From 3006e2bf75fce7c65e5f086487b7b75f6e1c8a43 Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe@altairis.fr>
Date: Wed, 27 Mar 2019 12:05:42 +0100
Subject: [PATCH 0001/1497] memorize line before delete (for triggers)

---
 htdocs/commande/class/commande.class.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 07b7a907150..6eff20da863 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -1367,7 +1367,7 @@ class Commande extends CommonOrder
 
 			// Check parameters
 			if ($type < 0) return -1;
-			
+
 			if ($date_start && $date_end && $date_start > $date_end) {
 				$langs->load("errors");
 				$this->error=$langs->trans('ErrorStartDateGreaterEnd');
@@ -2194,6 +2194,12 @@ class Commande extends CommonOrder
 					// For triggers
 					$line->fetch($lineid);
 
+					// Memorize previous line for triggers
+					$staticline=new OrderLine($this->db);
+					$staticline->fetch($lineid);
+					$staticline->fetch_optionals($lineid);
+					$line->oldline = $staticline;
+
 					if ($line->delete($user) > 0)
 					{
 						$result=$this->update_price(1);
@@ -2947,7 +2953,7 @@ class Commande extends CommonOrder
 			if (empty($txlocaltax2)) $txlocaltax2=0;
 			if (empty($remise_percent)) $remise_percent=0;
 			if (empty($special_code) || $special_code == 3) $special_code=0;
-			
+
 			if ($date_start && $date_end && $date_start > $date_end) {
 				$langs->load("errors");
 				$this->error=$langs->trans('ErrorStartDateGreaterEnd');
@@ -2962,7 +2968,7 @@ class Commande extends CommonOrder
 			$txtva=price2num($txtva);
 			$txlocaltax1=price2num($txlocaltax1);
 			$txlocaltax2=price2num($txlocaltax2);
-			
+
 			$this->db->begin();
 
 			// Calcul du total TTC et de la TVA pour la ligne a partir de

From 631be04d5de1c7489af970338d94163dc174d61e Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe@altairis.fr>
Date: Wed, 27 Mar 2019 12:15:50 +0100
Subject: [PATCH 0002/1497] better clone oldline and avoid emptylabel on update

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

diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 6eff20da863..18495a68f50 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -2195,9 +2195,7 @@ class Commande extends CommonOrder
 					$line->fetch($lineid);
 
 					// Memorize previous line for triggers
-					$staticline=new OrderLine($this->db);
-					$staticline->fetch($lineid);
-					$staticline->fetch_optionals($lineid);
+					$staticline = clone $line;
 					$line->oldline = $staticline;
 
 					if ($line->delete($user) > 0)
@@ -3054,7 +3052,7 @@ class Commande extends CommonOrder
 			}
 
 			$this->line->rowid=$rowid;
-			$this->line->label=$label;
+			$this->line->label=!empty($label)?$label:$this->line->oldline->label;
 			$this->line->desc=$desc;
 			$this->line->qty=$qty;
 

From c860c0dc4a72c35b38dfc5aee34ba968a1e1a13b Mon Sep 17 00:00:00 2001
From: BENKE Charlene <1179011+defrance@users.noreply.github.com>
Date: Thu, 26 Nov 2020 11:47:45 +0100
Subject: [PATCH 0003/1497] Add default BOM

---
 htdocs/install/mysql/tables/llx_product.sql | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/install/mysql/tables/llx_product.sql b/htdocs/install/mysql/tables/llx_product.sql
index 2431c884c62..a1ccf065ffa 100644
--- a/htdocs/install/mysql/tables/llx_product.sql
+++ b/htdocs/install/mysql/tables/llx_product.sql
@@ -100,5 +100,6 @@ create table llx_product
   desiredstock                  float      DEFAULT 0,
   fk_unit                       integer      DEFAULT NULL,
   price_autogen                 tinyint      DEFAULT 0,
+  fk_default_bom                integer      DEFAULT NULL,
   fk_project                    integer      DEFAULT NULL           -- Used when product was generated by a project or is specifif to a project
 )ENGINE=innodb;

From c2bd30a7e92445e10b6ffd0cc90b3121178d8816 Mon Sep 17 00:00:00 2001
From: BENKE Charlene <1179011+defrance@users.noreply.github.com>
Date: Thu, 26 Nov 2020 11:59:00 +0100
Subject: [PATCH 0004/1497] working progress

---
 htdocs/install/mysql/migration/12.0.0-13.0.0.sql |  1 +
 htdocs/product/class/product.class.php           | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
index c83755009ae..95d6d208145 100644
--- a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
+++ b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
@@ -29,6 +29,7 @@
 
 
 -- Missing in v12 or lower
+ALTER TABLE llx_product ADD COLUMN fk_default_bom integer DEFAULT NULL;
 
 ALTER TABLE llx_payment_salary MODIFY COLUMN ref varchar(30) NULL;
 ALTER TABLE llx_payment_various MODIFY COLUMN ref varchar(30) NULL;
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 03d81d4fd64..40d63c4643f 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -248,6 +248,13 @@ class Product extends CommonObject
 	 */
 	public $finished;
 
+		/**
+	 * fk_default_bom indicates the default bom
+	 *
+	 * @var int
+	 */
+	public $fk_default_bom;
+
 	/**
 	 * We must manage lot/batch number, sell-by date and so on : '1':yes '0':no
 	 *
@@ -996,6 +1003,7 @@ class Product extends CommonObject
 			$sql .= ", tobuy = ".(int) $this->status_buy;
 			$sql .= ", tobatch = ".((empty($this->status_batch) || $this->status_batch < 0) ? '0' : (int) $this->status_batch);
 			$sql .= ", finished = ".((!isset($this->finished) || $this->finished < 0 || $this->finished == '') ? "null" : (int) $this->finished);
+			$sql .= ", fk_default_bom = ".((!isset($this->fk_default_bom) || $this->fk_default_bom < 0 || $this->fk_default_bom == '') ? "null" : (int) $this->fk_default_bom);
 			$sql .= ", net_measure = ".($this->net_measure != '' ? "'".$this->db->escape($this->net_measure)."'" : 'null');
 			$sql .= ", net_measure_units = ".($this->net_measure_units != '' ? "'".$this->db->escape($this->net_measure_units)."'" : 'null');
 			$sql .= ", weight = ".($this->weight != '' ? "'".$this->db->escape($this->weight)."'" : 'null');
@@ -2046,7 +2054,7 @@ class Product extends CommonObject
 		$sql .= " price_min, price_min_ttc, price_base_type, cost_price, default_vat_code, tva_tx, recuperableonly as tva_npr, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type, tosell,";
 		$sql .= " tobuy, fk_product_type, duration, fk_default_warehouse, seuil_stock_alerte, canvas, net_measure, net_measure_units, weight, weight_units,";
 		$sql .= " length, length_units, width, width_units, height, height_units,";
-		$sql .= " surface, surface_units, volume, volume_units, barcode, fk_barcode_type, finished,";
+		$sql .= " surface, surface_units, volume, volume_units, barcode, fk_barcode_type, finished,fk_default_bom,";
 		$sql .= " accountancy_code_buy, accountancy_code_buy_intra, accountancy_code_buy_export,";
 		$sql .= " accountancy_code_sell, accountancy_code_sell_intra, accountancy_code_sell_export, stock, pmp,";
 		$sql .= " datec, tms, import_key, entity, desiredstock, tobatch, fk_unit,";
@@ -2107,8 +2115,10 @@ class Product extends CommonObject
 				$this->localtax2_tx                    = $obj->localtax2_tx;
 				$this->localtax1_type                = $obj->localtax1_type;
 				$this->localtax2_type                = $obj->localtax2_type;
-
+				
 				$this->finished                        = $obj->finished;
+				$this->fk_default_bom                  = $obj->fk_default_bom;
+
 				$this->duration                        = $obj->duration;
 				$this->duration_value                = substr($obj->duration, 0, dol_strlen($obj->duration) - 1);
 				$this->duration_unit = substr($obj->duration, -1);

From 5b40950f500f5a2de2e3a7bc58c8f12b42bd70af Mon Sep 17 00:00:00 2001
From: BENKE Charlene <1179011+defrance@users.noreply.github.com>
Date: Thu, 26 Nov 2020 12:45:06 +0100
Subject: [PATCH 0005/1497] Update card.php

add on card
---
 htdocs/product/card.php | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 6fdfb82e354..5fed4bc4ca1 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -17,7 +17,7 @@
  * Copyright (C) 2016		Meziane Sof		     <virtualsof@yahoo.fr>
  * Copyright (C) 2017		Josep Lluís Amador	 <joseplluis@lliuretic.cat>
  * Copyright (C) 2019       Frédéric France      <frederic.france@netlogic.fr>
- * Copyright (C) 2019-2020  Thibault FOUCART     <support@ptibogxiv.net>
+ * Copyright (C) 2019-2020  Thibault FOUCART     <support@ptibo gxiv.net>
  * Copyright (C) 2020  		Pierre Ardoin     	 <mapiolca@me.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -59,6 +59,7 @@ if (!empty($conf->commande->enabled))   require_once DOL_DOCUMENT_ROOT.'/command
 if (!empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
 if (!empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 if (!empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
+if (!empty($conf->bom->enabled)) 		require_once DOL_DOCUMENT_ROOT.'/bom/class/bom.class.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array('products', 'other'));
@@ -454,6 +455,13 @@ if (empty($reshook))
 					$object->finished = null;
 				}
 
+				$fk_default_bom = GETPOST('fk_default_bom', 'int');
+				if ($fk_default_bom >= 0) {
+					$object->fk_default_bom = $fk_default_bom;
+				} else {
+					$object->fk_default_bom = null;
+				}
+
 				$units = GETPOST('units', 'int');
 				if ($units > 0) {
 					$object->fk_unit = $units;
@@ -1567,6 +1575,13 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 				print $formproduct->selectProductNature('finished', $object->finished);
 				print '</td></tr>';
 
+				if ($conf->bom->enabled) {
+					print '<tr><td>'.$form->textwithpicto($langs->trans("DefaultBOM"), $langs->trans("DefaultBOMDesc")).'</td><td colspan="3">';
+					$bomkey = "Bom:bom/class/bom.class.php:0:t.status=1 AND t.fk_product=".$object->id;
+					print $form->selectForForms($bomkey, 'fk_default_bom', $object->fk_default_bom, 1);
+					print '</td></tr>';
+				}
+
 				// Brut Weight
 				print '<tr><td>'.$langs->trans("Weight").'</td><td colspan="3">';
 				print '<input name="weight" size="5" value="'.$object->weight.'"> ';
@@ -2059,6 +2074,16 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 				print $object->getLibFinished();
 				print '</td></tr>';
 
+				if ($conf->bom->enabled) {
+					print '<tr><td class="titlefield">'.$form->textwithpicto($langs->trans("DefaultBOM"), $langs->trans("DefaultBOMDesc")).'</td><td colspan="2">';
+					if ($object->fk_default_bom) {
+						$bom_static = new BOM($db);
+						$bom_static->fetch($object->fk_default_bom);
+						print $bom_static->getNomUrl(1);
+					}
+					print '</td></tr>';
+				}
+
 				// Brut Weight
 				print '<tr><td class="titlefield">'.$langs->trans("Weight").'</td><td colspan="2">';
 				if ($object->weight != '')

From 98e482de71c72da6692f5fc4aeeec7019c4dec3d Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 22 Mar 2021 06:53:09 +0100
Subject: [PATCH 0006/1497] Add text for popup

---
 htdocs/langs/en_US/accountancy.lang | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index c635809404e..3785961246e 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -328,6 +328,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountanc
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
+NotifiedExportDate=Notified export date
+NotifiedValidationDate=Validation of the entries (modification or deletion of the entries will not be possible)
+ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=Export draft journal
 Modelcsv=Model of export
 Selectmodelcsv=Select a model of export

From 49faedae6fef9775b889a063921ee252aa06ffad Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Wed, 24 Mar 2021 11:56:23 +0100
Subject: [PATCH 0007/1497] Work on date_validation

---
 htdocs/accountancy/bookkeeping/card.php       | 95 ++++++++++++-------
 htdocs/accountancy/bookkeeping/list.php       | 51 +++++++++-
 .../accountancy/class/bookkeeping.class.php   | 46 +++++++--
 3 files changed, 146 insertions(+), 46 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index e3cac139c08..03600781319 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2013-2017  Olivier Geffroy         <jeff@jeffinfo.com>
  * Copyright (C) 2013-2017  Florian Henry           <florian.henry@open-concept.pro>
- * Copyright (C) 2013-2018  Alexandre Spangaro      <aspangaro@open-dsi.fr>
+ * Copyright (C) 2013-2021  Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2017       Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2018-2020  Frédéric France         <frederic.france@netlogic.fr>
  *
@@ -537,6 +537,22 @@ if ($action == 'create') {
 		print '</td>';
 		print '</tr>';
 
+		// Date document creation
+		print '<tr>';
+		print '<td class="titlefield">'.$langs->trans("DateExport").'</td>';
+		print '<td>';
+		print $object->date_export ? dol_print_date($object->date_export, 'dayhour') : '&nbsp;';
+		print '</td>';
+		print '</tr>';
+
+		// Date document creation
+		print '<tr>';
+		print '<td class="titlefield">'.$langs->trans("DateValidation").'</td>';
+		print '<td>';
+		print $object->date_validation ? dol_print_date($object->date_validation, 'dayhour') : '&nbsp;';
+		print '</td>';
+		print '</tr>';
+
 		// Validate
 		/*
 		print '<tr>';
@@ -619,7 +635,9 @@ if ($action == 'create') {
 				print_liste_field_titre("LabelOperation");
 				print_liste_field_titre("Debit", "", "", "", "", 'class="right"');
 				print_liste_field_titre("Credit", "", "", "", "", 'class="right"');
-				print_liste_field_titre("Action", "", "", "", "", 'width="60" class="center"');
+				if (empty($object->date_validation)) {
+					print_liste_field_titre("Action", "", "", "", "", 'width="60" class="center"');
+				}
 
 				print "</tr>\n";
 
@@ -665,18 +683,22 @@ if ($action == 'create') {
 						print '<td class="nowrap right">'.price($line->debit).'</td>';
 						print '<td class="nowrap right">'.price($line->credit).'</td>';
 
-						print '<td class="center">';
-						print '<a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?action=update&id='.$line->id.'&piece_num='.urlencode($line->piece_num).'&mode='.urlencode($mode).'&token='.urlencode(newToken()).'">';
-						print img_edit('', 0, 'class="marginrightonly"');
-						print '</a> &nbsp;';
-
-						$actiontodelete = 'delete';
-						if ($mode == '_tmp' || $action != 'delmouv') {
-							$actiontodelete = 'confirm_delete';
+						if (empty($line->date_export) || empty($line->date_validation)) {
+							print '<td class="center">';
+							print '<a class="editfielda reposition" href="' . $_SERVER["PHP_SELF"] . '?action=update&id=' . $line->id . '&piece_num=' . urlencode($line->piece_num) . '&mode=' . urlencode($mode) . '&token=' . urlencode(newToken()) . '">';
+							print img_edit('', 0, 'class="marginrightonly"');
+							print '</a> &nbsp;';
 						}
 
-						print '<a href="'.$_SERVER["PHP_SELF"].'?action='.$actiontodelete.'&id='.$line->id.'&piece_num='.urlencode($line->piece_num).'&mode='.urlencode($mode).'&token='.urlencode(newToken()).'">';
-						print img_delete();
+						if (empty($line->date_validation)) {
+							$actiontodelete = 'delete';
+							if ($mode == '_tmp' || $action != 'delmouv') {
+								$actiontodelete = 'confirm_delete';
+							}
+
+							print '<a href="' . $_SERVER["PHP_SELF"] . '?action=' . $actiontodelete . '&id=' . $line->id . '&piece_num=' . urlencode($line->piece_num) . '&mode=' . urlencode($mode) . '&token=' . urlencode(newToken()) . '">';
+							print img_delete();
+						}
 
 						print '</a>';
 						print '</td>';
@@ -691,32 +713,33 @@ if ($action == 'create') {
 					setEventMessages(null, array($langs->trans('MvtNotCorrectlyBalanced', $total_debit, $total_credit)), 'warnings');
 				}
 
-				if ($action == "" || $action == 'add') {
-					print '<tr class="oddeven">';
-					print '<!-- td columns in add mode -->';
-					print '<td>';
-					print $formaccounting->select_account('', 'accountingaccount_number', 1, array(), 1, 1, '');
-					print '</td>';
-					print '<td>';
-					// TODO For the moment we keep a free input text instead of a combo. The select_auxaccount has problem because:
-					// It does not use the setup of "key pressed" to select a thirdparty and this hang browser on large databases.
-					// Also, it is not possible to use a value that is not in the list.
-					// Also, the label is not automatically filled when a value is selected.
-					if (!empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX)) {
-						print $formaccounting->select_auxaccount('', 'subledger_account', 1);
-					} else {
-						print '<input type="text" class="maxwidth150" name="subledger_account" value="" placeholder="'.dol_escape_htmltag($langs->trans("SubledgerAccount")).'">';
+				if (empty($object->date_export) || empty($object->date_validation)) {
+					if ($action == "" || $action == 'add') {
+						print '<tr class="oddeven">';
+						print '<!-- td columns in add mode -->';
+						print '<td>';
+						print $formaccounting->select_account('', 'accountingaccount_number', 1, array(), 1, 1, '');
+						print '</td>';
+						print '<td>';
+						// TODO For the moment we keep a free input text instead of a combo. The select_auxaccount has problem because:
+						// It does not use the setup of "key pressed" to select a thirdparty and this hang browser on large databases.
+						// Also, it is not possible to use a value that is not in the list.
+						// Also, the label is not automatically filled when a value is selected.
+						if (!empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX)) {
+							print $formaccounting->select_auxaccount('', 'subledger_account', 1);
+						} else {
+							print '<input type="text" class="maxwidth150" name="subledger_account" value="" placeholder="' . dol_escape_htmltag($langs->trans("SubledgerAccount")) . '">';
+						}
+						print '<br><input type="text" class="maxwidth150" name="subledger_label" value="" placeholder="' . dol_escape_htmltag($langs->trans("SubledgerAccountLabel")) . '">';
+						print '</td>';
+						print '<td><input type="text" class="minwidth200" name="label_operation" value="' . $label_operation . '"/></td>';
+						print '<td class="right"><input type="text" size="6" class="right" name="debit" value=""/></td>';
+						print '<td class="right"><input type="text" size="6" class="right" name="credit" value=""/></td>';
+						print '<td><input type="submit" class="button" name="save" value="' . $langs->trans("Add") . '"></td>';
+						print '</tr>';
 					}
-					print '<br><input type="text" class="maxwidth150" name="subledger_label" value="" placeholder="'.dol_escape_htmltag($langs->trans("SubledgerAccountLabel")).'">';
-					print '</td>';
-					print '<td><input type="text" class="minwidth200" name="label_operation" value="'.$label_operation.'"/></td>';
-					print '<td class="right"><input type="text" size="6" class="right" name="debit" value=""/></td>';
-					print '<td class="right"><input type="text" size="6" class="right" name="credit" value=""/></td>';
-					print '<td><input type="submit" class="button" name="save" value="'.$langs->trans("Add").'"></td>';
-					print '</tr>';
+					print '</table>';
 				}
-				print '</table>';
-
 
 				if ($mode == '_tmp' && $action == '') {
 					print '<br>';
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 40a8284adc4..dcaa16ffd4e 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-2020  Alexandre Spangaro      <aspangaro@open-dsi.fr>
+ * Copyright (C) 2013-2021  Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2016-2017  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2018-2021  Frédéric France         <frederic.france@netlogic.fr>
  *
@@ -53,6 +53,8 @@ $search_date_modification_start = dol_mktime(0, 0, 0, GETPOST('date_modification
 $search_date_modification_end = dol_mktime(0, 0, 0, GETPOST('date_modification_endmonth', 'int'), GETPOST('date_modification_endday', 'int'), GETPOST('date_modification_endyear', 'int'));
 $search_date_export_start = dol_mktime(0, 0, 0, GETPOST('date_export_startmonth', 'int'), GETPOST('date_export_startday', 'int'), GETPOST('date_export_startyear', 'int'));
 $search_date_export_end = dol_mktime(0, 0, 0, GETPOST('date_export_endmonth', 'int'), GETPOST('date_export_endday', 'int'), GETPOST('date_export_endyear', 'int'));
+$search_date_validation_start = dol_mktime(0, 0, 0, GETPOST('date_validation_startmonth', 'int'), GETPOST('date_validation_startday', 'int'), GETPOST('date_validation_startyear', 'int'));
+$search_date_validation_end = dol_mktime(0, 0, 0, GETPOST('date_validation_endmonth', 'int'), GETPOST('date_validation_endday', 'int'), GETPOST('date_validation_endyear', 'int'));
 
 //var_dump($search_date_start);exit;
 if (GETPOST("button_delmvt_x") || GETPOST("button_delmvt.x") || GETPOST("button_delmvt")) {
@@ -157,6 +159,7 @@ $arrayfields = array(
 	't.date_creation'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0),
 	't.tms'=>array('label'=>$langs->trans("DateModification"), 'checked'=>0),
 	't.date_export'=>array('label'=>$langs->trans("DateExport"), 'checked'=>1),
+	't.date_validated'=>array('label'=>$langs->trans("DateValidation"), 'checked'=>1),
 );
 
 if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING)) {
@@ -224,6 +227,8 @@ if (empty($reshook)) {
 		$search_date_modification_end = '';
 		$search_date_export_start = '';
 		$search_date_export_end = '';
+		$search_date_validation_start = '';
+		$search_date_validation_end = '';
 		$search_debit = '';
 		$search_credit = '';
 		$search_lettering_code = '';
@@ -328,6 +333,16 @@ if (empty($reshook)) {
 		$tmp = dol_getdate($search_date_export_end);
 		$param .= '&date_export_endmonth='.urlencode($tmp['mon']).'&date_export_endday='.urlencode($tmp['mday']).'&date_export_endyear='.urlencode($tmp['year']);
 	}
+	if (!empty($search_date_validation_start)) {
+		$filter['t.date_validated>='] = $search_date_validation_start;
+		$tmp = dol_getdate($search_date_validation_start);
+		$param .= '&date_validation_startmonth='.urlencode($tmp['mon']).'&date_validation_startday='.urlencode($tmp['mday']).'&date_validation_startyear='.urlencode($tmp['year']);
+	}
+	if (!empty($search_date_validation_end)) {
+		$filter['t.date_validated<='] = $search_date_validation_end;
+		$tmp = dol_getdate($search_date_validation_end);
+		$param .= '&date_validation_endmonth='.urlencode($tmp['mon']).'&date_validation_endday='.urlencode($tmp['mday']).'&date_validation_endyear='.urlencode($tmp['year']);
+	}
 	if (!empty($search_debit)) {
 		$filter['t.debit'] = $search_debit;
 		$param .= '&search_debit='.urlencode($search_debit);
@@ -447,7 +462,8 @@ $sql .= " t.journal_label,";
 $sql .= " t.piece_num,";
 $sql .= " t.date_creation,";
 $sql .= " t.tms as date_modification,";
-$sql .= " t.date_export";
+$sql .= " t.date_export,";
+$sql .= " t.date_validated as date_validation";
 $sql .= ' FROM '.MAIN_DB_PREFIX.$object->table_element.' as t';
 // Manage filter
 $sqlwhere = array();
@@ -469,6 +485,8 @@ if (count($filter) > 0) {
 			$sqlwhere[] = $key.'\''.$db->idate($value).'\'';
 		} elseif ($key == 't.date_export>=' || $key == 't.date_export<=') {
 			$sqlwhere[] = $key.'\''.$db->idate($value).'\'';
+		} elseif ($key == 't.date_validated>=' || $key == 't.date_validated<=') {
+			$sqlwhere[] = $key.'\''.$db->idate($value).'\'';
 		} elseif ($key == 't.credit' || $key == 't.debit') {
 			$sqlwhere[] = natural_search($key, $value, 1, 1);
 		} elseif ($key == 't.reconciled_option') {
@@ -846,6 +864,17 @@ if (!empty($arrayfields['t.date_export']['checked'])) {
 	print '</div>';
 	print '</td>';
 }
+// Date validation
+if (!empty($arrayfields['t.date_validated']['checked'])) {
+	print '<td class="liste_titre center">';
+	print '<div class="nowrap">';
+	print $form->selectDate($search_date_validation_start, 'date_validation_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
+	print '</div>';
+	print '<div class="nowrap">';
+	print $form->selectDate($search_date_validation_end, 'date_validation_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"));
+	print '</div>';
+	print '</td>';
+}
 // Action column
 print '<td class="liste_titre center">';
 $searchpicto = $form->showFilterButtons();
@@ -897,6 +926,9 @@ if (!empty($arrayfields['t.tms']['checked'])) {
 if (!empty($arrayfields['t.date_export']['checked'])) {
 	print_liste_field_titre($arrayfields['t.date_export']['label'], $_SERVER['PHP_SELF'], "t.date_export", "", $param, '', $sortfield, $sortorder, 'center ');
 }
+if (!empty($arrayfields['t.date_validated']['checked'])) {
+	print_liste_field_titre($arrayfields['t.date_validated']['label'], $_SERVER['PHP_SELF'], "t.date_validated", "", $param, '', $sortfield, $sortorder, 'center ');
+}
 print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
 print "</tr>\n";
 
@@ -939,6 +971,7 @@ while ($i < min($num, $limit)) {
 	$line->date_creation = $db->jdate($obj->date_creation);
 	$line->date_modification = $db->jdate($obj->date_modification);
 	$line->date_export = $db->jdate($obj->date_export);
+	$line->date_validation = $db->jdate($obj->date_validation);
 
 	$total_debit += $line->debit;
 	$total_credit += $line->credit;
@@ -1131,12 +1164,22 @@ while ($i < min($num, $limit)) {
 		}
 	}
 
+	// Validated operation date
+	if (!empty($arrayfields['t.date_validated']['checked'])) {
+		print '<td class="center">'.dol_print_date($line->date_validation, 'dayhour').'</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+	}
+
 	// Action column
 	print '<td class="nowraponall center">';
-	if (empty($line->date_export)) {
+	if (empty($line->date_export) || empty($line->date_validation)) {
 		if ($user->rights->accounting->mouvements->creer) {
-			print '<a class="editfielda paddingleft marginrightonly" href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?piece_num='.$line->piece_num.$param.'&page='.$page.($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : '').'">'.img_edit().'</a>';
+			print '<a class="editfielda paddingleft marginrightonly" href="' . DOL_URL_ROOT . '/accountancy/bookkeeping/card.php?piece_num=' . $line->piece_num . $param . '&page=' . $page . ($sortfield ? '&sortfield=' . $sortfield : '') . ($sortorder ? '&sortorder=' . $sortorder : '') . '">' . img_edit() . '</a>';
 		}
+	}
+	if (empty($line->date_validation)) {
 		if ($user->rights->accounting->mouvements->supprimer) {
 			print '<a class="reposition paddingleft marginrightonly" href="'.$_SERVER['PHP_SELF'].'?action=delmouv&mvt_num='.$line->piece_num.$param.'&page='.$page.($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : '').'">'.img_delete().'</a>';
 		}
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 7286e954d0e..d1939b84665 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -135,7 +135,6 @@ class BookKeeping extends CommonObject
 
 	/**
 	 * @var float FEC:Amount (Not necessary)
-	 * @deprecated No more used
 	 */
 	public $amount;
 
@@ -722,7 +721,9 @@ class BookKeeping extends CommonObject
 		$sql .= " t.code_journal,";
 		$sql .= " t.journal_label,";
 		$sql .= " t.piece_num,";
-		$sql .= " t.date_creation";
+		$sql .= " t.date_creation,";
+		$sql .= " t.date_export,";
+		$sql .= " t.date_validated as date_validation";
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.$mode.' as t';
 		$sql .= ' WHERE 1 = 1';
 		$sql .= " AND entity IN (".getEntity('accountancy').")";
@@ -763,6 +764,9 @@ class BookKeeping extends CommonObject
 				$this->journal_label = $obj->journal_label;
 				$this->piece_num = $obj->piece_num;
 				$this->date_creation = $this->db->jdate($obj->date_creation);
+				$this->date_export = $this->db->jdate($obj->date_export);
+				$this->date_validation = $this->db->jdate($obj->date_validated);
+				$this->date_validation = $this->db->jdate($obj->date_validation);
 			}
 			$this->db->free($resql);
 
@@ -828,7 +832,8 @@ class BookKeeping extends CommonObject
 		$sql .= " t.journal_label,";
 		$sql .= " t.piece_num,";
 		$sql .= " t.date_creation,";
-		$sql .= " t.date_export";
+		$sql .= " t.date_export,";
+		$sql .= " t.date_validated as date_validation";
 		// Manage filter
 		$sqlwhere = array();
 		if (count($filter) > 0) {
@@ -847,6 +852,8 @@ class BookKeeping extends CommonObject
 					$sqlwhere[] = $key.'\''.$this->db->idate($value).'\'';
 				} elseif ($key == 't.date_export>=' || $key == 't.date_export<=') {
 					$sqlwhere[] = $key.'\''.$this->db->idate($value).'\'';
+				} elseif ($key == 't.date_validated>=' || $key == 't.date_validated<=') {
+					$sqlwhere[] = $key.'\''.$this->db->idate($value).'\'';
 				} elseif ($key == 't.credit' || $key == 't.debit') {
 					$sqlwhere[] = natural_search($key, $value, 1, 1);
 				} elseif ($key == 't.reconciled_option') {
@@ -920,6 +927,8 @@ class BookKeeping extends CommonObject
 				$line->piece_num = $obj->piece_num;
 				$line->date_creation = $this->db->jdate($obj->date_creation);
 				$line->date_export = $this->db->jdate($obj->date_export);
+				$line->date_validation = $this->db->jdate($obj->date_validated);
+				$line->date_validation = $this->db->jdate($obj->date_validation);
 
 				$this->lines[] = $line;
 
@@ -982,6 +991,7 @@ class BookKeeping extends CommonObject
 		$sql .= " t.date_lim_reglement,";
 		$sql .= " t.tms as date_modification,";
 		$sql .= " t.date_export";
+		$sql .= " t.date_validated as date_validation,";
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
 		// Manage filter
 		$sqlwhere = array();
@@ -1003,6 +1013,8 @@ class BookKeeping extends CommonObject
 					$sqlwhere[] = $key.'\''.$this->db->idate($value).'\'';
 				} elseif ($key == 't.date_export>=' || $key == 't.date_export<=') {
 					$sqlwhere[] = $key.'\''.$this->db->idate($value).'\'';
+				} elseif ($key == 't.date_validated>=' || $key == 't.date_validated<=') {
+					$sqlwhere[] = $key.'\''.$this->db->idate($value).'\'';
 				} elseif ($key == 't.credit' || $key == 't.debit') {
 					$sqlwhere[] = natural_search($key, $value, 1, 1);
 				} else {
@@ -1062,6 +1074,8 @@ class BookKeeping extends CommonObject
 				$line->date_lim_reglement = $this->db->jdate($obj->date_lim_reglement);
 				$line->date_modification = $this->db->jdate($obj->date_modification);
 				$line->date_export = $this->db->jdate($obj->date_export);
+				$line->date_validation = $this->db->jdate($obj->date_validated);
+				$line->date_validation = $this->db->jdate($obj->date_validation);
 
 				$this->lines[] = $line;
 
@@ -1442,6 +1456,8 @@ class BookKeeping extends CommonObject
 			$sql .= " AND code_journal = '".$this->db->escape($journal)."'";
 		}
 		$sql .= " AND entity IN (".getEntity('accountancy').")";
+		// Exclusion of validated entries at the time of deletion
+		$sql .= " AND date_validated IS NULL";
 
 		// TODO: In a future we must forbid deletion if record is inside a closed fiscal period.
 
@@ -1591,7 +1607,8 @@ class BookKeeping extends CommonObject
 	{
 		global $conf;
 
-		$sql = "SELECT piece_num,doc_date,code_journal,journal_label,doc_ref,doc_type,date_creation";
+		$sql = "SELECT piece_num, doc_date,code_journal, journal_label, doc_ref, doc_type,";
+		$sql .= " date_creation, tms as date_modification, date_export, date_validated as date_validation";
 		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element.$mode;
 		$sql .= " WHERE piece_num = ".$piecenum;
 		$sql .= " AND entity IN (".getEntity('accountancy').")";
@@ -1608,6 +1625,10 @@ class BookKeeping extends CommonObject
 			$this->doc_ref = $obj->doc_ref;
 			$this->doc_type = $obj->doc_type;
 			$this->date_creation = $obj->date_creation;
+			$this->date_modification = $obj->date_modification;
+			$this->date_export = $obj->date_export;
+			$this->date_validation = $obj->date_validated;
+			$this->date_validation = $obj->date_validation;
 		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			dol_syslog(__METHOD__.$this->error, LOG_ERR);
@@ -1663,7 +1684,8 @@ 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 as amount, sens, fk_user_author, import_key, code_journal, journal_label, piece_num, date_creation";
+		$sql .= " montant as amount, sens, fk_user_author, import_key, code_journal, journal_label, piece_num,";
+		$sql .= " date_creation, tms as date_modification, date_export, date_validated as date_validation";
 		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element.$mode;
 		$sql .= " WHERE piece_num = ".$piecenum;
 		$sql .= " AND entity IN (".getEntity('accountancy').")";
@@ -1696,6 +1718,10 @@ class BookKeeping extends CommonObject
 				$line->journal_label = $obj->journal_label;
 				$line->piece_num = $obj->piece_num;
 				$line->date_creation = $obj->date_creation;
+				$line->date_modification = $obj->date_modification;
+				$line->date_export = $obj->date_export;
+				$line->date_validation = $obj->date_validated;
+				$line->date_validation = $obj->date_validation;
 
 				$this->linesmvt[] = $line;
 			}
@@ -1723,7 +1749,8 @@ 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 as amount, sens, fk_user_author, import_key, code_journal, piece_num";
+		$sql .= " montant as amount, sens, fk_user_author, import_key, code_journal, piece_num,";
+		$sql .= " date_validated as date_validation";
 		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
 		$sql .= " WHERE entity IN (".getEntity('accountancy').")";
 
@@ -1758,6 +1785,8 @@ class BookKeeping extends CommonObject
 				$line->sens = $obj->sens;
 				$line->code_journal = $obj->code_journal;
 				$line->piece_num = $obj->piece_num;
+				$line->date_validation = $obj->date_validated;
+				$line->date_validation = $obj->date_validation;
 
 				$this->linesexport[] = $line;
 			}
@@ -2091,4 +2120,9 @@ class BookKeepingLine
 	 * @var integer|string $date_export;
 	 */
 	public $date_export;
+
+	/**
+	 * @var integer|string $date_validation;
+	 */
+	public $date_validation;
 }

From 305b338a116f60af5583b36f8071718dc5849e7c Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 19 Apr 2021 06:03:03 +0200
Subject: [PATCH 0008/1497] Update notified

---
 htdocs/accountancy/bookkeeping/list.php       | 36 +++++++++++++------
 .../class/accountancycategory.class.php       |  2 +-
 .../accountancy/class/bookkeeping.class.php   |  4 +--
 htdocs/langs/en_US/accountancy.lang           |  4 +--
 4 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 9ad21bb2e0a..429aac9b877 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -524,10 +524,15 @@ if ($action == 'export_fileconfirm' && $user->rights->accounting->mouvements->ex
 		$accountancyexport = new AccountancyExport($db);
 		$accountancyexport->export($object->lines, $formatexportset);
 
+		$notifiedexportdate = GETPOST('notifiedexportdate', 'alpha');
+		$notifiedvalidationdate = GETPOST('notifiedvalidationdate', 'alpha');
+
+		dol_syslog("date_export/date_validated=".$notifiedexportdate.'/'.$notifiedvalidationdate, LOG_DEBUG);
+
 		if (!empty($accountancyexport->errors)) {
 			setEventMessages('', $accountancyexport->errors, 'errors');
-		} else {
-			// Specify as export : update field date_export
+		} elseif (!$notifiedexportdate || !$notifiedvalidationdate) {
+			// Specify as export : update field date_export or date_validated
 			$error = 0;
 			$db->begin();
 
@@ -536,8 +541,15 @@ if ($action == 'export_fileconfirm' && $user->rights->accounting->mouvements->ex
 					$now = dol_now();
 
 					$sql = " UPDATE ".MAIN_DB_PREFIX."accounting_bookkeeping";
-					$sql .= " SET date_export = '".$db->idate($now)."'";
-					$sql .= " , date_validated = '".$db->idate($now)."'";
+					$sql .= " SET";
+					if (!$notifiedexportdate && !$notifiedvalidationdate) {
+						$sql .= " date_export = '".$db->idate($now)."'";
+						$sql .= ", date_validated = '".$db->idate($now)."'";
+					} elseif (!$notifiedexportdate) {
+						$sql .= " date_export = '".$db->idate($now)."'";
+					} elseif (!$notifiedvalidationdate) {
+						$sql .= " date_validated = '".$db->idate($now)."'";
+					}
 					$sql .= " WHERE rowid = ".((int) $movement->id);
 
 					dol_syslog("/accountancy/bookeeping/list.php Function export_file Specify movements as exported sql=".$sql, LOG_DEBUG);
@@ -551,11 +563,11 @@ if ($action == 'export_fileconfirm' && $user->rights->accounting->mouvements->ex
 
 			if (!$error) {
 				$db->commit();
-				// setEventMessages($langs->trans("AllExportedMovementsWereRecordedAsExported"), null, 'mesgs');
+				// setEventMessages($langs->trans("AllExportedMovementsWereRecordedAsExportedOrValidated"), null, 'mesgs');
 			} else {
 				$error++;
 				$db->rollback();
-				setEventMessages($langs->trans("NotAllExportedMovementsCouldBeRecordedAsExported"), null, 'errors');
+				setEventMessages($langs->trans("NotAllExportedMovementsCouldBeRecordedAsExportedOrValidated"), null, 'errors');
 			}
 		}
 		exit;
@@ -603,6 +615,8 @@ if (is_numeric($nbtotalofrecords) && $limit > $nbtotalofrecords) {
 
 llxHeader('', $title_page);
 
+$formconfirm = '';
+
 if ($action == 'export_file') {
 	$form_question = array();
 
@@ -614,17 +628,15 @@ if ($action == 'export_file') {
 	);
 	$form_question['notifiedvalidationdate'] = array(
 		'name' => 'notifiedvalidationdate',
-		'type' => 'checkbox', // We don't use select here, the journal_array is already a select html component
+		'type' => 'checkbox',
 		'label' => $langs->trans('NotifiedValidationDate'),
 		'value' => (!empty($conf->global->ACCOUNTING_DEFAULT_NOT_NOTIFIED_VALIDATION_DATE) ? 'false' : 'true'),
 	);
 
-	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?'.$param, $langs->trans("ExportFilteredList").' ('.$listofformat[$formatexportset].')', $langs->trans('ConfirmExportFile'), 'export_fileconfirm', $form_question, '', 1, 300);
-	print $formconfirm;
+	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?'.$param, $langs->trans("ExportFilteredList").' ('.$listofformat[$formatexportset].')', $langs->trans('ConfirmExportFile'), 'export_fileconfirm', $form_question, '', 1, 300, 600);
 }
 if ($action == 'delmouv') {
 	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?mvt_num='.GETPOST('mvt_num').$param, $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvtPartial'), 'delmouvconfirm', '', 0, 1);
-	print $formconfirm;
 }
 if ($action == 'delbookkeepingyear') {
 	$form_question = array();
@@ -664,9 +676,11 @@ if ($action == 'delbookkeepingyear') {
 	);
 
 	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?'.$param, $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvt', $langs->transnoentitiesnoconv("RegistrationInAccounting")), 'delbookkeepingyearconfirm', $form_question, '', 1, 300);
-	print $formconfirm;
 }
 
+// Print form confirm
+print $formconfirm;
+
 //$param='';	param started before
 if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 	$param .= '&contextpage='.urlencode($contextpage);
diff --git a/htdocs/accountancy/class/accountancycategory.class.php b/htdocs/accountancy/class/accountancycategory.class.php
index 9550933f2d8..75f1275c142 100644
--- a/htdocs/accountancy/class/accountancycategory.class.php
+++ b/htdocs/accountancy/class/accountancycategory.class.php
@@ -263,7 +263,7 @@ class AccountancyCategory // extends CommonObject
 		if ($id) {
 			$sql .= " WHERE t.rowid = ".((int) $id);
 		} else {
-			$sql .= " WHERE t.entity IN (".getEntity('c_accounting_category').")"; // Dont't use entity if you use rowid
+			$sql .= " WHERE t.entity IN (".getEntity('c_accounting_category').")"; // Don't use entity if you use rowid
 			if ($code) {
 				$sql .= " AND t.code = '".$this->db->escape($code)."'";
 			} elseif ($label) {
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index afb9b502a9e..611dfcdc30c 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -993,8 +993,8 @@ class BookKeeping extends CommonObject
 		$sql .= " t.date_creation,";
 		$sql .= " t.date_lim_reglement,";
 		$sql .= " t.tms as date_modification,";
-		$sql .= " t.date_export";
-		$sql .= " t.date_validated as date_validation,";
+		$sql .= " t.date_export,";
+		$sql .= " t.date_validated as date_validation";
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
 		// Manage filter
 		$sqlwhere = array();
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index 69d2a4e22e2..0d38544dacb 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -328,7 +328,7 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountanc
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
-NotifiedExportDate=Notified export date
+NotifiedExportDate=Notified export date (modification of the entries will not be possible)
 NotifiedValidationDate=Validation of the entries (modification or deletion of the entries will not be possible)
 ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=Export draft journal
@@ -430,4 +430,4 @@ WarningReportNotReliable=Warning, this report is not based on the Ledger, so doe
 ExpenseReportJournal=Expense Report Journal
 InventoryJournal=Inventory Journal
 
-NAccounts=%s accounts
\ No newline at end of file
+NAccounts=%s accounts

From 894eb1e5a418f9e0c2d7c60490a8dfc1083bee17 Mon Sep 17 00:00:00 2001
From: Gauthier PC portable 024 <gauthier.verdol@atm-consulting.fr>
Date: Mon, 19 Apr 2021 14:34:11 +0200
Subject: [PATCH 0009/1497] NEW : "+" and "-" to show / hide batch details on
 product "stock" tab

---
 htdocs/admin/stock.php           | 15 +++++++++
 htdocs/langs/en_US/stocks.lang   |  3 +-
 htdocs/langs/fr_FR/stocks.lang   |  1 +
 htdocs/product/stock/product.php | 56 ++++++++++++++++++++++++++++++--
 4 files changed, 71 insertions(+), 4 deletions(-)

diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php
index 39a9e5ae601..c2d64d977c3 100644
--- a/htdocs/admin/stock.php
+++ b/htdocs/admin/stock.php
@@ -758,6 +758,21 @@ if ($conf->use_javascript_ajax) {
 }
 print "</td>\n";
 print "</tr>\n";
+
+if (!empty($conf->productbatch->enabled)) {
+	print '<tr class="oddeven">';
+	print '<td>' . $langs->trans("ShowAllBatchByDefault") . '</td>';
+	print '<td class="right">';
+	if ($conf->use_javascript_ajax) {
+		print ajax_constantonoff('STOCK_SHOW_ALL_BATCH_BY_DEFAULT');
+	} else {
+		$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+		print $form->selectarray("STOCK_SHOW_ALL_BATCH_BY_DEFAULT", $arrval, $conf->global->STOCK_SHOW_ALL_BATCH_BY_DEFAULT);
+	}
+	print "</td>\n";
+	print "</tr>\n";
+}
+
 print '</table>';
 
 print '</form>';
diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang
index 1b54e53d6de..376b86fcef7 100644
--- a/htdocs/langs/en_US/stocks.lang
+++ b/htdocs/langs/en_US/stocks.lang
@@ -240,4 +240,5 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
-DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
\ No newline at end of file
+DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
+ShowAllBatchByDefault=By default, show batch details on product "stock" tab
diff --git a/htdocs/langs/fr_FR/stocks.lang b/htdocs/langs/fr_FR/stocks.lang
index 444c546b853..cf178141f74 100644
--- a/htdocs/langs/fr_FR/stocks.lang
+++ b/htdocs/langs/fr_FR/stocks.lang
@@ -242,3 +242,4 @@ UpdateByScaning=Mise à jour par scan
 UpdateByScaningProductBarcode=Mettre à jour par scan (code-barres produit)
 UpdateByScaningLot=Mise à jour par scan (code barres lot/série)
 DisableStockChangeOfSubProduct=Désactiver les mouvements de stock des composants pour tout mouvement de stock de ce kit
+ShowAllBatchByDefault=Dérouler par défaut le détail des lots dans l'onglet "stock"
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index d1c1ea99ff7..1b72404011b 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -9,6 +9,7 @@
  * Copyright (C) 2014-2015 Cédric Gross            <c.gross@kreiz-it.fr>
  * Copyright (C) 2015      Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2018-2019 Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2021	   Gauthier VERDOL         <gauthier.verdol@atm-consulting.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
@@ -522,6 +523,48 @@ if ($id > 0 || $ref)
 
 	llxHeader('', $title, $helpurl);
 
+	?>
+
+	<script type="text/javascript" language="javascript">
+		$(document).ready(function() {
+
+			$(".collapse_batch").click(function() {
+
+				var id_entrepot = $(this).attr('id').replace('ent', '');
+
+				if($(this).text().indexOf('+') > 0) {
+					$(".batch_warehouse" + id_entrepot).show();
+					$(this).html('(-)&nbsp;');
+				}
+				else {
+					$(".batch_warehouse" + id_entrepot).hide();
+					$(this).html('(+)&nbsp;');
+				}
+
+				return false;
+			});
+
+			$("#show_all").click(function() {
+				$(this).hide();
+				$("#hide_all").show();
+				$("[class^=batch_warehouse]").show();
+				$("[class^=collapse_batch]").html('(-)&nbsp;');
+				return false;
+			});
+
+			$("#hide_all").click(function() {
+				$("[class^=batch_warehouse]").hide();
+				$(this).hide();
+				$("#show_all").show();
+				$("[class^=collapse_batch]").html('(+)&nbsp;');
+				return false;
+			});
+
+		});
+	</script>
+
+	<?php
+
 	if ($result > 0)
 	{
 		$head = product_prepare_head($object);
@@ -828,7 +871,10 @@ if (!$variants) {
 	print '</tr>';
 	if ((!empty($conf->productbatch->enabled)) && $object->hasbatch()) {
 		$colspan = 3;
-		print '<tr class="liste_titre"><td width="10%"></td>';
+		print '<tr class="liste_titre"><td width="14%">';
+		print '<a style="display:'.(!empty($conf->global->STOCK_SHOW_ALL_BATCH_BY_DEFAULT) ? 'visible' : 'none').';" id="hide_all" href="#">'.img_picto('', 'folder', 'class="paddingright"').$langs->trans("UndoExpandAll").'</a>';
+		print '<a style="display:'.(!empty($conf->global->STOCK_SHOW_ALL_BATCH_BY_DEFAULT) ? 'none' : 'visible').';" id="show_all" href="#">'.img_picto('', 'folder-open', 'class="paddingright"').$langs->trans("ExpandAll").'</a>';
+		print '</td>';
 		print '<td class="right" width="10%">'.$langs->trans("batch_number").'</td>';
 		if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
 			$colspan--;
@@ -880,7 +926,11 @@ if (!$variants) {
 
 			$stock_real = price2num($obj->reel, 'MS');
 			print '<tr class="oddeven">';
-			print '<td colspan="4">'.$entrepotstatic->getNomUrl(1).'</td>';
+			print '<td colspan="4">';
+			if(!empty($conf->productbatch->enabled)) {
+				print '<a class="collapse_batch" id="ent' . $entrepotstatic->id . '" href="#">' . (empty($conf->global->STOCK_SHOW_ALL_BATCH_BY_DEFAULT) ? '(+)' : '(-)') . '&nbsp;</a>';
+			}
+			print $entrepotstatic->getNomUrl(1).'</td>';
 			print '<td class="right">'.$stock_real.($stock_real < 0 ? ' '.img_warning() : '').'</td>';
 			// PMP
 			print '<td class="right">'.(price2num($object->pmp) ? price2num($object->pmp, 'MU') : '').'</td>';
@@ -934,7 +984,7 @@ if (!$variants) {
 						print '</form>';
 						print '</td></tr>';
 					} else {
-						print "\n".'<tr><td class="right">';
+						print "\n".'<tr style="display:'.(empty($conf->global->STOCK_SHOW_ALL_BATCH_BY_DEFAULT) ? 'none' : 'visible').';" class="batch_warehouse'.$entrepotstatic->id.'"><td class="right">';
 						print img_picto($langs->trans("Tranfer"), 'uparrow', 'class="hideonsmartphone"').' ';
 						print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;id_entrepot='.$entrepotstatic->id.'&amp;action=transfert&amp;pdluoid='.$pdluo->id.'">'.$langs->trans("TransferStock").'</a>';
 						// Disabled, because edition of stock content must use the "Correct stock menu".

From a79823742f464f0bbbe5ca217debf0c37c13d37e Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Mon, 19 Apr 2021 12:41:17 +0000
Subject: [PATCH 0010/1497] Fixing style errors.

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

diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 1b72404011b..17b209b845a 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -927,7 +927,7 @@ if (!$variants) {
 			$stock_real = price2num($obj->reel, 'MS');
 			print '<tr class="oddeven">';
 			print '<td colspan="4">';
-			if(!empty($conf->productbatch->enabled)) {
+			if (!empty($conf->productbatch->enabled)) {
 				print '<a class="collapse_batch" id="ent' . $entrepotstatic->id . '" href="#">' . (empty($conf->global->STOCK_SHOW_ALL_BATCH_BY_DEFAULT) ? '(+)' : '(-)') . '&nbsp;</a>';
 			}
 			print $entrepotstatic->getNomUrl(1).'</td>';

From 2236d1b07fa6c5967d8ab46049608dc0790e188d Mon Sep 17 00:00:00 2001
From: Gauthier PC portable 024 <gauthier.verdol@atm-consulting.fr>
Date: Mon, 19 Apr 2021 14:46:28 +0200
Subject: [PATCH 0011/1497] FIX : Hide all and check all links always available

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

diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 1b72404011b..8e17eb0c885 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -545,8 +545,6 @@ if ($id > 0 || $ref)
 			});
 
 			$("#show_all").click(function() {
-				$(this).hide();
-				$("#hide_all").show();
 				$("[class^=batch_warehouse]").show();
 				$("[class^=collapse_batch]").html('(-)&nbsp;');
 				return false;
@@ -554,8 +552,6 @@ if ($id > 0 || $ref)
 
 			$("#hide_all").click(function() {
 				$("[class^=batch_warehouse]").hide();
-				$(this).hide();
-				$("#show_all").show();
 				$("[class^=collapse_batch]").html('(+)&nbsp;');
 				return false;
 			});
@@ -872,8 +868,8 @@ if (!$variants) {
 	if ((!empty($conf->productbatch->enabled)) && $object->hasbatch()) {
 		$colspan = 3;
 		print '<tr class="liste_titre"><td width="14%">';
-		print '<a style="display:'.(!empty($conf->global->STOCK_SHOW_ALL_BATCH_BY_DEFAULT) ? 'visible' : 'none').';" id="hide_all" href="#">'.img_picto('', 'folder', 'class="paddingright"').$langs->trans("UndoExpandAll").'</a>';
-		print '<a style="display:'.(!empty($conf->global->STOCK_SHOW_ALL_BATCH_BY_DEFAULT) ? 'none' : 'visible').';" id="show_all" href="#">'.img_picto('', 'folder-open', 'class="paddingright"').$langs->trans("ExpandAll").'</a>';
+		print '<a id="show_all" href="#">'.img_picto('', 'folder-open', 'class="paddingright"').$langs->trans("ExpandAll").'</a><br>';
+		print '<a id="hide_all" href="#">'.img_picto('', 'folder', 'class="paddingright"').$langs->trans("UndoExpandAll").'</a>';
 		print '</td>';
 		print '<td class="right" width="10%">'.$langs->trans("batch_number").'</td>';
 		if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {

From 72ea2a56ea216e803d789719d88ddfc4416b64a2 Mon Sep 17 00:00:00 2001
From: Gauthier PC portable 024 <gauthier.verdol@atm-consulting.fr>
Date: Tue, 20 Apr 2021 10:02:53 +0200
Subject: [PATCH 0012/1497] NEW : help text

---
 htdocs/langs/en_US/stocks.lang   | 1 +
 htdocs/langs/fr_FR/stocks.lang   | 1 +
 htdocs/product/stock/product.php | 3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang
index 376b86fcef7..fa686b7baa3 100644
--- a/htdocs/langs/en_US/stocks.lang
+++ b/htdocs/langs/en_US/stocks.lang
@@ -242,3 +242,4 @@ UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
 DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
 ShowAllBatchByDefault=By default, show batch details on product "stock" tab
+CollapseBatchDetailHelp=You can set batch detail default display in stocks module configuration
diff --git a/htdocs/langs/fr_FR/stocks.lang b/htdocs/langs/fr_FR/stocks.lang
index cf178141f74..53118bc6b36 100644
--- a/htdocs/langs/fr_FR/stocks.lang
+++ b/htdocs/langs/fr_FR/stocks.lang
@@ -243,3 +243,4 @@ UpdateByScaningProductBarcode=Mettre à jour par scan (code-barres produit)
 UpdateByScaningLot=Mise à jour par scan (code barres lot/série)
 DisableStockChangeOfSubProduct=Désactiver les mouvements de stock des composants pour tout mouvement de stock de ce kit
 ShowAllBatchByDefault=Dérouler par défaut le détail des lots dans l'onglet "stock"
+CollapseBatchDetailHelp=Vous pouvez définir l'affichage par défaut du détail des lots dans la configuration du module stocks
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 97ccccb1cbc..b97903f0e84 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -869,7 +869,8 @@ if (!$variants) {
 		$colspan = 3;
 		print '<tr class="liste_titre"><td width="14%">';
 		print '<a id="show_all" href="#">'.img_picto('', 'folder-open', 'class="paddingright"').$langs->trans("ExpandAll").'</a><br>';
-		print '<a id="hide_all" href="#">'.img_picto('', 'folder', 'class="paddingright"').$langs->trans("UndoExpandAll").'</a>';
+		print '<a id="hide_all" href="#">'.img_picto('', 'folder', 'class="paddingright"').$langs->trans("UndoExpandAll").'</a>&nbsp;';
+		print $form->textwithpicto('', $langs->trans('CollapseBatchDetailHelp'), 1, 'help', '');
 		print '</td>';
 		print '<td class="right" width="10%">'.$langs->trans("batch_number").'</td>';
 		if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {

From 1b7854e69825206acea25602c6d12e6a60247d25 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Mon, 26 Apr 2021 10:15:28 +0200
Subject: [PATCH 0013/1497] added security to suggestion page index.php
 (securekey and id encoded)

---
 htdocs/public/project/index.php | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/htdocs/public/project/index.php b/htdocs/public/project/index.php
index 03f26ed2f37..65237be02ac 100644
--- a/htdocs/public/project/index.php
+++ b/htdocs/public/project/index.php
@@ -78,7 +78,23 @@ $langs->loadLangs(array("main", "other", "dict", "bills", "companies", "errors",
 // No check on module enabled. Done later according to $validpaymentmethod
 
 $action = GETPOST('action', 'aZ09');
-$id = dol_decode(GETPOST('id'), $dolibarr_main_instance_unique_id);
+
+$encodedid = GETPOST('id');
+$id = dol_decode($encodedid, $dolibarr_main_instance_unique_id);
+
+// Getting 'securekey'.'id' from Post and decoding it
+$encodedsecurekeyandid = GETPOST('securekey', 'alpha');
+$securekeyandid = dol_decode($encodedsecurekeyandid, $dolibarr_main_instance_unique_id);
+
+// Securekey decomposition into pure securekey and id added at the end
+$securekey = substr($securekeyandid, 0, strlen($securekeyandid)-strlen($encodedid));
+$idgotfromsecurekey = dol_decode(substr($securekeyandid, -strlen($encodedid), strlen($encodedid)), $dolibarr_main_instance_unique_id);
+
+// We check if the securekey collected is OK and if the id collected is the same than the id in the securekey
+if ($securekey != $conf->global->EVENTORGANIZATION_SECUREKEY || $idgotfromsecurekey != $id) {
+	print $langs->trans('MissingOrBadSecureKey');
+	exit;
+}
 
 // Define $urlwithroot
 //$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
@@ -113,15 +129,6 @@ $replacemainarea = (empty($conf->dol_hide_leftmenu) ? '<div>' : '').'<div>';
 llxHeader($head, $langs->trans("PaymentForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody', $replacemainarea);
 
 
-// Show sandbox warning
-if ((empty($paymentmethod) || $paymentmethod == 'paypal') && !empty($conf->paypal->enabled) && (!empty($conf->global->PAYPAL_API_SANDBOX) || GETPOST('forcesandbox', 'int'))) {		// We can force sand box with param 'forcesandbox'
-	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Paypal'), '', 'warning');
-}
-if ((empty($paymentmethod) || $paymentmethod == 'stripe') && !empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox', 'int'))) {
-	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Stripe'), '', 'warning');
-}
-
-
 print '<span id="dolpaymentspan"></span>'."\n";
 print '<div class="center">'."\n";
 print '<form id="dolpaymentform" class="center" name="paymentform" action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";

From 45531d0f1aab5d18a0c63793239a7ab4b4fc0af2 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Mon, 26 Apr 2021 10:39:22 +0200
Subject: [PATCH 0014/1497] index suggestion page form added, needs to be
 improved to show only necessary fields

---
 htdocs/public/project/index.php | 600 +++++++++++++++++++++++++-------
 1 file changed, 478 insertions(+), 122 deletions(-)

diff --git a/htdocs/public/project/index.php b/htdocs/public/project/index.php
index 65237be02ac..f493b2a379f 100644
--- a/htdocs/public/project/index.php
+++ b/htdocs/public/project/index.php
@@ -1,10 +1,11 @@
 <?php
-/* Copyright (C) 2001-2002	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2006-2017	Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2009-2012	Regis Houssin			<regis.houssin@inodbox.com>
- * Copyright (C) 2018	    Juanjo Menent			<jmenent@2byte.es>
- * Copyright (C) 2018-2019	Thibault FOUCART	    <support@ptibogxiv.net>
- * Copyright (C) 2021		Waël Almoman	    	<info@almoman.com>
+/* Copyright (C) 2001-2002  Rodolphe Quiedeville    <rodolphe@quiedeville.org>
+ * Copyright (C) 2001-2002  Jean-Louis Bergamo      <jlb@j1b.org>
+ * Copyright (C) 2006-2013  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2012       Regis Houssin           <regis.houssin@inodbox.com>
+ * Copyright (C) 2012       J. Fernando Lagrange    <fernando@demo-tic.org>
+ * Copyright (C) 2018-2019  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018       Alexandre Spangaro      <aspangaro@open-dsi.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,21 +19,22 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
- *
- * For Paypal test: https://developer.paypal.com/
- * For Paybox test: ???
- * For Stripe test: Use credit card 4242424242424242 .More example on https://stripe.com/docs/testing
- *
- * Variants:
- * - When option STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION is on, we use the new PaymentIntent API
- * - When option STRIPE_USE_NEW_CHECKOUT is on, we use the new checkout API
- * - If no option set, we use old APIS (charge)
  */
 
 /**
- *     	\file       htdocs/public/payment/newpayment.php
- *		\ingroup    core
- *		\brief      File to offer a way to make a payment for a particular Dolibarr object
+ *	\file       htdocs/public/members/new.php
+ *	\ingroup    member
+ *	\brief      Example of form to add a new member
+ *
+ *  Note that you can add following constant to change behaviour of page
+ *  MEMBER_NEWFORM_AMOUNT               Default amount for auto-subscribe form
+ *  MEMBER_NEWFORM_EDITAMOUNT           0 or 1 = Amount can be edited
+ *  MEMBER_NEWFORM_PAYONLINE            Suggest payment with paypal, paybox or stripe
+ *  MEMBER_NEWFORM_DOLIBARRTURNOVER     Show field turnover (specific for dolibarr foundation)
+ *  MEMBER_URL_REDIRECT_SUBSCRIPTION    Url to redirect once subscribe submitted
+ *  MEMBER_NEWFORM_FORCETYPE            Force type of member
+ *  MEMBER_NEWFORM_FORCEMORPHY          Force nature of member (mor/phy)
+ *  MEMBER_NEWFORM_FORCECOUNTRYCODE     Force country
  */
 
 if (!defined('NOLOGIN')) {
@@ -47,41 +49,52 @@ if (!defined('NOIPCHECK')) {
 if (!defined('NOBROWSERNOTIF')) {
 	define('NOBROWSERNOTIF', '1');
 }
+if (!defined('NOIPCHECK')) {
+	define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
+}
 
 // For MultiCompany module.
-// Do not use GETPOST here, function is not defined and get of entity must be done before including main.inc.php
-$entity = (!empty($_GET['entity']) ? (int) $_GET['entity'] : (!empty($_POST['entity']) ? (int) $_POST['entity'] : (!empty($_GET['e']) ? (int) $_GET['e'] : (!empty($_POST['e']) ? (int) $_POST['e'] : 1))));
+// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
+// TODO This should be useless. Because entity must be retrieve from object ref and not from url.
+$entity = (!empty($_GET['entity']) ? (int) $_GET['entity'] : (!empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
 if (is_numeric($entity)) {
 	define("DOLENTITY", $entity);
 }
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-require_once DOL_DOCUMENT_ROOT.'/societe/class/societeaccount.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorbooth.class.php';
+require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorboothattendee.class.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-// Hook to be used by external payment modules (ie Payzen, ...)
-include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-$hookmanager = new HookManager($db);
-$hookmanager->initHooks(array('newpayment'));
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/paymentterm.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 
-// For encryption
 global $dolibarr_main_instance_unique_id;
+global $dolibarr_main_url_root;
 
-// Load translation files
-$langs->loadLangs(array("main", "other", "dict", "bills", "companies", "errors", "paybox", "paypal", "stripe")); // File with generic data
-
-// Security check
-// No check on module enabled. Done later according to $validpaymentmethod
-
+// Init vars
+$errmsg = '';
+$num = 0;
+$error = 0;
+$backtopage = GETPOST('backtopage', 'alpha');
 $action = GETPOST('action', 'aZ09');
 
+$email = GETPOST("email");
+$societe = GETPOST("societe");
+
+// Getting id from Post and decoding it
 $encodedid = GETPOST('id');
 $id = dol_decode($encodedid, $dolibarr_main_instance_unique_id);
 
+$project = new Project($db);
+$resultproject = $project->fetch($id);
+if ($resultproject < 0) {
+	$error++;
+	$errmsg .= $project->error;
+}
+
 // Getting 'securekey'.'id' from Post and decoding it
 $encodedsecurekeyandid = GETPOST('securekey', 'alpha');
 $securekeyandid = dol_decode($encodedsecurekeyandid, $dolibarr_main_instance_unique_id);
@@ -96,108 +109,447 @@ if ($securekey != $conf->global->EVENTORGANIZATION_SECUREKEY || $idgotfromsecure
 	exit;
 }
 
-// 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. For Paypal payment, we can use internal URL like localhost.
+// Load translation files
+$langs->loadLangs(array("main", "companies", "install", "other", "eventorganization"));
 
-$project = new Project($db);
-$resultproject = $project->fetch($id);
-if ($resultproject < 0) {
-	$error++;
-	$errmsg .= $project->error;
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('publicnewmembercard', 'globalcard'));
+
+$extrafields = new ExtraFields($db);
+
+$user->loadDefaultValues();
+
+
+/**
+ * Show header for new member
+ *
+ * @param 	string		$title				Title
+ * @param 	string		$head				Head array
+ * @param 	int    		$disablejs			More content into html header
+ * @param 	int    		$disablehead		More content into html header
+ * @param 	array  		$arrayofjs			Array of complementary js files
+ * @param 	array  		$arrayofcss			Array of complementary css files
+ * @return	void
+ */
+function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $arrayofjs = '', $arrayofcss = '')
+{
+	global $user, $conf, $langs, $mysoc;
+
+	top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss); // Show html headers
+
+	print '<body id="mainbody" class="publicnewmemberform">';
+
+	// Define urllogo
+	$urllogo = DOL_URL_ROOT.'/theme/common/login_logo.png';
+
+	if (!empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small)) {
+		$urllogo = DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_small);
+	} elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo)) {
+		$urllogo = DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/'.$mysoc->logo);
+	} elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.svg')) {
+		$urllogo = DOL_URL_ROOT.'/theme/dolibarr_logo.svg';
+	}
+
+	print '<div class="center">';
+	// Output html code for logo
+	if ($urllogo) {
+		print '<div class="backgreypublicpayment">';
+		print '<div class="logopublicpayment">';
+		print '<img id="dolpaymentlogo" src="'.$urllogo.'"';
+		print '>';
+		print '</div>';
+		if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
+			print '<div class="poweredbypublicpayment opacitymedium right"><a class="poweredbyhref" href="https://www.dolibarr.org?utm_medium=website&utm_source=poweredby" target="dolibarr" rel="noopener">'.$langs->trans("PoweredBy").'<br><img class="poweredbyimg" src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
+		}
+		print '</div>';
+	}
+	print '</div>';
+
+	print '<div class="divmainbodylarge">';
 }
 
+/**
+ * Show footer for new member
+ *
+ * @return	void
+ */
+function llxFooterVierge()
+{
+	print '</div>';
+
+	printCommonFooter('public');
+
+	print "</body>\n";
+	print "</html>\n";
+}
+
+
+
 /*
  * Actions
  */
+global $mysoc;
+$parameters = array();
+// Note that $action and $object may have been modified by some hooks
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action);
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
+
+// Action called when page is submitted
+if (empty($reshook) && $action == 'add') {
+	$error = 0;
+
+	$urlback = '';
+
+	$db->begin();
+
+	if (!GETPOST("email")) {
+		$error++;
+		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Email"))."<br>\n";
+	}
+	// If the price has been set, name is required for the invoice
+	if (!GETPOST("societe") && !empty(floatval($project->price_registration))) {
+		$error++;
+		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Societe"))."<br>\n";
+	}
+	if (GETPOST("email") && !isValidEmail(GETPOST("email"))) {
+		$error++;
+		$langs->load("errors");
+		$errmsg .= $langs->trans("ErrorBadEMail", GETPOST("email"))."<br>\n";
+	}
+	if (!GETPOST("country_id")) {
+		$error++;
+		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Country"))."<br>\n";
+	}
+
+	if (!$error) {
+		// Check if attendee already exists (by email and for this event)
+		$confattendee = new ConferenceOrBoothAttendee($db);
+		$resultfetchconfattendee = $confattendee->fetchAll('', '', 0, 0, array('t.fk_actioncomm'=>$id, 'customsql'=>'t.email="'.$email.'"'));
+		if ($resultfetchconfattendee > 0 && count($resultfetchconfattendee)>0) {
+			// Found confattendee
+			$confattendee = array_shift($resultfetchconfattendee);
+		} else {
+			// Need to create a confattendee
+			$confattendee->date_subscription = dol_now();
+			$confattendee->email = $email;
+			$confattendee->fk_actioncomm = $id;
+			$resultconfattendee = $confattendee->create($user);
+			if ($resultconfattendee < 0) {
+				$error++;
+				$errmsg .= $confattendee->error;
+			}
+		}
+		// At this point, we have an attendee. It may not be linked to a thirdparty if we just created it
+
+		// If the attendee has already paid
+		if ($confattendee->status == 1) {
+			$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?securekey='.dol_encode($conf->global->EVENTORGANIZATION_SECUREKEY, $dolibarr_main_instance_unique_id);
+			Header("Location: ".$redirection);
+			exit;
+		}
+		// Getting the thirdparty or creating it
+		$thirdparty = new Societe($db);
+		// Fetch using fk_soc if the attendee was already existing
+		if (!empty($confattendee->fk_soc)) {
+			$resultfetchthirdparty = $thirdparty->fetch($confattendee->fk_soc);
+		} else {
+			// Fetch using the input field by user if we just created the attendee
+			if (!empty($societe)) {
+				$resultfetchthirdparty = $thirdparty->fetch('', $societe);
+				if ($resultfetchthirdparty<=0) {
+					// Need to create a new one (not found or multiple with the same name)
+					$resultfetchthirdparty = 0;
+				} else {
+					// We found an unique result with that name, so we put in in fk_soc of attendee
+					$confattendee->fk_soc = $thirdparty->id;
+					$confattendee->update($user);
+				}
+			} else {
+				// Need to create a thirdparty (put number>0 if we do not want to create a thirdparty for free-conferences)
+				$resultfetchthirdparty = 0;
+			}
+		}
+		if ($resultfetchthirdparty<0) {
+			$error++;
+			$errmsg .= $thirdparty->error;
+		} elseif ($resultfetchthirdparty==0) {
+			// creation of a new thirdparty
+			if (!empty($societe)) {
+				$thirdparty->name     = $societe;
+			} else {
+				$thirdparty->name     = $email;
+			}
+			$thirdparty->address      = GETPOST("address");
+			$thirdparty->zip          = GETPOST("zipcode");
+			$thirdparty->town         = GETPOST("town");
+			$thirdparty->client       = 2;
+			$thirdparty->fournisseur  = 0;
+			$thirdparty->country_id   = GETPOST("country_id", 'int');
+			$thirdparty->state_id     = GETPOST("state_id", 'int');
+			$thirdparty->email        = $email;
+
+			// Load object modCodeTiers
+			$module = (!empty($conf->global->SOCIETE_CODECLIENT_ADDON) ? $conf->global->SOCIETE_CODECLIENT_ADDON : 'mod_codeclient_leopard');
+			if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php') {
+				$module = substr($module, 0, dol_strlen($module) - 4);
+			}
+			$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
+			foreach ($dirsociete as $dirroot) {
+				$res = dol_include_once($dirroot.$module.'.php');
+				if ($res) {
+					break;
+				}
+			}
+			$modCodeClient = new $module($db);
+
+			if (empty($tmpcode) && !empty($modCodeClient->code_auto)) {
+				$tmpcode = $modCodeClient->getNextValue($thirdparty, 0);
+			}
+			$thirdparty->code_client = $tmpcode;
+			$readythirdparty = $thirdparty->create($user);
+			if ($readythirdparty <0) {
+				$error++;
+				$errmsg .= $thirdparty->error;
+			} else {
+				$thirdparty->country_code = getCountry($thirdparty->country_id, 2, $db, $langs);
+				$thirdparty->country      = getCountry($thirdparty->country_code, 0, $db, $langs);
+				$confattendee->fk_soc     = $thirdparty->id;
+				$confattendee->update($user);
+			}
+		}
+	}
+
+	if (!$error) {
+		$db->commit();
+		if (!empty(floatval($project->price_registration))) {
+			$productforinvoicerow = new Product($db);
+			$resultprod = $productforinvoicerow->fetch($conf->global->SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION);
+			if ($resultprod < 0) {
+				$error++;
+				$errmsg .= $productforinvoicerow->error;
+			} else {
+				$facture = new Facture($db);
+				$facture->type = Facture::TYPE_STANDARD;
+				$facture->socid = $thirdparty->id;
+				$facture->paye = 0;
+				$facture->date = dol_now();
+				$facture->cond_reglement_id = $confattendee->cond_reglement_id;
+
+				if (empty($facture->cond_reglement_id)) {
+					$paymenttermstatic = new PaymentTerm($confattendee->db);
+					$facture->cond_reglement_id = $paymenttermstatic->getDefaultId();
+					if (empty($facture->cond_reglement_id)) {
+						$error++;
+						$confattendee->error = 'ErrorNoPaymentTermRECEPFound';
+						$confattendee->errors[] = $confattendee->error;
+					}
+				}
+				$resultfacture = $facture->create($user);
+				if ($resultfacture <= 0) {
+					$confattendee->error = $facture->error;
+					$confattendee->errors = $facture->errors;
+					$error++;
+				} else {
+					$facture->add_object_linked($confattendee->element, $confattendee->id);
+				}
+			}
+
+			if (!$error) {
+				// Add line to draft invoice
+				$vattouse = get_default_tva($mysoc, $thirdparty, $productforinvoicerow->id);
+				$result = $facture->addline($langs->trans("ConferenceAttendeeFee", $conference->label, dol_print_date($conference->datep, '%d/%m/%y %H:%M:%S'), dol_print_date($conference->datep2, '%d/%m/%y %H:%M:%S')), floatval($project->price_registration), 1, $vattouse, 0, 0, $productforinvoicerow->id, 0, dol_now(), '', 0, 0, '', 'HT', 0, 1);
+				if ($result <= 0) {
+					$confattendee->error = $facture->error;
+					$confattendee->errors = $facture->errors;
+					$error++;
+				}
+				if (!$error) {
+					$valid = true;
+					$sourcetouse = 'conferencesubscription';
+					$reftouse = $facture->id;
+					$redirection = $dolibarr_main_url_root.'/public/payment/newpayment.php?source='.$sourcetouse.'&ref='.$reftouse;
+					if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
+						if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
+							$redirection .= '&securekey='.dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $sourcetouse . $reftouse, 2); // Use the source in the hash to avoid duplicates if the references are identical
+						} else {
+							$redirection .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
+						}
+					}
+					Header("Location: ".$redirection);
+					exit;
+				}
+			}
+		} else {
+			// No price has been set
+			// Validating the subscription
+			$confattendee->setStatut(1);
+
+			// Sending mail
+			require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+			include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+			$formmail = new FormMail($db);
+			// Set output language
+			$outputlangs = new Translate('', $conf);
+			$outputlangs->setDefaultLang(empty($thirdparty->default_lang) ? $mysoc->default_lang : $thirdparty->default_lang);
+			// Load traductions files required by page
+			$outputlangs->loadLangs(array("main", "members"));
+			// Get email content from template
+			$arraydefaultmessage = null;
+
+			$labeltouse = $conf->global->EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT;
+			if (!empty($labeltouse)) {
+				$arraydefaultmessage = $formmail->getEMailTemplate($db, 'eventorganization_send', $user, $outputlangs, $labeltouse, 1, '');
+			}
+
+			if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
+				$subject = $arraydefaultmessage->topic;
+				$msg     = $arraydefaultmessage->content;
+			}
+
+			$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $thirdparty);
+			complete_substitutions_array($substitutionarray, $outputlangs, $object);
+
+			$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
+			$texttosend = make_substitutions($msg, $substitutionarray, $outputlangs);
+
+			$sendto = $thirdparty->email;
+			$from = $conf->global->MAILING_EMAIL_FROM;
+			$urlback = $_SERVER["REQUEST_URI"];
+
+			$ishtml = dol_textishtml($texttosend); // May contain urls
+
+			$mailfile = new CMailFile($subjecttosend, $sendto, $from, $texttosend, array(), array(), array(), '', '', 0, $ishtml);
+
+			$result = $mailfile->sendfile();
+			if ($result) {
+				dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_payment');
+			} else {
+				dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
+			}
+
+			$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?securekey='.dol_encode($conf->global->EVENTORGANIZATION_SECUREKEY, $dolibarr_main_instance_unique_id);
+			Header("Location: ".$redirection);
+			exit;
+		}
+		//Header("Location: ".$urlback);
+		//exit;
+	} else {
+		$db->rollback();
+	}
+}
 
 
 /*
  * View
  */
 
-$head = '';
-if (!empty($conf->global->ONLINE_PAYMENT_CSS_URL)) {
-	$head = '<link rel="stylesheet" type="text/css" href="'.$conf->global->ONLINE_PAYMENT_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
-}
+$form = new Form($db);
+$formcompany = new FormCompany($db);
 
-$conf->dol_hide_topmenu = 1;
-$conf->dol_hide_leftmenu = 1;
-
-$replacemainarea = (empty($conf->dol_hide_leftmenu) ? '<div>' : '').'<div>';
-llxHeader($head, $langs->trans("PaymentForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody', $replacemainarea);
+llxHeaderVierge($langs->trans("NewSuggestion"));
 
 
-print '<span id="dolpaymentspan"></span>'."\n";
-print '<div class="center">'."\n";
-print '<form id="dolpaymentform" class="center" name="paymentform" action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";
-print '<input type="hidden" name="token" value="'.newToken().'">'."\n";
-print '<input type="hidden" name="action" value="dopayment">'."\n";
-print '<input type="hidden" name="tag" value="'.GETPOST("tag", 'alpha').'">'."\n";
-print '<input type="hidden" name="suffix" value="'.dol_escape_htmltag($suffix).'">'."\n";
-print '<input type="hidden" name="securekey" value="'.dol_escape_htmltag($SECUREKEY).'">'."\n";
-print '<input type="hidden" name="e" value="'.$entity.'" />';
-print '<input type="hidden" name="forcesandbox" value="'.GETPOST('forcesandbox', 'int').'" />';
-print "\n";
+print load_fiche_titre($langs->trans("NewSuggestion"), '', '', 0, 0, 'center');
 
 
-// Show logo (search order: logo defined by PAYMENT_LOGO_suffix, then PAYMENT_LOGO, then small company logo, large company logo, theme logo, common logo)
-// Define logo and logosmall
-$logosmall = $mysoc->logo_small;
-$logo = $mysoc->logo;
-$paramlogo = 'ONLINE_PAYMENT_LOGO_'.$suffix;
-if (!empty($conf->global->$paramlogo)) {
-	$logosmall = $conf->global->$paramlogo;
-} elseif (!empty($conf->global->ONLINE_PAYMENT_LOGO)) {
-	$logosmall = $conf->global->ONLINE_PAYMENT_LOGO;
-}
-//print '<!-- Show logo (logosmall='.$logosmall.' logo='.$logo.') -->'."\n";
-// Define urllogo
-$urllogo = '';
-$urllogofull = '';
-if (!empty($logosmall) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$logosmall)) {
-	$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file='.urlencode('logos/thumbs/'.$logosmall);
-	$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/thumbs/'.$logosmall);
-} elseif (!empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo)) {
-	$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file='.urlencode('logos/'.$logo);
-	$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/'.$logo);
-}
+print '<div align="center">';
+print '<div id="divsubscribe">';
+print '<div class="center subscriptionformhelptext justify">';
 
-// Output html code for logo
-if ($urllogo) {
-	print '<div class="backgreypublicpayment">';
-	print '<div class="logopublicpayment">';
-	print '<img id="dolpaymentlogo" src="'.$urllogo.'"';
-	print '>';
-	print '</div>';
-	if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
-		print '<div class="poweredbypublicpayment opacitymedium right"><a class="poweredbyhref" href="https://www.dolibarr.org?utm_medium=website&utm_source=poweredby" target="dolibarr" rel="noopener">'.$langs->trans("PoweredBy").'<br><img class="poweredbyimg" src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
-	}
-	print '</div>';
-}
-
-print '<table id="dolpaymenttable" summary="Payment form" class="center">'."\n";
-
-$text  = '<tr><td class="textpublicpayment"><br><strong>'.$langs->trans("EvntOrgRegistrationWelcomeMessage").'</strong></td></tr>'."\n";
+// Welcome message
+$text  = '<tr><td class="textpublicpayment"><strong>'.$langs->trans("EvntOrgRegistrationWelcomeMessage").'</strong></td></tr></br>';
 $text .= '<tr><td class="textpublicpayment">'.$langs->trans("EvntOrgRegistrationHelpMessage").' '.$id.'.<br><br></td></tr>'."\n";
-$text .= '<tr><td class="textpublicpayment">'.$project->note_public.'<br><br></td></tr>'."\n";;
-
+$text .= '<tr><td class="textpublicpayment">'.$project->note_public.'</td></tr>'."\n";;
 print $text;
+print '</div>';
 
-// Output payment summary form
-print '<tr><td align="center">';
+dol_htmloutput_errors($errmsg);
 
-$found = false;
-$error = 0;
-$var = false;
+// Print form
+print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST" name="newmember">'."\n";
+print '<input type="hidden" name="token" value="'.newToken().'" / >';
+print '<input type="hidden" name="entity" value="'.$entity.'" />';
+print '<input type="hidden" name="action" value="add" />';
+print '<input type="hidden" name="id" value="'.$encodedid.'" />';
+print '<input type="hidden" name="securekey" value="'.$encodedsecurekeyandid.'" />';
 
-$object = null;
+print '<br>';
 
-print "\n";
+print '<br><span class="opacitymedium">'.$langs->trans("FieldsWithAreMandatory", '*').'</span><br>';
+//print $langs->trans("FieldsWithIsForPublic",'**').'<br>';
+
+print dol_get_fiche_head('');
+
+print '<script type="text/javascript">
+jQuery(document).ready(function () {
+    jQuery(document).ready(function () {
+        jQuery("#selectcountry_id").change(function() {
+           document.newmember.action.value="create";
+           document.newmember.submit();
+        });
+    });
+});
+</script>';
+
+print '<table class="border" summary="form to subscribe" id="tablesubscribe">'."\n";
+
+// Email
+print '<tr><td>'.$langs->trans("Email").'<FONT COLOR="red">*</FONT></td><td><input type="text" name="email" maxlength="255" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('email')).'"></td></tr>'."\n";
+// Company
+print '<tr id="trcompany" class="trcompany"><td>'.$langs->trans("Company");
+if (!empty(floatval($project->price_registration))) {
+	print '<FONT COLOR="red">*</FONT>';
+}
+print ' </td><td><input type="text" name="societe" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('societe')).'"></td></tr>'."\n";
+// Address
+print '<tr><td>'.$langs->trans("Address").'</td><td>'."\n";
+print '<textarea name="address" id="address" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.dol_escape_htmltag(GETPOST('address', 'restricthtml'), 0, 1).'</textarea></td></tr>'."\n";
+// Zip / Town
+print '<tr><td>'.$langs->trans('Zip').' / '.$langs->trans('Town').'</td><td>';
+print $formcompany->select_ziptown(GETPOST('zipcode'), 'zipcode', array('town', 'selectcountry_id', 'state_id'), 6, 1);
+print ' / ';
+print $formcompany->select_ziptown(GETPOST('town'), 'town', array('zipcode', 'selectcountry_id', 'state_id'), 0, 1);
+print '</td></tr>';
+// Country
+print '<tr><td>'.$langs->trans('Country').'<FONT COLOR="red">*</FONT></td><td>';
+$country_id = GETPOST('country_id');
+if (!$country_id && !empty($conf->global->MEMBER_NEWFORM_FORCECOUNTRYCODE)) {
+	$country_id = getCountry($conf->global->MEMBER_NEWFORM_FORCECOUNTRYCODE, 2, $db, $langs);
+}
+if (!$country_id && !empty($conf->geoipmaxmind->enabled)) {
+	$country_code = dol_user_country();
+	//print $country_code;
+	if ($country_code) {
+		$new_country_id = getCountry($country_code, 3, $db, $langs);
+		//print 'xxx'.$country_code.' - '.$new_country_id;
+		if ($new_country_id) {
+			$country_id = $new_country_id;
+		}
+	}
+}
+$country_code = getCountry($country_id, 2, $db, $langs);
+print $form->select_country($country_id, 'country_id');
+print '</td></tr>';
+// State
+if (empty($conf->global->SOCIETE_DISABLE_STATE)) {
+	print '<tr><td>'.$langs->trans('State').'</td><td>';
+	if ($country_code) {
+		print $formcompany->select_state(GETPOST("state_id"), $country_code);
+	} else {
+		print '';
+	}
+	print '</td></tr>';
+}
+
+print "</table>\n";
+
+print dol_get_fiche_end();
 
 
 // Show all action buttons
+print '<div class="center">';
 print '<br>';
 // Output introduction text
 if ($project->accept_conference_suggestions) {
@@ -209,20 +561,24 @@ print '<br><br>';
 if ($project->accept_booth_suggestions) {
 	print '<input type="submit" value="'.$langs->trans("SuggestBooth").'" id="suggestbooth" class="button">';
 }
+print '</div>';
+
+print '<br><br>';
+
+// Save
+print '<div class="center">';
+print '<input type="submit" value="'.$langs->trans("Submit").'" id="submitsave" class="button">';
+if (!empty($backtopage)) {
+	print ' &nbsp; &nbsp; <input type="submit" value="'.$langs->trans("Cancel").'" id="submitcancel" class="button button-cancel">';
+}
+print '</div>';
 
 
-
-print '</td></tr>'."\n";
-
-print '</table>'."\n";
-
-print '</form>'."\n";
-print '</div>'."\n";
-print '<br>';
+print "</form>\n";
+print "<br>";
+print '</div></div>';
 
 
-htmlPrintOnlinePaymentFooter($mysoc, $langs, 1, $suffix, $object);
-
-llxFooter('', 'public');
+llxFooterVierge();
 
 $db->close();

From bced3d60dd17cae8f3cb555f471b654aa350ed57 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Mon, 26 Apr 2021 11:11:23 +0200
Subject: [PATCH 0015/1497] added required name to the form

---
 htdocs/public/project/index.php | 200 ++++----------------------------
 1 file changed, 23 insertions(+), 177 deletions(-)

diff --git a/htdocs/public/project/index.php b/htdocs/public/project/index.php
index f493b2a379f..3aeab9997b5 100644
--- a/htdocs/public/project/index.php
+++ b/htdocs/public/project/index.php
@@ -208,8 +208,11 @@ if (empty($reshook) && $action == 'add') {
 		$error++;
 		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Email"))."<br>\n";
 	}
-	// If the price has been set, name is required for the invoice
-	if (!GETPOST("societe") && !empty(floatval($project->price_registration))) {
+	if (!GETPOST("lastname")) {
+		$error++;
+		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Name"))."<br>\n";
+	}
+	if (!GETPOST("societe")) {
 		$error++;
 		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Societe"))."<br>\n";
 	}
@@ -224,63 +227,12 @@ if (empty($reshook) && $action == 'add') {
 	}
 
 	if (!$error) {
-		// Check if attendee already exists (by email and for this event)
-		$confattendee = new ConferenceOrBoothAttendee($db);
-		$resultfetchconfattendee = $confattendee->fetchAll('', '', 0, 0, array('t.fk_actioncomm'=>$id, 'customsql'=>'t.email="'.$email.'"'));
-		if ($resultfetchconfattendee > 0 && count($resultfetchconfattendee)>0) {
-			// Found confattendee
-			$confattendee = array_shift($resultfetchconfattendee);
-		} else {
-			// Need to create a confattendee
-			$confattendee->date_subscription = dol_now();
-			$confattendee->email = $email;
-			$confattendee->fk_actioncomm = $id;
-			$resultconfattendee = $confattendee->create($user);
-			if ($resultconfattendee < 0) {
-				$error++;
-				$errmsg .= $confattendee->error;
-			}
-		}
-		// At this point, we have an attendee. It may not be linked to a thirdparty if we just created it
-
-		// If the attendee has already paid
-		if ($confattendee->status == 1) {
-			$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?securekey='.dol_encode($conf->global->EVENTORGANIZATION_SECUREKEY, $dolibarr_main_instance_unique_id);
-			Header("Location: ".$redirection);
-			exit;
-		}
 		// Getting the thirdparty or creating it
 		$thirdparty = new Societe($db);
-		// Fetch using fk_soc if the attendee was already existing
-		if (!empty($confattendee->fk_soc)) {
-			$resultfetchthirdparty = $thirdparty->fetch($confattendee->fk_soc);
-		} else {
-			// Fetch using the input field by user if we just created the attendee
-			if (!empty($societe)) {
-				$resultfetchthirdparty = $thirdparty->fetch('', $societe);
-				if ($resultfetchthirdparty<=0) {
-					// Need to create a new one (not found or multiple with the same name)
-					$resultfetchthirdparty = 0;
-				} else {
-					// We found an unique result with that name, so we put in in fk_soc of attendee
-					$confattendee->fk_soc = $thirdparty->id;
-					$confattendee->update($user);
-				}
-			} else {
-				// Need to create a thirdparty (put number>0 if we do not want to create a thirdparty for free-conferences)
-				$resultfetchthirdparty = 0;
-			}
-		}
-		if ($resultfetchthirdparty<0) {
-			$error++;
-			$errmsg .= $thirdparty->error;
-		} elseif ($resultfetchthirdparty==0) {
-			// creation of a new thirdparty
-			if (!empty($societe)) {
-				$thirdparty->name     = $societe;
-			} else {
-				$thirdparty->name     = $email;
-			}
+		$resultfetchthirdparty = $thirdparty->fetch('', $societe);
+		if ($resultfetchthirdparty<=0) {
+			// Need to create a new one (not found or multiple with the same name)
+			$thirdparty->name     = $societe;
 			$thirdparty->address      = GETPOST("address");
 			$thirdparty->zip          = GETPOST("zipcode");
 			$thirdparty->town         = GETPOST("town");
@@ -315,126 +267,16 @@ if (empty($reshook) && $action == 'add') {
 			} else {
 				$thirdparty->country_code = getCountry($thirdparty->country_id, 2, $db, $langs);
 				$thirdparty->country      = getCountry($thirdparty->country_code, 0, $db, $langs);
-				$confattendee->fk_soc     = $thirdparty->id;
-				$confattendee->update($user);
 			}
 		}
-	}
-
-	if (!$error) {
+		// From there we have a thirdparty, now looking for the contact
+		$contact = new Contact($db);
+		$resultcontact = $contact->fetch('', $user, '', $email);
+		if ($resultcontact<=0) {
+			// Need to create a contact
+		}
+		// We have the contact and the thirdparty
 		$db->commit();
-		if (!empty(floatval($project->price_registration))) {
-			$productforinvoicerow = new Product($db);
-			$resultprod = $productforinvoicerow->fetch($conf->global->SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION);
-			if ($resultprod < 0) {
-				$error++;
-				$errmsg .= $productforinvoicerow->error;
-			} else {
-				$facture = new Facture($db);
-				$facture->type = Facture::TYPE_STANDARD;
-				$facture->socid = $thirdparty->id;
-				$facture->paye = 0;
-				$facture->date = dol_now();
-				$facture->cond_reglement_id = $confattendee->cond_reglement_id;
-
-				if (empty($facture->cond_reglement_id)) {
-					$paymenttermstatic = new PaymentTerm($confattendee->db);
-					$facture->cond_reglement_id = $paymenttermstatic->getDefaultId();
-					if (empty($facture->cond_reglement_id)) {
-						$error++;
-						$confattendee->error = 'ErrorNoPaymentTermRECEPFound';
-						$confattendee->errors[] = $confattendee->error;
-					}
-				}
-				$resultfacture = $facture->create($user);
-				if ($resultfacture <= 0) {
-					$confattendee->error = $facture->error;
-					$confattendee->errors = $facture->errors;
-					$error++;
-				} else {
-					$facture->add_object_linked($confattendee->element, $confattendee->id);
-				}
-			}
-
-			if (!$error) {
-				// Add line to draft invoice
-				$vattouse = get_default_tva($mysoc, $thirdparty, $productforinvoicerow->id);
-				$result = $facture->addline($langs->trans("ConferenceAttendeeFee", $conference->label, dol_print_date($conference->datep, '%d/%m/%y %H:%M:%S'), dol_print_date($conference->datep2, '%d/%m/%y %H:%M:%S')), floatval($project->price_registration), 1, $vattouse, 0, 0, $productforinvoicerow->id, 0, dol_now(), '', 0, 0, '', 'HT', 0, 1);
-				if ($result <= 0) {
-					$confattendee->error = $facture->error;
-					$confattendee->errors = $facture->errors;
-					$error++;
-				}
-				if (!$error) {
-					$valid = true;
-					$sourcetouse = 'conferencesubscription';
-					$reftouse = $facture->id;
-					$redirection = $dolibarr_main_url_root.'/public/payment/newpayment.php?source='.$sourcetouse.'&ref='.$reftouse;
-					if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
-						if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
-							$redirection .= '&securekey='.dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $sourcetouse . $reftouse, 2); // Use the source in the hash to avoid duplicates if the references are identical
-						} else {
-							$redirection .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
-						}
-					}
-					Header("Location: ".$redirection);
-					exit;
-				}
-			}
-		} else {
-			// No price has been set
-			// Validating the subscription
-			$confattendee->setStatut(1);
-
-			// Sending mail
-			require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-			include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-			$formmail = new FormMail($db);
-			// Set output language
-			$outputlangs = new Translate('', $conf);
-			$outputlangs->setDefaultLang(empty($thirdparty->default_lang) ? $mysoc->default_lang : $thirdparty->default_lang);
-			// Load traductions files required by page
-			$outputlangs->loadLangs(array("main", "members"));
-			// Get email content from template
-			$arraydefaultmessage = null;
-
-			$labeltouse = $conf->global->EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT;
-			if (!empty($labeltouse)) {
-				$arraydefaultmessage = $formmail->getEMailTemplate($db, 'eventorganization_send', $user, $outputlangs, $labeltouse, 1, '');
-			}
-
-			if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
-				$subject = $arraydefaultmessage->topic;
-				$msg     = $arraydefaultmessage->content;
-			}
-
-			$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $thirdparty);
-			complete_substitutions_array($substitutionarray, $outputlangs, $object);
-
-			$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
-			$texttosend = make_substitutions($msg, $substitutionarray, $outputlangs);
-
-			$sendto = $thirdparty->email;
-			$from = $conf->global->MAILING_EMAIL_FROM;
-			$urlback = $_SERVER["REQUEST_URI"];
-
-			$ishtml = dol_textishtml($texttosend); // May contain urls
-
-			$mailfile = new CMailFile($subjecttosend, $sendto, $from, $texttosend, array(), array(), array(), '', '', 0, $ishtml);
-
-			$result = $mailfile->sendfile();
-			if ($result) {
-				dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_payment');
-			} else {
-				dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
-			}
-
-			$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?securekey='.dol_encode($conf->global->EVENTORGANIZATION_SECUREKEY, $dolibarr_main_instance_unique_id);
-			Header("Location: ".$redirection);
-			exit;
-		}
-		//Header("Location: ".$urlback);
-		//exit;
 	} else {
 		$db->rollback();
 	}
@@ -495,6 +337,10 @@ jQuery(document).ready(function () {
 
 print '<table class="border" summary="form to subscribe" id="tablesubscribe">'."\n";
 
+// Name
+print '<tr><td><label for="lastname">'.$langs->trans("Lastname").' / '.$langs->trans("Label").'<FONT COLOR="red">*</FONT></label></td>';
+print '<td colspan="3"><input name="lastname" id="lastname" type="text" class="maxwidth100onsmartphone" maxlength="80" value="'.dol_escape_htmltag(GETPOST("lastname", 'alpha') ?GETPOST("lastname", 'alpha') : $object->lastname).'" autofocus="autofocus"></td>';
+print '</tr>';
 // Email
 print '<tr><td>'.$langs->trans("Email").'<FONT COLOR="red">*</FONT></td><td><input type="text" name="email" maxlength="255" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('email')).'"></td></tr>'."\n";
 // Company
@@ -553,13 +399,13 @@ print '<div class="center">';
 print '<br>';
 // Output introduction text
 if ($project->accept_conference_suggestions) {
-	print '<input type="submit" value="'.$langs->trans("SuggestConference").'" id="suggestconference" class="button">';
+	print '<input type="submit" value="'.$langs->trans("SuggestConference").'" name="suggestconference"  id="suggestconference" class="button">';
 	print '<br><br>';
 }
-print '<input type="submit" value="'.$langs->trans("ViewAndVote").'" id="viewandvote" class="button">';
+print '<input type="submit" value="'.$langs->trans("ViewAndVote").'" name="viewandvote" id="viewandvote" class="button">';
 print '<br><br>';
 if ($project->accept_booth_suggestions) {
-	print '<input type="submit" value="'.$langs->trans("SuggestBooth").'" id="suggestbooth" class="button">';
+	print '<input type="submit" value="'.$langs->trans("SuggestBooth").'" name="suggestbooth" id="suggestbooth" class="button">';
 }
 print '</div>';
 

From de63c93ad4c1b832e17d324fc188d59df660b338 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Mon, 26 Apr 2021 12:09:39 +0200
Subject: [PATCH 0016/1497] wip on creating the contact

---
 htdocs/public/project/index.php | 50 +++++++++++++++++++++++++++++++--
 1 file changed, 48 insertions(+), 2 deletions(-)

diff --git a/htdocs/public/project/index.php b/htdocs/public/project/index.php
index 3aeab9997b5..0eb2acd209f 100644
--- a/htdocs/public/project/index.php
+++ b/htdocs/public/project/index.php
@@ -274,9 +274,55 @@ if (empty($reshook) && $action == 'add') {
 		$resultcontact = $contact->fetch('', $user, '', $email);
 		if ($resultcontact<=0) {
 			// Need to create a contact
+			$contact->socid = $thirdparty->id;
+			$contact->lastname = (string) GETPOST("lastname", 'alpha');
+			$contact->firstname = (string) GETPOST("firstname", 'alpha');
+			$contact->address = (string) GETPOST("address", 'alpha');
+			$contact->zip = (string) GETPOST("zipcode", 'alpha');
+			$contact->town = (string) GETPOST("town", 'alpha');
+			$contact->country_id = (int) GETPOST("country_id", 'int');
+			$contact->state_id = (int) GETPOST("state_id", 'int');
+			$contact->email = $email;
+			$contact->statut = 1; //Default status to Actif
+
+			$resultcreatecontact = $contact->create($user);
+			if ($resultcreatecontact<0) {
+				$error++;
+				$errmsg .= $contact->error;
+			}
+		}
+
+		if (!$error) {
+			// Adding supplier tag
+			$category = new Categorie($db);
+			if (GETPOST("suggestconference")) {
+				// Conference case
+				$resultcategory = $category->fetch($conf->global->EVENTORGANIZATION_CATEG_THIRDPARTY_CONF);
+			} else {
+				// Booth case
+				$resultcategory = $category->fetch($conf->global->EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH);
+			}
+
+			if ($resultcategory<0) {
+				$error++;
+				$errmsg .= $category->error;
+			} else {
+				$contact->setCategoriesCommon($category->id, Categorie::TYPE_CONTACT, false);
+				$resultupdate  = $contact->update($contact->id);
+				if ($resultupdate <= 0) {
+					$error++;
+					$errmsg .= $contact->error;
+				}
+			}
+		}
+
+		if (!$error) {
+			// We have the contact and the thirdparty
+
+
+
+			$db->commit();
 		}
-		// We have the contact and the thirdparty
-		$db->commit();
 	} else {
 		$db->rollback();
 	}

From 1b4b93bc6aca0ace30a9126fa8e6f62d3f599b50 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Mon, 26 Apr 2021 14:28:37 +0200
Subject: [PATCH 0017/1497] thirdparty/contact creation seems ok

---
 htdocs/core/class/commonobject.class.php |  2 +-
 htdocs/public/project/index.php          | 61 +++++++++++-------------
 2 files changed, 29 insertions(+), 34 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 2c9e81b369e..18868f70271 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -9156,6 +9156,7 @@ abstract class CommonObject
 			if ($c->fetch($add) > 0) {
 				$result = $c->add_type($this, $type_categ);
 				if ($result < 0) {
+					var_dump($result);
 					$error++;
 					$this->error = $c->error;
 					$this->errors = $c->errors;
@@ -9165,7 +9166,6 @@ abstract class CommonObject
 				}
 			}
 		}
-
 		return $error ? -1 * $error : $ok;
 	}
 
diff --git a/htdocs/public/project/index.php b/htdocs/public/project/index.php
index 0eb2acd209f..ec8f0eca312 100644
--- a/htdocs/public/project/index.php
+++ b/htdocs/public/project/index.php
@@ -65,8 +65,9 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorbooth.class.php';
-require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorboothattendee.class.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/paymentterm.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
@@ -270,29 +271,32 @@ if (empty($reshook) && $action == 'add') {
 			}
 		}
 		// From there we have a thirdparty, now looking for the contact
-		$contact = new Contact($db);
-		$resultcontact = $contact->fetch('', $user, '', $email);
-		if ($resultcontact<=0) {
-			// Need to create a contact
-			$contact->socid = $thirdparty->id;
-			$contact->lastname = (string) GETPOST("lastname", 'alpha');
-			$contact->firstname = (string) GETPOST("firstname", 'alpha');
-			$contact->address = (string) GETPOST("address", 'alpha');
-			$contact->zip = (string) GETPOST("zipcode", 'alpha');
-			$contact->town = (string) GETPOST("town", 'alpha');
-			$contact->country_id = (int) GETPOST("country_id", 'int');
-			$contact->state_id = (int) GETPOST("state_id", 'int');
-			$contact->email = $email;
-			$contact->statut = 1; //Default status to Actif
-
-			$resultcreatecontact = $contact->create($user);
-			if ($resultcreatecontact<0) {
-				$error++;
-				$errmsg .= $contact->error;
-			}
-		}
 
 		if (!$error) {
+			$contact = new Contact($db);
+			$resultcontact = $contact->fetch('', '', '', $email);
+			if ($resultcontact<=0) {
+				// Need to create a contact
+				$contact->socid = $thirdparty->id;
+				$contact->lastname = (string) GETPOST("lastname", 'alpha');
+				$contact->firstname = (string) GETPOST("firstname", 'alpha');
+				$contact->address = (string) GETPOST("address", 'alpha');
+				$contact->zip = (string) GETPOST("zipcode", 'alpha');
+				$contact->town = (string) GETPOST("town", 'alpha');
+				$contact->country_id = (int) GETPOST("country_id", 'int');
+				$contact->state_id = (int) GETPOST("state_id", 'int');
+				$contact->email = $email;
+				$contact->statut = 1; //Default status to Actif
+
+				$resultcreatecontact = $contact->create($user);
+				if ($resultcreatecontact<0) {
+					$error++;
+					$errmsg .= $contact->error;
+				}
+			}
+		}
+		// Only if we created the contact
+		if (!$error && $resultcontact<=0) {
 			// Adding supplier tag
 			$category = new Categorie($db);
 			if (GETPOST("suggestconference")) {
@@ -307,9 +311,8 @@ if (empty($reshook) && $action == 'add') {
 				$error++;
 				$errmsg .= $category->error;
 			} else {
-				$contact->setCategoriesCommon($category->id, Categorie::TYPE_CONTACT, false);
-				$resultupdate  = $contact->update($contact->id);
-				if ($resultupdate <= 0) {
+				$resultsetcategory = $contact->setCategoriesCommon(array($category->id), CATEGORIE::TYPE_CONTACT, false);
+				if ($resultsetcategory <=0) {
 					$error++;
 					$errmsg .= $contact->error;
 				}
@@ -454,16 +457,8 @@ if ($project->accept_booth_suggestions) {
 	print '<input type="submit" value="'.$langs->trans("SuggestBooth").'" name="suggestbooth" id="suggestbooth" class="button">';
 }
 print '</div>';
-
 print '<br><br>';
 
-// Save
-print '<div class="center">';
-print '<input type="submit" value="'.$langs->trans("Submit").'" id="submitsave" class="button">';
-if (!empty($backtopage)) {
-	print ' &nbsp; &nbsp; <input type="submit" value="'.$langs->trans("Cancel").'" id="submitcancel" class="button button-cancel">';
-}
-print '</div>';
 
 
 print "</form>\n";

From dd9c42876a381b01f1891122c2a39c064d658cd6 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Mon, 26 Apr 2021 14:29:28 +0200
Subject: [PATCH 0018/1497] cleared test modif on core

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 18868f70271..2c9e81b369e 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -9156,7 +9156,6 @@ abstract class CommonObject
 			if ($c->fetch($add) > 0) {
 				$result = $c->add_type($this, $type_categ);
 				if ($result < 0) {
-					var_dump($result);
 					$error++;
 					$this->error = $c->error;
 					$this->errors = $c->errors;
@@ -9166,6 +9165,7 @@ abstract class CommonObject
 				}
 			}
 		}
+
 		return $error ? -1 * $error : $ok;
 	}
 

From a71697375764c9c20307ec04f204e2993eac199f Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Mon, 26 Apr 2021 15:44:08 +0200
Subject: [PATCH 0019/1497] form completed, tags added to thirdparty

---
 htdocs/public/project/index.php        | 90 ++++++++++++++++++++++++--
 htdocs/societe/class/societe.class.php |  2 +-
 2 files changed, 84 insertions(+), 8 deletions(-)

diff --git a/htdocs/public/project/index.php b/htdocs/public/project/index.php
index ec8f0eca312..64fbea05505 100644
--- a/htdocs/public/project/index.php
+++ b/htdocs/public/project/index.php
@@ -84,6 +84,10 @@ $action = GETPOST('action', 'aZ09');
 
 $email = GETPOST("email");
 $societe = GETPOST("societe");
+$label = GETPOST("label");
+$note = GETPOST("note");
+$datestart = GETPOST("datestart");
+$dateend = GETPOST("dateend");
 
 // Getting id from Post and decoding it
 $encodedid = GETPOST('id');
@@ -205,6 +209,26 @@ if (empty($reshook) && $action == 'add') {
 
 	$db->begin();
 
+	if (!GETPOST("email")) {
+		$error++;
+		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Email"))."<br>\n";
+	}
+	if (!GETPOST("label")) {
+		$error++;
+		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label"))."<br>\n";
+	}
+	if (!GETPOST("note")) {
+		$error++;
+		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Note"))."<br>\n";
+	}
+	if (!GETPOST("datestart")) {
+		$error++;
+		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DateStart"))."<br>\n";
+	}
+	if (!GETPOST("dateend")) {
+		$error++;
+		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DateEnd"))."<br>\n";
+	}
 	if (!GETPOST("email")) {
 		$error++;
 		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Email"))."<br>\n";
@@ -295,9 +319,9 @@ if (empty($reshook) && $action == 'add') {
 				}
 			}
 		}
-		// Only if we created the contact
-		if (!$error && $resultcontact<=0) {
-			// Adding supplier tag
+
+		if (!$error) {
+			// Adding supplier tag and tag from setup to thirdparty
 			$category = new Categorie($db);
 			if (GETPOST("suggestconference")) {
 				// Conference case
@@ -311,18 +335,58 @@ if (empty($reshook) && $action == 'add') {
 				$error++;
 				$errmsg .= $category->error;
 			} else {
-				$resultsetcategory = $contact->setCategoriesCommon(array($category->id), CATEGORIE::TYPE_CONTACT, false);
+				$resultsetcategory = $thirdparty->setCategoriesCommon(array($category->id), CATEGORIE::TYPE_CUSTOMER, false);
 				if ($resultsetcategory <=0) {
 					$error++;
-					$errmsg .= $contact->error;
+					$errmsg .= $thirdparty->error;
 				}
+				$thirdparty->fournisseur = 1;
+				// Load object modCodeFournisseur
+				$module = (!empty($conf->global->SOCIETE_CODECLIENT_ADDON) ? $conf->global->SOCIETE_CODECLIENT_ADDON : 'mod_codeclient_leopard');
+				if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php') {
+					$module = substr($module, 0, dol_strlen($module) - 4);
+				}
+				$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
+				foreach ($dirsociete as $dirroot) {
+					$res = dol_include_once($dirroot.$module.'.php');
+					if ($res) {
+						break;
+					}
+				}
+				$modCodeFournisseur = new $module;
+				if (empty($tmpcode) && !empty($modCodeFournisseur->code_auto)) {
+					$tmpcode = $modCodeFournisseur->getNextValue($thirdparty, 0);
+				}
+				$thirdparty->code_fournisseur = $tmpcode;
+
+				$res = $thirdparty->update(0);
 			}
 		}
 
 		if (!$error) {
+			/*
 			// We have the contact and the thirdparty
-
-
+			$conforbooth = new ConferenceOrBooth($db);
+			$conforbooth->label = $label;
+			$conforbooth->fk_soc = $thirdparty->id;
+			$conforbooth->fk_project = $project->id;
+			$conforbooth->note = $note;
+			//$conforbooth->fk_action =
+			$conforbooth->datep =$datestart;
+			$conforbooth->datep2 = $dateend;
+			$conforbooth->datec = dol_now();
+			$conforbooth->tms = dol_now();
+			//$conforbooth->fk_user_author =
+			//$conforbooth->fk_user_mod =
+			$conforbooth->status = CONFERENCEORBOOTH::STATUS_SUGGESTED;
+			$resultconforbooth = $conforbooth->create($user);
+			if ($resultconforbooth<=0) {
+				$error++;
+				$errmsg .= $conforbooth->error;
+			} else {
+				//conforbooth created
+				var_dump('gg');
+			}*/
 
 			$db->commit();
 		}
@@ -392,6 +456,18 @@ print '<td colspan="3"><input name="lastname" id="lastname" type="text" class="m
 print '</tr>';
 // Email
 print '<tr><td>'.$langs->trans("Email").'<FONT COLOR="red">*</FONT></td><td><input type="text" name="email" maxlength="255" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('email')).'"></td></tr>'."\n";
+// Label
+print '<tr><td>'.$langs->trans("Label").'</td>'."\n";
+print '</td><td><input type="text" name="label" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('label')).'"></td></tr>'."\n";
+// Note
+print '<tr><td>'.$langs->trans("Note").'</td>'."\n";
+print '<td><input type="text" name="note" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('note')).'"></td></tr>'."\n";
+// Start Date
+print '<tr><td>'.$langs->trans("DateStart").'</td>'."\n";
+print '<td><input type="date" name="datestart" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('note')).'"></td></tr>'."\n";
+// End Date
+print '<tr><td>'.$langs->trans("DateEnd").'</td>'."\n";
+print '<td><input type="date" name="dateend" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('note')).'"></td></tr>'."\n";
 // Company
 print '<tr id="trcompany" class="trcompany"><td>'.$langs->trans("Company");
 if (!empty(floatval($project->price_registration))) {
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 9d449922dd2..4ce6211c767 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1322,7 +1322,7 @@ class Societe extends CommonObject
 				}
 			}
 		}
-
+		var_dump($result);
 		if ($result >= 0) {
 			dol_syslog(get_class($this)."::update verify ok or not done");
 

From c8440a62836e8cdf8d6e8764fdce17da503619e2 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Mon, 26 Apr 2021 16:17:42 +0200
Subject: [PATCH 0020/1497] fix on form dates

---
 htdocs/public/project/index.php        | 6 ++++--
 htdocs/societe/class/societe.class.php | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/htdocs/public/project/index.php b/htdocs/public/project/index.php
index 64fbea05505..932a36dad92 100644
--- a/htdocs/public/project/index.php
+++ b/htdocs/public/project/index.php
@@ -340,7 +340,9 @@ if (empty($reshook) && $action == 'add') {
 					$error++;
 					$errmsg .= $thirdparty->error;
 				}
+
 				$thirdparty->fournisseur = 1;
+
 				// Load object modCodeFournisseur
 				$module = (!empty($conf->global->SOCIETE_CODECLIENT_ADDON) ? $conf->global->SOCIETE_CODECLIENT_ADDON : 'mod_codeclient_leopard');
 				if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php') {
@@ -464,10 +466,10 @@ print '<tr><td>'.$langs->trans("Note").'</td>'."\n";
 print '<td><input type="text" name="note" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('note')).'"></td></tr>'."\n";
 // Start Date
 print '<tr><td>'.$langs->trans("DateStart").'</td>'."\n";
-print '<td><input type="date" name="datestart" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('note')).'"></td></tr>'."\n";
+print '<td><input type="date" name="datestart" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('datestart')).'"></td></tr>'."\n";
 // End Date
 print '<tr><td>'.$langs->trans("DateEnd").'</td>'."\n";
-print '<td><input type="date" name="dateend" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('note')).'"></td></tr>'."\n";
+print '<td><input type="date" name="dateend" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('dateend')).'"></td></tr>'."\n";
 // Company
 print '<tr id="trcompany" class="trcompany"><td>'.$langs->trans("Company");
 if (!empty(floatval($project->price_registration))) {
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 4ce6211c767..9d449922dd2 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1322,7 +1322,7 @@ class Societe extends CommonObject
 				}
 			}
 		}
-		var_dump($result);
+
 		if ($result >= 0) {
 			dol_syslog(get_class($this)."::update verify ok or not done");
 

From a3628954b21b82bfad96b69d4fa396322778d77e Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Mon, 26 Apr 2021 17:46:30 +0200
Subject: [PATCH 0021/1497] fix for the supplier code

---
 htdocs/public/project/index.php | 47 ++++++++++++++++++---------------
 htdocs/societe/card.php         |  1 +
 2 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/htdocs/public/project/index.php b/htdocs/public/project/index.php
index 932a36dad92..d6614c8ed29 100644
--- a/htdocs/public/project/index.php
+++ b/htdocs/public/project/index.php
@@ -255,6 +255,7 @@ if (empty($reshook) && $action == 'add') {
 		// Getting the thirdparty or creating it
 		$thirdparty = new Societe($db);
 		$resultfetchthirdparty = $thirdparty->fetch('', $societe);
+
 		if ($resultfetchthirdparty<=0) {
 			// Need to create a new one (not found or multiple with the same name)
 			$thirdparty->name     = $societe;
@@ -331,37 +332,41 @@ if (empty($reshook) && $action == 'add') {
 				$resultcategory = $category->fetch($conf->global->EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH);
 			}
 
-			if ($resultcategory<0) {
+			if ($resultcategory<=0) {
 				$error++;
 				$errmsg .= $category->error;
 			} else {
 				$resultsetcategory = $thirdparty->setCategoriesCommon(array($category->id), CATEGORIE::TYPE_CUSTOMER, false);
-				if ($resultsetcategory <=0) {
+				if ($resultsetcategory < 0) {
 					$error++;
 					$errmsg .= $thirdparty->error;
-				}
+				} else {
+					$thirdparty->fournisseur = 1;
 
-				$thirdparty->fournisseur = 1;
+					// Load object modCodeFournisseur
+					$module = (!empty($conf->global->SOCIETE_CODECLIENT_ADDON) ? $conf->global->SOCIETE_CODECLIENT_ADDON : 'mod_codeclient_leopard');
+					if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php') {
+						$module = substr($module, 0, dol_strlen($module) - 4);
+					}
+					$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
+					foreach ($dirsociete as $dirroot) {
+						$res = dol_include_once($dirroot.$module.'.php');
+						if ($res) {
+							break;
+						}
+					}
+					$modCodeFournisseur = new $module;
+					if (empty($tmpcode) && !empty($modCodeFournisseur->code_auto)) {
+						$tmpcode = $modCodeFournisseur->getNextValue($thirdparty, 1);
+					}
+					$thirdparty->code_fournisseur = $tmpcode;
 
-				// Load object modCodeFournisseur
-				$module = (!empty($conf->global->SOCIETE_CODECLIENT_ADDON) ? $conf->global->SOCIETE_CODECLIENT_ADDON : 'mod_codeclient_leopard');
-				if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php') {
-					$module = substr($module, 0, dol_strlen($module) - 4);
-				}
-				$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
-				foreach ($dirsociete as $dirroot) {
-					$res = dol_include_once($dirroot.$module.'.php');
-					if ($res) {
-						break;
+					$res = $thirdparty->update(0, $user, 1, 1, 1);
+
+					if ($res <= 0) {
+						$error++;
 					}
 				}
-				$modCodeFournisseur = new $module;
-				if (empty($tmpcode) && !empty($modCodeFournisseur->code_auto)) {
-					$tmpcode = $modCodeFournisseur->getNextValue($thirdparty, 0);
-				}
-				$thirdparty->code_fournisseur = $tmpcode;
-
-				$res = $thirdparty->update(0);
 			}
 		}
 
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 68efa8e694c..64a46f9d1a8 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -2468,6 +2468,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			if ($tmpcheck != 0 && $tmpcheck != -5) {
 				print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
 			}
+			var_dump($tmpcheck);
 			print '</td>';
 			print '</tr>';
 		}

From cedb8adfe25280ca409495e1bfcf22e108ba590f Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Tue, 27 Apr 2021 09:52:11 +0200
Subject: [PATCH 0022/1497] removal of vardump

---
 htdocs/societe/card.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 64a46f9d1a8..68efa8e694c 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -2468,7 +2468,6 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			if ($tmpcheck != 0 && $tmpcheck != -5) {
 				print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
 			}
-			var_dump($tmpcheck);
 			print '</td>';
 			print '</tr>';
 		}

From bfadcfc4bb430966330672c4d8cb969ac0a23e79 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Tue, 27 Apr 2021 10:49:10 +0200
Subject: [PATCH 0023/1497] added red star on label and note, that are required

---
 htdocs/public/project/index.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/public/project/index.php b/htdocs/public/project/index.php
index d6614c8ed29..3a40649b183 100644
--- a/htdocs/public/project/index.php
+++ b/htdocs/public/project/index.php
@@ -464,10 +464,10 @@ print '</tr>';
 // Email
 print '<tr><td>'.$langs->trans("Email").'<FONT COLOR="red">*</FONT></td><td><input type="text" name="email" maxlength="255" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('email')).'"></td></tr>'."\n";
 // Label
-print '<tr><td>'.$langs->trans("Label").'</td>'."\n";
+print '<tr><td>'.$langs->trans("Label").'<FONT COLOR="red">*</FONT></td>'."\n";
 print '</td><td><input type="text" name="label" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('label')).'"></td></tr>'."\n";
 // Note
-print '<tr><td>'.$langs->trans("Note").'</td>'."\n";
+print '<tr><td>'.$langs->trans("Note").'<FONT COLOR="red">*</FONT></td>'."\n";
 print '<td><input type="text" name="note" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('note')).'"></td></tr>'."\n";
 // Start Date
 print '<tr><td>'.$langs->trans("DateStart").'</td>'."\n";

From 151819b7adbe58ed7f9f693bf7d94abb41fa3ab8 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Tue, 27 Apr 2021 11:22:40 +0200
Subject: [PATCH 0024/1497] added payment redirection to pay a booth, or status
 update for free booth/conference

---
 htdocs/langs/en_US/eventorganization.lang |   1 +
 htdocs/public/project/index.php           | 119 ++++++++++++++++++++--
 2 files changed, 113 insertions(+), 7 deletions(-)

diff --git a/htdocs/langs/en_US/eventorganization.lang b/htdocs/langs/en_US/eventorganization.lang
index 6ef39e81ff6..6d15d599789 100644
--- a/htdocs/langs/en_US/eventorganization.lang
+++ b/htdocs/langs/en_US/eventorganization.lang
@@ -107,6 +107,7 @@ MissingOrBadSecureKey = The security key is invalid or missing
 EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference 
 EvntOrgDuration = This conference starts on %s and ends on %s
 ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s
+BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
 #
 # SubscriptionOk page
 #
diff --git a/htdocs/public/project/index.php b/htdocs/public/project/index.php
index 3a40649b183..06e46e465eb 100644
--- a/htdocs/public/project/index.php
+++ b/htdocs/public/project/index.php
@@ -371,7 +371,6 @@ if (empty($reshook) && $action == 'add') {
 		}
 
 		if (!$error) {
-			/*
 			// We have the contact and the thirdparty
 			$conforbooth = new ConferenceOrBooth($db);
 			$conforbooth->label = $label;
@@ -383,17 +382,123 @@ if (empty($reshook) && $action == 'add') {
 			$conforbooth->datep2 = $dateend;
 			$conforbooth->datec = dol_now();
 			$conforbooth->tms = dol_now();
-			//$conforbooth->fk_user_author =
-			//$conforbooth->fk_user_mod =
-			$conforbooth->status = CONFERENCEORBOOTH::STATUS_SUGGESTED;
 			$resultconforbooth = $conforbooth->create($user);
 			if ($resultconforbooth<=0) {
 				$error++;
 				$errmsg .= $conforbooth->error;
 			} else {
-				//conforbooth created
-				var_dump('gg');
-			}*/
+				// If this is a paying booth, we have to redirect to payment page and create an invoice
+				if (GETPOST("suggestbooth") && !empty(floatval($project->price_booth))) {
+					$productforinvoicerow = new Product($db);
+					$resultprod = $productforinvoicerow->fetch($conf->global->SERVICE_BOOTH_LOCATION);
+					if ($resultprod < 0) {
+						$error++;
+						$errmsg .= $productforinvoicerow->error;
+					} else {
+						$facture = new Facture($db);
+						$facture->type = Facture::TYPE_STANDARD;
+						$facture->socid = $thirdparty->id;
+						$facture->paye = 0;
+						$facture->date = dol_now();
+						$facture->cond_reglement_id = $contact->cond_reglement_id;
+
+						if (empty($facture->cond_reglement_id)) {
+							$paymenttermstatic = new PaymentTerm($contact->db);
+							$facture->cond_reglement_id = $paymenttermstatic->getDefaultId();
+							if (empty($facture->cond_reglement_id)) {
+								$error++;
+								$contact->error = 'ErrorNoPaymentTermRECEPFound';
+								$contact->errors[] = $contact->error;
+							}
+						}
+						$resultfacture = $facture->create($user);
+						if ($resultfacture <= 0) {
+							$contact->error = $facture->error;
+							$contact->errors = $facture->errors;
+							$error++;
+						} else {
+							$facture->add_object_linked($contact->element, $contact->id);
+						}
+					}
+
+					if (!$error) {
+						// Add line to draft invoice
+						$vattouse = get_default_tva($mysoc, $thirdparty, $productforinvoicerow->id);
+						$result = $facture->addline($langs->trans("BoothLocationFee", $conforbooth->label, dol_print_date($conforbooth->datep, '%d/%m/%y %H:%M:%S'), dol_print_date($conforbooth->datep2, '%d/%m/%y %H:%M:%S')), floatval($project->price_booth), 1, $vattouse, 0, 0, $productforinvoicerow->id, 0, dol_now(), '', 0, 0, '', 'HT', 0, 1);
+						if ($result <= 0) {
+							$contact->error = $facture->error;
+							$contact->errors = $facture->errors;
+							$error++;
+						}
+						if (!$error) {
+							$valid = true;
+							$sourcetouse = 'boothlocation';
+							$reftouse = $facture->id;
+							$redirection = $dolibarr_main_url_root.'/public/payment/newpayment.php?source='.$sourcetouse.'&ref='.$reftouse;
+							if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
+								if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
+									$redirection .= '&securekey='.dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $sourcetouse . $reftouse, 2); // Use the source in the hash to avoid duplicates if the references are identical
+								} else {
+									$redirection .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
+								}
+							}
+							Header("Location: ".$redirection);
+							exit;
+						}
+					}
+				} else {
+					// If no price has been set for the booth or this is a conference, we confirm it as suggested and we update
+					$conforbooth->setStatut(CONFERENCEORBOOTH::STATUS_SUGGESTED);
+					$conforbooth->update($user);
+
+					// Sending mail
+					require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+					include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+					$formmail = new FormMail($db);
+					// Set output language
+					$outputlangs = new Translate('', $conf);
+					$outputlangs->setDefaultLang(empty($thirdparty->default_lang) ? $mysoc->default_lang : $thirdparty->default_lang);
+					// Load traductions files required by page
+					$outputlangs->loadLangs(array("main", "members"));
+					// Get email content from template
+					$arraydefaultmessage = null;
+
+					$labeltouse = $conf->global->EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT;
+					if (!empty($labeltouse)) {
+						$arraydefaultmessage = $formmail->getEMailTemplate($db, 'eventorganization_send', $user, $outputlangs, $labeltouse, 1, '');
+					}
+
+					if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
+						$subject = $arraydefaultmessage->topic;
+						$msg     = $arraydefaultmessage->content;
+					}
+
+					$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $thirdparty);
+					complete_substitutions_array($substitutionarray, $outputlangs, $object);
+
+					$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
+					$texttosend = make_substitutions($msg, $substitutionarray, $outputlangs);
+
+					$sendto = $thirdparty->email;
+					$from = $conf->global->MAILING_EMAIL_FROM;
+					$urlback = $_SERVER["REQUEST_URI"];
+
+					$ishtml = dol_textishtml($texttosend); // May contain urls
+
+					$mailfile = new CMailFile($subjecttosend, $sendto, $from, $texttosend, array(), array(), array(), '', '', 0, $ishtml);
+
+					$result = $mailfile->sendfile();
+					if ($result) {
+						dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_payment');
+					} else {
+						dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
+					}
+
+					$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?securekey='.dol_encode($conf->global->EVENTORGANIZATION_SECUREKEY, $dolibarr_main_instance_unique_id);
+					Header("Location: ".$redirection);
+					exit;
+				}
+			}
 
 			$db->commit();
 		}

From b24b297a407da6d7fc4281b5ba6d2773de3fed5d Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Tue, 27 Apr 2021 12:30:49 +0200
Subject: [PATCH 0025/1497] adaptation of the payment for the booth location
 case

---
 htdocs/langs/en_US/eventorganization.lang |   5 +-
 htdocs/public/payment/newpayment.php      | 107 +++++++++
 htdocs/public/payment/paymentok.php       | 272 ++++++++++++++++++----
 htdocs/public/project/index.php           |   2 +-
 4 files changed, 341 insertions(+), 45 deletions(-)

diff --git a/htdocs/langs/en_US/eventorganization.lang b/htdocs/langs/en_US/eventorganization.lang
index 6d15d599789..eb340795a1e 100644
--- a/htdocs/langs/en_US/eventorganization.lang
+++ b/htdocs/langs/en_US/eventorganization.lang
@@ -119,5 +119,6 @@ ConfAttendeeSubscriptionConfirmation = Confirmation of your subscription to a co
 #
 # Payment page
 #
-Attendee = Participant
-PaymentConferenceAttendee = Paiement de participation à une conférence
+Attendee = Attendee
+PaymentConferenceAttendee = Conference attendee payment
+PaymentBoothLocation = Booth location payment
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index b351367f6ea..346e5f7bdda 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -142,6 +142,23 @@ if ($source == 'conferencesubscription') {
 			}
 		}
 	}
+} elseif ($source == 'boothlocation') {
+	// Getting the amount to pay, the invoice, finding the thirdparty
+	$invoiceid = GETPOST('ref');
+	$invoice = new Facture($db);
+	$resultinvoice = $invoice->fetch($invoiceid);
+	if ($resultinvoice <= 0) {
+		setEventMessages(null, $invoice->errors, "errors");
+	} else {
+		$amount = price2num($invoice->total_ttc);
+		// Finding the associated thirdparty
+		$thirdparty = new Societe($db);
+		$resultthirdparty = $thirdparty->fetch($invoice->socid);
+		if ($resultthirdparty <= 0) {
+			setEventMessages(null, $thirdparty->errors, "errors");
+		}
+		$object = $thirdparty;
+	}
 }
 
 
@@ -1862,6 +1879,96 @@ if ($source == 'conferencesubscription') {
 	print '<input type="hidden" name="desc" value="'.dol_escape_htmltag($labeldesc).'">'."\n";
 }
 
+if ($source == 'boothlocation') {
+	$found = true;
+	$langs->load("members");
+
+	if (GETPOST('fulltag', 'alpha')) {
+		$fulltag = GETPOST('fulltag', 'alpha');
+	} else {
+		$fulltag = 'BOO='.GETPOST("booth").'.DAT='.dol_print_date(dol_now(), '%Y%m%d%H%M%S');
+		if (!empty($TAG)) {
+			$tag = $TAG; $fulltag .= '.TAG='.$TAG;
+		}
+	}
+	$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("Attendee");
+	print '</td><td class="CTableRow'.($var ? '1' : '2').'"><b>';
+	print $thirdparty->name;
+	print '</b>';
+	print '</td></tr>'."\n";
+
+	// Object
+	$text = '<b>'.$langs->trans("PaymentBoothLocation").'</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="source" value="'.dol_escape_htmltag($source).'">';
+	print '<input type="hidden" name="ref" value="'.dol_escape_htmltag($invoice->id).'">';
+	print '</td></tr>'."\n";
+
+	// Amount
+	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("Amount");
+	print '</td><td class="CTableRow'.($var ? '1' : '2').'">';
+	$valtoshow = $amount;
+	print '<b>'.price($valtoshow).'</b>';
+	print '<input type="hidden" name="amount" value="'.$valtoshow.'">';
+	print '<input type="hidden" name="newamount" value="'.$valtoshow.'">';
+
+	// Currency
+	print ' <b>'.$langs->trans("Currency".$currency).'</b>';
+	print '<input type="hidden" name="currency" value="'.$currency.'">';
+	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 style="word-break: break-all;">'.$fulltag.'</b>';
+	print '<input type="hidden" name="tag" value="'.$tag.'">';
+	print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
+	print '</td></tr>'."\n";
+
+	// Shipping address
+	$shipToName = $thirdparty->getFullName($langs);
+	$shipToStreet = $thirdparty->address;
+	$shipToCity = $thirdparty->town;
+	$shipToState = $thirdparty->state_code;
+	$shipToCountryCode = $thirdparty->country_code;
+	$shipToZip = $thirdparty->zip;
+	$shipToStreet2 = '';
+	$phoneNum = $thirdparty->phone;
+	if ($shipToName && $shipToStreet && $shipToCity && $shipToCountryCode && $shipToZip) {
+		print '<!-- Shipping address information -->';
+		print '<input type="hidden" name="shipToName" value="'.$shipToName.'">'."\n";
+		print '<input type="hidden" name="shipToStreet" value="'.$shipToStreet.'">'."\n";
+		print '<input type="hidden" name="shipToCity" value="'.$shipToCity.'">'."\n";
+		print '<input type="hidden" name="shipToState" value="'.$shipToState.'">'."\n";
+		print '<input type="hidden" name="shipToCountryCode" value="'.$shipToCountryCode.'">'."\n";
+		print '<input type="hidden" name="shipToZip" value="'.$shipToZip.'">'."\n";
+		print '<input type="hidden" name="shipToStreet2" value="'.$shipToStreet2.'">'."\n";
+		print '<input type="hidden" name="phoneNum" value="'.$phoneNum.'">'."\n";
+	} else {
+		print '<!-- Shipping address not complete, so we don t use it -->'."\n";
+	}
+	print '<input type="hidden" name="thirdparty_id" value="'.$thirdparty->id.'">'."\n";
+	print '<input type="hidden" name="email" value="'.$thirdparty->email.'">'."\n";
+	$labeldesc = $langs->trans("PaymentSubscription");
+	if (GETPOST('desc', 'alpha')) {
+		$labeldesc = GETPOST('desc', 'alpha');
+	}
+	print '<input type="hidden" name="desc" value="'.dol_escape_htmltag($labeldesc).'">'."\n";
+}
+
+
 if (!$found && !$mesg) {
 	$mesg = $langs->trans("ErrorBadParameters");
 }
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 3d3946927c8..d8905d86eac 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -104,7 +104,6 @@ if (empty($FULLTAG)) {
 }
 $source = GETPOST('s', 'alpha') ? GETPOST('s', 'alpha') : GETPOST('source', 'alpha');
 $ref = GETPOST('ref');
-$invoiceref = GETPOST('invoice');
 
 $suffix = GETPOST("suffix", 'aZ09');
 $membertypeid = GETPOST("membertypeid", 'int');
@@ -893,48 +892,51 @@ if ($ispaymentok) {
 
 							// Sending mail
 							$thirdparty = new Societe($db);
-							$thirdparty->fetch($attendeetovalidate->fk_soc);
-
-							require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-							include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-							$formmail = new FormMail($db);
-							// Set output language
-							$outputlangs = new Translate('', $conf);
-							$outputlangs->setDefaultLang(empty($thirdparty->default_lang) ? $mysoc->default_lang : $thirdparty->default_lang);
-							// Load traductions files required by page
-							$outputlangs->loadLangs(array("main", "members"));
-							// Get email content from template
-							$arraydefaultmessage = null;
-
-							$labeltouse = $conf->global->EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT;
-							if (!empty($labeltouse)) {
-								$arraydefaultmessage = $formmail->getEMailTemplate($db, 'eventorganization_send', $user, $outputlangs, $labeltouse, 1, '');
-							}
-
-							if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
-								$subject = $arraydefaultmessage->topic;
-								$msg     = $arraydefaultmessage->content;
-							}
-
-							$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $thirdparty);
-							complete_substitutions_array($substitutionarray, $outputlangs, $object);
-
-							$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
-							$texttosend = make_substitutions($msg, $substitutionarray, $outputlangs);
-
-							$sendto = $thirdparty->email;
-							$from = $conf->global->MAILING_EMAIL_FROM;
-							$urlback = $_SERVER["REQUEST_URI"];
-
-							$ishtml = dol_textishtml($texttosend); // May contain urls
-
-							$mailfile = new CMailFile($subjecttosend, $sendto, $from, $texttosend, array(), array(), array(), '', '', 0, $ishtml);
-
-							$result = $mailfile->sendfile();
-							if ($result) {
-								dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_payment');
+							$resultthirdparty = $thirdparty->fetch($attendeetovalidate->fk_soc);
+							if ($resultthirdparty < 0) {
+								setEventMessages(null, $attendeetovalidate->errors, "errors");
 							} else {
-								dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
+								require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+								include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+								$formmail = new FormMail($db);
+								// Set output language
+								$outputlangs = new Translate('', $conf);
+								$outputlangs->setDefaultLang(empty($thirdparty->default_lang) ? $mysoc->default_lang : $thirdparty->default_lang);
+								// Load traductions files required by page
+								$outputlangs->loadLangs(array("main", "members"));
+								// Get email content from template
+								$arraydefaultmessage = null;
+
+								$labeltouse = $conf->global->EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT;
+								if (!empty($labeltouse)) {
+									$arraydefaultmessage = $formmail->getEMailTemplate($db, 'eventorganization_send', $user, $outputlangs, $labeltouse, 1, '');
+								}
+
+								if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
+									$subject = $arraydefaultmessage->topic;
+									$msg     = $arraydefaultmessage->content;
+								}
+
+								$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $thirdparty);
+								complete_substitutions_array($substitutionarray, $outputlangs, $object);
+
+								$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
+								$texttosend = make_substitutions($msg, $substitutionarray, $outputlangs);
+
+								$sendto = $thirdparty->email;
+								$from = $conf->global->MAILING_EMAIL_FROM;
+								$urlback = $_SERVER["REQUEST_URI"];
+
+								$ishtml = dol_textishtml($texttosend); // May contain urls
+
+								$mailfile = new CMailFile($subjecttosend, $sendto, $from, $texttosend, array(), array(), array(), '', '', 0, $ishtml);
+
+								$result = $mailfile->sendfile();
+								if ($result) {
+									dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_payment');
+								} else {
+									dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
+								}
 							}
 						}
 					} else {
@@ -951,6 +953,192 @@ if ($ispaymentok) {
 		}
 	} elseif (array_key_exists('BOO', $tmptag) && $tmptag['BOO'] > 0) {
 		// @todo BOOTH CASE (to copy and adapt from above)
+		// Record payment
+		include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+		$object = new Facture($db);
+		$result = $object->fetch($ref);
+		if ($result) {
+			$FinalPaymentAmt = $_SESSION["FinalPaymentAmt"];
+
+			$paymentTypeId = 0;
+			if ($paymentmethod == 'paybox') {
+				$paymentTypeId = $conf->global->PAYBOX_PAYMENT_MODE_FOR_PAYMENTS;
+			}
+			if ($paymentmethod == 'paypal') {
+				$paymentTypeId = $conf->global->PAYPAL_PAYMENT_MODE_FOR_PAYMENTS;
+			}
+			if ($paymentmethod == 'stripe') {
+				$paymentTypeId = $conf->global->STRIPE_PAYMENT_MODE_FOR_PAYMENTS;
+			}
+			if (empty($paymentTypeId)) {
+				$paymentType = $_SESSION["paymentType"];
+				if (empty($paymentType)) {
+					$paymentType = 'CB';
+				}
+				$paymentTypeId = dol_getIdFromCode($db, $paymentType, 'c_paiement', 'code', 'id', 1);
+			}
+
+			$currencyCodeType = $_SESSION['currencyCodeType'];
+
+			// Do action only if $FinalPaymentAmt is set (session variable is cleaned after this page to avoid duplicate actions when page is POST a second time)
+			if (!empty($FinalPaymentAmt) && $paymentTypeId > 0) {
+				$resultvalidate = $object->validate($user);
+				if ($resultvalidate < 0) {
+					$postactionmessages[] = 'Cannot validate invoice';
+					$ispostactionok = -1;
+					$error++; // Not yet supported
+				} else {
+					$db->begin();
+
+					// Creation of payment line
+					include_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
+					$paiement = new Paiement($db);
+					$paiement->datepaye = $now;
+					if ($currencyCodeType == $conf->currency) {
+						$paiement->amounts = array($object->id => $FinalPaymentAmt); // Array with all payments dispatching with invoice id
+					} else {
+						$paiement->multicurrency_amounts = array($object->id => $FinalPaymentAmt); // Array with all payments dispatching
+
+						$postactionmessages[] = 'Payment was done in a different currency that currency expected of company';
+						$ispostactionok = -1;
+						$error++; // Not yet supported
+					}
+					$paiement->paiementid   = $paymentTypeId;
+					$paiement->num_payment = '';
+					$paiement->note_public  = 'Online payment '.dol_print_date($now, 'standard').' from '.$ipaddress;
+					$paiement->ext_payment_id = $TRANSACTIONID;
+					$paiement->ext_payment_site = $service;
+
+					if (!$error) {
+						$paiement_id = $paiement->create($user, 1); // This include closing invoices and regenerating documents
+						if ($paiement_id < 0) {
+							$postactionmessages[] = $paiement->error.' '.join("<br>\n", $paiement->errors);
+							$ispostactionok = -1;
+							$error++;
+						} else {
+							$postactionmessages[] = 'Payment created';
+							$ispostactionok = 1;
+						}
+					}
+
+					if (!$error && !empty($conf->banque->enabled)) {
+						$bankaccountid = 0;
+						if ($paymentmethod == 'paybox') {
+							$bankaccountid = $conf->global->PAYBOX_BANK_ACCOUNT_FOR_PAYMENTS;
+						} elseif ($paymentmethod == 'paypal') {
+							$bankaccountid = $conf->global->PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS;
+						} elseif ($paymentmethod == 'stripe') {
+							$bankaccountid = $conf->global->STRIPE_BANK_ACCOUNT_FOR_PAYMENTS;
+						}
+
+						if ($bankaccountid > 0) {
+							$label = '(CustomerInvoicePayment)';
+							if ($object->type == Facture::TYPE_CREDIT_NOTE) {
+								$label = '(CustomerInvoicePaymentBack)'; // Refund of a credit note
+							}
+							$result = $paiement->addPaymentToBank($user, 'payment', $label, $bankaccountid, '', '');
+							if ($result < 0) {
+								$postactionmessages[] = $paiement->error.' '.join("<br>\n", $paiement->errors);
+								$ispostactionok = -1;
+								$error++;
+							} else {
+								$postactionmessages[] = 'Bank transaction of payment created';
+								$ispostactionok = 1;
+							}
+						} else {
+							$postactionmessages[] = 'Setup of bank account to use in module '.$paymentmethod.' was not set. No way to record the payment.';
+							$ispostactionok = -1;
+							$error++;
+						}
+					}
+
+					if (!$error) {
+						// Putting the booth to "suggested" state
+						$booth = new ConferenceOrBooth($db);
+						$resultbooth = $booth->fetch($tmptag['BOO']);
+						if ($resultbooth < 0) {
+							$error++;
+							setEventMessages(null, $booth->errors, "errors");
+						} else {
+							$booth->setStatut(CONFERENCEORBOOTH::STATUS_SUGGESTED);
+							$resultboothupdate = $booth->update($user);
+							if ($resultboothupdate<0) {
+								// Finding the thirdparty by getting the invoice
+								$invoice = new Facture($db);
+								$resultinvoice = $invoice->fetch($ref);
+								if ($resultinvoice<0) {
+									$postactionmessages[] = 'Could not find the associated invoice.';
+									$ispostactionok = -1;
+									$error++;
+								} else {
+									$thirdparty = new Societe($db);
+									$resultthirdparty = $thirdparty->fetch($invoice->socid);
+									if ($resultthirdparty<0) {
+										$error++;
+										setEventMessages(null, $thirdparty->errors, "errors");
+									} else {
+										// Sending mail
+										require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+										include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+										$formmail = new FormMail($db);
+										// Set output language
+										$outputlangs = new Translate('', $conf);
+										$outputlangs->setDefaultLang(empty($thirdparty->default_lang) ? $mysoc->default_lang : $thirdparty->default_lang);
+										// Load traductions files required by page
+										$outputlangs->loadLangs(array("main", "members"));
+										// Get email content from template
+										$arraydefaultmessage = null;
+
+										$labeltouse = $conf->global->EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT;
+										if (!empty($labeltouse)) {
+											$arraydefaultmessage = $formmail->getEMailTemplate($db, 'eventorganization_send', $user, $outputlangs, $labeltouse, 1, '');
+										}
+
+										if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
+											$subject = $arraydefaultmessage->topic;
+											$msg     = $arraydefaultmessage->content;
+										}
+
+										$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $thirdparty);
+										complete_substitutions_array($substitutionarray, $outputlangs, $object);
+
+										$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
+										$texttosend = make_substitutions($msg, $substitutionarray, $outputlangs);
+
+										$sendto = $thirdparty->email;
+										$from = $conf->global->MAILING_EMAIL_FROM;
+										$urlback = $_SERVER["REQUEST_URI"];
+
+										$ishtml = dol_textishtml($texttosend); // May contain urls
+
+										$mailfile = new CMailFile($subjecttosend, $sendto, $from, $texttosend, array(), array(), array(), '', '', 0, $ishtml);
+
+										$result = $mailfile->sendfile();
+										if ($result) {
+											dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_payment');
+										} else {
+											dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
+										}
+									}
+								}
+							}
+						}
+					}
+
+					if (!$error) {
+						$db->commit();
+					} else {
+						$db->rollback();
+					}
+				}
+			} else {
+				$postactionmessages[] = 'Failed to get a valid value for "amount paid" ('.$FinalPaymentAmt.') or "payment type" ('.$paymentType.') to record the payment of invoice '.$tmptag['ATT'].'. May be payment was already recorded.';
+				$ispostactionok = -1;
+			}
+		} else {
+			$postactionmessages[] = 'Invoice paid '.$tmptag['ATT'].' was not found';
+			$ispostactionok = -1;
+		}
 	} else {
 		// Nothing done
 	}
diff --git a/htdocs/public/project/index.php b/htdocs/public/project/index.php
index 06e46e465eb..7eb7f263a16 100644
--- a/htdocs/public/project/index.php
+++ b/htdocs/public/project/index.php
@@ -434,7 +434,7 @@ if (empty($reshook) && $action == 'add') {
 							$valid = true;
 							$sourcetouse = 'boothlocation';
 							$reftouse = $facture->id;
-							$redirection = $dolibarr_main_url_root.'/public/payment/newpayment.php?source='.$sourcetouse.'&ref='.$reftouse;
+							$redirection = $dolibarr_main_url_root.'/public/payment/newpayment.php?source='.$sourcetouse.'&ref='.$reftouse.'&booth='.$conforbooth->id;
 							if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
 								if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
 									$redirection .= '&securekey='.dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $sourcetouse . $reftouse, 2); // Use the source in the hash to avoid duplicates if the references are identical

From f2f1eaa95e9ceb8f8d89fb0726d2e3407511053c Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Tue, 27 Apr 2021 16:01:01 +0200
Subject: [PATCH 0026/1497] wip

---
 .../attendee_subscription.php                 | 28 +++++++++++--------
 htdocs/public/project/index.php               | 28 +++++++++----------
 2 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index 4940f5965fe..7a377a7121a 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -374,15 +374,15 @@ if (empty($reshook) && $action == 'add') {
 					$valid = true;
 					$sourcetouse = 'conferencesubscription';
 					$reftouse = $facture->id;
-					$redirection = $dolibarr_main_url_root.'/public/payment/newpayment.php?source='.$sourcetouse.'&ref='.$reftouse;
+					$redirection = $dolibarr_main_url_root . '/public/payment/newpayment.php?source=' . $sourcetouse . '&ref=' . $reftouse;
 					if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
 						if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
-							$redirection .= '&securekey='.dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $sourcetouse . $reftouse, 2); // Use the source in the hash to avoid duplicates if the references are identical
+							$redirection .= '&securekey=' . dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $sourcetouse . $reftouse, 2); // Use the source in the hash to avoid duplicates if the references are identical
 						} else {
-							$redirection .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
+							$redirection .= '&securekey=' . $conf->global->PAYMENT_SECURITY_TOKEN;
 						}
 					}
-					Header("Location: ".$redirection);
+					Header("Location: " . $redirection);
 					exit;
 				}
 			}
@@ -392,8 +392,8 @@ if (empty($reshook) && $action == 'add') {
 			$confattendee->setStatut(1);
 
 			// Sending mail
-			require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-			include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+			require_once DOL_DOCUMENT_ROOT . '/core/class/CMailFile.class.php';
+			include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
 			$formmail = new FormMail($db);
 			// Set output language
 			$outputlangs = new Translate('', $conf);
@@ -410,7 +410,7 @@ if (empty($reshook) && $action == 'add') {
 
 			if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
 				$subject = $arraydefaultmessage->topic;
-				$msg     = $arraydefaultmessage->content;
+				$msg = $arraydefaultmessage->content;
 			}
 
 			$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $thirdparty);
@@ -429,19 +429,23 @@ if (empty($reshook) && $action == 'add') {
 
 			$result = $mailfile->sendfile();
 			if ($result) {
-				dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_payment');
+				dol_syslog("EMail sent to " . $sendto, LOG_DEBUG, 0, '_payment');
 			} else {
-				dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
+				dol_syslog("Failed to send EMail to " . $sendto, LOG_ERR, 0, '_payment');
 			}
 
 			$encodedid = dol_encode($id, $dolibarr_main_instance_unique_id);
-			$securekeyurl = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$id, 2);
-			$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?id='.$encodedid.'&securekey='.$securekeyurl;
-			Header("Location: ".$redirection);
+			$securekeyurl = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY . 'conferenceorbooth' . $id, 2);
+			$redirection = $dolibarr_main_url_root . '/public/eventorganization/subscriptionok.php?id=' . $encodedid . '&securekey=' . $securekeyurl;
+			Header("Location: " . $redirection);
 			exit;
 		}
 		//Header("Location: ".$urlback);
 		//exit;
+	}
+
+	if (!$error) {
+		$db->commit();
 	} else {
 		$db->rollback();
 	}
diff --git a/htdocs/public/project/index.php b/htdocs/public/project/index.php
index 7eb7f263a16..bbfe55a6522 100644
--- a/htdocs/public/project/index.php
+++ b/htdocs/public/project/index.php
@@ -100,16 +100,12 @@ if ($resultproject < 0) {
 	$errmsg .= $project->error;
 }
 
-// Getting 'securekey'.'id' from Post and decoding it
-$encodedsecurekeyandid = GETPOST('securekey', 'alpha');
-$securekeyandid = dol_decode($encodedsecurekeyandid, $dolibarr_main_instance_unique_id);
+// Security check
+$id = dol_decode($encodedid, $dolibarr_main_instance_unique_id);
+$securekeyreceived = GETPOST("securekey");
+$securekeytocompare = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$id, 2);
 
-// Securekey decomposition into pure securekey and id added at the end
-$securekey = substr($securekeyandid, 0, strlen($securekeyandid)-strlen($encodedid));
-$idgotfromsecurekey = dol_decode(substr($securekeyandid, -strlen($encodedid), strlen($encodedid)), $dolibarr_main_instance_unique_id);
-
-// We check if the securekey collected is OK and if the id collected is the same than the id in the securekey
-if ($securekey != $conf->global->EVENTORGANIZATION_SECUREKEY || $idgotfromsecurekey != $id) {
+if ($securekeytocompare != $securekeyreceived) {
 	print $langs->trans('MissingOrBadSecureKey');
 	exit;
 }
@@ -377,12 +373,13 @@ if (empty($reshook) && $action == 'add') {
 			$conforbooth->fk_soc = $thirdparty->id;
 			$conforbooth->fk_project = $project->id;
 			$conforbooth->note = $note;
-			//$conforbooth->fk_action =
+			$conforbooth->fk_action = 63;
 			$conforbooth->datep =$datestart;
 			$conforbooth->datep2 = $dateend;
 			$conforbooth->datec = dol_now();
 			$conforbooth->tms = dol_now();
 			$resultconforbooth = $conforbooth->create($user);
+			var_dump($conforbooth);
 			if ($resultconforbooth<=0) {
 				$error++;
 				$errmsg .= $conforbooth->error;
@@ -494,14 +491,17 @@ if (empty($reshook) && $action == 'add') {
 						dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
 					}
 
-					$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?securekey='.dol_encode($conf->global->EVENTORGANIZATION_SECUREKEY, $dolibarr_main_instance_unique_id);
+					$encodedid = dol_encode($id, $dolibarr_main_instance_unique_id);
+					$securekeyurl = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$id, 2);
+					$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?id='.$encodedid.'&securekey='.$securekeyurl;
 					Header("Location: ".$redirection);
 					exit;
 				}
 			}
-
-			$db->commit();
 		}
+	}
+	if (!$error) {
+		$db->commit();
 	} else {
 		$db->rollback();
 	}
@@ -540,7 +540,7 @@ print '<input type="hidden" name="token" value="'.newToken().'" / >';
 print '<input type="hidden" name="entity" value="'.$entity.'" />';
 print '<input type="hidden" name="action" value="add" />';
 print '<input type="hidden" name="id" value="'.$encodedid.'" />';
-print '<input type="hidden" name="securekey" value="'.$encodedsecurekeyandid.'" />';
+print '<input type="hidden" name="securekey" value="'.$securekeyreceived.'" />';
 
 print '<br>';
 

From 5203a417fe13d91d93909817def137b334c0139b Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Tue, 27 Apr 2021 16:31:14 +0200
Subject: [PATCH 0027/1497] select array OK for event type

---
 htdocs/public/project/index.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/htdocs/public/project/index.php b/htdocs/public/project/index.php
index bbfe55a6522..ce3f06a4cc3 100644
--- a/htdocs/public/project/index.php
+++ b/htdocs/public/project/index.php
@@ -82,6 +82,7 @@ $error = 0;
 $backtopage = GETPOST('backtopage', 'alpha');
 $action = GETPOST('action', 'aZ09');
 
+$eventtype = GETPOST("eventtype");
 $email = GETPOST("email");
 $societe = GETPOST("societe");
 $label = GETPOST("label");
@@ -120,6 +121,8 @@ $extrafields = new ExtraFields($db);
 
 $user->loadDefaultValues();
 
+$cactioncomm = new CActionComm($db);
+$arrayofeventtype = $cactioncomm->liste_array('', 'id', '', 0, 'module=\'conference@eventorganization\' OR module=\'booth@eventorganization\'');
 
 /**
  * Show header for new member
@@ -373,13 +376,12 @@ if (empty($reshook) && $action == 'add') {
 			$conforbooth->fk_soc = $thirdparty->id;
 			$conforbooth->fk_project = $project->id;
 			$conforbooth->note = $note;
-			$conforbooth->fk_action = 63;
+			$conforbooth->fk_action = $eventtype;
 			$conforbooth->datep =$datestart;
 			$conforbooth->datep2 = $dateend;
 			$conforbooth->datec = dol_now();
 			$conforbooth->tms = dol_now();
 			$resultconforbooth = $conforbooth->create($user);
-			var_dump($conforbooth);
 			if ($resultconforbooth<=0) {
 				$error++;
 				$errmsg .= $conforbooth->error;
@@ -568,6 +570,9 @@ print '<td colspan="3"><input name="lastname" id="lastname" type="text" class="m
 print '</tr>';
 // Email
 print '<tr><td>'.$langs->trans("Email").'<FONT COLOR="red">*</FONT></td><td><input type="text" name="email" maxlength="255" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('email')).'"></td></tr>'."\n";
+// Type of event
+print '<tr><td>'.$langs->trans("EventType").'<FONT COLOR="red">*</FONT></td>'."\n";
+print '<td>'.FORM::selectarray('eventtype', $arrayofeventtype, $eventtype).'</td>';
 // Label
 print '<tr><td>'.$langs->trans("Label").'<FONT COLOR="red">*</FONT></td>'."\n";
 print '</td><td><input type="text" name="label" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('label')).'"></td></tr>'."\n";

From 54b5a43006174ccfec34c9cdc57f5622d906b227 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Tue, 27 Apr 2021 17:06:25 +0200
Subject: [PATCH 0028/1497] wip

---
 htdocs/langs/en_US/eventorganization.lang |  1 +
 htdocs/public/project/index.php           | 15 ++++++---------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/htdocs/langs/en_US/eventorganization.lang b/htdocs/langs/en_US/eventorganization.lang
index 9ad2d45ddf4..7b5ddd8160c 100644
--- a/htdocs/langs/en_US/eventorganization.lang
+++ b/htdocs/langs/en_US/eventorganization.lang
@@ -108,6 +108,7 @@ EvntOrgWelcomeMessage = This form allows you to register as a new participant to
 EvntOrgDuration = This conference starts on %s and ends on %s.
 ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
 BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
+EventType = Event type
 #
 # SubscriptionOk page
 #
diff --git a/htdocs/public/project/index.php b/htdocs/public/project/index.php
index ce3f06a4cc3..4f376a2f10f 100644
--- a/htdocs/public/project/index.php
+++ b/htdocs/public/project/index.php
@@ -295,7 +295,6 @@ if (empty($reshook) && $action == 'add') {
 			}
 		}
 		// From there we have a thirdparty, now looking for the contact
-
 		if (!$error) {
 			$contact = new Contact($db);
 			$resultcontact = $contact->fetch('', '', '', $email);
@@ -447,9 +446,8 @@ if (empty($reshook) && $action == 'add') {
 					}
 				} else {
 					// If no price has been set for the booth or this is a conference, we confirm it as suggested and we update
-					$conforbooth->setStatut(CONFERENCEORBOOTH::STATUS_SUGGESTED);
+					$conforbooth->status = CONFERENCEORBOOTH::STATUS_SUGGESTED;
 					$conforbooth->update($user);
-
 					// Sending mail
 					require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
 					include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
@@ -492,18 +490,17 @@ if (empty($reshook) && $action == 'add') {
 					} else {
 						dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
 					}
-
-					$encodedid = dol_encode($id, $dolibarr_main_instance_unique_id);
-					$securekeyurl = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$id, 2);
-					$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?id='.$encodedid.'&securekey='.$securekeyurl;
-					Header("Location: ".$redirection);
-					exit;
 				}
 			}
 		}
 	}
 	if (!$error) {
 		$db->commit();
+		$encodedid = dol_encode($id, $dolibarr_main_instance_unique_id);
+		$securekeyurl = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$id, 2);
+		$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?id='.$encodedid.'&securekey='.$securekeyurl;
+		Header("Location: ".$redirection);
+		exit;
 	} else {
 		$db->rollback();
 	}

From 15e65729f6abf38cc744e2047a04cc8134f297e7 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Tue, 27 Apr 2021 17:19:13 +0200
Subject: [PATCH 0029/1497] put company under email in the form

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

diff --git a/htdocs/public/project/index.php b/htdocs/public/project/index.php
index 4f376a2f10f..e4c030c9718 100644
--- a/htdocs/public/project/index.php
+++ b/htdocs/public/project/index.php
@@ -567,6 +567,9 @@ print '<td colspan="3"><input name="lastname" id="lastname" type="text" class="m
 print '</tr>';
 // Email
 print '<tr><td>'.$langs->trans("Email").'<FONT COLOR="red">*</FONT></td><td><input type="text" name="email" maxlength="255" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('email')).'"></td></tr>'."\n";
+// Company
+print '<tr id="trcompany" class="trcompany"><td>'.$langs->trans("Company").'<FONT COLOR="red">*</FONT>';
+print ' </td><td><input type="text" name="societe" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('societe')).'"></td></tr>'."\n";
 // Type of event
 print '<tr><td>'.$langs->trans("EventType").'<FONT COLOR="red">*</FONT></td>'."\n";
 print '<td>'.FORM::selectarray('eventtype', $arrayofeventtype, $eventtype).'</td>';
@@ -582,12 +585,6 @@ print '<td><input type="date" name="datestart" class="minwidth150" value="'.dol_
 // End Date
 print '<tr><td>'.$langs->trans("DateEnd").'</td>'."\n";
 print '<td><input type="date" name="dateend" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('dateend')).'"></td></tr>'."\n";
-// Company
-print '<tr id="trcompany" class="trcompany"><td>'.$langs->trans("Company");
-if (!empty(floatval($project->price_registration))) {
-	print '<FONT COLOR="red">*</FONT>';
-}
-print ' </td><td><input type="text" name="societe" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('societe')).'"></td></tr>'."\n";
 // Address
 print '<tr><td>'.$langs->trans("Address").'</td><td>'."\n";
 print '<textarea name="address" id="address" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.dol_escape_htmltag(GETPOST('address', 'restricthtml'), 0, 1).'</textarea></td></tr>'."\n";

From 4c50d210dd0af5f0ef97b1dff27a385ead9c788d Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Thu, 6 May 2021 11:26:42 +0200
Subject: [PATCH 0030/1497] creation of the 3 main pages

---
 htdocs/public/project/suggestbooth.php      | 1 +
 htdocs/public/project/suggestconference.php | 1 +
 htdocs/public/project/viewandvote.php       | 1 +
 3 files changed, 3 insertions(+)
 create mode 100644 htdocs/public/project/suggestbooth.php
 create mode 100644 htdocs/public/project/suggestconference.php
 create mode 100644 htdocs/public/project/viewandvote.php

diff --git a/htdocs/public/project/suggestbooth.php b/htdocs/public/project/suggestbooth.php
new file mode 100644
index 00000000000..b3d9bbc7f37
--- /dev/null
+++ b/htdocs/public/project/suggestbooth.php
@@ -0,0 +1 @@
+<?php
diff --git a/htdocs/public/project/suggestconference.php b/htdocs/public/project/suggestconference.php
new file mode 100644
index 00000000000..b3d9bbc7f37
--- /dev/null
+++ b/htdocs/public/project/suggestconference.php
@@ -0,0 +1 @@
+<?php
diff --git a/htdocs/public/project/viewandvote.php b/htdocs/public/project/viewandvote.php
new file mode 100644
index 00000000000..b3d9bbc7f37
--- /dev/null
+++ b/htdocs/public/project/viewandvote.php
@@ -0,0 +1 @@
+<?php

From a68a7c1f67679298ab639a123db2410dbf78e280 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Thu, 6 May 2021 11:27:48 +0200
Subject: [PATCH 0031/1497] wip

---
 htdocs/public/project/index.php             |   8 -
 htdocs/public/project/suggestbooth.php      | 657 ++++++++++++++++++++
 htdocs/public/project/suggestconference.php | 657 ++++++++++++++++++++
 3 files changed, 1314 insertions(+), 8 deletions(-)

diff --git a/htdocs/public/project/index.php b/htdocs/public/project/index.php
index e4c030c9718..fcbc786be4c 100644
--- a/htdocs/public/project/index.php
+++ b/htdocs/public/project/index.php
@@ -82,14 +82,6 @@ $error = 0;
 $backtopage = GETPOST('backtopage', 'alpha');
 $action = GETPOST('action', 'aZ09');
 
-$eventtype = GETPOST("eventtype");
-$email = GETPOST("email");
-$societe = GETPOST("societe");
-$label = GETPOST("label");
-$note = GETPOST("note");
-$datestart = GETPOST("datestart");
-$dateend = GETPOST("dateend");
-
 // Getting id from Post and decoding it
 $encodedid = GETPOST('id');
 $id = dol_decode($encodedid, $dolibarr_main_instance_unique_id);
diff --git a/htdocs/public/project/suggestbooth.php b/htdocs/public/project/suggestbooth.php
index b3d9bbc7f37..e4c030c9718 100644
--- a/htdocs/public/project/suggestbooth.php
+++ b/htdocs/public/project/suggestbooth.php
@@ -1 +1,658 @@
 <?php
+/* Copyright (C) 2001-2002  Rodolphe Quiedeville    <rodolphe@quiedeville.org>
+ * Copyright (C) 2001-2002  Jean-Louis Bergamo      <jlb@j1b.org>
+ * Copyright (C) 2006-2013  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2012       Regis Houssin           <regis.houssin@inodbox.com>
+ * Copyright (C) 2012       J. Fernando Lagrange    <fernando@demo-tic.org>
+ * Copyright (C) 2018-2019  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018       Alexandre Spangaro      <aspangaro@open-dsi.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       htdocs/public/members/new.php
+ *	\ingroup    member
+ *	\brief      Example of form to add a new member
+ *
+ *  Note that you can add following constant to change behaviour of page
+ *  MEMBER_NEWFORM_AMOUNT               Default amount for auto-subscribe form
+ *  MEMBER_NEWFORM_EDITAMOUNT           0 or 1 = Amount can be edited
+ *  MEMBER_NEWFORM_PAYONLINE            Suggest payment with paypal, paybox or stripe
+ *  MEMBER_NEWFORM_DOLIBARRTURNOVER     Show field turnover (specific for dolibarr foundation)
+ *  MEMBER_URL_REDIRECT_SUBSCRIPTION    Url to redirect once subscribe submitted
+ *  MEMBER_NEWFORM_FORCETYPE            Force type of member
+ *  MEMBER_NEWFORM_FORCEMORPHY          Force nature of member (mor/phy)
+ *  MEMBER_NEWFORM_FORCECOUNTRYCODE     Force country
+ */
+
+if (!defined('NOLOGIN')) {
+	define("NOLOGIN", 1); // This means this output page does not require to be logged.
+}
+if (!defined('NOCSRFCHECK')) {
+	define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
+}
+if (!defined('NOIPCHECK')) {
+	define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
+}
+if (!defined('NOBROWSERNOTIF')) {
+	define('NOBROWSERNOTIF', '1');
+}
+if (!defined('NOIPCHECK')) {
+	define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
+}
+
+// For MultiCompany module.
+// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
+// TODO This should be useless. Because entity must be retrieve from object ref and not from url.
+$entity = (!empty($_GET['entity']) ? (int) $_GET['entity'] : (!empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
+if (is_numeric($entity)) {
+	define("DOLENTITY", $entity);
+}
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorbooth.class.php';
+require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/paymentterm.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+
+global $dolibarr_main_instance_unique_id;
+global $dolibarr_main_url_root;
+
+// Init vars
+$errmsg = '';
+$num = 0;
+$error = 0;
+$backtopage = GETPOST('backtopage', 'alpha');
+$action = GETPOST('action', 'aZ09');
+
+$eventtype = GETPOST("eventtype");
+$email = GETPOST("email");
+$societe = GETPOST("societe");
+$label = GETPOST("label");
+$note = GETPOST("note");
+$datestart = GETPOST("datestart");
+$dateend = GETPOST("dateend");
+
+// Getting id from Post and decoding it
+$encodedid = GETPOST('id');
+$id = dol_decode($encodedid, $dolibarr_main_instance_unique_id);
+
+$project = new Project($db);
+$resultproject = $project->fetch($id);
+if ($resultproject < 0) {
+	$error++;
+	$errmsg .= $project->error;
+}
+
+// Security check
+$id = dol_decode($encodedid, $dolibarr_main_instance_unique_id);
+$securekeyreceived = GETPOST("securekey");
+$securekeytocompare = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$id, 2);
+
+if ($securekeytocompare != $securekeyreceived) {
+	print $langs->trans('MissingOrBadSecureKey');
+	exit;
+}
+
+// Load translation files
+$langs->loadLangs(array("main", "companies", "install", "other", "eventorganization"));
+
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('publicnewmembercard', 'globalcard'));
+
+$extrafields = new ExtraFields($db);
+
+$user->loadDefaultValues();
+
+$cactioncomm = new CActionComm($db);
+$arrayofeventtype = $cactioncomm->liste_array('', 'id', '', 0, 'module=\'conference@eventorganization\' OR module=\'booth@eventorganization\'');
+
+/**
+ * Show header for new member
+ *
+ * @param 	string		$title				Title
+ * @param 	string		$head				Head array
+ * @param 	int    		$disablejs			More content into html header
+ * @param 	int    		$disablehead		More content into html header
+ * @param 	array  		$arrayofjs			Array of complementary js files
+ * @param 	array  		$arrayofcss			Array of complementary css files
+ * @return	void
+ */
+function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $arrayofjs = '', $arrayofcss = '')
+{
+	global $user, $conf, $langs, $mysoc;
+
+	top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss); // Show html headers
+
+	print '<body id="mainbody" class="publicnewmemberform">';
+
+	// Define urllogo
+	$urllogo = DOL_URL_ROOT.'/theme/common/login_logo.png';
+
+	if (!empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small)) {
+		$urllogo = DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_small);
+	} elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo)) {
+		$urllogo = DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/'.$mysoc->logo);
+	} elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.svg')) {
+		$urllogo = DOL_URL_ROOT.'/theme/dolibarr_logo.svg';
+	}
+
+	print '<div class="center">';
+	// Output html code for logo
+	if ($urllogo) {
+		print '<div class="backgreypublicpayment">';
+		print '<div class="logopublicpayment">';
+		print '<img id="dolpaymentlogo" src="'.$urllogo.'"';
+		print '>';
+		print '</div>';
+		if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
+			print '<div class="poweredbypublicpayment opacitymedium right"><a class="poweredbyhref" href="https://www.dolibarr.org?utm_medium=website&utm_source=poweredby" target="dolibarr" rel="noopener">'.$langs->trans("PoweredBy").'<br><img class="poweredbyimg" src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
+		}
+		print '</div>';
+	}
+	print '</div>';
+
+	print '<div class="divmainbodylarge">';
+}
+
+/**
+ * Show footer for new member
+ *
+ * @return	void
+ */
+function llxFooterVierge()
+{
+	print '</div>';
+
+	printCommonFooter('public');
+
+	print "</body>\n";
+	print "</html>\n";
+}
+
+
+
+/*
+ * Actions
+ */
+global $mysoc;
+$parameters = array();
+// Note that $action and $object may have been modified by some hooks
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action);
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
+
+// Action called when page is submitted
+if (empty($reshook) && $action == 'add') {
+	$error = 0;
+
+	$urlback = '';
+
+	$db->begin();
+
+	if (!GETPOST("email")) {
+		$error++;
+		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Email"))."<br>\n";
+	}
+	if (!GETPOST("label")) {
+		$error++;
+		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label"))."<br>\n";
+	}
+	if (!GETPOST("note")) {
+		$error++;
+		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Note"))."<br>\n";
+	}
+	if (!GETPOST("datestart")) {
+		$error++;
+		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DateStart"))."<br>\n";
+	}
+	if (!GETPOST("dateend")) {
+		$error++;
+		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DateEnd"))."<br>\n";
+	}
+	if (!GETPOST("email")) {
+		$error++;
+		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Email"))."<br>\n";
+	}
+	if (!GETPOST("lastname")) {
+		$error++;
+		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Name"))."<br>\n";
+	}
+	if (!GETPOST("societe")) {
+		$error++;
+		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Societe"))."<br>\n";
+	}
+	if (GETPOST("email") && !isValidEmail(GETPOST("email"))) {
+		$error++;
+		$langs->load("errors");
+		$errmsg .= $langs->trans("ErrorBadEMail", GETPOST("email"))."<br>\n";
+	}
+	if (!GETPOST("country_id")) {
+		$error++;
+		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Country"))."<br>\n";
+	}
+
+	if (!$error) {
+		// Getting the thirdparty or creating it
+		$thirdparty = new Societe($db);
+		$resultfetchthirdparty = $thirdparty->fetch('', $societe);
+
+		if ($resultfetchthirdparty<=0) {
+			// Need to create a new one (not found or multiple with the same name)
+			$thirdparty->name     = $societe;
+			$thirdparty->address      = GETPOST("address");
+			$thirdparty->zip          = GETPOST("zipcode");
+			$thirdparty->town         = GETPOST("town");
+			$thirdparty->client       = 2;
+			$thirdparty->fournisseur  = 0;
+			$thirdparty->country_id   = GETPOST("country_id", 'int');
+			$thirdparty->state_id     = GETPOST("state_id", 'int');
+			$thirdparty->email        = $email;
+
+			// Load object modCodeTiers
+			$module = (!empty($conf->global->SOCIETE_CODECLIENT_ADDON) ? $conf->global->SOCIETE_CODECLIENT_ADDON : 'mod_codeclient_leopard');
+			if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php') {
+				$module = substr($module, 0, dol_strlen($module) - 4);
+			}
+			$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
+			foreach ($dirsociete as $dirroot) {
+				$res = dol_include_once($dirroot.$module.'.php');
+				if ($res) {
+					break;
+				}
+			}
+			$modCodeClient = new $module($db);
+
+			if (empty($tmpcode) && !empty($modCodeClient->code_auto)) {
+				$tmpcode = $modCodeClient->getNextValue($thirdparty, 0);
+			}
+			$thirdparty->code_client = $tmpcode;
+			$readythirdparty = $thirdparty->create($user);
+			if ($readythirdparty <0) {
+				$error++;
+				$errmsg .= $thirdparty->error;
+			} else {
+				$thirdparty->country_code = getCountry($thirdparty->country_id, 2, $db, $langs);
+				$thirdparty->country      = getCountry($thirdparty->country_code, 0, $db, $langs);
+			}
+		}
+		// From there we have a thirdparty, now looking for the contact
+		if (!$error) {
+			$contact = new Contact($db);
+			$resultcontact = $contact->fetch('', '', '', $email);
+			if ($resultcontact<=0) {
+				// Need to create a contact
+				$contact->socid = $thirdparty->id;
+				$contact->lastname = (string) GETPOST("lastname", 'alpha');
+				$contact->firstname = (string) GETPOST("firstname", 'alpha');
+				$contact->address = (string) GETPOST("address", 'alpha');
+				$contact->zip = (string) GETPOST("zipcode", 'alpha');
+				$contact->town = (string) GETPOST("town", 'alpha');
+				$contact->country_id = (int) GETPOST("country_id", 'int');
+				$contact->state_id = (int) GETPOST("state_id", 'int');
+				$contact->email = $email;
+				$contact->statut = 1; //Default status to Actif
+
+				$resultcreatecontact = $contact->create($user);
+				if ($resultcreatecontact<0) {
+					$error++;
+					$errmsg .= $contact->error;
+				}
+			}
+		}
+
+		if (!$error) {
+			// Adding supplier tag and tag from setup to thirdparty
+			$category = new Categorie($db);
+			if (GETPOST("suggestconference")) {
+				// Conference case
+				$resultcategory = $category->fetch($conf->global->EVENTORGANIZATION_CATEG_THIRDPARTY_CONF);
+			} else {
+				// Booth case
+				$resultcategory = $category->fetch($conf->global->EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH);
+			}
+
+			if ($resultcategory<=0) {
+				$error++;
+				$errmsg .= $category->error;
+			} else {
+				$resultsetcategory = $thirdparty->setCategoriesCommon(array($category->id), CATEGORIE::TYPE_CUSTOMER, false);
+				if ($resultsetcategory < 0) {
+					$error++;
+					$errmsg .= $thirdparty->error;
+				} else {
+					$thirdparty->fournisseur = 1;
+
+					// Load object modCodeFournisseur
+					$module = (!empty($conf->global->SOCIETE_CODECLIENT_ADDON) ? $conf->global->SOCIETE_CODECLIENT_ADDON : 'mod_codeclient_leopard');
+					if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php') {
+						$module = substr($module, 0, dol_strlen($module) - 4);
+					}
+					$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
+					foreach ($dirsociete as $dirroot) {
+						$res = dol_include_once($dirroot.$module.'.php');
+						if ($res) {
+							break;
+						}
+					}
+					$modCodeFournisseur = new $module;
+					if (empty($tmpcode) && !empty($modCodeFournisseur->code_auto)) {
+						$tmpcode = $modCodeFournisseur->getNextValue($thirdparty, 1);
+					}
+					$thirdparty->code_fournisseur = $tmpcode;
+
+					$res = $thirdparty->update(0, $user, 1, 1, 1);
+
+					if ($res <= 0) {
+						$error++;
+					}
+				}
+			}
+		}
+
+		if (!$error) {
+			// We have the contact and the thirdparty
+			$conforbooth = new ConferenceOrBooth($db);
+			$conforbooth->label = $label;
+			$conforbooth->fk_soc = $thirdparty->id;
+			$conforbooth->fk_project = $project->id;
+			$conforbooth->note = $note;
+			$conforbooth->fk_action = $eventtype;
+			$conforbooth->datep =$datestart;
+			$conforbooth->datep2 = $dateend;
+			$conforbooth->datec = dol_now();
+			$conforbooth->tms = dol_now();
+			$resultconforbooth = $conforbooth->create($user);
+			if ($resultconforbooth<=0) {
+				$error++;
+				$errmsg .= $conforbooth->error;
+			} else {
+				// If this is a paying booth, we have to redirect to payment page and create an invoice
+				if (GETPOST("suggestbooth") && !empty(floatval($project->price_booth))) {
+					$productforinvoicerow = new Product($db);
+					$resultprod = $productforinvoicerow->fetch($conf->global->SERVICE_BOOTH_LOCATION);
+					if ($resultprod < 0) {
+						$error++;
+						$errmsg .= $productforinvoicerow->error;
+					} else {
+						$facture = new Facture($db);
+						$facture->type = Facture::TYPE_STANDARD;
+						$facture->socid = $thirdparty->id;
+						$facture->paye = 0;
+						$facture->date = dol_now();
+						$facture->cond_reglement_id = $contact->cond_reglement_id;
+
+						if (empty($facture->cond_reglement_id)) {
+							$paymenttermstatic = new PaymentTerm($contact->db);
+							$facture->cond_reglement_id = $paymenttermstatic->getDefaultId();
+							if (empty($facture->cond_reglement_id)) {
+								$error++;
+								$contact->error = 'ErrorNoPaymentTermRECEPFound';
+								$contact->errors[] = $contact->error;
+							}
+						}
+						$resultfacture = $facture->create($user);
+						if ($resultfacture <= 0) {
+							$contact->error = $facture->error;
+							$contact->errors = $facture->errors;
+							$error++;
+						} else {
+							$facture->add_object_linked($contact->element, $contact->id);
+						}
+					}
+
+					if (!$error) {
+						// Add line to draft invoice
+						$vattouse = get_default_tva($mysoc, $thirdparty, $productforinvoicerow->id);
+						$result = $facture->addline($langs->trans("BoothLocationFee", $conforbooth->label, dol_print_date($conforbooth->datep, '%d/%m/%y %H:%M:%S'), dol_print_date($conforbooth->datep2, '%d/%m/%y %H:%M:%S')), floatval($project->price_booth), 1, $vattouse, 0, 0, $productforinvoicerow->id, 0, dol_now(), '', 0, 0, '', 'HT', 0, 1);
+						if ($result <= 0) {
+							$contact->error = $facture->error;
+							$contact->errors = $facture->errors;
+							$error++;
+						}
+						if (!$error) {
+							$valid = true;
+							$sourcetouse = 'boothlocation';
+							$reftouse = $facture->id;
+							$redirection = $dolibarr_main_url_root.'/public/payment/newpayment.php?source='.$sourcetouse.'&ref='.$reftouse.'&booth='.$conforbooth->id;
+							if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
+								if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
+									$redirection .= '&securekey='.dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $sourcetouse . $reftouse, 2); // Use the source in the hash to avoid duplicates if the references are identical
+								} else {
+									$redirection .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
+								}
+							}
+							Header("Location: ".$redirection);
+							exit;
+						}
+					}
+				} else {
+					// If no price has been set for the booth or this is a conference, we confirm it as suggested and we update
+					$conforbooth->status = CONFERENCEORBOOTH::STATUS_SUGGESTED;
+					$conforbooth->update($user);
+					// Sending mail
+					require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+					include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+					$formmail = new FormMail($db);
+					// Set output language
+					$outputlangs = new Translate('', $conf);
+					$outputlangs->setDefaultLang(empty($thirdparty->default_lang) ? $mysoc->default_lang : $thirdparty->default_lang);
+					// Load traductions files required by page
+					$outputlangs->loadLangs(array("main", "members"));
+					// Get email content from template
+					$arraydefaultmessage = null;
+
+					$labeltouse = $conf->global->EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT;
+					if (!empty($labeltouse)) {
+						$arraydefaultmessage = $formmail->getEMailTemplate($db, 'eventorganization_send', $user, $outputlangs, $labeltouse, 1, '');
+					}
+
+					if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
+						$subject = $arraydefaultmessage->topic;
+						$msg     = $arraydefaultmessage->content;
+					}
+
+					$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $thirdparty);
+					complete_substitutions_array($substitutionarray, $outputlangs, $object);
+
+					$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
+					$texttosend = make_substitutions($msg, $substitutionarray, $outputlangs);
+
+					$sendto = $thirdparty->email;
+					$from = $conf->global->MAILING_EMAIL_FROM;
+					$urlback = $_SERVER["REQUEST_URI"];
+
+					$ishtml = dol_textishtml($texttosend); // May contain urls
+
+					$mailfile = new CMailFile($subjecttosend, $sendto, $from, $texttosend, array(), array(), array(), '', '', 0, $ishtml);
+
+					$result = $mailfile->sendfile();
+					if ($result) {
+						dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_payment');
+					} else {
+						dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
+					}
+				}
+			}
+		}
+	}
+	if (!$error) {
+		$db->commit();
+		$encodedid = dol_encode($id, $dolibarr_main_instance_unique_id);
+		$securekeyurl = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$id, 2);
+		$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?id='.$encodedid.'&securekey='.$securekeyurl;
+		Header("Location: ".$redirection);
+		exit;
+	} else {
+		$db->rollback();
+	}
+}
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+$formcompany = new FormCompany($db);
+
+llxHeaderVierge($langs->trans("NewSuggestion"));
+
+
+print load_fiche_titre($langs->trans("NewSuggestion"), '', '', 0, 0, 'center');
+
+
+print '<div align="center">';
+print '<div id="divsubscribe">';
+print '<div class="center subscriptionformhelptext justify">';
+
+// Welcome message
+$text  = '<tr><td class="textpublicpayment"><strong>'.$langs->trans("EvntOrgRegistrationWelcomeMessage").'</strong></td></tr></br>';
+$text .= '<tr><td class="textpublicpayment">'.$langs->trans("EvntOrgRegistrationHelpMessage").' '.$id.'.<br><br></td></tr>'."\n";
+$text .= '<tr><td class="textpublicpayment">'.$project->note_public.'</td></tr>'."\n";;
+print $text;
+print '</div>';
+
+dol_htmloutput_errors($errmsg);
+
+// Print form
+print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST" name="newmember">'."\n";
+print '<input type="hidden" name="token" value="'.newToken().'" / >';
+print '<input type="hidden" name="entity" value="'.$entity.'" />';
+print '<input type="hidden" name="action" value="add" />';
+print '<input type="hidden" name="id" value="'.$encodedid.'" />';
+print '<input type="hidden" name="securekey" value="'.$securekeyreceived.'" />';
+
+print '<br>';
+
+print '<br><span class="opacitymedium">'.$langs->trans("FieldsWithAreMandatory", '*').'</span><br>';
+//print $langs->trans("FieldsWithIsForPublic",'**').'<br>';
+
+print dol_get_fiche_head('');
+
+print '<script type="text/javascript">
+jQuery(document).ready(function () {
+    jQuery(document).ready(function () {
+        jQuery("#selectcountry_id").change(function() {
+           document.newmember.action.value="create";
+           document.newmember.submit();
+        });
+    });
+});
+</script>';
+
+print '<table class="border" summary="form to subscribe" id="tablesubscribe">'."\n";
+
+// Name
+print '<tr><td><label for="lastname">'.$langs->trans("Lastname").' / '.$langs->trans("Label").'<FONT COLOR="red">*</FONT></label></td>';
+print '<td colspan="3"><input name="lastname" id="lastname" type="text" class="maxwidth100onsmartphone" maxlength="80" value="'.dol_escape_htmltag(GETPOST("lastname", 'alpha') ?GETPOST("lastname", 'alpha') : $object->lastname).'" autofocus="autofocus"></td>';
+print '</tr>';
+// Email
+print '<tr><td>'.$langs->trans("Email").'<FONT COLOR="red">*</FONT></td><td><input type="text" name="email" maxlength="255" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('email')).'"></td></tr>'."\n";
+// Company
+print '<tr id="trcompany" class="trcompany"><td>'.$langs->trans("Company").'<FONT COLOR="red">*</FONT>';
+print ' </td><td><input type="text" name="societe" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('societe')).'"></td></tr>'."\n";
+// Type of event
+print '<tr><td>'.$langs->trans("EventType").'<FONT COLOR="red">*</FONT></td>'."\n";
+print '<td>'.FORM::selectarray('eventtype', $arrayofeventtype, $eventtype).'</td>';
+// Label
+print '<tr><td>'.$langs->trans("Label").'<FONT COLOR="red">*</FONT></td>'."\n";
+print '</td><td><input type="text" name="label" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('label')).'"></td></tr>'."\n";
+// Note
+print '<tr><td>'.$langs->trans("Note").'<FONT COLOR="red">*</FONT></td>'."\n";
+print '<td><input type="text" name="note" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('note')).'"></td></tr>'."\n";
+// Start Date
+print '<tr><td>'.$langs->trans("DateStart").'</td>'."\n";
+print '<td><input type="date" name="datestart" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('datestart')).'"></td></tr>'."\n";
+// End Date
+print '<tr><td>'.$langs->trans("DateEnd").'</td>'."\n";
+print '<td><input type="date" name="dateend" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('dateend')).'"></td></tr>'."\n";
+// Address
+print '<tr><td>'.$langs->trans("Address").'</td><td>'."\n";
+print '<textarea name="address" id="address" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.dol_escape_htmltag(GETPOST('address', 'restricthtml'), 0, 1).'</textarea></td></tr>'."\n";
+// Zip / Town
+print '<tr><td>'.$langs->trans('Zip').' / '.$langs->trans('Town').'</td><td>';
+print $formcompany->select_ziptown(GETPOST('zipcode'), 'zipcode', array('town', 'selectcountry_id', 'state_id'), 6, 1);
+print ' / ';
+print $formcompany->select_ziptown(GETPOST('town'), 'town', array('zipcode', 'selectcountry_id', 'state_id'), 0, 1);
+print '</td></tr>';
+// Country
+print '<tr><td>'.$langs->trans('Country').'<FONT COLOR="red">*</FONT></td><td>';
+$country_id = GETPOST('country_id');
+if (!$country_id && !empty($conf->global->MEMBER_NEWFORM_FORCECOUNTRYCODE)) {
+	$country_id = getCountry($conf->global->MEMBER_NEWFORM_FORCECOUNTRYCODE, 2, $db, $langs);
+}
+if (!$country_id && !empty($conf->geoipmaxmind->enabled)) {
+	$country_code = dol_user_country();
+	//print $country_code;
+	if ($country_code) {
+		$new_country_id = getCountry($country_code, 3, $db, $langs);
+		//print 'xxx'.$country_code.' - '.$new_country_id;
+		if ($new_country_id) {
+			$country_id = $new_country_id;
+		}
+	}
+}
+$country_code = getCountry($country_id, 2, $db, $langs);
+print $form->select_country($country_id, 'country_id');
+print '</td></tr>';
+// State
+if (empty($conf->global->SOCIETE_DISABLE_STATE)) {
+	print '<tr><td>'.$langs->trans('State').'</td><td>';
+	if ($country_code) {
+		print $formcompany->select_state(GETPOST("state_id"), $country_code);
+	} else {
+		print '';
+	}
+	print '</td></tr>';
+}
+
+print "</table>\n";
+
+print dol_get_fiche_end();
+
+
+// Show all action buttons
+print '<div class="center">';
+print '<br>';
+// Output introduction text
+if ($project->accept_conference_suggestions) {
+	print '<input type="submit" value="'.$langs->trans("SuggestConference").'" name="suggestconference"  id="suggestconference" class="button">';
+	print '<br><br>';
+}
+print '<input type="submit" value="'.$langs->trans("ViewAndVote").'" name="viewandvote" id="viewandvote" class="button">';
+print '<br><br>';
+if ($project->accept_booth_suggestions) {
+	print '<input type="submit" value="'.$langs->trans("SuggestBooth").'" name="suggestbooth" id="suggestbooth" class="button">';
+}
+print '</div>';
+print '<br><br>';
+
+
+
+print "</form>\n";
+print "<br>";
+print '</div></div>';
+
+
+llxFooterVierge();
+
+$db->close();
diff --git a/htdocs/public/project/suggestconference.php b/htdocs/public/project/suggestconference.php
index b3d9bbc7f37..e4c030c9718 100644
--- a/htdocs/public/project/suggestconference.php
+++ b/htdocs/public/project/suggestconference.php
@@ -1 +1,658 @@
 <?php
+/* Copyright (C) 2001-2002  Rodolphe Quiedeville    <rodolphe@quiedeville.org>
+ * Copyright (C) 2001-2002  Jean-Louis Bergamo      <jlb@j1b.org>
+ * Copyright (C) 2006-2013  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2012       Regis Houssin           <regis.houssin@inodbox.com>
+ * Copyright (C) 2012       J. Fernando Lagrange    <fernando@demo-tic.org>
+ * Copyright (C) 2018-2019  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018       Alexandre Spangaro      <aspangaro@open-dsi.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       htdocs/public/members/new.php
+ *	\ingroup    member
+ *	\brief      Example of form to add a new member
+ *
+ *  Note that you can add following constant to change behaviour of page
+ *  MEMBER_NEWFORM_AMOUNT               Default amount for auto-subscribe form
+ *  MEMBER_NEWFORM_EDITAMOUNT           0 or 1 = Amount can be edited
+ *  MEMBER_NEWFORM_PAYONLINE            Suggest payment with paypal, paybox or stripe
+ *  MEMBER_NEWFORM_DOLIBARRTURNOVER     Show field turnover (specific for dolibarr foundation)
+ *  MEMBER_URL_REDIRECT_SUBSCRIPTION    Url to redirect once subscribe submitted
+ *  MEMBER_NEWFORM_FORCETYPE            Force type of member
+ *  MEMBER_NEWFORM_FORCEMORPHY          Force nature of member (mor/phy)
+ *  MEMBER_NEWFORM_FORCECOUNTRYCODE     Force country
+ */
+
+if (!defined('NOLOGIN')) {
+	define("NOLOGIN", 1); // This means this output page does not require to be logged.
+}
+if (!defined('NOCSRFCHECK')) {
+	define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
+}
+if (!defined('NOIPCHECK')) {
+	define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
+}
+if (!defined('NOBROWSERNOTIF')) {
+	define('NOBROWSERNOTIF', '1');
+}
+if (!defined('NOIPCHECK')) {
+	define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
+}
+
+// For MultiCompany module.
+// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
+// TODO This should be useless. Because entity must be retrieve from object ref and not from url.
+$entity = (!empty($_GET['entity']) ? (int) $_GET['entity'] : (!empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
+if (is_numeric($entity)) {
+	define("DOLENTITY", $entity);
+}
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorbooth.class.php';
+require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/paymentterm.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+
+global $dolibarr_main_instance_unique_id;
+global $dolibarr_main_url_root;
+
+// Init vars
+$errmsg = '';
+$num = 0;
+$error = 0;
+$backtopage = GETPOST('backtopage', 'alpha');
+$action = GETPOST('action', 'aZ09');
+
+$eventtype = GETPOST("eventtype");
+$email = GETPOST("email");
+$societe = GETPOST("societe");
+$label = GETPOST("label");
+$note = GETPOST("note");
+$datestart = GETPOST("datestart");
+$dateend = GETPOST("dateend");
+
+// Getting id from Post and decoding it
+$encodedid = GETPOST('id');
+$id = dol_decode($encodedid, $dolibarr_main_instance_unique_id);
+
+$project = new Project($db);
+$resultproject = $project->fetch($id);
+if ($resultproject < 0) {
+	$error++;
+	$errmsg .= $project->error;
+}
+
+// Security check
+$id = dol_decode($encodedid, $dolibarr_main_instance_unique_id);
+$securekeyreceived = GETPOST("securekey");
+$securekeytocompare = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$id, 2);
+
+if ($securekeytocompare != $securekeyreceived) {
+	print $langs->trans('MissingOrBadSecureKey');
+	exit;
+}
+
+// Load translation files
+$langs->loadLangs(array("main", "companies", "install", "other", "eventorganization"));
+
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('publicnewmembercard', 'globalcard'));
+
+$extrafields = new ExtraFields($db);
+
+$user->loadDefaultValues();
+
+$cactioncomm = new CActionComm($db);
+$arrayofeventtype = $cactioncomm->liste_array('', 'id', '', 0, 'module=\'conference@eventorganization\' OR module=\'booth@eventorganization\'');
+
+/**
+ * Show header for new member
+ *
+ * @param 	string		$title				Title
+ * @param 	string		$head				Head array
+ * @param 	int    		$disablejs			More content into html header
+ * @param 	int    		$disablehead		More content into html header
+ * @param 	array  		$arrayofjs			Array of complementary js files
+ * @param 	array  		$arrayofcss			Array of complementary css files
+ * @return	void
+ */
+function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $arrayofjs = '', $arrayofcss = '')
+{
+	global $user, $conf, $langs, $mysoc;
+
+	top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss); // Show html headers
+
+	print '<body id="mainbody" class="publicnewmemberform">';
+
+	// Define urllogo
+	$urllogo = DOL_URL_ROOT.'/theme/common/login_logo.png';
+
+	if (!empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small)) {
+		$urllogo = DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_small);
+	} elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo)) {
+		$urllogo = DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/'.$mysoc->logo);
+	} elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.svg')) {
+		$urllogo = DOL_URL_ROOT.'/theme/dolibarr_logo.svg';
+	}
+
+	print '<div class="center">';
+	// Output html code for logo
+	if ($urllogo) {
+		print '<div class="backgreypublicpayment">';
+		print '<div class="logopublicpayment">';
+		print '<img id="dolpaymentlogo" src="'.$urllogo.'"';
+		print '>';
+		print '</div>';
+		if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
+			print '<div class="poweredbypublicpayment opacitymedium right"><a class="poweredbyhref" href="https://www.dolibarr.org?utm_medium=website&utm_source=poweredby" target="dolibarr" rel="noopener">'.$langs->trans("PoweredBy").'<br><img class="poweredbyimg" src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
+		}
+		print '</div>';
+	}
+	print '</div>';
+
+	print '<div class="divmainbodylarge">';
+}
+
+/**
+ * Show footer for new member
+ *
+ * @return	void
+ */
+function llxFooterVierge()
+{
+	print '</div>';
+
+	printCommonFooter('public');
+
+	print "</body>\n";
+	print "</html>\n";
+}
+
+
+
+/*
+ * Actions
+ */
+global $mysoc;
+$parameters = array();
+// Note that $action and $object may have been modified by some hooks
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action);
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
+
+// Action called when page is submitted
+if (empty($reshook) && $action == 'add') {
+	$error = 0;
+
+	$urlback = '';
+
+	$db->begin();
+
+	if (!GETPOST("email")) {
+		$error++;
+		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Email"))."<br>\n";
+	}
+	if (!GETPOST("label")) {
+		$error++;
+		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label"))."<br>\n";
+	}
+	if (!GETPOST("note")) {
+		$error++;
+		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Note"))."<br>\n";
+	}
+	if (!GETPOST("datestart")) {
+		$error++;
+		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DateStart"))."<br>\n";
+	}
+	if (!GETPOST("dateend")) {
+		$error++;
+		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DateEnd"))."<br>\n";
+	}
+	if (!GETPOST("email")) {
+		$error++;
+		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Email"))."<br>\n";
+	}
+	if (!GETPOST("lastname")) {
+		$error++;
+		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Name"))."<br>\n";
+	}
+	if (!GETPOST("societe")) {
+		$error++;
+		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Societe"))."<br>\n";
+	}
+	if (GETPOST("email") && !isValidEmail(GETPOST("email"))) {
+		$error++;
+		$langs->load("errors");
+		$errmsg .= $langs->trans("ErrorBadEMail", GETPOST("email"))."<br>\n";
+	}
+	if (!GETPOST("country_id")) {
+		$error++;
+		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Country"))."<br>\n";
+	}
+
+	if (!$error) {
+		// Getting the thirdparty or creating it
+		$thirdparty = new Societe($db);
+		$resultfetchthirdparty = $thirdparty->fetch('', $societe);
+
+		if ($resultfetchthirdparty<=0) {
+			// Need to create a new one (not found or multiple with the same name)
+			$thirdparty->name     = $societe;
+			$thirdparty->address      = GETPOST("address");
+			$thirdparty->zip          = GETPOST("zipcode");
+			$thirdparty->town         = GETPOST("town");
+			$thirdparty->client       = 2;
+			$thirdparty->fournisseur  = 0;
+			$thirdparty->country_id   = GETPOST("country_id", 'int');
+			$thirdparty->state_id     = GETPOST("state_id", 'int');
+			$thirdparty->email        = $email;
+
+			// Load object modCodeTiers
+			$module = (!empty($conf->global->SOCIETE_CODECLIENT_ADDON) ? $conf->global->SOCIETE_CODECLIENT_ADDON : 'mod_codeclient_leopard');
+			if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php') {
+				$module = substr($module, 0, dol_strlen($module) - 4);
+			}
+			$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
+			foreach ($dirsociete as $dirroot) {
+				$res = dol_include_once($dirroot.$module.'.php');
+				if ($res) {
+					break;
+				}
+			}
+			$modCodeClient = new $module($db);
+
+			if (empty($tmpcode) && !empty($modCodeClient->code_auto)) {
+				$tmpcode = $modCodeClient->getNextValue($thirdparty, 0);
+			}
+			$thirdparty->code_client = $tmpcode;
+			$readythirdparty = $thirdparty->create($user);
+			if ($readythirdparty <0) {
+				$error++;
+				$errmsg .= $thirdparty->error;
+			} else {
+				$thirdparty->country_code = getCountry($thirdparty->country_id, 2, $db, $langs);
+				$thirdparty->country      = getCountry($thirdparty->country_code, 0, $db, $langs);
+			}
+		}
+		// From there we have a thirdparty, now looking for the contact
+		if (!$error) {
+			$contact = new Contact($db);
+			$resultcontact = $contact->fetch('', '', '', $email);
+			if ($resultcontact<=0) {
+				// Need to create a contact
+				$contact->socid = $thirdparty->id;
+				$contact->lastname = (string) GETPOST("lastname", 'alpha');
+				$contact->firstname = (string) GETPOST("firstname", 'alpha');
+				$contact->address = (string) GETPOST("address", 'alpha');
+				$contact->zip = (string) GETPOST("zipcode", 'alpha');
+				$contact->town = (string) GETPOST("town", 'alpha');
+				$contact->country_id = (int) GETPOST("country_id", 'int');
+				$contact->state_id = (int) GETPOST("state_id", 'int');
+				$contact->email = $email;
+				$contact->statut = 1; //Default status to Actif
+
+				$resultcreatecontact = $contact->create($user);
+				if ($resultcreatecontact<0) {
+					$error++;
+					$errmsg .= $contact->error;
+				}
+			}
+		}
+
+		if (!$error) {
+			// Adding supplier tag and tag from setup to thirdparty
+			$category = new Categorie($db);
+			if (GETPOST("suggestconference")) {
+				// Conference case
+				$resultcategory = $category->fetch($conf->global->EVENTORGANIZATION_CATEG_THIRDPARTY_CONF);
+			} else {
+				// Booth case
+				$resultcategory = $category->fetch($conf->global->EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH);
+			}
+
+			if ($resultcategory<=0) {
+				$error++;
+				$errmsg .= $category->error;
+			} else {
+				$resultsetcategory = $thirdparty->setCategoriesCommon(array($category->id), CATEGORIE::TYPE_CUSTOMER, false);
+				if ($resultsetcategory < 0) {
+					$error++;
+					$errmsg .= $thirdparty->error;
+				} else {
+					$thirdparty->fournisseur = 1;
+
+					// Load object modCodeFournisseur
+					$module = (!empty($conf->global->SOCIETE_CODECLIENT_ADDON) ? $conf->global->SOCIETE_CODECLIENT_ADDON : 'mod_codeclient_leopard');
+					if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php') {
+						$module = substr($module, 0, dol_strlen($module) - 4);
+					}
+					$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
+					foreach ($dirsociete as $dirroot) {
+						$res = dol_include_once($dirroot.$module.'.php');
+						if ($res) {
+							break;
+						}
+					}
+					$modCodeFournisseur = new $module;
+					if (empty($tmpcode) && !empty($modCodeFournisseur->code_auto)) {
+						$tmpcode = $modCodeFournisseur->getNextValue($thirdparty, 1);
+					}
+					$thirdparty->code_fournisseur = $tmpcode;
+
+					$res = $thirdparty->update(0, $user, 1, 1, 1);
+
+					if ($res <= 0) {
+						$error++;
+					}
+				}
+			}
+		}
+
+		if (!$error) {
+			// We have the contact and the thirdparty
+			$conforbooth = new ConferenceOrBooth($db);
+			$conforbooth->label = $label;
+			$conforbooth->fk_soc = $thirdparty->id;
+			$conforbooth->fk_project = $project->id;
+			$conforbooth->note = $note;
+			$conforbooth->fk_action = $eventtype;
+			$conforbooth->datep =$datestart;
+			$conforbooth->datep2 = $dateend;
+			$conforbooth->datec = dol_now();
+			$conforbooth->tms = dol_now();
+			$resultconforbooth = $conforbooth->create($user);
+			if ($resultconforbooth<=0) {
+				$error++;
+				$errmsg .= $conforbooth->error;
+			} else {
+				// If this is a paying booth, we have to redirect to payment page and create an invoice
+				if (GETPOST("suggestbooth") && !empty(floatval($project->price_booth))) {
+					$productforinvoicerow = new Product($db);
+					$resultprod = $productforinvoicerow->fetch($conf->global->SERVICE_BOOTH_LOCATION);
+					if ($resultprod < 0) {
+						$error++;
+						$errmsg .= $productforinvoicerow->error;
+					} else {
+						$facture = new Facture($db);
+						$facture->type = Facture::TYPE_STANDARD;
+						$facture->socid = $thirdparty->id;
+						$facture->paye = 0;
+						$facture->date = dol_now();
+						$facture->cond_reglement_id = $contact->cond_reglement_id;
+
+						if (empty($facture->cond_reglement_id)) {
+							$paymenttermstatic = new PaymentTerm($contact->db);
+							$facture->cond_reglement_id = $paymenttermstatic->getDefaultId();
+							if (empty($facture->cond_reglement_id)) {
+								$error++;
+								$contact->error = 'ErrorNoPaymentTermRECEPFound';
+								$contact->errors[] = $contact->error;
+							}
+						}
+						$resultfacture = $facture->create($user);
+						if ($resultfacture <= 0) {
+							$contact->error = $facture->error;
+							$contact->errors = $facture->errors;
+							$error++;
+						} else {
+							$facture->add_object_linked($contact->element, $contact->id);
+						}
+					}
+
+					if (!$error) {
+						// Add line to draft invoice
+						$vattouse = get_default_tva($mysoc, $thirdparty, $productforinvoicerow->id);
+						$result = $facture->addline($langs->trans("BoothLocationFee", $conforbooth->label, dol_print_date($conforbooth->datep, '%d/%m/%y %H:%M:%S'), dol_print_date($conforbooth->datep2, '%d/%m/%y %H:%M:%S')), floatval($project->price_booth), 1, $vattouse, 0, 0, $productforinvoicerow->id, 0, dol_now(), '', 0, 0, '', 'HT', 0, 1);
+						if ($result <= 0) {
+							$contact->error = $facture->error;
+							$contact->errors = $facture->errors;
+							$error++;
+						}
+						if (!$error) {
+							$valid = true;
+							$sourcetouse = 'boothlocation';
+							$reftouse = $facture->id;
+							$redirection = $dolibarr_main_url_root.'/public/payment/newpayment.php?source='.$sourcetouse.'&ref='.$reftouse.'&booth='.$conforbooth->id;
+							if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
+								if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
+									$redirection .= '&securekey='.dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $sourcetouse . $reftouse, 2); // Use the source in the hash to avoid duplicates if the references are identical
+								} else {
+									$redirection .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
+								}
+							}
+							Header("Location: ".$redirection);
+							exit;
+						}
+					}
+				} else {
+					// If no price has been set for the booth or this is a conference, we confirm it as suggested and we update
+					$conforbooth->status = CONFERENCEORBOOTH::STATUS_SUGGESTED;
+					$conforbooth->update($user);
+					// Sending mail
+					require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+					include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+					$formmail = new FormMail($db);
+					// Set output language
+					$outputlangs = new Translate('', $conf);
+					$outputlangs->setDefaultLang(empty($thirdparty->default_lang) ? $mysoc->default_lang : $thirdparty->default_lang);
+					// Load traductions files required by page
+					$outputlangs->loadLangs(array("main", "members"));
+					// Get email content from template
+					$arraydefaultmessage = null;
+
+					$labeltouse = $conf->global->EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT;
+					if (!empty($labeltouse)) {
+						$arraydefaultmessage = $formmail->getEMailTemplate($db, 'eventorganization_send', $user, $outputlangs, $labeltouse, 1, '');
+					}
+
+					if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
+						$subject = $arraydefaultmessage->topic;
+						$msg     = $arraydefaultmessage->content;
+					}
+
+					$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $thirdparty);
+					complete_substitutions_array($substitutionarray, $outputlangs, $object);
+
+					$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
+					$texttosend = make_substitutions($msg, $substitutionarray, $outputlangs);
+
+					$sendto = $thirdparty->email;
+					$from = $conf->global->MAILING_EMAIL_FROM;
+					$urlback = $_SERVER["REQUEST_URI"];
+
+					$ishtml = dol_textishtml($texttosend); // May contain urls
+
+					$mailfile = new CMailFile($subjecttosend, $sendto, $from, $texttosend, array(), array(), array(), '', '', 0, $ishtml);
+
+					$result = $mailfile->sendfile();
+					if ($result) {
+						dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_payment');
+					} else {
+						dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
+					}
+				}
+			}
+		}
+	}
+	if (!$error) {
+		$db->commit();
+		$encodedid = dol_encode($id, $dolibarr_main_instance_unique_id);
+		$securekeyurl = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$id, 2);
+		$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?id='.$encodedid.'&securekey='.$securekeyurl;
+		Header("Location: ".$redirection);
+		exit;
+	} else {
+		$db->rollback();
+	}
+}
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+$formcompany = new FormCompany($db);
+
+llxHeaderVierge($langs->trans("NewSuggestion"));
+
+
+print load_fiche_titre($langs->trans("NewSuggestion"), '', '', 0, 0, 'center');
+
+
+print '<div align="center">';
+print '<div id="divsubscribe">';
+print '<div class="center subscriptionformhelptext justify">';
+
+// Welcome message
+$text  = '<tr><td class="textpublicpayment"><strong>'.$langs->trans("EvntOrgRegistrationWelcomeMessage").'</strong></td></tr></br>';
+$text .= '<tr><td class="textpublicpayment">'.$langs->trans("EvntOrgRegistrationHelpMessage").' '.$id.'.<br><br></td></tr>'."\n";
+$text .= '<tr><td class="textpublicpayment">'.$project->note_public.'</td></tr>'."\n";;
+print $text;
+print '</div>';
+
+dol_htmloutput_errors($errmsg);
+
+// Print form
+print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST" name="newmember">'."\n";
+print '<input type="hidden" name="token" value="'.newToken().'" / >';
+print '<input type="hidden" name="entity" value="'.$entity.'" />';
+print '<input type="hidden" name="action" value="add" />';
+print '<input type="hidden" name="id" value="'.$encodedid.'" />';
+print '<input type="hidden" name="securekey" value="'.$securekeyreceived.'" />';
+
+print '<br>';
+
+print '<br><span class="opacitymedium">'.$langs->trans("FieldsWithAreMandatory", '*').'</span><br>';
+//print $langs->trans("FieldsWithIsForPublic",'**').'<br>';
+
+print dol_get_fiche_head('');
+
+print '<script type="text/javascript">
+jQuery(document).ready(function () {
+    jQuery(document).ready(function () {
+        jQuery("#selectcountry_id").change(function() {
+           document.newmember.action.value="create";
+           document.newmember.submit();
+        });
+    });
+});
+</script>';
+
+print '<table class="border" summary="form to subscribe" id="tablesubscribe">'."\n";
+
+// Name
+print '<tr><td><label for="lastname">'.$langs->trans("Lastname").' / '.$langs->trans("Label").'<FONT COLOR="red">*</FONT></label></td>';
+print '<td colspan="3"><input name="lastname" id="lastname" type="text" class="maxwidth100onsmartphone" maxlength="80" value="'.dol_escape_htmltag(GETPOST("lastname", 'alpha') ?GETPOST("lastname", 'alpha') : $object->lastname).'" autofocus="autofocus"></td>';
+print '</tr>';
+// Email
+print '<tr><td>'.$langs->trans("Email").'<FONT COLOR="red">*</FONT></td><td><input type="text" name="email" maxlength="255" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('email')).'"></td></tr>'."\n";
+// Company
+print '<tr id="trcompany" class="trcompany"><td>'.$langs->trans("Company").'<FONT COLOR="red">*</FONT>';
+print ' </td><td><input type="text" name="societe" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('societe')).'"></td></tr>'."\n";
+// Type of event
+print '<tr><td>'.$langs->trans("EventType").'<FONT COLOR="red">*</FONT></td>'."\n";
+print '<td>'.FORM::selectarray('eventtype', $arrayofeventtype, $eventtype).'</td>';
+// Label
+print '<tr><td>'.$langs->trans("Label").'<FONT COLOR="red">*</FONT></td>'."\n";
+print '</td><td><input type="text" name="label" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('label')).'"></td></tr>'."\n";
+// Note
+print '<tr><td>'.$langs->trans("Note").'<FONT COLOR="red">*</FONT></td>'."\n";
+print '<td><input type="text" name="note" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('note')).'"></td></tr>'."\n";
+// Start Date
+print '<tr><td>'.$langs->trans("DateStart").'</td>'."\n";
+print '<td><input type="date" name="datestart" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('datestart')).'"></td></tr>'."\n";
+// End Date
+print '<tr><td>'.$langs->trans("DateEnd").'</td>'."\n";
+print '<td><input type="date" name="dateend" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('dateend')).'"></td></tr>'."\n";
+// Address
+print '<tr><td>'.$langs->trans("Address").'</td><td>'."\n";
+print '<textarea name="address" id="address" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.dol_escape_htmltag(GETPOST('address', 'restricthtml'), 0, 1).'</textarea></td></tr>'."\n";
+// Zip / Town
+print '<tr><td>'.$langs->trans('Zip').' / '.$langs->trans('Town').'</td><td>';
+print $formcompany->select_ziptown(GETPOST('zipcode'), 'zipcode', array('town', 'selectcountry_id', 'state_id'), 6, 1);
+print ' / ';
+print $formcompany->select_ziptown(GETPOST('town'), 'town', array('zipcode', 'selectcountry_id', 'state_id'), 0, 1);
+print '</td></tr>';
+// Country
+print '<tr><td>'.$langs->trans('Country').'<FONT COLOR="red">*</FONT></td><td>';
+$country_id = GETPOST('country_id');
+if (!$country_id && !empty($conf->global->MEMBER_NEWFORM_FORCECOUNTRYCODE)) {
+	$country_id = getCountry($conf->global->MEMBER_NEWFORM_FORCECOUNTRYCODE, 2, $db, $langs);
+}
+if (!$country_id && !empty($conf->geoipmaxmind->enabled)) {
+	$country_code = dol_user_country();
+	//print $country_code;
+	if ($country_code) {
+		$new_country_id = getCountry($country_code, 3, $db, $langs);
+		//print 'xxx'.$country_code.' - '.$new_country_id;
+		if ($new_country_id) {
+			$country_id = $new_country_id;
+		}
+	}
+}
+$country_code = getCountry($country_id, 2, $db, $langs);
+print $form->select_country($country_id, 'country_id');
+print '</td></tr>';
+// State
+if (empty($conf->global->SOCIETE_DISABLE_STATE)) {
+	print '<tr><td>'.$langs->trans('State').'</td><td>';
+	if ($country_code) {
+		print $formcompany->select_state(GETPOST("state_id"), $country_code);
+	} else {
+		print '';
+	}
+	print '</td></tr>';
+}
+
+print "</table>\n";
+
+print dol_get_fiche_end();
+
+
+// Show all action buttons
+print '<div class="center">';
+print '<br>';
+// Output introduction text
+if ($project->accept_conference_suggestions) {
+	print '<input type="submit" value="'.$langs->trans("SuggestConference").'" name="suggestconference"  id="suggestconference" class="button">';
+	print '<br><br>';
+}
+print '<input type="submit" value="'.$langs->trans("ViewAndVote").'" name="viewandvote" id="viewandvote" class="button">';
+print '<br><br>';
+if ($project->accept_booth_suggestions) {
+	print '<input type="submit" value="'.$langs->trans("SuggestBooth").'" name="suggestbooth" id="suggestbooth" class="button">';
+}
+print '</div>';
+print '<br><br>';
+
+
+
+print "</form>\n";
+print "<br>";
+print '</div></div>';
+
+
+llxFooterVierge();
+
+$db->close();

From 10c9e9b77c3017d618209de8bd4a8cd4ec8757ae Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Thu, 6 May 2021 11:31:23 +0200
Subject: [PATCH 0032/1497] wip

---
 htdocs/public/project/index.php | 688 ++++++--------------------------
 1 file changed, 133 insertions(+), 555 deletions(-)

diff --git a/htdocs/public/project/index.php b/htdocs/public/project/index.php
index fcbc786be4c..ce48db9e729 100644
--- a/htdocs/public/project/index.php
+++ b/htdocs/public/project/index.php
@@ -1,11 +1,10 @@
 <?php
-/* Copyright (C) 2001-2002  Rodolphe Quiedeville    <rodolphe@quiedeville.org>
- * Copyright (C) 2001-2002  Jean-Louis Bergamo      <jlb@j1b.org>
- * Copyright (C) 2006-2013  Laurent Destailleur     <eldy@users.sourceforge.net>
- * Copyright (C) 2012       Regis Houssin           <regis.houssin@inodbox.com>
- * Copyright (C) 2012       J. Fernando Lagrange    <fernando@demo-tic.org>
- * Copyright (C) 2018-2019  Frédéric France         <frederic.france@netlogic.fr>
- * Copyright (C) 2018       Alexandre Spangaro      <aspangaro@open-dsi.fr>
+/* Copyright (C) 2001-2002	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2006-2017	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2009-2012	Regis Houssin			<regis.houssin@inodbox.com>
+ * Copyright (C) 2018	    Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2018-2019	Thibault FOUCART	    <support@ptibogxiv.net>
+ * Copyright (C) 2021		Waël Almoman	    	<info@almoman.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
@@ -19,22 +18,21 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
+ * For Paypal test: https://developer.paypal.com/
+ * For Paybox test: ???
+ * For Stripe test: Use credit card 4242424242424242 .More example on https://stripe.com/docs/testing
+ *
+ * Variants:
+ * - When option STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION is on, we use the new PaymentIntent API
+ * - When option STRIPE_USE_NEW_CHECKOUT is on, we use the new checkout API
+ * - If no option set, we use old APIS (charge)
  */
 
 /**
- *	\file       htdocs/public/members/new.php
- *	\ingroup    member
- *	\brief      Example of form to add a new member
- *
- *  Note that you can add following constant to change behaviour of page
- *  MEMBER_NEWFORM_AMOUNT               Default amount for auto-subscribe form
- *  MEMBER_NEWFORM_EDITAMOUNT           0 or 1 = Amount can be edited
- *  MEMBER_NEWFORM_PAYONLINE            Suggest payment with paypal, paybox or stripe
- *  MEMBER_NEWFORM_DOLIBARRTURNOVER     Show field turnover (specific for dolibarr foundation)
- *  MEMBER_URL_REDIRECT_SUBSCRIPTION    Url to redirect once subscribe submitted
- *  MEMBER_NEWFORM_FORCETYPE            Force type of member
- *  MEMBER_NEWFORM_FORCEMORPHY          Force nature of member (mor/phy)
- *  MEMBER_NEWFORM_FORCECOUNTRYCODE     Force country
+ *     	\file       htdocs/public/payment/newpayment.php
+ *		\ingroup    core
+ *		\brief      File to offer a way to make a payment for a particular Dolibarr object
  */
 
 if (!defined('NOLOGIN')) {
@@ -49,52 +47,38 @@ if (!defined('NOIPCHECK')) {
 if (!defined('NOBROWSERNOTIF')) {
 	define('NOBROWSERNOTIF', '1');
 }
-if (!defined('NOIPCHECK')) {
-	define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
-}
 
 // For MultiCompany module.
-// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
-// TODO This should be useless. Because entity must be retrieve from object ref and not from url.
-$entity = (!empty($_GET['entity']) ? (int) $_GET['entity'] : (!empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
+// Do not use GETPOST here, function is not defined and get of entity must be done before including main.inc.php
+$entity = (!empty($_GET['entity']) ? (int) $_GET['entity'] : (!empty($_POST['entity']) ? (int) $_POST['entity'] : (!empty($_GET['e']) ? (int) $_GET['e'] : (!empty($_POST['e']) ? (int) $_POST['e'] : 1))));
 if (is_numeric($entity)) {
 	define("DOLENTITY", $entity);
 }
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorbooth.class.php';
-require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
-require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/societe/class/societeaccount.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/paymentterm.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+// Hook to be used by external payment modules (ie Payzen, ...)
+include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+$hookmanager = new HookManager($db);
+$hookmanager->initHooks(array('newpayment'));
 
+// For encryption
 global $dolibarr_main_instance_unique_id;
-global $dolibarr_main_url_root;
 
-// Init vars
-$errmsg = '';
-$num = 0;
-$error = 0;
-$backtopage = GETPOST('backtopage', 'alpha');
-$action = GETPOST('action', 'aZ09');
-
-// Getting id from Post and decoding it
-$encodedid = GETPOST('id');
-$id = dol_decode($encodedid, $dolibarr_main_instance_unique_id);
-
-$project = new Project($db);
-$resultproject = $project->fetch($id);
-if ($resultproject < 0) {
-	$error++;
-	$errmsg .= $project->error;
-}
+// Load translation files
+$langs->loadLangs(array("main", "other", "dict", "bills", "companies", "errors", "paybox", "paypal", "stripe")); // File with generic data
 
 // Security check
-$id = dol_decode($encodedid, $dolibarr_main_instance_unique_id);
+// No check on module enabled. Done later according to $validpaymentmethod
+
+$action = GETPOST('action', 'aZ09');
+$id = GETPOST('id');
 $securekeyreceived = GETPOST("securekey");
 $securekeytocompare = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$id, 2);
 
@@ -103,548 +87,142 @@ if ($securekeytocompare != $securekeyreceived) {
 	exit;
 }
 
-// Load translation files
-$langs->loadLangs(array("main", "companies", "install", "other", "eventorganization"));
+// 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. For Paypal payment, we can use internal URL like localhost.
 
-// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array('publicnewmembercard', 'globalcard'));
-
-$extrafields = new ExtraFields($db);
-
-$user->loadDefaultValues();
-
-$cactioncomm = new CActionComm($db);
-$arrayofeventtype = $cactioncomm->liste_array('', 'id', '', 0, 'module=\'conference@eventorganization\' OR module=\'booth@eventorganization\'');
-
-/**
- * Show header for new member
- *
- * @param 	string		$title				Title
- * @param 	string		$head				Head array
- * @param 	int    		$disablejs			More content into html header
- * @param 	int    		$disablehead		More content into html header
- * @param 	array  		$arrayofjs			Array of complementary js files
- * @param 	array  		$arrayofcss			Array of complementary css files
- * @return	void
- */
-function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $arrayofjs = '', $arrayofcss = '')
-{
-	global $user, $conf, $langs, $mysoc;
-
-	top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss); // Show html headers
-
-	print '<body id="mainbody" class="publicnewmemberform">';
-
-	// Define urllogo
-	$urllogo = DOL_URL_ROOT.'/theme/common/login_logo.png';
-
-	if (!empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small)) {
-		$urllogo = DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_small);
-	} elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo)) {
-		$urllogo = DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/'.$mysoc->logo);
-	} elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.svg')) {
-		$urllogo = DOL_URL_ROOT.'/theme/dolibarr_logo.svg';
-	}
-
-	print '<div class="center">';
-	// Output html code for logo
-	if ($urllogo) {
-		print '<div class="backgreypublicpayment">';
-		print '<div class="logopublicpayment">';
-		print '<img id="dolpaymentlogo" src="'.$urllogo.'"';
-		print '>';
-		print '</div>';
-		if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
-			print '<div class="poweredbypublicpayment opacitymedium right"><a class="poweredbyhref" href="https://www.dolibarr.org?utm_medium=website&utm_source=poweredby" target="dolibarr" rel="noopener">'.$langs->trans("PoweredBy").'<br><img class="poweredbyimg" src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
-		}
-		print '</div>';
-	}
-	print '</div>';
-
-	print '<div class="divmainbodylarge">';
+$project = new Project($db);
+$resultproject = $project->fetch($id);
+if ($resultproject < 0) {
+	$error++;
+	$errmsg .= $project->error;
 }
 
-/**
- * Show footer for new member
- *
- * @return	void
- */
-function llxFooterVierge()
-{
-	print '</div>';
-
-	printCommonFooter('public');
-
-	print "</body>\n";
-	print "</html>\n";
-}
-
-
-
 /*
  * Actions
  */
-global $mysoc;
-$parameters = array();
-// Note that $action and $object may have been modified by some hooks
-$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action);
-if ($reshook < 0) {
-	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-}
-
-// Action called when page is submitted
-if (empty($reshook) && $action == 'add') {
-	$error = 0;
-
-	$urlback = '';
-
-	$db->begin();
-
-	if (!GETPOST("email")) {
-		$error++;
-		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Email"))."<br>\n";
-	}
-	if (!GETPOST("label")) {
-		$error++;
-		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label"))."<br>\n";
-	}
-	if (!GETPOST("note")) {
-		$error++;
-		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Note"))."<br>\n";
-	}
-	if (!GETPOST("datestart")) {
-		$error++;
-		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DateStart"))."<br>\n";
-	}
-	if (!GETPOST("dateend")) {
-		$error++;
-		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DateEnd"))."<br>\n";
-	}
-	if (!GETPOST("email")) {
-		$error++;
-		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Email"))."<br>\n";
-	}
-	if (!GETPOST("lastname")) {
-		$error++;
-		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Name"))."<br>\n";
-	}
-	if (!GETPOST("societe")) {
-		$error++;
-		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Societe"))."<br>\n";
-	}
-	if (GETPOST("email") && !isValidEmail(GETPOST("email"))) {
-		$error++;
-		$langs->load("errors");
-		$errmsg .= $langs->trans("ErrorBadEMail", GETPOST("email"))."<br>\n";
-	}
-	if (!GETPOST("country_id")) {
-		$error++;
-		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Country"))."<br>\n";
-	}
-
-	if (!$error) {
-		// Getting the thirdparty or creating it
-		$thirdparty = new Societe($db);
-		$resultfetchthirdparty = $thirdparty->fetch('', $societe);
-
-		if ($resultfetchthirdparty<=0) {
-			// Need to create a new one (not found or multiple with the same name)
-			$thirdparty->name     = $societe;
-			$thirdparty->address      = GETPOST("address");
-			$thirdparty->zip          = GETPOST("zipcode");
-			$thirdparty->town         = GETPOST("town");
-			$thirdparty->client       = 2;
-			$thirdparty->fournisseur  = 0;
-			$thirdparty->country_id   = GETPOST("country_id", 'int');
-			$thirdparty->state_id     = GETPOST("state_id", 'int');
-			$thirdparty->email        = $email;
-
-			// Load object modCodeTiers
-			$module = (!empty($conf->global->SOCIETE_CODECLIENT_ADDON) ? $conf->global->SOCIETE_CODECLIENT_ADDON : 'mod_codeclient_leopard');
-			if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php') {
-				$module = substr($module, 0, dol_strlen($module) - 4);
-			}
-			$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
-			foreach ($dirsociete as $dirroot) {
-				$res = dol_include_once($dirroot.$module.'.php');
-				if ($res) {
-					break;
-				}
-			}
-			$modCodeClient = new $module($db);
-
-			if (empty($tmpcode) && !empty($modCodeClient->code_auto)) {
-				$tmpcode = $modCodeClient->getNextValue($thirdparty, 0);
-			}
-			$thirdparty->code_client = $tmpcode;
-			$readythirdparty = $thirdparty->create($user);
-			if ($readythirdparty <0) {
-				$error++;
-				$errmsg .= $thirdparty->error;
-			} else {
-				$thirdparty->country_code = getCountry($thirdparty->country_id, 2, $db, $langs);
-				$thirdparty->country      = getCountry($thirdparty->country_code, 0, $db, $langs);
-			}
-		}
-		// From there we have a thirdparty, now looking for the contact
-		if (!$error) {
-			$contact = new Contact($db);
-			$resultcontact = $contact->fetch('', '', '', $email);
-			if ($resultcontact<=0) {
-				// Need to create a contact
-				$contact->socid = $thirdparty->id;
-				$contact->lastname = (string) GETPOST("lastname", 'alpha');
-				$contact->firstname = (string) GETPOST("firstname", 'alpha');
-				$contact->address = (string) GETPOST("address", 'alpha');
-				$contact->zip = (string) GETPOST("zipcode", 'alpha');
-				$contact->town = (string) GETPOST("town", 'alpha');
-				$contact->country_id = (int) GETPOST("country_id", 'int');
-				$contact->state_id = (int) GETPOST("state_id", 'int');
-				$contact->email = $email;
-				$contact->statut = 1; //Default status to Actif
-
-				$resultcreatecontact = $contact->create($user);
-				if ($resultcreatecontact<0) {
-					$error++;
-					$errmsg .= $contact->error;
-				}
-			}
-		}
-
-		if (!$error) {
-			// Adding supplier tag and tag from setup to thirdparty
-			$category = new Categorie($db);
-			if (GETPOST("suggestconference")) {
-				// Conference case
-				$resultcategory = $category->fetch($conf->global->EVENTORGANIZATION_CATEG_THIRDPARTY_CONF);
-			} else {
-				// Booth case
-				$resultcategory = $category->fetch($conf->global->EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH);
-			}
-
-			if ($resultcategory<=0) {
-				$error++;
-				$errmsg .= $category->error;
-			} else {
-				$resultsetcategory = $thirdparty->setCategoriesCommon(array($category->id), CATEGORIE::TYPE_CUSTOMER, false);
-				if ($resultsetcategory < 0) {
-					$error++;
-					$errmsg .= $thirdparty->error;
-				} else {
-					$thirdparty->fournisseur = 1;
-
-					// Load object modCodeFournisseur
-					$module = (!empty($conf->global->SOCIETE_CODECLIENT_ADDON) ? $conf->global->SOCIETE_CODECLIENT_ADDON : 'mod_codeclient_leopard');
-					if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php') {
-						$module = substr($module, 0, dol_strlen($module) - 4);
-					}
-					$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
-					foreach ($dirsociete as $dirroot) {
-						$res = dol_include_once($dirroot.$module.'.php');
-						if ($res) {
-							break;
-						}
-					}
-					$modCodeFournisseur = new $module;
-					if (empty($tmpcode) && !empty($modCodeFournisseur->code_auto)) {
-						$tmpcode = $modCodeFournisseur->getNextValue($thirdparty, 1);
-					}
-					$thirdparty->code_fournisseur = $tmpcode;
-
-					$res = $thirdparty->update(0, $user, 1, 1, 1);
-
-					if ($res <= 0) {
-						$error++;
-					}
-				}
-			}
-		}
-
-		if (!$error) {
-			// We have the contact and the thirdparty
-			$conforbooth = new ConferenceOrBooth($db);
-			$conforbooth->label = $label;
-			$conforbooth->fk_soc = $thirdparty->id;
-			$conforbooth->fk_project = $project->id;
-			$conforbooth->note = $note;
-			$conforbooth->fk_action = $eventtype;
-			$conforbooth->datep =$datestart;
-			$conforbooth->datep2 = $dateend;
-			$conforbooth->datec = dol_now();
-			$conforbooth->tms = dol_now();
-			$resultconforbooth = $conforbooth->create($user);
-			if ($resultconforbooth<=0) {
-				$error++;
-				$errmsg .= $conforbooth->error;
-			} else {
-				// If this is a paying booth, we have to redirect to payment page and create an invoice
-				if (GETPOST("suggestbooth") && !empty(floatval($project->price_booth))) {
-					$productforinvoicerow = new Product($db);
-					$resultprod = $productforinvoicerow->fetch($conf->global->SERVICE_BOOTH_LOCATION);
-					if ($resultprod < 0) {
-						$error++;
-						$errmsg .= $productforinvoicerow->error;
-					} else {
-						$facture = new Facture($db);
-						$facture->type = Facture::TYPE_STANDARD;
-						$facture->socid = $thirdparty->id;
-						$facture->paye = 0;
-						$facture->date = dol_now();
-						$facture->cond_reglement_id = $contact->cond_reglement_id;
-
-						if (empty($facture->cond_reglement_id)) {
-							$paymenttermstatic = new PaymentTerm($contact->db);
-							$facture->cond_reglement_id = $paymenttermstatic->getDefaultId();
-							if (empty($facture->cond_reglement_id)) {
-								$error++;
-								$contact->error = 'ErrorNoPaymentTermRECEPFound';
-								$contact->errors[] = $contact->error;
-							}
-						}
-						$resultfacture = $facture->create($user);
-						if ($resultfacture <= 0) {
-							$contact->error = $facture->error;
-							$contact->errors = $facture->errors;
-							$error++;
-						} else {
-							$facture->add_object_linked($contact->element, $contact->id);
-						}
-					}
-
-					if (!$error) {
-						// Add line to draft invoice
-						$vattouse = get_default_tva($mysoc, $thirdparty, $productforinvoicerow->id);
-						$result = $facture->addline($langs->trans("BoothLocationFee", $conforbooth->label, dol_print_date($conforbooth->datep, '%d/%m/%y %H:%M:%S'), dol_print_date($conforbooth->datep2, '%d/%m/%y %H:%M:%S')), floatval($project->price_booth), 1, $vattouse, 0, 0, $productforinvoicerow->id, 0, dol_now(), '', 0, 0, '', 'HT', 0, 1);
-						if ($result <= 0) {
-							$contact->error = $facture->error;
-							$contact->errors = $facture->errors;
-							$error++;
-						}
-						if (!$error) {
-							$valid = true;
-							$sourcetouse = 'boothlocation';
-							$reftouse = $facture->id;
-							$redirection = $dolibarr_main_url_root.'/public/payment/newpayment.php?source='.$sourcetouse.'&ref='.$reftouse.'&booth='.$conforbooth->id;
-							if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
-								if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
-									$redirection .= '&securekey='.dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $sourcetouse . $reftouse, 2); // Use the source in the hash to avoid duplicates if the references are identical
-								} else {
-									$redirection .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
-								}
-							}
-							Header("Location: ".$redirection);
-							exit;
-						}
-					}
-				} else {
-					// If no price has been set for the booth or this is a conference, we confirm it as suggested and we update
-					$conforbooth->status = CONFERENCEORBOOTH::STATUS_SUGGESTED;
-					$conforbooth->update($user);
-					// Sending mail
-					require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-					include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-					$formmail = new FormMail($db);
-					// Set output language
-					$outputlangs = new Translate('', $conf);
-					$outputlangs->setDefaultLang(empty($thirdparty->default_lang) ? $mysoc->default_lang : $thirdparty->default_lang);
-					// Load traductions files required by page
-					$outputlangs->loadLangs(array("main", "members"));
-					// Get email content from template
-					$arraydefaultmessage = null;
-
-					$labeltouse = $conf->global->EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT;
-					if (!empty($labeltouse)) {
-						$arraydefaultmessage = $formmail->getEMailTemplate($db, 'eventorganization_send', $user, $outputlangs, $labeltouse, 1, '');
-					}
-
-					if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
-						$subject = $arraydefaultmessage->topic;
-						$msg     = $arraydefaultmessage->content;
-					}
-
-					$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $thirdparty);
-					complete_substitutions_array($substitutionarray, $outputlangs, $object);
-
-					$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
-					$texttosend = make_substitutions($msg, $substitutionarray, $outputlangs);
-
-					$sendto = $thirdparty->email;
-					$from = $conf->global->MAILING_EMAIL_FROM;
-					$urlback = $_SERVER["REQUEST_URI"];
-
-					$ishtml = dol_textishtml($texttosend); // May contain urls
-
-					$mailfile = new CMailFile($subjecttosend, $sendto, $from, $texttosend, array(), array(), array(), '', '', 0, $ishtml);
-
-					$result = $mailfile->sendfile();
-					if ($result) {
-						dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_payment');
-					} else {
-						dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
-					}
-				}
-			}
-		}
-	}
-	if (!$error) {
-		$db->commit();
-		$encodedid = dol_encode($id, $dolibarr_main_instance_unique_id);
-		$securekeyurl = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$id, 2);
-		$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?id='.$encodedid.'&securekey='.$securekeyurl;
-		Header("Location: ".$redirection);
-		exit;
-	} else {
-		$db->rollback();
-	}
-}
 
 
 /*
  * View
  */
 
-$form = new Form($db);
-$formcompany = new FormCompany($db);
+$head = '';
+if (!empty($conf->global->ONLINE_PAYMENT_CSS_URL)) {
+	$head = '<link rel="stylesheet" type="text/css" href="'.$conf->global->ONLINE_PAYMENT_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
+}
 
-llxHeaderVierge($langs->trans("NewSuggestion"));
+$conf->dol_hide_topmenu = 1;
+$conf->dol_hide_leftmenu = 1;
+
+$replacemainarea = (empty($conf->dol_hide_leftmenu) ? '<div>' : '').'<div>';
+llxHeader($head, $langs->trans("PaymentForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody', $replacemainarea);
 
 
-print load_fiche_titre($langs->trans("NewSuggestion"), '', '', 0, 0, 'center');
+// Show sandbox warning
+if ((empty($paymentmethod) || $paymentmethod == 'paypal') && !empty($conf->paypal->enabled) && (!empty($conf->global->PAYPAL_API_SANDBOX) || GETPOST('forcesandbox', 'int'))) {		// We can force sand box with param 'forcesandbox'
+	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Paypal'), '', 'warning');
+}
+if ((empty($paymentmethod) || $paymentmethod == 'stripe') && !empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox', 'int'))) {
+	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Stripe'), '', 'warning');
+}
 
 
-print '<div align="center">';
-print '<div id="divsubscribe">';
-print '<div class="center subscriptionformhelptext justify">';
+print '<span id="dolpaymentspan"></span>'."\n";
+print '<div class="center">'."\n";
+print '<form id="dolpaymentform" class="center" name="paymentform" action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";
+print '<input type="hidden" name="token" value="'.newToken().'">'."\n";
+print '<input type="hidden" name="action" value="dopayment">'."\n";
+print '<input type="hidden" name="tag" value="'.GETPOST("tag", 'alpha').'">'."\n";
+print '<input type="hidden" name="suffix" value="'.dol_escape_htmltag($suffix).'">'."\n";
+print '<input type="hidden" name="securekey" value="'.dol_escape_htmltag($SECUREKEY).'">'."\n";
+print '<input type="hidden" name="e" value="'.$entity.'" />';
+print '<input type="hidden" name="forcesandbox" value="'.GETPOST('forcesandbox', 'int').'" />';
+print "\n";
 
-// Welcome message
-$text  = '<tr><td class="textpublicpayment"><strong>'.$langs->trans("EvntOrgRegistrationWelcomeMessage").'</strong></td></tr></br>';
+
+// Show logo (search order: logo defined by PAYMENT_LOGO_suffix, then PAYMENT_LOGO, then small company logo, large company logo, theme logo, common logo)
+// Define logo and logosmall
+$logosmall = $mysoc->logo_small;
+$logo = $mysoc->logo;
+$paramlogo = 'ONLINE_PAYMENT_LOGO_'.$suffix;
+if (!empty($conf->global->$paramlogo)) {
+	$logosmall = $conf->global->$paramlogo;
+} elseif (!empty($conf->global->ONLINE_PAYMENT_LOGO)) {
+	$logosmall = $conf->global->ONLINE_PAYMENT_LOGO;
+}
+//print '<!-- Show logo (logosmall='.$logosmall.' logo='.$logo.') -->'."\n";
+// Define urllogo
+$urllogo = '';
+$urllogofull = '';
+if (!empty($logosmall) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$logosmall)) {
+	$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file='.urlencode('logos/thumbs/'.$logosmall);
+	$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/thumbs/'.$logosmall);
+} elseif (!empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo)) {
+	$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file='.urlencode('logos/'.$logo);
+	$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/'.$logo);
+}
+
+// Output html code for logo
+if ($urllogo) {
+	print '<div class="backgreypublicpayment">';
+	print '<div class="logopublicpayment">';
+	print '<img id="dolpaymentlogo" src="'.$urllogo.'"';
+	print '>';
+	print '</div>';
+	if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
+		print '<div class="poweredbypublicpayment opacitymedium right"><a class="poweredbyhref" href="https://www.dolibarr.org?utm_medium=website&utm_source=poweredby" target="dolibarr" rel="noopener">'.$langs->trans("PoweredBy").'<br><img class="poweredbyimg" src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
+	}
+	print '</div>';
+}
+
+print '<table id="dolpaymenttable" summary="Payment form" class="center">'."\n";
+
+$text  = '<tr><td class="textpublicpayment"><br><strong>'.$langs->trans("EvntOrgRegistrationWelcomeMessage").'</strong></td></tr>'."\n";
 $text .= '<tr><td class="textpublicpayment">'.$langs->trans("EvntOrgRegistrationHelpMessage").' '.$id.'.<br><br></td></tr>'."\n";
-$text .= '<tr><td class="textpublicpayment">'.$project->note_public.'</td></tr>'."\n";;
+$text .= '<tr><td class="textpublicpayment">'.$project->note_public.'<br><br></td></tr>'."\n";;
+
 print $text;
-print '</div>';
 
-dol_htmloutput_errors($errmsg);
+// Output payment summary form
+print '<tr><td align="center">';
 
-// Print form
-print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST" name="newmember">'."\n";
-print '<input type="hidden" name="token" value="'.newToken().'" / >';
-print '<input type="hidden" name="entity" value="'.$entity.'" />';
-print '<input type="hidden" name="action" value="add" />';
-print '<input type="hidden" name="id" value="'.$encodedid.'" />';
-print '<input type="hidden" name="securekey" value="'.$securekeyreceived.'" />';
+$found = false;
+$error = 0;
+$var = false;
 
-print '<br>';
+$object = null;
 
-print '<br><span class="opacitymedium">'.$langs->trans("FieldsWithAreMandatory", '*').'</span><br>';
-//print $langs->trans("FieldsWithIsForPublic",'**').'<br>';
-
-print dol_get_fiche_head('');
-
-print '<script type="text/javascript">
-jQuery(document).ready(function () {
-    jQuery(document).ready(function () {
-        jQuery("#selectcountry_id").change(function() {
-           document.newmember.action.value="create";
-           document.newmember.submit();
-        });
-    });
-});
-</script>';
-
-print '<table class="border" summary="form to subscribe" id="tablesubscribe">'."\n";
-
-// Name
-print '<tr><td><label for="lastname">'.$langs->trans("Lastname").' / '.$langs->trans("Label").'<FONT COLOR="red">*</FONT></label></td>';
-print '<td colspan="3"><input name="lastname" id="lastname" type="text" class="maxwidth100onsmartphone" maxlength="80" value="'.dol_escape_htmltag(GETPOST("lastname", 'alpha') ?GETPOST("lastname", 'alpha') : $object->lastname).'" autofocus="autofocus"></td>';
-print '</tr>';
-// Email
-print '<tr><td>'.$langs->trans("Email").'<FONT COLOR="red">*</FONT></td><td><input type="text" name="email" maxlength="255" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('email')).'"></td></tr>'."\n";
-// Company
-print '<tr id="trcompany" class="trcompany"><td>'.$langs->trans("Company").'<FONT COLOR="red">*</FONT>';
-print ' </td><td><input type="text" name="societe" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('societe')).'"></td></tr>'."\n";
-// Type of event
-print '<tr><td>'.$langs->trans("EventType").'<FONT COLOR="red">*</FONT></td>'."\n";
-print '<td>'.FORM::selectarray('eventtype', $arrayofeventtype, $eventtype).'</td>';
-// Label
-print '<tr><td>'.$langs->trans("Label").'<FONT COLOR="red">*</FONT></td>'."\n";
-print '</td><td><input type="text" name="label" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('label')).'"></td></tr>'."\n";
-// Note
-print '<tr><td>'.$langs->trans("Note").'<FONT COLOR="red">*</FONT></td>'."\n";
-print '<td><input type="text" name="note" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('note')).'"></td></tr>'."\n";
-// Start Date
-print '<tr><td>'.$langs->trans("DateStart").'</td>'."\n";
-print '<td><input type="date" name="datestart" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('datestart')).'"></td></tr>'."\n";
-// End Date
-print '<tr><td>'.$langs->trans("DateEnd").'</td>'."\n";
-print '<td><input type="date" name="dateend" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('dateend')).'"></td></tr>'."\n";
-// Address
-print '<tr><td>'.$langs->trans("Address").'</td><td>'."\n";
-print '<textarea name="address" id="address" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.dol_escape_htmltag(GETPOST('address', 'restricthtml'), 0, 1).'</textarea></td></tr>'."\n";
-// Zip / Town
-print '<tr><td>'.$langs->trans('Zip').' / '.$langs->trans('Town').'</td><td>';
-print $formcompany->select_ziptown(GETPOST('zipcode'), 'zipcode', array('town', 'selectcountry_id', 'state_id'), 6, 1);
-print ' / ';
-print $formcompany->select_ziptown(GETPOST('town'), 'town', array('zipcode', 'selectcountry_id', 'state_id'), 0, 1);
-print '</td></tr>';
-// Country
-print '<tr><td>'.$langs->trans('Country').'<FONT COLOR="red">*</FONT></td><td>';
-$country_id = GETPOST('country_id');
-if (!$country_id && !empty($conf->global->MEMBER_NEWFORM_FORCECOUNTRYCODE)) {
-	$country_id = getCountry($conf->global->MEMBER_NEWFORM_FORCECOUNTRYCODE, 2, $db, $langs);
-}
-if (!$country_id && !empty($conf->geoipmaxmind->enabled)) {
-	$country_code = dol_user_country();
-	//print $country_code;
-	if ($country_code) {
-		$new_country_id = getCountry($country_code, 3, $db, $langs);
-		//print 'xxx'.$country_code.' - '.$new_country_id;
-		if ($new_country_id) {
-			$country_id = $new_country_id;
-		}
-	}
-}
-$country_code = getCountry($country_id, 2, $db, $langs);
-print $form->select_country($country_id, 'country_id');
-print '</td></tr>';
-// State
-if (empty($conf->global->SOCIETE_DISABLE_STATE)) {
-	print '<tr><td>'.$langs->trans('State').'</td><td>';
-	if ($country_code) {
-		print $formcompany->select_state(GETPOST("state_id"), $country_code);
-	} else {
-		print '';
-	}
-	print '</td></tr>';
-}
-
-print "</table>\n";
-
-print dol_get_fiche_end();
+print "\n";
 
 
 // Show all action buttons
-print '<div class="center">';
 print '<br>';
 // Output introduction text
 if ($project->accept_conference_suggestions) {
-	print '<input type="submit" value="'.$langs->trans("SuggestConference").'" name="suggestconference"  id="suggestconference" class="button">';
+	print '<input type="submit" value="'.$langs->trans("SuggestConference").'" id="suggestconference" class="button">';
 	print '<br><br>';
 }
-print '<input type="submit" value="'.$langs->trans("ViewAndVote").'" name="viewandvote" id="viewandvote" class="button">';
+print '<input type="submit" value="'.$langs->trans("ViewAndVote").'" id="viewandvote" class="button">';
 print '<br><br>';
 if ($project->accept_booth_suggestions) {
-	print '<input type="submit" value="'.$langs->trans("SuggestBooth").'" name="suggestbooth" id="suggestbooth" class="button">';
+	print '<input type="submit" value="'.$langs->trans("SuggestBooth").'" id="suggestbooth" class="button">';
 }
-print '</div>';
-print '<br><br>';
 
 
 
-print "</form>\n";
-print "<br>";
-print '</div></div>';
+print '</td></tr>'."\n";
+
+print '</table>'."\n";
+
+print '</form>'."\n";
+print '</div>'."\n";
+print '<br>';
 
 
-llxFooterVierge();
+htmlPrintOnlinePaymentFooter($mysoc, $langs, 1, $suffix, $object);
+
+llxFooter('', 'public');
 
 $db->close();

From 099ad77d44b282417187c3003479c4bc60c457a4 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Thu, 6 May 2021 11:32:07 +0200
Subject: [PATCH 0033/1497] encryption change for url

---
 htdocs/eventorganization/conferenceorbooth_list.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/htdocs/eventorganization/conferenceorbooth_list.php b/htdocs/eventorganization/conferenceorbooth_list.php
index e3ba815121c..be8770b6390 100644
--- a/htdocs/eventorganization/conferenceorbooth_list.php
+++ b/htdocs/eventorganization/conferenceorbooth_list.php
@@ -364,8 +364,7 @@ if ($projectid > 0) {
 
 	// Link to the vote/register page
 	print '<tr><td>'.$langs->trans("RegisterPage").'</td><td>';
-	$encodedid = dol_encode($project->id, $dolibarr_main_instance_unique_id);
-	$linkregister = $dolibarr_main_url_root.'/public/project/index.php?id='.$encodedid;
+	$linkregister = $dolibarr_main_url_root.'/public/project/index.php?id='.$project->id;
 	$encodedsecurekey = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$project->id, 2);
 	$linkregister .= '&securekey='.urlencode($encodedsecurekey);
 	print '<a target="_blank" href="'.$linkregister.'">'.$linkregister.'</a>';

From df78aaff889bfab4b3803e07b8d4267ce47ea895 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Thu, 6 May 2021 11:49:00 +0200
Subject: [PATCH 0034/1497] now 2 distinct pages to suggest a conf or a booth

---
 htdocs/public/project/index.php             | 45 ++++++++++++---------
 htdocs/public/project/suggestbooth.php      | 16 ++------
 htdocs/public/project/suggestconference.php | 16 ++------
 3 files changed, 35 insertions(+), 42 deletions(-)

diff --git a/htdocs/public/project/index.php b/htdocs/public/project/index.php
index ce48db9e729..9ddfc8ce759 100644
--- a/htdocs/public/project/index.php
+++ b/htdocs/public/project/index.php
@@ -103,6 +103,23 @@ if ($resultproject < 0) {
  * Actions
  */
 
+if (GETPOST('suggestbooth')) {
+	header("Location: ".dol_buildpath('/public/project/suggestbooth.php', 1).'?id='.$id."&securekey=".$securekeyreceived);
+	exit;
+}
+
+if (GETPOST('suggestconference')) {
+	header("Location: ".dol_buildpath('/public/project/suggestconference.php', 1).'?id='.$id."&securekey=".$securekeyreceived);
+	exit;
+}
+
+if (GETPOST('viewandvote')) {
+	header("Location: ".dol_buildpath('/public/project/viewandvote.php', 1).'?id='.$id."&securekey=".$securekeyreceived);
+	exit;
+}
+
+
+
 
 /*
  * View
@@ -119,24 +136,15 @@ $conf->dol_hide_leftmenu = 1;
 $replacemainarea = (empty($conf->dol_hide_leftmenu) ? '<div>' : '').'<div>';
 llxHeader($head, $langs->trans("PaymentForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody', $replacemainarea);
 
-
-// Show sandbox warning
-if ((empty($paymentmethod) || $paymentmethod == 'paypal') && !empty($conf->paypal->enabled) && (!empty($conf->global->PAYPAL_API_SANDBOX) || GETPOST('forcesandbox', 'int'))) {		// We can force sand box with param 'forcesandbox'
-	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Paypal'), '', 'warning');
-}
-if ((empty($paymentmethod) || $paymentmethod == 'stripe') && !empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox', 'int'))) {
-	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Stripe'), '', 'warning');
-}
-
-
 print '<span id="dolpaymentspan"></span>'."\n";
 print '<div class="center">'."\n";
 print '<form id="dolpaymentform" class="center" name="paymentform" action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";
 print '<input type="hidden" name="token" value="'.newToken().'">'."\n";
 print '<input type="hidden" name="action" value="dopayment">'."\n";
 print '<input type="hidden" name="tag" value="'.GETPOST("tag", 'alpha').'">'."\n";
-print '<input type="hidden" name="suffix" value="'.dol_escape_htmltag($suffix).'">'."\n";
-print '<input type="hidden" name="securekey" value="'.dol_escape_htmltag($SECUREKEY).'">'."\n";
+//print '<input type="hidden" name="suffix" value="'.dol_escape_htmltag($suffix).'">'."\n";
+print '<input type="hidden" name="id" value="'.dol_escape_htmltag($id).'">'."\n";
+print '<input type="hidden" name="securekey" value="'.dol_escape_htmltag($securekeyreceived).'">'."\n";
 print '<input type="hidden" name="e" value="'.$entity.'" />';
 print '<input type="hidden" name="forcesandbox" value="'.GETPOST('forcesandbox', 'int').'" />';
 print "\n";
@@ -200,15 +208,16 @@ print "\n";
 // Show all action buttons
 print '<br>';
 // Output introduction text
-if ($project->accept_conference_suggestions) {
-	print '<input type="submit" value="'.$langs->trans("SuggestConference").'" id="suggestconference" class="button">';
+if ($project->accept_booth_suggestions) {
+	print '<input type="submit" value="'.$langs->trans("SuggestBooth").'" id="suggestbooth" name="suggestbooth" class="button">';
 	print '<br><br>';
 }
-print '<input type="submit" value="'.$langs->trans("ViewAndVote").'" id="viewandvote" class="button">';
-print '<br><br>';
-if ($project->accept_booth_suggestions) {
-	print '<input type="submit" value="'.$langs->trans("SuggestBooth").'" id="suggestbooth" class="button">';
+if ($project->accept_conference_suggestions) {
+	print '<input type="submit" value="'.$langs->trans("SuggestConference").'" id="suggestconference" name="suggestconference" class="button">';
+	print '<br><br>';
 }
+print '<input type="submit" value="'.$langs->trans("ViewAndVote").'" id="viewandvote" name="viewandvote" class="button">';
+
 
 
 
diff --git a/htdocs/public/project/suggestbooth.php b/htdocs/public/project/suggestbooth.php
index e4c030c9718..119741f6233 100644
--- a/htdocs/public/project/suggestbooth.php
+++ b/htdocs/public/project/suggestbooth.php
@@ -90,9 +90,7 @@ $note = GETPOST("note");
 $datestart = GETPOST("datestart");
 $dateend = GETPOST("dateend");
 
-// Getting id from Post and decoding it
-$encodedid = GETPOST('id');
-$id = dol_decode($encodedid, $dolibarr_main_instance_unique_id);
+$id = GETPOST('id');
 
 $project = new Project($db);
 $resultproject = $project->fetch($id);
@@ -102,7 +100,6 @@ if ($resultproject < 0) {
 }
 
 // Security check
-$id = dol_decode($encodedid, $dolibarr_main_instance_unique_id);
 $securekeyreceived = GETPOST("securekey");
 $securekeytocompare = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$id, 2);
 
@@ -122,7 +119,7 @@ $extrafields = new ExtraFields($db);
 $user->loadDefaultValues();
 
 $cactioncomm = new CActionComm($db);
-$arrayofeventtype = $cactioncomm->liste_array('', 'id', '', 0, 'module=\'conference@eventorganization\' OR module=\'booth@eventorganization\'');
+$arrayofeventtype = $cactioncomm->liste_array('', 'id', '', 0, 'module=\'booth@eventorganization\'');
 
 /**
  * Show header for new member
@@ -322,13 +319,8 @@ if (empty($reshook) && $action == 'add') {
 		if (!$error) {
 			// Adding supplier tag and tag from setup to thirdparty
 			$category = new Categorie($db);
-			if (GETPOST("suggestconference")) {
-				// Conference case
-				$resultcategory = $category->fetch($conf->global->EVENTORGANIZATION_CATEG_THIRDPARTY_CONF);
-			} else {
-				// Booth case
-				$resultcategory = $category->fetch($conf->global->EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH);
-			}
+
+			$resultcategory = $category->fetch($conf->global->EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH);
 
 			if ($resultcategory<=0) {
 				$error++;
diff --git a/htdocs/public/project/suggestconference.php b/htdocs/public/project/suggestconference.php
index e4c030c9718..68ed90fc260 100644
--- a/htdocs/public/project/suggestconference.php
+++ b/htdocs/public/project/suggestconference.php
@@ -90,9 +90,7 @@ $note = GETPOST("note");
 $datestart = GETPOST("datestart");
 $dateend = GETPOST("dateend");
 
-// Getting id from Post and decoding it
-$encodedid = GETPOST('id');
-$id = dol_decode($encodedid, $dolibarr_main_instance_unique_id);
+$id = GETPOST('id');
 
 $project = new Project($db);
 $resultproject = $project->fetch($id);
@@ -102,7 +100,6 @@ if ($resultproject < 0) {
 }
 
 // Security check
-$id = dol_decode($encodedid, $dolibarr_main_instance_unique_id);
 $securekeyreceived = GETPOST("securekey");
 $securekeytocompare = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$id, 2);
 
@@ -122,7 +119,7 @@ $extrafields = new ExtraFields($db);
 $user->loadDefaultValues();
 
 $cactioncomm = new CActionComm($db);
-$arrayofeventtype = $cactioncomm->liste_array('', 'id', '', 0, 'module=\'conference@eventorganization\' OR module=\'booth@eventorganization\'');
+$arrayofeventtype = $cactioncomm->liste_array('', 'id', '', 0, 'module=\'conference@eventorganization\'');
 
 /**
  * Show header for new member
@@ -322,13 +319,8 @@ if (empty($reshook) && $action == 'add') {
 		if (!$error) {
 			// Adding supplier tag and tag from setup to thirdparty
 			$category = new Categorie($db);
-			if (GETPOST("suggestconference")) {
-				// Conference case
-				$resultcategory = $category->fetch($conf->global->EVENTORGANIZATION_CATEG_THIRDPARTY_CONF);
-			} else {
-				// Booth case
-				$resultcategory = $category->fetch($conf->global->EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH);
-			}
+
+			$resultcategory = $category->fetch($conf->global->EVENTORGANIZATION_CATEG_THIRDPARTY_CONF);
 
 			if ($resultcategory<=0) {
 				$error++;

From c56c7afa89f79761b18392649603ce79d343c5de Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Thu, 6 May 2021 11:59:24 +0200
Subject: [PATCH 0035/1497] update on specifications on suggesting a booth/conf
 since its now two separated pages

---
 htdocs/public/project/suggestbooth.php      |   4 +-
 htdocs/public/project/suggestconference.php | 141 ++++++--------------
 2 files changed, 42 insertions(+), 103 deletions(-)

diff --git a/htdocs/public/project/suggestbooth.php b/htdocs/public/project/suggestbooth.php
index 119741f6233..bec7c1c55a1 100644
--- a/htdocs/public/project/suggestbooth.php
+++ b/htdocs/public/project/suggestbooth.php
@@ -378,7 +378,7 @@ if (empty($reshook) && $action == 'add') {
 				$errmsg .= $conforbooth->error;
 			} else {
 				// If this is a paying booth, we have to redirect to payment page and create an invoice
-				if (GETPOST("suggestbooth") && !empty(floatval($project->price_booth))) {
+				if (!empty(floatval($project->price_booth))) {
 					$productforinvoicerow = new Product($db);
 					$resultprod = $productforinvoicerow->fetch($conf->global->SERVICE_BOOTH_LOCATION);
 					if ($resultprod < 0) {
@@ -437,7 +437,7 @@ if (empty($reshook) && $action == 'add') {
 						}
 					}
 				} else {
-					// If no price has been set for the booth or this is a conference, we confirm it as suggested and we update
+					// If no price has been set for the booth, we confirm it as suggested and we update
 					$conforbooth->status = CONFERENCEORBOOTH::STATUS_SUGGESTED;
 					$conforbooth->update($user);
 					// Sending mail
diff --git a/htdocs/public/project/suggestconference.php b/htdocs/public/project/suggestconference.php
index 68ed90fc260..fc452c740bb 100644
--- a/htdocs/public/project/suggestconference.php
+++ b/htdocs/public/project/suggestconference.php
@@ -378,110 +378,49 @@ if (empty($reshook) && $action == 'add') {
 				$errmsg .= $conforbooth->error;
 			} else {
 				// If this is a paying booth, we have to redirect to payment page and create an invoice
-				if (GETPOST("suggestbooth") && !empty(floatval($project->price_booth))) {
-					$productforinvoicerow = new Product($db);
-					$resultprod = $productforinvoicerow->fetch($conf->global->SERVICE_BOOTH_LOCATION);
-					if ($resultprod < 0) {
-						$error++;
-						$errmsg .= $productforinvoicerow->error;
-					} else {
-						$facture = new Facture($db);
-						$facture->type = Facture::TYPE_STANDARD;
-						$facture->socid = $thirdparty->id;
-						$facture->paye = 0;
-						$facture->date = dol_now();
-						$facture->cond_reglement_id = $contact->cond_reglement_id;
+				$conforbooth->status = CONFERENCEORBOOTH::STATUS_SUGGESTED;
+				$conforbooth->update($user);
+				// Sending mail
+				require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+				include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+				$formmail = new FormMail($db);
+				// Set output language
+				$outputlangs = new Translate('', $conf);
+				$outputlangs->setDefaultLang(empty($thirdparty->default_lang) ? $mysoc->default_lang : $thirdparty->default_lang);
+				// Load traductions files required by page
+				$outputlangs->loadLangs(array("main", "members"));
+				// Get email content from template
+				$arraydefaultmessage = null;
 
-						if (empty($facture->cond_reglement_id)) {
-							$paymenttermstatic = new PaymentTerm($contact->db);
-							$facture->cond_reglement_id = $paymenttermstatic->getDefaultId();
-							if (empty($facture->cond_reglement_id)) {
-								$error++;
-								$contact->error = 'ErrorNoPaymentTermRECEPFound';
-								$contact->errors[] = $contact->error;
-							}
-						}
-						$resultfacture = $facture->create($user);
-						if ($resultfacture <= 0) {
-							$contact->error = $facture->error;
-							$contact->errors = $facture->errors;
-							$error++;
-						} else {
-							$facture->add_object_linked($contact->element, $contact->id);
-						}
-					}
+				$labeltouse = $conf->global->EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT;
+				if (!empty($labeltouse)) {
+					$arraydefaultmessage = $formmail->getEMailTemplate($db, 'eventorganization_send', $user, $outputlangs, $labeltouse, 1, '');
+				}
 
-					if (!$error) {
-						// Add line to draft invoice
-						$vattouse = get_default_tva($mysoc, $thirdparty, $productforinvoicerow->id);
-						$result = $facture->addline($langs->trans("BoothLocationFee", $conforbooth->label, dol_print_date($conforbooth->datep, '%d/%m/%y %H:%M:%S'), dol_print_date($conforbooth->datep2, '%d/%m/%y %H:%M:%S')), floatval($project->price_booth), 1, $vattouse, 0, 0, $productforinvoicerow->id, 0, dol_now(), '', 0, 0, '', 'HT', 0, 1);
-						if ($result <= 0) {
-							$contact->error = $facture->error;
-							$contact->errors = $facture->errors;
-							$error++;
-						}
-						if (!$error) {
-							$valid = true;
-							$sourcetouse = 'boothlocation';
-							$reftouse = $facture->id;
-							$redirection = $dolibarr_main_url_root.'/public/payment/newpayment.php?source='.$sourcetouse.'&ref='.$reftouse.'&booth='.$conforbooth->id;
-							if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
-								if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
-									$redirection .= '&securekey='.dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $sourcetouse . $reftouse, 2); // Use the source in the hash to avoid duplicates if the references are identical
-								} else {
-									$redirection .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
-								}
-							}
-							Header("Location: ".$redirection);
-							exit;
-						}
-					}
+				if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
+					$subject = $arraydefaultmessage->topic;
+					$msg     = $arraydefaultmessage->content;
+				}
+
+				$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $thirdparty);
+				complete_substitutions_array($substitutionarray, $outputlangs, $object);
+
+				$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
+				$texttosend = make_substitutions($msg, $substitutionarray, $outputlangs);
+
+				$sendto = $thirdparty->email;
+				$from = $conf->global->MAILING_EMAIL_FROM;
+				$urlback = $_SERVER["REQUEST_URI"];
+
+				$ishtml = dol_textishtml($texttosend); // May contain urls
+
+				$mailfile = new CMailFile($subjecttosend, $sendto, $from, $texttosend, array(), array(), array(), '', '', 0, $ishtml);
+
+				$result = $mailfile->sendfile();
+				if ($result) {
+					dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_payment');
 				} else {
-					// If no price has been set for the booth or this is a conference, we confirm it as suggested and we update
-					$conforbooth->status = CONFERENCEORBOOTH::STATUS_SUGGESTED;
-					$conforbooth->update($user);
-					// Sending mail
-					require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-					include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-					$formmail = new FormMail($db);
-					// Set output language
-					$outputlangs = new Translate('', $conf);
-					$outputlangs->setDefaultLang(empty($thirdparty->default_lang) ? $mysoc->default_lang : $thirdparty->default_lang);
-					// Load traductions files required by page
-					$outputlangs->loadLangs(array("main", "members"));
-					// Get email content from template
-					$arraydefaultmessage = null;
-
-					$labeltouse = $conf->global->EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT;
-					if (!empty($labeltouse)) {
-						$arraydefaultmessage = $formmail->getEMailTemplate($db, 'eventorganization_send', $user, $outputlangs, $labeltouse, 1, '');
-					}
-
-					if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
-						$subject = $arraydefaultmessage->topic;
-						$msg     = $arraydefaultmessage->content;
-					}
-
-					$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $thirdparty);
-					complete_substitutions_array($substitutionarray, $outputlangs, $object);
-
-					$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
-					$texttosend = make_substitutions($msg, $substitutionarray, $outputlangs);
-
-					$sendto = $thirdparty->email;
-					$from = $conf->global->MAILING_EMAIL_FROM;
-					$urlback = $_SERVER["REQUEST_URI"];
-
-					$ishtml = dol_textishtml($texttosend); // May contain urls
-
-					$mailfile = new CMailFile($subjecttosend, $sendto, $from, $texttosend, array(), array(), array(), '', '', 0, $ishtml);
-
-					$result = $mailfile->sendfile();
-					if ($result) {
-						dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_payment');
-					} else {
-						dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
-					}
+					dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
 				}
 			}
 		}

From 4d8d94bfbf254aee0af122821d8f04c42c0a0560 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Thu, 6 May 2021 12:13:49 +0200
Subject: [PATCH 0036/1497] fixes: show only correspond button on specific
 page, id no longer encoded in hidden parameter

---
 htdocs/public/project/suggestbooth.php      | 13 ++-----------
 htdocs/public/project/suggestconference.php | 15 +++------------
 2 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/htdocs/public/project/suggestbooth.php b/htdocs/public/project/suggestbooth.php
index bec7c1c55a1..96a00434374 100644
--- a/htdocs/public/project/suggestbooth.php
+++ b/htdocs/public/project/suggestbooth.php
@@ -530,7 +530,7 @@ print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST" name="newmember">'.
 print '<input type="hidden" name="token" value="'.newToken().'" / >';
 print '<input type="hidden" name="entity" value="'.$entity.'" />';
 print '<input type="hidden" name="action" value="add" />';
-print '<input type="hidden" name="id" value="'.$encodedid.'" />';
+print '<input type="hidden" name="id" value="'.$id.'" />';
 print '<input type="hidden" name="securekey" value="'.$securekeyreceived.'" />';
 
 print '<br>';
@@ -625,16 +625,7 @@ print dol_get_fiche_end();
 // Show all action buttons
 print '<div class="center">';
 print '<br>';
-// Output introduction text
-if ($project->accept_conference_suggestions) {
-	print '<input type="submit" value="'.$langs->trans("SuggestConference").'" name="suggestconference"  id="suggestconference" class="button">';
-	print '<br><br>';
-}
-print '<input type="submit" value="'.$langs->trans("ViewAndVote").'" name="viewandvote" id="viewandvote" class="button">';
-print '<br><br>';
-if ($project->accept_booth_suggestions) {
-	print '<input type="submit" value="'.$langs->trans("SuggestBooth").'" name="suggestbooth" id="suggestbooth" class="button">';
-}
+print '<input type="submit" value="'.$langs->trans("SuggestBooth").'" name="suggestbooth" id="suggestbooth" class="button">';
 print '</div>';
 print '<br><br>';
 
diff --git a/htdocs/public/project/suggestconference.php b/htdocs/public/project/suggestconference.php
index fc452c740bb..1350716072b 100644
--- a/htdocs/public/project/suggestconference.php
+++ b/htdocs/public/project/suggestconference.php
@@ -469,7 +469,7 @@ print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST" name="newmember">'.
 print '<input type="hidden" name="token" value="'.newToken().'" / >';
 print '<input type="hidden" name="entity" value="'.$entity.'" />';
 print '<input type="hidden" name="action" value="add" />';
-print '<input type="hidden" name="id" value="'.$encodedid.'" />';
+print '<input type="hidden" name="id" value="'.$id.'" />';
 print '<input type="hidden" name="securekey" value="'.$securekeyreceived.'" />';
 
 print '<br>';
@@ -564,21 +564,12 @@ print dol_get_fiche_end();
 // Show all action buttons
 print '<div class="center">';
 print '<br>';
-// Output introduction text
-if ($project->accept_conference_suggestions) {
-	print '<input type="submit" value="'.$langs->trans("SuggestConference").'" name="suggestconference"  id="suggestconference" class="button">';
-	print '<br><br>';
-}
-print '<input type="submit" value="'.$langs->trans("ViewAndVote").'" name="viewandvote" id="viewandvote" class="button">';
-print '<br><br>';
-if ($project->accept_booth_suggestions) {
-	print '<input type="submit" value="'.$langs->trans("SuggestBooth").'" name="suggestbooth" id="suggestbooth" class="button">';
-}
-print '</div>';
+print '<input type="submit" value="'.$langs->trans("SuggestConference").'" name="suggestconference"  id="suggestconference" class="button">';
 print '<br><br>';
 
 
 
+
 print "</form>\n";
 print "<br>";
 print '</div></div>';

From abeb1c644c7721bc931eaf97611d0ac6b09489da Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Thu, 6 May 2021 13:50:13 +0200
Subject: [PATCH 0037/1497] country now only required when paying a booth,
 dates of start and end required

---
 htdocs/public/project/suggestbooth.php      | 13 +++++++++----
 htdocs/public/project/suggestconference.php |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/htdocs/public/project/suggestbooth.php b/htdocs/public/project/suggestbooth.php
index 96a00434374..e8b7ad44874 100644
--- a/htdocs/public/project/suggestbooth.php
+++ b/htdocs/public/project/suggestbooth.php
@@ -242,7 +242,7 @@ if (empty($reshook) && $action == 'add') {
 		$langs->load("errors");
 		$errmsg .= $langs->trans("ErrorBadEMail", GETPOST("email"))."<br>\n";
 	}
-	if (!GETPOST("country_id")) {
+	if (!GETPOST("country_id") && !empty(floatval($project->price_booth))) {
 		$error++;
 		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Country"))."<br>\n";
 	}
@@ -407,6 +407,7 @@ if (empty($reshook) && $action == 'add') {
 							$contact->errors = $facture->errors;
 							$error++;
 						} else {
+							$db->commit();
 							$facture->add_object_linked($contact->element, $contact->id);
 						}
 					}
@@ -572,10 +573,10 @@ print '</td><td><input type="text" name="label" class="minwidth150" value="'.dol
 print '<tr><td>'.$langs->trans("Note").'<FONT COLOR="red">*</FONT></td>'."\n";
 print '<td><input type="text" name="note" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('note')).'"></td></tr>'."\n";
 // Start Date
-print '<tr><td>'.$langs->trans("DateStart").'</td>'."\n";
+print '<tr><td>'.$langs->trans("DateStart").'<FONT COLOR="red">*</FONT></td>'."\n";
 print '<td><input type="date" name="datestart" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('datestart')).'"></td></tr>'."\n";
 // End Date
-print '<tr><td>'.$langs->trans("DateEnd").'</td>'."\n";
+print '<tr><td>'.$langs->trans("DateEnd").'<FONT COLOR="red">*</FONT></td>'."\n";
 print '<td><input type="date" name="dateend" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('dateend')).'"></td></tr>'."\n";
 // Address
 print '<tr><td>'.$langs->trans("Address").'</td><td>'."\n";
@@ -587,7 +588,11 @@ print ' / ';
 print $formcompany->select_ziptown(GETPOST('town'), 'town', array('zipcode', 'selectcountry_id', 'state_id'), 0, 1);
 print '</td></tr>';
 // Country
-print '<tr><td>'.$langs->trans('Country').'<FONT COLOR="red">*</FONT></td><td>';
+print '<tr><td>'.$langs->trans('Country');
+if (!empty(floatval($project->price_booth))) {
+	print '<FONT COLOR="red">*</FONT>';
+}
+print '</td><td>';
 $country_id = GETPOST('country_id');
 if (!$country_id && !empty($conf->global->MEMBER_NEWFORM_FORCECOUNTRYCODE)) {
 	$country_id = getCountry($conf->global->MEMBER_NEWFORM_FORCECOUNTRYCODE, 2, $db, $langs);
diff --git a/htdocs/public/project/suggestconference.php b/htdocs/public/project/suggestconference.php
index 1350716072b..0483312e519 100644
--- a/htdocs/public/project/suggestconference.php
+++ b/htdocs/public/project/suggestconference.php
@@ -526,7 +526,7 @@ print ' / ';
 print $formcompany->select_ziptown(GETPOST('town'), 'town', array('zipcode', 'selectcountry_id', 'state_id'), 0, 1);
 print '</td></tr>';
 // Country
-print '<tr><td>'.$langs->trans('Country').'<FONT COLOR="red">*</FONT></td><td>';
+print '<tr><td>'.$langs->trans('Country').'</td><td>';
 $country_id = GETPOST('country_id');
 if (!$country_id && !empty($conf->global->MEMBER_NEWFORM_FORCECOUNTRYCODE)) {
 	$country_id = getCountry($conf->global->MEMBER_NEWFORM_FORCECOUNTRYCODE, 2, $db, $langs);

From 9c20e92e179eb86ac4f49b9321e221edcc9be662 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Thu, 6 May 2021 14:06:53 +0200
Subject: [PATCH 0038/1497] country no longer required for conf, preparation of
 add_contact to conforbooth (not done, commented) and page name change

---
 htdocs/langs/en_US/eventorganization.lang   |  1 +
 htdocs/public/project/index.php             |  2 +-
 htdocs/public/project/suggestbooth.php      | 10 +++-
 htdocs/public/project/suggestconference.php | 61 +++++++++++----------
 4 files changed, 43 insertions(+), 31 deletions(-)

diff --git a/htdocs/langs/en_US/eventorganization.lang b/htdocs/langs/en_US/eventorganization.lang
index 7b5ddd8160c..1d7b16c17f6 100644
--- a/htdocs/langs/en_US/eventorganization.lang
+++ b/htdocs/langs/en_US/eventorganization.lang
@@ -96,6 +96,7 @@ EvntOrgCancelled = Cancelled
 #
 # Public page
 #
+SuggestForm = Suggestion page
 RegisterPage = Page for conferences or booth
 EvntOrgRegistrationWelcomeMessage = Welcome on the conference or booth suggestion page.
 EvntOrgRegistrationHelpMessage = Here, you can suggest a new conference or a new booth for the project
diff --git a/htdocs/public/project/index.php b/htdocs/public/project/index.php
index 9ddfc8ce759..b05f2b1fc6f 100644
--- a/htdocs/public/project/index.php
+++ b/htdocs/public/project/index.php
@@ -134,7 +134,7 @@ $conf->dol_hide_topmenu = 1;
 $conf->dol_hide_leftmenu = 1;
 
 $replacemainarea = (empty($conf->dol_hide_leftmenu) ? '<div>' : '').'<div>';
-llxHeader($head, $langs->trans("PaymentForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody', $replacemainarea);
+llxHeader($head, $langs->trans("SuggestForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody', $replacemainarea);
 
 print '<span id="dolpaymentspan"></span>'."\n";
 print '<div class="center">'."\n";
diff --git a/htdocs/public/project/suggestbooth.php b/htdocs/public/project/suggestbooth.php
index e8b7ad44874..3db61f67129 100644
--- a/htdocs/public/project/suggestbooth.php
+++ b/htdocs/public/project/suggestbooth.php
@@ -377,7 +377,14 @@ if (empty($reshook) && $action == 'add') {
 				$error++;
 				$errmsg .= $conforbooth->error;
 			} else {
-				// If this is a paying booth, we have to redirect to payment page and create an invoice
+				// Adding the contact to the project
+				/*$resultaddcontact = $conforbooth->add_contact($contact);
+				if ($resultaddcontact<0) {
+					$error++;
+					$errmsg .= $conforbooth->error;
+				} else {*/
+
+					// If this is a paying booth, we have to redirect to payment page and create an invoice
 				if (!empty(floatval($project->price_booth))) {
 					$productforinvoicerow = new Product($db);
 					$resultprod = $productforinvoicerow->fetch($conf->global->SERVICE_BOOTH_LOCATION);
@@ -484,6 +491,7 @@ if (empty($reshook) && $action == 'add') {
 						dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
 					}
 				}
+				//}
 			}
 		}
 	}
diff --git a/htdocs/public/project/suggestconference.php b/htdocs/public/project/suggestconference.php
index 0483312e519..21cbe7d77bd 100644
--- a/htdocs/public/project/suggestconference.php
+++ b/htdocs/public/project/suggestconference.php
@@ -242,10 +242,6 @@ if (empty($reshook) && $action == 'add') {
 		$langs->load("errors");
 		$errmsg .= $langs->trans("ErrorBadEMail", GETPOST("email"))."<br>\n";
 	}
-	if (!GETPOST("country_id")) {
-		$error++;
-		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Country"))."<br>\n";
-	}
 
 	if (!$error) {
 		// Getting the thirdparty or creating it
@@ -377,22 +373,28 @@ if (empty($reshook) && $action == 'add') {
 				$error++;
 				$errmsg .= $conforbooth->error;
 			} else {
-				// If this is a paying booth, we have to redirect to payment page and create an invoice
-				$conforbooth->status = CONFERENCEORBOOTH::STATUS_SUGGESTED;
-				$conforbooth->update($user);
-				// Sending mail
-				require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-				include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-				$formmail = new FormMail($db);
-				// Set output language
-				$outputlangs = new Translate('', $conf);
-				$outputlangs->setDefaultLang(empty($thirdparty->default_lang) ? $mysoc->default_lang : $thirdparty->default_lang);
-				// Load traductions files required by page
-				$outputlangs->loadLangs(array("main", "members"));
-				// Get email content from template
-				$arraydefaultmessage = null;
+				// Adding the contact to the project
+				/*$resultaddcontact = $conforbooth->add_contact($contact);
+				if ($resultaddcontact<0) {
+					$error++;
+					$errmsg .= $conforbooth->error;
+				} else {*/
+					$conforbooth->status = CONFERENCEORBOOTH::STATUS_SUGGESTED;
+					$conforbooth->update($user);
 
-				$labeltouse = $conf->global->EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT;
+					// Sending mail
+					require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+					include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+					$formmail = new FormMail($db);
+					// Set output language
+					$outputlangs = new Translate('', $conf);
+					$outputlangs->setDefaultLang(empty($thirdparty->default_lang) ? $mysoc->default_lang : $thirdparty->default_lang);
+					// Load traductions files required by page
+					$outputlangs->loadLangs(array("main", "members"));
+					// Get email content from template
+					$arraydefaultmessage = null;
+
+					$labeltouse = $conf->global->EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT;
 				if (!empty($labeltouse)) {
 					$arraydefaultmessage = $formmail->getEMailTemplate($db, 'eventorganization_send', $user, $outputlangs, $labeltouse, 1, '');
 				}
@@ -402,26 +404,27 @@ if (empty($reshook) && $action == 'add') {
 					$msg     = $arraydefaultmessage->content;
 				}
 
-				$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $thirdparty);
-				complete_substitutions_array($substitutionarray, $outputlangs, $object);
+					$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $thirdparty);
+					complete_substitutions_array($substitutionarray, $outputlangs, $object);
 
-				$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
-				$texttosend = make_substitutions($msg, $substitutionarray, $outputlangs);
+					$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
+					$texttosend = make_substitutions($msg, $substitutionarray, $outputlangs);
 
-				$sendto = $thirdparty->email;
-				$from = $conf->global->MAILING_EMAIL_FROM;
-				$urlback = $_SERVER["REQUEST_URI"];
+					$sendto = $thirdparty->email;
+					$from = $conf->global->MAILING_EMAIL_FROM;
+					$urlback = $_SERVER["REQUEST_URI"];
 
-				$ishtml = dol_textishtml($texttosend); // May contain urls
+					$ishtml = dol_textishtml($texttosend); // May contain urls
 
-				$mailfile = new CMailFile($subjecttosend, $sendto, $from, $texttosend, array(), array(), array(), '', '', 0, $ishtml);
+					$mailfile = new CMailFile($subjecttosend, $sendto, $from, $texttosend, array(), array(), array(), '', '', 0, $ishtml);
 
-				$result = $mailfile->sendfile();
+					$result = $mailfile->sendfile();
 				if ($result) {
 					dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_payment');
 				} else {
 					dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
 				}
+				//}
 			}
 		}
 	}

From a00c9c44c35f3e98542de2b50b804638210f496f Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Thu, 6 May 2021 14:26:41 +0200
Subject: [PATCH 0039/1497] now adding contact to conforbooth, not only to
 thirdparty

---
 htdocs/public/project/suggestbooth.php      | 203 ++++++++++----------
 htdocs/public/project/suggestconference.php |  28 +--
 2 files changed, 115 insertions(+), 116 deletions(-)

diff --git a/htdocs/public/project/suggestbooth.php b/htdocs/public/project/suggestbooth.php
index 3db61f67129..bb03c0d3782 100644
--- a/htdocs/public/project/suggestbooth.php
+++ b/htdocs/public/project/suggestbooth.php
@@ -378,120 +378,119 @@ if (empty($reshook) && $action == 'add') {
 				$errmsg .= $conforbooth->error;
 			} else {
 				// Adding the contact to the project
-				/*$resultaddcontact = $conforbooth->add_contact($contact);
+				$resultaddcontact = $conforbooth->add_contact($contact->id, 'RESPONSIBLE');
 				if ($resultaddcontact<0) {
 					$error++;
 					$errmsg .= $conforbooth->error;
-				} else {*/
-
+				} else {
 					// If this is a paying booth, we have to redirect to payment page and create an invoice
-				if (!empty(floatval($project->price_booth))) {
-					$productforinvoicerow = new Product($db);
-					$resultprod = $productforinvoicerow->fetch($conf->global->SERVICE_BOOTH_LOCATION);
-					if ($resultprod < 0) {
-						$error++;
-						$errmsg .= $productforinvoicerow->error;
-					} else {
-						$facture = new Facture($db);
-						$facture->type = Facture::TYPE_STANDARD;
-						$facture->socid = $thirdparty->id;
-						$facture->paye = 0;
-						$facture->date = dol_now();
-						$facture->cond_reglement_id = $contact->cond_reglement_id;
-
-						if (empty($facture->cond_reglement_id)) {
-							$paymenttermstatic = new PaymentTerm($contact->db);
-							$facture->cond_reglement_id = $paymenttermstatic->getDefaultId();
-							if (empty($facture->cond_reglement_id)) {
-								$error++;
-								$contact->error = 'ErrorNoPaymentTermRECEPFound';
-								$contact->errors[] = $contact->error;
-							}
-						}
-						$resultfacture = $facture->create($user);
-						if ($resultfacture <= 0) {
-							$contact->error = $facture->error;
-							$contact->errors = $facture->errors;
+					if (!empty(floatval($project->price_booth))) {
+						$productforinvoicerow = new Product($db);
+						$resultprod = $productforinvoicerow->fetch($conf->global->SERVICE_BOOTH_LOCATION);
+						if ($resultprod < 0) {
 							$error++;
+							$errmsg .= $productforinvoicerow->error;
 						} else {
-							$db->commit();
-							$facture->add_object_linked($contact->element, $contact->id);
-						}
-					}
+							$facture = new Facture($db);
+							$facture->type = Facture::TYPE_STANDARD;
+							$facture->socid = $thirdparty->id;
+							$facture->paye = 0;
+							$facture->date = dol_now();
+							$facture->cond_reglement_id = $contact->cond_reglement_id;
 
-					if (!$error) {
-						// Add line to draft invoice
-						$vattouse = get_default_tva($mysoc, $thirdparty, $productforinvoicerow->id);
-						$result = $facture->addline($langs->trans("BoothLocationFee", $conforbooth->label, dol_print_date($conforbooth->datep, '%d/%m/%y %H:%M:%S'), dol_print_date($conforbooth->datep2, '%d/%m/%y %H:%M:%S')), floatval($project->price_booth), 1, $vattouse, 0, 0, $productforinvoicerow->id, 0, dol_now(), '', 0, 0, '', 'HT', 0, 1);
-						if ($result <= 0) {
-							$contact->error = $facture->error;
-							$contact->errors = $facture->errors;
-							$error++;
-						}
-						if (!$error) {
-							$valid = true;
-							$sourcetouse = 'boothlocation';
-							$reftouse = $facture->id;
-							$redirection = $dolibarr_main_url_root.'/public/payment/newpayment.php?source='.$sourcetouse.'&ref='.$reftouse.'&booth='.$conforbooth->id;
-							if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
-								if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
-									$redirection .= '&securekey='.dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $sourcetouse . $reftouse, 2); // Use the source in the hash to avoid duplicates if the references are identical
-								} else {
-									$redirection .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
+							if (empty($facture->cond_reglement_id)) {
+								$paymenttermstatic = new PaymentTerm($contact->db);
+								$facture->cond_reglement_id = $paymenttermstatic->getDefaultId();
+								if (empty($facture->cond_reglement_id)) {
+									$error++;
+									$contact->error = 'ErrorNoPaymentTermRECEPFound';
+									$contact->errors[] = $contact->error;
 								}
 							}
-							Header("Location: ".$redirection);
-							exit;
+							$resultfacture = $facture->create($user);
+							if ($resultfacture <= 0) {
+								$contact->error = $facture->error;
+								$contact->errors = $facture->errors;
+								$error++;
+							} else {
+								$db->commit();
+								$facture->add_object_linked($contact->element, $contact->id);
+							}
+						}
+
+						if (!$error) {
+							// Add line to draft invoice
+							$vattouse = get_default_tva($mysoc, $thirdparty, $productforinvoicerow->id);
+							$result = $facture->addline($langs->trans("BoothLocationFee", $conforbooth->label, dol_print_date($conforbooth->datep, '%d/%m/%y %H:%M:%S'), dol_print_date($conforbooth->datep2, '%d/%m/%y %H:%M:%S')), floatval($project->price_booth), 1, $vattouse, 0, 0, $productforinvoicerow->id, 0, dol_now(), '', 0, 0, '', 'HT', 0, 1);
+							if ($result <= 0) {
+								$contact->error = $facture->error;
+								$contact->errors = $facture->errors;
+								$error++;
+							}
+							if (!$error) {
+								$valid = true;
+								$sourcetouse = 'boothlocation';
+								$reftouse = $facture->id;
+								$redirection = $dolibarr_main_url_root.'/public/payment/newpayment.php?source='.$sourcetouse.'&ref='.$reftouse.'&booth='.$conforbooth->id;
+								if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
+									if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
+										$redirection .= '&securekey='.dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $sourcetouse . $reftouse, 2); // Use the source in the hash to avoid duplicates if the references are identical
+									} else {
+										$redirection .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
+									}
+								}
+								Header("Location: ".$redirection);
+								exit;
+							}
+						}
+					} else {
+						// If no price has been set for the booth, we confirm it as suggested and we update
+						$conforbooth->status = CONFERENCEORBOOTH::STATUS_SUGGESTED;
+						$conforbooth->update($user);
+						// Sending mail
+						require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+						include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+						$formmail = new FormMail($db);
+						// Set output language
+						$outputlangs = new Translate('', $conf);
+						$outputlangs->setDefaultLang(empty($thirdparty->default_lang) ? $mysoc->default_lang : $thirdparty->default_lang);
+						// Load traductions files required by page
+						$outputlangs->loadLangs(array("main", "members"));
+						// Get email content from template
+						$arraydefaultmessage = null;
+
+						$labeltouse = $conf->global->EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT;
+						if (!empty($labeltouse)) {
+							$arraydefaultmessage = $formmail->getEMailTemplate($db, 'eventorganization_send', $user, $outputlangs, $labeltouse, 1, '');
+						}
+
+						if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
+							$subject = $arraydefaultmessage->topic;
+							$msg     = $arraydefaultmessage->content;
+						}
+
+						$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $thirdparty);
+						complete_substitutions_array($substitutionarray, $outputlangs, $object);
+
+						$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
+						$texttosend = make_substitutions($msg, $substitutionarray, $outputlangs);
+
+						$sendto = $thirdparty->email;
+						$from = $conf->global->MAILING_EMAIL_FROM;
+						$urlback = $_SERVER["REQUEST_URI"];
+
+						$ishtml = dol_textishtml($texttosend); // May contain urls
+
+						$mailfile = new CMailFile($subjecttosend, $sendto, $from, $texttosend, array(), array(), array(), '', '', 0, $ishtml);
+
+						$result = $mailfile->sendfile();
+						if ($result) {
+							dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_payment');
+						} else {
+							dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
 						}
 					}
-				} else {
-					// If no price has been set for the booth, we confirm it as suggested and we update
-					$conforbooth->status = CONFERENCEORBOOTH::STATUS_SUGGESTED;
-					$conforbooth->update($user);
-					// Sending mail
-					require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-					include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-					$formmail = new FormMail($db);
-					// Set output language
-					$outputlangs = new Translate('', $conf);
-					$outputlangs->setDefaultLang(empty($thirdparty->default_lang) ? $mysoc->default_lang : $thirdparty->default_lang);
-					// Load traductions files required by page
-					$outputlangs->loadLangs(array("main", "members"));
-					// Get email content from template
-					$arraydefaultmessage = null;
-
-					$labeltouse = $conf->global->EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT;
-					if (!empty($labeltouse)) {
-						$arraydefaultmessage = $formmail->getEMailTemplate($db, 'eventorganization_send', $user, $outputlangs, $labeltouse, 1, '');
-					}
-
-					if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
-						$subject = $arraydefaultmessage->topic;
-						$msg     = $arraydefaultmessage->content;
-					}
-
-					$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $thirdparty);
-					complete_substitutions_array($substitutionarray, $outputlangs, $object);
-
-					$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
-					$texttosend = make_substitutions($msg, $substitutionarray, $outputlangs);
-
-					$sendto = $thirdparty->email;
-					$from = $conf->global->MAILING_EMAIL_FROM;
-					$urlback = $_SERVER["REQUEST_URI"];
-
-					$ishtml = dol_textishtml($texttosend); // May contain urls
-
-					$mailfile = new CMailFile($subjecttosend, $sendto, $from, $texttosend, array(), array(), array(), '', '', 0, $ishtml);
-
-					$result = $mailfile->sendfile();
-					if ($result) {
-						dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_payment');
-					} else {
-						dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
-					}
 				}
-				//}
 			}
 		}
 	}
diff --git a/htdocs/public/project/suggestconference.php b/htdocs/public/project/suggestconference.php
index 21cbe7d77bd..92c53795004 100644
--- a/htdocs/public/project/suggestconference.php
+++ b/htdocs/public/project/suggestconference.php
@@ -374,11 +374,11 @@ if (empty($reshook) && $action == 'add') {
 				$errmsg .= $conforbooth->error;
 			} else {
 				// Adding the contact to the project
-				/*$resultaddcontact = $conforbooth->add_contact($contact);
+				$resultaddcontact = $conforbooth->add_contact($contact->id, 'SPEAKER');
 				if ($resultaddcontact<0) {
 					$error++;
 					$errmsg .= $conforbooth->error;
-				} else {*/
+				} else {
 					$conforbooth->status = CONFERENCEORBOOTH::STATUS_SUGGESTED;
 					$conforbooth->update($user);
 
@@ -395,14 +395,14 @@ if (empty($reshook) && $action == 'add') {
 					$arraydefaultmessage = null;
 
 					$labeltouse = $conf->global->EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT;
-				if (!empty($labeltouse)) {
-					$arraydefaultmessage = $formmail->getEMailTemplate($db, 'eventorganization_send', $user, $outputlangs, $labeltouse, 1, '');
-				}
+					if (!empty($labeltouse)) {
+						$arraydefaultmessage = $formmail->getEMailTemplate($db, 'eventorganization_send', $user, $outputlangs, $labeltouse, 1, '');
+					}
 
-				if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
-					$subject = $arraydefaultmessage->topic;
-					$msg     = $arraydefaultmessage->content;
-				}
+					if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
+						$subject = $arraydefaultmessage->topic;
+						$msg     = $arraydefaultmessage->content;
+					}
 
 					$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $thirdparty);
 					complete_substitutions_array($substitutionarray, $outputlangs, $object);
@@ -419,12 +419,12 @@ if (empty($reshook) && $action == 'add') {
 					$mailfile = new CMailFile($subjecttosend, $sendto, $from, $texttosend, array(), array(), array(), '', '', 0, $ishtml);
 
 					$result = $mailfile->sendfile();
-				if ($result) {
-					dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_payment');
-				} else {
-					dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
+					if ($result) {
+						dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_payment');
+					} else {
+						dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
+					}
 				}
-				//}
 			}
 		}
 	}

From 2f7dd4e8070bbc3cb877c0559cba3875cd747659 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Thu, 6 May 2021 14:53:23 +0200
Subject: [PATCH 0040/1497] wip vote page

---
 htdocs/langs/en_US/eventorganization.lang   |   4 +-
 htdocs/public/project/suggestbooth.php      |   2 +-
 htdocs/public/project/suggestconference.php |   2 +-
 htdocs/public/project/viewandvote.php       | 216 ++++++++++++++++++++
 4 files changed, 221 insertions(+), 3 deletions(-)

diff --git a/htdocs/langs/en_US/eventorganization.lang b/htdocs/langs/en_US/eventorganization.lang
index 1d7b16c17f6..1940c9674c1 100644
--- a/htdocs/langs/en_US/eventorganization.lang
+++ b/htdocs/langs/en_US/eventorganization.lang
@@ -99,7 +99,9 @@ EvntOrgCancelled = Cancelled
 SuggestForm = Suggestion page
 RegisterPage = Page for conferences or booth
 EvntOrgRegistrationWelcomeMessage = Welcome on the conference or booth suggestion page.
-EvntOrgRegistrationHelpMessage = Here, you can suggest a new conference or a new booth for the project
+EvntOrgRegistrationConfHelpMessage = Here, you can suggest a new conference for the project
+EvntOrgRegistrationBoothHelpMessage = Here, you can suggest a new booth for the project
+EvntOrgVoteHelpMessage = Here, you can view and vote for the suggested events for the project
 SuggestConference = Suggest a new conference
 SuggestBooth = Suggest a booth
 ViewAndVote = View and vote for suggested events
diff --git a/htdocs/public/project/suggestbooth.php b/htdocs/public/project/suggestbooth.php
index bb03c0d3782..ecaf524c034 100644
--- a/htdocs/public/project/suggestbooth.php
+++ b/htdocs/public/project/suggestbooth.php
@@ -526,7 +526,7 @@ print '<div class="center subscriptionformhelptext justify">';
 
 // Welcome message
 $text  = '<tr><td class="textpublicpayment"><strong>'.$langs->trans("EvntOrgRegistrationWelcomeMessage").'</strong></td></tr></br>';
-$text .= '<tr><td class="textpublicpayment">'.$langs->trans("EvntOrgRegistrationHelpMessage").' '.$id.'.<br><br></td></tr>'."\n";
+$text .= '<tr><td class="textpublicpayment">'.$langs->trans("EvntOrgRegistrationBoothHelpMessage").' '.$id.'.<br><br></td></tr>'."\n";
 $text .= '<tr><td class="textpublicpayment">'.$project->note_public.'</td></tr>'."\n";;
 print $text;
 print '</div>';
diff --git a/htdocs/public/project/suggestconference.php b/htdocs/public/project/suggestconference.php
index 92c53795004..53dc9581d9a 100644
--- a/htdocs/public/project/suggestconference.php
+++ b/htdocs/public/project/suggestconference.php
@@ -460,7 +460,7 @@ print '<div class="center subscriptionformhelptext justify">';
 
 // Welcome message
 $text  = '<tr><td class="textpublicpayment"><strong>'.$langs->trans("EvntOrgRegistrationWelcomeMessage").'</strong></td></tr></br>';
-$text .= '<tr><td class="textpublicpayment">'.$langs->trans("EvntOrgRegistrationHelpMessage").' '.$id.'.<br><br></td></tr>'."\n";
+$text .= '<tr><td class="textpublicpayment">'.$langs->trans("EvntOrgRegistrationConfHelpMessage").' '.$id.'.<br><br></td></tr>'."\n";
 $text .= '<tr><td class="textpublicpayment">'.$project->note_public.'</td></tr>'."\n";;
 print $text;
 print '</div>';
diff --git a/htdocs/public/project/viewandvote.php b/htdocs/public/project/viewandvote.php
index b3d9bbc7f37..fe7d4d2ed59 100644
--- a/htdocs/public/project/viewandvote.php
+++ b/htdocs/public/project/viewandvote.php
@@ -1 +1,217 @@
 <?php
+/* Copyright (C) 2001-2002	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2006-2017	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2009-2012	Regis Houssin			<regis.houssin@inodbox.com>
+ * Copyright (C) 2018	    Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2018-2019	Thibault FOUCART	    <support@ptibogxiv.net>
+ * Copyright (C) 2021		Waël Almoman	    	<info@almoman.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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
+ * For Paypal test: https://developer.paypal.com/
+ * For Paybox test: ???
+ * For Stripe test: Use credit card 4242424242424242 .More example on https://stripe.com/docs/testing
+ *
+ * Variants:
+ * - When option STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION is on, we use the new PaymentIntent API
+ * - When option STRIPE_USE_NEW_CHECKOUT is on, we use the new checkout API
+ * - If no option set, we use old APIS (charge)
+ */
+
+/**
+ *     	\file       htdocs/public/payment/newpayment.php
+ *		\ingroup    core
+ *		\brief      File to offer a way to make a payment for a particular Dolibarr object
+ */
+
+if (!defined('NOLOGIN')) {
+	define("NOLOGIN", 1); // This means this output page does not require to be logged.
+}
+if (!defined('NOCSRFCHECK')) {
+	define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
+}
+if (!defined('NOIPCHECK')) {
+	define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
+}
+if (!defined('NOBROWSERNOTIF')) {
+	define('NOBROWSERNOTIF', '1');
+}
+
+// For MultiCompany module.
+// Do not use GETPOST here, function is not defined and get of entity must be done before including main.inc.php
+$entity = (!empty($_GET['entity']) ? (int) $_GET['entity'] : (!empty($_POST['entity']) ? (int) $_POST['entity'] : (!empty($_GET['e']) ? (int) $_GET['e'] : (!empty($_POST['e']) ? (int) $_POST['e'] : 1))));
+if (is_numeric($entity)) {
+	define("DOLENTITY", $entity);
+}
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/societe/class/societeaccount.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+// Hook to be used by external payment modules (ie Payzen, ...)
+include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+$hookmanager = new HookManager($db);
+$hookmanager->initHooks(array('newpayment'));
+
+// For encryption
+global $dolibarr_main_instance_unique_id;
+
+// Load translation files
+$langs->loadLangs(array("main", "other", "dict", "bills", "companies", "errors", "paybox", "paypal", "stripe")); // File with generic data
+
+// Security check
+// No check on module enabled. Done later according to $validpaymentmethod
+
+$action = GETPOST('action', 'aZ09');
+$id = GETPOST('id');
+$securekeyreceived = GETPOST("securekey");
+$securekeytocompare = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$id, 2);
+
+if ($securekeytocompare != $securekeyreceived) {
+	print $langs->trans('MissingOrBadSecureKey');
+	exit;
+}
+
+// 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. For Paypal payment, we can use internal URL like localhost.
+
+$project = new Project($db);
+$resultproject = $project->fetch($id);
+if ($resultproject < 0) {
+	$error++;
+	$errmsg .= $project->error;
+}
+
+/*
+ * Actions
+ */
+
+$listOfEvents = '<tr><td>oui</tr></td>';
+
+
+
+/*
+ * View
+ */
+
+$head = '';
+if (!empty($conf->global->ONLINE_PAYMENT_CSS_URL)) {
+	$head = '<link rel="stylesheet" type="text/css" href="'.$conf->global->ONLINE_PAYMENT_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
+}
+
+$conf->dol_hide_topmenu = 1;
+$conf->dol_hide_leftmenu = 1;
+
+$replacemainarea = (empty($conf->dol_hide_leftmenu) ? '<div>' : '').'<div>';
+llxHeader($head, $langs->trans("SuggestForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody', $replacemainarea);
+
+print '<span id="dolpaymentspan"></span>'."\n";
+print '<div class="center">'."\n";
+print '<form id="dolpaymentform" class="center" name="paymentform" action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";
+print '<input type="hidden" name="token" value="'.newToken().'">'."\n";
+print '<input type="hidden" name="action" value="dopayment">'."\n";
+print '<input type="hidden" name="tag" value="'.GETPOST("tag", 'alpha').'">'."\n";
+//print '<input type="hidden" name="suffix" value="'.dol_escape_htmltag($suffix).'">'."\n";
+print '<input type="hidden" name="id" value="'.dol_escape_htmltag($id).'">'."\n";
+print '<input type="hidden" name="securekey" value="'.dol_escape_htmltag($securekeyreceived).'">'."\n";
+print '<input type="hidden" name="e" value="'.$entity.'" />';
+print '<input type="hidden" name="forcesandbox" value="'.GETPOST('forcesandbox', 'int').'" />';
+print "\n";
+
+
+// Show logo (search order: logo defined by PAYMENT_LOGO_suffix, then PAYMENT_LOGO, then small company logo, large company logo, theme logo, common logo)
+// Define logo and logosmall
+$logosmall = $mysoc->logo_small;
+$logo = $mysoc->logo;
+$paramlogo = 'ONLINE_PAYMENT_LOGO_'.$suffix;
+if (!empty($conf->global->$paramlogo)) {
+	$logosmall = $conf->global->$paramlogo;
+} elseif (!empty($conf->global->ONLINE_PAYMENT_LOGO)) {
+	$logosmall = $conf->global->ONLINE_PAYMENT_LOGO;
+}
+//print '<!-- Show logo (logosmall='.$logosmall.' logo='.$logo.') -->'."\n";
+// Define urllogo
+$urllogo = '';
+$urllogofull = '';
+if (!empty($logosmall) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$logosmall)) {
+	$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file='.urlencode('logos/thumbs/'.$logosmall);
+	$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/thumbs/'.$logosmall);
+} elseif (!empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo)) {
+	$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file='.urlencode('logos/'.$logo);
+	$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/'.$logo);
+}
+
+// Output html code for logo
+if ($urllogo) {
+	print '<div class="backgreypublicpayment">';
+	print '<div class="logopublicpayment">';
+	print '<img id="dolpaymentlogo" src="'.$urllogo.'"';
+	print '>';
+	print '</div>';
+	if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
+		print '<div class="poweredbypublicpayment opacitymedium right"><a class="poweredbyhref" href="https://www.dolibarr.org?utm_medium=website&utm_source=poweredby" target="dolibarr" rel="noopener">'.$langs->trans("PoweredBy").'<br><img class="poweredbyimg" src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
+	}
+	print '</div>';
+}
+
+print '<table id="dolpaymenttable" summary="Payment form" class="center">'."\n";
+
+$text  = '<tr><td class="textpublicpayment"><br><strong>'.$langs->trans("EvntOrgRegistrationWelcomeMessage").'</strong></td></tr>'."\n";
+$text .= '<tr><td class="textpublicpayment">'.$langs->trans("EvntOrgVoteHelpMessage").' '.$id.'.<br><br></td></tr>'."\n";
+$text .= '<tr><td class="textpublicpayment">'.$project->note_public.'<br><br></td></tr>'."\n";;
+
+print $text;
+
+print $listOfEvents;
+
+// Output payment summary form
+print '<tr><td align="center">';
+
+$found = false;
+$error = 0;
+$var = false;
+
+$object = null;
+
+print "\n";
+
+
+// Show all action buttons
+print '<br>';
+
+print '<input type="submit" value="'.$langs->trans("ViewAndVote").'" id="viewandvote" name="viewandvote" class="button">';
+
+
+
+
+print '</td></tr>'."\n";
+
+print '</table>'."\n";
+
+print '</form>'."\n";
+print '</div>'."\n";
+print '<br>';
+
+
+htmlPrintOnlinePaymentFooter($mysoc, $langs, 1, $suffix, $object);
+
+llxFooter('', 'public');
+
+$db->close();

From 295c63468b7ac1a22dac7db7dac89f4222a49b92 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Thu, 6 May 2021 16:32:39 +0200
Subject: [PATCH 0041/1497] wip vote page

---
 htdocs/langs/en_US/eventorganization.lang |  2 +
 htdocs/public/project/viewandvote.php     | 79 ++++++++++++++++++++---
 2 files changed, 73 insertions(+), 8 deletions(-)

diff --git a/htdocs/langs/en_US/eventorganization.lang b/htdocs/langs/en_US/eventorganization.lang
index 1940c9674c1..8f36876fddc 100644
--- a/htdocs/langs/en_US/eventorganization.lang
+++ b/htdocs/langs/en_US/eventorganization.lang
@@ -102,6 +102,8 @@ EvntOrgRegistrationWelcomeMessage = Welcome on the conference or booth suggestio
 EvntOrgRegistrationConfHelpMessage = Here, you can suggest a new conference for the project
 EvntOrgRegistrationBoothHelpMessage = Here, you can suggest a new booth for the project
 EvntOrgVoteHelpMessage = Here, you can view and vote for the suggested events for the project
+ListOfSuggestedConferences = List of suggested conferences
+ListOfSuggestedBooths = List of suggested booths
 SuggestConference = Suggest a new conference
 SuggestBooth = Suggest a booth
 ViewAndVote = View and vote for suggested events
diff --git a/htdocs/public/project/viewandvote.php b/htdocs/public/project/viewandvote.php
index fe7d4d2ed59..89cdca7591b 100644
--- a/htdocs/public/project/viewandvote.php
+++ b/htdocs/public/project/viewandvote.php
@@ -63,6 +63,7 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/societeaccount.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+require_once DOL_DOCUMENT_ROOT . '/comm/action/class/actioncomm.class.php';
 // Hook to be used by external payment modules (ie Payzen, ...)
 include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 $hookmanager = new HookManager($db);
@@ -102,10 +103,62 @@ if ($resultproject < 0) {
 /*
  * Actions
  */
+$tmpthirdparty = new Societe($db);
 
-$listOfEvents = '<tr><td>oui</tr></td>';
+$listOfConferences = $listOfBooths = '<tr><td>'.$langs->trans('Label').'</td>
+										  <td>'.$langs->trans('Type').'</td>
+										  <td>'.$langs->trans('DateStart').'</td>
+									      <td>'.$langs->trans('DateEnd').'</td>
+									      <td>'.$langs->trans('Thirdparty').'</td>
+									      <td>'.$langs->trans('Note').'</td>';
 
 
+// For conferences
+$sql = "SELECT a.id, a.fk_action, a.datep, a.datep2, a.label, a.fk_soc, a.note, ca.libelle
+		FROM ".MAIN_DB_PREFIX."actioncomm as a
+		INNER JOIN ".MAIN_DB_PREFIX."c_actioncomm as ca ON (a.fk_action=ca.id)
+		WHERE ca.module='conference@eventorganization'
+		AND a.status<2";
+$result = $db->query($sql);
+
+$i = 0;
+while ($i < $db->num_rows($result)) {
+	$obj = $db->fetch_object($result);
+
+	$resultthirdparty = $tmpthirdparty->fetch($obj->fk_soc);
+	if ($resultthirdparty) {
+		$thirdpartyname = $tmpthirdparty->name;
+	} else {
+		$thirdpartyname = '';
+	}
+
+	$listOfConferences .= '<tr><td>'.$obj->label.'</td><td>'.$obj->libelle.'</td><td>'.$obj->datep.'</td><td>'.$obj->datep2.'</td><td>'.$thirdpartyname.'</td><td>'.$obj->note.'</td>';
+	$listOfConferences .= '<td><input type="submit" value="'.$langs->trans("Vote").'" name="'.$obj->id.'" class="button"></td></tr>';
+	$i++;
+}
+
+// For booths
+$sql = "SELECT a.id, a.fk_action, a.datep, a.datep2, a.label, a.fk_soc, a.note, ca.libelle
+		FROM ".MAIN_DB_PREFIX."actioncomm as a
+		INNER JOIN ".MAIN_DB_PREFIX."c_actioncomm as ca ON (a.fk_action=ca.id)
+		WHERE ca.module='booth@eventorganization'
+		AND a.status<2";
+$result = $db->query($sql);
+$i = 0;
+while ($i < $db->num_rows($result)) {
+	$obj = $db->fetch_object($result);
+
+	$resultthirdparty = $tmpthirdparty->fetch($obj->fk_soc);
+	if ($resultthirdparty) {
+		$thirdpartyname = $tmpthirdparty->name;
+	} else {
+		$thirdpartyname = '';
+	}
+
+	$listOfBooths .= '<tr><td>'.$obj->label.'</td><td>'.$obj->libelle.'</td><td>'.$obj->datep.'</td><td>'.$obj->datep2.'</td><td>'.$thirdpartyname.'</td><td>'.$obj->note.'</td>';
+	$listOfBooths .= '<td><input type="submit" value="'.$langs->trans("Vote").'" name="'.$obj->id.'" class="button"></td></tr>';
+	$i++;
+}
 
 /*
  * View
@@ -170,16 +223,26 @@ if ($urllogo) {
 	}
 	print '</div>';
 }
-
-print '<table id="dolpaymenttable" summary="Payment form" class="center">'."\n";
-
+print '<table id="welcome" class="center">'."\n";
 $text  = '<tr><td class="textpublicpayment"><br><strong>'.$langs->trans("EvntOrgRegistrationWelcomeMessage").'</strong></td></tr>'."\n";
-$text .= '<tr><td class="textpublicpayment">'.$langs->trans("EvntOrgVoteHelpMessage").' '.$id.'.<br><br></td></tr>'."\n";
+$text .= '<tr><td class="textpublicpayment">'.$langs->trans("EvntOrgVoteHelpMessage").' : "'.$project->title.'".<br><br></td></tr>'."\n";
 $text .= '<tr><td class="textpublicpayment">'.$project->note_public.'<br><br></td></tr>'."\n";;
-
 print $text;
+print '</table>'."\n";
 
-print $listOfEvents;
+print dol_get_fiche_head('');
+
+print '<table border=1  cellpadding="10" id="conferences" class="center">'."\n";
+print '<th colspan="7">'.$langs->trans("ListOfSuggestedConferences").'</th>';
+print $listOfConferences.'</br>';
+print '</table>'."\n";
+
+
+print '<table border=1  cellpadding="10" id="conferences" class="center">'."\n";
+print '<th colspan="7">'.$langs->trans("ListOfSuggestedBooths").'</th>';
+print $listOfBooths.'</br>';
+print '</table>'."\n";
+print dol_get_fiche_end();
 
 // Output payment summary form
 print '<tr><td align="center">';
@@ -196,7 +259,7 @@ print "\n";
 // Show all action buttons
 print '<br>';
 
-print '<input type="submit" value="'.$langs->trans("ViewAndVote").'" id="viewandvote" name="viewandvote" class="button">';
+//print '<input type="submit" value="'.$langs->trans("ViewAndVote").'" id="viewandvote" name="viewandvote" class="button">';
 
 
 

From 166e15633b2d6e5ac6a0b8f2521bfedd01d6c12c Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Thu, 6 May 2021 17:30:11 +0200
Subject: [PATCH 0042/1497] factorisation

---
 htdocs/public/project/viewandvote.php | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/htdocs/public/project/viewandvote.php b/htdocs/public/project/viewandvote.php
index 89cdca7591b..7b6f8776d3a 100644
--- a/htdocs/public/project/viewandvote.php
+++ b/htdocs/public/project/viewandvote.php
@@ -110,51 +110,44 @@ $listOfConferences = $listOfBooths = '<tr><td>'.$langs->trans('Label').'</td>
 										  <td>'.$langs->trans('DateStart').'</td>
 									      <td>'.$langs->trans('DateEnd').'</td>
 									      <td>'.$langs->trans('Thirdparty').'</td>
-									      <td>'.$langs->trans('Note').'</td>';
+									      <td>'.$langs->trans('Note').'</td></tr>';
 
-
-// For conferences
 $sql = "SELECT a.id, a.fk_action, a.datep, a.datep2, a.label, a.fk_soc, a.note, ca.libelle
 		FROM ".MAIN_DB_PREFIX."actioncomm as a
 		INNER JOIN ".MAIN_DB_PREFIX."c_actioncomm as ca ON (a.fk_action=ca.id)
-		WHERE ca.module='conference@eventorganization'
-		AND a.status<2";
-$result = $db->query($sql);
+		WHERE a.status<2";
 
+$sqlforconf = $sql." AND ca.module='conference@eventorganization'";
+$sqlforbooth = $sql." AND ca.module='booth@eventorganization'";
+
+
+// For conferences
+$result = $db->query($sqlforconf);
 $i = 0;
 while ($i < $db->num_rows($result)) {
 	$obj = $db->fetch_object($result);
-
 	$resultthirdparty = $tmpthirdparty->fetch($obj->fk_soc);
 	if ($resultthirdparty) {
 		$thirdpartyname = $tmpthirdparty->name;
 	} else {
 		$thirdpartyname = '';
 	}
-
 	$listOfConferences .= '<tr><td>'.$obj->label.'</td><td>'.$obj->libelle.'</td><td>'.$obj->datep.'</td><td>'.$obj->datep2.'</td><td>'.$thirdpartyname.'</td><td>'.$obj->note.'</td>';
 	$listOfConferences .= '<td><input type="submit" value="'.$langs->trans("Vote").'" name="'.$obj->id.'" class="button"></td></tr>';
 	$i++;
 }
 
 // For booths
-$sql = "SELECT a.id, a.fk_action, a.datep, a.datep2, a.label, a.fk_soc, a.note, ca.libelle
-		FROM ".MAIN_DB_PREFIX."actioncomm as a
-		INNER JOIN ".MAIN_DB_PREFIX."c_actioncomm as ca ON (a.fk_action=ca.id)
-		WHERE ca.module='booth@eventorganization'
-		AND a.status<2";
-$result = $db->query($sql);
+$result = $db->query($sqlforbooth);
 $i = 0;
 while ($i < $db->num_rows($result)) {
 	$obj = $db->fetch_object($result);
-
 	$resultthirdparty = $tmpthirdparty->fetch($obj->fk_soc);
 	if ($resultthirdparty) {
 		$thirdpartyname = $tmpthirdparty->name;
 	} else {
 		$thirdpartyname = '';
 	}
-
 	$listOfBooths .= '<tr><td>'.$obj->label.'</td><td>'.$obj->libelle.'</td><td>'.$obj->datep.'</td><td>'.$obj->datep2.'</td><td>'.$thirdpartyname.'</td><td>'.$obj->note.'</td>';
 	$listOfBooths .= '<td><input type="submit" value="'.$langs->trans("Vote").'" name="'.$obj->id.'" class="button"></td></tr>';
 	$i++;

From 27cffbddf368ec8c47c0133dfdf5560cdccc8d19 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Fri, 7 May 2021 12:21:15 +0200
Subject: [PATCH 0043/1497] vote page ok

---
 htdocs/langs/en_US/eventorganization.lang | 12 ++++-
 htdocs/public/payment/paymentok.php       |  1 -
 htdocs/public/project/viewandvote.php     | 61 +++++++++++++++++++++--
 3 files changed, 67 insertions(+), 7 deletions(-)

diff --git a/htdocs/langs/en_US/eventorganization.lang b/htdocs/langs/en_US/eventorganization.lang
index 8f36876fddc..97293f3cbb0 100644
--- a/htdocs/langs/en_US/eventorganization.lang
+++ b/htdocs/langs/en_US/eventorganization.lang
@@ -98,10 +98,8 @@ EvntOrgCancelled = Cancelled
 #
 SuggestForm = Suggestion page
 RegisterPage = Page for conferences or booth
-EvntOrgRegistrationWelcomeMessage = Welcome on the conference or booth suggestion page.
 EvntOrgRegistrationConfHelpMessage = Here, you can suggest a new conference for the project
 EvntOrgRegistrationBoothHelpMessage = Here, you can suggest a new booth for the project
-EvntOrgVoteHelpMessage = Here, you can view and vote for the suggested events for the project
 ListOfSuggestedConferences = List of suggested conferences
 ListOfSuggestedBooths = List of suggested booths
 SuggestConference = Suggest a new conference
@@ -114,6 +112,16 @@ EvntOrgDuration = This conference starts on %s and ends on %s.
 ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
 BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
 EventType = Event type
+
+#
+# Vote page
+#
+EvntOrgRegistrationWelcomeMessage = Welcome on the conference or booth suggestion page.
+EvntOrgVoteHelpMessage = Here, you can view and vote for the suggested events for the project
+VoteOk = Your vote has been accepted.
+AlreadyVoted = You have already voted for this event.
+VoteError = An error has occurred during the vote, please try again.
+
 #
 # SubscriptionOk page
 #
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index bf140bdd600..5cbd3da966b 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -1068,7 +1068,6 @@ if ($ispaymentok) {
 			$ispostactionok = -1;
 		}
 	} elseif (array_key_exists('BOO', $tmptag) && $tmptag['BOO'] > 0) {
-		// @todo BOOTH CASE (to copy and adapt from above)
 		// Record payment
 		include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 		$object = new Facture($db);
diff --git a/htdocs/public/project/viewandvote.php b/htdocs/public/project/viewandvote.php
index 7b6f8776d3a..355156d73cb 100644
--- a/htdocs/public/project/viewandvote.php
+++ b/htdocs/public/project/viewandvote.php
@@ -70,7 +70,7 @@ $hookmanager = new HookManager($db);
 $hookmanager->initHooks(array('newpayment'));
 
 // For encryption
-global $dolibarr_main_instance_unique_id;
+global $dolibarr_main_instance_unique_id, $dolibarr_main_url_root;
 
 // Load translation files
 $langs->loadLangs(array("main", "other", "dict", "bills", "companies", "errors", "paybox", "paypal", "stripe")); // File with generic data
@@ -88,6 +88,14 @@ if ($securekeytocompare != $securekeyreceived) {
 	exit;
 }
 
+if (GETPOST("votestatus")=="ok") {
+	setEventMessage($langs->trans("VoteOk"), 'mesgs');
+} else if (GETPOST("votestatus")=="ko") {
+	setEventMessage($langs->trans("AlreadyVoted"), 'warnings');
+} else if (GETPOST("votestatus")=="err") {
+	setEventMessage($langs->trans("VoteError"), 'warnings');
+}
+
 // 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
@@ -120,7 +128,6 @@ $sql = "SELECT a.id, a.fk_action, a.datep, a.datep2, a.label, a.fk_soc, a.note,
 $sqlforconf = $sql." AND ca.module='conference@eventorganization'";
 $sqlforbooth = $sql." AND ca.module='booth@eventorganization'";
 
-
 // For conferences
 $result = $db->query($sqlforconf);
 $i = 0;
@@ -133,7 +140,7 @@ while ($i < $db->num_rows($result)) {
 		$thirdpartyname = '';
 	}
 	$listOfConferences .= '<tr><td>'.$obj->label.'</td><td>'.$obj->libelle.'</td><td>'.$obj->datep.'</td><td>'.$obj->datep2.'</td><td>'.$thirdpartyname.'</td><td>'.$obj->note.'</td>';
-	$listOfConferences .= '<td><input type="submit" value="'.$langs->trans("Vote").'" name="'.$obj->id.'" class="button"></td></tr>';
+	$listOfConferences .= '<td><button type="submit" name="vote" value="'.$obj->id.'" class="button">'.$langs->trans("Vote").'</button></td></tr>';
 	$i++;
 }
 
@@ -149,10 +156,56 @@ while ($i < $db->num_rows($result)) {
 		$thirdpartyname = '';
 	}
 	$listOfBooths .= '<tr><td>'.$obj->label.'</td><td>'.$obj->libelle.'</td><td>'.$obj->datep.'</td><td>'.$obj->datep2.'</td><td>'.$thirdpartyname.'</td><td>'.$obj->note.'</td>';
-	$listOfBooths .= '<td><input type="submit" value="'.$langs->trans("Vote").'" name="'.$obj->id.'" class="button"></td></tr>';
+	$listOfBooths .= '<td><button type="submit" name="vote" value="'.$obj->id.'" class="button">'.$langs->trans("Vote").'</button></td></tr>';
 	$i++;
 }
 
+// Get vote result
+$idvote = GETPOST("vote");
+$hashedvote = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'vote'.$idvote);
+
+if (strlen($idvote)) {
+	if ($_COOKIE['VOTE_SUGGESTED_EVENTS_'.$hashedvote]==1) {
+		// Has already voted
+		$votestatus = 'ko';
+	} else {
+		// Has not already voted
+		$conforbooth = new ActionComm($db);
+		$resultconforbooth = $conforbooth->fetch($idvote);
+		if ($resultconforbooth<=0) {
+			$error++;
+			$errmsg .= $conforbooth->error;
+		} else {
+			// Cookie expiration date : start of event, or 30 days if not specified
+			$startdate = $conforbooth->datep;
+			if (strlen($startdate)) {
+				$timeleftbeforestartofevent = $startdate;
+			} else {
+				// Cookie duration by default
+				$timeleftbeforestartofevent = time()+86400*30;
+			}
+
+			// Process to vote
+			$res = setcookie('VOTE_SUGGESTED_EVENTS_'.$hashedvote, 1, 0);
+			if ($res) {
+				$conforbooth->num_vote++;
+				$resupdate = $conforbooth->update($user);
+				if ($resupdate) {
+					$votestatus = 'ok';
+				} else {
+					//Error during update
+					$votestatus = 'err';
+					$res = setcookie('VOTE_SUGGESTED_EVENTS_'.$hashedvote, 0, 0);
+				}
+			} else {
+				$votestatus = 'err';
+			}
+		}
+	}
+	header("Refresh:0;url=".dol_buildpath('/public/project/viewandvote.php?votestatus='.$votestatus.'&id='.$id.'&securekey=', 1).$securekeyreceived);
+}
+
+
 /*
  * View
  */

From 5bb100de29cb305728f057584c33587527b75774 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Fri, 7 May 2021 13:02:34 +0200
Subject: [PATCH 0044/1497] conforbooth class required in paymentok to confirm
 the booth

---
 htdocs/public/payment/paymentok.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 5cbd3da966b..09ffc2318b0 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -52,6 +52,7 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorboothattendee.class.php';
+require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorbooth.class.php';
 
 if (!empty($conf->paypal->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypal.lib.php';

From 2169a106fa040afec242b1786999b6c012c8c642 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Fri, 7 May 2021 14:34:29 +0200
Subject: [PATCH 0045/1497] note is now saved in database

---
 htdocs/eventorganization/class/conferenceorbooth.class.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/eventorganization/class/conferenceorbooth.class.php b/htdocs/eventorganization/class/conferenceorbooth.class.php
index 0df30ac61db..6227fb668ec 100644
--- a/htdocs/eventorganization/class/conferenceorbooth.class.php
+++ b/htdocs/eventorganization/class/conferenceorbooth.class.php
@@ -212,6 +212,7 @@ class ConferenceOrBooth extends ActionComm
 		$this->type_id=$this->fk_action;
 		$this->socid=$this->fk_soc;
 		$this->datef=$this->datep2;
+		$this->note_private=$this->note;
 	}
 
 	/**

From 6111f4394660511ec3c554e110f00b271046a2f0 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Fri, 7 May 2021 14:49:00 +0200
Subject: [PATCH 0046/1497] security fix, id was encoded where it should not be
 encoded

---
 htdocs/langs/en_US/eventorganization.lang   | 1 +
 htdocs/public/project/suggestbooth.php      | 3 +--
 htdocs/public/project/suggestconference.php | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/htdocs/langs/en_US/eventorganization.lang b/htdocs/langs/en_US/eventorganization.lang
index 97293f3cbb0..97090c343cf 100644
--- a/htdocs/langs/en_US/eventorganization.lang
+++ b/htdocs/langs/en_US/eventorganization.lang
@@ -98,6 +98,7 @@ EvntOrgCancelled = Cancelled
 #
 SuggestForm = Suggestion page
 RegisterPage = Page for conferences or booth
+EvntOrgRegistrationHelpMessage = Here, you can vote for an event, or suggest a new conference or booth for the project
 EvntOrgRegistrationConfHelpMessage = Here, you can suggest a new conference for the project
 EvntOrgRegistrationBoothHelpMessage = Here, you can suggest a new booth for the project
 ListOfSuggestedConferences = List of suggested conferences
diff --git a/htdocs/public/project/suggestbooth.php b/htdocs/public/project/suggestbooth.php
index ecaf524c034..71663a7f15c 100644
--- a/htdocs/public/project/suggestbooth.php
+++ b/htdocs/public/project/suggestbooth.php
@@ -496,9 +496,8 @@ if (empty($reshook) && $action == 'add') {
 	}
 	if (!$error) {
 		$db->commit();
-		$encodedid = dol_encode($id, $dolibarr_main_instance_unique_id);
 		$securekeyurl = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$id, 2);
-		$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?id='.$encodedid.'&securekey='.$securekeyurl;
+		$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?id='.$id.'&securekey='.$securekeyurl;
 		Header("Location: ".$redirection);
 		exit;
 	} else {
diff --git a/htdocs/public/project/suggestconference.php b/htdocs/public/project/suggestconference.php
index 53dc9581d9a..844641fc4cf 100644
--- a/htdocs/public/project/suggestconference.php
+++ b/htdocs/public/project/suggestconference.php
@@ -430,9 +430,8 @@ if (empty($reshook) && $action == 'add') {
 	}
 	if (!$error) {
 		$db->commit();
-		$encodedid = dol_encode($id, $dolibarr_main_instance_unique_id);
 		$securekeyurl = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$id, 2);
-		$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?id='.$encodedid.'&securekey='.$securekeyurl;
+		$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?id='.$id.'&securekey='.$securekeyurl;
 		Header("Location: ".$redirection);
 		exit;
 	} else {

From dbde0f0b02e96d0db4fd954f762cb7086f6df693 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Fri, 7 May 2021 15:05:37 +0200
Subject: [PATCH 0047/1497] fix on status change when a booth is paid

---
 htdocs/public/payment/paymentok.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 09ffc2318b0..390ce6ef555 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -1176,7 +1176,7 @@ if ($ispaymentok) {
 							$error++;
 							setEventMessages(null, $booth->errors, "errors");
 						} else {
-							$booth->setStatut(CONFERENCEORBOOTH::STATUS_SUGGESTED);
+							$booth->status = CONFERENCEORBOOTH::STATUS_SUGGESTED;
 							$resultboothupdate = $booth->update($user);
 							if ($resultboothupdate<0) {
 								// Finding the thirdparty by getting the invoice

From dfd3742d91370735775864520aa53c8428024610 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Fri, 7 May 2021 15:33:00 +0200
Subject: [PATCH 0048/1497] fix on label on payment page

---
 htdocs/public/payment/newpayment.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 9cadab8deb4..67323190e44 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -1810,9 +1810,6 @@ if ($source == 'conferencesubscription') {
 
 	// Object
 	$text = '<b>'.$langs->trans("PaymentConferenceAttendee").'</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="source" value="'.dol_escape_htmltag($source).'">';
@@ -1899,9 +1896,6 @@ if ($source == 'boothlocation') {
 
 	// Object
 	$text = '<b>'.$langs->trans("PaymentBoothLocation").'</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="source" value="'.dol_escape_htmltag($source).'">';

From d344ce5e08d4392cbf5cb7006d4485835ebafb8c Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Fri, 7 May 2021 15:59:25 +0200
Subject: [PATCH 0049/1497] clean viewandvote page

---
 htdocs/public/project/viewandvote.php | 28 ---------------------------
 1 file changed, 28 deletions(-)

diff --git a/htdocs/public/project/viewandvote.php b/htdocs/public/project/viewandvote.php
index 355156d73cb..f167fcf1717 100644
--- a/htdocs/public/project/viewandvote.php
+++ b/htdocs/public/project/viewandvote.php
@@ -18,15 +18,6 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
- *
- * For Paypal test: https://developer.paypal.com/
- * For Paybox test: ???
- * For Stripe test: Use credit card 4242424242424242 .More example on https://stripe.com/docs/testing
- *
- * Variants:
- * - When option STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION is on, we use the new PaymentIntent API
- * - When option STRIPE_USE_NEW_CHECKOUT is on, we use the new checkout API
- * - If no option set, we use old APIS (charge)
  */
 
 /**
@@ -288,7 +279,6 @@ print '<table border=1  cellpadding="10" id="conferences" class="center">'."\n";
 print '<th colspan="7">'.$langs->trans("ListOfSuggestedBooths").'</th>';
 print $listOfBooths.'</br>';
 print '</table>'."\n";
-print dol_get_fiche_end();
 
 // Output payment summary form
 print '<tr><td align="center">';
@@ -301,24 +291,6 @@ $object = null;
 
 print "\n";
 
-
-// Show all action buttons
-print '<br>';
-
-//print '<input type="submit" value="'.$langs->trans("ViewAndVote").'" id="viewandvote" name="viewandvote" class="button">';
-
-
-
-
-print '</td></tr>'."\n";
-
-print '</table>'."\n";
-
-print '</form>'."\n";
-print '</div>'."\n";
-print '<br>';
-
-
 htmlPrintOnlinePaymentFooter($mysoc, $langs, 1, $suffix, $object);
 
 llxFooter('', 'public');

From c48234409b30b811b341fe254cd370e7071d5923 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Fri, 7 May 2021 16:15:13 +0200
Subject: [PATCH 0050/1497] added copyright

---
 htdocs/langs/en_US/eventorganization.lang                 | 1 +
 htdocs/public/eventorganization/attendee_subscription.php | 8 +-------
 htdocs/public/eventorganization/subscriptionok.php        | 1 +
 htdocs/public/payment/newpayment.php                      | 1 +
 htdocs/public/payment/paymentok.php                       | 1 +
 htdocs/public/project/index.php                           | 7 +------
 htdocs/public/project/suggestbooth.php                    | 8 +-------
 htdocs/public/project/suggestconference.php               | 8 +-------
 htdocs/public/project/viewandvote.php                     | 7 +------
 9 files changed, 9 insertions(+), 33 deletions(-)

diff --git a/htdocs/langs/en_US/eventorganization.lang b/htdocs/langs/en_US/eventorganization.lang
index 97090c343cf..1a663c0b713 100644
--- a/htdocs/langs/en_US/eventorganization.lang
+++ b/htdocs/langs/en_US/eventorganization.lang
@@ -1,4 +1,5 @@
 # Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+# Copyright (C) 2021		Dorian Vabre			<dorian.vabre@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
diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index 37972628eed..82e82d58129 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -1,11 +1,5 @@
 <?php
-/* Copyright (C) 2001-2002  Rodolphe Quiedeville    <rodolphe@quiedeville.org>
- * Copyright (C) 2001-2002  Jean-Louis Bergamo      <jlb@j1b.org>
- * Copyright (C) 2006-2013  Laurent Destailleur     <eldy@users.sourceforge.net>
- * Copyright (C) 2012       Regis Houssin           <regis.houssin@inodbox.com>
- * Copyright (C) 2012       J. Fernando Lagrange    <fernando@demo-tic.org>
- * Copyright (C) 2018-2019  Frédéric France         <frederic.france@netlogic.fr>
- * Copyright (C) 2018       Alexandre Spangaro      <aspangaro@open-dsi.fr>
+/* Copyright (C) 2021		Dorian Vabre			<dorian.vabre@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
diff --git a/htdocs/public/eventorganization/subscriptionok.php b/htdocs/public/eventorganization/subscriptionok.php
index 02fb456f7d2..8586535f5ab 100644
--- a/htdocs/public/eventorganization/subscriptionok.php
+++ b/htdocs/public/eventorganization/subscriptionok.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2006-2013	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2012		Regis Houssin			<regis.houssin@inodbox.com>
  * Copyright (C) 2021		Waël Almoman			<info@almoman.com>
+ * Copyright (C) 2021		Dorian Vabre			<dorian.vabre@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
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 67323190e44..9de10b44cac 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2018	    Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2018-2019	Thibault FOUCART	    <support@ptibogxiv.net>
  * Copyright (C) 2021		Waël Almoman	    	<info@almoman.com>
+ * Copyright (C) 2021		Dorian Vabre			<dorian.vabre@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
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 390ce6ef555..8ea5d6a2587 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2012		Regis Houssin			<regis.houssin@inodbox.com>
  * Copyright (C) 2021		Waël Almoman			<info@almoman.com>
  * Copyright (C) 2021		Maxime Demarest			<maxime@indelog.fr>
+ * Copyright (C) 2021		Dorian Vabre			<dorian.vabre@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
diff --git a/htdocs/public/project/index.php b/htdocs/public/project/index.php
index b05f2b1fc6f..1231617768d 100644
--- a/htdocs/public/project/index.php
+++ b/htdocs/public/project/index.php
@@ -1,10 +1,5 @@
 <?php
-/* Copyright (C) 2001-2002	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2006-2017	Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2009-2012	Regis Houssin			<regis.houssin@inodbox.com>
- * Copyright (C) 2018	    Juanjo Menent			<jmenent@2byte.es>
- * Copyright (C) 2018-2019	Thibault FOUCART	    <support@ptibogxiv.net>
- * Copyright (C) 2021		Waël Almoman	    	<info@almoman.com>
+/* Copyright (C) 2021		Dorian Vabre			<dorian.vabre@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
diff --git a/htdocs/public/project/suggestbooth.php b/htdocs/public/project/suggestbooth.php
index 71663a7f15c..90fb7046bab 100644
--- a/htdocs/public/project/suggestbooth.php
+++ b/htdocs/public/project/suggestbooth.php
@@ -1,11 +1,5 @@
 <?php
-/* Copyright (C) 2001-2002  Rodolphe Quiedeville    <rodolphe@quiedeville.org>
- * Copyright (C) 2001-2002  Jean-Louis Bergamo      <jlb@j1b.org>
- * Copyright (C) 2006-2013  Laurent Destailleur     <eldy@users.sourceforge.net>
- * Copyright (C) 2012       Regis Houssin           <regis.houssin@inodbox.com>
- * Copyright (C) 2012       J. Fernando Lagrange    <fernando@demo-tic.org>
- * Copyright (C) 2018-2019  Frédéric France         <frederic.france@netlogic.fr>
- * Copyright (C) 2018       Alexandre Spangaro      <aspangaro@open-dsi.fr>
+/* Copyright (C) 2021		Dorian Vabre			<dorian.vabre@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
diff --git a/htdocs/public/project/suggestconference.php b/htdocs/public/project/suggestconference.php
index 844641fc4cf..c4cb3e298ec 100644
--- a/htdocs/public/project/suggestconference.php
+++ b/htdocs/public/project/suggestconference.php
@@ -1,11 +1,5 @@
 <?php
-/* Copyright (C) 2001-2002  Rodolphe Quiedeville    <rodolphe@quiedeville.org>
- * Copyright (C) 2001-2002  Jean-Louis Bergamo      <jlb@j1b.org>
- * Copyright (C) 2006-2013  Laurent Destailleur     <eldy@users.sourceforge.net>
- * Copyright (C) 2012       Regis Houssin           <regis.houssin@inodbox.com>
- * Copyright (C) 2012       J. Fernando Lagrange    <fernando@demo-tic.org>
- * Copyright (C) 2018-2019  Frédéric France         <frederic.france@netlogic.fr>
- * Copyright (C) 2018       Alexandre Spangaro      <aspangaro@open-dsi.fr>
+/* Copyright (C) 2021		Dorian Vabre			<dorian.vabre@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
diff --git a/htdocs/public/project/viewandvote.php b/htdocs/public/project/viewandvote.php
index f167fcf1717..8ade643b8ce 100644
--- a/htdocs/public/project/viewandvote.php
+++ b/htdocs/public/project/viewandvote.php
@@ -1,10 +1,5 @@
 <?php
-/* Copyright (C) 2001-2002	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2006-2017	Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2009-2012	Regis Houssin			<regis.houssin@inodbox.com>
- * Copyright (C) 2018	    Juanjo Menent			<jmenent@2byte.es>
- * Copyright (C) 2018-2019	Thibault FOUCART	    <support@ptibogxiv.net>
- * Copyright (C) 2021		Waël Almoman	    	<info@almoman.com>
+/* Copyright (C) 2021		Dorian Vabre			<dorian.vabre@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

From 05bbb3dbf6dc5927946f68a210920e6e1f1333f5 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Fri, 7 May 2021 16:39:03 +0200
Subject: [PATCH 0051/1497] improved welcome msg on suggestbooth/conf pages

---
 htdocs/langs/en_US/eventorganization.lang   | 2 ++
 htdocs/public/project/suggestbooth.php      | 2 +-
 htdocs/public/project/suggestconference.php | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/langs/en_US/eventorganization.lang b/htdocs/langs/en_US/eventorganization.lang
index 1a663c0b713..f990779b305 100644
--- a/htdocs/langs/en_US/eventorganization.lang
+++ b/htdocs/langs/en_US/eventorganization.lang
@@ -119,6 +119,8 @@ EventType = Event type
 # Vote page
 #
 EvntOrgRegistrationWelcomeMessage = Welcome on the conference or booth suggestion page.
+EvntOrgRegistrationConfWelcomeMessage = Welcome on the conference suggestion page.
+EvntOrgRegistrationBoothWelcomeMessage = Welcome on the booth suggestion page.
 EvntOrgVoteHelpMessage = Here, you can view and vote for the suggested events for the project
 VoteOk = Your vote has been accepted.
 AlreadyVoted = You have already voted for this event.
diff --git a/htdocs/public/project/suggestbooth.php b/htdocs/public/project/suggestbooth.php
index 90fb7046bab..32ca05d1b09 100644
--- a/htdocs/public/project/suggestbooth.php
+++ b/htdocs/public/project/suggestbooth.php
@@ -518,7 +518,7 @@ print '<div id="divsubscribe">';
 print '<div class="center subscriptionformhelptext justify">';
 
 // Welcome message
-$text  = '<tr><td class="textpublicpayment"><strong>'.$langs->trans("EvntOrgRegistrationWelcomeMessage").'</strong></td></tr></br>';
+$text  = '<tr><td class="textpublicpayment"><strong>'.$langs->trans("EvntOrgRegistrationBoothWelcomeMessage").'</strong></td></tr></br>';
 $text .= '<tr><td class="textpublicpayment">'.$langs->trans("EvntOrgRegistrationBoothHelpMessage").' '.$id.'.<br><br></td></tr>'."\n";
 $text .= '<tr><td class="textpublicpayment">'.$project->note_public.'</td></tr>'."\n";;
 print $text;
diff --git a/htdocs/public/project/suggestconference.php b/htdocs/public/project/suggestconference.php
index c4cb3e298ec..485d18ee2c6 100644
--- a/htdocs/public/project/suggestconference.php
+++ b/htdocs/public/project/suggestconference.php
@@ -452,7 +452,7 @@ print '<div id="divsubscribe">';
 print '<div class="center subscriptionformhelptext justify">';
 
 // Welcome message
-$text  = '<tr><td class="textpublicpayment"><strong>'.$langs->trans("EvntOrgRegistrationWelcomeMessage").'</strong></td></tr></br>';
+$text  = '<tr><td class="textpublicpayment"><strong>'.$langs->trans("EvntOrgRegistrationConfWelcomeMessage").'</strong></td></tr></br>';
 $text .= '<tr><td class="textpublicpayment">'.$langs->trans("EvntOrgRegistrationConfHelpMessage").' '.$id.'.<br><br></td></tr>'."\n";
 $text .= '<tr><td class="textpublicpayment">'.$project->note_public.'</td></tr>'."\n";;
 print $text;

From 9ab12e24551ca712a1a6025ca3d78af540f99d14 Mon Sep 17 00:00:00 2001
From: Antonin MARCHAL <antonin@letempledujeu.fr>
Date: Fri, 7 May 2021 17:06:53 +0200
Subject: [PATCH 0052/1497] add (getNomUrl)

---
 htdocs/fourn/class/fournisseur.commande.class.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 331e211e5ac..3728771c8aa 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -765,7 +765,7 @@ class CommandeFournisseur extends CommonOrder
 	 */
 	public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $save_lastsearch_value = -1, $addlinktonotes = 0)
 	{
-		global $langs, $conf, $user;
+		global $langs, $conf, $user, $hookmanager;
 
 		$result = '';
 
@@ -774,7 +774,15 @@ class CommandeFournisseur extends CommonOrder
 		if ($user->rights->fournisseur->commande->lire) {
 			$label = '<u class="paddingrightonly">'.$langs->trans("SupplierOrder").'</u>';
 			if (isset($this->statut)) {
-				$label .= ' '.$this->getLibStatut(5);
+				$statusText = ' '.$this->getLibStatut(5);
+				$parameters = array('obj' => $this);
+				$reshook = $hookmanager->executeHooks('moreHtmlStatus', $parameters, $object); // Note that $action and $object may have been modified by hook
+				if (empty($reshook)) {
+					$statusText .= $hookmanager->resPrint;
+				} else {
+					$statusText = $hookmanager->resPrint;
+				}
+				$label .= $statusText;
 			}
 			if (!empty($this->ref)) {
 				$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;

From c6d646f39e0ad1047493ef2960d4b3155770c3dc Mon Sep 17 00:00:00 2001
From: Antonin MARCHAL <antonin@letempledujeu.fr>
Date: Fri, 7 May 2021 17:08:36 +0200
Subject: [PATCH 0053/1497] add(prop)list

---
 htdocs/fourn/commande/list.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index d32e466444c..a294d2a4712 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -1283,6 +1283,7 @@ if ($resql) {
 
 		$objectstatic->id = $obj->rowid;
 		$objectstatic->ref = $obj->ref;
+		$objectstatic->socid = $obj->socid;
 		$objectstatic->ref_supplier = $obj->ref_supplier;
 		$objectstatic->total_ht = $obj->total_ht;
 		$objectstatic->total_tva = $obj->total_tva;

From a91d1b2e07d9262c9aeecf53f5777e9b90c6a891 Mon Sep 17 00:00:00 2001
From: Antonin MARCHAL <antonin@letempledujeu.fr>
Date: Fri, 7 May 2021 17:09:39 +0200
Subject: [PATCH 0054/1497] add(list) hook

---
 htdocs/fourn/commande/list.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index a294d2a4712..0aae47cd7fc 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -1537,7 +1537,15 @@ if ($resql) {
 		}
 		// Status
 		if (!empty($arrayfields['cf.fk_statut']['checked'])) {
-			print '<td class="right nowrap">'.$objectstatic->LibStatut($obj->fk_statut, 5, $obj->billed).'</td>';
+			$parameters = array('obj' => $obj);
+			$morehtmlstatus = $objectstatic->LibStatut($obj->fk_statut, 5, $obj->billed);
+			$reshook = $hookmanager->executeHooks('moreHtmlStatus', $parameters, $object); // Note that $action and $object may have been modified by hook
+			if (empty($reshook)) {
+				$morehtmlstatus .= $hookmanager->resPrint;
+			} else {
+				$morehtmlstatus = $hookmanager->resPrint;
+			}
+			print '<td class="right nowrap">' . $morehtmlstatus . '</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;
 			}

From 058bef1a79d03f73c099854ebbff8c96a2029b11 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Fri, 7 May 2021 17:20:36 +0200
Subject: [PATCH 0055/1497] clean viewandvote page

---
 htdocs/public/project/viewandvote.php | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/htdocs/public/project/viewandvote.php b/htdocs/public/project/viewandvote.php
index 8ade643b8ce..1f9b4d32dab 100644
--- a/htdocs/public/project/viewandvote.php
+++ b/htdocs/public/project/viewandvote.php
@@ -258,7 +258,7 @@ if ($urllogo) {
 print '<table id="welcome" class="center">'."\n";
 $text  = '<tr><td class="textpublicpayment"><br><strong>'.$langs->trans("EvntOrgRegistrationWelcomeMessage").'</strong></td></tr>'."\n";
 $text .= '<tr><td class="textpublicpayment">'.$langs->trans("EvntOrgVoteHelpMessage").' : "'.$project->title.'".<br><br></td></tr>'."\n";
-$text .= '<tr><td class="textpublicpayment">'.$project->note_public.'<br><br></td></tr>'."\n";;
+$text .= '<tr><td class="textpublicpayment">'.$project->note_public.'</td></tr>'."\n";;
 print $text;
 print '</table>'."\n";
 
@@ -269,23 +269,15 @@ print '<th colspan="7">'.$langs->trans("ListOfSuggestedConferences").'</th>';
 print $listOfConferences.'</br>';
 print '</table>'."\n";
 
+print '</br>';
 
 print '<table border=1  cellpadding="10" id="conferences" class="center">'."\n";
 print '<th colspan="7">'.$langs->trans("ListOfSuggestedBooths").'</th>';
 print $listOfBooths.'</br>';
 print '</table>'."\n";
 
-// Output payment summary form
-print '<tr><td align="center">';
-
-$found = false;
-$error = 0;
-$var = false;
-
 $object = null;
 
-print "\n";
-
 htmlPrintOnlinePaymentFooter($mysoc, $langs, 1, $suffix, $object);
 
 llxFooter('', 'public');

From d86b393d6023868bedef93c4a76a9e05dce37426 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Mon, 10 May 2021 09:54:26 +0200
Subject: [PATCH 0056/1497] useless line removed

---
 htdocs/public/eventorganization/attendee_subscription.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index 82e82d58129..4fdde7c7181 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -425,8 +425,7 @@ if (empty($reshook) && $action == 'add') {
 			} else {
 				dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
 			}
-
-			$encodedid = dol_encode($id, $dolibarr_main_instance_unique_id);
+			
 			$securekeyurl = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$id, 2);
 			$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?id='.$id.'&securekey='.$securekeyurl;
 			Header("Location: ".$redirection);

From 0dce9ee359746ca359566135e2bc04f7d773431c Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Mon, 10 May 2021 10:22:45 +0200
Subject: [PATCH 0057/1497] now using correct email templates after booth/conf
 suggestion

---
 htdocs/public/eventorganization/attendee_subscription.php | 2 +-
 htdocs/public/payment/newpayment.php                      | 1 -
 htdocs/public/project/suggestbooth.php                    | 2 +-
 htdocs/public/project/suggestconference.php               | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index 4fdde7c7181..a81ac456353 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -425,7 +425,7 @@ if (empty($reshook) && $action == 'add') {
 			} else {
 				dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
 			}
-			
+
 			$securekeyurl = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$id, 2);
 			$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?id='.$id.'&securekey='.$securekeyurl;
 			Header("Location: ".$redirection);
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 9de10b44cac..574085ac623 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -1954,7 +1954,6 @@ if ($source == 'boothlocation') {
 	print '<input type="hidden" name="desc" value="'.dol_escape_htmltag($labeldesc).'">'."\n";
 }
 
-
 if (!$found && !$mesg) {
 	$mesg = $langs->trans("ErrorBadParameters");
 }
diff --git a/htdocs/public/project/suggestbooth.php b/htdocs/public/project/suggestbooth.php
index 32ca05d1b09..f510a5274f0 100644
--- a/htdocs/public/project/suggestbooth.php
+++ b/htdocs/public/project/suggestbooth.php
@@ -453,7 +453,7 @@ if (empty($reshook) && $action == 'add') {
 						// Get email content from template
 						$arraydefaultmessage = null;
 
-						$labeltouse = $conf->global->EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT;
+						$labeltouse = $conf->global->EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH;
 						if (!empty($labeltouse)) {
 							$arraydefaultmessage = $formmail->getEMailTemplate($db, 'eventorganization_send', $user, $outputlangs, $labeltouse, 1, '');
 						}
diff --git a/htdocs/public/project/suggestconference.php b/htdocs/public/project/suggestconference.php
index 485d18ee2c6..3eff5fad3a9 100644
--- a/htdocs/public/project/suggestconference.php
+++ b/htdocs/public/project/suggestconference.php
@@ -388,7 +388,7 @@ if (empty($reshook) && $action == 'add') {
 					// Get email content from template
 					$arraydefaultmessage = null;
 
-					$labeltouse = $conf->global->EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT;
+					$labeltouse = $conf->global->EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF;
 					if (!empty($labeltouse)) {
 						$arraydefaultmessage = $formmail->getEMailTemplate($db, 'eventorganization_send', $user, $outputlangs, $labeltouse, 1, '');
 					}

From 0e62edfd42fc06056b1dfb355683151077eb251b Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Mon, 10 May 2021 12:47:09 +0200
Subject: [PATCH 0058/1497] fix error on fetching thirdparty when there is none

---
 htdocs/public/project/viewandvote.php | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/htdocs/public/project/viewandvote.php b/htdocs/public/project/viewandvote.php
index 1f9b4d32dab..283d50eda8f 100644
--- a/htdocs/public/project/viewandvote.php
+++ b/htdocs/public/project/viewandvote.php
@@ -119,12 +119,17 @@ $result = $db->query($sqlforconf);
 $i = 0;
 while ($i < $db->num_rows($result)) {
 	$obj = $db->fetch_object($result);
-	$resultthirdparty = $tmpthirdparty->fetch($obj->fk_soc);
-	if ($resultthirdparty) {
-		$thirdpartyname = $tmpthirdparty->name;
+	if (!empty($obj->fk_soc)) {
+		$resultthirdparty = $tmpthirdparty->fetch($obj->fk_soc);
+		if ($resultthirdparty) {
+			$thirdpartyname = $tmpthirdparty->name;
+		} else {
+			$thirdpartyname = '';
+		}
 	} else {
 		$thirdpartyname = '';
 	}
+
 	$listOfConferences .= '<tr><td>'.$obj->label.'</td><td>'.$obj->libelle.'</td><td>'.$obj->datep.'</td><td>'.$obj->datep2.'</td><td>'.$thirdpartyname.'</td><td>'.$obj->note.'</td>';
 	$listOfConferences .= '<td><button type="submit" name="vote" value="'.$obj->id.'" class="button">'.$langs->trans("Vote").'</button></td></tr>';
 	$i++;
@@ -135,12 +140,17 @@ $result = $db->query($sqlforbooth);
 $i = 0;
 while ($i < $db->num_rows($result)) {
 	$obj = $db->fetch_object($result);
-	$resultthirdparty = $tmpthirdparty->fetch($obj->fk_soc);
-	if ($resultthirdparty) {
-		$thirdpartyname = $tmpthirdparty->name;
+	if (!empty($obj->fk_soc)) {
+		$resultthirdparty = $tmpthirdparty->fetch($obj->fk_soc);
+		if ($resultthirdparty) {
+			$thirdpartyname = $tmpthirdparty->name;
+		} else {
+			$thirdpartyname = '';
+		}
 	} else {
 		$thirdpartyname = '';
 	}
+
 	$listOfBooths .= '<tr><td>'.$obj->label.'</td><td>'.$obj->libelle.'</td><td>'.$obj->datep.'</td><td>'.$obj->datep2.'</td><td>'.$thirdpartyname.'</td><td>'.$obj->note.'</td>';
 	$listOfBooths .= '<td><button type="submit" name="vote" value="'.$obj->id.'" class="button">'.$langs->trans("Vote").'</button></td></tr>';
 	$i++;

From c5dc20b9dc611434037fe4f27fece9a7a7f5725b Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Mon, 10 May 2021 15:31:52 +0200
Subject: [PATCH 0059/1497] opti

---
 htdocs/public/project/viewandvote.php | 5 ++---
 htdocs/societe/card.php               | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/htdocs/public/project/viewandvote.php b/htdocs/public/project/viewandvote.php
index 283d50eda8f..0f07e5e297e 100644
--- a/htdocs/public/project/viewandvote.php
+++ b/htdocs/public/project/viewandvote.php
@@ -180,18 +180,17 @@ if (strlen($idvote)) {
 				// Cookie duration by default
 				$timeleftbeforestartofevent = time()+86400*30;
 			}
-
+			
 			// Process to vote
-			$res = setcookie('VOTE_SUGGESTED_EVENTS_'.$hashedvote, 1, 0);
 			if ($res) {
 				$conforbooth->num_vote++;
 				$resupdate = $conforbooth->update($user);
 				if ($resupdate) {
 					$votestatus = 'ok';
+					$res = setcookie('VOTE_SUGGESTED_EVENTS_'.$hashedvote, 1, 0);
 				} else {
 					//Error during update
 					$votestatus = 'err';
-					$res = setcookie('VOTE_SUGGESTED_EVENTS_'.$hashedvote, 0, 0);
 				}
 			} else {
 				$votestatus = 'err';
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 8102c5064f2..104f45de979 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -2467,7 +2467,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print '</tr>';
 		}
 
-		// Supplier code
+		// Su+pplier code
 		if (((!empty($conf->fournisseur->enabled) && !empty($user->rights->fournisseur->lire) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || (!empty($conf->supplier_order->enabled) && !empty($user->rights->supplier_order->lire)) || (!empty($conf->supplier_invoice->enabled) && !empty($user->rights->supplier_invoice->lire))) && $object->fournisseur) {
 			print '<tr><td>';
 			print $langs->trans('SupplierCode').'</td><td>';

From ee4e8dd99f6992ee96d4f14e6a717f623a1ea45f Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Mon, 10 May 2021 15:37:25 +0200
Subject: [PATCH 0060/1497] cookies to session transition

---
 htdocs/public/project/viewandvote.php | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/htdocs/public/project/viewandvote.php b/htdocs/public/project/viewandvote.php
index 0f07e5e297e..304f42d637b 100644
--- a/htdocs/public/project/viewandvote.php
+++ b/htdocs/public/project/viewandvote.php
@@ -74,6 +74,8 @@ if ($securekeytocompare != $securekeyreceived) {
 	exit;
 }
 
+$listofvotes = explode(',', $_SESSION["savevotes"]);
+
 if (GETPOST("votestatus")=="ok") {
 	setEventMessage($langs->trans("VoteOk"), 'mesgs');
 } else if (GETPOST("votestatus")=="ko") {
@@ -161,7 +163,7 @@ $idvote = GETPOST("vote");
 $hashedvote = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'vote'.$idvote);
 
 if (strlen($idvote)) {
-	if ($_COOKIE['VOTE_SUGGESTED_EVENTS_'.$hashedvote]==1) {
+	if (in_array($hashedvote, $listofvotes)) {
 		// Has already voted
 		$votestatus = 'ko';
 	} else {
@@ -172,22 +174,13 @@ if (strlen($idvote)) {
 			$error++;
 			$errmsg .= $conforbooth->error;
 		} else {
-			// Cookie expiration date : start of event, or 30 days if not specified
-			$startdate = $conforbooth->datep;
-			if (strlen($startdate)) {
-				$timeleftbeforestartofevent = $startdate;
-			} else {
-				// Cookie duration by default
-				$timeleftbeforestartofevent = time()+86400*30;
-			}
-			
 			// Process to vote
 			if ($res) {
 				$conforbooth->num_vote++;
 				$resupdate = $conforbooth->update($user);
 				if ($resupdate) {
 					$votestatus = 'ok';
-					$res = setcookie('VOTE_SUGGESTED_EVENTS_'.$hashedvote, 1, 0);
+					$_SESSION["savevotes"] = $hashedvote.','.(empty($_SESSION["savevotes"]) ? '' : $_SESSION["savevotes"]); // Save voter
 				} else {
 					//Error during update
 					$votestatus = 'err';

From d71dc37a75f8d3f8dac486c130cd369c88879ef5 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Mon, 10 May 2021 15:39:39 +0200
Subject: [PATCH 0061/1497] fix

---
 htdocs/public/project/viewandvote.php | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/htdocs/public/project/viewandvote.php b/htdocs/public/project/viewandvote.php
index 304f42d637b..333edd81755 100644
--- a/htdocs/public/project/viewandvote.php
+++ b/htdocs/public/project/viewandvote.php
@@ -175,17 +175,13 @@ if (strlen($idvote)) {
 			$errmsg .= $conforbooth->error;
 		} else {
 			// Process to vote
-			if ($res) {
-				$conforbooth->num_vote++;
-				$resupdate = $conforbooth->update($user);
-				if ($resupdate) {
-					$votestatus = 'ok';
-					$_SESSION["savevotes"] = $hashedvote.','.(empty($_SESSION["savevotes"]) ? '' : $_SESSION["savevotes"]); // Save voter
-				} else {
-					//Error during update
-					$votestatus = 'err';
-				}
+			$conforbooth->num_vote++;
+			$resupdate = $conforbooth->update($user);
+			if ($resupdate) {
+				$votestatus = 'ok';
+				$_SESSION["savevotes"] = $hashedvote.','.(empty($_SESSION["savevotes"]) ? '' : $_SESSION["savevotes"]); // Save voter
 			} else {
+				//Error during update
 				$votestatus = 'err';
 			}
 		}

From 7d0c3dcf6d64b61893c4d0158c2a285f14bd49bc Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Mon, 10 May 2021 15:50:29 +0200
Subject: [PATCH 0062/1497] transition done from cookies to session

---
 htdocs/public/project/viewandvote.php | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/htdocs/public/project/viewandvote.php b/htdocs/public/project/viewandvote.php
index 333edd81755..0468a9c2e59 100644
--- a/htdocs/public/project/viewandvote.php
+++ b/htdocs/public/project/viewandvote.php
@@ -76,13 +76,6 @@ if ($securekeytocompare != $securekeyreceived) {
 
 $listofvotes = explode(',', $_SESSION["savevotes"]);
 
-if (GETPOST("votestatus")=="ok") {
-	setEventMessage($langs->trans("VoteOk"), 'mesgs');
-} else if (GETPOST("votestatus")=="ko") {
-	setEventMessage($langs->trans("AlreadyVoted"), 'warnings');
-} else if (GETPOST("votestatus")=="err") {
-	setEventMessage($langs->trans("VoteError"), 'warnings');
-}
 
 // Define $urlwithroot
 //$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
@@ -186,7 +179,15 @@ if (strlen($idvote)) {
 			}
 		}
 	}
-	header("Refresh:0;url=".dol_buildpath('/public/project/viewandvote.php?votestatus='.$votestatus.'&id='.$id.'&securekey=', 1).$securekeyreceived);
+	if ($votestatus=="ok") {
+		setEventMessage($langs->trans("VoteOk"), 'mesgs');
+	} else if ($votestatus=="ko") {
+		setEventMessage($langs->trans("AlreadyVoted"), 'warnings');
+	} else if ($votestatus=="err") {
+		setEventMessage($langs->trans("VoteError"), 'warnings');
+	}
+	header("Refresh:0;url=".dol_buildpath('/public/project/viewandvote.php?id='.$id.'&securekey=', 1).$securekeyreceived);
+	exit;
 }
 
 

From f6956d6a6272a14208f5b0d9da68f219f0b6751c Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Mon, 10 May 2021 15:58:54 +0200
Subject: [PATCH 0063/1497] using validate() function instead of settStatut(1)
 to validate an attendee

---
 htdocs/public/payment/paymentok.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 8ea5d6a2587..2e6cd630694 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -1006,7 +1006,7 @@ if ($ispaymentok) {
 						if ($resultattendee < 0) {
 							setEventMessages(null, $attendeetovalidate->errors, "errors");
 						} else {
-							$attendeetovalidate->setStatut(1);
+							$attendeetovalidate->validate($user);
 
 							// Sending mail
 							$thirdparty = new Societe($db);

From bf25fd083404a84f90512e3f7a2342876f8dc96b Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Mon, 10 May 2021 16:04:13 +0200
Subject: [PATCH 0064/1497] confattendee merge OK to replace thirdparty

---
 .../class/conferenceorboothattendee.class.php   | 17 +++++++++++++++++
 htdocs/societe/card.php                         |  3 ++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/htdocs/eventorganization/class/conferenceorboothattendee.class.php b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
index 6418d73580b..58bd38c35d8 100644
--- a/htdocs/eventorganization/class/conferenceorboothattendee.class.php
+++ b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
@@ -1070,6 +1070,23 @@ class ConferenceOrBoothAttendee extends CommonObject
 
 		return $error;
 	}
+
+	/**
+	 * Function used to replace a thirdparty id with another one.
+	 *
+	 * @param DoliDB $db Database handler
+	 * @param int $origin_id Old thirdparty id
+	 * @param int $dest_id New thirdparty id
+	 * @return bool
+	 */
+	public static function replaceThirdparty(DoliDB $db, $origin_id, $dest_id)
+	{
+		$tables = array(
+			'conferenceorboothattendee'
+		);
+
+		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
+	}
 }
 
 
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 104f45de979..20e8c06833d 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -270,7 +270,8 @@ if (empty($reshook)) {
 						'Product' => '/product/class/product.class.php',
 						'Project' => '/projet/class/project.class.php',
 						'Ticket' => '/ticket/class/ticket.class.php',
-						'User' => '/user/class/user.class.php'
+						'User' => '/user/class/user.class.php',
+						'ConfOrBoothAttendee' => '/eventorganization/class/conferenceorboothattendee.class.php'
 					);
 
 					//First, all core objects must update their tables

From 48bbb500d3b98d1f10a29534477b5a136de5061a Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Mon, 10 May 2021 16:25:44 +0200
Subject: [PATCH 0065/1497] fix on replacing thirdparty in attendees when
 merging multiple thirdparties

---
 .../class/conferenceorboothattendee.class.php               | 2 +-
 htdocs/societe/card.php                                     | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/htdocs/eventorganization/class/conferenceorboothattendee.class.php b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
index 58bd38c35d8..1cb24460523 100644
--- a/htdocs/eventorganization/class/conferenceorboothattendee.class.php
+++ b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
@@ -1082,7 +1082,7 @@ class ConferenceOrBoothAttendee extends CommonObject
 	public static function replaceThirdparty(DoliDB $db, $origin_id, $dest_id)
 	{
 		$tables = array(
-			'conferenceorboothattendee'
+			'eventorganization_conferenceorboothattendee'
 		);
 
 		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 20e8c06833d..18cfdfa1f16 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -57,6 +57,10 @@ if (! empty($conf->accounting->enabled)) {
 if (! empty($conf->accounting->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
 }
+if (! empty($conf->eventorganization->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorboothattendee.class.php';
+}
+
 
 $langs->loadLangs(array("companies", "commercial", "bills", "banks", "users"));
 if (!empty($conf->adherent->enabled)) {
@@ -271,7 +275,7 @@ if (empty($reshook)) {
 						'Project' => '/projet/class/project.class.php',
 						'Ticket' => '/ticket/class/ticket.class.php',
 						'User' => '/user/class/user.class.php',
-						'ConfOrBoothAttendee' => '/eventorganization/class/conferenceorboothattendee.class.php'
+						'ConferenceOrBoothAttendee' => '/eventorganization/class/conferenceorboothattendee.class.php'
 					);
 
 					//First, all core objects must update their tables

From c85b75924fc205648e67eeadb95c726100c53900 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Mon, 10 May 2021 16:57:48 +0200
Subject: [PATCH 0066/1497] wip on adding a filter for the ics file + fix on
 class name

---
 htdocs/comm/action/class/actioncomm.class.php | 3 +++
 htdocs/public/agenda/agendaexport.php         | 3 +++
 htdocs/public/project/suggestbooth.php        | 2 +-
 htdocs/public/project/suggestconference.php   | 2 +-
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index d8bcd0efb1b..bf6fa9fcc56 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -1901,6 +1901,9 @@ class ActionComm extends CommonObject
 						$sql .= " AND ar.fk_element = 0";
 					}
 				}
+				if ($key == 'author') {
+					$sql .= " AND c.type = '".$this->db->escape($value)."'";
+				}
 			}
 
 			$sql .= " AND a.datep IS NOT NULL"; // To exclude corrupted events and avoid errors in lightning/sunbird import
diff --git a/htdocs/public/agenda/agendaexport.php b/htdocs/public/agenda/agendaexport.php
index d40d75c0acf..00514cd026c 100644
--- a/htdocs/public/agenda/agendaexport.php
+++ b/htdocs/public/agenda/agendaexport.php
@@ -135,6 +135,9 @@ if (GETPOST("notolderthan", 'int')) {
 } else {
 	$filters['notolderthan'] = $conf->global->MAIN_AGENDA_EXPORT_PAST_DELAY;
 }
+if (GETPOST("author", 'apha')) {
+	$filters['author'] = GETPOST("author", 'apha');
+}
 
 // Check config
 if (empty($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY)) {
diff --git a/htdocs/public/project/suggestbooth.php b/htdocs/public/project/suggestbooth.php
index f510a5274f0..65b15578b7d 100644
--- a/htdocs/public/project/suggestbooth.php
+++ b/htdocs/public/project/suggestbooth.php
@@ -439,7 +439,7 @@ if (empty($reshook) && $action == 'add') {
 						}
 					} else {
 						// If no price has been set for the booth, we confirm it as suggested and we update
-						$conforbooth->status = CONFERENCEORBOOTH::STATUS_SUGGESTED;
+						$conforbooth->status = ConferenceOrBooth::STATUS_SUGGESTED;
 						$conforbooth->update($user);
 						// Sending mail
 						require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
diff --git a/htdocs/public/project/suggestconference.php b/htdocs/public/project/suggestconference.php
index 3eff5fad3a9..0028f544f9f 100644
--- a/htdocs/public/project/suggestconference.php
+++ b/htdocs/public/project/suggestconference.php
@@ -373,7 +373,7 @@ if (empty($reshook) && $action == 'add') {
 					$error++;
 					$errmsg .= $conforbooth->error;
 				} else {
-					$conforbooth->status = CONFERENCEORBOOTH::STATUS_SUGGESTED;
+					$conforbooth->status = ConferenceOrBooth::STATUS_SUGGESTED;
 					$conforbooth->update($user);
 
 					// Sending mail

From e31d8f89f5592ae5f3a5fbc8d089b9b62c45319d Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Mon, 10 May 2021 17:13:57 +0200
Subject: [PATCH 0067/1497] wip filter

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

diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index bf6fa9fcc56..a6f9faf353f 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -1902,7 +1902,7 @@ class ActionComm extends CommonObject
 					}
 				}
 				if ($key == 'author') {
-					$sql .= " AND c.type = '".$this->db->escape($value)."'";
+					$sql .= " AND u.lastname = '".$this->db->escape($value)."'";
 				}
 			}
 

From 1e90e618f04a54b3b4eee79668740acb7f95469f Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Mon, 10 May 2021 17:25:00 +0200
Subject: [PATCH 0068/1497] wip filter

---
 htdocs/eventorganization/conferenceorbooth_list.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/htdocs/eventorganization/conferenceorbooth_list.php b/htdocs/eventorganization/conferenceorbooth_list.php
index 3e480efca54..24d6853abda 100644
--- a/htdocs/eventorganization/conferenceorbooth_list.php
+++ b/htdocs/eventorganization/conferenceorbooth_list.php
@@ -427,7 +427,17 @@ if ($projectid > 0) {
 	print "</td></tr>";
 
 	print '<tr><td valign="middle">'.$langs->trans("EventOrganizationICSLink").'</td><td>';
-	print '';
+	// Define $urlwithroot
+	$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
+	$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT;
+	$getentity = ($conf->entity > 1 ? "&entity=".$conf->entity : "");
+
+	// Show message
+	$message = '<input type="text" id="onlinepaymenturl" class="quatrevingtpercent" value="'.$urlwithroot.'/public/agenda/agendaexport.php?format=ical'.$getentity.
+		'&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : '...')."&project=".$projectid.'">';
+	$message .= '</div>';
+	$message .= '<br>';
+	print $message;
 	print "</td></tr>";
 
 

From 56d78cf12a4e57ab23868ce7caf9eda017727fa0 Mon Sep 17 00:00:00 2001
From: Quentin VIAL-GOUTEYRON <quentin.vial-gouteyron@atm-consulting.fr>
Date: Wed, 12 May 2021 11:02:27 +0200
Subject: [PATCH 0069/1497] FIX missing town and zip filter in contract list
 sql request

---
 htdocs/contrat/list.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index a7b5114501f..96754e639fd 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -256,6 +256,8 @@ if ($search_email) $sql .= natural_search('s.email', $search_email);
 if ($search_contract) $sql .= natural_search(array('c.rowid', 'c.ref'), $search_contract);
 if (!empty($search_ref_customer)) $sql .= natural_search(array('c.ref_customer'), $search_ref_customer);
 if (!empty($search_ref_supplier)) $sql .= natural_search(array('c.ref_supplier'), $search_ref_supplier);
+if ($search_zip) $sql .= natural_search(array('s.zip'), $search_zip);
+if ($search_town) $sql .= natural_search(array('s.town'), $search_town);
 if ($search_sale > 0)
 {
 	$sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$search_sale;

From 1bfcfc3a0ca69e8c44fb55d0d8c16b9059843056 Mon Sep 17 00:00:00 2001
From: Antonin MARCHAL <antonin@letempledujeu.fr>
Date: Wed, 12 May 2021 16:55:03 +0200
Subject: [PATCH 0070/1497] rename Hook and moved it into LibStatut method

---
 htdocs/fourn/class/fournisseur.commande.class.php |  7 ++++++-
 htdocs/fourn/commande/list.php                    | 10 +---------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 3728771c8aa..99b64ccead4 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -690,7 +690,7 @@ class CommandeFournisseur extends CommonOrder
 	public function LibStatut($status, $mode = 0, $billed = 0)
 	{
 		// phpcs:enable
-		global $conf, $langs;
+		global $conf, $langs, $hookmanager;
 
 		if (empty($this->statuts) || empty($this->statutshort)) {
 			$langs->load('orders');
@@ -749,6 +749,11 @@ class CommandeFournisseur extends CommonOrder
 		$statusLong = $langs->transnoentitiesnoconv($this->statuts[$status]).$billedtext;
 		$statusShort = $langs->transnoentitiesnoconv($this->statutshort[$status]);
 
+		$parameters = array('status' => $status, 'mode' => $mode, 'billed' => $billed, 'obj'=>$this);
+		$reshook = $hookmanager->executeHooks('diffHtmlStatus', $parameters, $object); // Note that $action and $object may have been modified by hook
+		if ($reshook > 0) {
+			return $hookmanager->resPrint;
+		} 
 		return dolGetStatus($statusLong, $statusShort, '', $statusClass, $mode);
 	}
 
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index 0aae47cd7fc..a294d2a4712 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -1537,15 +1537,7 @@ if ($resql) {
 		}
 		// Status
 		if (!empty($arrayfields['cf.fk_statut']['checked'])) {
-			$parameters = array('obj' => $obj);
-			$morehtmlstatus = $objectstatic->LibStatut($obj->fk_statut, 5, $obj->billed);
-			$reshook = $hookmanager->executeHooks('moreHtmlStatus', $parameters, $object); // Note that $action and $object may have been modified by hook
-			if (empty($reshook)) {
-				$morehtmlstatus .= $hookmanager->resPrint;
-			} else {
-				$morehtmlstatus = $hookmanager->resPrint;
-			}
-			print '<td class="right nowrap">' . $morehtmlstatus . '</td>';
+			print '<td class="right nowrap">'.$objectstatic->LibStatut($obj->fk_statut, 5, $obj->billed).'</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;
 			}

From ea0d8605930e51a0e84bd38c739cdcf2cc3e3a0e Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Wed, 12 May 2021 14:55:32 +0000
Subject: [PATCH 0071/1497] Fixing style errors.

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

diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 99b64ccead4..abfe6df1edc 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -753,7 +753,7 @@ class CommandeFournisseur extends CommonOrder
 		$reshook = $hookmanager->executeHooks('diffHtmlStatus', $parameters, $object); // Note that $action and $object may have been modified by hook
 		if ($reshook > 0) {
 			return $hookmanager->resPrint;
-		} 
+		}
 		return dolGetStatus($statusLong, $statusShort, '', $statusClass, $mode);
 	}
 

From c577d1c51eeb16c3abb33c022502d57b011aae5b Mon Sep 17 00:00:00 2001
From: Ferran Marcet <fmarcet@2byte.es>
Date: Thu, 13 May 2021 13:35:28 +0200
Subject: [PATCH 0072/1497] FIX: Impossible to add multiple localtax2

---
 htdocs/admin/dict.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index b7f65ddf91f..fbe7d924cbc 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -9,7 +9,7 @@
  * Copyright (C) 2012-2015	Marcos García			<marcosgdf@gmail.com>
  * Copyright (C) 2012		Christophe Battarel		<christophe.battarel@ltairis.fr>
  * Copyright (C) 2011-2016	Alexandre Spangaro		<aspangaro@open-dsi.fr>
- * Copyright (C) 2015		Ferran Marcet			<fmarcet@2byte.es>
+ * Copyright (C) 2015-2021	Ferran Marcet			<fmarcet@2byte.es>
  * Copyright (C) 2016		Raphaël Doursenaud		<rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2019       Frédéric France         <frederic.france@netlogic.fr>
  *
@@ -777,6 +777,9 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
             elseif (in_array($keycode, array('joinfile', 'private', 'position', 'scale'))) {
             	$sql .= (int) GETPOST($keycode, 'int');
             }
+			elseif ($keycode == 'localtax2') {
+				$sql .= "'".GETPOST($keycode, 'alpha')."'";
+			}
             else {
             	$sql .= "'".$db->escape(GETPOST($keycode, 'nohtml'))."'";
             }
@@ -843,6 +846,9 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
             elseif (in_array($keycode, array('private', 'position', 'scale'))) {
             	$sql .= (int) GETPOST($keycode, 'int');
             }
+			elseif ($keycode == 'localtax2') {
+				$sql .= "'".GETPOST($keycode, 'alpha')."'";
+			}
             else {
             	$sql .= "'".$db->escape(GETPOST($keycode, 'nohtml'))."'";
             }

From acadef72c1d8bd734573e3afdadff24271f70818 Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Fri, 14 May 2021 18:01:22 +0200
Subject: [PATCH 0073/1497] Fix use supplier relative discount in replenish
 order creation

---
 htdocs/product/stock/replenish.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index dbf07c92d01..5d8e1f4a790 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -211,7 +211,9 @@ if ($action == 'order' && isset($_POST['valid']))
             if ($resql && $db->num_rows($resql) > 0) {
                 $obj = $db->fetch_object($resql);
                 $order->fetch($obj->rowid);
+				$order->fetch_thirdparty();
                 foreach ($supplier['lines'] as $line) {
+                	if(empty($line->remise_percent)) $line->remise_percent = $order->thirdparty->remise_supplier_percent;
                     $result = $order->addline(
                         $line->desc,
                         $line->subprice,
@@ -248,6 +250,7 @@ if ($action == 'order' && isset($_POST['valid']))
                 //trick to know which orders have been generated this way
                 $order->source = 42;
                 foreach ($supplier['lines'] as $line) {
+					if(empty($line->remise_percent)) $line->remise_percent = $order->thirdparty->remise_supplier_percent;
                     $order->lines[] = $line;
                 }
                 $order->cond_reglement_id = $order->thirdparty->cond_reglement_supplier_id;

From 1fbd53993f45901f5fb3d7e5c6bbf9df884e2b06 Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Sun, 16 May 2021 19:07:36 +0200
Subject: [PATCH 0074/1497] Fix missing substitutionarray on ticket presend

---
 htdocs/ticket/card.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index 6d14d29202f..a32ec67a11e 100644
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -1297,13 +1297,23 @@ elseif (empty($action) || $action == 'view' || $action == 'addlink' || $action =
 		// add a message
 		if ($action == 'presend' || $action == 'presend_addmessage')
 		{
+			$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;
+			}
+			$arrayoffamiliestoexclude = array('objectamount');
+
 			$action = 'add_message'; // action to use to post the message
 			$modelmail = 'ticket_send';
 
 			// Substitution array
 			$morehtmlright = '';
 			$help = "";
-			$substitutionarray = array();
+			$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, $arrayoffamiliestoexclude, $object);
 			if ($object->fk_soc > 0) {
 				$object->fetch_thirdparty();
 				$substitutionarray['__THIRDPARTY_NAME__'] = $object->thirdparty->name;

From c36f231f415eb3d6f6eeda42da629eedcb2de27b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 17 May 2021 07:34:56 +0200
Subject: [PATCH 0075/1497] Update card.php

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

diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index a32ec67a11e..cb428712913 100644
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -1299,8 +1299,8 @@ elseif (empty($action) || $action == 'view' || $action == 'addlink' || $action =
 		{
 			$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) && GETPOST('lang_id', 'aZ09')) {
+				$newlang = GETPOST('lang_id', 'aZ09');
 			}
 			if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {
 				$newlang = $object->thirdparty->default_lang;

From dd88f9cd767648860589be45a2a752fdd3e4a910 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 17 May 2021 07:37:01 +0200
Subject: [PATCH 0076/1497] Update card.php

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

diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index cb428712913..857365203f8 100644
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -1297,12 +1297,16 @@ elseif (empty($action) || $action == 'view' || $action == 'addlink' || $action =
 		// add a message
 		if ($action == 'presend' || $action == 'presend_addmessage')
 		{
+			if ($object->fk_soc > 0) {
+				$object->fetch_thirdparty();
+			}
+			
 			$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)) {
+			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && is_object($object->thirdparty)) {
 				$newlang = $object->thirdparty->default_lang;
 			}
 			$arrayoffamiliestoexclude = array('objectamount');
@@ -1315,7 +1319,6 @@ elseif (empty($action) || $action == 'view' || $action == 'addlink' || $action =
 			$help = "";
 			$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, $arrayoffamiliestoexclude, $object);
 			if ($object->fk_soc > 0) {
-				$object->fetch_thirdparty();
 				$substitutionarray['__THIRDPARTY_NAME__'] = $object->thirdparty->name;
 			}
 			$substitutionarray['__USER_SIGNATURE__'] = $user->signature;

From bdf876ead4d36c340c0249c150eecf5f3619d3cb Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Mon, 17 May 2021 05:38:46 +0000
Subject: [PATCH 0077/1497] Fixing style errors.

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

diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index 857365203f8..186a4461bd3 100644
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -1300,7 +1300,7 @@ elseif (empty($action) || $action == 'view' || $action == 'addlink' || $action =
 			if ($object->fk_soc > 0) {
 				$object->fetch_thirdparty();
 			}
-			
+
 			$outputlangs = $langs;
 			$newlang = '';
 			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) {

From d4162f3076a34a26dd9ad1d651d58a0083e00d19 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 17 May 2021 08:00:33 +0200
Subject: [PATCH 0078/1497] Update card.php

---
 htdocs/ticket/card.php | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index 186a4461bd3..5ed28094e39 100644
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -1317,7 +1317,7 @@ elseif (empty($action) || $action == 'view' || $action == 'addlink' || $action =
 			// Substitution array
 			$morehtmlright = '';
 			$help = "";
-			$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, $arrayoffamiliestoexclude, $object);
+			$substitutionarray = getCommonSubstitutionArray($newlang, 0, $arrayoffamiliestoexclude, $object);
 			if ($object->fk_soc > 0) {
 				$substitutionarray['__THIRDPARTY_NAME__'] = $object->thirdparty->name;
 			}
@@ -1351,16 +1351,6 @@ elseif (empty($action) || $action == 'view' || $action == 'addlink' || $action =
 
 			print '<hr>';
 
-			// 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->default_lang;
-			}
-
 			$formticket = new FormTicket($db);
 
 			$formticket->action = $action;

From 7bb71dd89fa1e6552135e2f875cd00cfa174635e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 17 May 2021 09:25:18 +0200
Subject: [PATCH 0079/1497] FIX #17602

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

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index f00d670d4a1..caa7a9fdc05 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -802,8 +802,8 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
             if ($value == 'price' || preg_match('/^amount/i', $value)) {
             	$_POST[$keycode] = price2num(GETPOST($keycode), 'MU');
             }
-            elseif ($value == 'taux' || $value == 'localtax1' || $value == 'localtax2') {
-            	$_POST[$keycode] = price2num(GETPOST($keycode), 8);
+            elseif ($value == 'taux' || $value == 'localtax1') {
+            	$_POST[$keycode] = price2num(GETPOST($keycode), 8);	// Note that localtax2 can be a list of rates separated by coma like X:Y:Z
             }
             elseif ($value == 'entity') {
             	$_POST[$keycode] = getEntity($tabname[$id]);
@@ -871,8 +871,8 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
             if ($field == 'price' || preg_match('/^amount/i', $field)) {
             	$_POST[$keycode] = price2num(GETPOST($keycode), 'MU');
             }
-            elseif ($field == 'taux' || $field == 'localtax1' || $field == 'localtax2') {
-            	$_POST[$keycode] = price2num(GETPOST($keycode), 8);
+            elseif ($field == 'taux' || $field == 'localtax1') {
+            	$_POST[$keycode] = price2num(GETPOST($keycode), 8);	// Note that localtax2 can be a list of rates separated by coma like X:Y:Z
             }
             elseif ($field == 'entity') {
             	$_POST[$keycode] = getEntity($tabname[$id]);

From 2f9a504dce7e44e16513a712cab815d58585ffb4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 17 May 2021 09:30:09 +0200
Subject: [PATCH 0080/1497] Fix label

---
 htdocs/admin/dict.php        | 10 +++++-----
 htdocs/langs/en_US/main.lang |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index caa7a9fdc05..4bd556c5ac3 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -1076,7 +1076,7 @@ if ($id)
 	$sql = $tabsql[$id];
 
 	if (!preg_match('/ WHERE /', $sql)) $sql .= " WHERE 1 = 1";
-	if ($search_country_id > 0) $sql .= " AND c.rowid = ".$search_country_id;
+	if ($search_country_id > 0) $sql .= " AND c.rowid = ".((int) $search_country_id);
 	if ($search_code != '' && $id == 9)     $sql .= natural_search("code_iso", $search_code);
 	elseif ($search_code != '' && $id == 28)    $sql .= natural_search("h.code", $search_code);
 	elseif ($search_code != '' && $id == 32)    $sql .= natural_search("a.code", $search_code);
@@ -1150,9 +1150,9 @@ if ($id)
 				$class = 'center';
 			}
 			if ($fieldlist[$field] == 'localtax1_type') { $valuetoshow = $langs->trans("UseLocalTax")." 2"; $class = "center"; $sortable = 0; }
-			if ($fieldlist[$field] == 'localtax1') { $valuetoshow = $langs->trans("Rate")." 2"; $class = "center"; }
+			if ($fieldlist[$field] == 'localtax1') { $valuetoshow = $langs->trans("RateOfTaxN", '2'); $class = "center"; }
 			if ($fieldlist[$field] == 'localtax2_type') { $valuetoshow = $langs->trans("UseLocalTax")." 3"; $class = "center"; $sortable = 0; }
-			if ($fieldlist[$field] == 'localtax2') { $valuetoshow = $langs->trans("Rate")." 3"; $class = "center"; }
+			if ($fieldlist[$field] == 'localtax2') { $valuetoshow = $langs->trans("RateOfTaxN", '3'); $class = "center"; }
 			if ($fieldlist[$field] == 'organization') { $valuetoshow = $langs->trans("Organization"); }
 			if ($fieldlist[$field] == 'lang') { $valuetoshow = $langs->trans("Language"); }
 			if ($fieldlist[$field] == 'type') {
@@ -1380,9 +1380,9 @@ if ($id)
 				$cssprefix = 'center ';
 			}
 			if ($fieldlist[$field] == 'localtax1_type') { $valuetoshow = $langs->trans("UseLocalTax")." 2"; $cssprefix = "center "; $sortable = 0; }
-			if ($fieldlist[$field] == 'localtax1') { $valuetoshow = $langs->trans("Rate")." 2"; $cssprefix = "center "; $sortable = 0; }
+			if ($fieldlist[$field] == 'localtax1') { $valuetoshow = $langs->trans("RateOfTaxN", '2'); $cssprefix = "center "; $sortable = 0; }
 			if ($fieldlist[$field] == 'localtax2_type') { $valuetoshow = $langs->trans("UseLocalTax")." 3"; $cssprefix = "center "; $sortable = 0; }
-			if ($fieldlist[$field] == 'localtax2') { $valuetoshow = $langs->trans("Rate")." 3"; $cssprefix = "center "; $sortable = 0; }
+			if ($fieldlist[$field] == 'localtax2') { $valuetoshow = $langs->trans("RateOfTaxN", '3'); $cssprefix = "center "; $sortable = 0; }
 			if ($fieldlist[$field] == 'organization') { $valuetoshow = $langs->trans("Organization"); }
 			if ($fieldlist[$field] == 'lang') { $valuetoshow = $langs->trans("Language"); }
 			if ($fieldlist[$field] == 'type') { $valuetoshow = $langs->trans("Type"); }
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 5594c835ba8..39517ca2e1b 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -427,6 +427,7 @@ LT1IN=CGST
 LT2IN=SGST
 LT1GC=Additionnal cents
 VATRate=Tax Rate
+RateOfTaxN=Rate of tax %s
 VATCode=Tax Rate code
 VATNPR=Tax Rate NPR
 DefaultTaxRate=Default tax rate

From f923c70f380d4145153b20bcbb8037caf7ea7a4c Mon Sep 17 00:00:00 2001
From: Ferran Marcet <fmarcet@2byte.es>
Date: Mon, 17 May 2021 10:17:54 +0200
Subject: [PATCH 0081/1497] Fix: Before there was no mistake

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

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index fbe7d924cbc..648537ec3f8 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -9,7 +9,7 @@
  * Copyright (C) 2012-2015	Marcos García			<marcosgdf@gmail.com>
  * Copyright (C) 2012		Christophe Battarel		<christophe.battarel@ltairis.fr>
  * Copyright (C) 2011-2016	Alexandre Spangaro		<aspangaro@open-dsi.fr>
- * Copyright (C) 2015-2021	Ferran Marcet			<fmarcet@2byte.es>
+ * Copyright (C) 2015		Ferran Marcet			<fmarcet@2byte.es>
  * Copyright (C) 2016		Raphaël Doursenaud		<rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2019       Frédéric France         <frederic.france@netlogic.fr>
  *
@@ -777,10 +777,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
             elseif (in_array($keycode, array('joinfile', 'private', 'position', 'scale'))) {
             	$sql .= (int) GETPOST($keycode, 'int');
             }
-			elseif ($keycode == 'localtax2') {
-				$sql .= "'".GETPOST($keycode, 'alpha')."'";
-			}
-            else {
+			else {
             	$sql .= "'".$db->escape(GETPOST($keycode, 'nohtml'))."'";
             }
 
@@ -846,9 +843,6 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
             elseif (in_array($keycode, array('private', 'position', 'scale'))) {
             	$sql .= (int) GETPOST($keycode, 'int');
             }
-			elseif ($keycode == 'localtax2') {
-				$sql .= "'".GETPOST($keycode, 'alpha')."'";
-			}
             else {
             	$sql .= "'".$db->escape(GETPOST($keycode, 'nohtml'))."'";
             }

From f95bd2f4396f9f159c1e872b96a16f7a84ebd92c Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Mon, 17 May 2021 11:40:36 +0200
Subject: [PATCH 0082/1497] fixw that

---
 htdocs/core/modules/propale/doc/pdf_cyan.modules.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
index 7c9f4e6fe77..8ce23e6f9ad 100644
--- a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
@@ -424,7 +424,7 @@ class pdf_cyan extends ModelePDFPropales
 						$salereparray = $object->thirdparty->getSalesRepresentatives($user);
 						$salerepobj = new User($this->db);
 						$salerepobj->fetch($salereparray[0]['id']);
-						if (!empty($salerepobj->signature)) $notetoshow = dol_concatdesc($notetoshow, $salerepobj->signature);
+						if (!empty($salerepobj->signature)) $notetoshow .= dol_concatdesc($notetoshow, $salerepobj->signature);
 					}
 				}
 

From 547f1dd3703a625b72ee594b238c211a0a684297 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Mon, 17 May 2021 11:54:53 +0200
Subject: [PATCH 0083/1497] Fix: user rest api rights

---
 htdocs/user/class/api_users.class.php | 38 +++++++++++++--------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/htdocs/user/class/api_users.class.php b/htdocs/user/class/api_users.class.php
index fa139e2c69f..7c1eef84c2c 100644
--- a/htdocs/user/class/api_users.class.php
+++ b/htdocs/user/class/api_users.class.php
@@ -71,7 +71,7 @@ class Users extends DolibarrApi
 
 	    $obj_ret = array();
 
-		if (!DolibarrApiAccess::$user->rights->user->user->lire) {
+		if (!DolibarrApiAccess::$user->rights->user->user->lire && !DolibarrApiAccess::$user->admin) {
 	        throw new RestException(401, "You are not allowed to read list of users");
 	    }
 
@@ -142,9 +142,9 @@ class Users extends DolibarrApi
 	 */
     public function get($id, $includepermissions = 0)
     {
-		//if (!DolibarrApiAccess::$user->rights->user->user->lire) {
-			//throw new RestException(401);
-		//}
+		if (!DolibarrApiAccess::$user->rights->user->user->lire  && !DolibarrApiAccess::$user->admin) {
+			throw new RestException(401);
+		}
 
 		$result = $this->useraccount->fetch($id);
 		if (!$result)
@@ -208,9 +208,9 @@ class Users extends DolibarrApi
     public function post($request_data = null)
     {
 	    // check user authorization
-	    //if(! DolibarrApiAccess::$user->rights->user->creer) {
-	    //   throw new RestException(401, "User creation not allowed");
-	    //}
+	    if(! DolibarrApiAccess::$user->rights->user->creer && !DolibarrApiAccess::$user->admin) {
+	       throw new RestException(401, "User creation not allowed");
+	    }
 	    // check mandatory fields
 	    /*if (!isset($request_data["login"]))
 	        throw new RestException(400, "login field missing");
@@ -242,9 +242,9 @@ class Users extends DolibarrApi
 	 */
     public function put($id, $request_data = null)
     {
-		//if (!DolibarrApiAccess::$user->rights->user->user->creer) {
-			//throw new RestException(401);
-		//}
+		if (!DolibarrApiAccess::$user->rights->user->user->creer && !DolibarrApiAccess::$user->admin) {
+			throw new RestException(401);
+		}
 
 		$result = $this->useraccount->fetch($id);
 		if (!$result)
@@ -299,7 +299,7 @@ class Users extends DolibarrApi
 	{
 		$obj_ret = array();
 
-		if (!DolibarrApiAccess::$user->rights->user->user->lire) {
+		if (!DolibarrApiAccess::$user->rights->user->user->lire && !DolibarrApiAccess::$user->admin) {
 			throw new RestException(401);
 		}
 
@@ -334,9 +334,9 @@ class Users extends DolibarrApi
 
 		global $conf;
 
-		//if (!DolibarrApiAccess::$user->rights->user->user->supprimer) {
-			//throw new RestException(401);
-		//}
+		if (!DolibarrApiAccess::$user->rights->user->user->supprimer && !DolibarrApiAccess::$user->admin) {
+			throw new RestException(401);
+		}
 		$result = $this->useraccount->fetch($id);
 		if (!$result)
 		{
@@ -389,7 +389,7 @@ class Users extends DolibarrApi
 
 	    $obj_ret = array();
 
-		if (!DolibarrApiAccess::$user->rights->user->group_advance->read) {
+		if (!DolibarrApiAccess::$user->rights->user->group_advance->read && !DolibarrApiAccess::$user->admin) {
 	        throw new RestException(401, "You are not allowed to read list of groups");
 	    }
 
@@ -463,7 +463,7 @@ class Users extends DolibarrApi
     {
 	    global $db, $conf;
 
-		if (!DolibarrApiAccess::$user->rights->user->group_advance->read) {
+		if (!DolibarrApiAccess::$user->rights->user->group_advance->read && !DolibarrApiAccess::$user->admin) {
 	        throw new RestException(401, "You are not allowed to read groups");
 	    }
 
@@ -486,9 +486,9 @@ class Users extends DolibarrApi
 	 */
     public function delete($id)
     {
-		//if (!DolibarrApiAccess::$user->rights->user->user->supprimer) {
-			//throw new RestException(401);
-		//}
+		if (!DolibarrApiAccess::$user->rights->user->user->supprimer && !DolibarrApiAccess::$user->admin) {
+			throw new RestException(401);
+		}
 		$result = $this->useraccount->fetch($id);
 		if (!$result)
 		{

From a3aba28c95fd41c3db3b390f642b6fd05e873105 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Mon, 17 May 2021 10:06:41 +0000
Subject: [PATCH 0084/1497] Fixing style errors.

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

diff --git a/htdocs/user/class/api_users.class.php b/htdocs/user/class/api_users.class.php
index 7c1eef84c2c..39f3b302599 100644
--- a/htdocs/user/class/api_users.class.php
+++ b/htdocs/user/class/api_users.class.php
@@ -209,7 +209,7 @@ class Users extends DolibarrApi
     {
 	    // check user authorization
 	    if(! DolibarrApiAccess::$user->rights->user->creer && !DolibarrApiAccess::$user->admin) {
-	       throw new RestException(401, "User creation not allowed");
+			throw new RestException(401, "User creation not allowed");
 	    }
 	    // check mandatory fields
 	    /*if (!isset($request_data["login"]))

From c6aa078892f89198178258484550681ad1762e2b Mon Sep 17 00:00:00 2001
From: Antonin MARCHAL <antonin@letempledujeu.fr>
Date: Mon, 17 May 2021 13:46:01 +0200
Subject: [PATCH 0085/1497] renamed LibStatut hook + removed useless hook

---
 htdocs/fourn/class/fournisseur.commande.class.php | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index abfe6df1edc..e8d6c0ed9c9 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -750,7 +750,7 @@ class CommandeFournisseur extends CommonOrder
 		$statusShort = $langs->transnoentitiesnoconv($this->statutshort[$status]);
 
 		$parameters = array('status' => $status, 'mode' => $mode, 'billed' => $billed, 'obj'=>$this);
-		$reshook = $hookmanager->executeHooks('diffHtmlStatus', $parameters, $object); // Note that $action and $object may have been modified by hook
+		$reshook = $hookmanager->executeHooks('LibStatut', $parameters, $object); // Note that $action and $object may have been modified by hook
 		if ($reshook > 0) {
 			return $hookmanager->resPrint;
 		}
@@ -779,15 +779,7 @@ class CommandeFournisseur extends CommonOrder
 		if ($user->rights->fournisseur->commande->lire) {
 			$label = '<u class="paddingrightonly">'.$langs->trans("SupplierOrder").'</u>';
 			if (isset($this->statut)) {
-				$statusText = ' '.$this->getLibStatut(5);
-				$parameters = array('obj' => $this);
-				$reshook = $hookmanager->executeHooks('moreHtmlStatus', $parameters, $object); // Note that $action and $object may have been modified by hook
-				if (empty($reshook)) {
-					$statusText .= $hookmanager->resPrint;
-				} else {
-					$statusText = $hookmanager->resPrint;
-				}
-				$label .= $statusText;
+				$label = ' '.$this->getLibStatut(5);
 			}
 			if (!empty($this->ref)) {
 				$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;

From 779c868eaede3368a6d5b3f8674942565df26e84 Mon Sep 17 00:00:00 2001
From: Antonin MARCHAL <antonin@letempledujeu.fr>
Date: Mon, 17 May 2021 13:48:21 +0200
Subject: [PATCH 0086/1497] fix mistake and removed hookmanager unused

---
 htdocs/fourn/class/fournisseur.commande.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index e8d6c0ed9c9..9b643ff1464 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -770,7 +770,7 @@ class CommandeFournisseur extends CommonOrder
 	 */
 	public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $save_lastsearch_value = -1, $addlinktonotes = 0)
 	{
-		global $langs, $conf, $user, $hookmanager;
+		global $langs, $conf, $user;
 
 		$result = '';
 
@@ -779,7 +779,7 @@ class CommandeFournisseur extends CommonOrder
 		if ($user->rights->fournisseur->commande->lire) {
 			$label = '<u class="paddingrightonly">'.$langs->trans("SupplierOrder").'</u>';
 			if (isset($this->statut)) {
-				$label = ' '.$this->getLibStatut(5);
+				$label .= ' '.$this->getLibStatut(5);
 			}
 			if (!empty($this->ref)) {
 				$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;

From 6f3d19b7b63c3fb62997dc64f8a32b16065501de Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Mon, 17 May 2021 15:12:25 +0200
Subject: [PATCH 0087/1497] dol_concatdesc better than concat operator

---
 htdocs/core/modules/propale/doc/pdf_cyan.modules.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
index 8ce23e6f9ad..2b40dffa30e 100644
--- a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
@@ -424,7 +424,7 @@ class pdf_cyan extends ModelePDFPropales
 						$salereparray = $object->thirdparty->getSalesRepresentatives($user);
 						$salerepobj = new User($this->db);
 						$salerepobj->fetch($salereparray[0]['id']);
-						if (!empty($salerepobj->signature)) $notetoshow .= dol_concatdesc($notetoshow, $salerepobj->signature);
+						if (!empty($salerepobj->signature)) $notetoshow = dol_concatdesc($notetoshow, $salerepobj->signature);
 					}
 				}
 
@@ -438,9 +438,11 @@ class pdf_cyan extends ModelePDFPropales
 				{
 					$tmpuser = new User($this->db);
 					$tmpuser->fetch($object->user_author_id);
-					$notetoshow .= $langs->trans("CaseFollowedBy").' '.$tmpuser->getFullName($langs);
-					if ($tmpuser->email) $notetoshow .= ',  Mail: '.$tmpuser->email;
-					if ($tmpuser->office_phone) $notetoshow .= ', Tel: '.$tmpuser->office_phone;
+					$creator_info = $langs->trans("CaseFollowedBy").' '.$tmpuser->getFullName($langs);
+					if ($tmpuser->email) $creator_info .= ',  Mail: '.$tmpuser->email;
+					if ($tmpuser->office_phone) $creator_info .= ', Tel: '.$tmpuser->office_phone;
+
+					$notetoshow = dol_concatdesc($notetoshow, $creator_info);
 				}
 
 				$tab_height = $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter;

From c54e010126fb1cc297f644f5bf045a26a0c0b09c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 17 May 2021 16:16:45 +0200
Subject: [PATCH 0088/1497] Fix perms on API user

---
 htdocs/user/class/api_users.class.php | 30 ++++++++++++++++-----------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/htdocs/user/class/api_users.class.php b/htdocs/user/class/api_users.class.php
index 39f3b302599..9f5ea935372 100644
--- a/htdocs/user/class/api_users.class.php
+++ b/htdocs/user/class/api_users.class.php
@@ -71,7 +71,7 @@ class Users extends DolibarrApi
 
 	    $obj_ret = array();
 
-		if (!DolibarrApiAccess::$user->rights->user->user->lire && !DolibarrApiAccess::$user->admin) {
+		if (!DolibarrApiAccess::$user->rights->user->user->lire && empty(DolibarrApiAccess::$user->admin)) {
 	        throw new RestException(401, "You are not allowed to read list of users");
 	    }
 
@@ -142,7 +142,7 @@ class Users extends DolibarrApi
 	 */
     public function get($id, $includepermissions = 0)
     {
-		if (!DolibarrApiAccess::$user->rights->user->user->lire  && !DolibarrApiAccess::$user->admin) {
+		if (!DolibarrApiAccess::$user->rights->user->user->lire && empty(DolibarrApiAccess::$user->admin)) {
 			throw new RestException(401);
 		}
 
@@ -177,7 +177,11 @@ class Users extends DolibarrApi
      */
     public function getInfo()
     {
-        $apiUser = DolibarrApiAccess::$user;
+    	if (empty(DolibarrApiAccess::$user->rights->user->user->lire) && empty(DolibarrApiAccess::$user->admin)) {
+    		throw new RestException(401, 'Not allowed');
+    	}
+    	
+    	$apiUser = DolibarrApiAccess::$user;
 
         $result = $this->useraccount->fetch($apiUser->id);
         if (!$result) {
@@ -208,7 +212,7 @@ class Users extends DolibarrApi
     public function post($request_data = null)
     {
 	    // check user authorization
-	    if(! DolibarrApiAccess::$user->rights->user->creer && !DolibarrApiAccess::$user->admin) {
+	    if (empty(DolibarrApiAccess::$user->rights->user->creer) && empty(DolibarrApiAccess::$user->admin)) {
 			throw new RestException(401, "User creation not allowed");
 	    }
 	    // check mandatory fields
@@ -242,7 +246,7 @@ class Users extends DolibarrApi
 	 */
     public function put($id, $request_data = null)
     {
-		if (!DolibarrApiAccess::$user->rights->user->user->creer && !DolibarrApiAccess::$user->admin) {
+		if (empty(DolibarrApiAccess::$user->rights->user->user->creer) && empty(DolibarrApiAccess::$user->admin)) {
 			throw new RestException(401);
 		}
 
@@ -299,7 +303,7 @@ class Users extends DolibarrApi
 	{
 		$obj_ret = array();
 
-		if (!DolibarrApiAccess::$user->rights->user->user->lire && !DolibarrApiAccess::$user->admin) {
+		if (empty(DolibarrApiAccess::$user->rights->user->user->lire) && empty(DolibarrApiAccess::$user->admin)) {
 			throw new RestException(401);
 		}
 
@@ -334,7 +338,7 @@ class Users extends DolibarrApi
 
 		global $conf;
 
-		if (!DolibarrApiAccess::$user->rights->user->user->supprimer && !DolibarrApiAccess::$user->admin) {
+		if (empty(DolibarrApiAccess::$user->rights->user->user->creer) && empty(DolibarrApiAccess::$user->admin)) {
 			throw new RestException(401);
 		}
 		$result = $this->useraccount->fetch($id);
@@ -389,9 +393,10 @@ class Users extends DolibarrApi
 
 	    $obj_ret = array();
 
-		if (!DolibarrApiAccess::$user->rights->user->group_advance->read && !DolibarrApiAccess::$user->admin) {
-	        throw new RestException(401, "You are not allowed to read list of groups");
-	    }
+	    if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty(DolibarrApiAccess::$user->rights->user->user->lire) && empty(DolibarrApiAccess::$user->admin)) ||
+	    	!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty(DolibarrApiAccess::$user->rights->user->group_advance->read) && empty(DolibarrApiAccess::$user->admin)) {
+	    		throw new RestException(401, "You are not allowed to read groups");
+    	}
 
 	    // case of external user, $societe param is ignored and replaced by user's socid
 	    //$socid = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : $societe;
@@ -463,7 +468,8 @@ class Users extends DolibarrApi
     {
 	    global $db, $conf;
 
-		if (!DolibarrApiAccess::$user->rights->user->group_advance->read && !DolibarrApiAccess::$user->admin) {
+	    if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty(DolibarrApiAccess::$user->rights->user->user->lire) && empty(DolibarrApiAccess::$user->admin)) ||
+	    	!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty(DolibarrApiAccess::$user->rights->user->group_advance->read) && empty(DolibarrApiAccess::$user->admin)) {
 	        throw new RestException(401, "You are not allowed to read groups");
 	    }
 
@@ -486,7 +492,7 @@ class Users extends DolibarrApi
 	 */
     public function delete($id)
     {
-		if (!DolibarrApiAccess::$user->rights->user->user->supprimer && !DolibarrApiAccess::$user->admin) {
+		if (empty(DolibarrApiAccess::$user->rights->user->user->supprimer) && empty(DolibarrApiAccess::$user->admin)) {
 			throw new RestException(401);
 		}
 		$result = $this->useraccount->fetch($id);

From 0b7f474dd37fbbbeeb0efc2ad54e1c0af75db6d0 Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Date: Mon, 17 May 2021 18:04:21 +0200
Subject: [PATCH 0089/1497] look_feel user author in list

---
 htdocs/comm/propal/list.php    | 10 +++++-----
 htdocs/commande/list.php       |  7 +++----
 htdocs/compta/facture/list.php |  7 +++----
 htdocs/projet/list.php         |  4 +++-
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 43c83117457..7f738f84ebe 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -1705,14 +1705,13 @@ if ($resql) {
 			}
 		}
 
-		$userstatic->id = $obj->fk_user_author;
-		$userstatic->login = $obj->login;
+		$userstatic->fetch($obj->fk_user_author);
 
 		// Author
 		if (!empty($arrayfields['u.login']['checked'])) {
-			print '<td class="center nowraponall">';
+			print '<td>';
 			if ($userstatic->id) {
-				print $userstatic->getLoginUrl(1);
+				print $userstatic->getNomUrl(-1);
 			}
 			print "</td>\n";
 			if (!$i) {
@@ -1744,7 +1743,8 @@ if ($resql) {
 						$userstatic->entity = $val['entity'];
 						$userstatic->photo = $val['photo'];
 						$userstatic->login = $val['login'];
-						$userstatic->phone = $val['phone'];
+						$userstatic->user_mobile = $val['user_mobile'];
+						$userstatic->user_mobile = $val['user_mobile'];
 						$userstatic->job = $val['job'];
 						$userstatic->gender = $val['gender'];
 						//print '<div class="float">':
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 3747b2107b2..d14fe1ae460 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -1668,14 +1668,13 @@ if ($resql) {
 			}
 		}
 
-		$userstatic->id = $obj->fk_user_author;
-		$userstatic->login = $obj->login;
+		$userstatic->fetch($obj->fk_user_author);
 
 		// Author
 		if (!empty($arrayfields['u.login']['checked'])) {
-			print '<td align="center">';
+			print '<td>';
 			if ($userstatic->id) {
-				print $userstatic->getLoginUrl(1);
+				print $userstatic->getNomUrl(-1);
 			} else {
 				print '&nbsp;';
 			}
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 14b0383fa8d..e5c08993b9f 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -1880,11 +1880,10 @@ if ($resql) {
 
 			// Author
 			if (!empty($arrayfields['u.login']['checked'])) {
-				$userstatic->id = $obj->fk_user_author;
-				$userstatic->login = $obj->login;
-				print '<td class="center tdoverflowmax100">';
+				$userstatic->fetch($obj->fk_user_author);
+				print '<td>';
 				if ($userstatic->id) {
-					print $userstatic->getLoginUrl(1);
+					print $userstatic->getNomUrl(-1);
 				} else {
 					print '&nbsp;';
 				}
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index a9f17f5439b..1edeb0816c2 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -1041,7 +1041,9 @@ while ($i < min($num, $limit)) {
 						$userstatic->entity = $val['entity'];
 						$userstatic->photo = $val['photo'];
 						$userstatic->login = $val['login'];
-						$userstatic->phone = $val['phone'];
+						$userstatic->office_phone = $val['office_phone'];
+						$userstatic->office_fax = $val['office_fax'];
+						$userstatic->user_mobile = $val['user_mobile'];
 						$userstatic->job = $val['job'];
 						$userstatic->gender = $val['gender'];
 						print ($nbofsalesrepresentative < 2) ? $userstatic->getNomUrl(-1, '', 0, 0, 12) : $userstatic->getNomUrl(-2);

From 9dcf2044a96c755a8bb54dfe61163c1703b466b7 Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Date: Mon, 17 May 2021 18:33:27 +0200
Subject: [PATCH 0090/1497] Update list.php

---
 htdocs/comm/propal/list.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 7f738f84ebe..0f277dad14c 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -1743,7 +1743,8 @@ if ($resql) {
 						$userstatic->entity = $val['entity'];
 						$userstatic->photo = $val['photo'];
 						$userstatic->login = $val['login'];
-						$userstatic->user_mobile = $val['user_mobile'];
+						$userstatic->office_phone = $val['office_phone'];
+						$userstatic->office_fax = $val['office_fax'];
 						$userstatic->user_mobile = $val['user_mobile'];
 						$userstatic->job = $val['job'];
 						$userstatic->gender = $val['gender'];

From 1a38d075a6830754de0bd68d6b14a188b2b21851 Mon Sep 17 00:00:00 2001
From: Bastien Schils <12594973+WimpyMan@users.noreply.github.com>
Date: Mon, 17 May 2021 18:34:23 +0200
Subject: [PATCH 0091/1497] html.form.class.php: Fixed SQL error (projects)

1. Strings should be quoted by single quotes
2. GROUP BY declaration must list all fields from SELECT statement
---
 htdocs/core/class/html.form.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 7f52cb099a1..55cb6270455 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -8118,8 +8118,8 @@ class Form
 		}
 
 		// Search all projects
-		$sql = 'SELECT f.rowid, f.ref as fref, "nolabel" as flabel, p.rowid as pid, f.ref,
-            p.title, p.fk_soc, p.fk_statut, p.public,';
+		$sql = "SELECT f.rowid, f.ref as fref, 'nolabel' as flabel, p.rowid as pid, f.ref,
+            p.title, p.fk_soc, p.fk_statut, p.public,";
 		$sql .= ' s.nom as name';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'projet as p';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON s.rowid = p.fk_soc,';
@@ -8129,7 +8129,7 @@ class Form
 		//if ($projectsListId) $sql.= " AND p.rowid IN (".$projectsListId.")";
 		//if ($socid == 0) $sql.= " AND (p.fk_soc=0 OR p.fk_soc IS NULL)";
 		//if ($socid > 0)  $sql.= " AND (p.fk_soc=".$socid." OR p.fk_soc IS NULL)";
-		$sql .= " GROUP BY f.ref ORDER BY p.ref, f.ref ASC";
+		$sql .= " GROUP BY f.ref, f.rowid, flabel,pid, p.title, p.fk_soc, p.fk_statut, p.public, name ORDER BY p.ref, f.ref ASC";
 
 		$resql = $this->db->query($sql);
 		if ($resql)

From 6bbd6db84bc1ec551632a6e2334bc61080a37a17 Mon Sep 17 00:00:00 2001
From: Givriz <damien375@outlook.fr>
Date: Mon, 17 May 2021 18:39:08 +0200
Subject: [PATCH 0092/1497] Compatibility phpv8

---
 htdocs/admin/system/modules.php   | 2 +-
 htdocs/admin/tools/listevents.php | 2 +-
 htdocs/main.inc.php               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/admin/system/modules.php b/htdocs/admin/system/modules.php
index f3892e105bb..4a77d2452c4 100644
--- a/htdocs/admin/system/modules.php
+++ b/htdocs/admin/system/modules.php
@@ -277,7 +277,7 @@ if ($arrayfields['module_position']['checked']) {
 }
 
 // Fields from hook
-$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+$parameters = array('arrayfields'=>$arrayfields, 'param'=>empty($param) ? '' : $param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php
index fbc2412a9df..b894920d34e 100644
--- a/htdocs/admin/tools/listevents.php
+++ b/htdocs/admin/tools/listevents.php
@@ -245,7 +245,7 @@ if ($result) {
 	if ($limit > 0 && $limit != $conf->liste_limit) {
 		$param .= '&limit='.urlencode($limit);
 	}
-	if ($optioncss != '') {
+	if (!empty($optioncss)) {
 		$param .= '&optioncss='.urlencode($optioncss);
 	}
 	if ($search_code) {
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index c9a7dd21ccc..1929dcbdb37 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -928,7 +928,7 @@ if (!defined('NOLOGIN')) {
 		$_SESSION["dol_dst_second"] = isset($dol_dst_second) ? $dol_dst_second : '';
 		$_SESSION["dol_screenwidth"] = isset($dol_screenwidth) ? $dol_screenwidth : '';
 		$_SESSION["dol_screenheight"] = isset($dol_screenheight) ? $dol_screenheight : '';
-		$_SESSION["dol_company"] = $conf->global->MAIN_INFO_SOCIETE_NOM;
+		$_SESSION["dol_company"] = getDolGlobalString("MAIN_INFO_SOCIETE_NOM");
 		$_SESSION["dol_entity"] = $conf->entity;
 		// Store value into session (values stored only if defined)
 		if (!empty($dol_hide_topmenu)) {

From a865f49d72049f7ffbb949da11386ab151fdfd16 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 17 May 2021 19:19:26 +0200
Subject: [PATCH 0093/1497] Fix phpcs

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

diff --git a/htdocs/user/class/api_users.class.php b/htdocs/user/class/api_users.class.php
index 9f5ea935372..75aedba09bd 100644
--- a/htdocs/user/class/api_users.class.php
+++ b/htdocs/user/class/api_users.class.php
@@ -180,7 +180,7 @@ class Users extends DolibarrApi
     	if (empty(DolibarrApiAccess::$user->rights->user->user->lire) && empty(DolibarrApiAccess::$user->admin)) {
     		throw new RestException(401, 'Not allowed');
     	}
-    	
+
     	$apiUser = DolibarrApiAccess::$user;
 
         $result = $this->useraccount->fetch($apiUser->id);

From 4236471a6f0efd9d8269837ddcdb494aeed05ee1 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 17 May 2021 22:12:01 +0200
Subject: [PATCH 0094/1497] Fix Title salary card

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

diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php
index 8e2188123db..aff3e4cce92 100755
--- a/htdocs/salaries/card.php
+++ b/htdocs/salaries/card.php
@@ -359,7 +359,9 @@ if ($action == 'confirm_clone' && $confirm == 'yes' && ($user->rights->salaries-
  *	View
  */
 
-llxHeader("", $langs->trans("Salary"));
+$title = $langs->trans('Salary')." - ".$langs->trans('Card');
+$help_url = "";
+llxHeader("", $title, $help_url);
 
 $form = new Form($db);
 if (!empty($conf->projet->enabled)) $formproject = new FormProjets($db);

From c3c760c26915af4ef39671fb0af23c31d1172901 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 17 May 2021 22:18:46 +0200
Subject: [PATCH 0095/1497] Fix Title salary document card

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

diff --git a/htdocs/salaries/document.php b/htdocs/salaries/document.php
index 4c88cefb8de..5950fc88798 100644
--- a/htdocs/salaries/document.php
+++ b/htdocs/salaries/document.php
@@ -91,7 +91,9 @@ include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
 
 $form = new Form($db);
 
-llxHeader("", $langs->trans("SalaryPayment"));
+$title = $langs->trans('Salary')." - ".$langs->trans('Documents');
+$help_url = "";
+llxHeader("", $title, $help_url);
 
 if ($object->id) {
 	$object->fetch_thirdparty();

From 91b8b6a6003ac730612abb607fc9a0c8b53ccb89 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 17 May 2021 22:41:00 +0200
Subject: [PATCH 0096/1497] Fix Title salary info card

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

diff --git a/htdocs/salaries/info.php b/htdocs/salaries/info.php
index 1b81a80189f..0f94f405fa1 100644
--- a/htdocs/salaries/info.php
+++ b/htdocs/salaries/info.php
@@ -53,7 +53,9 @@ restrictedArea($user, 'salaries', $object->id, 'salary', '');
  * View
  */
 
-llxHeader("", $langs->trans("SalaryPayment"));
+$title = $langs->trans('Salary')." - ".$langs->trans('Info');
+$help_url = "";
+llxHeader("", $title, $help_url);
 
 $object = new Salary($db);
 $object->fetch($id);

From 58db723502a58d054ffd45749ab151551026890d Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Date: Mon, 17 May 2021 23:27:33 +0200
Subject: [PATCH 0097/1497] thirdparty info popup list

---
 htdocs/comm/propal/list.php    |  9 +++++++-
 htdocs/commande/list.php       | 11 ++++++++--
 htdocs/compta/facture/list.php | 40 +++++++++++++++++++---------------
 htdocs/projet/list.php         | 38 ++++++++++++++++++++------------
 4 files changed, 64 insertions(+), 34 deletions(-)

diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index e1ec555837f..c8173967770 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -460,9 +460,10 @@ $sql = 'SELECT';
 if ($sall || $search_product_category > 0 || $search_user > 0) {
 	$sql = 'SELECT DISTINCT';
 }
-$sql .= ' s.rowid as socid, s.nom as name, s.name_alias as alias, s.email, s.town, s.zip, s.fk_pays, s.client, s.code_client, ';
+$sql .= ' s.rowid as socid, s.nom as name, s.name_alias as alias, s.email, s.phone, s.fax , s.address, s.town, s.zip, s.fk_pays, s.client, s.code_client, ';
 $sql .= " typent.code as typent_code,";
 $sql .= " ava.rowid as availability,";
+$sql .= " country.code as country_code,";
 $sql .= " state.code_departement as state_code, state.nom as state_name,";
 $sql .= ' p.rowid, p.entity, p.note_private, p.total_ht, p.total_tva, p.total_ttc, p.localtax1, p.localtax2, p.ref, p.ref_client, p.fk_statut as status, p.fk_user_author, p.datep as dp, p.fin_validite as dfv,p.date_livraison as ddelivery,';
 $sql .= ' p.fk_multicurrency, p.multicurrency_code, p.multicurrency_tx, p.multicurrency_total_ht, p.multicurrency_total_tva, p.multicurrency_total_ttc,';
@@ -1335,9 +1336,15 @@ if ($resql) {
 
 		$companystatic->id = $obj->socid;
 		$companystatic->name = $obj->name;
+		$companystatic->name_alias = $obj->alias;
 		$companystatic->client = $obj->client;
 		$companystatic->code_client = $obj->code_client;
 		$companystatic->email = $obj->email;
+		$companystatic->phone = $obj->phone;
+		$companystatic->address = $obj->address;
+		$companystatic->zip = $obj->zip;
+		$companystatic->town = $obj->town;
+		$companystatic->country_code = $obj->country_code;
 
 		$projectstatic->id = $obj->project_id;
 		$projectstatic->ref = $obj->project_ref;
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 5bb8e6ccb0c..81b15623adf 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -417,9 +417,10 @@ $sql = 'SELECT';
 if ($sall || $search_product_category > 0 || $search_user > 0) {
 	$sql = 'SELECT DISTINCT';
 }
-$sql .= ' s.rowid as socid, s.nom as name, s.name_alias as name_alias, s.email, s.town, s.zip, s.fk_pays, s.client, s.code_client,';
+$sql .= ' s.rowid as socid, s.nom as name, s.name_alias as alias, s.email, s.phone, s.fax, s.address, s.town, s.zip, s.fk_pays, s.client, s.code_client,';
 $sql .= " typent.code as typent_code,";
 $sql .= " state.code_departement as state_code, state.nom as state_name,";
+$sql .= " country.code as country_code,";
 $sql .= ' c.rowid, c.ref, c.total_ht, c.total_tva, c.total_ttc, c.ref_client, c.fk_user_author,';
 $sql .= ' c.fk_multicurrency, c.multicurrency_code, c.multicurrency_tx, c.multicurrency_total_ht, c.multicurrency_total_tva as multicurrency_total_vat, c.multicurrency_total_ttc,';
 $sql .= ' c.date_valid, c.date_commande, c.note_public, c.note_private, c.date_livraison as date_delivery, c.fk_statut, c.facture as billed,';
@@ -1383,10 +1384,16 @@ if ($resql) {
 		$nbprod = 0;
 
 		$companystatic->id = $obj->socid;
-		$companystatic->code_client = $obj->code_client;
 		$companystatic->name = $obj->name;
+		$companystatic->name_alias = $obj->alias;
 		$companystatic->client = $obj->client;
+		$companystatic->code_client = $obj->code_client;
 		$companystatic->email = $obj->email;
+		$companystatic->phone = $obj->phone;
+		$companystatic->address = $obj->address;
+		$companystatic->zip = $obj->zip;
+		$companystatic->town = $obj->town;
+		$companystatic->country_code = $obj->country_code;
 		if (!isset($getNomUrl_cache[$obj->socid])) {
 			$getNomUrl_cache[$obj->socid] = $companystatic->getNomUrl(1, 'customer');
 		}
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 1ac8765171d..2a474d00fae 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -467,7 +467,7 @@ if (!empty($conf->margin->enabled)) {
 $bankaccountstatic = new Account($db);
 $facturestatic = new Facture($db);
 $formcompany = new FormCompany($db);
-$thirdpartystatic = new Societe($db);
+$companystatic = new Societe($db);
 
 $sql = 'SELECT';
 if ($sall || $search_product_category > 0 || $search_user > 0) {
@@ -481,7 +481,7 @@ $sql .= ' f.datef, f.date_valid, f.date_lim_reglement as datelimite, f.module_so
 $sql .= ' f.paye as paye, f.fk_statut, f.close_code,';
 $sql .= ' f.datec as date_creation, f.tms as date_update, f.date_closing as date_closing,';
 $sql .= ' f.retained_warranty, f.retained_warranty_date_limit, f.situation_final, f.situation_cycle_ref, f.situation_counter,';
-$sql .= ' s.rowid as socid, s.nom as name, s.name_alias as name_alias, s.email, s.town, s.zip, s.fk_pays, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta as code_compta_client, s.code_compta_fournisseur,';
+$sql .= ' s.rowid as socid, s.nom as name, s.name_alias as alias, s.email, s.phone, s.fax, s.address, s.town, s.zip, s.fk_pays, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta as code_compta_client, s.code_compta_fournisseur,';
 $sql .= " typent.code as typent_code,";
 $sql .= " state.code_departement as state_code, state.nom as state_name,";
 $sql .= " country.code as country_code,";
@@ -714,7 +714,7 @@ if (!$sall) {
 	$sql .= ' f.retained_warranty, f.retained_warranty_date_limit, f.situation_final, f.situation_cycle_ref, f.situation_counter,';
 	$sql .= ' f.fk_user_author, f.fk_multicurrency, f.multicurrency_code, f.multicurrency_tx, f.multicurrency_total_ht, f.multicurrency_total_tva,';
 	$sql .= ' f.multicurrency_total_tva, f.multicurrency_total_ttc,';
-	$sql .= ' s.rowid, s.nom, s.name_alias, s.email, s.town, s.zip, s.fk_pays, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur,';
+	$sql .= ' s.rowid, s.nom, s.name_alias, s.email, s.phone, s.fax, s.address, s.town, s.zip, s.fk_pays, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur,';
 	$sql .= ' typent.code,';
 	$sql .= ' state.code_departement, state.nom,';
 	$sql .= ' country.code,';
@@ -1539,16 +1539,22 @@ if ($resql) {
 				 $facturestatic->situation_cycle_ref = $obj->situation_cycle_ref;
 				 $facturestatic->situation_counter = $obj->situation_counter;
 			}
-			$thirdpartystatic->id = $obj->socid;
-			$thirdpartystatic->name = $obj->name;
-			$thirdpartystatic->client = $obj->client;
-			$thirdpartystatic->fournisseur = $obj->fournisseur;
-			$thirdpartystatic->code_client = $obj->code_client;
-			$thirdpartystatic->code_compta_client = $obj->code_compta_client;
-			$thirdpartystatic->code_fournisseur = $obj->code_fournisseur;
-			$thirdpartystatic->code_compta_fournisseur = $obj->code_compta_fournisseur;
-			$thirdpartystatic->email = $obj->email;
-			$thirdpartystatic->country_code = $obj->country_code;
+			$companystatic->id = $obj->socid;
+			$companystatic->name = $obj->name;
+			$companystatic->name_alias = $obj->alias;
+			$companystatic->client = $obj->client;
+			$companystatic->fournisseur = $obj->fournisseur;
+			$companystatic->code_client = $obj->code_client;
+			$companystatic->code_compta_client = $obj->code_compta_client;
+			$companystatic->code_fournisseur = $obj->code_fournisseur;
+			$companystatic->code_compta_fournisseur = $obj->code_compta_fournisseur;
+			$companystatic->email = $obj->email;
+			$companystatic->phone = $obj->phone;
+			$companystatic->fax = $obj->fax;
+			$companystatic->address = $obj->address;
+			$companystatic->zip = $obj->zip;
+			$companystatic->town = $obj->town;
+			$companystatic->country_code = $obj->country_code;
 
 			$projectstatic->id = $obj->project_id;
 			$projectstatic->ref = $obj->project_ref;
@@ -1570,10 +1576,10 @@ if ($resql) {
 				$multicurrency_remaintopay = 0;
 			}
 			if ($facturestatic->type == Facture::TYPE_CREDIT_NOTE && $obj->paye == 1) {		// If credit note closed, we take into account the amount not yet consummed
-				$remaincreditnote = $discount->getAvailableDiscounts($thirdpartystatic, '', 'rc.fk_facture_source='.$facturestatic->id);
+				$remaincreditnote = $discount->getAvailableDiscounts($companystatic, '', 'rc.fk_facture_source='.$facturestatic->id);
 				$remaintopay = -$remaincreditnote;
 				$totalpay = price2num($facturestatic->total_ttc - $remaintopay);
-				$multicurrency_remaincreditnote = $discount->getAvailableDiscounts($thirdpartystatic, '', 'rc.fk_facture_source='.$facturestatic->id, 0, 0, 1);
+				$multicurrency_remaincreditnote = $discount->getAvailableDiscounts($companystatic, '', 'rc.fk_facture_source='.$facturestatic->id, 0, 0, 1);
 				$multicurrency_remaintopay = -$multicurrency_remaincreditnote;
 				$multicurrency_totalpay = price2num($facturestatic->multicurrency_total_ttc - $multicurrency_remaintopay);
 			}
@@ -1704,9 +1710,9 @@ if ($resql) {
 			if (!empty($arrayfields['s.nom']['checked'])) {
 				print '<td class="tdoverflowmax200">';
 				if ($contextpage == 'poslist') {
-					print $thirdpartystatic->name;
+					print $companystatic->name;
 				} else {
-					print $thirdpartystatic->getNomUrl(1, 'customer');
+					print $companystatic->getNomUrl(1, 'customer');
 				}
 				print '</td>';
 				if (!$i) {
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index a9f17f5439b..7edc94a0a8c 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -297,7 +297,7 @@ if (empty($reshook)) {
  * View
  */
 
-$socstatic = new Societe($db);
+$companystatic = new Societe($db);
 $form = new Form($db);
 $formother = new FormOther($db);
 $formproject = new FormProjets($db);
@@ -330,12 +330,13 @@ if (count($listofprojectcontacttype) == 0) {
 }
 
 $distinct = 'DISTINCT'; // We add distinct until we are added a protection to be sure a contact of a project and task is only once.
-$sql = "SELECT ".$distinct." p.rowid as id, p.ref, p.title, p.fk_statut as status, p.fk_opp_status, p.public, p.fk_user_creat";
-$sql .= ", p.datec as date_creation, p.dateo as date_start, p.datee as date_end, p.opp_amount, p.opp_percent, (p.opp_amount*p.opp_percent/100) as opp_weighted_amount, p.tms as date_update, p.budget_amount ";
-$sql .= ",  p.usage_opportunity, p.usage_task, p.usage_bill_time, p.usage_organize_event";
-$sql .= ", accept_conference_suggestions, accept_booth_suggestions, price_registration, price_booth";
-$sql .= ", s.rowid as socid, s.nom as name, s.email";
-$sql .= ", cls.code as opp_status_code";
+$sql = "SELECT ".$distinct." p.rowid as id, p.ref, p.title, p.fk_statut as status, p.fk_opp_status, p.public, p.fk_user_creat,";
+$sql .= " p.datec as date_creation, p.dateo as date_start, p.datee as date_end, p.opp_amount, p.opp_percent, (p.opp_amount*p.opp_percent/100) as opp_weighted_amount, p.tms as date_update, p.budget_amount,";
+$sql .= " p.usage_opportunity, p.usage_task, p.usage_bill_time, p.usage_organize_event,";
+$sql .= " accept_conference_suggestions, accept_booth_suggestions, price_registration, price_booth,";
+$sql .= " s.rowid as socid, s.nom as name, s.name_alias as alias, s.email, s.email, s.phone, s.fax, s.address, s.town, s.zip, s.fk_pays, s.client, s.code_client,";
+$sql .= " country.code as country_code,";
+$sql .= " cls.code as opp_status_code";
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
@@ -355,6 +356,7 @@ if (is_array($extrafields->attributes[$object->table_element]['label']) && count
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (p.rowid = ef.fk_object)";
 }
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as country on (country.rowid = s.fk_pays)";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_lead_status as cls on p.fk_opp_status = cls.rowid";
 // We'll need this table joined to the select in order to filter by sale
 // No check is done on company permission because readability is managed by public status of project and assignement.
@@ -978,9 +980,17 @@ while ($i < min($num, $limit)) {
 
 	$userAccess = $object->restrictedProjectArea($user); // why this ?
 	if ($userAccess >= 0) {
-		$socstatic->id = $obj->socid;
-		$socstatic->name = $obj->name;
-		$socstatic->email = $obj->email;
+		$companystatic->id = $obj->socid;
+		$companystatic->name = $obj->name;
+		$companystatic->name_alias = $obj->alias;
+		$companystatic->client = $obj->client;
+		$companystatic->code_client = $obj->code_client;
+		$companystatic->email = $obj->email;
+		$companystatic->phone = $obj->phone;
+		$companystatic->address = $obj->address;
+		$companystatic->zip = $obj->zip;
+		$companystatic->town = $obj->town;
+		$companystatic->country_code = $obj->country_code;
 
 		print '<tr class="oddeven">';
 
@@ -1009,7 +1019,7 @@ while ($i < min($num, $limit)) {
 		if (!empty($arrayfields['s.nom']['checked'])) {
 			print '<td class="tdoverflowmax100">';
 			if ($obj->socid) {
-				print $socstatic->getNomUrl(1);
+				print $companystatic->getNomUrl(1);
 			} else {
 				print '&nbsp;';
 			}
@@ -1022,9 +1032,9 @@ while ($i < min($num, $limit)) {
 		if (!empty($arrayfields['commercial']['checked'])) {
 			print '<td>';
 			if ($obj->socid) {
-				$socstatic->id = $obj->socid;
-				$socstatic->name = $obj->name;
-				$listsalesrepresentatives = $socstatic->getSalesRepresentatives($user);
+				$companystatic->id = $obj->socid;
+				$companystatic->name = $obj->name;
+				$listsalesrepresentatives = $companystatic->getSalesRepresentatives($user);
 				$nbofsalesrepresentative = count($listsalesrepresentatives);
 				if ($nbofsalesrepresentative > 6) {
 					// We print only number

From ba0e95a4ff6ffa6b085628d1477c838e480597b5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 17 May 2021 23:47:16 +0200
Subject: [PATCH 0098/1497] FIX huntr CWE-79

---
 htdocs/core/lib/functions.lib.php | 22 ++++++----
 htdocs/main.inc.php               | 29 ++++++++++++-
 test/phpunit/SecurityTest.php     | 68 +++++++++++++++++++++----------
 3 files changed, 86 insertions(+), 33 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 8251c850ddf..a987cf03e4c 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -634,17 +634,17 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
 		$out = checkVal($out, $check, $filter, $options);
 	}
 
-	// Sanitizing for special parameters. There is no reason to allow the backtopage, backtolist or backtourl parameter to contains an external URL.
+	// Sanitizing for special parameters.
+	// Note: There is no reason to allow the backtopage, backtolist or backtourl parameter to contains an external URL.
 	if ($paramname == 'backtopage' || $paramname == 'backtolist' || $paramname == 'backtourl') {
-		$out = str_replace('\\', '/', $out);
-		$out = str_replace(array(':', ';', '@'), '', $out);
-
+		$out = str_replace('\\', '/', $out);					// Can be before the loop because only 1 char is replaced. No risk to get it after other replacements.
+		$out = str_replace(array(':', ';', '@'), '', $out);		// Can be before the loop because only 1 char is replaced. No risk to get it after other replacements.
 		do {
 			$oldstringtoclean = $out;
 			$out = str_ireplace(array('javascript', 'vbscript', '&colon', '&#'), '', $out);
 		} while ($oldstringtoclean != $out);
 
-		$out = preg_replace(array('/^[a-z]*\/\/+/i'), '', $out);
+		$out = preg_replace(array('/^[a-z]*\/\/+/i'), '', $out);	// We remove schema*// to remove external URL
 	}
 
 	// Code for search criteria persistence.
@@ -684,7 +684,7 @@ function GETPOSTINT($paramname, $method = 0, $filter = null, $options = null, $n
 }
 
 /**
- *  Return a value after checking on a rule.
+ *  Return a value after checking on a rule. A sanitization may also have been done.
  *
  *  @param  string  $out	     Value to check/clear.
  *  @param  string  $check	     Type of check/sanitizing
@@ -777,6 +777,11 @@ function checkVal($out = '', $check = 'alphanohtml', $filter = null, $options =
 		case 'restricthtml':		// Recommended for most html textarea
 			do {
 				$oldstringtoclean = $out;
+
+				// We replace chars encoded with numeric HTML entities with real char (to avoid to have numeric entities used for obfuscation of injections)
+				$out = preg_replace_callback('/&#(x?[0-9][0-9a-f]+);/i', 'realCharForNumericEntities', $out);
+				$out = preg_replace('/&#x?[0-9]+/i', '', $out);	// For example if we have j&#x61vascript with an entities without the ; to hide the 'a' of 'javascript'.
+
 				$out = dol_string_onlythesehtmltags($out, 0, 1, 1);
 
 				// We should also exclude non expected attributes
@@ -797,7 +802,6 @@ function checkVal($out = '', $check = 'alphanohtml', $filter = null, $options =
 }
 
 
-
 if (!function_exists('dol_getprefix')) {
 	/**
 	 *  Return a prefix to use for this Dolibarr instance, for session/cookie names or email id.
@@ -9738,8 +9742,8 @@ function dolGetButtonAction($label, $html = '', $actionType = 'default', $url =
 /**
  * Add space between dolGetButtonTitle
  *
- * @param string $moreClass more css class label
- * @return string html of title separator
+ * @param  string $moreClass 	more css class label
+ * @return string 				html of title separator
  */
 function dolGetButtonTitleSeparator($moreClass = "")
 {
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index c9a7dd21ccc..7b40647ebcb 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -50,9 +50,33 @@ if (!empty($_SERVER['MAIN_SHOW_TUNING_INFO'])) {
 	}
 }
 
+
+/**
+ * Return the real char for a numeric entities.
+ * This function is required by testSqlAndScriptInject().
+ *
+ * @param	string		$matches			String of numeric entity
+ * @return	string							New value
+ */
+function realCharForNumericEntities($matches)
+{
+	$newstringnumentity = $matches[1];
+
+	if (preg_match('/^x/i', $newstringnumentity)) {
+		$newstringnumentity = hexdec(preg_replace('/^x/i', '', $newstringnumentity));
+	}
+
+	// The numeric value we don't want as entities
+	if (($newstringnumentity >= 65 && $newstringnumentity <= 90) || ($newstringnumentity >= 97 && $newstringnumentity <= 122)) {
+		return chr((int) $newstringnumentity);
+	}
+
+	return '&#'.$matches[1];
+}
+
 /**
  * Security: WAF layer for SQL Injection and XSS Injection (scripts) protection (Filters on GET, POST, PHP_SELF).
- * Warning: Such a protection can't be enough. It is not reliable as it will alwyas be possible to bypass this. Good protection can
+ * Warning: Such a protection can't be enough. It is not reliable as it will always be possible to bypass this. Good protection can
  * only be guaranted by escaping data during output.
  *
  * @param		string		$val		Value brut found int $_GET, $_POST or PHP_SELF
@@ -61,7 +85,7 @@ if (!empty($_SERVER['MAIN_SHOW_TUNING_INFO'])) {
  */
 function testSqlAndScriptInject($val, $type)
 {
-	// Decode string first bcause a lot of things are obfuscated by encoding or multiple encoding.
+	// Decode string first because a lot of things are obfuscated by encoding or multiple encoding.
 	// So <svg o&#110;load='console.log(&quot;123&quot;)' become <svg onload='console.log(&quot;123&quot;)'
 	// So "&colon;&apos;" become ":'" (due to ENT_HTML5)
 	// Loop to decode until no more thing to decode.
@@ -69,6 +93,7 @@ function testSqlAndScriptInject($val, $type)
 	do {
 		$oldval = $val;
 		$val = html_entity_decode($val, ENT_QUOTES | ENT_HTML5);
+		$val = preg_replace_callback('/&#(x?[0-9][0-9a-f]+)/i', 'realCharForNumericEntities', $val);	// Sometimes we have entities without the ; at end so html_entity_decode does not work but entities is still interpreted by browser.
 	} while ($oldval != $val);
 	//print "after  decoding $val\n";
 
diff --git a/test/phpunit/SecurityTest.php b/test/phpunit/SecurityTest.php
index 5c5274c0437..bd4d0e9b76d 100644
--- a/test/phpunit/SecurityTest.php
+++ b/test/phpunit/SecurityTest.php
@@ -198,20 +198,29 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 		$result=testSqlAndScriptInject($test, 0);
 		$this->assertEquals($expectedresult, $result, 'Error on testSqlAndScriptInject expected 0b');
 
-		// Should detect XSS
+
+		// Should detect attack
 		$expectedresult=1;
 
 		$_SERVER["PHP_SELF"]='/DIR WITH SPACE/htdocs/admin/index.php/<svg>';
 		$result=testSqlAndScriptInject($_SERVER["PHP_SELF"], 2);
 		$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject for PHP_SELF that should detect XSS');
 
+		$test = 'j&#x61;vascript:';
+		$result=testSqlAndScriptInject($test, 0);
+		$this->assertEquals($expectedresult, $result, 'Error on testSqlAndScriptInject for javascript1. Should find an attack and did not.');
+
+		$test = 'j&#x61vascript:';
+		$result=testSqlAndScriptInject($test, 0);
+		$this->assertEquals($expectedresult, $result, 'Error on testSqlAndScriptInject for javascript2. Should find an attack and did not.');
+
 		$test = 'javascript&colon&#x3B;alert(1)';
 		$result=testSqlAndScriptInject($test, 0);
-		$this->assertEquals($expectedresult, $result, 'Error on testSqlAndScriptInject expected 1a');
+		$this->assertEquals($expectedresult, $result, 'Error on testSqlAndScriptInject for javascript2');
 
 		$test="<img src='1.jpg' onerror =javascript:alert('XSS')>";
 		$result=testSqlAndScriptInject($test, 0);
-		$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject aaa');
+		$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject aaa1');
 
 		$test="<img src='1.jpg' onerror =javascript:alert('XSS')>";
 		$result=testSqlAndScriptInject($test, 2);
@@ -328,9 +337,12 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 		$_POST["param10"]='is_object($object) ? ($object->id < 10 ? round($object->id / 2, 2) : (2 * $user->id) * (int) substr($mysoc->zip, 1, 2)) : \'<abc>objnotdefined\'';
 		$_POST["param11"]=' Name <email@email.com> ';
 		$_POST["param12"]='<!DOCTYPE html><html>aaa</html>';
+		$_POST["param13"]='&#110; &#x6E; &gt; &lt; &quot; <a href=\"j&#x61;vascript:alert(document.domain)\">XSS</a>';
+		$_POST["param13b"]='&#110; &#x6E; &gt; &lt; &quot; <a href=\"j&#x61vascript:alert(document.domain)\">XSS</a>';
 		//$_POST["param13"]='javascript%26colon%26%23x3B%3Balert(1)';
 		//$_POST["param14"]='javascripT&javascript#x3a alert(1)';
 
+
 		$result=GETPOST('id', 'int');              // Must return nothing
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($result, '');
@@ -343,7 +355,7 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($result, 333, 'Test on param1 with 3rd param = 2');
 
-		// Test alpha
+		// Test with alpha
 
 		$result=GETPOST("param2", 'alpha');
 		print __METHOD__." result=".$result."\n";
@@ -357,7 +369,7 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($result, 'dir');
 
-		// Test aZ09
+		// Test with aZ09
 
 		$result=GETPOST("param1", 'aZ09');
 		print __METHOD__." result=".$result."\n";
@@ -379,25 +391,22 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($_GET["param5"], $result);
 
-		$result=GETPOST("param6", 'alpha');
-		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('>', $result);
+		// Test with nohtml
 
 		$result=GETPOST("param6", 'nohtml');
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('">', $result);
 
-		$result=GETPOST("param6b");
+		// Test with alpha = alphanohtml. We must convert the html entities like &#110; and disable all entities
+
+		$result=GETPOST("param6", 'alphanohtml');
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('>', $result);
+
+		$result=GETPOST("param6b", 'alphanohtml');
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('abc', $result);
 
-		// With restricthtml we must remove html open/close tag and content but not htmlentities like &#110;
-
-		$result=GETPOST("param7", 'restricthtml');
-		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('"c:\this is a path~1\aaa&#110;" abcdef', $result);
-
-		// With alphanohtml, we must convert the html entities like &#110; and disable all entities
 		$result=GETPOST("param8a", 'alphanohtml');
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals("Hackersvg onload='console.log(123)'", $result);
@@ -434,24 +443,39 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals("Name", $result, 'Test an email string with alphanohtml');
 
+		$result=GETPOST("param13", 'alphanohtml');
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('n n > <  XSS', $result, 'Test that html entities are decoded with alpha');
+
+		// Test with alphawithlgt
+
 		$result=GETPOST("param11", 'alphawithlgt');
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals(trim($_POST["param11"]), $result, 'Test an email string with alphawithlgt');
 
+		// Test with restricthtml we must remove html open/close tag and content but not htmlentities (we can decode html entities for ascii chars like &#110;)
+
+		$result=GETPOST("param6", 'restricthtml');
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('&quot;&gt;', $result);
+
+		$result=GETPOST("param7", 'restricthtml');
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('"c:\this is a path~1\aaan" abcdef', $result);
+
 		$result=GETPOST("param12", 'restricthtml');
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals(trim($_POST["param12"]), $result, 'Test a string with DOCTYPE and restricthtml');
 
-		/*$result=GETPOST("param13", 'alphanohtml');
+		$result=GETPOST("param13", 'restricthtml');
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals(trim($_POST["param13"]), $result, 'Test a string and alphanohtml');
+		$this->assertEquals('n n &gt; &lt; &quot; <a href=\"alert(document.domain)\">XSS</a>', $result, 'Test that HTML entities are decoded with restricthtml, but only for common alpha chars');
 
-		$result=GETPOST("param14", 'alphanohtml');
+		$result=GETPOST("param13b", 'restricthtml');
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals(trim($_POST["param14"]), $result, 'Test a string and alphanohtml');
-		*/
+		$this->assertEquals('n n &gt; &lt; &quot; <a href=\"jvascript:alert(document.domain)\">XSS</a>', $result, 'Test that HTML entities are decoded with restricthtml, but only for common alpha chars');
 
-		// Special test for GETPOST of backtopage or backtolist parameter
+		// Special test for GETPOST of backtopage, backtolist or backtourl parameter
 
 		$_POST["backtopage"]='//www.google.com';
 		$result=GETPOST("backtopage");

From 6fe9fe330d8a2618801910e7c1f056fee10edfa3 Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Date: Mon, 17 May 2021 23:54:31 +0200
Subject: [PATCH 0099/1497] delete fetch

---
 htdocs/comm/propal/list.php    | 16 ++++++++++++++--
 htdocs/commande/list.php       | 22 +++++++++++++++++-----
 htdocs/compta/facture/list.php | 25 +++++++++++++++++++------
 3 files changed, 50 insertions(+), 13 deletions(-)

diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index f086616cada..656d15114b9 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -470,7 +470,7 @@ $sql .= ' p.datec as date_creation, p.tms as date_update, p.date_cloture as date
 $sql .= ' p.note_public, p.note_private,';
 $sql .= ' p.fk_cond_reglement,p.fk_mode_reglement,p.fk_shipping_method,p.fk_input_reason,';
 $sql .= " pr.rowid as project_id, pr.ref as project_ref, pr.title as project_label,";
-$sql .= ' u.login';
+$sql .= ' u.login, u.lastname, u.firstname, u.email, u.statut, u.entity, u.photo, u.office_phone, u.office_fax, u.user_mobile, u.job, u.gender';
 if (!$user->rights->societe->client->voir && !$socid) {
 	$sql .= ", sc.fk_soc, sc.fk_user";
 }
@@ -1692,7 +1692,19 @@ if ($resql) {
 			}
 		}
 
-		$userstatic->fetch($obj->fk_user_author);
+		$userstatic->id = $obj->fk_user_author;
+		$userstatic->login = $obj->login;
+		$userstatic->lastname = $obj->lastname;
+		$userstatic->firstname = $obj->firstname;
+		$userstatic->email = $obj->email;
+		$userstatic->statut = $obj->statut;
+		$userstatic->entity = $obj->entity;
+		$userstatic->photo = $obj->photo;
+		$userstatic->office_phone = $obj->office_phone;
+		$userstatic->office_fax = $obj->office_fax;
+		$userstatic->user_mobile = $obj->user_mobile;
+		$userstatic->job = $obj->job;
+		$userstatic->gender = $obj->gender;
 
 		// Author
 		if (!empty($arrayfields['u.login']['checked'])) {
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index e441f4e2a57..64d41039e93 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -424,10 +424,10 @@ $sql .= ' c.rowid, c.ref, c.total_ht, c.total_tva, c.total_ttc, c.ref_client, c.
 $sql .= ' c.fk_multicurrency, c.multicurrency_code, c.multicurrency_tx, c.multicurrency_total_ht, c.multicurrency_total_tva as multicurrency_total_vat, c.multicurrency_total_ttc,';
 $sql .= ' c.date_valid, c.date_commande, c.note_public, c.note_private, c.date_livraison as date_delivery, c.fk_statut, c.facture as billed,';
 $sql .= ' c.date_creation as date_creation, c.tms as date_update, c.date_cloture as date_cloture,';
-$sql .= " p.rowid as project_id, p.ref as project_ref, p.title as project_label,";
-$sql .= " u.login,";
-$sql .= ' c.fk_cond_reglement,c.fk_mode_reglement,c.fk_shipping_method';
-$sql .= ' ,c.fk_input_reason';
+$sql .= ' p.rowid as project_id, p.ref as project_ref, p.title as project_label,';
+$sql .= ' u.login, u.lastname, u.firstname, u.email, u.statut, u.entity, u.photo, u.office_phone, u.office_fax, u.user_mobile, u.job, u.gender,';
+$sql .= ' c.fk_cond_reglement,c.fk_mode_reglement,c.fk_shipping_method,';
+$sql .= ' c.fk_input_reason';
 if ($search_categ_cus) {
 	$sql .= ", cc.fk_categorie, cc.fk_soc";
 }
@@ -1667,7 +1667,19 @@ if ($resql) {
 			}
 		}
 
-		$userstatic->fetch($obj->fk_user_author);
+		$userstatic->id = $obj->fk_user_author;
+		$userstatic->login = $obj->login;
+		$userstatic->lastname = $obj->lastname;
+		$userstatic->firstname = $obj->firstname;
+		$userstatic->email = $obj->email;
+		$userstatic->statut = $obj->statut;
+		$userstatic->entity = $obj->entity;
+		$userstatic->photo = $obj->photo;
+		$userstatic->office_phone = $obj->office_phone;
+		$userstatic->office_fax = $obj->office_fax;
+		$userstatic->user_mobile = $obj->user_mobile;
+		$userstatic->job = $obj->job;
+		$userstatic->gender = $obj->gender;
 
 		// Author
 		if (!empty($arrayfields['u.login']['checked'])) {
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index f60cec54cbb..fa703336a84 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -482,11 +482,11 @@ $sql .= ' f.paye as paye, f.fk_statut, f.close_code,';
 $sql .= ' f.datec as date_creation, f.tms as date_update, f.date_closing as date_closing,';
 $sql .= ' f.retained_warranty, f.retained_warranty_date_limit, f.situation_final, f.situation_cycle_ref, f.situation_counter,';
 $sql .= ' s.rowid as socid, s.nom as name, s.name_alias as name_alias, s.email, s.town, s.zip, s.fk_pays, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta as code_compta_client, s.code_compta_fournisseur,';
-$sql .= " typent.code as typent_code,";
-$sql .= " state.code_departement as state_code, state.nom as state_name,";
-$sql .= " country.code as country_code,";
-$sql .= " p.rowid as project_id, p.ref as project_ref, p.title as project_label,";
-$sql .= " u.login";
+$sql .= ' typent.code as typent_code,';
+$sql .= ' state.code_departement as state_code, state.nom as state_name,';
+$sql .= ' country.code as country_code,';
+$sql .= ' p.rowid as project_id, p.ref as project_ref, p.title as project_label,';
+$sql .= ' u.login, u.lastname, u.firstname, u.email, u.statut, u.entity, u.photo, u.office_phone, u.office_fax, u.user_mobile, u.job, u.gender';
 // We need dynamount_payed to be able to sort on status (value is surely wrong because we can count several lines several times due to other left join or link with contacts. But what we need is just 0 or > 0)
 // TODO Better solution to be able to sort on already payed or remain to pay is to store amount_payed in a denormalized field.
 if (!$sall) {
@@ -1878,9 +1878,22 @@ if ($resql) {
 				$totalarray['val']['f.total_ttc'] += $obj->total_ttc;
 			}
 
+			$userstatic->id = $obj->fk_user_author;
+			$userstatic->login = $obj->login;
+			$userstatic->lastname = $obj->lastname;
+			$userstatic->firstname = $obj->firstname;
+			$userstatic->email = $obj->email;
+			$userstatic->statut = $obj->statut;
+			$userstatic->entity = $obj->entity;
+			$userstatic->photo = $obj->photo;
+			$userstatic->office_phone = $obj->office_phone;
+			$userstatic->office_fax = $obj->office_fax;
+			$userstatic->user_mobile = $obj->user_mobile;
+			$userstatic->job = $obj->job;
+			$userstatic->gender = $obj->gender;
+
 			// Author
 			if (!empty($arrayfields['u.login']['checked'])) {
-				$userstatic->fetch($obj->fk_user_author);
 				print '<td>';
 				if ($userstatic->id) {
 					print $userstatic->getNomUrl(-1);

From b6dbe45242a1b1e9303b6103bf68e53535b85ad5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 18 May 2021 01:58:54 +0200
Subject: [PATCH 0100/1497] Fix permissions on page to move position of file

---
 htdocs/adherents/document.php                 |  2 ++
 htdocs/asset/document.php                     | 14 ++++++-----
 htdocs/bom/bom_document.php                   |  2 ++
 htdocs/comm/action/document.php               |  2 ++
 htdocs/comm/propal/document.php               |  2 ++
 htdocs/commande/document.php                  | 14 ++++++-----
 htdocs/compta/facture/document.php            |  2 ++
 htdocs/core/actions_linkedfiles.inc.php       | 11 +++++----
 htdocs/core/ajax/row.php                      | 24 +++++++++++++------
 htdocs/core/lib/security.lib.php              |  2 +-
 .../template/myobject_document.php            |  2 +-
 htdocs/product/document.php                   |  4 ++--
 htdocs/projet/document.php                    | 10 ++++----
 htdocs/societe/document.php                   |  1 +
 htdocs/ticket/agenda.php                      |  5 +---
 htdocs/ticket/card.php                        |  4 ++--
 htdocs/ticket/contact.php                     | 23 ++++++++++++++----
 htdocs/ticket/document.php                    | 20 ++++++++++++----
 htdocs/ticket/messaging.php                   |  9 +++----
 19 files changed, 98 insertions(+), 55 deletions(-)

diff --git a/htdocs/adherents/document.php b/htdocs/adherents/document.php
index 5150bea861e..f2a7c6f3f55 100644
--- a/htdocs/adherents/document.php
+++ b/htdocs/adherents/document.php
@@ -93,6 +93,8 @@ if ($id) {
 	$caneditfieldmember = $user->rights->adherent->creer;
 }
 
+$permissiontoadd = $canaddmember;
+
 // Security check
 $result = restrictedArea($user, 'adherent', $object->id, '', '', 'socid', 'rowid', 0);
 
diff --git a/htdocs/asset/document.php b/htdocs/asset/document.php
index e6f5ed9b353..91e46269994 100644
--- a/htdocs/asset/document.php
+++ b/htdocs/asset/document.php
@@ -40,12 +40,6 @@ $socid = GETPOST('socid', 'int');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 
-// Security check
-if ($user->socid) {
-	$socid = $user->socid;
-}
-$result=restrictedArea($user, 'asset', $id, '');
-
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
@@ -69,6 +63,14 @@ if ($object->fetch($id)) {
 	$upload_dir = $conf->asset->dir_output."/".dol_sanitizeFileName($object->ref);
 }
 
+$permissiontoadd = $user->rights->asset->write; // Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles.inc.php
+
+// Security check
+if ($user->socid) {
+	$socid = $user->socid;
+}
+$result=restrictedArea($user, 'asset', $id, '');
+
 
 /*
  * Actions
diff --git a/htdocs/bom/bom_document.php b/htdocs/bom/bom_document.php
index c0196670cfb..e59b22c45b2 100644
--- a/htdocs/bom/bom_document.php
+++ b/htdocs/bom/bom_document.php
@@ -85,6 +85,8 @@ if ($id > 0 || !empty($ref)) {
 $isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 restrictedArea($user, 'bom', $object->id, 'bom_bom', '', '', 'rowid', $isdraft);
 
+$permissiontoadd = $user->rights->bom->write; // Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles.inc.php
+
 
 /*
  * Actions
diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php
index f521fa2ab59..c55d4e114cc 100644
--- a/htdocs/comm/action/document.php
+++ b/htdocs/comm/action/document.php
@@ -88,6 +88,8 @@ if ($user->socid && $socid) {
 	$result = restrictedArea($user, 'societe', $socid);
 }
 
+$permissiontoadd = $user->rights->agenda->myactions->read; // Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles.inc.php
+
 
 /*
  * Actions
diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php
index 4e592c8371e..2b21c545c63 100644
--- a/htdocs/comm/propal/document.php
+++ b/htdocs/comm/propal/document.php
@@ -80,6 +80,8 @@ if (!$sortfield) {
 $object = new Propal($db);
 $object->fetch($id, $ref);
 
+$permissiontoadd = $user->rights->propale->creer;
+
 // Security check
 if (!empty($user->socid)) {
 	$socid = $user->socid;
diff --git a/htdocs/commande/document.php b/htdocs/commande/document.php
index b4dddc9a1bf..c289112ee9f 100644
--- a/htdocs/commande/document.php
+++ b/htdocs/commande/document.php
@@ -44,12 +44,6 @@ $confirm	= GETPOST('confirm');
 $id			= GETPOST('id', 'int');
 $ref		= GETPOST('ref');
 
-// Security check
-if ($user->socid) {
-	$socid = $user->socid;
-}
-$result = restrictedArea($user, 'commande', $id, '');
-
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
@@ -78,6 +72,14 @@ if (!$sortfield) {
 
 $object = new Commande($db);
 
+$permissiontoadd = $user->rights->commande->creer;
+
+// Security check
+if ($user->socid) {
+	$socid = $user->socid;
+}
+$result = restrictedArea($user, 'commande', $id, '');
+
 
 /*
  * Actions
diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php
index 664b84d4444..16cdee4ac53 100644
--- a/htdocs/compta/facture/document.php
+++ b/htdocs/compta/facture/document.php
@@ -72,6 +72,8 @@ if ($object->fetch($id, $ref)) {
 	$upload_dir = $conf->facture->dir_output."/".dol_sanitizeFileName($object->ref);
 }
 
+$permissiontoadd = $user->rights->facture->creer;
+
 // Security check
 if ($user->socid) {
 	$socid = $user->socid;
diff --git a/htdocs/core/actions_linkedfiles.inc.php b/htdocs/core/actions_linkedfiles.inc.php
index 13814511297..750ed2b2d9a 100644
--- a/htdocs/core/actions_linkedfiles.inc.php
+++ b/htdocs/core/actions_linkedfiles.inc.php
@@ -21,13 +21,14 @@
 // Variable $upload_dir must be defined when entering here.
 // Variable $upload_dirold may also exists.
 // Variable $confirm must be defined.
+// If variable $permissiontoadd is defined, we check it is true. Note: A test on permission should already have been done into the restrictedArea() method called by parent page.
 
 //var_dump($upload_dir);
 //var_dump($upload_dirold);
 
 
 // Submit file/link
-if (GETPOST('sendit', 'alpha') && !empty($conf->global->MAIN_UPLOAD_DOC)) {
+if (GETPOST('sendit', 'alpha') && !empty($conf->global->MAIN_UPLOAD_DOC) && (!isset($permissiontoadd) || $permissiontoadd)) {
 	if (!empty($_FILES)) {
 		if (is_array($_FILES['userfile']['tmp_name'])) {
 			$userfiles = $_FILES['userfile']['tmp_name'];
@@ -65,7 +66,7 @@ if (GETPOST('sendit', 'alpha') && !empty($conf->global->MAIN_UPLOAD_DOC)) {
 			}
 		}
 	}
-} elseif (GETPOST('linkit', 'restricthtml') && !empty($conf->global->MAIN_UPLOAD_DOC)) {
+} elseif (GETPOST('linkit', 'restricthtml') && !empty($conf->global->MAIN_UPLOAD_DOC) && (!isset($permissiontoadd) || $permissiontoadd)) {
 	$link = GETPOST('link', 'alpha');
 	if ($link) {
 		if (substr($link, 0, 7) != 'http://' && substr($link, 0, 8) != 'https://' && substr($link, 0, 7) != 'file://' && substr($link, 0, 7) != 'davs://') {
@@ -77,7 +78,7 @@ if (GETPOST('sendit', 'alpha') && !empty($conf->global->MAIN_UPLOAD_DOC)) {
 
 
 // Delete file/link
-if ($action == 'confirm_deletefile' && $confirm == 'yes') {
+if ($action == 'confirm_deletefile' && $confirm == 'yes' && (!isset($permissiontoadd) || $permissiontoadd)) {
 	$urlfile = GETPOST('urlfile', 'alpha', 0, null, null, 1); // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
 	if (GETPOST('section', 'alpha')) {
 		// For a delete from the ECM module, upload_dir is ECM root dir and urlfile contains relative path from upload_dir
@@ -149,7 +150,7 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes') {
 			exit;
 		}
 	}
-} elseif ($action == 'confirm_updateline' && GETPOST('save', 'alpha') && GETPOST('link', 'alpha')) {
+} elseif ($action == 'confirm_updateline' && GETPOST('save', 'alpha') && GETPOST('link', 'alpha') && (!isset($permissiontoadd) || $permissiontoadd)) {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
 	$langs->load('link');
 	$link = new Link($db);
@@ -167,7 +168,7 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes') {
 	} else {
 		//error fetching
 	}
-} elseif ($action == 'renamefile' && GETPOST('renamefilesave', 'alpha')) {
+} elseif ($action == 'renamefile' && GETPOST('renamefilesave', 'alpha') && (!isset($permissiontoadd) || $permissiontoadd)) {
 	// For documents pages, upload_dir contains already path to file from module dir, so we clean path into urlfile.
 	if (!empty($upload_dir)) {
 		$filenamefrom = dol_sanitizeFileName(GETPOST('renamefilefrom', 'alpha'), '_', 0); // Do not remove accents
diff --git a/htdocs/core/ajax/row.php b/htdocs/core/ajax/row.php
index 4662c3a1406..96dc792938f 100644
--- a/htdocs/core/ajax/row.php
+++ b/htdocs/core/ajax/row.php
@@ -49,6 +49,9 @@ if (!defined('NOREQUIRETRAN')) {
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/genericobject.class.php';
 
+// Security check
+// This is done later into view.
+
 
 /*
  * View
@@ -59,16 +62,16 @@ top_httphead();
 print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
 // Registering the location of boxes
-if (GETPOST('roworder', 'alpha', 2) && GETPOST('table_element_line', 'aZ09', 2)
-	&& GETPOST('fk_element', 'aZ09', 2) && GETPOST('element_id', 'int', 2)) {
-	$roworder = GETPOST('roworder', 'alpha', 2);
-	$table_element_line = GETPOST('table_element_line', 'aZ09', 2);
-	$fk_element = GETPOST('fk_element', 'aZ09', 2);
-	$element_id = GETPOST('element_id', 'int', 2);
+if (GETPOST('roworder', 'alpha', 3) && GETPOST('table_element_line', 'aZ09', 3)
+	&& GETPOST('fk_element', 'aZ09', 3) && GETPOST('element_id', 'int', 3)) {
+	$roworder = GETPOST('roworder', 'alpha', 3);
+	$table_element_line = GETPOST('table_element_line', 'aZ09', 3);
+	$fk_element = GETPOST('fk_element', 'aZ09', 3);
+	$element_id = GETPOST('element_id', 'int', 3);
 
 	dol_syslog("AjaxRow roworder=".$roworder." table_element_line=".$table_element_line." fk_element=".$fk_element." element_id=".$element_id, LOG_DEBUG);
 
-	// Make test on pemrission
+	// Make test on permission
 	$perm = 0;
 	if ($table_element_line == 'propaldet' && $user->rights->propal->creer) {
 		$perm = 1;
@@ -92,6 +95,10 @@ if (GETPOST('roworder', 'alpha', 2) && GETPOST('table_element_line', 'aZ09', 2)
 		$perm = 1;
 	} elseif ($table_element_line == 'facture_fourn_det' && $user->rights->fourn->facture->creer) {
 		$perm = 1;
+	} elseif ($table_element_line == 'ecm_files' && $fk_element == 'fk_product' && (!empty($user->rights->produit->creer) || !empty($user->rights->service->creer))) {
+		$perm = 1;
+	} elseif ($table_element_line == 'ecm_files' && $fk_element == 'fk_ticket' && !empty($user->rights->ticket->write)) {
+		$perm = 1;
 	} else {
 		$tmparray = explode('_', $table_element_line);
 		$tmpmodule = $tmparray[0]; $tmpobject = preg_replace('/line$/', '', $tmparray[1]);
@@ -101,7 +108,10 @@ if (GETPOST('roworder', 'alpha', 2) && GETPOST('table_element_line', 'aZ09', 2)
 	}
 
 	if (! $perm) {
+		// We should not be here. If we are not allowed to reorder rows, feature should not be visible on script.
+		// If we are here, it is a hack attempt, so we report a warning.
 		print 'Bad permission to modify position of lines for object in table '.$table_element_line;
+		dol_syslog('Bad permission to modify position of lines for object in table '.$table_element_line.', fk_element '.$fk_element, LOG_WARNING);
 		accessforbidden('Bad permission to modify position of lines for object in table '.$table_element_line);
 	}
 
diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index 1440a02983f..de4d67b1647 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -350,7 +350,7 @@ function restrictedArea($user, $features, $objectid = 0, $tableandshare = '', $f
 	// Check write permission from module (we need to know write permission to create but also to delete drafts record or to upload files)
 	$createok = 1;
 	$nbko = 0;
-	$wemustcheckpermissionforcreate = (GETPOST('sendit', 'alpha') || GETPOST('linkit', 'alpha') || GETPOST('action', 'aZ09') == 'create' || GETPOST('action', 'aZ09') == 'update');
+	$wemustcheckpermissionforcreate = (GETPOST('sendit', 'alpha') || GETPOST('linkit', 'alpha') || GETPOST('action', 'aZ09') == 'create' || GETPOST('action', 'aZ09') == 'update') || GETPOST('roworder', 'alpha', 2);
 	$wemustcheckpermissionfordeletedraft = ((GETPOST("action", "aZ09") == 'confirm_delete' && GETPOST("confirm", "aZ09") == 'yes') || GETPOST("action", "aZ09") == 'delete');
 
 	if ($wemustcheckpermissionforcreate || $wemustcheckpermissionfordeletedraft) {
diff --git a/htdocs/modulebuilder/template/myobject_document.php b/htdocs/modulebuilder/template/myobject_document.php
index 8598cc3dd18..e3fa6390e93 100644
--- a/htdocs/modulebuilder/template/myobject_document.php
+++ b/htdocs/modulebuilder/template/myobject_document.php
@@ -124,7 +124,7 @@ if ($id > 0 || !empty($ref)) {
 	$upload_dir = $conf->mymodule->multidir_output[$object->entity ? $object->entity : $conf->entity]."/myobject/".get_exdir(0, 0, 0, 1, $object);
 }
 
-$permissiontoadd = $user->rights->mymodule->myobject->write; // Used by the include of actions_addupdatedelete.inc.php
+$permissiontoadd = $user->rights->mymodule->myobject->write; // Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles.inc.php
 
 // Security check (enable the most restrictive one)
 //if ($user->socid > 0) accessforbidden();
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index af44521dc05..372e3c19bdc 100644
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -113,7 +113,7 @@ if ($reshook < 0) {
 if (empty($reshook)) {
 	// Delete line if product propal merge is linked to a file
 	if (!empty($conf->global->PRODUIT_PDF_MERGE_PROPAL)) {
-		if ($action == 'confirm_deletefile' && $confirm == 'yes') {
+		if ($action == 'confirm_deletefile' && $confirm == 'yes' && $permissiontoadd) {
 			//extract file name
 			$urlfile = GETPOST('urlfile', 'alpha');
 			$filename = basename($urlfile);
@@ -131,7 +131,7 @@ if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
 }
 
-if ($action == 'filemerge') {
+if ($action == 'filemerge' && $permissiontoadd) {
 	$is_refresh = GETPOST('refresh');
 	if (empty($is_refresh)) {
 		$filetomerge_file_array = GETPOST('filetoadd');
diff --git a/htdocs/projet/document.php b/htdocs/projet/document.php
index 3f9ec04d437..6bb905d6696 100644
--- a/htdocs/projet/document.php
+++ b/htdocs/projet/document.php
@@ -40,11 +40,6 @@ $ref		= GETPOST('ref', 'alpha');
 $mine 		= (GETPOST('mode', 'alpha') == 'mine' ? 1 : 0);
 //if (! $user->rights->projet->all->lire) $mine=1;	// Special for projects
 
-// Security check
-$socid = 0;
-//if ($user->socid > 0) $socid = $user->socid;    // For external user, no check is done on company because readability is managed by public status of project and assignement.
-$result = restrictedArea($user, 'projet', $id, 'projet&project');
-
 $object = new Project($db);
 
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once
@@ -82,6 +77,11 @@ if (!$sortfield) {
 	$sortfield = "name";
 }
 
+// Security check
+$socid = 0;
+//if ($user->socid > 0) $socid = $user->socid;    // For external user, no check is done on company because readability is managed by public status of project and assignement.
+$result = restrictedArea($user, 'projet', $id, 'projet&project');
+
 
 
 /*
diff --git a/htdocs/societe/document.php b/htdocs/societe/document.php
index 4ed26f67018..653069882e0 100644
--- a/htdocs/societe/document.php
+++ b/htdocs/societe/document.php
@@ -76,6 +76,7 @@ if ($id > 0 || !empty($ref)) {
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('thirdpartydocument', 'globalcard'));
 
+$permissiontoadd = $user->rights->societe->creer; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
 
 // Security check
 if ($user->socid > 0) {
diff --git a/htdocs/ticket/agenda.php b/htdocs/ticket/agenda.php
index 9bf6cbc13c4..fee91e959aa 100644
--- a/htdocs/ticket/agenda.php
+++ b/htdocs/ticket/agenda.php
@@ -81,12 +81,9 @@ if (!$action) {
 // Security check
 $id = GETPOST("id", 'int');
 $socid = 0;
-//if ($user->socid > 0) $socid = $user->socid;    // For external user, no check is done on company because readability is managed by public status of project and assignement.
+if ($user->socid > 0) $socid = $user->socid;
 $result = restrictedArea($user, 'ticket', $id, '');
 
-if (!$user->rights->ticket->read) {
-	accessforbidden();
-}
 // restrict access for externals users
 if ($user->socid > 0 && ($object->fk_soc != $user->socid)) {
 	accessforbidden();
diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index c4c637754b4..5e2ef1e804b 100644
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -112,8 +112,8 @@ if ($id || $track_id || $ref) {
 $url_page_current = DOL_URL_ROOT.'/ticket/card.php';
 
 // Security check - Protection if external user
-//if ($user->socid > 0) accessforbidden();
-//if ($user->socid > 0) $socid = $user->socid;
+$socid = 0;
+if ($user->socid > 0) $socid = $user->socid;
 $result = restrictedArea($user, 'ticket', $object->id);
 
 $triggermodname = 'TICKET_MODIFY';
diff --git a/htdocs/ticket/contact.php b/htdocs/ticket/contact.php
index 7e04dd12104..8d450ffb44b 100644
--- a/htdocs/ticket/contact.php
+++ b/htdocs/ticket/contact.php
@@ -50,11 +50,6 @@ $source = GETPOST('source', 'alpha');
 $ligne = GETPOST('ligne', 'int');
 $lineid = GETPOST('lineid', 'int');
 
-// Protection if external user
-if ($user->socid > 0) {
-	$socid = $user->socid;
-	accessforbidden();
-}
 
 // Store current page url
 $url_page_current = dol_buildpath('/ticket/contact.php', 1);
@@ -62,6 +57,24 @@ $url_page_current = dol_buildpath('/ticket/contact.php', 1);
 $object = new Ticket($db);
 
 
+$permissiontoadd = $user->rights->ticket->write;
+
+// Security check
+$id = GETPOST("id", 'int');
+$socid = 0;
+if ($user->socid > 0) $socid = $user->socid;
+$result = restrictedArea($user, 'ticket', $object->id, '');
+
+// restrict access for externals users
+if ($user->socid > 0 && ($object->fk_soc != $user->socid)) {
+	accessforbidden();
+}
+// or for unauthorized internals users
+if (!$user->socid && (!empty($conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY) && $object->fk_user_assign != $user->id) && !$user->rights->ticket->manage) {
+	accessforbidden();
+}
+
+
 /*
  * Actions
  */
diff --git a/htdocs/ticket/document.php b/htdocs/ticket/document.php
index 5e4d80cd8be..8edd2787c44 100644
--- a/htdocs/ticket/document.php
+++ b/htdocs/ticket/document.php
@@ -43,11 +43,6 @@ $track_id = GETPOST('track_id', 'alpha');
 $action   = GETPOST('action', 'alpha');
 $confirm  = GETPOST('confirm', 'alpha');
 
-// Security check
-if (!$user->rights->ticket->read) {
-	accessforbidden();
-}
-
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
@@ -75,6 +70,21 @@ if ($result < 0) {
 	$upload_dir = $conf->ticket->dir_output."/".dol_sanitizeFileName($object->ref);
 }
 
+$permissiontoadd = $user->rights->ticket->write;
+
+// Security check - Protection if external user
+$result = restrictedArea($user, 'ticket', $object->id);
+
+// restrict access for externals users
+if ($user->socid > 0 && ($object->fk_soc != $user->socid)) {
+	accessforbidden();
+}
+// or for unauthorized internals users
+if (!$user->socid && ($conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY && $object->fk_user_assign != $user->id) && !$user->rights->ticket->manage) {
+	accessforbidden();
+}
+
+
 
 /*
  * Actions
diff --git a/htdocs/ticket/messaging.php b/htdocs/ticket/messaging.php
index c3e70def7da..68615424abf 100644
--- a/htdocs/ticket/messaging.php
+++ b/htdocs/ticket/messaging.php
@@ -76,16 +76,14 @@ if (!$action) {
 	$action = 'view';
 }
 
+$permissiontoadd = $user->rights->ticket->write;
 
 // Security check
 $id = GETPOST("id", 'int');
 $socid = 0;
-//if ($user->socid > 0) $socid = $user->socid;    // For external user, no check is done on company because readability is managed by public status of project and assignement.
-$result = restrictedArea($user, 'ticket', $id, '');
+if ($user->socid > 0) $socid = $user->socid;
+$result = restrictedArea($user, 'ticket', $object->id, '');
 
-if (!$user->rights->ticket->read) {
-	accessforbidden();
-}
 // restrict access for externals users
 if ($user->socid > 0 && ($object->fk_soc != $user->socid)) {
 	accessforbidden();
@@ -96,7 +94,6 @@ if (!$user->socid && (!empty($conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY) &&
 }
 
 
-
 /*
  * Actions
  */

From f51e892a97a70c224fe37061ef46a4921ca660e8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 18 May 2021 02:06:35 +0200
Subject: [PATCH 0101/1497] Fix phpcs

---
 htdocs/admin/dict.php                 | 28 +++++++++++++--------------
 htdocs/user/class/api_users.class.php |  6 +++---
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 2004ccf86b9..d03574d473b 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -869,13 +869,13 @@ if (GETPOST('actionadd') || GETPOST('actionmodify')) {
 				$keycode = $value;
 			}
 
-            if ($value == 'price' || preg_match('/^amount/i', $value)) {
-            	$_POST[$keycode] = price2num(GETPOST($keycode), 'MU');
-            } elseif ($value == 'taux' || $value == 'localtax1') {
-            	$_POST[$keycode] = price2num(GETPOST($keycode), 8);	// Note that localtax2 can be a list of rates separated by coma like X:Y:Z
-            } elseif ($value == 'entity') {
-            	$_POST[$keycode] = getEntity($tabname[$id]);
-            }
+			if ($value == 'price' || preg_match('/^amount/i', $value)) {
+				$_POST[$keycode] = price2num(GETPOST($keycode), 'MU');
+			} elseif ($value == 'taux' || $value == 'localtax1') {
+				$_POST[$keycode] = price2num(GETPOST($keycode), 8);	// Note that localtax2 can be a list of rates separated by coma like X:Y:Z
+			} elseif ($value == 'entity') {
+				$_POST[$keycode] = getEntity($tabname[$id]);
+			}
 
 			if ($i) {
 				$sql .= ",";
@@ -938,13 +938,13 @@ if (GETPOST('actionadd') || GETPOST('actionmodify')) {
 				$keycode = $field;
 			}
 
-            if ($field == 'price' || preg_match('/^amount/i', $field)) {
-            	$_POST[$keycode] = price2num(GETPOST($keycode), 'MU');
-            } elseif ($field == 'taux' || $field == 'localtax1') {
-            	$_POST[$keycode] = price2num(GETPOST($keycode), 8);	// Note that localtax2 can be a list of rates separated by coma like X:Y:Z
-            } elseif ($field == 'entity') {
-            	$_POST[$keycode] = getEntity($tabname[$id]);
-            }
+			if ($field == 'price' || preg_match('/^amount/i', $field)) {
+				$_POST[$keycode] = price2num(GETPOST($keycode), 'MU');
+			} elseif ($field == 'taux' || $field == 'localtax1') {
+				$_POST[$keycode] = price2num(GETPOST($keycode), 8);	// Note that localtax2 can be a list of rates separated by coma like X:Y:Z
+			} elseif ($field == 'entity') {
+				$_POST[$keycode] = getEntity($tabname[$id]);
+			}
 
 			if ($i) {
 				$sql .= ",";
diff --git a/htdocs/user/class/api_users.class.php b/htdocs/user/class/api_users.class.php
index a21db2b521b..e760997f3c8 100644
--- a/htdocs/user/class/api_users.class.php
+++ b/htdocs/user/class/api_users.class.php
@@ -48,7 +48,7 @@ class Users extends DolibarrApi
 	public function __construct()
 	{
 		global $db, $conf;
-		
+
 		$this->db = $db;
 		$this->useraccount = new User($this->db);
 	}
@@ -73,8 +73,8 @@ class Users extends DolibarrApi
 		global $conf;
 
 		if (empty(DolibarrApiAccess::$user->rights->user->user->lire) && empty(DolibarrApiAccess::$user->admin)) {
-	        throw new RestException(401, "You are not allowed to read list of users");
-	    }
+			throw new RestException(401, "You are not allowed to read list of users");
+		}
 
 		$obj_ret = array();
 

From 9b0988e7bed846e947a0ff48abc016ee091445dc Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Tue, 18 May 2021 08:40:28 +0200
Subject: [PATCH 0102/1497] FIX Social contrib. - Missing language file

---
 htdocs/compta/sociales/list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/compta/sociales/list.php b/htdocs/compta/sociales/list.php
index 2b0c3961759..db754390e5e 100644
--- a/htdocs/compta/sociales/list.php
+++ b/htdocs/compta/sociales/list.php
@@ -38,7 +38,7 @@ if (!empty($conf->projet->enabled)) {
 }
 
 // Load translation files required by the page
-$langs->loadLangs(array('compta', 'banks', 'bills', 'hrm'));
+$langs->loadLangs(array('compta', 'banks', 'bills', 'hrm', 'projects'));
 
 $action				= GETPOST('action', 'aZ09');
 $massaction			= GETPOST('massaction', 'alpha');

From 078fc892a2b07a871a33c4bd01cc31f07027ca79 Mon Sep 17 00:00:00 2001
From: Gauthier PC portable 024 <gauthier.verdol@atm-consulting.fr>
Date: Tue, 18 May 2021 09:01:55 +0200
Subject: [PATCH 0103/1497] FIX : cast int

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

diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index 19dd7b59b3b..31fd0ea3152 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -288,7 +288,7 @@ if (!$user->rights->societe->client->voir && empty($socid)) {
 	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 }
 if ($socid) {
-	$sql .= " AND s.rowid = ".$socid;
+	$sql .= " AND s.rowid = ".((int) $socid);
 }
 if ($sall) {
 	$sql .= natural_search(array_keys($fieldstosearchall), $sall);

From 2771d50ffec7712f3b4977363d433905e9a4c190 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 18 May 2021 11:55:56 +0200
Subject: [PATCH 0104/1497] code comment

---
 htdocs/product/stock/replenish.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index fe16aca2783..48d8bf2033d 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -66,7 +66,7 @@ $fourn_id = GETPOST('fourn_id', 'int');
 $fk_supplier = GETPOST('fk_supplier', 'int');
 $fk_entrepot = GETPOST('fk_entrepot', 'int');
 
-//List all visible warehouses
+// List all visible warehouses
 $resWar = $db->query("SELECT rowid FROM " . MAIN_DB_PREFIX . "entrepot WHERE entity IN (" . $db->sanitize(getEntity('stock')) .")");
 $listofqualifiedwarehousesid = "";
 $count = 0;
@@ -103,6 +103,7 @@ if (!$sortorder) {
 	$sortorder = 'ASC';
 }
 
+// Define virtualdiffersfromphysical
 $virtualdiffersfromphysical = 0;
 if (!empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT)
 	|| !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER)

From 6170b28c3b1419468bbb9dd05c18b057d3cf0af8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 18 May 2021 11:58:49 +0200
Subject: [PATCH 0105/1497] FIx #17651

---
 htdocs/product/stock/replenish.php | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index 5d8e1f4a790..d316d6cdf98 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -48,7 +48,7 @@ $hookmanager->initHooks(array('stockreplenishlist'));
 
 //checks if a product has been ordered
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $sref = GETPOST('sref', 'alpha');
 $snom = GETPOST('snom', 'alpha');
 $sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
@@ -308,7 +308,7 @@ if (!empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE) && $fk_entre
 
 
 $sql = 'SELECT p.rowid, p.ref, p.label, p.description, p.price,';
-$sql .= ' p.price_ttc, p.price_base_type,p.fk_product_type,';
+$sql .= ' p.price_ttc, p.price_base_type, p.fk_product_type,';
 $sql .= ' p.tms as datem, p.duration, p.tobuy,';
 $sql .= ' p.desiredstock, p.seuil_stock_alerte,';
 if (!empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE) && $fk_entrepot > 0) {
@@ -326,11 +326,8 @@ $sql .= $hookmanager->resPrint;
 $sql .= ' FROM '.MAIN_DB_PREFIX.'product as p';
 $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_stock as s ON p.rowid = s.fk_product';
 $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'entrepot AS ent ON s.fk_entrepot = ent.rowid AND ent.entity IN('.getEntity('stock').')';
-if ($fk_supplier > 0) {
-	$sql .= ' INNER JOIN '.MAIN_DB_PREFIX.'product_fournisseur_price pfp ON (pfp.fk_product = p.rowid AND pfp.fk_soc = '.$fk_supplier.')';
-}
 if (!empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE) && $fk_entrepot > 0) {
-	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_warehouse_properties AS pse ON (p.rowid = pse.fk_product AND pse.fk_entrepot = '.$fk_entrepot.')';
+	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_warehouse_properties AS pse ON (p.rowid = pse.fk_product AND pse.fk_entrepot = '.((int) $fk_entrepot).')';
 }
 
 // Add fields from hooks
@@ -352,6 +349,9 @@ if ($sref) $sql .= natural_search('p.ref', $sref);
 if ($snom) $sql .= natural_search('p.label', $snom);
 $sql .= ' AND p.tobuy = 1';
 if (!empty($canvas)) $sql .= ' AND p.canvas = "'.$db->escape($canvas).'"';
+if ($fk_supplier > 0) {
+	$sql .= ' AND EXISTS (SELECT pfp.rowid FROM '.MAIN_DB_PREFIX.'product_fournisseur_price as pfp WHERE pfp.fk_product = p.rowid AND pfp.fk_soc = '.((int) $fk_supplier).' AND pfp.entity IN ('.getEntity('product_fournisseur_price').'))';
+}
 $sql .= ' GROUP BY p.rowid, p.ref, p.label, p.description, p.price';
 $sql .= ', p.price_ttc, p.price_base_type,p.fk_product_type, p.tms';
 $sql .= ', p.duration, p.tobuy';
@@ -762,7 +762,9 @@ while ($i < ($limit ? min($num, $limit) : $num))
 		print '<td class="right">'.$alertstock.'</td>';
 
 		// Current stock (all warehouses)
-		print '<td class="right">'.$warning.$stock.'</td>';
+		print '<td class="right">'.$warning.$stock;
+		print '<!-- stock returned by main sql is '.$objp->stock_physique.' -->';
+		print '</td>';
 
 		// Already ordered
 		print '<td class="right"><a href="replenishorders.php?sproduct='.$prod->id.'">'.$ordered.'</a> '.$picto.'</td>';

From 495d2e79f4ecec7d61326e77c448638bdc5df9f5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 18 May 2021 12:35:30 +0200
Subject: [PATCH 0106/1497] Update html.form.class.php

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 55cb6270455..e70337e195d 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -8129,7 +8129,7 @@ class Form
 		//if ($projectsListId) $sql.= " AND p.rowid IN (".$projectsListId.")";
 		//if ($socid == 0) $sql.= " AND (p.fk_soc=0 OR p.fk_soc IS NULL)";
 		//if ($socid > 0)  $sql.= " AND (p.fk_soc=".$socid." OR p.fk_soc IS NULL)";
-		$sql .= " GROUP BY f.ref, f.rowid, flabel,pid, p.title, p.fk_soc, p.fk_statut, p.public, name ORDER BY p.ref, f.ref ASC";
+		$sql .= "ORDER BY p.ref, f.ref ASC";
 
 		$resql = $this->db->query($sql);
 		if ($resql)

From 0c4884bb2c492b6d5e85ab1369e960e352ff2c6b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 18 May 2021 12:44:56 +0200
Subject: [PATCH 0107/1497] Fix sql error

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index e70337e195d..945897856f2 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -8129,7 +8129,7 @@ class Form
 		//if ($projectsListId) $sql.= " AND p.rowid IN (".$projectsListId.")";
 		//if ($socid == 0) $sql.= " AND (p.fk_soc=0 OR p.fk_soc IS NULL)";
 		//if ($socid > 0)  $sql.= " AND (p.fk_soc=".$socid." OR p.fk_soc IS NULL)";
-		$sql .= "ORDER BY p.ref, f.ref ASC";
+		$sql .= " ORDER BY p.ref, f.ref ASC";
 
 		$resql = $this->db->query($sql);
 		if ($resql)

From 74f35177ff050351e431bd023b81a0496df138f7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 18 May 2021 13:20:14 +0200
Subject: [PATCH 0108/1497] Fix group by

---
 htdocs/compta/facture/list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index ed4d36382f1..7c9b71e458b 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -719,7 +719,7 @@ if (!$sall) {
 	$sql .= ' state.code_departement, state.nom,';
 	$sql .= ' country.code,';
 	$sql .= " p.rowid, p.ref, p.title,";
-	$sql .= " u.login";
+	$sql .= " u.login, u.lastname, u.firstname, u.email, u.statut, u.entity, u.photo, u.office_phone, u.office_fax, u.user_mobile, u.job, u.gender";
 	if ($search_categ_cus) {
 		$sql .= ", cc.fk_categorie, cc.fk_soc";
 	}

From 7569275d284c4aa15820da512b5ae2a48d5ccf52 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 18 May 2021 13:36:07 +0200
Subject: [PATCH 0109/1497] Fix generation of invoice

---
 htdocs/langs/en_US/projects.lang   |  2 ++
 htdocs/projet/class/task.class.php |  4 ++--
 htdocs/projet/tasks/time.php       | 33 +++++++++++++++++++-----------
 3 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index 79c974f6e24..2fda7e1df0e 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -267,9 +267,11 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=New invoice
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+OneLinePerTimeSpentLine=One line for each time spent declaration
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
 AddPersonToTask=Add also to tasks
 UsageOrganizeEvent=Usage: Event Organization
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
+SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them 
\ No newline at end of file
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index 0f84313b75a..0b8e21f5afd 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -1351,9 +1351,9 @@ class Task extends CommonObject
 	}
 
 	/**
-	 *  Load one record of time spent
+	 *  Load properties of timespent of a task from the time spent ID.
 	 *
-	 *  @param	int		$id 	Id object
+	 *  @param	int		$id 	Id in time spent table
 	 *  @return int		        <0 if KO, >0 if OK
 	 */
 	public function fetchTimeSpent($id)
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 8cac9adfd05..01622a41945 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -192,10 +192,10 @@ if ($action == 'addtimespent' && $user->rights->projet->lire) {
 				$object->timespent_duration = GETPOSTINT("timespent_durationhour") * 60 * 60; // We store duration in seconds
 				$object->timespent_duration += (GETPOSTINT('timespent_durationmin') ? GETPOSTINT('timespent_durationmin') : 0) * 60; // We store duration in seconds
 				if (GETPOST("timehour") != '' && GETPOST("timehour") >= 0) {	// If hour was entered
-					$object->timespent_date = dol_mktime(GETPOST("timehour"), GETPOST("timemin"), 0, GETPOST("timemonth"), GETPOST("timeday"), GETPOST("timeyear"));
+					$object->timespent_date = dol_mktime(GETPOST("timehour", 'int'), GETPOST("timemin", 'int'), 0, GETPOST("timemonth", 'int'), GETPOST("timeday", 'int'), GETPOST("timeyear", 'int'));
 					$object->timespent_withhour = 1;
 				} else {
-					$object->timespent_date = dol_mktime(12, 0, 0, GETPOST("timemonth"), GETPOST("timeday"), GETPOST("timeyear"));
+					$object->timespent_date = dol_mktime(12, 0, 0, GETPOST("timemonth", 'int'), GETPOST("timeday", 'int'), GETPOST("timeyear", 'int'));
 				}
 				$object->timespent_fk_user = GETPOST("userid", 'int');
 				$result = $object->addTimeSpent($user);
@@ -402,7 +402,7 @@ if ($action == 'confirm_generateinvoice') {
 
 		if (!$error) {
 			if ($generateinvoicemode == 'onelineperuser') {
-					$arrayoftasks = array();
+				$arrayoftasks = array();
 				foreach ($toselect as $key => $value) {
 					// Get userid, timepent
 					$object->fetchTimeSpent($value);
@@ -437,22 +437,27 @@ if ($action == 'confirm_generateinvoice') {
 						break;
 					}
 				}
-			} elseif ($generateinvoicemode == 'onelineperperiod') {
-					$arrayoftasks = array();
+			} elseif ($generateinvoicemode == 'onelineperperiod') {	// One line for each time spent line
+				$arrayoftasks = array();
 				foreach ($toselect as $key => $value) {
 					// Get userid, timepent
 					$object->fetchTimeSpent($value);
+					// $object->id is the task id
+					$ftask = new Task($db);
+					$ftask->fetch($object->id);
+
+					$fuser->fetch($object->timespent_fk_user);
+					$username = $fuser->getFullName($langs);
+
 					$arrayoftasks[$object->timespent_id]['timespent'] = $object->timespent_duration;
 					$arrayoftasks[$object->timespent_id]['totalvaluetodivideby3600'] = $object->timespent_duration * $object->timespent_thm;
-					$arrayoftasks[$object->timespent_id]['note'] = $object->timespent_note;
+					$arrayoftasks[$object->timespent_id]['note'] = $ftask->ref.' - '.$ftask->label.' - '.$username.($object->timespent_note ? ' - '.$object->timespent_note : '');		// TODO Add user name in note
 					$arrayoftasks[$object->timespent_id]['user'] = $object->timespent_fk_user;
 				}
 
 				foreach ($arrayoftasks as $timespent_id => $value) {
 					$userid = $value['user'];
-					$fuser->fetch($userid);
 					//$pu_ht = $value['timespent'] * $fuser->thm;
-					$username = $fuser->getFullName($langs);
 
 					// Define qty per hour
 					$qtyhour = $value['timespent'] / 3600;
@@ -465,6 +470,7 @@ if ($action == 'confirm_generateinvoice') {
 
 					// Add lines
 					$lineid = $tmpinvoice->addline($value['note'], $pu_ht, round($qtyhour / $prodDurationHours, 2), $txtva, $localtax1, $localtax2, ($idprod > 0 ? $idprod : 0));
+					//var_dump($lineid);exit;
 
 					// Update lineid into line of timespent
 					$sql = 'UPDATE '.MAIN_DB_PREFIX.'projet_task_time SET invoice_line_id = '.((int) $lineid).', invoice_id = '.((int) $tmpinvoice->id);
@@ -477,7 +483,7 @@ if ($action == 'confirm_generateinvoice') {
 					}
 				}
 			} elseif ($generateinvoicemode == 'onelinepertask') {
-					$arrayoftasks = array();
+				$arrayoftasks = array();
 				foreach ($toselect as $key => $value) {
 					// Get userid, timepent
 					$object->fetchTimeSpent($value);
@@ -517,7 +523,10 @@ if ($action == 'confirm_generateinvoice') {
 
 		if (!$error) {
 			$urltoinvoice = $tmpinvoice->getNomUrl(0);
-			setEventMessages($langs->trans("InvoiceGeneratedFromTimeSpent", $urltoinvoice), null, 'mesgs');
+			$mesg = $langs->trans("InvoiceGeneratedFromTimeSpent", '{s1}');
+			$mesg = str_replace('{s1}', $urltoinvoice, $mesg);
+			setEventMessages($mesg, null, 'mesgs');
+
 			//var_dump($tmpinvoice);
 
 			$db->commit();
@@ -969,7 +978,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0) {
 				$tmparray = array(
 					'onelineperuser'=>'OneLinePerUser',
 					'onelinepertask'=>'OneLinePerTask',
-					'onelineperperiod'=>'OneLinePerPeriod',
+					'onelineperperiod'=>'OneLinePerTimeSpentLine',
 				);
 				print $form->selectarray('generateinvoicemode', $tmparray, 'onelineperuser', 0, 0, 0, '', 1);
 				print '</td>';
@@ -1315,7 +1324,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0) {
 			print_liste_field_titre($arrayfields['value']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'right ');
 		}
 		if (!empty($arrayfields['valuebilled']['checked'])) {
-			print_liste_field_titre($arrayfields['valuebilled']['label'], $_SERVER['PHP_SELF'], 'il.total_ht', '', $param, '', $sortfield, $sortorder, 'center ');
+			print_liste_field_titre($arrayfields['valuebilled']['label'], $_SERVER['PHP_SELF'], 'il.total_ht', '', $param, '', $sortfield, $sortorder, 'center ', $langs->trans("SelectLinesOfTimeSpentToInvoice"));
 		}
 		/*
 		// Extra fields

From c2cb055b0ad2ed6a5ef7f4877574047cc34ec143 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 18 May 2021 14:00:29 +0200
Subject: [PATCH 0110/1497] Fix look and feel v14

---
 htdocs/comm/action/card.php       | 2 +-
 htdocs/comm/action/document.php   | 2 +-
 htdocs/comm/action/index.php      | 4 ++--
 htdocs/comm/action/info.php       | 2 +-
 htdocs/comm/action/list.php       | 4 ++--
 htdocs/comm/action/pertype.php    | 4 ++--
 htdocs/comm/action/peruser.php    | 4 ++--
 htdocs/core/lib/functions.lib.php | 5 +++--
 8 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index f368378a281..10e96b50014 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -1821,7 +1821,7 @@ if ($id > 0) {
 
 		$linkback = '';
 		// Link to other agenda views
-		$linkback .= img_picto($langs->trans("BackToList"), 'object_list-alt', 'class="hideonsmartphone pictoactionview"');
+		$linkback .= img_picto($langs->trans("BackToList"), 'object_list', 'class="hideonsmartphone pictoactionview"');
 		$linkback .= '<a href="'.DOL_URL_ROOT.'/comm/action/list.php?action=show_list&restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 		$linkback .= '</li>';
 		$linkback .= '<li class="noborder litext">';
diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php
index c55d4e114cc..7465e613611 100644
--- a/htdocs/comm/action/document.php
+++ b/htdocs/comm/action/document.php
@@ -147,7 +147,7 @@ if ($object->id > 0) {
 	$out = '';
 	$out .= '</li><li class="noborder litext">'.img_picto($langs->trans("ViewPerUser"), 'object_calendarperuser', 'class="hideonsmartphone pictoactionview"');
 	$out .= '<a href="'.DOL_URL_ROOT.'/comm/action/peruser.php?action=show_peruser&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').'">'.$langs->trans("ViewPerUser").'</a>';
-	$out .= '</li><li class="noborder litext">'.img_picto($langs->trans("ViewCal"), 'object_calendar', 'class="hideonsmartphone pictoactionview"');
+	$out .= '</li><li class="noborder litext">'.img_picto($langs->trans("ViewCal"), 'object_calendarmonth', 'class="hideonsmartphone pictoactionview"');
 	$out .= '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_month&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').'">'.$langs->trans("ViewCal").'</a>';
 	$out .= '</li><li class="noborder litext">'.img_picto($langs->trans("ViewWeek"), 'object_calendarweek', 'class="hideonsmartphone pictoactionview"');
 	$out .= '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_day&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').'">'.$langs->trans("ViewWeek").'</a>';
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index d5457447100..459ede423b1 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -480,13 +480,13 @@ print '<input type="hidden" name="token" value="'.newToken().'">';
 $viewmode = '';
 $viewmode .= '<a class="btnTitle reposition" href="'.DOL_URL_ROOT.'/comm/action/list.php?action=show_list&restore_lastsearch_values=1'.$paramnoactionodate.'">';
 //$viewmode .= '<span class="fa paddingleft imgforviewmode valignmiddle btnTitle-icon">';
-$viewmode .= img_picto($langs->trans("List"), 'object_list-alt', 'class="pictoactionview block"');
+$viewmode .= img_picto($langs->trans("List"), 'object_list', 'class="pictoactionview block"');
 //$viewmode .= '</span>';
 $viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsmartphone">'.$langs->trans("ViewList").'</span></a>';
 
 $viewmode .= '<a class="btnTitle'.($action == 'show_month' ? ' btnTitleSelected' : '').' reposition" href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_month&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').$paramnoactionodate.'">';
 //$viewmode .= '<span class="fa paddingleft imgforviewmode valignmiddle btnTitle-icon">';
-$viewmode .= img_picto($langs->trans("ViewCal"), 'object_calendar', 'class="pictoactionview block"');
+$viewmode .= img_picto($langs->trans("ViewCal"), 'object_calendarmonth', 'class="pictoactionview block"');
 //$viewmode .= '</span>';
 $viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsmartphone">'.$langs->trans("ViewCal").'</span></a>';
 
diff --git a/htdocs/comm/action/info.php b/htdocs/comm/action/info.php
index f5d1c65b267..071d6409176 100644
--- a/htdocs/comm/action/info.php
+++ b/htdocs/comm/action/info.php
@@ -73,7 +73,7 @@ $linkback .= '<a href="'.DOL_URL_ROOT.'/comm/action/index.php">'.$langs->trans("
 $out = '';
 $out .= '</li><li class="noborder litext">'.img_picto($langs->trans("ViewPerUser"), 'object_calendarperuser', 'class="hideonsmartphone pictoactionview"');
 $out .= '<a href="'.DOL_URL_ROOT.'/comm/action/peruser.php?action=show_peruser&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').'">'.$langs->trans("ViewPerUser").'</a>';
-$out .= '</li><li class="noborder litext">'.img_picto($langs->trans("ViewCal"), 'object_calendar', 'class="hideonsmartphone pictoactionview"');
+$out .= '</li><li class="noborder litext">'.img_picto($langs->trans("ViewCal"), 'object_calendarmonth', 'class="hideonsmartphone pictoactionview"');
 $out .= '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_month&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').'">'.$langs->trans("ViewCal").'</a>';
 $out .= '</li><li class="noborder litext">'.img_picto($langs->trans("ViewWeek"), 'object_calendarweek', 'class="hideonsmartphone pictoactionview"');
 $out .= '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_day&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').'">'.$langs->trans("ViewWeek").'</a>';
diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index 96a69403289..e3cc54f5a35 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -606,13 +606,13 @@ if ($resql) {
 	$viewmode = '';
 	$viewmode .= '<a class="btnTitle btnTitleSelected reposition" href="'.DOL_URL_ROOT.'/comm/action/list.php?action=show_list&restore_lastsearch_values=1'.$paramnoactionodate.'">';
 	//$viewmode .= '<span class="fa paddingleft imgforviewmode valignmiddle btnTitle-icon">';
-	$viewmode .= img_picto($langs->trans("List"), 'object_list-alt', 'class="pictoactionview block"');
+	$viewmode .= img_picto($langs->trans("List"), 'object_list', 'class="pictoactionview block"');
 	//$viewmode .= '</span>';
 	$viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsmartphone">'.$langs->trans("ViewList").'</span></a>';
 
 	$viewmode .= '<a class="btnTitle reposition" href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_month&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').$paramnoactionodate.'">';
 	//$viewmode .= '<span class="fa paddingleft imgforviewmode valignmiddle btnTitle-icon">';
-	$viewmode .= img_picto($langs->trans("ViewCal"), 'object_calendar', 'class="pictoactionview block"');
+	$viewmode .= img_picto($langs->trans("ViewCal"), 'object_calendarmonth', 'class="pictoactionview block"');
 	//$viewmode .= '</span>';
 	$viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsmartphone">'.$langs->trans("ViewCal").'</span></a>';
 
diff --git a/htdocs/comm/action/pertype.php b/htdocs/comm/action/pertype.php
index 19f8a8ce31c..32eaccdcce1 100644
--- a/htdocs/comm/action/pertype.php
+++ b/htdocs/comm/action/pertype.php
@@ -416,13 +416,13 @@ $massactionbutton = '';
 $viewmode = '';
 $viewmode .= '<a class="btnTitle reposition" href="'.DOL_URL_ROOT.'/comm/action/list.php?action=show_list&restore_lastsearch_values=1'.$paramnoactionodate.'">';
 //$viewmode .= '<span class="fa paddingleft imgforviewmode valignmiddle btnTitle-icon">';
-$viewmode .= img_picto($langs->trans("List"), 'object_list-alt', 'class="pictoactionview block"');
+$viewmode .= img_picto($langs->trans("List"), 'object_list', 'class="pictoactionview block"');
 //$viewmode .= '</span>';
 $viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsmartphone">'.$langs->trans("ViewList").'</span></a>';
 
 $viewmode .= '<a class="btnTitle reposition" href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_month&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').$paramnoactionodate.'">';
 //$viewmode .= '<span class="fa paddingleft imgforviewmode valignmiddle btnTitle-icon">';
-$viewmode .= img_picto($langs->trans("ViewCal"), 'object_calendar', 'class="pictoactionview block"');
+$viewmode .= img_picto($langs->trans("ViewCal"), 'object_calendarmonth', 'class="pictoactionview block"');
 //$viewmode .= '</span>';
 $viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsmartphone">'.$langs->trans("ViewCal").'</span></a>';
 
diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index 62af33b34ee..76330d39453 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -426,13 +426,13 @@ $massactionbutton = '';
 $viewmode = '';
 $viewmode .= '<a class="btnTitle reposition" href="'.DOL_URL_ROOT.'/comm/action/list.php?action=show_list&restore_lastsearch_values=1'.$paramnoactionodate.'">';
 //$viewmode .= '<span class="fa paddingleft imgforviewmode valignmiddle btnTitle-icon">';
-$viewmode .= img_picto($langs->trans("List"), 'object_list-alt', 'class="pictoactionview block"');
+$viewmode .= img_picto($langs->trans("List"), 'object_list', 'class="pictoactionview block"');
 //$viewmode .= '</span>';
 $viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsmartphone">'.$langs->trans("ViewList").'</span></a>';
 
 $viewmode .= '<a class="btnTitle reposition" href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_month&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').$paramnoactionodate.'">';
 //$viewmode .= '<span class="fa paddingleft imgforviewmode valignmiddle btnTitle-icon">';
-$viewmode .= img_picto($langs->trans("ViewCal"), 'object_calendar', 'class="pictoactionview block"');
+$viewmode .= img_picto($langs->trans("ViewCal"), 'object_calendarmonth', 'class="pictoactionview block"');
 //$viewmode .= '</span>';
 $viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsmartphone">'.$langs->trans("ViewCal").'</span></a>';
 
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index a987cf03e4c..a4a2d736746 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3498,6 +3498,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'1downarrow', '1uparrow', '1leftarrow', '1rightarrow', '1uparrow_selected', '1downarrow_selected', '1leftarrow_selected', '1rightarrow_selected',
 				'accountancy', 'account', 'accountline', 'action', 'add', 'address', 'angle-double-down', 'angle-double-up', 'asset',
 				'bank_account', 'barcode', 'bank', 'bill', 'billa', 'billr', 'billd', 'bookmark', 'bom', 'bug', 'building',
+				'calendar', 'calendarmonth', 'calendarweek', 'calendarday', 'calendarperuser', 'calendarpertype',
 				'cash-register', 'category', 'chart', 'check', 'clock', 'close_title', 'cog', 'collab', 'company', 'contact', 'country', 'contract', 'cron', 'cubes', 'multicurrency',
 				'delete', 'dolly', 'dollyrevert', 'donation', 'download', 'dynamicprice',
 				'edit', 'ellipsis-h', 'email', 'eraser', 'establishment', 'expensereport', 'external-link-alt', 'external-link-square-alt',
@@ -3505,7 +3506,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'generate', 'globe', 'globe-americas', 'graph', 'grip', 'grip_title', 'group',
 				'help', 'holiday',
 				'images', 'incoterm', 'info', 'intervention', 'inventory', 'intracommreport', 'knowledgemanagement',
-				'label', 'language', 'link', 'list', 'listlight', 'loan', 'lot', 'long-arrow-alt-right',
+				'label', 'language', 'link', 'list', 'list-alt', 'listlight', 'loan', 'lot', 'long-arrow-alt-right',
 				'margin', 'map-marker-alt', 'member', 'meeting', 'money-bill-alt', 'movement', 'mrp', 'note', 'next',
 				'off', 'on', 'order',
 				'paiment', 'paragraph', 'play', 'pdf', 'phone', 'playdisabled', 'previous', 'poll', 'pos', 'printer', 'product', 'propal', 'stock', 'resize', 'service', 'stats', 'trip',
@@ -3551,7 +3552,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'sign-out'=>'sign-out-alt',
 				'switch_off'=>'toggle-off', 'switch_on'=>'toggle-on', 'check'=>'check', 'bookmark'=>'star', 'bookmark'=>'star',
 				'bank'=>'university', 'close_title'=>'times', 'delete'=>'trash', 'edit'=>'pencil-alt', 'filter'=>'filter',
-				'list-alt'=>'list-alt', 'calendar'=>'calendar-alt', 'calendarweek'=>'calendar-week', 'calendarmonth'=>'calendar-alt', 'calendarday'=>'calendar-day', 'calendarperuser'=>'table',
+				'list-alt'=>'list-alt', 'calendar'=>'calendar-alt', 'calendarmonth'=>'calendar-alt', 'calendarweek'=>'calendar-week', 'calendarmonth'=>'calendar-alt', 'calendarday'=>'calendar-day', 'calendarperuser'=>'table',
 				'intervention'=>'ambulance', 'invoice'=>'file-invoice-dollar', 'multicurrency'=>'dollar-sign', 'order'=>'file-invoice',
 				'error'=>'exclamation-triangle', 'warning'=>'exclamation-triangle',
 				'other'=>'square',

From fbaba3b81ba03767ed770d00d065c347d6f8f3f5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 18 May 2021 14:13:08 +0200
Subject: [PATCH 0111/1497] css

---
 htdocs/theme/eldy/global.inc.php | 4 ++--
 htdocs/theme/md/style.css.php    | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 3518518a5ef..27a889293f1 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -4929,8 +4929,8 @@ td.cal_other_month {
 /* ============================================================================== */
 
 /* CSS for treeview */
-.treeview ul { background-color: transparent !important; margin-bottom: 4px !important; margin-top: 0 !important; padding-top: 4px !important; }
-.treeview li { background-color: transparent !important; padding: 0 0 0 16px !important; min-height: 26px; }
+.treeview ul { background-color: transparent !important; margin-bottom: 4px !important; margin-top: 0 !important; padding-top: 8px !important; }
+.treeview li { background-color: transparent !important; padding: 0 0 0 16px !important; min-height: 30px; }
 .treeview .hover { color: var(--colortextlink) !important; text-decoration: underline !important; }
 .treeview .hitarea { margin-top: 3px; }
 
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 70a2ce1303e..0089248288a 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -4849,9 +4849,10 @@ td.gtaskname {
 /* ============================================================================== */
 
 /* CSS for treeview */
-.treeview ul { background-color: transparent !important; margin-top: 0; }
-.treeview li { background-color: transparent !important; padding: 0 0 0 16px !important; min-height: 20px; }
-.treeview .hover { color: rgb(<?php print $colortextlink; ?>) !important; text-decoration: underline !important; }
+.treeview ul { background-color: transparent !important; margin-bottom: 4px !important; margin-top: 0 !important; padding-top: 8px !important; }
+.treeview li { background-color: transparent !important; padding: 0 0 0 16px !important; min-height: 30px; }
+.treeview .hover { color: var(--colortextlink) !important; text-decoration: underline !important; }
+.treeview .hitarea { margin-top: 3px; }
 
 
 

From 90d159fbc3b9755201fde87ee19beb257b462b34 Mon Sep 17 00:00:00 2001
From: Adrien Raze <adrien.raze@atm-consulting.fr>
Date: Tue, 18 May 2021 14:58:46 +0200
Subject: [PATCH 0112/1497] FIX : Missing hook in cibles.php (for mailing)

---
 htdocs/comm/mailing/cibles.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index 8bfa82260b9..bf4b2e3d39c 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -66,6 +66,8 @@ $modulesdir = dolGetModulesDirs('/mailings');
 $object = new Mailing($db);
 $result = $object->fetch($id);
 
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('ciblescard', 'globalcard'));
 
 /*
  * Actions
@@ -471,6 +473,10 @@ if ($object->fetch($id) >= 0)
 			}
 		}	// End foreach dir
 
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+		print $hookmanager->resPrint;
+
 		print '</div>';
 
 		print '<br><br>';

From e7ac39fe35e84585564d57170c869a62d0525b03 Mon Sep 17 00:00:00 2001
From: Damien BENOIT <48482664+Givriz@users.noreply.github.com>
Date: Tue, 18 May 2021 15:23:29 +0200
Subject: [PATCH 0113/1497] Update modules.php

Added $param
---
 htdocs/admin/system/modules.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/admin/system/modules.php b/htdocs/admin/system/modules.php
index 4a77d2452c4..150ca10a359 100644
--- a/htdocs/admin/system/modules.php
+++ b/htdocs/admin/system/modules.php
@@ -65,6 +65,7 @@ $arrayfields = array(
 );
 
 $arrayfields = dol_sort_array($arrayfields, 'position');
+$param = '';
 
 
 /*
@@ -277,7 +278,7 @@ if ($arrayfields['module_position']['checked']) {
 }
 
 // Fields from hook
-$parameters = array('arrayfields'=>$arrayfields, 'param'=>empty($param) ? '' : $param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 

From 38a5dfb26343258ae2a4fed72e69377483417783 Mon Sep 17 00:00:00 2001
From: Damien BENOIT <48482664+Givriz@users.noreply.github.com>
Date: Tue, 18 May 2021 15:26:55 +0200
Subject: [PATCH 0114/1497] Update listevents.php

Added $optioncss
---
 htdocs/admin/tools/listevents.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php
index b894920d34e..31287cbbb8a 100644
--- a/htdocs/admin/tools/listevents.php
+++ b/htdocs/admin/tools/listevents.php
@@ -68,6 +68,7 @@ $search_user = GETPOST("search_user", "alpha");
 $search_desc = GETPOST("search_desc", "alpha");
 $search_ua   = GETPOST("search_ua", "restricthtml");
 $search_prefix_session = GETPOST("search_prefix_session", "restricthtml");
+$optioncss = GETPOST("optioncss", "aZ"); // Option for the css output (always '' except when 'print')
 
 $now = dol_now();
 $nowarray = dol_getdate($now);
@@ -245,7 +246,7 @@ if ($result) {
 	if ($limit > 0 && $limit != $conf->liste_limit) {
 		$param .= '&limit='.urlencode($limit);
 	}
-	if (!empty($optioncss)) {
+	if ($optioncss != '') {
 		$param .= '&optioncss='.urlencode($optioncss);
 	}
 	if ($search_code) {

From f3803bab9143003082515fc4567459a763ef86ad Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 18 May 2021 16:28:30 +0200
Subject: [PATCH 0115/1497] Responsive

---
 .../template/core/modules/modMyModule.class.php       |  4 ++--
 htdocs/projet/activity/perday.php                     |  2 +-
 htdocs/projet/activity/permonth.php                   |  2 +-
 htdocs/projet/activity/perweek.php                    |  2 +-
 htdocs/theme/eldy/global.inc.php                      |  4 ++++
 htdocs/theme/md/style.css.php                         | 11 +++++++++++
 6 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
index d212e10998e..9db4bcb9854 100644
--- a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
+++ b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
@@ -290,7 +290,7 @@ class modMyModule extends DolibarrModules
 			'fk_menu'=>'', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
 			'type'=>'top', // This is a Top menu entry
 			'titre'=>'ModuleMyModuleName',
-			'prefix' => img_picto('', $this->picto, 'class="paddingright pictofixedwidth"'),
+			'prefix' => img_picto('', $this->picto, 'class="paddingright pictofixedwidth valignmiddle"'),
 			'mainmenu'=>'mymodule',
 			'leftmenu'=>'',
 			'url'=>'/mymodule/mymoduleindex.php',
@@ -307,7 +307,7 @@ class modMyModule extends DolibarrModules
 			'fk_menu'=>'fk_mainmenu=mymodule',      // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
 			'type'=>'left',                          // This is a Top menu entry
 			'titre'=>'MyObject',
-			'prefix' => img_picto('', $this->picto, 'class="paddingright pictofixedwidth"'),
+			'prefix' => img_picto('', $this->picto, 'class="paddingright pictofixedwidth valignmiddle"'),
 			'mainmenu'=>'mymodule',
 			'leftmenu'=>'myobject',
 			'url'=>'/mymodule/mymoduleindex.php',
diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index b0195200dd5..56d5dfedf28 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -478,7 +478,7 @@ $formproject->selectTasks($socid ? $socid : -1, $taskid, 'taskid', 32, 0, '-- '.
 print '</div>';
 print ' ';
 print $formcompany->selectTypeContact($object, '', 'type', 'internal', 'rowid', 0, 'maxwidth150onsmartphone');
-print '<input type="submit" class="button valignmiddle" name="assigntask" value="'.dol_escape_htmltag($titleassigntask).'">';
+print '<input type="submit" class="button valignmiddle" name="assigntask smallonsmartphone" value="'.dol_escape_htmltag($titleassigntask).'">';
 print '</div>';
 
 print '<div class="clearboth" style="padding-bottom: 20px;"></div>';
diff --git a/htdocs/projet/activity/permonth.php b/htdocs/projet/activity/permonth.php
index 087fe5b8f0b..e4aea7af6c2 100644
--- a/htdocs/projet/activity/permonth.php
+++ b/htdocs/projet/activity/permonth.php
@@ -396,7 +396,7 @@ $formproject->selectTasks($socid ? $socid : -1, $taskid, 'taskid', 32, 0, '-- '.
 print '</div>';
 print ' ';
 print $formcompany->selectTypeContact($object, '', 'type', 'internal', 'rowid', 0, 'maxwidth150onsmartphone');
-print '<input type="submit" class="button valignmiddle" name="assigntask" value="'.dol_escape_htmltag($titleassigntask).'">';
+print '<input type="submit" class="button valignmiddle smallonsmartphone" name="assigntask" value="'.dol_escape_htmltag($titleassigntask).'">';
 print '</div>';
 
 print '<div class="clearboth" style="padding-bottom: 20px;"></div>';
diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php
index 0a275cb46e3..90764f637fd 100644
--- a/htdocs/projet/activity/perweek.php
+++ b/htdocs/projet/activity/perweek.php
@@ -493,7 +493,7 @@ $formproject->selectTasks($socid ? $socid : -1, $taskid, 'taskid', 32, 0, '-- '.
 print '</div>';
 print ' ';
 print $formcompany->selectTypeContact($object, '', 'type', 'internal', 'rowid', 0, 'maxwidth150onsmartphone');
-print '<input type="submit" class="button valignmiddle" name="assigntask" value="'.dol_escape_htmltag($titleassigntask).'">';
+print '<input type="submit" class="button valignmiddle smallonsmartphone" name="assigntask" value="'.dol_escape_htmltag($titleassigntask).'">';
 print '</div>';
 
 print '<div class="clearboth" style="padding-bottom: 20px;"></div>';
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 27a889293f1..67192c7063e 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -1491,6 +1491,10 @@ select.widthcentpercentminusxx, span.widthcentpercentminusxx:not(.select2-select
 	input.buttonpayment, button.buttonpayment, div.buttonpayment {
 		min-width: 270px;
 	}
+
+	.smallonsmartphone {
+    	font-size: 0.8em;
+	}
 }
 
 /* Force values for small screen 570 */
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 0089248288a..866d6c9f3d7 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1495,6 +1495,17 @@ table[summary="list_of_modules"] .fa-cog {
 	div.divphotoref {
 		padding-right: 10px !important;
 	}
+	
+	.poweredbyimg {
+		width: 48px;
+	}
+	input.buttonpayment, button.buttonpayment, div.buttonpayment {
+		min-width: 270px;
+	}
+
+	.smallonsmartphone {
+    	font-size: 0.8em;
+	}
 }
 
 /* Force values for small screen 570 */

From a829d8cedc719a4b799a94f39fe3b8f055200537 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 18 May 2021 16:31:59 +0200
Subject: [PATCH 0116/1497] css

---
 htdocs/projet/activity/perday.php   | 6 +++---
 htdocs/projet/activity/permonth.php | 8 ++++----
 htdocs/projet/activity/perweek.php  | 8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index 56d5dfedf28..b93b5158ad7 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -503,18 +503,18 @@ $includeonly = 'hierarchyme';
 if (empty($user->rights->user->user->lire)) {
 	$includeonly = array($user->id);
 }
-$moreforfilter .= img_picto($langs->trans('Filter').' '.$langs->trans('User'), 'user', 'class="paddingright"').$form->select_dolusers($search_usertoprocessid ? $search_usertoprocessid : $usertoprocess->id, 'search_usertoprocessid', $user->rights->user->user->lire ? 0 : 0, null, 0, $includeonly, null, 0, 0, 0, '', 0, '', 'maxwidth200');
+$moreforfilter .= img_picto($langs->trans('Filter').' '.$langs->trans('User'), 'user', 'class="paddingright pictofixedwidth"').$form->select_dolusers($search_usertoprocessid ? $search_usertoprocessid : $usertoprocess->id, 'search_usertoprocessid', $user->rights->user->user->lire ? 0 : 0, null, 0, $includeonly, null, 0, 0, 0, '', 0, '', 'maxwidth200');
 $moreforfilter .= '</div>';
 
 if (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) {
 	$moreforfilter .= '<div class="divsearchfield">';
 	$moreforfilter .= '<div class="inline-block"></div>';
-	$moreforfilter .= img_picto($langs->trans('Filter').' '.$langs->trans('Project'), 'project', 'class="paddingright"').'<input type="text" name="search_project_ref" class="maxwidth100" value="'.dol_escape_htmltag($search_project_ref).'">';
+	$moreforfilter .= img_picto($langs->trans('Filter').' '.$langs->trans('Project'), 'project', 'class="paddingright pictofixedwidth"').'<input type="text" name="search_project_ref" class="maxwidth100" value="'.dol_escape_htmltag($search_project_ref).'">';
 	$moreforfilter .= '</div>';
 
 	$moreforfilter .= '<div class="divsearchfield">';
 	$moreforfilter .= '<div class="inline-block"></div>';
-	$moreforfilter .= img_picto($langs->trans('Filter').' '.$langs->trans('ThirdParty'), 'company', 'class="paddingright"').'<input type="text" name="search_thirdparty" class="maxwidth100" value="'.dol_escape_htmltag($search_thirdparty).'">';
+	$moreforfilter .= img_picto($langs->trans('Filter').' '.$langs->trans('ThirdParty'), 'company', 'class="paddingright pictofixedwidth"').'<input type="text" name="search_thirdparty" class="maxwidth100" value="'.dol_escape_htmltag($search_thirdparty).'">';
 	$moreforfilter .= '</div>';
 }
 
diff --git a/htdocs/projet/activity/permonth.php b/htdocs/projet/activity/permonth.php
index e4aea7af6c2..0491b9c04e5 100644
--- a/htdocs/projet/activity/permonth.php
+++ b/htdocs/projet/activity/permonth.php
@@ -391,7 +391,7 @@ if ($usertoprocess->id != $user->id) {
 	$titleassigntask = $langs->transnoentities("AssignTaskToUser", $usertoprocess->getFullName($langs));
 }
 print '<div class="taskiddiv inline-block">';
-print img_picto('', 'projecttask');
+print img_picto('', 'projecttask', 'class="pictofixedwidth"');
 $formproject->selectTasks($socid ? $socid : -1, $taskid, 'taskid', 32, 0, '-- '.$langs->trans("ChooseANotYetAssignedTask").' --', 1);
 print '</div>';
 print ' ';
@@ -422,18 +422,18 @@ $includeonly = 'hierachyme';
 if (empty($user->rights->user->user->lire)) {
 	$includeonly = array($user->id);
 }
-$moreforfilter .= img_picto($langs->trans('Filter').' '.$langs->trans('User'), 'user', 'class="paddingright"').$form->select_dolusers($search_usertoprocessid ? $search_usertoprocessid : $usertoprocess->id, 'search_usertoprocessid', $user->rights->user->user->lire ? 0 : 0, null, 0, $includeonly, null, 0, 0, 0, '', 0, '', 'maxwidth200');
+$moreforfilter .= img_picto($langs->trans('Filter').' '.$langs->trans('User'), 'user', 'class="paddingright pictofixedwidth"').$form->select_dolusers($search_usertoprocessid ? $search_usertoprocessid : $usertoprocess->id, 'search_usertoprocessid', $user->rights->user->user->lire ? 0 : 0, null, 0, $includeonly, null, 0, 0, 0, '', 0, '', 'maxwidth200');
 $moreforfilter .= '</div>';
 
 if (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) {
 	$moreforfilter .= '<div class="divsearchfield">';
 	$moreforfilter .= '<div class="inline-block"></div>';
-	$moreforfilter .= img_picto($langs->trans('Filter').' '.$langs->trans('Project'), 'project', 'class="paddingright"').'<input type="text" name="search_project_ref" class="maxwidth100" value="'.dol_escape_htmltag($search_project_ref).'">';
+	$moreforfilter .= img_picto($langs->trans('Filter').' '.$langs->trans('Project'), 'project', 'class="paddingright pictofixedwidth"').'<input type="text" name="search_project_ref" class="maxwidth100" value="'.dol_escape_htmltag($search_project_ref).'">';
 	$moreforfilter .= '</div>';
 
 	$moreforfilter .= '<div class="divsearchfield">';
 	$moreforfilter .= '<div class="inline-block"></div>';
-	$moreforfilter .= img_picto($langs->trans('Filter').' '.$langs->trans('ThirdParty'), 'company', 'class="paddingright"').'<input type="text" name="search_thirdparty" class="maxwidth100" value="'.dol_escape_htmltag($search_thirdparty).'">';
+	$moreforfilter .= img_picto($langs->trans('Filter').' '.$langs->trans('ThirdParty'), 'company', 'class="paddingright pictofixedwidth"').'<input type="text" name="search_thirdparty" class="maxwidth100" value="'.dol_escape_htmltag($search_thirdparty).'">';
 	$moreforfilter .= '</div>';
 }
 
diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php
index 90764f637fd..6da7138e6d7 100644
--- a/htdocs/projet/activity/perweek.php
+++ b/htdocs/projet/activity/perweek.php
@@ -488,7 +488,7 @@ if ($usertoprocess->id != $user->id) {
 	$titleassigntask = $langs->transnoentities("AssignTaskToUser", $usertoprocess->getFullName($langs));
 }
 print '<div class="taskiddiv inline-block">';
-print img_picto('', 'projecttask');
+print img_picto('', 'projecttask', 'class="pictofixedwidth"');
 $formproject->selectTasks($socid ? $socid : -1, $taskid, 'taskid', 32, 0, '-- '.$langs->trans("ChooseANotYetAssignedTask").' --', 1, 0, 0, '', '', 'all', $usertoprocess);
 print '</div>';
 print ' ';
@@ -556,18 +556,18 @@ $includeonly = 'hierarchyme';
 if (empty($user->rights->user->user->lire)) {
 	$includeonly = array($user->id);
 }
-$moreforfilter .= img_picto($langs->trans('Filter').' '.$langs->trans('User'), 'user', 'class="paddingright"').$form->select_dolusers($search_usertoprocessid ? $search_usertoprocessid : $usertoprocess->id, 'search_usertoprocessid', $user->rights->user->user->lire ? 0 : 0, null, 0, $includeonly, null, 0, 0, 0, '', 0, '', 'maxwidth200');
+$moreforfilter .= img_picto($langs->trans('Filter').' '.$langs->trans('User'), 'user', 'class="paddingright pictofixedwidth"').$form->select_dolusers($search_usertoprocessid ? $search_usertoprocessid : $usertoprocess->id, 'search_usertoprocessid', $user->rights->user->user->lire ? 0 : 0, null, 0, $includeonly, null, 0, 0, 0, '', 0, '', 'maxwidth200');
 $moreforfilter .= '</div>';
 
 if (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) {
 	$moreforfilter .= '<div class="divsearchfield">';
 	$moreforfilter .= '<div class="inline-block"></div>';
-	$moreforfilter .= img_picto($langs->trans('Filter').' '.$langs->trans('Project'), 'project', 'class="paddingright"').'<input type="text" name="search_project_ref" class="maxwidth100" value="'.dol_escape_htmltag($search_project_ref).'">';
+	$moreforfilter .= img_picto($langs->trans('Filter').' '.$langs->trans('Project'), 'project', 'class="paddingright pictofixedwidth"').'<input type="text" name="search_project_ref" class="maxwidth100" value="'.dol_escape_htmltag($search_project_ref).'">';
 	$moreforfilter .= '</div>';
 
 	$moreforfilter .= '<div class="divsearchfield">';
 	$moreforfilter .= '<div class="inline-block"></div>';
-	$moreforfilter .= img_picto($langs->trans('Filter').' '.$langs->trans('ThirdParty'), 'company', 'class="paddingright"').'<input type="text" name="search_thirdparty" class="maxwidth100" value="'.dol_escape_htmltag($search_thirdparty).'">';
+	$moreforfilter .= img_picto($langs->trans('Filter').' '.$langs->trans('ThirdParty'), 'company', 'class="paddingright pictofixedwidth"').'<input type="text" name="search_thirdparty" class="maxwidth100" value="'.dol_escape_htmltag($search_thirdparty).'">';
 	$moreforfilter .= '</div>';
 }
 

From 2974a2333296b9bed3a77bf3664a428777fae699 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 18 May 2021 16:54:31 +0200
Subject: [PATCH 0117/1497] css

---
 htdocs/categories/index.php | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/htdocs/categories/index.php b/htdocs/categories/index.php
index 5779558e722..041226a8131 100644
--- a/htdocs/categories/index.php
+++ b/htdocs/categories/index.php
@@ -218,16 +218,27 @@ foreach ($fulltree as $key => $val) {
 }
 
 
-//print_barre_liste('', 0, $_SERVER["PHP_SELF"], '', '', '', '', 0, 0, '', 0, $newcardbutton, '', 0, 1, 1);
+$nbofentries = (count($data) - 1);
 
-print '<table class="liste nohover" width="100%">';
+$morethan1level = 0;
+foreach($data as $record) {
+	if (!empty($record['fk_menu'])) {
+		$morethan1level = 1;
+	}
+}
+
+
+print '<table class="liste nohover centpercent">';
 print '<tr class="liste_titre"><td>'.$langs->trans("Categories").'</td><td></td><td class="right">';
-if (!empty($conf->use_javascript_ajax)) {
-	print '<div id="iddivjstreecontrol"><a class="notasortlink" href="#">'.img_picto('', 'folder', 'class="paddingright"').$langs->trans("UndoExpandAll").'</a> | <a class="notasortlink" href="#">'.img_picto('', 'folder-open', 'class="paddingright"').$langs->trans("ExpandAll").'</a></div>';
+if ($morethan1level && !empty($conf->use_javascript_ajax)) {
+	print '<div id="iddivjstreecontrol">';
+	print '<a class="notasortlink" href="#">'.img_picto('', 'folder', 'class="paddingright"').'<span class="hideonsmartphone">'.$langs->trans("UndoExpandAll").'</span></a>';
+	print ' | ';
+	print '<a class="notasortlink" href="#">'.img_picto('', 'folder-open', 'class="paddingright"').'<span class="hideonsmartphone">'.$langs->trans("ExpandAll").'</span></a>';
+	print '</div>';
 }
 print '</td></tr>';
 
-$nbofentries = (count($data) - 1);
 if ($nbofentries > 0) {
 	print '<tr class="pair"><td colspan="3">';
 	tree_recur($data, $data[0], 0);

From ba595d8b74b8b7d03e85609ff3d59074cee1721d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 18 May 2021 16:56:57 +0200
Subject: [PATCH 0118/1497] Minor fix

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

diff --git a/htdocs/categories/index.php b/htdocs/categories/index.php
index 041226a8131..d338e4d95d4 100644
--- a/htdocs/categories/index.php
+++ b/htdocs/categories/index.php
@@ -222,7 +222,7 @@ $nbofentries = (count($data) - 1);
 
 $morethan1level = 0;
 foreach($data as $record) {
-	if (!empty($record['fk_menu'])) {
+	if (!empty($record['fk_menu']) && $record['fk_menu'] > 0) {
 		$morethan1level = 1;
 	}
 }

From a00ae6c918cee34bec6fcb7771fcd16c0df1d559 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 18 May 2021 17:00:20 +0200
Subject: [PATCH 0119/1497] css

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index a4a2d736746..5e25babbf1d 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1662,7 +1662,7 @@ function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab
 			$tabsname = str_replace("@", "", $picto);
 		}
 		$out .= '<div id="moretabs'.$tabsname.'" class="inline-block tabsElem">';
-		$out .= '<a href="#" class="tab moretab inline-block tabunactive">'.$langs->trans("More").'... ('.$nbintab.')</a>'; // Do not use "reposition" class in the "More".
+		$out .= '<a href="#" class="tab moretab inline-block tabunactive"><span class="hideonsmartphone">'.$langs->trans("More").'</span>... ('.$nbintab.')</a>'; // Do not use "reposition" class in the "More".
 		$out .= '<div id="moretabsList'.$tabsname.'" style="width: '.$widthofpopup.'px; position: absolute; '.$left.': -999em; text-align: '.$left.'; margin:0px; padding:2px; z-index:10;">';
 		$out .= $outmore;
 		$out .= '</div>';

From 271ba884db71b6c9dc91ab47ff127a72b1e95d12 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 18 May 2021 17:24:17 +0200
Subject: [PATCH 0120/1497] css

---
 htdocs/core/class/html.form.class.php        | 13 +++++++------
 htdocs/core/class/html.formactions.class.php |  2 +-
 htdocs/core/lib/functions.lib.php            |  2 +-
 htdocs/societe/agenda.php                    |  6 +++---
 htdocs/societe/card.php                      |  8 ++++----
 htdocs/societe/price.php                     |  2 +-
 htdocs/theme/eldy/btn.inc.php                |  3 ++-
 7 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 2d529cd55d6..13893fe42ee 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -8123,13 +8123,14 @@ class Form
 
 
 	/**
-	 *    	Return HTML code to output a barcode
+	 *  Return HTML code to output a barcode
 	 *
-	 *     	@param	Object	$object		Object containing data to retrieve file name
-	 * 		@param	int		$width			Width of photo
-	 * 	  	@return string    				HTML code to output barcode
+	 *  @param	Object	$object			Object containing data to retrieve file name
+	 * 	@param	int		$width			Width of photo
+	 * 	@param	string	$morecss		More CSS on img of barcode
+	 * 	@return string    				HTML code to output barcode
 	 */
-	public function showbarcode(&$object, $width = 100)
+	public function showbarcode(&$object, $width = 100, $morecss = '')
 	{
 		global $conf;
 
@@ -8150,7 +8151,7 @@ class Form
 		// Barcode image
 		$url = DOL_URL_ROOT.'/viewimage.php?modulepart=barcode&generator='.urlencode($object->barcode_type_coder).'&code='.urlencode($object->barcode).'&encoding='.urlencode($object->barcode_type_code);
 		$out = '<!-- url barcode = '.$url.' -->';
-		$out .= '<img src="'.$url.'">';
+		$out .= '<img src="'.$url.'"'.($morecss ? ' class="'.$morecss.'"' : '').'>';
 		return $out;
 	}
 
diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php
index 0380b26a392..992efb79bbf 100644
--- a/htdocs/core/class/html.formactions.class.php
+++ b/htdocs/core/class/html.formactions.class.php
@@ -304,7 +304,7 @@ class FormActions
 					print '<td>'.$label.'</td>';
 
 					// Date
-					print '<td class="center">'.dol_print_date($actioncomm->datep, 'dayhour', 'tzuserrel');
+					print '<td class="center nowraponall">'.dol_print_date($actioncomm->datep, 'dayhour', 'tzuserrel');
 					if ($actioncomm->datef) {
 						$tmpa = dol_getdate($actioncomm->datep);
 						$tmpb = dol_getdate($actioncomm->datef);
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 5e25babbf1d..8d171a048b0 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1923,7 +1923,7 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 	}
 
 	if ($showbarcode) {
-		$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">'.$form->showbarcode($object).'</div>';
+		$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">'.$form->showbarcode($object, 100, 'photoref').'</div>';
 	}
 
 	if ($object->element == 'societe') {
diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php
index 8789427c64b..ec59482b345 100644
--- a/htdocs/societe/agenda.php
+++ b/htdocs/societe/agenda.php
@@ -166,12 +166,12 @@ if ($socid > 0) {
 	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
 		print '<br>';
 
-		$param = '&socid='.$socid;
+		$param = '&socid='.urlencode($socid);
 		if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
-			$param .= '&contextpage='.$contextpage;
+			$param .= '&contextpage='.urlencode($contextpage);
 		}
 		if ($limit > 0 && $limit != $conf->liste_limit) {
-			$param .= '&limit='.$limit;
+			$param .= '&limit='.urlencode($limit);
 		}
 
 		print load_fiche_titre($langs->trans("ActionsOnCompany"), $newcardbutton, '');
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 3493ccc3f00..4973a328023 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -2844,10 +2844,10 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				if (empty($user->socid)) {
 					if (!empty($object->email) || $at_least_one_email_contact) {
 						$langs->load("mails");
-						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a>';
+						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a>'."\n";
 					} else {
 						$langs->load("mails");
-						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NoEMail")).'">'.$langs->trans('SendMail').'</a>';
+						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NoEMail")).'">'.$langs->trans('SendMail').'</a>'."\n";
 					}
 				}
 
@@ -2859,12 +2859,12 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 					$adh = new Adherent($db);
 					$result = $adh->fetch('', '', $object->id);
 					if ($result == 0 && ($object->client == 1 || $object->client == 3) && !empty($conf->global->MEMBER_CAN_CONVERT_CUSTOMERS_TO_MEMBERS)) {
-						print '<a class="butAction" href="'.DOL_URL_ROOT.'/adherents/card.php?&action=create&socid='.$object->id.'" title="'.dol_escape_htmltag($langs->trans("NewMember")).'">'.$langs->trans("NewMember").'</a>';
+						print '<a class="butAction" href="'.DOL_URL_ROOT.'/adherents/card.php?&action=create&socid='.$object->id.'" title="'.dol_escape_htmltag($langs->trans("NewMember")).'">'.$langs->trans("NewMember").'</a>'."\n";
 					}
 				}
 
 				if ($user->rights->societe->supprimer) {
-					print '<a class="butActionDelete" href="card.php?action=merge&socid='.$object->id.'" title="'.dol_escape_htmltag($langs->trans("MergeThirdparties")).'">'.$langs->trans('Merge').'</a>';
+					print '<a class="butActionDelete" href="card.php?action=merge&socid='.$object->id.'" title="'.dol_escape_htmltag($langs->trans("MergeThirdparties")).'">'.$langs->trans('Merge').'</a>'."\n";
 				}
 
 				if ($user->rights->societe->supprimer) {
diff --git a/htdocs/societe/price.php b/htdocs/societe/price.php
index cc056896414..b46a6124396 100644
--- a/htdocs/societe/price.php
+++ b/htdocs/societe/price.php
@@ -206,7 +206,7 @@ dol_banner_tab($object, 'socid', $linkback, ($user->socid ? 0 : 1), 'rowid', 'no
 print '<div class="fichecenter">';
 
 print '<div class="underbanner clearboth"></div>';
-print '<table class="border centpercent">';
+print '<table class="border centpercent tableforfield">';
 
 if (!empty($conf->global->SOCIETE_USEPREFIX)) { // Old not used prefix field
 	print '<tr><td class="titlefield">'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
diff --git a/htdocs/theme/eldy/btn.inc.php b/htdocs/theme/eldy/btn.inc.php
index 6f05daba22f..d874266f81d 100644
--- a/htdocs/theme/eldy/btn.inc.php
+++ b/htdocs/theme/eldy/btn.inc.php
@@ -50,7 +50,8 @@ if (!empty($conf->global->THEME_DARKMODEENABLED)) {
 	margin-bottom: 1.4em;
 }*/
 div.tabsAction > a.butAction, div.tabsAction > a.butActionRefused, div.tabsAction > a.butActionDelete,
-div.tabsAction > span.butAction, div.tabsAction > span.butActionRefused, div.tabsAction > span.butActionDelete {
+div.tabsAction > span.butAction, div.tabsAction > span.butActionRefused, div.tabsAction > span.butActionDelete,
+div.tabsAction > div.divButAction > span.butAction {
 	margin-bottom: 1.4em !important;
 	margin-right: 0px !important;
 }

From f99b1b261a1bb7596a0cb8499dc43a30d2f43540 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 18 May 2021 17:25:31 +0200
Subject: [PATCH 0121/1497] Fix phpcs

---
 htdocs/categories/index.php      | 2 +-
 htdocs/theme/eldy/global.inc.php | 2 +-
 htdocs/theme/md/style.css.php    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/categories/index.php b/htdocs/categories/index.php
index d338e4d95d4..065b4dfa83e 100644
--- a/htdocs/categories/index.php
+++ b/htdocs/categories/index.php
@@ -221,7 +221,7 @@ foreach ($fulltree as $key => $val) {
 $nbofentries = (count($data) - 1);
 
 $morethan1level = 0;
-foreach($data as $record) {
+foreach ($data as $record) {
 	if (!empty($record['fk_menu']) && $record['fk_menu'] > 0) {
 		$morethan1level = 1;
 	}
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 67192c7063e..e451a2af30b 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -1493,7 +1493,7 @@ select.widthcentpercentminusxx, span.widthcentpercentminusxx:not(.select2-select
 	}
 
 	.smallonsmartphone {
-    	font-size: 0.8em;
+		font-size: 0.8em;
 	}
 }
 
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 866d6c9f3d7..1ebe047ead7 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1504,7 +1504,7 @@ table[summary="list_of_modules"] .fa-cog {
 	}
 
 	.smallonsmartphone {
-    	font-size: 0.8em;
+		font-size: 0.8em;
 	}
 }
 

From 6cccd77508d2c41c5860bfa9098a1e7bd4b090da Mon Sep 17 00:00:00 2001
From: Florian Mortgat <florian.mortgat@atm-consulting.fr>
Date: Tue, 18 May 2021 17:57:23 +0200
Subject: [PATCH 0122/1497] FIX 13.0 - error message says
 MAIN_DISABLE_ALL_MAILS is set when it isn't + unhandled swiftmailer error
 (failed recipients due to RFC 2822 non-compliance)

---
 htdocs/core/actions_massactions.inc.php | 4 +++-
 htdocs/core/class/CMailFile.class.php   | 5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index 6b6d5854a1d..99f1271ff0b 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -559,8 +559,10 @@ if (!$error && $massaction == 'confirm_presend')
 							{
 								$resaction .= $langs->trans('ErrorFailedToSendMail', $from, $sendto);
 								$resaction .= '<br><div class="error">'.$mailfile->error.'</div>';
-							} else {
+							} elseif (!empty($conf->global->MAIN_DISABLE_ALL_MAILS)) {
 								$resaction .= '<div class="warning">No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS</div>';
+							} else {
+								$resaction .= $langs->trans('ErrorFailedToSendMail', $from, $sendto) . '<br><div class="error">(unhandled error)</div>';
 							}
 						}
 					}
diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index c942127aab3..67c3387fbc8 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -894,7 +894,7 @@ class CMailFile
 				}
 				// send mail
 				try {
-					$result = $this->mailer->send($this->message);
+					$result = $this->mailer->send($this->message, $failedRecipients);
 				} catch (Exception $e) {
 					$this->error = $e->getMessage();
 				}
@@ -902,6 +902,9 @@ class CMailFile
 
 				$res = true;
 				if (!empty($this->error) || !$result) {
+					if (!empty($failedRecipients)) {
+						$this->error = 'Transport failed for the following addresses: "' . join('", "', $failedRecipients) . '".';
+					}
 					dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
 					$res = false;
 				} else {

From 8e39eff180a2472a15d146bc5c0aab7eaf9afa11 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 18 May 2021 18:18:00 +0200
Subject: [PATCH 0123/1497] Look and feel v14

---
 htdocs/comm/propal/list.php                   | 22 ++++++++--------
 htdocs/commande/list.php                      |  8 +++---
 htdocs/compta/facture/class/facture.class.php |  4 +--
 htdocs/compta/facture/list.php                |  4 +--
 htdocs/contrat/list.php                       |  4 +--
 htdocs/user/class/user.class.php              | 26 ++++++++++++++-----
 6 files changed, 41 insertions(+), 27 deletions(-)

diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index b810ab242b6..48ad9783367 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -176,8 +176,8 @@ $arrayfields = array(
 	'pr.ref'=>array('label'=>"ProjectRef", 'checked'=>1, 'enabled'=>(empty($conf->projet->enabled) ? 0 : 1)),
 	'pr.title'=>array('label'=>"ProjectLabel", 'checked'=>0, 'enabled'=>(empty($conf->projet->enabled) ? 0 : 1)),
 	's.nom'=>array('label'=>"ThirdParty", 'checked'=>1),
-	's.name_alias'=>array('label'=>"AliasNameShort", 'checked'=>1),
-	's.town'=>array('label'=>"Town", 'checked'=>1),
+	's.name_alias'=>array('label'=>"AliasNameShort", 'checked'=>-1),
+	's.town'=>array('label'=>"Town", 'checked'=>-1),
 	's.zip'=>array('label'=>"Zip", 'checked'=>1),
 	'state.nom'=>array('label'=>"StateShort", 'checked'=>0),
 	'country.code_iso'=>array('label'=>"Country", 'checked'=>0),
@@ -203,7 +203,7 @@ $arrayfields = array(
 	'p.multicurrency_total_ht_invoiced'=>array('label'=>'MulticurrencyAmountInvoicedHT', 'checked'=>0, 'enabled'=>!empty($conf->multicurrency->enabled) && !empty($conf->global->PROPOSAL_SHOW_INVOICED_AMOUNT)),
 	'p.multicurrency_total_invoiced'=>array('label'=>'MulticurrencyAmountInvoicedTTC', 'checked'=>0, 'enabled'=>!empty($conf->multicurrency->enabled) && !empty($conf->global->PROPOSAL_SHOW_INVOICED_AMOUNT)),
 	'u.login'=>array('label'=>"Author", 'checked'=>1, 'position'=>10),
-	'sale_representative'=>array('label'=>"SaleRepresentativesOfThirdParty", 'checked'=>1),
+	'sale_representative'=>array('label'=>"SaleRepresentativesOfThirdParty", 'checked'=>-1),
 	'p.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>500),
 	'p.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500),
 	'p.date_cloture'=>array('label'=>"DateClosing", 'checked'=>0, 'position'=>500),
@@ -560,7 +560,7 @@ if ($search_societe_alias) {
 	$sql .= natural_search('s.name_alias', $search_societe_alias);
 }
 if ($search_login) {
-	$sql .= natural_search("u.login", $search_login);
+	$sql .= natural_search(array("u.login", "u.firstname", "u.lastname"), $search_login);
 }
 if ($search_montant_ht != '') {
 	$sql .= natural_search("p.total_ht", $search_montant_ht, 1);
@@ -616,7 +616,7 @@ if ($search_product_category > 0) {
 	$sql .= " AND cp.fk_categorie = ".$db->escape($search_product_category);
 }
 if ($socid > 0) {
-	$sql .= ' AND s.rowid = '.$socid;
+	$sql .= ' AND s.rowid = '.((int) $socid);
 }
 if ($search_status != '' && $search_status != '-1') {
 	$sql .= ' AND p.fk_statut IN ('.$db->sanitize($search_status).')';
@@ -640,10 +640,10 @@ if ($search_datedelivery_end) {
 	$sql .= " AND p.date_livraison <= '".$db->idate($search_datedelivery_end)."'";
 }
 if ($search_sale > 0) {
-	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$db->escape($search_sale);
+	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $search_sale);
 }
 if ($search_user > 0) {
-	$sql .= " AND c.fk_c_type_contact = tc.rowid AND tc.element='propal' AND tc.source='internal' AND c.element_id = p.rowid AND c.fk_socpeople = ".$db->escape($search_user);
+	$sql .= " AND c.fk_c_type_contact = tc.rowid AND tc.element='propal' AND tc.source='internal' AND c.element_id = p.rowid AND c.fk_socpeople = ".((int) $search_user);
 }
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
@@ -907,14 +907,14 @@ if ($resql) {
 		$moreforfilter .= '<div class="divsearchfield">';
 		$tmptitle = $langs->trans('IncludingProductWithTag');
 		$cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, null, 'parent', null, null, 1);
-		$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$form->selectarray('search_product_category', $cate_arbo, $search_product_category, $tmptitle, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1);
+		$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$form->selectarray('search_product_category', $cate_arbo, $search_product_category, $tmptitle, 0, 0, '', 0, 0, 0, 0, (empty($conf->dol_optimize_smallscreen) ? 'maxwidth300' : 'maxwidth250'), 1);
 		$moreforfilter .= '</div>';
 	}
 	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire) {
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
 		$tmptitle = $langs->trans('CustomersProspectsCategoriesShort');
-		$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$formother->select_categories('customer', $search_categ_cus, 'search_categ_cus', 1, $tmptitle);
+		$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$formother->select_categories('customer', $search_categ_cus, 'search_categ_cus', 1, $tmptitle, (empty($conf->dol_optimize_smallscreen) ? 'maxwidth300' : 'maxwidth250'));
 		$moreforfilter .= '</div>';
 	}
 	if (!empty($conf->stock->enabled) && !empty($conf->global->WAREHOUSE_ASK_WAREHOUSE_DURING_PROPAL)) {
@@ -1715,7 +1715,7 @@ if ($resql) {
 
 		// Author
 		if (!empty($arrayfields['u.login']['checked'])) {
-			print '<td>';
+			print '<td class="tdoverflowmax200">';
 			if ($userstatic->id) {
 				print $userstatic->getNomUrl(-1);
 			}
@@ -1727,7 +1727,7 @@ if ($resql) {
 
 		if (!empty($arrayfields['sale_representative']['checked'])) {
 			// Sales representatives
-			print '<td>';
+			print '<td class="tdoverflowmax200">';
 			if ($obj->socid > 0) {
 				$listsalesrepresentatives = $companystatic->getSalesRepresentatives($user);
 				if ($listsalesrepresentatives < 0) {
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 3485011c1e6..f42b7c08de9 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -588,7 +588,7 @@ if ($search_multicurrency_montant_ttc != '') {
 	$sql .= natural_search('c.multicurrency_total_ttc', $search_multicurrency_montant_ttc, 1);
 }
 if ($search_login) {
-	$sql .= natural_search("u.login", $search_login);
+	$sql .= natural_search(array("u.login", "u.firstname", "u.lastname"), $search_login);
 }
 if ($search_project_ref != '') {
 	$sql .= natural_search("p.ref", $search_project_ref);
@@ -1490,7 +1490,7 @@ if ($resql) {
 				$totalarray['nbfield']++;
 			}
 		}
-		// Town
+		// Alias name
 		if (!empty($arrayfields['s.name_alias']['checked'])) {
 			print '<td class="nocellnopadd">';
 			print $obj->alias;
@@ -1565,7 +1565,7 @@ if ($resql) {
 				$totalarray['nbfield']++;
 			}
 		}
-		//Shipping Method
+		// Shipping Method
 		if (!empty($arrayfields['c.fk_shipping_method']['checked'])) {
 			print '<td>';
 			$form->formSelectShippingMethod('', $obj->fk_shipping_method, 'none', 1);
@@ -1690,7 +1690,7 @@ if ($resql) {
 
 		// Author
 		if (!empty($arrayfields['u.login']['checked'])) {
-			print '<td>';
+			print '<td class="tdoverflowmax200">';
 			if ($userstatic->id) {
 				print $userstatic->getNomUrl(-1);
 			} else {
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 549862c53cc..bb25da4e604 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -301,7 +301,7 @@ class Facture extends CommonInvoice
 		'fk_soc' =>array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>50),
 		'datef' =>array('type'=>'date', 'label'=>'DateInvoice', 'enabled'=>1, 'visible'=>1, 'position'=>20),
 		'date_valid' =>array('type'=>'date', 'label'=>'DateValidation', 'enabled'=>1, 'visible'=>-1, 'position'=>22),
-		'date_lim_reglement' =>array('type'=>'date', 'label'=>'DateDue', 'enabled'=>1, 'visible'=>-1, 'position'=>25),
+		'date_lim_reglement' =>array('type'=>'date', 'label'=>'DateDue', 'enabled'=>1, 'visible'=>1, 'position'=>25),
 		'date_closing' =>array('type'=>'datetime', 'label'=>'Date closing', 'enabled'=>1, 'visible'=>-1, 'position'=>30),
 		'paye' =>array('type'=>'smallint(6)', 'label'=>'InvoicePaidCompletely', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>80),
 		//'amount' =>array('type'=>'double(24,8)', 'label'=>'Amount', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>85),
@@ -310,7 +310,7 @@ class Facture extends CommonInvoice
 		//'remise' =>array('type'=>'double', 'label'=>'Remise', 'enabled'=>1, 'visible'=>-1, 'position'=>100),
 		'close_code' =>array('type'=>'varchar(16)', 'label'=>'EarlyClosingReason', 'enabled'=>1, 'visible'=>-1, 'position'=>92),
 		'close_note' =>array('type'=>'varchar(128)', 'label'=>'EarlyClosingComment', 'enabled'=>1, 'visible'=>-1, 'position'=>93),
-		'total_ht' =>array('type'=>'double(24,8)', 'label'=>'AmountHT', 'enabled'=>1, 'visible'=>-1, 'position'=>95, 'isameasure'=>1),
+		'total_ht' =>array('type'=>'double(24,8)', 'label'=>'AmountHT', 'enabled'=>1, 'visible'=>1, 'position'=>95, 'isameasure'=>1),
 		'total_tva' =>array('type'=>'double(24,8)', 'label'=>'AmountVAT', 'enabled'=>1, 'visible'=>-1, 'position'=>100, 'isameasure'=>1),
 		'localtax1' =>array('type'=>'double(24,8)', 'label'=>'LT1', 'enabled'=>1, 'visible'=>-1, 'position'=>110, 'isameasure'=>1),
 		'localtax2' =>array('type'=>'double(24,8)', 'label'=>'LT2', 'enabled'=>1, 'visible'=>-1, 'position'=>120, 'isameasure'=>1),
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 7c9b71e458b..282aad95d89 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -632,7 +632,7 @@ if ($search_multicurrency_montant_ttc != '') {
 	$sql .= natural_search('f.multicurrency_total_ttc', $search_multicurrency_montant_ttc, 1);
 }
 if ($search_login) {
-	$sql .= natural_search('u.login', $search_login);
+	$sql .= natural_search(array('u.login', 'u.firstname', 'u.lastname'), $search_login);
 }
 if ($search_categ_cus > 0) {
 	$sql .= " AND cc.fk_categorie = ".$db->escape($search_categ_cus);
@@ -1900,7 +1900,7 @@ if ($resql) {
 
 			// Author
 			if (!empty($arrayfields['u.login']['checked'])) {
-				print '<td>';
+				print '<td class="tdoverflowmax200">';
 				if ($userstatic->id) {
 					print $userstatic->getNomUrl(-1);
 				} else {
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index 51b61c41830..e44c0411bea 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -133,10 +133,10 @@ $arrayfields = array(
 	's.nom'=>array('label'=>$langs->trans("ThirdParty"), 'checked'=>1, 'position'=>30),
 	's.email'=>array('label'=>$langs->trans("ThirdPartyEmail"), 'checked'=>0, 'position'=>30),
 	's.town'=>array('label'=>$langs->trans("Town"), 'checked'=>0, 'position'=>31),
-	's.zip'=>array('label'=>$langs->trans("Zip"), 'checked'=>0, 'position'=>32),
+	's.zip'=>array('label'=>$langs->trans("Zip"), 'checked'=>1, 'position'=>32),
 	'state.nom'=>array('label'=>$langs->trans("StateShort"), 'checked'=>0, 'position'=>33),
 	'country.code_iso'=>array('label'=>$langs->trans("Country"), 'checked'=>0, 'position'=>34),
-	'sale_representative'=>array('label'=>$langs->trans("SaleRepresentativesOfThirdParty"), 'checked'=>1, 'position'=>80),
+	'sale_representative'=>array('label'=>$langs->trans("SaleRepresentativesOfThirdParty"), 'checked'=>-1, 'position'=>80),
 	'c.date_contrat'=>array('label'=>$langs->trans("DateContract"), 'checked'=>1, 'position'=>45),
 	'c.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
 	'c.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 981374996cf..b8e63ea8f19 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -2558,11 +2558,13 @@ class User extends CommonObject
 	/**
 	 *  Return clickable link of login (eventualy with picto)
 	 *
-	 *	@param	int		$withpicto		Include picto into link
-	 *	@param	string	$option			Sur quoi pointe le lien
-	 *	@return	string					Chaine avec URL
+	 *	@param	int		$withpictoimg		Include picto into link
+	 *	@param	string	$option				On what the link point to ('leave', 'accountancy', 'nolink', )
+	 *  @param	integer	$notooltip			1=Disable tooltip on picto and name
+	 *  @param  string  $morecss       		Add more css on link
+	 *	@return	string						String with URL
 	 */
-	public function getLoginUrl($withpicto = 0, $option = '')
+	public function getLoginUrl($withpictoimg = 0, $option = '', $notooltip = 0, $morecss = '')
 	{
 		global $langs, $user;
 
@@ -2587,11 +2589,23 @@ class User extends CommonObject
 		}
 
 		$result .= $linkstart;
-		if ($withpicto) {
-			$result .= img_object($langs->trans("ShowUser"), 'user', 'class="paddingright"');
+		if ($withpictoimg) {
+			$paddafterimage = '';
+			if (abs($withpictoimg) == 1) {
+				$paddafterimage = 'style="margin-'.($langs->trans("DIRECTION") == 'rtl' ? 'left' : 'right').': 3px;"';
+			}
+			// Only picto
+			if ($withpictoimg > 0) {
+				$picto = '<!-- picto user --><span class="nopadding userimg'.($morecss ? ' '.$morecss : '').'">'.img_object('', 'user', $paddafterimage.' '.($notooltip ? '' : 'class="paddingright classfortooltip"'), 0, 0, $notooltip ? 0 : 1).'</span>';
+			} else {
+				// Picto must be a photo
+				$picto = '<!-- picto photo user --><span class="nopadding userimg'.($morecss ? ' '.$morecss : '').'"'.($paddafterimage ? ' '.$paddafterimage : '').'>'.Form::showphoto('userphoto', $this, 0, 0, 0, 'userphoto'.($withpictoimg == -3 ? 'small' : ''), 'mini', 0, 1).'</span>';
+			}
+			$result .= $picto;
 		}
 		$result .= $this->login;
 		$result .= $linkend;
+
 		return $result;
 	}
 

From 57732d4265f36bfb1c80c50c8ad9c39b3819a1f1 Mon Sep 17 00:00:00 2001
From: gmilad <61253440+gmilad@users.noreply.github.com>
Date: Tue, 18 May 2021 19:45:15 +0200
Subject: [PATCH 0124/1497] Fix issue #17608 for branch 10

Fix issue #17608 for branch 10
---
 htdocs/admin/translation.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index 2a9983d95b1..1a3fa4d4122 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -200,7 +200,7 @@ if ($action == 'delete')
 $form = new Form($db);
 $formadmin = new FormAdmin($db);
 
-$wikihelp='EN:Setup|FR:Paramétrage|ES:Configuración';
+$wikihelp = 'EN:Setup_Translation|FR:Paramétrage_Traduction|ES:Configuración_Traducción';
 llxHeader('', $langs->trans("Setup"), $wikihelp);
 
 $param='&mode='.$mode;

From 4bb18db90516bd71c43685c71131b3a1742af23d Mon Sep 17 00:00:00 2001
From: gmilad <61253440+gmilad@users.noreply.github.com>
Date: Tue, 18 May 2021 19:53:35 +0200
Subject: [PATCH 0125/1497] Fix issue #17608 for branch 11

Fix issue #17608 for branch 11
---
 htdocs/admin/translation.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index c641be11a59..23c2a69c127 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -197,7 +197,7 @@ if ($action == 'delete')
 $form = new Form($db);
 $formadmin = new FormAdmin($db);
 
-$wikihelp = 'EN:Setup|FR:Paramétrage|ES:Configuración';
+$wikihelp = 'EN:Setup_Translation|FR:Paramétrage_Traduction|ES:Configuración_Traducción';
 llxHeader('', $langs->trans("Setup"), $wikihelp);
 
 $param = '&mode='.$mode;

From 1cf7d0cee79e344ef26ab07dc2c9c1b92c3ac0c1 Mon Sep 17 00:00:00 2001
From: Givriz <damien375@outlook.fr>
Date: Tue, 18 May 2021 20:13:26 +0200
Subject: [PATCH 0126/1497] Compatibility phpv8

---
 htdocs/core/class/commonobject.class.php        |  2 +-
 htdocs/core/tpl/extrafields_add.tpl.php         |  2 +-
 .../tpl/extrafields_list_print_fields.tpl.php   |  2 +-
 htdocs/societe/card.php                         | 10 +++++-----
 htdocs/user/card.php                            |  4 ++--
 htdocs/user/list.php                            | 17 ++++++++++-------
 6 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 4b55b52dba0..3f4b2dd9ee6 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -7312,7 +7312,7 @@ abstract class CommonObject
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('showOptionals', $parameters, $this, $action); // Note that $action and $object may have been modified by hook
 		if (empty($reshook)) {
-			if (is_array($extrafields->attributes[$this->table_element]['label']) && count($extrafields->attributes[$this->table_element]['label']) > 0) {
+			if (key_exists('label', $extrafields->attributes[$this->table_element]) && is_array($extrafields->attributes[$this->table_element]['label']) && count($extrafields->attributes[$this->table_element]['label']) > 0) {
 				$out .= "\n";
 				$out .= '<!-- showOptionals --> ';
 				$out .= "\n";
diff --git a/htdocs/core/tpl/extrafields_add.tpl.php b/htdocs/core/tpl/extrafields_add.tpl.php
index f194a177178..2f44bbe9c48 100644
--- a/htdocs/core/tpl/extrafields_add.tpl.php
+++ b/htdocs/core/tpl/extrafields_add.tpl.php
@@ -47,7 +47,7 @@ if (empty($reshook)) {
 	if (isset($tpl_context)) {
 		$params['tpl_context'] = $tpl_context;
 	}
-	$params['cols'] = $parameters['colspanvalue'];
+	$params['cols'] = key_exists('colspanvalue', $parameters) ? $parameters['colspanvalue'] : '';
 	print $object->showOptionals($extrafields, 'create', $params);
 }
 
diff --git a/htdocs/core/tpl/extrafields_list_print_fields.tpl.php b/htdocs/core/tpl/extrafields_list_print_fields.tpl.php
index 4c56b0223cd..021ff42a9d3 100644
--- a/htdocs/core/tpl/extrafields_list_print_fields.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_print_fields.tpl.php
@@ -12,7 +12,7 @@ if (empty($extrafieldsobjectkey) && is_object($object)) {
 
 // Loop to show all columns of extrafields from $obj, $extrafields and $db
 if (!empty($extrafieldsobjectkey)) {	// $extrafieldsobject is the $object->table_element like 'societe', 'socpeople', ...
-	if (is_array($extrafields->attributes[$extrafieldsobjectkey]['label']) && count($extrafields->attributes[$extrafieldsobjectkey]['label'])) {
+	if (key_exists('label', $extrafields->attributes[$extrafieldsobjectkey]) && is_array($extrafields->attributes[$extrafieldsobjectkey]['label']) && count($extrafields->attributes[$extrafieldsobjectkey]['label'])) {
 		if (empty($extrafieldsobjectprefix)) {
 			$extrafieldsobjectprefix = 'ef.';
 		}
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 4973a328023..3d03a97a59f 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -48,13 +48,13 @@ require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 if (!empty($conf->adherent->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 }
-if (! empty($conf->accounting->enabled)) {
+if (!empty($conf->accounting->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
 }
-if (! empty($conf->accounting->enabled)) {
+if (!empty($conf->accounting->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 }
-if (! empty($conf->accounting->enabled)) {
+if (!empty($conf->accounting->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
 }
 
@@ -610,7 +610,7 @@ if (empty($reshook)) {
 					}
 
 					// Logo/Photo save
-					$dir     = $conf->societe->multidir_output[$conf->entity]."/".$object->id."/logos/";
+					$dir = $conf->societe->multidir_output[$conf->entity]."/".$object->id."/logos/";
 					$file_OK = is_uploaded_file($_FILES['photo']['tmp_name']);
 					if ($file_OK) {
 						if (image_format_supported($_FILES['photo']['name'])) {
@@ -892,7 +892,7 @@ $form = new Form($db);
 $formfile = new FormFile($db);
 $formadmin = new FormAdmin($db);
 $formcompany = new FormCompany($db);
-if (! empty($conf->accounting->enabled)) {
+if (!empty($conf->accounting->enabled)) {
 	$formaccounting = new FormAccounting($db);
 }
 
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 332c98f56da..595dd8154d6 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1110,7 +1110,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 	}
 
 	// Accountancy code
-	if ($conf->accounting->enabled) {
+	if (!empty($conf->accounting->enabled)) {
 		print '<tr><td>'.$langs->trans("AccountancyCode").'</td>';
 		print '<td>';
 		print '<input type="text" name="accountancy_code" value="'.dol_escape_htmltag(GETPOST('accountancy_code', 'alphanohtml')).'">';
@@ -1163,7 +1163,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 	print $langs->trans("Note");
 	print '</td><td>';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-	$doleditor = new DolEditor('note', GETPOSTISSET('note') ? GETPOST('note', 'restricthtml') : '', '', 120, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_3, '90%');
+	$doleditor = new DolEditor('note', GETPOSTISSET('note') ? GETPOST('note', 'restricthtml') : '', '', 120, 'dolibarr_notes', '', false, true, getDolGlobalString('FCKEDITOR_ENABLE_SOCIETE'), ROWS_3, '90%');
 	$doleditor->Create();
 	print "</td></tr>\n";
 
diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index a697fdf96c0..596670e6ce2 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -68,7 +68,7 @@ $pagenext = $page + 1;
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $object = new User($db);
 $extrafields = new ExtraFields($db);
-$diroutputmassaction = $conf->mymodule->dir_output.'/temp/massgeneration/'.$user->id;
+$diroutputmassaction = empty($conf->mymodule->dir_output) ? '' : $conf->mymodule->dir_output.'/temp/massgeneration/'.$user->id;
 $hookmanager->initHooks(array('userlist'));
 
 // Fetch optionals attributes and labels
@@ -124,9 +124,9 @@ $arrayfields = array(
 	'u.office_phone'=>array('label'=>"PhonePro", 'checked'=>1, 'position'=>31),
 	'u.user_mobile'=>array('label'=>"PhoneMobile", 'checked'=>1, 'position'=>32),
 	'u.email'=>array('label'=>"EMail", 'checked'=>1, 'position'=>35),
-	'u.api_key'=>array('label'=>"ApiKey", 'checked'=>0, 'position'=>40, "enabled"=>($conf->api->enabled && $user->admin)),
+	'u.api_key'=>array('label'=>"ApiKey", 'checked'=>0, 'position'=>40, "enabled"=>(!empty($conf->api->enabled) && $user->admin)),
 	'u.fk_soc'=>array('label'=>"Company", 'checked'=>($contextpage == 'employeelist' ? 0 : 1), 'position'=>45),
-	'u.salary'=>array('label'=>"Salary", 'checked'=>1, 'position'=>80, 'enabled'=>($conf->salaries->enabled && !empty($user->rights->salaries->readall))),
+	'u.salary'=>array('label'=>"Salary", 'checked'=>1, 'position'=>80, 'enabled'=>(!empty($conf->salaries->enabled) && !empty($user->rights->salaries->readall))),
 	'u.datelastlogin'=>array('label'=>"LastConnexion", 'checked'=>1, 'position'=>100),
 	'u.datepreviouslogin'=>array('label'=>"PreviousConnexion", 'checked'=>0, 'position'=>110),
 	'u.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>500),
@@ -345,7 +345,7 @@ $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // N
 $sql .= preg_replace('/^,/', '', $hookmanager->resPrint);
 $sql = preg_replace('/,\s*$/', '', $sql);
 $sql .= " FROM ".MAIN_DB_PREFIX."user as u";
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
+if (key_exists('label', $extrafields->attributes[$object->table_element]) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (u.rowid = ef.fk_object)";
 }
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON u.fk_soc = s.rowid";
@@ -577,7 +577,7 @@ if (!empty($socid)) {
 $newcardbutton = dolGetButtonTitle($langs->trans('NewUser'), '', 'fa fa-plus-circle', $url, '', $permissiontoadd);
 
 $moreparam = array('morecss'=>'btnTitleSelected');
-$morehtmlright .= dolGetButtonTitle($langs->trans("List"), '', 'fa fa-list paddingleft imgforviewmode', DOL_URL_ROOT.'/user/list.php'.(($search_statut != '' && $search_statut >= 0) ? '?search_statut='.$search_statut : ''), '', 1, $moreparam);
+$morehtmlright = dolGetButtonTitle($langs->trans("List"), '', 'fa fa-list paddingleft imgforviewmode', DOL_URL_ROOT.'/user/list.php'.(($search_statut != '' && $search_statut >= 0) ? '?search_statut='.$search_statut : ''), '', 1, $moreparam);
 $moreparam = array('morecss'=>'marginleftonly');
 $morehtmlright .= dolGetButtonTitle($langs->trans("HierarchicView"), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT.'/user/hierarchy.php'.(($search_statut != '' && $search_statut >= 0) ? '?search_statut='.$search_statut : ''), '', 1, $moreparam);
 
@@ -808,7 +808,7 @@ print '</tr>'."\n";
 
 // Detect if we need a fetch on each output line
 $needToFetchEachLine = 0;
-if (is_array($extrafields->attributes[$object->table_element]['computed']) && count($extrafields->attributes[$object->table_element]['computed']) > 0) {
+if (key_exists('computed', $extrafields->attributes[$object->table_element]) && is_array($extrafields->attributes[$object->table_element]['computed']) && count($extrafields->attributes[$object->table_element]['computed']) > 0) {
 	foreach ($extrafields->attributes[$object->table_element]['computed'] as $key => $val) {
 		if (preg_match('/\$object/', $val)) {
 			$needToFetchEachLine++; // There is at least one compute field that use $object
@@ -821,6 +821,7 @@ if (is_array($extrafields->attributes[$object->table_element]['computed']) && co
 // --------------------------------------------------------------------
 $i = 0;
 $totalarray = array();
+$totalarray['nbfield'] = 0;
 $arrayofselected = is_array($toselect) ? $toselect : array();
 while ($i < ($limit ? min($num, $limit) : $num)) {
 	$obj = $db->fetch_object($resql);
@@ -833,7 +834,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 
 	$userstatic->id = $obj->rowid;
 	$userstatic->admin = $obj->admin;
-	$userstatic->ref = $obj->label;
+	$userstatic->ref = empty($obj->label) ? '' : $obj->label;
 	$userstatic->login = $obj->login;
 	$userstatic->statut = $obj->statut;
 	$userstatic->office_phone = $obj->office_phone;
@@ -928,6 +929,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 			$totalarray['nbfield']++;
 		}
 	}
+	if (empty($obj->country_code)) $obj->country_code = '';
 	if (!empty($arrayfields['u.office_phone']['checked'])) {
 		print "<td>".dol_print_phone($obj->office_phone, $obj->country_code, 0, $obj->rowid, 'AC_TEL', ' ', 'phone')."</td>\n";
 		if (!$i) {
@@ -940,6 +942,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 			$totalarray['nbfield']++;
 		}
 	}
+	if (empty($obj->socid)) $obj->socid = 0;
 	if (!empty($arrayfields['u.email']['checked'])) {
 		print '<td class="tdoverflowmax150">'.dol_print_email($obj->email, $obj->rowid, $obj->socid, 'AC_EMAIL', 0, 0, 1)."</td>\n";
 		if (!$i) {

From 4d422356708088006496784e4c377ac507550d54 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 18 May 2021 20:46:14 +0200
Subject: [PATCH 0127/1497] Complete experimental module knowledge management

---
 htdocs/install/mysql/migration/13.0.0-14.0.0.sql                | 2 ++
 .../mysql/tables/llx_knowledgemanagement_knowledgerecord.sql    | 1 +
 2 files changed, 3 insertions(+)

diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index cf5da55d719..b95ea30f8fb 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -492,12 +492,14 @@ CREATE TABLE llx_knowledgemanagement_knowledgerecord(
 	model_pdf varchar(255), 
 	question text NOT NULL, 
 	answer text,
+	url varchar(255),
 	fk_ticket integer,
 	status integer NOT NULL
 	-- END MODULEBUILDER FIELDS
 ) ENGINE=innodb;
 
 ALTER TABLE llx_knowledgemanagement_knowledgerecord ADD COLUMN fk_ticket integer;
+ALTER TABLE llx_knowledgemanagement_knowledgerecord ADD COLUMN url varchar(255);
 
 
 create table llx_knowledgemanagement_knowledgerecord_extrafields
diff --git a/htdocs/install/mysql/tables/llx_knowledgemanagement_knowledgerecord.sql b/htdocs/install/mysql/tables/llx_knowledgemanagement_knowledgerecord.sql
index 5c9e4cf199f..c5332372019 100644
--- a/htdocs/install/mysql/tables/llx_knowledgemanagement_knowledgerecord.sql
+++ b/htdocs/install/mysql/tables/llx_knowledgemanagement_knowledgerecord.sql
@@ -28,6 +28,7 @@ CREATE TABLE llx_knowledgemanagement_knowledgerecord(
 	model_pdf varchar(255), 
 	question text NOT NULL, 
 	answer text,
+	url varchar(255),
 	fk_ticket integer,
 	status integer NOT NULL
 	-- END MODULEBUILDER FIELDS

From dffb244776029295a1b947c4824fc71edb970b2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Tue, 18 May 2021 21:04:43 +0200
Subject: [PATCH 0128/1497] Update AutoLoader.php

---
 .../includes/restler/framework/Luracast/Restler/AutoLoader.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/includes/restler/framework/Luracast/Restler/AutoLoader.php b/htdocs/includes/restler/framework/Luracast/Restler/AutoLoader.php
index 5ed160a070a..b11506ea86c 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/AutoLoader.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/AutoLoader.php
@@ -263,7 +263,7 @@ class AutoLoader
      * @return bool false unless className now exists
      */
     private function loadLastResort($className, $loader = null) {
-        $loaders = array_unique(static::$rogueLoaders);
+        $loaders = array_unique(static::$rogueLoaders, SORT_REGULAR);
         if (isset($loader)) {
             if (false === array_search($loader, $loaders))
                 static::$rogueLoaders[] = $loader;

From f86e10b453c06e023db5581ec749c013902ea392 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Wed, 19 May 2021 06:37:02 +0200
Subject: [PATCH 0129/1497] FIX wrong variable fk_code_ventilation register for
 addline

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

diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index f1f5c8fb969..62a734174b3 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -1830,7 +1830,7 @@ class FactureFournisseur extends CommonInvoice
 			$this->line->remise_percent = $remise_percent;
 			$this->line->date_start = $date_start;
 			$this->line->date_end = $date_end;
-			$this->line->ventil = $ventil;
+			$this->line->fk_code_ventilation = $ventil;
 			$this->line->rang = $rang;
 			$this->line->info_bits = $info_bits;
 

From 5fd02992c0b636cbc55e2daee9f67a8a846f516e Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Wed, 19 May 2021 10:26:04 +0200
Subject: [PATCH 0130/1497] Remove forgotten  echo

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

diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index b783ad5c002..7a758137133 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -1477,7 +1477,7 @@ if ((empty($conf->global->PRODUIT_CUSTOMER_PRICES) || $action == 'showlog_defaul
 			}
 
 			print '<td class="center">'.$langs->trans("PriceBase").'</td>';
-			print $conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL;
+
 			if (empty($conf->global->PRODUIT_MULTIPRICES) && empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) print '<td class="right">'.$langs->trans("DefaultTaxRate").'</td>';
 			print '<td class="right">'.$langs->trans("HT").'</td>';
 			print '<td class="right">'.$langs->trans("TTC").'</td>';

From 78cf2b59c80142b2df015861fd4b1542fb622ea4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 19 May 2021 11:47:58 +0200
Subject: [PATCH 0131/1497] Debug feature copy-paste on smarpthone

---
 htdocs/core/js/lib_foot.js.php    | 8 ++++----
 htdocs/core/lib/functions.lib.php | 9 ++++++++-
 htdocs/theme/eldy/btn.inc.php     | 7 ++++++-
 htdocs/theme/eldy/global.inc.php  | 4 ++++
 htdocs/theme/md/style.css.php     | 4 ++++
 5 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/js/lib_foot.js.php b/htdocs/core/js/lib_foot.js.php
index c0a8844b572..20debf50f12 100644
--- a/htdocs/core/js/lib_foot.js.php
+++ b/htdocs/core/js/lib_foot.js.php
@@ -214,17 +214,17 @@ print '
 print "\n/* JS CODE TO ENABLE ClipBoard copy paste*/\n";
 print 'jQuery(\'.clipboardCPShowOnHover\').hover(
 			function() {
-			console.log("We hover a value with a copy paste feature");
+				console.log("We hover a value with a copy paste feature");
 				$(this).children(".clipboardCPButton, .clipboardCPText").show();
 			},
 			function() {
-			console.log("We hover out the value with a copy paste feature");
+				console.log("We hover out the value with a copy paste feature");
 				$(this).children(".clipboardCPButton, .clipboardCPText").hide();
 			}
 		);';
-print 'jQuery(\'.clipboardCPButton\').click(function() {
+print 'jQuery(\'.clipboardCPButton, .clipboardCPValueToPrint\').click(function() {
 		/* console.log(this.parentNode); */
-		console.log("We click on a clipboardCPButton tag");
+		console.log("We click on a clipboardCPButton or clipboardCPValueToPrint class");
 		if (window.getSelection) {
 			selection = window.getSelection();
 
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 8d171a048b0..abf9c587b68 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -10236,7 +10236,8 @@ function readfileLowMemory($fullpath_original_file_osencoded, $method = -1)
 }
 
 /**
- * Create a button to copy $valuetocopy in the clipboard
+ * Create a button to copy $valuetocopy in the clipboard.
+ * Code that handle the click is inside lib_foot.jsp.php
  *
  * @param 	string 	$valuetocopy 		The value to print
  * @param	int		$showonlyonhover	Show the copy-paste button only on hover
@@ -10245,6 +10246,12 @@ function readfileLowMemory($fullpath_original_file_osencoded, $method = -1)
  */
 function showValueWithClipboardCPButton($valuetocopy, $showonlyonhover = 1, $texttoshow = '')
 {
+	global $conf;
+
+	/*if (!empty($conf->dol_no_mouse_hover)) {
+		$showonlyonhover = 0;
+	}*/
+
 	if ($texttoshow) {
 		$result = '<span class="clipboardCP'.($showonlyonhover ? ' clipboardCPShowOnHover' : '').'"><span class="clipboardCPValue hidewithsize">'.$valuetocopy.'</span><span class="clipboardCPValueToPrint">'.$texttoshow.'</span><span class="clipboardCPButton far fa-clipboard opacitymedium paddingleft paddingright"></span><span class="clipboardCPText opacitymedium"></span></span>';
 	} else {
diff --git a/htdocs/theme/eldy/btn.inc.php b/htdocs/theme/eldy/btn.inc.php
index d874266f81d..a05a8dc7952 100644
--- a/htdocs/theme/eldy/btn.inc.php
+++ b/htdocs/theme/eldy/btn.inc.php
@@ -51,7 +51,12 @@ if (!empty($conf->global->THEME_DARKMODEENABLED)) {
 }*/
 div.tabsAction > a.butAction, div.tabsAction > a.butActionRefused, div.tabsAction > a.butActionDelete,
 div.tabsAction > span.butAction, div.tabsAction > span.butActionRefused, div.tabsAction > span.butActionDelete,
-div.tabsAction > div.divButAction > span.butAction {
+div.tabsAction > div.divButAction > span.butAction,
+div.tabsAction > div.divButAction > span.butActionDelete,
+div.tabsAction > div.divButAction > span.butActionRefused,
+div.tabsAction > div.divButAction > a.butAction,
+div.tabsAction > div.divButAction > a.butActionDelete,
+div.tabsAction > div.divButAction > a.butActionRefused {
 	margin-bottom: 1.4em !important;
 	margin-right: 0px !important;
 }
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index e451a2af30b..8a1cc74de8c 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -6770,10 +6770,14 @@ div.phpdebugbar-widgets-templates a.phpdebugbar-widgets-editor-link:before
 /* For copy-paste feature                                                         */
 /* ============================================================================== */
 
+span.clipboardCPValueToPrint {
+	display: inline-block;
+}
 span.clipboardCPValue.hidewithsize {
 	width: 0 !important;
 	display: inline-block;
 	color: transparent;
+	white-space: nowrap;
 }
 
 .clipboardCPShowOnHover .clipboardCPButton {
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 1ebe047ead7..1ade055a9ef 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -6634,10 +6634,14 @@ div.phpdebugbar-widgets-templates a.phpdebugbar-widgets-editor-link:before
 /* For copy-paste feature                                                         */
 /* ============================================================================== */
 
+span.clipboardCPValueToPrint {
+	display: inline-block;
+}
 span.clipboardCPValue.hidewithsize {
 	width: 0 !important;
 	display: inline-block;
 	color: transparent;
+	white-space: nowrap;
 }
 
 .clipboardCPShowOnHover .clipboardCPButton {

From 9219dcfecb048e9778cf4815297f792af5fed601 Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Wed, 19 May 2021 11:52:34 +0200
Subject: [PATCH 0132/1497] Fix price log spam

---
 htdocs/product/class/product.class.php | 40 +++++++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 188bcbfd355..124990d09e1 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -1534,6 +1534,38 @@ class Product extends CommonObject
 		}
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  check if price have really change to avoid log pollution
+	 *
+	 * @param  int  $level price level to change
+	 * @return int                    <0 if KO, >0 if OK
+	 */
+	private function getArrayForPriceCompare($level = 0)
+	{
+		// phpcs:enable
+
+		$testExit = array('multiprices','multiprices_ttc','multiprices_base_type','multiprices_min','multiprices_min_ttc','multiprices_tva_tx','multiprices_recuperableonly');
+
+		foreach ($testExit as $field){
+			if (!isset($this->$field[$level])) {
+				return array();
+			}
+		}
+
+		$lastPrice = array(
+			'level' => $level ? $level : 1,
+			'multiprices' => doubleval($this->multiprices[$level]),
+			'multiprices_ttc' => doubleval($this->multiprices_ttc[$level]),
+			'multiprices_base_type' => $this->multiprices_base_type[$level],
+			'multiprices_min' => doubleval($this->multiprices_min[$level]),
+			'multiprices_min_ttc' => doubleval($this->multiprices_min_ttc[$level]),
+			'multiprices_tva_tx' => doubleval($this->multiprices_tva_tx[$level]),
+			'multiprices_recuperableonly' => doubleval($this->multiprices_recuperableonly[$level]),
+		);
+
+		return $lastPrice;
+	}
 
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -1862,6 +1894,8 @@ class Product extends CommonObject
 	{
 		global $conf, $langs;
 
+		$lastPriceData = $this->getArrayForPriceCompare($level); // temporary store current price before update
+
 		$id = $this->id;
 
 		dol_syslog(get_class($this)."::update_price id=".$id." newprice=".$newprice." newpricebase=".$newpricebase." newminprice=".$newminprice." level=".$level." npr=".$newnpr." newdefaultvatcode=".$newdefaultvatcode);
@@ -1994,7 +2028,11 @@ class Product extends CommonObject
 				// Price by quantity
 				$this->price_by_qty = $newpbq;
 
-				$this->_log_price($user, $level); // Save price for level into table product_price
+				// check if price have really change before log
+				$newPriceData = $this->getArrayForPriceCompare($level);
+				if (!empty(array_diff_assoc($newPriceData, $lastPriceData)) || empty($conf->global->PRODUIT_MULTIPRICES)) {
+					$this->_log_price($user, $level); // Save price for level into table product_price
+				}
 
 				$this->level = $level; // Store level of price edited for trigger
 

From 7b4ed859eb9f5c89466662c61b104fbc28f15090 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 19 May 2021 11:57:12 +0200
Subject: [PATCH 0133/1497] css

---
 htdocs/theme/eldy/global.inc.php | 4 ++--
 htdocs/theme/md/style.css.php    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 8a1cc74de8c..988ac6b3ae3 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -902,8 +902,8 @@ span.fa.fa-plus-circle.paddingleft {
 	height: 28px;
 	vertical-align: middle;
 }
-.divsocialnetwork:not(:first-child) {
-	padding-left: 20px;
+.divsocialnetwork:not(:last-child) {
+	padding-<?php print $right; ?>: 20px;
 }
 div.divsearchfield {
 	float: <?php print $left; ?>;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 1ade055a9ef..e292b3850d1 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1002,8 +1002,8 @@ body[class*="colorblind-"] .text-success{
 	height: 28px;
 	vertical-align: middle;
 }
-.divsocialnetwork:not(:first-child) {
-	padding-left: 20px;
+.divsocialnetwork:not(:last-child) {
+	padding-<?php print $right; ?>: 20px;
 }
 div.divsearchfield {
 	float: <?php print $left; ?>;

From 1512abf96ab4412717c53f4877df56279a9b6921 Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Wed, 19 May 2021 12:00:27 +0200
Subject: [PATCH 0134/1497] Remove hpcs:disable

---
 htdocs/product/class/product.class.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 124990d09e1..87fb839b5c9 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -1534,7 +1534,6 @@ class Product extends CommonObject
 		}
 	}
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  check if price have really change to avoid log pollution
 	 *
@@ -1543,7 +1542,6 @@ class Product extends CommonObject
 	 */
 	private function getArrayForPriceCompare($level = 0)
 	{
-		// phpcs:enable
 
 		$testExit = array('multiprices','multiprices_ttc','multiprices_base_type','multiprices_min','multiprices_min_ttc','multiprices_tva_tx','multiprices_recuperableonly');
 

From 3bf71d456ddc80564e29631ba714fe8d6368e096 Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Wed, 19 May 2021 12:01:47 +0200
Subject: [PATCH 0135/1497] fix doc

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

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 87fb839b5c9..685180e4659 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -1535,10 +1535,10 @@ class Product extends CommonObject
 	}
 
 	/**
-	 *  check if price have really change to avoid log pollution
+	 *  used to check if price have really change to avoid log pollution
 	 *
 	 * @param  int  $level price level to change
-	 * @return int                    <0 if KO, >0 if OK
+	 * @return array
 	 */
 	private function getArrayForPriceCompare($level = 0)
 	{

From 90835eaab4a740fac3ad46207e54fec7dcdbae43 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 19 May 2021 12:08:17 +0200
Subject: [PATCH 0136/1497] css

---
 htdocs/theme/eldy/btn.inc.php | 17 +++++++++++++++++
 htdocs/theme/md/btn.inc.php   | 17 +++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/htdocs/theme/eldy/btn.inc.php b/htdocs/theme/eldy/btn.inc.php
index a05a8dc7952..7122c252cbe 100644
--- a/htdocs/theme/eldy/btn.inc.php
+++ b/htdocs/theme/eldy/btn.inc.php
@@ -308,6 +308,23 @@ div.pagination li:first-child a.btnTitle{
 	}
 }
 
+/* rule to reduce top menu - 3rd reduction: The menu for user is on left */
+@media only screen and (max-width: <?php echo empty($conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3) ? round($nbtopmenuentries * 47, 0) + 130 : $conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3; ?>px)	/* reduction 3 */
+{
+	.butAction, .butActionRefused, .butActionDelete {
+		font-size: 0.9em;
+	}
+}
+
+/* smartphone */
+@media only screen and (max-width: 767px)
+{
+	.butAction, .butActionRefused, .butActionDelete {
+		font-size: 0.85em;
+	}
+}
+
+
 <?php if (!empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED) && (!$user->admin)) { ?>
 .butActionRefused, .butActionNewRefused, .btnTitle.refused {
 	display: none !important;
diff --git a/htdocs/theme/md/btn.inc.php b/htdocs/theme/md/btn.inc.php
index c0d6e2c9cd7..2517415a96f 100644
--- a/htdocs/theme/md/btn.inc.php
+++ b/htdocs/theme/md/btn.inc.php
@@ -379,6 +379,23 @@ div.pagination .btnTitle:hover .btnTitle-label{
 	}
 }
 
+/* rule to reduce top menu - 3rd reduction: The menu for user is on left */
+@media only screen and (max-width: <?php echo empty($conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3) ? round($nbtopmenuentries * 47, 0) + 130 : $conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3; ?>px)	/* reduction 3 */
+{
+	.butAction, .butActionRefused, .butActionDelete {
+		font-size: 0.9em;
+	}
+}
+
+/* smartphone */
+@media only screen and (max-width: 767px)
+{
+	.butAction, .butActionRefused, .butActionDelete {
+		font-size: 0.85em;
+	}
+}
+
+
 <?php if (!empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED) && (!$user->admin)) { ?>
 .butActionRefused, .butActionNewRefused, .btnTitle.refused {
 	display: none !important;

From 75f7ab41f036e123eb1f961d8e8be3f041b68df2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 19 May 2021 12:13:21 +0200
Subject: [PATCH 0137/1497] css

---
 htdocs/core/class/html.formfile.class.php | 2 +-
 htdocs/user/card.php                      | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 7cf9978d32b..45429512046 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -851,7 +851,7 @@ class FormFile
 
 					// Show file size
 					$size = (!empty($file['size']) ? $file['size'] : dol_filesize($filedir."/".$file["name"]));
-					$out .= '<td class="nowrap right">'.dol_print_size($size, 1, 1).'</td>';
+					$out .= '<td class="nowraponall right">'.dol_print_size($size, 1, 1).'</td>';
 
 					// Show file date
 					$date = (!empty($file['date']) ? $file['date'] : dol_filemtime($filedir."/".$file["name"]));
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 332c98f56da..cd891126ba6 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -2718,9 +2718,8 @@ if ($action == 'create' || $action == 'adduserldap') {
 
 		if ($action != 'edit' && $action != 'presend') {
 			print '<div class="fichecenter"><div class="fichehalfleft">';
-			/*
-			 * Generated documents
-			 */
+
+			// Generated documents
 			$filename = dol_sanitizeFileName($object->ref);
 			$filedir = $conf->user->dir_output."/".dol_sanitizeFileName($object->ref);
 			$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
@@ -2741,7 +2740,6 @@ if ($action == 'create' || $action == 'adduserldap') {
 			$formactions = new FormActions($db);
 			$somethingshown = $formactions->showactions($object, 'user', $socid, 1);
 
-
 			print '</div></div></div>';
 		}
 

From 059c2862624efde96cc36b8aca7d26250fcbb332 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 19 May 2021 12:19:18 +0200
Subject: [PATCH 0138/1497] css

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

diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php
index e80cb6c8462..1d521c62b34 100644
--- a/htdocs/user/perms.php
+++ b/htdocs/user/perms.php
@@ -425,9 +425,9 @@ if ($result) {
 			print '<td>&nbsp;</td>';
 		}
 
-		// Label of permission
+		// Descrption of permission
 		$permlabel = (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ($langs->trans("PermissionAdvanced".$obj->id) != ("PermissionAdvanced".$obj->id)) ? $langs->trans("PermissionAdvanced".$obj->id) : (($langs->trans("Permission".$obj->id) != ("Permission".$obj->id)) ? $langs->trans("Permission".$obj->id) : $langs->trans($obj->label)));
-		print '<td class="maxwidthonsmartphone">';
+		print '<td class="">';
 		print $permlabel;
 		if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
 			if (preg_match('/_advance$/', $obj->perms)) {

From e472d2d5d17dd9d768e1fd8b5128a12ca515754e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 19 May 2021 12:44:26 +0200
Subject: [PATCH 0139/1497] Fix bad permission position for external modules

---
 htdocs/admin/modules.php |  3 ++-
 htdocs/user/perms.php    | 25 ++++++++++++++++++-------
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 142d5accb0f..1a6d99261bd 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -386,7 +386,8 @@ foreach ($modulesdir as $dir) {
 									}
 
 									$moduleposition = ($objMod->module_position ? $objMod->module_position : '50');
-									if ($moduleposition == '50' && ($objMod->isCoreOrExternalModule() == 'external')) {
+									if ($objMod->isCoreOrExternalModule() == 'external' && $moduleposition < 100000) {
+										// an external module should never return a value lower than '80'.
 										$moduleposition = '80'; // External modules at end by default
 									}
 
diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php
index 1d521c62b34..cb0a093867d 100644
--- a/htdocs/user/perms.php
+++ b/htdocs/user/perms.php
@@ -311,21 +311,33 @@ if ($result) {
 	while ($i < $num) {
 		$obj = $db->fetch_object($result);
 
-		// If line is for a module that doe snot existe anymore (absent of includes/module), we ignore it
+		// If line is for a module that does not exist anymore (absent of includes/module), we ignore it
 		if (empty($modules[$obj->module])) {
 			$i++;
 			continue;
 		}
 
-		// Save field module_position in database if value is still zero
-		if (empty($obj->module_position)) {
+		$objMod = $modules[$obj->module];
+
+		// Save field module_position in database if value is wrong
+		if (empty($obj->module_position) || (is_object($objMod) && $objMod->isCoreOrExternalModule() == 'external' && $obj->module_position < 100000)) {
 			if (is_object($modules[$obj->module]) && ($modules[$obj->module]->module_position > 0)) {
 				// TODO Define familyposition
-				$family = $modules[$obj->module]->family_position;
+				//$familyposition = $modules[$obj->module]->family_position;
 				$familyposition = 0;
-				$sqlupdate = 'UPDATE '.MAIN_DB_PREFIX."rights_def SET module_position = ".((int) $modules[$obj->module]->module_position).",";
+
+				$newmoduleposition = $modules[$obj->module]->module_position;
+
+				// Correct $newmoduleposition position for external modules
+				$objMod = $modules[$obj->module];
+				if (is_object($objMod) && $objMod->isCoreOrExternalModule() == 'external' && $newmoduleposition < 100000) {
+					$newmoduleposition += 100000;
+				}
+
+				$sqlupdate = 'UPDATE '.MAIN_DB_PREFIX."rights_def SET module_position = ".((int) $newmoduleposition).",";
 				$sqlupdate .= " family_position = ".((int) $familyposition);
-				$sqlupdate .= " WHERE module_position = 0 AND module = '".$db->escape($obj->module)."'";
+				$sqlupdate .= " WHERE module_position = ".((int) $obj->module_position)." AND module = '".$db->escape($obj->module)."'";
+
 				$db->query($sqlupdate);
 			}
 		}
@@ -334,7 +346,6 @@ if ($result) {
 			$oldmod = $obj->module;
 
 			// Break detected, we get objMod
-			$objMod = $modules[$obj->module];
 			$picto = ($objMod->picto ? $objMod->picto : 'generic');
 
 			// Show break line

From 58ffee193f8c1ac7c54ec470191bfe7b980878c1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 19 May 2021 13:07:25 +0200
Subject: [PATCH 0140/1497] Debug v14

---
 htdocs/admin/tools/listevents.php  |  2 +-
 htdocs/core/lib/usergroups.lib.php |  2 +-
 htdocs/langs/en_US/other.lang      |  2 +-
 htdocs/user/param_ihm.php          | 36 ++++++++++++------------------
 4 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php
index fbc2412a9df..b76836a8dde 100644
--- a/htdocs/admin/tools/listevents.php
+++ b/htdocs/admin/tools/listevents.php
@@ -372,7 +372,7 @@ if ($result) {
 		print_liste_field_titre("UserAgent", $_SERVER["PHP_SELF"], "e.user_agent", "", $param, '', $sortfield, $sortorder);
 	}
 	if (!empty($arrayfields['e.prefix_session']['checked'])) {
-		print_liste_field_titre("PrefixSession", $_SERVER["PHP_SELF"], "e.prefix_session", "", $param, '', $sortfield, $sortorder);
+		print_liste_field_titre("SuffixSessionName", $_SERVER["PHP_SELF"], "e.prefix_session", "", $param, '', $sortfield, $sortorder);
 	}
 	print_liste_field_titre('');
 	print "</tr>\n";
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index 700c9c5ed86..6d01fcfee0a 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -339,7 +339,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 
 	$thumbsbyrow = 6;
 	print '<div class="div-table-responsive-no-min">';
-	print '<table class="noborder centpercent'.($edit ? ' editmode' : '').' tableforfield">';
+	print '<table class="noborder centpercent'.($edit ? ' editmode' : '').'">';
 
 	// Title
 	if ($foruserprofile) {
diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index 95297a98859..6fc8b351b77 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -263,7 +263,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
-PrefixSession=Prefix for session ID
+SuffixSessionName=Suffix for session name
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php
index 2856f787b52..b492e31177f 100644
--- a/htdocs/user/param_ihm.php
+++ b/htdocs/user/param_ihm.php
@@ -231,19 +231,9 @@ if ($action == 'edit') {
 
 	dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin);
 
-	if (!empty($conf->use_javascript_ajax)) {/*
-		print '<script type="text/javascript" language="javascript">
-		jQuery(document).ready(function() {
-			$("#main_lang_default").change(function() {
-				$("#check_MAIN_LANG_DEFAULT").prop("checked", true);
-			});
-			$("#main_size_liste_limit").keyup(function() {
-				if ($(this).val().length) $("#check_SIZE_LISTE_LIMIT").prop("checked", true);
-				else $("#check_SIZE_LISTE_LIMIT").prop("checked", false);
-			});
-		});
-		</script>';*/
-	}
+	print dol_get_fiche_end();
+
+
 	if (!empty($conf->use_javascript_ajax)) {
 		print '<script type="text/javascript" language="javascript">
         jQuery(document).ready(function() {
@@ -282,11 +272,11 @@ if ($action == 'edit') {
 
 	clearstatcache();
 
-	print '<table class="noborder centpercent tableforfield">';
+	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("DefaultValue").'</td><td>&nbsp;</td><td>'.$langs->trans("PersonalValue").'</td></tr>';
 
 	// Language by default
-	print '<tr class="oddeven"><td>'.$langs->trans("Language").'</td>';
+	print '<tr class="oddeven"><td class="titlefieldmiddle">'.$langs->trans("Language").'</td>';
 	print '<td>';
 	$s = picto_from_langcode($conf->global->MAIN_LANG_DEFAULT);
 	print $s ? $s.' ' : '';
@@ -337,8 +327,6 @@ if ($action == 'edit') {
 	// Theme
 	showSkins($object, (($user->admin || empty($dolibarr_main_demo)) ? 1 : 0), true);
 
-	print dol_get_fiche_end();
-
 
 	print '<div class="center">';
 	print '<input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
@@ -352,8 +340,12 @@ if ($action == 'edit') {
 
 	dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin);
 
-	print '<table class="noborder centpercent tableforfield">';
-	print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("DefaultValue").'</td><td>&nbsp;</td><td>'.$langs->trans("PersonalValue").'</td></tr>';
+	print dol_get_fiche_end();
+
+
+	print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("DefaultValue").'</td><td>&nbsp;</td><td>'.$langs->trans("PersonalValue").'</td></tr>';
 
 	// Language
 	print '<tr class="oddeven"><td>'.$langs->trans("Language").'</td>';
@@ -404,14 +396,14 @@ if ($action == 'edit') {
 	print '<td class="nowrap" width="20%"><input class="oddeven" type="checkbox" disabled '.(!empty($object->conf->MAIN_SIZE_LISTE_LIMIT) ? " checked" : "").'> '.$langs->trans("UsePersonalValue").'</td>';
 	print '<td>'.(!empty($object->conf->MAIN_SIZE_LISTE_LIMIT) ? $object->conf->MAIN_SIZE_LISTE_LIMIT : '&nbsp;').'</td></tr>';
 
-	print '</table><br>';
+	print '</table>';
+	print '</div>';
+	print '<br>';
 
 
 	// Skin
 	showSkins($object, 0, true);
 
-	print dol_get_fiche_end();
-
 
 	print '<div class="tabsAction">';
 	if (empty($user->admin) && !empty($dolibarr_main_demo)) {

From 026cc1b35ad0eb99f69276e219b4e5897bfdcce3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 19 May 2021 13:21:09 +0200
Subject: [PATCH 0141/1497] Debug for smartphone

---
 htdocs/core/photos_resize.php   | 68 ++++++++++++++++++---------------
 htdocs/langs/en_US/admin.lang   |  1 -
 htdocs/langs/en_US/other.lang   |  1 +
 htdocs/user/agenda_extsites.php |  6 +--
 4 files changed, 42 insertions(+), 34 deletions(-)

diff --git a/htdocs/core/photos_resize.php b/htdocs/core/photos_resize.php
index b3079691cd5..7c7813fbe14 100644
--- a/htdocs/core/photos_resize.php
+++ b/htdocs/core/photos_resize.php
@@ -487,8 +487,10 @@ print load_fiche_titre($title);
 $infoarray = dol_getImageSize($dir."/".GETPOST("file", 'alpha'));
 $height = $infoarray['height'];
 $width = $infoarray['width'];
-print '<span class="opacitymedium">'.$langs->trans("CurrentInformationOnImage").': ';
-print $langs->trans("Width").': <strong>'.$width.'</strong> x '.$langs->trans("Height").': <strong>'.$height.'</strong></span><br>';
+print '<span class="opacitymedium hideonsmartphone">'.$langs->trans("CurrentInformationOnImage").': </span>';
+print '<span class="opacitymedium">';
+print $langs->trans("Width").': <strong>'.$width.'</strong> x '.$langs->trans("Height").': <strong>'.$height.'</strong>';
+print '</span><br>';
 
 print '<br>'."\n";
 
@@ -546,36 +548,42 @@ if (!empty($conf->use_javascript_ajax)) {
 	print '<legend>'.$langs->trans("Recenter").'</legend>';
 	print $langs->trans("DefineNewAreaToPick").'...<br>';
 	print '<br><div class="center">';
-	print '<div style="border: 1px solid #888888; width: '.$widthforcrop.'px;">';
-	print '<img src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$object->entity.'&file='.urlencode($original_file).'" alt="" id="cropbox" width="'.$widthforcrop.'px"/>';
-	print '</div>';
-	print '</div><br>';
 
-	print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$id.($num ? '&num='.$num : '').'" method="POST">';
-	print '<input type="hidden" name="token" value="'.newToken().'">';
-	print '
-	      <div class="jc_coords">
-	         '.$langs->trans("NewSizeAfterCropping").':
-	         <label>X1 <input type="number" class="flat maxwidth50" id="x" name="x" /></label>
-	         <label>Y1 <input type="number" class="flat maxwidth50" id="y" name="y" /></label>
-	         <label>X2 <input type="number" class="flat maxwidth50" id="x2" name="x2" /></label>
-	         <label>Y2 <input type="number" class="flat maxwidth50" id="y2" name="y2" /></label>
-	         <label>W  <input type="number" class="flat maxwidth50" id="w" name="w" /></label>
-	         <label>H  <input type="number" class="flat maxwidth50" id="h" name="h" /></label>
-	      </div>
+	if (empty($conf->dol_no_mouse_hover)) {
+		print '<div style="border: 1px solid #888888; width: '.$widthforcrop.'px;">';
+		print '<img src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$object->entity.'&file='.urlencode($original_file).'" alt="" id="cropbox" width="'.$widthforcrop.'px"/>';
+		print '</div>';
+		print '</div><br>';
 
-	      <input type="hidden" id="file" name="file" value="'.dol_escape_htmltag($original_file).'" />
-	      <input type="hidden" id="action" name="action" value="confirm_crop" />
-	      <input type="hidden" id="product" name="product" value="'.dol_escape_htmltag($id).'" />
-	      <input type="hidden" id="refsizeforcrop" name="refsizeforcrop" value="'.$refsizeforcrop.'" />
-	      <input type="hidden" id="ratioforcrop" name="ratioforcrop" value="'.$ratioforcrop.'" /><!-- field used by core/lib/lib_photoresize.js -->
-          <input type="hidden" name="modulepart" value="'.dol_escape_htmltag($modulepart).'" />
-	      <input type="hidden" name="id" value="'.dol_escape_htmltag($id).'" />
-	      <br>
-	      <input type="submit" id="submitcrop" name="submitcrop" class="button" value="'.dol_escape_htmltag($langs->trans("Recenter")).'" />
-	      &nbsp;
-	      <input type="submit" id="cancelcrop" name="cancel" class="button button-cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'" />
-	   </form>'."\n";
+		print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$id.($num ? '&num='.$num : '').'" method="POST">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
+		print '
+		      <div class="jc_coords">
+		         '.$langs->trans("NewSizeAfterCropping").':
+		         <label>X1 <input type="number" class="flat maxwidth50" id="x" name="x" /></label>
+		         <label>Y1 <input type="number" class="flat maxwidth50" id="y" name="y" /></label>
+		         <label>X2 <input type="number" class="flat maxwidth50" id="x2" name="x2" /></label>
+		         <label>Y2 <input type="number" class="flat maxwidth50" id="y2" name="y2" /></label>
+		         <label>W  <input type="number" class="flat maxwidth50" id="w" name="w" /></label>
+		         <label>H  <input type="number" class="flat maxwidth50" id="h" name="h" /></label>
+		      </div>
+
+		      <input type="hidden" id="file" name="file" value="'.dol_escape_htmltag($original_file).'" />
+		      <input type="hidden" id="action" name="action" value="confirm_crop" />
+		      <input type="hidden" id="product" name="product" value="'.dol_escape_htmltag($id).'" />
+		      <input type="hidden" id="refsizeforcrop" name="refsizeforcrop" value="'.$refsizeforcrop.'" />
+		      <input type="hidden" id="ratioforcrop" name="ratioforcrop" value="'.$ratioforcrop.'" /><!-- field used by core/lib/lib_photoresize.js -->
+	          <input type="hidden" name="modulepart" value="'.dol_escape_htmltag($modulepart).'" />
+		      <input type="hidden" name="id" value="'.dol_escape_htmltag($id).'" />
+		      <br>
+		      <input type="submit" id="submitcrop" name="submitcrop" class="button" value="'.dol_escape_htmltag($langs->trans("Recenter")).'" />
+		      &nbsp;
+		      <input type="submit" id="cancelcrop" name="cancel" class="button button-cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'" />
+		   </form>'."\n";
+	} else {
+		$langs->load("other");
+		print '<div class="opacitymedium">'.$langs->trans("FeatureNotAvailableOnDevicesWithoutMouse").'</div>';
+	}
 	print '</fieldset>'."\n";
 	print '<br>';
 }
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 467fba89199..78077474c96 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -2103,7 +2103,6 @@ PDF_SHOW_PROJECT=Show project on document
 ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
-FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index 6fc8b351b77..bb35099ab82 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -129,6 +129,7 @@ ClosedByLogin=User login who closed
 FileWasRemoved=File %s was removed
 DirWasRemoved=Directory %s was removed
 FeatureNotYetAvailable=Feature not yet available in the current version
+FeatureNotAvailableOnDevicesWithoutMouse=Feature not available on devices without mouse
 FeaturesSupported=Supported features
 Width=Width
 Height=Height
diff --git a/htdocs/user/agenda_extsites.php b/htdocs/user/agenda_extsites.php
index 3faf6dc770c..b474bdfc678 100644
--- a/htdocs/user/agenda_extsites.php
+++ b/htdocs/user/agenda_extsites.php
@@ -206,15 +206,15 @@ while ($i <= $MAXAGENDA) {
 	print '<td class="maxwidth50onsmartphone">'.$langs->trans("AgendaExtNb", $key)."</td>";
 	// Name
 	$name_value = (GETPOST('AGENDA_EXT_NAME_'.$id.'_'.$key) ?GETPOST('AGENDA_EXT_NAME_'.$id.'_'.$key) : (empty($object->conf->$name) ? '' : $object->conf->$name));
-	print '<td class="maxwidth50onsmartphone"><input type="text" class="flat hideifnotset minwidth100" name="AGENDA_EXT_NAME_'.$id.'_'.$key.'" value="'.$name_value.'"></td>';
+	print '<td><input type="text" class="flat hideifnotset minwidth100 maxwidth100onsmartphone" name="AGENDA_EXT_NAME_'.$id.'_'.$key.'" value="'.$name_value.'"></td>';
 	// URL
 	$src_value = (GETPOST('AGENDA_EXT_SRC_'.$id.'_'.$key) ?GETPOST('AGENDA_EXT_SRC_'.$id.'_'.$key) : (empty($object->conf->$src) ? '' : $object->conf->$src));
-	print '<td class="maxwidth50onsmartphone"><input type="url" class="flat hideifnotset" name="AGENDA_EXT_SRC_'.$id.'_'.$key.'" value="'.$src_value.'"></td>';
+	print '<td><input type="url" class="flat hideifnotset" name="AGENDA_EXT_SRC_'.$id.'_'.$key.'" value="'.$src_value.'"></td>';
 	// Offset TZ
 	$offsettz_value = (GETPOST('AGENDA_EXT_OFFSETTZ_'.$id.'_'.$key) ? GETPOST('AGENDA_EXT_OFFSETTZ_'.$id.'_'.$key) : (empty($object->conf->$offsettz) ? 0 : $object->conf->$offsettz));
 	print '<td><input type="text" class="flat hideifnotset" name="AGENDA_EXT_OFFSETTZ_'.$id.'_'.$key.'" value="'.$offsettz_value.'" size="1"></td>';
 	// Color (Possible colors are limited by Google)
-	print '<td class="nowrap right">';
+	print '<td class="nowraponall right">';
 	//print $formadmin->selectColor($conf->global->$color, "google_agenda_color".$key, $colorlist);
 	$color_value = (GETPOST("AGENDA_EXT_COLOR_".$id.'_'.$key) ?GETPOST("AGENDA_EXT_COLOR_".$id.'_'.$key) : (empty($object->conf->$color) ? 'ffffff' : $object->conf->$color));
 	print $formother->selectColor($color_value, "AGENDA_EXT_COLOR_".$id.'_'.$key, 'extsitesconfig', 1, '', 'hideifnotset');

From 82e819d059748e652c1c5b2c201585d9f1d2b8f3 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Wed, 19 May 2021 13:43:13 +0200
Subject: [PATCH 0142/1497] Update llx_20_c_departements.sql

USA
---
 .../mysql/data/llx_20_c_departements.sql      | 108 +++++++++---------
 1 file changed, 55 insertions(+), 53 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_20_c_departements.sql b/htdocs/install/mysql/data/llx_20_c_departements.sql
index 5e739f07b72..27a9f8dd1f5 100644
--- a/htdocs/install/mysql/data/llx_20_c_departements.sql
+++ b/htdocs/install/mysql/data/llx_20_c_departements.sql
@@ -62,6 +62,7 @@
 -- Slovenia (need to check code SI-Id)
 -- Taiwan
 -- Tunisia
+-- United States of America 
 
 
 
@@ -1120,6 +1121,60 @@ INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc
 INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1001, 'TN24', '', 0, '', 'Zaghouan');
 
 
+-- USA States (id country=11)
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (1101, 'AL', '', 0, 'ALABAMA', 'Alabama');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (1101, 'AK', '', 0, 'ALASKA', 'Alaska');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (1101, 'AZ', '', 0, 'ARIZONA', 'Arizona');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (1101, 'AR', '', 0, 'ARKANSAS', 'Arkansas');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (1101, 'CA', '', 0, 'CALIFORNIA', 'California');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (1101, 'CO', '', 0, 'COLORADO', 'Colorado');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (1101, 'CT', '', 0, 'CONNECTICUT', 'Connecticut');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (1101, 'DE', '', 0, 'DELAWARE', 'Delaware');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (1101, 'FL', '', 0, 'FLORIDA', 'Florida');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (1101, 'GA', '', 0, 'GEORGIA', 'Georgia');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (1101, 'HI', '', 0, 'HAWAII', 'Hawaii');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (1101, 'ID', '', 0, 'IDAHO', 'Idaho');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (1101, 'IL', '', 0, 'ILLINOIS','Illinois');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (1101, 'IN', '', 0, 'INDIANA', 'Indiana');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (1101, 'IA', '', 0, 'IOWA', 'Iowa');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (1101, 'KS', '', 0, 'KANSAS', 'Kansas');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (1101, 'KY', '', 0, 'KENTUCKY', 'Kentucky');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (1101, 'LA', '', 0, 'LOUISIANA', 'Louisiana');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (1101, 'ME', '', 0, 'MAINE', 'Maine');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (1101, 'MD', '', 0, 'MARYLAND', 'Maryland');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (1101, 'MA', '', 0, 'MASSACHUSSETTS', 'Massachusetts');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (1101, 'MI', '', 0, 'MICHIGAN', 'Michigan');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (1101, 'MN', '', 0, 'MINNESOTA', 'Minnesota');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (1101, 'MS', '', 0, 'MISSISSIPPI', 'Mississippi');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (1101, 'MO', '', 0, 'MISSOURI', 'Missouri');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (1101, 'MT', '', 0, 'MONTANA', 'Montana');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (1101, 'NE', '', 0, 'NEBRASKA', 'Nebraska');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (1101, 'NV', '', 0, 'NEVADA', 'Nevada');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (1101, 'NH', '', 0, 'NEW HAMPSHIRE', 'New Hampshire');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (1101, 'NJ', '', 0, 'NEW JERSEY', 'New Jersey');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (1101, 'NM', '', 0, 'NEW MEXICO', 'New Mexico');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (1101, 'NY', '', 0, 'NEW YORK', 'New York');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (1101, 'NC', '', 0, 'NORTH CAROLINA', 'North Carolina');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (1101, 'ND', '', 0, 'NORTH DAKOTA', 'North Dakota');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (1101, 'OH', '', 0, 'OHIO', 'Ohio');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (1101, 'OK', '', 0, 'OKLAHOMA', 'Oklahoma');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (1101, 'OR', '', 0, 'OREGON', 'Oregon');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (1101, 'PA', '', 0, 'PENNSYLVANIA', 'Pennsylvania');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (1101, 'RI', '', 0, 'RHODE ISLAND', 'Rhode Island');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (1101, 'SC', '', 0, 'SOUTH CAROLINA', 'South Carolina');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (1101, 'SD', '', 0, 'SOUTH DAKOTA', 'South Dakota');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (1101, 'TN', '', 0, 'TENNESSEE', 'Tennessee');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (1101, 'TX', '', 0, 'TEXAS', 'Texas');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (1101, 'UT', '', 0, 'UTAH', 'Utah');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (1101, 'VT', '', 0, 'VERMONT', 'Vermont');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (1101, 'VA', '', 0, 'VIRGINIA', 'Virginia');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (1101, 'WA', '', 0, 'WASHINGTON', 'Washington');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (1101, 'WV', '', 0, 'WEST VIRGINIA', 'West Virginia');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (1101, 'WI', '', 0, 'WISCONSIN', 'Wisconsin');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (1101, 'WY', '', 0, 'WYOMING', 'Wyoming');
+
+
+
 
 
 -- Provinces Bolivia (id country=52)
@@ -1513,59 +1568,6 @@ INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc
 
 
 
--- Provinces US (id country=11)
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('AL', 1101, '', 0, 'ALABAMA', 'Alabama', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('AK', 1101, '', 0, 'ALASKA', 'Alaska', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('AZ', 1101, '', 0, 'ARIZONA', 'Arizona', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('AR', 1101, '', 0, 'ARKANSAS', 'Arkansas', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('CA', 1101, '', 0, 'CALIFORNIA', 'California', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('CO', 1101, '', 0, 'COLORADO', 'Colorado', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('CT', 1101, '', 0, 'CONNECTICUT', 'Connecticut', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('DE', 1101, '', 0, 'DELAWARE', 'Delaware', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('FL', 1101, '', 0, 'FLORIDA', 'Florida', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('GA', 1101, '', 0, 'GEORGIA', 'Georgia', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('HI', 1101, '', 0, 'HAWAII', 'Hawaii', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('ID', 1101, '', 0, 'IDAHO', 'Idaho', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('IL', 1101, '', 0, 'ILLINOIS','Illinois', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('IN', 1101, '', 0, 'INDIANA', 'Indiana', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('IA', 1101, '', 0, 'IOWA', 'Iowa', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('KS', 1101, '', 0, 'KANSAS', 'Kansas', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('KY', 1101, '', 0, 'KENTUCKY', 'Kentucky', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('LA', 1101, '', 0, 'LOUISIANA', 'Louisiana', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('ME', 1101, '', 0, 'MAINE', 'Maine', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('MD', 1101, '', 0, 'MARYLAND', 'Maryland', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('MA', 1101, '', 0, 'MASSACHUSSETTS', 'Massachusetts', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('MI', 1101, '', 0, 'MICHIGAN', 'Michigan', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('MN', 1101, '', 0, 'MINNESOTA', 'Minnesota', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('MS', 1101, '', 0, 'MISSISSIPPI', 'Mississippi', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('MO', 1101, '', 0, 'MISSOURI', 'Missouri', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('MT', 1101, '', 0, 'MONTANA', 'Montana', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('NE', 1101, '', 0, 'NEBRASKA', 'Nebraska', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('NV', 1101, '', 0, 'NEVADA', 'Nevada', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('NH', 1101, '', 0, 'NEW HAMPSHIRE', 'New Hampshire', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('NJ', 1101, '', 0, 'NEW JERSEY', 'New Jersey', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('NM', 1101, '', 0, 'NEW MEXICO', 'New Mexico', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('NY', 1101, '', 0, 'NEW YORK', 'New York', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('NC', 1101, '', 0, 'NORTH CAROLINA', 'North Carolina', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('ND', 1101, '', 0, 'NORTH DAKOTA', 'North Dakota', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('OH', 1101, '', 0, 'OHIO', 'Ohio', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('OK', 1101, '', 0, 'OKLAHOMA', 'Oklahoma', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('OR', 1101, '', 0, 'OREGON', 'Oregon', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('PA', 1101, '', 0, 'PENNSYLVANIA', 'Pennsylvania', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('RI', 1101, '', 0, 'RHODE ISLAND', 'Rhode Island', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('SC', 1101, '', 0, 'SOUTH CAROLINA', 'South Carolina', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('SD', 1101, '', 0, 'SOUTH DAKOTA', 'South Dakota', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('TN', 1101, '', 0, 'TENNESSEE', 'Tennessee', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('TX', 1101, '', 0, 'TEXAS', 'Texas', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('UT', 1101, '', 0, 'UTAH', 'Utah', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('VT', 1101, '', 0, 'VERMONT', 'Vermont', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('VA', 1101, '', 0, 'VIRGINIA', 'Virginia', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('WA', 1101, '', 0, 'WASHINGTON', 'Washington', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('WV', 1101, '', 0, 'WEST VIRGINIA', 'West Virginia', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('WI', 1101, '', 0, 'WISCONSIN', 'Wisconsin', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('WY', 1101, '', 0, 'WYOMING', 'Wyoming', 1);
-
-
 -- San Salvador (id country=86)
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SS', 8601, '', 0, '', 'San Salvador', 1);
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SA', 8603, '', 0, '', 'Santa Ana', 1);

From a8d36a3a555257b364205be2026ba0f3853a1434 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 19 May 2021 13:56:13 +0200
Subject: [PATCH 0143/1497] Debug v14

---
 htdocs/comm/action/card.php           |  4 +++-
 htdocs/core/class/html.form.class.php |  4 ++--
 htdocs/core/lib/ajax.lib.php          |  2 +-
 htdocs/product/card.php               |  2 +-
 htdocs/theme/eldy/global.inc.php      |  5 +++++
 htdocs/theme/md/style.css.php         | 14 ++++++++++++--
 6 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 10e96b50014..793518ed150 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -937,6 +937,7 @@ if ($action == 'create') {
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="add">';
 	print '<input type="hidden" name="donotclearsession" value="1">';
+	print '<input type="hidden" name="page_y" value="">';
 	if ($backtopage) {
 		print '<input type="hidden" name="backtopage" value="'.($backtopage != '1' ? $backtopage : htmlentities($_SERVER["HTTP_REFERER"])).'">';
 	}
@@ -1183,7 +1184,7 @@ if ($action == 'create') {
 		$projectid = GETPOST('projectid', 'int');
 
 		print '<tr><td class="titlefieldcreate">'.$langs->trans("Project").'</td><td id="project-input-container">';
-		print img_picto('', 'project', 'class="paddingrightonly"');
+		print img_picto('', 'project', 'class="pictofixedwidth"');
 		print $formproject->select_projects((!empty($societe->id) ? $societe->id : -1), $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500 widthcentpercentminusxx');
 
 		print '&nbsp;<a href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$societe->id.'&action=create&amp;backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create').'">';
@@ -1430,6 +1431,7 @@ if ($id > 0) {
 		print '<input type="hidden" name="action" value="update">';
 		print '<input type="hidden" name="id" value="'.$id.'">';
 		print '<input type="hidden" name="ref_ext" value="'.$object->ref_ext.'">';
+		print '<input type="hidden" name="page_y" value="">';
 		if ($backtopage) {
 			print '<input type="hidden" name="backtopage" value="'.($backtopage != '1' ? $backtopage : htmlentities($_SERVER["HTTP_REFERER"])).'">';
 		}
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 13893fe42ee..1366b8d5078 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -2131,7 +2131,7 @@ class Form
 				$out .= ' ('.$langs->trans("Owner").')';
 			}
 			if ($nbassignetouser > 1 && $action != 'view') {
-				$out .= ' <input type="image" style="border: 0px;" src="'.img_picto($langs->trans("Remove"), 'delete', '', 0, 1).'" value="'.$userstatic->id.'" class="removedassigned" id="removedassigned_'.$userstatic->id.'" name="removedassigned_'.$userstatic->id.'">';
+				$out .= ' <input type="image" style="border: 0px;" src="'.img_picto($langs->trans("Remove"), 'delete', '', 0, 1).'" value="'.$userstatic->id.'" class="removedassigned reposition" id="removedassigned_'.$userstatic->id.'" name="removedassigned_'.$userstatic->id.'">';
 			}
 			// Show my availability
 			if ($showproperties) {
@@ -2162,7 +2162,7 @@ class Form
 			$out .= '});';
 			$out .= '})</script>';
 			$out .= $this->select_dolusers('', $htmlname, $show_empty, $exclude, $disabled, $include, $enableonly, $force_entity, $maxlength, $showstatus, $morefilter);
-			$out .= ' <input type="submit" disabled class="button valignmiddle smallpaddingimp" id="'.$action.'assignedtouser" name="'.$action.'assignedtouser" value="'.dol_escape_htmltag($langs->trans("Add")).'">';
+			$out .= ' <input type="submit" disabled class="button valignmiddle smallpaddingimp reposition" id="'.$action.'assignedtouser" name="'.$action.'assignedtouser" value="'.dol_escape_htmltag($langs->trans("Add")).'">';
 			$out .= '<br>';
 		}
 
diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index 8874b96eda5..bd69b812200 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -454,7 +454,7 @@ function ajax_combobox($htmlname, $events = array(), $minLengthToAutocomplete =
 					templateResult: function (data, container) {	/* Format visible output into combo list */
 	 					/* Code to add class of origin OPTION propagated to the new select2 <li> tag */
 						if (data.element) { $(container).addClass($(data.element).attr("class")); }
-					    console.log($(data.element).attr("data-html"));
+					    //console.log($(data.element).attr("data-html"));
 					    if (data.id == -1 && $(data.element).attr("data-html") == undefined) {
 							return \'&nbsp;\';
 						}
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 98fb4132bb8..c92f847a1e9 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1181,7 +1181,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		if ($type != 1 && !empty($conf->stock->enabled)) {
 			// Default warehouse
 			print '<tr><td>'.$langs->trans("DefaultWarehouse").'</td><td>';
-			print img_picto($langs->trans("DefaultWarehouse"), 'stock', 'pictofixedwidth');
+			print img_picto($langs->trans("DefaultWarehouse"), 'stock', 'class="pictofixedwidth"');
 			print $formproduct->selectWarehouses(GETPOST('fk_default_warehouse'), 'fk_default_warehouse', 'warehouseopen', 1);
 			print ' <a href="'.DOL_URL_ROOT.'/product/stock/card.php?action=create&amp;backtopage='.urlencode($_SERVER['PHP_SELF'].'?id='.$object->id.'&action=edit').'">';
 			print '<span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddWarehouse").'"></span>';
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 988ac6b3ae3..6c705c62489 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -1027,6 +1027,7 @@ ul.attendees li {
 	list-style-type: none;
 	padding-top:1px;
 	padding-bottom:1px;
+	line-height: 1.6em;
 }
 .googlerefreshcal {
 	padding-top: 4px;
@@ -1472,6 +1473,10 @@ select.widthcentpercentminusxx, span.widthcentpercentminusxx:not(.select2-select
 		width: calc(100% - 40px) !important;
 		display: inline-block;
 	}
+	select.widthcentpercentminusxx, span.widthcentpercentminusxx:not(.select2-selection), input.widthcentpercentminusxx {
+		width: calc(100% - 70px) !important;
+		display: inline-block;
+	}
 
 	.logopublicpayment #dolpaymentlogo {
 		max-width: 260px;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index e292b3850d1..407a38ea320 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1496,6 +1496,18 @@ table[summary="list_of_modules"] .fa-cog {
 		padding-right: 10px !important;
 	}
 	
+	.hideonsmartphone { display: none; }
+	.hideonsmartphoneimp { display: none !important; }
+	
+	select.minwidth100imp, select.minwidth100, select.minwidth200, select.minwidth200imp, select.minwidth300 {
+		width: calc(100% - 40px) !important;
+		display: inline-block;
+	}
+	select.widthcentpercentminusxx, span.widthcentpercentminusxx:not(.select2-selection), input.widthcentpercentminusxx {
+		width: calc(100% - 70px) !important;
+		display: inline-block;
+	}
+	
 	.poweredbyimg {
 		width: 48px;
 	}
@@ -1580,8 +1592,6 @@ table[summary="list_of_modules"] .fa-cog {
 		line-height: 1.4em;
 	 }
 
-	.hideonsmartphone { display: none; }
-	.hideonsmartphoneimp { display: none !important; }
 	.noenlargeonsmartphone { width : 50px !important; display: inline !important; }
 	.maxwidthonsmartphone, #search_newcompany.ui-autocomplete-input { max-width: 100px; }
 	.maxwidth50onsmartphone { max-width: 40px; }

From f9fb296ea6cae998a0108014b22b156ac5d45e31 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Wed, 19 May 2021 13:59:36 +0200
Subject: [PATCH 0144/1497] Update llx_00_c_country.sql
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

République Tchèque  ->  Czech Republic
Danemark  ->  Denmark
Djibouti = Djibouti
Dominique  ->  Dominica
République Dominicaine  ->  Dominican Republic
Equateur  ->  Republic of Ecuador
Egypte  ->  Egypt
Salvador  ->  El Salvador
Guinée Equatoriale  ->  Equatorial Guinea
Erythrée  ->  Eritrea
---
 htdocs/install/mysql/data/llx_00_c_country.sql | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_00_c_country.sql b/htdocs/install/mysql/data/llx_00_c_country.sql
index 296b6d0e412..bc09a7fd1f6 100644
--- a/htdocs/install/mysql/data/llx_00_c_country.sql
+++ b/htdocs/install/mysql/data/llx_00_c_country.sql
@@ -106,16 +106,16 @@ INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (75
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (76,'HR','HRV','Croatie',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (77,'CU','CUB','Cuba',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (78,'CY','CYP','Cyprus',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (79,'CZ','CZE','République Tchèque',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (80,'DK','DNK','Danemark',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (79,'CZ','CZE','Czech Republic',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (80,'DK','DNK','Denmark',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (81,'DJ','DJI','Djibouti',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (82,'DM','DMA','Dominique',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (83,'DO','DOM','République Dominicaine',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (84,'EC','ECU','Equateur',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (85,'EG','EGY','Egypte',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (86,'SV','SLV','Salvador',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (87,'GQ','GNQ','Guinée Equatoriale',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (88,'ER','ERI','Erythrée',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (82,'DM','DMA','Dominica',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (83,'DO','DOM','Dominican Republic',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (84,'EC','ECU','Republic of Ecuador',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (85,'EG','EGY','Egypt',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (86,'SV','SLV','El Salvador',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (87,'GQ','GNQ','Equatorial Guinea',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (88,'ER','ERI','Eritrea',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (89,'EE','EST','Estonia',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (90,'ET','ETH','Ethiopia',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (91,'FK','FLK','Falkland Islands',1,0);

From 173ef6e877a542db618db669d1793e13510b316e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 19 May 2021 14:04:01 +0200
Subject: [PATCH 0145/1497] Look and feel v14

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 1366b8d5078..7fcad5b8fb4 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4946,16 +4946,16 @@ class Form
 			$formconfirm .= '<table class="valid centpercent">'."\n";
 
 			// Line title
-			$formconfirm .= '<tr class="validtitre"><td class="validtitre" colspan="3">'.img_picto('', 'recent').' '.$title.'</td></tr>'."\n";
+			$formconfirm .= '<tr class="validtitre"><td class="validtitre" colspan="2">'.img_picto('', 'recent').' '.$title.'</td></tr>'."\n";
 
 			// Line text
 			if (is_array($formquestion) && !empty($formquestion['text'])) {
-				$formconfirm .= '<tr class="valid"><td class="valid" colspan="3">'.$formquestion['text'].'</td></tr>'."\n";
+				$formconfirm .= '<tr class="valid"><td class="valid" colspan="2">'.$formquestion['text'].'</td></tr>'."\n";
 			}
 
 			// Line form fields
 			if ($more) {
-				$formconfirm .= '<tr class="valid"><td class="valid" colspan="3">'."\n";
+				$formconfirm .= '<tr class="valid"><td class="valid" colspan="2">'."\n";
 				$formconfirm .= $more;
 				$formconfirm .= '</td></tr>'."\n";
 			}
@@ -4963,10 +4963,10 @@ class Form
 			// Line with question
 			$formconfirm .= '<tr class="valid">';
 			$formconfirm .= '<td class="valid">'.$question.'</td>';
-			$formconfirm .= '<td class="valid">';
+			$formconfirm .= '<td class="valid center">';
 			$formconfirm .= $this->selectyesno("confirm", $newselectedchoice);
+			$formconfirm .= '<input class="button valignmiddle confirmvalidatebutton" type="submit" value="'.$langs->trans("Validate").'">';
 			$formconfirm .= '</td>';
-			$formconfirm .= '<td class="valid center"><input class="button valignmiddle confirmvalidatebutton" type="submit" value="'.$langs->trans("Validate").'"></td>';
 			$formconfirm .= '</tr>'."\n";
 
 			$formconfirm .= '</table>'."\n";

From 8f5c898daef6034358bb3ee4380cbbb55ebdfb04 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 19 May 2021 14:13:42 +0200
Subject: [PATCH 0146/1497] CSS

---
 htdocs/core/class/html.form.class.php | 11 +++++++----
 htdocs/core/lib/functions.lib.php     |  4 ++--
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 7fcad5b8fb4..47764d448f1 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4946,7 +4946,9 @@ class Form
 			$formconfirm .= '<table class="valid centpercent">'."\n";
 
 			// Line title
-			$formconfirm .= '<tr class="validtitre"><td class="validtitre" colspan="2">'.img_picto('', 'recent').' '.$title.'</td></tr>'."\n";
+			$formconfirm .= '<tr class="validtitre"><td class="validtitre" colspan="2">';
+			$formconfirm .= img_picto('', 'recent').' '.$title;
+			$formconfirm .= '</td></tr>'."\n";
 
 			// Line text
 			if (is_array($formquestion) && !empty($formquestion['text'])) {
@@ -4964,7 +4966,7 @@ class Form
 			$formconfirm .= '<tr class="valid">';
 			$formconfirm .= '<td class="valid">'.$question.'</td>';
 			$formconfirm .= '<td class="valid center">';
-			$formconfirm .= $this->selectyesno("confirm", $newselectedchoice);
+			$formconfirm .= $this->selectyesno("confirm", $newselectedchoice, 0, false, 0, 0, 'marginleftonly marginrightonly');
 			$formconfirm .= '<input class="button valignmiddle confirmvalidatebutton" type="submit" value="'.$langs->trans("Validate").'">';
 			$formconfirm .= '</td>';
 			$formconfirm .= '</tr>'."\n";
@@ -7837,9 +7839,10 @@ class Form
 	 *	@param	bool		$disabled		true or false
 	 *  @param	int      	$useempty		1=Add empty line
 	 *  @param	int			$addjscombo		1=Add js beautifier on combo box
+	 *  @param	string		$morecss		More CSS
 	 *	@return	string						See option
 	 */
-	public function selectyesno($htmlname, $value = '', $option = 0, $disabled = false, $useempty = 0, $addjscombo = 0)
+	public function selectyesno($htmlname, $value = '', $option = 0, $disabled = false, $useempty = 0, $addjscombo = 0, $morecss = '')
 	{
 		global $langs;
 
@@ -7852,7 +7855,7 @@ class Form
 
 		$disabled = ($disabled ? ' disabled' : '');
 
-		$resultyesno = '<select class="flat width75" id="'.$htmlname.'" name="'.$htmlname.'"'.$disabled.'>'."\n";
+		$resultyesno = '<select class="flat width75'.($morecss ? ' '.$morecss : '').'" id="'.$htmlname.'" name="'.$htmlname.'"'.$disabled.'>'."\n";
 		if ($useempty) {
 			$resultyesno .= '<option value="-1"'.(($value < 0) ? ' selected' : '').'>&nbsp;</option>'."\n";
 		}
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index abf9c587b68..9afa45aff26 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3516,7 +3516,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'generic', 'home', 'hrm', 'members', 'products', 'invoicing',
 				'partnership', 'payment', 'pencil-ruler', 'preview', 'project', 'projectpub', 'projecttask', 'refresh', 'salary', 'shipment', 'supplier_invoice', 'technic', 'ticket',
 				'error', 'warning',
-				'reception', 'recruitmentcandidature', 'recruitmentjobposition', 'resource',
+				'recent', 'reception', 'recruitmentcandidature', 'recruitmentjobposition', 'resource',
 				'shapes', 'supplier', 'supplier_proposal', 'supplier_order', 'supplier_invoice',
 				'timespent', 'title_setup', 'title_accountancy', 'title_bank', 'title_hrm', 'title_agenda',
 				'uncheck', 'user-cog', 'website', 'workstation',
@@ -3558,7 +3558,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'other'=>'square',
 				'playdisabled'=>'play', 'pdf'=>'file-pdf',  'poll'=>'check-double', 'pos'=>'cash-register', 'preview'=>'binoculars', 'project'=>'project-diagram', 'projectpub'=>'project-diagram', 'projecttask'=>'tasks', 'propal'=>'file-signature',
 				'partnership'=>'handshake', 'payment'=>'money-check-alt', 'phoning'=>'phone', 'phoning_mobile'=>'mobile-alt', 'phoning_fax'=>'fax', 'previous'=>'arrow-alt-circle-left', 'printer'=>'print', 'product'=>'cube', 'service'=>'concierge-bell',
-				'reception'=>'dolly', 'recruitmentjobposition'=>'id-card-alt', 'recruitmentcandidature'=>'id-badge',
+				'recent' => 'question', 'reception'=>'dolly', 'recruitmentjobposition'=>'id-card-alt', 'recruitmentcandidature'=>'id-badge',
 				'resize'=>'crop', 'supplier_order'=>'dol-order_supplier', 'supplier_proposal'=>'file-signature',
 				'refresh'=>'redo', 'resource'=>'laptop-house',
 				'security'=>'key', 'salary'=>'wallet', 'shipment'=>'dolly', 'stock'=>'box-open', 'stats' => 'chart-bar', 'split'=>'code-branch', 'stripe'=>'stripe-s',

From e2e6d4ba14434f52b8385bbbca5580250c6e3cc9 Mon Sep 17 00:00:00 2001
From: lvessiller <lvessiller@open-dsi.fr>
Date: Wed, 19 May 2021 14:29:46 +0200
Subject: [PATCH 0147/1497] FIX keep special code on supplier order lines for
 external modules

---
 htdocs/fourn/commande/card.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 0b7eb338b69..ef127e84811 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -1239,6 +1239,8 @@ if (empty($reshook))
 									$tva_tx = get_default_tva($soc, $mysoc, $lines[$i]->fk_product, $product_fourn_price_id);
 								}
 
+								$object->special_code = $lines[$i]->special_code;
+
 								$result = $object->addline(
 									$desc,
 									$lines[$i]->subprice,

From 92ccf5982a8e600cee4134ac0d8c7b12f40874a9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 19 May 2021 14:38:39 +0200
Subject: [PATCH 0148/1497] Fix responsive

---
 htdocs/comm/propal/card.php           | 25 +++++++++++-----------
 htdocs/core/class/html.form.class.php | 30 ++++++++++++++-------------
 htdocs/core/lib/functions.lib.php     |  2 +-
 3 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 984d77e7263..5d9ae8d75a6 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -1436,11 +1436,9 @@ if (empty($reshook)) {
  */
 
 $form = new Form($db);
-$formother = new FormOther($db);
 $formfile = new FormFile($db);
 $formpropal = new FormPropal($db);
 $formmargin = new FormMargin($db);
-$companystatic = new Societe($db);
 if (!empty($conf->projet->enabled)) {
 	$formproject = new FormProjets($db);
 }
@@ -1582,7 +1580,7 @@ if ($action == 'create') {
 		//$warehouse_id       = $soc->warehouse_id;
 	} else {
 		print '<td>';
-		print img_picto('', 'company').$form->select_company('', 'socid', '(s.client = 1 OR s.client = 2 OR s.client = 3) AND status=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300 maxwidth500');
+		print img_picto('', 'company').$form->select_company('', 'socid', '(s.client = 1 OR s.client = 2 OR s.client = 3) AND status=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300 maxwidth500 widthcentpercentminusxx');
 		// reload page to retrieve customer informations
 		if (empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE_DISABLED)) {
 			print '<script type="text/javascript">
@@ -1638,20 +1636,21 @@ if ($action == 'create') {
 	// Mode of payment
 	print '<tr><td>'.$langs->trans('PaymentMode').'</td><td>';
 	print img_picto('', 'bank').'&ensp;';
-	$form->select_types_paiements((GETPOSTISSET('mode_reglement_id') ? GETPOST('mode_reglement_id', 'int') : $soc->mode_reglement_id), 'mode_reglement_id');
+	$form->select_types_paiements((GETPOSTISSET('mode_reglement_id') ? GETPOST('mode_reglement_id', 'int') : $soc->mode_reglement_id), 'mode_reglement_id', '', 0, 1, 0, 0, 1, 'maxwidth200 widthcentpercentminusx');
 	print '</td></tr>';
 
 	// Bank Account
 	if (!empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL) && !empty($conf->banque->enabled)) {
 		print '<tr><td>'.$langs->trans('BankAccount').'</td><td>';
-		print img_picto('', 'bank_account');
-		$form->select_comptes($soc->fk_account, 'fk_account', 0, '', 1);
+		print img_picto('', 'bank_account', 'class="pictofixedwidth"');
+		print $form->select_comptes($soc->fk_account, 'fk_account', 0, '', 1, '', 0, 'maxwidth200 widthcentpercentminusx', 1);
 		print '</td></tr>';
 	}
 
 	// What trigger creation
 	print '<tr><td>'.$langs->trans('Source').'</td><td>';
-	$form->selectInputReason('', 'demand_reason_id', "SRC_PROP", 1);
+	print img_picto('', 'question', 'class="pictofixedwidth"');
+	$form->selectInputReason('', 'demand_reason_id', "SRC_PROP", 1, 'maxwidth200 widthcentpercentminusx');
 	print '</td></tr>';
 
 	// Delivery delay
@@ -1661,7 +1660,7 @@ if ($action == 'create') {
 	}
 	print '</td><td>';
 	print img_picto('', 'clock').'&ensp;';
-	$form->selectAvailabilityDelay('', 'availability_id', '', 1);
+	$form->selectAvailabilityDelay('', 'availability_id', '', 1, 'maxwidth200 widthcentpercentminusx');
 	print '</td></tr>';
 
 	// Shipping Method
@@ -1670,8 +1669,8 @@ if ($action == 'create') {
 			$shipping_method_id = $soc->shipping_method_id;
 		}
 		print '<tr><td>'.$langs->trans('SendingMethod').'</td><td>';
-		print img_picto('', 'object_dollyrevert').'&ensp;';
-		print $form->selectShippingMethod($shipping_method_id, 'shipping_method_id', '', 1);
+		print img_picto('', 'object_dollyrevert', 'class="pictofixedwidth"');
+		print $form->selectShippingMethod($shipping_method_id, 'shipping_method_id', '', 1, '', 0, 'maxwidth200 widthcentpercentminusx');
 		print '</td></tr>';
 	}
 
@@ -1680,7 +1679,7 @@ if ($action == 'create') {
 		require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 		$formproduct = new FormProduct($db);
 		print '<tr><td>'.$langs->trans('Warehouse').'</td><td>';
-		print img_picto('', 'stock').$formproduct->selectWarehouses($warehouse_id, 'warehouse_id', '', 1, 0, 0, '', 0, 0, array(), 'maxwidth175 maxwidth500 widthcentpercentminusxx');
+		print img_picto('', 'stock', 'class="pictofixedwidth"').$formproduct->selectWarehouses($warehouse_id, 'warehouse_id', '', 1, 0, 0, '', 0, 0, array(), 'maxwidth500 widthcentpercentminusxx');
 		print '</td></tr>';
 	}
 
@@ -1703,7 +1702,7 @@ if ($action == 'create') {
 		$langs->load("projects");
 		print '<tr>';
 		print '<td>'.$langs->trans("Project").'</td><td>';
-		print img_picto('', 'project').$formproject->select_projects(($soc->id > 0 ? $soc->id : -1), $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500');
+		print img_picto('', 'project', 'class="pictofixedwidth"').$formproject->select_projects(($soc->id > 0 ? $soc->id : -1), $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500 widthcentpercentminusxx');
 		print ' <a href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$soc->id.'&action=create&status=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create&socid='.$soc->id).'"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddProject").'"></span></a>';
 		print '</td>';
 		print '</tr>';
@@ -1725,7 +1724,7 @@ if ($action == 'create') {
 	print img_picto('', 'pdf').'&ensp;';
 	$liste = ModelePDFPropales::liste_modeles($db);
 	$preselected = ($conf->global->PROPALE_ADDON_PDF_ODT_DEFAULT ? $conf->global->PROPALE_ADDON_PDF_ODT_DEFAULT : $conf->global->PROPALE_ADDON_PDF);
-	print $form->selectarray('model', $liste, $preselected, 0, 0, 0, '', 0, 0, 0, '', '', 1);
+	print $form->selectarray('model', $liste, $preselected, 0, 0, 0, '', 0, 0, 0, '', 'maxwidth200 widthcentpercentminusx', 1);
 	print "</td></tr>";
 
 	// Multicurrency
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 47764d448f1..57bbbe3a029 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1025,7 +1025,7 @@ class Form
 				$out .= '<input type="hidden" name="token" value="'.newToken().'">';
 			}
 
-			$out .= '<select id="'.$htmlname.'" class="flat selectincoterm minwidth100imp noenlargeonsmartphone" name="'.$htmlname.'" '.$htmloption.'>';
+			$out .= '<select id="'.$htmlname.'" class="flat selectincoterm width75" name="'.$htmlname.'" '.$htmloption.'>';
 			$out .= '<option value="0">&nbsp;</option>';
 			$num = $this->db->num_rows($resql);
 			$i = 0;
@@ -3670,13 +3670,14 @@ class Form
 	/**
 	 *      Retourne la liste des types de delais de livraison possibles
 	 *
-	 *      @param	int		$selected        Id du type de delais pre-selectionne
-	 *      @param  string	$htmlname        Nom de la zone select
-	 *      @param  string	$filtertype      To add a filter
+	 *      @param	int		$selected       Id du type de delais pre-selectionne
+	 *      @param  string	$htmlname       Nom de la zone select
+	 *      @param  string	$filtertype     To add a filter
 	 *		@param	int		$addempty		Add empty entry
+	 * 		@param	string	$morecss		More CSS
 	 *		@return	void
 	 */
-	public function selectAvailabilityDelay($selected = '', $htmlname = 'availid', $filtertype = '', $addempty = 0)
+	public function selectAvailabilityDelay($selected = '', $htmlname = 'availid', $filtertype = '', $addempty = 0, $morecss = '')
 	{
 		global $langs, $user;
 
@@ -3684,7 +3685,7 @@ class Form
 
 		dol_syslog(__METHOD__." selected=".$selected.", htmlname=".$htmlname, LOG_DEBUG);
 
-		print '<select id="'.$htmlname.'" class="flat" name="'.$htmlname.'">';
+		print '<select id="'.$htmlname.'" class="flat'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'">';
 		if ($addempty) {
 			print '<option value="0">&nbsp;</option>';
 		}
@@ -3694,7 +3695,7 @@ class Form
 			} else {
 				print '<option value="'.$id.'">';
 			}
-			print $arrayavailability['label'];
+			print dol_escape_htmltag($arrayavailability['label']);
 			print '</option>';
 		}
 		print '</select>';
@@ -4154,15 +4155,16 @@ class Form
 	/**
 	 *  Return a HTML select list of shipping mode
 	 *
-	 *  @param	string	$selected          Id shipping mode pre-selected
-	 *  @param  string	$htmlname          Name of select zone
-	 *  @param  string	$filtre            To filter list. This parameter must not come from input of users
-	 *  @param  int		$useempty          1=Add an empty value in list, 2=Add an empty value in list only if there is more than 2 entries.
-	 *  @param  string	$moreattrib        To add more attribute on select
+	 *  @param	string	$selected           Id shipping mode pre-selected
+	 *  @param  string	$htmlname           Name of select zone
+	 *  @param  string	$filtre             To filter list. This parameter must not come from input of users
+	 *  @param  int		$useempty           1=Add an empty value in list, 2=Add an empty value in list only if there is more than 2 entries.
+	 *  @param  string	$moreattrib         To add more attribute on select
 	 *	@param	int		$noinfoadmin		0=Add admin info, 1=Disable admin info
+	 *  @param	string	$morecss			More CSS
 	 * 	@return	void
 	 */
-	public function selectShippingMethod($selected = '', $htmlname = 'shipping_method_id', $filtre = '', $useempty = 0, $moreattrib = '', $noinfoadmin = 0)
+	public function selectShippingMethod($selected = '', $htmlname = 'shipping_method_id', $filtre = '', $useempty = 0, $moreattrib = '', $noinfoadmin = 0, $morecss = '')
 	{
 		global $langs, $conf, $user;
 
@@ -4183,7 +4185,7 @@ class Form
 			$num = $this->db->num_rows($result);
 			$i = 0;
 			if ($num) {
-				print '<select id="select'.$htmlname.'" class="flat selectshippingmethod" name="'.$htmlname.'"'.($moreattrib ? ' '.$moreattrib : '').'>';
+				print '<select id="select'.$htmlname.'" class="flat selectshippingmethod'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'"'.($moreattrib ? ' '.$moreattrib : '').'>';
 				if ($useempty == 1 || ($useempty == 2 && $num > 1)) {
 					print '<option value="-1">&nbsp;</option>';
 				}
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 9afa45aff26..48237bbc826 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3514,7 +3514,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'github', 'jabber', 'skype', 'twitter', 'facebook', 'linkedin', 'instagram', 'snapchat', 'youtube', 'google-plus-g', 'whatsapp',
 				'chevron-left', 'chevron-right', 'chevron-down', 'chevron-top', 'commercial', 'companies',
 				'generic', 'home', 'hrm', 'members', 'products', 'invoicing',
-				'partnership', 'payment', 'pencil-ruler', 'preview', 'project', 'projectpub', 'projecttask', 'refresh', 'salary', 'shipment', 'supplier_invoice', 'technic', 'ticket',
+				'partnership', 'payment', 'pencil-ruler', 'preview', 'project', 'projectpub', 'projecttask', 'question', 'refresh', 'salary', 'shipment', 'supplier_invoice', 'technic', 'ticket',
 				'error', 'warning',
 				'recent', 'reception', 'recruitmentcandidature', 'recruitmentjobposition', 'resource',
 				'shapes', 'supplier', 'supplier_proposal', 'supplier_order', 'supplier_invoice',

From 3550fa2be426d5c0c2543a43e50537fe05234da5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 19 May 2021 14:48:30 +0200
Subject: [PATCH 0149/1497] Fix css

---
 htdocs/comm/propal/card.php |  2 +-
 htdocs/commande/card.php    | 34 ++++++++++++++++++----------------
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 5d9ae8d75a6..620b21d312e 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -1647,7 +1647,7 @@ if ($action == 'create') {
 		print '</td></tr>';
 	}
 
-	// What trigger creation
+	// Source / Channel - What trigger creation
 	print '<tr><td>'.$langs->trans('Source').'</td><td>';
 	print img_picto('', 'question', 'class="pictofixedwidth"');
 	$form->selectInputReason('', 'demand_reason_id', "SRC_PROP", 1, 'maxwidth200 widthcentpercentminusx');
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index e2b2be197e8..f72bf9e4663 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1626,36 +1626,37 @@ if ($action == 'create' && $usercancreate) {
 	print "</td>\n";
 	print '</tr>';
 
-	// terms of the settlement
+	// Terms of the settlement
 	print '<tr><td class="nowrap">'.$langs->trans('PaymentConditionsShort').'</td><td>';
+	print img_picto('', 'paiment');
 	$form->select_conditions_paiements($cond_reglement_id, 'cond_reglement_id', - 1, 1);
 	print '</td></tr>';
 
 	// Mode de reglement
 	print '<tr><td>'.$langs->trans('PaymentMode').'</td><td>';
-	print img_picto('', 'bank').'&ensp;';
-	$form->select_types_paiements($mode_reglement_id, 'mode_reglement_id');
+	print img_picto('', 'bank', 'class="pictofixedwidth"');
+	$form->select_types_paiements($mode_reglement_id, 'mode_reglement_id', '', 0, 1, 0, 0, 1, 'maxwidth200 widthcentpercentminusx');
 	print '</td></tr>';
 
 	// Bank Account
 	if (!empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_ORDER) && !empty($conf->banque->enabled)) {
 		print '<tr><td>'.$langs->trans('BankAccount').'</td><td>';
-		print img_picto('', 'bank_account');
-		$form->select_comptes($fk_account, 'fk_account', 0, '', 1);
+		print img_picto('', 'bank_account', 'class="pictofixedwidth"');
+		print $form->select_comptes($fk_account, 'fk_account', 0, '', 1, '', 0, 'maxwidth200 widthcentpercentminusx', 1);
 		print '</td></tr>';
 	}
 
 	// Delivery delay
 	print '<tr class="fielddeliverydelay"><td>'.$langs->trans('AvailabilityPeriod').'</td><td>';
-	print img_picto('', 'clock').'&ensp;';
-	$form->selectAvailabilityDelay($availability_id, 'availability_id', '', 1);
+	print img_picto('', 'clock', 'class="pictofixedwidth"');
+	$form->selectAvailabilityDelay($availability_id, 'availability_id', '', 1, 'maxwidth200 widthcentpercentminusx');
 	print '</td></tr>';
 
 	// Shipping Method
 	if (!empty($conf->expedition->enabled)) {
 		print '<tr><td>'.$langs->trans('SendingMethod').'</td><td>';
-		print img_picto('', 'object_dollyrevert').'&ensp;';
-		print $form->selectShippingMethod($shipping_method_id, 'shipping_method_id', '', 1);
+		print img_picto('', 'object_dollyrevert', 'class="pictofixedwidth"');
+		print $form->selectShippingMethod($shipping_method_id, 'shipping_method_id', '', 1, '', 0, 'maxwidth200 widthcentpercentminusx');
 		print '</td></tr>';
 	}
 
@@ -1664,13 +1665,14 @@ if ($action == 'create' && $usercancreate) {
 		require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 		$formproduct = new FormProduct($db);
 		print '<tr><td>'.$langs->trans('Warehouse').'</td><td>';
-		print img_picto('', 'stock').$formproduct->selectWarehouses($warehouse_id, 'warehouse_id', '', 1, 0, 0, '', 0, 0, array(), 'maxwidth175 maxwidth500 widthcentpercentminusxx');
+		print img_picto('', 'stock', 'class="pictofixedwidth"').$formproduct->selectWarehouses($warehouse_id, 'warehouse_id', '', 1, 0, 0, '', 0, 0, array(), 'maxwidth500 widthcentpercentminusxx');
 		print '</td></tr>';
 	}
 
-	// What trigger creation
+	// Source / Channle - What trigger creation
 	print '<tr><td>'.$langs->trans('Channel').'</td><td>';
-	$form->selectInputReason($demand_reason_id, 'demand_reason_id', '', 1);
+	print img_picto('', 'question', 'class="pictofixedwidth"');
+	$form->selectInputReason($demand_reason_id, 'demand_reason_id', '', 1, 'maxwidth200 widthcentpercentminusx');
 	print '</td></tr>';
 
 	// TODO How record was recorded OrderMode (llx_c_input_method)
@@ -1680,8 +1682,8 @@ if ($action == 'create' && $usercancreate) {
 		$langs->load("projects");
 		print '<tr>';
 		print '<td>'.$langs->trans("Project").'</td><td>';
-		print img_picto('', 'project');
-		$numprojet = $formproject->select_projects(($soc->id > 0 ? $soc->id : -1), $projectid, 'projectid', 0, 0, 1, 0, 0, 0, 0, '', 0, 0, 'maxwidth175 maxwidth500 widthcentpercentminusxx');
+		print img_picto('', 'project', 'class="pictofixedwidth"');
+		$numprojet = $formproject->select_projects(($soc->id > 0 ? $soc->id : -1), $projectid, 'projectid', 0, 0, 1, 0, 0, 0, 0, '', 0, 0, 'maxwidth500 widthcentpercentminusxx');
 		print ' <a href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$soc->id.'&action=create&status=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create&socid='.$soc->id).'"><span class="fa fa-plus-circle valignmiddle" title="'.$langs->trans("AddProject").'"></span></a>';
 		print '</td>';
 		print '</tr>';
@@ -1723,11 +1725,11 @@ if ($action == 'create' && $usercancreate) {
 	// Template to use by default
 	print '<tr><td>'.$langs->trans('DefaultModel').'</td>';
 	print '<td>';
-	print img_picto('', 'pdf').'&ensp;';
+	print img_picto('', 'pdf', 'class="pictofixedwidth"');
 	include_once DOL_DOCUMENT_ROOT.'/core/modules/commande/modules_commande.php';
 	$liste = ModelePDFCommandes::liste_modeles($db);
 	$preselected = $conf->global->COMMANDE_ADDON_PDF;
-	print $form->selectarray('model', $liste, $preselected, 0, 0, 0, '', 0, 0, 0, '', '', 1);
+	print $form->selectarray('model', $liste, $preselected, 0, 0, 0, '', 0, 0, 0, '', 'maxwidth200 widthcentpercentminusx', 1);
 	print "</td></tr>";
 
 	// Multicurrency

From fdf6dd2d9cf36327963c85cbab2b15591cd87781 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 19 May 2021 14:50:41 +0200
Subject: [PATCH 0150/1497] css

---
 htdocs/commande/card.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index f72bf9e4663..75478c04ef5 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1682,8 +1682,7 @@ if ($action == 'create' && $usercancreate) {
 		$langs->load("projects");
 		print '<tr>';
 		print '<td>'.$langs->trans("Project").'</td><td>';
-		print img_picto('', 'project', 'class="pictofixedwidth"');
-		$numprojet = $formproject->select_projects(($soc->id > 0 ? $soc->id : -1), $projectid, 'projectid', 0, 0, 1, 0, 0, 0, 0, '', 0, 0, 'maxwidth500 widthcentpercentminusxx');
+		print img_picto('', 'project', 'class="pictofixedwidth"').$formproject->select_projects(($soc->id > 0 ? $soc->id : -1), $projectid, 'projectid', 0, 0, 1, 0, 0, 0, 0, '', 1, 0, 'maxwidth500 widthcentpercentminusxx');
 		print ' <a href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$soc->id.'&action=create&status=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create&socid='.$soc->id).'"><span class="fa fa-plus-circle valignmiddle" title="'.$langs->trans("AddProject").'"></span></a>';
 		print '</td>';
 		print '</tr>';

From cf0da5cee72105a1e1bb447023044dac031af03e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 19 May 2021 15:00:44 +0200
Subject: [PATCH 0151/1497] css

---
 htdocs/comm/propal/card.php    |  5 ++---
 htdocs/commande/card.php       |  5 ++---
 htdocs/compta/facture/card.php | 10 ++++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 620b21d312e..b5bd94f0c2e 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -1636,14 +1636,13 @@ if ($action == 'create') {
 	// Mode of payment
 	print '<tr><td>'.$langs->trans('PaymentMode').'</td><td>';
 	print img_picto('', 'bank').'&ensp;';
-	$form->select_types_paiements((GETPOSTISSET('mode_reglement_id') ? GETPOST('mode_reglement_id', 'int') : $soc->mode_reglement_id), 'mode_reglement_id', '', 0, 1, 0, 0, 1, 'maxwidth200 widthcentpercentminusx');
+	$form->select_types_paiements((GETPOSTISSET('mode_reglement_id') ? GETPOST('mode_reglement_id', 'int') : $soc->mode_reglement_id), 'mode_reglement_id', 'CRDT', 0, 1, 0, 0, 1, 'maxwidth200 widthcentpercentminusx');
 	print '</td></tr>';
 
 	// Bank Account
 	if (!empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL) && !empty($conf->banque->enabled)) {
 		print '<tr><td>'.$langs->trans('BankAccount').'</td><td>';
-		print img_picto('', 'bank_account', 'class="pictofixedwidth"');
-		print $form->select_comptes($soc->fk_account, 'fk_account', 0, '', 1, '', 0, 'maxwidth200 widthcentpercentminusx', 1);
+		print img_picto('', 'bank_account', 'class="pictofixedwidth"').$form->select_comptes($soc->fk_account, 'fk_account', 0, '', 1, '', 0, 'maxwidth200 widthcentpercentminusx', 1);
 		print '</td></tr>';
 	}
 
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 75478c04ef5..6d0badf6380 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1635,14 +1635,13 @@ if ($action == 'create' && $usercancreate) {
 	// Mode de reglement
 	print '<tr><td>'.$langs->trans('PaymentMode').'</td><td>';
 	print img_picto('', 'bank', 'class="pictofixedwidth"');
-	$form->select_types_paiements($mode_reglement_id, 'mode_reglement_id', '', 0, 1, 0, 0, 1, 'maxwidth200 widthcentpercentminusx');
+	$form->select_types_paiements($mode_reglement_id, 'mode_reglement_id', 'CRDT', 0, 1, 0, 0, 1, 'maxwidth200 widthcentpercentminusx');
 	print '</td></tr>';
 
 	// Bank Account
 	if (!empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_ORDER) && !empty($conf->banque->enabled)) {
 		print '<tr><td>'.$langs->trans('BankAccount').'</td><td>';
-		print img_picto('', 'bank_account', 'class="pictofixedwidth"');
-		print $form->select_comptes($fk_account, 'fk_account', 0, '', 1, '', 0, 'maxwidth200 widthcentpercentminusx', 1);
+		print img_picto('', 'bank_account', 'class="pictofixedwidth"').$form->select_comptes($fk_account, 'fk_account', 0, '', 1, '', 0, 'maxwidth200 widthcentpercentminusx', 1);
 		print '</td></tr>';
 	}
 
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index e5b4b2d2398..de5856bdb58 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -3571,14 +3571,15 @@ if ($action == 'create') {
 
 	// Payment mode
 	print '<tr><td>'.$langs->trans('PaymentMode').'</td><td colspan="2">';
-	$form->select_types_paiements(GETPOSTISSET('mode_reglement_id') ? GETPOST('mode_reglement_id') : $mode_reglement_id, 'mode_reglement_id', 'CRDT');
+	print img_picto('', 'bank', 'class="pictofixedwidth"');
+	$form->select_types_paiements(GETPOSTISSET('mode_reglement_id') ? GETPOST('mode_reglement_id') : $mode_reglement_id, 'mode_reglement_id', 'CRDT', 0, 1, 0, 0, 1, 'maxwidth200 widthcentpercentminusx');
 	print '</td></tr>';
 
 	// Bank Account
 	if (!empty($conf->banque->enabled)) {
 		print '<tr><td>'.$langs->trans('BankAccount').'</td><td colspan="2">';
 		$fk_account = GETPOST('fk_account', 'int');
-		print img_picto('', 'bank_account', 'class="paddingrightonly"').$form->select_comptes(($fk_account < 0 ? '' : $fk_account), 'fk_account', 0, '', 1, '', 0, '', 1);
+		print img_picto('', 'bank_account', 'class="pictofixedwidth"').$form->select_comptes(($fk_account < 0 ? '' : $fk_account), 'fk_account', 0, '', 1, '', 0, 'maxwidth200 widthcentpercentminusx', 1);
 		print '</td></tr>';
 	}
 
@@ -3586,7 +3587,7 @@ if ($action == 'create') {
 	if (!empty($conf->projet->enabled)) {
 		$langs->load('projects');
 		print '<tr><td>'.$langs->trans('Project').'</td><td colspan="2">';
-		print img_picto('', 'project').$formproject->select_projects(($socid > 0 ? $socid : -1), $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500');
+		print img_picto('', 'project').$formproject->select_projects(($socid > 0 ? $socid : -1), $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500 widthcentpercentminusxx');
 		print ' <a href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$soc->id.'&action=create&status=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create&socid='.$soc->id.($fac_rec ? '&fac_rec='.$fac_rec : '')).'"><span class="fa fa-plus-circle valignmiddle" title="'.$langs->trans("AddProject").'"></span></a>';
 		print '</td></tr>';
 	}
@@ -3626,6 +3627,7 @@ if ($action == 'create') {
 	// Template to use by default
 	print '<tr><td>'.$langs->trans('Model').'</td>';
 	print '<td colspan="2">';
+	print img_picto('', 'pdf', 'class="pictofixedwidth"');
 	include_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
 	$liste = ModelePDFFactures::liste_modeles($db);
 	if (!empty($conf->global->INVOICE_USE_DEFAULT_DOCUMENT)) {
@@ -3635,7 +3637,7 @@ if ($action == 'create') {
 	} else {
 		$preselected = $conf->global->FACTURE_ADDON_PDF;
 	}
-	print $form->selectarray('model', $liste, $preselected, 0, 0, 0, '', 0, 0, 0, '', '', 1);
+	print $form->selectarray('model', $liste, $preselected, 0, 0, 0, '', 0, 0, 0, '', 'maxwidth200 widthcentpercentminusx', 1);
 	print "</td></tr>";
 
 	// Multicurrency

From 217ee260c2333cacd18dc72040181b3a2fa00d87 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 19 May 2021 15:11:47 +0200
Subject: [PATCH 0152/1497] css

---
 htdocs/compta/facture/card.php | 2 +-
 htdocs/fourn/facture/card.php  | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index de5856bdb58..29d4f91952b 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -1364,7 +1364,7 @@ if (empty($reshook)) {
 				$object->note_private = trim(GETPOST('note_private', 'restricthtml'));
 				$object->ref_client			= GETPOST('ref_client');
 				$object->model_pdf = GETPOST('model');
-				$object->fk_project			= GETPOST('projectid');
+				$object->fk_project			= GETPOST('projectid', 'int');
 				$object->cond_reglement_id	= (GETPOST('type') == 3 ? 1 : GETPOST('cond_reglement_id'));
 				$object->mode_reglement_id	= GETPOST('mode_reglement_id');
 				$object->fk_account = GETPOST('fk_account', 'int');
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 30c37bb4d88..0bc26ea8f2b 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -75,6 +75,7 @@ $lineid		= GETPOST('lineid', 'int');
 $projectid = GETPOST('projectid', 'int');
 $origin		= GETPOST('origin', 'alpha');
 $originid = GETPOST('originid', 'int');
+$fac_rec = GETPOST('fac_rec', 'int');
 
 // PDF
 $hidedetails = (GETPOST('hidedetails', 'int') ? GETPOST('hidedetails', 'int') : (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0));
@@ -2211,13 +2212,14 @@ if ($action == 'create') {
 
 	// Payment mode
 	print '<tr><td>'.$langs->trans('PaymentMode').'</td><td>';
-	$form->select_types_paiements(GETPOSTISSET('mode_reglement_id') ?GETPOST('mode_reglement_id', 'int') : $mode_reglement_id, 'mode_reglement_id', 'DBIT');
+	print img_picto('', 'bank', 'class="pictofixedwidth"');
+	$form->select_types_paiements(GETPOSTISSET('mode_reglement_id') ?GETPOST('mode_reglement_id', 'int') : $mode_reglement_id, 'mode_reglement_id', 'DBIT', 0, 1, 0, 0, 1, 'maxwidth200 widthcentpercentminusx');
 	print '</td></tr>';
 
 	// Bank Account
 	if (!empty($conf->banque->enabled)) {
 		print '<tr><td>'.$langs->trans('BankAccount').'</td><td>';
-		print img_picto('', 'bank_account').$form->select_comptes((GETPOSTISSET('fk_account') ?GETPOST('fk_account', 'alpha') : $fk_account), 'fk_account', 0, '', 1, '', 0, '', 1);
+		print img_picto('', 'bank_account', 'class="pictofixedwidth"').$form->select_comptes((GETPOSTISSET('fk_account') ?GETPOST('fk_account', 'alpha') : $fk_account), 'fk_account', 0, '', 1, '', 0, 'maxwidth200 widthcentpercentminusx', 1);
 		print '</td></tr>';
 	}
 
@@ -2227,7 +2229,8 @@ if ($action == 'create') {
 
 		$langs->load('projects');
 		print '<tr><td>'.$langs->trans('Project').'</td><td>';
-		print img_picto('', 'project').$formproject->select_projects((empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $societe->id : -1), $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500');
+		print img_picto('', 'project', 'class="pictofixedwidth"').$formproject->select_projects((empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $societe->id : -1), $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500 widthcentpercentminusxx');
+		print ' <a href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$soc->id.'&action=create&status=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create&socid='.$soc->id.($fac_rec ? '&fac_rec='.$fac_rec : '')).'"><span class="fa fa-plus-circle valignmiddle" title="'.$langs->trans("AddProject").'"></span></a>';
 		print '</td></tr>';
 	}
 

From 83521311dc4e19d96ecf2aaee970d583ca0f2fee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Wed, 19 May 2021 15:48:08 +0200
Subject: [PATCH 0153/1497] fix phpcs was disabled

---
 .../stock/class/mouvementstock.class.php      | 284 +++++++-----------
 1 file changed, 105 insertions(+), 179 deletions(-)

diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php
index d8dad67bee2..287cc26596c 100644
--- a/htdocs/product/stock/class/mouvementstock.class.php
+++ b/htdocs/product/stock/class/mouvementstock.class.php
@@ -150,7 +150,7 @@ class MouvementStock extends CommonObject
 	 */
 	public function _create($user, $fk_product, $entrepot_id, $qty, $type, $price = 0, $label = '', $inventorycode = '', $datem = '', $eatby = '', $sellby = '', $batch = '', $skip_batch = false, $id_product_batch = 0, $disablestockchangeforsubproduct = 0)
 	{
-		// phpcs:disable
+		// phpcs:enable
 		global $conf, $langs;
 
 		require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
@@ -160,26 +160,26 @@ class MouvementStock extends CommonObject
 		dol_syslog(get_class($this)."::_create start userid=$user->id, fk_product=$fk_product, warehouse_id=$entrepot_id, qty=$qty, type=$type, price=$price, label=$label, inventorycode=$inventorycode, datem=".$datem.", eatby=".$eatby.", sellby=".$sellby.", batch=".$batch.", skip_batch=".$skip_batch);
 
 		// start hook at beginning
-                global $action, $hookmanager;
-                $hookmanager->initHooks(array('mouvementstock'));
-                // Hook of thirdparty module
-                if (is_object($hookmanager)) {
+		global $action, $hookmanager;
+		$hookmanager->initHooks(array('mouvementstock'));
+		// Hook of thirdparty module
+		if (is_object($hookmanager)) {
 			$parameters = array(
-		'currentcontext'   => 'mouvementstock',
-		'user'             => &$user,
-		'fk_product'       => &$fk_product,
-		'entrepot_id'      => &$entrepot_id,
-		'qty'              => &$qty,
-		'type'             => &$type,
-		'price'            => &$price,
-		'label'            => &$label,
-		'inventorycode'    => &$inventorycode,
-		'datem'            => &$datem,
-		'eatby'            => &$eatby,
-		'sellby'           => &$sellby,
-		'batch'            => &$batch,
-		'skip_batch'       => &$skip_batch,
-		'id_product_batch' => &$id_product_batch
+				'currentcontext'   => 'mouvementstock',
+				'user'             => &$user,
+				'fk_product'       => &$fk_product,
+				'entrepot_id'      => &$entrepot_id,
+				'qty'              => &$qty,
+				'type'             => &$type,
+				'price'            => &$price,
+				'label'            => &$label,
+				'inventorycode'    => &$inventorycode,
+				'datem'            => &$datem,
+				'eatby'            => &$eatby,
+				'sellby'           => &$sellby,
+				'batch'            => &$batch,
+				'skip_batch'       => &$skip_batch,
+				'id_product_batch' => &$id_product_batch
 			);
 			$reshook    = $hookmanager->executeHooks('stockMovementCreate', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks
 
@@ -190,8 +190,8 @@ class MouvementStock extends CommonObject
 			} elseif ($reshook > 0) {
 				return $hookmanager->resPrint;
 			}
-                }
-                // end hook at beginning
+		}
+		// end hook at beginning
 
 		// Clean parameters
 		$price = price2num($price, 'MU'); // Clean value for the casse we receive a float zero value, to have it a real zero value.
@@ -244,10 +244,8 @@ class MouvementStock extends CommonObject
 		$product->load_stock('novirtual');
 
 		// Test if product require batch data. If yes, and there is not, we throw an error.
-		if (!empty($conf->productbatch->enabled) && $product->hasbatch() && !$skip_batch)
-		{
-			if (empty($batch))
-			{
+		if (!empty($conf->productbatch->enabled) && $product->hasbatch() && !$skip_batch) {
+			if (empty($batch)) {
 				$langs->load("errors");
 				$this->errors[] = $langs->transnoentitiesnoconv("ErrorTryToMakeMoveOnProductRequiringBatchData", $product->ref);
 				dol_syslog("Try to make a movement of a product with status_batch on without any batch data");
@@ -266,23 +264,17 @@ class MouvementStock extends CommonObject
 			$sql .= " WHERE pb.fk_product = ".$fk_product." AND pb.batch = '".$this->db->escape($batch)."'";
 			dol_syslog(get_class($this)."::_create scan serial for this product to check if eatby and sellby match", LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$num = $this->db->num_rows($resql);
 				$i = 0;
-				if ($num > 0)
-				{
-					while ($i < $num)
-					{
+				if ($num > 0) {
+					while ($i < $num) {
 						$obj = $this->db->fetch_object($resql);
-						if ($obj->eatby)
-						{
-							if ($eatby)
-							{
+						if ($obj->eatby) {
+							if ($eatby) {
 								$tmparray = dol_getdate($eatby, true);
 								$eatbywithouthour = dol_mktime(0, 0, 0, $tmparray['mon'], $tmparray['mday'], $tmparray['year']);
-								if ($this->db->jdate($obj->eatby) != $eatby && $this->db->jdate($obj->eatby) != $eatbywithouthour)    // We test date without hours and with hours for backward compatibility
-								{
+								if ($this->db->jdate($obj->eatby) != $eatby && $this->db->jdate($obj->eatby) != $eatbywithouthour) {    // We test date without hours and with hours for backward compatibility
 									// If found and eatby/sellby defined into table and provided and differs, return error
 									$langs->load("stocks");
 									$this->errors[] = $langs->transnoentitiesnoconv("ThisSerialAlreadyExistWithDifferentDate", $batch, dol_print_date($this->db->jdate($obj->eatby), 'dayhour'), dol_print_date($eatbywithouthour, 'dayhour'));
@@ -294,14 +286,12 @@ class MouvementStock extends CommonObject
 								$eatby = $obj->eatby; // If found and eatby/sellby defined into table and not provided, we take value from table
 							}
 						} else {
-							if ($eatby) // If found and eatby/sellby not defined into table and provided, we update table
-							{
+							if ($eatby) { // If found and eatby/sellby not defined into table and provided, we update table
 								$productlot = new Productlot($this->db);
 								$result = $productlot->fetch($obj->rowid);
 								$productlot->eatby = $eatby;
 								$result = $productlot->update($user);
-								if ($result <= 0)
-								{
+								if ($result <= 0) {
 									$this->error = $productlot->error;
 									$this->errors = $productlot->errors;
 									$this->db->rollback();
@@ -309,14 +299,11 @@ class MouvementStock extends CommonObject
 								}
 							}
 						}
-						if ($obj->sellby)
-						{
-							if ($sellby)
-							{
+						if ($obj->sellby) {
+							if ($sellby) {
 								$tmparray = dol_getdate($sellby, true);
 								$sellbywithouthour = dol_mktime(0, 0, 0, $tmparray['mon'], $tmparray['mday'], $tmparray['year']);
-								if ($this->db->jdate($obj->sellby) != $sellby && $this->db->jdate($obj->sellby) != $sellbywithouthour)    // We test date without hours and with hours for backward compatibility
-								{
+								if ($this->db->jdate($obj->sellby) != $sellby && $this->db->jdate($obj->sellby) != $sellbywithouthour) {    // We test date without hours and with hours for backward compatibility
 									// If found and eatby/sellby defined into table and provided and differs, return error
 									$this->errors[] = $langs->transnoentitiesnoconv("ThisSerialAlreadyExistWithDifferentDate", $batch, dol_print_date($this->db->jdate($obj->sellby)), dol_print_date($sellby));
 									dol_syslog($langs->transnoentities("ThisSerialAlreadyExistWithDifferentDate", $batch, dol_print_date($this->db->jdate($obj->sellby)), dol_print_date($sellby)), LOG_ERR);
@@ -326,17 +313,13 @@ class MouvementStock extends CommonObject
 							} else {
 								$sellby = $obj->sellby; // If found and eatby/sellby defined into table and not provided, we take value from table
 							}
-						}
-						else
-						{
-							if ($sellby) // If found and eatby/sellby not defined into table and provided, we update table
-							{
+						} else {
+							if ($sellby) { // If found and eatby/sellby not defined into table and provided, we update table
 								$productlot = new Productlot($this->db);
 								$result = $productlot->fetch($obj->rowid);
 								$productlot->sellby = $sellby;
 								$result = $productlot->update($user);
-								if ($result <= 0)
-								{
+								if ($result <= 0) {
 									$this->error = $productlot->error;
 									$this->errors = $productlot->errors;
 									$this->db->rollback();
@@ -347,9 +330,7 @@ class MouvementStock extends CommonObject
 
 						$i++;
 					}
-				}
-				else   // If not found, we add record
-				{
+				} else { // If not found, we add record
 					$productlot = new Productlot($this->db);
 					$productlot->entity = $conf->entity;
 					$productlot->fk_product = $fk_product;
@@ -358,17 +339,14 @@ class MouvementStock extends CommonObject
 					$productlot->eatby = $eatby;
 					$productlot->sellby = $sellby;
 					$result = $productlot->create($user);
-					if ($result <= 0)
-					{
+					if ($result <= 0) {
 						$this->error = $productlot->error;
 						$this->errors = $productlot->errors;
 						$this->db->rollback();
 						return -4;
 					}
 				}
-			}
-			else
-			{
+			} else {
 				dol_print_error($this->db);
 				$this->db->rollback();
 				return -1;
@@ -381,21 +359,17 @@ class MouvementStock extends CommonObject
 
 		// Check if stock is enough when qty is < 0
 		// Note that qty should be > 0 with type 0 or 3, < 0 with type 1 or 2.
-		if ($movestock && $qty < 0 && empty($conf->global->STOCK_ALLOW_NEGATIVE_TRANSFER))
-		{
-			if (!empty($conf->productbatch->enabled) && $product->hasbatch() && !$skip_batch)
-			{
+		if ($movestock && $qty < 0 && empty($conf->global->STOCK_ALLOW_NEGATIVE_TRANSFER)) {
+			if (!empty($conf->productbatch->enabled) && $product->hasbatch() && !$skip_batch) {
 				$foundforbatch = 0;
 				$qtyisnotenough = 0;
-				foreach ($product->stock_warehouse[$entrepot_id]->detail_batch as $batchcursor => $prodbatch)
-				{
+				foreach ($product->stock_warehouse[$entrepot_id]->detail_batch as $batchcursor => $prodbatch) {
 					if ($batch != $batchcursor) continue;
 					$foundforbatch = 1;
 					if ($prodbatch->qty < abs($qty)) $qtyisnotenough = $prodbatch->qty;
 					break;
 				}
-				if (!$foundforbatch || $qtyisnotenough)
-				{
+				if (!$foundforbatch || $qtyisnotenough) {
 					$langs->load("stocks");
 					include_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
 					$tmpwarehouse = new Entrepot($this->db);
@@ -406,11 +380,8 @@ class MouvementStock extends CommonObject
 					$this->db->rollback();
 					return -8;
 				}
-			}
-			else
-			{
-				if (empty($product->stock_warehouse[$entrepot_id]->real) || $product->stock_warehouse[$entrepot_id]->real < abs($qty))
-				{
+			} else {
+				if (empty($product->stock_warehouse[$entrepot_id]->real) || $product->stock_warehouse[$entrepot_id]->real < abs($qty)) {
 					$langs->load("stocks");
 					$this->error = $langs->trans('qtyToTranferIsNotEnough').' : '.$product->ref;
 					$this->errors[] = $langs->trans('qtyToTranferIsNotEnough').' : '.$product->ref;
@@ -420,8 +391,7 @@ class MouvementStock extends CommonObject
 			}
 		}
 
-		if ($movestock && $entrepot_id > 0)	// Change stock for current product, change for subproduct is done after
-		{
+		if ($movestock && $entrepot_id > 0) {	// Change stock for current product, change for subproduct is done after
 			// Set $origintype, fk_origin, fk_project
 			$fk_project = 0;
 			if (!empty($this->origin)) {			// This is set by caller for tracking reason
@@ -431,10 +401,8 @@ class MouvementStock extends CommonObject
 					$fk_project = $fk_origin;
 				} else {
 					$res = $this->origin->fetch($fk_origin);
-					if ($res > 0)
-					{
-						if (!empty($this->origin->fk_project))
-						{
+					if ($res > 0) {
+						if (!empty($this->origin->fk_project)) {
 							$fk_project = $this->origin->fk_project;
 						}
 					}
@@ -466,13 +434,10 @@ class MouvementStock extends CommonObject
 			dol_syslog(get_class($this)."::_create insert record into stock_mouvement", LOG_DEBUG);
 			$resql = $this->db->query($sql);
 
-			if ($resql)
-			{
+			if ($resql) {
 				$mvid = $this->db->last_insert_id(MAIN_DB_PREFIX."stock_mouvement");
 				$this->id = $mvid;
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->lasterror();
 				$this->errors[] = $this->error;
 				$error = -1;
@@ -485,18 +450,15 @@ class MouvementStock extends CommonObject
 
 			// Test if there is already a record for couple (warehouse / product), so later we will make an update or create.
 			$alreadyarecord = 0;
-			if (!$error)
-			{
+			if (!$error) {
 				$sql = "SELECT rowid, reel FROM ".MAIN_DB_PREFIX."product_stock";
 				$sql .= " WHERE fk_entrepot = ".((int) $entrepot_id)." AND fk_product = ".((int) $fk_product); // This is a unique key
 
 				dol_syslog(get_class($this)."::_create check if a record already exists in product_stock", LOG_DEBUG);
 				$resql = $this->db->query($sql);
-				if ($resql)
-				{
+				if ($resql) {
 					$obj = $this->db->fetch_object($resql);
-					if ($obj)
-					{
+					if ($obj) {
 						$alreadyarecord = 1;
 						$oldqtywarehouse = $obj->reel;
 						$fk_product_stock = $obj->rowid;
@@ -510,10 +472,8 @@ class MouvementStock extends CommonObject
 
 			// Calculate new AWP (PMP)
 			$newpmp = 0;
-			if (!$error)
-			{
-				if ($type == 0 || $type == 3)
-				{
+			if (!$error) {
+				if ($type == 0 || $type == 3) {
 					// After a stock increase
 					// Note: PMP is calculated on stock input only (type of movement = 0 or 3). If type == 0 or 3, qty should be > 0.
 					// Note: Price should always be >0 or 0. PMP should be always >0 (calculated on input)
@@ -540,10 +500,8 @@ class MouvementStock extends CommonObject
 				}
 			}
 			// Update stock quantity
-			if (!$error)
-			{
-				if ($alreadyarecord > 0)
-				{
+			if (!$error) {
+				if ($alreadyarecord > 0) {
 					$sql = "UPDATE ".MAIN_DB_PREFIX."product_stock SET reel = reel + ".((float) $qty);
 					$sql .= " WHERE fk_entrepot = ".((int) $entrepot_id)." AND fk_product = ".((int) $fk_product);
 				} else {
@@ -554,39 +512,29 @@ class MouvementStock extends CommonObject
 
 				dol_syslog(get_class($this)."::_create update stock value", LOG_DEBUG);
 				$resql = $this->db->query($sql);
-				if (!$resql)
-				{
+				if (!$resql) {
 					$this->errors[] = $this->db->lasterror();
 					$error = -3;
-				}
-				elseif (empty($fk_product_stock))
-				{
+				} elseif (empty($fk_product_stock)) {
 					$fk_product_stock = $this->db->last_insert_id(MAIN_DB_PREFIX."product_stock");
 				}
 			}
 
 			// Update detail stock for batch product
-			if (!$error && !empty($conf->productbatch->enabled) && $product->hasbatch() && !$skip_batch)
-			{
+			if (!$error && !empty($conf->productbatch->enabled) && $product->hasbatch() && !$skip_batch) {
 				// check unicity for serial numbered equipments ( different for lots managed products)
-				if ( $product->status_batch == 2 && $qty > 0 )
-				{
-					if ( $this->getBatchCount($fk_product, $batch) > 0 )
-					{
+				if ( $product->status_batch == 2 && $qty > 0 ) {
+					if ( $this->getBatchCount($fk_product, $batch) > 0 ) {
 						$error++;
 						$this->errors[] = $langs->trans("SerialNumberAlreadyInUse", $batch, $product->ref);
-					}
-					elseif ( $qty > 1 )
-					{
+					} elseif ( $qty > 1 ) {
 						$error++;
 						$this->errors[] = $langs->trans("TooManyQtyForSerialNumber", $product->ref, $batch);
 					}
 				}
 
-				if ( ! $error )
-				{
-					if ($id_product_batch > 0)
-					{
+				if ( ! $error ) {
+					if ($id_product_batch > 0) {
 						$result = $this->createBatch($id_product_batch, $qty);
 					} else {
 						$param_batch = array('fk_product_stock' =>$fk_product_stock, 'batchnumber'=>$batch);
@@ -597,8 +545,7 @@ class MouvementStock extends CommonObject
 			}
 
 			// Update PMP and denormalized value of stock qty at product level
-			if (!$error)
-			{
+			if (!$error) {
 				$newpmp = price2num($newpmp, 'MU');
 
 				// $sql = "UPDATE ".MAIN_DB_PREFIX."product SET pmp = ".$newpmp.", stock = ".$this->db->ifsql("stock IS NULL", 0, "stock") . " + ".$qty;
@@ -610,8 +557,7 @@ class MouvementStock extends CommonObject
 
 				dol_syslog(get_class($this)."::_create update AWP", LOG_DEBUG);
 				$resql = $this->db->query($sql);
-				if (!$resql)
-				{
+				if (!$resql) {
 					$this->errors[] = $this->db->lasterror();
 					$error = -4;
 				}
@@ -625,26 +571,21 @@ class MouvementStock extends CommonObject
 		}
 
 		// Add movement for sub products (recursive call)
-		if (!$error && !empty($conf->global->PRODUIT_SOUSPRODUITS) && empty($conf->global->INDEPENDANT_SUBPRODUCT_STOCK) && empty($disablestockchangeforsubproduct))
-		{
+		if (!$error && !empty($conf->global->PRODUIT_SOUSPRODUITS) && empty($conf->global->INDEPENDANT_SUBPRODUCT_STOCK) && empty($disablestockchangeforsubproduct)) {
 			$error = $this->_createSubProduct($user, $fk_product, $entrepot_id, $qty, $type, 0, $label, $inventorycode); // we use 0 as price, because AWP must not change for subproduct
 		}
 
-		if ($movestock && !$error)
-		{
+		if ($movestock && !$error) {
 			// Call trigger
 			$result = $this->call_trigger('STOCK_MOVEMENT', $user);
 			if ($result < 0) $error++;
 			// End call triggers
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$this->db->commit();
 			return $mvid;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			dol_syslog(get_class($this)."::_create error code=".$error, LOG_ERR);
 			return -6;
@@ -768,35 +709,27 @@ class MouvementStock extends CommonObject
 
 		dol_syslog(get_class($this)."::_createSubProduct for parent product ".$idProduct, LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$i = 0;
-			while ($obj = $this->db->fetch_object($resql))
-			{
+			while ($obj = $this->db->fetch_object($resql)) {
 				$pids[$i] = $obj->fk_product_fils;
 				$pqtys[$i] = $obj->qty;
 				$i++;
 			}
 			$this->db->free($resql);
-		}
-		else
-		{
+		} else {
 			$error = -2;
 		}
 
 		// Create movement for each subproduct
-		foreach ($pids as $key => $value)
-		{
-			if (!$error)
-			{
+		foreach ($pids as $key => $value) {
+			if (!$error) {
 				$tmpmove = dol_clone($this, 1);
 				$result = $tmpmove->_create($user, $pids[$key], $entrepot_id, ($qty * $pqtys[$key]), $type, 0, $label, $inventorycode); // This will also call _createSubProduct making this recursive
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$this->error = $tmpmove->error;
 					$this->errors = array_merge($this->errors, $tmpmove->errors);
-					if ($result == -2)
-					{
+					if ($result == -2) {
 						$this->errors[] = $langs->trans("ErrorNoteAlsoThatSubProductCantBeFollowedByLot");
 					}
 					$error = $result;
@@ -862,27 +795,26 @@ class MouvementStock extends CommonObject
 	}
 
 
-	/**
-	 * Return nb of subproducts lines for a product
-	 *
-	 * @param      int		$id				Id of product
-	 * @return     int						<0 if KO, nb of subproducts if OK
-	 * @deprecated A count($product->getChildsArbo($id,1)) is same. No reason to have this in this class.
-	 */
-	/*
-	public function nbOfSubProducts($id)
-	{
-		$nbSP=0;
+	// /**
+	//  * Return nb of subproducts lines for a product
+	//  *
+	//  * @param      int		$id				Id of product
+	//  * @return     int						<0 if KO, nb of subproducts if OK
+	//  * @deprecated A count($product->getChildsArbo($id,1)) is same. No reason to have this in this class.
+	//  */
+	// public function nbOfSubProducts($id)
+	// {
+	// 	$nbSP=0;
 
-		$resql = "SELECT count(*) as nb FROM ".MAIN_DB_PREFIX."product_association";
-		$resql.= " WHERE fk_product_pere = ".((int) $id);
-		if ($this->db->query($resql))
-		{
-			$obj=$this->db->fetch_object($resql);
-			$nbSP=$obj->nb;
-		}
-		return $nbSP;
-	}*/
+	// 	$resql = "SELECT count(*) as nb FROM ".MAIN_DB_PREFIX."product_association";
+	// 	$resql.= " WHERE fk_product_pere = ".((int) $id);
+	// 	if ($this->db->query($resql))
+	// 	{
+	// 		$obj=$this->db->fetch_object($resql);
+	// 		$nbSP=$obj->nb;
+	// 	}
+	// 	return $nbSP;
+	// }
 
 	/**
 	 * Count number of product in stock before a specific date
@@ -901,8 +833,7 @@ class MouvementStock extends CommonObject
 
 		dol_syslog(get_class($this).__METHOD__.'', LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
 			if ($obj) $nb = $obj->nb;
 			return (empty($nb) ? 0 : $nb);
@@ -930,19 +861,16 @@ class MouvementStock extends CommonObject
 		$result = 0;
 
 		// Try to find an existing record with same batch number or id
-		if (is_numeric($dluo))
-		{
+		if (is_numeric($dluo)) {
 			$result = $pdluo->fetch($dluo);
-			if (empty($pdluo->id))
-			{
+			if (empty($pdluo->id)) {
 				// We didn't find the line. May be it was deleted before by a previous move in same transaction.
 				$this->error = 'Error. You ask a move on a record for a serial that does not exists anymore. May be you take the same serial on same warehouse several times in same shipment or it was used by another shipment. Remove this shipment and prepare another one.';
 				$this->errors[] = $this->error;
 				$result = -2;
 			}
 		} elseif (is_array($dluo)) {
-			if (isset($dluo['fk_product_stock']))
-			{
+			if (isset($dluo['fk_product_stock'])) {
 				$vfk_product_stock = $dluo['fk_product_stock'];
 				$vbatchnumber = $dluo['batchnumber'];
 
@@ -956,8 +884,7 @@ class MouvementStock extends CommonObject
 			$result = -1;
 		}
 
-		if ($result >= 0)
-		{
+		if ($result >= 0) {
 			// No error
 			if ($pdluo->id > 0) {	// product_batch record found
 				//print "Avant ".$pdluo->qty." Apres ".($pdluo->qty + $qty)."<br>";
@@ -975,8 +902,7 @@ class MouvementStock extends CommonObject
 				$pdluo->batch = $vbatchnumber;
 
 				$result = $pdluo->create($user, 1);
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$this->error = $pdluo->error;
 					$this->errors = $pdluo->errors;
 				}

From 50637ab76b92895e5ce6dc7b3a8de8453fae11b8 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Wed, 19 May 2021 16:07:27 +0200
Subject: [PATCH 0154/1497] Update mo_agenda.php

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

diff --git a/htdocs/mrp/mo_agenda.php b/htdocs/mrp/mo_agenda.php
index 4619b04f7a1..bbd2724fb1c 100644
--- a/htdocs/mrp/mo_agenda.php
+++ b/htdocs/mrp/mo_agenda.php
@@ -131,7 +131,7 @@ $formproject = new FormProjets($db);
 if ($object->id > 0) {
 	$title = $langs->trans("Agenda");
 	//if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
-	$help_url = 'EN:Module_Agenda_En';
+	$help_url = 'EN:Module_Agenda_En|FR:Module_Agenda|ES:Módulo_Agenda|DE:Modul_Agenda';
 	llxHeader('', $title, $help_url);
 
 	if (!empty($conf->notification->enabled)) {

From f4ca37c1335d441bab962f39653632182e771193 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 19 May 2021 16:15:17 +0200
Subject: [PATCH 0155/1497] doc

---
 ChangeLog | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index bb44e0fa0be..52cc6035b68 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,7 +15,8 @@ NEW: Add a performance center page with all information and advices related to t
 NEW: A lot of fix into english text after a small proofreading campaign (still not perfect, but really better)
 NEW: All main menu entries are using the picto of the module
 NEW: Add a copy to clipboard button on some fields 
-NEW: Add an example of scheduled job to send email reminder for unpayed invoices 
+NEW: Add an example of scheduled job to send email reminder for unpayed invoices
+NEW: Can make massive stock transfers from a CSV file.
 NEW: Accountancy - Add FEC import
 NEW: Accountancy - Add a confirmation form with options on export
 NEW: Accountancy - Add select date from/to in already bind customer and supplier list

From 8a9c21c642b62d74d5d80645a4d7edd904a32856 Mon Sep 17 00:00:00 2001
From: Sylvain Legrand <sylvain.legrand@infras.fr>
Date: Wed, 19 May 2021 18:47:07 +0200
Subject: [PATCH 0156/1497] Update societe.class.php

---
 htdocs/societe/class/societe.class.php | 61 ++++++++++++++++++++------
 1 file changed, 48 insertions(+), 13 deletions(-)

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 011dd3dcce5..3c7d642c23f 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -3112,20 +3112,55 @@ class Societe extends CommonObject
 	{
 		// phpcs:enable
 		if ($this->id) {
-			$sql = "UPDATE ".MAIN_DB_PREFIX."societe";
-			$sql .= " SET parent = ".($id > 0 ? $id : "null");
-			$sql .= " WHERE rowid = ".$this->id;
-			dol_syslog(get_class($this).'::set_parent', LOG_DEBUG);
-			$resql = $this->db->query($sql);
-			if ($resql) {
-				$this->parent = $id;
-				return 1;
-			} else {
+			// InfraS change (to avoid infinite loop)
+			$sameparent				= $this->get_parents($id, $this->id);
+			if ($sameparent < 0)	return -1;
+			elseif ($sameparent == 1)
+			{
+				setEventMessages('la maison mère choisie est déjà filiale de ce tiers', null, 'warnings');
 				return -1;
-			}
-		} else {
-			return -1;
-		}
+			}	// elseif ($sameparent == 1)
+			else
+			{
+				$sql	= 'UPDATE '.MAIN_DB_PREFIX.'societe SET parent = '.($id > 0 ? $id : 'null').' WHERE rowid = '.$this->id;
+				dol_syslog(get_class($this).'::set_parent', LOG_DEBUG);
+				$resql	= $this->db->query($sql);
+				if ($resql)
+				{
+					$this->parent	= $id;
+					return 1;
+				}	// if ($resql)
+				else	return -1;
+			}	// else	// elseif ($sameparent == 1)
+		}	// if ($this->id)
+		else return -1;
+	}
+
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *    Search parent commany of current company
+	 *
+	 *    @param	int		$idparent	Id of thirdparty to check
+	 *    @param	int		$idchild	Id of thirdparty to compare to
+	 *    @return	int     		<0 if KO, 0 if OK or 1 if at some level a parent company was the child to compare to
+	 */
+    public function get_parents($idparent, $idchild)
+	{
+        // phpcs:enable
+		$sql	= 'SELECT s.parent';
+		$sql	.= ' FROM '.MAIN_DB_PREFIX.'societe as s';
+		$sql	.= ' WHERE rowid = '.$idparent;
+		$resql	= $this->db->query($sql);
+		if ($resql)
+		{
+			$obj	= $this->db->fetch_object($resql);
+
+			if ($obj->parent == '')				return 0;
+			elseif ($obj->parent == $idchild)	return 1;
+			else								$sameparent	= $this->get_parents($obj->parent, $idchild);
+			return $sameparent;
+		}	// if ($resql)
+		else	return -1;
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

From b5ac78d9a0532eac0961437adaf0ae05dc5a820f Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Wed, 19 May 2021 16:56:52 +0000
Subject: [PATCH 0157/1497] Fixing style errors.

---
 htdocs/societe/class/societe.class.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 3c7d642c23f..a1950bd5214 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -3120,8 +3120,7 @@ class Societe extends CommonObject
 				setEventMessages('la maison mère choisie est déjà filiale de ce tiers', null, 'warnings');
 				return -1;
 			}	// elseif ($sameparent == 1)
-			else
-			{
+			else {
 				$sql	= 'UPDATE '.MAIN_DB_PREFIX.'societe SET parent = '.($id > 0 ? $id : 'null').' WHERE rowid = '.$this->id;
 				dol_syslog(get_class($this).'::set_parent', LOG_DEBUG);
 				$resql	= $this->db->query($sql);
@@ -3130,7 +3129,7 @@ class Societe extends CommonObject
 					$this->parent	= $id;
 					return 1;
 				}	// if ($resql)
-				else	return -1;
+				else return -1;
 			}	// else	// elseif ($sameparent == 1)
 		}	// if ($this->id)
 		else return -1;
@@ -3157,10 +3156,10 @@ class Societe extends CommonObject
 
 			if ($obj->parent == '')				return 0;
 			elseif ($obj->parent == $idchild)	return 1;
-			else								$sameparent	= $this->get_parents($obj->parent, $idchild);
+			else $sameparent	= $this->get_parents($obj->parent, $idchild);
 			return $sameparent;
 		}	// if ($resql)
-		else	return -1;
+		else return -1;
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

From a3d1b49c6588da6fef07b4c6da55d5c654350123 Mon Sep 17 00:00:00 2001
From: Sylvain Legrand <sylvain.legrand@infras.fr>
Date: Wed, 19 May 2021 19:08:58 +0200
Subject: [PATCH 0158/1497] Error in list when using alias name of thirdparty

---
 htdocs/comm/propal/list.php    | 3 ++-
 htdocs/commande/list.php       | 3 ++-
 htdocs/compta/facture/list.php | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index fd6df13ae9e..f867f94a2d0 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -349,7 +349,7 @@ $help_url = 'EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos'
 
 $sql = 'SELECT';
 if ($sall || $search_product_category > 0 || $search_user > 0) $sql = 'SELECT DISTINCT';
-$sql .= ' s.rowid as socid, s.nom as name, s.email, s.town, s.zip, s.fk_pays, s.client, s.code_client, ';
+$sql .= ' s.rowid as socid, s.nom as name, s.name_alias, s.email, s.town, s.zip, s.fk_pays, s.client, s.code_client, ';	// InfraS change
 $sql .= " typent.code as typent_code,";
 $sql .= " ava.rowid as availability,";
 $sql .= " state.code_departement as state_code, state.nom as state_name,";
@@ -949,6 +949,7 @@ if ($resql)
 
 		$companystatic->id = $obj->socid;
 		$companystatic->name = $obj->name;
+		$companystatic->name_alias = $obj->name_alias;	// InfraS add
 		$companystatic->client = $obj->client;
 		$companystatic->code_client = $obj->code_client;
 		$companystatic->email = $obj->email;
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 9b3e865e459..1979d057f89 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -270,7 +270,7 @@ $help_url = "EN:Module_Customers_Orders|FR:Module_Commandes_Clients|ES:Módulo_P
 
 $sql = 'SELECT';
 if ($sall || $search_product_category > 0 || $search_user > 0) $sql = 'SELECT DISTINCT';
-$sql .= ' s.rowid as socid, s.nom as name, s.email, s.town, s.zip, s.fk_pays, s.client, s.code_client,';
+$sql .= ' s.rowid as socid, s.nom as name, s.name_alias, s.email, s.town, s.zip, s.fk_pays, s.client, s.code_client,';	// InfraS change
 $sql .= " typent.code as typent_code,";
 $sql .= " state.code_departement as state_code, state.nom as state_name,";
 $sql .= ' c.rowid, c.ref, c.total_ht, c.tva as total_tva, c.total_ttc, c.ref_client, c.fk_user_author,';
@@ -937,6 +937,7 @@ if ($resql)
 		$companystatic->id = $obj->socid;
 		$companystatic->code_client = $obj->code_client;
 		$companystatic->name = $obj->name;
+		$companystatic->name_alias = $obj->name_alias;	// InfraS add
 		$companystatic->client = $obj->client;
 		$companystatic->email = $obj->email;
 		if (!isset($getNomUrl_cache[$obj->socid])) {
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 6d4af64902d..57082ce5eee 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -422,7 +422,7 @@ $sql .= ' f.datef as df, f.date_valid, f.date_lim_reglement as datelimite, f.mod
 $sql .= ' f.paye as paye, f.fk_statut, f.close_code,';
 $sql .= ' f.datec as date_creation, f.tms as date_update, f.date_closing as date_closing,';
 $sql .= ' f.retained_warranty, f.retained_warranty_date_limit, f.situation_final, f.situation_cycle_ref, f.situation_counter,';
-$sql .= ' s.rowid as socid, s.nom as name, s.email, s.town, s.zip, s.fk_pays, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta as code_compta_client, s.code_compta_fournisseur,';
+$sql .= ' s.rowid as socid, s.nom as name, s.name_alias, s.email, s.town, s.zip, s.fk_pays, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta as code_compta_client, s.code_compta_fournisseur,';	// InfraS change
 $sql .= " typent.code as typent_code,";
 $sql .= " state.code_departement as state_code, state.nom as state_name,";
 $sql .= " country.code as country_code,";
@@ -1193,6 +1193,7 @@ if ($resql)
 			}
 			$thirdpartystatic->id = $obj->socid;
 			$thirdpartystatic->name = $obj->name;
+			$thirdpartystatic->name_alias = $obj->name_alias;	// InfraS add
 			$thirdpartystatic->client = $obj->client;
 			$thirdpartystatic->fournisseur = $obj->fournisseur;
 			$thirdpartystatic->code_client = $obj->code_client;

From 20c3ebeb5136b48991fb7e28fc5df803f11d7325 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 19 May 2021 19:46:46 +0200
Subject: [PATCH 0159/1497] Make SimplePOS deprecated

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

diff --git a/htdocs/core/modules/modCashDesk.class.php b/htdocs/core/modules/modCashDesk.class.php
index ba6c7ddce6c..a128b92ee29 100644
--- a/htdocs/core/modules/modCashDesk.class.php
+++ b/htdocs/core/modules/modCashDesk.class.php
@@ -51,7 +51,7 @@ class modCashDesk extends DolibarrModules
 		$this->name = preg_replace('/^mod/i', '', get_class($this));
 		$this->description = "CashDesk module";
 
-		$this->version = 'dolibarr';
+		$this->version = 'deprecated';
 
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
 		$this->picto = 'cash-register';

From 129d25a5877135b1fb6314133529e784ad8a7783 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 19 May 2021 19:55:13 +0200
Subject: [PATCH 0160/1497] Update doc

---
 ChangeLog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ChangeLog b/ChangeLog
index 52cc6035b68..ec201fa378e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -160,6 +160,7 @@ NEW: #13739 #17390 Product API route added to get product stock and product with
 WARNING:
 
 Following changes may create regressions for some external modules, but were necessary to make Dolibarr better:
+* Module SimplePOS is deprecated. If you need a POS module, please use the module TakePOS.
 * The ICS value for direct debit or credit transfer is now store on each bank account instead of into the global setup.
 * API /setup/shipment_methods has been replaced with API /setup/shipping_methods
 * Field "total" renamed into to "total_ht" for table llx_facture, llx_facture_rec for better field name consistency

From b214fcb5e09867fee36d1455fd97b79e6dafb79a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 19 May 2021 23:29:35 +0200
Subject: [PATCH 0161/1497] complete tooltip product

---
 htdocs/product/stock/card.php | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php
index b8698ff7ad3..6a61c60237b 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2005-2014	Regis Houssin			<regis.houssin@inodbox.com>
  * Copyright (C) 2016	    Francis Appels       	<francis.appels@yahoo.com>
  * Copyright (C) 2021		Noé Cendrier			<noe.cendrier@altairis.fr>
+ * Copyright (C) 2021		Frédéric France			<frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -612,6 +613,14 @@ if ($action == 'create') {
 			}
 
 			$sql = "SELECT p.rowid as rowid, p.ref, p.label as produit, p.tobatch, p.fk_product_type as type, p.price, p.price_ttc, p.entity,";
+			$sql .= "p.tosell, p.tobuy,";
+			$sql .= "p.accountancy_code_sell,";
+			$sql .= "p.accountancy_code_sell_intra,";
+			$sql .= "p.accountancy_code_sell_export,";
+			$sql .= "p.accountancy_code_buy,";
+			$sql .= "p.accountancy_code_buy_intra,";
+			$sql .= "p.accountancy_code_buy_export,";
+			$sql .= 'p.barcode,';
 			if ($separatedPMP) {
 				$sql .= " pa.pmp as ppmp,";
 			} else {
@@ -683,6 +692,15 @@ if ($action == 'create') {
 					$productstatic->entity = $objp->entity;
 					$productstatic->status_batch = $objp->tobatch;
 					$productstatic->fk_unit = $objp->fk_unit;
+					$productstatic->status = $objp->tosell;
+					$productstatic->status_buy = $objp->tobuy;
+					$productstatic->barcode = $objp->barcode;
+					$productstatic->accountancy_code_sell = $objp->accountancy_code_sell;
+					$productstatic->accountancy_code_sell_intra = $objp->accountancy_code_sell_intra;
+					$productstatic->accountancy_code_sell_export = $objp->accountancy_code_sell_export;
+					$productstatic->accountancy_code_buy = $objp->accountancy_code_buy;
+					$productstatic->accountancy_code_buy_intra = $objp->accountancy_code_buy_intra;
+					$productstatic->accountancy_code_buy_export = $objp->accountancy_code_buy_export;
 					print $productstatic->getNomUrl(1, 'stock', 16);
 					print '</td>';
 

From 0d8c75268e34bdee95d05aa5251eef28e562c600 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 19 May 2021 23:32:14 +0200
Subject: [PATCH 0162/1497] Update card.php

---
 htdocs/product/stock/card.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php
index 6a61c60237b..91284944397 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -786,6 +786,7 @@ if ($action == 'create') {
 				}
 				print '<td class="liste_total">&nbsp;</td>';
 				print '<td class="liste_total">&nbsp;</td>';
+				print '<td class="liste_total">&nbsp;</td>';
 				print '</tr>';
 			} else {
 				dol_print_error($db);

From c8b1eb180acc2cdca3d803f8557f9d1872253441 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 20 May 2021 08:50:15 +0200
Subject: [PATCH 0163/1497] doxygen

---
 htdocs/product/class/product.class.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 16c72297e10..202e85d7b89 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -14,7 +14,7 @@
  * Copyright (C) 2014		Ion agorria			    <ion@agorria.com>
  * Copyright (C) 2016-2018	Ferran Marcet			<fmarcet@2byte.es>
  * Copyright (C) 2017		Gustavo Novaro
- * Copyright (C) 2019-2020  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2019-2021  Frédéric France         <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -372,6 +372,9 @@ class Product extends CommonObject
 
 	public $oldcopy;
 
+	/**
+	 * @var int Default warehouse Id
+	 */
 	public $fk_default_warehouse;
 	/**
 	 * @var int ID
@@ -388,6 +391,10 @@ class Product extends CommonObject
 	 * @see        $ref_supplier
 	 */
 	public $ref_fourn;
+
+	/**
+	 * @var string ref supplier
+	 */
 	public $ref_supplier;
 
 	/**

From dbd7292cd6e85dd8e2bbf4555e5385a70ea8db98 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 20 May 2021 09:22:55 +0200
Subject: [PATCH 0164/1497] Replace doubleval into floatval

---
 htdocs/compta/facture/card.php                |  2 +-
 htdocs/core/class/cunits.class.php            |  6 ++---
 htdocs/core/lib/project.lib.php               | 24 +++++++++----------
 htdocs/index.php                              |  2 +-
 .../class/ProductCombination.class.php        | 12 +++++-----
 htdocs/webservices/server_payment.php         |  2 +-
 6 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 29d4f91952b..a088d94a01c 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -3556,7 +3556,7 @@ if ($action == 'create') {
 				if($( this ).prop("checked") && $.inArray($( this ).val(), '.json_encode($retainedWarrantyInvoiceAvailableType).' ) !== -1)
 				{
 					$(".retained-warranty-line").show();
-					$("#new-situation-invoice-retained-warranty").val("'.doubleval($retained_warranty_js_default).'");
+					$("#new-situation-invoice-retained-warranty").val("'.floatval($retained_warranty_js_default).'");
 				}
 				else{
 					$(".retained-warranty-line").hide();
diff --git a/htdocs/core/class/cunits.class.php b/htdocs/core/class/cunits.class.php
index ed3981d243d..364565af3aa 100644
--- a/htdocs/core/class/cunits.class.php
+++ b/htdocs/core/class/cunits.class.php
@@ -437,7 +437,7 @@ class CUnits // extends CommonObject
 	 */
 	public function unitConverter($value, $fk_unit, $fk_new_unit = 0)
 	{
-		$value = doubleval(price2num($value));
+		$value = floatval(price2num($value));
 		$fk_unit = intval($fk_unit);
 
 		// Calcul en unité de base
@@ -469,10 +469,10 @@ class CUnits // extends CommonObject
 		if ($unit) {
 			// TODO : if base exist in unit dictionary table remove this convertion exception and update convertion infos in database exemple time hour currently scale 3600 will become scale 2 base 60
 			if ($unit->unit_type == 'time') {
-				return doubleval($unit->scale);
+				return floatval($unit->scale);
 			}
 
-			return pow($base, doubleval($unit->scale));
+			return pow($base, floatval($unit->scale));
 		}
 
 		return 0;
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 0315e848e94..ffa06ebd508 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -2694,7 +2694,7 @@ function getTaskProgressView($task, $label = true, $progressNumber = true, $hide
 	// define progress color according to time spend vs workload
 	$progressBarClass = 'progress-bar-info';
 	if ($task->planned_workload) {
-		$progressCalculated = round(100 * doubleval($task->duration_effective) / doubleval($task->planned_workload), 2);
+		$progressCalculated = round(100 * floatval($task->duration_effective) / floatval($task->planned_workload), 2);
 
 		// this conf is actually hidden, by default we use 10% for "be carefull or warning"
 		$warningRatio = !empty($conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT) ? (1 + $conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT / 100) : 1.10;
@@ -2702,12 +2702,12 @@ function getTaskProgressView($task, $label = true, $progressNumber = true, $hide
 		$diffTitle = '<br>'.$langs->trans('ProgressDeclared').' : '.$task->progress.($task->progress ? '%' : '');
 		$diffTitle .= '<br>'.$langs->trans('ProgressCalculated').' : '.$progressCalculated.($progressCalculated ? '%' : '');
 
-		//var_dump($progressCalculated.' '.$warningRatio.' '.$task->progress.' '.doubleval($task->progress * $warningRatio));
-		if (doubleval($progressCalculated) > doubleval($task->progress * $warningRatio)) {
+		//var_dump($progressCalculated.' '.$warningRatio.' '.$task->progress.' '.floatval($task->progress * $warningRatio));
+		if (floatval($progressCalculated) > floatval($task->progress * $warningRatio)) {
 			$progressBarClass = 'progress-bar-danger';
 			$title = $langs->trans('TheReportedProgressIsLessThanTheCalculatedProgressionByX', abs($task->progress - $progressCalculated).' '.$langs->trans("point"));
 			$diff = '<span class="text-danger classfortooltip paddingrightonly" title="'.dol_htmlentities($title.$diffTitle).'" ><i class="fa fa-caret-down"></i> '.($task->progress - $progressCalculated).'%</span>';
-		} elseif (doubleval($progressCalculated) > doubleval($task->progress)) { // warning if close at 10%
+		} elseif (floatval($progressCalculated) > floatval($task->progress)) { // warning if close at 10%
 			$progressBarClass = 'progress-bar-warning';
 			$title = $langs->trans('TheReportedProgressIsLessThanTheCalculatedProgressionByX', abs($task->progress - $progressCalculated).' '.$langs->trans("point"));
 			$diff = '<span class="text-warning classfortooltip paddingrightonly" title="'.dol_htmlentities($title.$diffTitle).'" ><i class="fa fa-caret-left"></i> '.($task->progress - $progressCalculated).'%</span>';
@@ -2771,18 +2771,18 @@ function getTaskProgressView($task, $label = true, $progressNumber = true, $hide
 
 	$out .= '</span>';
 	$out .= '    <div class="progress sm '.$spaced.'">';
-	$diffval = doubleval($task->progress) - doubleval($progressCalculated);
+	$diffval = floatval($task->progress) - floatval($progressCalculated);
 	if ($diffval >= 0) {
 		// good
-		$out .= '        <div class="progress-bar '.$progressBarClass.'" style="width: '.doubleval($task->progress).'%" title="'.doubleval($task->progress).'%">';
+		$out .= '        <div class="progress-bar '.$progressBarClass.'" style="width: '.floatval($task->progress).'%" title="'.floatval($task->progress).'%">';
 		if (!empty($task->progress)) {
-			$out .= '        <div class="progress-bar progress-bar-consumed" style="width: '.doubleval($progressCalculated / $task->progress * 100).'%" title="'.doubleval($progressCalculated).'%"></div>';
+			$out .= '        <div class="progress-bar progress-bar-consumed" style="width: '.floatval($progressCalculated / $task->progress * 100).'%" title="'.floatval($progressCalculated).'%"></div>';
 		}
 		$out .= '        </div>';
 	} else {
 		// bad
-		$out .= '        <div class="progress-bar progress-bar-consumed" style="width: '.doubleval($progressCalculated).'%" title="'.doubleval($progressCalculated).'%">';
-		$out .= '        <div class="progress-bar '.$progressBarClass.'" style="width: '.($task->progress ? doubleval($task->progress / $progressCalculated * 100).'%' : '1px').'" title="'.doubleval($task->progress).'%"></div>';
+		$out .= '        <div class="progress-bar progress-bar-consumed" style="width: '.floatval($progressCalculated).'%" title="'.floatval($progressCalculated).'%">';
+		$out .= '        <div class="progress-bar '.$progressBarClass.'" style="width: '.($task->progress ? floatval($task->progress / $progressCalculated * 100).'%' : '1px').'" title="'.floatval($task->progress).'%"></div>';
 		$out .= '        </div>';
 	}
 	$out .= '    </div>';
@@ -2811,17 +2811,17 @@ function getTaskProgressBadge($task, $label = '', $tooltip = '')
 		// define color according to time spend vs workload
 		$badgeClass = 'badge ';
 		if ($task->planned_workload) {
-			$progressCalculated = round(100 * doubleval($task->duration_effective) / doubleval($task->planned_workload), 2);
+			$progressCalculated = round(100 * floatval($task->duration_effective) / floatval($task->planned_workload), 2);
 
 			// this conf is actually hidden, by default we use 10% for "be carefull or warning"
 			$warningRatio = !empty($conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT) ? (1 + $conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT / 100) : 1.10;
 
-			if (doubleval($progressCalculated) > doubleval($task->progress * $warningRatio)) {
+			if (floatval($progressCalculated) > floatval($task->progress * $warningRatio)) {
 				$badgeClass .= 'badge-danger';
 				if (empty($tooltip)) {
 					$tooltip = $task->progress.'% < '.$langs->trans("TimeConsumed").' '.$progressCalculated.'%';
 				}
-			} elseif (doubleval($progressCalculated) > doubleval($task->progress)) { // warning if close at 10%
+			} elseif (floatval($progressCalculated) > floatval($task->progress)) { // warning if close at 10%
 				$badgeClass .= 'badge-warning';
 				if (empty($tooltip)) {
 					$tooltip = $task->progress.'% < '.$langs->trans("TimeConsumed").' '.$progressCalculated.'%';
diff --git a/htdocs/index.php b/htdocs/index.php
index 5485f9bc7be..91b2de32087 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -472,7 +472,7 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
 						$classe = (!empty($classes[$keyIndex]) ? $classes[$keyIndex] : '');
 						if (isset($boardloaded[$classe]) && is_object($boardloaded[$classe])) {
 							$groupElement['globalStats']['total'] = $boardloaded[$classe]->nb[$globalStatsKey] ? $boardloaded[$classe]->nb[$globalStatsKey] : 0;
-							$nbTotal = doubleval($groupElement['globalStats']['total']);
+							$nbTotal = floatval($groupElement['globalStats']['total']);
 							if ($nbTotal >= 10000) {
 								$nbTotal = round($nbTotal / 1000, 2).'k';
 							}
diff --git a/htdocs/variants/class/ProductCombination.class.php b/htdocs/variants/class/ProductCombination.class.php
index 762d2eff124..29cfdf731f9 100644
--- a/htdocs/variants/class/ProductCombination.class.php
+++ b/htdocs/variants/class/ProductCombination.class.php
@@ -513,8 +513,8 @@ class ProductCombination
 					if ($parent->multiprices[$i] != '' || isset($this->combination_price_levels[$i]->variation_price)) {
 						$new_type = $parent->multiprices_base_type[$i];
 						$new_min_price = $parent->multiprices_min[$i];
-						$variation_price = doubleval(!isset($this->combination_price_levels[$i]->variation_price) ? $this->variation_price : $this->combination_price_levels[$i]->variation_price);
-						$variation_price_percentage = doubleval(!isset($this->combination_price_levels[$i]->variation_price_percentage) ? $this->variation_price_percentage : $this->combination_price_levels[$i]->variation_price_percentage);
+						$variation_price = floatval(!isset($this->combination_price_levels[$i]->variation_price) ? $this->variation_price : $this->combination_price_levels[$i]->variation_price);
+						$variation_price_percentage = floatval(!isset($this->combination_price_levels[$i]->variation_price_percentage) ? $this->variation_price_percentage : $this->combination_price_levels[$i]->variation_price_percentage);
 
 						if ($parent->prices_by_qty_list[$i]) {
 							$new_psq = 1;
@@ -1093,9 +1093,9 @@ class ProductCombinationLevel
 		}
 
 		$this->id = $obj->rowid;
-		$this->fk_product_attribute_combination = doubleval($obj->fk_product_attribute_combination);
+		$this->fk_product_attribute_combination = floatval($obj->fk_product_attribute_combination);
 		$this->fk_price_level = intval($obj->fk_price_level);
-		$this->variation_price = doubleval($obj->variation_price);
+		$this->variation_price = floatval($obj->variation_price);
 		$this->variation_price_percentage = (bool) $obj->variation_price_percentage;
 
 		return 1;
@@ -1129,7 +1129,7 @@ class ProductCombinationLevel
 		// Update
 		if (!empty($this->id)) {
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-			$sql .= ' SET variation_price = '.doubleval($this->variation_price).' , variation_price_percentage = '.intval($this->variation_price_percentage);
+			$sql .= ' SET variation_price = '.floatval($this->variation_price).' , variation_price_percentage = '.intval($this->variation_price_percentage);
 			$sql .= ' WHERE rowid = '.((int) $this->id);
 
 			$res = $this->db->query($sql);
@@ -1147,7 +1147,7 @@ class ProductCombinationLevel
 			$sql .= ") VALUES (";
 			$sql .= (int) $this->fk_product_attribute_combination;
 			$sql .= ", ".intval($this->fk_price_level);
-			$sql .= ", ".doubleval($this->variation_price);
+			$sql .= ", ".floatval($this->variation_price);
 			$sql .= ", ".intval($this->variation_price_percentage);
 			$sql .= ")";
 
diff --git a/htdocs/webservices/server_payment.php b/htdocs/webservices/server_payment.php
index 6bf43bf78f6..621a4a7a286 100644
--- a/htdocs/webservices/server_payment.php
+++ b/htdocs/webservices/server_payment.php
@@ -169,7 +169,7 @@ function createPayment($authentication, $payment)
 		$soc->fetch($payment['thirdparty_id']);
 
 		$new_payment              = new Paiement($db);
-		$new_payment->amount      = doubleval($payment['amount']);
+		$new_payment->amount      = floatval($payment['amount']);
 		$new_payment->num_payment = $payment['num_payment'];
 		$new_payment->fk_account  = intval($payment['bank_account']);
 		$new_payment->paiementid  = !empty($payment['payment_mode_id']) ? intval($payment['payment_mode_id']) : $soc->mode_reglement_id;

From 1a8b10328f980fad9876ac1a41e52e6eb1b7c85a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 20 May 2021 10:07:50 +0200
Subject: [PATCH 0165/1497] Fix title of rss file

---
 htdocs/website/samples/wrapper.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/website/samples/wrapper.php b/htdocs/website/samples/wrapper.php
index b847f607bf3..4802755608f 100644
--- a/htdocs/website/samples/wrapper.php
+++ b/htdocs/website/samples/wrapper.php
@@ -149,8 +149,10 @@ if ($rss) {
 	}
 
 	if ($buildfile) {
-		$langs->load("other");
-		$title = $desc = $langs->transnoentities('LatestBlogPosts');
+		$outputlangs = new Translate('', $conf);
+		$outputlangs->setDefaultLang($l);
+		$outputlangs->loadLangs(array("main", "other"));
+		$title = $desc = $outputlangs->transnoentities('LatestBlogPosts');
 
 		// Create temp file
 		$outputfiletmp = tempnam($dir_temp, 'tmp'); // Temporary file (allow call of function by different threads

From a3c28edfbb7ba240705a38c3d7568fbcb0cd5fab Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 20 May 2021 10:34:49 +0200
Subject: [PATCH 0166/1497] Fix regenerate wrapper when rebuilding cache

---
 htdocs/core/lib/website2.lib.php       |  4 ++--
 htdocs/website/class/website.class.php | 15 +++++++++++----
 htdocs/website/index.php               |  4 ++--
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/lib/website2.lib.php b/htdocs/core/lib/website2.lib.php
index 8824d9cc06d..721b908b9d1 100644
--- a/htdocs/core/lib/website2.lib.php
+++ b/htdocs/core/lib/website2.lib.php
@@ -283,11 +283,11 @@ function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage,
 
 
 /**
- * Save content of the index.php and/or wrapper.php page
+ * Save content of the index.php and/or the wrapper.php page
  *
  * @param	string		$pathofwebsite			Path of website root
  * @param	string		$fileindex				Full path of file index.php
- * @param	string		$filetpl				File tpl the index.php page redirect to
+ * @param	string		$filetpl				File tpl the index.php page redirect to (used only if $fileindex is provided)
  * @param	string		$filewrapper			Full path of file wrapper.php
  * @return	boolean								True if OK
  */
diff --git a/htdocs/website/class/website.class.php b/htdocs/website/class/website.class.php
index ef50a1701d7..7e70bfddc6d 100644
--- a/htdocs/website/class/website.class.php
+++ b/htdocs/website/class/website.class.php
@@ -636,7 +636,7 @@ class Website extends CommonObject
 	}
 
 	/**
-	 * Load an object from its id and create a new one in database.
+	 * Load a website its id and create a new one in database.
 	 * This copy website directories, regenerate all the pages + alias pages and recreate the medias link.
 	 *
 	 * @param	User	$user		User making the clone
@@ -777,8 +777,8 @@ class Website extends CommonObject
 				$filetpl = $pathofwebsitenew.'/page'.$newidforhome.'.tpl.php';
 				$filewrapper = $pathofwebsitenew.'/wrapper.php';
 
-				// Generate the index.php page to be the home page
-				//-------------------------------------------------
+				// Re-generates the index.php page to be the home page, and re-generates the wrapper.php
+				//--------------------------------------------------------------------------------------
 				$result = dolSaveIndexPage($pathofwebsitenew, $fileindex, $filetpl, $filewrapper);
 			}
 		}
@@ -1278,7 +1278,7 @@ class Website extends CommonObject
 	}
 
 	/**
-	 * Rebuild all files of a containers of a website. TODO Add other files too.
+	 * Rebuild all files of a containers of a website. Rebuild also the wrapper.php file. TODO Add other files too.
 	 * Note: Files are already regenerated during importWebSite so this function is useless when importing a website.
 	 *
 	 * @return 	int						<0 if KO, >=0 if OK
@@ -1347,6 +1347,13 @@ class Website extends CommonObject
 			$i++;
 		}
 
+		if (!$error) {
+			// Save wrapper.php
+			$pathofwebsite = $conf->website->dir_output.'/'.$object->ref;
+			$filewrapper = $pathofwebsite.'/wrapper.php';
+			dolSaveIndexPage($pathofwebsite, '', '', $filewrapper);
+		}
+
 		if ($error) {
 			return -1;
 		} else {
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 69ff8127e6c..ef5660ce8fa 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -1083,7 +1083,7 @@ if ($action == 'addcontainer' && $usercanedit) {
 			} else {
 				$filetpl = $pathofwebsite.'/page'.$pageid.'.tpl.php';
 
-				// Generate the index.php page (to be the home page) and wrapper.php file
+				// Generate the index.php page (to be the home page) and the wrapper.php file
 				$result = dolSaveIndexPage($pathofwebsite, $fileindex, $filetpl, $filewrapper);
 
 				if ($result <= 0) {
@@ -1315,7 +1315,7 @@ if (!GETPOSTISSET('pageid')) {
 	}
 }
 
-// Update css Update site properties
+// Update css site properties. Re-generates also the wrapper.
 if ($action == 'updatecss' && $usercanedit) {
 	// If we tried to reload another site/page, we stay on editcss mode.
 	if (GETPOST('refreshsite') || GETPOST('refreshsite_x') || GETPOST('refreshsite.x') || GETPOST('refreshpage') || GETPOST('refreshpage_x') || GETPOST('refreshpage.x')) {

From 1e6f3d0624a7220eeb77b3ee9d74efd4a447ca05 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Thu, 20 May 2021 12:30:02 +0200
Subject: [PATCH 0167/1497] add inventory link into mvt stock list

---
 htdocs/product/stock/class/mouvementstock.class.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php
index 287cc26596c..4877bb861ab 100644
--- a/htdocs/product/stock/class/mouvementstock.class.php
+++ b/htdocs/product/stock/class/mouvementstock.class.php
@@ -962,6 +962,10 @@ class MouvementStock extends CommonObject
 				require_once DOL_DOCUMENT_ROOT.'/reception/class/reception.class.php';
 				$origin = new Reception($this->db);
 				break;
+			case 'inventory':
+				require_once DOL_DOCUMENT_ROOT.'/product/inventory/class/inventory.class.php';
+				$origin = new Inventory($this->db);
+				break;
 
 			default:
 				if ($origintype) {

From d93cf0beb749ca764d10d7e9aecceea648f723f7 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Thu, 20 May 2021 12:36:26 +0200
Subject: [PATCH 0168/1497] fix: change societe by company varaible name in all
 file

---
 htdocs/compta/facture/list.php | 36 +++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 282aad95d89..e3d8f52265a 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -85,8 +85,8 @@ $search_refcustomer = GETPOST('search_refcustomer', 'alpha');
 $search_type = GETPOST('search_type', 'int');
 $search_project_ref = GETPOST('search_project_ref', 'alpha');
 $search_project = GETPOST('search_project', 'alpha');
-$search_societe = GETPOST('search_societe', 'alpha');
-$search_societe_alias = GETPOST('search_societe_alias', 'alpha');
+$search_company = GETPOST('search_company', 'alpha');
+$search_company_alias = GETPOST('search_company_alias', 'alpha');
 $search_montant_ht = GETPOST('search_montant_ht', 'alpha');
 $search_montant_vat = GETPOST('search_montant_vat', 'alpha');
 $search_montant_localtax1 = GETPOST('search_montant_localtax1', 'alpha');
@@ -304,8 +304,8 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter',
 	$search_type = '';
 	$search_project_ref = '';
 	$search_project = '';
-	$search_societe = '';
-	$search_societe_alias = '';
+	$search_company = '';
+	$search_company_alias = '';
 	$search_montant_ht = '';
 	$search_montant_vat = '';
 	$search_montant_localtax1 = '';
@@ -363,7 +363,7 @@ if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
 
-if ($massaction == 'makepayment') {
+if ($massaction == 'makepayment_confirm') {
 	$arrayofselected = is_array($toselect) ? $toselect : array();
 
 	$loc = dol_buildpath('/compta/paiement.php', 2).'?action=create&facids='.implode(',', $arrayofselected);
@@ -574,11 +574,11 @@ if ($search_project_ref) {
 if ($search_project) {
 	$sql .= natural_search('p.title', $search_project);
 }
-if ($search_societe) {
-	$sql .= natural_search('s.nom', $search_societe);
+if ($search_company) {
+	$sql .= natural_search('s.nom', $search_company);
 }
-if ($search_societe_alias) {
-	$sql .= natural_search('s.name_alias', $search_societe_alias);
+if ($search_company_alias) {
+	$sql .= natural_search('s.name_alias', $search_company_alias);
 }
 if ($search_town) {
 	$sql .= natural_search('s.town', $search_town);
@@ -782,8 +782,8 @@ if ($resql) {
 	if ($socid) {
 		$soc = new Societe($db);
 		$soc->fetch($socid);
-		if (empty($search_societe)) {
-			$search_societe = $soc->name;
+		if (empty($search_company)) {
+			$search_company = $soc->name;
 		}
 	}
 
@@ -854,11 +854,11 @@ if ($resql) {
 	if ($search_type != '') {
 		$param .= '&search_type='.urlencode($search_type);
 	}
-	if ($search_societe) {
-		$param .= '&search_societe='.urlencode($search_societe);
+	if ($search_company) {
+		$param .= '&search_societe='.urlencode($search_company);
 	}
-	if ($search_societe_alias) {
-		$param .= '&search_societe_alias='.urlencode($search_societe_alias);
+	if ($search_company_alias) {
+		$param .= '&search_societe_alias='.urlencode($search_company_alias);
 	}
 	if ($search_town) {
 		$param .= '&search_town='.urlencode($search_town);
@@ -948,7 +948,7 @@ if ($resql) {
 		'generate_doc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("ReGeneratePDF"),
 		'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
 		'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
-		//'makepayment'=>$langs->trans("InvoicePaymentsLimits"),   TODO Blank page when using this
+		'makepayment'=>$langs->trans("InvoicePaymentsLimits"),
 	);
 	if ($conf->prelevement->enabled && !empty($user->rights->prelevement->bons->creer)) {
 			$langs->load("withdrawals");
@@ -1142,11 +1142,11 @@ if ($resql) {
 	}
 	// Thirdparty
 	if (!empty($arrayfields['s.nom']['checked'])) {
-		print '<td class="liste_titre"><input class="flat maxwidth75imp" type="text" name="search_societe" value="'.$search_societe.'"></td>';
+		print '<td class="liste_titre"><input class="flat maxwidth75imp" type="text" name="search_company" value="'.$search_company.'"></td>';
 	}
 	// Alias
 	if (!empty($arrayfields['s.name_alias']['checked'])) {
-		print '<td class="liste_titre"><input class="flat maxwidth75imp" type="text" name="search_societe_alias" value="'.$search_societe_alias.'"></td>';
+		print '<td class="liste_titre"><input class="flat maxwidth75imp" type="text" name="search_company_alias" value="'.$search_company_alias.'"></td>';
 	}
 	// Town
 	if (!empty($arrayfields['s.town']['checked'])) {

From 7874be6e37f9e47a7cebd17ae105e8d135357d13 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Thu, 20 May 2021 12:48:18 +0200
Subject: [PATCH 0169/1497] bad comment remove

---
 htdocs/compta/facture/list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index e3d8f52265a..fff12c96151 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -948,7 +948,7 @@ if ($resql) {
 		'generate_doc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("ReGeneratePDF"),
 		'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
 		'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
-		'makepayment'=>$langs->trans("InvoicePaymentsLimits"),
+		//'makepayment'=>$langs->trans("InvoicePaymentsLimits"),
 	);
 	if ($conf->prelevement->enabled && !empty($user->rights->prelevement->bons->creer)) {
 			$langs->load("withdrawals");

From d83dbd19228e749881aaabcac712d7fac9ad6ad4 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Thu, 20 May 2021 13:24:30 +0200
Subject: [PATCH 0170/1497] fix: on mass action confirm box tag filter must not
 make LEFT JOIN

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

diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index f79857d744f..0a3e9207a96 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -467,10 +467,10 @@ if ($search_sale && $search_sale != '-1') {
 	$sql .= ", sc.fk_soc, sc.fk_user";
 }
 // We'll need these fields in order to filter by categ
-if ($search_categ_cus) {
+if ($search_categ_cus && $search_categ_cus!=-1) {
 	$sql .= ", cc.fk_categorie, cc.fk_soc";
 }
-if ($search_categ_sup) {
+if ($search_categ_sup && $search_categ_sup!=-1) {
 	$sql .= ", cs.fk_categorie, cs.fk_soc";
 }
 // Add fields from extrafields
@@ -494,10 +494,10 @@ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_effectif as staff on (staff.id = s.fk_ef
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid = s.fk_departement)";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_regions as region on (region.	code_region = state.fk_region)";
 // We'll need this table joined to the select in order to filter by categ
-if (!empty($search_categ_cus)) {
+if (!empty($search_categ_cus) && $search_categ_cus!=-1) {
 	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_societe as cc ON s.rowid = cc.fk_soc"; // We'll need this table joined to the select in order to filter by categ
 }
-if (!empty($search_categ_sup)) {
+if (!empty($search_categ_sup) && $search_categ_sup!=-1) {
 	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_fournisseur as cs ON s.rowid = cs.fk_soc"; // We'll need this table joined to the select in order to filter by categ
 }
 $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."c_stcomm as st ON s.fk_stcomm = st.id";

From 5e6d6ccf67b6a187fce1de3d3839de553dc0500f Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Thu, 20 May 2021 13:45:52 +0200
Subject: [PATCH 0171/1497] same bug on invoie list

---
 htdocs/compta/facture/list.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 282aad95d89..0beedbf70a9 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -492,7 +492,7 @@ $sql .= ' u.login, u.lastname, u.firstname, u.email, u.statut, u.entity, u.photo
 if (!$sall) {
 	$sql .= ', SUM(pf.amount) as dynamount_payed, SUM(pf.multicurrency_amount) as multicurrency_dynamount_payed';
 }
-if ($search_categ_cus) {
+if ($search_categ_cus && $search_categ_cus!=-1) {
 	$sql .= ", cc.fk_categorie, cc.fk_soc";
 }
 // Add fields from extrafields
@@ -509,7 +509,7 @@ $sql .= ' FROM '.MAIN_DB_PREFIX.'societe as s';
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as country on (country.rowid = s.fk_pays)";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_typent as typent on (typent.id = s.fk_typent)";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid = s.fk_departement)";
-if (!empty($search_categ_cus)) {
+if (!empty($search_categ_cus) && $search_categ_cus!=-1) {
 	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_societe as cc ON s.rowid = cc.fk_soc"; // We'll need this table joined to the select in order to filter by categ
 }
 
@@ -720,7 +720,7 @@ if (!$sall) {
 	$sql .= ' country.code,';
 	$sql .= " p.rowid, p.ref, p.title,";
 	$sql .= " u.login, u.lastname, u.firstname, u.email, u.statut, u.entity, u.photo, u.office_phone, u.office_fax, u.user_mobile, u.job, u.gender";
-	if ($search_categ_cus) {
+	if ($search_categ_cus && $search_categ_cus!=-1) {
 		$sql .= ", cc.fk_categorie, cc.fk_soc";
 	}
 	// Add fields from extrafields

From 2fabb986c8fb22b93eae0ed0ee36d9f5684ae5b8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 20 May 2021 14:16:31 +0200
Subject: [PATCH 0172/1497] Update doc

---
 dev/dolibarr_changes.txt | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/dev/dolibarr_changes.txt b/dev/dolibarr_changes.txt
index 9ea62de9048..4f80f06d444 100644
--- a/dev/dolibarr_changes.txt
+++ b/dev/dolibarr_changes.txt
@@ -245,6 +245,14 @@ RESTLER:
     	// @CHANGE LDR
         if (!is_string($haystack)) return false;
 
+* Replace  
+
+	$loaders = array_unique(static::$rogueLoaders);
+	
+	with 
+	
+	$loaders = array_unique(static::$rogueLoaders, SORT_REGULAR);
+
 
 +With swagger 2 provided into /explorer:
 ----------------------------------------

From 2604b8f9b5d40c229408ec3beb2afd3ac4c94c52 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 20 May 2021 14:18:00 +0200
Subject: [PATCH 0173/1497] Update list.php

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

diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index 596670e6ce2..6e78a1a7903 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -68,7 +68,7 @@ $pagenext = $page + 1;
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $object = new User($db);
 $extrafields = new ExtraFields($db);
-$diroutputmassaction = empty($conf->mymodule->dir_output) ? '' : $conf->mymodule->dir_output.'/temp/massgeneration/'.$user->id;
+$diroutputmassaction = $conf->user->dir_output.'/temp/massgeneration/'.$user->id;
 $hookmanager->initHooks(array('userlist'));
 
 // Fetch optionals attributes and labels

From eec1fefaa5eec08190b5db59011a8079638054b9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 20 May 2021 14:25:54 +0200
Subject: [PATCH 0174/1497] Update list.php

---
 htdocs/user/list.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index 6e78a1a7903..b6e5cba5652 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -571,7 +571,7 @@ print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
 $url = DOL_URL_ROOT.'/user/card.php?action=create'.($mode == 'employee' ? '&employee=1' : '').'&leftmenu=';
 if (!empty($socid)) {
-	$url .= '&socid='.$socid;
+	$url .= '&socid='.urlencode($socid);
 }
 
 $newcardbutton = dolGetButtonTitle($langs->trans('NewUser'), '', 'fa fa-plus-circle', $url, '', $permissiontoadd);
@@ -942,9 +942,8 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 			$totalarray['nbfield']++;
 		}
 	}
-	if (empty($obj->socid)) $obj->socid = 0;
 	if (!empty($arrayfields['u.email']['checked'])) {
-		print '<td class="tdoverflowmax150">'.dol_print_email($obj->email, $obj->rowid, $obj->socid, 'AC_EMAIL', 0, 0, 1)."</td>\n";
+		print '<td class="tdoverflowmax150">'.dol_print_email($obj->email, $obj->rowid, $obj->fk_soc, 'AC_EMAIL', 0, 0, 1)."</td>\n";
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}

From 30ab0b05b7879b2c1a727a12abbc2c6f3b95cea9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 20 May 2021 14:28:43 +0200
Subject: [PATCH 0175/1497] Update list.php

---
 htdocs/user/list.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index b6e5cba5652..ed1d2ae3dea 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -829,12 +829,14 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 		break; // Should not happen
 	}
 
+	if (empty($obj->country_code)) $obj->country_code = '';		// TODO Add join in select with country table to get country_code
+
 	// Store properties in $object
 	$object->setVarsFromFetchObj($obj);
 
 	$userstatic->id = $obj->rowid;
 	$userstatic->admin = $obj->admin;
-	$userstatic->ref = empty($obj->label) ? '' : $obj->label;
+	$userstatic->ref = $obj->rowid;
 	$userstatic->login = $obj->login;
 	$userstatic->statut = $obj->statut;
 	$userstatic->office_phone = $obj->office_phone;
@@ -929,7 +931,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 			$totalarray['nbfield']++;
 		}
 	}
-	if (empty($obj->country_code)) $obj->country_code = '';
+	
 	if (!empty($arrayfields['u.office_phone']['checked'])) {
 		print "<td>".dol_print_phone($obj->office_phone, $obj->country_code, 0, $obj->rowid, 'AC_TEL', ' ', 'phone')."</td>\n";
 		if (!$i) {

From 890d0f8040e648d6ff4542b6580efdaccc155869 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 20 May 2021 14:38:24 +0200
Subject: [PATCH 0176/1497] Update societe.class.php

---
 htdocs/societe/class/societe.class.php | 46 ++++++++++++++------------
 1 file changed, 25 insertions(+), 21 deletions(-)

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index a1950bd5214..39524d18e63 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -3113,26 +3113,26 @@ class Societe extends CommonObject
 		// phpcs:enable
 		if ($this->id) {
 			// InfraS change (to avoid infinite loop)
-			$sameparent				= $this->get_parents($id, $this->id);
-			if ($sameparent < 0)	return -1;
-			elseif ($sameparent == 1)
-			{
-				setEventMessages('la maison mère choisie est déjà filiale de ce tiers', null, 'warnings');
+			$sameparent	= $this->get_parents($id, $this->id);
+			if ($sameparent < 0) {
 				return -1;
-			}	// elseif ($sameparent == 1)
-			else {
+			} elseif ($sameparent == 1) {
+				setEventMessages('ParentCompanyIsAlreadyAChild', null, 'warnings');
+				return -1;
+			} else {
 				$sql	= 'UPDATE '.MAIN_DB_PREFIX.'societe SET parent = '.($id > 0 ? $id : 'null').' WHERE rowid = '.$this->id;
 				dol_syslog(get_class($this).'::set_parent', LOG_DEBUG);
 				$resql	= $this->db->query($sql);
-				if ($resql)
-				{
+				if ($resql) {
 					$this->parent	= $id;
 					return 1;
-				}	// if ($resql)
-				else return -1;
-			}	// else	// elseif ($sameparent == 1)
-		}	// if ($this->id)
-		else return -1;
+				} else {
+					return -1;
+				}
+			}
+		} else {
+			return -1;
+		}
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -3150,16 +3150,20 @@ class Societe extends CommonObject
 		$sql	.= ' FROM '.MAIN_DB_PREFIX.'societe as s';
 		$sql	.= ' WHERE rowid = '.$idparent;
 		$resql	= $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj	= $this->db->fetch_object($resql);
 
-			if ($obj->parent == '')				return 0;
-			elseif ($obj->parent == $idchild)	return 1;
-			else $sameparent	= $this->get_parents($obj->parent, $idchild);
+			if ($obj->parent == '')	{
+				return 0;
+			} elseif ($obj->parent == $idchild)	{
+				return 1;
+			} else {
+				$sameparent	= $this->get_parents($obj->parent, $idchild);
+			}
 			return $sameparent;
-		}	// if ($resql)
-		else return -1;
+		} else {
+			return -1;
+		}
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

From b64c3073586199e378d4ada177c92aae8dfaf58e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 20 May 2021 14:50:02 +0200
Subject: [PATCH 0177/1497] Update societe.class.php

---
 htdocs/societe/class/societe.class.php | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 39524d18e63..d7aa01e20cc 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -3113,7 +3113,7 @@ class Societe extends CommonObject
 		// phpcs:enable
 		if ($this->id) {
 			// InfraS change (to avoid infinite loop)
-			$sameparent	= $this->get_parents($id, $this->id);
+			$sameparent	= $this->validateFamilyTree($id, $this->id, 0);
 			if ($sameparent < 0) {
 				return -1;
 			} elseif ($sameparent == 1) {
@@ -3135,17 +3135,20 @@ class Societe extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *    Search parent commany of current company
+	 *    Check if a thirdparty $idchild is or not inside the parents (or grand parents) of another thirdparty id $idparent.
 	 *
 	 *    @param	int		$idparent	Id of thirdparty to check
 	 *    @param	int		$idchild	Id of thirdparty to compare to
-	 *    @return	int     		<0 if KO, 0 if OK or 1 if at some level a parent company was the child to compare to
+	 *    @param    int     $counter    Counter to protect against infinite loops
+	 *    @return	int     			<0 if KO, 0 if OK or 1 if at some level a parent company was the child to compare to
 	 */
-    public function get_parents($idparent, $idchild)
+    public function validateFamilyTree($idparent, $idchild, $counter = 0)
 	{
-        // phpcs:enable
+		if ($counter > 100) {
+			dol_syslog("Too high level of parent - child for company. May be an infinite loop ?", LOG_WARNING);
+		}
+		
 		$sql	= 'SELECT s.parent';
 		$sql	.= ' FROM '.MAIN_DB_PREFIX.'societe as s';
 		$sql	.= ' WHERE rowid = '.$idparent;
@@ -3158,7 +3161,7 @@ class Societe extends CommonObject
 			} elseif ($obj->parent == $idchild)	{
 				return 1;
 			} else {
-				$sameparent	= $this->get_parents($obj->parent, $idchild);
+				$sameparent	= $this->validateFamilyTree($obj->parent, $idchild, ($counter + 1));
 			}
 			return $sameparent;
 		} else {

From 94ca682cbf2c1473c1197f8cfb2280f3bacdc8d3 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Thu, 20 May 2021 12:51:53 +0000
Subject: [PATCH 0178/1497] Fixing style errors.

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

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index d7aa01e20cc..0310b9da79c 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -3148,7 +3148,7 @@ class Societe extends CommonObject
 		if ($counter > 100) {
 			dol_syslog("Too high level of parent - child for company. May be an infinite loop ?", LOG_WARNING);
 		}
-		
+
 		$sql	= 'SELECT s.parent';
 		$sql	.= ' FROM '.MAIN_DB_PREFIX.'societe as s';
 		$sql	.= ' WHERE rowid = '.$idparent;

From 28487fac12585640eae947b3378059993a89e740 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 20 May 2021 14:53:50 +0200
Subject: [PATCH 0179/1497] Create societe.class.php

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

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 0310b9da79c..e85f3a6c5ee 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -3112,15 +3112,15 @@ class Societe extends CommonObject
 	{
 		// phpcs:enable
 		if ($this->id) {
-			// InfraS change (to avoid infinite loop)
+			// Check if the id we want to add as parent has not already one parent that is the current id we try to update
 			$sameparent	= $this->validateFamilyTree($id, $this->id, 0);
 			if ($sameparent < 0) {
 				return -1;
 			} elseif ($sameparent == 1) {
-				setEventMessages('ParentCompanyIsAlreadyAChild', null, 'warnings');
+				setEventMessages('ParentCompanyToAddIsAlreadyAChildOfModifiedCompany', null, 'warnings');
 				return -1;
 			} else {
-				$sql	= 'UPDATE '.MAIN_DB_PREFIX.'societe SET parent = '.($id > 0 ? $id : 'null').' WHERE rowid = '.$this->id;
+				$sql = 'UPDATE '.MAIN_DB_PREFIX.'societe SET parent = '.($id > 0 ? $id : 'null').' WHERE rowid = '.((int) $this->id);
 				dol_syslog(get_class($this).'::set_parent', LOG_DEBUG);
 				$resql	= $this->db->query($sql);
 				if ($resql) {
@@ -3148,7 +3148,7 @@ class Societe extends CommonObject
 		if ($counter > 100) {
 			dol_syslog("Too high level of parent - child for company. May be an infinite loop ?", LOG_WARNING);
 		}
-
+		
 		$sql	= 'SELECT s.parent';
 		$sql	.= ' FROM '.MAIN_DB_PREFIX.'societe as s';
 		$sql	.= ' WHERE rowid = '.$idparent;

From 91f85abb7e0a25be2d447c33246a4baa9d4707ba Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 20 May 2021 14:55:37 +0200
Subject: [PATCH 0180/1497] Fix only comment to understand code are allowed

---
 htdocs/comm/propal/list.php    | 4 ++--
 htdocs/commande/list.php       | 4 ++--
 htdocs/compta/facture/list.php | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index f867f94a2d0..fcd8f067e01 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -349,7 +349,7 @@ $help_url = 'EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos'
 
 $sql = 'SELECT';
 if ($sall || $search_product_category > 0 || $search_user > 0) $sql = 'SELECT DISTINCT';
-$sql .= ' s.rowid as socid, s.nom as name, s.name_alias, s.email, s.town, s.zip, s.fk_pays, s.client, s.code_client, ';	// InfraS change
+$sql .= ' s.rowid as socid, s.nom as name, s.name_alias, s.email, s.town, s.zip, s.fk_pays, s.client, s.code_client, ';
 $sql .= " typent.code as typent_code,";
 $sql .= " ava.rowid as availability,";
 $sql .= " state.code_departement as state_code, state.nom as state_name,";
@@ -949,7 +949,7 @@ if ($resql)
 
 		$companystatic->id = $obj->socid;
 		$companystatic->name = $obj->name;
-		$companystatic->name_alias = $obj->name_alias;	// InfraS add
+		$companystatic->name_alias = $obj->name_alias;
 		$companystatic->client = $obj->client;
 		$companystatic->code_client = $obj->code_client;
 		$companystatic->email = $obj->email;
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 1979d057f89..987f975a47d 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -270,7 +270,7 @@ $help_url = "EN:Module_Customers_Orders|FR:Module_Commandes_Clients|ES:Módulo_P
 
 $sql = 'SELECT';
 if ($sall || $search_product_category > 0 || $search_user > 0) $sql = 'SELECT DISTINCT';
-$sql .= ' s.rowid as socid, s.nom as name, s.name_alias, s.email, s.town, s.zip, s.fk_pays, s.client, s.code_client,';	// InfraS change
+$sql .= ' s.rowid as socid, s.nom as name, s.name_alias, s.email, s.town, s.zip, s.fk_pays, s.client, s.code_client,';
 $sql .= " typent.code as typent_code,";
 $sql .= " state.code_departement as state_code, state.nom as state_name,";
 $sql .= ' c.rowid, c.ref, c.total_ht, c.tva as total_tva, c.total_ttc, c.ref_client, c.fk_user_author,';
@@ -937,7 +937,7 @@ if ($resql)
 		$companystatic->id = $obj->socid;
 		$companystatic->code_client = $obj->code_client;
 		$companystatic->name = $obj->name;
-		$companystatic->name_alias = $obj->name_alias;	// InfraS add
+		$companystatic->name_alias = $obj->name_alias;
 		$companystatic->client = $obj->client;
 		$companystatic->email = $obj->email;
 		if (!isset($getNomUrl_cache[$obj->socid])) {
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 57082ce5eee..56404aed78b 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -422,7 +422,7 @@ $sql .= ' f.datef as df, f.date_valid, f.date_lim_reglement as datelimite, f.mod
 $sql .= ' f.paye as paye, f.fk_statut, f.close_code,';
 $sql .= ' f.datec as date_creation, f.tms as date_update, f.date_closing as date_closing,';
 $sql .= ' f.retained_warranty, f.retained_warranty_date_limit, f.situation_final, f.situation_cycle_ref, f.situation_counter,';
-$sql .= ' s.rowid as socid, s.nom as name, s.name_alias, s.email, s.town, s.zip, s.fk_pays, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta as code_compta_client, s.code_compta_fournisseur,';	// InfraS change
+$sql .= ' s.rowid as socid, s.nom as name, s.name_alias, s.email, s.town, s.zip, s.fk_pays, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta as code_compta_client, s.code_compta_fournisseur,';
 $sql .= " typent.code as typent_code,";
 $sql .= " state.code_departement as state_code, state.nom as state_name,";
 $sql .= " country.code as country_code,";
@@ -1193,7 +1193,7 @@ if ($resql)
 			}
 			$thirdpartystatic->id = $obj->socid;
 			$thirdpartystatic->name = $obj->name;
-			$thirdpartystatic->name_alias = $obj->name_alias;	// InfraS add
+			$thirdpartystatic->name_alias = $obj->name_alias;
 			$thirdpartystatic->client = $obj->client;
 			$thirdpartystatic->fournisseur = $obj->fournisseur;
 			$thirdpartystatic->code_client = $obj->code_client;

From 93501a11477646808e917bf78f4faa1a0d681c7e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 20 May 2021 15:25:56 +0200
Subject: [PATCH 0181/1497] Fix phpcs

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

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index e85f3a6c5ee..591809389d4 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -3148,7 +3148,7 @@ class Societe extends CommonObject
 		if ($counter > 100) {
 			dol_syslog("Too high level of parent - child for company. May be an infinite loop ?", LOG_WARNING);
 		}
-		
+
 		$sql	= 'SELECT s.parent';
 		$sql	.= ' FROM '.MAIN_DB_PREFIX.'societe as s';
 		$sql	.= ' WHERE rowid = '.$idparent;

From 625aab34d648ea2dc54d9fd6da82fa9340c8bd70 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 20 May 2021 15:30:33 +0200
Subject: [PATCH 0182/1497] Fix phpcs

---
 htdocs/product/class/product.class.php | 2 +-
 htdocs/societe/class/societe.class.php | 2 +-
 htdocs/user/list.php                   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 5130db9cd2f..511331e6008 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -1645,7 +1645,7 @@ class Product extends CommonObject
 
 		$testExit = array('multiprices','multiprices_ttc','multiprices_base_type','multiprices_min','multiprices_min_ttc','multiprices_tva_tx','multiprices_recuperableonly');
 
-		foreach ($testExit as $field){
+		foreach ($testExit as $field) {
 			if (!isset($this->$field[$level])) {
 				return array();
 			}
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 6def79ac36d..8a8dea9f7e3 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -3363,7 +3363,7 @@ class Societe extends CommonObject
 	 *    @param    int     $counter    Counter to protect against infinite loops
 	 *    @return	int     			<0 if KO, 0 if OK or 1 if at some level a parent company was the child to compare to
 	 */
-    public function validateFamilyTree($idparent, $idchild, $counter = 0)
+	public function validateFamilyTree($idparent, $idchild, $counter = 0)
 	{
 		if ($counter > 100) {
 			dol_syslog("Too high level of parent - child for company. May be an infinite loop ?", LOG_WARNING);
diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index ed1d2ae3dea..d5df7ced259 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -931,7 +931,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 			$totalarray['nbfield']++;
 		}
 	}
-	
+
 	if (!empty($arrayfields['u.office_phone']['checked'])) {
 		print "<td>".dol_print_phone($obj->office_phone, $obj->country_code, 0, $obj->rowid, 'AC_TEL', ' ', 'phone')."</td>\n";
 		if (!$i) {

From df81ac8622f4718986832136bdd60d5c2148b4e0 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Thu, 20 May 2021 16:30:49 +0200
Subject: [PATCH 0183/1497] wip

---
 htdocs/public/agenda/agendaexport.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/public/agenda/agendaexport.php b/htdocs/public/agenda/agendaexport.php
index 00514cd026c..6a07680c9b9 100644
--- a/htdocs/public/agenda/agendaexport.php
+++ b/htdocs/public/agenda/agendaexport.php
@@ -138,7 +138,9 @@ if (GETPOST("notolderthan", 'int')) {
 if (GETPOST("author", 'apha')) {
 	$filters['author'] = GETPOST("author", 'apha');
 }
-
+if (GETPOST("module", 'apha')) {
+	$filters['module'] = GETPOST("module", 'apha');
+}
 // Check config
 if (empty($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY)) {
 	$user->getrights();

From ab4ae85eb80982ed1f1959842ca85888e9a62544 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Thu, 20 May 2021 16:33:04 +0200
Subject: [PATCH 0184/1497] fix: getpost exportagenda apha to alpha

---
 htdocs/public/agenda/agendaexport.php | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/htdocs/public/agenda/agendaexport.php b/htdocs/public/agenda/agendaexport.php
index d40d75c0acf..2aaeb12de23 100644
--- a/htdocs/public/agenda/agendaexport.php
+++ b/htdocs/public/agenda/agendaexport.php
@@ -96,9 +96,9 @@ if (!isset($conf->global->MAIN_AGENDA_EXPORT_PAST_DELAY)) {
 $format = 'ical';
 $type = 'event';
 if (GETPOST("format", 'alpha')) {
-	$format = GETPOST("format", 'apha');
+	$format = GETPOST("format", 'alpha');
 }
-if (GETPOST("type", 'apha')) {
+if (GETPOST("type", 'alpha')) {
 	$type = GETPOST("type", 'alpha');
 }
 
@@ -115,20 +115,20 @@ if (GETPOST("idfrom", 'int')) {
 if (GETPOST("idto", 'int')) {
 	$filters['idto'] = GETPOST("idto", 'int');
 }
-if (GETPOST("project", 'apha')) {
-	$filters['project'] = GETPOST("project", 'apha');
+if (GETPOST("project", 'alpha')) {
+	$filters['project'] = GETPOST("project", 'alpha');
 }
-if (GETPOST("logina", 'apha')) {
-	$filters['logina'] = GETPOST("logina", 'apha');
+if (GETPOST("logina", 'alpha')) {
+	$filters['logina'] = GETPOST("logina", 'alpha');
 }
-if (GETPOST("logint", 'apha')) {
-	$filters['logint'] = GETPOST("logint", 'apha');
+if (GETPOST("logint", 'alpha')) {
+	$filters['logint'] = GETPOST("logint", 'alpha');
 }
-if (GETPOST("notactiontype", 'apha')) {
-	$filters['notactiontype'] = GETPOST("notactiontype", 'apha');
+if (GETPOST("notactiontype", 'alpha')) {
+	$filters['notactiontype'] = GETPOST("notactiontype", 'alpha');
 }
-if (GETPOST("actiontype", 'apha')) {
-	$filters['actiontype'] = GETPOST("actiontype", 'apha');
+if (GETPOST("actiontype", 'alpha')) {
+	$filters['actiontype'] = GETPOST("actiontype", 'alpha');
 }
 if (GETPOST("notolderthan", 'int')) {
 	$filters['notolderthan'] = GETPOST("notolderthan", "int");

From c561669edf0ad3f3374aa8183e36d6a3bf4243b6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 20 May 2021 17:02:22 +0200
Subject: [PATCH 0185/1497] Code comment

---
 htdocs/admin/system/security.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/admin/system/security.php b/htdocs/admin/system/security.php
index 36f08309e02..a4060634ff9 100644
--- a/htdocs/admin/system/security.php
+++ b/htdocs/admin/system/security.php
@@ -155,7 +155,7 @@ print '<strong>'.$langs->trans("PermissionsOnFilesInWebRoot").'</strong>: ';
 $arrayoffilesinroot = dol_dir_list(DOL_DOCUMENT_ROOT, 'all', 1, '', array('\/custom'), 'name', SORT_ASC, 4, 1, '', 1);
 $fileswithwritepermission = array();
 foreach ($arrayoffilesinroot as $fileinroot) {
-	// Test permission on file
+	// Test if there is at least one write permission file. If yes, add the entry into array $fileswithwritepermission
 	if ($fileinroot['perm'] & 0222) {
 		$fileswithwritepermission[] = $fileinroot['relativename'];
 	}

From 720a368b297cc38f82a150e428220488ee9bb7d1 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Thu, 20 May 2021 17:24:27 +0200
Subject: [PATCH 0186/1497] link ics ok (todo: add name of speaker)

---
 htdocs/comm/action/class/actioncomm.class.php   |  7 +++++--
 .../class/conferenceorbooth.class.php           |  2 ++
 .../conferenceorbooth_list.php                  |  7 ++++---
 htdocs/langs/en_US/eventorganization.lang       |  1 +
 htdocs/public/agenda/agendaexport.php           | 17 +++++++++++++----
 5 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index a6f9faf353f..747c50c9640 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -1901,8 +1901,11 @@ class ActionComm extends CommonObject
 						$sql .= " AND ar.fk_element = 0";
 					}
 				}
-				if ($key == 'author') {
-					$sql .= " AND u.lastname = '".$this->db->escape($value)."'";
+				if ($key == 'module') {
+					$sql .= " AND c.module LIKE '%".$value."'";
+				}
+				if ($key == 'status') {
+					$sql .= " AND a.status =".$value;
 				}
 			}
 
diff --git a/htdocs/eventorganization/class/conferenceorbooth.class.php b/htdocs/eventorganization/class/conferenceorbooth.class.php
index 1719f0c508d..ff26d192301 100644
--- a/htdocs/eventorganization/class/conferenceorbooth.class.php
+++ b/htdocs/eventorganization/class/conferenceorbooth.class.php
@@ -134,6 +134,8 @@ class ConferenceOrBooth extends ActionComm
 	public $status;
 	// END MODULEBUILDER PROPERTIES
 
+	public $pubregister;
+
 	/**
 	 * Constructor
 	 *
diff --git a/htdocs/eventorganization/conferenceorbooth_list.php b/htdocs/eventorganization/conferenceorbooth_list.php
index 24d6853abda..15664896700 100644
--- a/htdocs/eventorganization/conferenceorbooth_list.php
+++ b/htdocs/eventorganization/conferenceorbooth_list.php
@@ -430,11 +430,11 @@ if ($projectid > 0) {
 	// Define $urlwithroot
 	$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
 	$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT;
-	$getentity = ($conf->entity > 1 ? "&entity=".$conf->entity : "");
 
 	// Show message
-	$message = '<input type="text" id="onlinepaymenturl" class="quatrevingtpercent" value="'.$urlwithroot.'/public/agenda/agendaexport.php?format=ical'.$getentity.
-		'&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : '...')."&project=".$projectid.'">';
+	$message = '<a href="'.$urlwithroot.'/public/agenda/agendaexport.php?format=ical'.($conf->entity > 1 ? "&entity=".$conf->entity : "");
+	$message .= '&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : '...');
+	$message .= "&project=".$projectid.'&module='.urlencode('@eventorganization').'&status='.ConferenceOrBooth::STATUS_CONFIRMED.'">'.$langs->trans('DownloadICSLink').'</a>';
 	$message .= '</div>';
 	$message .= '<br>';
 	print $message;
@@ -457,6 +457,7 @@ if ($projectid > 0) {
 // --------------------------------------------------------------------
 $sql = 'SELECT ';
 $sql .= $object->getFieldList('t');
+
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
diff --git a/htdocs/langs/en_US/eventorganization.lang b/htdocs/langs/en_US/eventorganization.lang
index f990779b305..335c257b224 100644
--- a/htdocs/langs/en_US/eventorganization.lang
+++ b/htdocs/langs/en_US/eventorganization.lang
@@ -82,6 +82,7 @@ PriceOfBoothHelp=Subscription price to stand a booth
 EventOrganizationICSLink=Link ICS for events
 ConferenceOrBoothInformation=Conference Or Booth informations
 Attendees = Attendees
+DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
 SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
 SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
diff --git a/htdocs/public/agenda/agendaexport.php b/htdocs/public/agenda/agendaexport.php
index 6a07680c9b9..5d48ffb06fe 100644
--- a/htdocs/public/agenda/agendaexport.php
+++ b/htdocs/public/agenda/agendaexport.php
@@ -135,11 +135,11 @@ if (GETPOST("notolderthan", 'int')) {
 } else {
 	$filters['notolderthan'] = $conf->global->MAIN_AGENDA_EXPORT_PAST_DELAY;
 }
-if (GETPOST("author", 'apha')) {
-	$filters['author'] = GETPOST("author", 'apha');
+if (GETPOST("module", 'alpha')) {
+	$filters['module'] = GETPOST("module", 'alpha');
 }
-if (GETPOST("module", 'apha')) {
-	$filters['module'] = GETPOST("module", 'apha');
+if (GETPOST("status", 'int')) {
+	$filters['status'] = GETPOST("status", 'int');
 }
 // Check config
 if (empty($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY)) {
@@ -206,6 +206,15 @@ foreach ($filters as $key => $value) {
 	if ($key == 'notactiontype') {
 		$filename .= '-notactiontype'.$value;
 	}
+	if ($key == 'actiontype') {
+		$filename .= '-actiontype'.$value;
+	}
+	if ($key == 'module') {
+		$filename .= '-module'.$value;
+	}
+	if ($key == 'status') {
+		$filename .= '-status'.$value;
+	}
 }
 // Add extension
 if ($format == 'vcal') {

From bbce806cb5e64c45e57a27f68b6ca9e61562ffc5 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Thu, 20 May 2021 17:32:48 +0200
Subject: [PATCH 0187/1497] typo

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

diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 16818e86d4f..15a7565780b 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -2473,7 +2473,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print '</tr>';
 		}
 
-		// Su+pplier code
+		// Supplier code
 		if (((!empty($conf->fournisseur->enabled) && !empty($user->rights->fournisseur->lire) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || (!empty($conf->supplier_order->enabled) && !empty($user->rights->supplier_order->lire)) || (!empty($conf->supplier_invoice->enabled) && !empty($user->rights->supplier_invoice->lire))) && $object->fournisseur) {
 			print '<tr><td>';
 			print $langs->trans('SupplierCode').'</td><td>';

From 0c5a934e10cae5c953e5aa81350a3d7b9e4eb85d Mon Sep 17 00:00:00 2001
From: Givriz <damien375@outlook.fr>
Date: Thu, 20 May 2021 17:40:44 +0200
Subject: [PATCH 0188/1497] Compatibility phpv8

---
 htdocs/admin/mails.php                         | 6 +++---
 htdocs/admin/system/security.php               | 4 ++--
 htdocs/core/boxes/box_dolibarr_state_board.php | 2 +-
 htdocs/core/class/html.formfile.class.php      | 4 ++--
 htdocs/projet/class/task.class.php             | 2 +-
 htdocs/user/card.php                           | 6 +++---
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index 2d3133c9fce..e86c78763ee 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -302,7 +302,7 @@ if ($action == 'edit') {
 
 	// Disable
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_DISABLE_ALL_MAILS").'</td><td>';
-	print $form->selectyesno('MAIN_DISABLE_ALL_MAILS', $conf->global->MAIN_DISABLE_ALL_MAILS, 1);
+	print $form->selectyesno('MAIN_DISABLE_ALL_MAILS', getDolGlobalString('MAIN_DISABLE_ALL_MAILS'), 1);
 	print '</td></tr>';
 
 	// Force e-mail recipient
@@ -514,7 +514,7 @@ if ($action == 'edit') {
 	$liste['company'] = $langs->trans('CompanyEmail').' ('.(empty($conf->global->MAIN_INFO_SOCIETE_MAIL) ? $langs->trans("NotDefined") : $conf->global->MAIN_INFO_SOCIETE_MAIL).')';
 
 	print '<tr class="oddeven"><td>'.$langs->trans('MAIN_MAIL_DEFAULT_FROMTYPE').'</td><td>';
-	print $form->selectarray('MAIN_MAIL_DEFAULT_FROMTYPE', $liste, $conf->global->MAIN_MAIL_DEFAULT_FROMTYPE, 0);
+	print $form->selectarray('MAIN_MAIL_DEFAULT_FROMTYPE', $liste, getDolGlobalString('MAIN_MAIL_DEFAULT_FROMTYPE'), 0);
 	print '</td></tr>';
 
 	// From
@@ -529,7 +529,7 @@ if ($action == 'edit') {
 
 	// Add user to select destinaries list
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_ENABLED_USER_DEST_SELECT").'</td><td>';
-	print $form->selectyesno('MAIN_MAIL_ENABLED_USER_DEST_SELECT', $conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT, 1);
+	print $form->selectyesno('MAIN_MAIL_ENABLED_USER_DEST_SELECT', getDolGlobalString('MAIN_MAIL_ENABLED_USER_DEST_SELECT'), 1);
 	print '</td></tr>';
 
 	print '</table>';
diff --git a/htdocs/admin/system/security.php b/htdocs/admin/system/security.php
index 36f08309e02..89d3a3fe251 100644
--- a/htdocs/admin/system/security.php
+++ b/htdocs/admin/system/security.php
@@ -156,7 +156,7 @@ $arrayoffilesinroot = dol_dir_list(DOL_DOCUMENT_ROOT, 'all', 1, '', array('\/cus
 $fileswithwritepermission = array();
 foreach ($arrayoffilesinroot as $fileinroot) {
 	// Test permission on file
-	if ($fileinroot['perm'] & 0222) {
+	if (isset($fileinroot['perm']) && ($fileinroot['perm'] & 0222)) {
 		$fileswithwritepermission[] = $fileinroot['relativename'];
 	}
 }
@@ -278,7 +278,7 @@ print '<br>';
 
 print '<strong>'.$langs->trans("AntivirusEnabledOnUpload").'</strong>: ';
 print empty($conf->global->MAIN_ANTIVIRUS_COMMAND) ? '' : img_picto('', 'tick').' ';
-print yn($conf->global->MAIN_ANTIVIRUS_COMMAND ? 1 : 0);
+print yn(!empty($conf->global->MAIN_ANTIVIRUS_COMMAND) ? 1 : 0);
 if (!empty($conf->global->MAIN_ANTIVIRUS_COMMAND)) {
 	print ' &nbsp; - '.$conf->global->MAIN_ANTIVIRUS_COMMAND;
 	if (defined('MAIN_ANTIVIRUS_COMMAND')) {
diff --git a/htdocs/core/boxes/box_dolibarr_state_board.php b/htdocs/core/boxes/box_dolibarr_state_board.php
index 348ffeda4cd..21bf58b859f 100644
--- a/htdocs/core/boxes/box_dolibarr_state_board.php
+++ b/htdocs/core/boxes/box_dolibarr_state_board.php
@@ -266,7 +266,7 @@ class box_dolibarr_state_board extends ModeleBoxes
 					$boxstatItem .= '<a href="' . $links[$val] . '" class="boxstatsindicator thumbstat nobold nounderline">';
 					$boxstatItem .= '<div class="boxstats">';
 					$boxstatItem .= '<span class="boxstatstext" title="' . dol_escape_htmltag($text) . '">' . $text . '</span><br>';
-					$boxstatItem .= '<span class="boxstatsindicator">' . img_object("", $board->picto, 'class="inline-block"') . ' ' . ($board->nb[$val] ? $board->nb[$val] : 0) . '</span>';
+					$boxstatItem .= '<span class="boxstatsindicator">' . img_object("", $board->picto, 'class="inline-block"') . ' ' . (!empty($board->nb[$val]) ? $board->nb[$val] : 0) . '</span>';
 					$boxstatItem .= '</div>';
 					$boxstatItem .= '</a>';
 
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 45429512046..0f046a08fd3 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -726,7 +726,7 @@ class FormFile
 			}
 
 			// Language code (if multilang)
-			if (($allowgenifempty || (is_array($modellist) && count($modellist) > 0)) && $conf->global->MAIN_MULTILANGS && !$forcenomultilang && (!empty($modellist) || $showempty)) {
+			if (($allowgenifempty || (is_array($modellist) && count($modellist) > 0)) && !empty($conf->global->MAIN_MULTILANGS) && !$forcenomultilang && (!empty($modellist) || $showempty)) {
 				include_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
 				$formadmin = new FormAdmin($this->db);
 				$defaultlang = $codelang ? $codelang : $langs->getDefaultLang();
@@ -812,7 +812,7 @@ class FormFile
 					completeFileArrayWithDatabaseInfo($file_list, $relativedir);
 
 					//var_dump($sortfield.' - '.$sortorder);
-					if ($sortfield && $sortorder) {	// If $sortfield is for example 'position_name', we will sort on the property 'position_name' (that is concat of position+name)
+					if (!empty($sortfield) && !empty($sortorder)) {	// If $sortfield is for example 'position_name', we will sort on the property 'position_name' (that is concat of position+name)
 						$file_list = dol_sort_array($file_list, $sortfield, $sortorder);
 					}
 				}
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index 0b8e21f5afd..97586a41f41 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -1986,7 +1986,7 @@ class Task extends CommonObject
 		global $conf, $langs;
 
 		// For external user, no check is done on company because readability is managed by public status of project and assignement.
-		//$socid=$user->socid;
+		$socid = $user->socid;
 
 		$projectstatic = new Project($this->db);
 		$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1, $socid);
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index cb4e7350e0e..7c1cb1b3f7e 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1557,7 +1557,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			print "</tr>\n";
 
 			// Accountancy code
-			if ($conf->accounting->enabled) {
+			if (!empty($conf->accounting->enabled)) {
 				print '<tr><td>'.$langs->trans("AccountancyCode").'</td>';
 				print '<td>'.$object->accountancy_code.'</td></tr>';
 			}
@@ -2445,7 +2445,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			print '</table><hr><table class="border centpercent">';
 
 			// Accountancy code
-			if ($conf->accounting->enabled) {
+			if (!empty($conf->accounting->enabled)) {
 				print "<tr>";
 				print '<td class="titlefieldcreate">'.$langs->trans("AccountancyCode").'</td>';
 				print '<td>';
@@ -2726,7 +2726,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			$genallowed = $user->rights->user->user->lire;
 			$delallowed = $user->rights->user->user->creer;
 
-			print $formfile->showdocuments('user', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang);
+			print $formfile->showdocuments('user', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', 0, '', empty($soc->default_lang) ? '' : $soc->default_lang);
 			$somethingshown = $formfile->numoffiles;
 
 			// Show links to link elements

From 6f050fc23a93e0aef0628096efefe3ec5ce1bf45 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Thu, 20 May 2021 15:48:04 +0000
Subject: [PATCH 0189/1497] Fixing style errors.

---
 htdocs/public/project/viewandvote.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/public/project/viewandvote.php b/htdocs/public/project/viewandvote.php
index 0468a9c2e59..9177e0edc8d 100644
--- a/htdocs/public/project/viewandvote.php
+++ b/htdocs/public/project/viewandvote.php
@@ -181,9 +181,9 @@ if (strlen($idvote)) {
 	}
 	if ($votestatus=="ok") {
 		setEventMessage($langs->trans("VoteOk"), 'mesgs');
-	} else if ($votestatus=="ko") {
+	} elseif ($votestatus=="ko") {
 		setEventMessage($langs->trans("AlreadyVoted"), 'warnings');
-	} else if ($votestatus=="err") {
+	} elseif ($votestatus=="err") {
 		setEventMessage($langs->trans("VoteError"), 'warnings');
 	}
 	header("Refresh:0;url=".dol_buildpath('/public/project/viewandvote.php?id='.$id.'&securekey=', 1).$securekeyreceived);

From 7833ac8fb0181a7377dd277b7f00dcf8a10b1dbe Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 20 May 2021 17:53:28 +0200
Subject: [PATCH 0190/1497] Code comment

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

diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index e38ddf9b93c..00cfcf842d5 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -230,7 +230,7 @@ if (!defined('NOREQUIREDB') && !defined('NOREQUIRESOC')) {
 // Set default language (must be after the setValues setting global $conf->global->MAIN_LANG_DEFAULT. Page main.inc.php will overwrite langs->defaultlang with user value later)
 if (!defined('NOREQUIRETRAN')) {
 	$langcode = (GETPOST('lang', 'aZ09') ? GETPOST('lang', 'aZ09', 1) : (empty($conf->global->MAIN_LANG_DEFAULT) ? 'auto' : $conf->global->MAIN_LANG_DEFAULT));
-	if (defined('MAIN_LANG_DEFAULT')) {
+	if (defined('MAIN_LANG_DEFAULT')) {	// So a page can force the language whatever is setup and parameters in URL
 		$langcode = constant('MAIN_LANG_DEFAULT');
 	}
 	$langs->setDefaultLang($langcode);

From cfd035e1deadc583247f3faf9750c916fd4783fd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 20 May 2021 21:25:36 +0200
Subject: [PATCH 0191/1497] css

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

diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index 30aa32a8d58..3b658f0c793 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -340,7 +340,7 @@ if ($action == 'create') {
 
 	print dol_get_fiche_head('');
 
-	print '<table class="border centpercent">';
+	print '<table class="border centpercent tableforfieldcreate">';
 
 	// Ref
 	print '<tr><td class="fieldrequired titlefieldcreate">'.$langs->trans("Ref").'</td>';
@@ -835,7 +835,7 @@ if ($action == 'create') {
 
 		//print '<div class="underbanner clearboth"></div>';
 
-		print '<table class="border centpercent">';
+		print '<table class="border centpercent tableforfieldcreate">';
 
 		// Ref
 		print '<tr><td class="fieldrequired titlefieldcreate">'.$langs->trans("Ref").'</td>';
@@ -925,7 +925,7 @@ if ($action == 'create') {
 
 		// Tags-Categories
 		if ($conf->categorie->enabled) {
-			print '<tr><td class="tdtop">'.$langs->trans("Categories").'</td><td>';
+			print '<tr><td>'.$langs->trans("Categories").'</td><td>';
 			$cate_arbo = $form->select_all_categories(Categorie::TYPE_ACCOUNT, '', 'parent', 64, 0, 1);
 			$c = new Categorie($db);
 			$cats = $c->containing($object->id, Categorie::TYPE_ACCOUNT);

From ac9d9e93147449acf001a8678e5ee27b36c56ef8 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Fri, 21 May 2021 07:04:58 +0200
Subject: [PATCH 0192/1497] NEW Add hook on balance list

---
 htdocs/accountancy/bookkeeping/balance.php | 75 +++++++++++++++-------
 1 file changed, 51 insertions(+), 24 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index 75283667fcb..434754516cc 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -68,7 +68,9 @@ if ($search_accountancy_code_end == - 1) {
 	$search_accountancy_code_end = '';
 }
 
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $object = new BookKeeping($db);
+$hookmanager->initHooks(array('balancelist'));  // Note that conf->hooks_modules contains array
 
 $formaccounting = new FormAccounting($db);
 $formother = new FormOther($db);
@@ -155,16 +157,23 @@ if (empty($user->rights->accounting->mouvements->lire)) {
  * Action
  */
 
-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
-	$show_subgroup = '';
-	$search_date_start = '';
-	$search_date_end = '';
-	$search_accountancy_code_start = '';
-	$search_accountancy_code_end = '';
-	$search_ledger_code = array();
-	$filter = array();
+$parameters = array('socid'=>$socid);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
 
+if (empty($reshook)) {
+	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
+		$show_subgroup = '';
+		$search_date_start = '';
+		$search_date_end = '';
+		$search_accountancy_code_start = '';
+		$search_accountancy_code_end = '';
+		$search_ledger_code = array();
+		$filter = array();
+	}
+}
 
 /*
  * View
@@ -226,22 +235,28 @@ if ($action != 'export_csv') {
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	print '<input type="hidden" name="page" value="'.$page.'">';
 
-	$button = '<input type="button" id="exportcsvbutton" name="exportcsvbutton" class="butAction" value="'.$langs->trans("Export").' ('.$conf->global->ACCOUNTING_EXPORT_FORMAT.')" />';
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+	if (empty($reshook)) {
+		$button = '<input type="button" id="exportcsvbutton" name="exportcsvbutton" class="butAction" value="'.$langs->trans("Export").' ('.$conf->global->ACCOUNTING_EXPORT_FORMAT.')" />';
 
-	print '<script type="text/javascript" language="javascript">
-	jQuery(document).ready(function() {
-		jQuery("#exportcsvbutton").click(function() {
-			event.preventDefault();
-			console.log("Set action to export_csv");
-			jQuery("#action").val("export_csv");
-			jQuery("#searchFormList").submit();
-			jQuery("#action").val("list");
+		print '<script type="text/javascript" language="javascript">
+		jQuery(document).ready(function() {
+			jQuery("#exportcsvbutton").click(function() {
+				event.preventDefault();
+				console.log("Set action to export_csv");
+				jQuery("#action").val("export_csv");
+				jQuery("#searchFormList").submit();
+				jQuery("#action").val("list");
+			});
 		});
-	});
-	</script>';
+		</script>';
+	}
 
 	print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $button, $result, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit);
 
+	$selectedfields = '';
+
 	$moreforfilter = '';
 
 	$moreforfilter .= '<div class="divsearchfield">';
@@ -283,12 +298,18 @@ if ($action != 'export_csv') {
 	print ' ';
 	print $formaccounting->select_account($search_accountancy_code_end, 'search_accountancy_code_end', $langs->trans('to'), array(), 1, 1, '', 'accounts');
 	print '</td>';
-	print '<td class="liste_titre center">';
+
+	// Fields from hook
+	$parameters = array('arrayfields'=>$arrayfields);
+	$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+
+	// Action column
+	print '<td class="liste_titre maxwidthsearch">';
 	$searchpicto = $form->showFilterButtons();
 	print $searchpicto;
 	print '</td>';
-
-	print '</tr>';
+	print '</tr>'."\n";
 
 	print '<tr class="liste_titre">';
 	print_liste_field_titre("AccountAccounting", $_SERVER['PHP_SELF'], "t.numero_compte", "", $param, "", $sortfield, $sortorder);
@@ -298,8 +319,14 @@ if ($action != 'export_csv') {
 	print_liste_field_titre("Debit", $_SERVER['PHP_SELF'], "t.debit", "", $param, 'class="right"', $sortfield, $sortorder);
 	print_liste_field_titre("Credit", $_SERVER['PHP_SELF'], "t.credit", "", $param, 'class="right"', $sortfield, $sortorder);
 	print_liste_field_titre("Balance", $_SERVER["PHP_SELF"], "", $param, "", 'class="right"', $sortfield, $sortorder);
-	print_liste_field_titre('', $_SERVER["PHP_SELF"], "", $param, "", 'width="60" class="center"', $sortfield, $sortorder);
-	print "</tr>\n";
+
+	// Hook fields
+	$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+	$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+	// Action column
+	print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+	print '</tr>'."\n";
 
 	$total_debit = 0;
 	$total_credit = 0;

From fbe491c4da728ed5ac85fa0eb4bf9f63d707fff8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 21 May 2021 12:17:56 +0200
Subject: [PATCH 0193/1497] FIX CWE-79 huntr

---
 htdocs/main.inc.php           | 32 ++++++++++++++------------------
 test/phpunit/SecurityTest.php |  4 ++++
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 7b40647ebcb..40bb38a54f7 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -142,27 +142,23 @@ function testSqlAndScriptInject($val, $type)
 	}
 	$inj += preg_match('/base\s+href/si', $val);
 	$inj += preg_match('/=data:/si', $val);
-	// List of dom events is on https://www.w3schools.com/jsref/dom_obj_event.asp
-	$inj += preg_match('/onmouse([a-z]*)\s*=/i', $val); // onmousexxx can be set on img or any html tag like <img title='...' onmouseover=alert(1)>
-	$inj += preg_match('/ondrag([a-z]*)\s*=/i', $val); //
-	$inj += preg_match('/ontouch([a-z]*)\s*=/i', $val); //
-	$inj += preg_match('/on(abort|afterprint|beforeprint|beforeunload|blur|canplay|canplaythrough|change|click|contextmenu|copy|cut)\s*=/i', $val);
-	$inj += preg_match('/on(dblclick|drop|durationchange|ended|error|focus|focusin|focusout|hashchange|input|invalid)\s*=/i', $val);
-	$inj += preg_match('/on(keydown|keypress|keyup|load|loadeddata|loadedmetadata|loadstart|loadend|offline|online|pagehide|pageshow)\s*=/i', $val);
-	$inj += preg_match('/on(paste|pause|play|playing|progress|ratechange|resize|reset|scroll|search|seeking|select|show|stalled|start|submit|suspend)\s*=/i', $val);
-	$inj += preg_match('/on(timeupdate|toggle|unload|volumechange|waiting)\s*=/i', $val);
+	// List of dom events is on https://www.w3schools.com/jsref/dom_obj_event.asp and https://developer.mozilla.org/en-US/docs/Web/API/GlobalEventHandlers
+	$inj += preg_match('/on(mouse|drag|key|load|touch|pointer|select|transition)([a-z]*)\s*=/i', $val); // onmousexxx can be set on img or any html tag like <img title='...' onmouseover=alert(1)>
+	$inj += preg_match('/on(abort|afterprint|animation|auxclick|beforeprint|beforeunload|blur|cancel|canplay|canplaythrough|change|click|close|contextmenu|cuechange|copy|cut)\s*=/i', $val);
+	$inj += preg_match('/on(lostpointercapture|dblclick|drop|durationchange|ended|error|focus|focusin|focusout|formdata|gotpointercapture|hashchange|input|invalid)\s*=/i', $val);
+	$inj += preg_match('/on(offline|online|pagehide|pageshow)\s*=/i', $val);
+	$inj += preg_match('/on(paste|pause|play|playing|progress|ratechange|reset|resize|scroll|search|seeking|show|stalled|start|submit|suspend)\s*=/i', $val);
+	$inj += preg_match('/on(timeupdate|toggle|unload|volumechange|waiting|wheel)\s*=/i', $val);
 
 	// We refuse html into html because some hacks try to obfuscate evil strings by inserting HTML into HTML. Example: <img on<a>error=alert(1) to bypass test on onerror
 	$tmpval = preg_replace('/<[^<]+>/', '', $val);
-	// List of dom events is on https://www.w3schools.com/jsref/dom_obj_event.asp
-	$inj += preg_match('/onmouse([a-z]*)\s*=/i', $tmpval); // onmousexxx can be set on img or any html tag like <img title='...' onmouseover=alert(1)>
-	$inj += preg_match('/ondrag([a-z]*)\s*=/i', $tmpval); //
-	$inj += preg_match('/ontouch([a-z]*)\s*=/i', $tmpval); //
-	$inj += preg_match('/on(abort|afterprint|beforeprint|beforeunload|blur|canplay|canplaythrough|change|click|contextmenu|copy|cut)\s*=/i', $tmpval);
-	$inj += preg_match('/on(dblclick|drop|durationchange|ended|error|focus|focusin|focusout|hashchange|input|invalid)\s*=/i', $tmpval);
-	$inj += preg_match('/on(keydown|keypress|keyup|load|loadeddata|loadedmetadata|loadstart|loadend|offline|online|pagehide|pageshow)\s*=/i', $tmpval);
-	$inj += preg_match('/on(paste|pause|play|playing|progress|ratechange|resize|reset|scroll|search|seeking|select|show|stalled|start|submit|suspend)\s*=/i', $tmpval);
-	$inj += preg_match('/on(timeupdate|toggle|unload|volumechange|waiting)\s*=/i', $tmpval);
+	// List of dom events is on https://www.w3schools.com/jsref/dom_obj_event.asp and https://developer.mozilla.org/en-US/docs/Web/API/GlobalEventHandlers
+	$inj += preg_match('/on(mouse|drag|key|load|touch|pointer|select|transition)([a-z]*)\s*=/i', $val); // onmousexxx can be set on img or any html tag like <img title='...' onmouseover=alert(1)>
+	$inj += preg_match('/on(abort|afterprint|animation|auxclick|beforeprint|beforeunload|blur|cancel|canplay|canplaythrough|change|click|close|contextmenu|cuechange|copy|cut)\s*=/i', $tmpval);
+	$inj += preg_match('/on(dblclick|drop|durationchange|ended|error|focus|focusin|focusout|formdata|gotpointercapture|hashchange|input|invalid)\s*=/i', $tmpval);
+	$inj += preg_match('/on(lostpointercapture|offline|online|pagehide|pageshow)\s*=/i', $tmpval);
+	$inj += preg_match('/on(paste|pause|play|playing|progress|ratechange|reset|resize|scroll|search|seeking|show|stalled|start|submit|suspend)\s*=/i', $tmpval);
+	$inj += preg_match('/on(timeupdate|toggle|unload|volumechange|waiting|wheel)\s*=/i', $tmpval);
 
 	//$inj += preg_match('/on[A-Z][a-z]+\*=/', $val);   // To lock event handlers onAbort(), ...
 	$inj += preg_match('/&#58;|&#0000058|&#x3A/i', $val); // refused string ':' encoded (no reason to have it encoded) to lock 'javascript:...'
diff --git a/test/phpunit/SecurityTest.php b/test/phpunit/SecurityTest.php
index bd4d0e9b76d..944d4f4cbe5 100644
--- a/test/phpunit/SecurityTest.php
+++ b/test/phpunit/SecurityTest.php
@@ -302,6 +302,10 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 		$test="<img src=x one<a>rror=alert(document.location)";
 		$result=testSqlAndScriptInject($test, 0);
 		$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject kkk');
+
+		$test="<a onpointerdown=alert(document.domain)>XSS</a>";
+		$result=testSqlAndScriptInject($test, 0);
+		$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject lll');
 	}
 
 	/**

From a5001899ebe2f34526fa44bcacca557d5f245058 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Fri, 21 May 2021 13:32:09 +0200
Subject: [PATCH 0194/1497] Update llx_00_c_country.sql
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Nouvelle-Calédonie  ->  New Caledonia
Nouvelle-Zélande  ->  New Zealand
Nicaragua = Nicaragua
Niger = Niger
Nigeria = Nigeria
Nioué  ->  Niue
Ile Norfolk  ->  Norfolk Island
Mariannes du Nord  ->  Northern Mariana Islands
Norvège  ->  Norway
Oman = Oman
Pakistan = Pakistan
Palaos  ->  Palau
Territoire Palestinien Occupé  ->  Palestinian territories
Panama = Panama
Papouasie-Nouvelle-Guinée  ->  Papua New Guinea
Paraguay = Paraguay
Peru = Peru
Philippines = Philippines
Iles Pitcairn  ->  Pitcairn Islands
Pologne  ->  Poland
Porto Rico  ->  Puerto Rico
Qatar = Qatar
---
 .../install/mysql/data/llx_00_c_country.sql   | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_00_c_country.sql b/htdocs/install/mysql/data/llx_00_c_country.sql
index bc09a7fd1f6..677447f1af2 100644
--- a/htdocs/install/mysql/data/llx_00_c_country.sql
+++ b/htdocs/install/mysql/data/llx_00_c_country.sql
@@ -194,27 +194,27 @@ INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (40
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (300,'CW','CUW','Curaçao',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (301,'SX','SXM','Sint Maarten',1,0);
 --End of antilles nederland
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (165,'NC','NCL','Nouvelle-Calédonie',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (166,'NZ','NZL','Nouvelle-Zélande',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (165,'NC','NCL','New Caledonia',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (166,'NZ','NZL','New Zealand',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (167,'NI','NIC','Nicaragua',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (168,'NE','NER','Niger',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (169,'NG','NGA','Nigeria',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (170,'NU','NIU','Nioué',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (171,'NF','NFK','Ile Norfolk',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (172,'MP','MNP','Mariannes du Nord',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (173,'NO','NOR','Norvège',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (170,'NU','NIU','Niue',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (171,'NF','NFK','Norfolk Island',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (172,'MP','MNP','Northern Mariana Islands',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (173,'NO','NOR','Norway',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (174,'OM','OMN','Oman',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (175,'PK','PAK','Pakistan',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (176,'PW','PLW','Palaos',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (177,'PS','PSE','Territoire Palestinien Occupé',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (176,'PW','PLW','Palau',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (177,'PS','PSE','Palestinian territories',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (178,'PA','PAN','Panama',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (179,'PG','PNG','Papouasie-Nouvelle-Guinée',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (179,'PG','PNG','Papua New Guinea',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (180,'PY','PRY','Paraguay',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (181,'PE','PER','Peru',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (182,'PH','PHL','Philippines',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (183,'PN','PCN','Iles Pitcairn',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (183,'PN','PCN','Pitcairn Islands',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (184,'PL','POL','Pologne',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (185,'PR','PRI','Porto Rico',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (185,'PR','PRI','Puerto Rico',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (186,'QA','QAT','Qatar',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (188,'RO','ROU','Roumanie',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (189,'RW','RWA','Rwanda',1,0);

From b5af3b17d53f41bc03ca784ccf94f1acc55d1a82 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 21 May 2021 14:03:52 +0200
Subject: [PATCH 0195/1497] Update doc

---
 doc/images/README.md | 19 +++++++++----------
 htdocs/main.inc.php  | 10 +++++-----
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/doc/images/README.md b/doc/images/README.md
index 7422d246d40..e93c9f9c3d4 100644
--- a/doc/images/README.md
+++ b/doc/images/README.md
@@ -10,17 +10,16 @@
 https://github.com/Dolibarr/foundation
 
 
-* Few icons are / were from website led24.de 
 
-* Attention: This website is no longer available! 
+# LICENCE OF IMAGE RESOURCES
+--------------------------------
 
-This is original README file for this source:
--------------------------------------------------------
+* All image resources (except dolihelp.ico and doliadmin.ico) in this directory are distributed under licence CC BY-SA
+
+List of icons from http://led24.de/iconset/ are:
+- doliadmin.ico
+- dolihelp.ico
+
+This is original README file for the package with this 2 images:
 You can do whatever you want with these icons (use on web or in desktop applications) as long as you don’t pass them off as your own and remove this readme file. A credit statement and a link back to
 http://led24.de/iconset/ or http://led24.de/ would be appreciated.
-
-Follow us on twitter http://twitter.com/gasyoun or email leds24@gmail.com
-512 icons 20/05/2009
--------------------------------------------------------
-List of icons from http://led24.de/iconset/ are:
-- dolihelp.ico
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 40bb38a54f7..a42c3c39cd3 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -145,9 +145,9 @@ function testSqlAndScriptInject($val, $type)
 	// List of dom events is on https://www.w3schools.com/jsref/dom_obj_event.asp and https://developer.mozilla.org/en-US/docs/Web/API/GlobalEventHandlers
 	$inj += preg_match('/on(mouse|drag|key|load|touch|pointer|select|transition)([a-z]*)\s*=/i', $val); // onmousexxx can be set on img or any html tag like <img title='...' onmouseover=alert(1)>
 	$inj += preg_match('/on(abort|afterprint|animation|auxclick|beforeprint|beforeunload|blur|cancel|canplay|canplaythrough|change|click|close|contextmenu|cuechange|copy|cut)\s*=/i', $val);
-	$inj += preg_match('/on(lostpointercapture|dblclick|drop|durationchange|ended|error|focus|focusin|focusout|formdata|gotpointercapture|hashchange|input|invalid)\s*=/i', $val);
-	$inj += preg_match('/on(offline|online|pagehide|pageshow)\s*=/i', $val);
-	$inj += preg_match('/on(paste|pause|play|playing|progress|ratechange|reset|resize|scroll|search|seeking|show|stalled|start|submit|suspend)\s*=/i', $val);
+	$inj += preg_match('/on(dblclick|drop|durationchange|emptied|ended|error|focus|focusin|focusout|formdata|gotpointercapture|hashchange|input|invalid)\s*=/i', $val);
+	$inj += preg_match('/on(lostpointercapture|offline|online|pagehide|pageshow)\s*=/i', $val);
+	$inj += preg_match('/on(paste|pause|play|playing|progress|ratechange|reset|resize|scroll|search|seeked|seeking|show|stalled|start|submit|suspend)\s*=/i', $val);
 	$inj += preg_match('/on(timeupdate|toggle|unload|volumechange|waiting|wheel)\s*=/i', $val);
 
 	// We refuse html into html because some hacks try to obfuscate evil strings by inserting HTML into HTML. Example: <img on<a>error=alert(1) to bypass test on onerror
@@ -155,9 +155,9 @@ function testSqlAndScriptInject($val, $type)
 	// List of dom events is on https://www.w3schools.com/jsref/dom_obj_event.asp and https://developer.mozilla.org/en-US/docs/Web/API/GlobalEventHandlers
 	$inj += preg_match('/on(mouse|drag|key|load|touch|pointer|select|transition)([a-z]*)\s*=/i', $val); // onmousexxx can be set on img or any html tag like <img title='...' onmouseover=alert(1)>
 	$inj += preg_match('/on(abort|afterprint|animation|auxclick|beforeprint|beforeunload|blur|cancel|canplay|canplaythrough|change|click|close|contextmenu|cuechange|copy|cut)\s*=/i', $tmpval);
-	$inj += preg_match('/on(dblclick|drop|durationchange|ended|error|focus|focusin|focusout|formdata|gotpointercapture|hashchange|input|invalid)\s*=/i', $tmpval);
+	$inj += preg_match('/on(dblclick|drop|durationchange|emptied|ended|error|focus|focusin|focusout|formdata|gotpointercapture|hashchange|input|invalid)\s*=/i', $tmpval);
 	$inj += preg_match('/on(lostpointercapture|offline|online|pagehide|pageshow)\s*=/i', $tmpval);
-	$inj += preg_match('/on(paste|pause|play|playing|progress|ratechange|reset|resize|scroll|search|seeking|show|stalled|start|submit|suspend)\s*=/i', $tmpval);
+	$inj += preg_match('/on(paste|pause|play|playing|progress|ratechange|reset|resize|scroll|search|seeked|seeking|show|stalled|start|submit|suspend)\s*=/i', $tmpval);
 	$inj += preg_match('/on(timeupdate|toggle|unload|volumechange|waiting|wheel)\s*=/i', $tmpval);
 
 	//$inj += preg_match('/on[A-Z][a-z]+\*=/', $val);   // To lock event handlers onAbort(), ...

From c1c2f44e384d092e9f5d1e6836223887f39e72e7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 21 May 2021 14:16:49 +0200
Subject: [PATCH 0196/1497] Update file COPYRIGHT

---
 COPYRIGHT | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/COPYRIGHT b/COPYRIGHT
index aedcb1be614..c43d77581a7 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,13 +1,24 @@
 
-License
--------
+Copyright and license
+----------------------
 
-Dolibarr is released 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 (GPL-3+).
-More information: https://www.gnu.org/licenses/gpl-3.0.txt
+The Dolibarr software as a whole is distributed under 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 (GPL-3+). More information: https://www.gnu.org/licenses/gpl-3.0.txt.
+A copy of this license is available in the COPYING file.
+Dolibarr depends on third-party components and code snippets released under their own license (obviously, all compatible with the one of Dolibarr).
+These dependencies are listed in the bottom of this file.
 
-Dolibarr uses some external libraries released under different licenses. This is compatibility summary:
+
+The Dolibarr images resources (available in the doc directory) is distributed under the Creative Commons Attribution 4.0 International license (CC BY 4.0).
+
+
+The name Dolibarr is a trademark initially registered by Laurent Destailleur and ceased to the Dolibarr foundation. You can use the name Dolibarr
+for your own need as long as you follow the rules defined on the page https://wiki.dolibarr.org/index.php/Rules_to_use_the_brand_name_%22Dolibarr%22   
+The use of the name DoliStore is also restricted to the same rules defined on https://wiki.dolibarr.org/index.php/Rules_to_use_the_brand_name_%22Dolibarr%22
+
+
+
+Licence of dependencies of third-party components used by Dolibarr (all compatible with the Licence of Dolibarr):
 
 Component              Version       License                     GPL Compatible  Usage
 -------------------------------------------------------------------------------------
@@ -28,7 +39,7 @@ php-iban               1.4.7         LGPL-3+                     Yes
 PHPoAuthLib            0.8.2         MIT License                 Yes             Library to provide oauth1 and oauth2 to different service
 PHPPrintIPP            1.3           GPL-2+                      Yes             Library to send print IPP requests
 PSR/Logs               1.0                                                       Library for logs (used by DebugBar)
-PSR/simple-cache        ?            MIT License                 Yes             Library for cache (used by PHPSpreadSheet)
+PSR/simple-cache       ?             MIT License                 Yes             Library for cache (used by PHPSpreadSheet)
 Restler                3.1.1         LGPL-3+                     Yes             Library to develop REST Web services (+ swagger-ui js lib into dir explorer)
 Sabre                  3.2.2         BSD                         Yes             DAV support
 Swift Mailer           5.4.2-DEV     MIT License                 Yes             Comprehensive mailing tools for PHP
@@ -63,11 +74,10 @@ Font libraries:
 Fontawesome            5.13          Font Awesome Free Licence   Yes
 
 
-For licenses compatibility informations:
-https://www.gnu.org/licenses/licenses.en.html
+For more licenses compatibility informations: https://www.gnu.org/licenses/licenses.en.html
 
 
-Copyright / Authors
+Authors
 -------------------
 
 See page https://github.com/Dolibarr/dolibarr/graphs/contributors

From 38bd595ebdfca44db2bff4b2d315d81bd13046cb Mon Sep 17 00:00:00 2001
From: lvessiller <lvessiller@open-dsi.fr>
Date: Fri, 21 May 2021 14:18:46 +0200
Subject: [PATCH 0197/1497] NEW translate supplier order menus and button

---
 htdocs/core/menus/init_menu_auguria.sql | 2 +-
 htdocs/core/menus/standard/eldy.lib.php | 2 +-
 htdocs/fourn/card.php                   | 4 ++--
 htdocs/fourn/commande/list.php          | 2 +-
 htdocs/langs/en_US/orders.lang          | 2 ++
 htdocs/langs/fr_FR/orders.lang          | 2 ++
 htdocs/main.inc.php                     | 2 +-
 htdocs/supplier_proposal/card.php       | 2 +-
 8 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql
index d9c2cad7c9f..9eb6a43f9b0 100644
--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@@ -167,7 +167,7 @@ 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->supplier_proposal->enabled', __HANDLER__, 'left', 1653__+MAX_llx_menu__, 'commercial', '', 1650__+MAX_llx_menu__, '/comm/propal/stats/index.php?leftmenu=supplier_proposals&amp;mode=supplier', 'Statistics', 1, 'supplier_proposal', '$user->rights->supplier_proposal->lire', '', 2, 2, __ENTITY__);
 -- Commercial - Supplier's orders
 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->supplier_order->enabled', __HANDLER__, 'left', 5100__+MAX_llx_menu__, 'commercial', 'orders_suppliers', 5__+MAX_llx_menu__, '/fourn/commande/index.php?mainmenu=commercial&amp;leftmenu=orders_suppliers', 'SuppliersOrders', 0, 'orders', '($user->rights->fournisseur->commande->lire || $user->rights->supplier_order->lire)', '', 2, 6, __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->supplier_order->enabled', __HANDLER__, 'left', 5101__+MAX_llx_menu__, 'commercial', '', 5100__+MAX_llx_menu__, '/fourn/commande/card.php?mainmenu=commercial&amp;action=create&amp;leftmenu=orders_suppliers', 'NewOrder', 1, 'orders', '($user->rights->fournisseur->commande->creer || $user->rights->supplier_order->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->supplier_order->enabled', __HANDLER__, 'left', 5101__+MAX_llx_menu__, 'commercial', '', 5100__+MAX_llx_menu__, '/fourn/commande/card.php?mainmenu=commercial&amp;action=create&amp;leftmenu=orders_suppliers', 'NewSupplierOrderShort', 1, 'orders', '($user->rights->fournisseur->commande->creer || $user->rights->supplier_order->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->supplier_order->enabled', __HANDLER__, 'left', 5102__+MAX_llx_menu__, 'commercial', '', 5100__+MAX_llx_menu__, '/fourn/commande/list.php?mainmenu=commercial&amp;leftmenu=orders_suppliers', 'List', 1, 'orders', '($user->rights->fournisseur->commande->lire || $user->rights->supplier_order->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->supplier_order->enabled && $leftmenu=="orders_suppliers"', __HANDLER__, 'left', 5103__+MAX_llx_menu__, 'commercial', '', 5102__+MAX_llx_menu__, '/fourn/commande/list.php?mainmenu=commercial&amp;leftmenu=orders_suppliers&amp;statut=0', 'StatusOrderDraftShort', 1, 'orders', '($user->rights->fournisseur->commande->lire || $user->rights->supplier_order->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->supplier_order->enabled && $leftmenu=="orders_suppliers"', __HANDLER__, 'left', 5104__+MAX_llx_menu__, 'commercial', '', 5102__+MAX_llx_menu__, '/fourn/commande/list.php?mainmenu=commercial&amp;leftmenu=orders_suppliers&amp;statut=1', 'StatusOrderValidated', 1, 'orders', '($user->rights->fournisseur->commande->lire || $user->rights->supplier_order->lire)', '', 2, 3, __ENTITY__);
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 74c66e899f4..2232b3333dd 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -959,7 +959,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			if (!empty($conf->supplier_order->enabled)) {
 				$langs->load("orders");
 				$newmenu->add("/fourn/commande/index.php?leftmenu=orders_suppliers", $langs->trans("SuppliersOrders"), 0, $user->rights->fournisseur->commande->lire, '', $mainmenu, 'orders_suppliers', 400, '', '', '', img_picto('', 'supplier_order', 'class="paddingright pictofixedwidth"'));
-				$newmenu->add("/fourn/commande/card.php?action=create&amp;leftmenu=orders_suppliers", $langs->trans("NewOrder"), 1, $user->rights->fournisseur->commande->creer);
+				$newmenu->add("/fourn/commande/card.php?action=create&amp;leftmenu=orders_suppliers", $langs->trans("NewSupplierOrderShort"), 1, $user->rights->fournisseur->commande->creer);
 				$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers", $langs->trans("List"), 1, $user->rights->fournisseur->commande->lire);
 
 				if ($usemenuhider || empty($leftmenu) || $leftmenu == "orders_suppliers") {
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index 90934062910..e9b61e53406 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -842,9 +842,9 @@ if ($object->id > 0) {
 		if ($user->rights->fournisseur->commande->creer || $user->rights->supplier_order->creer) {
 			$langs->load("orders");
 			if ($object->status == 1) {
-				print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/commande/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddOrder").'</a>';
+				print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/commande/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddSupplierOrderShort").'</a>';
 			} else {
-				print '<a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("ThirdPartyIsClosed")).'" href="#">'.$langs->trans("AddOrder").'</a>';
+				print '<a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("ThirdPartyIsClosed")).'" href="#">'.$langs->trans("AddSupplierOrderShort").'</a>';
 			}
 		}
 
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index fb1891051e6..aba5b8060f9 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -895,7 +895,7 @@ if ($resql) {
 	if (!empty($socid)) {
 		$url .= '&socid='.$socid;
 	}
-	$newcardbutton = dolGetButtonTitle($langs->trans('NewOrder'), '', 'fa fa-plus-circle', $url, '', ($user->rights->fournisseur->commande->creer || $user->rights->supplier_order->creer));
+	$newcardbutton = dolGetButtonTitle($langs->trans('NewSupplierOrderShort'), '', 'fa fa-plus-circle', $url, '', ($user->rights->fournisseur->commande->creer || $user->rights->supplier_order->creer));
 
 	// Lines of title fields
 	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
diff --git a/htdocs/langs/en_US/orders.lang b/htdocs/langs/en_US/orders.lang
index 87d196eb22f..5dab5b99bf1 100644
--- a/htdocs/langs/en_US/orders.lang
+++ b/htdocs/langs/en_US/orders.lang
@@ -11,6 +11,7 @@ OrderDate=Order date
 OrderDateShort=Order date
 OrderToProcess=Order to process
 NewOrder=New order
+NewSupplierOrderShort=New order
 NewOrderSupplier=New Purchase Order
 ToOrder=Make order
 MakeOrder=Make order
@@ -73,6 +74,7 @@ DeleteOrder=Delete order
 CancelOrder=Cancel order
 OrderReopened= Order %s re-open
 AddOrder=Create order
+AddSupplierOrderShort=Create order
 AddPurchaseOrder=Create purchase order
 AddToDraftOrders=Add to draft order
 ShowOrder=Show order
diff --git a/htdocs/langs/fr_FR/orders.lang b/htdocs/langs/fr_FR/orders.lang
index 0732013a49b..9bbc7154567 100644
--- a/htdocs/langs/fr_FR/orders.lang
+++ b/htdocs/langs/fr_FR/orders.lang
@@ -11,6 +11,7 @@ OrderDate=Date de commande
 OrderDateShort=Date de commande
 OrderToProcess=Commande à traiter
 NewOrder=Nouvelle commande
+NewSupplierOrderShort=Nouvelle commande
 NewOrderSupplier=Nouvelle Commande d'Achat
 ToOrder=Passer commande
 MakeOrder=Passer commande
@@ -73,6 +74,7 @@ DeleteOrder=Supprimer la commande
 CancelOrder=Annuler la commande
 OrderReopened= Commande %s réouverte
 AddOrder=Créer commande
+AddSupplierOrderShort=Créer commande
 AddPurchaseOrder=Créer commande d'achat
 AddToDraftOrders=Ajouter à commande brouillon
 ShowOrder=Afficher commande
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 7b40647ebcb..8d97a56b2f3 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -2317,7 +2317,7 @@ function top_menu_quickadd()
 		$dropDownQuickAddHtml .= '
                 <!-- Supplier order link -->
                 <div class="quickaddblock center">
-                    <a class="quickadddropdown-icon-link" href="'.DOL_URL_ROOT.'/fourn/commande/card.php?action=create" title="'.$langs->trans("NewOrder").'">
+                    <a class="quickadddropdown-icon-link" href="'.DOL_URL_ROOT.'/fourn/commande/card.php?action=create" title="'.$langs->trans("NewSupplierOrderShort").'">
                     '. img_picto('', 'object_order') .'<br>'. $langs->trans("SupplierOrder") .'</a>
                 </div>
                 ';
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index cad41f905ef..633f0785fe1 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -1862,7 +1862,7 @@ if ($action == 'create') {
 				// Create an order
 				if (((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_order->enabled)) && $object->statut == SupplierProposal::STATUS_SIGNED) {
 					if ($usercancreateorder) {
-						print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/fourn/commande/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans("AddOrder").'</a></div>';
+						print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/fourn/commande/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans("AddSupplierOrderShort").'</a></div>';
 					}
 				}
 

From 609d405685cffd0188bea6ffe5f6fec520f0bd29 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Fri, 21 May 2021 15:38:03 +0200
Subject: [PATCH 0198/1497] fix: formconfim if type radio must be :checked to
 get correct value

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 945897856f2..82c00e4e4f7 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4433,7 +4433,7 @@ class Form
                          			var more = "";
 									var inputvalue;
                          			if ($("input[name=\'" + inputname + "\']").attr("type") == "radio") {
-										inputvalue = $("input[name=\'" + inputname + "\']").val();
+										inputvalue = $("input[name=\'" + inputname + "\']:checked").val();
 									} else {
                          		    	if ($("#" + inputname).attr("type") == "checkbox") { more = ":checked"; }
                          				inputvalue = $("#" + inputname + more).val();

From 11fa523070a805a1608ebcf0031cce66beaa34c4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 21 May 2021 15:54:11 +0200
Subject: [PATCH 0199/1497] FIX CWE-269

---
 htdocs/core/lib/security.lib.php              |  5 ++++-
 htdocs/margin/tabs/productMargins.php         | 10 ++++++----
 htdocs/margin/tabs/thirdpartyMargins.php      |  8 ++++++--
 htdocs/product/agenda.php                     | 16 +++++++++++++++-
 htdocs/product/card.php                       | 12 +++++++++++-
 htdocs/product/composition/card.php           | 14 +++++++++++++-
 htdocs/product/document.php                   | 12 +++++++++++-
 htdocs/product/fournisseurs.php               | 19 +++++++++----------
 htdocs/product/note.php                       | 11 ++++++++++-
 htdocs/product/popuprop.php                   |  4 +---
 htdocs/product/price.php                      | 11 ++++++++++-
 htdocs/product/stats/bom.php                  |  3 ++-
 htdocs/product/stats/card.php                 |  3 ++-
 htdocs/product/stats/commande.php             |  6 +++---
 htdocs/product/stats/commande_fournisseur.php |  3 ++-
 htdocs/product/stats/contrat.php              |  5 ++---
 htdocs/product/stats/facture.php              |  2 +-
 htdocs/product/stats/facture_fournisseur.php  |  6 +++---
 htdocs/product/stats/mo.php                   |  5 ++---
 htdocs/product/stats/propal.php               |  5 +++--
 htdocs/product/stats/supplier_proposal.php    |  6 +++---
 htdocs/product/stock/product.php              | 13 +++++++++++--
 htdocs/product/traduction.php                 | 17 ++++++++++++++++-
 htdocs/variants/combinations.php              | 16 +++++++++++-----
 24 files changed, 157 insertions(+), 55 deletions(-)

diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index de4d67b1647..06baefed88e 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -173,10 +173,13 @@ function dol_verifyHash($chain, $hash, $type = '0')
  *  This method check permission on module then call checkUserAccessToObject() for permission on object (according to entity and socid of user).
  *
  *	@param	User	$user      	  	User to check
- *	@param  string	$features	    Features to check (it must be module $object->element. Examples: 'societe', 'contact', 'produit&service', 'produit|service', ...)
+ *	@param  string	$features	    Features to check (it must be module $object->element. Can be a 'or' check with 'levela|levelb'.
+ *									Examples: 'societe', 'contact', 'produit&service', 'produit|service', ...)
+ *									This is used to check permission $user->rights->features->...
  *	@param  int		$objectid      	Object ID if we want to check a particular record (optional) is linked to a owned thirdparty (optional).
  *	@param  string	$tableandshare  'TableName&SharedElement' with Tablename is table where object is stored. SharedElement is an optional key to define where to check entity for multicompany module. Param not used if objectid is null (optional).
  *	@param  string	$feature2		Feature to check, second level of permission (optional). Can be a 'or' check with 'sublevela|sublevelb'.
+ *									This is used to check permission $user->rights->features->feature2...
  *  @param  string	$dbt_keyfield   Field name for socid foreign key if not fk_soc. Not used if objectid is null (optional)
  *  @param  string	$dbt_select     Field name for select if not rowid. Not used if objectid is null (optional)
  *  @param	int		$isdraft		1=The object with id=$objectid is a draft
diff --git a/htdocs/margin/tabs/productMargins.php b/htdocs/margin/tabs/productMargins.php
index 4c34e04c54c..6f2337d1baf 100644
--- a/htdocs/margin/tabs/productMargins.php
+++ b/htdocs/margin/tabs/productMargins.php
@@ -39,10 +39,6 @@ $fieldtype = (!empty($ref) ? 'ref' : 'rowid');
 if (!empty($user->socid)) {
 	$socid = $user->socid;
 }
-$result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
-if (empty($user->rights->margins->liretous)) {
-	accessforbidden();
-}
 
 $object = new Product($db);
 
@@ -63,6 +59,12 @@ if (!$sortfield) {
 	$sortfield = "f.datef";
 }
 
+$result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
+
+if (empty($user->rights->margins->liretous)) {
+	accessforbidden();
+}
+
 
 /*
  * View
diff --git a/htdocs/margin/tabs/thirdpartyMargins.php b/htdocs/margin/tabs/thirdpartyMargins.php
index b1c569c0912..505ff9f9f31 100644
--- a/htdocs/margin/tabs/thirdpartyMargins.php
+++ b/htdocs/margin/tabs/thirdpartyMargins.php
@@ -33,8 +33,6 @@ $socid = GETPOST('socid', 'int');
 if (!empty($user->socid)) {
 	$socid = $user->socid;
 }
-$result = restrictedArea($user, 'societe', '', '');
-
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
@@ -61,6 +59,12 @@ if ($socid > 0) {
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('thirdpartymargins', 'globalcard'));
 
+$result = restrictedArea($user, 'societe', $object->id, '');
+
+if (empty($user->rights->margins->liretous)) {
+	accessforbidden();
+}
+
 
 /*
  * Actions
diff --git a/htdocs/product/agenda.php b/htdocs/product/agenda.php
index ea32e47c8a5..815014e259f 100644
--- a/htdocs/product/agenda.php
+++ b/htdocs/product/agenda.php
@@ -73,7 +73,21 @@ if (!$sortorder) {
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('agendathirdparty'));
 
-$result = restrictedArea($user, 'produit|service', $id, 'product&product');
+$object = new Product($db);
+if ($id > 0 || !empty($ref)) {
+	$object->fetch($id, $ref);
+}
+
+if ($object->id > 0) {
+	if ($object->type == $object::TYPE_PRODUCT) {
+		restrictedArea($user, 'produit', $object->id, 'product&product', '', '');
+	}
+	if ($object->type == $object::TYPE_SERVICE) {
+		restrictedArea($user, 'service', $object->id, 'product&product', '', '');
+	}
+} else {
+	restrictedArea($user, 'produit|service', 0, 'product&product', '', '');
+}
 
 
 /*
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index c92f847a1e9..61568a5510a 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -152,7 +152,17 @@ if (!empty($canvas)) {
 // Security check
 $fieldvalue = (!empty($id) ? $id : (!empty($ref) ? $ref : ''));
 $fieldtype = (!empty($id) ? 'rowid' : 'ref');
-$result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
+
+if ($object->id > 0) {
+	if ($object->type == $object::TYPE_PRODUCT) {
+		restrictedArea($user, 'produit', $object->id, 'product&product', '', '');
+	}
+	if ($object->type == $object::TYPE_SERVICE) {
+		restrictedArea($user, 'service', $object->id, 'product&product', '', '');
+	}
+} else {
+	restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
+}
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('productcard', 'globalcard'));
diff --git a/htdocs/product/composition/card.php b/htdocs/product/composition/card.php
index 442232686d3..c9499bf415b 100644
--- a/htdocs/product/composition/card.php
+++ b/htdocs/product/composition/card.php
@@ -50,7 +50,6 @@ if (!empty($user->socid)) {
 }
 $fieldvalue = (!empty($id) ? $id : (!empty($ref) ? $ref : ''));
 $fieldtype = (!empty($ref) ? 'ref' : 'rowid');
-$result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
 
 $object = new Product($db);
 $objectid = 0;
@@ -60,6 +59,19 @@ if ($id > 0 || !empty($ref)) {
 	$id = $object->id;
 }
 
+$result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
+
+if ($object->id > 0) {
+	if ($object->type == $object::TYPE_PRODUCT) {
+		restrictedArea($user, 'produit', $object->id, 'product&product', '', '');
+	}
+	if ($object->type == $object::TYPE_SERVICE) {
+		restrictedArea($user, 'service', $object->id, 'product&product', '', '');
+	}
+} else {
+	restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
+}
+
 
 /*
  * Actions
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index 372e3c19bdc..0b15ad7a85c 100644
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -95,9 +95,19 @@ if ($id > 0 || !empty($ref)) {
 }
 $modulepart = 'produit';
 
+
 $permissiontoadd = (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->creer) || ($object->type == Product::TYPE_SERVICE && $user->rights->service->creer));
 
-$result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
+if ($object->id > 0) {
+	if ($object->type == $object::TYPE_PRODUCT) {
+		restrictedArea($user, 'produit', $object->id, 'product&product', '', '');
+	}
+	if ($object->type == $object::TYPE_SERVICE) {
+		restrictedArea($user, 'service', $object->id, 'product&product', '', '');
+	}
+} else {
+	restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
+}
 
 
 /*
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index 0d5ea9647f5..8b2a792b872 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -103,17 +103,16 @@ if ($id > 0 || $ref) {
 	$object->fetch($id, $ref);
 }
 
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
-
-if (!$sortfield) {
-	$sortfield = "s.nom";
+if ($object->id > 0) {
+	if ($object->type == $object::TYPE_PRODUCT) {
+		restrictedArea($user, 'produit', $object->id, 'product&product', '', '');
+	}
+	if ($object->type == $object::TYPE_SERVICE) {
+		restrictedArea($user, 'service', $object->id, 'product&product', '', '');
+	}
+} else {
+	restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
 }
-if (!$sortorder) {
-	$sortorder = "ASC";
-}
-
-$result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
 
 
 /*
diff --git a/htdocs/product/note.php b/htdocs/product/note.php
index add915181a2..fad4df3500b 100644
--- a/htdocs/product/note.php
+++ b/htdocs/product/note.php
@@ -51,7 +51,16 @@ if ($id > 0 || !empty($ref)) {
 
 $permissionnote = $user->rights->produit->creer; // Used by the include of actions_setnotes.inc.php
 
-$result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
+if ($object->id > 0) {
+	if ($object->type == $object::TYPE_PRODUCT) {
+		restrictedArea($user, 'produit', $object->id, 'product&product', '', '');
+	}
+	if ($object->type == $object::TYPE_SERVICE) {
+		restrictedArea($user, 'service', $object->id, 'product&product', '', '');
+	}
+} else {
+	restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
+}
 
 
 /*
diff --git a/htdocs/product/popuprop.php b/htdocs/product/popuprop.php
index f23b6eae92d..5aa54b0963c 100644
--- a/htdocs/product/popuprop.php
+++ b/htdocs/product/popuprop.php
@@ -60,9 +60,7 @@ $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
-$staticproduct = new Product($db);
-
-$result = restrictedArea($user, 'produit|service', 0, 'product&product');
+restrictedArea($user, 'produit|service', 0, 'product&product', '', '');
 
 
 /*
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 9548643166a..295a999a778 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -82,7 +82,16 @@ if ((!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('productpricecard', 'globalcard'));
 
-$result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
+if ($object->id > 0) {
+	if ($object->type == $object::TYPE_PRODUCT) {
+		restrictedArea($user, 'produit', $object->id, 'product&product', '', '');
+	}
+	if ($object->type == $object::TYPE_SERVICE) {
+		restrictedArea($user, 'service', $object->id, 'product&product', '', '');
+	}
+} else {
+	restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
+}
 
 
 /*
diff --git a/htdocs/product/stats/bom.php b/htdocs/product/stats/bom.php
index 053d9d6b1a8..505bc8ed060 100644
--- a/htdocs/product/stats/bom.php
+++ b/htdocs/product/stats/bom.php
@@ -41,7 +41,6 @@ $fieldtype = (!empty($ref) ? 'ref' : 'rowid');
 if ($user->socid) {
 	$socid = $user->socid;
 }
-$result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('productstatscontract'));
@@ -67,6 +66,8 @@ if (!$sortfield) {
 	$sortfield = "b.date_valid";
 }
 
+$result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
+
 
 /*
  * View
diff --git a/htdocs/product/stats/card.php b/htdocs/product/stats/card.php
index 2dae292884e..d791100ae4a 100644
--- a/htdocs/product/stats/card.php
+++ b/htdocs/product/stats/card.php
@@ -58,7 +58,6 @@ if (!empty($user->socid)) {
 // Security check
 $fieldvalue = (!empty($id) ? $id : $ref);
 $fieldtype = (!empty($ref) ? 'ref' : 'rowid');
-$result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
 
 $tmp = dol_getdate(dol_now());
 $currentyear = $tmp['year'];
@@ -66,6 +65,8 @@ if (empty($search_year)) {
 	$search_year = $currentyear;
 }
 
+$result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
+
 
 /*
  * Actions
diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php
index fe8016f362a..9ba4dee7081 100644
--- a/htdocs/product/stats/commande.php
+++ b/htdocs/product/stats/commande.php
@@ -43,13 +43,10 @@ $socid = '';
 if (!empty($user->socid)) {
 	$socid = $user->socid;
 }
-$result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('productstatsorder'));
 
-$mesg = '';
-
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
@@ -75,6 +72,9 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter',
 	$search_year = '';
 }
 
+$result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
+
+
 /*
  * View
  */
diff --git a/htdocs/product/stats/commande_fournisseur.php b/htdocs/product/stats/commande_fournisseur.php
index bc8346e39b1..6037f608b58 100644
--- a/htdocs/product/stats/commande_fournisseur.php
+++ b/htdocs/product/stats/commande_fournisseur.php
@@ -42,7 +42,6 @@ $socid = '';
 if (!empty($user->socid)) {
 	$socid = $user->socid;
 }
-$result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('productstatssupplyorder'));
@@ -74,6 +73,8 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter',
 	$search_year = '';
 }
 
+$result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
+
 
 /*
  * View
diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php
index e419593208c..f91e74edf50 100644
--- a/htdocs/product/stats/contrat.php
+++ b/htdocs/product/stats/contrat.php
@@ -40,13 +40,10 @@ $fieldtype = (!empty($ref) ? 'ref' : 'rowid');
 if ($user->socid) {
 	$socid = $user->socid;
 }
-$result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('productstatscontract'));
 
-$mesg = '';
-
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
@@ -65,6 +62,8 @@ if (!$sortfield) {
 	$sortfield = "c.date_contrat";
 }
 
+$result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
+
 
 /*
  * View
diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php
index fa7d4fae24f..0681aa9b5ca 100644
--- a/htdocs/product/stats/facture.php
+++ b/htdocs/product/stats/facture.php
@@ -44,7 +44,6 @@ $socid = '';
 if (!empty($user->socid)) {
 	$socid = $user->socid;
 }
-$result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('productstatsinvoice'));
@@ -77,6 +76,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter',
 	$search_year = '';
 }
 
+$result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
 
 
 /*
diff --git a/htdocs/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php
index 018f1c28f02..69ef83ae5a7 100644
--- a/htdocs/product/stats/facture_fournisseur.php
+++ b/htdocs/product/stats/facture_fournisseur.php
@@ -44,13 +44,10 @@ $socid = '';
 if (!empty($user->socid)) {
 	$socid = $user->socid;
 }
-$result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('productstatssupplyinvoice'));
 
-$mesg = '';
-
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
@@ -76,6 +73,9 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter',
 	$search_year = '';
 }
 
+$result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
+
+
 /*
  * View
  */
diff --git a/htdocs/product/stats/mo.php b/htdocs/product/stats/mo.php
index 1cabfd9ef85..fefb89592e7 100644
--- a/htdocs/product/stats/mo.php
+++ b/htdocs/product/stats/mo.php
@@ -40,13 +40,10 @@ $fieldtype = (!empty($ref) ? 'ref' : 'rowid');
 if ($user->socid) {
 	$socid = $user->socid;
 }
-$result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('productstatscontract'));
 
-$mesg = '';
-
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
@@ -65,6 +62,8 @@ if (!$sortfield) {
 	$sortfield = "c.date_valid";
 }
 
+$result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
+
 
 /*
  * View
diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php
index 7dfc8b6d1db..96303ac598d 100644
--- a/htdocs/product/stats/propal.php
+++ b/htdocs/product/stats/propal.php
@@ -48,8 +48,6 @@ $result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('productstatspropal'));
 
-$mesg = '';
-
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
@@ -76,6 +74,9 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter',
 	$search_year = '';
 }
 
+$result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
+
+
 /*
  * View
  */
diff --git a/htdocs/product/stats/supplier_proposal.php b/htdocs/product/stats/supplier_proposal.php
index 86689786b2d..1b236ed3999 100644
--- a/htdocs/product/stats/supplier_proposal.php
+++ b/htdocs/product/stats/supplier_proposal.php
@@ -43,13 +43,10 @@ $socid = '';
 if (!empty($user->socid)) {
 	$socid = $user->socid;
 }
-$result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('productstatspropal'));
 
-$mesg = '';
-
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
@@ -76,6 +73,9 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter',
 	$search_year = '';
 }
 
+$result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
+
+
 /*
  * View
  */
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index b97e9b6c2d2..883fff49123 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -81,8 +81,6 @@ if (!empty($batchnumber)) {
 if ($user->socid) {
 	$socid = $user->socid;
 }
-$result = restrictedArea($user, 'produit&stock', $id, 'product&product', '', '', $fieldid);
-
 
 $object = new Product($db);
 $extrafields = new ExtraFields($db);
@@ -114,6 +112,17 @@ $hookmanager->initHooks(array('stockproductcard', 'globalcard'));
 
 $error = 0;
 
+if ($object->id > 0) {
+	if ($object->type == $object::TYPE_PRODUCT) {
+		restrictedArea($user, 'produit', $object->id, 'product&product', '', '');
+	}
+	if ($object->type == $object::TYPE_SERVICE) {
+		restrictedArea($user, 'service', $object->id, 'product&product', '', '');
+	}
+} else {
+	restrictedArea($user, 'produit|service', $id, 'product&product', '', '', $fieldid);
+}
+
 
 /*
  *	Actions
diff --git a/htdocs/product/traduction.php b/htdocs/product/traduction.php
index 45b45136410..b2c3b0d0b2f 100644
--- a/htdocs/product/traduction.php
+++ b/htdocs/product/traduction.php
@@ -45,7 +45,22 @@ $fieldtype = (!empty($ref) ? 'ref' : 'rowid');
 if ($user->socid) {
 	$socid = $user->socid;
 }
-$result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
+
+if ($id > 0 || !empty($ref)) {
+	$object = new Product($db);
+	$object->fetch($id, $ref);
+}
+
+if ($object->id > 0) {
+	if ($object->type == $object::TYPE_PRODUCT) {
+		restrictedArea($user, 'produit', $object->id, 'product&product', '', '');
+	}
+	if ($object->type == $object::TYPE_SERVICE) {
+		restrictedArea($user, 'service', $object->id, 'product&product', '', '');
+	}
+} else {
+	restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
+}
 
 
 /*
diff --git a/htdocs/variants/combinations.php b/htdocs/variants/combinations.php
index ded3a1bb8b9..a7ad432b3ba 100644
--- a/htdocs/variants/combinations.php
+++ b/htdocs/variants/combinations.php
@@ -51,7 +51,6 @@ $delete_product = GETPOST('delete_product', 'alpha');
 // Security check
 $fieldvalue = (!empty($id) ? $id : $ref);
 $fieldtype = (!empty($ref) ? 'ref' : 'rowid');
-$result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
 
 $prodstatic = new Product($db);
 $prodattr = new ProductAttribute($db);
@@ -64,8 +63,6 @@ if ($id > 0 || $ref) {
 
 $selectedvariant = $_SESSION['addvariant_'.$object->id];
 
-$permissiontoread = $user->rights->produit->lire || $user->rights->service->lire;
-
 // Security check
 if (empty($conf->variants->enabled)) {
 	accessforbidden('Module not enabled');
@@ -73,8 +70,17 @@ if (empty($conf->variants->enabled)) {
 if ($user->socid > 0) { // Protection if external user
 	accessforbidden();
 }
-//$result = restrictedArea($user, 'variant');
-if (!$permissiontoread) accessforbidden();
+
+if ($object->id > 0) {
+	if ($object->type == $object::TYPE_PRODUCT) {
+		restrictedArea($user, 'produit', $object->id, 'product&product', '', '');
+	}
+	if ($object->type == $object::TYPE_SERVICE) {
+		restrictedArea($user, 'service', $object->id, 'product&product', '', '');
+	}
+} else {
+	restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
+}
 
 
 /*

From 67cab8c1f2538ef7cc6af384dbedb374cbfb64d5 Mon Sep 17 00:00:00 2001
From: r3dge <regis.harpocrate@gmail.com>
Date: Fri, 21 May 2021 16:01:04 +0200
Subject: [PATCH 0200/1497] bug fix : replacing orders by donations and setting
 required field to allow post action in rest API for url donations. See issue
 #17700

---
 htdocs/don/class/api_donations.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/don/class/api_donations.class.php b/htdocs/don/class/api_donations.class.php
index 18a8563fd89..5f70ee82a2e 100644
--- a/htdocs/don/class/api_donations.class.php
+++ b/htdocs/don/class/api_donations.class.php
@@ -33,7 +33,7 @@ class Donations extends DolibarrApi
 	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
 	 */
 	static $FIELDS = array(
-		'socid'
+		'amount'
 	);
 
 	/**
@@ -193,7 +193,7 @@ class Donations extends DolibarrApi
         }*/
 
 		if ($this->don->create(DolibarrApiAccess::$user) < 0) {
-			throw new RestException(500, "Error creating order", array_merge(array($this->don->error), $this->don->errors));
+			throw new RestException(500, "Error creating donation", array_merge(array($this->don->error), $this->don->errors));
 		}
 
 		return $this->don->id;
@@ -355,7 +355,7 @@ class Donations extends DolibarrApi
 	private function _validate($data)
 	{
 		$don = array();
-		foreach (Orders::$FIELDS as $field) {
+		foreach (Donations::$FIELDS as $field) {
 			if (!isset($data[$field]))
 				throw new RestException(400, $field." field missing");
 			$don[$field] = $data[$field];

From fe272d32925657b0fe12482eaf56264eda8d21f2 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Fri, 21 May 2021 16:01:44 +0200
Subject: [PATCH 0201/1497] wip name of contact to add on ics file

---
 htdocs/comm/action/class/actioncomm.class.php     |  1 +
 .../class/conferenceorbooth.class.php             |  1 +
 htdocs/public/project/suggestconference.php       | 15 ++++++++++++---
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 747c50c9640..5790811fc2e 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -1944,6 +1944,7 @@ class ActionComm extends CommonObject
 
 					$duration = ($datestart && $dateend) ? ($dateend - $datestart) : 0;
 					$event['summary'] = $obj->label.($obj->socname ? " (".$obj->socname.")" : "");
+
 					$event['desc'] = $obj->note;
 					$event['startdate'] = $datestart;
 					$event['enddate'] = $dateend; // Not required with type 'journal'
diff --git a/htdocs/eventorganization/class/conferenceorbooth.class.php b/htdocs/eventorganization/class/conferenceorbooth.class.php
index ff26d192301..bb8649106b9 100644
--- a/htdocs/eventorganization/class/conferenceorbooth.class.php
+++ b/htdocs/eventorganization/class/conferenceorbooth.class.php
@@ -215,6 +215,7 @@ class ConferenceOrBooth extends ActionComm
 		$this->socid=$this->fk_soc;
 		$this->datef=$this->datep2;
 		$this->note_private=$this->note;
+		$this->fk_user_author=$this->fk_user_author;
 	}
 
 	/**
diff --git a/htdocs/public/project/suggestconference.php b/htdocs/public/project/suggestconference.php
index 0028f544f9f..19eb0801c6a 100644
--- a/htdocs/public/project/suggestconference.php
+++ b/htdocs/public/project/suggestconference.php
@@ -225,7 +225,11 @@ if (empty($reshook) && $action == 'add') {
 	}
 	if (!GETPOST("lastname")) {
 		$error++;
-		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Name"))."<br>\n";
+			$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Lastname"))."<br>\n";
+	}
+	if (!GETPOST("firstname")) {
+		$error++;
+		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Firstname"))."<br>\n";
 	}
 	if (!GETPOST("societe")) {
 		$error++;
@@ -297,7 +301,6 @@ if (empty($reshook) && $action == 'add') {
 				$contact->state_id = (int) GETPOST("state_id", 'int');
 				$contact->email = $email;
 				$contact->statut = 1; //Default status to Actif
-
 				$resultcreatecontact = $contact->create($user);
 				if ($resultcreatecontact<0) {
 					$error++;
@@ -362,6 +365,8 @@ if (empty($reshook) && $action == 'add') {
 			$conforbooth->datep2 = $dateend;
 			$conforbooth->datec = dol_now();
 			$conforbooth->tms = dol_now();
+			$conforbooth->firstname = $contact->firstname;
+			$conforbooth->lastname = $contact->lastname;
 			$resultconforbooth = $conforbooth->create($user);
 			if ($resultconforbooth<=0) {
 				$error++;
@@ -488,10 +493,14 @@ jQuery(document).ready(function () {
 
 print '<table class="border" summary="form to subscribe" id="tablesubscribe">'."\n";
 
-// Name
+// Last Name
 print '<tr><td><label for="lastname">'.$langs->trans("Lastname").' / '.$langs->trans("Label").'<FONT COLOR="red">*</FONT></label></td>';
 print '<td colspan="3"><input name="lastname" id="lastname" type="text" class="maxwidth100onsmartphone" maxlength="80" value="'.dol_escape_htmltag(GETPOST("lastname", 'alpha') ?GETPOST("lastname", 'alpha') : $object->lastname).'" autofocus="autofocus"></td>';
 print '</tr>';
+// First Name
+print '<tr><td><label for="firstname">'.$langs->trans("Firstname").' / '.$langs->trans("Label").'<FONT COLOR="red">*</FONT></label></td>';
+print '<td colspan="3"><input name="firstname" id="firstname" type="text" class="maxwidth100onsmartphone" maxlength="80" value="'.dol_escape_htmltag(GETPOST("firstname", 'alpha') ?GETPOST("firstname", 'alpha') : $object->firstname).'" autofocus="autofocus"></td>';
+print '</tr>';
 // Email
 print '<tr><td>'.$langs->trans("Email").'<FONT COLOR="red">*</FONT></td><td><input type="text" name="email" maxlength="255" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('email')).'"></td></tr>'."\n";
 // Company

From 4df70dc3f49e3fa3e952d35501090687e8039043 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 21 May 2021 16:22:45 +0200
Subject: [PATCH 0202/1497] Fix CWE-269 huntr

---
 htdocs/ecm/dir_add_card.php |  2 +-
 htdocs/ecm/dir_card.php     | 14 ++++++++++----
 htdocs/ecm/file_card.php    | 14 +++++++++-----
 htdocs/ecm/file_note.php    | 13 ++++++++-----
 htdocs/ecm/index.php        | 12 ++++++------
 htdocs/ecm/search.php       |  6 ++++++
 6 files changed, 40 insertions(+), 21 deletions(-)

diff --git a/htdocs/ecm/dir_add_card.php b/htdocs/ecm/dir_add_card.php
index 4cf557acde6..1416983e3a3 100644
--- a/htdocs/ecm/dir_add_card.php
+++ b/htdocs/ecm/dir_add_card.php
@@ -188,7 +188,7 @@ if ($action == 'add' && $permtoadd) {
 			exit;
 		}
 	}
-} elseif ($action == 'confirm_deletesection' && $confirm == 'yes') {
+} elseif ($action == 'confirm_deletesection' && $confirm == 'yes' && $permtoadd) {
 	// Deleting file
 	$result = $ecmdir->delete($user);
 	setEventMessages($langs->trans("ECMSectionWasRemoved", $ecmdir->label), null, 'mesgs');
diff --git a/htdocs/ecm/dir_card.php b/htdocs/ecm/dir_card.php
index 4c93e005266..d84a7330e69 100644
--- a/htdocs/ecm/dir_card.php
+++ b/htdocs/ecm/dir_card.php
@@ -88,17 +88,23 @@ if ($module == 'ecm') {
 }
 
 // Permissions
+$permtoread = 0;
 $permtoadd = 0;
 $permtoupload = 0;
 if ($module == 'ecm') {
+	$permtoread = $user->rights->ecm->read;
 	$permtoadd = $user->rights->ecm->setup;
 	$permtoupload = $user->rights->ecm->upload;
 }
 if ($module == 'medias') {
+	$permtoread = ($user->rights->mailing->lire || $user->rights->website->read);
 	$permtoadd = ($user->rights->mailing->creer || $user->rights->website->write);
 	$permtoupload = ($user->rights->mailing->creer || $user->rights->website->write);
 }
 
+if (!$permtoread) {
+	accessforbidden();
+}
 
 
 /*
@@ -106,7 +112,7 @@ if ($module == 'medias') {
  */
 
 // Upload file
-if (GETPOST("sendit") && !empty($conf->global->MAIN_UPLOAD_DOC)) {
+if (GETPOST("sendit") && !empty($conf->global->MAIN_UPLOAD_DOC) && $permtoupload) {
 	if (dol_mkdir($upload_dir) >= 0) {
 		$resupload = dol_move_uploaded_file($_FILES['userfile']['tmp_name'], $upload_dir."/".dol_unescapefile($_FILES['userfile']['name']), 0, 0, $_FILES['userfile']['error']);
 		if (is_numeric($resupload) && $resupload > 0) {
@@ -131,7 +137,7 @@ if (GETPOST("sendit") && !empty($conf->global->MAIN_UPLOAD_DOC)) {
 }
 
 // Remove file
-if ($action == 'confirm_deletefile' && $confirm == 'yes') {
+if ($action == 'confirm_deletefile' && $confirm == 'yes' && $permtoupload) {
 	$langs->load("other");
 	$file = $upload_dir."/".GETPOST('urlfile'); // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
 	$ret = dol_delete_file($file);
@@ -145,7 +151,7 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes') {
 }
 
 // Remove dir
-if ($action == 'confirm_deletedir' && $confirm == 'yes') {
+if ($action == 'confirm_deletedir' && $confirm == 'yes' && $permtoupload) {
 	$backtourl = DOL_URL_ROOT."/ecm/index.php";
 	if ($module == 'medias') {
 		$backtourl = DOL_URL_ROOT."/website/index.php?file_manager=1";
@@ -181,7 +187,7 @@ if ($action == 'confirm_deletedir' && $confirm == 'yes') {
 }
 
 // Update dirname or description
-if ($action == 'update' && !GETPOST('cancel', 'alpha')) {
+if ($action == 'update' && !GETPOST('cancel', 'alpha') && $permtoadd) {
 	$error = 0;
 
 	if ($module == 'ecm') {
diff --git a/htdocs/ecm/file_card.php b/htdocs/ecm/file_card.php
index 93885c2843a..14bc7e377f0 100644
--- a/htdocs/ecm/file_card.php
+++ b/htdocs/ecm/file_card.php
@@ -36,10 +36,6 @@ $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
 
-if (!$user->rights->ecm->setup) {
-	accessforbidden();
-}
-
 // Get parameters
 $socid = GETPOST("socid", "int");
 
@@ -105,6 +101,14 @@ if ($result < 0) {
 	exit;
 }
 
+// Permissions
+$permtoread = $user->rights->ecm->read;
+$permtoadd = $user->rights->ecm->setup;
+$permtoupload = $user->rights->ecm->upload;
+
+if (!$permtoread) {
+	accessforbidden();
+}
 
 
 /*
@@ -123,7 +127,7 @@ if ($cancel) {
 }
 
 // Rename file
-if ($action == 'update') {
+if ($action == 'update' && $permtoadd) {
 	$error = 0;
 
 	$oldlabel = GETPOST('urlfile', 'alpha');
diff --git a/htdocs/ecm/file_note.php b/htdocs/ecm/file_note.php
index d2f3f7b4792..505e432f982 100644
--- a/htdocs/ecm/file_note.php
+++ b/htdocs/ecm/file_note.php
@@ -22,7 +22,7 @@
 /**
  *  \file       htdocs/ecm/file_note.php
  *  \ingroup    ecm
- *  \brief      Fiche de notes sur une ecm file
+ *  \brief      Tab for notes on an ECM file
  */
 
 require '../main.inc.php';
@@ -39,10 +39,6 @@ $ref = GETPOST('ref', 'alpha');
 $socid = GETPOST('socid', 'int');
 $action = GETPOST('action', 'aZ09');
 
-if (!$user->rights->ecm->setup) {
-	accessforbidden();
-}
-
 // Get parameters
 $socid = GETPOST("socid", "int");
 // Security check
@@ -109,6 +105,13 @@ if ($result < 0) {
 
 $permissionnote = $user->rights->ecm->setup; // Used by the include of actions_setnotes.inc.php
 
+$permtoread = $user->rights->ecm->read;
+
+if (!$permtoread) {
+	accessforbidden();
+}
+
+
 /*
  * Actions
  */
diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php
index 26bf242b0f2..3a8d33343c7 100644
--- a/htdocs/ecm/index.php
+++ b/htdocs/ecm/index.php
@@ -34,12 +34,6 @@ require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array("ecm", "companies", "other", "users", "orders", "propal", "bills", "contracts"));
 
-// Security check
-if ($user->socid) {
-	$socid = $user->socid;
-}
-$result = restrictedArea($user, 'ecm', 0);
-
 // Get parameters
 $socid = GETPOST('socid', 'int');
 $action = GETPOST('action', 'aZ09');
@@ -81,6 +75,12 @@ $userstatic = new User($db);
 
 $error = 0;
 
+// Security check
+if ($user->socid) {
+	$socid = $user->socid;
+}
+$result = restrictedArea($user, 'ecm', 0);
+
 
 /*
  *	Actions
diff --git a/htdocs/ecm/search.php b/htdocs/ecm/search.php
index 979e1d3a417..aa792e0c9d7 100644
--- a/htdocs/ecm/search.php
+++ b/htdocs/ecm/search.php
@@ -84,6 +84,12 @@ if (!empty($section)) {
 	}
 }
 
+$permtoread = $user->rights->ecm->read;
+
+if (!$permtoread) {
+	accessforbidden();
+}
+
 
 /*
  * Actions

From a0418fc17d0c3a131096fe8f6c3767165c2f92de Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 21 May 2021 18:53:09 +0200
Subject: [PATCH 0203/1497] FIX CWE-269 huntr - download of files of project

---
 htdocs/core/class/html.formfile.class.php     |  9 +++-
 htdocs/core/lib/files.lib.php                 | 17 +++++-
 htdocs/core/lib/security.lib.php              | 52 ++++++++++++++-----
 htdocs/ecm/index_auto.php                     |  8 ++-
 .../class/expensereport.class.php             | 22 ++++----
 htdocs/projet/class/task.class.php            |  3 +-
 6 files changed, 78 insertions(+), 33 deletions(-)

diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 45429512046..573381b8b0c 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -1774,11 +1774,16 @@ class FormFile
 					continue; // We do not show orphelins files
 				}
 
-				print '<!-- Line list_of_autoecmfiles '.$key.' -->'."\n";
+				print '<!-- Line list_of_autoecmfiles key='.$key.' -->'."\n";
 				print '<tr class="oddeven">';
 				print '<td>';
 				if ($found > 0 && is_object($this->cache_objects[$modulepart.'_'.$id.'_'.$ref])) {
-					print $this->cache_objects[$modulepart.'_'.$id.'_'.$ref]->getNomUrl(1, 'document');
+					$tmpobject = $this->cache_objects[$modulepart.'_'.$id.'_'.$ref];
+					//if (! in_array($tmpobject->element, array('expensereport'))) {
+					print $tmpobject->getNomUrl(1, 'document');
+					//} else {
+					//	print $tmpobject->getNomUrl(1);
+					//}
 				} else {
 					print $langs->trans("ObjectDeleted", ($id ? $id : $ref));
 				}
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index ce5e7129bcf..90796f402d4 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -2232,7 +2232,8 @@ function dol_most_recent_file($dir, $regexfilter = '', $excludefilter = array('(
 }
 
 /**
- * Security check when accessing to a document (used by document.php, viewimage.php and webservices)
+ * Security check when accessing to a document (used by document.php, viewimage.php and webservices to get documents).
+ * TODO Replace code that set $accesallowed by a call to restrictedArea()
  *
  * @param	string	$modulepart			Module of document ('module', 'module_user_temp', 'module_user' or 'module_temp')
  * @param	string	$original_file		Relative path with filename, relative to modulepart.
@@ -2612,12 +2613,26 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		// Wrapping pour les projets
 		if ($fuser->rights->projet->{$lire} || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
+			// If we known $id of project, call checkUserAccessToObject to check permission on properties and contact of project
+			if ($refname && !preg_match('/^specimen/i', $original_file)) {
+				include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+				$tmpproject = new Project($db);
+				$tmpproject->fetch('', $refname);
+				$accessallowed = checkUserAccessToObject($user, array('projet'), $tmpproject->id, 'projet&project', '', '', 'rowid', '');
+			}
 		}
 		$original_file = $conf->projet->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."projet WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('project').")";
 	} elseif ($modulepart == 'project_task' && !empty($conf->projet->dir_output)) {
 		if ($fuser->rights->projet->{$lire} || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
+			// If we known $id of project, call checkUserAccessToObject to check permission on properties and contact of project
+			if ($refname && !preg_match('/^specimen/i', $original_file)) {
+				include_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
+				$tmptask = new Task($db);
+				$tmptask->fetch('', $refname);
+				$accessallowed = checkUserAccessToObject($user, array('projet_task'), $tmptask->id, 'projet&project', '', '', 'rowid', '');
+			}
 		}
 		$original_file = $conf->projet->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."projet WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('project').")";
diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index 06baefed88e..598802ea574 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -183,10 +183,11 @@ function dol_verifyHash($chain, $hash, $type = '0')
  *  @param  string	$dbt_keyfield   Field name for socid foreign key if not fk_soc. Not used if objectid is null (optional)
  *  @param  string	$dbt_select     Field name for select if not rowid. Not used if objectid is null (optional)
  *  @param	int		$isdraft		1=The object with id=$objectid is a draft
- * 	@return	int						Always 1, die process if not allowed
+ *  @param	int		$mode			Mode (0=default, 1=return with not die)
+ * 	@return	int						If mode = 0 (default): Always 1, die process if not allowed. If mode = 1: Return 0 if access not allowed.
  *  @see dol_check_secure_access_document(), checkUserAccessToObject()
  */
-function restrictedArea($user, $features, $objectid = 0, $tableandshare = '', $feature2 = '', $dbt_keyfield = 'fk_soc', $dbt_select = 'rowid', $isdraft = 0)
+function restrictedArea($user, $features, $objectid = 0, $tableandshare = '', $feature2 = '', $dbt_keyfield = 'fk_soc', $dbt_select = 'rowid', $isdraft = 0, $mode = 0)
 {
 	global $db, $conf;
 	global $hookmanager;
@@ -231,7 +232,11 @@ function restrictedArea($user, $features, $objectid = 0, $tableandshare = '', $f
 
 	if (isset($hookmanager->resArray['result'])) {
 		if ($hookmanager->resArray['result'] == 0) {
-			accessforbidden(); // Module returns 0, so access forbidden
+			if ($mode) {
+				return 0;
+			} else {
+				accessforbidden(); // Module returns 0, so access forbidden
+			}
 		}
 	}
 	if ($reshook > 0) {		// No other test done.
@@ -346,7 +351,11 @@ function restrictedArea($user, $features, $objectid = 0, $tableandshare = '', $f
 	}
 
 	if (!$readok) {
-		accessforbidden();
+		if ($mode) {
+			return 0;
+		} else {
+			accessforbidden();
+		}
 	}
 	//print "Read access is ok";
 
@@ -435,7 +444,11 @@ function restrictedArea($user, $features, $objectid = 0, $tableandshare = '', $f
 		}
 
 		if ($wemustcheckpermissionforcreate && !$createok) {
-			accessforbidden();
+			if ($mode) {
+				return 0;
+			} else {
+				accessforbidden();
+			}
 		}
 		//print "Write access is ok";
 	}
@@ -448,7 +461,11 @@ function restrictedArea($user, $features, $objectid = 0, $tableandshare = '', $f
 		}
 
 		if (!$createuserok) {
-			accessforbidden();
+			if ($mode) {
+				return 0;
+			} else {
+				accessforbidden();
+			}
 		}
 		//print "Create user access is ok";
 	}
@@ -523,26 +540,34 @@ function restrictedArea($user, $features, $objectid = 0, $tableandshare = '', $f
 		}
 
 		if (!$deleteok && !($isdraft && $createok)) {
-			accessforbidden();
+			if ($mode) {
+				return 0;
+			} else {
+				accessforbidden();
+			}
 		}
 		//print "Delete access is ok";
 	}
 
-	// If we have a particular object to check permissions on, we check this object
-	// is linked to a company allowed to $user.
+	// If we have a particular object to check permissions on, we check if $user has permission
+	// for this given object (link to company, is contact for project, ...)
 	if (!empty($objectid) && $objectid > 0) {
 		$ok = checkUserAccessToObject($user, $featuresarray, $objectid, $tableandshare, $feature2, $dbt_keyfield, $dbt_select, $parentfortableentity);
 		$params = array('objectid' => $objectid, 'features' => join(',', $featuresarray), 'features2' => $feature2);
 		//print 'checkUserAccessToObject ok='.$ok;
-		return $ok ? 1 : accessforbidden('', 1, 1, 0, $params);
+		if ($mode) {
+			return $ok ? 1 : 0;
+		} else {
+			return $ok ? 1 : accessforbidden('', 1, 1, 0, $params);
+		}
 	}
 
 	return 1;
 }
 
 /**
- * Check access by user to object.
- * This function is also called by restrictedArea that check before if module is enabled and permissions of user compared to $action.
+ * Check access by user to object is ok.
+ * This function is also called by restrictedArea that check before if module is enabled and if permission of user for $action is ok.
  *
  * @param User			$user					User to check
  * @param array			$featuresarray			Features/modules to check. Example: ('user','service','member','project','task',...)
@@ -555,7 +580,7 @@ function restrictedArea($user, $features, $objectid = 0, $tableandshare = '', $f
  * @return	bool								True if user has access, False otherwise
  * @see restrictedArea()
  */
-function checkUserAccessToObject($user, $featuresarray, $objectid = 0, $tableandshare = '', $feature2 = '', $dbt_keyfield = '', $dbt_select = 'rowid', $parenttableforentity = '')
+function checkUserAccessToObject($user, array $featuresarray, $objectid = 0, $tableandshare = '', $feature2 = '', $dbt_keyfield = '', $dbt_select = 'rowid', $parenttableforentity = '')
 {
 	global $db, $conf;
 
@@ -689,6 +714,7 @@ function checkUserAccessToObject($user, $featuresarray, $objectid = 0, $tableand
 				include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 				$projectstatic = new Project($db);
 				$tmps = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1, 0);
+
 				$tmparray = explode(',', $tmps);
 				if (!in_array($objectid, $tmparray)) {
 					return false;
diff --git a/htdocs/ecm/index_auto.php b/htdocs/ecm/index_auto.php
index bcfff8aa2da..d54dcf14d1e 100644
--- a/htdocs/ecm/index_auto.php
+++ b/htdocs/ecm/index_auto.php
@@ -440,15 +440,13 @@ if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i', $act
 				continue; // If condition to show is ok
 			}
 
-			$var = false;
-
 			print '<li class="directory collapsed">';
 			if (!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS)) {
-				print '<a class="fmdirlia jqft ecmjqft" href="'.$_SERVER["PHP_SELF"].'?module='.$val['module'].'">';
+				print '<a class="fmdirlia jqft ecmjqft" href="'.$_SERVER["PHP_SELF"].'?module='.urlencode($val['module']).'">';
 				print $val['label'];
 				print '</a>';
 			} else {
-				print '<a class="fmdirlia jqft ecmjqft" href="'.$_SERVER["PHP_SELF"].'?module='.$val['module'].'">';
+				print '<a class="fmdirlia jqft ecmjqft" href="'.$_SERVER["PHP_SELF"].'?module='.urlencode($val['module']).'">';
 				print $val['label'];
 				print '</a>';
 			}
@@ -456,7 +454,7 @@ if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i', $act
 			print '<div class="ecmjqft">';
 			// Info
 			$htmltooltip = '<b>'.$langs->trans("ECMSection").'</b>: '.$val['label'].'<br>';
-			$htmltooltip = '<b>'.$langs->trans("Type").'</b>: '.$langs->trans("ECMSectionAuto").'<br>';
+			$htmltooltip .= '<b>'.$langs->trans("Type").'</b>: '.$langs->trans("ECMSectionAuto").'<br>';
 			$htmltooltip .= '<b>'.$langs->trans("ECMCreationUser").'</b>: '.$langs->trans("ECMTypeAuto").'<br>';
 			$htmltooltip .= '<b>'.$langs->trans("Description").'</b>: '.$val['desc'];
 			print $form->textwithpicto('', $htmltooltip, 1, 'info');
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index be09b670d84..25ee6072a90 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -1645,6 +1645,7 @@ class ExpenseReport extends CommonObject
 	 *  Return clicable name (with picto eventually)
 	 *
 	 *	@param		int		$withpicto					0=No picto, 1=Include picto into link, 2=Only picto
+	 *  @param  	string 	$option                		Where point the link ('', 'document', ..)
 	 *	@param		int		$max						Max length of shown ref
 	 *	@param		int		$short						1=Return just URL
 	 *	@param		string	$moretitle					Add more text to title tooltip
@@ -1652,7 +1653,7 @@ class ExpenseReport extends CommonObject
 	 *  @param  	int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
 	 *	@return		string								String with URL
 	 */
-	public function getNomUrl($withpicto = 0, $max = 0, $short = 0, $moretitle = '', $notooltip = 0, $save_lastsearch_value = -1)
+	public function getNomUrl($withpicto = 0, $option = '', $max = 0, $short = 0, $moretitle = '', $notooltip = 0, $save_lastsearch_value = -1)
 	{
 		global $langs, $conf;
 
@@ -1684,17 +1685,16 @@ class ExpenseReport extends CommonObject
 			$label .= ' - '.$moretitle;
 		}
 
-		//if ($option != 'nolink')
-		//{
-		// Add param to save lastsearch_values or not
+		if ($option != 'nolink') {
+			// Add param to save lastsearch_values or not
 			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-		if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {
-			$add_save_lastsearch_values = 1;
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {
+				$add_save_lastsearch_values = 1;
+			}
+			if ($add_save_lastsearch_values) {
+				$url .= '&save_lastsearch_values=1';
+			}
 		}
-		if ($add_save_lastsearch_values) {
-			$url .= '&save_lastsearch_values=1';
-		}
-		//}
 
 		$ref = $this->ref;
 		if (empty($ref)) {
@@ -1720,7 +1720,7 @@ class ExpenseReport extends CommonObject
 			$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 .= ($max ? dol_trunc($ref, $max) : $ref);
 		}
 		$result .= $linkend;
 
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index 0b8e21f5afd..3206953c791 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -274,7 +274,8 @@ class Task extends CommonObject
 		}
 		$sql .= " WHERE ";
 		if (!empty($ref)) {
-			$sql .= "t.ref = '".$this->db->escape($ref)."'";
+			$sql .= "entity IN (".getEntity('project').")";
+			$sql .= " AND t.ref = '".$this->db->escape($ref)."'";
 		} else {
 			$sql .= "t.rowid = ".((int) $id);
 		}

From 2fdd8486c948029a6ed25477e5f29b04761624cb Mon Sep 17 00:00:00 2001
From: TuxGasy <garcia@soamichel.fr>
Date: Sat, 22 May 2021 06:13:16 +0200
Subject: [PATCH 0204/1497] No try to translate label field in dictionary for
 new

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

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index c9ada83ed15..2bd55c6c66a 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -2015,7 +2015,7 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 			print '<td class="'.$classtd.'">';
 			$transfound = 0;
 			$transkey = '';
-			if (in_array($fieldlist[$field], array('label', 'libelle')))		// For label
+			if (in_array($fieldlist[$field], array('label', 'libelle')) and !empty($obj->code))		// For label
 			{
 				// Special case for labels
 				if ($tabname == MAIN_DB_PREFIX.'c_civility') {

From 89f150dd950089042499c3f529446c3b1535da63 Mon Sep 17 00:00:00 2001
From: gmilad <61253440+gmilad@users.noreply.github.com>
Date: Sat, 22 May 2021 21:28:45 +0200
Subject: [PATCH 0205/1497] Fix #16100 Update utils.class.php

Fix #16100
End French Forum :

https://www.dolibarr.fr/forum/t/erreur-sauvegarde-dump-base-de-donnees/35009/7
---
 htdocs/core/class/utils.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/class/utils.class.php b/htdocs/core/class/utils.class.php
index bd0dec24495..da116191bbb 100644
--- a/htdocs/core/class/utils.class.php
+++ b/htdocs/core/class/utils.class.php
@@ -287,7 +287,7 @@ class Utils
 			{
 				$param .= " -d"; // No row information (no data)
 			}
-			$param .= " --default-character-set=utf8"; // We always save output into utf8 charset
+			$param .= " --default-character-set=utf8 --no-tablespaces"; // We always save output into utf8 charset
 			$paramcrypted = $param;
 			$paramclear = $param;
 			if (!empty($dolibarr_main_db_pass))

From 83245d321b5fba8809498a46713cae9786b9f941 Mon Sep 17 00:00:00 2001
From: "jove@bisquerra.com" <jove@bisquerra.com>
Date: Sun, 23 May 2021 09:55:01 +0200
Subject: [PATCH 0206/1497] FIX Search bug when hide product images

---
 htdocs/takepos/index.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index 1f9e6c32b2b..26a62e36d6e 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -289,6 +289,8 @@ function LoadProducts(position, issubcat) {
 		if (currentcat==val.fk_parent) {
 			$("#prodivdesc"+ishow).show();
 			$("#prodesc"+ishow).text(val.label);
+			$("#probutton"+ishow).text(val.label);
+			$("#probutton"+ishow).show();
 			$("#proprice"+ishow).attr("class", "hidden");
 			$("#proprice"+ishow).html("");
 			$("#proimg"+ishow).attr("src","genimg/index.php?query=cat&id="+val.rowid);
@@ -386,6 +388,8 @@ function MoreProducts(moreorless) {
 			if (typeof (data[idata]) == "undefined") {
 				$("#prodivdesc"+ishow).hide();
 				$("#prodesc"+ishow).text("");
+				$("#probutton"+ishow).text("");
+				$("#probutton"+ishow).hide();
 				$("#proprice"+ishow).attr("class", "");
 				$("#proprice"+ishow).html("");
 				$("#proimg"+ishow).attr("src","genimg/empty.png");
@@ -396,6 +400,8 @@ function MoreProducts(moreorless) {
 				//Only show products with status=1 (for sell)
 				$("#prodivdesc"+ishow).show();
 				$("#prodesc"+ishow).text(data[parseInt(idata)]['label']);
+				$("#probutton"+ishow).text(data[parseInt(idata)]['label']);
+				$("#probutton"+ishow).show();
 				if (data[parseInt(idata)]['price_formated']) {
 					$("#proprice"+ishow).attr("class", "productprice");
 					$("#proprice"+ishow).html(data[parseInt(idata)]['price_formated']);
@@ -544,6 +550,8 @@ function Search2(keyCodeForEnter) {
 			for (i = 0; i < <?php echo $MAXPRODUCT ?>; i++) {
 				if (typeof (data[i]) == "undefined") {
 					$("#prodesc" + i).text("");
+					$("#probutton" + i).text("");
+					$("#probutton" + i).hide();
 					$("#proprice" + i).attr("class", "hidden");
 					$("#proprice" + i).html("");
 					$("#proimg" + i).attr("src", "genimg/empty.png");
@@ -557,6 +565,8 @@ function Search2(keyCodeForEnter) {
 				var titlestring = <?php echo $titlestring; ?>;
 				$("#prodesc" + i).text(data[i]['label']);
 				$("#prodivdesc" + i).show();
+				$("#probutton" + i).text(data[i]['label']);
+				$("#probutton" + i).show();;
 				if (data[i]['price_formated']) {
 					$("#proprice" + i).attr("class", "productprice");
 					$("#proprice" + i).html(data[i]['price_formated']);

From f81136231a2250e1f4767f1c0285848b8cbc73bf Mon Sep 17 00:00:00 2001
From: r3dge <regis.harpocrate@gmail.com>
Date: Sun, 23 May 2021 18:09:10 +0200
Subject: [PATCH 0207/1497] fixing PUT request for donation update

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

diff --git a/htdocs/don/class/api_donations.class.php b/htdocs/don/class/api_donations.class.php
index 5f70ee82a2e..1a17f6ff94c 100644
--- a/htdocs/don/class/api_donations.class.php
+++ b/htdocs/don/class/api_donations.class.php
@@ -302,7 +302,7 @@ class Donations extends DolibarrApi
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-		$result = $this->don->valid(DolibarrApiAccess::$user, $idwarehouse, $notrigger);
+		$result = $this->don->valid_promesse($id, DolibarrApiAccess::$user->id, $notrigger);
 		if ($result == 0) {
 			throw new RestException(304, 'Error nothing done. May be object is already validated');
 		}

From 647997af2815c04111ea4e1831230e28f7a34364 Mon Sep 17 00:00:00 2001
From: r3dge <regis.harpocrate@gmail.com>
Date: Sun, 23 May 2021 18:15:00 +0200
Subject: [PATCH 0208/1497] fixing error on date

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

diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php
index 0717870ac42..9396f3a718a 100644
--- a/htdocs/don/class/don.class.php
+++ b/htdocs/don/class/don.class.php
@@ -390,7 +390,7 @@ class Don extends CommonObject
 		$sql .= ", phone";
 		$sql .= ", phone_mobile";
 		$sql .= ") VALUES (";
-		$sql .= "'".$this->db->idate($now)."'";
+		$sql .= "'".$this->db->idate($this->date)."'";
 		$sql .= ", ".$conf->entity;
 		$sql .= ", ".price2num($this->amount);
 		$sql .= ", ".($this->modepaymentid ? $this->modepaymentid : "null");

From 7d223beae53e05c5b671f745110ffdd231779b36 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Mon, 24 May 2021 12:51:58 +0200
Subject: [PATCH 0209/1497] fix: export balance with doublequote

---
 htdocs/accountancy/bookkeeping/balance.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index 6c15fd6615c..664f659fb46 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -158,11 +158,11 @@ if ($action == 'export_csv')
 
 	foreach ($object->lines as $line)
 	{
-		print length_accountg($line->numero_compte).$sep;
-		print $object->get_compte_desc($line->numero_compte).$sep;
-		print price($line->debit).$sep;
-		print price($line->credit).$sep;
-		print price($line->debit - $line->credit).$sep;
+		print '"'.length_accountg($line->numero_compte).'"'.$sep;
+		print '"'.$object->get_compte_desc($line->numero_compte).'"'.$sep;
+		print '"'.price($line->debit).'"'.$sep;
+		print '"'.price($line->credit).'"'.$sep;
+		print '"'.price($line->debit - $line->credit).'"'.$sep;
 		print "\n";
 	}
 

From 60176f7f5ed78b0e43a2240cb286722280c1bde7 Mon Sep 17 00:00:00 2001
From: piernov <piernov@piernov.org>
Date: Mon, 24 May 2021 18:01:27 +0200
Subject: [PATCH 0210/1497] Fix add/del user to group modifies LDAP group

Adding or removing a user from a group modifies the user object on Dolibarr's side.
In LDAP however, members of a group are stored in the group itself.
Therefore group must be updated after adding/removing a user from it.
Update group in LDAP with new list of users at the end of USER_MODIFY trigger.
---
 ...interface_50_modLdap_Ldapsynchro.class.php | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
index d0b91bcbe37..d92f4c3ecc4 100644
--- a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
+++ b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
@@ -126,6 +126,52 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 					$newparent = $object->_load_ldap_dn($info, 1);
 
 					$result = $ldap->update($dn, $info, $user, $olddn, $newrdn, $newparent);
+
+					if ($result > 0 && !empty($object->context['newgroupid'])) {      // We are in context of adding a new group to user
+						$usergroup = new Usergroup($this->db);
+
+						$usergroup->fetch($object->context['newgroupid']);
+
+						$oldinfo = $usergroup->_load_ldap_info();
+						$olddn = $usergroup->_load_ldap_dn($oldinfo);
+
+						// Verify if entry exist
+						$container = $usergroup->_load_ldap_dn($oldinfo, 1);
+						$search = "(".$usergroup->_load_ldap_dn($oldinfo, 2).")";
+						$records = $ldap->search($container, $search);
+						if (count($records) && $records['count'] == 0)
+						{
+							$olddn = '';
+						}
+
+						$info = $usergroup->_load_ldap_info(); // Contains all members, included the new one (insert already done before trigger call)
+						$dn = $usergroup->_load_ldap_dn($info);
+
+						$result = $ldap->update($dn, $info, $user, $olddn);
+					}
+
+					if ($result > 0 && !empty($object->context['oldgroupid'])) {      // We are in context of removing a group from user
+						$usergroup = new Usergroup($this->db);
+
+						$usergroup->fetch($object->context['oldgroupid']);
+
+						$oldinfo = $usergroup->_load_ldap_info();
+						$olddn = $usergroup->_load_ldap_dn($oldinfo);
+
+						// Verify if entry exist
+						$container = $usergroup->_load_ldap_dn($oldinfo, 1);
+						$search = "(".$usergroup->_load_ldap_dn($oldinfo, 2).")";
+						$records = $ldap->search($container, $search);
+						if (count($records) && $records['count'] == 0)
+						{
+							$olddn = '';
+						}
+
+						$info = $usergroup->_load_ldap_info(); // Contains all members, except the old one (remove already done before trigger call)
+						$dn = $usergroup->_load_ldap_dn($info);
+
+						$result = $ldap->update($dn, $info, $user, $olddn);
+					}
 				}
 
 				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;

From cdf3b7f9a8cb92e725b5bca83d981907dd9e73e9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 24 May 2021 19:05:25 +0200
Subject: [PATCH 0211/1497] Fix responsive

---
 htdocs/adherents/admin/member.php  | 6 ++++++
 htdocs/adherents/admin/website.php | 4 +++-
 htdocs/admin/reception_setup.php   | 8 +++++++-
 htdocs/admin/resource.php          | 2 ++
 htdocs/admin/user.php              | 7 ++++++-
 htdocs/core/lib/admin.lib.php      | 2 ++
 htdocs/theme/eldy/global.inc.php   | 3 +++
 htdocs/theme/md/style.css.php      | 3 +++
 htdocs/user/list.php               | 2 +-
 9 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/htdocs/adherents/admin/member.php b/htdocs/adherents/admin/member.php
index 925f2c9094d..621873afc94 100644
--- a/htdocs/adherents/admin/member.php
+++ b/htdocs/adherents/admin/member.php
@@ -197,6 +197,8 @@ print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="updateall">';
 
 print load_fiche_titre($langs->trans("MemberMainOptions"), '', '');
+
+print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Description").'</td>';
@@ -268,6 +270,7 @@ if ($conf->facture->enabled) {
 }
 
 print '</table>';
+print '</div>';
 
 print '<div class="center">';
 print '<input type="submit" class="button" value="'.$langs->trans("Update").'" name="Button">';
@@ -338,6 +341,7 @@ if ($resql) {
 
 print load_fiche_titre($langs->trans("MembersDocModules"), '', '');
 
+print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Name").'</td>';
@@ -446,6 +450,8 @@ foreach ($dirmodels as $reldir) {
 }
 
 print '</table>';
+print '</div>';
+
 print "<br>";
 
 print dol_get_fiche_end();
diff --git a/htdocs/adherents/admin/website.php b/htdocs/adherents/admin/website.php
index 06796ef193c..bb320e9f48a 100644
--- a/htdocs/adherents/admin/website.php
+++ b/htdocs/adherents/admin/website.php
@@ -172,6 +172,7 @@ print '<br>';
 if (!empty($conf->global->MEMBER_ENABLE_PUBLIC)) {
 	print '<br>';
 
+	print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder centpercent">';
 
 	print '<tr class="liste_titre">';
@@ -234,6 +235,7 @@ if (!empty($conf->global->MEMBER_ENABLE_PUBLIC)) {
 	print "</td></tr>\n";
 
 	print '</table>';
+	print '</div>';
 
 	print '<div class="center">';
 	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
@@ -262,7 +264,7 @@ if (!empty($conf->global->MEMBER_ENABLE_PUBLIC)) {
 	//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
 
 	print '<div class="urllink">';
-	print '<input type="text" id="publicurlmember" class="quatrevingtpercent" value="'.$urlwithroot.'/public/members/new.php'.$entity_qr.'">';
+	print '<input type="text" id="publicurlmember" class="quatrevingtpercentminusx" value="'.$urlwithroot.'/public/members/new.php'.$entity_qr.'">';
 	print '<a target="_blank" href="'.$urlwithroot.'/public/members/new.php'.$entity_qr.'">'.img_picto('', 'globe', 'class="paddingleft"').'</a>';
 	print '</div>';
 	print ajax_autoselect('publicurlmember');
diff --git a/htdocs/admin/reception_setup.php b/htdocs/admin/reception_setup.php
index 6ea6d195040..7cc9ae3e3be 100644
--- a/htdocs/admin/reception_setup.php
+++ b/htdocs/admin/reception_setup.php
@@ -178,6 +178,7 @@ print dol_get_fiche_head($head, 'reception', $langs->trans("Receptions"), -1, 'r
 
 print load_fiche_titre($langs->trans("ReceptionsNumberingModules"));
 
+print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td width="100">'.$langs->trans("Name").'</td>';
@@ -272,8 +273,10 @@ foreach ($dirmodels as $reldir) {
 	}
 }
 
-print '</table><br>';
+print '</table>';
+print '</div>';
 
+print '<br>';
 
 /*
  *  Documents models for Receptions Receipt
@@ -302,6 +305,7 @@ if ($resql) {
 	dol_print_error($db);
 }
 
+print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td width="140">'.$langs->trans("Name").'</td>';
@@ -417,6 +421,8 @@ foreach ($dirmodels as $reldir) {
 }
 
 print '</table>';
+print '</div>';
+
 print '<br>';
 
 
diff --git a/htdocs/admin/resource.php b/htdocs/admin/resource.php
index b8bb566c79b..06ae59d64a3 100644
--- a/htdocs/admin/resource.php
+++ b/htdocs/admin/resource.php
@@ -74,6 +74,7 @@ print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="updateoptions">';
 
+print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Parameters").'</td>'."\n";
@@ -132,6 +133,7 @@ print '<td></td>';
 print '</tr>';
 
 print '</table>';
+print '</div>';
 
 print '</form>';
 
diff --git a/htdocs/admin/user.php b/htdocs/admin/user.php
index 0dccf65e5e7..83649d46a28 100644
--- a/htdocs/admin/user.php
+++ b/htdocs/admin/user.php
@@ -126,6 +126,7 @@ $head = user_admin_prepare_head();
 
 print dol_get_fiche_head($head, 'card', $langs->trans("MenuUsersAndGroups"), -1, 'user');
 
+print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Parameter").'</td>';
@@ -171,6 +172,7 @@ if ($conf->use_javascript_ajax) {
 print '</td></tr>';
 
 print '</table>';
+print '</div>';
 
 print '<br>';
 
@@ -197,6 +199,7 @@ if ($resql) {
 
 print load_fiche_titre($langs->trans("UsersDocModules"), '', '');
 
+print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Name").'</td>';
@@ -306,7 +309,9 @@ foreach ($dirmodels as $reldir) {
 }
 
 print '</table>';
-print "<br>";
+print '</div>';
+
+print '<br>';
 
 print dol_get_fiche_end();
 
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index 303382f285b..ae260171a0b 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -1545,6 +1545,7 @@ function form_constantes($tableau, $strictw3c = 0, $helptext = '')
 		print '<input type="hidden" name="action" value="updateall">';
 	}
 
+	print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
 	print '<td class="">'.$langs->trans("Description").'</td>';
@@ -1715,6 +1716,7 @@ function form_constantes($tableau, $strictw3c = 0, $helptext = '')
 		}
 	}
 	print '</table>';
+	print '</div>';
 
 	if (!empty($strictw3c) && $strictw3c == 1) {
 		print '<div align="center"><input type="submit" class="button" value="'.$langs->trans("Update").'" name="update"></div>';
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 6c705c62489..4468c36a7da 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -633,6 +633,9 @@ th .button {
 .quatrevingtquinzepercent {
 	width: 95%;
 }
+.quatrevingtpercentminusx {
+	width: calc(80% - 52px);
+}
 textarea.centpercent {
 	width: 96%;
 }
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 407a38ea320..f1fb649f4af 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -780,6 +780,9 @@ th .button {
 textarea.centpercent {
 	width: 96%;
 }
+.quatrevingtpercentminusx {
+	width: calc(80% - 52px);
+}
 .small, small {
 	font-size: 85%;
 }
diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index d5df7ced259..693590ff7d2 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -188,7 +188,7 @@ if ($mode == 'employee') {
 		accessforbidden();
 	}
 } else {
-	if (!$user->rights->user->user->lire && !$user->admin) {
+	if (empty($user->rights->user->user->lire) && empty($user->admin)) {
 		accessforbidden();
 	}
 }

From d4310f49c4237fb7453b97473f01a59147bfa310 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 24 May 2021 19:46:19 +0200
Subject: [PATCH 0212/1497] FIX CWE-79 - huntr - Fix option
 MAIN_ALLOW_SVG_FILES_AS_IMAGES

---
 htdocs/admin/system/security.php      | 20 ++++---
 htdocs/core/class/html.form.class.php | 80 +++++++++++++++------------
 2 files changed, 57 insertions(+), 43 deletions(-)

diff --git a/htdocs/admin/system/security.php b/htdocs/admin/system/security.php
index a4060634ff9..7f258f8f30e 100644
--- a/htdocs/admin/system/security.php
+++ b/htdocs/admin/system/security.php
@@ -217,7 +217,7 @@ print '<br>';
 
 print '<strong>$dolibarr_nocsrfcheck</strong>: '.$dolibarr_nocsrfcheck;
 if (!empty($dolibarr_nocsrfcheck)) {
-	print img_picto('', 'warning').' &nbsp;  '.$langs->trans("IfYouAreOnAProductionSetThis", 0);
+	print ' &nbsp; '.img_picto('', 'warning').' '.$langs->trans("IfYouAreOnAProductionSetThis", 0);
 }
 print '<br>';
 
@@ -234,16 +234,18 @@ print '<br>';
 print '<br>';
 print '<br>';
 print '<br>';
-print load_fiche_titre($langs->trans("Menu").' '.$langs->trans("SecuritySetup"), '', 'folder');
+print load_fiche_titre($langs->trans("Menu").' '.$langs->trans("SecuritySetup").' + '.$langs->trans("OtherSetup"), '', 'folder');
 
 //print '<strong>'.$langs->trans("PasswordEncryption").'</strong>: ';
 print '<strong>MAIN_SECURITY_HASH_ALGO</strong> = '.(empty($conf->global->MAIN_SECURITY_HASH_ALGO) ? '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>' : $conf->global->MAIN_SECURITY_HASH_ALGO)." &nbsp; ";
 if (empty($conf->global->MAIN_SECURITY_HASH_ALGO)) {
 	print '<span class="opacitymedium"> &nbsp; &nbsp; If unset: \'md5\'</span>';
 }
-print '<br>';
 if ($conf->global->MAIN_SECURITY_HASH_ALGO != 'password_hash') {
-	print '<strong>MAIN_SECURITY_SALT</strong> = '.(empty($conf->global->MAIN_SECURITY_SALT) ? '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>' : $conf->global->MAIN_SECURITY_SALT).'<br>';
+	print '<br><strong>MAIN_SECURITY_SALT</strong> = '.(empty($conf->global->MAIN_SECURITY_SALT) ? '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>' : $conf->global->MAIN_SECURITY_SALT).'<br>';
+} else {
+	print '<span class="opacitymedium">('.$langs->trans("Recommanded").': password_hash)</span>';
+	print '<br>';
 }
 if ($conf->global->MAIN_SECURITY_HASH_ALGO != 'password_hash') {
 	print '<div class="info">The recommanded value for MAIN_SECURITY_HASH_ALGO is now \'password_hash\' but setting it now will make ALL existing passwords of all users not valid, so update is not possible.<br>';
@@ -259,18 +261,20 @@ print '<br>';
 print '<strong>MAIN_SECURITY_ANTI_SSRF_SERVER_IP</strong> = '.(empty($conf->global->MAIN_SECURITY_ANTI_SSRF_SERVER_IP) ? '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>' : $conf->global->MAIN_SECURITY_ANTI_SSRF_SERVER_IP)."<br>";
 print '<br>';
 
+print '<strong>MAIN_ALLOW_SVG_FILES_AS_IMAGES</strong> = '.(empty($conf->global->MAIN_ALLOW_SVG_FILES_AS_IMAGES) ? '0 &nbsp; <span class="opacitymedium">('.$langs->trans("Recommanded").': 0)</span>' : $conf->global->MAIN_ALLOW_SVG_FILES_AS_IMAGES)."<br>";
+print '<br>';
 
 print '<strong>MAIN_EXEC_USE_POPEN</strong> = ';
 if (empty($conf->global->MAIN_EXEC_USE_POPEN)) {
-	print '<span class="opacitymedium">'.$langs->trans("Undefined").'</span> &nbsp; ';
+	print '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>';
 } else {
-	print $conf->global->MAIN_EXEC_USE_POPEN.' &nbsp; ';
+	print $conf->global->MAIN_EXEC_USE_POPEN;
 }
 if ($execmethod == 1) {
-	print ' --> "exec" PHP method will be used for shell commands.';
+	print ' &nbsp; <span class="opacitymedium">("exec" PHP method will be used for shell commands)</span>';
 }
 if ($execmethod == 2) {
-	print ' --> "popen" PHP method will be used for shell commands.';
+	print ' &nbsp; <span class="opacitymedium">("popen" PHP method will be used for shell commands)</span>';
 }
 print "<br>";
 print '<br>';
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 57bbbe3a029..ea9692f2864 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -8193,41 +8193,47 @@ class Form
 		if ($modulepart == 'societe') {
 			$dir = $conf->societe->multidir_output[$entity];
 			if (!empty($object->logo)) {
-				if ((string) $imagesize == 'mini') {
-					$file = get_exdir(0, 0, 0, 0, $object, 'thirdparty').'logos/'.getImageFileNameForSize($object->logo, '_mini'); // getImageFileNameForSize include the thumbs
-				} elseif ((string) $imagesize == 'small') {
-					$file = get_exdir(0, 0, 0, 0, $object, 'thirdparty').'logos/'.getImageFileNameForSize($object->logo, '_small');
-				} else {
-					$file = get_exdir(0, 0, 0, 0, $object, 'thirdparty').'logos/'.$object->logo;
+				if (dolIsAllowedForPreview($object->logo)) {
+					if ((string) $imagesize == 'mini') {
+						$file = get_exdir(0, 0, 0, 0, $object, 'thirdparty').'logos/'.getImageFileNameForSize($object->logo, '_mini'); // getImageFileNameForSize include the thumbs
+					} elseif ((string) $imagesize == 'small') {
+						$file = get_exdir(0, 0, 0, 0, $object, 'thirdparty').'logos/'.getImageFileNameForSize($object->logo, '_small');
+					} else {
+						$file = get_exdir(0, 0, 0, 0, $object, 'thirdparty').'logos/'.$object->logo;
+					}
+					$originalfile = get_exdir(0, 0, 0, 0, $object, 'thirdparty').'logos/'.$object->logo;
 				}
-				$originalfile = get_exdir(0, 0, 0, 0, $object, 'thirdparty').'logos/'.$object->logo;
 			}
 			$email = $object->email;
 		} elseif ($modulepart == 'contact')	{
 			$dir = $conf->societe->multidir_output[$entity].'/contact';
 			if (!empty($object->photo)) {
-				if ((string) $imagesize == 'mini') {
-					$file = get_exdir(0, 0, 0, 0, $object, 'contact').'photos/'.getImageFileNameForSize($object->photo, '_mini');
-				} elseif ((string) $imagesize == 'small') {
-					$file = get_exdir(0, 0, 0, 0, $object, 'contact').'photos/'.getImageFileNameForSize($object->photo, '_small');
-				} else {
-					$file = get_exdir(0, 0, 0, 0, $object, 'contact').'photos/'.$object->photo;
+				if (dolIsAllowedForPreview($object->logo)) {
+					if ((string) $imagesize == 'mini') {
+						$file = get_exdir(0, 0, 0, 0, $object, 'contact').'photos/'.getImageFileNameForSize($object->photo, '_mini');
+					} elseif ((string) $imagesize == 'small') {
+						$file = get_exdir(0, 0, 0, 0, $object, 'contact').'photos/'.getImageFileNameForSize($object->photo, '_small');
+					} else {
+						$file = get_exdir(0, 0, 0, 0, $object, 'contact').'photos/'.$object->photo;
+					}
+					$originalfile = get_exdir(0, 0, 0, 0, $object, 'contact').'photos/'.$object->photo;
 				}
-				$originalfile = get_exdir(0, 0, 0, 0, $object, 'contact').'photos/'.$object->photo;
 			}
 			$email = $object->email;
 			$capture = 'user';
 		} elseif ($modulepart == 'userphoto') {
 			$dir = $conf->user->dir_output;
 			if (!empty($object->photo)) {
-				if ((string) $imagesize == 'mini') {
-					$file = get_exdir(0, 0, 0, 0, $object, 'user').getImageFileNameForSize($object->photo, '_mini');
-				} elseif ((string) $imagesize == 'small') {
-					$file = get_exdir(0, 0, 0, 0, $object, 'user').getImageFileNameForSize($object->photo, '_small');
-				} else {
-					$file = get_exdir(0, 0, 0, 0, $object, 'user').$object->photo;
+				if (dolIsAllowedForPreview($object->logo)) {
+					if ((string) $imagesize == 'mini') {
+						$file = get_exdir(0, 0, 0, 0, $object, 'user').getImageFileNameForSize($object->photo, '_mini');
+					} elseif ((string) $imagesize == 'small') {
+						$file = get_exdir(0, 0, 0, 0, $object, 'user').getImageFileNameForSize($object->photo, '_small');
+					} else {
+						$file = get_exdir(0, 0, 0, 0, $object, 'user').$object->photo;
+					}
+					$originalfile = get_exdir(0, 0, 0, 0, $object, 'user').$object->photo;
 				}
-				$originalfile = get_exdir(0, 0, 0, 0, $object, 'user').$object->photo;
 			}
 			if (!empty($conf->global->MAIN_OLD_IMAGE_LINKS)) {
 				$altfile = $object->id.".jpg"; // For backward compatibility
@@ -8237,14 +8243,16 @@ class Form
 		} elseif ($modulepart == 'memberphoto')	{
 			$dir = $conf->adherent->dir_output;
 			if (!empty($object->photo)) {
-				if ((string) $imagesize == 'mini') {
-					$file = get_exdir(0, 0, 0, 0, $object, 'member').'photos/'.getImageFileNameForSize($object->photo, '_mini');
-				} elseif ((string) $imagesize == 'small') {
-					$file = get_exdir(0, 0, 0, 0, $object, 'member').'photos/'.getImageFileNameForSize($object->photo, '_small');
-				} else {
-					$file = get_exdir(0, 0, 0, 0, $object, 'member').'photos/'.$object->photo;
+				if (dolIsAllowedForPreview($object->logo)) {
+					if ((string) $imagesize == 'mini') {
+						$file = get_exdir(0, 0, 0, 0, $object, 'member').'photos/'.getImageFileNameForSize($object->photo, '_mini');
+					} elseif ((string) $imagesize == 'small') {
+						$file = get_exdir(0, 0, 0, 0, $object, 'member').'photos/'.getImageFileNameForSize($object->photo, '_small');
+					} else {
+						$file = get_exdir(0, 0, 0, 0, $object, 'member').'photos/'.$object->photo;
+					}
+					$originalfile = get_exdir(0, 0, 0, 0, $object, 'member').'photos/'.$object->photo;
 				}
-				$originalfile = get_exdir(0, 0, 0, 0, $object, 'member').'photos/'.$object->photo;
 			}
 			if (!empty($conf->global->MAIN_OLD_IMAGE_LINKS)) {
 				$altfile = $object->id.".jpg"; // For backward compatibility
@@ -8255,14 +8263,16 @@ class Form
 			// Generic case to show photos
 			$dir = $conf->$modulepart->dir_output;
 			if (!empty($object->photo)) {
-				if ((string) $imagesize == 'mini') {
-					$file = get_exdir($id, 2, 0, 0, $object, $modulepart).'photos/'.getImageFileNameForSize($object->photo, '_mini');
-				} elseif ((string) $imagesize == 'small') {
-					$file = get_exdir($id, 2, 0, 0, $object, $modulepart).'photos/'.getImageFileNameForSize($object->photo, '_small');
-				} else {
-					$file = get_exdir($id, 2, 0, 0, $object, $modulepart).'photos/'.$object->photo;
+				if (dolIsAllowedForPreview($object->logo)) {
+					if ((string) $imagesize == 'mini') {
+						$file = get_exdir($id, 2, 0, 0, $object, $modulepart).'photos/'.getImageFileNameForSize($object->photo, '_mini');
+					} elseif ((string) $imagesize == 'small') {
+						$file = get_exdir($id, 2, 0, 0, $object, $modulepart).'photos/'.getImageFileNameForSize($object->photo, '_small');
+					} else {
+						$file = get_exdir($id, 2, 0, 0, $object, $modulepart).'photos/'.$object->photo;
+					}
+					$originalfile = get_exdir($id, 2, 0, 0, $object, $modulepart).'photos/'.$object->photo;
 				}
-				$originalfile = get_exdir($id, 2, 0, 0, $object, $modulepart).'photos/'.$object->photo;
 			}
 			if (!empty($conf->global->MAIN_OLD_IMAGE_LINKS)) {
 				$altfile = $object->id.".jpg"; // For backward compatibility

From 31af74f852f4db4fcc3e6cf46ebb346ea3e2979a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 24 May 2021 20:04:23 +0200
Subject: [PATCH 0213/1497] FIX CWE-269 - huntr - Can download files of an
 agenda event

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

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 90796f402d4..7e34eec5ecd 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -2447,6 +2447,16 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		// Wrapping for events
 		if ($fuser->rights->agenda->myactions->{$read}) {
 			$accessallowed = 1;
+			// If we known $id of project, call checkUserAccessToObject to check permission on the given agenda event on properties and assigned users
+			if ($refname && !preg_match('/^specimen/i', $original_file)) {
+				include_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
+				$tmpobject = new ActionComm($db);
+				$tmpobject->fetch((int) $refname);
+				$accessallowed = checkUserAccessToObject($user, array('agenda'), $tmpobject->id, 'actioncomm&societe', 'myactions|allactions', 'fk_soc', 'id', '');
+				if ($user->socid && $tmpobject->socid) {
+					$accessallowed = checkUserAccessToObject($user, array('societe'), $tmpobject->socid);
+				}
+			}
 		}
 		$original_file = $conf->agenda->dir_output.'/'.$original_file;
 	} elseif ($modulepart == 'category' && !empty($conf->categorie->multidir_output[$entity])) {

From bb64a25638cdba35bba39b8cf44677529ca403b1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 24 May 2021 22:11:24 +0200
Subject: [PATCH 0214/1497] Fix CWE-269 - huntr - Fix set of email without edit
 user permission

---
 htdocs/core/class/ldap.class.php |  2 +-
 htdocs/user/bank.php             | 82 +++++++++++++++++---------------
 htdocs/user/card.php             |  4 +-
 3 files changed, 47 insertions(+), 41 deletions(-)

diff --git a/htdocs/core/class/ldap.class.php b/htdocs/core/class/ldap.class.php
index 0f97ed878cf..a578f08f3c1 100644
--- a/htdocs/core/class/ldap.class.php
+++ b/htdocs/core/class/ldap.class.php
@@ -932,7 +932,7 @@ class Ldap
 	 * 	Returns an array containing a details or list of LDAP record(s)
 	 * 	ldapsearch -LLLx -hlocalhost -Dcn=admin,dc=parinux,dc=org -w password -b "ou=adherents,ou=people,dc=parinux,dc=org" userPassword
 	 *
-	 *	@param	string	$search			 	Value of fiel to search, '*' for all. Not used if $activefilter is set.
+	 *	@param	string	$search			 	Value of field to search, '*' for all. Not used if $activefilter is set.
 	 *	@param	string	$userDn			 	DN (Ex: ou=adherents,ou=people,dc=parinux,dc=org)
 	 *	@param	string	$useridentifier 	Name of key field (Ex: uid)
 	 *	@param	array	$attributeArray 	Array of fields required. Note this array must also contains field $useridentifier (Ex: sn,userPassword)
diff --git a/htdocs/user/bank.php b/htdocs/user/bank.php
index 356e23a5de0..0b179653487 100644
--- a/htdocs/user/bank.php
+++ b/htdocs/user/bank.php
@@ -59,6 +59,29 @@ if ($user->socid > 0) {
 	$socid = $user->socid;
 }
 $feature2 = (($socid && $user->rights->user->self->creer) ? '' : 'user');
+
+$object = new User($db);
+if ($id > 0 || !empty($ref)) {
+	$result = $object->fetch($id, $ref, '', 1);
+	$object->getrights();
+}
+
+$account = new UserBankAccount($db);
+if (!$bankid) {
+	$account->fetch(0, '', $id);
+} else {
+	$account->fetch($bankid);
+}
+if (empty($account->userid)) {
+	$account->userid = $object->id;
+}
+
+
+// Define value to know what current user can do on users
+$canadduser = (!empty($user->admin) || $user->rights->user->user->creer);
+$canreaduser = (!empty($user->admin) || $user->rights->user->user->lire);
+$permissiontoaddbankaccount = (!empty($user->rights->salaries->write) || !empty($user->rights->hrm->employee->write) || !empty($user->rights->user->creer));
+
 // Ok if user->rights->salaries->read or user->rights->hrm->read
 //$result = restrictedArea($user, 'salaries|hrm', $id, 'user&user', $feature2);
 $ok = false;
@@ -78,30 +101,12 @@ if (!$ok) {
 	accessforbidden();
 }
 
-$object = new User($db);
-if ($id > 0 || !empty($ref)) {
-	$result = $object->fetch($id, $ref, '', 1);
-	$object->getrights();
-}
-
-$account = new UserBankAccount($db);
-if (!$bankid) {
-	$account->fetch(0, '', $id);
-} else {
-	$account->fetch($bankid);
-}
-if (empty($account->userid)) {
-	$account->userid = $object->id;
-}
-
-$permissiontoaddbankaccount = (!empty($user->rights->salaries->write) || !empty($user->rights->hrm->employee->write) || !empty($user->rights->user->creer));
-
 
 /*
  *	Actions
  */
 
-if ($action == 'add' && !$cancel) {
+if ($action == 'add' && !$cancel && $permissiontoaddbankaccount) {
 	$account->userid          = $object->id;
 
 	$account->bank            = GETPOST('bank', 'alpha');
@@ -128,7 +133,7 @@ if ($action == 'add' && !$cancel) {
 	}
 }
 
-if ($action == 'update' && !$cancel) {
+if ($action == 'update' && !$cancel && $permissiontoaddbankaccount) {
 	$account->userid = $object->id;
 
 	/*
@@ -199,7 +204,7 @@ if ($action == 'update' && !$cancel) {
 }
 
 // update personal email
-if ($action == 'setpersonal_email') {
+if ($action == 'setpersonal_email' && $canadduser) {
 	$object->personal_email = (string) GETPOST('personal_email', 'alphanohtml');
 	$result = $object->update($user);
 	if ($result < 0) {
@@ -208,7 +213,7 @@ if ($action == 'setpersonal_email') {
 }
 
 // update personal mobile
-if ($action == 'setpersonal_mobile') {
+if ($action == 'setpersonal_mobile' && $canadduser) {
 	$object->personal_mobile = (string) GETPOST('personal_mobile', 'alphanohtml');
 	$result = $object->update($user);
 	if ($result < 0) {
@@ -216,25 +221,26 @@ if ($action == 'setpersonal_mobile') {
 	}
 }
 
-// update default_c_exp_tax_cat
-if ($action == 'setdefault_c_exp_tax_cat') {
-	$object->default_c_exp_tax_cat = GETPOST('default_c_exp_tax_cat', 'int');
-	$result = $object->update($user);
-	if ($result < 0) {
-		setEventMessages($object->error, $object->errors, 'errors');
+if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
+	// update default_c_exp_tax_cat
+	if ($action == 'setdefault_c_exp_tax_cat' && $canadduser) {
+		$object->default_c_exp_tax_cat = GETPOST('default_c_exp_tax_cat', 'int');
+		$result = $object->update($user);
+		if ($result < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	}
+
+	// update default range
+	if ($action == 'setdefault_range' && $canadduser) {
+		$object->default_range = GETPOST('default_range', 'int');
+		$result = $object->update($user);
+		if ($result < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
 	}
 }
 
-// update default range
-if ($action == 'setdefault_range') {
-	$object->default_range = GETPOST('default_range', 'int');
-	$result = $object->update($user);
-	if ($result < 0) {
-		setEventMessages($object->error, $object->errors, 'errors');
-	}
-}
-
-
 
 /*
  *	View
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index cb4e7350e0e..0dd7506a784 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -615,8 +615,8 @@ if (empty($reshook)) {
 	}
 
 	// Action initialisation donnees depuis record LDAP
-	if ($action == 'adduserldap') {
-		$selecteduser = $_POST['users'];
+	if ($action == 'adduserldap' && $canadduser) {
+		$selecteduser = GETPOST('users');
 
 		$required_fields = array(
 			$conf->global->LDAP_KEY_USERS,

From dd48c3ee9d334bbd83e8cf430ce3343d93fac591 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 25 May 2021 00:07:38 +0200
Subject: [PATCH 0215/1497] Remove deprecated __REFCLIENT__ (Replaced with
 __REF_CLIENT__)

---
 ChangeLog                               | 2 +-
 htdocs/core/lib/functions.lib.php       | 4 ----
 htdocs/core/tpl/card_presend.tpl.php    | 2 +-
 htdocs/core/tpl/massactions_pre.tpl.php | 2 +-
 4 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ec201fa378e..50a0ff10131 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -169,7 +169,7 @@ Following changes may create regressions for some external modules, but were nec
 * If your database is PostgreSql, you must use version 9.1.0 or more (Dolibarr need the SQL function CONCAT)
 * If your database is MySql or MariaDB, you need at least version 5.1
 * Function set_price_level() has been renamed into setPriceLevel() to follow camelcase rules
-
+* Remove deprecated subtituion key __REFCLIENT__ (Replaced with __REF_CLIENT__)
 
 ***** ChangeLog for 13.0.3 compared to 13.0.2 *****
 
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 48237bbc826..eab810692c6 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -6877,10 +6877,6 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 			$substitutionarray['__DATE_DELIVERY_SS__'] = (isset($object->date_livraison) ? dol_print_date($object->date_livraison, "%S") : '');
 
 			// For backward compatibility
-			$substitutionarray['__REFCLIENT__'] = (isset($object->ref_client) ? $object->ref_client : (isset($object->ref_customer) ? $object->ref_customer : null));
-			$substitutionarray['__REFSUPPLIER__'] = (isset($object->ref_supplier) ? $object->ref_supplier : null);
-			$substitutionarray['__REFCLIENT__'] = (isset($object->ref_client) ? $object->ref_client : (isset($object->ref_customer) ? $object->ref_customer : null));
-			$substitutionarray['__REFSUPPLIER__'] = (isset($object->ref_supplier) ? $object->ref_supplier : null);
 			$substitutionarray['__SUPPLIER_ORDER_DATE_DELIVERY__'] = (isset($object->date_livraison) ? dol_print_date($object->date_livraison, 'day', 0, $outputlangs) : '');
 			$substitutionarray['__SUPPLIER_ORDER_DELAY_DELIVERY__'] = (isset($object->availability_code) ? ($outputlangs->transnoentities("AvailabilityType".$object->availability_code) != ('AvailabilityType'.$object->availability_code) ? $outputlangs->transnoentities("AvailabilityType".$object->availability_code) : $outputlangs->convToOutputCharset(isset($object->availability) ? $object->availability : '')) : '');
 
diff --git a/htdocs/core/tpl/card_presend.tpl.php b/htdocs/core/tpl/card_presend.tpl.php
index 9c1387d7d58..731cc580ea1 100644
--- a/htdocs/core/tpl/card_presend.tpl.php
+++ b/htdocs/core/tpl/card_presend.tpl.php
@@ -76,7 +76,7 @@ if ($action == 'presend') {
 	if (empty($object->ref_client)) {
 		$topicmail = $outputlangs->trans($defaulttopic, '__REF__');
 	} elseif (!empty($object->ref_client)) {
-		$topicmail = $outputlangs->trans($defaulttopic, '__REF__ (__REFCLIENT__)');
+		$topicmail = $outputlangs->trans($defaulttopic, '__REF__ (__REF_CLIENT__)');
 	}
 
 	// Build document if it not exists
diff --git a/htdocs/core/tpl/massactions_pre.tpl.php b/htdocs/core/tpl/massactions_pre.tpl.php
index 21150d19936..4b8680e11bb 100644
--- a/htdocs/core/tpl/massactions_pre.tpl.php
+++ b/htdocs/core/tpl/massactions_pre.tpl.php
@@ -149,7 +149,7 @@ if ($massaction == 'presend') {
 	$formmail->withtofree = empty($liste) ? 1 : 0;
 	$formmail->withtocc = 1;
 	$formmail->withtoccc = $conf->global->MAIN_EMAIL_USECCC;
-	$formmail->withtopic = $langs->transnoentities($topicmail, '__REF__', '__REFCLIENT__');
+	$formmail->withtopic = $langs->transnoentities($topicmail, '__REF__', '__REF_CLIENT__');
 	$formmail->withfile = 1;
 	// $formmail->withfile = 2; Not yet supported in mass action
 	$formmail->withmaindocfile = 1; // Add a checkbox "Attach also main document"

From 97154f8267dd28dac5402b3f1ea498a6f7ab3154 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 25 May 2021 00:29:32 +0200
Subject: [PATCH 0216/1497] Fix timezone into widgets

---
 htdocs/core/boxes/box_accountancy_last_manual_entries.php    | 2 +-
 htdocs/core/boxes/box_actions.php                            | 4 ++--
 htdocs/core/boxes/box_birthdays.php                          | 4 ++--
 htdocs/core/boxes/box_birthdays_members.php                  | 4 ++--
 htdocs/core/boxes/box_boms.php                               | 2 +-
 htdocs/core/boxes/box_clients.php                            | 4 ++--
 htdocs/core/boxes/box_commandes.php                          | 2 +-
 htdocs/core/boxes/box_contacts.php                           | 2 +-
 htdocs/core/boxes/box_contracts.php                          | 2 +-
 htdocs/core/boxes/box_external_rss.php                       | 2 +-
 htdocs/core/boxes/box_factures.php                           | 4 ++--
 htdocs/core/boxes/box_factures_fourn.php                     | 4 ++--
 htdocs/core/boxes/box_factures_fourn_imp.php                 | 4 ++--
 htdocs/core/boxes/box_factures_imp.php                       | 4 ++--
 htdocs/core/boxes/box_ficheinter.php                         | 2 +-
 htdocs/core/boxes/box_fournisseurs.php                       | 4 ++--
 htdocs/core/boxes/box_goodcustomers.php                      | 4 ++--
 htdocs/core/boxes/box_last_modified_ticket.php               | 2 +-
 htdocs/core/boxes/box_last_ticket.php                        | 2 +-
 htdocs/core/boxes/box_lastlogin.php                          | 2 +-
 htdocs/core/boxes/box_members.php                            | 4 ++--
 htdocs/core/boxes/box_members_last_modified.php              | 4 ++--
 htdocs/core/boxes/box_members_last_subscriptions.php         | 2 +-
 htdocs/core/boxes/box_members_subscriptions_by_year.php      | 2 +-
 htdocs/core/boxes/box_mos.php                                | 4 ++--
 htdocs/core/boxes/box_produits.php                           | 4 ++--
 htdocs/core/boxes/box_propales.php                           | 4 ++--
 htdocs/core/boxes/box_prospect.php                           | 4 ++--
 htdocs/core/boxes/box_scheduled_jobs.php                     | 2 +-
 htdocs/core/boxes/box_services_contracts.php                 | 4 ++--
 htdocs/core/boxes/box_services_expired.php                   | 2 +-
 htdocs/core/boxes/box_supplier_orders.php                    | 2 +-
 htdocs/core/boxes/box_supplier_orders_awaiting_reception.php | 2 +-
 33 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/htdocs/core/boxes/box_accountancy_last_manual_entries.php b/htdocs/core/boxes/box_accountancy_last_manual_entries.php
index 123f9894e1e..b1e4a637046 100644
--- a/htdocs/core/boxes/box_accountancy_last_manual_entries.php
+++ b/htdocs/core/boxes/box_accountancy_last_manual_entries.php
@@ -116,7 +116,7 @@ class box_accountancy_last_manual_entries extends ModeleBoxes
 					);
 
 					$this->info_box_contents[$line][] = array(
-						'td' => 'class="right"',
+						'td' => 'class="center nowraponall"',
 						'text' => dol_print_date($date, 'day'),
 						'asis' => 1,
 					);
diff --git a/htdocs/core/boxes/box_actions.php b/htdocs/core/boxes/box_actions.php
index e14fdfcb457..45c9d580ad2 100644
--- a/htdocs/core/boxes/box_actions.php
+++ b/htdocs/core/boxes/box_actions.php
@@ -161,8 +161,8 @@ class box_actions extends ModeleBoxes
 					);
 
 					$this->info_box_contents[$line][2] = array(
-						'td' => 'class="nowrap left"',
-						'text' => dol_print_date($datelimite, "dayhour"),
+						'td' => 'class="center nowraponall"',
+						'text' => dol_print_date($datelimite, "dayhour", 'tzuserrel'),
 						'asis' => 1
 					);
 
diff --git a/htdocs/core/boxes/box_birthdays.php b/htdocs/core/boxes/box_birthdays.php
index d6e6296a3cc..62cfaa590ab 100644
--- a/htdocs/core/boxes/box_birthdays.php
+++ b/htdocs/core/boxes/box_birthdays.php
@@ -118,8 +118,8 @@ class box_birthdays extends ModeleBoxes
 					);
 
 					$this->info_box_contents[$line][] = array(
-						'td' => 'class="right"',
-						'text' => dol_print_date($dateb, "day").' - '.$age.' '.$langs->trans('DurationYears')
+						'td' => 'class="center nowraponall"',
+						'text' => dol_print_date($dateb, "day", 'gmt').' - '.$age.' '.$langs->trans('DurationYears')
 					);
 
 					/*$this->info_box_contents[$line][] = array(
diff --git a/htdocs/core/boxes/box_birthdays_members.php b/htdocs/core/boxes/box_birthdays_members.php
index 4d367a223e2..5e772ff3593 100644
--- a/htdocs/core/boxes/box_birthdays_members.php
+++ b/htdocs/core/boxes/box_birthdays_members.php
@@ -115,8 +115,8 @@ class box_birthdays_members extends ModeleBoxes
 					);
 
 					$this->info_box_contents[$line][] = array(
-						'td' => 'class="right"',
-						'text' => dol_print_date($dateb, "day").' - '.$age.' '.$langs->trans('DurationYears')
+						'td' => 'class="center nowraponall"',
+						'text' => dol_print_date($dateb, "day", 'gmt').' - '.$age.' '.$langs->trans('DurationYears')
 					);
 
 					/*$this->info_box_contents[$line][] = array(
diff --git a/htdocs/core/boxes/box_boms.php b/htdocs/core/boxes/box_boms.php
index d0a169321d0..ae0877c0369 100644
--- a/htdocs/core/boxes/box_boms.php
+++ b/htdocs/core/boxes/box_boms.php
@@ -143,7 +143,7 @@ class box_boms extends ModeleBoxes
 
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="right"',
-						'text' => dol_print_date($datem, 'day'),
+						'text' => dol_print_date($datem, 'day', 'tzuserrel'),
 					);
 
 					$this->info_box_contents[$line][] = array(
diff --git a/htdocs/core/boxes/box_clients.php b/htdocs/core/boxes/box_clients.php
index 56b8fa089a3..df56b510823 100644
--- a/htdocs/core/boxes/box_clients.php
+++ b/htdocs/core/boxes/box_clients.php
@@ -134,8 +134,8 @@ class box_clients extends ModeleBoxes
 					);
 
 					$this->info_box_contents[$line][] = array(
-						'td' => 'class="right"',
-						'text' => dol_print_date($datem, "day")
+						'td' => 'class="center nowraponall"',
+						'text' => dol_print_date($datem, "day", 'tzuserrel')
 					);
 
 					$this->info_box_contents[$line][] = array(
diff --git a/htdocs/core/boxes/box_commandes.php b/htdocs/core/boxes/box_commandes.php
index eac431918b2..6583673f8ca 100644
--- a/htdocs/core/boxes/box_commandes.php
+++ b/htdocs/core/boxes/box_commandes.php
@@ -180,7 +180,7 @@ class box_commandes extends ModeleBoxes
 
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="right"',
-						'text' => dol_print_date($date, 'day'),
+						'text' => dol_print_date($date, 'day', 'tzuserrel'),
 					);
 
 					$this->info_box_contents[$line][] = array(
diff --git a/htdocs/core/boxes/box_contacts.php b/htdocs/core/boxes/box_contacts.php
index bd69ddc0108..fada6a93bfd 100644
--- a/htdocs/core/boxes/box_contacts.php
+++ b/htdocs/core/boxes/box_contacts.php
@@ -161,7 +161,7 @@ class box_contacts extends ModeleBoxes
 
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="right"',
-						'text' => dol_print_date($datem, "day"),
+						'text' => dol_print_date($datem, "day", 'tzuserrel'),
 					);
 
 					$this->info_box_contents[$line][] = array(
diff --git a/htdocs/core/boxes/box_contracts.php b/htdocs/core/boxes/box_contracts.php
index ad19184691c..9d7b625db91 100644
--- a/htdocs/core/boxes/box_contracts.php
+++ b/htdocs/core/boxes/box_contracts.php
@@ -156,7 +156,7 @@ class box_contracts extends ModeleBoxes
 
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="right"',
-						'text' => dol_print_date($datec, 'day'),
+						'text' => dol_print_date($datec, 'day', 'tzuserrel'),
 					);
 
 					$this->info_box_contents[$line][] = array(
diff --git a/htdocs/core/boxes/box_external_rss.php b/htdocs/core/boxes/box_external_rss.php
index 7bf8a69ed03..aff48328edb 100644
--- a/htdocs/core/boxes/box_external_rss.php
+++ b/htdocs/core/boxes/box_external_rss.php
@@ -150,7 +150,7 @@ class box_external_rss extends ModeleBoxes
 				//$item['atom_content']
 			}
 			if (is_numeric($date)) {
-				$date = dol_print_date($date, "dayhour");
+				$date = dol_print_date($date, "dayhour", 'tzuserrel');
 			}
 
 			$isutf8 = utf8_check($title);
diff --git a/htdocs/core/boxes/box_factures.php b/htdocs/core/boxes/box_factures.php
index 9ef12a9b8f6..2a97d738cd8 100644
--- a/htdocs/core/boxes/box_factures.php
+++ b/htdocs/core/boxes/box_factures.php
@@ -163,7 +163,7 @@ class box_factures extends ModeleBoxes
 
 					$late = '';
 					if ($facturestatic->hasDelay()) {
-						$late = img_warning(sprintf($l_due_date, dol_print_date($datelimite, 'day')));
+						$late = img_warning(sprintf($l_due_date, dol_print_date($datelimite, 'day', 'tzuserrel')));
 					}
 
 					$this->info_box_contents[$line][] = array(
@@ -186,7 +186,7 @@ class box_factures extends ModeleBoxes
 
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="right"',
-						'text' => dol_print_date($date, 'day'),
+						'text' => dol_print_date($date, 'day', 'tzuserrel'),
 					);
 
 					$this->info_box_contents[$line][] = array(
diff --git a/htdocs/core/boxes/box_factures_fourn.php b/htdocs/core/boxes/box_factures_fourn.php
index a2ce199faee..a5d63c7b9c3 100644
--- a/htdocs/core/boxes/box_factures_fourn.php
+++ b/htdocs/core/boxes/box_factures_fourn.php
@@ -159,7 +159,7 @@ class box_factures_fourn extends ModeleBoxes
 					$late = '';
 
 					if ($facturestatic->hasDelay()) {
-						$late = img_warning(sprintf($l_due_date, dol_print_date($datelimite, 'day')));
+						$late = img_warning(sprintf($l_due_date, dol_print_date($datelimite, 'day', 'tzuserrel')));
 					}
 
 					$this->info_box_contents[$line][] = array(
@@ -189,7 +189,7 @@ class box_factures_fourn extends ModeleBoxes
 
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="right"',
-						'text' => dol_print_date($date, 'day'),
+						'text' => dol_print_date($date, 'day', 'tzuserrel'),
 					);
 
 					$this->info_box_contents[$line][] = array(
diff --git a/htdocs/core/boxes/box_factures_fourn_imp.php b/htdocs/core/boxes/box_factures_fourn_imp.php
index aea07802fdf..9c35055011d 100644
--- a/htdocs/core/boxes/box_factures_fourn_imp.php
+++ b/htdocs/core/boxes/box_factures_fourn_imp.php
@@ -150,7 +150,7 @@ class box_factures_fourn_imp extends ModeleBoxes
 
 					$late = '';
 					if ($facturestatic->hasDelay()) {
-						$late = img_warning(sprintf($l_due_date, dol_print_date($datelimite, 'day')));
+						$late = img_warning(sprintf($l_due_date, dol_print_date($datelimite, 'day', 'tzuserrel')));
 					}
 
 					$tooltip = $langs->trans('SupplierInvoice').': '.($objp->ref ? $objp->ref : $objp->facid).'<br>'.$langs->trans('RefSupplier').': '.$objp->ref_supplier;
@@ -175,7 +175,7 @@ class box_factures_fourn_imp extends ModeleBoxes
 
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="right"',
-						'text' => dol_print_date($datelimite, 'day'),
+						'text' => dol_print_date($datelimite, 'day', 'tzuserrel'),
 					);
 
 					$this->info_box_contents[$line][] = array(
diff --git a/htdocs/core/boxes/box_factures_imp.php b/htdocs/core/boxes/box_factures_imp.php
index 1830dcd5c7a..391fc2e7cd0 100644
--- a/htdocs/core/boxes/box_factures_imp.php
+++ b/htdocs/core/boxes/box_factures_imp.php
@@ -165,7 +165,7 @@ class box_factures_imp extends ModeleBoxes
 
 					$late = '';
 					if ($facturestatic->hasDelay()) {
-						$late = img_warning(sprintf($l_due_date, dol_print_date($datelimite, 'day')));
+						$late = img_warning(sprintf($l_due_date, dol_print_date($datelimite, 'day', 'tzuserrel')));
 					}
 
 					$this->info_box_contents[$line][] = array(
@@ -188,7 +188,7 @@ class box_factures_imp extends ModeleBoxes
 
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="right"',
-						'text' => dol_print_date($datelimite, 'day'),
+						'text' => dol_print_date($datelimite, 'day', 'tzuserrel'),
 					);
 
 					$this->info_box_contents[$line][] = array(
diff --git a/htdocs/core/boxes/box_ficheinter.php b/htdocs/core/boxes/box_ficheinter.php
index 94d081483e2..edf4daa5191 100644
--- a/htdocs/core/boxes/box_ficheinter.php
+++ b/htdocs/core/boxes/box_ficheinter.php
@@ -145,7 +145,7 @@ class box_ficheinter extends ModeleBoxes
 
 					$this->info_box_contents[$i][] = array(
 						'td' => 'class="right"',
-						'text' => dol_print_date($datec, 'day'),
+						'text' => dol_print_date($datec, 'day', 'tzuserrel'),
 					);
 
 					$this->info_box_contents[$i][] = array(
diff --git a/htdocs/core/boxes/box_fournisseurs.php b/htdocs/core/boxes/box_fournisseurs.php
index d8b7f30c103..b0d5a0774fc 100644
--- a/htdocs/core/boxes/box_fournisseurs.php
+++ b/htdocs/core/boxes/box_fournisseurs.php
@@ -128,8 +128,8 @@ class box_fournisseurs extends ModeleBoxes
 					);
 
 					$this->info_box_contents[$line][] = array(
-						'td' => 'class="right"',
-						'text' => dol_print_date($datem, "day"),
+						'td' => 'class="center nowraponall"',
+						'text' => dol_print_date($datem, "day", 'tzuserrel'),
 					);
 
 					$this->info_box_contents[$line][] = array(
diff --git a/htdocs/core/boxes/box_goodcustomers.php b/htdocs/core/boxes/box_goodcustomers.php
index 3a4f7e63103..aef7cdc9f3d 100644
--- a/htdocs/core/boxes/box_goodcustomers.php
+++ b/htdocs/core/boxes/box_goodcustomers.php
@@ -126,8 +126,8 @@ class box_goodcustomers extends ModeleBoxes
 					);
 
 					$this->info_box_contents[$line][] = array(
-						'td' => 'class="right"',
-						'text' => dol_print_date($datem, "day")
+						'td' => 'class="center nowraponall"',
+						'text' => dol_print_date($datem, "day", 'tzuserrel')
 					);
 
 					$this->info_box_contents[$line][] = array(
diff --git a/htdocs/core/boxes/box_last_modified_ticket.php b/htdocs/core/boxes/box_last_modified_ticket.php
index 320a23f745b..4d5097e23ba 100644
--- a/htdocs/core/boxes/box_last_modified_ticket.php
+++ b/htdocs/core/boxes/box_last_modified_ticket.php
@@ -162,7 +162,7 @@ class box_last_modified_ticket extends ModeleBoxes
 					// Date creation
 					$this->info_box_contents[$i][$r] = array(
 						'td' => 'class="right"',
-						'text' => dol_print_date($datec, 'dayhour')
+						'text' => dol_print_date($datec, 'dayhour', 'tzuserrel')
 					);
 					$r++;
 
diff --git a/htdocs/core/boxes/box_last_ticket.php b/htdocs/core/boxes/box_last_ticket.php
index 8a0e3822448..e08a54f1c87 100644
--- a/htdocs/core/boxes/box_last_ticket.php
+++ b/htdocs/core/boxes/box_last_ticket.php
@@ -166,7 +166,7 @@ class box_last_ticket extends ModeleBoxes
 					// Date creation
 					$this->info_box_contents[$i][$r] = array(
 						'td' => 'class="right"',
-						'text' => dol_print_date($datec, 'dayhour'),
+						'text' => dol_print_date($datec, 'dayhour', 'tzuserrel'),
 					);
 					$r++;
 
diff --git a/htdocs/core/boxes/box_lastlogin.php b/htdocs/core/boxes/box_lastlogin.php
index a487ec5bc72..e5e11d9ba8f 100644
--- a/htdocs/core/boxes/box_lastlogin.php
+++ b/htdocs/core/boxes/box_lastlogin.php
@@ -93,7 +93,7 @@ class box_lastlogin extends ModeleBoxes
 			'text' => $langs->trans("PreviousConnexion"),
 		);
 		if ($user->datepreviouslogin) {
-			$tmp = dol_print_date($user->datepreviouslogin, "dayhour", 'tzuser');
+			$tmp = dol_print_date($user->datepreviouslogin, "dayhour", 'tzuserrel');
 		} else {
 			$tmp = $langs->trans("Unknown");
 		}
diff --git a/htdocs/core/boxes/box_members.php b/htdocs/core/boxes/box_members.php
index acd3773d2f0..5865cba2530 100644
--- a/htdocs/core/boxes/box_members.php
+++ b/htdocs/core/boxes/box_members.php
@@ -145,8 +145,8 @@ class box_members extends ModeleBoxes
 					);
 
 					$this->info_box_contents[$line][] = array(
-						'td' => 'class="right"',
-						'text' => dol_print_date($datem, "day"),
+						'td' => 'class="center nowraponall"',
+						'text' => dol_print_date($datem, "day", 'tzuserrel'),
 					);
 
 					$this->info_box_contents[$line][] = array(
diff --git a/htdocs/core/boxes/box_members_last_modified.php b/htdocs/core/boxes/box_members_last_modified.php
index 1315ac9895b..9de6a3af12f 100644
--- a/htdocs/core/boxes/box_members_last_modified.php
+++ b/htdocs/core/boxes/box_members_last_modified.php
@@ -147,8 +147,8 @@ class box_members_last_modified extends ModeleBoxes
 					);
 
 					$this->info_box_contents[$line][] = array(
-						'td' => 'class="right"',
-						'text' => dol_print_date($datem, "day"),
+						'td' => 'class="center nowraponall"',
+						'text' => dol_print_date($datem, "day", 'tzuserrel'),
 					);
 
 					$this->info_box_contents[$line][] = array(
diff --git a/htdocs/core/boxes/box_members_last_subscriptions.php b/htdocs/core/boxes/box_members_last_subscriptions.php
index e08bc1073b6..3cea44c2dc3 100644
--- a/htdocs/core/boxes/box_members_last_subscriptions.php
+++ b/htdocs/core/boxes/box_members_last_subscriptions.php
@@ -158,7 +158,7 @@ class box_members_last_subscriptions extends ModeleBoxes
 
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="right tdoverflowmax150 maxwidth150onsmartphone"',
-						'text' => dol_print_date($this->db->jdate($obj->datem ? $obj->datem : $obj->datec), 'dayhour'),
+						'text' => dol_print_date($this->db->jdate($obj->datem ? $obj->datem : $obj->datec), 'dayhour', 'tzuserrel'),
 					);
 
 					$line++;
diff --git a/htdocs/core/boxes/box_members_subscriptions_by_year.php b/htdocs/core/boxes/box_members_subscriptions_by_year.php
index b6c146312bc..be835511c6b 100644
--- a/htdocs/core/boxes/box_members_subscriptions_by_year.php
+++ b/htdocs/core/boxes/box_members_subscriptions_by_year.php
@@ -111,7 +111,7 @@ class box_members_subscriptions_by_year extends ModeleBoxes
 				$i = 0;
 				while ($i < $num) {
 					$objp = $this->db->fetch_object($result);
-					$year = dol_print_date($this->db->jdate($objp->dateh), "%Y");
+					$year = dol_print_date($this->db->jdate($objp->dateh), "%Y", 'gmt');
 					$Total[$year] = (isset($Total[$year]) ? $Total[$year] : 0) + $objp->subscription;
 					$Number[$year] = (isset($Number[$year]) ? $Number[$year] : 0) + 1;
 					$tot += $objp->subscription;
diff --git a/htdocs/core/boxes/box_mos.php b/htdocs/core/boxes/box_mos.php
index b12506147bf..43d1cd411e4 100644
--- a/htdocs/core/boxes/box_mos.php
+++ b/htdocs/core/boxes/box_mos.php
@@ -138,8 +138,8 @@ class box_mos extends ModeleBoxes
 					}
 
 					$this->info_box_contents[$line][] = array(
-						'td' => 'class="right"',
-						'text' => dol_print_date($datem, 'day'),
+						'td' => 'class="center nowraponall"',
+						'text' => dol_print_date($datem, 'day', 'tzuserrel'),
 					);
 
 					$this->info_box_contents[$line][] = array(
diff --git a/htdocs/core/boxes/box_produits.php b/htdocs/core/boxes/box_produits.php
index 44333683000..dde3b685d25 100644
--- a/htdocs/core/boxes/box_produits.php
+++ b/htdocs/core/boxes/box_produits.php
@@ -190,8 +190,8 @@ class box_produits extends ModeleBoxes
 					);
 
 					$this->info_box_contents[$line][] = array(
-						'td' => 'class="right"',
-						'text' => dol_print_date($datem, 'day'),
+						'td' => 'class="center nowraponall"',
+						'text' => dol_print_date($datem, 'day', 'tzuserrel'),
 					);
 
 					$this->info_box_contents[$line][] = array(
diff --git a/htdocs/core/boxes/box_propales.php b/htdocs/core/boxes/box_propales.php
index d876dad67d0..9c6376351e7 100644
--- a/htdocs/core/boxes/box_propales.php
+++ b/htdocs/core/boxes/box_propales.php
@@ -165,8 +165,8 @@ class box_propales extends ModeleBoxes
 					);
 
 					$this->info_box_contents[$line][] = array(
-						'td' => 'class="right"',
-						'text' => dol_print_date($date, 'day'),
+						'td' => 'class="center nowraponall"',
+						'text' => dol_print_date($date, 'day', 'tzuserrel'),
 					);
 
 					$this->info_box_contents[$line][] = array(
diff --git a/htdocs/core/boxes/box_prospect.php b/htdocs/core/boxes/box_prospect.php
index ea550b9d856..a8959202082 100644
--- a/htdocs/core/boxes/box_prospect.php
+++ b/htdocs/core/boxes/box_prospect.php
@@ -135,8 +135,8 @@ class box_prospect extends ModeleBoxes
 					);
 
 					$this->info_box_contents[$line][] = array(
-						'td' => 'class="right"',
-						'text' => dol_print_date($datem, "day"),
+						'td' => 'class="center nowraponall"',
+						'text' => dol_print_date($datem, "day", 'tzuserrel'),
 					);
 
 					$this->info_box_contents[$line][] = array(
diff --git a/htdocs/core/boxes/box_scheduled_jobs.php b/htdocs/core/boxes/box_scheduled_jobs.php
index 04ba2944c75..793b0cc8c79 100644
--- a/htdocs/core/boxes/box_scheduled_jobs.php
+++ b/htdocs/core/boxes/box_scheduled_jobs.php
@@ -156,7 +156,7 @@ class box_scheduled_jobs extends ModeleBoxes
 					);
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="right"',
-						'textnoformat' => (empty($resultarray[$line][2]) ? '' : $form->textwithpicto(dol_print_date($resultarray[$line][2], "dayhoursec"), $langs->trans("CurrentTimeZone")))
+						'textnoformat' => (empty($resultarray[$line][2]) ? '' : $form->textwithpicto(dol_print_date($resultarray[$line][2], "dayhoursec", 'tzserver'), $langs->trans("CurrentTimeZone")))
 					);
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="center" ',
diff --git a/htdocs/core/boxes/box_services_contracts.php b/htdocs/core/boxes/box_services_contracts.php
index b6eb51826cc..98e2b82bb37 100644
--- a/htdocs/core/boxes/box_services_contracts.php
+++ b/htdocs/core/boxes/box_services_contracts.php
@@ -200,8 +200,8 @@ class box_services_contracts extends ModeleBoxes
 					);
 
 					$this->info_box_contents[$i][] = array(
-						'td' => '',
-						'text' => dol_print_date($datem, 'day'),
+						'td' => 'class="center nowraponall"',
+						'text' => dol_print_date($datem, 'day', 'tzuserrel'),
 						'text2'=> $late,
 					);
 
diff --git a/htdocs/core/boxes/box_services_expired.php b/htdocs/core/boxes/box_services_expired.php
index 724eb9baebf..75cc1cde413 100644
--- a/htdocs/core/boxes/box_services_expired.php
+++ b/htdocs/core/boxes/box_services_expired.php
@@ -152,7 +152,7 @@ class box_services_expired extends ModeleBoxes
 
 					$this->info_box_contents[$i][] = array(
 						'td' => 'class="center nowraponall"',
-						'text' => dol_print_date($dateline, 'day'),
+						'text' => dol_print_date($dateline, 'day', 'tzuserrel'),
 						'text2'=> $late,
 					);
 
diff --git a/htdocs/core/boxes/box_supplier_orders.php b/htdocs/core/boxes/box_supplier_orders.php
index 235e7a8e72a..0c2b97ce6b5 100644
--- a/htdocs/core/boxes/box_supplier_orders.php
+++ b/htdocs/core/boxes/box_supplier_orders.php
@@ -153,7 +153,7 @@ class box_supplier_orders extends ModeleBoxes
 
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="right"',
-						'text' => dol_print_date($date, 'day'),
+						'text' => dol_print_date($date, 'day', 'tzuserrel'),
 					);
 
 					$this->info_box_contents[$line][] = array(
diff --git a/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php b/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
index 1a8cec07155..04dabbd0ff3 100644
--- a/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
+++ b/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
@@ -161,7 +161,7 @@ class box_supplier_orders_awaiting_reception extends ModeleBoxes
 
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="right"',
-						'text' => $delayIcon.'<span class="classfortooltip" title="'.$langs->trans('DateDeliveryPlanned').'"><i class="fa fa-dolly" ></i> '.dol_print_date($delivery_date, 'day').'</span>',
+						'text' => $delayIcon.'<span class="classfortooltip" title="'.$langs->trans('DateDeliveryPlanned').'"><i class="fa fa-dolly" ></i> '.dol_print_date($delivery_date, 'day', 'tzuserrel').'</span>',
 						'asis' => 1
 					);
 

From fedf7645b1184d4748218e1e805f62052b201c49 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 25 May 2021 12:02:33 +0200
Subject: [PATCH 0217/1497] Fix regression, can't reset parent company.

---
 htdocs/societe/card.php                |  2 +-
 htdocs/societe/class/societe.class.php | 43 ++++++++++++++------------
 2 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 3d03a97a59f..1165d6a9fd7 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -852,7 +852,7 @@ if (empty($reshook)) {
 	// Set parent company
 	if ($action == 'set_thirdparty' && $user->rights->societe->creer) {
 		$object->fetch($socid);
-		$result = $object->set_parent(GETPOST('parent_id', 'int'));
+		$result = $object->setParent(GETPOST('parent_id', 'int'));
 	}
 
 	// Set sales representatives
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 8a8dea9f7e3..e2eba54b489 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -3321,34 +3321,37 @@ class Societe extends CommonObject
 		}
 	}
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    Define parent commany of current company
 	 *
 	 *    @param	int		$id     Id of thirdparty to set or '' to remove
 	 *    @return	int     		<0 if KO, >0 if OK
 	 */
-	public function set_parent($id)
+	public function setParent($id)
 	{
-		// phpcs:enable
 		if ($this->id) {
 			// Check if the id we want to add as parent has not already one parent that is the current id we try to update
-			$sameparent	= $this->validateFamilyTree($id, $this->id, 0);
-			if ($sameparent < 0) {
-				return -1;
-			} elseif ($sameparent == 1) {
-				setEventMessages('ParentCompanyToAddIsAlreadyAChildOfModifiedCompany', null, 'warnings');
-				return -1;
-			} else {
-				$sql = 'UPDATE '.MAIN_DB_PREFIX.'societe SET parent = '.($id > 0 ? $id : 'null').' WHERE rowid = '.((int) $this->id);
-				dol_syslog(get_class($this).'::set_parent', LOG_DEBUG);
-				$resql	= $this->db->query($sql);
-				if ($resql) {
-					$this->parent	= $id;
-					return 1;
-				} else {
+			if ($id > 0) {
+				$sameparent	= $this->validateFamilyTree($id, $this->id, 0);
+				if ($sameparent < 0) {
 					return -1;
 				}
+				if ($sameparent == 1) {
+					setEventMessages('ParentCompanyToAddIsAlreadyAChildOfModifiedCompany', null, 'warnings');
+					return -1;
+				}
+			}
+
+			dol_syslog(get_class($this).'::setParent', LOG_DEBUG);
+
+			$sql = 'UPDATE '.MAIN_DB_PREFIX.'societe SET parent = '.($id > 0 ? $id : 'null').' WHERE rowid = '.((int) $this->id);
+
+			$resql	= $this->db->query($sql);
+			if ($resql) {
+				$this->parent = $id;
+				return 1;
+			} else {
+				return -1;
 			}
 		} else {
 			return -1;
@@ -3369,9 +3372,9 @@ class Societe extends CommonObject
 			dol_syslog("Too high level of parent - child for company. May be an infinite loop ?", LOG_WARNING);
 		}
 
-		$sql	= 'SELECT s.parent';
-		$sql	.= ' FROM '.MAIN_DB_PREFIX.'societe as s';
-		$sql	.= ' WHERE rowid = '.$idparent;
+		$sql = 'SELECT s.parent';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'societe as s';
+		$sql .= ' WHERE rowid = '.$idparent;
 		$resql	= $this->db->query($sql);
 		if ($resql) {
 			$obj	= $this->db->fetch_object($resql);

From 857be16e1294c3ed2e7f5e624bcc838969dff565 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 25 May 2021 12:03:38 +0200
Subject: [PATCH 0218/1497] Log

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

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index e2eba54b489..7554ad2fbe2 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -3329,6 +3329,8 @@ class Societe extends CommonObject
 	 */
 	public function setParent($id)
 	{
+		dol_syslog(get_class($this).'::setParent', LOG_DEBUG);
+
 		if ($this->id) {
 			// Check if the id we want to add as parent has not already one parent that is the current id we try to update
 			if ($id > 0) {
@@ -3342,8 +3344,6 @@ class Societe extends CommonObject
 				}
 			}
 
-			dol_syslog(get_class($this).'::setParent', LOG_DEBUG);
-
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.'societe SET parent = '.($id > 0 ? $id : 'null').' WHERE rowid = '.((int) $this->id);
 
 			$resql	= $this->db->query($sql);

From fb6aea72b837ec464c059b9fbdafc4d799496e8d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 25 May 2021 12:06:29 +0200
Subject: [PATCH 0219/1497] Fix syntax error

---
 htdocs/fourn/class/fournisseur.facture.class.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 8586e0fc623..637f29e87b8 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -1361,7 +1361,7 @@ class FactureFournisseur extends CommonInvoice
 			}
 			$sql .= ', fk_user_closing = '.$user->id;
 			$sql .= ", date_closing = '".$this->db->idate($now)."'";
-			$sql .= ' WHERE rowid = '.$this->id;
+			$sql .= ' WHERE rowid = '.((int) $this->id);
 
 			$resql = $this->db->query($sql);
 			if ($resql) {
@@ -1417,18 +1417,17 @@ class FactureFournisseur extends CommonInvoice
 	 */
 	public function setUnpaid($user)
 	{
-		global $conf, $langs;
 		$error = 0;
 
 		$this->db->begin();
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'facture_fourn';
-		$sql .= ' SET paye=0, fk_statut='.self::STATUS_VALIDATED.', close_code=null, close_note=null';
+		$sql .= ' SET paye=0, fk_statut='.self::STATUS_VALIDATED.', close_code=null, close_note=null,';
 		$sql .= ' date_closing=null,';
 		$sql .= ' fk_user_closing=null';
-		$sql .= ' WHERE rowid = '.$this->id;
+		$sql .= ' WHERE rowid = '.((int) $this->id);
 
-		dol_syslog("FactureFournisseur::set_unpaid", LOG_DEBUG);
+		dol_syslog(get_class($this)."::set_unpaid", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			// Call trigger

From 71b35ef0e5be758b3faddfa7650916adc73d1536 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 25 May 2021 12:11:06 +0200
Subject: [PATCH 0220/1497] Fix regression - can't reset parent company

---
 htdocs/societe/class/societe.class.php | 33 +++++++++++++++-----------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 591809389d4..47105bf9068 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -3111,24 +3111,29 @@ class Societe extends CommonObject
 	public function set_parent($id)
 	{
 		// phpcs:enable
+		dol_syslog(get_class($this).'::set_parent', LOG_DEBUG);
+
 		if ($this->id) {
 			// Check if the id we want to add as parent has not already one parent that is the current id we try to update
-			$sameparent	= $this->validateFamilyTree($id, $this->id, 0);
-			if ($sameparent < 0) {
-				return -1;
-			} elseif ($sameparent == 1) {
-				setEventMessages('ParentCompanyToAddIsAlreadyAChildOfModifiedCompany', null, 'warnings');
-				return -1;
-			} else {
-				$sql = 'UPDATE '.MAIN_DB_PREFIX.'societe SET parent = '.($id > 0 ? $id : 'null').' WHERE rowid = '.((int) $this->id);
-				dol_syslog(get_class($this).'::set_parent', LOG_DEBUG);
-				$resql	= $this->db->query($sql);
-				if ($resql) {
-					$this->parent	= $id;
-					return 1;
-				} else {
+			if ($id > 0) {
+				$sameparent	= $this->validateFamilyTree($id, $this->id, 0);
+				if ($sameparent < 0) {
 					return -1;
 				}
+				if ($sameparent == 1) {
+					setEventMessages('ParentCompanyToAddIsAlreadyAChildOfModifiedCompany', null, 'warnings');
+					return -1;
+				}
+			}
+
+			$sql = 'UPDATE '.MAIN_DB_PREFIX.'societe SET parent = '.($id > 0 ? $id : 'null').' WHERE rowid = '.((int) $this->id);
+
+			$resql	= $this->db->query($sql);
+			if ($resql) {
+				$this->parent = $id;
+				return 1;
+			} else {
+				return -1;
 			}
 		} else {
 			return -1;

From a840afa72a33e80cb1b83802905c17fdfe6668e0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 25 May 2021 15:24:28 +0200
Subject: [PATCH 0221/1497] Fix missing entry into table

---
 htdocs/install/mysql/data/llx_accounting_abc.sql | 6 +++---
 htdocs/install/mysql/migration/13.0.0-14.0.0.sql | 5 +++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_accounting_abc.sql b/htdocs/install/mysql/data/llx_accounting_abc.sql
index 3c178f7c70d..806d084ce85 100644
--- a/htdocs/install/mysql/data/llx_accounting_abc.sql
+++ b/htdocs/install/mysql/data/llx_accounting_abc.sql
@@ -174,10 +174,10 @@ INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUE
 INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 15,'SYSCOHADA-TG', 'Plan comptable Ouest-Africain', 1);
 
 -- Description of chart of account USA US-BASE
-INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES (  11, 'US-BASE', 'USA basic chart of accounts', 1);
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 11, 'US-BASE', 'USA basic chart of accounts', 1);
 
 -- Description of chart of account Canada CA-ENG-BASE
-INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES (  14, 'CA-ENG-BASE', 'Canadian basic chart of accounts - English', 1);
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 14, 'CA-ENG-BASE', 'Canadian basic chart of accounts - English', 1);
 
 -- Description of chart of account Mexico SAT/24-2019
-INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES (  154, 'SAT/24-2019', 'Catalogo y codigo agrupador fiscal del 2019', 1);
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 154, 'SAT/24-2019', 'Catalogo y codigo agrupador fiscal del 2019', 1);
diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index b95ea30f8fb..c9736e429c4 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -62,6 +62,11 @@ UPDATE llx_c_country SET eec = 1 WHERE code IN ('AT','BE','BG','CY','CZ','DE','D
 ALTER TABLE llx_export_model MODIFY COLUMN type varchar(64);
 
 
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES (  11, 'US-BASE', 'USA basic chart of accounts', 1);
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 14, 'CA-ENG-BASE', 'Canadian basic chart of accounts - English', 1);
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 154, 'SAT/24-2019', 'Catalogo y codigo agrupador fiscal del 2019', 1);
+
+
 -- For v14
 
 ALTER TABLE llx_product_lot ADD COLUMN eol_date datetime NULL;

From d18fc6ca3c9e859be79f7d99bb6522fc37e35d46 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 25 May 2021 15:38:12 +0200
Subject: [PATCH 0222/1497] Fix init

---
 htdocs/accountancy/admin/accountmodel.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/accountancy/admin/accountmodel.php b/htdocs/accountancy/admin/accountmodel.php
index f0fd9702009..0f4d538cfac 100644
--- a/htdocs/accountancy/admin/accountmodel.php
+++ b/htdocs/accountancy/admin/accountmodel.php
@@ -609,10 +609,12 @@ if ($id) {
 		print '</tr>';
 
 		if ($num) {
+			$i = 0;
 			// Lines with values
 			while ($i < $num) {
 				$obj = $db->fetch_object($resql);
 				//print_r($obj);
+
 				print '<tr class="oddeven" id="rowid-'.$obj->rowid.'">';
 				if ($action == 'edit' && ($rowid == (!empty($obj->rowid) ? $obj->rowid : $obj->code))) {
 					print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
@@ -708,6 +710,7 @@ if ($id) {
 
 					print "</tr>\n";
 				}
+
 				$i++;
 			}
 		}

From b9de8561a9732773a4ea27f7fec888683db02ee8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 25 May 2021 15:59:36 +0200
Subject: [PATCH 0223/1497] Fix regression

---
 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 eab810692c6..45d1bdca12e 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -6877,6 +6877,8 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 			$substitutionarray['__DATE_DELIVERY_SS__'] = (isset($object->date_livraison) ? dol_print_date($object->date_livraison, "%S") : '');
 
 			// For backward compatibility
+			$substitutionarray['__REFCLIENT__'] = (isset($object->ref_client) ? $object->ref_client : (isset($object->ref_customer) ? $object->ref_customer : null));
+			$substitutionarray['__REFSUPPLIER__'] = (isset($object->ref_supplier) ? $object->ref_supplier : null);
 			$substitutionarray['__SUPPLIER_ORDER_DATE_DELIVERY__'] = (isset($object->date_livraison) ? dol_print_date($object->date_livraison, 'day', 0, $outputlangs) : '');
 			$substitutionarray['__SUPPLIER_ORDER_DELAY_DELIVERY__'] = (isset($object->availability_code) ? ($outputlangs->transnoentities("AvailabilityType".$object->availability_code) != ('AvailabilityType'.$object->availability_code) ? $outputlangs->transnoentities("AvailabilityType".$object->availability_code) : $outputlangs->convToOutputCharset(isset($object->availability) ? $object->availability : '')) : '');
 

From 263f1c8101df8279bb50e7e4be03150edd169143 Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Tue, 25 May 2021 17:26:56 +0200
Subject: [PATCH 0224/1497] Fix #11882 : fix of module opensurvey for
 datesurvey

---
 htdocs/opensurvey/results.php | 35 ++++++++++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/htdocs/opensurvey/results.php b/htdocs/opensurvey/results.php
index 6d12259a39f..1c7a98739d7 100644
--- a/htdocs/opensurvey/results.php
+++ b/htdocs/opensurvey/results.php
@@ -251,7 +251,40 @@ if (GETPOSTISSET("ajoutercolonne") && $object->format == "D") {
 				header('Location: results.php?id='.$object->id_sondage);
 			}
 		}
-
+		if ($cleinsertion >= 0) {
+			$sql = 'SELECT s.reponses';
+			$sql .= " FROM ".MAIN_DB_PREFIX."opensurvey_user_studs as s";
+			$sql .= " WHERE id_sondage = '".$db->escape($numsondage)."'";
+			$resql = $db->query($sql);
+			if (!$resql) {
+				dol_print_error($db);
+			} else {
+				$num = $db->num_rows($resql);
+				$compteur = 0;
+				while ($compteur < $num) {
+					$obj = $db->fetch_object($resql);
+					$sql = 'UPDATE '.MAIN_DB_PREFIX."opensurvey_user_studs";
+					if ($cleinsertion == 0) {
+						$sql .= " SET reponses = '0".$db->escape($obj->reponses)."'";
+					} else {
+						$reponsesadd = str_split($obj->reponses);
+						$lengthresponses = count($reponsesadd);
+						for ($cpt = $lengthresponses; $cpt > $cleinsertion; $cpt--) {
+							$reponsesadd[$cpt] = $reponsesadd[$cpt-1];
+						}
+						$reponsesadd[$cleinsertion] = '0';
+						$reponsesadd = implode($reponsesadd);
+						$sql .= " SET reponses = '".$db->escape($reponsesadd)."'";
+					}
+					$sql .= " WHERE id_sondage = '".$db->escape($numsondage)."'";
+					$resql = $db->query($sql);
+					if (!$resql) {
+						dol_print_error($db);
+					}
+					$compteur++;
+				}
+			}
+		}
 		$adresseadmin = $object->mail_admin;
 	} else {
 		$erreur_ajout_date = "yes";

From daababb97f3ae56e255e82cf6dd6f83e47b69e21 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 25 May 2021 19:39:06 +0200
Subject: [PATCH 0225/1497] Update index.php

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

diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index 26a62e36d6e..d51fd21279e 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -566,7 +566,7 @@ function Search2(keyCodeForEnter) {
 				$("#prodesc" + i).text(data[i]['label']);
 				$("#prodivdesc" + i).show();
 				$("#probutton" + i).text(data[i]['label']);
-				$("#probutton" + i).show();;
+				$("#probutton" + i).show();
 				if (data[i]['price_formated']) {
 					$("#proprice" + i).attr("class", "productprice");
 					$("#proprice" + i).html(data[i]['price_formated']);

From 708deaac00673e7302f489d5c704d5ea96e784e3 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Tue, 25 May 2021 17:47:28 +0000
Subject: [PATCH 0226/1497] Fixing style errors.

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

diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index 918bd4c256a..19a040bf091 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -290,10 +290,10 @@ if (!empty($search_ref_supplier)) {
 	$sql .= natural_search(array('c.ref_supplier'), $search_ref_supplier);
 }
 if ($search_zip) {
-  $sql .= natural_search(array('s.zip'), $search_zip);
+	$sql .= natural_search(array('s.zip'), $search_zip);
 }
 if ($search_town) {
-  $sql .= natural_search(array('s.town'), $search_town);
+	$sql .= natural_search(array('s.town'), $search_town);
 }
 if ($search_sale > 0) {
 	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$search_sale;

From 9d6e93fd0132c31241daab8557f47247ce80d50e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 25 May 2021 19:50:53 +0200
Subject: [PATCH 0227/1497] Update security.php

---
 htdocs/admin/system/security.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/admin/system/security.php b/htdocs/admin/system/security.php
index 89d3a3fe251..cb28b20195d 100644
--- a/htdocs/admin/system/security.php
+++ b/htdocs/admin/system/security.php
@@ -278,7 +278,7 @@ print '<br>';
 
 print '<strong>'.$langs->trans("AntivirusEnabledOnUpload").'</strong>: ';
 print empty($conf->global->MAIN_ANTIVIRUS_COMMAND) ? '' : img_picto('', 'tick').' ';
-print yn(!empty($conf->global->MAIN_ANTIVIRUS_COMMAND) ? 1 : 0);
+print yn(empty($conf->global->MAIN_ANTIVIRUS_COMMAND) ? 0 : 1);
 if (!empty($conf->global->MAIN_ANTIVIRUS_COMMAND)) {
 	print ' &nbsp; - '.$conf->global->MAIN_ANTIVIRUS_COMMAND;
 	if (defined('MAIN_ANTIVIRUS_COMMAND')) {

From 3dfb22b05e3605f7a4a728711e1247524f32ee9f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 25 May 2021 19:54:09 +0200
Subject: [PATCH 0228/1497] Update task.class.php

---
 htdocs/projet/class/task.class.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index 97586a41f41..80333f3d9fb 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -1986,7 +1986,8 @@ class Task extends CommonObject
 		global $conf, $langs;
 
 		// For external user, no check is done on company because readability is managed by public status of project and assignement.
-		$socid = $user->socid;
+		//$socid = $user->socid;
+		$socid = 0;
 
 		$projectstatic = new Project($this->db);
 		$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1, $socid);
@@ -2007,10 +2008,7 @@ class Task extends CommonObject
 			$sql .= " AND p.rowid IN (".$this->db->sanitize($projectsListId).")";
 		}
 		// No need to check company, as filtering of projects must be done by getProjectsAuthorizedForUser
-		//if ($socid || ! $user->rights->societe->client->voir)	$sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
-		if ($socid) {
-			$sql .= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".((int) $socid).")";
-		}
+		//if ($socid || ! $user->rights->societe->client->voir)	$sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".((int) $socid).")";
 		// No need to check company, as filtering of projects must be done by getProjectsAuthorizedForUser
 		// if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND ((s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id.") OR (s.rowid IS NULL))";
 

From 0d31db0ba5bb88d6d47f6e4c5719f4a06414b02f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 25 May 2021 20:11:46 +0200
Subject: [PATCH 0229/1497] Update don.class.php

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

diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php
index 9396f3a718a..3e0e300930d 100644
--- a/htdocs/don/class/don.class.php
+++ b/htdocs/don/class/don.class.php
@@ -390,7 +390,7 @@ class Don extends CommonObject
 		$sql .= ", phone";
 		$sql .= ", phone_mobile";
 		$sql .= ") VALUES (";
-		$sql .= "'".$this->db->idate($this->date)."'";
+		$sql .= "'".$this->db->idate($this->date ? $this->date : $now)."'";
 		$sql .= ", ".$conf->entity;
 		$sql .= ", ".price2num($this->amount);
 		$sql .= ", ".($this->modepaymentid ? $this->modepaymentid : "null");

From 4b47611e23e43dddd0612486ce42181eafaf9668 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 25 May 2021 21:21:09 +0200
Subject: [PATCH 0230/1497] Debug v14

---
 htdocs/compta/facture/class/facture.class.php |   2 +-
 htdocs/compta/facture/list.php                |  11 +-
 htdocs/fourn/facture/list.php                 | 105 ++----------------
 3 files changed, 15 insertions(+), 103 deletions(-)

diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index bb25da4e604..6dd67d4d931 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -352,7 +352,7 @@ class Facture extends CommonInvoice
 		'datec' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-1, 'position'=>500),
 		'tms' =>array('type'=>'timestamp', 'label'=>'DateModificationShort', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>500),
 		'import_key' =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>900),
-		'fk_statut' =>array('type'=>'smallint(6)', 'label'=>'Status', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>1000, 'arrayofkeyval'=>array(0=>'Draft', 1=>'Validated', 2=>'Paid', 3=>'Abandonned')),
+		'fk_statut' =>array('type'=>'smallint(6)', 'label'=>'Status', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'position'=>1000, 'arrayofkeyval'=>array(0=>'Draft', 1=>'Validated', 2=>'Paid', 3=>'Abandonned')),
 	);
 	// END MODULEBUILDER PROPERTIES
 
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 42e10477a3a..fb4089fabec 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -390,17 +390,16 @@ if ($massaction == 'makepayment_confirm') {
 				$totalcreditnotes = $objecttmp->getSumCreditNotesUsed();
 				$totaldeposits = $objecttmp->getSumDepositsUsed();
 				$objecttmp->resteapayer = price2num($objecttmp->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits, 'MT');
-				if ($objecttmp->paye || $objecttmp->resteapayer == 0) {
+				if ($objecttmp->statut == Facture::STATUS_DRAFT) {
+					$error++;
+					setEventMessages($objecttmp->ref.' '.$langs->trans("Draft"), $objecttmp->errors, 'errors');
+				} elseif ($objecttmp->paye || $objecttmp->resteapayer == 0) {
 					$error++;
 					setEventMessages($objecttmp->ref.' '.$langs->trans("AlreadyPaid"), $objecttmp->errors, 'errors');
 				} elseif ($objecttmp->resteapayer < 0) {
 					$error++;
 					setEventMessages($objecttmp->ref.' '.$langs->trans("AmountMustBePositive"), $objecttmp->errors, 'errors');
 				}
-				if (!($objecttmp->statut > Facture::STATUS_DRAFT)) {
-					$error++;
-					setEventMessages($objecttmp->ref.' '.$langs->trans("Draft"), $objecttmp->errors, 'errors');
-				}
 
 				$rsql = "SELECT pfd.rowid, pfd.traite, pfd.date_demande as date_demande";
 				$rsql .= " , pfd.date_traite as date_traite";
@@ -952,7 +951,7 @@ if ($resql) {
 	);
 	if ($conf->prelevement->enabled && !empty($user->rights->prelevement->bons->creer)) {
 			$langs->load("withdrawals");
-			$arrayofmassactions['withdrawrequest'] = $langs->trans("MakeWithdrawRequest");
+			$arrayofmassactions['withdrawrequest'] = img_picto('', 'payment', 'class="pictofixedwidth"').$langs->trans("MakeWithdrawRequest");
 	}
 	if ($user->rights->facture->supprimer) {
 		if (!empty($conf->global->INVOICE_CAN_REMOVE_DRAFT_ONLY)) {
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 4fd45d6cff0..0c4f21ae4be 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -300,17 +300,16 @@ if (empty($reshook)) {
 					$totalcreditnotes = $objecttmp->getSumCreditNotesUsed();
 					$totaldeposits = $objecttmp->getSumDepositsUsed();
 					$objecttmp->resteapayer = price2num($objecttmp->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits, 'MT');
-					if ($objecttmp->paye || $objecttmp->resteapayer == 0) {
+					if ($objecttmp->statut == FactureFournisseur::STATUS_DRAFT) {
+						$error++;
+						setEventMessages($objecttmp->ref.' '.$langs->trans("Draft"), $objecttmp->errors, 'errors');
+					} elseif ($objecttmp->paye || $objecttmp->resteapayer == 0) {
 						$error++;
 						setEventMessages($objecttmp->ref.' '.$langs->trans("AlreadyPaid"), $objecttmp->errors, 'errors');
 					} elseif ($objecttmp->resteapayer < 0) {
 						$error++;
 						setEventMessages($objecttmp->ref.' '.$langs->trans("AmountMustBePositive"), $objecttmp->errors, 'errors');
 					}
-					if (!($objecttmp->statut > FactureFournisseur::STATUS_DRAFT)) {
-						$error++;
-						setEventMessages($objecttmp->ref.' '.$langs->trans("Draft"), $objecttmp->errors, 'errors');
-					}
 
 					$rsql = "SELECT pfd.rowid, pfd.traite, pfd.date_demande as date_demande";
 					$rsql .= " , pfd.date_traite as date_traite";
@@ -340,7 +339,7 @@ if (empty($reshook)) {
 				}
 			}
 
-			//Massive withdraw request for request with no errors
+			// Massive withdraw request for request with no errors
 			if (!empty($listofbills)) {
 				$nbwithdrawrequestok = 0;
 				foreach ($listofbills as $aBill) {
@@ -363,88 +362,6 @@ if (empty($reshook)) {
 }
 
 
-if ($massaction == 'transfer_request') {
-	$langs->load("withdrawals");
-
-	if (!$user->rights->paymentbybanktransfer->create) {
-		$error++;
-		setEventMessages($langs->trans("NotEnoughPermissions"), null, 'errors');
-	} else {
-		//Checking error
-		$error = 0;
-
-		$arrayofselected = is_array($toselect) ? $toselect : array();
-		$listofbills = array();
-		foreach ($arrayofselected as $toselectid) {
-			$objecttmp = new FactureFournisseur($db);
-			$result = $objecttmp->fetch($toselectid);
-			if ($result > 0) {
-				$totalpaye = $objecttmp->getSommePaiement();
-				$totalcreditnotes = $objecttmp->getSumCreditNotesUsed();
-				$totaldeposits = $objecttmp->getSumDepositsUsed();
-				$objecttmp->resteapayer = price2num($objecttmp->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits, 'MT');
-				if ($objecttmp->paye || $objecttmp->resteapayer == 0) {
-					$error++;
-					setEventMessages($objecttmp->ref.' '.$langs->trans("AlreadyPaid"), $objecttmp->errors, 'errors');
-				} elseif ($objecttmp->resteapayer < 0) {
-					$error++;
-					setEventMessages($objecttmp->ref.' '.$langs->trans("AmountMustBePositive"), $objecttmp->errors, 'errors');
-				}
-				if (!($objecttmp->statut > FactureFournisseur::STATUS_DRAFT)) {
-					$error++;
-					setEventMessages($objecttmp->ref.' '.$langs->trans("Draft"), $objecttmp->errors, 'errors');
-				}
-
-				$rsql = "SELECT pfd.rowid, pfd.traite, pfd.date_demande as date_demande";
-				$rsql .= " , pfd.date_traite as date_traite";
-				$rsql .= " , pfd.amount";
-				$rsql .= " , u.rowid as user_id, u.lastname, u.firstname, u.login";
-				$rsql .= " FROM ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
-				$rsql .= " , ".MAIN_DB_PREFIX."user as u";
-				$rsql .= " WHERE fk_facture_fourn = ".$objecttmp->id;
-				$rsql .= " AND pfd.fk_user_demande = u.rowid";
-				$rsql .= " AND pfd.traite = 0";
-				$rsql .= " ORDER BY pfd.date_demande DESC";
-
-				$result_sql = $db->query($rsql);
-				if ($result_sql) {
-					$numprlv = $db->num_rows($result_sql);
-				}
-
-				if ($numprlv > 0) {
-					$error++;
-					setEventMessages($objecttmp->ref.' '.$langs->trans("RequestAlreadyDone"), $objecttmp->errors, 'warnings');
-				} elseif (!empty($objecttmp->mode_reglement_code) && $objecttmp->mode_reglement_code != 'VIR') {
-					$error++;
-					setEventMessages($objecttmp->ref.' '.$langs->trans("BadPaymentMethod"), $objecttmp->errors, 'errors');
-				} else {
-					$listofbills[] = $objecttmp; // $listofbills will only contains invoices with good payment method and no request already done
-				}
-			}
-		}
-
-		//Massive withdraw request for request with no errors
-		if (!empty($listofbills)) {
-			$nbwithdrawrequestok = 0;
-			foreach ($listofbills as $aBill) {
-				$db->begin();
-				$result = $aBill->demande_prelevement($user, $aBill->resteapayer, 'bank-transfer', 'supplier_invoice');
-				if ($result > 0) {
-					$db->commit();
-					$nbwithdrawrequestok++;
-				} else {
-					$db->rollback();
-					setEventMessages($aBill->error, $aBill->errors, 'errors');
-				}
-			}
-			if ($nbwithdrawrequestok > 0) {
-				setEventMessages($langs->trans("BankTransferRequestsDone", $nbwithdrawrequestok), null, 'mesgs');
-			}
-		}
-	}
-}
-
-
 /*
  * View
  */
@@ -623,7 +540,7 @@ if ($search_login) {
 	$sql .= natural_search('u.login', $search_login);
 }
 if ($search_status != '' && $search_status >= 0) {
-	$sql .= " AND f.fk_statut = ".$db->escape($search_status);
+	$sql .= " AND f.fk_statut = ".((int) $search_status);
 }
 if ($search_paymentmode > 0) {
 	$sql .= " AND f.fk_mode_reglement = ".((int) $search_paymentmode);
@@ -646,7 +563,7 @@ if ($search_categ_sup == -2) {
 	$sql .= " AND cs.fk_categorie IS NULL";
 }
 if ($search_status != '' && $search_status >= 0) {
-	$sql .= " AND f.fk_statut = ".$search_status;
+	$sql .= " AND f.fk_statut = ".((int) $search_status);
 }
 if ($filter && $filter != -1) {
 	$aFilter = explode(',', $filter);
@@ -857,14 +774,10 @@ if ($resql) {
 		//'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
 		//'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
 	);
-	if ($conf->paymentbybanktransfer->enabled) {
-			$langs->load("withdrawals");
-			$arrayofmassactions['transfer_request'] = $langs->trans("MakeBankTransferOrder");
-	}
 	//if($user->rights->fournisseur->facture->creer) $arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisCustomer");
 	if (!empty($conf->paymentbybanktransfer->enabled) && !empty($user->rights->paymentbybanktransfer->create)) {
 		$langs->load('withdrawals');
-		$arrayofmassactions['banktransfertrequest'] = $langs->trans("MakeBankTransferOrder");
+		$arrayofmassactions['banktransfertrequest'] = img_picto('', 'payment', 'class="pictofixedwidth"').$langs->trans("MakeBankTransferOrder");
 	}
 	if ($user->rights->fournisseur->facture->supprimer) {
 		$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
@@ -876,7 +789,7 @@ if ($resql) {
 
 	$url = DOL_URL_ROOT.'/fourn/facture/card.php?action=create';
 	if (!empty($socid)) {
-		$url .= '&socid='.$socid;
+		$url .= '&socid='.urlencode($socid);
 	}
 	$newcardbutton = dolGetButtonTitle($langs->trans('NewBill'), '', 'fa fa-plus-circle', $url, '', ($user->rights->fournisseur->facture->creer || $user->rights->supplier_invoice->creer));
 

From bad90240bc8b6fda2ecf88489af2ae4ec22f0cc9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 25 May 2021 21:39:50 +0200
Subject: [PATCH 0231/1497] Update pdf_cyan.modules.php

---
 htdocs/core/modules/propale/doc/pdf_cyan.modules.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
index 2b40dffa30e..4d2d159ec02 100644
--- a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
@@ -434,13 +434,12 @@ class pdf_cyan extends ModelePDFPropales
 					$notetoshow = dol_concatdesc($notetoshow, $extranote);
 				}
 
-				if (!empty($conf->global->MAIN_ADD_CREATOR_IN_NOTE) && $object->user_author_id > 0)
-				{
+				if (!empty($conf->global->MAIN_ADD_CREATOR_IN_NOTE) && $object->user_author_id > 0) {
 					$tmpuser = new User($this->db);
 					$tmpuser->fetch($object->user_author_id);
 					$creator_info = $langs->trans("CaseFollowedBy").' '.$tmpuser->getFullName($langs);
-					if ($tmpuser->email) $creator_info .= ',  Mail: '.$tmpuser->email;
-					if ($tmpuser->office_phone) $creator_info .= ', Tel: '.$tmpuser->office_phone;
+					if ($tmpuser->email) $creator_info .= ',  '.$langs->trans("EMail").': '.$tmpuser->email;
+					if ($tmpuser->office_phone) $creator_info .= ', '.$langs->trans("Phone").': '.$tmpuser->office_phone;
 
 					$notetoshow = dol_concatdesc($notetoshow, $creator_info);
 				}

From 9aee8a2a0b94194f25295e4778a7e89e84d16177 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 25 May 2021 21:53:44 +0200
Subject: [PATCH 0232/1497] FIX #17406

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

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 511331e6008..2ccc5e63c8f 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -5184,7 +5184,7 @@ class Product extends CommonObject
 	 *  Load value ->stock_theorique of a product. Property this->id must be defined.
 	 *  This function need a lot of load. If you use it on list, use a cache to execute it one for each product id.
 	 *
-	 * 	@param	int		$includedraftpoforvirtual	Include draft status of PO for virtual stock calculation
+	 * 	@param	int		$includedraftpoforvirtual	Include draft status and not yet approved Purchase Orders for virtual stock calculation
 	 *  @return int     							< 0 if KO, > 0 if OK
 	 *  @see	load_stock(), loadBatchInfo()
 	 */
@@ -5223,9 +5223,9 @@ class Product extends CommonObject
 			$stock_sending_client = $this->stats_expedition['qty'];
 		}
 		if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_order->enabled)) {
-			$filterStatus = '1,2,3,4';
+			$filterStatus = empty($conf->global->SUPPLIER_ORDER_STATUS_FOR_VIRTUAL_STOCK) ? '2,3,4' : $conf->global->SUPPLIER_ORDER_STATUS_FOR_VIRTUAL_STOCK;
 			if (isset($includedraftpoforvirtual)) {
-				$filterStatus = '0,'.$filterStatus;
+				$filterStatus = '0,1,2,'.$filterStatus;	// 1,2 may have already been inside $filterStatus but it is better to have twice than missing $filterStatus does not include them
 			}
 			$result = $this->load_stats_commande_fournisseur(0, $filterStatus, 1);
 			if ($result < 0) {

From c76cf60e1562d1abb1e1eff67fb6eb849ba53b00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Tue, 25 May 2021 22:09:58 +0200
Subject: [PATCH 0233/1497] Update html.form.class.php

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 43eb8f208db..3bd39359f33 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2004       Eric Seigne             <eric.seigne@ryxeo.com>
  * Copyright (C) 2005-2017  Regis Houssin           <regis.houssin@inodbox.com>
  * Copyright (C) 2006       Andre Cianfarani        <acianfa@free.fr>
- * Copyright (C) 2006       Marc Barilley/Ocebo     <marc@ocebo.com>
+ * Copyright (C) 2006       Marc Barilley/Ocebo     <marc@ocebo.com>logo
  * Copyright (C) 2007       Franky Van Liedekerke   <franky.van.liedekerker@telenet.be>
  * Copyright (C) 2007       Patrick Raguin          <patrick.raguin@gmail.com>
  * Copyright (C) 2010       Juanjo Menent           <jmenent@2byte.es>
@@ -8208,7 +8208,7 @@ class Form
 		} elseif ($modulepart == 'contact')	{
 			$dir = $conf->societe->multidir_output[$entity].'/contact';
 			if (!empty($object->photo)) {
-				if (dolIsAllowedForPreview($object->logo)) {
+				if (dolIsAllowedForPreview($object->photo)) {
 					if ((string) $imagesize == 'mini') {
 						$file = get_exdir(0, 0, 0, 0, $object, 'contact').'photos/'.getImageFileNameForSize($object->photo, '_mini');
 					} elseif ((string) $imagesize == 'small') {
@@ -8224,7 +8224,7 @@ class Form
 		} elseif ($modulepart == 'userphoto') {
 			$dir = $conf->user->dir_output;
 			if (!empty($object->photo)) {
-				if (dolIsAllowedForPreview($object->logo)) {
+				if (dolIsAllowedForPreview($object->photo)) {
 					if ((string) $imagesize == 'mini') {
 						$file = get_exdir(0, 0, 0, 0, $object, 'user').getImageFileNameForSize($object->photo, '_mini');
 					} elseif ((string) $imagesize == 'small') {
@@ -8243,7 +8243,7 @@ class Form
 		} elseif ($modulepart == 'memberphoto')	{
 			$dir = $conf->adherent->dir_output;
 			if (!empty($object->photo)) {
-				if (dolIsAllowedForPreview($object->logo)) {
+				if (dolIsAllowedForPreview($object->photo)) {
 					if ((string) $imagesize == 'mini') {
 						$file = get_exdir(0, 0, 0, 0, $object, 'member').'photos/'.getImageFileNameForSize($object->photo, '_mini');
 					} elseif ((string) $imagesize == 'small') {
@@ -8263,7 +8263,7 @@ class Form
 			// Generic case to show photos
 			$dir = $conf->$modulepart->dir_output;
 			if (!empty($object->photo)) {
-				if (dolIsAllowedForPreview($object->logo)) {
+				if (dolIsAllowedForPreview($object->photo)) {
 					if ((string) $imagesize == 'mini') {
 						$file = get_exdir($id, 2, 0, 0, $object, $modulepart).'photos/'.getImageFileNameForSize($object->photo, '_mini');
 					} elseif ((string) $imagesize == 'small') {

From 4c698ce7989a955cdd5ab98667633e9b1fa69989 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Tue, 25 May 2021 22:11:30 +0200
Subject: [PATCH 0234/1497] Update html.form.class.php

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 3bd39359f33..0f4bff6b2ba 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2004       Eric Seigne             <eric.seigne@ryxeo.com>
  * Copyright (C) 2005-2017  Regis Houssin           <regis.houssin@inodbox.com>
  * Copyright (C) 2006       Andre Cianfarani        <acianfa@free.fr>
- * Copyright (C) 2006       Marc Barilley/Ocebo     <marc@ocebo.com>logo
+ * Copyright (C) 2006       Marc Barilley/Ocebo     <marc@ocebo.com>
  * Copyright (C) 2007       Franky Van Liedekerke   <franky.van.liedekerker@telenet.be>
  * Copyright (C) 2007       Patrick Raguin          <patrick.raguin@gmail.com>
  * Copyright (C) 2010       Juanjo Menent           <jmenent@2byte.es>

From 332d8c91051453f1d122359409b24115f0d306cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Tue, 25 May 2021 22:24:46 +0200
Subject: [PATCH 0235/1497] fix warnings

---
 htdocs/comm/action/card.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 793518ed150..245f90edf72 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -1986,7 +1986,7 @@ if ($id > 0) {
 		print '	</td></tr>';
 
 		// Done by
-		if ($conf->global->AGENDA_ENABLE_DONEBY) {
+		if (!empty($conf->global->AGENDA_ENABLE_DONEBY)) {
 			print '<tr><td class="nowrap">'.$langs->trans("ActionDoneBy").'</td><td>';
 			if ($object->userdoneid > 0) {
 				$tmpuser = new User($db);
@@ -2080,10 +2080,10 @@ if ($id > 0) {
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
 		// Reminders
-		if ($conf->global->AGENDA_REMINDER_EMAIL || $conf->global->AGENDA_REMINDER_BROWSER) {
-			$filtreuserid = $user->id;
+		if (!empty($conf->global->AGENDA_REMINDER_EMAIL) || !empty($conf->global->AGENDA_REMINDER_BROWSER)) {
+			$filteruserid = $user->id;
 			if ($user->rights->agenda->allactions->read) {
-				$filtreuserid = 0;
+				$filteruserid = 0;
 			}
 			$object->loadReminders('', $filteruserid, false);
 

From 8576cf1b725c1597008048c4510185de22fe0d4a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 25 May 2021 22:51:37 +0200
Subject: [PATCH 0236/1497] Fix combo when we must no hide value with key -1

---
 htdocs/adherents/list.php             | 6 +++---
 htdocs/core/class/html.form.class.php | 2 +-
 htdocs/core/lib/ajax.lib.php          | 7 ++++---
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index 1ec9d498b9d..b6fe79b8d68 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -708,7 +708,7 @@ if (!empty($arrayfields['d.morphy']['checked'])) {
 if (!empty($arrayfields['t.libelle']['checked'])) {
 	print '<td class="liste_titre">';
 	$listetype = $membertypestatic->liste_array();
-	print $form->selectarray("search_type", $listetype, $type, 1, 0, 0, '', 0, 32);
+	print $form->selectarray("search_type", $listetype, $search_type, 1, 0, 0, '', 0, 32);
 	print '</td>';
 }
 
@@ -792,8 +792,8 @@ if (!empty($arrayfields['d.statut']['checked'])) {
 	$liststatus = array(
 		'-1'=>$langs->trans("Draft"),
 		'1'=>$langs->trans("Validated"),
-		'0'=>$langs->trans("Resiliated"),
-		'-2'=>$langs->trans("Excluded")
+		'0'=>$langs->trans("MemberStatusResiliatedShort"),
+		'-2'=>$langs->trans("MemberStatusExcludedShort")
 	);
 	print $form->selectarray('search_status', $liststatus, $search_status, -3);
 	print '</td>';
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 43eb8f208db..fec54c8d688 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -6924,7 +6924,7 @@ class Form
 		if ($addjscombo && $jsbeautify) {
 			// Enhance with select2
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
-			$out .= ajax_combobox($htmlname);
+			$out .= ajax_combobox($htmlname, array(), 0, 0, 'resolve', $show_empty < 0 ? (string) $show_empty : '-1');
 		}
 
 		$out .= '<select id="'.preg_replace('/^\./', '', $htmlname).'" '.($disabled ? 'disabled="disabled" ' : '').'class="flat '.(preg_replace('/^\./', '', $htmlname)).($morecss ? ' '.$morecss : '').'"';
diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index bd69b812200..99cf4e4f8d1 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -411,10 +411,11 @@ function ajax_dialog($title, $message, $w = 350, $h = 150)
  * @param  	int		$minLengthToAutocomplete	Minimum length of input string to start autocomplete
  * @param	int		$forcefocus					Force focus on field
  * @param	string	$widthTypeOfAutocomplete	'resolve' or 'off'
+ * @param	string	$idforemptyvalue			'-1'
  * @return	string								Return html string to convert a select field into a combo, or '' if feature has been disabled for some reason.
  * @see selectArrayAjax() of html.form.class
  */
-function ajax_combobox($htmlname, $events = array(), $minLengthToAutocomplete = 0, $forcefocus = 0, $widthTypeOfAutocomplete = 'resolve')
+function ajax_combobox($htmlname, $events = array(), $minLengthToAutocomplete = 0, $forcefocus = 0, $widthTypeOfAutocomplete = 'resolve', $idforemptyvalue = '-1')
 {
 	global $conf;
 
@@ -455,14 +456,14 @@ function ajax_combobox($htmlname, $events = array(), $minLengthToAutocomplete =
 	 					/* Code to add class of origin OPTION propagated to the new select2 <li> tag */
 						if (data.element) { $(container).addClass($(data.element).attr("class")); }
 					    //console.log($(data.element).attr("data-html"));
-					    if (data.id == -1 && $(data.element).attr("data-html") == undefined) {
+					    if (data.id == '.((int) $idforemptyvalue).' && $(data.element).attr("data-html") == undefined) {
 							return \'&nbsp;\';
 						}
 						if ($(data.element).attr("data-html") != undefined) return htmlEntityDecodeJs($(data.element).attr("data-html"));		// If property html set, we decode html entities and use this
 						return data.text;
 					},
 					templateSelection: function (selection) {		/* Format visible output of selected value */
-						if (selection.id == -1) return \'<span class="placeholder">\'+selection.text+\'</span>\';
+						if (selection.id == '.((int) $idforemptyvalue).') return \'<span class="placeholder">\'+selection.text+\'</span>\';
 						return selection.text;
 					},
 					escapeMarkup: function(markup) {

From 9e3de39245a81369342bdc076835c2da8545c4e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Tue, 25 May 2021 23:00:21 +0200
Subject: [PATCH 0237/1497] fix status/percent

in sql it is a.datep as dp, not datep
---
 htdocs/comm/action/list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index e3cc54f5a35..e5dba5d88db 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -1006,7 +1006,7 @@ if ($resql) {
 		}
 		if (!empty($arrayfields['a.percent']['checked'])) {
 			// Status/Percent
-			$datep = $db->jdate($obj->datep);
+			$datep = $db->jdate($obj->dp);
 			print '<td align="center" class="nowrap">'.$actionstatic->LibStatut($obj->percent, 5, 0, $datep).'</td>';
 		}
 		// Action column

From 1662d4a82997f35fd841d7d69312f05bcbfdc2c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Tue, 25 May 2021 23:14:36 +0200
Subject: [PATCH 0238/1497] fix warnings

---
 htdocs/fourn/commande/list.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index aba5b8060f9..e7f19d0671a 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2014      Marcos García        <marcosgdf@gmail.com>
  * Copyright (C) 2014      Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2016      Ferran Marcet        <fmarcet@2byte.es>
- * Copyright (C) 2018      Frédéric France      <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2021 Frédéric France      <frederic.france@netlogic.fr>
  * Copyright (C) 2018-2020 Charlene Benke       <charlie@patas-monkey.com>
  * Copyright (C) 2019      Nicolas ZABOURI      <info@inovea-conseil.com>
  *
@@ -1272,6 +1272,10 @@ if ($resql) {
 
 	$i = 0;
 	$totalarray = array();
+	$totalarray['nbfield'] = 0;
+	$totalarray['val'] = array();
+	$totalarray['val']['cf.total_ht'] = 0;
+	$totalarray['val']['cf.total_ttc'] = 0;
 	while ($i < min($num, $limit)) {
 		$obj = $db->fetch_object($resql);
 

From 4067ac19dcf2048e251a7676b701beb34a0858c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Tue, 25 May 2021 23:17:34 +0200
Subject: [PATCH 0239/1497] fix warning

---
 htdocs/fichinter/list.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index 31fd0ea3152..f96b9e62f88 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -572,6 +572,7 @@ if ($resql) {
 	$total = 0;
 	$i = 0;
 	$totalarray = array();
+	$totalarray['nbfield'] = 0;
 	while ($i < min($num, $limit)) {
 		$obj = $db->fetch_object($resql);
 

From e316437a0e824985c13f157881b2f603c39b0cae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Tue, 25 May 2021 23:20:55 +0200
Subject: [PATCH 0240/1497] fix warning

---
 htdocs/adherents/subscription/list.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php
index 55cafade309..06cd77f61c4 100644
--- a/htdocs/adherents/subscription/list.php
+++ b/htdocs/adherents/subscription/list.php
@@ -477,6 +477,7 @@ print "</tr>\n";
 
 
 $totalarray = array();
+$totalarray['nbfield'] = 0;
 while ($i < min($num, $limit)) {
 	$obj = $db->fetch_object($result);
 

From 8221011d7de3e244d613191bf2cea5ec045433c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Tue, 25 May 2021 23:22:43 +0200
Subject: [PATCH 0241/1497] Update list.php

---
 htdocs/adherents/list.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index b6fe79b8d68..dde013e60c4 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -891,6 +891,7 @@ print "</tr>\n";
 
 $i = 0;
 $totalarray = array();
+$totalarray['nbfield'] = 0;
 while ($i < min($num, $limit)) {
 	$obj = $db->fetch_object($resql);
 

From f9d6438baeff07e9692c5f43d61b68deb93420db Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 25 May 2021 23:26:03 +0200
Subject: [PATCH 0242/1497] Debug v14

---
 htdocs/admin/stock.php           |  2 ++
 htdocs/core/class/conf.class.php |  4 ++++
 htdocs/langs/en_US/mrp.lang      |  2 +-
 htdocs/product/stock/product.php | 34 ++++++++++++++++++--------------
 4 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php
index c5e98935ebb..a4a9e91e3ff 100644
--- a/htdocs/admin/stock.php
+++ b/htdocs/admin/stock.php
@@ -744,6 +744,7 @@ if ($conf->use_javascript_ajax) {
 print "</td>\n";
 print "</tr>\n";
 
+/* Disabled. Would be better to be managed with a user cookie
 if (!empty($conf->productbatch->enabled)) {
 	print '<tr class="oddeven">';
 	print '<td>' . $langs->trans("ShowAllBatchByDefault") . '</td>';
@@ -757,6 +758,7 @@ if (!empty($conf->productbatch->enabled)) {
 	print "</td>\n";
 	print "</tr>\n";
 }
+*/
 
 print '</table>';
 
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 632cfc0311f..8766d68c25b 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -533,6 +533,10 @@ class Conf
 			}
 		}
 
+		if (!isset($this->global->STOCK_SHOW_ALL_BATCH_BY_DEFAULT)) {
+			$this->global->STOCK_SHOW_ALL_BATCH_BY_DEFAULT = 1;
+		}
+
 		// conf->currency
 		if (empty($this->global->MAIN_MONNAIE)) {
 			$this->global->MAIN_MONNAIE = 'EUR';
diff --git a/htdocs/langs/en_US/mrp.lang b/htdocs/langs/en_US/mrp.lang
index f47354958eb..2414a92cefb 100644
--- a/htdocs/langs/en_US/mrp.lang
+++ b/htdocs/langs/en_US/mrp.lang
@@ -70,7 +70,7 @@ ProductionForRef=Production of %s
 AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
 NoStockChangeOnServices=No stock change on services
 ProductQtyToConsumeByMO=Product quantity still to consume by open MO
-ProductQtyToProduceByMO=Product quentity still to produce by open MO
+ProductQtyToProduceByMO=Product quantity still to produce by open MO
 AddNewConsumeLines=Add new line to consume
 ProductsToConsume=Products to consume
 ProductsToProduce=Products to produce
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 9b8af58e347..07ee7a66584 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -531,43 +531,44 @@ if ($id > 0 || $ref) {
 
 	llxHeader('', $title, $helpurl);
 
+	if (! empty($conf->use_javascript_ajax)) {
 	?>
-
 	<script type="text/javascript" language="javascript">
 		$(document).ready(function() {
-
 			$(".collapse_batch").click(function() {
-
+				console.log("We click on collapse_batch");
 				var id_entrepot = $(this).attr('id').replace('ent', '');
 
 				if($(this).text().indexOf('+') > 0) {
 					$(".batch_warehouse" + id_entrepot).show();
-					$(this).html('(-)&nbsp;');
+					$(this).html('(-)');
 				}
 				else {
 					$(".batch_warehouse" + id_entrepot).hide();
-					$(this).html('(+)&nbsp;');
+					$(this).html('(+)');
 				}
 
 				return false;
 			});
 
 			$("#show_all").click(function() {
+				console.log("We click on show_all");
 				$("[class^=batch_warehouse]").show();
-				$("[class^=collapse_batch]").html('(-)&nbsp;');
+				$("[class^=collapse_batch]").html('(-)');
 				return false;
 			});
 
 			$("#hide_all").click(function() {
+				console.log("We click on hide_all");
 				$("[class^=batch_warehouse]").hide();
-				$("[class^=collapse_batch]").html('(+)&nbsp;');
+				$("[class^=collapse_batch]").html('(+)');
 				return false;
 			});
 
 		});
 	</script>
-
 	<?php
+	}
 
 	if ($result > 0) {
 		$head = product_prepare_head($object);
@@ -908,18 +909,18 @@ if (!$variants) {
 	if ((!empty($conf->productbatch->enabled)) && $object->hasbatch()) {
 		$colspan = 3;
 		print '<tr class="liste_titre"><td width="14%">';
-		print '<a id="show_all" href="#">'.img_picto('', 'folder-open', 'class="paddingright"').$langs->trans("ExpandAll").'</a><br>';
-		print '<a id="hide_all" href="#">'.img_picto('', 'folder', 'class="paddingright"').$langs->trans("UndoExpandAll").'</a>&nbsp;';
-		print $form->textwithpicto('', $langs->trans('CollapseBatchDetailHelp'), 1, 'help', '');
+		print '<a id="show_all" href="#">'.img_picto('', 'folder-open', 'class="paddingright"').$langs->trans("ExpandAll").'</a> &nbsp; ';
+		print '<a id="hide_all" href="#">'.img_picto('', 'folder', 'class="paddingright"').$langs->trans("UndoExpandAll").'</a>';
+		//print '&nbsp;'.$form->textwithpicto('', $langs->trans('CollapseBatchDetailHelp'), 1, 'help', '');
 		print '</td>';
 		print '<td class="right">'.$langs->trans("batch_number").'</td>';
 		if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
 			$colspan--;
-			print '<td class="center width75">'.$langs->trans("EatByDate").'</td>';
+			print '<td class="center width100">'.$langs->trans("EatByDate").'</td>';
 		}
 		if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
 			$colspan--;
-			print '<td class="center width75">'.$langs->trans("SellByDate").'</td>';
+			print '<td class="center width100">'.$langs->trans("SellByDate").'</td>';
 		}
 		print '<td colspan="'.$colspan.'"></td>';
 		print '<td></td>';
@@ -967,10 +968,13 @@ if (!$variants) {
 			$stock_real = price2num($obj->reel, 'MS');
 			print '<tr class="oddeven">';
 			print '<td colspan="4">';
+			print $entrepotstatic->getNomUrl(1);
 			if (!empty($conf->productbatch->enabled)) {
-				print '<a class="collapse_batch" id="ent' . $entrepotstatic->id . '" href="#">' . (empty($conf->global->STOCK_SHOW_ALL_BATCH_BY_DEFAULT) ? '(+)' : '(-)') . '&nbsp;</a>';
+				print '<a class="collapse_batch marginleftonly" id="ent' . $entrepotstatic->id . '" href="#">';
+				print (empty($conf->global->STOCK_SHOW_ALL_BATCH_BY_DEFAULT) ? '(+)' : '(-)');
+				print '</a>';
 			}
-			print $entrepotstatic->getNomUrl(1).'</td>';
+			print '</td>';
 			print '<td class="right">'.$stock_real.($stock_real < 0 ? ' '.img_warning() : '').'</td>';
 			// PMP
 			print '<td class="right">'.(price2num($object->pmp) ? price2num($object->pmp, 'MU') : '').'</td>';

From 94c8246f6844181b5f827eec2329be2a592a842a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 25 May 2021 23:30:06 +0200
Subject: [PATCH 0243/1497] Debug v14

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

diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 07ee7a66584..9ef7b011d12 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -969,7 +969,7 @@ if (!$variants) {
 			print '<tr class="oddeven">';
 			print '<td colspan="4">';
 			print $entrepotstatic->getNomUrl(1);
-			if (!empty($conf->productbatch->enabled)) {
+			if (!empty($conf->productbatch->enabled) && $object->hasbatch()) {
 				print '<a class="collapse_batch marginleftonly" id="ent' . $entrepotstatic->id . '" href="#">';
 				print (empty($conf->global->STOCK_SHOW_ALL_BATCH_BY_DEFAULT) ? '(+)' : '(-)');
 				print '</a>';

From 429ebe6662b3e5256c54ffef6e080ee7a02d8214 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Tue, 25 May 2021 23:49:49 +0200
Subject: [PATCH 0244/1497] Update api_stockmovements.class.php

---
 htdocs/product/stock/class/api_stockmovements.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/product/stock/class/api_stockmovements.class.php b/htdocs/product/stock/class/api_stockmovements.class.php
index 9b022a840fc..42a03a1836a 100644
--- a/htdocs/product/stock/class/api_stockmovements.class.php
+++ b/htdocs/product/stock/class/api_stockmovements.class.php
@@ -95,7 +95,7 @@ class StockMovements extends DolibarrApi
 	 */
 	public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $sqlfilters = '')
 	{
-		global $db, $conf;
+		global $conf;
 
 		$obj_ret = array();
 
@@ -176,7 +176,7 @@ class StockMovements extends DolibarrApi
 		}
 
 		if ($qty == 0) {
-			throw new RestException(503, "Making a stock movement with a quentity of 0 is not possible");
+			throw new RestException(503, "Making a stock movement with a quantity of 0 is not possible");
 		}
 
 		// Type increase or decrease

From 156279d6a196aedba8592ea6b05a76e3e6b2227b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 26 May 2021 00:34:52 +0200
Subject: [PATCH 0245/1497] Fix nojs

---
 htdocs/product/stock/product.php | 78 ++++++++++++++++----------------
 1 file changed, 40 insertions(+), 38 deletions(-)

diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 9ef7b011d12..5908785e1cb 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -531,43 +531,43 @@ if ($id > 0 || $ref) {
 
 	llxHeader('', $title, $helpurl);
 
-	if (! empty($conf->use_javascript_ajax)) {
-	?>
-	<script type="text/javascript" language="javascript">
-		$(document).ready(function() {
-			$(".collapse_batch").click(function() {
-				console.log("We click on collapse_batch");
-				var id_entrepot = $(this).attr('id').replace('ent', '');
+	if (!empty($conf->use_javascript_ajax)) {
+		?>
+		<script type="text/javascript" language="javascript">
+			$(document).ready(function() {
+				$(".collapse_batch").click(function() {
+					console.log("We click on collapse_batch");
+					var id_entrepot = $(this).attr('id').replace('ent', '');
 
-				if($(this).text().indexOf('+') > 0) {
-					$(".batch_warehouse" + id_entrepot).show();
-					$(this).html('(-)');
-				}
-				else {
-					$(".batch_warehouse" + id_entrepot).hide();
-					$(this).html('(+)');
-				}
+					if($(this).text().indexOf('+') > 0) {
+						$(".batch_warehouse" + id_entrepot).show();
+						$(this).html('(-)');
+					}
+					else {
+						$(".batch_warehouse" + id_entrepot).hide();
+						$(this).html('(+)');
+					}
+
+					return false;
+				});
+
+				$("#show_all").click(function() {
+					console.log("We click on show_all");
+					$("[class^=batch_warehouse]").show();
+					$("[class^=collapse_batch]").html('(-)');
+					return false;
+				});
+
+				$("#hide_all").click(function() {
+					console.log("We click on hide_all");
+					$("[class^=batch_warehouse]").hide();
+					$("[class^=collapse_batch]").html('(+)');
+					return false;
+				});
 
-				return false;
 			});
-
-			$("#show_all").click(function() {
-				console.log("We click on show_all");
-				$("[class^=batch_warehouse]").show();
-				$("[class^=collapse_batch]").html('(-)');
-				return false;
-			});
-
-			$("#hide_all").click(function() {
-				console.log("We click on hide_all");
-				$("[class^=batch_warehouse]").hide();
-				$("[class^=collapse_batch]").html('(+)');
-				return false;
-			});
-
-		});
-	</script>
-	<?php
+		</script>
+		<?php
 	}
 
 	if ($result > 0) {
@@ -909,9 +909,11 @@ if (!$variants) {
 	if ((!empty($conf->productbatch->enabled)) && $object->hasbatch()) {
 		$colspan = 3;
 		print '<tr class="liste_titre"><td width="14%">';
-		print '<a id="show_all" href="#">'.img_picto('', 'folder-open', 'class="paddingright"').$langs->trans("ExpandAll").'</a> &nbsp; ';
-		print '<a id="hide_all" href="#">'.img_picto('', 'folder', 'class="paddingright"').$langs->trans("UndoExpandAll").'</a>';
-		//print '&nbsp;'.$form->textwithpicto('', $langs->trans('CollapseBatchDetailHelp'), 1, 'help', '');
+		if (!empty($conf->use_javascript_ajax)) {
+			print '<a id="show_all" href="#">'.img_picto('', 'folder-open', 'class="paddingright"').$langs->trans("ExpandAll").'</a> &nbsp; ';
+			print '<a id="hide_all" href="#">'.img_picto('', 'folder', 'class="paddingright"').$langs->trans("UndoExpandAll").'</a>';
+			//print '&nbsp;'.$form->textwithpicto('', $langs->trans('CollapseBatchDetailHelp'), 1, 'help', '');
+		}
 		print '</td>';
 		print '<td class="right">'.$langs->trans("batch_number").'</td>';
 		if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
@@ -969,7 +971,7 @@ if (!$variants) {
 			print '<tr class="oddeven">';
 			print '<td colspan="4">';
 			print $entrepotstatic->getNomUrl(1);
-			if (!empty($conf->productbatch->enabled) && $object->hasbatch()) {
+			if (!empty($conf->use_javascript_ajax) && !empty($conf->productbatch->enabled) && $object->hasbatch()) {
 				print '<a class="collapse_batch marginleftonly" id="ent' . $entrepotstatic->id . '" href="#">';
 				print (empty($conf->global->STOCK_SHOW_ALL_BATCH_BY_DEFAULT) ? '(+)' : '(-)');
 				print '</a>';

From eec254f066a7f985588b49559b88ed2d86178d1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 26 May 2021 08:42:35 +0200
Subject: [PATCH 0246/1497] fix warning

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

diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index 49a3cc74182..5182a6ff778 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2012       Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2012-2020  Philippe Grand          <philippe.grand@atoo-net.com>
  * Copyright (C) 2015-2018  Alexandre Spangaro      <aspangaro@open-dsi.fr>
- * Copyright (C) 2018-2020  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2021  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2021       Waël Almoman            <info@almoman.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -1088,7 +1088,8 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				if (!$value['active']) {
 					break;
 				}
-				print '<tr><td>'.$langs->trans($value['label']).'</td><td><input type="text" name="member_'.$key.'" size="40" value="'.(GETPOSTISSET('member_'.$key) ? GETPOST('member_'.$key, 'alpha') : $object->socialnetworks[$key]).'"></td></tr>';
+				$val = (GETPOSTISSET('member_'.$key) ? GETPOST('member_'.$key, 'alpha') : (empty($object->socialnetworks[$key]) ? '' : $object->socialnetworks[$key]));
+				print '<tr><td>'.$langs->trans($value['label']).'</td><td><input type="text" name="member_'.$key.'" size="40" value="'.$val.'"></td></tr>';
 			}
 		}
 

From 9a51333662701bb8c35a873f2e4ca28f34acf75a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 26 May 2021 08:49:54 +0200
Subject: [PATCH 0247/1497] fix warning

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

diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 1165d6a9fd7..844dd7810f7 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -1399,7 +1399,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				print '</tr><tr>';
 			}
 			print '<td class="individualline noemail">'.$form->editfieldkey($langs->trans('No_Email') .' ('.$langs->trans('Contact').')', 'contact_no_email', '', $object, 0).'</td>';
-			print '<td class="individualline" '.(($conf->browser->layout == 'phone') || empty($conf->mailing->enabled) ? ' colspan="3"' : '').'>'.$form->selectyesno('contact_no_email', (GETPOSTISSET("contact_no_email") ?GETPOST("contact_no_email", 'alpha') : $object->no_email), 1, false, 1).'</td>';
+			print '<td class="individualline" '.(($conf->browser->layout == 'phone') || empty($conf->mailing->enabled) ? ' colspan="3"' : '').'>'.$form->selectyesno('contact_no_email', (GETPOSTISSET("contact_no_email") ? GETPOST("contact_no_email", 'alpha') : (empty($object->no_email) ? 0 : 1)), 1, false, 1).'</td>';
 		}
 		print '</tr>';
 		print '<tr><td>'.$form->editfieldkey('Web', 'url', '', $object, 0).'</td>';

From 60196c04172aa2c647d6803d5657188cd48a69d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 26 May 2021 08:53:17 +0200
Subject: [PATCH 0248/1497] Update card.php

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

diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 844dd7810f7..aa8205bfa99 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -398,12 +398,12 @@ if (empty($reshook)) {
 			$error++;
 		}
 
-		if (!empty($conf->mailing->enabled) && $conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS==-1 && GETPOST('contact_no_email', 'int')==-1 && !empty(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL))) {
+		if (!empty($conf->mailing->enabled) && !empty($conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS) && $conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS==-1 && GETPOST('contact_no_email', 'int')==-1 && !empty(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL))) {
 			$error++;
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("No_Email")), null, 'errors');
 		}
 
-		if (!empty($conf->mailing->enabled) && GETPOST("private", 'int') == 1 && $conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS==-1 && GETPOST('contact_no_email', 'int')==-1 && !empty(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL))) {
+		if (!empty($conf->mailing->enabled) && GETPOST("private", 'int') == 1 && !empty($conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS) && $conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS==-1 && GETPOST('contact_no_email', 'int')==-1 && !empty(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL))) {
 			$error++;
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("No_Email")), null, 'errors');
 		}

From fe6b25ede698f047f6a4864d43c95080b73c6e05 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Wed, 26 May 2021 09:48:13 +0200
Subject: [PATCH 0249/1497] fix on $value

---
 htdocs/comm/action/class/actioncomm.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 5790811fc2e..3943a37e5a7 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -1902,10 +1902,10 @@ class ActionComm extends CommonObject
 					}
 				}
 				if ($key == 'module') {
-					$sql .= " AND c.module LIKE '%".$value."'";
+					$sql .= " AND c.module LIKE '%".$this->db->escape($value)."'";
 				}
 				if ($key == 'status') {
-					$sql .= " AND a.status =".$value;
+					$sql .= " AND a.status =".((int) $value);
 				}
 			}
 

From 2130be975e1e9546961b95b72d230a36f0d4d2fe Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 26 May 2021 11:01:54 +0200
Subject: [PATCH 0250/1497] Fix perm

---
 test/phpunit/CMailFileTest.php | 0
 test/phpunit/ContactTest.php   | 0
 test/phpunit/ModulesTest.php   | 0
 test/phpunit/PricesTest.php    | 0
 test/phpunit/SocieteTest.php   | 0
 5 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 test/phpunit/CMailFileTest.php
 mode change 100755 => 100644 test/phpunit/ContactTest.php
 mode change 100755 => 100644 test/phpunit/ModulesTest.php
 mode change 100755 => 100644 test/phpunit/PricesTest.php
 mode change 100755 => 100644 test/phpunit/SocieteTest.php

diff --git a/test/phpunit/CMailFileTest.php b/test/phpunit/CMailFileTest.php
old mode 100755
new mode 100644
diff --git a/test/phpunit/ContactTest.php b/test/phpunit/ContactTest.php
old mode 100755
new mode 100644
diff --git a/test/phpunit/ModulesTest.php b/test/phpunit/ModulesTest.php
old mode 100755
new mode 100644
diff --git a/test/phpunit/PricesTest.php b/test/phpunit/PricesTest.php
old mode 100755
new mode 100644
diff --git a/test/phpunit/SocieteTest.php b/test/phpunit/SocieteTest.php
old mode 100755
new mode 100644

From ded385f12ead547d46d988bfee6b57f04e534e60 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 26 May 2021 11:24:29 +0200
Subject: [PATCH 0251/1497] FIX #17650 #17710

---
 dev/initdemo/mysqldump_dolibarr_3.5.0.sql |  2 +-
 test/phpunit/CommandeFournisseurTest.php  |  4 ++--
 test/phpunit/PdfDocTest.php               | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dev/initdemo/mysqldump_dolibarr_3.5.0.sql b/dev/initdemo/mysqldump_dolibarr_3.5.0.sql
index 46053d1a187..252643afb59 100644
--- a/dev/initdemo/mysqldump_dolibarr_3.5.0.sql
+++ b/dev/initdemo/mysqldump_dolibarr_3.5.0.sql
@@ -5503,7 +5503,7 @@ CREATE TABLE `llx_product` (
 
 LOCK TABLES `llx_product` WRITE;
 /*!40000 ALTER TABLE `llx_product` DISABLE KEYS */;
-INSERT INTO `llx_product` VALUES (1,'2010-07-08 14:33:17','2013-03-12 09:30:24',0,0,'PIDRESS',1,NULL,'Pink dress','A beatifull pink dress','',NULL,NULL,100.00000000,112.50000000,90.00000000,101.25000000,'HT',12.500,0,0.000,0.000,1,1,1,0,'',20,NULL,0,'','',NULL,100,0,NULL,0,NULL,0,NULL,0,2,0.00000000,NULL,1,0,NULL,0),(2,'2010-07-09 00:30:01','2013-01-19 17:31:58',0,0,'Product_P1',1,NULL,'Product P1','','','',32,0.00000000,0.00000000,0.00000000,0.00000000,'HT',12.500,0,0.000,0.000,1,1,1,0,'',NULL,NULL,0,'','',NULL,NULL,0,NULL,0,NULL,0,NULL,0,998,0.00000000,NULL,0,0,NULL,0),(3,'2010-07-09 00:30:25','2012-12-08 13:11:14',0,0,'Service_S1',1,NULL,'Service S1','','',NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,'HT',12.500,0,0.000,0.000,1,1,1,1,'1m',NULL,NULL,0,'','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,NULL,0,0,NULL,0),(4,'2010-07-10 14:44:06','2013-01-19 17:22:48',0,0,'DECAP',1,NULL,'Decapsuleur','','',NULL,NULL,5.00000000,5.62500000,0.00000000,0.00000000,'HT',12.500,0,0.000,0.000,1,1,1,0,'',NULL,NULL,0,'','',NULL,2,-3,NULL,0,NULL,0,NULL,0,1001,10.00000000,NULL,1,0,NULL,0),(5,'2011-07-20 23:11:38','2011-07-27 17:02:59',0,0,'aaaa',1,NULL,'aaaa','cccc','bbbb','',NULL,10.00000000,11.96000000,0.00000000,0.00000000,'HT',19.600,0,0.000,0.000,1,1,1,0,'',NULL,NULL,0,'','',NULL,NULL,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,'',1,0,NULL,0),(6,'2011-07-29 22:16:44','2011-07-29 20:16:44',0,0,'Copy_of_aaaa',1,NULL,'aaaa','cccc','bbbb','',NULL,10.00000000,11.96000000,0.00000000,0.00000000,'HT',19.600,0,0.000,0.000,1,0,1,0,'',NULL,NULL,0,'','',NULL,NULL,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,'',1,0,NULL,0),(7,'2011-07-29 22:31:21','2011-07-29 20:31:21',0,0,'Copy_of_Copy_of_aaaa',1,NULL,'aaaa','cccc','bbbb','',NULL,10.00000000,11.96000000,0.00000000,0.00000000,'HT',19.600,0,0.000,0.000,1,0,0,0,'',NULL,NULL,0,'','',NULL,NULL,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,'',1,0,NULL,0),(8,'2011-07-29 22:46:54','2011-07-29 20:46:54',0,0,'Copy_of_Copy_of_Copy_of_aaaa',1,NULL,'aaaa','cccc','bbbb','',NULL,10.00000000,11.96000000,0.00000000,0.00000000,'HT',19.600,0,0.000,0.000,1,0,0,0,'',NULL,NULL,0,'','',NULL,NULL,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,'',1,0,NULL,0),(10,'2008-12-31 00:00:00','2012-12-08 13:11:14',0,0,'PR123456',1,NULL,'My product','This is a description example for record','Some note',NULL,NULL,100.00000000,110.00000000,0.00000000,0.00000000,'HT',10.000,0,0.000,0.000,NULL,0,0,0,'1y',0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,NULL,NULL,0,'20110729232310',0),(11,'2013-01-13 20:24:42','2013-01-19 17:22:48',0,0,'gh',1,NULL,'hfghf','','','',NULL,0.00000000,0.00000000,0.00000000,0.00000000,'HT',0.000,0,0.000,0.000,1,1,1,0,'',NULL,NULL,0,'','',NULL,NULL,0,NULL,0,NULL,0,NULL,0,-1,0.00000000,'',1,0,NULL,0);
+INSERT INTO `llx_product` VALUES (1,'2010-07-08 14:33:17','2013-03-12 09:30:24',0,0,'PINKDRESS',1,NULL,'Pink dress','A beatifull pink dress','',NULL,NULL,100.00000000,112.50000000,90.00000000,101.25000000,'HT',12.500,0,0.000,0.000,1,1,1,0,'',20,NULL,0,'','',NULL,100,0,NULL,0,NULL,0,NULL,0,2,0.00000000,NULL,1,0,NULL,0),(2,'2010-07-09 00:30:01','2013-01-19 17:31:58',0,0,'Product_P1',1,NULL,'Product P1','','','',32,0.00000000,0.00000000,0.00000000,0.00000000,'HT',12.500,0,0.000,0.000,1,1,1,0,'',NULL,NULL,0,'','',NULL,NULL,0,NULL,0,NULL,0,NULL,0,998,0.00000000,NULL,0,0,NULL,0),(3,'2010-07-09 00:30:25','2012-12-08 13:11:14',0,0,'Service_S1',1,NULL,'Service S1','','',NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,'HT',12.500,0,0.000,0.000,1,1,1,1,'1m',NULL,NULL,0,'','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,NULL,0,0,NULL,0),(4,'2010-07-10 14:44:06','2013-01-19 17:22:48',0,0,'DECAP',1,NULL,'Decapsuleur','','',NULL,NULL,5.00000000,5.62500000,0.00000000,0.00000000,'HT',12.500,0,0.000,0.000,1,1,1,0,'',NULL,NULL,0,'','',NULL,2,-3,NULL,0,NULL,0,NULL,0,1001,10.00000000,NULL,1,0,NULL,0),(5,'2011-07-20 23:11:38','2011-07-27 17:02:59',0,0,'aaaa',1,NULL,'aaaa','cccc','bbbb','',NULL,10.00000000,11.96000000,0.00000000,0.00000000,'HT',19.600,0,0.000,0.000,1,1,1,0,'',NULL,NULL,0,'','',NULL,NULL,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,'',1,0,NULL,0),(6,'2011-07-29 22:16:44','2011-07-29 20:16:44',0,0,'Copy_of_aaaa',1,NULL,'aaaa','cccc','bbbb','',NULL,10.00000000,11.96000000,0.00000000,0.00000000,'HT',19.600,0,0.000,0.000,1,0,1,0,'',NULL,NULL,0,'','',NULL,NULL,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,'',1,0,NULL,0),(7,'2011-07-29 22:31:21','2011-07-29 20:31:21',0,0,'Copy_of_Copy_of_aaaa',1,NULL,'aaaa','cccc','bbbb','',NULL,10.00000000,11.96000000,0.00000000,0.00000000,'HT',19.600,0,0.000,0.000,1,0,0,0,'',NULL,NULL,0,'','',NULL,NULL,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,'',1,0,NULL,0),(8,'2011-07-29 22:46:54','2011-07-29 20:46:54',0,0,'Copy_of_Copy_of_Copy_of_aaaa',1,NULL,'aaaa','cccc','bbbb','',NULL,10.00000000,11.96000000,0.00000000,0.00000000,'HT',19.600,0,0.000,0.000,1,0,0,0,'',NULL,NULL,0,'','',NULL,NULL,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,'',1,0,NULL,0),(10,'2008-12-31 00:00:00','2012-12-08 13:11:14',0,0,'PR123456',1,NULL,'My product','This is a description example for record','Some note',NULL,NULL,100.00000000,110.00000000,0.00000000,0.00000000,'HT',10.000,0,0.000,0.000,NULL,0,0,0,'1y',0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,NULL,NULL,0,'20110729232310',0),(11,'2013-01-13 20:24:42','2013-01-19 17:22:48',0,0,'gh',1,NULL,'hfghf','','','',NULL,0.00000000,0.00000000,0.00000000,0.00000000,'HT',0.000,0,0.000,0.000,1,1,1,0,'',NULL,NULL,0,'','',NULL,NULL,0,NULL,0,NULL,0,NULL,0,-1,0.00000000,'',1,0,NULL,0);
 /*!40000 ALTER TABLE `llx_product` ENABLE KEYS */;
 UNLOCK TABLES;
 
diff --git a/test/phpunit/CommandeFournisseurTest.php b/test/phpunit/CommandeFournisseurTest.php
index bf5922460a2..5240083512b 100644
--- a/test/phpunit/CommandeFournisseurTest.php
+++ b/test/phpunit/CommandeFournisseurTest.php
@@ -145,9 +145,9 @@ class CommandeFournisseurTest extends PHPUnit\Framework\TestCase
 		$societe=new Societe($db);
 		$societe->fetch($socid);
 		$product=new ProductFournisseur($db);
-		$product->fetch(0, 'PIDRESS');
+		$product->fetch(0, 'PINKDRESS');
 		if ($product->id <= 0) {
-			print "\n".__METHOD__." A product with ref PIDRESS must exists into database"; die(1);
+			print "\n".__METHOD__." A product with ref PINKDRESS must exists into database"; die(1);
 		}
 
 		$quantity=10;
diff --git a/test/phpunit/PdfDocTest.php b/test/phpunit/PdfDocTest.php
index e744aef3c2f..f7181f8a4f9 100644
--- a/test/phpunit/PdfDocTest.php
+++ b/test/phpunit/PdfDocTest.php
@@ -141,13 +141,13 @@ class PdfDocTest extends PHPUnit\Framework\TestCase
 		$db=$this->savdb;
 
 		$localproduct=new Product($this->savdb);
-		$result = $localproduct->fetch(0, 'PIDRESS');
+		$result = $localproduct->fetch(0, 'PINKDRESS');
 		if ($result < 0) {
-			print "\n".__METHOD__." Failed to make the fetch of product PIDRESS. ".$localproduct->error; die(1);
+			print "\n".__METHOD__." Failed to make the fetch of product PINKDRESS. ".$localproduct->error; die(1);
 		}
 		$product_id = $localproduct->id;
 		if ($product_id <= 0) {
-			print "\n".__METHOD__." A product with ref PIDRESS must exists into database"; die(1);
+			print "\n".__METHOD__." A product with ref PINKDRESS must exists into database. Create it manually before running the test"; die(1);
 		}
 
 		$localobject=new Facture($this->savdb);
@@ -160,11 +160,11 @@ class PdfDocTest extends PHPUnit\Framework\TestCase
 
 		$result=pdf_getlinedesc($localobject, 0, $langs);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals($result, "PIDRESS - Label 1<br>This is a description with a &eacute; accent<br>(Country of origin: France)");
+		$this->assertEquals($result, "PINKDRESS - Label 1<br>This is a description with a &eacute; accent<br>(Country of origin: France)");
 
 		$result=doc_getlinedesc($localobject->lines[0], $langs);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals($result, "PIDRESS - Label 1\nThis is a description with a é accent\n(Country of origin: France)");
+		$this->assertEquals($result, "PINKDRESS - Label 1\nThis is a description with a é accent\n(Country of origin: France)");
 	}
 
 	/**

From 38ef0283105ef2ea4619aefc2aeffca0219785ee Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 26 May 2021 12:44:15 +0200
Subject: [PATCH 0252/1497] Clean code. Fix check for lot that must be unique.

---
 .../stock/class/mouvementstock.class.php      | 116 +++++++++---------
 1 file changed, 60 insertions(+), 56 deletions(-)

diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php
index 4877bb861ab..959336c1671 100644
--- a/htdocs/product/stock/class/mouvementstock.class.php
+++ b/htdocs/product/stock/class/mouvementstock.class.php
@@ -126,27 +126,28 @@ class MouvementStock extends CommonObject
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *	Add a movement of stock (in one direction only).
+	 *  This is the lowest level method to record a stock change.
 	 *  $this->origin can be also be set to save the source object of movement.
 	 *
-	 *	@param		User	$user				User object
-	 *	@param		int		$fk_product			Id of product
-	 *	@param		int		$entrepot_id		Id of warehouse
-	 *	@param		int		$qty				Qty of movement (can be <0 or >0 depending on parameter type)
-	 *	@param		int		$type				Direction of movement:
-	 *											0=input (stock increase by a stock transfer), 1=output (stock decrease by a stock transfer),
-	 *											2=output (stock decrease), 3=input (stock increase)
-	 *                                      	Note that qty should be > 0 with 0 or 3, < 0 with 1 or 2.
-	 *	@param		int		$price				Unit price HT of product, used to calculate average weighted price (AWP or PMP in french). If 0, average weighted price is not changed.
-	 *	@param		string	$label				Label of stock movement
-	 *	@param		string	$inventorycode		Inventory code
-	 *	@param		string	$datem				Force date of movement
+	 *	@param		User			$user				User object
+	 *	@param		int				$fk_product			Id of product
+	 *	@param		int				$entrepot_id		Id of warehouse
+	 *	@param		int				$qty				Qty of movement (can be <0 or >0 depending on parameter type)
+	 *	@param		int				$type				Direction of movement:
+	 *													0=input (stock increase by a stock transfer), 1=output (stock decrease by a stock transfer),
+	 *													2=output (stock decrease), 3=input (stock increase)
+	 *                          		            	Note that qty should be > 0 with 0 or 3, < 0 with 1 or 2.
+	 *	@param		int				$price				Unit price HT of product, used to calculate average weighted price (AWP or PMP in french). If 0, average weighted price is not changed.
+	 *	@param		string			$label				Label of stock movement
+	 *	@param		string			$inventorycode		Inventory code
+	 *	@param		string			$datem				Force date of movement
 	 *	@param		integer|string	$eatby				eat-by date. Will be used if lot does not exists yet and will be created.
 	 *	@param		integer|string	$sellby				sell-by date. Will be used if lot does not exists yet and will be created.
-	 *	@param		string	$batch				batch number
-	 *	@param		boolean	$skip_batch			If set to true, stock movement is done without impacting batch record
-	 * 	@param		int		$id_product_batch	Id product_batch (when skip_batch is false and we already know which record of product_batch to use)
-	 *  @param		int		$disablestockchangeforsubproduct	Disable stock change for sub-products of kit (usefull only if product is a subproduct)
-	 *	@return		int							<0 if KO, 0 if fk_product is null or product id does not exists, >0 if OK
+	 *	@param		string			$batch				batch number
+	 *	@param		boolean			$skip_batch			If set to true, stock movement is done without impacting batch record
+	 * 	@param		int				$id_product_batch	Id product_batch (when skip_batch is false and we already know which record of product_batch to use)
+	 *  @param		int				$disablestockchangeforsubproduct	Disable stock change for sub-products of kit (usefull only if product is a subproduct)
+	 *	@return		int									<0 if KO, 0 if fk_product is null or product id does not exists, >0 if OK
 	 */
 	public function _create($user, $fk_product, $entrepot_id, $qty, $type, $price = 0, $label = '', $inventorycode = '', $datem = '', $eatby = '', $sellby = '', $batch = '', $skip_batch = false, $id_product_batch = 0, $disablestockchangeforsubproduct = 0)
 	{
@@ -159,10 +160,10 @@ class MouvementStock extends CommonObject
 		$error = 0;
 		dol_syslog(get_class($this)."::_create start userid=$user->id, fk_product=$fk_product, warehouse_id=$entrepot_id, qty=$qty, type=$type, price=$price, label=$label, inventorycode=$inventorycode, datem=".$datem.", eatby=".$eatby.", sellby=".$sellby.", batch=".$batch.", skip_batch=".$skip_batch);
 
-		// start hook at beginning
+		// Call hook at beginning
 		global $action, $hookmanager;
 		$hookmanager->initHooks(array('mouvementstock'));
-		// Hook of thirdparty module
+
 		if (is_object($hookmanager)) {
 			$parameters = array(
 				'currentcontext'   => 'mouvementstock',
@@ -181,11 +182,12 @@ class MouvementStock extends CommonObject
 				'skip_batch'       => &$skip_batch,
 				'id_product_batch' => &$id_product_batch
 			);
-			$reshook    = $hookmanager->executeHooks('stockMovementCreate', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks
+			$reshook = $hookmanager->executeHooks('stockMovementCreate', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks
 
 			if ($reshook < 0) {
-				if (!empty($hookmanager->resPrint))
+				if (!empty($hookmanager->resPrint)) {
 					dol_print_error('', $hookmanager->resPrint);
+				}
 				return $reshook;
 			} elseif ($reshook > 0) {
 				return $hookmanager->resPrint;
@@ -199,7 +201,8 @@ class MouvementStock extends CommonObject
 		$now = (!empty($datem) ? $datem : dol_now());
 
 		// Check parameters
-		if (empty($fk_product)) return 0;
+		if (!($fk_product > 0)) return 0;
+		if (!($entrepot_id > 0)) return 0;
 
 		if (is_numeric($eatby) && $eatby < 0) {
 			dol_syslog(get_class($this)."::_create start ErrorBadValueForParameterEatBy eatby = ".$eatby);
@@ -235,15 +238,23 @@ class MouvementStock extends CommonObject
 			dol_print_error('', "Failed to fetch product");
 			return -1;
 		}
-		if ($product->id <= 0) {	// Can happen if database is corrupted
+		if ($product->id <= 0) {	// Can happen if database is corrupted (a product id exist in stock with product that has been removed)
 			return 0;
 		}
 
+		// Define if we must make the stock change (If product type is a service or if stock is used also for services)
+		// Only record into stock tables wil be disabled by this (the rest like writing into lot table or movement of subproucts are done)
+		$movestock = 0;
+		if ($product->type != Product::TYPE_SERVICE || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) $movestock = 1;
+
 		$this->db->begin();
 
-		$product->load_stock('novirtual');
+		// Set value $product->stock_reel and detail per warehouse into $product->stock_warehouse array
+		if ($movestock) {
+			$product->load_stock('novirtual');
+		}
 
-		// Test if product require batch data. If yes, and there is not, we throw an error.
+		// Test if product require batch data. If yes, and there is not or values are not correct, we throw an error.
 		if (!empty($conf->productbatch->enabled) && $product->hasbatch() && !$skip_batch) {
 			if (empty($batch)) {
 				$langs->load("errors");
@@ -261,7 +272,7 @@ class MouvementStock extends CommonObject
 			// If found and eatby/sellby not defined into table and not provided, we do nothing
 			// If not found, we add record
 			$sql = "SELECT pb.rowid, pb.batch, pb.eatby, pb.sellby FROM ".MAIN_DB_PREFIX."product_lot as pb";
-			$sql .= " WHERE pb.fk_product = ".$fk_product." AND pb.batch = '".$this->db->escape($batch)."'";
+			$sql .= " WHERE pb.fk_product = ".((int) $fk_product)." AND pb.batch = '".$this->db->escape($batch)."'";
 			dol_syslog(get_class($this)."::_create scan serial for this product to check if eatby and sellby match", LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if ($resql) {
@@ -353,10 +364,6 @@ class MouvementStock extends CommonObject
 			}
 		}
 
-		// Define if we must make the stock change (If product type is a service or if stock is used also for services)
-		$movestock = 0;
-		if ($product->type != Product::TYPE_SERVICE || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) $movestock = 1;
-
 		// Check if stock is enough when qty is < 0
 		// Note that qty should be > 0 with type 0 or 3, < 0 with type 1 or 2.
 		if ($movestock && $qty < 0 && empty($conf->global->STOCK_ALLOW_NEGATIVE_TRANSFER)) {
@@ -391,7 +398,7 @@ class MouvementStock extends CommonObject
 			}
 		}
 
-		if ($movestock && $entrepot_id > 0) {	// Change stock for current product, change for subproduct is done after
+		if ($movestock) {	// Change stock for current product, change for subproduct is done after
 			// Set $origintype, fk_origin, fk_project
 			$fk_project = 0;
 			if (!empty($this->origin)) {			// This is set by caller for tracking reason
@@ -520,27 +527,16 @@ class MouvementStock extends CommonObject
 				}
 			}
 
-			// Update detail stock for batch product
+			// Update detail of stock for the lot.
 			if (!$error && !empty($conf->productbatch->enabled) && $product->hasbatch() && !$skip_batch) {
-				// check unicity for serial numbered equipments ( different for lots managed products)
-				if ( $product->status_batch == 2 && $qty > 0 ) {
-					if ( $this->getBatchCount($fk_product, $batch) > 0 ) {
-						$error++;
-						$this->errors[] = $langs->trans("SerialNumberAlreadyInUse", $batch, $product->ref);
-					} elseif ( $qty > 1 ) {
-						$error++;
-						$this->errors[] = $langs->trans("TooManyQtyForSerialNumber", $product->ref, $batch);
-					}
+				if ($id_product_batch > 0) {
+					$result = $this->createBatch($id_product_batch, $qty);
+				} else {
+					$param_batch = array('fk_product_stock' =>$fk_product_stock, 'batchnumber'=>$batch);
+					$result = $this->createBatch($param_batch, $qty);
 				}
-
-				if ( ! $error ) {
-					if ($id_product_batch > 0) {
-						$result = $this->createBatch($id_product_batch, $qty);
-					} else {
-						$param_batch = array('fk_product_stock' =>$fk_product_stock, 'batchnumber'=>$batch);
-						$result = $this->createBatch($param_batch, $qty);
-					}
-					if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
 				}
 			}
 
@@ -580,6 +576,16 @@ class MouvementStock extends CommonObject
 			$result = $this->call_trigger('STOCK_MOVEMENT', $user);
 			if ($result < 0) $error++;
 			// End call triggers
+
+			// Check unicity for serial numbered equipments once all movement were done.
+			if (!$error && !empty($conf->productbatch->enabled) && $product->hasbatch() && !$skip_batch) {
+				if ($product->status_batch == 2 && $qty > 0) {	// We check only if we increased qty
+					if ($this->getBatchCount($fk_product, $batch) > 1) {
+						$error++;
+						$this->errors[] = $langs->trans("TooManyQtyForSerialNumber", $batch, $product->ref);
+					}
+				}
+			}
 		}
 
 		if (!$error) {
@@ -1199,16 +1205,14 @@ class MouvementStock extends CommonObject
 	}
 
 	/**
-	 * Retrieve number of equipments for a product batch
+	 * Retrieve number of equipments for a product lot/serial
 	 *
-	 * @param int $fk_product Product id
-	 * @param varchar $batch  batch number
-	 * @return int            <0 if KO, number of equipments if OK
+	 * @param 	int 		$fk_product 	Product id
+	 * @param 	string 		$batch  		batch number
+	 * @return 	int            				<0 if KO, number of equipments found if OK
 	 */
 	private function getBatchCount($fk_product, $batch)
 	{
-		global $conf;
-
 		$cpt = 0;
 
 		$sql = "SELECT sum(pb.qty) as cpt";

From 1d5b8cbb19f82a4c6192ee1c66bd677f5ce2a9bc Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Wed, 26 May 2021 14:59:28 +0200
Subject: [PATCH 0253/1497] Fix Quadra accountancy export for due date

---
 htdocs/accountancy/class/accountancyexport.class.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index 114d0edf35a..0459c20a380 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -498,9 +498,8 @@ class AccountancyExport
 			$Tab['contrepartie'] = str_repeat(' ', 8);
 
 			// elarifr:  date format must be fixed format : 6 char ddmmyy = %d%m%yand not defined by user / dolibarr setting
-			if (!empty($data->date_echeance))
-				//$Tab['date_echeance'] = dol_print_date($data->date_echeance, $conf->global->ACCOUNTING_EXPORT_DATE);
-				$Tab['date_echeance'] = dol_print_date($data->date_echeance, '%d%m%y'); // elarifr:  format must be ddmmyy
+			if (!empty($data->date_lim_reglement))
+				$Tab['date_echeance'] = dol_print_date($data->date_lim_reglement, '%d%m%y'); // elarifr:  format must be ddmmyy
 			else
 				$Tab['date_echeance'] = '000000';
 

From b3a6bcd34f6b66a69b8614eadb4d1b9b8c90da0c Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Wed, 26 May 2021 15:01:31 +0200
Subject: [PATCH 0254/1497] Fix Winfic accountancy export for due date

---
 htdocs/accountancy/class/accountancyexport.class.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index 6fd3518689d..358d0e282c8 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -617,9 +617,8 @@ class AccountancyExport
 
 			$Tab['code_stat'] = str_repeat(' ', 4);
 
-			if (!empty($data->date_echeance))
-				//$Tab['date_echeance'] = dol_print_date($data->date_echeance, $conf->global->ACCOUNTING_EXPORT_DATE);
-				$Tab['date_echeance'] = dol_print_date($data->date_echeance, '%d%m%Y');
+			if (!empty($data->date_lim_reglement))
+				$Tab['date_echeance'] = dol_print_date($data->date_lim_reglement, '%d%m%Y');
 			else
 				$Tab['date_echeance'] = dol_print_date($data->doc_date, '%d%m%Y');
 

From 7c41be7f0a5069aeca89e40b3e8c4bbd8b4b8967 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 26 May 2021 15:22:49 +0200
Subject: [PATCH 0255/1497] FIX Navigation in list of holiday

---
 htdocs/holiday/view_log.php | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/htdocs/holiday/view_log.php b/htdocs/holiday/view_log.php
index a2ecbe1e8b3..cd43e03f957 100644
--- a/htdocs/holiday/view_log.php
+++ b/htdocs/holiday/view_log.php
@@ -373,7 +373,7 @@ if (!empty($arrayfields['cpl.fk_type']['checked'])) {
 
 // Filter: Previous balance
 if (!empty($arrayfields['cpl.prev_solde']['checked'])) {
-	print '<td class="liste_titre">';
+	print '<td class="liste_titre right">';
 	print '<input type="text" class="maxwidth50" name="search_prev_solde" value="'.$search_prev_solde.'">';
 	print '</td>';
 }
@@ -385,7 +385,7 @@ if (!empty($arrayfields['variation']['checked'])) {
 
 // Filter: New Balance
 if (!empty($arrayfields['cpl.new_solde']['checked'])) {
-	print '<td class="liste_titre">';
+	print '<td class="liste_titre right">';
 	print '<input type="text" class="maxwidth50" name="search_new_solde" value="'.$search_new_solde.'">';
 	print '</td>';
 }
@@ -428,12 +428,20 @@ if (!empty($arrayfields['cpl.new_solde']['checked'])) {
 print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
 print '</tr>';
 
-// TODO: $i = 0;
-$i = 1;
 
+$j = 0;
+while ($j < ($page * $limit)) {
+	$obj = next($object->logs);
+	$j++;
+}
+
+$i = 0;
 while ($i < min($num, $limit)) {
 	//TODO: $obj = $db->fetch_object($resql);
-	$obj = next($object->logs);
+	$obj = current($object->logs);
+	if (empty($obj)) {
+		break;
+	}
 
 	$holidaylogstatic->id = $obj['rowid'];
 	$holidaylogstatic->date = $obj['date_action'];
@@ -511,6 +519,7 @@ while ($i < min($num, $limit)) {
 	print '</tr>';
 
 	$i++;
+	next($object->logs);
 }
 
 if ($log_holiday == '2') {

From 48945533e43e62dffc981fe06362cbd67ade836b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 26 May 2021 15:22:56 +0200
Subject: [PATCH 0256/1497] Clean code

---
 htdocs/holiday/class/holiday.class.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index ffd394a35b3..55dd1c4bafb 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -1992,8 +1992,6 @@ class Holiday extends CommonObject
 	 */
 	public function fetchLog($order, $filter)
 	{
-		global $langs;
-
 		$sql = "SELECT";
 		$sql .= " cpl.rowid,";
 		$sql .= " cpl.date_action,";

From 421681cda4c9ed77c8fefcaece3f18681a1fe01f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 26 May 2021 15:22:49 +0200
Subject: [PATCH 0257/1497] FIX Navigation in list of holiday

Conflicts:
	htdocs/holiday/view_log.php
---
 htdocs/holiday/view_log.php | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/htdocs/holiday/view_log.php b/htdocs/holiday/view_log.php
index 2f2e223c87c..86562ef5f96 100644
--- a/htdocs/holiday/view_log.php
+++ b/htdocs/holiday/view_log.php
@@ -323,7 +323,7 @@ if (!empty($arrayfields['cpl.fk_type']['checked'])) {
 
 // Filter: Previous balance
 if (!empty($arrayfields['cpl.prev_solde']['checked'])) {
-	print '<td class="liste_titre">';
+	print '<td class="liste_titre right">';
 	print '<input type="text" class="maxwidth50" name="search_prev_solde" value="'.$search_prev_solde.'">';
 	print '</td>';
 }
@@ -335,7 +335,7 @@ if (!empty($arrayfields['variation']['checked'])) {
 
 // Filter: New Balance
 if (!empty($arrayfields['cpl.new_solde']['checked'])) {
-	print '<td class="liste_titre">';
+	print '<td class="liste_titre right">';
 	print '<input type="text" class="maxwidth50" name="search_new_solde" value="'.$search_new_solde.'">';
 	print '</td>';
 }
@@ -360,13 +360,20 @@ if (!empty($arrayfields['cpl.new_solde']['checked'])) print_liste_field_titre($a
 print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
 print '</tr>';
 
-// TODO: $i = 0;
-$i = 1;
 
-while ($i < min($num, $limit))
-{
-	//TODO: $obj = $db->fetch_object($resql);
+$j = 0;
+while ($j < ($page * $limit)) {
 	$obj = next($object->logs);
+	$j++;
+}
+
+$i = 0;
+while ($i < min($num, $limit)) {
+	//TODO: $obj = $db->fetch_object($resql);
+	$obj = current($object->logs);
+	if (empty($obj)) {
+		break;
+	}
 
 	$holidaylogstatic->id = $obj['rowid'];
 	$holidaylogstatic->date = $obj['date_action'];
@@ -444,6 +451,7 @@ while ($i < min($num, $limit))
 	print '</tr>';
 
 	$i++;
+	next($object->logs);
 }
 
 if ($log_holiday == '2') {

From 8dd2af42df87ff1fc8d0968c4303682695177a43 Mon Sep 17 00:00:00 2001
From: Antonin MARCHAL <antonin@letempledujeu.fr>
Date: Wed, 26 May 2021 16:44:35 +0200
Subject: [PATCH 0258/1497] fix(param) select_produits_fournisseur_list

---
 htdocs/core/class/html.form.class.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index a088f276463..04cfe53ef5d 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -3025,6 +3025,10 @@ class Form
 		global $langs, $conf;
 		global $price_level, $status, $finished;
 
+		if(empty($status)){
+			$status = 1;
+		}
+
 		$selected_input_value = '';
 		if (!empty($conf->use_javascript_ajax) && !empty($conf->global->PRODUIT_USE_SEARCH_TO_SELECT)) {
 			if ($selected > 0) {
@@ -3040,7 +3044,7 @@ class Form
 			print ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/product/ajax/products.php', $urloption, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT, 0, $ajaxoptions);
 			print ($hidelabel ? '' : $langs->trans("RefOrLabel").' : ').'<input type="text" class="minwidth300" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'"'.($placeholder ? ' placeholder="'.$placeholder.'"' : '').'>';
 		} else {
-			print $this->select_produits_fournisseurs_list($socid, $selected, $htmlname, $filtertype, $filtre, '', -1, 0, 0, $alsoproductwithnosupplierprice, $morecss, 0, $placeholder);
+			print $this->select_produits_fournisseurs_list($socid, $selected, $htmlname, $filtertype, $filtre, '', $status, 0, 0, $alsoproductwithnosupplierprice, $morecss, 0, $placeholder);
 		}
 	}
 
@@ -3054,7 +3058,7 @@ class Form
 	 *  @param	string	$filtertype     Filter on product type (''=nofilter, 0=product, 1=service)
 	 *	@param  string	$filtre         Pour filtre sql
 	 *	@param  string	$filterkey      Filtre des produits
-	 *  @param  int		$statut         -1=Return all products, 0=Products not on sell, 1=Products on sell (not used here, a filter on tobuy is already hard coded in request)
+	 *  @param  int		$statut         -1=Return all products, 0=Products not on buy, 1=Products on buy 
 	 *  @param  int		$outputmode     0=HTML select string, 1=Array
 	 *  @param  int     $limit          Limit of line number
 	 *  @param  int     $alsoproductwithnosupplierprice    1=Add also product without supplier prices
@@ -3107,7 +3111,9 @@ class Form
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_units u ON u.rowid = p.fk_unit";
 		}
 		$sql .= " WHERE p.entity IN (".getEntity('product').")";
-		$sql .= " AND p.tobuy = 1";
+		if($statut != -1){
+			$sql .= " AND p.tobuy = ".$statut;
+		}
 		if (strval($filtertype) != '') {
 			$sql .= " AND p.fk_product_type=".$this->db->escape($filtertype);
 		}

From 9c83bdff519aa2a6ce88ad98083efcbb79c6b184 Mon Sep 17 00:00:00 2001
From: Adrien Raze <adrien.raze@atm-consulting.fr>
Date: Wed, 26 May 2021 17:02:34 +0200
Subject: [PATCH 0259/1497] FIX : Add parameters (object and action) for user
 list DoActions hook

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

diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index 1f59656dcbd..e2b4fd3889d 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -154,7 +154,7 @@ if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
 if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend' && $massaction != 'confirm_createbills') { $massaction = ''; }
 
 $parameters = array();
-$reshook = $hookmanager->executeHooks('doActions', $parameters); // Note that $action and $object may have been modified by some hooks
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 if (empty($reshook))

From d11d1a2018fd17b5538550f2e7c2fe40905ffa86 Mon Sep 17 00:00:00 2001
From: Antonin MARCHAL <antonin@letempledujeu.fr>
Date: Wed, 26 May 2021 17:10:12 +0200
Subject: [PATCH 0260/1497] lint(stickler)

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 04cfe53ef5d..b362b177ac0 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -3025,7 +3025,7 @@ class Form
 		global $langs, $conf;
 		global $price_level, $status, $finished;
 
-		if(empty($status)){
+		if (empty($status)) {
 			$status = 1;
 		}
 
@@ -3058,7 +3058,7 @@ class Form
 	 *  @param	string	$filtertype     Filter on product type (''=nofilter, 0=product, 1=service)
 	 *	@param  string	$filtre         Pour filtre sql
 	 *	@param  string	$filterkey      Filtre des produits
-	 *  @param  int		$statut         -1=Return all products, 0=Products not on buy, 1=Products on buy 
+	 *  @param  int		$statut         -1=Return all products, 0=Products not on buy, 1=Products on buy
 	 *  @param  int		$outputmode     0=HTML select string, 1=Array
 	 *  @param  int     $limit          Limit of line number
 	 *  @param  int     $alsoproductwithnosupplierprice    1=Add also product without supplier prices
@@ -3111,7 +3111,7 @@ class Form
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_units u ON u.rowid = p.fk_unit";
 		}
 		$sql .= " WHERE p.entity IN (".getEntity('product').")";
-		if($statut != -1){
+		if ($statut != -1) {
 			$sql .= " AND p.tobuy = ".$statut;
 		}
 		if (strval($filtertype) != '') {

From c3c0ad1c8d8d980fc36bb25350971e92a3d9dcb7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 26 May 2021 17:20:09 +0200
Subject: [PATCH 0261/1497] Update html.form.class.php

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index b362b177ac0..bb551300e67 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -3112,7 +3112,7 @@ class Form
 		}
 		$sql .= " WHERE p.entity IN (".getEntity('product').")";
 		if ($statut != -1) {
-			$sql .= " AND p.tobuy = ".$statut;
+			$sql .= " AND p.tobuy = ".((int) $statut);
 		}
 		if (strval($filtertype) != '') {
 			$sql .= " AND p.fk_product_type=".$this->db->escape($filtertype);

From 8b1b2019f870a2e06ad8430ac8d724028680ad8d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 26 May 2021 17:24:27 +0200
Subject: [PATCH 0262/1497] Update html.form.class.php

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index bb551300e67..1f90b5f4fdc 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -3025,7 +3025,7 @@ class Form
 		global $langs, $conf;
 		global $price_level, $status, $finished;
 
-		if (empty($status)) {
+		if (!isset($status)) {
 			$status = 1;
 		}
 

From 9952fdb6d32e2bc41f3df69d5575c9fec7fd4b58 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 26 May 2021 17:45:45 +0200
Subject: [PATCH 0263/1497] FIX #17648 #17712

---
 htdocs/contact/card.php | 65 +++++++++++++++++++++++++++--------------
 1 file changed, 43 insertions(+), 22 deletions(-)

diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index b337f0980e6..b877909cc58 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -77,12 +77,6 @@ if (!empty($canvas)) {
 	$objcanvas->getCanvas('contact', 'contactcard', $canvas);
 }
 
-// Security check
-if ($user->socid) {
-	$socid = $user->socid;
-}
-$result = restrictedArea($user, 'contact', $id, 'socpeople&societe', '', '', 'rowid', 0); // If we create a contact with no company (shared contacts), no check on write permission
-
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('contactcard', 'globalcard'));
 
@@ -96,6 +90,16 @@ if (!($object->id > 0) && $action == 'view') {
 	exit;
 }
 
+$triggermodname = 'CONTACT_MODIFY';
+$permissiontoadd = $user->rights->societe->contact->creer;
+
+// Security check
+if ($user->socid) {
+	$socid = $user->socid;
+}
+$result = restrictedArea($user, 'contact', $id, 'socpeople&societe', '', '', 'rowid', 0); // If we create a contact with no company (shared contacts), no check on write permission
+
+
 /*
  *	Actions
  */
@@ -144,7 +148,7 @@ if (empty($reshook)) {
 
 
 	// Confirmation desactivation
-	if ($action == 'disable') {
+	if ($action == 'disable' && !empty($permissiontoadd)) {
 		$object->fetch($id);
 		if ($object->setstatus(0) < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -155,7 +159,7 @@ if (empty($reshook)) {
 	}
 
 	// Confirmation activation
-	if ($action == 'enable') {
+	if ($action == 'enable' && !empty($permissiontoadd)) {
 		$object->fetch($id);
 		if ($object->setstatus(1) < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -166,7 +170,7 @@ if (empty($reshook)) {
 	}
 
 	// Add contact
-	if ($action == 'add' && $user->rights->societe->contact->creer) {
+	if ($action == 'add' && !empty($permissiontoadd)) {
 		$db->begin();
 
 		if ($canvas) {
@@ -307,7 +311,7 @@ if (empty($reshook)) {
 		}
 	}
 
-	if ($action == 'update' && empty($cancel) && $user->rights->societe->contact->creer) {
+	if ($action == 'update' && empty($cancel) && !empty($permissiontoadd)) {
 		if (!GETPOST("lastname", 'alpha')) {
 			$error++; $errors = array($langs->trans("ErrorFieldRequired", $langs->transnoentities("Name").' / '.$langs->transnoentities("Label")));
 			$action = 'edit';
@@ -457,7 +461,7 @@ if (empty($reshook)) {
 		}
 	}
 
-	if ($action == 'setprospectcontactlevel' && $user->rights->societe->contact->creer) {
+	if ($action == 'setprospectcontactlevel' && !empty($permissiontoadd)) {
 		$object->fetch($id);
 		$object->fk_prospectlevel = GETPOST('prospect_contact_level_id', 'alpha');
 		$result = $object->update($object->id, $user);
@@ -467,7 +471,7 @@ if (empty($reshook)) {
 	}
 
 	// set communication status
-	if ($action == 'setstcomm') {
+	if ($action == 'setstcomm' && !empty($permissiontoadd)) {
 		$object->fetch($id);
 		$object->stcomm_id = dol_getIdFromCode($db, GETPOST('stcomm', 'alpha'), 'c_stcommcontact');
 		$result = $object->update($object->id, $user);
@@ -476,6 +480,31 @@ if (empty($reshook)) {
 		}
 	}
 
+	// Update extrafields
+	if ($action == "update_extras" && !empty($permissiontoadd)) {
+		$object->fetch(GETPOST('id', 'int'));
+
+		$attributekey = GETPOST('attribute', 'alpha');
+		$attributekeylong = 'options_'.$attributekey;
+
+		if (GETPOSTISSET($attributekeylong.'day') && GETPOSTISSET($attributekeylong.'month') && GETPOSTISSET($attributekeylong.'year')) {
+			// This is properties of a date
+			$object->array_options['options_'.$attributekey] = dol_mktime(GETPOST($attributekeylong.'hour', 'int'), GETPOST($attributekeylong.'min', 'int'), GETPOST($attributekeylong.'sec', 'int'), GETPOST($attributekeylong.'month', 'int'), GETPOST($attributekeylong.'day', 'int'), GETPOST($attributekeylong.'year', 'int'));
+			//var_dump(dol_print_date($object->array_options['options_'.$attributekey]));exit;
+		} else {
+			$object->array_options['options_'.$attributekey] = GETPOST($attributekeylong, 'alpha');
+		}
+
+		$result = $object->insertExtraFields(empty($triggermodname) ? '' : $triggermodname, $user);
+		if ($result > 0) {
+			setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
+			$action = 'view';
+		} else {
+			setEventMessages($object->error, $object->errors, 'errors');
+			$action = 'edit_extras';
+		}
+	}
+
 	// Actions to send emails
 	$triggersendname = 'CONTACT_SENTBYMAIL';
 	$paramname = 'id';
@@ -821,11 +850,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 			// Other attributes
 			$parameters = array('socid' => $socid, 'objsoc' => $objsoc, 'colspan' => ' colspan="3"', 'cols' => 3);
-			$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-			print $hookmanager->resPrint;
-			if (empty($reshook)) {
-				print $object->showOptionals($extrafields, 'edit', $parameters);
-			}
+			include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
 
 			print "</table><br>";
 
@@ -1133,11 +1158,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 			// Other attributes
 			$parameters = array('colspan' => ' colspan="3"', 'cols'=> '3');
-			$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-			print $hookmanager->resPrint;
-			if (empty($reshook)) {
-				print $object->showOptionals($extrafields, 'edit', $parameters);
-			}
+			include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_edit.tpl.php';
 
 			$object->load_ref_elements();
 

From 371f2e4f378d102395037580bef9b197486e8e9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 26 May 2021 18:24:06 +0200
Subject: [PATCH 0264/1497] fix warnings

---
 htdocs/adherents/list.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index dde013e60c4..986abc83b7b 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2013-2015  Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2014-2016  Juanjo Menent           <jmenent@2byte.es>
  * Copyright (C) 2018       Alexandre Spangaro      <aspangaro@open-dsi.fr>
+ * Copyright (C) 2021		Frédéric France			<frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -325,7 +326,7 @@ $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // N
 $sql .= preg_replace('/^,/', '', $hookmanager->resPrint);
 $sql = preg_replace('/,\s*$/', '', $sql);
 $sql .= " FROM ".MAIN_DB_PREFIX."adherent as d";
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
+if (!empty($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (d.rowid = ef.fk_object)";
 }
 if (!empty($search_categ) || !empty($catid)) {
@@ -1097,7 +1098,7 @@ while ($i < min($num, $limit)) {
 			print '<td class="nowrap center">';
 			print dol_print_date($datefin, 'day');
 			if ($memberstatic->hasDelay()) {
-				$textlate .= ' ('.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($conf->adherent->subscription->warning_delay / 60 / 60 / 24) >= 0 ? '+' : '').ceil($conf->adherent->subscription->warning_delay / 60 / 60 / 24).' '.$langs->trans("days").')';
+				$textlate = ' ('.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($conf->adherent->subscription->warning_delay / 60 / 60 / 24) >= 0 ? '+' : '').ceil($conf->adherent->subscription->warning_delay / 60 / 60 / 24).' '.$langs->trans("days").')';
 				print " ".img_warning($langs->trans("SubscriptionLate").$textlate);
 			}
 			print '</td>';

From 60250443a1c91cbe17d62215a9440ebde030225b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 26 May 2021 18:55:48 +0200
Subject: [PATCH 0265/1497] fix warning

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

diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index 5182a6ff778..d20318090e0 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -1908,7 +1908,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				}
 
 				// Reactivate
-				if (Adherent::STATUS_RESILIATED == $object->statut || Adherent::STATUS_EXCLUDED == $Object->statut) {
+				if (Adherent::STATUS_RESILIATED == $object->statut || Adherent::STATUS_EXCLUDED == $object->statut) {
 					if ($user->rights->adherent->creer) {
 						print '<a class="butAction" href="card.php?rowid='.$id.'&action=valid">'.$langs->trans("Reenable")."</a>\n";
 					} else {

From 9b51699228ef234b547eb94f9f6dab4d31b517cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 26 May 2021 19:55:47 +0200
Subject: [PATCH 0266/1497] fix warnings

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

diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 0a3e9207a96..3999158acaa 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -11,7 +11,7 @@
  * Copyright (C) 2017       Juanjo Menent      	    <jmenent@2byte.es>
  * Copyright (C) 2018       Nicolas ZABOURI         <info@inovea-conseil.com>
  * Copyright (C) 2020       Open-Dsi         		<support@open-dsi.fr>
-
+ * Copyright (C) 2021		Frédéric France			<frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -221,7 +221,7 @@ $checkedprofid6 = 0;
 $checkprospectlevel = (in_array($contextpage, array('prospectlist')) ? 1 : 0);
 $checkstcomm = (in_array($contextpage, array('prospectlist')) ? 1 : 0);
 $arrayfields = array(
-	's.rowid'=>array('label'=>"TechnicalID", 'position'=>1, 'checked'=>($conf->global->MAIN_SHOW_TECHNICAL_ID ? 1 : 0), 'enabled'=>($conf->global->MAIN_SHOW_TECHNICAL_ID ? 1 : 0)),
+	's.rowid'=>array('label'=>"TechnicalID", 'position'=>1, 'checked'=>(!empty($conf->global->MAIN_SHOW_TECHNICAL_ID)), 'enabled'=>(!empty($conf->global->MAIN_SHOW_TECHNICAL_ID))),
 	's.nom'=>array('label'=>"ThirdPartyName", 'position'=>2, 'checked'=>1),
 	's.name_alias'=>array('label'=>"AliasNameShort", 'position'=>3, 'checked'=>1),
 	's.barcode'=>array('label'=>"Gencod", 'position'=>5, 'checked'=>1, 'enabled'=>(!empty($conf->barcode->enabled))),

From 879a401724798510c93b3a1d8c0db90f532fa541 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 26 May 2021 20:00:23 +0200
Subject: [PATCH 0267/1497] fix warnings

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

diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 0a3e9207a96..1a6c0ea6baf 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -942,7 +942,7 @@ if (empty($type) || $type == 'c' || $type == 'p') {
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
 		$tmptitle = $langs->trans('Categories');
-		$moreforfilter .= img_picto($tmptile, 'category', 'class="pictofixedwidth"');
+		$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"');
 		$moreforfilter .= $formother->select_categories('customer', $search_categ_cus, 'search_categ_cus', 1, $langs->trans('CustomersProspectsCategoriesShort'));
 		$moreforfilter .= '</div>';
 	}
@@ -953,7 +953,7 @@ if (empty($type) || $type == 'f') {
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
 		$tmptitle = $langs->trans('Categories');
-		$moreforfilter .= img_picto($tmptilte, 'category', 'class="pictofixedwidth"');
+		$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"');
 		$moreforfilter .= $formother->select_categories('supplier', $search_categ_sup, 'search_categ_sup', 1, $langs->trans('SuppliersCategoriesShort'));
 		$moreforfilter .= '</div>';
 	}
@@ -962,8 +962,8 @@ if (empty($type) || $type == 'f') {
 // If the user can view prospects other than his'
 if ($user->rights->societe->client->voir || $socid) {
 	$moreforfilter .= '<div class="divsearchfield">';
-	$tmptile = $langs->trans('SalesRepresentatives');
-	$moreforfilter .= img_picto($tmptile, 'user', 'class="pictofixedwidth"');
+	$tmptitle = $langs->trans('SalesRepresentatives');
+	$moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"');
 	$moreforfilter .= $formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, $langs->trans('SalesRepresentatives'), ($conf->dol_optimize_smallscreen ? 'maxwidth200' : 'maxwidth300'), 1);
 	$moreforfilter .= '</div>';
 }

From 0d62d3bace46532c60964c0031f6f77f9783c203 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 26 May 2021 23:36:36 +0200
Subject: [PATCH 0268/1497] fix warnings

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

diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index 19a040bf091..e1166fe385a 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -494,14 +494,14 @@ $moreforfilter = '';
 if ($user->rights->societe->client->voir || $socid) {
 	$langs->load("commercial");
 	$moreforfilter .= '<div class="divsearchfield">';
-	$tmpttile = $langs->trans('ThirdPartiesOfSaleRepresentative');
+	$tmptitle = $langs->trans('ThirdPartiesOfSaleRepresentative');
 	$moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, $tmpttile, 'maxwidth250');
 	$moreforfilter .= '</div>';
 }
 // If the user can view other users
 if ($user->rights->user->user->lire) {
 	$moreforfilter .= '<div class="divsearchfield">';
-	$tmpttile = $langs->trans('LinkedToSpecificUsers');
+	$tmptitle = $langs->trans('LinkedToSpecificUsers');
 	$moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$form->select_dolusers($search_user, 'search_user', $tmpttile, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth250');
 	$moreforfilter .= '</div>';
 }
@@ -509,7 +509,7 @@ if ($user->rights->user->user->lire) {
 if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire && ($user->rights->produit->lire || $user->rights->service->lire)) {
 	include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 	$moreforfilter .= '<div class="divsearchfield">';
-	$tmpttile = $langs->trans('IncludingProductWithTag');
+	$tmptitle = $langs->trans('IncludingProductWithTag');
 	$cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, null, 'parent', null, null, 1);
 	$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$form->selectarray('search_product_category', $cate_arbo, $search_product_category, $tmpttile, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1);
 	$moreforfilter .= '</div>';

From 223ece5ca5a4e14cc926aae034f6756348ec4033 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 26 May 2021 23:43:14 +0200
Subject: [PATCH 0269/1497] Update list.php

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

diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index e1166fe385a..aea778f884c 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -495,14 +495,14 @@ if ($user->rights->societe->client->voir || $socid) {
 	$langs->load("commercial");
 	$moreforfilter .= '<div class="divsearchfield">';
 	$tmptitle = $langs->trans('ThirdPartiesOfSaleRepresentative');
-	$moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, $tmpttile, 'maxwidth250');
+	$moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, $tmptitle, 'maxwidth250');
 	$moreforfilter .= '</div>';
 }
 // If the user can view other users
 if ($user->rights->user->user->lire) {
 	$moreforfilter .= '<div class="divsearchfield">';
 	$tmptitle = $langs->trans('LinkedToSpecificUsers');
-	$moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$form->select_dolusers($search_user, 'search_user', $tmpttile, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth250');
+	$moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$form->select_dolusers($search_user, 'search_user', $tmptitle, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth250');
 	$moreforfilter .= '</div>';
 }
 // If the user can view categories of products
@@ -511,7 +511,7 @@ if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire && ($use
 	$moreforfilter .= '<div class="divsearchfield">';
 	$tmptitle = $langs->trans('IncludingProductWithTag');
 	$cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, null, 'parent', null, null, 1);
-	$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$form->selectarray('search_product_category', $cate_arbo, $search_product_category, $tmpttile, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1);
+	$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$form->selectarray('search_product_category', $cate_arbo, $search_product_category, $tmptitle, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1);
 	$moreforfilter .= '</div>';
 }
 

From 4237b374dda29e08558cd13692ea3382ceb69393 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 26 May 2021 23:45:45 +0200
Subject: [PATCH 0270/1497] Update list.php

---
 htdocs/contrat/list.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index aea778f884c..cf19f1178f6 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -706,6 +706,7 @@ print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $
 print "</tr>\n";
 
 $totalarray = array();
+$totalarray['nbfield'] = 0;
 $typenArray = array();
 $cacheCountryIDCode = array();
 

From 3ebe6eb014d440b7602a40252fc2fbb9ffc1caa3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 27 May 2021 00:02:01 +0200
Subject: [PATCH 0271/1497] fix bad setup of MAIN_USE_BACKGROUND_ON_PDF

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

diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 1babc31b4c2..281e45baf51 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -623,8 +623,8 @@ function pdf_pagehead(&$pdf, $outputlangs, $page_height)
 {
 	global $conf;
 
-	// Add a background image on document
-	if (!empty($conf->global->MAIN_USE_BACKGROUND_ON_PDF))		// Warning, this option make TCPDF generation being crazy and some content disappeared behind the image
+	// Add a background image on document only if good setup of const
+	if (!empty($conf->global->MAIN_USE_BACKGROUND_ON_PDF) && ($conf->global->MAIN_USE_BACKGROUND_ON_PDF != '-1'))		// Warning, this option make TCPDF generation being crazy and some content disappeared behind the image
 	{
 		$pdf->SetAutoPageBreak(0, 0); // Disable auto pagebreak before adding image
 		$pdf->Image($conf->mycompany->dir_output.'/logos/'.$conf->global->MAIN_USE_BACKGROUND_ON_PDF, (isset($conf->global->MAIN_USE_BACKGROUND_ON_PDF_X) ? $conf->global->MAIN_USE_BACKGROUND_ON_PDF_X : 0), (isset($conf->global->MAIN_USE_BACKGROUND_ON_PDF_Y) ? $conf->global->MAIN_USE_BACKGROUND_ON_PDF_Y : 0), 0, $page_height);

From 7983ce941eabf1679eab2b5fb4a37d9a1e7cdcff Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 27 May 2021 01:52:52 +0200
Subject: [PATCH 0272/1497] Fix performance page

---
 htdocs/admin/system/perf.php  | 101 ++++++++++++++++++++++++++++++++--
 htdocs/langs/en_US/admin.lang |   7 ++-
 2 files changed, 100 insertions(+), 8 deletions(-)

diff --git a/htdocs/admin/system/perf.php b/htdocs/admin/system/perf.php
index b1014cc98c7..32fbe8ab41c 100644
--- a/htdocs/admin/system/perf.php
+++ b/htdocs/admin/system/perf.php
@@ -464,11 +464,99 @@ if ($conf->db->type == 'mysql' || $conf->db->type == 'mysqli') {
 	print '<br>';
 }
 
-// Product search
+print '<br>';
+print '<strong>'.$langs->trans("ComboListOptim").'</strong>: ';
+print '<br>';
+// Product combo list
+$sql = "SELECT COUNT(*) as nb";
+$sql .= " FROM ".MAIN_DB_PREFIX."product as p";
+$resql = $db->query($sql);
+if ($resql) {
+	$limitforoptim = 5000;
+	$num = $db->num_rows($resql);
+	$obj = $db->fetch_object($resql);
+	$nb = $obj->nb;
+	if ($nb > $limitforoptim) {
+		if (empty($conf->global->PRODUIT_USE_SEARCH_TO_SELECT)) {
+			print img_picto('', 'warning.png').' '.$langs->trans("YouHaveXObjectUseComboOptim", $nb, $langs->transnoentitiesnoconv("ProductsOrServices"), 'PRODUIT_USE_SEARCH_TO_SELECT');
+		} else {
+			print img_picto('', 'tick.png').' '.$langs->trans("YouHaveXObjectAndSearchOptimOn", $nb, $langs->transnoentitiesnoconv("ProductsOrServices"), 'PRODUIT_USE_SEARCH_TO_SELECT', $conf->global->PRODUIT_USE_SEARCH_TO_SELECT);
+		}
+	} else {
+		print img_picto('', 'tick.png').' '.$langs->trans("NbOfObjectIsLowerThanNoPb", $nb, $langs->transnoentitiesnoconv("ProductsOrServices"));
+	}
+	print '<br>';
+	$db->free($resql);
+}
+// Thirdparty combo list
+$sql = "SELECT COUNT(*) as nb";
+$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+$resql = $db->query($sql);
+if ($resql) {
+	$limitforoptim = 5000;
+	$num = $db->num_rows($resql);
+	$obj = $db->fetch_object($resql);
+	$nb = $obj->nb;
+	if ($nb > $limitforoptim) {
+		if (empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT)) {
+			print img_picto('', 'warning.png').' '.$langs->trans("YouHaveXObjectUseComboOptim", $nb, $langs->transnoentitiesnoconv("ThirdParties"), 'COMPANY_USE_SEARCH_TO_SELECT');
+		} else {
+			print img_picto('', 'tick.png').' '.$langs->trans("YouHaveXObjectAndSearchOptimOn", $nb, $langs->transnoentitiesnoconv("ThirdParties"), 'COMPANY_USE_SEARCH_TO_SELECT', $conf->global->COMPANY_USE_SEARCH_TO_SELECT);
+		}
+	} else {
+		print img_picto('', 'tick.png').' '.$langs->trans("NbOfObjectIsLowerThanNoPb", $nb, $langs->transnoentitiesnoconv("ThirdParties"));
+	}
+	print '<br>';
+	$db->free($resql);
+}
+// Contact combo list
+$sql = "SELECT COUNT(*) as nb";
+$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as s";
+$resql = $db->query($sql);
+if ($resql) {
+	$limitforoptim = 5000;
+	$num = $db->num_rows($resql);
+	$obj = $db->fetch_object($resql);
+	$nb = $obj->nb;
+	if ($nb > $limitforoptim) {
+		if (empty($conf->global->CONTACT_USE_SEARCH_TO_SELECT)) {
+			print img_picto('', 'warning.png').' '.$langs->trans("YouHaveXObjectUseComboOptim", $nb, $langs->transnoentitiesnoconv("Contacts"), 'CONTACT_USE_SEARCH_TO_SELECT');
+		} else {
+			print img_picto('', 'tick.png').' '.$langs->trans("YouHaveXObjectAndSearchOptimOn", $nb, $langs->transnoentitiesnoconv("Contacts"), 'CONTACT_USE_SEARCH_TO_SELECT', $conf->global->CONTACT_USE_SEARCH_TO_SELECT);
+		}
+	} else {
+		print img_picto('', 'tick.png').' '.$langs->trans("NbOfObjectIsLowerThanNoPb", $nb, $langs->transnoentitiesnoconv("Contacts"));
+	}
+	print '<br>';
+	$db->free($resql);
+}
+// Contact combo list
+$sql = "SELECT COUNT(*) as nb";
+$sql .= " FROM ".MAIN_DB_PREFIX."projet as s";
+$resql = $db->query($sql);
+if ($resql) {
+	$limitforoptim = 5000;
+	$num = $db->num_rows($resql);
+	$obj = $db->fetch_object($resql);
+	$nb = $obj->nb;
+	if ($nb > $limitforoptim) {
+		if (empty($conf->global->PROJECT_USE_SEARCH_TO_SELECT)) {
+			print img_picto('', 'warning.png').' '.$langs->trans("YouHaveXObjectUseComboOptim", $nb, $langs->transnoentitiesnoconv("Projects"), 'PROJECT_USE_SEARCH_TO_SELECT');
+		} else {
+			print img_picto('', 'tick.png').' '.$langs->trans("YouHaveXObjectAndSearchOptimOn", $nb, $langs->transnoentitiesnoconv("Projects"), 'PROJECT_USE_SEARCH_TO_SELECT', $conf->global->PROJECT_USE_SEARCH_TO_SELECT);
+		}
+	} else {
+		print img_picto('', 'tick.png').' '.$langs->trans("NbOfObjectIsLowerThanNoPb", $nb, $langs->transnoentitiesnoconv("Projects"));
+	}
+	print '<br>';
+	$db->free($resql);
+}
+
+
 print '<br>';
 print '<strong>'.$langs->trans("SearchOptim").'</strong>: ';
 print '<br>';
-$tab = array();
+// Product search
 $sql = "SELECT COUNT(*) as nb";
 $sql .= " FROM ".MAIN_DB_PREFIX."product as p";
 $resql = $db->query($sql);
@@ -480,8 +568,9 @@ if ($resql) {
 	if ($nb > $limitforoptim) {
 		if (empty($conf->global->PRODUCT_DONOTSEARCH_ANYWHERE)) {
 			print img_picto('', 'warning.png').' '.$langs->trans("YouHaveXObjectUseSearchOptim", $nb, $langs->transnoentitiesnoconv("ProductsOrServices"), 'PRODUCT_DONOTSEARCH_ANYWHERE');
+			print $langs->trans("YouHaveXObjectUseSearchOptimDesc");
 		} else {
-			print img_picto('', 'tick.png').' '.$langs->trans("YouHaveXObjectAndSearchOptimOn", $nb, $langs->transnoentitiesnoconv("ProductsOrServices"));
+			print img_picto('', 'tick.png').' '.$langs->trans("YouHaveXObjectAndSearchOptimOn", $nb, $langs->transnoentitiesnoconv("ProductsOrServices"), 'PRODUCT_DONOTSEARCH_ANYWHERE', $conf->global->PRODUCT_DONOTSEARCH_ANYWHERE);
 		}
 	} else {
 		print img_picto('', 'tick.png').' '.$langs->trans("NbOfObjectIsLowerThanNoPb", $nb, $langs->transnoentitiesnoconv("ProductsOrServices"));
@@ -491,20 +580,20 @@ if ($resql) {
 }
 
 // Thirdparty search
-$tab = array();
 $sql = "SELECT COUNT(*) as nb";
 $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 $resql = $db->query($sql);
 if ($resql) {
-	$limitforoptim = 10000;
+	$limitforoptim = 100000;
 	$num = $db->num_rows($resql);
 	$obj = $db->fetch_object($resql);
 	$nb = $obj->nb;
 	if ($nb > $limitforoptim) {
 		if (empty($conf->global->COMPANY_DONOTSEARCH_ANYWHERE)) {
 			print img_picto('', 'warning.png').' '.$langs->trans("YouHaveXObjectUseSearchOptim", $nb, $langs->transnoentitiesnoconv("ThirdParties"), 'COMPANY_DONOTSEARCH_ANYWHERE');
+			print $langs->trans("YouHaveXObjectUseSearchOptimDesc");
 		} else {
-			print img_picto('', 'tick.png').' '.$langs->trans("YouHaveXObjectAndSearchOptimOn", $nb, $langs->transnoentitiesnoconv("ThirdParties"));
+			print img_picto('', 'tick.png').' '.$langs->trans("YouHaveXObjectAndSearchOptimOn", $nb, $langs->transnoentitiesnoconv("ThirdParties"), 'COMPANY_DONOTSEARCH_ANYWHERE', $conf->global->COMPANY_DONOTSEARCH_ANYWHERE);
 		}
 	} else {
 		print img_picto('', 'tick.png').' '.$langs->trans("NbOfObjectIsLowerThanNoPb", $nb, $langs->transnoentitiesnoconv("ThirdParties"));
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 78077474c96..2eaba13de3c 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1323,9 +1323,12 @@ ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
 NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
+ComboListOptim=Combo list loading optimization
 SearchOptim=Search optimization
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
-YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
+YouHaveXObjectUseComboOptim=You have %s %s in the database. You can go into setup of module to enable loading of combo list on key pressed event.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other.
+YouHaveXObjectUseSearchOptimDesc=This limits the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to %s in Home-Setup-Other.
 BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
 BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
 PHPModuleLoaded=PHP component %s is loaded

From 4f61286ae29a69a8c6358d1271ce1e7c734665f1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 27 May 2021 02:36:16 +0200
Subject: [PATCH 0273/1497] Small perf fix

---
 htdocs/comm/action/list.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index e5dba5d88db..0ecf33e5ebf 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -320,7 +320,7 @@ if ($search_title != '') {
 	$param .= '&search_title='.urlencode($search_title);
 }
 if ($search_note != '') {
-	$param .= '&search_note='.$search_note;
+	$param .= '&search_note='.urlencode($search_note);
 }
 if (GETPOST('datestartday', 'int')) {
 	$param .= '&datestartday='.GETPOST('datestartday', 'int');
@@ -829,7 +829,11 @@ if ($resql) {
 		$actionstatic->location = $obj->location;
 		$actionstatic->note_private = dol_htmlentitiesbr($obj->note);
 
-		$actionstatic->fetchResources();
+		// Initialize $this->userassigned && this->socpeopleassigned array && this->userownerid
+		// but only if we need it
+		if (!empty($arrayfields['a.fk_contact']['checked'])) {
+			$actionstatic->fetchResources();
+		}
 
 		print '<tr class="oddeven">';
 

From 2caaa52e855e36576d5fbb0059f5e1e82a546ce7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 27 May 2021 02:52:51 +0200
Subject: [PATCH 0274/1497] Doc

---
 htdocs/comm/action/list.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index 0ecf33e5ebf..8c6fc94e31f 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -520,6 +520,7 @@ $sql .= $db->order($sortfield, $sortorder);
 
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
+	// TODO Set and use an optimized request in $sqlforcount with no fields and no useless join to caluclate nb of records
 	$result = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($result);
 	if (($page * $limit) > $nbtotalofrecords) {	// if total resultset is smaller then paging size (filtering), goto and load page 0

From 531dee31fd4b29653b2da452eeec7d3b83642ad4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 27 May 2021 11:14:29 +0200
Subject: [PATCH 0275/1497] Fix securekey

---
 htdocs/public/payment/newpayment.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 287f9a576db..38732d3825f 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -254,11 +254,15 @@ $parameters = [
 $reshook = $hookmanager->executeHooks('doValidatePayment', $parameters, $object, $action);
 
 // Check security token
+$tmpsource = $source;
+if ($tmpsource == 'membersubscription') {
+	$tmpsource = 'member';
+}
 $valid = true;
 if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
 	if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
-		if ($source && $REF) {
-			$token = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$source.$REF, 2); // Use the source in the hash to avoid duplicates if the references are identical
+		if ($tmpsource && $REF) {
+			$token = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$tmpsource.$REF, 2); // Use the source in the hash to avoid duplicates if the references are identical
 		} else {
 			$token = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
 		}
@@ -770,7 +774,7 @@ $replacemainarea = (empty($conf->dol_hide_leftmenu) ? '<div>' : '').'<div>';
 llxHeader($head, $langs->trans("PaymentForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody', $replacemainarea);
 
 // Check link validity
-if ($source && in_array($ref, array('member_ref', 'contractline_ref', 'invoice_ref', 'order_ref', ''))) {
+if ($source && in_array($ref, array('member_ref', 'contractline_ref', 'invoice_ref', 'order_ref', 'donation_ref', ''))) {
 	$langs->load("errors");
 	dol_print_error_email('BADREFINPAYMENTFORM', $langs->trans("ErrorBadLinkSourceSetButBadValueForRef", $source, $ref));
 	// End of page

From 5a5fa1edbb8c214b54f6bcfd43dcf9a537a08a93 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 27 May 2021 11:57:17 +0200
Subject: [PATCH 0276/1497] Fix regression amount was always empty.

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

diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 38732d3825f..b58a57fc706 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -762,6 +762,8 @@ if ($action == 'charge' && !empty($conf->stripe->enabled)) {
  * View
  */
 
+$form = new Form($db);
+
 $head = '';
 if (!empty($conf->global->ONLINE_PAYMENT_CSS_URL)) {
 	$head = '<link rel="stylesheet" type="text/css" href="'.$conf->global->ONLINE_PAYMENT_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
@@ -1483,32 +1485,42 @@ if ($source == 'member' || $source == 'membersubscription') {
 	}
 
 	if ($member->type) {
-		// Last member type
-		print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("LastMemberType");
-		print '</td><td class="CTableRow'.($var ? '1' : '2').'">'.dol_escape_htmltag($member->type);
-		print "</td></tr>\n";
+		$oldtypeid = $member->typeid;
+		$newtypeid = (int) (GETPOSTISSET("typeid") ? GETPOST("typeid", 'int') : $member->typeid);
 
-		require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
-		$adht = new AdherentType($db);
-		// Amount by member type
-		$amountbytype = $adht->amountByType(1);
-		// Set the member type
-		$member->typeid = (int) (GETPOSTISSET("typeid") ? GETPOST("typeid", 'int') : $member->typeid);
-		// If we change the type of membership, we set also label of new type
-		$member->type = dol_getIdFromCode($db, $member->typeid, 'adherent_type', 'rowid', 'libelle');
-		// Set amount for the subscription
-		$amount = (!empty($amountbytype[$member->typeid])) ? $amountbytype[$member->typeid]  : $member->last_subscription_amount;
-		// list member type
-		if ( !$action) {
-			$form = new Form($db); // so we can call method selectarray
-			print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("NewSubscription");
-			print '</td><td class="CTableRow'.($var ? '1' : '2').'">';
-			print $form->selectarray("typeid", $adht->liste_array(1), $member->typeid, 0, 0, 0, 'onchange="window.location.replace(\''.$urlwithroot.'/public/payment/newpayment.php?source='.urlencode($source).'&ref='.urlencode($ref).'&amount='.urlencode($amount).'&typeid=\' + this.value + \'&securekey='.urlencode($SECUREKEY).'\');"', 0, 0, 0, '', '', 1);
-			print "</td></tr>\n";
-		} elseif ($action == dopayment) {
-			print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("NewMemberType");
+		if ($oldtypeid != $newtypeid && !empty($conf->global->MEMBER_ALLOW_CHANGE_OF_TYPE)) {
+			require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
+			$adht = new AdherentType($db);
+			// Amount by member type
+			$amountbytype = $adht->amountByType(1);
+
+			// Last member type
+			print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("LastMemberType");
+			print '</td><td class="CTableRow'.($var ? '1' : '2').'">'.dol_escape_htmltag($member->type);
+			print "</td></tr>\n";
+
+			// Set the new member type
+			$member->typeid = $newtypeid;
+			$member->type = dol_getIdFromCode($db, $newtypeid, 'adherent_type', 'rowid', 'libelle');
+
+			// list member type
+			if (!$action) {
+				// Set amount for the subscription
+				$amount = (!empty($amountbytype[$member->typeid])) ? $amountbytype[$member->typeid]  : $member->last_subscription_amount;
+
+				print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("NewSubscription");
+				print '</td><td class="CTableRow'.($var ? '1' : '2').'">';
+				print $form->selectarray("typeid", $adht->liste_array(1), $member->typeid, 0, 0, 0, 'onchange="window.location.replace(\''.$urlwithroot.'/public/payment/newpayment.php?source='.urlencode($source).'&ref='.urlencode($ref).'&amount='.urlencode($amount).'&typeid=\' + this.value + \'&securekey='.urlencode($SECUREKEY).'\');"', 0, 0, 0, '', '', 1);
+				print "</td></tr>\n";
+			} elseif ($action == dopayment) {
+				print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("NewMemberType");
+				print '</td><td class="CTableRow'.($var ? '1' : '2').'">'.dol_escape_htmltag($member->type);
+				print '<input type="hidden" name="membertypeid" value="'.$member->typeid.'">';
+				print "</td></tr>\n";
+			}
+		} else {
+			print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("MemberType");
 			print '</td><td class="CTableRow'.($var ? '1' : '2').'">'.dol_escape_htmltag($member->type);
-			print '<input type="hidden" name="membertypeid" value="'.$member->typeid.'">';
 			print "</td></tr>\n";
 		}
 	}
diff --git a/htdocs/stripe/class/stripe.class.php b/htdocs/stripe/class/stripe.class.php
index 7f325090b5e..5614b3c6138 100644
--- a/htdocs/stripe/class/stripe.class.php
+++ b/htdocs/stripe/class/stripe.class.php
@@ -514,7 +514,7 @@ class Stripe extends CommonObject
 						if (!$resql) {
 							$error++;
 							$this->error = $this->db->lasterror();
-							dol_syslog(get_class($this)."::PaymentIntent failed to insert paymentintent with id=".$paymentintent->id." into database.");
+							dol_syslog(get_class($this)."::PaymentIntent failed to insert paymentintent with id=".$paymentintent->id." into database.", LOG_ERR);
 						}
 					}
 				} else {

From 61753791b47eb270abf09d545c6e5a07754612f3 Mon Sep 17 00:00:00 2001
From: Frans Bosman <frans@fbosman.nl>
Date: Thu, 27 May 2021 12:20:42 +0200
Subject: [PATCH 0277/1497] Update card.php

Add Batchinfo on invoice detail lines if hidden feature INCUDE_BATCHINFO_ON_INVOICE is set
---
 htdocs/compta/facture/card.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index a088d94a01c..2d147c86b07 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -2232,6 +2232,15 @@ if (empty($reshook)) {
 				$mesg = $langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, - 1, $conf->currency));
 				setEventMessages($mesg, null, 'errors');
 			} else {
+				
+				// Add batchinfo if the detailline has batchinfo
+									
+				if (!empty($lines[$i]->detail_batch) && ! empty($conf->global->INCUDE_BATCHINFO_ON_INVOICE)){
+						foreach ($lines[$i]->detail_batch as $batchline){
+									$desc .= ' Batch: '.$batchline->batch.' aantal: '.$batchline->qty;
+						}
+				}
+				
 				// Insert line
 				$result = $object->addline($desc, $pu_ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, $idprod, $remise_percent, $date_start, $date_end, 0, $info_bits, '', $price_base_type, $pu_ttc, $type, - 1, $special_code, '', 0, GETPOST('fk_parent_line'), $fournprice, $buyingprice, $label, $array_options, $_POST['progress'], '', $fk_unit, $pu_ht_devise);
 

From c31530e7edcc308ae7775020d07a5f698b60eef5 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Thu, 27 May 2021 10:24:18 +0000
Subject: [PATCH 0278/1497] Fixing style errors.

---
 htdocs/compta/facture/card.php | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 2d147c86b07..beb9463acab 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -2232,15 +2232,14 @@ if (empty($reshook)) {
 				$mesg = $langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, - 1, $conf->currency));
 				setEventMessages($mesg, null, 'errors');
 			} else {
-				
 				// Add batchinfo if the detailline has batchinfo
-									
-				if (!empty($lines[$i]->detail_batch) && ! empty($conf->global->INCUDE_BATCHINFO_ON_INVOICE)){
-						foreach ($lines[$i]->detail_batch as $batchline){
-									$desc .= ' Batch: '.$batchline->batch.' aantal: '.$batchline->qty;
-						}
+
+				if (!empty($lines[$i]->detail_batch) && ! empty($conf->global->INCUDE_BATCHINFO_ON_INVOICE)) {
+					foreach ($lines[$i]->detail_batch as $batchline) {
+								$desc .= ' Batch: '.$batchline->batch.' aantal: '.$batchline->qty;
+					}
 				}
-				
+
 				// Insert line
 				$result = $object->addline($desc, $pu_ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, $idprod, $remise_percent, $date_start, $date_end, 0, $info_bits, '', $price_base_type, $pu_ttc, $type, - 1, $special_code, '', 0, GETPOST('fk_parent_line'), $fournprice, $buyingprice, $label, $array_options, $_POST['progress'], '', $fk_unit, $pu_ht_devise);
 

From ca7e52d86185e5a65be20e496f227ead8e77a05d Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Thu, 27 May 2021 13:09:03 +0200
Subject: [PATCH 0279/1497] Update llx_c_email_templates.sql

- formatting
- removed *tms* at eventorganization
---
 .../mysql/data/llx_c_email_templates.sql      | 33 ++++++++++---------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_c_email_templates.sql b/htdocs/install/mysql/data/llx_c_email_templates.sql
index 5ca98be8545..acc09bad008 100644
--- a/htdocs/install/mysql/data/llx_c_email_templates.sql
+++ b/htdocs/install/mysql/data/llx_c_email_templates.sql
@@ -20,21 +20,24 @@
 -- de l'install et tous les sigles '--' sont supprimés.
 --
 
-INSERT INTO llx_c_email_templates (entity,module,type_template,lang,private,fk_user,datec,label,position,enabled,active,topic,content,content_lines) VALUES (0,'banque','thirdparty','',0,null,null,'(YourSEPAMandate)',1,'$conf->societe->enabled && $conf->banque->enabled && $conf->prelevement->enabled',0,'__(YourSEPAMandate)__','__(Hello)__,<br><br>\n\n__(FindYourSEPAMandate)__ :<br>\n__MYCOMPANY_NAME__<br>\n__MYCOMPANY_FULLADDRESS__<br><br>\n__(Sincerely)__<br>\n__USER_SIGNATURE__',null);
+-- Bank Thirdparty
+INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, enabled, active, topic, content, content_lines) VALUES (0,'banque','thirdparty','',0,null,null,'(YourSEPAMandate)',1,'$conf->societe->enabled && $conf->banque->enabled && $conf->prelevement->enabled',0,'__(YourSEPAMandate)__','__(Hello)__,<br><br>\n\n__(FindYourSEPAMandate)__ :<br>\n__MYCOMPANY_NAME__<br>\n__MYCOMPANY_FULLADDRESS__<br><br>\n__(Sincerely)__<br>\n__USER_SIGNATURE__',null);
 
+-- Members
+INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, enabled, active, topic, content, content_lines, joinfiles) VALUES (0,'adherent','member','',0,null,null,'(SendingEmailOnAutoSubscription)'       ,10,'$conf->adherent->enabled',1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(YourMembershipRequestWasReceived)__','__(Hello)__ __MEMBER_FULLNAME__,<br><br>\n\n__(ThisIsContentOfYourMembershipRequestWasReceived)__<br>\n<br>__ONLINE_PAYMENT_TEXT_AND_URL__<br>\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',null, 0);
+INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, enabled, active, topic, content, content_lines, joinfiles) VALUES (0,'adherent','member','',0,null,null,'(SendingEmailOnMemberValidation)'       ,20,'$conf->adherent->enabled',1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(YourMembershipWasValidated)__',      '__(Hello)__ __MEMBER_FULLNAME__,<br><br>\n\n__(ThisIsContentOfYourMembershipWasValidated)__<br>__(FirstName)__ : __MEMBER_FIRSTNAME__<br>__(LastName)__ : __MEMBER_LASTNAME__<br>__(ID)__ : __MEMBER_ID__<br>\n<br>__ONLINE_PAYMENT_TEXT_AND_URL__<br>\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',null, 0);
+INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, enabled, active, topic, content, content_lines, joinfiles) VALUES (0,'adherent','member','',0,null,null,'(SendingEmailOnNewSubscription)'        ,30,'$conf->adherent->enabled',1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(YourSubscriptionWasRecorded)__',     '__(Hello)__ __MEMBER_FULLNAME__,<br><br>\n\n__(ThisIsContentOfYourSubscriptionWasRecorded)__<br>\n\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',null, 1);
+INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, enabled, active, topic, content, content_lines, joinfiles) VALUES (0,'adherent','member','',0,null,null,'(SendingReminderForExpiredSubscription)',40,'$conf->adherent->enabled',1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(SubscriptionReminderEmail)__',       '__(Hello)__ __MEMBER_FULLNAME__,<br><br>\n\n__(ThisIsContentOfSubscriptionReminderEmail)__<br>\n<br>__ONLINE_PAYMENT_TEXT_AND_URL__<br>\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',null, 0);
+INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, enabled, active, topic, content, content_lines, joinfiles) VALUES (0,'adherent','member','',0,null,null,'(SendingEmailOnCancelation)'            ,50,'$conf->adherent->enabled',1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(YourMembershipWasCanceled)__',       '__(Hello)__ __MEMBER_FULLNAME__,<br><br>\n\n__(YourMembershipWasCanceled)__<br>\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',null, 0);
+INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, enabled, active, topic, content, content_lines, joinfiles) VALUES (0,'adherent','member','',0,null,null,'(SendingAnEMailToMember)'               ,60,'$conf->adherent->enabled',1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(CardContent)__',                     '__(Hello)__,<br><br>\n\n__(ThisIsContentOfYourCard)__<br>\n__(ID)__ : __ID__<br>\n__(Civiliyty)__ : __MEMBER_CIVILITY__<br>\n__(Firstname)__ : __MEMBER_FIRSTNAME__<br>\n__(Lastname)__ : __MEMBER_LASTNAME__<br>\n__(Fullname)__ : __MEMBER_FULLNAME__<br>\n__(Company)__ : __MEMBER_COMPANY__<br>\n__(Address)__ : __MEMBER_ADDRESS__<br>\n__(Zip)__ : __MEMBER_ZIP__<br>\n__(Town)__ : __MEMBER_TOWN__<br>\n__(Country)__ : __MEMBER_COUNTRY__<br>\n__(Email)__ : __MEMBER_EMAIL__<br>\n__(Birthday)__ : __MEMBER_BIRTH__<br>\n__(Photo)__ : __MEMBER_PHOTO__<br>\n__(Login)__ : __MEMBER_LOGIN__<br>\n__(Password)__ : __MEMBER_PASSWORD__<br>\n__(Phone)__ : __MEMBER_PHONE__<br>\n__(PhonePerso)__ : __MEMBER_PHONEPRO__<br>\n__(PhoneMobile)__ : __MEMBER_PHONEMOBILE__<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',null, 0);
 
-INSERT INTO llx_c_email_templates (entity,module,type_template,lang,private,fk_user,datec,label,position,enabled,active,topic,content,content_lines,joinfiles) VALUES (0,'adherent','member','',0,null,null,'(SendingEmailOnAutoSubscription)'       ,10,'$conf->adherent->enabled',1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(YourMembershipRequestWasReceived)__','__(Hello)__ __MEMBER_FULLNAME__,<br><br>\n\n__(ThisIsContentOfYourMembershipRequestWasReceived)__<br>\n<br>__ONLINE_PAYMENT_TEXT_AND_URL__<br>\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',null, 0);
-INSERT INTO llx_c_email_templates (entity,module,type_template,lang,private,fk_user,datec,label,position,enabled,active,topic,content,content_lines,joinfiles) VALUES (0,'adherent','member','',0,null,null,'(SendingEmailOnMemberValidation)'       ,20,'$conf->adherent->enabled',1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(YourMembershipWasValidated)__',      '__(Hello)__ __MEMBER_FULLNAME__,<br><br>\n\n__(ThisIsContentOfYourMembershipWasValidated)__<br>__(FirstName)__ : __MEMBER_FIRSTNAME__<br>__(LastName)__ : __MEMBER_LASTNAME__<br>__(ID)__ : __MEMBER_ID__<br>\n<br>__ONLINE_PAYMENT_TEXT_AND_URL__<br>\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',null, 0);
-INSERT INTO llx_c_email_templates (entity,module,type_template,lang,private,fk_user,datec,label,position,enabled,active,topic,content,content_lines,joinfiles) VALUES (0,'adherent','member','',0,null,null,'(SendingEmailOnNewSubscription)'        ,30,'$conf->adherent->enabled',1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(YourSubscriptionWasRecorded)__',     '__(Hello)__ __MEMBER_FULLNAME__,<br><br>\n\n__(ThisIsContentOfYourSubscriptionWasRecorded)__<br>\n\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',null, 1);
-INSERT INTO llx_c_email_templates (entity,module,type_template,lang,private,fk_user,datec,label,position,enabled,active,topic,content,content_lines,joinfiles) VALUES (0,'adherent','member','',0,null,null,'(SendingReminderForExpiredSubscription)',40,'$conf->adherent->enabled',1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(SubscriptionReminderEmail)__',       '__(Hello)__ __MEMBER_FULLNAME__,<br><br>\n\n__(ThisIsContentOfSubscriptionReminderEmail)__<br>\n<br>__ONLINE_PAYMENT_TEXT_AND_URL__<br>\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',null, 0);
-INSERT INTO llx_c_email_templates (entity,module,type_template,lang,private,fk_user,datec,label,position,enabled,active,topic,content,content_lines,joinfiles) VALUES (0,'adherent','member','',0,null,null,'(SendingEmailOnCancelation)'            ,50,'$conf->adherent->enabled',1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(YourMembershipWasCanceled)__',       '__(Hello)__ __MEMBER_FULLNAME__,<br><br>\n\n__(YourMembershipWasCanceled)__<br>\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',null, 0);
-INSERT INTO llx_c_email_templates (entity,module,type_template,lang,private,fk_user,datec,label,position,enabled,active,topic,content,content_lines,joinfiles) VALUES (0,'adherent','member','',0,null,null,'(SendingAnEMailToMember)'               ,60,'$conf->adherent->enabled',1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(CardContent)__',                     '__(Hello)__,<br><br>\n\n__(ThisIsContentOfYourCard)__<br>\n__(ID)__ : __ID__<br>\n__(Civiliyty)__ : __MEMBER_CIVILITY__<br>\n__(Firstname)__ : __MEMBER_FIRSTNAME__<br>\n__(Lastname)__ : __MEMBER_LASTNAME__<br>\n__(Fullname)__ : __MEMBER_FULLNAME__<br>\n__(Company)__ : __MEMBER_COMPANY__<br>\n__(Address)__ : __MEMBER_ADDRESS__<br>\n__(Zip)__ : __MEMBER_ZIP__<br>\n__(Town)__ : __MEMBER_TOWN__<br>\n__(Country)__ : __MEMBER_COUNTRY__<br>\n__(Email)__ : __MEMBER_EMAIL__<br>\n__(Birthday)__ : __MEMBER_BIRTH__<br>\n__(Photo)__ : __MEMBER_PHOTO__<br>\n__(Login)__ : __MEMBER_LOGIN__<br>\n__(Password)__ : __MEMBER_PASSWORD__<br>\n__(Phone)__ : __MEMBER_PHONE__<br>\n__(PhonePerso)__ : __MEMBER_PHONEPRO__<br>\n__(PhoneMobile)__ : __MEMBER_PHONEMOBILE__<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',null, 0);
+-- Recruiting
+INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, enabled, active, topic, content, content_lines, joinfiles) VALUES (0,'recruitment','recruitmentcandidature_send','',0,null,null,'(AnswerCandidature)'       ,100,'$conf->recruitment->enabled',1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(YourCandidature)__',       '__(Hello)__ __CANDIDATE_FULLNAME__,<br><br>\n\n__(YourCandidatureAnswerMessage)__<br>__ONLINE_INTERVIEW_SCHEDULER_TEXT_AND_URL__\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',null, 0);
 
-INSERT INTO llx_c_email_templates (entity,module,type_template,lang,private,fk_user,datec,label,position,enabled,active,topic,content,content_lines,joinfiles) VALUES (0,'recruitment','recruitmentcandidature_send','',0,null,null,'(AnswerCandidature)'                    ,100,'$conf->recruitment->enabled',1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(YourCandidature)__',       '__(Hello)__ __CANDIDATE_FULLNAME__,<br><br>\n\n__(YourCandidatureAnswerMessage)__<br>__ONLINE_INTERVIEW_SCHEDULER_TEXT_AND_URL__\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',null, 0);
-
-INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, tms, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, '2021-02-14 14:42:41', 'EventOrganizationEmailAskConf', 10, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailAskConf)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventConfRequestWasReceived)__<br /><br />__ONLINE_PAYMENT_TEXT_AND_URL__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
-INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, tms, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, '2021-02-14 14:42:41', 'EventOrganizationEmailAskBooth', 20, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailAskBooth)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventBoothRequestWasReceived)__<br /><br />__ONLINE_PAYMENT_TEXT_AND_URL__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
-INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, tms, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, '2021-02-14 14:42:41', 'EventOrganizationEmailSubsBooth', 30, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailSubsBooth)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventBoothSubscriptionWasReceived)__<br /><br />__ONLINE_PAYMENT_TEXT_AND_URL__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
-INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, tms, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, '2021-02-14 14:42:41', 'EventOrganizationEmailSubsEvent', 40, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailSubsEvent)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventEventSubscriptionWasReceived)__<br /><br />__(Sincerely)__<br /><br />__MYCOMPANY_NAME__<br />__USER_SIGNATURE__', null, '1', null);
-INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, tms, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, '2021-02-14 14:42:41', 'EventOrganizationMassEmailAttendees', 50, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationMassEmailAttendees)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventBulkMailToAttendees)__<br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
-INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, tms, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, '2021-02-14 14:42:41', 'EventOrganizationMassEmailSpeakers', 60, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationMassEmailSpeakers)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventBulkMailToSpeakers)__<br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
+-- Event organization 
+INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, 'EventOrganizationEmailAskConf',       10, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailAskConf)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventConfRequestWasReceived)__<br /><br />__ONLINE_PAYMENT_TEXT_AND_URL__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
+INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, 'EventOrganizationEmailAskBooth',      20, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailAskBooth)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventBoothRequestWasReceived)__<br /><br />__ONLINE_PAYMENT_TEXT_AND_URL__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
+INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, 'EventOrganizationEmailSubsBooth',     30, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailSubsBooth)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventBoothSubscriptionWasReceived)__<br /><br />__ONLINE_PAYMENT_TEXT_AND_URL__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
+INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, 'EventOrganizationEmailSubsEvent',     40, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailSubsEvent)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventEventSubscriptionWasReceived)__<br /><br />__(Sincerely)__<br /><br />__MYCOMPANY_NAME__<br />__USER_SIGNATURE__', null, '1', null);
+INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, 'EventOrganizationMassEmailAttendees', 50, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationMassEmailAttendees)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventBulkMailToAttendees)__<br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
+INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, 'EventOrganizationMassEmailSpeakers',  60, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationMassEmailSpeakers)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventBulkMailToSpeakers)__<br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);

From d0a8dc9df969c8432d4a0cf30a35c72407b4cd52 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Thu, 27 May 2021 13:25:00 +0200
Subject: [PATCH 0280/1497] Update llx_c_chargesociales.sql

idea:  fk_pays at first  - id as second (based on fk_pays)
---
 htdocs/install/mysql/data/llx_c_chargesociales.sql | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_c_chargesociales.sql b/htdocs/install/mysql/data/llx_c_chargesociales.sql
index b728d9c6414..a7e12df0d31 100644
--- a/htdocs/install/mysql/data/llx_c_chargesociales.sql
+++ b/htdocs/install/mysql/data/llx_c_chargesociales.sql
@@ -50,10 +50,10 @@ insert into llx_c_chargesociales (id, libelle, deductible, active, code, fk_pays
 --
 -- Belgique
 --
-insert into llx_c_chargesociales (id, libelle, deductible, active, code, fk_pays) values (201, 'ONSS',						1,1,'TAXBEONSS'   ,'2');
-insert into llx_c_chargesociales (id, libelle, deductible, active, code, fk_pays) values (210, 'Precompte professionnel', 	1,1,'TAXBEPREPRO' ,'2');
-insert into llx_c_chargesociales (id, libelle, deductible, active, code, fk_pays) values (220, 'Prime existence',    		1,1,'TAXBEPRIEXI' ,'2');
-insert into llx_c_chargesociales (id, libelle, deductible, active, code, fk_pays) values (230, 'Precompte immobilier',      1,1,'TAXBEPREIMMO','2');
+insert into llx_c_chargesociales (fk_pays, id, libelle, deductible, active, code) values ('2', 201, 'ONSS',						1,1,'TAXBEONSS');
+insert into llx_c_chargesociales (fk_pays, id, libelle, deductible, active, code) values ('2', 210, 'Precompte professionnel', 	1,1,'TAXBEPREPRO');
+insert into llx_c_chargesociales (fk_pays, id, libelle, deductible, active, code) values ('2', 220, 'Prime existence',    		1,1,'TAXBEPRIEXI');
+insert into llx_c_chargesociales (fk_pays, id, libelle, deductible, active, code) values ('2', 230, 'Precompte immobilier',      1,1,'TAXBEPREIMMO');
 
 --
 -- Austria

From 61138b821078a66283fbdeccc88521f8d72cb613 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 27 May 2021 14:25:00 +0200
Subject: [PATCH 0281/1497] Fix look and feel v14

---
 htdocs/user/card.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 073438bda1f..d189ced83aa 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1134,7 +1134,8 @@ if ($action == 'create' || $action == 'adduserldap') {
 	}
 
 	if (!empty($conf->global->MAIN_MULTILANGS)) {
-		print '<tr><td>'.$form->editfieldkey('DefaultLang', 'default_lang', '', $object, 0).'</td><td colspan="3" class="maxwidthonsmartphone">'."\n";
+		print '<tr><td>'.$form->editfieldkey('DefaultLang', 'default_lang', '', $object, 0, 'string', '', 0, 0, 'id', $langs->trans("WarningNotLangOfInterface", $langs->transnoentitiesnoconv("UserGUISetup"))).'</td>';
+		print '<td colspan="3" class="maxwidthonsmartphone">'."\n";
 		print img_picto('', 'language').$formadmin->select_language(GETPOST('default_lang', 'alpha') ?GETPOST('default_lang', 'alpha') : ($object->lang ? $object->lang : ''), 'default_lang', 0, 0, 1, 0, 0, 'maxwidth200onsmartphone');
 		print '</td>';
 		print '</tr>';
@@ -1590,13 +1591,15 @@ if ($action == 'create' || $action == 'adduserldap') {
 
 			// Default language
 			if (!empty($conf->global->MAIN_MULTILANGS)) {
+				$langs->load("languages");
 				require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-				print '<tr><td class="titlefield">'.$langs->trans("DefaultLang").'</td><td>';
+				print '<tr><td class="titlefield">';
+				print $form->textwithpicto($langs->trans("DefaultLang"), $langs->trans("WarningNotLangOfInterface", $langs->transnoentitiesnoconv("UserGUISetup")));
+				print '</td><td>';
 				//$s=picto_from_langcode($object->default_lang);
 				//print ($s?$s.' ':'');
-				$langs->load("languages");
 				$labellang = ($object->lang ? $langs->trans('Language_'.$object->lang) : '');
-				print $form->textwithpicto($labellang, $langs->trans("WarningNotLangOfInterface", $langs->transnoentitiesnoconv("UserGUISetup")));
+				print $labellang;
 				print '</td></tr>';
 			}
 
@@ -2500,7 +2503,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 
 			// Default language
 			if (!empty($conf->global->MAIN_MULTILANGS)) {
-				print '<tr><td>'.$form->editfieldkey('DefaultLang', 'default_lang', '', $object, 0).'</td><td colspan="3">'."\n";
+				print '<tr><td>'.$form->editfieldkey('DefaultLang', 'default_lang', '', $object, 0, 'string', '', 0, 0, 'id', $langs->trans("WarningNotLangOfInterface", $langs->transnoentitiesnoconv("UserGUISetup"))).'</td><td colspan="3">'."\n";
 				print img_picto('', 'language').$formadmin->select_language($object->lang, 'default_lang', 0, 0, 1);
 				print '</td>';
 				print '</tr>';

From e9cf33dac56fdce36bd8e7600faa47be970279cc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 27 May 2021 14:35:20 +0200
Subject: [PATCH 0282/1497] css

---
 htdocs/adherents/subscription/list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php
index 06cd77f61c4..15dbfd2ec30 100644
--- a/htdocs/adherents/subscription/list.php
+++ b/htdocs/adherents/subscription/list.php
@@ -528,7 +528,7 @@ while ($i < min($num, $limit)) {
 
 	// Lastname
 	if (!empty($arrayfields['d.lastname']['checked'])) {
-		print '<td>'.$adherent->getNomUrl(-1, 0, 'card', 'lastname').'</td>';
+		print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($adherent->lastname).'">'.$adherent->getNomUrl(-1, 0, 'card', 'lastname').'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}

From e7f9d317c30164097790213a293d3cee472b9692 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 27 May 2021 14:45:16 +0200
Subject: [PATCH 0283/1497] css

---
 htdocs/adherents/subscription/list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php
index 15dbfd2ec30..2a40524413d 100644
--- a/htdocs/adherents/subscription/list.php
+++ b/htdocs/adherents/subscription/list.php
@@ -551,7 +551,7 @@ while ($i < min($num, $limit)) {
 
 	// Label
 	if (!empty($arrayfields['t.libelle']['checked'])) {
-		print '<td class="tdoverflowmax500" title="'.dol_escape_htmltag($obj->note).'">';
+		print '<td class="tdoverflowmax400" title="'.dol_escape_htmltag($obj->note).'">';
 		print $obj->note;
 		print '</td>';
 		if (!$i) {

From cc0560c73dc50ca484970726f3009573fc6c0d63 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 27 May 2021 14:47:06 +0200
Subject: [PATCH 0284/1497] css

---
 htdocs/adherents/subscription/list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php
index 2a40524413d..d3d84cb3624 100644
--- a/htdocs/adherents/subscription/list.php
+++ b/htdocs/adherents/subscription/list.php
@@ -528,7 +528,7 @@ while ($i < min($num, $limit)) {
 
 	// Lastname
 	if (!empty($arrayfields['d.lastname']['checked'])) {
-		print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($adherent->lastname).'">'.$adherent->getNomUrl(-1, 0, 'card', 'lastname').'</td>';
+		print '<td class="tdoverflowmax150">'.$adherent->getNomUrl(-1, 0, 'card', 'lastname').'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}

From a33f6a897748480026921694b62889db79d7717c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 27 May 2021 14:57:16 +0200
Subject: [PATCH 0285/1497] css

---
 htdocs/adherents/list.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index 986abc83b7b..838b7a6a620 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -949,7 +949,7 @@ while ($i < min($num, $limit)) {
 	}
 	// Firstname
 	if (!empty($arrayfields['d.firstname']['checked'])) {
-		print "<td>";
+		print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($obj->firstname).'">';
 		print $obj->firstname;
 		print "</td>\n";
 		if (!$i) {
@@ -958,7 +958,7 @@ while ($i < min($num, $limit)) {
 	}
 	// Lastname
 	if (!empty($arrayfields['d.lastname']['checked'])) {
-		print "<td>";
+		print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($obj->lastname).'">';
 		print $obj->lastname;
 		print "</td>\n";
 		if (!$i) {
@@ -978,13 +978,13 @@ while ($i < min($num, $limit)) {
 	}
 	// Company
 	if (!empty($arrayfields['d.company']['checked'])) {
-		print "<td>";
+		print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($companyname).'">';
 		print $companyname;
 		print "</td>\n";
 	}
 	// Login
 	if (!empty($arrayfields['d.login']['checked'])) {
-		print "<td>".$obj->login."</td>\n";
+		print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($obj->login).'">'.$obj->login."</td>\n";
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
@@ -1009,7 +1009,7 @@ while ($i < min($num, $limit)) {
 	if (!empty($arrayfields['t.libelle']['checked'])) {
 		$membertypestatic->id = $obj->type_id;
 		$membertypestatic->label = $obj->type;
-		print '<td class="nowrap">';
+		print '<td class="nowraponall">';
 		print $membertypestatic->getNomUrl(1, 32);
 		print '</td>';
 		if (!$i) {
@@ -1018,7 +1018,7 @@ while ($i < min($num, $limit)) {
 	}
 	// Address
 	if (!empty($arrayfields['d.address']['checked'])) {
-		print '<td class="nocellnopadd">';
+		print '<td class="nocellnopadd tdoverflowmax200" title="'.dol_escape_htmltag($obj->address).'">';
 		print $obj->address;
 		print '</td>';
 		if (!$i) {

From 819e6e1122610cc5b15c94c1a89cdc741ac25fe3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 27 May 2021 14:59:44 +0200
Subject: [PATCH 0286/1497] Fix duplicate

---
 htdocs/adherents/list.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index 838b7a6a620..749eacbbe10 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -306,7 +306,12 @@ $memberstatic = new Adherent($db);
 
 $now = dol_now();
 
-$sql = "SELECT d.rowid, d.ref, d.login, d.lastname, d.firstname, d.gender, d.societe as company, d.fk_soc,";
+if (!empty($search_categ) || !empty($catid)) {
+	$sql = "SELECT DISTINCT";
+} else {
+	$sql = "SELECT";
+}
+$sql .= " d.rowid, d.ref, d.login, d.lastname, d.firstname, d.gender, d.societe as company, d.fk_soc,";
 $sql .= " d.civility, d.datefin, d.address, d.zip, d.town, d.state_id, d.country,";
 $sql .= " d.email, d.phone, d.phone_perso, d.phone_mobile, d.skype, d.birth, d.public, d.photo,";
 $sql .= " d.fk_adherent_type as type_id, d.morphy, d.statut, d.datec as date_creation, d.tms as date_update,";
@@ -337,7 +342,7 @@ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as country on (country.rowid = d
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid = d.state_id)";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on (s.rowid = d.fk_soc)";
 $sql .= ", ".MAIN_DB_PREFIX."adherent_type as t";
-$sql .= " WHERE d.fk_adherent_type = t.rowid ";
+$sql .= " WHERE d.fk_adherent_type = t.rowid";
 if ($catid > 0) {
 	$sql .= " AND cm.fk_categorie = ".((int) $catid);
 }

From 8ed24d67969bf7a5375c90da5855a898e5cd8211 Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Thu, 27 May 2021 16:02:12 +0200
Subject: [PATCH 0287/1497] Add missing trigger LINERECEPTION_DELETE

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

diff --git a/htdocs/fourn/class/fournisseur.commande.dispatch.class.php b/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
index 0f8b8341a3d..5457a9ee376 100644
--- a/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
@@ -333,7 +333,6 @@ class CommandeFournisseurDispatch extends CommonObject
 	 */
 	public function update($user, $notrigger = 0)
 	{
-		global $conf, $langs;
 		$error = 0;
 
 		// Clean parameters
@@ -411,12 +410,12 @@ class CommandeFournisseurDispatch extends CommonObject
 			}
 
 			if (!$notrigger) {
-				// Uncomment this and change MYOBJECT to your own tag if you
+				// Call triggers
 				$result = $this->call_trigger('LINERECEPTION_UPDATE', $user);
 				if ($result < 0) {
 					$error++;
 				}
-				//// End call triggers
+				// End call triggers
 			}
 		}
 
@@ -444,24 +443,22 @@ class CommandeFournisseurDispatch extends CommonObject
 	 */
 	public function delete($user, $notrigger = 0)
 	{
-		global $conf, $langs;
 		$error = 0;
 
 		$this->db->begin();
 
 		if (!$error) {
 			if (!$notrigger) {
-				// Uncomment this and change MYOBJECT to your own tag if you
-				// want this action calls a trigger.
-
-				//// Call triggers
-				//$result=$this->call_trigger('MYOBJECT_DELETE',$user);
-				//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
-				//// End call triggers
+				// Call triggers
+				$result = $this->call_trigger('LINERECEPTION_DELETE', $user);
+				if ($result < 0) {
+					$error++;
+				}
+				// End call triggers
 			}
 		}
 
-				// Remove extrafields
+		// Remove extrafields
 		if (!$error) {
 			$result = $this->deleteExtraFields();
 			if ($result < 0) {
@@ -496,7 +493,6 @@ class CommandeFournisseurDispatch extends CommonObject
 	}
 
 
-
 	/**
 	 *	Load an object from its id and create a new one in database
 	 *

From 48f5cea91776bd8f3c47d1c45847844d0f2956dc Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Thu, 27 May 2021 16:03:17 +0200
Subject: [PATCH 0288/1497] Fix update receipt eatby

---
 htdocs/fourn/commande/dispatch.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index 4b8812cf22e..2c847b9a421 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -443,7 +443,7 @@ if ($action == 'updateline' && $user->rights->fournisseur->commande->receptionne
 		$product = $supplierorderdispatch->fk_product;
 		$price = price2num(GETPOST('price'), '', 2);
 		$comment = $supplierorderdispatch->comment;
-		$eatby = $supplierorderdispatch->fk_product;
+		$eatby = $supplierorderdispatch->eatby;
 		$sellby = $supplierorderdispatch->sellby;
 		$batch = $supplierorderdispatch->batch;
 

From fd2d10d443d73816b78b35120d7d954b4a1ceb03 Mon Sep 17 00:00:00 2001
From: Frans Bosman <frans@fbosman.nl>
Date: Thu, 27 May 2021 16:23:33 +0200
Subject: [PATCH 0289/1497] Update card.php

---
 htdocs/compta/facture/card.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index beb9463acab..c7c9202c18c 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -67,7 +67,7 @@ if (!empty($conf->accounting->enabled)) {
 }
 
 // Load translation files required by the page
-$langs->loadLangs(array('bills', 'companies', 'compta', 'products', 'banks', 'main', 'withdrawals'));
+$langs->loadLangs(array('bills', 'companies', 'compta', 'products', 'banks', 'main', 'withdrawals','productbatch'));
 if (!empty($conf->incoterm->enabled)) {
 	$langs->load('incoterm');
 }
@@ -2236,7 +2236,8 @@ if (empty($reshook)) {
 
 				if (!empty($lines[$i]->detail_batch) && ! empty($conf->global->INCUDE_BATCHINFO_ON_INVOICE)) {
 					foreach ($lines[$i]->detail_batch as $batchline) {
-								$desc .= ' Batch: '.$batchline->batch.' aantal: '.$batchline->qty;
+								$desc .= ' '.$langs->trans('Batch').' '.$batchline->batch.' '.$langs->trans('printQty',$batchline->qty).' ';
+							
 					}
 				}
 

From dfb2e547500646ddd5563fa1cf4fc8e0fe5907c2 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Thu, 27 May 2021 14:25:42 +0000
Subject: [PATCH 0290/1497] Fixing style errors.

---
 htdocs/compta/facture/card.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index c7c9202c18c..02fb8467e21 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -2236,8 +2236,7 @@ if (empty($reshook)) {
 
 				if (!empty($lines[$i]->detail_batch) && ! empty($conf->global->INCUDE_BATCHINFO_ON_INVOICE)) {
 					foreach ($lines[$i]->detail_batch as $batchline) {
-								$desc .= ' '.$langs->trans('Batch').' '.$batchline->batch.' '.$langs->trans('printQty',$batchline->qty).' ';
-							
+								$desc .= ' '.$langs->trans('Batch').' '.$batchline->batch.' '.$langs->trans('printQty', $batchline->qty).' ';
 					}
 				}
 

From 14fdd4d0c6ff9be688b683ae330f965e500993b7 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Thu, 27 May 2021 16:43:49 +0200
Subject: [PATCH 0291/1497] fix rollback to rollbac

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

diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php
index 2abc830eb7c..4344c2c7e08 100644
--- a/htdocs/product/inventory/inventory.php
+++ b/htdocs/product/inventory/inventory.php
@@ -160,7 +160,7 @@ if ($action == 'update' && !empty($user->rights->stock->mouvement->creer)) {
 	if (! $error) {
 		$db->commit();
 	} else {
-		$db->rollbak();
+		$db->rollback();
 	}
 }
 

From 00d60aa65a94b6b2f2e580261bceb3163907b0d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 27 May 2021 16:54:41 +0200
Subject: [PATCH 0292/1497] doxygen

---
 .../core/modules/supplier_invoice/doc/pdf_canelle.modules.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php b/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
index 8f6d12df1d0..07961dd3500 100644
--- a/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
+++ b/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2010-2011  Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2010-2014  Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2015       Marcos García        <marcosgdf@gmail.com>
- * Copyright (C) 2018       Frédéric France      <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2021  Frédéric France      <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -1062,7 +1062,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 	 *  @param  FactureFournisseur  $object         Object to show
 	 *  @param  int                 $showaddress    0=no, 1=yes
 	 *  @param  Translate           $outputlangs    Object lang for output
-	 *  @return void
+	 *  @return int
 	 */
 	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
 	{

From f1b32dce17dfc86dbaf8a8726a1758f02b10260f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 27 May 2021 17:07:59 +0200
Subject: [PATCH 0293/1497] Update pdf_canelle.modules.php

---
 .../core/modules/supplier_invoice/doc/pdf_canelle.modules.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php b/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
index 8f6d12df1d0..ed4f8ed6590 100644
--- a/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
+++ b/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
@@ -376,7 +376,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 					$notetoshow = convertBackOfficeMediasLinksToPublicLinks($notetoshow);
 
 					$pdf->SetFont('', '', $default_font_size - 1);
-					$pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top - 1, dol_htmlentitiesbr($object->note_public), 0, 1);
+					$pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top - 1, dol_htmlentitiesbr($notetoshow), 0, 1);
 					$nexY = $pdf->GetY();
 					$height_note = $nexY - $tab_top;
 

From 4095c69582d5fc62bf15107283d6c38af4acb744 Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Thu, 27 May 2021 21:09:49 +0200
Subject: [PATCH 0294/1497] Fix #17743 newpayement source membersubscription is
 member

Fix #17743 newpayement source membersubscription is not valid anymore

@eldy I'm not sure, but the bug may still occure with external module referring to membersubscription instead of member.
---
 htdocs/core/lib/payments.lib.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/lib/payments.lib.php b/htdocs/core/lib/payments.lib.php
index 59d9eb4aa4c..4621e22d122 100644
--- a/htdocs/core/lib/payments.lib.php
+++ b/htdocs/core/lib/payments.lib.php
@@ -158,7 +158,7 @@ function getValidOnlinePaymentMethods($paymentmethod = '')
 /**
  * Return string with full online payment Url
  *
- * @param   string	$type		Type of URL ('free', 'order', 'invoice', 'contractline', 'membersubscription' ...)
+ * @param   string	$type		Type of URL ('free', 'order', 'invoice', 'contractline', 'member' ...)
  * @param	string	$ref		Ref of object
  * @return	string				Url string
  */
@@ -182,7 +182,7 @@ function showOnlinePaymentUrl($type, $ref)
 /**
  * Return string with HTML link for online payment
  *
- * @param	string	$type		Type of URL ('free', 'order', 'invoice', 'contractline', 'membersubscription' ...)
+ * @param	string	$type		Type of URL ('free', 'order', 'invoice', 'contractline', 'member' ...)
  * @param	string	$ref		Ref of object
  * @param	string	$label		Text or HTML tag to display, if empty it display the URL
  * @return	string			Url string
@@ -199,7 +199,7 @@ function getHtmlOnlinePaymentLink($type, $ref, $label = '')
  * Return string with full Url
  *
  * @param   int		$mode		      0=True url, 1=Url formated with colors
- * @param   string	$type		      Type of URL ('free', 'order', 'invoice', 'contractline', 'membersubscription' ...)
+ * @param   string	$type		      Type of URL ('free', 'order', 'invoice', 'contractline', 'member' ...)
  * @param	string	$ref		      Ref of object
  * @param	int		$amount		      Amount (required for $type='free' only)
  * @param	string	$freetag	      Free tag
@@ -304,7 +304,7 @@ function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag
 		}
 	} elseif ($type == 'member' || $type == 'membersubscription') {
 		$newtype = 'member';
-		$out = $urltouse.'/public/payment/newpayment.php?source=membersubscription&ref='.($mode ? '<font color="#666666">' : '');
+		$out = $urltouse.'/public/payment/newpayment.php?source=member&ref='.($mode ? '<font color="#666666">' : '');
 		if ($mode == 1) {
 			$out .= 'member_ref';
 		}

From 52d44bd75e1413345a4a5b86d165734d94b01a91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 27 May 2021 22:28:59 +0200
Subject: [PATCH 0295/1497] fix warnings

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 1f90b5f4fdc..28c3152359c 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -8325,10 +8325,10 @@ class Form
 						$nophoto = 'company';
 					} else {
 						$nophoto = '/public/theme/common/user_anonymous.png';
-						if ($object->gender == 'man') {
+						if (!empty($object->gender) && $object->gender == 'man') {
 							$nophoto = '/public/theme/common/user_man.png';
 						}
-						if ($object->gender == 'woman') {
+						if (!empty($object->gender) && $object->gender == 'woman') {
 							$nophoto = '/public/theme/common/user_woman.png';
 						}
 					}

From 3b381dccc3af3a71a608ab897034fb7e34c2cf24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 27 May 2021 22:33:25 +0200
Subject: [PATCH 0296/1497] fix warnings

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

diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 589559ea426..95ba96abd74 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -580,9 +580,9 @@ if ($object->id > 0) {
 		print '</tr></table>';
 		print '</td><td>';
 		if ($action == 'edittransportmode') {
-			$form->formSelectTransportMode($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->fk_transport_mode, 'fk_transport_mode', 1);
+			$form->formSelectTransportMode($_SERVER['PHP_SELF'].'?socid='.$object->id, (!empty($object->fk_transport_mode) ? $object->fk_transport_mode : ''), 'fk_transport_mode', 1);
 		} else {
-			$form->formSelectTransportMode($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->fk_transport_mode, 'none');
+			$form->formSelectTransportMode($_SERVER['PHP_SELF'].'?socid='.$object->id, (!empty($object->fk_transport_mode) ? $object->fk_transport_mode : ''), 'none');
 		}
 		print "</td>";
 		print '</tr>';

From e1a427f1601bc2aa1224ee95e3f9034505cdeeb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 27 May 2021 22:40:26 +0200
Subject: [PATCH 0297/1497] fix warnings

---
 htdocs/comm/card.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 589559ea426..ce7d4242b6b 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -874,6 +874,7 @@ if ($object->id > 0) {
 		$sql .= ", c.total_ttc";
 		$sql .= ", c.ref, c.ref_client, c.fk_statut, c.facture";
 		$sql .= ", c.date_commande as dc";
+		$sql .= ", c.facture as billed";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande as c";
 		$sql .= " WHERE c.fk_soc = s.rowid ";
 		$sql .= " AND s.rowid = ".$object->id;

From 0b6457d83fae635dab80a6f65f21c24a8117aa83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 27 May 2021 22:44:05 +0200
Subject: [PATCH 0298/1497] fix warning

---
 htdocs/holiday/list.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index b00abadb9c3..dbc4b78be1a 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -722,6 +722,7 @@ if ($resql) {
 
 		$i = 0;
 		$totalarray = array();
+		$totalarray['nbfield'] = 0;
 		while ($i < min($num, $limit)) {
 			$obj = $db->fetch_object($resql);
 

From 4c1503a93bd825c1ec3571729104f9abda1cd60f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 27 May 2021 22:50:56 +0200
Subject: [PATCH 0299/1497] fix warnings

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

diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 25ee6072a90..34bef81e5a2 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2015 		Laurent Destailleur 	<eldy@users.sourceforge.net>
  * Copyright (C) 2015 		Alexandre Spangaro  	<aspangaro@open-dsi.fr>
  * Copyright (C) 2018       Nicolas ZABOURI         <info@inovea-conseil.com>
- * Copyright (c) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (c) 2018-2021  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2016-2020 	Ferran Marcet       	<fmarcet@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -2478,9 +2478,9 @@ class ExpenseReport extends CommonObject
 
 		$now = dol_now();
 		if ($option == 'toapprove') {
-			return ($this->datevalid ? $this->datevalid : $this->date_valid) < ($now - $conf->expensereport->approve->warning_delay);
+			return (!empty($this->datevalid) ? $this->datevalid : $this->date_valid) < ($now - $conf->expensereport->approve->warning_delay);
 		} else {
-			return ($this->datevalid ? $this->datevalid : $this->date_valid) < ($now - $conf->expensereport->payment->warning_delay);
+			return (!empty($this->datevalid) ? $this->datevalid : $this->date_valid) < ($now - $conf->expensereport->payment->warning_delay);
 		}
 	}
 

From d0b8a80c7a59cc87926aa1650db633a51e61cf79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 27 May 2021 22:56:20 +0200
Subject: [PATCH 0300/1497] fix warning

---
 htdocs/core/tpl/commonfields_add.tpl.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/tpl/commonfields_add.tpl.php b/htdocs/core/tpl/commonfields_add.tpl.php
index 639be537dba..3a43f04c149 100644
--- a/htdocs/core/tpl/commonfields_add.tpl.php
+++ b/htdocs/core/tpl/commonfields_add.tpl.php
@@ -82,7 +82,7 @@ foreach ($object->fields as $key => $val) {
 	} else {
 		$value = GETPOST($key, 'alphanohtml');
 	}
-	if ($val['noteditable']) {
+	if (!empty($val['noteditable'])) {
 		print $object->showOutputField($val, $key, $value, '', '', '', 0);
 	} else {
 		print $object->showInputField($val, $key, $value, '', '', '', 0);

From ca0654323f0ab7da9e2000af21f289eeb4c481c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 27 May 2021 23:11:05 +0200
Subject: [PATCH 0301/1497] fix warnings

---
 htdocs/core/class/commonobject.class.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 3f4b2dd9ee6..32cffe9e4f8 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -6397,7 +6397,7 @@ abstract class CommonObject
 		$param = array();
 		$param['options'] = array();
 		$reg = array();
-		$size = $this->fields[$key]['size'];
+		$size = !empty($this->fields[$key]['size']) ? $this->fields[$key]['size'] : 0;
 		// Because we work on extrafields
 		if (preg_match('/^(integer|link):(.*):(.*):(.*):(.*)/i', $val['type'], $reg)) {
 			$param['options'] = array($reg[2].':'.$reg[3].':'.$reg[4].':'.$reg[5] => 'N');
@@ -6430,21 +6430,21 @@ abstract class CommonObject
 		}
 
 		// Special case that force options and type ($type can be integer, varchar, ...)
-		if (is_array($this->fields[$key]['arrayofkeyval'])) {
+		if (!empty($this->fields[$key]['arrayofkeyval']) && is_array($this->fields[$key]['arrayofkeyval'])) {
 			$param['options'] = $this->fields[$key]['arrayofkeyval'];
 			$type = 'select';
 		}
 
 		$label = $this->fields[$key]['label'];
 		//$elementtype=$this->fields[$key]['elementtype'];	// Seems not used
-		$default = $this->fields[$key]['default'];
-		$computed = $this->fields[$key]['computed'];
-		$unique = $this->fields[$key]['unique'];
-		$required = $this->fields[$key]['required'];
-		$autofocusoncreate = $this->fields[$key]['autofocusoncreate'];
+		$default = (!empty($this->fields[$key]['default']) ? $this->fields[$key]['default'] : '');
+		$computed = (!empty($this->fields[$key]['computed']) ? $this->fields[$key]['computed'] : '');
+		$unique = (!empty($this->fields[$key]['unique']) ? $this->fields[$key]['unique'] : 0);
+		$required = (!empty($this->fields[$key]['required']) ? $this->fields[$key]['required'] : 0);
+		$autofocusoncreate = (!empty($this->fields[$key]['autofocusoncreate']) ? $this->fields[$key]['autofocusoncreate'] : 0);
 
-		$langfile = $this->fields[$key]['langfile'];
-		$list = $this->fields[$key]['list'];
+		$langfile = (!empty($this->fields[$key]['langfile']) ? $this->fields[$key]['langfile'] : '');
+		$list = (!empty($this->fields[$key]['list']) ? $this->fields[$key]['list'] : 0);
 		$hidden = (in_array(abs($this->fields[$key]['visible']), array(0, 2)) ? 1 : 0);
 
 		$objectid = $this->id;

From e87d1750415679b2556f961fedd0c2aa64775446 Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Fri, 28 May 2021 09:57:21 +0200
Subject: [PATCH 0302/1497] Fix inventory/inventory.php

---
 htdocs/langs/en_US/stocks.lang         |  1 +
 htdocs/product/inventory/inventory.php | 12 +++++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang
index 93cf9e9e037..977aab588a2 100644
--- a/htdocs/langs/en_US/stocks.lang
+++ b/htdocs/langs/en_US/stocks.lang
@@ -255,3 +255,4 @@ MakeMovementsAndClose=Generate movements and close
 AutofillWithExpected=Fill real quantity with expected quantity
 ShowAllBatchByDefault=By default, show batch details on product "stock" tab
 CollapseBatchDetailHelp=You can set batch detail default display in stocks module configuration
+FieldCannotBeNegative=Field "%s" cannot be negative
\ No newline at end of file
diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php
index 2abc830eb7c..212f0404bd9 100644
--- a/htdocs/product/inventory/inventory.php
+++ b/htdocs/product/inventory/inventory.php
@@ -185,8 +185,11 @@ if ($action =='updateinventorylines' && $permissiontoadd) {
 
 			if (GETPOST("id_".$lineid, 'alpha') != '') {		// If a value was set ('0' or something else)
 				$qtytoupdate = price2num(GETPOST("id_".$lineid, 'alpha'), 'MS');
-
 				$result = $inventoryline->fetch($lineid);
+				if ($qtytoupdate < 0) {
+					$result = -1;
+					setEventMessages($langs->trans("FieldCannotBeNegative", $langs->transnoentitiesnoconv("RealQty")), null, 'errors');
+				}
 				if ($result > 0) {
 					$inventoryline->qty_view = $qtytoupdate;
 					$resultupdate = $inventoryline->update($user);
@@ -251,7 +254,10 @@ if (empty($reshook)) {
 			$error++;
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Product")), null, 'errors');
 		}
-
+		if (GETPOST('qtytoadd') < 0) {
+			$error++;
+			setEventMessages($langs->trans("FieldCannotBeNegative", $langs->transnoentitiesnoconv("RealQty")), null, 'errors');
+		}
 		if (!$error && !empty($conf->productbatch->enabled)) {
 			$tmpproduct = new Product($db);
 			$result = $tmpproduct->fetch($fk_product);
@@ -654,7 +660,7 @@ if ($object->id > 0) {
 			// Real quantity
 			print '<td class="center">';
 			if ($object->status == $object::STATUS_VALIDATED) {
-				$qty_view = GETPOST("id_".$obj->rowid) ? GETPOST("id_".$obj->rowid) : $obj->qty_view;
+				$qty_view = GETPOST("id_".$obj->rowid) && GETPOST("id_".$obj->rowid) >= 0 ? GETPOST("id_".$obj->rowid) : $obj->qty_view;
 				$totalfound += price2num($qty_view, 'MS');
 				print '<input type="text" class="maxwidth75 right realqty" name="id_'.$obj->rowid.'" id="id_'.$obj->rowid.'_input" value="'.$qty_view.'">';
 				print '</td>';

From e3a5abe20e9e1c1941d489f936b8e06edb921770 Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Fri, 28 May 2021 10:02:48 +0200
Subject: [PATCH 0303/1497] Fix error name of menu knowledge management system

---
 htdocs/langs/en_US/knowledgemanagement.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/knowledgemanagement.lang b/htdocs/langs/en_US/knowledgemanagement.lang
index 269007e60f8..68f5cced76c 100644
--- a/htdocs/langs/en_US/knowledgemanagement.lang
+++ b/htdocs/langs/en_US/knowledgemanagement.lang
@@ -47,7 +47,7 @@ KnowledgeManagementArea = Knowledge Management
 # Menu
 #
 MenuKnowledgeRecord = Knowledge base
-ListOfArticles = List of articles
+ListKnowledgeRecord = List of articles
 NewKnowledgeRecord = New article
 ValidateReply = Validate solution
 KnowledgeRecords = Articles

From 05a966b93e2834a6c946dbbb00885d0c0aafe06e Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Fri, 28 May 2021 10:29:46 +0200
Subject: [PATCH 0304/1497] Fix of a bug on mass mailing

---
 htdocs/comm/mailing/card.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index 86aff8a36e0..73f31f34f01 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -677,6 +677,7 @@ if (empty($reshook)) {
 $form = new Form($db);
 $htmlother = new FormOther($db);
 
+$object->fetch($id);
 $help_url = 'EN:Module_EMailing|FR:Module_Mailing|ES:M&oacute;dulo_Mailing';
 llxHeader(
 	'',

From 11bbd2ace33c58e236ea5cb25b9a612df8fcf7f8 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Fri, 28 May 2021 10:31:54 +0200
Subject: [PATCH 0305/1497] fix: bad GETPOST test on payment module
 configuration

---
 htdocs/comm/propal/note.php    | 2 +-
 htdocs/paybox/admin/paybox.php | 6 +++---
 htdocs/paypal/admin/paypal.php | 6 +++---
 htdocs/stripe/admin/stripe.php | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/htdocs/comm/propal/note.php b/htdocs/comm/propal/note.php
index 06be1179fb1..cb91a85da5f 100644
--- a/htdocs/comm/propal/note.php
+++ b/htdocs/comm/propal/note.php
@@ -53,7 +53,7 @@ $object = new Propal($db);
 
 $permissionnote = $user->rights->propale->creer; // Used by the include of actions_setnotes.inc.php
 
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once
+		include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once
 
 
 
diff --git a/htdocs/paybox/admin/paybox.php b/htdocs/paybox/admin/paybox.php
index a342e58b971..b5b45dc3891 100644
--- a/htdocs/paybox/admin/paybox.php
+++ b/htdocs/paybox/admin/paybox.php
@@ -58,11 +58,11 @@ if ($action == 'setvalue' && $user->admin)
 	if (!$result > 0) $error++;
 	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_CSS_URL", GETPOST('ONLINE_PAYMENT_CSS_URL', 'alpha'), 'chaine', 0, '', $conf->entity);
 	if (!$result > 0) $error++;
-	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_FORM", GETPOST('ONLINE_PAYMENT_MESSAGE_FORM', 'alpha'), 'chaine', 0, '', $conf->entity);
+	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_FORM", GETPOST('ONLINE_PAYMENT_MESSAGE_FORM', 'restricthtml'), 'chaine', 0, '', $conf->entity);
 	if (!$result > 0) $error++;
-	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_OK", GETPOST('ONLINE_PAYMENT_MESSAGE_OK', 'alpha'), 'chaine', 0, '', $conf->entity);
+	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_OK", GETPOST('ONLINE_PAYMENT_MESSAGE_OK', 'restricthtml'), 'chaine', 0, '', $conf->entity);
 	if (!$result > 0) $error++;
-	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_KO", GETPOST('ONLINE_PAYMENT_MESSAGE_KO', 'alpha'), 'chaine', 0, '', $conf->entity);
+	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_KO", GETPOST('ONLINE_PAYMENT_MESSAGE_KO', 'restricthtml'), 'chaine', 0, '', $conf->entity);
 	if (!$result > 0) $error++;
 	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_SENDEMAIL", GETPOST('ONLINE_PAYMENT_SENDEMAIL'), 'chaine', 0, '', $conf->entity);
 	if (!$result > 0) $error++;
diff --git a/htdocs/paypal/admin/paypal.php b/htdocs/paypal/admin/paypal.php
index b16748f66b4..7d1c9879b9c 100644
--- a/htdocs/paypal/admin/paypal.php
+++ b/htdocs/paypal/admin/paypal.php
@@ -61,11 +61,11 @@ if ($action == 'setvalue' && $user->admin)
 	if (!$result > 0) $error++;
 	$result = dolibarr_set_const($db, "PAYPAL_ADD_PAYMENT_URL", GETPOST('PAYPAL_ADD_PAYMENT_URL', 'alpha'), 'chaine', 0, '', $conf->entity);
 	if (!$result > 0) $error++;
-	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_FORM", GETPOST('ONLINE_PAYMENT_MESSAGE_FORM'), 'chaine', 0, '', $conf->entity);
+	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_FORM", GETPOST('ONLINE_PAYMENT_MESSAGE_FORM', 'restricthtml'), 'chaine', 0, '', $conf->entity);
 	if (!$result > 0) $error++;
-	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_OK", GETPOST('ONLINE_PAYMENT_MESSAGE_OK'), 'chaine', 0, '', $conf->entity);
+	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_OK", GETPOST('ONLINE_PAYMENT_MESSAGE_OK', 'restricthtml'), 'chaine', 0, '', $conf->entity);
 	if (!$result > 0) $error++;
-	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_KO", GETPOST('ONLINE_PAYMENT_MESSAGE_KO'), 'chaine', 0, '', $conf->entity);
+	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_KO", GETPOST('ONLINE_PAYMENT_MESSAGE_KO', 'restricthtml'), 'chaine', 0, '', $conf->entity);
 	if (!$result > 0) $error++;
 	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_SENDEMAIL", GETPOST('ONLINE_PAYMENT_SENDEMAIL'), 'chaine', 0, '', $conf->entity);
 	if (!$result > 0) $error++;
diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php
index c304a00ce3f..25343265a5f 100644
--- a/htdocs/stripe/admin/stripe.php
+++ b/htdocs/stripe/admin/stripe.php
@@ -92,13 +92,13 @@ if ($action == 'setvalue' && $user->admin)
 	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_CSS_URL", GETPOST('ONLINE_PAYMENT_CSS_URL', 'alpha'), 'chaine', 0, '', $conf->entity);
 	if (!$result > 0)
 		$error++;
-	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_FORM", GETPOST('ONLINE_PAYMENT_MESSAGE_FORM', 'alpha'), 'chaine', 0, '', $conf->entity);
+	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_FORM", GETPOST('ONLINE_PAYMENT_MESSAGE_FORM', 'restricthtml'), 'chaine', 0, '', $conf->entity);
 	if (!$result > 0)
 		$error++;
-	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_OK", GETPOST('ONLINE_PAYMENT_MESSAGE_OK', 'alpha'), 'chaine', 0, '', $conf->entity);
+	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_OK", GETPOST('ONLINE_PAYMENT_MESSAGE_OK', 'restricthtml'), 'chaine', 0, '', $conf->entity);
 	if (!$result > 0)
 		$error++;
-	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_KO", GETPOST('ONLINE_PAYMENT_MESSAGE_KO', 'alpha'), 'chaine', 0, '', $conf->entity);
+	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_KO", GETPOST('ONLINE_PAYMENT_MESSAGE_KO', 'restricthtml'), 'chaine', 0, '', $conf->entity);
 	if (!$result > 0)
 		$error++;
 	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_SENDEMAIL", GETPOST('ONLINE_PAYMENT_SENDEMAIL'), 'chaine', 0, '', $conf->entity);

From c4f7a8194c1b521852b61f6d776cf2db09d0f549 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Fri, 28 May 2021 10:32:53 +0200
Subject: [PATCH 0306/1497] remove space

---
 htdocs/comm/propal/note.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/comm/propal/note.php b/htdocs/comm/propal/note.php
index cb91a85da5f..06be1179fb1 100644
--- a/htdocs/comm/propal/note.php
+++ b/htdocs/comm/propal/note.php
@@ -53,7 +53,7 @@ $object = new Propal($db);
 
 $permissionnote = $user->rights->propale->creer; // Used by the include of actions_setnotes.inc.php
 
-		include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once
+include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once
 
 
 

From fed5db032a0e83b1c87d6063a2779e7659175b23 Mon Sep 17 00:00:00 2001
From: Matthias Haberl <haberl@softwehr.at>
Date: Fri, 28 May 2021 11:26:55 +0200
Subject: [PATCH 0307/1497] Fix label of subaccount

---
 htdocs/accountancy/bookkeeping/listbysubaccount.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/accountancy/bookkeeping/listbysubaccount.php b/htdocs/accountancy/bookkeeping/listbysubaccount.php
index 129e695de3c..43d4acf343f 100644
--- a/htdocs/accountancy/bookkeeping/listbysubaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbysubaccount.php
@@ -682,7 +682,7 @@ while ($i < min($num, $limit)) {
 		print "<tr>";
 		print '<td colspan="'.($totalarray['nbfield'] ? $totalarray['nbfield'] : 10).'" style="font-weight:bold; border-bottom: 1pt solid black;">';
 		if ($line->subledger_account != "" && $line->subledger_account != '-1') {
-			print $object->get_compte_desc($line->numero_compte).' : '.length_accounta($line->subledger_account);
+			print $line->subledger_label.' : '.length_accounta($line->subledger_account);
 		} else {
 			// Should not happen: subledger account must be null or a non empty value
 			print '<span class="error">'.$langs->trans("Unknown");

From 1c75ce8862bf1e80483a673ec2d62e86ab83dd82 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 28 May 2021 14:12:22 +0200
Subject: [PATCH 0308/1497] Code comment

---
 htdocs/ticket/class/ticket.class.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index 5180abe6140..61a6d15d9a1 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -1112,10 +1112,10 @@ class Ticket extends CommonObject
 	}
 
 	/**
-	 * print selected status
+	 * Print selected status
 	 *
-	 * @param string    $selected   selected status
-	 * @return void
+	 * @param 	string    $selected   	Selected status
+	 * @return 	void
 	 */
 	public function printSelectStatus($selected = "")
 	{
@@ -1124,9 +1124,9 @@ class Ticket extends CommonObject
 
 
 	/**
-	 *      Charge dans cache la liste des types de tickets (paramétrable dans dictionnaire)
+	 * Load into a cache the types of tickets (setup done into dictionaries)
 	 *
-	 *      @return int             Number of lines loaded, 0 if already loaded, <0 if KO
+	 * @return 	int       Number of lines loaded, 0 if already loaded, <0 if KO
 	 */
 	public function loadCacheTypesTickets()
 	{

From 94467ea8cf7e06db9868b731aa8112f32d8f83ee Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 28 May 2021 17:05:26 +0200
Subject: [PATCH 0309/1497] Fix selection

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

diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index ef5660ce8fa..fe1bdce10d4 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -4098,9 +4098,9 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm' || $massaction =
 	print $langs->trans("SearchReplaceInto");
 	print '</div>';
 	print '<div class="tagtd">';
-	print '<input type="checkbox" class="marginleftonly" name="optioncontent" value="content"'.((!GETPOSTISSET('buttonreplacesitesearch') || GETPOST('optioncontent', 'aZ09')) ? ' checked' : '').'> '.$langs->trans("Content").'<br>';
-	print '<input type="checkbox" class="marginleftonly" name="optionmeta" value="meta"'.(GETPOST('optionmeta', 'aZ09') ? ' checked' : '').'> '.$langs->trans("Title").' | '.$langs->trans("Description").' | '.$langs->trans("Keywords").'<br>';
-	print '<input type="checkbox" class="marginleftonly" name="optionsitefiles" value="sitefiles"'.(GETPOST('optionsitefiles', 'aZ09') ? ' checked' : '').'> '.$langs->trans("GlobalCSSorJS").'<br>';
+	print '<input type="checkbox" class="marginleftonly" id="checkboxoptioncontent" name="optioncontent" value="content"'.((!GETPOSTISSET('buttonreplacesitesearch') || GETPOST('optioncontent', 'aZ09')) ? ' checked' : '').'> <label for="checkboxoptioncontent">'.$langs->trans("Content").'</label><br>';
+	print '<input type="checkbox" class="marginleftonly" id="checkboxoptionmeta" name="optionmeta" value="meta"'.(GETPOST('optionmeta', 'aZ09') ? ' checked' : '').'> <label for="checkboxoptionmeta">'.$langs->trans("Title").' | '.$langs->trans("Description").' | '.$langs->trans("Keywords").'</label><br>';
+	print '<input type="checkbox" class="marginleftonly" id="checkboxoptionsitefiles" name="optionsitefiles" value="sitefiles"'.(GETPOST('optionsitefiles', 'aZ09') ? ' checked' : '').'> <label for="checkboxoptionsitefiles">'.$langs->trans("GlobalCSSorJS").'</label><br>';
 	print '</div>';
 	print '</div>';
 

From 81a94f5642b22507a07b82085412854b57d4f1d8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 28 May 2021 18:04:45 +0200
Subject: [PATCH 0310/1497] FIX option
 MAIN_GENERATE_SUPPLIER_PROPOSAL_WITH_PICTURE

---
 .../doc/pdf_aurore.modules.php                |  2 +-
 htdocs/product/class/product.class.php        | 32 +++++++++++--------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
index e9e2179823b..3da4d72746b 100644
--- a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
@@ -239,7 +239,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 					$pdir = get_exdir($object->lines[$i]->fk_product, 2, 0, 0, $objphoto, 'product').$object->lines[$i]->fk_product."/photos/";
 					$dir = $conf->product->dir_output.'/'.$pdir;
 				} else {
-					$pdir = get_exdir(0, 2, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/';
+					$pdir = get_exdir(0, 0, 0, 0, $objphoto, 'product');
 					$dir = $conf->product->dir_output.'/'.$pdir;
 				}
 
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 685180e4659..1e60a0f63d3 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -5208,11 +5208,11 @@ class Product extends CommonObject
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *  Retourne tableau de toutes les photos du produit
+	 * Return an array with all photos of product found on disk. There is no sorting criteria.
 	 *
-	 * @param  string $dir   Repertoire a scanner
-	 * @param  int    $nbmax Nombre maximum de photos (0=pas de max)
-	 * @return array                   Tableau de photos
+	 * @param  string $dir   	Directory to scan
+	 * @param  int    $nbmax 	Number maxium of photos (0=no maximum)
+	 * @return array            Array of photos
 	 */
 	public function liste_photos($dir, $nbmax = 0)
 	{
@@ -5226,16 +5226,17 @@ class Product extends CommonObject
 		$dir_osencoded = dol_osencode($dir);
 		$handle = @opendir($dir_osencoded);
 		if (is_resource($handle)) {
-			while (($file = readdir($handle)) !== false)
-			{
-				if (!utf8_check($file)) { $file = utf8_encode($file); // readdir returns ISO
+			while (($file = readdir($handle)) !== false) {
+				if (!utf8_check($file)) {
+					$file = utf8_encode($file); // readdir returns ISO
 				}
 				if (dol_is_file($dir.$file) && image_format_supported($file) >= 0) {
 					$nbphoto++;
 
-					// On determine nom du fichier vignette
+					// We forge name of thumb.
 					$photo = $file;
 					$photo_vignette = '';
+					$regs = array();
 					if (preg_match('/('.$this->regeximgext.')$/i', $photo, $regs)) {
 						$photo_vignette = preg_replace('/'.$regs[0].'/i', '', $photo).'_small'.$regs[0];
 					}
@@ -5245,14 +5246,17 @@ class Product extends CommonObject
 					// Objet
 					$obj = array();
 					$obj['photo'] = $photo;
-					if ($photo_vignette && dol_is_file($dirthumb.$photo_vignette)) { $obj['photo_vignette'] = 'thumbs/'.$photo_vignette;
-					} else { $obj['photo_vignette'] = "";
+					if ($photo_vignette && dol_is_file($dirthumb.$photo_vignette)) {
+						$obj['photo_vignette'] = 'thumbs/'.$photo_vignette;
+					} else {
+						$obj['photo_vignette'] = "";
 					}
 
 					$tabobj[$nbphoto - 1] = $obj;
 
-					// On continue ou on arrete de boucler ?
-					if ($nbmax && $nbphoto >= $nbmax) { break;
+					// Do we have to continue with next photo ?
+					if ($nbmax && $nbphoto >= $nbmax) {
+						break;
 					}
 				}
 			}
@@ -5265,9 +5269,9 @@ class Product extends CommonObject
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *  Efface la photo du produit et sa vignette
+	 *  Delete a photo and its thumbs
 	 *
-	 * @param  string $file Chemin de l'image
+	 * @param  string $file 	Path to image file
 	 * @return void
 	 */
 	public function delete_photo($file)

From f33869bf1c9432cb3a0f65c2daa14c9aac1cdebc Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Fri, 28 May 2021 18:08:01 +0200
Subject: [PATCH 0311/1497] fix: uploaddir for productlot

---
 htdocs/product/stock/productlot_document.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/product/stock/productlot_document.php b/htdocs/product/stock/productlot_document.php
index 5b19288deff..820ad4d38bb 100644
--- a/htdocs/product/stock/productlot_document.php
+++ b/htdocs/product/stock/productlot_document.php
@@ -94,7 +94,9 @@ $usercanread = $user->rights->produit->lire;
 $usercancreate = $user->rights->produit->creer;
 $usercandelete = $user->rights->produit->supprimer;
 
-$upload_dir = $conf->productbatch->multidir_output[$conf->entity];
+if (empty($upload_dir)) {
+	$upload_dir = $conf->productbatch->multidir_output[$conf->entity];
+}
 
 $permissiontoread = $usercanread;
 $permissiontoadd = $usercancreate;

From 4f6385338a70ec953518b913d60726a83a6c001c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 28 May 2021 18:15:26 +0200
Subject: [PATCH 0312/1497] Fix option CAT_HIGH_QUALITY_IMAGES

---
 .../modules/supplier_order/doc/pdf_cornas.modules.php | 11 +++++++++--
 .../supplier_order/doc/pdf_muscadet.modules.php       | 11 +++++++++--
 .../supplier_proposal/doc/pdf_aurore.modules.php      | 11 +++++++++--
 3 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
index c60f82e9c4a..245897e1956 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
@@ -240,8 +240,15 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 
 				$realpath = '';
 				foreach ($objphoto->liste_photos($dir, 1) as $key => $obj) {
-					$filename = $obj['photo'];
-					//if ($obj['photo_vignette']) $filename='thumbs/'.$obj['photo_vignette'];
+					if (empty($conf->global->CAT_HIGH_QUALITY_IMAGES)) {		// If CAT_HIGH_QUALITY_IMAGES not defined, we use thumb if defined and then original photo
+						if ($obj['photo_vignette']) {
+							$filename = $obj['photo_vignette'];
+						} else {
+							$filename = $obj['photo'];
+						}
+					} else {
+						$filename = $obj['photo'];
+					}
 					$realpath = $dir.$filename;
 					break;
 				}
diff --git a/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php b/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
index c6d9cf8da14..bb12b19c829 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
@@ -254,8 +254,15 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 				}
 				$realpath = '';
 				foreach ($objphoto->liste_photos($dir, 1) as $key => $obj) {
-					$filename = $obj['photo'];
-					//if ($obj['photo_vignette']) $filename='thumbs/'.$obj['photo_vignette'];
+					if (empty($conf->global->CAT_HIGH_QUALITY_IMAGES)) {		// If CAT_HIGH_QUALITY_IMAGES not defined, we use thumb if defined and then original photo
+						if ($obj['photo_vignette']) {
+							$filename = $obj['photo_vignette'];
+						} else {
+							$filename = $obj['photo'];
+						}
+					} else {
+						$filename = $obj['photo'];
+					}
 					$realpath = $dir.$filename;
 					break;
 				}
diff --git a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
index c6cc6e8d1b1..b471f65add6 100644
--- a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
@@ -251,8 +251,15 @@ class pdf_aurore extends ModelePDFSupplierProposal
 
 				$realpath = '';
 				foreach ($objphoto->liste_photos($dir, 1) as $key => $obj) {
-					$filename = $obj['photo'];
-					//if ($obj['photo_vignette']) $filename='thumbs/'.$obj['photo_vignette'];
+					if (empty($conf->global->CAT_HIGH_QUALITY_IMAGES)) {		// If CAT_HIGH_QUALITY_IMAGES not defined, we use thumb if defined and then original photo
+						if ($obj['photo_vignette']) {
+							$filename = $obj['photo_vignette'];
+						} else {
+							$filename = $obj['photo'];
+						}
+					} else {
+						$filename = $obj['photo'];
+					}
 					$realpath = $dir.$filename;
 					break;
 				}

From ab4941a558ff55ce00aabbc7bab1807216abd0c1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 29 May 2021 02:22:30 +0200
Subject: [PATCH 0313/1497] Fix not visible button when missing permission

---
 htdocs/fichinter/card.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index 0b919c3eb4b..84c4fd61c62 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -1606,8 +1606,9 @@ if ($action == 'create')
 				// Validate
 				if ($object->statut == Fichinter::STATUS_DRAFT && (count($object->lines) > 0 || !empty($conf->global->FICHINTER_DISABLE_DETAILS))) {
 					if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->ficheinter->creer) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->ficheinter->ficheinter_advance->validate)) {
-						print '<div class="inline-block divButAction"><a class="butAction" href="card.php?id='.$object->id.'&action=validate"';
-						print '>'.$langs->trans("Validate").'</a></div>';
+						print '<div class="inline-block divButAction"><a class="butAction" href="card.php?id='.$object->id.'&action=validate">'.$langs->trans("Validate").'</a></div>';
+					} else {
+						print '<div class="inline-block divButActionRefused"><span class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Validate").'</span></div>';
 					}
 				}
 
@@ -1640,7 +1641,7 @@ if ($action == 'create')
 					}
 				}
 
-				// create intervention model
+				// Create intervention model
 				if ($conf->global->MAIN_FEATURES_LEVEL >= 1 && $object->statut == Fichinter::STATUS_DRAFT && $user->rights->ficheinter->creer && (count($object->lines) > 0)) {
 					print '<div class="inline-block divButAction">';
 					print '<a class="butAction" href="'.DOL_URL_ROOT.'/fichinter/card-rec.php?id='.$object->id.'&action=create">'.$langs->trans("ChangeIntoRepeatableIntervention").'</a>';

From 48867c39aaf89c0be659bba2859cc3182b214532 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 29 May 2021 04:54:53 +0200
Subject: [PATCH 0314/1497] Fix missing link to edit translation

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

diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index acb11e70332..362b29c0163 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -563,6 +563,21 @@ if ($mode == 'searchkey') {
 				print ' &nbsp; <a href="'.$transifexurl.'" target="transifex">'.img_picto($langs->trans('FixOnTransifex'), 'globe').'</a>';
 			}
 		} else {
+			// retrieve rowid
+			$sql = "SELECT rowid";
+			$sql .= " FROM ".MAIN_DB_PREFIX."overwrite_trans";
+			$sql .= " WHERE entity IN (".getEntity('overwrite_trans').")";
+			$sql .= " AND transkey = '".$db->escape($key)."'";
+			dol_syslog("translation::select from table", LOG_DEBUG);
+			$result = $db->query($sql);
+			if ($result) {
+				$obj = $db->fetch_object($result);
+			}
+			print '<a class="editfielda reposition marginrightonly" href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$conf->entity.'&mode=overwrite&action=edit">'.img_edit().'</a>';
+			print ' ';
+			print '<a class="marginleftonly marginrightonly" href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$conf->entity.'&mode='.urlencode($mode).'&action=delete&mode='.urlencode($mode).'&token='.newToken().'">'.img_delete().'</a>';
+			print '&nbsp;&nbsp;';
+
 			$htmltext = $langs->trans("TransKeyWithoutOriginalValue", $key);
 			print $form->textwithpicto('', $htmltext, 1, 'warning');
 		}

From baea57ec05617e8f95b6b1898ad2e5f434d18e58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 30 May 2021 08:38:07 +0200
Subject: [PATCH 0315/1497] force reload css after activate/desactivate module

---
 htdocs/admin/modules.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 1a6d99261bd..5dc660adb9b 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -8,6 +8,7 @@
  * Copyright (C) 2015		Jean-François Ferry		<jfefe@aternatik.fr>
  * Copyright (C) 2015		Raphaël Doursenaud		<rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2018		Nicolas ZABOURI 		<info@inovea-conseil.com>
+ * Copyright (C) 2021       Frédéric France         <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -246,6 +247,7 @@ if ($action == 'install') {
 
 if ($action == 'set' && $user->admin) {
 	$resarray = activateModule($value);
+	dolibarr_set_const($db, "MAIN_IHM_PARAMS_REV", (int) $conf->global->MAIN_IHM_PARAMS_REV + 1, 'chaine', 0, '', $conf->entity);
 	if (!empty($resarray['errors'])) {
 		setEventMessages('', $resarray['errors'], 'errors');
 	} else {
@@ -269,6 +271,7 @@ if ($action == 'set' && $user->admin) {
 	exit;
 } elseif ($action == 'reset' && $user->admin && GETPOST('confirm') == 'yes') {
 	$result = unActivateModule($value);
+	dolibarr_set_const($db, "MAIN_IHM_PARAMS_REV", (int) $conf->global->MAIN_IHM_PARAMS_REV + 1, 'chaine', 0, '', $conf->entity);
 	if ($result) {
 		setEventMessages($result, null, 'errors');
 	}

From 1834d642b3469d245fef36dd0997cdc9ae90ed96 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 30 May 2021 17:04:12 +0200
Subject: [PATCH 0316/1497] Fix phpcs

---
 htdocs/admin/system/perf.php     |  6 +++---
 htdocs/admin/system/security.php | 21 ++++++++++++++++++++-
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/htdocs/admin/system/perf.php b/htdocs/admin/system/perf.php
index 32fbe8ab41c..2a8dfa975cd 100644
--- a/htdocs/admin/system/perf.php
+++ b/htdocs/admin/system/perf.php
@@ -75,7 +75,7 @@ print '<br>';
 print '<strong>'.$langs->trans("Syslog").'</strong>: ';
 $test = empty($conf->syslog->enabled);
 if ($test) {
-	print img_picto('', 'tick.png').' '.$langs->trans("NotInstalled").' - '.$langs->trans("NotSlowedDownByThis");
+	print img_picto('', 'tick.png').' '.$langs->trans("NotInstalled").'  <span class="opacitymedium">'.$langs->trans("NotSlowedDownByThis").'</span>';
 } else {
 	if ($conf->global->SYSLOG_LEVEL > LOG_NOTICE) {
 		print img_picto('', 'warning').' '.$langs->trans("ModuleActivatedWithTooHighLogLevel", $langs->transnoentities("Syslog"));
@@ -91,7 +91,7 @@ print '<br>';
 print '<strong>'.$langs->trans("DebugBar").'</strong>: ';
 $test = empty($conf->debugbar->enabled);
 if ($test) {
-	print img_picto('', 'tick.png').' '.$langs->trans("NotInstalled").' - '.$langs->trans("NotSlowedDownByThis");
+	print img_picto('', 'tick.png').' '.$langs->trans("NotInstalled").' <span class="opacitymedium">'.$langs->trans("NotSlowedDownByThis").'</span>';
 } else {
 	print img_picto('', 'warning').' '.$langs->trans("ModuleActivated", $langs->transnoentities("DebugBar"));
 	//print ' '.$langs->trans("MoreInformation").' <a href="'.DOL_URL_ROOT.'/admin/system/xdebug.php'.'">XDebug admin page</a>';
@@ -111,7 +111,7 @@ if ($test) {
 		print ' <a href="'.dol_buildpath('/memcached/admin/memcached.php', 1).'">Memcached module admin page</a>';
 	}
 } else {
-	print img_picto('', 'warning').' '.$langs->trans("MemcachedNotAvailable");
+	print $langs->trans("MemcachedNotAvailable");
 }
 print '</br>';
 
diff --git a/htdocs/admin/system/security.php b/htdocs/admin/system/security.php
index 087ad76631d..ff054a13ce0 100644
--- a/htdocs/admin/system/security.php
+++ b/htdocs/admin/system/security.php
@@ -66,7 +66,26 @@ if (function_exists('php_ini_loaded_file')) {
 print "<br>\n";
 
 // Get versionof web server
-print "<br><strong>Web server</strong> - ".$langs->trans("Version").": ".$_SERVER["SERVER_SOFTWARE"]."<br>\n";
+print "<br><strong>Web server - ".$langs->trans("Version")."</strong>: ".$_SERVER["SERVER_SOFTWARE"]."<br>\n";
+print '<strong>'.$langs->trans("DataRootServer")."</strong>: ".DOL_DATA_ROOT."<br>\n";
+// Web user group by default
+$labeluser = dol_getwebuser('user');
+$labelgroup = dol_getwebuser('group');
+if ($labeluser && $labelgroup) {
+	print '<strong>'.$langs->trans("WebUserGroup")." (env vars)</strong> : ".$labeluser.':'.$labelgroup;
+	if (function_exists('posix_geteuid') && function_exists('posix_getpwuid')) {
+		$arrayofinfoofuser = posix_getpwuid(posix_geteuid());
+		print ' <span class="opacitymedium">(POSIX '.$arrayofinfoofuser['name'].':'.$arrayofinfoofuser['gecos'].':'.$arrayofinfoofuser['dir'].':'.$arrayofinfoofuser['shell'].')</span><br>'."\n";
+	}
+}
+// Web user group real (detected by 'id' external command)
+if (function_exists('exec')) {
+	$arrayout = array(); $varout = 0;
+	exec('id', $arrayout, $varout);
+	if (empty($varout)) {	// Test command is ok. Work only on Linux OS.
+		print '<strong>'.$langs->trans("WebUserGroup")." (real, 'id' command)</strong> : ".join(',', $arrayout)."<br>\n";
+	}
+}
 print '<br>';
 
 print "<strong>PHP safe_mode</strong> = ".(ini_get('safe_mode') ? ini_get('safe_mode') : yn(0)).' &nbsp; <span class="opacitymedium">'.$langs->trans("Deprecated")." (removed in PHP 5.4)</span><br>\n";

From 2f969f154e79e4d4a886fe51d655839b381830c7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 30 May 2021 17:10:38 +0200
Subject: [PATCH 0317/1497] More examples

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

diff --git a/htdocs/admin/system/security.php b/htdocs/admin/system/security.php
index ff054a13ce0..e972581beaa 100644
--- a/htdocs/admin/system/security.php
+++ b/htdocs/admin/system/security.php
@@ -65,7 +65,7 @@ if (function_exists('php_ini_loaded_file')) {
 }
 print "<br>\n";
 
-// Get versionof web server
+// Get version of web server
 print "<br><strong>Web server - ".$langs->trans("Version")."</strong>: ".$_SERVER["SERVER_SOFTWARE"]."<br>\n";
 print '<strong>'.$langs->trans("DataRootServer")."</strong>: ".DOL_DATA_ROOT."<br>\n";
 // Web user group by default
@@ -89,7 +89,7 @@ if (function_exists('exec')) {
 print '<br>';
 
 print "<strong>PHP safe_mode</strong> = ".(ini_get('safe_mode') ? ini_get('safe_mode') : yn(0)).' &nbsp; <span class="opacitymedium">'.$langs->trans("Deprecated")." (removed in PHP 5.4)</span><br>\n";
-print "<strong>PHP open_basedir</strong> = ".(ini_get('open_basedir') ? ini_get('open_basedir') : yn(0).' &nbsp; <span class="opacitymedium">('.$langs->trans("RecommendedValueIs", $langs->transnoentitiesnoconv("ARestrictedPath")).')</span>')."<br>\n";
+print "<strong>PHP open_basedir</strong> = ".(ini_get('open_basedir') ? ini_get('open_basedir') : yn(0).' &nbsp; <span class="opacitymedium">('.$langs->trans("RecommendedValueIs", $langs->transnoentitiesnoconv("ARestrictedPath").', '.$langs->transnoentitiesnoconv("Example").' '.$_SERVER["DOCUMENT_ROOT"]).')</span>')."<br>\n";
 print "<strong>PHP allow_url_fopen</strong> = ".(ini_get('allow_url_fopen') ? img_picto($langs->trans("YouShouldSetThisToOff"), 'warning').' '.ini_get('allow_url_fopen') : yn(0)).' &nbsp; <span class="opacitymedium">('.$langs->trans("RecommendedValueIs", $langs->transnoentitiesnoconv("No")).")</span><br>\n";
 print "<strong>PHP allow_url_include</strong> = ".(ini_get('allow_url_include') ? img_picto($langs->trans("YouShouldSetThisToOff"), 'warning').' '.ini_get('allow_url_include') : yn(0)).' &nbsp; <span class="opacitymedium">('.$langs->trans("RecommendedValueIs", $langs->transnoentitiesnoconv("No")).")</span><br>\n";
 print "<strong>PHP disable_functions</strong> = ";

From d2bda7ad09137061441938d1b45ef4f6643517d2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 30 May 2021 19:01:43 +0200
Subject: [PATCH 0318/1497] Set a maxlength on fields

---
 htdocs/core/tpl/login.tpl.php             | 4 ++--
 htdocs/core/tpl/passwordforgotten.tpl.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index b5dc9b90be0..9af5bc7d7b4 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -180,7 +180,7 @@ if ($disablenofollow) {
 } ?>
 <!-- <span class="span-icon-user">-->
 <span class="fa fa-user"></span>
-<input type="text" id="username" placeholder="<?php echo $langs->trans("Login"); ?>" name="username" class="flat input-icon-user minwidth150" value="<?php echo dol_escape_htmltag($login); ?>" tabindex="1" autofocus="autofocus" />
+<input type="text" id="username" maxlength="255" placeholder="<?php echo $langs->trans("Login"); ?>" name="username" class="flat input-icon-user minwidth150" value="<?php echo dol_escape_htmltag($login); ?>" tabindex="1" autofocus="autofocus" />
 </div>
 </div>
 
@@ -192,7 +192,7 @@ if ($disablenofollow) {
 } ?>
 <!--<span class="span-icon-password">-->
 <span class="fa fa-key"></span>
-<input id="password" placeholder="<?php echo $langs->trans("Password"); ?>" name="password" class="flat input-icon-password minwidth150" type="password" value="<?php echo dol_escape_htmltag($password); ?>" tabindex="2" autocomplete="<?php echo empty($conf->global->MAIN_LOGIN_ENABLE_PASSWORD_AUTOCOMPLETE) ? 'off' : 'on'; ?>" />
+<input type="password" id="password" maxlength="128" placeholder="<?php echo $langs->trans("Password"); ?>" name="password" class="flat input-icon-password minwidth150" value="<?php echo dol_escape_htmltag($password); ?>" tabindex="2" autocomplete="<?php echo empty($conf->global->MAIN_LOGIN_ENABLE_PASSWORD_AUTOCOMPLETE) ? 'off' : 'on'; ?>" />
 </div></div>
 
 <?php
diff --git a/htdocs/core/tpl/passwordforgotten.tpl.php b/htdocs/core/tpl/passwordforgotten.tpl.php
index 3e2fb78bdb0..6e890f06e80 100644
--- a/htdocs/core/tpl/passwordforgotten.tpl.php
+++ b/htdocs/core/tpl/passwordforgotten.tpl.php
@@ -129,7 +129,7 @@ if (!empty($disablenofollow)) {
 <div class="tagtd nowraponall center valignmiddle tdinputlogin">
 <!-- <span class="span-icon-user">-->
 <span class="fa fa-user"></span>
-<input type="text" placeholder="<?php echo $langs->trans("Login"); ?>" <?php echo $disabled; ?> id="username" name="username" class="flat input-icon-user minwidth150" value="<?php echo dol_escape_htmltag($username); ?>" tabindex="1" />
+<input type="text" maxlength="255" placeholder="<?php echo $langs->trans("Login"); ?>" <?php echo $disabled; ?> id="username" name="username" class="flat input-icon-user minwidth150" value="<?php echo dol_escape_htmltag($username); ?>" tabindex="1" />
 </div>
 </div>
 

From 356e349944989674350a5cbba07df77706d7aeab Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 30 May 2021 20:01:29 +0200
Subject: [PATCH 0319/1497] Fix reposition

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

diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php
index 44629525a26..df691eba688 100644
--- a/htdocs/admin/boxes.php
+++ b/htdocs/admin/boxes.php
@@ -427,11 +427,11 @@ foreach ($boxactivated as $key => $box) {
 	$hasprevious = ($key != 0);
 	print '<td class="center">'.($key + 1).'</td>';
 	print '<td class="center">';
-	print ($hasnext ? '<a href="boxes.php?action=switch&amp;switchfrom='.$box->rowid.'&amp;switchto='.$boxactivated[$key + 1]->rowid.'">'.img_down().'</a>&nbsp;' : '');
-	print ($hasprevious ? '<a href="boxes.php?action=switch&amp;switchfrom='.$box->rowid.'&amp;switchto='.$boxactivated[$key - 1]->rowid.'">'.img_up().'</a>' : '');
+	print ($hasnext ? '<a class="reposition" href="boxes.php?action=switch&amp;switchfrom='.$box->rowid.'&amp;switchto='.$boxactivated[$key + 1]->rowid.'">'.img_down().'</a>&nbsp;' : '');
+	print ($hasprevious ? '<a class="reposition" href="boxes.php?action=switch&amp;switchfrom='.$box->rowid.'&amp;switchto='.$boxactivated[$key - 1]->rowid.'">'.img_up().'</a>' : '');
 	print '</td>';
 	print '<td class="center">';
-	print '<a href="boxes.php?rowid='.$box->rowid.'&action=delete&token='.newToken().'">'.img_delete().'</a>';
+	print '<a class="reposition" href="boxes.php?rowid='.$box->rowid.'&action=delete&token='.newToken().'">'.img_delete().'</a>';
 	print '</td>';
 
 	print '</tr>'."\n";

From ea21e1dbfbe957f3fb80ad0f89bce20c541596aa Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 30 May 2021 20:19:02 +0200
Subject: [PATCH 0320/1497] Fix color selection for ticket graph

---
 .../core/boxes/box_graph_nb_tickets_type.php  | 33 +++++++++----------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/htdocs/core/boxes/box_graph_nb_tickets_type.php b/htdocs/core/boxes/box_graph_nb_tickets_type.php
index aee3e68ee5d..712c28df851 100644
--- a/htdocs/core/boxes/box_graph_nb_tickets_type.php
+++ b/htdocs/core/boxes/box_graph_nb_tickets_type.php
@@ -66,6 +66,10 @@ class box_graph_nb_tickets_type extends ModeleBoxes
 	public function loadBox($max = 5)
 	{
 		global $conf, $user, $langs;
+		global $theme_datacolor, $badgeStatus8;
+
+		require_once DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php";
+
 
 		$badgeStatus0 = '#cbd3d3'; // draft
 		$badgeStatus1 = '#bc9526'; // validated
@@ -98,29 +102,22 @@ class box_graph_nb_tickets_type extends ModeleBoxes
 			if ($resql) {
 				$num = $this->db->num_rows($resql);
 				$i = 0;
+				$newcolorkey = 0;
+				$colorused = array();
 				while ($i < $num) {
 					$objp = $this->db->fetch_object($resql);
 					$listofoppcode[$objp->rowid] = $objp->code;
 					$listofopplabel[$objp->rowid] = $objp->label;
-					switch ($objp->code) {
-						case 'COM':
-							$colorseriesstat[$objp->rowid] = $badgeStatus1;
-							break;
-						case 'HELP':
-							$colorseriesstat[$objp->rowid] = $badgeStatus2;
-							break;
-						case 'ISSUE':
-							$colorseriesstat[$objp->rowid] = $badgeStatus3;
-							break;
-						case 'REQUEST':
-							$colorseriesstat[$objp->rowid] = $badgeStatus4;
-							break;
-						case 'OTHER':
-							$colorseriesstat[$objp->rowid] = $badgeStatus5;
-							break;
-						default:
-							break;
+					if (empty($colorused[$objp->code])) {
+						if ($objp->code == 'ISSUE') {
+							$colorused[$objp->code] = $badgeStatus8;
+						} else {
+							$colorused[$objp->code] = colorArrayToHex($theme_datacolor[$newcolorkey]);
+							$newcolorkey++;
+						}
 					}
+					$colorseriesstat[$objp->rowid] = $colorused[$objp->code];
+
 					$i++;
 				}
 			} else {

From ab64f467f52c5e9f62d7d6cb510868355e777b1a Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Mon, 31 May 2021 09:31:38 +0200
Subject: [PATCH 0321/1497] add of a new param in selectGroupTicket

---
 htdocs/core/class/html.formticket.class.php | 244 ++++++++++++++------
 1 file changed, 174 insertions(+), 70 deletions(-)

diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index 3cec6c19789..23c220d43df 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -569,90 +569,194 @@ class FormTicket
 	 *      @param  int    $noadmininfo 0=Add admin info, 1=Disable admin info
 	 *      @param  int    $maxlength   Max length of label
 	 *      @param	string	$morecss	More CSS
+	 * 		@param	int 	$use_multilevel	if != 0 create a multilevel select ( Do not use any of the other params)
 	 *      @return void
 	 */
-	public function selectGroupTickets($selected = '', $htmlname = 'ticketcategory', $filtertype = '', $format = 0, $empty = 0, $noadmininfo = 0, $maxlength = 0, $morecss = '')
+	public function selectGroupTickets($selected = '', $htmlname = 'ticketcategory', $filtertype = '', $format = 0, $empty = 0, $noadmininfo = 0, $maxlength = 0, $morecss = '', $use_multilevel = 0)
 	{
 		global $langs, $user;
 
-		$ticketstat = new Ticket($this->db);
+		if ($use_multilevel == 0) {
+			$ticketstat = new Ticket($this->db);
 
-		dol_syslog(get_class($this)."::selectCategoryTickets ".$selected.", ".$htmlname.", ".$filtertype.", ".$format, LOG_DEBUG);
+			dol_syslog(get_class($this)."::selectCategoryTickets ".$selected.", ".$htmlname.", ".$filtertype.", ".$format, LOG_DEBUG);
 
-		$ticketstat->loadCacheCategoriesTickets();
+			$ticketstat->loadCacheCategoriesTickets();
 
-		print '<select id="select'.$htmlname.'" class="flat minwidth100'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'">';
-		if ($empty) {
-			print '<option value="">&nbsp;</option>';
-		}
+			print '<select id="select'.$htmlname.'" class="flat minwidth100'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'">';
+			if ($empty) {
+				print '<option value="">&nbsp;</option>';
+			}
 
-		if (is_array($ticketstat->cache_category_tickets) && count($ticketstat->cache_category_tickets)) {
-			foreach ($ticketstat->cache_category_tickets as $id => $arraycategories) {
-				// Exclude some record
-				if ($filtertype == 'public=1') {
-					if (empty($arraycategories['public'])) {
+			if (is_array($ticketstat->cache_category_tickets) && count($ticketstat->cache_category_tickets)) {
+				foreach ($ticketstat->cache_category_tickets as $id => $arraycategories) {
+					// Exclude some record
+					if ($filtertype == 'public=1') {
+						if (empty($arraycategories['public'])) {
+							continue;
+						}
+					}
+
+					// We discard empty line if showempty is on because an empty line has already been output.
+					if ($empty && empty($arraycategories['code'])) {
 						continue;
 					}
+
+					if ($format == 0) {
+						print '<option value="'.$id.'"';
+					}
+
+					if ($format == 1) {
+						print '<option value="'.$arraycategories['code'].'"';
+					}
+
+					if ($format == 2) {
+						print '<option value="'.$arraycategories['code'].'"';
+					}
+
+					if ($format == 3) {
+						print '<option value="'.$id.'"';
+					}
+
+					// Si selected est text, on compare avec code, sinon avec id
+					if (preg_match('/[a-z]/i', $selected) && $selected == $arraycategories['code']) {
+						print ' selected="selected"';
+					} elseif ($selected == $id) {
+						print ' selected="selected"';
+					} elseif ($arraycategories['use_default'] == "1" && !$selected && !$empty) {
+						print ' selected="selected"';
+					}
+
+					print '>';
+
+					if ($format == 0) {
+						$value = ($maxlength ? dol_trunc($arraycategories['label'], $maxlength) : $arraycategories['label']);
+					}
+
+					if ($format == 1) {
+						$value = $arraycategories['code'];
+					}
+
+					if ($format == 2) {
+						$value = ($maxlength ? dol_trunc($arraycategories['label'], $maxlength) : $arraycategories['label']);
+					}
+
+					if ($format == 3) {
+						$value = $arraycategories['code'];
+					}
+
+					print $value ? $value : '&nbsp;';
+					print '</option>';
 				}
-
-				// We discard empty line if showempty is on because an empty line has already been output.
-				if ($empty && empty($arraycategories['code'])) {
-					continue;
-				}
-
-				if ($format == 0) {
-					print '<option value="'.$id.'"';
-				}
-
-				if ($format == 1) {
-					print '<option value="'.$arraycategories['code'].'"';
-				}
-
-				if ($format == 2) {
-					print '<option value="'.$arraycategories['code'].'"';
-				}
-
-				if ($format == 3) {
-					print '<option value="'.$id.'"';
-				}
-
-				// Si selected est text, on compare avec code, sinon avec id
-				if (preg_match('/[a-z]/i', $selected) && $selected == $arraycategories['code']) {
-					print ' selected="selected"';
-				} elseif ($selected == $id) {
-					print ' selected="selected"';
-				} elseif ($arraycategories['use_default'] == "1" && !$selected && !$empty) {
-					print ' selected="selected"';
-				}
-
-				print '>';
-
-				if ($format == 0) {
-					$value = ($maxlength ? dol_trunc($arraycategories['label'], $maxlength) : $arraycategories['label']);
-				}
-
-				if ($format == 1) {
-					$value = $arraycategories['code'];
-				}
-
-				if ($format == 2) {
-					$value = ($maxlength ? dol_trunc($arraycategories['label'], $maxlength) : $arraycategories['label']);
-				}
-
-				if ($format == 3) {
-					$value = $arraycategories['code'];
-				}
-
-				print $value ? $value : '&nbsp;';
-				print '</option>';
 			}
-		}
-		print '</select>';
-		if ($user->admin && !$noadmininfo) {
-			print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
-		}
+			print '</select>';
+			if ($user->admin && !$noadmininfo) {
+				print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+			}
 
-		print ajax_combobox('select'.$htmlname);
+			print ajax_combobox('select'.$htmlname);
+		} else {
+			$groupticket=GETPOST('groupticket', 'aZ09');
+			$groupticketchild=GETPOST('groupticket_child', 'aZ09');
+			$arraycodenotparent[] = "";
+			$stringtoprint = '<span class="supportemailfield bold">'.$langs->trans("GroupOfTicket").'</span> ';
+			$stringtoprint .= '<select name="groupticket" id ="groupticket" class="maxwidth500 minwidth400">';
+			$stringtoprint .= '<option value="">&nbsp;</option>';
+
+			$sql = "SELECT ctc.rowid, ctc.code, ctc.label, ctc.fk_parent, ";
+			$sql .= $this->db->ifsql("ctc.rowid NOT IN (SELECT ctcfather.rowid FROM llx_c_ticket_category as ctcfather JOIN llx_c_ticket_category as ctcjoin ON ctcfather.rowid = ctcjoin.fk_parent)", "'NOTPARENT'", "'PARENT'")." as isparent";
+			$sql .= " FROM ".MAIN_DB_PREFIX."c_ticket_category as ctc";
+			$sql .= " WHERE ctc.public = 1";
+			$sql .= " AND ctc.active = 1";
+			$sql .= " AND ctc.fk_parent = 0";
+			$sql .= $this->db->order('ctc.pos', 'ASC');
+			$resql = $this->db->query($sql);
+			if ($resql) {
+				$num_rows = $this->db->num_rows($resql);
+				$i = 0;
+				while ($i < $num_rows) {
+					$obj = $this->db->fetch_object($resql);
+					if ($obj) {
+						$grouprowid = $obj->rowid;
+						$groupvalue = $obj->code;
+						$grouplabel = $obj->label;
+						$isparent = $obj->isparent;
+						$iselected = $groupticket == $obj->code ?'selected':'';
+						$stringtoprint .= '<option '.$iselected.' class="groupticket'.dol_escape_htmltag($grouprowid).'" value="'.dol_escape_htmltag($groupvalue).'" data-html="'.dol_escape_htmltag($grouplabel).'">'.dol_escape_htmltag($grouplabel).'</option>';
+						if ($isparent == 'NOTPARENT') {
+							$arraycodenotparent[] = $groupvalue;
+						}
+					}
+					$i++;
+				}
+			} else {
+				dol_print_error($this->db);
+			}
+			if ($num_rows == 1) {
+				return '<input type="hidden" name="groupticket" id="groupticket" value="'.dol_escape_htmltag($groupvalue).'">';
+			}
+			$stringtoprint .= '</select>&nbsp';
+
+			$stringtoprint .= '<select name="groupticket_child" id ="groupticket_child" class="maxwidth500 minwidth400">';
+			$stringtoprint .= '<option value="">&nbsp;</option>';
+
+			$sql = "SELECT ctc.rowid, ctc.code, ctc.label, ctc.fk_parent, ctcjoin.code as codefather";
+			$sql .= " FROM ".MAIN_DB_PREFIX."c_ticket_category as ctc";
+			$sql .= " JOIN ".MAIN_DB_PREFIX."c_ticket_category as ctcjoin ON ctc.fk_parent = ctcjoin.rowid";
+			$sql .= " WHERE ctc.public = 1";
+			$sql .= " AND ctc.active = 1";
+			$sql .= " AND ctc.fk_parent <> 0";
+			$sql .= $this->db->order('ctc.pos', 'ASC');
+			$resql = $this->db->query($sql);
+			if ($resql) {
+				$num_rows = $this->db->num_rows($resql);
+				$i = 0;
+				while ($i < $num_rows) {
+					$obj = $this->db->fetch_object($resql);
+					if ($obj) {
+						$grouprowid = $obj->rowid;
+						$groupvalue = $obj->code;
+						$grouplabel = $obj->label;
+						$fatherid = $obj->fk_parent;
+						$groupcodefather = $obj->codefather;
+						$iselected = $groupticketchild == $obj->code ?'selected':'';
+						$stringtoprint .= '<option '.$iselected.' class="groupticket_'.dol_escape_htmltag($fatherid).'_child" value="'.dol_escape_htmltag($groupvalue).'" data-html="'.dol_escape_htmltag($grouplabel).'">'.dol_escape_htmltag($grouplabel).'</option>';
+						$tabscript[] = 'if($("#groupticket")[0].value == "'.dol_escape_js($groupcodefather).'"){
+							$(".groupticket_'.dol_escape_htmltag($fatherid).'_child").show()
+						}else{
+							$(".groupticket_'.dol_escape_htmltag($fatherid).'_child").hide()
+						}';
+					}
+					$i++;
+				}
+			} else {
+				dol_print_error($this->db);
+			}
+			$stringtoprint .='</select>';
+
+			$stringtoprint .='<script>';
+			$stringtoprint .='var arraynotparents = '.json_encode($arraycodenotparent).';';
+			$stringtoprint .='if (arraynotparents.includes($("#groupticket")[0].value)){$("#groupticket_child").hide()}
+			else{';
+			foreach ($tabscript as $script) {
+				$stringtoprint .= $script;
+			};
+			$stringtoprint .='}
+			$("#groupticket").change(function() {
+				$("#groupticket_child")[0].value = ""
+				if (!arraynotparents.includes(this.value)) {
+				$("#groupticket_child").show()
+				} else {
+				$("#groupticket_child").hide()
+				}
+			';
+			foreach ($tabscript as $script) {
+				$stringtoprint .= $script;
+			};
+			$stringtoprint .='})';
+			$stringtoprint .='</script>';
+			return $stringtoprint;
+		}
 	}
 
 	/**

From 2c6eee2528b0fc0f0edf4d7a73e297a44f525f6e Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 31 May 2021 10:26:05 +0200
Subject: [PATCH 0322/1497] Update llx_00_c_country.sql
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Roumanie  ->  Romania
Rwanda = Rwanda
Sainte-Hélène  ->  Saint Helena
Saint-Christophe-et-Niévès  ->  Saint Kitts and Nevis
Sainte-Lucie  ->  Saint Lucia
Saint-Pierre-et-Miquelon  ->  Saint Pierre and Miquelon
Saint-Vincent-et-les-Grenadines  ->  Saint Vincent and the Grenadines
Samoa = Samoa
Saint-Marin  ->  San Marino
Sao Tomé-et-Principe  ->  Saint Thomas and Prince
Serbie  ->  Serbia
Seychelles = Seychelles
Sierra Leone = Sierra Leone
Slovaquie  ->  Slovakia
Slovénie  ->  Slovenia
---
 .../install/mysql/data/llx_00_c_country.sql   | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_00_c_country.sql b/htdocs/install/mysql/data/llx_00_c_country.sql
index 677447f1af2..1e2e8b69c39 100644
--- a/htdocs/install/mysql/data/llx_00_c_country.sql
+++ b/htdocs/install/mysql/data/llx_00_c_country.sql
@@ -216,21 +216,21 @@ INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (18
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (184,'PL','POL','Pologne',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (185,'PR','PRI','Puerto Rico',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (186,'QA','QAT','Qatar',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (188,'RO','ROU','Roumanie',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (188,'RO','ROU','Romania',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (189,'RW','RWA','Rwanda',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (190,'SH','SHN','Sainte-Hélène',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (191,'KN','KNA','Saint-Christophe-et-Niévès',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (192,'LC','LCA','Sainte-Lucie',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (193,'PM','SPM','Saint-Pierre-et-Miquelon',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (194,'VC','VCT','Saint-Vincent-et-les-Grenadines',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (190,'SH','SHN','Saint Helena',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (191,'KN','KNA','Saint Kitts and Nevis',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (192,'LC','LCA','Saint Lucia',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (193,'PM','SPM','Saint Pierre and Miquelon',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (194,'VC','VCT','Saint Vincent and the Grenadines',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (195,'WS','WSM','Samoa',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (196,'SM','SMR','Saint-Marin',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (197,'ST','STP','Sao Tomé-et-Principe',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (198,'RS','SRB','Serbie',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (196,'SM','SMR','San Marino ',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (197,'ST','STP','Saint Thomas and Prince',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (198,'RS','SRB','Serbia',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (199,'SC','SYC','Seychelles',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (200,'SL','SLE','Sierra Leone',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (201,'SK','SVK','Slovaquie',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (202,'SI','SVN','Slovénie',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (201,'SK','SVK','Slovakia',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (202,'SI','SVN','Slovenia',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (203,'SB','SLB','Iles Salomon',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (204,'SO','SOM','Somalie',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (205,'ZA','ZAF','South Africa',1,0);

From a97efdbdfa12ef4e121a556c3b5ed64822abd670 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 31 May 2021 10:31:25 +0200
Subject: [PATCH 0323/1497] Update list.php

$title = $langs->trans('Supplier')." - ".$langs->trans('ProductsAndServices');
---
 htdocs/fourn/product/list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/fourn/product/list.php b/htdocs/fourn/product/list.php
index f411d70af25..ed137fd5d86 100644
--- a/htdocs/fourn/product/list.php
+++ b/htdocs/fourn/product/list.php
@@ -121,7 +121,7 @@ $form = new Form($db);
 $productstatic = new Product($db);
 $companystatic = new Societe($db);
 
-$title = $langs->trans("ProductsAndServices");
+$title = $langs->trans('Supplier')." - ".$langs->trans('ProductsAndServices');
 
 if ($fourn_id) {
 	$supplier = new Fournisseur($db);

From fed7878d18ad9273560129fdaffdfd27f1f61645 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 31 May 2021 10:33:36 +0200
Subject: [PATCH 0324/1497] Update card.php

$lineid  was duplicate
---
 htdocs/fourn/commande/card.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 8c4aa1e2a54..21cd61536ee 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -70,8 +70,6 @@ $socid = GETPOST('socid', 'int');
 $projectid = GETPOST('projectid', 'int');
 $cancel         = GETPOST('cancel', 'alpha');
 $lineid         = GETPOST('lineid', 'int');
-
-$lineid = GETPOST('lineid', 'int');
 $origin = GETPOST('origin', 'alpha');
 $originid = (GETPOST('originid', 'int') ? GETPOST('originid', 'int') : GETPOST('origin_id', 'int')); // For backward compatibility
 

From 7aae5be54a86d704d63ea61bf5bf878cc3b78e9a Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 31 May 2021 10:36:43 +0200
Subject: [PATCH 0325/1497] Update card.php

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

diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 0bc26ea8f2b..86cd9e439f9 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -1791,8 +1791,8 @@ if (!empty($conf->projet->enabled)) {
 $now = dol_now();
 
 $title = $langs->trans('SupplierInvoice')." - ".$langs->trans('Card');
-$helpurl = "EN:Module_Suppliers_Invoices|FR:Module_Fournisseurs_Factures|ES:Módulo_Facturas_de_proveedores";
-llxHeader('', $title, $helpurl);
+$help_url = 'EN:Module_Suppliers_Invoices|FR:Module_Fournisseurs_Factures|ES:Módulo_Facturas_de_proveedores|DE:Modul_Lieferantenrechnungen';
+llxHeader('', $title, $help_url);
 
 // Mode creation
 if ($action == 'create') {

From 55d48077a32301e509aa67925d19f07c11287e91 Mon Sep 17 00:00:00 2001
From: Christian Foellmann <christian@foellmann.de>
Date: Mon, 31 May 2021 09:26:53 +0200
Subject: [PATCH 0326/1497] ADD note to supplier order refusal

---
 .../interface_50_modAgenda_ActionsAuto.class.php   |  7 ++++++-
 htdocs/fourn/commande/card.php                     | 14 +++++++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
index 8e98030b484..3c7c8cb6e1c 100644
--- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
@@ -544,13 +544,18 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->sendtoid = 0;
 		} elseif ($action == 'ORDER_SUPPLIER_REFUSE') {
 			// Load translation files required by the page
-			$langs->loadLangs(array("agenda", "other", "orders"));
+			$langs->loadLangs(array("agenda", "other", "orders", "main"));
 
 			if (empty($object->actionmsg2)) {
 				$object->actionmsg2 = $langs->transnoentities("OrderRefusedInDolibarr", $object->ref);
 			}
 			$object->actionmsg = $langs->transnoentities("OrderRefusedInDolibarr", $object->ref);
 
+			if (!empty($object->refuse_note)) {
+				$object->actionmsg .= '<br />';
+				$object->actionmsg .= $langs->trans("Reason") . ': '.$object->refuse_note;
+			}
+
 			$object->sendtoid = 0;
 		} elseif ($action == 'ORDER_SUPPLIER_SUBMIT') {
 			// Load translation files required by the page
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 8c4aa1e2a54..d5ff9bc229f 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -960,6 +960,9 @@ if (empty($reshook)) {
 	}
 
 	if ($action == 'confirm_refuse' && $confirm == 'yes' && $usercanapprove) {
+		if (GETPOST('refuse_note')) {
+			$object->refuse_note = GETPOST('refuse_note');
+		}
 		$result = $object->refuse($user);
 		if ($result > 0) {
 			header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
@@ -1875,7 +1878,16 @@ if ($action == 'create') {
 
 	// Confirmation de la desapprobation
 	if ($action == 'refuse') {
-		$formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=$object->id", $langs->trans("DenyingThisOrder"), $langs->trans("ConfirmDenyingThisOrder", $object->ref), "confirm_refuse", '', 0, 1);
+		$formquestion = array(
+			array(
+				'type' => 'text',
+				'name' => 'refuse_note',
+				'label' => $langs->trans("MotifCP"),
+				'value' => '',
+				'morecss' => 'minwidth300'
+			)
+		);
+		$formconfirm  = $form->formconfirm($_SERVER['PHP_SELF']."?id=$object->id", $langs->trans("DenyingThisOrder"), $langs->trans("ConfirmDenyingThisOrder", $object->ref), "confirm_refuse", $formquestion, 0, 1);
 	}
 
 	// Confirmation de l'annulation

From e1de510c389396730d4aef03ccecd780b226f3c3 Mon Sep 17 00:00:00 2001
From: TuxGasy <garcia@soamichel.fr>
Date: Mon, 31 May 2021 11:06:52 +0200
Subject: [PATCH 0327/1497] Do a strict comparison when check if stock is
 enough

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

diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php
index 2429a4c09c5..ec2dfbc257e 100644
--- a/htdocs/product/stock/class/mouvementstock.class.php
+++ b/htdocs/product/stock/class/mouvementstock.class.php
@@ -355,7 +355,7 @@ class MouvementStock extends CommonObject
 				$qtyisnotenough = 0;
 				foreach ($product->stock_warehouse[$entrepot_id]->detail_batch as $batchcursor => $prodbatch)
 				{
-					if ($batch != $batchcursor) continue;
+					if ($batch !== $batchcursor) continue; // Do a strict comparison because $batchcursar can be an integer
 					$foundforbatch = 1;
 					if ($prodbatch->qty < abs($qty)) $qtyisnotenough = $prodbatch->qty;
 					break;

From ffc7ae038947c63bf3d48e6815427a25a489055f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 31 May 2021 12:02:03 +0200
Subject: [PATCH 0328/1497] Fix missing test

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

diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index d189ced83aa..62d815842ce 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1789,7 +1789,9 @@ if ($action == 'create' || $action == 'adduserldap') {
 			if ($object->datepreviouslogin) {
 				print dol_print_date($object->datepreviouslogin, "dayhour").' <span class="opacitymedium">('.$langs->trans("Previous").')</span>, ';
 			}
-			print dol_print_date($object->datelastlogin, "dayhour").' <span class="opacitymedium">('.$langs->trans("Current").')</span>';
+			if ($object->datelastlogin) {
+				print dol_print_date($object->datelastlogin, "dayhour").' <span class="opacitymedium">('.$langs->trans("Current").')</span>';
+			}
 			print '</td>';
 			print "</tr>\n";
 

From 90ae16372c7d2cc0a6d8939b224230b267909744 Mon Sep 17 00:00:00 2001
From: Pierre Payet <pierre.p@synergies-france.fr>
Date: Mon, 31 May 2021 12:11:16 +0200
Subject: [PATCH 0329/1497] add missing hooks in societe list.php

---
 htdocs/societe/list.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 0df74bc166e..fe55d05dda4 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -429,6 +429,10 @@ $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."c_stcomm as st ON s.fk_stcomm = st.id";
 // We'll need this table joined to the select in order to filter by sale
 if ($search_sale == -2) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc = s.rowid";
 elseif ($search_sale || (!$user->rights->societe->client->voir && !$socid)) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+// Add table from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
 $sql .= " WHERE s.entity IN (".getEntity('societe').")";
 if (!$user->rights->societe->client->voir && !$socid)	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 if ($search_sale && $search_sale != -2)    $sql .= " AND s.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
@@ -490,6 +494,11 @@ if (empty($reshook)) {
 }
 $sql .= $hookmanager->resPrint;
 
+// Add GroupBy from hooks
+$parameters = array('all' => $all, 'fieldstosearchall' => $fieldstosearchall);
+$reshook = $hookmanager->executeHooks('printFieldListGroupBy', $parameters, $object); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
+
 $sql .= $db->order($sortfield, $sortorder);
 
 // Count total nb of records

From 0071d63fbba31aefc51c136eacc6afb455d8fd67 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 31 May 2021 13:35:03 +0200
Subject: [PATCH 0330/1497] Fix for ro-md language

---
 htdocs/core/lib/functions.lib.php | 6 +++++-
 htdocs/langs/en_US/languages.lang | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 45d1bdca12e..61a3869fe1a 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -8068,7 +8068,7 @@ function picto_from_langcode($codelang, $moreatt = '')
  * Return default language from country code.
  * Return null if not found.
  *
- * @param 	string 	$countrycode	Country code like 'US', 'FR', 'CA', ...
+ * @param 	string 	$countrycode	Country code like 'US', 'FR', 'CA', 'ES', 'MX', ...
  * @return	string					Value of locale like 'en_US', 'fr_FR', ...
  */
 function getLanguageCodeFromCountryCode($countrycode)
@@ -8092,6 +8092,9 @@ function getLanguageCodeFromCountryCode($countrycode)
 		if ($mysoc->country_code == 'DE') {
 			return 'de_CH';
 		}
+		if ($mysoc->country_code == 'IT') {
+			return 'it_CH';
+		}
 	}
 
 	// Locale list taken from:
@@ -8232,6 +8235,7 @@ function getLanguageCodeFromCountryCode($countrycode)
 		'pt-BR',
 		'pt-PT',
 		'rm-CH',
+		'ro-MD',
 		'ro-RO',
 		'ru-RU',
 		'rw-RW',
diff --git a/htdocs/langs/en_US/languages.lang b/htdocs/langs/en_US/languages.lang
index 015e6dcfa25..cbc94b4481c 100644
--- a/htdocs/langs/en_US/languages.lang
+++ b/htdocs/langs/en_US/languages.lang
@@ -84,6 +84,7 @@ Language_nl_NL=Dutch
 Language_pl_PL=Polish
 Language_pt_BR=Portuguese (Brazil)
 Language_pt_PT=Portuguese
+Language_ro_MD=Romanian (Moldavia)
 Language_ro_RO=Romanian
 Language_ru_RU=Russian
 Language_ru_UA=Russian (Ukraine)

From c19f624eb5ca5e9e935e694307779db0712ea6d9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 31 May 2021 16:00:03 +0200
Subject: [PATCH 0331/1497] Code comment

---
 htdocs/user/group/card.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php
index 19b78cf06e9..0e60e70e42a 100644
--- a/htdocs/user/group/card.php
+++ b/htdocs/user/group/card.php
@@ -1,10 +1,10 @@
 <?php
 /* Copyright (C) 2005		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2005-2015	Laurent Destailleur	<eldy@users.sourceforge.net>
- * Copyright (C) 2005-2017	Regis Houssin		<regis.houssin@inodbox.com>
- * Copyright (C) 2011		Herve Prot			<herve.prot@symeos.com>
- * Copyright (C) 2012		Florian Henry		<florian.henry@open-concept.pro>
- * Copyright (C) 2018		Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2005-2021	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2017	Regis Houssin			<regis.houssin@inodbox.com>
+ * Copyright (C) 2011		Herve Prot				<herve.prot@symeos.com>
+ * Copyright (C) 2012		Florian Henry			<florian.henry@open-concept.pro>
+ * Copyright (C) 2018		Juanjo Menent			<jmenent@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
@@ -22,7 +22,7 @@
 
 /**
  *       \file       htdocs/user/group/card.php
- *       \brief      Onglet groupes utilisateurs
+ *       \brief      Tab of a user group
  */
 
 require '../../main.inc.php';

From 2dc9ca334fa7ae9115847ee36bc7ffa2ed65c9ae Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 31 May 2021 23:36:37 +0200
Subject: [PATCH 0332/1497] CSS

---
 htdocs/admin/system/filecheck.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/admin/system/filecheck.php b/htdocs/admin/system/filecheck.php
index 50b27b30964..212fcc6228a 100644
--- a/htdocs/admin/system/filecheck.php
+++ b/htdocs/admin/system/filecheck.php
@@ -122,7 +122,7 @@ if (dol_is_file($xmlfile)) {
 print '<!-- for a remote target=remote&xmlremote=... -->'."\n";
 if ($enableremotecheck) {
 	print '<input type="radio" name="target" id="checkboxremote" value="remote"'.(GETPOST('target') == 'remote' ? 'checked="checked"' : '').'> <label for="checkboxremote">'.$langs->trans("RemoteSignature").'</label> = ';
-	print '<input name="xmlremote" class="flat minwidth400" value="'.dol_escape_htmltag($xmlremote).'"><br>';
+	print '<input name="xmlremote" class="flat minwidth500" value="'.dol_escape_htmltag($xmlremote).'"><br>';
 } else {
 	print '<input type="radio" name="target" value="remote" disabled="disabled"> '.$langs->trans("RemoteSignature").' = '.dol_escape_htmltag($xmlremote);
 	if (!GETPOST('xmlremote')) {

From 9d44df8a64e0857e0647ba08312a7301500f03f8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 1 Jun 2021 00:05:43 +0200
Subject: [PATCH 0333/1497] Fix escape

---
 htdocs/societe/list.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 0a3e9207a96..48cc882c052 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -1405,7 +1405,7 @@ while ($i < min($num, $limit)) {
 	}
 	if (!empty($arrayfields['s.name_alias']['checked'])) {
 		print '<td class="tdoverflowmax200">';
-		print $companystatic->name_alias;
+		print dol_escape_htmltag($companystatic->name_alias);
 		print "</td>\n";
 		if (!$i) {
 			$totalarray['nbfield']++;
@@ -1413,70 +1413,70 @@ while ($i < min($num, $limit)) {
 	}
 	// Barcode
 	if (!empty($arrayfields['s.barcode']['checked'])) {
-		print '<td>'.$obj->barcode.'</td>';
+		print '<td>'.dol_escape_htmltag($obj->barcode).'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
 	}
 	// Customer code
 	if (!empty($arrayfields['s.code_client']['checked'])) {
-		print '<td class="nowraponall">'.$obj->code_client.'</td>';
+		print '<td class="nowraponall">'.dol_escape_htmltag($obj->code_client).'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
 	}
 	// Supplier code
 	if (!empty($arrayfields['s.code_fournisseur']['checked'])) {
-		print '<td class="nowraponall">'.$obj->code_fournisseur.'</td>';
+		print '<td class="nowraponall">'.dol_escape_htmltag($obj->code_fournisseur).'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
 	}
 	// Account customer code
 	if (!empty($arrayfields['s.code_compta']['checked'])) {
-		print '<td>'.$obj->code_compta.'</td>';
+		print '<td>'.dol_escape_htmltag($obj->code_compta).'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
 	}
 	// Account supplier code
 	if (!empty($arrayfields['s.code_compta_fournisseur']['checked'])) {
-		print '<td>'.$obj->code_compta_fournisseur.'</td>';
+		print '<td>'.dol_escape_htmltag($obj->code_compta_fournisseur).'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
 	}
 	// Address
 	if (!empty($arrayfields['s.address']['checked'])) {
-		print '<td>'.$obj->address.'</td>';
+		print '<td>'.dol_escape_htmltag($obj->address).'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
 	}
 	// Zip
 	if (!empty($arrayfields['s.zip']['checked'])) {
-		print "<td>".$obj->zip."</td>\n";
+		print "<td>".dol_escape_htmltag($obj->zip)."</td>\n";
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
 	}
 	// Town
 	if (!empty($arrayfields['s.town']['checked'])) {
-		print "<td>".$obj->town."</td>\n";
+		print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($obj->town).'">'.dol_escape_htmltag($obj->town)."</td>\n";
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
 	}
 	// State
 	if (!empty($arrayfields['state.nom']['checked'])) {
-		print "<td>".$obj->state_name."</td>\n";
+		print "<td>".dol_escape_htmltag($obj->state_name)."</td>\n";
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
 	}
 	// Region
 	if (!empty($arrayfields['region.nom']['checked'])) {
-		print "<td>".$obj->region_name."</td>\n";
+		print "<td>".dol_escape_htmltag($obj->region_name)."</td>\n";
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}

From d18c1ea0c0177618397c28996fde3e288eabf86b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 1 Jun 2021 00:41:51 +0200
Subject: [PATCH 0334/1497] css

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

diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index 2132cbc141b..28fa0287f0c 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -600,7 +600,7 @@ if ($num > 0) {
 		print '</td>';
 
 		// Output of last run
-		print '<td>';
+		print '<td class="small">';
 		if (!empty($obj->lastoutput)) {
 			print dol_trunc(nl2br($obj->lastoutput), 50);
 		}

From a5c2ce1727044a141cbdc228c3f6680ac8115179 Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Tue, 1 Jun 2021 08:45:45 +0200
Subject: [PATCH 0335/1497] NEW/FIX : Allow auto picking for child warehouse
 and taking into account of the quantities already affected in list

---
 htdocs/expedition/card.php         | 118 +++++++++++++++++++++++++++--
 htdocs/langs/en_US/deliveries.lang |   1 +
 htdocs/langs/fr_FR/deliveries.lang |   1 +
 3 files changed, 114 insertions(+), 6 deletions(-)

diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index cc441d9f50f..8d4ed510449 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -1020,7 +1020,11 @@ if ($action == 'create') {
 			// Load shipments already done for same order
 			$object->loadExpeditions();
 
-			if ($numAsked) {
+
+            $alreadyQtyBatchSetted = $alreadyQtySetted = array();
+
+            if ($numAsked)
+            {
 				print '<tr class="liste_titre">';
 				print '<td>'.$langs->trans("Description").'</td>';
 				print '<td class="center">'.$langs->trans("QtyOrdered").'</td>';
@@ -1044,6 +1048,15 @@ if ($action == 'create') {
 				print "</tr>\n";
 			}
 
+			$warehouse_id = GETPOST('entrepot_id', 'int');
+            $warehousePicking = array();
+            // get all warehouse children for picking
+			if($warehouse_id > 0){
+				$warehousePicking[] = $warehouse_id;
+				$warehouseObj = new Entrepot($db);
+				$warehouseObj->get_children_warehouses($warehouse_id,$warehousePicking);
+			}
+
 			$indiceAsked = 0;
 			while ($indiceAsked < $numAsked) {
 				$product = new Product($db);
@@ -1293,6 +1306,12 @@ if ($action == 'create') {
 							$subj = 0;
 							// Define nb of lines suggested for this order line
 							$nbofsuggested = 0;
+
+							uasort ( $product->stock_warehouse , function ($a, $b){
+								if ($a->real == $b->real) { return 0; }
+								return ($a->real < $b->real) ? -1 : 1;
+							});
+
 							foreach ($product->stock_warehouse as $warehouse_id => $stock_warehouse) {
 								if ($stock_warehouse->real > 0) {
 									$nbofsuggested++;
@@ -1300,6 +1319,12 @@ if ($action == 'create') {
 							}
 							$tmpwarehouseObject = new Entrepot($db);
 							foreach ($product->stock_warehouse as $warehouse_id => $stock_warehouse) {    // $stock_warehouse is product_stock
+
+								if(!empty($warehousePicking) && !in_array($warehouse_id, $warehousePicking)){
+									// if a warehouse was selected by user, picking is limited to this warehouse and his children
+									continue;
+								}
+
 								$tmpwarehouseObject->fetch($warehouse_id);
 								if ($stock_warehouse->real > 0) {
 									$stock = + $stock_warehouse->real; // Convert it to number
@@ -1309,7 +1334,32 @@ if ($action == 'create') {
 									print '<!-- subj='.$subj.'/'.$nbofsuggested.' --><tr '.((($subj + 1) == $nbofsuggested) ? $bc[$var] : '').'>';
 									print '<td colspan="3" ></td><td class="center"><!-- qty to ship (no lot management for product line indiceAsked='.$indiceAsked.') -->';
 									if ($line->product_type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
-										print '<input name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'" type="text" size="4" value="'.$deliverableQty.'">';
+										if(isset($alreadyQtySetted[$line->fk_product][intval($warehouse_id)])){
+											$deliverableQty = min($quantityToBeDelivered, $stock - $alreadyQtySetted[$line->fk_product][intval($warehouse_id)]);
+										}
+										else{
+											if(!isset($alreadyQtySetted[$line->fk_product])){
+												$alreadyQtySetted[$line->fk_product] = array();
+											}
+
+											$deliverableQty = min($quantityToBeDelivered, $stock);
+										}
+
+										if ($deliverableQty < 0) $deliverableQty = 0;
+
+										$tooltip = '';
+										if(!empty($alreadyQtySetted[$line->fk_product][intval($warehouse_id)])){
+											$tooltip = ' class="classfortooltip" title="'.$langs->trans('StockQuantitiesAlreadyAllocatedOnPreviousLines').' : '.$alreadyQtySetted[$line->fk_product][intval($warehouse_id)].'" ';
+										}
+
+										$alreadyQtySetted[$line->fk_product][intval($warehouse_id)] = $deliverableQty + $alreadyQtySetted[$line->fk_product][intval($warehouse_id)];
+
+										$inputName = 'qtyl'.$indiceAsked.'_'.$subj;
+										if(GETPOSTISSET($inputName)){
+											$deliverableQty = GETPOST($inputName, 'int');
+										}
+
+										print '<input '.$tooltip.' name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'" type="text" size="4" value="'.$deliverableQty.'">';
 										print '<input name="ent1'.$indiceAsked.'_'.$subj.'" type="hidden" value="'.$warehouse_id.'">';
 									} else {
 										print $langs->trans("NA");
@@ -1366,6 +1416,12 @@ if ($action == 'create') {
 
 							$tmpwarehouseObject = new Entrepot($db);
 							$productlotObject = new Productlot($db);
+
+							uasort ( $product->stock_warehouse , function ($a, $b){
+								if ($a->real == $b->real) { return 0; }
+								return ($a->real < $b->real) ? -1 : 1;
+							});
+
 							// Define nb of lines suggested for this order line
 							$nbofsuggested = 0;
 							foreach ($product->stock_warehouse as $warehouse_id => $stock_warehouse) {
@@ -1373,18 +1429,68 @@ if ($action == 'create') {
 									foreach ($stock_warehouse->detail_batch as $dbatch) {
 										$nbofsuggested++;
 									}
+
+									// Sort Batch priority
+									uasort($stock_warehouse->detail_batch, function ($a, $b) {
+										$compare = 0;
+										$multiplePow = 0;
+										// The comparison function must return an integer less than, equal to, or greater than zero if the first argument is considered to be respectively less than, equal to, or greater than the second.
+
+										// PRIORITY FOR QTY : Eliminate place with small qty first
+										$multiplePow++;
+										$multiple = pow(10, $multiplePow);
+										$compare += (($a->qty < $b->qty) ? -1 : 1) * $multiple;
+
+										// PRIORITY FOR SELL EXPIRATION DATE
+										$multiplePow++;
+										$multiple = pow(10, $multiplePow);
+										$compare += (($a->sellby < $b->sellby) ? -1 : 1) * $multiple;
+
+										// PRIORITY FOR CONSUMPTION EXPIRATION DATE
+										$multiplePow++;
+										$multiple = pow(10, $multiplePow);
+										$compare += (($a->eatby < $b->eatby) ? -1 : 1) * $multiple;
+
+										return $compare;
+									});
 								}
 							}
+
 							foreach ($product->stock_warehouse as $warehouse_id => $stock_warehouse) {
 								$tmpwarehouseObject->fetch($warehouse_id);
 								if (($stock_warehouse->real > 0) && (count($stock_warehouse->detail_batch))) {
 									foreach ($stock_warehouse->detail_batch as $dbatch) {
-										//var_dump($dbatch);
+
 										$batchStock = + $dbatch->qty; // To get a numeric
-										$deliverableQty = min($quantityToBeDelivered, $batchStock);
-										if ($deliverableQty < 0) {
-											$deliverableQty = 0;
+										if(isset($alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch][intval($warehouse_id)])){
+											$deliverableQty = min($quantityToBeDelivered, $batchStock - $alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch][intval($warehouse_id)]);
 										}
+										else{
+											if(!isset($alreadyQtyBatchSetted[$line->fk_product])){
+												$alreadyQtyBatchSetted[$line->fk_product] = array();
+											}
+
+											if(!isset($alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch])){
+												$alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch] = array();
+											}
+
+											$deliverableQty = min($quantityToBeDelivered, $batchStock);
+										}
+
+										if ($deliverableQty < 0) $deliverableQty = 0;
+
+										$inputName = 'qtyl'.$indiceAsked.'_'.$subj;
+										if(GETPOSTISSET($inputName)){
+											$deliverableQty = GETPOST($inputName, 'int');
+										}
+
+										$tooltip = '';
+										if(!empty($alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch][intval($warehouse_id)])){
+											$tooltip = ' class="classfortooltip" title="'.$langs->trans('StockQuantitiesAlreadyAllocatedOnPreviousLines').' : '.$alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch][intval($warehouse_id)].'" ';
+										}
+
+										$alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch][intval($warehouse_id)] = $deliverableQty + $alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch][intval($warehouse_id)];
+
 										print '<!-- subj='.$subj.'/'.$nbofsuggested.' --><tr '.((($subj + 1) == $nbofsuggested) ? $bc[$var] : '').'><td colspan="3"></td><td class="center">';
 										print '<input class="qtyl" name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'_'.$subj.'" type="text" size="4" value="'.$deliverableQty.'">';
 										print '</td>';
diff --git a/htdocs/langs/en_US/deliveries.lang b/htdocs/langs/en_US/deliveries.lang
index fdfd6404a8a..cd8a36e6c70 100644
--- a/htdocs/langs/en_US/deliveries.lang
+++ b/htdocs/langs/en_US/deliveries.lang
@@ -30,3 +30,4 @@ NonShippable=Not Shippable
 ShowShippableStatus=Show shippable status
 ShowReceiving=Show delivery receipt
 NonExistentOrder=Nonexistent order
+StockQuantitiesAlreadyAllocatedOnPreviousLines = Stock quantities already allocated on previous lines
diff --git a/htdocs/langs/fr_FR/deliveries.lang b/htdocs/langs/fr_FR/deliveries.lang
index bd13cce814c..6af98a54d4f 100644
--- a/htdocs/langs/fr_FR/deliveries.lang
+++ b/htdocs/langs/fr_FR/deliveries.lang
@@ -30,3 +30,4 @@ NonShippable=Non expédiable
 ShowShippableStatus=Afficher le statut Expédiable
 ShowReceiving=Afficher le bon de réception
 NonExistentOrder=Commande inexistante
+StockQuantitiesAlreadyAllocatedOnPreviousLines = Qtés de stock déja attribuées sur une ou des lignes précédentes

From cf9c9ec8825e5db3da054b9ecb8eeade7126eb9b Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Tue, 1 Jun 2021 09:07:05 +0200
Subject: [PATCH 0336/1497] fix condition

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

diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 8d4ed510449..64d554b9780 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -1155,10 +1155,9 @@ if ($action == 'create') {
 					} else {
 						$quantityToBeDelivered = $quantityAsked - $quantityDelivered;
 					}
-					$warehouse_id = GETPOST('entrepot_id', 'int');
 
 					$warehouseObject = null;
-					if ($warehouse_id > 0 || !($line->fk_product > 0) || empty($conf->stock->enabled)) {     // If warehouse was already selected or if product is not a predefined, we go into this part with no multiwarehouse selection
+					if (count($warehousePicking) == 1 || !($line->fk_product > 0) || empty($conf->stock->enabled)) {     // If warehouse was already selected or if product is not a predefined, we go into this part with no multiwarehouse selection
 						print '<!-- Case warehouse already known or product not a predefined product -->';
 						//ship from preselected location
 						$stock = + $product->stock_warehouse[$warehouse_id]->real; // Convert to number

From 3cc65989c1eee25920d816aa8b50efd5d65f52ea Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Tue, 1 Jun 2021 07:25:29 +0000
Subject: [PATCH 0337/1497] Fixing style errors.

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

diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 64d554b9780..543a67311f0 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -1021,10 +1021,9 @@ if ($action == 'create') {
 			$object->loadExpeditions();
 
 
-            $alreadyQtyBatchSetted = $alreadyQtySetted = array();
+			$alreadyQtyBatchSetted = $alreadyQtySetted = array();
 
-            if ($numAsked)
-            {
+			if ($numAsked) {
 				print '<tr class="liste_titre">';
 				print '<td>'.$langs->trans("Description").'</td>';
 				print '<td class="center">'.$langs->trans("QtyOrdered").'</td>';
@@ -1049,12 +1048,12 @@ if ($action == 'create') {
 			}
 
 			$warehouse_id = GETPOST('entrepot_id', 'int');
-            $warehousePicking = array();
-            // get all warehouse children for picking
-			if($warehouse_id > 0){
+			$warehousePicking = array();
+			// get all warehouse children for picking
+			if ($warehouse_id > 0) {
 				$warehousePicking[] = $warehouse_id;
 				$warehouseObj = new Entrepot($db);
-				$warehouseObj->get_children_warehouses($warehouse_id,$warehousePicking);
+				$warehouseObj->get_children_warehouses($warehouse_id, $warehousePicking);
 			}
 
 			$indiceAsked = 0;
@@ -1306,7 +1305,7 @@ if ($action == 'create') {
 							// Define nb of lines suggested for this order line
 							$nbofsuggested = 0;
 
-							uasort ( $product->stock_warehouse , function ($a, $b){
+							uasort( $product->stock_warehouse, function ($a, $b) {
 								if ($a->real == $b->real) { return 0; }
 								return ($a->real < $b->real) ? -1 : 1;
 							});
@@ -1318,8 +1317,7 @@ if ($action == 'create') {
 							}
 							$tmpwarehouseObject = new Entrepot($db);
 							foreach ($product->stock_warehouse as $warehouse_id => $stock_warehouse) {    // $stock_warehouse is product_stock
-
-								if(!empty($warehousePicking) && !in_array($warehouse_id, $warehousePicking)){
+								if (!empty($warehousePicking) && !in_array($warehouse_id, $warehousePicking)) {
 									// if a warehouse was selected by user, picking is limited to this warehouse and his children
 									continue;
 								}
@@ -1333,11 +1331,10 @@ if ($action == 'create') {
 									print '<!-- subj='.$subj.'/'.$nbofsuggested.' --><tr '.((($subj + 1) == $nbofsuggested) ? $bc[$var] : '').'>';
 									print '<td colspan="3" ></td><td class="center"><!-- qty to ship (no lot management for product line indiceAsked='.$indiceAsked.') -->';
 									if ($line->product_type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
-										if(isset($alreadyQtySetted[$line->fk_product][intval($warehouse_id)])){
+										if (isset($alreadyQtySetted[$line->fk_product][intval($warehouse_id)])) {
 											$deliverableQty = min($quantityToBeDelivered, $stock - $alreadyQtySetted[$line->fk_product][intval($warehouse_id)]);
-										}
-										else{
-											if(!isset($alreadyQtySetted[$line->fk_product])){
+										} else {
+											if (!isset($alreadyQtySetted[$line->fk_product])) {
 												$alreadyQtySetted[$line->fk_product] = array();
 											}
 
@@ -1347,14 +1344,14 @@ if ($action == 'create') {
 										if ($deliverableQty < 0) $deliverableQty = 0;
 
 										$tooltip = '';
-										if(!empty($alreadyQtySetted[$line->fk_product][intval($warehouse_id)])){
+										if (!empty($alreadyQtySetted[$line->fk_product][intval($warehouse_id)])) {
 											$tooltip = ' class="classfortooltip" title="'.$langs->trans('StockQuantitiesAlreadyAllocatedOnPreviousLines').' : '.$alreadyQtySetted[$line->fk_product][intval($warehouse_id)].'" ';
 										}
 
 										$alreadyQtySetted[$line->fk_product][intval($warehouse_id)] = $deliverableQty + $alreadyQtySetted[$line->fk_product][intval($warehouse_id)];
 
 										$inputName = 'qtyl'.$indiceAsked.'_'.$subj;
-										if(GETPOSTISSET($inputName)){
+										if (GETPOSTISSET($inputName)) {
 											$deliverableQty = GETPOST($inputName, 'int');
 										}
 
@@ -1416,7 +1413,7 @@ if ($action == 'create') {
 							$tmpwarehouseObject = new Entrepot($db);
 							$productlotObject = new Productlot($db);
 
-							uasort ( $product->stock_warehouse , function ($a, $b){
+							uasort( $product->stock_warehouse, function ($a, $b) {
 								if ($a->real == $b->real) { return 0; }
 								return ($a->real < $b->real) ? -1 : 1;
 							});
@@ -1459,17 +1456,15 @@ if ($action == 'create') {
 								$tmpwarehouseObject->fetch($warehouse_id);
 								if (($stock_warehouse->real > 0) && (count($stock_warehouse->detail_batch))) {
 									foreach ($stock_warehouse->detail_batch as $dbatch) {
-
 										$batchStock = + $dbatch->qty; // To get a numeric
-										if(isset($alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch][intval($warehouse_id)])){
+										if (isset($alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch][intval($warehouse_id)])) {
 											$deliverableQty = min($quantityToBeDelivered, $batchStock - $alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch][intval($warehouse_id)]);
-										}
-										else{
-											if(!isset($alreadyQtyBatchSetted[$line->fk_product])){
+										} else {
+											if (!isset($alreadyQtyBatchSetted[$line->fk_product])) {
 												$alreadyQtyBatchSetted[$line->fk_product] = array();
 											}
 
-											if(!isset($alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch])){
+											if (!isset($alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch])) {
 												$alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch] = array();
 											}
 
@@ -1479,12 +1474,12 @@ if ($action == 'create') {
 										if ($deliverableQty < 0) $deliverableQty = 0;
 
 										$inputName = 'qtyl'.$indiceAsked.'_'.$subj;
-										if(GETPOSTISSET($inputName)){
+										if (GETPOSTISSET($inputName)) {
 											$deliverableQty = GETPOST($inputName, 'int');
 										}
 
 										$tooltip = '';
-										if(!empty($alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch][intval($warehouse_id)])){
+										if (!empty($alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch][intval($warehouse_id)])) {
 											$tooltip = ' class="classfortooltip" title="'.$langs->trans('StockQuantitiesAlreadyAllocatedOnPreviousLines').' : '.$alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch][intval($warehouse_id)].'" ';
 										}
 

From c91b9d613afc5c72f27b59e554b53a75ed3cc299 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Tue, 1 Jun 2021 15:30:17 +0200
Subject: [PATCH 0338/1497] FIX: order supplier stats by category now display
 figures

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

diff --git a/htdocs/commande/class/commandestats.class.php b/htdocs/commande/class/commandestats.class.php
index cbb93b940de..7d98c5be996 100644
--- a/htdocs/commande/class/commandestats.class.php
+++ b/htdocs/commande/class/commandestats.class.php
@@ -78,6 +78,7 @@ class CommandeStats extends Stats
 			$this->field = 'total_ht';
 			$this->field_line = 'total_ht';
 			$this->where .= " c.fk_statut > 0"; // Not draft and not cancelled
+			$this->categ_link=MAIN_DB_PREFIX.'categorie_societe';
 		}
 		elseif ($mode == 'supplier')
 		{
@@ -87,6 +88,7 @@ class CommandeStats extends Stats
 			$this->field = 'total_ht';
 			$this->field_line = 'total_ht';
 			$this->where .= " c.fk_statut > 2"; // Only approved & ordered
+			$this->categ_link=MAIN_DB_PREFIX.'categorie_fournisseur';
 		}
 		//$this->where.= " AND c.fk_soc = s.rowid AND c.entity = ".$conf->entity;
 		$this->where .= ' AND c.entity IN ('.getEntity('commande').')';
@@ -106,7 +108,7 @@ class CommandeStats extends Stats
 
         if ($categid)
         {
-            $this->join .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_societe as cats ON cats.fk_soc = c.fk_soc';
+            $this->join .= ' LEFT JOIN '.$this->categ_link.' as cats ON cats.fk_soc = c.fk_soc';
             $this->join .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie as cat ON cat.rowid = cats.fk_categorie';
             $this->where .= ' AND cat.rowid = '.$categid;
         }

From af509742e6a16910f55b9e95e21527dc1726a0b3 Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Tue, 1 Jun 2021 16:34:39 +0200
Subject: [PATCH 0339/1497] Fix #17726 : holliday with advanced perms works

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

diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index bab0655b4c2..97a70782e36 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -163,19 +163,23 @@ if (empty($reshook)) {
 			$description = trim(GETPOST('description', 'restricthtml'));
 
 			// Check that leave is for a user inside the hierarchy or advanced permission for all is set
-			if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->holiday->write))
-				|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->id == $fuserid && empty($user->rights->holiday->write))
-				|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->id != $fuserid && empty($user->rights->holiday->writeall_advance))
-				) {
-				$error++;
-				setEventMessages($langs->trans("NotEnoughPermissions"), null, 'errors');
+			if (empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
+				if (empty($user->rights->holiday->write)) {
+					$error++;
+					setEventMessages($langs->trans("NotEnoughPermissions"), null, 'errors');
+				} elseif (!in_array($fuserid, $childids)) {
+					$error++;
+					setEventMessages($langs->trans("UserNotInHierachy"), null, 'errors');
+					$action = 'create';
+				}
 			} else {
-				if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->holiday->writeall_advance)) {
-					if (!in_array($fuserid, $childids)) {
-						$error++;
-						setEventMessages($langs->trans("UserNotInHierachy"), null, 'errors');
-						$action = 'create';
-					}
+				if (empty($user->rights->holiday->write) && empty($user->rights->holiday->writeall_advance)) {
+					$error++;
+					setEventMessages($langs->trans("NotEnoughPermissions"), null, 'errors');
+				} elseif (empty($user->rights->holiday->writeall_advance) && !in_array($fuserid, $childids)) {
+					$error++;
+					setEventMessages($langs->trans("UserNotInHierachy"), null, 'errors');
+					$action = 'create';
 				}
 			}
 
@@ -1136,7 +1140,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 			}
 
 			// On vérifie si l'utilisateur à le droit de lire cette demande
-			if ($cancreate) {
+			if ($canread) {
 				$head = holiday_prepare_head($object);
 
 				if (($action == 'edit' && $object->statut == Holiday::STATUS_DRAFT) || ($action == 'editvalidator')) {

From 49f4de8728a9acc266a9e436eacfd5f8b0b98a53 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 1 Jun 2021 16:57:55 +0200
Subject: [PATCH 0340/1497] Fix massaction on cron

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

diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index 28fa0287f0c..80371b14889 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -202,7 +202,7 @@ if (empty($reshook)) {
 	$permissiontodelete = $user->rights->cron->delete;
 	$uploaddir = $conf->cron->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
-	if ($permissiontoadd) {
+	if ($massaction && $permissiontoadd) {
 		$tmpcron = new Cronjob($db);
 		foreach ($toselect as $id) {
 			$result = $tmpcron->fetch($id);

From f13388122cc57b6fd9b4a8863f64a51367a51715 Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Tue, 1 Jun 2021 21:43:05 +0200
Subject: [PATCH 0341/1497] Add fetch stock order

---
 htdocs/expedition/card.php                  | 46 +++------------------
 htdocs/product/class/product.class.php      |  2 +
 htdocs/product/class/productbatch.class.php |  8 +++-
 3 files changed, 14 insertions(+), 42 deletions(-)

diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 543a67311f0..ef6c80d20d8 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -1305,11 +1305,6 @@ if ($action == 'create') {
 							// Define nb of lines suggested for this order line
 							$nbofsuggested = 0;
 
-							uasort( $product->stock_warehouse, function ($a, $b) {
-								if ($a->real == $b->real) { return 0; }
-								return ($a->real < $b->real) ? -1 : 1;
-							});
-
 							foreach ($product->stock_warehouse as $warehouse_id => $stock_warehouse) {
 								if ($stock_warehouse->real > 0) {
 									$nbofsuggested++;
@@ -1413,42 +1408,11 @@ if ($action == 'create') {
 							$tmpwarehouseObject = new Entrepot($db);
 							$productlotObject = new Productlot($db);
 
-							uasort( $product->stock_warehouse, function ($a, $b) {
-								if ($a->real == $b->real) { return 0; }
-								return ($a->real < $b->real) ? -1 : 1;
-							});
-
 							// Define nb of lines suggested for this order line
 							$nbofsuggested = 0;
 							foreach ($product->stock_warehouse as $warehouse_id => $stock_warehouse) {
 								if (($stock_warehouse->real > 0) && (count($stock_warehouse->detail_batch))) {
-									foreach ($stock_warehouse->detail_batch as $dbatch) {
-										$nbofsuggested++;
-									}
-
-									// Sort Batch priority
-									uasort($stock_warehouse->detail_batch, function ($a, $b) {
-										$compare = 0;
-										$multiplePow = 0;
-										// The comparison function must return an integer less than, equal to, or greater than zero if the first argument is considered to be respectively less than, equal to, or greater than the second.
-
-										// PRIORITY FOR QTY : Eliminate place with small qty first
-										$multiplePow++;
-										$multiple = pow(10, $multiplePow);
-										$compare += (($a->qty < $b->qty) ? -1 : 1) * $multiple;
-
-										// PRIORITY FOR SELL EXPIRATION DATE
-										$multiplePow++;
-										$multiple = pow(10, $multiplePow);
-										$compare += (($a->sellby < $b->sellby) ? -1 : 1) * $multiple;
-
-										// PRIORITY FOR CONSUMPTION EXPIRATION DATE
-										$multiplePow++;
-										$multiple = pow(10, $multiplePow);
-										$compare += (($a->eatby < $b->eatby) ? -1 : 1) * $multiple;
-
-										return $compare;
-									});
+									$nbofsuggested+=count($stock_warehouse->detail_batch);
 								}
 							}
 
@@ -1478,15 +1442,15 @@ if ($action == 'create') {
 											$deliverableQty = GETPOST($inputName, 'int');
 										}
 
-										$tooltip = '';
+										$tooltipClass = $tooltipTitle = '';
 										if (!empty($alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch][intval($warehouse_id)])) {
-											$tooltip = ' class="classfortooltip" title="'.$langs->trans('StockQuantitiesAlreadyAllocatedOnPreviousLines').' : '.$alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch][intval($warehouse_id)].'" ';
+											$tooltipClass = ' classfortooltip';
+											$tooltipTitle = $langs->trans('StockQuantitiesAlreadyAllocatedOnPreviousLines').' : '.$alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch][intval($warehouse_id)];
 										}
-
 										$alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch][intval($warehouse_id)] = $deliverableQty + $alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch][intval($warehouse_id)];
 
 										print '<!-- subj='.$subj.'/'.$nbofsuggested.' --><tr '.((($subj + 1) == $nbofsuggested) ? $bc[$var] : '').'><td colspan="3"></td><td class="center">';
-										print '<input class="qtyl" name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'_'.$subj.'" type="text" size="4" value="'.$deliverableQty.'">';
+										print '<input class="qtyl '.$tooltipClass.'" title="'.$tooltipTitle.'" name="'.$inputName.'" id="'.$inputName.'" type="text" size="4" value="'.$deliverableQty.'">';
 										print '</td>';
 
 										print '<td class="left">';
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 2ccc5e63c8f..9d8977a2223 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -5147,6 +5147,8 @@ class Product extends CommonObject
 			$sql .= " AND w.statut IN (".$this->db->sanitize(implode(',', $warehouseStatus)).")";
 		}
 
+		$sql .= " ORDER BY ps.reel ".(!empty($conf->global->DO_NOT_TRY_TO_DEFRAGMENT_STOCKS_WAREHOUSE)?'DESC':'ASC'); // Note : qty ASC is important for expedition card, to avoid stock fragmentation;
+
 		dol_syslog(get_class($this)."::load_stock", LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result) {
diff --git a/htdocs/product/class/productbatch.class.php b/htdocs/product/class/productbatch.class.php
index 10704f2f53e..7ac2e43740f 100644
--- a/htdocs/product/class/productbatch.class.php
+++ b/htdocs/product/class/productbatch.class.php
@@ -436,7 +436,7 @@ class Productbatch extends CommonObject
 	 */
 	public static function findAll($db, $fk_product_stock, $with_qty = 0, $fk_product = 0)
 	{
-		global $langs;
+		global $langs, $conf;
 		$ret = array();
 
 		$sql = "SELECT";
@@ -462,6 +462,12 @@ class Productbatch extends CommonObject
 			$sql .= " AND t.qty <> 0";
 		}
 
+		$sql .= " ORDER BY ";
+		// TODO : use product lifo and fifo when product will implement it
+		if ($fk_product > 0) { $sql .= "pl.eatby ASC, pl.sellby ASC, "; }
+		$sql .= "t.eatby ASC, t.sellby ASC ";
+		$sql .= ", t.qty ".(!empty($conf->global->DO_NOT_TRY_TO_DEFRAGMENT_STOCKS_WAREHOUSE)?'DESC':'ASC'); // Note : qty ASC is important for expedition card, to avoid stock fragmentation
+
 		dol_syslog("productbatch::findAll", LOG_DEBUG);
 		$resql = $db->query($sql);
 		if ($resql) {

From b5904e49a023354f435858c7060a1d02cf9d3a07 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Tue, 1 Jun 2021 22:43:43 +0200
Subject: [PATCH 0342/1497] NEW Add field date from/to in customer payment list

---
 htdocs/compta/paiement/list.php | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php
index 1e99cf8676f..eb6d50712c5 100644
--- a/htdocs/compta/paiement/list.php
+++ b/htdocs/compta/paiement/list.php
@@ -56,11 +56,10 @@ $contextpage		= GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'p
 $facid				= GETPOST('facid', 'int');
 $socid				= GETPOST('socid', 'int');
 $userid = GETPOST('userid', 'int');
-$day = GETPOST('day', 'int');
-$month				= GETPOST('month', 'int');
-$year = GETPOST('year', 'int');
 
 $search_ref = GETPOST("search_ref", "alpha");
+$search_date_start	= dol_mktime(0, 0, 0, GETPOST('search_date_startmonth', 'int'), GETPOST('search_date_startday', 'int'), GETPOST('search_date_startyear', 'int'));
+$search_date_end	= dol_mktime(23, 59, 59, GETPOST('search_date_endmonth', 'int'), GETPOST('search_date_endday', 'int'), GETPOST('search_date_endyear', 'int'));
 $search_company		= GETPOST("search_company", 'alpha');
 $search_paymenttype	= GETPOST("search_paymenttype");
 $search_account		= GETPOST("search_account", "int");
@@ -130,14 +129,13 @@ if (empty($reshook)) {
 	// All tests are required to be compatible with all browsers
 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
 		$search_ref = '';
+		$search_date_start = '';
+		$search_date_end = '';
 		$search_account = '';
 		$search_amount = '';
 		$search_paymenttype = '';
 		$search_payment_num = '';
 		$search_company = '';
-		$day = '';
-		$year = '';
-		$month = '';
 		$option = '';
 		$toselect = '';
 		$search_array_options = array();
@@ -211,10 +209,15 @@ if (GETPOST("orphelins", "alpha")) {
 	}
 
 	// Search criteria
-	$sql .= dolSqlDateFilter("p.datep", $day, $month, $year);
 	if ($search_ref) {
 		$sql .= natural_search('p.ref', $search_ref);
 	}
+	if ($search_date_start) {
+		$sql .= " AND p.datep >= '" . $db->idate($search_date_start) . "'";
+	}
+	if ($search_date_end) {
+		$sql .= " AND p.datep <= '" . $db->idate($search_date_end) . "'";
+	}
 	if ($search_account > 0) {
 		$sql .= " AND b.fk_account=".((int) $search_account);
 	}
@@ -275,6 +278,8 @@ if ($limit > 0 && $limit != $conf->liste_limit) {
 }
 $param .= (GETPOST("orphelins") ? "&orphelins=1" : '');
 $param .= ($search_ref ? "&search_ref=".urlencode($search_ref) : '');
+$param .= ($search_date_start ? "&search_date_start=".urlencode($search_date_start) : '');
+$param .= ($search_date_end ? "&search_date_end=".urlencode($search_date_end) : '');
 $param .= ($search_company ? "&search_company=".urlencode($search_company) : '');
 $param .= ($search_amount ? "&search_amount=".urlencode($search_amount) : '');
 $param .= ($search_payment_num ? "&search_payment_num=".urlencode($search_payment_num) : '');
@@ -331,11 +336,14 @@ if (!empty($arrayfields['p.ref']['checked'])) {
 // Filter: Date
 if (!empty($arrayfields['p.datep']['checked'])) {
 	print '<td class="liste_titre center">';
-	if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
-		print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="day" value="'.dol_escape_htmltag($day).'">';
-	}
-	print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="month" value="'.dol_escape_htmltag($month).'">';
-	$formother->select_year($year ? $year : -1, 'year', 1, 20, 5);
+	print '<div class="nowrap">';
+	print $langs->trans('From') . ' ';
+	print $form->selectDate($search_date_start?$search_date_start:-1, 'search_date_start', 0, 0, 1);
+	print '</div>';
+	print '<div class="nowrap">';
+	print $langs->trans('to') . ' ';
+	print $form->selectDate($search_date_end?$search_date_end:-1, 'search_date_end', 0, 0, 1);
+	print '</div>';
 	print '</td>';
 }
 

From 3744ccdd286b8e33968031248884f331cbefd133 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Tue, 1 Jun 2021 22:50:55 +0200
Subject: [PATCH 0343/1497] Look & feel v14

---
 htdocs/compta/paiement/list.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php
index eb6d50712c5..c06f8ee9cb5 100644
--- a/htdocs/compta/paiement/list.php
+++ b/htdocs/compta/paiement/list.php
@@ -337,12 +337,10 @@ if (!empty($arrayfields['p.ref']['checked'])) {
 if (!empty($arrayfields['p.datep']['checked'])) {
 	print '<td class="liste_titre center">';
 	print '<div class="nowrap">';
-	print $langs->trans('From') . ' ';
-	print $form->selectDate($search_date_start?$search_date_start:-1, 'search_date_start', 0, 0, 1);
+	print $form->selectDate($search_date_start ? $search_date_start : -1, 'search_date_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
 	print '</div>';
 	print '<div class="nowrap">';
-	print $langs->trans('to') . ' ';
-	print $form->selectDate($search_date_end?$search_date_end:-1, 'search_date_end', 0, 0, 1);
+	print $form->selectDate($search_date_end ? $search_date_end : -1, 'search_date_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
 	print '</div>';
 	print '</td>';
 }

From c35124f036d75ab99dbf9a2d76abfbe4f24f2d74 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Tue, 1 Jun 2021 23:23:00 +0200
Subject: [PATCH 0344/1497] NEW Add field date from/to in supplier payment list

---
 htdocs/fourn/paiement/list.php | 41 ++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/htdocs/fourn/paiement/list.php b/htdocs/fourn/paiement/list.php
index 6a38ae2033d..6b932ae2019 100644
--- a/htdocs/fourn/paiement/list.php
+++ b/htdocs/fourn/paiement/list.php
@@ -36,6 +36,7 @@
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array('companies', 'bills', 'banks', 'compta'));
@@ -48,9 +49,8 @@ $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 've
 $socid = GETPOST('socid', 'int');
 
 $search_ref				= GETPOST('search_ref', 'alpha');
-$search_day				= GETPOST('search_day', 'int');
-$search_month = GETPOST('search_month', 'int');
-$search_year			= GETPOST('search_year', 'int');
+$search_date_start = dol_mktime(0, 0, 0, GETPOST('search_date_startmonth', 'int'), GETPOST('search_date_startday', 'int'), GETPOST('search_date_startyear', 'int'));
+$search_date_end = dol_mktime(23, 59, 59, GETPOST('search_date_endmonth', 'int'), GETPOST('search_date_endday', 'int'), GETPOST('search_date_endyear', 'int'));
 $search_company = GETPOST('search_company', 'alpha');
 $search_payment_type	= GETPOST('search_payment_type');
 $search_cheque_num = GETPOST('search_cheque_num', 'alpha');
@@ -135,9 +135,8 @@ if (empty($reshook)) {
 
 	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_ref = '';
-		$search_day = '';
-		$search_month = '';
-		$search_year = '';
+		$search_date_start = '';
+		$search_date_end = '';
 		$search_company = '';
 		$search_payment_type = '';
 		$search_cheque_num = '';
@@ -187,7 +186,13 @@ if ($socid > 0) {
 if ($search_ref) {
 	$sql .= natural_search('p.ref', $search_ref);
 }
-$sql .= dolSqlDateFilter('p.datep', $search_day, $search_month, $search_year);
+if ($search_date_start) {
+	$sql .= " AND p.datep >= '" . $db->idate($search_date_start) . "'";
+}
+if ($search_date_end) {
+	$sql .=" AND p.datep <= '" . $db->idate($search_date_end) . "'";
+}
+
 if ($search_company) {
 	$sql .= natural_search('s.nom', $search_company);
 }
@@ -254,14 +259,11 @@ if ($optioncss != '') {
 if ($search_ref) {
 	$param .= '&search_ref='.urlencode($search_ref);
 }
-if ($saerch_day) {
-	$param .= '&search_day='.urlencode($search_day);
+if ($search_date_start) {
+	$param.= '&search_date_start='.urlencode($search_date_start);
 }
-if ($saerch_month) {
-	$param .= '&search_month='.urlencode($search_month);
-}
-if ($search_year) {
-	$param .= '&search_year='.urlencode($search_year);
+if ($search_date_end) {
+	$param.= '&search_date_end='.urlencode($search_date_end);
 }
 if ($search_company) {
 	$param .= '&search_company='.urlencode($search_company);
@@ -336,11 +338,12 @@ if (!empty($arrayfields['p.ref']['checked'])) {
 // Filter: Date
 if (!empty($arrayfields['p.datep']['checked'])) {
 	print '<td class="liste_titre center">';
-	if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
-		print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="search_day" value="'.dol_escape_htmltag($search_day).'">';
-	}
-	print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="search_month" value="'.dol_escape_htmltag($search_month).'">';
-	$formother->select_year($search_year ? $search_year : -1, 'search_year', 1, 20, 5);
+	print '<div class="nowrap">';
+	print $form->selectDate($search_date_start ? $search_date_start : -1, 'search_date_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+	print '</div>';
+	print '<div class="nowrap">';
+	print $form->selectDate($search_date_end ? $search_date_end : -1, 'search_date_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
+	print '</div>';
 	print '</td>';
 }
 

From bda42403b259550a30003cc0053d830dda862cee Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 2 Jun 2021 04:15:21 +0200
Subject: [PATCH 0345/1497] FIX Creation of reception (missing extrafields).
 Lose data if error.

---
 htdocs/reception/card.php | 84 ++++++++++++++++++++++++---------------
 1 file changed, 52 insertions(+), 32 deletions(-)

diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php
index 75f5401d401..493a400c891 100644
--- a/htdocs/reception/card.php
+++ b/htdocs/reception/card.php
@@ -72,7 +72,7 @@ if (!empty($conf->productbatch->enabled)) {
 }
 
 $origin = GETPOST('origin', 'alpha') ?GETPOST('origin', 'alpha') : 'reception'; // Example: commande, propal
-$origin_id = GETPOST('id', 'int') ?GETPOST('id', 'int') : '';
+$origin_id = GETPOST('id', 'int') ? GETPOST('id', 'int') : '';
 $id = $origin_id;
 if (empty($origin_id)) {
 	$origin_id  = GETPOST('origin_id', 'int'); // Id of order or propal
@@ -86,12 +86,12 @@ if (empty($origin_id)) {
 $ref = GETPOST('ref', 'alpha');
 $line_id = GETPOST('lineid', 'int') ?GETPOST('lineid', 'int') : '';
 
-$action		= GETPOST('action', 'alpha');
+$action	= GETPOST('action', 'alpha');
 //Select mail models is same action as presend
 if (GETPOST('modelselected')) {
 	$action = 'presend';
 }
-$confirm	= GETPOST('confirm', 'alpha');
+$confirm = GETPOST('confirm', 'alpha');
 $cancel = GETPOST('cancel', 'alpha');
 
 //PDF
@@ -117,7 +117,6 @@ $permissiondellink = $user->rights->reception->creer; // Used by the include of
 
 $date_delivery = dol_mktime(GETPOST('date_deliveryhour', 'int'), GETPOST('date_deliverymin', 'int'), 0, GETPOST('date_deliverymonth', 'int'), GETPOST('date_deliveryday', 'int'), GETPOST('date_deliveryyear', 'int'));
 
-$object = new Reception($db);
 if ($id > 0 || !empty($ref)) {
 	$object->fetch($id, $ref);
 	$object->fetch_thirdparty();
@@ -725,13 +724,13 @@ if ($action == 'create') {
 			$classname = ucfirst($origin);
 		}
 
-		$object = new $classname($db);
-		if ($object->fetch($origin_id)) {	// This include the fetch_lines
+		$objectsrc = new $classname($db);
+		if ($objectsrc->fetch($origin_id)) {	// This include the fetch_lines
 			$soc = new Societe($db);
-			$soc->fetch($object->socid);
+			$soc->fetch($objectsrc->socid);
 
 			$author = new User($db);
-			$author->fetch($object->user_author_id);
+			$author->fetch($objectsrc->user_author_id);
 
 			if (!empty($conf->stock->enabled)) {
 				$entrepot = new Entrepot($db);
@@ -741,8 +740,7 @@ if ($action == 'create') {
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			print '<input type="hidden" name="action" value="add">';
 			print '<input type="hidden" name="origin" value="'.$origin.'">';
-			print '<input type="hidden" name="origin_id" value="'.$object->id.'">';
-			print '<input type="hidden" name="ref_int" value="'.$object->ref_int.'">';
+			print '<input type="hidden" name="origin_id" value="'.$objectsrc->id.'">';
 			if (GETPOST('entrepot_id', 'int')) {
 				print '<input type="hidden" name="entrepot_id" value="'.GETPOST('entrepot_id', 'int').'">';
 			}
@@ -754,10 +752,10 @@ if ($action == 'create') {
 			// Ref
 			print '<tr><td class="titlefieldcreate fieldrequired">';
 			if ($origin == 'supplierorder' && ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_order->enabled))) {
-				print $langs->trans("RefOrder").'</td><td colspan="3"><a href="'.DOL_URL_ROOT.'/fourn/commande/card.php?id='.$object->id.'">'.img_object($langs->trans("ShowOrder"), 'order').' '.$object->ref;
+				print $langs->trans("RefOrder").'</td><td colspan="3"><a href="'.DOL_URL_ROOT.'/fourn/commande/card.php?id='.$objectsrc->id.'">'.img_object($langs->trans("ShowOrder"), 'order').' '.$objectsrc->ref;
 			}
 			if ($origin == 'propal' && !empty($conf->propal->enabled)) {
-				print $langs->trans("RefProposal").'</td><td colspan="3"><a href="'.DOL_URL_ROOT.'/comm/card.php?id='.$object->id.'">'.img_object($langs->trans("ShowProposal"), 'propal').' '.$object->ref;
+				print $langs->trans("RefProposal").'</td><td colspan="3"><a href="'.DOL_URL_ROOT.'/comm/card.php?id='.$objectsrc->id.'">'.img_object($langs->trans("ShowProposal"), 'propal').' '.$objectsrc->ref;
 			}
 			print '</a></td>';
 			print "</tr>\n";
@@ -770,7 +768,7 @@ if ($action == 'create') {
 				print $langs->trans('RefSupplier');
 			}
 			print '</td><td colspan="3">';
-			print '<input type="text" name="ref_supplier" value="'.$object->ref_supplier.'" />';
+			print '<input type="text" name="ref_supplier" value="'.$objectsrc->ref_supplier.'" />';
 			print '</td>';
 			print '</tr>';
 
@@ -782,8 +780,8 @@ if ($action == 'create') {
 			// Project
 			if (!empty($conf->projet->enabled)) {
 				$projectid = GETPOST('projectid', 'int') ?GETPOST('projectid', 'int') : 0;
-				if (empty($projectid) && !empty($object->fk_project)) {
-					$projectid = $object->fk_project;
+				if (empty($projectid) && !empty($objectsrc->fk_project)) {
+					$projectid = $objectsrc->fk_project;
 				}
 				if ($origin == 'project') {
 					$projectid = ($originid ? $originid : 0);
@@ -802,7 +800,7 @@ if ($action == 'create') {
 			// Date delivery planned
 			print '<tr><td>'.$langs->trans("DateDeliveryPlanned").'</td>';
 			print '<td colspan="3">';
-			$date_delivery = ($date_delivery ? $date_delivery : $object->delivery_date); // $date_delivery comes from GETPOST
+			$date_delivery = ($date_delivery ? $date_delivery : $objectsrc->delivery_date); // $date_delivery comes from GETPOST
 			print $form->selectDate($date_delivery ? $date_delivery : -1, 'date_delivery', 1, 1, 1);
 			print "</td>\n";
 			print '</tr>';
@@ -810,15 +808,15 @@ if ($action == 'create') {
 			// Note Public
 			print '<tr><td>'.$langs->trans("NotePublic").'</td>';
 			print '<td colspan="3">';
-			$doleditor = new DolEditor('note_public', $object->note_public, '', 60, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_3, '90%');
+			$doleditor = new DolEditor('note_public', $objectsrc->note_public, '', 60, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_3, '90%');
 			print $doleditor->Create(1);
 			print "</td></tr>";
 
 			// Note Private
-			if ($object->note_private && !$user->socid) {
+			if ($objectsrc->note_private && !$user->socid) {
 				print '<tr><td>'.$langs->trans("NotePrivate").'</td>';
 				print '<td colspan="3">';
-				$doleditor = new DolEditor('note_private', $object->note_private, '', 60, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_3, '90%');
+				$doleditor = new DolEditor('note_private', $objectsrc->note_private, '', 60, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_3, '90%');
 				print $doleditor->Create(1);
 				print "</td></tr>";
 			}
@@ -861,15 +859,15 @@ if ($action == 'create') {
 
 			// Other attributes
 			$parameters = array('objectsrc' => $objectsrc, 'colspan' => ' colspan="3"', 'cols' => '3', 'socid'=>$socid);
-			$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $recept, $action); // Note that $action and $object may have been modified by hook
+			$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $recept, $action); // Note that $action and $objectsrc may have been modified by hook
 			print $hookmanager->resPrint;
 
-			// Here $object can be of an object Order
+			// Here $object can be of an object Reception
 			$extrafields->fetch_name_optionals_label($object->table_element);
 			if (empty($reshook) && !empty($extrafields->attributes[$object->table_element]['label'])) {
 				// copy from order
-				if ($object->fetch_optionals() > 0) {
-					$recept->array_options = array_merge($recept->array_options, $object->array_options);
+				if ($objectsrc->fetch_optionals() > 0) {
+					$recept->array_options = array_merge($recept->array_options, $objectsrc->array_options);
 				}
 				print $object->showOptionals($extrafields, 'edit', $parameters);
 			}
@@ -877,9 +875,9 @@ if ($action == 'create') {
 			// Incoterms
 			if (!empty($conf->incoterm->enabled)) {
 				print '<tr>';
-				print '<td><label for="incoterm_id">'.$form->textwithpicto($langs->trans("IncotermLabel"), $object->label_incoterms, 1).'</label></td>';
+				print '<td><label for="incoterm_id">'.$form->textwithpicto($langs->trans("IncotermLabel"), $objectsrc->label_incoterms, 1).'</label></td>';
 				print '<td colspan="3" class="maxwidthonsmartphone">';
-				print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''));
+				print $form->select_incoterms((!empty($objectsrc->fk_incoterms) ? $objectsrc->fk_incoterms : ''), (!empty($objectsrc->location_incoterms) ? $objectsrc->location_incoterms : ''));
 				print '</td></tr>';
 			}
 
@@ -898,12 +896,14 @@ if ($action == 'create') {
 
 			print dol_get_fiche_end();
 
-
 			// Reception lines
 			$numAsked = 0;
 			$dispatchLines = array();
 			foreach ($_POST as $key => $value) {
+				// If create form is coming from the button "Create Reception" of previous page
+
 				// without batch module enabled
+				$reg = array();
 				if (preg_match('/^product_([0-9]+)_([0-9]+)$/i', $key, $reg)) {
 					$numAsked++;
 
@@ -934,6 +934,25 @@ if ($action == 'create') {
 					$fk_commandefourndet = 'fk_commandefourndet_'.$reg[1].'_'.$reg[2];
 					$dispatchLines[$numAsked] = array('prod' => GETPOST($prod, 'int'), 'qty' =>GETPOST($qty), 'ent' =>GETPOST($ent, 'int'), 'pu' =>GETPOST($pu), 'comment' =>GETPOST('comment'), 'fk_commandefourndet' => GETPOST($fk_commandefourndet, 'int'), 'DLC'=> $dDLC, 'DLUO'=> $dDLUO, 'lot'=> GETPOST($lot, 'alpha'));
 				}
+
+				// If create form is coming from same page post was sent but an error occured
+				if (preg_match('/^productid([0-9]+)$/i', $key, $reg)) {
+					$numAsked++;
+
+					// eat-by date dispatch
+					// $numline=$reg[2] + 1; // line of product
+					$numline = $numAsked;
+					$prod = 'productid'.$reg[1];
+					$comment = 'comment'.$reg[1];
+					$qty = 'qtyl'.$reg[1];
+					$ent = 'entl'.$reg[1];
+					$pu = 'pul'.$reg[1];
+					$lot = 'batch'.$reg[1];
+					$dDLUO = dol_mktime(12, 0, 0, GETPOST('dluo'.$reg[1].'month', 'int'), GETPOST('dluo'.$reg[1].'day', 'int'), GETPOST('dluo'.$reg[1].'year', 'int'));
+					$dDLC = dol_mktime(12, 0, 0, GETPOST('dlc'.$reg[1].'month', 'int'), GETPOST('dlc'.$reg[1].'day', 'int'), GETPOST('dlc'.$reg[1].'year', 'int'));
+					$fk_commandefourndet = 'fk_commandefournisseurdet'.$reg[1];
+					$dispatchLines[$numAsked] = array('prod' => GETPOST($prod, 'int'), 'qty' =>GETPOST($qty), 'ent' =>GETPOST($ent, 'int'), 'pu' =>GETPOST($pu), 'comment' =>GETPOST($comment), 'fk_commandefourndet' => GETPOST($fk_commandefourndet, 'int'), 'DLC'=> $dDLC, 'DLUO'=> $dDLUO, 'lot'=> GETPOST($lot, 'alpha'));
+				}
 			}
 
 
@@ -961,7 +980,7 @@ if ($action == 'create') {
 			print '<table class="noborder centpercent">';
 
 			// Load receptions already done for same order
-			$object->loadReceptions();
+			$objectsrc->loadReceptions();
 
 			if ($numAsked) {
 				print '<tr class="liste_titre">';
@@ -993,14 +1012,13 @@ if ($action == 'create') {
 			$indiceAsked = 1;
 			while ($indiceAsked <= $numAsked) {
 				$product = new Product($db);
-				foreach ($object->lines as $supplierLine) {
+				foreach ($objectsrc->lines as $supplierLine) {
 					if ($dispatchLines[$indiceAsked]['fk_commandefourndet'] == $supplierLine->id) {
 						$line = $supplierLine;
 						break;
 					}
 				}
 
-
 				// Show product and description
 				$type = $line->product_type ? $line->product_type : $line->fk_product_type;
 				// Try to enhance type detection using date_start and date_end for free lines where type
@@ -1012,7 +1030,7 @@ if ($action == 'create') {
 					$type = 1;
 				}
 
-				print '<!-- line '.$line->rowid.' for product -->'."\n";
+				print '<!-- line fk_commandefourndet='.$line->id.' for product='.$line->fk_product.' -->'."\n";
 				print '<tr class="oddeven">'."\n";
 
 
@@ -1024,6 +1042,7 @@ if ($action == 'create') {
 
 					print '<td>';
 					print '<a name="'.$line->id.'"></a>'; // ancre pour retourner sur la ligne
+					print '<input type="hidden" name="productid'.$indiceAsked.'" value="'.$line->fk_product.'">';
 
 					// Show product and description
 					$product_static->type = $line->fk_product_type;
@@ -1067,7 +1086,7 @@ if ($action == 'create') {
 
 				// Comment
 				//$defaultcomment = 'Line create from order line id '.$line->id;
-				$defaultcomment = '';
+				$defaultcomment = $dispatchLines[$indiceAsked]['comment'];
 				print '<td>';
 				print '<input type="text" class="maxwidth100" name="comment'.$indiceAsked.'" value="'.$defaultcomment.'">';
 				print '</td>';
@@ -1075,13 +1094,14 @@ if ($action == 'create') {
 				// Qty
 				print '<td class="center">'.$line->qty;
 				print '<input type="hidden" name="fk_commandefournisseurdet'.$indiceAsked.'" value="'.$line->id.'">';
+				print '<input type="hidden" name="pul'.$indiceAsked.'" value="'.$line->pu_ht.'">';
 				print '<input name="qtyasked'.$indiceAsked.'" id="qtyasked'.$indiceAsked.'" type="hidden" value="'.$line->qty.'">';
 				print '</td>';
 				$qtyProdCom = $line->qty;
 
 				// Qty already received
 				print '<td class="center">';
-				$quantityDelivered = $object->receptions[$line->id];
+				$quantityDelivered = $objectsrc->receptions[$line->id];
 				print $quantityDelivered;
 				print '<input name="qtydelivered'.$indiceAsked.'" id="qtydelivered'.$indiceAsked.'" type="hidden" value="'.$quantityDelivered.'">';
 				print '</td>';

From 5a260865dc32c90c573c3b2889bbfee0e50d555b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 2 Jun 2021 04:15:21 +0200
Subject: [PATCH 0346/1497] FIX Creation of reception (missing extrafields).
 Lose data if error.

Conflicts:
	htdocs/reception/card.php
---
 htdocs/reception/card.php | 105 ++++++++++++++++++++++----------------
 1 file changed, 60 insertions(+), 45 deletions(-)

diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php
index 18aa08b0d85..8b49f143176 100644
--- a/htdocs/reception/card.php
+++ b/htdocs/reception/card.php
@@ -62,7 +62,7 @@ if (!empty($conf->incoterm->enabled)) $langs->load('incoterm');
 if (!empty($conf->productbatch->enabled)) $langs->load('productbatch');
 
 $origin = GETPOST('origin', 'alpha') ?GETPOST('origin', 'alpha') : 'reception'; // Example: commande, propal
-$origin_id = GETPOST('id', 'int') ?GETPOST('id', 'int') : '';
+$origin_id = GETPOST('id', 'int') ? GETPOST('id', 'int') : '';
 $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
@@ -87,7 +87,7 @@ $action		= GETPOST('action', 'alpha');
 if (GETPOST('modelselected')) {
 	$action = 'presend';
 }
-$confirm	= GETPOST('confirm', 'alpha');
+$confirm = GETPOST('confirm', 'alpha');
 $cancel = GETPOST('cancel', 'alpha');
 
 //PDF
@@ -707,14 +707,13 @@ if ($action == 'create')
 		if ($origin == 'supplierorder')$classname = 'CommandeFournisseur';
 		else $classname = ucfirst($origin);
 
-		$object = new $classname($db);
-		if ($object->fetch($origin_id))	// This include the fetch_lines
-		{
+		$objectsrc = new $classname($db);
+		if ($objectsrc->fetch($origin_id)) {	// This include the fetch_lines
 			$soc = new Societe($db);
-			$soc->fetch($object->socid);
+			$soc->fetch($objectsrc->socid);
 
 			$author = new User($db);
-			$author->fetch($object->user_author_id);
+			$author->fetch($objectsrc->user_author_id);
 
 			if (!empty($conf->stock->enabled)) $entrepot = new Entrepot($db);
 
@@ -722,10 +721,8 @@ if ($action == 'create')
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			print '<input type="hidden" name="action" value="add">';
 			print '<input type="hidden" name="origin" value="'.$origin.'">';
-			print '<input type="hidden" name="origin_id" value="'.$object->id.'">';
-			print '<input type="hidden" name="ref_int" value="'.$object->ref_int.'">';
-			if (GETPOST('entrepot_id', 'int'))
-			{
+			print '<input type="hidden" name="origin_id" value="'.$objectsrc->id.'">';
+			if (GETPOST('entrepot_id', 'int')) {
 				print '<input type="hidden" name="entrepot_id" value="'.GETPOST('entrepot_id', 'int').'">';
 			}
 
@@ -735,13 +732,11 @@ if ($action == 'create')
 
 			// Ref
 			print '<tr><td class="titlefieldcreate fieldrequired">';
-			if ($origin == 'supplierorder' && !empty($conf->fournisseur->enabled))
-			{
-				print $langs->trans("RefOrder").'</td><td colspan="3"><a href="'.DOL_URL_ROOT.'/fourn/commande/card.php?id='.$object->id.'">'.img_object($langs->trans("ShowOrder"), 'order').' '.$object->ref;
+			if ($origin == 'supplierorder' && ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_order->enabled))) {
+				print $langs->trans("RefOrder").'</td><td colspan="3"><a href="'.DOL_URL_ROOT.'/fourn/commande/card.php?id='.$objectsrc->id.'">'.img_object($langs->trans("ShowOrder"), 'order').' '.$objectsrc->ref;
 			}
-			if ($origin == 'propal' && !empty($conf->propal->enabled))
-			{
-				print $langs->trans("RefProposal").'</td><td colspan="3"><a href="'.DOL_URL_ROOT.'/comm/card.php?id='.$object->id.'">'.img_object($langs->trans("ShowProposal"), 'propal').' '.$object->ref;
+			if ($origin == 'propal' && !empty($conf->propal->enabled)) {
+				print $langs->trans("RefProposal").'</td><td colspan="3"><a href="'.DOL_URL_ROOT.'/comm/card.php?id='.$objectsrc->id.'">'.img_object($langs->trans("ShowProposal"), 'propal').' '.$objectsrc->ref;
 			}
 			print '</a></td>';
 			print "</tr>\n";
@@ -751,7 +746,7 @@ if ($action == 'create')
 			if ($origin == 'supplier_order') print $langs->trans('SupplierOrder');
 			else print $langs->trans('RefSupplier');
 			print '</td><td colspan="3">';
-			print '<input type="text" name="ref_supplier" value="'.$object->ref_supplier.'" />';
+			print '<input type="text" name="ref_supplier" value="'.$objectsrc->ref_supplier.'" />';
 			print '</td>';
 			print '</tr>';
 
@@ -764,8 +759,12 @@ if ($action == 'create')
 			if (!empty($conf->projet->enabled))
 			{
 				$projectid = GETPOST('projectid', 'int') ?GETPOST('projectid', 'int') : 0;
-				if (empty($projectid) && !empty($object->fk_project)) $projectid = $object->fk_project;
-				if ($origin == 'project') $projectid = ($originid ? $originid : 0);
+				if (empty($projectid) && !empty($objectsrc->fk_project)) {
+					$projectid = $objectsrc->fk_project;
+				}
+				if ($origin == 'project') {
+					$projectid = ($originid ? $originid : 0);
+				}
 
 				$langs->load("projects");
 				print '<tr>';
@@ -779,7 +778,7 @@ if ($action == 'create')
 			// Date delivery planned
 			print '<tr><td>'.$langs->trans("DateDeliveryPlanned").'</td>';
 			print '<td colspan="3">';
-			$date_delivery = ($date_delivery ? $date_delivery : $object->delivery_date); // $date_delivery comes from GETPOST
+			$date_delivery = ($date_delivery ? $date_delivery : $objectsrc->delivery_date); // $date_delivery comes from GETPOST
 			print $form->selectDate($date_delivery ? $date_delivery : -1, 'date_delivery', 1, 1, 1);
 			print "</td>\n";
 			print '</tr>';
@@ -787,16 +786,15 @@ if ($action == 'create')
 			// Note Public
 			print '<tr><td>'.$langs->trans("NotePublic").'</td>';
 			print '<td colspan="3">';
-			$doleditor = new DolEditor('note_public', $object->note_public, '', 60, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+			$doleditor = new DolEditor('note_public', $objectsrc->note_public, '', 60, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_3, '90%');
 			print $doleditor->Create(1);
 			print "</td></tr>";
 
 			// Note Private
-			if ($object->note_private && !$user->socid)
-			{
+			if ($objectsrc->note_private && !$user->socid) {
 				print '<tr><td>'.$langs->trans("NotePrivate").'</td>';
 				print '<td colspan="3">';
-				$doleditor = new DolEditor('note_private', $object->note_private, '', 60, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+				$doleditor = new DolEditor('note_private', $objectsrc->note_private, '', 60, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_3, '90%');
 				print $doleditor->Create(1);
 				print "</td></tr>";
 			}
@@ -837,15 +835,15 @@ if ($action == 'create')
 
 			// Other attributes
 			$parameters = array('objectsrc' => $objectsrc, 'colspan' => ' colspan="3"', 'cols' => '3', 'socid'=>$socid);
-			$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $recept, $action); // Note that $action and $object may have been modified by hook
+			$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $recept, $action); // Note that $action and $objectsrc may have been modified by hook
 			print $hookmanager->resPrint;
 
-			// Here $object can be of an object Order
+			// Here $object can be of an object Reception
 			$extrafields->fetch_name_optionals_label($object->table_element);
 			if (empty($reshook) && !empty($extrafields->attributes[$object->table_element]['label'])) {
 				// copy from order
-				if ($object->fetch_optionals() > 0) {
-					$recept->array_options = array_merge($recept->array_options, $object->array_options);
+				if ($objectsrc->fetch_optionals() > 0) {
+					$recept->array_options = array_merge($recept->array_options, $objectsrc->array_options);
 				}
 				print $object->showOptionals($extrafields, 'edit', $parameters);
 			}
@@ -854,9 +852,9 @@ if ($action == 'create')
 			if (!empty($conf->incoterm->enabled))
 			{
 				print '<tr>';
-				print '<td><label for="incoterm_id">'.$form->textwithpicto($langs->trans("IncotermLabel"), $object->label_incoterms, 1).'</label></td>';
+				print '<td><label for="incoterm_id">'.$form->textwithpicto($langs->trans("IncotermLabel"), $objectsrc->label_incoterms, 1).'</label></td>';
 				print '<td colspan="3" class="maxwidthonsmartphone">';
-				print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''));
+				print $form->select_incoterms((!empty($objectsrc->fk_incoterms) ? $objectsrc->fk_incoterms : ''), (!empty($objectsrc->location_incoterms) ? $objectsrc->location_incoterms : ''));
 				print '</td></tr>';
 			}
 
@@ -876,15 +874,15 @@ if ($action == 'create')
 
 			print dol_get_fiche_end();
 
-
 			// Reception lines
 			$numAsked = 0;
 			$dispatchLines = array();
-			foreach ($_POST as $key => $value)
-			{
+			foreach ($_POST as $key => $value) {
+				// If create form is coming from the button "Create Reception" of previous page
+
 				// without batch module enabled
-				if (preg_match('/^product_([0-9]+)_([0-9]+)$/i', $key, $reg))
-				{
+				$reg = array();
+				if (preg_match('/^product_([0-9]+)_([0-9]+)$/i', $key, $reg)) {
 					$numAsked++;
 
 					// $numline=$reg[2] + 1; // line of product
@@ -915,6 +913,25 @@ if ($action == 'create')
 					$fk_commandefourndet = 'fk_commandefourndet_'.$reg[1].'_'.$reg[2];
 					$dispatchLines[$numAsked] = array('prod' => GETPOST($prod, 'int'), 'qty' =>GETPOST($qty), 'ent' =>GETPOST($ent, 'int'), 'pu' =>GETPOST($pu), 'comment' =>GETPOST('comment'), 'fk_commandefourndet' => GETPOST($fk_commandefourndet, 'int'), 'DLC'=> $dDLC, 'DLUO'=> $dDLUO, 'lot'=> GETPOST($lot, 'alpha'));
 				}
+
+				// If create form is coming from same page post was sent but an error occured
+				if (preg_match('/^productid([0-9]+)$/i', $key, $reg)) {
+					$numAsked++;
+
+					// eat-by date dispatch
+					// $numline=$reg[2] + 1; // line of product
+					$numline = $numAsked;
+					$prod = 'productid'.$reg[1];
+					$comment = 'comment'.$reg[1];
+					$qty = 'qtyl'.$reg[1];
+					$ent = 'entl'.$reg[1];
+					$pu = 'pul'.$reg[1];
+					$lot = 'batch'.$reg[1];
+					$dDLUO = dol_mktime(12, 0, 0, GETPOST('dluo'.$reg[1].'month', 'int'), GETPOST('dluo'.$reg[1].'day', 'int'), GETPOST('dluo'.$reg[1].'year', 'int'));
+					$dDLC = dol_mktime(12, 0, 0, GETPOST('dlc'.$reg[1].'month', 'int'), GETPOST('dlc'.$reg[1].'day', 'int'), GETPOST('dlc'.$reg[1].'year', 'int'));
+					$fk_commandefourndet = 'fk_commandefournisseurdet'.$reg[1];
+					$dispatchLines[$numAsked] = array('prod' => GETPOST($prod, 'int'), 'qty' =>GETPOST($qty), 'ent' =>GETPOST($ent, 'int'), 'pu' =>GETPOST($pu), 'comment' =>GETPOST($comment), 'fk_commandefourndet' => GETPOST($fk_commandefourndet, 'int'), 'DLC'=> $dDLC, 'DLUO'=> $dDLUO, 'lot'=> GETPOST($lot, 'alpha'));
+				}
 			}
 
 
@@ -944,7 +961,7 @@ if ($action == 'create')
 			print '<table class="noborder centpercent">';
 
 			// Load receptions already done for same order
-			$object->loadReceptions();
+			$objectsrc->loadReceptions();
 
 			if ($numAsked)
 			{
@@ -980,14 +997,13 @@ if ($action == 'create')
 			while ($indiceAsked <= $numAsked)
 			{
 				$product = new Product($db);
-				foreach ($object->lines as $supplierLine) {
+				foreach ($objectsrc->lines as $supplierLine) {
 					if ($dispatchLines[$indiceAsked]['fk_commandefourndet'] == $supplierLine->id) {
 						$line = $supplierLine;
 						break;
 					}
 				}
 
-
 				// Show product and description
 				$type = $line->product_type ? $line->product_type : $line->fk_product_type;
 				// Try to enhance type detection using date_start and date_end for free lines where type
@@ -995,7 +1011,7 @@ if ($action == 'create')
 				if (!empty($line->date_start)) $type = 1;
 				if (!empty($line->date_end)) $type = 1;
 
-				print '<!-- line '.$line->rowid.' for product -->'."\n";
+				print '<!-- line fk_commandefourndet='.$line->id.' for product='.$line->fk_product.' -->'."\n";
 				print '<tr class="oddeven">'."\n";
 
 
@@ -1008,6 +1024,7 @@ if ($action == 'create')
 
 					print '<td>';
 					print '<a name="'.$line->id.'"></a>'; // ancre pour retourner sur la ligne
+					print '<input type="hidden" name="productid'.$indiceAsked.'" value="'.$line->fk_product.'">';
 
 					// Show product and description
 					$product_static->type = $line->fk_product_type;
@@ -1049,17 +1066,15 @@ if ($action == 'create')
 
 				// Qty
 				print '<td class="center">'.$line->qty;
-				print '<input type="hidden" name="fk_commandefournisseurdet'.$indiceAsked.'" value=\''.$line->id.'\' />';
-				print '<textarea style="display:none;"  name="comment'.$indiceAsked.'" >'.$line->desc.'</textarea>';
+				print '<input type="hidden" name="fk_commandefournisseurdet'.$indiceAsked.'" value="'.$line->id.'">';
+				print '<input type="hidden" name="pul'.$indiceAsked.'" value="'.$line->pu_ht.'">';
 				print '<input name="qtyasked'.$indiceAsked.'" id="qtyasked'.$indiceAsked.'" type="hidden" value="'.$line->qty.'">';
 				print '</td>';
 				$qtyProdCom = $line->qty;
 
 				// Qty already received
 				print '<td class="center">';
-
-
-				$quantityDelivered = $object->receptions[$line->id];
+				$quantityDelivered = $objectsrc->receptions[$line->id];
 				print $quantityDelivered;
 				print '<input name="qtydelivered'.$indiceAsked.'" id="qtydelivered'.$indiceAsked.'" type="hidden" value="'.$quantityDelivered.'">';
 				print '</td>';

From 33a4c98dc3b2ecc134fdda48a0ed15a3f1d7a69c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 2 Jun 2021 04:33:35 +0200
Subject: [PATCH 0347/1497] Fix popup

---
 htdocs/reception/card.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php
index 8b49f143176..8a4d5edc611 100644
--- a/htdocs/reception/card.php
+++ b/htdocs/reception/card.php
@@ -1027,10 +1027,7 @@ if ($action == 'create')
 					print '<input type="hidden" name="productid'.$indiceAsked.'" value="'.$line->fk_product.'">';
 
 					// Show product and description
-					$product_static->type = $line->fk_product_type;
-					$product_static->id = $line->fk_product;
-					$product_static->ref = $line->ref;
-					$product_static->status_batch = $line->product_tobatch;
+					$product_static = $product;
 
 					$text = $product_static->getNomUrl(1);
 					$text .= ' - '.(!empty($line->label) ? $line->label : $line->product_label);

From 68579f9cda31df18f0d61789da37c96a06e0d0ef Mon Sep 17 00:00:00 2001
From: Christian Foellmann <christian@foellmann.de>
Date: Wed, 2 Jun 2021 08:17:34 +0200
Subject: [PATCH 0348/1497] fix html linebreak

---
 .../core/triggers/interface_50_modAgenda_ActionsAuto.class.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
index 3c7c8cb6e1c..8e23c258d88 100644
--- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
@@ -552,7 +552,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actionmsg = $langs->transnoentities("OrderRefusedInDolibarr", $object->ref);
 
 			if (!empty($object->refuse_note)) {
-				$object->actionmsg .= '<br />';
+				$object->actionmsg .= '<br>';
 				$object->actionmsg .= $langs->trans("Reason") . ': '.$object->refuse_note;
 			}
 

From 6d049f5c2e018603ec04219fa4586f544952ce60 Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Wed, 2 Jun 2021 09:31:04 +0200
Subject: [PATCH 0349/1497] Fix #17791 : Error when loading chart of accounts

---
 .../mysql/data/llx_accounting_account_es.sql       | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_accounting_account_es.sql b/htdocs/install/mysql/data/llx_accounting_account_es.sql
index b3301de496f..c3d194fab2a 100644
--- a/htdocs/install/mysql/data/llx_accounting_account_es.sql
+++ b/htdocs/install/mysql/data/llx_accounting_account_es.sql
@@ -42,7 +42,7 @@ INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, acc
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 4008, 'PCG08-PYME','CAPIT', '10', '4001', 'CAPITAL', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 4009, 'PCG08-PYME','CAPIT', '100', '4008', 'Capital social', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 4010, 'PCG08-PYME','CAPIT', '101', '4008', 'Fondo social', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 4011, 'PCG08-PYME','CAPIT', 'CAPITAL', '102', '4008', 'Capital', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 4011, 'PCG08-PYME','CAPIT', '102', '4008', 'Capital', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 4012, 'PCG08-PYME','CAPIT', '103', '4008', 'Socios por desembolsos no exigidos', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 4013, 'PCG08-PYME','CAPIT', '1030', '4012', 'Socios por desembolsos no exigidos capital social', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 4014, 'PCG08-PYME','CAPIT', '1034', '4012', 'Socios por desembolsos no exigidos capital pendiente de inscripción', 1);
@@ -291,8 +291,8 @@ INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, acc
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 4257, 'PCG08-PYME','EXISTENCIAS', '394', '4252', 'Deterioro de valor de los productos semiterminados', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 4258, 'PCG08-PYME','EXISTENCIAS', '395', '4252', 'Deterioro de valor de los productos terminados', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 4259, 'PCG08-PYME','EXISTENCIAS', '396', '4252', 'Deterioro de valor de los subproductos, residuos y materiales recuperados', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 4260, 'PCG08-PYME','ACREEDORES_DEUDORES', 'PROVEEDORES', '40', '4004', 'Proveedores', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 4261, 'PCG08-PYME','ACREEDORES_DEUDORES', 'PROVEEDORES', '400', '4260', 'Proveedores', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 4260, 'PCG08-PYME','ACREEDORES_DEUDORES', '40', '4004', 'Proveedores', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 4261, 'PCG08-PYME','ACREEDORES_DEUDORES', '400', '4260', 'Proveedores', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 4262, 'PCG08-PYME','ACREEDORES_DEUDORES', '4000', '4261', 'Proveedores euros', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 4263, 'PCG08-PYME','ACREEDORES_DEUDORES', '4004', '4261', 'Proveedores moneda extranjera', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 4264, 'PCG08-PYME','ACREEDORES_DEUDORES', '4009', '4261', 'Proveedores facturas pendientes de recibir o formalizar', 1);
@@ -314,8 +314,8 @@ INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, acc
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 4280, 'PCG08-PYME','ACREEDORES_DEUDORES', '4109', '4277', 'Acreedores por prestaciones de servicios facturas pendientes de recibir o formalizar', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 4281, 'PCG08-PYME','ACREEDORES_DEUDORES', '411', '4276', 'Acreedores efectos comerciales a pagar', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 4282, 'PCG08-PYME','ACREEDORES_DEUDORES', '419', '4276', 'Acreedores por operaciones en común', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 4283, 'PCG08-PYME','ACREEDORES_DEUDORES', 'CLIENTES', '43', '4004', 'Clientes', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 4284, 'PCG08-PYME','ACREEDORES_DEUDORES', 'CLIENTES', '430', '4283', 'Clientes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 4283, 'PCG08-PYME','ACREEDORES_DEUDORES', '43', '4004', 'Clientes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 4284, 'PCG08-PYME','ACREEDORES_DEUDORES', '430', '4283', 'Clientes', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 4285, 'PCG08-PYME','ACREEDORES_DEUDORES', '4300', '4284', 'Clientes euros', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 4286, 'PCG08-PYME','ACREEDORES_DEUDORES', '4304', '4284', 'Clientes moneda extranjera', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 4287, 'PCG08-PYME','ACREEDORES_DEUDORES', '4309', '4284', 'Clientes facturas pendientes de formalizar', 1);
@@ -501,9 +501,9 @@ INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, acc
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 4467, 'PCG08-PYME','FINAN', '567', '4462', 'Intereses pagados por anticipado', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 4468, 'PCG08-PYME','FINAN', '568', '4462', 'Intereses cobrados a corto plazo', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 4469, 'PCG08-PYME','FINAN', '57', '4005', 'Tesorería', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 4470, 'PCG08-PYME','FINAN', 'CAJA', '570', '4469', 'Caja euros', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 4470, 'PCG08-PYME','FINAN', '570', '4469', 'Caja euros', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 4471, 'PCG08-PYME','FINAN', '571', '4469', 'Caja moneda extranjera', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 4472, 'PCG08-PYME','FINAN', 'BANCOS', '572', '4469', 'Bancos e instituciones de crédito cc vista euros', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 4472, 'PCG08-PYME','FINAN', '572', '4469', 'Bancos e instituciones de crédito cc vista euros', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 4473, 'PCG08-PYME','FINAN', '573', '4469', 'Bancos e instituciones de crédito cc vista moneda extranjera', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 4474, 'PCG08-PYME','FINAN', '574', '4469', 'Bancos e instituciones de crédito cuentas de ahorro euros', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 4475, 'PCG08-PYME','FINAN', '575', '4469', 'Bancos e instituciones de crédito cuentas de ahorro moneda extranjera', 1);

From f875bcfe09be360570096a8b610396a4574a3b09 Mon Sep 17 00:00:00 2001
From: atm-greg <gregory.blemand@atm-consulting.fr>
Date: Wed, 2 Jun 2021 10:30:48 +0200
Subject: [PATCH 0350/1497] update ->nom field if different from ->name

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

diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php
index 20ac35b370f..b271eec5754 100644
--- a/htdocs/user/class/usergroup.class.php
+++ b/htdocs/user/class/usergroup.class.php
@@ -675,7 +675,7 @@ class UserGroup extends CommonObject
 	{
 		global $user, $conf;
 
-		if (empty($this->nom) && !empty($this->name)) {
+		if ((empty($this->nom) || $this->nom != $this->name) && !empty($this->name)) {
 			$this->nom = $this->name;
 		}
 

From 89f6b66c2a8e091163a4bd8ecfe101117acbe2b0 Mon Sep 17 00:00:00 2001
From: Quentin VIAL-GOUTEYRON <quentin.vial-gouteyron@atm-consulting.fr>
Date: Wed, 2 Jun 2021 10:32:30 +0200
Subject: [PATCH 0351/1497] wrong join, request too long

---
 htdocs/compta/stats/cabyprodserv.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/compta/stats/cabyprodserv.php b/htdocs/compta/stats/cabyprodserv.php
index 485a6088338..46908ac6b75 100644
--- a/htdocs/compta/stats/cabyprodserv.php
+++ b/htdocs/compta/stats/cabyprodserv.php
@@ -232,7 +232,7 @@ if ($modecompta == 'CREANCES-DETTES')
 	if ($selected_cat === -2) {	// Without any category
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON p.rowid = cp.fk_product";
 	} elseif ($selected_cat) { 	// Into a specific category
-		$sql .= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."categorie_product as cp";
+		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON (cp.fk_product = p.rowid) INNER JOIN ".MAIN_DB_PREFIX."categorie as c ON (cp.fk_categorie = c.rowid)";
 	}
 	$sql .= " WHERE l.fk_facture = f.rowid";
 	$sql .= " AND f.fk_statut in (1,2)";

From b8b30a9af6f6d3647e862c51e6eedf73698a383b Mon Sep 17 00:00:00 2001
From: Quentin VIAL-GOUTEYRON <quentin.vial-gouteyron@atm-consulting.fr>
Date: Wed, 2 Jun 2021 10:53:04 +0200
Subject: [PATCH 0352/1497] wrong where cabyprodserv

---
 htdocs/compta/stats/cabyprodserv.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/compta/stats/cabyprodserv.php b/htdocs/compta/stats/cabyprodserv.php
index 46908ac6b75..7b8f1101004 100644
--- a/htdocs/compta/stats/cabyprodserv.php
+++ b/htdocs/compta/stats/cabyprodserv.php
@@ -263,11 +263,11 @@ if ($modecompta == 'CREANCES-DETTES')
 			}
 		}
 
-		$sql .= " AND (p.rowid IN ";
-		$sql .= " (SELECT fk_product FROM ".MAIN_DB_PREFIX."categorie_product cp WHERE ";
+		$sql .= " AND ";
+
 		if ($subcat) $sql .= "cp.fk_categorie IN (".$listofcatsql.")";
 		else $sql .= "cp.fk_categorie = ".$selected_cat;
-		$sql .= "))";
+
 	}
 	if ($selected_soc > 0) $sql .= " AND soc.rowid=".$selected_soc;
 	$sql .= " AND f.entity IN (".getEntity('invoice').")";

From de1be814d5ff2cd60c7994579c73962c839872e9 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Wed, 2 Jun 2021 09:23:50 +0000
Subject: [PATCH 0353/1497] Fixing style errors.

---
 htdocs/compta/stats/cabyprodserv.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/compta/stats/cabyprodserv.php b/htdocs/compta/stats/cabyprodserv.php
index 7b8f1101004..3b00832c1a3 100644
--- a/htdocs/compta/stats/cabyprodserv.php
+++ b/htdocs/compta/stats/cabyprodserv.php
@@ -267,7 +267,6 @@ if ($modecompta == 'CREANCES-DETTES')
 
 		if ($subcat) $sql .= "cp.fk_categorie IN (".$listofcatsql.")";
 		else $sql .= "cp.fk_categorie = ".$selected_cat;
-
 	}
 	if ($selected_soc > 0) $sql .= " AND soc.rowid=".$selected_soc;
 	$sql .= " AND f.entity IN (".getEntity('invoice').")";

From 3aca9bdb9e62973d0f3217589c5d6d8384cb7f48 Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Wed, 2 Jun 2021 12:02:27 +0200
Subject: [PATCH 0354/1497] Fix warehouse id

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

diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 264089ac48a..a4597fee291 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -2211,7 +2211,8 @@ if ($action == 'create')
 								// 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>';
+							$entrepot_id = !empty($detail_batch->entrepot_id)?$detail_batch->entrepot_id:$lines[$i]->entrepot_id;
+							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, $entrepot_id).'</td>';
 							print '</tr>';
 						}
 						// add a 0 qty lot row to be able to add a lot

From a4d213a0c9e115c94876f471ad6c751db145957a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 2 Jun 2021 12:29:05 +0200
Subject: [PATCH 0355/1497] Update doc

---
 README-FR.md | 20 ++++++++++++++++----
 README.md    |  5 +++--
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/README-FR.md b/README-FR.md
index 77bb5a3e27a..81fdff13047 100644
--- a/README-FR.md
+++ b/README-FR.md
@@ -8,10 +8,12 @@ Il est simple d'utilisation et modulaire, vous permettant de n'activez que les f
 
 ![ScreenShot](https://www.dolibarr.org/medias/dolibarr_screenshot1_1920x1080.jpg)
 
+
 ## LICENCE
 
 Dolibarr est distribué sous les termes de la licence GNU General Public License v3+ ou supérieure.
 
+
 ## INSTALLER DOLIBARR
 
 ### Configuration simple
@@ -52,6 +54,7 @@ Vous pouvez aussi utiliser un serveur Web et une base de données prise en charg
 
 - Suivez les instructions de l'installateur
 
+
 ## METTRE A JOUR DOLIBARR
 
 Pour mettre à jour Dolibarr depuis une vieille version vers celle ci:
@@ -64,9 +67,11 @@ Pour mettre à jour Dolibarr depuis une vieille version vers celle ci:
 
 *Note: Le processus de migration peut être lancé manuellement et plusieurs fois, sans risque, en appelant la page /install/*
 
+
 ## CE QUI EST NOUVEAU
 
-Voir fichier ChangeLog.
+See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog) file.
+
 
 ## CE QUE DOLIBARR PEUT FAIRE
 
@@ -82,15 +87,17 @@ Voir fichier ChangeLog.
 - Calendrier/Agenda partagé (avec export ical, vcal)
 - Suivi des opportunités et/ou projets (suivi de rentabilité incluant les factures, notes de frais, temps consommé valorisé, ...)
 - Gestion de contrats de services
-- Gestion de stock
+- Gestion de stock et inventaires
 - Gestion des expéditions
 - Gestion des demandes de congès
 - Gestion des notes de frais
+- Gestion de recrutement
 - GED (Gestion Electronique de Documents)
 - EMailings de masse
 - Réalisation de sondages
+- Gestion d'adhérents
 - Point de vente/Caisse enregistreuse
-- …
+- … (près de 100 modules disponibles en standard, près de 1000 autre sur la place de marché d'extensions)
 
 ### Autres modules
 
@@ -135,31 +142,36 @@ Voir fichier ChangeLog.
 
 Dolibarr peut aussi être étendu à volonté avec l'ajout de module/applications externes développées par des développeus tiers, disponible sur [DoliStore](https://www.dolistore.com).
 
+
 ## CE QUE DOLIBARR NE PEUT PAS (ENCORE) FAIRE
 
 Voici un liste de fonctionnalités pas encore gérées par Dolibarr:
 
-- Dolibarr ne contient pas de module de Gestion de la paie.
+- Dolibarr ne contient pas de module de génération de feuille de paie.
 - Les tâches du module de gestion de projets n'ont pas de dépendances entre elle.
 - Dolibarr n'embarque pas de Webmail intégré nativement.
 - Dolibarr ne fait pas le café (pas encore).
 
+
 ## DOCUMENTATION
 
 La documentation utilisateur, développeur et traducteur est disponible sous forme de ressources de la communauté via le site [Wiki](https://wiki.dolibarr.org).
 
+
 ## CONTRIBUER
 
 Ce projet existe grâce à ses nombreux contributeurs [[Contribuer](https://github.com/Dolibarr/dolibarr/blob/develop/.github/CONTRIBUTING.md)].
 
 <a href="https://github.com/Dolibarr/dolibarr/graphs/contributors"><img src="https://opencollective.com/dolibarr/contributors.svg?width=890&button=false" /></a>
 
+
 ## CREDITS
 
 Dolibarr est le résultat du travail de nombreux contributeurs depuis des années et utilise des librairies d'autres contributeurs.
 
 Voir le fichier [COPYRIGHT](https://github.com/Dolibarr/dolibarr/blob/develop/COPYRIGHT)
 
+
 ## ACTUALITES ET RESEAUX SOCIAUX
 
 Suivez le projet Dolibarr project sur les réseaux francophones
diff --git a/README.md b/README.md
index 0a3aeecb9f4..531a19e0be9 100644
--- a/README.md
+++ b/README.md
@@ -104,7 +104,7 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
 - Customer & Supplier Orders management
 - Invoices and payment management
 - Shipping management
-- Warehouse/Stock management
+- Warehouse/Stock management/Inventory
 - Manufacturing Orders
 - Bank accounts management
 - Direct debit orders management (European SEPA)
@@ -117,11 +117,12 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
 - Interventions management
 - Employee's leave requests management
 - Expense reports
+- Recruitment management
 - Timesheets
 - Electronic Document Management (EDM)
 - Foundations members management
 - Point of Sale (POS)
-- …
+- … (around 100 modules available by default, + 1000 on the addon market place)
 
 ### Other application/modules
 

From b5680a91d0cfc7699cd8dffc79f48136f26172ec Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 2 Jun 2021 13:03:20 +0200
Subject: [PATCH 0356/1497] css

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

diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index 693590ff7d2..ba737dfbc62 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -933,13 +933,13 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 	}
 
 	if (!empty($arrayfields['u.office_phone']['checked'])) {
-		print "<td>".dol_print_phone($obj->office_phone, $obj->country_code, 0, $obj->rowid, 'AC_TEL', ' ', 'phone')."</td>\n";
+		print '<td>'.dol_print_phone($obj->office_phone, $obj->country_code, 0, $obj->rowid, 'AC_TEL', ' ', 'phone')."</td>\n";
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
 	}
 	if (!empty($arrayfields['u.user_mobile']['checked'])) {
-		print "<td>".dol_print_phone($obj->user_mobile, $obj->country_code, 0, $obj->rowid, 'AC_TEL', ' ', 'mobile')."</td>\n";
+		print '<td>'.dol_print_phone($obj->user_mobile, $obj->country_code, 0, $obj->rowid, 'AC_TEL', ' ', 'mobile')."</td>\n";
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}

From db5bcd1b99a8bd4e4043d7bb0cb06cb86e9a0d10 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 2 Jun 2021 13:41:08 +0200
Subject: [PATCH 0357/1497] Fix css

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

diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index ba737dfbc62..bd82824cb05 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -992,7 +992,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 
 	// Salary
 	if (!empty($arrayfields['u.salary']['checked'])) {
-		print '<td class="nowraponall right">'.($obj->salary ? price($obj->salary) : '').'</td>';
+		print '<td class="nowraponall right amount">'.($obj->salary ? price($obj->salary) : '').'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}

From 431691cec4a4d4bf879e5366de218adbd6a3b35d Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Wed, 2 Jun 2021 15:18:45 +0200
Subject: [PATCH 0358/1497] Fix propal/index.php error on thirdparty display

---
 htdocs/comm/propal/index.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/htdocs/comm/propal/index.php b/htdocs/comm/propal/index.php
index 359084ddabe..3973071d1f0 100644
--- a/htdocs/comm/propal/index.php
+++ b/htdocs/comm/propal/index.php
@@ -150,7 +150,7 @@ print '<div class="ficheaddleft">';
  */
 
 $sql = "SELECT c.rowid, c.entity, c.ref, c.fk_statut, date_cloture as datec";
-$sql .= ", s.nom as socname, s.rowid as socid, s.canvas, s.client";
+$sql .= ", s.nom as socname, s.rowid as socid, s.canvas, s.client, s.email, s.code_compta";
 $sql .= " FROM ".MAIN_DB_PREFIX."propal as c";
 $sql .= ", ".MAIN_DB_PREFIX."societe as s";
 if (!$user->rights->societe->client->voir && !$socid) {
@@ -185,6 +185,8 @@ if ($resql) {
 			$companystatic->name = $obj->socname;
 			$companystatic->client = $obj->client;
 			$companystatic->canvas = $obj->canvas;
+			$companystatic->email = $obj->email;
+			$companystatic->code_compta = $obj->code_compta;
 
 			$filename = dol_sanitizeFileName($obj->ref);
 			$filedir = $conf->propal->multidir_output[$obj->entity].'/'.dol_sanitizeFileName($obj->ref);
@@ -223,7 +225,7 @@ if ($resql) {
  * Open (validated) proposals
  */
 if (!empty($conf->propal->enabled) && $user->rights->propale->lire) {
-	$sql = "SELECT s.nom as socname, s.rowid as socid, s.canvas, s.client";
+	$sql = "SELECT s.nom as socname, s.rowid as socid, s.canvas, s.client, s.email, s.code_compta";
 	$sql .= ", p.rowid as propalid, p.entity, p.total_ttc, p.total_ht, p.ref, p.fk_statut, p.datep as dp, p.fin_validite as dfv";
 	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 	$sql .= ", ".MAIN_DB_PREFIX."propal as p";
@@ -260,6 +262,8 @@ if (!empty($conf->propal->enabled) && $user->rights->propale->lire) {
 				$companystatic->name = $obj->socname;
 				$companystatic->client = $obj->client;
 				$companystatic->canvas = $obj->canvas;
+				$companystatic->email = $obj->email;
+				$companystatic->code_compta = $obj->code_compta;
 
 				$filename = dol_sanitizeFileName($obj->ref);
 				$filedir = $conf->propal->multidir_output[$obj->entity].'/'.dol_sanitizeFileName($obj->ref);

From da7d821a3e18fa283cf79abe1d6a660c41b131dc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 2 Jun 2021 15:32:39 +0200
Subject: [PATCH 0359/1497] css

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

diff --git a/htdocs/holiday/month_report.php b/htdocs/holiday/month_report.php
index 62991a6e0ee..966dd7e8dee 100644
--- a/htdocs/holiday/month_report.php
+++ b/htdocs/holiday/month_report.php
@@ -413,7 +413,7 @@ if ($num == 0) {
 			print '<td class="right">'.num_open_day($date_start_inmonth, $date_end_inmonth, 0, 1, $halfdayinmonth).'</td>';
 		}
 		if (!empty($arrayfields['cp.description']['checked'])) {
-			print '<td class="maxwidth300">'.dol_escape_htmltag(dolGetFirstLineOfText($obj->description)).'</td>';
+			print '<td class="maxwidth300 small">'.dol_escape_htmltag(dolGetFirstLineOfText($obj->description)).'</td>';
 		}
 
 		print '<td></td>';

From 1468761073884ccc039a2fdbc25e01051712343b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 2 Jun 2021 16:29:38 +0200
Subject: [PATCH 0360/1497] Fix select

---
 htdocs/holiday/month_report.php | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/htdocs/holiday/month_report.php b/htdocs/holiday/month_report.php
index b83d957b27f..922c313840b 100644
--- a/htdocs/holiday/month_report.php
+++ b/htdocs/holiday/month_report.php
@@ -138,13 +138,21 @@ $sql .= " FROM ".MAIN_DB_PREFIX."holiday cp";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user u ON cp.fk_user = u.rowid";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_holiday_types ct ON cp.fk_type = ct.rowid";
 $sql .= " WHERE cp.rowid > 0";
-$sql .= " AND cp.statut = 3"; // 3 = Approved
+$sql .= " AND cp.statut = ".Holiday::STATUS_APPROVED;
 $sql .= " AND (date_format(cp.date_debut, '%Y-%m') = '".$db->escape($year_month)."' OR date_format(cp.date_fin, '%Y-%m') = '".$db->escape($year_month)."')";
 
-if (!empty($search_ref))            $sql .= natural_search('cp.ref', $search_ref);
-if (!empty($search_employee))       $sql .= " AND cp.fk_user = '".$db->escape($search_employee)."'";
-if (!empty($search_type))           $sql .= ' AND cp.fk_type IN ('.$db->escape($search_type).')';
-if (!empty($search_description))    $sql .= natural_search('cp.description', $search_description);
+if (!empty($search_ref)) {
+	$sql .= natural_search('cp.ref', $search_ref);
+}
+if (!empty($search_employee) && $search_employee > 0) {
+	$sql .= " AND cp.fk_user = ".((int) $search_employee);
+}
+if (!empty($search_type) && $search_type != '-1') {
+	$sql .= ' AND cp.fk_type IN ('.$db->escape($search_type).')';
+}
+if (!empty($search_description)) {
+	$sql .= natural_search('cp.description', $search_description);
+}
 
 $sql .= $db->order($sortfield, $sortorder);
 

From 38423ba2600303665faf18626f2a89c0f6e93504 Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Wed, 2 Jun 2021 16:31:31 +0200
Subject: [PATCH 0361/1497] Fix wrong hook context

---
 htdocs/product/stock/stockatdate.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/product/stock/stockatdate.php b/htdocs/product/stock/stockatdate.php
index 91159984a35..8d355e5c1dc 100644
--- a/htdocs/product/stock/stockatdate.php
+++ b/htdocs/product/stock/stockatdate.php
@@ -45,7 +45,7 @@ if ($user->socid) {
 $result = restrictedArea($user, 'produit|service');
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array('stockreplenishlist'));
+$hookmanager->initHooks(array('stockatdate'));
 
 //checks if a product has been ordered
 

From e46faacac1d99c8a82eee26a0bcee616e3347936 Mon Sep 17 00:00:00 2001
From: Nicolas <nicolas@eoxia.com>
Date: Wed, 2 Jun 2021 18:11:47 +0200
Subject: [PATCH 0362/1497] FIX : Add process payment with online link order

---
 htdocs/public/payment/paymentok.php | 101 ++++++++++++++++++++++++++++
 1 file changed, 101 insertions(+)

diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index f4b9f0feb5b..5f8f90ba72b 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -721,6 +721,107 @@ if ($ispaymentok)
 			$postactionmessages[] = 'Invoice paid '.$tmptag['INV'].' was not found';
 			$ispostactionok = -1;
 		}
+	} elseif (array_key_exists('ORD', $tmptag) && $tmptag['ORD'] > 0) {
+		// Record payment
+		include_once DOL_DOCUMENT_ROOT . '/commande/class/commande.class.php';
+		$object = new Commande($db);
+		$result = $object->fetch($tmptag['ORD']);
+		if ($result) {
+			$FinalPaymentAmt = $_SESSION["FinalPaymentAmt"];
+
+			$paymentTypeId = 0;
+			if ($paymentmethod == 'paybox') $paymentTypeId = $conf->global->PAYBOX_PAYMENT_MODE_FOR_PAYMENTS;
+			if ($paymentmethod == 'paypal') $paymentTypeId = $conf->global->PAYPAL_PAYMENT_MODE_FOR_PAYMENTS;
+			if ($paymentmethod == 'stripe') $paymentTypeId = $conf->global->STRIPE_PAYMENT_MODE_FOR_PAYMENTS;
+			if (empty($paymentTypeId)) {
+				$paymentType = $_SESSION["paymentType"];
+				if (empty($paymentType)) $paymentType = 'CB';
+				$paymentTypeId = dol_getIdFromCode($db, $paymentType, 'c_paiement', 'code', 'id', 1);
+			}
+
+			$currencyCodeType = $_SESSION['currencyCodeType'];
+
+			// Do action only if $FinalPaymentAmt is set (session variable is cleaned after this page to avoid duplicate actions when page is POST a second time)
+			if (!empty($FinalPaymentAmt) && $paymentTypeId > 0) {
+				include_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
+				$invoice = new Facture($db);
+				$result = $invoice->createFromOrder($object, $user);
+				if ($result > 0) {
+					$object->classifyBilled($user);
+					$invoice->validate($user);
+					// Creation of payment line
+					include_once DOL_DOCUMENT_ROOT . '/compta/paiement/class/paiement.class.php';
+					$paiement = new Paiement($db);
+					$paiement->datepaye = $now;
+					if ($currencyCodeType == $conf->currency) {
+						$paiement->amounts = array($invoice->id => $FinalPaymentAmt); // Array with all payments dispatching with invoice id
+					} else {
+						$paiement->multicurrency_amounts = array($invoice->id => $FinalPaymentAmt); // Array with all payments dispatching
+
+						$postactionmessages[] = 'Payment was done in a different currency that currency expected of company';
+						$ispostactionok = -1;
+						$error++; // Not yet supported
+					}
+					$paiement->paiementid = $paymentTypeId;
+					$paiement->num_payment = '';
+					$paiement->note_public = 'Online payment ' . dol_print_date($now, 'standard') . ' from ' . $ipaddress;
+					$paiement->ext_payment_id = $TRANSACTIONID;
+					$paiement->ext_payment_site = $service;
+
+					if (!$error) {
+						$paiement_id = $paiement->create($user, 1); // This include closing invoices and regenerating documents
+						if ($paiement_id < 0) {
+							$postactionmessages[] = $paiement->error . ' ' . join("<br>\n", $paiement->errors);
+							$ispostactionok = -1;
+							$error++;
+						} else {
+							$postactionmessages[] = 'Payment created';
+							$ispostactionok = 1;
+						}
+					}
+
+					if (!$error && !empty($conf->banque->enabled)) {
+						$bankaccountid = 0;
+						if ($paymentmethod == 'paybox') $bankaccountid = $conf->global->PAYBOX_BANK_ACCOUNT_FOR_PAYMENTS;
+						elseif ($paymentmethod == 'paypal') $bankaccountid = $conf->global->PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS;
+						elseif ($paymentmethod == 'stripe') $bankaccountid = $conf->global->STRIPE_BANK_ACCOUNT_FOR_PAYMENTS;
+
+						if ($bankaccountid > 0) {
+							$label = '(CustomerInvoicePayment)';
+							if ($object->type == Facture::TYPE_CREDIT_NOTE) $label = '(CustomerInvoicePaymentBack)'; // Refund of a credit note
+							$result = $paiement->addPaymentToBank($user, 'payment', $label, $bankaccountid, '', '');
+							if ($result < 0) {
+								$postactionmessages[] = $paiement->error . ' ' . join("<br>\n", $paiement->errors);
+								$ispostactionok = -1;
+								$error++;
+							} else {
+								$postactionmessages[] = 'Bank transaction of payment created';
+								$ispostactionok = 1;
+							}
+						} else {
+							$postactionmessages[] = 'Setup of bank account to use in module ' . $paymentmethod . ' was not set. No way to record the payment.';
+							$ispostactionok = -1;
+							$error++;
+						}
+					}
+
+					if (!$error) {
+						$db->commit();
+					} else {
+						$db->rollback();
+					}
+				} else {
+					$postactionmessages[] = 'Failed to create invoice form order ' . $tmptag['ORD'] . '.';
+					$ispostactionok = -1;
+				}
+			} else {
+				$postactionmessages[] = 'Failed to get a valid value for "amount paid" (' . $FinalPaymentAmt . ') or "payment type" (' . $paymentType . ') to record the payment of order ' . $tmptag['ORD'] . '. May be payment was already recorded.';
+				$ispostactionok = -1;
+			}
+		} else {
+			$postactionmessages[] = 'Order paid ' . $tmptag['ORD'] . ' was not found';
+			$ispostactionok = -1;
+		}
 	} else {
 		// Nothing done
 	}

From 456356ded7ac9b5271fe3d6b2e63e1fb2e818979 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 2 Jun 2021 18:45:48 +0200
Subject: [PATCH 0363/1497] Fix migration

---
 htdocs/install/mysql/migration/13.0.0-14.0.0.sql | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index c9736e429c4..25a6a6b09e8 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -67,6 +67,13 @@ INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUE
 INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 154, 'SAT/24-2019', 'Catalogo y codigo agrupador fiscal del 2019', 1);
 
 
+UPDATE llx_const set value = __ENCRYPT('eldy')__ WHERE __DECRYPT('value')__ = 'auguria';
+UPDATE llx_const set value = __ENCRYPT('eldy')__ WHERE __DECRYPT('value')__ = 'bureau2crea';
+UPDATE llx_const set value = __ENCRYPT('eldy')__ WHERE __DECRYPT('value')__ = 'amarok';
+UPDATE llx_const set value = __ENCRYPT('eldy')__ WHERE __DECRYPT('value')__ = 'cameleo';
+DELETE FROM llx_user_param where param = 'MAIN_THEME' and value in ('auguria', 'amarok', 'cameleo');
+
+
 -- For v14
 
 ALTER TABLE llx_product_lot ADD COLUMN eol_date datetime NULL;

From ef032f9fa0f27eafaa8007fa7a8c4ed04857811a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 3 Jun 2021 08:33:44 +0200
Subject: [PATCH 0364/1497] fix warning

---
 htdocs/core/lib/project.lib.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index ffa06ebd508..9c33744ceb0 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -2693,6 +2693,7 @@ function getTaskProgressView($task, $label = true, $progressNumber = true, $hide
 
 	// define progress color according to time spend vs workload
 	$progressBarClass = 'progress-bar-info';
+	$progressCalculated = 0;
 	if ($task->planned_workload) {
 		$progressCalculated = round(100 * floatval($task->duration_effective) / floatval($task->planned_workload), 2);
 

From c3d58ad044cbeb5e39979ff5963e624c4ec3b60a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 3 Jun 2021 08:36:50 +0200
Subject: [PATCH 0365/1497] fix warning

---
 htdocs/user/group/list.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/user/group/list.php b/htdocs/user/group/list.php
index edd34dfe9b8..302d697c563 100644
--- a/htdocs/user/group/list.php
+++ b/htdocs/user/group/list.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2004-2018  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2018  Regis Houssin           <regis.houssin@inodbox.com>
  * Copyright (C) 2011       Herve Prot              <herve.prot@symeos.com>
- * Copyright (C) 2019       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2019-2021  Frédéric France         <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -34,6 +34,7 @@ $langs->load("users");
 $sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
 $search_group = GETPOST('search_group');
 $optioncss = GETPOST('optioncss', 'alpha');
+$massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
 
 // Defini si peux lire/modifier utilisateurs et permisssions
 $caneditperms = ($user->admin || $user->rights->user->user->creer);

From aa1ade5224f0925ff5c9b4188b46278edbbe7509 Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Thu, 3 Jun 2021 09:13:48 +0200
Subject: [PATCH 0366/1497] Fix #17791 : fix for SKR03

---
 .../mysql/data/llx_accounting_account_de.sql  | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_accounting_account_de.sql b/htdocs/install/mysql/data/llx_accounting_account_de.sql
index ddb0ab18356..d1b6b00f800 100644
--- a/htdocs/install/mysql/data/llx_accounting_account_de.sql
+++ b/htdocs/install/mysql/data/llx_accounting_account_de.sql
@@ -2725,20 +2725,20 @@ INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, acc
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 3852, 'SKR04', 'Anlagevermögen', 170, 0, 'Geleistete Anzahlungen auf immaterielle Vermögensgegenstände');
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 3853, 'SKR04', 'Anlagevermögen', 179, 0, 'Anzahlungen auf Geschäfts- oder Firmenwert');
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 3854, 'SKR04', 'Anlagevermögen', 200, 0, 'Grundstücke, grundstücksgleiche Rechte und Bauten einschließlich der Bauten auf fremden Grundstück');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 3855, 'SKR04', 'Anlagevermögen', 210, 3854, Grundstücksgleiche Rechte ohne Bauten');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 3856, 'SKR04', 'Anlagevermögen', 215, 3854, Unbebaute Grundstücke');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 3857, 'SKR04', 'Anlagevermögen', 220, 3854, Grundstücksgleiche Rechte (Erbbaurecht, Dauerwohnrecht, unbebaute Grundstücke)');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 3858, 'SKR04', 'Anlagevermögen', 225, 3854, Grundstücke mit Substanzverkehr');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 3859, 'SKR04', 'Anlagevermögen', 229, 3854, Grundstücksanteil des häuslichen Arbeitszimmers');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 3860, 'SKR04', 'Anlagevermögen', 230, 3854, Bauten auf eigenen Grundstücken und grundstücksgleichen Rechten');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 3861, 'SKR04', 'Anlagevermögen', 235, 3854, Grundstückswerte eigener bebauter Grundstücke');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 3862, 'SKR04', 'Anlagevermögen', 240, 3854, Geschäftsbauten');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 3863, 'SKR04', 'Anlagevermögen', 250, 3854, Fabrikbauten');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 3864, 'SKR04', 'Anlagevermögen', 260, 3854, Andere Bauten');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 3865, 'SKR04', 'Anlagevermögen', 270, 3854, Garagen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 3866, 'SKR04', 'Anlagevermögen', 280, 3854, Außenanlagen für Geschäfts-, Fabrik- und andere Bauten');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 3867, 'SKR04', 'Anlagevermögen', 285, 3854, Hof- und Wegbefestigungen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 3868, 'SKR04', 'Anlagevermögen', 290, 3854, Einrichtungen für Geschäfts-. Fabrik- und andere Bauten');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 3855, 'SKR04', 'Anlagevermögen', 210, 3854, 'Grundstücksgleiche Rechte ohne Bauten');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 3856, 'SKR04', 'Anlagevermögen', 215, 3854,'Unbebaute Grundstücke');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 3857, 'SKR04', 'Anlagevermögen', 220, 3854, 'Grundstücksgleiche Rechte (Erbbaurecht, Dauerwohnrecht, unbebaute Grundstücke)');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 3858, 'SKR04', 'Anlagevermögen', 225, 3854, 'Grundstücke mit Substanzverkehr');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 3859, 'SKR04', 'Anlagevermögen', 229, 3854, 'Grundstücksanteil des häuslichen Arbeitszimmers');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 3860, 'SKR04', 'Anlagevermögen', 230, 3854, 'Bauten auf eigenen Grundstücken und grundstücksgleichen Rechten');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 3861, 'SKR04', 'Anlagevermögen', 235, 3854, 'Grundstückswerte eigener bebauter Grundstücke');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 3862, 'SKR04', 'Anlagevermögen', 240, 3854, 'Geschäftsbauten');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 3863, 'SKR04', 'Anlagevermögen', 250, 3854, 'Fabrikbauten');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 3864, 'SKR04', 'Anlagevermögen', 260, 3854, 'Andere Bauten');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 3865, 'SKR04', 'Anlagevermögen', 270, 3854, 'Garagen');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 3866, 'SKR04', 'Anlagevermögen', 280, 3854, 'Außenanlagen für Geschäfts-, Fabrik- und andere Bauten');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 3867, 'SKR04', 'Anlagevermögen', 285, 3854, 'Hof- und Wegbefestigungen');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 3868, 'SKR04', 'Anlagevermögen', 290, 3854, 'Einrichtungen für Geschäfts-. Fabrik- und andere Bauten');
 --INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 3869, 'SKR04', 'Anlagevermögen', 300, 3854, Wohnbauten');
 --INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 3870, 'SKR04', 'Anlagevermögen', 305, 3854, Garagen');
 --INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 3871, 'SKR04', 'Anlagevermögen', 310, 3854, Außenanlagen');

From 583acfbad4c18c8ba748485c584f24678521bed9 Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Thu, 3 Jun 2021 09:29:12 +0200
Subject: [PATCH 0367/1497] Fix #17791 : fix at account

---
 htdocs/accountancy/admin/account.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php
index 6f510ad3706..ba5bb2105d2 100644
--- a/htdocs/accountancy/admin/account.php
+++ b/htdocs/accountancy/admin/account.php
@@ -165,7 +165,7 @@ if (empty($reshook)) {
 				}
 				$offsetforchartofaccount += ($conf->entity * 100000000);
 
-				$result = run_sql($sqlfile, 1, $conf->entity, 1, '', 'default', 32768, 0, $offsetforchartofaccount);
+				$result = run_sql($sqlfile, 0, $conf->entity, 1, '', 'default', 32768, 0, $offsetforchartofaccount);
 
 				if ($result > 0) {
 					setEventMessages($langs->trans("ChartLoaded"), null, 'mesgs');

From 8f7daf7f5719355c7f6a928e637fc45da568eb9e Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Thu, 3 Jun 2021 09:32:58 +0200
Subject: [PATCH 0368/1497] Fix 17791 : fix for at account

---
 htdocs/accountancy/admin/account.php          |   2 +-
 .../mysql/data/llx_accounting_account_at.sql  | 642 +++++++++---------
 2 files changed, 322 insertions(+), 322 deletions(-)

diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php
index ba5bb2105d2..6f510ad3706 100644
--- a/htdocs/accountancy/admin/account.php
+++ b/htdocs/accountancy/admin/account.php
@@ -165,7 +165,7 @@ if (empty($reshook)) {
 				}
 				$offsetforchartofaccount += ($conf->entity * 100000000);
 
-				$result = run_sql($sqlfile, 0, $conf->entity, 1, '', 'default', 32768, 0, $offsetforchartofaccount);
+				$result = run_sql($sqlfile, 1, $conf->entity, 1, '', 'default', 32768, 0, $offsetforchartofaccount);
 
 				if ($result > 0) {
 					setEventMessages($langs->trans("ChartLoaded"), null, 'mesgs');
diff --git a/htdocs/install/mysql/data/llx_accounting_account_at.sql b/htdocs/install/mysql/data/llx_accounting_account_at.sql
index c20d5877dc2..402e6893e6b 100644
--- a/htdocs/install/mysql/data/llx_accounting_account_at.sql
+++ b/htdocs/install/mysql/data/llx_accounting_account_at.sql
@@ -22,324 +22,324 @@
 -- Descriptif des plans comptables autrichiens standard
 -- ADD 4100000 to rowid # Do no remove this comment --
 
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 1, 'AT-BASE','0','GROUP0','110','0','Patentrechte');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 2, 'AT-BASE','0','GROUP0','120','0','Software');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 3, 'AT-BASE','0','GROUP0','121','0','ERP System');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 4, 'AT-BASE','0','GROUP0','122','0','Homepage');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 5, 'AT-BASE','0','GROUP0','125','0','Software Fremdentwicklung_noch nicht aktivieren');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 6, 'AT-BASE','0','GROUP0','160','0','Umgründungsmehrwert');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 7, 'AT-BASE','0','GROUP0','250','0','Mieterinvestitionen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 8, 'AT-BASE','0','GROUP0','400','0','Maschinen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 9, 'AT-BASE','0','GROUP0','600','0','Betriebs u. Geschäftsausstattung');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 10, 'AT-BASE','0','GROUP0','601','0','Ausstellungsstücke');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 11, 'AT-BASE','0','GROUP0','602','0','Leihstellungsstücke');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 12, 'AT-BASE','0','GROUP0','603','0','Getriebeprüfstand_hinten');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 13, 'AT-BASE','0','GROUP0','604','0','Wuchtstand_links_AQ');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 14, 'AT-BASE','0','GROUP0','605','0','Messlabor(Messraum)');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 15, 'AT-BASE','0','GROUP0','606','0','PAK-System');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 16, 'AT-BASE','0','GROUP0','607','0','Server');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 17, 'AT-BASE','0','GROUP0','608','0','EDV-Ausstattung (Hardware)');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 18, 'AT-BASE','0','GROUP0','609','0','Werkstattausstattung (Werkzeug)');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 19, 'AT-BASE','0','GROUP0','610','0','Wuchtprüfstand neu_noch nicht in Betrieb genommen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 20, 'AT-BASE','0','GROUP0','611','0','Messequipment/Ausstattung');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 21, 'AT-BASE','0','GROUP0','630','0','PKW');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 22, 'AT-BASE','0','GROUP0','640','0','LKW');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 23, 'AT-BASE','0','GROUP0','680','0','GWG-Geschäftsausstattung');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 24, 'AT-BASE','0','GROUP0','710','0','Anlagen in Bau');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 25, 'AT-BASE','1','GROUP1','1100','0','Rohstoffe');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 26, 'AT-BASE','1','GROUP1','1200','0','Bezogenen Teile');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 27, 'AT-BASE','1','GROUP1','1300','0','Hilfsstoffe und Betriebsstoffe');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 28, 'AT-BASE','1','GROUP1','1400','0','fertige Erzeugnisse');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 29, 'AT-BASE','1','GROUP1','1500','0','unfertige Erzeugnisse');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 30, 'AT-BASE','1','GROUP1','1600','0','Waren');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 31, 'AT-BASE','1','GROUP1','1700','0','Noch nicht abrechenbare Leist.');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 32, 'AT-BASE','1','GROUP1','1701','0','Bestandsveränderung laufend');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 33, 'AT-BASE','1','GROUP1','1800','0','Vorrat Verpackungsmaterial');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 34, 'AT-BASE','1','GROUP1','1810','0','Vorrat Werbematerial');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 35, 'AT-BASE','2','GROUP2','2000','0','Lieferforderungen Inland I');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 36, 'AT-BASE','2','GROUP2','2080','0','Einzelwertb. Ford. Inland');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 37, 'AT-BASE','2','GROUP2','2292','0','geleistete Anzahlungen (20%)');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 38, 'AT-BASE','2','GROUP2','2293','0','gel. Anzahlungen i.g.');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 39, 'AT-BASE','2','GROUP2','2301','0','Forderung Forschungsprämie');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 40, 'AT-BASE','2','GROUP2','2302','0','Forderungen gelieferte (noch nicht fakturierte Waren)');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 41, 'AT-BASE','2','GROUP2','2303','0','Vorauszahlung Leasing Server');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 42, 'AT-BASE','2','GROUP2','2306','0','Kaution Pfauengarten');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 43, 'AT-BASE','2','GROUP2','2307','0','Kaution Werkstatt');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 44, 'AT-BASE','2','GROUP2','2308','0','Kaution Parkplatz PKW');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 45, 'AT-BASE','2','GROUP2','2309','0','Kaution Werkstatt');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 46, 'AT-BASE','2','GROUP2','2310','0','Kaution Studentenwohnheim');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 47, 'AT-BASE','2','GROUP2','2311','0','Kaution China');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 48, 'AT-BASE','2','GROUP2','2312','0','Vorauszahlung Xerox');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 49, 'AT-BASE','2','GROUP2','2313','0','Verrechnung Bildungsscheck');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 50, 'AT-BASE','2','GROUP2','2315','0','Aktivierung Körperschaftsteuer');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 51, 'AT-BASE','2','GROUP2','2500','0','Vorsteuer');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 52, 'AT-BASE','2','GROUP2','2501','0','Vorsteuer aus i. g. Erwerb');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 53, 'AT-BASE','2','GROUP2','2502','0','Vorsteuer reverse charge syst.');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 54, 'AT-BASE','2','GROUP2','2503','0','Vorsteuer Reverse Charge § 19/1d');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 55, 'AT-BASE','2','GROUP2','2508','0','Vorsteuer sonstige Leistungen EU');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 56, 'AT-BASE','2','GROUP2','2509','0','EUSt Forderung');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 57, 'AT-BASE','2','GROUP2','2510','0','Einfuhrumsatzsteuer');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 58, 'AT-BASE','2','GROUP2','2531','0','Vorsteuer Frankreich');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 59, 'AT-BASE','2','GROUP2','2532','0','Vorsteuer Niederlande');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 60, 'AT-BASE','2','GROUP2','2533','0','Vorsteuer GB');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 61, 'AT-BASE','2','GROUP2','2534','0','Vorsteuer Belgien');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 62, 'AT-BASE','2','GROUP2','2535','0','Vorsteuer GB');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 63, 'AT-BASE','2','GROUP2','2901','0','Leasingvorauszahlung Vito');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 64, 'AT-BASE','3','GROUP3','3020','0','Rückstellung für Körperschaftsteuer');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 65, 'AT-BASE','3','GROUP3','3060','0','Rst. für Beratungskosten');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 66, 'AT-BASE','3','GROUP3','3064','0','Rst. für Sonderzahlungen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 67, 'AT-BASE','3','GROUP3','3072','0','Rst. für nicht konsum. Urlaube');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 68, 'AT-BASE','3','GROUP3','3214','0','Raika 40-00.800.185');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 69, 'AT-BASE','3','GROUP3','3286','0','Darlehen Dipl. Ing. REICH GMBH');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 70, 'AT-BASE','3','GROUP3','3287','0','Darlehen Dr.Höfler');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 71, 'AT-BASE','3','GROUP3','3288','0','Darlehen DI Mayrhofer');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 72, 'AT-BASE','3','GROUP3','3289','0','Darlehen AWS');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 73, 'AT-BASE','3','GROUP3','3292','0','Anzahlungen von Kunden 20 %');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 74, 'AT-BASE','3','GROUP3','3294','0','Anzahlungen von Kunden Drittland');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 75, 'AT-BASE','3','GROUP3','3300','0','Lieferverbindlichkeiten I');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 76, 'AT-BASE','3','GROUP3','3481','0','Verrechnungskto DI Mayrhofer');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 77, 'AT-BASE','3','GROUP3','3500','0','Umsatzsteuer');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 78, 'AT-BASE','3','GROUP3','3501','0','Umsatzsteuer aus i. g. Erwerb');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 79, 'AT-BASE','3','GROUP3','3502','0','USt § 19/Art 19 (reverse Charge)');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 80, 'AT-BASE','3','GROUP3','3503','0','Umsatzsteuer Reverse Charge § 19/1d');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 81, 'AT-BASE','3','GROUP3','3508','0','Umsatzsteuer sonstige Leistung');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 82, 'AT-BASE','3','GROUP3','3531','0','FA-Zahllast Dezember');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 83, 'AT-BASE','3','GROUP3','3533','0','Umsatzsteuer 2012');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 84, 'AT-BASE','3','GROUP3','3535','0','Umsatzsteuer 2013');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 85, 'AT-BASE','3','GROUP3','3536','0','Umsatzsteuer 2014');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 86, 'AT-BASE','3','GROUP3','3537','0','Umsatzsteuer 2015');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 87, 'AT-BASE','3','GROUP3','3632','0','Verrechnungskonto EUSt');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 88, 'AT-BASE','3','GROUP3','3892','0','Verbindlichkeiten Anzahlungsrechn.');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 89, 'AT-BASE','3','GROUP3','3898','0','Abgrenzung Sonderzahlungen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 90, 'AT-BASE','4','GROUP4','4000','0','Erlöse Lieferungen 20 %');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 91, 'AT-BASE','4','GROUP4','4001','0','Erlöse i.g. Lieferung');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 92, 'AT-BASE','4','GROUP4','4002','0','Erlöse Dienstleistungen EU');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 93, 'AT-BASE','4','GROUP4','4003','0','Erlöse Dienstleistungen 20 %');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 94, 'AT-BASE','4','GROUP4','4004','0','Erlöse Software 20 %');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 95, 'AT-BASE','4','GROUP4','4005','0','Erlöse Software EU');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 96, 'AT-BASE','4','GROUP4','4006','0','Evidenz Kfd. Reverse Charge');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 97, 'AT-BASE','4','GROUP4','4050','0','Erlöse 0 % Drittland');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 98, 'AT-BASE','4','GROUP4','4051','0','Erlöse Dienstleistungen Drittland');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 99, 'AT-BASE','4','GROUP4','4052','0','Erlöse Software Drittland');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 100, 'AT-BASE','4','GROUP4','4069','0','Erlöse § 19/1d Schrott');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 101, 'AT-BASE','4','GROUP4','4400','0','Kundenskonto 20 %');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 102, 'AT-BASE','4','GROUP4','4405','0','Kundenskonto 0 % Ausfuhrlieferungen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 103, 'AT-BASE','4','GROUP4','4410','0','Skontoaufwand i.g. Lieferung');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 104, 'AT-BASE','4','GROUP4','4413','0','Kundenskonto sonstige Leistung EU');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 105, 'AT-BASE','4','GROUP4','4420','0','Kundenskonto EU-Land A x %');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 106, 'AT-BASE','4','GROUP4','4450','0','Kundenrabatt 20%');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 107, 'AT-BASE','4','GROUP4','4500','0','Bestandsveränderungen fertige Erzeugnisse');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 108, 'AT-BASE','4','GROUP4','4510','0','Best.Veränd.Halbf.Erzeugnisse');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 109, 'AT-BASE','4','GROUP4','4519','0','Bestandsveränderung laufend');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 110, 'AT-BASE','4','GROUP4','4520','0','Best.Veränd.n.n.abger.Leist.');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 111, 'AT-BASE','4','GROUP4','4530','0','Gelieferte (noch nicht fakturierte Waren)');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 112, 'AT-BASE','4','GROUP4','4580','0','Aktivierte Eigenleistung');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 113, 'AT-BASE','4','GROUP4','4630','0','Erträge aus d.Abgang v.Anlagen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 114, 'AT-BASE','4','GROUP4','4801','0','Zuwendungen a.öffentl. Mitteln');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 115, 'AT-BASE','4','GROUP4','4831','0','sonstige betriebliche Erträge (nicht steuerbar)');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 116, 'AT-BASE','4','GROUP4','4840','0','Sonstige Erlöse 20 %');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 117, 'AT-BASE','4','GROUP4','4850','0','Erl. Aufwandersätze');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 118, 'AT-BASE','4','GROUP4','4881','0','Versicherungsvergütungen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 119, 'AT-BASE','4','GROUP4','4885','0','Zuschreibungen zum Umlaufvermögen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 120, 'AT-BASE','4','GROUP4','4950','0','Privatanteil 20 %');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 121, 'AT-BASE','4','GROUP4','4991','0','Sachbezüge 20%');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 122, 'AT-BASE','5','GROUP5','5000','0','Handelswareneinsatz');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 123, 'AT-BASE','5','GROUP5','5001','0','Materialeinkauf Fremdfertigung');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 124, 'AT-BASE','5','GROUP5','5002','0','Wareneinkauf Verkauf');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 125, 'AT-BASE','5','GROUP5','5020','0','Materialeinkauf');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 126, 'AT-BASE','5','GROUP5','5090','0','Bezugskosten');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 127, 'AT-BASE','5','GROUP5','5100','0','Verbrauch Rohstoffe');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 128, 'AT-BASE','5','GROUP5','5199','0','Aufwand für TW-AFA Vorräte');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 129, 'AT-BASE','5','GROUP5','5200','0','Verbrauch bezogenen Teile');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 130, 'AT-BASE','5','GROUP5','5300','0','Verbrauch Hilfsstoffe');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 131, 'AT-BASE','5','GROUP5','5400','0','Hilfsstoffverbrauch');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 132, 'AT-BASE','5','GROUP5','5440','0','Inventurveränderung Fremdbarb. + GK');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 133, 'AT-BASE','5','GROUP5','5441','0','GWG Fremdbarb. + GK');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 134, 'AT-BASE','5','GROUP5','5450','0','Verpackungsmaterial');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 135, 'AT-BASE','5','GROUP5','5800','0','Fremdleistungen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 136, 'AT-BASE','5','GROUP5','5880','0','Lieferantenskonti');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 137, 'AT-BASE','5','GROUP5','5900','0','Skontoertrag ig.E. 0% (m.VST)');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 138, 'AT-BASE','5','GROUP5','5920','0','Skontoertrag ig.E. 20% (m.VST)');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 139, 'AT-BASE','6','GROUP6','6000','0','Löhne');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 140, 'AT-BASE','6','GROUP6','6001','0','Rückerstattung AUVA Arbeiter');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 141, 'AT-BASE','6','GROUP6','6010','0','Lehrlingsentschädigung Arb.');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 142, 'AT-BASE','6','GROUP6','6020','0','Nichtleistungslöhne');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 143, 'AT-BASE','6','GROUP6','6100','0','Leihpersonal Aufwand');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 144, 'AT-BASE','6','GROUP6','6150','0','Sonderzahlungen Arbeiter');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 145, 'AT-BASE','6','GROUP6','6200','0','Gehälter');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 146, 'AT-BASE','6','GROUP6','6201','0','Förderung AMS');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 147, 'AT-BASE','6','GROUP6','6202','0','Rückerstattung AUVA Angestellte');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 148, 'AT-BASE','6','GROUP6','6210','0','Veränderung Mehrarbeitsvergütung RSt Ang');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 149, 'AT-BASE','6','GROUP6','6211','0','Veränderung Mehrarbeitsvergütung RSt Arbeiter');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 150, 'AT-BASE','6','GROUP6','6230','0','Sonderzahlungen Angestellte');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 151, 'AT-BASE','6','GROUP6','6231','0','Dotierung RST Sonderzahlungen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 152, 'AT-BASE','6','GROUP6','6255','0','Geschäftsführerbezüge');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 153, 'AT-BASE','6','GROUP6','6256','0','Geschäftsführersachbezüge');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 154, 'AT-BASE','6','GROUP6','6300','0','Sonderzahlung aliquot vorläufig');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 155, 'AT-BASE','6','GROUP6','6310','0','Dotierung Urlaubsrückstellung');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 156, 'AT-BASE','6','GROUP6','6311','0','Veränderung Urlaubsrückstellung Arbeiter');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 157, 'AT-BASE','6','GROUP6','6402','0','Betriebliche Vorsorgekassa Arbeiter');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 158, 'AT-BASE','6','GROUP6','6407','0','Betriebliche Vorsorgekassa Angestellte');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 159, 'AT-BASE','6','GROUP6','6416','0','Veränderung Pensionsrückstellung (Angestellte)');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 160, 'AT-BASE','6','GROUP6','6435','0','sonstige Beiträge für die Altersversorgung');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 161, 'AT-BASE','6','GROUP6','6500','0','Gesetzlicher Sozialaufwand');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 162, 'AT-BASE','6','GROUP6','6600','0','Gesetzlicher Sozialaufwand Arbeiter');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 163, 'AT-BASE','6','GROUP6','6605','0','Gesetzlicher Sozialaufwand Angestellte');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 164, 'AT-BASE','6','GROUP6','6610','0','Dienstgeberbeitrag Arbeiter');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 165, 'AT-BASE','6','GROUP6','6611','0','Dienstgeberbeitrag Angestellte');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 166, 'AT-BASE','6','GROUP6','6620','0','Zuschlag zum DB');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 167, 'AT-BASE','6','GROUP6','6621','0','Zuschlag zum DB Angestellte');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 168, 'AT-BASE','6','GROUP6','6630','0','Ausgleichstaxe');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 169, 'AT-BASE','6','GROUP6','6690','0','Lohnsteuer');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 170, 'AT-BASE','6','GROUP6','6693','0','Kommunalsteuer Arbeiter');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 171, 'AT-BASE','6','GROUP6','6694','0','Kommunalsteuer Angestellte');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 172, 'AT-BASE','6','GROUP6','6700','0','Freiwilliger Sozialaufwand');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 173, 'AT-BASE','6','GROUP6','6710','0','Arbeitskleidung');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 174, 'AT-BASE','6','GROUP6','6720','0','Fahrspesen Dienstnehmer');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 175, 'AT-BASE','6','GROUP6','6730','0','Weihnachtsgeschenke Arbeitnehmer');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 176, 'AT-BASE','6','GROUP6','6740','0','Betriebsveranstaltungen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 177, 'AT-BASE','6','GROUP6','6750','0','Konto frei');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 178, 'AT-BASE','6','GROUP6','6760','0','Vergleichszahlung Dienstnehmer');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 179, 'AT-BASE','7','GROUP7','7030','0','Abschreibung  G W G');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 180, 'AT-BASE','7','GROUP7','7070','0','Buchwert ausgeschiedener Anlagen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 181, 'AT-BASE','7','GROUP7','7080','0','Planmäßige AFA immat.WG.');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 182, 'AT-BASE','7','GROUP7','7081','0','Planmäßige Abschreibung für Sachanlagen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 183, 'AT-BASE','7','GROUP7','7100','0','Nicht abzugsfähige Vorsteuer (VStK)');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 184, 'AT-BASE','7','GROUP7','7110','0','Gebühren und Abgaben_Zoll');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 185, 'AT-BASE','7','GROUP7','7111','0','Kammerumlage');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 186, 'AT-BASE','7','GROUP7','7200','0','Instandhaltung Gebäude');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 187, 'AT-BASE','7','GROUP7','7201','0','Instandhaltung Außenanlagen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 188, 'AT-BASE','7','GROUP7','7202','0','Instandh. - Maschinen u. Anl.');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 189, 'AT-BASE','7','GROUP7','7204','0','Instandhaltung und Betriebskosten Betriebs und Geschäftsgebäude');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 190, 'AT-BASE','7','GROUP7','7205','0','Verbrauchsmaterial Werkstatt');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 191, 'AT-BASE','7','GROUP7','7210','0','Müllentsorgung');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 192, 'AT-BASE','7','GROUP7','7211','0','Entsorgungskosten');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 193, 'AT-BASE','7','GROUP7','7230','0','Reinigungsmaterial (div. Verbrauchsmaterial)');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 194, 'AT-BASE','7','GROUP7','7231','0','Berufsbekleidung');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 195, 'AT-BASE','7','GROUP7','7235','0','Reinigung durch Dritte');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 196, 'AT-BASE','7','GROUP7','7240','0','LKW-Betriebskosten Vito G 437 MB');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 197, 'AT-BASE','7','GROUP7','7241','0','Leasing Mercedes Vito G 437 MB');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 198, 'AT-BASE','7','GROUP7','7250','0','KFZ Betriebskosten allgemein');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 199, 'AT-BASE','7','GROUP7','7251','0','KFZ Leasing allgemein');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 200, 'AT-BASE','7','GROUP7','7252','0','KFZ Versicherungen allgemein');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 201, 'AT-BASE','7','GROUP7','7253','0','Wachdienst');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 202, 'AT-BASE','7','GROUP7','7254','0','Konto frei');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 203, 'AT-BASE','7','GROUP7','7255','0','Aufwand Leihwagen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 204, 'AT-BASE','7','GROUP7','7256','0','PKW-Betriebskosten VW Golf G 854 SH Versuchsfahrzeug');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 205, 'AT-BASE','7','GROUP7','7257','0','Leasing VW Golf G 854 SH');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 206, 'AT-BASE','7','GROUP7','7258','0','Konto frei');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 207, 'AT-BASE','7','GROUP7','7285','0','Strom');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 208, 'AT-BASE','7','GROUP7','7286','0','Betriebskosten/Beheizung Mietobjekte');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 209, 'AT-BASE','7','GROUP7','7300','0','Transporte durch Dritte');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 210, 'AT-BASE','7','GROUP7','7330','0','Reise und Fahrtspesen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 211, 'AT-BASE','7','GROUP7','7331','0','Kilometergelder');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 212, 'AT-BASE','7','GROUP7','7360','0','Reisediäten');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 213, 'AT-BASE','7','GROUP7','7380','0','Telefon');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 214, 'AT-BASE','7','GROUP7','7381','0','Internet');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 215, 'AT-BASE','7','GROUP7','7382','0','Wartung Homepage');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 216, 'AT-BASE','7','GROUP7','7390','0','Postgebühren');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 217, 'AT-BASE','7','GROUP7','7400','0','Konto frei');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 218, 'AT-BASE','7','GROUP7','7401','0','Konto frei');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 219, 'AT-BASE','7','GROUP7','7402','0','Konto frei');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 220, 'AT-BASE','7','GROUP7','7403','0','Miete Büro Linz');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 221, 'AT-BASE','7','GROUP7','7404','0','Miete Gradnerstraße');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 222, 'AT-BASE','7','GROUP7','7410','0','Maschinen u. Gerätemieten');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 223, 'AT-BASE','7','GROUP7','7411','0','Wartungskosten BuG Ausstattung');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 224, 'AT-BASE','7','GROUP7','7420','0','Mobilien-Leasing ');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 225, 'AT-BASE','7','GROUP7','7421','0','Konto frei');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 226, 'AT-BASE','7','GROUP7','7422','0','Leasing Server');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 227, 'AT-BASE','7','GROUP7','7423','0','Konto frei');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 228, 'AT-BASE','7','GROUP7','7424','0','Konto frei');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 229, 'AT-BASE','7','GROUP7','7480','0','Lizenzgebühren');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 230, 'AT-BASE','7','GROUP7','7540','0','Provisionen an Dritte');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 231, 'AT-BASE','7','GROUP7','7600','0','Büromaterial');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 232, 'AT-BASE','7','GROUP7','7601','0','EDV-Material');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 233, 'AT-BASE','7','GROUP7','7610','0','Drucksorten');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 234, 'AT-BASE','7','GROUP7','7620','0','Fachliteratur und Zeitungen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 235, 'AT-BASE','7','GROUP7','7630','0','Gästeunt. u. Zeitschriften');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 236, 'AT-BASE','7','GROUP7','7650','0','Werbeaufwand/Inserate');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 237, 'AT-BASE','7','GROUP7','7651','0','Anbahnung');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 238, 'AT-BASE','7','GROUP7','7652','0','Aufwand Messen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 239, 'AT-BASE','7','GROUP7','7653','0','Konto frei');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 240, 'AT-BASE','7','GROUP7','7654','0','Inserate');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 241, 'AT-BASE','7','GROUP7','7670','0','Bewirtungskosten');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 242, 'AT-BASE','7','GROUP7','7690','0','Trinkgelder u. Spenden');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 243, 'AT-BASE','7','GROUP7','7691','0','Spenden an begünstigte Institutionen/Sponsoring');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 244, 'AT-BASE','7','GROUP7','7696','0','Säumnis- und Verspätungszuschläge');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 245, 'AT-BASE','7','GROUP7','7700','0','Betriebsversicherungen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 246, 'AT-BASE','7','GROUP7','7701','0','Transportversicherungen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 247, 'AT-BASE','7','GROUP7','7710','0','Pflichtversich. Unternehmer');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 248, 'AT-BASE','7','GROUP7','7749','0','Aufwand Japan');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 249, 'AT-BASE','7','GROUP7','7750','0','Steuerberatung (Lohnverrechnung, Buchhaltung)');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 250, 'AT-BASE','7','GROUP7','7751','0','Patentkosten');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 251, 'AT-BASE','7','GROUP7','7752','0','Rechtsberatung');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 252, 'AT-BASE','7','GROUP7','7753','0','Unternehmensberatung');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 253, 'AT-BASE','7','GROUP7','7754','0','Aufwand tectos China');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 254, 'AT-BASE','7','GROUP7','7755','0','Wartung (Betreuung EDV)');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 255, 'AT-BASE','7','GROUP7','7756','0','Lizenzgebühren Abaqus');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 256, 'AT-BASE','7','GROUP7','7757','0','Lizenzgebühren Sonstige');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 257, 'AT-BASE','7','GROUP7','7758','0','Sonstige Beratungskosten');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 258, 'AT-BASE','7','GROUP7','7759','0','EDV-Beratung');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 259, 'AT-BASE','7','GROUP7','7760','0','Mitgliedsbeiträge/freiwillige Beiträge');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 260, 'AT-BASE','7','GROUP7','7761','0','Prüfung Jahresabschluss');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 261, 'AT-BASE','7','GROUP7','7770','0','Aus- und Fortbildung');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 262, 'AT-BASE','7','GROUP7','7775','0','Forschung und Entwicklung');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 263, 'AT-BASE','7','GROUP7','7776','0','Messentwicklung');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 264, 'AT-BASE','7','GROUP7','7777','0','Produktentwicklung');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 265, 'AT-BASE','7','GROUP7','7785','0','Freiwillige Verbandsbeiträge');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 266, 'AT-BASE','7','GROUP7','7790','0','Spesen des Geldverkehrs');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 267, 'AT-BASE','7','GROUP7','7791','0','Kursdifferenzen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 268, 'AT-BASE','7','GROUP7','7800','0','Betriebsbedingte Schadensfälle');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 269, 'AT-BASE','7','GROUP7','7801','0','Ausgaben nicht absetzbar');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 270, 'AT-BASE','7','GROUP7','7802','0','Strafen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 271, 'AT-BASE','7','GROUP7','7805','0','Forderungsverluste 20');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 272, 'AT-BASE','7','GROUP7','7806','0','Abschreibungen auf Forderungen (EU)');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 273, 'AT-BASE','7','GROUP7','7807','0','Abschreibungen auf Forderungen (Drittland)');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 274, 'AT-BASE','7','GROUP7','7810','0','Zuweisung an Einzel-WB Forderungen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 275, 'AT-BASE','7','GROUP7','7811','0','Zuweisung pauschale Wertberichtigungen zu Exportforderungen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 276, 'AT-BASE','7','GROUP7','7812','0','Abschreibungen auf Vorräte');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 277, 'AT-BASE','7','GROUP7','7820','0','Buchwert abgegangener Sachanlagen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 278, 'AT-BASE','7','GROUP7','7840','0','Gründungskosten');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 279, 'AT-BASE','7','GROUP7','7850','0','Sonstiger Aufwand');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 280, 'AT-BASE','7','GROUP7','7851','0','Sonstiger Aufwand Gewinnanteil Reich');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 281, 'AT-BASE','7','GROUP7','7930','0','Aufw. Gewährleistungsverpfl.');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 282, 'AT-BASE','7','GROUP7','7940','0','Aufwand aus Vorperioden');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 283, 'AT-BASE','8','GROUP8','8020','0','Gewinnüberrg. v. Organgesell.');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 284, 'AT-BASE','8','GROUP8','8060','0','Zinserträge');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 285, 'AT-BASE','8','GROUP8','8090','0','Ertr.a.Ant.a.and. Unternehmen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 286, 'AT-BASE','8','GROUP8','8100','0','Habenzinsen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 287, 'AT-BASE','8','GROUP8','8280','0','Zinsen f. Kredite u. Darlehen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 288, 'AT-BASE','8','GROUP8','8286','0','Kursgewinne/Kursverluste');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 289, 'AT-BASE','8','GROUP8','8288','0','Zinsen auf Lieferantenkredite');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 290, 'AT-BASE','8','GROUP8','8291','0','Sonst. Zinsen und ähnliche Aufwendungen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 291, 'AT-BASE','8','GROUP8','8500','0','Körperschaftsteuer');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 292, 'AT-BASE','8','GROUP8','8505','0','Kapitalertragsteuer');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 293, 'AT-BASE','8','GROUP8','8510','0','Körperschaftsteuervorauszahl.');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 294, 'AT-BASE','8','GROUP8','8511','0','Dotierung KöSt-Rückstellung');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 295, 'AT-BASE','8','GROUP8','8512','0','Aktivierung Körperschaftsteuer');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 296, 'AT-BASE','8','GROUP8','8513','0','Köst Vorperioden');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 297, 'AT-BASE','8','GROUP8','8520','0','Forschungsprämie');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 298, 'AT-BASE','8','GROUP8','8595','0','Ertrag aus der Aktivierung latenter Steuern');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 299, 'AT-BASE','8','GROUP8','8610','0','Auflösung sonstiger unversteuerter Rücklagen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 300, 'AT-BASE','8','GROUP8','8700','0','Auflösung gebundener Kapitalrücklage');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 301, 'AT-BASE','8','GROUP8','8710','0','Auflösung Rücklage für eigene Anteile');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 302, 'AT-BASE','8','GROUP8','8720','0','Auflösung nicht gebundene Kapitalrücklage');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 303, 'AT-BASE','8','GROUP8','8750','0','Auflösung gesetzliche Rücklage');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 304, 'AT-BASE','8','GROUP8','8760','0','Auflösung satzungsmäßige Rücklage');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 305, 'AT-BASE','8','GROUP8','8770','0','Auflösung andere (freie) Rücklage');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 306, 'AT-BASE','8','GROUP8','8810','0','Zuweisung sonstige unversteuerte Rücklagen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 307, 'AT-BASE','8','GROUP8','8820','0','Zuweisung Inv. Rücklage');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 308, 'AT-BASE','8','GROUP8','8890','0','Zuw.Bew.Res.GWG');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 309, 'AT-BASE','8','GROUP8','8900','0','Zuweisung gesetzliche Rücklagen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 310, 'AT-BASE','8','GROUP8','8910','0','Zuweisung satzungsmäßige Rücklagen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 311, 'AT-BASE','8','GROUP8','8920','0','Zuweisung andere (freie) Rücklagen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 312, 'AT-BASE','9','GROUP9','9390','0','Bilanzgewinn');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 313, 'AT-BASE','9','GROUP9','9391','0','Bilanzverlust');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 314, 'AT-BASE','9','GROUP9','9700','0','Wachdienst');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 315, 'AT-BASE','9','GROUP9','9991','0','Gewinnvortrag');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 316, 'AT-BASE','9','GROUP9','9993','0','Verlustvortrag');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 317, 'AT-BASE','9','GROUP9','9994','0','Verlustvortrag');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 318, 'AT-BASE','5','GROUP5','50200','0','Materialeinkauf');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 319, 'AT-BASE','6','GROUP6','60000','0','kalk. Löhne u Gehälter');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 320, 'AT-BASE','6','GROUP6','64160','0','Veränderung Pensionsrückstellung (Angestellte)');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 321, 'AT-BASE','6','GROUP6','66300','0','Leistungserfassung');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 1, 'AT-BASE','GROUP0','110','0','Patentrechte');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 2, 'AT-BASE','GROUP0','120','0','Software');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 3, 'AT-BASE','GROUP0','121','0','ERP System');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 4, 'AT-BASE','GROUP0','122','0','Homepage');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 5, 'AT-BASE','GROUP0','125','0','Software Fremdentwicklung_noch nicht aktivieren');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 6, 'AT-BASE','GROUP0','160','0','Umgründungsmehrwert');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 7, 'AT-BASE','GROUP0','250','0','Mieterinvestitionen');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 8, 'AT-BASE','GROUP0','400','0','Maschinen');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 9, 'AT-BASE','GROUP0','600','0','Betriebs u. Geschäftsausstattung');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 10, 'AT-BASE','GROUP0','601','0','Ausstellungsstücke');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 11, 'AT-BASE','GROUP0','602','0','Leihstellungsstücke');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 12, 'AT-BASE','GROUP0','603','0','Getriebeprüfstand_hinten');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 13, 'AT-BASE','GROUP0','604','0','Wuchtstand_links_AQ');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 14, 'AT-BASE','GROUP0','605','0','Messlabor(Messraum)');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 15, 'AT-BASE','GROUP0','606','0','PAK-System');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 16, 'AT-BASE','GROUP0','607','0','Server');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 17, 'AT-BASE','GROUP0','608','0','EDV-Ausstattung (Hardware)');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 18, 'AT-BASE','GROUP0','609','0','Werkstattausstattung (Werkzeug)');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 19, 'AT-BASE','GROUP0','610','0','Wuchtprüfstand neu_noch nicht in Betrieb genommen');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 20, 'AT-BASE','GROUP0','611','0','Messequipment/Ausstattung');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 21, 'AT-BASE','GROUP0','630','0','PKW');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 22, 'AT-BASE','GROUP0','640','0','LKW');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 23, 'AT-BASE','GROUP0','680','0','GWG-Geschäftsausstattung');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 24, 'AT-BASE','GROUP0','710','0','Anlagen in Bau');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 25, 'AT-BASE','GROUP1','1100','0','Rohstoffe');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 26, 'AT-BASE','GROUP1','1200','0','Bezogenen Teile');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 27, 'AT-BASE','GROUP1','1300','0','Hilfsstoffe und Betriebsstoffe');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 28, 'AT-BASE','GROUP1','1400','0','fertige Erzeugnisse');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 29, 'AT-BASE','GROUP1','1500','0','unfertige Erzeugnisse');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 30, 'AT-BASE','GROUP1','1600','0','Waren');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 31, 'AT-BASE','GROUP1','1700','0','Noch nicht abrechenbare Leist.');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 32, 'AT-BASE','GROUP1','1701','0','Bestandsveränderung laufend');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 33, 'AT-BASE','GROUP1','1800','0','Vorrat Verpackungsmaterial');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 34, 'AT-BASE','GROUP1','1810','0','Vorrat Werbematerial');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 35, 'AT-BASE','GROUP2','2000','0','Lieferforderungen Inland I');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 36, 'AT-BASE','GROUP2','2080','0','Einzelwertb. Ford. Inland');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 37, 'AT-BASE','GROUP2','2292','0','geleistete Anzahlungen (20%)');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 38, 'AT-BASE','GROUP2','2293','0','gel. Anzahlungen i.g.');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 39, 'AT-BASE','GROUP2','2301','0','Forderung Forschungsprämie');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 40, 'AT-BASE','GROUP2','2302','0','Forderungen gelieferte (noch nicht fakturierte Waren)');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 41, 'AT-BASE','GROUP2','2303','0','Vorauszahlung Leasing Server');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 42, 'AT-BASE','GROUP2','2306','0','Kaution Pfauengarten');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 43, 'AT-BASE','GROUP2','2307','0','Kaution Werkstatt');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 44, 'AT-BASE','GROUP2','2308','0','Kaution Parkplatz PKW');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 45, 'AT-BASE','GROUP2','2309','0','Kaution Werkstatt');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 46, 'AT-BASE','GROUP2','2310','0','Kaution Studentenwohnheim');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 47, 'AT-BASE','GROUP2','2311','0','Kaution China');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 48, 'AT-BASE','GROUP2','2312','0','Vorauszahlung Xerox');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 49, 'AT-BASE','GROUP2','2313','0','Verrechnung Bildungsscheck');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 50, 'AT-BASE','GROUP2','2315','0','Aktivierung Körperschaftsteuer');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 51, 'AT-BASE','GROUP2','2500','0','Vorsteuer');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 52, 'AT-BASE','GROUP2','2501','0','Vorsteuer aus i. g. Erwerb');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 53, 'AT-BASE','GROUP2','2502','0','Vorsteuer reverse charge syst.');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 54, 'AT-BASE','GROUP2','2503','0','Vorsteuer Reverse Charge § 19/1d');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 55, 'AT-BASE','GROUP2','2508','0','Vorsteuer sonstige Leistungen EU');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 56, 'AT-BASE','GROUP2','2509','0','EUSt Forderung');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 57, 'AT-BASE','GROUP2','2510','0','Einfuhrumsatzsteuer');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 58, 'AT-BASE','GROUP2','2531','0','Vorsteuer Frankreich');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 59, 'AT-BASE','GROUP2','2532','0','Vorsteuer Niederlande');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 60, 'AT-BASE','GROUP2','2533','0','Vorsteuer GB');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 61, 'AT-BASE','GROUP2','2534','0','Vorsteuer Belgien');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 62, 'AT-BASE','GROUP2','2535','0','Vorsteuer GB');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 63, 'AT-BASE','GROUP2','2901','0','Leasingvorauszahlung Vito');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 64, 'AT-BASE','GROUP3','3020','0','Rückstellung für Körperschaftsteuer');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 65, 'AT-BASE','GROUP3','3060','0','Rst. für Beratungskosten');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 66, 'AT-BASE','GROUP3','3064','0','Rst. für Sonderzahlungen');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 67, 'AT-BASE','GROUP3','3072','0','Rst. für nicht konsum. Urlaube');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 68, 'AT-BASE','GROUP3','3214','0','Raika 40-00.800.185');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 69, 'AT-BASE','GROUP3','3286','0','Darlehen Dipl. Ing. REICH GMBH');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 70, 'AT-BASE','GROUP3','3287','0','Darlehen Dr.Höfler');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 71, 'AT-BASE','GROUP3','3288','0','Darlehen DI Mayrhofer');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 72, 'AT-BASE','GROUP3','3289','0','Darlehen AWS');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 73, 'AT-BASE','GROUP3','3292','0','Anzahlungen von Kunden 20 %');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 74, 'AT-BASE','GROUP3','3294','0','Anzahlungen von Kunden Drittland');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 75, 'AT-BASE','GROUP3','3300','0','Lieferverbindlichkeiten I');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 76, 'AT-BASE','GROUP3','3481','0','Verrechnungskto DI Mayrhofer');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 77, 'AT-BASE','GROUP3','3500','0','Umsatzsteuer');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 78, 'AT-BASE','GROUP3','3501','0','Umsatzsteuer aus i. g. Erwerb');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 79, 'AT-BASE','GROUP3','3502','0','USt § 19/Art 19 (reverse Charge)');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 80, 'AT-BASE','GROUP3','3503','0','Umsatzsteuer Reverse Charge § 19/1d');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 81, 'AT-BASE','GROUP3','3508','0','Umsatzsteuer sonstige Leistung');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 82, 'AT-BASE','GROUP3','3531','0','FA-Zahllast Dezember');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 83, 'AT-BASE','GROUP3','3533','0','Umsatzsteuer 2012');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 84, 'AT-BASE','GROUP3','3535','0','Umsatzsteuer 2013');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 85, 'AT-BASE','GROUP3','3536','0','Umsatzsteuer 2014');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 86, 'AT-BASE','GROUP3','3537','0','Umsatzsteuer 2015');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 87, 'AT-BASE','GROUP3','3632','0','Verrechnungskonto EUSt');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 88, 'AT-BASE','GROUP3','3892','0','Verbindlichkeiten Anzahlungsrechn.');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 89, 'AT-BASE','GROUP3','3898','0','Abgrenzung Sonderzahlungen');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 90, 'AT-BASE','GROUP4','4000','0','Erlöse Lieferungen 20 %');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 91, 'AT-BASE','GROUP4','4001','0','Erlöse i.g. Lieferung');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 92, 'AT-BASE','GROUP4','4002','0','Erlöse Dienstleistungen EU');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 93, 'AT-BASE','GROUP4','4003','0','Erlöse Dienstleistungen 20 %');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 94, 'AT-BASE','GROUP4','4004','0','Erlöse Software 20 %');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 95, 'AT-BASE','GROUP4','4005','0','Erlöse Software EU');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 96, 'AT-BASE','GROUP4','4006','0','Evidenz Kfd. Reverse Charge');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 97, 'AT-BASE','GROUP4','4050','0','Erlöse 0 % Drittland');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 98, 'AT-BASE','GROUP4','4051','0','Erlöse Dienstleistungen Drittland');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 99, 'AT-BASE','GROUP4','4052','0','Erlöse Software Drittland');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 100, 'AT-BASE','GROUP4','4069','0','Erlöse § 19/1d Schrott');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 101, 'AT-BASE','GROUP4','4400','0','Kundenskonto 20 %');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 102, 'AT-BASE','GROUP4','4405','0','Kundenskonto 0 % Ausfuhrlieferungen');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 103, 'AT-BASE','GROUP4','4410','0','Skontoaufwand i.g. Lieferung');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 104, 'AT-BASE','GROUP4','4413','0','Kundenskonto sonstige Leistung EU');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 105, 'AT-BASE','GROUP4','4420','0','Kundenskonto EU-Land A x %');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 106, 'AT-BASE','GROUP4','4450','0','Kundenrabatt 20%');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 107, 'AT-BASE','GROUP4','4500','0','Bestandsveränderungen fertige Erzeugnisse');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 108, 'AT-BASE','GROUP4','4510','0','Best.Veränd.Halbf.Erzeugnisse');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 109, 'AT-BASE','GROUP4','4519','0','Bestandsveränderung laufend');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 110, 'AT-BASE','GROUP4','4520','0','Best.Veränd.n.n.abger.Leist.');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 111, 'AT-BASE','GROUP4','4530','0','Gelieferte (noch nicht fakturierte Waren)');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 112, 'AT-BASE','GROUP4','4580','0','Aktivierte Eigenleistung');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 113, 'AT-BASE','GROUP4','4630','0','Erträge aus d.Abgang v.Anlagen');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 114, 'AT-BASE','GROUP4','4801','0','Zuwendungen a.öffentl. Mitteln');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 115, 'AT-BASE','GROUP4','4831','0','sonstige betriebliche Erträge (nicht steuerbar)');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 116, 'AT-BASE','GROUP4','4840','0','Sonstige Erlöse 20 %');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 117, 'AT-BASE','GROUP4','4850','0','Erl. Aufwandersätze');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 118, 'AT-BASE','GROUP4','4881','0','Versicherungsvergütungen');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 119, 'AT-BASE','GROUP4','4885','0','Zuschreibungen zum Umlaufvermögen');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 120, 'AT-BASE','GROUP4','4950','0','Privatanteil 20 %');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 121, 'AT-BASE','GROUP4','4991','0','Sachbezüge 20%');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 122, 'AT-BASE','GROUP5','5000','0','Handelswareneinsatz');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 123, 'AT-BASE','GROUP5','5001','0','Materialeinkauf Fremdfertigung');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 124, 'AT-BASE','GROUP5','5002','0','Wareneinkauf Verkauf');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 125, 'AT-BASE','GROUP5','5020','0','Materialeinkauf');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 126, 'AT-BASE','GROUP5','5090','0','Bezugskosten');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 127, 'AT-BASE','GROUP5','5100','0','Verbrauch Rohstoffe');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 128, 'AT-BASE','GROUP5','5199','0','Aufwand für TW-AFA Vorräte');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 129, 'AT-BASE','GROUP5','5200','0','Verbrauch bezogenen Teile');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 130, 'AT-BASE','GROUP5','5300','0','Verbrauch Hilfsstoffe');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 131, 'AT-BASE','GROUP5','5400','0','Hilfsstoffverbrauch');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 132, 'AT-BASE','GROUP5','5440','0','Inventurveränderung Fremdbarb. + GK');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 133, 'AT-BASE','GROUP5','5441','0','GWG Fremdbarb. + GK');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 134, 'AT-BASE','GROUP5','5450','0','Verpackungsmaterial');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 135, 'AT-BASE','GROUP5','5800','0','Fremdleistungen');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 136, 'AT-BASE','GROUP5','5880','0','Lieferantenskonti');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 137, 'AT-BASE','GROUP5','5900','0','Skontoertrag ig.E. 0% (m.VST)');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 138, 'AT-BASE','GROUP5','5920','0','Skontoertrag ig.E. 20% (m.VST)');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 139, 'AT-BASE','GROUP6','6000','0','Löhne');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 140, 'AT-BASE','GROUP6','6001','0','Rückerstattung AUVA Arbeiter');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 141, 'AT-BASE','GROUP6','6010','0','Lehrlingsentschädigung Arb.');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 142, 'AT-BASE','GROUP6','6020','0','Nichtleistungslöhne');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 143, 'AT-BASE','GROUP6','6100','0','Leihpersonal Aufwand');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 144, 'AT-BASE','GROUP6','6150','0','Sonderzahlungen Arbeiter');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 145, 'AT-BASE','GROUP6','6200','0','Gehälter');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 146, 'AT-BASE','GROUP6','6201','0','Förderung AMS');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 147, 'AT-BASE','GROUP6','6202','0','Rückerstattung AUVA Angestellte');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 148, 'AT-BASE','GROUP6','6210','0','Veränderung Mehrarbeitsvergütung RSt Ang');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 149, 'AT-BASE','GROUP6','6211','0','Veränderung Mehrarbeitsvergütung RSt Arbeiter');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 150, 'AT-BASE','GROUP6','6230','0','Sonderzahlungen Angestellte');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 151, 'AT-BASE','GROUP6','6231','0','Dotierung RST Sonderzahlungen');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 152, 'AT-BASE','GROUP6','6255','0','Geschäftsführerbezüge');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 153, 'AT-BASE','GROUP6','6256','0','Geschäftsführersachbezüge');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 154, 'AT-BASE','GROUP6','6300','0','Sonderzahlung aliquot vorläufig');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 155, 'AT-BASE','GROUP6','6310','0','Dotierung Urlaubsrückstellung');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 156, 'AT-BASE','GROUP6','6311','0','Veränderung Urlaubsrückstellung Arbeiter');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 157, 'AT-BASE','GROUP6','6402','0','Betriebliche Vorsorgekassa Arbeiter');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 158, 'AT-BASE','GROUP6','6407','0','Betriebliche Vorsorgekassa Angestellte');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 159, 'AT-BASE','GROUP6','6416','0','Veränderung Pensionsrückstellung (Angestellte)');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 160, 'AT-BASE','GROUP6','6435','0','sonstige Beiträge für die Altersversorgung');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 161, 'AT-BASE','GROUP6','6500','0','Gesetzlicher Sozialaufwand');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 162, 'AT-BASE','GROUP6','6600','0','Gesetzlicher Sozialaufwand Arbeiter');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 163, 'AT-BASE','GROUP6','6605','0','Gesetzlicher Sozialaufwand Angestellte');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 164, 'AT-BASE','GROUP6','6610','0','Dienstgeberbeitrag Arbeiter');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 165, 'AT-BASE','GROUP6','6611','0','Dienstgeberbeitrag Angestellte');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 166, 'AT-BASE','GROUP6','6620','0','Zuschlag zum DB');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 167, 'AT-BASE','GROUP6','6621','0','Zuschlag zum DB Angestellte');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 168, 'AT-BASE','GROUP6','6630','0','Ausgleichstaxe');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 169, 'AT-BASE','GROUP6','6690','0','Lohnsteuer');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 170, 'AT-BASE','GROUP6','6693','0','Kommunalsteuer Arbeiter');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 171, 'AT-BASE','GROUP6','6694','0','Kommunalsteuer Angestellte');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 172, 'AT-BASE','GROUP6','6700','0','Freiwilliger Sozialaufwand');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 173, 'AT-BASE','GROUP6','6710','0','Arbeitskleidung');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 174, 'AT-BASE','GROUP6','6720','0','Fahrspesen Dienstnehmer');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 175, 'AT-BASE','GROUP6','6730','0','Weihnachtsgeschenke Arbeitnehmer');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 176, 'AT-BASE','GROUP6','6740','0','Betriebsveranstaltungen');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 177, 'AT-BASE','GROUP6','6750','0','Konto frei');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 178, 'AT-BASE','GROUP6','6760','0','Vergleichszahlung Dienstnehmer');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 179, 'AT-BASE','GROUP7','7030','0','Abschreibung  G W G');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 180, 'AT-BASE','GROUP7','7070','0','Buchwert ausgeschiedener Anlagen');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 181, 'AT-BASE','GROUP7','7080','0','Planmäßige AFA immat.WG.');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 182, 'AT-BASE','GROUP7','7081','0','Planmäßige Abschreibung für Sachanlagen');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 183, 'AT-BASE','GROUP7','7100','0','Nicht abzugsfähige Vorsteuer (VStK)');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 184, 'AT-BASE','GROUP7','7110','0','Gebühren und Abgaben_Zoll');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 185, 'AT-BASE','GROUP7','7111','0','Kammerumlage');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 186, 'AT-BASE','GROUP7','7200','0','Instandhaltung Gebäude');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 187, 'AT-BASE','GROUP7','7201','0','Instandhaltung Außenanlagen');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 188, 'AT-BASE','GROUP7','7202','0','Instandh. - Maschinen u. Anl.');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 189, 'AT-BASE','GROUP7','7204','0','Instandhaltung und Betriebskosten Betriebs und Geschäftsgebäude');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 190, 'AT-BASE','GROUP7','7205','0','Verbrauchsmaterial Werkstatt');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 191, 'AT-BASE','GROUP7','7210','0','Müllentsorgung');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 192, 'AT-BASE','GROUP7','7211','0','Entsorgungskosten');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 193, 'AT-BASE','GROUP7','7230','0','Reinigungsmaterial (div. Verbrauchsmaterial)');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 194, 'AT-BASE','GROUP7','7231','0','Berufsbekleidung');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 195, 'AT-BASE','GROUP7','7235','0','Reinigung durch Dritte');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 196, 'AT-BASE','GROUP7','7240','0','LKW-Betriebskosten Vito G 437 MB');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 197, 'AT-BASE','GROUP7','7241','0','Leasing Mercedes Vito G 437 MB');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 198, 'AT-BASE','GROUP7','7250','0','KFZ Betriebskosten allgemein');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 199, 'AT-BASE','GROUP7','7251','0','KFZ Leasing allgemein');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 200, 'AT-BASE','GROUP7','7252','0','KFZ Versicherungen allgemein');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 201, 'AT-BASE','GROUP7','7253','0','Wachdienst');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 202, 'AT-BASE','GROUP7','7254','0','Konto frei');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 203, 'AT-BASE','GROUP7','7255','0','Aufwand Leihwagen');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 204, 'AT-BASE','GROUP7','7256','0','PKW-Betriebskosten VW Golf G 854 SH Versuchsfahrzeug');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 205, 'AT-BASE','GROUP7','7257','0','Leasing VW Golf G 854 SH');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 206, 'AT-BASE','GROUP7','7258','0','Konto frei');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 207, 'AT-BASE','GROUP7','7285','0','Strom');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 208, 'AT-BASE','GROUP7','7286','0','Betriebskosten/Beheizung Mietobjekte');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 209, 'AT-BASE','GROUP7','7300','0','Transporte durch Dritte');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 210, 'AT-BASE','GROUP7','7330','0','Reise und Fahrtspesen');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 211, 'AT-BASE','GROUP7','7331','0','Kilometergelder');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 212, 'AT-BASE','GROUP7','7360','0','Reisediäten');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 213, 'AT-BASE','GROUP7','7380','0','Telefon');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 214, 'AT-BASE','GROUP7','7381','0','Internet');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 215, 'AT-BASE','GROUP7','7382','0','Wartung Homepage');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 216, 'AT-BASE','GROUP7','7390','0','Postgebühren');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 217, 'AT-BASE','GROUP7','7400','0','Konto frei');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 218, 'AT-BASE','GROUP7','7401','0','Konto frei');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 219, 'AT-BASE','GROUP7','7402','0','Konto frei');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 220, 'AT-BASE','GROUP7','7403','0','Miete Büro Linz');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 221, 'AT-BASE','GROUP7','7404','0','Miete Gradnerstraße');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 222, 'AT-BASE','GROUP7','7410','0','Maschinen u. Gerätemieten');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 223, 'AT-BASE','GROUP7','7411','0','Wartungskosten BuG Ausstattung');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 224, 'AT-BASE','GROUP7','7420','0','Mobilien-Leasing ');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 225, 'AT-BASE','GROUP7','7421','0','Konto frei');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 226, 'AT-BASE','GROUP7','7422','0','Leasing Server');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 227, 'AT-BASE','GROUP7','7423','0','Konto frei');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 228, 'AT-BASE','GROUP7','7424','0','Konto frei');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 229, 'AT-BASE','GROUP7','7480','0','Lizenzgebühren');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 230, 'AT-BASE','GROUP7','7540','0','Provisionen an Dritte');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 231, 'AT-BASE','GROUP7','7600','0','Büromaterial');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 232, 'AT-BASE','GROUP7','7601','0','EDV-Material');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 233, 'AT-BASE','GROUP7','7610','0','Drucksorten');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 234, 'AT-BASE','GROUP7','7620','0','Fachliteratur und Zeitungen');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 235, 'AT-BASE','GROUP7','7630','0','Gästeunt. u. Zeitschriften');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 236, 'AT-BASE','GROUP7','7650','0','Werbeaufwand/Inserate');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 237, 'AT-BASE','GROUP7','7651','0','Anbahnung');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 238, 'AT-BASE','GROUP7','7652','0','Aufwand Messen');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 239, 'AT-BASE','GROUP7','7653','0','Konto frei');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 240, 'AT-BASE','GROUP7','7654','0','Inserate');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 241, 'AT-BASE','GROUP7','7670','0','Bewirtungskosten');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 242, 'AT-BASE','GROUP7','7690','0','Trinkgelder u. Spenden');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 243, 'AT-BASE','GROUP7','7691','0','Spenden an begünstigte Institutionen/Sponsoring');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 244, 'AT-BASE','GROUP7','7696','0','Säumnis- und Verspätungszuschläge');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 245, 'AT-BASE','GROUP7','7700','0','Betriebsversicherungen');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 246, 'AT-BASE','GROUP7','7701','0','Transportversicherungen');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 247, 'AT-BASE','GROUP7','7710','0','Pflichtversich. Unternehmer');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 248, 'AT-BASE','GROUP7','7749','0','Aufwand Japan');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 249, 'AT-BASE','GROUP7','7750','0','Steuerberatung (Lohnverrechnung, Buchhaltung)');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 250, 'AT-BASE','GROUP7','7751','0','Patentkosten');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 251, 'AT-BASE','GROUP7','7752','0','Rechtsberatung');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 252, 'AT-BASE','GROUP7','7753','0','Unternehmensberatung');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 253, 'AT-BASE','GROUP7','7754','0','Aufwand tectos China');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 254, 'AT-BASE','GROUP7','7755','0','Wartung (Betreuung EDV)');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 255, 'AT-BASE','GROUP7','7756','0','Lizenzgebühren Abaqus');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 256, 'AT-BASE','GROUP7','7757','0','Lizenzgebühren Sonstige');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 257, 'AT-BASE','GROUP7','7758','0','Sonstige Beratungskosten');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 258, 'AT-BASE','GROUP7','7759','0','EDV-Beratung');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 259, 'AT-BASE','GROUP7','7760','0','Mitgliedsbeiträge/freiwillige Beiträge');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 260, 'AT-BASE','GROUP7','7761','0','Prüfung Jahresabschluss');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 261, 'AT-BASE','GROUP7','7770','0','Aus- und Fortbildung');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 262, 'AT-BASE','GROUP7','7775','0','Forschung und Entwicklung');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 263, 'AT-BASE','GROUP7','7776','0','Messentwicklung');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 264, 'AT-BASE','GROUP7','7777','0','Produktentwicklung');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 265, 'AT-BASE','GROUP7','7785','0','Freiwillige Verbandsbeiträge');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 266, 'AT-BASE','GROUP7','7790','0','Spesen des Geldverkehrs');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 267, 'AT-BASE','GROUP7','7791','0','Kursdifferenzen');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 268, 'AT-BASE','GROUP7','7800','0','Betriebsbedingte Schadensfälle');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 269, 'AT-BASE','GROUP7','7801','0','Ausgaben nicht absetzbar');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 270, 'AT-BASE','GROUP7','7802','0','Strafen');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 271, 'AT-BASE','GROUP7','7805','0','Forderungsverluste 20');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 272, 'AT-BASE','GROUP7','7806','0','Abschreibungen auf Forderungen (EU)');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 273, 'AT-BASE','GROUP7','7807','0','Abschreibungen auf Forderungen (Drittland)');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 274, 'AT-BASE','GROUP7','7810','0','Zuweisung an Einzel-WB Forderungen');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 275, 'AT-BASE','GROUP7','7811','0','Zuweisung pauschale Wertberichtigungen zu Exportforderungen');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 276, 'AT-BASE','GROUP7','7812','0','Abschreibungen auf Vorräte');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 277, 'AT-BASE','GROUP7','7820','0','Buchwert abgegangener Sachanlagen');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 278, 'AT-BASE','GROUP7','7840','0','Gründungskosten');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 279, 'AT-BASE','GROUP7','7850','0','Sonstiger Aufwand');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 280, 'AT-BASE','GROUP7','7851','0','Sonstiger Aufwand Gewinnanteil Reich');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 281, 'AT-BASE','GROUP7','7930','0','Aufw. Gewährleistungsverpfl.');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 282, 'AT-BASE','GROUP7','7940','0','Aufwand aus Vorperioden');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 283, 'AT-BASE','GROUP8','8020','0','Gewinnüberrg. v. Organgesell.');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 284, 'AT-BASE','GROUP8','8060','0','Zinserträge');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 285, 'AT-BASE','GROUP8','8090','0','Ertr.a.Ant.a.and. Unternehmen');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 286, 'AT-BASE','GROUP8','8100','0','Habenzinsen');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 287, 'AT-BASE','GROUP8','8280','0','Zinsen f. Kredite u. Darlehen');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 288, 'AT-BASE','GROUP8','8286','0','Kursgewinne/Kursverluste');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 289, 'AT-BASE','GROUP8','8288','0','Zinsen auf Lieferantenkredite');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 290, 'AT-BASE','GROUP8','8291','0','Sonst. Zinsen und ähnliche Aufwendungen');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 291, 'AT-BASE','GROUP8','8500','0','Körperschaftsteuer');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 292, 'AT-BASE','GROUP8','8505','0','Kapitalertragsteuer');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 293, 'AT-BASE','GROUP8','8510','0','Körperschaftsteuervorauszahl.');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 294, 'AT-BASE','GROUP8','8511','0','Dotierung KöSt-Rückstellung');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 295, 'AT-BASE','GROUP8','8512','0','Aktivierung Körperschaftsteuer');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 296, 'AT-BASE','GROUP8','8513','0','Köst Vorperioden');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 297, 'AT-BASE','GROUP8','8520','0','Forschungsprämie');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 298, 'AT-BASE','GROUP8','8595','0','Ertrag aus der Aktivierung latenter Steuern');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 299, 'AT-BASE','GROUP8','8610','0','Auflösung sonstiger unversteuerter Rücklagen');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 300, 'AT-BASE','GROUP8','8700','0','Auflösung gebundener Kapitalrücklage');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 301, 'AT-BASE','GROUP8','8710','0','Auflösung Rücklage für eigene Anteile');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 302, 'AT-BASE','GROUP8','8720','0','Auflösung nicht gebundene Kapitalrücklage');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 303, 'AT-BASE','GROUP8','8750','0','Auflösung gesetzliche Rücklage');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 304, 'AT-BASE','GROUP8','8760','0','Auflösung satzungsmäßige Rücklage');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 305, 'AT-BASE','GROUP8','8770','0','Auflösung andere (freie) Rücklage');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 306, 'AT-BASE','GROUP8','8810','0','Zuweisung sonstige unversteuerte Rücklagen');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 307, 'AT-BASE','GROUP8','8820','0','Zuweisung Inv. Rücklage');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 308, 'AT-BASE','GROUP8','8890','0','Zuw.Bew.Res.GWG');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 309, 'AT-BASE','GROUP8','8900','0','Zuweisung gesetzliche Rücklagen');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 310, 'AT-BASE','GROUP8','8910','0','Zuweisung satzungsmäßige Rücklagen');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 311, 'AT-BASE','GROUP8','8920','0','Zuweisung andere (freie) Rücklagen');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 312, 'AT-BASE','GROUP9','9390','0','Bilanzgewinn');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 313, 'AT-BASE','GROUP9','9391','0','Bilanzverlust');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 314, 'AT-BASE','GROUP9','9700','0','Wachdienst');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 315, 'AT-BASE','GROUP9','9991','0','Gewinnvortrag');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 316, 'AT-BASE','GROUP9','9993','0','Verlustvortrag');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 317, 'AT-BASE','GROUP9','9994','0','Verlustvortrag');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 318, 'AT-BASE','GROUP5','50200','0','Materialeinkauf');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 319, 'AT-BASE','GROUP6','60000','0','kalk. Löhne u Gehälter');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 320, 'AT-BASE','GROUP6','64160','0','Veränderung Pensionsrückstellung (Angestellte)');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 321, 'AT-BASE','GROUP6','66300','0','Leistungserfassung');

From fa71402a9b74393bb76e3d3df922880794a6d027 Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Thu, 3 Jun 2021 09:34:49 +0200
Subject: [PATCH 0369/1497] Fix 17791 : fix for at account

---
 htdocs/install/mysql/data/llx_accounting_account_at.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/data/llx_accounting_account_at.sql b/htdocs/install/mysql/data/llx_accounting_account_at.sql
index 402e6893e6b..f05dc2572c2 100644
--- a/htdocs/install/mysql/data/llx_accounting_account_at.sql
+++ b/htdocs/install/mysql/data/llx_accounting_account_at.sql
@@ -22,7 +22,7 @@
 -- Descriptif des plans comptables autrichiens standard
 -- ADD 4100000 to rowid # Do no remove this comment --
 
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 1, 'AT-BASE','GROUP0','110','0','Patentrechte');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 1, 'AT-BASE','0','GROUP0','110','0','Patentrechte');
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 2, 'AT-BASE','GROUP0','120','0','Software');
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 3, 'AT-BASE','GROUP0','121','0','ERP System');
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 4, 'AT-BASE','GROUP0','122','0','Homepage');

From 71856984a3555e0e90ed8b80b0f8139730c170a8 Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Thu, 3 Jun 2021 09:35:31 +0200
Subject: [PATCH 0370/1497] Fix #17791 : fix for at account

---
 htdocs/install/mysql/data/llx_accounting_account_at.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/data/llx_accounting_account_at.sql b/htdocs/install/mysql/data/llx_accounting_account_at.sql
index f05dc2572c2..402e6893e6b 100644
--- a/htdocs/install/mysql/data/llx_accounting_account_at.sql
+++ b/htdocs/install/mysql/data/llx_accounting_account_at.sql
@@ -22,7 +22,7 @@
 -- Descriptif des plans comptables autrichiens standard
 -- ADD 4100000 to rowid # Do no remove this comment --
 
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 1, 'AT-BASE','0','GROUP0','110','0','Patentrechte');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 1, 'AT-BASE','GROUP0','110','0','Patentrechte');
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 2, 'AT-BASE','GROUP0','120','0','Software');
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 3, 'AT-BASE','GROUP0','121','0','ERP System');
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 4, 'AT-BASE','GROUP0','122','0','Homepage');

From 093705a1b552d18450c968001e4eafa4d65c127e Mon Sep 17 00:00:00 2001
From: Gauthier PC portable 024 <gauthier.verdol@atm-consulting.fr>
Date: Thu, 3 Jun 2021 11:32:41 +0200
Subject: [PATCH 0371/1497] FIX : field name is search_status and not
 search_statut

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

diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index cb8da24052b..cbd9b76e45e 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -106,7 +106,7 @@ $search_month_end    = GETPOST('search_month_end', 'int');
 $search_year_end     = GETPOST('search_year_end', 'int');
 $search_employee     = GETPOST('search_employee', 'int');
 $search_valideur     = GETPOST('search_valideur', 'int');
-$search_status       = GETPOST('search_statut', 'int');
+$search_status       = GETPOST('search_status', 'int');
 $search_type         = GETPOST('search_type', 'int');
 
 // Initialize technical objects

From c534b7fcce8808189b9ef108aa69f9697e584a08 Mon Sep 17 00:00:00 2001
From: Inovea Conseil <inoveaconseil@users.noreply.github.com>
Date: Thu, 3 Jun 2021 14:36:47 +0200
Subject: [PATCH 0372/1497] FIX delete object actionComm

---
 htdocs/core/actions_massactions.inc.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index 99f1271ff0b..3cbcd30af7f 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2015-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2018	   Nicolas ZABOURI	<info@inovea-conseil.com>
+ * Copyright (C) 2018-2021 Nicolas ZABOURI	<info@inovea-conseil.com>
  * Copyright (C) 2018 	   Juanjo Menent  <jmenent@2byte.es>
  * Copyright (C) 2019 	   Ferran Marcet  <fmarcet@2byte.es>
  * Copyright (C) 2019-2021 Frédéric France <frederic.france@netlogic.fr>
@@ -1241,8 +1241,13 @@ if (!$error && ($massaction == 'delete' || ($action == 'delete' && $confirm == '
 			}
 
 			if (in_array($objecttmp->element, array('societe', 'member'))) $result = $objecttmp->delete($objecttmp->id, $user, 1);
-			else $result = $objecttmp->delete($user);
-
+			else {
+				if (get_class($objecttmp) === "ActionComm") {
+					$result = $objecttmp->delete();
+				} else {
+					$result = $objecttmp->delete($user);
+				}
+			}
 			if ($result <= 0)
 			{
 				setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');

From ee55a5568f1985c33c865dedfc6a833350cdb8cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 3 Jun 2021 15:14:31 +0200
Subject: [PATCH 0373/1497] fix warning

---
 htdocs/core/tpl/commonfields_view.tpl.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/tpl/commonfields_view.tpl.php b/htdocs/core/tpl/commonfields_view.tpl.php
index 4b7821c2dad..f9da77c5894 100644
--- a/htdocs/core/tpl/commonfields_view.tpl.php
+++ b/htdocs/core/tpl/commonfields_view.tpl.php
@@ -74,7 +74,7 @@ foreach ($object->fields as $key => $val) {
 	if ($val['type'] == 'text') {
 		print ' wordbreak';
 	}
-	if ($val['cssview']) {
+	if (!empty($val['cssview'])) {
 		print ' '.$val['cssview'];
 	}
 	print '">';

From e83e399cb6f069125aa6392b955767af341cab06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 3 Jun 2021 15:19:54 +0200
Subject: [PATCH 0374/1497] fix warning

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

diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index 12a6eb97d13..9c99fab4657 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -8,7 +8,7 @@
  * Copyright (C) 2014       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2014       Teddy Andreotti         <125155@supinfo.com>
  * Copyright (C) 2015       Juanjo Menent           <jmenent@2byte.es>
- * Copyright (C) 2018-2019  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2021  Frédéric France         <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -465,7 +465,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 
 		// Date payment
 		print '<tr><td><span class="fieldrequired">'.$langs->trans('Date').'</span></td><td>';
-		$datepayment = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
+		$datepayment = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
 		$datepayment = ($datepayment == '' ? (empty($conf->global->MAIN_AUTOFILL_DATE) ?-1 : '') : $datepayment);
 		print $form->selectDate($datepayment, '', '', '', 0, "add_paiement", 1, 1, 0, '', '', $facture->date);
 		print '</td></tr>';

From 0b28587e658e12ec1ab8b018c8e5c74771d28441 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 3 Jun 2021 15:28:47 +0200
Subject: [PATCH 0375/1497] fix warnings

---
 htdocs/compta/paiement.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index 12a6eb97d13..b6a63b32466 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -598,7 +598,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 				print '<td align="right">&nbsp;</td>';
 				print "</tr>\n";
 
-				$total = 0;
+				$total_ttc = 0;
 				$totalrecu = 0;
 				$totalrecucreditnote = 0;
 				$totalrecudeposits = 0;
@@ -754,15 +754,14 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 					// Warning
 					print '<td align="center" width="16">';
 					//print "xx".$amounts[$invoice->id]."-".$amountsresttopay[$invoice->id]."<br>";
-					if ($amounts[$invoice->id] && (abs($amounts[$invoice->id]) > abs($amountsresttopay[$invoice->id]))
-						|| $multicurrency_amounts[$invoice->id] && (abs($multicurrency_amounts[$invoice->id]) > abs($multicurrency_amountsresttopay[$invoice->id]))) {
+					if (!empty($amounts[$invoice->id]) && (abs($amounts[$invoice->id]) > abs($amountsresttopay[$invoice->id]))
+						|| !empty($multicurrency_amounts[$invoice->id]) && (abs($multicurrency_amounts[$invoice->id]) > abs($multicurrency_amountsresttopay[$invoice->id]))) {
 						print ' '.img_warning($langs->trans("PaymentHigherThanReminderToPay"));
 					}
 					print '</td>';
 
 					print "</tr>\n";
 
-					$total += $objp->total;
 					$total_ttc += $objp->total_ttc;
 					$totalrecu += $paiement;
 					$totalrecucreditnote += $creditnotes;

From ca66cdad01f5a86728684d11da652b65fd8e3078 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Thu, 3 Jun 2021 21:47:10 +0200
Subject: [PATCH 0376/1497] debug intracomm report transport mode

---
 htdocs/comm/card.php                             | 13 +++++++++++--
 htdocs/core/class/commonobject.class.php         |  2 +-
 htdocs/core/class/html.form.class.php            |  4 ++--
 htdocs/fourn/class/fournisseur.facture.class.php | 15 +++++++++++----
 htdocs/fourn/facture/card.php                    | 12 ++++++------
 5 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 589559ea426..fc7378ecd93 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -184,6 +184,15 @@ if (empty($reshook)) {
 		}
 	}
 
+	// transport mode
+	if ($action == 'settransportmode' && $user->rights->societe->creer) {
+		$object->fetch($id);
+		$result = $object->setTransportMode(GETPOST('transport_mode_id', 'alpha'));
+		if ($result < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	}
+
 	// Bank account
 	if ($action == 'setbankaccount' && $user->rights->societe->creer) {
 		$object->fetch($id);
@@ -580,9 +589,9 @@ if ($object->id > 0) {
 		print '</tr></table>';
 		print '</td><td>';
 		if ($action == 'edittransportmode') {
-			$form->formSelectTransportMode($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->fk_transport_mode, 'fk_transport_mode', 1);
+			$form->formSelectTransportMode($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->transport_mode_id, 'transport_mode_id', 1);
 		} else {
-			$form->formSelectTransportMode($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->fk_transport_mode, 'none');
+			$form->formSelectTransportMode($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->transport_mode_id, 'none');
 		}
 		print "</td>";
 		print '</tr>';
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 3f4b2dd9ee6..33cfa7c8b32 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -2566,7 +2566,7 @@ abstract class CommonObject
 	/**
 	 *  Change the transport mode methods
 	 *
-	 *  @param		int		$id		Id of new payment method
+	 *  @param		int		$id		Id of transport mode
 	 *  @return		int				>0 if OK, <0 if KO
 	 */
 	public function setTransportMode($id)
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 1f90b5f4fdc..dda350865af 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5289,9 +5289,9 @@ class Form
 		global $langs;
 		if ($htmlname != "none") {
 			print '<form method="POST" action="'.$page.'">';
-			print '<input type="hidden" name="action" value="setmode">';
+			print '<input type="hidden" name="action" value="settransportmode">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
-			$this->selectTransportMode($selected, $htmlname, 2, $addempty, 0, 0, $active);
+			$this->selectTransportMode($selected, $htmlname, 0, $addempty, 0, 0, $active);
 			print '<input type="submit" class="button smallpaddingimp valignmiddle" value="'.$langs->trans("Modify").'">';
 			print '</form>';
 		} else {
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 637f29e87b8..81533dae324 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -214,6 +214,11 @@ class FactureFournisseur extends CommonInvoice
 	public $mode_reglement_id;
 	public $mode_reglement_code;
 
+	/**
+	 * @var int transport mode id
+	 */
+	public $transport_mode_id;
+
 	public $extraparams = array();
 
 	/**
@@ -670,6 +675,7 @@ class FactureFournisseur extends CommonInvoice
 		$sql .= ' s.nom as socnom, s.rowid as socid,';
 		$sql .= ' t.fk_incoterms, t.location_incoterms,';
 		$sql .= " i.libelle as label_incoterms,";
+		$sql .= ' t.fk_transport_mode,';
 		$sql .= ' t.fk_multicurrency, t.multicurrency_code, t.multicurrency_tx, t.multicurrency_total_ht, t.multicurrency_total_tva, t.multicurrency_total_ttc';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'facture_fourn as t';
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON (t.fk_soc = s.rowid)";
@@ -742,14 +748,15 @@ class FactureFournisseur extends CommonInvoice
 				$this->fk_incoterms = $obj->fk_incoterms;
 				$this->location_incoterms = $obj->location_incoterms;
 				$this->label_incoterms = $obj->label_incoterms;
+				$this->transport_mode_id = $obj->fk_transport_mode;
 
 				// Multicurrency
-				$this->fk_multicurrency 		= $obj->fk_multicurrency;
+				$this->fk_multicurrency = $obj->fk_multicurrency;
 				$this->multicurrency_code = $obj->multicurrency_code;
-				$this->multicurrency_tx 		= $obj->multicurrency_tx;
+				$this->multicurrency_tx = $obj->multicurrency_tx;
 				$this->multicurrency_total_ht = $obj->multicurrency_total_ht;
-				$this->multicurrency_total_tva 	= $obj->multicurrency_total_tva;
-				$this->multicurrency_total_ttc 	= $obj->multicurrency_total_ttc;
+				$this->multicurrency_total_tva = $obj->multicurrency_total_tva;
+				$this->multicurrency_total_ttc = $obj->multicurrency_total_ttc;
 
 				$this->extraparams = (array) json_decode($obj->extraparams, true);
 
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 0bc26ea8f2b..a796ff81a0e 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -1875,10 +1875,10 @@ if ($action == 'create') {
 		$objectsrc->fetch_optionals();
 		$object->array_options = $objectsrc->array_options;
 	} else {
-		$cond_reglement_id 	= $societe->cond_reglement_supplier_id;
-		$mode_reglement_id 	= $societe->mode_reglement_supplier_id;
+		$cond_reglement_id = $societe->cond_reglement_supplier_id;
+		$mode_reglement_id = $societe->mode_reglement_supplier_id;
 		$transport_mode_id = $societe->transport_mode_supplier_id;
-		$fk_account         = $societe->fk_account;
+		$fk_account = $societe->fk_account;
 		$datetmp = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
 		$dateinvoice = ($datetmp == '' ? (empty($conf->global->MAIN_AUTOFILL_DATE) ?-1 : '') : $datetmp);
 		$datetmp = dol_mktime(12, 0, 0, $_POST['echmonth'], $_POST['echday'], $_POST['echyear']);
@@ -2889,12 +2889,12 @@ if ($action == 'create') {
 		// Intracomm report
 		if (!empty($conf->intracommreport->enabled)) {
 			$langs->loadLangs(array("intracommreport"));
-			print '<tr><td class="nowrap">';
-			print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
+			print '<tr><td>';
+			print '<table width="100%" class="nobordernopadding"><tr><td>';
 			print $langs->trans('IntracommReportTransportMode');
 			print '</td>';
 			if ($action != 'editmode' && ($user->rights->fournisseur->facture->creer || $user->rights->supplier_invoice->creer)) {
-				print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editmode&amp;id='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
+				print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editmode&amp;id='.$object->id.'">'.img_edit().'</a></td>';
 			}
 			print '</tr></table>';
 			print '</td>';

From 350a4215445077fcb747e793f418adb95189a729 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 4 Jun 2021 08:41:26 +0200
Subject: [PATCH 0377/1497] Update card.php

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

diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index a796ff81a0e..a8a4cb63258 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -2894,7 +2894,7 @@ if ($action == 'create') {
 			print $langs->trans('IntracommReportTransportMode');
 			print '</td>';
 			if ($action != 'editmode' && ($user->rights->fournisseur->facture->creer || $user->rights->supplier_invoice->creer)) {
-				print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editmode&amp;id='.$object->id.'">'.img_edit().'</a></td>';
+				print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmode&amp;id='.$object->id.'">'.img_edit().'</a></td>';
 			}
 			print '</tr></table>';
 			print '</td>';

From 3ae3137eaf9759d98a7422504496867984556f7a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 4 Jun 2021 08:57:48 +0200
Subject: [PATCH 0378/1497] Missing picto

---
 htdocs/fourn/commande/list.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index e7f19d0671a..c02a311f633 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -881,10 +881,10 @@ if ($resql) {
 		'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
 	);
 	if ($user->rights->fournisseur->facture->creer || $user->rights->supplier_invoice->creer) {
-		$arrayofmassactions['createbills'] = $langs->trans("CreateInvoiceForThisSupplier");
+		$arrayofmassactions['createbills'] = img_picto('', 'bill', 'class="pictofixedwidth"').$langs->trans("CreateInvoiceForThisSupplier");
 	}
 	if ($user->rights->fournisseur->commande->supprimer) {
-		$arrayofmassactions['predelete'] = img_picto('', 'delete').$langs->trans("Delete");
+		$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 	}
 	if (in_array($massaction, array('presend', 'predelete', 'createbills'))) {
 		$arrayofmassactions = array();

From 621aa9e6f368118e42ca9dffe9daaeb607ea542b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 4 Jun 2021 09:27:33 +0200
Subject: [PATCH 0379/1497] Fix typo

---
 htdocs/fourn/paiement/list.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/fourn/paiement/list.php b/htdocs/fourn/paiement/list.php
index 6a38ae2033d..4da69cfc0c1 100644
--- a/htdocs/fourn/paiement/list.php
+++ b/htdocs/fourn/paiement/list.php
@@ -254,10 +254,10 @@ if ($optioncss != '') {
 if ($search_ref) {
 	$param .= '&search_ref='.urlencode($search_ref);
 }
-if ($saerch_day) {
+if ($search_day) {
 	$param .= '&search_day='.urlencode($search_day);
 }
-if ($saerch_month) {
+if ($search_month) {
 	$param .= '&search_month='.urlencode($search_month);
 }
 if ($search_year) {

From 402d90554a8c421c048a941f493a787ff2e0d11d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 4 Jun 2021 10:04:56 +0200
Subject: [PATCH 0380/1497] Clean code

---
 htdocs/accountancy/closure/index.php       | 2 +-
 htdocs/accountancy/customer/index.php      | 2 +-
 htdocs/accountancy/expensereport/index.php | 2 +-
 htdocs/accountancy/supplier/index.php      | 2 +-
 htdocs/cashdesk/index_verif.php            | 2 +-
 htdocs/public/agenda/agendaexport.php      | 2 --
 htdocs/public/project/index.php            | 2 +-
 htdocs/public/project/new.php              | 3 +--
 8 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/htdocs/accountancy/closure/index.php b/htdocs/accountancy/closure/index.php
index 390c288b606..bcb3d7901f5 100644
--- a/htdocs/accountancy/closure/index.php
+++ b/htdocs/accountancy/closure/index.php
@@ -29,7 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 require_once DOL_DOCUMENT_ROOT.'/accountancy/class/bookkeeping.class.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("compta", "bills", "other", "main", "accountancy"));
+$langs->loadLangs(array("compta", "bills", "other", "accountancy"));
 
 $socid = GETPOST('socid', 'int');
 
diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php
index d33f5e12312..9580e8bca37 100644
--- a/htdocs/accountancy/customer/index.php
+++ b/htdocs/accountancy/customer/index.php
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("compta", "bills", "other", "main", "accountancy"));
+$langs->loadLangs(array("compta", "bills", "other", "accountancy"));
 
 // Security check
 if (empty($conf->accounting->enabled)) {
diff --git a/htdocs/accountancy/expensereport/index.php b/htdocs/accountancy/expensereport/index.php
index b4e85fd517a..baeefa1bbfb 100644
--- a/htdocs/accountancy/expensereport/index.php
+++ b/htdocs/accountancy/expensereport/index.php
@@ -30,7 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("compta", "bills", "other", "main", "accountancy"));
+$langs->loadLangs(array("compta", "bills", "other", "accountancy"));
 
 $month_start = ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
 if (GETPOST("year", 'int')) {
diff --git a/htdocs/accountancy/supplier/index.php b/htdocs/accountancy/supplier/index.php
index a69debeb0c0..c1a3ffe23a6 100644
--- a/htdocs/accountancy/supplier/index.php
+++ b/htdocs/accountancy/supplier/index.php
@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("compta", "bills", "other", "main", "accountancy"));
+$langs->loadLangs(array("compta", "bills", "other", "accountancy"));
 
 // Security check
 if (empty($conf->accounting->enabled)) {
diff --git a/htdocs/cashdesk/index_verif.php b/htdocs/cashdesk/index_verif.php
index 47a1d90b76c..94e0e7009cf 100644
--- a/htdocs/cashdesk/index_verif.php
+++ b/htdocs/cashdesk/index_verif.php
@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/cashdesk/include/environnement.php';
 require_once DOL_DOCUMENT_ROOT.'/cashdesk/class/Auth.class.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("main", "admin", "cashdesk"));
+$langs->loadLangs(array("admin", "cashdesk"));
 
 $username = GETPOST("txtUsername");
 $password = GETPOST("pwdPassword");
diff --git a/htdocs/public/agenda/agendaexport.php b/htdocs/public/agenda/agendaexport.php
index 2aaeb12de23..cc255b185ed 100644
--- a/htdocs/public/agenda/agendaexport.php
+++ b/htdocs/public/agenda/agendaexport.php
@@ -212,9 +212,7 @@ if ($format == 'ical') {
 if ($format == 'rss') {
 	$shortfilename .= '.rss'; $filename .= '.rss';
 }
-
 if ($shortfilename == 'dolibarrcalendar') {
-	$langs->load("main");
 	$langs->load("errors");
 	llxHeaderVierge();
 	print '<div class="error">'.$langs->trans("ErrorWrongValueForParameterX", 'format').'</div>';
diff --git a/htdocs/public/project/index.php b/htdocs/public/project/index.php
index ce48db9e729..013f290dc6a 100644
--- a/htdocs/public/project/index.php
+++ b/htdocs/public/project/index.php
@@ -72,7 +72,7 @@ $hookmanager->initHooks(array('newpayment'));
 global $dolibarr_main_instance_unique_id;
 
 // Load translation files
-$langs->loadLangs(array("main", "other", "dict", "bills", "companies", "errors", "paybox", "paypal", "stripe")); // File with generic data
+$langs->loadLangs(array("other", "dict", "bills", "companies", "errors", "paybox", "paypal", "stripe")); // File with generic data
 
 // Security check
 // No check on module enabled. Done later according to $validpaymentmethod
diff --git a/htdocs/public/project/new.php b/htdocs/public/project/new.php
index 048df9c41b3..e4a8b495d7c 100644
--- a/htdocs/public/project/new.php
+++ b/htdocs/public/project/new.php
@@ -60,13 +60,12 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 
 // Init vars
 $errmsg = '';
-$num = 0;
 $error = 0;
 $backtopage = GETPOST('backtopage', 'alpha');
 $action = GETPOST('action', 'aZ09');
 
 // Load translation files
-$langs->loadLangs(array("main", "members", "companies", "install", "other"));
+$langs->loadLangs(array("members", "companies", "install", "other"));
 
 // Security check
 if (empty($conf->projet->enabled)) {

From 8c9bec3e3bdc7b62a02b987d10e814b375dc531a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 4 Jun 2021 10:29:30 +0200
Subject: [PATCH 0381/1497] Code comment

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

diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index f7c5a1d32a8..ea5bd17fdfb 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -468,11 +468,11 @@ class Expedition extends CommonObject
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 * Create the detail (eat-by date) of the expedition line
+	 * Create the detail of the expedition line. Create 1 record into expeditiondet for each warehouse and n record for each lot in this warehouse into expeditiondet_batch.
 	 *
-	 * @param 	object		$line_ext		full line informations
+	 * @param 	object		$line_ext			Objet with full information of line. $line_ext->detail_batch must be an array of ExpeditionLineBatch
 	 * @param	array		$array_options		extrafields array
-	 * @return	int							<0 if KO, >0 if OK
+	 * @return	int								<0 if KO, >0 if OK
 	 */
 	public function create_line_batch($line_ext, $array_options = 0)
 	{
@@ -496,7 +496,7 @@ class Expedition extends CommonObject
 				// create shipment batch lines for stockLocation
 				foreach ($tab as $detbatch) {
 					if ($detbatch->entrepot_id == $stockLocation) {
-						if (!($detbatch->create($line_id) > 0)) {		// Create an expeditionlinebatch
+						if (!($detbatch->create($line_id) > 0)) {		// Create an ExpeditionLineBatch
 							$error++;
 						}
 					}

From 174c6f8a455da035abceef8b7a31fefc59f9ba60 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 4 Jun 2021 10:33:13 +0200
Subject: [PATCH 0382/1497] Update mouvementstock.class.php

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

diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php
index ec2dfbc257e..ecdfdacbf44 100644
--- a/htdocs/product/stock/class/mouvementstock.class.php
+++ b/htdocs/product/stock/class/mouvementstock.class.php
@@ -355,7 +355,9 @@ class MouvementStock extends CommonObject
 				$qtyisnotenough = 0;
 				foreach ($product->stock_warehouse[$entrepot_id]->detail_batch as $batchcursor => $prodbatch)
 				{
-					if ($batch !== $batchcursor) continue; // Do a strict comparison because $batchcursar can be an integer
+					if ((string) $batch != (string) $batchcursor) {		// Lot '59' must be different than lot '59c'
+						continue;
+					}
 					$foundforbatch = 1;
 					if ($prodbatch->qty < abs($qty)) $qtyisnotenough = $prodbatch->qty;
 					break;

From e73dad30bb9a238a46d31e07449343f23225ebec Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 4 Jun 2021 11:53:12 +0200
Subject: [PATCH 0383/1497] Warning

---
 htdocs/comm/mailing/card.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index 86aff8a36e0..bbbebfad767 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -48,6 +48,7 @@ $confirm = GETPOST('confirm', 'alpha');
 $urlfrom = GETPOST('urlfrom');
 
 $object = new Mailing($db);
+
 $result = $object->fetch($id);
 
 $extrafields = new ExtraFields($db);
@@ -78,7 +79,7 @@ $listofmethods['mail'] = 'PHP mail function';
 $listofmethods['smtps'] = 'SMTP/SMTPS socket library';
 
 // Security check
-if (!$user->rights->mailing->lire || (empty($conf->global->EXTERNAL_USERS_ARE_AUTHORIZED) && $user->socid > 0)) {
+if (empty($user->rights->mailing->lire) || (empty($conf->global->EXTERNAL_USERS_ARE_AUTHORIZED) && $user->socid > 0)) {
 	accessforbidden();
 }
 

From 1136e7dec537e58c0c4d6503b97465ae22e9750a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 4 Jun 2021 11:57:59 +0200
Subject: [PATCH 0384/1497] Update inventory.php

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

diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php
index 212f0404bd9..eee7217eef3 100644
--- a/htdocs/product/inventory/inventory.php
+++ b/htdocs/product/inventory/inventory.php
@@ -254,7 +254,7 @@ if (empty($reshook)) {
 			$error++;
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Product")), null, 'errors');
 		}
-		if (GETPOST('qtytoadd') < 0) {
+		if (price2num(GETPOST('qtytoadd'), 'MS') < 0) {
 			$error++;
 			setEventMessages($langs->trans("FieldCannotBeNegative", $langs->transnoentitiesnoconv("RealQty")), null, 'errors');
 		}

From e26f0f155fdcc5c51e2c9a2ad9bc45ef7f5ec1c1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 4 Jun 2021 12:00:54 +0200
Subject: [PATCH 0385/1497] Update inventory.php

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

diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php
index eee7217eef3..644e7ba2025 100644
--- a/htdocs/product/inventory/inventory.php
+++ b/htdocs/product/inventory/inventory.php
@@ -660,7 +660,7 @@ if ($object->id > 0) {
 			// Real quantity
 			print '<td class="center">';
 			if ($object->status == $object::STATUS_VALIDATED) {
-				$qty_view = GETPOST("id_".$obj->rowid) && GETPOST("id_".$obj->rowid) >= 0 ? GETPOST("id_".$obj->rowid) : $obj->qty_view;
+				$qty_view = GETPOST("id_".$obj->rowid) && price2num(GETPOST("id_".$obj->rowid), 'MS') >= 0 ? GETPOST("id_".$obj->rowid) : $obj->qty_view;
 				$totalfound += price2num($qty_view, 'MS');
 				print '<input type="text" class="maxwidth75 right realqty" name="id_'.$obj->rowid.'" id="id_'.$obj->rowid.'_input" value="'.$qty_view.'">';
 				print '</td>';

From c77dee0922b4b66225f08bd653acc7802f1e85ce Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Fri, 4 Jun 2021 12:27:50 +0200
Subject: [PATCH 0386/1497] changes to fetch after send

---
 htdocs/comm/mailing/card.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index 73f31f34f01..0d321c08c09 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -408,7 +408,7 @@ if (empty($reshook)) {
 				dol_syslog($db->error());
 				dol_print_error($db);
 			}
-
+			$object->fetch($id);
 			$action = '';
 		}
 	}
@@ -677,7 +677,6 @@ if (empty($reshook)) {
 $form = new Form($db);
 $htmlother = new FormOther($db);
 
-$object->fetch($id);
 $help_url = 'EN:Module_EMailing|FR:Module_Mailing|ES:M&oacute;dulo_Mailing';
 llxHeader(
 	'',

From e5ab721660ce528c5b53e76da76570d34f1b67a6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 4 Jun 2021 12:30:46 +0200
Subject: [PATCH 0387/1497] Fix sanitize

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

diff --git a/htdocs/holiday/month_report.php b/htdocs/holiday/month_report.php
index eef3ca0dcbe..698d71e5dc7 100644
--- a/htdocs/holiday/month_report.php
+++ b/htdocs/holiday/month_report.php
@@ -154,7 +154,7 @@ if (!empty($search_employee) && $search_employee > 0) {
 	$sql .= " AND cp.fk_user = ".((int) $search_employee);
 }
 if (!empty($search_type) && $search_type != '-1') {
-	$sql .= ' AND cp.fk_type IN ('.$db->escape($search_type).')';
+	$sql .= ' AND cp.fk_type IN ('.$db->sanitize($search_type).')';
 }
 if (!empty($search_description)) {
 	$sql .= natural_search('cp.description', $search_description);

From 01f5a5fb18fc722d644cb6e8f1f631eab26f0fd6 Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Thu, 27 May 2021 16:03:17 +0200
Subject: [PATCH 0388/1497] Fix update receipt eatby

---
 htdocs/fourn/commande/dispatch.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index 13989286e33..de09bb80ea4 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -464,7 +464,7 @@ if ($action == 'updateline' && $user->rights->fournisseur->commande->receptionne
 		$product = $supplierorderdispatch->fk_product;
 		$price = price2num(GETPOST('price'), '', 2);
 		$comment = $supplierorderdispatch->comment;
-		$eatby = $supplierorderdispatch->fk_product;
+		$eatby = $supplierorderdispatch->eatby;
 		$sellby = $supplierorderdispatch->sellby;
 		$batch = $supplierorderdispatch->batch;
 

From 34955b1cf9d9aab738b299850cd44a38ba5c40a5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 4 Jun 2021 12:48:18 +0200
Subject: [PATCH 0389/1497] Fix sql

---
 htdocs/install/mysql/migration/13.0.0-14.0.0.sql | 2 +-
 htdocs/install/mysql/tables/llx_product.sql      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index 25a6a6b09e8..3fb671fa9b2 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -418,7 +418,7 @@ UPDATE llx_propal SET fk_user_signature = fk_user_cloture WHERE fk_user_signatur
 UPDATE llx_propal SET date_signature = date_cloture WHERE date_signature IS NULL AND date_cloture IS NOT NULL;
 
 
-ALTER TABLE llx_product ADD COLUMN batch_mask VARCHAR(32) NULL;
+ALTER TABLE llx_product ADD COLUMN batch_mask VARCHAR(32) DEFAULT NULL;
 ALTER TABLE llx_product ADD COLUMN lifetime INTEGER NULL;
 ALTER TABLE llx_product ADD COLUMN qc_frequency INTEGER NULL;
 
diff --git a/htdocs/install/mysql/tables/llx_product.sql b/htdocs/install/mysql/tables/llx_product.sql
index 73b4473a5a4..4aad3393137 100644
--- a/htdocs/install/mysql/tables/llx_product.sql
+++ b/htdocs/install/mysql/tables/llx_product.sql
@@ -59,7 +59,7 @@ create table llx_product
   tobuy                         tinyint      DEFAULT 1,             -- Product you buy
   onportal                      tinyint      DEFAULT 0,	            -- If it is a product you sell and you want to sell it on portal (module website must be on)
   tobatch                       tinyint      DEFAULT 0 NOT NULL,    -- Is it a product that need a batch management (eat-by or lot management)
-  batch_mask			        varchar(32),                        -- If the product has batch feature, you may want to use a batch mask per product
+  batch_mask			        varchar(32)  DEFAULT NULL,          -- If the product has batch feature, you may want to use a batch mask per product
   fk_product_type               integer      DEFAULT 0,             -- Type of product: 0 for regular product, 1 for service, 9 for other (used by external module)
   duration                      varchar(6),
   seuil_stock_alerte            float      DEFAULT NULL,
@@ -95,7 +95,7 @@ create table llx_product
   canvas                        varchar(32)  DEFAULT NULL,
   finished                      tinyint      DEFAULT NULL,          -- see dictionnary c_product_nature
   lifetime                      integer      DEFAULT NULL,
-  qc_frequency 					integer 	 DEFAULT NULL,
+  qc_frequency 					integer 	 DEFAULT NULL,			-- Quality control periodicity
   hidden                        tinyint      DEFAULT 0,             -- Not used. Deprecated.
   import_key                    varchar(14),                        -- Import key
   model_pdf                     varchar(255),                       -- model save dodument used

From 292d5f6a154b97ae939be55b174ebc999e88d777 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 4 Jun 2021 12:55:03 +0200
Subject: [PATCH 0390/1497] Update card.php

---
 htdocs/compta/facture/card.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 02fb8467e21..c3ba878cdbf 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -2232,11 +2232,10 @@ if (empty($reshook)) {
 				$mesg = $langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, - 1, $conf->currency));
 				setEventMessages($mesg, null, 'errors');
 			} else {
-				// Add batchinfo if the detailline has batchinfo
-
-				if (!empty($lines[$i]->detail_batch) && ! empty($conf->global->INCUDE_BATCHINFO_ON_INVOICE)) {
+				// Add batchinfo if the detail_batch array is defined
+				if (!empty($lines[$i]->detail_batch) && is_array($lines[$i]->detail_batch) && !empty($conf->global->INVOICE_INCUDE_DETAILS_OF_LOTS_SERIALS)) {
 					foreach ($lines[$i]->detail_batch as $batchline) {
-								$desc .= ' '.$langs->trans('Batch').' '.$batchline->batch.' '.$langs->trans('printQty', $batchline->qty).' ';
+						$desc .= ' '.$langs->trans('Batch').' '.$batchline->batch.' '.$langs->trans('printQty', $batchline->qty).' ';
 					}
 				}
 

From 43be7cf996e5c221264d3a6bcf1d1dc99ef01d10 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 4 Jun 2021 12:56:40 +0200
Subject: [PATCH 0391/1497] Update card.php

---
 htdocs/compta/facture/card.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index c3ba878cdbf..9f91c462a40 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -67,7 +67,7 @@ if (!empty($conf->accounting->enabled)) {
 }
 
 // Load translation files required by the page
-$langs->loadLangs(array('bills', 'companies', 'compta', 'products', 'banks', 'main', 'withdrawals','productbatch'));
+$langs->loadLangs(array('bills', 'companies', 'compta', 'products', 'banks', 'main', 'withdrawals'));
 if (!empty($conf->incoterm->enabled)) {
 	$langs->load('incoterm');
 }
@@ -2234,6 +2234,7 @@ if (empty($reshook)) {
 			} else {
 				// Add batchinfo if the detail_batch array is defined
 				if (!empty($lines[$i]->detail_batch) && is_array($lines[$i]->detail_batch) && !empty($conf->global->INVOICE_INCUDE_DETAILS_OF_LOTS_SERIALS)) {
+					$langs->load('productbatch');
 					foreach ($lines[$i]->detail_batch as $batchline) {
 						$desc .= ' '.$langs->trans('Batch').' '.$batchline->batch.' '.$langs->trans('printQty', $batchline->qty).' ';
 					}

From 8b5922a0df094f64ec602610b0c66f9804aa8408 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 4 Jun 2021 12:57:43 +0200
Subject: [PATCH 0392/1497] Update card.php

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

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 9f91c462a40..be9e23afecc 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -2233,7 +2233,7 @@ if (empty($reshook)) {
 				setEventMessages($mesg, null, 'errors');
 			} else {
 				// Add batchinfo if the detail_batch array is defined
-				if (!empty($lines[$i]->detail_batch) && is_array($lines[$i]->detail_batch) && !empty($conf->global->INVOICE_INCUDE_DETAILS_OF_LOTS_SERIALS)) {
+				if (!empty($conf->productbatch->enabled) && !empty($lines[$i]->detail_batch) && is_array($lines[$i]->detail_batch) && !empty($conf->global->INVOICE_INCUDE_DETAILS_OF_LOTS_SERIALS)) {
 					$langs->load('productbatch');
 					foreach ($lines[$i]->detail_batch as $batchline) {
 						$desc .= ' '.$langs->trans('Batch').' '.$batchline->batch.' '.$langs->trans('printQty', $batchline->qty).' ';

From 27018bd4b43d1e73efe0161c1124ee7aa0ec8985 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 4 Jun 2021 14:25:32 +0200
Subject: [PATCH 0393/1497] Fix group by

---
 htdocs/compta/facture/list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 56404aed78b..5180a9e7141 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -551,7 +551,7 @@ if (!$sall)
 	$sql .= ' f.retained_warranty, f.retained_warranty_date_limit, f.situation_final, f.situation_cycle_ref, f.situation_counter,';
 	$sql .= ' f.fk_user_author, f.fk_multicurrency, f.multicurrency_code, f.multicurrency_tx, f.multicurrency_total_ht, f.multicurrency_total_tva,';
 	$sql .= ' f.multicurrency_total_tva, f.multicurrency_total_ttc,';
-	$sql .= ' s.rowid, s.nom, s.email, s.town, s.zip, s.fk_pays, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur,';
+	$sql .= ' s.rowid, s.nom, s.name_alias, s.email, s.town, s.zip, s.fk_pays, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur,';
 	$sql .= ' typent.code,';
 	$sql .= ' state.code_departement, state.nom,';
 	$sql .= ' country.code,';

From 2182e7fd54e299f7db7edd9bc5cecce82b6240c3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 4 Jun 2021 14:36:52 +0200
Subject: [PATCH 0394/1497] Look and feel v14

---
 htdocs/compta/facture/invoicetemplate_list.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/compta/facture/invoicetemplate_list.php b/htdocs/compta/facture/invoicetemplate_list.php
index 52dac1c462a..5f7e277076c 100644
--- a/htdocs/compta/facture/invoicetemplate_list.php
+++ b/htdocs/compta/facture/invoicetemplate_list.php
@@ -50,8 +50,7 @@ $confirm    = GETPOST('confirm', 'alpha');
 $cancel     = GETPOST('cancel', 'alpha');
 $toselect   = GETPOST('toselect', 'array');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'invoicetemplatelist'; // To manage different context of search
-
-$socid = GETPOST('socid', 'int');
+$optioncss = GETPOST('optioncss', 'alpha');
 
 $socid = GETPOST('socid', 'int');
 
@@ -394,7 +393,7 @@ if ($resql) {
 	if ($search_payment_term != '') {
 		$param .= '&search_payment_term='.urlencode($search_payment_term);
 	}
-	if ($search_recurring != '' && $search_recurrning != '-1') {
+	if ($search_recurring != '' && $search_recurring != '-1') {
 		$param .= '&search_recurring='.urlencode($search_recurring);
 	}
 	if ($search_frequency > 0) {
@@ -570,7 +569,7 @@ if ($resql) {
 	if (!empty($arrayfields['s.nom']['checked'])) {
 		print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER['PHP_SELF'], "s.nom", "", $param, "", $sortfield, $sortorder);
 	}
-	if (!empty($arrayfields['f.total_total']['checked'])) {
+	if (!empty($arrayfields['f.total_ht']['checked'])) {
 		print_liste_field_titre($arrayfields['f.total_ht']['label'], $_SERVER['PHP_SELF'], "f.total_ht", "", $param, 'class="right"', $sortfield, $sortorder);
 	}
 	if (!empty($arrayfields['f.total_tva']['checked'])) {
@@ -789,12 +788,13 @@ if ($resql) {
 				}
 			}
 			// Action column
-			print '<td class="center">';
+			print '<td class="center tdoverflowmax125">';
 			if ($user->rights->facture->creer && empty($invoicerectmp->suspended)) {
 				if ($invoicerectmp->isMaxNbGenReached()) {
 					print $langs->trans("MaxNumberOfGenerationReached");
 				} elseif (empty($objp->frequency) || $db->jdate($objp->date_when) <= $today) {
 					print '<a href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&amp;socid='.$objp->socid.'&amp;fac_rec='.$objp->facid.'">';
+					print img_picto($langs->trans("CreateBill"), 'add', 'class="paddingrightonly"');
 					print $langs->trans("CreateBill").'</a>';
 				} else {
 					print $form->textwithpicto('', $langs->trans("DateIsNotEnough"));

From 0147ffa737073733b603947ddd6aa2a7b15880f6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 4 Jun 2021 14:38:22 +0200
Subject: [PATCH 0395/1497] Fix css

---
 .../triggers/interface_50_modLdap_Ldapsynchro.class.php   | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
index 81054338b88..d4db5ebccfc 100644
--- a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
+++ b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
@@ -138,8 +138,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 						$container = $usergroup->_load_ldap_dn($oldinfo, 1);
 						$search = "(".$usergroup->_load_ldap_dn($oldinfo, 2).")";
 						$records = $ldap->search($container, $search);
-						if (count($records) && $records['count'] == 0)
-						{
+						if (count($records) && $records['count'] == 0) {
 							$olddn = '';
 						}
 
@@ -157,12 +156,11 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 						$oldinfo = $usergroup->_load_ldap_info();
 						$olddn = $usergroup->_load_ldap_dn($oldinfo);
 
-						// Verify if entry exist
+						// Verify if an entry exists
 						$container = $usergroup->_load_ldap_dn($oldinfo, 1);
 						$search = "(".$usergroup->_load_ldap_dn($oldinfo, 2).")";
 						$records = $ldap->search($container, $search);
-						if (count($records) && $records['count'] == 0)
-						{
+						if (count($records) && $records['count'] == 0) {
 							$olddn = '';
 						}
 

From 56bb2bbd14e788b6f2cb643cd9506de6741124f7 Mon Sep 17 00:00:00 2001
From: TuxGasy <garcia@soamichel.fr>
Date: Fri, 4 Jun 2021 17:10:26 +0200
Subject: [PATCH 0396/1497] On dict, test $obj->code if empty before
 translation

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

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 2bd55c6c66a..f0b6ab5ec2b 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -2015,13 +2015,13 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 			print '<td class="'.$classtd.'">';
 			$transfound = 0;
 			$transkey = '';
-			if (in_array($fieldlist[$field], array('label', 'libelle')) and !empty($obj->code))		// For label
+			if (in_array($fieldlist[$field], array('label', 'libelle')))		// For label
 			{
 				// Special case for labels
-				if ($tabname == MAIN_DB_PREFIX.'c_civility') {
+				if ($tabname == MAIN_DB_PREFIX.'c_civility' && !empty($obj->code)) {
 					$transkey = "Civility".strtoupper($obj->code);
 				}
-				if ($tabname == MAIN_DB_PREFIX.'c_payment_term') {
+				if ($tabname == MAIN_DB_PREFIX.'c_payment_term' && !empty($obj->code)) {
 					$langs->load("bills");
 					$transkey = "PaymentConditionShort".strtoupper($obj->code);
 				}

From 3fb1fb63b471b3f6a639a4dab7d6ce74ef68d7ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Fri, 4 Jun 2021 22:16:25 +0200
Subject: [PATCH 0397/1497] test zapier

---
 dev/examples/zapier/creates/thirdparty.js | 4 ++--
 dev/examples/zapier/package.json          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev/examples/zapier/creates/thirdparty.js b/dev/examples/zapier/creates/thirdparty.js
index 3e20fd10e41..2abeef6ae4c 100644
--- a/dev/examples/zapier/creates/thirdparty.js
+++ b/dev/examples/zapier/creates/thirdparty.js
@@ -6,7 +6,7 @@ const createThirdparty = async (z, bundle) => {
     const response = await z.request({
         method: 'POST',
         url: apiurl,
-        body: JSON.stringify({
+        body: {
             name: bundle.inputData.name,
             name_alias: bundle.inputData.name_alias,
             ref_ext: bundle.inputData.ref_ext,
@@ -24,7 +24,7 @@ const createThirdparty = async (z, bundle) => {
             code_client: bundle.inputData.code_client,
             code_fournisseur: bundle.inputData.code_fournisseur,
             sens: 'fromzapier'
-        })
+        }
     });
     const result = z.JSON.parse(response.content);
     // api returns an integer when ok, a json when ko
diff --git a/dev/examples/zapier/package.json b/dev/examples/zapier/package.json
index cc0768a27ef..4d5c5daa867 100644
--- a/dev/examples/zapier/package.json
+++ b/dev/examples/zapier/package.json
@@ -15,7 +15,7 @@
     "npm": ">=5.6.0"
   },
   "dependencies": {
-    "zapier-platform-core": "11.0.0"
+    "zapier-platform-core": "11.0.1"
   },
   "devDependencies": {
     "mocha": "^5.2.0",

From 3440024efebf877b219d66c55917d7ad4e0201f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Fri, 4 Jun 2021 22:35:05 +0200
Subject: [PATCH 0398/1497] test zapier

---
 dev/examples/zapier/triggers/thirdparty.js | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/dev/examples/zapier/triggers/thirdparty.js b/dev/examples/zapier/triggers/thirdparty.js
index 4656f836e74..0fecd4434ce 100644
--- a/dev/examples/zapier/triggers/thirdparty.js
+++ b/dev/examples/zapier/triggers/thirdparty.js
@@ -56,6 +56,12 @@ const getThirdparty = (z, bundle) => {
         fournisseur: bundle.cleanedRequest.fournisseur,
         code_client: bundle.cleanedRequest.code_client,
         code_fournisseur: bundle.cleanedRequest.code_fournisseur,
+        idprof1: bundle.cleanedRequest.idprof1,
+        idprof2: bundle.cleanedRequest.idprof2,
+        idprof3: bundle.cleanedRequest.idprof3,
+        idprof4: bundle.cleanedRequest.idprof4,
+        idprof5: bundle.cleanedRequest.idprof5,
+        idprof6: bundle.cleanedRequest.idprof6,
         authorId: bundle.cleanedRequest.authorId,
         createdAt: bundle.cleanedRequest.createdAt,
         action: bundle.cleanedRequest.action
@@ -170,7 +176,13 @@ module.exports = {
             {key: 'client', label: 'Customer/Prospect 0/1/2/3'},
             {key: 'fournisseur', label: 'Supplier 0/1'},
             {key: 'code_client', label: 'Customer code'},
-            {key: 'code_fournisseur', label: 'Supplier code'}
+            {key: 'code_fournisseur', label: 'Supplier code'},
+            {key: 'idprof1', label: 'Id Prof 1'},
+            {key: 'idprof2', label: 'Id Prof 2'},
+            {key: 'idprof3', label: 'Id Prof 3'},
+            {key: 'idprof4', label: 'Id Prof 4'},
+            {key: 'idprof5', label: 'Id Prof 5'},
+            {key: 'idprof6', label: 'Id Prof 6'}
         ]
     }
 };

From c94946b934758236a82f3668ffcf969912b823a8 Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Fri, 4 Jun 2021 23:14:31 +0200
Subject: [PATCH 0399/1497] Fix #17743 - token was hashed with
 membersubscription

#Fix #17743 - token was hashed with membersubscription

for retro-compatibility we must try to hash token wth both "membre" ans "membersubscription" to verify unique secure key d'or member
---
 htdocs/public/payment/newpayment.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 377077531ae..f19aef7f79c 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -281,6 +281,9 @@ if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
 	if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
 		if ($tmpsource && $REF) {
 			$token = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$tmpsource.$REF, 2); // Use the source in the hash to avoid duplicates if the references are identical
+			if ($SECUREKEY != $token) {
+				$token = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$source.$REF, 2); // for retro-compatibility (token may have been hashed with membersubscription in external module)
+			}
 		} else {
 			$token = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
 		}

From d327de4e80b0e0bf60e9256bd5f186f7ee00e792 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 4 Jun 2021 23:39:52 +0200
Subject: [PATCH 0400/1497] Doc

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 531a19e0be9..34162fd5682 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ You can freely use, study, modify or distribute it according to its licence.
 
 You can use it as a standalone application or as a web application to access it from the Internet or a LAN.
 
-Dolibarr has a large community ready to help you, free forums and [officially preferred partners ready to offer commercial support should you need it](https://partners.dolibarr.org)
+Dolibarr has a large community ready to help you, free forums and [preferred partners ready to offer commercial support should you need it](https://partners.dolibarr.org)
 
 ![ScreenShot](https://www.dolibarr.org/medias/dolibarr_screenshot1_1920x1080.jpg)
 
@@ -122,7 +122,7 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
 - Electronic Document Management (EDM)
 - Foundations members management
 - Point of Sale (POS)
-- … (around 100 modules available by default, + 1000 on the addon market place)
+- … (around 100 modules available by default, 1000+ on the addon market place)
 
 ### Other application/modules
 

From 420bf440ef32c98f08a9b6c6f50284336edf93a3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 5 Jun 2021 00:53:07 +0200
Subject: [PATCH 0401/1497] Update newpayment.php

---
 htdocs/public/payment/newpayment.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index f19aef7f79c..a0e6a1854fd 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -278,11 +278,13 @@ if ($tmpsource == 'membersubscription') {
 }
 $valid = true;
 if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
+	$token = '';
+	$tokenoldcompat = '';
 	if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
 		if ($tmpsource && $REF) {
 			$token = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$tmpsource.$REF, 2); // Use the source in the hash to avoid duplicates if the references are identical
-			if ($SECUREKEY != $token) {
-				$token = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$source.$REF, 2); // for retro-compatibility (token may have been hashed with membersubscription in external module)
+			if ($tmpsource != $source) {
+				$tokenoldcompat = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$source.$REF, 2); // for retro-compatibility (token may have been hashed with membersubscription in external module)
 			}
 		} else {
 			$token = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
@@ -290,7 +292,7 @@ if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
 	} else {
 		$token = $conf->global->PAYMENT_SECURITY_TOKEN;
 	}
-	if ($SECUREKEY != $token) {
+	if ($SECUREKEY != $token && $SECUREKEY != $tokenoldcompat) {
 		if (empty($conf->global->PAYMENT_SECURITY_ACCEPT_ANY_TOKEN)) {
 			$valid = false; // PAYMENT_SECURITY_ACCEPT_ANY_TOKEN is for backward compatibility
 		} else {

From 246cb09ba58a02b8479d21a48f9a5916c256fa29 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 5 Jun 2021 00:56:28 +0200
Subject: [PATCH 0402/1497] Update newpayment.php

---
 htdocs/public/payment/newpayment.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index a0e6a1854fd..b71dd2df499 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -292,7 +292,7 @@ if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
 	} else {
 		$token = $conf->global->PAYMENT_SECURITY_TOKEN;
 	}
-	if ($SECUREKEY != $token && $SECUREKEY != $tokenoldcompat) {
+	if ($SECUREKEY != $token && (empty($tokenoldcompat) || $SECUREKEY != $tokenoldcompat)) {
 		if (empty($conf->global->PAYMENT_SECURITY_ACCEPT_ANY_TOKEN)) {
 			$valid = false; // PAYMENT_SECURITY_ACCEPT_ANY_TOKEN is for backward compatibility
 		} else {

From 6ae4a75ac2405562adbda1a045f5571b6b19cae5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 5 Jun 2021 01:04:09 +0200
Subject: [PATCH 0403/1497] Update fournisseur.commande.class.php

---
 htdocs/fourn/class/fournisseur.commande.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 9b643ff1464..be13ad412aa 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -749,8 +749,8 @@ class CommandeFournisseur extends CommonOrder
 		$statusLong = $langs->transnoentitiesnoconv($this->statuts[$status]).$billedtext;
 		$statusShort = $langs->transnoentitiesnoconv($this->statutshort[$status]);
 
-		$parameters = array('status' => $status, 'mode' => $mode, 'billed' => $billed, 'obj'=>$this);
-		$reshook = $hookmanager->executeHooks('LibStatut', $parameters, $object); // Note that $action and $object may have been modified by hook
+		$parameters = array('status' => $status, 'mode' => $mode, 'billed' => $billed);
+		$reshook = $hookmanager->executeHooks('LibStatut', $parameters, $this); // Note that $action and $object may have been modified by hook
 		if ($reshook > 0) {
 			return $hookmanager->resPrint;
 		}

From f0118183c848cbf5443bc394fa8c0cdad20e4d0e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 5 Jun 2021 01:11:05 +0200
Subject: [PATCH 0404/1497] Clean code

---
 .../class/fournisseur.commande.class.php      |   2 +
 htdocs/public/payment/newpayment.php          | 185 +++++++++---------
 2 files changed, 94 insertions(+), 93 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index d094916ef38..06f893026a5 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -156,6 +156,8 @@ class CommandeFournisseur extends CommonOrder
 	public $user_approve_id;
 	public $user_approve_id2; // Used when SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED is set
 
+	public $refuse_note;
+
 	public $extraparams = array();
 
 	/**
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 377077531ae..49093e0913e 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -907,7 +907,6 @@ print '<tr><td align="left" colspan="2" class="opacitymedium">'.$langs->trans("T
 
 $found = false;
 $error = 0;
-$var = false;
 
 $object = null;
 
@@ -923,17 +922,17 @@ if (!$source) {
 	}
 
 	// 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 '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("Creditor");
+	print '</td><td class="CTableRow2"><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");
+	print '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("Amount");
 	if (empty($amount)) {
 		print ' ('.$langs->trans("ToComplete").')';
 	}
-	print '</td><td class="CTableRow'.($var ? '1' : '2').'">';
+	print '</td><td class="CTableRow2">';
 	if (empty($amount) || !is_numeric($amount)) {
 		print '<input type="hidden" name="amount" value="'.price2num(GETPOST("amount", 'alpha'), 'MT').'">';
 		print '<input class="flat maxwidth75" type="text" name="newamount" value="'.price2num(GETPOST("newamount", "alpha"), 'MT').'">';
@@ -948,8 +947,8 @@ 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 style="word-break: break-all;">'.$fulltag.'</b>';
+	print '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("PaymentCode");
+	print '</td><td class="CTableRow2"><b style="word-break: break-all;">'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
 	print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
 	print '</td></tr>'."\n";
@@ -995,14 +994,14 @@ 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 '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("Creditor");
+	print '</td><td class="CTableRow2"><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>';
+	print '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("ThirdParty");
+	print '</td><td class="CTableRow2"><b>'.$order->thirdparty->name.'</b>';
 	print '</td></tr>'."\n";
 
 	// Object
@@ -1010,8 +1009,8 @@ if ($source == 'order') {
 	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 '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("Designation");
+	print '</td><td class="CTableRow2">'.$text;
 	print '<input type="hidden" name="s" value="'.dol_escape_htmltag($source).'">';
 	print '<input type="hidden" name="ref" value="'.dol_escape_htmltag($order->ref).'">';
 	print '<input type="hidden" name="dol_id" value="'.dol_escape_htmltag($order->id).'">';
@@ -1024,11 +1023,11 @@ if ($source == 'order') {
 	print '</td></tr>'."\n";
 
 	// Amount
-	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("Amount");
+	print '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("Amount");
 	if (empty($amount)) {
 		print ' ('.$langs->trans("ToComplete").')';
 	}
-	print '</td><td class="CTableRow'.($var ? '1' : '2').'">';
+	print '</td><td class="CTableRow2">';
 	if (empty($amount) || !is_numeric($amount)) {
 		print '<input type="hidden" name="amount" value="'.price2num(GETPOST("amount", 'alpha'), 'MT').'">';
 		print '<input class="flat maxwidth75" type="text" name="newamount" value="'.price2num(GETPOST("newamount", "alpha"), 'MT').'">';
@@ -1043,8 +1042,8 @@ 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 style="word-break: break-all;">'.$fulltag.'</b>';
+	print '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("PaymentCode");
+	print '</td><td class="CTableRow2"><b style="word-break: break-all;">'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.dol_escape_htmltag($tag).'">';
 	print '<input type="hidden" name="fulltag" value="'.dol_escape_htmltag($fulltag).'">';
 	print '</td></tr>'."\n";
@@ -1119,14 +1118,14 @@ 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 '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("Creditor");
+	print '</td><td class="CTableRow2"><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>';
+	print '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("ThirdParty");
+	print '</td><td class="CTableRow2"><b>'.$invoice->thirdparty->name.'</b>';
 	print '</td></tr>'."\n";
 
 	// Object
@@ -1134,8 +1133,8 @@ if ($source == 'invoice') {
 	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 '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("Designation");
+	print '</td><td class="CTableRow2">'.$text;
 	print '<input type="hidden" name="s" value="'.dol_escape_htmltag($source).'">';
 	print '<input type="hidden" name="ref" value="'.dol_escape_htmltag($invoice->ref).'">';
 	print '<input type="hidden" name="dol_id" value="'.dol_escape_htmltag($invoice->id).'">';
@@ -1148,11 +1147,11 @@ if ($source == 'invoice') {
 	print '</td></tr>'."\n";
 
 	// Amount
-	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("PaymentAmount");
+	print '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("PaymentAmount");
 	if (empty($amount) && empty($object->paye)) {
 		print ' ('.$langs->trans("ToComplete").')';
 	}
-	print '</td><td class="CTableRow'.($var ? '1' : '2').'">';
+	print '</td><td class="CTableRow2">';
 	if ($object->type == $object::TYPE_CREDIT_NOTE) {
 		print '<b>'.$langs->trans("CreditNote").'</b>';
 	} elseif (empty($object->paye)) {
@@ -1174,8 +1173,8 @@ if ($source == 'invoice') {
 	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 style="word-break: break-all;">'.$fulltag.'</b>';
+	print '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("PaymentCode");
+	print '</td><td class="CTableRow2"><b style="word-break: break-all;">'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
 	print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
 	print '</td></tr>'."\n";
@@ -1290,14 +1289,14 @@ if ($source == 'contractline') {
 	}
 
 	// 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 '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("Creditor");
+	print '</td><td class="CTableRow2"><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>';
+	print '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("ThirdParty");
+	print '</td><td class="CTableRow2"><b>'.$contract->thirdparty->name.'</b>';
 	print '</td></tr>'."\n";
 
 	// Object
@@ -1319,8 +1318,8 @@ if ($source == 'contractline') {
 	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 '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("Designation");
+	print '</td><td class="CTableRow2">'.$text;
 	print '<input type="hidden" name="source" value="'.dol_escape_htmltag($source).'">';
 	print '<input type="hidden" name="ref" value="'.dol_escape_htmltag($contractline->ref).'">';
 	print '<input type="hidden" name="dol_id" value="'.dol_escape_htmltag($contractline->id).'">';
@@ -1349,17 +1348,17 @@ if ($source == 'contractline') {
 			$duration = $contractline->product->duration_value.' '.$dur[$contractline->product->duration_unit];
 		}
 	}
-	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$label.'</td>';
-	print '<td class="CTableRow'.($var ? '1' : '2').'"><b>'.($duration ? $duration : $qty).'</b>';
+	print '<tr class="CTableRow2"><td class="CTableRow2">'.$label.'</td>';
+	print '<td class="CTableRow2"><b>'.($duration ? $duration : $qty).'</b>';
 	print '<input type="hidden" name="newqty" value="'.dol_escape_htmltag($qty).'">';
 	print '</b></td></tr>'."\n";
 
 	// Amount
-	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("Amount");
+	print '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("Amount");
 	if (empty($amount)) {
 		print ' ('.$langs->trans("ToComplete").')';
 	}
-	print '</td><td class="CTableRow'.($var ? '1' : '2').'">';
+	print '</td><td class="CTableRow2">';
 	if (empty($amount) || !is_numeric($amount)) {
 		print '<input type="hidden" name="amount" value="'.price2num(GETPOST("amount", 'alpha'), 'MT').'">';
 		print '<input class="flat maxwidth75" type="text" name="newamount" value="'.price2num(GETPOST("newamount", "alpha"), 'MT').'">';
@@ -1374,8 +1373,8 @@ 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 style="word-break: break-all;">'.$fulltag.'</b>';
+	print '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("PaymentCode");
+	print '</td><td class="CTableRow2"><b style="word-break: break-all;">'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
 	print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
 	print '</td></tr>'."\n";
@@ -1451,14 +1450,14 @@ if ($source == 'member' || $source == 'membersubscription') {
 	$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 '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("Creditor");
+	print '</td><td class="CTableRow2"><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("Member");
-	print '</td><td class="CTableRow'.($var ? '1' : '2').'"><b>';
+	print '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("Member");
+	print '</td><td class="CTableRow2"><b>';
 	if ($member->morphy == 'mor' && !empty($member->societe)) {
 		print $member->societe;
 	} else {
@@ -1472,29 +1471,29 @@ if ($source == 'member' || $source == 'membersubscription') {
 	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 '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("Designation");
+	print '</td><td class="CTableRow2">'.$text;
 	print '<input type="hidden" name="source" value="'.dol_escape_htmltag($source).'">';
 	print '<input type="hidden" name="ref" value="'.dol_escape_htmltag($member->ref).'">';
 	print '</td></tr>'."\n";
 
 	if ($object->datefin > 0) {
-		print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("DateEndSubscription");
-		print '</td><td class="CTableRow'.($var ? '1' : '2').'">'.dol_print_date($member->datefin, 'day');
+		print '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("DateEndSubscription");
+		print '</td><td class="CTableRow2">'.dol_print_date($member->datefin, 'day');
 		print '</td></tr>'."\n";
 	}
 
 	if ($member->last_subscription_date || $member->last_subscription_amount) {
 		// Last subscription date
 
-		print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("LastSubscriptionDate");
-		print '</td><td class="CTableRow'.($var ? '1' : '2').'">'.dol_print_date($member->last_subscription_date, 'day');
+		print '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("LastSubscriptionDate");
+		print '</td><td class="CTableRow2">'.dol_print_date($member->last_subscription_date, 'day');
 		print '</td></tr>'."\n";
 
 		// Last subscription amount
 
-		print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("LastSubscriptionAmount");
-		print '</td><td class="CTableRow'.($var ? '1' : '2').'">'.price($member->last_subscription_amount);
+		print '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("LastSubscriptionAmount");
+		print '</td><td class="CTableRow2">'.price($member->last_subscription_amount);
 		print '</td></tr>'."\n";
 
 		if (empty($amount) && !GETPOST('newamount', 'alpha')) {
@@ -1513,8 +1512,8 @@ if ($source == 'member' || $source == 'membersubscription') {
 			$amountbytype = $adht->amountByType(1);
 
 			// Last member type
-			print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("LastMemberType");
-			print '</td><td class="CTableRow'.($var ? '1' : '2').'">'.dol_escape_htmltag($member->type);
+			print '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("LastMemberType");
+			print '</td><td class="CTableRow2">'.dol_escape_htmltag($member->type);
 			print "</td></tr>\n";
 
 			// Set the new member type
@@ -1526,25 +1525,25 @@ if ($source == 'member' || $source == 'membersubscription') {
 				// Set amount for the subscription
 				$amount = (!empty($amountbytype[$member->typeid])) ? $amountbytype[$member->typeid]  : $member->last_subscription_amount;
 
-				print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("NewSubscription");
-				print '</td><td class="CTableRow'.($var ? '1' : '2').'">';
+				print '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("NewSubscription");
+				print '</td><td class="CTableRow2">';
 				print $form->selectarray("typeid", $adht->liste_array(1), $member->typeid, 0, 0, 0, 'onchange="window.location.replace(\''.$urlwithroot.'/public/payment/newpayment.php?source='.urlencode($source).'&ref='.urlencode($ref).'&amount='.urlencode($amount).'&typeid=\' + this.value + \'&securekey='.urlencode($SECUREKEY).'\');"', 0, 0, 0, '', '', 1);
 				print "</td></tr>\n";
 			} elseif ($action == dopayment) {
-				print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("NewMemberType");
-				print '</td><td class="CTableRow'.($var ? '1' : '2').'">'.dol_escape_htmltag($member->type);
+				print '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("NewMemberType");
+				print '</td><td class="CTableRow2">'.dol_escape_htmltag($member->type);
 				print '<input type="hidden" name="membertypeid" value="'.$member->typeid.'">';
 				print "</td></tr>\n";
 			}
 		} else {
-			print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("MemberType");
-			print '</td><td class="CTableRow'.($var ? '1' : '2').'">'.dol_escape_htmltag($member->type);
+			print '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("MemberType");
+			print '</td><td class="CTableRow2">'.dol_escape_htmltag($member->type);
 			print "</td></tr>\n";
 		}
 	}
 
 	// Amount
-	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("Amount");
+	print '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("Amount");
 	if (empty($amount)) {
 		if (empty($conf->global->MEMBER_NEWFORM_AMOUNT)) {
 			print ' ('.$langs->trans("ToComplete");
@@ -1556,7 +1555,7 @@ if ($source == 'member' || $source == 'membersubscription') {
 			print ')';
 		}
 	}
-	print '</td><td class="CTableRow'.($var ? '1' : '2').'">';
+	print '</td><td class="CTableRow2">';
 	$valtoshow = '';
 	if (empty($amount) || !is_numeric($amount)) {
 		$valtoshow = price2num(GETPOST("newamount", 'alpha'), 'MT');
@@ -1601,8 +1600,8 @@ if ($source == 'member' || $source == 'membersubscription') {
 	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 style="word-break: break-all;">'.$fulltag.'</b>';
+	print '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("PaymentCode");
+	print '</td><td class="CTableRow2"><b style="word-break: break-all;">'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
 	print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
 	print '</td></tr>'."\n";
@@ -1677,14 +1676,14 @@ if ($source == 'donation') {
 	$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 '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("Creditor");
+	print '</td><td class="CTableRow2"><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>';
+	print '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("ThirdParty");
+	print '</td><td class="CTableRow2"><b>';
 	if ($don->morphy == 'mor' && !empty($don->societe)) {
 		print $don->societe;
 	} else {
@@ -1698,14 +1697,14 @@ if ($source == 'donation') {
 	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 '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("Designation");
+	print '</td><td class="CTableRow2">'.$text;
 	print '<input type="hidden" name="source" value="'.dol_escape_htmltag($source).'">';
 	print '<input type="hidden" name="ref" value="'.dol_escape_htmltag($don->ref).'">';
 	print '</td></tr>'."\n";
 
 	// Amount
-	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("Amount");
+	print '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("Amount");
 	if (empty($amount)) {
 		if (empty($conf->global->MEMBER_NEWFORM_AMOUNT)) {
 			print ' ('.$langs->trans("ToComplete");
@@ -1717,7 +1716,7 @@ if ($source == 'donation') {
 			print ')';
 		}
 	}
-	print '</td><td class="CTableRow'.($var ? '1' : '2').'">';
+	print '</td><td class="CTableRow2">';
 	$valtoshow = '';
 	if (empty($amount) || !is_numeric($amount)) {
 		$valtoshow = price2num(GETPOST("newamount", 'alpha'), 'MT');
@@ -1757,8 +1756,8 @@ if ($source == 'donation') {
 	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 style="word-break: break-all;">'.$fulltag.'</b>';
+	print '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("PaymentCode");
+	print '</td><td class="CTableRow2"><b style="word-break: break-all;">'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
 	print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
 	print '</td></tr>'."\n";
@@ -1811,29 +1810,29 @@ if ($source == 'conferencesubscription') {
 	$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 '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("Creditor");
+	print '</td><td class="CTableRow2"><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("Attendee");
-	print '</td><td class="CTableRow'.($var ? '1' : '2').'"><b>';
+	print '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("Attendee");
+	print '</td><td class="CTableRow2"><b>';
 	print $thirdparty->name;
 	print '</b>';
 	print '</td></tr>'."\n";
 
 	// Object
 	$text = '<b>'.$langs->trans("PaymentConferenceAttendee").'</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 '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("Designation");
+	print '</td><td class="CTableRow2">'.$text;
 	print '<input type="hidden" name="source" value="'.dol_escape_htmltag($source).'">';
 	print '<input type="hidden" name="ref" value="'.dol_escape_htmltag($invoice->id).'">';
 	print '</td></tr>'."\n";
 
 	// Amount
-	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("Amount");
-	print '</td><td class="CTableRow'.($var ? '1' : '2').'">';
+	print '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("Amount");
+	print '</td><td class="CTableRow2">';
 	$valtoshow = $amount;
 	print '<b>'.price($valtoshow).'</b>';
 	print '<input type="hidden" name="amount" value="'.$valtoshow.'">';
@@ -1845,8 +1844,8 @@ if ($source == 'conferencesubscription') {
 	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 style="word-break: break-all;">'.$fulltag.'</b>';
+	print '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("PaymentCode");
+	print '</td><td class="CTableRow2"><b style="word-break: break-all;">'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
 	print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
 	print '</td></tr>'."\n";
@@ -1897,29 +1896,29 @@ if ($source == 'boothlocation') {
 	$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 '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("Creditor");
+	print '</td><td class="CTableRow2"><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("Attendee");
-	print '</td><td class="CTableRow'.($var ? '1' : '2').'"><b>';
+	print '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("Attendee");
+	print '</td><td class="CTableRow2"><b>';
 	print $thirdparty->name;
 	print '</b>';
 	print '</td></tr>'."\n";
 
 	// Object
 	$text = '<b>'.$langs->trans("PaymentBoothLocation").'</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 '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("Designation");
+	print '</td><td class="CTableRow2">'.$text;
 	print '<input type="hidden" name="source" value="'.dol_escape_htmltag($source).'">';
 	print '<input type="hidden" name="ref" value="'.dol_escape_htmltag($invoice->id).'">';
 	print '</td></tr>'."\n";
 
 	// Amount
-	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("Amount");
-	print '</td><td class="CTableRow'.($var ? '1' : '2').'">';
+	print '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("Amount");
+	print '</td><td class="CTableRow2">';
 	$valtoshow = $amount;
 	print '<b>'.price($valtoshow).'</b>';
 	print '<input type="hidden" name="amount" value="'.$valtoshow.'">';
@@ -1931,8 +1930,8 @@ if ($source == 'boothlocation') {
 	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 style="word-break: break-all;">'.$fulltag.'</b>';
+	print '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("PaymentCode");
+	print '</td><td class="CTableRow2"><b style="word-break: break-all;">'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
 	print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
 	print '</td></tr>'."\n";

From 3e53ab5bfe13144ce3deee0e7fe345dac8fe31d2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 5 Jun 2021 01:17:16 +0200
Subject: [PATCH 0405/1497] Fix scrutinizer

---
 htdocs/user/class/api_users.class.php | 6 ++----
 htdocs/user/class/user.class.php      | 5 +++++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/htdocs/user/class/api_users.class.php b/htdocs/user/class/api_users.class.php
index e760997f3c8..9fa84042c3a 100644
--- a/htdocs/user/class/api_users.class.php
+++ b/htdocs/user/class/api_users.class.php
@@ -248,8 +248,8 @@ class Users extends DolibarrApi
 	 *
 	 * @url	GET /info
 	 *
-	 * @param	int			$includepermissions	Set this to 1 to have the array of permissions loaded (not done by default for performance purpose)
-	 * @return  array|mixed 					Data without useless information
+	 * @param	int			$includepermissions		Set this to 1 to have the array of permissions loaded (not done by default for performance purpose)
+	 * @return  array|mixed 						Data without useless information
 	 *
 	 * @throws RestException 401     Insufficient rights
 	 * @throws RestException 404     User or group not found
@@ -371,11 +371,9 @@ class Users extends DolibarrApi
 			if ($field == 'pass') {
 				if ($this->useraccount->id != DolibarrApiAccess::$user->id && empty(DolibarrApiAccess::$user->rights->user->user->password)) {
 					throw new RestException(401, 'You are not allowed to modify password of other users');
-					continue;
 				}
 				if ($this->useraccount->id == DolibarrApiAccess::$user->id && empty(DolibarrApiAccess::$user->rights->user->self->password)) {
 					throw new RestException(401, 'You are not allowed to modify your own password');
-					continue;
 				}
 			}
 			if (DolibarrApiAccess::$user->admin) {	// If user for API is admin
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index b8e63ea8f19..910edce8c17 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -299,6 +299,11 @@ class User extends CommonObject
 	 */
 	public $nb_rights;
 
+	/**
+	 * @var array	To store list of groups of user (used by API /info for example)
+	 */
+	public $user_group_list;
+
 	/**
 	 * @var array Cache array of already loaded permissions
 	 */

From 39adaec7eb9616c543d709ab539461dec48a27af Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 5 Jun 2021 01:29:24 +0200
Subject: [PATCH 0406/1497] Fix var not found

---
 htdocs/compta/bank/class/account.class.php |  8 +++++++-
 htdocs/compta/charges/index.php            | 10 ++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 8c29a9ffc36..e629d7620f0 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -177,6 +177,10 @@ class Account extends CommonObject
 	 * @var int ID
 	 */
 	public $fk_accountancy_journal;
+	/**
+	 * @var string	Label of journal
+	 */
+	public $accountancy_journal;
 
 	/**
 	 * Currency code
@@ -281,6 +285,7 @@ class Account extends CommonObject
 		'rappro' =>array('type'=>'smallint(6)', 'label'=>'Rappro', 'enabled'=>1, 'visible'=>-1, 'position'=>120),
 		'url' =>array('type'=>'varchar(128)', 'label'=>'Url', 'enabled'=>1, 'visible'=>-1, 'position'=>125),
 		'account_number' =>array('type'=>'varchar(32)', 'label'=>'Account number', 'enabled'=>1, 'visible'=>-1, 'position'=>130),
+		'fk_accountancy_journal' =>array('type'=>'integer', 'label'=>'Accountancy journal ID', 'enabled'=>1, 'visible'=>-1, 'position'=>132),
 		'accountancy_journal' =>array('type'=>'varchar(20)', 'label'=>'Accountancy journal', 'enabled'=>1, 'visible'=>-1, 'position'=>135),
 		'currency_code' =>array('type'=>'varchar(3)', 'label'=>'Currency code', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>140),
 		'min_allowed' =>array('type'=>'integer', 'label'=>'Min allowed', 'enabled'=>1, 'visible'=>-1, 'position'=>145),
@@ -294,7 +299,6 @@ class Account extends CommonObject
 		'model_pdf' =>array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>1, 'visible'=>0, 'position'=>175),
 		'import_key' =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>180),
 		'extraparams' =>array('type'=>'varchar(255)', 'label'=>'Extraparams', 'enabled'=>1, 'visible'=>-1, 'position'=>185),
-		'fk_accountancy_journal' =>array('type'=>'integer', 'label'=>'Fk accountancy journal', 'enabled'=>1, 'visible'=>-1, 'position'=>190),
 	);
 	// END MODULEBUILDER PROPERTIES
 
@@ -311,9 +315,11 @@ class Account extends CommonObject
 	 */
 	const TYPE_SAVINGS = 0;
 
+
 	const STATUS_OPEN = 0;
 	const STATUS_CLOSED = 1;
 
+
 	/**
 	 *  Constructor
 	 *
diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php
index f171546f6c1..be7c88c0a1a 100644
--- a/htdocs/compta/charges/index.php
+++ b/htdocs/compta/charges/index.php
@@ -227,9 +227,10 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire) {
 					$accountstatic->id = $obj->bid;
 					$accountstatic->ref = $obj->bref;
 					$accountstatic->number = $obj->bnumber;
-					$accountstatic->accountancy_number = $obj->account_number;
-					$accountstatic->accountancy_journal = $obj->accountancy_journal;
+					$accountstatic->account_number = $obj->account_number;
+					$accountstatic->fk_accountancy_journal = $obj->fk_accountancy_journal;
 					$accountstatic->label = $obj->blabel;
+
 					print $accountstatic->getNomUrl(1);
 				} else {
 					print '&nbsp;';
@@ -348,9 +349,10 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire) {
 					$accountstatic->id = $obj->bid;
 					$accountstatic->ref = $obj->bref;
 					$accountstatic->number = $obj->bnumber;
-					$accountstatic->accountancy_number = $obj->account_number;
-					$accountstatic->accountancy_journal = $obj->accountancy_journal;
+					$accountstatic->account_number = $obj->account_number;
+					$accountstatic->fk_accountancy_journal = $obj->fk_accountancy_journal;
 					$accountstatic->label = $obj->blabel;
+
 					print $accountstatic->getNomUrl(1);
 				} else {
 					print '&nbsp;';

From b6ba1de3b39acb2835f9fa5e4fc9fbc760631e7c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 5 Jun 2021 02:18:45 +0200
Subject: [PATCH 0407/1497] Fix remove use of captcha on backoffice for ticket
 creation

---
 htdocs/core/class/html.formticket.class.php | 2 +-
 htdocs/ticket/card.php                      | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index 23c220d43df..b10ac80416f 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -259,7 +259,7 @@ class FormTicket
 		$doleditor->Create();
 		print '</td></tr>';
 
-		if (!empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA)) {
+		if ($public && !empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA)) {
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
 			print '<tr><td class="titlefield"><label for="email"><span class="fieldrequired">'.$langs->trans("SecurityCode").'</span></label></td><td>';
 			print '<span class="span-icon-security inline-block">';
diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index 5e2ef1e804b..96a5ad0c120 100644
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -53,6 +53,7 @@ $ref       = GETPOST('ref', 'alpha');
 $projectid = GETPOST('projectid', 'int');
 $cancel    = GETPOST('cancel', 'alpha');
 $action    = GETPOST('action', 'aZ09');
+$backtopage = GETPOST('$backtopage', 'alpha');
 
 $notifyTiers = GETPOST("notify_tiers_at_create", 'alpha');
 
@@ -152,7 +153,7 @@ if (empty($reshook)) {
 	}
 
 	// Action to add an action (not a message)
-	if (GETPOST('add', 'alpha') && $user->rights->ticket->write) {
+	if (GETPOST('add', 'alpha') && !empty($user->rights->ticket->write)) {
 		$error = 0;
 
 		if (!GETPOST("subject", 'alphanohtml')) {

From 865bf3b8493c4273f0e0f6e30fa05aa8ddc7c843 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 5 Jun 2021 02:42:49 +0200
Subject: [PATCH 0408/1497] CSS

---
 htdocs/theme/eldy/global.inc.php             | 4 ++--
 htdocs/theme/md/style.css.php                | 9 +++++++--
 htdocs/ticket/class/actions_ticket.class.php | 8 +++++---
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 4468c36a7da..70e5229ba28 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -348,7 +348,7 @@ a.butStatus {
 	padding-right: 5px;
 	background-color: transparent;
 	color: var(--colortext) !important;
-	border: 2px solid var( --butactionbg);
+	border: 2px solid var( --butactionbg) !important;
 	margin: 0 0.45em !important;
 }
 
@@ -3894,7 +3894,7 @@ table.noborder.paymenttable {
 }
 .paymenttable tr td:first-child, .margintable tr td:first-child
 {
-	padding-left: 2px;
+	//padding-left: 2px;
 }
 .paymenttable, .margintable tr td {
 	height: 22px;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index f1fb649f4af..7dd19673b5e 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -3902,14 +3902,19 @@ tr.liste_sub_total, tr.liste_sub_total td {
 }
 
 .paymenttable, .margintable {
+	margin: 0px 0px 0px 0px !important;
+}
+.paymenttable, .margintable:not(.margintablenotop) {
 	border-top-width: <?php echo $borderwidth ?>px !important;
 	border-top-color: rgb(<?php echo $colortopbordertitle1 ?>) !important;
 	border-top-style: solid !important;
-	margin: 0px 0px 0px 0px !important;
+}
+.margintable.margintablenotop {
+	border-top-width: 0;
 }
 .paymenttable tr td:first-child, .margintable tr td:first-child
 {
-	padding-left: 2px;
+	//padding-left: 2px;
 }
 .paymenttable, .margintable tr td {
 	height: 22px;
diff --git a/htdocs/ticket/class/actions_ticket.class.php b/htdocs/ticket/class/actions_ticket.class.php
index eb6193d58f1..b787a437899 100644
--- a/htdocs/ticket/class/actions_ticket.class.php
+++ b/htdocs/ticket/class/actions_ticket.class.php
@@ -192,7 +192,7 @@ class ActionsTicket
 		// Initial message
 		print '<div class="underbanner clearboth"></div>';
 		print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
-		print '<table class="noborder centpercent margintable">';
+		print '<table class="noborder centpercent margintable margintablenotop">';
 		print '<tr class="liste_titre trforfield"><td class="nowrap titlefield">';
 		print $langs->trans("InitialMessage");
 		print '</td><td>';
@@ -391,7 +391,7 @@ class ActionsTicket
 	{
 		global $langs;
 
-		print '<div class="div-table-responsive-no-min margintoponly">';
+		print '<div class="div-table-responsive-no-min margintoponly navBarForStatus">';
 		print '<div class="centpercent right">';
 		// Exclude status which requires specific method
 		$exclude_status = array(Ticket::STATUS_CLOSED, Ticket::STATUS_CANCELED);
@@ -419,7 +419,9 @@ class ActionsTicket
 				print '</div>';
 			}
 		}
-		print '</div></div><br>';
+		print '</div>';
+		print '</div>';
+		print '<br>';
 	}
 
 	/**

From 466bc2625663f7b775dc8302e37cf21129b873d9 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sat, 5 Jun 2021 07:16:43 +0200
Subject: [PATCH 0409/1497] Fix with search_date_startxxx

---
 htdocs/fourn/paiement/list.php | 42 ++++++++++++++++++++++++++--------
 1 file changed, 33 insertions(+), 9 deletions(-)

diff --git a/htdocs/fourn/paiement/list.php b/htdocs/fourn/paiement/list.php
index 6b932ae2019..39ad7131b24 100644
--- a/htdocs/fourn/paiement/list.php
+++ b/htdocs/fourn/paiement/list.php
@@ -49,13 +49,19 @@ $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 've
 $socid = GETPOST('socid', 'int');
 
 $search_ref				= GETPOST('search_ref', 'alpha');
-$search_date_start = dol_mktime(0, 0, 0, GETPOST('search_date_startmonth', 'int'), GETPOST('search_date_startday', 'int'), GETPOST('search_date_startyear', 'int'));
-$search_date_end = dol_mktime(23, 59, 59, GETPOST('search_date_endmonth', 'int'), GETPOST('search_date_endday', 'int'), GETPOST('search_date_endyear', 'int'));
-$search_company = GETPOST('search_company', 'alpha');
+$search_date_startday	= GETPOST('search_date_startday', 'int');
+$search_date_startmonth	= GETPOST('search_date_startmonth', 'int');
+$search_date_startyear	= GETPOST('search_date_startyear', 'int');
+$search_date_endday		= GETPOST('search_date_endday', 'int');
+$search_date_endmonth	= GETPOST('search_date_endmonth', 'int');
+$search_date_endyear	= GETPOST('search_date_endyear', 'int');
+$search_date_start		= dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);	// Use tzserver
+$search_date_end		= dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
+$search_company			= GETPOST('search_company', 'alpha');
 $search_payment_type	= GETPOST('search_payment_type');
-$search_cheque_num = GETPOST('search_cheque_num', 'alpha');
+$search_cheque_num		= GETPOST('search_cheque_num', 'alpha');
 $search_bank_account	= GETPOST('search_bank_account', 'int');
-$search_amount = GETPOST('search_amount', 'alpha'); // alpha because we must be able to search on '< x'
+$search_amount			= GETPOST('search_amount', 'alpha'); // alpha because we must be able to search on '< x'
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield				= GETPOST('sortfield', 'alpha');
@@ -135,6 +141,12 @@ if (empty($reshook)) {
 
 	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_ref = '';
+		$search_date_startday = '';
+		$search_date_startmonth = '';
+		$search_date_startyear = '';
+		$search_date_endday = '';
+		$search_date_endmonth = '';
+		$search_date_endyear = '';
 		$search_date_start = '';
 		$search_date_end = '';
 		$search_company = '';
@@ -259,11 +271,23 @@ if ($optioncss != '') {
 if ($search_ref) {
 	$param .= '&search_ref='.urlencode($search_ref);
 }
-if ($search_date_start) {
-	$param.= '&search_date_start='.urlencode($search_date_start);
+if ($search_date_startday) {
+	$param .= '&search_date_startday='.urlencode($search_date_startday);
 }
-if ($search_date_end) {
-	$param.= '&search_date_end='.urlencode($search_date_end);
+if ($search_date_startmonth) {
+	$param .= '&search_date_startmonth='.urlencode($search_date_startmonth);
+}
+if ($search_date_startyear) {
+	$param .= '&search_date_startyear='.urlencode($search_date_startyear);
+}
+if ($search_date_endday) {
+	$param .= '&search_date_endday='.urlencode($search_date_endday);
+}
+if ($search_date_endmonth) {
+	$param .= '&search_date_endmonth='.urlencode($search_date_endmonth);
+}
+if ($search_date_endyear) {
+	$param .= '&search_date_endyear='.urlencode($search_date_endyear);
 }
 if ($search_company) {
 	$param .= '&search_company='.urlencode($search_company);

From a92bd31ce14d46b5786ad5fc303d5452a5af3b5e Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sat, 5 Jun 2021 07:39:15 +0200
Subject: [PATCH 0410/1497] Fix search_datexxx

---
 htdocs/compta/paiement/list.php | 68 +++++++++++++++++++++++++--------
 1 file changed, 53 insertions(+), 15 deletions(-)

diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php
index c06f8ee9cb5..b6835765c00 100644
--- a/htdocs/compta/paiement/list.php
+++ b/htdocs/compta/paiement/list.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2013		Cédric Salvador			<csalvador@gpcsolutions.fr>
  * Copyright (C) 2015		Jean-François Ferry		<jfefe@aternatik.fr>
  * Copyright (C) 2015		Juanjo Menent			<jmenent@2byte.es>
- * Copyright (C) 2017		Alexandre Spangaro		<aspangaro@open-dsi.fr>
+ * Copyright (C) 2017-2021	Alexandre Spangaro		<aspangaro@open-dsi.fr>
  * Copyright (C) 2018		Ferran Marcet			<fmarcet@2byte.es>
  * Copyright (C) 2018		Charlene Benke			<charlie@patas-monkey.com>
  * Copyright (C) 2020		Tobias Sekan			<tobias.sekan@startmail.com>
@@ -58,12 +58,18 @@ $socid				= GETPOST('socid', 'int');
 $userid = GETPOST('userid', 'int');
 
 $search_ref = GETPOST("search_ref", "alpha");
-$search_date_start	= dol_mktime(0, 0, 0, GETPOST('search_date_startmonth', 'int'), GETPOST('search_date_startday', 'int'), GETPOST('search_date_startyear', 'int'));
-$search_date_end	= dol_mktime(23, 59, 59, GETPOST('search_date_endmonth', 'int'), GETPOST('search_date_endday', 'int'), GETPOST('search_date_endyear', 'int'));
-$search_company		= GETPOST("search_company", 'alpha');
-$search_paymenttype	= GETPOST("search_paymenttype");
-$search_account		= GETPOST("search_account", "int");
-$search_payment_num	= GETPOST('search_payment_num', 'alpha');
+$search_date_startday = GETPOST('search_date_startday', 'int');
+$search_date_startmonth = GETPOST('search_date_startmonth', 'int');
+$search_date_startyear = GETPOST('search_date_startyear', 'int');
+$search_date_endday = GETPOST('search_date_endday', 'int');
+$search_date_endmonth = GETPOST('search_date_endmonth', 'int');
+$search_date_endyear = GETPOST('search_date_endyear', 'int');
+$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);	// Use tzserver
+$search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
+$search_company = GETPOST("search_company", 'alpha');
+$search_paymenttype = GETPOST("search_paymenttype");
+$search_account = GETPOST("search_account", "int");
+$search_payment_num = GETPOST('search_payment_num', 'alpha');
 $search_amount = GETPOST("search_amount", 'alpha'); // alpha because we must be able to search on "< x"
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
@@ -129,8 +135,13 @@ if (empty($reshook)) {
 	// All tests are required to be compatible with all browsers
 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
 		$search_ref = '';
+		$search_date_startday = '';
+		$search_date_startmonth = '';
+		$search_date_startyear = '';
+		$search_date_endday = '';
+		$search_date_endmonth = '';
+		$search_date_endyear = '';
 		$search_date_start = '';
-		$search_date_end = '';
 		$search_account = '';
 		$search_amount = '';
 		$search_paymenttype = '';
@@ -276,13 +287,40 @@ if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 if ($limit > 0 && $limit != $conf->liste_limit) {
 	$param .= '&limit='.urlencode($limit);
 }
-$param .= (GETPOST("orphelins") ? "&orphelins=1" : '');
-$param .= ($search_ref ? "&search_ref=".urlencode($search_ref) : '');
-$param .= ($search_date_start ? "&search_date_start=".urlencode($search_date_start) : '');
-$param .= ($search_date_end ? "&search_date_end=".urlencode($search_date_end) : '');
-$param .= ($search_company ? "&search_company=".urlencode($search_company) : '');
-$param .= ($search_amount ? "&search_amount=".urlencode($search_amount) : '');
-$param .= ($search_payment_num ? "&search_payment_num=".urlencode($search_payment_num) : '');
+
+if (GETPOST("orphelins")) {
+	$param .= '&orphelins=1';
+}
+if ($search_ref) {
+	$param .= '&search_ref='.urlencode($search_ref);
+}
+if ($search_date_startday) {
+	$param .= '&search_date_startday='.urlencode($search_date_startday);
+}
+if ($search_date_startmonth) {
+	$param .= '&search_date_startmonth='.urlencode($search_date_startmonth);
+}
+if ($search_date_startyear) {
+	$param .= '&search_date_startyear='.urlencode($search_date_startyear);
+}
+if ($search_date_endday) {
+	$param .= '&search_date_endday='.urlencode($search_date_endday);
+}
+if ($search_date_endmonth) {
+	$param .= '&search_date_endmonth='.urlencode($search_date_endmonth);
+}
+if ($search_date_endyear) {
+	$param .= '&search_date_endyear='.urlencode($search_date_endyear);
+}
+if ($search_company) {
+	$param .= '&search_company='.urlencode($search_company);
+}
+if ($search_amount != '') {
+	$param .= '&search_amount='.urlencode($search_amount);
+}
+if ($search_payment_num) {
+	$param .= '&search_payment_num='.urlencode($search_payment_num);
+}
 if ($optioncss != '') {
 	$param .= '&optioncss='.urlencode($optioncss);
 }

From f6bc1c64144a51d2bb92e34acba8757926819a2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 5 Jun 2021 09:37:38 +0200
Subject: [PATCH 0411/1497] add trigger contact

---
 dev/examples/zapier/index.js                  |  2 ++
 ...face_99_modZapier_ZapierTriggers.class.php | 19 +++++++++++++++++++
 htdocs/societe/class/api_contacts.class.php   |  2 +-
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/dev/examples/zapier/index.js b/dev/examples/zapier/index.js
index d1897673b39..d96df72e11f 100644
--- a/dev/examples/zapier/index.js
+++ b/dev/examples/zapier/index.js
@@ -2,6 +2,7 @@
 const triggerAction = require('./triggers/action');
 const triggerOrder = require('./triggers/order');
 const triggerThirdparty = require('./triggers/thirdparty');
+const triggerContact = require('./triggers/contact');
 const triggerTicket = require('./triggers/ticket');
 const triggerUser = require('./triggers/user');
 
@@ -62,6 +63,7 @@ const App = {
         [triggerAction.key]: triggerAction,
         [triggerOrder.key]: triggerOrder,
         [triggerThirdparty.key]: triggerThirdparty,
+        [triggerContact.key]: triggerContact,
         [triggerTicket.key]: triggerTicket,
         [triggerUser.key]: triggerUser,
     },
diff --git a/htdocs/core/triggers/interface_99_modZapier_ZapierTriggers.class.php b/htdocs/core/triggers/interface_99_modZapier_ZapierTriggers.class.php
index 4e808d5bf15..7d6f346449d 100644
--- a/htdocs/core/triggers/interface_99_modZapier_ZapierTriggers.class.php
+++ b/htdocs/core/triggers/interface_99_modZapier_ZapierTriggers.class.php
@@ -174,8 +174,27 @@ class InterfaceZapierTriggers extends DolibarrTriggers
 
 			// Contacts
 			case 'CONTACT_CREATE':
+				$resql = $this->db->query($sql);
+				while ($resql && $obj = $this->db->fetch_array($resql)) {
+					$cleaned = cleanObjectDatas(dol_clone($object));
+					$json = json_encode($cleaned);
+					// call the zapierPostWebhook() function
+					zapierPostWebhook($obj['url'], $json);
+				}
+				$logtriggeraction = true;
+				break;
 			case 'CONTACT_MODIFY':
+				$resql = $this->db->query($sql);
+				while ($resql && $obj = $this->db->fetch_array($resql)) {
+					$cleaned = cleanObjectDatas(dol_clone($object));
+					$json = json_encode($cleaned);
+					// call the zapierPostWebhook() function
+					zapierPostWebhook($obj['url'], $json);
+				}
+				$logtriggeraction = true;
+				break;
 			case 'CONTACT_DELETE':
+				break;
 			case 'CONTACT_ENABLEDISABLE':
 				break;
 			// Products
diff --git a/htdocs/societe/class/api_contacts.class.php b/htdocs/societe/class/api_contacts.class.php
index f62fb894bd0..f87ca111164 100644
--- a/htdocs/societe/class/api_contacts.class.php
+++ b/htdocs/societe/class/api_contacts.class.php
@@ -75,7 +75,7 @@ class Contacts extends DolibarrApi
 			throw new RestException(401, 'No permission to read contacts');
 		}
 
-		if ($id == 0) {
+		if ($id === 0) {
 			$result = $this->contact->initAsSpecimen();
 		} else {
 			$result = $this->contact->fetch($id);

From 1d1c85ca98831ad4fb0bc8c406f779851cbebf28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 5 Jun 2021 09:38:33 +0200
Subject: [PATCH 0412/1497] add trigger contact

---
 dev/examples/zapier/triggers/contact.js | 175 ++++++++++++++++++++++++
 1 file changed, 175 insertions(+)
 create mode 100644 dev/examples/zapier/triggers/contact.js

diff --git a/dev/examples/zapier/triggers/contact.js b/dev/examples/zapier/triggers/contact.js
new file mode 100644
index 00000000000..6db4d7f5053
--- /dev/null
+++ b/dev/examples/zapier/triggers/contact.js
@@ -0,0 +1,175 @@
+const subscribeHook = (z, bundle) => {
+    // `z.console.log()` is similar to `console.log()`.
+    z.console.log('suscribing hook!');
+
+    // bundle.targetUrl has the Hook URL this app should call when an action is created.
+    const data = {
+        url: bundle.targetUrl,
+        event: bundle.event,
+        module: 'contact',
+        action: bundle.inputData.action
+    };
+
+    const url = bundle.authData.url  + '/api/index.php/zapierapi/hook';
+
+    // You can build requests and our client will helpfully inject all the variables
+    // you need to complete. You can also register middleware to control this.
+    const options = {
+        url: url,
+        method: 'POST',
+        body: data,
+    };
+
+    // You may return a promise or a normal data structure from any perform method.
+    return z.request(options).then((response) => JSON.parse(response.content));
+};
+
+const unsubscribeHook = (z, bundle) => {
+    // bundle.subscribeData contains the parsed response JSON from the subscribe
+    // request made initially.
+    z.console.log('unsuscribing hook!');
+
+    // You can build requests and our client will helpfully inject all the variables
+    // you need to complete. You can also register middleware to control this.
+    const options = {
+        url: bundle.authData.url + '/api/index.php/zapierapi/hook/' + bundle.subscribeData.id,
+        method: 'DELETE',
+    };
+
+    // You may return a promise or a normal data structure from any perform method.
+    return z.request(options).then((response) => JSON.parse(response.content));
+};
+
+const getContact = (z, bundle) => {
+    // bundle.cleanedRequest will include the parsed JSON object (if it's not a
+    // test poll) and also a .querystring property with the URL's query string.
+    const contact = {
+        id: bundle.cleanedRequest.id,
+        name: bundle.cleanedRequest.name,
+        name_alias: bundle.cleanedRequest.name_alias,
+        firstname: bundle.cleanedRequest.firstname,
+        address: bundle.cleanedRequest.address,
+        zip: bundle.cleanedRequest.zip,
+        town: bundle.cleanedRequest.town,
+        email: bundle.cleanedRequest.email,
+        client: bundle.cleanedRequest.client,
+        fournisseur: bundle.cleanedRequest.fournisseur,
+        code_client: bundle.cleanedRequest.code_client,
+        code_fournisseur: bundle.cleanedRequest.code_fournisseur,
+        idprof1: bundle.cleanedRequest.idprof1,
+        idprof2: bundle.cleanedRequest.idprof2,
+        idprof3: bundle.cleanedRequest.idprof3,
+        idprof4: bundle.cleanedRequest.idprof4,
+        idprof5: bundle.cleanedRequest.idprof5,
+        idprof6: bundle.cleanedRequest.idprof6,
+        authorId: bundle.cleanedRequest.authorId,
+        createdAt: bundle.cleanedRequest.createdAt,
+        action: bundle.cleanedRequest.action
+    };
+
+    return [contact];
+};
+
+const getFallbackRealContact = (z, bundle) => {
+    // For the test poll, you should get some real data, to aid the setup process.
+    const module = bundle.inputData.module;
+    const options = {
+        url: bundle.authData.url + '/api/index.php/contacts/0',
+    };
+
+    return z.request(options).then((response) => [JSON.parse(response.content)]);
+};
+
+// const getModulesChoices = (z/*, bundle*/) => {
+//     // For the test poll, you should get some real data, to aid the setup process.
+//     const options = {
+//         url: bundle.authData.url + '/api/index.php/zapierapi/getmoduleschoices',
+//     };
+
+//     return z.request(options).then((response) => JSON.parse(response.content));
+// };
+// const getModulesChoices = () => {
+//     return {
+//         orders: "Order",
+//         invoices: "Invoice",
+//         contacts: "Contact",
+//         contacts: "Contacts"
+//     };
+// };
+
+// const getActionsChoices = (z, bundle) => {
+//     // For the test poll, you should get some real data, to aid the setup process.
+//     const module = bundle.inputData.module;
+//     const options = {
+//         url:  url: bundle.authData.url + '/api/index.php/zapierapi/getactionschoices/thirparty`,
+//     };
+
+//     return z.request(options).then((response) => JSON.parse(response.content));
+// };
+
+// We recommend writing your triggers separate like this and rolling them
+// into the App definition at the end.
+module.exports = {
+    key: 'contact',
+
+    // You'll want to provide some helpful display labels and descriptions
+    // for users. Zapier will put them into the UX.
+    noun: 'Contact',
+    display: {
+        label: 'New Contact',
+        description: 'Triggers when a new thirdpaty action is done in Dolibarr.'
+    },
+
+    // `operation` is where the business logic goes.
+    operation: {
+
+        // `inputFields` can define the fields a user could provide,
+        // we'll pass them in as `bundle.inputData` later.
+        inputFields: [
+            {
+                key: 'action',
+                required: true,
+                type: 'string',
+                helpText: 'Which action of contact this should trigger on.',
+                choices: {
+                    create: "Create",
+                    modify: "Modify",
+                    validate: "Validate",
+                }
+            }
+        ],
+
+        type: 'hook',
+
+        performSubscribe: subscribeHook,
+        performUnsubscribe: unsubscribeHook,
+
+        perform: getContact,
+        performList: getFallbackRealContact,
+
+        // In cases where Zapier needs to show an example record to the user, but we are unable to get a live example
+        // from the API, Zapier will fallback to this hard-coded sample. It should reflect the data structure of
+        // returned records, and have obviously dummy values that we can show to any user.
+        sample: {
+            id: 1,
+            createdAt: 1472069465,
+            lastname: 'DOE',
+            firstname: 'John',
+            authorId: 1,
+            action: 'create'
+        },
+
+        // If the resource can have fields that are custom on a per-user basis, define a function to fetch the custom
+        // field definitions. The result will be used to augment the sample.
+        // outputFields: () => { return []; }
+        // Alternatively, a static field definition should be provided, to specify labels for the fields
+        outputFields: [
+            {key: 'id', type: "integer", label: 'ID'},
+            {key: 'createdAt', label: 'Created At'},
+            {key: 'lastname', label: 'Lastname'},
+            {key: 'firstname', label: 'Firstname'},
+            {key: 'authorId', type: "integer", label: 'Author ID'},
+            {key: 'action', label: 'Action'}
+        ]
+    }
+};

From e79be6f4872b3eedeb06c9bc8617250a672a6d21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 5 Jun 2021 09:41:14 +0200
Subject: [PATCH 0413/1497] add trigger contact

---
 dev/examples/zapier/triggers/contact.js    | 12 +-----------
 dev/examples/zapier/triggers/thirdparty.js |  2 +-
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/dev/examples/zapier/triggers/contact.js b/dev/examples/zapier/triggers/contact.js
index 6db4d7f5053..547755d241d 100644
--- a/dev/examples/zapier/triggers/contact.js
+++ b/dev/examples/zapier/triggers/contact.js
@@ -52,16 +52,6 @@ const getContact = (z, bundle) => {
         zip: bundle.cleanedRequest.zip,
         town: bundle.cleanedRequest.town,
         email: bundle.cleanedRequest.email,
-        client: bundle.cleanedRequest.client,
-        fournisseur: bundle.cleanedRequest.fournisseur,
-        code_client: bundle.cleanedRequest.code_client,
-        code_fournisseur: bundle.cleanedRequest.code_fournisseur,
-        idprof1: bundle.cleanedRequest.idprof1,
-        idprof2: bundle.cleanedRequest.idprof2,
-        idprof3: bundle.cleanedRequest.idprof3,
-        idprof4: bundle.cleanedRequest.idprof4,
-        idprof5: bundle.cleanedRequest.idprof5,
-        idprof6: bundle.cleanedRequest.idprof6,
         authorId: bundle.cleanedRequest.authorId,
         createdAt: bundle.cleanedRequest.createdAt,
         action: bundle.cleanedRequest.action
@@ -117,7 +107,7 @@ module.exports = {
     noun: 'Contact',
     display: {
         label: 'New Contact',
-        description: 'Triggers when a new thirdpaty action is done in Dolibarr.'
+        description: 'Triggers when a new contact action is done in Dolibarr.'
     },
 
     // `operation` is where the business logic goes.
diff --git a/dev/examples/zapier/triggers/thirdparty.js b/dev/examples/zapier/triggers/thirdparty.js
index 0fecd4434ce..76194acbc9a 100644
--- a/dev/examples/zapier/triggers/thirdparty.js
+++ b/dev/examples/zapier/triggers/thirdparty.js
@@ -118,7 +118,7 @@ module.exports = {
     noun: 'Thirdparty',
     display: {
         label: 'New Thirdparty',
-        description: 'Triggers when a new thirdpaty action is done in Dolibarr.'
+        description: 'Triggers when a new thirdparty action is done in Dolibarr.'
     },
 
     // `operation` is where the business logic goes.

From 69d70d5ea8c3680691477547b44b75d144ed8c4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 5 Jun 2021 10:09:44 +0200
Subject: [PATCH 0414/1497] update connector version add trigger contact

---
 dev/examples/zapier/package.json        | 4 ++--
 dev/examples/zapier/triggers/contact.js | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/dev/examples/zapier/package.json b/dev/examples/zapier/package.json
index 4d5c5daa867..a9d519dec69 100644
--- a/dev/examples/zapier/package.json
+++ b/dev/examples/zapier/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dolibarr",
-  "version": "1.13.0",
+  "version": "1.14.0",
   "description": "An app for connecting Dolibarr to the Zapier platform.",
   "repository": "Dolibarr/dolibarr",
   "homepage": "https://www.dolibarr.org/",
@@ -11,7 +11,7 @@
     "test": "mocha --recursive"
   },
   "engines": {
-    "node": "8.10.0",
+    "node": "14.0.0",
     "npm": ">=5.6.0"
   },
   "dependencies": {
diff --git a/dev/examples/zapier/triggers/contact.js b/dev/examples/zapier/triggers/contact.js
index 547755d241d..2ba3bd226f8 100644
--- a/dev/examples/zapier/triggers/contact.js
+++ b/dev/examples/zapier/triggers/contact.js
@@ -52,6 +52,9 @@ const getContact = (z, bundle) => {
         zip: bundle.cleanedRequest.zip,
         town: bundle.cleanedRequest.town,
         email: bundle.cleanedRequest.email,
+        phone_pro: bundle.cleanedRequest.phone_pro,
+        phone_perso: bundle.cleanedRequest.phone_perso,
+        phone_mobile: bundle.cleanedRequest.phone_mobile,
         authorId: bundle.cleanedRequest.authorId,
         createdAt: bundle.cleanedRequest.createdAt,
         action: bundle.cleanedRequest.action
@@ -158,6 +161,9 @@ module.exports = {
             {key: 'createdAt', label: 'Created At'},
             {key: 'lastname', label: 'Lastname'},
             {key: 'firstname', label: 'Firstname'},
+            {key: 'phone', label: 'Phone pro'},
+            {key: 'phone_perso', label: 'Phone perso'},
+            {key: 'phone_mobile', label: 'Phone mobile'},
             {key: 'authorId', type: "integer", label: 'Author ID'},
             {key: 'action', label: 'Action'}
         ]

From 7a93365836d0a6ad7450d3d3de193fbb1a470f8c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 5 Jun 2021 11:07:38 +0200
Subject: [PATCH 0415/1497] Fix bad name of var

---
 htdocs/core/lib/pdf.lib.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index d1c793c621c..6095abff8ee 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -1325,31 +1325,31 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 			$translatealsoifmodified = (!empty($conf->global->MAIN_MULTILANG_TRANSLATE_EVEN_IF_MODIFIED)); // By default if value was modified manually, we keep it (no translation because we don't have it)
 
 			// TODO Instead of making a compare to see if param was modified, check that content contains reference translation. If yes, add the added part to the new translation
-			// ($textwasmodified is replaced with $textwasmodifiedorcompleted and we add completion).
+			// ($textwasnotmodified is replaced with $textwasmodifiedorcompleted and we add completion).
 
 			// Set label
 			// If we want another language, and if label is same than default language (we did force it to a specific value), we can use translation.
 			//var_dump($outputlangs->defaultlang.' - '.$langs->defaultlang.' - '.$label.' - '.$prodser->label);exit;
-			$textwasmodified = ($label == $prodser->label);
-			if (!empty($prodser->multilangs[$outputlangs->defaultlang]["label"]) && ($textwasmodified || $translatealsoifmodified)) {
+			$textwasnotmodified = ($label == $prodser->label);
+			if (!empty($prodser->multilangs[$outputlangs->defaultlang]["label"]) && ($textwasnotmodified || $translatealsoifmodified)) {
 				$label = $prodser->multilangs[$outputlangs->defaultlang]["label"];
 			}
 
 			// Set desc
 			// Manage HTML entities description test because $prodser->description is store with htmlentities but $desc no
-			$textwasmodified = false;
+			$textwasnotmodified = false;
 			if (!empty($desc) && dol_textishtml($desc) && !empty($prodser->description) && dol_textishtml($prodser->description)) {
-				$textwasmodified = (strpos(dol_html_entity_decode($desc, ENT_QUOTES | ENT_HTML5), dol_html_entity_decode($prodser->description, ENT_QUOTES | ENT_HTML5)) !== false);
+				$textwasnotmodified = (strpos(dol_html_entity_decode($desc, ENT_QUOTES | ENT_HTML5), dol_html_entity_decode($prodser->description, ENT_QUOTES | ENT_HTML5)) !== false);
 			} else {
-				$textwasmodified = ($desc == $prodser->description);
+				$textwasnotmodified = ($desc == $prodser->description);
 			}
-			if (!empty($prodser->multilangs[$outputlangs->defaultlang]["description"]) && ($textwasmodified || $translatealsoifmodified)) {
+			if (!empty($prodser->multilangs[$outputlangs->defaultlang]["description"]) && ($textwasnotmodified || $translatealsoifmodified)) {
 				$desc = $prodser->multilangs[$outputlangs->defaultlang]["description"];
 			}
 
 			// Set note
-			$textwasmodified = ($note == $prodser->note);
-			if (!empty($prodser->multilangs[$outputlangs->defaultlang]["note"]) && ($textwasmodified || $translatealsoifmodified)) {
+			$textwasnotmodified = ($note == $prodser->note_public);
+			if (!empty($prodser->multilangs[$outputlangs->defaultlang]["note"]) && ($textwasnotmodified || $translatealsoifmodified)) {
 				$note = $prodser->multilangs[$outputlangs->defaultlang]["note"];
 			}
 		}

From ddbfb5d73484954ff29a3d9e4bb67ddf948a6b89 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 5 Jun 2021 11:14:06 +0200
Subject: [PATCH 0416/1497] Fix translation of note of product

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

diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 6095abff8ee..880c63970f7 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -1349,8 +1349,8 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 
 			// Set note
 			$textwasnotmodified = ($note == $prodser->note_public);
-			if (!empty($prodser->multilangs[$outputlangs->defaultlang]["note"]) && ($textwasnotmodified || $translatealsoifmodified)) {
-				$note = $prodser->multilangs[$outputlangs->defaultlang]["note"];
+			if (!empty($prodser->multilangs[$outputlangs->defaultlang]["other"]) && ($textwasnotmodified || $translatealsoifmodified)) {
+				$note = $prodser->multilangs[$outputlangs->defaultlang]["other"];
 			}
 		}
 	} elseif ($object->element == 'facture' || $object->element == 'facturefourn') {

From be97d66f5ba5e725dee3117dc90c9a29d1b15c72 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 5 Jun 2021 12:58:14 +0200
Subject: [PATCH 0417/1497] Look and feel v14

---
 htdocs/langs/en_US/partnership.lang           |  4 ++-
 .../admin/partnership_extrafields.php         |  2 +-
 htdocs/partnership/admin/setup.php            | 35 +++++++++++++++----
 3 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/htdocs/langs/en_US/partnership.lang b/htdocs/langs/en_US/partnership.lang
index df9619533de..72868ab6ddf 100644
--- a/htdocs/langs/en_US/partnership.lang
+++ b/htdocs/langs/en_US/partnership.lang
@@ -32,10 +32,12 @@ ListOfPartnerships=List of partnership
 PartnershipSetup=Partnership setup
 PartnershipAbout=About Partnership
 PartnershipAboutPage=Partnership about page
-partnershipforthirdpartyormember=Partnership is for a 'thirdparty' or for a 'member'
+partnershipforthirdpartyormember=Partner status must be set on a 'thirdparty' or a 'member'
 PARTNERSHIP_IS_MANAGED_FOR=Partnership managed for
 PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks to check
 PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb of days before cancel status of partnership when subscription is expired
+ReferingWebsiteCheck=Check of website referring
+ReferingWebsiteCheckDesc=You can enable a feature to check that your partners has added a backlink to your website domains on their own website.
 
 #
 # Object
diff --git a/htdocs/partnership/admin/partnership_extrafields.php b/htdocs/partnership/admin/partnership_extrafields.php
index 7d819b3bbcb..f178bc893cd 100644
--- a/htdocs/partnership/admin/partnership_extrafields.php
+++ b/htdocs/partnership/admin/partnership_extrafields.php
@@ -98,7 +98,7 @@ llxHeader('', $title, $help_url);
 
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
-print load_fiche_titre($langs->trans("PartnershipSetup"), $linkback, 'object_partnership');
+print load_fiche_titre($langs->trans("PartnershipSetup"), $linkback, 'title_setup');
 
 
 $head = partnershipAdminPrepareHead();
diff --git a/htdocs/partnership/admin/setup.php b/htdocs/partnership/admin/setup.php
index d681274106c..79c8c469eec 100644
--- a/htdocs/partnership/admin/setup.php
+++ b/htdocs/partnership/admin/setup.php
@@ -139,22 +139,22 @@ print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="setting">';
 print '<input type="hidden" name="page_y" value="">';
 
+print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
 print '<table class="noborder centpercent">';
 
-
 print '<tr class="liste_titre">';
-print '<td class="titlefield">'.$langs->trans("Setting").'</td>';
-print '<td class="left">'.$langs->trans("Value").'</td>';
-print '<td class="left">'.$langs->trans("Examples").'</td>';
+print '<td>'.$langs->trans("Setting").'</td>';
+print '<td>'.$langs->trans("Value").'</td>';
+print '<td>'.$langs->trans("Examples").'</td>';
 print '</tr>';
 
-
 print '<tr class="oddeven"><td>'.$langs->trans("PARTNERSHIP_IS_MANAGED_FOR").'</td>';
 print '<td>';
 print '<select class="flat minwidth100" id="select_PARTNERSHIP_IS_MANAGED_FOR" name="PARTNERSHIP_IS_MANAGED_FOR">';
 print '<option value="thirdparty" '.(($conf->global->PARTNERSHIP_IS_MANAGED_FOR == 'thirdparty') ? 'selected' : '').'>'.$langs->trans("ThirdParty").'</option>';
 print '<option value="member" '.(($conf->global->PARTNERSHIP_IS_MANAGED_FOR == 'member') ? 'selected' : '').'>'.$langs->trans("Members").'</option>';
 print '</select>';
+print ajax_combobox('select_PARTNERSHIP_IS_MANAGED_FOR');
 print '</td>';
 print '<td><span class="opacitymedium">'.$langs->trans("partnershipforthirdpartyormember").'</span></td>';
 print '</tr>';
@@ -163,7 +163,7 @@ print '</tr>';
 if ($conf->global->PARTNERSHIP_IS_MANAGED_FOR == 'member') {
 	print '<tr class="oddeven"><td>'.$langs->trans("PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL").'</td>';
 	print '<td>';
-	$dnbdays 	= '7';
+	$dnbdays 	= '15';
 	$backlinks 	= (!empty($conf->global->PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL)) ? $conf->global->PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL : $dnbdays;
 	print '<input class="maxwidth50" type="text" name="PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL" value="'.$backlinks.'">';
 	print '</td>';
@@ -171,6 +171,25 @@ if ($conf->global->PARTNERSHIP_IS_MANAGED_FOR == 'member') {
 	print '</tr>';
 }
 
+print '</table>';
+print '</div>';
+
+print '<br>';
+
+
+print_fiche_titre($langs->trans("ReferingWebsiteCheck"), '', '');
+
+print '<span class="opacitymedium">'.$langs->trans("ReferingWebsiteCheckDesc").'</span><br>';
+print '<br>';
+
+print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print '<table class="noborder centpercent">';
+
+print '<tr class="liste_titre">';
+print '<td>'.$langs->trans("Setting").'</td>';
+print '<td>'.$langs->trans("Value").'</td>';
+print '<td>'.$langs->trans("Examples").'</td>';
+print '</tr>';
 
 print '<tr class="oddeven"><td>'.$langs->trans("PARTNERSHIP_BACKLINKS_TO_CHECK").'</td>';
 print '<td>';
@@ -181,8 +200,10 @@ print '</td>';
 print '<td><span class="opacitymedium">'.$dbacklinks.'</span></td>';
 print '</tr>';
 
-
 print '</table>';
+print '</div>';
+
+
 print '<div class="center">';
 print '<input type="submit" class="button reposition" value="'.$langs->trans("Modify").'">';
 print '</div>';

From 4695bbbd600c9d75eaae3dbfc9c6ad9a88c6babe Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 5 Jun 2021 12:59:19 +0200
Subject: [PATCH 0418/1497] Trans

---
 htdocs/langs/en_US/partnership.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/partnership.lang b/htdocs/langs/en_US/partnership.lang
index 72868ab6ddf..7decec2a003 100644
--- a/htdocs/langs/en_US/partnership.lang
+++ b/htdocs/langs/en_US/partnership.lang
@@ -35,7 +35,7 @@ PartnershipAboutPage=Partnership about page
 partnershipforthirdpartyormember=Partner status must be set on a 'thirdparty' or a 'member'
 PARTNERSHIP_IS_MANAGED_FOR=Partnership managed for
 PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks to check
-PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb of days before cancel status of partnership when subscription is expired
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb of days before cancelling status of a partnership when a subscription has expired
 ReferingWebsiteCheck=Check of website referring
 ReferingWebsiteCheckDesc=You can enable a feature to check that your partners has added a backlink to your website domains on their own website.
 

From 36accba5c96df8c726357b3ea8cb92a2aed9cb11 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Sat, 5 Jun 2021 14:43:40 +0200
Subject: [PATCH 0419/1497] Fix date_start of last subscription

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

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index eeede7b3810..1d8ed358c73 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -1402,7 +1402,7 @@ class Adherent extends CommonObject
 					$this->first_subscription_amount = $obj->subscription;
 				}
 				$this->last_subscription_date = $this->db->jdate($obj->datec);
-				$this->last_subscription_date_start = $this->db->jdate($obj->datef);
+				$this->last_subscription_date_start = $this->db->jdate($obj->dateh);
 				$this->last_subscription_date_end = $this->db->jdate($obj->datef);
 				$this->last_subscription_amount = $obj->subscription;
 

From 1e657b86212a25d006eaecbbdc7ed2fe3dd1129f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 5 Jun 2021 15:14:10 +0200
Subject: [PATCH 0420/1497] Fix value of showoncombobox

---
 htdocs/adherents/class/adherent.class.php     |  6 +--
 htdocs/adherents/partnership.php              | 44 +++++--------------
 htdocs/bom/class/bom.class.php                |  2 +-
 htdocs/core/lib/company.lib.php               |  6 +--
 .../class/conferenceorbooth.class.php         |  4 +-
 htdocs/fichinter/class/fichinter.class.php    |  2 +-
 htdocs/hrm/class/establishment.class.php      |  2 +-
 .../template/class/myobject.class.php         |  6 +--
 htdocs/mrp/class/mo.class.php                 |  2 +-
 htdocs/product/class/product.class.php        |  4 +-
 htdocs/product/stock/class/entrepot.class.php |  2 +-
 htdocs/projet/class/project.class.php         |  2 +-
 .../class/recruitmentjobposition.class.php    |  2 +-
 htdocs/societe/class/societe.class.php        |  2 +-
 .../workstation/class/workstation.class.php   |  2 +-
 htdocs/zapier/class/hook.class.php            |  9 ++--
 16 files changed, 35 insertions(+), 62 deletions(-)

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index a663cea85d2..18d8746cca7 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -296,15 +296,15 @@ class Adherent extends CommonObject
 		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => 1, 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 15, 'index' => 1),
 		'ref_ext' => array('type' => 'varchar(128)', 'label' => 'Ref ext', 'enabled' => 1, 'visible' => 0, 'position' => 20),
 		'civility' => array('type' => 'varchar(6)', 'label' => 'Civility', 'enabled' => 1, 'visible' => -1, 'position' => 25),
-		'lastname' => array('type' => 'varchar(50)', 'label' => 'Lastname', 'enabled' => 1, 'visible' => -1, 'position' => 30),
-		'firstname' => array('type' => 'varchar(50)', 'label' => 'Firstname', 'enabled' => 1, 'visible' => -1, 'position' => 35),
+		'lastname' => array('type' => 'varchar(50)', 'label' => 'Lastname', 'enabled' => 1, 'visible' => -1, 'position' => 30, 'showoncombobox'=>1),
+		'firstname' => array('type' => 'varchar(50)', 'label' => 'Firstname', 'enabled' => 1, 'visible' => -1, 'position' => 35, 'showoncombobox'=>1),
 		'login' => array('type' => 'varchar(50)', 'label' => 'Login', 'enabled' => 1, 'visible' => -1, 'position' => 40),
 		'gender' => array('type' => 'varchar(10)', 'label' => 'Gender', 'enabled' => 1, 'visible' => -1, 'position' => 250),
 		'pass' => array('type' => 'varchar(50)', 'label' => 'Pass', 'enabled' => 1, 'visible' => -1, 'position' => 45),
 		'pass_crypted' => array('type' => 'varchar(128)', 'label' => 'Pass crypted', 'enabled' => 1, 'visible' => -1, 'position' => 50),
 		'fk_adherent_type' => array('type' => 'integer', 'label' => 'Fk adherent type', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 55),
 		'morphy' => array('type' => 'varchar(3)', 'label' => 'MorPhy', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 60),
-		'societe' => array('type' => 'varchar(128)', 'label' => 'Societe', 'enabled' => 1, 'visible' => -1, 'position' => 65),
+		'societe' => array('type' => 'varchar(128)', 'label' => 'Societe', 'enabled' => 1, 'visible' => -1, 'position' => 65, 'showoncombobox'=>2),
 		'fk_soc' => array('type' => 'integer:Societe:societe/class/societe.class.php', 'label' => 'ThirdParty', 'enabled' => 1, 'visible' => -1, 'position' => 70),
 		'address' => array('type' => 'text', 'label' => 'Address', 'enabled' => 1, 'visible' => -1, 'position' => 75),
 		'zip' => array('type' => 'varchar(10)', 'label' => 'Zip', 'enabled' => 1, 'visible' => -1, 'position' => 80),
diff --git a/htdocs/adherents/partnership.php b/htdocs/adherents/partnership.php
index 3cd70de3228..5bdf758e84f 100644
--- a/htdocs/adherents/partnership.php
+++ b/htdocs/adherents/partnership.php
@@ -44,43 +44,14 @@
 //if (! defined('NOBROWSERNOTIF'))     		 define('NOBROWSERNOTIF', '1');				// Disable browser notification
 
 // Load Dolibarr environment
-$res = 0;
-// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
-if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
-	$res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
-}
-// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
-$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
-while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) {
-	$i--; $j--;
-}
-if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) {
-	$res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
-}
-if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) {
-	$res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
-}
-// Try main.inc.php using relative path
-if (!$res && file_exists("../main.inc.php")) {
-	$res = @include "../main.inc.php";
-}
-if (!$res && file_exists("../../main.inc.php")) {
-	$res = @include "../../main.inc.php";
-}
-if (!$res && file_exists("../../../main.inc.php")) {
-	$res = @include "../../../main.inc.php";
-}
-if (!$res) {
-	die("Include of main fails");
-}
-
+require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
-dol_include_once('/partnership/class/partnership.class.php');
-dol_include_once('/partnership/lib/partnership.lib.php');
+require_once DOL_DOCUMENT_ROOT.'/partnership/class/partnership.class.php';
+require_once DOL_DOCUMENT_ROOT.'/partnership/lib/partnership.lib.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array("companies","members","partnership", "other"));
@@ -150,6 +121,12 @@ if (($action == 'update' || $action == 'edit') && $object->status != $object::ST
 if (empty($memberid) && $object) {
 	$memberid = $object->fk_member;
 }
+
+
+// Security check
+$result = restrictedArea($user, 'adherent', $memberid, '', '', 'socid', 'rowid', 0);
+
+
 /*
  * Actions
  */
@@ -271,10 +248,9 @@ $object->fields['fk_member']['visible'] = 0;
 if ($object->id > 0 && $object->status == $object::STATUS_REFUSED && empty($action)) $object->fields['reason_decline_or_cancel']['visible'] = 1;
 $object->fields['note_public']['visible'] = 1;
 
+
 /*
  * View
- *
- * Put here all code to build page
  */
 
 $form = new Form($db);
diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index 9fe0543c4cf..220c724ad89 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -96,7 +96,7 @@ class BOM extends CommonObject
 		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'position'=>1, 'notnull'=>1, 'index'=>1, 'comment'=>"Id",),
 		'entity' => array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'notnull'=> 1, 'default'=>1, 'index'=>1, 'position'=>5),
 		'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>1, 'noteditable'=>1, 'visible'=>4, 'position'=>10, 'notnull'=>1, 'default'=>'(PROV)', 'index'=>1, 'searchall'=>1, 'comment'=>"Reference of BOM", 'showoncombobox'=>'1',),
-		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>1, 'visible'=>1, 'position'=>30, 'notnull'=>1, 'searchall'=>1, 'showoncombobox'=>'1', 'autofocusoncreate'=>1),
+		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>1, 'visible'=>1, 'position'=>30, 'notnull'=>1, 'searchall'=>1, 'showoncombobox'=>'2', 'autofocusoncreate'=>1),
 		'bomtype' => array('type'=>'integer', 'label'=>'Type', 'enabled'=>1, 'visible'=>1, 'position'=>33, 'notnull'=>1, 'default'=>'0', 'arrayofkeyval'=>array(0=>'Manufacturing', 1=>'Disassemble'), 'css'=>'minwidth150', 'csslist'=>'minwidth150 center'),
 		//'bomtype' => array('type'=>'integer', 'label'=>'Type', 'enabled'=>1, 'visible'=>-1, 'position'=>32, 'notnull'=>1, 'default'=>'0', 'arrayofkeyval'=>array(0=>'Manufacturing')),
 		'fk_product' => array('type'=>'integer:Product:product/class/product.class.php:1:(finished IS NULL or finished <> 0)', 'label'=>'Product', 'picto'=>'product', 'enabled'=>1, 'visible'=>1, 'position'=>35, 'notnull'=>1, 'index'=>1, 'help'=>'ProductBOMHelp', 'css'=>'maxwidth500'),
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 99bcd2c3921..61332d8041b 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -963,9 +963,9 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
 
 	$contactstatic->fields = array(
 		'name'      =>array('type'=>'varchar(128)', 'label'=>'Name', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1),
-		'poste'     =>array('type'=>'varchar(128)', 'label'=>'PostOrFunction', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>20),
-		'address'   =>array('type'=>'varchar(128)', 'label'=>'Address', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>30),
-		'role'      =>array('type'=>'checkbox', 'label'=>'Role', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>40),
+		'poste'     =>array('type'=>'varchar(128)', 'label'=>'PostOrFunction', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>2, 'index'=>1, 'position'=>20),
+		'address'   =>array('type'=>'varchar(128)', 'label'=>'Address', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>3, 'index'=>1, 'position'=>30),
+		'role'      =>array('type'=>'checkbox', 'label'=>'Role', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>4, 'index'=>1, 'position'=>40),
 		'statut'    =>array('type'=>'integer', 'label'=>'Status', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'default'=>0, 'index'=>1, 'position'=>50, 'arrayofkeyval'=>array(0=>$contactstatic->LibStatut(0, 1), 1=>$contactstatic->LibStatut(1, 1))),
 	);
 
diff --git a/htdocs/eventorganization/class/conferenceorbooth.class.php b/htdocs/eventorganization/class/conferenceorbooth.class.php
index bb8649106b9..ae35f3eb892 100644
--- a/htdocs/eventorganization/class/conferenceorbooth.class.php
+++ b/htdocs/eventorganization/class/conferenceorbooth.class.php
@@ -110,8 +110,8 @@ class ConferenceOrBooth extends ActionComm
 		'fk_project' => array('type'=>'integer:Project:projet/class/project.class.php:1::eventorganization', 'label'=>'Project', 'enabled'=>'1', 'position'=>52, 'notnull'=>-1, 'visible'=>-1, 'index'=>1,),
 		'note' => array('type'=>'text', 'label'=>'Description', 'enabled'=>'1', 'position'=>60, 'notnull'=>0, 'visible'=>1,),
 		'fk_action' => array('type'=>'sellist:c_actioncomm:libelle:id::module LIKE (\'%@eventorganization\')', 'label'=>'Format', 'enabled'=>'1', 'position'=>60, 'notnull'=>1, 'visible'=>1,),
-		'datep' => array('type'=>'datetime', 'label'=>'DateStart', 'enabled'=>'1', 'position'=>70, 'notnull'=>0, 'visible'=>1, 'showoncombobox'=>'1',),
-		'datep2' => array('type'=>'datetime', 'label'=>'DateEnd', 'enabled'=>'1', 'position'=>71, 'notnull'=>0, 'visible'=>1, 'showoncombobox'=>'1',),
+		'datep' => array('type'=>'datetime', 'label'=>'DateStart', 'enabled'=>'1', 'position'=>70, 'notnull'=>0, 'visible'=>1, 'showoncombobox'=>'2',),
+		'datep2' => array('type'=>'datetime', 'label'=>'DateEnd', 'enabled'=>'1', 'position'=>71, 'notnull'=>0, 'visible'=>1, 'showoncombobox'=>'3',),
 		'datec' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>'1', 'position'=>500, 'notnull'=>1, 'visible'=>-2,),
 		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>'1', 'position'=>501, 'notnull'=>0, 'visible'=>-2,),
 		'fk_user_author' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>'1', 'position'=>510, 'notnull'=>1, 'visible'=>-2, 'foreignkey'=>'user.rowid',),
diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index 1c1c1ab37be..e2ac86f55bd 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -57,7 +57,7 @@ class Fichinter extends CommonObject
 	'datee' =>array('type'=>'date', 'label'=>'Datee', 'enabled'=>1, 'visible'=>-1, 'position'=>90),
 	'datet' =>array('type'=>'date', 'label'=>'Datet', 'enabled'=>1, 'visible'=>-1, 'position'=>95),
 	'duree' =>array('type'=>'double', 'label'=>'Duree', 'enabled'=>1, 'visible'=>-1, 'position'=>100),
-	'description' =>array('type'=>'text', 'label'=>'Description', 'enabled'=>1, 'visible'=>-1, 'position'=>105, 'showoncombobox'=>1),
+	'description' =>array('type'=>'text', 'label'=>'Description', 'enabled'=>1, 'visible'=>-1, 'position'=>105, 'showoncombobox'=>2),
 	'note_private' =>array('type'=>'text', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>110),
 	'note_public' =>array('type'=>'text', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>115),
 	'model_pdf' =>array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>1, 'visible'=>0, 'position'=>120),
diff --git a/htdocs/hrm/class/establishment.class.php b/htdocs/hrm/class/establishment.class.php
index c63ab29a14a..c2fa520442b 100644
--- a/htdocs/hrm/class/establishment.class.php
+++ b/htdocs/hrm/class/establishment.class.php
@@ -133,7 +133,7 @@ class Establishment extends CommonObject
 		'rowid' =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10),
 		'entity' =>array('type'=>'integer', 'label'=>'Entity', 'default'=>1, 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>15, 'index'=>1),
 		'ref' =>array('type'=>'varchar(30)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'showoncombobox'=>1, 'position'=>20),
-		'label' =>array('type'=>'varchar(128)', 'label'=>'Label', 'enabled'=>1, 'visible'=>-1, 'showoncombobox'=>1, 'position'=>22),
+		'label' =>array('type'=>'varchar(128)', 'label'=>'Label', 'enabled'=>1, 'visible'=>-1, 'showoncombobox'=>2, 'position'=>22),
 		'address' =>array('type'=>'varchar(255)', 'label'=>'Address', 'enabled'=>1, 'visible'=>-1, 'position'=>25),
 		'zip' =>array('type'=>'varchar(25)', 'label'=>'Zip', 'enabled'=>1, 'visible'=>-1, 'position'=>30),
 		'town' =>array('type'=>'varchar(50)', 'label'=>'Town', 'enabled'=>1, 'visible'=>-1, 'position'=>35),
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index e69c5bc333d..76c6bb691f5 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -101,9 +101,9 @@ class MyObject extends CommonObject
 	 */
 	public $fields = array(
 		'rowid'         => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-2, 'noteditable'=>1, 'notnull'=> 1, 'index'=>1, 'position'=>1, 'comment'=>'Id', 'css'=>'left'),
-		'ref'           => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>1, 'noteditable'=>0, 'default'=>'', 'notnull'=> 1, 'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1, 'comment'=>'Reference of object'),
-		'entity'        => array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'notnull'=> 1, 'default'=>1, 'index'=>1, 'position'=>20),
-		'label'         => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>1, 'visible'=>1, 'position'=>30, 'searchall'=>1, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'help'=>'Help text', 'showoncombobox'=>1),
+		'entity'        => array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'notnull'=> 1, 'default'=>1, 'index'=>1, 'position'=>10),
+		'ref'           => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>1, 'noteditable'=>0, 'default'=>'', 'notnull'=> 1, 'showoncombobox'=>1, 'index'=>1, 'position'=>20, 'searchall'=>1, 'comment'=>'Reference of object'),
+		'label'         => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>1, 'visible'=>1, 'position'=>30, 'searchall'=>1, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'help'=>'Help text', 'showoncombobox'=>2),
 		'amount'        => array('type'=>'price', 'label'=>'Amount', 'enabled'=>1, 'visible'=>1, 'default'=>'null', 'position'=>40, 'searchall'=>0, 'isameasure'=>1, 'help'=>'Help text for amount'),
 		'qty'           => array('type'=>'real', 'label'=>'Qty', 'enabled'=>1, 'visible'=>1, 'default'=>'0', 'position'=>45, 'searchall'=>0, 'isameasure'=>1, 'help'=>'Help text for quantity', 'css'=>'maxwidth75imp'),
 		'fk_soc' 		=> array('type'=>'integer:Societe:societe/class/societe.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'picto'=>'company', 'label'=>'ThirdParty', 'visible'=> 1, 'enabled'=>1, 'position'=>50, 'notnull'=>-1, 'index'=>1, 'help'=>'LinkToThirparty'),
diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index d48d4959fd1..115844c916d 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -103,7 +103,7 @@ class Mo extends CommonObject
 		'fk_bom' => array('type'=>'integer:Bom:bom/class/bom.class.php:0:t.status=1', 'filter'=>'active=1', 'label'=>'BOM', 'enabled'=>1, 'visible'=>1, 'position'=>33, 'notnull'=>-1, 'index'=>1, 'comment'=>"Original BOM", 'css'=>'minwidth100 maxwidth300', 'csslist'=>'nowraponall'),
 		'fk_product' => array('type'=>'integer:Product:product/class/product.class.php:0', 'label'=>'Product', 'enabled'=>1, 'visible'=>1, 'position'=>35, 'notnull'=>1, 'index'=>1, 'comment'=>"Product to produce", 'css'=>'maxwidth300', 'picto'=>'product'),
 		'qty' => array('type'=>'real', 'label'=>'QtyToProduce', 'enabled'=>1, 'visible'=>1, 'position'=>40, 'notnull'=>1, 'comment'=>"Qty to produce", 'css'=>'width75', 'default'=>1, 'isameasure'=>1),
-		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>1, 'visible'=>1, 'position'=>42, 'notnull'=>-1, 'searchall'=>1, 'showoncombobox'=>'1',),
+		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>1, 'visible'=>1, 'position'=>42, 'notnull'=>-1, 'searchall'=>1, 'showoncombobox'=>'2',),
 		'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1', 'label'=>'ThirdParty', 'picto'=>'company', 'enabled'=>1, 'visible'=>-1, 'position'=>50, 'notnull'=>-1, 'index'=>1, 'css'=>'maxwidth400'),
 		'fk_project' => array('type'=>'integer:Project:projet/class/project.class.php:1:fk_statut=1', 'label'=>'Project', 'picto'=>'project', 'enabled'=>1, 'visible'=>-1, 'position'=>51, 'notnull'=>-1, 'index'=>1, 'css'=>'minwidth200 maxwidth400'),
 		'fk_warehouse' => array('type'=>'integer:Entrepot:product/stock/class/entrepot.class.php:0', 'label'=>'WarehouseForProduction', 'picto'=>'stock', 'enabled'=>1, 'visible'=>1, 'position'=>52, 'css'=>'maxwidth400'),
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index f76a6fec0ad..6aee9af9c60 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -433,8 +433,8 @@ class Product extends CommonObject
 		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'index'=>1, 'position'=>1, 'comment'=>'Id'),
 		'ref'           =>array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1, 'comment'=>'Reference of object'),
 		'entity'        =>array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'default'=>1, 'notnull'=>1, 'index'=>1, 'position'=>5),
-		'label'         =>array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'position'=>15),
-		'barcode'       =>array('type'=>'varchar(255)', 'label'=>'Barcode', 'enabled'=>'!empty($conf->barcode->enabled)', 'position'=>20, 'visible'=>-1, 'showoncombobox'=>1),
+		'label'         =>array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>2, 'position'=>15),
+		'barcode'       =>array('type'=>'varchar(255)', 'label'=>'Barcode', 'enabled'=>'!empty($conf->barcode->enabled)', 'position'=>20, 'visible'=>-1, 'showoncombobox'=>3),
 		'fk_barcode_type' => array('type'=>'integer', 'label'=>'BarcodeType', 'enabled'=>'1', 'position'=>21, 'notnull'=>0, 'visible'=>-1,),
 		'note_public'   =>array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>61),
 		'note'          =>array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>62),
diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index dc15e092155..35791bfd158 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -127,7 +127,7 @@ class Entrepot extends CommonObject
 		'ref' =>array('type'=>'varchar(255)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>1, 'showoncombobox'=>1, 'position'=>25, 'searchall'=>1),
 		'entity' =>array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'notnull'=>1, 'position'=>30),
 		'description' =>array('type'=>'text', 'label'=>'Description', 'enabled'=>1, 'visible'=>-2, 'position'=>35, 'searchall'=>1),
-		'lieu' =>array('type'=>'varchar(64)', 'label'=>'LocationSummary', 'enabled'=>1, 'visible'=>1, 'position'=>40, 'showoncombobox'=>1, 'searchall'=>1),
+		'lieu' =>array('type'=>'varchar(64)', 'label'=>'LocationSummary', 'enabled'=>1, 'visible'=>1, 'position'=>40, 'showoncombobox'=>2, 'searchall'=>1),
 		'fk_parent' =>array('type'=>'integer:Entrepot:product/stock/class/entrepot.class.php:1:statut=1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'ParentWarehouse', 'enabled'=>1, 'visible'=>-2, 'position'=>41),
 		'fk_project' =>array('type'=>'integer:Project:projet/class/project.class.php:1:fk_statut=1', 'label'=>'Project', 'enabled'=>1, 'visible'=>-1, 'position'=>25),
 		'address' =>array('type'=>'varchar(255)', 'label'=>'Address', 'enabled'=>1, 'visible'=>-2, 'position'=>45, 'searchall'=>1),
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index ca42e8a3fd1..851703ce96b 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -224,7 +224,7 @@ class Project extends CommonObject
 	public $fields = array(
 		'rowid' =>array('type'=>'integer', 'label'=>'ID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10),
 		'ref' =>array('type'=>'varchar(50)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>1, 'showoncombobox'=>1, 'position'=>15, 'searchall'=>1),
-		'title' =>array('type'=>'varchar(255)', 'label'=>'ProjectLabel', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'position'=>17, 'showoncombobox'=>1, 'searchall'=>1),
+		'title' =>array('type'=>'varchar(255)', 'label'=>'ProjectLabel', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'position'=>17, 'showoncombobox'=>2, 'searchall'=>1),
 		'entity' =>array('type'=>'integer', 'label'=>'Entity', 'default'=>1, 'enabled'=>1, 'visible'=>3, 'notnull'=>1, 'position'=>19),
 		'fk_soc' =>array('type'=>'integer', 'label'=>'Thirdparty', 'enabled'=>1, 'visible'=>0, 'position'=>20),
 		'dateo' =>array('type'=>'date', 'label'=>'DateStart', 'enabled'=>1, 'visible'=>1, 'position'=>30),
diff --git a/htdocs/recruitment/class/recruitmentjobposition.class.php b/htdocs/recruitment/class/recruitmentjobposition.class.php
index 86cd99e7180..2f180bcc8ec 100644
--- a/htdocs/recruitment/class/recruitmentjobposition.class.php
+++ b/htdocs/recruitment/class/recruitmentjobposition.class.php
@@ -102,7 +102,7 @@ class RecruitmentJobPosition extends CommonObject
 		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'comment'=>"Id"),
 		'entity' => array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'position'=>5, 'notnull'=>1, 'default'=>'1', 'index'=>1),
 		'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>'1', 'position'=>10, 'notnull'=>1, 'visible'=>4, 'noteditable'=>'1', 'default'=>'(PROV)', 'index'=>1, 'searchall'=>1, 'showoncombobox'=>'1', 'comment'=>"Reference of object"),
-		'label' => array('type'=>'varchar(255)', 'label'=>'JobLabel', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth500', 'csslist'=>'tdoverflowmax300', 'showoncombobox'=>'1', 'autofocusoncreate'=>1),
+		'label' => array('type'=>'varchar(255)', 'label'=>'JobLabel', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth500', 'csslist'=>'tdoverflowmax300', 'showoncombobox'=>'2', 'autofocusoncreate'=>1),
 		'qty' => array('type'=>'integer', 'label'=>'NbOfEmployeesExpected', 'enabled'=>'1', 'position'=>45, 'notnull'=>1, 'visible'=>1, 'default'=>'1', 'isameasure'=>'1', 'css'=>'maxwidth75imp'),
 		'fk_project' => array('type'=>'integer:Project:projet/class/project.class.php:1', 'label'=>'Project', 'enabled'=>'1', 'position'=>52, 'notnull'=>-1, 'visible'=>-1, 'index'=>1, 'css'=>'maxwidth500', 'picto'=>'project'),
 		'fk_user_recruiter' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'ResponsibleOfRecruitement', 'enabled'=>'1', 'position'=>54, 'notnull'=>1, 'visible'=>1, 'foreignkey'=>'user.rowid', 'csslist'=>'tdoverflowmax150'),
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 7554ad2fbe2..97723f83f37 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -162,7 +162,7 @@ class Societe extends CommonObject
 		'tms' =>array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>25),
 		'datec' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-1, 'position'=>30),
 		'nom' =>array('type'=>'varchar(128)', 'label'=>'Nom', 'enabled'=>1, 'visible'=>-1, 'position'=>35, 'showoncombobox'=>1),
-		'name_alias' =>array('type'=>'varchar(128)', 'label'=>'Name alias', 'enabled'=>1, 'visible'=>-1, 'position'=>36, 'showoncombobox'=>1),
+		'name_alias' =>array('type'=>'varchar(128)', 'label'=>'Name alias', 'enabled'=>1, 'visible'=>-1, 'position'=>36, 'showoncombobox'=>2),
 		'entity' =>array('type'=>'integer', 'label'=>'Entity', 'default'=>1, 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>40, 'index'=>1),
 		'ref_ext' =>array('type'=>'varchar(255)', 'label'=>'RefExt', 'enabled'=>1, 'visible'=>0, 'position'=>45),
 		'code_client' =>array('type'=>'varchar(24)', 'label'=>'CustomerCode', 'enabled'=>1, 'visible'=>-1, 'position'=>55),
diff --git a/htdocs/workstation/class/workstation.class.php b/htdocs/workstation/class/workstation.class.php
index d81bab42eab..5cb6baf3565 100755
--- a/htdocs/workstation/class/workstation.class.php
+++ b/htdocs/workstation/class/workstation.class.php
@@ -101,7 +101,7 @@ class Workstation extends CommonObject
 	public $fields=array(
 		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
 		'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>'1', 'position'=>10, 'notnull'=>1, 'visible'=>1, 'noteditable'=>'0', 'default'=>'', 'index'=>1, 'searchall'=>1, 'showoncombobox'=>'1', 'comment'=>"Reference of object"),
-		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth300', 'showoncombobox'=>'1',),
+		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth300', 'showoncombobox'=>'2',),
 		'type' => array('type'=>'varchar(8)', 'label'=>'Type', 'enabled'=>'1', 'position'=>32, 'default'=>1, 'notnull'=>1, 'visible'=>1, 'arrayofkeyval'=>array('HUMAN'=>'Human', 'MACHINE'=>'Machine', 'BOTH'=>'HumanMachine'),),
 		'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>'1', 'position'=>61, 'notnull'=>0, 'visible'=>0,),
 		'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>'1', 'position'=>62, 'notnull'=>0, 'visible'=>0,),
diff --git a/htdocs/zapier/class/hook.class.php b/htdocs/zapier/class/hook.class.php
index 9197942b5c0..ba04f504da6 100644
--- a/htdocs/zapier/class/hook.class.php
+++ b/htdocs/zapier/class/hook.class.php
@@ -121,8 +121,7 @@ class Hook extends CommonObject
 			'position' => 30,
 			'searchall' => 1,
 			'css' => 'minwidth200',
-			'help' => 'Hook url',
-			'showoncombobox' => 1,
+			'help' => 'Hook url'
 		),
 		'module' => array(
 			'type' => 'varchar(128)',
@@ -132,8 +131,7 @@ class Hook extends CommonObject
 			'position' => 30,
 			'searchall' => 1,
 			'css' => 'minwidth200',
-			'help' => 'Hook module',
-			'showoncombobox' => 1,
+			'help' => 'Hook module'
 		),
 		'action' => array(
 			'type' => 'varchar(128)',
@@ -143,8 +141,7 @@ class Hook extends CommonObject
 			'position' => 30,
 			'searchall' => 1,
 			'css' => 'minwidth200',
-			'help' => 'Hook action trigger',
-			'showoncombobox' => 1,
+			'help' => 'Hook action trigger'
 		),
 		'event' => array(
 			'type' => 'varchar(255)',

From 7074f8d048a733e24c999049986573833aab64e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 5 Jun 2021 15:23:29 +0200
Subject: [PATCH 0421/1497] add creates

---
 dev/examples/zapier/creates/contact.js | 74 ++++++++++++++++++++++++++
 dev/examples/zapier/creates/member.js  | 74 ++++++++++++++++++++++++++
 dev/examples/zapier/index.js           |  4 ++
 3 files changed, 152 insertions(+)
 create mode 100644 dev/examples/zapier/creates/contact.js
 create mode 100644 dev/examples/zapier/creates/member.js

diff --git a/dev/examples/zapier/creates/contact.js b/dev/examples/zapier/creates/contact.js
new file mode 100644
index 00000000000..bcb849ad63d
--- /dev/null
+++ b/dev/examples/zapier/creates/contact.js
@@ -0,0 +1,74 @@
+/*jshint esversion: 6 */
+// create a particular contact by name
+const createContact = async (z, bundle) => {
+    const apiurl = bundle.authData.url  + '/api/index.php/contacts';
+
+    const response = await z.request({
+        method: 'POST',
+        url: apiurl,
+        body: {
+            name: bundle.inputData.name,
+            name_alias: bundle.inputData.name_alias,
+            ref_ext: bundle.inputData.ref_ext,
+            ref_int: bundle.inputData.ref_int,
+            address: bundle.inputData.address,
+            zip: bundle.inputData.zip,
+            town: bundle.inputData.town,
+            country_code: bundle.inputData.country_code,
+            country_id: bundle.inputData.country_id,
+            country: bundle.inputData.country,
+            phone: bundle.inputData.phone,
+            email: bundle.inputData.email,
+            sens: 'fromzapier'
+        }
+    });
+    const result = z.JSON.parse(response.content);
+    // api returns an integer when ok, a json when ko
+    return result.response || {id: response};
+};
+
+module.exports = {
+    key: 'contact',
+    noun: 'Contact',
+
+    display: {
+        label: 'Create Contact',
+        description: 'Creates a contact.'
+    },
+
+    operation: {
+        inputFields: [
+            {key: 'name', required: true},
+            {key: 'name_alias', required: false},
+            {key: 'address', required: false},
+            {key: 'zip', required: false},
+            {key: 'town', required: false},
+            {key: 'email', required: false}
+        ],
+        perform: createContact,
+
+        sample: {
+            id: 1,
+            name: 'DUPOND',
+            name_alias: 'DUPOND Ltd',
+            address: 'Rue des Canaries',
+            zip: '34090',
+            town: 'MONTPELLIER',
+            phone: '0123456789',
+            fax: '2345678901',
+            email: 'robot@domain.com'
+        },
+
+        outputFields: [
+            {key: 'id', type: "integer", label: 'ID'},
+            {key: 'name', label: 'Name'},
+            {key: 'name_alias', label: 'Name alias'},
+            {key: 'address', label: 'Address'},
+            {key: 'zip', label: 'Zip'},
+            {key: 'town', label: 'Town'},
+            {key: 'phone', label: 'Phone'},
+            {key: 'fax', label: 'Fax'},
+            {key: 'email', label: 'Email'}
+        ]
+    }
+};
diff --git a/dev/examples/zapier/creates/member.js b/dev/examples/zapier/creates/member.js
new file mode 100644
index 00000000000..152f1129e79
--- /dev/null
+++ b/dev/examples/zapier/creates/member.js
@@ -0,0 +1,74 @@
+/*jshint esversion: 6 */
+// create a particular member by name
+const createMember = async (z, bundle) => {
+    const apiurl = bundle.authData.url  + '/api/index.php/members';
+
+    const response = await z.request({
+        method: 'POST',
+        url: apiurl,
+        body: {
+            name: bundle.inputData.name,
+            name_alias: bundle.inputData.name_alias,
+            ref_ext: bundle.inputData.ref_ext,
+            ref_int: bundle.inputData.ref_int,
+            address: bundle.inputData.address,
+            zip: bundle.inputData.zip,
+            town: bundle.inputData.town,
+            country_code: bundle.inputData.country_code,
+            country_id: bundle.inputData.country_id,
+            country: bundle.inputData.country,
+            phone: bundle.inputData.phone,
+            email: bundle.inputData.email,
+            sens: 'fromzapier'
+        }
+    });
+    const result = z.JSON.parse(response.content);
+    // api returns an integer when ok, a json when ko
+    return result.response || {id: response};
+};
+
+module.exports = {
+    key: 'member',
+    noun: 'Member',
+
+    display: {
+        label: 'Create Member',
+        description: 'Creates a member.'
+    },
+
+    operation: {
+        inputFields: [
+            {key: 'name', required: true},
+            {key: 'name_alias', required: false},
+            {key: 'address', required: false},
+            {key: 'zip', required: false},
+            {key: 'town', required: false},
+            {key: 'email', required: false}
+        ],
+        perform: createMember,
+
+        sample: {
+            id: 1,
+            name: 'DUPOND',
+            name_alias: 'DUPOND Ltd',
+            address: 'Rue des Canaries',
+            zip: '34090',
+            town: 'MONTPELLIER',
+            phone: '0123456789',
+            fax: '2345678901',
+            email: 'robot@domain.com'
+        },
+
+        outputFields: [
+            {key: 'id', type: "integer", label: 'ID'},
+            {key: 'name', label: 'Name'},
+            {key: 'name_alias', label: 'Name alias'},
+            {key: 'address', label: 'Address'},
+            {key: 'zip', label: 'Zip'},
+            {key: 'town', label: 'Town'},
+            {key: 'phone', label: 'Phone'},
+            {key: 'fax', label: 'Fax'},
+            {key: 'email', label: 'Email'}
+        ]
+    }
+};
diff --git a/dev/examples/zapier/index.js b/dev/examples/zapier/index.js
index d96df72e11f..94046969045 100644
--- a/dev/examples/zapier/index.js
+++ b/dev/examples/zapier/index.js
@@ -9,6 +9,8 @@ const triggerUser = require('./triggers/user');
 const searchThirdparty = require('./searches/thirdparty');
 
 const createThirdparty = require('./creates/thirdparty');
+const createContact = require('./creates/contact');
+const createMember = require('./creates/member');
 
 const {
     config: authentication,
@@ -76,6 +78,8 @@ const App = {
     // If you want your creates to show up, you better include it here!
     creates: {
         [createThirdparty.key]: createThirdparty,
+        [createContact.key]: createContact,
+        [createMember.key]: createMember,
     }
 };
 

From fb0d2cdddcc2be2f9bf1f4e47066224b8747452e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 5 Jun 2021 15:27:49 +0200
Subject: [PATCH 0422/1497] Debug v14

---
 htdocs/core/class/html.form.class.php          | 5 ++++-
 htdocs/partnership/class/partnership.class.php | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 0944918f815..1dd6712dba6 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -6840,9 +6840,12 @@ class Form
 					$obj = $this->db->fetch_object($resql);
 					$label = '';
 					$tmparray = explode(',', $fieldstoshow);
+					$oldvalueforshowoncombobox = 0;
 					foreach ($tmparray as $key => $val) {
 						$val = preg_replace('/t\./', '', $val);
-						$label .= (($label && $obj->$val) ? ' - ' : '').$obj->$val;
+						$label .= (($label && $obj->$val) ? ($oldvalueforshowoncombobox != $objecttmp->fields[$val]['showoncombobox'] ? ' - ' : ' ') : '');
+						$label .= $obj->$val;
+						$oldvalueforshowoncombobox = $objecttmp->fields[$val]['showoncombobox'];
 					}
 					if (empty($outputmode)) {
 						if ($preselectedvalue > 0 && $preselectedvalue == $obj->rowid) {
diff --git a/htdocs/partnership/class/partnership.class.php b/htdocs/partnership/class/partnership.class.php
index 77ae16d9d2d..f33a19f312e 100644
--- a/htdocs/partnership/class/partnership.class.php
+++ b/htdocs/partnership/class/partnership.class.php
@@ -198,9 +198,9 @@ class Partnership extends CommonObject
 		);
 
 		if ($conf->global->PARTNERSHIP_IS_MANAGED_FOR == 'member') {
-			$this->fields['fk_member'] = array('type'=>'integer:Adherent:adherents/class/adherent.class.php:1', 'label'=>'Member', 'enabled'=>'1', 'position'=>50, 'notnull'=>-1, 'visible'=>1, 'index'=>1,);
+			$this->fields['fk_member'] = array('type'=>'integer:Adherent:adherents/class/adherent.class.php:1', 'label'=>'Member', 'enabled'=>'1', 'position'=>50, 'notnull'=>-1, 'visible'=>1, 'index'=>1, 'picto'=>'member');
 		} else {
-			$this->fields['fk_soc'] = array('type'=>'integer:Societe:societe/class/societe.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'ThirdParty', 'enabled'=>'1', 'position'=>50, 'notnull'=>-1, 'visible'=>1, 'index'=>1,);
+			$this->fields['fk_soc'] = array('type'=>'integer:Societe:societe/class/societe.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'ThirdParty', 'enabled'=>'1', 'position'=>50, 'notnull'=>-1, 'visible'=>1, 'index'=>1, 'picto'=>'societe');
 		}
 
 		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {

From 273c4c288038d5b60a5c5e931c65640e8c37724a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 5 Jun 2021 15:28:41 +0200
Subject: [PATCH 0423/1497] Fix typo

---
 htdocs/core/lib/pdf.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 6e4cc60ce53..933d8e14197 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -1250,7 +1250,7 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 			// ($textwasmodified is replaced with $textwasmodifiedorcompleted and we add completion).
 
 			// Set label
-			// If we want another language, and if label is same than default language (we did force it to a specific value), we can use translation.
+			// If we want another language, and if label is same than default language (we did not force it to a specific value), we can use translation.
 			//var_dump($outputlangs->defaultlang.' - '.$langs->defaultlang.' - '.$label.' - '.$prodser->label);exit;
 			$textwasmodified = ($label == $prodser->label);
 			if (!empty($prodser->multilangs[$outputlangs->defaultlang]["label"]) && ($textwasmodified || $translatealsoifmodified)) {

From 70af18148b9324d91c257c10b6a5177c5a4b2986 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 5 Jun 2021 17:48:30 +0200
Subject: [PATCH 0424/1497] Debug modulebuilder v14

---
 htdocs/core/lib/functions.lib.php                | 7 ++++---
 htdocs/install/mysql/migration/13.0.0-14.0.0.sql | 2 ++
 htdocs/modulebuilder/template/myobject_card.php  | 3 +--
 htdocs/partnership/partnership_card.php          | 5 ++---
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 61a3869fe1a..b018b4d2fb0 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -9671,7 +9671,7 @@ function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $st
 /**
  * Function dolGetButtonAction
  *
- * @param string    $label      label of button no html : use in alt attribute for accessibility $html is not empty
+ * @param string    $label      label of button without HTML : use in alt attribute for accessibility $html is not empty
  * @param string    $html       optional : content with html
  * @param string    $actionType default, delete, danger
  * @param string    $url        the url for link
@@ -9689,8 +9689,9 @@ function dolGetButtonAction($label, $html = '', $actionType = 'default', $url =
 	}
 
 	$attr = array(
-		'class' => $class
-		,'href' => empty($url) ? '' : $url
+		'class' => $class,
+		'href' => empty($url) ? '' : $url,
+		'title' => $label
 	);
 
 	if (empty($html)) {
diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index 3fb671fa9b2..cc4b791725d 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -450,6 +450,8 @@ CREATE TABLE llx_partnership(
 	model_pdf varchar(255)
 ) ENGINE=innodb;
 
+ALTER TABLE llx_partnership ADD COLUMN last_check_backlink datetime NULL;
+
 ALTER TABLE llx_partnership ADD INDEX idx_partnership_rowid (rowid);
 ALTER TABLE llx_partnership ADD INDEX idx_partnership_ref (ref);
 ALTER TABLE llx_partnership ADD INDEX idx_partnership_fk_soc (fk_soc);
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index 1f9da9c80ae..739596b5653 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -505,8 +505,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 					print dolGetButtonAction($langs->trans('Validate'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_validate&confirm=yes', '', $permissiontoadd);
 				} else {
 					$langs->load("errors");
-					//print dolGetButtonAction($langs->trans('Validate'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_validate&confirm=yes', '', 0);
-					print '<a class="butActionRefused" href="" title="'.dol_escape_htmltag($langs->trans("ErrorAddAtLeastOneLineFirst")).'">'.$langs->trans("Validate").'</a>';
+					print dolGetButtonAction($langs->trans("ErrorAddAtLeastOneLineFirst"), $langs->trans("Validate"), 'default', '#', '', 0);
 				}
 			}
 
diff --git a/htdocs/partnership/partnership_card.php b/htdocs/partnership/partnership_card.php
index b31ced3556f..f724ace839d 100644
--- a/htdocs/partnership/partnership_card.php
+++ b/htdocs/partnership/partnership_card.php
@@ -639,8 +639,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 					print dolGetButtonAction($langs->trans('Validate'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_accept&confirm=yes', '', $permissiontoadd);
 				} else {
 					$langs->load("errors");
-					//print dolGetButtonAction($langs->trans('Accept'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_accept&confirm=yes', '', 0);
-					print '<a class="butActionRefused" href="" title="'.$langs->trans("ErrorAddAtLeastOneLineFirst").'">'.$langs->trans("Validate").'</a>';
+					print dolGetButtonAction($langs->trans("ErrorAddAtLeastOneLineFirst"), $langs->trans("Validate"), 'default', '#', '', 0);
 				}
 			}
 
@@ -657,7 +656,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			// Refuse
 			if ($permissiontoadd) {
 				if ($object->status != $object::STATUS_CANCELED && $object->status != $object::STATUS_REFUSED) {
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=refuse&token='.newToken().'">'.$langs->trans("Refuse").'</a>'."\n";
+					print dolGetButtonAction($langs->trans('Refuse'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=refuse&token='.newToken(), '', $permissiontoadd);
 				}
 			}
 

From 92b6425ce0832639c7e3f19e31199405f5634d27 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 5 Jun 2021 18:20:07 +0200
Subject: [PATCH 0425/1497] Debug v14

---
 htdocs/adherents/partnership.php              |  6 ++-
 htdocs/langs/en_US/partnership.lang           |  2 +-
 .../modulebuilder/template/myobject_card.php  |  4 +-
 htdocs/partnership/partnership_card.php       | 10 ++--
 htdocs/societe/partnership.php                | 48 +++++--------------
 5 files changed, 24 insertions(+), 46 deletions(-)

diff --git a/htdocs/adherents/partnership.php b/htdocs/adherents/partnership.php
index 5bdf758e84f..28b041240a3 100644
--- a/htdocs/adherents/partnership.php
+++ b/htdocs/adherents/partnership.php
@@ -510,20 +510,22 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 		if (empty($reshook)) {
 			if ($object->status == $object::STATUS_DRAFT) {
-				print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER["PHP_SELF"].'?rowid='.$memberid.'&action=edit', '', $permissiontoadd);
+				print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER["PHP_SELF"].'?rowid='.$memberid.'&action=edit&token='.newToken(), '', $permissiontoadd);
 			}
 
 			// Show
 			if ($permissiontoadd) {
-				print dolGetButtonAction($langs->trans('ShowPartnership'), '', 'default', dol_buildpath('/partnership/partnership_card.php', 1).'?id='.$object->id, '', $permissiontoadd);
+				print dolGetButtonAction($langs->trans('ManagePartnership'), '', 'default', dol_buildpath('/partnership/partnership_card.php', 1).'?id='.$object->id, '', $permissiontoadd);
 			}
 
 			// Cancel
+			/*
 			if ($permissiontoadd) {
 				if ($object->status == $object::STATUS_ACCEPTED) {
 					print dolGetButtonAction($langs->trans('Cancel'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=close&token='.newToken(), '', $permissiontoadd);
 				}
 			}
+			*/
 		}
 		print '</div>'."\n";
 	}
diff --git a/htdocs/langs/en_US/partnership.lang b/htdocs/langs/en_US/partnership.lang
index 7decec2a003..6d0c7dc0ac9 100644
--- a/htdocs/langs/en_US/partnership.lang
+++ b/htdocs/langs/en_US/partnership.lang
@@ -50,7 +50,7 @@ DatePartnershipEnd=End date
 ReasonDecline=Decline reason
 ReasonDeclineOrCancel=Decline reason
 PartnershipAlreadyExist=Partnership already exist
-ShowPartnership=Show partnership
+ManagePartnership=Manage partnership
 BacklinkNotFoundOnPartnerWebsite=Backlink not found on partner website
 ConfirmClosePartnershipAsk=Are you sure you want to cancel this partnership?
 
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index 739596b5653..7111b59b582 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -489,7 +489,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		if (empty($reshook)) {
 			// Send
 			if (empty($user->socid)) {
-				print dolGetButtonAction($langs->trans('SendMail'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle');
+				print dolGetButtonAction($langs->trans('SendMail'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init&token='.newToken().'#formmailbeforetitle');
 			}
 
 			// Back to draft
@@ -502,7 +502,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			// Validate
 			if ($object->status == $object::STATUS_DRAFT) {
 				if (empty($object->table_element_line) || (is_array($object->lines) && count($object->lines) > 0)) {
-					print dolGetButtonAction($langs->trans('Validate'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_validate&confirm=yes', '', $permissiontoadd);
+					print dolGetButtonAction($langs->trans('Validate'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_validate&confirm=yes&token='.newToken(), '', $permissiontoadd);
 				} else {
 					$langs->load("errors");
 					print dolGetButtonAction($langs->trans("ErrorAddAtLeastOneLineFirst"), $langs->trans("Validate"), 'default', '#', '', 0);
diff --git a/htdocs/partnership/partnership_card.php b/htdocs/partnership/partnership_card.php
index f724ace839d..72e0bc22bdd 100644
--- a/htdocs/partnership/partnership_card.php
+++ b/htdocs/partnership/partnership_card.php
@@ -623,20 +623,20 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		if (empty($reshook)) {
 			// Send
 			if (empty($user->socid)) {
-				print dolGetButtonAction($langs->trans('SendMail'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle');
+				print dolGetButtonAction($langs->trans('SendMail'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init&token='.newToken().'#formmailbeforetitle');
 			}
 
 			// Back to draft
 			if ($object->status != $object::STATUS_DRAFT) {
-				print dolGetButtonAction($langs->trans('SetToDraft'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_setdraft&confirm=yes', '', $permissiontoadd);
+				print dolGetButtonAction($langs->trans('SetToDraft'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_setdraft&confirm=yes&token='.newToken(), '', $permissiontoadd);
 			}
 
-			print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit', '', $permissiontoadd);
+			print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&token='.newToken(), '', $permissiontoadd);
 
 			// Accept
 			if ($object->status == $object::STATUS_DRAFT) {
 				if (empty($object->table_element_line) || (is_array($object->lines) && count($object->lines) > 0)) {
-					print dolGetButtonAction($langs->trans('Validate'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_accept&confirm=yes', '', $permissiontoadd);
+					print dolGetButtonAction($langs->trans('Validate'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_accept&confirm=yes&token='.newToken(), '', $permissiontoadd);
 				} else {
 					$langs->load("errors");
 					print dolGetButtonAction($langs->trans("ErrorAddAtLeastOneLineFirst"), $langs->trans("Validate"), 'default', '#', '', 0);
@@ -655,7 +655,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 			// Refuse
 			if ($permissiontoadd) {
-				if ($object->status != $object::STATUS_CANCELED && $object->status != $object::STATUS_REFUSED) {
+				if ($object->status != $object::STATUS_ACCEPTED && $object->status != $object::STATUS_CANCELED && $object->status != $object::STATUS_REFUSED) {
 					print dolGetButtonAction($langs->trans('Refuse'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=refuse&token='.newToken(), '', $permissiontoadd);
 				}
 			}
diff --git a/htdocs/societe/partnership.php b/htdocs/societe/partnership.php
index 0a5205799a9..6a45c657126 100644
--- a/htdocs/societe/partnership.php
+++ b/htdocs/societe/partnership.php
@@ -44,42 +44,13 @@
 //if (! defined('NOBROWSERNOTIF'))     		 define('NOBROWSERNOTIF', '1');				// Disable browser notification
 
 // Load Dolibarr environment
-$res = 0;
-// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
-if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
-	$res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
-}
-// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
-$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
-while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) {
-	$i--; $j--;
-}
-if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) {
-	$res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
-}
-if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) {
-	$res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
-}
-// Try main.inc.php using relative path
-if (!$res && file_exists("../main.inc.php")) {
-	$res = @include "../main.inc.php";
-}
-if (!$res && file_exists("../../main.inc.php")) {
-	$res = @include "../../main.inc.php";
-}
-if (!$res && file_exists("../../../main.inc.php")) {
-	$res = @include "../../../main.inc.php";
-}
-if (!$res) {
-	die("Include of main fails");
-}
-
+require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-dol_include_once('/partnership/class/partnership.class.php');
-dol_include_once('/partnership/lib/partnership.lib.php');
+require_once DOL_DOCUMENT_ROOT.'/partnership/class/partnership.class.php';
+require_once DOL_DOCUMENT_ROOT.'/partnership/lib/partnership.lib.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array("companies","partnership", "other"));
@@ -153,6 +124,11 @@ if (($action == 'update' || $action == 'edit') && $object->status != $object::ST
 if (empty($socid) && $object) {
 	$socid = $object->fk_soc;
 }
+
+// Security check
+$result = restrictedArea($user, 'societe', $socid, '&societe', '', 'fk_soc', 'rowid', 0);
+
+
 /*
  * Actions
  */
@@ -276,8 +252,6 @@ $object->fields['note_public']['visible'] = 1;
 
 /*
  * View
- *
- * Put here all code to build page
  */
 
 $form = new Form($db);
@@ -528,20 +502,22 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 		if (empty($reshook)) {
 			if ($object->status == $object::STATUS_DRAFT) {
-				print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER["PHP_SELF"].'?socid='.$socid.'&action=edit', '', $permissiontoadd);
+				print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER["PHP_SELF"].'?socid='.$socid.'&action=edit&token='.newtoken(), '', $permissiontoadd);
 			}
 
 			// Show
 			if ($permissiontoadd) {
-				print dolGetButtonAction($langs->trans('ShowPartnership'), '', 'default', dol_buildpath('/partnership/partnership_card.php', 1).'?id='.$object->id, '', $permissiontoadd);
+				print dolGetButtonAction($langs->trans('ManagePartnership'), '', 'default', dol_buildpath('/partnership/partnership_card.php', 1).'?id='.$object->id, '', $permissiontoadd);
 			}
 
 			// Cancel
+			/*
 			if ($permissiontoadd) {
 				if ($object->status == $object::STATUS_ACCEPTED) {
 					print dolGetButtonAction($langs->trans('Cancel'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=close&token='.newToken(), '', $permissiontoadd);
 				}
 			}
+			*/
 		}
 		print '</div>'."\n";
 	}

From 51bce78e6e5048c40e052c9d4e4c35d36792ec44 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sun, 6 Jun 2021 06:05:47 +0200
Subject: [PATCH 0426/1497] NEW Add field date start/end from/to in expense
 report list

---
 htdocs/expensereport/list.php | 119 +++++++++++++++++++++++++++-------
 1 file changed, 95 insertions(+), 24 deletions(-)

diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index ce1dc4e3c09..1f3468d06fc 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -107,12 +107,23 @@ $search_amount_vat	= GETPOST('search_amount_vat', 'alpha');
 $search_amount_ttc	= GETPOST('search_amount_ttc', 'alpha');
 $search_status		= (GETPOST('search_status', 'intcomma') != '' ?GETPOST('search_status', 'intcomma') : GETPOST('statut', 'intcomma'));
 
-$year_start   = GETPOST('year_start', 'int');
-$month_start  = GETPOST('month_start', 'int');
-$day_start    = GETPOST('day_start', 'int');
-$year_end     = GETPOST('year_end', 'int');
-$month_end    = GETPOST('month_end', 'int');
-$day_end      = GETPOST('day_end', 'int');
+$search_date_startday		= GETPOST('search_date_startday', 'int');
+$search_date_startmonth		= GETPOST('search_date_startmonth', 'int');
+$search_date_startyear		= GETPOST('search_date_startyear', 'int');
+$search_date_startendday	= GETPOST('search_date_startendday', 'int');
+$search_date_startendmonth	= GETPOST('search_date_startendmonth', 'int');
+$search_date_startendyear	= GETPOST('search_date_startendyear', 'int');
+$search_date_start			= dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);	// Use tzserver
+$search_date_startend		= dol_mktime(23, 59, 59, $search_date_startendmonth, $search_date_startendday, $search_date_startendyear);
+
+$search_date_endday			= GETPOST('search_date_endday', 'int');
+$search_date_endmonth		= GETPOST('search_date_endmonth', 'int');
+$search_date_endyear		= GETPOST('search_date_endyear', 'int');
+$search_date_endendday		= GETPOST('search_date_endendday', 'int');
+$search_date_endendmonth	= GETPOST('search_date_endendmonth', 'int');
+$search_date_endendyear		= GETPOST('search_date_endendyear', 'int');
+$search_date_end			= dol_mktime(0, 0, 0, $search_date_endmonth, $search_date_endday, $search_date_endyear);	// Use tzserver
+$search_date_endend			= dol_mktime(23, 59, 59, $search_date_endendmonth, $search_date_endendday, $search_date_endendyear);
 
 $optioncss    = GETPOST('optioncss', 'alpha');
 
@@ -197,11 +208,22 @@ if (empty($reshook)) {
 		$search_amount_vat = "";
 		$search_amount_ttc = "";
 		$search_status = "";
-		$month_start = "";
-		$year_start = "";
-		$month_end = "";
-		$year_end = "";
-		$day_end = "";
+		$search_date_startday = '';
+		$search_date_startmonth = '';
+		$search_date_startyear = '';
+		$search_date_startendday = '';
+		$search_date_startendmonth = '';
+		$search_date_startendyear = '';
+		$search_date_start = '';
+		$search_date_startend = '';
+		$search_date_endday = '';
+		$search_date_endmonth = '';
+		$search_date_endyear = '';
+		$search_date_endendday = '';
+		$search_date_endendmonth = '';
+		$search_date_endendyear = '';
+		$search_date_end = '';
+		$search_date_endend = '';
 		$toselect = '';
 		$search_array_options = array();
 	}
@@ -277,9 +299,19 @@ if (!empty($search_ref)) {
 	$sql .= natural_search('d.ref', $search_ref);
 }
 // Date Start
-$sql .= dolSqlDateFilter("d.date_debut", $day_start, $month_start, $year_start);
+if ($search_date_start) {
+	$sql .= " AND d.date_debut >= '".$db->idate($search_date_start)."'";
+}
+if ($search_date_startend) {
+	$sql .= " AND d.date_debut <= '".$db->idate($search_date_startend)."'";
+}
 // Date End
-$sql .= dolSqlDateFilter("d.date_fin", $day_end, $month_end, $year_end);
+if ($search_date_end) {
+	$sql .= " AND d.date_fin >= '".$db->idate($search_date_end)."'";
+}
+if ($search_date_endend) {
+	$sql .= " AND d.date_fin <= '".$db->idate($search_date_endend)."'";
+}
 
 if ($search_amount_ht != '') {
 	$sql .= natural_search('d.total_ht', $search_amount_ht, 1);
@@ -342,6 +374,44 @@ if ($resql) {
 	if ($search_ref) {
 		$param .= "&search_ref=".urlencode($search_ref);
 	}
+	// Start date
+	if ($search_date_startday) {
+		$param .= '&search_date_startday='.urlencode($search_date_startday);
+	}
+	if ($search_date_startmonth) {
+		$param .= '&search_date_startmonth='.urlencode($search_date_startmonth);
+	}
+	if ($search_date_startyear) {
+		$param .= '&search_date_startyear='.urlencode($search_date_startyear);
+	}
+	if ($search_date_startendday) {
+		$param .= '&search_date_startendday='.urlencode($search_date_startendday);
+	}
+	if ($search_date_startendmonth) {
+		$param .= '&search_date_startendmonth='.urlencode($search_date_startendmonth);
+	}
+	if ($search_date_startendyear) {
+		$param .= '&search_date_startendyear='.urlencode($search_date_startendyear);
+	}
+	// End date
+	if ($search_date_endday) {
+		$param .= '&search_date_endday='.urlencode($search_date_endday);
+	}
+	if ($search_date_endmonth) {
+		$param .= '&search_date_endmonth='.urlencode($search_date_endmonth);
+	}
+	if ($search_date_endyear) {
+		$param .= '&search_date_endyear='.urlencode($search_date_endyear);
+	}
+	if ($search_date_endendday) {
+		$param .= '&search_date_endendday='.urlencode($search_date_endendday);
+	}
+	if ($search_date_endendmonth) {
+		$param .= '&search_date_endendmonth='.urlencode($search_date_endendmonth);
+	}
+	if ($search_date_endendyear) {
+		$param .= '&search_date_endendyear='.urlencode($search_date_endendyear);
+	}
 	if ($search_user) {
 		$param .= "&search_user=".urlencode($search_user);
 	}
@@ -489,22 +559,23 @@ if ($resql) {
 	// Date start
 	if (!empty($arrayfields['d.date_debut']['checked'])) {
 		print '<td class="liste_titre" align="center">';
-		if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
-			print '<input class="flat width25" type="text" maxlength="2" name="day_start" value="'.dol_escape_htmltag($day_start).'">';
-		}
-
-		print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="month_start" value="'.$month_start.'">';
-		$formother->select_year($year_start, 'year_start', 1, $min_year, $max_year);
+		print '<div class="nowrap">';
+		print $form->selectDate($search_date_start ? $search_date_start : -1, 'search_date_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+		print '</div>';
+		print '<div class="nowrap">';
+		print $form->selectDate($search_date_startend ? $search_date_startend : -1, 'search_date_startend', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
+		print '</div>';
 		print '</td>';
 	}
 	// Date end
 	if (!empty($arrayfields['d.date_fin']['checked'])) {
 		print '<td class="liste_titre" align="center">';
-		if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
-			print '<input class="flat width25" type="text" maxlength="2" name="day_end" value="'.dol_escape_htmltag($day_end).'">';
-		}
-		print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="month_end" value="'.$month_end.'">';
-		$formother->select_year($year_end, 'year_end', 1, $min_year, $max_year);
+		print '<div class="nowrap">';
+		print $form->selectDate($search_date_end ? $search_date_end : -1, 'search_date_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+		print '</div>';
+		print '<div class="nowrap">';
+		print $form->selectDate($search_date_endend ? $search_date_endend : -1, 'search_date_endend', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
+		print '</div>';
 		print '</td>';
 	}
 	// Date valid

From c1757bdbd8b0476274ba452e774857fb51a8c754 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sun, 6 Jun 2021 06:28:38 +0200
Subject: [PATCH 0427/1497] Remove warning

---
 htdocs/compta/paiement/list.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php
index b6835765c00..ee847603954 100644
--- a/htdocs/compta/paiement/list.php
+++ b/htdocs/compta/paiement/list.php
@@ -71,6 +71,7 @@ $search_paymenttype = GETPOST("search_paymenttype");
 $search_account = GETPOST("search_account", "int");
 $search_payment_num = GETPOST('search_payment_num', 'alpha');
 $search_amount = GETPOST("search_amount", 'alpha'); // alpha because we must be able to search on "< x"
+$search_status = GETPOST('search_status', 'intcomma');
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield			= GETPOST("sortfield", 'alpha');
@@ -142,11 +143,13 @@ if (empty($reshook)) {
 		$search_date_endmonth = '';
 		$search_date_endyear = '';
 		$search_date_start = '';
+		$search_date_end = '';
 		$search_account = '';
 		$search_amount = '';
 		$search_paymenttype = '';
 		$search_payment_num = '';
 		$search_company = '';
+		$search_status = '';
 		$option = '';
 		$toselect = '';
 		$search_array_options = array();
@@ -348,10 +351,12 @@ if ($search_all) {
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+$massactionbutton = '';
 if ($massactionbutton) {
 	$selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
 }
 
+$moreforfilter = '';
 print '<div class="div-table-responsive">';
 print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : '').'">';
 

From 678f24f2b3f33079c0757ac674880e10e141832d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sun, 6 Jun 2021 09:57:59 +0200
Subject: [PATCH 0428/1497] try to fix search

---
 dev/examples/zapier/searches/thirdparty.js | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/dev/examples/zapier/searches/thirdparty.js b/dev/examples/zapier/searches/thirdparty.js
index 8f72b9270e5..009780ea7fb 100644
--- a/dev/examples/zapier/searches/thirdparty.js
+++ b/dev/examples/zapier/searches/thirdparty.js
@@ -22,7 +22,7 @@ module.exports = {
             }
         ],
 
-        perform: (z, bundle) => {
+        perform: async (z, bundle) => {
             const url = bundle.authData.url  + '/api/index.php/thirdparties/';
 
             // Put the search value in a query param. The details of how to build
@@ -32,8 +32,18 @@ module.exports = {
                     sqlfilters: "t.nom like \'%"+bundle.inputData.name+"%\'"
                 }
             };
-
-            return z.request(url, options).then(response => JSON.parse(response.content));
+            const response = await z.request({
+                url: url,
+                skipThrowForStatus: true,
+                params: {
+                    sqlfilters: "t.nom like \'%"+bundle.inputData.name+"%\'"
+                }
+            });
+            //z.console.log(response);
+            if (response.status != 200) {
+                return [];
+            }
+            return response.json;
         },
 
         // In cases where Zapier needs to show an example record to the user, but we are unable to get a live example

From 3c51eac66ff9ffaab68fb1a91e15ae966831c514 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sun, 6 Jun 2021 10:07:01 +0200
Subject: [PATCH 0429/1497] try to fix search

---
 dev/examples/zapier/searches/thirdparty.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev/examples/zapier/searches/thirdparty.js b/dev/examples/zapier/searches/thirdparty.js
index 009780ea7fb..93c32975992 100644
--- a/dev/examples/zapier/searches/thirdparty.js
+++ b/dev/examples/zapier/searches/thirdparty.js
@@ -34,6 +34,7 @@ module.exports = {
             };
             const response = await z.request({
                 url: url,
+                // this parameter avoid throwing errors and let us manage them
                 skipThrowForStatus: true,
                 params: {
                     sqlfilters: "t.nom like \'%"+bundle.inputData.name+"%\'"

From efb5ec2901e577705022be02d16d8d35228d6f3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sun, 6 Jun 2021 10:32:04 +0200
Subject: [PATCH 0430/1497] search by name or email

---
 dev/examples/zapier/searches/thirdparty.js | 18 +++++++++++++++++-
 htdocs/core/lib/functions2.lib.php         |  2 +-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/dev/examples/zapier/searches/thirdparty.js b/dev/examples/zapier/searches/thirdparty.js
index 93c32975992..2a6d2c6e207 100644
--- a/dev/examples/zapier/searches/thirdparty.js
+++ b/dev/examples/zapier/searches/thirdparty.js
@@ -19,6 +19,12 @@ module.exports = {
                 type: 'string',
                 label: 'Name',
                 helpText: 'Name to limit to the search to (i.e. The company or %company%).'
+            },
+            {
+                key: 'email',
+                type: 'string',
+                label: 'Email',
+                helpText: 'Email to limit to the search to.'
             }
         ],
 
@@ -32,12 +38,22 @@ module.exports = {
                     sqlfilters: "t.nom like \'%"+bundle.inputData.name+"%\'"
                 }
             };
+            let filter = '';
+            if (bundle.inputData.name) {
+                filter = "t.nom like \'%"+bundle.inputData.name+"%\'";
+            }
+            if (bundle.inputData.email) {
+                if (bundle.inputData.name) {
+                    filter += " and ";
+                }
+                filter += "t.email like \'"+bundle.inputData.email+"\'";
+            }
             const response = await z.request({
                 url: url,
                 // this parameter avoid throwing errors and let us manage them
                 skipThrowForStatus: true,
                 params: {
-                    sqlfilters: "t.nom like \'%"+bundle.inputData.name+"%\'"
+                    sqlfilters: filter
                 }
             });
             //z.console.log(response);
diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index e279ced2a3d..d963763d788 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -1043,7 +1043,7 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
 	$regType = array();
 	if (preg_match('/\{(t+)\}/i', $mask, $regType)) {
 		$masktype = $regType[1];
-		$masktype_value = substr(preg_replace('/^TE_/', '', $objsoc->typent_code), 0, dol_strlen($regType[1])); // get n first characters of thirdpaty typent_code (where n is length in mask)
+		$masktype_value = substr(preg_replace('/^TE_/', '', $objsoc->typent_code), 0, dol_strlen($regType[1])); // get n first characters of thirdparty typent_code (where n is length in mask)
 		$masktype_value = str_pad($masktype_value, dol_strlen($regType[1]), "#", STR_PAD_RIGHT); // we fill on right with # to have same number of char than into mask
 	} else {
 		$masktype = '';

From 6348b777e132cbddea422d15d7ec72c694916c50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sun, 6 Jun 2021 12:12:12 +0200
Subject: [PATCH 0431/1497] add contact search

---
 dev/examples/zapier/index.js               |  2 +
 dev/examples/zapier/searches/contact.js    | 95 ++++++++++++++++++++++
 dev/examples/zapier/searches/thirdparty.js |  5 --
 3 files changed, 97 insertions(+), 5 deletions(-)
 create mode 100644 dev/examples/zapier/searches/contact.js

diff --git a/dev/examples/zapier/index.js b/dev/examples/zapier/index.js
index 94046969045..044415a7ddd 100644
--- a/dev/examples/zapier/index.js
+++ b/dev/examples/zapier/index.js
@@ -7,6 +7,7 @@ const triggerTicket = require('./triggers/ticket');
 const triggerUser = require('./triggers/user');
 
 const searchThirdparty = require('./searches/thirdparty');
+const searchContact = require('./searches/contact');
 
 const createThirdparty = require('./creates/thirdparty');
 const createContact = require('./creates/contact');
@@ -73,6 +74,7 @@ const App = {
     // If you want your searches to show up, you better include it here!
     searches: {
         [searchThirdparty.key]: searchThirdparty,
+        [searchContact.key]: searchContact,
     },
 
     // If you want your creates to show up, you better include it here!
diff --git a/dev/examples/zapier/searches/contact.js b/dev/examples/zapier/searches/contact.js
new file mode 100644
index 00000000000..b52b8d3e367
--- /dev/null
+++ b/dev/examples/zapier/searches/contact.js
@@ -0,0 +1,95 @@
+module.exports = {
+    key: 'contact',
+
+    // You'll want to provide some helpful display labels and descriptions
+    // for users. Zapier will put them into the UX.
+    noun: 'Contact',
+    display: {
+        label: 'Find a Contact',
+        description: 'Search for contact.'
+    },
+
+    // `operation` is where we make the call to your API to do the search
+    operation: {
+        // This search only has one search field. Your searches might have just one, or many
+        // search fields.
+        inputFields: [
+            {
+                key: 'lastname',
+                type: 'string',
+                label: 'Lastname',
+                helpText: 'Lastname to limit to the search to (i.e. The company or %company%).'
+            },
+            {
+                key: 'email',
+                type: 'string',
+                label: 'Email',
+                helpText: 'Email to limit to the search to.'
+            }
+        ],
+
+        perform: async (z, bundle) => {
+            const url = bundle.authData.url  + '/api/index.php/contacts/';
+
+            // Put the search value in a query param. The details of how to build
+            // a search URL will depend on how your API works.
+            let filter = '';
+            if (bundle.inputData.lastname) {
+                filter = "t.lastname like \'%"+bundle.inputData.name+"%\'";
+            }
+            if (bundle.inputData.email) {
+                if (bundle.inputData.lastname) {
+                    filter += " and ";
+                }
+                filter += "t.email like \'"+bundle.inputData.email+"\'";
+            }
+            const response = await z.request({
+                url: url,
+                // this parameter avoid throwing errors and let us manage them
+                skipThrowForStatus: true,
+                params: {
+                    sqlfilters: filter
+                }
+            });
+            //z.console.log(response);
+            if (response.status != 200) {
+                return [];
+            }
+            return response.json;
+        },
+
+        // In cases where Zapier needs to show an example record to the user, but we are unable to get a live example
+        // from the API, Zapier will fallback to this hard-coded sample. It should reflect the data structure of
+        // returned records, and have obviously dummy values that we can show to any user.
+        sample: {
+            id: 1,
+            createdAt: 1472069465,
+            name: 'DOE',
+            firstname: 'John',
+            authorId: 1,
+            directions: '1. Boil Noodles\n2.Serve with sauce',
+            style: 'italian'
+        },
+
+        // If the resource can have fields that are custom on a per-user basis, define a function to fetch the custom
+        // field definitions. The result will be used to augment the sample.
+        // outputFields: () => { return []; }
+        // Alternatively, a static field definition should be provided, to specify labels for the fields
+        outputFields: [
+            {
+                key: 'id',
+                type: "integer",
+                label: 'ID'
+            },
+            {key: 'createdAt', type: "integer", label: 'Created At'},
+            {key: 'name', label: 'Name'},
+            {key: 'firstname', label: 'Firstname'},
+            {key: 'directions', label: 'Directions'},
+            {key: 'authorId', type: "integer", label: 'Author ID'},
+            {
+                key: 'style',
+                label: 'Style'
+            }
+        ]
+    }
+};
diff --git a/dev/examples/zapier/searches/thirdparty.js b/dev/examples/zapier/searches/thirdparty.js
index 2a6d2c6e207..e1e6878f5b3 100644
--- a/dev/examples/zapier/searches/thirdparty.js
+++ b/dev/examples/zapier/searches/thirdparty.js
@@ -33,11 +33,6 @@ module.exports = {
 
             // Put the search value in a query param. The details of how to build
             // a search URL will depend on how your API works.
-            const options = {
-                params: {
-                    sqlfilters: "t.nom like \'%"+bundle.inputData.name+"%\'"
-                }
-            };
             let filter = '';
             if (bundle.inputData.name) {
                 filter = "t.nom like \'%"+bundle.inputData.name+"%\'";

From 1aca7efce3d739b079ed8fa0249830fe841b76d3 Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Sun, 6 Jun 2021 13:15:03 +0200
Subject: [PATCH 0432/1497] Fix childtablesoncascade doc

---
 htdocs/core/class/commonobject.class.php | 2 +-
 htdocs/societe/class/societe.class.php   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index f2c61bc86a3..1d0509d7483 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -440,7 +440,7 @@ abstract class CommonObject
 
 	/**
 	 * @var array    List of child tables. To know object to delete on cascade.
-	 *               if name like with @ClassNAme:FilePathClass;ParentFkFieldName' it will
+	 *               if name like with @ClassNAme:FilePathClass:ParentFkFieldName' it will
 	 *               call method deleteByParentField(parentId,ParentFkFieldName) to fetch and delete child object
 	 */
 	protected $childtablesoncascade = array();
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index f10cead50fd..9687485eb10 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -84,7 +84,7 @@ class Societe extends CommonObject
 
 	/**
 	 * @var array    List of child tables. To know object to delete on cascade.
-	 *               if name like with @ClassNAme:FilePathClass;ParentFkFieldName' it will call method deleteByParentField (with parentId as parameters) and FieldName to fetch and delete child object
+	 *               if name like with @ClassNAme:FilePathClass:ParentFkFieldName' it will call method deleteByParentField (with parentId as parameters) and FieldName to fetch and delete child object
 	 */
 	protected $childtablesoncascade = array(
 		"societe_prices",

From a1bb7129dab6ebb2f457ed32efa0025354bebb36 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 6 Jun 2021 15:29:49 +0200
Subject: [PATCH 0433/1497] Debug v14

---
 htdocs/adherents/partnership.php             | 10 ++++---
 htdocs/core/lib/member.lib.php               | 30 ++++++++++++++++++--
 htdocs/core/modules/modPartnership.class.php |  4 +--
 htdocs/cron/list.php                         |  3 +-
 htdocs/langs/en_US/partnership.lang          |  3 ++
 htdocs/partnership/admin/setup.php           |  5 ++--
 6 files changed, 40 insertions(+), 15 deletions(-)

diff --git a/htdocs/adherents/partnership.php b/htdocs/adherents/partnership.php
index 28b041240a3..3dab1f86064 100644
--- a/htdocs/adherents/partnership.php
+++ b/htdocs/adherents/partnership.php
@@ -449,6 +449,9 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	print $formconfirm;
 
 
+	// TODO Replace this card into a list of all partnerships.
+
+
 	// Object card
 	// ------------------------------------------------------------
 	$linkback = '<a href="'.dol_buildpath('/partnership/partnership_list.php', 1).'?restore_lastsearch_values=1'.(!empty($memberid) ? '&rowid='.$memberid : '').'">'.$langs->trans("BackToList").'</a>';
@@ -498,6 +501,9 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	print dol_get_fiche_end();
 
+
+
+
 	// Buttons for actions
 
 	if ($action != 'presend') {
@@ -509,10 +515,6 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		}
 
 		if (empty($reshook)) {
-			if ($object->status == $object::STATUS_DRAFT) {
-				print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER["PHP_SELF"].'?rowid='.$memberid.'&action=edit&token='.newToken(), '', $permissiontoadd);
-			}
-
 			// Show
 			if ($permissiontoadd) {
 				print dolGetButtonAction($langs->trans('ManagePartnership'), '', 'default', dol_buildpath('/partnership/partnership_card.php', 1).'?id='.$object->id, '', $permissiontoadd);
diff --git a/htdocs/core/lib/member.lib.php b/htdocs/core/lib/member.lib.php
index 484f34c265c..fc274e0d624 100644
--- a/htdocs/core/lib/member.lib.php
+++ b/htdocs/core/lib/member.lib.php
@@ -63,6 +63,33 @@ function member_prepare_head(Adherent $object)
 		$h++;
 	}
 
+	$tabtoadd = (!empty(getDolGlobalString('PARTNERSHIP_IS_MANAGED_FOR')) && getDolGlobalString('PARTNERSHIP_IS_MANAGED_FOR') == 'member') ? 'member' : 'thirdparty';
+
+	if ($tabtoadd == 'member') {
+		if (!empty($user->rights->partnership->read)) {
+			$nbPartnership = is_array($object->partnerships) ? count($object->partnerships) : 0;
+			$head[$h][0] = DOL_URL_ROOT.'/adherents/partnership.php?rowid='.$object->id;
+			$head[$h][1] = $langs->trans("Partnership");
+			$head[$h][2] = 'partnership';
+			if ($nbPartnership > 0) {
+				$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbPartnership.'</span>';
+			}
+			$h++;
+		}
+	} else {
+		if (!empty($user->rights->partnership->read)) {
+			$nbPartnership = is_array($object->partnerships) ? count($object->partnerships) : 0;
+			$head[$h][0] = DOL_URL_ROOT.'/societe/partnership.php?socid='.$object->id;
+			$head[$h][1] = $langs->trans("Partnership");
+			$head[$h][2] = 'partnership';
+			if ($nbPartnership > 0) {
+				$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbPartnership.'</span>';
+			}
+			$h++;
+		}
+	}
+
+
 	// Show more tabs from modules
 	// Entries must be declared in modules descriptor with line
 	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
@@ -70,9 +97,6 @@ function member_prepare_head(Adherent $object)
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'member');
 
 	$nbNote = 0;
-	if (!empty($object->note)) {
-		$nbNote++;
-	}
 	if (!empty($object->note_private)) {
 		$nbNote++;
 	}
diff --git a/htdocs/core/modules/modPartnership.class.php b/htdocs/core/modules/modPartnership.class.php
index d12cd610238..889f18cde73 100644
--- a/htdocs/core/modules/modPartnership.class.php
+++ b/htdocs/core/modules/modPartnership.class.php
@@ -180,10 +180,8 @@ class modPartnership extends DolibarrModules
 		$tabtoadd = (!empty(getDolGlobalString('PARTNERSHIP_IS_MANAGED_FOR')) && getDolGlobalString('PARTNERSHIP_IS_MANAGED_FOR') == 'member') ? 'member' : 'thirdparty';
 
 		if ($tabtoadd == 'member') {
-			$this->tabs[] = array('data'=>'member:+partnership:Partnership:partnership@partnership:$user->rights->partnership->read:/adherents/partnership.php?rowid=__ID__');
 			$fk_mainmenu = "members";
 		} else {
-			$this->tabs[] = array('data'=>'thirdparty:+partnership:Partnership:partnership@partnership:$user->rights->partnership->read:/societe/partnership.php?socid=__ID__');
 			$fk_mainmenu = "companies";
 		}
 
@@ -258,7 +256,7 @@ class modPartnership extends DolibarrModules
 
 		$this->cronjobs = array(
 			0	=> array('priority'=>60, 'label'=>'CancelPartnershipForExpiredMembers', 'jobtype'=>'method', 'class'=>'/partnership/class/partnershiputils.class.php', 'objectname'=>'PartnershipUtils', 'method'=>'doCancelStatusOfMemberPartnership', 'parameters'=>'',      'comment'=>'Cancel status of partnership when subscription is expired + x days.', 'frequency'=>1, 'unitfrequency'=>86400, 'status'=>1, 'test'=>'$conf->partnership->enabled', 'datestart'=>$datestart),
-			1	=> array('priority'=>61, 'label'=>'CheckDolibarrBacklink', 'jobtype'=>'method', 'class'=>'/partnership/class/partnershiputils.class.php', 'objectname'=>'PartnershipUtils', 'method'=>'doWarningOfPartnershipIfDolibarrBacklinkNotfound', 'parameters'=>'',      'comment'=>'Warning of partnership if Dolibarr backlink not found on partner website.', 'frequency'=>1, 'unitfrequency'=>86400, 'status'=>0, 'test'=>'$conf->partnership->enabled', 'datestart'=>$datestart),
+			1	=> array('priority'=>61, 'label'=>'PartnershipCheckBacklink', 'jobtype'=>'method', 'class'=>'/partnership/class/partnershiputils.class.php', 'objectname'=>'PartnershipUtils', 'method'=>'doWarningOfPartnershipIfDolibarrBacklinkNotfound', 'parameters'=>'',      'comment'=>'Warning of partnership if Dolibarr backlink not found on partner website.', 'frequency'=>1, 'unitfrequency'=>86400, 'status'=>0, 'test'=>'$conf->partnership->enabled', 'datestart'=>$datestart),
 		);
 
 		// Permissions provided by this module
diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index 80371b14889..4d829258b2b 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2012      Nicolas Villa aka Boyquotes http://informetic.fr
  * Copyright (C) 2013      Florian Henry       <florian.henry@open-concept.pro>
- * Copyright (C) 2013-2019 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2013-2021 Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2019      Frédéric France     <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -24,7 +24,6 @@
  *  \brief      Lists Jobs
  */
 
-
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/cron/class/cronjob.class.php';
diff --git a/htdocs/langs/en_US/partnership.lang b/htdocs/langs/en_US/partnership.lang
index 6d0c7dc0ac9..04fe88b3442 100644
--- a/htdocs/langs/en_US/partnership.lang
+++ b/htdocs/langs/en_US/partnership.lang
@@ -20,6 +20,9 @@ ModulePartnershipName=Partnership management
 PartnershipDescription=Module Partnership management
 PartnershipDescriptionLong= Module Partnership management
 
+CancelPartnershipForExpiredMembers=Partnership: Cancel partnership of members with expired subscriptions
+PartnershipCheckBacklink=Partnership: Check referring backlink
+
 #
 # Menu
 #
diff --git a/htdocs/partnership/admin/setup.php b/htdocs/partnership/admin/setup.php
index 79c8c469eec..7fa0ef62b5e 100644
--- a/htdocs/partnership/admin/setup.php
+++ b/htdocs/partnership/admin/setup.php
@@ -193,11 +193,10 @@ print '</tr>';
 
 print '<tr class="oddeven"><td>'.$langs->trans("PARTNERSHIP_BACKLINKS_TO_CHECK").'</td>';
 print '<td>';
-$dbacklinks = 'dolibarr.org|dolibarr.fr|dolibarr.es';
-$backlinks 	= (!empty($conf->global->PARTNERSHIP_BACKLINKS_TO_CHECK)) ? $conf->global->PARTNERSHIP_BACKLINKS_TO_CHECK : $dbacklinks;
+$backlinks 	= (empty($conf->global->PARTNERSHIP_BACKLINKS_TO_CHECK) ? '' : $conf->global->PARTNERSHIP_BACKLINKS_TO_CHECK);
 print '<input class="minwidth400" type="text" name="PARTNERSHIP_BACKLINKS_TO_CHECK" value="'.$backlinks.'">';
 print '</td>';
-print '<td><span class="opacitymedium">'.$dbacklinks.'</span></td>';
+print '<td><span class="opacitymedium">dolibarr.org|dolibarr.fr|dolibarr.es</span></td>';
 print '</tr>';
 
 print '</table>';

From 9f177a0c63c07269497f3894e68db37441f3787f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 6 Jun 2021 16:36:41 +0200
Subject: [PATCH 0434/1497] Debug v14

---
 htdocs/adherents/partnership.php              | 388 ++++--------------
 htdocs/admin/dict.php                         |   4 +-
 htdocs/core/modules/modPartnership.class.php  |  21 +-
 .../install/mysql/migration/13.0.0-14.0.0.sql |  14 +-
 .../mysql/tables/llx_c_partnership_type.sql   |  35 ++
 htdocs/langs/en_US/partnership.lang           |   2 +
 .../partnership/class/partnership.class.php   |  27 +-
 htdocs/partnership/partnership_card.php       |  51 +--
 htdocs/societe/partnership.php                | 346 +++-------------
 9 files changed, 200 insertions(+), 688 deletions(-)
 create mode 100644 htdocs/install/mysql/tables/llx_c_partnership_type.sql

diff --git a/htdocs/adherents/partnership.php b/htdocs/adherents/partnership.php
index 3dab1f86064..cf0e11d70e0 100644
--- a/htdocs/adherents/partnership.php
+++ b/htdocs/adherents/partnership.php
@@ -57,8 +57,7 @@ require_once DOL_DOCUMENT_ROOT.'/partnership/lib/partnership.lib.php';
 $langs->loadLangs(array("companies","members","partnership", "other"));
 
 // Get parameters
-$id = GETPOST('id', 'int');
-$memberid = GETPOST('rowid', 'int');
+$id = GETPOST('rowid', 'int') ? GETPOST('rowid', 'int') : GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
@@ -68,9 +67,9 @@ $backtopage = GETPOST('backtopage', 'alpha');
 $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
 //$lineid   = GETPOST('lineid', 'int');
 
-$member = new Adherent($db);
-if ($memberid > 0) {
-	$member->fetch($memberid);
+$object = new Adherent($db);
+if ($id > 0) {
+	$object->fetch($id);
 }
 
 // Initialize technical objects
@@ -112,19 +111,13 @@ if (empty($conf->partnership->enabled)) accessforbidden();
 if (empty($permissiontoread)) accessforbidden();
 if ($action == 'edit' && empty($permissiontoadd)) accessforbidden();
 
-$partnershipid = $object->fetch(0, "", $memberid);
-if (empty($action) && empty($partnershipid)) {
-	$action = 'create';
-}
-if (($action == 'update' || $action == 'edit') && $object->status != $object::STATUS_DRAFT) accessforbidden();
-
-if (empty($memberid) && $object) {
-	$memberid = $object->fk_member;
+if (($action == 'update' || $action == 'edit') && $object->status != $object::STATUS_DRAFT) {
+	accessforbidden();
 }
 
 
 // Security check
-$result = restrictedArea($user, 'adherent', $memberid, '', '', 'socid', 'rowid', 0);
+$result = restrictedArea($user, 'adherent', $id, '', '', 'socid', 'rowid', 0);
 
 
 /*
@@ -143,102 +136,7 @@ $date_end = dol_mktime(0, 0, 0, GETPOST('date_partnership_endmonth', 'int'), GET
 if (empty($reshook)) {
 	$error = 0;
 
-	$backtopage = dol_buildpath('/partnership/partnership.php', 1).'?rowid='.($memberid > 0 ? $memberid : '__ID__');
-
-	$triggermodname = 'PARTNERSHIP_MODIFY'; // Name of trigger action code to execute when we modify record
-
-	if ($action == 'add' && $permissiontoread) {
-		$error = 0;
-
-		$db->begin();
-
-		$now = dol_now();
-
-		if (!$error) {
-			$old_start_date = $object->date_partnership_start;
-
-			$object->fk_member           		= $memberid;
-			$object->date_partnership_start   	= (!GETPOST('date_partnership_start')) ? '' : $date_start;
-			$object->date_partnership_end     	= (!GETPOST('date_partnership_end')) ? '' : $date_end;
-			$object->note_public     			= GETPOST('note_public', 'restricthtml');
-			$object->date_creation 				= $now;
-			$object->fk_user_creat 				= $user->id;
-			$object->entity 					= $conf->entity;
-
-			// Fill array 'array_options' with data from add form
-			$ret = $extrafields->setOptionalsFromPost(null, $object);
-			if ($ret < 0) {
-				$error++;
-			}
-		}
-
-		if (!$error) {
-			$result = $object->create($user);
-			if ($result < 0) {
-				$error++;
-				if ($result == -4) {
-					setEventMessages($langs->trans("ErrorRefAlreadyExists"), null, 'errors');
-				} else {
-					setEventMessages($object->error, $object->errors, 'errors');
-				}
-			}
-		}
-
-		if ($error) {
-			$db->rollback();
-			$action = 'create';
-		} else {
-			$db->commit();
-		}
-	} elseif ($action == 'update' && $permissiontoread) {
-		$error = 0;
-
-		$db->begin();
-
-		$now = dol_now();
-
-		if (!$error) {
-			$object->oldcopy = clone $object;
-
-			$old_start_date = $object->date_partnership_start;
-
-			$object->date_partnership_start   	= (!GETPOST('date_partnership_start')) ? '' : $date_start;
-			$object->date_partnership_end     	= (!GETPOST('date_partnership_end')) ? '' : $date_end;
-			$object->note_public     			= GETPOST('note_public', 'restricthtml');
-			$object->fk_user_creat 				= $user->id;
-			$object->fk_user_modif 				= $user->id;
-
-			// Fill array 'array_options' with data from add form
-			$ret = $extrafields->setOptionalsFromPost(null, $object);
-			if ($ret < 0) {
-				$error++;
-			}
-		}
-
-		if (!$error) {
-			$result = $object->update($user);
-			if ($result < 0) {
-				$error++;
-				if ($result == -4) {
-					setEventMessages($langs->trans("ErrorRefAlreadyExists"), null, 'errors');
-				} else {
-					setEventMessages($object->error, $object->errors, 'errors');
-				}
-			}
-		}
-
-		if ($error) {
-			$db->rollback();
-			$action = 'edit';
-		} else {
-			$db->commit();
-		}
-	} elseif ($action == 'confirm_close' || $action == 'update_extras') {
-		include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php';
-
-		header("Location: ".$_SERVER['PHP_SELF']."?rowid=".$memberid);
-		exit;
-	}
+	$backtopage = dol_buildpath('/partnership/partnership.php', 1).'?rowid='.($id > 0 ? $id : '__ID__');
 
 	// Actions when linking object each other
 	include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';
@@ -261,11 +159,11 @@ llxHeader('', $title);
 
 $form = new Form($db);
 
-if ($memberid) {
+if ($id > 0) {
 	$langs->load("members");
 
-	$member = new Adherent($db);
-	$result = $member->fetch($memberid);
+	$object = new Adherent($db);
+	$result = $object->fetch($id);
 
 	if (!empty($conf->notification->enabled)) {
 		$langs->load("mails");
@@ -273,13 +171,13 @@ if ($memberid) {
 
 	$adht->fetch($object->typeid);
 
-	$head = member_prepare_head($member);
+	$head = member_prepare_head($object);
 
 	print dol_get_fiche_head($head, 'partnership', $langs->trans("ThirdParty"), -1, 'user');
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-	dol_banner_tab($member, 'rowid', $linkback);
+	dol_banner_tab($object, 'rowid', $linkback);
 
 	print '<div class="fichecenter">';
 
@@ -288,21 +186,21 @@ if ($memberid) {
 
 	// Login
 	if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
-		print '<tr><td class="titlefield">'.$langs->trans("Login").' / '.$langs->trans("Id").'</td><td class="valeur">'.$member->login.'&nbsp;</td></tr>';
+		print '<tr><td class="titlefield">'.$langs->trans("Login").' / '.$langs->trans("Id").'</td><td class="valeur">'.$object->login.'&nbsp;</td></tr>';
 	}
 
 	// Type
 	print '<tr><td class="titlefield">'.$langs->trans("Type").'</td><td class="valeur">'.$adht->getNomUrl(1)."</td></tr>\n";
 
 	// Morphy
-	print '<tr><td>'.$langs->trans("MemberNature").'</td><td class="valeur" >'.$member->getmorphylib().'</td>';
+	print '<tr><td>'.$langs->trans("MemberNature").'</td><td class="valeur" >'.$object->getmorphylib().'</td>';
 	print '</tr>';
 
 	// Company
-	print '<tr><td>'.$langs->trans("Company").'</td><td class="valeur">'.$member->company.'</td></tr>';
+	print '<tr><td>'.$langs->trans("Company").'</td><td class="valeur">'.$object->company.'</td></tr>';
 
 	// Civility
-	print '<tr><td>'.$langs->trans("UserTitle").'</td><td class="valeur">'.$member->getCivilityLabel().'&nbsp;</td>';
+	print '<tr><td>'.$langs->trans("UserTitle").'</td><td class="valeur">'.$object->getCivilityLabel().'&nbsp;</td>';
 	print '</tr>';
 
 	print '</table>';
@@ -310,200 +208,13 @@ if ($memberid) {
 	print '</div>';
 
 	print dol_get_fiche_end();
-
-	$params = '';
-
-	print '<br>';
 } else {
 	dol_print_error('', 'Parameter rowid not defined');
 }
 
-// Part to create
-if ($action == 'create') {
-	print load_fiche_titre($langs->trans("NewObject", $langs->transnoentitiesnoconv("Partnership")), '', '');
-
-	$backtopageforcancel = DOL_URL_ROOT.'/partnership/partnership.php?rowid='.$memberid;
-
-	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-	print '<input type="hidden" name="token" value="'.newToken().'">';
-	print '<input type="hidden" name="action" value="add">';
-	print '<input type="hidden" name="rowid" value="'.$memberid.'">';
-	print '<input type="hidden" name="fk_member" value="'.$memberid.'">';
-
-	if ($backtopage) {
-		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
-	}
-	if ($backtopageforcancel) {
-		print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
-	}
-
-	print dol_get_fiche_head(array(), '');
-
-	print '<table class="border centpercent tableforfieldcreate">'."\n";
-
-	// Common attributes
-	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_add.tpl.php';
-
-	// Other attributes
-	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
-
-	print '</table>'."\n";
-
-	print dol_get_fiche_end();
-
-	print '<div class="center">';
-	print '<input type="submit" class="button" name="add" value="'.dol_escape_htmltag($langs->trans("Validate")).'">';
-	print '&nbsp; ';
-	// print '<input type="'.($backtopage ? "submit" : "button").'" class="button button-cancel" 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>';
-}
-
-// Part to edit record
-if (($partnershipid || $ref) && $action == 'edit') {
-	print load_fiche_titre($langs->trans("Partnership"), '', '');
-
-	$backtopageforcancel = DOL_URL_ROOT.'/partnership/partnership.php?rowid='.$memberid;
-
-	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-	print '<input type="hidden" name="token" value="'.newToken().'">';
-	print '<input type="hidden" name="action" value="update">';
-	print '<input type="hidden" name="rowid" value="'.$memberid.'">';
-	print '<input type="hidden" name="fk_member" value="'.$memberid.'">';
-	if ($backtopage) {
-		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
-	}
-	if ($backtopageforcancel) {
-		print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
-	}
-
-	print dol_get_fiche_head();
-
-	print '<table class="border centpercent tableforfieldedit">'."\n";
-
-	// Common attributes
-	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_edit.tpl.php';
-
-	// Other attributes
-	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_edit.tpl.php';
-
-	print '</table>';
-
-	print dol_get_fiche_end();
-
-	print '<div class="center"><input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
-	print ' &nbsp; <input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
-	print '</div>';
-
-	print '</form>';
-}
 
 // Part to show record
 if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create'))) {
-	print load_fiche_titre($langs->trans("PartnershipDedicatedToThisMember", $langs->transnoentitiesnoconv("Partnership")), '', '');
-
-	$res = $object->fetch_optionals();
-
-	// $head = partnershipPrepareHead($object);
-	// print dol_get_fiche_head($head, 'card', $langs->trans("Partnership"), -1, $object->picto);
-
-	$linkback = '';
-	dol_banner_tab($object, 'id', $linkback, 0, 'rowid', 'ref');
-
-	$formconfirm = '';
-
-	// Close confirmation
-	if ($action == 'close') {
-		// Create an array for form
-		$formquestion = array();
-		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClose'), $langs->trans('ConfirmClosePartnershipAsk', $object->ref), 'confirm_close', $formquestion, 'yes', 1);
-	}
-	// Reopon confirmation
-	if ($action == 'reopen') {
-		// Create an array for form
-		$formquestion = array();
-		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToReopon'), $langs->trans('ConfirmReoponAsk', $object->ref), 'confirm_reopen', $formquestion, 'yes', 1);
-	}
-
-	// Refuse confirmatio
-	if ($action == 'refuse') {
-		//Form to close proposal (signed or not)
-		$formquestion = array(
-			array('type' => 'text', 'name' => 'reason_decline_or_cancel', 'label' => $langs->trans("Note"), 'morecss' => 'reason_decline_or_cancel', 'value' => '')				// Field to complete private note (not replace)
-		);
-
-		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ReasonDecline'), $text, 'confirm_refuse', $formquestion, '', 1, 250);
-	}
-
-	// Call Hook formConfirm
-	$parameters = array('formConfirm' => $formconfirm, 'lineid' => $lineid);
-	$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-	if (empty($reshook)) {
-		$formconfirm .= $hookmanager->resPrint;
-	} elseif ($reshook > 0) {
-		$formconfirm = $hookmanager->resPrint;
-	}
-
-	// Print form confirm
-	print $formconfirm;
-
-
-	// TODO Replace this card into a list of all partnerships.
-
-
-	// Object card
-	// ------------------------------------------------------------
-	$linkback = '<a href="'.dol_buildpath('/partnership/partnership_list.php', 1).'?restore_lastsearch_values=1'.(!empty($memberid) ? '&rowid='.$memberid : '').'">'.$langs->trans("BackToList").'</a>';
-
-	print '<div class="fichecenter">';
-	print '<div class="fichehalfleft">';
-	print '<div class="underbanner clearboth"></div>';
-	print '<table class="border centpercent tableforfield">'."\n";
-
-	// Common attributes
-	//$keyforbreak='fieldkeytoswitchonsecondcolumn';	// We change column just before this field
-	//unset($object->fields['fk_project']);				// Hide field already shown in banner
-	//unset($object->fields['fk_member']);					// Hide field already shown in banner
-	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';
-
-	// End of subscription date
-	$fadherent = new Adherent($db);
-	$fadherent->fetch($object->fk_member);
-	print '<tr><td>'.$langs->trans("SubscriptionEndDate").'</td><td class="valeur">';
-	if ($fadherent->datefin) {
-		print dol_print_date($fadherent->datefin, 'day');
-		if ($fadherent->hasDelay()) {
-			print " ".img_warning($langs->trans("Late"));
-		}
-	} else {
-		if (!$adht->subscription) {
-			print $langs->trans("SubscriptionNotRecorded");
-			if ($fadherent->statut > 0) {
-				print " ".img_warning($langs->trans("Late")); // Display a delay picto only if it is not a draft and is not canceled
-			}
-		} else {
-			print $langs->trans("SubscriptionNotReceived");
-			if ($fadherent->statut > 0) {
-				print " ".img_warning($langs->trans("Late")); // Display a delay picto only if it is not a draft and is not canceled
-			}
-		}
-	}
-	print '</td></tr>';
-
-	// Other attributes. Fields from hook formObjectOptions and Extrafields.
-	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
-
-	print '</table>';
-	print '</div>';
-
-	print '<div class="clearboth"></div>';
-
-	print dol_get_fiche_end();
-
-
-
-
 	// Buttons for actions
 
 	if ($action != 'presend') {
@@ -517,20 +228,65 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		if (empty($reshook)) {
 			// Show
 			if ($permissiontoadd) {
-				print dolGetButtonAction($langs->trans('ManagePartnership'), '', 'default', dol_buildpath('/partnership/partnership_card.php', 1).'?id='.$object->id, '', $permissiontoadd);
+				print dolGetButtonAction($langs->trans('AddPartnership'), '', 'default', DOL_URL_ROOT.'/partnership/partnership_card.php?action=create&fk_member='.$object->id.'&backtopage='.urlencode(DOL_URL_ROOT.'/adherents/partnership.php?id='.$object->id), '', $permissiontoadd);
 			}
-
-			// Cancel
-			/*
-			if ($permissiontoadd) {
-				if ($object->status == $object::STATUS_ACCEPTED) {
-					print dolGetButtonAction($langs->trans('Cancel'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=close&token='.newToken(), '', $permissiontoadd);
-				}
-			}
-			*/
 		}
 		print '</div>'."\n";
 	}
+
+
+	//$morehtmlright = 'partnership/partnership_card.php?action=create&backtopage=%2Fdolibarr%2Fhtdocs%2Fpartnership%2Fpartnership_list.php';
+	$morehtmlright = '';
+
+	print load_fiche_titre($langs->trans("PartnershipDedicatedToThisMember", $langs->transnoentitiesnoconv("Partnership")), $morehtmlright, '');
+
+	$memberid = $object->id;
+
+
+	// TODO Replace this card with the list of all partnerships.
+
+	$object = new Partnership($db);
+	$partnershipid = $object->fetch(0, "", $memberid);
+
+	if ($partnershipid > 0) {
+		print '<div class="fichecenter">';
+		print '<div class="fichehalfleft">';
+		print '<div class="underbanner clearboth"></div>';
+		print '<table class="border centpercent tableforfield">'."\n";
+
+		// Common attributes
+		//$keyforbreak='fieldkeytoswitchonsecondcolumn';	// We change column just before this field
+		//unset($object->fields['fk_project']);				// Hide field already shown in banner
+		//unset($object->fields['fk_member']);					// Hide field already shown in banner
+		include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';
+
+		// End of subscription date
+		$fadherent = new Adherent($db);
+		$fadherent->fetch($object->fk_member);
+		print '<tr><td>'.$langs->trans("SubscriptionEndDate").'</td><td class="valeur">';
+		if ($fadherent->datefin) {
+			print dol_print_date($fadherent->datefin, 'day');
+			if ($fadherent->hasDelay()) {
+				print " ".img_warning($langs->trans("Late"));
+			}
+		} else {
+			if (!$adht->subscription) {
+				print $langs->trans("SubscriptionNotRecorded");
+				if ($fadherent->statut > 0) {
+					print " ".img_warning($langs->trans("Late")); // Display a delay picto only if it is not a draft and is not canceled
+				}
+			} else {
+				print $langs->trans("SubscriptionNotReceived");
+				if ($fadherent->statut > 0) {
+					print " ".img_warning($langs->trans("Late")); // Display a delay picto only if it is not a draft and is not canceled
+				}
+			}
+		}
+		print '</td></tr>';
+
+		print '</table>';
+		print '</div>';
+	}
 }
 
 // End of page
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index d03574d473b..650c0016f9a 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -100,7 +100,7 @@ $hookmanager->initHooks(array('admin'));
 // Put here declaration of dictionaries properties
 
 // Sort order to show dictionary (0 is space). All other dictionaries (added by modules) will be at end of this.
-$taborder = array(9, 0, 4, 3, 2, 0, 1, 8, 19, 16, 39, 27, 40, 38, 0, 5, 11, 0, 6, 0, 29, 0, 33, 34, 32, 24, 28, 17, 35, 36, 0, 10, 23, 12, 13, 7, 0, 14, 0, 22, 20, 18, 21, 41, 0, 15, 30, 0, 37, 42, 0, 25, 0, 43, 0);
+$taborder = array(9, 0, 4, 3, 2, 0, 1, 8, 19, 16, 39, 27, 40, 38, 0, 5, 11, 0, 6, 0, 29, 0, 33, 34, 32, 24, 28, 17, 35, 36, 0, 10, 23, 12, 13, 7, 0, 14, 0, 22, 20, 18, 21, 41, 0, 15, 30, 0, 37, 42, 0,43, 0, 25, 0);
 
 // Name of SQL tables of dictionaries
 $tabname = array();
@@ -608,7 +608,7 @@ $tabcomplete = array(
 	'c_prospectcontactlevel'=>array('picto'=>'company'),
 	'c_stcommcontact'=>array('picto'=>'company'),
 	'c_product_nature'=>array('picto'=>'product'),
-	'c_productbatch_qcstatus'=>array('picto'=>'batch'),
+	'c_productbatch_qcstatus'=>array('picto'=>'lot'),
 
 );
 
diff --git a/htdocs/core/modules/modPartnership.class.php b/htdocs/core/modules/modPartnership.class.php
index 889f18cde73..d7041eca754 100644
--- a/htdocs/core/modules/modPartnership.class.php
+++ b/htdocs/core/modules/modPartnership.class.php
@@ -212,30 +212,27 @@ class modPartnership extends DolibarrModules
 		// 'user'             to add a tab in user view
 
 		// Dictionaries
-		$this->dictionaries = array();
-		/* Example:
 		$this->dictionaries=array(
 			'langs'=>'partnership@partnership',
 			// List of tables we want to see into dictonnary editor
-			'tabname'=>array(MAIN_DB_PREFIX."table1", MAIN_DB_PREFIX."table2", MAIN_DB_PREFIX."table3"),
+			'tabname'=>array(MAIN_DB_PREFIX."c_partnership_type"),
 			// Label of tables
-			'tablib'=>array("Table1", "Table2", "Table3"),
+			'tablib'=>array("PartnershipType"),
 			// Request to select fields
-			'tabsql'=>array('SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table1 as f', 'SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table2 as f', 'SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table3 as f'),
+			'tabsql'=>array('SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'c_partnership_type as f WHERE f.entity = '.$conf->entity),
 			// Sort order
-			'tabsqlsort'=>array("label ASC", "label ASC", "label ASC"),
+			'tabsqlsort'=>array("label ASC"),
 			// List of fields (result of select to show dictionary)
-			'tabfield'=>array("code,label", "code,label", "code,label"),
+			'tabfield'=>array("code,label"),
 			// List of fields (list of fields to edit a record)
-			'tabfieldvalue'=>array("code,label", "code,label", "code,label"),
+			'tabfieldvalue'=>array("code,label"),
 			// List of fields (list of fields for insert)
-			'tabfieldinsert'=>array("code,label", "code,label", "code,label"),
+			'tabfieldinsert'=>array("code,label"),
 			// Name of columns with primary key (try to always name it 'rowid')
-			'tabrowid'=>array("rowid", "rowid", "rowid"),
+			'tabrowid'=>array("rowid"),
 			// Condition to show each dictionary
-			'tabcond'=>array($conf->partnership->enabled, $conf->partnership->enabled, $conf->partnership->enabled)
+			'tabcond'=>array($conf->partnership->enabled)
 		);
-		*/
 
 		// Boxes/Widgets
 		// Add here list of php file(s) stored in partnership/core/boxes that contains a class to show a widget.
diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index cc4b791725d..741d92a88a1 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -173,7 +173,9 @@ CREATE TABLE llx_workstation_workstation_usergroup(
 	fk_workstation integer
 ) ENGINE=innodb;
 
-CREATE TABLE llx_c_producbatch_qcstatus(
+DROP TABLE llx_c_producbatch_qcstatus;		-- delete table with bad name
+
+CREATE TABLE llx_c_productbatch_qcstatus(
   rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
   entity   integer NOT NULL DEFAULT 1,
   code     varchar(16)        NOT NULL,
@@ -532,3 +534,13 @@ INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) VALUE
 INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) VALUES ('CONTACT_MODIFY','Contact address update','Executed when a contact is updated','contact',51);
 
 
+create table llx_c_partnership_type
+(
+  rowid      	integer AUTO_INCREMENT PRIMARY KEY,
+  entity        integer DEFAULT 1 NOT NULL,
+  code          varchar(32) NOT NULL,
+  label 	    varchar(64)	NOT NULL,
+  active  	    tinyint DEFAULT 1  NOT NULL
+)ENGINE=innodb;
+
+
diff --git a/htdocs/install/mysql/tables/llx_c_partnership_type.sql b/htdocs/install/mysql/tables/llx_c_partnership_type.sql
new file mode 100644
index 00000000000..23d5a89e16c
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_c_partnership_type.sql
@@ -0,0 +1,35 @@
+-- ========================================================================
+-- Copyright (C) 2021 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 <https://www.gnu.org/licenses/>.
+--
+-- Defini les types de contact d'un element sert de reference pour
+-- la table llx_element_contact
+--
+-- element est le nom de la table utilisant le type de contact.
+-- i.e. contact, facture, projet, societe (sans le llx_ devant).
+-- Libelle est un texte decrivant le type de contact.
+-- active precise si cette valeur est 'active' ou 'archive'.
+--
+-- ========================================================================
+
+create table llx_c_partnership_type
+(
+  rowid      	integer AUTO_INCREMENT PRIMARY KEY,
+  entity        integer DEFAULT 1 NOT NULL,
+  code          varchar(32) NOT NULL,
+  label 	    varchar(64)	NOT NULL,
+  active  	    tinyint DEFAULT 1  NOT NULL
+)ENGINE=innodb;
+
diff --git a/htdocs/langs/en_US/partnership.lang b/htdocs/langs/en_US/partnership.lang
index 04fe88b3442..3a653e29967 100644
--- a/htdocs/langs/en_US/partnership.lang
+++ b/htdocs/langs/en_US/partnership.lang
@@ -20,6 +20,7 @@ ModulePartnershipName=Partnership management
 PartnershipDescription=Module Partnership management
 PartnershipDescriptionLong= Module Partnership management
 
+AddPartnership=Add partnership
 CancelPartnershipForExpiredMembers=Partnership: Cancel partnership of members with expired subscriptions
 PartnershipCheckBacklink=Partnership: Check referring backlink
 
@@ -56,6 +57,7 @@ PartnershipAlreadyExist=Partnership already exist
 ManagePartnership=Manage partnership
 BacklinkNotFoundOnPartnerWebsite=Backlink not found on partner website
 ConfirmClosePartnershipAsk=Are you sure you want to cancel this partnership?
+PartnershipType=Partnership type
 
 #
 # Template Mail
diff --git a/htdocs/partnership/class/partnership.class.php b/htdocs/partnership/class/partnership.class.php
index f33a19f312e..d04d0c335eb 100644
--- a/htdocs/partnership/class/partnership.class.php
+++ b/htdocs/partnership/class/partnership.class.php
@@ -105,7 +105,7 @@ class Partnership extends CommonObject
 	/**
 	 * @var int rowid
 	 * @deprecated
-	 * @see id
+	 * @see $id
 	 */
 	public $rowid;
 
@@ -180,6 +180,7 @@ class Partnership extends CommonObject
 			'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
 			'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>'1', 'position'=>10, 'notnull'=>1, 'visible'=>4, 'noteditable'=>'1', 'default'=>'(PROV)', 'index'=>1, 'searchall'=>1, 'showoncombobox'=>'1', 'comment'=>"Reference of object"),
 			'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => 1, 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 15, 'index' => 1),
+			//'fk_type' => array('type' => 'integer:PartnershipType:partnership/class/partnershiptype.class.php', 'label' => 'Type', 'default' => 1, 'enabled' => 1, 'visible' => 1, 'position' => 20),
 			'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>'1', 'position'=>61, 'notnull'=>0, 'visible'=>0,),
 			'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>'1', 'position'=>62, 'notnull'=>0, 'visible'=>0,),
 			'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>'1', 'position'=>500, 'notnull'=>1, 'visible'=>-2,),
@@ -353,15 +354,16 @@ class Partnership extends CommonObject
 	 *
 	 *	@param      int			$id       				Id of object to load
 	 * 	@param		string		$ref					Ref of object
-	 * 	@param 		int 		$fk_soc_or_member  		fk_soc or fk_member
+	 * 	@param 		int 		$fk_soc			  		fk_soc
+	 * 	@param 		int 		$fk_member		  		fk_member
 	 *	@return     int         						>0 if OK, <0 if KO, 0 if not found
 	 */
-	public function fetch($id, $ref = null, $fk_soc_or_member = null)
+	public function fetch($id, $ref = null, $fk_member = null, $fk_soc = null)
 	{
 		global $conf;
 
 		// Check parameters
-		if (empty($id) && empty($ref) && empty($fk_soc_or_member)) {
+		if (empty($id) && empty($ref) && empty($fk_member) && empty($fk_soc)) {
 			return -1;
 		}
 
@@ -375,7 +377,7 @@ class Partnership extends CommonObject
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'partnership as p';
 
 		if ($id) {
-			$sql .= " WHERE p.rowid=".$id;
+			$sql .= " WHERE p.rowid=".((int) $id);
 		} else {
 			$sql .= " WHERE p.entity IN (0,".getEntity('partnership').")"; // Dont't use entity if you use rowid
 		}
@@ -384,14 +386,13 @@ class Partnership extends CommonObject
 			$sql .= " AND p.ref='".$this->db->escape($ref)."'";
 		}
 
-		if ($fk_soc_or_member) {
-			$sql .= ' AND';
-			if ($conf->global->PARTNERSHIP_IS_MANAGED_FOR == 'member')
-				$sql .= ' p.fk_member = ';
-			else $sql .= ' p.fk_soc = ';
-			$sql .= $fk_soc_or_member;
-			$sql .= ' ORDER BY p.date_partnership_end DESC';
+		if ($fk_member > 0) {
+			$sql .= ' AND p.fk_member = '.((int) $fk_member);
 		}
+		if ($fk_soc > 0) {
+			$sql .= ' AND p.fk_soc = '.((int) $fk_soc);
+		}
+		$sql .= ' ORDER BY p.date_partnership_end DESC';
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$result = $this->db->query($sql);
@@ -420,8 +421,6 @@ class Partnership extends CommonObject
 				$this->import_key 					= $obj->import_key;
 				$this->model_pdf 					= $obj->model_pdf;
 
-				$this->lines = array();
-
 				// Retrieve all extrafield
 				// fetch optionals attributes and labels
 				$this->fetch_optionals();
diff --git a/htdocs/partnership/partnership_card.php b/htdocs/partnership/partnership_card.php
index 72e0bc22bdd..21c5cbdf68b 100644
--- a/htdocs/partnership/partnership_card.php
+++ b/htdocs/partnership/partnership_card.php
@@ -44,41 +44,12 @@
 //if (! defined('NOBROWSERNOTIF'))     		 define('NOBROWSERNOTIF', '1');				// Disable browser notification
 
 // Load Dolibarr environment
-$res = 0;
-// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
-if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
-	$res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
-}
-// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
-$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
-while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) {
-	$i--; $j--;
-}
-if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) {
-	$res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
-}
-if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) {
-	$res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
-}
-// Try main.inc.php using relative path
-if (!$res && file_exists("../main.inc.php")) {
-	$res = @include "../main.inc.php";
-}
-if (!$res && file_exists("../../main.inc.php")) {
-	$res = @include "../../main.inc.php";
-}
-if (!$res && file_exists("../../../main.inc.php")) {
-	$res = @include "../../../main.inc.php";
-}
-if (!$res) {
-	die("Include of main fails");
-}
-
+require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
-dol_include_once('/partnership/class/partnership.class.php');
-dol_include_once('/partnership/lib/partnership.lib.php');
+require_once DOL_DOCUMENT_ROOT.'/partnership/class/partnership.class.php';
+require_once DOL_DOCUMENT_ROOT.'/partnership/lib/partnership.lib.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array("partnership", "other"));
@@ -164,21 +135,11 @@ if (empty($reshook)) {
 	$fk_partner 	= ($managedfor == 'member') ? GETPOST('fk_member', 'int') : GETPOST('fk_soc', 'int');
 	$obj_partner 	= ($managedfor == 'member') ? $object->fk_member : $object->fk_soc;
 
-	if ($action == 'add' || ($action == 'update' && $obj_partner != $fk_partner)) {
-		$fpartnership = new Partnership($db);
-
-		$partnershipid = $fpartnership->fetch(0, "", $fk_partner);
-		if ($partnershipid > 0) {
-			setEventMessages($langs->trans('PartnershipAlreadyExist').' : '.$fpartnership->getNomUrl(0, '', 1), '', 'errors');
-			$action = ($action == 'add') ? 'create' : 'edit';
-		}
-	}
-
-	$triggermodname = 'PARTNERSHIP_MODIFY'; // Name of trigger action code to execute when we modify record
-
 	// Actions cancel, add, update, update_extras, confirm_validate, confirm_delete, confirm_deleteline, confirm_clone, confirm_close, confirm_setdraft, confirm_reopen
 	include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php';
 
+	$triggermodname = 'PARTNERSHIP_MODIFY'; // Name of trigger action code to execute when we modify record
+
 	// Action accept object
 	if ($action == 'confirm_accept' && $confirm == 'yes' && $permissiontoadd) {
 		$result = $object->accept($user);
@@ -275,8 +236,6 @@ if ($object->id > 0 && $object->status == $object::STATUS_REFUSED) $object->fiel
 
 /*
  * View
- *
- * Put here all code to build page
  */
 
 $form = new Form($db);
diff --git a/htdocs/societe/partnership.php b/htdocs/societe/partnership.php
index 6a45c657126..d109421fe8d 100644
--- a/htdocs/societe/partnership.php
+++ b/htdocs/societe/partnership.php
@@ -48,6 +48,7 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/partnership/class/partnership.class.php';
 require_once DOL_DOCUMENT_ROOT.'/partnership/lib/partnership.lib.php';
@@ -70,11 +71,12 @@ $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
 $socid = GETPOST('socid', 'int');
 if (!empty($user->socid)) {
 	$socid = $user->socid;
+	$id = $socid;
 }
 
-$societe = new Societe($db);
-if ($socid > 0) {
-	$societe->fetch($socid);
+$object = new Societe($db);
+if ($id > 0) {
+	$object->fetch($id);
 }
 
 // Initialize technical objects
@@ -115,18 +117,13 @@ if (empty($conf->partnership->enabled)) accessforbidden();
 if (empty($permissiontoread)) accessforbidden();
 if ($action == 'edit' && empty($permissiontoadd)) accessforbidden();
 
-$partnershipid = $object->fetch(0, "", $socid);
-if (empty($action) && empty($partnershipid)) {
-	$action = 'create';
+if (($action == 'update' || $action == 'edit') && $object->status != $object::STATUS_DRAFT && !empty($user->socid)) {
+	accessforbidden();
 }
-if (($action == 'update' || $action == 'edit') && $object->status != $object::STATUS_DRAFT && !empty($user->socid)) accessforbidden();
 
-if (empty($socid) && $object) {
-	$socid = $object->fk_soc;
-}
 
 // Security check
-$result = restrictedArea($user, 'societe', $socid, '&societe', '', 'fk_soc', 'rowid', 0);
+$result = restrictedArea($user, 'societe', $id, '&societe', '', 'fk_soc', 'rowid', 0);
 
 
 /*
@@ -145,102 +142,7 @@ $date_end = dol_mktime(0, 0, 0, GETPOST('date_partnership_endmonth', 'int'), GET
 if (empty($reshook)) {
 	$error = 0;
 
-	$backtopage = dol_buildpath('/partnership/partnership.php', 1).'?socid='.($socid > 0 ? $socid : '__ID__');
-
-	$triggermodname = 'PARTNERSHIP_MODIFY'; // Name of trigger action code to execute when we modify record
-
-	if ($action == 'add' && $permissiontoread) {
-		$error = 0;
-
-		$db->begin();
-
-		$now = dol_now();
-
-		if (!$error) {
-			$old_start_date = $object->date_partnership_start;
-
-			$object->fk_soc           			= $socid;
-			$object->date_partnership_start   	= (!GETPOST('date_partnership_start')) ? '' : $date_start;
-			$object->date_partnership_end     	= (!GETPOST('date_partnership_end')) ? '' : $date_end;
-			$object->note_public     			= GETPOST('note_public', 'restricthtml');
-			$object->date_creation 				= $now;
-			$object->fk_user_creat 				= $user->id;
-			$object->entity 					= $conf->entity;
-
-			// Fill array 'array_options' with data from add form
-			$ret = $extrafields->setOptionalsFromPost(null, $object);
-			if ($ret < 0) {
-				$error++;
-			}
-		}
-
-		if (!$error) {
-			$result = $object->create($user);
-			if ($result < 0) {
-				$error++;
-				if ($result == -4) {
-					setEventMessages($langs->trans("ErrorRefAlreadyExists"), null, 'errors');
-				} else {
-					setEventMessages($object->error, $object->errors, 'errors');
-				}
-			}
-		}
-
-		if ($error) {
-			$db->rollback();
-			$action = 'create';
-		} else {
-			$db->commit();
-		}
-	} elseif ($action == 'update' && $permissiontoread) {
-		$error = 0;
-
-		$db->begin();
-
-		$now = dol_now();
-
-		if (!$error) {
-			$object->oldcopy = clone $object;
-
-			$old_start_date = $object->date_partnership_start;
-
-			$object->date_partnership_start   	= (!GETPOST('date_partnership_start')) ? '' : $date_start;
-			$object->date_partnership_end     	= (!GETPOST('date_partnership_end')) ? '' : $date_end;
-			$object->note_public     			= GETPOST('note_public', 'restricthtml');
-			$object->fk_user_creat 				= $user->id;
-			$object->fk_user_modif 				= $user->id;
-
-			// Fill array 'array_options' with data from add form
-			$ret = $extrafields->setOptionalsFromPost(null, $object);
-			if ($ret < 0) {
-				$error++;
-			}
-		}
-
-		if (!$error) {
-			$result = $object->update($user);
-			if ($result < 0) {
-				$error++;
-				if ($result == -4) {
-					setEventMessages($langs->trans("ErrorRefAlreadyExists"), null, 'errors');
-				} else {
-					setEventMessages($object->error, $object->errors, 'errors');
-				}
-			}
-		}
-
-		if ($error) {
-			$db->rollback();
-			$action = 'edit';
-		} else {
-			$db->commit();
-		}
-	} elseif ($action == 'confirm_close' || $action == 'update_extras') {
-		include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php';
-
-		header("Location: ".$_SERVER['PHP_SELF']."?socid=".$socid);
-		exit;
-	}
+	$backtopage = dol_buildpath('/partnership/partnership.php', 1).'?id='.($id > 0 ? $id : '__ID__');
 
 	// Actions when linking object each other
 	include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';
@@ -250,6 +152,7 @@ $object->fields['fk_soc']['visible'] = 0;
 if ($object->id > 0 && $object->status == $object::STATUS_REFUSED && empty($action)) $object->fields['reason_decline_or_cancel']['visible'] = 1;
 $object->fields['note_public']['visible'] = 1;
 
+
 /*
  * View
  */
@@ -262,25 +165,22 @@ llxHeader('', $title);
 
 $form = new Form($db);
 
-if ($socid) {
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-	require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-
+if ($id > 0) {
 	$langs->load("companies");
 
-	$societe = new Societe($db);
-	$result = $societe->fetch($socid);
+	$object = new Societe($db);
+	$result = $object->fetch($id);
 
 	if (!empty($conf->notification->enabled)) {
 		$langs->load("mails");
 	}
-	$head = societe_prepare_head($societe);
+	$head = societe_prepare_head($object);
 
 	print dol_get_fiche_head($head, 'partnership', $langs->trans("ThirdParty"), -1, 'company');
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-	dol_banner_tab($societe, 'socid', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom');
+	dol_banner_tab($object, 'socid', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom');
 
 	print '<div class="fichecenter">';
 
@@ -310,7 +210,8 @@ if ($socid) {
 		if ($tmpcheck != 0 && $tmpcheck != -5) {
 			print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
 		}
-		print '</td></tr>';
+		print '</td>';
+		print '</tr>';
 	}
 
 	print '</table>';
@@ -318,178 +219,12 @@ if ($socid) {
 	print '</div>';
 
 	print dol_get_fiche_end();
-
-	$params = '';
-
-	print '<br>';
 } else {
-	dol_print_error('', 'Parameter socid not defined');
-}
-
-// Part to create
-if ($action == 'create') {
-	print load_fiche_titre($langs->trans("NewObject", $langs->transnoentitiesnoconv("Partnership")), '', '');
-
-	$backtopageforcancel = DOL_URL_ROOT.'/partnership/partnership.php?socid='.$socid;
-
-	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-	print '<input type="hidden" name="token" value="'.newToken().'">';
-	print '<input type="hidden" name="action" value="add">';
-	print '<input type="hidden" name="socid" value="'.$socid.'">';
-	print '<input type="hidden" name="fk_soc" value="'.$socid.'">';
-
-	if ($backtopage) {
-		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
-	}
-	if ($backtopageforcancel) {
-		print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
-	}
-
-	print dol_get_fiche_head(array(), '');
-
-	print '<table class="border centpercent tableforfieldcreate">'."\n";
-
-	// Common attributes
-	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_add.tpl.php';
-
-	// Other attributes
-	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
-
-	print '</table>'."\n";
-
-	print dol_get_fiche_end();
-
-	print '<div class="center">';
-	print '<input type="submit" class="button" name="add" value="'.dol_escape_htmltag($langs->trans("Validate")).'">';
-	print '&nbsp; ';
-	// print '<input type="'.($backtopage ? "submit" : "button").'" class="button button-cancel" 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>';
-}
-
-// Part to edit record
-if (($partnershipid || $ref) && $action == 'edit') {
-	print load_fiche_titre($langs->trans("Partnership"), '', '');
-
-	$backtopageforcancel = DOL_URL_ROOT.'/partnership/partnership.php?socid='.$socid;
-
-	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-	print '<input type="hidden" name="token" value="'.newToken().'">';
-	print '<input type="hidden" name="action" value="update">';
-	print '<input type="hidden" name="socid" value="'.$socid.'">';
-	print '<input type="hidden" name="fk_soc" value="'.$socid.'">';
-	if ($backtopage) {
-		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
-	}
-	if ($backtopageforcancel) {
-		print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
-	}
-
-	print dol_get_fiche_head();
-
-	print '<table class="border centpercent tableforfieldedit">'."\n";
-
-	// Common attributes
-	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_edit.tpl.php';
-
-	// Other attributes
-	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_edit.tpl.php';
-
-	print '</table>';
-
-	print dol_get_fiche_end();
-
-	print '<div class="center"><input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
-	print ' &nbsp; <input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
-	print '</div>';
-
-	print '</form>';
+	dol_print_error('', 'Parameter id not defined');
 }
 
 // Part to show record
 if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create'))) {
-	print load_fiche_titre($langs->trans("PartnershipDedicatedToThisThirdParty", $langs->transnoentitiesnoconv("Partnership")), '', '');
-
-	$res = $object->fetch_optionals();
-
-	// $head = partnershipPrepareHead($object);
-	// print dol_get_fiche_head($head, 'card', $langs->trans("Partnership"), -1, $object->picto);
-
-	$linkback = '';
-	dol_banner_tab($object, 'id', $linkback, 0, 'rowid', 'ref');
-
-	$formconfirm = '';
-
-	// Close confirmation
-	if ($action == 'close') {
-		// Create an array for form
-		$formquestion = array();
-		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClose'), $langs->trans('ConfirmClosePartnershipAsk', $object->ref), 'confirm_close', $formquestion, 'yes', 1);
-	}
-	// Reopon confirmation
-	if ($action == 'reopen') {
-		// Create an array for form
-		$formquestion = array();
-		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToReopon'), $langs->trans('ConfirmReoponAsk', $object->ref), 'confirm_reopen', $formquestion, 'yes', 1);
-	}
-
-	// Refuse confirmatio
-	if ($action == 'refuse') {
-		//Form to close proposal (signed or not)
-		$formquestion = array(
-			array('type' => 'text', 'name' => 'reason_decline_or_cancel', 'label' => $langs->trans("Note"), 'morecss' => 'reason_decline_or_cancel', 'value' => '')				// Field to complete private note (not replace)
-		);
-
-		// if (!empty($conf->notification->enabled)) {
-		// 	require_once DOL_DOCUMENT_ROOT.'/core/class/notify.class.php';
-		// 	$notify = new Notify($db);
-		// 	$formquestion = array_merge($formquestion, array(
-		// 		array('type' => 'onecolumn', 'value' => $notify->confirmMessage('PROPAL_CLOSE_SIGNED', $object->socid, $object)),
-		// 	));
-		// }
-
-		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ReasonDecline'), $text, 'confirm_refuse', $formquestion, '', 1, 250);
-	}
-
-	// Call Hook formConfirm
-	$parameters = array('formConfirm' => $formconfirm, 'lineid' => $lineid);
-	$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-	if (empty($reshook)) {
-		$formconfirm .= $hookmanager->resPrint;
-	} elseif ($reshook > 0) {
-		$formconfirm = $hookmanager->resPrint;
-	}
-
-	// Print form confirm
-	print $formconfirm;
-
-
-	// Object card
-	// ------------------------------------------------------------
-	$linkback = '<a href="'.dol_buildpath('/partnership/partnership_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
-
-	print '<div class="fichecenter">';
-	print '<div class="fichehalfleft">';
-	print '<div class="underbanner clearboth"></div>';
-	print '<table class="border centpercent tableforfield">'."\n";
-
-	// Common attributes
-	//$keyforbreak='fieldkeytoswitchonsecondcolumn';	// We change column just before this field
-	//unset($object->fields['fk_project']);				// Hide field already shown in banner
-	//unset($object->fields['fk_soc']);					// Hide field already shown in banner
-	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';
-
-	// Other attributes. Fields from hook formObjectOptions and Extrafields.
-	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
-
-	print '</table>';
-	print '</div>';
-
-	print '<div class="clearboth"></div>';
-
-	print dol_get_fiche_end();
-
 	// Buttons for actions
 
 	if ($action != 'presend') {
@@ -501,26 +236,43 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		}
 
 		if (empty($reshook)) {
-			if ($object->status == $object::STATUS_DRAFT) {
-				print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER["PHP_SELF"].'?socid='.$socid.'&action=edit&token='.newtoken(), '', $permissiontoadd);
-			}
-
 			// Show
 			if ($permissiontoadd) {
-				print dolGetButtonAction($langs->trans('ManagePartnership'), '', 'default', dol_buildpath('/partnership/partnership_card.php', 1).'?id='.$object->id, '', $permissiontoadd);
+				print dolGetButtonAction($langs->trans('AddPartnership'), '', 'default', DOL_URL_ROOT.'/partnership/partnership_card.php?action=create&fk_soc='.$object->id.'&backtopage='.urlencode(DOL_URL_ROOT.'/societe/partnership.php?id='.$object->id), '', $permissiontoadd);
 			}
-
-			// Cancel
-			/*
-			if ($permissiontoadd) {
-				if ($object->status == $object::STATUS_ACCEPTED) {
-					print dolGetButtonAction($langs->trans('Cancel'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=close&token='.newToken(), '', $permissiontoadd);
-				}
-			}
-			*/
 		}
 		print '</div>'."\n";
 	}
+
+
+	//$morehtmlright = 'partnership/partnership_card.php?action=create&backtopage=%2Fdolibarr%2Fhtdocs%2Fpartnership%2Fpartnership_list.php';
+	$morehtmlright = '';
+
+	print load_fiche_titre($langs->trans("PartnershipDedicatedToThisThirdParty", $langs->transnoentitiesnoconv("Partnership")), $morehtmlright, '');
+
+	$socid = $object->id;
+
+
+	// TODO Replace this card with the list of all partnerships.
+
+	$object = new Partnership($db);
+	$partnershipid = $object->fetch(0, '', 0, $socid);
+
+	if ($partnershipid > 0) {
+		print '<div class="fichecenter">';
+		print '<div class="fichehalfleft">';
+		print '<div class="underbanner clearboth"></div>';
+		print '<table class="border centpercent tableforfield">'."\n";
+
+		// Common attributes
+		//$keyforbreak='fieldkeytoswitchonsecondcolumn';	// We change column just before this field
+		//unset($object->fields['fk_project']);				// Hide field already shown in banner
+		//unset($object->fields['fk_member']);					// Hide field already shown in banner
+		include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';
+
+		print '</table>';
+		print '</div>';
+	}
 }
 
 // End of page

From 46a06f8e9512bbff7c48e51ceee11af025a58082 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 6 Jun 2021 16:37:45 +0200
Subject: [PATCH 0435/1497] Fix phpcs

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

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 650c0016f9a..b8bf1a5998a 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -100,7 +100,7 @@ $hookmanager->initHooks(array('admin'));
 // Put here declaration of dictionaries properties
 
 // Sort order to show dictionary (0 is space). All other dictionaries (added by modules) will be at end of this.
-$taborder = array(9, 0, 4, 3, 2, 0, 1, 8, 19, 16, 39, 27, 40, 38, 0, 5, 11, 0, 6, 0, 29, 0, 33, 34, 32, 24, 28, 17, 35, 36, 0, 10, 23, 12, 13, 7, 0, 14, 0, 22, 20, 18, 21, 41, 0, 15, 30, 0, 37, 42, 0,43, 0, 25, 0);
+$taborder = array(9, 0, 4, 3, 2, 0, 1, 8, 19, 16, 39, 27, 40, 38, 0, 5, 11, 0, 6, 0, 29, 0, 33, 34, 32, 24, 28, 17, 35, 36, 0, 10, 23, 12, 13, 7, 0, 14, 0, 22, 20, 18, 21, 41, 0, 15, 30, 0, 37, 42, 0, 43, 0, 25, 0);
 
 // Name of SQL tables of dictionaries
 $tabname = array();

From cc24013d42b5b515c3087713f0bcfa54a381804d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 6 Jun 2021 17:13:18 +0200
Subject: [PATCH 0436/1497] Update partnership_agenda.php

---
 htdocs/partnership/partnership_agenda.php | 55 ++---------------------
 1 file changed, 3 insertions(+), 52 deletions(-)

diff --git a/htdocs/partnership/partnership_agenda.php b/htdocs/partnership/partnership_agenda.php
index 51f417399df..799aadd24cd 100644
--- a/htdocs/partnership/partnership_agenda.php
+++ b/htdocs/partnership/partnership_agenda.php
@@ -22,63 +22,14 @@
  *  \brief      Tab of events on Partnership
  */
 
-//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB', '1');				// Do not create database handler $db
-//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER', '1');				// Do not load object $user
-//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC', '1');				// Do not load object $mysoc
-//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN', '1');				// Do not load object $langs
-//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION', '1');		// Do not check injection attack on GET parameters
-//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION', '1');		// Do not check injection attack on POST parameters
-//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK', '1');				// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
-//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL', '1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
-//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK', '1');				// Do not check style html tag into posted data
-//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU', '1');				// If there is no need to load and show top and left menu
-//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML', '1');				// If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX', '1');       	  	// Do not load ajax.lib.php library
-//if (! defined("NOLOGIN"))                  define("NOLOGIN", '1');					// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
-//if (! defined('NOIPCHECK'))                define('NOIPCHECK', '1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
-//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');					// Force lang to a particular value
-//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');	// Force authentication handler
-//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
-//if (! defined("FORCECSP"))                 define('FORCECSP', 'none');				// Disable all Content Security Policies
-//if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
-//if (! defined('NOBROWSERNOTIF'))     		 define('NOBROWSERNOTIF', '1');				// Disable browser notification
-
 // Load Dolibarr environment
-$res = 0;
-// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
-if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
-	$res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
-}
-// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
-$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
-while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) {
-	$i--; $j--;
-}
-if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) {
-	$res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
-}
-if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) {
-	$res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
-}
-// Try main.inc.php using relative path
-if (!$res && file_exists("../main.inc.php")) {
-	$res = @include "../main.inc.php";
-}
-if (!$res && file_exists("../../main.inc.php")) {
-	$res = @include "../../main.inc.php";
-}
-if (!$res && file_exists("../../../main.inc.php")) {
-	$res = @include "../../../main.inc.php";
-}
-if (!$res) {
-	die("Include of main fails");
-}
+require '../main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-dol_include_once('/partnership/class/partnership.class.php');
-dol_include_once('/partnership/lib/partnership.lib.php');
+require_once DOL_DOCUMENT_ROOT.'/partnership/class/partnership.class.php';
+require_once DOL_DOCUMENT_ROOT.'/partnership/lib/partnership.lib.php';
 
 
 // Load translation files required by the page

From 83cd127f0b28b6aa154bfb1b400a0a5377e060d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 6 Jun 2021 17:14:02 +0200
Subject: [PATCH 0437/1497] Update partnership_card.php

---
 htdocs/partnership/partnership_card.php | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/htdocs/partnership/partnership_card.php b/htdocs/partnership/partnership_card.php
index 21c5cbdf68b..4fc4b08adb1 100644
--- a/htdocs/partnership/partnership_card.php
+++ b/htdocs/partnership/partnership_card.php
@@ -22,27 +22,6 @@
  *		\brief      Page to create/edit/view partnership
  */
 
-//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB', '1');				// Do not create database handler $db
-//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER', '1');				// Do not load object $user
-//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC', '1');				// Do not load object $mysoc
-//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN', '1');				// Do not load object $langs
-//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION', '1');		// Do not check injection attack on GET parameters
-//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION', '1');		// Do not check injection attack on POST parameters
-//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK', '1');				// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
-//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL', '1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
-//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK', '1');				// Do not check style html tag into posted data
-//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU', '1');				// If there is no need to load and show top and left menu
-//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML', '1');				// If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX', '1');       	  	// Do not load ajax.lib.php library
-//if (! defined("NOLOGIN"))                  define("NOLOGIN", '1');					// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
-//if (! defined('NOIPCHECK'))                define('NOIPCHECK', '1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
-//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');					// Force lang to a particular value
-//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');	// Force authentication handler
-//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
-//if (! defined("FORCECSP"))                 define('FORCECSP', 'none');				// Disable all Content Security Policies
-//if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
-//if (! defined('NOBROWSERNOTIF'))     		 define('NOBROWSERNOTIF', '1');				// Disable browser notification
-
 // Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';

From 5fecaa2a5bde91cc98f164609ff79c42c4f8d082 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 6 Jun 2021 17:15:36 +0200
Subject: [PATCH 0438/1497] Update partnership_contact.php

---
 htdocs/partnership/partnership_contact.php | 35 +++-------------------
 1 file changed, 4 insertions(+), 31 deletions(-)

diff --git a/htdocs/partnership/partnership_contact.php b/htdocs/partnership/partnership_contact.php
index 632047acf25..1c416cf690c 100644
--- a/htdocs/partnership/partnership_contact.php
+++ b/htdocs/partnership/partnership_contact.php
@@ -22,41 +22,14 @@
  *  \brief      Tab for contacts linked to Partnership
  */
 
+
 // Load Dolibarr environment
-$res = 0;
-// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
-if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
-	$res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
-}
-// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
-$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
-while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) {
-	$i--; $j--;
-}
-if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) {
-	$res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
-}
-if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) {
-	$res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
-}
-// Try main.inc.php using relative path
-if (!$res && file_exists("../main.inc.php")) {
-	$res = @include "../main.inc.php";
-}
-if (!$res && file_exists("../../main.inc.php")) {
-	$res = @include "../../main.inc.php";
-}
-if (!$res && file_exists("../../../main.inc.php")) {
-	$res = @include "../../../main.inc.php";
-}
-if (!$res) {
-	die("Include of main fails");
-}
+require '../main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
-dol_include_once('/partnership/class/partnership.class.php');
-dol_include_once('/partnership/lib/partnership.lib.php');
+require_once DOL_DOCUMENT_ROOT.'/partnership/class/partnership.class.php';
+require_once DOL_DOCUMENT_ROOT.'/partnership/lib/partnership.lib.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array("partnership", "companies", "other", "mails"));

From 4ac3576a7493936d759352a2f38da568e1a7c3f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 6 Jun 2021 17:16:27 +0200
Subject: [PATCH 0439/1497] Update partnership_document.php

---
 htdocs/partnership/partnership_document.php | 55 ++-------------------
 1 file changed, 3 insertions(+), 52 deletions(-)

diff --git a/htdocs/partnership/partnership_document.php b/htdocs/partnership/partnership_document.php
index d6f89c07d00..e7fae7ee7ff 100644
--- a/htdocs/partnership/partnership_document.php
+++ b/htdocs/partnership/partnership_document.php
@@ -22,64 +22,15 @@
  *  \brief      Tab for documents linked to Partnership
  */
 
-//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB', '1');				// Do not create database handler $db
-//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER', '1');				// Do not load object $user
-//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC', '1');				// Do not load object $mysoc
-//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN', '1');				// Do not load object $langs
-//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION', '1');		// Do not check injection attack on GET parameters
-//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION', '1');		// Do not check injection attack on POST parameters
-//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK', '1');				// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
-//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL', '1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
-//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK', '1');				// Do not check style html tag into posted data
-//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU', '1');				// If there is no need to load and show top and left menu
-//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML', '1');				// If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX', '1');       	  	// Do not load ajax.lib.php library
-//if (! defined("NOLOGIN"))                  define("NOLOGIN", '1');					// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
-//if (! defined('NOIPCHECK'))                define('NOIPCHECK', '1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
-//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');					// Force lang to a particular value
-//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');	// Force authentication handler
-//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
-//if (! defined("FORCECSP"))                 define('FORCECSP', 'none');				// Disable all Content Security Policies
-//if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
-//if (! defined('NOBROWSERNOTIF'))     		 define('NOBROWSERNOTIF', '1');				// Disable browser notification
-
 // Load Dolibarr environment
-$res = 0;
-// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
-if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
-	$res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
-}
-// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
-$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
-while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) {
-	$i--; $j--;
-}
-if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) {
-	$res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
-}
-if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) {
-	$res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
-}
-// Try main.inc.php using relative path
-if (!$res && file_exists("../main.inc.php")) {
-	$res = @include "../main.inc.php";
-}
-if (!$res && file_exists("../../main.inc.php")) {
-	$res = @include "../../main.inc.php";
-}
-if (!$res && file_exists("../../../main.inc.php")) {
-	$res = @include "../../../main.inc.php";
-}
-if (!$res) {
-	die("Include of main fails");
-}
+require '../main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-dol_include_once('/partnership/class/partnership.class.php');
-dol_include_once('/partnership/lib/partnership.lib.php');
+require_once DOL_DOCUMENT_ROOT.'/partnership/class/partnership.class.php';
+require_once DOL_DOCUMENT_ROOT.'/partnership/lib/partnership.lib.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array("partnership", "companies", "other", "mails"));

From 0eb61a6063472efcf244d2541bd8756d6929c1b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 6 Jun 2021 17:17:50 +0200
Subject: [PATCH 0440/1497] Update partnership_list.php

---
 htdocs/partnership/partnership_list.php | 67 ++++---------------------
 1 file changed, 9 insertions(+), 58 deletions(-)

diff --git a/htdocs/partnership/partnership_list.php b/htdocs/partnership/partnership_list.php
index 1ae90d0d4cf..457d0345c31 100644
--- a/htdocs/partnership/partnership_list.php
+++ b/htdocs/partnership/partnership_list.php
@@ -22,57 +22,8 @@
  *		\brief      List page for partnership
  */
 
-//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB', '1');				// Do not create database handler $db
-//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER', '1');				// Do not load object $user
-//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC', '1');				// Do not load object $mysoc
-//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN', '1');				// Do not load object $langs
-//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION', '1');		// Do not check injection attack on GET parameters
-//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION', '1');		// Do not check injection attack on POST parameters
-//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK', '1');				// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
-//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL', '1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
-//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK', '1');				// Do not check style html tag into posted data
-//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU', '1');				// If there is no need to load and show top and left menu
-//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML', '1');				// If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX', '1');       	  	// Do not load ajax.lib.php library
-//if (! defined("NOLOGIN"))                  define("NOLOGIN", '1');					// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
-//if (! defined('NOIPCHECK'))                define('NOIPCHECK', '1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
-//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');					// Force lang to a particular value
-//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');	// Force authentication handler
-//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
-//if (! defined("FORCECSP"))                 define('FORCECSP', 'none');				// Disable all Content Security Policies
-//if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
-//if (! defined('NOBROWSERNOTIF'))     		 define('NOBROWSERNOTIF', '1');				// Disable browser notification
-
 // Load Dolibarr environment
-$res = 0;
-// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
-if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
-	$res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
-}
-// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
-$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
-while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) {
-	$i--; $j--;
-}
-if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) {
-	$res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
-}
-if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) {
-	$res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
-}
-// Try main.inc.php using relative path
-if (!$res && file_exists("../main.inc.php")) {
-	$res = @include "../main.inc.php";
-}
-if (!$res && file_exists("../../main.inc.php")) {
-	$res = @include "../../main.inc.php";
-}
-if (!$res && file_exists("../../../main.inc.php")) {
-	$res = @include "../../../main.inc.php";
-}
-if (!$res) {
-	die("Include of main fails");
-}
+require '../main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
@@ -80,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 
 // load partnership libraries
-require_once __DIR__.'/class/partnership.class.php';
+require_once DOL_DOCUMENT_ROOT.'/partnership/class/partnership.class.php';
 
 // for other modules
 //dol_include_once('/othermodule/class/otherobject.class.php');
@@ -88,12 +39,12 @@ require_once __DIR__.'/class/partnership.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array("partnership", "members", "other"));
 
-$action     = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
+$action = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
 $massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
 $show_files = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ?
-$confirm    = GETPOST('confirm', 'alpha'); // Result of a confirmation
-$cancel     = GETPOST('cancel', 'alpha'); // We click on a Cancel button
-$toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
+$confirm = GETPOST('confirm', 'alpha'); // Result of a confirmation
+$cancel = GETPOST('cancel', 'alpha'); // We click on a Cancel button
+$toselect = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'partnershiplist'; // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
 $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
@@ -113,9 +64,9 @@ $pageprev = $page - 1;
 $pagenext = $page + 1;
 
 // Initialize technical objects
-$object 		= new Partnership($db);
-$extrafields 	= new ExtraFields($db);
-$adherent 		= new Adherent($db);
+$object = new Partnership($db);
+$extrafields = new ExtraFields($db);
+$adherent = new Adherent($db);
 $diroutputmassaction = $conf->partnership->dir_output.'/temp/massgeneration/'.$user->id;
 $hookmanager->initHooks(array('partnershiplist')); // Note that conf->hooks_modules contains array
 

From b1ff123155e9672c377adf18bde07be089667365 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 6 Jun 2021 17:19:20 +0200
Subject: [PATCH 0441/1497] Update partnership_note.php

---
 htdocs/partnership/partnership_note.php | 59 +++----------------------
 1 file changed, 5 insertions(+), 54 deletions(-)

diff --git a/htdocs/partnership/partnership_note.php b/htdocs/partnership/partnership_note.php
index 29a59f67ef4..b9607e5aeb6 100644
--- a/htdocs/partnership/partnership_note.php
+++ b/htdocs/partnership/partnership_note.php
@@ -22,69 +22,20 @@
  *  \brief      Tab for notes on Partnership
  */
 
-//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB', '1');				// Do not create database handler $db
-//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER', '1');				// Do not load object $user
-//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC', '1');				// Do not load object $mysoc
-//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN', '1');				// Do not load object $langs
-//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION', '1');		// Do not check injection attack on GET parameters
-//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION', '1');		// Do not check injection attack on POST parameters
-//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK', '1');				// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
-//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL', '1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
-//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK', '1');				// Do not check style html tag into posted data
-//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU', '1');				// If there is no need to load and show top and left menu
-//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML', '1');				// If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX', '1');       	  	// Do not load ajax.lib.php library
-//if (! defined("NOLOGIN"))                  define("NOLOGIN", '1');					// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
-//if (! defined('NOIPCHECK'))                define('NOIPCHECK', '1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
-//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');					// Force lang to a particular value
-//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');	// Force authentication handler
-//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
-//if (! defined("FORCECSP"))                 define('FORCECSP', 'none');				// Disable all Content Security Policies
-//if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
-//if (! defined('NOBROWSERNOTIF'))     		 define('NOBROWSERNOTIF', '1');				// Disable browser notification
-
 // Load Dolibarr environment
-$res = 0;
-// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
-if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
-	$res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
-}
-// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
-$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
-while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) {
-	$i--; $j--;
-}
-if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) {
-	$res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
-}
-if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) {
-	$res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
-}
-// Try main.inc.php using relative path
-if (!$res && file_exists("../main.inc.php")) {
-	$res = @include "../main.inc.php";
-}
-if (!$res && file_exists("../../main.inc.php")) {
-	$res = @include "../../main.inc.php";
-}
-if (!$res && file_exists("../../../main.inc.php")) {
-	$res = @include "../../../main.inc.php";
-}
-if (!$res) {
-	die("Include of main fails");
-}
+require '../main.inc.php';
 
-dol_include_once('/partnership/class/partnership.class.php');
-dol_include_once('/partnership/lib/partnership.lib.php');
+require_once DOL_DOCUMENT_ROOT.'/partnership/class/partnership.class.php';
+require_once DOL_DOCUMENT_ROOT.'/partnership/lib/partnership.lib.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array("partnership", "companies"));
 
 // Get parameters
 $id = GETPOST('id', 'int');
-$ref        = GETPOST('ref', 'alpha');
+$ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
-$cancel     = GETPOST('cancel', 'aZ09');
+$cancel = GETPOST('cancel', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
 
 // Initialize technical objects

From 594cd90c4b1dd97d419a272b14eb0fb03d2fa411 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 6 Jun 2021 17:22:20 +0200
Subject: [PATCH 0442/1497] Update partnershipindex.php

---
 htdocs/partnership/partnershipindex.php | 68 +++++--------------------
 1 file changed, 12 insertions(+), 56 deletions(-)

diff --git a/htdocs/partnership/partnershipindex.php b/htdocs/partnership/partnershipindex.php
index 8076f105dbb..536729a473d 100644
--- a/htdocs/partnership/partnershipindex.php
+++ b/htdocs/partnership/partnershipindex.php
@@ -25,35 +25,7 @@
  */
 
 // Load Dolibarr environment
-$res = 0;
-// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
-if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
-	$res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
-}
-// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
-$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
-while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) {
-	$i--; $j--;
-}
-if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) {
-	$res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
-}
-if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) {
-	$res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
-}
-// Try main.inc.php using relative path
-if (!$res && file_exists("../main.inc.php")) {
-	$res = @include "../main.inc.php";
-}
-if (!$res && file_exists("../../main.inc.php")) {
-	$res = @include "../../main.inc.php";
-}
-if (!$res && file_exists("../../../main.inc.php")) {
-	$res = @include "../../../main.inc.php";
-}
-if (!$res) {
-	die("Include of main fails");
-}
+require '../main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 
@@ -100,8 +72,7 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 
 /* BEGIN MODULEBUILDER DRAFT MYOBJECT
 // Draft MyObject
-if (! empty($conf->partnership->enabled) && $user->rights->partnership->read)
-{
+if (! empty($conf->partnership->enabled) && $user->rights->partnership->read) {
 	$langs->load("orders");
 
 	$sql = "SELECT c.rowid, c.ref, c.ref_client, c.total_ht, c.tva as total_tva, c.total_ttc, s.rowid as socid, s.nom as name, s.client, s.canvas";
@@ -116,8 +87,7 @@ if (! empty($conf->partnership->enabled) && $user->rights->partnership->read)
 	if ($socid)	$sql.= " AND c.fk_soc = ".$socid;
 
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$total = 0;
 		$num = $db->num_rows($resql);
 
@@ -126,12 +96,9 @@ if (! empty($conf->partnership->enabled) && $user->rights->partnership->read)
 		print '<th colspan="3">'.$langs->trans("DraftMyObjects").($num?'<span class="badge marginleftonlyshort">'.$num.'</span>':'').'</th></tr>';
 
 		$var = true;
-		if ($num > 0)
-		{
+		if ($num > 0) {
 			$i = 0;
-			while ($i < $num)
-			{
-
+			while ($i < $num) {
 				$obj = $db->fetch_object($resql);
 				print '<tr class="oddeven"><td class="nowrap">';
 
@@ -150,23 +117,16 @@ if (! empty($conf->partnership->enabled) && $user->rights->partnership->read)
 				$i++;
 				$total += $obj->total_ttc;
 			}
-			if ($total>0)
-			{
-
+			if ($total>0) {
 				print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td colspan="2" class="right">'.price($total)."</td></tr>";
 			}
-		}
-		else
-		{
-
+		} else {
 			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("NoOrder").'</td></tr>';
 		}
 		print "</table><br>";
 
 		$db->free($resql);
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -181,8 +141,7 @@ $max = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
 
 /* BEGIN MODULEBUILDER LASTMODIFIED MYOBJECT
 // Last modified myobject
-if (! empty($conf->partnership->enabled) && $user->rights->partnership->read)
-{
+if (! empty($conf->partnership->enabled) && $user->rights->partnership->read) {
 	$sql = "SELECT s.rowid, s.ref, s.label, s.date_creation, s.tms";
 	$sql.= " FROM ".MAIN_DB_PREFIX."partnership_myobject as s";
 	//if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -193,8 +152,7 @@ if (! empty($conf->partnership->enabled) && $user->rights->partnership->read)
 	$sql .= $db->plimit($max, 0);
 
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$num = $db->num_rows($resql);
 		$i = 0;
 
@@ -205,10 +163,8 @@ if (! empty($conf->partnership->enabled) && $user->rights->partnership->read)
 		print '</th>';
 		print '<th class="right">'.$langs->trans("DateModificationShort").'</th>';
 		print '</tr>';
-		if ($num)
-		{
-			while ($i < $num)
-			{
+		if ($num) {
+			while ($i < $num) {
 				$objp = $db->fetch_object($resql);
 
 				$myobjectstatic->id=$objp->rowid;

From ccc35326a52f85b7a0710345cc1593b588b667a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 6 Jun 2021 17:25:44 +0200
Subject: [PATCH 0443/1497] Update partnershiputils.class.php

---
 htdocs/partnership/class/partnershiputils.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/partnership/class/partnershiputils.class.php b/htdocs/partnership/class/partnershiputils.class.php
index 992fca2703e..aef1bf18e49 100644
--- a/htdocs/partnership/class/partnershiputils.class.php
+++ b/htdocs/partnership/class/partnershiputils.class.php
@@ -28,10 +28,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
 
-dol_include_once('partnership/lib/partnership.lib.php');
-dol_include_once('/partnership/class/partnership.class.php');
+require_once DOL_DOCUMENT_ROOT.'/partnership/lib/partnership.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/partnership/class/partnership.class.php';
 
-require_once DOL_DOCUMENT_ROOT."/societe/class/societe.class.php";
+require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 /**
  *	Class with cron tasks of Partnership module

From 8a359c9009edc7c0e2363253d8474244b4788560 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 6 Jun 2021 17:34:03 +0200
Subject: [PATCH 0444/1497] Update partnership.class.php

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

diff --git a/htdocs/partnership/class/partnership.class.php b/htdocs/partnership/class/partnership.class.php
index d04d0c335eb..125dacb1e53 100644
--- a/htdocs/partnership/class/partnership.class.php
+++ b/htdocs/partnership/class/partnership.class.php
@@ -354,8 +354,8 @@ class Partnership extends CommonObject
 	 *
 	 *	@param      int			$id       				Id of object to load
 	 * 	@param		string		$ref					Ref of object
-	 * 	@param 		int 		$fk_soc			  		fk_soc
 	 * 	@param 		int 		$fk_member		  		fk_member
+	 * 	@param 		int 		$fk_soc			  		fk_soc
 	 *	@return     int         						>0 if OK, <0 if KO, 0 if not found
 	 */
 	public function fetch($id, $ref = null, $fk_member = null, $fk_soc = null)

From e11656a3e3daa847875f2c99fca54fe1906e1adb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sun, 6 Jun 2021 17:44:06 +0200
Subject: [PATCH 0445/1497] add member search

---
 dev/examples/zapier/index.js           |  2 +
 dev/examples/zapier/searches/member.js | 88 ++++++++++++++++++++++++++
 2 files changed, 90 insertions(+)
 create mode 100644 dev/examples/zapier/searches/member.js

diff --git a/dev/examples/zapier/index.js b/dev/examples/zapier/index.js
index 044415a7ddd..9567c120bb0 100644
--- a/dev/examples/zapier/index.js
+++ b/dev/examples/zapier/index.js
@@ -8,6 +8,7 @@ const triggerUser = require('./triggers/user');
 
 const searchThirdparty = require('./searches/thirdparty');
 const searchContact = require('./searches/contact');
+const searchMember = require('./searches/member');
 
 const createThirdparty = require('./creates/thirdparty');
 const createContact = require('./creates/contact');
@@ -75,6 +76,7 @@ const App = {
     searches: {
         [searchThirdparty.key]: searchThirdparty,
         [searchContact.key]: searchContact,
+        [searchMember.key]: searchMember,
     },
 
     // If you want your creates to show up, you better include it here!
diff --git a/dev/examples/zapier/searches/member.js b/dev/examples/zapier/searches/member.js
new file mode 100644
index 00000000000..f1a84061146
--- /dev/null
+++ b/dev/examples/zapier/searches/member.js
@@ -0,0 +1,88 @@
+module.exports = {
+    key: 'member',
+
+    // You'll want to provide some helpful display labels and descriptions
+    // for users. Zapier will put them into the UX.
+    noun: 'Member',
+    display: {
+        label: 'Find a Member',
+        description: 'Search for member.'
+    },
+
+    // `operation` is where we make the call to your API to do the search
+    operation: {
+        // This search only has one search field. Your searches might have just one, or many
+        // search fields.
+        inputFields: [
+            {
+                key: 'lastname',
+                type: 'string',
+                label: 'Lastname',
+                helpText: 'Lastname to limit to the search to (i.e. The company or %company%).'
+            },
+            {
+                key: 'email',
+                type: 'string',
+                label: 'Email',
+                helpText: 'Email to limit to the search to.'
+            }
+        ],
+
+        perform: async (z, bundle) => {
+            const url = bundle.authData.url + '/api/index.php/members/';
+
+            // Put the search value in a query param. The details of how to build
+            // a search URL will depend on how your API works.
+            let filter = '';
+            if (bundle.inputData.lastname) {
+                filter = "t.lastname like \'%" + bundle.inputData.name + "%\'";
+            }
+            if (bundle.inputData.email) {
+                if (bundle.inputData.lastname) {
+                    filter += " and ";
+                }
+                filter += "t.email like \'" + bundle.inputData.email + "\'";
+            }
+            const response = await z.request({
+                url: url,
+                // this parameter avoid throwing errors and let us manage them
+                skipThrowForStatus: true,
+                params: {
+                    sqlfilters: filter
+                }
+            });
+            //z.console.log(response);
+            if (response.status != 200) {
+                return [];
+            }
+            return response.json;
+        },
+
+        // In cases where Zapier needs to show an example record to the user, but we are unable to get a live example
+        // from the API, Zapier will fallback to this hard-coded sample. It should reflect the data structure of
+        // returned records, and have obviously dummy values that we can show to any user.
+        sample: {
+            id: 1,
+            createdAt: 1472069465,
+            name: 'DOE',
+            firstname: 'John',
+            authorId: 1,
+        },
+
+        // If the resource can have fields that are custom on a per-user basis, define a function to fetch the custom
+        // field definitions. The result will be used to augment the sample.
+        // outputFields: () => { return []; }
+        // Alternatively, a static field definition should be provided, to specify labels for the fields
+        outputFields: [
+            {
+                key: 'id',
+                type: "integer",
+                label: 'ID'
+            },
+            { key: 'createdAt', type: "integer", label: 'Created At' },
+            { key: 'name', label: 'Name' },
+            { key: 'firstname', label: 'Firstname' },
+            { key: 'authorId', type: "integer", label: 'Author ID' },
+        ]
+    }
+};

From 8401fa3ce778bf31fbecf5ceff48b2a0b8f03333 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sun, 6 Jun 2021 17:57:48 +0200
Subject: [PATCH 0446/1497] add trigger member

---
 dev/examples/zapier/index.js                  |   2 +
 dev/examples/zapier/triggers/member.js        | 171 ++++++++++++++++++
 ...face_99_modZapier_ZapierTriggers.class.php |  22 ++-
 3 files changed, 193 insertions(+), 2 deletions(-)
 create mode 100644 dev/examples/zapier/triggers/member.js

diff --git a/dev/examples/zapier/index.js b/dev/examples/zapier/index.js
index 9567c120bb0..fdd1ed29a53 100644
--- a/dev/examples/zapier/index.js
+++ b/dev/examples/zapier/index.js
@@ -5,6 +5,7 @@ const triggerThirdparty = require('./triggers/thirdparty');
 const triggerContact = require('./triggers/contact');
 const triggerTicket = require('./triggers/ticket');
 const triggerUser = require('./triggers/user');
+const triggerMember = require('./triggers/member');
 
 const searchThirdparty = require('./searches/thirdparty');
 const searchContact = require('./searches/contact');
@@ -70,6 +71,7 @@ const App = {
         [triggerContact.key]: triggerContact,
         [triggerTicket.key]: triggerTicket,
         [triggerUser.key]: triggerUser,
+        [triggerMember.key]: triggerMember,
     },
 
     // If you want your searches to show up, you better include it here!
diff --git a/dev/examples/zapier/triggers/member.js b/dev/examples/zapier/triggers/member.js
new file mode 100644
index 00000000000..3385cdca625
--- /dev/null
+++ b/dev/examples/zapier/triggers/member.js
@@ -0,0 +1,171 @@
+const subscribeHook = (z, bundle) => {
+    // `z.console.log()` is similar to `console.log()`.
+    z.console.log('suscribing hook!');
+
+    // bundle.targetUrl has the Hook URL this app should call when an action is created.
+    const data = {
+        url: bundle.targetUrl,
+        event: bundle.event,
+        module: 'member',
+        action: bundle.inputData.action
+    };
+
+    const url = bundle.authData.url  + '/api/index.php/zapierapi/hook';
+
+    // You can build requests and our client will helpfully inject all the variables
+    // you need to complete. You can also register middleware to control this.
+    const options = {
+        url: url,
+        method: 'POST',
+        body: data,
+    };
+
+    // You may return a promise or a normal data structure from any perform method.
+    return z.request(options).then((response) => JSON.parse(response.content));
+};
+
+const unsubscribeHook = (z, bundle) => {
+    // bundle.subscribeData contains the parsed response JSON from the subscribe
+    // request made initially.
+    z.console.log('unsuscribing hook!');
+
+    // You can build requests and our client will helpfully inject all the variables
+    // you need to complete. You can also register middleware to control this.
+    const options = {
+        url: bundle.authData.url + '/api/index.php/zapierapi/hook/' + bundle.subscribeData.id,
+        method: 'DELETE',
+    };
+
+    // You may return a promise or a normal data structure from any perform method.
+    return z.request(options).then((response) => JSON.parse(response.content));
+};
+
+const getMember = (z, bundle) => {
+    // bundle.cleanedRequest will include the parsed JSON object (if it's not a
+    // test poll) and also a .querystring property with the URL's query string.
+    const member = {
+        id: bundle.cleanedRequest.id,
+        name: bundle.cleanedRequest.name,
+        name_alias: bundle.cleanedRequest.name_alias,
+        firstname: bundle.cleanedRequest.firstname,
+        address: bundle.cleanedRequest.address,
+        zip: bundle.cleanedRequest.zip,
+        town: bundle.cleanedRequest.town,
+        email: bundle.cleanedRequest.email,
+        phone_pro: bundle.cleanedRequest.phone_pro,
+        phone_perso: bundle.cleanedRequest.phone_perso,
+        phone_mobile: bundle.cleanedRequest.phone_mobile,
+        authorId: bundle.cleanedRequest.authorId,
+        createdAt: bundle.cleanedRequest.createdAt,
+        action: bundle.cleanedRequest.action
+    };
+
+    return [member];
+};
+
+const getFallbackRealMember = (z, bundle) => {
+    // For the test poll, you should get some real data, to aid the setup process.
+    const module = bundle.inputData.module;
+    const options = {
+        url: bundle.authData.url + '/api/index.php/members/0',
+    };
+
+    return z.request(options).then((response) => [JSON.parse(response.content)]);
+};
+
+// const getModulesChoices = (z/*, bundle*/) => {
+//     // For the test poll, you should get some real data, to aid the setup process.
+//     const options = {
+//         url: bundle.authData.url + '/api/index.php/zapierapi/getmoduleschoices',
+//     };
+
+//     return z.request(options).then((response) => JSON.parse(response.content));
+// };
+// const getModulesChoices = () => {
+//     return {
+//         orders: "Order",
+//         invoices: "Invoice",
+//         members: "Member",
+//         members: "Members"
+//     };
+// };
+
+// const getActionsChoices = (z, bundle) => {
+//     // For the test poll, you should get some real data, to aid the setup process.
+//     const module = bundle.inputData.module;
+//     const options = {
+//         url:  url: bundle.authData.url + '/api/index.php/zapierapi/getactionschoices/thirparty`,
+//     };
+
+//     return z.request(options).then((response) => JSON.parse(response.content));
+// };
+
+// We recommend writing your triggers separate like this and rolling them
+// into the App definition at the end.
+module.exports = {
+    key: 'member',
+
+    // You'll want to provide some helpful display labels and descriptions
+    // for users. Zapier will put them into the UX.
+    noun: 'Member',
+    display: {
+        label: 'New Member',
+        description: 'Triggers when a new member action is done in Dolibarr.'
+    },
+
+    // `operation` is where the business logic goes.
+    operation: {
+
+        // `inputFields` can define the fields a user could provide,
+        // we'll pass them in as `bundle.inputData` later.
+        inputFields: [
+            {
+                key: 'action',
+                required: true,
+                type: 'string',
+                helpText: 'Which action of member this should trigger on.',
+                choices: {
+                    create: "Create",
+                    modify: "Modify",
+                    validate: "Validate",
+                }
+            }
+        ],
+
+        type: 'hook',
+
+        performSubscribe: subscribeHook,
+        performUnsubscribe: unsubscribeHook,
+
+        perform: getMember,
+        performList: getFallbackRealMember,
+
+        // In cases where Zapier needs to show an example record to the user, but we are unable to get a live example
+        // from the API, Zapier will fallback to this hard-coded sample. It should reflect the data structure of
+        // returned records, and have obviously dummy values that we can show to any user.
+        sample: {
+            id: 1,
+            createdAt: 1472069465,
+            lastname: 'DOE',
+            firstname: 'John',
+            authorId: 1,
+            action: 'create'
+        },
+
+        // If the resource can have fields that are custom on a per-user basis, define a function to fetch the custom
+        // field definitions. The result will be used to augment the sample.
+        // outputFields: () => { return []; }
+        // Alternatively, a static field definition should be provided, to specify labels for the fields
+        outputFields: [
+            {key: 'id', type: "integer", label: 'ID'},
+            {key: 'createdAt', label: 'Created At'},
+            {key: 'lastname', label: 'Lastname'},
+            {key: 'firstname', label: 'Firstname'},
+            {key: 'phone', label: 'Phone pro'},
+            {key: 'phone_perso', label: 'Phone perso'},
+            {key: 'phone_mobile', label: 'Phone mobile'},
+            {key: 'authorId', type: "integer", label: 'Author ID'},
+            {key: 'action', label: 'Action'}
+        ]
+    }
+};
diff --git a/htdocs/core/triggers/interface_99_modZapier_ZapierTriggers.class.php b/htdocs/core/triggers/interface_99_modZapier_ZapierTriggers.class.php
index 7d6f346449d..8025f0c0293 100644
--- a/htdocs/core/triggers/interface_99_modZapier_ZapierTriggers.class.php
+++ b/htdocs/core/triggers/interface_99_modZapier_ZapierTriggers.class.php
@@ -339,10 +339,28 @@ class InterfaceZapierTriggers extends DolibarrTriggers
 			// case 'LINEFICHINTER_DELETE':
 
 			// Members
-			// case 'MEMBER_CREATE':
+			case 'MEMBER_CREATE':
+				$resql = $this->db->query($sql);
+				while ($resql && $obj = $this->db->fetch_array($resql)) {
+					$cleaned = cleanObjectDatas(dol_clone($object));
+					$json = json_encode($cleaned);
+					// call the zapierPostWebhook() function
+					zapierPostWebhook($obj['url'], $json);
+				}
+				$logtriggeraction = true;
+				break;
+			case 'MEMBER_MODIFY':
+				$resql = $this->db->query($sql);
+				while ($resql && $obj = $this->db->fetch_array($resql)) {
+					$cleaned = cleanObjectDatas(dol_clone($object));
+					$json = json_encode($cleaned);
+					// call the zapierPostWebhook() function
+					zapierPostWebhook($obj['url'], $json);
+				}
+				$logtriggeraction = true;
+				break;
 			// case 'MEMBER_VALIDATE':
 			// case 'MEMBER_SUBSCRIPTION':
-			// case 'MEMBER_MODIFY':
 			// case 'MEMBER_NEW_PASSWORD':
 			// case 'MEMBER_RESILIATE':
 			// case 'MEMBER_DELETE':

From a47df8246899ee2500b44373c94db12eef46ba27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 6 Jun 2021 19:14:42 +0200
Subject: [PATCH 0447/1497] fix warning

---
 htdocs/societe/partnership.php | 27 +++------------------------
 1 file changed, 3 insertions(+), 24 deletions(-)

diff --git a/htdocs/societe/partnership.php b/htdocs/societe/partnership.php
index d109421fe8d..912307a5675 100644
--- a/htdocs/societe/partnership.php
+++ b/htdocs/societe/partnership.php
@@ -22,27 +22,6 @@
  *		\brief      Page to create/edit/view partnership
  */
 
-//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB', '1');				// Do not create database handler $db
-//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER', '1');				// Do not load object $user
-//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC', '1');				// Do not load object $mysoc
-//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN', '1');				// Do not load object $langs
-//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION', '1');		// Do not check injection attack on GET parameters
-//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION', '1');		// Do not check injection attack on POST parameters
-//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK', '1');				// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
-//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL', '1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
-//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK', '1');				// Do not check style html tag into posted data
-//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU', '1');				// If there is no need to load and show top and left menu
-//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML', '1');				// If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX', '1');       	  	// Do not load ajax.lib.php library
-//if (! defined("NOLOGIN"))                  define("NOLOGIN", '1');					// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
-//if (! defined('NOIPCHECK'))                define('NOIPCHECK', '1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
-//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');					// Force lang to a particular value
-//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');	// Force authentication handler
-//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
-//if (! defined("FORCECSP"))                 define('FORCECSP', 'none');				// Disable all Content Security Policies
-//if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
-//if (! defined('NOBROWSERNOTIF'))     		 define('NOBROWSERNOTIF', '1');				// Disable browser notification
-
 // Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
@@ -80,8 +59,8 @@ if ($id > 0) {
 }
 
 // Initialize technical objects
-$object 		= new Partnership($db);
-$extrafields 	= new ExtraFields($db);
+$object = new Partnership($db);
+$extrafields = new ExtraFields($db);
 $diroutputmassaction = $conf->partnership->dir_output.'/temp/massgeneration/'.$user->id;
 $hookmanager->initHooks(array('partnershipthirdparty', 'globalcard')); // Note that conf->hooks_modules contains array
 
@@ -112,7 +91,7 @@ $usercanclose 			= $user->rights->partnership->write; // Used by the include of
 $upload_dir 			= $conf->partnership->multidir_output[isset($object->entity) ? $object->entity : 1];
 
 
-if ($conf->global->PARTNERSHIP_IS_MANAGED_FOR != 'thirdparty') accessforbidden();
+if (!empty($conf->global->PARTNERSHIP_IS_MANAGED_FOR) && $conf->global->PARTNERSHIP_IS_MANAGED_FOR != 'thirdparty') accessforbidden();
 if (empty($conf->partnership->enabled)) accessforbidden();
 if (empty($permissiontoread)) accessforbidden();
 if ($action == 'edit' && empty($permissiontoadd)) accessforbidden();

From d54d4da8cd6ee03b0d4948d4ed095df13f3922fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 6 Jun 2021 19:18:02 +0200
Subject: [PATCH 0448/1497] Update setup.php

---
 htdocs/partnership/admin/setup.php | 29 ++---------------------------
 1 file changed, 2 insertions(+), 27 deletions(-)

diff --git a/htdocs/partnership/admin/setup.php b/htdocs/partnership/admin/setup.php
index 7fa0ef62b5e..3f933c2bc94 100644
--- a/htdocs/partnership/admin/setup.php
+++ b/htdocs/partnership/admin/setup.php
@@ -23,32 +23,7 @@
  */
 
 // Load Dolibarr environment
-$res = 0;
-// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
-if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
-	$res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
-}
-// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
-$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
-while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) {
-	$i--; $j--;
-}
-if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) {
-	$res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
-}
-if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) {
-	$res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
-}
-// Try main.inc.php using relative path
-if (!$res && file_exists("../../main.inc.php")) {
-	$res = @include "../../main.inc.php";
-}
-if (!$res && file_exists("../../../main.inc.php")) {
-	$res = @include "../../../main.inc.php";
-}
-if (!$res) {
-	die("Include of main fails");
-}
+require '../main.inc.php';
 
 global $langs, $user;
 
@@ -160,7 +135,7 @@ print '<td><span class="opacitymedium">'.$langs->trans("partnershipforthirdparty
 print '</tr>';
 
 
-if ($conf->global->PARTNERSHIP_IS_MANAGED_FOR == 'member') {
+if (!empty($conf->global->PARTNERSHIP_IS_MANAGED_FOR) && $conf->global->PARTNERSHIP_IS_MANAGED_FOR == 'member') {
 	print '<tr class="oddeven"><td>'.$langs->trans("PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL").'</td>';
 	print '<td>';
 	$dnbdays 	= '15';

From f3a3ce90e12a017aa245eb0bcb7a7d30f815353c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 6 Jun 2021 21:18:23 +0200
Subject: [PATCH 0449/1497] Update partnership_card.php

---
 htdocs/partnership/partnership_card.php | 32 -------------------------
 1 file changed, 32 deletions(-)

diff --git a/htdocs/partnership/partnership_card.php b/htdocs/partnership/partnership_card.php
index 4fc4b08adb1..29789072773 100644
--- a/htdocs/partnership/partnership_card.php
+++ b/htdocs/partnership/partnership_card.php
@@ -225,22 +225,6 @@ $title = $langs->trans("Partnership");
 $help_url = '';
 llxHeader('', $title, $help_url);
 
-// Example : Adding jquery code
-print '<script type="text/javascript" language="javascript">
-jQuery(document).ready(function() {
-	function init_myfunc()
-	{
-		jQuery("#myid").removeAttr(\'disabled\');
-		jQuery("#myid").attr(\'disabled\',\'disabled\');
-	}
-	init_myfunc();
-	jQuery("#mybutton").click(function() {
-		init_myfunc();
-	});
-});
-</script>';
-
-
 // Part to create
 if ($action == 'create') {
 	print load_fiche_titre($langs->trans("NewObject", $langs->transnoentitiesnoconv("Partnership")), '', 'object_'.$object->picto);
@@ -373,22 +357,6 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToRefuse'), $text, 'confirm_refuse', $formquestion, '', 1, 250);
 	}
 
-	// Confirmation of action xxxx
-	if ($action == 'xxx') {
-		$formquestion = array();
-		/*
-		$forcecombo=0;
-		if ($conf->browser->name == 'ie') $forcecombo = 1;	// There is a bug in IE10 that make combo inside popup crazy
-		$formquestion = array(
-			// 'text' => $langs->trans("ConfirmClone"),
-			// array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value' => 1),
-			// array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans("PuttingPricesUpToDate"), 'value' => 1),
-			// array('type' => 'other',    'name' => 'idwarehouse',   'label' => $langs->trans("SelectWarehouseForStockDecrease"), 'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse')?GETPOST('idwarehouse'):'ifone', 'idwarehouse', '', 1, 0, 0, '', 0, $forcecombo))
-		);
-		*/
-		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('XXX'), $text, 'confirm_xxx', $formquestion, 0, 1, 220);
-	}
-
 	// Call Hook formConfirm
 	$parameters = array('formConfirm' => $formconfirm, 'lineid' => $lineid);
 	$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook

From ffb1b232d4540d6bc34b9d6787495c9729461583 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sun, 6 Jun 2021 21:27:48 +0200
Subject: [PATCH 0450/1497] Fix Withdraw - link is missing in llx_bank_url when
 the debit is rejected

---
 .../compta/paiement/class/paiement.class.php  | 26 ++++++++++++++-----
 .../class/rejetprelevement.class.php          | 14 +++++++---
 2 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index 221ff3de042..76709332f06 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -2,13 +2,14 @@
 /* Copyright (C) 2002-2004  Rodolphe Quiedeville    <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2010  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2005       Marc Barilley / Ocebo   <marc@ocebo.com>
- * Copyright (C) 2012      Cédric Salvador       <csalvador@gpcsolutions.fr>
- * Copyright (C) 2014      Raphaël Doursenaud    <rdoursenaud@gpcsolutions.fr>
- * Copyright (C) 2014      Marcos García 		 <marcosgdf@gmail.com>
- * Copyright (C) 2015      Juanjo Menent		 <jmenent@2byte.es>
- * Copyright (C) 2018      Ferran Marcet		 <fmarcet@2byte.es>
- * Copyright (C) 2018      Thibault FOUCART		 <support@ptibogxiv.net>
- * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2012		Cédric Salvador			<csalvador@gpcsolutions.fr>
+ * Copyright (C) 2014		Raphaël Doursenaud		<rdoursenaud@gpcsolutions.fr>
+ * Copyright (C) 2014		Marcos García			<marcosgdf@gmail.com>
+ * Copyright (C) 2015		Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2018		Ferran Marcet			<fmarcet@2byte.es>
+ * Copyright (C) 2018		Thibault FOUCART		<support@ptibogxiv.net>
+ * Copyright (C) 2018       Frédéric France			<frederic.france@netlogic.fr>
+ * Copyright (C) 2021       OpenDsi					<support@open-dsi.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -748,6 +749,17 @@ class Paiement extends CommonObject
 					);
 				}
 
+				// Add link 'InvoiceRefused' in bank_url
+				if (! $error && $label == '(InvoiceRefused)') {
+					$result=$acc->add_url_line(
+						$bank_line_id,
+						$this->id_prelevement,
+						DOL_URL_ROOT.'/compta/prelevement/card.php?id=',
+						$this->num_prelevement,
+						'withdraw'
+					);
+				}
+
 	            if (! $error && ! $notrigger)
 				{
 					// Appel des triggers
diff --git a/htdocs/compta/prelevement/class/rejetprelevement.class.php b/htdocs/compta/prelevement/class/rejetprelevement.class.php
index 740a1e47784..f1e6eab552a 100644
--- a/htdocs/compta/prelevement/class/rejetprelevement.class.php
+++ b/htdocs/compta/prelevement/class/rejetprelevement.class.php
@@ -1,7 +1,8 @@
 <?php
-/* Copyright (C) 2005      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
- * Copyright (C) 2010-2013 Juanjo Menent        <jmenent@2byte.es>
+/* Copyright (C) 2005		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2005-2009	Regis Houssin			<regis.houssin@inodbox.com>
+ * Copyright (C) 2010-2013	Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2021       OpenDsi					<support@open-dsi.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -95,6 +96,10 @@ class RejetPrelevement
 		$bankaccount = $conf->global->PRELEVEMENT_ID_BANKACCOUNT;
 		$facs = $this->getListInvoices(1);
 
+		require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/ligneprelevement.class.php';
+		$lipre = new LignePrelevement($this->db, $user);
+		$lipre->fetch($id);
+
 		$this->db->begin();
 
 		// Insert refused line into database
@@ -154,6 +159,9 @@ class RejetPrelevement
 			$pai->datepaye = $date_rejet;
 			$pai->paiementid = 3; // type of payment: withdrawal
 			$pai->num_paiement = $fac->ref;
+			$pai->num_payment = $fac->ref;
+			$pai->id_prelevement = $this->bon_id;
+			$pai->num_prelevement = $lipre->bon_ref;
 
 			if ($pai->create($this->user) < 0)  // we call with no_commit
 			{

From a586afd8b33d2cd8fd1cfdfe8a9df7c099ad0904 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sun, 6 Jun 2021 21:35:39 +0200
Subject: [PATCH 0451/1497] clean code

---
 htdocs/admin/knowledgemanagement.php          | 28 +---------
 htdocs/admin/knowledgerecord_extrafields.php  | 27 +--------
 .../class/knowledgerecord.class.php           |  2 +-
 .../knowledgemanagementindex.php              | 30 +---------
 .../knowledgerecord_agenda.php                | 55 +------------------
 .../knowledgerecord_card.php                  | 55 +------------------
 .../knowledgerecord_contact.php               | 34 +-----------
 .../knowledgerecord_document.php              | 55 +------------------
 .../knowledgerecord_list.php                  | 53 +-----------------
 .../knowledgerecord_note.php                  | 55 +------------------
 .../lib/knowledgemanagement.lib.php           |  6 +-
 ...nowledgemanagement_knowledgerecord.lib.php | 10 ++--
 .../partnership/class/partnership.class.php   |  2 +-
 13 files changed, 31 insertions(+), 381 deletions(-)

diff --git a/htdocs/admin/knowledgemanagement.php b/htdocs/admin/knowledgemanagement.php
index 5bc994bb086..b8434773f67 100644
--- a/htdocs/admin/knowledgemanagement.php
+++ b/htdocs/admin/knowledgemanagement.php
@@ -23,32 +23,8 @@
  */
 
 // Load Dolibarr environment
-$res = 0;
-// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
-if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
-	$res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
-}
-// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
-$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
-while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) {
-	$i--; $j--;
-}
-if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) {
-	$res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
-}
-if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) {
-	$res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
-}
-// Try main.inc.php using relative path
-if (!$res && file_exists("../main.inc.php")) {
-	$res = @include "../main.inc.php";
-}
-if (!$res && file_exists("../../main.inc.php")) {
-	$res = @include "../../main.inc.php";
-}
-if (!$res) {
-	die("Include of main fails");
-}
+require '../main.inc.php';
+
 global $langs, $user;
 
 // Libraries
diff --git a/htdocs/admin/knowledgerecord_extrafields.php b/htdocs/admin/knowledgerecord_extrafields.php
index 823366e1fbe..d6c94e4ceeb 100644
--- a/htdocs/admin/knowledgerecord_extrafields.php
+++ b/htdocs/admin/knowledgerecord_extrafields.php
@@ -27,32 +27,7 @@
  */
 
 // Load Dolibarr environment
-$res = 0;
-// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
-if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
-	$res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
-}
-// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
-$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
-while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) {
-	$i--; $j--;
-}
-if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) {
-	$res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
-}
-if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) {
-	$res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
-}
-// Try main.inc.php using relative path
-if (!$res && file_exists("../main.inc.php")) {
-	$res = @include "../main.inc.php";
-}
-if (!$res && file_exists("../../main.inc.php")) {
-	$res = @include "../../main.inc.php";
-}
-if (!$res) {
-	die("Include of main fails");
-}
+require '../main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 require_once DOL_DOCUMENT_ROOT.'/knowledgemanagement/lib/knowledgemanagement.lib.php';
diff --git a/htdocs/knowledgemanagement/class/knowledgerecord.class.php b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
index 4d46794aaf8..85d8a1bcb9e 100644
--- a/htdocs/knowledgemanagement/class/knowledgerecord.class.php
+++ b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * \file        class/knowledgerecord.class.php
+ * \file        htdocs/knowledgemanagement/class/knowledgerecord.class.php
  * \ingroup     knowledgemanagement
  * \brief       This file is a CRUD class file for KnowledgeRecord (Create/Read/Update/Delete)
  */
diff --git a/htdocs/knowledgemanagement/knowledgemanagementindex.php b/htdocs/knowledgemanagement/knowledgemanagementindex.php
index 86ea3f10e08..f4fc767e9d5 100644
--- a/htdocs/knowledgemanagement/knowledgemanagementindex.php
+++ b/htdocs/knowledgemanagement/knowledgemanagementindex.php
@@ -25,35 +25,7 @@
  */
 
 // Load Dolibarr environment
-$res = 0;
-// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
-if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
-	$res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
-}
-// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
-$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
-while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) {
-	$i--; $j--;
-}
-if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) {
-	$res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
-}
-if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) {
-	$res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
-}
-// Try main.inc.php using relative path
-if (!$res && file_exists("../main.inc.php")) {
-	$res = @include "../main.inc.php";
-}
-if (!$res && file_exists("../../main.inc.php")) {
-	$res = @include "../../main.inc.php";
-}
-if (!$res && file_exists("../../../main.inc.php")) {
-	$res = @include "../../../main.inc.php";
-}
-if (!$res) {
-	die("Include of main fails");
-}
+require '../main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 
diff --git a/htdocs/knowledgemanagement/knowledgerecord_agenda.php b/htdocs/knowledgemanagement/knowledgerecord_agenda.php
index 5144b736b98..7853aa7e2ff 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_agenda.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_agenda.php
@@ -22,63 +22,14 @@
  *  \brief      Tab of events on KnowledgeRecord
  */
 
-//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB', '1');				// Do not create database handler $db
-//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER', '1');				// Do not load object $user
-//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC', '1');				// Do not load object $mysoc
-//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN', '1');				// Do not load object $langs
-//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION', '1');		// Do not check injection attack on GET parameters
-//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION', '1');		// Do not check injection attack on POST parameters
-//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK', '1');				// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
-//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL', '1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
-//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK', '1');				// Do not check style html tag into posted data
-//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU', '1');				// If there is no need to load and show top and left menu
-//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML', '1');				// If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX', '1');       	  	// Do not load ajax.lib.php library
-//if (! defined("NOLOGIN"))                  define("NOLOGIN", '1');					// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
-//if (! defined('NOIPCHECK'))                define('NOIPCHECK', '1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
-//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');					// Force lang to a particular value
-//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');	// Force authentication handler
-//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
-//if (! defined("FORCECSP"))                 define('FORCECSP', 'none');				// Disable all Content Security Policies
-//if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
-//if (! defined('NOBROWSERNOTIF'))     		 define('NOBROWSERNOTIF', '1');				// Disable browser notification
-
 // Load Dolibarr environment
-$res = 0;
-// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
-if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
-	$res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
-}
-// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
-$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
-while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) {
-	$i--; $j--;
-}
-if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) {
-	$res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
-}
-if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) {
-	$res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
-}
-// Try main.inc.php using relative path
-if (!$res && file_exists("../main.inc.php")) {
-	$res = @include "../main.inc.php";
-}
-if (!$res && file_exists("../../main.inc.php")) {
-	$res = @include "../../main.inc.php";
-}
-if (!$res && file_exists("../../../main.inc.php")) {
-	$res = @include "../../../main.inc.php";
-}
-if (!$res) {
-	die("Include of main fails");
-}
+require '../main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-dol_include_once('/knowledgemanagement/class/knowledgerecord.class.php');
-dol_include_once('/knowledgemanagement/lib/knowledgemanagement_knowledgerecord.lib.php');
+require_once DOL_DOCUMENT_ROOT.'/knowledgemanagement/class/knowledgerecord.class.php';
+require_once DOL_DOCUMENT_ROOT.'/knowledgemanagement/lib/knowledgemanagement_knowledgerecord.lib.php';
 
 
 // Load translation files required by the page
diff --git a/htdocs/knowledgemanagement/knowledgerecord_card.php b/htdocs/knowledgemanagement/knowledgerecord_card.php
index f4e949a8603..b33ecb652f7 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_card.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_card.php
@@ -22,63 +22,14 @@
  *		\brief      Page to create/edit/view knowledgerecord
  */
 
-//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB', '1');				// Do not create database handler $db
-//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER', '1');				// Do not load object $user
-//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC', '1');				// Do not load object $mysoc
-//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN', '1');				// Do not load object $langs
-//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION', '1');		// Do not check injection attack on GET parameters
-//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION', '1');		// Do not check injection attack on POST parameters
-//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK', '1');				// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
-//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL', '1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
-//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK', '1');				// Do not check style html tag into posted data
-//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU', '1');				// If there is no need to load and show top and left menu
-//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML', '1');				// If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX', '1');       	  	// Do not load ajax.lib.php library
-//if (! defined("NOLOGIN"))                  define("NOLOGIN", '1');					// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
-//if (! defined('NOIPCHECK'))                define('NOIPCHECK', '1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
-//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');					// Force lang to a particular value
-//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');	// Force authentication handler
-//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
-//if (! defined("FORCECSP"))                 define('FORCECSP', 'none');				// Disable all Content Security Policies
-//if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
-//if (! defined('NOBROWSERNOTIF'))     		 define('NOBROWSERNOTIF', '1');				// Disable browser notification
-
 // Load Dolibarr environment
-$res = 0;
-// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
-if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
-	$res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
-}
-// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
-$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
-while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) {
-	$i--; $j--;
-}
-if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) {
-	$res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
-}
-if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) {
-	$res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
-}
-// Try main.inc.php using relative path
-if (!$res && file_exists("../main.inc.php")) {
-	$res = @include "../main.inc.php";
-}
-if (!$res && file_exists("../../main.inc.php")) {
-	$res = @include "../../main.inc.php";
-}
-if (!$res && file_exists("../../../main.inc.php")) {
-	$res = @include "../../../main.inc.php";
-}
-if (!$res) {
-	die("Include of main fails");
-}
+require '../main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
-dol_include_once('/knowledgemanagement/class/knowledgerecord.class.php');
-dol_include_once('/knowledgemanagement/lib/knowledgemanagement_knowledgerecord.lib.php');
+require_once DOL_DOCUMENT_ROOT.'/knowledgemanagement/class/knowledgerecord.class.php';
+require_once DOL_DOCUMENT_ROOT.'/knowledgemanagement/lib/knowledgemanagement_knowledgerecord.lib.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array("knowledgemanagement", "other"));
diff --git a/htdocs/knowledgemanagement/knowledgerecord_contact.php b/htdocs/knowledgemanagement/knowledgerecord_contact.php
index e5af4a54611..1eb80efafa1 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_contact.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_contact.php
@@ -23,40 +23,12 @@
  */
 
 // Load Dolibarr environment
-$res = 0;
-// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
-if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
-	$res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
-}
-// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
-$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
-while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) {
-	$i--; $j--;
-}
-if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) {
-	$res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
-}
-if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) {
-	$res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
-}
-// Try main.inc.php using relative path
-if (!$res && file_exists("../main.inc.php")) {
-	$res = @include "../main.inc.php";
-}
-if (!$res && file_exists("../../main.inc.php")) {
-	$res = @include "../../main.inc.php";
-}
-if (!$res && file_exists("../../../main.inc.php")) {
-	$res = @include "../../../main.inc.php";
-}
-if (!$res) {
-	die("Include of main fails");
-}
+require '../main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
-dol_include_once('/knowledgemanagement/class/knowledgerecord.class.php');
-dol_include_once('/knowledgemanagement/lib/knowledgemanagement_knowledgerecord.lib.php');
+require_once DOL_DOCUMENT_ROOT.'/knowledgemanagement/class/knowledgerecord.class.php';
+require_once DOL_DOCUMENT_ROOT.'/knowledgemanagement/lib/knowledgemanagement_knowledgerecord.lib.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array("knowledgemanagement", "companies", "other", "mails"));
diff --git a/htdocs/knowledgemanagement/knowledgerecord_document.php b/htdocs/knowledgemanagement/knowledgerecord_document.php
index 5261fde7118..4a572ee22bb 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_document.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_document.php
@@ -22,64 +22,15 @@
  *  \brief      Tab for documents linked to KnowledgeRecord
  */
 
-//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB', '1');				// Do not create database handler $db
-//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER', '1');				// Do not load object $user
-//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC', '1');				// Do not load object $mysoc
-//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN', '1');				// Do not load object $langs
-//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION', '1');		// Do not check injection attack on GET parameters
-//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION', '1');		// Do not check injection attack on POST parameters
-//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK', '1');				// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
-//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL', '1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
-//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK', '1');				// Do not check style html tag into posted data
-//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU', '1');				// If there is no need to load and show top and left menu
-//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML', '1');				// If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX', '1');       	  	// Do not load ajax.lib.php library
-//if (! defined("NOLOGIN"))                  define("NOLOGIN", '1');					// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
-//if (! defined('NOIPCHECK'))                define('NOIPCHECK', '1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
-//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');					// Force lang to a particular value
-//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');	// Force authentication handler
-//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
-//if (! defined("FORCECSP"))                 define('FORCECSP', 'none');				// Disable all Content Security Policies
-//if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
-//if (! defined('NOBROWSERNOTIF'))     		 define('NOBROWSERNOTIF', '1');				// Disable browser notification
-
 // Load Dolibarr environment
-$res = 0;
-// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
-if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
-	$res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
-}
-// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
-$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
-while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) {
-	$i--; $j--;
-}
-if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) {
-	$res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
-}
-if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) {
-	$res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
-}
-// Try main.inc.php using relative path
-if (!$res && file_exists("../main.inc.php")) {
-	$res = @include "../main.inc.php";
-}
-if (!$res && file_exists("../../main.inc.php")) {
-	$res = @include "../../main.inc.php";
-}
-if (!$res && file_exists("../../../main.inc.php")) {
-	$res = @include "../../../main.inc.php";
-}
-if (!$res) {
-	die("Include of main fails");
-}
+require '../main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-dol_include_once('/knowledgemanagement/class/knowledgerecord.class.php');
-dol_include_once('/knowledgemanagement/lib/knowledgemanagement_knowledgerecord.lib.php');
+require_once DOL_DOCUMENT_ROOT.'/knowledgemanagement/class/knowledgerecord.class.php';
+require_once DOL_DOCUMENT_ROOT.'/knowledgemanagement/lib/knowledgemanagement_knowledgerecord.lib.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array("knowledgemanagement", "companies", "other", "mails"));
diff --git a/htdocs/knowledgemanagement/knowledgerecord_list.php b/htdocs/knowledgemanagement/knowledgerecord_list.php
index bd4c8829be5..c886d6931a0 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_list.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_list.php
@@ -22,64 +22,15 @@
  *		\brief      List page for knowledgerecord
  */
 
-//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB', '1');				// Do not create database handler $db
-//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER', '1');				// Do not load object $user
-//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC', '1');				// Do not load object $mysoc
-//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN', '1');				// Do not load object $langs
-//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION', '1');		// Do not check injection attack on GET parameters
-//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION', '1');		// Do not check injection attack on POST parameters
-//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK', '1');				// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
-//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL', '1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
-//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK', '1');				// Do not check style html tag into posted data
-//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU', '1');				// If there is no need to load and show top and left menu
-//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML', '1');				// If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX', '1');       	  	// Do not load ajax.lib.php library
-//if (! defined("NOLOGIN"))                  define("NOLOGIN", '1');					// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
-//if (! defined('NOIPCHECK'))                define('NOIPCHECK', '1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
-//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');					// Force lang to a particular value
-//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');	// Force authentication handler
-//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
-//if (! defined("FORCECSP"))                 define('FORCECSP', 'none');				// Disable all Content Security Policies
-//if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
-//if (! defined('NOBROWSERNOTIF'))     		 define('NOBROWSERNOTIF', '1');				// Disable browser notification
-
 // Load Dolibarr environment
-$res = 0;
-// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
-if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
-	$res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
-}
-// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
-$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
-while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) {
-	$i--; $j--;
-}
-if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) {
-	$res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
-}
-if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) {
-	$res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
-}
-// Try main.inc.php using relative path
-if (!$res && file_exists("../main.inc.php")) {
-	$res = @include "../main.inc.php";
-}
-if (!$res && file_exists("../../main.inc.php")) {
-	$res = @include "../../main.inc.php";
-}
-if (!$res && file_exists("../../../main.inc.php")) {
-	$res = @include "../../../main.inc.php";
-}
-if (!$res) {
-	die("Include of main fails");
-}
+require '../main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 
 // load knowledgemanagement libraries
-require_once __DIR__.'/class/knowledgerecord.class.php';
+require_once DOL_DOCUMENT_ROOT.'/knowledgemanagement/class/knowledgerecord.class.php';
 
 // for other modules
 //dol_include_once('/othermodule/class/otherobject.class.php');
diff --git a/htdocs/knowledgemanagement/knowledgerecord_note.php b/htdocs/knowledgemanagement/knowledgerecord_note.php
index 31c15ff2064..bcf9fb9b801 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_note.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_note.php
@@ -22,60 +22,11 @@
  *  \brief      Tab for notes on KnowledgeRecord
  */
 
-//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB', '1');				// Do not create database handler $db
-//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER', '1');				// Do not load object $user
-//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC', '1');				// Do not load object $mysoc
-//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN', '1');				// Do not load object $langs
-//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION', '1');		// Do not check injection attack on GET parameters
-//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION', '1');		// Do not check injection attack on POST parameters
-//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK', '1');				// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
-//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL', '1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
-//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK', '1');				// Do not check style html tag into posted data
-//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU', '1');				// If there is no need to load and show top and left menu
-//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML', '1');				// If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX', '1');       	  	// Do not load ajax.lib.php library
-//if (! defined("NOLOGIN"))                  define("NOLOGIN", '1');					// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
-//if (! defined('NOIPCHECK'))                define('NOIPCHECK', '1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
-//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');					// Force lang to a particular value
-//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');	// Force authentication handler
-//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
-//if (! defined("FORCECSP"))                 define('FORCECSP', 'none');				// Disable all Content Security Policies
-//if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
-//if (! defined('NOBROWSERNOTIF'))     		 define('NOBROWSERNOTIF', '1');				// Disable browser notification
-
 // Load Dolibarr environment
-$res = 0;
-// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
-if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
-	$res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
-}
-// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
-$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
-while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) {
-	$i--; $j--;
-}
-if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) {
-	$res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
-}
-if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) {
-	$res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
-}
-// Try main.inc.php using relative path
-if (!$res && file_exists("../main.inc.php")) {
-	$res = @include "../main.inc.php";
-}
-if (!$res && file_exists("../../main.inc.php")) {
-	$res = @include "../../main.inc.php";
-}
-if (!$res && file_exists("../../../main.inc.php")) {
-	$res = @include "../../../main.inc.php";
-}
-if (!$res) {
-	die("Include of main fails");
-}
+require '../main.inc.php';
 
-dol_include_once('/knowledgemanagement/class/knowledgerecord.class.php');
-dol_include_once('/knowledgemanagement/lib/knowledgemanagement_knowledgerecord.lib.php');
+require_once DOL_DOCUMENT_ROOT.'/knowledgemanagement/class/knowledgerecord.class.php';
+require_once DOL_DOCUMENT_ROOT.'/knowledgemanagement/lib/knowledgemanagement_knowledgerecord.lib.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array("knowledgemanagement", "companies"));
diff --git a/htdocs/knowledgemanagement/lib/knowledgemanagement.lib.php b/htdocs/knowledgemanagement/lib/knowledgemanagement.lib.php
index ba81dd49057..0b07e7b46e8 100644
--- a/htdocs/knowledgemanagement/lib/knowledgemanagement.lib.php
+++ b/htdocs/knowledgemanagement/lib/knowledgemanagement.lib.php
@@ -35,18 +35,18 @@ function knowledgemanagementAdminPrepareHead()
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = dol_buildpath("/admin/knowledgemanagement.php", 1);
+	$head[$h][0] = DOL_URL_ROOT.'/admin/knowledgemanagement.php';
 	$head[$h][1] = $langs->trans("Setup");
 	$head[$h][2] = 'setup';
 	$h++;
 
 
-	$head[$h][0] = dol_buildpath("admin/knowledgerecord_extrafields.php", 1);
+	$head[$h][0] = DOL_URL_ROOT.'/admin/knowledgerecord_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFields");
 	$head[$h][2] = 'extra';
 	$h++;
 
-	/*$head[$h][0] = dol_buildpath("/knowledgemanagement/admin/about.php", 1);
+	/*$head[$h][0] = DOL_URL_ROOT.'/knowledgemanagement/admin/about.php';
 	$head[$h][1] = $langs->trans("About");
 	$head[$h][2] = 'about';
 	$h++;*/
diff --git a/htdocs/knowledgemanagement/lib/knowledgemanagement_knowledgerecord.lib.php b/htdocs/knowledgemanagement/lib/knowledgemanagement_knowledgerecord.lib.php
index 1da21a3e413..e70b4654d19 100644
--- a/htdocs/knowledgemanagement/lib/knowledgemanagement_knowledgerecord.lib.php
+++ b/htdocs/knowledgemanagement/lib/knowledgemanagement_knowledgerecord.lib.php
@@ -16,7 +16,7 @@
  */
 
 /**
- * \file    lib/knowledgemanagement_knowledgerecord.lib.php
+ * \file    htdocs/knowledgemanagementlib/knowledgemanagement_knowledgerecord.lib.php
  * \ingroup knowledgemanagement
  * \brief   Library files with common functions for KnowledgeRecord
  */
@@ -36,7 +36,7 @@ function knowledgerecordPrepareHead($object)
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = dol_buildpath("/knowledgemanagement/knowledgerecord_card.php", 1).'?id='.$object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/knowledgemanagement/knowledgerecord_card.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("KnowledgeRecord");
 	$head[$h][2] = 'card';
 	$h++;
@@ -49,7 +49,7 @@ function knowledgerecordPrepareHead($object)
 		if (!empty($object->note_public)) {
 			$nbNote++;
 		}
-		$head[$h][0] = dol_buildpath('/knowledgemanagement/knowledgerecord_note.php', 1).'?id='.$object->id;
+		$head[$h][0] = DOL_URL_ROOT.'/knowledgemanagement/knowledgerecord_note.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('Notes');
 		if ($nbNote > 0) {
 			$head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.$nbNote.'</span>' : '');
@@ -63,7 +63,7 @@ function knowledgerecordPrepareHead($object)
 	$upload_dir = $conf->knowledgemanagement->dir_output."/knowledgerecord/".dol_sanitizeFileName($object->ref);
 	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
 	$nbLinks = Link::count($db, $object->element, $object->id);
-	$head[$h][0] = dol_buildpath("/knowledgemanagement/knowledgerecord_document.php", 1).'?id='.$object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/knowledgemanagement/knowledgerecord_document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
 	if (($nbFiles + $nbLinks) > 0) {
 		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
@@ -71,7 +71,7 @@ function knowledgerecordPrepareHead($object)
 	$head[$h][2] = 'document';
 	$h++;
 
-	$head[$h][0] = dol_buildpath("/knowledgemanagement/knowledgerecord_agenda.php", 1).'?id='.$object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/knowledgemanagement/knowledgerecord_agenda.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Events");
 	$head[$h][2] = 'agenda';
 	$h++;
diff --git a/htdocs/partnership/class/partnership.class.php b/htdocs/partnership/class/partnership.class.php
index f33a19f312e..78eb60a3ab3 100644
--- a/htdocs/partnership/class/partnership.class.php
+++ b/htdocs/partnership/class/partnership.class.php
@@ -197,7 +197,7 @@ class Partnership extends CommonObject
 			'reason_decline_or_cancel' => array('type'=>'text', 'label'=>'ReasonDeclineOrCancel', 'enabled'=>'1', 'position'=>64, 'notnull'=>0, 'visible'=>-2,),
 		);
 
-		if ($conf->global->PARTNERSHIP_IS_MANAGED_FOR == 'member') {
+		if (!empty($conf->global->PARTNERSHIP_IS_MANAGED_FOR) && $conf->global->PARTNERSHIP_IS_MANAGED_FOR == 'member') {
 			$this->fields['fk_member'] = array('type'=>'integer:Adherent:adherents/class/adherent.class.php:1', 'label'=>'Member', 'enabled'=>'1', 'position'=>50, 'notnull'=>-1, 'visible'=>1, 'index'=>1, 'picto'=>'member');
 		} else {
 			$this->fields['fk_soc'] = array('type'=>'integer:Societe:societe/class/societe.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'ThirdParty', 'enabled'=>'1', 'position'=>50, 'notnull'=>-1, 'visible'=>1, 'index'=>1, 'picto'=>'societe');

From a06fb441d300617b3f9c2a7a24c0b8bf5335f835 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sun, 6 Jun 2021 21:40:47 +0200
Subject: [PATCH 0452/1497] clean code

---
 .../knowledgemanagementindex.php               | 18 +++++++-----------
 .../knowledgerecord_note.php                   |  6 +++---
 .../lib/knowledgemanagement.lib.php            |  2 +-
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/htdocs/knowledgemanagement/knowledgemanagementindex.php b/htdocs/knowledgemanagement/knowledgemanagementindex.php
index f4fc767e9d5..8add69ae86d 100644
--- a/htdocs/knowledgemanagement/knowledgemanagementindex.php
+++ b/htdocs/knowledgemanagement/knowledgemanagementindex.php
@@ -19,7 +19,7 @@
  */
 
 /**
- *	\file       knowledgemanagement/knowledgemanagementindex.php
+ *	\file       htdocs/knowledgemanagement/knowledgemanagementindex.php
  *	\ingroup    knowledgemanagement
  *	\brief      Home page of knowledgemanagement top menu
  */
@@ -148,13 +148,12 @@ END MODULEBUILDER DRAFT MYOBJECT */
 print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 
-$NBMAX = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
-$max = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
+$NBMAX = (empty($conf->global->MAIN_SIZE_SHORTLIST_LIMIT) ? 25 : $conf->global->MAIN_SIZE_SHORTLIST_LIMIT);
+$max = $NBMAX;
 
 /* BEGIN MODULEBUILDER LASTMODIFIED MYOBJECT
 // Last modified myobject
-if (! empty($conf->knowledgemanagement->enabled) && $user->rights->knowledgemanagement->read)
-{
+if (! empty($conf->knowledgemanagement->enabled) && $user->rights->knowledgemanagement->read) {
 	$sql = "SELECT s.rowid, s.ref, s.label, s.date_creation, s.tms";
 	$sql.= " FROM ".MAIN_DB_PREFIX."knowledgemanagement_myobject as s";
 	//if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -165,8 +164,7 @@ if (! empty($conf->knowledgemanagement->enabled) && $user->rights->knowledgemana
 	$sql .= $db->plimit($max, 0);
 
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$num = $db->num_rows($resql);
 		$i = 0;
 
@@ -177,10 +175,8 @@ if (! empty($conf->knowledgemanagement->enabled) && $user->rights->knowledgemana
 		print '</th>';
 		print '<th class="right">'.$langs->trans("DateModificationShort").'</th>';
 		print '</tr>';
-		if ($num)
-		{
-			while ($i < $num)
-			{
+		if ($num) {
+			while ($i < $num) {
 				$objp = $db->fetch_object($resql);
 
 				$myobjectstatic->id=$objp->rowid;
diff --git a/htdocs/knowledgemanagement/knowledgerecord_note.php b/htdocs/knowledgemanagement/knowledgerecord_note.php
index bcf9fb9b801..a6a9974a9c8 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_note.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_note.php
@@ -17,7 +17,7 @@
  */
 
 /**
- *  \file       knowledgerecord_note.php
+ *  \file       htdocs/knowledgemanagement/knowledgerecord_note.php
  *  \ingroup    knowledgemanagement
  *  \brief      Tab for notes on KnowledgeRecord
  */
@@ -33,9 +33,9 @@ $langs->loadLangs(array("knowledgemanagement", "companies"));
 
 // Get parameters
 $id = GETPOST('id', 'int');
-$ref        = GETPOST('ref', 'alpha');
+$ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
-$cancel     = GETPOST('cancel', 'aZ09');
+$cancel = GETPOST('cancel', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
 
 // Initialize technical objects
diff --git a/htdocs/knowledgemanagement/lib/knowledgemanagement.lib.php b/htdocs/knowledgemanagement/lib/knowledgemanagement.lib.php
index 0b07e7b46e8..12db6245087 100644
--- a/htdocs/knowledgemanagement/lib/knowledgemanagement.lib.php
+++ b/htdocs/knowledgemanagement/lib/knowledgemanagement.lib.php
@@ -16,7 +16,7 @@
  */
 
 /**
- * \file    knowledgemanagement/lib/knowledgemanagement.lib.php
+ * \file    htdocs/knowledgemanagement/lib/knowledgemanagement.lib.php
  * \ingroup knowledgemanagement
  * \brief   Library files with common functions for KnowledgeManagement
  */

From a63d3364b4bdd72b40c0fbe5739747d4b18d2cc9 Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Sun, 6 Jun 2021 22:51:27 +0200
Subject: [PATCH 0453/1497] Fix links in box last MO

---
 htdocs/core/boxes/box_mos.php | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/htdocs/core/boxes/box_mos.php b/htdocs/core/boxes/box_mos.php
index 43d1cd411e4..d7f7a8f72ae 100644
--- a/htdocs/core/boxes/box_mos.php
+++ b/htdocs/core/boxes/box_mos.php
@@ -86,12 +86,15 @@ class box_mos extends ModeleBoxes
 
 		if ($user->rights->mrp->read) {
 			$sql = "SELECT p.ref as product_ref";
+			$sql .= ", p.rowid as productid";
+			$sql .= ", p.tosell";
+			$sql .= ", p.tobuy";
+			$sql .= ", p.tobatch";
 			$sql .= ", c.rowid";
 			$sql .= ", c.date_creation";
 			$sql .= ", c.tms";
 			$sql .= ", c.ref";
 			$sql .= ", c.status";
-			//$sql.= ", c.fk_user_valid";
 			$sql .= " FROM ".MAIN_DB_PREFIX."product as p";
 			$sql .= ", ".MAIN_DB_PREFIX."mrp_mo as c";
 			$sql .= " WHERE c.fk_product = p.rowid";
@@ -110,9 +113,12 @@ class box_mos extends ModeleBoxes
 					$datem = $this->db->jdate($objp->tms);
 					$mostatic->id = $objp->rowid;
 					$mostatic->ref = $objp->ref;
-					$mostatic->id = $objp->socid;
 					$mostatic->status = $objp->status;
+					$productstatic->id = $objp->productid;
 					$productstatic->ref = $objp->product_ref;
+					$productstatic->status = $objp->tosell;
+					$productstatic->status_buy = $objp->tobuy;
+					$productstatic->status_batch = $objp->tobatch;
 
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="nowraponall"',
@@ -126,17 +132,6 @@ class box_mos extends ModeleBoxes
 						'asis' => 1,
 					);
 
-					if (!empty($conf->global->MRP_BOX_LAST_MOS_SHOW_VALIDATE_USER)) {
-						if ($objp->fk_user_valid > 0) {
-							$userstatic->fetch($objp->fk_user_valid);
-						}
-						$this->info_box_contents[$line][] = array(
-							'td' => 'class="right"',
-							'text' => (($objp->fk_user_valid > 0) ? $userstatic->getNomUrl(1) : ''),
-							'asis' => 1,
-						);
-					}
-
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="center nowraponall"',
 						'text' => dol_print_date($datem, 'day', 'tzuserrel'),

From 242f8b2544833f8d8d70ab6dd300782511717e21 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 7 Jun 2021 01:23:34 +0200
Subject: [PATCH 0454/1497] Debug v14

---
 htdocs/core/boxes/box_graph_nb_ticket_last_x_days.php | 5 +++--
 htdocs/core/boxes/box_graph_new_vs_close_ticket.php   | 2 +-
 htdocs/core/boxes/box_graph_ticket_by_severity.php    | 9 +++++----
 htdocs/langs/en_US/ticket.lang                        | 2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/boxes/box_graph_nb_ticket_last_x_days.php b/htdocs/core/boxes/box_graph_nb_ticket_last_x_days.php
index 18ce00d0af3..baa822dcf29 100644
--- a/htdocs/core/boxes/box_graph_nb_ticket_last_x_days.php
+++ b/htdocs/core/boxes/box_graph_nb_ticket_last_x_days.php
@@ -168,8 +168,9 @@ class box_graph_nb_ticket_last_x_days extends ModeleBoxes
 					$totalnb += $value['data'];
 				}
 				$px1->SetData($data);
-				$px1->setShowLegend(2);
-				$px1->SetType(array('bar'));
+				//$px1->setShowLegend(2);
+				$px1->setShowLegend(0);
+				$px1->SetType(array('bars'));
 				$px1->SetLegend(array($langs->trans('BoxNumberOfTicketByDay')));
 				$px1->SetMaxValue($px1->GetCeilMaxValue());
 				$px1->SetHeight(192);
diff --git a/htdocs/core/boxes/box_graph_new_vs_close_ticket.php b/htdocs/core/boxes/box_graph_new_vs_close_ticket.php
index bd835d6cc07..5b17c335f3f 100644
--- a/htdocs/core/boxes/box_graph_new_vs_close_ticket.php
+++ b/htdocs/core/boxes/box_graph_new_vs_close_ticket.php
@@ -149,7 +149,7 @@ class box_graph_new_vs_close_ticket extends ModeleBoxes
 				}
 				$stringtoprint .= '</div>';
 				$this->info_box_contents[][]=array(
-					'td' => 'center',
+					'td' => 'class="center"',
 					'text' => $stringtoprint
 				);
 			} else {
diff --git a/htdocs/core/boxes/box_graph_ticket_by_severity.php b/htdocs/core/boxes/box_graph_ticket_by_severity.php
index ce769da4752..787e9cebb33 100644
--- a/htdocs/core/boxes/box_graph_ticket_by_severity.php
+++ b/htdocs/core/boxes/box_graph_ticket_by_severity.php
@@ -30,7 +30,6 @@ require_once DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php";
  */
 class box_graph_ticket_by_severity extends ModeleBoxes
 {
-
 	public $boxcode = "box_ticket_by_severity";
 	public $boximg = "ticket";
 	public $boxlabel;
@@ -168,16 +167,18 @@ class box_graph_ticket_by_severity extends ModeleBoxes
 				$mesg = $px1->isGraphKo();
 				$totalnb = 0;
 				if (!$mesg) {
-					$px1->SetDataColor(array_values($colorseriesstat));
+					//$px1->SetDataColor(array_values($colorseriesstat));
 					$data = array();
 					$legend = array();
 					foreach ($dataseries as $value) {
 						$data[] = array($value['label'], $value['data']);
 						$totalnb += $value['data'];
 					}
+
 					$px1->SetData($data);
-					$px1->setShowLegend(2);
-					$px1->SetType(array('pie'));
+					//$px1->setShowLegend(2);
+					$px1->setShowLegend(0);
+					$px1->SetType(array('bars'));
 					$px1->SetLegend($legend);
 					$px1->SetMaxValue($px1->GetCeilMaxValue());
 					//$px1->SetHeight($HEIGHT);
diff --git a/htdocs/langs/en_US/ticket.lang b/htdocs/langs/en_US/ticket.lang
index 50fa8c970ae..0f87504a0a5 100644
--- a/htdocs/langs/en_US/ticket.lang
+++ b/htdocs/langs/en_US/ticket.lang
@@ -304,7 +304,7 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
-BoxTicketType=Number of open tickets by type
+BoxTicketType=Distribution of open tickets by type
 BoxTicketSeverity=Number of open tickets by severity
 BoxNoTicketSeverity=No tickets opened
 BoxTicketLastXDays=Number of new tickets by days the last %s days

From d6cbb9007ff6234c2f757c46724258b961c3ad17 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 7 Jun 2021 01:43:24 +0200
Subject: [PATCH 0455/1497] Debug ticket form to add a local file

---
 htdocs/core/class/html.formticket.class.php | 10 ++++++----
 htdocs/core/lib/functions.lib.php           |  3 ++-
 htdocs/public/ticket/view.php               | 11 +++++++++--
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index b10ac80416f..f4e076640c4 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -1099,6 +1099,8 @@ class FormTicket
 			print '</td></tr>';
 		}
 
+		$uselocalbrowser = false;
+
 		// Intro
 		// External users can't send message email
 		if ($user->rights->ticket->write && !$user->socid) {
@@ -1109,15 +1111,15 @@ class FormTicket
 
 			print '</td><td>';
 			include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-			$uselocalbrowser = true;
 
-			$doleditor = new DolEditor('mail_intro', $mail_intro, '100%', 90, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_2, 70);
+			$doleditor = new DolEditor('mail_intro', $mail_intro, '100%', 90, 'dolibarr_details', '', false, $uselocalbrowser, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_2, 70);
 
 			$doleditor->Create();
 			print '</td></tr>';
 		}
 
 		// MESSAGE
+
 		$defaultmessage = "";
 		if (is_object($arraydefaultmessage) && $arraydefaultmessage->content) {
 			$defaultmessage = $arraydefaultmessage->content;
@@ -1147,7 +1149,7 @@ class FormTicket
 		//$toolbarname = 'dolibarr_details';
 		$toolbarname = 'dolibarr_notes';
 		include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-		$doleditor = new DolEditor('message', $defaultmessage, '100%', 200, $toolbarname, '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_5, 70);
+		$doleditor = new DolEditor('message', $defaultmessage, '100%', 200, $toolbarname, '', false, $uselocalbrowser, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_5, 70);
 		$doleditor->Create();
 		print '</td></tr>';
 
@@ -1159,7 +1161,7 @@ class FormTicket
 			print $form->textwithpicto('', $langs->trans("TicketMessageMailSignatureHelp"), 1, 'help');
 			print '</td><td>';
 			include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-			$doleditor = new DolEditor('mail_signature', $mail_signature, '100%', 150, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_2, 70);
+			$doleditor = new DolEditor('mail_signature', $mail_signature, '100%', 150, 'dolibarr_details', '', false, $uselocalbrowser, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_2, 70);
 			$doleditor->Create();
 			print '</td></tr>';
 		}
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index b018b4d2fb0..165d9c503a4 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3499,7 +3499,8 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'accountancy', 'account', 'accountline', 'action', 'add', 'address', 'angle-double-down', 'angle-double-up', 'asset',
 				'bank_account', 'barcode', 'bank', 'bill', 'billa', 'billr', 'billd', 'bookmark', 'bom', 'bug', 'building',
 				'calendar', 'calendarmonth', 'calendarweek', 'calendarday', 'calendarperuser', 'calendarpertype',
-				'cash-register', 'category', 'chart', 'check', 'clock', 'close_title', 'cog', 'collab', 'company', 'contact', 'country', 'contract', 'cron', 'cubes', 'multicurrency',
+				'cash-register', 'category', 'chart', 'check', 'clock', 'close_title', 'cog', 'collab', 'company', 'contact', 'country', 'contract', 'conversation', 'cron', 'cubes',
+				'multicurrency',
 				'delete', 'dolly', 'dollyrevert', 'donation', 'download', 'dynamicprice',
 				'edit', 'ellipsis-h', 'email', 'eraser', 'establishment', 'expensereport', 'external-link-alt', 'external-link-square-alt',
 				'filter', 'file-code', 'file-export', 'file-import', 'file-upload', 'autofill', 'folder', 'folder-open', 'folder-plus',
diff --git a/htdocs/public/ticket/view.php b/htdocs/public/ticket/view.php
index 2f70ded9914..3fec075160b 100644
--- a/htdocs/public/ticket/view.php
+++ b/htdocs/public/ticket/view.php
@@ -234,6 +234,7 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
 
 		// Ref
 		print '<tr><td class="titlefield">'.$langs->trans("Ref").'</td><td>';
+		print img_picto('', 'ticket', 'class="pictofixedwidth"');
 		print dol_escape_htmltag($object->dao->ref);
 		print '</td></tr>';
 
@@ -244,7 +245,9 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
 
 		// Subject
 		print '<tr><td>'.$langs->trans("Subject").'</td><td>';
+		print '<span class="bold">';
 		print dol_escape_htmltag($object->dao->subject);
+		print '</span>';
 		print '</td></tr>';
 
 		// Statut
@@ -259,6 +262,7 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
 
 		// Category
 		print '<tr><td>'.$langs->trans("Category").'</td><td>';
+		print img_picto('', 'category', 'class="pictofixedwidth"');
 		print dol_escape_htmltag($object->dao->category_label);
 		print '</td></tr>';
 
@@ -278,8 +282,10 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
 			$langs->load("users");
 			$fuser = new User($db);
 			$fuser->fetch($object->dao->fk_user_create);
+			print img_picto('', 'user', 'class="pictofixedwidth"');
 			print $fuser->getFullName($langs);
 		} else {
+			print img_picto('', 'email', 'class="pictofixedwidth"');
 			print dol_escape_htmltag($object->dao->origin_email);
 		}
 
@@ -304,6 +310,7 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
 		if ($object->dao->fk_user_assign > 0) {
 			$fuser = new User($db);
 			$fuser->fetch($object->dao->fk_user_assign);
+			print img_picto('', 'user', 'class="pictofixedwidth"');
 			print $fuser->getFullName($langs, 1);
 		}
 		print '</td></tr>';
@@ -320,7 +327,7 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
 		print '<div style="clear: both; margin-top: 1.5em;"></div>';
 
 		if ($action == 'presend') {
-			print load_fiche_titre($langs->trans('TicketAddMessage'), '', 'messages@ticket');
+			print load_fiche_titre($langs->trans('TicketAddMessage'), '', 'conversation');
 
 			$formticket = new FormTicket($db);
 
@@ -364,7 +371,7 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
 		}
 
 		// Message list
-		print load_fiche_titre($langs->trans('TicketMessagesList'), '', 'object_conversation');
+		print load_fiche_titre($langs->trans('TicketMessagesList'), '', 'conversation');
 		$object->viewTicketMessages(false, true, $object->dao);
 	} else {
 		print '<div class="error">Not Allowed<br><a href="'.$_SERVER['PHP_SELF'].'?track_id='.$object->dao->track_id.'" rel="nofollow noopener">'.$langs->trans('Back').'</a></div>';

From beca3c8ad30bc307c228e8a746bcfdc0c774cd95 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 7 Jun 2021 01:51:56 +0200
Subject: [PATCH 0456/1497] Debug v14

---
 htdocs/public/ticket/list.php | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/htdocs/public/ticket/list.php b/htdocs/public/ticket/list.php
index 1e1eb08dd5e..3c5dfffba17 100644
--- a/htdocs/public/ticket/list.php
+++ b/htdocs/public/ticket/list.php
@@ -561,14 +561,19 @@ if ($action == "view_ticketlist") {
 					// Ref
 					if (!empty($arrayfields['t.ref']['checked'])) {
 						print '<td class="nowraponall">';
+						print '<a rel="nofollow" href="javascript:viewticket(\''.dol_escape_js($obj->track_id).'\',\''.dol_escape_js($_SESSION['email_customer']).'\');">';
+						print img_picto('', 'ticket', 'class="paddingrightonly"');
 						print $obj->ref;
+						print '</a>';
 						print '</td>';
 					}
 
 					// Subject
 					if (!empty($arrayfields['t.subject']['checked'])) {
 						print '<td>';
-						print '<a rel="nofollow" href="javascript:viewticket(\''.$obj->track_id.'\',\''.$_SESSION['email_customer'].'\');">'.$obj->subject.'</a>';
+						print '<a rel="nofollow" href="javascript:viewticket(\''.dol_escape_js($obj->track_id).'\',\''.dol_escape_js($_SESSION['email_customer']).'\');">';
+						print $obj->subject;
+						print '</a>';
 						print '</td>';
 					}
 
@@ -602,13 +607,14 @@ if ($action == "view_ticketlist") {
 
 					// Message author
 					if (!empty($arrayfields['t.fk_user_create']['checked'])) {
-						print '<td>';
+						print '<td title="'.dol_escape_htmltag($obj->origin_email).'">';
 						if ($obj->fk_user_create > 0) {
 							$user_create->firstname = (!empty($obj->user_create_firstname) ? $obj->user_create_firstname : '');
 							$user_create->name = (!empty($obj->user_create_lastname) ? $obj->user_create_lastname : '');
 							$user_create->id = (!empty($obj->fk_user_create) ? $obj->fk_user_create : '');
 							print $user_create->getFullName($langs);
 						} else {
+							print img_picto('', 'email', 'class="paddingrightonly"');
 							print $langs->trans('Email');
 						}
 						print '</td>';
@@ -617,10 +623,11 @@ if ($action == "view_ticketlist") {
 					// Assigned author
 					if (!empty($arrayfields['t.fk_user_assign']['checked'])) {
 						print '<td>';
-						if ($obj->fk_user_assig > 0) {
+						if ($obj->fk_user_assign > 0) {
 							$user_assign->firstname = (!empty($obj->user_assign_firstname) ? $obj->user_assign_firstname : '');
 							$user_assign->lastname = (!empty($obj->user_assign_lastname) ? $obj->user_assign_lastname : '');
 							$user_assign->id = (!empty($obj->fk_user_assign) ? $obj->fk_user_assign : '');
+							print img_picto('', 'user', 'class="paddingrightonly"');
 							print $user_assign->getFullName($langs);
 						}
 						print '</td>';

From 2dbf9537b3be79350d0e2855230270b24c0de505 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 7 Jun 2021 08:59:47 +0200
Subject: [PATCH 0457/1497] Update llx_c_chargesociales.sql

---
 .../mysql/data/llx_c_chargesociales.sql       | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_c_chargesociales.sql b/htdocs/install/mysql/data/llx_c_chargesociales.sql
index a7e12df0d31..afc8afea2f8 100644
--- a/htdocs/install/mysql/data/llx_c_chargesociales.sql
+++ b/htdocs/install/mysql/data/llx_c_chargesociales.sql
@@ -50,20 +50,20 @@ insert into llx_c_chargesociales (id, libelle, deductible, active, code, fk_pays
 --
 -- Belgique
 --
-insert into llx_c_chargesociales (fk_pays, id, libelle, deductible, active, code) values ('2', 201, 'ONSS',						1,1,'TAXBEONSS');
-insert into llx_c_chargesociales (fk_pays, id, libelle, deductible, active, code) values ('2', 210, 'Precompte professionnel', 	1,1,'TAXBEPREPRO');
-insert into llx_c_chargesociales (fk_pays, id, libelle, deductible, active, code) values ('2', 220, 'Prime existence',    		1,1,'TAXBEPRIEXI');
-insert into llx_c_chargesociales (fk_pays, id, libelle, deductible, active, code) values ('2', 230, 'Precompte immobilier',      1,1,'TAXBEPREIMMO');
+insert into llx_c_chargesociales (fk_pays, id, libelle, deductible, active, code) values (2, 201, 'ONSS',						1,1,'TAXBEONSS');
+insert into llx_c_chargesociales (fk_pays, id, libelle, deductible, active, code) values (2, 210, 'Precompte professionnel', 	1,1,'TAXBEPREPRO');
+insert into llx_c_chargesociales (fk_pays, id, libelle, deductible, active, code) values (2, 220, 'Prime existence',    		1,1,'TAXBEPRIEXI');
+insert into llx_c_chargesociales (fk_pays, id, libelle, deductible, active, code) values (2, 230, 'Precompte immobilier',      1,1,'TAXBEPREIMMO');
 
 --
 -- Austria
 --
-insert into llx_c_chargesociales (id, libelle, deductible, active, code, fk_pays) values (4101, 'Krankenversicherung',				1,1,'TAXATKV'   ,'41');
-insert into llx_c_chargesociales (id, libelle, deductible, active, code, fk_pays) values (4102, 'Unfallversicherung',				1,1,'TAXATUV'   ,'41');
-insert into llx_c_chargesociales (id, libelle, deductible, active, code, fk_pays) values (4103, 'Pensionsversicherung',				1,1,'TAXATPV'   ,'41');
-insert into llx_c_chargesociales (id, libelle, deductible, active, code, fk_pays) values (4104, 'Arbeitslosenversicherung',			1,1,'TAXATAV'   ,'41');
-insert into llx_c_chargesociales (id, libelle, deductible, active, code, fk_pays) values (4105, 'Insolvenzentgeltsicherungsfond',   1,1,'TAXATIESG' ,'41');
-insert into llx_c_chargesociales (id, libelle, deductible, active, code, fk_pays) values (4106, 'Wohnbauförderung',					1,1,'TAXATWF'   ,'41');
-insert into llx_c_chargesociales (id, libelle, deductible, active, code, fk_pays) values (4107, 'Arbeiterkammerumlage',				1,1,'TAXATAK'   ,'41');
-insert into llx_c_chargesociales (id, libelle, deductible, active, code, fk_pays) values (4108, 'Mitarbeitervorsorgekasse',			1,1,'TAXATMVK'  ,'41');
-insert into llx_c_chargesociales (id, libelle, deductible, active, code, fk_pays) values (4109, 'Familienlastenausgleichsfond',		1,1,'TAXATFLAF' ,'41');
+insert into llx_c_chargesociales (fk_pays, id, libelle, deductible, active, code) values (41, 4101, 'Krankenversicherung',				1,1,'TAXATKV');
+insert into llx_c_chargesociales (fk_pays, id, libelle, deductible, active, code) values (41, 4102, 'Unfallversicherung',				1,1,'TAXATUV');
+insert into llx_c_chargesociales (fk_pays, id, libelle, deductible, active, code) values (41, 4103, 'Pensionsversicherung',				1,1,'TAXATPV');
+insert into llx_c_chargesociales (fk_pays, id, libelle, deductible, active, code) values (41, 4104, 'Arbeitslosenversicherung',			1,1,'TAXATAV');
+insert into llx_c_chargesociales (fk_pays, id, libelle, deductible, active, code) values (41, 4105, 'Insolvenzentgeltsicherungsfond',   1,1,'TAXATIESG');
+insert into llx_c_chargesociales (fk_pays, id, libelle, deductible, active, code) values (41, 4106, 'Wohnbauförderung',					1,1,'TAXATWF');
+insert into llx_c_chargesociales (fk_pays, id, libelle, deductible, active, code) values (41, 4107, 'Arbeiterkammerumlage',				1,1,'TAXATAK');
+insert into llx_c_chargesociales (fk_pays, id, libelle, deductible, active, code) values (41, 4108, 'Mitarbeitervorsorgekasse',			1,1,'TAXATMVK');
+insert into llx_c_chargesociales (fk_pays, id, libelle, deductible, active, code) values (41, 4109, 'Familienlastenausgleichsfond',		1,1,'TAXATFLAF');

From e74c57167ee9971cebe6d55d2dd10ac4bf98a62c Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 7 Jun 2021 09:39:05 +0200
Subject: [PATCH 0458/1497] Update README.md

---
 README.md | 85 ++++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 56 insertions(+), 29 deletions(-)

diff --git a/README.md b/README.md
index 34162fd5682..736925bec72 100644
--- a/README.md
+++ b/README.md
@@ -97,41 +97,68 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
 
 ### Main application/modules (all optional)
 
-- Customers, Prospects (Leads) and/or Suppliers directory + Contacts
-- Members/Membership management 
-- Products and/or Services catalog
-- Commercial proposals management
-- Customer & Supplier Orders management
-- Invoices and payment management
-- Shipping management
-- Warehouse/Stock management/Inventory
-- Manufacturing Orders
-- Bank accounts management
-- Direct debit orders management (European SEPA)
-- Accounting management
-- Shared calendar/agenda (with ical and vcal export for third party tools integration)
-- Opportunities or Leads management
-- Projects & Tasks management
-- Ticket System
-- Contracts management
-- Interventions management
-- Employee's leave requests management
-- Expense reports
-- Recruitment management
-- Timesheets
-- Electronic Document Management (EDM)
-- Foundations members management
-- Point of Sale (POS)
-- … (around 100 modules available by default, 1000+ on the addon market place)
+- Third-Parties Management: Customers, Prospects (Leads) and/or Suppliers + Contacts 
+- Members/Membership/Foundation management 
+
+ Product Management 
+- Products and/or Services catalog 
+- Stock / Warehouse management + Inventory 
+- Barcodes 
+- Batches / Lots / Serials 
+- Product Variants 
+- Bill of Materials 
+- Manufacturing Orders 
+
+ Customer/Sales Management 
+- Customers/Prospects + Contacts management 
+- Opportunities or Leads management 
+- Commercial proposals management 
+- Customer Orders management 
+- Contracts/Subscription management 
+- Interventions management 
+- Ticket System 
+- Shipping management 
+- Customer Invoices/Credit notes and payment management 
+- Point of Sale (POS) 
+
+ Supplier/Purchase Management 
+- Suppliers/Vendors + Contacts 
+- Supplier (price) requests 
+- Purchase Order management 
+- Delivery/Receiption 
+- Supplier Invoices/credit notes and payment management 
+
+ Finance / Accounting 
+- Invoices / Payments 
+- Bank accounts management 
+- Direct debit orders management (European SEPA) 
+- Accounting management 
+- Donations management 
+- Loan management 
+- Margins 
+- Reports 
+
+ 
+- Shared calendar/agenda (with ical and vcal export for third party tools integration) 
+- Projects & Tasks management 
+- Ticket System 
+
+- Employee's leave requests management 
+- Expense reports 
+- Recruitment management 
+- Timesheets 
+
+- (around 100 modules available by default, 1000+ on the addon market place)
+
 
 ### Other application/modules
 
+- Electronic Document Management (EDM) 
 - Bookmarks management
-- Donations management
 - Reporting
 - Surveys
 - Data export/import
-- Barcodes support
+- Barcodes 
 - Margin calculations
 - LDAP connectivity
 - ClickToDial integration
@@ -139,7 +166,7 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
 - RSS integration
 - Skype integration
 - Payment platforms integration (PayPal, Stripe, Paybox...)
-- …
+- 
 
 ### Other general features
 

From 80af5e2216dd3a91ed20c9ca3e4a9c4a78600e4e Mon Sep 17 00:00:00 2001
From: Quentin VIAL-GOUTEYRON <quentin.vial-gouteyron@atm-consulting.fr>
Date: Mon, 7 Jun 2021 10:05:24 +0200
Subject: [PATCH 0459/1497] keep where but remove join

---
 htdocs/compta/stats/cabyprodserv.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/stats/cabyprodserv.php b/htdocs/compta/stats/cabyprodserv.php
index 7b8f1101004..fce5a9740a2 100644
--- a/htdocs/compta/stats/cabyprodserv.php
+++ b/htdocs/compta/stats/cabyprodserv.php
@@ -231,8 +231,6 @@ if ($modecompta == 'CREANCES-DETTES')
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON l.fk_product = p.rowid";
 	if ($selected_cat === -2) {	// Without any category
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON p.rowid = cp.fk_product";
-	} elseif ($selected_cat) { 	// Into a specific category
-		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON (cp.fk_product = p.rowid) INNER JOIN ".MAIN_DB_PREFIX."categorie as c ON (cp.fk_categorie = c.rowid)";
 	}
 	$sql .= " WHERE l.fk_facture = f.rowid";
 	$sql .= " AND f.fk_statut in (1,2)";
@@ -263,10 +261,13 @@ if ($modecompta == 'CREANCES-DETTES')
 			}
 		}
 
+		$sql .= " AND (p.rowid IN ";
+		$sql .= " (SELECT fk_product FROM ".MAIN_DB_PREFIX."categorie_product cp WHERE ";
 		$sql .= " AND ";
 
 		if ($subcat) $sql .= "cp.fk_categorie IN (".$listofcatsql.")";
 		else $sql .= "cp.fk_categorie = ".$selected_cat;
+		$sql .= "))";
 
 	}
 	if ($selected_soc > 0) $sql .= " AND soc.rowid=".$selected_soc;

From 4f6a5cf5f7694c9a9eb5c000a13b0c8c99b96484 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 7 Jun 2021 10:08:31 +0200
Subject: [PATCH 0460/1497] Debug v14

---
 htdocs/adherents/class/adherent.class.php | 40 +++++++++++++++++++----
 1 file changed, 34 insertions(+), 6 deletions(-)

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 18d8746cca7..b7852280ddf 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -260,9 +260,9 @@ class Adherent extends CommonObject
 
 	public $datefin;
 
-	// From member table
 
-	// Fields loaded by fetch_subscriptions()
+	// Fields loaded by fetch_subscriptions() from member table
+
 	public $first_subscription_date;
 
 	public $first_subscription_amount;
@@ -277,6 +277,12 @@ class Adherent extends CommonObject
 
 	public $subscriptions = array();
 
+
+	// Fields loaded by fetchPartnerships() from partnership table
+
+	public $partnerships = array();
+
+
 	/**
 	 * @var Adherent To contains a clone of this when we need to save old properties of object
 	 */
@@ -1439,11 +1445,12 @@ class Adherent extends CommonObject
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *	Function to get member subscriptions data
-	 *				first_subscription_date, first_subscription_date_start, first_subscription_date_end, first_subscription_amount
-	 *				last_subscription_date, last_subscription_date_start, last_subscription_date_end, last_subscription_amount
+	 *	Function to get member subscriptions data:
+	 *  subscriptions,
+	 *	first_subscription_date, first_subscription_date_start, first_subscription_date_end, first_subscription_amount
+	 *	last_subscription_date, last_subscription_date_start, last_subscription_date_end, last_subscription_amount
 	 *
-	 *	@return		int			<0 si KO, >0 si OK
+	 *	@return		int			<0 if KO, >0 if OK
 	 */
 	public function fetch_subscriptions()
 	{
@@ -1503,6 +1510,27 @@ class Adherent extends CommonObject
 	}
 
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Function to get partnerships array
+	 *
+	 *  @param		string		$mode		'member' or 'thirdparty'
+	 *	@return		int						<0 if KO, >0 if OK
+	 */
+	public function fetchPartnerships($mode)
+	{
+		// phpcs:enable
+		global $langs;
+
+		require_once DOL_DOCUMENT_ROOT.'/parntership/class/partnership.class.php';
+
+
+		$this->partnerships[] = array();
+
+		return 1;
+	}
+
+
 	/**
 	 *	Insert subscription into database and eventually add links to banks, mailman, etc...
 	 *

From 98aa374185cb8996d9a4194695f77db35cddbeeb Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Mon, 7 Jun 2021 08:10:05 +0000
Subject: [PATCH 0461/1497] Fixing style errors.

---
 htdocs/compta/stats/cabyprodserv.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/compta/stats/cabyprodserv.php b/htdocs/compta/stats/cabyprodserv.php
index fce5a9740a2..f7c215270d4 100644
--- a/htdocs/compta/stats/cabyprodserv.php
+++ b/htdocs/compta/stats/cabyprodserv.php
@@ -268,7 +268,6 @@ if ($modecompta == 'CREANCES-DETTES')
 		if ($subcat) $sql .= "cp.fk_categorie IN (".$listofcatsql.")";
 		else $sql .= "cp.fk_categorie = ".$selected_cat;
 		$sql .= "))";
-
 	}
 	if ($selected_soc > 0) $sql .= " AND soc.rowid=".$selected_soc;
 	$sql .= " AND f.entity IN (".getEntity('invoice').")";

From af913cd29f1412481858ca796508520bded4e414 Mon Sep 17 00:00:00 2001
From: Quentin VIAL-GOUTEYRON <quentin.vial-gouteyron@atm-consulting.fr>
Date: Mon, 7 Jun 2021 10:10:42 +0200
Subject: [PATCH 0462/1497] remove and

---
 htdocs/compta/stats/cabyprodserv.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/htdocs/compta/stats/cabyprodserv.php b/htdocs/compta/stats/cabyprodserv.php
index fce5a9740a2..da9927c2e20 100644
--- a/htdocs/compta/stats/cabyprodserv.php
+++ b/htdocs/compta/stats/cabyprodserv.php
@@ -263,8 +263,6 @@ if ($modecompta == 'CREANCES-DETTES')
 
 		$sql .= " AND (p.rowid IN ";
 		$sql .= " (SELECT fk_product FROM ".MAIN_DB_PREFIX."categorie_product cp WHERE ";
-		$sql .= " AND ";
-
 		if ($subcat) $sql .= "cp.fk_categorie IN (".$listofcatsql.")";
 		else $sql .= "cp.fk_categorie = ".$selected_cat;
 		$sql .= "))";

From 0144d6c0fdba1c38f9c60535cd6911b83c32ea73 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 7 Jun 2021 11:30:46 +0200
Subject: [PATCH 0463/1497] Inventory is now stable feature

---
 htdocs/core/menus/standard/eldy.lib.php | 28 ++++++++++++-------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 2232b3333dd..7f6121fb07d 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1598,21 +1598,19 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			}
 
 			// Inventory
-			if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
-				if (!empty($conf->stock->enabled)) {
-					$langs->load("stocks");
-					if (empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
-						$newmenu->add("/product/inventory/list.php?leftmenu=stock_inventories", $langs->trans("Inventories"), 0, $user->rights->stock->lire, '', $mainmenu, 'stock', 0, '', '', '', img_picto('', 'inventory', 'class="pictofixedwidth"'));
-						if ($usemenuhider || empty($leftmenu) || $leftmenu == "stock_inventories") {
-							$newmenu->add("/product/inventory/card.php?action=create&leftmenu=stock_inventories", $langs->trans("NewInventory"), 1, $user->rights->stock->creer);
-							$newmenu->add("/product/inventory/list.php?leftmenu=stock_inventories", $langs->trans("List"), 1, $user->rights->stock->lire);
-						}
-					} else {
-						$newmenu->add("/product/inventory/list.php?leftmenu=stock_inventories", $langs->trans("Inventories"), 0, $user->rights->stock->inventory_advance->read, '', $mainmenu, 'stock', 0, '', '', '', img_picto('', 'inventory', 'class="pictofixedwidth"'));
-						if ($usemenuhider || empty($leftmenu) || $leftmenu == "stock_inventories") {
-							$newmenu->add("/product/inventory/card.php?action=create&leftmenu=stock_inventories", $langs->trans("NewInventory"), 1, $user->rights->stock->inventory_advance->write);
-							$newmenu->add("/product/inventory/list.php?leftmenu=stock_inventories", $langs->trans("List"), 1, $user->rights->stock->inventory_advance->read);
-						}
+			if (!empty($conf->stock->enabled)) {
+				$langs->load("stocks");
+				if (empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
+					$newmenu->add("/product/inventory/list.php?leftmenu=stock_inventories", $langs->trans("Inventories"), 0, $user->rights->stock->lire, '', $mainmenu, 'stock', 0, '', '', '', img_picto('', 'inventory', 'class="pictofixedwidth"'));
+					if ($usemenuhider || empty($leftmenu) || $leftmenu == "stock_inventories") {
+						$newmenu->add("/product/inventory/card.php?action=create&leftmenu=stock_inventories", $langs->trans("NewInventory"), 1, $user->rights->stock->creer);
+						$newmenu->add("/product/inventory/list.php?leftmenu=stock_inventories", $langs->trans("List"), 1, $user->rights->stock->lire);
+					}
+				} else {
+					$newmenu->add("/product/inventory/list.php?leftmenu=stock_inventories", $langs->trans("Inventories"), 0, $user->rights->stock->inventory_advance->read, '', $mainmenu, 'stock', 0, '', '', '', img_picto('', 'inventory', 'class="pictofixedwidth"'));
+					if ($usemenuhider || empty($leftmenu) || $leftmenu == "stock_inventories") {
+						$newmenu->add("/product/inventory/card.php?action=create&leftmenu=stock_inventories", $langs->trans("NewInventory"), 1, $user->rights->stock->inventory_advance->write);
+						$newmenu->add("/product/inventory/list.php?leftmenu=stock_inventories", $langs->trans("List"), 1, $user->rights->stock->inventory_advance->read);
 					}
 				}
 			}

From cac63ddd3fcd64e39df0431c562cb78684be52ae Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 7 Jun 2021 12:16:11 +0200
Subject: [PATCH 0464/1497] Add missing translation

---
 htdocs/langs/en_US/languages.lang | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/langs/en_US/languages.lang b/htdocs/langs/en_US/languages.lang
index cbc94b4481c..598eec1fdca 100644
--- a/htdocs/langs/en_US/languages.lang
+++ b/htdocs/langs/en_US/languages.lang
@@ -3,6 +3,7 @@ Language_am_ET=Ethiopian
 Language_ar_AR=Arabic
 Language_ar_EG=Arabic (Egypt)
 Language_ar_SA=Arabic
+Language_ar_TN=Arabic (Tunisia)
 Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengali
 Language_bn_IN=Bengali (India)

From e64c27e1c308f1157f24442020aad31f22a2f111 Mon Sep 17 00:00:00 2001
From: Gauthier PC portable 024 <gauthier.verdol@atm-consulting.fr>
Date: Tue, 8 Jun 2021 10:27:33 +0200
Subject: [PATCH 0465/1497] FIX : need to add payment sum to getlibstatus
 function in object linked block

---
 htdocs/compta/facture/tpl/linkedobjectblock.tpl.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
index a02a0fc1682..1e18eb6bfeb 100644
--- a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
@@ -85,7 +85,7 @@ foreach ($linkedObjectBlock as $key => $objectlink)
     	}
 	}
     print '</td>';
-    print '<td class="linkedcol-statut right">'.$objectlink->getLibStatut(3).'</td>';
+    print '<td class="linkedcol-statut right">'.$objectlink->getLibStatut(3, $objectlink->getSommePaiement()).'</td>';
     print '<td class="linkedcol-action right"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key.'">'.img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink').'</a></td>';
     print "</tr>\n";
 }

From b1c3a7cf4864ff8568569c0f1926c2f6cd590c9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Tue, 8 Jun 2021 10:38:34 +0200
Subject: [PATCH 0466/1497] avoid fatal error

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

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 60e5d4eb52a..8f5ac173d7f 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -3208,7 +3208,7 @@ if ($action == 'create')
 				$facids = $facturestatic->list_qualified_avoir_invoices($soc->id);
 				if ($facids < 0)
 				{
-					dol_print_error($db, $facturestatic);
+					dol_print_error($db, $facturestatic->error, $facturestatic->errors);
 					exit;
 				}
 				$optionsav = "";
@@ -3656,7 +3656,7 @@ if ($action == 'create')
 
 	$result = $object->fetch($id, $ref);
 	if ($result <= 0) {
-		dol_print_error($db, $object->error);
+		dol_print_error($db, $object->error, $object->errors);
 		exit();
 	}
 

From 37433ffee7cfa54ba9d6e268e95a599635bf25c1 Mon Sep 17 00:00:00 2001
From: atm-greg <gregory.blemand@atm-consulting.fr>
Date: Tue, 8 Jun 2021 11:39:04 +0200
Subject: [PATCH 0467/1497] verify vat change to update multiprice

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

diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index dd56aa42318..27d39779338 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -349,6 +349,7 @@ if (empty($reshook))
 
 				$newprice = price2num($newprice, 'MU');
 				$newprice_min = price2num($val['price_min'], 'MU');
+				$newvattx = price2num($val['vat_tx'], 'MU');
 
 				if (!empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE) && $newprice_min < $maxpricesupplier) {
 					setEventMessages($langs->trans("MinimumPriceLimit", price($maxpricesupplier, 0, '', 1, - 1, - 1, 'auto')), null, 'errors');
@@ -356,11 +357,10 @@ if (empty($reshook))
 					break;
 				}
 
-				if ($object->multiprices[$key] != $newprice || $object->multiprices_min[$key] != $newprice_min || $object->multiprices_base_type[$key] != $val['price_base_type'])
+				if ($object->multiprices[$key] != $newprice || $object->multiprices_min[$key] != $newprice_min || $object->multiprices_base_type[$key] != $val['price_base_type'] || $object->multiprices_tva_tx[$key] != $newvattx)
        				$res = $object->updatePrice($newprice, $val['price_base_type'], $user, $val['vat_tx'], $newprice_min, $key, $val['npr'], $psq, 0, $val['localtaxes_array'], $val['default_vat_code']);
 				else $res = 0;
 
-
 				if ($res < 0) {
 					$error++;
 					setEventMessages($object->error, $object->errors, 'errors');

From 7e95c5ec207ee1c07349dbdb8e846671c4837f28 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 8 Jun 2021 11:40:50 +0200
Subject: [PATCH 0468/1497] Clean code

---
 htdocs/product/card.php             | 87 +++++++++++++++--------------
 htdocs/product/composition/card.php | 12 +++-
 htdocs/product/stock/product.php    | 12 +++-
 htdocs/variants/combinations.php    | 19 +++++--
 4 files changed, 79 insertions(+), 51 deletions(-)

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 61568a5510a..1b732cd721e 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1974,14 +1974,14 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print '<div class="fichehalfleft">';
 
 			print '<div class="underbanner clearboth"></div>';
-			print '<table class="border tableforfield" width="100%">';
+			print '<table class="border tableforfield centpercent">';
 
 			// Type
 			if (!empty($conf->product->enabled) && !empty($conf->service->enabled)) {
 				$typeformat = 'select;0:'.$langs->trans("Product").',1:'.$langs->trans("Service");
 				print '<tr><td class="titlefield">';
 				print (empty($conf->global->PRODUCT_DENY_CHANGE_PRODUCT_TYPE)) ? $form->editfieldkey("Type", 'fk_product_type', $object->type, $object, $usercancreate, $typeformat) : $langs->trans('Type');
-				print '</td><td colspan="2">';
+				print '</td><td>';
 				print $form->editfieldval("Type", 'fk_product_type', $object->type, $object, $usercancreate, $typeformat);
 				print '</td></tr>';
 			}
@@ -1996,7 +1996,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 					print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editbarcodetype&amp;id='.$object->id.'">'.img_edit($langs->trans('Edit'), 1).'</a></td>';
 				}
 				print '</tr></table>';
-				print '</td><td colspan="2">';
+				print '</td><td>';
 				if ($action == 'editbarcodetype' || $action == 'editbarcode') {
 					require_once DOL_DOCUMENT_ROOT.'/core/class/html.formbarcode.class.php';
 					$formbarcode = new FormBarCode($db);
@@ -2022,7 +2022,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 					print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editbarcode&amp;id='.$object->id.'">'.img_edit($langs->trans('Edit'), 1).'</a></td>';
 				}
 				print '</tr></table>';
-				print '</td><td colspan="2">';
+				print '</td><td>';
 				if ($action == 'editbarcode') {
 					$tmpcode = GETPOSTISSET('barcode') ? GETPOST('barcode') : $object->barcode;
 					if (empty($tmpcode) && !empty($modBarCodeProduct->code_auto)) {
@@ -2042,10 +2042,25 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				print '</td></tr>'."\n";
 			}
 
+			// Batch number management (to batch)
+			if (!empty($conf->productbatch->enabled)) {
+				if ($object->isProduct() || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
+					print '<tr><td>'.$langs->trans("ManageLotSerial").'</td><td>';
+					print $object->getLibStatut(0, 2);
+					print '</td></tr>';
+					if ((($object->status_batch == '1' &&$conf->global->PRODUCTBATCH_LOT_USE_PRODUCT_MASKS && $conf->global->PRODUCTBATCH_LOT_ADDON == 'mod_lot_advanced')
+						|| ($object->status_batch == '2' && $conf->global->PRODUCTBATCH_SN_ADDON == 'mod_sn_advanced' && $conf->global->PRODUCTBATCH_SN_USE_PRODUCT_MASKS))) {
+							print '<tr><td>'.$langs->trans("ManageLotMask").'</td><td>';
+							print $object->batch_mask;
+							print '</td></tr>';
+						}
+				}
+			}
+
 			// Accountancy sell code
 			print '<tr><td class="nowrap">';
 			print $langs->trans("ProductAccountancySellCode");
-			print '</td><td colspan="2">';
+			print '</td><td>';
 			if (!empty($conf->accounting->enabled)) {
 				if (!empty($object->accountancy_code_sell)) {
 					$accountingaccount = new AccountingAccount($db);
@@ -2062,7 +2077,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			if ($mysoc->isInEEC()) {
 				print '<tr><td class="nowrap">';
 				print $langs->trans("ProductAccountancySellIntraCode");
-				print '</td><td colspan="2">';
+				print '</td><td>';
 				if (!empty($conf->accounting->enabled)) {
 					if (!empty($object->accountancy_code_sell_intra)) {
 						$accountingaccount2 = new AccountingAccount($db);
@@ -2079,7 +2094,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			// Accountancy sell code export
 			print '<tr><td class="nowrap">';
 			print $langs->trans("ProductAccountancySellExportCode");
-			print '</td><td colspan="2">';
+			print '</td><td>';
 			if (!empty($conf->accounting->enabled)) {
 				if (!empty($object->accountancy_code_sell_export)) {
 					$accountingaccount3 = new AccountingAccount($db);
@@ -2095,7 +2110,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			// Accountancy buy code
 			print '<tr><td class="nowrap">';
 			print $langs->trans("ProductAccountancyBuyCode");
-			print '</td><td colspan="2">';
+			print '</td><td>';
 			if (!empty($conf->accounting->enabled)) {
 				if (!empty($object->accountancy_code_buy)) {
 					$accountingaccount4 = new AccountingAccount($db);
@@ -2112,7 +2127,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			if ($mysoc->isInEEC()) {
 				print '<tr><td class="nowrap">';
 				print $langs->trans("ProductAccountancyBuyIntraCode");
-				print '</td><td colspan="2">';
+				print '</td><td>';
 				if (!empty($conf->accounting->enabled)) {
 					if (!empty($object->accountancy_code_buy_intra)) {
 						$accountingaccount5 = new AccountingAccount($db);
@@ -2129,7 +2144,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			// Accountancy buy code export
 			print '<tr><td class="nowrap">';
 			print $langs->trans("ProductAccountancyBuyExportCode");
-			print '</td><td colspan="2">';
+			print '</td><td>';
 			if (!empty($conf->accounting->enabled)) {
 				if (!empty($object->accountancy_code_buy_export)) {
 					$accountingaccount6 = new AccountingAccount($db);
@@ -2142,26 +2157,11 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			}
 			print '</td></tr>';
 
-			// Batch number management (to batch)
-			if (!empty($conf->productbatch->enabled)) {
-				if ($object->isProduct() || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
-					print '<tr><td>'.$langs->trans("ManageLotSerial").'</td><td colspan="2">';
-					print $object->getLibStatut(0, 2);
-					print '</td></tr>';
-					if ((($object->status_batch == '1' &&$conf->global->PRODUCTBATCH_LOT_USE_PRODUCT_MASKS && $conf->global->PRODUCTBATCH_LOT_ADDON == 'mod_lot_advanced')
-					|| ($object->status_batch == '2' && $conf->global->PRODUCTBATCH_SN_ADDON == 'mod_sn_advanced' && $conf->global->PRODUCTBATCH_SN_USE_PRODUCT_MASKS))) {
-						print '<tr><td>'.$langs->trans("ManageLotMask").'</td><td colspan="2">';
-						print $object->batch_mask;
-						print '</td></tr>';
-					}
-				}
-			}
-
 			// Description
-			print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td colspan="2">'.(dol_textishtml($object->description) ? $object->description : dol_nl2br($object->description, 1, true)).'</td></tr>';
+			print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td>'.(dol_textishtml($object->description) ? $object->description : dol_nl2br($object->description, 1, true)).'</td></tr>';
 
 			// Public URL
-			print '<tr><td>'.$langs->trans("PublicUrl").'</td><td colspan="2">';
+			print '<tr><td>'.$langs->trans("PublicUrl").'</td><td>';
 			print dol_print_url($object->url);
 			print '</td></tr>';
 
@@ -2184,7 +2184,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 					$prodstatic->fetch($combination->fk_product_parent);
 
 					// Parent product
-					print '<tr><td>'.$langs->trans("ParentProduct").'</td><td colspan="2">';
+					print '<tr><td>'.$langs->trans("ParentProduct").'</td><td>';
 					print $prodstatic->getNomUrl(1);
 					print '</td></tr>';
 				}
@@ -2195,11 +2195,11 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print '<div class="fichehalfright"><div class="ficheaddleft">';
 
 			print '<div class="underbanner clearboth"></div>';
-			print '<table class="border tableforfield" width="100%">';
+			print '<table class="border tableforfield centpercent">';
 
 			if ($object->isService()) {
 				// Duration
-				print '<tr><td class="titlefield">'.$langs->trans("Duration").'</td><td colspan="2">'.$object->duration_value.'&nbsp;';
+				print '<tr><td class="titlefield">'.$langs->trans("Duration").'</td><td>'.$object->duration_value.'&nbsp;';
 				if ($object->duration_value > 1) {
 					$dur = array("i"=>$langs->trans("Minute"), "h"=>$langs->trans("Hours"), "d"=>$langs->trans("Days"), "w"=>$langs->trans("Weeks"), "m"=>$langs->trans("Months"), "y"=>$langs->trans("Years"));
 				} elseif ($object->duration_value > 0) {
@@ -2210,12 +2210,12 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				print '</td></tr>';
 			} else {
 				// Nature
-				print '<tr><td class="titlefield">'.$form->textwithpicto($langs->trans("NatureOfProductShort"), $langs->trans("NatureOfProductDesc")).'</td><td colspan="2">';
+				print '<tr><td class="titlefield">'.$form->textwithpicto($langs->trans("NatureOfProductShort"), $langs->trans("NatureOfProductDesc")).'</td><td>';
 				print $object->getLibFinished();
 				print '</td></tr>';
 
 				// Brut Weight
-				print '<tr><td class="titlefield">'.$langs->trans("Weight").'</td><td colspan="2">';
+				print '<tr><td class="titlefield">'.$langs->trans("Weight").'</td><td>';
 				if ($object->weight != '') {
 					print $object->weight." ".measuringUnitString(0, "weight", $object->weight_units);
 				} else {
@@ -2225,7 +2225,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 				if (empty($conf->global->PRODUCT_DISABLE_SIZE)) {
 					// Brut Length
-					print '<tr><td>'.$langs->trans("Length").' x '.$langs->trans("Width").' x '.$langs->trans("Height").'</td><td colspan="2">';
+					print '<tr><td>'.$langs->trans("Length").' x '.$langs->trans("Width").' x '.$langs->trans("Height").'</td><td>';
 					if ($object->length != '' || $object->width != '' || $object->height != '') {
 						print $object->length;
 						if ($object->width) {
@@ -2242,7 +2242,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				}
 				if (empty($conf->global->PRODUCT_DISABLE_SURFACE)) {
 					// Brut Surface
-					print '<tr><td>'.$langs->trans("Surface").'</td><td colspan="2">';
+					print '<tr><td>'.$langs->trans("Surface").'</td><td>';
 					if ($object->surface != '') {
 						print $object->surface." ".measuringUnitString(0, "surface", $object->surface_units);
 					} else {
@@ -2252,7 +2252,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				}
 				if (empty($conf->global->PRODUCT_DISABLE_VOLUME)) {
 					// Brut Volume
-					print '<tr><td>'.$langs->trans("Volume").'</td><td colspan="2">';
+					print '<tr><td>'.$langs->trans("Volume").'</td><td>';
 					if ($object->volume != '') {
 						print $object->volume." ".measuringUnitString(0, "volume", $object->volume_units);
 					} else {
@@ -2263,12 +2263,13 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 				if (!empty($conf->global->PRODUCT_ADD_NET_MEASURE)) {
 					// Net Measure
-					print '<tr><td class="titlefield">'.$langs->trans("NetMeasure").'</td><td colspan="2">';
+					print '<tr><td class="titlefield">'.$langs->trans("NetMeasure").'</td><td>';
 					if ($object->net_measure != '') {
 						print $object->net_measure." ".measuringUnitString($object->net_measure_units);
 					} else {
 						print '&nbsp;';
 					}
+					print '</td></tr>';
 				}
 			}
 
@@ -2285,10 +2286,10 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 			// Custom code
 			if (!$object->isService() && empty($conf->global->PRODUCT_DISABLE_CUSTOM_INFO)) {
-				print '<tr><td>'.$langs->trans("CustomCode").'</td><td colspan="2">'.$object->customcode.'</td>';
+				print '<tr><td>'.$langs->trans("CustomCode").'</td><td>'.$object->customcode.'</td>';
 
 				// Origin country code
-				print '<tr><td>'.$langs->trans("Origin").'</td><td colspan="2">'.getCountry($object->country_id, 0, $db);
+				print '<tr><td>'.$langs->trans("Origin").'</td><td>'.getCountry($object->country_id, 0, $db);
 				if (!empty($object->state_id)) {
 					print ' - '.getState($object->state_id, 0, $db);
 				}
@@ -2297,17 +2298,17 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 			// Quality Control
 			if (!empty($conf->global->PRODUCT_LOT_ENABLE_QUALITY_CONTROL)) {
-				print '<tr><td>'.$langs->trans("LifeTime").'</td><td colspan="2">'.$object->lifetime.'</td></tr>';
-				print '<tr><td>'.$langs->trans("QCFrequency").'</td><td colspan="2">'.$object->qc_frequency.'</td></tr>';
+				print '<tr><td>'.$langs->trans("LifeTime").'</td><td">'.$object->lifetime.'</td></tr>';
+				print '<tr><td>'.$langs->trans("QCFrequency").'</td><td>'.$object->qc_frequency.'</td></tr>';
 			}
 
 			// Other attributes
-			$parameters = array('colspan' => ' colspan="'.(2 + (($showphoto || $showbarcode) ? 1 : 0)).'"', 'cols' => (2 + (($showphoto || $showbarcode) ? 1 : 0)));
+			$parameters = array();
 			include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
 			// Categories
 			if ($conf->categorie->enabled) {
-				print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td colspan="3">';
+				print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
 				print $form->showCategories($object->id, Categorie::TYPE_PRODUCT, 1);
 				print "</td></tr>";
 			}
@@ -2315,7 +2316,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			// Note private
 			if (!empty($conf->global->MAIN_DISABLE_NOTES_TAB)) {
 				print '<!-- show Note --> '."\n";
-				print '<tr><td class="tdtop">'.$langs->trans("NotePrivate").'</td><td colspan="'.(2 + (($showphoto || $showbarcode) ? 1 : 0)).'">'.(dol_textishtml($object->note_private) ? $object->note_private : dol_nl2br($object->note_private, 1, true)).'</td></tr>'."\n";
+				print '<tr><td class="tdtop">'.$langs->trans("NotePrivate").'</td><td>'.(dol_textishtml($object->note_private) ? $object->note_private : dol_nl2br($object->note_private, 1, true)).'</td></tr>'."\n";
 				print '<!-- End show Note --> '."\n";
 			}
 
diff --git a/htdocs/product/composition/card.php b/htdocs/product/composition/card.php
index c9499bf415b..e1250f10cb3 100644
--- a/htdocs/product/composition/card.php
+++ b/htdocs/product/composition/card.php
@@ -200,7 +200,7 @@ print dol_get_fiche_head($head, 'subproduct', $titre, -1, $picto);
 
 if ($id > 0 || !empty($ref)) {
 	/*
-	 * Fiche en mode edition
+	 * Product card
 	 */
 	if ($user->rights->produit->lire || $user->rights->service->lire) {
 		$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
@@ -218,6 +218,16 @@ if ($id > 0 || !empty($ref)) {
 
 			print '<table class="border centpercent tableforfield">';
 
+			// Type
+			if (!empty($conf->product->enabled) && !empty($conf->service->enabled)) {
+				$typeformat = 'select;0:'.$langs->trans("Product").',1:'.$langs->trans("Service");
+				print '<tr><td class="titlefieldcreate">';
+				print (empty($conf->global->PRODUCT_DENY_CHANGE_PRODUCT_TYPE)) ? $form->editfieldkey("Type", 'fk_product_type', $object->type, $object, $usercancreate, $typeformat) : $langs->trans('Type');
+				print '</td><td>';
+				print $form->editfieldval("Type", 'fk_product_type', $object->type, $object, $usercancreate, $typeformat);
+				print '</td></tr>';
+			}
+
 			// Nature
 			if ($object->type != Product::TYPE_SERVICE) {
 				print '<tr><td class="titlefieldcreate">'.$langs->trans("Nature").'</td><td>';
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 5908785e1cb..0220df610e4 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -596,8 +596,18 @@ if ($id > 0 || $ref) {
 
 			print '<table class="border tableforfield centpercent">';
 
+			// Type
+			if (!empty($conf->product->enabled) && !empty($conf->service->enabled)) {
+				$typeformat = 'select;0:'.$langs->trans("Product").',1:'.$langs->trans("Service");
+				print '<tr><td class="">';
+				print (empty($conf->global->PRODUCT_DENY_CHANGE_PRODUCT_TYPE)) ? $form->editfieldkey("Type", 'fk_product_type', $object->type, $object, $usercancreate, $typeformat) : $langs->trans('Type');
+				print '</td><td>';
+				print $form->editfieldval("Type", 'fk_product_type', $object->type, $object, $usercancreate, $typeformat);
+				print '</td></tr>';
+			}
+
 			if ($conf->productbatch->enabled) {
-				print '<tr><td class="titlefield">'.$langs->trans("ManageLotSerial").'</td><td>';
+				print '<tr><td class="">'.$langs->trans("ManageLotSerial").'</td><td>';
 				print $object->getLibStatut(0, 2);
 				print '</td></tr>';
 			}
diff --git a/htdocs/variants/combinations.php b/htdocs/variants/combinations.php
index a7ad432b3ba..0d9de5d857f 100644
--- a/htdocs/variants/combinations.php
+++ b/htdocs/variants/combinations.php
@@ -356,15 +356,25 @@ if (!empty($id) || !empty($ref)) {
 	$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?type='.$object->type.'">'.$langs->trans("BackToList").'</a>';
 	$object->next_prev_filter = " fk_product_type = ".$object->type;
 
-	dol_banner_tab($object, 'ref', $linkback, ($user->socid ? 0 : 1), 'ref', '', '', '', 0, '', '', 1);
+	dol_banner_tab($object, 'ref', $linkback, ($user->socid ? 0 : 1), 'ref', '', '', '', 0, '', '');
 
 	print '<div class="fichecenter">';
 
 	print '<div class="underbanner clearboth"></div>';
-	print '<table class="border tableforfield" width="100%">';
+	print '<table class="border centpercent tableforfield">';
+
+	// Type
+	if (!empty($conf->product->enabled) && !empty($conf->service->enabled)) {
+		$typeformat = 'select;0:'.$langs->trans("Product").',1:'.$langs->trans("Service");
+		print '<tr><td class="titlefieldcreate">';
+		print (empty($conf->global->PRODUCT_DENY_CHANGE_PRODUCT_TYPE)) ? $form->editfieldkey("Type", 'fk_product_type', $object->type, $object, $usercancreate, $typeformat) : $langs->trans('Type');
+		print '</td><td>';
+		print $form->editfieldval("Type", 'fk_product_type', $object->type, $object, $usercancreate, $typeformat);
+		print '</td></tr>';
+	}
 
 	// TVA
-	print '<tr><td class="titlefield">'.$langs->trans("DefaultTaxRate").'</td><td>';
+	print '<tr><td class="titlefieldcreate">'.$langs->trans("DefaultTaxRate").'</td><td>';
 
 	$positiverates = '';
 	if (price2num($object->tva_tx)) {
@@ -415,9 +425,6 @@ if (!empty($id) || !empty($ref)) {
 	}
 	print "</td></tr>\n";
 
-
-
-
 	print "</table>\n";
 
 	print '</div>';

From 0ea0966b09c32b8605b3384b1daff44d9259f479 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Tue, 8 Jun 2021 12:01:05 +0200
Subject: [PATCH 0469/1497] Update card.php

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

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 8f5ac173d7f..54994eaf187 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -3123,7 +3123,7 @@ if ($action == 'create')
 			// Type de facture
 			$facids = $facturestatic->list_replacable_invoices($soc->id);
 			if ($facids < 0) {
-				dol_print_error($db, $facturestatic);
+				dol_print_error($db, $facturestatic->error, $facturestatic->errors);
 				exit();
 			}
 			$options = "";

From 4e530c2486c7c4255c9b20a6e1ddf7816afdfd66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Tue, 8 Jun 2021 12:05:45 +0200
Subject: [PATCH 0470/1497] Update card.php

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

diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 80491d5edfe..530a0d22766 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -1867,7 +1867,7 @@ if ($action == 'create')
 			// Type invoice
 			$facids = $facturestatic->list_replacable_supplier_invoices($societe->id);
 			if ($facids < 0) {
-				dol_print_error($db, $facturestatic);
+				dol_print_error($db, $facturestatic->error, $facturestatic->errors);
 				exit();
 			}
 			$options = "";
@@ -1933,7 +1933,7 @@ if ($action == 'create')
 				$facids = $facturestatic->list_qualified_avoir_supplier_invoices($societe->id);
 				if ($facids < 0)
 				{
-					dol_print_error($db, $facturestatic);
+					dol_print_error($db, $facturestatic->error, $facturestatic->errors);
 					exit;
 				}
 				$optionsav = "";

From 207dc1df5528cf74dea92f82930645bf1da30d6f Mon Sep 17 00:00:00 2001
From: MOREAU FRANCK <moreauf@theobald-groupe.com>
Date: Tue, 8 Jun 2021 12:34:26 +0200
Subject: [PATCH 0471/1497] Adding hooks on product stat in order to allow to
 expand stat on other modules

---
 htdocs/core/lib/product.lib.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php
index 9825b2dac2c..a63871689b4 100644
--- a/htdocs/core/lib/product.lib.php
+++ b/htdocs/core/lib/product.lib.php
@@ -362,7 +362,7 @@ function show_stats_for_company($product, $socid)
 {
 	global $conf, $langs, $user, $db;
 	$form = new Form($db);
-
+	$hookmanager->initHooks(array('productstats'));
 	$nblines = 0;
 
 	print '<tr class="liste_titre">';
@@ -558,6 +558,10 @@ function show_stats_for_company($product, $socid)
 		print '</td>';
 		print '</tr>';
 	}
+	$reshook = $hookmanager->executeHooks('addmoreproductstat', $parameters, $product); // Note that $action and $object may have been modified by some hooks
+	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+	print $hookmanager->resPrint;
 
 	return $nblines++;
 }

From 5131ab5199b39605745544bae20429a98883476c Mon Sep 17 00:00:00 2001
From: John BOTELLA <john.botella@atm-consulting.fr>
Date: Tue, 8 Jun 2021 12:36:08 +0200
Subject: [PATCH 0472/1497] Fix php 7 warning : Only variables should be passed
 by reference

---
 htdocs/core/modules/modFournisseur.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/modules/modFournisseur.class.php b/htdocs/core/modules/modFournisseur.class.php
index d39d67775f5..39b2f3d3237 100644
--- a/htdocs/core/modules/modFournisseur.class.php
+++ b/htdocs/core/modules/modFournisseur.class.php
@@ -489,7 +489,8 @@ class modFournisseur extends DolibarrModules
 					case 'sellist':
 						$tmp = '';
 						$tmpparam = unserialize($obj->param); // $tmp ay be array 'options' => array 'c_currencies:code_iso:code_iso' => null
-						if ($tmpparam['options'] && is_array($tmpparam['options'])) $tmp = array_shift(array_keys($tmpparam['options']));
+						$array_keys = array_keys($tmpparam['options']);
+						if ($tmpparam['options'] && is_array($tmpparam['options'])) $tmp = array_shift($array_keys);
 						if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) $typeFilter = "List:".$tmp;
 						break;
 				}

From 1aeb91eb9a3ab439f66fb5717e3dff8de8a95b38 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 8 Jun 2021 13:44:11 +0200
Subject: [PATCH 0473/1497] FIX entry menus that has been lost in v13 Look and
 feel v14

---
 htdocs/compta/stats/cabyprodserv.php          |  6 ++-
 htdocs/compta/stats/casoc.php                 |  9 +++--
 htdocs/compta/stats/index.php                 | 12 ++++--
 htdocs/compta/stats/supplier_turnover.php     | 30 +++++++++++---
 .../stats/supplier_turnover_by_prodserv.php   |  6 ++-
 .../stats/supplier_turnover_by_thirdparty.php | 14 ++++---
 htdocs/core/menus/standard/eldy.lib.php       | 39 ++++++++++++++-----
 7 files changed, 82 insertions(+), 34 deletions(-)

diff --git a/htdocs/compta/stats/cabyprodserv.php b/htdocs/compta/stats/cabyprodserv.php
index d48a931ca2c..83eb9ce68b9 100644
--- a/htdocs/compta/stats/cabyprodserv.php
+++ b/htdocs/compta/stats/cabyprodserv.php
@@ -391,7 +391,8 @@ if ($modecompta == 'CREANCES-DETTES') {
 	// Category filter
 	print '<tr class="liste_titre">';
 	print '<td>';
-	print $langs->trans("Category").': '.$formother->select_categories(Categorie::TYPE_PRODUCT, $selected_cat, 'search_categ', true);
+	print img_picto('', 'category', 'class="paddingrightonly"');
+	print $formother->select_categories(Categorie::TYPE_PRODUCT, $selected_cat, 'search_categ', 0, $langs->trans("Category"));
 	print ' ';
 	print $langs->trans("SubCats").'? ';
 	print '<input type="checkbox" name="subcat" value="yes"';
@@ -406,7 +407,8 @@ if ($modecompta == 'CREANCES-DETTES') {
 
 	//select thirdparty
 	print '</br>';
-	print $langs->trans("ThirdParty").': '.$form->select_thirdparty_list($selected_soc, 'search_soc', '', 1);
+	print img_picto('', 'company', 'class="paddingrightonly"');
+	print $form->select_thirdparty_list($selected_soc, 'search_soc', '', $langs->trans("ThirdParty"));
 	print '</td>';
 
 	print '<td colspan="5" class="right">';
diff --git a/htdocs/compta/stats/casoc.php b/htdocs/compta/stats/casoc.php
index af3f2bc8a53..10f7956c6b7 100644
--- a/htdocs/compta/stats/casoc.php
+++ b/htdocs/compta/stats/casoc.php
@@ -405,7 +405,8 @@ print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" :
 // Category filter
 print '<tr class="liste_titre">';
 print '<td>';
-print $langs->trans("Category").': '.$formother->select_categories(Categorie::TYPE_CUSTOMER, $selected_cat, 'search_categ', true);
+print img_picto('', 'category', 'class="paddingrightonly"');
+print $formother->select_categories(Categorie::TYPE_CUSTOMER, $selected_cat, 'search_categ', 0, $langs->trans("Category"));
 print ' ';
 print $langs->trans("SubCats").'? ';
 print '<input type="checkbox" name="subcat" value="yes"';
@@ -420,13 +421,13 @@ print '</tr>';
 
 print '<tr class="liste_titre">';
 print '<td class="liste_titre left">';
-print '<input class="flat" size="6" type="text" name="search_societe" value="'.$search_societe.'">';
+print '<input class="flat" size="6" type="text" name="search_societe" value="'.dol_escape_htmltag($search_societe).'">';
 print '</td>';
 print '<td class="liste_titre left">';
-print '<input class="flat" size="6" type="text" name="search_zip" value="'.$search_zip.'">';
+print '<input class="flat" size="6" type="text" name="search_zip" value="'.dol_escape_htmltag($search_zip).'">';
 print '</td>';
 print '<td class="liste_titre left">';
-print '<input class="flat" size="6" type="text" name="search_town" value="'.$search_town.'">';
+print '<input class="flat" size="6" type="text" name="search_town" value="'.dol_escape_htmltag($search_town).'">';
 print '</td>';
 print '<td class="liste_titre left">';
 print $form->select_country($search_country, 'search_country');
diff --git a/htdocs/compta/stats/index.php b/htdocs/compta/stats/index.php
index b93d3c507b3..05bbbab99d3 100644
--- a/htdocs/compta/stats/index.php
+++ b/htdocs/compta/stats/index.php
@@ -149,9 +149,11 @@ if ($modecompta == "CREANCES-DETTES") {
 	$name = $langs->trans("Turnover");
 	$calcmode = $langs->trans("CalcModeDebt");
 	//$calcmode.='<br>('.$langs->trans("SeeReportInInputOutputMode",'<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=RECETTES-DEPENSES">','</a>').')';
-	$calcmode .= '<br>('.$langs->trans("SeeReportInBookkeepingMode", '{link1}', '{link2}').')';
-	$calcmode = str_replace('{link1}', '<a class="bold" href="'.$_SERVER["PHP_SELF"].'?'.($param ? $param : 'year_start='.$year_start).'&modecompta=BOOKKEEPING">', $calcmode);
-	$calcmode = str_replace('{link2}', '</a>', $calcmode);
+	if (!empty($conf->accounting->enabled)) {
+		$calcmode .= '<br>('.$langs->trans("SeeReportInBookkeepingMode", '{link1}', '{link2}').')';
+		$calcmode = str_replace('{link1}', '<a class="bold" href="'.$_SERVER["PHP_SELF"].'?'.($param ? $param : 'year_start='.$year_start).'&modecompta=BOOKKEEPING">', $calcmode);
+		$calcmode = str_replace('{link2}', '</a>', $calcmode);
+	}
 	$periodlink = ($year_start ? "<a href='".$_SERVER["PHP_SELF"]."?year=".($year_start + $nbofyear - 2)."&modecompta=".$modecompta."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($year_start + $nbofyear)."&modecompta=".$modecompta."'>".img_next()."</a>" : "");
 	$description = $langs->trans("RulesCADue");
 	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
@@ -164,8 +166,10 @@ if ($modecompta == "CREANCES-DETTES") {
 } elseif ($modecompta == "RECETTES-DEPENSES") {
 	$name = $langs->trans("TurnoverCollected");
 	$calcmode = $langs->trans("CalcModeEngagement");
-	//$calcmode.='<br>('.$langs->trans("SeeReportInDueDebtMode",'<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=CREANCES-DETTES">','</a>').')';
+	//$calcmode .= '<br>('.$langs->trans("SeeReportInDueDebtMode",'<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=CREANCES-DETTES">','</a>').')';
+	//if (!empty($conf->accounting->enabled)) {
 	//$calcmode.='<br>('.$langs->trans("SeeReportInBookkeepingMode",'<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=BOOKKEEPINGCOLLECTED">','</a>').')';
+	//}
 	$periodlink = ($year_start ? "<a href='".$_SERVER["PHP_SELF"]."?year=".($year_start + $nbofyear - 2)."&modecompta=".$modecompta."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($year_start + $nbofyear)."&modecompta=".$modecompta."'>".img_next()."</a>" : "");
 	$description = $langs->trans("RulesCAIn");
 	$description .= $langs->trans("DepositsAreIncluded");
diff --git a/htdocs/compta/stats/supplier_turnover.php b/htdocs/compta/stats/supplier_turnover.php
index bb341c6a3a5..0afcb72da2d 100644
--- a/htdocs/compta/stats/supplier_turnover.php
+++ b/htdocs/compta/stats/supplier_turnover.php
@@ -128,23 +128,31 @@ llxHeader();
 
 $form = new Form($db);
 
+// TODO Report from bookkeeping not yet available, so we switch on report on business events
+if ($modecompta == "BOOKKEEPING") {
+	$modecompta = "CREANCES-DETTES";
+}
+if ($modecompta == "BOOKKEEPINGCOLLECTED") {
+	$modecompta = "RECETTES-DEPENSES";
+}
+
 // Affiche en-tete du rapport
 if ($modecompta == "CREANCES-DETTES") {
 	$name = $langs->trans("PurchaseTurnover");
 	$calcmode = $langs->trans("CalcModeDebt");
-	$calcmode .= '<br>('.$langs->trans("SeeReportInBookkeepingMode", '{link1}', '{link2}').')';
-	$calcmode = str_replace('{link1}', '<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=BOOKKEEPING">', $calcmode);
-	$calcmode = str_replace('{link2}', '</a>', $calcmode);
+	if (!empty($conf->accounting->enabled)) {
+		$calcmode .= '<br>('.$langs->trans("SeeReportInBookkeepingMode", '{link1}', '{link2}').')';
+		$calcmode = str_replace('{link1}', '<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=BOOKKEEPING">', $calcmode);
+		$calcmode = str_replace('{link2}', '</a>', $calcmode);
+	}
 	$periodlink = ($year_start ? "<a href='".$_SERVER["PHP_SELF"]."?year=".($year_start + $nbofyear - 2)."&modecompta=".$modecompta."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($year_start + $nbofyear)."&modecompta=".$modecompta."'>".img_next()."</a>" : "");
 	$description = $langs->trans("RulesPurchaseTurnoverDue");
-	$builddate = dol_now();
 	//$exportlink=$langs->trans("NotYetAvailable");
 } elseif ($modecompta == "RECETTES-DEPENSES") {
 	$name = $langs->trans("PurchaseTurnoverCollected");
 	$calcmode = $langs->trans("CalcModeEngagement");
 	$periodlink = ($year_start ? "<a href='".$_SERVER["PHP_SELF"]."?year=".($year_start + $nbofyear - 2)."&modecompta=".$modecompta."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($year_start + $nbofyear)."&modecompta=".$modecompta."'>".img_next()."</a>" : "");
 	$description = $langs->trans("RulesPurchaseTurnoverIn");
-	$builddate = dol_now();
 	//$exportlink=$langs->trans("NotYetAvailable");
 } elseif ($modecompta == "BOOKKEEPING") {
 	$name = $langs->trans("PurchaseTurnover");
@@ -154,9 +162,19 @@ if ($modecompta == "CREANCES-DETTES") {
 	$calcmode = str_replace('{link2}', '</a>', $calcmode);
 	$periodlink = ($year_start ? "<a href='".$_SERVER["PHP_SELF"]."?year=".($year_start + $nbofyear - 2)."&modecompta=".$modecompta."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($year_start + $nbofyear)."&modecompta=".$modecompta."'>".img_next()."</a>" : "");
 	$description = $langs->trans("RulesPurchaseTurnoverOfExpenseAccounts");
-	$builddate = dol_now();
+	//$exportlink=$langs->trans("NotYetAvailable");
+} elseif ($modecompta == "BOOKKEEPINGCOLLECTED") {
+	$name = $langs->trans("PurchaseTurnoverCollected");
+	$calcmode = $langs->trans("CalcModeBookkeeping");
+	$calcmode .= '<br>('.$langs->trans("SeeReportInDueDebtMode", '{link1}', '{link2}').')';
+	$calcmode = str_replace('{link1}', '<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=RECETTES-DEPENSES">', $calcmode);
+	$calcmode = str_replace('{link2}', '</a>', $calcmode);
+	$periodlink = ($year_start ? "<a href='".$_SERVER["PHP_SELF"]."?year=".($year_start + $nbofyear - 2)."&modecompta=".$modecompta."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($year_start + $nbofyear)."&modecompta=".$modecompta."'>".img_next()."</a>" : "");
+	$description = $langs->trans("RulesPurchaseTurnoverCollectedOfExpenseAccounts");
 	//$exportlink=$langs->trans("NotYetAvailable");
 }
+
+$builddate = dol_now();
 $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0, 0, '', '', '', '', 1, '', '', 'tzserver');
 $period .= ' - ';
 $period .= $form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0, 0, '', '', '', '', 1, '', '', 'tzserver');
diff --git a/htdocs/compta/stats/supplier_turnover_by_prodserv.php b/htdocs/compta/stats/supplier_turnover_by_prodserv.php
index 1af51249433..4e92325a323 100644
--- a/htdocs/compta/stats/supplier_turnover_by_prodserv.php
+++ b/htdocs/compta/stats/supplier_turnover_by_prodserv.php
@@ -345,7 +345,8 @@ if ($modecompta == 'CREANCES-DETTES') {
 	// Category filter
 	print '<tr class="liste_titre">';
 	print '<td>';
-	print $langs->trans("Category").': '.$formother->select_categories(Categorie::TYPE_PRODUCT, $selected_cat, 'search_categ', true);
+	print img_picto('', 'category', 'class="paddingrightonly"');
+	print $formother->select_categories(Categorie::TYPE_PRODUCT, $selected_cat, 'search_categ', 0, $langs->trans("Category"));
 	print ' ';
 	print $langs->trans("SubCats").'? ';
 	print '<input type="checkbox" name="subcat" value="yes"';
@@ -360,7 +361,8 @@ if ($modecompta == 'CREANCES-DETTES') {
 
 	//select thirdparty
 	print '</br>';
-	print $langs->trans("ThirdParty").': '.$form->select_thirdparty_list($selected_soc, 'search_soc', '', 1);
+	print img_picto('', 'company', 'class="paddingrightonly"');
+	print $form->select_thirdparty_list($selected_soc, 'search_soc', '', $langs->trans("ThirdParty"));
 	print '</td>';
 
 	print '<td colspan="5" class="right">';
diff --git a/htdocs/compta/stats/supplier_turnover_by_thirdparty.php b/htdocs/compta/stats/supplier_turnover_by_thirdparty.php
index b1b1f219f53..a97e15d1499 100644
--- a/htdocs/compta/stats/supplier_turnover_by_thirdparty.php
+++ b/htdocs/compta/stats/supplier_turnover_by_thirdparty.php
@@ -200,18 +200,19 @@ if ($modecompta == "CREANCES-DETTES") {
 	$calcmode = $langs->trans("CalcModeDebt");
 	//$calcmode.='<br>('.$langs->trans("SeeReportInInputOutputMode",'<a href="'.$_SERVER["PHP_SELF"].'?year='.$year_start.'&modecompta=RECETTES-DEPENSES">','</a>').')';
 	$description = $langs->trans("RulesPurchaseTurnoverDue");
-	$builddate = dol_now();
 	//$exportlink=$langs->trans("NotYetAvailable");
 } elseif ($modecompta == "RECETTES-DEPENSES") {
 	$name = $langs->trans("PurchaseTurnoverCollected").', '.$langs->trans("ByThirdParties");
 	$calcmode = $langs->trans("CalcModeEngagement");
 	//$calcmode.='<br>('.$langs->trans("SeeReportInDueDebtMode",'<a href="'.$_SERVER["PHP_SELF"].'?year='.$year_start.'&modecompta=CREANCES-DETTES">','</a>').')';
 	$description = $langs->trans("RulesPurchaseTurnoverIn");
-	$builddate = dol_now();
 	//$exportlink=$langs->trans("NotYetAvailable");
 } elseif ($modecompta == "BOOKKEEPING") {
+	// TODO
 } elseif ($modecompta == "BOOKKEEPINGCOLLECTED") {
+	// TODO
 }
+$builddate = dol_now();
 $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0, 0, '', '', '', '', 1, '', '', 'tzserver');
 $period .= ' - ';
 $period .= $form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0, 0, '', '', '', '', 1, '', '', 'tzserver');
@@ -344,7 +345,8 @@ print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" :
 // Category filter
 print '<tr class="liste_titre">';
 print '<td>';
-print $langs->trans("Category").': '.$formother->select_categories(Categorie::TYPE_SUPPLIER, $selected_cat, 'search_categ', true);
+print img_picto('', 'category', 'class="paddingrightonly"');
+print $formother->select_categories(Categorie::TYPE_SUPPLIER, $selected_cat, 'search_categ', 0, $langs->trans("Category"));
 print ' ';
 print $langs->trans("SubCats").'? ';
 print '<input type="checkbox" name="subcat" value="yes"';
@@ -359,13 +361,13 @@ print '</tr>';
 
 print '<tr class="liste_titre">';
 print '<td class="liste_titre left">';
-print '<input class="flat" size="6" type="text" name="search_societe" value="'.$search_societe.'">';
+print '<input class="flat" size="6" type="text" name="search_societe" value="'.dol_escape_htmltag($search_societe).'">';
 print '</td>';
 print '<td class="liste_titre left">';
-print '<input class="flat" size="6" type="text" name="search_zip" value="'.$search_zip.'">';
+print '<input class="flat" size="6" type="text" name="search_zip" value="'.dol_escape_htmltag($search_zip).'">';
 print '</td>';
 print '<td class="liste_titre left">';
-print '<input class="flat" size="6" type="text" name="search_town" value="'.$search_town.'">';
+print '<input class="flat" size="6" type="text" name="search_town" value="'.dol_escape_htmltag($search_town).'">';
 print '</td>';
 print '<td class="liste_titre left">';
 print $form->select_country($search_country, 'search_country');
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 7f6121fb07d..80ea1d5ea7b 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1373,7 +1373,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 
 				$modecompta = 'CREANCES-DETTES';
 				if (!empty($conf->accounting->enabled) && !empty($user->rights->accounting->comptarapport->lire) && $mainmenu == 'accountancy') {
-					$modecompta = 'BOOKKEEPING'; // Not yet implemented. Should be BOOKKEEPINGCOLLECTED
+					$modecompta = 'BOOKKEEPING'; // Not yet implemented.
 				}
 				if ($modecompta && ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_invoice->enabled))) {
 					if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/', $leftmenu)) {
@@ -1384,7 +1384,9 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				}
 
 				$modecompta = 'RECETTES-DEPENSES';
-				//if (! empty($conf->accounting->enabled) && ! empty($user->rights->accounting->comptarapport->lire) && $mainmenu == 'accountancy') $modecompta='';	// Not yet implemented. Should be BOOKKEEPINGCOLLECTED
+				if (!empty($conf->accounting->enabled) && !empty($user->rights->accounting->comptarapport->lire) && $mainmenu == 'accountancy') {
+					$modecompta = 'BOOKKEEPINGCOLLECTED'; // Not yet implemented.
+				}
 				if ($modecompta && ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_invoice->enabled))) {
 					if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/', $leftmenu)) {
 						$newmenu->add("/compta/stats/supplier_turnover.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportPurchaseTurnoverCollected"), 2, $user->rights->accounting->comptarapport->lire);
@@ -1410,7 +1412,6 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 					$newmenu->add("/compta/resultat/compteres.php?leftmenu=report","Compte de resultat",2,$user->rights->compta->resultat->lire);
 					$newmenu->add("/compta/resultat/bilan.php?leftmenu=report","Bilan",2,$user->rights->compta->resultat->lire);
 					*/
-					$newmenu->add("/compta/stats/index.php?leftmenu=report", $langs->trans("ReportTurnover"), 1, $user->rights->compta->resultat->lire);
 
 					/*
 					$newmenu->add("/compta/stats/cumul.php?leftmenu=report","Cumule",2,$user->rights->compta->resultat->lire);
@@ -1419,14 +1420,32 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 						$newmenu->add("/compta/stats/comp.php?leftmenu=report","Transforme",2,$user->rights->compta->resultat->lire);
 					}
 					*/
-					$newmenu->add("/compta/stats/casoc.php?leftmenu=report", $langs->trans("ByCompanies"), 2, $user->rights->compta->resultat->lire);
-					$newmenu->add("/compta/stats/cabyuser.php?leftmenu=report", $langs->trans("ByUsers"), 2, $user->rights->compta->resultat->lire);
-					$newmenu->add("/compta/stats/cabyprodserv.php?leftmenu=report", $langs->trans("ByProductsAndServices"), 2, $user->rights->compta->resultat->lire);
-					$newmenu->add("/compta/stats/byratecountry.php?leftmenu=report", $langs->trans("ByVatRate"), 2, $user->rights->compta->resultat->lire);
+
+					$modecompta = 'CREANCES-DETTES';
+					$newmenu->add("/compta/stats/index.php?leftmenu=report&modecompta=".$modecompta, $langs->trans("ReportTurnover"), 1, $user->rights->compta->resultat->lire);
+					$newmenu->add("/compta/stats/casoc.php?leftmenu=report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 2, $user->rights->compta->resultat->lire);
+					$newmenu->add("/compta/stats/cabyuser.php?leftmenu=report&modecompta=".$modecompta, $langs->trans("ByUsers"), 2, $user->rights->compta->resultat->lire);
+					$newmenu->add("/compta/stats/cabyprodserv.php?leftmenu=report&modecompta=".$modecompta, $langs->trans("ByProductsAndServices"), 2, $user->rights->compta->resultat->lire);
+					$newmenu->add("/compta/stats/byratecountry.php?leftmenu=report&modecompta=".$modecompta, $langs->trans("ByVatRate"), 2, $user->rights->compta->resultat->lire);
+
+					$modecompta = 'RECETTES-DEPENSES';
+					$newmenu->add("/compta/stats/index.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportTurnoverCollected"), 1, $user->rights->compta->resultat->lire);
+					$newmenu->add("/compta/stats/casoc.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 2, $user->rights->compta->resultat->lire);
+					$newmenu->add("/compta/stats/cabyuser.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByUsers"), 2, $user->rights->compta->resultat->lire);
+
 					//Achats
-					$newmenu->add("/compta/stats/supplier_turnover.php?leftmenu=accountancy_report", $langs->trans("ReportPurchaseTurnover"), 1, $user->rights->compta->resultat->lire);
-					$newmenu->add("/compta/stats/supplier_turnover_by_thirdparty.php?leftmenu=accountancy_report", $langs->trans("ByCompanies"), 2, $user->rights->compta->resultat->lire);
-					$newmenu->add("/compta/stats/supplier_turnover_by_prodserv.php?leftmenu=accountancy_report", $langs->trans("ByProductsAndServices"), 2, $user->rights->compta->resultat->lire);
+					$modecompta = 'CREANCES-DETTES';
+					$newmenu->add("/compta/stats/supplier_turnover.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportPurchaseTurnover"), 1, $user->rights->compta->resultat->lire);
+					$newmenu->add("/compta/stats/supplier_turnover_by_thirdparty.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 2, $user->rights->compta->resultat->lire);
+					$newmenu->add("/compta/stats/supplier_turnover_by_prodserv.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByProductsAndServices"), 2, $user->rights->compta->resultat->lire);
+
+					/*
+					$modecompta = 'RECETTES-DEPENSES';
+					$newmenu->add("/compta/stats/index.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportPurchaseTurnoverCollected"), 1, $user->rights->compta->resultat->lire);
+					$newmenu->add("/compta/stats/casoc.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 2, $user->rights->compta->resultat->lire);
+					$newmenu->add("/compta/stats/cabyuser.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByUsers"), 2, $user->rights->compta->resultat->lire);
+					*/
+
 					// Journals
 					$newmenu->add("/compta/journal/sellsjournal.php?leftmenu=report", $langs->trans("SellsJournal"), 1, $user->rights->compta->resultat->lire, '', '', '', 50);
 					$newmenu->add("/compta/journal/purchasesjournal.php?leftmenu=report", $langs->trans("PurchasesJournal"), 1, $user->rights->compta->resultat->lire, '', '', '', 51);

From 2e6650924560ee5eca40da063cf0b0b4aebdff01 Mon Sep 17 00:00:00 2001
From: MOREAU FRANCK <moreauf@theobald-groupe.com>
Date: Tue, 8 Jun 2021 15:47:20 +0200
Subject: [PATCH 0474/1497] Adding hooks on product stat in order to allow to
 expand stat on other modules

---
 htdocs/core/lib/product.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php
index a63871689b4..b22207c5dda 100644
--- a/htdocs/core/lib/product.lib.php
+++ b/htdocs/core/lib/product.lib.php
@@ -360,7 +360,7 @@ function product_lot_admin_prepare_head()
  */
 function show_stats_for_company($product, $socid)
 {
-	global $conf, $langs, $user, $db;
+	global $conf, $langs, $user, $db, $hookmanager;
 	$form = new Form($db);
 	$hookmanager->initHooks(array('productstats'));
 	$nblines = 0;

From 6eab0f56619eb204b594857ce783cd25f2def604 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 8 Jun 2021 15:49:26 +0200
Subject: [PATCH 0475/1497] Fix css

---
 htdocs/comm/propal/list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 48ad9783367..ceb945d1e72 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -1419,7 +1419,7 @@ if ($resql) {
 
 		if (!empty($arrayfields['pr.ref']['checked'])) {
 			// Project ref
-			print '<td class="nowrap">';
+			print '<td class="nowraponall">';
 			if ($obj->project_id > 0) {
 				print $projectstatic->getNomUrl(1);
 			}

From facf594b2da40a8462b7b744c4a8040896daed9c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 8 Jun 2021 16:01:26 +0200
Subject: [PATCH 0476/1497] FIX Date of invoice generated from membership must
 be current date

---
 htdocs/adherents/class/adherent.class.php | 3 ++-
 htdocs/public/payment/newpayment.php      | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index b7852280ddf..4c0c602cbc1 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -1740,7 +1740,8 @@ class Adherent extends CommonObject
 					}
 				}
 				$invoice->socid = $this->fk_soc;
-				$invoice->date = $datesubscription;
+				//$invoice->date = $datesubscription;
+				$invoice->date = dol_now();
 
 				// Possibility to add external linked objects with hooks
 				$invoice->linked_objects['subscription'] = $subscriptionid;
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 3a7f9a4ed9f..fb95432256d 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -1419,6 +1419,8 @@ if ($source == 'contractline') {
 
 // Payment on member subscription
 if ($source == 'member' || $source == 'membersubscription') {
+	$newsource = 'member';
+
 	$found = true;
 	$langs->load("members");
 
@@ -1478,7 +1480,7 @@ if ($source == 'member' || $source == 'membersubscription') {
 	}
 	print '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("Designation");
 	print '</td><td class="CTableRow2">'.$text;
-	print '<input type="hidden" name="source" value="'.dol_escape_htmltag($source).'">';
+	print '<input type="hidden" name="source" value="'.dol_escape_htmltag($newsource).'">';
 	print '<input type="hidden" name="ref" value="'.dol_escape_htmltag($member->ref).'">';
 	print '</td></tr>'."\n";
 

From fa4786a3f64083895c257863c8d2b5ed463c0776 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 8 Jun 2021 16:19:21 +0200
Subject: [PATCH 0477/1497] Fix permission

---
 htdocs/adherents/document.php                          | 2 +-
 htdocs/asset/document.php                              | 2 +-
 htdocs/bom/bom_document.php                            | 2 +-
 htdocs/comm/action/document.php                        | 2 +-
 htdocs/comm/propal/document.php                        | 2 +-
 htdocs/commande/document.php                           | 2 +-
 htdocs/compta/bank/account_statement_document.php      | 2 +-
 htdocs/compta/bank/document.php                        | 2 +-
 htdocs/compta/bank/various_payment/document.php        | 2 +-
 htdocs/compta/deplacement/document.php                 | 2 +-
 htdocs/compta/facture/document.php                     | 2 +-
 htdocs/compta/sociales/document.php                    | 2 +-
 htdocs/compta/tva/document.php                         | 2 +-
 htdocs/contact/document.php                            | 2 +-
 htdocs/contrat/document.php                            | 2 +-
 htdocs/don/document.php                                | 2 +-
 htdocs/expedition/document.php                         | 2 +-
 htdocs/expensereport/document.php                      | 2 +-
 htdocs/fichinter/document.php                          | 2 +-
 htdocs/fourn/commande/document.php                     | 2 +-
 htdocs/holiday/document.php                            | 2 +-
 htdocs/loan/document.php                               | 2 +-
 htdocs/modulebuilder/template/myobject_document.php    | 4 ++--
 htdocs/mrp/mo_document.php                             | 2 +-
 htdocs/product/stock/productlot_document.php           | 1 -
 htdocs/projet/document.php                             | 2 +-
 htdocs/projet/tasks/document.php                       | 2 +-
 htdocs/recruitment/recruitmentcandidature_document.php | 2 +-
 htdocs/recruitment/recruitmentjobposition_document.php | 2 +-
 htdocs/resource/document.php                           | 2 +-
 htdocs/salaries/document.php                           | 2 +-
 htdocs/societe/document.php                            | 2 +-
 htdocs/supplier_proposal/document.php                  | 2 +-
 htdocs/ticket/document.php                             | 2 +-
 htdocs/user/document.php                               | 2 +-
 35 files changed, 35 insertions(+), 36 deletions(-)

diff --git a/htdocs/adherents/document.php b/htdocs/adherents/document.php
index f2a7c6f3f55..98c0e026139 100644
--- a/htdocs/adherents/document.php
+++ b/htdocs/adherents/document.php
@@ -182,7 +182,7 @@ if ($id > 0) {
 		print dol_get_fiche_end();
 
 		$modulepart = 'member';
-		$permission = $user->rights->adherent->creer;
+		$permissiontoadd = $user->rights->adherent->creer;
 		$permtoedit = $user->rights->adherent->creer;
 		$param = '&id='.$object->id;
 		include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
diff --git a/htdocs/asset/document.php b/htdocs/asset/document.php
index 91e46269994..b4ee3a0a175 100644
--- a/htdocs/asset/document.php
+++ b/htdocs/asset/document.php
@@ -128,7 +128,7 @@ if ($id > 0 || !empty($ref)) {
 		print dol_get_fiche_end();
 
 		$modulepart = 'asset';
-		$permission = $user->rights->asset->write;
+		$permissiontoadd = $user->rights->asset->write;
 		$permtoedit = $user->rights->asset->write;
 		$param = '&id='.$object->id;
 		include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
diff --git a/htdocs/bom/bom_document.php b/htdocs/bom/bom_document.php
index e59b22c45b2..9952423da99 100644
--- a/htdocs/bom/bom_document.php
+++ b/htdocs/bom/bom_document.php
@@ -147,7 +147,7 @@ if ($object->id) {
 	print dol_get_fiche_end();
 
 	$modulepart = 'bom';
-	$permission = $user->rights->bom->write;
+	$permissiontoadd = $user->rights->bom->write;
 	$permtoedit = $user->rights->bom->write;
 	$param = '&id='.$object->id;
 
diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php
index 7465e613611..eb1ac59cfe0 100644
--- a/htdocs/comm/action/document.php
+++ b/htdocs/comm/action/document.php
@@ -287,7 +287,7 @@ if ($object->id > 0) {
 
 
 	$modulepart = 'actions';
-	$permission = $user->rights->agenda->myactions->create || $user->rights->agenda->allactions->create;
+	$permissiontoadd = $user->rights->agenda->myactions->create || $user->rights->agenda->allactions->create;
 	$param = '&id='.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 } else {
diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php
index 2b21c545c63..a60f892274c 100644
--- a/htdocs/comm/propal/document.php
+++ b/htdocs/comm/propal/document.php
@@ -189,7 +189,7 @@ if ($object->id > 0) {
 	print dol_get_fiche_end();
 
 	$modulepart = 'propal';
-	$permission = $user->rights->propal->creer;
+	$permissiontoadd = $user->rights->propal->creer;
 	$permtoedit = $user->rights->propal->creer;
 	$param = '&id='.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
diff --git a/htdocs/commande/document.php b/htdocs/commande/document.php
index c289112ee9f..f8cc503e0ec 100644
--- a/htdocs/commande/document.php
+++ b/htdocs/commande/document.php
@@ -184,7 +184,7 @@ if ($id > 0 || !empty($ref)) {
 		print dol_get_fiche_end();
 
 		$modulepart = 'commande';
-		$permission = $user->rights->commande->creer;
+		$permissiontoadd = $user->rights->commande->creer;
 		$permtoedit = $user->rights->commande->creer;
 		$param = '&id='.$object->id.'&entity='.(!empty($object->entity) ? $object->entity : $conf->entity);
 		include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
diff --git a/htdocs/compta/bank/account_statement_document.php b/htdocs/compta/bank/account_statement_document.php
index 4f317c1a9ed..03209ad7673 100644
--- a/htdocs/compta/bank/account_statement_document.php
+++ b/htdocs/compta/bank/account_statement_document.php
@@ -183,7 +183,7 @@ if ($id > 0 || !empty($ref)) {
 
 
 		$modulepart = 'bank';
-		$permission = $user->rights->banque->modifier;
+		$permissiontoadd = $user->rights->banque->modifier;
 		$permtoedit = $user->rights->banque->modifier;
 		$param = '&id='.$object->id.'&num='.urlencode($numref);
 		$moreparam = '&num='.urlencode($numref);
diff --git a/htdocs/compta/bank/document.php b/htdocs/compta/bank/document.php
index f97dbca114b..ec46002b031 100644
--- a/htdocs/compta/bank/document.php
+++ b/htdocs/compta/bank/document.php
@@ -136,7 +136,7 @@ if ($id > 0 || !empty($ref)) {
 
 
 		$modulepart = 'bank';
-		$permission = $user->rights->banque->modifier;
+		$permissiontoadd = $user->rights->banque->modifier;
 		$permtoedit = $user->rights->banque->modifier;
 		$param = '&id='.$object->id;
 		include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
diff --git a/htdocs/compta/bank/various_payment/document.php b/htdocs/compta/bank/various_payment/document.php
index ce793f7e6ee..1b5fd5fd383 100644
--- a/htdocs/compta/bank/various_payment/document.php
+++ b/htdocs/compta/bank/various_payment/document.php
@@ -150,7 +150,7 @@ if ($object->id) {
 	print dol_get_fiche_end();
 
 	$modulepart = 'banque';
-	$permission = $user->rights->banque->modifier;
+	$permissiontoadd = $user->rights->banque->modifier;
 	$param = '&id='.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 } else {
diff --git a/htdocs/compta/deplacement/document.php b/htdocs/compta/deplacement/document.php
index bd4437715d8..cdb4b5f0f0f 100644
--- a/htdocs/compta/deplacement/document.php
+++ b/htdocs/compta/deplacement/document.php
@@ -126,7 +126,7 @@ if ($object->id) {
 	print '</div>';
 
 	$modulepart = 'deplacement';
-	$permission = $user->rights->deplacement->creer;
+	$permissiontoadd = $user->rights->deplacement->creer;
 	$param = '&id='.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 } else {
diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php
index 16cdee4ac53..5196216c57c 100644
--- a/htdocs/compta/facture/document.php
+++ b/htdocs/compta/facture/document.php
@@ -181,7 +181,7 @@ if ($id > 0 || !empty($ref)) {
 		print dol_get_fiche_end();
 
 		$modulepart = 'facture';
-		$permission = $user->rights->facture->creer;
+		$permissiontoadd = $user->rights->facture->creer;
 		$permtoedit = $user->rights->facture->creer;
 		$param = '&id='.$object->id;
 		include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
diff --git a/htdocs/compta/sociales/document.php b/htdocs/compta/sociales/document.php
index 3335174d86f..1fbfdfa296a 100644
--- a/htdocs/compta/sociales/document.php
+++ b/htdocs/compta/sociales/document.php
@@ -164,7 +164,7 @@ if ($object->id) {
 	print dol_get_fiche_end();
 
 	$modulepart = 'tax';
-	$permission = $user->rights->tax->charges->creer;
+	$permissiontoadd = $user->rights->tax->charges->creer;
 	$permtoedit = $user->rights->tax->charges->creer;
 	$param = '&id='.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
diff --git a/htdocs/compta/tva/document.php b/htdocs/compta/tva/document.php
index eee1abcd2f5..e2f0dcec96d 100644
--- a/htdocs/compta/tva/document.php
+++ b/htdocs/compta/tva/document.php
@@ -150,7 +150,7 @@ if ($object->id) {
 
 	print dol_get_fiche_end();
 
-	$permission = $user->rights->tax->charges->creer;
+	$permissiontoadd = $user->rights->tax->charges->creer;
 	$permtoedit = $user->rights->tax->charges->creer;
 	$param = '&id='.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
diff --git a/htdocs/contact/document.php b/htdocs/contact/document.php
index e980b0ee94c..3005c6b7827 100644
--- a/htdocs/contact/document.php
+++ b/htdocs/contact/document.php
@@ -182,7 +182,7 @@ if ($object->id) {
 	print dol_get_fiche_end();
 
 	$modulepart = 'contact';
-	$permission = $user->rights->societe->contact->creer;
+	$permissiontoadd = $user->rights->societe->contact->creer;
 	$permtoedit = $user->rights->societe->contact->creer;
 	$param = '&id='.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
diff --git a/htdocs/contrat/document.php b/htdocs/contrat/document.php
index 1dd87fd75e3..0d66204f81d 100644
--- a/htdocs/contrat/document.php
+++ b/htdocs/contrat/document.php
@@ -192,7 +192,7 @@ if ($object->id) {
 	print dol_get_fiche_end();
 
 	$modulepart = 'contract';
-	$permission = $user->rights->contrat->creer;
+	$permissiontoadd = $user->rights->contrat->creer;
 	$permtoedit = $user->rights->contrat->creer;
 	$param = '&id='.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
diff --git a/htdocs/don/document.php b/htdocs/don/document.php
index 0bd4edbc77b..374306bc7b0 100644
--- a/htdocs/don/document.php
+++ b/htdocs/don/document.php
@@ -188,7 +188,7 @@ if ($object->id) {
 	print dol_get_fiche_end();
 
 	$modulepart = 'don';
-	$permission = $user->rights->don->creer;
+	$permissiontoadd = $user->rights->don->creer;
 	$permtoedit = $user->rights->don->creer;
 	$param = '&id='.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
diff --git a/htdocs/expedition/document.php b/htdocs/expedition/document.php
index c392187d607..200a4b67aac 100644
--- a/htdocs/expedition/document.php
+++ b/htdocs/expedition/document.php
@@ -177,7 +177,7 @@ if ($id > 0 || !empty($ref)) {
 		print dol_get_fiche_end();
 
 		$modulepart = 'expedition';
-		$permission = $user->rights->expedition->creer;
+		$permissiontoadd = $user->rights->expedition->creer;
 		$permtoedit = $user->rights->expedition->creer;
 		$param = '&id='.$object->id;
 		include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
diff --git a/htdocs/expensereport/document.php b/htdocs/expensereport/document.php
index 147f0842e4c..d7ecea8fcc9 100644
--- a/htdocs/expensereport/document.php
+++ b/htdocs/expensereport/document.php
@@ -154,7 +154,7 @@ if ($object->id) {
 
 
 	$modulepart = 'expensereport';
-	$permission = $user->rights->expensereport->creer;
+	$permissiontoadd = $user->rights->expensereport->creer;
 	$permtoedit = $user->rights->expensereport->creer;
 	$param = '&id='.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
diff --git a/htdocs/fichinter/document.php b/htdocs/fichinter/document.php
index 576e6be0e5e..71f52212978 100644
--- a/htdocs/fichinter/document.php
+++ b/htdocs/fichinter/document.php
@@ -170,7 +170,7 @@ if ($object->id) {
 	print dol_get_fiche_end();
 
 	$modulepart = 'ficheinter';
-	$permission = $user->rights->ficheinter->creer;
+	$permissiontoadd = $user->rights->ficheinter->creer;
 	$permtoedit = $user->rights->ficheinter->creer;
 	$param = '&id='.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
diff --git a/htdocs/fourn/commande/document.php b/htdocs/fourn/commande/document.php
index 5bb8baf4879..c38751fc138 100644
--- a/htdocs/fourn/commande/document.php
+++ b/htdocs/fourn/commande/document.php
@@ -178,7 +178,7 @@ if ($object->id > 0) {
 
 
 	$modulepart = 'commande_fournisseur';
-	$permission = ($user->rights->fournisseur->commande->creer || $user->rights->supplier_order->creer);
+	$permissiontoadd = ($user->rights->fournisseur->commande->creer || $user->rights->supplier_order->creer);
 	$permtoedit = ($user->rights->fournisseur->commande->creer || $user->rights->supplier_order->creer);
 	$param = '&id='.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
diff --git a/htdocs/holiday/document.php b/htdocs/holiday/document.php
index d1be99b0446..063a3330ffd 100644
--- a/htdocs/holiday/document.php
+++ b/htdocs/holiday/document.php
@@ -349,7 +349,7 @@ if ($object->id) {
 
 
 	$modulepart = 'holiday';
-	$permission = $user->rights->holiday->write;
+	$permissiontoadd = $user->rights->holiday->write;
 	$permtoedit = $user->rights->holiday->write;
 	$param = '&id='.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
diff --git a/htdocs/loan/document.php b/htdocs/loan/document.php
index 85c958dd545..97c0ea56b15 100644
--- a/htdocs/loan/document.php
+++ b/htdocs/loan/document.php
@@ -160,7 +160,7 @@ if ($object->id) {
 	print dol_get_fiche_end();
 
 	$modulepart = 'loan';
-	$permission = $user->rights->loan->write;
+	$permissiontoadd = $user->rights->loan->write;
 	$permtoedit = $user->rights->loan->write;
 	$param = '&id='.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
diff --git a/htdocs/modulebuilder/template/myobject_document.php b/htdocs/modulebuilder/template/myobject_document.php
index e3fa6390e93..2db325b8b41 100644
--- a/htdocs/modulebuilder/template/myobject_document.php
+++ b/htdocs/modulebuilder/template/myobject_document.php
@@ -233,8 +233,8 @@ if ($object->id) {
 	print dol_get_fiche_end();
 
 	$modulepart = 'mymodule';
-	//$permission = $user->rights->mymodule->myobject->write;
-	$permission = 1;
+	//$permissiontoadd = $user->rights->mymodule->myobject->write;
+	$permissiontoadd = 1;
 	//$permtoedit = $user->rights->mymodule->myobject->write;
 	$permtoedit = 1;
 	$param = '&id='.$object->id;
diff --git a/htdocs/mrp/mo_document.php b/htdocs/mrp/mo_document.php
index 96041171da6..101d26223f5 100644
--- a/htdocs/mrp/mo_document.php
+++ b/htdocs/mrp/mo_document.php
@@ -179,7 +179,7 @@ if ($object->id) {
 	print dol_get_fiche_end();
 
 	$modulepart = 'mrp';
-	$permission = $user->rights->mrp->write;
+	$permissiontoadd = $user->rights->mrp->write;
 	$permtoedit = $user->rights->mrp->write;
 	$param = '&id='.$object->id;
 
diff --git a/htdocs/product/stock/productlot_document.php b/htdocs/product/stock/productlot_document.php
index 820ad4d38bb..08b565c90a0 100644
--- a/htdocs/product/stock/productlot_document.php
+++ b/htdocs/product/stock/productlot_document.php
@@ -193,7 +193,6 @@ if ($object->id) {
 
 	print dol_get_fiche_end();
 
-	$permission = ($user->rights->produit->creer);
 	$param = '&id='.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 } else {
diff --git a/htdocs/projet/document.php b/htdocs/projet/document.php
index 6bb905d6696..b088dcf7141 100644
--- a/htdocs/projet/document.php
+++ b/htdocs/projet/document.php
@@ -165,7 +165,7 @@ if ($object->id > 0) {
 	print dol_get_fiche_end();
 
 	$modulepart = 'project';
-	$permission = ($userWrite > 0);
+	$permissiontoadd = ($userWrite > 0);
 	$permtoedit = ($userWrite > 0);
 	include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 } else {
diff --git a/htdocs/projet/tasks/document.php b/htdocs/projet/tasks/document.php
index 575f949bb75..d9c49001dfc 100644
--- a/htdocs/projet/tasks/document.php
+++ b/htdocs/projet/tasks/document.php
@@ -324,7 +324,7 @@ if ($object->id > 0) {
 		$param .= '&withproject=1';
 	}
 	$modulepart = 'project_task';
-	$permission = $user->rights->projet->creer;
+	$permissiontoadd = $user->rights->projet->creer;
 	$permtoedit = $user->rights->projet->creer;
 	$relativepathwithnofile = dol_sanitizeFileName($projectstatic->ref).'/'.dol_sanitizeFileName($object->ref).'/';
 	include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
diff --git a/htdocs/recruitment/recruitmentcandidature_document.php b/htdocs/recruitment/recruitmentcandidature_document.php
index 24b9f6d4e67..2e8c29cf2fe 100644
--- a/htdocs/recruitment/recruitmentcandidature_document.php
+++ b/htdocs/recruitment/recruitmentcandidature_document.php
@@ -212,7 +212,7 @@ if ($object->id) {
 	print dol_get_fiche_end();
 
 	$modulepart = 'recruitment';
-	$permission = $user->rights->recruitment->recruitmentjobposition->write;
+	$permissiontoadd = $user->rights->recruitment->recruitmentjobposition->write;
 	$permtoedit = $user->rights->recruitment->recruitmentjobposition->write;
 	$param = '&id='.$object->id;
 
diff --git a/htdocs/recruitment/recruitmentjobposition_document.php b/htdocs/recruitment/recruitmentjobposition_document.php
index e8ede6f0bdd..43d80901f3d 100644
--- a/htdocs/recruitment/recruitmentjobposition_document.php
+++ b/htdocs/recruitment/recruitmentjobposition_document.php
@@ -211,7 +211,7 @@ if ($object->id) {
 	print dol_get_fiche_end();
 
 	$modulepart = 'recruitment';
-	$permission = $user->rights->recruitment->recruitmentjobposition->write;
+	$permissiontoadd = $user->rights->recruitment->recruitmentjobposition->write;
 	$permtoedit = $user->rights->recruitment->recruitmentjobposition->write;
 	$param = '&id='.$object->id;
 
diff --git a/htdocs/resource/document.php b/htdocs/resource/document.php
index 6f4c714fac4..fec869d5620 100644
--- a/htdocs/resource/document.php
+++ b/htdocs/resource/document.php
@@ -139,7 +139,7 @@ if ($object->id > 0) {
 	print dol_get_fiche_end();
 
 	$modulepart = 'dolresource';
-	$permission = $user->rights->resource->write;
+	$permissiontoadd = $user->rights->resource->write;
 
 	include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 } else {
diff --git a/htdocs/salaries/document.php b/htdocs/salaries/document.php
index 5950fc88798..ea21b49159c 100644
--- a/htdocs/salaries/document.php
+++ b/htdocs/salaries/document.php
@@ -149,7 +149,7 @@ if ($object->id) {
 	print dol_get_fiche_end();
 
 	$modulepart = 'salaries';
-	$permission = $user->rights->salaries->write;
+	$permissiontoadd = $user->rights->salaries->write;
 	$param = '&id='.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 } else {
diff --git a/htdocs/societe/document.php b/htdocs/societe/document.php
index 653069882e0..0b8376e4f88 100644
--- a/htdocs/societe/document.php
+++ b/htdocs/societe/document.php
@@ -176,7 +176,7 @@ if ($object->id) {
 	print dol_get_fiche_end();
 
 	$modulepart = 'societe';
-	$permission = $user->rights->societe->creer;
+	$permissiontoadd = $user->rights->societe->creer;
 	$permtoedit = $user->rights->societe->creer;
 	$param = '&id='.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
diff --git a/htdocs/supplier_proposal/document.php b/htdocs/supplier_proposal/document.php
index eaf02981966..580c0f0974e 100644
--- a/htdocs/supplier_proposal/document.php
+++ b/htdocs/supplier_proposal/document.php
@@ -163,7 +163,7 @@ if ($object->id > 0) {
 	print dol_get_fiche_end();
 
 	$modulepart = 'supplier_proposal';
-	$permission = $user->rights->supplier_proposal->creer;
+	$permissiontoadd = $user->rights->supplier_proposal->creer;
 	$permtoedit = $user->rights->supplier_proposal->creer;
 	$param = '&id='.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
diff --git a/htdocs/ticket/document.php b/htdocs/ticket/document.php
index 8edd2787c44..d534e8a1123 100644
--- a/htdocs/ticket/document.php
+++ b/htdocs/ticket/document.php
@@ -203,7 +203,7 @@ if ($object->id) {
 
 	//$object->ref = $object->track_id;	// For compatibility we use track ID for directory
 	$modulepart = 'ticket';
-	$permission = $user->rights->ticket->write;
+	$permissiontoadd = $user->rights->ticket->write;
 	$permtoedit = $user->rights->ticket->write;
 	$param = '&id='.$object->id;
 
diff --git a/htdocs/user/document.php b/htdocs/user/document.php
index 297243f36ef..8cf6c2b2a81 100644
--- a/htdocs/user/document.php
+++ b/htdocs/user/document.php
@@ -176,7 +176,7 @@ if ($object->id) {
 
 
 	$modulepart = 'user';
-	$permission = $user->rights->user->user->creer;
+	$permissiontoadd = $user->rights->user->user->creer;
 	$permtoedit = $user->rights->user->user->creer;
 	$param = '&id='.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';

From af6bbe23cad2c28c33fb65adc6d58eadbc083a5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Tue, 8 Jun 2021 17:39:13 +0200
Subject: [PATCH 0478/1497] add warning if outstanding limit is exceeded

---
 htdocs/comm/propal/card.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index b5bd94f0c2e..8b5f757ad0e 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -2294,6 +2294,7 @@ if ($action == 'create') {
 		print $langs->trans('OutstandingBill');
 		print '</td><td class="valuefield">';
 		$arrayoutstandingbills = $soc->getOutstandingBills();
+		print ($arrayoutstandingbills['opened'] > $soc->outstanding_limit ? img_warning() : '');
 		print price($arrayoutstandingbills['opened']).' / ';
 		print price($soc->outstanding_limit, 0, $langs, 1, - 1, - 1, $conf->currency);
 		print '</td>';

From 4b8dfc1abe8744df3f8a42c107894f58da948266 Mon Sep 17 00:00:00 2001
From: MOREAU FRANCK <moreauf@theobald-groupe.com>
Date: Tue, 8 Jun 2021 18:11:59 +0200
Subject: [PATCH 0479/1497] Adding hooks on product stat in order to allow to
 expand stat on other modules

---
 htdocs/core/lib/product.lib.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php
index b22207c5dda..e87e63666ef 100644
--- a/htdocs/core/lib/product.lib.php
+++ b/htdocs/core/lib/product.lib.php
@@ -558,9 +558,10 @@ function show_stats_for_company($product, $socid)
 		print '</td>';
 		print '</tr>';
 	}
-	$reshook = $hookmanager->executeHooks('addmoreproductstat', $parameters, $product); // Note that $action and $object may have been modified by some hooks
+	$parameters = array('socid'=>$socid);
+	$reshook = $hookmanager->executeHooks('addmoreproductstat', $parameters, $product,$nblines); // Note that $action and $object may have been modified by some hooks
 	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-
+	
 	print $hookmanager->resPrint;
 
 	return $nblines++;

From 6733d278d8775cab97e49afb47348c595e00510b Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <68746600+marc-dll@users.noreply.github.com>
Date: Tue, 8 Jun 2021 18:13:18 +0200
Subject: [PATCH 0480/1497] NEW: project time spent: conf to prevent recording
 time after X months

---
 htdocs/core/lib/project.lib.php    | 50 ++++++++++++++++++++++++++----
 htdocs/langs/en_US/admin.lang      |  1 +
 htdocs/langs/en_US/projects.lang   |  1 +
 htdocs/projet/admin/project.php    | 15 +++++++++
 htdocs/projet/class/task.class.php | 12 +++++++
 5 files changed, 73 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index aaa1e144202..d48d37a9539 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -1076,6 +1076,13 @@ 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
 	}
 
+    $restrictBefore = null;
+
+    if (! empty($conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS)) {
+        require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+        $restrictBefore = dol_time_plus_duree(dol_now(), - $conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS, 'm');
+    }
+
 	//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++)
 	{
@@ -1307,6 +1314,10 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 					$disabledtask = 1;
 				}
 
+                if ($restrictBefore && $preselectedday < $restrictBefore) {
+                    $disabledtask = 1;
+                }
+
 				// Form to add new time
 				print '<td class="nowrap leftborder center">';
 				$tableCell = $form->selectDate($preselectedday, $lines[$i]->id, 1, 1, 2, "addtime", 0, 0, $disabledtask);
@@ -1451,6 +1462,13 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 		$oldprojectforbreak = (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT) ? 0 : -1); // 0 = start break, -1 = never break
 	}
 
+    $restrictBefore = null;
+
+    if (! empty($conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS)) {
+        require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+        $restrictBefore = dol_time_plus_duree(dol_now(), - $conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS, 'm');
+    }
+
 	for ($i = 0; $i < $numlines; $i++)
 	{
 		if ($parent == 0) $level = 0;
@@ -1708,6 +1726,12 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 						$cssweekend = 'weekend';
 					}
 
+                    $disabledtaskday = $disabledtask;
+
+                    if (! $disabledtask && $restrictBefore && $tmpday < $restrictBefore) {
+                        $disabledtaskday = 1;
+                    }
+
 					$tableCell = '<td class="center hide'.$idw.($cssonholiday ? ' '.$cssonholiday : '').($cssweekend ? ' '.$cssweekend : '').'">';
 					//$tableCell .= 'idw='.$idw.' '.$conf->global->MAIN_START_WEEK.' '.$numstartworkingday.'-'.$numendworkingday;
 					$placeholder = '';
@@ -1717,7 +1741,7 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 						//$placeholder=' placeholder="00:00"';
 					 	//$tableCell.='+';
 					}
-				  	$tableCell .= '<input type="text" alt="'.($disabledtask ? '' : $alttitle).'" title="'.($disabledtask ? '' : $alttitle).'" '.($disabledtask ? 'disabled' : $placeholder).' class="center smallpadd" size="2" id="timeadded['.$inc.']['.$idw.']" name="task['.$lines[$i]->id.']['.$idw.']" value="" cols="2"  maxlength="5"';
+				  	$tableCell .= '<input type="text" alt="'.($disabledtaskday ? '' : $alttitle).'" title="'.($disabledtaskday ? '' : $alttitle).'" '.($disabledtaskday ? 'disabled' : $placeholder).' class="center smallpadd" size="2" id="timeadded['.$inc.']['.$idw.']" name="task['.$lines[$i]->id.']['.$idw.']" value="" cols="2"  maxlength="5"';
 					$tableCell .= ' onkeypress="return regexEvent(this,event,\'timeChar\')"';
 				   	$tableCell .= ' onkeyup="updateTotal('.$idw.',\''.$modeinput.'\')"';
 				   	$tableCell .= ' onblur="regexEvent(this,event,\''.$modeinput.'\'); updateTotal('.$idw.',\''.$modeinput.'\')" />';
@@ -1812,6 +1836,13 @@ function projectLinesPerMonth(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &
 		$oldprojectforbreak = (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT) ? 0 : -1); // 0 = start break, -1 = never break
 	}
 
+    $restrictBefore = null;
+
+    if (! empty($conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS)) {
+        require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+        $restrictBefore = dol_time_plus_duree(dol_now(), - $conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS, 'm');
+    }
+
 	for ($i = 0; $i < $numlines; $i++)
 	{
 		if ($parent == 0) $level = 0;
@@ -1954,10 +1985,11 @@ function projectLinesPerMonth(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &
 				$tableCell = ''; $modeinput = 'hours';
 				$TFirstDay = getFirstDayOfEachWeek($TWeek, date('Y', $firstdaytoshow));
 				$TFirstDay[reset($TWeek)] = 1;
-				foreach ($TFirstDay as &$fday) {
-					$fday--;
-				}
-				foreach ($TWeek as $weekNb)
+
+                $firstdaytoshowarray = dol_getdate($firstdaytoshow);
+                $year = $firstdaytoshowarray['year'];
+                $month = $firstdaytoshowarray['mon'];
+				foreach ($TWeek as $weekIndex => $weekNb)
 				{
 					$weekWorkLoad = $projectstatic->monthWorkLoadPerTask[$weekNb][$lines[$i]->id];
 					$totalforeachweek[$weekNb] += $weekWorkLoad;
@@ -1966,6 +1998,12 @@ function projectLinesPerMonth(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &
 					if ($weekWorkLoad > 0) $alreadyspent = convertSecondToTime($weekWorkLoad, 'allhourmin');
 					$alttitle = $langs->trans("AddHereTimeSpentForWeek", $weekNb);
 
+                    $disabledtaskweek = $disabledtask;
+                    $firstdayofweek = dol_mktime(0, 0, 0, $month, $TFirstDay[$weekIndex], $year);
+
+                    if (! $disabledtask && $restrictBefore && $firstdayofweek < $restrictBefore) {
+                        $disabledtaskweek = 1;
+                    }
 
 					$tableCell = '<td class="center hide weekend">';
 					$placeholder = '';
@@ -1976,7 +2014,7 @@ function projectLinesPerMonth(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &
 						//$tableCell.='+';
 					}
 
-					$tableCell .= '<input type="text" alt="'.($disabledtask ? '' : $alttitle).'" title="'.($disabledtask ? '' : $alttitle).'" '.($disabledtask ? 'disabled' : $placeholder).' class="center smallpadd" size="2" id="timeadded['.$inc.']['.((int) $weekNb).']" name="task['.$lines[$i]->id.']['.$TFirstDay[$weekNb].']" value="" cols="2"  maxlength="5"';
+					$tableCell .= '<input type="text" alt="'.($disabledtaskweek ? '' : $alttitle).'" title="'.($disabledtaskweek ? '' : $alttitle).'" '.($disabledtaskweek ? 'disabled' : $placeholder).' class="center smallpadd" size="2" id="timeadded['.$inc.']['.((int) $weekNb).']" name="task['.$lines[$i]->id.']['.($TFirstDay[$weekNb] - 1).']" value="" cols="2"  maxlength="5"';
 					$tableCell .= ' onkeypress="return regexEvent(this,event,\'timeChar\')"';
 					$tableCell .= ' onkeyup="updateTotal('.$weekNb.',\''.$modeinput.'\')"';
 					$tableCell .= ' onblur="regexEvent(this,event,\''.$modeinput.'\'); updateTotal('.$weekNb.',\''.$modeinput.'\')" />';
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index f5770bad737..446f01a5446 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -81,6 +81,7 @@ NumberOfBytes=Number of Bytes
 SearchString=Search string
 NotAvailableWhenAjaxDisabled=Not available when Ajax disabled
 AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
+TimesheetPreventAfterFollowingMonths=Prevent recording time spent after the following number of months
 JavascriptDisabled=JavaScript disabled
 UsePreviewTabs=Use preview tabs
 ShowPreview=Show preview
diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index 2aedbd53377..9fea85e7d1e 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -139,6 +139,7 @@ NoTasks=No tasks for this project
 LinkedToAnotherCompany=Linked to other third party
 TaskIsNotAssignedToUser=Task not assigned to user. Use button '<strong>%s</strong>' to assign task now.
 ErrorTimeSpentIsEmpty=Time spent is empty
+TimeRecordingRestrictedToNMonthsBack=Time recording is restricted to %s months back
 ThisWillAlsoRemoveTasks=This action will also delete all tasks of project (<b>%s</b> tasks at the moment) and all inputs of time spent.
 IfNeedToUseOtherObjectKeepEmpty=If some objects (invoice, order, ...), belonging to another third party, must be linked to the project to create, keep this empty to have the project being multi third parties.
 CloneTasks=Clone tasks
diff --git a/htdocs/projet/admin/project.php b/htdocs/projet/admin/project.php
index f36aae34c4f..143f75b72ab 100644
--- a/htdocs/projet/admin/project.php
+++ b/htdocs/projet/admin/project.php
@@ -242,6 +242,11 @@ elseif ($action == 'setdoc')
 		$projectToSelect = GETPOST('projectToSelect', 'alpha');
 		dolibarr_set_const($db, 'PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY', $projectToSelect, 'chaine', 0, '', $conf->entity); //Allow to disable this configuration if empty value
 	}
+	if (GETPOST('PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS'))
+	{
+		$timesheetFreezeDuration = GETPOST('timesheetFreezeDuration', 'alpha');
+		dolibarr_set_const($db, 'PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS', intval($timesheetFreezeDuration), 'chaine', 0, '', $conf->entity); //Allow to disable this configuration if empty value
+	}
 }
 
 
@@ -839,6 +844,16 @@ print '<input type="text" id="projectToSelect" name="projectToSelect" value="'.$
 print $form->textwithpicto('', $langs->trans('AllowToLinkFromOtherCompany'));
 print '<input type="submit" class="button" name="PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY" value="'.$langs->trans("Modify").'">';
 print '</td>';
+print '</tr>';
+
+print '<tr class="oddeven">';
+print '<td>'.$langs->trans("TimesheetPreventAfterFollowingMonths").'</td>';
+
+print '<td class="right" width="60" colspan="2">';
+print '<input type="number" id="timesheetFreezeDuration" name="timesheetFreezeDuration" min="0" step="1" value="'.$conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS.'"/>&nbsp;';
+print '<input type="submit" class="button" name="PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS" value="'.$langs->trans("Modify").'">';
+print '</td>';
+print '</tr>';
 
 print '</table>';
 
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index b4733de05ae..1b64f0d9a66 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -1095,6 +1095,18 @@ class Task extends CommonObject
 		if (isset($this->timespent_note)) $this->timespent_note = trim($this->timespent_note);
 		if (empty($this->timespent_datehour)) $this->timespent_datehour = $this->timespent_date;
 
+        if (! empty($conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS)) {
+            require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+            $restrictBefore = dol_time_plus_duree(dol_now(), - $conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS, 'm');
+
+            if ($this->timespent_date < $restrictBefore) {
+                $this->error = $langs->trans('TimeRecordingRestrictedToNMonthsBack', $conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS);
+                $this->errors[] = $this->error;
+                return -1;
+            }
+        }
+
+
 		$this->db->begin();
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."projet_task_time (";

From 71dbb8733d5516b02b0d8c1e418f69059fbc6ebf Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Tue, 8 Jun 2021 20:18:31 +0200
Subject: [PATCH 0481/1497] fix: #17827

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

diff --git a/htdocs/projet/document.php b/htdocs/projet/document.php
index b088dcf7141..df31724d07c 100644
--- a/htdocs/projet/document.php
+++ b/htdocs/projet/document.php
@@ -164,7 +164,7 @@ if ($object->id > 0) {
 
 	print dol_get_fiche_end();
 
-	$modulepart = 'project';
+	$modulepart = 'projet';
 	$permissiontoadd = ($userWrite > 0);
 	$permtoedit = ($userWrite > 0);
 	include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';

From 27f803cab0e73b2fb2bf69a7fe67be604b8acc54 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 9 Jun 2021 03:35:22 +0200
Subject: [PATCH 0482/1497] Fix receipt of cash fence must contains more legal
 information

---
 .../cashcontrol/class/cashcontrol.class.php   |  19 +--
 htdocs/compta/cashcontrol/report.php          | 108 ++++++++++--------
 2 files changed, 71 insertions(+), 56 deletions(-)

diff --git a/htdocs/compta/cashcontrol/class/cashcontrol.class.php b/htdocs/compta/cashcontrol/class/cashcontrol.class.php
index a59816eebd7..59580cb7c46 100644
--- a/htdocs/compta/cashcontrol/class/cashcontrol.class.php
+++ b/htdocs/compta/cashcontrol/class/cashcontrol.class.php
@@ -93,10 +93,12 @@ class CashControl extends CommonObject
 	'year_close' =>array('type'=>'integer', 'label'=>'Year close', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'position'=>50, 'css'=>'center'),
 	'month_close' =>array('type'=>'integer', 'label'=>'Month close', 'enabled'=>1, 'visible'=>1, 'position'=>55, 'css'=>'center'),
 	'day_close' =>array('type'=>'integer', 'label'=>'Day close', 'enabled'=>1, 'visible'=>1, 'position'=>60, 'css'=>'center'),
-	'date_valid' =>array('type'=>'datetime', 'label'=>'DateValidation', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>490),
 	'date_creation' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>500),
+	'date_valid' =>array('type'=>'datetime', 'label'=>'DateValidation', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>502),
 	'tms' =>array('type'=>'timestamp', 'label'=>'Tms', 'enabled'=>1, 'visible'=>0, 'notnull'=>1, 'position'=>505),
-	'import_key' =>array('type'=>'varchar(14)', 'label'=>'Import key', 'enabled'=>1, 'visible'=>0, 'position'=>510),
+	'fk_user_creat' =>array('type'=>'integer:User', 'label'=>'userCreation', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>600),
+	'fk_user_valid' =>array('type'=>'integer:User', 'label'=>'UserValidation', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>602),
+	'import_key' =>array('type'=>'varchar(14)', 'label'=>'Import key', 'enabled'=>1, 'visible'=>0, 'position'=>700),
 	'status' => array('type'=>'integer', 'label'=>'Status', 'enabled'=>1, 'visible'=>1, 'position'=>1000, 'notnull'=>1, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Brouillon', '1'=>'Validated')),
 	);
 
@@ -115,21 +117,24 @@ class CashControl extends CommonObject
 	public $cheque;
 	public $card;
 
-	/**
-	 * @var integer|string $date_valid
-	 */
-	public $date_valid;
-
 	/**
 	 * @var integer|string date_creation
 	 */
 	public $date_creation;
+	public $fk_user_creat;
 
 	/**
 	 * @var integer|string $date_modification
 	 */
 	public $date_modification;
 
+	/**
+	 * @var integer|string $date_valid
+	 */
+	public $date_valid;
+	public $fk_user_valid;
+
+
 	const STATUS_DRAFT = 0;
 	const STATUS_VALIDATED = 1;
 	const STATUS_CLOSED = 1; // For the moment CLOSED = VALIDATED
diff --git a/htdocs/compta/cashcontrol/report.php b/htdocs/compta/cashcontrol/report.php
index 653161ca3bc..12dff9d460a 100644
--- a/htdocs/compta/cashcontrol/report.php
+++ b/htdocs/compta/cashcontrol/report.php
@@ -26,7 +26,7 @@
 /**
  *	\file       htdocs/compta/cashcontrol/report.php
  *	\ingroup    cashdesk|takepos
- *	\brief      List of bank transactions
+ *	\brief      List of sales from POS
  */
 
 if (!defined('NOREQUIREMENU')) {
@@ -36,6 +36,8 @@ if (!defined('NOBROWSERNOTIF')) {
 	define('NOBROWSERNOTIF', '1'); // Disable browser notification
 }
 
+$_GET['optioncss'] = "print";
+
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/cashcontrol/class/cashcontrol.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
@@ -48,10 +50,8 @@ $langs->loadLangs(array("bills", "banks"));
 
 $id = GETPOST('id', 'int');
 
-$_GET['optioncss'] = "print";
-
-$cashcontrol = new CashControl($db);
-$cashcontrol->fetch($id);
+$object = new CashControl($db);
+$object->fetch($id);
 
 //$limit = GETPOST('limit')?GETPOST('limit', 'int'):$conf->liste_limit;
 $sortorder = 'ASC';
@@ -67,19 +67,19 @@ $arrayfields = array(
 	'b.credit'=>array('label'=>$langs->trans("Credit"), 'checked'=>1, 'position'=>605),
 );
 
-$syear  = $cashcontrol->year_close;
-$smonth = $cashcontrol->month_close;
-$sday   = $cashcontrol->day_close;
+$syear  = $object->year_close;
+$smonth = $object->month_close;
+$sday   = $object->day_close;
 
-$posmodule = $cashcontrol->posmodule;
-$terminalid = $cashcontrol->posnumber;
+$posmodule = $object->posmodule;
+$terminalid = $object->posnumber;
 
 // Security check
 if ($user->socid > 0) {	// Protection if external user
 	//$socid = $user->socid;
 	accessforbidden();
 }
-if (!$user->rights->cashdesk->run && !$user->rights->takepos->run) {
+if (empty($user->rights->cashdesk->run) && empty($user->rights->takepos->run)) {
 	accessforbidden();
 }
 
@@ -106,8 +106,8 @@ $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank_url as bu ON bu.fk_bank = b.rowid AND
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."facture as f ON bu.url_id = f.rowid";
 $sql.= " WHERE b.fk_account = ba.rowid";
 // Define filter on invoice
-$sql.= " AND f.module_source = '".$db->escape($cashcontrol->posmodule)."'";
-$sql.= " AND f.pos_source = '".$db->escape($cashcontrol->posnumber)."'";
+$sql.= " AND f.module_source = '".$db->escape($object->posmodule)."'";
+$sql.= " AND f.pos_source = '".$db->escape($object->posnumber)."'";
 $sql.= " AND f.entity IN (".getEntity('facture').")";
 // Define filter on data
 if ($syear && ! $smonth)              $sql.= " AND dateo BETWEEN '".$db->idate(dol_get_first_day($syear, 1))."' AND '".$db->idate(dol_get_last_day($syear, 12))."'";
@@ -151,19 +151,33 @@ if ($resql) {
 	$i = 0;
 
 	print "<!-- title of cash fence -->\n";
-	print "<center><h2>";
-	if ($cashcontrol->status != $cashcontrol::STATUS_DRAFT) {
-		print $langs->trans("CashControl")." ".$cashcontrol->id;
+	print '<center>';
+	print '<h2>';
+	if ($object->status != $object::STATUS_DRAFT) {
+		print $langs->trans("CashControl")." ".$object->id;
 	} else {
 		print $langs->trans("CashControl")." - ".$langs->trans("Draft");
 	}
-	print "<br>".$langs->trans("DateCreationShort").": ".dol_print_date($cashcontrol->date_creation, 'dayhour');
-	print "</h2></center>";
+	print "</h2>";
+	print $langs->trans("DateCreationShort").": ".dol_print_date($object->date_creation, 'dayhour');
+	print '<br>'.$mysoc->name;
+	$userauthor = $object->fk_user_valid;
+	if (empty($userauthor)) {
+		$userauthor = $object->fk_user_creat;
+	}
+
+	$uservalid = new User($db);
+	if ($userauthor > 0) {
+		$uservalid->fetch($userauthor);
+		print '<br>'.$langs->trans("Author").': '.$uservalid->getFullName($langs);
+	}
+	print '<br>'.$langs->trans("Period").': '.$object->year_close.($object->month_close ? '-'.$object->month_close : '').($object->day_close ? '-'.$object->day_close : '');
+	print '</center>';
 
 	$invoicetmp = new Facture($db);
 
 	print "<div style='text-align: right'><h2>";
-	print $langs->trans("InitialBankBalance").' - '.$langs->trans("Cash")." : ".price($cashcontrol->opening);
+	print $langs->trans("InitialBankBalance").' - '.$langs->trans("Cash").' : <span class="amount">'.price($object->opening).'</span>';
 	print "</h2></div>";
 
 	print '<div class="div-table-responsive">';
@@ -206,7 +220,7 @@ if ($resql) {
 		{
 			print '<tr class="oddeven">';
 			print '<td>'.$langs->trans("InitialBankBalance").' - '.$langs->trans("Cash").'</td>';
-			print '<td></td><td></td><td></td><td class="right"><span class="amount">'.price($cashcontrol->opening).'</span></td>';
+			print '<td></td><td></td><td></td><td class="right"><span class="amount">'.price($object->opening).'</span></td>';
 			print '</tr>';
 			$first = "no";
 		}*/
@@ -232,8 +246,8 @@ if ($resql) {
 		// Bank account
 		print '<td class="nowrap right">';
 		print $bankaccount->getNomUrl(1);
-		if ($cashcontrol->posmodule == "takepos") {
-			$var1 = 'CASHDESK_ID_BANKACCOUNT_CASH'.$cashcontrol->posnumber;
+		if ($object->posmodule == "takepos") {
+			$var1 = 'CASHDESK_ID_BANKACCOUNT_CASH'.$object->posnumber;
 		} else {
 			$var1 = 'CASHDESK_ID_BANKACCOUNT_CASH';
 		}
@@ -305,48 +319,44 @@ if ($resql) {
 	include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
 
 	print "</table>";
+	print "</div>";
 
-	//$cash = $amountpertype['LIQ'] + $cashcontrol->opening;
-	$cash = price2num($cash + $cashcontrol->opening, 'MT');
+	//$cash = $amountpertype['LIQ'] + $object->opening;
+	$cash = price2num($cash + $object->opening, 'MT');
 
-	print '<div style="text-align: right"><h2>';
-	print $langs->trans("Cash").": ".price($cash);
-	if ($cashcontrol->status == $cashcontrol::STATUS_VALIDATED && $cash != $cashcontrol->cash) {
-		print ' <> <span class="amountremaintopay">'.$langs->trans("Declared").': '.price($cashcontrol->cash).'</span>';
+	print '<div style="text-align: right">';
+	print '<h2>';
+
+	print $langs->trans("Cash").': <span class="amount">'.price($cash).'</span>';
+	if ($object->status == $object::STATUS_VALIDATED && $cash != $object->cash) {
+		print ' <> <span class="amountremaintopay">'.$langs->trans("Declared").': '.price($object->cash).'</span>';
 	}
-	print "<br><br>";
+	print "<br>";
 
 	//print '<br>';
-	print $langs->trans("PaymentTypeCHQ").": ".price($cheque);
-	if ($cashcontrol->status == $cashcontrol::STATUS_VALIDATED && $cheque != $cashcontrol->cheque) {
-		print ' <> <span class="amountremaintopay">'.$langs->trans("Declared").': '.price($cashcontrol->cheque).'</span>';
+	print $langs->trans("PaymentTypeCHQ").': <span class="amount">'.price($cheque).'</span>';
+	if ($object->status == $object::STATUS_VALIDATED && $cheque != $object->cheque) {
+		print ' <> <span class="amountremaintopay">'.$langs->trans("Declared").': '.price($object->cheque).'</span>';
 	}
-	print "<br><br>";
+	print "<br>";
 
 	//print '<br>';
-	print $langs->trans("PaymentTypeCB").": ".price($bank);
-	if ($cashcontrol->status == $cashcontrol::STATUS_VALIDATED && $bank != $cashcontrol->card) {
-		print ' <> <span class="amountremaintopay">'.$langs->trans("Declared").': '.price($cashcontrol->card).'</span>';
+	print $langs->trans("PaymentTypeCB").': <span class="amount">'.price($bank).'</span>';
+	if ($object->status == $object::STATUS_VALIDATED && $bank != $object->card) {
+		print ' <> <span class="amountremaintopay">'.$langs->trans("Declared").': '.price($object->card).'</span>';
 	}
-	print "<br><br>";
+	print "<br>";
 
 	// print '<br>';
 	if ($other) {
-		print '<br>'.$langs->trans("Other").": ".price($other)."<br><br>";
+		print ''.$langs->trans("Other").': <span class="amount">'.price($other)."</span>";
+		print '<br>';
 	}
-	print "</h2></div>";
 
-	//save totals to DB
-	/*
-	$sql = "UPDATE ".MAIN_DB_PREFIX."pos_cash_fence ";
-	$sql .= "SET";
-	$sql .= " cash='".$db->escape($cash)."'";
-	$sql .= ", card='".$db->escape($bank)."'";
-	$sql .= " where rowid = ".((int) $id);
-	$db->query($sql);
-	*/
+	print $langs->trans("Total").': <span class="amount">'.price($cash + $cheque + $bank + $other).'</span>';
 
-	print "</div>";
+	print '</h2>';
+	print '</div>';
 
 	print '</form>';
 

From f17e7a6979a9373183943d0afb906a69f41f0df3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 9 Jun 2021 03:54:19 +0200
Subject: [PATCH 0483/1497] Add more info

---
 htdocs/compta/cashcontrol/report.php | 50 ++++++++++++++++++++--------
 1 file changed, 37 insertions(+), 13 deletions(-)

diff --git a/htdocs/compta/cashcontrol/report.php b/htdocs/compta/cashcontrol/report.php
index 12dff9d460a..15345584f73 100644
--- a/htdocs/compta/cashcontrol/report.php
+++ b/htdocs/compta/cashcontrol/report.php
@@ -120,9 +120,10 @@ $sql.=" OR b.fk_account=".$conf->global->CASHDESK_ID_BANKACCOUNT_CB;
 $sql.=" OR b.fk_account=".$conf->global->CASHDESK_ID_BANKACCOUNT_CHEQUE;
 $sql.=")";
 */
-$sql = "SELECT f.rowid as facid, f.ref, f.datef as do, pf.amount as amount, b.fk_account as bankid, cp.code";
-$sql .= " FROM ".MAIN_DB_PREFIX."paiement_facture as pf, ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."paiement as p, ".MAIN_DB_PREFIX."c_paiement as cp, ".MAIN_DB_PREFIX."bank as b";
-$sql .= " WHERE pf.fk_facture = f.rowid AND p.rowid = pf.fk_paiement AND cp.id = p.fk_paiement AND p.fk_bank = b.rowid";
+$sql = "SELECT f.rowid as facid, f.ref, f.datef as do, pf.amount as amount, b.fk_account as bankid, cp.code, SUM(fd.qty) as qty";
+$sql .= " FROM ".MAIN_DB_PREFIX."paiement_facture as pf, ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."paiement as p, ".MAIN_DB_PREFIX."c_paiement as cp, ".MAIN_DB_PREFIX."bank as b,";
+$sql .= " ".MAIN_DB_PREFIX."facturedet as fd";
+$sql .= " WHERE pf.fk_facture = f.rowid AND p.rowid = pf.fk_paiement AND cp.id = p.fk_paiement AND p.fk_bank = b.rowid AND fd.fk_facture = f.rowid";
 $sql .= " AND f.module_source = '".$db->escape($posmodule)."'";
 $sql .= " AND f.pos_source = '".$db->escape($terminalid)."'";
 $sql .= " AND f.paye = 1";
@@ -144,6 +145,7 @@ if ($syear && !$smonth) {
 } else {
 	dol_print_error('', 'Year not defined');
 }
+$sql .= " GROUP BY f.rowid, f.ref, f.datef, pf.amount, b.fk_account, cp.code";
 
 $resql = $db->query($sql);
 if ($resql) {
@@ -196,15 +198,20 @@ if ($resql) {
 	print "</tr>\n";
 
 	// Loop on each record
-	$sign = 1;
 	$cash = $bank = $cheque = $other = 0;
 
-	$totalarray = array();
+	$totalqty = 0;
 	$cachebankaccount = array();
+	$transactionspertype = array();
 	$amountpertype = array();
+
+	$totalarray = array();
 	while ($i < $num) {
 		$objp = $db->fetch_object($resql);
 
+		$totalqty += $objp->qty;
+
+
 		if (empty($cachebankaccount[$objp->bankid])) {
 			$bankaccounttmp = new Account($db);
 			$bankaccounttmp->fetch($objp->bankid);
@@ -243,25 +250,42 @@ if ($resql) {
 			$totalarray['nbfield']++;
 		}
 
-		// Bank account
-		print '<td class="nowrap right">';
-		print $bankaccount->getNomUrl(1);
 		if ($object->posmodule == "takepos") {
 			$var1 = 'CASHDESK_ID_BANKACCOUNT_CASH'.$object->posnumber;
 		} else {
 			$var1 = 'CASHDESK_ID_BANKACCOUNT_CASH';
 		}
+
+		// Bank account
+		print '<td class="nowrap right">';
+		print $bankaccount->getNomUrl(1);
 		if ($objp->code == 'CHQ') {
 			$cheque += $objp->amount;
+			if (empty($transactionspertype[$objp->code])) {
+				$transactionspertype[$objp->code] = 0;
+			}
+			$transactionspertype[$objp->code] += 1;
 		} elseif ($objp->code == 'CB') {
 			$bank += $objp->amount;
+			if (empty($transactionspertype[$objp->code])) {
+				$transactionspertype[$objp->code] = 0;
+			}
+			$transactionspertype[$objp->code] += 1;
 		} else {
 			if ($conf->global->$var1 == $bankaccount->id) {
 				$cash += $objp->amount;
 				// } elseif ($conf->global->$var2 == $bankaccount->id) $bank+=$objp->amount;
 				//elseif ($conf->global->$var3 == $bankaccount->id) $cheque+=$objp->amount;
+				if (empty($transactionspertype['CASH'])) {
+					$transactionspertype['CASH'] = 0;
+				}
+				$transactionspertype['CASH'] += 1;
 			} else {
 				$other += $objp->amount;
+				if (empty($transactionspertype['OTHER'])) {
+					$transactionspertype['OTHER'] = 0;
+				}
+				$transactionspertype['OTHER'] += 1;
 			}
 		}
 		print "</td>\n";
@@ -327,21 +351,21 @@ if ($resql) {
 	print '<div style="text-align: right">';
 	print '<h2>';
 
-	print $langs->trans("Cash").': <span class="amount">'.price($cash).'</span>';
+	print $langs->trans("Cash").' '.($transactionspertype['CASH']?'('.$transactionspertype['CASH'].')':'').': <span class="amount">'.price($cash).'</span>';
 	if ($object->status == $object::STATUS_VALIDATED && $cash != $object->cash) {
 		print ' <> <span class="amountremaintopay">'.$langs->trans("Declared").': '.price($object->cash).'</span>';
 	}
 	print "<br>";
 
 	//print '<br>';
-	print $langs->trans("PaymentTypeCHQ").': <span class="amount">'.price($cheque).'</span>';
+	print $langs->trans("PaymentTypeCHQ").' '.($transactionspertype['CHQ']?'('.$transactionspertype['CHQ'].')':'').': <span class="amount">'.price($cheque).'</span>';
 	if ($object->status == $object::STATUS_VALIDATED && $cheque != $object->cheque) {
 		print ' <> <span class="amountremaintopay">'.$langs->trans("Declared").': '.price($object->cheque).'</span>';
 	}
 	print "<br>";
 
 	//print '<br>';
-	print $langs->trans("PaymentTypeCB").': <span class="amount">'.price($bank).'</span>';
+	print $langs->trans("PaymentTypeCB").' '.($transactionspertype['CB']?'('.$transactionspertype['CB'].')':'').': <span class="amount">'.price($bank).'</span>';
 	if ($object->status == $object::STATUS_VALIDATED && $bank != $object->card) {
 		print ' <> <span class="amountremaintopay">'.$langs->trans("Declared").': '.price($object->card).'</span>';
 	}
@@ -349,11 +373,11 @@ if ($resql) {
 
 	// print '<br>';
 	if ($other) {
-		print ''.$langs->trans("Other").': <span class="amount">'.price($other)."</span>";
+		print ''.$langs->trans("Other").' '.($transactionspertype['OTHER']?'('.$transactionspertype['OTHER'].')':'').': <span class="amount">'.price($other)."</span>";
 		print '<br>';
 	}
 
-	print $langs->trans("Total").': <span class="amount">'.price($cash + $cheque + $bank + $other).'</span>';
+	print $langs->trans("Total").' ('.$totalqty.' '.$langs->trans("Articles").') : <span class="amount">'.price($cash + $cheque + $bank + $other).'</span>';
 
 	print '</h2>';
 	print '</div>';

From cfa268e0d30147011abaeb6e37f629e019f261d3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 9 Jun 2021 04:13:57 +0200
Subject: [PATCH 0484/1497] Fix we must add total vat on cash fence receipts
 (Ticket Z)

---
 htdocs/compta/cashcontrol/report.php | 35 ++++++++++++++--------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/htdocs/compta/cashcontrol/report.php b/htdocs/compta/cashcontrol/report.php
index 15345584f73..fb6e75c68c4 100644
--- a/htdocs/compta/cashcontrol/report.php
+++ b/htdocs/compta/cashcontrol/report.php
@@ -120,10 +120,9 @@ $sql.=" OR b.fk_account=".$conf->global->CASHDESK_ID_BANKACCOUNT_CB;
 $sql.=" OR b.fk_account=".$conf->global->CASHDESK_ID_BANKACCOUNT_CHEQUE;
 $sql.=")";
 */
-$sql = "SELECT f.rowid as facid, f.ref, f.datef as do, pf.amount as amount, b.fk_account as bankid, cp.code, SUM(fd.qty) as qty";
-$sql .= " FROM ".MAIN_DB_PREFIX."paiement_facture as pf, ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."paiement as p, ".MAIN_DB_PREFIX."c_paiement as cp, ".MAIN_DB_PREFIX."bank as b,";
-$sql .= " ".MAIN_DB_PREFIX."facturedet as fd";
-$sql .= " WHERE pf.fk_facture = f.rowid AND p.rowid = pf.fk_paiement AND cp.id = p.fk_paiement AND p.fk_bank = b.rowid AND fd.fk_facture = f.rowid";
+$sql = "SELECT f.rowid as facid, f.ref, f.datef as do, pf.amount as amount, b.fk_account as bankid, cp.code";
+$sql .= " FROM ".MAIN_DB_PREFIX."paiement_facture as pf, ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."paiement as p, ".MAIN_DB_PREFIX."c_paiement as cp, ".MAIN_DB_PREFIX."bank as b";
+$sql .= " WHERE pf.fk_facture = f.rowid AND p.rowid = pf.fk_paiement AND cp.id = p.fk_paiement AND p.fk_bank = b.rowid";
 $sql .= " AND f.module_source = '".$db->escape($posmodule)."'";
 $sql .= " AND f.pos_source = '".$db->escape($terminalid)."'";
 $sql .= " AND f.paye = 1";
@@ -145,7 +144,6 @@ if ($syear && !$smonth) {
 } else {
 	dol_print_error('', 'Year not defined');
 }
-$sql .= " GROUP BY f.rowid, f.ref, f.datef, pf.amount, b.fk_account, cp.code";
 
 $resql = $db->query($sql);
 if ($resql) {
@@ -161,8 +159,8 @@ if ($resql) {
 		print $langs->trans("CashControl")." - ".$langs->trans("Draft");
 	}
 	print "</h2>";
-	print $langs->trans("DateCreationShort").": ".dol_print_date($object->date_creation, 'dayhour');
-	print '<br>'.$mysoc->name;
+	print $mysoc->name;
+	print '<br>'.$langs->trans("DateCreationShort").": ".dol_print_date($object->date_creation, 'dayhour');
 	$userauthor = $object->fk_user_valid;
 	if (empty($userauthor)) {
 		$userauthor = $object->fk_user_creat;
@@ -201,7 +199,9 @@ if ($resql) {
 	$cash = $bank = $cheque = $other = 0;
 
 	$totalqty = 0;
+	$totalvat = 0;
 	$cachebankaccount = array();
+	$cacheinvoiceid = array();
 	$transactionspertype = array();
 	$amountpertype = array();
 
@@ -209,9 +209,7 @@ if ($resql) {
 	while ($i < $num) {
 		$objp = $db->fetch_object($resql);
 
-		$totalqty += $objp->qty;
-
-
+		// Load bankaccount
 		if (empty($cachebankaccount[$objp->bankid])) {
 			$bankaccounttmp = new Account($db);
 			$bankaccounttmp->fetch($objp->bankid);
@@ -223,14 +221,13 @@ if ($resql) {
 
 		$invoicetmp->fetch($objp->facid);
 
-		/*if ($first == "yes")
-		{
-			print '<tr class="oddeven">';
-			print '<td>'.$langs->trans("InitialBankBalance").' - '.$langs->trans("Cash").'</td>';
-			print '<td></td><td></td><td></td><td class="right"><span class="amount">'.price($object->opening).'</span></td>';
-			print '</tr>';
-			$first = "no";
-		}*/
+		if (empty($cacheinvoiceid[$objp->facid])) {
+			$cacheinvoiceid[$objp->facid] = $objp->facid;	// First time this invoice is found into list of invoice x payments
+			foreach($invoicetmp->lines as $line) {
+				$totalqty += $line->qty;
+				$totalvat += $line->total_tva;
+			}
+		}
 
 		print '<tr class="oddeven">';
 
@@ -378,6 +375,8 @@ if ($resql) {
 	}
 
 	print $langs->trans("Total").' ('.$totalqty.' '.$langs->trans("Articles").') : <span class="amount">'.price($cash + $cheque + $bank + $other).'</span>';
+	print '<br>'.$langs->trans("TotalVAT").' : <span class="amount">'.price($totalvat).'</span>';
+	// TODO Add total localtaxes.
 
 	print '</h2>';
 	print '</div>';

From a4f3792cec80c7f5bcc9d52f7f4a7fb79143239e Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Wed, 9 Jun 2021 07:42:05 +0200
Subject: [PATCH 0485/1497] FIX Missing link to language file

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

diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 40ff6625163..9b747d9c713 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -92,7 +92,7 @@ $result = restrictedArea($user, 'user', $id, 'user', $feature2);
 if ($user->id <> $id && !$canreaduser) accessforbidden();
 
 // Load translation files required by page
-$langs->loadLangs(array('users', 'companies', 'ldap', 'admin', 'hrm', 'stocks'));
+$langs->loadLangs(array('users', 'companies', 'ldap', 'admin', 'hrm', 'stocks', 'other'));
 
 $object = new User($db);
 $extrafields = new ExtraFields($db);

From a141d722ad3477f3e1afa501c727278911e6f4e0 Mon Sep 17 00:00:00 2001
From: MOREAU FRANCK <moreauf@theobald-groupe.com>
Date: Wed, 9 Jun 2021 08:39:06 +0200
Subject: [PATCH 0486/1497] Adding hooks on product stat in order to allow to
 expand stat on other modules stickler-ci test corrections

---
 htdocs/core/lib/product.lib.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php
index e87e63666ef..4b249a1cc9a 100644
--- a/htdocs/core/lib/product.lib.php
+++ b/htdocs/core/lib/product.lib.php
@@ -559,11 +559,12 @@ function show_stats_for_company($product, $socid)
 		print '</tr>';
 	}
 	$parameters = array('socid'=>$socid);
-	$reshook = $hookmanager->executeHooks('addmoreproductstat', $parameters, $product,$nblines); // Note that $action and $object may have been modified by some hooks
+	$reshook = $hookmanager->executeHooks('addmoreproductstat', $parameters, $product, $nblines); // Note that $action and $object may have been modified by some hooks
 	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-	
+
 	print $hookmanager->resPrint;
 
+
 	return $nblines++;
 }
 

From 7317aad41f76c944b21618df2caf3346788520e8 Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <68746600+marc-dll@users.noreply.github.com>
Date: Wed, 9 Jun 2021 11:08:38 +0200
Subject: [PATCH 0487/1497] FIX: projet time spent: also restrict to X months
 back for update and delete

---
 htdocs/projet/class/task.class.php | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index 1b64f0d9a66..e974532f545 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -1465,6 +1465,17 @@ class Task extends CommonObject
 		if (empty($this->timespent_datehour)) $this->timespent_datehour = $this->timespent_date;
 		if (isset($this->timespent_note)) $this->timespent_note = trim($this->timespent_note);
 
+        if (! empty($conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS)) {
+            require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+            $restrictBefore = dol_time_plus_duree(dol_now(), - $conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS, 'm');
+
+            if ($this->timespent_date < $restrictBefore) {
+                $this->error = $langs->trans('TimeRecordingRestrictedToNMonthsBack', $conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS);
+                $this->errors[] = $this->error;
+                return -1;
+            }
+        }
+
 		$this->db->begin();
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."projet_task_time SET";
@@ -1530,6 +1541,17 @@ class Task extends CommonObject
 
 		$error = 0;
 
+        if (! empty($conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS)) {
+            require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+            $restrictBefore = dol_time_plus_duree(dol_now(), - $conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS, 'm');
+
+            if ($this->timespent_date < $restrictBefore) {
+                $this->error = $langs->trans('TimeRecordingRestrictedToNMonthsBack', $conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS);
+                $this->errors[] = $this->error;
+                return -1;
+            }
+        }
+
 		$this->db->begin();
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."projet_task_time";

From c62c668c68e9456cd36864de6ecbf3c5d95af2e0 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Wed, 9 Jun 2021 09:29:22 +0000
Subject: [PATCH 0488/1497] Fixing style errors.

---
 htdocs/projet/class/task.class.php | 54 +++++++++++++++---------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index f46869382a5..05ce98b8896 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -1158,16 +1158,16 @@ class Task extends CommonObject
 			$this->timespent_datehour = $this->timespent_date;
 		}
 
-        if (! empty($conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS)) {
-            require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-            $restrictBefore = dol_time_plus_duree(dol_now(), - $conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS, 'm');
+		if (! empty($conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS)) {
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+			$restrictBefore = dol_time_plus_duree(dol_now(), - $conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS, 'm');
 
-            if ($this->timespent_date < $restrictBefore) {
-                $this->error = $langs->trans('TimeRecordingRestrictedToNMonthsBack', $conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS);
-                $this->errors[] = $this->error;
-                return -1;
-            }
-        }
+			if ($this->timespent_date < $restrictBefore) {
+				$this->error = $langs->trans('TimeRecordingRestrictedToNMonthsBack', $conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS);
+				$this->errors[] = $this->error;
+				return -1;
+			}
+		}
 
 
 		$this->db->begin();
@@ -1531,16 +1531,16 @@ class Task extends CommonObject
 			$this->timespent_note = trim($this->timespent_note);
 		}
 
-        if (! empty($conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS)) {
-            require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-            $restrictBefore = dol_time_plus_duree(dol_now(), - $conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS, 'm');
+		if (! empty($conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS)) {
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+			$restrictBefore = dol_time_plus_duree(dol_now(), - $conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS, 'm');
 
-            if ($this->timespent_date < $restrictBefore) {
-                $this->error = $langs->trans('TimeRecordingRestrictedToNMonthsBack', $conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS);
-                $this->errors[] = $this->error;
-                return -1;
-            }
-        }
+			if ($this->timespent_date < $restrictBefore) {
+				$this->error = $langs->trans('TimeRecordingRestrictedToNMonthsBack', $conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS);
+				$this->errors[] = $this->error;
+				return -1;
+			}
+		}
 
 		$this->db->begin();
 
@@ -1608,16 +1608,16 @@ class Task extends CommonObject
 
 		$error = 0;
 
-        if (! empty($conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS)) {
-            require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-            $restrictBefore = dol_time_plus_duree(dol_now(), - $conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS, 'm');
+		if (! empty($conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS)) {
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+			$restrictBefore = dol_time_plus_duree(dol_now(), - $conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS, 'm');
 
-            if ($this->timespent_date < $restrictBefore) {
-                $this->error = $langs->trans('TimeRecordingRestrictedToNMonthsBack', $conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS);
-                $this->errors[] = $this->error;
-                return -1;
-            }
-        }
+			if ($this->timespent_date < $restrictBefore) {
+				$this->error = $langs->trans('TimeRecordingRestrictedToNMonthsBack', $conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS);
+				$this->errors[] = $this->error;
+				return -1;
+			}
+		}
 
 		$this->db->begin();
 

From 4b6fb7dd47eec16fba08c9e0da51d3ec1a974864 Mon Sep 17 00:00:00 2001
From: Gauthier PC portable 024 <gauthier.verdol@atm-consulting.fr>
Date: Wed, 9 Jun 2021 12:26:28 +0200
Subject: [PATCH 0489/1497] FIX : auto rounding on "_FORMATED_" tags

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 4d450768fe7..51b7442defe 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -6453,11 +6453,11 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 		if ($onlykey != 2 || $mysoc->useLocalTax(1)) $substitutionarray['__AMOUNT_TAX2__']     = is_object($object) ? $object->total_localtax1 : '';
 		if ($onlykey != 2 || $mysoc->useLocalTax(2)) $substitutionarray['__AMOUNT_TAX3__']     = is_object($object) ? $object->total_localtax2 : '';
 
-		$substitutionarray['__AMOUNT_FORMATED__']          = is_object($object) ? ($object->total_ttc ? price($object->total_ttc, 0, $outputlangs, 0, 0, -1, $conf->currency) : null) : '';
-		$substitutionarray['__AMOUNT_EXCL_TAX_FORMATED__'] = is_object($object) ? ($object->total_ht ? price($object->total_ht, 0, $outputlangs, 0, 0, -1, $conf->currency) : null) : '';
-		$substitutionarray['__AMOUNT_VAT_FORMATED__']      = is_object($object) ? ($object->total_vat ? price($object->total_vat, 0, $outputlangs, 0, 0, -1, $conf->currency) : ($object->total_tva ? price($object->total_tva, 0, $outputlangs, 0, 0, -1, $conf->currency) : null)) : '';
-		if ($onlykey != 2 || $mysoc->useLocalTax(1)) $substitutionarray['__AMOUNT_TAX2_FORMATED__']     = is_object($object) ? ($object->total_localtax1 ? price($object->total_localtax1, 0, $outputlangs, 0, 0, -1, $conf->currency) : null) : '';
-		if ($onlykey != 2 || $mysoc->useLocalTax(2)) $substitutionarray['__AMOUNT_TAX3_FORMATED__']     = is_object($object) ? ($object->total_localtax2 ? price($object->total_localtax2, 0, $outputlangs, 0, 0, -1, $conf->currency) : null) : '';
+		$substitutionarray['__AMOUNT_FORMATED__']          = is_object($object) ? ($object->total_ttc ? price($object->total_ttc, 0, $outputlangs, 0, -1, -1, $conf->currency) : null) : '';
+		$substitutionarray['__AMOUNT_EXCL_TAX_FORMATED__'] = is_object($object) ? ($object->total_ht ? price($object->total_ht, 0, $outputlangs, 0, -1, -1, $conf->currency) : null) : '';
+		$substitutionarray['__AMOUNT_VAT_FORMATED__']      = is_object($object) ? ($object->total_vat ? price($object->total_vat, 0, $outputlangs, 0, -1, -1, $conf->currency) : ($object->total_tva ? price($object->total_tva, 0, $outputlangs, 0, 0, -1, $conf->currency) : null)) : '';
+		if ($onlykey != 2 || $mysoc->useLocalTax(1)) $substitutionarray['__AMOUNT_TAX2_FORMATED__']     = is_object($object) ? ($object->total_localtax1 ? price($object->total_localtax1, 0, $outputlangs, 0, -1, -1, $conf->currency) : null) : '';
+		if ($onlykey != 2 || $mysoc->useLocalTax(2)) $substitutionarray['__AMOUNT_TAX3_FORMATED__']     = is_object($object) ? ($object->total_localtax2 ? price($object->total_localtax2, 0, $outputlangs, 0, -1, -1, $conf->currency) : null) : '';
 
 		// TODO Add keys for foreign multicurrency
 

From 5d9aa40065c68cb5f837570b1d229f119ffeca81 Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <68746600+marc-dll@users.noreply.github.com>
Date: Wed, 9 Jun 2021 12:40:34 +0200
Subject: [PATCH 0490/1497] FIX: holiday list: bad right for mass deletion

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

diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index 18df214f4c6..7e77ef45d35 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -381,7 +381,7 @@ if ($resql)
 		//'builddoc'=>$langs->trans("PDFMerge"),
 		//'presend'=>$langs->trans("SendByMail"),
 	);
-	if ($user->rights->holiday->supprimer) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
+	if ($user->rights->holiday->delete) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
 	if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
 	$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 

From c375668ab6d87612490377787ac5a233196ef11d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 9 Jun 2021 12:41:53 +0200
Subject: [PATCH 0491/1497] Clean code

---
 htdocs/admin/system/security.php |  2 +-
 htdocs/core/lib/geturl.lib.php   |  7 +++++--
 test/phpunit/SecurityTest.php    | 11 ++++++++---
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/htdocs/admin/system/security.php b/htdocs/admin/system/security.php
index e972581beaa..5214808985d 100644
--- a/htdocs/admin/system/security.php
+++ b/htdocs/admin/system/security.php
@@ -277,7 +277,7 @@ if ($conf->global->MAIN_SECURITY_HASH_ALGO != 'password_hash') {
 print '<br>';
 
 
-print '<strong>MAIN_SECURITY_ANTI_SSRF_SERVER_IP</strong> = '.(empty($conf->global->MAIN_SECURITY_ANTI_SSRF_SERVER_IP) ? '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>' : $conf->global->MAIN_SECURITY_ANTI_SSRF_SERVER_IP)."<br>";
+print '<strong>MAIN_SECURITY_ANTI_SSRF_SERVER_IP</strong> = '.(empty($conf->global->MAIN_SECURITY_ANTI_SSRF_SERVER_IP) ? '<span class="opacitymedium">'.$langs->trans("Undefined").'</span> &nbsp; <span class="opacitymedium">('.$langs->trans("Example").': static-ips-of-server - '.$langs->trans("Note").': common loopback ip like 127.*.*.*, [::1] are already added)</span>' : $conf->global->MAIN_SECURITY_ANTI_SSRF_SERVER_IP)."<br>";
 print '<br>';
 
 print '<strong>MAIN_ALLOW_SVG_FILES_AS_IMAGES</strong> = '.(empty($conf->global->MAIN_ALLOW_SVG_FILES_AS_IMAGES) ? '0 &nbsp; <span class="opacitymedium">('.$langs->trans("Recommanded").': 0)</span>' : $conf->global->MAIN_ALLOW_SVG_FILES_AS_IMAGES)."<br>";
diff --git a/htdocs/core/lib/geturl.lib.php b/htdocs/core/lib/geturl.lib.php
index 9feddb6f7f5..f87e7b7b4cd 100644
--- a/htdocs/core/lib/geturl.lib.php
+++ b/htdocs/core/lib/geturl.lib.php
@@ -24,7 +24,9 @@
 /**
  * Function to get a content from an URL (use proxy if proxy defined).
  * Support Dolibarr setup for timeout and proxy.
- * Enhancement of CURL to add an anti SSRF protection.
+ * Enhancement of CURL to add an anti SSRF protection:
+ * - you can set MAIN_SECURITY_ANTI_SSRF_SERVER_IP to set static ip of server
+ * - common local lookup ips like 127.*.*.* are automatically added
  *
  * @param	string	  $url 				    URL to call.
  * @param	string    $postorget		    'POST', 'GET', 'HEAD', 'PUT', 'PUTALREADYFORMATED', 'POSTALREADYFORMATED', 'DELETE'
@@ -199,12 +201,13 @@ function getURLContent($url, $postorget = 'GET', $param = '', $followlocation =
 				}
 			}
 			if ($localurl == 1) {	// Only local url allowed (dangerous, may allow to get metadata on server or make internal port scanning)
+				// Deny ips NOT like 10.0.0.0/8, 172.16.0.0/12, 192.168.0.0/16, 0.0.0.0/8, 169.254.0.0/16, 127.0.0.0/8 et 240.0.0.0/4, ::1/128, ::/128, ::ffff:0:0/96, fe80::/10...
 				if (filter_var($iptocheck, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE)) {
 					$info['http_code'] = 400;
 					$info['content'] = 'Error bad hostname '.$iptocheck.'. Must be a local URL.';
 					break;
 				}
-				if (!empty($conf->global->MAIN_SECURITY_ANTI_SSRF_SERVER_IP) && !in_array($iptocheck, explode(',', '127.0.0.1,::1,'.$conf->global->MAIN_SECURITY_ANTI_SSRF_SERVER_IP))) {
+				if (!empty($conf->global->MAIN_SECURITY_ANTI_SSRF_SERVER_IP) && !in_array($iptocheck, explode(',', $conf->global->MAIN_SECURITY_ANTI_SSRF_SERVER_IP))) {
 					$info['http_code'] = 400;
 					$info['content'] = 'Error bad hostname IP (IP is not a local IP defined into list MAIN_SECURITY_SERVER_IP). Must be a local URL in allowed list.';
 					break;
diff --git a/test/phpunit/SecurityTest.php b/test/phpunit/SecurityTest.php
index 944d4f4cbe5..f889a6c542b 100644
--- a/test/phpunit/SecurityTest.php
+++ b/test/phpunit/SecurityTest.php
@@ -703,17 +703,22 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 		$url = 'http://127.0.0.1';
 		$tmp = getURLContent($url, 'GET', '', 0, array(), array('http', 'https'), 0);		// Only external URL
 		print __METHOD__." url=".$url."\n";
-		$this->assertEquals(400, $tmp['http_code'], 'GET url to '.$url.' that is a local URL');	// Test we receive an error because localtest.me is not an external URL
+		$this->assertEquals(400, $tmp['http_code'], 'GET url to '.$url.' that is a local URL');	// Test we receive an error because 127.0.0.1 is not an external URL
+
+		$url = 'http://127.0.2.1';
+		$tmp = getURLContent($url, 'GET', '', 0, array(), array('http', 'https'), 0);		// Only external URL
+		print __METHOD__." url=".$url."\n";
+		$this->assertEquals(400, $tmp['http_code'], 'GET url to '.$url.' that is a local URL');	// Test we receive an error because 127.0.2.1 is not an external URL
 
 		$url = 'https://169.254.0.1';
 		$tmp = getURLContent($url, 'GET', '', 0, array(), array('http', 'https'), 0);		// Only external URL
 		print __METHOD__." url=".$url."\n";
-		$this->assertEquals(400, $tmp['http_code'], 'GET url to '.$url.' that is a local URL');	// Test we receive an error because localtest.me is not an external URL
+		$this->assertEquals(400, $tmp['http_code'], 'GET url to '.$url.' that is a local URL');	// Test we receive an error because 169.254.0.1 is not an external URL
 
 		$url = 'http://[::1]';
 		$tmp = getURLContent($url, 'GET', '', 0, array(), array('http', 'https'), 0);		// Only external URL
 		print __METHOD__." url=".$url."\n";
-		$this->assertEquals(400, $tmp['http_code'], 'GET url to '.$url.' that is a local URL');	// Test we receive an error because localtest.me is not an external URL
+		$this->assertEquals(400, $tmp['http_code'], 'GET url to '.$url.' that is a local URL');	// Test we receive an error because [::1] is not an external URL
 
 		/*$url = 'localtest.me';
 		 $tmp = getURLContent($url, 'GET', '', 0, array(), array('http', 'https'), 0);		// Only external URL

From 14e3d04e25eceb52baafa43202f69759bf08717e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 9 Jun 2021 13:02:17 +0200
Subject: [PATCH 0492/1497] Add more info on security page

---
 htdocs/admin/system/security.php | 14 ++++++++++++++
 htdocs/langs/en_US/admin.lang    |  6 ++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/htdocs/admin/system/security.php b/htdocs/admin/system/security.php
index 5214808985d..b076cd020be 100644
--- a/htdocs/admin/system/security.php
+++ b/htdocs/admin/system/security.php
@@ -245,8 +245,22 @@ if (empty($dolibarr_main_restrict_ip)) {
 	print '<span class="opacitymedium">'.$langs->trans("None").'</span>';
 	//print ' <span class="opacitymedium">('.$langs->trans("RecommendedValueIs", $langs->transnoentitiesnoconv("IPsOfUsers")).')</span>';
 }
+
 print '<br>';
 
+if (empty($conf->global->SECURITY_DISABLE_TEST_ON_OBFUSCATED_CONF)) {
+	print '<strong>$dolibarr_main_db_pass</strong>: ';
+	if (!empty($dolibarr_main_db_pass) && !preg_match('/^crypted:/', $dolibarr_main_db_pass)) {
+		print img_picto('', 'warning').' '.$langs->trans("DatabasePasswordNotObfuscated").' &nbsp; <span class="opacitymedium">('.$langs->trans("Recommanded").': '.$langs->trans("SetOptionTo", $langs->transnoentitiesnoconv("MainDbPasswordFileConfEncrypted"), yn(1)).')</span>';
+		//print ' <span class="opacitymedium">('.$langs->trans("RecommendedValueIs", $langs->transnoentitiesnoconv("IPsOfUsers")).')</span>';
+	} else {
+		print img_picto('', 'tick').' '.$langs->trans("");
+	}
+
+	print '<br>';
+}
+
+
 
 // Menu security
 
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index b7618f64739..5ae901dc7b2 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -221,8 +221,8 @@ NotCompatible=This module does not seem compatible with your Dolibarr %s (Min %s
 CompatibleAfterUpdate=This module requires an update to your Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=See in Market place
 SeeSetupOfModule=See setup of module %s
+SetOptionTo=Set option <b>%s</b> to %s
 Updated=Updated
-Nouveauté=Novelty
 AchatTelechargement=Buy / Download
 GoModuleSetupArea=To deploy/install a new module, go to the Module setup area: <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
@@ -2141,4 +2141,6 @@ ModuleUpdateAvailable=An update is available
 NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
 YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
-RandomlySelectedIfSeveral=Randomly selected if several pictures are available
\ No newline at end of file
+RandomlySelectedIfSeveral=Randomly selected if several pictures are available
+DatabasePasswordObfuscated=Database password obfucated in conf file
+DatabasePasswordNotObfuscated=Database password obfucated in conf file

From a78d29bb710cd913c6de7853a4c3f1a35645b3a4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 9 Jun 2021 13:05:32 +0200
Subject: [PATCH 0493/1497] Fix trans

---
 htdocs/langs/en_US/admin.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 5ae901dc7b2..2939d93b0c6 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1191,7 +1191,7 @@ SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of m
 SetupDescription5=Other Setup menu entries manage optional parameters.
 AuditedSecurityEvents=Security events that are audited
 NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
-Audit=Audit
+Audit=Security events
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
 InfoOS=About OS

From 997674aebc8af3e4d3042096ff3f9ab8f86b82cc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 9 Jun 2021 13:15:47 +0200
Subject: [PATCH 0494/1497] Fix trans

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

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 2939d93b0c6..ef97369f040 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -2142,5 +2142,5 @@ NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
 YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
 RandomlySelectedIfSeveral=Randomly selected if several pictures are available
-DatabasePasswordObfuscated=Database password obfucated in conf file
-DatabasePasswordNotObfuscated=Database password obfucated in conf file
+DatabasePasswordObfuscated=Database password is obfuscated in conf file
+DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file

From 458ef9f8daacc73830ae7f481dc10e05a8682061 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 9 Jun 2021 13:31:00 +0200
Subject: [PATCH 0495/1497] Fix security test

---
 htdocs/admin/system/security.php | 4 ++--
 htdocs/filefunc.inc.php          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/admin/system/security.php b/htdocs/admin/system/security.php
index b076cd020be..85ad40775d2 100644
--- a/htdocs/admin/system/security.php
+++ b/htdocs/admin/system/security.php
@@ -250,11 +250,11 @@ print '<br>';
 
 if (empty($conf->global->SECURITY_DISABLE_TEST_ON_OBFUSCATED_CONF)) {
 	print '<strong>$dolibarr_main_db_pass</strong>: ';
-	if (!empty($dolibarr_main_db_pass) && !preg_match('/^crypted:/', $dolibarr_main_db_pass)) {
+	if (!empty($dolibarr_main_db_pass) && empty($dolibarr_main_db_encrypted_pass)) {
 		print img_picto('', 'warning').' '.$langs->trans("DatabasePasswordNotObfuscated").' &nbsp; <span class="opacitymedium">('.$langs->trans("Recommanded").': '.$langs->trans("SetOptionTo", $langs->transnoentitiesnoconv("MainDbPasswordFileConfEncrypted"), yn(1)).')</span>';
 		//print ' <span class="opacitymedium">('.$langs->trans("RecommendedValueIs", $langs->transnoentitiesnoconv("IPsOfUsers")).')</span>';
 	} else {
-		print img_picto('', 'tick').' '.$langs->trans("");
+		print img_picto('', 'tick').' '.$langs->trans("DatabasePasswordObfuscated");
 	}
 
 	print '<br>';
diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index 2c7795b9ac8..777fde21885 100644
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -349,7 +349,7 @@ if ((!empty($dolibarr_main_db_pass) && preg_match('/crypted:/i', $dolibarr_main_
 	if (!empty($dolibarr_main_db_pass) && preg_match('/crypted:/i', $dolibarr_main_db_pass)) {
 		$dolibarr_main_db_pass = preg_replace('/crypted:/i', '', $dolibarr_main_db_pass);
 		$dolibarr_main_db_pass = dol_decode($dolibarr_main_db_pass);
-		$dolibarr_main_db_encrypted_pass = $dolibarr_main_db_pass; // We need to set this as it is used to know the password was initially crypted
+		$dolibarr_main_db_encrypted_pass = $dolibarr_main_db_pass; // We need to set this so we can use it later to know the password was initially crypted
 	} else {
 		$dolibarr_main_db_pass = dol_decode($dolibarr_main_db_encrypted_pass);
 	}

From e915e3403c8030d3dc8c98f064f309af09d966b9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 9 Jun 2021 13:36:37 +0200
Subject: [PATCH 0496/1497] Trans

---
 htdocs/langs/fr_FR/admin.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index e9b5ddf5c4e..ecaa4b6e600 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -1584,7 +1584,7 @@ NotInstalled=Non installé.
 NotSlowedDownByThis=Non ralenti par cela.
 NotRiskOfLeakWithThis=Pas de risque de fuite de données avec cela.
 ApplicativeCache=Cache applicatif
-MemcachedNotAvailable=Aucun cache applicatif trouvé. Vous pouvez accélérer les performances de Dolibarr en installant un serveur de cache Memcached et un module de cache applicatif exploitant ce serveur.<br>Plus d'info ici<a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">https://wiki.dolibarr.org/index.php/Module_MemCached</a>.<br>Notez que de nombreux hébergeurs low-cost ne fournissent pas de tels serveurs de cache dans leur infrastructure.
+MemcachedNotAvailable=Aucun cache applicatif trouvé. Vous pouvez accélérer les performances de Dolibarr en installant un serveur de cache Memcached et un module de cache applicatif exploitant ce serveur.<br>Plus d'info ici <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">https://wiki.dolibarr.org/index.php/Module_MemCached</a>.<br>Notez que de nombreux hébergeurs low-cost ne fournissent pas de tels serveurs de cache dans leur infrastructure.
 MemcachedModuleAvailableButNotSetup=Le module memcached pour le cache applicatif a été trouvé mais la configuration de ce module n'est pas complète.
 MemcachedAvailableAndSetup=Le module memcached dédié à l'utilisation du serveur de cache memcached est activé.
 OPCodeCache=Cache OPCode

From d4ca6bf42a358b96982ce8f29adab250956ff1ab Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 9 Jun 2021 13:56:03 +0200
Subject: [PATCH 0497/1497] Clean code

---
 htdocs/admin/system/security.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/admin/system/security.php b/htdocs/admin/system/security.php
index 85ad40775d2..3e01a99cb61 100644
--- a/htdocs/admin/system/security.php
+++ b/htdocs/admin/system/security.php
@@ -228,7 +228,7 @@ print '<br>';
 print '<br>';
 print load_fiche_titre($langs->trans("ConfigurationFile").' ('.$conffile.')', '', 'folder');
 
-print '<strong>$dolibarr_main_prod</strong>: '.$dolibarr_main_prod;
+print '<strong>$dolibarr_main_prod</strong>: '.($dolibarr_main_prod ? $dolibarr_main_prod : '0');
 if (empty($dolibarr_main_prod)) {
 	print ' &nbsp; '.img_picto('', 'warning').' '.$langs->trans("IfYouAreOnAProductionSetThis", 1);
 }

From 0a23cf029d8460dea8c802ad0014e830d23c3b30 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Wed, 9 Jun 2021 14:13:50 +0200
Subject: [PATCH 0498/1497] using strlen instead of count

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

diff --git a/htdocs/core/class/CSMSFile.class.php b/htdocs/core/class/CSMSFile.class.php
index a02f00fbac9..1ea2434a27f 100644
--- a/htdocs/core/class/CSMSFile.class.php
+++ b/htdocs/core/class/CSMSFile.class.php
@@ -75,7 +75,7 @@ class CSMSFile
 		    return -1;
 		}
 
-		dol_syslog("CSMSFile::CSMSFile: MAIN_SMS_SENDMODE=".$conf->global->MAIN_SMS_SENDMODE." charset=".$conf->file->character_set_client." from=".$from.", to=".$to.", msg length=".count($msg), LOG_DEBUG);
+		dol_syslog("CSMSFile::CSMSFile: MAIN_SMS_SENDMODE=".$conf->global->MAIN_SMS_SENDMODE." charset=".$conf->file->character_set_client." from=".$from.", to=".$to.", msg length=".strlen($msg), LOG_DEBUG);
 		dol_syslog("CSMSFile::CSMSFile: deferred=".$deferred." priority=".$priority." class=".$class, LOG_DEBUG);
 
 		// Action according to choosed sending method

From fb46ece9061a87bc289e1998d234a559a5c32565 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 9 Jun 2021 15:36:47 +0200
Subject: [PATCH 0499/1497] Fix yogosha 6347

---
 htdocs/accountancy/admin/categories_list.php  |  2 +-
 .../class/accountancycategory.class.php       |  4 +-
 .../class/accountingaccount.class.php         |  4 +-
 .../accountancy/class/bookkeeping.class.php   |  4 +-
 htdocs/accountancy/journal/bankjournal.php    |  2 +-
 htdocs/adherents/class/adherent.class.php     |  6 +--
 .../adherents/class/adherent_type.class.php   |  2 +-
 htdocs/adherents/class/api_members.class.php  |  6 +--
 htdocs/adherents/class/subscription.class.php |  8 ++--
 htdocs/api/class/api_setup.class.php          | 10 ++--
 htdocs/asset/class/asset_type.class.php       |  4 +-
 htdocs/bom/class/bom.class.php                |  4 +-
 htdocs/bookmarks/bookmarks.lib.php            |  2 +-
 htdocs/bookmarks/list.php                     |  2 +-
 htdocs/categories/class/categorie.class.php   |  6 +--
 htdocs/comm/action/class/actioncomm.class.php |  4 +-
 htdocs/comm/action/index.php                  |  4 +-
 htdocs/comm/action/pertype.php                |  2 +-
 htdocs/comm/action/peruser.php                |  4 +-
 htdocs/comm/contact.php                       |  8 ----
 htdocs/comm/propal/class/propal.class.php     | 10 ++--
 htdocs/comm/propal/index.php                  |  8 ++--
 htdocs/comm/propal/list.php                   | 12 ++---
 htdocs/comm/prospect/index.php                |  8 ++--
 htdocs/commande/class/commande.class.php      | 10 ++--
 htdocs/commande/customer.php                  |  3 --
 htdocs/commande/index.php                     |  8 ++--
 htdocs/commande/list.php                      |  2 +-
 htdocs/compta/bank/bankentries_list.php       |  2 +-
 htdocs/compta/bank/class/account.class.php    |  4 +-
 .../bank/class/api_bankaccounts.class.php     |  2 +-
 htdocs/compta/bank/line.php                   |  2 +-
 htdocs/compta/bank/releve.php                 |  2 +-
 htdocs/compta/bank/various_payment/list.php   | 10 ++--
 htdocs/compta/clients.php                     | 20 +++-----
 .../facture/class/api_invoices.class.php      |  2 +-
 .../facture/class/facture-rec.class.php       | 16 +++----
 htdocs/compta/facture/class/facture.class.php |  6 +--
 htdocs/compta/facture/list.php                | 12 ++---
 htdocs/compta/index.php                       |  6 +--
 .../compta/localtax/class/localtax.class.php  |  2 +-
 htdocs/compta/localtax/index.php              |  4 +-
 htdocs/compta/paiement/cheque/card.php        |  2 +-
 htdocs/compta/paiement/cheque/list.php        |  2 +-
 htdocs/compta/paiement/tovalidate.php         |  2 +-
 .../class/bonprelevement.class.php            |  2 +-
 .../class/rejetprelevement.class.php          |  6 +--
 htdocs/compta/prelevement/fiche-rejet.php     |  6 +--
 htdocs/compta/recap-compta.php                |  2 +-
 htdocs/compta/resultat/clientfourn.php        |  2 +-
 htdocs/compta/sociales/list.php               |  6 +--
 htdocs/compta/stats/cabyuser.php              |  2 +-
 htdocs/compta/stats/index.php                 |  2 +-
 htdocs/compta/stats/supplier_turnover.php     |  4 +-
 .../stats/supplier_turnover_by_thirdparty.php |  2 +-
 htdocs/compta/tva/class/tva.class.php         |  2 +-
 htdocs/compta/tva/list.php                    |  6 +--
 htdocs/contact/class/contact.class.php        | 16 +++----
 htdocs/contact/list.php                       | 12 ++---
 htdocs/contrat/class/contrat.class.php        |  8 ++--
 htdocs/contrat/index.php                      |  2 +-
 htdocs/contrat/list.php                       |  8 ++--
 htdocs/contrat/services_list.php              |  2 +-
 htdocs/core/class/commonobject.class.php      | 26 +++++-----
 htdocs/core/class/discount.class.php          |  2 +-
 htdocs/core/class/extrafields.class.php       |  6 +--
 htdocs/core/class/html.form.class.php         | 12 ++---
 .../core/class/html.formaccounting.class.php  |  2 +-
 .../class/html.formintervention.class.php     |  4 +-
 htdocs/core/class/html.formmail.class.php     |  6 +--
 .../class/html.formsocialcontrib.class.php    |  2 +-
 htdocs/core/class/infobox.class.php           |  8 ++--
 htdocs/core/class/menubase.class.php          |  4 +-
 htdocs/core/class/notify.class.php            | 10 ++--
 htdocs/core/lib/agenda.lib.php                |  4 +-
 htdocs/core/lib/company.lib.php               |  8 ++--
 htdocs/core/lib/fourn.lib.php                 |  2 +-
 htdocs/core/lib/invoice.lib.php               |  8 ++--
 htdocs/core/lib/sendings.lib.php              |  2 +-
 htdocs/core/lib/ticket.lib.php                |  2 +-
 htdocs/core/lib/usergroups.lib.php            |  2 +-
 htdocs/core/modules/DolibarrModules.class.php |  6 +--
 .../core/modules/mailings/pomme.modules.php   |  2 +-
 .../modules/mailings/thirdparties.modules.php |  6 +--
 .../thirdparties_services_expired.modules.php |  2 +-
 .../movement/doc/pdf_standard.modules.php     |  4 +-
 .../doc/doc_generic_project_odt.modules.php   |  2 +-
 .../task/doc/doc_generic_task_odt.modules.php |  2 +-
 .../modules/rapport/pdf_paiement.class.php    |  2 +-
 .../stock/doc/pdf_standard.modules.php        |  2 +-
 .../class/actions_datapolicy.class.php        |  2 +-
 htdocs/don/class/api_donations.class.php      |  2 +-
 htdocs/don/class/don.class.php                |  8 ++--
 htdocs/ecm/class/ecmfiles.class.php           |  2 +-
 .../conferenceorboothattendee_list.php        |  2 +-
 htdocs/expedition/card.php                    |  2 +-
 .../expedition/class/api_shipments.class.php  |  2 +-
 htdocs/expedition/class/expedition.class.php  |  6 +--
 .../class/expeditionbatch.class.php           |  2 +-
 htdocs/expedition/list.php                    |  8 ++--
 htdocs/expedition/shipment.php                |  2 +-
 .../class/expensereport.class.php             | 28 +++++------
 htdocs/fichinter/card-rec.php                 |  2 +-
 htdocs/fichinter/class/fichinter.class.php    |  4 +-
 .../class/api_supplier_invoices.class.php     |  2 +-
 .../fourn/class/api_supplier_orders.class.php |  2 +-
 .../class/fournisseur.commande.class.php      |  2 +-
 .../fourn/class/fournisseur.facture.class.php | 12 ++---
 .../fourn/class/fournisseur.product.class.php |  8 ++--
 htdocs/fourn/commande/index.php               |  6 +--
 htdocs/fourn/commande/list.php                |  8 ++--
 htdocs/fourn/contact.php                      |  2 +-
 htdocs/fourn/facture/list.php                 |  4 +-
 htdocs/fourn/index.php                        |  4 +-
 htdocs/fourn/product/list.php                 |  4 +-
 htdocs/fourn/recap-fourn.php                  |  2 +-
 htdocs/holiday/class/holiday.class.php        |  4 +-
 htdocs/hrm/class/establishment.class.php      |  8 ++--
 htdocs/hrm/index.php                          |  4 +-
 htdocs/install/upgrade2.php                   | 18 +++----
 htdocs/intracommreport/list.php               |  4 +-
 .../knowledgemanagementindex.php              |  2 +-
 htdocs/loan/class/loan.class.php              |  6 +--
 htdocs/margin/agentMargins.php                |  4 +-
 htdocs/margin/tabs/productMargins.php         |  2 +-
 .../template/class/api_mymodule.class.php     |  4 +-
 .../modulebuilder/template/mymoduleindex.php  |  2 +-
 htdocs/mrp/class/api_mos.class.php            |  4 +-
 .../class/opensurveysondage.class.php         |  6 +--
 .../class/partnershiputils.class.php          |  4 +-
 htdocs/partnership/partnershipindex.php       |  2 +-
 htdocs/product/ajax/products.php              |  4 +-
 .../product/actions_card_product.class.php    |  8 ++--
 .../service/actions_card_service.class.php    | 18 +++----
 htdocs/product/class/api_products.class.php   |  4 +-
 htdocs/product/class/product.class.php        | 48 +++++++++----------
 htdocs/product/class/productbatch.class.php   |  6 +--
 .../class/propalmergepdfproduct.class.php     |  4 +-
 .../class/price_global_variable.class.php     |  2 +-
 .../price_global_variable_updater.class.php   |  8 ++--
 htdocs/product/index.php                      |  6 +--
 htdocs/product/list.php                       |  2 +-
 htdocs/product/popuprop.php                   |  2 +-
 htdocs/product/reassort.php                   |  2 +-
 htdocs/product/reassortlot.php                |  2 +-
 htdocs/product/stats/bom.php                  |  7 ++-
 htdocs/product/stats/commande.php             |  4 +-
 htdocs/product/stats/commande_fournisseur.php |  4 +-
 htdocs/product/stats/contrat.php              |  2 +-
 htdocs/product/stats/facture.php              |  2 +-
 htdocs/product/stats/facture_fournisseur.php  |  2 +-
 htdocs/product/stats/mo.php                   |  2 +-
 htdocs/product/stats/propal.php               |  2 +-
 htdocs/product/stats/supplier_proposal.php    |  2 +-
 htdocs/product/stock/card.php                 |  2 +-
 htdocs/product/stock/class/entrepot.class.php |  6 +--
 htdocs/product/stock/product.php              |  2 +-
 htdocs/product/stock/stockatdate.php          |  4 +-
 htdocs/projet/activity/index.php              |  2 +-
 htdocs/projet/class/api_projects.class.php    |  2 +-
 htdocs/projet/class/project.class.php         | 20 ++++----
 htdocs/projet/class/projectstats.class.php    |  4 +-
 htdocs/projet/class/task.class.php            | 14 +++---
 htdocs/projet/index.php                       |  2 +-
 htdocs/projet/list.php                        |  6 +--
 htdocs/projet/tasks/list.php                  |  9 +---
 htdocs/projet/tasks/time.php                  |  2 +-
 .../public/emailing/mailing-unsubscribe.php   |  2 +-
 htdocs/reception/card.php                     |  4 +-
 htdocs/reception/index.php                    |  6 +--
 htdocs/reception/list.php                     |  4 +-
 htdocs/recruitment/recruitmentindex.php       |  2 +-
 htdocs/resource/class/dolresource.class.php   |  6 +--
 htdocs/salaries/class/salary.class.php        |  6 +--
 htdocs/salaries/list.php                      |  4 +-
 htdocs/salaries/payments.php                  |  2 +-
 htdocs/societe/class/api_contacts.class.php   |  2 +-
 .../societe/class/api_thirdparties.class.php  |  6 +--
 .../class/companybankaccount.class.php        |  4 +-
 htdocs/societe/class/societe.class.php        |  8 ++--
 htdocs/societe/list.php                       | 10 ++--
 htdocs/societe/notify/card.php                | 12 ++---
 htdocs/societe/paymentmodes.php               |  4 +-
 .../class/supplier_proposal.class.php         |  6 +--
 htdocs/supplier_proposal/index.php            |  4 +-
 htdocs/supplier_proposal/list.php             |  2 +-
 htdocs/takepos/floors.php                     |  2 +-
 htdocs/takepos/invoice.php                    |  2 +-
 htdocs/ticket/class/api_tickets.class.php     |  4 +-
 htdocs/ticket/class/ticket.class.php          |  5 +-
 htdocs/user/class/api_users.class.php         |  2 +-
 htdocs/user/class/user.class.php              |  6 +--
 htdocs/user/class/usergroup.class.php         | 12 ++---
 htdocs/user/list.php                          |  2 +-
 htdocs/webservices/server_invoice.php         |  2 +-
 htdocs/webservices/server_order.php           |  2 +-
 .../webservices/server_productorservice.php   |  6 +--
 .../webservices/server_supplier_invoice.php   |  2 +-
 htdocs/webservices/server_thirdparty.php      |  6 +--
 199 files changed, 507 insertions(+), 533 deletions(-)

diff --git a/htdocs/accountancy/admin/categories_list.php b/htdocs/accountancy/admin/categories_list.php
index c5091ef4207..9a8a84893fe 100644
--- a/htdocs/accountancy/admin/categories_list.php
+++ b/htdocs/accountancy/admin/categories_list.php
@@ -444,7 +444,7 @@ if ($search_country_id > 0) {
 	} else {
 		$sql .= " WHERE ";
 	}
-	$sql .= " (a.fk_country = ".$search_country_id." OR a.fk_country = 0)";
+	$sql .= " (a.fk_country = ".((int) $search_country_id)." OR a.fk_country = 0)";
 }
 
 // If sort order is "country", we use country_code instead
diff --git a/htdocs/accountancy/class/accountancycategory.class.php b/htdocs/accountancy/class/accountancycategory.class.php
index d8e1598d1ac..aa200c770e4 100644
--- a/htdocs/accountancy/class/accountancycategory.class.php
+++ b/htdocs/accountancy/class/accountancycategory.class.php
@@ -675,7 +675,7 @@ class AccountancyCategory // extends CommonObject
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_accounting_category as c";
 		$sql .= " WHERE c.active = 1";
 		$sql .= " AND c.entity = ".$conf->entity;
-		$sql .= " AND (c.fk_country = ".$mysoc->country_id." OR c.fk_country = 0)";
+		$sql .= " AND (c.fk_country = ".((int) $mysoc->country_id)." OR c.fk_country = 0)";
 		$sql .= " AND cat.rowid = t.fk_accounting_category";
 		$sql .= " AND t.entity = ".$conf->entity;
 		$sql .= " ORDER BY cat.position ASC";
@@ -806,7 +806,7 @@ class AccountancyCategory // extends CommonObject
 		if ($categorytype >= 0) {
 			$sql .= " AND c.category_type = 1";
 		}
-		$sql .= " AND (c.fk_country = ".$mysoc->country_id." OR c.fk_country = 0)";
+		$sql .= " AND (c.fk_country = ".((int) $mysoc->country_id)." OR c.fk_country = 0)";
 		$sql .= " ORDER BY c.position ASC";
 
 		$resql = $this->db->query($sql);
diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php
index 28601380ac1..99a0dc0dc48 100644
--- a/htdocs/accountancy/class/accountingaccount.class.php
+++ b/htdocs/accountancy/class/accountingaccount.class.php
@@ -602,7 +602,7 @@ class AccountingAccount extends CommonObject
 
 			$sql = "UPDATE ".MAIN_DB_PREFIX."accounting_account ";
 			$sql .= "SET ".$fieldtouse." = '0'";
-			$sql .= " WHERE rowid = ".$this->db->escape($id);
+			$sql .= " WHERE rowid = ".((int) $id);
 
 			dol_syslog(get_class($this)."::accountDeactivate ".$fieldtouse." sql=".$sql, LOG_DEBUG);
 			$result = $this->db->query($sql);
@@ -640,7 +640,7 @@ class AccountingAccount extends CommonObject
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."accounting_account";
 		$sql .= " SET ".$fieldtouse." = '1'";
-		$sql .= " WHERE rowid = ".$this->db->escape($id);
+		$sql .= " WHERE rowid = ".((int) $id);
 
 		dol_syslog(get_class($this)."::account_activate ".$fieldtouse." sql=".$sql, LOG_DEBUG);
 		$result = $this->db->query($sql);
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 3594bb26fc8..97ad7767be5 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -294,7 +294,7 @@ class BookKeeping extends CommonObject
 		$sql = "SELECT count(*) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
 		$sql .= " WHERE doc_type = '".$this->db->escape($this->doc_type)."'";
-		$sql .= " AND fk_doc = ".$this->fk_doc;
+		$sql .= " AND fk_doc = ".((int) $this->fk_doc);
 		if (!empty($conf->global->ACCOUNTANCY_ENABLE_FKDOCDET)) {
 			// DO NOT USE THIS IN PRODUCTION. This will generate a lot of trouble into reports and will corrupt database (by generating duplicate entries.
 			$sql .= " AND fk_docdet = " . $this->fk_docdet;			// This field can be 0 if record is for several lines
@@ -312,7 +312,7 @@ class BookKeeping extends CommonObject
 				$sqlnum = "SELECT piece_num";
 				$sqlnum .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
 				$sqlnum .= " WHERE doc_type = '".$this->db->escape($this->doc_type)."'"; // For example doc_type = 'bank'
-				$sqlnum .= " AND fk_doc = ".$this->fk_doc;
+				$sqlnum .= " AND fk_doc = ".((int) $this->fk_doc);
 				if (!empty($conf->global->ACCOUNTANCY_ENABLE_FKDOCDET)) {
 					// fk_docdet is rowid into llx_bank or llx_facturedet or llx_facturefourndet, or ...
 					$sqlnum .= " AND fk_docdet = ".((int) $this->fk_docdet);
diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index 76984d55fba..32670b15575 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -1320,7 +1320,7 @@ function getSourceDocRef($val, $typerecord)
 	if ($typerecord == 'payment') {
 		$sqlmid = 'SELECT payfac.fk_facture as id, f.ref as ref';
 		$sqlmid .= " FROM ".MAIN_DB_PREFIX."paiement_facture as payfac, ".MAIN_DB_PREFIX."facture as f";
-		$sqlmid .= " WHERE payfac.fk_facture = f.rowid AND payfac.fk_paiement=".$val["paymentid"];
+		$sqlmid .= " WHERE payfac.fk_facture = f.rowid AND payfac.fk_paiement=".((int) $val["paymentid"]);
 		$ref = $langs->transnoentitiesnoconv("Invoice");
 	} elseif ($typerecord == 'payment_supplier') {
 		$sqlmid = 'SELECT payfac.fk_facturefourn as id, f.ref';
diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 4c0c602cbc1..91f01d19f89 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -598,8 +598,8 @@ class Adherent extends CommonObject
 				if ($this->user_id) {
 					// Add link to user
 					$sql = "UPDATE ".MAIN_DB_PREFIX."user SET";
-					$sql .= " fk_member = ".$this->id;
-					$sql .= " WHERE rowid = ".$this->user_id;
+					$sql .= " fk_member = ".((int) $this->id);
+					$sql .= " WHERE rowid = ".((int) $this->user_id);
 					dol_syslog(get_class($this)."::create", LOG_DEBUG);
 					$resql = $this->db->query($sql);
 					if (!$resql) {
@@ -728,7 +728,7 @@ class Adherent extends CommonObject
 		if (!empty($this->oldcopy) && $this->typeid != $this->oldcopy->typeid) {
 			$sql2 = "SELECT libelle as label";
 			$sql2 .= " FROM ".MAIN_DB_PREFIX."adherent_type";
-			$sql2 .= " WHERE rowid = ".$this->typeid;
+			$sql2 .= " WHERE rowid = ".((int) $this->typeid);
 			$resql2 = $this->db->query($sql2);
 			if ($resql2) {
 				while ($obj = $this->db->fetch_object($resql2)) {
diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php
index 0104f8f36e8..1cb9fcdb12c 100644
--- a/htdocs/adherents/class/adherent_type.class.php
+++ b/htdocs/adherents/class/adherent_type.class.php
@@ -362,7 +362,7 @@ class AdherentType extends CommonObject
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."adherent_type ";
 		$sql .= "SET ";
-		$sql .= "statut = ".$this->status.",";
+		$sql .= "statut = ".((int) $this->status).",";
 		$sql .= "libelle = '".$this->db->escape($this->label)."',";
 		$sql .= "morphy = '".$this->db->escape($this->morphy)."',";
 		$sql .= "subscription = '".$this->db->escape($this->subscription)."',";
diff --git a/htdocs/adherents/class/api_members.class.php b/htdocs/adherents/class/api_members.class.php
index 5573961456f..d57a01510d4 100644
--- a/htdocs/adherents/class/api_members.class.php
+++ b/htdocs/adherents/class/api_members.class.php
@@ -228,12 +228,12 @@ class Members extends DolibarrApi
 		}
 		$sql .= ' WHERE t.entity IN ('.getEntity('adherent').')';
 		if (!empty($typeid)) {
-			$sql .= ' AND t.fk_adherent_type='.$typeid;
+			$sql .= ' AND t.fk_adherent_type='.((int) $typeid);
 		}
 		// Select members of given category
 		if ($category > 0) {
-			$sql .= " AND c.fk_categorie = ".$this->db->escape($category);
-			$sql .= " AND c.fk_member = t.rowid ";
+			$sql .= " AND c.fk_categorie = ".((int) $category);
+			$sql .= " AND c.fk_member = t.rowid";
 		}
 		// Add sql filters
 		if ($sqlfilters) {
diff --git a/htdocs/adherents/class/subscription.class.php b/htdocs/adherents/class/subscription.class.php
index 1285b12b2d0..bb5cdd20bd5 100644
--- a/htdocs/adherents/class/subscription.class.php
+++ b/htdocs/adherents/class/subscription.class.php
@@ -267,14 +267,14 @@ class Subscription extends CommonObject
 		}
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."subscription SET ";
-		$sql .= " fk_type = ".$this->fk_type.",";
-		$sql .= " fk_adherent = ".$this->fk_adherent.",";
+		$sql .= " fk_type = ".((int) $this->fk_type).",";
+		$sql .= " fk_adherent = ".((int) $this->fk_adherent).",";
 		$sql .= " note=".($this->note ? "'".$this->db->escape($this->note)."'" : 'null').",";
 		$sql .= " subscription = ".price2num($this->amount).",";
 		$sql .= " dateadh='".$this->db->idate($this->dateh)."',";
 		$sql .= " datef='".$this->db->idate($this->datef)."',";
 		$sql .= " datec='".$this->db->idate($this->datec)."',";
-		$sql .= " fk_bank = ".($this->fk_bank ? $this->fk_bank : 'null');
+		$sql .= " fk_bank = ".($this->fk_bank ? ((int) $this->fk_bank) : 'null');
 		$sql .= " WHERE rowid = ".$this->id;
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
@@ -341,7 +341,7 @@ class Subscription extends CommonObject
 		}
 
 		if (!$error) {
-			$sql = "DELETE FROM ".MAIN_DB_PREFIX."subscription WHERE rowid = ".$this->id;
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."subscription WHERE rowid = ".((int) $this->id);
 			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if ($resql) {
diff --git a/htdocs/api/class/api_setup.class.php b/htdocs/api/class/api_setup.class.php
index 15d31140874..1f59762c865 100644
--- a/htdocs/api/class/api_setup.class.php
+++ b/htdocs/api/class/api_setup.class.php
@@ -200,7 +200,7 @@ class Setup extends DolibarrApi
 		$sql = "SELECT id, code, type, libelle as label, module";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_paiement as t";
 		$sql .= " WHERE t.entity IN (".getEntity('c_paiement').")";
-		$sql .= " AND t.active = ".$active;
+		$sql .= " AND t.active = ".((int) $active);
 		// Add sql filters
 		if ($sqlfilters) {
 			if (!DolibarrApi::_checkFilters($sqlfilters)) {
@@ -1055,7 +1055,7 @@ class Setup extends DolibarrApi
 
 		$sql = "SELECT rowid AS id, zip, town, fk_county, fk_pays AS fk_country";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_ziptown as t";
-		$sql .= " AND t.active = ".$active;
+		$sql .= " AND t.active = ".((int) $active);
 		if ($zipcode) {
 			$sql .= " AND t.zip LIKE '%".$this->db->escape($zipcode)."%'";
 		}
@@ -1125,7 +1125,7 @@ class Setup extends DolibarrApi
 		$sql = "SELECT rowid as id, code, sortorder, libelle as label, libelle_facture as descr, type_cdr, nbjour, decalage, module";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_payment_term as t";
 		$sql .= " WHERE t.entity IN (".getEntity('c_payment_term').")";
-		$sql .= " AND t.active = ".$active;
+		$sql .= " AND t.active = ".((int) $active);
 		// Add sql filters
 		if ($sqlfilters) {
 			if (!DolibarrApi::_checkFilters($sqlfilters)) {
@@ -1183,7 +1183,7 @@ class Setup extends DolibarrApi
 		$sql = "SELECT rowid as id, code, libelle as label, description, tracking, module";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_shipment_mode as t";
 		$sql .= " WHERE t.entity IN (".getEntity('c_shipment_mode').")";
-		$sql .= " AND t.active = ".$active;
+		$sql .= " AND t.active = ".((int) $active);
 		// Add sql filters
 		if ($sqlfilters) {
 			if (!DolibarrApi::_checkFilters($sqlfilters)) {
@@ -1307,7 +1307,7 @@ class Setup extends DolibarrApi
 		$sql = "SELECT t.rowid, t.entity, t.code, t.label, t.url, t.icon, t.active";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_socialnetworks as t";
 		$sql .= " WHERE t.entity IN (".getEntity('c_socialnetworks').")";
-		$sql .= " AND t.active = ".$active;
+		$sql .= " AND t.active = ".((int) $active);
 		// Add sql filters
 		if ($sqlfilters) {
 			if (!DolibarrApi::_checkFilters($sqlfilters)) {
diff --git a/htdocs/asset/class/asset_type.class.php b/htdocs/asset/class/asset_type.class.php
index 36c654c28ba..335cd63115a 100644
--- a/htdocs/asset/class/asset_type.class.php
+++ b/htdocs/asset/class/asset_type.class.php
@@ -332,7 +332,7 @@ class AssetType extends CommonObject
 	/**
 	 * 	Return array of Asset objects for asset type this->id (or all if this->id not defined)
 	 *
-	 * 	@param	string	$excludefilter		Filter to exclude. This parameter must not be provided by input of users
+	 * 	@param	string	$excludefilter		Filter string to exclude. This parameter must not be provided by input of users
 	 *  @param	int		$mode				0=Return array of asset instance
 	 *  									1=Return array of asset instance without extra data
 	 *  									2=Return array of asset id only
@@ -347,7 +347,7 @@ class AssetType extends CommonObject
 		$sql = "SELECT a.rowid";
 		$sql .= " FROM ".MAIN_DB_PREFIX."asset as a";
 		$sql .= " WHERE a.entity IN (".getEntity('asset').")";
-		$sql .= " AND a.fk_asset_type = ".$this->id;
+		$sql .= " AND a.fk_asset_type = ".((int) $this->id);
 		if (!empty($excludefilter)) {
 			$sql .= ' AND ('.$excludefilter.')';
 		}
diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index 220c724ad89..728bdef6cf6 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -614,8 +614,8 @@ class BOM extends CommonObject
 		$sql .= " SET ref = '".$this->db->escape($num)."',";
 		$sql .= " status = ".self::STATUS_VALIDATED.",";
 		$sql .= " date_valid='".$this->db->idate($now)."',";
-		$sql .= " fk_user_valid = ".$user->id;
-		$sql .= " WHERE rowid = ".$this->id;
+		$sql .= " fk_user_valid = ".((int) $user->id);
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		dol_syslog(get_class($this)."::validate()", LOG_DEBUG);
 		$resql = $this->db->query($sql);
diff --git a/htdocs/bookmarks/bookmarks.lib.php b/htdocs/bookmarks/bookmarks.lib.php
index 199944165b4..a977ae57fbc 100644
--- a/htdocs/bookmarks/bookmarks.lib.php
+++ b/htdocs/bookmarks/bookmarks.lib.php
@@ -80,7 +80,7 @@ function printDropdownBookmarksList()
 
 	// Menu with list of bookmarks
 	$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 .= " WHERE (fk_user = ".((int) $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)) {
diff --git a/htdocs/bookmarks/list.php b/htdocs/bookmarks/list.php
index 7d644d3a103..17be6be9cef 100644
--- a/htdocs/bookmarks/list.php
+++ b/htdocs/bookmarks/list.php
@@ -98,7 +98,7 @@ $sql .= " FROM ".MAIN_DB_PREFIX."bookmark as b LEFT JOIN ".MAIN_DB_PREFIX."user
 $sql .= " WHERE 1=1";
 $sql .= " AND b.entity IN (".getEntity('bookmark').")";
 if (!$user->admin) {
-	$sql .= " AND (b.fk_user = ".$user->id." OR b.fk_user is NULL OR b.fk_user = 0)";
+	$sql .= " AND (b.fk_user = ".((int) $user->id)." OR b.fk_user is NULL OR b.fk_user = 0)";
 }
 
 $sql .= $db->order($sortfield.", position", $sortorder);
diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index 5f30a96c9c1..b98cff5b3a5 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -774,7 +774,7 @@ class Categorie extends CommonObject
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."categorie_".(empty($this->MAP_CAT_TABLE[$type]) ? $type : $this->MAP_CAT_TABLE[$type]);
 		$sql .= " WHERE fk_categorie = ".$this->id;
-		$sql .= " AND fk_".(empty($this->MAP_CAT_FK[$type]) ? $type : $this->MAP_CAT_FK[$type])." = ".$obj->id;
+		$sql .= " AND fk_".(empty($this->MAP_CAT_FK[$type]) ? $type : $this->MAP_CAT_FK[$type])." = ".((int) $obj->id);
 
 		dol_syslog(get_class($this).'::del_type', LOG_DEBUG);
 		if ($this->db->query($sql)) {
@@ -1303,7 +1303,7 @@ class Categorie extends CommonObject
 		$sql .= " FROM ".MAIN_DB_PREFIX."categorie as c ";
 		$sql .= " WHERE c.entity IN (".getEntity('category').")";
 		$sql .= " AND c.type = ".((int) $type);
-		$sql .= " AND c.fk_parent = ".$this->fk_parent;
+		$sql .= " AND c.fk_parent = ".((int) $this->fk_parent);
 		$sql .= " AND c.label = '".$this->db->escape($this->label)."'";
 
 		dol_syslog(get_class($this)."::already_exists", LOG_DEBUG);
@@ -1552,7 +1552,7 @@ class Categorie extends CommonObject
 
 		// Generation requete recherche
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."categorie";
-		$sql .= " WHERE type = ".$this->MAP_ID[$type];
+		$sql .= " WHERE type = ".((int) $this->MAP_ID[$type]);
 		$sql .= " AND entity IN (".getEntity('category').")";
 		if ($nom) {
 			if (!$exact) {
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 3943a37e5a7..38acaac0fc9 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -1896,7 +1896,7 @@ class ActionComm extends CommonObject
 					$userforfilter = new User($this->db);
 					$result = $userforfilter->fetch('', $logint);
 					if ($result > 0) {
-						$sql .= " AND ar.fk_element = ".$userforfilter->id;
+						$sql .= " AND ar.fk_element = ".((int) $userforfilter->id);
 					} elseif ($result < 0 || $condition == '=') {
 						$sql .= " AND ar.fk_element = 0";
 					}
@@ -2410,7 +2410,7 @@ class ActionComm extends CommonObject
 			// 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";
 			$sql .= " WHERE dateremind < '".$this->db->idate($now - (3600 * 24 * 32))."'";
-			$sql .= " AND status = ".$actionCommReminder::STATUS_DONE;
+			$sql .= " AND status = ".((int) $actionCommReminder::STATUS_DONE);
 			$resql = $this->db->query($sql);
 
 			if (!$resql) {
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 459ede423b1..465f1be8701 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -741,10 +741,10 @@ if ($status == 'todo') {
 if ($filtert > 0 || $usergroup > 0) {
 	$sql .= " AND (";
 	if ($filtert > 0) {
-		$sql .= "ar.fk_element = ".$filtert;
+		$sql .= "ar.fk_element = ".((int) $filtert);
 	}
 	if ($usergroup > 0) {
-		$sql .= ($filtert > 0 ? " OR " : "")." ugu.fk_usergroup = ".$usergroup;
+		$sql .= ($filtert > 0 ? " OR " : "")." ugu.fk_usergroup = ".((int) $usergroup);
 	}
 	$sql .= ")";
 }
diff --git a/htdocs/comm/action/pertype.php b/htdocs/comm/action/pertype.php
index 32eaccdcce1..b39d6c3141d 100644
--- a/htdocs/comm/action/pertype.php
+++ b/htdocs/comm/action/pertype.php
@@ -616,7 +616,7 @@ if ($filtert > 0 || $usergroup > 0) {
 		$sql .= "ar.fk_element = ".$filtert;
 	}
 	if ($usergroup > 0) {
-		$sql .= ($filtert > 0 ? " OR " : "")." ugu.fk_usergroup = ".$usergroup;
+		$sql .= ($filtert > 0 ? " OR " : "")." ugu.fk_usergroup = ".((int) $usergroup);
 	}
 	$sql .= ")";
 }
diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index 76330d39453..10d9871c4c9 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -637,7 +637,7 @@ if ($filtert > 0 || $usergroup > 0) {
 		$sql .= "ar.fk_element = ".$filtert;
 	}
 	if ($usergroup > 0) {
-		$sql .= ($filtert > 0 ? " OR " : "")." ugu.fk_usergroup = ".$usergroup;
+		$sql .= ($filtert > 0 ? " OR " : "")." ugu.fk_usergroup = ".((int) $usergroup);
 	}
 	$sql .= ")";
 }
@@ -899,7 +899,7 @@ while ($currentdaytoshow < $lastdaytoshow) {
 		}
 		$sql .= " WHERE u.statut = 1 AND u.entity IN (".getEntity('user').")";
 		if ($usergroup > 0) {
-			$sql .= " AND ug.fk_usergroup = ".$usergroup;
+			$sql .= " AND ug.fk_usergroup = ".((int) $usergroup);
 		}
 		//print $sql;
 		$resql = $db->query($sql);
diff --git a/htdocs/comm/contact.php b/htdocs/comm/contact.php
index 9945ca0e186..1d74cba61cd 100644
--- a/htdocs/comm/contact.php
+++ b/htdocs/comm/contact.php
@@ -104,23 +104,15 @@ if ($type == "f") {
 if ($socid) {
 	$sql .= " AND s.rowid = ".((int) $socid);
 }
-
-if (dol_strlen($stcomm)) {
-	$sql .= " AND s.fk_stcomm=".$db->escape($stcomm);
-}
-
 if (!empty($search_lastname)) {
 	$sql .= " AND p.name LIKE '%".$db->escape($search_lastname)."%'";
 }
-
 if (!empty($search_firstname)) {
 	$sql .= " AND p.firstname LIKE '%".$db->escape($search_firstname)."%'";
 }
-
 if (!empty($search_company)) {
 	$sql .= " AND s.nom LIKE '%".$db->escape($search_company)."%'";
 }
-
 if (!empty($contactname)) { // acces a partir du module de recherche
 	$sql .= " AND (p.name LIKE '%".$db->escape($contactname)."%' OR lower(p.firstname) LIKE '%".$db->escape($contactname)."%') ";
 	$sortfield = "p.name";
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index c544f5f7fe9..6c670c82364 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -2463,12 +2463,12 @@ class Propal extends CommonObject
 		$error = 0;
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."propal";
-		$sql .= " SET fk_statut = ".$status.",";
+		$sql .= " SET fk_statut = ".((int) $status).",";
 		if (!empty($note)) {
 			$sql .= " note_private = '".$this->db->escape($note)."',";
 		}
 		$sql .= " date_cloture=NULL, fk_user_cloture=NULL";
-		$sql .= " WHERE rowid = ".$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		$this->db->begin();
 
@@ -4305,7 +4305,7 @@ class PropaleLigne extends CommonObjectLine
 		}
 		$sql .= ", fk_parent_line=".($this->fk_parent_line > 0 ? $this->fk_parent_line : "null");
 		if (!empty($this->rang)) {
-			$sql .= ", rang=".$this->rang;
+			$sql .= ", rang=".((int) $this->rang);
 		}
 		$sql .= ", date_start=".(!empty($this->date_start) ? "'".$this->db->idate($this->date_start)."'" : "null");
 		$sql .= ", date_end=".(!empty($this->date_end) ? "'".$this->db->idate($this->date_end)."'" : "null");
@@ -4317,7 +4317,7 @@ class PropaleLigne extends CommonObjectLine
 		$sql .= ", multicurrency_total_tva=".price2num($this->multicurrency_total_tva)."";
 		$sql .= ", multicurrency_total_ttc=".price2num($this->multicurrency_total_ttc)."";
 
-		$sql .= " WHERE rowid = ".$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -4365,7 +4365,7 @@ class PropaleLigne extends CommonObjectLine
 		$sql .= " total_ht=".price2num($this->total_ht, 'MT')."";
 		$sql .= ",total_tva=".price2num($this->total_tva, 'MT')."";
 		$sql .= ",total_ttc=".price2num($this->total_ttc, 'MT')."";
-		$sql .= " WHERE rowid = ".$this->rowid;
+		$sql .= " WHERE rowid = ".((int) $this->rowid);
 
 		dol_syslog("PropaleLigne::update_total", LOG_DEBUG);
 
diff --git a/htdocs/comm/propal/index.php b/htdocs/comm/propal/index.php
index 3973071d1f0..7ff3e405499 100644
--- a/htdocs/comm/propal/index.php
+++ b/htdocs/comm/propal/index.php
@@ -88,7 +88,7 @@ if (!empty($conf->propal->enabled)) {
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 	}
 	if ($socid) {
-		$sql .= " AND p.fk_soc = ".$socid;
+		$sql .= " AND p.fk_soc = ".((int) $socid);
 	}
 
 	$resql = $db->query($sql);
@@ -160,7 +160,7 @@ $sql .= " WHERE c.entity IN (".getEntity($propalstatic->element).")";
 $sql .= " AND c.fk_soc = s.rowid";
 //$sql.= " AND c.fk_statut > 2";
 if ($socid) {
-	$sql .= " AND c.fk_soc = ".$socid;
+	$sql .= " AND c.fk_soc = ".((int) $socid);
 }
 if (!$user->rights->societe->client->voir && !$socid) {
 	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
@@ -318,7 +318,7 @@ if (! empty($conf->propal->enabled))
 	$sql.= " WHERE c.fk_soc = s.rowid";
 	$sql.= " AND c.entity = ".$conf->entity;
 	$sql.= " AND c.fk_statut = 1";
-	if ($socid) $sql.= " AND c.fk_soc = ".$socid;
+	if ($socid) $sql.= " AND c.fk_soc = ".((int) $socid);
 	if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 	$sql.= " ORDER BY c.rowid DESC";
 
@@ -393,7 +393,7 @@ if (! empty($conf->propal->enabled))
 	$sql.= " WHERE c.fk_soc = s.rowid";
 	$sql.= " AND c.entity = ".$conf->entity;
 	$sql.= " AND c.fk_statut = 2 ";
-	if ($socid) $sql.= " AND c.fk_soc = ".$socid;
+	if ($socid) $sql.= " AND c.fk_soc = ".((int) $socid);
 	if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 	$sql.= " ORDER BY c.rowid DESC";
 
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index ceb945d1e72..95d461eac39 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -593,27 +593,27 @@ if ($sall) {
 	$sql .= natural_search(array_keys($fieldstosearchall), $sall);
 }
 if ($search_categ_cus > 0) {
-	$sql .= " AND cc.fk_categorie = ".$db->escape($search_categ_cus);
+	$sql .= " AND cc.fk_categorie = ".((int) $search_categ_cus);
 }
 if ($search_categ_cus == -2) {
 	$sql .= " AND cc.fk_categorie IS NULL";
 }
 
 if ($search_fk_cond_reglement > 0) {
-	$sql .= " AND p.fk_cond_reglement = ".$db->escape($search_fk_cond_reglement);
+	$sql .= " AND p.fk_cond_reglement = ".((int) $search_fk_cond_reglement);
 }
 if ($search_fk_shipping_method > 0) {
-	$sql .= " AND p.fk_shipping_method = ".$db->escape($search_fk_shipping_method);
+	$sql .= " AND p.fk_shipping_method = ".((int) $search_fk_shipping_method);
 }
 if ($search_fk_input_reason > 0) {
-	$sql .= " AND p.fk_input_reason = ".$db->escape($search_fk_input_reason);
+	$sql .= " AND p.fk_input_reason = ".((int) $search_fk_input_reason);
 }
 if ($search_fk_mode_reglement > 0) {
-	$sql .= " AND p.fk_mode_reglement = ".$db->escape($search_fk_mode_reglement);
+	$sql .= " AND p.fk_mode_reglement = ".((int) $search_fk_mode_reglement);
 }
 
 if ($search_product_category > 0) {
-	$sql .= " AND cp.fk_categorie = ".$db->escape($search_product_category);
+	$sql .= " AND cp.fk_categorie = ".((int) $search_product_category);
 }
 if ($socid > 0) {
 	$sql .= ' AND s.rowid = '.((int) $socid);
diff --git a/htdocs/comm/prospect/index.php b/htdocs/comm/prospect/index.php
index 8883e0af6f3..d2f60c36212 100644
--- a/htdocs/comm/prospect/index.php
+++ b/htdocs/comm/prospect/index.php
@@ -87,7 +87,7 @@ $sql .= " WHERE s.fk_stcomm = st.id";
 $sql .= " AND s.client IN (2, 3)";
 $sql .= " AND s.entity IN (".getEntity($companystatic->element).")";
 if (!$user->rights->societe->client->voir && !$socid) {
-	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 }
 $sql .= " GROUP BY st.id";
 $sql .= " ORDER BY st.id";
@@ -129,7 +129,7 @@ if (!empty($conf->propal->enabled) && $user->rights->propale->lire) {
 	$sql .= " AND p.fk_soc = s.rowid";
 	$sql .= " AND p.entity IN (".getEntity('propal').")";
 	if (!$user->rights->societe->client->voir && !$socid) {
-		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 	}
 
 	$resql = $db->query($sql);
@@ -191,7 +191,7 @@ if (!empty($conf->propal->enabled) && $user->rights->propale->lire) {
 	$sql .= " AND p.fk_statut = 1";
 	$sql .= " AND p.entity IN (".getEntity('propal').")";
 	if (!$user->rights->societe->client->voir && !$socid) {
-		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 	}
 	if ($socid) {
 		$sql .= " AND s.rowid = ".((int) $socid);
@@ -250,7 +250,7 @@ if (!$user->rights->societe->client->voir && !$socid) {
 $sql .= " WHERE s.fk_stcomm = 1";
 $sql .= " AND s.entity IN (".getEntity($companystatic->element).")";
 if (!$user->rights->societe->client->voir && !$socid) {
-	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 }
 $sql .= " ORDER BY s.tms ASC";
 $sql .= $db->plimit(15, 0);
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index c0851dfee1d..c19cc6c379f 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -2539,7 +2539,7 @@ class Commande extends CommonOrder
 
 			$sql = "UPDATE ".MAIN_DB_PREFIX."commande";
 			$sql .= " SET date_commande = ".($date ? "'".$this->db->idate($date)."'" : 'null');
-			$sql .= " WHERE rowid = ".$this->id." AND fk_statut = ".self::STATUS_DRAFT;
+			$sql .= " WHERE rowid = ".$this->id." AND fk_statut = ".((int) self::STATUS_DRAFT);
 
 			dol_syslog(__METHOD__, LOG_DEBUG);
 			$resql = $this->db->query($sql);
@@ -4559,14 +4559,14 @@ class OrderLine extends CommonOrderLine
 		}
 		$sql .= " , fk_product_fournisseur_price=".(!empty($this->fk_fournprice) ? $this->fk_fournprice : "null");
 		$sql .= " , buy_price_ht='".price2num($this->pa_ht)."'";
-		$sql .= " , info_bits=".$this->info_bits;
-		$sql .= " , special_code=".$this->special_code;
+		$sql .= " , info_bits=".((int) $this->info_bits);
+		$sql .= " , special_code=".((int) $this->special_code);
 		$sql .= " , date_start=".(!empty($this->date_start) ? "'".$this->db->idate($this->date_start)."'" : "null");
 		$sql .= " , date_end=".(!empty($this->date_end) ? "'".$this->db->idate($this->date_end)."'" : "null");
 		$sql .= " , product_type=".$this->product_type;
 		$sql .= " , fk_parent_line=".(!empty($this->fk_parent_line) ? $this->fk_parent_line : "null");
 		if (!empty($this->rang)) {
-			$sql .= ", rang=".$this->rang;
+			$sql .= ", rang=".((int) $this->rang);
 		}
 		$sql .= " , fk_unit=".(!$this->fk_unit ? 'NULL' : $this->fk_unit);
 
@@ -4576,7 +4576,7 @@ class OrderLine extends CommonOrderLine
 		$sql .= " , multicurrency_total_tva=".price2num($this->multicurrency_total_tva)."";
 		$sql .= " , multicurrency_total_ttc=".price2num($this->multicurrency_total_ttc)."";
 
-		$sql .= " WHERE rowid = ".$this->rowid;
+		$sql .= " WHERE rowid = ".((int) $this->rowid);
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
diff --git a/htdocs/commande/customer.php b/htdocs/commande/customer.php
index 6dfa898a024..62f8c4772f6 100644
--- a/htdocs/commande/customer.php
+++ b/htdocs/commande/customer.php
@@ -89,9 +89,6 @@ $sql .= " AND s.entity IN (".getEntity('societe').")";
 if (!$user->rights->societe->client->voir && !$socid) {
 	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 }
-if (dol_strlen($stcomm)) {
-	$sql .= " AND s.fk_stcomm=".$stcomm;
-}
 if (GETPOST("search_nom")) {
 	$sql .= natural_search("s.nom", GETPOST("search_nom"));
 }
diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php
index 48f1f600126..73f40668cea 100644
--- a/htdocs/commande/index.php
+++ b/htdocs/commande/index.php
@@ -166,7 +166,7 @@ $sql .= " WHERE c.fk_soc = s.rowid";
 $sql .= " AND c.entity IN (".getEntity('commande').")";
 //$sql.= " AND c.fk_statut > 2";
 if ($socid) {
-	$sql .= " AND c.fk_soc = ".$socid;
+	$sql .= " AND c.fk_soc = ".((int) $socid);
 }
 if (!$user->rights->societe->client->voir && !$socid) {
 	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
@@ -250,7 +250,7 @@ if (!empty($conf->commande->enabled)) {
 	$sql .= " AND c.entity IN (".getEntity('commande').")";
 	$sql .= " AND c.fk_statut = ".Commande::STATUS_VALIDATED;
 	if ($socid) {
-		$sql .= " AND c.fk_soc = ".$socid;
+		$sql .= " AND c.fk_soc = ".((int) $socid);
 	}
 	if (!$user->rights->societe->client->voir && !$socid) {
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
@@ -337,9 +337,9 @@ if (!empty($conf->commande->enabled)) {
 	}
 	$sql .= " WHERE c.fk_soc = s.rowid";
 	$sql .= " AND c.entity IN (".getEntity('commande').")";
-	$sql .= " AND c.fk_statut = ".Commande::STATUS_ACCEPTED;
+	$sql .= " AND c.fk_statut = ".((int) Commande::STATUS_ACCEPTED);
 	if ($socid) {
-		$sql .= " AND c.fk_soc = ".$socid;
+		$sql .= " AND c.fk_soc = ".((int) $socid);
 	}
 	if (!$user->rights->societe->client->voir && !$socid) {
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index f42b7c08de9..98bbd00b351 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -473,7 +473,7 @@ if ($search_user > 0) {
 $sql .= ' WHERE c.fk_soc = s.rowid';
 $sql .= ' AND c.entity IN ('.getEntity('commande').')';
 if ($search_product_category > 0) {
-	$sql .= " AND cp.fk_categorie = ".$search_product_category;
+	$sql .= " AND cp.fk_categorie = ".((int) $search_product_category);
 }
 if ($socid > 0) {
 	$sql .= ' AND s.rowid = '.((int) $socid);
diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php
index 0a9784fce75..666621cbdd6 100644
--- a/htdocs/compta/bank/bankentries_list.php
+++ b/htdocs/compta/bank/bankentries_list.php
@@ -1181,7 +1181,7 @@ if ($resql) {
 			$sqlforbalance .= " ".MAIN_DB_PREFIX."bank as b";
 			$sqlforbalance .= " WHERE b.fk_account = ba.rowid";
 			$sqlforbalance .= " AND ba.entity IN (".getEntity('bank_account').")";
-			$sqlforbalance .= " AND b.fk_account = ".$search_account;
+			$sqlforbalance .= " AND b.fk_account = ".((int) $search_account);
 			$sqlforbalance .= " AND (b.datev < '".$db->idate($db->jdate($objp->dv))."' OR (b.datev = '".$db->idate($db->jdate($objp->dv))."' AND (b.dateo < '".$db->idate($db->jdate($objp->do))."' OR (b.dateo = '".$db->idate($db->jdate($objp->do))."' AND b.rowid < ".$objp->rowid."))))";
 			$resqlforbalance = $db->query($sqlforbalance);
 			//print $sqlforbalance;
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index e629d7620f0..0d97ed69a07 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -1070,7 +1070,7 @@ class Account extends CommonObject
 
 		if (!$error) {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_account";
-			$sql .= " WHERE rowid = ".$this->rowid;
+			$sql .= " WHERE rowid = ".((int) $this->rowid);
 
 			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 			$result = $this->db->query($sql);
@@ -2090,7 +2090,7 @@ class AccountLine extends CommonObject
 		$sql .= " amount = ".price2num($this->amount).",";
 		$sql .= " datev='".$this->db->idate($this->datev)."',";
 		$sql .= " dateo='".$this->db->idate($this->dateo)."'";
-		$sql .= " WHERE rowid = ".$this->rowid;
+		$sql .= " WHERE rowid = ".((int) $this->rowid);
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
diff --git a/htdocs/compta/bank/class/api_bankaccounts.class.php b/htdocs/compta/bank/class/api_bankaccounts.class.php
index 10357155295..fd7ed1838f2 100644
--- a/htdocs/compta/bank/class/api_bankaccounts.class.php
+++ b/htdocs/compta/bank/class/api_bankaccounts.class.php
@@ -77,7 +77,7 @@ class BankAccounts extends DolibarrApi
 		$sql .= ' WHERE t.entity IN ('.getEntity('bank_account').')';
 		// Select accounts of given category
 		if ($category > 0) {
-			$sql .= " AND c.fk_categorie = ".$this->db->escape($category)." AND c.fk_account = t.rowid ";
+			$sql .= " AND c.fk_categorie = ".((int) $category)." AND c.fk_account = t.rowid";
 		}
 		// Add sql filters
 		if ($sqlfilters) {
diff --git a/htdocs/compta/bank/line.php b/htdocs/compta/bank/line.php
index c84f52ffee1..2c33085aa6d 100644
--- a/htdocs/compta/bank/line.php
+++ b/htdocs/compta/bank/line.php
@@ -173,7 +173,7 @@ if ($user->rights->banque->modifier && $action == "update") {
 				$sql .= " datev = '".$db->idate($dateval)."',";
 			}
 		}
-		$sql .= " fk_account = ".$actarget->id;
+		$sql .= " fk_account = ".((int) $actarget->id);
 		$sql .= " WHERE rowid = ".((int) $acline->id);
 
 		$result = $db->query($sql);
diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index f45d2a64af4..167c809a8b1 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -606,7 +606,7 @@ if (empty($numref)) {
 				$sql .= ", ".MAIN_DB_PREFIX."bank_class as cl";
 				$sql .= " WHERE ct.rowid = cl.fk_categ";
 				$sql .= " AND ct.entity = ".$conf->entity;
-				$sql .= " AND cl.lineid = ".$objp->rowid;
+				$sql .= " AND cl.lineid = ".((int) $objp->rowid);
 
 				$resc = $db->query($sql);
 				if ($resc) {
diff --git a/htdocs/compta/bank/various_payment/list.php b/htdocs/compta/bank/various_payment/list.php
index f78e004f571..dda68a096a1 100644
--- a/htdocs/compta/bank/various_payment/list.php
+++ b/htdocs/compta/bank/various_payment/list.php
@@ -250,19 +250,19 @@ if ($search_amount_cred) {
 	$sql .= natural_search("v.amount", $search_amount_cred, 1);
 }
 if ($search_bank_account > 0) {
-	$sql .= " AND b.fk_account=".$db->escape($search_bank_account);
+	$sql .= " AND b.fk_account = ".((int) $search_bank_account);
 }
 if ($search_bank_entry > 0) {
-	$sql .= " AND b.fk_account=".$db->escape($search_bank_account);
+	$sql .= " AND b.fk_account = ".((int) $search_bank_account);
 }
 if ($search_accountancy_account > 0) {
-	$sql .= " AND v.accountancy_code=".$db->escape($search_accountancy_account);
+	$sql .= " AND v.accountancy_code = ".((int) $search_accountancy_account);
 }
 if ($search_accountancy_subledger > 0) {
-	$sql .= " AND v.subledger_account=".$db->escape($search_accountancy_subledger);
+	$sql .= " AND v.subledger_account = ".((int) $search_accountancy_subledger);
 }
 if ($typeid > 0) {
-	$sql .= " AND v.fk_typepayment=".$typeid;
+	$sql .= " AND v.fk_typepayment=".((int) $typeid);
 }
 if ($search_all) {
 	$sql .= natural_search(array_keys($fieldstosearchall), $search_all);
diff --git a/htdocs/compta/clients.php b/htdocs/compta/clients.php
index 60924dae644..b0a4716b7e1 100644
--- a/htdocs/compta/clients.php
+++ b/htdocs/compta/clients.php
@@ -71,7 +71,7 @@ llxHeader();
 $thirdpartystatic = new Societe($db);
 
 if ($action == 'note') {
-	$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET note='".$db->escape($note)."' WHERE rowid=".$socid;
+	$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET note='".$db->escape($note)."' WHERE rowid=".((int) $socid);
 	$result = $db->query($sql);
 }
 
@@ -107,29 +107,21 @@ if (!$user->rights->societe->client->voir && !$socid) {
 	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 }
 if (dol_strlen($stcomm)) {
-	$sql .= " AND s.fk_stcomm=".$stcomm;
+	$sql .= " AND s.fk_stcomm=".((int) $stcomm);
 }
-if ($socname) {
-	$sql .= natural_search("s.nom", $socname);
-	$sortfield = "s.nom";
-	$sortorder = "ASC";
-}
-if ($_GET["search_nom"]) {
+if (GETPOST("search_nom")) {
 	$sql .= natural_search("s.nom", GETPOST("search_nom"));
 }
-if ($_GET["search_compta"]) {
+if (GETPOST("search_compta")) {
 	$sql .= natural_search("s.code_compta", GETPOST("search_compta"));
 }
-if ($_GET["search_code_client"]) {
+if (GETPOST("search_code_client")) {
 	$sql .= natural_search("s.code_client", GETPOST("search_code_client"));
 }
-if (dol_strlen($begin)) {
-	$sql .= natural_search("s.nom", $begin);
-}
 if ($socid) {
 	$sql .= " AND s.rowid = ".((int) $socid);
 }
-$sql .= " ORDER BY $sortfield $sortorder ";
+$sql .= " ORDER BY $sortfield $sortorder";
 $sql .= $db->plimit($conf->liste_limit + 1, $offset);
 //print $sql;
 
diff --git a/htdocs/compta/facture/class/api_invoices.class.php b/htdocs/compta/facture/class/api_invoices.class.php
index 84b4df207a5..3dfa5f70603 100644
--- a/htdocs/compta/facture/class/api_invoices.class.php
+++ b/htdocs/compta/facture/class/api_invoices.class.php
@@ -217,7 +217,7 @@ class Invoices extends DolibarrApi
 		}
 		// Insert sale filter
 		if ($search_sale > 0) {
-			$sql .= " AND sc.fk_user = ".$search_sale;
+			$sql .= " AND sc.fk_user = ".((int) $search_sale);
 		}
 		// Add sql filters
 		if ($sqlfilters) {
diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index 286b5a1ccea..7d2ffe9e022 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -470,9 +470,9 @@ class FactureRec extends CommonInvoice
 		$error = 0;
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."facture_rec SET";
-		$sql .= " fk_soc = ".$this->fk_soc;
+		$sql .= " fk_soc = ".((int) $this->fk_soc);
 		// TODO Add missing fields
-		$sql .= " WHERE rowid = ".$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -1136,12 +1136,12 @@ class FactureRec extends CommonInvoice
 			$sql .= ", qty=".price2num($qty);
 			$sql .= ", tva_tx=".price2num($txtva);
 			$sql .= ", vat_src_code='".$this->db->escape($vat_src_code)."'";
-			$sql .= ", localtax1_tx=".$txlocaltax1;
+			$sql .= ", localtax1_tx=".((float) $txlocaltax1);
 			$sql .= ", localtax1_type='".$this->db->escape($localtaxes_type[0])."'";
-			$sql .= ", localtax2_tx=".$txlocaltax2;
+			$sql .= ", localtax2_tx=".((float) $txlocaltax2);
 			$sql .= ", localtax2_type='".$this->db->escape($localtaxes_type[2])."'";
 			$sql .= ", fk_product=".(!empty($fk_product) ? "'".$this->db->escape($fk_product)."'" : "null");
-			$sql .= ", product_type=".$product_type;
+			$sql .= ", product_type=".((int) $product_type);
 			$sql .= ", remise_percent='".price2num($remise_percent)."'";
 			$sql .= ", subprice='".price2num($pu_ht)."'";
 			$sql .= ", total_ht='".price2num($total_ht)."'";
@@ -2124,11 +2124,11 @@ class FactureLigneRec extends CommonInvoiceLine
 			$sql .= ", total_localtax2=".price2num($this->total_localtax2);
 			$sql .= ", total_ttc=".price2num($this->total_ttc);
 		}
-		$sql .= ", rang=".$this->rang;
-		$sql .= ", special_code=".$this->special_code;
+		$sql .= ", rang=".((int) $this->rang);
+		$sql .= ", special_code=".((int) $this->special_code);
 		$sql .= ", fk_unit=".($this->fk_unit ? "'".$this->db->escape($this->fk_unit)."'" : "null");
 		$sql .= ", fk_contract_line=".($this->fk_contract_line ? $this->fk_contract_line : "null");
-		$sql .= " WHERE rowid = ".$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		$this->db->begin();
 
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 6dd67d4d931..40a14eb1711 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -4105,7 +4105,7 @@ class Facture extends CommonInvoice
 		$sql .= " AND pf.fk_paiement IS NULL"; // Aucun paiement deja fait
 		$sql .= " AND ff.fk_statut IS NULL"; // Renvoi vrai si pas facture de remplacement
 		if ($socid > 0) {
-			$sql .= " AND f.fk_soc = ".$socid;
+			$sql .= " AND f.fk_soc = ".((int) $socid);
 		}
 		$sql .= " ORDER BY f.ref";
 
@@ -5594,7 +5594,7 @@ class FactureLigne extends CommonInvoiceLine
 		$sql .= ", buy_price_ht=".(($this->pa_ht || $this->pa_ht === 0 || $this->pa_ht === '0') ? price2num($this->pa_ht) : "null");	// $this->pa_ht should always be defined (set to 0 or to sell price depending on option)
 		$sql .= ", fk_parent_line=".($this->fk_parent_line > 0 ? $this->fk_parent_line : "null");
 		if (!empty($this->rang)) {
-			$sql .= ", rang=".$this->rang;
+			$sql .= ", rang=".((int) $this->rang);
 		}
 		$sql .= ", situation_percent=".$this->situation_percent;
 		$sql .= ", fk_unit=".(!$this->fk_unit ? 'NULL' : $this->fk_unit);
@@ -5606,7 +5606,7 @@ class FactureLigne extends CommonInvoiceLine
 		$sql .= ", multicurrency_total_tva=".price2num($this->multicurrency_total_tva)."";
 		$sql .= ", multicurrency_total_ttc=".price2num($this->multicurrency_total_ttc)."";
 
-		$sql .= " WHERE rowid = ".$this->rowid;
+		$sql .= " WHERE rowid = ".((int) $this->rowid);
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index fb4089fabec..a375bc677f2 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -546,7 +546,7 @@ if (!$user->rights->societe->client->voir && !$socid) {
 	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 }
 if ($search_product_category > 0) {
-	$sql .= " AND cp.fk_categorie = ".$db->escape($search_product_category);
+	$sql .= " AND cp.fk_categorie = ".((int) $search_product_category);
 }
 if ($socid > 0) {
 	$sql .= ' AND s.rowid = '.((int) $socid);
@@ -634,7 +634,7 @@ if ($search_login) {
 	$sql .= natural_search(array('u.login', 'u.firstname', 'u.lastname'), $search_login);
 }
 if ($search_categ_cus > 0) {
-	$sql .= " AND cc.fk_categorie = ".$db->escape($search_categ_cus);
+	$sql .= " AND cc.fk_categorie = ".((int) $search_categ_cus);
 }
 if ($search_categ_cus == -2) {
 	$sql .= " AND cc.fk_categorie IS NULL";
@@ -659,10 +659,10 @@ if ($search_status != '-1' && $search_status != '') {
 }
 
 if ($search_paymentmode > 0) {
-	$sql .= " AND f.fk_mode_reglement = ".$db->escape($search_paymentmode);
+	$sql .= " AND f.fk_mode_reglement = ".((int) $search_paymentmode);
 }
 if ($search_paymentterms > 0) {
-	$sql .= " AND f.fk_cond_reglement = ".$db->escape($search_paymentterms);
+	$sql .= " AND f.fk_cond_reglement = ".((int) $search_paymentterms);
 }
 if ($search_module_source) {
 	$sql .= natural_search("f.module_source", $search_module_source);
@@ -692,10 +692,10 @@ if ($option == 'late') {
 	$sql .= " AND f.date_lim_reglement < '".$db->idate(dol_now() - $conf->facture->client->warning_delay)."'";
 }
 if ($search_sale > 0) {
-	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".(int) $search_sale;
+	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $search_sale);
 }
 if ($search_user > 0) {
-	$sql .= " AND ec.fk_c_type_contact = tc.rowid AND tc.element='facture' AND tc.source='internal' AND ec.element_id = f.rowid AND ec.fk_socpeople = ".$search_user;
+	$sql .= " AND ec.fk_c_type_contact = tc.rowid AND tc.element='facture' AND tc.source='internal' AND ec.element_id = f.rowid AND ec.fk_socpeople = ".((int) $search_user);
 }
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index e33ddc35610..18519955bf6 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -138,7 +138,7 @@ if (!empty($conf->facture->enabled) && !empty($user->rights->facture->lire)) {
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 	}
 	if ($socid) {
-		$sql .= " AND f.fk_soc = ".$socid;
+		$sql .= " AND f.fk_soc = ".((int) $socid);
 	}
 	// Add where from hooks
 	$parameters = array();
@@ -283,7 +283,7 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 	}
 	if ($socid) {
-		$sql .= " AND ff.fk_soc = ".$socid;
+		$sql .= " AND ff.fk_soc = ".((int) $socid);
 	}
 	// Add where from hooks
 	$parameters = array();
@@ -593,7 +593,7 @@ if (!empty($conf->facture->enabled) && !empty($conf->commande->enabled) && $user
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 	}
 	if ($socid) {
-		$sql .= " AND c.fk_soc = ".$socid;
+		$sql .= " AND c.fk_soc = ".((int) $socid);
 	}
 	$sql .= " AND c.fk_statut = ".Commande::STATUS_CLOSED;
 	$sql .= " AND c.facture = 0";
diff --git a/htdocs/compta/localtax/class/localtax.class.php b/htdocs/compta/localtax/class/localtax.class.php
index dc133977202..115dce99c9e 100644
--- a/htdocs/compta/localtax/class/localtax.class.php
+++ b/htdocs/compta/localtax/class/localtax.class.php
@@ -170,7 +170,7 @@ class Localtax extends CommonObject
 
 		// Update request
 		$sql = "UPDATE ".MAIN_DB_PREFIX."localtax SET";
-		$sql .= " localtaxtype=".$this->ltt.",";
+		$sql .= " localtaxtype=".((int) $this->ltt).",";
 		$sql .= " tms='".$this->db->idate($this->tms)."',";
 		$sql .= " datep='".$this->db->idate($this->datep)."',";
 		$sql .= " datev='".$this->db->idate($this->datev)."',";
diff --git a/htdocs/compta/localtax/index.php b/htdocs/compta/localtax/index.php
index 86fa3fe52f0..f9ea0ac02d9 100644
--- a/htdocs/compta/localtax/index.php
+++ b/htdocs/compta/localtax/index.php
@@ -584,7 +584,7 @@ $sql .= "SELECT SUM(amount) as mm, date_format(f.datev,'%Y-%m') as dm, 'claimed'
 $sql .= " FROM ".MAIN_DB_PREFIX."localtax as f";
 $sql .= " WHERE f.entity = ".$conf->entity;
 $sql .= " AND (f.datev >= '".$db->idate($date_start)."' AND f.datev <= '".$db->idate($date_end)."')";
-$sql .= " AND localtaxtype=".$localTaxType;
+$sql .= " AND localtaxtype=".((int) $localTaxType);
 $sql .= " GROUP BY dm";
 
 $sql .= " UNION ";
@@ -593,7 +593,7 @@ $sql .= "SELECT SUM(amount) as mm, date_format(f.datep,'%Y-%m') as dm, 'paid' as
 $sql .= " FROM ".MAIN_DB_PREFIX."localtax as f";
 $sql .= " WHERE f.entity = ".$conf->entity;
 $sql .= " AND (f.datep >= '".$db->idate($date_start)."' AND f.datep <= '".$db->idate($date_end)."')";
-$sql .= " AND localtaxtype=".$localTaxType;
+$sql .= " AND localtaxtype=".((int) $localTaxType);
 $sql .= " GROUP BY dm";
 
 $sql .= " ORDER BY dm ASC, mode ASC";
diff --git a/htdocs/compta/paiement/cheque/card.php b/htdocs/compta/paiement/cheque/card.php
index 04eee81ced0..32f81532ecf 100644
--- a/htdocs/compta/paiement/cheque/card.php
+++ b/htdocs/compta/paiement/cheque/card.php
@@ -606,7 +606,7 @@ if ($action == 'new') {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement as p ON p.fk_bank = b.rowid";
 	$sql .= " WHERE ba.entity IN (".getEntity('bank_account').")";
 	$sql .= " AND b.fk_type= 'CHQ'";
-	$sql .= " AND b.fk_bordereau = ".$object->id;
+	$sql .= " AND b.fk_bordereau = ".((int) $object->id);
 	$sql .= $db->order($sortfield, $sortorder);
 
 	$resql = $db->query($sql);
diff --git a/htdocs/compta/paiement/cheque/list.php b/htdocs/compta/paiement/cheque/list.php
index 0c4a6d9c478..f4d6c9e2686 100644
--- a/htdocs/compta/paiement/cheque/list.php
+++ b/htdocs/compta/paiement/cheque/list.php
@@ -104,7 +104,7 @@ if ($search_ref) {
 	$sql .= natural_search("bc.ref", $search_ref);
 }
 if ($search_account > 0) {
-	$sql .= " AND bc.fk_bank_account=".$search_account;
+	$sql .= " AND bc.fk_bank_account = ".((int) $search_account);
 }
 if ($search_amount) {
 	$sql .= natural_search("bc.amount", price2num($search_amount));
diff --git a/htdocs/compta/paiement/tovalidate.php b/htdocs/compta/paiement/tovalidate.php
index 4e464243df6..6b811bc2d13 100644
--- a/htdocs/compta/paiement/tovalidate.php
+++ b/htdocs/compta/paiement/tovalidate.php
@@ -78,7 +78,7 @@ if ($socid) {
 }
 $sql .= " WHERE p.entity IN (".getEntity('invoice').')';
 if ($socid) {
-	$sql .= " AND f.fk_soc = ".$socid;
+	$sql .= " AND f.fk_soc = ".((int) $socid);
 }
 $sql .= " AND p.statut = 0";
 
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index dbf2d67778a..f69c7b476a2 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -203,7 +203,7 @@ class BonPrelevement extends CommonObject
 			$sql = "SELECT rowid";
 			$sql .= " FROM  ".MAIN_DB_PREFIX."prelevement_lignes";
 			$sql .= " WHERE fk_prelevement_bons = ".$this->id;
-			$sql .= " AND fk_soc =".$client_id;
+			$sql .= " AND fk_soc =".((int) $client_id);
 			$sql .= " AND code_banque = '".$this->db->escape($code_banque)."'";
 			$sql .= " AND code_guichet = '".$this->db->escape($code_guichet)."'";
 			$sql .= " AND number = '".$this->db->escape($number)."'";
diff --git a/htdocs/compta/prelevement/class/rejetprelevement.class.php b/htdocs/compta/prelevement/class/rejetprelevement.class.php
index 0faea8a159c..dcf3c1a8bc5 100644
--- a/htdocs/compta/prelevement/class/rejetprelevement.class.php
+++ b/htdocs/compta/prelevement/class/rejetprelevement.class.php
@@ -329,7 +329,7 @@ class RejetPrelevement
 
 		$sql = "SELECT pr.date_rejet as dr, motif, afacturer";
 		$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_rejet as pr";
-		$sql .= " WHERE pr.fk_prelevement_lignes =".$rowid;
+		$sql .= " WHERE pr.fk_prelevement_lignes =".((int) $rowid);
 
 		$resql = $this->db->query($sql);
 		if ($resql) {
@@ -345,11 +345,11 @@ class RejetPrelevement
 
 				return 0;
 			} else {
-				dol_syslog("RejetPrelevement::Fetch Erreur rowid=$rowid numrows=0");
+				dol_syslog("RejetPrelevement::Fetch Erreur rowid=".$rowid." numrows=0");
 				return -1;
 			}
 		} else {
-			dol_syslog("RejetPrelevement::Fetch Erreur rowid=$rowid");
+			dol_syslog("RejetPrelevement::Fetch Erreur rowid=".$rowid);
 			return -2;
 		}
 	}
diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php
index 928be9c4245..8711f663d55 100644
--- a/htdocs/compta/prelevement/fiche-rejet.php
+++ b/htdocs/compta/prelevement/fiche-rejet.php
@@ -170,15 +170,15 @@ $sql .= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p";
 $sql .= " , ".MAIN_DB_PREFIX."prelevement_lignes as pl";
 $sql .= " , ".MAIN_DB_PREFIX."societe as s";
 $sql .= " , ".MAIN_DB_PREFIX."prelevement_rejet as pr";
-$sql .= " WHERE p.rowid=".$object->id;
+$sql .= " WHERE p.rowid=".((int) $object->id);
 $sql .= " AND pl.fk_prelevement_bons = p.rowid";
 $sql .= " AND p.entity = ".$conf->entity;
 $sql .= " AND pl.fk_soc = s.rowid";
 $sql .= " AND pl.statut = 3 ";
 $sql .= " AND pr.fk_prelevement_lignes = pl.rowid";
-if ($socid) {
+/*if ($socid) {
 	$sql .= " AND s.rowid = ".((int) $socid);
-}
+}*/
 $sql .= " ORDER BY pl.amount DESC";
 
 // Count total nb of records
diff --git a/htdocs/compta/recap-compta.php b/htdocs/compta/recap-compta.php
index 3abdf04ae1b..d98a6aab251 100644
--- a/htdocs/compta/recap-compta.php
+++ b/htdocs/compta/recap-compta.php
@@ -189,7 +189,7 @@ if ($id > 0) {
 				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON p.fk_user_creat = u.rowid";
 				$sql .= " WHERE pf.fk_paiement = p.rowid";
 				$sql .= " AND p.entity = ".$conf->entity;
-				$sql .= " AND pf.fk_facture = ".$fac->id;
+				$sql .= " AND pf.fk_facture = ".((int) $fac->id);
 				$sql .= " ORDER BY p.datep ASC, p.rowid ASC";
 
 				$resqlp = $db->query($sql);
diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index bd871fd3ea3..5aca25466a3 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -403,7 +403,7 @@ if ($modecompta == 'BOOKKEEPING') {
 	}
 	$sql .= " AND f.entity IN (".getEntity('invoice').")";
 	if ($socid) {
-		$sql .= " AND f.fk_soc = ".$socid;
+		$sql .= " AND f.fk_soc = ".((int) $socid);
 	}
 	$sql .= " GROUP BY name, socid";
 	$sql .= $db->order($sortfield, $sortorder);
diff --git a/htdocs/compta/sociales/list.php b/htdocs/compta/sociales/list.php
index db754390e5e..a4deec56715 100644
--- a/htdocs/compta/sociales/list.php
+++ b/htdocs/compta/sociales/list.php
@@ -218,7 +218,7 @@ if ($search_amount) {
 	$sql .= natural_search("cs.amount", $search_amount, 1);
 }
 if ($search_status != '' && $search_status >= 0) {
-	$sql .= " AND cs.paye = ".$db->escape($search_status);
+	$sql .= " AND cs.paye = ".((int) $search_status);
 }
 $sql .= dolSqlDateFilter("cs.periode", $search_day_lim, $search_month_lim, $search_year_lim);
 //$sql.= dolSqlDateFilter("cs.periode", 0, 0, $year);
@@ -230,8 +230,8 @@ if ($year > 0) {
 	$sql .= "OR (cs.periode IS NULL AND date_format(cs.date_ech, '%Y') = '".$db->escape($year)."')";
 	$sql .= ")";
 }
-if ($search_typeid) {
-	$sql .= " AND cs.fk_type=".$db->escape($search_typeid);
+if ($search_typeid > 0) {
+	$sql .= " AND cs.fk_type = ".((int) $search_typeid);
 }
 $sql .= " GROUP BY cs.rowid, cs.fk_type, cs.fk_user, cs.amount, cs.date_ech, cs.libelle, cs.paye, cs.periode, c.libelle, cs.fk_account, ba.label, ba.ref, ba.number, ba.account_number, ba.iban_prefix, ba.bic, ba.currency_code, ba.clos, pay.code, u.lastname";
 if (!empty($conf->projet->enabled)) {
diff --git a/htdocs/compta/stats/cabyuser.php b/htdocs/compta/stats/cabyuser.php
index 63798baf62f..8e3169f1e8c 100644
--- a/htdocs/compta/stats/cabyuser.php
+++ b/htdocs/compta/stats/cabyuser.php
@@ -262,7 +262,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 }
 $sql .= " AND f.entity IN (".getEntity('invoice').")";
 if ($socid) {
-	$sql .= " AND f.fk_soc = ".$socid;
+	$sql .= " AND f.fk_soc = ".((int) $socid);
 }
 $sql .= " GROUP BY u.rowid, u.lastname, u.firstname";
 $sql .= " ORDER BY u.rowid";
diff --git a/htdocs/compta/stats/index.php b/htdocs/compta/stats/index.php
index 05bbbab99d3..e7ec8c61db7 100644
--- a/htdocs/compta/stats/index.php
+++ b/htdocs/compta/stats/index.php
@@ -681,7 +681,7 @@ print '</div>';
  AND p.facture =0";
  if ($socid)
  {
- $sql .= " AND f.fk_soc = ".$socid;
+ $sql .= " AND f.fk_soc = ".((int) $socid);
  }
  $sql .= " GROUP BY p.rowid";
 
diff --git a/htdocs/compta/stats/supplier_turnover.php b/htdocs/compta/stats/supplier_turnover.php
index 0afcb72da2d..7273e8ed529 100644
--- a/htdocs/compta/stats/supplier_turnover.php
+++ b/htdocs/compta/stats/supplier_turnover.php
@@ -197,7 +197,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 	$sql .= " AND f.type IN (0,2)";
 	$sql .= " AND f.entity IN (".getEntity('supplier_invoice').")";
 	if ($socid) {
-		$sql .= " AND f.fk_soc = ".$socid;
+		$sql .= " AND f.fk_soc = ".((int) $socid);
 	}
 } elseif ($modecompta == "RECETTES-DEPENSES") {
 	$sql = "SELECT date_format(p.datep,'%Y-%m') as dm, sum(pf.amount) as amount_ttc";
@@ -208,7 +208,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 	$sql .= " AND pf.fk_facturefourn = f.rowid";
 	$sql .= " AND f.entity IN (".getEntity('supplier_invoice').")";
 	if ($socid) {
-		$sql .= " AND f.fk_soc = ".$socid;
+		$sql .= " AND f.fk_soc = ".((int) $socid);
 	}
 } elseif ($modecompta == "BOOKKEEPING") {
 	$pcgverid = $conf->global->CHARTOFACCOUNTS;
diff --git a/htdocs/compta/stats/supplier_turnover_by_thirdparty.php b/htdocs/compta/stats/supplier_turnover_by_thirdparty.php
index a97e15d1499..0ea8418381d 100644
--- a/htdocs/compta/stats/supplier_turnover_by_thirdparty.php
+++ b/htdocs/compta/stats/supplier_turnover_by_thirdparty.php
@@ -301,7 +301,7 @@ if ($search_country > 0) {
 }
 $sql .= " AND f.entity IN (".getEntity('supplier_invoice').")";
 if ($socid) {
-	$sql .= " AND f.fk_soc = ".$socid;
+	$sql .= " AND f.fk_soc = ".((int) $socid);
 }
 $sql .= " GROUP BY s.rowid, s.nom, s.zip, s.town, s.fk_pays";
 $sql .= " ORDER BY s.rowid";
diff --git a/htdocs/compta/tva/class/tva.class.php b/htdocs/compta/tva/class/tva.class.php
index daed5b19f5e..45d3d2e74b4 100644
--- a/htdocs/compta/tva/class/tva.class.php
+++ b/htdocs/compta/tva/class/tva.class.php
@@ -207,7 +207,7 @@ class Tva extends CommonObject
 		$sql .= " amount=".price2num($this->amount).",";
 		$sql .= " label='".$this->db->escape($this->label)."',";
 		$sql .= " note='".$this->db->escape($this->note)."',";
-		$sql .= " fk_user_creat=".$this->fk_user_creat.",";
+		$sql .= " fk_user_creat=".((int) $this->fk_user_creat).",";
 		$sql .= " fk_user_modif=".($this->fk_user_modif > 0 ? $this->fk_user_modif : $user->id)."";
 		$sql .= " WHERE rowid=".((int) $this->id);
 
diff --git a/htdocs/compta/tva/list.php b/htdocs/compta/tva/list.php
index 17237732cea..69ce8ae8ae5 100644
--- a/htdocs/compta/tva/list.php
+++ b/htdocs/compta/tva/list.php
@@ -171,16 +171,16 @@ if (!empty($search_datepayment_end)) {
 	$sql .= ' AND t.datep <= "'.$db->idate($search_datepayment_end).'"';
 }
 if (!empty($search_type) && $search_type > 0) {
-	$sql .= ' AND t.fk_typepayment='.$search_type;
+	$sql .= ' AND t.fk_typepayment = '.((int) $search_type);
 }
 if (!empty($search_account) && $search_account > 0) {
-	$sql .= ' AND t.fk_account='.$search_account;
+	$sql .= ' AND t.fk_account = '.((int) $search_account);
 }
 if (!empty($search_amount)) {
 	$sql .= natural_search('t.amount', price2num(trim($search_amount)), 1);
 }
 if ($search_status != '' && $search_status >= 0) {
-	$sql .= " AND t.paye = ".$db->escape($search_status);
+	$sql .= " AND t.paye = ".((int) $search_status);
 }
 
 $sql .= " GROUP BY t.rowid, t.amount, t.label, t.datev, t.datep, t.paye, t.fk_typepayment, t.fk_account, ba.label, ba.ref, ba.number, ba.account_number, ba.iban_prefix, ba.bic, ba.currency_code, ba.clos, t.num_payment, pst.code";
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index 78e4ffae99b..e1f987ac2f4 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -591,11 +591,11 @@ class Contact extends CommonObject
 		if (isset($this->stcomm_id)) {
 			$sql .= ", fk_stcommcontact = ".($this->stcomm_id > 0 || $this->stcomm_id == -1 ? $this->stcomm_id : "0");
 		}
-		$sql .= ", statut = ".$this->db->escape($this->statut);
+		$sql .= ", statut = ".((int) $this->statut);
 		$sql .= ", fk_user_modif=".($user->id > 0 ? "'".$this->db->escape($user->id)."'" : "NULL");
 		$sql .= ", default_lang=".($this->default_lang ? "'".$this->db->escape($this->default_lang)."'" : "NULL");
-		$sql .= ", entity = ".$this->db->escape($this->entity);
-		$sql .= " WHERE rowid=".$this->db->escape($id);
+		$sql .= ", entity = ".((int) $this->entity);
+		$sql .= " WHERE rowid=".((int) $id);
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$result = $this->db->query($sql);
@@ -1221,7 +1221,7 @@ class Contact extends CommonObject
 					$obj = $this->db->fetch_object($resql);
 
 					$sqldel = "DELETE FROM ".MAIN_DB_PREFIX."element_contact";
-					$sqldel .= " WHERE rowid = ".$obj->rowid;
+					$sqldel .= " WHERE rowid = ".((int) $obj->rowid);
 					dol_syslog(__METHOD__, LOG_DEBUG);
 					$result = $this->db->query($sqldel);
 					if (!$result) {
@@ -1324,7 +1324,7 @@ class Contact extends CommonObject
 		$sql = "SELECT c.rowid, c.datec as datec, c.fk_user_creat,";
 		$sql .= " c.tms as tms, c.fk_user_modif";
 		$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as c";
-		$sql .= " WHERE c.rowid = ".$this->db->escape($id);
+		$sql .= " WHERE c.rowid = ".((int) $id);
 
 		$resql = $this->db->query($sql);
 		if ($resql) {
@@ -1770,10 +1770,10 @@ class Contact extends CommonObject
 		$sql = "SELECT sc.fk_socpeople as id, sc.fk_c_type_contact";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_type_contact tc";
 		$sql .= ", ".MAIN_DB_PREFIX."societe_contacts sc";
-		$sql .= " WHERE sc.fk_soc =".$this->socid;
+		$sql .= " WHERE sc.fk_soc =".((int) $this->socid);
 		$sql .= " AND sc.fk_c_type_contact=tc.rowid";
-		$sql .= " AND tc.element='".$this->db->escape($element)."'";
-		$sql .= " AND tc.active=1";
+		$sql .= " AND tc.element = '".$this->db->escape($element)."'";
+		$sql .= " AND tc.active = 1";
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 		$resql = $this->db->query($sql);
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 74e3c704739..5ef0a10deb5 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -392,7 +392,7 @@ if (!$user->rights->societe->client->voir && !$socid) { //restriction
 	$sql .= " AND (sc.fk_user = ".$user->id." OR p.fk_soc IS NULL)";
 }
 if (!empty($userid)) {    // propre au commercial
-	$sql .= " AND p.fk_user_creat=".$db->escape($userid);
+	$sql .= " AND p.fk_user_creat=".((int) $userid);
 }
 if ($search_level) {
 	$sql .= natural_search("p.fk_prospectcontactlevel", join(',', $search_level), 3);
@@ -414,19 +414,19 @@ if ($search_priv != '0' && $search_priv != '1') {
 }
 
 if ($search_categ > 0) {
-	$sql .= " AND cc.fk_categorie = ".$db->escape($search_categ);
+	$sql .= " AND cc.fk_categorie = ".((int) $search_categ);
 }
 if ($search_categ == -2) {
 	$sql .= " AND cc.fk_categorie IS NULL";
 }
 if ($search_categ_thirdparty > 0) {
-	$sql .= " AND cs.fk_categorie = ".$db->escape($search_categ_thirdparty);
+	$sql .= " AND cs.fk_categorie = ".((int) $search_categ_thirdparty);
 }
 if ($search_categ_thirdparty == -2) {
 	$sql .= " AND cs.fk_categorie IS NULL";
 }
 if ($search_categ_supplier > 0) {
-	$sql .= " AND cs2.fk_categorie = ".$db->escape($search_categ_supplier);
+	$sql .= " AND cs2.fk_categorie = ".((int) $search_categ_supplier);
 }
 if ($search_categ_supplier == -2) {
 	$sql .= " AND cs2.fk_categorie IS NULL";
@@ -495,10 +495,10 @@ if (count($search_roles) > 0) {
 	$sql .= " AND p.rowid IN (SELECT sc.fk_socpeople FROM ".MAIN_DB_PREFIX."societe_contacts as sc WHERE sc.fk_c_type_contact IN (".$db->sanitize(implode(',', $search_roles))."))";
 }
 if ($search_no_email != '' && $search_no_email >= 0) {
-	$sql .= " AND p.no_email = ".$db->escape($search_no_email);
+	$sql .= " AND p.no_email = ".((int) $search_no_email);
 }
 if ($search_status != '' && $search_status >= 0) {
-	$sql .= " AND p.statut = ".$db->escape($search_status);
+	$sql .= " AND p.statut = ".((int) $search_status);
 }
 if ($search_import_key) {
 	$sql .= natural_search("p.import_key", $search_import_key);
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 186e4ee5761..0275baeb3a9 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -3066,9 +3066,9 @@ class ContratLigne extends CommonObjectLine
 
 		// Update request
 		$sql = "UPDATE ".MAIN_DB_PREFIX."contratdet SET";
-		$sql .= " fk_contrat=".$this->fk_contrat.",";
+		$sql .= " fk_contrat=".((int) $this->fk_contrat).",";
 		$sql .= " fk_product=".($this->fk_product ? "'".$this->db->escape($this->fk_product)."'" : 'null').",";
-		$sql .= " statut=".$this->statut.",";
+		$sql .= " statut=".((int) $this->statut).",";
 		$sql .= " label='".$this->db->escape($this->label)."',";
 		$sql .= " description='".$this->db->escape($this->description)."',";
 		$sql .= " date_commande=".($this->date_commande != '' ? "'".$this->db->idate($this->date_commande)."'" : "null").",";
@@ -3373,11 +3373,11 @@ class ContratLigne extends CommonObjectLine
 
 		$this->db->begin();
 
-		$sql = "UPDATE ".MAIN_DB_PREFIX."contratdet SET statut = ".ContratLigne::STATUS_CLOSED.",";
+		$sql = "UPDATE ".MAIN_DB_PREFIX."contratdet SET statut = ".((int) ContratLigne::STATUS_CLOSED).",";
 		$sql .= " date_cloture = '".$this->db->idate($date_end)."',";
 		$sql .= " fk_user_cloture = ".$user->id.",";
 		$sql .= " commentaire = '".$this->db->escape($comment)."'";
-		$sql .= " WHERE rowid = ".$this->id." AND statut = ".ContratLigne::STATUS_OPEN;
+		$sql .= " WHERE rowid = ".$this->id." AND statut = ".((int) ContratLigne::STATUS_OPEN);
 
 		$resql = $this->db->query($sql);
 		if ($resql) {
diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php
index aed4cba2fe1..a5e3da943b7 100644
--- a/htdocs/contrat/index.php
+++ b/htdocs/contrat/index.php
@@ -250,7 +250,7 @@ if (!empty($conf->contrat->enabled) && $user->rights->contrat->lire) {
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 	}
 	if ($socid) {
-		$sql .= " AND c.fk_soc = ".$socid;
+		$sql .= " AND c.fk_soc = ".((int) $socid);
 	}
 
 	$resql = $db->query($sql);
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index cf19f1178f6..ccb36830844 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -265,10 +265,10 @@ if ($search_type_thirdparty != '' && $search_type_thirdparty > 0) {
 	$sql .= " AND s.fk_typent IN (".$db->sanitize($db->escape($search_type_thirdparty)).')';
 }
 if ($search_product_category > 0) {
-	$sql .= " AND cp.fk_categorie = ".$search_product_category;
+	$sql .= " AND cp.fk_categorie = ".((int) $search_product_category);
 }
 if ($socid) {
-	$sql .= " AND s.rowid = ".$db->escape($socid);
+	$sql .= " AND s.rowid = ".((int) $socid);
 }
 if (!$user->rights->societe->client->voir && !$socid) {
 	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
@@ -296,13 +296,13 @@ if ($search_town) {
 	$sql .= natural_search(array('s.town'), $search_town);
 }
 if ($search_sale > 0) {
-	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$search_sale;
+	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $search_sale);
 }
 if ($sall) {
 	$sql .= natural_search(array_keys($fieldstosearchall), $sall);
 }
 if ($search_user > 0) {
-	$sql .= " AND ec.fk_c_type_contact = tc.rowid AND tc.element='contrat' AND tc.source='internal' AND ec.element_id = c.rowid AND ec.fk_socpeople = ".$search_user;
+	$sql .= " AND ec.fk_c_type_contact = tc.rowid AND tc.element='contrat' AND tc.source='internal' AND ec.element_id = c.rowid AND ec.fk_socpeople = ".((int) $search_user);
 }
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
diff --git a/htdocs/contrat/services_list.php b/htdocs/contrat/services_list.php
index a0ecc6b4be8..8368bffbab2 100644
--- a/htdocs/contrat/services_list.php
+++ b/htdocs/contrat/services_list.php
@@ -257,7 +257,7 @@ if ($search_product_category > 0) {
 $sql .= " WHERE c.entity = ".$conf->entity;
 $sql .= " AND c.rowid = cd.fk_contrat";
 if ($search_product_category > 0) {
-	$sql .= " AND cp.fk_categorie = ".$search_product_category;
+	$sql .= " AND cp.fk_categorie = ".((int) $search_product_category);
 }
 $sql .= " AND c.fk_soc = s.rowid";
 if (!$user->rights->societe->client->voir && !$socid) {
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 9e312bee679..f3c68711edd 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -531,7 +531,7 @@ abstract class CommonObject
 		$sql .= " WHERE entity IN (".getEntity($element).")";
 
 		if ($id > 0) {
-			$sql .= " AND rowid = ".$db->escape($id);
+			$sql .= " AND rowid = ".((int) $id);
 		} elseif ($ref) {
 			$sql .= " AND ref = '".$db->escape($ref)."'";
 		} elseif ($ref_ext) {
@@ -542,7 +542,7 @@ abstract class CommonObject
 			return -1;
 		}
 		if ($ref || $ref_ext) {
-			$sql .= " AND entity = ".$conf->entity;
+			$sql .= " AND entity = ".((int) $conf->entity);
 		}
 
 		dol_syslog(get_class()."::isExistingObject", LOG_DEBUG);
@@ -1278,7 +1278,7 @@ abstract class CommonObject
 		}
 		$sql .= " AND tc.active=1";
 		if ($status >= 0) {
-			$sql .= " AND ec.statut = ".$status;
+			$sql .= " AND ec.statut = ".((int) $status);
 		}
 		$sql .= " ORDER BY t.lastname ASC";
 
@@ -1926,7 +1926,7 @@ abstract class CommonObject
 		if ($format == 'text') {
 			$sql .= $field." = '".$this->db->escape($value)."'";
 		} elseif ($format == 'int') {
-			$sql .= $field." = ".$this->db->escape($value);
+			$sql .= $field." = ".((int) $value);
 		} elseif ($format == 'date') {
 			$sql .= $field." = ".($value ? "'".$this->db->idate($value)."'" : "null");
 		}
@@ -3709,19 +3709,19 @@ abstract class CommonObject
 		$sql .= " WHERE ";
 		if ($justsource || $justtarget) {
 			if ($justsource) {
-				$sql .= "fk_source = ".$sourceid." AND sourcetype = '".$this->db->escape($sourcetype)."'";
+				$sql .= "fk_source = ".((int) $sourceid)." AND sourcetype = '".$this->db->escape($sourcetype)."'";
 				if ($withtargettype) {
 					$sql .= " AND targettype = '".$this->db->escape($targettype)."'";
 				}
 			} elseif ($justtarget) {
-				$sql .= "fk_target = ".$targetid." AND targettype = '".$this->db->escape($targettype)."'";
+				$sql .= "fk_target = ".((int) $targetid)." AND targettype = '".$this->db->escape($targettype)."'";
 				if ($withsourcetype) {
 					$sql .= " AND sourcetype = '".$this->db->escape($sourcetype)."'";
 				}
 			}
 		} else {
-			$sql .= "(fk_source = ".$sourceid." AND sourcetype = '".$this->db->escape($sourcetype)."')";
-			$sql .= " ".$clause." (fk_target = ".$targetid." AND targettype = '".$this->db->escape($targettype)."')";
+			$sql .= "(fk_source = ".((int) $sourceid)." AND sourcetype = '".$this->db->escape($sourcetype)."')";
+			$sql .= " ".$clause." (fk_target = ".((int) $targetid)." AND targettype = '".$this->db->escape($targettype)."')";
 		}
 		$sql .= ' ORDER BY '.$orderby;
 
@@ -4106,12 +4106,12 @@ abstract class CommonObject
 		}
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$elementTable;
-		$sql .= " SET ".$fieldstatus." = ".$status;
+		$sql .= " SET ".$fieldstatus." = ".((int) $status);
 		// If status = 1 = validated, update also fk_user_valid
 		if ($status == 1 && $elementTable == 'expensereport') {
 			$sql .= ", fk_user_valid = ".$user->id;
 		}
-		$sql .= " WHERE rowid=".$elementId;
+		$sql .= " WHERE rowid=".((int) $elementId);
 
 		dol_syslog(get_class($this)."::setStatut", LOG_DEBUG);
 		if ($this->db->query($sql)) {
@@ -7122,11 +7122,11 @@ abstract class CommonObject
 				$sql .= ' as main';
 			}
 			if ($selectkey == 'rowid' && empty($value)) {
-				$sql .= " WHERE ".$selectkey."=0";
+				$sql .= " WHERE ".$selectkey." = 0";
 			} elseif ($selectkey == 'rowid') {
-				$sql .= " WHERE ".$selectkey."=".$this->db->escape($value);
+				$sql .= " WHERE ".$selectkey." = ".((int) $value);
 			} else {
-				$sql .= " WHERE ".$selectkey."='".$this->db->escape($value)."'";
+				$sql .= " WHERE ".$selectkey." = '".$this->db->escape($value)."'";
 			}
 
 			//$sql.= ' AND entity = '.$conf->entity;
diff --git a/htdocs/core/class/discount.class.php b/htdocs/core/class/discount.class.php
index 32d7faa1557..aaf0f315c1b 100644
--- a/htdocs/core/class/discount.class.php
+++ b/htdocs/core/class/discount.class.php
@@ -292,7 +292,7 @@ class DiscountAbsolute
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except";
 			$sql .= " WHERE (fk_facture_line IS NOT NULL"; // Not used as absolute simple discount
 			$sql .= " OR fk_facture IS NOT NULL)"; // Not used as credit note and not used as deposit
-			$sql .= " AND fk_facture_source = ".$this->fk_facture_source;
+			$sql .= " AND fk_facture_source = ".((int) $this->fk_facture_source);
 			//$sql.=" AND rowid != ".$this->id;
 
 			dol_syslog(get_class($this)."::delete Check if we can remove discount", LOG_DEBUG);
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index dc3726f2634..2f8b0871a83 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -1722,11 +1722,11 @@ class ExtraFields
 				$sql .= ' as main';
 			}
 			if ($selectkey == 'rowid' && empty($value)) {
-				$sql .= " WHERE ".$selectkey."=0";
+				$sql .= " WHERE ".$selectkey." = 0";
 			} elseif ($selectkey == 'rowid') {
-				$sql .= " WHERE ".$selectkey."=".$this->db->escape($value);
+				$sql .= " WHERE ".$selectkey." = ".((int) $value);
 			} else {
-				$sql .= " WHERE ".$selectkey."='".$this->db->escape($value)."'";
+				$sql .= " WHERE ".$selectkey." = '".$this->db->escape($value)."'";
 			}
 
 			//$sql.= ' AND entity = '.$conf->entity;
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 1dd6712dba6..e084757fe28 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -2497,18 +2497,18 @@ class Form
 		}
 
 		if ($finished == 0) {
-			$sql .= " AND p.finished = ".$finished;
+			$sql .= " AND p.finished = ".((int) $finished);
 		} elseif ($finished == 1) {
-			$sql .= " AND p.finished = ".$finished;
+			$sql .= " AND p.finished = ".((int) $finished);
 			if ($status >= 0) {
-				$sql .= " AND p.tosell = ".$status;
+				$sql .= " AND p.tosell = ".((int) $status);
 			}
 		} elseif ($status >= 0) {
-			$sql .= " AND p.tosell = ".$status;
+			$sql .= " AND p.tosell = ".((int) $status);
 		}
 		// Filter by product type
 		if (strval($filtertype) != '') {
-			$sql .= " AND p.fk_product_type = ".$filtertype;
+			$sql .= " AND p.fk_product_type = ".((int) $filtertype);
 		} elseif (empty($conf->product->enabled)) { // when product module is disabled, show services only
 			$sql .= " AND p.fk_product_type = 1";
 		} elseif (empty($conf->service->enabled)) { // when service module is disabled, show products only
@@ -3828,7 +3828,6 @@ class Form
 		$sql = "SELECT id, code, libelle as label, type, active";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_paiement";
 		$sql .= " WHERE entity IN (".getEntity('c_paiement').")";
-		//if ($active >= 0) $sql.= " AND active = ".$active;
 
 		$resql = $this->db->query($sql);
 		if ($resql) {
@@ -4061,7 +4060,6 @@ class Form
 		$sql = "SELECT rowid, code, label, active";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_transport_mode";
 		$sql .= " WHERE entity IN (".getEntity('c_transport_mode').")";
-		//if ($active >= 0) $sql.= " AND active = ".$active;
 
 		$resql = $this->db->query($sql);
 		if ($resql) {
diff --git a/htdocs/core/class/html.formaccounting.class.php b/htdocs/core/class/html.formaccounting.class.php
index a57e39f1779..fbfde88198b 100644
--- a/htdocs/core/class/html.formaccounting.class.php
+++ b/htdocs/core/class/html.formaccounting.class.php
@@ -242,7 +242,7 @@ class FormAccounting extends Form
 			$sql .= " WHERE c.active = 1";
 			$sql .= " AND c.category_type = 0";
 			if (empty($allcountries)) {
-				$sql .= " AND c.fk_country = ".$mysoc->country_id;
+				$sql .= " AND c.fk_country = ".((int) $mysoc->country_id);
 			}
 			$sql .= " ORDER BY c.label ASC";
 		} else {
diff --git a/htdocs/core/class/html.formintervention.class.php b/htdocs/core/class/html.formintervention.class.php
index aa0259ba288..7058e80b1d7 100644
--- a/htdocs/core/class/html.formintervention.class.php
+++ b/htdocs/core/class/html.formintervention.class.php
@@ -77,14 +77,14 @@ class FormIntervention
 			if ($socid == '0') {
 				$sql .= " AND (f.fk_soc = 0 OR f.fk_soc IS NULL)";
 			} else {
-				$sql .= " AND f.fk_soc = ".$socid;
+				$sql .= " AND f.fk_soc = ".((int) $socid);
 			}
 		}
 
 		dol_syslog(get_class($this)."::select_intervention", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
-			$out .= '<select id="interventionid" class="flat" name="'.$htmlname.'">';
+			$out .= '<select id="interventionid" class="flat" name="'.dol_escape_htmltag($htmlname).'">';
 			if ($showempty) {
 				$out .= '<option value="0">&nbsp;</option>';
 			}
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index a9da488907d..00c1c4236c4 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -1275,10 +1275,10 @@ class FormMail extends Form
 		$sql .= " AND entity IN (".getEntity('c_email_templates').")";
 		$sql .= " AND (private = 0 OR fk_user = ".$user->id.")"; // Get all public or private owned
 		if ($active >= 0) {
-			$sql .= " AND active = ".$active;
+			$sql .= " AND active = ".((int) $active);
 		}
 		if ($label) {
-			$sql .= " AND label ='".$db->escape($label)."'";
+			$sql .= " AND label = '".$db->escape($label)."'";
 		}
 		if (!($id > 0) && $languagetosearch) {
 			$sql .= " AND (lang = '".$db->escape($languagetosearch)."'".($languagetosearchmain ? " OR lang = '".$db->escape($languagetosearchmain)."'" : "")." OR lang IS NULL OR lang = '')";
@@ -1434,7 +1434,7 @@ class FormMail extends Form
 		$sql .= " AND entity IN (".getEntity('c_email_templates').")";
 		$sql .= " AND (private = 0 OR fk_user = ".$user->id.")"; // See all public templates or templates I own.
 		if ($active >= 0) {
-			$sql .= " AND active = ".$active;
+			$sql .= " AND active = ".((int) $active);
 		}
 		//if (is_object($outputlangs)) $sql.= " AND (lang = '".$this->db->escape($outputlangs->defaultlang)."' OR lang IS NULL OR lang = '')";	// Return all languages
 		$sql .= $this->db->order("position,lang,label", "ASC");
diff --git a/htdocs/core/class/html.formsocialcontrib.class.php b/htdocs/core/class/html.formsocialcontrib.class.php
index 8a40eed9da8..3455b572888 100644
--- a/htdocs/core/class/html.formsocialcontrib.class.php
+++ b/htdocs/core/class/html.formsocialcontrib.class.php
@@ -76,7 +76,7 @@ class FormSocialContrib
 			$sql = "SELECT c.id, c.libelle as type";
 			$sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
 			$sql .= " WHERE c.active = 1";
-			$sql .= " AND c.fk_pays = ".$mysoc->country_id;
+			$sql .= " AND c.fk_pays = ".((int) $mysoc->country_id);
 			$sql .= " ORDER BY c.libelle ASC";
 		} else {
 			$sql = "SELECT c.id, c.libelle as type";
diff --git a/htdocs/core/class/infobox.class.php b/htdocs/core/class/infobox.class.php
index 076dace54f0..545d3c12274 100644
--- a/htdocs/core/class/infobox.class.php
+++ b/htdocs/core/class/infobox.class.php
@@ -105,7 +105,7 @@ class InfoBox
 			$sql .= " WHERE b.box_id = d.rowid";
 			$sql .= " AND b.entity IN (0,".$conf->entity.")";
 			if ($zone >= 0) {
-				$sql .= " AND b.position = ".$zone;
+				$sql .= " AND b.position = ".((int) $zone);
 			}
 			if (is_object($user)) {
 				$sql .= " AND b.fk_user IN (0,".$user->id.")";
@@ -116,7 +116,7 @@ class InfoBox
 		} else { // available
 			$sql = "SELECT d.rowid as box_id, d.file, d.note, d.tms";
 			$sql .= " FROM ".MAIN_DB_PREFIX."boxes_def as d";
-			$sql .= " WHERE d.entity IN (0,".$conf->entity.")";
+			$sql .= " WHERE d.entity IN (0, ".$conf->entity.")";
 		}
 
 		dol_syslog(get_class()."::listBoxes get default box list for mode=".$mode." userid=".(is_object($user) ? $user->id : '')."", LOG_DEBUG);
@@ -254,8 +254,8 @@ class InfoBox
 		// Delete all lines
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."boxes";
 		$sql .= " WHERE entity = ".$conf->entity;
-		$sql .= " AND fk_user = ".$userid;
-		$sql .= " AND position = ".$zone;
+		$sql .= " AND fk_user = ".((int) $userid);
+		$sql .= " AND position = ".((int) $zone);
 
 		dol_syslog(get_class()."::saveboxorder", LOG_DEBUG);
 		$result = $db->query($sql);
diff --git a/htdocs/core/class/menubase.class.php b/htdocs/core/class/menubase.class.php
index 65fdaff9645..6f024c91b0b 100644
--- a/htdocs/core/class/menubase.class.php
+++ b/htdocs/core/class/menubase.class.php
@@ -352,10 +352,10 @@ class Menubase
 		$sql .= " type='".$this->db->escape($this->type)."',";
 		$sql .= " mainmenu='".$this->db->escape($this->mainmenu)."',";
 		$sql .= " leftmenu='".$this->db->escape($this->leftmenu)."',";
-		$sql .= " fk_menu=".$this->fk_menu.",";
+		$sql .= " fk_menu=".((int) $this->fk_menu).",";
 		$sql .= " fk_mainmenu=".($this->fk_mainmenu ? "'".$this->db->escape($this->fk_mainmenu)."'" : "null").",";
 		$sql .= " fk_leftmenu=".($this->fk_leftmenu ? "'".$this->db->escape($this->fk_leftmenu)."'" : "null").",";
-		$sql .= " position=".($this->position > 0 ? $this->position : 0).",";
+		$sql .= " position=".($this->position > 0 ? ((int) $this->position) : 0).",";
 		$sql .= " url='".$this->db->escape($this->url)."',";
 		$sql .= " target='".$this->db->escape($this->target)."',";
 		$sql .= " titre='".$this->db->escape($this->title)."',";
diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php
index 345ec5b38e3..6b32799bc89 100644
--- a/htdocs/core/class/notify.class.php
+++ b/htdocs/core/class/notify.class.php
@@ -176,7 +176,7 @@ class Notify
 		$sqlnotifcode = '';
 		if ($notifcode) {
 			if (is_numeric($notifcode)) {
-				$sqlnotifcode = " AND n.fk_action = ".$notifcode; // Old usage
+				$sqlnotifcode = " AND n.fk_action = ".((int) $notifcode); // Old usage
 			} else {
 				$sqlnotifcode = " AND a.code = '".$this->db->escape($notifcode)."'"; // New usage
 			}
@@ -195,7 +195,7 @@ class Notify
 				$sql .= $sqlnotifcode;
 				$sql .= " AND s.entity IN (".getEntity('societe').")";
 				if ($socid > 0) {
-					$sql .= " AND s.rowid = ".$socid;
+					$sql .= " AND s.rowid = ".((int) $socid);
 				}
 
 				dol_syslog(__METHOD__." ".$notifcode.", ".$socid."", LOG_DEBUG);
@@ -233,7 +233,7 @@ class Notify
 				$sql .= $sqlnotifcode;
 				$sql .= " AND c.entity IN (".getEntity('user').")";
 				if ($userid > 0) {
-					$sql .= " AND c.rowid = ".$userid;
+					$sql .= " AND c.rowid = ".((int) $userid);
 				}
 
 				dol_syslog(__METHOD__." ".$notifcode.", ".$socid."", LOG_DEBUG);
@@ -380,11 +380,11 @@ class Notify
 			$sql .= " AND n.fk_soc = s.rowid";
 			$sql .= " AND c.statut = 1";
 			if (is_numeric($notifcode)) {
-				$sql .= " AND n.fk_action = ".$notifcode; // Old usage
+				$sql .= " AND n.fk_action = ".((int) $notifcode); // Old usage
 			} else {
 				$sql .= " AND a.code = '".$this->db->escape($notifcode)."'"; // New usage
 			}
-			$sql .= " AND s.rowid = ".$object->socid;
+			$sql .= " AND s.rowid = ".((int) $object->socid);
 
 			$sql .= "\nUNION\n";
 		}
diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php
index 939e6514c13..ef635b259ff 100644
--- a/htdocs/core/lib/agenda.lib.php
+++ b/htdocs/core/lib/agenda.lib.php
@@ -168,7 +168,7 @@ function show_array_actions_to_do($max = 5)
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 	}
 	if ($socid) {
-		$sql .= " AND s.rowid = ".$socid;
+		$sql .= " AND s.rowid = ".((int) $socid);
 	}
 	$sql .= " ORDER BY a.datep DESC, a.id DESC";
 	$sql .= $db->plimit($max, 0);
@@ -284,7 +284,7 @@ function show_array_last_actions_done($max = 5)
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 	}
 	if ($socid) {
-		$sql .= " AND s.rowid = ".$socid;
+		$sql .= " AND s.rowid = ".((int) $socid);
 	}
 	$sql .= " ORDER BY a.datep2 DESC";
 	$sql .= $db->plimit($max, 0);
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 61332d8041b..5abc6bfc2ac 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -227,7 +227,7 @@ function societe_prepare_head(Societe $object)
 		if (empty($conf->stripe->enabled)) {
 			$sql .= " AND n.stripe_card_ref IS NULL";
 		} else {
-			$sql .= " AND (n.stripe_card_ref IS NULL OR (n.stripe_card_ref IS NOT NULL AND n.status = ".$servicestatus."))";
+			$sql .= " AND (n.stripe_card_ref IS NULL OR (n.stripe_card_ref IS NOT NULL AND n.status = ".((int) $servicestatus)."))";
 		}
 
 		$resql = $db->query($sql);
@@ -1448,7 +1448,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 		if (is_object($objcon) && $objcon->id > 0) {
 			$force_filter_contact = true;
 			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."actioncomm_resources as r ON a.id = r.fk_actioncomm";
-			$sql .= " AND r.element_type = '".$db->escape($objcon->table_element)."' AND r.fk_element = ".$objcon->id;
+			$sql .= " AND r.element_type = '".$db->escape($objcon->table_element)."' AND r.fk_element = ".((int) $objcon->id);
 		}
 
 		if (is_object($filterobj) && in_array(get_class($filterobj), array('Societe', 'Client', 'Fournisseur'))) {
@@ -1457,7 +1457,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."element_resources as er";
 			$sql .= " ON er.resource_type = 'dolresource'";
 			$sql .= " AND er.element_id = a.id";
-			$sql .= " AND er.resource_id = ".$filterobj->id;
+			$sql .= " AND er.resource_id = ".((int) $filterobj->id);
 		} elseif (is_object($filterobj) && get_class($filterobj) == 'Project') {
 			/* Nothing */
 		} elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') {
@@ -1940,7 +1940,7 @@ function show_subsidiaries($conf, $langs, $db, $object)
 
 	$sql = "SELECT s.rowid, s.client, s.fournisseur, s.nom as name, s.name_alias, s.email, s.address, s.zip, s.town, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur, s.canvas";
 	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-	$sql .= " WHERE s.parent = ".$object->id;
+	$sql .= " WHERE s.parent = ".((int) $object->id);
 	$sql .= " AND s.entity IN (".getEntity('societe').")";
 	$sql .= " ORDER BY s.nom";
 
diff --git a/htdocs/core/lib/fourn.lib.php b/htdocs/core/lib/fourn.lib.php
index 68910357269..efc9f60147c 100644
--- a/htdocs/core/lib/fourn.lib.php
+++ b/htdocs/core/lib/fourn.lib.php
@@ -59,7 +59,7 @@ function facturefourn_prepare_head($object)
 		$nbStandingOrders = 0;
 		$sql = "SELECT COUNT(pfd.rowid) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
-		$sql .= " WHERE pfd.fk_facture_fourn = ".$object->id;
+		$sql .= " WHERE pfd.fk_facture_fourn = ".((int) $object->id);
 		$sql .= " AND pfd.ext_payment_id IS NULL";
 		$resql = $db->query($sql);
 		if ($resql) {
diff --git a/htdocs/core/lib/invoice.lib.php b/htdocs/core/lib/invoice.lib.php
index 16891214ca5..0cbb89ae47b 100644
--- a/htdocs/core/lib/invoice.lib.php
+++ b/htdocs/core/lib/invoice.lib.php
@@ -734,7 +734,7 @@ function getDraftSupplierTable($maxCount = 500, $socid = 0)
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 	}
 	if ($socid) {
-		$sql .= " AND f.fk_soc = ".$socid;
+		$sql .= " AND f.fk_soc = ".((int) $socid);
 	}
 	// Add where from hooks
 	$parameters = array();
@@ -950,7 +950,7 @@ function getPurchaseInvoiceLatestEditTable($maxCount = 5, $socid = 0)
 	$sql .= " WHERE f.fk_soc = s.rowid";
 	$sql .= " AND f.entity IN (".getEntity('facture_fourn').")";
 	if ($socid) {
-		$sql .= " AND f.fk_soc = ".$socid;
+		$sql .= " AND f.fk_soc = ".((int) $socid);
 	}
 	if (!$user->rights->societe->client->voir && !$socid) {
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
@@ -1062,7 +1062,7 @@ function getCustomerInvoiceUnpaidOpenTable($maxCount = 500, $socid = 0)
 			$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 		}
 		if ($socid) {
-			$sql .= " AND f.fk_soc = ".$socid;
+			$sql .= " AND f.fk_soc = ".((int) $socid);
 		}
 		// Add where from hooks
 		$parameters = array();
@@ -1250,7 +1250,7 @@ function getPurchaseInvoiceUnpaidOpenTable($maxCount = 500, $socid = 0)
 			$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 		}
 		if ($socid) {
-			$sql .= " AND ff.fk_soc = ".$socid;
+			$sql .= " AND ff.fk_soc = ".((int) $socid);
 		}
 		// Add where from hooks
 		$parameters = array();
diff --git a/htdocs/core/lib/sendings.lib.php b/htdocs/core/lib/sendings.lib.php
index 880019d7b97..0814c0f4825 100644
--- a/htdocs/core/lib/sendings.lib.php
+++ b/htdocs/core/lib/sendings.lib.php
@@ -246,7 +246,7 @@ function show_list_sending_receive($origin, $origin_id, $filter = '')
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON obj.fk_product = p.rowid";
 	//TODO Add link to expeditiondet_batch
 	$sql .= " WHERE e.entity IN (".getEntity('expedition').")";
-	$sql .= " AND obj.fk_".$origin." = ".$origin_id;
+	$sql .= " AND obj.fk_".$origin." = ".((int) $origin_id);
 	$sql .= " AND obj.rowid = ed.fk_origin_line";
 	$sql .= " AND ed.fk_expedition = e.rowid";
 	if ($filter) {
diff --git a/htdocs/core/lib/ticket.lib.php b/htdocs/core/lib/ticket.lib.php
index 4d9d4bb2fa2..0ba7f56c615 100644
--- a/htdocs/core/lib/ticket.lib.php
+++ b/htdocs/core/lib/ticket.lib.php
@@ -336,7 +336,7 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
 		if (is_object($objcon) && $objcon->id > 0) {
 			$force_filter_contact = true;
 			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."actioncomm_resources as r ON a.id = r.fk_actioncomm";
-			$sql .= " AND r.element_type = '".$db->escape($objcon->table_element)."' AND r.fk_element = ".$objcon->id;
+			$sql .= " AND r.element_type = '".$db->escape($objcon->table_element)."' AND r.fk_element = ".((int) $objcon->id);
 		}
 
 		if (is_object($filterobj) && get_class($filterobj) == 'Societe') {
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index 6d01fcfee0a..cd9ae5ad297 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -110,7 +110,7 @@ function user_prepare_head($object)
 		$nbNote = 0;
 		$sql = "SELECT COUNT(n.rowid) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."notify_def as n";
-		$sql .= " WHERE fk_user = ".$object->id;
+		$sql .= " WHERE fk_user = ".((int) $object->id);
 		$resql = $db->query($sql);
 		if ($resql) {
 			$num = $db->num_rows($resql);
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index 5fbfc05a9fb..3b7cc0d1184 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -1371,7 +1371,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 				if ($command) {
 					$sql .= " AND command = '".$this->db->escape($command)."'";
 				}
-				$sql .= " AND entity = ".$entity; // Must be exact entity
+				$sql .= " AND entity = ".((int) $entity); // Must be exact entity
 
 				$now = dol_now();
 
@@ -1612,7 +1612,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 			$sql = "SELECT count(*)";
 			$sql .= " FROM ".MAIN_DB_PREFIX."const";
 			$sql .= " WHERE ".$this->db->decrypt('name')." = '".$this->db->escape($name)."'";
-			$sql .= " AND entity = ".$entity;
+			$sql .= " AND entity = ".((int) $entity);
 
 			$result = $this->db->query($sql);
 			if ($result) {
@@ -2197,7 +2197,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 
 				$sql = "DELETE FROM ".MAIN_DB_PREFIX."const";
 				$sql .= " WHERE ".$this->db->decrypt('name')." LIKE '".$this->db->escape($this->const_name)."_".strtoupper($key)."'";
-				$sql .= " AND entity = ".$entity;
+				$sql .= " AND entity = ".((int) $entity);
 
 				dol_syslog(get_class($this)."::delete_const_".$key."", LOG_DEBUG);
 				if (!$this->db->query($sql)) {
diff --git a/htdocs/core/modules/mailings/pomme.modules.php b/htdocs/core/modules/mailings/pomme.modules.php
index 03334e62322..a2a54c02c55 100644
--- a/htdocs/core/modules/mailings/pomme.modules.php
+++ b/htdocs/core/modules/mailings/pomme.modules.php
@@ -171,7 +171,7 @@ class mailing_pomme extends MailingTargets
 		$sql .= " FROM ".MAIN_DB_PREFIX."user as u";
 		$sql .= " WHERE u.email <> ''"; // u.email IS NOT NULL est implicite dans ce test
 		$sql .= " AND u.entity IN (0,".$conf->entity.")";
-		$sql .= " AND u.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")";
+		$sql .= " AND u.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".((int) $mailing_id).")";
 		if (GETPOSTISSET("filter") && GETPOST("filter") == '1') {
 			$sql .= " AND u.statut=1";
 		}
diff --git a/htdocs/core/modules/mailings/thirdparties.modules.php b/htdocs/core/modules/mailings/thirdparties.modules.php
index b3b88224df6..f764c3f5f71 100644
--- a/htdocs/core/modules/mailings/thirdparties.modules.php
+++ b/htdocs/core/modules/mailings/thirdparties.modules.php
@@ -77,7 +77,7 @@ class mailing_thirdparties extends MailingTargets
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 			$sql .= " WHERE s.email <> ''";
 			$sql .= " AND s.entity IN (".getEntity('societe').")";
-			$sql .= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")";
+			$sql .= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".((int) $mailing_id).")";
 		} else {
 			$addFilter = "";
 			if (GETPOSTISSET("filter_client") && GETPOST("filter_client") <> '-1') {
@@ -112,7 +112,7 @@ class mailing_thirdparties extends MailingTargets
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."categorie_societe as cs, ".MAIN_DB_PREFIX."categorie as c";
 			$sql .= " WHERE s.email <> ''";
 			$sql .= " AND s.entity IN (".getEntity('societe').")";
-			$sql .= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")";
+			$sql .= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".((int) $mailing_id).")";
 			$sql .= " AND cs.fk_soc = s.rowid";
 			$sql .= " AND c.rowid = cs.fk_categorie";
 			$sql .= " AND c.rowid=".((int) GETPOST('filter', 'int'));
@@ -122,7 +122,7 @@ class mailing_thirdparties extends MailingTargets
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."categorie_fournisseur as cs, ".MAIN_DB_PREFIX."categorie as c";
 			$sql .= " WHERE s.email <> ''";
 			$sql .= " AND s.entity IN (".getEntity('societe').")";
-			$sql .= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")";
+			$sql .= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".((int) $mailing_id).")";
 			$sql .= " AND cs.fk_soc = s.rowid";
 			$sql .= " AND c.rowid = cs.fk_categorie";
 			$sql .= " AND c.rowid=".((int) GETPOST('filter', 'int'));
diff --git a/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php b/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
index 7b5d4f38737..4c848b69ac0 100644
--- a/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
+++ b/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
@@ -110,7 +110,7 @@ class mailing_thirdparties_services_expired extends MailingTargets
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as c";
 		$sql .= ", ".MAIN_DB_PREFIX."contratdet as cd, ".MAIN_DB_PREFIX."product as p";
 		$sql .= " WHERE s.entity IN (".getEntity('societe').")";
-		$sql .= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")";
+		$sql .= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".((int) $mailing_id).")";
 		$sql .= " AND s.rowid = c.fk_soc AND cd.fk_contrat = c.rowid AND s.email != ''";
 		$sql .= " AND cd.statut= 4 AND cd.fk_product=p.rowid AND p.ref = '".$this->db->escape($product)."'";
 		$sql .= " AND cd.date_fin_validite < '".$this->db->idate($now)."'";
diff --git a/htdocs/core/modules/movement/doc/pdf_standard.modules.php b/htdocs/core/modules/movement/doc/pdf_standard.modules.php
index 82d930a1aac..872890958ff 100644
--- a/htdocs/core/modules/movement/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/movement/doc/pdf_standard.modules.php
@@ -529,8 +529,8 @@ class pdf_stdandard extends ModelePDFMovement
 						if (!empty($conf->global->MAIN_MULTILANGS)) { // si l'option est active
 							$sql = "SELECT label";
 							$sql .= " FROM ".MAIN_DB_PREFIX."product_lang";
-							$sql .= " WHERE fk_product=".$objp->rowid;
-							$sql .= " AND lang='".$this->db->escape($langs->getDefaultLang())."'";
+							$sql .= " WHERE fk_product = ".((int) $objp->rowid);
+							$sql .= " AND lang = '".$this->db->escape($langs->getDefaultLang())."'";
 							$sql .= " LIMIT 1";
 
 							$result = $this->db->query($sql);
diff --git a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
index d007b421fd7..da95e841728 100644
--- a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
+++ b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
@@ -742,7 +742,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 						$sql .= ", u.lastname, u.firstname, t.thm";
 						$sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t";
 						$sql .= " , ".MAIN_DB_PREFIX."user as u";
-						$sql .= " WHERE t.fk_task =".$task->id;
+						$sql .= " WHERE t.fk_task =".((int) $task->id);
 						$sql .= " AND t.fk_user = u.rowid";
 						$sql .= " ORDER BY t.task_date DESC";
 
diff --git a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
index 2d263aae6c0..0662e1a5a76 100644
--- a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
+++ b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
@@ -657,7 +657,7 @@ class doc_generic_task_odt extends ModelePDFTask
 					$sql .= ", u.lastname, u.firstname";
 					$sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t";
 					$sql .= " , ".MAIN_DB_PREFIX."user as u";
-					$sql .= " WHERE t.fk_task =".$object->id;
+					$sql .= " WHERE t.fk_task =".((int) $object->id);
 					$sql .= " AND t.fk_user = u.rowid";
 					$sql .= " ORDER BY t.task_date DESC";
 
diff --git a/htdocs/core/modules/rapport/pdf_paiement.class.php b/htdocs/core/modules/rapport/pdf_paiement.class.php
index b69ebdeb828..9f85aca1aff 100644
--- a/htdocs/core/modules/rapport/pdf_paiement.class.php
+++ b/htdocs/core/modules/rapport/pdf_paiement.class.php
@@ -209,7 +209,7 @@ class pdf_paiement
 					$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 				}
 				if (!empty($socid)) {
-					$sql .= " AND s.rowid = ".$socid;
+					$sql .= " AND s.rowid = ".((int) $socid);
 				}
 				// If global param PAYMENTS_REPORT_GROUP_BY_MOD is set, payement are ordered by paiement_code
 				if (!empty($conf->global->PAYMENTS_REPORT_GROUP_BY_MOD)) {
diff --git a/htdocs/core/modules/stock/doc/pdf_standard.modules.php b/htdocs/core/modules/stock/doc/pdf_standard.modules.php
index a57b996086b..b0cc07dcb62 100644
--- a/htdocs/core/modules/stock/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/stock/doc/pdf_standard.modules.php
@@ -315,7 +315,7 @@ class pdf_standard extends ModelePDFStock
 				$sql .= " FROM ".MAIN_DB_PREFIX."product_stock as ps, ".MAIN_DB_PREFIX."product as p";
 				$sql .= " WHERE ps.fk_product = p.rowid";
 				$sql .= " AND ps.reel <> 0"; // We do not show if stock is 0 (no product in this warehouse)
-				$sql .= " AND ps.fk_entrepot = ".$object->id;
+				$sql .= " AND ps.fk_entrepot = ".((int) $object->id);
 				$sql .= $this->db->order($sortfield, $sortorder);
 
 				//dol_syslog('List products', LOG_DEBUG);
diff --git a/htdocs/datapolicy/class/actions_datapolicy.class.php b/htdocs/datapolicy/class/actions_datapolicy.class.php
index cbcaceec743..7a3ba77fb5a 100644
--- a/htdocs/datapolicy/class/actions_datapolicy.class.php
+++ b/htdocs/datapolicy/class/actions_datapolicy.class.php
@@ -121,7 +121,7 @@ class ActionsDatapolicy
 
 				if ($object->update($object->id, $user, 0)) {
 					// On supprime les contacts associé
-					$sql = "DELETE FROM ".MAIN_DB_PREFIX."socpeople WHERE fk_soc = ".$object->id;
+					$sql = "DELETE FROM ".MAIN_DB_PREFIX."socpeople WHERE fk_soc = ".((int) $object->id);
 					$this->db->query($sql);
 
 					setEventMessages($langs->trans('ANONYMISER_SUCCESS'), array());
diff --git a/htdocs/don/class/api_donations.class.php b/htdocs/don/class/api_donations.class.php
index 3ae04c64833..cfd9e8ccd8b 100644
--- a/htdocs/don/class/api_donations.class.php
+++ b/htdocs/don/class/api_donations.class.php
@@ -123,7 +123,7 @@ class Donations extends DolibarrApi
 			$sql .= " AND t.fk_soc = sc.fk_soc";
 		}
 		if ($thirdparty_ids) {
-			$sql .= " AND t.fk_soc = ".$thirdparty_ids." ";
+			$sql .= " AND t.fk_soc = ".((int) $thirdparty_ids)." ";
 		}
 
 		// Add sql filters
diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php
index 56062868d86..181b3fc0ca3 100644
--- a/htdocs/don/class/don.class.php
+++ b/htdocs/don/class/don.class.php
@@ -476,8 +476,8 @@ class Don extends CommonObject
 		$sql .= ",address='".$this->db->escape($this->address)."'";
 		$sql .= ",zip='".$this->db->escape($this->zip)."'";
 		$sql .= ",town='".$this->db->escape($this->town)."'";
-		$sql .= ",fk_country = ".($this->country_id > 0 ? $this->country_id : '0');
-		$sql .= ",public=".$this->public;
+		$sql .= ",fk_country = ".($this->country_id > 0 ? ((int) $this->country_id) : '0');
+		$sql .= ",public=".((int) $this->public);
 		$sql .= ",fk_projet=".($this->fk_project > 0 ? $this->fk_project : 'null');
 		$sql .= ",note_private=".(!empty($this->note_private) ? ("'".$this->db->escape($this->note_private)."'") : "NULL");
 		$sql .= ",note_public=".(!empty($this->note_public) ? ("'".$this->db->escape($this->note_public)."'") : "NULL");
@@ -486,8 +486,8 @@ class Don extends CommonObject
 		$sql .= ",email='".$this->db->escape(trim($this->email))."'";
 		$sql .= ",phone='".$this->db->escape(trim($this->phone))."'";
 		$sql .= ",phone_mobile='".$this->db->escape(trim($this->phone_mobile))."'";
-		$sql .= ",fk_statut=".$this->statut;
-		$sql .= " WHERE rowid = ".$this->id;
+		$sql .= ",fk_statut=".((int) $this->statut);
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		dol_syslog(get_class($this)."::Update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
diff --git a/htdocs/ecm/class/ecmfiles.class.php b/htdocs/ecm/class/ecmfiles.class.php
index b292dd33429..035a7aee9c6 100644
--- a/htdocs/ecm/class/ecmfiles.class.php
+++ b/htdocs/ecm/class/ecmfiles.class.php
@@ -425,7 +425,7 @@ class EcmFiles extends CommonObject
 			//$sql .= " AND t.entity = ".$conf->entity;							// hashforshare already unique
 		} elseif ($src_object_type && $src_object_id) {
 			// Warning: May return several record, and only first one is returned !
-			$sql .= " AND t.src_object_type ='".$this->db->escape($src_object_type)."' AND t.src_object_id = ".$this->db->escape($src_object_id);
+			$sql .= " AND t.src_object_type = '".$this->db->escape($src_object_type)."' AND t.src_object_id = ".((int) $src_object_id);
 			$sql .= " AND t.entity = ".$conf->entity;
 		} else {
 			$sql .= ' AND t.rowid = '.((int) $id); // rowid already unique
diff --git a/htdocs/eventorganization/conferenceorboothattendee_list.php b/htdocs/eventorganization/conferenceorboothattendee_list.php
index e282da6a4d9..6ece0bc115e 100644
--- a/htdocs/eventorganization/conferenceorboothattendee_list.php
+++ b/htdocs/eventorganization/conferenceorboothattendee_list.php
@@ -234,7 +234,7 @@ $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $obje
 $sql .= preg_replace('/^,/', '', $hookmanager->resPrint);
 $sql = preg_replace('/,\s*$/', '', $sql);
 $sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
-$sql .= " INNER JOIN ".MAIN_DB_PREFIX."actioncomm as a on a.id=t.fk_actioncomm AND a.id=".$confOrBooth->id;
+$sql .= " INNER JOIN ".MAIN_DB_PREFIX."actioncomm as a on a.id=t.fk_actioncomm AND a.id=".((int) $confOrBooth->id);
 if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (t.rowid = ef.fk_object)";
 }
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index ae643ee688a..02ac007d30f 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -1982,7 +1982,7 @@ if ($action == 'create') {
 			//if ($conf->delivery_note->enabled) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."delivery as l ON l.fk_expedition = e.rowid LEFT JOIN ".MAIN_DB_PREFIX."deliverydet as ld ON ld.fk_delivery = l.rowid  AND obj.rowid = ld.fk_origin_line";
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON obj.fk_product = p.rowid";
 			$sql .= " WHERE e.entity IN (".getEntity('expedition').")";
-			$sql .= " AND obj.fk_".$origin." = ".$origin_id;
+			$sql .= " AND obj.fk_".$origin." = ".((int) $origin_id);
 			$sql .= " AND obj.rowid = ed.fk_origin_line";
 			$sql .= " AND ed.fk_expedition = e.rowid";
 			//if ($filter) $sql.= $filter;
diff --git a/htdocs/expedition/class/api_shipments.class.php b/htdocs/expedition/class/api_shipments.class.php
index dcd619da76e..2a4b6765b4e 100644
--- a/htdocs/expedition/class/api_shipments.class.php
+++ b/htdocs/expedition/class/api_shipments.class.php
@@ -140,7 +140,7 @@ class Shipments extends DolibarrApi
 		}
 		// Insert sale filter
 		if ($search_sale > 0) {
-			$sql .= " AND sc.fk_user = ".$search_sale;
+			$sql .= " AND sc.fk_user = ".((int) $search_sale);
 		}
 		// Add sql filters
 		if ($sqlfilters) {
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index ea5bd17fdfb..ee7324a22c4 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -2125,7 +2125,7 @@ class Expedition extends CommonObject
 		if (!empty($this->shipping_method_id)) {
 			$sql = "SELECT em.code, em.tracking";
 			$sql .= " FROM ".MAIN_DB_PREFIX."c_shipment_mode as em";
-			$sql .= " WHERE em.rowid = ".$this->shipping_method_id;
+			$sql .= " WHERE em.rowid = ".((int) $this->shipping_method_id);
 
 			$resql = $this->db->query($sql);
 			if ($resql) {
@@ -2981,8 +2981,8 @@ class ExpeditionLigne extends CommonObjectLine
 			// update line
 			$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
 			$sql .= " fk_entrepot = ".($this->entrepot_id > 0 ? $this->entrepot_id : 'null');
-			$sql .= " , qty = ".$qty;
-			$sql .= " WHERE rowid = ".$this->id;
+			$sql .= " , qty = ".((float) price2num($qty, 'MS'));
+			$sql .= " WHERE rowid = ".((int) $this->id);
 
 			if (!$this->db->query($sql)) {
 				$this->errors[] = $this->db->lasterror()." - sql=$sql";
diff --git a/htdocs/expedition/class/expeditionbatch.class.php b/htdocs/expedition/class/expeditionbatch.class.php
index 736cfba6e42..03066869450 100644
--- a/htdocs/expedition/class/expeditionbatch.class.php
+++ b/htdocs/expedition/class/expeditionbatch.class.php
@@ -186,7 +186,7 @@ class ExpeditionLineBatch extends CommonObject
 		}
 		$sql .= " FROM ".MAIN_DB_PREFIX.self::$_table_element." as eb";
 		if ($fk_product > 0) {
-			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_lot as pl ON pl.batch = eb.batch AND pl.fk_product = ".$fk_product;
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_lot as pl ON pl.batch = eb.batch AND pl.fk_product = ".((int) $fk_product);
 		}
 		$sql .= " WHERE fk_expeditiondet=".(int) $id_line_expdet;
 
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index a1070d02ef1..5a110d33f2a 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -282,7 +282,7 @@ if ($search_user > 0) {
 }
 $sql .= " WHERE e.entity IN (".getEntity('expedition').")";
 if ($search_product_category > 0) {
-	$sql .= " AND cp.fk_categorie = ".$search_product_category;
+	$sql .= " AND cp.fk_categorie = ".((int) $search_product_category);
 }
 if ($socid > 0) {
 	$sql .= ' AND s.rowid = '.$socid;
@@ -292,7 +292,7 @@ if (!$user->rights->societe->client->voir && !$socid) {	// Internal user with no
 	$sql .= " AND sc.fk_user = ".$user->id;
 }
 if ($socid) {
-	$sql .= " AND e.fk_soc = ".$socid;
+	$sql .= " AND e.fk_soc = ".((int) $socid);
 }
 if ($search_status <> '' && $search_status >= 0) {
 	$sql .= " AND e.fk_statut = ".((int) $search_status);
@@ -322,7 +322,7 @@ if ($search_type_thirdparty != '' && $search_type_thirdparty > 0) {
 	$sql .= " AND s.fk_typent IN (".$db->sanitize($search_type_thirdparty).')';
 }
 if ($search_sale > 0) {
-	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$search_sale;
+	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $search_sale);
 }
 if ($search_user > 0) {
 	// The contact on a shipment is also the contact of the order.
@@ -353,7 +353,7 @@ if ($sall) {
 	$sql .= natural_search(array_keys($fieldstosearchall), $sall);
 }
 if ($search_categ_cus > 0) {
-	$sql .= " AND cc.fk_categorie = ".$db->escape($search_categ_cus);
+	$sql .= " AND cc.fk_categorie = ".((int) $search_categ_cus);
 }
 if ($search_categ_cus == -2) {
 	$sql .= " AND cc.fk_categorie IS NULL";
diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index 8f5903dd988..42b8630bd3c 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -626,7 +626,7 @@ if ($id > 0 || !empty($ref)) {
 		$sql .= ' p.surface, p.surface_units, p.volume, p.volume_units';
 		$sql .= " FROM ".MAIN_DB_PREFIX."commandedet as cd";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON cd.fk_product = p.rowid";
-		$sql .= " WHERE cd.fk_commande = ".$object->id;
+		$sql .= " WHERE cd.fk_commande = ".((int) $object->id);
 		$sql .= " ORDER BY cd.rang, cd.rowid";
 
 		//print $sql;
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 34bef81e5a2..6cd3531f82d 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -990,9 +990,9 @@ class ExpenseReport extends CommonObject
 
 			$total_ttc = $total_ht + $total_tva;
 			$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
-			$sql .= " total_ht = ".$total_ht;
-			$sql .= " , total_ttc = ".$total_ttc;
-			$sql .= " , total_tva = ".$total_tva;
+			$sql .= " total_ht = ".price2num($total_ht, 'MT');
+			$sql .= " , total_ttc = ".price2num($total_ttc, 'MT');
+			$sql .= " , total_tva = ".price2num($total_tva, 'MT');
 			$sql .= " WHERE rowid = ".((int) $id);
 			$result = $this->db->query($sql);
 			if ($result) :
@@ -2811,30 +2811,30 @@ class ExpenseReportLine
 		// Update line in database
 		$sql = "UPDATE ".MAIN_DB_PREFIX."expensereport_det SET";
 		$sql .= " comments='".$this->db->escape($this->comments)."'";
-		$sql .= ",value_unit=".$this->db->escape($this->value_unit);
-		$sql .= ",qty=".$this->db->escape($this->qty);
+		$sql .= ",value_unit = ".((float) $this->value_unit);
+		$sql .= ",qty=".((float) $this->qty);
 		$sql .= ",date='".$this->db->idate($this->date)."'";
-		$sql .= ",total_ht=".$this->db->escape($this->total_ht)."";
-		$sql .= ",total_tva=".$this->db->escape($this->total_tva)."";
-		$sql .= ",total_ttc=".$this->db->escape($this->total_ttc)."";
-		$sql .= ",tva_tx=".$this->db->escape($this->vatrate);
+		$sql .= ",total_ht=".((float) price2num($this->total_ht, 'MT'))."";
+		$sql .= ",total_tva=".((float) price2num($this->total_tva, 'MT'))."";
+		$sql .= ",total_ttc=".((float) price2num($this->total_ttc, 'MT'))."";
+		$sql .= ",tva_tx=".((float) $this->vatrate);
 		$sql .= ",vat_src_code='".$this->db->escape($this->vat_src_code)."'";
 		$sql .= ",rule_warning_message='".$this->db->escape($this->rule_warning_message)."'";
 		$sql .= ",fk_c_exp_tax_cat=".$this->db->escape($this->fk_c_exp_tax_cat);
-		$sql .= ",fk_ecm_files=".($this->fk_ecm_files > 0 ? $this->fk_ecm_files : 'null');
+		$sql .= ",fk_ecm_files=".($this->fk_ecm_files > 0 ? ((int) $this->fk_ecm_files) : 'null');
 		if ($this->fk_c_type_fees) {
-			$sql .= ",fk_c_type_fees=".$this->db->escape($this->fk_c_type_fees);
+			$sql .= ",fk_c_type_fees = ".((int) $this->fk_c_type_fees);
 		} else {
 			$sql .= ",fk_c_type_fees=null";
 		}
 		if ($this->fk_project > 0) {
-			$sql .= ",fk_projet=".$this->db->escape($this->fk_project);
+			$sql .= ",fk_projet=".((int) $this->fk_project);
 		} else {
 			$sql .= ",fk_projet=null";
 		}
-		$sql .= " WHERE rowid = ".$this->db->escape($this->rowid ? $this->rowid : $this->id);
+		$sql .= " WHERE rowid = ".((int) ($this->rowid ? $this->rowid : $this->id));
 
-		dol_syslog("ExpenseReportLine::update sql=".$sql);
+		dol_syslog("ExpenseReportLine::update");
 
 		$resql = $this->db->query($sql);
 		if ($resql) {
diff --git a/htdocs/fichinter/card-rec.php b/htdocs/fichinter/card-rec.php
index fb031d81583..44ff46b233c 100644
--- a/htdocs/fichinter/card-rec.php
+++ b/htdocs/fichinter/card-rec.php
@@ -388,7 +388,7 @@ if ($action == 'create') {
 
 		$sql = 'SELECT l.rowid, l.description, l.duree';
 		$sql .= " FROM ".MAIN_DB_PREFIX."fichinterdet as l";
-		$sql .= " WHERE l.fk_fichinter= ".$object->id;
+		$sql .= " WHERE l.fk_fichinter= ".((int) $object->id);
 		//$sql.= " AND l.fk_product is null ";
 		$sql .= " ORDER BY l.rang";
 
diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index e2ac86f55bd..2e9d8a4a9b1 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -379,8 +379,8 @@ class Fichinter extends CommonObject
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."fichinter SET ";
 		$sql .= "description  = '".$this->db->escape($this->description)."'";
-		$sql .= ", duree = ".$this->duration;
-		$sql .= ", fk_projet = ".$this->fk_project;
+		$sql .= ", duree = ".((int) $this->duration);
+		$sql .= ", fk_projet = ".((int) $this->fk_project);
 		$sql .= ", note_private = ".($this->note_private ? "'".$this->db->escape($this->note_private)."'" : "null");
 		$sql .= ", note_public = ".($this->note_public ? "'".$this->db->escape($this->note_public)."'" : "null");
 		$sql .= ", fk_user_modif = ".$user->id;
diff --git a/htdocs/fourn/class/api_supplier_invoices.class.php b/htdocs/fourn/class/api_supplier_invoices.class.php
index 34939bb599a..df1bf36b723 100644
--- a/htdocs/fourn/class/api_supplier_invoices.class.php
+++ b/htdocs/fourn/class/api_supplier_invoices.class.php
@@ -155,7 +155,7 @@ class SupplierInvoices extends DolibarrApi
 		}
 		// Insert sale filter
 		if ($search_sale > 0) {
-			$sql .= " AND sc.fk_user = ".$search_sale;
+			$sql .= " AND sc.fk_user = ".((int) $search_sale);
 		}
 		// Add sql filters
 		if ($sqlfilters) {
diff --git a/htdocs/fourn/class/api_supplier_orders.class.php b/htdocs/fourn/class/api_supplier_orders.class.php
index 09c9209629f..d4eedcd0fd9 100644
--- a/htdocs/fourn/class/api_supplier_orders.class.php
+++ b/htdocs/fourn/class/api_supplier_orders.class.php
@@ -171,7 +171,7 @@ class SupplierOrders extends DolibarrApi
 		}
 		// Insert sale filter
 		if ($search_sale > 0) {
-			$sql .= " AND sc.fk_user = ".$search_sale;
+			$sql .= " AND sc.fk_user = ".((int) $search_sale);
 		}
 		// Add sql filters
 		if ($sqlfilters) {
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index e2196d5595d..d9ca371c133 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -3058,7 +3058,7 @@ class CommandeFournisseur extends CommonOrder
 		if ($this->methode_commande_id > 0) {
 			$sql = "SELECT rowid, code, libelle as label";
 			$sql .= " FROM ".MAIN_DB_PREFIX.'c_input_method';
-			$sql .= " WHERE active=1 AND rowid = ".$this->db->escape($this->methode_commande_id);
+			$sql .= " WHERE active=1 AND rowid = ".((int) $this->methode_commande_id);
 
 			$resql = $this->db->query($sql);
 			if ($resql) {
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 81533dae324..a48d00c820b 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -3401,7 +3401,7 @@ class SupplierInvoiceLine extends CommonObjectLine
 		$sql .= ", pu_ttc = ".price2num($this->pu_ttc);
 		$sql .= ", qty = ".price2num($this->qty);
 		$sql .= ", remise_percent = ".price2num($this->remise_percent);
-		if ($this->fk_remise_except) $sql.= ", fk_remise_except=".$this->fk_remise_except;
+		if ($this->fk_remise_except) $sql.= ", fk_remise_except=".((int) $this->fk_remise_except);
 		else $sql.= ", fk_remise_except=null";
 		$sql .= ", vat_src_code = '".$this->db->escape(empty($this->vat_src_code) ? '' : $this->vat_src_code)."'";
 		$sql .= ", tva_tx = ".price2num($this->tva_tx);
@@ -3414,10 +3414,10 @@ class SupplierInvoiceLine extends CommonObjectLine
 		$sql .= ", total_localtax1= ".price2num($this->total_localtax1);
 		$sql .= ", total_localtax2= ".price2num($this->total_localtax2);
 		$sql .= ", total_ttc = ".price2num($this->total_ttc);
-		$sql .= ", fk_product = ".$fk_product;
-		$sql .= ", product_type = ".$this->product_type;
-		$sql .= ", info_bits = ".$this->info_bits;
-		$sql .= ", fk_unit = ".$fk_unit;
+		$sql .= ", fk_product = ".((int) $fk_product);
+		$sql .= ", product_type = ".((int) $this->product_type);
+		$sql .= ", info_bits = ".((int) $this->info_bits);
+		$sql .= ", fk_unit = ".((int) $fk_unit);
 
 		// Multicurrency
 		$sql .= " , multicurrency_subprice=".price2num($this->multicurrency_subprice)."";
@@ -3425,7 +3425,7 @@ class SupplierInvoiceLine extends CommonObjectLine
 		$sql .= " , multicurrency_total_tva=".price2num($this->multicurrency_total_tva)."";
 		$sql .= " , multicurrency_total_ttc=".price2num($this->multicurrency_total_ttc)."";
 
-		$sql .= " WHERE rowid = ".$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index 21b4ec377a2..2172af578e9 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -789,14 +789,14 @@ class ProductFournisseur extends Product
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."product_fournisseur_price as pfp";
 		$sql .= " WHERE s.entity IN (".getEntity('societe').")";
 		$sql .= " AND pfp.entity = ".$conf->entity; // only current entity
-		$sql .= " AND pfp.fk_product = ".$prodid;
+		$sql .= " AND pfp.fk_product = ".((int) $prodid);
 		$sql .= " AND pfp.fk_soc = s.rowid";
 		$sql .= " AND s.status = 1"; // only enabled society
 		if ($qty > 0) {
-			$sql .= " AND pfp.quantity <= ".$qty;
+			$sql .= " AND pfp.quantity <= ".((float) $qty);
 		}
 		if ($socid > 0) {
-			$sql .= ' AND pfp.fk_soc = '.$socid;
+			$sql .= ' AND pfp.fk_soc = '.((int) $socid);
 		}
 
 		dol_syslog(get_class($this)."::find_min_price_product_fournisseur", LOG_DEBUG);
@@ -1001,7 +1001,7 @@ class ProductFournisseur extends Product
 		$sql .= " WHERE pfp.entity IN (".getEntity('productprice').")";
 		$sql .= " AND pfpl.fk_user = u.rowid";
 		$sql .= " AND pfp.rowid = pfpl.fk_product_fournisseur";
-		$sql .= " AND pfpl.fk_product_fournisseur = ".$product_fourn_price_id;
+		$sql .= " AND pfpl.fk_product_fournisseur = ".((int) $product_fourn_price_id);
 		if (empty($sortfield)) {
 			$sql .= " ORDER BY pfpl.datec";
 		} else {
diff --git a/htdocs/fourn/commande/index.php b/htdocs/fourn/commande/index.php
index eef851c6d73..1ea5db20b59 100644
--- a/htdocs/fourn/commande/index.php
+++ b/htdocs/fourn/commande/index.php
@@ -183,7 +183,7 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 	$sql .= " AND c.entity IN (".getEntity("supplier_order").")"; // Thirdparty sharing is mandatory with supplier order sharing
 	$sql .= " AND c.fk_statut = 0";
 	if (!empty($socid)) {
-		$sql .= " AND c.fk_soc = ".$socid;
+		$sql .= " AND c.fk_soc = ".((int) $socid);
 	}
 	if (!$user->rights->societe->client->voir && !$socid) {
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
@@ -290,7 +290,7 @@ $sql .= " WHERE c.fk_soc = s.rowid";
 $sql .= " AND c.entity = ".$conf->entity;
 //$sql.= " AND c.fk_statut > 2";
 if (!empty($socid)) {
-	$sql .= " AND c.fk_soc = ".$socid;
+	$sql .= " AND c.fk_soc = ".((int) $socid);
 }
 if (!$user->rights->societe->client->voir && !$socid) {
 	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
@@ -359,7 +359,7 @@ if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX
 $sql.= " WHERE c.fk_soc = s.rowid";
 $sql.= " AND c.entity = ".$conf->entity;
 $sql.= " AND c.fk_statut = 1";
-if ($socid) $sql.= " AND c.fk_soc = ".$socid;
+if ($socid) $sql.= " AND c.fk_soc = ".((int) $socid);
 if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 $sql.= " ORDER BY c.rowid DESC";
 
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index d8959ada7c0..25f71f85eb4 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -651,7 +651,7 @@ $sql .= $hookmanager->resPrint;
 $sql .= ' WHERE cf.fk_soc = s.rowid';
 $sql .= ' AND cf.entity IN ('.getEntity('supplier_order').')';
 if ($socid > 0) {
-	$sql .= " AND s.rowid = ".$socid;
+	$sql .= " AND s.rowid = ".((int) $socid);
 }
 if (!$user->rights->societe->client->voir && !$socid) {
 	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
@@ -672,10 +672,10 @@ if ($search_request_author) {
 	$sql .= natural_search(array('u.lastname', 'u.firstname', 'u.login'), $search_request_author);
 }
 if ($search_billed != '' && $search_billed >= 0) {
-	$sql .= " AND cf.billed = ".$db->escape($search_billed);
+	$sql .= " AND cf.billed = ".((int) $search_billed);
 }
 if ($search_product_category > 0) {
-	$sql .= " AND cp.fk_categorie = ".$search_product_category;
+	$sql .= " AND cp.fk_categorie = ".((int) $search_product_category);
 }
 //Required triple check because statut=0 means draft filter
 if (GETPOST('statut', 'intcomma') !== '') {
@@ -705,7 +705,7 @@ if ($search_company) {
 	$sql .= natural_search('s.nom', $search_company);
 }
 if ($search_sale > 0) {
-	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$db->escape($search_sale);
+	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $search_sale);
 }
 if ($search_user > 0) {
 	$sql .= " AND ec.fk_c_type_contact = tc.rowid AND tc.element='supplier_order' AND tc.source='internal' AND ec.element_id = cf.rowid AND ec.fk_socpeople = ".$db->escape($search_user);
diff --git a/htdocs/fourn/contact.php b/htdocs/fourn/contact.php
index 82c8df6ac66..3196ffed7ac 100644
--- a/htdocs/fourn/contact.php
+++ b/htdocs/fourn/contact.php
@@ -94,7 +94,7 @@ if ($contactname) {
 }
 
 if ($socid) {
-	$sql .= " AND s.rowid = ".$socid;
+	$sql .= " AND s.rowid = ".((int) $socid);
 }
 
 $sql .= " ORDER BY $sortfield $sortorder ";
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 0c4f21ae4be..8578f82137d 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -451,10 +451,10 @@ if (!$user->rights->societe->client->voir && !$socid) {
 	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 }
 if ($search_product_category > 0) {
-	$sql .= " AND cp.fk_categorie = ".$search_product_category;
+	$sql .= " AND cp.fk_categorie = ".((int) $search_product_category);
 }
 if ($socid > 0) {
-	$sql .= ' AND s.rowid = '.$socid;
+	$sql .= ' AND s.rowid = '.((int) $socid);
 }
 if ($search_ref) {
 	if (is_numeric($search_ref)) {
diff --git a/htdocs/fourn/index.php b/htdocs/fourn/index.php
index 4a761ea8b70..8d124f46350 100644
--- a/htdocs/fourn/index.php
+++ b/htdocs/fourn/index.php
@@ -172,7 +172,7 @@ if (((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_S
 	$sql .= " AND ff.entity = ".$conf->entity;
 	$sql .= " AND ff.fk_statut = 0";
 	if ($socid) {
-		$sql .= " AND f.fk_soc = ".$socid;
+		$sql .= " AND f.fk_soc = ".((int) $socid);
 	}
 
 	$resql = $db->query($sql);
@@ -243,7 +243,7 @@ if (!$user->rights->societe->client->voir && !$socid) {
 	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 }
 if ($socid) {
-	$sql .= " AND s.rowid = ".$socid;
+	$sql .= " AND s.rowid = ".((int) $socid);
 }
 $sql .= " ORDER BY s.tms DESC";
 $sql .= $db->plimit($max, 0);
diff --git a/htdocs/fourn/product/list.php b/htdocs/fourn/product/list.php
index ed137fd5d86..5ecec959614 100644
--- a/htdocs/fourn/product/list.php
+++ b/htdocs/fourn/product/list.php
@@ -174,10 +174,10 @@ if ($snom) {
 	$sql .= natural_search('p.label', $snom);
 }
 if ($catid) {
-	$sql .= " AND cp.fk_categorie = ".$catid;
+	$sql .= " AND cp.fk_categorie = ".((int) $catid);
 }
 if ($fourn_id > 0) {
-	$sql .= " AND ppf.fk_soc = ".$fourn_id;
+	$sql .= " AND ppf.fk_soc = ".((int) $fourn_id);
 }
 
 // Add WHERE filters from hooks
diff --git a/htdocs/fourn/recap-fourn.php b/htdocs/fourn/recap-fourn.php
index adeaf7b1447..353083bd717 100644
--- a/htdocs/fourn/recap-fourn.php
+++ b/htdocs/fourn/recap-fourn.php
@@ -134,7 +134,7 @@ if ($socid > 0) {
 				$sql .= " ".MAIN_DB_PREFIX."paiementfourn as p";
 				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON p.fk_user_author = u.rowid";
 				$sql .= " WHERE pf.fk_paiementfourn = p.rowid";
-				$sql .= " AND pf.fk_facturefourn = ".$fac->id;
+				$sql .= " AND pf.fk_facturefourn = ".((int) $fac->id);
 
 				$resqlp = $db->query($sql);
 				if ($resqlp) {
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index 55dd1c4bafb..7e3585bd5bc 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -1477,7 +1477,7 @@ class Holiday extends CommonObject
 				if ($num > 0) {
 					// Update for user
 					$sql = "UPDATE ".MAIN_DB_PREFIX."holiday_users SET";
-					$sql .= " nb_holiday = ".$nbHoliday;
+					$sql .= " nb_holiday = ".((int) $nbHoliday);
 					$sql .= " WHERE fk_user = ".(int) $userID." AND fk_type = ".(int) $fk_type;
 					$result = $this->db->query($sql);
 					if (!$result) {
@@ -1487,7 +1487,7 @@ class Holiday extends CommonObject
 				} else {
 					// Insert for user
 					$sql = "INSERT INTO ".MAIN_DB_PREFIX."holiday_users(nb_holiday, fk_user, fk_type) VALUES (";
-					$sql .= $nbHoliday;
+					$sql .= ((int) $nbHoliday);
 					$sql .= ", ".(int) $userID.", ".(int) $fk_type.")";
 					$result = $this->db->query($sql);
 					if (!$result) {
diff --git a/htdocs/hrm/class/establishment.class.php b/htdocs/hrm/class/establishment.class.php
index c2fa520442b..2cac4a1352b 100644
--- a/htdocs/hrm/class/establishment.class.php
+++ b/htdocs/hrm/class/establishment.class.php
@@ -264,10 +264,10 @@ class Establishment extends CommonObject
 		$sql .= ", zip = '".$this->db->escape($this->zip)."'";
 		$sql .= ", town = '".$this->db->escape($this->town)."'";
 		$sql .= ", fk_country = ".($this->country_id > 0 ? $this->country_id : 'null');
-		$sql .= ", status = ".$this->db->escape($this->status);
-		$sql .= ", fk_user_mod = ".$user->id;
-		$sql .= ", entity = ".$this->entity;
-		$sql .= " WHERE rowid = ".$this->id;
+		$sql .= ", status = ".((int) $this->status);
+		$sql .= ", fk_user_mod = ".((int) $user->id);
+		$sql .= ", entity = ".((int) $this->entity);
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
 		$result = $this->db->query($sql);
diff --git a/htdocs/hrm/index.php b/htdocs/hrm/index.php
index 50fd4c3f521..2315edc100c 100644
--- a/htdocs/hrm/index.php
+++ b/htdocs/hrm/index.php
@@ -190,7 +190,7 @@ if (!empty($conf->holiday->enabled) && $user->rights->holiday->read) {
 		$sql .= ' AND x.fk_user IN ('.$db->sanitize(join(',', $childids)).')';
 	}
 	//if (!$user->rights->societe->client->voir && !$user->socid) $sql.= " AND x.fk_soc = s. rowid AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-	//if (!empty($socid)) $sql.= " AND x.fk_soc = ".$socid;
+	//if (!empty($socid)) $sql.= " AND x.fk_soc = ".((int) $socid);
 	$sql .= $db->order("x.tms", "DESC");
 	$sql .= $db->plimit($max, 0);
 
@@ -271,7 +271,7 @@ if (!empty($conf->expensereport->enabled) && $user->rights->expensereport->lire)
 		$sql .= ' AND x.fk_user_author IN ('.$db->sanitize(join(',', $childids)).')';
 	}
 	//if (!$user->rights->societe->client->voir && !$user->socid) $sql.= " AND x.fk_soc = s. rowid AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-	//if (!empty($socid)) $sql.= " AND x.fk_soc = ".$socid;
+	//if (!empty($socid)) $sql.= " AND x.fk_soc = ".((int) $socid);
 	$sql .= $db->order("x.tms", "DESC");
 	$sql .= $db->plimit($max, 0);
 
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index f94e461398b..23acc7d4a1b 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -1183,7 +1183,7 @@ function migrate_contracts_date2($db, $langs, $conf)
 					print $langs->trans('MigrationContractsInvalidDateFix', $obj->cref, $obj->date_contrat, $obj->datemin)."<br>\n";
 					$sql = "UPDATE ".MAIN_DB_PREFIX."contrat";
 					$sql .= " SET date_contrat='".$db->idate($datemin)."'";
-					$sql .= " WHERE rowid=".$obj->cref;
+					$sql .= " WHERE rowid = ".((int) $obj->cref);
 					$resql2 = $db->query($sql);
 					if (!$resql2) {
 						dol_print_error($db);
@@ -1275,8 +1275,8 @@ function migrate_contracts_open($db, $langs, $conf)
 
 				print $langs->trans('MigrationReopenThisContract', $obj->cref)."<br>\n";
 				$sql = "UPDATE ".MAIN_DB_PREFIX."contrat";
-				$sql .= " SET statut=1";
-				$sql .= " WHERE rowid=".$obj->cref;
+				$sql .= " SET statut = 1";
+				$sql .= " WHERE rowid = ".((int) $obj->cref);
 				$resql2 = $db->query($sql);
 				if (!$resql2) {
 					dol_print_error($db);
@@ -2835,8 +2835,8 @@ function migrate_project_task_time($db, $langs, $conf)
 					$newtime = $hour + $min;
 
 					$sql2 = "UPDATE ".MAIN_DB_PREFIX."projet_task_time SET";
-					$sql2 .= " task_duration = ".$newtime;
-					$sql2 .= " WHERE rowid = ".$obj->rowid;
+					$sql2 .= " task_duration = ".((int) $newtime);
+					$sql2 .= " WHERE rowid = ".((int) $obj->rowid);
 
 					$resql2 = $db->query($sql2);
 					if (!$resql2) {
@@ -2865,7 +2865,7 @@ function migrate_project_task_time($db, $langs, $conf)
 				if ($oldtime > 0) {
 					foreach ($totaltime as $taskid => $total_duration) {
 						$sql = "UPDATE ".MAIN_DB_PREFIX."projet_task SET";
-						$sql .= " duration_effective = ".$total_duration;
+						$sql .= " duration_effective = ".((int) $total_duration);
 						$sql .= " WHERE rowid = ".((int) $taskid);
 
 						$resql = $db->query($sql);
@@ -2945,7 +2945,7 @@ function migrate_customerorder_shipping($db, $langs, $conf)
 						$sqlUpdate = "UPDATE ".MAIN_DB_PREFIX."expedition SET";
 						$sqlUpdate .= " ref_customer = '".$db->escape($obj->ref_client)."'";
 						$sqlUpdate .= ", date_delivery = '".$db->escape($obj->delivery_date ? $obj->delivery_date : 'null')."'";
-						$sqlUpdate .= " WHERE rowid = ".$obj->shipping_id;
+						$sqlUpdate .= " WHERE rowid = ".((int) $obj->shipping_id);
 
 						$result = $db->query($sqlUpdate);
 						if (!$result) {
@@ -3407,8 +3407,8 @@ function migrate_categorie_association($db, $langs, $conf)
 					$obj = $db->fetch_object($resql);
 
 					$sqlUpdate = "UPDATE ".MAIN_DB_PREFIX."categorie SET ";
-					$sqlUpdate .= "fk_parent = ".$obj->fk_categorie_mere;
-					$sqlUpdate .= " WHERE rowid = ".$obj->fk_categorie_fille;
+					$sqlUpdate .= "fk_parent = ".((int) $obj->fk_categorie_mere);
+					$sqlUpdate .= " WHERE rowid = ".((int) $obj->fk_categorie_fille);
 
 					$result = $db->query($sqlUpdate);
 					if (!$result) {
diff --git a/htdocs/intracommreport/list.php b/htdocs/intracommreport/list.php
index 1ba796026c6..686bd16d5de 100644
--- a/htdocs/intracommreport/list.php
+++ b/htdocs/intracommreport/list.php
@@ -237,8 +237,8 @@ if (dol_strlen($search_type) && $search_type != '-1') {
 if ($search_ref)     $sql .= natural_search('i.ref', $search_ref);
 if ($search_label)   $sql .= natural_search('i.label', $search_label);
 if ($search_barcode) $sql .= natural_search('i.barcode', $search_barcode);
-if (isset($search_tosell) && dol_strlen($search_tosell) > 0  && $search_tosell!=-1) $sql.= " AND i.tosell = ".$db->escape($search_tosell);
-if (isset($search_tobuy) && dol_strlen($search_tobuy) > 0  && $search_tobuy!=-1)   $sql.= " AND i.tobuy = ".$db->escape($search_tobuy);
+if (isset($search_tosell) && dol_strlen($search_tosell) > 0  && $search_tosell!=-1) $sql.= " AND i.tosell = ".((int) $search_tosell);
+if (isset($search_tobuy) && dol_strlen($search_tobuy) > 0  && $search_tobuy!=-1)   $sql.= " AND i.tobuy = ".((int) $search_tobuy);
 if (dol_strlen($canvas) > 0)                    $sql.= " AND i.canvas = '".$db->escape($canvas)."'";
 */
 
diff --git a/htdocs/knowledgemanagement/knowledgemanagementindex.php b/htdocs/knowledgemanagement/knowledgemanagementindex.php
index 86ea3f10e08..0402ab07710 100644
--- a/htdocs/knowledgemanagement/knowledgemanagementindex.php
+++ b/htdocs/knowledgemanagement/knowledgemanagementindex.php
@@ -113,7 +113,7 @@ if (! empty($conf->knowledgemanagement->enabled) && $user->rights->knowledgemana
 	$sql.= " AND c.fk_statut = 0";
 	$sql.= " AND c.entity IN (".getEntity('commande').")";
 	if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-	if ($socid)	$sql.= " AND c.fk_soc = ".$socid;
+	if ($socid)	$sql.= " AND c.fk_soc = ".((int) $socid);
 
 	$resql = $db->query($sql);
 	if ($resql)
diff --git a/htdocs/loan/class/loan.class.php b/htdocs/loan/class/loan.class.php
index b628de1b68b..b5c0ffc0add 100644
--- a/htdocs/loan/class/loan.class.php
+++ b/htdocs/loan/class/loan.class.php
@@ -356,12 +356,12 @@ class Loan extends CommonObject
 		$sql .= " capital='".price2num($this->db->escape($this->capital))."',";
 		$sql .= " datestart='".$this->db->idate($this->datestart)."',";
 		$sql .= " dateend='".$this->db->idate($this->dateend)."',";
-		$sql .= " nbterm=".$this->nbterm.",";
-		$sql .= " rate=".$this->db->escape($this->rate).",";
+		$sql .= " nbterm=".((float) $this->nbterm).",";
+		$sql .= " rate=".((float) $this->rate).",";
 		$sql .= " accountancy_account_capital = '".$this->db->escape($this->account_capital)."',";
 		$sql .= " accountancy_account_insurance = '".$this->db->escape($this->account_insurance)."',";
 		$sql .= " accountancy_account_interest = '".$this->db->escape($this->account_interest)."',";
-		$sql .= " fk_projet=".(empty($this->fk_project) ? 'NULL' : $this->fk_project).",";
+		$sql .= " fk_projet=".(empty($this->fk_project) ? 'NULL' : ((int) $this->fk_project)).",";
 		$sql .= " fk_user_modif = ".$user->id.",";
 		$sql .= " insurance_amount = '".price2num($this->db->escape($this->insurance_amount))."'";
 		$sql .= " WHERE rowid=".((int) $this->id);
diff --git a/htdocs/margin/agentMargins.php b/htdocs/margin/agentMargins.php
index 1ac670c4a7f..5f8c7320cd1 100644
--- a/htdocs/margin/agentMargins.php
+++ b/htdocs/margin/agentMargins.php
@@ -171,9 +171,9 @@ $sql .= ' AND s.entity IN ('.getEntity('societe').')';
 $sql .= " AND d.fk_facture = f.rowid";
 if ($agentid > 0) {
 	if (!empty($conf->global->AGENT_CONTACT_TYPE)) {
-		$sql .= " AND ((e.fk_socpeople IS NULL AND sc.fk_user = ".$agentid.") OR (e.fk_socpeople IS NOT NULL AND e.fk_socpeople = ".$agentid."))";
+		$sql .= " AND ((e.fk_socpeople IS NULL AND sc.fk_user = ".((int) $agentid).") OR (e.fk_socpeople IS NOT NULL AND e.fk_socpeople = ".((int) $agentid)."))";
 	} else {
-		$sql .= " AND sc.fk_user = ".$agentid;
+		$sql .= " AND sc.fk_user = ".((int) $agentid);
 	}
 }
 if (!empty($startdate)) {
diff --git a/htdocs/margin/tabs/productMargins.php b/htdocs/margin/tabs/productMargins.php
index 6f2337d1baf..a5e6e6af6e9 100644
--- a/htdocs/margin/tabs/productMargins.php
+++ b/htdocs/margin/tabs/productMargins.php
@@ -158,7 +158,7 @@ if ($id > 0 || !empty($ref)) {
 			$sql .= " AND f.fk_statut > 0";
 			$sql .= " AND f.entity IN (".getEntity('invoice').")";
 			$sql .= " AND d.fk_facture = f.rowid";
-			$sql .= " AND d.fk_product =".$object->id;
+			$sql .= " AND d.fk_product = ".((int) $object->id);
 			if (!$user->rights->societe->client->voir && !$socid) {
 				$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 			}
diff --git a/htdocs/modulebuilder/template/class/api_mymodule.class.php b/htdocs/modulebuilder/template/class/api_mymodule.class.php
index bc52cf7378f..faeb22a095b 100644
--- a/htdocs/modulebuilder/template/class/api_mymodule.class.php
+++ b/htdocs/modulebuilder/template/class/api_mymodule.class.php
@@ -145,14 +145,14 @@ class MyModuleApi extends DolibarrApi
 			$sql .= " AND t.fk_soc = sc.fk_soc";
 		}
 		if ($restrictonsocid && $socid) {
-			$sql .= " AND t.fk_soc = ".$socid;
+			$sql .= " AND t.fk_soc = ".((int) $socid);
 		}
 		if ($restrictonsocid && $search_sale > 0) {
 			$sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
 		}
 		// Insert sale filter
 		if ($restrictonsocid && $search_sale > 0) {
-			$sql .= " AND sc.fk_user = ".$search_sale;
+			$sql .= " AND sc.fk_user = ".((int) $search_sale);
 		}
 		if ($sqlfilters) {
 			if (!DolibarrApi::_checkFilters($sqlfilters)) {
diff --git a/htdocs/modulebuilder/template/mymoduleindex.php b/htdocs/modulebuilder/template/mymoduleindex.php
index 2d262aeeb36..990a6d91bfa 100644
--- a/htdocs/modulebuilder/template/mymoduleindex.php
+++ b/htdocs/modulebuilder/template/mymoduleindex.php
@@ -113,7 +113,7 @@ if (! empty($conf->mymodule->enabled) && $user->rights->mymodule->read)
 	$sql.= " AND c.fk_statut = 0";
 	$sql.= " AND c.entity IN (".getEntity('commande').")";
 	if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-	if ($socid)	$sql.= " AND c.fk_soc = ".$socid;
+	if ($socid)	$sql.= " AND c.fk_soc = ".((int) $socid);
 
 	$resql = $db->query($sql);
 	if ($resql)
diff --git a/htdocs/mrp/class/api_mos.class.php b/htdocs/mrp/class/api_mos.class.php
index a2558fe6252..0ece243dc39 100644
--- a/htdocs/mrp/class/api_mos.class.php
+++ b/htdocs/mrp/class/api_mos.class.php
@@ -137,14 +137,14 @@ class Mos extends DolibarrApi
 			$sql .= " AND t.fk_soc = sc.fk_soc";
 		}
 		if ($restrictonsocid && $socid) {
-			$sql .= " AND t.fk_soc = ".$socid;
+			$sql .= " AND t.fk_soc = ".((int) $socid);
 		}
 		if ($restrictonsocid && $search_sale > 0) {
 			$sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
 		}
 		// Insert sale filter
 		if ($restrictonsocid && $search_sale > 0) {
-			$sql .= " AND sc.fk_user = ".$search_sale;
+			$sql .= " AND sc.fk_user = ".((int) $search_sale);
 		}
 		if ($sqlfilters) {
 			if (!DolibarrApi::_checkFilters($sqlfilters)) {
diff --git a/htdocs/opensurvey/class/opensurveysondage.class.php b/htdocs/opensurvey/class/opensurveysondage.class.php
index e11fb65184a..e35abff84bb 100644
--- a/htdocs/opensurvey/class/opensurveysondage.class.php
+++ b/htdocs/opensurvey/class/opensurveysondage.class.php
@@ -321,9 +321,9 @@ class Opensurveysondage extends CommonObject
 		$sql .= " date_fin=".(dol_strlen($this->date_fin) != 0 ? "'".$this->db->idate($this->date_fin)."'" : 'null').",";
 		$sql .= " status=".(isset($this->status) ? "'".$this->db->escape($this->status)."'" : "null").",";
 		$sql .= " format=".(isset($this->format) ? "'".$this->db->escape($this->format)."'" : "null").",";
-		$sql .= " mailsonde=".(isset($this->mailsonde) ? $this->db->escape($this->mailsonde) : "null").",";
-		$sql .= " allow_comments=".$this->db->escape($this->allow_comments).",";
-		$sql .= " allow_spy=".$this->db->escape($this->allow_spy);
+		$sql .= " mailsonde=".(isset($this->mailsonde) ? ((int) $this->mailsonde) : "null").",";
+		$sql .= " allow_comments=".((int) $this->allow_comments).",";
+		$sql .= " allow_spy=".((int) $this->allow_spy);
 		$sql .= " WHERE id_sondage='".$this->db->escape($this->id_sondage)."'";
 
 		$this->db->begin();
diff --git a/htdocs/partnership/class/partnershiputils.class.php b/htdocs/partnership/class/partnershiputils.class.php
index 992fca2703e..04f5db251e5 100644
--- a/htdocs/partnership/class/partnershiputils.class.php
+++ b/htdocs/partnership/class/partnershiputils.class.php
@@ -102,7 +102,7 @@ class PartnershipUtils
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."adherent_type as dty on (dty.rowid = d.fk_adherent_type)";
 		$sql .= " WHERE fk_member > 0";
 		$sql .= " AND (d.datefin < '".$this->db->idate($datetotest)."' AND dty.subscription = 1)";
-		$sql .= " AND p.status = ".$partnership::STATUS_ACCEPTED; // Only accepted not yet canceled
+		$sql .= " AND p.status = ".((int) $partnership::STATUS_ACCEPTED); // Only accepted not yet canceled
 		$sql .= $this->db->order('d.rowid', 'ASC');
 		// Limit is managed into loop later
 
@@ -263,7 +263,7 @@ class PartnershipUtils
 
 		$sql .= " WHERE 1 = 1";
 		$sql .= " AND p.".$fk_partner." > 0";
-		$sql .= " AND p.status = ".$partnership::STATUS_ACCEPTED; // Only accepted not yet canceled
+		$sql .= " AND p.status = ".((int) $partnership::STATUS_ACCEPTED); // Only accepted not yet canceled
 		$sql .= " AND (p.last_check_backlink IS NULL OR p.last_check_backlink <= '".$this->db->idate($now - 7 * 24 * 3600)."')"; // Every week, check that website contains a link to dolibarr.
 		$sql .= $this->db->order('p.rowid', 'ASC');
 		// Limit is managed into loop later
diff --git a/htdocs/partnership/partnershipindex.php b/htdocs/partnership/partnershipindex.php
index 8076f105dbb..ce7a17b8fce 100644
--- a/htdocs/partnership/partnershipindex.php
+++ b/htdocs/partnership/partnershipindex.php
@@ -113,7 +113,7 @@ if (! empty($conf->partnership->enabled) && $user->rights->partnership->read)
 	$sql.= " AND c.fk_statut = 0";
 	$sql.= " AND c.entity IN (".getEntity('commande').")";
 	if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-	if ($socid)	$sql.= " AND c.fk_soc = ".$socid;
+	if ($socid)	$sql.= " AND c.fk_soc = ".((int) $socid);
 
 	$resql = $db->query($sql);
 	if ($resql)
diff --git a/htdocs/product/ajax/products.php b/htdocs/product/ajax/products.php
index 901e2b387e3..ac2e70e3287 100644
--- a/htdocs/product/ajax/products.php
+++ b/htdocs/product/ajax/products.php
@@ -122,8 +122,8 @@ if (!empty($action) && $action == 'fetch' && !empty($id)) {
 		// Price by qty
 		if (!empty($price_by_qty_rowid) && $price_by_qty_rowid >= 1 && (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))) { // If we need a particular price related to qty
 			$sql = "SELECT price, unitprice, quantity, remise_percent";
-			$sql .= " FROM ".MAIN_DB_PREFIX."product_price_by_qty ";
-			$sql .= " WHERE rowid=".$price_by_qty_rowid."";
+			$sql .= " FROM ".MAIN_DB_PREFIX."product_price_by_qty";
+			$sql .= " WHERE rowid = ".((int) $price_by_qty_rowid);
 
 			$result = $db->query($sql);
 			if ($result) {
diff --git a/htdocs/product/canvas/product/actions_card_product.class.php b/htdocs/product/canvas/product/actions_card_product.class.php
index 3bda877af62..d155abdc2c2 100644
--- a/htdocs/product/canvas/product/actions_card_product.class.php
+++ b/htdocs/product/canvas/product/actions_card_product.class.php
@@ -349,11 +349,11 @@ class ActionsCardProduct
 			}
 		}
 
-		if (isset($_GET["tosell"]) && dol_strlen($_GET["tosell"]) > 0) {
-			$sql .= " AND p.tosell = ".$this->db->escape($_GET["tosell"]);
+		if (GETPOSTISSET("tosell")) {
+			$sql .= " AND p.tosell = ".((int) GETPOST("tosell", "int"));
 		}
-		if (isset($_GET["canvas"]) && dol_strlen($_GET["canvas"]) > 0) {
-			$sql .= " AND p.canvas = '".$this->db->escape($_GET["canvas"])."'";
+		if (GETPOSTISSET("canvas")) {
+			$sql .= " AND p.canvas = '".$this->db->escape(GETPOST("canvas"))."'";
 		}
 		$sql .= $this->db->order($sortfield, $sortorder);
 		$sql .= $this->db->plimit($limit + 1, $offset);
diff --git a/htdocs/product/canvas/service/actions_card_service.class.php b/htdocs/product/canvas/service/actions_card_service.class.php
index 53e0df73212..c4296dc63a8 100644
--- a/htdocs/product/canvas/service/actions_card_service.class.php
+++ b/htdocs/product/canvas/service/actions_card_service.class.php
@@ -298,29 +298,29 @@ class ActionsCardService
 			$sql .= " AND (p.ref LIKE '%".$this->db->escape($sall)."%' OR p.label LIKE '%".$this->db->escape($sall)."%' OR p.description LIKE '%".$this->db->escape($sall)."%' OR p.note LIKE '%".$this->db->escape($sall)."%')";
 		}
 		if ($sref) {
-			$sql .= " AND p.ref LIKE '%".$sref."%'";
+			$sql .= " AND p.ref LIKE '%".$this->db->escape($sref)."%'";
 		}
 		if ($search_barcode) {
-			$sql .= " AND p.barcode LIKE '%".$search_barcode."%'";
+			$sql .= " AND p.barcode LIKE '%".$this->db->escape($search_barcode)."%'";
 		}
 		if ($snom) {
 			$sql .= " AND p.label LIKE '%".$this->db->escape($snom)."%'";
 		}
-		if (isset($_GET["tosell"]) && dol_strlen($_GET["tosell"]) > 0) {
-			$sql .= " AND p.tosell = ".$this->db->escape($_GET["tosell"]);
+		if (GETPOSTISSET("tosell")) {
+			$sql .= " AND p.tosell = ".((int) GETPOST("tosell", 'int'));
 		}
-		if (isset($_GET["canvas"]) && dol_strlen($_GET["canvas"]) > 0) {
-			$sql .= " AND p.canvas = '".$this->db->escape($_GET["canvas"])."'";
+		if (GETPOSTISSET("canvas")) {
+			$sql .= " AND p.canvas = '".$this->db->escape(GETPOST("canvas"))."'";
 		}
 		if ($catid) {
-			$sql .= " AND cp.fk_categorie = ".$catid;
+			$sql .= " AND cp.fk_categorie = ".((int) $catid);
 		}
 		if ($fourn_id > 0) {
-			$sql .= " AND p.rowid = pfp.fk_product AND pfp.fk_soc = ".$fourn_id;
+			$sql .= " AND p.rowid = pfp.fk_product AND pfp.fk_soc = ".((int) $fourn_id);
 		}
 		// Insert categ filter
 		if ($search_categ) {
-			$sql .= " AND cp.fk_categorie = ".$this->db->escape($search_categ);
+			$sql .= " AND cp.fk_categorie = ".((int) $search_categ);
 		}
 		$sql .= $this->db->order($sortfield, $sortorder);
 		$sql .= $this->db->plimit($limit + 1, $offset);
diff --git a/htdocs/product/class/api_products.class.php b/htdocs/product/class/api_products.class.php
index b4e860a1069..2e0d21b0456 100644
--- a/htdocs/product/class/api_products.class.php
+++ b/htdocs/product/class/api_products.class.php
@@ -206,8 +206,8 @@ class Products extends DolibarrApi
 
 		// Select products of given category
 		if ($category > 0) {
-			$sql .= " AND c.fk_categorie = ".$this->db->escape($category);
-			$sql .= " AND c.fk_product = t.rowid ";
+			$sql .= " AND c.fk_categorie = ".((int) $category);
+			$sql .= " AND c.fk_product = t.rowid";
 		}
 		if ($mode == 1) {
 			// Show only products
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 6aee9af9c60..1afd1e74e23 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -1055,16 +1055,16 @@ class Product extends CommonObject
 			$sql .= " SET label = '".$this->db->escape($this->label)."'";
 
 			if ($updatetype && ($this->isProduct() || $this->isService())) {
-				$sql .= ", fk_product_type = ".$this->type;
+				$sql .= ", fk_product_type = ".((int) $this->type);
 			}
 
 			$sql .= ", ref = '".$this->db->escape($this->ref)."'";
 			$sql .= ", ref_ext = ".(!empty($this->ref_ext) ? "'".$this->db->escape($this->ref_ext)."'" : "null");
 			$sql .= ", default_vat_code = ".($this->default_vat_code ? "'".$this->db->escape($this->default_vat_code)."'" : "null");
-			$sql .= ", tva_tx = ".$this->tva_tx;
-			$sql .= ", recuperableonly = ".$this->tva_npr;
-			$sql .= ", localtax1_tx = ".$this->localtax1_tx;
-			$sql .= ", localtax2_tx = ".$this->localtax2_tx;
+			$sql .= ", tva_tx = ".((float) $this->tva_tx);
+			$sql .= ", recuperableonly = ".((int) $this->tva_npr);
+			$sql .= ", localtax1_tx = ".((float) $this->localtax1_tx);
+			$sql .= ", localtax2_tx = ".((float) $this->localtax2_tx);
 			$sql .= ", localtax1_type = ".($this->localtax1_type != '' ? "'".$this->db->escape($this->localtax1_type)."'" : "'0'");
 			$sql .= ", localtax2_type = ".($this->localtax2_type != '' ? "'".$this->db->escape($this->localtax2_type)."'" : "'0'");
 
@@ -2391,8 +2391,8 @@ class Product extends CommonObject
 						$sql .= " price_base_type, tva_tx, default_vat_code, tosell, price_by_qty, rowid, recuperableonly";
 						$sql .= " FROM ".MAIN_DB_PREFIX."product_price";
 						$sql .= " WHERE entity IN (".getEntity('productprice').")";
-						$sql .= " AND price_level=".$i;
-						$sql .= " AND fk_product = ".$this->id;
+						$sql .= " AND price_level=".((int) $i);
+						$sql .= " AND fk_product = ".((int) $this->id);
 						$sql .= " ORDER BY date_price DESC, rowid DESC";
 						$sql .= " LIMIT 1";
 						$resql = $this->db->query($sql);
@@ -2501,7 +2501,7 @@ class Product extends CommonObject
 						$sql .= " price_base_type, tva_tx, default_vat_code, tosell, price_by_qty, rowid, recuperableonly";
 						$sql .= " FROM ".MAIN_DB_PREFIX."product_price";
 						$sql .= " WHERE entity IN (".getEntity('productprice').")";
-						$sql .= " AND price_level=".$i;
+						$sql .= " AND price_level=".((int) $i);
 						$sql .= " AND fk_product = ".$this->id;
 						$sql .= " ORDER BY date_price DESC, rowid DESC";
 						$sql .= " LIMIT 1";
@@ -2613,7 +2613,7 @@ class Product extends CommonObject
 			$sql .= " AND mp.fk_product =".$this->id;
 			$sql .= " AND mp.role ='".$this->db->escape($role)."'";
 			if ($socid > 0) {
-				$sql .= " AND c.fk_soc = ".$socid;
+				$sql .= " AND c.fk_soc = ".((int) $socid);
 			}
 
 			$result = $this->db->query($sql);
@@ -2739,7 +2739,7 @@ class Product extends CommonObject
 		}
 		//$sql.= " AND pr.fk_statut != 0";
 		if ($socid > 0) {
-			$sql .= " AND p.fk_soc = ".$socid;
+			$sql .= " AND p.fk_soc = ".((int) $socid);
 		}
 
 		$result = $this->db->query($sql);
@@ -2814,7 +2814,7 @@ class Product extends CommonObject
 		}
 		//$sql.= " AND pr.fk_statut != 0";
 		if ($socid > 0) {
-			$sql .= " AND p.fk_soc = ".$socid;
+			$sql .= " AND p.fk_soc = ".((int) $socid);
 		}
 
 		$result = $this->db->query($sql);
@@ -2869,7 +2869,7 @@ class Product extends CommonObject
 			$sql .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
 		}
 		if ($socid > 0) {
-			$sql .= " AND c.fk_soc = ".$socid;
+			$sql .= " AND c.fk_soc = ".((int) $socid);
 		}
 		if ($filtrestatut <> '') {
 			$sql .= " AND c.fk_statut in (".$this->db->sanitize($filtrestatut).")";
@@ -2971,7 +2971,7 @@ class Product extends CommonObject
 			$sql .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
 		}
 		if ($socid > 0) {
-			$sql .= " AND c.fk_soc = ".$socid;
+			$sql .= " AND c.fk_soc = ".((int) $socid);
 		}
 		if ($filtrestatut != '') {
 			$sql .= " AND c.fk_statut in (".$this->db->sanitize($filtrestatut).")"; // Peut valoir 0
@@ -3033,7 +3033,7 @@ class Product extends CommonObject
 			$sql .= " AND e.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
 		}
 		if ($socid > 0) {
-			$sql .= " AND e.fk_soc = ".$socid;
+			$sql .= " AND e.fk_soc = ".((int) $socid);
 		}
 		if ($filtrestatut <> '') {
 			$sql .= " AND c.fk_statut IN (".$this->db->sanitize($filtrestatut).")";
@@ -3114,7 +3114,7 @@ class Product extends CommonObject
 			$sql .= " AND cf.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
 		}
 		if ($socid > 0) {
-			$sql .= " AND cf.fk_soc = ".$socid;
+			$sql .= " AND cf.fk_soc = ".((int) $socid);
 		}
 		if ($filtrestatut <> '') {
 			$sql .= " AND cf.fk_statut IN (".$this->db->sanitize($filtrestatut).")";
@@ -3170,7 +3170,7 @@ class Product extends CommonObject
 			$sql .= " AND m.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
 		}
 		if ($socid > 0) {
-			$sql .= " AND m.fk_soc = ".$socid;
+			$sql .= " AND m.fk_soc = ".((int) $socid);
 		}
 		if ($filtrestatut <> '') {
 			$sql .= " AND m.status IN (".$this->db->sanitize($filtrestatut).")";
@@ -3265,7 +3265,7 @@ class Product extends CommonObject
 		}
 		//$sql.= " AND c.statut != 0";
 		if ($socid > 0) {
-			$sql .= " AND c.fk_soc = ".$socid;
+			$sql .= " AND c.fk_soc = ".((int) $socid);
 		}
 
 		$result = $this->db->query($sql);
@@ -3339,7 +3339,7 @@ class Product extends CommonObject
 		}
 		//$sql.= " AND f.fk_statut != 0";
 		if ($socid > 0) {
-			$sql .= " AND f.fk_soc = ".$socid;
+			$sql .= " AND f.fk_soc = ".((int) $socid);
 		}
 
 		$result = $this->db->query($sql);
@@ -3413,7 +3413,7 @@ class Product extends CommonObject
 		}
 		//$sql.= " AND f.fk_statut != 0";
 		if ($socid > 0) {
-			$sql .= " AND f.fk_soc = ".$socid;
+			$sql .= " AND f.fk_soc = ".((int) $socid);
 		}
 
 		$result = $this->db->query($sql);
@@ -3655,7 +3655,7 @@ class Product extends CommonObject
 			$sql .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
 		}
 		if ($socid > 0) {
-			$sql .= " AND p.fk_soc = ".$socid;
+			$sql .= " AND p.fk_soc = ".((int) $socid);
 		}
 		$sql .= $morefilter;
 		$sql .= " GROUP BY date_format(p.datep,'%Y%m')";
@@ -3758,7 +3758,7 @@ class Product extends CommonObject
 			$sql .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
 		}
 		if ($socid > 0) {
-			$sql .= " AND c.fk_soc = ".$socid;
+			$sql .= " AND c.fk_soc = ".((int) $socid);
 		}
 		$sql .= $morefilter;
 		$sql .= " GROUP BY date_format(c.date_commande,'%Y%m')";
@@ -3809,7 +3809,7 @@ class Product extends CommonObject
 			$sql .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
 		}
 		if ($socid > 0) {
-			$sql .= " AND c.fk_soc = ".$socid;
+			$sql .= " AND c.fk_soc = ".((int) $socid);
 		}
 		$sql .= $morefilter;
 		$sql .= " GROUP BY date_format(c.date_commande,'%Y%m')";
@@ -3863,7 +3863,7 @@ class Product extends CommonObject
 			$sql .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
 		}
 		if ($socid > 0) {
-			$sql .= " AND c.fk_soc = ".$socid;
+			$sql .= " AND c.fk_soc = ".((int) $socid);
 		}
 		$sql .= $morefilter;
 		$sql .= " GROUP BY date_format(c.date_contrat,'%Y%m')";
@@ -3916,7 +3916,7 @@ class Product extends CommonObject
 			$sql .= " AND d.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
 		}
 		if ($socid > 0) {
-			$sql .= " AND d.fk_soc = ".$socid;
+			$sql .= " AND d.fk_soc = ".((int) $socid);
 		}
 		$sql .= $morefilter;
 		$sql .= " GROUP BY date_format(d.date_valid,'%Y%m')";
diff --git a/htdocs/product/class/productbatch.class.php b/htdocs/product/class/productbatch.class.php
index 10704f2f53e..529284af464 100644
--- a/htdocs/product/class/productbatch.class.php
+++ b/htdocs/product/class/productbatch.class.php
@@ -384,7 +384,7 @@ class Productbatch extends CommonObject
 		$sql .= " t.qty,";
 		$sql .= " t.import_key";
 		$sql .= " FROM ".MAIN_DB_PREFIX.self::$_table_element." as t";
-		$sql .= " WHERE fk_product_stock=".$fk_product_stock;
+		$sql .= " WHERE fk_product_stock=".((int) $fk_product_stock);
 
 		if (!empty($eatby)) {
 			array_push($where, " eatby = '".$this->db->idate($eatby)."'"); // deprecated
@@ -454,10 +454,10 @@ class Productbatch extends CommonObject
 		}
 		$sql .= " FROM ".MAIN_DB_PREFIX."product_batch as t";
 		if ($fk_product > 0) {
-			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_lot as pl ON pl.fk_product = ".$fk_product." AND pl.batch = t.batch";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_lot as pl ON pl.fk_product = ".((int) $fk_product)." AND pl.batch = t.batch";
 			// TODO May add extrafields to ?
 		}
-		$sql .= " WHERE fk_product_stock=".$fk_product_stock;
+		$sql .= " WHERE fk_product_stock=".((int) $fk_product_stock);
 		if ($with_qty) {
 			$sql .= " AND t.qty <> 0";
 		}
diff --git a/htdocs/product/class/propalmergepdfproduct.class.php b/htdocs/product/class/propalmergepdfproduct.class.php
index a1d92cc492a..0b5ea0cc2a6 100644
--- a/htdocs/product/class/propalmergepdfproduct.class.php
+++ b/htdocs/product/class/propalmergepdfproduct.class.php
@@ -408,10 +408,10 @@ class Propalmergepdfproduct extends CommonObject
 
 		if (!$error) {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."propal_merge_pdf_product";
-			$sql .= " WHERE fk_product=".$product_id;
+			$sql .= " WHERE fk_product = ".((int) $product_id);
 
 			if ($conf->global->MAIN_MULTILANGS && !empty($lang_id)) {
-				$sql .= " AND lang='".$this->db->escape($lang_id)."'";
+				$sql .= " AND lang = '".$this->db->escape($lang_id)."'";
 			}
 
 			dol_syslog(__METHOD__, LOG_DEBUG);
diff --git a/htdocs/product/dynamic_price/class/price_global_variable.class.php b/htdocs/product/dynamic_price/class/price_global_variable.class.php
index 5286b932ca7..0404f0bd97a 100644
--- a/htdocs/product/dynamic_price/class/price_global_variable.class.php
+++ b/htdocs/product/dynamic_price/class/price_global_variable.class.php
@@ -182,7 +182,7 @@ class PriceGlobalVariable
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
 		$sql .= " code = ".(isset($this->code) ? "'".$this->db->escape($this->code)."'" : "''").",";
 		$sql .= " description = ".(isset($this->description) ? "'".$this->db->escape($this->description)."'" : "''").",";
-		$sql .= " value = ".$this->value;
+		$sql .= " value = ".((float) $this->value);
 		$sql .= " WHERE rowid = ".$this->id;
 
 		$this->db->begin();
diff --git a/htdocs/product/dynamic_price/class/price_global_variable_updater.class.php b/htdocs/product/dynamic_price/class/price_global_variable_updater.class.php
index 172c004a2d7..4272beb44bc 100644
--- a/htdocs/product/dynamic_price/class/price_global_variable_updater.class.php
+++ b/htdocs/product/dynamic_price/class/price_global_variable_updater.class.php
@@ -200,12 +200,12 @@ class PriceGlobalVariableUpdater
 
 		// Update request
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
-		$sql .= " type = ".$this->type.",";
+		$sql .= " type = ".((int) $this->type).",";
 		$sql .= " description = ".(isset($this->description) ? "'".$this->db->escape($this->description)."'" : "''").",";
 		$sql .= " parameters = ".(isset($this->parameters) ? "'".$this->db->escape($this->parameters)."'" : "''").",";
-		$sql .= " fk_variable = ".$this->fk_variable.",";
-		$sql .= " update_interval = ".$this->update_interval.",";
-		$sql .= " next_update = ".$this->next_update.",";
+		$sql .= " fk_variable = ".((int) $this->fk_variable).",";
+		$sql .= " update_interval = ".((int) $this->update_interval).",";
+		$sql .= " next_update = ".((int) $this->next_update).",";
 		$sql .= " last_status = ".(isset($this->last_status) ? "'".$this->db->escape($this->last_status)."'" : "''");
 		$sql .= " WHERE rowid = ".$this->id;
 
diff --git a/htdocs/product/index.php b/htdocs/product/index.php
index 0e709f54f99..4aaaf3a0fa7 100644
--- a/htdocs/product/index.php
+++ b/htdocs/product/index.php
@@ -287,7 +287,7 @@ if ((!empty($conf->product->enabled) || !empty($conf->service->enabled)) && ($us
 	$sql .= " FROM ".MAIN_DB_PREFIX."product as p";
 	$sql .= " WHERE p.entity IN (".getEntity($product_static->element, 1).")";
 	if ($type != '') {
-		$sql .= " AND p.fk_product_type = ".$type;
+		$sql .= " AND p.fk_product_type = ".((int) $type);
 	}
 	// Add where from hooks
 	$parameters = array();
@@ -445,8 +445,8 @@ function activitytrim($product_type)
 	$sql .= " WHERE f.entity IN (".getEntity('invoice').")";
 	$sql .= " AND f.rowid = fd.fk_facture";
 	$sql .= " AND pf.fk_facture = f.rowid";
-	$sql .= " AND pf.fk_paiement= p.rowid";
-	$sql .= " AND fd.product_type=".$product_type;
+	$sql .= " AND pf.fk_paiement = p.rowid";
+	$sql .= " AND fd.product_type = ".((int) $product_type);
 	$sql .= " AND p.datep >= '".$db->idate(dol_get_first_day($yearofbegindate), 1)."'";
 	$sql .= " GROUP BY annee, mois ";
 	$sql .= " ORDER BY annee, mois ";
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index eb3fc71d53a..0c922fab0dd 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -451,7 +451,7 @@ if (dol_strlen($canvas) > 0) {
 	$sql .= " AND p.canvas = '".$db->escape($canvas)."'";
 }
 if ($catid > 0) {
-	$sql .= " AND cp.fk_categorie = ".$catid;
+	$sql .= " AND cp.fk_categorie = ".((int) $catid);
 }
 if ($catid == -2) {
 	$sql .= " AND cp.fk_categorie IS NULL";
diff --git a/htdocs/product/popuprop.php b/htdocs/product/popuprop.php
index 5aa54b0963c..8ffae0bee8c 100644
--- a/htdocs/product/popuprop.php
+++ b/htdocs/product/popuprop.php
@@ -211,7 +211,7 @@ if ($mode && $mode != '-1') {
 		if (!empty($conf->global->MAIN_MULTILANGS)) { // si l'option est active
 			$sql = "SELECT label";
 			$sql .= " FROM ".MAIN_DB_PREFIX."product_lang";
-			$sql .= " WHERE fk_product=".$prodid;
+			$sql .= " WHERE fk_product = ".((int) $prodid);
 			$sql .= " AND lang='".$db->escape($langs->getDefaultLang())."'";
 			$sql .= " LIMIT 1";
 
diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php
index 342acb49b6e..f8db6915409 100644
--- a/htdocs/product/reassort.php
+++ b/htdocs/product/reassort.php
@@ -190,7 +190,7 @@ if ($fourn_id > 0) {
 }
 // Insert categ filter
 if ($search_categ) {
-	$sql .= " AND cp.fk_categorie = ".$db->escape($search_categ);
+	$sql .= " AND cp.fk_categorie = ".((int) $search_categ);
 }
 $sql .= " GROUP BY p.rowid, p.ref, p.label, p.barcode, p.price, p.price_ttc, p.price_base_type, p.entity,";
 $sql .= " p.fk_product_type, p.tms, p.duration, p.tosell, p.tobuy, p.seuil_stock_alerte, p.desiredstock";
diff --git a/htdocs/product/reassortlot.php b/htdocs/product/reassortlot.php
index 38b16cea44a..ea9901a3794 100644
--- a/htdocs/product/reassortlot.php
+++ b/htdocs/product/reassortlot.php
@@ -179,7 +179,7 @@ if ($fourn_id > 0) {
 }
 // Insert categ filter
 if ($search_categ) {
-	$sql .= " AND cp.fk_categorie = ".$db->escape($search_categ);
+	$sql .= " AND cp.fk_categorie = ".((int) $search_categ);
 }
 if ($search_warehouse) {
 	$sql .= natural_search("e.ref", $search_warehouse);
diff --git a/htdocs/product/stats/bom.php b/htdocs/product/stats/bom.php
index 505bc8ed060..8db7c63d83e 100644
--- a/htdocs/product/stats/bom.php
+++ b/htdocs/product/stats/bom.php
@@ -138,7 +138,7 @@ if ($id > 0 || !empty($ref)) {
 		$sql .= " FROM ".MAIN_DB_PREFIX."bom_bom as b";
 		$sql .= " WHERE ";
 		$sql .= " b.entity IN (".getEntity('bom').")";
-		$sql .= " AND b.fk_product =".$product->id;
+		$sql .= " AND b.fk_product = ".((int) $product->id);
 		$sql .= $db->order($sortfield, $sortorder);
 
 		// Count total nb of records
@@ -184,9 +184,8 @@ if ($id > 0 || !empty($ref)) {
 		$sql .= " SUM(bl.qty) as qty_toconsume";
 		$sql .= " FROM ".MAIN_DB_PREFIX."bom_bom as b";
 		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."bom_bomline as bl ON bl.fk_bom=b.rowid";
-		$sql .= " WHERE ";
-		$sql .= " b.entity IN (".getEntity('bom').")";
-		$sql .= " AND bl.fk_product=".$product->id;
+		$sql .= " WHERE b.entity IN (".getEntity('bom').")";
+		$sql .= " AND bl.fk_product = ".((int) $product->id);
 		$sql .= " GROUP BY b.rowid, b.ref, b.date_valid, b.status";
 		$sql .= $db->order($sortfield, $sortorder);
 
diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php
index 9ba4dee7081..623306536b7 100644
--- a/htdocs/product/stats/commande.php
+++ b/htdocs/product/stats/commande.php
@@ -151,7 +151,7 @@ if ($id > 0 || !empty($ref)) {
 			$sql .= " WHERE c.fk_soc = s.rowid";
 			$sql .= " AND c.entity IN (".getEntity('commande').")";
 			$sql .= " AND d.fk_commande = c.rowid";
-			$sql .= " AND d.fk_product =".$product->id;
+			$sql .= " AND d.fk_product = ".((int) $product->id);
 			if (!empty($search_month)) {
 				$sql .= ' AND MONTH(c.date_commande) IN ('.$db->sanitize($search_month).')';
 			}
@@ -159,7 +159,7 @@ if ($id > 0 || !empty($ref)) {
 				$sql .= ' AND YEAR(c.date_commande) IN ('.$db->sanitize($search_year).')';
 			}
 			if (!$user->rights->societe->client->voir && !$socid) {
-				$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+				$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 			}
 			if ($socid) {
 				$sql .= " AND c.fk_soc = ".((int) $socid);
diff --git a/htdocs/product/stats/commande_fournisseur.php b/htdocs/product/stats/commande_fournisseur.php
index 6037f608b58..e42905811a8 100644
--- a/htdocs/product/stats/commande_fournisseur.php
+++ b/htdocs/product/stats/commande_fournisseur.php
@@ -152,7 +152,7 @@ if ($id > 0 || !empty($ref)) {
 			$sql .= " WHERE c.fk_soc = s.rowid";
 			$sql .= " AND c.entity = ".$conf->entity;
 			$sql .= " AND d.fk_commande = c.rowid";
-			$sql .= " AND d.fk_product =".$product->id;
+			$sql .= " AND d.fk_product = ".((int) $product->id);
 			if (!empty($search_month)) {
 				$sql .= ' AND MONTH(c.date_commande) IN ('.$db->sanitize($search_month).')';
 			}
@@ -160,7 +160,7 @@ if ($id > 0 || !empty($ref)) {
 				$sql .= ' AND YEAR(c.date_commande) IN ('.$db->sanitize($search_year).')';
 			}
 			if (!$user->rights->societe->client->voir && !$socid) {
-				$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+				$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 			}
 			if ($socid) {
 				$sql .= " AND c.fk_soc = ".((int) $socid);
diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php
index f91e74edf50..f71c907a430 100644
--- a/htdocs/product/stats/contrat.php
+++ b/htdocs/product/stats/contrat.php
@@ -142,7 +142,7 @@ if ($id > 0 || !empty($ref)) {
 		$sql .= " WHERE c.rowid = cd.fk_contrat";
 		$sql .= " AND c.fk_soc = s.rowid";
 		$sql .= " AND c.entity IN (".getEntity('contract').")";
-		$sql .= " AND cd.fk_product =".$product->id;
+		$sql .= " AND cd.fk_product = ".((int) $product->id);
 		if (!$user->rights->societe->client->voir && !$socid) {
 			$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 		}
diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php
index 0681aa9b5ca..b8a83e847c2 100644
--- a/htdocs/product/stats/facture.php
+++ b/htdocs/product/stats/facture.php
@@ -168,7 +168,7 @@ if ($id > 0 || !empty($ref)) {
 			$sql .= " WHERE f.fk_soc = s.rowid";
 			$sql .= " AND f.entity IN (".getEntity('invoice').")";
 			$sql .= " AND d.fk_facture = f.rowid";
-			$sql .= " AND d.fk_product =".$product->id;
+			$sql .= " AND d.fk_product = ".((int) $product->id);
 			if (!empty($search_month)) {
 				$sql .= ' AND MONTH(f.datef) IN ('.$db->sanitize($search_month).')';
 			}
diff --git a/htdocs/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php
index 69ef83ae5a7..2ad05313762 100644
--- a/htdocs/product/stats/facture_fournisseur.php
+++ b/htdocs/product/stats/facture_fournisseur.php
@@ -151,7 +151,7 @@ if ($id > 0 || !empty($ref)) {
 			$sql .= " WHERE f.fk_soc = s.rowid";
 			$sql .= " AND f.entity IN (".getEntity('facture_fourn').")";
 			$sql .= " AND d.fk_facture_fourn = f.rowid";
-			$sql .= " AND d.fk_product =".$product->id;
+			$sql .= " AND d.fk_product = ".((int) $product->id);
 			if (!empty($search_month)) {
 				$sql .= ' AND MONTH(f.datef) IN ('.$db->sanitize($search_month).')';
 			}
diff --git a/htdocs/product/stats/mo.php b/htdocs/product/stats/mo.php
index fefb89592e7..81bb29650db 100644
--- a/htdocs/product/stats/mo.php
+++ b/htdocs/product/stats/mo.php
@@ -137,7 +137,7 @@ if ($id > 0 || !empty($ref)) {
 		$sql .= ", ".MAIN_DB_PREFIX."mrp_production as cd";
 		$sql .= " WHERE c.rowid = cd.fk_mo";
 		$sql .= " AND c.entity IN (".getEntity('mo').")";
-		$sql .= " AND cd.fk_product =".$product->id;
+		$sql .= " AND cd.fk_product = ".((int) $product->id);
 		if ($socid) {
 			$sql .= " AND s.rowid = ".((int) $socid);
 		}
diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php
index 96303ac598d..f2a26d4af73 100644
--- a/htdocs/product/stats/propal.php
+++ b/htdocs/product/stats/propal.php
@@ -153,7 +153,7 @@ if ($id > 0 || !empty($ref)) {
 			$sql .= " WHERE p.fk_soc = s.rowid";
 			$sql .= " AND p.entity IN (".getEntity('propal').")";
 			$sql .= " AND d.fk_propal = p.rowid";
-			$sql .= " AND d.fk_product =".$product->id;
+			$sql .= " AND d.fk_product = ".((int) $product->id);
 			if (!empty($search_month)) {
 				$sql .= ' AND MONTH(p.datep) IN ('.$db->sanitize($search_month).')';
 			}
diff --git a/htdocs/product/stats/supplier_proposal.php b/htdocs/product/stats/supplier_proposal.php
index 1b236ed3999..3de03aa73c1 100644
--- a/htdocs/product/stats/supplier_proposal.php
+++ b/htdocs/product/stats/supplier_proposal.php
@@ -152,7 +152,7 @@ if ($id > 0 || !empty($ref)) {
 			$sql .= " WHERE p.fk_soc = s.rowid";
 			$sql .= " AND p.entity IN (".getEntity('supplier_proposal').")";
 			$sql .= " AND d.fk_supplier_proposal = p.rowid";
-			$sql .= " AND d.fk_product =".$product->id;
+			$sql .= " AND d.fk_product = ".((int) $product->id);
 			if (!empty($search_month)) {
 				$sql .= ' AND MONTH(p.datep) IN ('.$db->sanitize($search_month).')';
 			}
diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php
index 91284944397..55ab129edee 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -645,7 +645,7 @@ if ($action == 'create') {
 
 			$sql .= " WHERE ps.fk_product = p.rowid";
 			$sql .= " AND ps.reel <> 0"; // We do not show if stock is 0 (no product in this warehouse)
-			$sql .= " AND ps.fk_entrepot = ".$object->id;
+			$sql .= " AND ps.fk_entrepot = ".((int) $object->id);
 
 			if ($separatedPMP) {
 				$sql .= " AND pa.fk_product = p.rowid AND pa.entity = ". (int) $conf->entity;
diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index 35791bfd158..c7516066e7f 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -293,17 +293,17 @@ class Entrepot extends CommonObject
 		$this->town = trim($this->town);
 		$this->country_id = ($this->country_id > 0 ? $this->country_id : 0);
 
-		$sql = "UPDATE ".MAIN_DB_PREFIX."entrepot ";
+		$sql = "UPDATE ".MAIN_DB_PREFIX."entrepot";
 		$sql .= " SET ref = '".$this->db->escape($this->label)."'";
 		$sql .= ", fk_parent = ".(($this->fk_parent > 0) ? $this->fk_parent : "NULL");
 		$sql .= ", fk_project = ".(($this->fk_project > 0) ? $this->fk_project : "NULL");
 		$sql .= ", description = '".$this->db->escape($this->description)."'";
-		$sql .= ", statut = ".$this->statut;
+		$sql .= ", statut = ".((int) $this->statut);
 		$sql .= ", lieu = '".$this->db->escape($this->lieu)."'";
 		$sql .= ", address = '".$this->db->escape($this->address)."'";
 		$sql .= ", zip = '".$this->db->escape($this->zip)."'";
 		$sql .= ", town = '".$this->db->escape($this->town)."'";
-		$sql .= ", fk_pays = ".$this->country_id;
+		$sql .= ", fk_pays = ".((int) $this->country_id);
 		$sql .= ", phone = '".$this->db->escape($this->phone)."'";
 		$sql .= ", fax = '".$this->db->escape($this->fax)."'";
 		$sql .= " WHERE rowid = ".((int) $id);
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 0220df610e4..ef1393dfb63 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -951,7 +951,7 @@ if (!$variants) {
 	$sql .= " WHERE ps.reel != 0";
 	$sql .= " AND ps.fk_entrepot = e.rowid";
 	$sql .= " AND e.entity IN (".getEntity('stock').")";
-	$sql .= " AND ps.fk_product = ".$object->id;
+	$sql .= " AND ps.fk_product = ".((int) $object->id);
 	$sql .= " ORDER BY e.ref";
 
 	$entrepotstatic = new Entrepot($db);
diff --git a/htdocs/product/stock/stockatdate.php b/htdocs/product/stock/stockatdate.php
index 52addeba637..77923d9e7c9 100644
--- a/htdocs/product/stock/stockatdate.php
+++ b/htdocs/product/stock/stockatdate.php
@@ -136,10 +136,10 @@ if ($date && $dateIsValid) {	// Avoid heavy sql if mandatory date is not defined
 		$sql .= " AND w.statut IN (".$db->sanitize(implode(',', $warehouseStatus)).")";
 	}
 	if ($productid > 0) {
-		$sql .= " AND ps.fk_product = ".$productid;
+		$sql .= " AND ps.fk_product = ".((int) $productid);
 	}
 	if ($fk_warehouse > 0) {
-		$sql .= " AND ps.fk_entrepot = ".$fk_warehouse;
+		$sql .= " AND ps.fk_entrepot = ".((int) $fk_warehouse);
 	}
 	$sql .= " GROUP BY fk_product, fk_entrepot";
 	//print $sql;
diff --git a/htdocs/projet/activity/index.php b/htdocs/projet/activity/index.php
index 0191cc74ef8..60484eb4f17 100644
--- a/htdocs/projet/activity/index.php
+++ b/htdocs/projet/activity/index.php
@@ -425,7 +425,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_SH
 		$sql .= " AND ect.fk_c_type_contact IN (".$db->sanitize(join(',', array_keys($listoftaskcontacttype))).") AND ect.element_id = t.rowid AND ect.fk_socpeople = ".$user->id;
 	}
 	if ($socid) {
-		$sql .= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
+		$sql .= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".((int) $socid).")";
 	}
 	$sql .= " AND p.fk_statut=1";
 	$sql .= " GROUP BY p.ref, p.title, p.rowid, p.fk_statut, p.fk_opp_status, p.public, t.label, t.rowid, t.planned_workload, t.duration_effective, t.progress, t.dateo, t.datee";
diff --git a/htdocs/projet/class/api_projects.class.php b/htdocs/projet/class/api_projects.class.php
index b0b94264fb0..38f525626ba 100644
--- a/htdocs/projet/class/api_projects.class.php
+++ b/htdocs/projet/class/api_projects.class.php
@@ -146,7 +146,7 @@ class Projects extends DolibarrApi
 		}
 		// Select projects of given category
 		if ($category > 0) {
-			$sql .= " AND c.fk_categorie = ".$this->db->escape($category)." AND c.fk_project = t.rowid ";
+			$sql .= " AND c.fk_categorie = ".((int) $category)." AND c.fk_project = t.rowid ";
 		}
 		// Add sql filters
 		if ($sqlfilters) {
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 851703ce96b..e381aaabfb3 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -486,7 +486,7 @@ class Project extends CommonObject
 			$sql .= ", title = '".$this->db->escape($this->title)."'";
 			$sql .= ", description = '".$this->db->escape($this->description)."'";
 			$sql .= ", fk_soc = ".($this->socid > 0 ? $this->socid : "null");
-			$sql .= ", fk_statut = ".$this->statut;
+			$sql .= ", fk_statut = ".((int) $this->statut);
 			$sql .= ", fk_opp_status = ".((is_numeric($this->opp_status) && $this->opp_status > 0) ? $this->opp_status : 'null');
 			$sql .= ", opp_percent = ".((is_numeric($this->opp_percent) && $this->opp_percent != '') ? $this->opp_percent : 'null');
 			$sql .= ", public = ".($this->public ? 1 : 0);
@@ -1777,13 +1777,13 @@ class Project extends CommonObject
 
 		if ($tableName == "actioncomm") {
 			$sql .= " SET fk_project=".$this->id;
-			$sql .= " WHERE id=".$elementSelectId;
+			$sql .= " WHERE id=".((int) $elementSelectId);
 		} elseif ($tableName == "entrepot") {
 			$sql .= " SET fk_project=".$this->id;
-			$sql .= " WHERE rowid=".$elementSelectId;
+			$sql .= " WHERE rowid=".((int) $elementSelectId);
 		} else {
 			$sql .= " SET fk_projet=".$this->id;
-			$sql .= " WHERE rowid=".$elementSelectId;
+			$sql .= " WHERE rowid=".((int) $elementSelectId);
 		}
 
 		dol_syslog(get_class($this)."::update_element", LOG_DEBUG);
@@ -1813,10 +1813,10 @@ class Project extends CommonObject
 
 		if ($tableName == "actioncomm") {
 			$sql .= " SET fk_project=NULL";
-			$sql .= " WHERE id=".$elementSelectId;
+			$sql .= " WHERE id=".((int) $elementSelectId);
 		} else {
 			$sql .= " SET ".$projectfield."=NULL";
-			$sql .= " WHERE rowid=".$elementSelectId;
+			$sql .= " WHERE rowid=".((int) $elementSelectId);
 		}
 
 		dol_syslog(get_class($this)."::remove_element", LOG_DEBUG);
@@ -1888,10 +1888,10 @@ class Project extends CommonObject
 		$sql .= " AND (ptt.task_date >= '".$this->db->idate($datestart)."' ";
 		$sql .= " AND ptt.task_date <= '".$this->db->idate(dol_time_plus_duree($datestart, 1, 'w') - 1)."')";
 		if ($taskid) {
-			$sql .= " AND ptt.fk_task=".$taskid;
+			$sql .= " AND ptt.fk_task=".((int) $taskid);
 		}
 		if (is_numeric($userid)) {
-			$sql .= " AND ptt.fk_user=".$userid;
+			$sql .= " AND ptt.fk_user=".((int) $userid);
 		}
 
 		//print $sql;
@@ -1951,10 +1951,10 @@ class Project extends CommonObject
 		$sql .= " AND (ptt.task_date >= '".$this->db->idate($datestart)."' ";
 		$sql .= " AND ptt.task_date <= '".$this->db->idate(dol_time_plus_duree($datestart, 1, 'm') - 1)."')";
 		if ($task_id) {
-			$sql .= " AND ptt.fk_task=".$taskid;
+			$sql .= " AND ptt.fk_task=".((int) $taskid);
 		}
 		if (is_numeric($userid)) {
-			$sql .= " AND ptt.fk_user=".$userid;
+			$sql .= " AND ptt.fk_user=".((int) $userid);
 		}
 
 		//print $sql;
diff --git a/htdocs/projet/class/projectstats.class.php b/htdocs/projet/class/projectstats.class.php
index 42c5ae2135f..1845e303704 100644
--- a/htdocs/projet/class/projectstats.class.php
+++ b/htdocs/projet/class/projectstats.class.php
@@ -68,7 +68,7 @@ class ProjectStats extends Stats
 		$sql .= ", ".MAIN_DB_PREFIX."c_lead_status as cls";
 		$sql .= $this->buildWhere();
 		// For external user, no check is done on company permission because readability is managed by public status of project and assignement.
-		//if ($socid > 0) $sql.= " AND t.fk_soc = ".$socid;
+		//if ($socid > 0) $sql.= " AND t.fk_soc = ".((int) $socid);
 		// No check is done on company permission because readability is managed by public status of project and assignement.
 		//if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND ((s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id.") OR (s.rowid IS NULL))";
 		$sql .= " AND t.fk_opp_status = cls.rowid";
@@ -133,7 +133,7 @@ class ProjectStats extends Stats
 		//	$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user=" . $user->id;
 		$sql .= $this->buildWhere();
 		// For external user, no check is done on company permission because readability is managed by public status of project and assignement.
-		//if ($socid > 0) $sql.= " AND t.fk_soc = ".$socid;
+		//if ($socid > 0) $sql.= " AND t.fk_soc = ".((int) $socid);
 		// No check is done on company permission because readability is managed by public status of project and assignement.
 		//if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND ((s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id.") OR (s.rowid IS NULL))";
 		$sql .= " GROUP BY year";
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index 9f81218ba8d..bd25398776e 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -854,7 +854,7 @@ class Task extends CommonObject
 			$sql .= " AND p.rowid = ec.element_id";
 			$sql .= " AND ctc.rowid = ec.fk_c_type_contact";
 			$sql .= " AND ctc.element = 'project'";
-			$sql .= " AND ec.fk_socpeople = ".$filteronprojuser;
+			$sql .= " AND ec.fk_socpeople = ".((int) $filteronprojuser);
 			$sql .= " AND ec.statut = 4";
 			$sql .= " AND ctc.source = 'internal'";
 		}
@@ -863,12 +863,12 @@ class Task extends CommonObject
 			$sql .= " AND p.rowid = ec2.element_id";
 			$sql .= " AND ctc2.rowid = ec2.fk_c_type_contact";
 			$sql .= " AND ctc2.element = 'project_task'";
-			$sql .= " AND ec2.fk_socpeople = ".$filterontaskuser;
+			$sql .= " AND ec2.fk_socpeople = ".((int) $filterontaskuser);
 			$sql .= " AND ec2.statut = 4";
 			$sql .= " AND ctc2.source = 'internal'";
 		}
 		if ($socid) {
-			$sql .= " AND p.fk_soc = ".$socid;
+			$sql .= " AND p.fk_soc = ".((int) $socid);
 		}
 		if ($projectid) {
 			$sql .= " AND p.rowid IN (".$this->db->sanitize($projectid).")";
@@ -1525,10 +1525,10 @@ class Task extends CommonObject
 		$sql .= " task_date = '".$this->db->idate($this->timespent_date)."',";
 		$sql .= " task_datehour = '".$this->db->idate($this->timespent_datehour)."',";
 		$sql .= " task_date_withhour = ".(empty($this->timespent_withhour) ? 0 : 1).",";
-		$sql .= " task_duration = ".$this->timespent_duration.",";
-		$sql .= " fk_user = ".$this->timespent_fk_user.",";
+		$sql .= " task_duration = ".((int) $this->timespent_duration).",";
+		$sql .= " fk_user = ".((int) $this->timespent_fk_user).",";
 		$sql .= " note = ".(isset($this->timespent_note) ? "'".$this->db->escape($this->timespent_note)."'" : "null");
-		$sql .= " WHERE rowid = ".$this->timespent_id;
+		$sql .= " WHERE rowid = ".((int) $this->timespent_id);
 
 		dol_syslog(get_class($this)."::updateTimeSpent", LOG_DEBUG);
 		if ($this->db->query($sql)) {
@@ -2082,7 +2082,7 @@ class Task extends CommonObject
 		// No need to check company, as filtering of projects must be done by getProjectsAuthorizedForUser
 		//if ($socid || ! $user->rights->societe->client->voir)	$sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
 		if ($socid) {
-			$sql .= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
+			$sql .= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".((int) $socid).")";
 		}
 		if (!$user->rights->societe->client->voir && !$socid) {
 			$sql .= " AND ((s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id.") OR (s.rowid IS NULL))";
diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php
index d8c875d2933..aa9d9a8a437 100644
--- a/htdocs/projet/index.php
+++ b/htdocs/projet/index.php
@@ -213,7 +213,7 @@ if ($mine || empty($user->rights->projet->all->lire)) {
 	$sql .= " AND p.rowid IN (".$db->sanitize($projectsListId).")"; // If we have this test true, it also means projectset is not 2
 }
 if ($socid) {
-	$sql .= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
+	$sql .= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".((int) $socid).")";
 }
 $sql .= " ORDER BY p.tms DESC";
 $sql .= $db->plimit($max, 0);
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index aa1229ccb42..c95ae10e79a 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -402,12 +402,12 @@ if ($search_status >= 0) {
 	if ($search_status == 99) {
 		$sql .= " AND p.fk_statut <> 2";
 	} else {
-		$sql .= " AND p.fk_statut = ".$db->escape($search_status);
+		$sql .= " AND p.fk_statut = ".((int) $search_status);
 	}
 }
 if ($search_opp_status) {
 	if (is_numeric($search_opp_status) && $search_opp_status > 0) {
-		$sql .= " AND p.fk_opp_status = ".$db->escape($search_opp_status);
+		$sql .= " AND p.fk_opp_status = ".((int) $search_opp_status);
 	}
 	if ($search_opp_status == 'all') {
 		$sql .= " AND (p.fk_opp_status IS NOT NULL AND p.fk_opp_status <> -1)";
@@ -423,7 +423,7 @@ if ($search_opp_status) {
 	}
 }
 if ($search_public != '') {
-	$sql .= " AND p.public = ".$db->escape($search_public);
+	$sql .= " AND p.public = ".((int) $search_public);
 }
 // For external user, no check is done on company permission because readability is managed by public status of project and assignement.
 //if ($socid > 0) $sql.= " AND s.rowid = ".((int) $socid);
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index e842b409eae..bbb7b1e51f9 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -39,6 +39,7 @@ $massaction = GETPOST('massaction', 'alpha');
 $show_files = GETPOST('show_files', 'int');
 $confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
+$optioncss = GETPOST('optioncss', 'aZ09');
 
 $id = GETPOST('id', 'int');
 
@@ -382,12 +383,9 @@ if ($search_projectstatus >= 0) {
 	if ($search_projectstatus == 99) {
 		$sql .= " AND p.fk_statut <> 2";
 	} else {
-		$sql .= " AND p.fk_statut = ".$db->escape($search_projectstatus);
+		$sql .= " AND p.fk_statut = ".((int) $search_projectstatus);
 	}
 }
-if ($search_public != '') {
-	$sql .= " AND p.public = ".$db->escape($search_public);
-}
 if ($search_project_user > 0) {
 	$sql .= " AND ecp.fk_c_type_contact IN (".$db->sanitize(join(',', array_keys($listofprojectcontacttype))).") AND ecp.element_id = p.rowid AND ecp.fk_socpeople = ".$search_project_user;
 }
@@ -512,9 +510,6 @@ if ($search_projectstatus != '') {
 if ((is_numeric($search_opp_status) && $search_opp_status >= 0) || in_array($search_opp_status, array('all', 'none'))) {
 	$param .= '&search_opp_status='.urlencode($search_opp_status);
 }
-if ($search_public != '') {
-	$param .= '&search_public='.urlencode($search_public);
-}
 if ($search_project_user != '') {
 	$param .= '&search_project_user='.urlencode($search_project_user);
 }
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 01622a41945..a9316bcedcd 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -1043,7 +1043,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0) {
 		$sql .= " ".MAIN_DB_PREFIX."projet_task as pt, ".MAIN_DB_PREFIX."user as u";
 		$sql .= " WHERE t.fk_user = u.rowid AND t.fk_task = pt.rowid";
 		if (empty($projectidforalltimes)) {
-			$sql .= " AND t.fk_task =".$object->id;
+			$sql .= " AND t.fk_task =".((int) $object->id);
 		} else {
 			$sql .= " AND pt.fk_projet IN (".$db->sanitize($projectidforalltimes).")";
 		}
diff --git a/htdocs/public/emailing/mailing-unsubscribe.php b/htdocs/public/emailing/mailing-unsubscribe.php
index 9c39dafa18d..6648bafd07a 100644
--- a/htdocs/public/emailing/mailing-unsubscribe.php
+++ b/htdocs/public/emailing/mailing-unsubscribe.php
@@ -127,7 +127,7 @@ if (!empty($tag) && ($unsuscrib == '1')) {
 
 	// Update status of mail in recipient mailing list table
 	$statut = '3';
-	$sql = "UPDATE ".MAIN_DB_PREFIX."mailing_cibles SET statut=".$statut." WHERE tag='".$db->escape($tag)."'";
+	$sql = "UPDATE ".MAIN_DB_PREFIX."mailing_cibles SET statut=".((int) $statut)." WHERE tag = '".$db->escape($tag)."'";
 
 	$resql = $db->query($sql);
 	if (!$resql) {
diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php
index cd34b0f916f..531fdf9c23a 100644
--- a/htdocs/reception/card.php
+++ b/htdocs/reception/card.php
@@ -1699,10 +1699,10 @@ if ($action == 'create') {
 			//if ($conf->delivery_note->enabled) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."delivery as l ON l.fk_reception = e.rowid LEFT JOIN ".MAIN_DB_PREFIX."deliverydet as ld ON ld.fk_delivery = l.rowid  AND obj.rowid = ld.fk_origin_line";
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON obj.fk_product = p.rowid";
 			$sql .= " WHERE e.entity IN (".getEntity('reception').")";
-			$sql .= " AND obj.fk_commande = ".$origin_id;
+			$sql .= " AND obj.fk_commande = ".((int) $origin_id);
 			$sql .= " AND obj.rowid = ed.fk_commandefourndet";
 			$sql .= " AND ed.fk_reception = e.rowid";
-			$sql .= " AND ed.fk_reception !=".$object->id;
+			$sql .= " AND ed.fk_reception !=".(int) $object->id);
 			//if ($filter) $sql.= $filter;
 			$sql .= " ORDER BY obj.fk_product";
 
diff --git a/htdocs/reception/index.php b/htdocs/reception/index.php
index 9eadc3be41a..7cb26dee0ca 100644
--- a/htdocs/reception/index.php
+++ b/htdocs/reception/index.php
@@ -94,7 +94,7 @@ if (!$user->rights->societe->client->voir && !$socid) {
 $sql .= $clause." e.fk_statut = 0";
 $sql .= " AND e.entity IN (".getEntity('reception').")";
 if ($socid) {
-	$sql .= " AND c.fk_soc = ".$socid;
+	$sql .= " AND c.fk_soc = ".((int) $socid);
 }
 
 $resql = $db->query($sql);
@@ -160,7 +160,7 @@ if (!$user->rights->societe->client->voir && !$socid) {
 }
 $sql .= " AND e.fk_statut = 1";
 if ($socid) {
-	$sql .= " AND c.fk_soc = ".$socid;
+	$sql .= " AND c.fk_soc = ".((int) $socid);
 }
 $sql .= " ORDER BY e.date_delivery DESC";
 $sql .= $db->plimit($max, 0);
@@ -219,7 +219,7 @@ $sql .= " WHERE c.fk_soc = s.rowid";
 $sql .= " AND c.entity IN (".getEntity('supplier_order').")";
 $sql .= " AND c.fk_statut IN (".CommandeFournisseur::STATUS_ORDERSENT.", ".CommandeFournisseur::STATUS_RECEIVED_PARTIALLY.")";
 if ($socid > 0) {
-	$sql .= " AND c.fk_soc = ".$socid;
+	$sql .= " AND c.fk_soc = ".((int) $socid);
 }
 if (!$user->rights->societe->client->voir && !$socid) {
 	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
diff --git a/htdocs/reception/list.php b/htdocs/reception/list.php
index 7295b3df75a..a6ecd37cc6d 100644
--- a/htdocs/reception/list.php
+++ b/htdocs/reception/list.php
@@ -454,10 +454,10 @@ if (!$user->rights->societe->client->voir && !$socid) {	// Internal user with no
 	$sql .= " AND sc.fk_user = ".$user->id;
 }
 if ($socid) {
-	$sql .= " AND e.fk_soc = ".$socid;
+	$sql .= " AND e.fk_soc = ".((int) $socid);
 }
 if ($search_status <> '' && $search_status >= 0) {
-	$sql .= " AND e.fk_statut = ".$search_status;
+	$sql .= " AND e.fk_statut = ".((int) $search_status);
 }
 if ($search_billed != '' && $search_billed >= 0) {
 	$sql .= ' AND e.billed = '.((int) $search_billed);
diff --git a/htdocs/recruitment/recruitmentindex.php b/htdocs/recruitment/recruitmentindex.php
index 7e369fe6bb2..d3f97e6f3d1 100644
--- a/htdocs/recruitment/recruitmentindex.php
+++ b/htdocs/recruitment/recruitmentindex.php
@@ -255,7 +255,7 @@ if (! empty($conf->recruitment->enabled) && $user->rights->recruitment->read)
 	$sql.= " AND c.fk_statut = 0";
 	$sql.= " AND c.entity IN (".getEntity('commande').")";
 	if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-	if ($socid)	$sql.= " AND c.fk_soc = ".$socid;
+	if ($socid)	$sql.= " AND c.fk_soc = ".((int) $socid);
 
 	$resql = $db->query($sql);
 	if ($resql)
diff --git a/htdocs/resource/class/dolresource.class.php b/htdocs/resource/class/dolresource.class.php
index 4979a883d9c..91f68951842 100644
--- a/htdocs/resource/class/dolresource.class.php
+++ b/htdocs/resource/class/dolresource.class.php
@@ -200,7 +200,7 @@ class Dolresource extends CommonObject
 		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as t";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_type_resource as ty ON ty.code=t.fk_code_type_resource";
 		if ($id) {
-			$sql .= " WHERE t.rowid = ".$this->db->escape($id);
+			$sql .= " WHERE t.rowid = ".((int) $id);
 		} else {
 			$sql .= " WHERE t.ref = '".$this->db->escape($ref)."'";
 		}
@@ -415,7 +415,7 @@ class Dolresource extends CommonObject
 		dol_syslog(get_class($this), LOG_DEBUG);
 		if ($this->db->query($sql)) {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."element_resources";
-			$sql .= " WHERE element_type='resource' AND resource_id =".$this->db->escape($rowid);
+			$sql .= " WHERE element_type='resource' AND resource_id = ".((int) $rowid);
 			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if (!$resql) {
@@ -831,7 +831,7 @@ class Dolresource extends CommonObject
 		// Links beetween objects are stored in this table
 		$sql = 'SELECT rowid, resource_id, resource_type, busy, mandatory';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'element_resources';
-		$sql .= " WHERE element_id=".$element_id." AND element_type='".$this->db->escape($element)."'";
+		$sql .= " WHERE element_id=".((int) $element_id)." AND element_type='".$this->db->escape($element)."'";
 		if ($resource_type) {
 			$sql .= " AND resource_type LIKE '%".$this->db->escape($resource_type)."%'";
 		}
diff --git a/htdocs/salaries/class/salary.class.php b/htdocs/salaries/class/salary.class.php
index e7f1af66e0c..2f87fdd99d2 100644
--- a/htdocs/salaries/class/salary.class.php
+++ b/htdocs/salaries/class/salary.class.php
@@ -132,14 +132,13 @@ class Salary extends CommonObject
 
 		// Update request
 		$sql = "UPDATE ".MAIN_DB_PREFIX."salary SET";
-
 		$sql .= " tms='".$this->db->idate(dol_now())."',";
-		$sql .= " fk_user=".$this->fk_user.",";
+		$sql .= " fk_user=".((int) $this->fk_user).",";
 		/*$sql .= " datep='".$this->db->idate($this->datep)."',";
 		$sql .= " datev='".$this->db->idate($this->datev)."',";*/
 		$sql .= " amount=".price2num($this->amount).",";
 		$sql .= " fk_projet=".((int) $this->fk_project).",";
-		$sql .= " fk_typepayment=".$this->type_payment.",";
+		$sql .= " fk_typepayment=".((int) $this->type_payment).",";
 		$sql .= " label='".$this->db->escape($this->label)."',";
 		$sql .= " datesp='".$this->db->idate($this->datesp)."',";
 		$sql .= " dateep='".$this->db->idate($this->dateep)."',";
@@ -147,7 +146,6 @@ class Salary extends CommonObject
 		$sql .= " fk_bank=".($this->fk_bank > 0 ? (int) $this->fk_bank : "null").",";
 		$sql .= " fk_user_author=".((int) $this->fk_user_author).",";
 		$sql .= " fk_user_modif=".($this->fk_user_modif > 0 ? (int) $this->fk_user_modif : (int) $user->id);
-
 		$sql .= " WHERE rowid=".((int) $this->id);
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
diff --git a/htdocs/salaries/list.php b/htdocs/salaries/list.php
index 382e05e4f0d..b4abbb04a26 100644
--- a/htdocs/salaries/list.php
+++ b/htdocs/salaries/list.php
@@ -273,10 +273,10 @@ if ($search_account > 0) {
 	$sql .= " AND s.fk_account=".((int) $search_account);
 }
 if ($search_status != '' && $search_status >= 0) {
-	$sql .= " AND s.paye = ".$db->escape($search_status);
+	$sql .= " AND s.paye = ".((int) $search_status);
 }
 if ($search_type_id) {
-	$sql .= " AND s.fk_typepayment=".$search_type_id;
+	$sql .= " AND s.fk_typepayment=".((int) $search_type_id);
 }
 $sql .= " GROUP BY u.rowid, u.lastname, u.firstname, u.login, u.email, u.admin, u.salary, u.fk_soc, u.statut,";
 $sql .= " s.rowid, s.fk_account, s.paye, s.fk_user, s.amount, s.salary, s.label, s.datesp, s.dateep, s.fk_typepayment, s.fk_bank,";
diff --git a/htdocs/salaries/payments.php b/htdocs/salaries/payments.php
index f0602e88a5c..7af7fa4d986 100644
--- a/htdocs/salaries/payments.php
+++ b/htdocs/salaries/payments.php
@@ -218,7 +218,7 @@ if ($search_fk_bank)			$sql .= " AND s.fk_bank=".((int) $search_fk_bank);
 if ($search_chq_number)		$sql .= natural_search(array('s.num_payment'), $search_chq_number);
 
 if ($search_type_id > 0) {
-	$sql .= " AND s.fk_typepayment=".$search_type_id;
+	$sql .= " AND s.fk_typepayment=".((int) $search_type_id);
 }
 $sql .= $db->order($sortfield, $sortorder);
 
diff --git a/htdocs/societe/class/api_contacts.class.php b/htdocs/societe/class/api_contacts.class.php
index f62fb894bd0..f8cd7f9d7ea 100644
--- a/htdocs/societe/class/api_contacts.class.php
+++ b/htdocs/societe/class/api_contacts.class.php
@@ -210,7 +210,7 @@ class Contacts extends DolibarrApi
 
 		// Select contacts of given category
 		if ($category > 0) {
-			$sql .= " AND c.fk_categorie = ".$this->db->escape($category);
+			$sql .= " AND c.fk_categorie = ".((int) $category);
 			$sql .= " AND c.fk_socpeople = t.rowid ";
 		}
 
diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index 253a35e710c..0257b692b62 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -178,11 +178,11 @@ class Thirdparties extends DolibarrApi
 		// Select thirdparties of given category
 		if ($category > 0) {
 			if (!empty($mode) && $mode != 4) {
-				$sql .= " AND c.fk_categorie = ".$this->db->escape($category)." AND c.fk_soc = t.rowid";
+				$sql .= " AND c.fk_categorie = ".((int) $category)." AND c.fk_soc = t.rowid";
 			} elseif (!empty($mode) && $mode == 4) {
-				$sql .= " AND cc.fk_categorie = ".$this->db->escape($category)." AND cc.fk_soc = t.rowid";
+				$sql .= " AND cc.fk_categorie = ".((int) $category)." AND cc.fk_soc = t.rowid";
 			} else {
-				$sql .= " AND ((c.fk_categorie = ".$this->db->escape($category)." AND c.fk_soc = t.rowid) OR (cc.fk_categorie = ".$this->db->escape($category)." AND cc.fk_soc = t.rowid))";
+				$sql .= " AND ((c.fk_categorie = ".((int) $category)." AND c.fk_soc = t.rowid) OR (cc.fk_categorie = ".((int) $category)." AND cc.fk_soc = t.rowid))";
 			}
 		}
 
diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php
index 3e410019b22..6c52359979e 100644
--- a/htdocs/societe/class/companybankaccount.class.php
+++ b/htdocs/societe/class/companybankaccount.class.php
@@ -156,10 +156,10 @@ class CompanyBankAccount extends Account
 		$sql .= ",cle_rib='".$this->db->escape($this->cle_rib)."'";
 		$sql .= ",bic='".$this->db->escape($this->bic)."'";
 		$sql .= ",iban_prefix = '".$this->db->escape($this->iban)."'";
-		$sql .= ",domiciliation='".$this->db->escape($this->domiciliation)."'";
+		$sql .= ",domiciliation = '".$this->db->escape($this->domiciliation)."'";
 		$sql .= ",proprio = '".$this->db->escape($this->proprio)."'";
 		$sql .= ",owner_address = '".$this->db->escape($this->owner_address)."'";
-		$sql .= ",default_rib = ".$this->default_rib;
+		$sql .= ",default_rib = ".((int) $this->default_rib);
 		if ($conf->prelevement->enabled) {
 			$sql .= ",frstrecur = '".$this->db->escape($this->frstrecur)."'";
 			$sql .= ",rum = '".$this->db->escape($this->rum)."'";
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 97723f83f37..149801a65e2 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1386,7 +1386,7 @@ class Societe extends CommonObject
 
 			$sql .= ",tva_assuj = ".($this->tva_assuj != '' ? "'".$this->db->escape($this->tva_assuj)."'" : "null");
 			$sql .= ",tva_intra = '".$this->db->escape($this->tva_intra)."'";
-			$sql .= ",status = ".$this->status;
+			$sql .= ",status = ".((int) $this->status);
 
 			// Local taxes
 			$sql .= ",localtax1_assuj = ".($this->localtax1_assuj != '' ? "'".$this->db->escape($this->localtax1_assuj)."'" : "null");
@@ -1449,7 +1449,7 @@ class Societe extends CommonObject
 			$sql .= ",webservices_key = ".(!empty($this->webservices_key) ? "'".$this->db->escape($this->webservices_key)."'" : "null");
 
 			//Incoterms
-			$sql .= ", fk_incoterms = ".$this->fk_incoterms;
+			$sql .= ", fk_incoterms = ".((int) $this->fk_incoterms);
 			$sql .= ", location_incoterms = ".(!empty($this->location_incoterms) ? "'".$this->db->escape($this->location_incoterms)."'" : "null");
 
 			if ($customer) {
@@ -3941,8 +3941,8 @@ class Societe extends CommonObject
 			}
 
 			$sql = "UPDATE ".MAIN_DB_PREFIX."adherent";
-			$sql .= " SET fk_soc=".$this->id;
-			$sql .= " WHERE rowid=".$member->id;
+			$sql .= " SET fk_soc = ".((int) $this->id);
+			$sql .= " WHERE rowid = ".((int) $member->id);
 
 			$resql = $this->db->query($sql);
 			if ($resql) {
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index bf39dbc608c..5935ac43b70 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -288,7 +288,7 @@ if ($action == "change") {	// Change customer for TakePOS
 		$invoice->module_source = 'takepos';
 		$invoice->pos_source = $_SESSION["takeposterminal"];
 		$placeid = $invoice->create($user);
-		$sql = "UPDATE ".MAIN_DB_PREFIX."facture set ref='(PROV-POS".$_SESSION["takeposterminal"]."-".$place.")' where rowid=".$placeid;
+		$sql = "UPDATE ".MAIN_DB_PREFIX."facture set ref='(PROV-POS".$_SESSION["takeposterminal"]."-".$place.")' where rowid = ".((int) $placeid);
 		$db->query($sql);
 	}
 
@@ -526,13 +526,13 @@ if (!$user->rights->fournisseur->lire) {
 if ($search_sale == -2) {
 	$sql .= " AND sc.fk_user IS NULL";
 } elseif ($search_sale > 0) {
-	$sql .= " AND sc.fk_user = ".$db->escape($search_sale);
+	$sql .= " AND sc.fk_user = ".((int) $search_sale);
 }
 if ($search_categ_cus > 0) {
-	$sql .= " AND cc.fk_categorie = ".$db->escape($search_categ_cus);
+	$sql .= " AND cc.fk_categorie = ".((int) $search_categ_cus);
 }
 if ($search_categ_sup > 0) {
-	$sql .= " AND cs.fk_categorie = ".$db->escape($search_categ_sup);
+	$sql .= " AND cs.fk_categorie = ".((int) $search_categ_sup);
 }
 if ($search_categ_cus == -2) {
 	$sql .= " AND cc.fk_categorie IS NULL";
@@ -667,7 +667,7 @@ $parameters = array('socid' => $socid);
 $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
 if (empty($reshook)) {
 	if ($socid) {
-		$sql .= " AND s.rowid = ".$socid;
+		$sql .= " AND s.rowid = ".((int) $socid);
 	}
 }
 $sql .= $hookmanager->resPrint;
diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php
index 55ae070363a..7e4a1084ec1 100644
--- a/htdocs/societe/notify/card.php
+++ b/htdocs/societe/notify/card.php
@@ -34,8 +34,8 @@ $langs->loadLangs(array("companies", "mails", "admin", "other", "errors"));
 
 $socid     = GETPOST("socid", 'int');
 $action    = GETPOST('action', 'aZ09');
-$contactid = GETPOST('contactid'); // May be an int or 'thirdparty'
-$actionid  = GETPOST('actionid');
+$contactid = GETPOST('contactid', 'alpha'); // May be an int or 'thirdparty'
+$actionid  = GETPOST('actionid', 'int');
 $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 
 // Security check
@@ -98,10 +98,10 @@ if (empty($reshook)) {
 			$db->begin();
 
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."notify_def";
-			$sql .= " WHERE fk_soc=".$socid." AND fk_contact=".$contactid." AND fk_action=".$actionid;
+			$sql .= " WHERE fk_soc=".((int) $socid)." AND fk_contact=".((int) $contactid)." AND fk_action=".((int) $actionid);
 			if ($db->query($sql)) {
 				$sql = "INSERT INTO ".MAIN_DB_PREFIX."notify_def (datec,fk_soc, fk_contact, fk_action)";
-				$sql .= " VALUES ('".$db->idate($now)."',".$socid.",".$contactid.",".$actionid.")";
+				$sql .= " VALUES ('".$db->idate($now)."',".((int) $socid).",".((int) $contactid).",".((int) $actionid).")";
 
 				if (!$db->query($sql)) {
 					$error++;
@@ -230,7 +230,7 @@ if ($result > 0) {
 	$sql .= " ".MAIN_DB_PREFIX."socpeople c";
 	$sql .= " WHERE a.rowid = n.fk_action";
 	$sql .= " AND c.rowid = n.fk_contact";
-	$sql .= " AND c.fk_soc = ".$object->id;
+	$sql .= " AND c.fk_soc = ".((int) $object->id);
 
 	$resql = $db->query($sql);
 	if ($resql) {
@@ -399,7 +399,7 @@ if ($result > 0) {
 	$sql .= " ".MAIN_DB_PREFIX."notify as n ";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as c ON n.fk_contact = c.rowid";
 	$sql .= " WHERE a.rowid = n.fk_action";
-	$sql .= " AND n.fk_soc = ".$object->id;
+	$sql .= " AND n.fk_soc = ".((int) $object->id);
 	$sql .= $db->order($sortfield, $sortorder);
 
 	// Count total nb of records
diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php
index ed392c0c0a1..2d2869fd1cc 100644
--- a/htdocs/societe/paymentmodes.php
+++ b/htdocs/societe/paymentmodes.php
@@ -977,8 +977,8 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 
 			$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX."societe_rib";
 			$sql .= " WHERE type in ('card')";
-			$sql .= " AND fk_soc = ".$object->id;
-			$sql .= " AND status = ".$servicestatus;
+			$sql .= " AND fk_soc = ".((int) $object->id);
+			$sql .= " AND status = ".((int) $servicestatus);
 
 			$resql = $db->query($sql);
 			if ($resql) {
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index 47793509bab..5906db24ee7 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -3211,7 +3211,7 @@ class SupplierProposalLine extends CommonObjectLine
 		$sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposaldet SET";
 		$sql .= " description='".$this->db->escape($this->desc)."'";
 		$sql .= " , label=".(!empty($this->label) ? "'".$this->db->escape($this->label)."'" : "null");
-		$sql .= " , product_type=".$this->product_type;
+		$sql .= " , product_type=".((int) $this->product_type);
 		$sql .= " , date_start=".($this->date_start ? "'".$this->db->idate($this->date_start)."'" : "null");
 		$sql .= " , date_end=".($this->date_end ? "'".$this->db->idate($this->date_end)."'" : "null");
 		$sql .= " , tva_tx='".price2num($this->tva_tx)."'";
@@ -3233,11 +3233,11 @@ class SupplierProposalLine extends CommonObjectLine
 		$sql .= " , fk_product_fournisseur_price=".(!empty($this->fk_fournprice) ? "'".$this->db->escape($this->fk_fournprice)."'" : "null");
 		$sql .= " , buy_price_ht=".price2num($this->pa_ht);
 		if (strlen($this->special_code)) {
-			$sql .= " , special_code=".$this->special_code;
+			$sql .= " , special_code=".((int) $this->special_code);
 		}
 		$sql .= " , fk_parent_line=".($this->fk_parent_line > 0 ? $this->fk_parent_line : "null");
 		if (!empty($this->rang)) {
-			$sql .= ", rang=".$this->rang;
+			$sql .= ", rang=".((int) $this->rang);
 		}
 		$sql .= " , ref_fourn=".(!empty($this->ref_fourn) ? "'".$this->db->escape($this->ref_fourn)."'" : "null");
 		$sql .= " , fk_unit=".($this->fk_unit ? $this->fk_unit : 'null');
diff --git a/htdocs/supplier_proposal/index.php b/htdocs/supplier_proposal/index.php
index 75eba410d0f..85f5f96c1af 100644
--- a/htdocs/supplier_proposal/index.php
+++ b/htdocs/supplier_proposal/index.php
@@ -173,7 +173,7 @@ if (!empty($conf->supplier_proposal->enabled)) {
 	$sql .= " AND c.entity = ".$conf->entity;
 	$sql .= " AND c.fk_statut = 0";
 	if ($socid) {
-		$sql .= " AND c.fk_soc = ".$socid;
+		$sql .= " AND c.fk_soc = ".((int) $socid);
 	}
 	if (!$user->rights->societe->client->voir && !$socid) {
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
@@ -231,7 +231,7 @@ $sql .= " WHERE c.fk_soc = s.rowid";
 $sql .= " AND c.entity = ".$conf->entity;
 //$sql.= " AND c.fk_statut > 2";
 if ($socid) {
-	$sql .= " AND c.fk_soc = ".$socid;
+	$sql .= " AND c.fk_soc = ".((int) $socid);
 }
 if (!$user->rights->societe->client->voir && !$socid) {
 	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index 3b9a7892310..5fcafb2fdc4 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -382,7 +382,7 @@ if ($search_sale > 0) {
 	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $search_sale);
 }
 if ($search_user > 0) {
-	$sql .= " AND c.fk_c_type_contact = tc.rowid AND tc.element='supplier_proposal' AND tc.source='internal' AND c.element_id = sp.rowid AND c.fk_socpeople = ".$search_user;
+	$sql .= " AND c.fk_c_type_contact = tc.rowid AND tc.element='supplier_proposal' AND tc.source='internal' AND c.element_id = sp.rowid AND c.fk_socpeople = ".((int) $search_user);
 }
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
diff --git a/htdocs/takepos/floors.php b/htdocs/takepos/floors.php
index 92d7e8288e1..0aa45028ddd 100644
--- a/htdocs/takepos/floors.php
+++ b/htdocs/takepos/floors.php
@@ -70,7 +70,7 @@ if (empty($user->rights->takepos->run)) {
  */
 
 if ($action == "getTables") {
-	$sql = "SELECT rowid, entity, label, leftpos, toppos, floor FROM ".MAIN_DB_PREFIX."takepos_floor_tables where floor=".$floor;
+	$sql = "SELECT rowid, entity, label, leftpos, toppos, floor FROM ".MAIN_DB_PREFIX."takepos_floor_tables where floor = ".((int) $floor);
 	$resql = $db->query($sql);
 	$rows = array();
 	while ($row = $db->fetch_array($resql)) {
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index 6582ec96172..60276c545ca 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -478,7 +478,7 @@ if (($action == "addline" || $action == "freezone") && $placeid == 0) {
 		if ($placeid < 0) {
 			dol_htmloutput_errors($invoice->error, $invoice->errors, 1);
 		}
-		$sql = "UPDATE ".MAIN_DB_PREFIX."facture set ref='(PROV-POS".$_SESSION["takeposterminal"]."-".$place.")' where rowid=".$placeid;
+		$sql = "UPDATE ".MAIN_DB_PREFIX."facture set ref='(PROV-POS".$_SESSION["takeposterminal"]."-".$place.")' where rowid = ".((int) $placeid);
 		$db->query($sql);
 	}
 }
diff --git a/htdocs/ticket/class/api_tickets.class.php b/htdocs/ticket/class/api_tickets.class.php
index 7f2d2cf1be0..e104d425bf4 100644
--- a/htdocs/ticket/class/api_tickets.class.php
+++ b/htdocs/ticket/class/api_tickets.class.php
@@ -262,7 +262,7 @@ class Tickets extends DolibarrApi
 			$sql .= " AND t.fk_soc = sc.fk_soc";
 		}
 		if ($socid > 0) {
-			$sql .= " AND t.fk_soc = ".$socid;
+			$sql .= " AND t.fk_soc = ".((int) $socid);
 		}
 		if ($search_sale > 0) {
 			$sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
@@ -270,7 +270,7 @@ class Tickets extends DolibarrApi
 
 		// Insert sale filter
 		if ($search_sale > 0) {
-			$sql .= " AND sc.fk_user = ".$search_sale;
+			$sql .= " AND sc.fk_user = ".((int) $search_sale);
 		}
 		// Add sql filters
 		if ($sqlfilters) {
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index 61a6d15d9a1..f4e92ecab18 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -1829,19 +1829,22 @@ class Ticket extends CommonObject
 	public function searchSocidByEmail($email, $type = '0', $filters = array(), $clause = 'AND')
 	{
 		$thirdparties = array();
+		$case = 0;
+		$exact = 0;
 
 		// Generation requete recherche
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe";
 		$sql .= " WHERE entity IN (".getEntity('ticket', 1).")";
 		if (!empty($type)) {
 			if ($type == 1 || $type == 2) {
-				$sql .= " AND client = ".$type;
+				$sql .= " AND client = ".((int) $type);
 			} elseif ($type == 3) {
 				$sql .= " AND fournisseur = 1";
 			}
 		}
 		if (!empty($email)) {
 			if (!$exact) {
+				$regs = array();
 				if (preg_match('/^([\*])?[^*]+([\*])?$/', $email, $regs) && count($regs) > 1) {
 					$email = str_replace('*', '%', $email);
 				} else {
diff --git a/htdocs/user/class/api_users.class.php b/htdocs/user/class/api_users.class.php
index 9fa84042c3a..e0cbd849092 100644
--- a/htdocs/user/class/api_users.class.php
+++ b/htdocs/user/class/api_users.class.php
@@ -93,7 +93,7 @@ class Users extends DolibarrApi
 
 		// Select products of given category
 		if ($category > 0) {
-			$sql .= " AND c.fk_categorie = ".$this->db->escape($category);
+			$sql .= " AND c.fk_categorie = ".((int) $category);
 			$sql .= " AND c.fk_user = t.rowid";
 		}
 
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 910edce8c17..ec09aafeef5 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1418,10 +1418,10 @@ class User extends CommonObject
 		$result = $this->create($user, 1);
 		if ($result > 0) {
 			$sql = "UPDATE ".MAIN_DB_PREFIX."user";
-			$sql .= " SET fk_socpeople=".$contact->id;
+			$sql .= " SET fk_socpeople=".((int) $contact->id);
 			$sql .= ", civility='".$this->db->escape($contact->civility_code)."'";
 			if ($contact->socid > 0) {
-				$sql .= ", fk_soc=".$contact->socid;
+				$sql .= ", fk_soc=".((int) $contact->socid);
 			}
 			$sql .= " WHERE rowid=".((int) $this->id);
 
@@ -1517,7 +1517,7 @@ class User extends CommonObject
 
 			if ($result > 0 && $member->fk_soc) {	// If member is linked to a thirdparty
 				$sql = "UPDATE ".MAIN_DB_PREFIX."user";
-				$sql .= " SET fk_soc=".$member->fk_soc;
+				$sql .= " SET fk_soc=".((int) $member->fk_soc);
 				$sql .= " WHERE rowid=".((int) $this->id);
 
 				dol_syslog(get_class($this)."::create_from_member", LOG_DEBUG);
diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php
index cacaeb54fc1..083b1bcc18c 100644
--- a/htdocs/user/class/usergroup.class.php
+++ b/htdocs/user/class/usergroup.class.php
@@ -194,7 +194,7 @@ class UserGroup extends CommonObject
 		$sql .= " FROM ".MAIN_DB_PREFIX."usergroup as g,";
 		$sql .= " ".MAIN_DB_PREFIX."usergroup_user as ug";
 		$sql .= " WHERE ug.fk_usergroup = g.rowid";
-		$sql .= " AND ug.fk_user = ".$userid;
+		$sql .= " AND ug.fk_user = ".((int) $userid);
 		if (!empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && !$user->entity) {
 			$sql .= " AND g.entity IS NOT NULL";
 		} else {
@@ -359,7 +359,7 @@ class UserGroup extends CommonObject
 			//print "$module-$perms-$subperms";
 			$sql = "SELECT id";
 			$sql .= " FROM ".MAIN_DB_PREFIX."rights_def";
-			$sql .= " WHERE entity = ".$entity;
+			$sql .= " WHERE entity = ".((int) $entity);
 			if (!empty($whereforadd) && $whereforadd != 'allmodules') {
 				$sql .= " AND ".$whereforadd;
 			}
@@ -438,8 +438,8 @@ class UserGroup extends CommonObject
 			// les caracteristiques module, perms et subperms de ce droit.
 			$sql = "SELECT module, perms, subperms";
 			$sql .= " FROM ".MAIN_DB_PREFIX."rights_def";
-			$sql .= " WHERE id = '".$this->db->escape($rid)."'";
-			$sql .= " AND entity = ".$entity;
+			$sql .= " WHERE id = ".((int) $rid);
+			$sql .= " AND entity = ".((int) $entity);
 
 			$result = $this->db->query($sql);
 			if ($result) {
@@ -454,8 +454,8 @@ class UserGroup extends CommonObject
 				dol_print_error($this->db);
 			}
 
-			// Where pour la liste des droits a supprimer
-			$wherefordel = "id=".$this->db->escape($rid);
+			// Where for the list of permissions to delete
+			$wherefordel = "id = ".((int) $rid);
 			// Suppression des droits induits
 			if ($subperms == 'lire' || $subperms == 'read') {
 				$wherefordel .= " OR (module='".$this->db->escape($module)."' AND perms='".$this->db->escape($perms)."' AND subperms IS NOT NULL)";
diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index bd82824cb05..62372df637a 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -423,7 +423,7 @@ if ($search_categ == -2) {
 	$sql .= " AND cu.fk_categorie IS NULL";
 }
 if ($search_warehouse > 0) {
-	$sql .= " AND u.fk_warehouse = ".$db->escape($search_warehouse);
+	$sql .= " AND u.fk_warehouse = ".((int) $search_warehouse);
 }
 if ($mode == 'employee' && empty($user->rights->salaries->readall)) {
 	$sql .= " AND u.rowid IN (".$db->sanitize(join(',', $childids)).")";
diff --git a/htdocs/webservices/server_invoice.php b/htdocs/webservices/server_invoice.php
index d1382ac7c62..3fa61960b8c 100644
--- a/htdocs/webservices/server_invoice.php
+++ b/htdocs/webservices/server_invoice.php
@@ -425,7 +425,7 @@ function getInvoicesForThirdParty($authentication, $idthirdparty)
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'facture as f';
 		$sql .= " WHERE f.entity IN (".getEntity('invoice').")";
 		if ($idthirdparty != 'all') {
-			$sql .= " AND f.fk_soc = ".$db->escape($idthirdparty);
+			$sql .= " AND f.fk_soc = ".((int) $idthirdparty);
 		}
 
 		$resql = $db->query($sql);
diff --git a/htdocs/webservices/server_order.php b/htdocs/webservices/server_order.php
index 8f3d5af17e6..73769d43cec 100644
--- a/htdocs/webservices/server_order.php
+++ b/htdocs/webservices/server_order.php
@@ -537,7 +537,7 @@ function getOrdersForThirdParty($authentication, $idthirdparty)
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'commande as c';
 		$sql .= " WHERE c.entity = ".$conf->entity;
 		if ($idthirdparty != 'all') {
-			$sql .= " AND c.fk_soc = ".$db->escape($idthirdparty);
+			$sql .= " AND c.fk_soc = ".((int) $idthirdparty);
 		}
 
 
diff --git a/htdocs/webservices/server_productorservice.php b/htdocs/webservices/server_productorservice.php
index 95b7246d021..35997d16d6e 100644
--- a/htdocs/webservices/server_productorservice.php
+++ b/htdocs/webservices/server_productorservice.php
@@ -916,13 +916,13 @@ function getListOfProductsOrServices($authentication, $filterproduct)
 		$sql .= " WHERE entity=".$conf->entity;
 		foreach ($filterproduct as $key => $val) {
 			if ($key == 'type' && $val >= 0) {
-				$sql .= " AND fk_product_type = ".$db->escape($val);
+				$sql .= " AND fk_product_type = ".((int) $val);
 			}
 			if ($key == 'status_tosell') {
-				$sql .= " AND tosell = ".$db->escape($val);
+				$sql .= " AND tosell = ".((int) $val);
 			}
 			if ($key == 'status_tobuy') {
-				$sql .= " AND tobuy = ".$db->escape($val);
+				$sql .= " AND tobuy = ".((int) $val);
 			}
 		}
 		$resql = $db->query($sql);
diff --git a/htdocs/webservices/server_supplier_invoice.php b/htdocs/webservices/server_supplier_invoice.php
index 2a17ea15265..6803133d527 100644
--- a/htdocs/webservices/server_supplier_invoice.php
+++ b/htdocs/webservices/server_supplier_invoice.php
@@ -358,7 +358,7 @@ function getSupplierInvoicesForThirdParty($authentication, $idthirdparty)
 		//$sql.=" WHERE f.fk_soc = s.rowid AND nom = '".$db->escape($idthirdparty)."'";
 		$sql .= " WHERE f.entity = ".$conf->entity;
 		if ($idthirdparty != 'all') {
-			$sql .= " AND f.fk_soc = ".$db->escape($idthirdparty);
+			$sql .= " AND f.fk_soc = ".((int) $idthirdparty);
 		}
 
 		$resql = $db->query($sql);
diff --git a/htdocs/webservices/server_thirdparty.php b/htdocs/webservices/server_thirdparty.php
index c256e975217..dbf2f3dd125 100644
--- a/htdocs/webservices/server_thirdparty.php
+++ b/htdocs/webservices/server_thirdparty.php
@@ -707,13 +707,13 @@ function getListOfThirdParties($authentication, $filterthirdparty)
 				$sql .= " AND s.name LIKE '%".$db->escape($val)."%'";
 			}
 			if ($key == 'client' && (int) $val > 0) {
-				$sql .= " AND s.client = ".$db->escape($val);
+				$sql .= " AND s.client = ".((int) $val);
 			}
 			if ($key == 'supplier' && (int) $val > 0) {
-				$sql .= " AND s.fournisseur = ".$db->escape($val);
+				$sql .= " AND s.fournisseur = ".((int) $val);
 			}
 			if ($key == 'category' && (int) $val > 0) {
-				$sql .= " AND s.rowid IN (SELECT fk_soc FROM ".MAIN_DB_PREFIX."categorie_societe WHERE fk_categorie=".$db->escape($val).") ";
+				$sql .= " AND s.rowid IN (SELECT fk_soc FROM ".MAIN_DB_PREFIX."categorie_societe WHERE fk_categorie = ".((int) $val).") ";
 			}
 		}
 		dol_syslog("Function: getListOfThirdParties", LOG_DEBUG);

From 4e1fe23b7e1a83d34b45c51348968d415626085c Mon Sep 17 00:00:00 2001
From: Nicolas <nicolas@eoxia.com>
Date: Wed, 9 Jun 2021 15:48:31 +0200
Subject: [PATCH 0500/1497] FIX: add check display payment link if invoice
 module is enabled

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

diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 1ef37552f1f..4913731efb5 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -2633,7 +2633,7 @@ if ($action == 'create' && $usercancreate)
 			$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem, $compatibleImportElementsList);
 
 			// Show online payment link
-			$useonlinepayment = (!empty($conf->paypal->enabled) || !empty($conf->stripe->enabled) || !empty($conf->paybox->enabled));
+			$useonlinepayment = ((!empty($conf->paypal->enabled) || !empty($conf->stripe->enabled) || !empty($conf->paybox->enabled)) && !empty($conf->facture->enabled));
 			if (!empty($conf->global->ORDER_HIDE_ONLINE_PAYMENT_ON_ORDER)) $useonlinepayment = 0;
 			if ($object->statut != Commande::STATUS_DRAFT && $useonlinepayment)
 			{

From 2681d581075c69544b67cb1bd491b848896f46ea Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 9 Jun 2021 16:37:15 +0200
Subject: [PATCH 0501/1497] FIx CVE ID: CVE-2021-33816

---
 htdocs/core/class/utils.class.php |  2 +-
 htdocs/website/index.php          | 25 +++++++++++++++++++++++--
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/utils.class.php b/htdocs/core/class/utils.class.php
index a4f6bb11706..bdd6cc2b83a 100644
--- a/htdocs/core/class/utils.class.php
+++ b/htdocs/core/class/utils.class.php
@@ -594,7 +594,7 @@ class Utils
 	 * Execute a CLI command.
 	 *
 	 * @param 	string	$command		Command line to execute.
-	 * @param 	string	$outputfile		Output file (used only when method is 2). For exemple $conf->admin->dir_temp.'/out.tmp';
+	 * @param 	string	$outputfile		A path for an output file (used only when method is 2). For example: $conf->admin->dir_temp.'/out.tmp';
 	 * @param	int		$execmethod		0=Use default method (that is 1 by default), 1=Use the PHP 'exec', 2=Use the 'popen' method
 	 * @return	array					array('result'=>...,'output'=>...,'error'=>...). result = 0 means OK.
 	 */
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index fe1bdce10d4..9361aae865f 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -1998,8 +1998,12 @@ if ($usercanedit && (($action == 'updatesource' || $action == 'updatecontent' ||
 
 			// Security analysis
 			$phpfullcodestring = dolKeepOnlyPhpCode($objectpage->content);
-			//print dol_escape_htmltag($phpfullcodestring);exit;
-			$forbiddenphpcommands = array("exec", "passthru", "system", "shell_exec", "proc_open", "eval", "dol_eval");
+
+			// First check forbidden commands
+			$forbiddenphpcommands = array();
+			if (empty($conf->global->WEBSITE_PHP_ALLOW_EXEC)) {    // If option is not on, we disallow functions to execute commands
+				$forbiddenphpcommands = array("exec", "passthru", "shell_exec", "system", "proc_open", "popen", "eval", "dol_eval", "executeCLI");
+			}
 			if (empty($conf->global->WEBSITE_PHP_ALLOW_WRITE)) {    // If option is not on, we disallow functions to write files
 				$forbiddenphpcommands = array_merge($forbiddenphpcommands, array("fopen", "file_put_contents", "fputs", "fputscsv", "fwrite", "fpassthru", "unlink", "mkdir", "rmdir", "symlink", "touch", "umask"));
 			}
@@ -2015,6 +2019,23 @@ if ($usercanedit && (($action == 'updatesource' || $action == 'updatecontent' ||
 					}
 				}
 			}
+			// This char can be used to execute RCE for example using with echo `ls`
+			$forbiddenphpchars = array();
+			if (empty($conf->global->WEBSITE_PHP_ALLOW_DANGEROUS_CHARS)) {    // If option is not on, we disallow functions to execute commands
+				$forbiddenphpchars = array("`");
+			}
+			foreach ($forbiddenphpchars as $forbiddenphpchar) {
+				if (preg_match('/'.$forbiddenphpchar.'/ms', $phpfullcodestring)) {
+					$error++;
+					setEventMessages($langs->trans("DynamicPHPCodeContainsAForbiddenInstruction", $forbiddenphpchar), null, 'errors');
+					if ($action == 'updatesource') {
+						$action = 'editsource';
+					}
+					if ($action == 'updatecontent') {
+						$action = 'editcontent';
+					}
+				}
+			}
 
 			if (empty($user->rights->website->writephp)) {
 				if ($phpfullcodestringold != $phpfullcodestring) {

From 0b7b12685fac454c450430dfdb100dc72f3778c4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 9 Jun 2021 16:41:43 +0200
Subject: [PATCH 0502/1497] Clean code

---
 htdocs/core/lib/functions2.lib.php | 51 ------------------------------
 1 file changed, 51 deletions(-)

diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index e279ced2a3d..37f78563c02 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -2679,57 +2679,6 @@ if (!function_exists('dolEscapeXML')) {
 }
 
 
-/**
- *	Return automatic or manual in current language
- *
- *	@param	string	$automaticmanual   Value to test (1, 'automatic', 'true' or 0, 'manual', 'false')
- *	@param	integer	$case			   1=Yes/No, 0=yes/no, 2=Disabled checkbox, 3=Disabled checkbox + Automatic/Manual
- *	@param	int		$color			   0=texte only, 1=Text is formated with a color font style ('ok' or 'error'), 2=Text is formated with 'ok' color.
- *	@return	string					   HTML string
- */
-function autoOrManual($automaticmanual, $case = 1, $color = 0)
-{
-	global $langs;
-	$result = 'unknown';
-	$classname = '';
-	if ($automaticmanual == 1 || strtolower($automaticmanual) == 'automatic' || strtolower($automaticmanual) == 'true') { 	// A mettre avant test sur no a cause du == 0
-		$result = $langs->trans('automatic');
-		if ($case == 1 || $case == 3) {
-			$result = $langs->trans("Automatic");
-		}
-		if ($case == 2) {
-			$result = '<input type="checkbox" value="1" checked disabled>';
-		}
-		if ($case == 3) {
-			$result = '<input type="checkbox" value="1" checked disabled> '.$result;
-		}
-
-		$classname = 'ok';
-	} elseif ($automaticmanual == 0 || strtolower($automaticmanual) == 'manual' || strtolower($automaticmanual) == 'false') {
-		$result = $langs->trans("manual");
-		if ($case == 1 || $case == 3) {
-			$result = $langs->trans("Manual");
-		}
-		if ($case == 2) {
-			$result = '<input type="checkbox" value="0" disabled>';
-		}
-		if ($case == 3) {
-			$result = '<input type="checkbox" value="0" disabled> '.$result;
-		}
-
-		if ($color == 2) {
-			$classname = 'ok';
-		} else {
-			$classname = 'error';
-		}
-	}
-	if ($color) {
-		return '<font class="'.$classname.'">'.$result.'</font>';
-	}
-	return $result;
-}
-
-
 /**
  * Convert links to local wrapper to medias files into a string into a public external URL readable on internet
  *

From c37c3713928a6d2216ceaa2b04e21f436081a7c3 Mon Sep 17 00:00:00 2001
From: lvessiller <lvessiller@open-dsi.fr>
Date: Wed, 9 Jun 2021 17:18:01 +0200
Subject: [PATCH 0503/1497] FIX clone invoice with acount line

---
 .../triggers/interface_90_modSociete_ContactRoles.class.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/htdocs/core/triggers/interface_90_modSociete_ContactRoles.class.php b/htdocs/core/triggers/interface_90_modSociete_ContactRoles.class.php
index 0ee3cdb73ab..b15113c9c08 100644
--- a/htdocs/core/triggers/interface_90_modSociete_ContactRoles.class.php
+++ b/htdocs/core/triggers/interface_90_modSociete_ContactRoles.class.php
@@ -84,11 +84,7 @@ class InterfaceContactRoles extends DolibarrTriggers
 				if (is_array($TContact) && ! empty($TContact)) {
 					$TContactAlreadyLinked = array();
 					if ($object->id > 0) {
-						$cloneFrom = dol_clone($object, 1);
-
-						if (! empty($cloneFrom->id)) {
-							$TContactAlreadyLinked = array_merge($cloneFrom->liste_contact(- 1, 'external'), $cloneFrom->liste_contact(- 1, 'internal'));
-						}
+						$TContactAlreadyLinked = array_merge($object->liste_contact(- 1, 'external'), $object->liste_contact(- 1, 'internal'));
 					}
 
 					foreach ($TContact as $i => $infos) {

From f1c94ac659175c78fc5034dab2d0510eadf4a567 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 9 Jun 2021 17:44:42 +0200
Subject: [PATCH 0504/1497] NEW Reduce scope of dol_eval function.

---
 htdocs/core/lib/functions.lib.php | 19 +++++++++++++
 test/phpunit/SecurityTest.php     | 44 +++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 165d9c503a4..61f268d7871 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -7995,6 +7995,25 @@ function dol_eval($s, $returnvalue = 0, $hideerrors = 1)
 	global $obj; // To get $obj used into list when dol_eval is used for computed fields and $obj is not yet $object
 	global $soc; // For backward compatibility
 
+	// Replace dangerous char (used for RCE), we allow only PHP variable testing.
+	if (strpos($s, '`') !== false) {
+		return 'Bad string syntax to evaluate: '.$s;
+	}
+
+	// We block using of php exec or php file functions
+	$forbiddenphpcommands = array("exec(", "passthru(", "shell_exec(", "system(", "proc_open(", "popen(", "eval(", "dol_eval(", "executeCLI(");
+	$forbiddenphpcommands = array_merge($forbiddenphpcommands, array("fopen(", "file_put_contents(", "fputs(", "fputscsv(", "fwrite(", "fpassthru(", "unlink(", "mkdir(", "rmdir(", "symlink(", "touch(", "umask("));
+	$forbiddenphpcommands = array_merge($forbiddenphpcommands, array('function(', '$$', 'call_user_func(', '_SESSION', '_COOKIE'));
+	do {
+		$oldstringtoclean = $s;
+		$s = str_ireplace($forbiddenphpcommands, '__forbiddenstring__', $s);
+		//$s = preg_replace('/\$[a-zA-Z0-9_\->\$]+\(/i', '', $s);	// Remove $function( call and $mycall->mymethod(
+	} while ($oldstringtoclean != $s);
+
+	if (strpos($s, '__forbiddenstring__') !== false) {
+		return 'Bad string syntax to evaluate: '.$s;
+	}
+
 	//print $s."<br>\n";
 	if ($returnvalue) {
 		if ($hideerrors) {
diff --git a/test/phpunit/SecurityTest.php b/test/phpunit/SecurityTest.php
index f889a6c542b..b1a32249ffc 100644
--- a/test/phpunit/SecurityTest.php
+++ b/test/phpunit/SecurityTest.php
@@ -777,4 +777,48 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 		$result=dol_sanitizeFileName('bad file --evilparam');
 		$this->assertEquals('bad file _evilparam', $result);
 	}
+
+	/**
+	 * testDolEval
+	 *
+	 * @return void
+	 */
+	public function testDolEval()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
+
+		$result=dol_eval('1==1', 1, 0);
+		print "result = ".$result."\n";
+		$this->assertTrue($result);
+
+		$result=dol_eval('1==2', 1, 0);
+		print "result = ".$result."\n";
+		$this->assertFalse($result);
+
+		include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
+		$result=dol_eval('(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: "Parent project not found"', 1, 1);
+		print "result = ".$result."\n";
+		$this->assertEquals('Parent project not found', $result);
+
+		$result=dol_eval('$a=function() { }; $a;', 1, 1);
+		print "result = ".$result."\n";
+		$this->assertContains('Bad string syntax to evaluate', $result);
+
+		$result=dol_eval('$a=exec("ls");', 1, 1);
+		print "result = ".$result."\n";
+		$this->assertContains('Bad string syntax to evaluate', $result);
+
+		$result=dol_eval('$a="test"; $$a;', 1, 0);
+		print "result = ".$result."\n";
+		$this->assertContains('Bad string syntax to evaluate', $result);
+
+		$result=dol_eval('`ls`', 1, 0);
+		print "result = ".$result."\n";
+		$this->assertContains('Bad string syntax to evaluate', $result);
+	}
 }

From f472ff4fd9aac82fc75b2c454d357bb90c1eec49 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 9 Jun 2021 17:47:27 +0200
Subject: [PATCH 0505/1497] Add phpunit for dol_eval

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 61f268d7871..1857be0146c 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -8003,7 +8003,8 @@ function dol_eval($s, $returnvalue = 0, $hideerrors = 1)
 	// We block using of php exec or php file functions
 	$forbiddenphpcommands = array("exec(", "passthru(", "shell_exec(", "system(", "proc_open(", "popen(", "eval(", "dol_eval(", "executeCLI(");
 	$forbiddenphpcommands = array_merge($forbiddenphpcommands, array("fopen(", "file_put_contents(", "fputs(", "fputscsv(", "fwrite(", "fpassthru(", "unlink(", "mkdir(", "rmdir(", "symlink(", "touch(", "umask("));
-	$forbiddenphpcommands = array_merge($forbiddenphpcommands, array('function(', '$$', 'call_user_func(', '_SESSION', '_COOKIE'));
+	$forbiddenphpcommands = array_merge($forbiddenphpcommands, array('function(', '$$', 'call_user_func('));
+	$forbiddenphpcommands = array_merge($forbiddenphpcommands, array('global', '_ENV', '_SESSION', '_COOKIE', '_GET', '_POST', '_REQUEST'));
 	do {
 		$oldstringtoclean = $s;
 		$s = str_ireplace($forbiddenphpcommands, '__forbiddenstring__', $s);

From 16f1210e8afddd451ead51fce9fadff0cf360c83 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 9 Jun 2021 17:50:21 +0200
Subject: [PATCH 0506/1497] Fix phpcs

---
 htdocs/compta/cashcontrol/report.php           | 2 +-
 htdocs/partnership/class/partnership.class.php | 2 +-
 htdocs/product/card.php                        | 8 ++++----
 htdocs/reception/card.php                      | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/compta/cashcontrol/report.php b/htdocs/compta/cashcontrol/report.php
index fb6e75c68c4..de597a608dc 100644
--- a/htdocs/compta/cashcontrol/report.php
+++ b/htdocs/compta/cashcontrol/report.php
@@ -223,7 +223,7 @@ if ($resql) {
 
 		if (empty($cacheinvoiceid[$objp->facid])) {
 			$cacheinvoiceid[$objp->facid] = $objp->facid;	// First time this invoice is found into list of invoice x payments
-			foreach($invoicetmp->lines as $line) {
+			foreach ($invoicetmp->lines as $line) {
 				$totalqty += $line->qty;
 				$totalvat += $line->total_tva;
 			}
diff --git a/htdocs/partnership/class/partnership.class.php b/htdocs/partnership/class/partnership.class.php
index d04d0c335eb..125dacb1e53 100644
--- a/htdocs/partnership/class/partnership.class.php
+++ b/htdocs/partnership/class/partnership.class.php
@@ -354,8 +354,8 @@ class Partnership extends CommonObject
 	 *
 	 *	@param      int			$id       				Id of object to load
 	 * 	@param		string		$ref					Ref of object
-	 * 	@param 		int 		$fk_soc			  		fk_soc
 	 * 	@param 		int 		$fk_member		  		fk_member
+	 * 	@param 		int 		$fk_soc			  		fk_soc
 	 *	@return     int         						>0 if OK, <0 if KO, 0 if not found
 	 */
 	public function fetch($id, $ref = null, $fk_member = null, $fk_soc = null)
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 1b732cd721e..5067b9ce838 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -2050,10 +2050,10 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 					print '</td></tr>';
 					if ((($object->status_batch == '1' &&$conf->global->PRODUCTBATCH_LOT_USE_PRODUCT_MASKS && $conf->global->PRODUCTBATCH_LOT_ADDON == 'mod_lot_advanced')
 						|| ($object->status_batch == '2' && $conf->global->PRODUCTBATCH_SN_ADDON == 'mod_sn_advanced' && $conf->global->PRODUCTBATCH_SN_USE_PRODUCT_MASKS))) {
-							print '<tr><td>'.$langs->trans("ManageLotMask").'</td><td>';
-							print $object->batch_mask;
-							print '</td></tr>';
-						}
+						print '<tr><td>'.$langs->trans("ManageLotMask").'</td><td>';
+						print $object->batch_mask;
+						print '</td></tr>';
+					}
 				}
 			}
 
diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php
index 531fdf9c23a..c9a638e7cde 100644
--- a/htdocs/reception/card.php
+++ b/htdocs/reception/card.php
@@ -1702,7 +1702,7 @@ if ($action == 'create') {
 			$sql .= " AND obj.fk_commande = ".((int) $origin_id);
 			$sql .= " AND obj.rowid = ed.fk_commandefourndet";
 			$sql .= " AND ed.fk_reception = e.rowid";
-			$sql .= " AND ed.fk_reception !=".(int) $object->id);
+			$sql .= " AND ed.fk_reception !=".((int) $object->id);
 			//if ($filter) $sql.= $filter;
 			$sql .= " ORDER BY obj.fk_product";
 

From c00bef83a8d919aeb624c9cf23adf653d28aacf1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 9 Jun 2021 18:05:56 +0200
Subject: [PATCH 0507/1497] Fix php unit

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

diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index a48d00c820b..377f09028df 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -3417,7 +3417,7 @@ class SupplierInvoiceLine extends CommonObjectLine
 		$sql .= ", fk_product = ".((int) $fk_product);
 		$sql .= ", product_type = ".((int) $this->product_type);
 		$sql .= ", info_bits = ".((int) $this->info_bits);
-		$sql .= ", fk_unit = ".((int) $fk_unit);
+		$sql .= ", fk_unit = ".($fk_unit > 0 ? (int) $fk_unit : 'null');
 
 		// Multicurrency
 		$sql .= " , multicurrency_subprice=".price2num($this->multicurrency_subprice)."";

From e4d3fd4861d6f384dd575bb61efcc67814bc3f63 Mon Sep 17 00:00:00 2001
From: prolyfix <marc.baudot@gmail.com>
Date: Wed, 9 Jun 2021 23:09:31 +0200
Subject: [PATCH 0508/1497] bug resolution: exception

when a user test the send mail functionality, an exception is thrown: $object is null in the method_exists's function. and thus not allowed.
Adding is_object resolve the problem
---
 htdocs/core/actions_sendmails.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php
index b4e583387c9..83a823edeb2 100644
--- a/htdocs/core/actions_sendmails.inc.php
+++ b/htdocs/core/actions_sendmails.inc.php
@@ -345,7 +345,7 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 			$subject = make_substitutions($subject, $substitutionarray);
 			$message = make_substitutions($message, $substitutionarray);
 
-			if (method_exists($object, 'makeSubstitution')) {
+			if (is_object($object) && method_exists($object, 'makeSubstitution')) {
 				$subject = $object->makeSubstitution($subject);
 				$message = $object->makeSubstitution($message);
 			}

From f3d54aada5df4794466b5010c12486218bc4178d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 9 Jun 2021 23:48:28 +0200
Subject: [PATCH 0509/1497] Clean code

---
 htdocs/adherents/class/adherent.class.php |  2 --
 htdocs/societe/class/societe.class.php    | 24 +++++++++++++++++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 91f01d19f89..5a69c30abdb 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -1510,7 +1510,6 @@ class Adherent extends CommonObject
 	}
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Function to get partnerships array
 	 *
@@ -1519,7 +1518,6 @@ class Adherent extends CommonObject
 	 */
 	public function fetchPartnerships($mode)
 	{
-		// phpcs:enable
 		global $langs;
 
 		require_once DOL_DOCUMENT_ROOT.'/parntership/class/partnership.class.php';
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 149801a65e2..e20643fb589 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -740,6 +740,12 @@ class Societe extends CommonObject
 	public $multicurrency_code;
 
 
+	// Fields loaded by fetchPartnerships()
+
+	public $partnerships = array();
+
+
+
 	/**
 	 * @var Account|string Default BAN account
 	 */
@@ -4806,4 +4812,22 @@ class Societe extends CommonObject
 			return -1;
 		}
 	}
+
+	/**
+	 *	Function to get partnerships array
+	 *
+	 *  @param		string		$mode		'member' or 'thirdparty'
+	 *	@return		int						<0 if KO, >0 if OK
+	 */
+	public function fetchPartnerships($mode)
+	{
+		global $langs;
+
+		require_once DOL_DOCUMENT_ROOT.'/parntership/class/partnership.class.php';
+
+
+		$this->partnerships[] = array();
+
+		return 1;
+	}
 }

From 9b7795dc44ebabda3eaf0944a531f445471f7d86 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 9 Jun 2021 23:55:56 +0200
Subject: [PATCH 0510/1497] Debug v14

---
 htdocs/partnership/admin/setup.php            |  2 +-
 .../class/partnershiputils.class.php          | 19 +++++++++----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/htdocs/partnership/admin/setup.php b/htdocs/partnership/admin/setup.php
index 7fa0ef62b5e..97e21647b81 100644
--- a/htdocs/partnership/admin/setup.php
+++ b/htdocs/partnership/admin/setup.php
@@ -177,7 +177,7 @@ print '</div>';
 print '<br>';
 
 
-print_fiche_titre($langs->trans("ReferingWebsiteCheck"), '', '');
+print load_fiche_titre($langs->trans("ReferingWebsiteCheck"), '', '');
 
 print '<span class="opacitymedium">'.$langs->trans("ReferingWebsiteCheckDesc").'</span><br>';
 print '<br>';
diff --git a/htdocs/partnership/class/partnershiputils.class.php b/htdocs/partnership/class/partnershiputils.class.php
index 04f5db251e5..7cf01c2957c 100644
--- a/htdocs/partnership/class/partnershiputils.class.php
+++ b/htdocs/partnership/class/partnershiputils.class.php
@@ -27,12 +27,11 @@ require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
-
-dol_include_once('partnership/lib/partnership.lib.php');
-dol_include_once('/partnership/class/partnership.class.php');
-
-require_once DOL_DOCUMENT_ROOT."/societe/class/societe.class.php";
+require_once DOL_DOCUMENT_ROOT.'/partnership/lib/partnership.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/partnership/class/partnership.class.php';
+require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+
 /**
  *	Class with cron tasks of Partnership module
  */
@@ -273,6 +272,7 @@ class PartnershipUtils
 			$numofexpiredmembers 		= $this->db->num_rows($resql);
 			$somethingdoneonpartnership = 0;
 			$ifetchpartner 				= 0;
+			$websitenotfound = '';
 			while ($ifetchpartner < $numofexpiredmembers) {
 				$ifetchpartner++;
 
@@ -393,11 +393,10 @@ class PartnershipUtils
 	/**
 	 * Action to check if Dolibarr backlink not found on partner website
 	 *
-	 * CAN BE A CRON TASK
-	 * @param  $website      Partner's website
-	 * @return  int                 0 if KO, 1 if OK
+	 * @param  $website      Website	Partner's website
+	 * @return  int                 	0 if KO, 1 if OK
 	 */
-	public function checkDolibarrBacklink($website = null)
+	private function checkDolibarrBacklink($website = null)
 	{
 		global $conf, $langs, $user;
 
@@ -406,7 +405,7 @@ class PartnershipUtils
 		$webcontent = '';
 
 		// $website = 'https://nextgestion.com/'; // For Test
-		$tmpgeturl = getURLContent($website);
+		$tmpgeturl = getURLContent($website, 'GET', '', 1, array(), array('http', 'https'), 0);
 		if ($tmpgeturl['curl_error_no']) {
 			$error++;
 			dol_syslog('Error getting '.$website.': '.$tmpgeturl['curl_error_msg']);

From 7b31ef0ff3ba416fd0c8c4c5c20a3000365adcd4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 10 Jun 2021 00:00:49 +0200
Subject: [PATCH 0511/1497] Fix warnings

---
 htdocs/comm/action/list.php                     | 3 ++-
 htdocs/comm/action/rapport/index.php            | 3 ++-
 htdocs/compta/prelevement/line.php              | 3 ++-
 htdocs/modulebuilder/template/myobject_list.php | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index 8c6fc94e31f..8bf35df622d 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -106,7 +106,8 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if ($page == -1 || $page == null) {
+if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
+	// If $page is not defined, or '' or -1 or if we click on clear filters
 	$page = 0;
 }
 $offset = $limit * $page;
diff --git a/htdocs/comm/action/rapport/index.php b/htdocs/comm/action/rapport/index.php
index a90bc1cf5a3..9b6238ca0de 100644
--- a/htdocs/comm/action/rapport/index.php
+++ b/htdocs/comm/action/rapport/index.php
@@ -43,7 +43,8 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if ($page == -1 || $page == null) {
+if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
+	// If $page is not defined, or '' or -1 or if we click on clear filters
 	$page = 0;
 }
 $offset = $limit * $page;
diff --git a/htdocs/compta/prelevement/line.php b/htdocs/compta/prelevement/line.php
index bc3a06c2e6d..5aa7344eea5 100644
--- a/htdocs/compta/prelevement/line.php
+++ b/htdocs/compta/prelevement/line.php
@@ -51,7 +51,8 @@ $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if ($page == -1 || $page == null) {
+if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
+	// If $page is not defined, or '' or -1 or if we click on clear filters
 	$page = 0;
 }
 $offset = $limit * $page;
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 05cce2ba934..e2c817c12cc 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -105,8 +105,9 @@ $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
+	// If $page is not defined, or '' or -1 or if we click on clear filters
 	$page = 0;
-}     // If $page is not defined, or '' or -1 or if we click on clear filters
+}
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;

From 067f37e22e46864822507906a03449dd3373cf93 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 10 Jun 2021 00:09:38 +0200
Subject: [PATCH 0512/1497] Clean code

---
 .../contact/canvas/actions_contactcard_common.class.php  | 6 +-----
 .../canvas/default/tpl/contactcard_create.tpl.php        | 5 -----
 htdocs/contact/card.php                                  | 4 +---
 htdocs/contact/class/contact.class.php                   | 9 ++++-----
 htdocs/contact/perso.php                                 | 4 ++--
 htdocs/core/class/commondocgenerator.class.php           | 1 -
 htdocs/datapolicy/class/actions_datapolicy.class.php     | 1 -
 htdocs/install/upgrade2.php                              | 2 +-
 htdocs/webservices/server_contact.php                    | 4 +---
 9 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/htdocs/contact/canvas/actions_contactcard_common.class.php b/htdocs/contact/canvas/actions_contactcard_common.class.php
index 0e80df07676..f63f25b2a18 100644
--- a/htdocs/contact/canvas/actions_contactcard_common.class.php
+++ b/htdocs/contact/canvas/actions_contactcard_common.class.php
@@ -283,10 +283,7 @@ abstract class ActionsContactCardCommon
 		// phpcs:enable
 		global $langs, $mysoc;
 
-		$this->object->old_name = GETPOST("old_name");
-		$this->object->old_firstname = GETPOST("old_firstname");
-
-		$this->object->socid = GETPOST("socid");
+		$this->object->socid = GETPOST("socid", 'int');
 		$this->object->lastname			= GETPOST("name");
 		$this->object->firstname		= GETPOST("firstname");
 		$this->object->civility_id = GETPOST("civility_id");
@@ -301,7 +298,6 @@ abstract class ActionsContactCardCommon
 		$this->object->phone_mobile = GETPOST("phone_mobile");
 		$this->object->fax = GETPOST("fax");
 		$this->object->email			= GETPOST("email");
-		$this->object->jabberid = GETPOST("jabberid");
 		$this->object->priv				= GETPOST("priv");
 		$this->object->note				= GETPOST("note", "restricthtml");
 		$this->object->canvas = GETPOST("canvas");
diff --git a/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php b/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php
index bd5cf24e195..a6c134d0a9a 100644
--- a/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php
+++ b/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php
@@ -109,11 +109,6 @@ echo $this->control->tpl['ajax_selectcountry']; ?>
 	<td colspan="3"><input name="email" type="text" size="50" maxlength="80" value="<?php echo $this->control->tpl['email']; ?>"></td>
 </tr>
 
-<tr>
-	<td><?php echo $langs->trans("IM"); ?></td>
-	<td colspan="3"><input name="jabberid" type="text" size="50" maxlength="80" value="<?php echo $this->control->tpl['jabberid']; ?>"></td>
-</tr>
-
 <tr>
 	<td><?php echo $langs->trans("ContactVisibility"); ?></td>
 	<td colspan="3"><?php echo $this->control->tpl['select_visibility']; ?></td>
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index b877909cc58..d185815b51a 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -297,7 +297,7 @@ if (empty($reshook)) {
 		$object->old_lastname = (string) GETPOST("old_lastname", 'alpha');
 		$object->old_firstname = (string) GETPOST("old_firstname", 'alpha');
 
-		$result = $object->delete();
+		$result = $object->delete();	// TODO Add $user as first param
 		if ($result > 0) {
 			if ($backtopage) {
 				header("Location: ".$backtopage);
@@ -443,8 +443,6 @@ if (empty($reshook)) {
 						}
 					}
 
-					$object->old_lastname = '';
-					$object->old_firstname = '';
 					$action = 'view';
 				} else {
 					setEventMessages($object->error, $object->errors, 'errors');
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index e1f987ac2f4..86d38c5b3e1 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -545,8 +545,6 @@ class Contact extends CommonObject
 		$this->phone_pro = trim($this->phone_pro);
 		$this->phone_perso = trim($this->phone_perso);
 		$this->phone_mobile = trim($this->phone_mobile);
-		$this->jabberid = trim($this->jabberid);
-		$this->skype = trim($this->skype);
 		$this->photo = trim($this->photo);
 		$this->fax = trim($this->fax);
 		$this->zip = (empty($this->zip) ? '' : trim($this->zip));
@@ -1190,10 +1188,11 @@ class Contact extends CommonObject
 	}
 
 	/**
-	 *   	Efface le contact de la base
+	 *	Delete a contact from database
+	 *  // TODO Add $user as first param
 	 *
-	 *   	@param		int		$notrigger		Disable all trigger
-	 *		@return		int						<0 if KO, >0 if OK
+	 *  @param		int		$notrigger		Disable all trigger
+	 *	@return		int						<0 if KO, >0 if OK
 	 */
 	public function delete($notrigger = 0)
 	{
diff --git a/htdocs/contact/perso.php b/htdocs/contact/perso.php
index 628c73b0afc..261ffebf29c 100644
--- a/htdocs/contact/perso.php
+++ b/htdocs/contact/perso.php
@@ -60,8 +60,8 @@ if ($action == 'update' && !GETPOST("cancel") && $user->rights->societe->contact
 
 	$result = $object->update_perso($id, $user);
 	if ($result > 0) {
-		$object->old_name = '';
-		$object->old_firstname = '';
+		$object->oldcopy = clone $object;
+
 		// Logo/Photo save
 		$dir = $conf->societe->dir_output.'/contact/'.get_exdir($object->id, 0, 0, 1, $object, 'contact').'/photos';
 
diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 30ea40fbbb2..6e91d9d175b 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -321,7 +321,6 @@ abstract class CommonDocGenerator
 			$array_key.'_statut' => $object->statut,
 			$array_key.'_code' => $object->code,
 			$array_key.'_email' => $object->email,
-			$array_key.'_jabberid' => $object->jabberid, // deprecated
 			$array_key.'_phone_pro' => $object->phone_pro,
 			$array_key.'_phone_perso' => $object->phone_perso,
 			$array_key.'_phone_mobile' => $object->phone_mobile,
diff --git a/htdocs/datapolicy/class/actions_datapolicy.class.php b/htdocs/datapolicy/class/actions_datapolicy.class.php
index 7a3ba77fb5a..e54086149fe 100644
--- a/htdocs/datapolicy/class/actions_datapolicy.class.php
+++ b/htdocs/datapolicy/class/actions_datapolicy.class.php
@@ -196,7 +196,6 @@ class ActionsDatapolicy
 			echo $object->phone_pro.';';
 			echo $object->phone_perso.';';
 			echo $object->phone_mobile.';';
-			echo $object->jabberid.';';
 			echo dol_print_date($object->birth).';';
 			exit;
 		} elseif ($parameters['currentcontext'] == 'contactcard' && $action == 'send_datapolicy') {
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index 23acc7d4a1b..e814e69574a 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -4710,7 +4710,7 @@ function migrate_contacts_socialnetworks()
 	$db->begin();
 	print '<tr><td colspan="4">';
 	$sql = 'SELECT rowid, socialnetworks';
-	$sql .= ', jabberid, skype, twitter, facebook, linkedin, instagram, snapchat, googleplus, youtube, whatsapp FROM '.MAIN_DB_PREFIX.'socpeople WHERE ';
+	$sql .= ', jabberid, skype, twitter, facebook, linkedin, instagram, snapchat, googleplus, youtube, whatsapp FROM '.MAIN_DB_PREFIX.'socpeople WHERE';
 	$sql .= " jabberid IS NOT NULL OR jabberid <> ''";
 	$sql .= " OR skype IS NOT NULL OR skype <> ''";
 	$sql .= " OR twitter IS NOT NULL OR twitter <> ''";
diff --git a/htdocs/webservices/server_contact.php b/htdocs/webservices/server_contact.php
index a28371443d5..37d86dcded9 100644
--- a/htdocs/webservices/server_contact.php
+++ b/htdocs/webservices/server_contact.php
@@ -492,8 +492,7 @@ function getContactsForThirdParty($authentication, $idthirdparty)
 		$sql .= " c.fk_pays as country_id,";
 		$sql .= " c.fk_departement as state_id,";
 		$sql .= " c.birthday,";
-		$sql .= " c.poste, c.phone, c.phone_perso, c.phone_mobile, c.fax, c.email, c.jabberid,";
-		//$sql.= " c.priv, c.note, c.default_lang, c.canvas,";
+		$sql .= " c.poste, c.phone, c.phone_perso, c.phone_mobile, c.fax, c.email,";
 		$sql .= " co.label as country, co.code as country_code,";
 		$sql .= " d.nom as state, d.code_departement as state_code,";
 		$sql .= " u.rowid as user_id, u.login as user_login,";
@@ -545,7 +544,6 @@ function getContactsForThirdParty($authentication, $idthirdparty)
 					'phone_mobile' => $contact->phone_mobile ? $contact->phone_mobile : '',
 
 					'email' => $contact->email ? $contact->email : '',
-					'jabberid' => $contact->jabberid ? $contact->jabberid : '',
 					'priv' => $contact->priv ? $contact->priv : '',
 					'mail' => $contact->mail ? $contact->mail : '',
 

From 3cc478b1335ad6f4e422d770125b73c332b6f035 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 10 Jun 2021 00:13:23 +0200
Subject: [PATCH 0513/1497] Fix use of get url

---
 htdocs/blockedlog/class/authority.class.php | 22 +++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/htdocs/blockedlog/class/authority.class.php b/htdocs/blockedlog/class/authority.class.php
index 4ec3fc6d07e..7240aaf0151 100644
--- a/htdocs/blockedlog/class/authority.class.php
+++ b/htdocs/blockedlog/class/authority.class.php
@@ -71,7 +71,7 @@ class BlockedLogAuthority
 
 		$this->blockchain = '';
 
-		if (is_array($bocks)) {
+		if (is_array($blocks)) {
 			foreach ($blocks as &$b) {
 				$this->blockchain .= $b->signature;
 			}
@@ -299,16 +299,18 @@ class BlockedLogAuthority
 
 		$signature = $block_static->getSignature();
 
-		foreach ($blocks as &$block) {
-			$url = $conf->global->BLOCKEDLOG_AUTHORITY_URL.'/blockedlog/ajax/authority.php?s='.$signature.'&b='.$block->signature;
+		if (is_array($blocks)) {
+			foreach ($blocks as &$block) {
+				$url = $conf->global->BLOCKEDLOG_AUTHORITY_URL.'/blockedlog/ajax/authority.php?s='.$signature.'&b='.$block->signature;
 
-			$res = file_get_contents($url);
-			echo $block->signature.' '.$url.' '.$res.'<br>';
-			if ($res === 'blockalreadyadded' || $res === 'blockadded') {
-				$block->setCertified();
-			} else {
-				$this->error = $langs->trans('ImpossibleToContactAuthority ', $url);
-				return -1;
+				$res = getURLContent($url);
+				echo $block->signature.' '.$url.' '.$res.'<br>';
+				if ($res === 'blockalreadyadded' || $res === 'blockadded') {
+					$block->setCertified();
+				} else {
+					$this->error = $langs->trans('ImpossibleToContactAuthority ', $url);
+					return -1;
+				}
 			}
 		}
 

From 9afe8e54a7d164153339e3306d5eb9661067977d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 10 Jun 2021 00:41:15 +0200
Subject: [PATCH 0514/1497] Fix

---
 htdocs/compta/facture/index.php |  4 ++--
 htdocs/core/lib/invoice.lib.php | 24 +++++++++++++++---------
 htdocs/fourn/facture/index.php  |  4 ++--
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/htdocs/compta/facture/index.php b/htdocs/compta/facture/index.php
index 0b2f4538636..66a2fccaf08 100644
--- a/htdocs/compta/facture/index.php
+++ b/htdocs/compta/facture/index.php
@@ -59,8 +59,8 @@ print load_fiche_titre($langs->trans("CustomersInvoicesArea"), '', 'bill');
 print '<div class="fichecenter">';
 
 print '<div class="fichethirdleft">';
-
-print getCustomerInvoicePieChart($socid);
+print getNumberInvoicesPieChart('customers');
+//print getCustomerInvoicePieChart($socid);
 print '<br>';
 print getCustomerInvoiceDraftTable($max, $socid);
 
diff --git a/htdocs/core/lib/invoice.lib.php b/htdocs/core/lib/invoice.lib.php
index 0cbb89ae47b..43cff7d3c3e 100644
--- a/htdocs/core/lib/invoice.lib.php
+++ b/htdocs/core/lib/invoice.lib.php
@@ -458,8 +458,9 @@ function getPurchaseInvoicePieChart($socid = 0)
 
 /**
  * Return an HTML table that contains a pie chart of the number of customers or supplier invoices
- * @param string $mode Can be customer or fourn
- * @return string A HTML table that contains a pie chart of customers or supplier invoices
+ *
+ * @param 	string 	$mode 		Can be 'customers' or 'suppliers'
+ * @return 	string 				A HTML table that contains a pie chart of customers or supplier invoices
  */
 function getNumberInvoicesPieChart($mode)
 {
@@ -487,13 +488,17 @@ function getNumberInvoicesPieChart($mode)
 		$sql .= ", sum(".$db->ifsql("f.date_lim_reglement > '".date_format($datenowadd30, 'Y-m-d')."'", 1, 0).") as nbnotlate30";
 		if ($mode == 'customers') {
 			$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
-		} elseif ($mode == 'fourn') {
+		} elseif ($mode == 'fourn' || $mode == 'suppliers') {
 			$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
 		} else {
 			return '';
 		}
 		$sql .= " WHERE f.type <> 2";
 		$sql .= " AND f.fk_statut = 1";
+		if (isset($user->socid) && $user->socid > 0) {
+			$sql .= " AND f.fk_soc = ".((int) $user->socid);
+		}
+
 		$resql = $db->query($sql);
 		if ($resql) {
 			$num = $db->num_rows($resql);
@@ -519,14 +524,15 @@ function getNumberInvoicesPieChart($mode)
 				$result = '<div class="div-table-responsive-no-min">';
 				$result .= '<table class="noborder nohover centpercent">';
 				$result .= '<tr class="liste_titre">';
-				$result .= '<td colspan="2">'.$langs->trans("Statistics").' - ';
+				$result .= '<td>'.$langs->trans("Statistics").' - ';
 				if ($mode == 'customers') {
-					$result .= $langs->trans("CustomerInvoice").'</td>';
-				} elseif ($mode == 'fourn') {
-					$result .= $langs->trans("SupplierInvoice").'</td>';
+					$result .= $langs->trans("CustomerInvoice");
+				} elseif ($mode == 'fourn' || $mode == 'suppliers') {
+					$result .= $langs->trans("SupplierInvoice");
 				} else {
 					return '';
 				}
+				$result .= '</td>';
 				$result .= '</tr>';
 
 				$dolgraph = new DolGraph();
@@ -539,13 +545,13 @@ function getNumberInvoicesPieChart($mode)
 				$dolgraph->setWidth('300');
 				if ($mode == 'customers') {
 					$dolgraph->draw('idgraphcustomerinvoices');
-				} elseif ($mode == 'fourn') {
+				} elseif ($mode == 'fourn' || $mode == 'suppliers') {
 					$dolgraph->draw('idgraphfourninvoices');
 				} else {
 					return '';
 				}
 				$result .= '<tr maxwidth="255">';
-				$result .= '<td align="center" colspan="2">'.$dolgraph->show($total ? 0 : 1).'</td>';
+				$result .= '<td class="center">'.$dolgraph->show($total ? 0 : 1).'</td>';
 				$result .= '</tr>';
 				$result .= '</table>';
 				$result .= '</div>';
diff --git a/htdocs/fourn/facture/index.php b/htdocs/fourn/facture/index.php
index e76426f54c2..c695eed9285 100644
--- a/htdocs/fourn/facture/index.php
+++ b/htdocs/fourn/facture/index.php
@@ -58,8 +58,8 @@ print load_fiche_titre($langs->trans("SupplierInvoicesArea"), '', 'supplier_invo
 print '<div class="fichecenter">';
 
 print '<div class="fichethirdleft">';
-
-print getPurchaseInvoicePieChart($socid);
+print getNumberInvoicesPieChart('suppliers');
+//print getPurchaseInvoicePieChart($socid);
 print '<br>';
 print getDraftSupplierTable($maxDraftCount, $socid);
 

From c40bc085b2dd309bd09118172d4084599eafd651 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 10 Jun 2021 00:55:10 +0200
Subject: [PATCH 0515/1497] Fix v14

---
 htdocs/core/lib/invoice.lib.php | 40 +++++++++++++++++++--------------
 htdocs/langs/en_US/bills.lang   |  1 +
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/htdocs/core/lib/invoice.lib.php b/htdocs/core/lib/invoice.lib.php
index 43cff7d3c3e..b6618b5df26 100644
--- a/htdocs/core/lib/invoice.lib.php
+++ b/htdocs/core/lib/invoice.lib.php
@@ -505,6 +505,7 @@ function getNumberInvoicesPieChart($mode)
 			$i = 0;
 			$total = 0;
 			$dataseries = array();
+
 			while ($i < $num) {
 				$obj = $db->fetch_object($resql);
 				$dataseries = array(array($langs->trans('InvoiceLate30Days'),$obj->nblate30)
@@ -520,21 +521,22 @@ function getNumberInvoicesPieChart($mode)
 			}
 
 			$colorseries = array($badgeStatus8, $badgeStatus1, $badgeStatus3, $badgeStatus4, $badgeStatus11, '-'.$badgeStatus11);
-			if ($conf->use_javascript_ajax) {
-				$result = '<div class="div-table-responsive-no-min">';
-				$result .= '<table class="noborder nohover centpercent">';
-				$result .= '<tr class="liste_titre">';
-				$result .= '<td>'.$langs->trans("Statistics").' - ';
-				if ($mode == 'customers') {
-					$result .= $langs->trans("CustomerInvoice");
-				} elseif ($mode == 'fourn' || $mode == 'suppliers') {
-					$result .= $langs->trans("SupplierInvoice");
-				} else {
-					return '';
-				}
-				$result .= '</td>';
-				$result .= '</tr>';
 
+			$result = '<div class="div-table-responsive-no-min">';
+			$result .= '<table class="noborder nohover centpercent">';
+			$result .= '<tr class="liste_titre">';
+			$result .= '<td>'.$langs->trans("Statistics").' - ';
+			if ($mode == 'customers') {
+				$result .= $langs->trans("CustomerInvoice");
+			} elseif ($mode == 'fourn' || $mode == 'suppliers') {
+				$result .= $langs->trans("SupplierInvoice");
+			} else {
+				return '';
+			}
+			$result .= '</td>';
+			$result .= '</tr>';
+
+			if ($conf->use_javascript_ajax) {
 				$dolgraph = new DolGraph();
 				$dolgraph->SetData($dataseries);
 				$dolgraph->SetDataColor(array_values($colorseries));
@@ -551,11 +553,15 @@ function getNumberInvoicesPieChart($mode)
 					return '';
 				}
 				$result .= '<tr maxwidth="255">';
-				$result .= '<td class="center">'.$dolgraph->show($total ? 0 : 1).'</td>';
+				$result .= '<td class="center">'.$dolgraph->show($total ? 0 : $langs->trans("NoOpenInvoice")).'</td>';
 				$result .= '</tr>';
-				$result .= '</table>';
-				$result .= '</div>';
+			} else {
+				// Print text lines
 			}
+
+			$result .= '</table>';
+			$result .= '</div>';
+
 			return $result;
 		} else {
 			dol_print_error($db);
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index 940da4e35b4..0c660de8e22 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -259,6 +259,7 @@ DateMaxPayment=Payment due on
 DateInvoice=Invoice date
 DatePointOfTax=Point of tax
 NoInvoice=No invoice
+NoOpenInvoice=No open invoice
 ClassifyBill=Classify invoice
 SupplierBillsToPay=Unpaid vendor invoices
 CustomerBillsUnpaid=Unpaid customer invoices

From ea0db5a574db32eab922845e924b2577eccc1eab Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 10 Jun 2021 01:10:35 +0200
Subject: [PATCH 0516/1497] Fix popup of invoice

---
 htdocs/core/lib/functions.lib.php |  8 ++++++--
 htdocs/core/lib/invoice.lib.php   | 16 ++++++++++++----
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 1857be0146c..dd4d8cba1f2 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3515,7 +3515,9 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'github', 'jabber', 'skype', 'twitter', 'facebook', 'linkedin', 'instagram', 'snapchat', 'youtube', 'google-plus-g', 'whatsapp',
 				'chevron-left', 'chevron-right', 'chevron-down', 'chevron-top', 'commercial', 'companies',
 				'generic', 'home', 'hrm', 'members', 'products', 'invoicing',
-				'partnership', 'payment', 'pencil-ruler', 'preview', 'project', 'projectpub', 'projecttask', 'question', 'refresh', 'salary', 'shipment', 'supplier_invoice', 'technic', 'ticket',
+				'partnership', 'payment', 'pencil-ruler', 'preview', 'project', 'projectpub', 'projecttask', 'question', 'refresh', 'salary', 'shipment',
+				'supplier_invoice', 'supplier_invoicea', 'supplier_invoicer', 'supplier_invoiced',
+				'technic', 'ticket',
 				'error', 'warning',
 				'recent', 'reception', 'recruitmentcandidature', 'recruitmentjobposition', 'resource',
 				'shapes', 'supplier', 'supplier_proposal', 'supplier_order', 'supplier_invoice',
@@ -3536,7 +3538,9 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 
 			$arrayconvpictotofa = array(
 				'account'=>'university', 'accountline'=>'receipt', 'accountancy'=>'search-dollar', 'action'=>'calendar-alt', 'add'=>'plus-circle', 'address'=> 'address-book', 'asset'=>'money-check-alt', 'autofill'=>'fill',
-				'bank_account'=>'university', 'bill'=>'file-invoice-dollar', 'billa'=>'file-excel', 'billr'=>'file-invoice-dollar', 'supplier_invoicea'=>'file-excel', 'billd'=>'file-medical', 'supplier_invoiced'=>'file-medical',
+				'bank_account'=>'university',
+				'bill'=>'file-invoice-dollar', 'billa'=>'file-excel', 'billr'=>'file-invoice-dollar', 'billd'=>'file-medical',
+				'supplier_invoice'=>'file-invoice-dollar', 'supplier_invoicea'=>'file-excel', 'supplier_invoicer'=>'file-invoice-dollar', 'supplier_invoiced'=>'file-medical',
 				'bom'=>'shapes',
 				'chart'=>'chart-line', 'company'=>'building', 'contact'=>'address-book', 'contract'=>'suitcase', 'collab'=>'people-arrows', 'conversation'=>'comments', 'country'=>'globe-americas', 'cron'=>'business-time',
 				'donation'=>'file-alt', 'dynamicprice'=>'hand-holding-usd',
diff --git a/htdocs/core/lib/invoice.lib.php b/htdocs/core/lib/invoice.lib.php
index b6618b5df26..c328d659b93 100644
--- a/htdocs/core/lib/invoice.lib.php
+++ b/htdocs/core/lib/invoice.lib.php
@@ -854,8 +854,8 @@ function getCustomerInvoiceLatestEditTable($maxCount = 5, $socid = 0)
 {
 	global $conf, $db, $langs, $user;
 
-	$sql = "SELECT f.rowid, f.entity, f.ref, f.fk_statut as status, f.paye, s.nom as socname, s.rowid as socid, s.canvas, s.client,";
-	$sql .= " f.datec";
+	$sql = "SELECT f.rowid, f.entity, f.ref, f.fk_statut as status, f.paye, f.type, f.total_ht, f.total_tva, f.total_ttc, f.datec,";
+	$sql .= " s.nom as socname, s.rowid as socid, s.canvas, s.client";
 	$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
 	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
 	if (!$user->rights->societe->client->voir && !$socid) {
@@ -904,6 +904,10 @@ function getCustomerInvoiceLatestEditTable($maxCount = 5, $socid = 0)
 		$objectstatic->ref = $obj->ref;
 		$objectstatic->paye = $obj->paye;
 		$objectstatic->statut = $obj->status;
+		$objectstatic->total_ht = $obj->total_ht;
+		$objectstatic->total_tva = $obj->total_tva;
+		$objectstatic->total_ttc = $obj->total_ttc;
+		$objectstatic->type = $obj->type;
 
 		$companystatic->id = $obj->socid;
 		$companystatic->name = $obj->socname;
@@ -952,8 +956,8 @@ function getPurchaseInvoiceLatestEditTable($maxCount = 5, $socid = 0)
 {
 	global $conf, $db, $langs, $user;
 
-	$sql = "SELECT f.rowid, f.entity, f.ref, f.fk_statut as status, f.paye, s.nom as socname, s.rowid as socid, s.canvas, s.client,";
-	$sql .= " f.datec";
+	$sql = "SELECT f.rowid, f.entity, f.ref, f.fk_statut as status, f.paye, f.total_ht, f.total_tva, f.total_ttc, f.type, f.ref_supplier, f.datec,";
+	$sql .= " s.nom as socname, s.rowid as socid, s.canvas, s.client";
 	$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
 	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
 	if (!$user->rights->societe->client->voir && !$socid) {
@@ -1002,6 +1006,10 @@ function getPurchaseInvoiceLatestEditTable($maxCount = 5, $socid = 0)
 		$objectstatic->ref = $obj->ref;
 		$objectstatic->paye = $obj->paye;
 		$objectstatic->statut = $obj->status;
+		$objectstatic->total_ht = $obj->total_ht;
+		$objectstatic->total_tva = $obj->total_tva;
+		$objectstatic->total_ttc = $obj->total_ttc;
+		$objectstatic->type = $obj->type;
 
 		$companystatic->id = $obj->socid;
 		$companystatic->name = $obj->socname;

From 4c89a1146c1553c8cdda1693057e7e06617f9a5c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 10 Jun 2021 01:13:50 +0200
Subject: [PATCH 0517/1497] Fix popup

---
 htdocs/compta/index.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index 18519955bf6..8db217747ef 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -267,7 +267,7 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 	$langs->load("boxes");
 	$facstatic = new FactureFournisseur($db);
 
-	$sql = "SELECT ff.rowid, ff.ref, ff.fk_statut as status, ff.libelle, ff.total_ht, ff.total_tva, ff.total_ttc, ff.tms, ff.paye";
+	$sql = "SELECT ff.rowid, ff.ref, ff.fk_statut as status, ff.type, ff.libelle, ff.total_ht, ff.total_tva, ff.total_ttc, ff.tms, ff.paye, ff.ref_supplier";
 	$sql .= ", s.nom as name";
 	$sql .= ", s.rowid as socid";
 	$sql .= ", s.code_fournisseur, s.code_compta_fournisseur, s.email";
@@ -290,7 +290,7 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 	$reshook = $hookmanager->executeHooks('printFieldListWhereSupplierLastModified', $parameters);
 	$sql .= $hookmanager->resPrint;
 
-	$sql .= " GROUP BY ff.rowid, ff.ref, ff.fk_statut, ff.libelle, ff.total_ht, ff.tva, ff.total_tva, ff.total_ttc, ff.tms, ff.paye,";
+	$sql .= " GROUP BY ff.rowid, ff.ref, ff.fk_statut, ff.type, ff.libelle, ff.total_ht, ff.tva, ff.total_tva, ff.total_ttc, ff.tms, ff.paye, ff.ref_supplier,";
 	$sql .= " s.nom, s.rowid, s.code_fournisseur, s.code_compta_fournisseur, s.email";
 	$sql .= " ORDER BY ff.tms DESC ";
 	$sql .= $db->plimit($max, 0);
@@ -332,6 +332,8 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 				$facstatic->total_ttc = $obj->total_ttc;
 				$facstatic->statut = $obj->status;
 				$facstatic->paye = $obj->paye;
+				$facstatic->type = $obj->type;
+				$facstatic->ref_supplier = $obj->ref_supplier;
 
 				$thirdpartystatic->id = $obj->socid;
 				$thirdpartystatic->name = $obj->name;

From ae6d2ba9b51013747c650926e445a7b914b067e7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 10 Jun 2021 01:56:20 +0200
Subject: [PATCH 0518/1497] Fix missing user creation/modif of template invoice

---
 .../compta/facture/invoicetemplate_list.php   | 51 +++++++++++++++++--
 htdocs/compta/facture/list.php                |  2 +-
 2 files changed, 47 insertions(+), 6 deletions(-)

diff --git a/htdocs/compta/facture/invoicetemplate_list.php b/htdocs/compta/facture/invoicetemplate_list.php
index 5f7e277076c..af6678ffd71 100644
--- a/htdocs/compta/facture/invoicetemplate_list.php
+++ b/htdocs/compta/facture/invoicetemplate_list.php
@@ -137,9 +137,11 @@ $arrayfields = array(
 	'f.nb_gen_done'=>array('label'=>"NbOfGenerationDoneShort", 'checked'=>1),
 	'f.date_last_gen'=>array('label'=>"DateLastGenerationShort", 'checked'=>1),
 	'f.date_when'=>array('label'=>"NextDateToExecutionShort", 'checked'=>1),
-	'status'=>array('label'=>"Status", 'checked'=>1, 'position'=>100),
-	'f.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>500),
-	'f.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500),
+	'f.fk_user_author'=>array('label'=>"UserCreation", 'checked'=>0, 'position'=>500),
+	'f.fk_user_modif'=>array('label'=>"UserModification", 'checked'=>0, 'position'=>505),
+	'f.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>520),
+	'f.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>525),
+	'status'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000),
 );
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
@@ -240,6 +242,7 @@ if (!empty($conf->projet->enabled)) {
 }
 $companystatic = new Societe($db);
 $invoicerectmp = new FactureRec($db);
+$tmpuser = new User($db);
 
 $now = dol_now();
 $tmparray = dol_getdate($now);
@@ -252,7 +255,7 @@ $today = dol_mktime(23, 59, 59, $tmparray['mon'], $tmparray['mday'], $tmparray['
 
 $sql = "SELECT s.nom as name, s.rowid as socid, f.rowid as facid, f.titre as title, f.total_ht, f.total_tva, f.total_ttc, f.frequency, f.unit_frequency,";
 $sql .= " f.nb_gen_done, f.nb_gen_max, f.date_last_gen, f.date_when, f.suspended,";
-$sql .= " f.datec, f.tms,";
+$sql .= " f.datec, f.fk_user_author, f.tms, f.fk_user_modif,";
 $sql .= " f.fk_cond_reglement, f.fk_mode_reglement";
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
@@ -274,7 +277,7 @@ if (!$user->rights->societe->client->voir && !$socid) {
 $sql .= " WHERE f.fk_soc = s.rowid";
 $sql .= ' AND f.entity IN ('.getEntity('invoice').')';
 if (!$user->rights->societe->client->voir && !$socid) {
-	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 }
 if ($search_ref) {
 	$sql .= natural_search('f.titre', $search_ref);
@@ -534,6 +537,16 @@ if ($resql) {
 	$parameters = array('arrayfields'=>$arrayfields);
 	$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
+	// User creation
+	if (!empty($arrayfields['f.fk_user_author']['checked'])) {
+		print '<td class="liste_titre">';
+		print '</td>';
+	}
+	// User modification
+	if (!empty($arrayfields['f.fk_user_modif']['checked'])) {
+		print '<td class="liste_titre">';
+		print '</td>';
+	}
 	// Date creation
 	if (!empty($arrayfields['f.datec']['checked'])) {
 		print '<td class="liste_titre">';
@@ -602,6 +615,12 @@ if ($resql) {
 	if (!empty($arrayfields['f.date_when']['checked'])) {
 		print_liste_field_titre($arrayfields['f.date_when']['label'], $_SERVER['PHP_SELF'], "f.date_when", "", $param, 'align="center"', $sortfield, $sortorder);
 	}
+	if (!empty($arrayfields['f.fk_user_author']['checked'])) {
+		print_liste_field_titre($arrayfields['f.fk_user_author']['label'], $_SERVER['PHP_SELF'], "f.fk_user_author", "", $param, 'align="center"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['f.fk_user_modif']['checked'])) {
+		print_liste_field_titre($arrayfields['f.fk_user_modif']['label'], $_SERVER['PHP_SELF'], "f.fk_user_modif", "", $param, 'align="center"', $sortfield, $sortorder);
+	}
 	if (!empty($arrayfields['f.datec']['checked'])) {
 		print_liste_field_titre($arrayfields['f.datec']['label'], $_SERVER['PHP_SELF'], "f.datec", "", $param, 'align="center"', $sortfield, $sortorder);
 	}
@@ -754,6 +773,28 @@ if ($resql) {
 					$totalarray['nbfield']++;
 				}
 			}
+			if (!empty($arrayfields['f.fk_user_author']['checked'])) {
+				print '<td class="center tdoverflowmax150">';
+				if ($objp->fk_user_author > 0) {
+					$tmpuser->fetch($objp->fk_user_author);
+					print $tmpuser->getNomUrl(1);
+				}
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			if (!empty($arrayfields['f.fk_user_modif']['checked'])) {
+				print '<td class="center tdoverflowmax150">';
+				if ($objp->fk_user_author > 0) {
+					$tmpuser->fetch($objp->fk_user_author);
+					print $tmpuser->getNomUrl(1);
+				}
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
 			if (!empty($arrayfields['f.datec']['checked'])) {
 				print '<td class="center">';
 				print dol_print_date($db->jdate($objp->datec), 'dayhour');
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index a375bc677f2..de6c3f66065 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -240,7 +240,7 @@ $arrayfields = array(
 	'total_margin_rate' => array('label' => 'MarginRate', 'checked' => 0, 'position' => 302, 'enabled' => (empty($conf->margin->enabled) || !$user->rights->margins->liretous || empty($conf->global->DISPLAY_MARGIN_RATES) ? 0 : 1)),
 	'total_mark_rate' => array('label' => 'MarkRate', 'checked' => 0, 'position' => 303, 'enabled' => (empty($conf->margin->enabled) || !$user->rights->margins->liretous || empty($conf->global->DISPLAY_MARK_RATES) ? 0 : 1)),
 	'f.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>500),
-	'f.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500),
+	'f.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>502),
 	'f.note_public'=>array('label'=>'NotePublic', 'checked'=>0, 'position'=>510, 'enabled'=>(empty($conf->global->MAIN_LIST_ALLOW_PUBLIC_NOTES))),
 	'f.note_private'=>array('label'=>'NotePrivate', 'checked'=>0, 'position'=>511, 'enabled'=>(empty($conf->global->MAIN_LIST_ALLOW_PRIVATE_NOTES))),
 	'f.fk_statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000),

From 5f925d9e3b183f32bf8ea0d455b2d66edcf9c53f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 10 Jun 2021 02:10:58 +0200
Subject: [PATCH 0519/1497] Fix total -> total_ht

---
 htdocs/compta/facture/invoicetemplate_list.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/htdocs/compta/facture/invoicetemplate_list.php b/htdocs/compta/facture/invoicetemplate_list.php
index af6678ffd71..19da4b97f63 100644
--- a/htdocs/compta/facture/invoicetemplate_list.php
+++ b/htdocs/compta/facture/invoicetemplate_list.php
@@ -654,6 +654,9 @@ if ($resql) {
 			$invoicerectmp->nb_gen_max = $objp->nb_gen_max;
 			$invoicerectmp->nb_gen_done = $objp->nb_gen_done;
 			$invoicerectmp->ref = $objp->title;
+			$invoicerectmp->total_ht = $objp->total_ht;
+			$invoicerectmp->total_tva = $objp->total_tva;
+			$invoicerectmp->total_ttc = $objp->total_ttc;
 
 			print '<tr class="oddeven">';
 
@@ -673,7 +676,7 @@ if ($resql) {
 				}
 			}
 			if (!empty($arrayfields['f.total_ht']['checked'])) {
-				print '<td class="nowrap right amount">'.price($objp->total).'</td>'."\n";
+				print '<td class="nowrap right amount">'.price($objp->total_ht).'</td>'."\n";
 				if (!$i) {
 					$totalarray['nbfield']++;
 				}

From 53af424a3dc082ace87de3ba16804b4fe5acc7dd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 10 Jun 2021 02:12:29 +0200
Subject: [PATCH 0520/1497] Fix total tva

---
 htdocs/compta/facture/invoicetemplate_list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/compta/facture/invoicetemplate_list.php b/htdocs/compta/facture/invoicetemplate_list.php
index 19da4b97f63..c60690ce96b 100644
--- a/htdocs/compta/facture/invoicetemplate_list.php
+++ b/htdocs/compta/facture/invoicetemplate_list.php
@@ -686,7 +686,7 @@ if ($resql) {
 				$totalarray['val']['f.total_ht'] += $objp->total_ht;
 			}
 			if (!empty($arrayfields['f.total_tva']['checked'])) {
-				print '<td class="nowrap right amount">'.price($objp->total_vat).'</td>'."\n";
+				print '<td class="nowrap right amount">'.price($objp->total_tva).'</td>'."\n";
 				if (!$i) {
 					$totalarray['nbfield']++;
 				}

From 3d26ad4cf8f67c8f7d94defc87f3f4a6d66a74c4 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Thu, 10 Jun 2021 05:59:29 +0200
Subject: [PATCH 0521/1497] NEW Add field date from/to in supplier invoice list

---
 htdocs/fourn/facture/list.php | 158 +++++++++++++++++++++++-----------
 1 file changed, 106 insertions(+), 52 deletions(-)

diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 8578f82137d..72ca65bc409 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -1,17 +1,18 @@
 <?php
-/* Copyright (C) 2002-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2019 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2013 Regis Houssin        <regis.houssin@inodbox.com>
- * Copyright (C) 2013-2019 Philippe Grand       <philippe.grand@atoo-net.com>
- * Copyright (C) 2013	   Florian Henry        <florian.henry@open-concept.pro>
- * Copyright (C) 2013      Cédric Salvador      <csalvador@gpcsolutions.fr>
- * Copyright (C) 2015      Marcos García        <marcosgdf@gmail.com>
- * Copyright (C) 2015-2007 Juanjo Menent        <jmenent@2byte.es>
- * Copyright (C) 2015 	   Abbes Bahfir         <bafbes@gmail.com>
- * Copyright (C) 2015-2016 Ferran Marcet        <fmarcet@2byte.es>
- * Copyright (C) 2017      Josep Lluís Amador   <joseplluis@lliuretic.cat>
- * Copyright (C) 2018      Charlene Benke       <charlie@patas-monkey.com>
- * Copyright (C) 2018-2020 Frédéric France      <frederic.france@netlogic.fr>
+/* Copyright (C) 2002-2006	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2019	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2013	Regis Houssin			<regis.houssin@inodbox.com>
+ * Copyright (C) 2013-2019	Philippe Grand			<philippe.grand@atoo-net.com>
+ * Copyright (C) 2013		Florian Henry			<florian.henry@open-concept.pro>
+ * Copyright (C) 2013		Cédric Salvador			<csalvador@gpcsolutions.fr>
+ * Copyright (C) 2015		Marcos García			<marcosgdf@gmail.com>
+ * Copyright (C) 2015-2007	Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2015		Abbes Bahfir			<bafbes@gmail.com>
+ * Copyright (C) 2015-2016	Ferran Marcet			<fmarcet@2byte.es>
+ * Copyright (C) 2017		Josep Lluís Amador		<joseplluis@lliuretic.cat>
+ * Copyright (C) 2018		Charlene Benke			<charlie@patas-monkey.com>
+ * Copyright (C) 2018-2020	Frédéric France			<frederic.france@netlogic.fr>
+ * Copyright (C) 2019-2021	Alexandre Spangaro		<aspangaro@open-dsi.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -101,12 +102,22 @@ $search_country = GETPOST("search_country", 'int');
 $search_type_thirdparty = GETPOST("search_type_thirdparty", 'int');
 $search_user = GETPOST('search_user', 'int');
 $search_sale = GETPOST('search_sale', 'int');
-$day = GETPOST('day', 'int');
-$month = GETPOST('month', 'int');
-$year = GETPOST('year', 'int');
-$day_lim = GETPOST('day_lim', 'int');
-$month_lim = GETPOST('month_lim', 'int');
-$year_lim	= GETPOST('year_lim', 'int');
+$search_date_startday = GETPOST('search_date_startday', 'int');
+$search_date_startmonth = GETPOST('search_date_startmonth', 'int');
+$search_date_startyear = GETPOST('search_date_startyear', 'int');
+$search_date_endday = GETPOST('search_date_endday', 'int');
+$search_date_endmonth = GETPOST('search_date_endmonth', 'int');
+$search_date_endyear = GETPOST('search_date_endyear', 'int');
+$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);	// Use tzserver
+$search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
+$search_datelimit_startday = GETPOST('search_datelimit_startday', 'int');
+$search_datelimit_startmonth = GETPOST('search_datelimit_startmonth', 'int');
+$search_datelimit_startyear = GETPOST('search_datelimit_startyear', 'int');
+$search_datelimit_endday = GETPOST('search_datelimit_endday', 'int');
+$search_datelimit_endmonth = GETPOST('search_datelimit_endmonth', 'int');
+$search_datelimit_endyear = GETPOST('search_datelimit_endyear', 'int');
+$search_datelimit_start = dol_mktime(0, 0, 0, $search_datelimit_startmonth,$search_datelimit_startday, $search_datelimit_startyear);
+$search_datelimit_end = dol_mktime(23, 59, 59, $search_datelimit_endmonth,$search_datelimit_endday, $search_datelimit_endyear);
 $toselect = GETPOST('toselect', 'array');
 $search_btn = GETPOST('button_search', 'alpha');
 $search_remove_btn = GETPOST('button_removefilter', 'alpha');
@@ -257,12 +268,22 @@ if (empty($reshook)) {
 		$search_type = '';
 		$search_country = '';
 		$search_type_thirdparty = '';
-		$year = "";
-		$month = "";
-		$day = "";
-		$year_lim = "";
-		$month_lim = "";
-		$day_lim = "";
+		$search_date_startday = '';
+		$search_date_startmonth = '';
+		$search_date_startyear = '';
+		$search_date_endday = '';
+		$search_date_endmonth = '';
+		$search_date_endyear = '';
+		$search_date_start = '';
+		$search_date_end = '';
+		$search_datelimit_startday = '';
+		$search_datelimit_startmonth = '';
+		$search_datelimit_startyear = '';
+		$search_datelimit_endday = '';
+		$search_datelimit_endmonth = '';
+		$search_datelimit_endyear = '';
+		$search_datelimit_start = '';
+		$search_datelimit_end = '';
 		$toselect = '';
 		$search_array_options = array();
 		$filter = '';
@@ -548,8 +569,18 @@ if ($search_paymentmode > 0) {
 if ($search_paymentcond > 0) {
 	$sql .= " AND f.fk_cond_reglement = ".((int) $search_paymentcond);
 }
-$sql .= dolSqlDateFilter("f.datef", $day, $month, $year);
-$sql .= dolSqlDateFilter("f.date_lim_reglement", $day_lim, $month_lim, $year_lim);
+if ($search_date_start) {
+	$sql .= " AND f.datef >= '" . $db->idate($search_date_start) . "'";
+}
+if ($search_date_end) {
+	$sql .= " AND f.datef <= '" . $db->idate($search_date_end) . "'";
+}
+if ($search_datelimit_start) {
+	$sql .= " AND f.date_lim_reglement >= '" . $db->idate($search_datelimit_start) . "'";
+}
+if ($search_datelimit_end) {
+	$sql .= " AND f.date_lim_reglement <= '" . $db->idate($search_datelimit_end) . "'";
+}
 if ($option == 'late') {
 	$sql .= " AND f.date_lim_reglement < '".$db->idate(dol_now() - $conf->facture->fournisseur->warning_delay)."'";
 }
@@ -669,23 +700,41 @@ if ($resql) {
 	if ($search_all) {
 		$param .= '&search_all='.urlencode($search_all);
 	}
-	if ($day) {
-		$param .= '&day='.urlencode($day);
+	if ($search_date_startday) {
+		$param .= '&search_date_startday='.urlencode($search_date_startday);
 	}
-	if ($month) {
-		$param .= '&month='.urlencode($month);
+	if ($search_date_startmonth) {
+		$param .= '&search_date_startmonth='.urlencode($search_date_startmonth);
 	}
-	if ($year) {
-		$param .= '&year='.urlencode($year);
+	if ($search_date_startyear) {
+		$param .= '&search_date_startyear='.urlencode($search_date_startyear);
 	}
-	if ($day_lim) {
-		$param .= '&day_lim='.urlencode($day_lim);
+	if ($search_date_endday) {
+		$param .= '&search_date_endday='.urlencode($search_date_endday);
 	}
-	if ($month_lim) {
-		$param .= '&month_lim='.urlencode($month_lim);
+	if ($search_date_endmonth) {
+		$param .= '&search_date_endmonth='.urlencode($search_date_endmonth);
 	}
-	if ($year_lim) {
-		$param .= '&year_lim='.urlencode($year_lim);
+	if ($search_date_endyear) {
+		$param .= '&search_date_endyear='.urlencode($search_date_endyear);
+	}
+	if ($search_datelimit_startday) {
+		$param .= '&search_datelimit_startday='.urlencode($search_datelimit_startday);
+	}
+	if ($search_datelimit_startmonth) {
+		$param .= '&search_datelimit_startmonth='.urlencode($search_datelimit_startmonth);
+	}
+	if ($search_datelimit_startyear) {
+		$param .= '&search_datelimit_startyear='.urlencode($search_datelimit_startyear);
+	}
+	if ($search_datelimit_endday) {
+		$param .= '&search_datelimit_endday='.urlencode($search_datelimit_endday);
+	}
+	if ($search_datelimit_endmonth) {
+		$param .= '&search_datelimit_endmonth='.urlencode($search_datelimit_endmonth);
+	}
+	if ($search_datelimit_endyear) {
+		$param .= '&search_datelimit_endyear='.urlencode($search_datelimit_endyear);
 	}
 	if ($search_ref) {
 		$param .= '&search_ref='.urlencode($search_ref);
@@ -956,23 +1005,28 @@ if ($resql) {
 	}
 	// Date invoice
 	if (!empty($arrayfields['f.datef']['checked'])) {
-		print '<td class="liste_titre nowraponall center">';
-		if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
-			print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="day" value="'.dol_escape_htmltag($day).'">';
-		}
-		print '<input class="flat width25 valignmiddle" type="text" size="1" maxlength="2" name="month" value="'.$month.'">';
-		$formother->select_year($year ? $year : -1, 'year', 1, 20, 5);
+		print '<td class="liste_titre center">';
+		print '<div class="nowrap">';
+		print $form->selectDate($search_date_start ? $search_date_start : -1, 'search_date_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+		print '</div>';
+		print '<div class="nowrap">';
+		print $form->selectDate($search_date_end ? $search_date_end : -1, 'search_date_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
+		print '</div>';
 		print '</td>';
 	}
 	// Date due
 	if (!empty($arrayfields['f.date_lim_reglement']['checked'])) {
-		print '<td class="liste_titre nowraponall center">';
-		if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
-			print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="day_lim" value="'.dol_escape_htmltag($day_lim).'">';
-		}
-		print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="month_lim" value="'.$month_lim.'">';
-		$formother->select_year($year_lim ? $year_lim : -1, 'year_lim', 1, 20, 5);
-		print '<br><input type="checkbox" class="paddingright paddingleft" name="option" id="option" value="late"'.($option == 'late' ? ' checked' : '').'><label for="option">'.$langs->trans("Late").'</label>';
+		print '<td class="liste_titre center">';
+		print '<div class="nowrap">';
+		/*
+		print $langs->trans('From').' ';
+		print $form->selectDate($search_datelimit_start ? $search_datelimit_start : -1, 'search_datelimit_start', 0, 0, 1);
+		print '</div>';
+		print '<div class="nowrap">';
+		print $langs->trans('to').' ';*/
+		print $form->selectDate($search_datelimit_end ? $search_datelimit_end : -1, 'search_datelimit_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("Before"));
+		print '<br><input type="checkbox" name="search_option" value="late"'.($option == 'late' ? ' checked' : '').'> '.$langs->trans("Alert");
+		print '</div>';
 		print '</td>';
 	}
 	// Project

From 17bdd0b5bcc0bbe78028a1115c101bc4ae5fc818 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Thu, 10 Jun 2021 04:03:51 +0000
Subject: [PATCH 0522/1497] Fixing style errors.

---
 htdocs/fourn/facture/list.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 72ca65bc409..04dd46035b3 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -116,8 +116,8 @@ $search_datelimit_startyear = GETPOST('search_datelimit_startyear', 'int');
 $search_datelimit_endday = GETPOST('search_datelimit_endday', 'int');
 $search_datelimit_endmonth = GETPOST('search_datelimit_endmonth', 'int');
 $search_datelimit_endyear = GETPOST('search_datelimit_endyear', 'int');
-$search_datelimit_start = dol_mktime(0, 0, 0, $search_datelimit_startmonth,$search_datelimit_startday, $search_datelimit_startyear);
-$search_datelimit_end = dol_mktime(23, 59, 59, $search_datelimit_endmonth,$search_datelimit_endday, $search_datelimit_endyear);
+$search_datelimit_start = dol_mktime(0, 0, 0, $search_datelimit_startmonth, $search_datelimit_startday, $search_datelimit_startyear);
+$search_datelimit_end = dol_mktime(23, 59, 59, $search_datelimit_endmonth, $search_datelimit_endday, $search_datelimit_endyear);
 $toselect = GETPOST('toselect', 'array');
 $search_btn = GETPOST('button_search', 'alpha');
 $search_remove_btn = GETPOST('button_removefilter', 'alpha');

From b216c81c60305513415c7c9b1086d55df75eac0f Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Thu, 10 Jun 2021 06:22:03 +0200
Subject: [PATCH 0523/1497] FIX Customer invoice list - Pagination lost
 search_date_xxx information

---
 htdocs/compta/facture/list.php | 74 ++++++++++++++++++++++++++++------
 1 file changed, 61 insertions(+), 13 deletions(-)

diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index f655de32646..94326852d31 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -13,7 +13,7 @@
  * Copyright (C) 2015-2016 Ferran Marcet         <fmarcet@2byte.es>
  * Copyright (C) 2017      Josep Lluís Amador    <joseplluis@lliuretic.cat>
  * Copyright (C) 2018      Charlene Benke        <charlie@patas-monkey.com>
- * Copyright (C) 2019	   Alexandre Spangaro	 <aspangaro@open-dsi.fr>
+ * Copyright (C) 2019-2021 Alexandre Spangaro	 <aspangaro@open-dsi.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -105,12 +105,30 @@ $search_country = GETPOST("search_country", 'int');
 $search_type_thirdparty = GETPOST("search_type_thirdparty", 'int');
 $search_user = GETPOST('search_user', 'int');
 $search_sale = GETPOST('search_sale', 'int');
-$search_date_start = dol_mktime(0, 0, 0, GETPOST('search_date_startmonth', 'int'), GETPOST('search_date_startday', 'int'), GETPOST('search_date_startyear', 'int'));
-$search_date_end = dol_mktime(23, 59, 59, GETPOST('search_date_endmonth', 'int'), GETPOST('search_date_endday', 'int'), GETPOST('search_date_endyear', 'int'));
-$search_date_valid_start = dol_mktime(0, 0, 0, GETPOST('search_date_valid_startmonth', 'int'), GETPOST('search_date_valid_startday', 'int'), GETPOST('search_date_valid_startyear', 'int'));
-$search_date_valid_end = dol_mktime(23, 59, 59, GETPOST('search_date_valid_endmonth', 'int'), GETPOST('search_date_valid_endday', 'int'), GETPOST('search_date_valid_endyear', 'int'));
-$search_datelimit_start = dol_mktime(0, 0, 0, GETPOST('search_datelimit_startmonth', 'int'), GETPOST('search_datelimit_startday', 'int'), GETPOST('search_datelimit_startyear', 'int'));
-$search_datelimit_end = dol_mktime(23, 59, 59, GETPOST('search_datelimit_endmonth', 'int'), GETPOST('search_datelimit_endday', 'int'), GETPOST('search_datelimit_endyear', 'int'));
+$search_date_startday = GETPOST('search_date_startday', 'int');
+$search_date_startmonth = GETPOST('search_date_startmonth', 'int');
+$search_date_startyear = GETPOST('search_date_startyear', 'int');
+$search_date_endday = GETPOST('search_date_endday', 'int');
+$search_date_endmonth = GETPOST('search_date_endmonth', 'int');
+$search_date_endyear = GETPOST('search_date_endyear', 'int');
+$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);	// Use tzserver
+$search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
+$search_date_valid_startday = GETPOST('search_date_valid_startday', 'int');
+$search_date_valid_startmonth = GETPOST('search_date_valid_startmonth', 'int');
+$search_date_valid_startyear = GETPOST('search_date_valid_startyear', 'int');
+$search_date_valid_endday = GETPOST('search_date_valid_endday', 'int');
+$search_date_valid_endmonth = GETPOST('search_date_valid_endmonth', 'int');
+$search_date_valid_endyear = GETPOST('search_date_valid_endyear', 'int');
+$search_date_valid_start = dol_mktime(0, 0, 0, $search_date_valid_startmonth, $search_date_valid_startday, $search_date_valid_startyear);
+$search_date_valid_end = dol_mktime(23, 59, 59, $search_date_valid_endmonth, $search_date_valid_endday, $search_date_valid_endyear);
+$search_datelimit_startday = GETPOST('search_datelimit_startday', 'int');
+$search_datelimit_startmonth = GETPOST('search_datelimit_startmonth', 'int');
+$search_datelimit_startyear = GETPOST('search_datelimit_startyear', 'int');
+$search_datelimit_endday = GETPOST('search_datelimit_endday', 'int');
+$search_datelimit_endmonth = GETPOST('search_datelimit_endmonth', 'int');
+$search_datelimit_endyear = GETPOST('search_datelimit_endyear', 'int');
+$search_datelimit_start = dol_mktime(0, 0, 0, $search_datelimit_startmonth, $search_datelimit_startday, $search_datelimit_startyear);
+$search_datelimit_end = dol_mktime(23, 59, 59, $search_datelimit_endmonth, $search_datelimit_endday, $search_datelimit_endyear);
 $search_categ_cus = trim(GETPOST("search_categ_cus", 'int'));
 $search_btn = GETPOST('button_search', 'alpha');
 $search_remove_btn = GETPOST('button_removefilter', 'alpha');
@@ -273,10 +291,28 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter',
 	$search_type = '';
 	$search_country = '';
 	$search_type_thirdparty = '';
+	$search_date_startday = '';
+	$search_date_startmonth = '';
+	$search_date_startyear = '';
+	$search_date_endday = '';
+	$search_date_endmonth = '';
+	$search_date_endyear = '';
 	$search_date_start = '';
 	$search_date_end = '';
+	$search_date_valid_startday = '';
+	$search_date_valid_startmonth = '';
+	$search_date_valid_startyear = '';
+	$search_date_valid_endday = '';
+	$search_date_valid_endmonth = '';
+	$search_date_valid_endyear = '';
 	$search_date_valid_start = '';
 	$search_date_valid_end = '';
+	$search_datelimit_startday = '';
+	$search_datelimit_startmonth = '';
+	$search_datelimit_startyear = '';
+	$search_datelimit_endday = '';
+	$search_datelimit_endmonth = '';
+	$search_datelimit_endyear = '';
 	$search_datelimit_start = '';
 	$search_datelimit_end = '';
 	$option = '';
@@ -623,12 +659,24 @@ if ($resql)
 	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
 	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
 	if ($sall)				 $param .= '&sall='.urlencode($sall);
-	if ($search_date_start)				$param .= '&search_date_start='.urlencode($search_date_start);
-	if ($search_date_end)				$param .= '&search_date_end='.urlencode($search_date_end);
-	if ($search_date_valid_start)		$param .= '&search_date_valid_start='.urlencode($search_date_valid_start);
-	if ($search_date_valid_end)			$param .= '&search_date_valid_end='.urlencode($search_date_valid_end);
-	if ($search_datelimit_start)		$param .= '&search_datelimit_start='.urlencode($search_datelimit_start);
-	if ($search_datelimit_end)			$param .= '&search_datelimit_end='.urlencode($search_datelimit_end);
+	if ($search_date_startday)		$param .= '&search_date_startday='.urlencode($search_date_startday);
+	if ($search_date_startmonth)	$param .= '&search_date_startmonth='.urlencode($search_date_startmonth);
+	if ($search_date_startyear)		$param .= '&search_date_startyear='.urlencode($search_date_startyear);
+	if ($search_date_endday)		$param .= '&search_date_endday='.urlencode($search_date_endday);
+	if ($search_date_endmonth)		$param .= '&search_date_endmonth='.urlencode($search_date_endmonth);
+	if ($search_date_endyear)		$param .= '&search_date_endyear='.urlencode($search_date_endyear);
+	if ($search_date_valid_startday)		$param .= '&search_date_valid_startday='.urlencode($search_date_valid_startday);
+	if ($search_date_valid_startmonth)		$param .= '&search_date_valid_startmonth='.urlencode($search_date_valid_startmonth);
+	if ($search_date_valid_startyear)		$param .= '&search_date_valid_startyear='.urlencode($search_date_valid_startyear);
+	if ($search_date_valid_endday)			$param .= '&search_date_valid_endday='.urlencode($search_date_valid_endday);
+	if ($search_date_valid_endmonth)		$param .= '&search_date_valid_endmonth='.urlencode($search_date_valid_endmonth);
+	if ($search_date_valid_endyear)			$param .= '&search_date_valid_endyear='.urlencode($search_date_valid_endyear);
+	if ($search_datelimit_startday)		$param .= '&search_datelimit_startday='.urlencode($search_datelimit_startday);
+	if ($search_datelimit_startmonth)	$param .= '&search_datelimit_startmonth='.urlencode($search_datelimit_startmonth);
+	if ($search_datelimit_startyear)	$param .= '&search_datelimit_startyear='.urlencode($search_datelimit_startyear);
+	if ($search_datelimit_endday)		$param .= '&search_datelimit_endday='.urlencode($search_datelimit_endday);
+	if ($search_datelimit_endmonth)		$param .= '&search_datelimit_endmonth='.urlencode($search_datelimit_endmonth);
+	if ($search_datelimit_endyear)		$param .= '&search_datelimit_endyear='.urlencode($search_datelimit_endyear);
 	if ($search_ref)         $param .= '&search_ref='.urlencode($search_ref);
 	if ($search_refcustomer) $param .= '&search_refcustomer='.urlencode($search_refcustomer);
 	if ($search_project_ref) $param .= '&search_project_ref='.urlencode($search_project_ref);

From 08186fdff155b6b261bba852cc6002e1554df5cf Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Thu, 10 Jun 2021 06:28:09 +0200
Subject: [PATCH 0524/1497] Fix warning - search_societe is already present

---
 htdocs/compta/facture/list.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 94326852d31..a704280a9f4 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -530,7 +530,6 @@ if ($search_zip)   $sql .= natural_search("s.zip", $search_zip);
 if ($search_state) $sql .= natural_search("state.nom", $search_state);
 if ($search_country) $sql .= " AND s.fk_pays IN (".$db->escape($search_country).')';
 if ($search_type_thirdparty) $sql .= " AND s.fk_typent IN (".$db->escape($search_type_thirdparty).')';
-if ($search_company) $sql .= natural_search('s.nom', $search_company);
 if ($search_montant_ht != '') $sql .= natural_search('f.total', $search_montant_ht, 1);
 if ($search_montant_vat != '') $sql .= natural_search('f.tva', $search_montant_vat, 1);
 if ($search_montant_localtax1 != '') $sql .= natural_search('f.localtax1', $search_montant_localtax1, 1);

From c0c773dd1d285fa27278bf2fba60c737e3bd4420 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 10 Jun 2021 11:32:09 +0200
Subject: [PATCH 0525/1497] css

---
 htdocs/public/demo/index.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php
index e39a332d3fb..bbb4a85aadf 100644
--- a/htdocs/public/demo/index.php
+++ b/htdocs/public/demo/index.php
@@ -118,7 +118,7 @@ if (empty($reshook)) {
 									'mailmanspip', 'notification', 'oauth', 'syslog', 'user', 'webservices', 'workflow',
 									// Extended modules
 									'memcached', 'numberwords', 'zipautofillfr');
-	$alwayshiddenuncheckedmodules = array('collab', 'dav', 'debugbar', 'emailcollector', 'ftp', 'hrm', 'modulebuilder', 'printing', 'webservicesclient', 'zappier',
+	$alwayshiddenuncheckedmodules = array('cashdesk', 'collab', 'dav', 'debugbar', 'emailcollector', 'ftp', 'hrm', 'modulebuilder', 'printing', 'webservicesclient', 'zappier',
 									// Extended modules
 									'awstats', 'bittorrent', 'bootstrap', 'cabinetmed', 'cmcic', 'concatpdf', 'customfield', 'datapolicy', 'deplacement', 'dolicloud', 'filemanager', 'lightbox', 'mantis', 'monitoring', 'moretemplates', 'multicompany', 'nltechno', 'numberingpack', 'openstreetmap',
 									'ovh', 'phenix', 'phpsysinfo', 'pibarcode', 'postnuke', 'dynamicprices', 'receiptprinter', 'selectbank', 'skincoloreditor', 'submiteverywhere', 'survey', 'thomsonphonebook', 'topten', 'tvacerfa', 'voyage', 'webcalendar', 'webmail');
@@ -352,13 +352,13 @@ foreach ($demoprofiles as $profilearray) {
 		if (empty($profilearray['url'])) {
 			print '<div id="tr1'.$profilearray['key'].'" class="moduleline hidden" style="margin-left: 8px; margin-right: 8px; text-align: justify; font-size:14px; line-height: 130%; padding-bottom: 8px">';
 
-			print $langs->trans("ThisIsListOfModules").'<br><br>';
+			print '<span class="opacitymedium">'.$langs->trans("ThisIsListOfModules").'</span><br><br>';
 
 			print '<div class="csscolumns">';
 
 			$listofdisabledmodules = explode(',', $profilearray['disablemodules']);
 			$j = 0;
-			$nbcolsmod = empty($conf->dol_optimize_smallscreen) ? 4 : 3;
+			//$nbcolsmod = empty($conf->dol_optimize_smallscreen) ? 4 : 3;
 			//var_dump($modules);
 			foreach ($orders as $index => $key) { // Loop on qualified (enabled) modules
 				//print $index.' '.$key;
@@ -369,10 +369,10 @@ foreach ($demoprofiles as $profilearray) {
 				if (!empty($val->always_enabled) || in_array($modulekeyname, $alwayshiddenuncheckedmodules)) {
 					$modulequalified = 0;
 				}
-				if ($val->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2 && !$conf->global->$const_name) {
+				if ($val->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2 && empty($conf->global->$const_name)) {
 					$modulequalified = 0;
 				}
-				if ($val->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1 && !$conf->global->$const_name) {
+				if ($val->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1 && empty($conf->global->$const_name)) {
 					$modulequalified = 0;
 				}
 				if (!$modulequalified) {
@@ -383,7 +383,7 @@ foreach ($demoprofiles as $profilearray) {
 					print "\n".'<!-- Module '.$modulekeyname.' hidden and always checked -->';
 					print '<input type="hidden" name="'.$modulekeyname.'" value="1">';
 				} else {
-					$modulo = ($j % $nbcolsmod);
+					//$modulo = ($j % $nbcolsmod);
 					//if ($modulo == 0) print '<tr>';
 					print '<!-- id='.$val->numero.' -->';
 					print '<div class="nowrap">';

From c4dcad5e6b6440c3d09d66711777cfc58b7f0e13 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 10 Jun 2021 11:57:42 +0200
Subject: [PATCH 0526/1497] Fix regression

---
 htdocs/core/lib/functions.lib.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index dd4d8cba1f2..29a27ccd38b 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -8005,17 +8005,20 @@ function dol_eval($s, $returnvalue = 0, $hideerrors = 1)
 	}
 
 	// We block using of php exec or php file functions
-	$forbiddenphpcommands = array("exec(", "passthru(", "shell_exec(", "system(", "proc_open(", "popen(", "eval(", "dol_eval(", "executeCLI(");
-	$forbiddenphpcommands = array_merge($forbiddenphpcommands, array("fopen(", "file_put_contents(", "fputs(", "fputscsv(", "fwrite(", "fpassthru(", "unlink(", "mkdir(", "rmdir(", "symlink(", "touch(", "umask("));
-	$forbiddenphpcommands = array_merge($forbiddenphpcommands, array('function(', '$$', 'call_user_func('));
-	$forbiddenphpcommands = array_merge($forbiddenphpcommands, array('global', '_ENV', '_SESSION', '_COOKIE', '_GET', '_POST', '_REQUEST'));
+	$forbiddenphpstrings = array("exec(", "passthru(", "shell_exec(", "system(", "proc_open(", "popen(", "eval(", "dol_eval(", "executeCLI(");
+	$forbiddenphpstrings = array_merge($forbiddenphpstrings, array("fopen(", "file_put_contents(", "fputs(", "fputscsv(", "fwrite(", "fpassthru(", "unlink(", "mkdir(", "rmdir(", "symlink(", "touch(", "umask("));
+	$forbiddenphpstrings = array_merge($forbiddenphpstrings, array('function(', '$$', 'call_user_func('));
+	$forbiddenphpstrings = array_merge($forbiddenphpstrings, array('_ENV', '_SESSION', '_COOKIE', '_GET', '_POST', '_REQUEST'));
+	$forbiddenphpregex = array('global\s+\$');
 	do {
 		$oldstringtoclean = $s;
-		$s = str_ireplace($forbiddenphpcommands, '__forbiddenstring__', $s);
+		$s = str_ireplace($forbiddenphpstrings, '__forbiddenstring__', $s);
+		$s = preg_replace('/'.$forbiddenphpregex.'/', '__forbiddenstring__', $s);
 		//$s = preg_replace('/\$[a-zA-Z0-9_\->\$]+\(/i', '', $s);	// Remove $function( call and $mycall->mymethod(
 	} while ($oldstringtoclean != $s);
 
 	if (strpos($s, '__forbiddenstring__') !== false) {
+		dol_syslog('Bad string syntax to evaluate: '.$s, LOG_WARNING);
 		return 'Bad string syntax to evaluate: '.$s;
 	}
 

From 1e149f819663ac3328c88aecc278d770bfbc0675 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 10 Jun 2021 12:49:05 +0200
Subject: [PATCH 0527/1497] Doc

---
 ChangeLog | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 50a0ff10131..f52fbb55668 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,7 +15,7 @@ NEW: Add a performance center page with all information and advices related to t
 NEW: A lot of fix into english text after a small proofreading campaign (still not perfect, but really better)
 NEW: All main menu entries are using the picto of the module
 NEW: Add a copy to clipboard button on some fields 
-NEW: Add an example of scheduled job to send email reminder for unpayed invoices
+NEW: Add an example of scheduled job to send email reminder for unpaid invoices
 NEW: Can make massive stock transfers from a CSV file.
 NEW: Accountancy - Add FEC import
 NEW: Accountancy - Add a confirmation form with options on export
@@ -34,7 +34,7 @@ NEW: Add some company information in the dropdown login menu
 NEW: Add constant MAIN_BUGTRACK_URL to set a custom url to redirect to when clicking on link "declare a bug"
 NEW: Add contact tag and bulk email status on the thirparty+contact create form
 NEW: Add db fields note_public and note_private for ECM module
-NEW: Manage deposit on supplier invoice (& somes ajustments)
+NEW: Support down payment on supplier invoice (& somes ajustments)
 NEW: Add edit/delete action icons on categories list pages
 NEW: Add hidden option to auto load input line extrafield into new lines
 NEW: Add import profile to import BOM
@@ -73,8 +73,8 @@ NEW: Can toggle FCKeditor on public/private notes
 NEW: Can use captcha on public page to create a ticket
 NEW: Check update availability for externals modules using a button on module page
 NEW: Choose lines to use while creating intervention card from origin
-NEW: Column shippement method, payment mode, payment term in proposal and order list
-NEW: Conf for default actiomm status
+NEW: Column shipment method, payment mode, payment term in proposal and order list
+NEW: Conf for default actioncomm status
 NEW: customer ref for product customer prices
 NEW: date and user signature on proposal (Issue 16062)
 NEW: Dictionary for availability - Add a column position

From 8a46fd376f3ce79dafb6e3719c89312a00248551 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 10 Jun 2021 12:58:42 +0200
Subject: [PATCH 0528/1497] Update commonobject.class.php

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 1d0509d7483..1241a65f6e4 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -440,7 +440,7 @@ abstract class CommonObject
 
 	/**
 	 * @var array    List of child tables. To know object to delete on cascade.
-	 *               if name like with @ClassNAme:FilePathClass:ParentFkFieldName' it will
+	 *               if name like with @ClassName:FilePathClass:ParentFkFieldName' it will
 	 *               call method deleteByParentField(parentId,ParentFkFieldName) to fetch and delete child object
 	 */
 	protected $childtablesoncascade = array();

From b7ba9df6b4e6c902fcce5c3dbe2506a3c80b2e97 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 10 Jun 2021 12:59:04 +0200
Subject: [PATCH 0529/1497] Update societe.class.php

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

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 9687485eb10..a58b93bdc96 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -84,7 +84,7 @@ class Societe extends CommonObject
 
 	/**
 	 * @var array    List of child tables. To know object to delete on cascade.
-	 *               if name like with @ClassNAme:FilePathClass:ParentFkFieldName' it will call method deleteByParentField (with parentId as parameters) and FieldName to fetch and delete child object
+	 *               if name like with @ClassName:FilePathClass:ParentFkFieldName' it will call method deleteByParentField (with parentId as parameters) and FieldName to fetch and delete child object
 	 */
 	protected $childtablesoncascade = array(
 		"societe_prices",

From ed53301cec7a7c632c9eb8772065793ae827f0ba Mon Sep 17 00:00:00 2001
From: lvessiller <lvessiller@open-dsi.fr>
Date: Thu, 10 Jun 2021 16:18:20 +0200
Subject: [PATCH 0530/1497] NEW do actions hook on bank card

---
 htdocs/compta/bank/card.php | 430 ++++++++++++++++++------------------
 1 file changed, 218 insertions(+), 212 deletions(-)

diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index 3b658f0c793..143d3bb600b 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -73,223 +73,229 @@ $result = restrictedArea($user, 'banque', $id, 'bank_account&bank_account', '',
  * Actions
  */
 
-if ($cancel) {
-	$action = '';
-}
+$parameters = array();
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-if ($action == 'add') {
-	$error = 0;
+if (empty($reshook)) {
 
-	$db->begin();
-
-	// Create account
-	$object = new Account($db);
-
-	$object->ref             = dol_string_nospecial(trim(GETPOST('ref', 'alpha')));
-	$object->label           = trim(GETPOST("label", 'alphanohtml'));
-	$object->courant         = GETPOST("type");
-	$object->clos            = GETPOST("clos");
-	$object->rappro          = (GETPOST("norappro", 'alpha') ? 0 : 1);
-	$object->url             = trim(GETPOST("url", 'alpha'));
-
-	$object->bank            = trim(GETPOST("bank"));
-	$object->code_banque     = trim(GETPOST("code_banque"));
-	$object->code_guichet    = trim(GETPOST("code_guichet"));
-	$object->number          = trim(GETPOST("number"));
-	$object->cle_rib         = trim(GETPOST("cle_rib"));
-	$object->bic             = trim(GETPOST("bic"));
-	$object->iban            = trim(GETPOST("iban"));
-	$object->domiciliation   = trim(GETPOST("domiciliation", "nohtml"));
-
-	$object->proprio = trim(GETPOST("proprio", 'alphanohtml'));
-	$object->owner_address   = trim(GETPOST("owner_address", 'nohtml'));
-
-	$object->ics             = trim(GETPOST("ics", 'alpha'));
-	$object->ics_transfer    = trim(GETPOST("ics_transfer", 'alpha'));
-
-	$account_number = GETPOST('account_number', 'alphanohtml');
-	if (empty($account_number) || $account_number == '-1') {
-		$object->account_number = '';
-	} else {
-		$object->account_number = $account_number;
-	}
-	$fk_accountancy_journal  = GETPOST('fk_accountancy_journal', 'int');
-	if ($fk_accountancy_journal <= 0) {
-		$object->fk_accountancy_journal = '';
-	} else {
-		$object->fk_accountancy_journal = $fk_accountancy_journal;
-	}
-
-	$object->solde           = price2num(GETPOST("solde"));
-	$object->date_solde      = dol_mktime(12, 0, 0, GETPOST("remonth", 'int'), GETPOST('reday', 'int'), GETPOST("reyear", 'int'));
-
-	$object->currency_code   = trim(GETPOST("account_currency_code"));
-
-	$object->state_id        = GETPOST("account_state_id", 'int');
-	$object->country_id      = GETPOST("account_country_id", 'int');
-
-	$object->min_allowed     = GETPOST("account_min_allowed", 'int');
-	$object->min_desired     = GETPOST("account_min_desired", 'int');
-	$object->comment         = trim(GETPOST("account_comment", 'restricthtml'));
-
-	$object->fk_user_author  = $user->id;
-
-	if ($conf->global->MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED && empty($object->account_number)) {
-		setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired", $langs->transnoentitiesnoconv("AccountancyCode")), null, 'errors');
-		$action = 'create'; // Force chargement page en mode creation
-		$error++;
-	}
-	if (empty($object->ref)) {
-		setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired", $langs->transnoentitiesnoconv("Ref")), null, 'errors');
-		$action = 'create'; // Force chargement page en mode creation
-		$error++;
-	}
-	if (empty($object->label)) {
-		setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired", $langs->transnoentitiesnoconv("LabelBankCashAccount")), null, 'errors');
-		$action = 'create'; // Force chargement page en mode creation
-		$error++;
-	}
-
-	// Fill array 'array_options' with data from add form
-	$ret = $extrafields->setOptionalsFromPost(null, $object);
-
-	if (!$error) {
-		$id = $object->create($user);
-		if ($id > 0) {
-			// Category association
-			$categories = GETPOST('categories', 'array');
-			$object->setCategories($categories);
-
-			$_GET["id"] = $id; // Force chargement page en mode visu
-
-			$action = '';
-		} else {
-			$error++;
-			setEventMessages($object->error, $object->errors, 'errors');
-
-			$action = 'create'; // Force chargement page en mode creation
-		}
-	}
-
-	if (!$error) {
-		$db->commit();
-	} else {
-		$db->rollback();
-	}
-}
-
-if ($action == 'update') {
-	$error = 0;
-
-	// Update account
-	$object = new Account($db);
-	$object->fetch(GETPOST("id", 'int'));
-
-	$object->ref             = dol_string_nospecial(trim(GETPOST('ref', 'alpha')));
-	$object->label           = trim(GETPOST("label", 'alphanohtml'));
-	$object->courant         = GETPOST("type");
-	$object->clos            = GETPOST("clos");
-	$object->rappro          = (GETPOST("norappro", 'alpha') ? 0 : 1);
-	$object->url             = trim(GETPOST("url", 'alpha'));
-
-	$object->bank            = trim(GETPOST("bank"));
-	$object->code_banque     = trim(GETPOST("code_banque"));
-	$object->code_guichet    = trim(GETPOST("code_guichet"));
-	$object->number          = trim(GETPOST("number"));
-	$object->cle_rib         = trim(GETPOST("cle_rib"));
-	$object->bic             = trim(GETPOST("bic"));
-	$object->iban            = trim(GETPOST("iban"));
-	$object->domiciliation   = trim(GETPOST("domiciliation", "nohtml"));
-
-	$object->proprio = trim(GETPOST("proprio", 'alphanohtml'));
-	$object->owner_address   = trim(GETPOST("owner_address", 'nohtml'));
-
-	$object->ics             = trim(GETPOST("ics", 'alpha'));
-	$object->ics_transfer    = trim(GETPOST("ics_transfer", 'alpha'));
-
-	$account_number = GETPOST('account_number', 'alpha');
-	if (empty($account_number) || $account_number == '-1') {
-		$object->account_number = '';
-	} else {
-		$object->account_number = $account_number;
-	}
-	$fk_accountancy_journal  = GETPOST('fk_accountancy_journal', 'int');
-	if ($fk_accountancy_journal <= 0) {
-		$object->fk_accountancy_journal = '';
-	} else {
-		$object->fk_accountancy_journal = $fk_accountancy_journal;
-	}
-
-	$object->currency_code   = trim(GETPOST("account_currency_code"));
-
-	$object->state_id        = GETPOST("account_state_id", 'int');
-	$object->country_id      = GETPOST("account_country_id", 'int');
-
-	$object->min_allowed     = GETPOST("account_min_allowed", 'int');
-	$object->min_desired     = GETPOST("account_min_desired", 'int');
-	$object->comment         = trim(GETPOST("account_comment", 'restricthtml'));
-
-	if ($conf->global->MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED && empty($object->account_number)) {
-		setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired", $langs->transnoentitiesnoconv("AccountancyCode")), null, 'errors');
-		$action = 'edit'; // Force chargement page en mode creation
-		$error++;
-	}
-	if (empty($object->ref)) {
-		setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired", $langs->transnoentitiesnoconv("Ref")), null, 'errors');
-		$action = 'edit'; // Force chargement page en mode creation
-		$error++;
-	}
-	if (empty($object->label)) {
-		setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired", $langs->transnoentitiesnoconv("LabelBankCashAccount")), null, 'errors');
-		$action = 'edit'; // Force chargement page en mode creation
-		$error++;
-	}
-
-	$db->begin();
-
-	if (!$error) {
-		// Fill array 'array_options' with data from add form
-		$ret = $extrafields->setOptionalsFromPost(null, $object);
-	}
-
-	if (!$error) {
-		$result = $object->update($user);
-		if ($result >= 0) {
-			// Category association
-			$categories = GETPOST('categories', 'array');
-			$object->setCategories($categories);
-
-			$_GET["id"] = $_POST["id"]; // Force chargement page en mode visu
-		} else {
-			$error++;
-			setEventMessages($object->error, $object->errors, 'errors');
-			$action = 'edit'; // Force chargement page edition
-		}
-	}
-
-	if (!$error) {
-		$db->commit();
-	} else {
-		$db->rollback();
-	}
-}
-
-if ($action == 'confirm_delete' && GETPOST("confirm") == "yes" && $user->rights->banque->configurer) {
-	// Delete
-	$object = new Account($db);
-	$object->fetch(GETPOST("id", "int"));
-	$result = $object->delete($user);
-
-	if ($result > 0) {
-		setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
-		header("Location: ".DOL_URL_ROOT."/compta/bank/list.php");
-		exit;
-	} else {
-		setEventMessages($object->error, $object->errors, 'errors');
+	if ($cancel) {
 		$action = '';
 	}
-}
 
+	if ($action == 'add') {
+		$error = 0;
+
+		$db->begin();
+
+		// Create account
+		$object = new Account($db);
+
+		$object->ref = dol_string_nospecial(trim(GETPOST('ref', 'alpha')));
+		$object->label = trim(GETPOST("label", 'alphanohtml'));
+		$object->courant = GETPOST("type");
+		$object->clos = GETPOST("clos");
+		$object->rappro = (GETPOST("norappro", 'alpha') ? 0 : 1);
+		$object->url = trim(GETPOST("url", 'alpha'));
+
+		$object->bank = trim(GETPOST("bank"));
+		$object->code_banque = trim(GETPOST("code_banque"));
+		$object->code_guichet = trim(GETPOST("code_guichet"));
+		$object->number = trim(GETPOST("number"));
+		$object->cle_rib = trim(GETPOST("cle_rib"));
+		$object->bic = trim(GETPOST("bic"));
+		$object->iban = trim(GETPOST("iban"));
+		$object->domiciliation = trim(GETPOST("domiciliation", "nohtml"));
+
+		$object->proprio = trim(GETPOST("proprio", 'alphanohtml'));
+		$object->owner_address = trim(GETPOST("owner_address", 'nohtml'));
+
+		$object->ics = trim(GETPOST("ics", 'alpha'));
+		$object->ics_transfer = trim(GETPOST("ics_transfer", 'alpha'));
+
+		$account_number = GETPOST('account_number', 'alphanohtml');
+		if (empty($account_number) || $account_number == '-1') {
+			$object->account_number = '';
+		} else {
+			$object->account_number = $account_number;
+		}
+		$fk_accountancy_journal = GETPOST('fk_accountancy_journal', 'int');
+		if ($fk_accountancy_journal <= 0) {
+			$object->fk_accountancy_journal = '';
+		} else {
+			$object->fk_accountancy_journal = $fk_accountancy_journal;
+		}
+
+		$object->solde = price2num(GETPOST("solde"));
+		$object->date_solde = dol_mktime(12, 0, 0, GETPOST("remonth", 'int'), GETPOST('reday', 'int'), GETPOST("reyear", 'int'));
+
+		$object->currency_code = trim(GETPOST("account_currency_code"));
+
+		$object->state_id = GETPOST("account_state_id", 'int');
+		$object->country_id = GETPOST("account_country_id", 'int');
+
+		$object->min_allowed = GETPOST("account_min_allowed", 'int');
+		$object->min_desired = GETPOST("account_min_desired", 'int');
+		$object->comment = trim(GETPOST("account_comment", 'restricthtml'));
+
+		$object->fk_user_author = $user->id;
+
+		if ($conf->global->MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED && empty($object->account_number)) {
+			setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired", $langs->transnoentitiesnoconv("AccountancyCode")), null, 'errors');
+			$action = 'create'; // Force chargement page en mode creation
+			$error++;
+		}
+		if (empty($object->ref)) {
+			setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired", $langs->transnoentitiesnoconv("Ref")), null, 'errors');
+			$action = 'create'; // Force chargement page en mode creation
+			$error++;
+		}
+		if (empty($object->label)) {
+			setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired", $langs->transnoentitiesnoconv("LabelBankCashAccount")), null, 'errors');
+			$action = 'create'; // Force chargement page en mode creation
+			$error++;
+		}
+
+		// Fill array 'array_options' with data from add form
+		$ret = $extrafields->setOptionalsFromPost(null, $object);
+
+		if (!$error) {
+			$id = $object->create($user);
+			if ($id > 0) {
+				// Category association
+				$categories = GETPOST('categories', 'array');
+				$object->setCategories($categories);
+
+				$_GET["id"] = $id; // Force chargement page en mode visu
+
+				$action = '';
+			} else {
+				$error++;
+				setEventMessages($object->error, $object->errors, 'errors');
+
+				$action = 'create'; // Force chargement page en mode creation
+			}
+		}
+
+		if (!$error) {
+			$db->commit();
+		} else {
+			$db->rollback();
+		}
+	}
+
+	if ($action == 'update') {
+		$error = 0;
+
+		// Update account
+		$object = new Account($db);
+		$object->fetch(GETPOST("id", 'int'));
+
+		$object->ref = dol_string_nospecial(trim(GETPOST('ref', 'alpha')));
+		$object->label = trim(GETPOST("label", 'alphanohtml'));
+		$object->courant = GETPOST("type");
+		$object->clos = GETPOST("clos");
+		$object->rappro = (GETPOST("norappro", 'alpha') ? 0 : 1);
+		$object->url = trim(GETPOST("url", 'alpha'));
+
+		$object->bank = trim(GETPOST("bank"));
+		$object->code_banque = trim(GETPOST("code_banque"));
+		$object->code_guichet = trim(GETPOST("code_guichet"));
+		$object->number = trim(GETPOST("number"));
+		$object->cle_rib = trim(GETPOST("cle_rib"));
+		$object->bic = trim(GETPOST("bic"));
+		$object->iban = trim(GETPOST("iban"));
+		$object->domiciliation = trim(GETPOST("domiciliation", "nohtml"));
+
+		$object->proprio = trim(GETPOST("proprio", 'alphanohtml'));
+		$object->owner_address = trim(GETPOST("owner_address", 'nohtml'));
+
+		$object->ics = trim(GETPOST("ics", 'alpha'));
+		$object->ics_transfer = trim(GETPOST("ics_transfer", 'alpha'));
+
+		$account_number = GETPOST('account_number', 'alpha');
+		if (empty($account_number) || $account_number == '-1') {
+			$object->account_number = '';
+		} else {
+			$object->account_number = $account_number;
+		}
+		$fk_accountancy_journal = GETPOST('fk_accountancy_journal', 'int');
+		if ($fk_accountancy_journal <= 0) {
+			$object->fk_accountancy_journal = '';
+		} else {
+			$object->fk_accountancy_journal = $fk_accountancy_journal;
+		}
+
+		$object->currency_code = trim(GETPOST("account_currency_code"));
+
+		$object->state_id = GETPOST("account_state_id", 'int');
+		$object->country_id = GETPOST("account_country_id", 'int');
+
+		$object->min_allowed = GETPOST("account_min_allowed", 'int');
+		$object->min_desired = GETPOST("account_min_desired", 'int');
+		$object->comment = trim(GETPOST("account_comment", 'restricthtml'));
+
+		if ($conf->global->MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED && empty($object->account_number)) {
+			setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired", $langs->transnoentitiesnoconv("AccountancyCode")), null, 'errors');
+			$action = 'edit'; // Force chargement page en mode creation
+			$error++;
+		}
+		if (empty($object->ref)) {
+			setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired", $langs->transnoentitiesnoconv("Ref")), null, 'errors');
+			$action = 'edit'; // Force chargement page en mode creation
+			$error++;
+		}
+		if (empty($object->label)) {
+			setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired", $langs->transnoentitiesnoconv("LabelBankCashAccount")), null, 'errors');
+			$action = 'edit'; // Force chargement page en mode creation
+			$error++;
+		}
+
+		$db->begin();
+
+		if (!$error) {
+			// Fill array 'array_options' with data from add form
+			$ret = $extrafields->setOptionalsFromPost(null, $object);
+		}
+
+		if (!$error) {
+			$result = $object->update($user);
+			if ($result >= 0) {
+				// Category association
+				$categories = GETPOST('categories', 'array');
+				$object->setCategories($categories);
+
+				$_GET["id"] = $_POST["id"]; // Force chargement page en mode visu
+			} else {
+				$error++;
+				setEventMessages($object->error, $object->errors, 'errors');
+				$action = 'edit'; // Force chargement page edition
+			}
+		}
+
+		if (!$error) {
+			$db->commit();
+		} else {
+			$db->rollback();
+		}
+	}
+
+	if ($action == 'confirm_delete' && GETPOST("confirm") == "yes" && $user->rights->banque->configurer) {
+		// Delete
+		$object = new Account($db);
+		$object->fetch(GETPOST("id", "int"));
+		$result = $object->delete($user);
+
+		if ($result > 0) {
+			setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
+			header("Location: " . DOL_URL_ROOT . "/compta/bank/list.php");
+			exit;
+		} else {
+			setEventMessages($object->error, $object->errors, 'errors');
+			$action = '';
+		}
+	}
+}
 
 /*
  * View

From c8c9fb7700796cedd8b2a0d1dbdb2dc70c9b7c5c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 10 Jun 2021 16:29:30 +0200
Subject: [PATCH 0531/1497] FIX #17847

---
 htdocs/compta/facture/class/facture.class.php | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 40a14eb1711..5636095c42e 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -4153,20 +4153,23 @@ class Facture extends CommonInvoice
 		//	$sql.= " AND (f.paye = 1";				// Classee payee completement
 		//	$sql.= " OR f.close_code IS NOT NULL)";	// Classee payee partiellement
 		$sql .= " AND ff.type IS NULL"; // Renvoi vrai si pas facture de remplacement
-		$sql .= " AND f.type != ".self::TYPE_CREDIT_NOTE; // Type non 2 si facture non avoir
+		$sql .= " AND f.type <> ".self::TYPE_CREDIT_NOTE; // Exclude credit note invoices from selection
 
 		if (!empty($conf->global->INVOICE_USE_SITUATION_CREDIT_NOTE)) {
-			// Select the last situation invoice
-			$sqlSit = 'SELECT MAX(fs.rowid)';
-			$sqlSit .= " FROM ".MAIN_DB_PREFIX."facture as fs";
-			$sqlSit .= " WHERE fs.entity IN (".getEntity('invoice').")";
-			$sqlSit .= " AND fs.type = ".self::TYPE_SITUATION;
-			$sqlSit .= " AND fs.fk_statut in (".self::STATUS_VALIDATED.",".self::STATUS_CLOSED.")";
-			$sqlSit .= " GROUP BY fs.situation_cycle_ref";
-			$sqlSit .= " ORDER BY fs.situation_counter";
-			$sql .= " AND ( f.type != ".self::TYPE_SITUATION." OR f.rowid IN (".$this->db->sanitize($sqlSit).") )"; // Type non 5 si facture non avoir
+			// Keep invoices that are not situation invoices or that are the last in serie if it is a situation invoice
+			$sql .= " AND (f.type <> ".self::TYPE_SITUATION." OR f.rowid IN ";
+			$sql .= '(SELECT MAX(fs.rowid)';	// This select returns several ID becasue of the group by later
+			$sql .= " FROM ".MAIN_DB_PREFIX."facture as fs";
+			$sql .= " WHERE fs.entity IN (".getEntity('invoice').")";
+			$sql .= " AND fs.type = ".self::TYPE_SITUATION;
+			$sql .= " AND fs.fk_statut IN (".self::STATUS_VALIDATED.",".self::STATUS_CLOSED.")";
+			if ($socid > 0) {
+				$sql .= " AND f.fk_soc = ".((int) $socid);
+			}
+			$sql .= " GROUP BY fs.situation_cycle_ref)";		// For each situation_cycle_ref, we take the higher rowid
+			$sql .= ")";
 		} else {
-			$sql .= " AND f.type != ".self::TYPE_SITUATION; // Type non 5 si facture non avoir
+			$sql .= " AND f.type <> ".self::TYPE_SITUATION; // Keep invoices that are not situation invoices
 		}
 
 		if ($socid > 0) {

From 03cd88d145e0bafe3ea0799ea2530b18079c61b6 Mon Sep 17 00:00:00 2001
From: Alexis LAURIER <a.laurier@kreactive.com>
Date: Thu, 10 Jun 2021 16:29:56 +0200
Subject: [PATCH 0532/1497] 
 bugfix/supplierBankTransfertWrongCodeCheckMassAction

---
 htdocs/fourn/facture/list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 317def67098..904de663e78 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -323,7 +323,7 @@ if (empty($reshook))
 					if ($numprlv > 0) {
 						$error++;
 						setEventMessages($objecttmp->ref.' '.$langs->trans("RequestAlreadyDone"), $objecttmp->errors, 'warnings');
-					} elseif (!empty($objecttmp->mode_reglement_code) && $objecttmp->mode_reglement_code != 'PRE') {
+					} elseif (!empty($objecttmp->mode_reglement_code) && $objecttmp->mode_reglement_code != 'VIR') {
 						$error++;
 						setEventMessages($objecttmp->ref.' '.$langs->trans("BadPaymentMethod"), $objecttmp->errors, 'errors');
 					} else {

From 1950e50c89c556518bc03e4cc8b11253ebcc5865 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 10 Jun 2021 16:31:28 +0200
Subject: [PATCH 0533/1497] Fix test

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

diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 5636095c42e..1f633015cd4 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -4164,7 +4164,7 @@ class Facture extends CommonInvoice
 			$sql .= " AND fs.type = ".self::TYPE_SITUATION;
 			$sql .= " AND fs.fk_statut IN (".self::STATUS_VALIDATED.",".self::STATUS_CLOSED.")";
 			if ($socid > 0) {
-				$sql .= " AND f.fk_soc = ".((int) $socid);
+				$sql .= " AND fs.fk_soc = ".((int) $socid);
 			}
 			$sql .= " GROUP BY fs.situation_cycle_ref)";		// For each situation_cycle_ref, we take the higher rowid
 			$sql .= ")";

From 693ac3eab603effa0361f7cd3b47fadbecf8d0e2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 10 Jun 2021 16:38:09 +0200
Subject: [PATCH 0534/1497] Code comment

---
 htdocs/public/payment/paymentok.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index b589a6c37e0..50a2de7bc68 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -918,7 +918,7 @@ if ($ispaymentok) {
 		// TODO send email with acknowledgment for the donation
 		//      (need that the donation module can gen a pdf document for the cerfa with pre filled content)
 	} elseif (array_key_exists('ATT', $tmptag) && $tmptag['ATT'] > 0) {
-		// Record payment
+		// Record payment for attendee
 		include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 		$object = new Facture($db);
 		$result = $object->fetch($ref);
@@ -1090,7 +1090,7 @@ if ($ispaymentok) {
 			$ispostactionok = -1;
 		}
 	} elseif (array_key_exists('BOO', $tmptag) && $tmptag['BOO'] > 0) {
-		// Record payment
+		// Record payment for booth or conference
 		include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 		$object = new Facture($db);
 		$result = $object->fetch($ref);

From 1a2434818dff72954c1d661993af33b663728027 Mon Sep 17 00:00:00 2001
From: Alexis LAURIER <a.laurier@kreactive.com>
Date: Thu, 10 Jun 2021 18:00:49 +0200
Subject: [PATCH 0535/1497] remove useless check on deposit line content when
 generating pdf

---
 htdocs/core/lib/pdf.lib.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 6e4cc60ce53..0a73b062ae3 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -1272,9 +1272,7 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 			if (!empty($prodser->multilangs[$outputlangs->defaultlang]["note"]) && ($textwasmodified || $translatealsoifmodified))  $note = $prodser->multilangs[$outputlangs->defaultlang]["note"];
 		}
 	} elseif ($object->element == 'facture' || $object->element == 'facturefourn') {
-		if ($object->type == $object::TYPE_DEPOSIT) {
-			$desc = str_replace('(DEPOSIT)', $outputlangs->trans('Deposit'), $desc);
-		}
+		$desc = str_replace('(DEPOSIT)', $outputlangs->trans('Deposit'), $desc);
 	}
 
 	// Description short of product line

From e938d875fb87fe4bd4767e3527e8efc616834438 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 10 Jun 2021 18:34:43 +0200
Subject: [PATCH 0536/1497] FIX #17855

---
 htdocs/bom/bom_document.php                     | 4 ++--
 htdocs/modulebuilder/template/myobject_card.php | 2 +-
 htdocs/mrp/mo_document.php                      | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/bom/bom_document.php b/htdocs/bom/bom_document.php
index 9952423da99..dd0227e4305 100644
--- a/htdocs/bom/bom_document.php
+++ b/htdocs/bom/bom_document.php
@@ -76,7 +76,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
 
 if ($id > 0 || !empty($ref)) {
-	$upload_dir = $conf->bom->multidir_output[$object->entity ? $object->entity : 1]."/bom/".get_exdir(0, 0, 0, 1, $object);
+	$upload_dir = $conf->bom->multidir_output[$object->entity ? $object->entity : 1]."/".get_exdir(0, 0, 0, 1, $object);
 }
 
 // Security check - Protection if external user
@@ -152,7 +152,7 @@ if ($object->id) {
 	$param = '&id='.$object->id;
 
 	//$relativepathwithnofile='bom/' . dol_sanitizeFileName($object->id).'/';
-	$relativepathwithnofile = 'bom/'.dol_sanitizeFileName($object->ref).'/';
+	$relativepathwithnofile = dol_sanitizeFileName($object->ref).'/';
 
 	include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 } else {
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index 7111b59b582..9a689c79a08 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -127,7 +127,7 @@ $permissiontoadd = $user->rights->mymodule->myobject->write; // Used by the incl
 $permissiontodelete = $user->rights->mymodule->myobject->delete || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT);
 $permissionnote = $user->rights->mymodule->myobject->write; // Used by the include of actions_setnotes.inc.php
 $permissiondellink = $user->rights->mymodule->myobject->write; // Used by the include of actions_dellink.inc.php
-$upload_dir = $conf->mymodule->multidir_output[isset($object->entity) ? $object->entity : 1];
+$upload_dir = $conf->mymodule->multidir_output[isset($object->entity) ? $object->entity : 1].'/myobject';
 
 // Security check (enable the most restrictive one)
 //if ($user->socid > 0) accessforbidden();
diff --git a/htdocs/mrp/mo_document.php b/htdocs/mrp/mo_document.php
index 101d26223f5..211fa897c09 100644
--- a/htdocs/mrp/mo_document.php
+++ b/htdocs/mrp/mo_document.php
@@ -74,7 +74,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
 
 if ($id > 0 || !empty($ref)) {
-	$upload_dir = $conf->mrp->multidir_output[$object->entity ? $object->entity : $conf->entity]."/mo/".get_exdir(0, 0, 0, 1, $object);
+	$upload_dir = $conf->mrp->multidir_output[$object->entity ? $object->entity : $conf->entity]."/".get_exdir(0, 0, 0, 1, $object);
 }
 
 // Security check - Protection if external user
@@ -184,7 +184,7 @@ if ($object->id) {
 	$param = '&id='.$object->id;
 
 	//$relativepathwithnofile='mo/' . dol_sanitizeFileName($object->id).'/';
-	$relativepathwithnofile = 'mo/'.dol_sanitizeFileName($object->ref).'/';
+	$relativepathwithnofile = dol_sanitizeFileName($object->ref).'/';
 
 	include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 } else {

From 4e87a0828298a1f5117281a017a8637c612ac38b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 10 Jun 2021 19:02:53 +0200
Subject: [PATCH 0537/1497] Try fix for #17866

---
 htdocs/core/actions_massactions.inc.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index f39c73b5bf0..fdd4d1a69fd 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -712,7 +712,7 @@ if ($massaction == 'confirm_createbills') {   // Create bills from orders.
 
 				for ($i = 0; $i < $num; $i++) {
 					$desc = ($lines[$i]->desc ? $lines[$i]->desc : '');
-					// If we build one invoice for several order, we must put the invoice of order on the line
+					// If we build one invoice for several orders, we must put the ref of order on the invoice line
 					if (!empty($createbills_onebythird)) {
 						$desc = dol_concatdesc($desc, $langs->trans("Order").' '.$cmd->ref.' - '.dol_print_date($cmd->date, 'day'));
 					}
@@ -772,6 +772,8 @@ if ($massaction == 'confirm_createbills') {   // Create bills from orders.
 							$array_options = $lines[$i]->array_options;
 						}
 
+						$objecttmp->context['createfromclone'];
+
 						$result = $objecttmp->addline(
 							$desc,
 							$lines[$i]->subprice,

From 77efbda14804e8ec3afe9daef8f5fb083473fdba Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 10 Jun 2021 20:04:21 +0200
Subject: [PATCH 0538/1497] Fix responsive

---
 htdocs/fourn/facture/card.php                 |   2 +-
 htdocs/product/card.php                       | 199 +++++++++---------
 .../product/class/html.formproduct.class.php  |   6 +-
 3 files changed, 109 insertions(+), 98 deletions(-)

diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 622c494d095..48d7aa7240a 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -1930,7 +1930,7 @@ if ($action == 'create') {
 		print $societe->getNomUrl(1);
 		print '<input type="hidden" name="socid" value="'.$societe->id.'">';
 	} else {
-		print img_picto('', 'company').$form->select_company($societe->id, 'socid', 's.fournisseur=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
+		print img_picto('', 'company').$form->select_company($societe->id, 'socid', 's.fournisseur=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300 widthcentpercentminusxx');
 		// reload page to retrieve supplier informations
 		if (!empty($conf->global->RELOAD_PAGE_ON_SUPPLIER_CHANGE)) {
 			print '<script type="text/javascript">
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 5067b9ce838..c3c91b40537 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1076,23 +1076,23 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		if (!empty($modCodeProduct->code_auto)) {
 			$tmpcode = $modCodeProduct->getNextValue($object, $type);
 		}
-		print '<td class="titlefieldcreate fieldrequired">'.$langs->trans("Ref").'</td><td colspan="3"><input id="ref" name="ref" class="maxwidth200" maxlength="128" value="'.dol_escape_htmltag(GETPOSTISSET('ref') ? GETPOST('ref', 'alphanohtml') : $tmpcode).'">';
+		print '<td class="titlefieldcreate fieldrequired">'.$langs->trans("Ref").'</td><td><input id="ref" name="ref" class="maxwidth200" maxlength="128" value="'.dol_escape_htmltag(GETPOSTISSET('ref') ? GETPOST('ref', 'alphanohtml') : $tmpcode).'">';
 		if ($refalreadyexists) {
 			print $langs->trans("RefAlreadyExists");
 		}
 		print '</td></tr>';
 
 		// Label
-		print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td colspan="3"><input name="label" class="minwidth300 maxwidth400onsmartphone" maxlength="255" value="'.dol_escape_htmltag(GETPOST('label', $label_security_check)).'"></td></tr>';
+		print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td><input name="label" class="minwidth300 maxwidth400onsmartphone" maxlength="255" value="'.dol_escape_htmltag(GETPOST('label', $label_security_check)).'"></td></tr>';
 
 		// On sell
-		print '<tr><td class="fieldrequired">'.$langs->trans("Status").' ('.$langs->trans("Sell").')</td><td colspan="3">';
+		print '<tr><td class="fieldrequired">'.$langs->trans("Status").' ('.$langs->trans("Sell").')</td><td>';
 		$statutarray = array('1' => $langs->trans("OnSell"), '0' => $langs->trans("NotOnSell"));
 		print $form->selectarray('statut', $statutarray, GETPOST('statut'));
 		print '</td></tr>';
 
 		// To buy
-		print '<tr><td class="fieldrequired">'.$langs->trans("Status").' ('.$langs->trans("Buy").')</td><td colspan="3">';
+		print '<tr><td class="fieldrequired">'.$langs->trans("Status").' ('.$langs->trans("Buy").')</td><td>';
 		$statutarray = array('1' => $langs->trans("ProductStatusOnBuy"), '0' => $langs->trans("ProductStatusNotOnBuy"));
 		print $form->selectarray('statut_buy', $statutarray, GETPOST('statut_buy'));
 		print '</td></tr>';
@@ -1102,7 +1102,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print '<tr><td>'.$langs->trans("ManageLotSerial").'</td><td>';
 			$statutarray = array('0' => $langs->trans("ProductStatusNotOnBatch"), '1' => $langs->trans("ProductStatusOnBatch"), '2' => $langs->trans("ProductStatusOnSerial"));
 			print $form->selectarray('status_batch', $statutarray, GETPOST('status_batch'));
-			print '</td>';
+			print '</td></tr>';
 			// Product specific batch number management
 			$status_batch = GETPOST('status_batch');
 			if ($status_batch !== '0') {
@@ -1111,38 +1111,45 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				$tooltip .= $langs->trans("GenericMaskCodes3");
 				$tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("Batch"), $langs->transnoentities("Batch"));
 				$tooltip .= $langs->trans("GenericMaskCodes5");
-				print '<td id="mask_option">'.$langs->trans("ManageLotMask").'</td>';
-				if (($conf->global->PRODUCTBATCH_LOT_USE_PRODUCT_MASKS && $conf->global->PRODUCTBATCH_LOT_ADDON == 'mod_lot_advanced') || ($conf->global->PRODUCTBATCH_SN_USE_PRODUCT_MASKS && $conf->global->PRODUCTBATCH_SN_ADDON == 'mod_sn_advanced')) {
+				if (($conf->global->PRODUCTBATCH_LOT_USE_PRODUCT_MASKS && $conf->global->PRODUCTBATCH_LOT_ADDON == 'mod_lot_advanced')
+					|| ($conf->global->PRODUCTBATCH_SN_USE_PRODUCT_MASKS && $conf->global->PRODUCTBATCH_SN_ADDON == 'mod_sn_advanced')) {
+					print '<tr><td id="mask_option">'.$langs->trans("ManageLotMask").'</td>';
 					$inherited_mask_lot = $conf->global->LOT_ADVANCED_MASK;
 					$inherited_mask_sn = $conf->global->SN_ADVANCED_MASK;
 					print '<td id="field_mask">';
 					print $form->textwithpicto('<input type="text" class="flat" size="24" name="batch_mask" id="batch_mask_input">', $tooltip, 1, 1);
-					print '</td>';
 					print '<script type="text/javascript">
 								$(document).ready(function() {
 									$("#field_mask, #mask_option").addClass("hideobject");
 									$("#status_batch").on("change", function () {
+										console.log("We change batch status");
 										var optionSelected = $("option:selected", this);
 										var valueSelected = this.value;
 										$("#field_mask, #mask_option").addClass("hideobject");
+					';
+					if ($conf->global->PRODUCTBATCH_LOT_USE_PRODUCT_MASKS && $conf->global->PRODUCTBATCH_LOT_ADDON == 'mod_lot_advanced') {
+						print '
 										if (this.value == 1) {
 											$("#field_mask, #mask_option").toggleClass("hideobject");
 											$("#batch_mask_input").val("'.$inherited_mask_lot.'");
 										}
+						';
+					}
+					if ($conf->global->PRODUCTBATCH_SN_USE_PRODUCT_MASKS && $conf->global->PRODUCTBATCH_SN_ADDON == 'mod_sn_advanced') {
+						print '
 										if (this.value == 2) {
 											$("#field_mask, #mask_option").toggleClass("hideobject");
 											$("#batch_mask_input").val("'.$inherited_mask_sn.'");
 										}
+						';
+					}
+					print '
 									})
 								})
 							</script>';
-				} else {
-					print '<td></td>';
+					print '</td></tr>';
 				}
-			} else {
-				print '<td colspan="2"></td>';
 			}
-			print '</tr>';
 		}
 
 		$showbarcode = empty($conf->barcode->enabled) ? 0 : 1;
@@ -1163,9 +1170,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			$formbarcode = new FormBarCode($db);
 			print $formbarcode->selectBarcodeType($fk_barcode_type, 'fk_barcode_type', 1);
 			print '</td>';
-			if ($conf->browser->layout == 'phone') {
-				print '</tr><tr>';
-			}
+			print '</tr><tr>';
 			print '<td>'.$langs->trans("BarcodeValue").'</td><td>';
 			$tmpcode = GETPOSTISSET('barcode') ? GETPOST('barcode') : $object->barcode;
 			if (empty($tmpcode) && !empty($modBarCodeProduct->code_auto)) {
@@ -1176,7 +1181,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		}
 
 		// Description (used in invoice, propal...)
-		print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td colspan="3">';
+		print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td>';
 
 		$doleditor = new DolEditor('desc', GETPOST('desc', 'restricthtml'), '', 160, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_4, '90%');
 		$doleditor->Create();
@@ -1184,7 +1189,8 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		print "</td></tr>";
 
 		// Public URL
-		print '<tr><td>'.$langs->trans("PublicUrl").'</td><td colspan="3">';
+		print '<tr><td>'.$langs->trans("PublicUrl").'</td><td>';
+		print img_picto('', 'globe', 'class="pictofixedwidth"');
 		print '<input type="text" name="url" class="quatrevingtpercent" value="'.GETPOST('url').'">';
 		print '</td></tr>';
 
@@ -1192,7 +1198,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			// Default warehouse
 			print '<tr><td>'.$langs->trans("DefaultWarehouse").'</td><td>';
 			print img_picto($langs->trans("DefaultWarehouse"), 'stock', 'class="pictofixedwidth"');
-			print $formproduct->selectWarehouses(GETPOST('fk_default_warehouse'), 'fk_default_warehouse', 'warehouseopen', 1);
+			print $formproduct->selectWarehouses(GETPOST('fk_default_warehouse', 'int'), 'fk_default_warehouse', 'warehouseopen', 1, 0, 0, '', 0, 0, array(), 'minwidth300 widthcentpercentminusxx maxwidth500');
 			print ' <a href="'.DOL_URL_ROOT.'/product/stock/card.php?action=create&amp;backtopage='.urlencode($_SERVER['PHP_SELF'].'?id='.$object->id.'&action=edit').'">';
 			print '<span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddWarehouse").'"></span>';
 			print '</a>';
@@ -1203,11 +1209,11 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print '<tr><td>'.$form->textwithpicto($langs->trans("StockLimit"), $langs->trans("StockLimitDesc"), 1).'</td><td>';
 			print '<input name="seuil_stock_alerte" class="maxwidth50" value="'.GETPOST('seuil_stock_alerte').'">';
 			print '</td>';
-			if ($conf->browser->layout == 'phone') {
-				print '</tr><tr>';
-			}
+
+			print '</tr><tr>';
+
 			// Stock desired level
-			print '<td>'.$form->textwithpicto($langs->trans("DesiredStock"), $langs->trans("DesiredStockDesc"), 1).'</td><td>';
+			print '<tr><td>'.$form->textwithpicto($langs->trans("DesiredStock"), $langs->trans("DesiredStockDesc"), 1).'</td><td>';
 			print '<input name="desiredstock" class="maxwidth50" value="'.GETPOST('desiredstock').'">';
 			print '</td></tr>';
 		} else {
@@ -1217,7 +1223,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 		// Duration
 		if ($type == 1) {
-			print '<tr><td>'.$langs->trans("Duration").'</td><td colspan="3">';
+			print '<tr><td>'.$langs->trans("Duration").'</td><td>';
 			print '<input name="duration_value" size="4" value="'.GETPOST('duration_value', 'int').'">';
 			print $formproduct->selectMeasuringUnits("duration_unit", "time", GETPOST('duration_value', 'alpha'), 0, 1);
 			print '</td></tr>';
@@ -1225,20 +1231,20 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 		if ($type != 1) {	// Nature, Weight and volume only applies to products and not to services
 			// Nature
-			print '<tr><td>'.$form->textwithpicto($langs->trans("NatureOfProductShort"), $langs->trans("NatureOfProductDesc")).'</td><td colspan="3">';
+			print '<tr><td>'.$form->textwithpicto($langs->trans("NatureOfProductShort"), $langs->trans("NatureOfProductDesc")).'</td><td>';
 			$statutarray = array('1' => $langs->trans("Finished"), '0' => $langs->trans("RowMaterial"));
 			print $form->selectarray('finished', $statutarray, GETPOST('finished', 'alpha'), 1);
 			print '</td></tr>';
 
 			// Brut Weight
-			print '<tr><td>'.$langs->trans("Weight").'</td><td colspan="3">';
+			print '<tr><td>'.$langs->trans("Weight").'</td><td>';
 			print '<input name="weight" size="4" value="'.GETPOST('weight').'">';
 			print $formproduct->selectMeasuringUnits("weight_units", "weight", GETPOSTISSET('weight_units') ?GETPOST('weight_units', 'alpha') : (empty($conf->global->MAIN_WEIGHT_DEFAULT_UNIT) ? 0 : $conf->global->MAIN_WEIGHT_DEFAULT_UNIT), 0, 2);
 			print '</td></tr>';
 
 			// Brut Length
 			if (empty($conf->global->PRODUCT_DISABLE_SIZE)) {
-				print '<tr><td>'.$langs->trans("Length").' x '.$langs->trans("Width").' x '.$langs->trans("Height").'</td><td colspan="3">';
+				print '<tr><td>'.$langs->trans("Length").' x '.$langs->trans("Width").' x '.$langs->trans("Height").'</td><td>';
 				print '<input name="size" class="width50" value="'.GETPOST('size').'"> x ';
 				print '<input name="sizewidth" class="width50" value="'.GETPOST('sizewidth').'"> x ';
 				print '<input name="sizeheight" class="width50" value="'.GETPOST('sizeheight').'">';
@@ -1247,14 +1253,14 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			}
 			if (empty($conf->global->PRODUCT_DISABLE_SURFACE)) {
 				// Brut Surface
-				print '<tr><td>'.$langs->trans("Surface").'</td><td colspan="3">';
+				print '<tr><td>'.$langs->trans("Surface").'</td><td>';
 				print '<input name="surface" size="4" value="'.GETPOST('surface').'">';
 				print $formproduct->selectMeasuringUnits("surface_units", "surface", GETPOSTISSET('surface_units') ?GETPOST('surface_units', 'alpha') : '0', 0, 2);
 				print '</td></tr>';
 			}
 			if (empty($conf->global->PRODUCT_DISABLE_VOLUME)) {
 				// Brut Volume
-				print '<tr><td>'.$langs->trans("Volume").'</td><td colspan="3">';
+				print '<tr><td>'.$langs->trans("Volume").'</td><td>';
 				print '<input name="volume" size="4" value="'.GETPOST('volume').'">';
 				print $formproduct->selectMeasuringUnits("volume_units", "volume", GETPOSTISSET('volume_units') ?GETPOST('volume_units', 'alpha') : '0', 0, 2);
 				print '</td></tr>';
@@ -1262,7 +1268,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 			if (!empty($conf->global->PRODUCT_ADD_NET_MEASURE)) {
 				// Net Measure
-				print '<tr><td>'.$langs->trans("NetMeasure").'</td><td colspan="3">';
+				print '<tr><td>'.$langs->trans("NetMeasure").'</td><td>';
 				print '<input name="net_measure" size="4" value="'.GETPOST('net_measure').'">';
 				print $formproduct->selectMeasuringUnits("net_measure_units", '', GETPOSTISSET('net_measure_units') ?GETPOST('net_measure_units', 'alpha') : (empty($conf->global->MAIN_WEIGHT_DEFAULT_UNIT) ? 0 : $conf->global->MAIN_WEIGHT_DEFAULT_UNIT), 0, 0);
 				print '</td></tr>';
@@ -1272,41 +1278,37 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		// Units
 		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
 			print '<tr><td>'.$langs->trans('DefaultUnitToShow').'</td>';
-			print '<td colspan="3">';
+			print '<td>';
 			print $form->selectUnits(empty($line->fk_unit) ? $conf->global->PRODUCT_USE_UNITS : $line->fk_unit, 'units');
 			print '</td></tr>';
 		}
 
 		// Custom code
 		if (empty($conf->global->PRODUCT_DISABLE_CUSTOM_INFO) && empty($type)) {
-			print '<tr><td>'.$langs->trans("CustomCode").'</td><td><input name="customcode" class="maxwidth100onsmartphone" value="'.GETPOST('customcode').'"></td></tr>';
+			print '<tr><td class="wordbreak">'.$langs->trans("CustomCode").'</td><td><input name="customcode" class="maxwidth100onsmartphone" value="'.GETPOST('customcode').'"></td></tr>';
 
 			// Origin country
-			print '<td>'.$langs->trans("CountryOrigin").'</td>';
+			print '<tr><td>'.$langs->trans("CountryOrigin").'</td>';
 			print '<td>';
 			print img_picto('', 'globe-americas', 'class="paddingrightonly"');
 			print $form->select_country((GETPOSTISSET('country_id') ? GETPOST('country_id') : $object->country_id), 'country_id', '', 0, 'minwidth300 widthcentpercentminusx');
 			if ($user->admin) {
 				print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 			}
-			print '</td>';
+			print '</td></tr>';
 
 			// State
 			if (empty($conf->global->PRODUCT_DISABLE_STATE)) {
-				if ($conf->browser->layout == 'phone') {
-					print '</tr><tr>';
-				}
+				print '<tr>';
 				if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && ($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 || $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 2)) {
-					print '<td>'.$form->editfieldkey('RegionStateOrigin', 'state_id', '', $object, 0).'</td><td colspan="3">';
+					print '<td>'.$form->editfieldkey('RegionStateOrigin', 'state_id', '', $object, 0).'</td><td>';
 				} else {
-					print '<td>'.$form->editfieldkey('StateOrigin', 'state_id', '', $object, 0).'</td><td colspan="3">';
+					print '<td>'.$form->editfieldkey('StateOrigin', 'state_id', '', $object, 0).'</td><td>';
 				}
 
 				print $formcompany->select_state($object->state_id, $object->country_code);
 				print '</tr>';
 			}
-
-			print '</tr>';
 		}
 
 		// Quality control
@@ -1316,7 +1318,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		}
 
 		// Other attributes
-		$parameters = array('colspan' => 3, 'cols' => '3');
+		$parameters = array('colspan' => ' colspan="2"', 'cols'=>2);
 		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 		if (empty($reshook)) {
@@ -1326,7 +1328,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		// Note (private, no output on invoices, propales...)
 		//if (! empty($conf->global->MAIN_DISABLE_NOTES_TAB))       available in create mode
 		//{
-			print '<tr><td class="tdtop">'.$langs->trans("NoteNotVisibleOnBill").'</td><td colspan="3">';
+			print '<tr><td class="tdtop">'.$langs->trans("NoteNotVisibleOnBill").'</td><td>';
 
 			// We use dolibarr_details as type of DolEditor here, because we must not accept images as description is included into PDF and not accepted by TCPDF.
 			$doleditor = new DolEditor('note_private', GETPOST('note_private', 'restricthtml'), '', 140, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_8, '90%');
@@ -1337,7 +1339,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 		if ($conf->categorie->enabled) {
 			// Categories
-			print '<tr><td>'.$langs->trans("Categories").'</td><td colspan="3">';
+			print '<tr><td>'.$langs->trans("Categories").'</td><td>';
 			$cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, '', 'parent', 64, 0, 1);
 			print img_picto('', 'category').$form->multiselectarray('categories', $cate_arbo, GETPOST('categories', 'array'), '', 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
 			print "</td></tr>";
@@ -1385,6 +1387,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		}
 
 		// Accountancy codes
+		print '<!-- accountancy codes -->'."\n";
 		print '<table class="border centpercent">';
 
 		if (!empty($conf->accounting->enabled)) {
@@ -1396,7 +1399,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			} else {
 				$accountancy_code_sell = (GETPOSTISSET('accountancy_code_sell') ? GETPOST('accountancy_code_sell', 'alpha') : $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT);
 			}
-			print $formaccounting->select_account($accountancy_code_sell, 'accountancy_code_sell', 1, null, 1, 1, 'minwidth100 maxwidth300 maxwidthonsmartphone', 1);
+			print $formaccounting->select_account($accountancy_code_sell, 'accountancy_code_sell', 1, null, 1, 1, 'minwidth150 maxwidth300', 1);
 			print '</td></tr>';
 
 			// Accountancy_code_sell_intra
@@ -1408,7 +1411,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				} else {
 					$accountancy_code_sell_intra = (GETPOSTISSET('accountancy_code_sell_intra') ? GETPOST('accountancy_code_sell_intra', 'alpha') : $conf->global->ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT);
 				}
-				print $formaccounting->select_account($accountancy_code_sell_intra, 'accountancy_code_sell_intra', 1, null, 1, 1, 'minwidth100 maxwidth300 maxwidthonsmartphone', 1);
+				print $formaccounting->select_account($accountancy_code_sell_intra, 'accountancy_code_sell_intra', 1, null, 1, 1, 'minwidth150 maxwidth300', 1);
 				print '</td></tr>';
 			}
 
@@ -1420,7 +1423,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			} else {
 				$accountancy_code_sell_export = (GETPOST('accountancy_code_sell_export') ? GETPOST('accountancy_code_sell_export', 'alpha') : $conf->global->ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT);
 			}
-			print $formaccounting->select_account($accountancy_code_sell_export, 'accountancy_code_sell_export', 1, null, 1, 1, 'minwidth100 maxwidth300 maxwidthonsmartphone', 1);
+			print $formaccounting->select_account($accountancy_code_sell_export, 'accountancy_code_sell_export', 1, null, 1, 1, 'minwidth150 maxwidth300', 1);
 			print '</td></tr>';
 
 			// Accountancy_code_buy
@@ -1431,7 +1434,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			} else {
 				$accountancy_code_buy = (GETPOST('accountancy_code_buy', 'alpha') ? (GETPOST('accountancy_code_buy', 'alpha')) : $conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT);
 			}
-			print $formaccounting->select_account($accountancy_code_buy, 'accountancy_code_buy', 1, null, 1, 1, 'minwidth100 maxwidth300 maxwidthonsmartphone', 1);
+			print $formaccounting->select_account($accountancy_code_buy, 'accountancy_code_buy', 1, null, 1, 1, 'minwidth150 maxwidth300', 1);
 			print '</td></tr>';
 
 			// Accountancy_code_buy_intra
@@ -1443,7 +1446,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				} else {
 					$accountancy_code_buy_intra = (GETPOSTISSET('accountancy_code_buy_intra') ? GETPOST('accountancy_code_buy_intra', 'alpha') : $conf->global->ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT);
 				}
-				print $formaccounting->select_account($accountancy_code_buy_intra, 'accountancy_code_buy_intra', 1, null, 1, 1, 'minwidth100 maxwidth300 maxwidthonsmartphone', 1);
+				print $formaccounting->select_account($accountancy_code_buy_intra, 'accountancy_code_buy_intra', 1, null, 1, 1, 'minwidth150 maxwidth300', 1);
 				print '</td></tr>';
 			}
 
@@ -1455,10 +1458,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			} else {
 				$accountancy_code_buy_export = (GETPOST('accountancy_code_buy_export') ? GETPOST('accountancy_code_buy_export', 'alpha') : $conf->global->ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT);
 			}
-			print $formaccounting->select_account($accountancy_code_buy_export, 'accountancy_code_buy_export', 1, null, 1, 1, 'minwidth100 maxwidth300 maxwidthonsmartphone', 1);
+			print $formaccounting->select_account($accountancy_code_buy_export, 'accountancy_code_buy_export', 1, null, 1, 1, 'minwidth150 maxwidth300', 1);
 			print '</td></tr>';
-		} else // For external software
-		{
+		} else {// For external software
 			if (!empty($accountancy_code_sell)) {
 				$object->accountancy_code_sell = $accountancy_code_sell;
 			}
@@ -1480,36 +1482,36 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 			// Accountancy_code_sell
 			print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellCode").'</td>';
-			print '<td class="maxwidthonsmartphone"><input class="minwidth100" name="accountancy_code_sell" value="'.$object->accountancy_code_sell.'">';
+			print '<td class="maxwidthonsmartphone"><input class="minwidth150" name="accountancy_code_sell" value="'.$object->accountancy_code_sell.'">';
 			print '</td></tr>';
 
 			// Accountancy_code_sell_intra
 			if ($mysoc->isInEEC()) {
 				print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellIntraCode").'</td>';
-				print '<td class="maxwidthonsmartphone"><input class="minwidth100" name="accountancy_code_sell_intra" value="'.$object->accountancy_code_sell_intra.'">';
+				print '<td class="maxwidthonsmartphone"><input class="minwidth150" name="accountancy_code_sell_intra" value="'.$object->accountancy_code_sell_intra.'">';
 				print '</td></tr>';
 			}
 
 			// Accountancy_code_sell_export
 			print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellExportCode").'</td>';
-			print '<td class="maxwidthonsmartphone"><input class="minwidth100" name="accountancy_code_sell_export" value="'.$object->accountancy_code_sell_export.'">';
+			print '<td class="maxwidthonsmartphone"><input class="minwidth150" name="accountancy_code_sell_export" value="'.$object->accountancy_code_sell_export.'">';
 			print '</td></tr>';
 
 			// Accountancy_code_buy
 			print '<tr><td>'.$langs->trans("ProductAccountancyBuyCode").'</td>';
-			print '<td class="maxwidthonsmartphone"><input class="minwidth100" name="accountancy_code_buy" value="'.$object->accountancy_code_buy.'">';
+			print '<td class="maxwidthonsmartphone"><input class="minwidth150" name="accountancy_code_buy" value="'.$object->accountancy_code_buy.'">';
 			print '</td></tr>';
 
 			// Accountancy_code_buy_intra
 			if ($mysoc->isInEEC()) {
 				print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancyBuyIntraCode").'</td>';
-				print '<td class="maxwidthonsmartphone"><input class="minwidth100" name="accountancy_code_buy_intra" value="'.$object->accountancy_code_buy_intra.'">';
+				print '<td class="maxwidthonsmartphone"><input class="minwidth150" name="accountancy_code_buy_intra" value="'.$object->accountancy_code_buy_intra.'">';
 				print '</td></tr>';
 			}
 
 			// Accountancy_code_buy_export
 			print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancyBuyExportCode").'</td>';
-			print '<td class="maxwidthonsmartphone"><input class="minwidth100" name="accountancy_code_buy_export" value="'.$object->accountancy_code_buy_export.'">';
+			print '<td class="maxwidthonsmartphone"><input class="minwidth150" name="accountancy_code_buy_export" value="'.$object->accountancy_code_buy_export.'">';
 			print '</td></tr>';
 		}
 		print '</table>';
@@ -1609,14 +1611,14 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 					print '<tr><td>'.$langs->trans("ManageLotSerial").'</td><td>';
 					$statutarray = array('0' => $langs->trans("ProductStatusNotOnBatch"), '1' => $langs->trans("ProductStatusOnBatch"), '2' => $langs->trans("ProductStatusOnSerial"));
 					print $form->selectarray('status_batch', $statutarray, $object->status_batch);
-					print '</td>';
+					print '</td></tr>';
 					if ($object->status_batch !== '0') {
 						$tooltip = $langs->trans("GenericMaskCodes", $langs->transnoentities("Batch"), $langs->transnoentities("Batch"));
 						$tooltip .= $langs->trans("GenericMaskCodes2");
 						$tooltip .= $langs->trans("GenericMaskCodes3");
 						$tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("Batch"), $langs->transnoentities("Batch"));
 						$tooltip .= $langs->trans("GenericMaskCodes5");
-						print '<td id="mask_option">'.$langs->trans("ManageLotMask").'</td>';
+						print '<tr><td id="mask_option">'.$langs->trans("ManageLotMask").'</td>';
 						if ($object->status_batch == '1' && $conf->global->PRODUCTBATCH_LOT_USE_PRODUCT_MASKS && $conf->global->PRODUCTBATCH_LOT_ADDON == 'mod_lot_advanced') {
 							$mask = ! empty($object->batch_mask) ? $object->batch_mask : $conf->global->LOT_ADVANCED_MASK;
 						}
@@ -1627,7 +1629,6 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 						$inherited_mask_sn = $conf->global->SN_ADVANCED_MASK;
 						print '<td id="field_mask">';
 						print $form->textwithpicto('<input type="text" class="flat" size="24" name="batch_mask" id="batch_mask_input" value="'.$mask.'">', $tooltip, 1, 1);
-						print '</td>';
 
 						print '<script type="text/javascript">
 						$(document).ready(function() {
@@ -1637,24 +1638,33 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 								$("#field_mask, #mask_option").toggleClass("hideobject");
 							}
 							$("#status_batch").on("change", function () {
+								console.log("We change batch status");
 								var optionSelected = $("option:selected", this);
 								var valueSelected = this.value;
 								$("#field_mask, #mask_option").addClass("hideobject");
+						';
+						if ($conf->global->PRODUCTBATCH_LOT_USE_PRODUCT_MASKS && $conf->global->PRODUCTBATCH_LOT_ADDON == 'mod_lot_advanced') {
+							print '
 								if (this.value == 1) {
 									$("#field_mask, #mask_option").toggleClass("hideobject");
 									$("#batch_mask_input").val("'.$inherited_mask_lot.'");
 								}
+							';
+						}
+						if ($conf->global->PRODUCTBATCH_SN_USE_PRODUCT_MASKS && $conf->global->PRODUCTBATCH_SN_ADDON == 'mod_sn_advanced') {
+							print '
 								if (this.value == 2) {
 									$("#field_mask, #mask_option").toggleClass("hideobject");
 									$("#batch_mask_input").val("'.$inherited_mask_sn.'");
 								}
+							';
+						}
+						print '
 							})
 						})
 					</script>';
-					} else {
-						print '<td colspan="2"></td>';
+						print '</td></tr>';
 					}
-					print '</tr>';
 				}
 			}
 
@@ -1677,17 +1687,18 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				require_once DOL_DOCUMENT_ROOT.'/core/class/html.formbarcode.class.php';
 				$formbarcode = new FormBarCode($db);
 				print $formbarcode->selectBarcodeType($fk_barcode_type, 'fk_barcode_type', 1);
-				print '</td><td>'.$langs->trans("BarcodeValue").'</td><td>';
+				print '</td></tr>';
+				print '<tr><td>'.$langs->trans("BarcodeValue").'</td><td>';
 				$tmpcode = GETPOSTISSET('barcode') ? GETPOST('barcode') : $object->barcode;
 				if (empty($tmpcode) && !empty($modBarCodeProduct->code_auto)) {
 					$tmpcode = $modBarCodeProduct->getNextValue($object, $fk_barcode_type);
 				}
-				print '<input size="40" class="maxwidthonsmartphone" type="text" name="barcode" value="'.dol_escape_htmltag($tmpcode).'">';
+				print '<input class="maxwidth150 maxwidthonsmartphone" type="text" name="barcode" value="'.dol_escape_htmltag($tmpcode).'">';
 				print '</td></tr>';
 			}
 
 			// Description (used in invoice, propal...)
-			print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td colspan="3">';
+			print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td>';
 
 			// We use dolibarr_details as type of DolEditor here, because we must not accept images as description is included into PDF and not accepted by TCPDF.
 			$doleditor = new DolEditor('desc', $object->description, '', 160, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_4, '90%');
@@ -1697,7 +1708,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print "\n";
 
 			// Public Url
-			print '<tr><td>'.$langs->trans("PublicUrl").'</td><td colspan="3">';
+			print '<tr><td>'.$langs->trans("PublicUrl").'</td><td>';
 			print '<input type="text" name="url" class="quatrevingtpercent" value="'.$object->url.'">';
 			print '</td></tr>';
 
@@ -1707,7 +1718,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				print '<tr><td>'.$langs->trans("DefaultWarehouse").'</td><td>';
 				print $formproduct->selectWarehouses($object->fk_default_warehouse, 'fk_default_warehouse', 'warehouseopen', 1);
 				print ' <a href="'.DOL_URL_ROOT.'/product/stock/card.php?action=create&amp;backtopage='.urlencode($_SERVER['PHP_SELF'].'?action=create&type='.GETPOST('type', 'int')).'"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddWarehouse").'"></span></a>';
-				print '</td>';
+				print '</td></tr>';
 				/*
 				print "<tr>".'<td>'.$langs->trans("StockLimit").'</td><td>';
 				print '<input name="seuil_stock_alerte" size="4" value="'.$object->seuil_stock_alerte.'">';
@@ -1727,25 +1738,25 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 			if ($object->isService()) {
 				// Duration
-				print '<tr><td>'.$langs->trans("Duration").'</td><td colspan="3">';
+				print '<tr><td>'.$langs->trans("Duration").'</td><td>';
 				print '<input name="duration_value" size="5" value="'.$object->duration_value.'"> ';
 				print $formproduct->selectMeasuringUnits("duration_unit", "time", $object->duration_unit, 0, 1);
 				print '</td></tr>';
 			} else {
 				// Nature
-				print '<tr><td>'.$form->textwithpicto($langs->trans("NatureOfProductShort"), $langs->trans("NatureOfProductDesc")).'</td><td colspan="3">';
+				print '<tr><td>'.$form->textwithpicto($langs->trans("NatureOfProductShort"), $langs->trans("NatureOfProductDesc")).'</td><td>';
 				print $formproduct->selectProductNature('finished', $object->finished);
 				print '</td></tr>';
 
 				// Brut Weight
-				print '<tr><td>'.$langs->trans("Weight").'</td><td colspan="3">';
+				print '<tr><td>'.$langs->trans("Weight").'</td><td>';
 				print '<input name="weight" size="5" value="'.$object->weight.'"> ';
 				print $formproduct->selectMeasuringUnits("weight_units", "weight", $object->weight_units, 0, 2);
 				print '</td></tr>';
 
 				if (empty($conf->global->PRODUCT_DISABLE_SIZE)) {
 					// Brut Length
-					print '<tr><td>'.$langs->trans("Length").' x '.$langs->trans("Width").' x '.$langs->trans("Height").'</td><td colspan="3">';
+					print '<tr><td>'.$langs->trans("Length").' x '.$langs->trans("Width").' x '.$langs->trans("Height").'</td><td>';
 					print '<input name="size" size="5" value="'.$object->length.'">x';
 					print '<input name="sizewidth" size="5" value="'.$object->width.'">x';
 					print '<input name="sizeheight" size="5" value="'.$object->height.'"> ';
@@ -1754,14 +1765,14 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				}
 				if (empty($conf->global->PRODUCT_DISABLE_SURFACE)) {
 					// Brut Surface
-					print '<tr><td>'.$langs->trans("Surface").'</td><td colspan="3">';
+					print '<tr><td>'.$langs->trans("Surface").'</td><td>';
 					print '<input name="surface" size="5" value="'.$object->surface.'"> ';
 					print $formproduct->selectMeasuringUnits("surface_units", "surface", $object->surface_units, 0, 2);
 					print '</td></tr>';
 				}
 				if (empty($conf->global->PRODUCT_DISABLE_VOLUME)) {
 					// Brut Volume
-					print '<tr><td>'.$langs->trans("Volume").'</td><td colspan="3">';
+					print '<tr><td>'.$langs->trans("Volume").'</td><td>';
 					print '<input name="volume" size="5" value="'.$object->volume.'"> ';
 					print $formproduct->selectMeasuringUnits("volume_units", "volume", $object->volume_units, 0, 2);
 					print '</td></tr>';
@@ -1769,7 +1780,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 				if (!empty($conf->global->PRODUCT_ADD_NET_MEASURE)) {
 					// Net Measure
-					print '<tr><td>'.$langs->trans("NetMeasure").'</td><td colspan="3">';
+					print '<tr><td>'.$langs->trans("NetMeasure").'</td><td>';
 					print '<input name="net_measure" size="5" value="'.$object->net_measure.'"> ';
 					print $formproduct->selectMeasuringUnits("net_measure_units", "", $object->net_measure_units, 0, 0);
 					print '</td></tr>';
@@ -1778,38 +1789,36 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			// Units
 			if (!empty($conf->global->PRODUCT_USE_UNITS)) {
 				print '<tr><td>'.$langs->trans('DefaultUnitToShow').'</td>';
-				print '<td colspan="3">';
+				print '<td>';
 				print $form->selectUnits($object->fk_unit, 'units');
 				print '</td></tr>';
 			}
 
 			// Custom code
 			if (!$object->isService() && empty($conf->global->PRODUCT_DISABLE_CUSTOM_INFO)) {
-				print '<tr><td>'.$langs->trans("CustomCode").'</td><td><input name="customcode" class="maxwidth100onsmartphone" value="'.$object->customcode.'"></td></tr>';
+				print '<tr><td class="wordbreak">'.$langs->trans("CustomCode").'</td><td><input name="customcode" class="maxwidth100onsmartphone" value="'.$object->customcode.'"></td></tr>';
 				// Origin country
-				print '<td>'.$langs->trans("CountryOrigin").'</td>';
+				print '<tr><td>'.$langs->trans("CountryOrigin").'</td>';
 				print '<td>';
 				print img_picto('', 'globe-americas', 'class="paddingrightonly"');
 				print $form->select_country($object->country_id, 'country_id', '', 0, 'minwidth100 maxwidthonsmartphone');
 				if ($user->admin) {
 					print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 				}
-				print '</td>';
+				print '</td></tr>';
 				// State
 				if (empty($conf->global->PRODUCT_DISABLE_STATE)) {
-					if ($conf->browser->layout == 'phone') {
-						print '</tr><tr>';
-					}
+					print '<tr>';
 					if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && ($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 || $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 2)) {
-						print '<td>'.$form->editfieldkey('RegionStateOrigin', 'state_id', '', $object, 0).'</td><td colspan="3">';
+						print '<td>'.$form->editfieldkey('RegionStateOrigin', 'state_id', '', $object, 0).'</td><td>';
 					} else {
-						print '<td>'.$form->editfieldkey('StateOrigin', 'state_id', '', $object, 0).'</td><td colspan="3">';
+						print '<td>'.$form->editfieldkey('StateOrigin', 'state_id', '', $object, 0).'</td><td>';
 					}
 
 					print $formcompany->select_state($object->state_id, $object->country_code);
 					print '</td>';
+					print '</tr>';
 				}
-				print '</tr>';
 			}
 
 			// Quality control
@@ -1819,7 +1828,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			}
 
 			// Other attributes
-			$parameters = array('colspan' => ' colspan="3"', 'cols' => 3);
+			$parameters = array('colspan' => ' colspan="2"', 'cols' => 2);
 			$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 			print $hookmanager->resPrint;
 			if (empty($reshook)) {
@@ -1828,7 +1837,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 			// Tags-Categories
 			if ($conf->categorie->enabled) {
-				print '<tr><td>'.$langs->trans("Categories").'</td><td colspan="3">';
+				print '<tr><td>'.$langs->trans("Categories").'</td><td>';
 				$cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, '', 'parent', 64, 0, 1);
 				$c = new Categorie($db);
 				$cats = $c->containing($object->id, Categorie::TYPE_PRODUCT);
@@ -1844,7 +1853,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 			// Note private
 			if (!empty($conf->global->MAIN_DISABLE_NOTES_TAB)) {
-				print '<tr><td class="tdtop">'.$langs->trans("NoteNotVisibleOnBill").'</td><td colspan="3">';
+				print '<tr><td class="tdtop">'.$langs->trans("NoteNotVisibleOnBill").'</td><td>';
 
 				$doleditor = new DolEditor('note_private', $object->note_private, '', 140, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_4, '90%');
 				$doleditor->Create();
@@ -1862,41 +1871,41 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				// Accountancy_code_sell
 				print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellCode").'</td>';
 				print '<td>';
-				print $formaccounting->select_account($object->accountancy_code_sell, 'accountancy_code_sell', 1, '', 1, 1);
+				print $formaccounting->select_account($object->accountancy_code_sell, 'accountancy_code_sell', 1, '', 1, 1, 'minwidth150 maxwidth300');
 				print '</td></tr>';
 
 				// Accountancy_code_sell_intra
 				if ($mysoc->isInEEC()) {
 					print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellIntraCode").'</td>';
 					print '<td>';
-					print $formaccounting->select_account($object->accountancy_code_sell_intra, 'accountancy_code_sell_intra', 1, '', 1, 1);
+					print $formaccounting->select_account($object->accountancy_code_sell_intra, 'accountancy_code_sell_intra', 1, '', 1, 1, 'minwidth150 maxwidth300');
 					print '</td></tr>';
 				}
 
 				// Accountancy_code_sell_export
 				print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellExportCode").'</td>';
 				print '<td>';
-				print $formaccounting->select_account($object->accountancy_code_sell_export, 'accountancy_code_sell_export', 1, '', 1, 1);
+				print $formaccounting->select_account($object->accountancy_code_sell_export, 'accountancy_code_sell_export', 1, '', 1, 1, 'minwidth150 maxwidth300');
 				print '</td></tr>';
 
 				// Accountancy_code_buy
 				print '<tr><td>'.$langs->trans("ProductAccountancyBuyCode").'</td>';
 				print '<td>';
-				print $formaccounting->select_account($object->accountancy_code_buy, 'accountancy_code_buy', 1, '', 1, 1);
+				print $formaccounting->select_account($object->accountancy_code_buy, 'accountancy_code_buy', 1, '', 1, 1, 'minwidth150 maxwidth300');
 				print '</td></tr>';
 
 				// Accountancy_code_buy_intra
 				if ($mysoc->isInEEC()) {
 					print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancyBuyIntraCode").'</td>';
 					print '<td>';
-					print $formaccounting->select_account($object->accountancy_code_buy_intra, 'accountancy_code_buy_intra', 1, '', 1, 1);
+					print $formaccounting->select_account($object->accountancy_code_buy_intra, 'accountancy_code_buy_intra', 1, '', 1, 1, 'minwidth150 maxwidth300');
 					print '</td></tr>';
 				}
 
 				// Accountancy_code_buy_export
 				print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancyBuyExportCode").'</td>';
 				print '<td>';
-				print $formaccounting->select_account($object->accountancy_code_buy_export, 'accountancy_code_buy_export', 1, '', 1, 1);
+				print $formaccounting->select_account($object->accountancy_code_buy_export, 'accountancy_code_buy_export', 1, '', 1, 1, 'minwidth150 maxwidth300');
 				print '</td></tr>';
 			} else {
 				// For external software
diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index 69429677c27..637e186a3f3 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -382,11 +382,13 @@ class FormProduct
 	 *  @param  string		$default             Preselected value
 	 *  @param  int|string	$adddefault			 1=Add empty unit called "Default", ''=Add empty value
 	 *  @param  int         $mode                1=Use short label as value, 0=Use rowid, 2=Use scale (power)
+	 *  @param	string		$morecss			 More CSS
 	 *  @return string
 	 */
-	public function selectMeasuringUnits($name = 'measuring_units', $measuring_style = '', $default = '0', $adddefault = 0, $mode = 0)
+	public function selectMeasuringUnits($name = 'measuring_units', $measuring_style = '', $default = '0', $adddefault = 0, $mode = 0, $morecss = 'maxwidth125')
 	{
 		global $langs, $conf, $mysoc, $db;
+
 		$langs->load("other");
 
 		$return = '';
@@ -412,7 +414,7 @@ class FormProduct
 			dol_print_error($db);
 			return -1;
 		} else {
-			$return .= '<select class="flat" name="'.$name.'">';
+			$return .= '<select class="flat'.($morecss ? ' '.$morecss : '').'" name="'.$name.'">';
 			if ($adddefault || $adddefault === '') {
 				$return .= '<option value="0">'.($adddefault ? $langs->trans("Default") : '').'</option>';
 			}

From 648c1ef3a66f9493c5d98316c438de495fde9b82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 10 Jun 2021 20:32:45 +0200
Subject: [PATCH 0539/1497] try to fix

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 29a27ccd38b..f5726090d50 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -8009,7 +8009,7 @@ function dol_eval($s, $returnvalue = 0, $hideerrors = 1)
 	$forbiddenphpstrings = array_merge($forbiddenphpstrings, array("fopen(", "file_put_contents(", "fputs(", "fputscsv(", "fwrite(", "fpassthru(", "unlink(", "mkdir(", "rmdir(", "symlink(", "touch(", "umask("));
 	$forbiddenphpstrings = array_merge($forbiddenphpstrings, array('function(', '$$', 'call_user_func('));
 	$forbiddenphpstrings = array_merge($forbiddenphpstrings, array('_ENV', '_SESSION', '_COOKIE', '_GET', '_POST', '_REQUEST'));
-	$forbiddenphpregex = array('global\s+\$');
+	$forbiddenphpregex = 'global\s+\$';
 	do {
 		$oldstringtoclean = $s;
 		$s = str_ireplace($forbiddenphpstrings, '__forbiddenstring__', $s);

From 3cb17d7535f5fa234004c50697cc88dfa9625fb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 10 Jun 2021 20:40:10 +0200
Subject: [PATCH 0540/1497] fix warning

---
 htdocs/core/tpl/document_actions_post_headers.tpl.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/tpl/document_actions_post_headers.tpl.php b/htdocs/core/tpl/document_actions_post_headers.tpl.php
index 4a43da6d6cc..45090824248 100644
--- a/htdocs/core/tpl/document_actions_post_headers.tpl.php
+++ b/htdocs/core/tpl/document_actions_post_headers.tpl.php
@@ -112,7 +112,7 @@ if (!isset($savingdocmask) || !empty($conf->global->MAIN_DISABLE_SUGGEST_REF_AS_
 	}
 }
 
-if (!is_object($formfile)) {
+if (empty($formfile) || !is_object($formfile)) {
 	$formfile = new FormFile($db);
 }
 

From 3f40a65f26f052f91ab8a55570a29a0810832136 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 10 Jun 2021 20:53:29 +0200
Subject: [PATCH 0541/1497] fix warnings

---
 htdocs/compta/facture/list.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index de6c3f66065..323f2b7004a 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -131,7 +131,7 @@ $search_datelimit_end = dol_mktime(23, 59, 59, GETPOST('search_datelimit_endmont
 $search_categ_cus = GETPOST("search_categ_cus", 'int');
 $search_btn = GETPOST('button_search', 'alpha');
 $search_remove_btn = GETPOST('button_removefilter', 'alpha');
-
+$optioncss = GETPOST('optioncss', 'alpha');
 
 
 $option = GETPOST('search_option');
@@ -262,7 +262,7 @@ foreach ($object->fields as $key => $val) {
 				'checked'=>(($visible < 0) ? 0 : 1),
 				'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
 				'position'=>$val['position'],
-				'help'=>$val['help']
+				'help' => empty($val['help']) ? '' : $val['help'],
 			);
 		}
 	}
@@ -472,7 +472,7 @@ $sql = 'SELECT';
 if ($sall || $search_product_category > 0 || $search_user > 0) {
 	$sql = 'SELECT DISTINCT';
 }
-$sql .= ' f.rowid as id, f.ref, f.ref_client, f.type, f.note_private, f.note_public, f.increment, f.fk_mode_reglement, f.fk_cond_reglement, f.total_ht, f.total_tva, f.total_ttc,';
+$sql .= ' f.rowid as id, f.ref, f.ref_client, f.fk_soc, f.type, f.note_private, f.note_public, f.increment, f.fk_mode_reglement, f.fk_cond_reglement, f.total_ht, f.total_tva, f.total_ttc,';
 $sql .= ' f.localtax1 as total_localtax1, f.localtax2 as total_localtax2,';
 $sql .= ' f.fk_user_author,';
 $sql .= ' f.fk_multicurrency, f.multicurrency_code, f.multicurrency_tx, f.multicurrency_total_ht, f.multicurrency_total_tva as multicurrency_total_vat, f.multicurrency_total_ttc,';

From 86eea2c4fc1842f2e6eacd1c79d7937daba72d0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 10 Jun 2021 20:55:00 +0200
Subject: [PATCH 0542/1497] Update list.php

---
 htdocs/compta/facture/list.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 323f2b7004a..bcf590fd835 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -1501,6 +1501,10 @@ if ($resql) {
 	if ($num > 0) {
 		$i = 0;
 		$totalarray = array();
+		$totalarray['nbfield'] = 0;
+		$totalarray['val'] = array();
+		$totalarray['val']['f.total_ht'] = 0;
+		$totalarray['val']['f.total_ttc'] = 0;
 		while ($i < min($num, $limit)) {
 			$obj = $db->fetch_object($resql);
 

From 759472f5d1ff5c5439db59b261ba8a6dcf5f7a6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 10 Jun 2021 20:58:56 +0200
Subject: [PATCH 0543/1497] fix warning

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

diff --git a/htdocs/core/class/discount.class.php b/htdocs/core/class/discount.class.php
index af336c38745..43a6bf50df6 100644
--- a/htdocs/core/class/discount.class.php
+++ b/htdocs/core/class/discount.class.php
@@ -519,7 +519,7 @@ class DiscountAbsolute
 			//}
 			if ($multicurrency)
 			{
-				return $obj->amount_multicurrency;
+				return $obj->multicurrency_amount;
 			}
 
 			return $obj->amount;

From 1e7df0ba9fe9f8b247e77ac8b0f75b98a969bb01 Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <68746600+marc-dll@users.noreply.github.com>
Date: Thu, 10 Jun 2021 21:53:06 +0200
Subject: [PATCH 0544/1497] NEW: holiday: handle monthly updates with cronjob

---
 htdocs/core/modules/modHoliday.class.php | 22 ++++++++++++++++++++++
 htdocs/holiday/class/holiday.class.php   |  2 +-
 htdocs/holiday/define_holiday.php        |  4 ----
 htdocs/holiday/list.php                  |  3 ---
 htdocs/hrm/index.php                     | 10 ----------
 htdocs/langs/en_US/holiday.lang          |  1 +
 test/phpunit/HolidayTest.php             |  2 +-
 7 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/htdocs/core/modules/modHoliday.class.php b/htdocs/core/modules/modHoliday.class.php
index 23cbf7eddf8..76700b59b31 100644
--- a/htdocs/core/modules/modHoliday.class.php
+++ b/htdocs/core/modules/modHoliday.class.php
@@ -135,6 +135,28 @@ class modHoliday extends DolibarrModules
 		//$r++;
 
 
+		// Cronjobs
+		$arraydate = dol_getdate(dol_now());
+		$datestart = dol_mktime(4, 0, 0, $arraydate['mon'], $arraydate['mday'], $arraydate['year']);
+		$this->cronjobs = array(
+			0 => array(
+                'label' => 'HolidayBalanceMonthlyUpdate',
+                'jobtype' => 'method',
+                'class' => 'holiday/class/holiday.class.php',
+                'objectname' => 'Holiday',
+                'method' => 'updateBalance',
+                'parameters' => '',
+                'comment' => 'Update holiday balance every month',
+                'frequency' => 1,
+                'unitfrequency' => 3600 * 24,
+                'priority' => 50,
+                'status' => 1,
+                'test' => '$conf->holiday->enabled',
+                'datestart' => $datestart
+            )
+		);
+
+
 		// Permissions
 		$this->rights = array(); // Permission array used by this module
 		$r = 0;
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index 55dd1c4bafb..b885202f3a9 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -227,7 +227,7 @@ class Holiday extends CommonObject
 
 		if ($result >= 0) {
 			$this->db->commit();
-			return 1;
+			return 0; // for cronjob use (0 is OK, any other value is an error code)
 		} else {
 			$this->db->rollback();
 			return -1;
diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php
index b3d2c25adda..fcb8b73d486 100644
--- a/htdocs/holiday/define_holiday.php
+++ b/htdocs/holiday/define_holiday.php
@@ -193,10 +193,6 @@ llxHeader('', $langs->trans('CPTitreMenu'));
 
 
 $typeleaves = $holiday->getTypes(1, 1);
-$result = $holiday->updateBalance(); // Create users into table holiday if they don't exists. TODO Remove this whif we use field into table user.
-if ($result < 0) {
-	setEventMessages($holiday->error, $holiday->errors, 'errors');
-}
 
 
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index c62185d5f2a..9d569f4344e 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -231,9 +231,6 @@ $formfile = new FormFile($db);
 $fuser = new User($db);
 $holidaystatic = new Holiday($db);
 
-// Update sold
-$result = $object->updateBalance();
-
 $title = $langs->trans('CPTitreMenu');
 llxHeader('', $title);
 
diff --git a/htdocs/hrm/index.php b/htdocs/hrm/index.php
index 50fd4c3f521..6cc4dc3b5bd 100644
--- a/htdocs/hrm/index.php
+++ b/htdocs/hrm/index.php
@@ -68,16 +68,6 @@ if (empty($conf->global->MAIN_INFO_SOCIETE_NOM) || empty($conf->global->MAIN_INF
 $max = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
 
 
-/*
- * Actions
- */
-
-// Update sold
-if (!empty($conf->holiday->enabled) && !empty($setupcompanynotcomplete)) {
-	$holidaystatic = new Holiday($db);
-	$result = $holidaystatic->updateBalance();
-}
-
 
 /*
  * View
diff --git a/htdocs/langs/en_US/holiday.lang b/htdocs/langs/en_US/holiday.lang
index 2393a02ee50..0e6b1d69b36 100644
--- a/htdocs/langs/en_US/holiday.lang
+++ b/htdocs/langs/en_US/holiday.lang
@@ -132,3 +132,4 @@ FreeLegalTextOnHolidays=Free text on PDF
 WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
 HolidaysToApprove=Holidays to approve
 NobodyHasPermissionToValidateHolidays=Nobody has permission to validate holidays
+HolidayBalanceMonthlyUpdate=Monthly update of holiday balance
diff --git a/test/phpunit/HolidayTest.php b/test/phpunit/HolidayTest.php
index bba5d68c41e..415d45da674 100644
--- a/test/phpunit/HolidayTest.php
+++ b/test/phpunit/HolidayTest.php
@@ -366,6 +366,6 @@ class HolidayTest extends PHPUnit\Framework\TestCase
 
 		$localobjecta->updateConfCP('lastUpdate', '20100101120000');
 		$result = $localobjecta->updateBalance();
-		$this->assertEquals($result, 1);
+		$this->assertEquals($result, 0);
 	}
 }

From 82feb57fcfbfdd971a1a4c7581878fbc1c1349fc Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Thu, 10 Jun 2021 19:56:03 +0000
Subject: [PATCH 0545/1497] Fixing style errors.

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

diff --git a/htdocs/core/modules/modHoliday.class.php b/htdocs/core/modules/modHoliday.class.php
index 76700b59b31..71ab96e65bd 100644
--- a/htdocs/core/modules/modHoliday.class.php
+++ b/htdocs/core/modules/modHoliday.class.php
@@ -140,20 +140,20 @@ class modHoliday extends DolibarrModules
 		$datestart = dol_mktime(4, 0, 0, $arraydate['mon'], $arraydate['mday'], $arraydate['year']);
 		$this->cronjobs = array(
 			0 => array(
-                'label' => 'HolidayBalanceMonthlyUpdate',
-                'jobtype' => 'method',
-                'class' => 'holiday/class/holiday.class.php',
-                'objectname' => 'Holiday',
-                'method' => 'updateBalance',
-                'parameters' => '',
-                'comment' => 'Update holiday balance every month',
-                'frequency' => 1,
-                'unitfrequency' => 3600 * 24,
-                'priority' => 50,
-                'status' => 1,
-                'test' => '$conf->holiday->enabled',
-                'datestart' => $datestart
-            )
+				'label' => 'HolidayBalanceMonthlyUpdate',
+				'jobtype' => 'method',
+				'class' => 'holiday/class/holiday.class.php',
+				'objectname' => 'Holiday',
+				'method' => 'updateBalance',
+				'parameters' => '',
+				'comment' => 'Update holiday balance every month',
+				'frequency' => 1,
+				'unitfrequency' => 3600 * 24,
+				'priority' => 50,
+				'status' => 1,
+				'test' => '$conf->holiday->enabled',
+				'datestart' => $datestart
+			)
 		);
 
 

From acc41adb8dc6fa09e5d3382985eae1b70bc04e18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 10 Jun 2021 22:22:24 +0200
Subject: [PATCH 0546/1497] fix warning

---
 htdocs/core/tpl/card_presend.tpl.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/tpl/card_presend.tpl.php b/htdocs/core/tpl/card_presend.tpl.php
index 731cc580ea1..c741fb213c2 100644
--- a/htdocs/core/tpl/card_presend.tpl.php
+++ b/htdocs/core/tpl/card_presend.tpl.php
@@ -194,7 +194,7 @@ if ($action == 'presend') {
 	$formmail->withto = $liste;
 	$formmail->withtofree = (GETPOSTISSET('sendto') ? (GETPOST('sendto', 'alphawithlgt') ? GETPOST('sendto', 'alphawithlgt') : '1') : '1');
 	$formmail->withtocc = $liste;
-	$formmail->withtoccc = $conf->global->MAIN_EMAIL_USECCC;
+	$formmail->withtoccc = getDolGlobalString('MAIN_EMAIL_USECCC');
 	$formmail->withtopic = $topicmail;
 	$formmail->withfile = 2;
 	$formmail->withbody = 1;

From 86f39795c04685886acd7394c2ea89b3d978ceac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 10 Jun 2021 22:26:58 +0200
Subject: [PATCH 0547/1497] fix warnings

---
 htdocs/core/class/html.formmail.class.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 00c1c4236c4..74f11a16e5a 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2010-2011 Juanjo Menent	    <jmenent@2byte.es>
  * Copyright (C) 2015-2017 Marcos García        <marcosgdf@gmail.com>
  * Copyright (C) 2015-2017 Nicolas ZABOURI      <info@inovea-conseil.com>
- * Copyright (C) 2018-2019  Frédéric France     <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2021  Frédéric France     <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -584,7 +584,10 @@ class FormMail extends Form
 						$liste['company'] = $conf->global->MAIN_INFO_SOCIETE_NOM.' &lt;'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'&gt;';
 
 						// Add also email aliases if there is some
-						$listaliases = array('user_aliases'=>$user->email_aliases, 'global_aliases'=>$conf->global->MAIN_INFO_SOCIETE_MAIL_ALIASES);
+						$listaliases = array(
+							'user_aliases' => (empty($user->email_aliases) ? '' : $user->email_aliases),
+							'global_aliases' => getDolGlobalString('$conf->global->MAIN_INFO_SOCIETE_MAIL_ALIASES'),
+						);
 
 						// Also add robot email
 						if (!empty($this->fromalsorobot)) {

From f58cf14ae987af334bc19a583d613617fc0bfc2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 10 Jun 2021 22:28:19 +0200
Subject: [PATCH 0548/1497] Update html.formmail.class.php

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

diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 74f11a16e5a..06b6a18b870 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -586,7 +586,7 @@ class FormMail extends Form
 						// Add also email aliases if there is some
 						$listaliases = array(
 							'user_aliases' => (empty($user->email_aliases) ? '' : $user->email_aliases),
-							'global_aliases' => getDolGlobalString('$conf->global->MAIN_INFO_SOCIETE_MAIL_ALIASES'),
+							'global_aliases' => getDolGlobalString('MAIN_INFO_SOCIETE_MAIL_ALIASES'),
 						);
 
 						// Also add robot email

From 96656ff148feca5326b306535aea3989ea44e154 Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <68746600+marc-dll@users.noreply.github.com>
Date: Thu, 10 Jun 2021 23:26:33 +0200
Subject: [PATCH 0549/1497] FIX: project time spent by day/week: quote mismatch
 is SQL query to assign to check task assigment

---
 htdocs/projet/activity/perday.php  | 2 +-
 htdocs/projet/activity/perweek.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index 8215eec4258..199591922aa 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -210,7 +210,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
 		{
 			// Test if we are already contact of the project (should be rare but sometimes we can add as task contact without being contact of project, like when admin user has been removed from contact of project)
 			$sql = 'SELECT ec.rowid FROM '.MAIN_DB_PREFIX.'element_contact as ec, '.MAIN_DB_PREFIX.'c_type_contact as tc WHERE tc.rowid = ec.fk_c_type_contact';
-			$sql .= ' AND ec.fk_socpeople = '.$idfortaskuser." AND ec.element_id = '.$object->fk_project.' AND tc.element = 'project' AND source = 'internal'";
+			$sql .= ' AND ec.fk_socpeople = '.$idfortaskuser." AND ec.element_id = ".$object->fk_project." AND tc.element = 'project' AND source = 'internal'";
 			$resql = $db->query($sql);
 			if ($resql)
 			{
diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php
index 4488342ab73..0db7bf57f3a 100644
--- a/htdocs/projet/activity/perweek.php
+++ b/htdocs/projet/activity/perweek.php
@@ -224,7 +224,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
 		{
 			// Test if we are already contact of the project (should be rare but sometimes we can add as task contact without being contact of project, like when admin user has been removed from contact of project)
 			$sql = 'SELECT ec.rowid FROM '.MAIN_DB_PREFIX.'element_contact as ec, '.MAIN_DB_PREFIX.'c_type_contact as tc WHERE tc.rowid = ec.fk_c_type_contact';
-			$sql .= ' AND ec.fk_socpeople = '.$idfortaskuser." AND ec.element_id = '.$object->fk_project.' AND tc.element = 'project' AND source = 'internal'";
+			$sql .= ' AND ec.fk_socpeople = '.$idfortaskuser." AND ec.element_id = ".$object->fk_project." AND tc.element = 'project' AND source = 'internal'";
 			$resql = $db->query($sql);
 			if ($resql)
 			{

From 3f72f9b544106dbe9fb89fb7ba28a06f0c8944e0 Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <68746600+marc-dll@users.noreply.github.com>
Date: Thu, 10 Jun 2021 23:29:37 +0200
Subject: [PATCH 0550/1497] FIX: project time spent by month: quote mismatch in
 SQL query to assign to check task assigment

---
 htdocs/projet/activity/permonth.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/projet/activity/permonth.php b/htdocs/projet/activity/permonth.php
index ae4eed48515..83680885fe5 100644
--- a/htdocs/projet/activity/permonth.php
+++ b/htdocs/projet/activity/permonth.php
@@ -170,7 +170,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
 		{
 			// Test if we are already contact of the project (should be rare but sometimes we can add as task contact without being contact of project, like when admin user has been removed from contact of project)
 			$sql = 'SELECT ec.rowid FROM '.MAIN_DB_PREFIX.'element_contact as ec, '.MAIN_DB_PREFIX.'c_type_contact as tc WHERE tc.rowid = ec.fk_c_type_contact';
-			$sql .= ' AND ec.fk_socpeople = '.$idfortaskuser." AND ec.element_id = '.$object->fk_project.' AND tc.element = 'project' AND source = 'internal'";
+			$sql .= ' AND ec.fk_socpeople = '.$idfortaskuser." AND ec.element_id = ".$object->fk_project." AND tc.element = 'project' AND source = 'internal'";
 			$resql = $db->query($sql);
 			if ($resql)
 			{

From b0b2bb4d8659531206f847403349d17758bbf263 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 11 Jun 2021 09:20:59 +0200
Subject: [PATCH 0551/1497] Fix trans

---
 htdocs/core/modules/modWorkstation.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/modules/modWorkstation.class.php b/htdocs/core/modules/modWorkstation.class.php
index b0fae39bb52..0266b3b0cc7 100755
--- a/htdocs/core/modules/modWorkstation.class.php
+++ b/htdocs/core/modules/modWorkstation.class.php
@@ -329,7 +329,7 @@ class modWorkstation extends DolibarrModules
 			'fk_menu'=>'fk_mainmenu=mrp',
 			// This is a Left menu entry
 			'type'=>'left',
-			'titre'=>$langs->trans('Workstations'),
+			'titre'=>'Workstations',
 			'prefix' => img_picto('', $this->picto, 'class="paddingright pictofixedwidth"'),
 			'mainmenu'=>'mrp',
 			'leftmenu'=>'workstation_workstation',
@@ -350,7 +350,7 @@ class modWorkstation extends DolibarrModules
 			'fk_menu'=>'fk_mainmenu=mrp,fk_leftmenu=workstation_workstation',
 			// This is a Left menu entry
 			'type'=>'left',
-			'titre'=>$langs->trans('WorkstationCreate'),
+			'titre'=>'WorkstationCreate',
 			'mainmenu'=>'mrp',
 			'leftmenu'=>'workstation_workstation_left_create',
 			'url'=>'/workstation/workstation_card.php?action=create',
@@ -370,7 +370,7 @@ class modWorkstation extends DolibarrModules
 			'fk_menu'=>'fk_mainmenu=mrp,fk_leftmenu=workstation_workstation',
 			// This is a Left menu entry
 			'type'=>'left',
-			'titre'=>$langs->trans('List'),
+			'titre'=>'List',
 			'mainmenu'=>'mrp',
 			'leftmenu'=>'workstation_workstation_left_list',
 			'url'=>'/workstation/workstation_list.php',

From e17ab1cca6a414ef4f452f4cb88778dd8bb79e81 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 11 Jun 2021 09:22:01 +0200
Subject: [PATCH 0552/1497] Clean code

---
 htdocs/core/modules/modWorkstation.class.php | 61 --------------------
 1 file changed, 61 deletions(-)

diff --git a/htdocs/core/modules/modWorkstation.class.php b/htdocs/core/modules/modWorkstation.class.php
index 0266b3b0cc7..8e2d676bf27 100755
--- a/htdocs/core/modules/modWorkstation.class.php
+++ b/htdocs/core/modules/modWorkstation.class.php
@@ -263,67 +263,6 @@ class modWorkstation extends DolibarrModules
 		$this->menu = array();
 		$r = 0;
 		// Add here entries to declare new menus
-		/* BEGIN MODULEBUILDER TOPMENU */
-		/*$this->menu[$r++] = array(
-			'fk_menu'=>'', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-			'type'=>'top', // This is a Top menu entry
-			'titre'=>$langs->trans('GPAO'),
-			'mainmenu'=>'gpao',
-			'leftmenu'=>'',
-			'url'=>'/workstation/workstationindex.php',
-			'langs'=>'workstation@workstation', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-			'position'=>1000 + $r,
-			'enabled'=>'$conf->workstation->enabled', // Define condition to show or hide menu entry. Use '$conf->workstation->enabled' if entry must be visible if module is enabled.
-			'perms'=>'1', // Use 'perms'=>'$user->rights->workstation->workstation->read' if you want your menu with a permission rules
-			'target'=>'',
-			'user'=>2, // 0=Menu for internal users, 1=external users, 2=both
-		);*/
-		/* END MODULEBUILDER TOPMENU */
-		/* BEGIN MODULEBUILDER LEFTMENU WORKSTATION
-		$this->menu[$r++]=array(
-			'fk_menu'=>'fk_mainmenu=workstation',      // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-			'type'=>'left',                          // This is a Top menu entry
-			'titre'=>'Workstation',
-			'mainmenu'=>'workstation',
-			'leftmenu'=>'workstation',
-			'url'=>'/workstation/workstationindex.php',
-			'langs'=>'workstation@workstation',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-			'position'=>1000+$r,
-			'enabled'=>'$conf->workstation->enabled',  // Define condition to show or hide menu entry. Use '$conf->workstation->enabled' if entry must be visible if module is enabled.
-			'perms'=>'$user->rights->workstation->workstation->read',			                // Use 'perms'=>'$user->rights->workstation->level1->level2' if you want your menu with a permission rules
-			'target'=>'',
-			'user'=>2,				                // 0=Menu for internal users, 1=external users, 2=both
-		);
-		$this->menu[$r++]=array(
-			'fk_menu'=>'fk_mainmenu=workstation,fk_leftmenu=workstation',	    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-			'type'=>'left',			                // This is a Left menu entry
-			'titre'=>'List_Workstation',
-			'mainmenu'=>'workstation',
-			'leftmenu'=>'workstation_workstation_list',
-			'url'=>'/workstation/workstation_list.php',
-			'langs'=>'workstation@workstation',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-			'position'=>1000+$r,
-			'enabled'=>'$conf->workstation->enabled',  // Define condition to show or hide menu entry. Use '$conf->workstation->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-			'perms'=>'$user->rights->workstation->workstation->read',			                // Use 'perms'=>'$user->rights->workstation->level1->level2' if you want your menu with a permission rules
-			'target'=>'',
-			'user'=>2,				                // 0=Menu for internal users, 1=external users, 2=both
-		);
-		$this->menu[$r++]=array(
-			'fk_menu'=>'fk_mainmenu=workstation,fk_leftmenu=workstation',	    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-			'type'=>'left',			                // This is a Left menu entry
-			'titre'=>'New_Workstation',
-			'mainmenu'=>'workstation',
-			'leftmenu'=>'workstation_workstation_new',
-			'url'=>'/workstation/workstation_card.php?action=create',
-			'langs'=>'workstation@workstation',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-			'position'=>1000+$r,
-			'enabled'=>'$conf->workstation->enabled',  // Define condition to show or hide menu entry. Use '$conf->workstation->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-			'perms'=>'$user->rights->workstation->workstation->write',			                // Use 'perms'=>'$user->rights->workstation->level1->level2' if you want your menu with a permission rules
-			'target'=>'',
-			'user'=>2,				                // 0=Menu for internal users, 1=external users, 2=both
-		);
-		*/
-
 		$this->menu[$r++]=array(
 			// '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
 			'fk_menu'=>'fk_mainmenu=mrp',

From a88efc9065f5afdbc44403c179b99b3d5e570b91 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 11 Jun 2021 09:58:03 +0200
Subject: [PATCH 0553/1497] Fix permission on produce and consume Missing API
 to produce

---
 htdocs/mrp/class/api_mos.class.php | 65 ++++++++++++++++++++++++++++++
 htdocs/mrp/mo_production.php       |  6 +--
 2 files changed, 68 insertions(+), 3 deletions(-)

diff --git a/htdocs/mrp/class/api_mos.class.php b/htdocs/mrp/class/api_mos.class.php
index 0ece243dc39..33d4a108f17 100644
--- a/htdocs/mrp/class/api_mos.class.php
+++ b/htdocs/mrp/class/api_mos.class.php
@@ -278,6 +278,71 @@ class Mos extends DolibarrApi
 	}
 
 
+	/**
+	 * Produce and consume
+	 *
+	 * Example:
+	 * {
+	 *   "inventorylabel": "Produce and consume using API",
+	 *   "inventorycode": "PRODUCEAPI-YY-MM-DD",
+	 *   "autoclose": 1,
+	 *   "arraytoconsume": [],
+	 *   "arraytoproduce": []
+	 * }
+	 *
+	 * @param int       $id        		ID of state
+	 * @param array 	$request_data   Request datas
+	 *
+	 * @url     POST {id}/produceandconsume
+	 *
+	 * @return int  ID of MO
+	 */
+	public function produceAndConsume($id, $request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->mrp->write) {
+			throw new RestException(401, 'Not enough permission');
+		}
+		$result = $this->mo->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'MO not found');
+		}
+
+		if ($this->mo->status != Mo::STATUS_VALIDATED && $this->mo->status != Mo::STATUS_INPROGRESS) {
+			throw new RestException(401, 'Error bad status of MO');
+		}
+
+		$labelmovement = '';
+		$codemovement = '';
+		$autoclose = 1;
+		$arraytoconsume = array();
+		$arraytoproduce = array();
+
+		foreach ($request_data as $field => $value) {
+			if ($field == 'inventorylabel') {
+				$labelmovement = $value;
+			}
+			if ($field == 'inventorycode') {
+				$codemovement = $value;
+			}
+			if ($field == 'autoclose') {
+				$autoclose = $value;
+			}
+		}
+
+		if (empty($labelmovement)) {
+			throw new RestException(500, "Field inventorylabel not prodivded");
+		}
+		if (empty($codemovement)) {
+			throw new RestException(500, "Field inventorycode not prodivded");
+		}
+
+		// TODO Add code for consume and produce...
+		throw new RestException(500, "Feature not yet available");
+
+		return $this->mo->id;
+	}
+
+
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 * Clean sensible object datas
diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index 65d4da3c908..ca9480eb1ae 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -145,11 +145,11 @@ if (empty($reshook)) {
 		$object->setProject(GETPOST('projectid', 'int'));
 	}
 
-	if ($action == 'confirm_reopen') {
+	if ($action == 'confirm_reopen' && $permissiontoadd) {
 		$result = $object->setStatut($object::STATUS_INPROGRESS, 0, '', 'MRP_REOPEN');
 	}
 
-	if ($action == 'confirm_addconsumeline' && GETPOST('addconsumelinebutton')) {
+	if ($action == 'confirm_addconsumeline' && GETPOST('addconsumelinebutton') && $permissiontoadd) {
 		$moline = new MoLine($db);
 
 		// Line to produce
@@ -169,7 +169,7 @@ if (empty($reshook)) {
 		$action = '';
 	}
 
-	if (in_array($action, array('confirm_consumeorproduce', 'confirm_consumeandproduceall'))) {
+	if (in_array($action, array('confirm_consumeorproduce', 'confirm_consumeandproduceall')) && $permissiontoproduce) {
 		$stockmove = new MouvementStock($db);
 
 		$labelmovement = GETPOST('inventorylabel', 'alphanohtml');

From 52f0de00f646df0135e6cf7dabf583994a0bc6b1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 11 Jun 2021 13:17:22 +0200
Subject: [PATCH 0554/1497] Fix missing fields

---
 htdocs/install/mysql/migration/13.0.0-14.0.0.sql | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index 741d92a88a1..c58b9ee3efe 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -32,6 +32,9 @@
 
 -- Missing in v13 or lower
 
+ALTER TABLE llx_ecm_files ADD COLUMN note_private text AFTER fk_user_m;
+ALTER TABLE llx_ecm_files ADD COLUMN note_public text AFTER note_private;
+
 ALTER TABLE llx_accounting_bookkeeping DROP INDEX idx_accounting_bookkeeping_numero_compte;
 ALTER TABLE llx_accounting_bookkeeping DROP INDEX idx_accounting_bookkeeping_code_journal;
 

From 99cada2d43488eeb9b273af170737f1e72b25d4c Mon Sep 17 00:00:00 2001
From: John BOTELLA <john.botella@atm-consulting.fr>
Date: Fri, 11 Jun 2021 14:42:51 +0200
Subject: [PATCH 0555/1497] Fix missing hooks

---
 .../tpl/extrafields_list_print_fields.tpl.php     |  2 +-
 htdocs/product/stock/movement_list.php            | 15 ++++++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/tpl/extrafields_list_print_fields.tpl.php b/htdocs/core/tpl/extrafields_list_print_fields.tpl.php
index 021ff42a9d3..f53f88e3362 100644
--- a/htdocs/core/tpl/extrafields_list_print_fields.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_print_fields.tpl.php
@@ -11,7 +11,7 @@ if (empty($extrafieldsobjectkey) && is_object($object)) {
 }
 
 // Loop to show all columns of extrafields from $obj, $extrafields and $db
-if (!empty($extrafieldsobjectkey)) {	// $extrafieldsobject is the $object->table_element like 'societe', 'socpeople', ...
+if (!empty($extrafieldsobjectkey) && !empty($extrafields->attributes[$extrafieldsobjectkey])) {	// $extrafieldsobject is the $object->table_element like 'societe', 'socpeople', ...
 	if (key_exists('label', $extrafields->attributes[$extrafieldsobjectkey]) && is_array($extrafields->attributes[$extrafieldsobjectkey]['label']) && count($extrafields->attributes[$extrafieldsobjectkey]['label'])) {
 		if (empty($extrafieldsobjectprefix)) {
 			$extrafieldsobjectprefix = 'ef.';
diff --git a/htdocs/product/stock/movement_list.php b/htdocs/product/stock/movement_list.php
index 0f2cec28ec9..9797ab82b8f 100644
--- a/htdocs/product/stock/movement_list.php
+++ b/htdocs/product/stock/movement_list.php
@@ -86,6 +86,7 @@ $search_user = trim(GETPOST("search_user"));
 $search_batch = trim(GETPOST("search_batch"));
 $search_qty = trim(GETPOST("search_qty"));
 $search_type_mouvement = GETPOST('search_type_mouvement', 'int');
+$search_fk_projet=GETPOST("search_fk_projet", 'int');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -198,6 +199,7 @@ if (empty($reshook)) {
 		$search_user = "";
 		$search_batch = "";
 		$search_qty = '';
+		$search_fk_projet=0;
 		$sall = "";
 		$toselect = '';
 		$search_array_options = array();
@@ -549,6 +551,9 @@ if (!empty($search_batch)) {
 if (!empty($product_id)) {
 	$sql .= natural_search('p.rowid', $product_id);
 }
+if (!empty($search_fk_projet)) {
+	$sql .= natural_search('m.fk_projet', $search_fk_projet);
+}
 if ($search_qty != '') {
 	$sql .= natural_search('m.value', $search_qty, 1);
 }
@@ -889,7 +894,7 @@ if ($resql) {
 
 	$moreforfilter = '';
 
-	$parameters = array();
+	$parameters = array('arrayfields'=>&$arrayfields);
 	$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
 	if (empty($reshook)) {
 		$moreforfilter .= $hookmanager->resPrint;
@@ -1255,6 +1260,14 @@ if ($resql) {
 			}
 			print '</td>';
 		}
+
+		// Extra fields
+		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+		// Fields from hook
+		$parameters = array('arrayfields'=>$arrayfields, 'objp'=>$objp, 'i'=>$i, 'totalarray'=>&$totalarray);
+		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
+		print $hookmanager->resPrint;
+
 		// Action column
 		print '<td class="nowrap center">';
 		if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined

From 1605564d5ed231eb817e868b6ea615ee4926bb90 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 11 Jun 2021 14:54:18 +0200
Subject: [PATCH 0556/1497] Clean code

---
 htdocs/admin/boxes.php              |  8 ++------
 htdocs/core/class/infobox.class.php | 10 ++++------
 htdocs/index.php                    |  4 ++--
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php
index df691eba688..ae33ef3b6fa 100644
--- a/htdocs/admin/boxes.php
+++ b/htdocs/admin/boxes.php
@@ -115,7 +115,7 @@ if ($action == 'add') {
 							$sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes (";
 							$sql .= "box_id, position, box_order, fk_user, entity";
 							$sql .= ") VALUES (";
-							$sql .= $boxid['value'].", ".((int) $pos).", '".(($nbboxonleft > $nbboxonright) ? 'B01' : 'A01')."', ".$fk_user.", ".$conf->entity;
+							$sql .= ((int) $boxid['value']).", ".((int) $pos).", '".(($nbboxonleft > $nbboxonright) ? 'B01' : 'A01')."', ".((int) $fk_user).", ".$conf->entity;
 							$sql .= ")";
 
 							dol_syslog("boxes.php activate box", LOG_DEBUG);
@@ -149,11 +149,6 @@ if ($action == 'delete') {
 	if (!empty($obj->box_id)) {
 		$db->begin();
 
-		// Remove all personalized setup when a box is activated or disabled (why removing all ? We removed only removed boxes)
-		//	$sql = "DELETE FROM ".MAIN_DB_PREFIX."user_param";
-		//	$sql.= " WHERE param LIKE 'MAIN_BOXES_%'";
-		//	$resql = $db->query($sql);
-
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."boxes";
 		$sql .= " WHERE entity = ".$conf->entity;
 		$sql .= " AND box_id=".((int) $obj->box_id);
@@ -184,6 +179,7 @@ if ($action == 'switch') {
 			 $newsecondnum = preg_replace('/[a-zA-Z]+/', '', $newsecond);
 			 $newsecond = sprintf("%s%02d", $newsecondchar ? $newsecondchar : 'A', $newsecondnum + 1);
 		}
+
 		$sql = "UPDATE ".MAIN_DB_PREFIX."boxes SET box_order='".$db->escape($newfirst)."' WHERE rowid=".((int) $objfrom->rowid);
 		dol_syslog($sql);
 		$resultupdatefrom = $db->query($sql);
diff --git a/htdocs/core/class/infobox.class.php b/htdocs/core/class/infobox.class.php
index 545d3c12274..82e7227763f 100644
--- a/htdocs/core/class/infobox.class.php
+++ b/htdocs/core/class/infobox.class.php
@@ -97,7 +97,6 @@ class InfoBox
 
 		$boxes = array();
 
-		$confuserzone = 'MAIN_BOXES_'.$zone;
 		if ($mode == 'activated') {	// activated
 			$sql = "SELECT b.rowid, b.position, b.box_order, b.fk_user,";
 			$sql .= " d.rowid as box_id, d.file, d.note, d.tms";
@@ -278,14 +277,13 @@ class InfoBox
 						$sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes";
 						$sql .= "(box_id, position, box_order, fk_user, entity)";
 						$sql .= " values (";
-						$sql .= " ".$id.",";
-						$sql .= " ".$zone.",";
+						$sql .= " ".((int) $id).",";
+						$sql .= " ".((int) $zone).",";
 						$sql .= " '".$db->escape($colonne.$ii)."',";
-						$sql .= " ".$userid.",";
-						$sql .= " ".$conf->entity;
+						$sql .= " ".((int) $userid).",";
+						$sql .= " ".((int) $conf->entity);
 						$sql .= ")";
 
-						dol_syslog(get_class()."::saveboxorder", LOG_DEBUG);
 						$result = $db->query($sql);
 						if ($result < 0) {
 							$error++;
diff --git a/htdocs/index.php b/htdocs/index.php
index 91b2de32087..79a957a52c7 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -415,7 +415,7 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
 
 	$boxwork = '';
 	$boxwork .= '<div class="box">';
-	$boxwork .= '<table summary="'.dol_escape_htmltag($langs->trans("WorkingBoard")).'" class="noborder boxtable boxtablenobottom boxworkingboard" width="100%">'."\n";
+	$boxwork .= '<table summary="'.dol_escape_htmltag($langs->trans("WorkingBoard")).'" class="noborder boxtable boxtablenobottom boxworkingboard centpercent">'."\n";
 	$boxwork .= '<tr class="liste_titre">';
 	$boxwork .= '<th class="liste_titre"><div class="inline-block valignmiddle">'.$langs->trans("DolibarrWorkBoard").'</div>';
 	if ($showweather) {
@@ -797,7 +797,7 @@ function getWeatherStatus($totallate)
 	$offset = 0;
 	$factor = 10; // By default
 
-	$used_conf = !empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? 'MAIN_METEO_PERCENTAGE_LEVEL' : 'MAIN_METEO_LEVEL';
+	$used_conf = empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? 'MAIN_METEO_LEVEL' : 'MAIN_METEO_PERCENTAGE_LEVEL';
 
 	$level0 = $offset;
 	$weather->level = 0;

From c2b910f6edd86d1ea0f0a50ce66446a3031b79ed Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 11 Jun 2021 15:08:54 +0200
Subject: [PATCH 0557/1497] Clean code

---
 htdocs/bom/bom_note.php  | 40 +---------------------------------------
 htdocs/variants/list.php |  9 +++++++--
 2 files changed, 8 insertions(+), 41 deletions(-)

diff --git a/htdocs/bom/bom_note.php b/htdocs/bom/bom_note.php
index 1110bb4b0d4..539eb654751 100644
--- a/htdocs/bom/bom_note.php
+++ b/htdocs/bom/bom_note.php
@@ -97,45 +97,7 @@ if ($id > 0 || !empty($ref)) {
 	$linkback = '<a href="'.dol_buildpath('/bom/bom_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
 	$morehtmlref = '<div class="refidno">';
-	/*
-	// Ref customer
-	$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
-	$morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
-	// Thirdparty
-	$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
-	// Project
-	if (! empty($conf->projet->enabled))
-	{
-		$langs->load("projects");
-		$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
-		if ($user->rights->bom->creer)
-		{
-			if ($action != 'classify')
-				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-				$morehtmlref.=' : ';
-				if ($action == 'classify') {
-					//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-					$morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-					$morehtmlref.='<input type="hidden" name="action" value="classin">';
-					$morehtmlref.='<input type="hidden" name="token" value="'.newToken().'">';
-					$morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-					$morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-					$morehtmlref.='</form>';
-				} else {
-					$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-				}
-		} else {
-			if (! empty($object->fk_project)) {
-				$proj = new Project($db);
-				$proj->fetch($object->fk_project);
-				$morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
-				$morehtmlref.=$proj->ref;
-				$morehtmlref.='</a>';
-			} else {
-				$morehtmlref.='';
-			}
-		}
-	}*/
+
 	$morehtmlref .= '</div>';
 
 
diff --git a/htdocs/variants/list.php b/htdocs/variants/list.php
index dd55b028ff9..dcf4fdcdb43 100644
--- a/htdocs/variants/list.php
+++ b/htdocs/variants/list.php
@@ -16,12 +16,15 @@
  */
 
 require '../main.inc.php';
+require DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require DOL_DOCUMENT_ROOT.'/variants/class/ProductAttribute.class.php';
 
 $action = GETPOST('action', 'aZ09');
 $object = new ProductAttribute($db);
+$rowid = GETPOST('rowid', 'int');		// Id of line for up / down when no javascript available
 
 $permissiontoread = $user->rights->produit->lire || $user->rights->service->lire;
+$permissiontoadd = $user->rights->produit->creer || $user->rights->service->creer;
 
 // Security check
 if (empty($conf->variants->enabled)) {
@@ -30,6 +33,8 @@ if (empty($conf->variants->enabled)) {
 if ($user->socid > 0) { // Protection if external user
 	accessforbidden();
 }
+
+
 //$result = restrictedArea($user, 'variant');
 if (!$permissiontoread) accessforbidden();
 
@@ -39,13 +44,13 @@ if (!$permissiontoread) accessforbidden();
  * Actions
  */
 
-if ($action == 'up') {
+if ($action == 'up' && $permissiontoadd) {
 	$object->fetch($rowid);
 	$object->moveUp();
 
 	header('Location: '.$_SERVER['PHP_SELF']);
 	exit();
-} elseif ($action == 'down') {
+} elseif ($action == 'down' && $permissiontoadd) {
 	$object->fetch($rowid);
 	$object->moveDown();
 

From 73a1119b263406bc709bc1a46ddece37865f1adb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 11 Jun 2021 15:21:24 +0200
Subject: [PATCH 0558/1497] Clean code

---
 htdocs/accountancy/index.php        | 2 +-
 htdocs/adherents/index.php          | 2 +-
 htdocs/core/class/infobox.class.php | 4 ++--
 htdocs/index.php                    | 2 +-
 htdocs/societe/index.php            | 2 +-
 htdocs/user/home.php                | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/accountancy/index.php b/htdocs/accountancy/index.php
index d073139a533..6e13a662948 100644
--- a/htdocs/accountancy/index.php
+++ b/htdocs/accountancy/index.php
@@ -61,7 +61,7 @@ if (empty($user->rights->compta->resultat->lire) && empty($user->rights->account
 if (GETPOST('addbox')) {
 	// Add box (when submit is done from a form when ajax disabled)
 	require_once DOL_DOCUMENT_ROOT.'/core/class/infobox.class.php';
-	$zone = GETPOST('areacode', 'aZ09');
+	$zone = GETPOST('areacode', 'int');
 	$userid = GETPOST('userid', 'int');
 	$boxorder = GETPOST('boxorder', 'aZ09');
 	$boxorder .= GETPOST('boxcombo', 'aZ09');
diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php
index 998736e137f..8b59c0d3ca4 100644
--- a/htdocs/adherents/index.php
+++ b/htdocs/adherents/index.php
@@ -52,7 +52,7 @@ $result = restrictedArea($user, 'adherent');
 if (GETPOST('addbox')) {
 	// Add box (when submit is done from a form when ajax disabled)
 	require_once DOL_DOCUMENT_ROOT.'/core/class/infobox.class.php';
-	$zone = GETPOST('areacode', 'aZ09');
+	$zone = GETPOST('areacode', 'int');
 	$userid = GETPOST('userid', 'int');
 	$boxorder = GETPOST('boxorder', 'aZ09');
 	$boxorder .= GETPOST('boxcombo', 'aZ09');
diff --git a/htdocs/core/class/infobox.class.php b/htdocs/core/class/infobox.class.php
index 82e7227763f..fb59e2b7c42 100644
--- a/htdocs/core/class/infobox.class.php
+++ b/htdocs/core/class/infobox.class.php
@@ -85,7 +85,7 @@ class InfoBox
 	 *
 	 *  @param	DoliDB		$db				Database handler
 	 *  @param	string		$mode			'available' or 'activated'
-	 *  @param	string		$zone			Name or area (-1 for all, 0 for Homepage, 1 for Accountancy, 2 for xxx, ...)
+	 *  @param	int			$zone			Name or area (-1 for all, 0 for Homepage, 1 for Accountancy, 2 for xxx, ...)
 	 *  @param  User|null   $user	  		Object user to filter
 	 *  @param	array		$excludelist	Array of box id (box.box_id = boxes_def.rowid) to exclude
 	 *  @param  int         $includehidden  Include also hidden boxes
@@ -216,7 +216,7 @@ class InfoBox
 	 *  Save order of boxes for area and user
 	 *
 	 *  @param	DoliDB	$db				Database handler
-	 *  @param	string	$zone       	Name of area (0 for Homepage, ...)
+	 *  @param	int		$zone       	Name of area (0 for Homepage, ...)
 	 *  @param  string  $boxorder   	List of boxes with correct order 'A:123,456,...-B:789,321...'
 	 *  @param  int     $userid     	Id of user
 	 *  @return int                   	<0 if KO, 0=Nothing done, > 0 if OK
diff --git a/htdocs/index.php b/htdocs/index.php
index 79a957a52c7..7eaf517b321 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -52,7 +52,7 @@ if (count($conf->modules) <= (empty($conf->global->MAIN_MIN_NB_ENABLED_MODULE_FO
 }
 if (GETPOST('addbox')) {	// Add box (when submit is done from a form when ajax disabled)
 	require_once DOL_DOCUMENT_ROOT.'/core/class/infobox.class.php';
-	$zone = GETPOST('areacode', 'aZ09');
+	$zone = GETPOST('areacode', 'int');
 	$userid = GETPOST('userid', 'int');
 	$boxorder = GETPOST('boxorder', 'aZ09');
 	$boxorder .= GETPOST('boxcombo', 'aZ09');
diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php
index f56beedb64e..f5a4392a0c0 100644
--- a/htdocs/societe/index.php
+++ b/htdocs/societe/index.php
@@ -57,7 +57,7 @@ $resultboxes = FormOther::getBoxesArea($user, "3");
 if (GETPOST('addbox')) {
 	// Add box (when submit is done from a form when ajax disabled)
 	require_once DOL_DOCUMENT_ROOT.'/core/class/infobox.class.php';
-	$zone = GETPOST('areacode', 'aZ09');
+	$zone = GETPOST('areacode', 'int');
 	$userid = GETPOST('userid', 'int');
 	$boxorder = GETPOST('boxorder', 'aZ09');
 	$boxorder .= GETPOST('boxcombo', 'aZ09');
diff --git a/htdocs/user/home.php b/htdocs/user/home.php
index 4a41b3fd899..fbfe4638bd5 100644
--- a/htdocs/user/home.php
+++ b/htdocs/user/home.php
@@ -62,7 +62,7 @@ $resultboxes = FormOther::getBoxesArea($user, "1");
 if (GETPOST('addbox')) {
 	// Add box (when submit is done from a form when ajax disabled)
 	require_once DOL_DOCUMENT_ROOT.'/core/class/infobox.class.php';
-	$zone = GETPOST('areacode', 'aZ09');
+	$zone = GETPOST('areacode', 'int');
 	$userid = GETPOST('userid', 'int');
 	$boxorder = GETPOST('boxorder', 'aZ09');
 	$boxorder .= GETPOST('boxcombo', 'aZ09');

From ac965bf49a8031be7dc4c0a5e0ef9c64cb10542e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 11 Jun 2021 17:40:04 +0200
Subject: [PATCH 0559/1497] FIX #16551

---
 htdocs/fourn/product/list.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/fourn/product/list.php b/htdocs/fourn/product/list.php
index 5ecec959614..9a67c3922f0 100644
--- a/htdocs/fourn/product/list.php
+++ b/htdocs/fourn/product/list.php
@@ -158,8 +158,8 @@ $sql .= " FROM ".MAIN_DB_PREFIX."product as p";
 if ($catid) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON cp.fk_product = p.rowid";
 }
-$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as ppf ON p.rowid = ppf.fk_product";
-$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON ppf.fk_soc = s.rowid";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as ppf ON p.rowid = ppf.fk_product AND p.entity = ppf.entity";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON ppf.fk_soc = s.rowid AND s.entity IN (".getEntity('societe').")";
 $sql .= " WHERE p.entity IN (".getEntity('product').")";
 if ($sRefSupplier) {
 	$sql .= natural_search('ppf.ref_fourn', $sRefSupplier);

From 92dc0d28ce256621526ac81973bb70aeedeb98ef Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 11 Jun 2021 17:50:52 +0200
Subject: [PATCH 0560/1497] Fix disallow reserved values for field name

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

diff --git a/htdocs/core/actions_extrafields.inc.php b/htdocs/core/actions_extrafields.inc.php
index b03c2c3d192..1ca04a00c8b 100644
--- a/htdocs/core/actions_extrafields.inc.php
+++ b/htdocs/core/actions_extrafields.inc.php
@@ -137,7 +137,7 @@ if ($action == 'add') {
 
 		// Check reserved keyword with more than 3 characters
 		if (!$error) {
-			if (in_array(GETPOST('attrname', 'aZ09'), array('and', 'keyword', 'table', 'index', 'integer', 'float', 'double', 'position'))) {
+			if (in_array(GETPOST('attrname', 'aZ09'), array('and', 'keyword', 'table', 'index', 'int', 'integer', 'float', 'double', 'real', 'position'))) {
 				$error++;
 				$langs->load("errors");
 				$mesg[] = $langs->trans("ErrorReservedKeyword", GETPOST('attrname', 'aZ09'));

From 0bbe2210f265d22bd967434cf944e0279fcea173 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 11 Jun 2021 17:57:55 +0200
Subject: [PATCH 0561/1497] FIX #17649

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

diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 2f8b0871a83..59311b707dd 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -2215,7 +2215,11 @@ class ExtraFields
 						continue; // Value was not provided, we should not set it.
 					}
 					$value_arr = GETPOST($keysuffix."options_".$key.$keyprefix);
-					$value_key = price2num($value_arr);
+					if ($keysuffix != 'search_') {	// If value is for a search, we must keep complex string like '>100 <=150'
+						$value_key = price2num($value_arr);
+					} else {
+						$value_key = $value_arr;
+					}
 				} else {
 					if (!GETPOSTISSET($keysuffix."options_".$key.$keyprefix)) {
 						continue; // Value was not provided, we should not set it.

From bdded2af173763832952a608c86dc9706ad1a3f2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 11 Jun 2021 18:09:17 +0200
Subject: [PATCH 0562/1497] Update movement_list.php

---
 htdocs/product/stock/movement_list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/product/stock/movement_list.php b/htdocs/product/stock/movement_list.php
index 9797ab82b8f..44e9e7ecea9 100644
--- a/htdocs/product/stock/movement_list.php
+++ b/htdocs/product/stock/movement_list.php
@@ -551,7 +551,7 @@ if (!empty($search_batch)) {
 if (!empty($product_id)) {
 	$sql .= natural_search('p.rowid', $product_id);
 }
-if (!empty($search_fk_projet)) {
+if (!empty($search_fk_projet) && $search_fk_projet != '-1') {
 	$sql .= natural_search('m.fk_projet', $search_fk_projet);
 }
 if ($search_qty != '') {

From 0315f4519878b570e79b69570b88e5ff8f71f773 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 11 Jun 2021 18:10:57 +0200
Subject: [PATCH 0563/1497] Update permonth.php

---
 htdocs/projet/activity/permonth.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/projet/activity/permonth.php b/htdocs/projet/activity/permonth.php
index 83680885fe5..854c9194315 100644
--- a/htdocs/projet/activity/permonth.php
+++ b/htdocs/projet/activity/permonth.php
@@ -170,7 +170,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
 		{
 			// Test if we are already contact of the project (should be rare but sometimes we can add as task contact without being contact of project, like when admin user has been removed from contact of project)
 			$sql = 'SELECT ec.rowid FROM '.MAIN_DB_PREFIX.'element_contact as ec, '.MAIN_DB_PREFIX.'c_type_contact as tc WHERE tc.rowid = ec.fk_c_type_contact';
-			$sql .= ' AND ec.fk_socpeople = '.$idfortaskuser." AND ec.element_id = ".$object->fk_project." AND tc.element = 'project' AND source = 'internal'";
+			$sql .= ' AND ec.fk_socpeople = '.((int) $idfortaskuser)." AND ec.element_id = ".((int) $object->fk_project)." AND tc.element = 'project' AND source = 'internal'";
 			$resql = $db->query($sql);
 			if ($resql)
 			{

From 057d91698f52e5728525a1601f2bb69467be2543 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 11 Jun 2021 18:11:55 +0200
Subject: [PATCH 0564/1497] Update perday.php

---
 htdocs/projet/activity/perday.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index 199591922aa..5e288ae9aea 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -210,7 +210,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
 		{
 			// Test if we are already contact of the project (should be rare but sometimes we can add as task contact without being contact of project, like when admin user has been removed from contact of project)
 			$sql = 'SELECT ec.rowid FROM '.MAIN_DB_PREFIX.'element_contact as ec, '.MAIN_DB_PREFIX.'c_type_contact as tc WHERE tc.rowid = ec.fk_c_type_contact';
-			$sql .= ' AND ec.fk_socpeople = '.$idfortaskuser." AND ec.element_id = ".$object->fk_project." AND tc.element = 'project' AND source = 'internal'";
+			$sql .= ' AND ec.fk_socpeople = '.((int) $idfortaskuser)." AND ec.element_id = ".((int) $object->fk_project)." AND tc.element = 'project' AND source = 'internal'";
 			$resql = $db->query($sql);
 			if ($resql)
 			{

From a8f11fec31c4ec4e89ab08f82734dcb0ba96651f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 11 Jun 2021 18:12:39 +0200
Subject: [PATCH 0565/1497] Update perweek.php

---
 htdocs/projet/activity/perweek.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php
index 0db7bf57f3a..97626c58e50 100644
--- a/htdocs/projet/activity/perweek.php
+++ b/htdocs/projet/activity/perweek.php
@@ -224,7 +224,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
 		{
 			// Test if we are already contact of the project (should be rare but sometimes we can add as task contact without being contact of project, like when admin user has been removed from contact of project)
 			$sql = 'SELECT ec.rowid FROM '.MAIN_DB_PREFIX.'element_contact as ec, '.MAIN_DB_PREFIX.'c_type_contact as tc WHERE tc.rowid = ec.fk_c_type_contact';
-			$sql .= ' AND ec.fk_socpeople = '.$idfortaskuser." AND ec.element_id = ".$object->fk_project." AND tc.element = 'project' AND source = 'internal'";
+			$sql .= ' AND ec.fk_socpeople = '.((int) $idfortaskuser)." AND ec.element_id = ".((int) $object->fk_project)." AND tc.element = 'project' AND source = 'internal'";
 			$resql = $db->query($sql);
 			if ($resql)
 			{

From 4e66e134bdbc4367db57be045d5dad236f2c6094 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 11 Jun 2021 18:21:00 +0200
Subject: [PATCH 0566/1497] Update price.php

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

diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 27d39779338..61b2be4f837 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -349,7 +349,7 @@ if (empty($reshook))
 
 				$newprice = price2num($newprice, 'MU');
 				$newprice_min = price2num($val['price_min'], 'MU');
-				$newvattx = price2num($val['vat_tx'], 'MU');
+				$newvattx = price2num($val['vat_tx']);
 
 				if (!empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE) && $newprice_min < $maxpricesupplier) {
 					setEventMessages($langs->trans("MinimumPriceLimit", price($maxpricesupplier, 0, '', 1, - 1, - 1, 'auto')), null, 'errors');

From eefc6ddf83bce48847aa758a575d4f8a2757ba44 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 11 Jun 2021 18:44:01 +0200
Subject: [PATCH 0567/1497] Fix phpcs

---
 htdocs/compta/bank/card.php                | 1 -
 htdocs/compta/bank/class/account.class.php | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index 143d3bb600b..7f1c830d45b 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -78,7 +78,6 @@ $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 if (empty($reshook)) {
-
 	if ($cancel) {
 		$action = '';
 	}
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 0d97ed69a07..46d1bb93684 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -705,8 +705,8 @@ class Account extends CommonObject
 		$sql .= ", ".price2num($this->min_allowed);
 		$sql .= ", ".price2num($this->min_desired);
 		$sql .= ", '".$this->db->escape($this->comment)."'";
-		$sql .= ", ".($this->state_id > 0 ? $this->state_id : "null");
-		$sql .= ", ".($this->country_id > 0 ? $this->country_id : "null");
+		$sql .= ", ".($this->state_id > 0 ? ((int) $this->state_id) : "null");
+		$sql .= ", ".($this->country_id > 0 ? ((int) $this->country_id) : "null");
 		$sql .= ", '".$this->db->escape($this->ics)."'";
 		$sql .= ", '".$this->db->escape($this->ics_transfer)."'";
 		$sql .= ")";

From 663cf28eba4dfa4c66062a3d527b542a743864f7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 11 Jun 2021 19:05:33 +0200
Subject: [PATCH 0568/1497] Fix lost code during previous merge

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

diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 6b36e950f78..0c054eb012f 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -357,7 +357,7 @@ if (empty($reshook))
 					break;
 				}
 
-				if ($object->multiprices[$key] != $newprice || $object->multiprices_min[$key] != $newprice_min || $object->multiprices_base_type[$key] != $val['price_base_type']) {
+				if ($object->multiprices[$key] != $newprice || $object->multiprices_min[$key] != $newprice_min || $object->multiprices_base_type[$key] != $val['price_base_type'] || $object->multiprices_tva_tx[$key] != $newvattx) {
 	   				$res = $object->updatePrice($newprice, $val['price_base_type'], $user, $val['vat_tx'], $newprice_min, $key, $val['npr'], $psq, 0, $val['localtaxes_array'], $val['default_vat_code']);
 				} else {
 					$res = 0;

From c4d0086b8a75f769385850b290743aa64e5df82f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 11 Jun 2021 19:24:26 +0200
Subject: [PATCH 0569/1497] Fix hook context names

---
 htdocs/product/stats/bom.php                  | 2 +-
 htdocs/product/stats/commande_fournisseur.php | 2 +-
 htdocs/product/stats/facture_fournisseur.php  | 2 +-
 htdocs/product/stats/mo.php                   | 2 +-
 htdocs/product/stats/supplier_proposal.php    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/product/stats/bom.php b/htdocs/product/stats/bom.php
index 8db7c63d83e..52eec409185 100644
--- a/htdocs/product/stats/bom.php
+++ b/htdocs/product/stats/bom.php
@@ -43,7 +43,7 @@ if ($user->socid) {
 }
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array('productstatscontract'));
+$hookmanager->initHooks(array('productstatsbom'));
 
 $mesg = '';
 $option = '';
diff --git a/htdocs/product/stats/commande_fournisseur.php b/htdocs/product/stats/commande_fournisseur.php
index e42905811a8..fd64a1c0572 100644
--- a/htdocs/product/stats/commande_fournisseur.php
+++ b/htdocs/product/stats/commande_fournisseur.php
@@ -44,7 +44,7 @@ if (!empty($user->socid)) {
 }
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array('productstatssupplyorder'));
+$hookmanager->initHooks(array('productstatssupplierorder'));
 
 $mesg = '';
 
diff --git a/htdocs/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php
index 2ad05313762..6eaf5a33e22 100644
--- a/htdocs/product/stats/facture_fournisseur.php
+++ b/htdocs/product/stats/facture_fournisseur.php
@@ -46,7 +46,7 @@ if (!empty($user->socid)) {
 }
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array('productstatssupplyinvoice'));
+$hookmanager->initHooks(array('productstatssupplierinvoice'));
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
diff --git a/htdocs/product/stats/mo.php b/htdocs/product/stats/mo.php
index 81bb29650db..3781d23699a 100644
--- a/htdocs/product/stats/mo.php
+++ b/htdocs/product/stats/mo.php
@@ -42,7 +42,7 @@ if ($user->socid) {
 }
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array('productstatscontract'));
+$hookmanager->initHooks(array('productstatsmo'));
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
diff --git a/htdocs/product/stats/supplier_proposal.php b/htdocs/product/stats/supplier_proposal.php
index 3de03aa73c1..b30983bbda5 100644
--- a/htdocs/product/stats/supplier_proposal.php
+++ b/htdocs/product/stats/supplier_proposal.php
@@ -45,7 +45,7 @@ if (!empty($user->socid)) {
 }
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array('productstatspropal'));
+$hookmanager->initHooks(array('productstatssupplierpropal'));
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;

From 37ebedcafa6f4ea50f8d1a08a24c75e5758fabf8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 11 Jun 2021 19:32:25 +0200
Subject: [PATCH 0570/1497] Update product.lib.php

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

diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php
index 4b249a1cc9a..52c6ff3bd98 100644
--- a/htdocs/core/lib/product.lib.php
+++ b/htdocs/core/lib/product.lib.php
@@ -361,8 +361,9 @@ function product_lot_admin_prepare_head()
 function show_stats_for_company($product, $socid)
 {
 	global $conf, $langs, $user, $db, $hookmanager;
+
 	$form = new Form($db);
-	$hookmanager->initHooks(array('productstats'));
+	
 	$nblines = 0;
 
 	print '<tr class="liste_titre">';

From 5d2f5b230525395fb52adf1ab3ecb1a83f13cc4b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 11 Jun 2021 19:33:07 +0200
Subject: [PATCH 0571/1497] Update product.lib.php

---
 htdocs/core/lib/product.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php
index 52c6ff3bd98..f3ebef1e49f 100644
--- a/htdocs/core/lib/product.lib.php
+++ b/htdocs/core/lib/product.lib.php
@@ -560,7 +560,7 @@ function show_stats_for_company($product, $socid)
 		print '</tr>';
 	}
 	$parameters = array('socid'=>$socid);
-	$reshook = $hookmanager->executeHooks('addmoreproductstat', $parameters, $product, $nblines); // Note that $action and $object may have been modified by some hooks
+	$reshook = $hookmanager->executeHooks('addMoreProductStat', $parameters, $product, $nblines); // Note that $action and $object may have been modified by some hooks
 	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 	print $hookmanager->resPrint;

From d3815cbb93916f547868159e052ae14106e66af4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 11 Jun 2021 19:42:36 +0200
Subject: [PATCH 0572/1497] css

---
 htdocs/margin/tabs/productMargins.php | 30 +++++++++++++--------------
 htdocs/product/fournisseurs.php       | 16 +++++++-------
 2 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/htdocs/margin/tabs/productMargins.php b/htdocs/margin/tabs/productMargins.php
index a5e6e6af6e9..d2c9a1bca76 100644
--- a/htdocs/margin/tabs/productMargins.php
+++ b/htdocs/margin/tabs/productMargins.php
@@ -91,9 +91,7 @@ if ($id > 0 || !empty($ref)) {
 
 	llxHeader('', $title, $help_url);
 
-	/*
-	 *  En mode visu
-	 */
+	// View mode
 	if ($result > 0) {
 		$head = product_prepare_head($object);
 		$titre = $langs->trans("CardProduct".$object->type);
@@ -108,23 +106,23 @@ if ($id > 0 || !empty($ref)) {
 		print '<div class="fichecenter">';
 
 		print '<div class="underbanner clearboth"></div>';
-		print '<table class="border tableforfield" width="100%">';
+		print '<table class="border tableforfield centpercent">';
 
 		// Total Margin
-		print '<tr><td class="titlefield">'.$langs->trans("TotalMargin").'</td><td colspan="3">';
-		print '<span id="totalMargin"></span>'; // set by jquery (see below)
+		print '<tr><td class="titlefield">'.$langs->trans("TotalMargin").'</td><td>';
+		print '<span id="totalMargin" class="amount"></span>'; // set by jquery (see below)
 		print '</td></tr>';
 
 		// Margin Rate
 		if (!empty($conf->global->DISPLAY_MARGIN_RATES)) {
-			print '<tr><td>'.$langs->trans("MarginRate").'</td><td colspan="3">';
+			print '<tr><td>'.$langs->trans("MarginRate").'</td><td>';
 			print '<span id="marginRate"></span>'; // set by jquery (see below)
 			print '</td></tr>';
 		}
 
 		// Mark Rate
 		if (!empty($conf->global->DISPLAY_MARK_RATES)) {
-			print '<tr><td>'.$langs->trans("MarkRate").'</td><td colspan="3">';
+			print '<tr><td>'.$langs->trans("MarkRate").'</td><td>';
 			print '<span id="markRate"></span>'; // set by jquery (see below)
 			print '</td></tr>';
 		}
@@ -227,12 +225,12 @@ if ($id > 0 || !empty($ref)) {
 						print "</td>\n";
 						print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$objp->socid.'">'.img_object($langs->trans("ShowCompany"), "company").' '.dol_trunc($objp->name, 44).'</a></td>';
 						print "<td>".$objp->code_client."</td>\n";
-						print "<td class=\"center\">";
+						print '<td class="center">';
 						print dol_print_date($db->jdate($objp->datef), 'day')."</td>";
-						print "<td class=\"right\">".price(price2num($objp->selling_price, 'MT'))."</td>\n";
-						print "<td class=\"right\">".price(price2num($objp->buying_price, 'MT'))."</td>\n";
-						print "<td class=\"right\">".price(price2num($objp->qty, 'MT'))."</td>\n";
-						print "<td class=\"right\">".price(price2num($objp->marge, 'MT'))."</td>\n";
+						print '<td class="right amount">'.price(price2num($objp->selling_price, 'MT'))."</td>\n";
+						print '<td class="right amount">'.price(price2num($objp->buying_price, 'MT'))."</td>\n";
+						print '<td class="right">'.price(price2num($objp->qty, 'MT'))."</td>\n";
+						print '<td class="right amount">'.price(price2num($objp->marge, 'MT'))."</td>\n";
 						if (!empty($conf->global->DISPLAY_MARGIN_RATES)) {
 							print "<td class=\"right\">".(($marginRate === '') ? 'n/a' : price(price2num($marginRate, 'MT'))."%")."</td>\n";
 						}
@@ -260,10 +258,10 @@ if ($id > 0 || !empty($ref)) {
 				}
 				print '<tr class="liste_total">';
 				print '<td colspan=4>'.$langs->trans('TotalMargin')."</td>";
-				print '<td class="right">'.price(price2num($cumul_vente, 'MT'))."</td>\n";
-				print '<td class="right">'.price(price2num($cumul_achat, 'MT'))."</td>\n";
+				print '<td class="right amount">'.price(price2num($cumul_vente, 'MT'))."</td>\n";
+				print '<td class="right amount">'.price(price2num($cumul_achat, 'MT'))."</td>\n";
 				print '<td class="right">'.price(price2num($cumul_qty, 'MT'))."</td>\n";
-				print '<td class="right">'.price(price2num($totalMargin, 'MT'))."</td>\n";
+				print '<td class="right amount">'.price(price2num($totalMargin, 'MT'))."</td>\n";
 				if (!empty($conf->global->DISPLAY_MARGIN_RATES)) {
 					print '<td class="right">'.(($marginRate === '') ? 'n/a' : price(price2num($marginRate, 'MT'))."%")."</td>\n";
 				}
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index 8b2a792b872..1234deef497 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -382,7 +382,7 @@ if ($id > 0 || $ref) {
 			echo $formconfirm;
 		}
 
-		if ($action <> 'edit' && $action <> 're-edit') {
+		if ($action != 'edit' && $action != 're-edit') {
 			$head = product_prepare_head($object);
 			$titre = $langs->trans("CardProduct".$object->type);
 			$picto = ($object->type == Product::TYPE_SERVICE ? 'service' : 'product');
@@ -835,12 +835,13 @@ END;
 				print '<input class="button button-cancel" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
 				print '</div>';
 
-				print '</form>';
+				print '</form>'."\n";
 			}
 
+
 			// Actions buttons
 
-			print "\n<div class=\"tabsAction\">\n";
+			print '<div class="tabsAction">'."\n";
 
 			if ($action != 'add_price' && $action != 'update_price') {
 				$parameters = array();
@@ -853,8 +854,7 @@ END;
 				}
 			}
 
-			print "\n</div>\n";
-			print '<br>';
+			print "</div>\n";
 
 			if ($user->rights->fournisseur->lire) { // Duplicate ? this check is already in the head of this file
 				$param = '';
@@ -1016,14 +1016,14 @@ END;
 
 						// Supplier
 						if (!empty($arrayfields['s.nom']['checked'])) {
-							print '<td class="tdoverflowmax200">'.$productfourn->getSocNomUrl(1, 'supplier').'</td>';
+							print '<td class="tdoverflowmax150">'.$productfourn->getSocNomUrl(1, 'supplier').'</td>';
 						}
 
 						// Supplier ref
 						if ($usercancreate) { // change required right here
-							print '<td class="left">'.$productfourn->getNomUrl().'</td>';
+							print '<td>'.$productfourn->getNomUrl().'</td>';
 						} else {
-							print '<td class="left">'.$productfourn->fourn_ref.'</td>';
+							print '<td>'.$productfourn->fourn_ref.'</td>';
 						}
 
 						// Availability

From 56afefd6ad4528ebefc8e1f0f7c610c8c7d7ae05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sat, 12 Jun 2021 07:12:45 +0200
Subject: [PATCH 0573/1497] fix warnings

---
 htdocs/product/class/product.class.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 1afd1e74e23..18b0529a5da 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -2666,14 +2666,14 @@ class Product extends CommonObject
 		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."bom_bomline as bl ON bl.fk_bom=b.rowid";
 		$sql .= " WHERE ";
 		$sql .= " b.entity IN (".getEntity('bom').")";
-		$sql .= " AND b.fk_product =".$this->id;
+		$sql .= " AND b.fk_product =".((int) $this->id);
 		$sql .= " GROUP BY b.rowid";
 
 		$result = $this->db->query($sql);
 		if ($result) {
 			$obj = $this->db->fetch_object($result);
-			$this->stats_bom['nb_toproduce'] = $obj->nb_toproduce ? $obj->nb_toproduce : 0;
-			$this->stats_bom['qty_toproduce'] = $obj->qty_toproduce ? price2num($obj->qty_toproduce) : 0;
+			$this->stats_bom['nb_toproduce'] = !empty($obj->nb_toproduce) ? $obj->nb_toproduce : 0;
+			$this->stats_bom['qty_toproduce'] = !empty($obj->qty_toproduce) ? price2num($obj->qty_toproduce) : 0;
 		} else {
 			$this->error = $this->db->error();
 			$error++;
@@ -2685,13 +2685,13 @@ class Product extends CommonObject
 		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."bom_bomline as bl ON bl.fk_bom=b.rowid";
 		$sql .= " WHERE ";
 		$sql .= " b.entity IN (".getEntity('bom').")";
-		$sql .= " AND bl.fk_product =".$this->id;
+		$sql .= " AND bl.fk_product =".((int) $this->id);
 
 		$result = $this->db->query($sql);
 		if ($result) {
 			$obj = $this->db->fetch_object($result);
-			$this->stats_bom['nb_toconsume'] = $obj->nb_toconsume ? $obj->nb_toconsume : 0;
-			$this->stats_bom['qty_toconsume'] = $obj->qty_toconsume ? price2num($obj->qty_toconsume) : 0;
+			$this->stats_bom['nb_toconsume'] = !empty($obj->nb_toconsume) ? $obj->nb_toconsume : 0;
+			$this->stats_bom['qty_toconsume'] = !empty($obj->qty_toconsume) ? price2num($obj->qty_toconsume) : 0;
 		} else {
 			$this->error = $this->db->error();
 			$error++;

From 3ca8de8fabe98081a162d0d915605ea0c919ae55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sat, 12 Jun 2021 07:20:41 +0200
Subject: [PATCH 0574/1497] fix warning

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

diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 0c922fab0dd..b4804751086 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -1236,8 +1236,8 @@ if ($resql) {
 
 		$product_static->id = $obj->rowid;
 		$product_static->ref = $obj->ref;
-		$product_static->ref_fourn = $obj->ref_supplier; // deprecated
-		$product_static->ref_supplier = $obj->ref_supplier;
+		$product_static->ref_fourn = empty($obj->ref_supplier) ? '' : $obj->ref_supplier; // deprecated
+		$product_static->ref_supplier = empty($obj->ref_supplier) ? '' : $obj->ref_supplier;
 		$product_static->label = $obj->label;
 		$product_static->finished = $obj->finished;
 		$product_static->type = $obj->fk_product_type;

From 4138353d7ff0133b6ded623a50b624b576ed436b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sat, 12 Jun 2021 09:11:12 +0200
Subject: [PATCH 0575/1497] fix warnings

---
 htdocs/fourn/facture/contact.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/fourn/facture/contact.php b/htdocs/fourn/facture/contact.php
index 3ee6fe10d14..22892823f05 100644
--- a/htdocs/fourn/facture/contact.php
+++ b/htdocs/fourn/facture/contact.php
@@ -205,11 +205,11 @@ if ($id > 0 || !empty($ref)) {
 			}
 			print ' ('.$langs->transnoentities("InvoiceHasAvoir") . (count($invoicecredits) ? ' ' : '') . implode(',', $invoicecredits) . ')';
 		}
-		if ($facidnext > 0) {
-			$facthatreplace = new FactureFournisseur($db);
-			$facthatreplace->fetch($facidnext);
-			print ' ('.$langs->transnoentities("ReplacedByInvoice", $facthatreplace->getNomUrl(1)).')';
-		}
+		//if ($facidnext > 0) {
+		//	$facthatreplace = new FactureFournisseur($db);
+		//	$facthatreplace->fetch($facidnext);
+		//	print ' ('.$langs->transnoentities("ReplacedByInvoice", $facthatreplace->getNomUrl(1)).')';
+		//}
 		print '</td></tr>';
 
 		// Label
@@ -223,13 +223,13 @@ if ($id > 0 || !empty($ref)) {
 
 		// Amount Local Taxes
 		//TODO: Place into a function to control showing by country or study better option
-		if ($societe->localtax1_assuj == "1") { //Localtax1
-			print '<tr><td>'.$langs->transcountry("AmountLT1", $societe->country_code).'</td>';
+		if ($mysoc->localtax1_assuj == "1" || $object->total_localtax1 != 0) { //Localtax1
+			print '<tr><td>'.$langs->transcountry("AmountLT1", $mysoc->country_code).'</td>';
 			print '<td>'.price($object->total_localtax1, 1, $langs, 0, -1, -1, $conf->currency).'</td>';
 			print '</tr>';
 		}
-		if ($societe->localtax2_assuj == "1") { //Localtax2
-			print '<tr><td>'.$langs->transcountry("AmountLT2", $societe->country_code).'</td>';
+		if ($mysoc->localtax2_assuj == "1" || $object->total_localtax2 != 0) { //Localtax2
+			print '<tr><td>'.$langs->transcountry("AmountLT2", $mysoc->country_code).'</td>';
 			print '<td>'.price($object->total_localtax2, 1, $langs, 0, -1, -1, $conf->currency).'</td>';
 			print '</tr>';
 		}

From c3a27b5ab9073517d0c29eb7581f8dab3162298b Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Sat, 12 Jun 2021 10:32:42 +0200
Subject: [PATCH 0576/1497] Update llx_c_chargesociales.sql

---
 .../mysql/data/llx_c_chargesociales.sql       | 32 +++++++++++--------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_c_chargesociales.sql b/htdocs/install/mysql/data/llx_c_chargesociales.sql
index afc8afea2f8..a403a1df689 100644
--- a/htdocs/install/mysql/data/llx_c_chargesociales.sql
+++ b/htdocs/install/mysql/data/llx_c_chargesociales.sql
@@ -5,7 +5,9 @@
 -- Copyright (C) 2004      Guillaume Delecourt  <guillaume.delecourt@opensides.be>
 -- Copyright (C) 2005-2010 Regis Houssin        <regis.houssin@inodbox.com>
 -- Copyright (C) 2007 	   Patrick Raguin       <patrick.raguin@gmail.com>
+-- Copyright (C) 2021      Udo Tamm             <dev@dolibit.de>
 --
+-- 
 -- 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
@@ -27,25 +29,27 @@
 --
 
 --
--- Types de charges
+-- Types de charges 
 --
 
+-- insert into llx_c_chargesociales (fk_pays, id, libelle, deductible, active, code) values (id of country, id of social charges = fk_pays id & free numbering, label, ...); 
+
 --
 -- France
 --
-insert into llx_c_chargesociales (id, libelle, deductible, active, code, fk_pays) values (  1, 'Securite sociale (URSSAF / MSA)', 1, 1, 'TAXSECU', '1');
-insert into llx_c_chargesociales (id, libelle, deductible, active, code, fk_pays) values (  2, 'Securite sociale des indépendants (URSSAF)', 1, 1, 'TAXSSI', '1');
-insert into llx_c_chargesociales (id, libelle, deductible, active, code, fk_pays) values ( 10, 'Taxe apprentissage', 1, 1, 'TAXAPP', '1');
-insert into llx_c_chargesociales (id, libelle, deductible, active, code, fk_pays) values ( 11, 'Formation professionnelle continue', 1, 1, 'TAXFPC', '1');
-insert into llx_c_chargesociales (id, libelle, deductible, active, code, fk_pays) values ( 12, 'Cotisation fonciere des entreprises (CFE)', 1, 1, 'TAXCFE', '1');
-insert into llx_c_chargesociales (id, libelle, deductible, active, code, fk_pays) values ( 13, 'Cotisation sur la valeur ajoutee des entreprises (CVAE)', 1, 1, 'TAXCVAE', '1');
-insert into llx_c_chargesociales (id, libelle, deductible, active, code, fk_pays) values ( 20, 'Taxe fonciere', 1, 1, 'TAXFON', '1');
-insert into llx_c_chargesociales (id, libelle, deductible, active, code, fk_pays) values ( 25, 'Prelevement à la source (PAS)', 0, 1, 'TAXPAS', '1');
-insert into llx_c_chargesociales (id, libelle, deductible, active, code, fk_pays) values ( 30, 'Prevoyance', 1, 1,'TAXPREV', '1');
-insert into llx_c_chargesociales (id, libelle, deductible, active, code, fk_pays) values ( 40, 'Mutuelle', 1, 1,'TAXMUT', '1');
-insert into llx_c_chargesociales (id, libelle, deductible, active, code, fk_pays) values ( 50, 'Retraite', 1, 1,'TAXRET', '1');
-insert into llx_c_chargesociales (id, libelle, deductible, active, code, fk_pays) values ( 60, 'Taxe sur vehicule societe (TVS)', 0, 1, 'TAXTVS', '1');
-insert into llx_c_chargesociales (id, libelle, deductible, active, code, fk_pays) values ( 70, 'impôts sur les sociétés (IS)', 0, 1, 'TAXIS', '1');
+insert into llx_c_chargesociales (fk_pays, id, libelle, deductible, active, code) values ( 1,  1, 'Securite sociale (URSSAF / MSA)', 1, 1, 'TAXSECU');
+insert into llx_c_chargesociales (fk_pays, id, libelle, deductible, active, code) values ( 1,  2, 'Securite sociale des indépendants (URSSAF)', 1, 1, 'TAXSSI');
+insert into llx_c_chargesociales (fk_pays, id, libelle, deductible, active, code) values ( 1, 10, 'Taxe apprentissage', 1, 1, 'TAXAPP');
+insert into llx_c_chargesociales (fk_pays, id, libelle, deductible, active, code) values ( 1, 11, 'Formation professionnelle continue', 1, 1, 'TAXFPC');
+insert into llx_c_chargesociales (fk_pays, id, libelle, deductible, active, code) values ( 1, 12, 'Cotisation fonciere des entreprises (CFE)', 1, 1, 'TAXCFE');
+insert into llx_c_chargesociales (fk_pays, id, libelle, deductible, active, code) values ( 1, 13, 'Cotisation sur la valeur ajoutee des entreprises (CVAE)', 1, 1, 'TAXCVAE');
+insert into llx_c_chargesociales (fk_pays, id, libelle, deductible, active, code) values ( 1, 20, 'Taxe fonciere', 1, 1, 'TAXFON');
+insert into llx_c_chargesociales (fk_pays, id, libelle, deductible, active, code) values ( 1, 25, 'Prelevement à la source (PAS)', 0, 1, 'TAXPAS');
+insert into llx_c_chargesociales (fk_pays, id, libelle, deductible, active, code) values ( 1, 30, 'Prevoyance', 1, 1,'TAXPREV');
+insert into llx_c_chargesociales (fk_pays, id, libelle, deductible, active, code) values ( 1, 40, 'Mutuelle', 1, 1,'TAXMUT');
+insert into llx_c_chargesociales (fk_pays, id, libelle, deductible, active, code) values ( 1, 50, 'Retraite', 1, 1,'TAXRET');
+insert into llx_c_chargesociales (fk_pays, id, libelle, deductible, active, code) values ( 1, 60, 'Taxe sur vehicule societe (TVS)', 0, 1, 'TAXTVS');
+insert into llx_c_chargesociales (fk_pays, id, libelle, deductible, active, code) values ( 1, 70, 'impôts sur les sociétés (IS)', 0, 1, 'TAXIS');
 
 --
 -- Belgique

From 408ed3cf72ca473e363c8db8361905c769156c83 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Sat, 12 Jun 2021 12:06:21 +0200
Subject: [PATCH 0577/1497] Update ChangeLog

---
 ChangeLog | 86 ++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 53 insertions(+), 33 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f52fbb55668..7464b0f68d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,7 +16,6 @@ NEW: A lot of fix into english text after a small proofreading campaign (still n
 NEW: All main menu entries are using the picto of the module
 NEW: Add a copy to clipboard button on some fields 
 NEW: Add an example of scheduled job to send email reminder for unpaid invoices
-NEW: Can make massive stock transfers from a CSV file.
 NEW: Accountancy - Add FEC import
 NEW: Accountancy - Add a confirmation form with options on export
 NEW: Accountancy - Add select date from/to in already bind customer and supplier list
@@ -32,58 +31,44 @@ NEW: Add the column "Office phone" and  "User mobile" in user list
 NEW: Add the column "Price level"in thirdparty list
 NEW: Add some company information in the dropdown login menu
 NEW: Add constant MAIN_BUGTRACK_URL to set a custom url to redirect to when clicking on link "declare a bug"
-NEW: Add contact tag and bulk email status on the thirparty+contact create form
-NEW: Add db fields note_public and note_private for ECM module
+NEW: Add contact tag and bulk email status on the thirdparty + contact create form
 NEW: Support down payment on supplier invoice (& somes ajustments)
 NEW: Add edit/delete action icons on categories list pages
 NEW: Add hidden option to auto load input line extrafield into new lines
 NEW: Add import profile to import BOM
-NEW: Add last date of modification for website pages in the list of pages
 NEW: Add link picto to the stock movement on the detail of production
 NEW: Add mass action "Set tag" for product/service, user, thirdparty, warehouse, project, bank account, members
 NEW: Add bulk action Validate and Set to billed on order list.
-NEW: add bulk action to set a commercial proposal to status "Refused"
-NEW: Add option CONTRACT_ALLOW_EXTERNAL_DOWNLOAD and SUPPLIER_PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD to make generated doc automatically shared.
+NEW: Add option CONTRACT_ALLOW_EXTERNAL_DOWNLOAD  to make generated doc automatically shared.
+NEW: Add option SUPPLIER_PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD  to make generated doc automatically shared.
 NEW: Add option MAIN_SECURITY_ANTI_SSRF_SERVER_IP to define list of IPs that are local IPs
 NEW: Add option SOCIETE_DISABLE_WORKFORCE to hide staff field
-NEW: Add a new permission "Export website"
 NEW: Add possibility to exports userGroups fields on user exports
 NEW: Add price min and price min including tax into product export
 NEW: Can search on lots or serials into the quick search bar
 NEW: Add support for Friday as a non working day
 NEW: Add a total in page of margin by user
 NEW: Add the total of margin in invoice list
-NEW: Can set a Warehouse on a Thirparty
+NEW: Can set a Warehouse on a Thirdparty
 NEW: auto notification with module Notification can use templated emails
 NEW: Bank Entries : display user linked to a salary or a taxes
-NEW: Can set a warehouse in a proposal
-NEW: Can clone a cron job.
+NEW: Can clone a cron job
 NEW: Can create a lot from the list view (Look and feel standardization).
-NEW: Can filter files in GED on status Shared/Not shared
 NEW: Can filter on extrafields date on lists
-NEW: Can filter on rowid in list of blocked logs.
-NEW: Can hide columns "time consumed" on timesheet per week.
+NEW: Can filter on rowid in list of blocked logs
+NEW: Can hide columns "time consumed" on timesheet per week
 NEW: Can set an employee on each social contribution
 NEW: Can set a percentage when creating an invoice from another object
-NEW: Can set if a ticket group is visible on public interface or not.
 NEW: Can set order of execution of hooks
-NEW: Can show the leave dates/holidays on the agenda view.
-NEW: Can show the project ref into PDF documents
+NEW: Can show the leave dates/holidays on the agenda view
 NEW: Can toggle FCKeditor on public/private notes
-NEW: Can use captcha on public page to create a ticket
 NEW: Check update availability for externals modules using a button on module page
 NEW: Choose lines to use while creating intervention card from origin
-NEW: Column shipment method, payment mode, payment term in proposal and order list
+NEW: Columns shipment method, payment mode, payment term in proposal and order list
 NEW: Conf for default actioncomm status
 NEW: customer ref for product customer prices
 NEW: date and user signature on proposal (Issue 16062)
 NEW: Dictionary for availability - Add a column position
-NEW: TAKEPOS delayed payment in TakePOS
-NEW: TAKEPOS display date range if exist in TakePOS
-NEW: TAKEPOS display resiliate status in TakePOS for member
-NEW: TAKEPOS Edit sales lines rights in TakePOS
-NEW: TAKEPOS Option for Takepos to show the total price without tax
-NEW: TAKEPOS More permission in TakePOS (Can edit added line, can modify once order sent to kitchen)
 NEW: Can set a user related to a social contribution
 NEW: ICS Direct debit can be set with a different value for each bank account
 NEW: LDAP: usergroup search can be filtered
@@ -94,37 +79,71 @@ NEW: Add bulk actions for Bank Transfer
 NEW: Enhance the multicurrency rate editor
 NEW: Multiselect ledger account code filter on book keeping list
 NEW: Normalyse Type company field with ajax combobox
-NEW: option to automatically close an open project when all its tasks are done (=progress 100%)
-NEW: option to select membership type on the online payment page for membership subscription or renewal
 NEW: preload product description on selection for customer propal/order/invoice
 NEW: Add a ref in product customer price
-NEW: Save old page with .old extension on disk when editing a website page
 NEW: Search usergroups & resources
 NEW: Set status of all variants when changing status of parent
 NEW: Setup Page for module creation with module builder enhancement #FoundationFunding
 NEW: Show picto of module into the list of dictionaries
 NEW: Show the total of payment on the payment confirmation page
-NEW: Stock movement list - Add more complete date field
 NEW: Support color for types of event
 NEW: The global setup for Mandatory fields can now be done on combo list too.
 NEW: translate in "en_US" to complete PR 16980
 NEW: Update the list of taxes available by default for France
-NEW: Add captcha on public page to create a ticket
 NEW: Salary payment request and Salary payment are 2 different steps in workflow on Salary payment recording
 NEW: VAT payment request and VAT payment are now 2 different steps in workflow on VAT payment recording
 NEW: VAT report - Optimisation & collapse by rate
 NEW: When we add contacts/users to a project, ask to also affect them on tasks.
 NEW: When a doc file is shared, link is visible from the main page of doc.
 NEW: Add option in Workflow module to set a shipment as closed.
-NEW: Option to automatically create a login/user when a new subscription of a member is done online
 NEW: #16378 More E-Mail Contact substitution Values for better salutation
 NEW: option to keep the "Automatically create a total payment" checkbox empty on the tax creation page
-NEW: #17113 Can upload a favicon in website module
+
+ ECM/GED
+NEW: Add db fields note_public and note_private for ECM module
+NEW: Can filter files in GED on status Shared/Not shared
+
+ Members
 NEW: #17292 default subscription amount by adherent type
+NEW: Option to automatically create a login/user when a new subscription of a member is done online
+NEW: option to select membership type on the online payment page for membership subscription or renewal
+
+ Projects
+NEW: option to automatically close an open project when all its tasks are done (=progress 100%)
+NEW: Can show the project ref into PDF documents
+
+ Proposals
+NEW: add bulk action to set a commercial proposal to status "Refused"
+NEW: Can set a warehouse in a proposal
+
+ TakePOS
+NEW: TAKEPOS delayed payment in TakePOS
+NEW: TAKEPOS display date range if exist in TakePOS
+NEW: TAKEPOS display resiliate status in TakePOS for member
+NEW: TAKEPOS Edit sales lines rights in TakePOS
+NEW: TAKEPOS Option for TakePOS to show the total price without tax
+NEW: TAKEPOS More permission in TakePOS (Can edit added line, can modify once order sent to kitchen)
+
+ Tickets
+NEW: Add captcha on public page to create a ticket
+NEW: Can use captcha on public page to create a ticket
+NEW: Can set if a ticket group is visible on public interface or not
+
+ Warehouse
+NEW: Can make massive stock transfers from a CSV file
+NEW: Stock movement list - Add more complete date field
+
+ Website Module
+NEW: #17113 Can upload a favicon in website module
+NEW: add a new permission "Export website"
+NEW: add last date of modification for website pages in the list of pages
+NEW: Save old page with .old extension on disk when editing a website page
+
+ new Modules
 NEW: start new experimental module Event Organization Management
 NEW: start new experimental module Partnership Management
 NEW: start new experimental module Knowledge Management
-NEW: start new experimental module Workstations management
+NEW: start new experimental module Workstations Management
 
 
 For developers:
@@ -171,6 +190,7 @@ Following changes may create regressions for some external modules, but were nec
 * Function set_price_level() has been renamed into setPriceLevel() to follow camelcase rules
 * Remove deprecated subtituion key __REFCLIENT__ (Replaced with __REF_CLIENT__)
 
+
 ***** ChangeLog for 13.0.3 compared to 13.0.2 *****
 
 FIX: 13.0 warning - missing quotes around 'label'
@@ -193,7 +213,7 @@ FIX: create sociales : keep values error form
 FIX: dol_print_date for %a and %b with some timezone
 FIX: email is not case sensitive
 FIX: error for duplicate thirdparty found correctly returned by ws
-FIX: Espadon PDF shippment model with long public note now wroking
+FIX: Espadon PDF shippment model with long public note now working
 FIX: esupplier order: error 500 when using packaging with product where it is not defined
 FIX: Filter on debit/credit
 FIX: Filter on supplier payment list

From 7444ff54122634389a457492a11fdb192e38a7a5 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sat, 12 Jun 2021 14:18:44 +0200
Subject: [PATCH 0578/1497] Update notified

---
 htdocs/accountancy/bookkeeping/list.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 429aac9b877..a9ef259e243 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -527,8 +527,6 @@ if ($action == 'export_fileconfirm' && $user->rights->accounting->mouvements->ex
 		$notifiedexportdate = GETPOST('notifiedexportdate', 'alpha');
 		$notifiedvalidationdate = GETPOST('notifiedvalidationdate', 'alpha');
 
-		dol_syslog("date_export/date_validated=".$notifiedexportdate.'/'.$notifiedvalidationdate, LOG_DEBUG);
-
 		if (!empty($accountancyexport->errors)) {
 			setEventMessages('', $accountancyexport->errors, 'errors');
 		} elseif (!$notifiedexportdate || !$notifiedvalidationdate) {

From f13dcb5376c87ad8bb61a69d47ec754cdadef6d7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 12 Jun 2021 15:44:03 +0200
Subject: [PATCH 0579/1497] Fix merge

---
 htdocs/compta/facture/list.php | 125 +++++----------------------------
 1 file changed, 17 insertions(+), 108 deletions(-)

diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index c8e505948a0..370a0ac4070 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -124,15 +124,8 @@ $search_date_valid_startyear = GETPOST('search_date_valid_startyear', 'int');
 $search_date_valid_endday = GETPOST('search_date_valid_endday', 'int');
 $search_date_valid_endmonth = GETPOST('search_date_valid_endmonth', 'int');
 $search_date_valid_endyear = GETPOST('search_date_valid_endyear', 'int');
-<<<<<<< HEAD
 $search_date_valid_start = dol_mktime(0, 0, 0, $search_date_valid_startmonth, $search_date_valid_startday, $search_date_valid_startyear);	// Use tzserver
 $search_date_valid_end = dol_mktime(23, 59, 59, $search_date_valid_endmonth, $search_date_valid_endday, $search_date_valid_endyear);
-$search_datelimit_start = dol_mktime(0, 0, 0, GETPOST('search_datelimit_startmonth', 'int'), GETPOST('search_datelimit_startday', 'int'), GETPOST('search_datelimit_startyear', 'int'));
-$search_datelimit_end = dol_mktime(23, 59, 59, GETPOST('search_datelimit_endmonth', 'int'), GETPOST('search_datelimit_endday', 'int'), GETPOST('search_datelimit_endyear', 'int'));
-$search_categ_cus = GETPOST("search_categ_cus", 'int');
-=======
-$search_date_valid_start = dol_mktime(0, 0, 0, $search_date_valid_startmonth, $search_date_valid_startday, $search_date_valid_startyear);
-$search_date_valid_end = dol_mktime(23, 59, 59, $search_date_valid_endmonth, $search_date_valid_endday, $search_date_valid_endyear);
 $search_datelimit_startday = GETPOST('search_datelimit_startday', 'int');
 $search_datelimit_startmonth = GETPOST('search_datelimit_startmonth', 'int');
 $search_datelimit_startyear = GETPOST('search_datelimit_startyear', 'int');
@@ -141,8 +134,7 @@ $search_datelimit_endmonth = GETPOST('search_datelimit_endmonth', 'int');
 $search_datelimit_endyear = GETPOST('search_datelimit_endyear', 'int');
 $search_datelimit_start = dol_mktime(0, 0, 0, $search_datelimit_startmonth, $search_datelimit_startday, $search_datelimit_startyear);
 $search_datelimit_end = dol_mktime(23, 59, 59, $search_datelimit_endmonth, $search_datelimit_endday, $search_datelimit_endyear);
-$search_categ_cus = trim(GETPOST("search_categ_cus", 'int'));
->>>>>>> branch '13.0' of git@github.com:Dolibarr/dolibarr.git
+$search_categ_cus = GETPOST("search_categ_cus", 'int');
 $search_btn = GETPOST('button_search', 'alpha');
 $search_remove_btn = GETPOST('button_removefilter', 'alpha');
 $optioncss = GETPOST('optioncss', 'alpha');
@@ -578,7 +570,6 @@ if ($userid) {
 		$sql .= ' AND f.fk_user_author = '.((int) $userid);
 	}
 }
-<<<<<<< HEAD
 if ($search_ref) {
 	$sql .= natural_search('f.ref', $search_ref);
 }
@@ -674,40 +665,6 @@ if ($search_status != '-1' && $search_status != '') {
 		if ($search_status == '3') {
 			$sql .= " AND f.fk_statut = 3"; // abandonned
 		}
-=======
-if ($search_ref) $sql .= natural_search('f.ref', $search_ref);
-if ($search_refcustomer) $sql .= natural_search('f.ref_client', $search_refcustomer);
-if ($search_type != '' && $search_type != '-1') $sql .= " AND f.type IN (".$db->sanitize($db->escape($search_type)).")";
-if ($search_project_ref) $sql .= natural_search('p.ref', $search_project_ref);
-if ($search_project) $sql .= natural_search('p.title', $search_project);
-if ($search_societe) $sql .= natural_search('s.nom', $search_societe);
-if ($search_town)  $sql .= natural_search('s.town', $search_town);
-if ($search_zip)   $sql .= natural_search("s.zip", $search_zip);
-if ($search_state) $sql .= natural_search("state.nom", $search_state);
-if ($search_country) $sql .= " AND s.fk_pays IN (".$db->sanitize($db->escape($search_country)).')';
-if ($search_type_thirdparty) $sql .= " AND s.fk_typent IN (".$db->sanitize($db->escape($search_type_thirdparty)).')';
-if ($search_montant_ht != '') $sql .= natural_search('f.total', $search_montant_ht, 1);
-if ($search_montant_vat != '') $sql .= natural_search('f.tva', $search_montant_vat, 1);
-if ($search_montant_localtax1 != '') $sql .= natural_search('f.localtax1', $search_montant_localtax1, 1);
-if ($search_montant_localtax2 != '') $sql .= natural_search('f.localtax2', $search_montant_localtax2, 1);
-if ($search_montant_ttc != '') $sql .= natural_search('f.total_ttc', $search_montant_ttc, 1);
-if ($search_multicurrency_code != '') $sql .= ' AND f.multicurrency_code = "'.$db->escape($search_multicurrency_code).'"';
-if ($search_multicurrency_tx != '') $sql .= natural_search('f.multicurrency_tx', $search_multicurrency_tx, 1);
-if ($search_multicurrency_montant_ht != '') $sql .= natural_search('f.multicurrency_total_ht', $search_multicurrency_montant_ht, 1);
-if ($search_multicurrency_montant_vat != '') $sql .= natural_search('f.multicurrency_total_tva', $search_multicurrency_montant_vat, 1);
-if ($search_multicurrency_montant_ttc != '') $sql .= natural_search('f.multicurrency_total_ttc', $search_multicurrency_montant_ttc, 1);
-if ($search_login) $sql .= natural_search('u.login', $search_login);
-if ($search_categ_cus > 0) $sql .= " AND cc.fk_categorie = ".$db->escape($search_categ_cus);
-if ($search_categ_cus == -2)   $sql .= " AND cc.fk_categorie IS NULL";
-if ($search_status != '-1' && $search_status != '')
-{
-	if (is_numeric($search_status) && $search_status >= 0)
-	{
-		if ($search_status == '0') $sql .= " AND f.fk_statut = 0"; // draft
-		if ($search_status == '1') $sql .= " AND f.fk_statut = 1"; // unpayed
-		if ($search_status == '2') $sql .= " AND f.fk_statut = 2"; // payed     Not that some corrupted data may contains f.fk_statut = 1 AND f.paye = 1 (it means payed too but should not happend. If yes, reopen and reclassify billed)
-		if ($search_status == '3') $sql .= " AND f.fk_statut = 3"; // abandonned
->>>>>>> branch '13.0' of git@github.com:Dolibarr/dolibarr.git
 	} else {
 		$sql .= " AND f.fk_statut IN (".$db->sanitize($db->escape($search_status)).")"; // When search_status is '1,2' for example
 	}
@@ -768,11 +725,7 @@ if (!$sall) {
 	$sql .= ' f.retained_warranty, f.retained_warranty_date_limit, f.situation_final, f.situation_cycle_ref, f.situation_counter,';
 	$sql .= ' f.fk_user_author, f.fk_multicurrency, f.multicurrency_code, f.multicurrency_tx, f.multicurrency_total_ht, f.multicurrency_total_tva,';
 	$sql .= ' f.multicurrency_total_tva, f.multicurrency_total_ttc,';
-<<<<<<< HEAD
 	$sql .= ' s.rowid, s.nom, s.name_alias, s.email, s.phone, s.fax, s.address, s.town, s.zip, s.fk_pays, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur,';
-=======
-	$sql .= ' s.rowid, s.nom, s.name_alias, s.email, s.town, s.zip, s.fk_pays, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur,';
->>>>>>> branch '13.0' of git@github.com:Dolibarr/dolibarr.git
 	$sql .= ' typent.code,';
 	$sql .= ' state.code_departement, state.nom,';
 	$sql .= ' country.code,';
@@ -845,7 +798,6 @@ if ($resql) {
 		}
 	}
 
-<<<<<<< HEAD
 	$param = '&socid='.urlencode($socid);
 	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 		$param .= '&contextpage='.urlencode($contextpage);
@@ -892,11 +844,23 @@ if ($resql) {
 	if ($search_date_valid_endyear) {
 		$param .= '&search_date_valid_endyear='.urlencode($search_date_valid_endyear);
 	}
-	if ($search_datelimit_start) {
-		$param .= '&search_datelimit_start='.urlencode($search_datelimit_start);
+	if ($search_datelimit_startday)	{
+		$param .= '&search_datelimit_startday='.urlencode($search_datelimit_startday);
 	}
-	if ($search_datelimit_end) {
-		$param .= '&search_datelimit_end='.urlencode($search_datelimit_end);
+	if ($search_datelimit_startmonth) {
+		$param .= '&search_datelimit_startmonth='.urlencode($search_datelimit_startmonth);
+	}
+	if ($search_datelimit_startyear) {
+		$param .= '&search_datelimit_startyear='.urlencode($search_datelimit_startyear);
+	}
+	if ($search_datelimit_endday) {
+		$param .= '&search_datelimit_endday='.urlencode($search_datelimit_endday);
+	}
+	if ($search_datelimit_endmonth) {
+		$param .= '&search_datelimit_endmonth='.urlencode($search_datelimit_endmonth);
+	}
+	if ($search_datelimit_endyear) {
+		$param .= '&search_datelimit_endyear='.urlencode($search_datelimit_endyear);
 	}
 	if ($search_ref) {
 		$param .= '&search_ref='.urlencode($search_ref);
@@ -994,61 +958,6 @@ if ($resql) {
 	if ($search_categ_cus > 0) {
 		$param .= '&search_categ_cus='.urlencode($search_categ_cus);
 	}
-=======
-	$param = '&socid='.$socid;
-	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-	if ($sall)				 $param .= '&sall='.urlencode($sall);
-	if ($search_date_startday)		$param .= '&search_date_startday='.urlencode($search_date_startday);
-	if ($search_date_startmonth)	$param .= '&search_date_startmonth='.urlencode($search_date_startmonth);
-	if ($search_date_startyear)		$param .= '&search_date_startyear='.urlencode($search_date_startyear);
-	if ($search_date_endday)		$param .= '&search_date_endday='.urlencode($search_date_endday);
-	if ($search_date_endmonth)		$param .= '&search_date_endmonth='.urlencode($search_date_endmonth);
-	if ($search_date_endyear)		$param .= '&search_date_endyear='.urlencode($search_date_endyear);
-	if ($search_date_valid_startday)		$param .= '&search_date_valid_startday='.urlencode($search_date_valid_startday);
-	if ($search_date_valid_startmonth)		$param .= '&search_date_valid_startmonth='.urlencode($search_date_valid_startmonth);
-	if ($search_date_valid_startyear)		$param .= '&search_date_valid_startyear='.urlencode($search_date_valid_startyear);
-	if ($search_date_valid_endday)			$param .= '&search_date_valid_endday='.urlencode($search_date_valid_endday);
-	if ($search_date_valid_endmonth)		$param .= '&search_date_valid_endmonth='.urlencode($search_date_valid_endmonth);
-	if ($search_date_valid_endyear)			$param .= '&search_date_valid_endyear='.urlencode($search_date_valid_endyear);
-	if ($search_datelimit_startday)		$param .= '&search_datelimit_startday='.urlencode($search_datelimit_startday);
-	if ($search_datelimit_startmonth)	$param .= '&search_datelimit_startmonth='.urlencode($search_datelimit_startmonth);
-	if ($search_datelimit_startyear)	$param .= '&search_datelimit_startyear='.urlencode($search_datelimit_startyear);
-	if ($search_datelimit_endday)		$param .= '&search_datelimit_endday='.urlencode($search_datelimit_endday);
-	if ($search_datelimit_endmonth)		$param .= '&search_datelimit_endmonth='.urlencode($search_datelimit_endmonth);
-	if ($search_datelimit_endyear)		$param .= '&search_datelimit_endyear='.urlencode($search_datelimit_endyear);
-	if ($search_ref)         $param .= '&search_ref='.urlencode($search_ref);
-	if ($search_refcustomer) $param .= '&search_refcustomer='.urlencode($search_refcustomer);
-	if ($search_project_ref) $param .= '&search_project_ref='.urlencode($search_project_ref);
-	if ($search_project)     $param .= '&search_project='.urlencode($search_project);
-	if ($search_type != '')  $param .= '&search_type='.urlencode($search_type);
-	if ($search_societe)     $param .= '&search_societe='.urlencode($search_societe);
-	if ($search_town)        $param .= '&search_town='.urlencode($search_town);
-	if ($search_zip)         $param .= '&search_zip='.urlencode($search_zip);
-	if ($search_sale > 0)    $param .= '&search_sale='.urlencode($search_sale);
-	if ($search_user > 0)    $param .= '&search_user='.urlencode($search_user);
-	if ($search_login)       $param .= '&search_login='.urlencode($search_login);
-	if ($search_product_category > 0)   $param .= '&search_product_category='.urlencode($search_product_category);
-	if ($search_montant_ht != '')  $param .= '&search_montant_ht='.urlencode($search_montant_ht);
-	if ($search_montant_vat != '')  $param .= '&search_montant_vat='.urlencode($search_montant_vat);
-	if ($search_montant_localtax1 != '')  $param .= '&search_montant_localtax1='.urlencode($search_montant_localtax1);
-	if ($search_montant_localtax2 != '')  $param .= '&search_montant_localtax2='.urlencode($search_montant_localtax2);
-	if ($search_montant_ttc != '') $param .= '&search_montant_ttc='.urlencode($search_montant_ttc);
-	if ($search_multicurrency_code != '')  $param .= '&search_multicurrency_code='.urlencode($search_multicurrency_code);
-	if ($search_multicurrency_tx != '')  $param .= '&search_multicurrency_tx='.urlencode($search_multicurrency_tx);
-	if ($search_multicurrency_montant_ht != '')  $param .= '&search_multicurrency_montant_ht='.urlencode($search_multicurrency_montant_ht);
-	if ($search_multicurrency_montant_vat != '')  $param .= '&search_multicurrency_montant_vat='.urlencode($search_multicurrency_montant_vat);
-	if ($search_multicurrency_montant_ttc != '') $param .= '&search_multicurrency_montant_ttc='.urlencode($search_multicurrency_montant_ttc);
-	if ($search_status != '') $param .= '&search_status='.urlencode($search_status);
-	if ($search_paymentmode > 0) $param .= '&search_paymentmode='.urlencode($search_paymentmode);
-	if ($search_paymentterms > 0) $param .= '&search_paymentterms='.urlencode($search_paymentterms);
-	if ($search_module_source)  $param .= '&search_module_source='.urlencode($search_module_source);
-	if ($search_pos_source)  $param .= '&search_pos_source='.urlencode($search_pos_source);
-	if ($show_files)         $param .= '&show_files='.urlencode($show_files);
-	if ($option)             $param .= "&search_option=".urlencode($option);
-	if ($optioncss != '')    $param .= '&optioncss='.urlencode($optioncss);
-	if ($search_categ_cus > 0) $param .= '&search_categ_cus='.urlencode($search_categ_cus);
->>>>>>> branch '13.0' of git@github.com:Dolibarr/dolibarr.git
 
 	// Add $param from extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';

From 7cb647e5b5176c3e1fa31dc2b8bdc3e94569f228 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 12 Jun 2021 17:02:24 +0200
Subject: [PATCH 0580/1497] Complete log

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

diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index 6643d95a4ab..efb4fe82da7 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -947,7 +947,7 @@ class EmailCollector extends CommonObject
 
 		require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 
-		dol_syslog("EmailCollector::doCollectOneCollector start", LOG_DEBUG);
+		dol_syslog("EmailCollector::doCollectOneCollector start for id=".$this->id, LOG_DEBUG);
 
 		$langs->loadLangs(array("project", "companies", "mails", "errors", "ticket", "agenda"));
 

From a723a8f93e81547d4c22cf1bc39196325882b067 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 12 Jun 2021 18:40:00 +0200
Subject: [PATCH 0581/1497] remove phpcs warning

---
 htdocs/core/lib/product.lib.php          |  2 +-
 htdocs/core/modules/modFacture.class.php | 32 ++++++++++++++++++++++--
 2 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php
index f3ebef1e49f..64cc72a8879 100644
--- a/htdocs/core/lib/product.lib.php
+++ b/htdocs/core/lib/product.lib.php
@@ -363,7 +363,7 @@ function show_stats_for_company($product, $socid)
 	global $conf, $langs, $user, $db, $hookmanager;
 
 	$form = new Form($db);
-	
+
 	$nblines = 0;
 
 	print '<tr class="liste_titre">';
diff --git a/htdocs/core/modules/modFacture.class.php b/htdocs/core/modules/modFacture.class.php
index b296fa3b32c..a9765f45ada 100644
--- a/htdocs/core/modules/modFacture.class.php
+++ b/htdocs/core/modules/modFacture.class.php
@@ -120,8 +120,36 @@ class modFacture extends DolibarrModules
 		$arraydate = dol_getdate(dol_now());
 		$datestart = dol_mktime(23, 0, 0, $arraydate['mon'], $arraydate['mday'], $arraydate['year']);
 		$this->cronjobs = array(
-			0=>array('label'=>'RecurringInvoices', 'jobtype'=>'method', 'class'=>'compta/facture/class/facture-rec.class.php', 'objectname'=>'FactureRec', 'method'=>'createRecurringInvoices', 'parameters'=>'', 'comment'=>'Generate recurring invoices', 'frequency'=>1, 'unitfrequency'=>3600 * 24, 'priority'=>50, 'status'=>1, 'test'=>'$conf->facture->enabled', 'datestart'=>$datestart),
-			1=>array('label'=>'SendEmailsRemindersOnInvoiceDueDate', 'jobtype'=>'method', 'class'=>'compta/facture/class/facture.class.php', 'objectname'=>'Facture', 'method'=>'sendEmailsRemindersOnInvoiceDueDate', 'parameters'=>"10,all,EmailTemplateCode", 'comment'=>'Send an emails when the unpaid invoices reach a due date + n days = today. First param is the offset n of days, second parameter is "all" or a payment mode code, last paramater is the code of email template to use (an email template with EmailTemplateCode must exists. the version in the language of the thirdparty will be used in priority).', 'frequency'=>1, 'unitfrequency'=>3600 * 24, 'priority'=>50, 'status'=>0, 'test'=>'$conf->facture->enabled', 'datestart'=>$datestart),
+			0 => array(
+				'label'=>'RecurringInvoices',
+				'jobtype'=>'method',
+				'class'=>'compta/facture/class/facture-rec.class.php',
+				'objectname'=>'FactureRec',
+				'method'=>'createRecurringInvoices',
+				'parameters'=>'',
+				'comment'=>'Generate recurring invoices',
+				'frequency'=>1,
+				'unitfrequency'=>3600 * 24,
+				'priority'=>50,
+				'status'=>1,
+				'test'=>'$conf->facture->enabled',
+				'datestart'=>$datestart
+			),
+			1 => array(
+				'label'=>'SendEmailsRemindersOnInvoiceDueDate',
+				'jobtype'=>'method',
+				'class'=>'compta/facture/class/facture.class.php',
+				'objectname'=>'Facture',
+				'method'=>'sendEmailsRemindersOnInvoiceDueDate',
+				'parameters'=>"10,all,EmailTemplateCode",
+				'comment'=>'Send an emails when the unpaid invoices reach a due date + n days = today. First param is the offset n of days, second parameter is "all" or a payment mode code, last paramater is the code of email template to use (an email template with EmailTemplateCode must exists. the version in the language of the thirdparty will be used in priority).',
+				'frequency'=>1,
+				'unitfrequency'=>3600 * 24,
+				'priority'=>50,
+				'status'=>0,
+				'test'=>'$conf->facture->enabled',
+				'datestart'=>$datestart
+			),
 		);
 
 		// Permissions

From 9ba0fe07f0ea454e24831afe65154922defe7bf7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 12 Jun 2021 18:47:29 +0200
Subject: [PATCH 0582/1497] Fix phpcs

---
 htdocs/core/lib/product.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php
index f3ebef1e49f..64cc72a8879 100644
--- a/htdocs/core/lib/product.lib.php
+++ b/htdocs/core/lib/product.lib.php
@@ -363,7 +363,7 @@ function show_stats_for_company($product, $socid)
 	global $conf, $langs, $user, $db, $hookmanager;
 
 	$form = new Form($db);
-	
+
 	$nblines = 0;
 
 	print '<tr class="liste_titre">';

From 74e06353e9898f65db25a704112b25e14dd4fcaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sat, 12 Jun 2021 19:25:47 +0200
Subject: [PATCH 0583/1497] fix PDF BACKGROUND not found

---
 .../doc/pdf_standard_recruitmentjobposition.modules.php   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php b/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
index fcbbdb76930..e3cdbae0ddc 100644
--- a/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
+++ b/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
@@ -8,7 +8,7 @@
  * Copyright (C) 2012-2014  Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2015       Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2017       Ferran Marcet           <fmarcet@2byte.es>
- * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2021  Frédéric France         <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -347,7 +347,11 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
 
 				// Set path to the background PDF File
 				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND)) {
-					$pagecount = $pdf->setSourceFile($conf->mycompany->multidir_output[$object->entity].'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
+					$logodir = $conf->mycompany->dir_output;
+					if (!empty($conf->mycompany->multidir_output[$object->entity])) {
+						$logodir = $conf->mycompany->multidir_output[$object->entity];
+					}
+					$pagecount = $pdf->setSourceFile($logodir.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
 					$tplidx = $pdf->importPage(1);
 				}
 

From 6ff97ca2c61e38294aa62999d58ceb78ffc012cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sat, 12 Jun 2021 19:28:58 +0200
Subject: [PATCH 0584/1497] Update
 pdf_standard_recruitmentjobposition.modules.php

---
 .../doc/pdf_standard_recruitmentjobposition.modules.php       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php b/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
index fcbbdb76930..7c8783fdca9 100644
--- a/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
+++ b/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
@@ -31,7 +31,7 @@
  *  \brief      File of class to generate document from standard template
  */
 
-dol_include_once('/recruitment/core/modules/recruitment/modules_recruitmentjobposition.php');
+require_once DOL_DOCUMENT_ROOT.'/recruitment/core/modules/recruitment/modules_recruitmentjobposition.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
@@ -130,7 +130,7 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
 	/**
 	 * @var array of document table columns
 	 */
-	public $cols;
+	public $cols = array();
 
 
 	/**

From 8b9af8f5abb5148faa600652b1c26b9aea7348e6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 13 Jun 2021 01:27:04 +0200
Subject: [PATCH 0585/1497] Responsive

---
 .../default/tpl/adherentcard_create.tpl.php     |  4 ++--
 .../default/tpl/adherentcard_edit.tpl.php       |  4 ++--
 htdocs/admin/commande.php                       | 14 ++++++++++++--
 htdocs/admin/contract.php                       |  2 +-
 htdocs/admin/expedition.php                     |  2 +-
 htdocs/admin/expensereport.php                  |  2 +-
 htdocs/admin/facture.php                        | 17 +++++++++++++++--
 htdocs/admin/fichinter.php                      | 13 +++++++++++--
 htdocs/admin/geoipmaxmind.php                   |  2 +-
 htdocs/admin/holiday.php                        |  2 +-
 htdocs/admin/modules.php                        | 11 +++++------
 htdocs/admin/receiptprinter.php                 |  8 ++++----
 htdocs/admin/reception_setup.php                |  2 +-
 htdocs/admin/supplier_proposal.php              |  2 +-
 .../default/tpl/contactcard_create.tpl.php      |  4 ++--
 .../canvas/default/tpl/contactcard_edit.tpl.php |  4 ++--
 .../barcode/mod_barcode_product_standard.php    |  2 +-
 .../bom/doc/doc_generic_bom_odt.modules.php     |  2 +-
 htdocs/core/modules/bom/mod_bom_advanced.php    |  2 +-
 .../modules/cheque/mod_chequereceipt_thyme.php  |  2 +-
 .../doc/doc_generic_order_odt.modules.php       |  4 ++--
 .../modules/commande/mod_commande_saphir.php    |  2 +-
 .../doc/doc_generic_contract_odt.modules.php    |  4 ++--
 .../modules/contract/mod_contract_magre.php     |  2 +-
 .../modules/delivery/mod_delivery_saphir.php    |  2 +-
 .../doc/doc_generic_shipment_odt.modules.php    |  2 +-
 .../expedition/mod_expedition_ribera.php        |  2 +-
 .../expensereport/mod_expensereport_sand.php    |  2 +-
 .../doc/doc_generic_invoice_odt.modules.php     |  4 ++--
 .../modules/facture/mod_facture_mercure.php     |  8 ++++----
 htdocs/core/modules/fichinter/mod_arctic.php    |  2 +-
 .../modules/holiday/mod_holiday_immaculate.php  |  2 +-
 .../member/doc/doc_generic_member_odt.class.php |  4 ++--
 .../mrp/doc/doc_generic_mo_odt.modules.php      |  2 +-
 htdocs/core/modules/mrp/mod_mo_advanced.php     |  2 +-
 htdocs/core/modules/payment/mod_payment_ant.php |  2 +-
 .../doc/doc_generic_product_odt.modules.php     |  2 +-
 .../product/mod_codeproduct_elephant.php        |  4 ++--
 .../modules/product_batch/mod_lot_advanced.php  |  2 +-
 .../modules/product_batch/mod_sn_advanced.php   |  2 +-
 .../doc/doc_generic_project_odt.modules.php     |  2 +-
 .../modules/project/mod_project_universal.php   |  2 +-
 .../task/doc/doc_generic_task_odt.modules.php   |  2 +-
 .../modules/project/task/mod_task_universal.php |  2 +-
 .../doc/doc_generic_proposal_odt.modules.php    |  4 ++--
 .../core/modules/propale/mod_propale_saphir.php |  2 +-
 .../doc/doc_generic_reception_odt.modules.php   |  2 +-
 .../reception/mod_reception_moonstone.php       |  2 +-
 .../societe/doc/doc_generic_odt.modules.php     |  4 ++--
 .../modules/societe/mod_codeclient_elephant.php |  4 ++--
 .../stock/doc/doc_generic_stock_odt.modules.php |  4 ++--
 .../mod_facture_fournisseur_tulip.php           |  8 ++++----
 .../doc_generic_supplier_order_odt.modules.php  |  2 +-
 .../mod_commande_fournisseur_orchidee.php       |  2 +-
 .../mod_supplier_payment_brodator.php           |  2 +-
 ...oc_generic_supplier_proposal_odt.modules.php |  2 +-
 .../mod_supplier_proposal_saphir.php            |  2 +-
 .../takepos/mod_takepos_ref_universal.php       |  2 +-
 .../doc/doc_generic_ticket_odt.modules.php      |  4 ++--
 .../modules/ticket/mod_ticket_universal.php     |  2 +-
 .../user/doc/doc_generic_user_odt.modules.php   |  4 ++--
 .../doc/doc_generic_usergroup_odt.modules.php   |  2 +-
 .../workstation/mod_workstation_advanced.php    |  2 +-
 htdocs/ftp/admin/ftpclient.php                  |  4 ++--
 .../mod_knowledgerecord_advanced.php            |  2 +-
 .../doc/doc_generic_myobject_odt.modules.php    |  2 +-
 .../modules/mymodule/mod_myobject_advanced.php  |  2 +-
 htdocs/opensurvey/results.php                   |  2 +-
 .../partnership/mod_partnership_advanced.php    |  2 +-
 htdocs/product/admin/dynamic_prices.php         |  8 ++++----
 htdocs/product/card.php                         |  4 ++--
 htdocs/public/opensurvey/studs.php              |  2 +-
 ...neric_recruitmentjobposition_odt.modules.php |  2 +-
 .../mod_recruitmentjobposition_advanced.php     |  2 +-
 htdocs/ticket/card.php                          |  2 +-
 75 files changed, 143 insertions(+), 112 deletions(-)

diff --git a/htdocs/adherents/canvas/default/tpl/adherentcard_create.tpl.php b/htdocs/adherents/canvas/default/tpl/adherentcard_create.tpl.php
index b6c0b542d27..87b8a6874c4 100644
--- a/htdocs/adherents/canvas/default/tpl/adherentcard_create.tpl.php
+++ b/htdocs/adherents/canvas/default/tpl/adherentcard_create.tpl.php
@@ -68,7 +68,7 @@ echo $this->control->tpl['ajax_selectcountry']; ?>
 
 <tr>
 	<td><?php echo $langs->trans("Morphy"); ?></td>
-	<td colspan="3"><input name="morphy" type="text" size="50" maxlength="80" value="<?php echo $this->control->tpl['select_morphy']; ?>"></td>
+	<td colspan="3"><input name="morphy" type="text" class="minwidth200" value="<?php echo $this->control->tpl['select_morphy']; ?>"></td>
 </tr>
 
 <tr>
@@ -105,7 +105,7 @@ echo $this->control->tpl['ajax_selectcountry']; ?>
 
 <tr>
 	<td><?php echo $langs->trans("Email"); ?></td>
-	<td colspan="3"><input name="email" type="text" size="50" maxlength="80" value="<?php echo $this->control->tpl['email']; ?>"></td>
+	<td colspan="3"><input name="email" type="text" class="minwidth200" maxlength="80" value="<?php echo $this->control->tpl['email']; ?>"></td>
 </tr>
 
 <tr>
diff --git a/htdocs/adherents/canvas/default/tpl/adherentcard_edit.tpl.php b/htdocs/adherents/canvas/default/tpl/adherentcard_edit.tpl.php
index 3259df07b8d..9056ff201e4 100644
--- a/htdocs/adherents/canvas/default/tpl/adherentcard_edit.tpl.php
+++ b/htdocs/adherents/canvas/default/tpl/adherentcard_edit.tpl.php
@@ -77,7 +77,7 @@ echo $this->control->tpl['ajax_selectcountry'];
 
 <tr>
 	<td><?php echo $langs->trans("Morphy"); ?></td>
-	<td colspan="3"><input name="poste" type="text" size="50" maxlength="80" value="<?php echo $this->control->tpl['select_morphy']; ?>"></td>
+	<td colspan="3"><input name="poste" type="text" class="minwidth200" maxlength="80" value="<?php echo $this->control->tpl['select_morphy']; ?>"></td>
 </tr>
 
 <tr>
@@ -114,7 +114,7 @@ echo $this->control->tpl['ajax_selectcountry'];
 
 <tr>
 	<td><?php echo $langs->trans("Email"); ?></td>
-	<td><input name="email" type="text" size="50" maxlength="80" value="<?php echo $this->control->tpl['email']; ?>"></td>
+	<td><input name="email" type="text" class="minwidth200" maxlength="80" value="<?php echo $this->control->tpl['email']; ?>"></td>
 </tr>
 
 <tr>
diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index 89363a9027b..7407961649c 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -367,8 +367,8 @@ if ($resql) {
 
 
 print '<div class="div-table-responsive-no-min">';
-print "<table class=\"noborder\" width=\"100%\">\n";
-print "<tr class=\"liste_titre\">\n";
+print '<table class="noborder centpercent">'."\n";
+print '<tr class="liste_titre">'."\n";
 print '<td>'.$langs->trans("Name").'</td>';
 print '<td>'.$langs->trans("Description").'</td>';
 print '<td class="center" width="60">'.$langs->trans("Status")."</td>\n";
@@ -498,6 +498,7 @@ print load_fiche_titre($langs->trans("SuggestedPaymentModesIfNotDefinedInOrder")
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 print '<input type="hidden" name="token" value="'.newToken().'" />';
 
+print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 
 print '<tr class="liste_titre">';
@@ -584,6 +585,8 @@ if (empty($conf->facture->enabled)) {
 }
 print "</td></tr>";
 print "</table>";
+print '</div>';
+
 print "</form>";
 
 
@@ -594,6 +597,8 @@ print '<br>';
  */
 
 print load_fiche_titre($langs->trans("OtherOptions"), '', '');
+
+print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Parameter").'</td>';
@@ -704,6 +709,8 @@ if ($conf->stock->enabled) {
 */
 
 print '</table>';
+print '</div>';
+
 print '<br>';
 
 
@@ -712,6 +719,8 @@ print '<br>';
  */
 
 print load_fiche_titre($langs->trans("Notifications"), '', '');
+
+print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Parameter").'</td>';
@@ -725,6 +734,7 @@ print '</td><td class="right">';
 print "</td></tr>\n";
 
 print '</table>';
+print '</div>';
 
 // End of page
 llxFooter();
diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php
index 30b77f6db8b..c10a6ed04b4 100644
--- a/htdocs/admin/contract.php
+++ b/htdocs/admin/contract.php
@@ -456,7 +456,7 @@ print '</td></tr>'."\n";
 print '<tr class="oddeven"><td>';
 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 '<input class="flat minwidth200" type="text" name="CONTRACT_DRAFT_WATERMARK" value="'.$conf->global->CONTRACT_DRAFT_WATERMARK.'">';
 print '</td></tr>'."\n";
 
 print '<tr class="oddeven">';
diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php
index 8be9aeee0bc..8916adef471 100644
--- a/htdocs/admin/expedition.php
+++ b/htdocs/admin/expedition.php
@@ -449,7 +449,7 @@ print "</td></tr>\n";
 
 print '<tr><td>';
 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 '<input class="flat minwidth200" type="text" name="SHIPPING_DRAFT_WATERMARK" value="'.$conf->global->SHIPPING_DRAFT_WATERMARK.'">';
 print "</td></tr>\n";
 
 print '</table>';
diff --git a/htdocs/admin/expensereport.php b/htdocs/admin/expensereport.php
index ad04e09ffd1..7ff30242336 100644
--- a/htdocs/admin/expensereport.php
+++ b/htdocs/admin/expensereport.php
@@ -455,7 +455,7 @@ print '</td></tr>'."\n";
 
 print '<tr class="oddeven"><td colspan="2">';
 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 '<input class="flat minwidth200" type="text" name="EXPENSEREPORT_DRAFT_WATERMARK" value="'.$conf->global->EXPENSEREPORT_DRAFT_WATERMARK.'">';
 print '</td></tr>'."\n";
 
 print '</table>';
diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index a16df0d7fc4..bd4b6f5404f 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -249,6 +249,7 @@ print dol_get_fiche_head($head, 'general', $langs->trans("Invoices"), -1, 'invoi
 
 print load_fiche_titre($langs->trans("BillsNumberingModule"), '', '');
 
+print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Name").'</td>';
@@ -411,6 +412,7 @@ foreach ($dirmodels as $reldir) {
 }
 
 print '</table>';
+print '</div>';
 
 
 /*
@@ -439,6 +441,7 @@ if ($resql) {
 	dol_print_error($db);
 }
 
+print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Name").'</td>';
@@ -558,6 +561,7 @@ foreach ($dirmodels as $reldir) {
 	}
 }
 print '</table>';
+print '</div>';
 
 if (!empty($conf->global->INVOICE_USE_DEFAULT_DOCUMENT)) { // Hidden conf
 	/*
@@ -565,9 +569,12 @@ if (!empty($conf->global->INVOICE_USE_DEFAULT_DOCUMENT)) { // Hidden conf
 	 */
 	print '<br>';
 	print load_fiche_titre($langs->trans("BillsPDFModulesAccordindToInvoiceType"), '', '');
+
 	print '<form action="'.$_SERVER["PHP_SELF"].'#default-pdf-modules-by-type-table" method="POST">';
 	print '<input type="hidden" name="token" value="'.newToken().'" />';
 	print '<input type="hidden" name="action" value="setDefaultPDFModulesByType" >';
+
+	print '<div class="div-table-responsive-no-min">';
 	print '<table id="default-pdf-modules-by-type-table" class="noborder centpercent">';
 	print '<tr class="liste_titre">';
 	print '<td>'.$langs->trans("Type").'</td>';
@@ -595,6 +602,8 @@ if (!empty($conf->global->INVOICE_USE_DEFAULT_DOCUMENT)) { // Hidden conf
 	}
 
 	print '</table>';
+	print '</div>';
+
 	print "</form>";
 }
 
@@ -607,6 +616,7 @@ print load_fiche_titre($langs->trans("SuggestedPaymentModesIfNotDefinedInInvoice
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 print '<input type="hidden" name="token" value="'.newToken().'" />';
 
+print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 
 print '<tr class="liste_titre">';
@@ -681,12 +691,15 @@ if ($resql) {
 print "</select>";
 print "</td></tr>";
 print "</table>";
+print '</div>';
+
 print "</form>";
 
 
 print "<br>";
 print load_fiche_titre($langs->trans("OtherOptions"), '', '');
 
+print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Parameter").'</td>';
@@ -740,14 +753,14 @@ print '<input type="hidden" name="action" value="set_FACTURE_DRAFT_WATERMARK" />
 print '<tr class="oddeven"><td>';
 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><input class="flat minwidth200imp" type="text" name="FACTURE_DRAFT_WATERMARK" value="'.$conf->global->FACTURE_DRAFT_WATERMARK.'" />';
 print '</td><td class="right">';
 print '<input type="submit" class="button" value="'.$langs->trans("Modify").'" />';
 print "</td></tr>\n";
 print '</form>';
 
 print '</table>';
-
+print '</div>';
 
 /*
  *  Repertoire
diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php
index b0dcf2f39c4..cdfa1f91753 100644
--- a/htdocs/admin/fichinter.php
+++ b/htdocs/admin/fichinter.php
@@ -236,6 +236,7 @@ print dol_get_fiche_head($head, 'ficheinter', $langs->trans("Interventions"), -1
 
 print load_fiche_titre($langs->trans("FicheinterNumberingModules"), '', '');
 
+print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td width="100">'.$langs->trans("Name").'</td>';
@@ -328,7 +329,10 @@ foreach ($dirmodels as $reldir) {
 	}
 }
 
-print '</table><br>';
+print '</table>';
+print '</div>';
+
+print '<br>';
 
 
 /*
@@ -358,6 +362,7 @@ if ($resql) {
 }
 
 
+print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Name").'</td>';
@@ -468,6 +473,7 @@ foreach ($dirmodels as $reldir) {
 }
 
 print '</table>';
+print '</div>';
 print "<br>";
 
 /*
@@ -475,6 +481,8 @@ print "<br>";
  */
 
 print load_fiche_titre($langs->trans("OtherOptions"), '', '');
+
+print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Parameter").'</td>';
@@ -515,7 +523,7 @@ print "<input type=\"hidden\" name=\"action\" value=\"set_FICHINTER_DRAFT_WATERM
 print '<tr class="oddeven"><td>';
 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 '<input class="flat minwidth200" type="text" name="FICHINTER_DRAFT_WATERMARK" value="'.$conf->global->FICHINTER_DRAFT_WATERMARK.'">';
 print '</td><td class="right">';
 print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
 print "</td></tr>\n";
@@ -585,6 +593,7 @@ print '</tr>';
 print '</form>';
 
 print '</table>';
+print '</div>';
 
 print '<br>';
 
diff --git a/htdocs/admin/geoipmaxmind.php b/htdocs/admin/geoipmaxmind.php
index 109bd6b388d..40819b697e3 100644
--- a/htdocs/admin/geoipmaxmind.php
+++ b/htdocs/admin/geoipmaxmind.php
@@ -132,7 +132,7 @@ print '<td colspan="2">';
 if ($conf->global->GEOIP_VERSION == 'php') {
 	print 'Using geoip PHP internal functions. Value must be '.geoip_db_filename(GEOIP_COUNTRY_EDITION).' or '.geoip_db_filename(GEOIP_CITY_EDITION_REV1).' or /pathtodatafile/GeoLite2-Country.mmdb<br>';
 }
-print '<input size="50" type="text" name="GEOIPMAXMIND_COUNTRY_DATAFILE" value="'.dol_escape_htmltag($conf->global->GEOIPMAXMIND_COUNTRY_DATAFILE).'">';
+print '<input type="text" class="minwidth200" name="GEOIPMAXMIND_COUNTRY_DATAFILE" value="'.dol_escape_htmltag($conf->global->GEOIPMAXMIND_COUNTRY_DATAFILE).'">';
 print '</td></tr>';
 
 print '</table>';
diff --git a/htdocs/admin/holiday.php b/htdocs/admin/holiday.php
index 28fbeba9063..f6ac529466e 100644
--- a/htdocs/admin/holiday.php
+++ b/htdocs/admin/holiday.php
@@ -472,7 +472,7 @@ print '</td></tr>'."\n";
 print '<tr class="oddeven"><td>';
 print $form->textwithpicto($langs->trans("WatermarkOnDraftHolidayCards"), $htmltext, 1, 'help', '', 0, 2, 'watermarktooltip').'<br>';
 print '</td><td>';
-print '<input size="50" class="flat" type="text" name="HOLIDAY_DRAFT_WATERMARK" value="'.$conf->global->HOLIDAY_DRAFT_WATERMARK.'">';
+print '<input class="flat minwidth200" type="text" name="HOLIDAY_DRAFT_WATERMARK" value="'.$conf->global->HOLIDAY_DRAFT_WATERMARK.'">';
 print '</td></tr>'."\n";
 
 print '</table>';
diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 5dc660adb9b..589cf9fcb1a 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -535,7 +535,7 @@ if ($mode == 'common' || $mode == 'commonkanban') {
 
 	$moreforfilter .= '<div class="colorbacktimesheet float valignmiddle">';
 	$moreforfilter .= '<div class="divsearchfield paddingtop">';
-	$moreforfilter .= img_picto($langs->trans("Filter"), 'filter', 'class="paddingright opacityhigh"').'<input type="text" id="search_keyword" name="search_keyword" class="maxwidth125" value="'.dol_escape_htmltag($search_keyword).'" placeholder="'.dol_escape_htmltag($langs->trans('Keyword')).'">';
+	$moreforfilter .= img_picto($langs->trans("Filter"), 'filter', 'class="paddingright opacityhigh hideonsmartphone"').'<input type="text" id="search_keyword" name="search_keyword" class="maxwidth125" value="'.dol_escape_htmltag($search_keyword).'" placeholder="'.dol_escape_htmltag($langs->trans('Keyword')).'">';
 	$moreforfilter .= '</div>';
 	$moreforfilter .= '<div class="divsearchfield paddingtop">';
 	$moreforfilter .= $form->selectarray('search_nature', $arrayofnatures, dol_escape_htmltag($search_nature), $langs->trans('Origin'), 0, 0, '', 0, 0, 0, '', 'maxwidth200', 1);
@@ -826,8 +826,7 @@ if ($mode == 'common' || $mode == 'commonkanban') {
 			} else {
 				$codetoconfig .= img_picto($langs->trans("NothingToSetup"), "setup", 'class="opacitytransp" style="padding-right: 6px"', false, 0, 0, '', 'fa-15');
 			}
-		} else // Module not yet activated
-		{
+		} else { // Module not yet activated
 			// Set $codeenabledisable
 			if (!empty($objMod->always_enabled)) {
 				// Should never happened
@@ -884,11 +883,11 @@ if ($mode == 'common' || $mode == 'commonkanban') {
 		} else {
 			print '<tr class="oddeven">'."\n";
 			if (!empty($conf->global->MAIN_MODULES_SHOW_LINENUMBERS)) {
-				print '<td width="20px">'.$linenum.'</td>';
+				print '<td class="width50">'.$linenum.'</td>';
 			}
 
 			// Picto + Name of module
-			print '  <td width="200px">';
+			print '  <td class="tdoverflowmax300" title="'.dol_escape_htmltag($objMod->getName()).'">';
 			$alttext = '';
 			//if (is_array($objMod->need_dolibarr_version)) $alttext.=($alttext?' - ':'').'Dolibarr >= '.join('.',$objMod->need_dolibarr_version);
 			//if (is_array($objMod->phpmin)) $alttext.=($alttext?' - ':'').'PHP >= '.join('.',$objMod->phpmin);
@@ -1015,7 +1014,7 @@ if ($mode == 'marketplace') {
 					<input type="hidden" name="token" value="<?php echo newToken(); ?>">
 					<input type="hidden" name="mode" value="marketplace">
 					<div class="divsearchfield">
-						<input name="search_keyword" placeholder="<?php echo $langs->trans('Keyword') ?>" id="search_keyword" type="text" size="50" value="<?php echo $options['search'] ?>"><br>
+						<input name="search_keyword" placeholder="<?php echo $langs->trans('Keyword') ?>" id="search_keyword" type="text" class="minwidth200" value="<?php echo $options['search'] ?>"><br>
 					</div>
 					<div class="divsearchfield">
 						<input class="button buttongen" value="<?php echo $langs->trans('Rechercher') ?>" type="submit">
diff --git a/htdocs/admin/receiptprinter.php b/htdocs/admin/receiptprinter.php
index f1b74146c5e..883a6ff6f03 100644
--- a/htdocs/admin/receiptprinter.php
+++ b/htdocs/admin/receiptprinter.php
@@ -313,7 +313,7 @@ if ($mode == 'config' && $user->admin) {
 
 	if ($action != 'editprinter') {
 		print '<tr>';
-		print '<td><input size="50" type="text" name="printername"></td>';
+		print '<td><input class="minwidth200" type="text" name="printername"></td>';
 		$ret = $printer->selectTypePrinter();
 		print '<td>'.$printer->resprint.'</td>';
 		$ret = $printer->selectProfilePrinter();
@@ -334,7 +334,7 @@ if ($mode == 'config' && $user->admin) {
 			print '<tr class="oddeven">';
 			if ($action == 'editprinter' && $printer->listprinters[$line]['rowid'] == $printerid) {
 				print '<input type="hidden" name="printerid" value="'.$printer->listprinters[$line]['rowid'].'">';
-				print '<td><input size="50" type="text" name="printername" value="'.$printer->listprinters[$line]['name'].'"></td>';
+				print '<td><input type="text" class="minwidth200" name="printername" value="'.$printer->listprinters[$line]['name'].'"></td>';
 				$ret = $printer->selectTypePrinter($printer->listprinters[$line]['fk_type']);
 				print '<td>'.$printer->resprint.'</td>';
 				$ret = $printer->selectProfilePrinter($printer->listprinters[$line]['fk_profile']);
@@ -427,7 +427,7 @@ if ($mode == 'template' && $user->admin) {
 			print '<tr class="oddeven">';
 			if ($action == 'edittemplate' && $printer->listprinterstemplates[$line]['rowid'] == $templateid) {
 				print '<input type="hidden" name="templateid" value="'.$printer->listprinterstemplates[$line]['rowid'].'">';
-				print '<td><input size="50" type="text" name="templatename" value="'.$printer->listprinterstemplates[$line]['name'].'"></td>';
+				print '<td><input type="text" class="minwidth200" name="templatename" value="'.$printer->listprinterstemplates[$line]['name'].'"></td>';
 				print '<td>';
 				print '<textarea name="template" wrap="soft" cols="120" rows="12">'.$printer->listprinterstemplates[$line]['template'].'</textarea>';
 				print '</td>';
@@ -456,7 +456,7 @@ if ($mode == 'template' && $user->admin) {
 
 	if ($action != 'edittemplate') {
 		print '<tr>';
-		print '<td><input size="50" type="text" name="templatename" value="'.$printer->listprinterstemplates[$line]['name'].'"></td>';
+		print '<td><input type="text" class="minwidth200" name="templatename" value="'.$printer->listprinterstemplates[$line]['name'].'"></td>';
 		print '<td>';
 		print '<textarea name="template" wrap="soft" cols="120" rows="12">';
 		print '</textarea>';
diff --git a/htdocs/admin/reception_setup.php b/htdocs/admin/reception_setup.php
index 7cc9ae3e3be..e9a4a724871 100644
--- a/htdocs/admin/reception_setup.php
+++ b/htdocs/admin/reception_setup.php
@@ -465,7 +465,7 @@ print "</td></tr>\n";
 
 print '<tr><td>';
 print $form->textwithpicto($langs->trans("WatermarkOnDraftContractCards"), $htmltext).'<br>';
-print '<input size="50" class="flat" type="text" name="RECEPTION_DRAFT_WATERMARK" value="'.$conf->global->RECEPTION_DRAFT_WATERMARK.'">';
+print '<input class="flat minwidth200" type="text" name="RECEPTION_DRAFT_WATERMARK" value="'.$conf->global->RECEPTION_DRAFT_WATERMARK.'">';
 print "</td></tr>\n";
 */
 print '</table>';
diff --git a/htdocs/admin/supplier_proposal.php b/htdocs/admin/supplier_proposal.php
index d74c4d5dbf7..68066a2aebc 100644
--- a/htdocs/admin/supplier_proposal.php
+++ b/htdocs/admin/supplier_proposal.php
@@ -490,7 +490,7 @@ print "<input type=\"hidden\" name=\"action\" value=\"set_SUPPLIER_PROPOSAL_DRAF
 print '<tr class="oddeven"><td>';
 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 '<input class="flat minwidth200" type="text" name="SUPPLIER_PROPOSAL_DRAFT_WATERMARK" value="'.$conf->global->SUPPLIER_PROPOSAL_DRAFT_WATERMARK.'">';
 print '</td><td class="right">';
 print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
 print "</td></tr>\n";
diff --git a/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php b/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php
index a6c134d0a9a..edb2a78818c 100644
--- a/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php
+++ b/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php
@@ -67,7 +67,7 @@ echo $this->control->tpl['ajax_selectcountry']; ?>
 
 <tr>
 	<td><?php echo $langs->trans("PostOrFunction"); ?></td>
-	<td colspan="3"><input name="poste" type="text" size="50" maxlength="80" value="<?php echo $this->control->tpl['poste']; ?>"></td>
+	<td colspan="3"><input name="poste" type="text" class="minwidth200" maxlength="80" value="<?php echo $this->control->tpl['poste']; ?>"></td>
 </tr>
 
 <tr>
@@ -106,7 +106,7 @@ echo $this->control->tpl['ajax_selectcountry']; ?>
 
 <tr>
 	<td><?php echo $langs->trans("Email"); ?></td>
-	<td colspan="3"><input name="email" type="text" size="50" maxlength="80" value="<?php echo $this->control->tpl['email']; ?>"></td>
+	<td colspan="3"><input name="email" type="text" class="minwidth200" maxlength="80" value="<?php echo $this->control->tpl['email']; ?>"></td>
 </tr>
 
 <tr>
diff --git a/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php b/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php
index 41fbdb5def9..5c06b1d1549 100644
--- a/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php
+++ b/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php
@@ -76,7 +76,7 @@ echo $this->control->tpl['ajax_selectcountry'];
 
 <tr>
 	<td><?php echo $langs->trans("PostOrFunction"); ?></td>
-	<td colspan="3"><input name="poste" type="text" size="50" maxlength="80" value="<?php echo $this->control->tpl['poste']; ?>"></td>
+	<td colspan="3"><input name="poste" type="text" class="minwidth200" maxlength="80" value="<?php echo $this->control->tpl['poste']; ?>"></td>
 </tr>
 
 <tr>
@@ -115,7 +115,7 @@ echo $this->control->tpl['ajax_selectcountry'];
 
 <tr>
 	<td><?php echo $langs->trans("Email"); ?></td>
-	<td><input name="email" type="text" size="50" maxlength="80" value="<?php echo $this->control->tpl['email']; ?>"></td>
+	<td><input name="email" type="text" class="minwidth200" maxlength="80" value="<?php echo $this->control->tpl['email']; ?>"></td>
 	<?php if ($this->control->tpl['nb_emailing']) { ?>
 	<td class="nowrap"><?php echo $langs->trans("NbOfEMailingsReceived"); ?></td>
 	<td><?php echo $this->control->tpl['nb_emailing']; ?></td>
diff --git a/htdocs/core/modules/barcode/mod_barcode_product_standard.php b/htdocs/core/modules/barcode/mod_barcode_product_standard.php
index 7bbedd0aa67..0d1bee3c28a 100644
--- a/htdocs/core/modules/barcode/mod_barcode_product_standard.php
+++ b/htdocs/core/modules/barcode/mod_barcode_product_standard.php
@@ -107,7 +107,7 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode
 		// Mask parameter
 		//$texte.= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("BarCodeModel").'):</td>';
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="value1" value="'.(!empty($conf->global->BARCODE_STANDARD_PRODUCT_MASK) ? $conf->global->BARCODE_STANDARD_PRODUCT_MASK : '').'"'.$disabled.'>', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="value1" value="'.(!empty($conf->global->BARCODE_STANDARD_PRODUCT_MASK) ? $conf->global->BARCODE_STANDARD_PRODUCT_MASK : '').'"'.$disabled.'>', $tooltip, 1, 1).'</td>';
 		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"'.$disabled.'></td>';
 		$texte .= '</tr>';
 
diff --git a/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php b/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php
index 20ce1373b66..30d93aedfa0 100644
--- a/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php
+++ b/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php
@@ -151,7 +151,7 @@ class doc_generic_bom_odt extends ModelePDFBom
 		$texte .= $conf->global->BOM_ADDON_PDF_ODT_PATH;
 		$texte .= '</textarea>';
 		$texte .= '</div><div style="display: inline-block; vertical-align: middle;">';
-		$texte .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button">';
+		$texte .= '<input type="submit" class="button small" value="'.$langs->trans("Modify").'" name="Button">';
 		$texte .= '<br></div></div>';
 
 		// Scan directories
diff --git a/htdocs/core/modules/bom/mod_bom_advanced.php b/htdocs/core/modules/bom/mod_bom_advanced.php
index 71bd2788c82..d590c3ff70c 100644
--- a/htdocs/core/modules/bom/mod_bom_advanced.php
+++ b/htdocs/core/modules/bom/mod_bom_advanced.php
@@ -79,7 +79,7 @@ class mod_bom_advanced extends ModeleNumRefboms
 
 		// Parametrage du prefix
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskBom" value="'.$conf->global->BOM_ADVANCED_MASK.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskBom" value="'.$conf->global->BOM_ADVANCED_MASK.'">', $tooltip, 1, 1).'</td>';
 
 		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
 
diff --git a/htdocs/core/modules/cheque/mod_chequereceipt_thyme.php b/htdocs/core/modules/cheque/mod_chequereceipt_thyme.php
index 36a2b30e6e0..16e0f666774 100644
--- a/htdocs/core/modules/cheque/mod_chequereceipt_thyme.php
+++ b/htdocs/core/modules/cheque/mod_chequereceipt_thyme.php
@@ -73,7 +73,7 @@ class mod_chequereceipt_thyme extends ModeleNumRefChequeReceipts
 
 		// Parametrage du prefix
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskchequereceipts" value="'.$conf->global->CHEQUERECEIPTS_THYME_MASK.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskchequereceipts" value="'.$conf->global->CHEQUERECEIPTS_THYME_MASK.'">', $tooltip, 1, 1).'</td>';
 
 		$texte .= '<td class="left" rowspan="2">&nbsp;<input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
 
diff --git a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
index 33b31135caf..603394b9797 100644
--- a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
+++ b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
@@ -158,7 +158,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
 		$texte .= $conf->global->COMMANDE_ADDON_PDF_ODT_PATH;
 		$texte .= '</textarea>';
 		$texte .= '</div><div style="display: inline-block; vertical-align: middle;">';
-		$texte .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button">';
+		$texte .= '<input type="submit" class="button small" value="'.$langs->trans("Modify").'" name="Button">';
 		$texte .= '<br></div></div>';
 
 		// Scan directories
@@ -182,7 +182,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
 		// Add input to upload a new template file.
 		$texte .= '<div>'.$langs->trans("UploadNewTemplate").' <input type="file" name="uploadfile">';
 		$texte .= '<input type="hidden" value="COMMANDE_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
-		$texte .= '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
+		$texte .= '<input type="submit" class="button small" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
 		$texte .= '</div>';
 
 		$texte .= '</td>';
diff --git a/htdocs/core/modules/commande/mod_commande_saphir.php b/htdocs/core/modules/commande/mod_commande_saphir.php
index 4099686c1b6..8b4ccdfaba7 100644
--- a/htdocs/core/modules/commande/mod_commande_saphir.php
+++ b/htdocs/core/modules/commande/mod_commande_saphir.php
@@ -79,7 +79,7 @@ class mod_commande_saphir extends ModeleNumRefCommandes
 
 		// Parametrage du prefix
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskorder" value="'.$conf->global->COMMANDE_SAPHIR_MASK.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskorder" value="'.$conf->global->COMMANDE_SAPHIR_MASK.'">', $tooltip, 1, 1).'</td>';
 
 		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
 
diff --git a/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php b/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
index 7b451287ae1..2b3e2905907 100644
--- a/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
+++ b/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
@@ -157,7 +157,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 		$texte .= $conf->global->CONTRACT_ADDON_PDF_ODT_PATH;
 		$texte .= '</textarea>';
 		$texte .= '</div><div style="display: inline-block; vertical-align: middle;">';
-		$texte .= '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Modify")).'" name="Button">';
+		$texte .= '<input type="submit" class="button small" value="'.dol_escape_htmltag($langs->trans("Modify")).'" name="Button">';
 		$texte .= '<br></div></div>';
 
 		// Scan directories
@@ -168,7 +168,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 		// Add input to upload a new template file.
 		$texte .= '<div>'.$langs->trans("UploadNewTemplate").' <input type="file" name="uploadfile">';
 		$texte .= '<input type="hidden" value="CONTRACT_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
-		$texte .= '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
+		$texte .= '<input type="submit" class="button small" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
 		$texte .= '</div>';
 
 		$texte .= '</td>';
diff --git a/htdocs/core/modules/contract/mod_contract_magre.php b/htdocs/core/modules/contract/mod_contract_magre.php
index d696ac06fdd..dcaee5eadbc 100644
--- a/htdocs/core/modules/contract/mod_contract_magre.php
+++ b/htdocs/core/modules/contract/mod_contract_magre.php
@@ -85,7 +85,7 @@ class mod_contract_magre extends ModelNumRefContracts
 		$tooltip .= $langs->trans("GenericMaskCodes5");
 
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskcontract" value="'.$conf->global->CONTRACT_MAGRE_MASK.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskcontract" value="'.$conf->global->CONTRACT_MAGRE_MASK.'">', $tooltip, 1, 1).'</td>';
 		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
 		$texte .= '</tr>';
 		$texte .= '</table>';
diff --git a/htdocs/core/modules/delivery/mod_delivery_saphir.php b/htdocs/core/modules/delivery/mod_delivery_saphir.php
index af1900803c8..d5ac288b52a 100644
--- a/htdocs/core/modules/delivery/mod_delivery_saphir.php
+++ b/htdocs/core/modules/delivery/mod_delivery_saphir.php
@@ -83,7 +83,7 @@ class mod_delivery_saphir extends ModeleNumRefDeliveryOrder
 
 		// Parametrage du prefix
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskdelivery" value="'.$conf->global->DELIVERY_SAPHIR_MASK.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskdelivery" value="'.$conf->global->DELIVERY_SAPHIR_MASK.'">', $tooltip, 1, 1).'</td>';
 
 		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
 
diff --git a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
index 797530a6c13..163392ead88 100644
--- a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
+++ b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
@@ -182,7 +182,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 		// Add input to upload a new template file.
 		$texte .= '<div>'.$langs->trans("UploadNewTemplate").' <input type="file" name="uploadfile">';
 		$texte .= '<input type="hidden" value="EXPEDITION_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
-		$texte .= '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
+		$texte .= '<input type="submit" class="button small" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
 		$texte .= '</div>';
 		$texte .= '</td>';
 
diff --git a/htdocs/core/modules/expedition/mod_expedition_ribera.php b/htdocs/core/modules/expedition/mod_expedition_ribera.php
index 0303dfde3dc..79bbcbdb481 100644
--- a/htdocs/core/modules/expedition/mod_expedition_ribera.php
+++ b/htdocs/core/modules/expedition/mod_expedition_ribera.php
@@ -80,7 +80,7 @@ class mod_expedition_ribera extends ModelNumRefExpedition
 		$tooltip .= $langs->trans("GenericMaskCodes5");
 
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskexpedition" value="'.$conf->global->EXPEDITION_RIBERA_MASK.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskexpedition" value="'.$conf->global->EXPEDITION_RIBERA_MASK.'">', $tooltip, 1, 1).'</td>';
 		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
 		$texte .= '</tr>';
 		$texte .= '</table>';
diff --git a/htdocs/core/modules/expensereport/mod_expensereport_sand.php b/htdocs/core/modules/expensereport/mod_expensereport_sand.php
index 195667692f1..482b8c06431 100644
--- a/htdocs/core/modules/expensereport/mod_expensereport_sand.php
+++ b/htdocs/core/modules/expensereport/mod_expensereport_sand.php
@@ -82,7 +82,7 @@ class mod_expensereport_sand extends ModeleNumRefExpenseReport
 
 		// Parametrage du prefix
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskvalue" value="'.$conf->global->EXPENSEREPORT_SAND_MASK.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskvalue" value="'.$conf->global->EXPENSEREPORT_SAND_MASK.'">', $tooltip, 1, 1).'</td>';
 
 		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
 
diff --git a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
index eb48373a443..ffba0717332 100644
--- a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
+++ b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
@@ -158,7 +158,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 		$texte .= $conf->global->FACTURE_ADDON_PDF_ODT_PATH;
 		$texte .= '</textarea>';
 		$texte .= '</div><div style="display: inline-block; vertical-align: middle;">';
-		$texte .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button">';
+		$texte .= '<input type="submit" class="button small" value="'.$langs->trans("Modify").'" name="Button">';
 		$texte .= '<br></div></div>';
 
 		// Scan directories
@@ -181,7 +181,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 		// Add input to upload a new template file.
 		$texte .= '<div>'.$langs->trans("UploadNewTemplate").' <input type="file" name="uploadfile">';
 		$texte .= '<input type="hidden" value="FACTURE_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
-		$texte .= '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
+		$texte .= '<input type="submit" class="button small" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
 		$texte .= '</div>';
 		$texte .= '</td>';
 
diff --git a/htdocs/core/modules/facture/mod_facture_mercure.php b/htdocs/core/modules/facture/mod_facture_mercure.php
index 70fde36f549..32e06f285a9 100644
--- a/htdocs/core/modules/facture/mod_facture_mercure.php
+++ b/htdocs/core/modules/facture/mod_facture_mercure.php
@@ -76,7 +76,7 @@ class mod_facture_mercure extends ModeleNumRefFactures
 
 		// Setting the prefix
 		$texte .= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceStandard").'):</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskinvoice" value="'.$conf->global->FACTURE_MERCURE_MASK_INVOICE.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskinvoice" value="'.$conf->global->FACTURE_MERCURE_MASK_INVOICE.'">', $tooltip, 1, 1).'</td>';
 
 		$texte .= '<td class="left" rowspan="3">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
 
@@ -84,17 +84,17 @@ class mod_facture_mercure extends ModeleNumRefFactures
 
 		// Prefix setting of replacement invoices
 		$texte .= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceReplacement").'):</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskreplacement" value="'.$conf->global->FACTURE_MERCURE_MASK_REPLACEMENT.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskreplacement" value="'.$conf->global->FACTURE_MERCURE_MASK_REPLACEMENT.'">', $tooltip, 1, 1).'</td>';
 		$texte .= '</tr>';
 
 		// Prefix setting of credit note
 		$texte .= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceAvoir").'):</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskcredit" value="'.$conf->global->FACTURE_MERCURE_MASK_CREDIT.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskcredit" value="'.$conf->global->FACTURE_MERCURE_MASK_CREDIT.'">', $tooltip, 1, 1).'</td>';
 		$texte .= '</tr>';
 
 		// Prefix setting of deposit
 		$texte .= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceDeposit").'):</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskdeposit" value="'.$conf->global->FACTURE_MERCURE_MASK_DEPOSIT.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskdeposit" value="'.$conf->global->FACTURE_MERCURE_MASK_DEPOSIT.'">', $tooltip, 1, 1).'</td>';
 		$texte .= '</tr>';
 
 		$texte .= '</table>';
diff --git a/htdocs/core/modules/fichinter/mod_arctic.php b/htdocs/core/modules/fichinter/mod_arctic.php
index fa5dd49f0fa..91025817a9d 100644
--- a/htdocs/core/modules/fichinter/mod_arctic.php
+++ b/htdocs/core/modules/fichinter/mod_arctic.php
@@ -84,7 +84,7 @@ class mod_arctic extends ModeleNumRefFicheinter
 
 		// Setting the prefix
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskvalue" value="'.$conf->global->FICHINTER_ARTIC_MASK.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskvalue" value="'.$conf->global->FICHINTER_ARTIC_MASK.'">', $tooltip, 1, 1).'</td>';
 
 		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
 
diff --git a/htdocs/core/modules/holiday/mod_holiday_immaculate.php b/htdocs/core/modules/holiday/mod_holiday_immaculate.php
index b8cb33f550e..000c7881561 100644
--- a/htdocs/core/modules/holiday/mod_holiday_immaculate.php
+++ b/htdocs/core/modules/holiday/mod_holiday_immaculate.php
@@ -85,7 +85,7 @@ class mod_holiday_immaculate extends ModelNumRefHolidays
 		$tooltip .= $langs->trans("GenericMaskCodes5");
 
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskholiday" value="'.$conf->global->HOLIDAY_IMMACULATE_MASK.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskholiday" value="'.$conf->global->HOLIDAY_IMMACULATE_MASK.'">', $tooltip, 1, 1).'</td>';
 		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
 		$texte .= '</tr>';
 		$texte .= '</table>';
diff --git a/htdocs/core/modules/member/doc/doc_generic_member_odt.class.php b/htdocs/core/modules/member/doc/doc_generic_member_odt.class.php
index 5ff5a1f767a..9a14e96bc28 100644
--- a/htdocs/core/modules/member/doc/doc_generic_member_odt.class.php
+++ b/htdocs/core/modules/member/doc/doc_generic_member_odt.class.php
@@ -154,7 +154,7 @@ class doc_generic_member_odt extends ModelePDFMember
 		$texte .= $conf->global->MEMBER_ADDON_PDF_ODT_PATH;
 		$texte .= '</textarea>';
 		$texte .= '</div><div style="display: inline-block; vertical-align: middle;">';
-		$texte .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button">';
+		$texte .= '<input type="submit" class="button small" value="'.$langs->trans("Modify").'" name="Button">';
 		$texte .= '<br></div></div>';
 
 		// Scan directories
@@ -171,7 +171,7 @@ class doc_generic_member_odt extends ModelePDFMember
 		// Add input to upload a new template file.
 		$texte .= '<div>'.$langs->trans("UploadNewTemplate").' <input type="file" name="uploadfile">';
 		$texte .= '<input type="hidden" value="MEMBER_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
-		$texte .= '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
+		$texte .= '<input type="submit" class="button small" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
 		$texte .= '</div>';
 		$texte .= '</td>';
 
diff --git a/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php b/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
index 374ae5b4337..860e07d7d36 100644
--- a/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
+++ b/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
@@ -158,7 +158,7 @@ class doc_generic_mo_odt extends ModelePDFMo
 		$texte .= $conf->global->MRP_MO_ADDON_PDF_ODT_PATH;
 		$texte .= '</textarea>';
 		$texte .= '</div><div style="display: inline-block; vertical-align: middle;">';
-		$texte .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button">';
+		$texte .= '<input type="submit" class="button small" value="'.$langs->trans("Modify").'" name="Button">';
 		$texte .= '<br></div></div>';
 
 		// Scan directories
diff --git a/htdocs/core/modules/mrp/mod_mo_advanced.php b/htdocs/core/modules/mrp/mod_mo_advanced.php
index 3d70ded1ba2..14292f7f896 100644
--- a/htdocs/core/modules/mrp/mod_mo_advanced.php
+++ b/htdocs/core/modules/mrp/mod_mo_advanced.php
@@ -80,7 +80,7 @@ class mod_mo_advanced extends ModeleNumRefMos
 
 		// Parametrage du prefix
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskMo" value="'.$conf->global->MRP_MO_ADVANCED_MASK.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskMo" value="'.$conf->global->MRP_MO_ADVANCED_MASK.'">', $tooltip, 1, 1).'</td>';
 
 		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
 
diff --git a/htdocs/core/modules/payment/mod_payment_ant.php b/htdocs/core/modules/payment/mod_payment_ant.php
index 10926805721..dca32b26505 100644
--- a/htdocs/core/modules/payment/mod_payment_ant.php
+++ b/htdocs/core/modules/payment/mod_payment_ant.php
@@ -82,7 +82,7 @@ class mod_payment_ant extends ModeleNumRefPayments
 
 		// Parametrage du prefix
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskpayment" value="'.$conf->global->PAYMENT_ANT_MASK.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskpayment" value="'.$conf->global->PAYMENT_ANT_MASK.'">', $tooltip, 1, 1).'</td>';
 
 		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
 
diff --git a/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php b/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
index 19a752d5be7..d038acd7ee5 100644
--- a/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
+++ b/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
@@ -161,7 +161,7 @@ class doc_generic_product_odt extends ModelePDFProduct
 		$texte .= $conf->global->PRODUCT_ADDON_PDF_ODT_PATH;
 		$texte .= '</textarea>';
 		$texte .= '</div><div style="display: inline-block; vertical-align: middle;">';
-		$texte .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button">';
+		$texte .= '<input type="submit" class="button small" value="'.$langs->trans("Modify").'" name="Button">';
 		$texte .= '<br></div></div>';
 
 		// Scan directories
diff --git a/htdocs/core/modules/product/mod_codeproduct_elephant.php b/htdocs/core/modules/product/mod_codeproduct_elephant.php
index 0a302c0fb6b..5936476e079 100644
--- a/htdocs/core/modules/product/mod_codeproduct_elephant.php
+++ b/htdocs/core/modules/product/mod_codeproduct_elephant.php
@@ -116,7 +116,7 @@ class mod_codeproduct_elephant extends ModeleProductCode
 
 		// Parametrage du prefix customers
 		$texte .= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("ProductCodeModel").'):</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="value1" value="'.(!empty($conf->global->PRODUCT_ELEPHANT_MASK_PRODUCT) ? $conf->global->PRODUCT_ELEPHANT_MASK_PRODUCT : '').'"'.$disabled.'>', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="value1" value="'.(!empty($conf->global->PRODUCT_ELEPHANT_MASK_PRODUCT) ? $conf->global->PRODUCT_ELEPHANT_MASK_PRODUCT : '').'"'.$disabled.'>', $tooltip, 1, 1).'</td>';
 
 		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"'.$disabled.'></td>';
 
@@ -124,7 +124,7 @@ class mod_codeproduct_elephant extends ModeleProductCode
 
 		// Parametrage du prefix suppliers
 		$texte .= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("ServiceCodeModel").'):</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="value2" value="'.(!empty($conf->global->PRODUCT_ELEPHANT_MASK_SERVICE) ? $conf->global->PRODUCT_ELEPHANT_MASK_SERVICE : '').'"'.$disabled.'>', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="value2" value="'.(!empty($conf->global->PRODUCT_ELEPHANT_MASK_SERVICE) ? $conf->global->PRODUCT_ELEPHANT_MASK_SERVICE : '').'"'.$disabled.'>', $tooltip, 1, 1).'</td>';
 		$texte .= '</tr>';
 
 		$texte .= '</table>';
diff --git a/htdocs/core/modules/product_batch/mod_lot_advanced.php b/htdocs/core/modules/product_batch/mod_lot_advanced.php
index c580d8915c9..0bbb124d14b 100644
--- a/htdocs/core/modules/product_batch/mod_lot_advanced.php
+++ b/htdocs/core/modules/product_batch/mod_lot_advanced.php
@@ -80,7 +80,7 @@ class mod_lot_advanced extends ModeleNumRefBatch
 
 		// Parametrage du prefix
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskLot" value="'.$conf->global->LOT_ADVANCED_MASK.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskLot" value="'.$conf->global->LOT_ADVANCED_MASK.'">', $tooltip, 1, 1).'</td>';
 
 		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
 
diff --git a/htdocs/core/modules/product_batch/mod_sn_advanced.php b/htdocs/core/modules/product_batch/mod_sn_advanced.php
index 74f36a55fe6..8117b9e6c6e 100644
--- a/htdocs/core/modules/product_batch/mod_sn_advanced.php
+++ b/htdocs/core/modules/product_batch/mod_sn_advanced.php
@@ -80,7 +80,7 @@ class mod_sn_advanced extends ModeleNumRefBatch
 
 		// Parametrage du prefix
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskSN" value="'.$conf->global->SN_ADVANCED_MASK.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskSN" value="'.$conf->global->SN_ADVANCED_MASK.'">', $tooltip, 1, 1).'</td>';
 
 		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
 
diff --git a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
index da95e841728..c085f1eeaac 100644
--- a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
+++ b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
@@ -449,7 +449,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 		$texte .= $conf->global->PROJECT_ADDON_PDF_ODT_PATH;
 		$texte .= '</textarea>';
 		$texte .= '</div><div style="display: inline-block; vertical-align: middle;">';
-		$texte .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button">';
+		$texte .= '<input type="submit" class="button small" value="'.$langs->trans("Modify").'" name="Button">';
 		$texte .= '<br></div></div>';
 
 		// Scan directories
diff --git a/htdocs/core/modules/project/mod_project_universal.php b/htdocs/core/modules/project/mod_project_universal.php
index 3ab4079c1b7..480d19396c3 100644
--- a/htdocs/core/modules/project/mod_project_universal.php
+++ b/htdocs/core/modules/project/mod_project_universal.php
@@ -83,7 +83,7 @@ class mod_project_universal extends ModeleNumRefProjects
 
 		// Parametrage du prefix
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskproject" value="'.$conf->global->PROJECT_UNIVERSAL_MASK.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskproject" value="'.$conf->global->PROJECT_UNIVERSAL_MASK.'">', $tooltip, 1, 1).'</td>';
 
 		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
 
diff --git a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
index 0662e1a5a76..a04e2e9c14a 100644
--- a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
+++ b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
@@ -416,7 +416,7 @@ class doc_generic_task_odt extends ModelePDFTask
 		$texte .= $conf->global->PROJECT_TASK_ADDON_PDF_ODT_PATH;
 		$texte .= '</textarea>';
 		$texte .= '</div><div style="display: inline-block; vertical-align: middle;">';
-		$texte .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button">';
+		$texte .= '<input type="submit" class="button small" value="'.$langs->trans("Modify").'" name="Button">';
 		$texte .= '<br></div></div>';
 
 		// Scan directories
diff --git a/htdocs/core/modules/project/task/mod_task_universal.php b/htdocs/core/modules/project/task/mod_task_universal.php
index 011ac381254..3a6ef89f3fb 100644
--- a/htdocs/core/modules/project/task/mod_task_universal.php
+++ b/htdocs/core/modules/project/task/mod_task_universal.php
@@ -83,7 +83,7 @@ class mod_task_universal extends ModeleNumRefTask
 
 		// Parametrage du prefix
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="masktask" value="'.$conf->global->PROJECT_TASK_UNIVERSAL_MASK.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="masktask" value="'.$conf->global->PROJECT_TASK_UNIVERSAL_MASK.'">', $tooltip, 1, 1).'</td>';
 
 		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
 
diff --git a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
index 4a292d4a97b..e7eade5de02 100644
--- a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
+++ b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
@@ -160,7 +160,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 		$texte .= $conf->global->PROPALE_ADDON_PDF_ODT_PATH;
 		$texte .= '</textarea>';
 		$texte .= '</div><div style="display: inline-block; vertical-align: middle;">';
-		$texte .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button">';
+		$texte .= '<input type="submit" class="button small" value="'.$langs->trans("Modify").'" name="Button">';
 		$texte .= '<br></div></div>';
 
 		// Scan directories
@@ -209,7 +209,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 		// Add input to upload a new template file.
 		$texte .= '<div>'.$langs->trans("UploadNewTemplate").' <input type="file" name="uploadfile">';
 		$texte .= '<input type="hidden" value="PROPALE_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
-		$texte .= '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
+		$texte .= '<input type="submit" class="button small" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
 		$texte .= '</div>';
 		$texte .= '</td>';
 
diff --git a/htdocs/core/modules/propale/mod_propale_saphir.php b/htdocs/core/modules/propale/mod_propale_saphir.php
index 5fb7eeaa6fb..ce78f341319 100644
--- a/htdocs/core/modules/propale/mod_propale_saphir.php
+++ b/htdocs/core/modules/propale/mod_propale_saphir.php
@@ -85,7 +85,7 @@ class mod_propale_saphir extends ModeleNumRefPropales
 
 		// Parametrage du prefix
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskpropal" value="'.$conf->global->PROPALE_SAPHIR_MASK.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskpropal" value="'.$conf->global->PROPALE_SAPHIR_MASK.'">', $tooltip, 1, 1).'</td>';
 
 		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
 
diff --git a/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php b/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php
index 13a05b3378d..d70ecca00ad 100644
--- a/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php
+++ b/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php
@@ -153,7 +153,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 		$texte .= $conf->global->RECEPTION_ADDON_PDF_ODT_PATH;
 		$texte .= '</textarea>';
 		$texte .= '</div><div style="display: inline-block; vertical-align: middle;">';
-		$texte .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button">';
+		$texte .= '<input type="submit" class="button small" value="'.$langs->trans("Modify").'" name="Button">';
 		$texte .= '<br></div></div>';
 
 		// Scan directories
diff --git a/htdocs/core/modules/reception/mod_reception_moonstone.php b/htdocs/core/modules/reception/mod_reception_moonstone.php
index bcab451ab9e..0d0ced20eb4 100644
--- a/htdocs/core/modules/reception/mod_reception_moonstone.php
+++ b/htdocs/core/modules/reception/mod_reception_moonstone.php
@@ -61,7 +61,7 @@ class mod_reception_moonstone extends ModelNumRefReception
 		$tooltip .= $langs->trans("GenericMaskCodes5");
 
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskreception" value="'.$conf->global->RECEPTION_MOONSTONE_MASK.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskreception" value="'.$conf->global->RECEPTION_MOONSTONE_MASK.'">', $tooltip, 1, 1).'</td>';
 		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
 		$texte .= '</tr>';
 		$texte .= '</table>';
diff --git a/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
index 1822a5b8c95..9045ed0b281 100644
--- a/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
+++ b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
@@ -141,7 +141,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 		$texte .= '</textarea>';
 		$texte .= '</td>';
 		$texte .= '<td class="center">&nbsp; ';
-		$texte .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button">';
+		$texte .= '<input type="submit" class="button small" value="'.$langs->trans("Modify").'" name="Button">';
 		$texte .= '</td>';
 		$texte .= '</tr>';
 		$texte .= '</table>';
@@ -167,7 +167,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 		// Add input to upload a new template file.
 		$texte .= '<div>'.$langs->trans("UploadNewTemplate").' <input type="file" name="uploadfile">';
 		$texte .= '<input type="hidden" value="COMPANY_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
-		$texte .= '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
+		$texte .= '<input type="submit" class="button small" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
 		$texte .= '</div>';
 		$texte .= '</td>';
 
diff --git a/htdocs/core/modules/societe/mod_codeclient_elephant.php b/htdocs/core/modules/societe/mod_codeclient_elephant.php
index 9ddf77abe44..705564e7e8e 100644
--- a/htdocs/core/modules/societe/mod_codeclient_elephant.php
+++ b/htdocs/core/modules/societe/mod_codeclient_elephant.php
@@ -132,7 +132,7 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
 
 		// Parametrage du prefix customers
 		$texte .= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("CustomerCodeModel").'):</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="value1" value="'.$conf->global->COMPANY_ELEPHANT_MASK_CUSTOMER.'"'.$disabled.'>', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="value1" value="'.$conf->global->COMPANY_ELEPHANT_MASK_CUSTOMER.'"'.$disabled.'>', $tooltip, 1, 1).'</td>';
 
 		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"'.$disabled.'></td>';
 
@@ -140,7 +140,7 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
 
 		// Parametrage du prefix suppliers
 		$texte .= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("SupplierCodeModel").'):</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="value2" value="'.$conf->global->COMPANY_ELEPHANT_MASK_SUPPLIER.'"'.$disabled.'>', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="value2" value="'.$conf->global->COMPANY_ELEPHANT_MASK_SUPPLIER.'"'.$disabled.'>', $tooltip, 1, 1).'</td>';
 		$texte .= '</tr>';
 
 		$texte .= '</table>';
diff --git a/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php b/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
index 2819adea021..e2d474d2dd2 100644
--- a/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
+++ b/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
@@ -155,7 +155,7 @@ class doc_generic_stock_odt extends ModelePDFStock
 		$texte .= $conf->global->STOCK_ADDON_PDF_ODT_PATH;
 		$texte .= '</textarea>';
 		$texte .= '</div><div style="display: inline-block; vertical-align: middle;">';
-		$texte .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button">';
+		$texte .= '<input type="submit" class="button small" value="'.$langs->trans("Modify").'" name="Button">';
 		$texte .= '<br></div></div>';
 
 		// Scan directories
@@ -179,7 +179,7 @@ class doc_generic_stock_odt extends ModelePDFStock
 		// Add input to upload a new template file.
 		$texte .= '<div>'.$langs->trans("UploadNewTemplate").' <input type="file" name="uploadfile">';
 		$texte .= '<input type="hidden" value="STOCK_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
-		$texte .= '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
+		$texte .= '<input type="submit" class="button small" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
 		$texte .= '</div>';
 
 		$texte .= '</td>';
diff --git a/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php b/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
index 3cf0a4a209e..57d5798c29e 100644
--- a/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
+++ b/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
@@ -93,7 +93,7 @@ class mod_facture_fournisseur_tulip extends ModeleNumRefSuppliersInvoices
 		// Setting the prefix
 		$texte .= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceStandard").')';
 		$texte .= ':</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskinvoice" value="'.$conf->global->SUPPLIER_INVOICE_TULIP_MASK.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskinvoice" value="'.$conf->global->SUPPLIER_INVOICE_TULIP_MASK.'">', $tooltip, 1, 1).'</td>';
 
 		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
 
@@ -101,19 +101,19 @@ class mod_facture_fournisseur_tulip extends ModeleNumRefSuppliersInvoices
 
 		// Prefix setting of credit note
 		$texte .= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceAvoir").'):</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskcredit" value="'.$conf->global->SUPPLIER_CREDIT_TULIP_MASK.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskcredit" value="'.$conf->global->SUPPLIER_CREDIT_TULIP_MASK.'">', $tooltip, 1, 1).'</td>';
 		$texte .= '</tr>';
 
 		if ($conf->global->MAIN_FEATURE_LEVEL >= 2) {
 			// Parametrage du prefix des replacement
 			$texte .= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceReplacement").'):</td>';
-			$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskreplacement" value="'.$conf->global->SUPPLIER_REPLACEMENT_TULIP_MASK.'">', $tooltip, 1, 1).'</td>';
+			$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskreplacement" value="'.$conf->global->SUPPLIER_REPLACEMENT_TULIP_MASK.'">', $tooltip, 1, 1).'</td>';
 			$texte .= '</tr>';
 		}
 
 		// Prefix setting of deposit
 		$texte .= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceDeposit").'):</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskdeposit" value="'.$conf->global->SUPPLIER_DEPOSIT_TULIP_MASK.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskdeposit" value="'.$conf->global->SUPPLIER_DEPOSIT_TULIP_MASK.'">', $tooltip, 1, 1).'</td>';
 		$texte .= '</tr>';
 
 		$texte .= '</table>';
diff --git a/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php b/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
index 9e9799f44c6..b7fd399edef 100644
--- a/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
@@ -159,7 +159,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 		$texte .= $conf->global->SUPPLIER_ORDER_ADDON_PDF_ODT_PATH;
 		$texte .= '</textarea>';
 		$texte .= '</div><div style="display: inline-block; vertical-align: middle;">';
-		$texte .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button">';
+		$texte .= '<input type="submit" class="button small" value="'.$langs->trans("Modify").'" name="Button">';
 		$texte .= '<br></div></div>';
 
 		// Scan directories
diff --git a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php
index a609eeade08..c691b1448ef 100644
--- a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php
+++ b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php
@@ -85,7 +85,7 @@ class mod_commande_fournisseur_orchidee extends ModeleNumRefSuppliersOrders
 
 		// Parametrage du prefix
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskorder" value="'.$conf->global->COMMANDE_FOURNISSEUR_ORCHIDEE_MASK.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskorder" value="'.$conf->global->COMMANDE_FOURNISSEUR_ORCHIDEE_MASK.'">', $tooltip, 1, 1).'</td>';
 
 		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
 
diff --git a/htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php b/htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php
index 8f3b7ad36df..19e632a6264 100644
--- a/htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php
+++ b/htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php
@@ -82,7 +82,7 @@ class mod_supplier_payment_brodator extends ModeleNumRefSupplierPayments
 
 		// Parametrage du prefix
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="masksupplierpayment" value="'.$conf->global->SUPPLIER_PAYMENT_BRODATOR_MASK.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="masksupplierpayment" value="'.$conf->global->SUPPLIER_PAYMENT_BRODATOR_MASK.'">', $tooltip, 1, 1).'</td>';
 
 		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
 
diff --git a/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php b/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
index 4b761f8099b..7e300c68643 100644
--- a/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
@@ -162,7 +162,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 		$texte .= $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_PATH;
 		$texte .= '</textarea>';
 		$texte .= '</div><div style="display: inline-block; vertical-align: middle;">';
-		$texte .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button">';
+		$texte .= '<input type="submit" class="button small" value="'.$langs->trans("Modify").'" name="Button">';
 		$texte .= '<br></div></div>';
 
 		// Scan directories
diff --git a/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php
index adf53aed4e6..3b8754d9928 100644
--- a/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php
+++ b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php
@@ -85,7 +85,7 @@ class mod_supplier_proposal_saphir extends ModeleNumRefSupplierProposal
 
 		// Parametrage du prefix
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="masksupplier_proposal" value="'.$conf->global->SUPPLIER_PROPOSAL_SAPHIR_MASK.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="masksupplier_proposal" value="'.$conf->global->SUPPLIER_PROPOSAL_SAPHIR_MASK.'">', $tooltip, 1, 1).'</td>';
 
 		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
 
diff --git a/htdocs/core/modules/takepos/mod_takepos_ref_universal.php b/htdocs/core/modules/takepos/mod_takepos_ref_universal.php
index e6487db6ed1..d103dbe3b0b 100644
--- a/htdocs/core/modules/takepos/mod_takepos_ref_universal.php
+++ b/htdocs/core/modules/takepos/mod_takepos_ref_universal.php
@@ -79,7 +79,7 @@ class mod_takepos_ref_universal extends ModeleNumRefTakepos
 
 		// Parametrage du prefix
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte .= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskvalue" value="'.$conf->global->TAKEPOS_REF_UNIVERSAL_MASK.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskvalue" value="'.$conf->global->TAKEPOS_REF_UNIVERSAL_MASK.'">', $tooltip, 1, 1).'</td>';
 
 		$texte .= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
 
diff --git a/htdocs/core/modules/ticket/doc/doc_generic_ticket_odt.modules.php b/htdocs/core/modules/ticket/doc/doc_generic_ticket_odt.modules.php
index eb90baef7e5..d1d3763fb2e 100644
--- a/htdocs/core/modules/ticket/doc/doc_generic_ticket_odt.modules.php
+++ b/htdocs/core/modules/ticket/doc/doc_generic_ticket_odt.modules.php
@@ -150,7 +150,7 @@ class doc_generic_ticket_odt extends ModelePDFTicket
 		$texte .= $conf->global->TICKET_ADDON_PDF_ODT_PATH;
 		$texte .= '</textarea>';
 		$texte .= '</div><div style="display: inline-block; vertical-align: middle;">';
-		$texte .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button">';
+		$texte .= '<input type="submit" class="button small" value="'.$langs->trans("Modify").'" name="Button">';
 		$texte .= '<br></div></div>';
 
 		// Scan directories
@@ -167,7 +167,7 @@ class doc_generic_ticket_odt extends ModelePDFTicket
 		// Add input to upload a new template file.
 		$texte .= '<div>'.$langs->trans("UploadNewTemplate").' <input type="file" name="uploadfile">';
 		$texte .= '<input type="hidden" value="TICKET_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
-		$texte .= '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
+		$texte .= '<input type="submit" class="button small" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
 		$texte .= '</div>';
 
 		$texte .= '</td>';
diff --git a/htdocs/core/modules/ticket/mod_ticket_universal.php b/htdocs/core/modules/ticket/mod_ticket_universal.php
index 1a528359221..f60b1f16481 100644
--- a/htdocs/core/modules/ticket/mod_ticket_universal.php
+++ b/htdocs/core/modules/ticket/mod_ticket_universal.php
@@ -81,7 +81,7 @@ class mod_ticket_universal extends ModeleNumRefTicket
 
 		// Parametrage du prefix
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskticket" value="'.$conf->global->TICKET_UNIVERSAL_MASK.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskticket" value="'.$conf->global->TICKET_UNIVERSAL_MASK.'">', $tooltip, 1, 1).'</td>';
 
 		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
 
diff --git a/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php b/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
index fb24e2782c9..035a99fe744 100644
--- a/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
+++ b/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
@@ -159,7 +159,7 @@ class doc_generic_user_odt extends ModelePDFUser
 		$texte .= $conf->global->USER_ADDON_PDF_ODT_PATH;
 		$texte .= '</textarea>';
 		$texte .= '</div><div style="display: inline-block; vertical-align: middle;">';
-		$texte .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button">';
+		$texte .= '<input type="submit" class="button small" value="'.$langs->trans("Modify").'" name="Button">';
 		$texte .= '<br></div></div>';
 
 		// Scan directories
@@ -199,7 +199,7 @@ class doc_generic_user_odt extends ModelePDFUser
 		// Add input to upload a new template file.
 		$texte .= '<div>'.$langs->trans("UploadNewTemplate").' <input type="file" name="uploadfile">';
 		$texte .= '<input type="hidden" value="USER_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
-		$texte .= '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
+		$texte .= '<input type="submit" class="button small" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
 		$texte .= '</div>';
 
 		$texte .= '</td>';
diff --git a/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php b/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
index 45a9469753e..04d9957458b 100644
--- a/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
+++ b/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
@@ -162,7 +162,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 		$texte .= $conf->global->USERGROUP_ADDON_PDF_ODT_PATH;
 		$texte .= '</textarea>';
 		$texte .= '</div><div style="display: inline-block; vertical-align: middle;">';
-		$texte .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button">';
+		$texte .= '<input type="submit" class="button small" value="'.$langs->trans("Modify").'" name="Button">';
 		$texte .= '<br></div></div>';
 
 		// Scan directories
diff --git a/htdocs/core/modules/workstation/mod_workstation_advanced.php b/htdocs/core/modules/workstation/mod_workstation_advanced.php
index 4e23219581c..bf783542c75 100755
--- a/htdocs/core/modules/workstation/mod_workstation_advanced.php
+++ b/htdocs/core/modules/workstation/mod_workstation_advanced.php
@@ -80,7 +80,7 @@ class mod_workstation_advanced extends ModeleNumRefWorkstation
 
 		// Parametrage du prefix
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskWorkstation" value="'.$conf->global->WORKSTATION_WORKSTATION_ADVANCED_MASK.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskWorkstation" value="'.$conf->global->WORKSTATION_WORKSTATION_ADVANCED_MASK.'">', $tooltip, 1, 1).'</td>';
 
 		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
 
diff --git a/htdocs/ftp/admin/ftpclient.php b/htdocs/ftp/admin/ftpclient.php
index 12ee32a496f..cd24a3a881a 100644
--- a/htdocs/ftp/admin/ftpclient.php
+++ b/htdocs/ftp/admin/ftpclient.php
@@ -190,13 +190,13 @@ if (!function_exists('ftp_connect')) {
 
 	print '<tr class="impair">';
 	print '<td>'.$langs->trans("User").'</td>';
-	print '<td><input type="text" name="FTP_USER_'.($lastftpentry + 1).'" value="'.GETPOST("FTP_USER_".($lastftpentry + 1)).'" size="24"></td>';
+	print '<td><input type="text" name="FTP_USER_'.($lastftpentry + 1).'" value="'.GETPOST("FTP_USER_".($lastftpentry + 1)).'" class="minwidth175"></td>';
 	print '<td>myftplogin</td>';
 	print '</tr>';
 
 	print '<tr class="pair">';
 	print '<td>'.$langs->trans("Password").'</td>';
-	print '<td><input type="password" name="FTP_PASSWORD_'.($lastftpentry + 1).'" value="'.GETPOST("FTP_PASSWORD_".($lastftpentry + 1)).'" size="24"></td>';
+	print '<td><input type="password" name="FTP_PASSWORD_'.($lastftpentry + 1).'" value="'.GETPOST("FTP_PASSWORD_".($lastftpentry + 1)).'" class="minwidth175"></td>';
 	print '<td>myftppassword</td>';
 	print '</tr>';
 
diff --git a/htdocs/knowledgemanagement/core/modules/knowledgemanagement/mod_knowledgerecord_advanced.php b/htdocs/knowledgemanagement/core/modules/knowledgemanagement/mod_knowledgerecord_advanced.php
index 14c3b334ee1..48efbfbc8eb 100644
--- a/htdocs/knowledgemanagement/core/modules/knowledgemanagement/mod_knowledgerecord_advanced.php
+++ b/htdocs/knowledgemanagement/core/modules/knowledgemanagement/mod_knowledgerecord_advanced.php
@@ -79,7 +79,7 @@ class mod_knowledgerecord_advanced extends ModeleNumRefKnowledgeRecord
 
 		// Parametrage du prefix
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskKnowledgeRecord" value="'.$conf->global->KNOWLEDGEMANAGEMENT_KNOWLEDGERECORD_ADVANCED_MASK.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskKnowledgeRecord" value="'.$conf->global->KNOWLEDGEMANAGEMENT_KNOWLEDGERECORD_ADVANCED_MASK.'">', $tooltip, 1, 1).'</td>';
 
 		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
 
diff --git a/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php b/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
index 3e389c1757f..d64c80c9355 100644
--- a/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
+++ b/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
@@ -157,7 +157,7 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 		$texte .= $conf->global->MYMODULE_MYOBJECT_ADDON_PDF_ODT_PATH;
 		$texte .= '</textarea>';
 		$texte .= '</div><div style="display: inline-block; vertical-align: middle;">';
-		$texte .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button">';
+		$texte .= '<input type="submit" class="button small" value="'.$langs->trans("Modify").'" name="Button">';
 		$texte .= '<br></div></div>';
 
 		// Scan directories
diff --git a/htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php b/htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
index 9c685e65d9a..72b46b96416 100644
--- a/htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
+++ b/htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
@@ -79,7 +79,7 @@ class mod_myobject_advanced extends ModeleNumRefMyObject
 
 		// Parametrage du prefix
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskMyObject" value="'.$conf->global->MYMODULE_MYOBJECT_ADVANCED_MASK.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskMyObject" value="'.$conf->global->MYMODULE_MYOBJECT_ADVANCED_MASK.'">', $tooltip, 1, 1).'</td>';
 
 		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
 
diff --git a/htdocs/opensurvey/results.php b/htdocs/opensurvey/results.php
index 1c7a98739d7..ff5198c006a 100644
--- a/htdocs/opensurvey/results.php
+++ b/htdocs/opensurvey/results.php
@@ -1007,7 +1007,7 @@ if (empty($testligneamodifier)) {
 	print '<tr>'."\n";
 	print '<td></td>'."\n";
 	print '<td class="nom">'."\n";
-	print '<input type="text" placeholder="'.dol_escape_htmltag($langs->trans("Name")).'" name="nom" maxlength="64" size="24">'."\n";
+	print '<input type="text" placeholder="'.dol_escape_htmltag($langs->trans("Name")).'" name="nom" maxlength="64">'."\n";
 	print '</td>'."\n";
 
 	for ($i = 0; $i < $nbcolonnes; $i++) {
diff --git a/htdocs/partnership/core/modules/partnership/mod_partnership_advanced.php b/htdocs/partnership/core/modules/partnership/mod_partnership_advanced.php
index 0b293d19a35..a536bb59600 100644
--- a/htdocs/partnership/core/modules/partnership/mod_partnership_advanced.php
+++ b/htdocs/partnership/core/modules/partnership/mod_partnership_advanced.php
@@ -79,7 +79,7 @@ class mod_partnership_advanced extends ModeleNumRefPartnership
 
 		// Parametrage du prefix
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskPartnership" value="'.$conf->global->PARTNERSHIP_ADVANCED_MASK.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskPartnership" value="'.$conf->global->PARTNERSHIP_ADVANCED_MASK.'">', $tooltip, 1, 1).'</td>';
 
 		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
 
diff --git a/htdocs/product/admin/dynamic_prices.php b/htdocs/product/admin/dynamic_prices.php
index fdd42bd34d7..d90ea7090f7 100644
--- a/htdocs/product/admin/dynamic_prices.php
+++ b/htdocs/product/admin/dynamic_prices.php
@@ -213,17 +213,17 @@ if ($action == 'create_variable' || $action == 'edit_variable') {
 	//Code
 	print '<tr>';
 	print '<td class="fieldrequired">'.$langs->trans("Variable").'</td>';
-	print '<td class="valeur"><input type="text" name="code" size="20" value="'.(empty($price_globals->code) ? '' : $price_globals->code).'"></td>';
+	print '<td class="valeur"><input type="text" name="code" class="minwidth100" value="'.(empty($price_globals->code) ? '' : $price_globals->code).'"></td>';
 	print '</tr>';
 	//Description
 	print '<tr>';
 	print '<td>'.$langs->trans("Description").'</td>';
-	print '<td class="valeur"><input type="text" name="description" size="50" value="'.(empty($price_globals->description) ? '' : $price_globals->description).'"></td>';
+	print '<td class="valeur"><input type="text" name="description" class="minwidth200" value="'.(empty($price_globals->description) ? '' : $price_globals->description).'"></td>';
 	print '</tr>';
 	//Value
 	print '<tr>';
 	print '<td class="fieldrequired">'.$langs->trans("Value").'</td>';
-	print '<td class="valeur"><input type="text" name="value" size="10" value="'.(empty($price_globals->value) ? '' : $price_globals->value).'"></td>';
+	print '<td class="valeur"><input type="text" name="value" class="minwidth100" value="'.(empty($price_globals->value) ? '' : $price_globals->value).'"></td>';
 	print '</tr>';
 	print '</table>';
 
@@ -310,7 +310,7 @@ if ($action == 'create_updater' || $action == 'edit_updater') {
 	//Description
 	print '<tr>';
 	print '<td>'.$langs->trans("Description").'</td>';
-	print '<td class="valeur"><input type="text" name="description" size="50" value="'.(empty($price_updaters->description) ? '' : $price_updaters->description).'"></td>';
+	print '<td class="valeur"><input type="text" name="description" class="minwidth200" value="'.(empty($price_updaters->description) ? '' : $price_updaters->description).'"></td>';
 	print '</tr>';
 	//Type
 	print '<tr>';
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index c3c91b40537..170853b9c2b 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1117,7 +1117,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 					$inherited_mask_lot = $conf->global->LOT_ADVANCED_MASK;
 					$inherited_mask_sn = $conf->global->SN_ADVANCED_MASK;
 					print '<td id="field_mask">';
-					print $form->textwithpicto('<input type="text" class="flat" size="24" name="batch_mask" id="batch_mask_input">', $tooltip, 1, 1);
+					print $form->textwithpicto('<input type="text" class="flat minwidth175" name="batch_mask" id="batch_mask_input">', $tooltip, 1, 1);
 					print '<script type="text/javascript">
 								$(document).ready(function() {
 									$("#field_mask, #mask_option").addClass("hideobject");
@@ -1628,7 +1628,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 						$inherited_mask_lot = $conf->global->LOT_ADVANCED_MASK;
 						$inherited_mask_sn = $conf->global->SN_ADVANCED_MASK;
 						print '<td id="field_mask">';
-						print $form->textwithpicto('<input type="text" class="flat" size="24" name="batch_mask" id="batch_mask_input" value="'.$mask.'">', $tooltip, 1, 1);
+						print $form->textwithpicto('<input type="text" class="flat minwidth175" name="batch_mask" id="batch_mask_input" value="'.$mask.'">', $tooltip, 1, 1);
 
 						print '<script type="text/javascript">
 						$(document).ready(function() {
diff --git a/htdocs/public/opensurvey/studs.php b/htdocs/public/opensurvey/studs.php
index 5f5446ae3f1..8b6da7e0b75 100644
--- a/htdocs/public/opensurvey/studs.php
+++ b/htdocs/public/opensurvey/studs.php
@@ -609,7 +609,7 @@ if ($ligneamodifier < 0 && (!isset($_SESSION['nom']))) {
 	if (isset($_SESSION['nom'])) {
 		print '<input type=hidden name="nom" value="'.$_SESSION['nom'].'">'.$_SESSION['nom']."\n";
 	} else {
-		print '<input type="text" name="nom" placeholder="'.dol_escape_htmltag($langs->trans("Name")).'" maxlength="64" size="24">'."\n";
+		print '<input type="text" name="nom" placeholder="'.dol_escape_htmltag($langs->trans("Name")).'" maxlength="64" class=" minwidth175">'."\n";
 	}
 	print '</td>'."\n";
 
diff --git a/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php b/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php
index 054443a5be5..47867e40c5f 100644
--- a/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php
+++ b/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php
@@ -157,7 +157,7 @@ class doc_generic_recruitmentjobposition_odt extends ModelePDFRecruitmentJobPosi
 		$texte .= $conf->global->RECRUITMENT_RECRUITMENTJOBPOSITION_ADDON_PDF_ODT_PATH;
 		$texte .= '</textarea>';
 		$texte .= '</div><div style="display: inline-block; vertical-align: middle;">';
-		$texte .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button">';
+		$texte .= '<input type="submit" class="button small" value="'.$langs->trans("Modify").'" name="Button">';
 		$texte .= '<br></div></div>';
 
 		// Scan directories
diff --git a/htdocs/recruitment/core/modules/recruitment/mod_recruitmentjobposition_advanced.php b/htdocs/recruitment/core/modules/recruitment/mod_recruitmentjobposition_advanced.php
index 311eb7e1b36..35f5616da68 100644
--- a/htdocs/recruitment/core/modules/recruitment/mod_recruitmentjobposition_advanced.php
+++ b/htdocs/recruitment/core/modules/recruitment/mod_recruitmentjobposition_advanced.php
@@ -79,7 +79,7 @@ class mod_recruitmentjobposition_advanced extends ModeleNumRefRecruitmentJobPosi
 
 		// Parametrage du prefix
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskRecruitmentJobPosition" value="'.$conf->global->RECRUITMENT_RECRUITMENTJOBPOSITION_ADVANCED_MASK.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskRecruitmentJobPosition" value="'.$conf->global->RECRUITMENT_RECRUITMENTJOBPOSITION_ADVANCED_MASK.'">', $tooltip, 1, 1).'</td>';
 
 		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
 
diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index 96a5ad0c120..f2edf617ff5 100644
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -726,7 +726,7 @@ if ($action == 'create' || $action == 'presend') {
 
 	// Subject
 	print '<tr><td><label for="subject"><span class="fieldrequired">'.$langs->trans("Subject").'</span></label></td><td>';
-	print '<input class="text" size="50" id="subject" name="subject" value="'.dol_escape_htmltag(GETPOSTISSET('subject') ? GETPOST('subject', 'alpha') : $object->subject).'" />';
+	print '<input class="text minwidth200" id="subject" name="subject" value="'.dol_escape_htmltag(GETPOSTISSET('subject') ? GETPOST('subject', 'alpha') : $object->subject).'" />';
 	print '</td></tr>';
 
 	// Other attributes

From bb48da988bc324b542d9ca848888883a6015c55f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 13 Jun 2021 01:32:14 +0200
Subject: [PATCH 0586/1497] css

---
 htdocs/admin/bom.php                          | 10 ++++++-
 htdocs/partnership/admin/about.php            | 29 +------------------
 .../admin/partnership_extrafields.php         | 28 +-----------------
 htdocs/partnership/admin/setup.php            |  6 +---
 4 files changed, 12 insertions(+), 61 deletions(-)

diff --git a/htdocs/admin/bom.php b/htdocs/admin/bom.php
index 528f2f6b29f..c401c6cabf1 100644
--- a/htdocs/admin/bom.php
+++ b/htdocs/admin/bom.php
@@ -179,6 +179,7 @@ print dol_get_fiche_head($head, 'settings', $langs->trans("BOMs"), -1, 'bom');
 
 print load_fiche_titre($langs->trans("BOMsNumberingModules"), '', '');
 
+print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Name").'</td>';
@@ -272,7 +273,9 @@ foreach ($dirmodels as $reldir) {
 		}
 	}
 }
-print "</table><br>\n";
+print "</table>";
+print "</div>";
+print "<br>\n";
 
 
 /*
@@ -301,6 +304,7 @@ if ($resql) {
 }
 
 
+print '<div class="div-table-responsive-no-min">';
 print "<table class=\"noborder\" width=\"100%\">\n";
 print "<tr class=\"liste_titre\">\n";
 print '<td>'.$langs->trans("Name").'</td>';
@@ -414,6 +418,7 @@ foreach ($dirmodels as $reldir) {
 }
 
 print '</table>';
+print '</div>';
 print "<br>";
 
 /*
@@ -421,6 +426,8 @@ print "<br>";
  */
 
 print load_fiche_titre($langs->trans("OtherOptions"), '', '');
+
+print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Parameter").'</td>';
@@ -469,6 +476,7 @@ print "</td></tr>\n";
 print '</form>';
 
 print '</table>';
+print '</div>';
 print '<br>';
 
 
diff --git a/htdocs/partnership/admin/about.php b/htdocs/partnership/admin/about.php
index 0d3fb11c4e3..47423bf4709 100644
--- a/htdocs/partnership/admin/about.php
+++ b/htdocs/partnership/admin/about.php
@@ -23,34 +23,7 @@
  */
 
 // Load Dolibarr environment
-$res = 0;
-// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
-if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
-	$res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
-}
-// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
-$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
-while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) {
-	$i--; $j--;
-}
-if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) {
-	$res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
-}
-if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) {
-	$res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
-}
-// Try main.inc.php using relative path
-if (!$res && file_exists("../../main.inc.php")) {
-	$res = @include "../../main.inc.php";
-}
-if (!$res && file_exists("../../../main.inc.php")) {
-	$res = @include "../../../main.inc.php";
-}
-if (!$res) {
-	die("Include of main fails");
-}
-
-// Libraries
+require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once '../lib/partnership.lib.php';
diff --git a/htdocs/partnership/admin/partnership_extrafields.php b/htdocs/partnership/admin/partnership_extrafields.php
index f178bc893cd..573f3f1cbba 100644
--- a/htdocs/partnership/admin/partnership_extrafields.php
+++ b/htdocs/partnership/admin/partnership_extrafields.php
@@ -27,33 +27,7 @@
  */
 
 // Load Dolibarr environment
-$res = 0;
-// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
-if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
-	$res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
-}
-// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
-$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
-while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) {
-	$i--; $j--;
-}
-if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) {
-	$res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
-}
-if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) {
-	$res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
-}
-// Try main.inc.php using relative path
-if (!$res && file_exists("../../main.inc.php")) {
-	$res = @include "../../main.inc.php";
-}
-if (!$res && file_exists("../../../main.inc.php")) {
-	$res = @include "../../../main.inc.php";
-}
-if (!$res) {
-	die("Include of main fails");
-}
-
+require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 require_once '../lib/partnership.lib.php';
 
diff --git a/htdocs/partnership/admin/setup.php b/htdocs/partnership/admin/setup.php
index 6a46daf51f4..4005be154a1 100644
--- a/htdocs/partnership/admin/setup.php
+++ b/htdocs/partnership/admin/setup.php
@@ -23,11 +23,7 @@
  */
 
 // Load Dolibarr environment
-require '../main.inc.php';
-
-global $langs, $user;
-
-// Libraries
+require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
 require_once '../lib/partnership.lib.php';
 //require_once "../class/myclass.class.php";

From 11959ec1abd6d241d94c04aeaeae54f637c23b25 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sun, 13 Jun 2021 06:07:01 +0200
Subject: [PATCH 0587/1497] Fix some date problems

---
 htdocs/accountancy/bookkeeping/list.php       | 84 ++++++++++++++++---
 .../accountancy/bookkeeping/listbyaccount.php |  2 +-
 2 files changed, 74 insertions(+), 12 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index cd44e3598e3..9df70350922 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -44,17 +44,47 @@ $action = GETPOST('action', 'aZ09');
 $search_mvt_num = GETPOST('search_mvt_num', 'int');
 $search_doc_type = GETPOST("search_doc_type", 'alpha');
 $search_doc_ref = GETPOST("search_doc_ref", 'alpha');
-$search_date_start = dol_mktime(0, 0, 0, GETPOST('search_date_startmonth', 'int'), GETPOST('search_date_startday', 'int'), GETPOST('search_date_startyear', 'int'));
-$search_date_end = dol_mktime(23, 59, 59, GETPOST('search_date_endmonth', 'int'), GETPOST('search_date_endday', 'int'), GETPOST('search_date_endyear', 'int'));
+$search_date_startyear =  GETPOST('search_date_startyear', 'int');
+$search_date_startmonth =  GETPOST('search_date_startmonth', 'int');
+$search_date_startday =  GETPOST('search_date_startday', 'int');
+$search_date_endyear =  GETPOST('search_date_endyear', 'int');
+$search_date_endmonth =  GETPOST('search_date_endmonth', 'int');
+$search_date_endday =  GETPOST('search_date_endday', 'int');
+$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);
+$search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
 $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(23, 59, 59, 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(23, 59, 59, GETPOST('date_modification_endmonth', 'int'), GETPOST('date_modification_endday', 'int'), GETPOST('date_modification_endyear', 'int'));
-$search_date_export_start = dol_mktime(0, 0, 0, GETPOST('date_export_startmonth', 'int'), GETPOST('date_export_startday', 'int'), GETPOST('date_export_startyear', 'int'));
-$search_date_export_end = dol_mktime(0, 0, 0, GETPOST('date_export_endmonth', 'int'), GETPOST('date_export_endday', 'int'), GETPOST('date_export_endyear', 'int'));
-$search_date_validation_start = dol_mktime(0, 0, 0, GETPOST('date_validation_startmonth', 'int'), GETPOST('date_validation_startday', 'int'), GETPOST('date_validation_startyear', 'int'));
-$search_date_validation_end = dol_mktime(0, 0, 0, GETPOST('date_validation_endmonth', 'int'), GETPOST('date_validation_endday', 'int'), GETPOST('date_validation_endyear', 'int'));
+$search_date_creation_startyear =  GETPOST('search_date_creation_startyear', 'int');
+$search_date_creation_startmonth =  GETPOST('search_date_creation_startmonth', 'int');
+$search_date_creation_startday =  GETPOST('search_date_creation_startday', 'int');
+$search_date_creation_endyear =  GETPOST('search_date_creation_endyear', 'int');
+$search_date_creation_endmonth =  GETPOST('search_date_creation_endmonth', 'int');
+$search_date_creation_endday =  GETPOST('search_date_creation_endday', 'int');
+$search_date_creation_start = dol_mktime(0, 0, 0, $search_date_creation_startmonth, $search_date_creation_startday, $search_date_creation_startyear);
+$search_date_creation_end = dol_mktime(23, 59, 59, $search_date_creation_endmonth, $search_date_creation_endday, $search_date_creation_endyear);
+$search_date_modification_startyear =  GETPOST('search_date_modification_startyear', 'int');
+$search_date_modification_startmonth =  GETPOST('search_date_modification_startmonth', 'int');
+$search_date_modification_startday =  GETPOST('search_date_modification_startday', 'int');
+$search_date_modification_endyear =  GETPOST('search_date_modification_endyear', 'int');
+$search_date_modification_endmonth =  GETPOST('search_date_modification_endmonth', 'int');
+$search_date_modification_endday =  GETPOST('search_date_modification_endday', 'int');
+$search_date_modification_start = dol_mktime(0, 0, 0, $search_date_modification_startmonth, $search_date_modification_startday, $search_date_modification_startyear);
+$search_date_modification_end = dol_mktime(23, 59, 59, $search_date_modification_endmonth, $search_date_modification_endday, $search_date_modification_endyear);
+$search_date_export_startyear =  GETPOST('search_date_export_startyear', 'int');
+$search_date_export_startmonth =  GETPOST('search_date_export_startmonth', 'int');
+$search_date_export_startday =  GETPOST('search_date_export_startday', 'int');
+$search_date_export_endyear =  GETPOST('search_date_export_endyear', 'int');
+$search_date_export_endmonth =  GETPOST('search_date_export_endmonth', 'int');
+$search_date_export_endday =  GETPOST('search_date_export_endday', 'int');
+$search_date_export_start = dol_mktime(0, 0, 0, $search_date_export_startmonth, $search_date_export_startday, $search_date_export_startyear);
+$search_date_export_end = dol_mktime(23, 59, 59, $search_date_export_endmonth, $search_date_export_endday, $search_date_export_endyear);
+$search_date_validation_startyear =  GETPOST('search_date_validation_startyear', 'int');
+$search_date_validation_startmonth =  GETPOST('search_date_validation_startmonth', 'int');
+$search_date_validation_startday =  GETPOST('search_date_validation_startday', 'int');
+$search_date_validation_endyear =  GETPOST('search_date_validation_endyear', 'int');
+$search_date_validation_endmonth =  GETPOST('search_date_validation_endmonth', 'int');
+$search_date_validation_endday =  GETPOST('search_date_validation_endday', 'int');
+$search_date_validation_start = dol_mktime(0, 0, 0, $search_date_validation_startmonth, $search_date_validation_startday, $search_date_validation_startyear);
+$search_date_validation_end = dol_mktime(23, 59, 59, $search_date_validation_endmonth, $search_date_validation_endday, $search_date_validation_endyear);
 
 //var_dump($search_date_start);exit;
 if (GETPOST("button_delmvt_x") || GETPOST("button_delmvt.x") || GETPOST("button_delmvt")) {
@@ -219,14 +249,44 @@ if (empty($reshook)) {
 		$search_mvt_label = '';
 		$search_direction = '';
 		$search_ledger_code = array();
+		$search_date_startyear = '';
+		$search_date_startmonth = '';
+		$search_date_startday = '';
+		$search_date_endyear = '';
+		$search_date_endmonth = '';
+		$search_date_endday = '';
 		$search_date_start = '';
 		$search_date_end = '';
+		$search_date_creation_startyear = '';
+		$search_date_creation_startmonth = '';
+		$search_date_creation_startday = '';
+		$search_date_creation_endyear = '';
+		$search_date_creation_endmonth = '';
+		$search_date_creation_endday = '';
 		$search_date_creation_start = '';
 		$search_date_creation_end = '';
+		$search_date_modification_startyear = '';
+		$search_date_modification_startmonth = '';
+		$search_date_modification_startday = '';
+		$search_date_modification_endyear = '';
+		$search_date_modification_endmonth = '';
+		$search_date_modification_endday = '';
 		$search_date_modification_start = '';
 		$search_date_modification_end = '';
+		$search_date_export_startyear = '';
+		$search_date_export_startmonth = '';
+		$search_date_export_startday = '';
+		$search_date_export_endyear = '';
+		$search_date_export_endmonth = '';
+		$search_date_export_endday = '';
 		$search_date_export_start = '';
 		$search_date_export_end = '';
+		$search_date_validation_startyear = '';
+		$search_date_validation_startmonth = '';
+		$search_date_validation_startday = '';
+		$search_date_validation_endyear = '';
+		$search_date_validation_endmonth = '';
+		$search_date_validation_endday = '';
 		$search_date_validation_start = '';
 		$search_date_validation_end = '';
 		$search_debit = '';
@@ -699,6 +759,8 @@ print '<input type="hidden" name="formfilteraction" id="formfilteraction" value=
 print '<input type="hidden" name="sortfield" value="'.urlencode($sortfield).'">';
 print '<input type="hidden" name="sortorder" value="'.urlencode($sortorder).'">';
 
+$massactionbutton = '';
+
 if (count($filter)) {
 	$buttonLabel = $langs->trans("ExportFilteredList");
 } else {
@@ -731,7 +793,7 @@ if (empty($reshook)) {
 	$newcardbutton .= dolGetButtonTitle($langs->trans('NewAccountingMvt'), '', 'fa fa-plus-circle paddingleft', $url, '', $user->rights->accounting->mouvements->creer);
 }
 
-print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_accountancy', 0, $newcardbutton, '', $limit, 0, 0, 1);
+print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_accountancy', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index 406664938cc..c47e4ca0e27 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -55,7 +55,7 @@ $search_date_export_endyear =  GETPOST('search_date_export_endyear', 'int');
 $search_date_export_endmonth =  GETPOST('search_date_export_endmonth', 'int');
 $search_date_export_endday =  GETPOST('search_date_export_endday', 'int');
 $search_date_export_start = dol_mktime(0, 0, 0, $search_date_export_startmonth, $search_date_export_startday, $search_date_export_startyear);
-$search_date_export_end = dol_mktime(0, 0, 0, $search_date_export_endmonth, $search_date_export_endday, $search_date_export_endyear);
+$search_date_export_end = dol_mktime(23, 59, 59, $search_date_export_endmonth, $search_date_export_endday, $search_date_export_endyear);
 
 $search_accountancy_code = GETPOST("search_accountancy_code");
 $search_accountancy_code_start = GETPOST('search_accountancy_code_start', 'alpha');

From cf723d512067887c8d3a1531952fe38ff62cd0ac Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sun, 13 Jun 2021 06:37:44 +0200
Subject: [PATCH 0588/1497] Look a feel v14 CSS Amount

---
 htdocs/accountancy/bookkeeping/balance.php    | 30 +++++++++----------
 htdocs/accountancy/bookkeeping/card.php       |  4 +--
 htdocs/accountancy/bookkeeping/list.php       |  4 +--
 .../accountancy/bookkeeping/listbyaccount.php |  4 +--
 .../bookkeeping/listbysubaccount.php          |  4 +--
 .../thirdparty_lettering_customer.php         |  6 ++--
 .../thirdparty_lettering_supplier.php         |  6 ++--
 htdocs/accountancy/customer/index.php         | 20 ++++++-------
 htdocs/accountancy/customer/lines.php         |  2 +-
 htdocs/accountancy/customer/list.php          |  2 +-
 htdocs/accountancy/expensereport/index.php    | 16 +++++-----
 htdocs/accountancy/expensereport/lines.php    |  2 +-
 htdocs/accountancy/expensereport/list.php     |  2 +-
 htdocs/accountancy/journal/bankjournal.php    | 12 ++++----
 .../journal/expensereportsjournal.php         | 12 ++++----
 .../accountancy/journal/purchasesjournal.php  | 16 +++++-----
 htdocs/accountancy/journal/sellsjournal.php   | 12 ++++----
 htdocs/accountancy/supplier/index.php         | 16 +++++-----
 htdocs/accountancy/supplier/lines.php         |  2 +-
 htdocs/accountancy/supplier/list.php          |  2 +-
 20 files changed, 87 insertions(+), 87 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index a35333020cd..7d6d71d49a8 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -401,14 +401,14 @@ if ($action != 'export_csv') {
 					print '<tr class="liste_total">';
 					print '<td class="right">'.$langs->trans("SubTotal").':</td>';
 					if (!empty($conf->global->ACCOUNTANCY_SHOW_OPENING_BALANCE)) {
-						print '<td class="nowrap right">'.price($sous_total_opening_balance).'</td>';
+						print '<td class="right nowraponall amount">'.price($sous_total_opening_balance).'</td>';
 					}
-					print '<td class="nowrap right">'.price($sous_total_debit).'</td>';
-					print '<td class="nowrap right">'.price($sous_total_credit).'</td>';
+					print '<td class="right nowraponall amount">'.price($sous_total_debit).'</td>';
+					print '<td class="right nowraponall amount">'.price($sous_total_credit).'</td>';
 					if (!empty($conf->global->ACCOUNTANCY_SHOW_OPENING_BALANCE)) {
-						print '<td class="nowrap right">'.price(price2num($sous_total_opening_balance + $sous_total_debit - $sous_total_credit)).'</td>';
+						print '<td class="right nowraponall amount">'.price(price2num($sous_total_opening_balance + $sous_total_debit - $sous_total_credit)).'</td>';
 					} else {
-						print '<td class="nowrap right">'.price(price2num($sous_total_debit - $sous_total_credit)).'</td>';
+						print '<td class="right nowraponall amount">'.price(price2num($sous_total_debit - $sous_total_credit)).'</td>';
 					}
 					print "<td></td>\n";
 					print '</tr>';
@@ -443,14 +443,14 @@ if ($action != 'export_csv') {
 			}
 		}
 		// Debit
-		print '<td class="nowraponall right"><a href="'.$urlzoom.'">'.price($line->debit).'</a></td>';
+		print '<td class="right nowraponall amount"><a href="'.$urlzoom.'">'.price($line->debit).'</a></td>';
 		// Credit
-		print '<td class="nowraponall right"><a href="'.$urlzoom.'">'.price($line->credit).'</a></td>';
+		print '<td class="right nowraponall amount"><a href="'.$urlzoom.'">'.price($line->credit).'</a></td>';
 
 		if (!empty($conf->global->ACCOUNTANCY_SHOW_OPENING_BALANCE)) {
-			print '<td class="nowraponall right">'.price(price2num($opening_balance + $line->debit - $line->credit, 'MT')).'</td>';
+			print '<td class="right nowraponall amount">'.price(price2num($opening_balance + $line->debit - $line->credit, 'MT')).'</td>';
 		} else {
-			print '<td class="nowraponall right">'.price(price2num($line->debit - $line->credit, 'MT')).'</td>';
+			print '<td class="right nowraponall amount">'.price(price2num($line->debit - $line->credit, 'MT')).'</td>';
 		}
 		print '<td class="center">';
 		print $link;
@@ -468,12 +468,12 @@ if ($action != 'export_csv') {
 		if (!empty($conf->global->ACCOUNTANCY_SHOW_OPENING_BALANCE)) {
 			print '<td class="nowrap right">'.price($sous_total_opening_balance).'</td>';
 		}
-		print '<td class="nowrap right">'.price($sous_total_debit).'</td>';
-		print '<td class="nowrap right">'.price($sous_total_credit).'</td>';
+		print '<td class="right nowraponall amount">'.price($sous_total_debit).'</td>';
+		print '<td class="right nowraponall amount">'.price($sous_total_credit).'</td>';
 		if (!empty($conf->global->ACCOUNTANCY_SHOW_OPENING_BALANCE)) {
-			print '<td class="nowrap right">' . price(price2num($sous_total_opening_balance + $sous_total_debit - $sous_total_credit, 'MT')) . '</td>';
+			print '<td class="right nowraponall amount">' . price(price2num($sous_total_opening_balance + $sous_total_debit - $sous_total_credit, 'MT')) . '</td>';
 		} else {
-			print '<td class="nowrap right">' . price(price2num($sous_total_debit - $sous_total_credit, 'MT')) . '</td>';
+			print '<td class="right nowraponall amount">' . price(price2num($sous_total_debit - $sous_total_credit, 'MT')) . '</td>';
 		}
 		print "<td></td>\n";
 		print '</tr>';
@@ -483,8 +483,8 @@ if ($action != 'export_csv') {
 	if (!empty($conf->global->ACCOUNTANCY_SHOW_OPENING_BALANCE)) {
 		print '<td class="nowrap right">'.price($total_opening_balance).'</td>';
 	}
-	print '<td class="nowrap right">'.price($total_debit).'</td>';
-	print '<td class="nowrap right">'.price($total_credit).'</td>';
+	print '<td class="right nowraponall amount">'.price($total_debit).'</td>';
+	print '<td class="right nowraponall amount">'.price($total_credit).'</td>';
 	if (!empty($conf->global->ACCOUNTANCY_SHOW_OPENING_BALANCE)) {
 		print '<td class="nowrap right">' . price(price2num($total_opening_balance + $total_debit - $total_credit, 'MT')) . '</td>';
 	} else {
diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index 81b6f98570e..4c7194b2255 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -680,8 +680,8 @@ if ($action == 'create') {
 						}
 						print '</td>';
 						print '<td>'.$line->label_operation.'</td>';
-						print '<td class="nowrap right">'.price($line->debit).'</td>';
-						print '<td class="nowrap right">'.price($line->credit).'</td>';
+						print '<td class="right nowraponall amount">'.price($line->debit).'</td>';
+						print '<td class="right nowraponall amount">'.price($line->credit).'</td>';
 
 						if (empty($line->date_export) || empty($line->date_validation)) {
 							print '<td class="center">';
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 9df70350922..a70bb710937 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -1174,7 +1174,7 @@ while ($i < min($num, $limit)) {
 
 	// Amount debit
 	if (!empty($arrayfields['t.debit']['checked'])) {
-		print '<td class="nowrap right">'.($line->debit != 0 ? price($line->debit) : '').'</td>';
+		print '<td class="right nowraponall amount">'.($line->debit != 0 ? price($line->debit) : '').'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
@@ -1186,7 +1186,7 @@ while ($i < min($num, $limit)) {
 
 	// Amount credit
 	if (!empty($arrayfields['t.credit']['checked'])) {
-		print '<td class="nowrap right">'.($line->credit != 0 ? price($line->credit) : '').'</td>';
+		print '<td class="right nowraponall amount">'.($line->credit != 0 ? price($line->credit) : '').'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index c47e4ca0e27..98c3f14191b 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -807,7 +807,7 @@ while ($i < min($num, $limit)) {
 
 	// Amount debit
 	if (!empty($arrayfields['t.debit']['checked'])) {
-		print '<td class="nowrap right">'.($line->debit ? price($line->debit) : '').'</td>';
+		print '<td class="right nowraponall amount">'.($line->debit ? price($line->debit) : '').'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
@@ -819,7 +819,7 @@ while ($i < min($num, $limit)) {
 
 	// Amount credit
 	if (!empty($arrayfields['t.credit']['checked'])) {
-		print '<td class="nowrap right">'.($line->credit ? price($line->credit) : '').'</td>';
+		print '<td class="right nowraponall amount">'.($line->credit ? price($line->credit) : '').'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
diff --git a/htdocs/accountancy/bookkeeping/listbysubaccount.php b/htdocs/accountancy/bookkeeping/listbysubaccount.php
index 43d4acf343f..20899c693c6 100644
--- a/htdocs/accountancy/bookkeeping/listbysubaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbysubaccount.php
@@ -821,7 +821,7 @@ while ($i < min($num, $limit)) {
 
 	// Amount debit
 	if (!empty($arrayfields['t.debit']['checked'])) {
-		print '<td class="nowrap right">'.($line->debit ? price($line->debit) : '').'</td>';
+		print '<td class="right nowraponall amount">'.($line->debit ? price($line->debit) : '').'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
@@ -833,7 +833,7 @@ while ($i < min($num, $limit)) {
 
 	// Amount credit
 	if (!empty($arrayfields['t.credit']['checked'])) {
-		print '<td class="nowrap right">'.($line->credit ? price($line->credit) : '').'</td>';
+		print '<td class="right nowraponall amount">'.($line->credit ? price($line->credit) : '').'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
diff --git a/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php b/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
index 8669cae7c2f..29a0171fe08 100644
--- a/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
+++ b/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
@@ -296,15 +296,15 @@ if ($resql) {
 
 	print '<tr class="oddeven">';
 	print '<td class="right" colspan="3">'.$langs->trans("Total").':</td>'."\n";
-	print '<td class="nowrap right"><strong>'.price($debit).'</strong></td>';
-	print '<td class="nowrap right"><strong>'.price($credit).'</strong></td>';
+	print '<td class="right nowraponall amount"><strong>'.price($debit).'</strong></td>';
+	print '<td class="right nowraponall amount"><strong>'.price($credit).'</strong></td>';
 	print '<td colspan="4"></td>';
 	print "</tr>\n";
 
 	print '<tr class="oddeven">';
 	print '<td class="right" colspan="3">'.$langs->trans("Balancing").':</td>'."\n";
 	print '<td colspan="2">&nbsp;</td>';
-	print '<td class="nowrap right"><strong>'.price($credit - $debit).'</strong></td>';
+	print '<td class="right nowraponall amount"><strong>'.price($credit - $debit).'</strong></td>';
 	print '<td colspan="6"></td>';
 	print "</tr>\n";
 
diff --git a/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php b/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
index a73f711e15a..d62a1e9fc25 100644
--- a/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
+++ b/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
@@ -293,15 +293,15 @@ if ($resql) {
 
 	print '<tr class="oddeven">';
 	print '<td class="right" colspan="3">'.$langs->trans("Total").':</td>'."\n";
-	print '<td class="nowrap right"><strong>'.price($debit).'</strong></td>';
-	print '<td class="nowrap right"><strong>'.price($credit).'</strong></td>';
+	print '<td class="right nowraponall amount"><strong>'.price($debit).'</strong></td>';
+	print '<td class="right nowraponall amount"><strong>'.price($credit).'</strong></td>';
 	print '<td colspan="6"></td>';
 	print "</tr>\n";
 
 	print '<tr class="oddeven">';
 	print '<td class="right" colspan="3">'.$langs->trans("Balancing").':</td>'."\n";
 	print '<td colspan="2">&nbsp;</td>';
-	print '<td class="nowrap right"><strong>'.price($credit - $debit).'</strong></td>';
+	print '<td class="right nowraponall amount"><strong>'.price($credit - $debit).'</strong></td>';
 	print '<td colspan="4"></td>';
 	print "</tr>\n";
 
diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php
index 9580e8bca37..16dea74108e 100644
--- a/htdocs/accountancy/customer/index.php
+++ b/htdocs/accountancy/customer/index.php
@@ -319,10 +319,10 @@ if ($resql) {
 		}
 		print '</td>';
 		for ($i = 2; $i <= 12; $i++) {
-			print '<td class="nowrap right">'.price($row[$i]).'</td>';
+			print '<td class="right nowraponall amount">'.price($row[$i]).'</td>';
 		}
-		print '<td class="nowrap right">'.price($row[13]).'</td>';
-		print '<td class="nowrap right"><b>'.price($row[14]).'</b></td>';
+		print '<td class="right nowraponall amount">'.price($row[13]).'</td>';
+		print '<td class="right nowraponall amount"><b>'.price($row[14]).'</b></td>';
 		print '</tr>';
 	}
 	$db->free($resql);
@@ -405,10 +405,10 @@ if ($resql) {
 		print '</td>';
 
 		for ($i = 2; $i <= 12; $i++) {
-			print '<td class="nowrap right">'.price($row[$i]).'</td>';
+			print '<td class="right nowraponall amount">'.price($row[$i]).'</td>';
 		}
-		print '<td class="nowrap right">'.price($row[13]).'</td>';
-		print '<td class="nowrap right"><b>'.price($row[14]).'</b></td>';
+		print '<td class="right nowraponall amount">'.price($row[13]).'</td>';
+		print '<td class="right nowraponall amount"><b>'.price($row[14]).'</b></td>';
 		print '</tr>';
 	}
 	$db->free($resql);
@@ -472,9 +472,9 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) { // This part of code looks strange
 		while ($row = $db->fetch_row($resql)) {
 			print '<tr><td>'.$row[0].'</td>';
 			for ($i = 1; $i <= 12; $i++) {
-				print '<td class="nowrap right">'.price($row[$i]).'</td>';
+				print '<td class="right nowraponall amount">'.price($row[$i]).'</td>';
 			}
-			print '<td class="nowrap right"><b>'.price($row[13]).'</b></td>';
+			print '<td class="right nowraponall amount"><b>'.price($row[13]).'</b></td>';
 			print '</tr>';
 		}
 		$db->free($resql);
@@ -533,9 +533,9 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) { // This part of code looks strange
 			while ($row = $db->fetch_row($resql)) {
 				print '<tr><td>'.$row[0].'</td>';
 				for ($i = 1; $i <= 12; $i++) {
-					print '<td class="nowrap right">'.price(price2num($row[$i])).'</td>';
+					print '<td class="right nowraponall amount">'.price(price2num($row[$i])).'</td>';
 				}
-				print '<td class="nowrap right"><b>'.price(price2num($row[13])).'</b></td>';
+				print '<td class="right nowraponall amount"><b>'.price(price2num($row[13])).'</b></td>';
 				print '</tr>';
 			}
 			$db->free($resql);
diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php
index 1e6fb660c62..884de9dd232 100644
--- a/htdocs/accountancy/customer/lines.php
+++ b/htdocs/accountancy/customer/lines.php
@@ -492,7 +492,7 @@ if ($result) {
 		print $form->textwithtooltip(dol_trunc($text, $trunclength), $objp->description);
 		print '</td>';
 
-		print '<td class="nowrap right">'.price($objp->total_ht).'</td>';
+		print '<td class="right nowraponall amount">'.price($objp->total_ht).'</td>';
 
 		print '<td class="right">'.vatrate($objp->tva_tx.($objp->vat_src_code ? ' ('.$objp->vat_src_code.')' : '')).'</td>';
 
diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index 4df8d6b9b15..347f5b8c4c2 100644
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -687,7 +687,7 @@ if ($result) {
 		print $form->textwithtooltip(dol_trunc($text, $trunclength), $objp->description);
 		print '</td>';
 
-		print '<td class="nowrap right">';
+		print '<td class="right nowraponall amount">';
 		print price($objp->total_ht);
 		print '</td>';
 
diff --git a/htdocs/accountancy/expensereport/index.php b/htdocs/accountancy/expensereport/index.php
index baeefa1bbfb..f06dd5f8d6f 100644
--- a/htdocs/accountancy/expensereport/index.php
+++ b/htdocs/accountancy/expensereport/index.php
@@ -210,10 +210,10 @@ if ($resql) {
 		}
 		print '</td>';
 		for ($i = 2; $i <= 12; $i++) {
-			print '<td class="nowrap right">'.price($row[$i]).'</td>';
+			print '<td class="right nowraponall amount">'.price($row[$i]).'</td>';
 		}
-		print '<td class="nowrap right">'.price($row[13]).'</td>';
-		print '<td class="nowrap right"><b>'.price($row[14]).'</b></td>';
+		print '<td class="right nowraponall amount">'.price($row[13]).'</td>';
+		print '<td class="right nowraponall amount"><b>'.price($row[14]).'</b></td>';
 		print '</tr>';
 	}
 	$db->free($resql);
@@ -290,10 +290,10 @@ if ($resql) {
 		}
 		print '</td>';
 		for ($i = 2; $i <= 12; $i++) {
-			print '<td class="nowrap right">'.price($row[$i]).'</td>';
+			print '<td class="right nowraponall amount">'.price($row[$i]).'</td>';
 		}
-		print '<td class="nowrap right">'.price($row[13]).'</td>';
-		print '<td class="nowrap right"><b>'.price($row[14]).'</b></td>';
+		print '<td class="right nowraponall amount">'.price($row[13]).'</td>';
+		print '<td class="right nowraponall amount"><b>'.price($row[14]).'</b></td>';
 		print '</tr>';
 	}
 	$db->free($resql);
@@ -352,9 +352,9 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) { // This part of code looks strange
 		while ($row = $db->fetch_row($resql)) {
 			print '<tr><td>'.$row[0].'</td>';
 			for ($i = 1; $i <= 12; $i++) {
-				print '<td class="nowrap right">'.price($row[$i]).'</td>';
+				print '<td class="right nowraponall amount">'.price($row[$i]).'</td>';
 			}
-			print '<td class="nowrap right"><b>'.price($row[13]).'</b></td>';
+			print '<td class="right nowraponall amount"><b>'.price($row[13]).'</b></td>';
 			print '</tr>';
 		}
 
diff --git a/htdocs/accountancy/expensereport/lines.php b/htdocs/accountancy/expensereport/lines.php
index df50eaaff87..b262f85367a 100644
--- a/htdocs/accountancy/expensereport/lines.php
+++ b/htdocs/accountancy/expensereport/lines.php
@@ -388,7 +388,7 @@ if ($result) {
 		print '</td>';
 
 		// Amount without taxes
-		print '<td class="nowrap right">'.price($objp->total_ht).'</td>';
+		print '<td class="right nowraponall amount">'.price($objp->total_ht).'</td>';
 
 		// Vat rate
 		print '<td class="center">'.vatrate($objp->tva_tx.($objp->vat_src_code ? ' ('.$objp->vat_src_code.')' : '')).'</td>';
diff --git a/htdocs/accountancy/expensereport/list.php b/htdocs/accountancy/expensereport/list.php
index 810f65c68df..d69e78fead2 100644
--- a/htdocs/accountancy/expensereport/list.php
+++ b/htdocs/accountancy/expensereport/list.php
@@ -434,7 +434,7 @@ if ($result) {
 		print '</td>';
 
 		// Amount without taxes
-		print '<td class="nowrap right">';
+		print '<td class="right nowraponall amount">';
 		print price($objp->price);
 		print '</td>';
 
diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index 32670b15575..34e533974fc 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -1108,8 +1108,8 @@ if (empty($action) || $action == 'view') {
 				print $reflabel;
 				print "</td>";
 				print '<td class="center">'.$val["type_payment"]."</td>";
-				print '<td class="right nowraponall">'.($mt >= 0 ? price($mt) : '')."</td>";
-				print '<td class="right nowraponall">'.($mt < 0 ? price(-$mt) : '')."</td>";
+				print '<td class="right nowraponall amount">'.($mt >= 0 ? price($mt) : '')."</td>";
+				print '<td class="right nowraponall amount">'.($mt < 0 ? price(-$mt) : '')."</td>";
 				print "</tr>";
 			}
 		}
@@ -1222,8 +1222,8 @@ if (empty($action) || $action == 'view') {
 					print "</td>";
 					print "<td>".$reflabel."</td>";
 					print '<td class="center">'.$val["type_payment"]."</td>";
-					print '<td class="right nowraponall">'.($mt < 0 ? price(-$mt) : '')."</td>";
-					print '<td class="right nowraponall">'.($mt >= 0 ? price($mt) : '')."</td>";
+					print '<td class="right nowraponall amount">'.($mt < 0 ? price(-$mt) : '')."</td>";
+					print '<td class="right nowraponall amount">'.($mt >= 0 ? price($mt) : '')."</td>";
 					print "</tr>";
 				}
 			}
@@ -1259,8 +1259,8 @@ if (empty($action) || $action == 'view') {
 					print "</td>";
 					print "<td>".$reflabel."</td>";
 					print '<td class="center">'.$val["type_payment"]."</td>";
-					print '<td class="right nowraponall">'.($mt < 0 ? price(-$mt) : '')."</td>";
-					print '<td class="right nowraponall">'.($mt >= 0 ? price($mt) : '')."</td>";
+					print '<td class="right nowraponall amount">'.($mt < 0 ? price(-$mt) : '')."</td>";
+					print '<td class="right nowraponall amount">'.($mt >= 0 ? price($mt) : '')."</td>";
 					print "</tr>";
 				}
 			}
diff --git a/htdocs/accountancy/journal/expensereportsjournal.php b/htdocs/accountancy/journal/expensereportsjournal.php
index 0273690ae81..c1a62847b32 100644
--- a/htdocs/accountancy/journal/expensereportsjournal.php
+++ b/htdocs/accountancy/journal/expensereportsjournal.php
@@ -610,8 +610,8 @@ if (empty($action) || $action == 'view') {
 				$userstatic->id = $tabuser[$key]['id'];
 				$userstatic->name = $tabuser[$key]['name'];
 				print "<td>".$userstatic->getNomUrl(0, 'user', 16).' - '.$accountingaccount->label."</td>";
-				print '<td class="right nowraponall">'.($mt >= 0 ? price($mt) : '')."</td>";
-				print '<td class="right nowraponall">'.($mt < 0 ? price(-$mt) : '')."</td>";
+				print '<td class="right nowraponall amount amount">'.($mt >= 0 ? price($mt) : '')."</td>";
+				print '<td class="right nowraponall amount">'.($mt < 0 ? price(-$mt) : '')."</td>";
 				print "</tr>";
 			}
 		}
@@ -644,8 +644,8 @@ if (empty($action) || $action == 'view') {
 			}
 			print '</td>';
 			print "<td>".$userstatic->getNomUrl(0, 'user', 16).' - '.$langs->trans("SubledgerAccount")."</td>";
-			print '<td class="right nowraponall">'.($mt < 0 ? price(-$mt) : '')."</td>";
-			print '<td class="right nowraponall">'.($mt >= 0 ? price($mt) : '')."</td>";
+			print '<td class="right nowraponall amount">'.($mt < 0 ? price(-$mt) : '')."</td>";
+			print '<td class="right nowraponall amount">'.($mt >= 0 ? price($mt) : '')."</td>";
 			print "</tr>";
 		}
 
@@ -680,8 +680,8 @@ if (empty($action) || $action == 'view') {
 					print '</td>';
 					print "<td>".$userstatic->getNomUrl(0, 'user', 16).' - '.$langs->trans("VAT").' '.join(', ', $def_tva[$key][$k]).' %'.($numtax ? ' - Localtax '.$numtax : '');
 					print "</td>";
-					print '<td class="right nowraponall">'.($mt >= 0 ? price($mt) : '')."</td>";
-					print '<td class="right nowraponall">'.($mt < 0 ? price(-$mt) : '')."</td>";
+					print '<td class="right nowraponall amount">'.($mt >= 0 ? price($mt) : '')."</td>";
+					print '<td class="right nowraponall amount">'.($mt < 0 ? price(-$mt) : '')."</td>";
 					print "</tr>";
 				}
 			}
diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index 2677f8569f2..9b979da37d6 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -911,8 +911,8 @@ if (empty($action) || $action == 'view') {
 			}
 			print '</td>';
 			print "<td>".$companystatic->getNomUrl(0, 'supplier', 16).' - '.$invoicestatic->ref_supplier.' - '.$langs->trans("SubledgerAccount")."</td>";
-			print '<td class="right nowraponall">'.($mt < 0 ? price(-$mt) : '')."</td>";
-			print '<td class="right nowraponall">'.($mt >= 0 ? price($mt) : '')."</td>";
+			print '<td class="right nowraponall amount">'.($mt < 0 ? price(-$mt) : '')."</td>";
+			print '<td class="right nowraponall amount">'.($mt >= 0 ? price($mt) : '')."</td>";
 			print "</tr>";
 		}
 
@@ -940,8 +940,8 @@ if (empty($action) || $action == 'view') {
 			$companystatic->id = $tabcompany[$key]['id'];
 			$companystatic->name = $tabcompany[$key]['name'];
 			print "<td>".$companystatic->getNomUrl(0, 'supplier', 16).' - '.$invoicestatic->ref_supplier.' - '.$accountingaccount->label."</td>";
-			print '<td class="right nowraponall">'.($mt >= 0 ? price($mt) : '')."</td>";
-			print '<td class="right nowraponall">'.($mt < 0 ? price(-$mt) : '')."</td>";
+			print '<td class="right nowraponall amount">'.($mt >= 0 ? price($mt) : '')."</td>";
+			print '<td class="right nowraponall amount">'.($mt < 0 ? price(-$mt) : '')."</td>";
 			print "</tr>";
 		}
 
@@ -977,8 +977,8 @@ if (empty($action) || $action == 'view') {
 					print "<td>";
 					print $companystatic->getNomUrl(0, 'supplier', 16).' - '.$invoicestatic->ref_supplier.' - '.$langs->trans("VAT").' '.join(', ', $def_tva[$key][$k]).' %'.($numtax ? ' - Localtax '.$numtax : '');
 					print "</td>";
-					print '<td class="right nowraponall">'.($mt >= 0 ? price($mt) : '')."</td>";
-					print '<td class="right nowraponall">'.($mt < 0 ? price(-$mt) : '')."</td>";
+					print '<td class="right nowraponall amount">'.($mt >= 0 ? price($mt) : '')."</td>";
+					print '<td class="right nowraponall amount">'.($mt < 0 ? price(-$mt) : '')."</td>";
 					print "</tr>";
 				}
 			}
@@ -1005,8 +1005,8 @@ if (empty($action) || $action == 'view') {
 					print "<td>";
 					print '</td>';
 					print "<td>".$companystatic->getNomUrl(0, 'supplier', 16).' - '.$invoicestatic->ref_supplier.' - '.$langs->trans("VAT")." NPR (counterpart)</td>";
-					print '<td class="right nowraponall">'.($mt < 0 ? price(-$mt) : '')."</td>";
-					print '<td class="right nowraponall">'.($mt >= 0 ? price($mt) : '')."</td>";
+					print '<td class="right nowraponall amount">'.($mt < 0 ? price(-$mt) : '')."</td>";
+					print '<td class="right nowraponall amount">'.($mt >= 0 ? price($mt) : '')."</td>";
 					print "</tr>";
 				}
 			}
diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index d147186a8d8..93be8e8b1b9 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -851,8 +851,8 @@ if (empty($action) || $action == 'view') {
 			}
 			print '</td>';
 			print "<td>".$companystatic->getNomUrl(0, 'customer', 16).' - '.$invoicestatic->ref.' - '.$langs->trans("SubledgerAccount")."</td>";
-			print '<td class="right nowraponall">'.($mt >= 0 ? price($mt) : '')."</td>";
-			print '<td class="right nowraponall">'.($mt < 0 ? price(-$mt) : '')."</td>";
+			print '<td class="right nowraponall amount">'.($mt >= 0 ? price($mt) : '')."</td>";
+			print '<td class="right nowraponall amount">'.($mt < 0 ? price(-$mt) : '')."</td>";
 			print "</tr>";
 		}
 
@@ -880,8 +880,8 @@ if (empty($action) || $action == 'view') {
 			$companystatic->id = $tabcompany[$key]['id'];
 			$companystatic->name = $tabcompany[$key]['name'];
 			print "<td>".$companystatic->getNomUrl(0, 'customer', 16).' - '.$invoicestatic->ref.' - '.$accountingaccount->label."</td>";
-			print '<td class="right nowraponall">'.($mt < 0 ? price(-$mt) : '')."</td>";
-			print '<td class="right nowraponall">'.($mt >= 0 ? price($mt) : '')."</td>";
+			print '<td class="right nowraponall amount">'.($mt < 0 ? price(-$mt) : '')."</td>";
+			print '<td class="right nowraponall amount">'.($mt >= 0 ? price($mt) : '')."</td>";
 			print "</tr>";
 		}
 
@@ -916,8 +916,8 @@ if (empty($action) || $action == 'view') {
 					print '</td>';
 					print "<td>".$companystatic->getNomUrl(0, 'customer', 16).' - '.$invoicestatic->ref.' - '.$langs->trans("VAT").' '.join(', ', $def_tva[$key][$k]).' %'.($numtax ? ' - Localtax '.$numtax : '');
 					print "</td>";
-					print '<td class="right nowraponall">'.($mt < 0 ? price(-$mt) : '')."</td>";
-					print '<td class="right nowraponall">'.($mt >= 0 ? price($mt) : '')."</td>";
+					print '<td class="right nowraponall amount">'.($mt < 0 ? price(-$mt) : '')."</td>";
+					print '<td class="right nowraponall amount">'.($mt >= 0 ? price($mt) : '')."</td>";
 					print "</tr>";
 				}
 			}
diff --git a/htdocs/accountancy/supplier/index.php b/htdocs/accountancy/supplier/index.php
index c1a3ffe23a6..343eb506408 100644
--- a/htdocs/accountancy/supplier/index.php
+++ b/htdocs/accountancy/supplier/index.php
@@ -314,10 +314,10 @@ if ($resql) {
 		}
 		print '</td>';
 		for ($i = 2; $i <= 12; $i++) {
-			print '<td class="nowrap right">'.price($row[$i]).'</td>';
+			print '<td class="right nowraponall amount">'.price($row[$i]).'</td>';
 		}
-		print '<td class="nowrap right">'.price($row[13]).'</td>';
-		print '<td class="nowrap right"><b>'.price($row[14]).'</b></td>';
+		print '<td class="right nowraponall amount">'.price($row[13]).'</td>';
+		print '<td class="right nowraponall amount"><b>'.price($row[14]).'</b></td>';
 		print '</tr>';
 	}
 	$db->free($resql);
@@ -393,10 +393,10 @@ if ($resql) {
 		}
 		print '</td>';
 		for ($i = 2; $i <= 12; $i++) {
-			print '<td class="nowrap right">'.price($row[$i]).'</td>';
+			print '<td class="right nowraponall amount">'.price($row[$i]).'</td>';
 		}
-		print '<td class="nowrap right">'.price($row[13]).'</td>';
-		print '<td class="nowrap right"><b>'.price($row[14]).'</b></td>';
+		print '<td class="right nowraponall amount">'.price($row[13]).'</td>';
+		print '<td class="right nowraponall amount"><b>'.price($row[14]).'</b></td>';
 		print '</tr>';
 	}
 	$db->free($resql);
@@ -456,9 +456,9 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) { // This part of code looks strange
 		while ($row = $db->fetch_row($resql)) {
 			print '<tr><td>'.$row[0].'</td>';
 			for ($i = 1; $i <= 12; $i++) {
-				print '<td class="nowrap right">'.price($row[$i]).'</td>';
+				print '<td class="right nowraponall amount">'.price($row[$i]).'</td>';
 			}
-			print '<td class="nowrap right"><b>'.price($row[13]).'</b></td>';
+			print '<td class="right nowraponall amount"><b>'.price($row[13]).'</b></td>';
 			print '</tr>';
 		}
 		$db->free($resql);
diff --git a/htdocs/accountancy/supplier/lines.php b/htdocs/accountancy/supplier/lines.php
index 90e7213c8f9..4a3b8cd53ac 100644
--- a/htdocs/accountancy/supplier/lines.php
+++ b/htdocs/accountancy/supplier/lines.php
@@ -497,7 +497,7 @@ if ($result) {
 		print $form->textwithtooltip(dol_trunc($text, $trunclength), $objp->description);
 		print '</td>';
 
-		print '<td class="nowrap right">'.price($objp->total_ht).'</td>';
+		print '<td class="right nowraponall amount">'.price($objp->total_ht).'</td>';
 
 		print '<td class="right">'.vatrate($objp->tva_tx.($objp->vat_src_code ? ' ('.$objp->vat_src_code.')' : '')).'</td>';
 
diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php
index 63dd996a546..793ba453105 100644
--- a/htdocs/accountancy/supplier/list.php
+++ b/htdocs/accountancy/supplier/list.php
@@ -671,7 +671,7 @@ if ($result) {
 		print $form->textwithtooltip(dol_trunc($text, $trunclength), $objp->description);
 		print '</td>';
 
-		print '<td class="nowrap right">';
+		print '<td class="right nowraponall amount">';
 		print price($objp->total_ht);
 		print '</td>';
 

From abfc87c1dec0e0b2142f8e29dae5486bb8ed23f1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 13 Jun 2021 13:29:15 +0200
Subject: [PATCH 0589/1497] Fix separator extrafields must not appear as
 selected fields

---
 htdocs/core/class/html.form.class.php         | 11 +++--
 .../tpl/extrafields_list_array_fields.tpl.php |  1 +
 htdocs/product/class/product.class.php        | 25 +++++++++++
 htdocs/product/list.php                       | 43 ++++++++++++++++++-
 htdocs/product/stock/productlot_list.php      | 15 +------
 5 files changed, 77 insertions(+), 18 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index e084757fe28..c5248fdf490 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -7408,7 +7408,7 @@ class Form
 			}
 		}
 
-		$lis = '';
+		$listoffieldsforselection = '';
 		$listcheckedstring = '';
 
 		foreach ($array as $key => $val) {
@@ -7419,13 +7419,18 @@ class Form
 				unset($array[$key]); // We don't want this field
 				continue;
 			}
+			if (!empty($val['type']) && $val['type'] == 'separate') {
+				// Field remains in array but we don't add it into $listoffieldsforselection
+				//$listoffieldsforselection .= '<li>-----</li>';
+				continue;
+			}
 			if ($val['label']) {
 				if (!empty($val['langfile']) && is_object($langs)) {
 					$langs->load($val['langfile']);
 				}
 
 				// Note: $val['checked'] <> 0 means we must show the field into the combo list
-				$lis .= '<li><input type="checkbox" id="checkbox'.$key.'" value="'.$key.'"'.((empty($val['checked']) && $val['checked'] != '-1') ? '' : ' checked="checked"').'/><label for="checkbox'.$key.'">'.dol_escape_htmltag($langs->trans($val['label'])).'</label></li>';
+				$listoffieldsforselection .= '<li><input type="checkbox" id="checkbox'.$key.'" value="'.$key.'"'.((empty($val['checked']) && $val['checked'] != '-1') ? '' : ' checked="checked"').'/><label for="checkbox'.$key.'">'.dol_escape_htmltag($langs->trans($val['label'])).'</label></li>';
 				$listcheckedstring .= (empty($val['checked']) ? '' : $key.',');
 			}
 		}
@@ -7442,7 +7447,7 @@ class Form
             <dd class="dropdowndd">
                 <div class="multiselectcheckbox'.$htmlname.'">
                     <ul class="ul'.$htmlname.'">
-                    '.$lis.'
+                    '.$listoffieldsforselection.'
                     </ul>
                 </div>
             </dd>
diff --git a/htdocs/core/tpl/extrafields_list_array_fields.tpl.php b/htdocs/core/tpl/extrafields_list_array_fields.tpl.php
index ebab4e8608a..f7c9fc201f4 100644
--- a/htdocs/core/tpl/extrafields_list_array_fields.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_array_fields.tpl.php
@@ -23,6 +23,7 @@ if (!empty($extrafieldsobjectkey)) {	// $extrafieldsobject is the $object->table
 			if (!empty($extrafields->attributes[$extrafieldsobjectkey]['list'][$key])) {
 				$arrayfields[$extrafieldsobjectprefix.$key] = array(
 					'label'    => $extrafields->attributes[$extrafieldsobjectkey]['label'][$key],
+					'type'     => $extrafields->attributes[$extrafieldsobjectkey]['type'][$key],
 					'checked'  => (($extrafields->attributes[$extrafieldsobjectkey]['list'][$key] < 0) ? 0 : 1),
 					'position' => $extrafields->attributes[$extrafieldsobjectkey]['pos'][$key],
 					'enabled'  => (abs((int) $extrafields->attributes[$extrafieldsobjectkey]['list'][$key]) != 3 && $extrafields->attributes[$extrafieldsobjectkey]['perms'][$key]),
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 1afd1e74e23..381d92c52f7 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -426,6 +426,31 @@ class Product extends CommonObject
 	public $is_object_used;
 
 
+	/**
+	 *  'type' if the field format ('integer', 'integer:ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter]]', 'varchar(x)', 'double(24,8)', 'real', 'price', 'text', 'html', 'date', 'datetime', 'timestamp', 'duration', 'mail', 'phone', 'url', 'password')
+	 *         Note: Filter can be a string like "(t.ref:like:'SO-%') or (t.date_creation:<:'20160101') or (t.nature:is:NULL)"
+	 *  'label' the translation key.
+	 *  'enabled' is a condition when the field must be managed (Example: 1 or '$conf->global->MY_SETUP_PARAM)
+	 *  'position' is the sort order of field.
+	 *  'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
+	 *  'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). 5=Visible on list and view only (not create/not update). Using a negative value means field is not shown by default on list but can be selected for viewing)
+	 *  'noteditable' says if field is not editable (1 or 0)
+	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
+	 *  '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_...).
+	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
+	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
+	 *  'css' is the CSS style to use on field. For example: 'maxwidth200'
+	 *  'help' is a string visible as a tooltip on field
+	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
+	 *  'disabled' is 1 if we want to have the field locked by a 'disabled' attribute. In most cases, this is never set into the definition of $fields into class, but is set dynamically by some part of code.
+	 *  'arrayofkeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
+	 *  'autofocusoncreate' to have field having the focus on a create form. Only 1 field should have this property set to 1.
+	 *  'comment' is not used. You can store here any text of your choice. It is not used by application.
+	 *
+	 *  Note: To have value dynamic, you can set value to 0 in definition and edit the value on the fly into the constructor.
+	 */
+
 	/**
 	 * @var array fields of object product
 	 */
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 0c922fab0dd..8000eac356b 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -58,6 +58,7 @@ $confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
 
 $sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
+$search_id = GETPOST("search_id", 'alpha');
 $search_ref = GETPOST("search_ref", 'alpha');
 $search_ref_supplier = GETPOST("search_ref_supplier", 'alpha');
 $search_barcode = GETPOST("search_barcode", 'alpha');
@@ -193,9 +194,10 @@ $isInEEC = isInEEC($mysoc);
 
 $alias_product_perentity = empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED) ? "p" : "ppe";
 
-// Definition of fields for lists
+// Definition of array of fields for columns
 $arrayfields = array(
-	'p.ref'=>array('label'=>"Ref", 'checked'=>1),
+	'p.rowid'=>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-2, 'noteditable'=>1, 'notnull'=> 1, 'index'=>1, 'position'=>1, 'comment'=>'Id', 'css'=>'left'),
+	'p.ref'=>array('label'=>"Ref", 'checked'=>1, 'position'=>10),
 	//'pfp.ref_fourn'=>array('label'=>$langs->trans("RefSupplier"), 'checked'=>1, 'enabled'=>(! empty($conf->barcode->enabled))),
 	'p.label'=>array('label'=>"Label", 'checked'=>1, 'position'=>10),
 	'p.fk_product_type'=>array('label'=>"Type", 'checked'=>0, 'enabled'=>(!empty($conf->product->enabled) && !empty($conf->service->enabled)), 'position'=>11),
@@ -239,6 +241,19 @@ $arrayfields = array(
 	'p.tosell'=>array('label'=>$langs->transnoentitiesnoconv("Status").' ('.$langs->transnoentitiesnoconv("Sell").')', 'checked'=>1, 'position'=>1000),
 	'p.tobuy'=>array('label'=>$langs->transnoentitiesnoconv("Status").' ('.$langs->transnoentitiesnoconv("Buy").')', 'checked'=>1, 'position'=>1000)
 );
+/*foreach ($object->fields as $key => $val) {
+	// If $val['visible']==0, then we never show the field
+	if (!empty($val['visible'])) {
+		$visible = dol_eval($val['visible'], 1);
+		$arrayfields['p.'.$key] = array(
+			'label'=>$val['label'],
+			'checked'=>(($visible < 0) ? 0 : 1),
+			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
+			'position'=>$val['position']
+		);
+	}
+}*/
+
 
 // MultiPrices
 if ($conf->global->PRODUIT_MULTIPRICES) {
@@ -300,6 +315,7 @@ if (empty($reshook)) {
 	// 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
 		$sall = "";
+		$search_id = '';
 		$search_ref = "";
 		$search_ref_supplier = "";
 		$search_label = "";
@@ -426,6 +442,9 @@ if (!empty($conf->variants->enabled) && (!empty($conf->global->PRODUIT_ATTRIBUTE
 	$sql .= " AND pac.rowid IS NULL";
 }
 
+if ($search_id) {
+	$sql .= natural_search('p.rowid', $search_id, 1);
+}
 if ($search_ref) {
 	$sql .= natural_search('p.ref', $search_ref);
 }
@@ -705,6 +724,7 @@ if ($resql) {
 		$perm = $user->rights->service->creer;
 	} elseif ($type == Product::TYPE_PRODUCT) {
 		$perm = $user->rights->produit->creer;
+
 	}
 	$oldtype = $type;
 	$params = array();
@@ -801,6 +821,7 @@ if ($resql) {
 	}
 
 	$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);
@@ -811,6 +832,11 @@ if ($resql) {
 
 	// Lines with input filters
 	print '<tr class="liste_titre_filter">';
+	if (!empty($arrayfields['p.rowid']['checked'])) {
+		print '<td class="liste_titre left">';
+		print '<input class="flat" type="text" name="search_id" size="4" value="'.dol_escape_htmltag($search_id).'">';
+		print '</td>';
+	}
 	if (!empty($arrayfields['p.ref']['checked'])) {
 		print '<td class="liste_titre left">';
 		print '<input class="flat" type="text" name="search_ref" size="8" value="'.dol_escape_htmltag($search_ref).'">';
@@ -1058,6 +1084,9 @@ if ($resql) {
 	print '</tr>';
 
 	print '<tr class="liste_titre">';
+	if (!empty($arrayfields['p.rowid']['checked'])) {
+		print_liste_field_titre($arrayfields['p.rowid']['label'], $_SERVER["PHP_SELF"], "p.rowid", "", $param, "", $sortfield, $sortorder);
+	}
 	if (!empty($arrayfields['p.ref']['checked'])) {
 		print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER["PHP_SELF"], "p.ref", "", $param, "", $sortfield, $sortorder);
 	}
@@ -1281,6 +1310,16 @@ if ($resql) {
 
 		print '<tr class="oddeven">';
 
+		// Ref
+		if (!empty($arrayfields['p.rowid']['checked'])) {
+			print '<td class="nowraponall">';
+			print $product_static->id;
+			print "</td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
 		// Ref
 		if (!empty($arrayfields['p.ref']['checked'])) {
 			print '<td class="tdoverflowmax200">';
diff --git a/htdocs/product/stock/productlot_list.php b/htdocs/product/stock/productlot_list.php
index 00c8c186c66..04682a84322 100644
--- a/htdocs/product/stock/productlot_list.php
+++ b/htdocs/product/stock/productlot_list.php
@@ -113,19 +113,8 @@ foreach ($object->fields as $key => $val) {
 	}
 }
 // Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0) {
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-		if (!empty($extrafields->attributes[$object->table_element]['list'][$key])) {
-			$arrayfields["ef.".$key] = array(
-				'label'=>$extrafields->attributes[$object->table_element]['label'][$key],
-				'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1),
-				'position'=>$extrafields->attributes[$object->table_element]['pos'][$key],
-				'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]),
-				'langfile'=>$extrafields->attributes[$object->table_element]['langfile'][$key]
-			);
-		}
-	}
-}
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
+
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 

From 497e9edbb24ceb020b6cc6b49419ab1a7459cc3f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 13 Jun 2021 15:17:47 +0200
Subject: [PATCH 0590/1497] Trans

---
 htdocs/langs/en_US/admin.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index ef97369f040..329b7ff2775 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -562,7 +562,7 @@ Module53Desc=Management of Services
 Module54Name=Contracts/Subscriptions
 Module54Desc=Management of contracts (services or recurring subscriptions)
 Module55Name=Barcodes
-Module55Desc=Barcode management
+Module55Desc=Barcode or QR code management
 Module56Name=Payment by credit transfer
 Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
 Module57Name=Payments by Direct Debit

From ebc0cc75dd7916af6eefadf65c28320bcca7451f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 13 Jun 2021 15:37:54 +0200
Subject: [PATCH 0591/1497] fix warning

---
 htdocs/core/modules/member/modules_cards.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/modules/member/modules_cards.php b/htdocs/core/modules/member/modules_cards.php
index 0e041a17559..937e8a06870 100644
--- a/htdocs/core/modules/member/modules_cards.php
+++ b/htdocs/core/modules/member/modules_cards.php
@@ -48,7 +48,7 @@ class ModelePDFCards
 	 *	@param	integer	$maxfilenamelength	Max length of value to show
 	 *	@return	array						List of templates
 	 */
-	public function liste_modeles($db, $maxfilenamelength = 0)
+	public static function liste_modeles($db, $maxfilenamelength = 0)
 	{
 		// phpcs:enable
 		global $conf;

From 519d7f1d0f3271c78789c121c286c06ab74aa351 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 13 Jun 2021 15:47:42 +0200
Subject: [PATCH 0592/1497] fix warnings

---
 htdocs/ticket/list.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php
index 45a11a9daef..3ba138bb99e 100644
--- a/htdocs/ticket/list.php
+++ b/htdocs/ticket/list.php
@@ -765,19 +765,19 @@ foreach ($object->fields as $key => $val) {
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
 		if ($key == 'type_code') {
 			print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
-			$formTicket->selectTypesTickets(dol_escape_htmltag($search[$key]), 'search_'.$key.'', '', 2, 1, 1, 0, ($val['css'] ? $val['css'] : 'maxwidth150'));
+			$formTicket->selectTypesTickets(dol_escape_htmltag(empty($search[$key]) ? '' : $search[$key]), 'search_'.$key.'', '', 2, 1, 1, 0, ($val['css'] ? $val['css'] : 'maxwidth150'));
 			print '</td>';
 		} elseif ($key == 'category_code') {
 			print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
-			$formTicket->selectGroupTickets(dol_escape_htmltag($search[$key]), 'search_'.$key.'', '', 2, 1, 1, 0, ($val['css'] ? $val['css'] : 'maxwidth150'));
+			$formTicket->selectGroupTickets(dol_escape_htmltag(empty($search[$key]) ? '' : $search[$key]), 'search_'.$key.'', '', 2, 1, 1, 0, ($val['css'] ? $val['css'] : 'maxwidth150'));
 			print '</td>';
 		} elseif ($key == 'severity_code') {
 			print '<td class="liste_titre center'.($cssforfield ? ' '.$cssforfield : '').'">';
-			$formTicket->selectSeveritiesTickets(dol_escape_htmltag($search[$key]), 'search_'.$key.'', '', 2, 1, 1, 0, ($val['css'] ? $val['css'] : 'maxwidth150'));
+			$formTicket->selectSeveritiesTickets(dol_escape_htmltag(empty($search[$key]) ? '' : $search[$key]), 'search_'.$key.'', '', 2, 1, 1, 0, ($val['css'] ? $val['css'] : 'maxwidth150'));
 			print '</td>';
 		} elseif ($key == 'fk_user_assign' || $key == 'fk_user_create') {
 			print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
-			print $form->select_dolusers($search[$key], 'search_'.$key, 1, null, 0, '', '', '0', 0, 0, '', 0, '', ($val['css'] ? $val['css'] : 'maxwidth125'));
+			print $form->select_dolusers((empty($search[$key]) ? '' : $search[$key]), 'search_'.$key, 1, null, 0, '', '', '0', 0, 0, '', 0, '', ($val['css'] ? $val['css'] : 'maxwidth125'));
 			print '</td>';
 		} elseif ($key == 'fk_statut') {
 			$arrayofstatus = array();
@@ -791,7 +791,7 @@ foreach ($object->fields as $key => $val) {
 			print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
 			//var_dump($arrayofstatus);var_dump($search['fk_statut']);var_dump(array_values($search[$key]));
 			$selectedarray = null;
-			if ($search[$key]) {
+			if (!empty($search[$key])) {
 				$selectedarray = array_values($search[$key]);
 			}
 			print Form::multiselectarray('search_fk_statut', $arrayofstatus, $selectedarray, 0, 0, 'minwidth100 maxwidth150', 1, 0, '', '', '');
@@ -832,7 +832,7 @@ foreach ($object->fields as $key => $val) {
 			} elseif (strpos($val['type'], 'integer:') === 0) {
 				print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
 			} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) {
-				print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
+				print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag(empty($search[$key]) ? '' : $search[$key]).'">';
 			}
 			print '</td>';
 		}

From 791e4ab05617e4da77aab9c041765462b2db6b8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 13 Jun 2021 15:59:22 +0200
Subject: [PATCH 0593/1497] fix warning

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

diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 1f633015cd4..1ee946e8a00 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -4250,7 +4250,7 @@ class Facture extends CommonInvoice
 				$generic_facture->statut = $obj->fk_statut;
 
 				$response->nbtodo++;
-				$response->total += $obj->total;
+				$response->total += $obj->total_ht;
 
 				if ($generic_facture->hasDelay()) {
 					$response->nbtodolate++;

From d774e19afe896f21ad1beb02e6b4e215e632c9dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 13 Jun 2021 16:10:45 +0200
Subject: [PATCH 0594/1497] fix warnings

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

diff --git a/htdocs/workstation/workstation_list.php b/htdocs/workstation/workstation_list.php
index 4ca96ec00ff..8058ec2793d 100755
--- a/htdocs/workstation/workstation_list.php
+++ b/htdocs/workstation/workstation_list.php
@@ -98,7 +98,7 @@ $resources = GETPOST('resources', 'array:int');
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array();
 foreach ($object->fields as $key => $val) {
-	if ($val['searchall']) {
+	if (!empty($val['searchall'])) {
 		$fieldstosearchall['t.'.$key] = $val['label'];
 	}
 }
@@ -114,7 +114,7 @@ foreach ($object->fields as $key => $val) {
 			'checked'=>(($visible < 0) ? 0 : 1),
 			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
 			'position'=>$val['position'],
-			'help'=>$val['help']
+			'help' => empty($val['help']) ? '' : $val['help']
 		);
 	}
 }
@@ -124,7 +124,7 @@ $arrayfields['wug.fk_usergroup'] = array(
 	'checked'=>(($visible < 0) ? 0 : 1),
 	'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
 	'position'=>1000,
-	'help'=>$val['help']
+	'help' => empty($val['help']) ? '' : $val['help']
 );
 
 $arrayfields['wr.fk_resource'] = array(
@@ -132,7 +132,7 @@ $arrayfields['wr.fk_resource'] = array(
 	'checked'=>(($visible < 0) ? 0 : 1),
 	'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
 	'position'=>1001,
-	'help'=>$val['help']
+	'help' => empty($val['help']) ? '' : $val['help']
 );
 
 // Extra fields

From 20f6a3424997332e2764097ac402c818abc7ced2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 13 Jun 2021 16:12:46 +0200
Subject: [PATCH 0595/1497] Update list.php

---
 htdocs/product/list.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 8000eac356b..329f72f4d9c 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -724,7 +724,6 @@ if ($resql) {
 		$perm = $user->rights->service->creer;
 	} elseif ($type == Product::TYPE_PRODUCT) {
 		$perm = $user->rights->produit->creer;
-
 	}
 	$oldtype = $type;
 	$params = array();

From c4cba43bade736ab89e31013a6ccee59a6e077ee Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 13 Jun 2021 16:15:05 +0200
Subject: [PATCH 0596/1497] FIX Broken Access Control reported by Ahsan Aziz.

---
 htdocs/langs/en_US/errors.lang   |  1 +
 htdocs/user/card.php             | 22 ++++++++++++++--------
 htdocs/user/class/user.class.php | 28 +++++++++++++++++++++++++++-
 3 files changed, 42 insertions(+), 9 deletions(-)

diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index f2d9106107b..c4e8a1d7226 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -11,6 +11,7 @@ ErrorBadValueForParamNotAString=Bad value for your parameter. It appends general
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s already exists.
 ErrorGroupAlreadyExists=Group %s already exists.
+ErrorEmailAlreadyExists=Email %s already exists.
 ErrorRecordNotFound=Record not found.
 ErrorFailToCopyFile=Failed to copy file '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 0b67853b553..a78425bb596 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -444,16 +444,22 @@ if (empty($reshook)) {
 
 				$object->lang = GETPOST('default_lang', 'aZ09');
 
-				if (!empty($conf->multicompany->enabled)) {
-					if (GETPOST("superadmin")) {
-						$object->entity = 0;
-					} elseif (!empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
-						$object->entity = 1; // all users in master entity
+				// Do we update also ->entity ?
+				if (!empty($conf->multicompany->enabled)) {	// If multicompany is not enabled, we never update the entity of a user.
+					if (!empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+						$object->entity = 1; // all users are in master entity
 					} else {
-						$object->entity = (!GETPOST('entity', 'int') ? 0 : GETPOST('entity', 'int'));
+						// A user should not be able to move a user into another entity. Only superadmin should be able to do this.
+						if ($user->entity == 0 && $user->admin) {
+							if (GETPOST("superadmin")) {
+								// We try to set the user as superadmin.
+								$object->entity = 0;
+							} else {
+								// We try to change the entity of user
+								$object->entity = (GETPOSTISSET('entity') ? GETPOSTINT('entity') : $object->entity);
+							}
+						}
 					}
-				} else {
-					$object->entity = (!GETPOST('entity', 'int') ? 0 : GETPOST('entity', 'int'));
 				}
 
 				// Fill array 'array_options' with data from add form
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index ec09aafeef5..1a2098619ae 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1662,6 +1662,32 @@ class User extends CommonObject
 
 		$this->db->begin();
 
+		// Check if login already exists in same entity or into entity 0.
+		if ($this->oldcopy->login != $this->login) {
+			$sqltochecklogin = "SELECT COUNT(*) as nb FROM ".MAIN_DB_PREFIX."user WHERE entity IN (".((int) $this->entity).", 0) AND login = '".$this->db->escape($this->login)."'";
+			$resqltochecklogin = $this->db->query($sqltochecklogin);
+			if ($resqltochecklogin) {
+				$objtochecklogin = $this->db->fetch_object($resqltochecklogin);
+				if ($objtochecklogin && $objtochecklogin->nb > 0) {
+					$langs->load("errors");
+					$this->error = $langs->trans("ErrorLoginAlreadyExists", $this->login);
+					return -1;
+				}
+			}
+		}
+		if ($this->email !== '' && $this->oldcopy->email != $this->email) {
+			$sqltochecklogin = "SELECT COUNT(*) as nb FROM ".MAIN_DB_PREFIX."user WHERE entity IN (".((int) $this->entity).", 0) AND email = '".$this->db->escape($this->email)."'";
+			$resqltochecklogin = $this->db->query($sqltochecklogin);
+			if ($resqltochecklogin) {
+				$objtochecklogin = $this->db->fetch_object($resqltochecklogin);
+				if ($objtochecklogin && $objtochecklogin->nb > 0) {
+					$langs->load("errors");
+					$this->error = $langs->trans("ErrorEmailAlreadyExists", $this->email);
+					return -1;
+				}
+			}
+		}
+
 		// Update datas
 		$sql = "UPDATE ".MAIN_DB_PREFIX."user SET";
 		$sql .= " civility = '".$this->db->escape($this->civility_code)."'";
@@ -1715,7 +1741,7 @@ class User extends CommonObject
 			$sql .= ", salaryextra= ".($this->salaryextra != '' ? "'".$this->db->escape($this->salaryextra)."'" : "null");
 		}
 		$sql .= ", weeklyhours= ".($this->weeklyhours != '' ? "'".$this->db->escape($this->weeklyhours)."'" : "null");
-		$sql .= ", entity = '".$this->db->escape($this->entity)."'";
+		$sql .= ", entity = ".((int) $this->entity);
 		$sql .= ", default_range = ".($this->default_range > 0 ? $this->default_range : 'null');
 		$sql .= ", default_c_exp_tax_cat = ".($this->default_c_exp_tax_cat > 0 ? $this->default_c_exp_tax_cat : 'null');
 		$sql .= ", fk_warehouse = ".($this->fk_warehouse > 0 ? $this->fk_warehouse : "null");

From a72f66b456e0bbd2cfaf07e447d456aeea55fd18 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 13 Jun 2021 16:32:06 +0200
Subject: [PATCH 0597/1497] Fix: dictionnaries are edited per entity

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

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 230c6e28229..35e20b96570 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -970,7 +970,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify')) {
 			$sql .= " WHERE ".$rowidcol." = ".((int) $rowid);
 		}
 		if (in_array('entity', $listfieldmodify)) {
-			$sql .= " AND entity = '".getEntity($tabname[$id])."'";
+			$sql .= " AND entity = ".((int) getEntity($tabname[$id], 0));
 		}
 
 		dol_syslog("actionmodify", LOG_DEBUG);

From a019996bc8bbcaefb48e893336b23e7b9faa68ac Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Sun, 13 Jun 2021 17:36:51 +0200
Subject: [PATCH 0598/1497] Fix create image thumbs on php 8.0

---
 htdocs/core/lib/images.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/lib/images.lib.php b/htdocs/core/lib/images.lib.php
index 0a0ebe3ce02..bdc00ffb2ac 100644
--- a/htdocs/core/lib/images.lib.php
+++ b/htdocs/core/lib/images.lib.php
@@ -590,7 +590,7 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small',
 			break;
 	}
 
-	if (!is_resource($img)) {
+	if (!is_resource($img) && !$img instanceof \GdImage) {
 		dol_syslog('Failed to detect type of image. We found infoImg[2]='.$infoImg[2], LOG_WARNING);
 		return 0;
 	}

From 95ee0f630ddabb46d0cafee926718bbc5df52a57 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 13 Jun 2021 18:10:04 +0200
Subject: [PATCH 0599/1497] Fix phpcs

---
 htdocs/user/class/user.class.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 1a2098619ae..4b0e87dcc7b 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -442,7 +442,7 @@ class User extends CommonObject
 
 		if ($entity < 0) {
 			if ((empty($conf->multicompany->enabled) || empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) && (!empty($user->entity))) {
-				$sql .= " WHERE u.entity IN (0,".$conf->entity.")";
+				$sql .= " WHERE u.entity IN (0, ".$this->db->sanitize($conf->entity).")";
 			} else {
 				$sql .= " WHERE u.entity IS NOT NULL"; // multicompany is on in transverse mode or user making fetch is on entity 0, so user is allowed to fetch anywhere into database
 			}
@@ -451,7 +451,7 @@ class User extends CommonObject
 			if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
 				$sql .= " WHERE u.entity IS NOT NULL"; // multicompany is on in transverse mode or user making fetch is on entity 0, so user is allowed to fetch anywhere into database
 			} else {
-				$sql .= " WHERE u.entity IN (0, ".(($entity != '' && $entity >= 0) ? $entity : $conf->entity).")"; // search in entity provided in parameter
+				$sql .= " WHERE u.entity IN (0, ".$this->db->sanitize(($entity != '' && $entity >= 0) ? $entity : $conf->entity).")"; // search in entity provided in parameter
 			}
 		}
 
@@ -961,9 +961,9 @@ class User extends CommonObject
 		if (!empty($conf->global->MULTICOMPANY_BACKWARD_COMPATIBILITY)) {
 			$sql .= " AND r.entity IN (0,".(!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) ? "1," : "").$conf->entity.")";
 		} else {
-			$sql .= " AND ur.entity = ".$conf->entity;
+			$sql .= " AND ur.entity = ".((int) $conf->entity);
 		}
-		$sql .= " AND ur.fk_user= ".$this->id;
+		$sql .= " AND ur.fk_user= ".((int) $this->id);
 		$sql .= " AND r.perms IS NOT NULL";
 		if ($moduletag) {
 			$sql .= " AND r.module = '".$this->db->escape($moduletag)."'";
@@ -1289,7 +1289,7 @@ class User extends CommonObject
 
 		$sql = "SELECT login FROM ".MAIN_DB_PREFIX."user";
 		$sql .= " WHERE login ='".$this->db->escape($this->login)."'";
-		$sql .= " AND entity IN (0,".$this->db->escape($conf->entity).")";
+		$sql .= " AND entity IN (0, ".$this->db->escape($conf->entity).")";
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -1664,7 +1664,7 @@ class User extends CommonObject
 
 		// Check if login already exists in same entity or into entity 0.
 		if ($this->oldcopy->login != $this->login) {
-			$sqltochecklogin = "SELECT COUNT(*) as nb FROM ".MAIN_DB_PREFIX."user WHERE entity IN (".((int) $this->entity).", 0) AND login = '".$this->db->escape($this->login)."'";
+			$sqltochecklogin = "SELECT COUNT(*) as nb FROM ".MAIN_DB_PREFIX."user WHERE entity IN (".$this->db->sanitize((int) $this->entity).", 0) AND login = '".$this->db->escape($this->login)."'";
 			$resqltochecklogin = $this->db->query($sqltochecklogin);
 			if ($resqltochecklogin) {
 				$objtochecklogin = $this->db->fetch_object($resqltochecklogin);
@@ -1676,7 +1676,7 @@ class User extends CommonObject
 			}
 		}
 		if ($this->email !== '' && $this->oldcopy->email != $this->email) {
-			$sqltochecklogin = "SELECT COUNT(*) as nb FROM ".MAIN_DB_PREFIX."user WHERE entity IN (".((int) $this->entity).", 0) AND email = '".$this->db->escape($this->email)."'";
+			$sqltochecklogin = "SELECT COUNT(*) as nb FROM ".MAIN_DB_PREFIX."user WHERE entity IN (".$this->db->sanitize((int) $this->entity).", 0) AND email = '".$this->db->escape($this->email)."'";
 			$resqltochecklogin = $this->db->query($sqltochecklogin);
 			if ($resqltochecklogin) {
 				$objtochecklogin = $this->db->fetch_object($resqltochecklogin);

From 67e00e5cf5310b54eeb6e325775e407f3c8ccbcc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 13 Jun 2021 19:05:48 +0200
Subject: [PATCH 0600/1497] Fix regression. Missing rollback.

---
 htdocs/user/class/user.class.php | 159 +++++++++++++++++--------------
 1 file changed, 87 insertions(+), 72 deletions(-)

diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 4b0e87dcc7b..37ce6544cd0 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1287,86 +1287,97 @@ class User extends CommonObject
 		$error = 0;
 		$this->db->begin();
 
-		$sql = "SELECT login FROM ".MAIN_DB_PREFIX."user";
-		$sql .= " WHERE login ='".$this->db->escape($this->login)."'";
-		$sql .= " AND entity IN (0, ".$this->db->escape($conf->entity).")";
+		// Check if login already exists in same entity or into entity 0.
+		if ($this->login) {
+			$sqltochecklogin = "SELECT COUNT(*) as nb FROM ".MAIN_DB_PREFIX."user WHERE entity IN (".$this->db->sanitize((int) $this->entity).", 0) AND login = '".$this->db->escape($this->login)."'";
+			$resqltochecklogin = $this->db->query($sqltochecklogin);
+			if ($resqltochecklogin) {
+				$objtochecklogin = $this->db->fetch_object($resqltochecklogin);
+				if ($objtochecklogin && $objtochecklogin->nb > 0) {
+					$langs->load("errors");
+					$this->error = $langs->trans("ErrorLoginAlreadyExists", $this->login);
+					dol_syslog(get_class($this)."::create ".$this->error, LOG_DEBUG);
+					$this->db->rollback();
+					return -6;
+				}
+				$this->db->free($resqltochecklogin);
+			}
+		}
+		if ($this->email !== '') {
+			$sqltochecklogin = "SELECT COUNT(*) as nb FROM ".MAIN_DB_PREFIX."user WHERE entity IN (".$this->db->sanitize((int) $this->entity).", 0) AND email = '".$this->db->escape($this->email)."'";
+			$resqltochecklogin = $this->db->query($sqltochecklogin);
+			if ($resqltochecklogin) {
+				$objtochecklogin = $this->db->fetch_object($resqltochecklogin);
+				if ($objtochecklogin && $objtochecklogin->nb > 0) {
+					$langs->load("errors");
+					$this->error = $langs->trans("ErrorEmailAlreadyExists", $this->email);
+					dol_syslog(get_class($this)."::create ".$this->error, LOG_DEBUG);
+					$this->db->rollback();
+					return -6;
+				}
+				$this->db->free($resqltochecklogin);
+			}
+		}
+
+		// Insert into database
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."user (datec, login, ldap_sid, entity)";
+		$sql .= " VALUES('".$this->db->idate($this->datec)."','".$this->db->escape($this->login)."','".$this->db->escape($this->ldap_sid)."',".$this->db->escape($this->entity).")";
+		$result = $this->db->query($sql);
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
-		$resql = $this->db->query($sql);
-		if ($resql) {
-			$num = $this->db->num_rows($resql);
-			$this->db->free($resql);
+		if ($result) {
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."user");
 
-			if ($num) {
-				$this->error = 'ErrorLoginAlreadyExists';
-				dol_syslog(get_class($this)."::create ".$this->error, LOG_WARNING);
+			// Set default rights
+			if ($this->set_default_rights() < 0) {
+				$this->error = 'ErrorFailedToSetDefaultRightOfUser';
 				$this->db->rollback();
-				return -6;
-			} else {
-				$sql = "INSERT INTO ".MAIN_DB_PREFIX."user (datec,login,ldap_sid,entity)";
-				$sql .= " VALUES('".$this->db->idate($this->datec)."','".$this->db->escape($this->login)."','".$this->db->escape($this->ldap_sid)."',".$this->db->escape($this->entity).")";
-				$result = $this->db->query($sql);
+				return -5;
+			}
 
-				dol_syslog(get_class($this)."::create", LOG_DEBUG);
-				if ($result) {
-					$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."user");
+			if (!empty($conf->global->MAIN_DEFAULT_WAREHOUSE_USER) && !empty($conf->global->STOCK_USERSTOCK_AUTOCREATE)) {
+				require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
+				$langs->load("stocks");
+				$entrepot = new Entrepot($this->db);
+				$entrepot->label = $langs->trans("PersonalStock", $this->getFullName($langs));
+				$entrepot->libelle = $entrepot->label; // For backward compatibility
+				$entrepot->description = $langs->trans("ThisWarehouseIsPersonalStock", $this->getFullName($langs));
+				$entrepot->statut = 1;
+				$entrepot->country_id = $mysoc->country_id;
+				$warehouseid = $entrepot->create($user);
 
-					// Set default rights
-					if ($this->set_default_rights() < 0) {
-						$this->error = 'ErrorFailedToSetDefaultRightOfUser';
-						$this->db->rollback();
-						return -5;
-					}
+				$this->fk_warehouse = $warehouseid;
+			}
 
-					if (!empty($conf->global->MAIN_DEFAULT_WAREHOUSE_USER) && !empty($conf->global->STOCK_USERSTOCK_AUTOCREATE)) {
-						require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
-						$langs->load("stocks");
-						$entrepot = new Entrepot($this->db);
-						$entrepot->label = $langs->trans("PersonalStock", $this->getFullName($langs));
-						$entrepot->libelle = $entrepot->label; // For backward compatibility
-						$entrepot->description = $langs->trans("ThisWarehouseIsPersonalStock", $this->getFullName($langs));
-						$entrepot->statut = 1;
-						$entrepot->country_id = $mysoc->country_id;
-						$warehouseid = $entrepot->create($user);
+			// Update minor fields
+			$result = $this->update($user, 1, 1);
+			if ($result < 0) {
+				$this->db->rollback();
+				return -4;
+			}
 
-						$this->fk_warehouse = $warehouseid;
-					}
-
-					// Update minor fields
-					$result = $this->update($user, 1, 1);
-					if ($result < 0) {
-						$this->db->rollback();
-						return -4;
-					}
-
-					if (!$notrigger) {
-						// Call trigger
-						$result = $this->call_trigger('USER_CREATE', $user);
-						if ($result < 0) {
-							$error++;
-						}
-						// End call triggers
-					}
-
-					if (!$error) {
-						$this->db->commit();
-						return $this->id;
-					} else {
-						//$this->error=$interface->error;
-						dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
-						$this->db->rollback();
-						return -3;
-					}
-				} else {
-					$this->error = $this->db->lasterror();
-					$this->db->rollback();
-					return -2;
+			if (!$notrigger) {
+				// Call trigger
+				$result = $this->call_trigger('USER_CREATE', $user);
+				if ($result < 0) {
+					$error++;
 				}
+				// End call triggers
+			}
+
+			if (!$error) {
+				$this->db->commit();
+				return $this->id;
+			} else {
+				//$this->error=$interface->error;
+				dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
+				$this->db->rollback();
+				return -3;
 			}
 		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
-			return -1;
+			return -2;
 		}
 	}
 
@@ -1591,12 +1602,12 @@ class User extends CommonObject
 	/**
 	 *  	Update a user into database (and also password if this->pass is defined)
 	 *
-	 *		@param	User	$user				User qui fait la mise a jour
-	 *    	@param  int		$notrigger			1 ne declenche pas les triggers, 0 sinon
+	 *		@param	User	$user				User making update
+	 *    	@param  int		$notrigger			1=do not execute triggers, 0 by default
 	 *		@param	int		$nosyncmember		0=Synchronize linked member (standard info), 1=Do not synchronize linked member
 	 *		@param	int		$nosyncmemberpass	0=Synchronize linked member (password), 1=Do not synchronize linked member
 	 *		@param	int		$nosynccontact		0=Synchronize linked contact, 1=Do not synchronize linked contact
-	 *    	@return int 		        		<0 si KO, >=0 si OK
+	 *    	@return int 		        		<0 if KO, >=0 if OK
 	 */
 	public function update($user, $notrigger = 0, $nosyncmember = 0, $nosyncmemberpass = 0, $nosynccontact = 0)
 	{
@@ -1663,7 +1674,7 @@ class User extends CommonObject
 		$this->db->begin();
 
 		// Check if login already exists in same entity or into entity 0.
-		if ($this->oldcopy->login != $this->login) {
+		if (!empty($this->oldcopy) && $this->oldcopy->login != $this->login) {
 			$sqltochecklogin = "SELECT COUNT(*) as nb FROM ".MAIN_DB_PREFIX."user WHERE entity IN (".$this->db->sanitize((int) $this->entity).", 0) AND login = '".$this->db->escape($this->login)."'";
 			$resqltochecklogin = $this->db->query($sqltochecklogin);
 			if ($resqltochecklogin) {
@@ -1671,11 +1682,13 @@ class User extends CommonObject
 				if ($objtochecklogin && $objtochecklogin->nb > 0) {
 					$langs->load("errors");
 					$this->error = $langs->trans("ErrorLoginAlreadyExists", $this->login);
+					dol_syslog(get_class($this)."::create ".$this->error, LOG_DEBUG);
+					$this->db->rollback();
 					return -1;
 				}
 			}
 		}
-		if ($this->email !== '' && $this->oldcopy->email != $this->email) {
+		if (!empty($this->oldcopy) && $this->email !== '' && $this->oldcopy->email != $this->email) {
 			$sqltochecklogin = "SELECT COUNT(*) as nb FROM ".MAIN_DB_PREFIX."user WHERE entity IN (".$this->db->sanitize((int) $this->entity).", 0) AND email = '".$this->db->escape($this->email)."'";
 			$resqltochecklogin = $this->db->query($sqltochecklogin);
 			if ($resqltochecklogin) {
@@ -1683,6 +1696,8 @@ class User extends CommonObject
 				if ($objtochecklogin && $objtochecklogin->nb > 0) {
 					$langs->load("errors");
 					$this->error = $langs->trans("ErrorEmailAlreadyExists", $this->email);
+					dol_syslog(get_class($this)."::create ".$this->error, LOG_DEBUG);
+					$this->db->rollback();
 					return -1;
 				}
 			}

From 6f97a551ef2171a21052d18150154913fe7b0587 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 13 Jun 2021 20:32:11 +0200
Subject: [PATCH 0601/1497] Clean code

---
 htdocs/public/project/suggestbooth.php      | 5 +++--
 htdocs/public/project/suggestconference.php | 5 +++--
 htdocs/public/project/viewandvote.php       | 2 ++
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/htdocs/public/project/suggestbooth.php b/htdocs/public/project/suggestbooth.php
index 65b15578b7d..77d3873511a 100644
--- a/htdocs/public/project/suggestbooth.php
+++ b/htdocs/public/project/suggestbooth.php
@@ -115,6 +115,7 @@ $user->loadDefaultValues();
 $cactioncomm = new CActionComm($db);
 $arrayofeventtype = $cactioncomm->liste_array('', 'id', '', 0, 'module=\'booth@eventorganization\'');
 
+
 /**
  * Show header for new member
  *
@@ -183,10 +184,10 @@ function llxFooterVierge()
 /*
  * Actions
  */
-global $mysoc;
+
 $parameters = array();
 // Note that $action and $object may have been modified by some hooks
-$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $project, $action);
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
diff --git a/htdocs/public/project/suggestconference.php b/htdocs/public/project/suggestconference.php
index 19eb0801c6a..45dbaf80656 100644
--- a/htdocs/public/project/suggestconference.php
+++ b/htdocs/public/project/suggestconference.php
@@ -115,6 +115,7 @@ $user->loadDefaultValues();
 $cactioncomm = new CActionComm($db);
 $arrayofeventtype = $cactioncomm->liste_array('', 'id', '', 0, 'module=\'conference@eventorganization\'');
 
+
 /**
  * Show header for new member
  *
@@ -183,10 +184,10 @@ function llxFooterVierge()
 /*
  * Actions
  */
-global $mysoc;
+
 $parameters = array();
 // Note that $action and $object may have been modified by some hooks
-$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $project, $action);
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
diff --git a/htdocs/public/project/viewandvote.php b/htdocs/public/project/viewandvote.php
index 9177e0edc8d..9252a7ac50f 100644
--- a/htdocs/public/project/viewandvote.php
+++ b/htdocs/public/project/viewandvote.php
@@ -89,9 +89,11 @@ if ($resultproject < 0) {
 	$errmsg .= $project->error;
 }
 
+
 /*
  * Actions
  */
+
 $tmpthirdparty = new Societe($db);
 
 $listOfConferences = $listOfBooths = '<tr><td>'.$langs->trans('Label').'</td>

From 3eea92c6e6495920d6fe94d34223e033889560d2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 13 Jun 2021 20:36:12 +0200
Subject: [PATCH 0602/1497] Clean code

---
 htdocs/public/eventorganization/attendee_subscription.php | 5 +++++
 htdocs/public/eventorganization/subscriptionok.php        | 8 +++++++-
 htdocs/public/project/index.html                          | 1 -
 htdocs/public/project/suggestbooth.php                    | 5 +++++
 htdocs/public/project/suggestconference.php               | 5 +++++
 htdocs/public/project/viewandvote.php                     | 5 +++++
 6 files changed, 27 insertions(+), 2 deletions(-)
 delete mode 100644 htdocs/public/project/index.html

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index a81ac456353..96dd77bce74 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -115,6 +115,11 @@ $extrafields = new ExtraFields($db);
 
 $user->loadDefaultValues();
 
+// Security check
+if (empty($conf->eventorganization->enabled)) {
+	accessforbidden('', 0, 0, 1);
+}
+
 
 /**
  * Show header for new member
diff --git a/htdocs/public/eventorganization/subscriptionok.php b/htdocs/public/eventorganization/subscriptionok.php
index 8586535f5ab..b45e98b832a 100644
--- a/htdocs/public/eventorganization/subscriptionok.php
+++ b/htdocs/public/eventorganization/subscriptionok.php
@@ -66,7 +66,7 @@ $object = new stdClass(); // For triggers
 $error = 0;
 
 // Security check
-$id = GETPOST("id");
+$id = GETPOST("id", 'int');
 $securekeyreceived = GETPOST("securekey");
 $securekeytocompare = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$id, 2);
 
@@ -75,6 +75,12 @@ if ($securekeyreceived != $securekeytocompare) {
 	exit;
 }
 
+// Security check
+if (empty($conf->eventorganization->enabled)) {
+	accessforbidden('', 0, 0, 1);
+}
+
+
 /*
  * Actions
  */
diff --git a/htdocs/public/project/index.html b/htdocs/public/project/index.html
deleted file mode 100644
index 8b137891791..00000000000
--- a/htdocs/public/project/index.html
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/htdocs/public/project/suggestbooth.php b/htdocs/public/project/suggestbooth.php
index 77d3873511a..f5ef237a9bd 100644
--- a/htdocs/public/project/suggestbooth.php
+++ b/htdocs/public/project/suggestbooth.php
@@ -115,6 +115,11 @@ $user->loadDefaultValues();
 $cactioncomm = new CActionComm($db);
 $arrayofeventtype = $cactioncomm->liste_array('', 'id', '', 0, 'module=\'booth@eventorganization\'');
 
+// Security check
+if (empty($conf->eventorganization->enabled)) {
+	accessforbidden('', 0, 0, 1);
+}
+
 
 /**
  * Show header for new member
diff --git a/htdocs/public/project/suggestconference.php b/htdocs/public/project/suggestconference.php
index 45dbaf80656..4ef1784e2a7 100644
--- a/htdocs/public/project/suggestconference.php
+++ b/htdocs/public/project/suggestconference.php
@@ -115,6 +115,11 @@ $user->loadDefaultValues();
 $cactioncomm = new CActionComm($db);
 $arrayofeventtype = $cactioncomm->liste_array('', 'id', '', 0, 'module=\'conference@eventorganization\'');
 
+// Security check
+if (empty($conf->eventorganization->enabled)) {
+	accessforbidden('', 0, 0, 1);
+}
+
 
 /**
  * Show header for new member
diff --git a/htdocs/public/project/viewandvote.php b/htdocs/public/project/viewandvote.php
index 9252a7ac50f..64307018c38 100644
--- a/htdocs/public/project/viewandvote.php
+++ b/htdocs/public/project/viewandvote.php
@@ -89,6 +89,11 @@ if ($resultproject < 0) {
 	$errmsg .= $project->error;
 }
 
+// Security check
+if (empty($conf->eventorganization->enabled)) {
+	accessforbidden('', 0, 0, 1);
+}
+
 
 /*
  * Actions

From 465ee6e643458e76472181089c75a1df7e04dda7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 13 Jun 2021 20:37:53 +0200
Subject: [PATCH 0603/1497] Fix security check on public pages

---
 htdocs/public/project/index.php     |  6 ++++++
 htdocs/public/project/new.php       | 10 +++++-----
 htdocs/public/recruitment/index.php |  5 ++++-
 htdocs/public/recruitment/view.php  |  5 +++++
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/htdocs/public/project/index.php b/htdocs/public/project/index.php
index 48c77944d72..d3dca7def6f 100644
--- a/htdocs/public/project/index.php
+++ b/htdocs/public/project/index.php
@@ -94,6 +94,12 @@ if ($resultproject < 0) {
 	$errmsg .= $project->error;
 }
 
+// Security check
+if (empty($conf->projet->enabled)) {
+	accessforbidden('', 0, 0, 1);
+}
+
+
 /*
  * Actions
  */
diff --git a/htdocs/public/project/new.php b/htdocs/public/project/new.php
index e4a8b495d7c..240b3d8f036 100644
--- a/htdocs/public/project/new.php
+++ b/htdocs/public/project/new.php
@@ -67,11 +67,6 @@ $action = GETPOST('action', 'aZ09');
 // Load translation files
 $langs->loadLangs(array("members", "companies", "install", "other"));
 
-// Security check
-if (empty($conf->projet->enabled)) {
-	accessforbidden('', 0, 0, 1);
-}
-
 if (empty($conf->global->PROJECT_ENABLE_PUBLIC)) {
 	print $langs->trans("Form for public lead registration has not been enabled");
 	exit;
@@ -86,6 +81,11 @@ $object = new Project($db);
 
 $user->loadDefaultValues();
 
+// Security check
+if (empty($conf->projet->enabled)) {
+	accessforbidden('', 0, 0, 1);
+}
+
 
 /**
  * Show header for new member
diff --git a/htdocs/public/recruitment/index.php b/htdocs/public/recruitment/index.php
index 7d4ec0223f1..cf7e8f8bc24 100644
--- a/htdocs/public/recruitment/index.php
+++ b/htdocs/public/recruitment/index.php
@@ -55,7 +55,10 @@ $email = GETPOST('email', 'alpha');
 
 $object = new RecruitmentJobPosition($db);
 
-
+// Security check
+if (empty($conf->recruitement->enabled)) {
+	accessforbidden('', 0, 0, 1);
+}
 
 
 /*
diff --git a/htdocs/public/recruitment/view.php b/htdocs/public/recruitment/view.php
index 27aaa0fd0f4..2fe6a9af21e 100644
--- a/htdocs/public/recruitment/view.php
+++ b/htdocs/public/recruitment/view.php
@@ -74,6 +74,11 @@ if (!$action) {
 //$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. For Paypal payment, we can use internal URL like localhost.
 
+// Security check
+if (empty($conf->recruitement->enabled)) {
+	accessforbidden('', 0, 0, 1);
+}
+
 
 /*
  * Actions

From 34cebe6aa3914ed22e2849c3729af78b1379e78e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 14 Jun 2021 01:11:39 +0200
Subject: [PATCH 0604/1497] Look and feel v14

---
 htdocs/adherents/stats/byproperties.php   |  4 +-
 htdocs/adherents/stats/geo.php            |  4 +-
 htdocs/adherents/stats/index.php          |  8 +-
 htdocs/comm/propal/stats/index.php        | 89 +++++++++++------------
 htdocs/commande/stats/index.php           | 12 +--
 htdocs/compta/deplacement/stats/index.php | 11 +--
 htdocs/compta/facture/list.php            |  4 +-
 htdocs/compta/facture/stats/index.php     | 25 +++----
 htdocs/don/stats/index.php                | 52 +++++++------
 htdocs/expedition/stats/index.php         | 52 +++++++------
 htdocs/expensereport/stats/index.php      | 10 +--
 htdocs/fichinter/stats/index.php          | 66 ++++++++---------
 htdocs/product/stats/card.php             |  6 +-
 htdocs/projet/stats/index.php             |  8 +-
 htdocs/projet/tasks/stats/index.php       |  5 +-
 htdocs/reception/stats/index.php          | 52 +++++++------
 htdocs/salaries/stats/index.php           |  8 +-
 htdocs/ticket/index.php                   |  3 +-
 htdocs/ticket/stats/index.php             | 11 +--
 19 files changed, 212 insertions(+), 218 deletions(-)

diff --git a/htdocs/adherents/stats/byproperties.php b/htdocs/adherents/stats/byproperties.php
index 1238fd0fe15..f934ebcf0af 100644
--- a/htdocs/adherents/stats/byproperties.php
+++ b/htdocs/adherents/stats/byproperties.php
@@ -40,7 +40,7 @@ if ($user->socid > 0) {
 $result = restrictedArea($user, 'adherent', '', '', 'cotisation');
 
 $year = strftime("%Y", time());
-$startyear = $year - 2;
+$startyear = $year - (empty($conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS) ? 2 : max(1, min(10, $conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS)));
 $endyear = $year;
 
 // Load translation files required by the page
@@ -69,7 +69,7 @@ $sql .= " d.morphy as code";
 $sql .= " FROM ".MAIN_DB_PREFIX."adherent as d";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."subscription as s ON s.fk_adherent = d.rowid";
 $sql .= " WHERE d.entity IN (".getEntity('adherent').")";
-$sql .= " AND d.statut != -1"; // Not draft
+$sql .= " AND d.statut <> -1"; // Not draft
 $sql .= " GROUP BY d.morphy";
 $foundphy = $foundmor = 0;
 
diff --git a/htdocs/adherents/stats/geo.php b/htdocs/adherents/stats/geo.php
index 74a5c9b014e..e4a7816c002 100644
--- a/htdocs/adherents/stats/geo.php
+++ b/htdocs/adherents/stats/geo.php
@@ -42,7 +42,7 @@ if ($user->socid > 0) {
 $result = restrictedArea($user, 'adherent', '', '', 'cotisation');
 
 $year = strftime("%Y", time());
-$startyear = $year - 2;
+$startyear = $year - (empty($conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS) ? 2 : max(1, min(10, $conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS)));
 $endyear = $year;
 
 // Load translation files required by the page
@@ -92,7 +92,7 @@ if ($mode) {
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c on d.country = c.rowid";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."subscription as s ON s.fk_adherent = d.rowid";
 		$sql .= " WHERE d.entity IN (".getEntity('adherent').")";
-		$sql .= " AND d.statut != -1";
+		$sql .= " AND d.statut <> -1";
 		$sql .= " GROUP BY c.label, c.code";
 		//print $sql;
 	}
diff --git a/htdocs/adherents/stats/index.php b/htdocs/adherents/stats/index.php
index e820d0a0d23..c216214606d 100644
--- a/htdocs/adherents/stats/index.php
+++ b/htdocs/adherents/stats/index.php
@@ -47,7 +47,7 @@ if ($user->socid > 0) {
 $result = restrictedArea($user, 'adherent', '', '', 'cotisation');
 
 $year = strftime("%Y", time());
-$startyear = $year - 2;
+$startyear = $year - (empty($conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS) ? 2 : max(1, min(10, $conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS)));
 $endyear = $year;
 
 // Load translation files required by the page
@@ -151,12 +151,14 @@ print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<table class="border centpercent">';
 print '<tr class="liste_titre"><td class="liste_titre" colspan="2">'.$langs->trans("Filter").'</td></tr>';
 print '<tr><td>'.$langs->trans("Member").'</td><td>';
+print img_picto('', 'company', 'class="pictofixedwidth"');
 print $form->select_company($id,'memberid','',1);
 print '</td></tr>';
 print '<tr><td>'.$langs->trans("User").'</td><td>';
-print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
+print img_picto('', 'user', 'class="pictofixedwidth"');
+print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'widthcentpercentminusx maxwidth300');
 print '</td></tr>';
-print '<tr><td class="center" colspan="2"><input type="submit" name="submit" class="button" value="'.$langs->trans("Refresh").'"></td></tr>';
+print '<tr><td class="center" colspan="2"><input type="submit" name="submit" class="button small" value="'.$langs->trans("Refresh").'"></td></tr>';
 print '</table>';
 print '</form>';
 print '<br><br>';
diff --git a/htdocs/comm/propal/stats/index.php b/htdocs/comm/propal/stats/index.php
index c0d92908aab..c1975e309f5 100644
--- a/htdocs/comm/propal/stats/index.php
+++ b/htdocs/comm/propal/stats/index.php
@@ -53,8 +53,7 @@ if ($user->socid > 0) {
 
 $nowyear = strftime("%Y", dol_now());
 $year = GETPOST('year') > 0 ? GETPOST('year', 'int') : $nowyear;
-//$startyear=$year-2;
-$startyear = $year - 1;
+$startyear = $year - (empty($conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS) ? 2 : max(1, min(10, $conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS)));
 $endyear = $year;
 
 // Load translation files required by the page
@@ -254,56 +253,56 @@ print dol_get_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1);
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
 
-//if (empty($socid))
-//{
-	// Show filter box
-	print '<form name="stats" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-	print '<input type="hidden" name="token" value="'.newToken().'">';
-	print '<input type="hidden" name="mode" value="'.$mode.'">';
+// Show filter box
+print '<form name="stats" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="mode" value="'.$mode.'">';
 
-	print '<table class="noborder centpercent">';
-	print '<tr class="liste_titre"><td class="liste_titre" colspan="2">'.$langs->trans("Filter").'</td></tr>';
-	// Company
-	print '<tr><td class="left">'.$langs->trans("ThirdParty").'</td><td class="left">';
-	$filter = 's.client IN (1,2,3)';
-	print $form->select_company($socid, 'socid', $filter, 1, 0, 0, array(), 0, '', 'style="width: 95%"');
-	print '</td></tr>';
-	// ThirdParty Type
-	print '<tr><td>'.$langs->trans("ThirdPartyType").'</td><td>';
-	$sortparam_typent = (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT); // NONE means we keep sort of original array, so we sort on position. ASC, means next function will sort on label.
-	print $form->selectarray("typent_id", $formcompany->typent_array(0), $typent_id, 1, 0, 0, '', 0, 0, 0, $sortparam_typent, '', 1);
+print '<table class="noborder centpercent">';
+print '<tr class="liste_titre"><td class="liste_titre" colspan="2">'.$langs->trans("Filter").'</td></tr>';
+// Company
+print '<tr><td class="left">'.$langs->trans("ThirdParty").'</td><td class="left">';
+$filter = 's.client IN (1,2,3)';
+print img_picto('', 'company', 'class="pictofixedwidth"');
+print $form->select_company($socid, 'socid', $filter, 1, 0, 0, array(), 0, 'widthcentpercentminusx maxwidth300', '');
+print '</td></tr>';
+// ThirdParty Type
+print '<tr><td>'.$langs->trans("ThirdPartyType").'</td><td>';
+$sortparam_typent = (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT); // NONE means we keep sort of original array, so we sort on position. ASC, means next function will sort on label.
+print $form->selectarray("typent_id", $formcompany->typent_array(0), $typent_id, 1, 0, 0, '', 0, 0, 0, $sortparam_typent, '', 1);
 if ($user->admin) {
 	print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 }
-	print '</td></tr>';
-	// Category
-	print '<tr><td>'.$cat_label.'</td><td>';
-	print $formother->select_categories($cat_type, $categ_id, 'categ_id', true);
-	print '</td></tr>';
-	// User
-	print '<tr><td class="left">'.$langs->trans("CreatedBy").'</td><td class="left">';
-	print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
-	print '</td></tr>';
-	// Status
-	print '<tr><td class="left">'.$langs->trans("Status").'</td><td class="left">';
-	$formpropal->selectProposalStatus(($object_status != '' ? $object_status : -1), 0, 0, 1, $mode, 'object_status');
-	print '</td></tr>';
-	// Year
-	print '<tr><td class="left">'.$langs->trans("Year").'</td><td class="left">';
+print '</td></tr>';
+// Category
+print '<tr><td>'.$cat_label.'</td><td>';
+print img_picto('', 'category', 'class="pictofixedwidth"');
+print $formother->select_categories($cat_type, $categ_id, 'categ_id', 0, 1, 'widthcentpercentminusx maxwidth300');
+print '</td></tr>';
+// User
+print '<tr><td>'.$langs->trans("CreatedBy").'</td><td>';
+print img_picto('', 'user', 'class="pictofixedwidth"');
+print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'widthcentpercentminusx maxwidth300');
+print '</td></tr>';
+// Status
+print '<tr><td>'.$langs->trans("Status").'</td><td>';
+$formpropal->selectProposalStatus(($object_status != '' ? $object_status : -1), 0, 0, 1, $mode, 'object_status');
+print '</td></tr>';
+// Year
+print '<tr><td>'.$langs->trans("Year").'</td><td>';
 if (!in_array($year, $arrayyears)) {
 	$arrayyears[$year] = $year;
 }
 if (!in_array($nowyear, $arrayyears)) {
 	$arrayyears[$nowyear] = $nowyear;
 }
-	arsort($arrayyears);
-	print $form->selectarray('year', $arrayyears, $year, 0);
-	print '</td></tr>';
-	print '<tr><td align="center" colspan="2"><input type="submit" name="submit" class="button" value="'.$langs->trans("Refresh").'"></td></tr>';
-	print '</table>';
-	print '</form>';
-	print '<br><br>';
-//}
+arsort($arrayyears);
+print $form->selectarray('year', $arrayyears, $year, 0);
+print '</td></tr>';
+print '<tr><td align="center" colspan="2"><input type="submit" name="submit" class="button small" value="'.$langs->trans("Refresh").'"></td></tr>';
+print '</table>';
+print '</form>';
+print '<br><br>';
 
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
@@ -336,11 +335,11 @@ foreach ($data as $val) {
 	print '<tr class="oddeven" height="24">';
 	print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$year.($socid > 0 ? '&socid='.$socid : '').($userid > 0 ? '&userid='.$userid : '').'">'.$year.'</a></td>';
 	print '<td class="right">'.$val['nb'].'</td>';
-	print '<td class="right" style="'.(($val['nb_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.round($val['nb_diff']).'</td>';
+	print '<td class="right opacitylow" style="'.(($val['nb_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.round($val['nb_diff']).'%</td>';
 	print '<td class="right">'.price(price2num($val['total'], 'MT'), 1).'</td>';
-	print '<td class="right" style="'.(($val['total_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.round($val['total_diff']).'</td>';
+	print '<td class="right opacitylow" style="'.(($val['total_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.round($val['total_diff']).'%</td>';
 	print '<td class="right">'.price(price2num($val['avg'], 'MT'), 1).'</td>';
-	print '<td class="right" style="'.(($val['avg_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.round($val['avg_diff']).'</td>';
+	print '<td class="right opacitylow" style="'.(($val['avg_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.round($val['avg_diff']).'%</td>';
 	print '</tr>';
 	$oldyear = $year;
 }
diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php
index 090d07baf81..aebed5e3eb4 100644
--- a/htdocs/commande/stats/index.php
+++ b/htdocs/commande/stats/index.php
@@ -60,8 +60,7 @@ if ($user->socid > 0) {
 
 $nowyear = strftime("%Y", dol_now());
 $year = GETPOST('year') > 0 ?GETPOST('year') : $nowyear;
-//$startyear=$year-2;
-$startyear = $year - 1;
+$startyear = $year - (empty($conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS) ? 2 : max(1, min(10, $conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS)));
 $endyear = $year;
 
 // Load translation files required by the page
@@ -295,7 +294,8 @@ if ($mode == 'customer') {
 if ($mode == 'supplier') {
 	$filter = 's.fournisseur = 1';
 }
-print $form->select_company($socid, 'socid', $filter, 1, 0, 0, array(), 0, '', 'style="width: 95%"');
+print img_picto('', 'company', 'class="pictofixedwidth"');
+print $form->select_company($socid, 'socid', $filter, 1, 0, 0, array(), 0, 'widthcentpercentminusx maxwidth300');
 print '</td></tr>';
 // ThirdParty Type
 print '<tr><td>'.$langs->trans("ThirdPartyType").'</td><td>';
@@ -315,11 +315,13 @@ if ($mode == 'supplier') {
 	$cat_label = $langs->trans("Category").' '.lcfirst($langs->trans("Supplier"));
 }
 print '<tr><td>'.$cat_label.'</td><td>';
+print img_picto('', 'category', 'class="pictofixedwidth"');
 print $formother->select_categories($cat_type, $categ_id, 'categ_id', true);
 print '</td></tr>';
 // User
 print '<tr><td class="left">'.$langs->trans("CreatedBy").'</td><td class="left">';
-print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
+print img_picto('', 'user', 'class="pictofixedwidth"');
+print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'widthcentpercentminusx maxwidth300');
 // Status
 print '<tr><td class="left">'.$langs->trans("Status").'</td><td class="left">';
 if ($mode == 'customer') {
@@ -347,7 +349,7 @@ if (!in_array($nowyear, $arrayyears)) {
 arsort($arrayyears);
 print $form->selectarray('year', $arrayyears, $year, 0);
 print '</td></tr>';
-print '<tr><td align="center" colspan="2"><input type="submit" name="submit" class="button" value="'.$langs->trans("Refresh").'"></td></tr>';
+print '<tr><td align="center" colspan="2"><input type="submit" name="submit" class="button small" value="'.$langs->trans("Refresh").'"></td></tr>';
 print '</table>';
 print '</form>';
 print '<br><br>';
diff --git a/htdocs/compta/deplacement/stats/index.php b/htdocs/compta/deplacement/stats/index.php
index 673cd7c1972..edc590119ef 100644
--- a/htdocs/compta/deplacement/stats/index.php
+++ b/htdocs/compta/deplacement/stats/index.php
@@ -63,8 +63,7 @@ if ($userid > 0) {
 
 $nowyear = strftime("%Y", dol_now());
 $year = GETPOST('year') > 0 ?GETPOST('year') : $nowyear;
-//$startyear=$year-2;
-$startyear = $year - 1;
+$startyear = $year - (empty($conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS) ? 2 : max(1, min(10, $conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS)));
 $endyear = $year;
 
 $mode = GETPOST("mode") ?GETPOST("mode") : 'customer';
@@ -243,7 +242,8 @@ print '<tr class="liste_titre"><td class="liste_titre" colspan="2">'.$langs->tra
 // Company
 print '<tr><td>'.$langs->trans("ThirdParty").'</td><td>';
 $filter = '';
-print $form->select_company($socid, 'socid', $filter, 1, 1, 0, array(), 0, '', 'style="width: 95%"');
+print img_picto('', 'company', 'class="pictofixedwidth"');
+print $form->select_company($socid, 'socid', $filter, 1, 1, 0, array(), 0, 'widthcentpercentminusx maxwidth300', '');
 print '</td></tr>';
 // User
 print '<tr><td>'.$langs->trans("User").'</td><td>';
@@ -251,7 +251,8 @@ $include = '';
 if (empty($user->rights->deplacement->readall) && empty($user->rights->deplacement->lire_tous)) {
 	$include = 'hierarchy';
 }
-print $form->select_dolusers($userid, 'userid', 1, '', 0, $include, '', 0, 0, 0, '', 0, '', 'maxwidth300');
+print img_picto('', 'user', 'class="pictofixedwidth"');
+print $form->select_dolusers($userid, 'userid', 1, '', 0, $include, '', 0, 0, 0, '', 0, '', 'widthcentpercentminusx maxwidth300');
 print '</td></tr>';
 // Year
 print '<tr><td>'.$langs->trans("Year").'</td><td>';
@@ -261,7 +262,7 @@ if (!in_array($year, $arrayyears)) {
 arsort($arrayyears);
 print $form->selectarray('year', $arrayyears, $year, 0);
 print '</td></tr>';
-print '<tr><td align="center" colspan="2"><input type="submit" name="submit" class="button" value="'.$langs->trans("Refresh").'"></td></tr>';
+print '<tr><td align="center" colspan="2"><input type="submit" name="submit" class="button small" value="'.$langs->trans("Refresh").'"></td></tr>';
 print '</table>';
 print '</form>';
 print '<br><br>';
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 370a0ac4070..cc52984d6d4 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -717,7 +717,7 @@ $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // No
 $sql .= $hookmanager->resPrint;
 
 if (!$sall) {
-	$sql .= ' GROUP BY f.rowid, f.ref, ref_client, f.type, f.note_private, f.note_public, f.increment, f.fk_mode_reglement, f.fk_cond_reglement, f.total_ht, f.total_tva, f.total_ttc,';
+	$sql .= ' GROUP BY f.rowid, f.ref, ref_client, f.fk_soc, f.type, f.note_private, f.note_public, f.increment, f.fk_mode_reglement, f.fk_cond_reglement, f.total_ht, f.total_tva, f.total_ttc,';
 	$sql .= ' f.localtax1, f.localtax2,';
 	$sql .= ' f.datef, f.date_valid, f.date_lim_reglement, f.module_source, f.pos_source,';
 	$sql .= ' f.paye, f.fk_statut, f.close_code,';
@@ -1049,7 +1049,7 @@ if ($resql) {
 		$moreforfilter .= '<div class="divsearchfield">';
 		$tmptitle = $langs->trans('IncludingProductWithTag');
 		$cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, null, 'parent', null, null, 1);
-		$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$form->selectarray('search_product_category', $cate_arbo, $search_product_category, $tmptitle, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1);
+		$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$form->selectarray('search_product_category', $cate_arbo, $search_product_category, $tmptitle, 0, 0, '', 0, 0, 0, 0, 'maxwidth250', 1);
 		$moreforfilter .= '</div>';
 	}
 	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire) {
diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php
index 9fcfff783b3..307e39cbf62 100644
--- a/htdocs/compta/facture/stats/index.php
+++ b/htdocs/compta/facture/stats/index.php
@@ -65,11 +65,7 @@ if ($user->socid > 0) {
 
 $nowyear = strftime("%Y", dol_now());
 $year = GETPOST('year') > 0 ? GETPOST('year', 'int') : $nowyear;
-if (!empty($conf->global->INVOICE_STATS_GRAPHS_SHOW_2_YEARS)) {
-	$startyear = $year - 2;
-} else {
-	$startyear = $year - 1;
-}
+$startyear = $year - (empty($conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS) ? 2 : max(1, min(10, $conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS)));
 $endyear = $year;
 
 
@@ -291,7 +287,8 @@ if ($mode == 'customer') {
 if ($mode == 'supplier') {
 	$filter = 's.fournisseur = 1';
 }
-print $form->selectarray('socid', $companies, $socid, 1, 0, 0, 'style="width: 95%"', 0, 0, 0, '', '', 1);
+print img_picto('', 'company', 'class="pictofixedwidth"');
+print $form->selectarray('socid', $companies, $socid, 1, 0, 0, '', 0, 0, 0, '', 'maxwidth250', 1);
 print '</td></tr>';
 
 // ThirdParty Type
@@ -315,17 +312,19 @@ if (!empty($conf->category->enabled)) {
 	}
 	print '<tr><td>'.$cat_label.'</td><td>';
 	$cate_arbo = $form->select_all_categories(Categorie::TYPE_CUSTOMER, null, 'parent', null, null, 1);
-	print $form->multiselectarray('custcats', $cate_arbo, GETPOST('custcats', 'array'), null, null, null, null, "90%");
+	print img_picto('', 'category', 'class="pictofixedwidth"');
+	print $form->multiselectarray('custcats', $cate_arbo, GETPOST('custcats', 'array'), 0, 0, 'widthcentpercentminusx maxwidth300');
 	//print $formother->select_categories($cat_type, $categ_id, 'categ_id', true);
 	print '</td></tr>';
 }
 
 // User
 print '<tr><td>'.$langs->trans("CreatedBy").'</td><td>';
-print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
+print img_picto('', 'user', 'class="pictofixedwidth"');
+print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'widthcentpercentminusx maxwidth300');
 print '</td></tr>';
 // Status
-print '<tr><td class="left">'.$langs->trans("Status").'</td><td class="left">';
+print '<tr><td>'.$langs->trans("Status").'</td><td>';
 if ($mode == 'customer') {
 	$liststatus = array('0'=>$langs->trans("BillStatusDraft"), '1'=>$langs->trans("BillStatusNotPaid"), '2'=>$langs->trans("BillStatusPaid"), '1,2'=>$langs->trans("BillStatusNotPaid").' / '.$langs->trans("BillStatusPaid"), '3'=>$langs->trans("BillStatusCanceled"));
 	print $form->selectarray('object_status', $liststatus, $object_status, 1);
@@ -346,7 +345,7 @@ if (!in_array($nowyear, $arrayyears)) {
 arsort($arrayyears);
 print $form->selectarray('year', $arrayyears, $year, 0);
 print '</td></tr>';
-print '<tr><td align="center" colspan="2"><input type="submit" name="submit" class="button" value="'.$langs->trans("Refresh").'"></td></tr>';
+print '<tr><td class="center" colspan="2"><input type="submit" name="submit" class="button small" value="'.$langs->trans("Refresh").'"></td></tr>';
 print '</table>';
 print '</form>';
 print '<br><br>';
@@ -383,11 +382,11 @@ foreach ($data as $val) {
 	print '<tr class="oddeven" height="24">';
 	print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&amp;mode='.$mode.($socid > 0 ? '&socid='.$socid : '').($userid > 0 ? '&userid='.$userid : '').'">'.$year.'</a></td>';
 	print '<td class="right">'.$val['nb'].'</td>';
-	print '<td class="right" style="'.(($val['nb_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.round($val['nb_diff']).'</td>';
+	print '<td class="right opacitylow" style="'.(($val['nb_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.($val['nb_diff'] < 0 ? '' : '+').round($val['nb_diff']).'%</td>';
 	print '<td class="right"><span class="amount">'.price(price2num($val['total'], 'MT'), 1).'</span></td>';
-	print '<td class="right" style="'.(($val['total_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.round($val['total_diff']).'</td>';
+	print '<td class="right opacitylow" style="'.(($val['total_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.($val['total_diff'] < 0 ? '' : '+').round($val['total_diff']).'%</td>';
 	print '<td class="right"><span class="amount">'.price(price2num($val['avg'], 'MT'), 1).'</span></td>';
-	print '<td class="right" style="'.(($val['avg_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.round($val['avg_diff']).'</td>';
+	print '<td class="right opacitylow" style="'.(($val['avg_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.($val['avg_diff'] < 0 ? '' : '+').round($val['avg_diff']).'%</td>';
 	print '</tr>';
 	$oldyear = $year;
 }
diff --git a/htdocs/don/stats/index.php b/htdocs/don/stats/index.php
index 917e30edb50..23e6c0a46c0 100644
--- a/htdocs/don/stats/index.php
+++ b/htdocs/don/stats/index.php
@@ -42,8 +42,7 @@ if ($user->socid > 0) {
 
 $nowyear = strftime("%Y", dol_now());
 $year = GETPOST('year') > 0 ?GETPOST('year') : $nowyear;
-//$startyear=$year-2;
-$startyear = $year - 1;
+$startyear = $year - (empty($conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS) ? 2 : max(1, min(10, $conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS)));
 $endyear = $year;
 
 // Load translation files required by the page
@@ -209,38 +208,37 @@ print dol_get_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1);
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
 
-//if (empty($socid))
-//{
-	// Show filter box
-	print '<form name="stats" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-	print '<input type="hidden" name="token" value="'.newToken().'">';
+// Show filter box
+print '<form name="stats" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
 
-	print '<table class="border centpercent">';
-	print '<tr class="liste_titre"><td class="liste_titre" colspan="2">'.$langs->trans("Filter").'</td></tr>';
-	// Company
-	print '<tr><td class="left">'.$langs->trans("ThirdParty").'</td><td class="left">';
-	print $form->select_company($socid, 'socid', '', 1, 0, 0, array(), 0, '', 'style="width: 95%"');
-	print '</td></tr>';
-	// User
-	print '<tr><td class="left">'.$langs->trans("CreatedBy").'</td><td class="left">';
-	print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
-	print '</td></tr>';
-	// Year
-	print '<tr><td class="left">'.$langs->trans("Year").'</td><td class="left">';
+print '<table class="border centpercent">';
+print '<tr class="liste_titre"><td class="liste_titre" colspan="2">'.$langs->trans("Filter").'</td></tr>';
+// Company
+print '<tr><td class="left">'.$langs->trans("ThirdParty").'</td><td class="left">';
+print img_picto('', 'company', 'class="pictofixedwidth"');
+print $form->select_company($socid, 'socid', '', 1, 0, 0, array(), 0, 'widthcentpercentminusx maxwidth300', '');
+print '</td></tr>';
+// User
+print '<tr><td class="left">'.$langs->trans("CreatedBy").'</td><td class="left">';
+print img_picto('', 'user', 'class="pictofixedwidth"');
+print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'widthcentpercentminusx maxwidth300');
+print '</td></tr>';
+// Year
+print '<tr><td class="left">'.$langs->trans("Year").'</td><td class="left">';
 if (!in_array($year, $arrayyears)) {
 	$arrayyears[$year] = $year;
 }
 if (!in_array($nowyear, $arrayyears)) {
 	$arrayyears[$nowyear] = $nowyear;
 }
-	arsort($arrayyears);
-	print $form->selectarray('year', $arrayyears, $year, 0);
-	print '</td></tr>';
-	print '<tr><td class="center" colspan="2"><input type="submit" name="submit" class="button" value="'.$langs->trans("Refresh").'"></td></tr>';
-	print '</table>';
-	print '</form>';
-	print '<br><br>';
-//}
+arsort($arrayyears);
+print $form->selectarray('year', $arrayyears, $year, 0);
+print '</td></tr>';
+print '<tr><td class="center" colspan="2"><input type="submit" name="submit" class="button small" value="'.$langs->trans("Refresh").'"></td></tr>';
+print '</table>';
+print '</form>';
+print '<br><br>';
 
 print '<div class="div-table-responsive-no-min">';
 print '<table class="border centpercent">';
diff --git a/htdocs/expedition/stats/index.php b/htdocs/expedition/stats/index.php
index 6bdc495472c..42cac2d3c92 100644
--- a/htdocs/expedition/stats/index.php
+++ b/htdocs/expedition/stats/index.php
@@ -41,8 +41,7 @@ if ($user->socid > 0) {
 
 $nowyear = dol_print_date(dol_now(), "%Y");
 $year = GETPOST('year') > 0 ?GETPOST('year') : $nowyear;
-//$startyear=$year-2;
-$startyear = $year - 1;
+$startyear = $year - (empty($conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS) ? 2 : max(1, min(10, $conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS)));
 $endyear = $year;
 
 // Load translation files required by the page
@@ -214,38 +213,37 @@ print dol_get_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1);
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
 
-//if (empty($socid))
-//{
-	// Show filter box
-	print '<form name="stats" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-	print '<input type="hidden" name="token" value="'.newToken().'">';
+// Show filter box
+print '<form name="stats" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
 
-	print '<table class="noborder centpercent">';
-	print '<tr class="liste_titre"><td class="liste_titre" colspan="2">'.$langs->trans("Filter").'</td></tr>';
-	// Company
-	print '<tr><td class="left">'.$langs->trans("ThirdParty").'</td><td class="left">';
-	print $form->select_company($socid, 'socid', '', 1, 0, 0, array(), 0, '', 'style="width: 95%"');
-	print '</td></tr>';
-	// User
-	print '<tr><td class="left">'.$langs->trans("CreatedBy").'</td><td class="left">';
-	print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
-	print '</td></tr>';
-	// Year
-	print '<tr><td class="left">'.$langs->trans("Year").'</td><td class="left">';
+print '<table class="noborder centpercent">';
+print '<tr class="liste_titre"><td class="liste_titre" colspan="2">'.$langs->trans("Filter").'</td></tr>';
+// Company
+print '<tr><td class="left">'.$langs->trans("ThirdParty").'</td><td class="left">';
+print img_picto('', 'company', 'class="pictofixedwidth"');
+print $form->select_company($socid, 'socid', '', 1, 0, 0, array(), 0, 'widthcentpercentminusx maxwidth300', '');
+print '</td></tr>';
+// User
+print '<tr><td class="left">'.$langs->trans("CreatedBy").'</td><td class="left">';
+print img_picto('', 'user', 'class="pictofixedwidth"');
+print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'widthcentpercentminusx maxwidth300');
+print '</td></tr>';
+// Year
+print '<tr><td class="left">'.$langs->trans("Year").'</td><td class="left">';
 if (!in_array($year, $arrayyears)) {
 	$arrayyears[$year] = $year;
 }
 if (!in_array($nowyear, $arrayyears)) {
 	$arrayyears[$nowyear] = $nowyear;
 }
-	arsort($arrayyears);
-	print $form->selectarray('year', $arrayyears, $year, 0);
-	print '</td></tr>';
-	print '<tr><td class="center" colspan="2"><input type="submit" name="submit" class="button" value="'.$langs->trans("Refresh").'"></td></tr>';
-	print '</table>';
-	print '</form>';
-	print '<br><br>';
-//}
+arsort($arrayyears);
+print $form->selectarray('year', $arrayyears, $year, 0);
+print '</td></tr>';
+print '<tr><td class="center" colspan="2"><input type="submit" name="submit" class="button small" value="'.$langs->trans("Refresh").'"></td></tr>';
+print '</table>';
+print '</form>';
+print '<br><br>';
 
 
 print '<div class="div-table-responsive-no-min">';
diff --git a/htdocs/expensereport/stats/index.php b/htdocs/expensereport/stats/index.php
index 87bac2dde1a..ce8add98d54 100644
--- a/htdocs/expensereport/stats/index.php
+++ b/htdocs/expensereport/stats/index.php
@@ -55,8 +55,7 @@ $result = restrictedArea($user, 'expensereport', $id, '');
 
 $nowyear = strftime("%Y", dol_now());
 $year = GETPOST('year') > 0 ? GETPOST('year', 'int') : $nowyear;
-//$startyear=$year-2;
-$startyear = $year - 1;
+$startyear = $year - (empty($conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS) ? 2 : max(1, min(10, $conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS)));
 $endyear = $year;
 
 
@@ -225,7 +224,7 @@ print '<tr class="liste_titre"><td class="liste_titre" colspan="2">'.$langs->tra
 // Company
 /*
 print '<tr><td>'.$langs->trans("ThirdParty").'</td><td>';
-print $form->select_company($socid,'socid','',1,1,0,array(),0,'','style="width: 95%"');
+print $form->select_company($socid,'socid','',1,1,0,array(),0,'widthcentpercentminusx maxwidth300','');
 print '</td></tr>';
 */
 // User
@@ -234,7 +233,8 @@ $include = '';
 if (empty($user->rights->expensereport->readall) && empty($user->rights->expensereport->lire_tous)) {
 	$include = 'hierarchy';
 }
-print $form->select_dolusers($userid, 'userid', 1, '', 0, $include, '', 0, 0, 0, '', 0, '', 'maxwidth300');
+print img_picto('', 'user', 'class="pictofixedwidth"');
+print $form->select_dolusers($userid, 'userid', 1, '', 0, $include, '', 0, 0, 0, '', 0, '', 'widthcentpercentminusx maxwidth300');
 print '</td></tr>';
 // Status
 print '<tr><td class="left">'.$langs->trans("Status").'</td><td class="left">';
@@ -251,7 +251,7 @@ if (!in_array($year, $arrayyears)) {
 arsort($arrayyears);
 print $form->selectarray('year', $arrayyears, $year, 0);
 print '</td></tr>';
-print '<tr><td class="center" colspan="2"><input type="submit" name="submit" class="button" value="'.$langs->trans("Refresh").'"></td></tr>';
+print '<tr><td class="center" colspan="2"><input type="submit" name="submit" class="button small" value="'.$langs->trans("Refresh").'"></td></tr>';
 print '</table>';
 print '</form>';
 print '<br><br>';
diff --git a/htdocs/fichinter/stats/index.php b/htdocs/fichinter/stats/index.php
index 29a5f9976b0..7a7adb639b3 100644
--- a/htdocs/fichinter/stats/index.php
+++ b/htdocs/fichinter/stats/index.php
@@ -44,8 +44,7 @@ if ($user->socid > 0) {
 
 $nowyear = strftime("%Y", dol_now());
 $year = GETPOST('year') > 0 ? GETPOST('year', 'int') : $nowyear;
-//$startyear=$year-2;
-$startyear = $year - 1;
+$startyear = $year - (empty($conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS) ? 2 : max(1, min(10, $conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS)));
 $endyear = $year;
 
 $object_status = GETPOST('object_status', 'intcomma');
@@ -211,48 +210,47 @@ print dol_get_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1);
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
 
-//if (empty($socid))
-//{
-	// Show filter box
-	print '<form name="stats" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-	print '<input type="hidden" name="token" value="'.newToken().'">';
-	print '<input type="hidden" name="mode" value="'.$mode.'">';
+// Show filter box
+print '<form name="stats" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="mode" value="'.$mode.'">';
 
-	print '<table class="noborder centpercent">';
-	print '<tr class="liste_titre"><td class="liste_titre" colspan="2">'.$langs->trans("Filter").'</td></tr>';
-	// Company
-	print '<tr><td class="left">'.$langs->trans("ThirdParty").'</td><td class="left">';
-	$filter = 's.client IN (1,2,3)';
-	print $form->select_company($socid, 'socid', $filter, 1, 0, 0, array(), 0, '', 'style="width: 95%"');
-	print '</td></tr>';
-	// User
-	print '<tr><td class="left">'.$langs->trans("CreatedBy").'</td><td class="left">';
-	print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
-	// Status
-	print '<tr><td class="left">'.$langs->trans("Status").'</td><td class="left">';
-	$tmp = $objectstatic->LibStatut(0); // To load $this->statuts_short
-	$liststatus = $objectstatic->statuts_short;
+print '<table class="noborder centpercent">';
+print '<tr class="liste_titre"><td class="liste_titre" colspan="2">'.$langs->trans("Filter").'</td></tr>';
+// Company
+print '<tr><td class="left">'.$langs->trans("ThirdParty").'</td><td class="left">';
+$filter = 's.client IN (1,2,3)';
+print img_picto('', 'company', 'class="pictofixedwidth"');
+print $form->select_company($socid, 'socid', $filter, 1, 0, 0, array(), 0, 'widthcentpercentminusx maxwidth300', '');
+print '</td></tr>';
+// User
+print '<tr><td class="left">'.$langs->trans("CreatedBy").'</td><td class="left">';
+print img_picto('', 'user', 'class="pictofixedwidth"');
+print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'widthcentpercentminusx maxwidth300');
+// Status
+print '<tr><td class="left">'.$langs->trans("Status").'</td><td class="left">';
+$tmp = $objectstatic->LibStatut(0); // To force load of $this->statuts_short
+$liststatus = $objectstatic->statuts_short;
 if (empty($conf->global->FICHINTER_CLASSIFY_BILLED)) {
 	unset($liststatus[2]); // Option deprecated. In a future, billed must be managed with a dedicated field to 0 or 1
 }
-	print $form->selectarray('object_status', $liststatus, $object_status, 1, 0, 0, '', 1);
-	print '</td></tr>';
-	// Year
-	print '<tr><td class="left">'.$langs->trans("Year").'</td><td class="left">';
+print $form->selectarray('object_status', $liststatus, $object_status, 1, 0, 0, '', 1);
+print '</td></tr>';
+// Year
+print '<tr><td class="left">'.$langs->trans("Year").'</td><td class="left">';
 if (!in_array($year, $arrayyears)) {
 	$arrayyears[$year] = $year;
 }
 if (!in_array($nowyear, $arrayyears)) {
 	$arrayyears[$nowyear] = $nowyear;
 }
-	arsort($arrayyears);
-	print $form->selectarray('year', $arrayyears, $year, 0);
-	print '</td></tr>';
-	print '<tr><td class="center" colspan="2"><input type="submit" name="submit" class="button" value="'.$langs->trans("Refresh").'"></td></tr>';
-	print '</table>';
-	print '</form>';
-	print '<br><br>';
-//}
+arsort($arrayyears);
+print $form->selectarray('year', $arrayyears, $year, 0);
+print '</td></tr>';
+print '<tr><td class="center" colspan="2"><input type="submit" name="submit" class="button small" value="'.$langs->trans("Refresh").'"></td></tr>';
+print '</table>';
+print '</form>';
+print '<br><br>';
 
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
diff --git a/htdocs/product/stats/card.php b/htdocs/product/stats/card.php
index d791100ae4a..6929c70a5ff 100644
--- a/htdocs/product/stats/card.php
+++ b/htdocs/product/stats/card.php
@@ -185,8 +185,8 @@ if ($result || empty($id)) {
 		// Tag
 		if ($conf->categorie->enabled) {
 			print '<tr><td class="titlefield">'.$langs->trans("Categories").'</td><td>';
-			$moreforfilter .= img_picto($langs->trans("Categories"), 'category', 'paddingright');
-			$moreforfilter .= $htmlother->select_categories(Categorie::TYPE_PRODUCT, $search_categ, 'search_categ', 1);
+			$moreforfilter .= img_picto($langs->trans("Categories"), 'category', 'class="pictofixedwidth"');
+			$moreforfilter .= $htmlother->select_categories(Categorie::TYPE_PRODUCT, $search_categ, 'search_categ', 1, 1, 'widthcentpercentminusx maxwidth300');
 			print $moreforfilter;
 			print '</td></tr>';
 		}
@@ -208,7 +208,7 @@ if ($result || empty($id)) {
 	print $form->selectarray('search_year', $arrayyears, $search_year, 1, 0, 0, '', 0, 0, 0, '', 'width75');
 	print '</td></tr>';
 	print '</table>';
-	print '<div class="center"><input type="submit" name="submit" class="button" value="'.$langs->trans("Refresh").'"></div>';
+	print '<div class="center"><input type="submit" name="submit" class="button small" value="'.$langs->trans("Refresh").'"></div>';
 	print '</form><br>';
 
 	print '<br>';
diff --git a/htdocs/projet/stats/index.php b/htdocs/projet/stats/index.php
index 6b1b0eac4c1..c420e2fbe79 100644
--- a/htdocs/projet/stats/index.php
+++ b/htdocs/projet/stats/index.php
@@ -45,8 +45,7 @@ if ($user->socid > 0) {
 }
 $nowyear = strftime("%Y", dol_now());
 $year = GETPOST('year') > 0 ?GETPOST('year') : $nowyear;
-//$startyear=$year-2;
-$startyear = $year - 1;
+$startyear = $year - (empty($conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS) ? 2 : max(1, min(10, $conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS)));
 $endyear = $year;
 
 // Load translation files required by the page
@@ -283,7 +282,8 @@ print '<table class="noborder centpercent">';
 print '<tr class="liste_titre"><td class="liste_titre" colspan="2">'.$langs->trans("Filter").'</td></tr>';
 // Company
 print '<tr><td>'.$langs->trans("ThirdParty").'</td><td>';
-print $form->select_company($socid, 'socid', '', 1, 0, 0, array(), 0, '', 'style="width: 95%"');
+print img_picto('', 'company', 'class="pictofixedwidth"');
+print $form->select_company($socid, 'socid', '', 1, 0, 0, array(), 0, 'widthcentpercentminusx maxwidth300', '');
 print '</td></tr>';
 // User
 /*print '<tr><td>'.$langs->trans("ProjectCommercial").'</td><td>';
@@ -300,7 +300,7 @@ if (!in_array($nowyear, $arrayyears)) {
 arsort($arrayyears);
 print $form->selectarray('year', $arrayyears, $year, 0);
 print '</td></tr>';
-print '<tr><td class="center" colspan="2"><input type="submit" name="submit" class="button" value="'.$langs->trans("Refresh").'"></td></tr>';
+print '<tr><td class="center" colspan="2"><input type="submit" name="submit" class="button small" value="'.$langs->trans("Refresh").'"></td></tr>';
 print '</table>';
 print '</form>';
 print '<br><br>';
diff --git a/htdocs/projet/tasks/stats/index.php b/htdocs/projet/tasks/stats/index.php
index 531b9eb7b3a..76c74ba343c 100644
--- a/htdocs/projet/tasks/stats/index.php
+++ b/htdocs/projet/tasks/stats/index.php
@@ -45,8 +45,7 @@ if ($user->socid > 0) {
 }
 $nowyear = strftime("%Y", dol_now());
 $year = GETPOST('year') > 0 ?GETPOST('year') : $nowyear;
-//$startyear=$year-2;
-$startyear = $year - 1;
+$startyear = $year - (empty($conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS) ? 2 : max(1, min(10, $conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS)));
 $endyear = $year;
 
 // Load translation files required by the page
@@ -171,7 +170,7 @@ if (!in_array($nowyear, $arrayyears)) {
 arsort($arrayyears);
 print $form->selectarray('year', $arrayyears, $year, 0);
 print '</td></tr>';
-print '<tr><td class="center" colspan="2"><input type="submit" name="submit" class="button" value="'.$langs->trans("Refresh").'"></td></tr>';
+print '<tr><td class="center" colspan="2"><input type="submit" name="submit" class="button small" value="'.$langs->trans("Refresh").'"></td></tr>';
 print '</table>';
 print '</form>';
 print '<br><br>';
diff --git a/htdocs/reception/stats/index.php b/htdocs/reception/stats/index.php
index 1fe3397ef66..61098e74322 100644
--- a/htdocs/reception/stats/index.php
+++ b/htdocs/reception/stats/index.php
@@ -37,8 +37,7 @@ $socid = GETPOST('socid', 'int');
 
 $nowyear = strftime("%Y", dol_now());
 $year = GETPOST('year') > 0 ?GETPOST('year') : $nowyear;
-//$startyear=$year-2;
-$startyear = $year - 1;
+$startyear = $year - (empty($conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS) ? 2 : max(1, min(10, $conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS)));
 $endyear = $year;
 
 $langs->loadLangs(array("reception", "other", "companies"));
@@ -209,38 +208,37 @@ print dol_get_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1);
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
 
-//if (empty($socid))
-//{
-	// Show filter box
-	print '<form name="stats" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-	print '<input type="hidden" name="token" value="'.newToken().'">';
+// Show filter box
+print '<form name="stats" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
 
-	print '<table class="noborder centpercent">';
-	print '<tr class="liste_titre"><td class="liste_titre" colspan="2">'.$langs->trans("Filter").'</td></tr>';
-	// Company
-	print '<tr><td class="left">'.$langs->trans("ThirdParty").'</td><td class="left">';
-	print $form->select_company($socid, 'socid', '', 1, 0, 0, array(), 0, '', 'style="width: 95%"');
-	print '</td></tr>';
-	// User
-	print '<tr><td class="left">'.$langs->trans("CreatedBy").'</td><td class="left">';
-	print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
-	print '</td></tr>';
-	// Year
-	print '<tr><td class="left">'.$langs->trans("Year").'</td><td class="left">';
+print '<table class="noborder centpercent">';
+print '<tr class="liste_titre"><td class="liste_titre" colspan="2">'.$langs->trans("Filter").'</td></tr>';
+// Company
+print '<tr><td>'.$langs->trans("ThirdParty").'</td><td>';
+print img_picto('', 'company', 'class="pictofixedwidth"');
+print $form->select_company($socid, 'socid', '', 1, 0, 0, array(), 0, 'widthcentpercentminusx maxwidth300', '');
+print '</td></tr>';
+// User
+print '<tr><td>'.$langs->trans("CreatedBy").'</td><td>';
+print img_picto('', 'user', 'class="pictofixedwidth"');
+print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'widthcentpercentminusx maxwidth300');
+print '</td></tr>';
+// Year
+print '<tr><td>'.$langs->trans("Year").'</td><td>';
 if (!in_array($year, $arrayyears)) {
 	$arrayyears[$year] = $year;
 }
 if (!in_array($nowyear, $arrayyears)) {
 	$arrayyears[$nowyear] = $nowyear;
 }
-	arsort($arrayyears);
-	print $form->selectarray('year', $arrayyears, $year, 0);
-	print '</td></tr>';
-	print '<tr><td class="center" colspan="2"><input type="submit" name="submit" class="button" value="'.$langs->trans("Refresh").'"></td></tr>';
-	print '</table>';
-	print '</form>';
-	print '<br><br>';
-//}
+arsort($arrayyears);
+print $form->selectarray('year', $arrayyears, $year, 0);
+print '</td></tr>';
+print '<tr><td class="center" colspan="2"><input type="submit" name="submit" class="button small" value="'.$langs->trans("Refresh").'"></td></tr>';
+print '</table>';
+print '</form>';
+print '<br><br>';
 
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre" height="24">';
diff --git a/htdocs/salaries/stats/index.php b/htdocs/salaries/stats/index.php
index 1a7f2de6d39..ecc62c2a237 100644
--- a/htdocs/salaries/stats/index.php
+++ b/htdocs/salaries/stats/index.php
@@ -52,8 +52,7 @@ $result = restrictedArea($user, 'salaries', '', '', '');
 
 $nowyear = strftime("%Y", dol_now());
 $year = GETPOST('year') > 0 ?GETPOST('year') : $nowyear;
-//$startyear=$year-2;
-$startyear = $year - 1;
+$startyear = $year - (empty($conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS) ? 2 : max(1, min(10, $conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS)));
 $endyear = $year;
 
 
@@ -204,7 +203,8 @@ print '<table class="noborder centpercent">';
 print '<tr class="liste_titre"><td class="liste_titre" colspan="2">'.$langs->trans("Filter").'</td></tr>';
 // User
 print '<tr><td>'.$langs->trans("Employee").'</td><td>';
-print $form->select_dolusers(($userid ? $userid : -1), 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
+print img_picto('', 'user', 'class="pictofixedwidth"');
+print $form->select_dolusers(($userid ? $userid : -1), 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'widthcentpercentminusx maxwidth300');
 print '</td></tr>';
 // Year
 print '<tr><td>'.$langs->trans("Year").'</td><td>';
@@ -214,7 +214,7 @@ if (!in_array($year, $arrayyears)) {
 arsort($arrayyears);
 print $form->selectarray('year', $arrayyears, $year, 0);
 print '</td></tr>';
-print '<tr><td align="center" colspan="2"><input type="submit" name="submit" class="button" value="'.$langs->trans("Refresh").'"></td></tr>';
+print '<tr><td align="center" colspan="2"><input type="submit" name="submit" class="button small" value="'.$langs->trans("Refresh").'"></td></tr>';
 print '</table>';
 print '</form>';
 print '<br><br>';
diff --git a/htdocs/ticket/index.php b/htdocs/ticket/index.php
index 6bebe358af3..9e085d468ef 100644
--- a/htdocs/ticket/index.php
+++ b/htdocs/ticket/index.php
@@ -56,8 +56,7 @@ $result = restrictedArea($user, 'ticket', 0, '', '', '', '');
 
 $nowyear = strftime("%Y", dol_now());
 $year = GETPOST('year') > 0 ? GETPOST('year') : $nowyear;
-//$startyear=$year-2;
-$startyear = $year - 1;
+$startyear = $year - (empty($conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS) ? 2 : max(1, min(10, $conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS)));
 $endyear = $year;
 
 $object = new Ticket($db);
diff --git a/htdocs/ticket/stats/index.php b/htdocs/ticket/stats/index.php
index 9f6e1cc5471..6e87cd42854 100644
--- a/htdocs/ticket/stats/index.php
+++ b/htdocs/ticket/stats/index.php
@@ -46,8 +46,7 @@ if ($user->socid > 0) {
 
 $nowyear = strftime("%Y", dol_now());
 $year = GETPOST('year') > 0 ? GETPOST('year', 'int') : $nowyear;
-//$startyear=$year-2;
-$startyear = $year - 1;
+$startyear = $year - (empty($conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS) ? 2 : max(1, min(10, $conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS)));
 $endyear = $year;
 
 // Load translation files required by the page
@@ -223,11 +222,13 @@ print '<table class="noborder centpercent">';
 print '<tr class="liste_titre"><td class="liste_titre" colspan="2">'.$langs->trans("Filter").'</td></tr>';
 // Company
 print '<tr><td class="left">'.$langs->trans("ThirdParty").'</td><td class="left">';
-print $form->select_company($socid, 'socid', '', 1, 0, 0, array(), 0, '', 'style="width: 95%"');
+print img_picto('', 'company', 'class="pictofixedwidth"');
+print $form->select_company($socid, 'socid', '', 1, 0, 0, array(), 0, 'widthcentpercentminusx maxwidth300', '');
 print '</td></tr>';
 // User
 print '<tr><td class="left">'.$langs->trans("CreatedBy").'</td><td class="left">';
-print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
+print img_picto('', 'user', 'class="pictofixedwidth"');
+print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'widthcentpercentminusx maxwidth300');
 // Status
 print '<tr><td class="left">'.$langs->trans("Status").'</td><td class="left">';
 $liststatus = $object->fields['fk_statut']['arrayofkeyval'];
@@ -244,7 +245,7 @@ if (!in_array($nowyear, $arrayyears)) {
 arsort($arrayyears);
 print $form->selectarray('year', $arrayyears, $year, 0);
 print '</td></tr>';
-print '<tr><td class="center" colspan="2"><input type="submit" name="submit" class="button" value="'.$langs->trans("Refresh").'"></td></tr>';
+print '<tr><td class="center" colspan="2"><input type="submit" name="submit" class="button small" value="'.$langs->trans("Refresh").'"></td></tr>';
 print '</table>';
 print '</form>';
 print '<br><br>';

From aceeb9558f29ebd78fb449034bda70da0c962f17 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 14 Jun 2021 01:13:46 +0200
Subject: [PATCH 0605/1497] css

---
 htdocs/compta/facture/stats/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php
index 307e39cbf62..9b9630a5d5f 100644
--- a/htdocs/compta/facture/stats/index.php
+++ b/htdocs/compta/facture/stats/index.php
@@ -288,7 +288,7 @@ if ($mode == 'supplier') {
 	$filter = 's.fournisseur = 1';
 }
 print img_picto('', 'company', 'class="pictofixedwidth"');
-print $form->selectarray('socid', $companies, $socid, 1, 0, 0, '', 0, 0, 0, '', 'maxwidth250', 1);
+print $form->selectarray('socid', $companies, $socid, 1, 0, 0, '', 0, 0, 0, '', 'widthcentpercentminusx maxwidth300', 1);
 print '</td></tr>';
 
 // ThirdParty Type

From f8f951977c99f8cfacea11483f5e1859105039c5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 14 Jun 2021 01:33:01 +0200
Subject: [PATCH 0606/1497] Debug v14

---
 htdocs/adherents/stats/index.php         |  8 ++++----
 htdocs/commande/stats/index.php          | 12 ++++++------
 htdocs/core/class/commonobject.class.php |  8 ++++----
 htdocs/expensereport/stats/index.php     |  8 ++++----
 htdocs/projet/stats/index.php            | 18 +++++++++---------
 5 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/htdocs/adherents/stats/index.php b/htdocs/adherents/stats/index.php
index c216214606d..ed79978552f 100644
--- a/htdocs/adherents/stats/index.php
+++ b/htdocs/adherents/stats/index.php
@@ -189,8 +189,8 @@ foreach ($data as $val) {
 		//print '</a>';
 		print '</td>';
 		print '<td class="right">0</td>';
-		print '<td class="right">0</td>';
-		print '<td class="right">0</td>';
+		print '<td class="right amount nowraponall">0</td>';
+		print '<td class="right amount nowraponall">0</td>';
 		print '</tr>';
 	}
 	print '<tr class="oddeven" height="24">';
@@ -200,8 +200,8 @@ foreach ($data as $val) {
 	//print '</a>';
 	print '</td>';
 	print '<td class="right">'.$val['nb'].'</td>';
-	print '<td class="right"><span class="amount">'.price(price2num($val['total'], 'MT'), 1).'</span></td>';
-	print '<td class="right"><span class="amount">'.price(price2num($val['avg'], 'MT'), 1).'</span></td>';
+	print '<td class="right amount nowraponall"><span class="amount">'.price(price2num($val['total'], 'MT'), 1).'</span></td>';
+	print '<td class="right amount nowraponall"><span class="amount">'.price(price2num($val['avg'], 'MT'), 1).'</span></td>';
 	print '</tr>';
 	$oldyear = $year;
 }
diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php
index aebed5e3eb4..bd92dc084c7 100644
--- a/htdocs/commande/stats/index.php
+++ b/htdocs/commande/stats/index.php
@@ -316,14 +316,14 @@ if ($mode == 'supplier') {
 }
 print '<tr><td>'.$cat_label.'</td><td>';
 print img_picto('', 'category', 'class="pictofixedwidth"');
-print $formother->select_categories($cat_type, $categ_id, 'categ_id', true);
+print $formother->select_categories($cat_type, $categ_id, 'categ_id', 0, 1, 'widthcentpercentminusx maxwidth300');
 print '</td></tr>';
 // User
-print '<tr><td class="left">'.$langs->trans("CreatedBy").'</td><td class="left">';
+print '<tr><td>'.$langs->trans("CreatedBy").'</td><td>';
 print img_picto('', 'user', 'class="pictofixedwidth"');
 print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'widthcentpercentminusx maxwidth300');
 // Status
-print '<tr><td class="left">'.$langs->trans("Status").'</td><td class="left">';
+print '<tr><td>'.$langs->trans("Status").'</td><td>';
 if ($mode == 'customer') {
 	$liststatus = array(
 		Commande::STATUS_DRAFT=>$langs->trans("StatusOrderDraft"),
@@ -388,11 +388,11 @@ foreach ($data as $val) {
 	print '<tr class="oddeven" height="24">';
 	print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&amp;mode='.$mode.($socid > 0 ? '&socid='.$socid : '').($userid > 0 ? '&userid='.$userid : '').'">'.$year.'</a></td>';
 	print '<td class="right">'.$val['nb'].'</td>';
-	print '<td class="right" style="'.(($val['nb_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.round($val['nb_diff']).'</td>';
+	print '<td class="right opacitylow" style="'.(($val['nb_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.round($val['nb_diff']).'%</td>';
 	print '<td class="right">'.price(price2num($val['total'], 'MT'), 1).'</td>';
-	print '<td class="right" style="'.(($val['total_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.round($val['total_diff']).'</td>';
+	print '<td class="right opacitylow" style="'.(($val['total_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.round($val['total_diff']).'%</td>';
 	print '<td class="right">'.price(price2num($val['avg'], 'MT'), 1).'</td>';
-	print '<td class="right" style="'.(($val['avg_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.round($val['avg_diff']).'</td>';
+	print '<td class="right opacitylow" style="'.(($val['avg_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.round($val['avg_diff']).'%</td>';
 	print '</tr>';
 	$oldyear = $year;
 }
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 1f350d65fcf..8c2e55df7bc 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -6971,7 +6971,7 @@ abstract class CommonObject
 			require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 			$form = new Form($this->db);
 		}
-
+var_dump($val);
 		$objectid = $this->id;
 		$label = $val['label'];
 		$type  = $val['type'];
@@ -7018,7 +7018,7 @@ abstract class CommonObject
 
 		$langfile = $val['langfile'];
 		$list = $val['list'];
-		$help = $val['help'];
+		$help = (empty($val['help']) ? '' : $val['help']);
 		$hidden = (($val['visible'] == 0) ? 1 : 0); // If zero, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
 
 		if ($hidden) {
@@ -7044,9 +7044,9 @@ abstract class CommonObject
 			} elseif ($type == 'boolean') {
 				$morecss = '';
 			} else {
-				if (round($size) < 12) {
+				if (is_numeric($size) && round($size) < 12) {
 					$morecss = 'minwidth100';
-				} elseif (round($size) <= 48) {
+				} elseif (is_numeric($size) && round($size) <= 48) {
 					$morecss = 'minwidth200';
 				} else {
 					$morecss = 'minwidth400';
diff --git a/htdocs/expensereport/stats/index.php b/htdocs/expensereport/stats/index.php
index ce8add98d54..5f8a9f628b5 100644
--- a/htdocs/expensereport/stats/index.php
+++ b/htdocs/expensereport/stats/index.php
@@ -274,8 +274,8 @@ foreach ($data as $val) {
 		print '<tr class="oddeven" height="24">';
 		print '<td class="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$oldyear.'&amp;mode='.$mode.'">'.$oldyear.'</a></td>';
 		print '<td class="right">0</td>';
-		print '<td class="right">0</td>';
-		print '<td class="right">0</td>';
+		print '<td class="right amount nowraponall">0</td>';
+		print '<td class="right amount nowraponall">0</td>';
 		print '</tr>';
 	}
 
@@ -283,8 +283,8 @@ foreach ($data as $val) {
 	print '<tr class="oddeven" height="24">';
 	print '<td class="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&amp;mode='.$mode.'">'.$year.'</a></td>';
 	print '<td class="right">'.$val['nb'].'</td>';
-	print '<td class="right">'.price(price2num($val['total'], 'MT'), 1).'</td>';
-	print '<td class="right">'.price(price2num($val['avg'], 'MT'), 1).'</td>';
+	print '<td class="right amount nowraponall">'.price(price2num($val['total'], 'MT'), 1).'</td>';
+	print '<td class="right amount nowraponall">'.price(price2num($val['avg'], 'MT'), 1).'</td>';
 	print '</tr>';
 	$oldyear = $year;
 }
diff --git a/htdocs/projet/stats/index.php b/htdocs/projet/stats/index.php
index c420e2fbe79..afd86f3ed07 100644
--- a/htdocs/projet/stats/index.php
+++ b/htdocs/projet/stats/index.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2014-2015 Florian HENRY       <florian.henry@open-concept.pro>
- * Copyright (C) 2015      Laurent Destailleur <ldestailleur@users.sourceforge.net>
+ * Copyright (C) 2015-2021 Laurent Destailleur <ldestailleur@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
@@ -325,12 +325,12 @@ foreach ($data_all_year as $val) {
 
 		print '<tr class="oddeven" height="24">';
 		print '<td class="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$oldyear.($socid > 0 ? '&socid='.$socid : '').($userid > 0 ? '&userid='.$userid : '').'">'.$oldyear.'</a></td>';
-		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
-			print '<td class="right">0</td>';
-			print '<td class="right">0</td>';
-			print '<td class="right">0</td>';
-		}
 		print '<td class="right">0</td>';
+		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
+			print '<td class="right amount nowraponall">0</td>';
+			print '<td class="right amount nowraponall">0</td>';
+			print '<td class="right amount nowraponall">0</td>';
+		}
 		print '</tr>';
 	}
 
@@ -338,9 +338,9 @@ foreach ($data_all_year as $val) {
 	print '<td class="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$year.($socid > 0 ? '&socid='.$socid : '').($userid > 0 ? '&userid='.$userid : '').'">'.$year.'</a></td>';
 	print '<td class="right">'.$val['nb'].'</td>';
 	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
-		print '<td class="right">'.($val['total'] ? price(price2num($val['total'], 'MT'), 1) : '0').'</td>';
-		print '<td class="right">'.($val['avg'] ? price(price2num($val['avg'], 'MT'), 1) : '0').'</td>';
-		print '<td class="right">'.(isset($val['weighted']) ? price(price2num($val['weighted'], 'MT'), 1) : '0').'</td>';
+		print '<td class="right amount nowraponall">'.($val['total'] ? price(price2num($val['total'], 'MT'), 1) : '0').'</td>';
+		print '<td class="right amount nowraponall">'.($val['avg'] ? price(price2num($val['avg'], 'MT'), 1) : '0').'</td>';
+		print '<td class="right amount nowraponall">'.(isset($val['weighted']) ? price(price2num($val['weighted'], 'MT'), 1) : '0').'</td>';
 	}
 	print '</tr>';
 	$oldyear = $year;

From 046215f64a795a086e5caa61595a2f736b818ad1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 14 Jun 2021 01:55:58 +0200
Subject: [PATCH 0607/1497] Fix PHP8

---
 htdocs/admin/emailcollector_list.php          |  8 +++-
 htdocs/admin/mails_senderprofile_list.php     |  6 +++
 htdocs/asset/list.php                         |  8 +++-
 htdocs/bom/bom_list.php                       |  8 +++-
 .../compta/cashcontrol/cashcontrol_list.php   |  8 +++-
 htdocs/core/class/commonobject.class.php      | 24 ++++++-----
 .../tpl/extrafields_list_print_fields.tpl.php |  6 +++
 .../conferenceorbooth_list.php                |  8 +++-
 .../conferenceorboothattendee_list.php        |  8 +++-
 .../knowledgerecord_list.php                  |  6 +++
 .../modulebuilder/template/myobject_list.php  | 19 +++++---
 htdocs/mrp/mo_list.php                        |  8 +++-
 htdocs/partnership/partnership_list.php       |  8 +++-
 htdocs/product/inventory/list.php             |  8 +++-
 htdocs/product/stock/list.php                 |  8 +++-
 htdocs/product/stock/productlot_list.php      |  8 +++-
 .../recruitmentcandidature_list.php           | 43 +++++++++----------
 .../recruitmentjobposition_list.php           | 33 +++++++-------
 htdocs/salaries/list.php                      |  2 +-
 htdocs/salaries/payments.php                  |  4 +-
 htdocs/societe/website.php                    |  8 +++-
 htdocs/ticket/list.php                        |  6 +++
 htdocs/workstation/workstation_list.php       |  6 +++
 23 files changed, 180 insertions(+), 71 deletions(-)

diff --git a/htdocs/admin/emailcollector_list.php b/htdocs/admin/emailcollector_list.php
index 2c6739e96dd..55b2052936c 100644
--- a/htdocs/admin/emailcollector_list.php
+++ b/htdocs/admin/emailcollector_list.php
@@ -99,7 +99,7 @@ foreach ($object->fields as $key => $val) {
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array();
 foreach ($object->fields as $key => $val) {
-	if ($val['searchall']) {
+	if (!empty($val['searchall'])) {
 		$fieldstosearchall['t.'.$key] = $val['label'];
 	}
 }
@@ -549,6 +549,12 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 				if (!$i) {
 					$totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
 				}
+				if (!isset($totalarray['val'])) {
+					$totalarray['val'] = array();
+				}
+				if (!isset($totalarray['val']['t.'.$key])) {
+					$totalarray['val']['t.'.$key] = 0;
+				}
 				$totalarray['val']['t.'.$key] += $object->$key;
 			}
 		}
diff --git a/htdocs/admin/mails_senderprofile_list.php b/htdocs/admin/mails_senderprofile_list.php
index 44982fc3ece..e27c48b0416 100644
--- a/htdocs/admin/mails_senderprofile_list.php
+++ b/htdocs/admin/mails_senderprofile_list.php
@@ -609,6 +609,12 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 				if (!$i) {
 					$totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
 				}
+				if (!isset($totalarray['val'])) {
+					$totalarray['val'] = array();
+				}
+				if (!isset($totalarray['val']['t.'.$key])) {
+					$totalarray['val']['t.'.$key] = 0;
+				}
 				$totalarray['val']['t.'.$key] += $object->$key;
 			}
 		}
diff --git a/htdocs/asset/list.php b/htdocs/asset/list.php
index 1e906677e7d..056a73328dc 100644
--- a/htdocs/asset/list.php
+++ b/htdocs/asset/list.php
@@ -103,7 +103,7 @@ foreach ($object->fields as $key => $val) {
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array();
 foreach ($object->fields as $key => $val) {
-	if ($val['searchall']) {
+	if (!empty($val['searchall'])) {
 		$fieldstosearchall['t.'.$key] = $val['label'];
 	}
 }
@@ -542,6 +542,12 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 				if (!$i) {
 					$totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
 				}
+				if (!isset($totalarray['val'])) {
+					$totalarray['val'] = array();
+				}
+				if (!isset($totalarray['val']['t.'.$key])) {
+					$totalarray['val']['t.'.$key] = 0;
+				}
 				$totalarray['val']['t.'.$key] += $object->$key;
 			}
 		}
diff --git a/htdocs/bom/bom_list.php b/htdocs/bom/bom_list.php
index 2fa59d8d6ef..e8511ab6e5c 100644
--- a/htdocs/bom/bom_list.php
+++ b/htdocs/bom/bom_list.php
@@ -88,7 +88,7 @@ foreach ($object->fields as $key => $val) {
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array();
 foreach ($object->fields as $key => $val) {
-	if ($val['searchall']) {
+	if (!empty($val['searchall'])) {
 		$fieldstosearchall['t.'.$key] = $val['label'];
 	}
 }
@@ -623,6 +623,12 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 				if (!$i) {
 					$totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
 				}
+				if (!isset($totalarray['val'])) {
+					$totalarray['val'] = array();
+				}
+				if (!isset($totalarray['val']['t.'.$key])) {
+					$totalarray['val']['t.'.$key] = 0;
+				}
 				$totalarray['val']['t.'.$key] += $object->$key;
 			}
 		}
diff --git a/htdocs/compta/cashcontrol/cashcontrol_list.php b/htdocs/compta/cashcontrol/cashcontrol_list.php
index 34264649ead..876fd6703d3 100644
--- a/htdocs/compta/cashcontrol/cashcontrol_list.php
+++ b/htdocs/compta/cashcontrol/cashcontrol_list.php
@@ -115,7 +115,7 @@ foreach ($object->fields as $key => $val) {
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array();
 foreach ($object->fields as $key => $val) {
-	if ($val['searchall']) {
+	if (!empty($val['searchall'])) {
 		$fieldstosearchall['t.'.$key] = $val['label'];
 	}
 }
@@ -582,6 +582,12 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 				if (!$i) {
 					$totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
 				}
+				if (!isset($totalarray['val'])) {
+					$totalarray['val'] = array();
+				}
+				if (!isset($totalarray['val']['t.'.$key])) {
+					$totalarray['val']['t.'.$key] = 0;
+				}
 				$totalarray['val']['t.'.$key] += $object->$key;
 			}
 		}
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 8c2e55df7bc..14eb0faa353 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -6625,6 +6625,7 @@ abstract class CommonObject
 					} else {
 						$InfoFieldList[4] = str_replace('$ID$', '0', $InfoFieldList[4]);
 					}
+
 					//We have to join on extrafield table
 					if (strpos($InfoFieldList[4], 'extra') !== false) {
 						$sql .= ' as main, '.MAIN_DB_PREFIX.$InfoFieldList[0].'_extrafields as extra';
@@ -6971,11 +6972,12 @@ abstract class CommonObject
 			require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 			$form = new Form($this->db);
 		}
-var_dump($val);
-		$objectid = $this->id;
-		$label = $val['label'];
-		$type  = $val['type'];
-		$size  = $val['css'];
+
+		$objectid = $this->id;	// Not used ???
+
+		$label = empty($val['label']) ? '' : $val['label'];
+		$type  = empty($val['type']) ? '' : $val['type'];
+		$size  = empty($val['css']) ? '' : $val['css'];
 		$reg = array();
 
 		// Convert var to be able to share same code than showOutputField of extrafields
@@ -6992,10 +6994,10 @@ var_dump($val);
 			$type = 'link';
 		}
 
-		$default = $val['default'];
-		$computed = $val['computed'];
-		$unique = $val['unique'];
-		$required = $val['required'];
+		$default = empty($val['default']) ? '' : $val['default'];
+		$computed = empty($val['computed']) ? '' : $val['computed'];
+		$unique = empty($val['unique']) ? '' : $val['unique'];
+		$required = empty($val['required']) ? '' : $val['required'];
 		$param = array();
 		$param['options'] = array();
 
@@ -7016,8 +7018,8 @@ var_dump($val);
 			$type = 'sellist';
 		}
 
-		$langfile = $val['langfile'];
-		$list = $val['list'];
+		$langfile = empty($val['langfile']) ? '' : $val['langfile'];
+		$list = (empty($val['list']) ? '' : $val['list']);
 		$help = (empty($val['help']) ? '' : $val['help']);
 		$hidden = (($val['visible'] == 0) ? 1 : 0); // If zero, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
 
diff --git a/htdocs/core/tpl/extrafields_list_print_fields.tpl.php b/htdocs/core/tpl/extrafields_list_print_fields.tpl.php
index f53f88e3362..7d547d52dea 100644
--- a/htdocs/core/tpl/extrafields_list_print_fields.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_print_fields.tpl.php
@@ -66,6 +66,12 @@ if (!empty($extrafieldsobjectkey) && !empty($extrafields->attributes[$extrafield
 					if (!$i) {
 						$totalarray['pos'][$totalarray['nbfield']] = $extrafieldsobjectprefix.$tmpkey;
 					}
+					if (!isset($totalarray['val'])) {
+						$totalarray['val'] = array();
+					}
+					if (!isset($totalarray['val'][$extrafieldsobjectprefix.$tmpkey])) {
+						$totalarray['val'][$extrafieldsobjectprefix.$tmpkey] = 0;
+					}
 					$totalarray['val'][$extrafieldsobjectprefix.$tmpkey] += $obj->$tmpkey;
 				}
 			}
diff --git a/htdocs/eventorganization/conferenceorbooth_list.php b/htdocs/eventorganization/conferenceorbooth_list.php
index 15664896700..b51823242f8 100644
--- a/htdocs/eventorganization/conferenceorbooth_list.php
+++ b/htdocs/eventorganization/conferenceorbooth_list.php
@@ -103,7 +103,7 @@ foreach ($object->fields as $key => $val) {
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array();
 foreach ($object->fields as $key => $val) {
-	if ($val['searchall']) {
+	if (!empty($val['searchall'])) {
 		$fieldstosearchall['t.'.$key] = $val['label'];
 	}
 }
@@ -802,6 +802,12 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 				if (!$i) {
 					$totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
 				}
+				if (!isset($totalarray['val'])) {
+					$totalarray['val'] = array();
+				}
+				if (!isset($totalarray['val']['t.'.$key])) {
+					$totalarray['val']['t.'.$key] = 0;
+				}
 				$totalarray['val']['t.'.$key] += $object->$key;
 			}
 		}
diff --git a/htdocs/eventorganization/conferenceorboothattendee_list.php b/htdocs/eventorganization/conferenceorboothattendee_list.php
index 6ece0bc115e..97748640f17 100644
--- a/htdocs/eventorganization/conferenceorboothattendee_list.php
+++ b/htdocs/eventorganization/conferenceorboothattendee_list.php
@@ -112,7 +112,7 @@ foreach ($object->fields as $key => $val) {
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array();
 foreach ($object->fields as $key => $val) {
-	if ($val['searchall']) {
+	if (!empty($val['searchall'])) {
 		$fieldstosearchall['t.'.$key] = $val['label'];
 	}
 }
@@ -788,6 +788,12 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 				if (!$i) {
 					$totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
 				}
+				if (!isset($totalarray['val'])) {
+					$totalarray['val'] = array();
+				}
+				if (!isset($totalarray['val']['t.'.$key])) {
+					$totalarray['val']['t.'.$key] = 0;
+				}
 				$totalarray['val']['t.'.$key] += $object->$key;
 			}
 		}
diff --git a/htdocs/knowledgemanagement/knowledgerecord_list.php b/htdocs/knowledgemanagement/knowledgerecord_list.php
index c886d6931a0..87be91f51f6 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_list.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_list.php
@@ -570,6 +570,12 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 				if (!$i) {
 					$totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
 				}
+				if (!isset($totalarray['val'])) {
+					$totalarray['val'] = array();
+				}
+				if (!isset($totalarray['val']['t.'.$key])) {
+					$totalarray['val']['t.'.$key] = 0;
+				}
 				$totalarray['val']['t.'.$key] += $object->$key;
 			}
 		}
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index e2c817c12cc..59af3c6b383 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -149,7 +149,7 @@ foreach ($object->fields as $key => $val) {
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array();
 foreach ($object->fields as $key => $val) {
-	if ($val['searchall']) {
+	if (!empty($val['searchall'])) {
 		$fieldstosearchall['t.'.$key] = $val['label'];
 	}
 }
@@ -274,7 +274,7 @@ $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $obje
 $sql .= preg_replace('/^,/', '', $hookmanager->resPrint);
 $sql = preg_replace('/,\s*$/', '', $sql);
 $sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
+if (isset($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (t.rowid = ef.fk_object)";
 }
 // Add table from hooks
@@ -516,11 +516,11 @@ foreach ($object->fields as $key => $val) {
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
 		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
-			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
+			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], (isset($search[$key]) ? $search[$key] : ''), $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
 		} elseif ((strpos($val['type'], 'integer:') === 0) || (strpos($val['type'], 'sellist:')=== 0)) {
-			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth125', 1);
+			print $object->showInputField($val, $key, (isset($search[$key]) ? $search[$key] : ''), '', '', 'search_', 'maxwidth125', 1);
 		} elseif (!preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
-			print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
+			print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag(isset($search[$key]) ? $search[$key] : '').'">';
 		} elseif (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
 			print '<div class="nowrap">';
 			print $form->selectDate($search[$key.'_dtstart'] ? $search[$key.'_dtstart'] : '', "search_".$key."_dtstart", 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
@@ -578,7 +578,7 @@ print '</tr>'."\n";
 
 // Detect if we need a fetch on each output line
 $needToFetchEachLine = 0;
-if (is_array($extrafields->attributes[$object->table_element]['computed']) && count($extrafields->attributes[$object->table_element]['computed']) > 0) {
+if (isset($extrafields->attributes[$object->table_element]['computed']) && is_array($extrafields->attributes[$object->table_element]['computed']) && count($extrafields->attributes[$object->table_element]['computed']) > 0) {
 	foreach ($extrafields->attributes[$object->table_element]['computed'] as $key => $val) {
 		if (preg_match('/\$object/', $val)) {
 			$needToFetchEachLine++; // There is at least one compute field that use $object
@@ -591,6 +591,7 @@ if (is_array($extrafields->attributes[$object->table_element]['computed']) && co
 // --------------------------------------------------------------------
 $i = 0;
 $totalarray = array();
+$totalarray['nbfield'] = 0;
 while ($i < ($limit ? min($num, $limit) : $num)) {
 	$obj = $db->fetch_object($resql);
 	if (empty($obj)) {
@@ -636,6 +637,12 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 				if (!$i) {
 					$totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
 				}
+				if (!isset($totalarray['val'])) {
+					$totalarray['val'] = array();
+				}
+				if (!isset($totalarray['val']['t.'.$key])) {
+					$totalarray['val']['t.'.$key] = 0;
+				}
 				$totalarray['val']['t.'.$key] += $object->$key;
 			}
 		}
diff --git a/htdocs/mrp/mo_list.php b/htdocs/mrp/mo_list.php
index 4597f265f80..7786bf9eca6 100644
--- a/htdocs/mrp/mo_list.php
+++ b/htdocs/mrp/mo_list.php
@@ -94,7 +94,7 @@ foreach ($object->fields as $key => $val) {
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array();
 foreach ($object->fields as $key => $val) {
-	if ($val['searchall']) {
+	if (!empty($val['searchall'])) {
 		$fieldstosearchall['t.'.$key] = $val['label'];
 	}
 }
@@ -545,6 +545,12 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 				if (!$i) {
 					$totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
 				}
+				if (!isset($totalarray['val'])) {
+					$totalarray['val'] = array();
+				}
+				if (!isset($totalarray['val']['t.'.$key])) {
+					$totalarray['val']['t.'.$key] = 0;
+				}
 				$totalarray['val']['t.'.$key] += $object->$key;
 			}
 		}
diff --git a/htdocs/partnership/partnership_list.php b/htdocs/partnership/partnership_list.php
index 457d0345c31..c8bb93ccb7d 100644
--- a/htdocs/partnership/partnership_list.php
+++ b/htdocs/partnership/partnership_list.php
@@ -110,7 +110,7 @@ if ($filter) {
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array();
 foreach ($object->fields as $key => $val) {
-	if ($val['searchall']) {
+	if (!empty($val['searchall'])) {
 		$fieldstosearchall['t.'.$key] = $val['label'];
 	}
 }
@@ -670,6 +670,12 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 				if (!$i) {
 					$totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
 				}
+				if (!isset($totalarray['val'])) {
+					$totalarray['val'] = array();
+				}
+				if (!isset($totalarray['val']['t.'.$key])) {
+					$totalarray['val']['t.'.$key] = 0;
+				}
 				$totalarray['val']['t.'.$key] += $object->$key;
 			}
 		}
diff --git a/htdocs/product/inventory/list.php b/htdocs/product/inventory/list.php
index 1c1e09e3162..84f9bc137b6 100644
--- a/htdocs/product/inventory/list.php
+++ b/htdocs/product/inventory/list.php
@@ -96,7 +96,7 @@ foreach ($object->fields as $key => $val) {
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array();
 foreach ($object->fields as $key => $val) {
-	if ($val['searchall']) {
+	if (!empty($val['searchall'])) {
 		$fieldstosearchall['t.'.$key] = $val['label'];
 	}
 }
@@ -522,6 +522,12 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 				if (!$i) {
 					$totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
 				}
+				if (!isset($totalarray['val'])) {
+					$totalarray['val'] = array();
+				}
+				if (!isset($totalarray['val']['t.'.$key])) {
+					$totalarray['val']['t.'.$key] = 0;
+				}
 				$totalarray['val']['t.'.$key] += $object->$key;
 			}
 		}
diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index ae8b13c776f..1d54244d4f0 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -106,7 +106,7 @@ foreach ($object->fields as $key => $val) {
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array();
 foreach ($object->fields as $key => $val) {
-	if ($val['searchall']) {
+	if (!empty($val['searchall'])) {
 		$fieldstosearchall['t.'.$key] = $val['label'];
 	}
 }
@@ -628,6 +628,12 @@ if ($num) {
 					if (!$i) {
 						$totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
 					}
+					if (!isset($totalarray['val'])) {
+						$totalarray['val'] = array();
+					}
+					if (!isset($totalarray['val']['t.'.$key])) {
+						$totalarray['val']['t.'.$key] = 0;
+					}
 					$totalarray['val']['t.'.$key] += $warehouse->$key;
 				}
 			}
diff --git a/htdocs/product/stock/productlot_list.php b/htdocs/product/stock/productlot_list.php
index 04682a84322..58e5bd055f1 100644
--- a/htdocs/product/stock/productlot_list.php
+++ b/htdocs/product/stock/productlot_list.php
@@ -93,7 +93,7 @@ foreach ($object->fields as $key => $val) {
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array();
 foreach ($object->fields as $key => $val) {
-	if ($val['searchall']) {
+	if (!empty($val['searchall'])) {
 		$fieldstosearchall['t.'.$key] = $val['label'];
 	}
 }
@@ -541,6 +541,12 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 				if (!$i) {
 					$totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
 				}
+				if (!isset($totalarray['val'])) {
+					$totalarray['val'] = array();
+				}
+				if (!isset($totalarray['val']['t.'.$key])) {
+					$totalarray['val']['t.'.$key] = 0;
+				}
 				$totalarray['val']['t.'.$key] += $object->$key;
 			}
 		}
diff --git a/htdocs/recruitment/recruitmentcandidature_list.php b/htdocs/recruitment/recruitmentcandidature_list.php
index 8f8ac25c577..1caeb05095f 100644
--- a/htdocs/recruitment/recruitmentcandidature_list.php
+++ b/htdocs/recruitment/recruitmentcandidature_list.php
@@ -83,7 +83,7 @@ require_once __DIR__.'/class/recruitmentcandidature.class.php';
 //dol_include_once('/othermodule/class/otherobject.class.php');
 
 // Load translation files required by the page
-$langs->loadLangs(array("recruitment@recruitment", "other"));
+$langs->loadLangs(array("recruitment", "other"));
 
 $action     = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
 $massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
@@ -141,7 +141,7 @@ foreach ($object->fields as $key => $val) {
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array();
 foreach ($object->fields as $key => $val) {
-	if ($val['searchall']) {
+	if (!empty($val['searchall'])) {
 		$fieldstosearchall['t.'.$key] = $val['label'];
 	}
 }
@@ -161,18 +161,8 @@ foreach ($object->fields as $key => $val) {
 	}
 }
 // Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0) {
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-		if (!empty($extrafields->attributes[$object->table_element]['list'][$key])) {
-			$arrayfields["ef.".$key] = array(
-				'label'=>$extrafields->attributes[$object->table_element]['label'][$key],
-				'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1),
-				'position'=>$extrafields->attributes[$object->table_element]['pos'][$key],
-				'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key])
-			);
-		}
-	}
-}
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
+
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
@@ -262,7 +252,7 @@ $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $obje
 $sql .= preg_replace('/^,/', '', $hookmanager->resPrint);
 $sql = preg_replace('/,\s*$/', '', $sql);
 $sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
+if (isset($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (t.rowid = ef.fk_object)";
 }
 if ($object->ismultientitymanaged == 1) {
@@ -304,7 +294,9 @@ foreach ($object->fields as $key => $val)
 }
 // Add fields from extrafields
 if (! empty($extrafields->attributes[$object->table_element]['label'])) {
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql.=($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.', ' : '');
+	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
+		$sql.=($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.', ' : '');
+	}
 }
 // Add where from hooks
 $parameters=array();
@@ -430,7 +422,7 @@ print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sort
 $topicmail = "SendRecruitmentCandidatureRef";
 $modelmail = "recruitmentcandidature";
 $objecttmp = new RecruitmentCandidature($db);
-$trackid = 'xxxx'.$object->id;
+$trackid = 'recruitmentapplication'.$object->id;
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
 if ($search_all) {
@@ -484,11 +476,11 @@ foreach ($object->fields as $key => $val) {
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
 		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
-			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
+			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], (isset($search[$key]) ? $search[$key] : ''), $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
 		} elseif (strpos($val['type'], 'integer:') === 0) {
-			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
+			print $object->showInputField($val, $key, (isset($search[$key]) ? $search[$key] : ''), '', '', 'search_', 'maxwidth150', 1);
 		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) {
-			print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
+			print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag(isset($search[$key]) ? $search[$key] : '').'">';
 		}
 		print '</td>';
 	}
@@ -539,7 +531,7 @@ print '</tr>'."\n";
 
 // Detect if we need a fetch on each output line
 $needToFetchEachLine = 0;
-if (is_array($extrafields->attributes[$object->table_element]['computed']) && count($extrafields->attributes[$object->table_element]['computed']) > 0) {
+if (isset($extrafields->attributes[$object->table_element]['computed']) && is_array($extrafields->attributes[$object->table_element]['computed']) && count($extrafields->attributes[$object->table_element]['computed']) > 0) {
 	foreach ($extrafields->attributes[$object->table_element]['computed'] as $key => $val) {
 		if (preg_match('/\$object/', $val)) {
 			$needToFetchEachLine++; // There is at least one compute field that use $object
@@ -552,6 +544,7 @@ if (is_array($extrafields->attributes[$object->table_element]['computed']) && co
 // --------------------------------------------------------------------
 $i = 0;
 $totalarray = array();
+$totalarray['nbfield'] = 0;
 while ($i < ($limit ? min($num, $limit) : $num)) {
 	$obj = $db->fetch_object($resql);
 	if (empty($obj)) {
@@ -564,7 +557,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 	// Show here line of result
 	print '<tr class="oddeven">';
 	foreach ($object->fields as $key => $val) {
-		$cssforfield = (empty($val['css']) ? '' : $val['css']);
+		$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 		if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
 			$cssforfield .= ($cssforfield ? ' ' : '').'center';
 		} elseif ($key == 'status') {
@@ -597,6 +590,12 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 				if (!$i) {
 					$totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
 				}
+				if (!isset($totalarray['val'])) {
+					$totalarray['val'] = array();
+				}
+				if (!isset($totalarray['val']['t.'.$key])) {
+					$totalarray['val']['t.'.$key] = 0;
+				}
 				$totalarray['val']['t.'.$key] += $object->$key;
 			}
 		}
diff --git a/htdocs/recruitment/recruitmentjobposition_list.php b/htdocs/recruitment/recruitmentjobposition_list.php
index 99b2e5ade4e..6475a60a8ed 100644
--- a/htdocs/recruitment/recruitmentjobposition_list.php
+++ b/htdocs/recruitment/recruitmentjobposition_list.php
@@ -141,7 +141,7 @@ foreach ($object->fields as $key => $val) {
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array();
 foreach ($object->fields as $key => $val) {
-	if ($val['searchall']) {
+	if (!empty($val['searchall'])) {
 		$fieldstosearchall['t.'.$key] = $val['label'];
 	}
 }
@@ -161,18 +161,8 @@ foreach ($object->fields as $key => $val) {
 	}
 }
 // Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0) {
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-		if (!empty($extrafields->attributes[$object->table_element]['list'][$key])) {
-			$arrayfields["ef.".$key] = array(
-				'label'=>$extrafields->attributes[$object->table_element]['label'][$key],
-				'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1),
-				'position'=>$extrafields->attributes[$object->table_element]['pos'][$key],
-				'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key])
-			);
-		}
-	}
-}
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
+
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields['nbapplications'] = array('label'=>'Applications', 'checked'=>1, 'enabled'=>1, 'position'=>90);
 $arrayfields = dol_sort_array($arrayfields, 'position');
@@ -265,7 +255,7 @@ $sql = preg_replace('/,\s*$/', '', $sql);
 $sql .= ", COUNT(rc.rowid) as nbapplications";
 $sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."recruitment_recruitmentcandidature as rc ON rc.fk_recruitmentjobposition = t.rowid";
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
+if (isset($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (t.rowid = ef.fk_object)";
 }
 if ($object->ismultientitymanaged == 1) {
@@ -487,11 +477,11 @@ foreach ($object->fields as $key => $val) {
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
 		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
-			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
+			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], (isset($search[$key]) ? $search[$key] : ''), $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
 		} elseif (strpos($val['type'], 'integer:') === 0) {
-			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
+			print $object->showInputField($val, $key, (isset($search[$key]) ? $search[$key] : ''), '', '', 'search_', 'maxwidth150', 1);
 		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) {
-			print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
+			print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag(isset($search[$key]) ? $search[$key] : '').'">';
 		}
 		print '</td>';
 	}
@@ -547,7 +537,7 @@ print '</tr>'."\n";
 
 // Detect if we need a fetch on each output line
 $needToFetchEachLine = 0;
-if (is_array($extrafields->attributes[$object->table_element]['computed']) && count($extrafields->attributes[$object->table_element]['computed']) > 0) {
+if (isset($extrafields->attributes[$object->table_element]['computed']) && is_array($extrafields->attributes[$object->table_element]['computed']) && count($extrafields->attributes[$object->table_element]['computed']) > 0) {
 	foreach ($extrafields->attributes[$object->table_element]['computed'] as $key => $val) {
 		if (preg_match('/\$object/', $val)) {
 			$needToFetchEachLine++; // There is at least one compute field that use $object
@@ -560,6 +550,7 @@ if (is_array($extrafields->attributes[$object->table_element]['computed']) && co
 // --------------------------------------------------------------------
 $i = 0;
 $totalarray = array();
+$totalarray['nbfield'] = 0;
 while ($i < ($limit ? min($num, $limit) : $num)) {
 	$obj = $db->fetch_object($resql);
 	if (empty($obj)) {
@@ -605,6 +596,12 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 				if (!$i) {
 					$totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
 				}
+				if (!isset($totalarray['val'])) {
+					$totalarray['val'] = array();
+				}
+				if (!isset($totalarray['val']['t.'.$key])) {
+					$totalarray['val']['t.'.$key] = 0;
+				}
 				$totalarray['val']['t.'.$key] += $object->$key;
 			}
 		}
diff --git a/htdocs/salaries/list.php b/htdocs/salaries/list.php
index b4abbb04a26..690f8df4c8c 100644
--- a/htdocs/salaries/list.php
+++ b/htdocs/salaries/list.php
@@ -124,7 +124,7 @@ foreach ($object->fields as $key => $val) {
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array();
 foreach ($object->fields as $key => $val) {
-	if ($val['searchall']) {
+	if (!empty($val['searchall'])) {
 		$fieldstosearchall['t.'.$key] = $val['label'];
 	}
 }
diff --git a/htdocs/salaries/payments.php b/htdocs/salaries/payments.php
index 7af7fa4d986..8b0c774cc6a 100644
--- a/htdocs/salaries/payments.php
+++ b/htdocs/salaries/payments.php
@@ -107,7 +107,9 @@ foreach ($object->fields as $key => $val) {
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array();
 foreach ($object->fields as $key => $val) {
-	if ($val['searchall']) $fieldstosearchall['t.'.$key] = $val['label'];
+	if (!empty($val['searchall'])) {
+		$fieldstosearchall['t.'.$key] = $val['label'];
+	}
 }
 
 $permissiontoread = $user->rights->salaries->read;
diff --git a/htdocs/societe/website.php b/htdocs/societe/website.php
index e34672bfd1d..0740200867d 100644
--- a/htdocs/societe/website.php
+++ b/htdocs/societe/website.php
@@ -95,7 +95,7 @@ foreach ($objectwebsiteaccount->fields as $key => $val) {
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array();
 foreach ($objectwebsiteaccount->fields as $key => $val) {
-	if ($val['searchall']) {
+	if (!empty($val['searchall'])) {
 		$fieldstosearchall['t.'.$key] = $val['label'];
 	}
 }
@@ -530,6 +530,12 @@ while ($i < min($num, $limit)) {
 				if (!$i) {
 					$totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
 				}
+				if (!isset($totalarray['val'])) {
+					$totalarray['val'] = array();
+				}
+				if (!isset($totalarray['val']['t.'.$key])) {
+					$totalarray['val']['t.'.$key] = 0;
+				}
 				$totalarray['val']['t.'.$key] += $obj->$key;
 			}
 		}
diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php
index 3ba138bb99e..7e5c1aa968f 100644
--- a/htdocs/ticket/list.php
+++ b/htdocs/ticket/list.php
@@ -998,6 +998,12 @@ while ($i < min($num, $limit)) {
 				if (!$i) {
 					$totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
 				}
+				if (!isset($totalarray['val'])) {
+					$totalarray['val'] = array();
+				}
+				if (!isset($totalarray['val']['t.'.$key])) {
+					$totalarray['val']['t.'.$key] = 0;
+				}
 				$totalarray['val']['t.'.$key] += $obj->$key;
 			}
 		}
diff --git a/htdocs/workstation/workstation_list.php b/htdocs/workstation/workstation_list.php
index 8058ec2793d..fda05400421 100755
--- a/htdocs/workstation/workstation_list.php
+++ b/htdocs/workstation/workstation_list.php
@@ -620,6 +620,12 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 				if (!$i) {
 					$totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
 				}
+				if (!isset($totalarray['val'])) {
+					$totalarray['val'] = array();
+				}
+				if (!isset($totalarray['val']['t.'.$key])) {
+					$totalarray['val']['t.'.$key] = 0;
+				}
 				$totalarray['val']['t.'.$key] += $object->$key;
 			}
 		}

From 0f91c4cfa26632460ab73303f5eea81715f12648 Mon Sep 17 00:00:00 2001
From: Adrien Raze <adrien.raze@atm-consulting.fr>
Date: Mon, 14 Jun 2021 10:02:44 +0200
Subject: [PATCH 0608/1497] FIX : Allow to set bookmarks on list filtered by
 multiselect fields

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

diff --git a/htdocs/bookmarks/bookmarks.lib.php b/htdocs/bookmarks/bookmarks.lib.php
index 06f0b0e8fe7..18328e34e92 100644
--- a/htdocs/bookmarks/bookmarks.lib.php
+++ b/htdocs/bookmarks/bookmarks.lib.php
@@ -53,7 +53,7 @@ function printDropdownBookmarksList()
         {
             foreach ($_POST as $key => $val)
             {
-                if (preg_match('/^search_/', $key) && $val != '') $tmpurl .= ($tmpurl ? '&' : '').$key.'='.$val;
+				if (preg_match('/^search_/', $key) && $val != '') $tmpurl .= ($tmpurl ? '&' : '').http_build_query(array($key => $val));
             }
         }
         $url .= ($tmpurl ? '?'.$tmpurl : '');

From fe06e76e2f266829435bcbdb62861f7ec751189e Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 14 Jun 2021 10:21:16 +0200
Subject: [PATCH 0609/1497] Update ChangeLog

---
 ChangeLog | 67 +++++++++++++++++++++++++++++++------------------------
 1 file changed, 38 insertions(+), 29 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7464b0f68d3..95a4a7a3ae6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -39,17 +39,12 @@ NEW: Add import profile to import BOM
 NEW: Add link picto to the stock movement on the detail of production
 NEW: Add mass action "Set tag" for product/service, user, thirdparty, warehouse, project, bank account, members
 NEW: Add bulk action Validate and Set to billed on order list.
-NEW: Add option CONTRACT_ALLOW_EXTERNAL_DOWNLOAD  to make generated doc automatically shared.
-NEW: Add option SUPPLIER_PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD  to make generated doc automatically shared.
-NEW: Add option MAIN_SECURITY_ANTI_SSRF_SERVER_IP to define list of IPs that are local IPs
-NEW: Add option SOCIETE_DISABLE_WORKFORCE to hide staff field
 NEW: Add possibility to exports userGroups fields on user exports
 NEW: Add price min and price min including tax into product export
 NEW: Can search on lots or serials into the quick search bar
 NEW: Add support for Friday as a non working day
 NEW: Add a total in page of margin by user
 NEW: Add the total of margin in invoice list
-NEW: Can set a Warehouse on a Thirdparty
 NEW: auto notification with module Notification can use templated emails
 NEW: Bank Entries : display user linked to a salary or a taxes
 NEW: Can clone a cron job
@@ -67,7 +62,7 @@ NEW: Choose lines to use while creating intervention card from origin
 NEW: Columns shipment method, payment mode, payment term in proposal and order list
 NEW: Conf for default actioncomm status
 NEW: customer ref for product customer prices
-NEW: date and user signature on proposal (Issue 16062)
+NEW: date and user signature on proposal (Issue 16062) #16980
 NEW: Dictionary for availability - Add a column position
 NEW: Can set a user related to a social contribution
 NEW: ICS Direct debit can be set with a different value for each bank account
@@ -93,9 +88,7 @@ NEW: Update the list of taxes available by default for France
 NEW: Salary payment request and Salary payment are 2 different steps in workflow on Salary payment recording
 NEW: VAT payment request and VAT payment are now 2 different steps in workflow on VAT payment recording
 NEW: VAT report - Optimisation & collapse by rate
-NEW: When we add contacts/users to a project, ask to also affect them on tasks.
 NEW: When a doc file is shared, link is visible from the main page of doc.
-NEW: Add option in Workflow module to set a shipment as closed.
 NEW: #16378 More E-Mail Contact substitution Values for better salutation
 NEW: option to keep the "Automatically create a total payment" checkbox empty on the tax creation page
 
@@ -108,30 +101,38 @@ NEW: #17292 default subscription amount by adherent type
 NEW: Option to automatically create a login/user when a new subscription of a member is done online
 NEW: option to select membership type on the online payment page for membership subscription or renewal
 
- Projects
+ Projects/Tasks
 NEW: option to automatically close an open project when all its tasks are done (=progress 100%)
-NEW: Can show the project ref into PDF documents
+NEW: can show the project ref into PDF documents
+NEW: when we add contacts/users to a project, ask to also affect them on tasks
 
  Proposals
 NEW: add bulk action to set a commercial proposal to status "Refused"
-NEW: Can set a warehouse in a proposal
+NEW: can set a warehouse in a proposal
+
+ Shipment
+NEW: add option in Workflow module to set a shipment as closed
 
  TakePOS
-NEW: TAKEPOS delayed payment in TakePOS
-NEW: TAKEPOS display date range if exist in TakePOS
-NEW: TAKEPOS display resiliate status in TakePOS for member
-NEW: TAKEPOS Edit sales lines rights in TakePOS
-NEW: TAKEPOS Option for TakePOS to show the total price without tax
-NEW: TAKEPOS More permission in TakePOS (Can edit added line, can modify once order sent to kitchen)
+NEW: delayed payment in TakePOS  #14456?
+NEW: display date range if exist in TakePOS
+NEW: display resiliate status in TakePOS for member
+NEW: edit sales lines rights in TakePOS
+NEW: option for TakePOS to show the total price without tax
+NEW: more permissions in TakePOS (can edit added line, can modify once order sent to kitchen)
+
+ Third-Parties
+NEW: Can set a Warehouse on a Thirdparty
 
  Tickets
-NEW: Add captcha on public page to create a ticket
-NEW: Can use captcha on public page to create a ticket
-NEW: Can set if a ticket group is visible on public interface or not
+NEW: can use captcha on public page to create a ticket  #16347
+NEW: can set if a ticket group is visible on public interface or not
 
  Warehouse
 NEW: Can make massive stock transfers from a CSV file
 NEW: Stock movement list - Add more complete date field
+NEW: Can set a Warehouse on a Thirdparty
+NEW: can set a warehouse in a proposal
 
  Website Module
 NEW: #17113 Can upload a favicon in website module
@@ -145,6 +146,12 @@ NEW: start new experimental module Partnership Management
 NEW: start new experimental module Knowledge Management
 NEW: start new experimental module Workstations Management
 
+ new Options
+NEW: Add option CONTRACT_ALLOW_EXTERNAL_DOWNLOAD  to make generated doc automatically shared
+NEW: Add option SUPPLIER_PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD  to make generated doc automatically shared
+NEW: Add option MAIN_SECURITY_ANTI_SSRF_SERVER_IP  to define list of IPs that are local IPs
+NEW: Add option SOCIETE_DISABLE_WORKFORCE  to hide staff field
+
 
 For developers:
 ---------------
@@ -165,8 +172,6 @@ NEW: Support sepa_debit in stripe paymentmethods list
 NEW: Update doleditor.class.php for easily activate SCAYT
 NEW: Add triggers in the function add_object_linked(), updateObjectLinked() and deleteObjectLinked()
 NEW: Add triggers OBJECT_LINK_INSERT, OBJECT_LINK_UPDATE et OBJECT_LINK_DELETE in the function add_object_linked(), updateObjectLinked() and deleteObjectLinked()
-NEW: API Add option $includeifobjectisused to get a product
-NEW: API Get the list of product ids only
 NEW: Can set a target image in dolcropresize function.
 NEW: Can set a label as placeholder for combo lists.
 NEW: Add pagination on Get Products response API
@@ -175,20 +180,24 @@ NEW: Extrafields of documents lines are inside the lines, not any more on separa
 NEW: unit selection on object edit line
 NEW: #13739 #17390 Product API route added to get product stock and product with or without variants
 
+ APIs
+NEW: API Add option $includeifobjectisused to get a product
+NEW: API Get the list of product ids only
+
 
 WARNING:
 
 Following changes may create regressions for some external modules, but were necessary to make Dolibarr better:
 * Module SimplePOS is deprecated. If you need a POS module, please use the module TakePOS.
-* The ICS value for direct debit or credit transfer is now store on each bank account instead of into the global setup.
+* The ICS value for direct debit or credit transfer is now stored on each bank account instead of into the global setup.
 * API /setup/shipment_methods has been replaced with API /setup/shipping_methods
-* Field "total" renamed into to "total_ht" for table llx_facture, llx_facture_rec for better field name consistency
-* Field "tva" renamed into "total_tva" for table llx_propal, llx_supplier_proposal, llx_commande, llx_commande_fournisseur for better field name consistency
-* Field "total" renamed into "total_ttc" for table lx_propal, llx_supplier_proposal for better field name consistency
-* If your database is PostgreSql, you must use version 9.1.0 or more (Dolibarr need the SQL function CONCAT)
-* If your database is MySql or MariaDB, you need at least version 5.1
+* Field "total" renamed into "total_ht"  for table llx_facture, llx_facture_rec for better field name consistency
+* Field "tva"   renamed into "total_tva" for table llx_propal, llx_supplier_proposal, llx_commande, llx_commande_fournisseur for better field name consistency
+* Field "total" renamed into "total_ttc" for table llx_propal, llx_supplier_proposal for better field name consistency
+* If your database is PostgreSQL, you must use version 9.1.0 or more (Dolibarr need the SQL function CONCAT)
+* If your database is MySQL or MariaDB, you need at least version 5.1
 * Function set_price_level() has been renamed into setPriceLevel() to follow camelcase rules
-* Remove deprecated subtituion key __REFCLIENT__ (Replaced with __REF_CLIENT__)
+* removed deprecated subtituion key  __REFCLIENT__  (replaced with __REF_CLIENT__)
 
 
 ***** ChangeLog for 13.0.3 compared to 13.0.2 *****

From 5f1f61c38ba22624801b7f764604c059b6319fb1 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 14 Jun 2021 10:45:09 +0200
Subject: [PATCH 0610/1497] Update README.md

---
 README.md | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 736925bec72..ad349f713c1 100644
--- a/README.md
+++ b/README.md
@@ -106,7 +106,7 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
 - Barcodes 
 - Batches / Lots / Serials 
 - Product Variants 
-- Bill of Materials 
+- Bill of Materials (BOM)
 - Manufacturing Orders 
 
  Customer/Sales Management 
@@ -124,9 +124,10 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
  Supplier/Purchase Management 
 - Suppliers/Vendors + Contacts 
 - Supplier (price) requests 
-- Purchase Order management 
+- Purchase Orders management 
 - Delivery/Receiption 
 - Supplier Invoices/credit notes and payment management 
+- INCOTERMS 
 
  Finance / Accounting 
 - Invoices / Payments 
@@ -138,25 +139,24 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
 - Margins 
 - Reports 
 
- 
+ Collaboration 
 - Shared calendar/agenda (with ical and vcal export for third party tools integration) 
 - Projects & Tasks management 
 - Ticket System 
+- Surveys
 
+ HR 
 - Employee's leave requests management 
 - Expense reports 
 - Recruitment management 
 - Timesheets 
 
-- (around 100 modules available by default, 1000+ on the addon market place)
-
 
 ### Other application/modules
 
 - Electronic Document Management (EDM) 
 - Bookmarks management
 - Reporting
-- Surveys
 - Data export/import
 - Barcodes 
 - Margin calculations
@@ -165,8 +165,12 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
 - Mass emailing
 - RSS integration
 - Skype integration
+- Social platforms linking 
 - Payment platforms integration (PayPal, Stripe, Paybox...)
-- 
+- Email-Collector
+
+(around 100 modules available by default, 1000+ on the addon market place)
+
 
 ### Other general features
 

From ba4f7a66d3fdaa50ba8dbda2fb72af7e61de9366 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 14 Jun 2021 10:55:29 +0200
Subject: [PATCH 0611/1497] Update bom_agenda.php

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

diff --git a/htdocs/bom/bom_agenda.php b/htdocs/bom/bom_agenda.php
index 0f18c39d2af..bf65f40fe13 100644
--- a/htdocs/bom/bom_agenda.php
+++ b/htdocs/bom/bom_agenda.php
@@ -126,7 +126,7 @@ $form = new Form($db);
 if ($object->id > 0) {
 	$title = $langs->trans("Agenda");
 	//if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
-	$help_url = 'EN:Module_Agenda_En|FR:Module_Agenda|ES:Módulo_Agenda';
+	$help_url = 'EN:Module_Agenda_En|FR:Module_Agenda|ES:Módulo_Agenda|DE:Modul_Agenda';
 	llxHeader('', $title, $help_url);
 
 	if (!empty($conf->notification->enabled)) {

From 2143395d7071e13abf192a4751fd5bffb328fc4e Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 14 Jun 2021 11:02:43 +0200
Subject: [PATCH 0612/1497] Update agenda.php

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

diff --git a/htdocs/contact/agenda.php b/htdocs/contact/agenda.php
index ca496540a47..293c4f11aa3 100644
--- a/htdocs/contact/agenda.php
+++ b/htdocs/contact/agenda.php
@@ -143,7 +143,7 @@ $title = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("C
 if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/contactnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->lastname) {
 	$title = $object->lastname;
 }
-$help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
+$help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas|DE:Modul_Partner';
 llxHeader('', $title, $help_url);
 
 

From f5ec96bfce153104a524a878f84cfd6e51ae774d Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Mon, 14 Jun 2021 12:19:24 +0200
Subject: [PATCH 0613/1497] Clean code (use Adh constant and precise comment)

---
 htdocs/adherents/stats/byproperties.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/adherents/stats/byproperties.php b/htdocs/adherents/stats/byproperties.php
index f934ebcf0af..63deec867ef 100644
--- a/htdocs/adherents/stats/byproperties.php
+++ b/htdocs/adherents/stats/byproperties.php
@@ -29,7 +29,7 @@ $graphwidth = 700;
 $mapratio = 0.5;
 $graphheight = round($graphwidth * $mapratio);
 
-$mode = GETPOST('mode') ?GETPOST('mode') : '';
+$mode = GETPOST('mode') ? GETPOST('mode') : '';
 
 
 // Security check
@@ -69,7 +69,7 @@ $sql .= " d.morphy as code";
 $sql .= " FROM ".MAIN_DB_PREFIX."adherent as d";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."subscription as s ON s.fk_adherent = d.rowid";
 $sql .= " WHERE d.entity IN (".getEntity('adherent').")";
-$sql .= " AND d.statut <> -1"; // Not draft
+$sql .= " AND d.statut <> ".Adherent::STATUS_DRAFT;
 $sql .= " GROUP BY d.morphy";
 $foundphy = $foundmor = 0;
 
@@ -104,7 +104,7 @@ $sql .= " d.morphy as code";
 $sql .= " FROM ".MAIN_DB_PREFIX."adherent as d";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."subscription as s ON s.fk_adherent = d.rowid";
 $sql .= " WHERE d.entity IN (".getEntity('adherent').")";
-$sql .= " AND d.statut >= 1"; // Active (not draft=-1, not resiliated=0)
+$sql .= " AND d.statut >= 1"; // Active (not excluded=-2, not draft=-1, not resiliated=0)
 $sql .= " GROUP BY d.morphy";
 $foundphy = $foundmor = 0;
 

From 80f4278c42ceafa6813bc4e32eafbf4c24c9d2ae Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Mon, 14 Jun 2021 12:24:58 +0200
Subject: [PATCH 0614/1497] Clean code

---
 htdocs/adherents/stats/geo.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/adherents/stats/geo.php b/htdocs/adherents/stats/geo.php
index e4a7816c002..ea7730dbb3b 100644
--- a/htdocs/adherents/stats/geo.php
+++ b/htdocs/adherents/stats/geo.php
@@ -92,7 +92,7 @@ if ($mode) {
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c on d.country = c.rowid";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."subscription as s ON s.fk_adherent = d.rowid";
 		$sql .= " WHERE d.entity IN (".getEntity('adherent').")";
-		$sql .= " AND d.statut <> -1";
+		$sql .= " AND d.statut <> ".Adherent::STATUS_DRAFT;
 		$sql .= " GROUP BY c.label, c.code";
 		//print $sql;
 	}
@@ -110,7 +110,7 @@ if ($mode) {
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co on d.country = co.rowid";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."subscription as s ON s.fk_adherent = d.rowid";
 		$sql .= " WHERE d.entity IN (".getEntity('adherent').")";
-		$sql .= " AND d.statut != -1";
+		$sql .= " AND d.statut <> ".Adherent::STATUS_DRAFT;
 		$sql .= " GROUP BY co.label, co.code, c.nom";
 		//print $sql;
 	}
@@ -127,7 +127,7 @@ if ($mode) {
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co on d.country = co.rowid";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."subscription as s ON s.fk_adherent = d.rowid";
 		$sql .= " WHERE d.entity IN (".getEntity('adherent').")";
-		$sql .= " AND d.statut != -1";
+		$sql .= " AND d.statut <> ".Adherent::STATUS_DRAFT;
 		$sql .= " GROUP BY co.label, co.code, r.nom"; //+
 		//print $sql;
 	}
@@ -142,7 +142,7 @@ if ($mode) {
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c on d.country = c.rowid";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."subscription as s ON s.fk_adherent = d.rowid";
 		$sql .= " WHERE d.entity IN (".getEntity('adherent').")";
-		$sql .= " AND d.statut != -1";
+		$sql .= " AND d.statut <> "Adherent::STATUS_DRAFT;
 		$sql .= " GROUP BY c.label, c.code, d.town";
 		//print $sql;
 	}

From 8423ad823b920ae1f1c05a50c17a06f3c0cb22d7 Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Mon, 14 Jun 2021 12:41:32 +0200
Subject: [PATCH 0615/1497] Update list.php

---
 htdocs/adherents/list.php | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index 749eacbbe10..7a4a7d5bc1f 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -473,28 +473,28 @@ llxHeader('', $langs->trans("Member"), 'EN:Module_Foundations|FR:Module_Adh&eacu
 
 $titre = $langs->trans("MembersList");
 if (GETPOSTISSET("search_status")) {
-	if ($search_status == '-1,1') {
+	if ($search_status == '-1,1') { // TODO : check this test as -1 == Adherent::STATUS_DRAFT and -2 == Adherent::STATUS_EXLCUDED
 		$titre = $langs->trans("MembersListQualified");
 	}
-	if ($search_status == '-1') {
+	if ($search_status == Adherent::STATUS_DRAFT) {
 		$titre = $langs->trans("MembersListToValid");
 	}
-	if ($search_status == '1' && $filter == '') {
+	if ($search_status == Adherent::STATUS_VALIDATED && $filter == '') {
 		$titre = $langs->trans("MembersValidated");
 	}
-	if ($search_status == '1' && $filter == 'withoutsubscription') {
+	if ($search_status == Adherent::STATUS_VALIDATED && $filter == 'withoutsubscription') {
 		$titre = $langs->trans("MembersWithSubscriptionToReceive");
 	}
-	if ($search_status == '1' && $filter == 'uptodate') {
+	if ($search_status == Adherent::STATUS_VALIDATED && $filter == 'uptodate') {
 		$titre = $langs->trans("MembersListUpToDate");
 	}
-	if ($search_status == '1' && $filter == 'outofdate') {
+	if ($search_status == Adherent::STATUS_VALIDATED && $filter == 'outofdate') {
 		$titre = $langs->trans("MembersListNotUpToDate");
 	}
-	if ($search_status == '0') {
+	if ($search_status == Adherent::STATUS_RESILIATED) {
 		$titre = $langs->trans("MembersListResiliated");
 	}
-	if ($search_status == '-2') {
+	if ($search_status == Adherent::STATUS_EXCLUDED) {
 		$titre = $langs->trans("MembersListExcluded");
 	}
 } elseif ($action == 'search') {
@@ -571,7 +571,7 @@ if ($search_phone_mobile != '') {
 if ($search_filter && $search_filter != '-1') {
 	$param .= "&search_filter=".urlencode($search_filter);
 }
-if ($search_status != "" && $search_status != '-1') {
+if ($search_status != "" && $search_status != Adherent::STATUS_DRAFT) {
 	$param .= "&search_status=".urlencode($search_status);
 }
 if ($search_type > 0) {
@@ -796,10 +796,10 @@ if (!empty($arrayfields['d.tms']['checked'])) {
 if (!empty($arrayfields['d.statut']['checked'])) {
 	print '<td class="liste_titre right maxwidthonsmartphone">';
 	$liststatus = array(
-		'-1'=>$langs->trans("Draft"),
-		'1'=>$langs->trans("Validated"),
-		'0'=>$langs->trans("MemberStatusResiliatedShort"),
-		'-2'=>$langs->trans("MemberStatusExcludedShort")
+		Adherent::STATUS_DRAFT => $langs->trans("Draft"),
+		Adherent::STATUS_VALIDATED => $langs->trans("Validated"),
+		Adherent::STATUS_RESILIATED => $langs->trans("MemberStatusResiliatedShort"),
+		Adherent::STATUS_EXCLUDED =>$langs->trans("MemberStatusExcludedShort")
 	);
 	print $form->selectarray('search_status', $liststatus, $search_status, -3);
 	print '</td>';

From 023453e73be934bc79fd050d5549a8b69a0b25a8 Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Mon, 14 Jun 2021 12:45:13 +0200
Subject: [PATCH 0616/1497] Update geo.php

---
 htdocs/adherents/stats/geo.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/adherents/stats/geo.php b/htdocs/adherents/stats/geo.php
index ea7730dbb3b..16dfc3ccff6 100644
--- a/htdocs/adherents/stats/geo.php
+++ b/htdocs/adherents/stats/geo.php
@@ -142,7 +142,7 @@ if ($mode) {
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c on d.country = c.rowid";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."subscription as s ON s.fk_adherent = d.rowid";
 		$sql .= " WHERE d.entity IN (".getEntity('adherent').")";
-		$sql .= " AND d.statut <> "Adherent::STATUS_DRAFT;
+		$sql .= " AND d.statut <> ".Adherent::STATUS_DRAFT;
 		$sql .= " GROUP BY c.label, c.code, d.town";
 		//print $sql;
 	}

From 5cc86d2319f71db1abf07ace726579e88d9e20c6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 14 Jun 2021 13:51:09 +0200
Subject: [PATCH 0617/1497] Fix #yogosha6370

---
 .../class/accountancycategory.class.php       |  8 ++--
 htdocs/adherents/class/subscription.class.php |  2 +-
 .../compta/localtax/class/localtax.class.php  |  2 +-
 .../class/paymentsocialcontribution.class.php |  4 +-
 htdocs/compta/tva/class/paymentvat.class.php  |  4 +-
 htdocs/contact/class/contact.class.php        | 10 ++---
 htdocs/contrat/class/contrat.class.php        | 10 ++---
 htdocs/core/boxes/box_boms.php                |  2 +-
 htdocs/core/boxes/box_mos.php                 |  2 +-
 htdocs/core/class/commonobject.class.php      | 17 ++++-----
 htdocs/core/class/discount.class.php          | 10 ++---
 htdocs/core/class/events.class.php            |  2 +-
 htdocs/core/class/extrafields.class.php       |  8 ++--
 htdocs/core/class/html.form.class.php         | 38 +++++++++----------
 htdocs/core/class/html.formcompany.class.php  |  6 +--
 htdocs/core/db/DoliDB.class.php               |  2 +-
 htdocs/core/lib/functions.lib.php             |  2 +-
 htdocs/don/class/paymentdonation.class.php    |  4 +-
 htdocs/ecm/class/ecmdirectory.class.php       |  2 +-
 .../class/expensereport.class.php             | 20 +++++-----
 .../class/paymentexpensereport.class.php      |  2 +-
 htdocs/fichinter/class/fichinter.class.php    |  4 +-
 htdocs/fourn/card.php                         |  5 ++-
 .../class/fournisseur.commande.class.php      | 10 ++---
 .../fourn/class/fournisseur.facture.class.php | 10 ++---
 .../fourn/class/fournisseur.product.class.php | 30 +++++++--------
 htdocs/holiday/class/holiday.class.php        | 18 ++++-----
 htdocs/install/upgrade2.php                   |  4 +-
 htdocs/loan/class/loanschedule.class.php      | 12 +++---
 htdocs/loan/class/paymentloan.class.php       |  8 ++--
 htdocs/product/class/product.class.php        |  4 +-
 .../class/productcustomerprice.class.php      |  4 +-
 .../class/propalmergepdfproduct.class.php     | 13 ++-----
 .../class/price_global_variable.class.php     |  2 +-
 .../price_global_variable_updater.class.php   |  8 ++--
 .../stock/class/mouvementstock.class.php      |  8 ++--
 htdocs/salaries/class/paymentsalary.class.php |  4 +-
 htdocs/societe/class/societe.class.php        |  8 ++--
 htdocs/ticket/class/ticket.class.php          | 11 ++----
 39 files changed, 154 insertions(+), 166 deletions(-)

diff --git a/htdocs/accountancy/class/accountancycategory.class.php b/htdocs/accountancy/class/accountancycategory.class.php
index 783fc7156c2..77d10516daa 100644
--- a/htdocs/accountancy/class/accountancycategory.class.php
+++ b/htdocs/accountancy/class/accountancycategory.class.php
@@ -201,7 +201,7 @@ class AccountancyCategory // extends CommonObject
 		$sql .= "entity";
 		$sql .= ") VALUES (";
 		if ($this->rowid > 0) {
-			$sql .= " ".$this->rowid.",";
+			$sql .= " ".((int) $this->rowid).",";
 		}
 		$sql .= " ".(!isset($this->code) ? 'NULL' : "'".$this->db->escape($this->code)."'").",";
 		$sql .= " ".(!isset($this->label) ? 'NULL' : "'".$this->db->escape($this->label)."'").",";
@@ -209,9 +209,9 @@ class AccountancyCategory // extends CommonObject
 		$sql .= " ".(!isset($this->sens) ? 'NULL' : "'".$this->db->escape($this->sens)."'").",";
 		$sql .= " ".(!isset($this->category_type) ? 'NULL' : "'".$this->db->escape($this->category_type)."'").",";
 		$sql .= " ".(!isset($this->formula) ? 'NULL' : "'".$this->db->escape($this->formula)."'").",";
-		$sql .= " ".(!isset($this->position) ? 'NULL' : $this->db->escape($this->position)).",";
-		$sql .= " ".(!isset($this->fk_country) ? 'NULL' : $this->db->escape($this->fk_country)).",";
-		$sql .= " ".(!isset($this->active) ? 'NULL' : $this->db->escape($this->active));
+		$sql .= " ".(!isset($this->position) ? 'NULL' : ((int) $this->position)).",";
+		$sql .= " ".(!isset($this->fk_country) ? 'NULL' : ((int) $this->fk_country)).",";
+		$sql .= " ".(!isset($this->active) ? 'NULL' : ((int) $this->active));
 		$sql .= ", ".$conf->entity;
 		$sql .= ")";
 
diff --git a/htdocs/adherents/class/subscription.class.php b/htdocs/adherents/class/subscription.class.php
index bb5cdd20bd5..fff9d925cd9 100644
--- a/htdocs/adherents/class/subscription.class.php
+++ b/htdocs/adherents/class/subscription.class.php
@@ -168,7 +168,7 @@ class Subscription extends CommonObject
 		$sql .= " VALUES (".((int) $this->fk_adherent).", '".$this->db->escape($type)."', '".$this->db->idate($now)."',";
 		$sql .= " '".$this->db->idate($this->dateh)."',";
 		$sql .= " '".$this->db->idate($this->datef)."',";
-		$sql .= " ".$this->amount.",";
+		$sql .= " ".((float) $this->amount).",";
 		$sql .= " '".$this->db->escape($this->note_public ? $this->note_public : $this->note)."')";
 
 		$resql = $this->db->query($sql);
diff --git a/htdocs/compta/localtax/class/localtax.class.php b/htdocs/compta/localtax/class/localtax.class.php
index 115dce99c9e..63b4f982316 100644
--- a/htdocs/compta/localtax/class/localtax.class.php
+++ b/htdocs/compta/localtax/class/localtax.class.php
@@ -110,7 +110,7 @@ class Localtax extends CommonObject
 		$sql .= "fk_user_creat,";
 		$sql .= "fk_user_modif";
 		$sql .= ") VALUES (";
-		$sql .= " ".$this->ltt.",";
+		$sql .= " ".((int) $this->ltt).",";
 		$sql .= " '".$this->db->idate($this->tms)."',";
 		$sql .= " '".$this->db->idate($this->datep)."',";
 		$sql .= " '".$this->db->idate($this->datev)."',";
diff --git a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
index 434078959b9..48ba4b06d30 100644
--- a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
+++ b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
@@ -181,8 +181,8 @@ class PaymentSocialContribution extends CommonObject
 			$sql .= " fk_typepaiement, num_paiement, note, fk_user_creat, fk_bank)";
 			$sql .= " VALUES ($this->chid, '".$this->db->idate($now)."',";
 			$sql .= " '".$this->db->idate($this->datepaye)."',";
-			$sql .= " ".$totalamount.",";
-			$sql .= " ".$this->paiementtype.", '".$this->db->escape($this->num_payment)."', '".$this->db->escape($this->note)."', ".$user->id.",";
+			$sql .= " ".((float) $totalamount).",";
+			$sql .= " ".((int) $this->paiementtype).", '".$this->db->escape($this->num_payment)."', '".$this->db->escape($this->note)."', ".$user->id.",";
 			$sql .= " 0)";
 
 			$resql = $this->db->query($sql);
diff --git a/htdocs/compta/tva/class/paymentvat.class.php b/htdocs/compta/tva/class/paymentvat.class.php
index f8a397bdb9a..bc234b4516e 100644
--- a/htdocs/compta/tva/class/paymentvat.class.php
+++ b/htdocs/compta/tva/class/paymentvat.class.php
@@ -180,8 +180,8 @@ class PaymentVAT extends CommonObject
 			$sql .= " fk_typepaiement, num_paiement, note, fk_user_creat, fk_bank)";
 			$sql .= " VALUES ($this->chid, '".$this->db->idate($now)."',";
 			$sql .= " '".$this->db->idate($this->datepaye)."',";
-			$sql .= " ".$totalamount.",";
-			$sql .= " ".$this->paiementtype.", '".$this->db->escape($this->num_payment)."', '".$this->db->escape($this->note)."', ".$user->id.",";
+			$sql .= " ".((float) $totalamount).",";
+			$sql .= " ".((int) $this->paiementtype).", '".$this->db->escape($this->num_payment)."', '".$this->db->escape($this->note)."', ".$user->id.",";
 			$sql .= " 0)";
 
 			$resql = $this->db->query($sql);
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index 86d38c5b3e1..3d545b40d63 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -455,18 +455,18 @@ class Contact extends CommonObject
 		$sql .= ") VALUES (";
 		$sql .= "'".$this->db->idate($now)."',";
 		if ($this->socid > 0) {
-			$sql .= " ".$this->db->escape($this->socid).",";
+			$sql .= " ".((int) $this->socid).",";
 		} else {
 			$sql .= "null,";
 		}
 		$sql .= "'".$this->db->escape($this->lastname)."',";
 		$sql .= "'".$this->db->escape($this->firstname)."',";
-		$sql .= " ".($user->id > 0 ? "'".$this->db->escape($user->id)."'" : "null").",";
-		$sql .= " ".$this->db->escape($this->priv).",";
+		$sql .= " ".($user->id > 0 ? ((int) $user->id)."'" : "null").",";
+		$sql .= " ".((int) $this->priv).",";
 		$sql .= " 0,";
-		$sql .= " ".$this->db->escape($this->statut).",";
+		$sql .= " ".((int) $this->statut).",";
 		$sql .= " ".(!empty($this->canvas) ? "'".$this->db->escape($this->canvas)."'" : "null").",";
-		$sql .= " ".$this->db->escape($this->entity).",";
+		$sql .= " ".((int) $this->entity).",";
 		$sql .= "'".$this->db->escape($this->ref_ext)."',";
 		$sql .= " ".(!empty($this->import_key) ? "'".$this->db->escape($this->import_key)."'" : "null");
 		$sql .= ")";
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 0275baeb3a9..5436c55faeb 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -1546,11 +1546,11 @@ class Contrat extends CommonObject
 			$sql .= ") VALUES (";
 			$sql .= $this->id.", '', '".$this->db->escape($desc)."',";
 			$sql .= ($fk_product > 0 ? $fk_product : "null").",";
-			$sql .= " ".$qty.",";
-			$sql .= " ".$txtva.",";
+			$sql .= " ".((float) $qty).",";
+			$sql .= " ".((float) $txtva).",";
 			$sql .= " ".($vat_src_code ? "'".$this->db->escape($vat_src_code)."'" : "null").",";
-			$sql .= " ".$txlocaltax1.",";
-			$sql .= " ".$txlocaltax2.",";
+			$sql .= " ".((float) $txlocaltax1).",";
+			$sql .= " ".((float) $txlocaltax2).",";
 			$sql .= " '".$this->db->escape($localtax1_type)."',";
 			$sql .= " '".$this->db->escape($localtax2_type)."',";
 			$sql .= " ".price2num($remise_percent).",";
@@ -1559,7 +1559,7 @@ class Contrat extends CommonObject
 			$sql .= " '".$this->db->escape($info_bits)."',";
 			$sql .= " ".price2num($price).",".price2num($remise).",";
 			if (isset($fk_fournprice)) {
-				$sql .= ' '.$fk_fournprice.',';
+				$sql .= ' '.((int) $fk_fournprice).',';
 			} else {
 				$sql .= ' null,';
 			}
diff --git a/htdocs/core/boxes/box_boms.php b/htdocs/core/boxes/box_boms.php
index ae0877c0369..ee248d0a083 100644
--- a/htdocs/core/boxes/box_boms.php
+++ b/htdocs/core/boxes/box_boms.php
@@ -97,7 +97,7 @@ class box_boms extends ModeleBoxes
 			$sql .= " WHERE c.fk_product = p.rowid";
 			$sql .= " AND c.entity = ".$conf->entity;
 			$sql .= " ORDER BY c.tms DESC, c.ref DESC";
-			$sql .= " ".$this->db->plimit($max, 0);
+			$sql .= $this->db->plimit($max, 0);
 
 			$result = $this->db->query($sql);
 			if ($result) {
diff --git a/htdocs/core/boxes/box_mos.php b/htdocs/core/boxes/box_mos.php
index 43d1cd411e4..18a19da93dc 100644
--- a/htdocs/core/boxes/box_mos.php
+++ b/htdocs/core/boxes/box_mos.php
@@ -97,7 +97,7 @@ class box_mos extends ModeleBoxes
 			$sql .= " WHERE c.fk_product = p.rowid";
 			$sql .= " AND c.entity = ".$conf->entity;
 			$sql .= " ORDER BY c.tms DESC, c.ref DESC";
-			$sql .= " ".$this->db->plimit($max, 0);
+			$sql .= $this->db->plimit($max, 0);
 
 			$result = $this->db->query($sql);
 			if ($result) {
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 14eb0faa353..c927b833c71 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -3541,17 +3541,16 @@ abstract class CommonObject
 
 			if (empty($nodatabaseupdate)) {
 				$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' SET';
-				$sql .= " ".$fieldht."='".price2num($this->total_ht)."',";
-				$sql .= " ".$fieldtva."='".price2num($this->total_tva)."',";
-				$sql .= " ".$fieldlocaltax1."='".price2num($this->total_localtax1)."',";
-				$sql .= " ".$fieldlocaltax2."='".price2num($this->total_localtax2)."',";
-				$sql .= " ".$fieldttc."='".price2num($this->total_ttc)."'";
-						$sql .= ", multicurrency_total_ht='".price2num($this->multicurrency_total_ht, 'MT', 1)."'";
-						$sql .= ", multicurrency_total_tva='".price2num($this->multicurrency_total_tva, 'MT', 1)."'";
-						$sql .= ", multicurrency_total_ttc='".price2num($this->multicurrency_total_ttc, 'MT', 1)."'";
+				$sql .= " ".$fieldht." = ".price2num($this->total_ht).",";
+				$sql .= " ".$fieldtva." = ".price2num($this->total_tva).",";
+				$sql .= " ".$fieldlocaltax1." = ".price2num($this->total_localtax1).",";
+				$sql .= " ".$fieldlocaltax2." = ".price2num($this->total_localtax2).",";
+				$sql .= " ".$fieldttc." = ".price2num($this->total_ttc);
+				$sql .= ", multicurrency_total_ht = ".price2num($this->multicurrency_total_ht, 'MT', 1);
+				$sql .= ", multicurrency_total_tva = ".price2num($this->multicurrency_total_tva, 'MT', 1);
+				$sql .= ", multicurrency_total_ttc = ".price2num($this->multicurrency_total_ttc, 'MT', 1);
 				$sql .= ' WHERE rowid = '.$this->id;
 
-
 				dol_syslog(get_class($this)."::update_price", LOG_DEBUG);
 				$resql = $this->db->query($sql);
 				if (!$resql) {
diff --git a/htdocs/core/class/discount.class.php b/htdocs/core/class/discount.class.php
index e1f1c9775c3..2aa829f4090 100644
--- a/htdocs/core/class/discount.class.php
+++ b/htdocs/core/class/discount.class.php
@@ -257,11 +257,11 @@ class DiscountAbsolute
 		$sql .= " multicurrency_amount_ht, multicurrency_amount_tva, multicurrency_amount_ttc,";
 		$sql .= " fk_facture_source, fk_invoice_supplier_source";
 		$sql .= ")";
-		$sql .= " VALUES (".$conf->entity.", '".$this->db->idate($this->datec != '' ? $this->datec : dol_now())."', ".$this->fk_soc.", ".(empty($this->discount_type) ? 0 : intval($this->discount_type)).", ".$userid.", '".$this->db->escape($this->description)."',";
-		$sql .= " ".$this->amount_ht.", ".$this->amount_tva.", ".$this->amount_ttc.", ".$this->tva_tx.", '".$this->db->escape($this->vat_src_code)."',";
-		$sql .= " ".$this->multicurrency_amount_ht.", ".$this->multicurrency_amount_tva.", ".$this->multicurrency_amount_ttc.", ";
-		$sql .= " ".($this->fk_facture_source ? "'".$this->db->escape($this->fk_facture_source)."'" : "null").",";
-		$sql .= " ".($this->fk_invoice_supplier_source ? "'".$this->db->escape($this->fk_invoice_supplier_source)."'" : "null");
+		$sql .= " VALUES (".$conf->entity.", '".$this->db->idate($this->datec != '' ? $this->datec : dol_now())."', ".((int) $this->fk_soc).", ".(empty($this->discount_type) ? 0 : intval($this->discount_type)).", ".((int) $userid).", '".$this->db->escape($this->description)."',";
+		$sql .= " ".price2num($this->amount_ht).", ".price2num($this->amount_tva).", ".price2num($this->amount_ttc).", ".price2num($this->tva_tx).", '".$this->db->escape($this->vat_src_code)."',";
+		$sql .= " ".price2num($this->multicurrency_amount_ht).", ".price2num($this->multicurrency_amount_tva).", ".price2num($this->multicurrency_amount_ttc).", ";
+		$sql .= " ".($this->fk_facture_source ? ((int) $this->fk_facture_source) : "null").",";
+		$sql .= " ".($this->fk_invoice_supplier_source ? ((int) $this->fk_invoice_supplier_source) : "null");
 		$sql .= ")";
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
diff --git a/htdocs/core/class/events.class.php b/htdocs/core/class/events.class.php
index 1771f0d18f0..c8799ebbd5e 100644
--- a/htdocs/core/class/events.class.php
+++ b/htdocs/core/class/events.class.php
@@ -163,7 +163,7 @@ class Events // extends CommonObject
 		$sql .= "prefix_session";
 		$sql .= ") VALUES (";
 		$sql .= " '".$this->db->escape($this->type)."',";
-		$sql .= " ".$conf->entity.",";
+		$sql .= " ".((int) $conf->entity).",";
 		$sql .= " '".$this->db->escape(getUserRemoteIP())."',";
 		$sql .= " ".($this->user_agent ? "'".$this->db->escape(dol_trunc($this->user_agent, 250))."'" : 'NULL').",";
 		$sql .= " '".$this->db->idate($this->dateevent)."',";
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 59311b707dd..16d58f51eb3 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -472,14 +472,14 @@ class ExtraFields
 			$sql .= " VALUES('".$this->db->escape($attrname)."',";
 			$sql .= " '".$this->db->escape($label)."',";
 			$sql .= " '".$this->db->escape($type)."',";
-			$sql .= " ".$pos.",";
+			$sql .= " ".((int) $pos).",";
 			$sql .= " '".$this->db->escape($size)."',";
 			$sql .= " ".($entity === '' ? $conf->entity : $entity).",";
 			$sql .= " '".$this->db->escape($elementtype)."',";
-			$sql .= " ".$unique.",";
-			$sql .= " ".$required.",";
+			$sql .= " ".((int) $unique).",";
+			$sql .= " ".((int) $required).",";
 			$sql .= " '".$this->db->escape($params)."',";
-			$sql .= " ".$alwayseditable.",";
+			$sql .= " ".((int) $alwayseditable).",";
 			$sql .= " ".($perms ? "'".$this->db->escape($perms)."'" : "null").",";
 			$sql .= " ".($langfile ? "'".$this->db->escape($langfile)."'" : "null").",";
 			$sql .= " '".$this->db->escape($list)."',";
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index c5248fdf490..ebda2face9e 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1849,7 +1849,7 @@ class Form
 	 *  @param	string			$force_entity	'0' or Ids of environment to force
 	 *  @param	int				$maxlength		Maximum length of string into list (0=no limit)
 	 *  @param	int				$showstatus		0=show user status only if status is disabled, 1=always show user status into label, -1=never show user status
-	 *  @param	string			$morefilter		Add more filters into sql request (Example: 'employee = 1')
+	 *  @param	string			$morefilter		Add more filters into sql request (Example: 'employee = 1'). This value must not come from user input.
 	 *  @param	integer			$show_every		0=default list, 1=add also a value "Everybody" at beginning of list
 	 *  @param	string			$enableonlytext	If option $enableonlytext is set, we use this text to explain into label why record is disabled. Not used if enableonly is empty.
 	 *  @param	string			$morecss		More css
@@ -1903,9 +1903,9 @@ class Form
 		}
 		$sql .= " FROM ".MAIN_DB_PREFIX."user as u";
 		if (!empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && !$user->entity) {
-			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."entity as e ON e.rowid=u.entity";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."entity as e ON e.rowid = u.entity";
 			if ($force_entity) {
-				$sql .= " WHERE u.entity IN (0, ".$force_entity.")";
+				$sql .= " WHERE u.entity IN (0, ".$this->db->sanitize($force_entity).")";
 			} else {
 				$sql .= " WHERE u.entity IS NOT NULL";
 			}
@@ -1919,7 +1919,7 @@ class Form
 			}
 		}
 		if (!empty($user->socid)) {
-			$sql .= " AND u.fk_soc = ".$user->socid;
+			$sql .= " AND u.fk_soc = ".((int) $user->socid);
 		}
 		if (is_array($exclude) && $excludeUsers) {
 			$sql .= " AND u.rowid NOT IN (".$this->db->sanitize($excludeUsers).")";
@@ -3052,20 +3052,20 @@ class Form
 	/**
 	 *	Return list of suppliers products
 	 *
-	 *	@param	int		$socid   		Id societe fournisseur (0 pour aucun filtre)
-	 *	@param  int		$selected       Product price pre-selected (must be 'id' in product_fournisseur_price or 'idprod_IDPROD')
-	 *	@param  string	$htmlname       Nom de la zone select
-	 *  @param	string	$filtertype     Filter on product type (''=nofilter, 0=product, 1=service)
-	 *	@param  string	$filtre         Pour filtre sql
-	 *	@param  string	$filterkey      Filtre des produits
-	 *  @param  int		$statut         -1=Return all products, 0=Products not on buy, 1=Products on buy
-	 *  @param  int		$outputmode     0=HTML select string, 1=Array
-	 *  @param  int     $limit          Limit of line number
+	 *	@param	int		$socid   			Id of supplier thirdparty (0 = no filter)
+	 *	@param  int		$selected       	Product price pre-selected (must be 'id' in product_fournisseur_price or 'idprod_IDPROD')
+	 *	@param  string	$htmlname       	Name of HTML select
+	 *  @param	string	$filtertype     	Filter on product type (''=nofilter, 0=product, 1=service)
+	 *	@param  string	$filtre         	Generic filter. Data must not come from user input.
+	 *	@param  string	$filterkey      	Filter of produdts
+	 *  @param  int		$statut         	-1=Return all products, 0=Products not on buy, 1=Products on buy
+	 *  @param  int		$outputmode     	0=HTML select string, 1=Array
+	 *  @param  int     $limit          	Limit of line number
 	 *  @param  int     $alsoproductwithnosupplierprice    1=Add also product without supplier prices
-	 *  @param	string	$morecss		Add more CSS
+	 *  @param	string	$morecss			Add more CSS
 	 *  @param	int		$showstockinlist	Show stock information (slower).
-	 *  @param	string	$placeholder	Placeholder
-	 *  @return array           		Array of keys for json
+	 *  @param	string	$placeholder		Placeholder
+	 *  @return array           			Array of keys for json
 	 */
 	public function select_produits_fournisseurs_list($socid, $selected = '', $htmlname = 'productid', $filtertype = '', $filtre = '', $filterkey = '', $statut = -1, $outputmode = 0, $limit = 100, $alsoproductwithnosupplierprice = 0, $morecss = '', $showstockinlist = 0, $placeholder = '')
 	{
@@ -3102,8 +3102,8 @@ class Form
 		}
 		$sql .= " FROM ".MAIN_DB_PREFIX."product as p";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON ( p.rowid = pfp.fk_product AND pfp.entity IN (".getEntity('product').") )";
-		if ($socid) {
-			$sql .= " AND pfp.fk_soc = ".$socid;
+		if ($socid > 0) {
+			$sql .= " AND pfp.fk_soc = ".((int) $socid);
 		}
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON pfp.fk_soc = s.rowid";
 		// Units
@@ -3115,7 +3115,7 @@ class Form
 			$sql .= " AND p.tobuy = ".((int) $statut);
 		}
 		if (strval($filtertype) != '') {
-			$sql .= " AND p.fk_product_type=".$this->db->escape($filtertype);
+			$sql .= " AND p.fk_product_type = ".((int) $filtertype);
 		}
 		if (!empty($filtre)) {
 			$sql .= " ".$filtre;
diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php
index 4fa2f87f636..bb99b2a32e9 100644
--- a/htdocs/core/class/html.formcompany.class.php
+++ b/htdocs/core/class/html.formcompany.class.php
@@ -45,7 +45,7 @@ class FormCompany extends Form
 	 *    	Return list of labels (translated) of third parties type
 	 *
 	 *		@param	int		$mode		0=Return id+label, 1=Return code+label
-	 *      @param  string	$filter     Add a SQL filter to select
+	 *      @param  string	$filter     Add a SQL filter to select. Data must not come from user input.
 	 *    	@return array      			Array of types
 	 */
 	public function typent_array($mode = 0, $filter = '')
@@ -96,7 +96,7 @@ class FormCompany extends Form
 	 *	Renvoie la liste des types d'effectifs possibles (pas de traduction car nombre)
 	 *
 	 *	@param	int		$mode		0=renvoi id+libelle, 1=renvoi code+libelle
-	 *	@param  string	$filter     Add a SQL filter to select
+	 *	@param  string	$filter     Add a SQL filter to select. Data must not come from user input.
 	 *  @return array				Array of types d'effectifs
 	 */
 	public function effectif_array($mode = 0, $filter = '')
@@ -509,7 +509,7 @@ class FormCompany extends Form
 	 *
 	 *    @param	string		$selected        	Preselected code of juridical type
 	 *    @param    int			$country_codeid     0=list for all countries, otherwise list only country requested
-	 *    @param    string		$filter          	Add a SQL filter on list
+	 *    @param    string		$filter          	Add a SQL filter on list. Data must not come from user input.
 	 *    @param	string		$htmlname			HTML name of select
 	 *    @param	string		$morecss			More CSS
 	 *    @return	string							String with HTML select
diff --git a/htdocs/core/db/DoliDB.class.php b/htdocs/core/db/DoliDB.class.php
index 2ed93a9b5f4..b93a3f40cea 100644
--- a/htdocs/core/db/DoliDB.class.php
+++ b/htdocs/core/db/DoliDB.class.php
@@ -108,7 +108,7 @@ abstract class DoliDB implements Database
 	 * Sanitize a string for SQL forging
 	 *
 	 * @param   string 	$stringtosanitize 	String to escape
-	 * @param   int		$allowsimplequote 	Allow simple quote
+	 * @param   int		$allowsimplequote 	1=Allow simple quotes in string. When string is used as a list of SQL string ('aa', 'bb', ...)
 	 * @return  string                      String escaped
 	 */
 	public function sanitize($stringtosanitize, $allowsimplequote = 0)
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 6856cbab458..16b28814f64 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -5190,7 +5190,7 @@ function price($amount, $form = 0, $outlangs = '', $trunc = 1, $rounding = -1, $
  * 	@param	int				$option			Put 1 if you know that content is already universal format number (so no correction on decimal will be done)
  * 											Put 2 if you know that number is a user input (so we know we don't have to fix decimal separator).
  *	@return	string							Amount with universal numeric format (Example: '99.99999').
- *											If conversion fails, it return text unchanged if $rounding = '' or '0' if $rounding is defined.
+ *											If conversion fails, it return text unchanged if ($rounding = '' and $option = 1) or '0' if ($rounding is defined and $option = 1).
  *											If amount is null or '', it returns '' if $rounding = '' or '0' if $rounding is defined..
  *
  *	@see    price()							Opposite function of price2num
diff --git a/htdocs/don/class/paymentdonation.class.php b/htdocs/don/class/paymentdonation.class.php
index 82c3ddde7fa..b5775ce18ac 100644
--- a/htdocs/don/class/paymentdonation.class.php
+++ b/htdocs/don/class/paymentdonation.class.php
@@ -189,8 +189,8 @@ class PaymentDonation extends CommonObject
 			$sql .= " fk_user_creat, fk_bank)";
 			$sql .= " VALUES ($this->chid, '".$this->db->idate($now)."',";
 			$sql .= " '".$this->db->idate($this->datepaid)."',";
-			$sql .= " ".$totalamount.",";
-			$sql .= " ".$this->paymenttype.", '".$this->db->escape($this->num_payment)."', '".$this->db->escape($this->note_public)."', ";
+			$sql .= " ".price2num($totalamount).",";
+			$sql .= " ".((int) $this->paymenttype).", '".$this->db->escape($this->num_payment)."', '".$this->db->escape($this->note_public)."', ";
 			$sql .= " ".($this->ext_payment_id ? "'".$this->db->escape($this->ext_payment_id)."'" : "null").", ".($this->ext_payment_site ? "'".$this->db->escape($this->ext_payment_site)."'" : "null").",";
 			$sql .= " ".$user->id.", 0)";
 
diff --git a/htdocs/ecm/class/ecmdirectory.class.php b/htdocs/ecm/class/ecmdirectory.class.php
index 52897e84b1a..c2961794bbc 100644
--- a/htdocs/ecm/class/ecmdirectory.class.php
+++ b/htdocs/ecm/class/ecmdirectory.class.php
@@ -196,7 +196,7 @@ class EcmDirectory extends CommonObject
 			$sql .= " '".$this->db->escape($conf->entity)."',";
 			$sql .= " '".$this->db->escape($this->fk_parent)."',";
 			$sql .= " '".$this->db->escape($this->description)."',";
-			$sql .= " ".$this->cachenbofdoc.",";
+			$sql .= " ".((int) $this->cachenbofdoc).",";
 			$sql .= " '".$this->db->idate($this->date_c)."',";
 			$sql .= " '".$this->db->escape($this->fk_user_c)."'";
 			$sql .= ")";
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 6cd3531f82d..9592f9548af 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -2697,20 +2697,20 @@ class ExpenseReportLine
 		$sql .= ' (fk_expensereport, fk_c_type_fees, fk_projet,';
 		$sql .= ' tva_tx, vat_src_code, comments, qty, value_unit, total_ht, total_tva, total_ttc, date, rule_warning_message, fk_c_exp_tax_cat, fk_ecm_files)';
 		$sql .= " VALUES (".$this->db->escape($this->fk_expensereport).",";
-		$sql .= " ".$this->db->escape($this->fk_c_type_fees).",";
-		$sql .= " ".$this->db->escape((!empty($this->fk_project) && $this->fk_project > 0) ? $this->fk_project : ((!empty($this->fk_projet) && $this->fk_projet > 0) ? $this->fk_projet : 'null')).",";
-		$sql .= " ".$this->db->escape($this->vatrate).",";
+		$sql .= " ".((int) $this->fk_c_type_fees).",";
+		$sql .= " ".((int) (!empty($this->fk_project) && $this->fk_project > 0) ? $this->fk_project : ((!empty($this->fk_projet) && $this->fk_projet > 0) ? $this->fk_projet : 'null')).",";
+		$sql .= " ".((float) $this->vatrate).",";
 		$sql .= " '".$this->db->escape(empty($this->vat_src_code) ? '' : $this->vat_src_code)."',";
 		$sql .= " '".$this->db->escape($this->comments)."',";
-		$sql .= " ".$this->db->escape($this->qty).",";
-		$sql .= " ".$this->db->escape($this->value_unit).",";
-		$sql .= " ".$this->db->escape($this->total_ht).",";
-		$sql .= " ".$this->db->escape($this->total_tva).",";
-		$sql .= " ".$this->db->escape($this->total_ttc).",";
+		$sql .= " ".((float) $this->qty).",";
+		$sql .= " ".((int) $this->value_unit).",";
+		$sql .= " ".price2num($this->total_ht).",";
+		$sql .= " ".price2num($this->total_tva).",";
+		$sql .= " ".price2num($this->total_ttc).",";
 		$sql .= " '".$this->db->idate($this->date)."',";
 		$sql .= " ".(empty($this->rule_warning_message) ? 'null' : "'".$this->db->escape($this->rule_warning_message)."'").",";
-		$sql .= " ".$this->db->escape($this->fk_c_exp_tax_cat).",";
-		$sql .= " ".($this->fk_ecm_files > 0 ? $this->fk_ecm_files : 'null');
+		$sql .= " ".((int) $this->fk_c_exp_tax_cat).",";
+		$sql .= " ".($this->fk_ecm_files > 0 ? ((int) $this->fk_ecm_files) : 'null');
 		$sql .= ")";
 
 		$resql = $this->db->query($sql);
diff --git a/htdocs/expensereport/class/paymentexpensereport.class.php b/htdocs/expensereport/class/paymentexpensereport.class.php
index c673316d491..a453b810e6a 100644
--- a/htdocs/expensereport/class/paymentexpensereport.class.php
+++ b/htdocs/expensereport/class/paymentexpensereport.class.php
@@ -168,7 +168,7 @@ class PaymentExpenseReport extends CommonObject
 			$sql .= " fk_typepayment, num_payment, note, fk_user_creat, fk_bank)";
 			$sql .= " VALUES ($this->fk_expensereport, '".$this->db->idate($now)."',";
 			$sql .= " '".$this->db->idate($this->datepaid)."',";
-			$sql .= " ".$totalamount.",";
+			$sql .= " ".price2num($totalamount).",";
 			$sql .= " ".$this->fk_typepayment.", '".$this->db->escape($this->num_payment)."', '".$this->db->escape($this->note_public)."', ".$user->id.",";
 			$sql .= " 0)";
 
diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index 2e9d8a4a9b1..0bb5d2522ab 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -1499,8 +1499,8 @@ class FichinterLigne extends CommonObjectLine
 		$sql .= " VALUES (".$this->fk_fichinter.",";
 		$sql .= " '".$this->db->escape($this->desc)."',";
 		$sql .= " '".$this->db->idate($this->datei)."',";
-		$sql .= " ".$this->duration.",";
-		$sql .= ' '.$rangToUse;
+		$sql .= " ".((int) $this->duration).",";
+		$sql .= ' '.((int) $rangToUse);
 		$sql .= ')';
 
 		dol_syslog("FichinterLigne::insert", LOG_DEBUG);
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index e9b61e53406..866fd31318e 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -592,7 +592,7 @@ if ($object->id > 0) {
 		$sql .= " WHERE p.fk_soc =".$object->id;
 		$sql .= " AND p.entity IN (".getEntity('supplier_proposal').")";
 		$sql .= " ORDER BY p.date_valid DESC";
-		$sql .= " ".$db->plimit($MAXLIST);
+		$sql .= $db->plimit($MAXLIST);
 
 		$resql = $db->query($sql);
 		if ($resql) {
@@ -694,7 +694,8 @@ if ($object->id > 0) {
 		$sql .= " WHERE p.fk_soc =".$object->id;
 		$sql .= " AND p.entity IN (".getEntity('commande_fournisseur').")";
 		$sql .= " ORDER BY p.date_commande DESC";
-		$sql .= " ".$db->plimit($MAXLIST);
+		$sql .= $db->plimit($MAXLIST);
+
 		$resql = $db->query($sql);
 		if ($resql) {
 			$i = 0;
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index d9ca371c133..daa943ffee9 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -3681,19 +3681,19 @@ class CommandeFournisseurLigne extends CommonOrderLine
 		$sql .= "'".$this->db->escape($this->rang)."',";
 		$sql .= "'".$this->db->escape($this->qty)."', ";
 		$sql .= " ".(empty($this->vat_src_code) ? "''" : "'".$this->db->escape($this->vat_src_code)."'").",";
-		$sql .= " ".$this->tva_tx.", ";
-		$sql .= " ".$this->localtax1_tx.",";
-		$sql .= " ".$this->localtax2_tx.",";
+		$sql .= " ".price2num($this->tva_tx).", ";
+		$sql .= " ".price2num($this->localtax1_tx).",";
+		$sql .= " ".price2num($this->localtax2_tx).",";
 		$sql .= " '".$this->db->escape($this->localtax1_type)."',";
 		$sql .= " '".$this->db->escape($this->localtax2_type)."',";
-		$sql .= " ".$this->remise_percent.", ".price2num($this->subprice, 'MU').", '".$this->db->escape($this->ref_supplier)."',";
+		$sql .= " ".((float) $this->remise_percent).", ".price2num($this->subprice, 'MU').", '".$this->db->escape($this->ref_supplier)."',";
 		$sql .= " ".price2num($this->total_ht).",";
 		$sql .= " ".price2num($this->total_tva).",";
 		$sql .= " ".price2num($this->total_localtax1).",";
 		$sql .= " ".price2num($this->total_localtax2).",";
 		$sql .= " ".price2num($this->total_ttc).",";
 		$sql .= ($this->fk_unit ? "'".$this->db->escape($this->fk_unit)."'" : "null");
-		$sql .= ", ".($this->fk_multicurrency ? $this->fk_multicurrency : "null");
+		$sql .= ", ".($this->fk_multicurrency ? ((int) $this->fk_multicurrency) : "null");
 		$sql .= ", '".$this->db->escape($this->multicurrency_code)."'";
 		$sql .= ", ".($this->multicurrency_subprice ? price2num($this->multicurrency_subprice) : '0');
 		$sql .= ", ".($this->multicurrency_total_ht ? price2num($this->multicurrency_total_ht) : '0');
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 377f09028df..f5840712807 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -3584,17 +3584,17 @@ class SupplierInvoiceLine extends CommonObjectLine
 		$sql .= " '".$this->db->escape($this->localtax1_type)."',";
 		$sql .= " '".$this->db->escape($this->localtax2_type)."',";
 		$sql .= ' '.(!empty($this->fk_product) ? $this->fk_product : "null").',';
-		$sql .= " ".$this->product_type.",";
+		$sql .= " ".((int) $this->product_type).",";
 		$sql .= " ".price2num($this->remise_percent).",";
-		$sql .= ' '.(! empty($this->fk_remise_except)?$this->fk_remise_except:"null").',';
+		$sql .= ' '.(! empty($this->fk_remise_except) ? ((int) $this->fk_remise_except) : "null").',';
 		$sql .= " ".price2num($this->subprice).",";
 		$sql .= " ".(!empty($this->qty) ?price2num($this->total_ttc / $this->qty) : price2num($this->total_ttc)).",";
 		$sql .= " ".(!empty($this->date_start) ? "'".$this->db->idate($this->date_start)."'" : "null").",";
 		$sql .= " ".(!empty($this->date_end) ? "'".$this->db->idate($this->date_end)."'" : "null").",";
 		$sql .= ' '.(!empty($this->fk_code_ventilation) ? $this->fk_code_ventilation : 0).',';
-		$sql .= ' '.$this->rang.',';
-		$sql .= ' '.$this->special_code.',';
-		$sql .= " '".$this->db->escape($this->info_bits)."',";
+		$sql .= ' '.((int) $this->rang).',';
+		$sql .= ' '.((int) $this->special_code).',';
+		$sql .= " ".((int) $this->info_bits)."',";
 		$sql .= " ".price2num($this->total_ht).",";
 		$sql .= " ".price2num($this->total_tva).",";
 		$sql .= " ".price2num($this->total_ttc).",";
diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index 2172af578e9..3eaed8d27b8 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -455,28 +455,28 @@ class ProductFournisseur extends Product
 				$sql .= (isset($fk_multicurrency) ? "'".$this->db->escape($fk_multicurrency)."'" : 'null').",";
 				$sql .= (isset($multicurrency_code) ? "'".$this->db->escape($multicurrency_code)."'" : 'null').",";
 				$sql .= " '".$this->db->idate($now)."',";
-				$sql .= " ".$this->id.",";
-				$sql .= " ".$fourn->id.",";
+				$sql .= " ".((int) $this->id).",";
+				$sql .= " ".((int) $fourn->id).",";
 				$sql .= " '".$this->db->escape($ref_fourn)."',";
 				$sql .= " '".$this->db->escape($desc_fourn)."',";
 				$sql .= " ".$user->id.",";
-				$sql .= " ".$buyprice.",";
-				$sql .= " ".$qty.",";
-				$sql .= " ".$remise_percent.",";
-				$sql .= " ".$remise.",";
-				$sql .= " ".$unitBuyPrice.",";
-				$sql .= " ".$tva_tx.",";
-				$sql .= " ".$charges.",";
-				$sql .= " ".$availability.",";
+				$sql .= " ".price2num($buyprice).",";
+				$sql .= " ".((float) $qty).",";
+				$sql .= " ".((float) $remise_percent).",";
+				$sql .= " ".((float) $remise).",";
+				$sql .= " ".price2num($unitBuyPrice).",";
+				$sql .= " ".price2num($tva_tx).",";
+				$sql .= " ".price2num($charges).",";
+				$sql .= " ".((int) $availability).",";
 				$sql .= " ".($newdefaultvatcode ? "'".$this->db->escape($newdefaultvatcode)."'" : "null").",";
-				$sql .= " ".$newnpr.",";
+				$sql .= " ".((int) $newnpr).",";
 				$sql .= $conf->entity.",";
-				$sql .= ($delivery_time_days != '' ? $delivery_time_days : 'null').",";
+				$sql .= ($delivery_time_days != '' ? ((int) $delivery_time_days) : 'null').",";
 				$sql .= (empty($supplier_reputation) ? 'NULL' : "'".$this->db->escape($supplier_reputation)."'").",";
 				$sql .= (empty($barcode) ? 'NULL' : "'".$this->db->escape($barcode)."'").",";
 				$sql .= (empty($fk_barcode_type) ? 'NULL' : "'".$this->db->escape($fk_barcode_type)."'");
 				if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) {
-					$sql .= ", ".(empty($this->packaging) ? 1 : $this->db->escape($this->packaging));
+					$sql .= ", ".(empty($this->packaging) ? '1' : "'".$this->db->escape($this->packaging)."'");
 				}
 				$sql .= ")";
 
@@ -1253,10 +1253,10 @@ class ProductFournisseur extends Product
 		$sql .= (isset($fk_multicurrency) ? "'".$this->db->escape($fk_multicurrency)."'" : 'null').",";
 		$sql .= (isset($multicurrency_code) ? "'".$this->db->escape($multicurrency_code)."'" : 'null').",";
 		$sql .= "'".$this->db->idate($datec)."',";
-		$sql .= " ".$this->product_fourn_price_id.",";
+		$sql .= " ".((int) $this->product_fourn_price_id).",";
 		$sql .= " ".$user->id.",";
 		$sql .= " ".price2num($buyprice).",";
-		$sql .= " ".$qty;
+		$sql .= " ".price2num($qty);
 		$sql .= ")";
 
 		$resql = $this->db->query($sql);
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index 7e3585bd5bc..f51e1ed85cf 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -275,17 +275,17 @@ class Holiday extends CommonObject
 		$sql .= "entity";
 		$sql .= ") VALUES (";
 		$sql .= "'(PROV)',";
-		$sql .= "'".$this->db->escape($this->fk_user)."',";
+		$sql .= " ".((int) $this->fk_user)."',";
 		$sql .= " '".$this->db->idate($now)."',";
 		$sql .= " '".$this->db->escape($this->description)."',";
 		$sql .= " '".$this->db->idate($this->date_debut)."',";
 		$sql .= " '".$this->db->idate($this->date_fin)."',";
-		$sql .= " ".$this->halfday.",";
+		$sql .= " ".((int) $this->halfday).",";
 		$sql .= " '1',";
-		$sql .= " '".$this->db->escape($this->fk_validator)."',";
-		$sql .= " ".$this->fk_type.",";
-		$sql .= " ".$user->id.",";
-		$sql .= " ".$conf->entity;
+		$sql .= " ".((int) $this->fk_validator).",";
+		$sql .= " ".((int) $this->fk_type).",";
+		$sql .= " ".((int) $user->id).",";
+		$sql .= " ".((int) $conf->entity);
 		$sql .= ")";
 
 		$this->db->begin();
@@ -1952,12 +1952,12 @@ class Holiday extends CommonObject
 		$sql .= "fk_type";
 		$sql .= ") VALUES (";
 		$sql .= " '".$this->db->idate(dol_now())."',";
-		$sql .= " '".$this->db->escape($fk_user_action)."',";
-		$sql .= " '".$this->db->escape($fk_user_update)."',";
+		$sql .= " ".((int) $fk_user_action).",";
+		$sql .= " ".((int) $fk_user_update).",";
 		$sql .= " '".$this->db->escape($label)."',";
 		$sql .= " '".$this->db->escape($prev_solde)."',";
 		$sql .= " '".$this->db->escape($new_solde)."',";
-		$sql .= " ".$fk_type;
+		$sql .= " ".((int) $fk_type);
 		$sql .= ")";
 
 		$resql = $this->db->query($sql);
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index e814e69574a..824f05bc059 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -2465,7 +2465,7 @@ function migrate_restore_missing_links($db, $langs, $conf)
 				print 'Line '.$obj->rowid.' in '.$table1.' is linked to record '.$obj->field.' in '.$table2.' that has no link to '.$table1.'. We fix this.<br>';
 				$sql = "UPDATE ".MAIN_DB_PREFIX.$table2." SET";
 				$sql .= " ".$field2." = '".$db->escape($obj->rowid)."'";
-				$sql .= " WHERE rowid=".$obj->field;
+				$sql .= " WHERE rowid = ".((int) $obj->field);
 
 				$resql2 = $db->query($sql);
 				if (!$resql2) {
@@ -2522,7 +2522,7 @@ function migrate_restore_missing_links($db, $langs, $conf)
 				print 'Line '.$obj->rowid.' in '.$table1.' is linked to record '.$obj->field.' in '.$table2.' that has no link to '.$table1.'. We fix this.<br>';
 				$sql = "UPDATE ".MAIN_DB_PREFIX.$table2." SET";
 				$sql .= " ".$field2." = '".$db->escape($obj->rowid)."'";
-				$sql .= " WHERE rowid=".$obj->field;
+				$sql .= " WHERE rowid = ".((int) $obj->field);
 
 				$resql2 = $db->query($sql);
 				if (!$resql2) {
diff --git a/htdocs/loan/class/loanschedule.class.php b/htdocs/loan/class/loanschedule.class.php
index 54d4607ab70..126002eb47a 100644
--- a/htdocs/loan/class/loanschedule.class.php
+++ b/htdocs/loan/class/loanschedule.class.php
@@ -177,12 +177,12 @@ class LoanSchedule extends CommonObject
 			$sql .= " fk_typepayment, fk_user_creat, fk_bank)";
 			$sql .= " VALUES (".$this->fk_loan.", '".$this->db->idate($now)."',";
 			$sql .= " '".$this->db->idate($this->datep)."',";
-			$sql .= " ".$this->amount_capital.",";
-			$sql .= " ".$this->amount_insurance.",";
-			$sql .= " ".$this->amount_interest.",";
-			$sql .= " ".$this->fk_typepayment.", ";
-			$sql .= " ".$user->id.",";
-			$sql .= " ".$this->fk_bank.")";
+			$sql .= " ".price2num($this->amount_capital).",";
+			$sql .= " ".price2num($this->amount_insurance).",";
+			$sql .= " ".price2num($this->amount_interest).",";
+			$sql .= " ".price2num($this->fk_typepayment).", ";
+			$sql .= " ".((int) $user->id).",";
+			$sql .= " ".((int) $this->fk_bank).")";
 
 			dol_syslog(get_class($this)."::create", LOG_DEBUG);
 			$resql = $this->db->query($sql);
diff --git a/htdocs/loan/class/paymentloan.class.php b/htdocs/loan/class/paymentloan.class.php
index cf0a8e87f63..fd4dbf42081 100644
--- a/htdocs/loan/class/paymentloan.class.php
+++ b/htdocs/loan/class/paymentloan.class.php
@@ -182,10 +182,10 @@ class PaymentLoan extends CommonObject
 			$sql .= " fk_typepayment, num_payment, note_private, note_public, fk_user_creat, fk_bank)";
 			$sql .= " VALUES (".$this->chid.", '".$this->db->idate($now)."',";
 			$sql .= " '".$this->db->idate($this->datep)."',";
-			$sql .= " ".$this->amount_capital.",";
-			$sql .= " ".$this->amount_insurance.",";
-			$sql .= " ".$this->amount_interest.",";
-			$sql .= " ".$this->paymenttype.", '".$this->db->escape($this->num_payment)."', '".$this->db->escape($this->note_private)."', '".$this->db->escape($this->note_public)."', ".$user->id.",";
+			$sql .= " ".price2num($this->amount_capital).",";
+			$sql .= " ".price2num($this->amount_insurance).",";
+			$sql .= " ".price2num($this->amount_interest).",";
+			$sql .= " ".((int) $this->paymenttype).", '".$this->db->escape($this->num_payment)."', '".$this->db->escape($this->note_private)."', '".$this->db->escape($this->note_public)."', ".$user->id.",";
 			$sql .= " 0)";
 
 			dol_syslog(get_class($this)."::create", LOG_DEBUG);
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 70327386dd1..8d53db4c0b7 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -1714,8 +1714,8 @@ class Product extends CommonObject
 		// Add new price
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_price(price_level,date_price, fk_product, fk_user_author, price, price_ttc, price_base_type,tosell, tva_tx, default_vat_code, recuperableonly,";
 		$sql .= " localtax1_tx, localtax2_tx, localtax1_type, localtax2_type, price_min,price_min_ttc,price_by_qty,entity,fk_price_expression) ";
-		$sql .= " VALUES(".($level ? $level : 1).", '".$this->db->idate($now)."',".$this->id.",".$user->id.",".$this->price.",".$this->price_ttc.",'".$this->db->escape($this->price_base_type)."',".$this->status.",".$this->tva_tx.", ".($this->default_vat_code ? ("'".$this->db->escape($this->default_vat_code)."'") : "null").",".$this->tva_npr.",";
-		$sql .= " ".$this->localtax1_tx.", ".$this->localtax2_tx.", '".$this->db->escape($this->localtax1_type)."', '".$this->db->escape($this->localtax2_type)."', ".$this->price_min.",".$this->price_min_ttc.",".$this->price_by_qty.",".$conf->entity.",".($this->fk_price_expression > 0 ? $this->fk_price_expression : 'null');
+		$sql .= " VALUES(".($level ? $level : 1).", '".$this->db->idate($now)."', ".$this->id.", ".$user->id.", ".price2num($this->price).", ".price2num($this->price_ttc).",'".$this->db->escape($this->price_base_type)."',".((int) $this->status).", ".price2num($this->tva_tx).", ".($this->default_vat_code ? ("'".$this->db->escape($this->default_vat_code)."'") : "null").", ".((int) $this->tva_npr).",";
+		$sql .= " ".price2num($this->localtax1_tx).", ".price2num($this->localtax2_tx).", '".$this->db->escape($this->localtax1_type)."', '".$this->db->escape($this->localtax2_type)."', ".price2num($this->price_min).", ".price2num($this->price_min_ttc).", ".price2num($this->price_by_qty).", ".$conf->entity.",".($this->fk_price_expression > 0 ? ((int) $this->fk_price_expression) : 'null');
 		$sql .= ")";
 
 		dol_syslog(get_class($this)."::_log_price", LOG_DEBUG);
diff --git a/htdocs/product/class/productcustomerprice.class.php b/htdocs/product/class/productcustomerprice.class.php
index 9b0d29b4cdd..0683732d6cb 100644
--- a/htdocs/product/class/productcustomerprice.class.php
+++ b/htdocs/product/class/productcustomerprice.class.php
@@ -209,7 +209,7 @@ class Productcustomerprice extends CommonObject
 		$sql .= "fk_user,";
 		$sql .= "import_key";
 		$sql .= ") VALUES (";
-		$sql .= " ".$conf->entity.",";
+		$sql .= " ".((int) $conf->entity).",";
 		$sql .= " '".$this->db->idate(dol_now())."',";
 		$sql .= " ".(!isset($this->fk_product) ? 'NULL' : "'".$this->db->escape($this->fk_product)."'").",";
 		$sql .= " ".(!isset($this->fk_soc) ? 'NULL' : "'".$this->db->escape($this->fk_soc)."'").",";
@@ -226,7 +226,7 @@ class Productcustomerprice extends CommonObject
 		$sql .= " ".(!isset($this->localtax1_tx) ? 'NULL' : (empty($this->localtax1_tx) ? 0 : $this->localtax1_tx)).",";
 		$sql .= " ".(empty($this->localtax2_type) ? "'0'" : "'".$this->db->escape($this->localtax2_type)."'").",";
 		$sql .= " ".(!isset($this->localtax2_tx) ? 'NULL' : (empty($this->localtax2_tx) ? 0 : $this->localtax2_tx)).",";
-		$sql .= " ".$user->id.",";
+		$sql .= " ".((int) $user->id).",";
 		$sql .= " ".(!isset($this->import_key) ? 'NULL' : "'".$this->db->escape($this->import_key)."'")."";
 		$sql .= ")";
 
diff --git a/htdocs/product/class/propalmergepdfproduct.class.php b/htdocs/product/class/propalmergepdfproduct.class.php
index 0b5ea0cc2a6..67c24ac37c8 100644
--- a/htdocs/product/class/propalmergepdfproduct.class.php
+++ b/htdocs/product/class/propalmergepdfproduct.class.php
@@ -105,7 +105,6 @@ class Propalmergepdfproduct extends CommonObject
 
 		// Insert request
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."propal_merge_pdf_product(";
-
 		$sql .= "fk_product,";
 		$sql .= "file_name,";
 		if ($conf->global->MAIN_MULTILANGS) {
@@ -114,25 +113,19 @@ class Propalmergepdfproduct extends CommonObject
 		$sql .= "fk_user_author,";
 		$sql .= "fk_user_mod,";
 		$sql .= "datec";
-
-
 		$sql .= ") VALUES (";
-
-		$sql .= " ".(!isset($this->fk_product) ? 'NULL' : "'".$this->db->escape($this->fk_product)."'").",";
+		$sql .= " ".(!isset($this->fk_product) ? 'NULL' : ((int) $this->fk_product)).",";
 		$sql .= " ".(!isset($this->file_name) ? 'NULL' : "'".$this->db->escape($this->file_name)."'").",";
 		if ($conf->global->MAIN_MULTILANGS) {
 			$sql .= " ".(!isset($this->lang) ? 'NULL' : "'".$this->db->escape($this->lang)."'").",";
 		}
-		$sql .= " ".$user->id.",";
-		$sql .= " ".$user->id.",";
+		$sql .= " ".((int) $user->id).",";
+		$sql .= " ".((int) $user->id).",";
 		$sql .= " '".$this->db->idate(dol_now())."'";
-
-
 		$sql .= ")";
 
 		$this->db->begin();
 
-		dol_syslog(__METHOD__, LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
 			$error++; $this->errors[] = "Error ".$this->db->lasterror();
diff --git a/htdocs/product/dynamic_price/class/price_global_variable.class.php b/htdocs/product/dynamic_price/class/price_global_variable.class.php
index 0404f0bd97a..87cb8dea2c5 100644
--- a/htdocs/product/dynamic_price/class/price_global_variable.class.php
+++ b/htdocs/product/dynamic_price/class/price_global_variable.class.php
@@ -93,7 +93,7 @@ class PriceGlobalVariable
 		$sql .= ") VALUES (";
 		$sql .= " ".(isset($this->code) ? "'".$this->db->escape($this->code)."'" : "''").",";
 		$sql .= " ".(isset($this->description) ? "'".$this->db->escape($this->description)."'" : "''").",";
-		$sql .= " ".$this->value;
+		$sql .= " ".((float) $this->value);
 		$sql .= ")";
 
 		$this->db->begin();
diff --git a/htdocs/product/dynamic_price/class/price_global_variable_updater.class.php b/htdocs/product/dynamic_price/class/price_global_variable_updater.class.php
index 4272beb44bc..331a65971b6 100644
--- a/htdocs/product/dynamic_price/class/price_global_variable_updater.class.php
+++ b/htdocs/product/dynamic_price/class/price_global_variable_updater.class.php
@@ -103,12 +103,12 @@ class PriceGlobalVariableUpdater
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element." (";
 		$sql .= "type, description, parameters, fk_variable, update_interval, next_update, last_status";
 		$sql .= ") VALUES (";
-		$sql .= " ".$this->type.",";
+		$sql .= " ".((int) $this->type).",";
 		$sql .= " ".(isset($this->description) ? "'".$this->db->escape($this->description)."'" : "''").",";
 		$sql .= " ".(isset($this->parameters) ? "'".$this->db->escape($this->parameters)."'" : "''").",";
-		$sql .= " ".$this->fk_variable.",";
-		$sql .= " ".$this->update_interval.",";
-		$sql .= " ".$this->next_update.",";
+		$sql .= " ".((int) $this->fk_variable).",";
+		$sql .= " ".((int) $this->update_interval).",";
+		$sql .= " ".((int) $this->next_update).",";
 		$sql .= " ".(isset($this->last_status) ? "'".$this->db->escape($this->last_status)."'" : "''");
 		$sql .= ")";
 
diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php
index 5e609bbe301..f0c7d51c86b 100644
--- a/htdocs/product/stock/class/mouvementstock.class.php
+++ b/htdocs/product/stock/class/mouvementstock.class.php
@@ -432,14 +432,14 @@ class MouvementStock extends CommonObject
 			$sql .= " ".($batch ? "'".$this->db->escape($batch)."'" : "null").", ";
 			$sql .= " ".($eatby ? "'".$this->db->idate($eatby)."'" : "null").", ";
 			$sql .= " ".($sellby ? "'".$this->db->idate($sellby)."'" : "null").", ";
-			$sql .= " ".$this->entrepot_id.", ".$this->qty.", ".((int) $this->type).",";
-			$sql .= " ".$user->id.",";
+			$sql .= " ".((int) $this->entrepot_id).", ".((float) $this->qty).", ".((int) $this->type).",";
+			$sql .= " ".((int) $user->id).",";
 			$sql .= " '".$this->db->escape($label)."',";
 			$sql .= " ".($inventorycode ? "'".$this->db->escape($inventorycode)."'" : "null").",";
 			$sql .= " ".price2num($price).",";
-			$sql .= " ".$fk_origin.",";
+			$sql .= " ".((int) $fk_origin).",";
 			$sql .= " '".$this->db->escape($origintype)."',";
-			$sql .= " ".$fk_project;
+			$sql .= " ".((int) $fk_project);
 			$sql .= ")";
 
 			dol_syslog(get_class($this)."::_create insert record into stock_mouvement", LOG_DEBUG);
diff --git a/htdocs/salaries/class/paymentsalary.class.php b/htdocs/salaries/class/paymentsalary.class.php
index dcb50dac49a..e2b199780f0 100644
--- a/htdocs/salaries/class/paymentsalary.class.php
+++ b/htdocs/salaries/class/paymentsalary.class.php
@@ -168,8 +168,8 @@ class PaymentSalary extends CommonObject
 			$sql .= " fk_typepayment, num_payment, note, fk_user_author, fk_bank)";
 			$sql .= " VALUES ($this->chid, '".$this->db->idate($now)."',";
 			$sql .= " '".$this->db->idate($this->datepaye)."',";
-			$sql .= " ".$totalamount.",";
-			$sql .= " ".$this->paiementtype.", '".$this->db->escape($this->num_payment)."', '".$this->db->escape($this->note)."', ".$user->id.",";
+			$sql .= " ".price2num($totalamount).",";
+			$sql .= " ".((int) $this->paiementtype).", '".$this->db->escape($this->num_payment)."', '".$this->db->escape($this->note)."', ".((int) $user->id).",";
 			$sql .= " 0)";
 
 			$resql = $this->db->query($sql);
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index e885912e2a1..07da47dc2ce 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -2112,9 +2112,9 @@ class Societe extends CommonObject
 			// Writes trace in discount history
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_remise";
 			$sql .= " (entity, datec, fk_soc, remise_client, note, fk_user_author)";
-			$sql .= " VALUES (".$conf->entity.", '".$this->db->idate($now)."', ".$this->id.", '".$this->db->escape($remise)."',";
+			$sql .= " VALUES (".$conf->entity.", '".$this->db->idate($now)."', ".((int) $this->id).", '".$this->db->escape($remise)."',";
 			$sql .= " '".$this->db->escape($note)."',";
-			$sql .= " ".$user->id;
+			$sql .= " ".((int) $user->id);
 			$sql .= ")";
 
 			$resql = $this->db->query($sql);
@@ -2171,9 +2171,9 @@ class Societe extends CommonObject
 			// Writes trace in discount history
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_remise_supplier";
 			$sql .= " (entity, datec, fk_soc, remise_supplier, note, fk_user_author)";
-			$sql .= " VALUES (".$conf->entity.", '".$this->db->idate($now)."', ".$this->id.", '".$this->db->escape($remise)."',";
+			$sql .= " VALUES (".$conf->entity.", '".$this->db->idate($now)."', ".((int) $this->id).", '".$this->db->escape($remise)."',";
 			$sql .= " '".$this->db->escape($note)."',";
-			$sql .= " ".$user->id;
+			$sql .= " ".((int) $user->id);
 			$sql .= ")";
 
 			$resql = $this->db->query($sql);
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index f4e92ecab18..31f1b0b243a 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -1829,7 +1829,6 @@ class Ticket extends CommonObject
 	public function searchSocidByEmail($email, $type = '0', $filters = array(), $clause = 'AND')
 	{
 		$thirdparties = array();
-		$case = 0;
 		$exact = 0;
 
 		// Generation requete recherche
@@ -1843,7 +1842,7 @@ class Ticket extends CommonObject
 			}
 		}
 		if (!empty($email)) {
-			if (!$exact) {
+			if (empty($exact)) {
 				$regs = array();
 				if (preg_match('/^([\*])?[^*]+([\*])?$/', $email, $regs) && count($regs) > 1) {
 					$email = str_replace('*', '%', $email);
@@ -1856,15 +1855,11 @@ class Ticket extends CommonObject
 				$sql .= "(";
 			}
 
-			if (!$case) {
-				$sql .= "email LIKE '".$this->db->escape($email)."'";
-			} else {
-				$sql .= "email LIKE BINARY '".$this->db->escape($email)."'";
-			}
+			$sql .= "email LIKE '".$this->db->escape($email)."'";
 		}
 		if (is_array($filters) && !empty($filters)) {
 			foreach ($filters as $field => $value) {
-				$sql .= " ".$clause." ".$field." LIKE BINARY '".$this->db->escape($value)."'";
+				$sql .= " ".$clause." ".$field." LIKE '".$this->db->escape($value)."'";
 			}
 			if (!empty($email)) {
 				$sql .= ")";

From 03fbd68da46cacb3f0f2ff0bb53643521189144f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 14 Jun 2021 14:05:48 +0200
Subject: [PATCH 0618/1497] Update images.lib.php

---
 htdocs/core/lib/images.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/lib/images.lib.php b/htdocs/core/lib/images.lib.php
index bdc00ffb2ac..0ccb6a415fc 100644
--- a/htdocs/core/lib/images.lib.php
+++ b/htdocs/core/lib/images.lib.php
@@ -590,7 +590,7 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small',
 			break;
 	}
 
-	if (!is_resource($img) && !$img instanceof \GdImage) {
+	if (!is_resource($img) && !($img instanceof \GdImage)) {
 		dol_syslog('Failed to detect type of image. We found infoImg[2]='.$infoImg[2], LOG_WARNING);
 		return 0;
 	}

From 45e0f8a7eefb6316b2f7f6706ad237db4a4605da Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 14 Jun 2021 14:11:21 +0200
Subject: [PATCH 0619/1497] Update card.php

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

diff --git a/htdocs/delivery/card.php b/htdocs/delivery/card.php
index 4855c9c1e49..a845b7aff95 100644
--- a/htdocs/delivery/card.php
+++ b/htdocs/delivery/card.php
@@ -249,7 +249,9 @@ include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
  *	View
  */
 
-llxHeader('', $langs->trans('Delivery'), 'Livraison');
+$title = $langs->trans('Delivery');
+
+llxHeader('', $title, 'Livraison');
 
 $form = new Form($db);
 $formfile = new FormFile($db);

From f988f4c35214ae87bb89783c2bd755a0d31bff5c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 14 Jun 2021 14:15:32 +0200
Subject: [PATCH 0620/1497] Fix contact

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

diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index 3d545b40d63..7ca69871238 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -461,7 +461,7 @@ class Contact extends CommonObject
 		}
 		$sql .= "'".$this->db->escape($this->lastname)."',";
 		$sql .= "'".$this->db->escape($this->firstname)."',";
-		$sql .= " ".($user->id > 0 ? ((int) $user->id)."'" : "null").",";
+		$sql .= " ".($user->id > 0 ? ((int) $user->id) : "null").",";
 		$sql .= " ".((int) $this->priv).",";
 		$sql .= " 0,";
 		$sql .= " ".((int) $this->statut).",";

From 988dbd25b3bf823514286c455fe1fb20abb051a2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 14 Jun 2021 14:24:18 +0200
Subject: [PATCH 0621/1497] Fix sql syntax error

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

diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index f51e1ed85cf..76ea8555d85 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -275,7 +275,7 @@ class Holiday extends CommonObject
 		$sql .= "entity";
 		$sql .= ") VALUES (";
 		$sql .= "'(PROV)',";
-		$sql .= " ".((int) $this->fk_user)."',";
+		$sql .= " ".((int) $this->fk_user).",";
 		$sql .= " '".$this->db->idate($now)."',";
 		$sql .= " '".$this->db->escape($this->description)."',";
 		$sql .= " '".$this->db->idate($this->date_debut)."',";

From d2a19b530ff541f6c05b5f699fcadf1983388586 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 14 Jun 2021 14:24:21 +0200
Subject: [PATCH 0622/1497] Update card.php

---
 htdocs/don/card.php | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/htdocs/don/card.php b/htdocs/don/card.php
index 0763ff9b7e5..1b3c72906b4 100644
--- a/htdocs/don/card.php
+++ b/htdocs/don/card.php
@@ -64,6 +64,7 @@ $result = restrictedArea($user, 'don', $id);
 
 // fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);
+$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('doncard', 'globalcard'));
@@ -118,6 +119,8 @@ if ($action == 'confirm_reopen' && $confirm == 'yes' && $permissiontoadd) {
 	}
 }
 
+
+// Action update object
 if ($action == 'update') {
 	if (!empty($cancel)) {
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".urlencode($id));
@@ -170,6 +173,8 @@ if ($action == 'update') {
 	}
 }
 
+
+// Action add/create object
 if ($action == 'add') {
 	if (!empty($cancel)) {
 		header("Location: index.php");
@@ -228,6 +233,8 @@ if ($action == 'add') {
 		}
 	}
 }
+
+// Action delete object
 if ($action == 'confirm_delete' && GETPOST("confirm") == "yes" && $user->rights->don->supprimer) {
 	$object->fetch($id);
 	$result = $object->delete($user);
@@ -239,6 +246,8 @@ if ($action == 'confirm_delete' && GETPOST("confirm") == "yes" && $user->rights-
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
+
+// Action validation
 if ($action == 'valid_promesse') {
 	$object->fetch($id);
 	if ($object->valid_promesse($id, $user->id) >= 0) {
@@ -248,6 +257,8 @@ if ($action == 'valid_promesse') {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
+
+// Action cancel
 if ($action == 'set_cancel') {
 	$object->fetch($id);
 	if ($object->set_cancel($id) >= 0) {
@@ -256,6 +267,8 @@ if ($action == 'set_cancel') {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
+
+// Action set paid
 if ($action == 'set_paid') {
 	$object->fetch($id);
 	if ($object->setPaid($id, $modepayment) >= 0) {
@@ -268,6 +281,7 @@ if ($action == 'set_paid') {
 	$object->setProject($projectid);
 }
 
+
 // Actions to build doc
 include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 
@@ -329,9 +343,11 @@ if ($action == 'builddoc')
  * View
  */
 
+$title = $langs->trans("Donation");
+
 $help_url = 'EN:Module_Donations|FR:Module_Dons|ES:M&oacute;dulo_Donaciones|DE:Modul_Spenden';
 
-llxHeader('', $langs->trans("Donation"), $help_url);
+llxHeader('', $title, $help_url);
 
 $form = new Form($db);
 $formfile = new FormFile($db);

From dcca3011eed8bc4f15d191cb56f5839f1729196c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 14 Jun 2021 14:41:50 +0200
Subject: [PATCH 0623/1497] Clean code

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

diff --git a/htdocs/core/triggers/interface_90_modSociete_ContactRoles.class.php b/htdocs/core/triggers/interface_90_modSociete_ContactRoles.class.php
index b15113c9c08..2dcbe590692 100644
--- a/htdocs/core/triggers/interface_90_modSociete_ContactRoles.class.php
+++ b/htdocs/core/triggers/interface_90_modSociete_ContactRoles.class.php
@@ -84,7 +84,7 @@ class InterfaceContactRoles extends DolibarrTriggers
 				if (is_array($TContact) && ! empty($TContact)) {
 					$TContactAlreadyLinked = array();
 					if ($object->id > 0) {
-						$TContactAlreadyLinked = array_merge($object->liste_contact(- 1, 'external'), $object->liste_contact(- 1, 'internal'));
+						$TContactAlreadyLinked = array_merge($object->liste_contact(-1, 'external'), $object->liste_contact(-1, 'internal'));
 					}
 
 					foreach ($TContact as $i => $infos) {

From d04fe12ce9108040e80e04c52aba30a51dc31ab1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 14 Jun 2021 15:05:54 +0200
Subject: [PATCH 0624/1497] # WARNING: head commit changed in the meantime

Clean code
---
 .../install/mysql/tables/llx_oauth_token.sql  | 20 +++++++++----------
 htdocs/user/card.php                          |  2 +-
 htdocs/user/list.php                          |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/htdocs/install/mysql/tables/llx_oauth_token.sql b/htdocs/install/mysql/tables/llx_oauth_token.sql
index 06f2625c76e..7674f7f3455 100644
--- a/htdocs/install/mysql/tables/llx_oauth_token.sql
+++ b/htdocs/install/mysql/tables/llx_oauth_token.sql
@@ -16,15 +16,15 @@
 -- ============================================================================
 
 CREATE TABLE llx_oauth_token (
-    rowid integer AUTO_INCREMENT PRIMARY KEY,
-    service varchar(36),         -- 'Google', 'Stripe', 'auth-public-key', ...
-    token text,					 -- token in serialize() format, of an object StdOAuth2Token of library phpoauth2
-    tokenstring text,			 -- token in text or json format. Value depends on 'service. For example for an OAUTH service: '{"access_token": "sk_test_cccc", "refresh_token": "rt_aaa", "token_type": "bearer", ..., "scope": "read_write"}
-    fk_soc integer,
-    fk_user integer,             -- Id of user in llx_user
-    fk_adherent integer,
-    restricted_ips varchar(200), -- Restrict the authentication mode/token to some IPs
-    datec            datetime DEFAULT NULL,		-- date creation project
-    tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    rowid 			integer AUTO_INCREMENT PRIMARY KEY,
+    service 		varchar(36),         	-- What king of key or token: 'Google', 'Stripe', 'auth-public-key', ...
+    token 			text,				 	-- token in serialize() format, of an object StdOAuth2Token of library phpoauth2
+    tokenstring 	text,				 	-- token in text or json format. Value depends on 'service'. For example for an OAUTH service: '{"access_token": "sk_test_cccc", "refresh_token": "rt_aaa", "token_type": "bearer", ..., "scope": "read_write"}
+    fk_soc 			integer,				-- Id of thirdparty in llx_societe
+    fk_user 		integer,             	-- Id of user in llx_user
+    fk_adherent 	integer,				-- Id of member in llx_adherent
+    restricted_ips 	varchar(200), 			-- Restrict the authentication mode/token to some IPs
+    datec       	datetime DEFAULT NULL,	-- date creation project
+    tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     entity integer DEFAULT 1
 )ENGINE=innodb;
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index a78425bb596..fcd6baa2c05 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1392,7 +1392,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			if (!empty($object->ldap_sid) && $object->statut == 0) {
 				print '<td class="error">'.$langs->trans("LoginAccountDisableInDolibarr").'</td>';
 			} else {
-				print '<td>'.$object->login.'</td>';
+				print '<td>'.showValueWithClipboardCPButton($object->login).'</td>';
 			}
 			print '</tr>'."\n";
 
diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index 62372df637a..5c8185069c9 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -854,7 +854,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 	print '<tr class="oddeven">';
 
 	if (!empty($arrayfields['u.login']['checked'])) {
-		print '<td class="nowraponall">';
+		print '<td class="nowraponall tdoverflowmax150">';
 		print $li;
 		if (!empty($conf->multicompany->enabled) && $obj->admin && !$obj->entity) {
 			print img_picto($langs->trans("SuperAdministrator"), 'redstar', 'class="valignmiddle paddingleft"');

From e81023c35a01868b9447867d54d3fa0260416aee Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 14 Jun 2021 15:12:08 +0200
Subject: [PATCH 0625/1497] Update doc

---
 doc/index.html        | 2 --
 doc/install/README    | 2 +-
 doc/install/README-DE | 2 +-
 doc/install/README-FR | 8 +++-----
 doc/user/README       | 1 +
 doc/user/README-FR    | 5 +----
 6 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/doc/index.html b/doc/index.html
index 5c655136e3e..385c7a63c3a 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -17,8 +17,6 @@ on Internet on web following sites:<br>
 <br>
 * <a href="https://demo.dolibarr.org">Dolibarr demo (online)</a><br>
 <br>
-* <a href="https://www.nltechno.com/pages/dolibarrwinbin.php">DoliWamp, the Dolibarr for Windows</a><br>
-<br>
 * <a href="https://www.dolistore.com">DoliStore (official addons/plugins market place)</a><br>
 
 </body>
diff --git a/doc/install/README b/doc/install/README
index 0c7341b196c..0192ff27521 100644
--- a/doc/install/README
+++ b/doc/install/README
@@ -19,7 +19,7 @@ Download
 Install
 --------------------------------
 
-* For a Quick guide, take a look at README file into root directory.
+* For a Quick guide, take a look at README.md file into root directory.
 
 * More complete documentations are also available on line on the Dolibarr Wiki:
     https://wiki.dolibarr.org
diff --git a/doc/install/README-DE b/doc/install/README-DE
index c7ece3891f3..e616cd404fe 100644
--- a/doc/install/README-DE
+++ b/doc/install/README-DE
@@ -22,7 +22,7 @@ Download / Herunterladen
 Installation
 --------------------------------
 
-* Für eine kurze Einleitung, schau auf die README Datei im Hauptverzeichnis.
+* Für eine kurze Einleitung, schau auf die README.md Datei im Hauptverzeichnis.
 
 * Umfangreiche Dokumentationen sind im Dolibarr Wiki zu finden:
     https://wiki.dolibarr.org/index.php/Hauptseite 
diff --git a/doc/install/README-FR b/doc/install/README-FR
index 2cee29cf2df..211c76e1851 100644
--- a/doc/install/README-FR
+++ b/doc/install/README-FR
@@ -19,9 +19,7 @@ https://www.dolistore.org
 Documentation utilisateur
 --------------------------------
 
-* Pour une prise en main et installation rapide, consultez le fichier
-README-FR à la racine.
+* Pour une prise en main et installation rapide, consultez le fichier README-FR.md à la racine.
 
-* Une documentation utilisateur francophone plus consistante est disponible en
-ligne sur le wiki de Dolibarr à l'adresse:
-https://wiki.dolibarr.org
+* Une documentation utilisateur francophone plus consistante est disponible en ligne sur le wiki de Dolibarr à l'adresse:
+    https://wiki.dolibarr.org
diff --git a/doc/user/README b/doc/user/README
index 129dff11058..ecde765cde3 100644
--- a/doc/user/README
+++ b/doc/user/README
@@ -4,4 +4,5 @@ User guide
 --------------------------------
 
 * All Dolibarr guides are available, on line, on the Dolibarr Web site:
+
 https://www.dolibarr.org
diff --git a/doc/user/README-FR b/doc/user/README-FR
index fbf67fd89bc..f5cb72ea1c6 100644
--- a/doc/user/README-FR
+++ b/doc/user/README-FR
@@ -3,9 +3,6 @@ README (french)
 Documentation utilisateur
 --------------------------------
 
-* Pour une prise en main et installation rapide, consultez le fichier
-README-FR à la racine.
+La documentation utilisateur francophone est disponible en ligne sur le site Web de Dolibarr à l'adresse:
 
-* Une documentation utilisateur francophone plus consistante est disponible en
-ligne sur le site Web de Dolibarr à l'adresse:
 https://www.dolibarr.fr

From c8a41fab11b48b751f28a2c02719e311d90dbc5e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 14 Jun 2021 15:24:50 +0200
Subject: [PATCH 0626/1497] Doc

---
 doc/user/{README-DE.md => README-DE} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename doc/user/{README-DE.md => README-DE} (100%)

diff --git a/doc/user/README-DE.md b/doc/user/README-DE
similarity index 100%
rename from doc/user/README-DE.md
rename to doc/user/README-DE

From 55c9f37ffade081d9e98debac711bd3a1e47e01e Mon Sep 17 00:00:00 2001
From: Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
Date: Mon, 14 Jun 2021 13:37:02 +0000
Subject: [PATCH 0627/1497] Scrutinizer Auto-Fixes

This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
---
 .../accountancy/class/bookkeeping.class.php   |  10 +-
 htdocs/compta/cashcontrol/report.php          |  12 +-
 htdocs/compta/facture/class/facture.class.php |  22 +-
 htdocs/contact/card.php                       |  34 +--
 .../boxes/box_graph_new_vs_close_ticket.php   |   6 +-
 htdocs/core/lib/invoice.lib.php               |  16 +-
 .../fourn/class/fournisseur.facture.class.php |  22 +-
 htdocs/partnership/admin/setup.php            |   6 +-
 .../class/partnershiputils.class.php          |  98 ++++----
 htdocs/partnership/partnership_list.php       |  14 +-
 htdocs/product/card.php                       |  12 +-
 htdocs/product/stock/card.php                 |   8 +-
 htdocs/salaries/payments.php                  | 231 +++++++++++++-----
 htdocs/societe/partnership.php                |  32 ++-
 14 files changed, 325 insertions(+), 198 deletions(-)

diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 59d74783d04..6bd39f4e227 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -297,11 +297,11 @@ class BookKeeping extends CommonObject
 		$sql .= " AND fk_doc = ".((int) $this->fk_doc);
 		if (!empty($conf->global->ACCOUNTANCY_ENABLE_FKDOCDET)) {
 			// DO NOT USE THIS IN PRODUCTION. This will generate a lot of trouble into reports and will corrupt database (by generating duplicate entries.
-			$sql .= " AND fk_docdet = " . $this->fk_docdet;			// This field can be 0 if record is for several lines
+			$sql .= " AND fk_docdet = ".$this->fk_docdet; // This field can be 0 if record is for several lines
 		}
 		$sql .= " AND numero_compte = '".$this->db->escape($this->numero_compte)."'";
 		$sql .= " AND label_operation = '".$this->db->escape($this->label_operation)."'";
-		$sql .= " AND entity = ".$conf->entity;	// Do not use getEntity for accounting features
+		$sql .= " AND entity = ".$conf->entity; // Do not use getEntity for accounting features
 
 		$resql = $this->db->query($sql);
 
@@ -318,7 +318,7 @@ class BookKeeping extends CommonObject
 					$sqlnum .= " AND fk_docdet = ".((int) $this->fk_docdet);
 				}
 				$sqlnum .= " AND doc_ref = '".$this->db->escape($this->doc_ref)."'"; // ref of source object
-				$sqlnum .= " AND entity = ".$conf->entity;	// Do not use getEntity for accounting features
+				$sqlnum .= " AND entity = ".$conf->entity; // Do not use getEntity for accounting features
 
 				dol_syslog(get_class($this).":: create sqlnum=".$sqlnum, LOG_DEBUG);
 				$resqlnum = $this->db->query($sqlnum);
@@ -331,7 +331,7 @@ class BookKeeping extends CommonObject
 				if (empty($this->piece_num)) {
 					$sqlnum = "SELECT MAX(piece_num)+1 as maxpiecenum";
 					$sqlnum .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
-					$sqlnum .= " WHERE entity = ".$conf->entity;	// Do not use getEntity for accounting features
+					$sqlnum .= " WHERE entity = ".$conf->entity; // Do not use getEntity for accounting features
 
 					$resqlnum = $this->db->query($sqlnum);
 					if ($resqlnum) {
@@ -1067,7 +1067,7 @@ class BookKeeping extends CommonObject
 				$line->label_operation = $obj->label_operation;
 				$line->debit = $obj->debit;
 				$line->credit = $obj->credit;
-				$line->montant = $obj->amount;	// deprecated
+				$line->montant = $obj->amount; // deprecated
 				$line->amount = $obj->amount;
 				$line->sens = $obj->sens;
 				$line->lettering_code = $obj->lettering_code;
diff --git a/htdocs/compta/cashcontrol/report.php b/htdocs/compta/cashcontrol/report.php
index de597a608dc..6a23beab86b 100644
--- a/htdocs/compta/cashcontrol/report.php
+++ b/htdocs/compta/cashcontrol/report.php
@@ -126,7 +126,7 @@ $sql .= " WHERE pf.fk_facture = f.rowid AND p.rowid = pf.fk_paiement AND cp.id =
 $sql .= " AND f.module_source = '".$db->escape($posmodule)."'";
 $sql .= " AND f.pos_source = '".$db->escape($terminalid)."'";
 $sql .= " AND f.paye = 1";
-$sql .= " AND p.entity = ".$conf->entity;	// Never share entities for features related to accountancy
+$sql .= " AND p.entity = ".$conf->entity; // Never share entities for features related to accountancy
 /*if ($key == 'cash')       $sql.=" AND cp.code = 'LIQ'";
 elseif ($key == 'cheque') $sql.=" AND cp.code = 'CHQ'";
 elseif ($key == 'card')   $sql.=" AND cp.code = 'CB'";
@@ -222,7 +222,7 @@ if ($resql) {
 		$invoicetmp->fetch($objp->facid);
 
 		if (empty($cacheinvoiceid[$objp->facid])) {
-			$cacheinvoiceid[$objp->facid] = $objp->facid;	// First time this invoice is found into list of invoice x payments
+			$cacheinvoiceid[$objp->facid] = $objp->facid; // First time this invoice is found into list of invoice x payments
 			foreach ($invoicetmp->lines as $line) {
 				$totalqty += $line->qty;
 				$totalvat += $line->total_tva;
@@ -348,21 +348,21 @@ if ($resql) {
 	print '<div style="text-align: right">';
 	print '<h2>';
 
-	print $langs->trans("Cash").' '.($transactionspertype['CASH']?'('.$transactionspertype['CASH'].')':'').': <span class="amount">'.price($cash).'</span>';
+	print $langs->trans("Cash").' '.($transactionspertype['CASH'] ? '('.$transactionspertype['CASH'].')' : '').': <span class="amount">'.price($cash).'</span>';
 	if ($object->status == $object::STATUS_VALIDATED && $cash != $object->cash) {
 		print ' <> <span class="amountremaintopay">'.$langs->trans("Declared").': '.price($object->cash).'</span>';
 	}
 	print "<br>";
 
 	//print '<br>';
-	print $langs->trans("PaymentTypeCHQ").' '.($transactionspertype['CHQ']?'('.$transactionspertype['CHQ'].')':'').': <span class="amount">'.price($cheque).'</span>';
+	print $langs->trans("PaymentTypeCHQ").' '.($transactionspertype['CHQ'] ? '('.$transactionspertype['CHQ'].')' : '').': <span class="amount">'.price($cheque).'</span>';
 	if ($object->status == $object::STATUS_VALIDATED && $cheque != $object->cheque) {
 		print ' <> <span class="amountremaintopay">'.$langs->trans("Declared").': '.price($object->cheque).'</span>';
 	}
 	print "<br>";
 
 	//print '<br>';
-	print $langs->trans("PaymentTypeCB").' '.($transactionspertype['CB']?'('.$transactionspertype['CB'].')':'').': <span class="amount">'.price($bank).'</span>';
+	print $langs->trans("PaymentTypeCB").' '.($transactionspertype['CB'] ? '('.$transactionspertype['CB'].')' : '').': <span class="amount">'.price($bank).'</span>';
 	if ($object->status == $object::STATUS_VALIDATED && $bank != $object->card) {
 		print ' <> <span class="amountremaintopay">'.$langs->trans("Declared").': '.price($object->card).'</span>';
 	}
@@ -370,7 +370,7 @@ if ($resql) {
 
 	// print '<br>';
 	if ($other) {
-		print ''.$langs->trans("Other").' '.($transactionspertype['OTHER']?'('.$transactionspertype['OTHER'].')':'').': <span class="amount">'.price($other)."</span>";
+		print ''.$langs->trans("Other").' '.($transactionspertype['OTHER'] ? '('.$transactionspertype['OTHER'].')' : '').': <span class="amount">'.price($other)."</span>";
 		print '<br>';
 	}
 
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 1ee946e8a00..940cd146f7b 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -522,7 +522,7 @@ class Facture extends CommonInvoice
 			$this->fk_project        = GETPOST('projectid', 'int') > 0 ? ((int) GETPOST('projectid', 'int')) : $_facrec->fk_project;
 			$this->note_public       = GETPOST('note_public', 'none') ? GETPOST('note_public', 'restricthtml') : $_facrec->note_public;
 			$this->note_private      = GETPOST('note_private', 'none') ? GETPOST('note_private', 'restricthtml') : $_facrec->note_private;
-			$this->model_pdf          = GETPOST('model', 'alpha') ? GETPOST('model', 'alpha') : $_facrec->model_pdf;
+			$this->model_pdf = GETPOST('model', 'alpha') ? GETPOST('model', 'alpha') : $_facrec->model_pdf;
 			$this->cond_reglement_id = GETPOST('cond_reglement_id', 'int') > 0 ? ((int) GETPOST('cond_reglement_id', 'int')) : $_facrec->cond_reglement_id;
 			$this->mode_reglement_id = GETPOST('mode_reglement_id', 'int') > 0 ? ((int) GETPOST('mode_reglement_id', 'int')) : $_facrec->mode_reglement_id;
 			$this->fk_account        = GETPOST('fk_account') > 0 ? ((int) GETPOST('fk_account')) : $_facrec->fk_account;
@@ -1180,8 +1180,8 @@ class Facture extends CommonInvoice
 
 		// Clear fields
 		$object->date               = (empty($this->date) ? dol_now() : $this->date);
-		$object->user_author        = $user->id;	// deprecated
-		$object->user_valid         = null;			// deprecated
+		$object->user_author        = $user->id; // deprecated
+		$object->user_valid         = null; // deprecated
 		$object->fk_user_author     = $user->id;
 		$object->fk_user_valid      = null;
 		$object->fk_facture_source  = 0;
@@ -1227,7 +1227,7 @@ class Facture extends CommonInvoice
 				}
 			}
 
-			$object->lines[$i]->ref_ext = '';	// Do not clone ref_ext
+			$object->lines[$i]->ref_ext = ''; // Do not clone ref_ext
 		}
 
 		// Create clone
@@ -1672,9 +1672,9 @@ class Facture extends CommonInvoice
 				$this->note = $obj->note_private; // deprecated
 				$this->note_private = $obj->note_private;
 				$this->note_public			= $obj->note_public;
-				$this->user_author			= $obj->fk_user_author;	// deprecated
-				$this->user_valid           = $obj->fk_user_valid;	// deprecated
-				$this->fk_user_author		= $obj->fk_user_author;
+				$this->user_author			= $obj->fk_user_author; // deprecated
+				$this->user_valid           = $obj->fk_user_valid; // deprecated
+				$this->fk_user_author = $obj->fk_user_author;
 				$this->fk_user_valid        = $obj->fk_user_valid;
 				$this->model_pdf = $obj->model_pdf;
 				$this->modelpdf = $obj->model_pdf; // deprecated
@@ -3430,7 +3430,7 @@ class Facture extends CommonInvoice
 			$qty			= price2num($qty);
 			$pu 			= price2num($pu);
 			$pu_ht_devise = price2num($pu_ht_devise);
-			$pa_ht			= price2num($pa_ht);
+			$pa_ht = price2num($pa_ht);
 			if (!preg_match('/\((.*)\)/', $txtva)) {
 				$txtva = price2num($txtva); // $txtva can have format '5.0(XXX)' or '5'
 			}
@@ -4158,7 +4158,7 @@ class Facture extends CommonInvoice
 		if (!empty($conf->global->INVOICE_USE_SITUATION_CREDIT_NOTE)) {
 			// Keep invoices that are not situation invoices or that are the last in serie if it is a situation invoice
 			$sql .= " AND (f.type <> ".self::TYPE_SITUATION." OR f.rowid IN ";
-			$sql .= '(SELECT MAX(fs.rowid)';	// This select returns several ID becasue of the group by later
+			$sql .= '(SELECT MAX(fs.rowid)'; // This select returns several ID becasue of the group by later
 			$sql .= " FROM ".MAIN_DB_PREFIX."facture as fs";
 			$sql .= " WHERE fs.entity IN (".getEntity('invoice').")";
 			$sql .= " AND fs.type = ".self::TYPE_SITUATION;
@@ -4166,7 +4166,7 @@ class Facture extends CommonInvoice
 			if ($socid > 0) {
 				$sql .= " AND fs.fk_soc = ".((int) $socid);
 			}
-			$sql .= " GROUP BY fs.situation_cycle_ref)";		// For each situation_cycle_ref, we take the higher rowid
+			$sql .= " GROUP BY fs.situation_cycle_ref)"; // For each situation_cycle_ref, we take the higher rowid
 			$sql .= ")";
 		} else {
 			$sql .= " AND f.type <> ".self::TYPE_SITUATION; // Keep invoices that are not situation invoices
@@ -5594,7 +5594,7 @@ class FactureLigne extends CommonInvoiceLine
 			$sql .= ", total_localtax2=".price2num($this->total_localtax2);
 		}
 		$sql .= ", fk_product_fournisseur_price=".(!empty($this->fk_fournprice) ? "'".$this->db->escape($this->fk_fournprice)."'" : "null");
-		$sql .= ", buy_price_ht=".(($this->pa_ht || $this->pa_ht === 0 || $this->pa_ht === '0') ? price2num($this->pa_ht) : "null");	// $this->pa_ht should always be defined (set to 0 or to sell price depending on option)
+		$sql .= ", buy_price_ht=".(($this->pa_ht || $this->pa_ht === 0 || $this->pa_ht === '0') ? price2num($this->pa_ht) : "null"); // $this->pa_ht should always be defined (set to 0 or to sell price depending on option)
 		$sql .= ", fk_parent_line=".($this->fk_parent_line > 0 ? $this->fk_parent_line : "null");
 		if (!empty($this->rang)) {
 			$sql .= ", rang=".((int) $this->rang);
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index d185815b51a..dea4f9d185d 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -225,7 +225,7 @@ if (empty($reshook)) {
 			$action = 'create';
 		}
 
-		if (!empty($conf->mailing->enabled) && $conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS==-1 && $object->no_email==-1 && !empty($object->email)) {
+		if (!empty($conf->mailing->enabled) && $conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS == -1 && $object->no_email == -1 && !empty($object->email)) {
 			$error++;
 			$errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentities("No_Email"));
 			$action = 'create';
@@ -256,7 +256,7 @@ if (empty($reshook)) {
 		if (empty($error)) {
 			// Categories association
 			$contcats = GETPOST('contcats', 'array');
-			if (count($contcats)>0) {
+			if (count($contcats) > 0) {
 				$result = $object->setCategories($contcats);
 				if ($result <= 0) {
 					$error++;
@@ -268,8 +268,8 @@ if (empty($reshook)) {
 
 		if (empty($error) && !empty($conf->mailing->enabled) && !empty($object->email)) {
 			// Add mass emailing flag into table mailing_unsubscribe
-			$result=$object->setNoEmail($object->no_email);
-			if ($result<0) {
+			$result = $object->setNoEmail($object->no_email);
+			if ($result < 0) {
 				$error++;
 				$errors = array_merge($errors, ($object->error ? array($object->error) : $object->errors));
 				$action = 'create';
@@ -297,7 +297,7 @@ if (empty($reshook)) {
 		$object->old_lastname = (string) GETPOST("old_lastname", 'alpha');
 		$object->old_firstname = (string) GETPOST("old_firstname", 'alpha');
 
-		$result = $object->delete();	// TODO Add $user as first param
+		$result = $object->delete(); // TODO Add $user as first param
 		if ($result > 0) {
 			if ($backtopage) {
 				header("Location: ".$backtopage);
@@ -317,7 +317,7 @@ if (empty($reshook)) {
 			$action = 'edit';
 		}
 
-		if (!empty($conf->mailing->enabled) && $conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS==-1 && GETPOST("no_email", "int")==-1 && !empty(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL))) {
+		if (!empty($conf->mailing->enabled) && $conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS == -1 && GETPOST("no_email", "int") == -1 && !empty(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL))) {
 			$error++;
 			$errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentities("No_Email"));
 			$action = 'edit';
@@ -417,7 +417,7 @@ if (empty($reshook)) {
 			$object->note_public = (string) GETPOST("note_public", 'restricthtml');
 			$object->note_private = (string) GETPOST("note_private", 'restricthtml');
 
-			$object->roles = GETPOST("roles", 'array');		// Note GETPOSTISSET("role") is null when combo is empty
+			$object->roles = GETPOST("roles", 'array'); // Note GETPOSTISSET("role") is null when combo is empty
 
 			// Fill array 'array_options' with data from add form
 			$ret = $extrafields->setOptionalsFromPost(null, $object);
@@ -436,8 +436,8 @@ if (empty($reshook)) {
 					// Update mass emailing flag into table mailing_unsubscribe
 					if (GETPOSTISSET('no_email') && $object->email) {
 						$no_email = GETPOST('no_email', 'int');
-						$result=$object->setNoEmail($no_email);
-						if ($result<0) {
+						$result = $object->setNoEmail($no_email);
+						if ($result < 0) {
 							setEventMessages($object->error, $object->errors, 'errors');
 							$action = 'edit';
 						}
@@ -779,7 +779,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 			// Unsubscribe
 			if (!empty($conf->mailing->enabled)) {
-				if ($conf->use_javascript_ajax && $conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS==-1) {
+				if ($conf->use_javascript_ajax && $conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS == -1) {
 					print "\n".'<script type="text/javascript" language="javascript">'."\n";
 					print '$(document).ready(function () {
 							$("#email").keyup(function() {
@@ -793,14 +793,14 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 					print '</script>'."\n";
 				}
 				if (!GETPOSTISSET("no_email") && !empty($object->email)) {
-					$result=$object->getNoEmail();
-					if ($result<0) {
+					$result = $object->getNoEmail();
+					if ($result < 0) {
 						setEventMessages($object->error, $object->errors, 'errors');
 					}
 				}
 				print '<tr>';
 				print '<td class="noemail"><label for="no_email">'.$langs->trans("No_Email").'</label></td>';
-				print '<td>'.$form->selectyesno('no_email', (GETPOSTISSET("no_email") ? GETPOST("no_email", 'int') : $conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS), 1, false, ($conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS==-1)).'</td>';
+				print '<td>'.$form->selectyesno('no_email', (GETPOSTISSET("no_email") ? GETPOST("no_email", 'int') : $conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS), 1, false, ($conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS == -1)).'</td>';
 				print '</tr>';
 			}
 
@@ -1078,8 +1078,8 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 					print '</script>'."\n";
 				}
 				if (!GETPOSTISSET("no_email") && !empty($object->email)) {
-					$result=$object->getNoEmail();
-					if ($result<0) {
+					$result = $object->getNoEmail();
+					if ($result < 0) {
 						setEventMessages($object->error, $object->errors, 'errors');
 					}
 				}
@@ -1313,8 +1313,8 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 		// Unsubscribe opt-out
 		if (!empty($conf->mailing->enabled)) {
-			$result=$object->getNoEmail();
-			if ($result<0) {
+			$result = $object->getNoEmail();
+			if ($result < 0) {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 			print '<tr><td>'.$langs->trans("No_Email").'</td><td>'.yn($object->no_email).'</td></tr>';
diff --git a/htdocs/core/boxes/box_graph_new_vs_close_ticket.php b/htdocs/core/boxes/box_graph_new_vs_close_ticket.php
index 5b17c335f3f..f2e2170a1b8 100644
--- a/htdocs/core/boxes/box_graph_new_vs_close_ticket.php
+++ b/htdocs/core/boxes/box_graph_new_vs_close_ticket.php
@@ -89,7 +89,7 @@ class box_graph_new_vs_close_ticket extends ModeleBoxes
 			$data = array();
 			$totalnb = 0;
 			$sql = "SELECT COUNT(t.datec) as nb";
-			$sql .= " FROM " . MAIN_DB_PREFIX . "ticket as t";
+			$sql .= " FROM ".MAIN_DB_PREFIX."ticket as t";
 			$sql .= " WHERE CAST(t.datec AS DATE) = CURRENT_DATE";
 			$sql .= " AND t.fk_statut <> 8";
 			$sql .= " GROUP BY CAST(t.datec AS DATE)";
@@ -107,7 +107,7 @@ class box_graph_new_vs_close_ticket extends ModeleBoxes
 				dol_print_error($this->db);
 			}
 			$sql = "SELECT COUNT(t.date_close) as nb";
-			$sql .= " FROM " . MAIN_DB_PREFIX . "ticket as t";
+			$sql .= " FROM ".MAIN_DB_PREFIX."ticket as t";
 			$sql .= " WHERE CAST(t.date_close AS DATE) = CURRENT_DATE";
 			$sql .= " AND t.fk_statut = 8";
 			$sql .= " GROUP BY CAST(t.date_close AS DATE)";
@@ -148,7 +148,7 @@ class box_graph_new_vs_close_ticket extends ModeleBoxes
 					$stringtoprint .= $px1->show($totalnb ? 0 : 1);
 				}
 				$stringtoprint .= '</div>';
-				$this->info_box_contents[][]=array(
+				$this->info_box_contents[][] = array(
 					'td' => 'class="center"',
 					'text' => $stringtoprint
 				);
diff --git a/htdocs/core/lib/invoice.lib.php b/htdocs/core/lib/invoice.lib.php
index c328d659b93..3838829f8cd 100644
--- a/htdocs/core/lib/invoice.lib.php
+++ b/htdocs/core/lib/invoice.lib.php
@@ -508,16 +508,16 @@ function getNumberInvoicesPieChart($mode)
 
 			while ($i < $num) {
 				$obj = $db->fetch_object($resql);
-				$dataseries = array(array($langs->trans('InvoiceLate30Days'),$obj->nblate30)
-									,array($langs->trans('InvoiceLate15Days'),$obj->nblate15-$obj->nblate30)
-									,array($langs->trans('InvoiceLateMinus15Days'),$obj->nblatenow-$obj->nblate15)
-									,array($langs->trans('InvoiceNotLate'),$obj->nbnotlatenow-$obj->nbnotlate15)
-									,array($langs->trans('InvoiceNotLate15Days'),$obj->nbnotlate15-$obj->nbnotlate30)
-									,array($langs->trans('InvoiceNotLate30Days'),$obj->nbnotlate30));
+				$dataseries = array(array($langs->trans('InvoiceLate30Days'), $obj->nblate30)
+									,array($langs->trans('InvoiceLate15Days'), $obj->nblate15 - $obj->nblate30)
+									,array($langs->trans('InvoiceLateMinus15Days'), $obj->nblatenow - $obj->nblate15)
+									,array($langs->trans('InvoiceNotLate'), $obj->nbnotlatenow - $obj->nbnotlate15)
+									,array($langs->trans('InvoiceNotLate15Days'), $obj->nbnotlate15 - $obj->nbnotlate30)
+									,array($langs->trans('InvoiceNotLate30Days'), $obj->nbnotlate30));
 				$i++;
 			}
 			foreach ($dataseries as $key=>$value) {
-				$total+=$value[1];
+				$total += $value[1];
 			}
 
 			$colorseries = array($badgeStatus8, $badgeStatus1, $badgeStatus3, $badgeStatus4, $badgeStatus11, '-'.$badgeStatus11);
@@ -615,7 +615,7 @@ function getCustomerInvoiceDraftTable($maxCount = 500, $socid = 0)
 	$sql .= " s.nom, s.rowid, s.email, s.code_client, s.code_compta, s.code_fournisseur, s.code_compta_fournisseur,";
 	$sql .= " cc.rowid, cc.code";
 	if (!$user->rights->societe->client->voir && !$socid) {
-		$sql.= ", sc.fk_soc, sc.fk_user";
+		$sql .= ", sc.fk_soc, sc.fk_user";
 	}
 
 	// Add Group from hooks
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index f5840712807..0c825672f65 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -714,7 +714,7 @@ class FactureFournisseur extends CommonInvoice
 				$this->remise				= $obj->remise;
 				$this->close_code			= $obj->close_code;
 				$this->close_note			= $obj->close_note;
-				$this->tva					= $obj->tva;
+				$this->tva = $obj->tva;
 				$this->total_localtax1		= $obj->localtax1;
 				$this->total_localtax2		= $obj->localtax2;
 				$this->total_ht				= $obj->total_ht;
@@ -729,7 +729,7 @@ class FactureFournisseur extends CommonInvoice
 				$this->fk_project = $obj->fk_project;
 				$this->cond_reglement_id	= $obj->fk_cond_reglement;
 				$this->cond_reglement_code = $obj->cond_reglement_code;
-				$this->cond_reglement = $obj->cond_reglement_label;			// deprecated
+				$this->cond_reglement = $obj->cond_reglement_label; // deprecated
 				$this->cond_reglement_label = $obj->cond_reglement_label;
 				$this->cond_reglement_doc = $obj->cond_reglement_doc;
 				$this->fk_account = $obj->fk_account;
@@ -3234,8 +3234,8 @@ class SupplierInvoiceLine extends CommonObjectLine
 		$this->ref_supplier		= $obj->ref_supplier;
 		$this->product_desc		= $obj->product_desc;
 
-		$this->subprice 		= $obj->pu_ht;
-		$this->pu_ht			= $obj->pu_ht;
+		$this->subprice = $obj->pu_ht;
+		$this->pu_ht = $obj->pu_ht;
 		$this->pu_ttc			= $obj->pu_ttc;
 		$this->tva_tx			= $obj->tva_tx;
 		$this->localtax1_tx		= $obj->localtax1_tx;
@@ -3245,7 +3245,7 @@ class SupplierInvoiceLine extends CommonObjectLine
 
 		$this->qty				= $obj->qty;
 		$this->remise_percent = $obj->remise_percent;
-		$this->fk_remise_except	= $obj->fk_remise_except;
+		$this->fk_remise_except = $obj->fk_remise_except;
 		$this->tva				= $obj->total_tva; // deprecated
 		$this->total_ht = $obj->total_ht;
 		$this->total_tva			= $obj->total_tva;
@@ -3401,8 +3401,8 @@ class SupplierInvoiceLine extends CommonObjectLine
 		$sql .= ", pu_ttc = ".price2num($this->pu_ttc);
 		$sql .= ", qty = ".price2num($this->qty);
 		$sql .= ", remise_percent = ".price2num($this->remise_percent);
-		if ($this->fk_remise_except) $sql.= ", fk_remise_except=".((int) $this->fk_remise_except);
-		else $sql.= ", fk_remise_except=null";
+		if ($this->fk_remise_except) $sql .= ", fk_remise_except=".((int) $this->fk_remise_except);
+		else $sql .= ", fk_remise_except=null";
 		$sql .= ", vat_src_code = '".$this->db->escape(empty($this->vat_src_code) ? '' : $this->vat_src_code)."'";
 		$sql .= ", tva_tx = ".price2num($this->tva_tx);
 		$sql .= ", localtax1_tx = ".price2num($this->localtax1_tx);
@@ -3633,7 +3633,7 @@ class SupplierInvoiceLine extends CommonObjectLine
 						if ($discount->fk_facture_line > 0) {
 							if (empty($noerrorifdiscountalreadylinked)) {
 								$this->error = $langs->trans("ErrorDiscountAlreadyUsed", $discount->id);
-								dol_syslog(get_class($this) . "::insert Error " . $this->error, LOG_ERR);
+								dol_syslog(get_class($this)."::insert Error ".$this->error, LOG_ERR);
 								$this->db->rollback();
 								return -3;
 							}
@@ -3641,20 +3641,20 @@ class SupplierInvoiceLine extends CommonObjectLine
 							$result = $discount->link_to_invoice($this->rowid, 0);
 							if ($result < 0) {
 								$this->error = $discount->error;
-								dol_syslog(get_class($this) . "::insert Error " . $this->error, LOG_ERR);
+								dol_syslog(get_class($this)."::insert Error ".$this->error, LOG_ERR);
 								$this->db->rollback();
 								return -3;
 							}
 						}
 					} else {
 						$this->error = $langs->trans("ErrorADiscountThatHasBeenRemovedIsIncluded");
-						dol_syslog(get_class($this) . "::insert Error " . $this->error, LOG_ERR);
+						dol_syslog(get_class($this)."::insert Error ".$this->error, LOG_ERR);
 						$this->db->rollback();
 						return -3;
 					}
 				} else {
 					$this->error = $discount->error;
-					dol_syslog(get_class($this) . "::insert Error " . $this->error, LOG_ERR);
+					dol_syslog(get_class($this)."::insert Error ".$this->error, LOG_ERR);
 					$this->db->rollback();
 					return -3;
 				}
diff --git a/htdocs/partnership/admin/setup.php b/htdocs/partnership/admin/setup.php
index 4005be154a1..25567b137db 100644
--- a/htdocs/partnership/admin/setup.php
+++ b/htdocs/partnership/admin/setup.php
@@ -134,8 +134,8 @@ print '</tr>';
 if (!empty($conf->global->PARTNERSHIP_IS_MANAGED_FOR) && $conf->global->PARTNERSHIP_IS_MANAGED_FOR == 'member') {
 	print '<tr class="oddeven"><td>'.$langs->trans("PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL").'</td>';
 	print '<td>';
-	$dnbdays 	= '15';
-	$backlinks 	= (!empty($conf->global->PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL)) ? $conf->global->PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL : $dnbdays;
+	$dnbdays = '15';
+	$backlinks = (!empty($conf->global->PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL)) ? $conf->global->PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL : $dnbdays;
 	print '<input class="maxwidth50" type="text" name="PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL" value="'.$backlinks.'">';
 	print '</td>';
 	print '<td><span class="opacitymedium">'.$dnbdays.'</span></td>';
@@ -164,7 +164,7 @@ print '</tr>';
 
 print '<tr class="oddeven"><td>'.$langs->trans("PARTNERSHIP_BACKLINKS_TO_CHECK").'</td>';
 print '<td>';
-$backlinks 	= (empty($conf->global->PARTNERSHIP_BACKLINKS_TO_CHECK) ? '' : $conf->global->PARTNERSHIP_BACKLINKS_TO_CHECK);
+$backlinks = (empty($conf->global->PARTNERSHIP_BACKLINKS_TO_CHECK) ? '' : $conf->global->PARTNERSHIP_BACKLINKS_TO_CHECK);
 print '<input class="minwidth400" type="text" name="PARTNERSHIP_BACKLINKS_TO_CHECK" value="'.$backlinks.'">';
 print '</td>';
 print '<td><span class="opacitymedium">dolibarr.org|dolibarr.fr|dolibarr.es</span></td>';
diff --git a/htdocs/partnership/class/partnershiputils.class.php b/htdocs/partnership/class/partnershiputils.class.php
index 7cf01c2957c..0588b9e5df2 100644
--- a/htdocs/partnership/class/partnershiputils.class.php
+++ b/htdocs/partnership/class/partnershiputils.class.php
@@ -37,9 +37,9 @@ require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
  */
 class PartnershipUtils
 {
-	public $db;							//!< To store db handler
-	public $error;						//!< To return error code (or message)
-	public $errors=array();				//!< To return several error codes (or messages)
+	public $db; //!< To store db handler
+	public $error; //!< To return error code (or message)
+	public $errors = array(); //!< To return several error codes (or messages)
 
 
 	/**
@@ -71,19 +71,19 @@ class PartnershipUtils
 		}
 
 		$partnership = new Partnership($this->db);
-		$MAXPERCALL = (empty($conf->global->PARTNERSHIP_MAX_EXPIRATION_CANCEL_PER_CALL) ? 25 : $conf->global->PARTNERSHIP_MAX_EXPIRATION_CANCEL_PER_CALL);       // Limit to 25 per call
+		$MAXPERCALL = (empty($conf->global->PARTNERSHIP_MAX_EXPIRATION_CANCEL_PER_CALL) ? 25 : $conf->global->PARTNERSHIP_MAX_EXPIRATION_CANCEL_PER_CALL); // Limit to 25 per call
 
 		$langs->loadLangs(array("partnership", "member"));
 
-		$error 			= 0;
-		$erroremail 	= '';
-		$this->output 	= '';
-		$this->error 	= '';
+		$error = 0;
+		$erroremail = '';
+		$this->output = '';
+		$this->error = '';
 		$partnershipsprocessed = array();
 
-		$gracedelay=$conf->global->PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL;
+		$gracedelay = $conf->global->PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL;
 		if ($gracedelay < 1) {
-			$this->error='BadValueForDelayBeforeCancelCheckSetup';
+			$this->error = 'BadValueForDelayBeforeCancelCheckSetup';
 			return -1;
 		}
 
@@ -116,7 +116,7 @@ class PartnershipUtils
 
 				$obj = $this->db->fetch_object($resql);
 				if ($obj) {
-					if (! empty($partnershipsprocessed[$obj->rowid])) continue;
+					if (!empty($partnershipsprocessed[$obj->rowid])) continue;
 
 					if ($somethingdoneonpartnership >= $MAXPERCALL) {
 						dol_syslog("We reach the limit of ".$MAXPERCALL." partnership processed, so we quit loop for this batch doCancelStatusOfMemberPartnership to avoid to reach email quota.", LOG_WARNING);
@@ -142,7 +142,7 @@ class PartnershipUtils
 								else $this->errors = $object->errors;
 							}
 						} else {
-							$partnershipsprocessed[$object->id]=$object->ref;
+							$partnershipsprocessed[$object->id] = $object->ref;
 
 							// Send an email to inform member
 							$labeltemplate = '(SendingEmailOnPartnershipCanceled)';
@@ -152,21 +152,21 @@ class PartnershipUtils
 							// Send deployment email
 							include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 							include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-							$formmail=new FormMail($this->db);
+							$formmail = new FormMail($this->db);
 
 							// Define output language
 							$outputlangs = $langs;
 							$newlang = '';
 							if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
-							if (! empty($newlang)) {
+							if (!empty($newlang)) {
 								$outputlangs = new Translate("", $conf);
 								$outputlangs->setDefaultLang($newlang);
-								$outputlangs->loadLangs(array('main','member','partnership'));
+								$outputlangs->loadLangs(array('main', 'member', 'partnership'));
 							}
 
-							$arraydefaultmessage=$formmail->getEMailTemplate($this->db, 'partnership_send', $user, $outputlangs, 0, 1, $labeltemplate);
+							$arraydefaultmessage = $formmail->getEMailTemplate($this->db, 'partnership_send', $user, $outputlangs, 0, 1, $labeltemplate);
 
-							$substitutionarray=getCommonSubstitutionArray($outputlangs, 0, null, $object);
+							$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
 							complete_substitutions_array($substitutionarray, $outputlangs, $object);
 
 							$subject = make_substitutions($arraydefaultmessage->topic, $substitutionarray, $outputlangs);
@@ -179,7 +179,7 @@ class PartnershipUtils
 
 							$cmail = new CMailFile($subject, $to, $from, $msg, array(), array(), array(), '', '', 0, 1);
 							$result = $cmail->sendfile();
-							if (! $result || $cmail->error) {
+							if (!$result || $cmail->error) {
 								$erroremail .= ($erroremail ? ', ' : '').$cmail->error;
 								$this->errors[] = $cmail->error;
 								if (is_array($cmail->errors) && count($cmail->errors) > 0) $this->errors += $cmail->errors;
@@ -193,18 +193,18 @@ class PartnershipUtils
 			$this->error = $this->db->lasterror();
 		}
 
-		if (! $error) {
+		if (!$error) {
 			$this->db->commit();
 			$this->output = $numofexpiredmembers.' expired partnership members found'."\n";
-			if ($erroremail) $this->output.='. Got errors when sending some email : '.$erroremail;
+			if ($erroremail) $this->output .= '. Got errors when sending some email : '.$erroremail;
 		} else {
 			$this->db->rollback();
 			$this->output = "Rollback after error\n";
-			$this->output.= $numofexpiredmembers.' expired partnership members found'."\n";
-			if ($erroremail) $this->output.='. Got errors when sending some email : '.$erroremail;
+			$this->output .= $numofexpiredmembers.' expired partnership members found'."\n";
+			if ($erroremail) $this->output .= '. Got errors when sending some email : '.$erroremail;
 		}
 
-		return ($error ? 1: 0);
+		return ($error ? 1 : 0);
 	}
 
 
@@ -222,19 +222,19 @@ class PartnershipUtils
 		$managedfor = $conf->global->PARTNERSHIP_IS_MANAGED_FOR;
 
 		$partnership = new Partnership($this->db);
-		$MAXPERCALL = (empty($conf->global->PARTNERSHIP_MAX_WARNING_BACKLINK_PER_CALL) ? 10 : $conf->global->PARTNERSHIP_MAX_WARNING_BACKLINK_PER_CALL);       // Limit to 10 per call
+		$MAXPERCALL = (empty($conf->global->PARTNERSHIP_MAX_WARNING_BACKLINK_PER_CALL) ? 10 : $conf->global->PARTNERSHIP_MAX_WARNING_BACKLINK_PER_CALL); // Limit to 10 per call
 
 		$langs->loadLangs(array("partnership", "member"));
 
-		$error 			= 0;
-		$erroremail 	= '';
-		$this->output 	= '';
-		$this->error 	= '';
+		$error = 0;
+		$erroremail = '';
+		$this->output = '';
+		$this->error = '';
 		$partnershipsprocessed = array();
 
-		$gracedelay=$conf->global->PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL;
+		$gracedelay = $conf->global->PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL;
 		if ($gracedelay < 1) {
-			$this->error='BadValueForDelayBeforeCancelCheckSetup';
+			$this->error = 'BadValueForDelayBeforeCancelCheckSetup';
 			return -1;
 		}
 
@@ -269,16 +269,16 @@ class PartnershipUtils
 
 		$resql = $this->db->query($sql);
 		if ($resql) {
-			$numofexpiredmembers 		= $this->db->num_rows($resql);
+			$numofexpiredmembers = $this->db->num_rows($resql);
 			$somethingdoneonpartnership = 0;
-			$ifetchpartner 				= 0;
+			$ifetchpartner = 0;
 			$websitenotfound = '';
 			while ($ifetchpartner < $numofexpiredmembers) {
 				$ifetchpartner++;
 
 				$obj = $this->db->fetch_object($resql);
 				if ($obj) {
-					if (! empty($partnershipsprocessed[$obj->rowid])) continue;
+					if (!empty($partnershipsprocessed[$obj->rowid])) continue;
 
 					if ($somethingdoneonpartnership >= $MAXPERCALL) {
 						dol_syslog("We reach the limit of ".$MAXPERCALL." partnership processed, so we quit loop for this batch doWarningOfPartnershipIfDolibarrBacklinkNotfound to avoid to reach email quota.", LOG_WARNING);
@@ -318,21 +318,21 @@ class PartnershipUtils
 								// Send deployment email
 								include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 								include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-								$formmail=new FormMail($this->db);
+								$formmail = new FormMail($this->db);
 
 								// Define output language
 								$outputlangs = $langs;
 								$newlang = '';
 								if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
-								if (! empty($newlang)) {
+								if (!empty($newlang)) {
 									$outputlangs = new Translate("", $conf);
 									$outputlangs->setDefaultLang($newlang);
-									$outputlangs->loadLangs(array('main','member','partnership'));
+									$outputlangs->loadLangs(array('main', 'member', 'partnership'));
 								}
 
-								$arraydefaultmessage=$formmail->getEMailTemplate($this->db, 'partnership_send', $user, $outputlangs, 0, 1, $labeltemplate);
+								$arraydefaultmessage = $formmail->getEMailTemplate($this->db, 'partnership_send', $user, $outputlangs, 0, 1, $labeltemplate);
 
-								$substitutionarray=getCommonSubstitutionArray($outputlangs, 0, null, $object);
+								$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
 								complete_substitutions_array($substitutionarray, $outputlangs, $object);
 
 								$subject = make_substitutions($arraydefaultmessage->topic, $substitutionarray, $outputlangs);
@@ -343,7 +343,7 @@ class PartnershipUtils
 
 								$cmail = new CMailFile($subject, $to, $from, $msg, array(), array(), array(), '', '', 0, 1);
 								$result = $cmail->sendfile();
-								if (! $result || $cmail->error) {
+								if (!$result || $cmail->error) {
 									$erroremail .= ($erroremail ? ', ' : '').$cmail->error;
 									$this->errors[] = $cmail->error;
 									if (is_array($cmail->errors) && count($cmail->errors) > 0) $this->errors += $cmail->errors;
@@ -360,7 +360,7 @@ class PartnershipUtils
 						$object->reason_decline_or_cancel = '';
 					}
 
-					$partnershipsprocessed[$object->id]=$object->ref;
+					$partnershipsprocessed[$object->id] = $object->ref;
 
 					$object->last_check_backlink = $this->db->idate($now);
 
@@ -372,22 +372,22 @@ class PartnershipUtils
 			$this->error = $this->db->lasterror();
 		}
 
-		if (! $error) {
+		if (!$error) {
 			$this->db->commit();
 			$this->output = $numofexpiredmembers.' partnership checked'."\n";
-			if ($erroremail) $this->output.='. Got errors when sending some email : '.$erroremail."\n";
-			if ($emailnotfound) $this->output.='. Email not found for some partner : '.$emailnotfound."\n";
-			if ($websitenotfound) $this->output.='. Website not found for some partner : '.$websitenotfound."\n";
+			if ($erroremail) $this->output .= '. Got errors when sending some email : '.$erroremail."\n";
+			if ($emailnotfound) $this->output .= '. Email not found for some partner : '.$emailnotfound."\n";
+			if ($websitenotfound) $this->output .= '. Website not found for some partner : '.$websitenotfound."\n";
 		} else {
 			$this->db->rollback();
 			$this->output = "Rollback after error\n";
-			$this->output.= $numofexpiredmembers.' partnership checked'."\n";
-			if ($erroremail) $this->output.='. Got errors when sending some email : '.$erroremail."\n";
-			if ($emailnotfound) $this->output.='. Email not found for some partner : '.$emailnotfound."\n";
-			if ($websitenotfound) $this->output.='. Website not found for some partner : '.$websitenotfound."\n";
+			$this->output .= $numofexpiredmembers.' partnership checked'."\n";
+			if ($erroremail) $this->output .= '. Got errors when sending some email : '.$erroremail."\n";
+			if ($emailnotfound) $this->output .= '. Email not found for some partner : '.$emailnotfound."\n";
+			if ($websitenotfound) $this->output .= '. Website not found for some partner : '.$websitenotfound."\n";
 		}
 
-		return ($error ? 1: 0);
+		return ($error ? 1 : 0);
 	}
 
 	/**
diff --git a/htdocs/partnership/partnership_list.php b/htdocs/partnership/partnership_list.php
index c8bb93ccb7d..79f51be6ca9 100644
--- a/htdocs/partnership/partnership_list.php
+++ b/htdocs/partnership/partnership_list.php
@@ -82,7 +82,7 @@ if ($managedfor != 'member' && $sortfield == 'd.datefin') $sortfield = '';
 
 // Default sort order (if not yet defined by previous GETPOST)
 if (!$sortfield) {
-	reset($object->fields);					// Reset is required to avoid key() to return null.
+	reset($object->fields); // Reset is required to avoid key() to return null.
 	$sortfield = "t.".key($object->fields); // Set here default search field. By default 1st field in definition.
 }
 if (!$sortorder) {
@@ -136,8 +136,8 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
-$permissiontoread 	= $user->rights->partnership->read;
-$permissiontoadd 	= $user->rights->partnership->write;
+$permissiontoread = $user->rights->partnership->read;
+$permissiontoadd = $user->rights->partnership->write;
 $permissiontodelete = $user->rights->partnership->delete;
 
 // Security check
@@ -305,13 +305,13 @@ foreach ($search as $key => $val) {
 		}
 	} else {
 		if (preg_match('/(_dtstart|_dtend)$/', $key) && $search[$key] != '') {
-			$columnName=preg_replace('/(_dtstart|_dtend)$/', '', $key);
+			$columnName = preg_replace('/(_dtstart|_dtend)$/', '', $key);
 			if (preg_match('/^(date|timestamp|datetime)/', $object->fields[$columnName]['type'])) {
 				if (preg_match('/_dtstart$/', $key)) {
-					$sql .= " AND t." . $columnName . " >= '" . $db->idate($search[$key]) . "'";
+					$sql .= " AND t.".$columnName." >= '".$db->idate($search[$key])."'";
 				}
 				if (preg_match('/_dtend$/', $key)) {
-					$sql .= " AND t." . $columnName . " <= '" . $db->idate($search[$key]) . "'";
+					$sql .= " AND t.".$columnName." <= '".$db->idate($search[$key])."'";
 				}
 			}
 		}
@@ -538,7 +538,7 @@ foreach ($object->fields as $key => $val) {
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
 		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
 			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
-		} elseif ((strpos($val['type'], 'integer:') === 0) || (strpos($val['type'], 'sellist:')=== 0)) {
+		} elseif ((strpos($val['type'], 'integer:') === 0) || (strpos($val['type'], 'sellist:') === 0)) {
 			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth125', 1);
 		} elseif (!preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
 			print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 170853b9c2b..1b04a77083c 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -315,11 +315,11 @@ if (empty($reshook)) {
 
 			$object->type               	 = $type;
 			$object->status             	 = GETPOST('statut');
-			$object->status_buy            = GETPOST('statut_buy');
+			$object->status_buy = GETPOST('statut_buy');
 			$object->status_batch = GETPOST('status_batch');
 			$object->batch_mask = GETPOST('batch_mask');
 
-			$object->barcode_type          = GETPOST('fk_barcode_type');
+			$object->barcode_type = GETPOST('fk_barcode_type');
 			$object->barcode = GETPOST('barcode');
 			// Set barcode_type_xxx from barcode_type id
 			$stdobject = new GenericObject($db);
@@ -1620,10 +1620,10 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 						$tooltip .= $langs->trans("GenericMaskCodes5");
 						print '<tr><td id="mask_option">'.$langs->trans("ManageLotMask").'</td>';
 						if ($object->status_batch == '1' && $conf->global->PRODUCTBATCH_LOT_USE_PRODUCT_MASKS && $conf->global->PRODUCTBATCH_LOT_ADDON == 'mod_lot_advanced') {
-							$mask = ! empty($object->batch_mask) ? $object->batch_mask : $conf->global->LOT_ADVANCED_MASK;
+							$mask = !empty($object->batch_mask) ? $object->batch_mask : $conf->global->LOT_ADVANCED_MASK;
 						}
 						if ($object->status_batch == '2' && $conf->global->PRODUCTBATCH_SN_USE_PRODUCT_MASKS && $conf->global->PRODUCTBATCH_SN_ADDON == 'mod_sn_advanced') {
-							$mask = ! empty($object->batch_mask) ? $object->batch_mask : $conf->global->SN_ADVANCED_MASK;
+							$mask = !empty($object->batch_mask) ? $object->batch_mask : $conf->global->SN_ADVANCED_MASK;
 						}
 						$inherited_mask_lot = $conf->global->LOT_ADVANCED_MASK;
 						$inherited_mask_sn = $conf->global->SN_ADVANCED_MASK;
@@ -2011,7 +2011,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 					$formbarcode = new FormBarCode($db);
 				}
 
-				$fk_barcode_type='';
+				$fk_barcode_type = '';
 				if ($action == 'editbarcodetype') {
 					print $formbarcode->formBarcodeType($_SERVER['PHP_SELF'].'?id='.$object->id, $object->barcode_type, 'fk_barcode_type');
 					$fk_barcode_type = $object->barcode_type;
@@ -2057,7 +2057,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 					print '<tr><td>'.$langs->trans("ManageLotSerial").'</td><td>';
 					print $object->getLibStatut(0, 2);
 					print '</td></tr>';
-					if ((($object->status_batch == '1' &&$conf->global->PRODUCTBATCH_LOT_USE_PRODUCT_MASKS && $conf->global->PRODUCTBATCH_LOT_ADDON == 'mod_lot_advanced')
+					if ((($object->status_batch == '1' && $conf->global->PRODUCTBATCH_LOT_USE_PRODUCT_MASKS && $conf->global->PRODUCTBATCH_LOT_ADDON == 'mod_lot_advanced')
 						|| ($object->status_batch == '2' && $conf->global->PRODUCTBATCH_SN_ADDON == 'mod_sn_advanced' && $conf->global->PRODUCTBATCH_SN_USE_PRODUCT_MASKS))) {
 						print '<tr><td>'.$langs->trans("ManageLotMask").'</td><td>';
 						print $object->batch_mask;
diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php
index 55ab129edee..876ced9892c 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -169,7 +169,7 @@ if (empty($reshook)) {
 	// Modification entrepot
 	if ($action == 'update' && !$cancel) {
 		if ($object->fetch($id)) {
-			$object->label 		 = GETPOST("libelle");
+			$object->label = GETPOST("libelle");
 			$object->fk_parent   = GETPOST("fk_parent");
 			$object->fk_project = GETPOST('projectid');
 			$object->description = GETPOST("desc");
@@ -179,8 +179,8 @@ if (empty($reshook)) {
 			$object->zip         = GETPOST("zipcode");
 			$object->town        = GETPOST("town");
 			$object->country_id  = GETPOST("country_id");
-			$object->phone 		 = GETPOST("phone");
-			$object->fax 		 = GETPOST("fax");
+			$object->phone = GETPOST("phone");
+			$object->fax = GETPOST("fax");
 
 			// Fill array 'array_options' with data from add form
 			$ret = $extrafields->setOptionalsFromPost(null, $object);
@@ -648,7 +648,7 @@ if ($action == 'create') {
 			$sql .= " AND ps.fk_entrepot = ".((int) $object->id);
 
 			if ($separatedPMP) {
-				$sql .= " AND pa.fk_product = p.rowid AND pa.entity = ". (int) $conf->entity;
+				$sql .= " AND pa.fk_product = p.rowid AND pa.entity = ".(int) $conf->entity;
 			}
 
 			$sql .= $db->order($sortfield, $sortorder);
diff --git a/htdocs/salaries/payments.php b/htdocs/salaries/payments.php
index 8b0c774cc6a..28cf3f821cf 100644
--- a/htdocs/salaries/payments.php
+++ b/htdocs/salaries/payments.php
@@ -28,7 +28,9 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/salaries/class/salary.class.php';
 require_once DOL_DOCUMENT_ROOT.'/salaries/class/paymentsalary.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-if (!empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
+if (!empty($conf->accounting->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
+}
 
 // Load translation files required by the page
 $langs->loadLangs(array("compta", "salaries", "bills", "hrm"));
@@ -52,8 +54,12 @@ if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST(
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortfield) $sortfield = "s.datep,s.rowid";
-if (!$sortorder) $sortorder = "DESC,DESC";
+if (!$sortfield) {
+	$sortfield = "s.datep,s.rowid";
+}
+if (!$sortorder) {
+	$sortorder = "DESC,DESC";
+}
 
 // Initialize technical objects
 $object = new PaymentSalary($db);
@@ -66,8 +72,12 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
-if (!$sortfield) $sortfield = "s.datep,s.rowid";
-if (!$sortorder) $sortorder = "DESC,DESC";
+if (!$sortfield) {
+	$sortfield = "s.datep,s.rowid";
+}
+if (!$sortorder) {
+	$sortorder = "DESC,DESC";
+}
 
 $search_ref = GETPOST('search_ref', 'int');
 $search_ref_salary = GETPOST('search_ref_salary', 'int');
@@ -89,7 +99,9 @@ if (!GETPOST('search_type_id', 'int')) {
 	$filterarray = explode('-', $newfiltre);
 	foreach ($filterarray as $val) {
 		$part = explode(':', $val);
-		if ($part[0] == 's.fk_typepayment') $search_type_id = $part[1];
+		if ($part[0] == 's.fk_typepayment') {
+			$search_type_id = $part[1];
+		}
 	}
 } else {
 	$search_type_id = GETPOST('search_type_id', 'int');
@@ -133,7 +145,9 @@ if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massa
 
 $parameters = array();
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
 if (empty($reshook)) {
 	// Selection of new fields
@@ -203,21 +217,47 @@ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON b.fk_account = ba.ro
 $sql .= " ".MAIN_DB_PREFIX."user as u";
 $sql .= " WHERE u.rowid = sal.fk_user";
 $sql .= " AND s.entity IN (".getEntity('payment_salaries').")";
-if (empty($user->rights->salaries->readall)) $sql .= " AND s.fk_user IN (".$db->sanitize(join(',', $childids)).")";
+if (empty($user->rights->salaries->readall)) {
+	$sql .= " AND s.fk_user IN (".$db->sanitize(join(',', $childids)).")";
+}
 
 // Search criteria
-if ($search_ref)			$sql .= " AND s.rowid=".((int) $search_ref);
-if ($search_ref_salary)		$sql .= " AND sal.rowid=".((int) $search_ref_salary);
-if ($search_user)			$sql .= natural_search(array('u.login', 'u.lastname', 'u.firstname', 'u.email'), $search_user);
-if ($search_label)			$sql .= natural_search(array('sal.label'), $search_label);
-if ($search_date_start)     $sql .= " AND s.datep >= '".$db->idate($search_date_start)."'";
-if ($search_date_end)		$sql .= " AND s.datep <= '".$db->idate($search_date_end)."'";
-if ($search_dateep_start)     $sql .= " AND sal.dateep >= '".$db->idate($search_dateep_start)."'";
-if ($search_dateep_end)		$sql .= " AND sal.dateep <= '".$db->idate($search_dateep_end)."'";
-if ($search_amount)			$sql .= natural_search("s.amount", $search_amount, 1);
-if ($search_account > 0)	$sql .= " AND b.fk_account=".((int) $search_account);
-if ($search_fk_bank)			$sql .= " AND s.fk_bank=".((int) $search_fk_bank);
-if ($search_chq_number)		$sql .= natural_search(array('s.num_payment'), $search_chq_number);
+if ($search_ref) {
+	$sql .= " AND s.rowid=".((int) $search_ref);
+}
+if ($search_ref_salary) {
+	$sql .= " AND sal.rowid=".((int) $search_ref_salary);
+}
+if ($search_user) {
+	$sql .= natural_search(array('u.login', 'u.lastname', 'u.firstname', 'u.email'), $search_user);
+}
+if ($search_label) {
+	$sql .= natural_search(array('sal.label'), $search_label);
+}
+if ($search_date_start) {
+	$sql .= " AND s.datep >= '".$db->idate($search_date_start)."'";
+}
+if ($search_date_end) {
+	$sql .= " AND s.datep <= '".$db->idate($search_date_end)."'";
+}
+if ($search_dateep_start) {
+	$sql .= " AND sal.dateep >= '".$db->idate($search_dateep_start)."'";
+}
+if ($search_dateep_end) {
+	$sql .= " AND sal.dateep <= '".$db->idate($search_dateep_end)."'";
+}
+if ($search_amount) {
+	$sql .= natural_search("s.amount", $search_amount, 1);
+}
+if ($search_account > 0) {
+	$sql .= " AND b.fk_account=".((int) $search_account);
+}
+if ($search_fk_bank) {
+	$sql .= " AND s.fk_bank=".((int) $search_fk_bank);
+}
+if ($search_chq_number) {
+	$sql .= natural_search(array('s.num_payment'), $search_chq_number);
+}
 
 if ($search_type_id > 0) {
 	$sql .= " AND s.fk_typepayment=".((int) $search_type_id);
@@ -238,7 +278,9 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit))) {
 	$num = $nbtotalofrecords;
 } else {
-	if ($limit) $sql .= $db->plimit($limit + 1, $offset);
+	if ($limit) {
+		$sql .= $db->plimit($limit + 1, $offset);
+	}
 
 	$resql = $db->query($sql);
 	if (!$resql) {
@@ -257,21 +299,51 @@ llxHeader('', $title, $help_url);
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
 $param = '';
-if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-if ($search_type_id) $param .= '&search_type_id='.urlencode($search_type_id);
-if ($optioncss != '') $param .= '&optioncss='.urlencode($optioncss);
-if ($search_ref) $param .= '&search_ref='.urlencode($search_ref);
-if ($search_ref_salary) $param .= '&search_ref_salary='.urlencode($search_ref_salary);
-if ($search_user) $param .= '&search_user='.urlencode($search_user);
-if ($search_label) $param .= '&search_label='.urlencode($search_label);
-if ($search_fk_bank) $param .= '&search_fk_bank='.urlencode($search_fk_bank);
-if ($search_chq_number) $param .= '&search_chq_number='.urlencode($search_chq_number);
-if ($search_account) $param .= '&search_account='.urlencode($search_account);
-if ($search_date_start) $param .= '&search_date_startday='.urlencode(GETPOST('search_date_startday', 'int')).'&search_date_startmonth='.urlencode(GETPOST('search_date_startmonth', 'int')).'&search_date_startyear='.urlencode(GETPOST('search_date_startyear', 'int'));
-if ($search_dateep_start) $param .= '&search_dateep_startday='.urlencode(GETPOST('search_dateep_startday', 'int')).'&search_dateep_startmonth='.urlencode(GETPOST('search_dateep_startmonth', 'int')).'&search_dateep_startyear='.urlencode(GETPOST('search_dateep_startyear', 'int'));
-if ($search_date_end) $param .= '&search_date_endday='.urlencode(GETPOST('search_date_endday', 'int')).'&search_date_endmonth='.urlencode(GETPOST('search_date_endmonth', 'int')).'&search_date_endyear='.urlencode(GETPOST('search_date_endyear', 'int'));
-if ($search_dateep_end) $param .= '&search_dateep_endday='.urlencode(GETPOST('search_dateep_endday', 'int')).'&search_dateep_endmonth='.urlencode(GETPOST('search_dateep_endmonth', 'int')).'&search_dateep_endyear='.urlencode(GETPOST('search_dateep_endyear', 'int'));
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+	$param .= '&contextpage='.urlencode($contextpage);
+}
+if ($limit > 0 && $limit != $conf->liste_limit) {
+	$param .= '&limit='.urlencode($limit);
+}
+if ($search_type_id) {
+	$param .= '&search_type_id='.urlencode($search_type_id);
+}
+if ($optioncss != '') {
+	$param .= '&optioncss='.urlencode($optioncss);
+}
+if ($search_ref) {
+	$param .= '&search_ref='.urlencode($search_ref);
+}
+if ($search_ref_salary) {
+	$param .= '&search_ref_salary='.urlencode($search_ref_salary);
+}
+if ($search_user) {
+	$param .= '&search_user='.urlencode($search_user);
+}
+if ($search_label) {
+	$param .= '&search_label='.urlencode($search_label);
+}
+if ($search_fk_bank) {
+	$param .= '&search_fk_bank='.urlencode($search_fk_bank);
+}
+if ($search_chq_number) {
+	$param .= '&search_chq_number='.urlencode($search_chq_number);
+}
+if ($search_account) {
+	$param .= '&search_account='.urlencode($search_account);
+}
+if ($search_date_start) {
+	$param .= '&search_date_startday='.urlencode(GETPOST('search_date_startday', 'int')).'&search_date_startmonth='.urlencode(GETPOST('search_date_startmonth', 'int')).'&search_date_startyear='.urlencode(GETPOST('search_date_startyear', 'int'));
+}
+if ($search_dateep_start) {
+	$param .= '&search_dateep_startday='.urlencode(GETPOST('search_dateep_startday', 'int')).'&search_dateep_startmonth='.urlencode(GETPOST('search_dateep_startmonth', 'int')).'&search_dateep_startyear='.urlencode(GETPOST('search_dateep_startyear', 'int'));
+}
+if ($search_date_end) {
+	$param .= '&search_date_endday='.urlencode(GETPOST('search_date_endday', 'int')).'&search_date_endmonth='.urlencode(GETPOST('search_date_endmonth', 'int')).'&search_date_endyear='.urlencode(GETPOST('search_date_endyear', 'int'));
+}
+if ($search_dateep_end) {
+	$param .= '&search_dateep_endday='.urlencode(GETPOST('search_dateep_endday', 'int')).'&search_dateep_endmonth='.urlencode(GETPOST('search_dateep_endmonth', 'int')).'&search_dateep_endyear='.urlencode(GETPOST('search_dateep_endyear', 'int'));
+}
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
@@ -281,11 +353,15 @@ $arrayofmassactions = array(
 	//'buildsepa'=>$langs->trans("BuildSepa"),	// TODO
 );
 //if ($permissiontodelete) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
+if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
+	$arrayofmassactions = array();
+}
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
-if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+if ($optioncss != '') {
+	print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+}
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 print '<input type="hidden" name="action" value="list">';
@@ -294,7 +370,9 @@ print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
 $url = DOL_URL_ROOT.'/salaries/card.php?action=create';
-if (!empty($socid)) $url .= '&socid='.$socid;
+if (!empty($socid)) {
+	$url .= '&socid='.$socid;
+}
 $newcardbutton = dolGetButtonTitle($langs->trans('NewSalaryPayment'), '', 'fa fa-plus-circle', $url, '', $user->rights->salaries->write);
 
 print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $totalnboflines, 'object_payment', 0, $newcardbutton, '', $limit, 0, 0, 1);
@@ -413,7 +491,10 @@ print '</tr>'."\n";
 $needToFetchEachLine = 0;
 if (is_array($extrafields->attributes[$object->table_element]['computed']) && count($extrafields->attributes[$object->table_element]['computed']) > 0) {
 	foreach ($extrafields->attributes[$object->table_element]['computed'] as $key => $val) {
-		if (preg_match('/\$object/', $val)) $needToFetchEachLine++; // There is at least one compute field that use $object
+		if (preg_match('/\$object/', $val)) {
+			$needToFetchEachLine++;
+		}
+		// There is at least one compute field that use $object
 	}
 }
 
@@ -424,7 +505,10 @@ $total = 0;
 $totalarray = array();
 while ($i < ($limit ? min($num, $limit) : $num)) {
 	$obj = $db->fetch_object($resql);
-	if (empty($obj)) break; // Should not happen
+	if (empty($obj)) {
+		break;
+	}
+	// Should not happen
 
 	// Store properties in $object
 	$object->setVarsFromFetchObj($obj);
@@ -449,22 +533,32 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 
 	// Ref
 	print "<td>".$paymentsalstatic->getNomUrl(1)."</td>\n";
-	if (!$i) $totalarray['nbfield']++;
+	if (!$i) {
+		$totalarray['nbfield']++;
+	}
 
 	print "<td>".$salstatic->getNomUrl(1)."</td>\n";
-	if (!$i) $totalarray['nbfield']++;
+	if (!$i) {
+		$totalarray['nbfield']++;
+	}
 
 	// Label payment
 	print "<td>".dol_trunc($obj->label, 40)."</td>\n";
-	if (!$i) $totalarray['nbfield']++;
+	if (!$i) {
+		$totalarray['nbfield']++;
+	}
 
 	// Date end period
 	print '<td class="center">'.dol_print_date($db->jdate($obj->dateep), 'day')."</td>\n";
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 
 	// Date payment
 	print '<td class="center">'.dol_print_date($db->jdate($obj->datep), 'day')."</td>\n";
-	if (!$i) $totalarray['nbfield']++;
+	if (!$i) {
+		$totalarray['nbfield']++;
+	}
 
 	// Date value
 	/*print '<td class="center">'.dol_print_date($db->jdate($obj->datev), 'day')."</td>\n";
@@ -472,15 +566,21 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 
 	// Employee
 	print "<td>".$userstatic->getNomUrl(1)."</td>\n";
-	if (!$i) $totalarray['nbfield']++;
+	if (!$i) {
+		$totalarray['nbfield']++;
+	}
 
 	// Type
 	print '<td>'.$langs->trans("PaymentTypeShort".$obj->payment_code).'</td>';
-	if (!$i) $totalarray['nbfield']++;
+	if (!$i) {
+		$totalarray['nbfield']++;
+	}
 
 	// Chq number
 	print '<td>'.$obj->num_payment.'</td>';
-	if (!$i) $totalarray['nbfield']++;
+	if (!$i) {
+		$totalarray['nbfield']++;
+	}
 
 	// Account
 	if (!empty($conf->banque->enabled)) {
@@ -489,7 +589,9 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 		$accountlinestatic->id = $obj->fk_bank;
 		print $accountlinestatic->getNomUrl(1);
 		print '</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 
 		print '<td>';
 		if ($obj->fk_bank > 0) {
@@ -514,15 +616,23 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 			if ($accountstatic->id > 0) {
 				print $accountstatic->getNomUrl(1);
 			}
-		} else print '&nbsp;';
+		} else {
+			print '&nbsp;';
+		}
 		print '</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Amount
 	print '<td class="nowrap right"><span class="amount">'.price($obj->amount).'</span></td>';
-	if (!$i) $totalarray['nbfield']++;
-	if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'totalttcfield';
+	if (!$i) {
+		$totalarray['nbfield']++;
+	}
+	if (!$i) {
+		$totalarray['pos'][$totalarray['nbfield']] = 'totalttcfield';
+	}
 	$totalarray['val']['totalttcfield'] += $obj->amount;
 
 	// Extra fields
@@ -535,11 +645,15 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 	print '<td class="nowrap center">';
 	if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
 		$selected = 0;
-		if (in_array($object->id, $arrayofselected)) $selected = 1;
+		if (in_array($object->id, $arrayofselected)) {
+			$selected = 1;
+		}
 		print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
 	}
 	print '</td>';
-	if (!$i) $totalarray['nbfield']++;
+	if (!$i) {
+		$totalarray['nbfield']++;
+	}
 
 	print '</tr>'."\n";
 
@@ -553,7 +667,10 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
 // If no record found
 if ($num == 0) {
 	$colspan = 1;
-	foreach ($arrayfields as $key => $val) { if (!empty($val['checked'])) $colspan++; }
+	foreach ($arrayfields as $key => $val) { if (!empty($val['checked'])) {
+		$colspan++;
+	}
+	}
 	print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
 }
 
diff --git a/htdocs/societe/partnership.php b/htdocs/societe/partnership.php
index 912307a5675..9cb065d2c3b 100644
--- a/htdocs/societe/partnership.php
+++ b/htdocs/societe/partnership.php
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/partnership/class/partnership.class.php';
 require_once DOL_DOCUMENT_ROOT.'/partnership/lib/partnership.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("companies","partnership", "other"));
+$langs->loadLangs(array("companies", "partnership", "other"));
 
 // Get parameters
 $id = GETPOST('id', 'int');
@@ -82,19 +82,27 @@ foreach ($object->fields as $key => $val) {
 // Load object
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
 
-$permissiontoread 		= $user->rights->partnership->read;
-$permissiontoadd 		= $user->rights->partnership->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+$permissiontoread = $user->rights->partnership->read;
+$permissiontoadd = $user->rights->partnership->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
 $permissiontodelete 	= $user->rights->partnership->delete || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT);
-$permissionnote 		= $user->rights->partnership->write; // Used by the include of actions_setnotes.inc.php
+$permissionnote = $user->rights->partnership->write; // Used by the include of actions_setnotes.inc.php
 $permissiondellink 		= $user->rights->partnership->write; // Used by the include of actions_dellink.inc.php
-$usercanclose 			= $user->rights->partnership->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
-$upload_dir 			= $conf->partnership->multidir_output[isset($object->entity) ? $object->entity : 1];
+$usercanclose = $user->rights->partnership->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+$upload_dir = $conf->partnership->multidir_output[isset($object->entity) ? $object->entity : 1];
 
 
-if (!empty($conf->global->PARTNERSHIP_IS_MANAGED_FOR) && $conf->global->PARTNERSHIP_IS_MANAGED_FOR != 'thirdparty') accessforbidden();
-if (empty($conf->partnership->enabled)) accessforbidden();
-if (empty($permissiontoread)) accessforbidden();
-if ($action == 'edit' && empty($permissiontoadd)) accessforbidden();
+if (!empty($conf->global->PARTNERSHIP_IS_MANAGED_FOR) && $conf->global->PARTNERSHIP_IS_MANAGED_FOR != 'thirdparty') {
+	accessforbidden();
+}
+if (empty($conf->partnership->enabled)) {
+	accessforbidden();
+}
+if (empty($permissiontoread)) {
+	accessforbidden();
+}
+if ($action == 'edit' && empty($permissiontoadd)) {
+	accessforbidden();
+}
 
 if (($action == 'update' || $action == 'edit') && $object->status != $object::STATUS_DRAFT && !empty($user->socid)) {
 	accessforbidden();
@@ -128,7 +136,9 @@ if (empty($reshook)) {
 }
 
 $object->fields['fk_soc']['visible'] = 0;
-if ($object->id > 0 && $object->status == $object::STATUS_REFUSED && empty($action)) $object->fields['reason_decline_or_cancel']['visible'] = 1;
+if ($object->id > 0 && $object->status == $object::STATUS_REFUSED && empty($action)) {
+	$object->fields['reason_decline_or_cancel']['visible'] = 1;
+}
 $object->fields['note_public']['visible'] = 1;
 
 

From afa1e117c5a371003b32271b4d7286f100e7e4e5 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Mon, 14 Jun 2021 13:37:39 +0000
Subject: [PATCH 0628/1497] Fixing style errors.

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

diff --git a/htdocs/salaries/payments.php b/htdocs/salaries/payments.php
index 28cf3f821cf..bfc795ebcef 100644
--- a/htdocs/salaries/payments.php
+++ b/htdocs/salaries/payments.php
@@ -550,9 +550,9 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 
 	// Date end period
 	print '<td class="center">'.dol_print_date($db->jdate($obj->dateep), 'day')."</td>\n";
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
+	if (!$i) {
+		$totalarray['nbfield']++;
+	}
 
 	// Date payment
 	print '<td class="center">'.dol_print_date($db->jdate($obj->datep), 'day')."</td>\n";
@@ -668,7 +668,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
 if ($num == 0) {
 	$colspan = 1;
 	foreach ($arrayfields as $key => $val) { if (!empty($val['checked'])) {
-		$colspan++;
+			$colspan++;
 	}
 	}
 	print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';

From 33553f33476efd363b93cf6c5257943b560b59a0 Mon Sep 17 00:00:00 2001
From: Gauthier PC portable 024 <gauthier.verdol@atm-consulting.fr>
Date: Mon, 14 Jun 2021 17:01:59 +0200
Subject: [PATCH 0629/1497] FIX : same thing on supplier orders

---
 htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
index 1b85082616a..1e5ed8c724c 100644
--- a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
@@ -65,7 +65,7 @@ foreach ($linkedObjectBlock as $key => $objectlink)
     			echo '<strike>'.price($objectlink->total_ht).'</strike>';
     		}
     	} ?></td>
-    	<td class="right"><?php echo $objectlink->getLibStatut(3); ?></td>
+    	<td class="right"><?php echo $objectlink->getLibStatut(3, $objectlink->getSommePaiement()); ?></td>
     	<td class="right"><a class="reposition" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>
     </tr>
     <?php

From 564a3b66c2d496af22f6be4db31787060fa97ad8 Mon Sep 17 00:00:00 2001
From: Gauthier PC portable 024 <gauthier.verdol@atm-consulting.fr>
Date: Mon, 14 Jun 2021 17:08:16 +0200
Subject: [PATCH 0630/1497] FIX : method exists

---
 htdocs/compta/facture/tpl/linkedobjectblock.tpl.php | 5 ++++-
 htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php  | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
index 1e18eb6bfeb..1b81446c243 100644
--- a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
@@ -85,7 +85,10 @@ foreach ($linkedObjectBlock as $key => $objectlink)
     	}
 	}
     print '</td>';
-    print '<td class="linkedcol-statut right">'.$objectlink->getLibStatut(3, $objectlink->getSommePaiement()).'</td>';
+    print '<td class="linkedcol-statut right">';
+    if(method_exists($objectlink, 'getSommePaiement')) print $objectlink->getLibStatut(3, $objectlink->getSommePaiement());
+    else print $objectlink->getLibStatut(3);
+    print '</td>';
     print '<td class="linkedcol-action right"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key.'">'.img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink').'</a></td>';
     print "</tr>\n";
 }
diff --git a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
index 1e5ed8c724c..5bb6e45a8c8 100644
--- a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
@@ -65,7 +65,10 @@ foreach ($linkedObjectBlock as $key => $objectlink)
     			echo '<strike>'.price($objectlink->total_ht).'</strike>';
     		}
     	} ?></td>
-    	<td class="right"><?php echo $objectlink->getLibStatut(3, $objectlink->getSommePaiement()); ?></td>
+    	<td class="right"><?php
+		if(method_exists($objectlink, 'getSommePaiement')) echo $objectlink->getLibStatut(3, $objectlink->getSommePaiement()); 
+		else echo $objectlink->getLibStatut(3);
+	?></td>
     	<td class="right"><a class="reposition" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>
     </tr>
     <?php

From 745ad8b4035ba8da17a00ca337ccc7a2218aff5d Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Mon, 14 Jun 2021 15:10:24 +0000
Subject: [PATCH 0631/1497] Fixing style errors.

---
 htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
index 5bb6e45a8c8..20969cddf22 100644
--- a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
@@ -66,9 +66,9 @@ foreach ($linkedObjectBlock as $key => $objectlink)
     		}
     	} ?></td>
     	<td class="right"><?php
-		if(method_exists($objectlink, 'getSommePaiement')) echo $objectlink->getLibStatut(3, $objectlink->getSommePaiement()); 
+		if(method_exists($objectlink, 'getSommePaiement')) echo $objectlink->getLibStatut(3, $objectlink->getSommePaiement());
 		else echo $objectlink->getLibStatut(3);
-	?></td>
+		?></td>
     	<td class="right"><a class="reposition" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>
     </tr>
     <?php

From 8b0c2d997cec857f02651b70f3b78fbb8edc66f7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 14 Jun 2021 18:45:02 +0200
Subject: [PATCH 0632/1497] Clean code

---
 htdocs/admin/user.php          |  1 +
 htdocs/fourn/commande/card.php | 31 +++++++++++++++++++++++--------
 htdocs/fourn/commande/list.php |  5 +++--
 3 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/htdocs/admin/user.php b/htdocs/admin/user.php
index 83649d46a28..6d8cfe21f00 100644
--- a/htdocs/admin/user.php
+++ b/htdocs/admin/user.php
@@ -109,6 +109,7 @@ if ($action == 'set_default') {
 	}
 }
 
+
 /*
  * View
  */
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 44a712969c1..6e89abbf953 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -66,6 +66,11 @@ $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
 $action 		= GETPOST('action', 'alpha');
 $confirm		= GETPOST('confirm', 'alpha');
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'purchaseordercard'; // To manage different context of search
+
+$backtopage = GETPOST('backtopage', 'alpha');
+$backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
+
 $socid = GETPOST('socid', 'int');
 $projectid = GETPOST('projectid', 'int');
 $cancel         = GETPOST('cancel', 'alpha');
@@ -151,12 +156,16 @@ if ($reshook < 0) {
 }
 
 if (empty($reshook)) {
-	if ($cancel) {
-		if (!empty($backtopage)) {
-			header("Location: ".$backtopage);
-			exit;
+	$backurlforlist = DOL_URL_ROOT.'/fourn/commande/list.php'.($socid > 0 ? '&socid='.((int) $socid)  : '');
+
+	if (empty($backtopage) || ($cancel && empty($id))) {
+		if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) {
+			if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) {
+				$backtopage = $backurlforlist;
+			} else {
+				$backtopage = DOL_URL_ROOT.'/fourn/commande/card.php?id='.($id > 0 ? $id : '__ID__');
+			}
 		}
-		$action = '';
 	}
 
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
@@ -1573,10 +1582,16 @@ if ($action == 'create') {
 	print '<form name="add" action="'.$_SERVER["PHP_SELF"].'" method="post">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="add">';
-	print '<input type="hidden" name="socid" value="'.$soc->id.'">'."\n";
 	print '<input type="hidden" name="remise_percent" value="'.$soc->remise_supplier_percent.'">';
 	print '<input type="hidden" name="origin" value="'.$origin.'">';
 	print '<input type="hidden" name="originid" value="'.$originid.'">';
+	if ($backtopage) {
+		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+	}
+	if ($backtopageforcancel) {
+		print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
+	}
+
 	if (!empty($currency_tx)) {
 		print '<input type="hidden" name="originmulticurrency_tx" value="'.$currency_tx.'">';
 	}
@@ -1592,9 +1607,9 @@ if ($action == 'create') {
 	print '<tr><td class="fieldrequired">'.$langs->trans('Supplier').'</td>';
 	print '<td>';
 
-	if ($socid > 0) {
+	if ($societe->id > 0) {
 		print $societe->getNomUrl(1);
-		print '<input type="hidden" name="socid" value="'.$socid.'">';
+		print '<input type="hidden" name="socid" value="'.$societe->id.'">';
 	} else {
 		print img_picto('', 'company').$form->select_company((empty($socid) ? '' : $socid), 'socid', 's.fournisseur=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
 		// reload page to retrieve customer informations
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index 25f71f85eb4..c644f9e35a5 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -892,8 +892,9 @@ if ($resql) {
 	$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 	$url = DOL_URL_ROOT.'/fourn/commande/card.php?action=create';
-	if (!empty($socid)) {
-		$url .= '&socid='.$socid;
+	if ($socid > 0) {
+		$url .= '&socid='.((int) $socid);
+		$url .= '&backtopage='.urlencode(DOL_URL_ROOT.'/fourn/commande/list.php?socid='.((int) $socid));
 	}
 	$newcardbutton = dolGetButtonTitle($langs->trans('NewSupplierOrderShort'), '', 'fa fa-plus-circle', $url, '', ($user->rights->fournisseur->commande->creer || $user->rights->supplier_order->creer));
 

From a79afeaf02fe23c0e8d2c9c46c2a45248dabff7b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 14 Jun 2021 19:58:12 +0200
Subject: [PATCH 0633/1497] Add info to allow debug of email collector

---
 .../class/emailcollector.class.php             |  2 +-
 htdocs/langs/en_US/main.lang                   |  1 +
 htdocs/projet/class/project.class.php          |  1 +
 htdocs/projet/list.php                         | 18 +++++++++++++++++-
 4 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index b01f1883d53..ec5e33d8bb3 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -1539,7 +1539,7 @@ class EmailCollector extends CommonObject
 
 					// Make Operation
 					dol_syslog("Execute action ".$operation['type']." actionparam=".$operation['actionparam'].' thirdpartystatic->id='.$thirdpartystatic->id.' contactstatic->id='.$contactstatic->id.' projectstatic->id='.$projectstatic->id);
-					dol_syslog("Execute action fk_element_id=".$fk_element_id." fk_element_type=".$fk_element_type);
+					dol_syslog("Execute action fk_element_id=".$fk_element_id." fk_element_type=".$fk_element_type);	// If a Dolibarr tracker id is found, we should now the id of object
 
 					$actioncode = 'EMAIL_IN';
 					// If we scan the Sent box, we use the code for out email
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 39517ca2e1b..86c38e39b8b 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -1117,3 +1117,4 @@ UpdateForAllLines=Update for all lines
 OnHold=On hold
 Civility=Civility
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
+EmailMsgID=Email MsgID
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index c6e9799afa7..54e0f87a358 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -206,6 +206,7 @@ class Project extends CommonObject
 		'fk_user_creat' =>array('type'=>'integer', 'label'=>'UserCreation', 'enabled'=>1, 'visible'=>0, 'notnull'=>1, 'position'=>210),
 		'fk_user_modif' =>array('type'=>'integer', 'label'=>'UserModification', 'enabled'=>1, 'visible'=>0, 'position'=>215),
 		'import_key' =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>0, 'position'=>220),
+		'email_msgid'=>array('type'=>'varchar(255)', 'label'=>'EmailMsgID', 'enabled'=>1, 'visible'=>-1, 'position'=>250, 'help'=>'EmailMsgIDWhenSourceisEmail'),
 		'fk_statut' =>array('type'=>'smallint(6)', 'label'=>'Status', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'position'=>500)
 	);
 	// END MODULEBUILDER PROPERTIES
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 4438a9ce217..96c960e58d1 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -25,7 +25,7 @@
 
 /**
  *	\file       htdocs/projet/list.php
- *	\ingroup    projet
+ *	\ingroup    project
  *	\brief      Page to list projects
  */
 
@@ -300,6 +300,7 @@ if (count($listofprojectcontacttype) == 0) $listofprojectcontacttype[0] = '0'; /
 $distinct = 'DISTINCT'; // We add distinct until we are added a protection to be sure a contact of a project and task is only once.
 $sql = "SELECT ".$distinct." p.rowid as id, p.ref, p.title, p.fk_statut as status, p.fk_opp_status, p.public, p.fk_user_creat";
 $sql .= ", p.datec as date_creation, p.dateo as date_start, p.datee as date_end, p.opp_amount, p.opp_percent, (p.opp_amount*p.opp_percent/100) as opp_weighted_amount, p.tms as date_update, p.budget_amount, p.usage_opportunity, p.usage_task, p.usage_bill_time";
+$sql .= ", p.email_msgid";
 $sql .= ", s.rowid as socid, s.nom as name, s.email";
 $sql .= ", cls.code as opp_status_code";
 // Add fields from extrafields
@@ -668,6 +669,12 @@ if (!empty($arrayfields['p.tms']['checked']))
 	print '<td class="liste_titre">';
 	print '</td>';
 }
+if (!empty($arrayfields['p.email_msgid']['checked']))
+{
+	// Email msg id
+	print '<td class="liste_titre">';
+	print '</td>';
+}
 if (!empty($arrayfields['p.fk_statut']['checked']))
 {
 	print '<td class="liste_titre nowrap right">';
@@ -710,6 +717,7 @@ $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // No
 print $hookmanager->resPrint;
 if (!empty($arrayfields['p.datec']['checked']))  print_liste_field_titre($arrayfields['p.datec']['label'], $_SERVER["PHP_SELF"], "p.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
 if (!empty($arrayfields['p.tms']['checked']))    print_liste_field_titre($arrayfields['p.tms']['label'], $_SERVER["PHP_SELF"], "p.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+if (!empty($arrayfields['p.email_msgid']['checked']))    print_liste_field_titre($arrayfields['p.email_msgid']['label'], $_SERVER["PHP_SELF"], "p.email_msgid", "", $param, '', $sortfield, $sortorder, 'center ');
 if (!empty($arrayfields['p.fk_statut']['checked'])) print_liste_field_titre($arrayfields['p.fk_statut']['label'], $_SERVER["PHP_SELF"], "p.fk_statut", "", $param, '', $sortfield, $sortorder, 'right ');
 print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
 print "</tr>\n";
@@ -948,6 +956,14 @@ while ($i < min($num, $limit))
 			print '</td>';
 			if (!$i) $totalarray['nbfield']++;
 		}
+		// Email MsgID
+		if (!empty($arrayfields['p.email_msgid']['checked']))
+		{
+			print '<td class="center">';
+			print $obj->email_msgid;
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
+		}
 		// Status
 		if (!empty($arrayfields['p.fk_statut']['checked']))
 		{

From d154ec2344f67756552f0e35b98595341cea9c36 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 14 Jun 2021 20:06:52 +0200
Subject: [PATCH 0634/1497] FIX Collector to create lead was broken

---
 htdocs/comm/action/class/actioncomm.class.php | 4 ++++
 htdocs/projet/class/project.class.php         | 4 +++-
 htdocs/ticket/class/ticket.class.php          | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index f7e0ef6acb1..d094fb0bab4 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -683,6 +683,10 @@ class ActionComm extends CommonObject
 	{
 		global $langs;
 
+		if (empty($id) && empty($ref) && empty($ref_ext) && empty($email_msgid)) {
+			return -1;
+		}
+
 		$sql = "SELECT a.id,";
 		$sql .= " a.id as ref,";
 		$sql .= " a.entity,";
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 54e0f87a358..c5dd1045f03 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -526,7 +526,9 @@ class Project extends CommonObject
 	{
 		global $conf;
 
-		if (empty($id) && empty($ref)) return -1;
+		if (empty($id) && empty($ref) && empty($ref_ext) && empty($email_msgid)) {
+			return -1;
+		}
 
 		$sql = "SELECT rowid, entity, ref, title, description, public, datec, opp_amount, budget_amount,";
 		$sql .= " tms, dateo, datee, date_close, fk_soc, fk_user_creat, fk_user_modif, fk_user_close, fk_statut as status, fk_opp_status, opp_percent,";
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index 5f95c7f0dc5..20d63cea600 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -529,7 +529,7 @@ class Ticket extends CommonObject
 		global $langs;
 
 		// Check parameters
-		if (!$id && !$track_id && !$ref && !$email_msgid) {
+		if (empty($id) && empty($ref) && empty($track_id) && empty($email_msgid)) {
 			$this->error = 'ErrorWrongParameters';
 			dol_print_error(get_class($this)."::fetch ".$this->error);
 			return -1;

From 7e7800c1103967fa119f4846bcf2d5503798cb5a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 14 Jun 2021 20:37:21 +0200
Subject: [PATCH 0635/1497] Fix phpcs

---
 htdocs/projet/list.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 502f2bed071..cd532ecd048 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -1304,8 +1304,7 @@ while ($i < min($num, $limit)) {
 			}
 		}
 		// Email MsgID
-		if (!empty($arrayfields['p.email_msgid']['checked']))
-		{
+		if (!empty($arrayfields['p.email_msgid']['checked'])) {
 			print '<td class="center">';
 			print $obj->email_msgid;
 			print '</td>';

From 41549af751b2551480dd02a4581474ea09f05897 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 14 Jun 2021 21:45:11 +0200
Subject: [PATCH 0636/1497] Update llx_00_c_country.sql
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Iles Salomon  ->  Solomon Islands
Somalie  ->  Somalia
South Africa
Iles Géorgie du Sud et Sandwich du Sud  ->  South Georgia and the South Sandwich Islands
Sri Lanka = Sri Lanka
Soudan  ->  Sudan
Suriname = Suriname
Iles Svalbard et Jan Mayen  ->  Svalbard and Jan Mayen
Swaziland = Swaziland     & new also:   Eswatini
Syrie  ->  Syria
---
 htdocs/install/mysql/data/llx_00_c_country.sql | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_00_c_country.sql b/htdocs/install/mysql/data/llx_00_c_country.sql
index 1e2e8b69c39..6cf703829a5 100644
--- a/htdocs/install/mysql/data/llx_00_c_country.sql
+++ b/htdocs/install/mysql/data/llx_00_c_country.sql
@@ -231,16 +231,16 @@ INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (19
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (200,'SL','SLE','Sierra Leone',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (201,'SK','SVK','Slovakia',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (202,'SI','SVN','Slovenia',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (203,'SB','SLB','Iles Salomon',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (204,'SO','SOM','Somalie',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (203,'SB','SLB','Solomon Islands',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (204,'SO','SOM','Somalia',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (205,'ZA','ZAF','South Africa',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (206,'GS','SGS','Iles Géorgie du Sud et Sandwich du Sud',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (206,'GS','SGS','South Georgia and the South Sandwich Islands ',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (207,'LK','LKA','Sri Lanka',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (208,'SD','SDN','Soudan',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (208,'SD','SDN','Sudan',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (209,'SR','SUR','Suriname',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (210,'SJ','SJM','Iles Svalbard et Jan Mayen',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (211,'SZ','SWZ','Swaziland',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (212,'SY','SYR','Syrie',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (210,'SJ','SJM','Svalbard and Jan Mayen',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (211,'SZ','SWZ','Swaziland / Eswatini',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (212,'SY','SYR','Syria',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (213,'TW','TWN','Taïwan',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (214,'TJ','TJK','Tadjikistan',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (215,'TZ','TZA','Tanzanie',1,0);

From 0b4105880e1c3d89c7ad080ea20ec0be305a93f2 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 14 Jun 2021 21:59:37 +0200
Subject: [PATCH 0637/1497] Update ChangeLog

---
 ChangeLog | 52 +++++++++++++++++++++++++++-------------------------
 1 file changed, 27 insertions(+), 25 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 95a4a7a3ae6..5808fbf313f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,19 +16,12 @@ NEW: A lot of fix into english text after a small proofreading campaign (still n
 NEW: All main menu entries are using the picto of the module
 NEW: Add a copy to clipboard button on some fields 
 NEW: Add an example of scheduled job to send email reminder for unpaid invoices
-NEW: Accountancy - Add FEC import
-NEW: Accountancy - Add a confirmation form with options on export
-NEW: Accountancy - Add select date from/to in already bind customer and supplier list
-NEW: Accountancy - Format FEC - Add new field DateLimitReglmt
-NEW: Accountancy - In ledger & journals, show link on bank transaction
-NEW: Accountancy - Possibility to filter on journals in balance
-NEW: Accountancy - Add a page to list subledger accounts
-NEW: add the Channel column into the list of orders
 NEW: Add a check to avoid an invoice date in the future
 NEW: Add some color and picto for the direction of movement
+NEW: add the column "Channel" into the list of orders
 NEW: Add the column "alias" of company in the list of proposal, order, invoice
 NEW: Add the column "Office phone" and  "User mobile" in user list
-NEW: Add the column "Price level"in thirdparty list
+NEW: Add the column "Price level" in thirdparty list
 NEW: Add some company information in the dropdown login menu
 NEW: Add constant MAIN_BUGTRACK_URL to set a custom url to redirect to when clicking on link "declare a bug"
 NEW: Add contact tag and bulk email status on the thirdparty + contact create form
@@ -92,13 +85,22 @@ NEW: When a doc file is shared, link is visible from the main page of doc.
 NEW: #16378 More E-Mail Contact substitution Values for better salutation
 NEW: option to keep the "Automatically create a total payment" checkbox empty on the tax creation page
 
+ Accountancy
+NEW: Accountancy - Add FEC import
+NEW: Accountancy - Add a confirmation form with options on export
+NEW: Accountancy - Add select date from/to in already bind customer and supplier list
+NEW: Accountancy - Format FEC - Add new field DateLimitReglmt
+NEW: Accountancy - In ledger & journals, show link on bank transaction
+NEW: Accountancy - Possibility to filter on journals in balance
+NEW: Accountancy - Add a page to list subledger accounts
+
  ECM/GED
-NEW: Add db fields note_public and note_private for ECM module
-NEW: Can filter files in GED on status Shared/Not shared
+NEW: add DB fields note_public and note_private for ECM module
+NEW: Can filter files in ECM/GED on status Shared/Not shared
 
  Members
 NEW: #17292 default subscription amount by adherent type
-NEW: Option to automatically create a login/user when a new subscription of a member is done online
+NEW: option to automatically create a login/user when a new subscription of a member is done online
 NEW: option to select membership type on the online payment page for membership subscription or renewal
 
  Projects/Tasks
@@ -122,17 +124,17 @@ NEW: option for TakePOS to show the total price without tax
 NEW: more permissions in TakePOS (can edit added line, can modify once order sent to kitchen)
 
  Third-Parties
-NEW: Can set a Warehouse on a Thirdparty
+NEW: can set a warehouse on a Thirdparty
 
  Tickets
 NEW: can use captcha on public page to create a ticket  #16347
 NEW: can set if a ticket group is visible on public interface or not
 
  Warehouse
-NEW: Can make massive stock transfers from a CSV file
-NEW: Stock movement list - Add more complete date field
-NEW: Can set a Warehouse on a Thirdparty
+NEW: can make massive stock transfers from a CSV file
+NEW: Stock movement list - add more complete date field
 NEW: can set a warehouse in a proposal
+NEW: can set a warehouse on a Thirdparty
 
  Website Module
 NEW: #17113 Can upload a favicon in website module
@@ -147,10 +149,10 @@ NEW: start new experimental module Knowledge Management
 NEW: start new experimental module Workstations Management
 
  new Options
-NEW: Add option CONTRACT_ALLOW_EXTERNAL_DOWNLOAD  to make generated doc automatically shared
-NEW: Add option SUPPLIER_PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD  to make generated doc automatically shared
-NEW: Add option MAIN_SECURITY_ANTI_SSRF_SERVER_IP  to define list of IPs that are local IPs
-NEW: Add option SOCIETE_DISABLE_WORKFORCE  to hide staff field
+NEW: add option  CONTRACT_ALLOW_EXTERNAL_DOWNLOAD            to make generated doc automatically shared
+NEW: add option  SUPPLIER_PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD   to make generated doc automatically shared
+NEW: add option  MAIN_SECURITY_ANTI_SSRF_SERVER_IP           to define list of IPs that are local IPs
+NEW: add option  SOCIETE_DISABLE_WORKFORCE                   to hide staff field
 
 
 For developers:
@@ -164,10 +166,7 @@ NEW: Add experimental repair script to switch to dynamic row format and utf8mb4
 NEW: add form confirm hook on company card
 NEW: Add function showValueWithClipboardCPButton() to add a copy/paste
 NEW: Add hook addSectionECMAuto method to add custom diretory into ECM auto files
-NEW: Add native compression in rest apis
-NEW: Product Variants API, add variant stock to response by parameter
 NEW: Upgrade Stripe PHP lib to 7.67.0
-NEW: Add link to OpenAPI specifications xml file in REST API module setup: swagger.json file can be included into external tools like redoc
 NEW: Support sepa_debit in stripe paymentmethods list
 NEW: Update doleditor.class.php for easily activate SCAYT
 NEW: Add triggers in the function add_object_linked(), updateObjectLinked() and deleteObjectLinked()
@@ -181,8 +180,11 @@ NEW: unit selection on object edit line
 NEW: #13739 #17390 Product API route added to get product stock and product with or without variants
 
  APIs
-NEW: API Add option $includeifobjectisused to get a product
-NEW: API Get the list of product ids only
+NEW: API add option $includeifobjectisused to get a product
+NEW: API get the list of product ids only
+NEW: add native compression in REST APIs
+NEW: Product Variants API, add variant stock to response by parameter
+NEW: add link to OpenAPI specifications XML file in REST API module setup: swagger.json file can be included into external tools like redoc
 
 
 WARNING:

From 3b9936f7e21934f31b78114171e0b5f6b4602494 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 15 Jun 2021 01:18:17 +0200
Subject: [PATCH 0638/1497] Fix responsive

---
 htdocs/admin/accountant.php             |  8 +++---
 htdocs/admin/boxes.php                  |  2 +-
 htdocs/admin/company.php                | 36 ++++++++++++++-----------
 htdocs/admin/company_socialnetworks.php |  7 +++--
 htdocs/admin/ihm.php                    |  4 +--
 htdocs/admin/menus/index.php            |  4 +--
 htdocs/admin/security.php               | 21 ++++++++++-----
 htdocs/admin/translation.php            | 17 +++---------
 htdocs/core/class/html.form.class.php   |  2 +-
 htdocs/core/lib/treeview.lib.php        |  7 +++--
 htdocs/theme/eldy/global.inc.php        |  4 +++
 htdocs/theme/md/style.css.php           |  4 +++
 12 files changed, 63 insertions(+), 53 deletions(-)

diff --git a/htdocs/admin/accountant.php b/htdocs/admin/accountant.php
index 56c9605c460..1e924699cd5 100644
--- a/htdocs/admin/accountant.php
+++ b/htdocs/admin/accountant.php
@@ -144,23 +144,23 @@ print '</td></tr>'."\n";
 
 print '<tr class="oddeven"><td><label for="phone">'.$langs->trans("Phone").'</label></td><td>';
 print img_picto('', 'object_phoning', '', false, 0, 0, '', 'paddingright');
-print '<input name="tel" id="phone" value="'.(GETPOSTISSET('tel') ? GETPOST('tel', 'alpha') : (!empty($conf->global->MAIN_INFO_ACCOUNTANT_PHONE) ? $conf->global->MAIN_INFO_ACCOUNTANT_PHONE : '')).'"></td></tr>';
+print '<input name="tel" id="phone" class="maxwidth150 widthcentpercentminusx" value="'.(GETPOSTISSET('tel') ? GETPOST('tel', 'alpha') : (!empty($conf->global->MAIN_INFO_ACCOUNTANT_PHONE) ? $conf->global->MAIN_INFO_ACCOUNTANT_PHONE : '')).'"></td></tr>';
 print '</td></tr>'."\n";
 
 print '<tr class="oddeven"><td><label for="fax">'.$langs->trans("Fax").'</label></td><td>';
 print img_picto('', 'object_phoning_fax', '', false, 0, 0, '', 'paddingright');
-print '<input name="fax" id="fax" value="'.(GETPOSTISSET('fax') ? GETPOST('fax', 'alpha') : (!empty($conf->global->MAIN_INFO_ACCOUNTANT_FAX) ? $conf->global->MAIN_INFO_ACCOUNTANT_FAX : '')).'"></td></tr>';
+print '<input name="fax" id="fax" class="maxwidth150 widthcentpercentminusx" value="'.(GETPOSTISSET('fax') ? GETPOST('fax', 'alpha') : (!empty($conf->global->MAIN_INFO_ACCOUNTANT_FAX) ? $conf->global->MAIN_INFO_ACCOUNTANT_FAX : '')).'"></td></tr>';
 print '</td></tr>'."\n";
 
 print '<tr class="oddeven"><td><label for="email">'.$langs->trans("EMail").'</label></td><td>';
 print img_picto('', 'object_email', '', false, 0, 0, '', 'paddingright');
-print '<input name="mail" id="email" class="minwidth200" value="'.(GETPOSTISSET('mail') ? GETPOST('mail', 'alpha') : (!empty($conf->global->MAIN_INFO_ACCOUNTANT_MAIL) ? $conf->global->MAIN_INFO_ACCOUNTANT_MAIL : '')).'"></td></tr>';
+print '<input name="mail" id="email" class="maxwidth150 widthcentpercentminusx" value="'.(GETPOSTISSET('mail') ? GETPOST('mail', 'alpha') : (!empty($conf->global->MAIN_INFO_ACCOUNTANT_MAIL) ? $conf->global->MAIN_INFO_ACCOUNTANT_MAIL : '')).'"></td></tr>';
 print '</td></tr>'."\n";
 
 // Web
 print '<tr class="oddeven"><td><label for="web">'.$langs->trans("Web").'</label></td><td>';
 print img_picto('', 'globe', '', false, 0, 0, '', 'paddingright');
-print '<input name="web" id="web" class="minwidth300" value="'.(GETPOSTISSET('web') ? GETPOST('web', 'alpha') : (!empty($conf->global->MAIN_INFO_ACCOUNTANT_WEB) ? $conf->global->MAIN_INFO_ACCOUNTANT_WEB : '')).'"></td></tr>';
+print '<input name="web" id="web" class="maxwidth300 widthcentpercentminusx" value="'.(GETPOSTISSET('web') ? GETPOST('web', 'alpha') : (!empty($conf->global->MAIN_INFO_ACCOUNTANT_WEB) ? $conf->global->MAIN_INFO_ACCOUNTANT_WEB : '')).'"></td></tr>';
 print '</td></tr>'."\n";
 
 // Code
diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php
index ae33ef3b6fa..56971457f76 100644
--- a/htdocs/admin/boxes.php
+++ b/htdocs/admin/boxes.php
@@ -422,7 +422,7 @@ foreach ($boxactivated as $key => $box) {
 	$hasnext = ($key < (count($boxactivated) - 1));
 	$hasprevious = ($key != 0);
 	print '<td class="center">'.($key + 1).'</td>';
-	print '<td class="center">';
+	print '<td class="center nowraponall">';
 	print ($hasnext ? '<a class="reposition" href="boxes.php?action=switch&amp;switchfrom='.$box->rowid.'&amp;switchto='.$boxactivated[$key + 1]->rowid.'">'.img_down().'</a>&nbsp;' : '');
 	print ($hasprevious ? '<a class="reposition" href="boxes.php?action=switch&amp;switchfrom='.$box->rowid.'&amp;switchto='.$boxactivated[$key - 1]->rowid.'">'.img_up().'</a>' : '');
 	print '</td>';
diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index 0c6da346285..804ed9934bf 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -418,7 +418,7 @@ print '<input name="MAIN_INFO_SOCIETE_TOWN" class="minwidth200" id="MAIN_INFO_SO
 // Country
 print '<tr class="oddeven"><td class="fieldrequired"><label for="selectcountry_id">'.$langs->trans("Country").'</label></td><td class="maxwidthonsmartphone">';
 print img_picto('', 'globe-americas', 'class="paddingrightonly"');
-print $form->select_country($mysoc->country_id, 'country_id');
+print $form->select_country($mysoc->country_id, 'country_id', '', 0);
 if ($user->admin) {
 	print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 }
@@ -441,25 +441,25 @@ print '</td></tr>'."\n";
 // Phone
 print '<tr class="oddeven"><td><label for="phone">'.$langs->trans("Phone").'</label></td><td>';
 print img_picto('', 'object_phoning', '', false, 0, 0, '', 'paddingright');
-print '<input name="tel" id="phone" value="'.dol_escape_htmltag((GETPOSTISSET('tel') ? GETPOST('tel', 'alphanohtml') : (!empty($conf->global->MAIN_INFO_SOCIETE_TEL) ? $conf->global->MAIN_INFO_SOCIETE_TEL : ''))).'"></td></tr>';
+print '<input class="maxwidth150 widthcentpercentminusx" name="tel" id="phone" value="'.dol_escape_htmltag((GETPOSTISSET('tel') ? GETPOST('tel', 'alphanohtml') : (!empty($conf->global->MAIN_INFO_SOCIETE_TEL) ? $conf->global->MAIN_INFO_SOCIETE_TEL : ''))).'"></td></tr>';
 print '</td></tr>'."\n";
 
 // Fax
 print '<tr class="oddeven"><td><label for="fax">'.$langs->trans("Fax").'</label></td><td>';
 print img_picto('', 'object_phoning_fax', '', false, 0, 0, '', 'paddingright');
-print '<input name="fax" id="fax" value="'.dol_escape_htmltag((GETPOSTISSET('fax') ? GETPOST('fax', 'alphanohtml') : (!empty($conf->global->MAIN_INFO_SOCIETE_FAX) ? $conf->global->MAIN_INFO_SOCIETE_FAX : ''))).'"></td></tr>';
+print '<input class="maxwidth150" name="fax" id="fax" value="'.dol_escape_htmltag((GETPOSTISSET('fax') ? GETPOST('fax', 'alphanohtml') : (!empty($conf->global->MAIN_INFO_SOCIETE_FAX) ? $conf->global->MAIN_INFO_SOCIETE_FAX : ''))).'"></td></tr>';
 print '</td></tr>'."\n";
 
 // Email
 print '<tr class="oddeven"><td><label for="email">'.$langs->trans("EMail").'</label></td><td>';
 print img_picto('', 'object_email', '', false, 0, 0, '', 'paddingright');
-print '<input name="mail" id="email" class="minwidth200" value="'.dol_escape_htmltag((GETPOSTISSET('mail') ? GETPOST('mail', 'alphanohtml') : (!empty($conf->global->MAIN_INFO_SOCIETE_MAIL) ? $conf->global->MAIN_INFO_SOCIETE_MAIL : ''))).'"></td></tr>';
+print '<input class="maxwidth150" name="mail" id="email" value="'.dol_escape_htmltag((GETPOSTISSET('mail') ? GETPOST('mail', 'alphanohtml') : (!empty($conf->global->MAIN_INFO_SOCIETE_MAIL) ? $conf->global->MAIN_INFO_SOCIETE_MAIL : ''))).'"></td></tr>';
 print '</td></tr>'."\n";
 
 // Web
 print '<tr class="oddeven"><td><label for="web">'.$langs->trans("Web").'</label></td><td>';
 print img_picto('', 'globe', '', false, 0, 0, '', 'paddingright');
-print '<input name="web" id="web" class="minwidth300" value="'.dol_escape_htmltag((GETPOSTISSET('web') ? GETPOST('web', 'alphanohtml') : (!empty($conf->global->MAIN_INFO_SOCIETE_WEB) ? $conf->global->MAIN_INFO_SOCIETE_WEB : ''))).'"></td></tr>';
+print '<input class="maxwidth300 widthcentpercentminusx" name="web" id="web" value="'.dol_escape_htmltag((GETPOSTISSET('web') ? GETPOST('web', 'alphanohtml') : (!empty($conf->global->MAIN_INFO_SOCIETE_WEB) ? $conf->global->MAIN_INFO_SOCIETE_WEB : ''))).'"></td></tr>';
 print '</td></tr>'."\n";
 
 // Barcode
@@ -467,19 +467,19 @@ if (!empty($conf->barcode->enabled)) {
 	print '<tr class="oddeven"><td>';
 	print '<label for="barcode">'.$langs->trans("Gencod").'</label></td><td>';
 	print '<span class="fa paddingright fa-barcode"></span>';
-	print '<input name="barcode" id="barcode" class="minwidth150" value="'.dol_escape_htmltag((GETPOSTISSET('barcode') ? GETPOST('barcode', 'alphanohtml') : (!empty($conf->global->MAIN_INFO_SOCIETE_GENCODE) ? $conf->global->MAIN_INFO_SOCIETE_GENCODE : ''))).'"></td></tr>';
+	print '<input name="barcode" id="barcode" class="minwidth150 widthcentpercentminusx maxwidth300" value="'.dol_escape_htmltag((GETPOSTISSET('barcode') ? GETPOST('barcode', 'alphanohtml') : (!empty($conf->global->MAIN_INFO_SOCIETE_GENCODE) ? $conf->global->MAIN_INFO_SOCIETE_GENCODE : ''))).'"></td></tr>';
 	print '</td></tr>';
 }
 
 // Logo
 print '<tr class="oddeven"><td><label for="logo">'.$form->textwithpicto($langs->trans("Logo"), 'png, jpg').'</label></td><td>';
-print '<div class="centpertent nobordernopadding valignmiddle "><div class="inline-block marginrightonly">';
-print '<input type="file" class="flat minwidth200" name="logo" id="logo" accept="image/*">';
+print '<div class="centpercent nobordernopadding valignmiddle "><div class="inline-block marginrightonly">';
+print '<input type="file" class="flat minwidth100 maxwidthinputfileonsmartphone" name="logo" id="logo" accept="image/*">';
 print '</div>';
 if (!empty($mysoc->logo_small)) {
 	if (file_exists($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small)) {
 		print '<div class="inline-block valignmiddle">';
-		print '<img style="max-height: 80px" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_small).'">';
+		print '<img style="max-height: 80px; max-width: 200px;" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_small).'">';
 		print '</div>';
 	} elseif (!empty($mysoc->logo)) {
 		if (!file_exists($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini)) {
@@ -487,10 +487,12 @@ if (!empty($mysoc->logo_small)) {
 		}
 		$imgThumbSmall = vignette($conf->mycompany->dir_output.'/logos/'.$mysoc->logo, $maxwidthmini, $maxheightmini, '_small', $quality);
 		print '<div class="inline-block valignmiddle">';
-		print '<img style="max-height: 80px" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.basename($imgThumbSmall)).'">';
+		print '<img style="max-height: 80px; max-width: 200px;" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.basename($imgThumbSmall)).'">';
 		print '</div>';
 	}
-	print '<div class="inline-block valignmiddle marginrightonly"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=removelogo">'.img_delete($langs->trans("Delete"), '', 'marginleftonly').'</a></div>';
+	print '<div class="inline-block valignmiddle marginrightonly">';
+	print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=removelogo">'.img_delete($langs->trans("Delete"), '', 'marginleftonly').'</a>';
+	print '</div>';
 } elseif (!empty($mysoc->logo)) {
 	if (file_exists($conf->mycompany->dir_output.'/logos/'.$mysoc->logo)) {
 		print '<div class="inline-block valignmiddle">';
@@ -508,8 +510,8 @@ print '</td></tr>';
 
 // Logo (squarred)
 print '<tr class="oddeven"><td><label for="logo_squarred">'.$form->textwithpicto($langs->trans("LogoSquarred"), 'png, jpg').'</label></td><td>';
-print '<div class="centpertent nobordernopadding valignmiddle"><div class="inline-block marginrightonly">';
-print '<input type="file" class="flat minwidth200" name="logo_squarred" id="logo_squarred" accept="image/*">';
+print '<div class="centpercent nobordernopadding valignmiddle"><div class="inline-block marginrightonly">';
+print '<input type="file" class="flat minwidth100 maxwidthinputfileonsmartphone" name="logo_squarred" id="logo_squarred" accept="image/*">';
 print '</div>';
 if (!empty($mysoc->logo_squarred_small)) {
 	if (file_exists($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_squarred_small)) {
@@ -551,20 +553,21 @@ print '</table>';
 print '<br>';
 
 // IDs of the company (country-specific)
+print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent editmode">';
-print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("CompanyIds").'</td><td>'.$langs->trans("Value").'</td></tr>';
+print '<tr class="liste_titre"><td class="titlefield wordbreak">'.$langs->trans("CompanyIds").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
 $langs->load("companies");
 
 // Managing Director(s)
 print '<tr class="oddeven"><td><label for="director">'.$langs->trans("ManagingDirectors").'</label></td><td>';
-print '<input name="MAIN_INFO_SOCIETE_MANAGERS" id="directors" class="minwidth200" value="'.dol_escape_htmltag((GETPOSTISSET('MAIN_INFO_SOCIETE_MANAGERS') ? GETPOST('MAIN_INFO_SOCIETE_MANAGERS', 'nohtml') : (!empty($conf->global->MAIN_INFO_SOCIETE_MANAGERS) ? $conf->global->MAIN_INFO_SOCIETE_MANAGERS : ''))).'"></td></tr>';
+print '<input name="MAIN_INFO_SOCIETE_MANAGERS" id="directors" class="minwidth300" value="'.dol_escape_htmltag((GETPOSTISSET('MAIN_INFO_SOCIETE_MANAGERS') ? GETPOST('MAIN_INFO_SOCIETE_MANAGERS', 'nohtml') : (!empty($conf->global->MAIN_INFO_SOCIETE_MANAGERS) ? $conf->global->MAIN_INFO_SOCIETE_MANAGERS : ''))).'"></td></tr>';
 
 // GDPR contact
 print '<tr class="oddeven"><td>';
 print $form->textwithpicto($langs->trans("GDPRContact"), $langs->trans("GDPRContactDesc"));
 print '</td><td>';
-print '<input name="MAIN_INFO_GDPR" id="infodirector" class="minwidth500" value="'.dol_escape_htmltag((GETPOSTISSET("MAIN_INFO_GDPR") ? GETPOST("MAIN_INFO_GDPR", 'nohtml') : (!empty($conf->global->MAIN_INFO_GDPR) ? $conf->global->MAIN_INFO_GDPR : ''))).'"></td></tr>';
+print '<input name="MAIN_INFO_GDPR" id="infodirector" class="minwidth300" value="'.dol_escape_htmltag((GETPOSTISSET("MAIN_INFO_GDPR") ? GETPOST("MAIN_INFO_GDPR", 'nohtml') : (!empty($conf->global->MAIN_INFO_GDPR) ? $conf->global->MAIN_INFO_GDPR : ''))).'"></td></tr>';
 
 // Capital
 print '<tr class="oddeven"><td><label for="capital">'.$langs->trans("Capital").'</label></td><td>';
@@ -656,6 +659,7 @@ print '<textarea class="flat quatrevingtpercent" name="object" id="object" rows=
 print '</td></tr>';
 
 print '</table>';
+print '</div>';
 
 
 // Fiscal year start
diff --git a/htdocs/admin/company_socialnetworks.php b/htdocs/admin/company_socialnetworks.php
index 93c6739d37d..4809a418861 100644
--- a/htdocs/admin/company_socialnetworks.php
+++ b/htdocs/admin/company_socialnetworks.php
@@ -104,6 +104,8 @@ print '<input type="hidden" name="action" value="update">';
 
 // Social networks
 print '<br>';
+
+print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent editmode">';
 print '<tr class="liste_titre">';
 print '<td class="titlefield">'.$langs->trans("SocialNetworksInformation").'</td><td>'.$langs->trans("Url").'</td><td>'.$langs->trans("SocialNetworkId").'</td><td></td>';
@@ -116,17 +118,18 @@ foreach ($listofnetworks as $key => $value) {
 		print '<td><label for="'.$key.'url">'.$langs->trans(ucfirst($key)).'</label></td>';
 		$networkconstname = 'MAIN_INFO_SOCIETE_'.strtoupper($key).'_URL';
 		$networkconstid = 'MAIN_INFO_SOCIETE_'.strtoupper($key);
-		print '<td><span class="fa paddingright '.($value['icon'] ? $value['icon'] : 'fa-link').'"></span>';
+		print '<td class="nowraponall"><span class="fa paddingright '.($value['icon'] ? $value['icon'] : 'fa-link').'"></span>';
 		print '<input name="'.$key.'url" id="'.$key.'url" class="minwidth300" value="'.(!empty($conf->global->$networkconstname) ? dol_escape_htmltag($conf->global->$networkconstname) : '').'">';
 		print '</td><td>';
 		print '<input name="'.$key.'" id="'.$key.'" class="minwidth300" value="'.(!empty($conf->global->$networkconstid) ? dol_escape_htmltag($conf->global->$networkconstid) : '').'">';
 		print '</td>';
-		print '<td>'.dol_print_socialnetworks((!empty($conf->global->$networkconstid) ? dol_escape_htmltag($conf->global->$networkconstid) : ''), 0, 0, $key, $listofnetworks).'</td>';
+		print '<td class="nowraponall">'.dol_print_socialnetworks((!empty($conf->global->$networkconstid) ? dol_escape_htmltag($conf->global->$networkconstid) : ''), 0, 0, $key, $listofnetworks).'</td>';
 		print '</tr>'."\n";
 	}
 }
 
 print "</table>";
+print '</div>';
 
 print '<br>';
 
diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index 0ac40741ab3..f4ea09966fc 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -476,7 +476,7 @@ $disabled = '';
 if (!empty($conf->global->ADD_UNSPLASH_LOGIN_BACKGROUND)) {
 	$disabled = ' disabled="disabled"';
 }
-print '<input type="file" class="flat class=minwidth200" name="imagebackground" id="imagebackground"'.$disabled.'>';
+print '<input type="file" class="flat maxwidthinputfileonsmartphone" name="imagebackground" id="imagebackground"'.$disabled.'>';
 if ($disabled) {
 	print '('.$langs->trans("DisabledByOptionADD_UNSPLASH_LOGIN_BACKGROUND").') ';
 }
@@ -484,7 +484,7 @@ if (!empty($conf->global->MAIN_LOGIN_BACKGROUND)) {
 	print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=removebackgroundlogin">'.img_delete($langs->trans("Delete")).'</a>';
 	if (file_exists($conf->mycompany->dir_output.'/logos/'.$conf->global->MAIN_LOGIN_BACKGROUND)) {
 		print ' &nbsp; ';
-		print '<img class="paddingleft valignmiddle" width="100px" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('logos/'.$conf->global->MAIN_LOGIN_BACKGROUND).'">';
+		print '<img class="paddingleft valignmiddle" width="100" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('logos/'.$conf->global->MAIN_LOGIN_BACKGROUND).'">';
 	}
 } else {
 	print '<img class="paddingleft valignmiddle" width="100" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.png">';
diff --git a/htdocs/admin/menus/index.php b/htdocs/admin/menus/index.php
index 4d9c85a69f9..5a155d11411 100644
--- a/htdocs/admin/menus/index.php
+++ b/htdocs/admin/menus/index.php
@@ -314,14 +314,14 @@ if ($conf->use_javascript_ajax) {
 			$entry .= '<a class="editfielda marginleftonly marginrightonly" href="edit.php?menu_handler='.$menu_handler_to_search.'&action=edit&token='.newToken().'&menuId='.$menu['rowid'].'">'.img_edit('default', 0, 'class="menuEdit" id="edit'.$menu['rowid'].'"').'</a> ';
 			$entry .= '<a class="marginleftonly marginrightonly" href="edit.php?menu_handler='.$menu_handler_to_search.'&action=create&token='.newToken().'&menuId='.$menu['rowid'].'">'.img_edit_add('default').'</a> ';
 			$entry .= '<a class="marginleftonly marginrightonly" href="index.php?menu_handler='.$menu_handler_to_search.'&action=delete&token='.newToken().'&menuId='.$menu['rowid'].'">'.img_delete('default').'</a> ';
-			$entry .= '&nbsp; &nbsp; &nbsp;';
+			$entry .= '&nbsp; ';
 			$entry .= '<a class="marginleftonly marginrightonly" href="index.php?menu_handler='.$menu_handler_to_search.'&action=up&token='.newToken().'&menuId='.$menu['rowid'].'">'.img_picto("Up", "1uparrow").'</a><a href="index.php?menu_handler='.$menu_handler_to_search.'&action=down&menuId='.$menu['rowid'].'">'.img_picto("Down", "1downarrow").'</a>';
 			$entry .= '</td></tr></table>';
 
 			$buttons = '<a class="editfielda marginleftonly marginrightonly" href="edit.php?menu_handler='.$menu_handler_to_search.'&action=edit&token='.newToken().'&menuId='.$menu['rowid'].'">'.img_edit('default', 0, 'class="menuEdit" id="edit'.$menu['rowid'].'"').'</a> ';
 			$buttons .= '<a class="marginleftonly marginrightonly" href="edit.php?menu_handler='.$menu_handler_to_search.'&action=create&token='.newToken().'&menuId='.$menu['rowid'].'">'.img_edit_add('default').'</a> ';
 			$buttons .= '<a class="marginleftonly marginrightonly" href="index.php?menu_handler='.$menu_handler_to_search.'&action=delete&token='.newToken().'&menuId='.$menu['rowid'].'">'.img_delete('default').'</a> ';
-			$buttons .= '&nbsp; &nbsp; &nbsp;';
+			$buttons .= '&nbsp; ';
 			$buttons .= '<a class="marginleftonly marginrightonly" href="index.php?menu_handler='.$menu_handler_to_search.'&action=up&token='.newToken().'&menuId='.$menu['rowid'].'">'.img_picto("Up", "1uparrow").'</a><a href="index.php?menu_handler='.$menu_handler_to_search.'&action=down&menuId='.$menu['rowid'].'">'.img_picto("Down", "1downarrow").'</a>';
 
 			$data[] = array(
diff --git a/htdocs/admin/security.php b/htdocs/admin/security.php
index b1dd28956dc..e94dd6bad39 100644
--- a/htdocs/admin/security.php
+++ b/htdocs/admin/security.php
@@ -39,9 +39,11 @@ if (!$user->admin) {
 // Allow/Disallow change to clear passwords once passwords are crypted
 $allow_disable_encryption = true;
 
+
 /*
  * Actions
  */
+
 if ($action == 'setgeneraterule') {
 	if (!dolibarr_set_const($db, 'USER_PASSWORD_GENERATED', $_GET["value"], 'chaine', 0, '', $conf->entity)) {
 		dol_print_error($db);
@@ -215,6 +217,7 @@ if (is_resource($handle)) {
 }
 asort($arrayhandler);
 
+print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td colspan="2">'.$langs->trans("RuleForGeneratedPasswords").'</td>';
@@ -266,6 +269,8 @@ foreach ($arrayhandler as $key => $module) {
 	}
 }
 print '</table>';
+print '</div>';
+
 print '</form>';
 
 //if($conf->global->MAIN_SECURITY_DISABLEFORGETPASSLINK == 1)
@@ -273,45 +278,47 @@ print '</form>';
 if ($conf->global->USER_PASSWORD_GENERATED == "Perso") {
 	$tabConf = explode(";", $conf->global->USER_PASSWORD_PATTERN);
 	print '<br>';
+
+	print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
-	print '<td colspan="3"> '.$langs->trans("PasswordPatternDesc").'</td>';
+	print '<td colspan="2"> '.$langs->trans("PasswordPatternDesc").'</td>';
 	print '</tr>';
 
 
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("MinLength")."</td>";
-	print '<td colspan="2"><input type="number" value="'.$tabConf[0].'" id="minlenght" min="1"></td>';
+	print '<td><input type="number" value="'.$tabConf[0].'" id="minlenght" min="1"></td>';
 	print '</tr>';
 
 
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("NbMajMin")."</td>";
-	print '<td colspan="2"><input type="number" value="'.$tabConf[1].'" id="NbMajMin" min="0"></td>';
+	print '<td><input type="number" value="'.$tabConf[1].'" id="NbMajMin" min="0"></td>';
 	print '</tr>';
 
 
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("NbNumMin")."</td>";
-	print '<td colspan="2"><input type="number" value="'.$tabConf[2].'" id="NbNumMin" min="0"></td>';
+	print '<td><input type="number" value="'.$tabConf[2].'" id="NbNumMin" min="0"></td>';
 	print '</tr>';
 
 
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("NbSpeMin")."</td>";
-	print '<td colspan="2"><input type="number" value="'.$tabConf[3].'" id="NbSpeMin" min="0"></td>';
+	print '<td><input type="number" value="'.$tabConf[3].'" id="NbSpeMin" min="0"></td>';
 	print '</tr>';
 
 
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("NbIteConsecutive")."</td>";
-	print '<td colspan="2"><input type="number" value="'.$tabConf[4].'" id="NbIteConsecutive" min="0"></td>';
+	print '<td><input type="number" value="'.$tabConf[4].'" id="NbIteConsecutive" min="0"></td>';
 	print '</tr>';
 
 
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("NoAmbiCaracAutoGeneration")."</td>";
-	print '<td colspan="2"><input type="checkbox" id="NoAmbiCaracAutoGeneration" '.($tabConf[5] ? "checked" : "").' min="0"> <span id="textcheckbox">'.($tabConf[5] ? $langs->trans("Activated") : $langs->trans("Disabled")).'</span></td>';
+	print '<td><input type="checkbox" id="NoAmbiCaracAutoGeneration" '.($tabConf[5] ? "checked" : "").' min="0"> <span id="textcheckbox">'.($tabConf[5] ? $langs->trans("Activated") : $langs->trans("Disabled")).'</span></td>';
 	print '</tr>';
 
 	print '</table>';
diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index 362b29c0163..3fa2e5d0af9 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -296,19 +296,8 @@ if ($mode == 'overwrite') {
 	print '</td><td>';
 	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)
-	{
-		print '<td>';
-		print '<input type="text" class="flat" size="1" name="entity" value="'.$conf->entity.'">';
-		print '</td>';
-		print '<td class="center">';
-	}
-	else
-	{*/
-		print '<td class="center">';
-		print '<input type="hidden" name="entity" value="'.$conf->entity.'">';
-	//}
+	print '<td class="center">';
+	print '<input type="hidden" name="entity" value="'.$conf->entity.'">';
 	print '<input type="submit" class="button"'.$disabled.' value="'.$langs->trans("Add").'" name="add" title="'.dol_escape_htmltag($langs->trans("YouMustEnabledTranslationOverwriteBefore")).'">';
 	print "</td>\n";
 	print '</tr>';
@@ -500,7 +489,7 @@ if ($mode == 'searchkey') {
 	//}
 	print '</td>';
 	// Action column
-	print '<td class="nowrap right">';
+	print '<td class="nowraponall">';
 	$searchpicto = $form->showFilterAndCheckAddButtons(!empty($massactionbutton) ? 1 : 0, 'checkforselect', 1);
 	print $searchpicto;
 	print '</td>';
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index ebda2face9e..4fb48a8dbf1 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -8494,7 +8494,7 @@ class Form
 	 */
 	public function showFilterButtons()
 	{
-		$out = '<div class="nowrap">';
+		$out = '<div class="nowraponall">';
 		$out .= '<button type="submit" class="liste_titre button_search" name="button_search_x" value="x"><span class="fa fa-search"></span></button>';
 		$out .= '<button type="submit" class="liste_titre button_removefilter" name="button_removefilter_x" value="x"><span class="fa fa-remove"></span></button>';
 		$out .= '</div>';
diff --git a/htdocs/core/lib/treeview.lib.php b/htdocs/core/lib/treeview.lib.php
index 255bc47d9a9..fda21e28a21 100644
--- a/htdocs/core/lib/treeview.lib.php
+++ b/htdocs/core/lib/treeview.lib.php
@@ -162,10 +162,9 @@ function tree_recur($tab, $pere, $rang, $iddivjstree = 'iddivjstree', $donoreset
 			print "\n".'<li '.(!empty($tab[$x]['statut']) ? ' class="liuseractive"' : 'class="liuserdisabled"').'>';
 			if ($showfk) {
 				print '<table class="nobordernopadding centpercent"><tr><td>';
-				print '<strong> &nbsp; ';
-				print $tab[$x]['title'];
-				print '&nbsp; (fk_mainmenu='.$tab[$x]['fk_mainmenu'].' fk_leftmenu='.$tab[$x]['fk_leftmenu'].')';
-				print '</td><td class="right">';
+				print '<span class="paddingleftonly">'.$tab[$x]['title'].'</span>';
+				print '&nbsp; <span class="opacitymedium">(fk_mainmenu='.$tab[$x]['fk_mainmenu'].' fk_leftmenu='.$tab[$x]['fk_leftmenu'].')</span>';
+				print '</td><td class="right nowraponall">';
 				print $tab[$x]['buttons'];
 				print '</td></tr></table>';
 			} else {
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 70e5229ba28..e039779c96d 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -1481,6 +1481,10 @@ select.widthcentpercentminusxx, span.widthcentpercentminusxx:not(.select2-select
 		display: inline-block;
 	}
 
+	input.maxwidthinputfileonsmartphone {
+		width: 175px;
+	}
+
 	.logopublicpayment #dolpaymentlogo {
 		max-width: 260px;
 	}
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 7dd19673b5e..2c91aa0299b 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1511,6 +1511,10 @@ table[summary="list_of_modules"] .fa-cog {
 		display: inline-block;
 	}
 	
+	input.maxwidthinputfileonsmartphone {
+		width: 175px;
+	}
+	
 	.poweredbyimg {
 		width: 48px;
 	}

From a1e6236df0fa9c31f47cfe4a6f052662f7a153f2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 15 Jun 2021 02:15:45 +0200
Subject: [PATCH 0639/1497] Fix regression sql error

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

diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 0c825672f65..3c6151ef349 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -3594,7 +3594,7 @@ class SupplierInvoiceLine extends CommonObjectLine
 		$sql .= ' '.(!empty($this->fk_code_ventilation) ? $this->fk_code_ventilation : 0).',';
 		$sql .= ' '.((int) $this->rang).',';
 		$sql .= ' '.((int) $this->special_code).',';
-		$sql .= " ".((int) $this->info_bits)."',";
+		$sql .= " ".((int) $this->info_bits).",";
 		$sql .= " ".price2num($this->total_ht).",";
 		$sql .= " ".price2num($this->total_tva).",";
 		$sql .= " ".price2num($this->total_ttc).",";

From cd615b1717118166264cbac736bcb42e22b76dc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Tue, 15 Jun 2021 08:31:08 +0200
Subject: [PATCH 0640/1497] fix php warning

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

diff --git a/htdocs/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php
index 511c03a931b..359e408b784 100644
--- a/htdocs/core/tpl/contacts.tpl.php
+++ b/htdocs/core/tpl/contacts.tpl.php
@@ -104,7 +104,7 @@ if ($permission) {
 		<input type="hidden" name="id" value="<?php echo $object->id; ?>" />
 		<input type="hidden" name="action" value="addcontact" />
 		<input type="hidden" name="source" value="internal" />
-		<?php if ($withproject) {
+		<?php if (!empty($withproject)) {
 			print '<input type="hidden" name="withproject" value="'.$withproject.'">';
 		} ?>
 
@@ -134,7 +134,7 @@ if ($permission) {
 		<input type="hidden" name="id" value="<?php echo $object->id; ?>" />
 		<input type="hidden" name="action" value="addcontact" />
 		<input type="hidden" name="source" value="external" />
-		<?php if ($withproject) {
+		<?php if (!empty($withproject)) {
 			print '<input type="hidden" name="withproject" value="'.$withproject.'">';
 		} ?>
 

From 8fbdde9ec325ec87a643c9ff01a74cbd43f88986 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Tue, 15 Jun 2021 08:43:14 +0200
Subject: [PATCH 0641/1497] Update contacts.tpl.php

---
 htdocs/core/tpl/contacts.tpl.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php
index 359e408b784..482289b3e74 100644
--- a/htdocs/core/tpl/contacts.tpl.php
+++ b/htdocs/core/tpl/contacts.tpl.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2012      Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2013-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2015-2016 Charlie BENKE 	<charlie@patas-monkey.com>
+ * Copyright (C) 2021       Frédéric France     <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -100,7 +101,7 @@ if ($permission) {
 	if (empty($hideaddcontactforuser)) {
 		?>
 	<form class="tagtr impair nohover" action="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id; ?>" method="POST">
-		<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>" />
+		<input type="hidden" name="token" value="<?php echo newToken(); ?>" />
 		<input type="hidden" name="id" value="<?php echo $object->id; ?>" />
 		<input type="hidden" name="action" value="addcontact" />
 		<input type="hidden" name="source" value="internal" />
@@ -139,14 +140,12 @@ if ($permission) {
 		} ?>
 
 		<div class="tagtd nowrap maxwidthonsmartphone noborderbottom">
-			<?php $selectedCompany = isset($_GET["newcompany"]) ? $_GET["newcompany"] : $object->socid; ?>
-			<?php
+			<?php $selectedCompany = isset($_GET["newcompany"]) ? $_GET["newcompany"] : (empty($object->socid) ?  0 : $object->socid);
 			// add company icon before select list
 			if ($selectedCompany) {
 				echo img_object('', 'company', 'class="hideonsmartphone"');
 			}
-			?>
-			<?php $selectedCompany = $formcompany->selectCompaniesForNewContact($object, 'id', $selectedCompany, 'newcompany', '', 0, '', 'minwidth300imp'); ?>
+			$selectedCompany = $formcompany->selectCompaniesForNewContact($object, 'id', $selectedCompany, 'newcompany', '', 0, '', 'minwidth300imp'); ?>
 		</div>
 		<!--  <div class="tagtd nowrap noborderbottom"><?php echo img_object('', 'contact').' '.$langs->trans("ThirdPartyContacts"); ?></div>-->
 		<div class="tagtd maxwidthonsmartphone noborderbottom">

From 5ceb957059ac21cd5e608bddbf68407eb52405ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Tue, 15 Jun 2021 08:48:52 +0200
Subject: [PATCH 0642/1497] fix php warning

---
 htdocs/core/tpl/document_actions_post_headers.tpl.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/core/tpl/document_actions_post_headers.tpl.php b/htdocs/core/tpl/document_actions_post_headers.tpl.php
index 45090824248..4ec69efbac8 100644
--- a/htdocs/core/tpl/document_actions_post_headers.tpl.php
+++ b/htdocs/core/tpl/document_actions_post_headers.tpl.php
@@ -47,6 +47,9 @@ if (!isset($permission)) {
 if (!isset($permtoedit)) {
 	$permtoedit = $permissiontoadd;
 }
+if (!isset($param)) {
+	$param = '';
+}
 
 // Drag and drop for up and down allowed on product, thirdparty, ...
 // The drag and drop call the page core/ajax/row.php

From 77f0645c0efc07f8794402d7bb32fffbb3024dac Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Tue, 15 Jun 2021 10:30:58 +0200
Subject: [PATCH 0643/1497] Update index.php

---
 htdocs/accountancy/closure/index.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/htdocs/accountancy/closure/index.php b/htdocs/accountancy/closure/index.php
index bcb3d7901f5..b612762d358 100644
--- a/htdocs/accountancy/closure/index.php
+++ b/htdocs/accountancy/closure/index.php
@@ -12,7 +12,7 @@
  * 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/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  *
  */
 
@@ -124,7 +124,11 @@ if ($action == 'validate_movements_confirm' && !empty($user->rights->accounting-
 $form = new Form($db);
 $formaccounting = new FormAccounting($db);
 
-llxHeader('', $langs->trans("Closure"));
+$title = $langs->trans('Closure');
+
+$help_url ='EN:Module_Double_Entry_Accounting';
+
+llxHeader('', $title, $help_url);
 
 if ($action == 'validate_movements') {
 	$form_question = array();

From 2688b902b65f73c25650c8328709669a07499447 Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Tue, 15 Jun 2021 11:35:41 +0200
Subject: [PATCH 0644/1497] Close #17890 : produceandconsume into api finished

---
 htdocs/mrp/class/api_mos.class.php | 290 ++++++++++++++++++++++++++++-
 1 file changed, 289 insertions(+), 1 deletion(-)

diff --git a/htdocs/mrp/class/api_mos.class.php b/htdocs/mrp/class/api_mos.class.php
index 33d4a108f17..22420733a45 100644
--- a/htdocs/mrp/class/api_mos.class.php
+++ b/htdocs/mrp/class/api_mos.class.php
@@ -327,6 +327,12 @@ class Mos extends DolibarrApi
 			if ($field == 'autoclose') {
 				$autoclose = $value;
 			}
+			if ($field == 'arraytoconsume') {
+				$arraytoconsume = $value;
+			}
+			if ($field == 'arraytoproduce') {
+				$arraytoproduce = $value;
+			}
 		}
 
 		if (empty($labelmovement)) {
@@ -337,7 +343,289 @@ class Mos extends DolibarrApi
 		}
 
 		// TODO Add code for consume and produce...
-		throw new RestException(500, "Feature not yet available");
+		require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
+		dol_include_once('/mrp/lib/mrp_mo.lib.php');
+		$stockmove = new MouvementStock($this->db);
+		if (!empty($arraytoconsume) && !empty($arraytoproduce)) {
+			$pos = 0;
+			$arrayofarrayname = array("arraytoconsume","arraytoproduce");
+			foreach ($arrayofarrayname as $arrayname) {
+				foreach ($$arrayname as $value) {
+					$tmpproduct = new Product($this->db);
+					if (empty($value["objectid"])) {
+						throw new RestException(500, "Field objectid required in ".$arrayname);
+					}
+					$tmpproduct->fetch($value["qty"]);
+					if (empty($value["qty"])) {
+						throw new RestException(500, "Field qty required in ".$arrayname);
+					}
+					if ($value["qty"]!=0) {
+						$qtytoprocess = $value["qty"];
+						if (isset($value["fk_warehouse"])) {	// If there is a warehouse to set
+							if (!($value["fk_warehouse"] > 0)) {	// If there is no warehouse set.
+								throw new RestException(500, "Field fk_warehouse must be > 0 in ".$arrayname);
+								$error++;
+							}
+							if ($tmpproduct->status_batch) {
+								throw new RestException(500, "Product ".$tmpproduct->ref."must be in batch");
+								$error++;
+							}
+						}
+						$idstockmove = 0;
+						if (!$error && $value["fk_warehouse"] > 0) {
+							// Record stock movement
+							$id_product_batch = 0;
+							$stockmove->origin = $this->mo;
+							if ($qtytoprocess >= 0) {
+								$moline = new MoLine($this->db);
+								$moline->fk_mo = $this->mo->id;
+								$moline->position = $pos;
+								$moline->fk_product = $value["objectid"];
+								$moline->fk_warehouse = $value["fk_warehouse"];
+								$moline->qty = $qtytoprocess;
+								$moline->batch = $tmpproduct->status_batch;
+								$moline->role = 'toproduce';
+								$moline->fk_mrp_production = "";
+								$moline->fk_stock_movement = $idstockmove;
+								$moline->fk_user_creat = DolibarrApiAccess::$user->id;
+
+								$resultmoline = $moline->create(DolibarrApiAccess::$user);
+								if ($resultmoline <= 0) {
+									$error++;
+									throw new RestException(500, $moline->error);
+								}
+								$idstockmove = $stockmove->livraison(DolibarrApiAccess::$user, $value["objectid"], $value["fk_warehouse"], $qtytoprocess, 0, $labelmovement, dol_now(), '', '', $tmpproduct->status_batch, $id_product_batch, $codemovement);
+							} else {
+								$moline = new MoLine($this->db);
+								$moline->fk_mo = $this->mo->id;
+								$moline->position = $pos;
+								$moline->fk_product = $value["objectid"];
+								$moline->fk_warehouse = $value["fk_warehouse"];
+								$moline->qty = $qtytoprocess;
+								$moline->batch = $tmpproduct->status_batch;
+								$moline->role = 'toconsume';
+								$moline->fk_mrp_production = "";
+								$moline->fk_stock_movement = $idstockmove;
+								$moline->fk_user_creat = DolibarrApiAccess::$user->id;
+
+								$resultmoline = $moline->create(DolibarrApiAccess::$user);
+								if ($resultmoline <= 0) {
+									$error++;
+									throw new RestException(500, $moline->error);
+								}
+								$idstockmove = $stockmove->reception(DolibarrApiAccess::$user, $value["objectid"], $value["fk_warehouse"], $qtytoprocess, 0, $labelmovement, dol_now(), '', '', $tmpproduct->status_batch, $id_product_batch, $codemovement);
+							}
+							if ($idstockmove < 0) {
+								$error++;
+								throw new RestException(500, $stockmove->error);
+							}
+						}
+						if (!$error) {
+							// Record consumption
+							$moline = new MoLine($this->db);
+							$moline->fk_mo = $this->mo->id;
+							$moline->position = $pos;
+							$moline->fk_product = $value["objectid"];
+							$moline->fk_warehouse = $value["fk_warehouse"];
+							$moline->qty = $qtytoprocess;
+							$moline->batch = $tmpproduct->status_batch;
+							if ($arrayname == "arraytoconsume") {
+								$moline->role = 'consumed';
+							} else {
+								$moline->role = 'produced';
+							}
+							$moline->fk_mrp_production = "";
+							$moline->fk_stock_movement = $idstockmove;
+							$moline->fk_user_creat = DolibarrApiAccess::$user->id;
+
+							$resultmoline = $moline->create(DolibarrApiAccess::$user);
+							if ($resultmoline <= 0) {
+								$error++;
+								throw new RestException(500, $moline->error);
+							}
+
+							$pos++;
+						}
+					}
+				}
+			}
+			if (!$error) {
+				$consumptioncomplete = true;
+				$productioncomplete = true;
+
+				if ($autoclose <= 0) {
+					$consumptioncomplete = false;
+					$productioncomplete = false;
+				}
+			}
+		} else {
+			$pos = 0;
+			foreach ($this->mo->lines as $line) {
+				if ($line->role == 'toconsume') {
+					$tmpproduct = new Product($this->db);
+					$tmpproduct->fetch($line->fk_product);
+					if ($line->qty != 0) {
+						$qtytoprocess = $line->qty;
+						if (isset($line->fk_warehouse)) {	// If there is a warehouse to set
+							if (!($line->fk_warehouse > 0)) {	// If there is no warehouse set.
+								$langs->load("errors");
+								throw new RestException(500, $langs->trans("ErrorFieldRequiredForProduct", $langs->transnoentitiesnoconv("Warehouse"), $tmpproduct->ref));
+								$error++;
+							}
+							if ($tmpproduct->status_batch) {
+								$langs->load("errors");
+								throw new RestException(500, $langs->trans("ErrorFieldRequiredForProduct", $langs->transnoentitiesnoconv("Batch"), $tmpproduct->ref));
+								$error++;
+							}
+						}
+						$idstockmove = 0;
+						if (!$error && $line->fk_warehouse > 0) {
+							// Record stock movement
+							$id_product_batch = 0;
+							$stockmove->origin = $this->mo;
+							if ($qtytoprocess >= 0) {
+								$idstockmove = $stockmove->livraison(DolibarrApiAccess::$user, $line->fk_product, $line->fk_warehouse, $qtytoprocess, 0, $labelmovement, dol_now(), '', '', $tmpproduct->status_batch, $id_product_batch, $codemovement);
+							} else {
+								$idstockmove = $stockmove->reception(DolibarrApiAccess::$user, $line->fk_product, $line->fk_warehouse, $qtytoprocess, 0, $labelmovement, dol_now(), '', '', $tmpproduct->status_batch, $id_product_batch, $codemovement);
+							}
+							if ($idstockmove < 0) {
+								$error++;
+								throw new RestException(500, $stockmove->error);
+							}
+						}
+						if (!$error) {
+							// Record consumption
+							$moline = new MoLine($this->db);
+							$moline->fk_mo = $this->mo->id;
+							$moline->position = $pos;
+							$moline->fk_product = $line->fk_product;
+							$moline->fk_warehouse = $line->fk_warehouse;
+							$moline->qty = $qtytoprocess;
+							$moline->batch = $tmpproduct->status_batch;
+							$moline->role = 'consumed';
+							$moline->fk_mrp_production = $line->id;
+							$moline->fk_stock_movement = $idstockmove;
+							$moline->fk_user_creat = DolibarrApiAccess::$user->id;
+
+							$resultmoline = $moline->create(DolibarrApiAccess::$user);
+							if ($resultmoline <= 0) {
+								$error++;
+								throw new RestException(500, $moline->error);
+							}
+
+							$pos++;
+						}
+					}
+				}
+			}
+			$pos = 0;
+			foreach ($this->mo->lines as $line) {
+				if ($line->role == 'toproduce') {
+					$tmpproduct = new Product($this->db);
+					$tmpproduct->fetch($line->fk_product);
+					if ($line->qty != 0) {
+						$qtytoprocess = $line->qty;
+						if (isset($line->fk_warehouse)) {	// If there is a warehouse to set
+							if (!($line->fk_warehouse > 0)) {	// If there is no warehouse set.
+								$langs->load("errors");
+								throw new RestException(500, $langs->trans("ErrorFieldRequiredForProduct", $langs->transnoentitiesnoconv("Warehouse"), $tmpproduct->ref));
+								$error++;
+							}
+							if ($tmpproduct->status_batch) {
+								$langs->load("errors");
+								throw new RestException(500, $langs->trans("ErrorFieldRequiredForProduct", $langs->transnoentitiesnoconv("Batch"), $tmpproduct->ref));
+								$error++;
+							}
+						}
+						$idstockmove = 0;
+						if (!$error && $line->fk_warehouse > 0) {
+							// Record stock movement
+							$id_product_batch = 0;
+							$stockmove->origin = $this->mo;
+							if ($qtytoprocess >= 0) {
+								$idstockmove = $stockmove->livraison(DolibarrApiAccess::$user, $line->fk_product, $line->fk_warehouse, $qtytoprocess, 0, $labelmovement, dol_now(), '', '', $tmpproduct->status_batch, $id_product_batch, $codemovement);
+							} else {
+								$idstockmove = $stockmove->reception(DolibarrApiAccess::$user, $line->fk_product, $line->fk_warehouse, $qtytoprocess, 0, $labelmovement, dol_now(), '', '', $tmpproduct->status_batch, $id_product_batch, $codemovement);
+							}
+							if ($idstockmove < 0) {
+								$error++;
+								throw new RestException(500, $stockmove->error);
+							}
+						}
+						if (!$error) {
+							// Record consumption
+							$moline = new MoLine($this->db);
+							$moline->fk_mo = $this->mo->id;
+							$moline->position = $pos;
+							$moline->fk_product = $line->fk_product;
+							$moline->fk_warehouse = $line->fk_warehouse;
+							$moline->qty = $qtytoprocess;
+							$moline->batch = $tmpproduct->status_batch;
+							$moline->role = 'produced';
+							$moline->fk_mrp_production = $line->id;
+							$moline->fk_stock_movement = $idstockmove;
+							$moline->fk_user_creat = DolibarrApiAccess::$user->id;
+
+							$resultmoline = $moline->create(DolibarrApiAccess::$user);
+							if ($resultmoline <= 0) {
+								$error++;
+								throw new RestException(500, $moline->error);
+							}
+
+							$pos++;
+						}
+					}
+				}
+			}
+
+			if (!$error) {
+				$consumptioncomplete = true;
+				$productioncomplete = true;
+
+				if ($autoclose > 0) {
+					foreach ($this->mo->lines as $line) {
+						if ($line->role == 'toconsume') {
+							$arrayoflines = $this->mo->fetchLinesLinked('consumed', $line->id);
+							$alreadyconsumed = 0;
+							foreach ($arrayoflines as $line2) {
+								$alreadyconsumed += $line2['qty'];
+							}
+
+							if ($alreadyconsumed < $line->qty) {
+								$consumptioncomplete = false;
+							}
+						}
+						if ($line->role == 'toproduce') {
+							$arrayoflines = $this->mo->fetchLinesLinked('produced', $line->id);
+							$alreadyproduced = 0;
+							foreach ($arrayoflines as $line2) {
+								$alreadyproduced += $line2['qty'];
+							}
+
+							if ($alreadyproduced < $line->qty) {
+								$productioncomplete = false;
+							}
+						}
+					}
+				} else {
+					$consumptioncomplete = false;
+					$productioncomplete = false;
+				}
+			}
+		}
+		// Update status of MO
+		dol_syslog("consumptioncomplete = ".$consumptioncomplete." productioncomplete = ".$productioncomplete);
+		//var_dump("consumptioncomplete = ".$consumptioncomplete." productioncomplete = ".$productioncomplete);
+		if ($consumptioncomplete && $productioncomplete) {
+			$result = $this->mo->setStatut($this->mo::STATUS_PRODUCED, 0, '', 'MRP_MO_PRODUCED');
+		} else {
+			$result = $this->mo->setStatut($this->mo::STATUS_INPROGRESS, 0, '', 'MRP_MO_PRODUCED');
+		}
+		if ($result <= 0) {
+			$error++;
+			throw new RestException(500, $this->mo->error);
+		}
 
 		return $this->mo->id;
 	}

From 9ff0efbcc2c04da094507ed8cdcb662fec0686aa Mon Sep 17 00:00:00 2001
From: kevin <kevin.giuga@atm-consulting.fr>
Date: Tue, 15 Jun 2021 12:04:24 +0200
Subject: [PATCH 0645/1497] FIX fatal error when adding message to a ticket

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

diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index 5ed28094e39..85e88ce012c 100644
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -1317,7 +1317,7 @@ elseif (empty($action) || $action == 'view' || $action == 'addlink' || $action =
 			// Substitution array
 			$morehtmlright = '';
 			$help = "";
-			$substitutionarray = getCommonSubstitutionArray($newlang, 0, $arrayoffamiliestoexclude, $object);
+			$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, $arrayoffamiliestoexclude, $object);
 			if ($object->fk_soc > 0) {
 				$substitutionarray['__THIRDPARTY_NAME__'] = $object->thirdparty->name;
 			}

From d1ffd4fcc8b335353a66ec96134ad3b47ed28ebc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 15 Jun 2021 13:48:00 +0200
Subject: [PATCH 0646/1497] Trans

---
 htdocs/langs/en_US/admin.lang | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 329b7ff2775..4d28f2160c6 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -849,10 +849,10 @@ Permission402=Create/modify discounts
 Permission403=Validate discounts
 Permission404=Delete discounts
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries (yours and subordinates)
-Permission512=Create/modify payments of salaries
-Permission514=Delete payments of salaries
-Permission517=Read payments of salaries of everybody
+Permission511=Read salaries and payments (yours and subordinates)
+Permission512=Create/modify salaries and payments
+Permission514=Delete salaries and payments
+Permission517=Read salaries and payments everybody
 Permission519=Export salaries
 Permission520=Read Loans
 Permission522=Create/modify loans

From 7f3c8b4cd5ef262cf762121d082345a111517f0a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 15 Jun 2021 13:54:52 +0200
Subject: [PATCH 0647/1497] Fix user can't edit record

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

diff --git a/htdocs/user/document.php b/htdocs/user/document.php
index 8cf6c2b2a81..a5d88d04c5d 100644
--- a/htdocs/user/document.php
+++ b/htdocs/user/document.php
@@ -60,6 +60,9 @@ if ($id) {
 	|| (($user->id != $id) && $user->rights->user->user->password));
 }
 
+$permissiontoadd = $caneditfield;
+$permtoedit = $caneditfield;
+
 // Security check
 $socid = 0;
 if ($user->socid > 0) {
@@ -174,10 +177,7 @@ if ($object->id) {
 
 	print dol_get_fiche_end();
 
-
 	$modulepart = 'user';
-	$permissiontoadd = $user->rights->user->user->creer;
-	$permtoedit = $user->rights->user->user->creer;
 	$param = '&id='.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 } else {

From 80760d79603e38b01367b0e264ae97a6053bcc08 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 15 Jun 2021 14:18:09 +0200
Subject: [PATCH 0648/1497] Fix permissions

---
 htdocs/core/modules/modSalaries.class.php |  4 +--
 htdocs/user/card.php                      |  7 +++--
 htdocs/user/list.php                      | 35 +++++++++++++++++++++--
 3 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/modules/modSalaries.class.php b/htdocs/core/modules/modSalaries.class.php
index 759804b409e..3464a5e14b3 100644
--- a/htdocs/core/modules/modSalaries.class.php
+++ b/htdocs/core/modules/modSalaries.class.php
@@ -101,7 +101,7 @@ class modSalaries extends DolibarrModules
 
 		$r++;
 		$this->rights[$r][0] = 511;
-		$this->rights[$r][1] = 'Read payments of employee salaries (yours and your subordinates)';
+		$this->rights[$r][1] = 'Read employee salaries and payments (yours and your subordinates)';
 		$this->rights[$r][2] = 'r';
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'read';
@@ -125,7 +125,7 @@ class modSalaries extends DolibarrModules
 
 		$r++;
 		$this->rights[$r][0] = 517;
-		$this->rights[$r][1] = 'Read payments of salariests of every employee';
+		$this->rights[$r][1] = 'Read salaries and payments of all employees';
 		$this->rights[$r][2] = 'r';
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'readall';
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index fcd6baa2c05..999de6db0f7 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -87,6 +87,8 @@ if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
 	$caneditgroup = (!empty($user->admin) || $user->rights->user->group_advance->write);
 }
 
+$childids = $user->getAllChildIds(1);	// For later, test on salary visibility
+
 // Define value to know what current user can do on properties of edited user
 if ($id) {
 	// $user is the current logged user, $id is the user we want to edit
@@ -1201,7 +1203,8 @@ if ($action == 'create' || $action == 'adduserldap') {
 	print '<input class="maxwidth200" type="text" name="job" value="'.dol_escape_htmltag(GETPOST('job', 'alphanohtml')).'">';
 	print '</td></tr>';
 
-	if ((!empty($conf->salaries->enabled) && !empty($user->rights->salaries->read))
+	if ((!empty($conf->salaries->enabled) && !empty($user->rights->salaries->read) && in_array($id, $childids))
+		|| (!empty($conf->salaries->enabled) && !empty($user->rights->salaries->readall))
 		|| (!empty($conf->hrm->enabled) && !empty($user->rights->hrm->employee->read))) {
 		$langs->load("salaries");
 
@@ -1499,8 +1502,6 @@ if ($action == 'create' || $action == 'adduserldap') {
 			print '<td>'.dol_escape_htmltag($object->job).'</td>';
 			print '</tr>'."\n";
 
-			//$childids = $user->getAllChildIds(1);
-
 			if ((!empty($conf->salaries->enabled) && !empty($user->rights->salaries->read))
 				|| (!empty($conf->hrm->enabled) && !empty($user->rights->hrm->employee->read))) {
 				// Even a superior can't see this info of its subordinates wihtout $user->rights->salaries->read and $user->rights->hrm->employee->read (setting/viewing is reserverd to HR people).
diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index 5c8185069c9..ee7adeff3be 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -851,8 +851,20 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 
 	$li = $userstatic->getNomUrl(-1, '', 0, 0, 24, 1, 'login', '', 1);
 
+	$canreadhrmdata = 0;
+	if ((!empty($conf->salaries->enabled) && !empty($user->rights->salaries->read) && in_array($obj->rowid, $childids))
+		|| (!empty($conf->salaries->enabled) && !empty($user->rights->salaries->readall))
+		|| (!empty($conf->hrm->enabled) && !empty($user->rights->hrm->employee->read))) {
+			$canreadhrmdata = 1;
+	}
+	$canreadsecretapi = 0;
+	if ($user->id = $obj->rowid || !empty($user->admin)) {	// Current user or admin
+		$canreadsecretapi = 1;
+	}
+
 	print '<tr class="oddeven">';
 
+	// Login
 	if (!empty($arrayfields['u.login']['checked'])) {
 		print '<td class="nowraponall tdoverflowmax150">';
 		print $li;
@@ -888,6 +900,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 			$totalarray['nbfield']++;
 		}
 	}
+	// Employee yes/no
 	if (!empty($arrayfields['u.employee']['checked'])) {
 		print '<td class="center">'.yn($obj->employee).'</td>';
 		if (!$i) {
@@ -951,14 +964,22 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 		}
 	}
 	if (!empty($arrayfields['u.api_key']['checked'])) {
-		print '<td>'.$obj->api_key.'</td>';
+		print '<td>';
+		if ($obj->api_key) {
+			if ($canreadsecretapi) {
+				print $obj->api_key;
+			} else {
+				print '<span class="opacitymedium">'.$langs->trans("Hidden").'</span>';
+			}
+		}
+		print '</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
 	}
 	if (!empty($arrayfields['u.fk_soc']['checked'])) {
 		print '<td class="tdoverflowmax200">';
-		if ($obj->fk_soc) {
+		if ($obj->fk_soc > 0) {
 			$companystatic->id = $obj->fk_soc;
 			$companystatic->name = $obj->name;
 			$companystatic->canvas = $obj->canvas;
@@ -992,7 +1013,15 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 
 	// Salary
 	if (!empty($arrayfields['u.salary']['checked'])) {
-		print '<td class="nowraponall right amount">'.($obj->salary ? price($obj->salary) : '').'</td>';
+		print '<td class="nowraponall right amount">';
+		if ($obj->salary) {
+			if ($canreadhrmdata) {
+				print price($obj->salary);
+			} else {
+				print '<span class="opacitymedium">'.$langs->trans("Hidden").'</span>';
+			}
+		}
+		print '</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}

From 3cd4f3e4af5f0b8d4f4556236b1b0d91f190541d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 15 Jun 2021 14:26:59 +0200
Subject: [PATCH 0649/1497] Fix permissions

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

diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 999de6db0f7..c788c8305b3 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1502,7 +1502,8 @@ if ($action == 'create' || $action == 'adduserldap') {
 			print '<td>'.dol_escape_htmltag($object->job).'</td>';
 			print '</tr>'."\n";
 
-			if ((!empty($conf->salaries->enabled) && !empty($user->rights->salaries->read))
+			if ((!empty($conf->salaries->enabled) && !empty($user->rights->salaries->read) && in_array($id, $childids))
+				|| (!empty($conf->salaries->enabled) && !empty($user->rights->salaries->readall))
 				|| (!empty($conf->hrm->enabled) && !empty($user->rights->hrm->employee->read))) {
 				// Even a superior can't see this info of its subordinates wihtout $user->rights->salaries->read and $user->rights->hrm->employee->read (setting/viewing is reserverd to HR people).
 				// However, he can see the valuation of timesheet of its subordinates even without these permissions.
@@ -1777,17 +1778,14 @@ if ($action == 'create' || $action == 'adduserldap') {
 			print '</tr>'."\n";
 
 			// API key
-			if (!empty($conf->api->enabled) && $user->admin) {
+			if (!empty($conf->api->enabled) && ($user->id == $id || $user->admin)) {
 				print '<tr><td>'.$langs->trans("ApiKey").'</td>';
 				print '<td>';
 				if (!empty($object->api_key)) {
 					print '<span class="opacitymedium">';
-					print showValueWithClipboardCPButton($object->api_key, 1, $langs->trans("Hidden"));
+					print showValueWithClipboardCPButton($object->api_key, 1, $langs->trans("Hidden"));		// TODO Add an option to also reveal the hash, not only copy paste
 					print '</span>';
 				}
-				if ($user->admin || $user->id == $object->id) {
-					// TODO Add a feature to reveal the hash
-				}
 				print '</td></tr>';
 			}
 
@@ -2303,7 +2301,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			print "</td></tr>\n";
 
 			// API key
-			if (!empty($conf->api->enabled) && $user->admin) {
+			if (!empty($conf->api->enabled) && ($user->id == $id || $user->admin)) {
 				print '<tr><td>'.$langs->trans("ApiKey").'</td>';
 				print '<td>';
 				print '<input class="minwidth300" maxsize="32" type="text" id="api_key" name="api_key" value="'.$object->api_key.'" autocomplete="off">';

From 43c5dd2aea7ff54952fe1e7fd4e4e3fe4d7f5389 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 15 Jun 2021 14:29:07 +0200
Subject: [PATCH 0650/1497] Fix permissions

---
 htdocs/user/card.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index c788c8305b3..1404e86be9d 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -2630,7 +2630,8 @@ if ($action == 'create' || $action == 'adduserldap') {
 			}
 			print '</td></tr>';
 
-			if ((!empty($conf->salaries->enabled) && !empty($user->rights->salaries->read))
+			if ((!empty($conf->salaries->enabled) && !empty($user->rights->salaries->read) && in_array($id, $childids))
+				|| (!empty($conf->salaries->enabled) && !empty($user->rights->salaries->readall))
 				|| (!empty($conf->hrm->enabled) && !empty($user->rights->hrm->employee->read))) {
 				$langs->load("salaries");
 

From 5f7dddbdcba37949a94caf94205589613da40df5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 15 Jun 2021 14:49:08 +0200
Subject: [PATCH 0651/1497] Fix permissions

---
 htdocs/admin/perms.php                        | 59 ++++++++++++++-----
 .../install/mysql/migration/13.0.0-14.0.0.sql |  2 +-
 htdocs/install/mysql/migration/repair.sql     |  2 +
 htdocs/user/perms.php                         | 10 ++--
 4 files changed, 54 insertions(+), 19 deletions(-)

diff --git a/htdocs/admin/perms.php b/htdocs/admin/perms.php
index f08a1497181..8f4c0c6f763 100644
--- a/htdocs/admin/perms.php
+++ b/htdocs/admin/perms.php
@@ -21,7 +21,7 @@
 /**
  *   	\file       htdocs/admin/perms.php
  *      \ingroup    core
- *		\brief      Page d'administration/configuration des permissions par defaut
+ *		\brief      Page to setup default permissions of a new user
  */
 
 require '../main.inc.php';
@@ -64,6 +64,7 @@ if ($action == 'remove') {
  */
 
 $wikihelp = 'EN:Setup_Security|FR:Paramétrage_Sécurité|ES:Configuración_Seguridad';
+
 llxHeader('', $langs->trans("DefaultRights"), $wikihelp);
 
 print load_fiche_titre($langs->trans("SecuritySetup"), '', 'title_setup');
@@ -121,15 +122,15 @@ print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Module").'</td>';
 print '<td class="center">'.$langs->trans("Default").'</td>';
-print '<td class="center">&nbsp;</td>';
+print '<td class="center" width="24">&nbsp;</td>';
 print '<td>'.$langs->trans("Permissions").'</td>';
 if ($user->admin) {
-	print '<td class="right">'.$langs->trans("ID").'</td>';
+	print '<td class="right"></td>';
 }
 print '</tr>'."\n";
 
 //print "xx".$conf->global->MAIN_USE_ADVANCED_PERMS;
-$sql = "SELECT r.id, r.libelle as label, r.module, r.module_position, r.perms, r.subperms, r.bydefault";
+$sql = "SELECT r.id, r.libelle as label, r.module, r.perms, r.subperms, r.module_position, r.bydefault";
 $sql .= " FROM ".MAIN_DB_PREFIX."rights_def as r";
 $sql .= " WHERE r.libelle NOT LIKE 'tou%'"; // On ignore droits "tous"
 $sql .= " AND r.entity = ".((int) $entity);
@@ -147,21 +148,32 @@ if ($result) {
 	while ($i < $num) {
 		$obj = $db->fetch_object($result);
 
-		// If line is for a module that doe snot existe anymore (absent of includes/module), we ignore it
+		// If line is for a module that does not exist anymore (absent of includes/module), we ignore it
 		if (empty($modules[$obj->module])) {
 			$i++;
 			continue;
 		}
 
-		// Save field module_position in database if value is still zero
-		if (empty($obj->module_position)) {
+		$objMod = $modules[$obj->module];
+
+		// Save field module_position in database if value is wrong
+		if (empty($obj->module_position) || (is_object($objMod) && $objMod->isCoreOrExternalModule() == 'external' && $obj->module_position < 100000)) {
 			if (is_object($modules[$obj->module]) && ($modules[$obj->module]->module_position > 0)) {
 				// TODO Define familyposition
-				$family = (!empty($modules[$obj->module]->family_position) ? $modules[$obj->module]->family_position : '');
+				//$familyposition = $modules[$obj->module]->family_position;
 				$familyposition = 0;
-				$sqlupdate = 'UPDATE '.MAIN_DB_PREFIX."rights_def SET module_position = ".((int) $modules[$obj->module]->module_position).",";
+
+				$newmoduleposition = $modules[$obj->module]->module_position;
+
+				// Correct $newmoduleposition position for external modules
+				$objMod = $modules[$obj->module];
+				if (is_object($objMod) && $objMod->isCoreOrExternalModule() == 'external' && $newmoduleposition < 100000) {
+					$newmoduleposition += 100000;
+				}
+
+				$sqlupdate = 'UPDATE '.MAIN_DB_PREFIX."rights_def SET module_position = ".((int) $newmoduleposition).",";
 				$sqlupdate .= " family_position = ".((int) $familyposition);
-				$sqlupdate .= " WHERE module_position = 0 AND module = '".$db->escape($obj->module)."'";
+				$sqlupdate .= " WHERE module_position = ".((int) $obj->module_position)." AND module = '".$db->escape($obj->module)."'";
 				$db->query($sqlupdate);
 			}
 		}
@@ -203,12 +215,12 @@ if ($result) {
 			print '</tr>'."\n";
 		}
 
-		$perm_libelle = (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ($langs->trans("PermissionAdvanced".$obj->id) != ("PermissionAdvanced".$obj->id)) ? $langs->trans("PermissionAdvanced".$obj->id) : (($langs->trans("Permission".$obj->id) != ("Permission".$obj->id)) ? $langs->trans("Permission".$obj->id) : $obj->label));
-
+		print '<!-- '.$obj->module.'->'.$obj->perms.($obj->subperms ? '->'.$obj->subperms : '').' -->'."\n";
 		print '<tr class="oddeven">';
 
 		// Picto and label of module
 		print '<td class="maxwidthonsmartphone tdoverflowonsmartphone">';
+		//print img_object('', $picto, 'class="pictoobjectwidth"').' '.$objMod->getName();
 		print '</td>';
 
 		// Tick
@@ -235,11 +247,24 @@ if ($result) {
 		}
 
 		// Permission and tick
-		print '<td>'.$perm_libelle.'</td>';
+		$permlabel = (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ($langs->trans("PermissionAdvanced".$obj->id) != ("PermissionAdvanced".$obj->id)) ? $langs->trans("PermissionAdvanced".$obj->id) : (($langs->trans("Permission".$obj->id) != ("Permission".$obj->id)) ? $langs->trans("Permission".$obj->id) : $langs->trans($obj->label)));
+		print '<td>';
+		print $permlabel;
+		if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
+			if (preg_match('/_advance$/', $obj->perms)) {
+				print ' <span class="opacitymedium">('.$langs->trans("AdvancedModeOnly").')</span>';
+			}
+		}
+		print '</td>';
 
 		// Permission id
 		if ($user->admin) {
-			print '<td class="right"><span class="opacitymedium">'.$obj->id.'</span></td>';
+			print '<td class="right">';
+			$htmltext = $langs->trans("ID").': '.$obj->id;
+			$htmltext .= '<br>'.$langs->trans("Permission").': user->rights->'.$obj->module.'->'.$obj->perms.($obj->subperms ? '->'.$obj->subperms : '');
+			print $form->textwithpicto('', $htmltext);
+			//print '<span class="opacitymedium">'.$obj->id.'</span>';
+			print '</td>';
 		}
 
 		print '</tr>'."\n";
@@ -252,6 +277,12 @@ if ($result) {
 print '</table>';
 print '</div>';
 
+$parameters = array();
+$reshook = $hookmanager->executeHooks('insertExtraFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
+
 print dol_get_fiche_end();
 
 // End of page
diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index c58b9ee3efe..d7aa335a4b2 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -546,4 +546,4 @@ create table llx_c_partnership_type
   active  	    tinyint DEFAULT 1  NOT NULL
 )ENGINE=innodb;
 
-
+DELETE FROM llx_rights_def WHERE module = 'hrm' AND perms = 'employee';
diff --git a/htdocs/install/mysql/migration/repair.sql b/htdocs/install/mysql/migration/repair.sql
index 6e9ea4601f8..59f04fdb2ca 100644
--- a/htdocs/install/mysql/migration/repair.sql
+++ b/htdocs/install/mysql/migration/repair.sql
@@ -533,3 +533,5 @@ UPDATE llx_facturedet SET situation_percent = 100 WHERE situation_percent IS NUL
 --ALTER TABLE llx_tablename ROW_FORMAT=DYNAMIC;
 
 
+DELETE FROM llx_rights_def WHERE module = 'hrm' AND perms = 'employee';
+
diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php
index cb0a093867d..2136d0f07c5 100644
--- a/htdocs/user/perms.php
+++ b/htdocs/user/perms.php
@@ -293,10 +293,10 @@ if ($user->admin) {
 print '</tr>'."\n";
 
 //print "xx".$conf->global->MAIN_USE_ADVANCED_PERMS;
-$sql = "SELECT r.id, r.libelle as label, r.module, r.perms, r.subperms, r.module_position";
+$sql = "SELECT r.id, r.libelle as label, r.module, r.perms, r.subperms, r.module_position, r.bydefault";
 $sql .= " FROM ".MAIN_DB_PREFIX."rights_def as r";
 $sql .= " WHERE r.libelle NOT LIKE 'tou%'"; // On ignore droits "tous"
-$sql .= " AND r.entity = ".$entity;
+$sql .= " AND r.entity = ".((int) $entity);
 if (empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
 	$sql .= " AND r.perms NOT LIKE '%_advance'"; // Hide advanced perms if option is not enabled
 }
@@ -342,10 +342,12 @@ if ($result) {
 			}
 		}
 
+		// Break found, it's a new module to catch
 		if (isset($obj->module) && ($oldmod <> $obj->module)) {
 			$oldmod = $obj->module;
 
 			// Break detected, we get objMod
+			$objMod = $modules[$obj->module];
 			$picto = ($objMod->picto ? $objMod->picto : 'generic');
 
 			// Show break line
@@ -436,9 +438,9 @@ if ($result) {
 			print '<td>&nbsp;</td>';
 		}
 
-		// Descrption of permission
+		// Description of permission
 		$permlabel = (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ($langs->trans("PermissionAdvanced".$obj->id) != ("PermissionAdvanced".$obj->id)) ? $langs->trans("PermissionAdvanced".$obj->id) : (($langs->trans("Permission".$obj->id) != ("Permission".$obj->id)) ? $langs->trans("Permission".$obj->id) : $langs->trans($obj->label)));
-		print '<td class="">';
+		print '<td>';
 		print $permlabel;
 		if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
 			if (preg_match('/_advance$/', $obj->perms)) {

From d070c5b75d6b3d5a918cc290fdd0b15b9ccb413c Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Tue, 15 Jun 2021 15:13:25 +0200
Subject: [PATCH 0652/1497] Fix #17930 : input boxes can be empty as previously

---
 htdocs/opensurvey/wizard/choix_date.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/opensurvey/wizard/choix_date.php b/htdocs/opensurvey/wizard/choix_date.php
index ce5f79b1174..817f3d88139 100644
--- a/htdocs/opensurvey/wizard/choix_date.php
+++ b/htdocs/opensurvey/wizard/choix_date.php
@@ -55,7 +55,7 @@ if (GETPOST('confirmation')) {
 
 				$tmphorairesi = GETPOST('horaires'.$i, 'array');
 
-				if (!is_array($tmphorairesi) || empty($tmphorairesi[$j])) {
+				if (!is_array($tmphorairesi)) {
 					$errheure[$i][$j] = true;
 					$erreur = true;
 					continue;
@@ -155,7 +155,7 @@ if (GETPOST('confirmation')) {
 			}
 		}
 
-		if (isset($errheure)) {
+		if (!empty($errheure)) {
 			setEventMessages($langs->trans("ErrorBadFormat"), null, 'errors');
 		}
 	}

From 83ec4cbd71a4cc01f35aaba88607b21f6945b0a1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 15 Jun 2021 15:19:46 +0200
Subject: [PATCH 0653/1497] Reponsive

---
 htdocs/core/lib/functions.lib.php |  2 +-
 htdocs/user/card.php              | 26 +++++++++++++-------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 16b28814f64..f238b949420 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3510,7 +3510,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'label', 'language', 'link', 'list', 'list-alt', 'listlight', 'loan', 'lot', 'long-arrow-alt-right',
 				'margin', 'map-marker-alt', 'member', 'meeting', 'money-bill-alt', 'movement', 'mrp', 'note', 'next',
 				'off', 'on', 'order',
-				'paiment', 'paragraph', 'play', 'pdf', 'phone', 'playdisabled', 'previous', 'poll', 'pos', 'printer', 'product', 'propal', 'stock', 'resize', 'service', 'stats', 'trip',
+				'paiment', 'paragraph', 'play', 'pdf', 'phone', 'phoning', 'phoning_mobile', 'phoning_fax', 'playdisabled', 'previous', 'poll', 'pos', 'printer', 'product', 'propal', 'stock', 'resize', 'service', 'stats', 'trip',
 				'security', 'setup', 'share-alt', 'sign-out', 'split', 'stripe', 'stripe-s', 'switch_off', 'switch_on', 'tools', 'unlink', 'uparrow', 'user', 'vcard', 'wrench',
 				'github', 'jabber', 'skype', 'twitter', 'facebook', 'linkedin', 'instagram', 'snapchat', 'youtube', 'google-plus-g', 'whatsapp',
 				'chevron-left', 'chevron-right', 'chevron-down', 'chevron-top', 'commercial', 'companies',
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 1404e86be9d..c872034e599 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -2157,7 +2157,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			print '<tr><td class="titlefield">'.$langs->trans("HierarchicalResponsible").'</td>';
 			print '<td>';
 			if ($caneditfield) {
-				print img_picto('', 'user').$form->select_dolusers($object->fk_user, 'fk_user', 1, array($object->id), 0, '', 0, $object->entity, 0, 0, '', 0, '', 'maxwidth300');
+				print img_picto('', 'user').$form->select_dolusers($object->fk_user, 'fk_user', 1, array($object->id), 0, '', 0, $object->entity, 0, 0, '', 0, '', 'widthcentpercentminusx maxwidth300');
 			} else {
 				print '<input type="hidden" name="fk_user" value="'.$object->fk_user.'">';
 				$huser = new User($db);
@@ -2175,7 +2175,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 				print '</td>';
 				print '<td>';
 				if ($caneditfield) {
-					print img_picto('', 'user').$form->select_dolusers($object->fk_user_expense_validator, 'fk_user_expense_validator', 1, array($object->id), 0, '', 0, $object->entity, 0, 0, '', 0, '', 'maxwidth300');
+					print img_picto('', 'user').$form->select_dolusers($object->fk_user_expense_validator, 'fk_user_expense_validator', 1, array($object->id), 0, '', 0, $object->entity, 0, 0, '', 0, '', 'widthcentpercentminusx maxwidth300');
 				} else {
 					print '<input type="hidden" name="fk_user_expense_validator" value="'.$object->fk_user_expense_validator.'">';
 					$evuser = new User($db);
@@ -2194,7 +2194,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 				print '</td>';
 				print '<td>';
 				if ($caneditfield) {
-					print img_picto('', 'user').$form->select_dolusers($object->fk_user_holiday_validator, 'fk_user_holiday_validator', 1, array($object->id), 0, '', 0, $object->entity, 0, 0, '', 0, '', 'maxwidth300');
+					print img_picto('', 'user').$form->select_dolusers($object->fk_user_holiday_validator, 'fk_user_holiday_validator', 1, array($object->id), 0, '', 0, $object->entity, 0, 0, '', 0, '', 'widthcentpercentminusx maxwidth300');
 				} else {
 					print '<input type="hidden" name="fk_user_holiday_validator" value="'.$object->fk_user_holiday_validator.'">';
 					$hvuser = new User($db);
@@ -2372,7 +2372,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			// Tel pro
 			print "<tr>".'<td>'.$langs->trans("PhonePro").'</td>';
 			print '<td>';
-			print img_picto('', 'object_phoning');
+			print img_picto('', 'phoning', 'class="pictofixedwidth"');
 			if ($caneditfield && empty($object->ldap_sid)) {
 				print '<input type="text" name="office_phone" class="flat maxwidth200" value="'.$object->office_phone.'">';
 			} else {
@@ -2384,7 +2384,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			// Tel mobile
 			print "<tr>".'<td>'.$langs->trans("PhoneMobile").'</td>';
 			print '<td>';
-			print img_picto('', 'object_phoning_mobile');
+			print img_picto('', 'phoning_mobile', 'class="pictofixedwidth"');
 			if ($caneditfield && empty($object->ldap_sid)) {
 				print '<input type="text" name="user_mobile" class="flat maxwidth200" value="'.$object->user_mobile.'">';
 			} else {
@@ -2396,7 +2396,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			// Fax
 			print "<tr>".'<td>'.$langs->trans("Fax").'</td>';
 			print '<td>';
-			print img_picto('', 'object_phoning_fax');
+			print img_picto('', 'phoning_fax', 'class="pictofixedwidth"');
 			if ($caneditfield && empty($object->ldap_sid)) {
 				print '<input type="text" name="office_fax" class="flat maxwidth200" value="'.$object->office_fax.'">';
 			} else {
@@ -2408,7 +2408,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			// EMail
 			print "<tr>".'<td'.(!empty($conf->global->USER_MAIL_REQUIRED) ? ' class="fieldrequired"' : '').'>'.$langs->trans("EMail").'</td>';
 			print '<td>';
-			print img_picto('', 'object_email');
+			print img_picto('', 'object_email', 'class="pictofixedwidth"');
 			if ($caneditfield && empty($object->ldap_sid)) {
 				print '<input class="minwidth100 maxwidth500 widthcentpercentminusx" type="text" name="email" class="flat" value="'.$object->email.'">';
 			} else {
@@ -2423,10 +2423,10 @@ if ($action == 'create' || $action == 'adduserldap') {
 						print '<tr><td>'.$langs->trans($value['label']).'</td>';
 						print '<td>';
 						if (!empty($value['icon'])) {
-							print '<span class="fa '.$value['icon'].'"></span>';
+							print '<span class="fa '.$value['icon'].' pictofixedwidth"></span>';
 						}
 						if ($caneditfield && empty($object->ldap_sid)) {
-							print '<input size="40" type="text" name="'.$key.'" class="flat" value="'.$object->socialnetworks[$key].'">';
+							print '<input type="text" name="'.$key.'" class="flat maxwidth200" value="'.$object->socialnetworks[$key].'">';
 						} else {
 							print '<input type="hidden" name="'.$key.'" value="'.$object->socialnetworks[$key].'">';
 							print $object->socialnetworks[$key];
@@ -2460,7 +2460,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 				print '<td class="titlefieldcreate">'.$langs->trans("AccountancyCode").'</td>';
 				print '<td>';
 				if ($caneditfield) {
-					print '<input size="30" type="text" class="flat" name="accountancy_code" value="'.$object->accountancy_code.'">';
+					print '<input type="text" class="flat maxwidth300" name="accountancy_code" value="'.$object->accountancy_code.'">';
 				} else {
 					print '<input type="hidden" name="accountancy_code" value="'.$object->accountancy_code.'">';
 					print $object->accountancy_code;
@@ -2493,7 +2493,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
 				print '<tr><td>'.$form->editfieldkey('Categories', 'usercats', '', $object, 0).'</td>';
 				print '<td>';
-				print img_picto('', 'category');
+				print img_picto('', 'category', 'class="pictofixedwidth"');
 				$cate_arbo = $form->select_all_categories(Categorie::TYPE_USER, null, null, null, null, 1);
 				$c = new Categorie($db);
 				$cats = $c->containing($object->id, Categorie::TYPE_USER);
@@ -2511,7 +2511,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			// Default language
 			if (!empty($conf->global->MAIN_MULTILANGS)) {
 				print '<tr><td>'.$form->editfieldkey('DefaultLang', 'default_lang', '', $object, 0, 'string', '', 0, 0, 'id', $langs->trans("WarningNotLangOfInterface", $langs->transnoentitiesnoconv("UserGUISetup"))).'</td><td colspan="3">'."\n";
-				print img_picto('', 'language').$formadmin->select_language($object->lang, 'default_lang', 0, 0, 1);
+				print img_picto('', 'language', 'class="pictofixedwidth"').$formadmin->select_language($object->lang, 'default_lang', 0, null, '1', 0, 0, 'widthcentpercentminusx maxwidth300');
 				print '</td>';
 				print '</tr>';
 			}
@@ -2623,7 +2623,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			print '<tr><td class="titlefieldcreate">'.$langs->trans("PostOrFunction").'</td>';
 			print '<td>';
 			if ($caneditfield) {
-				print '<input size="30" type="text" name="job" value="'.dol_escape_htmltag($object->job).'">';
+				print '<input type="text" class="maxwidth300" name="job" value="'.dol_escape_htmltag($object->job).'">';
 			} else {
 				print '<input type="hidden" name="job" value="'.dol_escape_htmltag($object->job).'">';
 				print dol_escape_htmltag($object->job);

From 162da2a5b1633142a8d9d840425da5d24dceff64 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 15 Jun 2021 15:24:12 +0200
Subject: [PATCH 0654/1497] css

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

diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index c872034e599..94ed01d2d1b 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -2623,7 +2623,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			print '<tr><td class="titlefieldcreate">'.$langs->trans("PostOrFunction").'</td>';
 			print '<td>';
 			if ($caneditfield) {
-				print '<input type="text" class="maxwidth300" name="job" value="'.dol_escape_htmltag($object->job).'">';
+				print '<input type="text" class="minwidth300 maxwidth500" name="job" value="'.dol_escape_htmltag($object->job).'">';
 			} else {
 				print '<input type="hidden" name="job" value="'.dol_escape_htmltag($object->job).'">';
 				print dol_escape_htmltag($object->job);

From 674bd53b324f2cf2aaae6398cf4e23593b23cd60 Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Tue, 15 Jun 2021 16:11:25 +0200
Subject: [PATCH 0655/1497] Fix #17907 : import of the undefined function

---
 htdocs/public/recruitment/view.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/public/recruitment/view.php b/htdocs/public/recruitment/view.php
index 2fe6a9af21e..2133ef605f6 100644
--- a/htdocs/public/recruitment/view.php
+++ b/htdocs/public/recruitment/view.php
@@ -39,6 +39,7 @@ require_once DOL_DOCUMENT_ROOT.'/recruitment/class/recruitmentjobposition.class.
 require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/security.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array("companies", "other", "recruitment"));
@@ -75,7 +76,7 @@ if (!$action) {
 $urlwithroot = DOL_MAIN_URL_ROOT; // This is to use same domain name than current. For Paypal payment, we can use internal URL like localhost.
 
 // Security check
-if (empty($conf->recruitement->enabled)) {
+if (empty($conf->recruitment->enabled)) {
 	accessforbidden('', 0, 0, 1);
 }
 

From d0173044acbd48e21951ce4779bd2f782a579d6e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 15 Jun 2021 16:18:15 +0200
Subject: [PATCH 0656/1497] css

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

diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index ee7adeff3be..a3b69d1dff8 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -681,10 +681,10 @@ if (!empty($arrayfields['u.accountancy_code']['checked'])) {
 	print '<td class="liste_titre"><input type="text" name="search_accountancy_code" class="maxwidth50" value="'.$search_accountancy_code.'"></td>';
 }
 if (!empty($arrayfields['u.office_phone']['checked'])) {
-	print '<td class="liste_titre"><input type="text" name="search_phonepro" class="maxwidth75" value="'.$search_phonepro.'"></td>';
+	print '<td class="liste_titre"><input type="text" name="search_phonepro" class="maxwidth50" value="'.$search_phonepro.'"></td>';
 }
 if (!empty($arrayfields['u.user_mobile']['checked'])) {
-	print '<td class="liste_titre"><input type="text" name="search_phonemobile" class="maxwidth75" value="'.$search_phonemobile.'"></td>';
+	print '<td class="liste_titre"><input type="text" name="search_phonemobile" class="maxwidth50" value="'.$search_phonemobile.'"></td>';
 }
 if (!empty($arrayfields['u.email']['checked'])) {
 	print '<td class="liste_titre"><input type="text" name="search_email" class="maxwidth75" value="'.$search_email.'"></td>';

From f6274b84189bfd677996faa8d05bf05cf5b0e02b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 15 Jun 2021 16:29:42 +0200
Subject: [PATCH 0657/1497] Fix nb of holidays can be float

---
 htdocs/holiday/class/holiday.class.php | 10 +++++-----
 htdocs/holiday/define_holiday.php      |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index 76ea8555d85..e1a9d9d905b 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -1393,7 +1393,7 @@ class Holiday extends CommonObject
 	 *	Met à jour le timestamp de la dernière mise à jour du solde des CP
 	 *
 	 *	@param		int		$userID		Id of user
-	 *	@param		int		$nbHoliday	Nb of days
+	 *	@param		float	$nbHoliday	Nb of days
 	 *  @param		int		$fk_type	Type of vacation
 	 *  @return     int					0=Nothing done, 1=OK, -1=KO
 	 */
@@ -1477,7 +1477,7 @@ class Holiday extends CommonObject
 				if ($num > 0) {
 					// Update for user
 					$sql = "UPDATE ".MAIN_DB_PREFIX."holiday_users SET";
-					$sql .= " nb_holiday = ".((int) $nbHoliday);
+					$sql .= " nb_holiday = ".((float) $nbHoliday);
 					$sql .= " WHERE fk_user = ".(int) $userID." AND fk_type = ".(int) $fk_type;
 					$result = $this->db->query($sql);
 					if (!$result) {
@@ -1487,7 +1487,7 @@ class Holiday extends CommonObject
 				} else {
 					// Insert for user
 					$sql = "INSERT INTO ".MAIN_DB_PREFIX."holiday_users(nb_holiday, fk_user, fk_type) VALUES (";
-					$sql .= ((int) $nbHoliday);
+					$sql .= ((float) $nbHoliday);
 					$sql .= ", ".(int) $userID.", ".(int) $fk_type.")";
 					$result = $this->db->query($sql);
 					if (!$result) {
@@ -1955,8 +1955,8 @@ class Holiday extends CommonObject
 		$sql .= " ".((int) $fk_user_action).",";
 		$sql .= " ".((int) $fk_user_update).",";
 		$sql .= " '".$this->db->escape($label)."',";
-		$sql .= " '".$this->db->escape($prev_solde)."',";
-		$sql .= " '".$this->db->escape($new_solde)."',";
+		$sql .= " ".((float) $prev_solde).",";
+		$sql .= " ".((float) $new_solde).",";
 		$sql .= " ".((int) $fk_type);
 		$sql .= ")";
 
diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php
index b3d2c25adda..5daedf98ff5 100644
--- a/htdocs/holiday/define_holiday.php
+++ b/htdocs/holiday/define_holiday.php
@@ -126,16 +126,16 @@ if (empty($reshook)) {
 	*/
 
 	// Si il y a une action de mise à jour
-	if ($action == 'update' && isset($_POST['update_cp'])) {
+	if ($action == 'update' && GETPOSTISSET('update_cp')) {
 		$error = 0;
 
 		$typeleaves = $holiday->getTypes(1, 1);
 
-		$userID = array_keys($_POST['update_cp']);
+		$userID = array_keys(GETPOST('update_cp'));
 		$userID = $userID[0];
 
 		foreach ($typeleaves as $key => $val) {
-			$userValue = $_POST['nb_holiday_'.$val['rowid']];
+			$userValue = GETPOST('nb_holiday_'.$val['rowid']);
 			$userValue = $userValue[$userID];
 
 			if (!empty($userValue) || (string) $userValue == '0') {

From adfbb9d7d598a2ee4a2df4146da0088749ae466c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 15 Jun 2021 17:53:25 +0200
Subject: [PATCH 0658/1497] Fix VAT column missing

---
 htdocs/compta/accounting-files.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/compta/accounting-files.php b/htdocs/compta/accounting-files.php
index 68c73c84090..fa42a73e656 100644
--- a/htdocs/compta/accounting-files.php
+++ b/htdocs/compta/accounting-files.php
@@ -170,7 +170,7 @@ if (($action == 'searchfiles' || $action == 'dl')) {
 			if (!empty($sql)) {
 				$sql .= " UNION ALL";
 			}
-			$sql .= "SELECT t.rowid as id, t.entity, t.ref, t.paye as paid, t.total_ht, t.total_ttc, t.total_tva, t.multicurrency_code as currency, t.fk_soc, t.datef as date, t.date_lim_reglement as date_due, 'Invoice' as item, s.nom as thirdparty_name, s.code_client as thirdparty_code, c.code as country_code, s.tva_intra as vatnum, ".PAY_CREDIT." as sens";
+			$sql .= "SELECT t.rowid as id, t.entity, t.ref, t.paye as paid, t.total_ht, t.total_ttc, t.total_tva as total_vat, t.multicurrency_code as currency, t.fk_soc, t.datef as date, t.date_lim_reglement as date_due, 'Invoice' as item, s.nom as thirdparty_name, s.code_client as thirdparty_code, c.code as country_code, s.tva_intra as vatnum, ".PAY_CREDIT." as sens";
 			$sql .= " FROM ".MAIN_DB_PREFIX."facture as t LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = t.fk_soc LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON c.rowid = s.fk_pays";
 			$sql .= " WHERE datef between ".$wheretail;
 			$sql .= " AND t.entity IN (".$db->sanitize($entity == 1 ? '0,1' : $entity).')';

From f79e16e3b102a2ad570be1bd3cd1858292f3e5b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Tue, 15 Jun 2021 19:08:08 +0200
Subject: [PATCH 0659/1497] replace recruitement by recruitment

---
 htdocs/public/recruitment/index.php                  | 2 +-
 htdocs/public/recruitment/view.php                   | 2 +-
 htdocs/recruitment/admin/candidature_extrafields.php | 2 +-
 htdocs/recruitment/admin/jobposition_extrafields.php | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/public/recruitment/index.php b/htdocs/public/recruitment/index.php
index cf7e8f8bc24..f3d84ec996f 100644
--- a/htdocs/public/recruitment/index.php
+++ b/htdocs/public/recruitment/index.php
@@ -56,7 +56,7 @@ $email = GETPOST('email', 'alpha');
 $object = new RecruitmentJobPosition($db);
 
 // Security check
-if (empty($conf->recruitement->enabled)) {
+if (empty($conf->recruitment->enabled)) {
 	accessforbidden('', 0, 0, 1);
 }
 
diff --git a/htdocs/public/recruitment/view.php b/htdocs/public/recruitment/view.php
index 2fe6a9af21e..6eda22b951d 100644
--- a/htdocs/public/recruitment/view.php
+++ b/htdocs/public/recruitment/view.php
@@ -75,7 +75,7 @@ if (!$action) {
 $urlwithroot = DOL_MAIN_URL_ROOT; // This is to use same domain name than current. For Paypal payment, we can use internal URL like localhost.
 
 // Security check
-if (empty($conf->recruitement->enabled)) {
+if (empty($conf->recruitment->enabled)) {
 	accessforbidden('', 0, 0, 1);
 }
 
diff --git a/htdocs/recruitment/admin/candidature_extrafields.php b/htdocs/recruitment/admin/candidature_extrafields.php
index 1f0ac538d0b..efb68e5ff2c 100644
--- a/htdocs/recruitment/admin/candidature_extrafields.php
+++ b/htdocs/recruitment/admin/candidature_extrafields.php
@@ -26,7 +26,7 @@ require_once DOL_DOCUMENT_ROOT.'/recruitment/lib/recruitment.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array('recruitement', 'admin'));
+$langs->loadLangs(array('recruitment', 'admin'));
 
 $extrafields = new ExtraFields($db);
 $form = new Form($db);
diff --git a/htdocs/recruitment/admin/jobposition_extrafields.php b/htdocs/recruitment/admin/jobposition_extrafields.php
index 3b17322d5eb..d1b0651da64 100644
--- a/htdocs/recruitment/admin/jobposition_extrafields.php
+++ b/htdocs/recruitment/admin/jobposition_extrafields.php
@@ -26,7 +26,7 @@ require_once DOL_DOCUMENT_ROOT.'/recruitment/lib/recruitment.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array('recruitement', 'admin'));
+$langs->loadLangs(array('recruitment', 'admin'));
 
 $extrafields = new ExtraFields($db);
 $form = new Form($db);

From 3a5770f6795050e1352eaef6c86df35cd6737f85 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 15 Jun 2021 20:16:05 +0200
Subject: [PATCH 0660/1497] Clean code

---
 htdocs/admin/ldap.php               |  2 ++
 htdocs/admin/ldap_contacts.php      |  8 +++++---
 htdocs/admin/ldap_groups.php        | 15 ++++++++++-----
 htdocs/admin/ldap_members.php       |  9 ++++++---
 htdocs/admin/ldap_members_types.php | 10 +++++++---
 htdocs/admin/ldap_users.php         |  9 ++++++---
 htdocs/core/class/ldap.class.php    |  5 +++++
 htdocs/user/card.php                |  7 ++++---
 8 files changed, 45 insertions(+), 20 deletions(-)

diff --git a/htdocs/admin/ldap.php b/htdocs/admin/ldap.php
index 18399894ad0..26f0c28172f 100644
--- a/htdocs/admin/ldap.php
+++ b/htdocs/admin/ldap.php
@@ -255,11 +255,13 @@ print '<td colspan="3">'.$langs->trans("ForANonAnonymousAccess").'</td>';
 print "</tr>\n";
 
 // DNAdmin
+print '<!-- LDAP_ADMIN_DN -->';
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPAdminDn").'</td><td>';
 print '<input size="25" type="text" name="admin" value="'.$conf->global->LDAP_ADMIN_DN.'">';
 print '</td><td>'.$langs->trans("LDAPAdminDnExample").'</td></tr>';
 
 // Pass
+print '<!-- LDAP_ADMIN_PASS -->';
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPPassword").'</td><td>';
 if (!empty($conf->global->LDAP_ADMIN_PASS)) {
 	print '<input size="25" type="password" name="pass" value="'.$conf->global->LDAP_ADMIN_PASS.'">'; // je le met en visible pour test
diff --git a/htdocs/admin/ldap_contacts.php b/htdocs/admin/ldap_contacts.php
index d21c95405a2..4fb58898a07 100644
--- a/htdocs/admin/ldap_contacts.php
+++ b/htdocs/admin/ldap_contacts.php
@@ -155,14 +155,16 @@ print '<td colspan="4">'.$langs->trans("LDAPSynchronizeContacts").'</td>';
 print "</tr>\n";
 
 // DN Pour les contacts
-print '<tr class="oddeven"><td width="25%"><span class="fieldrequired">'.$langs->trans("LDAPContactDn").'</span></td><td>';
+print '<!-- LDAP_CONTACT_DN -->';
+print '<tr class="oddeven"><td><span class="fieldrequired">'.$langs->trans("LDAPContactDn").'</span></td><td>';
 print '<input size="48" type="text" name="contactdn" value="'.$conf->global->LDAP_CONTACT_DN.'">';
 print '</td><td>'.$langs->trans("LDAPContactDnExample").'</td>';
 print '<td>&nbsp;</td>';
 print '</tr>';
 
 // List of object class used to define attributes in structure
-print '<tr class="oddeven"><td width="25%"><span class="fieldrequired">'.$langs->trans("LDAPContactObjectClassList").'</span></td><td>';
+print '<!-- LDAP_CONTACT_OBJECT_CLASS -->';
+print '<tr class="oddeven"><td><span class="fieldrequired">'.$langs->trans("LDAPContactObjectClassList").'</span></td><td>';
 print '<input size="48" type="text" name="objectclass" value="'.$conf->global->LDAP_CONTACT_OBJECT_CLASS.'">';
 print '</td><td>'.$langs->trans("LDAPContactObjectClassListExample").'</td>';
 print '<td>&nbsp;</td>';
@@ -173,7 +175,7 @@ print '<br>';
 print '<table class="noborder centpercent">';
 
 print '<tr class="liste_titre">';
-print '<td width="25%">'.$langs->trans("LDAPDolibarrMapping").'</td>';
+print '<td>'.$langs->trans("LDAPDolibarrMapping").'</td>';
 print '<td colspan="2">'.$langs->trans("LDAPLdapMapping").'</td>';
 print '<td class="right">'.$langs->trans("LDAPNamingAttribute").'</td>';
 print "</tr>\n";
diff --git a/htdocs/admin/ldap_groups.php b/htdocs/admin/ldap_groups.php
index 13532474681..19d24ecd5db 100644
--- a/htdocs/admin/ldap_groups.php
+++ b/htdocs/admin/ldap_groups.php
@@ -99,6 +99,8 @@ if ($action == 'setvalue' && $user->admin) {
  * View
  */
 
+$form = new Form($db);
+
 llxHeader('', $langs->trans("LDAPSetup"), 'EN:Module_LDAP_En|FR:Module_LDAP|ES:M&oacute;dulo_LDAP');
 $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
 
@@ -121,8 +123,6 @@ print '<br>';
 print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?action=setvalue">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 
-$form = new Form($db);
-
 print '<table class="noborder centpercent">';
 
 print '<tr class="liste_titre">';
@@ -130,20 +130,23 @@ print '<td colspan="4">'.$langs->trans("LDAPSynchronizeGroups").'</td>';
 print "</tr>\n";
 
 // DN pour les groupes
-print '<tr class="oddeven"><td width="25%"><span class="fieldrequired">'.$langs->trans("LDAPGroupDn").'</span></td><td>';
+print '<!-- LDAP_GROUP_DN -->';
+print '<tr class="oddeven"><td><span class="fieldrequired">'.$langs->trans("LDAPGroupDn").'</span></td><td>';
 print '<input size="48" type="text" name="group" value="'.$conf->global->LDAP_GROUP_DN.'">';
 print '</td><td>'.$langs->trans("LDAPGroupDnExample").'</td>';
 print '<td>&nbsp;</td>';
 print '</tr>';
 
 // List of object class used to define attributes in structure
-print '<tr class="oddeven"><td width="25%"><span class="fieldrequired">'.$langs->trans("LDAPGroupObjectClassList").'</span></td><td>';
+print '<!-- LDAP_GROUP_OBJECT_CLASS -->';
+print '<tr class="oddeven"><td><span class="fieldrequired">'.$langs->trans("LDAPGroupObjectClassList").'</span></td><td>';
 print '<input size="48" type="text" name="objectclass" value="'.$conf->global->LDAP_GROUP_OBJECT_CLASS.'">';
 print '</td><td>'.$langs->trans("LDAPGroupObjectClassListExample").'</td>';
 print '<td>&nbsp;</td>';
 print '</tr>';
 
 // Filter, used to filter search
+print '<!-- LDAP_GROUP_FILTER -->';
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFilterConnection").'</td><td>';
 print '<input size="48" type="text" name="filter" value="'.$conf->global->LDAP_GROUP_FILTER.'">';
 print '</td><td>'.$langs->trans("LDAPGroupFilterExample").'</td>';
@@ -151,11 +154,13 @@ print '<td></td>';
 print '</tr>';
 
 print '</table>';
+
 print '<br>';
+
 print '<table class="noborder centpercent">';
 
 print '<tr class="liste_titre">';
-print '<td width="25%">'.$langs->trans("LDAPDolibarrMapping").'</td>';
+print '<td>'.$langs->trans("LDAPDolibarrMapping").'</td>';
 print '<td colspan="2">'.$langs->trans("LDAPLdapMapping").'</td>';
 print '<td class="right">'.$langs->trans("LDAPNamingAttribute").'</td>';
 print "</tr>\n";
diff --git a/htdocs/admin/ldap_members.php b/htdocs/admin/ldap_members.php
index d64628516ca..ab1af5fcf16 100644
--- a/htdocs/admin/ldap_members.php
+++ b/htdocs/admin/ldap_members.php
@@ -200,20 +200,23 @@ print '<td colspan="4">'.$langs->trans("LDAPSynchronizeMembers").'</td>';
 print "</tr>\n";
 
 // DN Pour les adherents
-print '<tr class="oddeven"><td width="25%"><span class="fieldrequired">'.$langs->trans("LDAPMemberDn").'</span></td><td>';
+print '<!-- LDAP_MEMBER_DN -->';
+print '<tr class="oddeven"><td><span class="fieldrequired">'.$langs->trans("LDAPMemberDn").'</span></td><td>';
 print '<input size="48" type="text" name="user" value="'.$conf->global->LDAP_MEMBER_DN.'">';
 print '</td><td>'.$langs->trans("LDAPMemberDnExample").'</td>';
 print '<td>&nbsp;</td>';
 print '</tr>';
 
 // List of object class used to define attributes in structure
-print '<tr class="oddeven"><td width="25%"><span class="fieldrequired">'.$langs->trans("LDAPMemberObjectClassList").'</span></td><td>';
+print '<!-- LDAP_MEMBER_OBJECT_CLASS -->';
+print '<tr class="oddeven"><td><span class="fieldrequired">'.$langs->trans("LDAPMemberObjectClassList").'</span></td><td>';
 print '<input size="48" type="text" name="objectclass" value="'.$conf->global->LDAP_MEMBER_OBJECT_CLASS.'">';
 print '</td><td>'.$langs->trans("LDAPMemberObjectClassListExample").'</td>';
 print '<td>&nbsp;</td>';
 print '</tr>';
 
 // Filter, used to filter search
+print '<!-- LDAP_MEMBER_FILTER -->';
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFilterConnection").'</td><td>';
 print '<input size="48" type="text" name="filterconnection" value="'.$conf->global->LDAP_MEMBER_FILTER.'">';
 print '</td><td>'.$langs->trans("LDAPFilterConnectionExample").'</td>';
@@ -225,7 +228,7 @@ print '<br>';
 print '<table class="noborder centpercent">';
 
 print '<tr class="liste_titre">';
-print '<td width="25%">'.$langs->trans("LDAPDolibarrMapping").'</td>';
+print '<td>'.$langs->trans("LDAPDolibarrMapping").'</td>';
 print '<td colspan="2">'.$langs->trans("LDAPLdapMapping").'</td>';
 print '<td class="right">'.$langs->trans("LDAPNamingAttribute").'</td>';
 print "</tr>\n";
diff --git a/htdocs/admin/ldap_members_types.php b/htdocs/admin/ldap_members_types.php
index 75ed864ecf0..ae4a1794f35 100644
--- a/htdocs/admin/ldap_members_types.php
+++ b/htdocs/admin/ldap_members_types.php
@@ -124,25 +124,29 @@ print '<td colspan="4">'.$langs->trans("LDAPSynchronizeMembersTypes").'</td>';
 print "</tr>\n";
 
 // DN pour les types de membres
-print '<tr class="oddeven"><td width="25%"><span class="fieldrequired">'.$langs->trans("LDAPMemberTypeDn").'</span></td><td>';
+print '<!-- LDAP_MEMBER_TYPE_DN -->';
+print '<tr class="oddeven"><td><span class="fieldrequired">'.$langs->trans("LDAPMemberTypeDn").'</span></td><td>';
 print '<input size="48" type="text" name="membertype" value="'.$conf->global->LDAP_MEMBER_TYPE_DN.'">';
 print '</td><td>'.$langs->trans("LDAPMemberTypepDnExample").'</td>';
 print '<td>&nbsp;</td>';
 print '</tr>';
 
 // List of object class used to define attributes in structure
-print '<tr class="oddeven"><td width="25%"><span class="fieldrequired">'.$langs->trans("LDAPMemberTypeObjectClassList").'</span></td><td>';
+print '<!-- LDAP_MEMBER_TYPE_OBJECT_CLASS -->';
+print '<tr class="oddeven"><td><span class="fieldrequired">'.$langs->trans("LDAPMemberTypeObjectClassList").'</span></td><td>';
 print '<input size="48" type="text" name="objectclass" value="'.$conf->global->LDAP_MEMBER_TYPE_OBJECT_CLASS.'">';
 print '</td><td>'.$langs->trans("LDAPMemberTypeObjectClassListExample").'</td>';
 print '<td>&nbsp;</td>';
 print '</tr>';
 
 print '</table>';
+
 print '<br>';
+
 print '<table class="noborder centpercent">';
 
 print '<tr class="liste_titre">';
-print '<td width="25%">'.$langs->trans("LDAPDolibarrMapping").'</td>';
+print '<td>'.$langs->trans("LDAPDolibarrMapping").'</td>';
 print '<td colspan="2">'.$langs->trans("LDAPLdapMapping").'</td>';
 print '<td class="right">'.$langs->trans("LDAPNamingAttribute").'</td>';
 print "</tr>\n";
diff --git a/htdocs/admin/ldap_users.php b/htdocs/admin/ldap_users.php
index 7e53eebc9ce..6e38eb2564e 100644
--- a/htdocs/admin/ldap_users.php
+++ b/htdocs/admin/ldap_users.php
@@ -190,20 +190,23 @@ print '<td colspan="4">'.$langs->trans("LDAPSynchronizeUsers").'</td>';
 print "</tr>\n";
 
 // DN Pour les utilisateurs
-print '<tr class="oddeven"><td width="25%"><span class="fieldrequired">'.$langs->trans("LDAPUserDn").'</span></td><td>';
+print '<!-- LDAP_USER_DN -->';
+print '<tr class="oddeven"><td><span class="fieldrequired">'.$langs->trans("LDAPUserDn").'</span></td><td>';
 print '<input size="48" type="text" name="user" value="'.$conf->global->LDAP_USER_DN.'">';
 print '</td><td>'.$langs->trans("LDAPUserDnExample").'</td>';
 print '<td>&nbsp;</td>';
 print '</tr>';
 
 // List of object class used to define attributes in structure
-print '<tr class="oddeven"><td width="25%"><span class="fieldrequired">'.$langs->trans("LDAPUserObjectClassList").'</span></td><td>';
+print '<!-- LDAP_USER_OBJECT_CLASS -->';
+print '<tr class="oddeven"><td><span class="fieldrequired">'.$langs->trans("LDAPUserObjectClassList").'</span></td><td>';
 print '<input size="48" type="text" name="objectclass" value="'.$conf->global->LDAP_USER_OBJECT_CLASS.'">';
 print '</td><td>'.$langs->trans("LDAPUserObjectClassListExample").'</td>';
 print '<td>&nbsp;</td>';
 print '</tr>';
 
 // Filter, used to filter search
+print '<!-- LDAP_FILTER_CONNECTION -->';
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFilterConnection").'</td><td>';
 print '<input size="48" type="text" name="filterconnection" value="'.$conf->global->LDAP_FILTER_CONNECTION.'">';
 print '</td><td>'.$langs->trans("LDAPFilterConnectionExample").'</td>';
@@ -215,7 +218,7 @@ print '<br>';
 print '<table class="noborder centpercent">';
 
 print '<tr class="liste_titre">';
-print '<td width="25%">'.$langs->trans("LDAPDolibarrMapping").'</td>';
+print '<td>'.$langs->trans("LDAPDolibarrMapping").'</td>';
 print '<td colspan="2">'.$langs->trans("LDAPLdapMapping").'</td>';
 print '<td class="right">'.$langs->trans("LDAPNamingAttribute").'</td>';
 print "</tr>\n";
diff --git a/htdocs/core/class/ldap.class.php b/htdocs/core/class/ldap.class.php
index a578f08f3c1..78ac3e9c089 100644
--- a/htdocs/core/class/ldap.class.php
+++ b/htdocs/core/class/ldap.class.php
@@ -22,6 +22,10 @@
 /**
  *	\file 		htdocs/core/class/ldap.class.php
  *	\brief 		File of class to manage LDAP features
+ *
+ *  Note:
+ *  LDAP_ESCAPE_FILTER is to escape char  array('\\', '*', '(', ')', "\x00")
+ *  LDAP_ESCAPE_DN is to escape char  array('\\', ',', '=', '+', '<', '>', ';', '"', '#')
  */
 
 /**
@@ -132,6 +136,7 @@ class Ldap
 		$this->ldapProtocolVersion = $conf->global->LDAP_SERVER_PROTOCOLVERSION;
 		$this->dn                  = $conf->global->LDAP_SERVER_DN;
 		$this->serverType          = $conf->global->LDAP_SERVER_TYPE;
+
 		$this->domain              = $conf->global->LDAP_SERVER_DN;
 		$this->searchUser          = $conf->global->LDAP_ADMIN_DN;
 		$this->searchPassword      = $conf->global->LDAP_ADMIN_PASS;
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 94ed01d2d1b..135e2072fdf 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -139,7 +139,7 @@ if ($reshook < 0) {
 
 if (empty($reshook)) {
 	if ($action == 'confirm_disable' && $confirm == "yes" && $candisableuser) {
-		if ($id <> $user->id) {		// A user can't disable itself
+		if ($id != $user->id) {		// A user can't disable itself
 			$object->fetch($id);
 			if ($object->admin && empty($user->admin)) {
 				// If user to delete is an admin user and if logged user is not admin, we deny the operation.
@@ -152,10 +152,11 @@ if (empty($reshook)) {
 			}
 		}
 	}
+
 	if ($action == 'confirm_enable' && $confirm == "yes" && $candisableuser) {
 		$error = 0;
 
-		if ($id <> $user->id) {
+		if ($id != $user->id) {
 			$object->fetch($id);
 
 			if (!empty($conf->file->main_limit_users)) {
@@ -175,7 +176,7 @@ if (empty($reshook)) {
 	}
 
 	if ($action == 'confirm_delete' && $confirm == "yes" && $candisableuser) {
-		if ($id <> $user->id) {
+		if ($id != $user->id) {
 			if (!GETPOSTISSET('token')) {
 				print 'Error, token required for this critical operation';
 				exit;

From 1c87420895f1cd8f2126bdad007bbb12164c61d7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 15 Jun 2021 20:22:36 +0200
Subject: [PATCH 0661/1497] Fix #yogosha6411

---
 htdocs/core/class/ldap.class.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/class/ldap.class.php b/htdocs/core/class/ldap.class.php
index 78ac3e9c089..a2e5d450869 100644
--- a/htdocs/core/class/ldap.class.php
+++ b/htdocs/core/class/ldap.class.php
@@ -958,7 +958,7 @@ class Ldap
 		}
 
 		// Define filter
-		if (!empty($activefilter)) {
+		if (!empty($activefilter)) {	// Use a predefined trusted filter (defined into setup by admin).
 			if (((string) $activefilter == '1' || (string) $activefilter == 'user') && $this->filter) {
 				$filter = '('.$this->filter.')';
 			} elseif (((string) $activefilter == 'group') && $this->filtergroup ) {
@@ -966,11 +966,11 @@ class Ldap
 			} elseif (((string) $activefilter == 'member') && $this->filter) {
 				$filter = '('.$this->filtermember.')';
 			} else {
-				// If this->filter is empty, make fiter on * (all)
-				$filter = '('.$useridentifier.'=*)';
+				// If this->filter/this->filtergroup is empty, make fiter on * (all)
+				$filter = '('.ldap_escape($useridentifier, '', LDAP_ESCAPE_FILTER).'=*)';
 			}
-		} else {
-			$filter = '('.$useridentifier.'='.$search.')';
+		} else {						// Use a filter forged using the $search value
+			$filter = '('.ldap_escape($useridentifier, '', LDAP_ESCAPE_FILTER).'='.ldap_escape($search, '', LDAP_ESCAPE_FILTER).')';
 		}
 
 		if (is_array($attributeArray)) {

From 78f41bf60e4ae95a9b3978cfc5d2a60e2b97a5ce Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 15 Jun 2021 22:04:31 +0200
Subject: [PATCH 0662/1497] Update card.php

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

diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index 85e88ce012c..8a571ace839 100644
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -1305,10 +1305,14 @@ elseif (empty($action) || $action == 'view' || $action == 'addlink' || $action =
 			$newlang = '';
 			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
 				$newlang = GETPOST('lang_id', 'aZ09');
-			}
-			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && is_object($object->thirdparty)) {
+			} elseif ($conf->global->MAIN_MULTILANGS && empty($newlang) && is_object($object->thirdparty)) {
 				$newlang = $object->thirdparty->default_lang;
 			}
+			if (!empty($newlang)) {
+				$outputlangs = new Translate("", $conf);
+				$outputlangs->setDefaultLang($newlang);
+			}
+			
 			$arrayoffamiliestoexclude = array('objectamount');
 
 			$action = 'add_message'; // action to use to post the message

From 5ddf12b29c0eab546d9f53972a977feebce08558 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 15 Jun 2021 22:06:26 +0200
Subject: [PATCH 0663/1497] Fix set language

---
 htdocs/core/actions_massactions.inc.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index 3cbcd30af7f..60b386ce083 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -956,8 +956,11 @@ if (!$error && $massaction == "builddoc" && $permissiontoread && !GETPOST('butto
 	// Define output language (Here it is not used because we do only merging existing PDF)
 	$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 = $objecttmp->thirdparty->default_lang;
+	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
+		$newlang = GETPOST('lang_id', 'aZ09');
+	} elseif ($conf->global->MAIN_MULTILANGS && empty($newlang) && is_object($objecttmp->thirdparty)) {
+		$newlang = $objecttmp->thirdparty->default_lang;
+	}
 	if (!empty($newlang)) {
 		$outputlangs = new Translate("", $conf);
 		$outputlangs->setDefaultLang($newlang);

From 26cae49fafb59deb74d4938c63acaadb8ebc00ec Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Tue, 15 Jun 2021 20:06:48 +0000
Subject: [PATCH 0664/1497] Fixing style errors.

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

diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index 8a571ace839..687aca67378 100644
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -1312,7 +1312,7 @@ elseif (empty($action) || $action == 'view' || $action == 'addlink' || $action =
 				$outputlangs = new Translate("", $conf);
 				$outputlangs->setDefaultLang($newlang);
 			}
-			
+
 			$arrayoffamiliestoexclude = array('objectamount');
 
 			$action = 'add_message'; // action to use to post the message

From 2a3b330e1ef03a0f6989df30be4dfe1683565f38 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 15 Jun 2021 22:10:59 +0200
Subject: [PATCH 0665/1497] Fix newToken()

---
 htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php | 2 +-
 htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php   | 2 +-
 htdocs/core/tpl/admin_extrafields_add.tpl.php                | 2 +-
 htdocs/core/tpl/contacts.tpl.php                             | 4 ++--
 htdocs/core/tpl/passwordforgotten.tpl.php                    | 2 +-
 htdocs/product/canvas/product/tpl/card_create.tpl.php        | 2 +-
 htdocs/product/canvas/product/tpl/card_edit.tpl.php          | 2 +-
 htdocs/product/canvas/service/tpl/card_create.tpl.php        | 2 +-
 htdocs/product/canvas/service/tpl/card_edit.tpl.php          | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php b/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php
index 98a66e499b9..14186afbff1 100644
--- a/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php
+++ b/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php
@@ -40,7 +40,7 @@ echo $this->control->tpl['ajax_selectcountry']; ?>
 <br>
 
 <form method="post" name="formsoc" action="<?php echo $_SERVER["PHP_SELF"]; ?>">
-<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>">
+<input type="hidden" name="token" value="<?php echo newToken(); ?>">
 <input type="hidden" name="canvas" value="<?php echo $canvas ?>">
 <input type="hidden" name="action" value="add">
 <?php if ($this->control->tpl['company_id']) { ?>
diff --git a/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php b/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php
index 2c82a868ed4..a9cd393866b 100644
--- a/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php
+++ b/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php
@@ -40,7 +40,7 @@ echo $this->control->tpl['ajax_selectcountry'];
 <br>
 
 <form method="post" name="formsoc" action="<?php echo $_SERVER["PHP_SELF"].'?id='.GETPOST('id', 'int'); ?>">
-<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>">
+<input type="hidden" name="token" value="<?php echo newToken(); ?>">
 <input type="hidden" name="canvas" value="<?php echo $canvas ?>">
 <input type="hidden" name="id" value="<?php echo GETPOST('id', 'int'); ?>">
 <input type="hidden" name="action" value="update">
diff --git a/htdocs/core/tpl/admin_extrafields_add.tpl.php b/htdocs/core/tpl/admin_extrafields_add.tpl.php
index 2a9438f4413..657e29dc8f1 100644
--- a/htdocs/core/tpl/admin_extrafields_add.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_add.tpl.php
@@ -141,7 +141,7 @@ $listofexamplesforlink = 'Societe:societe/class/societe.class.php<br>Contact:con
 </script>
 
 <form action="<?php echo $_SERVER["PHP_SELF"]; ?>" method="post">
-<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>">
+<input type="hidden" name="token" value="<?php echo newToken(); ?>">
 <input type="hidden" name="action" value="add">
 
 <?php print dol_get_fiche_head(); ?>
diff --git a/htdocs/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php
index a1abc3a9240..7ea32370fcd 100644
--- a/htdocs/core/tpl/contacts.tpl.php
+++ b/htdocs/core/tpl/contacts.tpl.php
@@ -96,7 +96,7 @@ if ($permission)
 	{
 		?>
 	<form class="tagtr impair nohover" action="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id; ?>" method="POST">
-	<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>" />
+	<input type="hidden" name="token" value="<?php echo newToken(); ?>" />
 	<input type="hidden" name="id" value="<?php echo $object->id; ?>" />
 	<input type="hidden" name="action" value="addcontact" />
 	<input type="hidden" name="source" value="internal" />
@@ -121,7 +121,7 @@ if ($permission)
 		?>
 
 	<form class="tagtr pair nohover" action="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id; ?>" method="POST">
-	<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>" />
+	<input type="hidden" name="token" value="<?php echo newToken(); ?>" />
 	<input type="hidden" name="id" value="<?php echo $object->id; ?>" />
 	<input type="hidden" name="action" value="addcontact" />
 	<input type="hidden" name="source" value="external" />
diff --git a/htdocs/core/tpl/passwordforgotten.tpl.php b/htdocs/core/tpl/passwordforgotten.tpl.php
index 937ee63a68c..ac2dba0c233 100644
--- a/htdocs/core/tpl/passwordforgotten.tpl.php
+++ b/htdocs/core/tpl/passwordforgotten.tpl.php
@@ -74,7 +74,7 @@ $(document).ready(function () {
 <div class="login_vertical_align">
 
 <form id="login" name="login" method="POST" action="<?php echo $php_self; ?>">
-<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>">
+<input type="hidden" name="token" value="<?php echo newToken(); ?>">
 <input type="hidden" name="action" value="buildnewpassword">
 
 
diff --git a/htdocs/product/canvas/product/tpl/card_create.tpl.php b/htdocs/product/canvas/product/tpl/card_create.tpl.php
index 042734f8fd3..84f4b9fb482 100644
--- a/htdocs/product/canvas/product/tpl/card_create.tpl.php
+++ b/htdocs/product/canvas/product/tpl/card_create.tpl.php
@@ -40,7 +40,7 @@ print dol_get_fiche_head('');
 <?php dol_htmloutput_errors($GLOBALS['mesg'], $GLOBALS['mesgs']); ?>
 
 <form action="<?php echo $_SERVER["PHP_SELF"]; ?>" method="post">
-<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>">
+<input type="hidden" name="token" value="<?php echo newToken(); ?>">
 <input type="hidden" name="action" value="add">
 <input type="hidden" name="type" value="0">
 <input type="hidden" name="canvas" value="<?php echo $canvas; ?>">
diff --git a/htdocs/product/canvas/product/tpl/card_edit.tpl.php b/htdocs/product/canvas/product/tpl/card_edit.tpl.php
index 512ab13416b..6c086244391 100644
--- a/htdocs/product/canvas/product/tpl/card_edit.tpl.php
+++ b/htdocs/product/canvas/product/tpl/card_edit.tpl.php
@@ -39,7 +39,7 @@ dol_htmloutput_errors($object->error, $object->errors);
 ?>
 
 <form action="<?php echo $_SERVER["PHP_SELF"]; ?>" method="post">
-<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>">
+<input type="hidden" name="token" value="<?php echo newToken(); ?>">
 <input type="hidden" name="action" value="update">
 <input type="hidden" name="id" value="<?php echo $object->id; ?>">
 <input type="hidden" name="canvas" value="<?php echo $object->canvas; ?>">
diff --git a/htdocs/product/canvas/service/tpl/card_create.tpl.php b/htdocs/product/canvas/service/tpl/card_create.tpl.php
index 13fceff4e22..b36ca8db60e 100644
--- a/htdocs/product/canvas/service/tpl/card_create.tpl.php
+++ b/htdocs/product/canvas/service/tpl/card_create.tpl.php
@@ -40,7 +40,7 @@ print dol_get_fiche_head('');
 <?php dol_htmloutput_errors($GLOBALS['mesg'], $GLOBALS['mesgs']); ?>
 
 <form action="<?php echo $_SERVER["PHP_SELF"]; ?>" method="post">
-<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>">
+<input type="hidden" name="token" value="<?php echo newToken(); ?>">
 <input type="hidden" name="action" value="add">
 <input type="hidden" name="type" value="1">
 <input type="hidden" name="canvas" value="<?php echo $canvas; ?>">
diff --git a/htdocs/product/canvas/service/tpl/card_edit.tpl.php b/htdocs/product/canvas/service/tpl/card_edit.tpl.php
index 8e4613f21b0..a141af17332 100644
--- a/htdocs/product/canvas/service/tpl/card_edit.tpl.php
+++ b/htdocs/product/canvas/service/tpl/card_edit.tpl.php
@@ -39,7 +39,7 @@ dol_htmloutput_errors($object->error, $object->errors);
 ?>
 
 <form action="<?php echo $_SERVER["PHP_SELF"]; ?>" method="post">
-<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>">
+<input type="hidden" name="token" value="<?php echo newToken(); ?>">
 <input type="hidden" name="action" value="update">
 <input type="hidden" name="id" value="<?php echo $object->id; ?>">
 <input type="hidden" name="canvas" value="<?php echo $object->canvas; ?>">

From e503f73e950acbdfbb722faa74db7ff47e82ffaa Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 15 Jun 2021 22:28:39 +0200
Subject: [PATCH 0666/1497] Comment dead code

---
 htdocs/core/actions_massactions.inc.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index 60b386ce083..1ee8dc4b0f2 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -958,9 +958,10 @@ if (!$error && $massaction == "builddoc" && $permissiontoread && !GETPOST('butto
 	$newlang = '';
 	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
 		$newlang = GETPOST('lang_id', 'aZ09');
-	} elseif ($conf->global->MAIN_MULTILANGS && empty($newlang) && is_object($objecttmp->thirdparty)) {
-		$newlang = $objecttmp->thirdparty->default_lang;
 	}
+	//elseif ($conf->global->MAIN_MULTILANGS && empty($newlang) && is_object($objecttmp->thirdparty)) {		// On massaction, we can have several values for $objecttmp->thirdparty
+	//	$newlang = $objecttmp->thirdparty->default_lang;
+	//}
 	if (!empty($newlang)) {
 		$outputlangs = new Translate("", $conf);
 		$outputlangs->setDefaultLang($newlang);

From e8485794951cfe077a5a46f74ab13c153c10c4a7 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Wed, 16 Jun 2021 06:00:00 +0200
Subject: [PATCH 0667/1497] Look & feel v14

---
 htdocs/accountancy/bookkeeping/balance.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index 7d6d71d49a8..b84fe255760 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -388,7 +388,7 @@ if ($action != 'export_csv') {
 		} elseif (empty($tmparrayforrootaccount['label'])) {
 			// $tmparrayforrootaccount['label'] not defined = the account has not parent with a parent.
 			// This is useless, we should not create a new account when an account has no parent, we must edit it to fix its parent.
-			// BUG 1: Accounts on level root or level 1 must not have a parent 2 level higher, so shoule not show a link to create another account.
+			// BUG 1: Accounts on level root or level 1 must not have a parent 2 level higher, so should not show a link to create another account.
 			// BUG 2: Adding a link to create a new accounting account here is useless because it is not add as parent of the orphelin.
 			//$link = '<a href="' . DOL_URL_ROOT . '/accountancy/admin/card.php?action=create&token=' . newToken() . '&accountingaccount=' . length_accountg($line->numero_compte) . '">' . img_edit_add() . '</a>';
 		}
@@ -429,7 +429,7 @@ if ($action != 'export_csv') {
 		print '<tr class="oddeven">';
 		print '<td>'.$accounting_account.'</td>';
 		if (!empty($conf->global->ACCOUNTANCY_SHOW_OPENING_BALANCE)) {
-			print '<td class="nowraponall right">'.price($opening_balance).'</td>';
+			print '<td class="right nowraponall amount">'.price($opening_balance).'</td>';
 		}
 
 		$urlzoom = '';
@@ -466,7 +466,7 @@ if ($action != 'export_csv') {
 	if (!empty($show_subgroup)) {
 		print '<tr class="liste_total"><td class="right">'.$langs->trans("SubTotal").':</td>';
 		if (!empty($conf->global->ACCOUNTANCY_SHOW_OPENING_BALANCE)) {
-			print '<td class="nowrap right">'.price($sous_total_opening_balance).'</td>';
+			print '<td class="right nowraponall amount">'.price($sous_total_opening_balance).'</td>';
 		}
 		print '<td class="right nowraponall amount">'.price($sous_total_debit).'</td>';
 		print '<td class="right nowraponall amount">'.price($sous_total_credit).'</td>';
@@ -486,9 +486,9 @@ if ($action != 'export_csv') {
 	print '<td class="right nowraponall amount">'.price($total_debit).'</td>';
 	print '<td class="right nowraponall amount">'.price($total_credit).'</td>';
 	if (!empty($conf->global->ACCOUNTANCY_SHOW_OPENING_BALANCE)) {
-		print '<td class="nowrap right">' . price(price2num($total_opening_balance + $total_debit - $total_credit, 'MT')) . '</td>';
+		print '<td class="right nowraponall amount">' . price(price2num($total_opening_balance + $total_debit - $total_credit, 'MT')) . '</td>';
 	} else {
-		print '<td class="nowrap right">' . price(price2num($total_debit - $total_credit, 'MT')) . '</td>';
+		print '<td class="right nowraponall amount">' . price(price2num($total_debit - $total_credit, 'MT')) . '</td>';
 	}
 	print "<td></td>\n";
 	print '</tr>';

From 7f0d2b009e7af2a71312093bce022725e4b4dd10 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Wed, 16 Jun 2021 06:23:50 +0200
Subject: [PATCH 0668/1497] FIX SQL Error on automatic binding with
 functionality "company per entity" activated

---
 htdocs/accountancy/customer/index.php | 3 +++
 htdocs/accountancy/supplier/index.php | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php
index 16dea74108e..dde599a1462 100644
--- a/htdocs/accountancy/customer/index.php
+++ b/htdocs/accountancy/customer/index.php
@@ -141,6 +141,9 @@ if ($action == 'validatehistory') {
 
 	$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
 	$sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = f.fk_soc";
+	if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
+		$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = " . ((int) $conf->entity);
+	}
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co ON co.rowid = s.fk_pays ";
 	$sql .= " INNER JOIN ".MAIN_DB_PREFIX."facturedet as l ON f.rowid = l.fk_facture";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = l.fk_product";
diff --git a/htdocs/accountancy/supplier/index.php b/htdocs/accountancy/supplier/index.php
index 343eb506408..b5c6804c7d6 100644
--- a/htdocs/accountancy/supplier/index.php
+++ b/htdocs/accountancy/supplier/index.php
@@ -149,6 +149,9 @@ if ($action == 'validatehistory') {
 
 	$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
 	$sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = f.fk_soc";
+	if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
+		$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = " . ((int) $conf->entity);
+	}
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co ON co.rowid = s.fk_pays ";
 	$sql .= " INNER JOIN ".MAIN_DB_PREFIX."facture_fourn_det as l ON f.rowid = l.fk_facture_fourn";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = l.fk_product";

From 4c47c5f2e7ada6216db4f6b6a6a7bff96e2e45c2 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Wed, 16 Jun 2021 09:27:08 +0200
Subject: [PATCH 0669/1497] Update ChangeLog

---
 ChangeLog | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5808fbf313f..6ffeae32ad5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -46,16 +46,13 @@ NEW: Can filter on extrafields date on lists
 NEW: Can filter on rowid in list of blocked logs
 NEW: Can hide columns "time consumed" on timesheet per week
 NEW: Can set an employee on each social contribution
-NEW: Can set a percentage when creating an invoice from another object
 NEW: Can set order of execution of hooks
-NEW: Can show the leave dates/holidays on the agenda view
 NEW: Can toggle FCKeditor on public/private notes
 NEW: Check update availability for externals modules using a button on module page
 NEW: Choose lines to use while creating intervention card from origin
 NEW: Columns shipment method, payment mode, payment term in proposal and order list
 NEW: Conf for default actioncomm status
 NEW: customer ref for product customer prices
-NEW: date and user signature on proposal (Issue 16062) #16980
 NEW: Dictionary for availability - Add a column position
 NEW: Can set a user related to a social contribution
 NEW: ICS Direct debit can be set with a different value for each bank account
@@ -65,7 +62,6 @@ NEW: If main logo not defined, can use the squarred logo on login page
 NEW: The manifest file can use the squared image if available
 NEW: Add bulk actions for Bank Transfer
 NEW: Enhance the multicurrency rate editor
-NEW: Multiselect ledger account code filter on book keeping list
 NEW: Normalyse Type company field with ajax combobox
 NEW: preload product description on selection for customer propal/order/invoice
 NEW: Add a ref in product customer price
@@ -93,11 +89,18 @@ NEW: Accountancy - Format FEC - Add new field DateLimitReglmt
 NEW: Accountancy - In ledger & journals, show link on bank transaction
 NEW: Accountancy - Possibility to filter on journals in balance
 NEW: Accountancy - Add a page to list subledger accounts
+NEW: Multiselect ledger account code filter on book keeping list
+
+ Agenda
+NEW: Can show the leave dates/holidays on the agenda view
 
  ECM/GED
 NEW: add DB fields note_public and note_private for ECM module
 NEW: Can filter files in ECM/GED on status Shared/Not shared
 
+ Invoices
+NEW: Can set a percentage when creating an invoice from another object
+
  Members
 NEW: #17292 default subscription amount by adherent type
 NEW: option to automatically create a login/user when a new subscription of a member is done online
@@ -111,6 +114,7 @@ NEW: when we add contacts/users to a project, ask to also affect them on tasks
  Proposals
 NEW: add bulk action to set a commercial proposal to status "Refused"
 NEW: can set a warehouse in a proposal
+NEW: date and user signature on proposal (Issue 16062) #16980
 
  Shipment
 NEW: add option in Workflow module to set a shipment as closed
@@ -130,7 +134,8 @@ NEW: can set a warehouse on a Thirdparty
 NEW: can use captcha on public page to create a ticket  #16347
 NEW: can set if a ticket group is visible on public interface or not
 
- Warehouse
+ Warehouse/Stock
+NEW: Feature to make Stock Inventories
 NEW: can make massive stock transfers from a CSV file
 NEW: Stock movement list - add more complete date field
 NEW: can set a warehouse in a proposal
@@ -143,10 +148,12 @@ NEW: add last date of modification for website pages in the list of pages
 NEW: Save old page with .old extension on disk when editing a website page
 
  new Modules
+NEW: Module Recruitement is now stable
 NEW: start new experimental module Event Organization Management
 NEW: start new experimental module Partnership Management
 NEW: start new experimental module Knowledge Management
 NEW: start new experimental module Workstations Management
+NEW: Check update availability for externals modules using a button on module page
 
  new Options
 NEW: add option  CONTRACT_ALLOW_EXTERNAL_DOWNLOAD            to make generated doc automatically shared
@@ -171,20 +178,20 @@ NEW: Support sepa_debit in stripe paymentmethods list
 NEW: Update doleditor.class.php for easily activate SCAYT
 NEW: Add triggers in the function add_object_linked(), updateObjectLinked() and deleteObjectLinked()
 NEW: Add triggers OBJECT_LINK_INSERT, OBJECT_LINK_UPDATE et OBJECT_LINK_DELETE in the function add_object_linked(), updateObjectLinked() and deleteObjectLinked()
-NEW: Can set a target image in dolcropresize function.
-NEW: Can set a label as placeholder for combo lists.
+NEW: can set a target image in dolcropresize function
+NEW: can set a label as placeholder for combo lists
 NEW: Add pagination on Get Products response API
 NEW: Add the DefaultValues CRUD class
 NEW: Extrafields of documents lines are inside the lines, not any more on separate TR
 NEW: unit selection on object edit line
-NEW: #13739 #17390 Product API route added to get product stock and product with or without variants
 
  APIs
 NEW: API add option $includeifobjectisused to get a product
 NEW: API get the list of product ids only
+NEW: add link to OpenAPI specifications XML file in REST API module setup: swagger.json file can be included into external tools like redoc
 NEW: add native compression in REST APIs
 NEW: Product Variants API, add variant stock to response by parameter
-NEW: add link to OpenAPI specifications XML file in REST API module setup: swagger.json file can be included into external tools like redoc
+NEW: Product API route added to get product stock and product with or without variants #13739 #17390 
 
 
 WARNING:

From b8824435d22b7d9d9342c6ebd7a66e4118047ce0 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Wed, 16 Jun 2021 09:40:45 +0200
Subject: [PATCH 0670/1497] Update llx_00_c_country.sql
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Taïwan  ->  Taiwan
Tadjikistan  ->  Tajikistan
Tanzanie  ->  Tanzania
Thaïlande  ->  Thailand
Timor Oriental  ->  East Timor /  Timor-Leste
Tokélaou  ->  Tokelau
Tonga = Tonga
Trinité-et-Tobago  ->  Trinidad and Tobago
Turquie  ->  Turkey
Turkménistan  ->  Turkmenistan
Iles Turks-et-Caicos  ->  Turks and Caicos Islands
Tuvalu = Tuvalu
---
 .../install/mysql/data/llx_00_c_country.sql   | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_00_c_country.sql b/htdocs/install/mysql/data/llx_00_c_country.sql
index 6cf703829a5..7746c91f6ce 100644
--- a/htdocs/install/mysql/data/llx_00_c_country.sql
+++ b/htdocs/install/mysql/data/llx_00_c_country.sql
@@ -241,17 +241,17 @@ INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (20
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (210,'SJ','SJM','Svalbard and Jan Mayen',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (211,'SZ','SWZ','Swaziland / Eswatini',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (212,'SY','SYR','Syria',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (213,'TW','TWN','Taïwan',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (214,'TJ','TJK','Tadjikistan',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (215,'TZ','TZA','Tanzanie',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (216,'TH','THA','Thaïlande',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (217,'TL','TLS','Timor Oriental',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (218,'TK','TKL','Tokélaou',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (213,'TW','TWN','Taiwan',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (214,'TJ','TJK','Tajikistan',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (215,'TZ','TZA','Tanzania',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (216,'TH','THA','Thailand',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (217,'TL','TLS','Timor-Leste',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (218,'TK','TKL','Tokelau',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (219,'TO','TON','Tonga',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (220,'TT','TTO','Trinité-et-Tobago',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (221,'TR','TUR','Turquie',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (222,'TM','TKM','Turkménistan',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (223,'TC','TCA','Iles Turks-et-Caicos',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (220,'TT','TTO','Trinidad and Tobago',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (221,'TR','TUR','Turkey',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (222,'TM','TKM','Turkmenistan',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (223,'TC','TCA','Turks and Caicos Islands',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (224,'TV','TUV','Tuvalu',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (225,'UG','UGA','Ouganda',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (226,'UA','UKR','Ukraine',1,0);

From 5d79143401c5c9af2679c1279fd19815f4498284 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 16 Jun 2021 11:50:52 +0200
Subject: [PATCH 0671/1497] fix php warning

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

diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 5abc6bfc2ac..f6d07e32f01 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -1616,8 +1616,8 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 
 						'contact_id'=>$obj->fk_contact,
 						'socpeopleassigned' => $contactaction->socpeopleassigned,
-						'lastname'=>$obj->lastname,
-						'firstname'=>$obj->firstname,
+						'lastname' => empty($obj->lastname) ? '' : $obj->lastname,
+						'firstname' => empty($obj->firstname) ? '' : $obj->firstname,
 						'fk_element'=>$obj->fk_element,
 						'elementtype'=>$obj->elementtype,
 						// Type of event

From fca75a58424544785a8425909b7c0ccb04ed2852 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 16 Jun 2021 11:54:33 +0200
Subject: [PATCH 0672/1497] fix php warning

---
 htdocs/product/note.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/product/note.php b/htdocs/product/note.php
index fad4df3500b..b758f414035 100644
--- a/htdocs/product/note.php
+++ b/htdocs/product/note.php
@@ -76,23 +76,23 @@ include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include,
 
 $form = new Form($db);
 
-$helpurl = '';
+$help_url = '';
 if (GETPOST("type") == '0' || ($object->type == Product::TYPE_PRODUCT)) {
-	$helpurl = 'EN:Module_Products|FR:Module_Produits|ES:M&oacute;dulo_Productos';
+	$help_url = 'EN:Module_Products|FR:Module_Produits|ES:M&oacute;dulo_Productos';
 }
 if (GETPOST("type") == '1' || ($object->type == Product::TYPE_SERVICE)) {
-	$helpurl = 'EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
+	$help_url = 'EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
 }
 
 $title = $langs->trans('ProductServiceCard');
 $shortlabel = dol_trunc($object->label, 16);
 if (GETPOST("type") == '0' || ($object->type == Product::TYPE_PRODUCT)) {
 	$title = $langs->trans('Product')." ".$shortlabel." - ".$langs->trans('Notes');
-	$helpurl = 'EN:Module_Products|FR:Module_Produits|ES:M&oacute;dulo_Productos';
+	$help_url = 'EN:Module_Products|FR:Module_Produits|ES:M&oacute;dulo_Productos';
 }
 if (GETPOST("type") == '1' || ($object->type == Product::TYPE_SERVICE)) {
 	$title = $langs->trans('Service')." ".$shortlabel." - ".$langs->trans('Notes');
-	$helpurl = 'EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
+	$help_url = 'EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
 }
 
 llxHeader('', $title, $help_url);

From cf9c595568ff2117fa963942bae4011e18d448af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 16 Jun 2021 12:01:52 +0200
Subject: [PATCH 0673/1497] fix unknown right

supprimer doesn't exists
---
 htdocs/compta/bank/list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/compta/bank/list.php b/htdocs/compta/bank/list.php
index df23b111aa2..0d934b5bced 100644
--- a/htdocs/compta/bank/list.php
+++ b/htdocs/compta/bank/list.php
@@ -130,7 +130,7 @@ $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
 $permissiontoadd = $user->rights->banque->modifier;
-$permissiontodelete = $user->rights->banque->supprimer;
+$permissiontodelete = $user->rights->banque->configurer;
 
 /*
  * Actions

From 06b09f614a4dd851337ed99edff82e8034f1330f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 16 Jun 2021 12:08:34 +0200
Subject: [PATCH 0674/1497] Fix var not defined

---
 htdocs/mrp/class/api_mos.class.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/htdocs/mrp/class/api_mos.class.php b/htdocs/mrp/class/api_mos.class.php
index 22420733a45..ed17db03db6 100644
--- a/htdocs/mrp/class/api_mos.class.php
+++ b/htdocs/mrp/class/api_mos.class.php
@@ -299,6 +299,10 @@ class Mos extends DolibarrApi
 	 */
 	public function produceAndConsume($id, $request_data = null)
 	{
+		global $langs;
+
+		$error = 0;
+
 		if (!DolibarrApiAccess::$user->rights->mrp->write) {
 			throw new RestException(401, 'Not enough permission');
 		}
@@ -342,11 +346,13 @@ class Mos extends DolibarrApi
 			throw new RestException(500, "Field inventorycode not prodivded");
 		}
 
-		// TODO Add code for consume and produce...
+		// Code for consume and produce...
 		require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 		require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 		dol_include_once('/mrp/lib/mrp_mo.lib.php');
+
 		$stockmove = new MouvementStock($this->db);
+
 		if (!empty($arraytoconsume) && !empty($arraytoproduce)) {
 			$pos = 0;
 			$arrayofarrayname = array("arraytoconsume","arraytoproduce");
@@ -618,12 +624,11 @@ class Mos extends DolibarrApi
 		dol_syslog("consumptioncomplete = ".$consumptioncomplete." productioncomplete = ".$productioncomplete);
 		//var_dump("consumptioncomplete = ".$consumptioncomplete." productioncomplete = ".$productioncomplete);
 		if ($consumptioncomplete && $productioncomplete) {
-			$result = $this->mo->setStatut($this->mo::STATUS_PRODUCED, 0, '', 'MRP_MO_PRODUCED');
+			$result = $this->mo->setStatut(self::STATUS_PRODUCED, 0, '', 'MRP_MO_PRODUCED');
 		} else {
-			$result = $this->mo->setStatut($this->mo::STATUS_INPROGRESS, 0, '', 'MRP_MO_PRODUCED');
+			$result = $this->mo->setStatut(self::STATUS_INPROGRESS, 0, '', 'MRP_MO_PRODUCED');
 		}
 		if ($result <= 0) {
-			$error++;
 			throw new RestException(500, $this->mo->error);
 		}
 

From 11a1cba68a80a09a0c13b1e117ffbbe789da146b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 16 Jun 2021 12:10:21 +0200
Subject: [PATCH 0675/1497] fix warning

---
 htdocs/cron/card.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/cron/card.php b/htdocs/cron/card.php
index fb8699b911e..7911194603b 100644
--- a/htdocs/cron/card.php
+++ b/htdocs/cron/card.php
@@ -284,6 +284,7 @@ if ($conf->use_javascript_ajax) {
 	print '</script>'."\n";
 }
 
+$formconfirm = '';
 if ($action == 'delete') {
 	$formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=".$object->id, $langs->trans("CronDelete"), $langs->trans("CronConfirmDelete"), "confirm_delete", '', '', 1);
 

From 6a4210f759657a576fb4c9244a08d40bd67ab5b9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 16 Jun 2021 12:53:49 +0200
Subject: [PATCH 0676/1497] Reduce travis load

---
 .travis.yml | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 22d4b2b0827..cbc6dc66f89 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -264,24 +264,27 @@ script:
   echo
 
 - |
-  echo "Checking PHP syntax errors"
+  echo "Checking PHP syntax errors (only 1 version to not overload travis and avoid duplicate tests)"
   # Ensure we catch errors
   set -e
   #parallel-lint --exclude htdocs/includes --blame .
-  parallel-lint --exclude dev/tools/test/namespacemig --exclude htdocs/includes/composer --exclude htdocs/includes/myclabs --exclude htdocs/includes/phpspec --exclude dev/initdata/dbf/includes \
-  	--exclude htdocs/includes/sabre --exclude htdocs/includes/phpoffice/PhpSpreadsheet --exclude htdocs/includes/sebastian \
-  	--exclude htdocs/includes/squizlabs/php_codesniffer --exclude htdocs/includes/jakub-onderka --exclude htdocs/includes/php-parallel-lint --exclude htdocs/includes/symfony \
-  	--exclude htdocs/includes/mike42/escpos-php/example --exclude htdocs/includes/maximebf \
-  	--exclude htdocs/includes/phpunit/ --exclude htdocs/includes/tecnickcom/tcpdf/include/barcodes --exclude htdocs/includes/webmozart --blame .
+  # Exclusions are defined in the ruleset.xml file
+  if [ "$TRAVIS_PHP_VERSION" = "7.4" ]; then
+	  parallel-lint --exclude dev/tools/test/namespacemig --exclude htdocs/includes/composer --exclude htdocs/includes/myclabs --exclude htdocs/includes/phpspec --exclude dev/initdata/dbf/includes \
+	  	--exclude htdocs/includes/sabre --exclude htdocs/includes/phpoffice/PhpSpreadsheet --exclude htdocs/includes/sebastian \
+	  	--exclude htdocs/includes/squizlabs/php_codesniffer --exclude htdocs/includes/jakub-onderka --exclude htdocs/includes/php-parallel-lint --exclude htdocs/includes/symfony \
+	  	--exclude htdocs/includes/mike42/escpos-php/example --exclude htdocs/includes/maximebf \
+	  	--exclude htdocs/includes/phpunit/ --exclude htdocs/includes/tecnickcom/tcpdf/include/barcodes --exclude htdocs/includes/webmozart --blame .
+  fi
   set +e
   echo
 
 - |
-  echo "Checking coding style (excluding Pull Requests builds to not overload travis, excluding also some jobs to avoid duplicate tests)"
+  echo "Checking coding style (only for Pull Requests builds and 1 version to not overload travis and avoid duplicate tests)"
   # Ensure we catch errors
   set -e
   # Exclusions are defined in the ruleset.xml file
-  if [ "$TRAVIS_PULL_REQUEST" = "false" ] && [ "$TRAVIS_PHP_VERSION" = "7.4" ] && [ "$DB" = "mysql" ]; then
+  if [ "$TRAVIS_PULL_REQUEST" = "false" ] && [ "$TRAVIS_PHP_VERSION" = "7.4" ]; then
     phpcs -s -p -d memory_limit=-1 --extensions=php --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 --runtime-set ignore_warnings_on_exit true .;
   fi
   set +e

From 2dbe621f444b2b7915cb9ce3262bd45d81ab3f81 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 16 Jun 2021 13:11:35 +0200
Subject: [PATCH 0677/1497] Fxi travis file

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index cbc6dc66f89..d7e167fa842 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -270,7 +270,7 @@ script:
   #parallel-lint --exclude htdocs/includes --blame .
   # Exclusions are defined in the ruleset.xml file
   if [ "$TRAVIS_PHP_VERSION" = "7.4" ]; then
-	  parallel-lint --exclude dev/tools/test/namespacemig --exclude htdocs/includes/composer --exclude htdocs/includes/myclabs --exclude htdocs/includes/phpspec --exclude dev/initdata/dbf/includes \
+    parallel-lint --exclude dev/tools/test/namespacemig --exclude htdocs/includes/composer --exclude htdocs/includes/myclabs --exclude htdocs/includes/phpspec --exclude dev/initdata/dbf/includes \
 	  	--exclude htdocs/includes/sabre --exclude htdocs/includes/phpoffice/PhpSpreadsheet --exclude htdocs/includes/sebastian \
 	  	--exclude htdocs/includes/squizlabs/php_codesniffer --exclude htdocs/includes/jakub-onderka --exclude htdocs/includes/php-parallel-lint --exclude htdocs/includes/symfony \
 	  	--exclude htdocs/includes/mike42/escpos-php/example --exclude htdocs/includes/maximebf \

From d5a747eed783395e646be97f6de2e3c853e5cf76 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 16 Jun 2021 13:14:28 +0200
Subject: [PATCH 0678/1497] Fix travis syntax file

---
 .travis.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d7e167fa842..daf30c2045f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -271,10 +271,10 @@ script:
   # Exclusions are defined in the ruleset.xml file
   if [ "$TRAVIS_PHP_VERSION" = "7.4" ]; then
     parallel-lint --exclude dev/tools/test/namespacemig --exclude htdocs/includes/composer --exclude htdocs/includes/myclabs --exclude htdocs/includes/phpspec --exclude dev/initdata/dbf/includes \
-	  	--exclude htdocs/includes/sabre --exclude htdocs/includes/phpoffice/PhpSpreadsheet --exclude htdocs/includes/sebastian \
-	  	--exclude htdocs/includes/squizlabs/php_codesniffer --exclude htdocs/includes/jakub-onderka --exclude htdocs/includes/php-parallel-lint --exclude htdocs/includes/symfony \
-	  	--exclude htdocs/includes/mike42/escpos-php/example --exclude htdocs/includes/maximebf \
-	  	--exclude htdocs/includes/phpunit/ --exclude htdocs/includes/tecnickcom/tcpdf/include/barcodes --exclude htdocs/includes/webmozart --blame .
+      --exclude htdocs/includes/sabre --exclude htdocs/includes/phpoffice/PhpSpreadsheet --exclude htdocs/includes/sebastian \
+      --exclude htdocs/includes/squizlabs/php_codesniffer --exclude htdocs/includes/jakub-onderka --exclude htdocs/includes/php-parallel-lint --exclude htdocs/includes/symfony \
+      --exclude htdocs/includes/mike42/escpos-php/example --exclude htdocs/includes/maximebf \
+      --exclude htdocs/includes/phpunit/ --exclude htdocs/includes/tecnickcom/tcpdf/include/barcodes --exclude htdocs/includes/webmozart --blame .
   fi
   set +e
   echo

From 3fffbb4cd3ae2b6c758a5666c180238a2676f33e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 16 Jun 2021 13:55:17 +0200
Subject: [PATCH 0679/1497] Split updage and enable of new module in 2
 different tasks

---
 .travis.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index daf30c2045f..b261f84f674 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -404,8 +404,12 @@ script:
   php upgrade.php 13.0.0 14.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade13001400.log
   php upgrade2.php 13.0.0 14.0.0 > $TRAVIS_BUILD_DIR/upgrade13001400-2.log
   php step5.php 13.0.0 14.0.0 > $TRAVIS_BUILD_DIR/upgrade13001400-3.log
+  ls -alrt $TRAVIS_BUILD_DIR/
 
+- |
+  echo "Enabling new modules"
   # Enable modules not enabled into original dump
+  cd htdocs/install
   php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_API,MAIN_MODULE_PRODUCTBATCH,MAIN_MODULE_SUPPLIERPROPOSAL,MAIN_MODULE_STRIPE > $TRAVIS_BUILD_DIR/enablemodule.log
   php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_WEBSITE,MAIN_MODULE_TICKET,MAIN_MODULE_ACCOUNTING,MAIN_MODULE_MRP >> $TRAVIS_BUILD_DIR/enablemodule.log
   php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_RECEPTION,MAIN_MODULE_RECRUITMENT >> $TRAVIS_BUILD_DIR/enablemodule.log

From a556caf7772019041bff69f172938315374ab976 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 16 Jun 2021 14:00:50 +0200
Subject: [PATCH 0680/1497] Clean phpunit file

---
 test/phpunit/phpunittest.xml | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/test/phpunit/phpunittest.xml b/test/phpunit/phpunittest.xml
index 7e903daa16d..84b31a8dd3b 100644
--- a/test/phpunit/phpunittest.xml
+++ b/test/phpunit/phpunittest.xml
@@ -8,8 +8,7 @@
 	convertWarningsToExceptions="true"
 	colors="true"
 	processIsolation="false"
-	stopOnFailure="true"
-	syntaxCheck="true">
+	stopOnFailure="true">
 	<php>
 		<ini name="max_execution_time" value="1800"/>
 		<ini name="max_input_time" value="1800"/>
@@ -42,19 +41,5 @@
 	    <directory suffix=".php">../../htdocs/includes/</directory>
 	    </exclude>
 	  </whitelist>
-	  <blacklist>
-	    <directory suffix=".php">../../build/</directory>
-	    <directory suffix=".php">../../dev/</directory>
-	    <directory suffix=".php">../../doc/</directory>
-	    <directory suffix=".php">../../test/</directory>
-	    <directory suffix=".php">../../documents/</directory>
-	    <directory suffix=".php">../../htdocs/custom/</directory>
-	    <directory suffix=".php">../../htdocs/documents/custom/</directory>
-	    <directory suffix=".php">../../htdocs/nltechno/</directory>
-	    <directory suffix=".php">../../htdocs/products/canvas/</directory>
-	    <directory suffix=".php">../../htdocs/contact/canvas/</directory>
-	    <directory suffix=".php">../../htdocs/societe/canvas/</directory>
-	    <directory suffix=".php">../../htdocs/includes/</directory>
-	  </blacklist>
 	</filter>
 </phpunit>

From 884ef12dde2884b8431c7651698c864161be800d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 16 Jun 2021 14:08:46 +0200
Subject: [PATCH 0681/1497] Add -e php option to parallel-lint

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index b261f84f674..dbb1a4ab628 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -270,7 +270,7 @@ script:
   #parallel-lint --exclude htdocs/includes --blame .
   # Exclusions are defined in the ruleset.xml file
   if [ "$TRAVIS_PHP_VERSION" = "7.4" ]; then
-    parallel-lint --exclude dev/tools/test/namespacemig --exclude htdocs/includes/composer --exclude htdocs/includes/myclabs --exclude htdocs/includes/phpspec --exclude dev/initdata/dbf/includes \
+    parallel-lint -e php --exclude dev/tools/test/namespacemig --exclude htdocs/includes/composer --exclude htdocs/includes/myclabs --exclude htdocs/includes/phpspec --exclude dev/initdata/dbf/includes \
       --exclude htdocs/includes/sabre --exclude htdocs/includes/phpoffice/PhpSpreadsheet --exclude htdocs/includes/sebastian \
       --exclude htdocs/includes/squizlabs/php_codesniffer --exclude htdocs/includes/jakub-onderka --exclude htdocs/includes/php-parallel-lint --exclude htdocs/includes/symfony \
       --exclude htdocs/includes/mike42/escpos-php/example --exclude htdocs/includes/maximebf \

From d5cb81982d3fb558d51f59cd18a20bc56a92ebc0 Mon Sep 17 00:00:00 2001
From: Antonin MARCHAL <antonin@letempledujeu.fr>
Date: Wed, 16 Jun 2021 14:21:23 +0200
Subject: [PATCH 0682/1497] fix wrong display on extrafields type = double

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

diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 16d58f51eb3..8f4d5e9b8d7 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -1613,7 +1613,7 @@ class ExtraFields
 		if (!empty($extrafieldsobjectkey)) {
 			$label = $this->attributes[$extrafieldsobjectkey]['label'][$key];
 			$type = $this->attributes[$extrafieldsobjectkey]['type'][$key];
-			$size = (int) $this->attributes[$extrafieldsobjectkey]['size'][$key];
+			$size = $this->attributes[$extrafieldsobjectkey]['size'][$key];
 			$default = $this->attributes[$extrafieldsobjectkey]['default'][$key];
 			$computed = $this->attributes[$extrafieldsobjectkey]['computed'][$key];
 			$unique = $this->attributes[$extrafieldsobjectkey]['unique'][$key];

From e68955afc5168395cfface9869e8926aca9e8cb2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 16 Jun 2021 14:27:49 +0200
Subject: [PATCH 0683/1497] Try to reduce the depth of git clone

---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index dbb1a4ab628..df6e24a7e02 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,6 +9,9 @@ dist: xenial
 
 language: php
 
+git:
+  depth: 1
+
 # Start on every boot
 services:
 - memcached

From b2221d2c3a10a82fb5bd055a636f1cbed187b220 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 16 Jun 2021 14:31:22 +0200
Subject: [PATCH 0684/1497] Update extrafields.class.php

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

diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 8f4d5e9b8d7..b4d7f1a74df 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -1613,7 +1613,7 @@ class ExtraFields
 		if (!empty($extrafieldsobjectkey)) {
 			$label = $this->attributes[$extrafieldsobjectkey]['label'][$key];
 			$type = $this->attributes[$extrafieldsobjectkey]['type'][$key];
-			$size = $this->attributes[$extrafieldsobjectkey]['size'][$key];
+			$size = $this->attributes[$extrafieldsobjectkey]['size'][$key];			// Can be '255', '24,8'...
 			$default = $this->attributes[$extrafieldsobjectkey]['default'][$key];
 			$computed = $this->attributes[$extrafieldsobjectkey]['computed'][$key];
 			$unique = $this->attributes[$extrafieldsobjectkey]['unique'][$key];
@@ -1911,7 +1911,7 @@ class ExtraFields
 		} elseif ($type == 'password') {
 			$value = dol_trunc(preg_replace('/./i', '*', $value), 8, 'right', 'UTF-8', 1);
 		} else {
-			$showsize = round($size);
+			$showsize = round((float) $size);
 			if ($showsize > 48) {
 				$showsize = 48;
 			}

From 657972b79be5f3cf9b5ece59b7bfc500a3e3188f Mon Sep 17 00:00:00 2001
From: Gauthier PC portable 024 <gauthier.verdol@atm-consulting.fr>
Date: Wed, 16 Jun 2021 16:49:24 +0200
Subject: [PATCH 0685/1497] FIX : Tracking number label shouldn't be displaied
 on "espadon" model if shipping tracking number is empty

---
 htdocs/core/modules/expedition/doc/pdf_espadon.modules.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
index c232edbe81c..69b6059e622 100644
--- a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
@@ -364,7 +364,11 @@ class pdf_espadon extends ModelePdfExpedition
 					$tab_top_alt = $tab_top;
 
 					$pdf->SetFont('', 'B', $default_font_size - 2);
-					$pdf->writeHTMLCell(60, 4, $this->posxdesc - 1, $tab_top - 1, $outputlangs->transnoentities("TrackingNumber")." : ".$object->tracking_number, 0, 1, false, true, 'L');
+					if(!empty($object->tracking_number)) {
+						$pdf->writeHTMLCell(60, 4, $this->posxdesc - 1, $tab_top - 1, $outputlangs->transnoentities("TrackingNumber")." : ".$object->tracking_number, 0, 1, false, true, 'L');
+					} else {
+						$pdf->writeHTMLCell(60, 4, $this->posxdesc - 1, $tab_top - 5, '', 0, 1, false, true, 'L');
+					}
 
 					$tab_top_alt = $pdf->GetY();
 					//$tab_top_alt += 1;

From 3b42b44899ff31f59ddaf18381f352adc6a70d10 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 16 Jun 2021 19:05:51 +0200
Subject: [PATCH 0686/1497] Update travis

---
 .travis.yml | 43 +++++++++++++++++++++++++------------------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7b8fa4546b2..9403188d709 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 # This script is used by Travis CI to run automatically Continuous test integration
 # from Dolibarr GitHub repository.
-# For syntax, see http://about.travis-ci.org/docs/user/languages/php/
+# For syntax, see https://docs.travis-ci.com/user/languages/php/
 
 # We use dist: xenial to have php 5.6+ available
 os: linux
@@ -9,6 +9,9 @@ dist: xenial
 
 language: php
 
+git:
+  depth: 1
+
 # Start on every boot
 services:
 - memcached
@@ -38,8 +41,8 @@ env:
 
 jobs:
   fast_finish: true
-  allow_failures:
-  - php: nightly
+  #allow_failures:
+  #- php: nightly
   include:
     - if: type = push
       php: '5.6'
@@ -73,13 +76,6 @@ before_install:
   phpenv config-rm xdebug.ini
   echo
 
-- |
-  if [ "$DB" = 'postgresql' ]; then
-    echo "Check pgloader version"
-    pgloader --version
-    echo
-  fi
-
 install:
 - |
   echo "Updating Composer"
@@ -178,6 +174,10 @@ before_script:
     mysql --version | head -
     mysql -e "SELECT VERSION();"  | head -
     psql --version
+    if [ "$DB" = 'postgresql' ]; then
+      echo "Check pgloader version"
+      pgloader --version
+    fi
     echo
 
   - |
@@ -267,24 +267,27 @@ script:
   echo
 
 - |
-  echo "Checking PHP syntax errors"
+  echo "Checking PHP syntax errors (only 1 version to not overload travis and avoid duplicate tests)"
   # Ensure we catch errors
   set -e
   #parallel-lint --exclude htdocs/includes --blame .
-  parallel-lint --exclude dev/tools/test/namespacemig --exclude htdocs/includes/composer --exclude htdocs/includes/myclabs --exclude htdocs/includes/phpspec --exclude dev/initdata/dbf/includes \
-  	--exclude htdocs/includes/sabre --exclude htdocs/includes/phpoffice/PhpSpreadsheet --exclude htdocs/includes/sebastian \
-  	--exclude htdocs/includes/squizlabs/php_codesniffer --exclude htdocs/includes/jakub-onderka --exclude htdocs/includes/php-parallel-lint --exclude htdocs/includes/symfony \
-  	--exclude htdocs/includes/mike42/escpos-php/example --exclude htdocs/includes/maximebf \
-  	--exclude htdocs/includes/phpunit/ --exclude htdocs/includes/tecnickcom/tcpdf/include/barcodes --exclude htdocs/includes/webmozart --blame .
+  # Exclusions are defined in the ruleset.xml file
+  if [ "$TRAVIS_PHP_VERSION" = "7.4" ]; then
+    parallel-lint -e php --exclude dev/tools/test/namespacemig --exclude htdocs/includes/composer --exclude htdocs/includes/myclabs --exclude htdocs/includes/phpspec --exclude dev/initdata/dbf/includes \
+      --exclude htdocs/includes/sabre --exclude htdocs/includes/phpoffice/PhpSpreadsheet --exclude htdocs/includes/sebastian \
+      --exclude htdocs/includes/squizlabs/php_codesniffer --exclude htdocs/includes/jakub-onderka --exclude htdocs/includes/php-parallel-lint --exclude htdocs/includes/symfony \
+      --exclude htdocs/includes/mike42/escpos-php/example --exclude htdocs/includes/maximebf \
+      --exclude htdocs/includes/phpunit/ --exclude htdocs/includes/tecnickcom/tcpdf/include/barcodes --exclude htdocs/includes/webmozart --blame .
+  fi
   set +e
   echo
 
 - |
-  echo "Checking coding style (excluding Pull Requests builds to not overload travis, excluding also some jobs to avoid duplicate tests)"
+  echo "Checking coding style (only for Pull Requests builds and 1 version to not overload travis and avoid duplicate tests)"
   # Ensure we catch errors
   set -e
   # Exclusions are defined in the ruleset.xml file
-  if [ "$TRAVIS_PULL_REQUEST" = "false" ] && [ "$TRAVIS_PHP_VERSION" = "7.4" ] && [ "$DB" = "mysql" ]; then
+  if [ "$TRAVIS_PULL_REQUEST" = "false" ] && [ "$TRAVIS_PHP_VERSION" = "7.4" ]; then
     phpcs -s -p -d memory_limit=-1 --extensions=php --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 --runtime-set ignore_warnings_on_exit true .;
   fi
   set +e
@@ -401,8 +404,12 @@ script:
   php upgrade.php 12.0.0 13.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade12001300.log
   php upgrade2.php 12.0.0 13.0.0 > $TRAVIS_BUILD_DIR/upgrade12001300-2.log
   php step5.php 12.0.0 13.0.0 > $TRAVIS_BUILD_DIR/upgrade12001300-3.log
+  ls -alrt $TRAVIS_BUILD_DIR/
 
+- |
+  echo "Enabling new modules"
   # Enable modules not enabled into original dump
+  cd htdocs/install
   php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_API,MAIN_MODULE_PRODUCTBATCH,MAIN_MODULE_SUPPLIERPROPOSAL,MAIN_MODULE_STRIPE > $TRAVIS_BUILD_DIR/enablemodule.log
   php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_WEBSITE,MAIN_MODULE_TICKET,MAIN_MODULE_ACCOUNTING,MAIN_MODULE_MRP >> $TRAVIS_BUILD_DIR/enablemodule.log
   php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_RECEPTION,MAIN_MODULE_RECRUITMENT >> $TRAVIS_BUILD_DIR/enablemodule.log

From 8db0ecd4dbb7b2a9b12ebdcf4d93020e65b07232 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 16 Jun 2021 19:40:43 +0200
Subject: [PATCH 0687/1497] Add fix of corrupted data

---
 htdocs/install/mysql/migration/13.0.0-14.0.0.sql | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index d7aa335a4b2..0097bcca16d 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -32,6 +32,11 @@
 
 -- Missing in v13 or lower
 
+-- VMYSQL4.1 SET sql_mode = 'ALLOW_INVALID_DATES';
+-- VMYSQL4.1 update llx_propal set tms = datec where DATE(STR_TO_DATE(tms, '%Y-%m-%d')) IS NULL;
+-- VMYSQL4.1 SET sql_mode = 'NO_ZERO_DATE';
+-- VMYSQL4.1 update llx_propal set tms = null where DATE(STR_TO_DATE(tms, '%Y-%m-%d')) IS NULL;
+
 ALTER TABLE llx_ecm_files ADD COLUMN note_private text AFTER fk_user_m;
 ALTER TABLE llx_ecm_files ADD COLUMN note_public text AFTER note_private;
 
@@ -492,7 +497,7 @@ ALTER TABLE llx_payment_donation ADD COLUMN ext_payment_id  varchar(128) AFTER n
 -- Rebuild sequence for postgres only after query INSERT INTO llx_salary(rowid, ...
 -- VPGSQL8.2 SELECT dol_util_rebuild_sequences();
 
-UPDATE llx_const SET type = 'chaine', value = __ENCRYPT('github')__ WHERE __DECRYPT('name')__ = 'MAIN_BUGTRACK_ENABLELINK' AND __DECRYPT('value')__ = 1;
+UPDATE llx_const SET type = 'chaine', value = __ENCRYPT('github')__ WHERE __DECRYPT('name')__ = 'MAIN_BUGTRACK_ENABLELINK' AND __DECRYPT('value')__ = '1';
 
 ALTER TABLE llx_facture_fourn_det ADD COLUMN fk_remise_except integer DEFAULT NULL after remise_percent;
 ALTER TABLE llx_facture_fourn_det ADD UNIQUE INDEX uk_fk_remise_except (fk_remise_except, fk_facture_fourn);

From 19ddfc8fc6b6084bddbb24cc9fb84f973adfbe4a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 16 Jun 2021 19:44:58 +0200
Subject: [PATCH 0688/1497] Fix warning

---
 htdocs/install/upgrade.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php
index bc615c1da94..70257bba79e 100644
--- a/htdocs/install/upgrade.php
+++ b/htdocs/install/upgrade.php
@@ -58,12 +58,12 @@ error_reporting(0);
 error_reporting($err);
 
 
-$setuplang = GETPOST("selectlang", 'aZ09', 3) ?GETPOST("selectlang", 'aZ09', 3) : 'auto';
+$setuplang = GETPOST("selectlang", 'aZ09', 3) ? GETPOST("selectlang", 'aZ09', 3) : 'auto';
 $langs->setDefaultLang($setuplang);
-$versionfrom = GETPOST("versionfrom", 'alpha', 3) ?GETPOST("versionfrom", 'alpha', 3) : (empty($argv[1]) ? '' : $argv[1]);
-$versionto = GETPOST("versionto", 'alpha', 3) ?GETPOST("versionto", '', 3) : (empty($argv[2]) ? '' : $argv[2]);
-$dirmodule = ((GETPOST("dirmodule", 'alpha', 3) && GETPOST("dirmodule", 'alpha', 3) != 'ignoredbversion')) ?GETPOST("dirmodule", 'alpha', 3) : ((empty($argv[3]) || $argv[3] == 'ignoredbversion') ? '' : $argv[3]);
-$ignoredbversion = (GETPOST('ignoredbversion', 'alpha', 3) == 'ignoredbversion') ?GETPOST('ignoredbversion', 'alpha', 3) : ((empty($argv[3]) || $argv[3] != 'ignoredbversion') ? '' : $argv[3]);
+$versionfrom = GETPOST("versionfrom", 'alpha', 3) ? GETPOST("versionfrom", 'alpha', 3) : (empty($argv[1]) ? '' : $argv[1]);
+$versionto = GETPOST("versionto", 'alpha', 3) ? GETPOST("versionto", 'alpha', 3) : (empty($argv[2]) ? '' : $argv[2]);
+$dirmodule = ((GETPOST("dirmodule", 'alpha', 3) && GETPOST("dirmodule", 'alpha', 3) != 'ignoredbversion')) ? GETPOST("dirmodule", 'alpha', 3) : ((empty($argv[3]) || $argv[3] == 'ignoredbversion') ? '' : $argv[3]);
+$ignoredbversion = (GETPOST('ignoredbversion', 'alpha', 3) == 'ignoredbversion') ? GETPOST('ignoredbversion', 'alpha', 3) : ((empty($argv[3]) || $argv[3] != 'ignoredbversion') ? '' : $argv[3]);
 
 $langs->loadLangs(array("admin", "install", "other", "errors"));
 

From ac1e6c996656ec378c4ac9005bb993179eecf7d8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 16 Jun 2021 20:17:21 +0200
Subject: [PATCH 0689/1497] FIX sql error on strict mysql

---
 htdocs/product/class/product.class.php | 176 ++++++++++++++-----------
 1 file changed, 98 insertions(+), 78 deletions(-)

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 8d53db4c0b7..b0f8ee1aa8d 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -231,8 +231,8 @@ class Product extends CommonObject
 	public $desiredstock = 0;
 
 	/*
-	* Service expiration
-	*/
+	 * Service expiration
+	 */
 	public $duration_value;
 
 	/**
@@ -543,7 +543,7 @@ class Product extends CommonObject
 	{
 		global $conf, $langs;
 
-			$error = 0;
+		$error = 0;
 
 		// Clean parameters
 		$this->ref = dol_sanitizeFileName(dol_string_nospecial(trim($this->ref)));
@@ -1154,8 +1154,8 @@ class Product extends CommonObject
 				// Multilangs
 				if (!empty($conf->global->MAIN_MULTILANGS)) {
 					if ($this->setMultiLangs($user) < 0) {
-						   $this->error = $langs->trans("Error")." : ".$this->db->error()." - ".$sql;
-						   return -2;
+						$this->error = $langs->trans("Error")." : ".$this->db->error()." - ".$sql;
+						return -2;
 					}
 				}
 
@@ -2253,8 +2253,8 @@ class Product extends CommonObject
 
 		//For MultiCompany
 		//PMP per entity & Stocks Sharings stock_reel includes only stocks shared with this entity
-		$separatedEntityPMP = false;
-		$separatedStock = false;
+		$separatedEntityPMP = false;	// Set to true to get the AWP from table llx_product_perentity instead of field 'pmp' into llx_product.
+		$separatedStock = false;		// Set to true will count stock from subtable llx_product_stock. It is slower than using denormalized field 'stock', but it is required when using multientity and shared warehouses.
 		if (!empty($conf->global->MULTICOMPANY_PRODUCT_SHARING_ENABLED)) {
 			if (!empty($conf->global->MULTICOMPANY_PMP_PER_ENTITY_ENABLED)) {
 				$checkPMPPerEntity = $this->db->query("SELECT pmp FROM " . MAIN_DB_PREFIX . "product_perentity WHERE fk_product  = ".((int) $id)." AND entity = ".(int) $conf->entity);
@@ -2269,17 +2269,18 @@ class Product extends CommonObject
 				$visibleWarehousesEntities .= "," . implode(",", $mc->sharings['stock']);
 			}
 		}
-		if ($separatedStock) {
-			$sql .= " SUM(sp.reel) as stock,";
-		} else {
-			$sql .= " p.stock,";
-		}
 		if ($separatedEntityPMP) {
-			$sql .= " ppe.pmp, p.datec, p.tms, p.import_key, p.entity, p.desiredstock, p.tobatch, p.batch_mask, p.fk_unit,";
+			$sql .= " ppe.pmp,";
 		} else {
-			$sql .= " p.pmp, p.datec, p.tms, p.import_key, p.entity, p.desiredstock, p.tobatch, p.batch_mask, p.fk_unit,";
+			$sql .= " p.pmp,";
+		}
+		$sql .= " p.datec, p.tms, p.import_key, p.entity, p.desiredstock, p.tobatch, p.batch_mask, p.fk_unit,";
+		$sql .= " p.fk_price_expression, p.price_autogen, p.model_pdf,";
+		if ($separatedStock) {
+			$sql .= " SUM(sp.reel) as stock";
+		} else {
+			$sql .= " p.stock";
 		}
-		$sql .= " p.fk_price_expression, p.price_autogen, p.model_pdf";
 		$sql .= " FROM ".MAIN_DB_PREFIX."product as p";
 		if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED) || $separatedEntityPMP) {
 			$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity);
@@ -2300,11 +2301,30 @@ class Product extends CommonObject
 			}
 		}
 		if ($separatedStock) {
-			$sql .= " AND sp.fk_entrepot IN (
-				SELECT rowid
-				FROM ".MAIN_DB_PREFIX."entrepot	WHERE entity IN (".$this->db->sanitize($visibleWarehousesEntities)."))";
+			$sql .= " AND sp.fk_entrepot IN (SELECT rowid FROM ".MAIN_DB_PREFIX."entrepot WHERE entity IN (".$this->db->sanitize($visibleWarehousesEntities)."))";
+		}
+		if ($separatedStock) {
+			$sql .= " GROUP BY p.rowid, p.ref, p.ref_ext, p.label, p.description, p.url, p.note_public, p.note, p.customcode, p.fk_country, p.fk_state, p.lifetime, p.qc_frequency, p.price, p.price_ttc,";
+			$sql .= " p.price_min, p.price_min_ttc, p.price_base_type, p.cost_price, p.default_vat_code, p.tva_tx, p.recuperableonly, p.localtax1_tx, p.localtax2_tx, p.localtax1_type, p.localtax2_type, p.tosell,";
+			$sql .= " p.tobuy, p.fk_product_type, p.duration, p.fk_default_warehouse, p.seuil_stock_alerte, p.canvas, p.net_measure, p.net_measure_units, p.weight, p.weight_units,";
+			$sql .= " p.length, p.length_units, p.width, p.width_units, p.height, p.height_units,";
+			$sql .= " p.surface, p.surface_units, p.volume, p.volume_units, p.barcode, p.fk_barcode_type, p.finished,";
+			if (empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
+				$sql .= " p.accountancy_code_buy, p.accountancy_code_buy_intra, p.accountancy_code_buy_export, p.accountancy_code_sell, p.accountancy_code_sell_intra, p.accountancy_code_sell_export,";
+			} else {
+				$sql .= " ppe.accountancy_code_buy, ppe.accountancy_code_buy_intra, ppe.accountancy_code_buy_export, ppe.accountancy_code_sell, ppe.accountancy_code_sell_intra, ppe.accountancy_code_sell_export,";
+			}
+			if ($separatedEntityPMP) {
+				$sql .= " ppe.pmp,";
+			} else {
+				$sql .= " p.pmp,";
+			}
+			$sql .= " p.datec, p.tms, p.import_key, p.entity, p.desiredstock, p.tobatch, p.batch_mask, p.fk_unit,";
+			$sql .= " p.fk_price_expression, p.price_autogen, p.model_pdf";
+			if (!$separatedStock) {
+				$sql .= ", p.stock";
+			}
 		}
-
 
 		$resql = $this->db->query($sql);
 		if ($resql) {
@@ -2435,39 +2455,39 @@ class Product extends CommonObject
 
 							// Price by quantity
 							/*
-							$this->prices_by_qty[$i]=$result["price_by_qty"];
-							$this->prices_by_qty_id[$i]=$result["rowid"];
-							// Récuperation de la liste des prix selon qty si flag positionné
-							if ($this->prices_by_qty[$i] == 1)
-							{
-							$sql = "SELECT rowid, price, unitprice, quantity, remise_percent, remise, price_base_type";
-							$sql.= " FROM ".MAIN_DB_PREFIX."product_price_by_qty";
-							$sql.= " WHERE fk_product_price = ".$this->prices_by_qty_id[$i];
-							$sql.= " ORDER BY quantity ASC";
-							$resultat=array();
-							$resql = $this->db->query($sql);
-							if ($resql)
-							{
-							$ii=0;
-							while ($result= $this->db->fetch_array($resql)) {
-							$resultat[$ii]=array();
-							$resultat[$ii]["rowid"]=$result["rowid"];
-							$resultat[$ii]["price"]= $result["price"];
-							$resultat[$ii]["unitprice"]= $result["unitprice"];
-							$resultat[$ii]["quantity"]= $result["quantity"];
-							$resultat[$ii]["remise_percent"]= $result["remise_percent"];
-							$resultat[$ii]["remise"]= $result["remise"];                    // deprecated
-							$resultat[$ii]["price_base_type"]= $result["price_base_type"];
-							$ii++;
-							}
-							$this->prices_by_qty_list[$i]=$resultat;
-							}
-							else
-							{
-							dol_print_error($this->db);
-							return -1;
-							}
-							}*/
+							 $this->prices_by_qty[$i]=$result["price_by_qty"];
+							 $this->prices_by_qty_id[$i]=$result["rowid"];
+							 // Récuperation de la liste des prix selon qty si flag positionné
+							 if ($this->prices_by_qty[$i] == 1)
+							 {
+							 $sql = "SELECT rowid, price, unitprice, quantity, remise_percent, remise, price_base_type";
+							 $sql.= " FROM ".MAIN_DB_PREFIX."product_price_by_qty";
+							 $sql.= " WHERE fk_product_price = ".$this->prices_by_qty_id[$i];
+							 $sql.= " ORDER BY quantity ASC";
+							 $resultat=array();
+							 $resql = $this->db->query($sql);
+							 if ($resql)
+							 {
+							 $ii=0;
+							 while ($result= $this->db->fetch_array($resql)) {
+							 $resultat[$ii]=array();
+							 $resultat[$ii]["rowid"]=$result["rowid"];
+							 $resultat[$ii]["price"]= $result["price"];
+							 $resultat[$ii]["unitprice"]= $result["unitprice"];
+							 $resultat[$ii]["quantity"]= $result["quantity"];
+							 $resultat[$ii]["remise_percent"]= $result["remise_percent"];
+							 $resultat[$ii]["remise"]= $result["remise"];                    // deprecated
+							 $resultat[$ii]["price_base_type"]= $result["price_base_type"];
+							 $ii++;
+							 }
+							 $this->prices_by_qty_list[$i]=$resultat;
+							 }
+							 else
+							 {
+							 dol_print_error($this->db);
+							 return -1;
+							 }
+							 }*/
 						} else {
 							$this->error = $this->db->lasterror;
 							return -1;
@@ -2581,9 +2601,9 @@ class Product extends CommonObject
 				}
 
 				if (!empty($conf->dynamicprices->enabled) && !empty($this->fk_price_expression) && empty($ignore_expression)) {
-					   include_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_parser.class.php';
+					include_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_parser.class.php';
 					$priceparser = new PriceParser($this->db);
-					   $price_result = $priceparser->parseProduct($this);
+					$price_result = $priceparser->parseProduct($this);
 					if ($price_result >= 0) {
 						$this->price = $price_result;
 						// Calculate the VAT
@@ -2601,7 +2621,7 @@ class Product extends CommonObject
 				return 0;
 			}
 		} else {
-			$this->error = $this->db->lasterror;
+			$this->error = $this->db->lasterror();
 			return -1;
 		}
 	}
@@ -3996,10 +4016,10 @@ class Product extends CommonObject
 					$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'product_association(fk_product_pere,fk_product_fils,qty,incdec)';
 					$sql .= ' VALUES ('.((int) $id_pere).', '.((int) $id_fils).', '.((float) $qty).', '.((int) $incdec).')';
 					if (!$this->db->query($sql)) {
-						 dol_print_error($this->db);
-						 return -1;
+						dol_print_error($this->db);
+						return -1;
 					} else {
-						 return 1;
+						return 1;
 					}
 				}
 			}
@@ -4203,7 +4223,7 @@ class Product extends CommonObject
 					return -1;
 				}
 			} else {
-				 // If the supplier price already exists for this product and quantity
+				// If the supplier price already exists for this product and quantity
 				$this->product_fourn_price_id = $obj->rowid;
 				return 0;
 			}
@@ -4378,16 +4398,16 @@ class Product extends CommonObject
 
 		// les fournisseurs
 		/*$sql = "INSERT ".MAIN_DB_PREFIX."product_fournisseur ("
-		. " datec, fk_product, fk_soc, ref_fourn, fk_user_author )"
-		. " SELECT '".$this->db->idate($now)."', ".$toId.", fk_soc, ref_fourn, fk_user_author"
-		. " FROM ".MAIN_DB_PREFIX."product_fournisseur"
-		. " WHERE fk_product = ".((int) $fromId);
+		 . " datec, fk_product, fk_soc, ref_fourn, fk_user_author )"
+		 . " SELECT '".$this->db->idate($now)."', ".$toId.", fk_soc, ref_fourn, fk_user_author"
+		 . " FROM ".MAIN_DB_PREFIX."product_fournisseur"
+		 . " WHERE fk_product = ".((int) $fromId);
 
-		if ( ! $this->db->query($sql ) )
-		{
-		$this->db->rollback();
-		return -1;
-		}*/
+		 if ( ! $this->db->query($sql ) )
+		 {
+		 $this->db->rollback();
+		 return -1;
+		 }*/
 
 		// les prix de fournisseurs.
 		$sql = "INSERT ".MAIN_DB_PREFIX."product_fournisseur_price (";
@@ -4468,7 +4488,7 @@ class Product extends CommonObject
 
 				// Recursive call if there is childs to child
 				if (is_array($desc_pere['childs'])) {
-					   //print 'YYY We go down for '.$desc_pere[3]." -> \n";
+					//print 'YYY We go down for '.$desc_pere[3]." -> \n";
 					$this->fetch_prod_arbo($desc_pere['childs'], $compl_path.$desc_pere[3]." -> ", $desc_pere[1] * $multiply, $level + 1, $id, $ignore_stock_load);
 				}
 			}
@@ -4665,17 +4685,17 @@ class Product extends CommonObject
 				}
 				$alreadyfound[$rec['rowid']] = 1;
 				$prods[$rec['rowid']] = array(
-				 0=>$rec['rowid'],
-				 1=>$rec['qty'],
-				 2=>$rec['fk_product_type'],
-				 3=>$this->db->escape($rec['label']),
-				 4=>$rec['incdec'],
-				 5=>$rec['ref']
+					0=>$rec['rowid'],
+					1=>$rec['qty'],
+					2=>$rec['fk_product_type'],
+					3=>$this->db->escape($rec['label']),
+					4=>$rec['incdec'],
+					5=>$rec['ref']
 				);
 				//$prods[$this->db->escape($rec['label'])]= array(0=>$rec['id'],1=>$rec['qty'],2=>$rec['fk_product_type']);
 				//$prods[$this->db->escape($rec['label'])]= array(0=>$rec['id'],1=>$rec['qty']);
 				if (empty($firstlevelonly)) {
-					   $listofchilds = $this->getChildsArbo($rec['rowid'], 0, $level + 1);
+					$listofchilds = $this->getChildsArbo($rec['rowid'], 0, $level + 1);
 					foreach ($listofchilds as $keyChild => $valueChild) {
 						$prods[$rec['rowid']]['childs'][$keyChild] = $valueChild;
 					}
@@ -5804,8 +5824,8 @@ class Product extends CommonObject
 	public static function replaceThirdparty(DoliDB $db, $origin_id, $dest_id)
 	{
 		$tables = array(
-		'product_customer_price',
-		'product_customer_price_log'
+			'product_customer_price',
+			'product_customer_price_log'
 		);
 
 		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);

From 834fc289b61cb9e294684be2fad0eed16524e2d7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 16 Jun 2021 20:35:55 +0200
Subject: [PATCH 0690/1497] Fix look and feel v14

---
 htdocs/compta/bank/list.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/bank/list.php b/htdocs/compta/bank/list.php
index 0d934b5bced..67599ffff0e 100644
--- a/htdocs/compta/bank/list.php
+++ b/htdocs/compta/bank/list.php
@@ -538,7 +538,7 @@ foreach ($accounts as $key => $type) {
 
 	// Label
 	if (!empty($arrayfields['b.label']['checked'])) {
-		print '<td>'.$objecttmp->label.'</td>';
+		print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($objecttmp->label).'">'.dol_escape_htmltag($objecttmp->label).'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
@@ -556,7 +556,7 @@ foreach ($accounts as $key => $type) {
 
 	// Number
 	if (!empty($arrayfields['b.number']['checked'])) {
-		print '<td>'.$objecttmp->number.'</td>';
+		print '<td>'.dol_escape_htmltag($objecttmp->number).'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}

From f850f058fa7fe1f4b186876a49d2b67f2536d201 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 16 Jun 2021 21:06:55 +0200
Subject: [PATCH 0691/1497] Look and feel v14

---
 htdocs/accountancy/customer/list.php  |  8 ++++----
 htdocs/accountancy/supplier/list.php  | 10 +++++-----
 htdocs/core/class/html.form.class.php |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index 347f5b8c4c2..97d94a42f00 100644
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -495,7 +495,7 @@ if ($result) {
 	//print_liste_field_titre("ProductLabel", $_SERVER["PHP_SELF"], "p.label", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("ProductDescription", $_SERVER["PHP_SELF"], "l.description", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "l.total_ht", "", $param, '', $sortfield, $sortorder, 'right maxwidth50 ');
-	print_liste_field_titre("VATRate", $_SERVER["PHP_SELF"], "l.tva_tx", "", $param, '', $sortfield, $sortorder, 'right ');
+	print_liste_field_titre("VATRate", $_SERVER["PHP_SELF"], "l.tva_tx", "", $param, '', $sortfield, $sortorder, 'right ', '', 1);
 	print_liste_field_titre("ThirdParty", $_SERVER["PHP_SELF"], "s.nom", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("Country", $_SERVER["PHP_SELF"], "co.label", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("VATIntraShort", $_SERVER["PHP_SELF"], "s.tva_intra", "", $param, '', $sortfield, $sortorder);
@@ -703,13 +703,13 @@ if ($result) {
 		print '<td class="tdoverflowmax100">'.$thirdpartystatic->getNomUrl(1, 'customer').'</td>';
 
 		// Country
-		print '<td>';
 		$labelcountry = ($objp->country_code && ($langs->trans("Country".$objp->country_code) != "Country".$objp->country_code)) ? $langs->trans("Country".$objp->country_code) : $objp->country_label;
-		print $labelcountry;
+		print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($labelcountry).'">';
+		print dol_escape_htmltag($labelcountry);
 		print '</td>';
 
 		// VAT Num
-		print '<td>'.$objp->tva_intra.'</td>';
+		print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($objp->tva_intra).'">'.dol_escape_htmltag($objp->tva_intra).'</td>';
 
 		// Found accounts
 		print '<td class="small">';
diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php
index 793ba453105..4fd16df2afe 100644
--- a/htdocs/accountancy/supplier/list.php
+++ b/htdocs/accountancy/supplier/list.php
@@ -482,7 +482,7 @@ if ($result) {
 	print '<td class="liste_titre right"><input type="text" class="flat maxwidth50 right" name="search_vat" placeholder="%" size="1" value="'.dol_escape_htmltag($search_vat).'"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth75imp" name="search_societe" value="'.dol_escape_htmltag($search_societe).'"></td>';
 	print '<td class="liste_titre">';
-	print $form->select_country($search_country, 'search_country', '', 0, 'maxwidth125', 'code2', 1, 0, 1);
+	print $form->select_country($search_country, 'search_country', '', 0, 'maxwidth125', 'code2', 1, 0, 1, null, 1);
 	//print '<input type="text" class="flat maxwidth50" name="search_country" value="' . dol_escape_htmltag($search_country) . '">';
 	print '</td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_tvaintra" value="'.dol_escape_htmltag($search_tvaintra).'"></td>';
@@ -503,7 +503,7 @@ if ($result) {
 	//print_liste_field_titre("ProductLabel", $_SERVER["PHP_SELF"], "p.label", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("ProductDescription", $_SERVER["PHP_SELF"], "l.description", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "l.total_ht", "", $param, '', $sortfield, $sortorder, 'right maxwidth50 ');
-	print_liste_field_titre("VATRate", $_SERVER["PHP_SELF"], "l.tva_tx", "", $param, '', $sortfield, $sortorder, 'right ');
+	print_liste_field_titre("VATRate", $_SERVER["PHP_SELF"], "l.tva_tx", "", $param, '', $sortfield, $sortorder, 'right ', '', 1);
 	print_liste_field_titre("ThirdParty", $_SERVER["PHP_SELF"], "s.nom", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("Country", $_SERVER["PHP_SELF"], "co.label", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("VATIntraShort", $_SERVER["PHP_SELF"], "s.tva_intra", "", $param, '', $sortfield, $sortorder);
@@ -687,13 +687,13 @@ if ($result) {
 		print '<td class="tdoverflowmax100">'.$thirdpartystatic->getNomUrl(1, 'supplier').'</td>';
 
 		// Country
-		print '<td>';
 		$labelcountry = ($objp->country_code && ($langs->trans("Country".$objp->country_code) != "Country".$objp->country_code)) ? $langs->trans("Country".$objp->country_code) : $objp->country_label;
-		print $labelcountry;
+		print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($labelcountry).'">';
+		print dol_escape_htmltag($labelcountry);
 		print '</td>';
 
 		// VAT Num
-		print '<td>'.$objp->tva_intra.'</td>';
+		print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($objp->tva_intra).'">'.dol_escape_htmltag($objp->tva_intra).'</td>';
 
 		// Found accounts
 		print '<td class="small">';
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 4fb48a8dbf1..c5b4266e814 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -957,7 +957,7 @@ class Form
 					if ($row['code_iso']) {
 						$labeltoshow .= ' <span class="opacitymedium">('.$row['code_iso'].')</span>';
 						if (empty($hideflags)) {
-							$tmpflag = picto_from_langcode($row['code_iso'], 'class="saturatemedium marginrightonly"');
+							$tmpflag = picto_from_langcode($row['code_iso'], 'class="saturatemedium paddingrightonly"');
 							$labeltoshow = $tmpflag.' '.$labeltoshow;
 						}
 					}
@@ -978,7 +978,7 @@ class Form
 
 		// Make select dynamic
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
-		$out .= ajax_combobox('select'.$htmlname);
+		$out .= ajax_combobox('select'.$htmlname, array(), 0, 0, 'resolve');
 
 		return $out;
 	}

From c4e886672716779bfe60c5d041f5d8eb8d42cb33 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 16 Jun 2021 21:20:27 +0200
Subject: [PATCH 0692/1497] Clean code

---
 htdocs/comm/mailing/index.php | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/htdocs/comm/mailing/index.php b/htdocs/comm/mailing/index.php
index 026acfc43b8..01abc1e5ef1 100644
--- a/htdocs/comm/mailing/index.php
+++ b/htdocs/comm/mailing/index.php
@@ -21,7 +21,7 @@
 /**
  *       \file       htdocs/comm/mailing/index.php
  *       \ingroup    mailing
- *       \brief      Page accueil de la zone mailing
+ *       \brief      Home page for emailing area
  */
 
 require '../../main.inc.php';
@@ -34,8 +34,9 @@ $hookmanager = new HookManager($db);
 $hookmanager->initHooks(array('mailingindex'));
 
 // Load translation files required by the page
-$langs->loadLangs(array('commercial', 'orders'));
+$langs->loadLangs(array('commercial', 'orders', 'mails'));
 
+$object = new Mailing($db);
 
 // Security check
 $result = restrictedArea($user, 'mailing');
@@ -46,9 +47,11 @@ $result = restrictedArea($user, 'mailing');
  */
 
 $help_url = 'EN:Module_EMailing|FR:Module_Mailing|ES:M&oacute;dulo_Mailing';
-llxHeader('', 'EMailing', $help_url);
+$title = $langs->trans('MailingArea');
 
-print load_fiche_titre($langs->trans("MailingArea"));
+llxHeader('', $title, $help_url);
+
+print load_fiche_titre($title);
 
 //print '<table class="notopnoleftnoright" width="100%">';
 //print '<tr><td valign="top" width="30%" class="notopnoleft">';
@@ -190,19 +193,9 @@ if ($result) {
 }
 
 
-//print '</td></tr></table>';
 print '</div></div></div>';
 
 
-if ($langs->file_exists("html/spam.html", 0)) {
-	print "<br><br><br><br>".$langs->trans("Note")."<br>";
-	print '<div style="padding: 4px; background: #FAFAFA; border: 1px solid #BBBBBB;" >';
-	dol_print_file($langs, "html/spam.html", 0);
-	print '</div>';
-
-	print '<br>';
-}
-
 $parameters = array('user' => $user);
 $reshook = $hookmanager->executeHooks('dashboardEmailings', $parameters, $object); // Note that $action and $object may have been modified by hook
 

From e04cf7d53a67cadcbf1b38c89a093ae5a9793b50 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 16 Jun 2021 22:17:44 +0200
Subject: [PATCH 0693/1497] css

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

diff --git a/htdocs/hrm/index.php b/htdocs/hrm/index.php
index 2315edc100c..cdce14780f9 100644
--- a/htdocs/hrm/index.php
+++ b/htdocs/hrm/index.php
@@ -233,8 +233,8 @@ if (!empty($conf->holiday->enabled) && $user->rights->holiday->read) {
 
 				print '<tr class="oddeven">';
 				print '<td class="nowraponall">'.$holidaystatic->getNomUrl(1).'</td>';
-				print '<td class="tdoverflowmax150">'.$userstatic->getNomUrl(-1, 'leave').'</td>';
-				print '<td>'.$typeleaves[$obj->fk_type]['label'].'</td>';
+				print '<td class="tdoverflowmax125">'.$userstatic->getNomUrl(-1, 'leave').'</td>';
+				print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($typeleaves[$obj->fk_type]['label']).'">'.dol_escape_htmltag($typeleaves[$obj->fk_type]['label']).'</td>';
 
 				$starthalfday = ($obj->halfday == -1 || $obj->halfday == 2) ? 'afternoon' : 'morning';
 				$endhalfday = ($obj->halfday == 1 || $obj->halfday == 2) ? 'morning' : 'afternoon';

From 3754c2c3c9f1499317b3da5d5f39bd83124754bf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 16 Jun 2021 22:49:26 +0200
Subject: [PATCH 0694/1497] Fix name of field

---
 .../class/utils_diff.class.php                |   0
 .../install/mysql/migration/13.0.0-14.0.0.sql |   2 +
 ...lx_knowledgemanagement_knowledgerecord.sql |   1 +
 .../class/knowledgerecord.class.php           |   3 +
 .../knowledgerecord_card.php                  |  50 +-
 htdocs/ticket/class/cticketcategory.class.php | 819 ++++++++++++++++++
 6 files changed, 826 insertions(+), 49 deletions(-)
 rename htdocs/{ticket => core}/class/utils_diff.class.php (100%)
 create mode 100644 htdocs/ticket/class/cticketcategory.class.php

diff --git a/htdocs/ticket/class/utils_diff.class.php b/htdocs/core/class/utils_diff.class.php
similarity index 100%
rename from htdocs/ticket/class/utils_diff.class.php
rename to htdocs/core/class/utils_diff.class.php
diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index 0097bcca16d..deb40d9c7fd 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -518,11 +518,13 @@ CREATE TABLE llx_knowledgemanagement_knowledgerecord(
 	answer text,
 	url varchar(255),
 	fk_ticket integer,
+	fk_c_ticket_category integer,
 	status integer NOT NULL
 	-- END MODULEBUILDER FIELDS
 ) ENGINE=innodb;
 
 ALTER TABLE llx_knowledgemanagement_knowledgerecord ADD COLUMN fk_ticket integer;
+ALTER TABLE llx_knowledgemanagement_knowledgerecord ADD COLUMN fk_c_ticket_category integer;
 ALTER TABLE llx_knowledgemanagement_knowledgerecord ADD COLUMN url varchar(255);
 
 
diff --git a/htdocs/install/mysql/tables/llx_knowledgemanagement_knowledgerecord.sql b/htdocs/install/mysql/tables/llx_knowledgemanagement_knowledgerecord.sql
index c5332372019..65c8add25c4 100644
--- a/htdocs/install/mysql/tables/llx_knowledgemanagement_knowledgerecord.sql
+++ b/htdocs/install/mysql/tables/llx_knowledgemanagement_knowledgerecord.sql
@@ -30,6 +30,7 @@ CREATE TABLE llx_knowledgemanagement_knowledgerecord(
 	answer text,
 	url varchar(255),
 	fk_ticket integer,
+	fk_c_ticket_category integer,
 	status integer NOT NULL
 	-- END MODULEBUILDER FIELDS
 ) ENGINE=innodb;
diff --git a/htdocs/knowledgemanagement/class/knowledgerecord.class.php b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
index 85d8a1bcb9e..872c5289c61 100644
--- a/htdocs/knowledgemanagement/class/knowledgerecord.class.php
+++ b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
@@ -112,6 +112,8 @@ class KnowledgeRecord extends CommonObject
 		'model_pdf' => array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>'1', 'position'=>1010, 'notnull'=>-1, 'visible'=>0,),
 		'question' => array('type'=>'text', 'label'=>'Question', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1, 'csslist'=>'tdoverflow300'),
 		'answer' => array('type'=>'html', 'label'=>'Solution', 'enabled'=>'1', 'position'=>50, 'notnull'=>0, 'visible'=>3, 'csslist'=>'tdoverflow300'),
+		//'url' => array('type'=>'varchar(255)', 'label'=>'URL', 'enabled'=>'1', 'position'=>55, 'notnull'=>0, 'visible'=>-1, 'csslist'=>'tdoverflow200', 'help'=>'UrlForInfoPage'),
+		'fk_c_ticket_category' => array('type'=>'integer:CTicketCategory:ticket/class/cticketcategory.class.php', 'label'=>'TicketGroup', 'enabled'=>'$conf->ticket->enabled', 'position'=>512, 'notnull'=>0, 'visible'=>-1, 'help'=>'YouCanLinkArticleToATicketCategory'),
 		'status' => array('type'=>'integer', 'label'=>'Status', 'enabled'=>'1', 'position'=>1000, 'notnull'=>1, 'visible'=>1, 'default'=>0, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Draft', '1'=>'Valid'),),
 	);
 	public $rowid;
@@ -126,6 +128,7 @@ class KnowledgeRecord extends CommonObject
 	public $model_pdf;
 	public $question;
 	public $answer;
+	public $url;
 	public $status;
 	// END MODULEBUILDER PROPERTIES
 
diff --git a/htdocs/knowledgemanagement/knowledgerecord_card.php b/htdocs/knowledgemanagement/knowledgerecord_card.php
index b33ecb652f7..c96319eb022 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_card.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_card.php
@@ -327,7 +327,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	print '<table class="border centpercent tableforfield">'."\n";
 
 	// Common attributes
-	//$keyforbreak='fieldkeytoswitchonsecondcolumn';	// We change column just before this field
+	$keyforbreak='fk_c_ticket_category';	// We change column just before this field
 	//unset($object->fields['fk_project']);				// Hide field already shown in banner
 	//unset($object->fields['fk_soc']);					// Hide field already shown in banner
 	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';
@@ -344,54 +344,6 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	print dol_get_fiche_end();
 
 
-	/*
-	 * Lines
-	 */
-
-	if (!empty($object->table_element_line)) {
-		// Show object lines
-		$result = $object->getLinesArray();
-
-		print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '#addline' : '#line_'.GETPOST('lineid', 'int')).'" method="POST">
-		<input type="hidden" name="token" value="' . newToken().'">
-		<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline').'">
-		<input type="hidden" name="mode" value="">
-		<input type="hidden" name="id" value="' . $object->id.'">
-		';
-
-		if (!empty($conf->use_javascript_ajax) && $object->status == 0) {
-			include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php';
-		}
-
-		print '<div class="div-table-responsive-no-min">';
-		if (!empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline')) {
-			print '<table id="tablelines" class="noborder noshadow" width="100%">';
-		}
-
-		if (!empty($object->lines)) {
-			$object->printObjectLines($action, $mysoc, null, GETPOST('lineid', 'int'), 1);
-		}
-
-		// Form to add new line
-		if ($object->status == 0 && $permissiontoadd && $action != 'selectlines') {
-			if ($action != 'editline') {
-				// Add products/services form
-				$object->formAddObjectLine(1, $mysoc, $soc);
-
-				$parameters = array();
-				$reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-			}
-		}
-
-		if (!empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline')) {
-			print '</table>';
-		}
-		print '</div>';
-
-		print "</form>\n";
-	}
-
-
 	// Buttons for actions
 
 	if ($action != 'presend' && $action != 'editline') {
diff --git a/htdocs/ticket/class/cticketcategory.class.php b/htdocs/ticket/class/cticketcategory.class.php
new file mode 100644
index 00000000000..4e3e6311354
--- /dev/null
+++ b/htdocs/ticket/class/cticketcategory.class.php
@@ -0,0 +1,819 @@
+<?php
+/* 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
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file        htdocs/modulebuilder/template/class/myobject.class.php
+ * \ingroup     mymodule
+ * \brief       This file is a CRUD class file for MyObject (Create/Read/Update/Delete)
+ */
+
+// Put here all includes required by your class file
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
+//require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
+//require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
+
+/**
+ * Class for MyObject
+ */
+class CTicketCategory extends CommonObject
+{
+	/**
+	 * @var string ID of module.
+	 */
+	public $module = 'ticket';
+
+	/**
+	 * @var string ID to identify managed object.
+	 */
+	public $element = 'cticketcategory';
+
+	/**
+	 * @var string Name of table without prefix where object is stored. This is also the key used for extrafields management.
+	 */
+	public $table_element = 'c_ticket_category';
+
+	/**
+	 * @var int  Does this object support multicompany module ?
+	 * 0=No test on entity, 1=Test with field entity, 'field@table'=Test with link by field@table
+	 */
+	public $ismultientitymanaged = 0;
+
+	/**
+	 * @var int  Does object support extrafields ? 0=No, 1=Yes
+	 */
+	public $isextrafieldmanaged = 0;
+
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
+	public $picto = 'ticket';
+
+
+	const STATUS_DISABLED = 0;
+	const STATUS_ENABLED = 1;
+
+
+	/**
+	 *  'type' field format ('integer', 'integer:ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter]]', 'sellist:TableName:LabelFieldName[:KeyFieldName[:KeyFieldParent[:Filter]]]', 'varchar(x)', 'double(24,8)', 'real', 'price', 'text', 'text:none', 'html', 'date', 'datetime', 'timestamp', 'duration', 'mail', 'phone', 'url', 'password')
+	 *         Note: Filter can be a string like "(t.ref:like:'SO-%') or (t.date_creation:<:'20160101') or (t.nature:is:NULL)"
+	 *  'label' the translation key.
+	 *  'picto' is code of a picto to show before value in forms
+	 *  'enabled' is a condition when the field must be managed (Example: 1 or '$conf->global->MY_SETUP_PARAM)
+	 *  'position' is the sort order of field.
+	 *  'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
+	 *  'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). 5=Visible on list and view only (not create/not update). Using a negative value means field is not shown by default on list but can be selected for viewing)
+	 *  'noteditable' says if field is not editable (1 or 0)
+	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
+	 *  '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_...).
+	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
+	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
+	 *  'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'maxwidth200', 'wordbreak', 'tdoverflowmax200'
+	 *  'help' is a 'TranslationString' to use to show a tooltip on field. You can also use 'TranslationString:keyfortooltiponlick' for a tooltip on click.
+	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
+	 *  'disabled' is 1 if we want to have the field locked by a 'disabled' attribute. In most cases, this is never set into the definition of $fields into class, but is set dynamically by some part of code.
+	 *  'arrayofkeyval' to set a list of values if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel"). Note that type can be 'integer' or 'varchar'
+	 *  'autofocusoncreate' to have field having the focus on a create form. Only 1 field should have this property set to 1.
+	 *  'comment' is not used. You can store here any text of your choice. It is not used by application.
+	 *
+	 *  Note: To have value dynamic, you can set value to 0 in definition and edit the value on the fly into the constructor.
+	 */
+
+	// 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', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10),
+		'entity' =>array('type'=>'integer', 'label'=>'Entity', 'default'=>1, 'enabled'=>1, 'visible'=>-2, 'position'=>15, 'index'=>1),
+		'code' =>array('type'=>'varchar(32)', 'label'=>'Code', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>20),
+		'pos' =>array('type'=>'integer', 'label'=>'Pos', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>25),
+		'label' =>array('type'=>'varchar(128)', 'label'=>'Label', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>30, 'showoncombobox'=>1),
+		'active' =>array('type'=>'integer', 'label'=>'Active', 'enabled'=>1, 'visible'=>-1, 'position'=>35),
+		'use_default' =>array('type'=>'integer', 'label'=>'Usedefault', 'enabled'=>1, 'visible'=>-1, 'position'=>40),
+		'description' =>array('type'=>'varchar(255)', 'label'=>'Description', 'enabled'=>1, 'visible'=>-1, 'position'=>45),
+		'fk_parent' =>array('type'=>'integer', 'label'=>'Fkparent', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>50),
+		'force_severity' =>array('type'=>'varchar(32)', 'label'=>'Forceseverity', 'enabled'=>1, 'visible'=>-1, 'position'=>55),
+		'public' =>array('type'=>'integer', 'label'=>'Public', 'enabled'=>1, 'visible'=>-1, 'position'=>60),
+	);
+
+	/**
+	 * @var int ID
+	 */
+	public $rowid;
+
+	/**
+	 * @var string Ref
+	 */
+	public $ref;
+
+	/**
+	 * @var int Entity
+	 */
+	public $entity;
+
+	/**
+	 * @var string label
+	 */
+	public $label;
+
+	/**
+	 * @var string amount
+	 */
+	public $amount;
+
+	/**
+	 * @var int Status
+	 */
+	public $status;
+
+	/**
+	 * @var integer|string date_creation
+	 */
+	public $date_creation;
+
+	/**
+	 * @var integer tms
+	 */
+	public $tms;
+
+	/**
+	 * @var int ID
+	 */
+	public $fk_user_creat;
+
+	/**
+	 * @var int ID
+	 */
+	public $fk_user_modif;
+
+	/**
+	 * @var string public $last_main_doc
+	 */
+	public $last_main_doc;
+
+	/**
+	 * @var string import_key
+	 */
+	public $import_key;
+	// END MODULEBUILDER PROPERTIES
+
+
+
+	/**
+	 * Constructor
+	 *
+	 * @param DoliDb $db Database handler
+	 */
+	public function __construct(DoliDB $db)
+	{
+		global $conf, $langs;
+
+		$this->db = $db;
+
+		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
+			$this->fields['rowid']['visible'] = 0;
+		}
+		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) {
+			$this->fields['entity']['enabled'] = 0;
+		}
+
+		// Example to show how to set values of fields definition dynamically
+		/*if ($user->rights->mymodule->myobject->read) {
+			$this->fields['myfield']['visible'] = 1;
+			$this->fields['myfield']['noteditable'] = 0;
+		}*/
+
+		// Unset fields that are disabled
+		foreach ($this->fields as $key => $val) {
+			if (isset($val['enabled']) && empty($val['enabled'])) {
+				unset($this->fields[$key]);
+			}
+		}
+
+		// Translate some data of arrayofkeyval
+		if (is_object($langs)) {
+			foreach ($this->fields as $key => $val) {
+				if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
+					foreach ($val['arrayofkeyval'] as $key2 => $val2) {
+						$this->fields[$key]['arrayofkeyval'][$key2] = $langs->trans($val2);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * 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)
+	{
+		$resultcreate = $this->createCommon($user, $notrigger);
+
+		//$resultvalidate = $this->validate($user, $notrigger);
+
+		return $resultcreate;
+	}
+
+	/**
+	 * Clone an object into another one
+	 *
+	 * @param  	User 	$user      	User that creates
+	 * @param  	int 	$fromid     Id of object to clone
+	 * @return 	mixed 				New object created, <0 if KO
+	 */
+	public function createFromClone(User $user, $fromid)
+	{
+		global $langs, $extrafields;
+		$error = 0;
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$object = new self($this->db);
+
+		$this->db->begin();
+
+		// Load source object
+		$result = $object->fetchCommon($fromid);
+		if ($result > 0 && !empty($object->table_element_line)) {
+			$object->fetchLines();
+		}
+
+		// get lines so they will be clone
+		//foreach($this->lines as $line)
+		//	$line->fetch_optionals();
+
+		// Reset some properties
+		unset($object->id);
+		unset($object->fk_user_creat);
+		unset($object->import_key);
+
+		// Clear fields
+		if (property_exists($object, 'ref')) {
+			$object->ref = empty($this->fields['ref']['default']) ? "Copy_Of_".$object->ref : $this->fields['ref']['default'];
+		}
+		if (property_exists($object, 'label')) {
+			$object->label = empty($this->fields['label']['default']) ? $langs->trans("CopyOf")." ".$object->label : $this->fields['label']['default'];
+		}
+		if (property_exists($object, 'status')) {
+			$object->status = self::STATUS_DRAFT;
+		}
+		if (property_exists($object, 'date_creation')) {
+			$object->date_creation = dol_now();
+		}
+		if (property_exists($object, 'date_modification')) {
+			$object->date_modification = null;
+		}
+		// ...
+		// Clear extrafields that are unique
+		if (is_array($object->array_options) && count($object->array_options) > 0) {
+			$extrafields->fetch_name_optionals_label($this->table_element);
+			foreach ($object->array_options as $key => $option) {
+				$shortkey = preg_replace('/options_/', '', $key);
+				if (!empty($extrafields->attributes[$this->table_element]['unique'][$shortkey])) {
+					//var_dump($key); var_dump($clonedObj->array_options[$key]); exit;
+					unset($object->array_options[$key]);
+				}
+			}
+		}
+
+		// Create clone
+		$object->context['createfromclone'] = 'createfromclone';
+		$result = $object->createCommon($user);
+		if ($result < 0) {
+			$error++;
+			$this->error = $object->error;
+			$this->errors = $object->errors;
+		}
+
+		if (!$error) {
+			// copy internal contacts
+			if ($this->copy_linked_contact($object, 'internal') < 0) {
+				$error++;
+			}
+		}
+
+		if (!$error) {
+			// copy external contacts if same company
+			if (property_exists($this, 'fk_soc') && $this->fk_soc == $object->socid) {
+				if ($this->copy_linked_contact($object, 'external') < 0) {
+					$error++;
+				}
+			}
+		}
+
+		unset($object->context['createfromclone']);
+
+		// End
+		if (!$error) {
+			$this->db->commit();
+			return $object;
+		} else {
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+	/**
+	 * 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);
+		if ($result > 0 && !empty($this->table_element_line)) {
+			$this->fetchLines();
+		}
+		return $result;
+	}
+
+	/**
+	 * Load object lines in memory from the database
+	 *
+	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 */
+	public function fetchLines()
+	{
+		$this->lines = array();
+
+		$result = $this->fetchLinesCommon();
+		return $result;
+	}
+
+
+	/**
+	 * Load list of objects in memory from the database.
+	 *
+	 * @param  string      $sortorder    Sort Order
+	 * @param  string      $sortfield    Sort field
+	 * @param  int         $limit        limit
+	 * @param  int         $offset       Offset
+	 * @param  array       $filter       Filter array. Example array('field'=>'valueforlike', 'customurl'=>...)
+	 * @param  string      $filtermode   Filter mode (AND or OR)
+	 * @return array|int                 int <0 if KO, array of pages if OK
+	 */
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
+	{
+		global $conf;
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$records = array();
+
+		$sql = 'SELECT ';
+		$sql .= $this->getFieldList('t');
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
+		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
+			$sql .= ' WHERE t.entity IN ('.getEntity($this->table_element).')';
+		} else {
+			$sql .= ' WHERE 1 = 1';
+		}
+		// Manage filter
+		$sqlwhere = array();
+		if (count($filter) > 0) {
+			foreach ($filter as $key => $value) {
+				if ($key == 't.rowid') {
+					$sqlwhere[] = $key.'='.$value;
+				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
+				} elseif ($key == 'customsql') {
+					$sqlwhere[] = $value;
+				} elseif (strpos($value, '%') === false) {
+					$sqlwhere[] = $key.' IN ('.$this->db->sanitize($this->db->escape($value)).')';
+				} else {
+					$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
+				}
+			}
+		}
+		if (count($sqlwhere) > 0) {
+			$sql .= ' AND ('.implode(' '.$filtermode.' ', $sqlwhere).')';
+		}
+
+		if (!empty($sortfield)) {
+			$sql .= $this->db->order($sortfield, $sortorder);
+		}
+		if (!empty($limit)) {
+			$sql .= ' '.$this->db->plimit($limit, $offset);
+		}
+
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$num = $this->db->num_rows($resql);
+			$i = 0;
+			while ($i < ($limit ? min($limit, $num) : $num)) {
+				$obj = $this->db->fetch_object($resql);
+
+				$record = new self($this->db);
+				$record->setVarsFromFetchObj($obj);
+
+				$records[$record->id] = $record;
+
+				$i++;
+			}
+			$this->db->free($resql);
+
+			return $records;
+		} else {
+			$this->errors[] = 'Error '.$this->db->lasterror();
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+
+			return -1;
+		}
+	}
+
+	/**
+	 * 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);
+		//return $this->deleteCommon($user, $notrigger, 1);
+	}
+
+	/**
+	 *  Delete a line of object in database
+	 *
+	 *	@param  User	$user       User that delete
+	 *  @param	int		$idline		Id of line to delete
+	 *  @param 	bool 	$notrigger  false=launch triggers after, true=disable triggers
+	 *  @return int         		>0 if OK, <0 if KO
+	 */
+	public function deleteLine(User $user, $idline, $notrigger = false)
+	{
+		if ($this->status < 0) {
+			$this->error = 'ErrorDeleteLineNotAllowedByObjectStatus';
+			return -2;
+		}
+
+		return $this->deleteLineCommon($user, $idline, $notrigger);
+	}
+
+
+	/**
+	 *	Validate object
+	 *
+	 *	@param		User	$user     		User making status change
+	 *  @param		int		$notrigger		1=Does not execute triggers, 0= execute triggers
+	 *	@return  	int						<=0 if OK, 0=Nothing done, >0 if KO
+	 */
+	public function validate($user, $notrigger = 0)
+	{
+		global $conf, $langs;
+
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+		$error = 0;
+
+		// Protection
+		if ($this->status == self::STATUS_VALIDATED) {
+			dol_syslog(get_class($this)."::validate action abandonned: already validated", LOG_WARNING);
+			return 0;
+		}
+
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->mymodule->myobject->write))
+		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->mymodule->myobject->myobject_advance->validate))))
+		 {
+		 $this->error='NotEnoughPermissions';
+		 dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
+		 return -1;
+		 }*/
+
+		$now = dol_now();
+
+		$this->db->begin();
+
+		// Define new ref
+		if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) { // empty should not happened, but when it occurs, the test save life
+			$num = $this->getNextNumRef();
+		} else {
+			$num = $this->ref;
+		}
+		$this->newref = $num;
+
+		if (!empty($num)) {
+			// Validate
+			$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
+			$sql .= " SET ref = '".$this->db->escape($num)."',";
+			$sql .= " status = ".self::STATUS_VALIDATED;
+			if (!empty($this->fields['date_validation'])) {
+				$sql .= ", date_validation = '".$this->db->idate($now)."'";
+			}
+			if (!empty($this->fields['fk_user_valid'])) {
+				$sql .= ", fk_user_valid = ".((int) $user->id);
+			}
+			$sql .= " WHERE rowid = ".((int) $this->id);
+
+			dol_syslog(get_class($this)."::validate()", LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if (!$resql) {
+				dol_print_error($this->db);
+				$this->error = $this->db->lasterror();
+				$error++;
+			}
+
+			if (!$error && !$notrigger) {
+				// Call trigger
+				$result = $this->call_trigger('MYOBJECT_VALIDATE', $user);
+				if ($result < 0) {
+					$error++;
+				}
+				// End call triggers
+			}
+		}
+
+		if (!$error) {
+			$this->oldref = $this->ref;
+
+			// Rename directory if dir was a temporary ref
+			if (preg_match('/^[\(]?PROV/i', $this->ref)) {
+				// Now we rename also files into index
+				$sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filename = CONCAT('".$this->db->escape($this->newref)."', SUBSTR(filename, ".(strlen($this->ref) + 1).")), filepath = 'myobject/".$this->db->escape($this->newref)."'";
+				$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'myobject/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
+				$resql = $this->db->query($sql);
+				if (!$resql) {
+					$error++; $this->error = $this->db->lasterror();
+				}
+
+				// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
+				$oldref = dol_sanitizeFileName($this->ref);
+				$newref = dol_sanitizeFileName($num);
+				$dirsource = $conf->mymodule->dir_output.'/myobject/'.$oldref;
+				$dirdest = $conf->mymodule->dir_output.'/myobject/'.$newref;
+				if (!$error && file_exists($dirsource)) {
+					dol_syslog(get_class($this)."::validate() rename dir ".$dirsource." into ".$dirdest);
+
+					if (@rename($dirsource, $dirdest)) {
+						dol_syslog("Rename ok");
+						// Rename docs starting with $oldref with $newref
+						$listoffiles = dol_dir_list($conf->mymodule->dir_output.'/myobject/'.$newref, 'files', 1, '^'.preg_quote($oldref, '/'));
+						foreach ($listoffiles as $fileentry) {
+							$dirsource = $fileentry['name'];
+							$dirdest = preg_replace('/^'.preg_quote($oldref, '/').'/', $newref, $dirsource);
+							$dirsource = $fileentry['path'].'/'.$dirsource;
+							$dirdest = $fileentry['path'].'/'.$dirdest;
+							@rename($dirsource, $dirdest);
+						}
+					}
+				}
+			}
+		}
+
+		// Set new ref and current status
+		if (!$error) {
+			$this->ref = $num;
+			$this->status = self::STATUS_VALIDATED;
+		}
+
+		if (!$error) {
+			$this->db->commit();
+			return 1;
+		} else {
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+
+	/**
+	 *	Set cancel status
+	 *
+	 *	@param	User	$user			Object user that modify
+	 *  @param	int		$notrigger		1=Does not execute triggers, 0=Execute triggers
+	 *	@return	int						<0 if KO, 0=Nothing done, >0 if OK
+	 */
+	public function cancel($user, $notrigger = 0)
+	{
+		// Protection
+		if ($this->status != self::STATUS_VALIDATED) {
+			return 0;
+		}
+
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->mymodule->write))
+		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->mymodule->mymodule_advance->validate))))
+		 {
+		 $this->error='Permission denied';
+		 return -1;
+		 }*/
+
+		return $this->setStatusCommon($user, self::STATUS_DISABLED, $notrigger, 'CTICKETCATEGORY_CANCEL');
+	}
+
+	/**
+	 *  Return a link to the object card (with optionaly the picto)
+	 *
+	 *  @param  int     $withpicto                  Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
+	 *  @param  string  $option                     On what the link point to ('nolink', ...)
+	 *  @param  int     $notooltip                  1=Disable tooltip
+	 *  @param  string  $morecss                    Add more css on link
+	 *  @param  int     $save_lastsearch_value      -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *  @return	string                              String with URL
+	 */
+	public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
+	{
+		global $conf, $langs, $hookmanager;
+
+		if (!empty($conf->dol_no_mouse_hover)) {
+			$notooltip = 1; // Force disable tooltips
+		}
+
+		$result = '';
+
+		/*$label = img_picto('', $this->picto).' <u>'.$langs->trans("MyObject").'</u>';
+		if (isset($this->status)) {
+			$label .= ' '.$this->getLibStatut(5);
+		}
+		$label .= '<br>';
+		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
+		*/
+		$label = '';
+
+		//$url = dol_buildpath('/mymodule/myobject_card.php', 1).'?id='.$this->id;
+		$url = '';
+
+		if ($option != 'nolink') {
+			// Add param to save lastsearch_values or not
+			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {
+				$add_save_lastsearch_values = 1;
+			}
+			if ($add_save_lastsearch_values) {
+				$url .= '&save_lastsearch_values=1';
+			}
+		}
+
+		$linkclose = '';
+		if (empty($notooltip)) {
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+				$label = $langs->trans("ShowMyObject");
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
+			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
+		} else {
+			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		}
+
+		if ($option == 'nolink') {
+			$linkstart = '<span';
+		} else {
+			$linkstart = '<a href="'.$url.'"';
+		}
+		$linkstart .= $linkclose.'>';
+		if ($option == 'nolink') {
+			$linkend = '</span>';
+		} else {
+			$linkend = '</a>';
+		}
+
+		//$result .= $linkstart;
+		$result .= $this->label;
+		//$result .= $linkend;
+
+		global $action, $hookmanager;
+		$hookmanager->initHooks(array('cticketcategorydao'));
+		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+		if ($reshook > 0) {
+			$result = $hookmanager->resPrint;
+		} else {
+			$result .= $hookmanager->resPrint;
+		}
+
+		return $result;
+	}
+
+	/**
+	 *  Return the label of the 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
+	 */
+	public function getLibStatut($mode = 0)
+	{
+		return $this->LibStatut($this->status, $mode);
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  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
+	 */
+	public function LibStatut($status, $mode = 0)
+	{
+		// phpcs:enable
+		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
+			global $langs;
+			//$langs->load("mymodule@mymodule");
+			$this->labelStatus[self::STATUS_ENABLED] = $langs->trans('Enabled');
+			$this->labelStatus[self::STATUS_DISABLED] = $langs->trans('Disabled');
+			$this->labelStatusShort[self::STATUS_ENABLED] = $langs->trans('Enabled');
+			$this->labelStatusShort[self::STATUS_DISABLED] = $langs->trans('Disabled');
+		}
+
+		$statusType = 'status'.$status;
+		//if ($status == self::STATUS_VALIDATED) $statusType = 'status1';
+		if ($status == self::STATUS_DISABLED) {
+			$statusType = 'status6';
+		}
+
+		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
+	}
+
+	/**
+	 *	Load the info information in the object
+	 *
+	 *	@param  int		$id       Id of object
+	 *	@return	void
+	 */
+	public function info($id)
+	{
+		$sql = 'SELECT rowid, date_creation as datec, tms as datem,';
+		$sql .= ' fk_user_creat, fk_user_modif';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
+		$sql .= ' WHERE t.rowid = '.((int) $id);
+		$result = $this->db->query($sql);
+		if ($result) {
+			if ($this->db->num_rows($result)) {
+				$obj = $this->db->fetch_object($result);
+				$this->id = $obj->rowid;
+				if ($obj->fk_user_author) {
+					$cuser = new User($this->db);
+					$cuser->fetch($obj->fk_user_author);
+					$this->user_creation = $cuser;
+				}
+
+				if ($obj->fk_user_valid) {
+					$vuser = new User($this->db);
+					$vuser->fetch($obj->fk_user_valid);
+					$this->user_validation = $vuser;
+				}
+
+				if ($obj->fk_user_cloture) {
+					$cluser = new User($this->db);
+					$cluser->fetch($obj->fk_user_cloture);
+					$this->user_cloture = $cluser;
+				}
+
+				$this->date_creation     = $this->db->jdate($obj->datec);
+				$this->date_modification = $this->db->jdate($obj->datem);
+				$this->date_validation   = $this->db->jdate($obj->datev);
+			}
+
+			$this->db->free($result);
+		} else {
+			dol_print_error($this->db);
+		}
+	}
+
+	/**
+	 * Initialise object with example values
+	 * Id must be 0 if object instance is a specimen
+	 *
+	 * @return void
+	 */
+	public function initAsSpecimen()
+	{
+		$this->initAsSpecimenCommon();
+	}
+}

From 61bd572a9c367ae70b0ac5c2cd20a1d459d08f1b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 17 Jun 2021 03:37:52 +0200
Subject: [PATCH 0695/1497] Fix token for ajax call

---
 htdocs/admin/system/perf.php                 | 14 ++++++++++----
 htdocs/blockedlog/admin/blockedlog_list.php  | 13 ++++++++-----
 htdocs/contact/list.php                      |  6 +++---
 htdocs/core/ajax/pingresult.php              |  4 +---
 htdocs/core/class/html.form.class.php        |  7 ++-----
 htdocs/core/js/lib_notification.js.php       |  2 +-
 htdocs/core/tpl/ajax/fileupload_main.tpl.php |  7 +++++--
 htdocs/loan/schedule.php                     |  3 ++-
 htdocs/main.inc.php                          | 17 ++++++++++-------
 htdocs/public/notice.php                     |  2 +-
 htdocs/takepos/floors.php                    | 20 ++++++++++----------
 htdocs/takepos/index.php                     |  7 +++++--
 htdocs/takepos/invoice.php                   |  5 +++--
 htdocs/takepos/pay.php                       |  5 ++++-
 htdocs/takepos/send.php                      |  3 ++-
 15 files changed, 67 insertions(+), 48 deletions(-)

diff --git a/htdocs/admin/system/perf.php b/htdocs/admin/system/perf.php
index 2a8dfa975cd..758a93a765d 100644
--- a/htdocs/admin/system/perf.php
+++ b/htdocs/admin/system/perf.php
@@ -172,7 +172,8 @@ jQuery(document).ready(function() {
   var compphpstring;
   getphpurl = $.ajax({
     type: "GET",
-    url: \''.DOL_URL_ROOT.'/index.php\',
+	data: { token: \''.currentToken().'\' },
+    url: \''.DOL_URL_ROOT.'/public/notice.php\',
     cache: false,
     /* async: false, */
     /* crossDomain: true,*/
@@ -211,10 +212,11 @@ jQuery(document).ready(function() {
   var compcssstring;
   getcssurl = $.ajax({
     type: "GET",
+	data: { token: \'notrequired\' },
     url: \''.DOL_URL_ROOT.'/includes/jquery/css/base/jquery-ui.css\',
     cache: false,
     /* async: false, */
-    /*crossDomain: true, */
+    /* crossDomain: true, */
     success: function () {
       	cachecssstring=getcssurl.getResponseHeader(\'Cache-Control\');
       	/* alert(\'css:\'+getcssurl.getAllResponseHeaders()); */
@@ -250,10 +252,11 @@ jQuery(document).ready(function() {
   var compcssphpstring;
   getcssphpurl = $.ajax({
     type: "GET",
+	data: { token: \''.currentToken().'\' },
     url: \''.DOL_URL_ROOT.'/theme/eldy/style.css.php\',
     cache: false,
     /* async: false, */
-    /*crossDomain: true,*/
+    /* crossDomain: true,*/
     success: function () {
       	cachecssphpstring=getcssphpurl.getResponseHeader(\'Cache-Control\');
       	/* alert(\'cssphp:\'+getcssphpurl.getAllResponseHeaders()); */
@@ -289,10 +292,11 @@ jQuery(document).ready(function() {
   var compimgstring;
   getimgurl = $.ajax({
     type: "GET",
+	data: { token: \'notrequired\' },
     url: \''.DOL_URL_ROOT.'/theme/eldy/img/help.png\',
     cache: false,
     /* async: false, */
-    /*crossDomain: true,*/
+    /* crossDomain: true,*/
     success: function () {
       	cacheimgstring=getimgurl.getResponseHeader(\'Cache-Control\');
       	/* alert(\'img:\'+getimgurl.getAllResponseHeaders()); */
@@ -328,6 +332,7 @@ jQuery(document).ready(function() {
   var compjsstring;
   getjsurl = $.ajax({
     type: "GET",
+	data: { token: \'notrequired\' },
     url: \''.DOL_URL_ROOT.'/core/js/lib_rare.js\',
     cache: false,
     /* async: false, */
@@ -367,6 +372,7 @@ jQuery(document).ready(function() {
   var compjsphpstring;
   getjsphpurl = $.ajax({
     type: "GET",
+	data: { token: \''.currentToken().'\' },
     url: \''.DOL_URL_ROOT.'/core/js/lib_head.js.php\',
     cache: false,
     /* async: false, */
diff --git a/htdocs/blockedlog/admin/blockedlog_list.php b/htdocs/blockedlog/admin/blockedlog_list.php
index 6b59c009ae7..265c12dd49c 100644
--- a/htdocs/blockedlog/admin/blockedlog_list.php
+++ b/htdocs/blockedlog/admin/blockedlog_list.php
@@ -613,8 +613,10 @@ jQuery(document).ready(function () {
 		var fk_block = $(this).attr("data-blockid");
 
 		$.ajax({
-			url:"../ajax/block-info.php?id="+fk_block
-			,dataType:"html"
+			method: "GET",
+			data: { token: \''.currentToken().'\' },
+			url: "'.DOL_URL_ROOT.'/blockedlog/ajax/block-info.php?id="+fk_block,
+			dataType: "html"
 		}).done(function(data) {
 			jQuery("#dialogforpopup").html(data);
 		});
@@ -630,10 +632,11 @@ if (!empty($conf->global->BLOCKEDLOG_USE_REMOTE_AUTHORITY) && !empty($conf->glob
 		<script type="text/javascript">
 
 			$.ajax({
-				url : "<?php echo dol_buildpath('/blockedlog/ajax/check_signature.php', 1) ?>"
-				,dataType:"html"
+				method: "GET",
+				data: { token: '<?php echo currentToken() ?>' },
+				url: '<?php echo DOL_URL_ROOT.'/blockedlog/ajax/check_signature.php' ?>',
+				dataType: 'html'
 			}).done(function(data) {
-
 				if(data == 'hashisok') {
 					$('#blockchainstatus').html('<?php echo $langs->trans('AuthorityReconizeFingerprintConformity').' '.img_picto($langs->trans('SignatureOK'), 'on') ?>');
 				}
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 5ef0a10deb5..fe8e20bac9c 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -375,13 +375,13 @@ if (is_array($extrafields->attributes[$object->table_element]['label']) && count
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co ON co.rowid = p.fk_pays";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = p.fk_soc";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_stcommcontact as st ON st.id = p.fk_stcommcontact";
-if (!empty($search_categ)) {
+if (!empty($search_categ) && $search_categ != '-1') {
 	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_contact as cc ON p.rowid = cc.fk_socpeople"; // We need this table joined to the select in order to filter by categ
 }
-if (!empty($search_categ_thirdparty)) {
+if (!empty($search_categ_thirdparty) && $search_categ_thirdparty != '-1') {
 	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_soc"; // We need this table joined to the select in order to filter by categ
 }
-if (!empty($search_categ_supplier)) {
+if (!empty($search_categ_supplier) && $search_categ_supplier != '-1') {
 	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_fournisseur as cs2 ON s.rowid = cs2.fk_soc"; // We need this table joined to the select in order to filter by categ
 }
 if (!$user->rights->societe->client->voir && !$socid) {
diff --git a/htdocs/core/ajax/pingresult.php b/htdocs/core/ajax/pingresult.php
index c1b75fb92d2..202dfbae390 100644
--- a/htdocs/core/ajax/pingresult.php
+++ b/htdocs/core/ajax/pingresult.php
@@ -48,9 +48,7 @@ $hash_algo = GETPOST('hash_algo', 'alpha');
 
 
 // Security check
-if (!empty($user->socid)) {
-	$socid = $user->socid;
-}
+// None.
 
 $now = dol_now();
 
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index c5b4266e814..911b679c928 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -8628,14 +8628,11 @@ class Form
 
 									if ($("select[name='.$target.']").val() == '.$obj->id.') {
 										// get price of kilometer to fill the unit price
-										var data = '.json_encode($params).';
-										data.fk_c_exp_tax_cat = $(this).val();
-
 										$.ajax({
 											method: "POST",
 											dataType: "json",
-											data: data,
-											url: "'.(DOL_URL_ROOT.'/expensereport/ajax/ajaxik.php').'",
+											data: { fk_c_exp_tax_cat: $(this).val(), token: \''.currentToken().'\' },
+											url: "'.(DOL_URL_ROOT.'/expensereport/ajax/ajaxik.php?'.$params).'",
 										}).done(function( data, textStatus, jqXHR ) {
 											console.log(data);
 											if (typeof data.up != "undefined") {
diff --git a/htdocs/core/js/lib_notification.js.php b/htdocs/core/js/lib_notification.js.php
index f25c218f5d8..dc46a5e2072 100644
--- a/htdocs/core/js/lib_notification.js.php
+++ b/htdocs/core/js/lib_notification.js.php
@@ -153,7 +153,7 @@ if (!($_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root.'/' || $_SERVER['HTTP
 						// Update status of all notifications we sent on browser (listofreminderids)
 						console.log("Flag notification as done for listofreminderids="+listofreminderids);
 						$.ajax("<?php print DOL_URL_ROOT.'/core/ajax/check_notifications.php?action=stopreminder&listofreminderids='; ?>"+listofreminderids, {
-							type: "post",   // Usually post or get
+							type: "POST",   // Usually post or get
 							async: true,
 							data: { time_js_next_test: time_js_next_test, token: 'notrequired' }
 						});
diff --git a/htdocs/core/tpl/ajax/fileupload_main.tpl.php b/htdocs/core/tpl/ajax/fileupload_main.tpl.php
index a4563c7536a..8be24f7450f 100644
--- a/htdocs/core/tpl/ajax/fileupload_main.tpl.php
+++ b/htdocs/core/tpl/ajax/fileupload_main.tpl.php
@@ -63,8 +63,11 @@ $(function () {
 					"<?php echo $langs->trans('Ok'); ?>": function() {
 						$( "#confirm-delete" ).dialog( "close" );
 						if (data.url) {
-							$.ajax(data)
-								.success(function (data) {
+							$.ajax({
+								method: "POST",
+								data: { token: '<?php echo currentToken(); ?>' },
+								url: data.url
+							}).success(function (data) {
 									if (data) {
 										that._adjustMaxNumberOfFiles(1);
 										$(this).fadeOut(function () {
diff --git a/htdocs/loan/schedule.php b/htdocs/loan/schedule.php
index 2969d6958b5..67be217f0d2 100644
--- a/htdocs/loan/schedule.php
+++ b/htdocs/loan/schedule.php
@@ -196,9 +196,10 @@ $(document).ready(function() {
 		var capital=price2numjs($(idcap).val());
 		console.log("Change montly amount echeance="+echeance+" idcap="+idcap+" capital="+capital);
 		$.ajax({
+			  method: "GET",
 			  dataType: 'json',
 			  url: 'calcmens.php',
-			  data: { echeance: echeance, mens: mens, capital:capital, rate:<?php echo $object->rate / 100; ?> , nbterm : <?php echo $object->nbterm; ?>},
+			  data: { echeance: echeance, mens: mens, capital:capital, rate:<?php echo $object->rate / 100; ?>, nbterm: <?php echo $object->nbterm; ?>, token: '<?php echo currentToken(); ?>' },
 			  success: function(data) {
 				$.each(data, function(index, element) {
 					var idcap_res='#hi_capital'+index;
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 72698a2f8aa..bcda6447c06 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -469,13 +469,15 @@ if ((!defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck) && !empty($conf->gl
 		$sensitiveget = true;
 	}
 
-	// Check all cases that need a mandatory token (all POST actions + all login, actions and mass actions on pages with CSRFCHECK_WITH_TOKEN set + all sensitive GET actions)
+	// Check a token is provided for all cases that need a mandatory token
+	// (all POST actions + all login, actions and mass actions on pages with CSRFCHECK_WITH_TOKEN set + all sensitive GET actions)
 	if (
 		$_SERVER['REQUEST_METHOD'] == 'POST' ||
 		$sensitiveget ||
 		((GETPOSTISSET('actionlogin') || GETPOSTISSET('action') || GETPOSTISSET('massaction')) && defined('CSRFCHECK_WITH_TOKEN'))
 	) {
-		if (!GETPOST('token', 'alpha')) {		// If token is not provided or empty
+		// If token is not provided or empty, error (we are in case it is mandatory)
+		if (!GETPOST('token', 'alpha') || GETPOST('token', 'alpha') == 'notrequired') {
 			if (GETPOST('uploadform', 'int')) {
 				dol_syslog("--- Access to ".(empty($_SERVER["REQUEST_METHOD"])?'':$_SERVER["REQUEST_METHOD"].' ').$_SERVER["PHP_SELF"]." refused. File size too large.");
 				$langs->loadLangs(array("errors", "install"));
@@ -497,7 +499,7 @@ if ((!defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck) && !empty($conf->gl
 
 	$sessiontokenforthisurl = (empty($_SESSION['token']) ? '' : $_SESSION['token']);
 	// TODO Get the sessiontokenforthisurl into the array of session token
-	if (GETPOSTISSET('token') && GETPOST('token', 'alpha') != $sessiontokenforthisurl) {
+	if (GETPOSTISSET('token') && GETPOST('token') != 'notrequired' && GETPOST('token', 'alpha') != $sessiontokenforthisurl) {
 		dol_syslog("--- Access to ".(empty($_SERVER["REQUEST_METHOD"])?'':$_SERVER["REQUEST_METHOD"].' ').$_SERVER["PHP_SELF"]." refused due to invalid token, so we disable POST and some GET parameters - referer=".$_SERVER['HTTP_REFERER'].", action=".GETPOST('action', 'aZ09').", _GET|POST['token']=".GETPOST('token', 'alpha').", _SESSION['token']=".$_SESSION['token'], LOG_WARNING);
 		//print 'Unset POST by CSRF protection in main.inc.php.';	// Do not output anything because this create problems when using the BACK button on browsers.
 		setEventMessages('SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry', null, 'warnings');
@@ -3205,16 +3207,17 @@ if (!function_exists("llxFooter")) {
 										  country_code: '<?php echo $mysoc->country_code ? dol_escape_js($mysoc->country_code) : 'unknown'; ?>',
 										  php_version: '<?php echo dol_escape_js(phpversion()); ?>',
 										  os_version: '<?php echo dol_escape_js(version_os('smr')); ?>',
-										  distrib: '<?php echo $distrib ? dol_escape_js($distrib) : 'unknown'; ?>'
+										  distrib: '<?php echo $distrib ? dol_escape_js($distrib) : 'unknown'; ?>',
+										  token: 'notrequired'
 									  },
 									  success: function (data, status, xhr) {   // success callback function (data contains body of response)
-											  console.log("Ping ok");
+											console.log("Ping ok");
 											$.ajax({
 												method: 'GET',
 												url: '<?php echo DOL_URL_ROOT.'/core/ajax/pingresult.php'; ?>',
 												timeout: 500,     // timeout milliseconds
 												cache: false,
-												data: { hash_algo: 'md5', hash_unique_id: '<?php echo dol_escape_js($hash_unique_id); ?>', action: 'firstpingok' },	// for update
+												data: { hash_algo: 'md5', hash_unique_id: '<?php echo dol_escape_js($hash_unique_id); ?>', action: 'firstpingok', token: 'notrequired' },	// for update
 											  });
 									  },
 									  error: function (data,status,xhr) {   // error callback function
@@ -3224,7 +3227,7 @@ if (!function_exists("llxFooter")) {
 												  url: '<?php echo DOL_URL_ROOT.'/core/ajax/pingresult.php'; ?>',
 												  timeout: 500,     // timeout milliseconds
 												  cache: false,
-												  data: { hash_algo: 'md5', hash_unique_id: '<?php echo dol_escape_js($hash_unique_id); ?>', action: 'firstpingko' },
+												  data: { hash_algo: 'md5', hash_unique_id: '<?php echo dol_escape_js($hash_unique_id); ?>', action: 'firstpingko', token: 'notrequired' },
 												});
 									  }
 								});
diff --git a/htdocs/public/notice.php b/htdocs/public/notice.php
index f85c628e1eb..c41bf81bea4 100644
--- a/htdocs/public/notice.php
+++ b/htdocs/public/notice.php
@@ -18,7 +18,7 @@
 /**
  *	\file       htdocs/public/notice.php
  *	\brief      Dolibarr page to show a notice.
- *              Default notice is a message to say network connection is off.
+ *              Default notice is a message to say network connection is off or show another message.
  *              You can also call this page with URL:
  *                /public/notice.php?lang=xx_XX&transkey=translation_key  (key must be inside file main.lang, error.lang or other.lang)
  *                /public/notice.php?transphrase=url_encoded_sentence_to_show
diff --git a/htdocs/takepos/floors.php b/htdocs/takepos/floors.php
index 0aa45028ddd..508d6e670b3 100644
--- a/htdocs/takepos/floors.php
+++ b/htdocs/takepos/floors.php
@@ -154,10 +154,10 @@ function updateplace(idplace, left, top) {
 	console.log("updateplace idplace="+idplace+" left="+left+" top="+top);
 	$.ajax({
 		type: "POST",
-		url: "floors.php",
-		data: { action: "update", left: left, top: top, place: idplace }
-		}).done(function( msg ) {
-		window.location.href='floors.php?mode=edit&floor=<?php echo $floor; ?>';
+		url: "<?php echo DOL_URL_ROOT.'/takepos/floors.php'; ?>",
+		data: { action: "update", left: left, top: top, place: idplace, token: '<?php echo currentToken(); ?>' }
+	}).done(function( msg ) {
+		window.location.href='floors.php?mode=edit&floor=<?php echo urlencode($floor); ?>';
 	});
 }
 
@@ -166,12 +166,12 @@ function updatename(rowid) {
 	console.log("updatename rowid="+rowid+" after="+after);
 	$.ajax({
 		type: "POST",
-		url: "floors.php",
-		data: { action: "updatename", place: rowid, newname: after }
-		}).done(function( msg ) {
-		window.location.href='floors.php?mode=edit&floor=<?php echo $floor; ?>';
-		});
-	}
+		url: "<?php echo DOL_URL_ROOT.'/takepos/floors.php'; ?>",
+		data: { action: "updatename", place: rowid, newname: after, token: '<?php echo currentToken(); ?>' }
+	}).done(function( msg ) {
+		window.location.href='floors.php?mode=edit&floor=<?php echo urlencode($floor); ?>';
+	});
+}
 
 function LoadPlace(place){
 	parent.location.href='index.php?place='+place;
diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index d51fd21279e..b182f37f787 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -705,6 +705,7 @@ function OpenDrawer(){
 	console.log("OpenDrawer call ajax url http://<?php print $conf->global->TAKEPOS_PRINT_SERVER; ?>:8111/print");
 	$.ajax({
 		type: "POST",
+		data: { token: 'notrequired' },
 		<?php
 		if (filter_var($conf->global->TAKEPOS_PRINT_SERVER, FILTER_VALIDATE_URL) == true) {
 			echo "url: '".$conf->global->TAKEPOS_PRINT_SERVER."/printer/drawer.php',";
@@ -717,10 +718,11 @@ function OpenDrawer(){
 }
 
 function DolibarrOpenDrawer() {
-	console.log("DolibarrOpenDrawer call ajax url /takepos/ajax/ajax.php?action=opendrawer&term=<?php print $_SESSION["takeposterminal"] ?>");
+	console.log("DolibarrOpenDrawer call ajax url /takepos/ajax/ajax.php?action=opendrawer&term=<?php print urlencode($_SESSION["takeposterminal"]); ?>");
 	$.ajax({
 		type: "GET",
-		url: "<?php print dol_buildpath('/takepos/ajax/ajax.php', 1).'?action=opendrawer&term='.$_SESSION["takeposterminal"]; ?>",
+		data: { token: '<?php echo currentToken(); ?>' },
+		url: "<?php print DOL_URL_ROOT.'/takepos/ajax/ajax.php?action=opendrawer&term='.urlencode($_SESSION["takeposterminal"]); ?>",
 	});
 }
 
@@ -777,6 +779,7 @@ function WeighingScale(){
 	console.log("Weighing Scale");
 	$.ajax({
 		type: "POST",
+		data: { token: 'notrequired' },
 		url: '<?php print $conf->global->TAKEPOS_PRINT_SERVER; ?>/scale/index.php',
 	})
 	.done(function( editnumber ) {
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index 60276c545ca..3f7e63d84cb 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -1000,7 +1000,7 @@ function TakeposPrinting(id){
 
 function TakeposConnector(id){
 	console.log("TakeposConnector" + id);
-	$.get("ajax/ajax.php?action=printinvoiceticket&term=<?php echo $_SESSION["takeposterminal"]; ?>&id="+id, function(data, status){
+	$.get("<?php echo DOL_URL_ROOT; ?>/takepos/ajax/ajax.php?action=printinvoiceticket&term=<?php echo urlencode($_SESSION["takeposterminal"]); ?>&id="+id+"&token=<?php echo currentToken(); ?>", function(data, status) {
 		$.ajax({
 			type: "POST",
 			url: '<?php print $conf->global->TAKEPOS_PRINT_SERVER; ?>/printer/index.php',
@@ -1013,7 +1013,8 @@ function DolibarrTakeposPrinting(id) {
 	console.log("DolibarrTakeposPrinting Printing invoice ticket " + id)
 	$.ajax({
 		type: "GET",
-		url: "<?php print DOL_URL_ROOT.'/takepos/ajax/ajax.php?action=printinvoiceticket&term='.$_SESSION["takeposterminal"].'&id='; ?>" + id,
+		data: { token: '<?php echo currentToken(); ?>' },
+		url: "<?php print DOL_URL_ROOT.'/takepos/ajax/ajax.php?action=printinvoiceticket&term='.urlencode($_SESSION["takeposterminal"]).'&id='; ?>" + id,
 	});
 }
 
diff --git a/htdocs/takepos/pay.php b/htdocs/takepos/pay.php
index d4b6c023186..ba8ac8f82f7 100644
--- a/htdocs/takepos/pay.php
+++ b/htdocs/takepos/pay.php
@@ -236,7 +236,10 @@ if ($conf->global->TAKEPOS_NUMPAD == 0) {
 		window.open('sumupmerchant://pay/1.0?affiliate-key=<?php echo $conf->global->TAKEPOS_SUMUP_AFFILIATE ?>&app-id=<?php echo $conf->global->TAKEPOS_SUMUP_APPID ?>&total=' + amountpayed + '&currency=EUR&title=' + invoiceid + '&callback=<?php echo DOL_MAIN_URL_ROOT ?>/takepos/smpcb.php');
 
 		var loop = window.setInterval(function () {
-			$.ajax('<?php echo DOL_URL_ROOT ?>/takepos/smpcb.php?status').done(function (data) {
+			$.ajax({
+				method: 'POST',
+				data: { token: '<?php echo currentToken(); ?>' },
+				url: '<?php echo DOL_URL_ROOT ?>/takepos/smpcb.php?status' }).done(function (data) {
 				console.log(data);
 				if (data === "SUCCESS") {
 					parent.$("#poslines").load("invoice.php?place=<?php echo $place; ?>&action=valid&pay=CB&amount=" + amountpayed + "&invoiceid=" + invoiceid, function () {
diff --git a/htdocs/takepos/send.php b/htdocs/takepos/send.php
index 9f98d5fbd7d..af606a65209 100644
--- a/htdocs/takepos/send.php
+++ b/htdocs/takepos/send.php
@@ -97,7 +97,8 @@ top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
 function SendMail() {
 	$.ajax({
 		type: "GET",
-		url: "<?php print dol_buildpath('/takepos/send.php', 1).'?action=send&facid='.$facid.'&email='; ?>" + $("#email"). val(),
+		data: { token: '<?php echo currentToken(); ?>' },
+		url: "<?php print DOL_URL_ROOT.'/takepos/send.php?action=send&facid='.$facid.'&email='; ?>" + $("#email"). val(),
 	});
 	parent.$.colorbox.close();
 }

From 52800309ab1cf2e4cf8112d7e4cc42a9525f287c Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Thu, 17 Jun 2021 08:39:08 +0200
Subject: [PATCH 0696/1497] Update ChangeLog

---
 ChangeLog | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6ffeae32ad5..115cfa9ee27 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,9 +23,7 @@ NEW: Add the column "alias" of company in the list of proposal, order, invoice
 NEW: Add the column "Office phone" and  "User mobile" in user list
 NEW: Add the column "Price level" in thirdparty list
 NEW: Add some company information in the dropdown login menu
-NEW: Add constant MAIN_BUGTRACK_URL to set a custom url to redirect to when clicking on link "declare a bug"
 NEW: Add contact tag and bulk email status on the thirdparty + contact create form
-NEW: Support down payment on supplier invoice (& somes ajustments)
 NEW: Add edit/delete action icons on categories list pages
 NEW: Add hidden option to auto load input line extrafield into new lines
 NEW: Add import profile to import BOM
@@ -33,13 +31,11 @@ NEW: Add link picto to the stock movement on the detail of production
 NEW: Add mass action "Set tag" for product/service, user, thirdparty, warehouse, project, bank account, members
 NEW: Add bulk action Validate and Set to billed on order list.
 NEW: Add possibility to exports userGroups fields on user exports
-NEW: Add price min and price min including tax into product export
 NEW: Can search on lots or serials into the quick search bar
 NEW: Add support for Friday as a non working day
 NEW: Add a total in page of margin by user
 NEW: Add the total of margin in invoice list
 NEW: auto notification with module Notification can use templated emails
-NEW: Bank Entries : display user linked to a salary or a taxes
 NEW: Can clone a cron job
 NEW: Can create a lot from the list view (Look and feel standardization).
 NEW: Can filter on extrafields date on lists
@@ -60,17 +56,14 @@ NEW: LDAP: usergroup search can be filtered
 NEW: Make public bookmarks editable by admin users only
 NEW: If main logo not defined, can use the squarred logo on login page
 NEW: The manifest file can use the squared image if available
-NEW: Add bulk actions for Bank Transfer
 NEW: Enhance the multicurrency rate editor
 NEW: Normalyse Type company field with ajax combobox
 NEW: preload product description on selection for customer propal/order/invoice
-NEW: Add a ref in product customer price
 NEW: Search usergroups & resources
 NEW: Set status of all variants when changing status of parent
 NEW: Setup Page for module creation with module builder enhancement #FoundationFunding
 NEW: Show picto of module into the list of dictionaries
 NEW: Show the total of payment on the payment confirmation page
-NEW: Support color for types of event
 NEW: The global setup for Mandatory fields can now be done on combo list too.
 NEW: translate in "en_US" to complete PR 16980
 NEW: Update the list of taxes available by default for France
@@ -93,6 +86,11 @@ NEW: Multiselect ledger account code filter on book keeping list
 
  Agenda
 NEW: Can show the leave dates/holidays on the agenda view
+NEW: Support color for types of event
+
+ Bank
+NEW: Bank Entries : display user linked to a salary or a taxes 
+NEW: Add bulk actions for Bank Transfer
 
  ECM/GED
 NEW: add DB fields note_public and note_private for ECM module
@@ -100,12 +98,17 @@ NEW: Can filter files in ECM/GED on status Shared/Not shared
 
  Invoices
 NEW: Can set a percentage when creating an invoice from another object
+NEW: Support down payment on supplier invoice (& somes ajustments)
 
  Members
 NEW: #17292 default subscription amount by adherent type
 NEW: option to automatically create a login/user when a new subscription of a member is done online
 NEW: option to select membership type on the online payment page for membership subscription or renewal
 
+ Products
+NEW: Add price min and price min including tax into product export 
+NEW: Add a ref in product customer price
+
  Projects/Tasks
 NEW: option to automatically close an open project when all its tasks are done (=progress 100%)
 NEW: can show the project ref into PDF documents
@@ -147,6 +150,7 @@ NEW: add a new permission "Export website"
 NEW: add last date of modification for website pages in the list of pages
 NEW: Save old page with .old extension on disk when editing a website page
 
+
  new Modules
 NEW: Module Recruitement is now stable
 NEW: start new experimental module Event Organization Management
@@ -160,19 +164,15 @@ NEW: add option  CONTRACT_ALLOW_EXTERNAL_DOWNLOAD            to make generated d
 NEW: add option  SUPPLIER_PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD   to make generated doc automatically shared
 NEW: add option  MAIN_SECURITY_ANTI_SSRF_SERVER_IP           to define list of IPs that are local IPs
 NEW: add option  SOCIETE_DISABLE_WORKFORCE                   to hide staff field
+NEW: add constant  MAIN_BUGTRACK_URL                         to set a custom url to redirect to when clicking on link "declare a bug"
 
 
 For developers:
 ---------------
 NEW: Can edit an object property in module builder
-NEW: hook printFieldListTitle for cabyprodserv.php
-NEW: Hook to allow external modules to add their own shortlist of recent objects
-NEW: SQL-altering hooks in the turnover by product report
 NEW: Add data-eec=1 for EEC countries on select for js interaction
 NEW: Add experimental repair script to switch to dynamic row format and utf8mb4 encoding
-NEW: add form confirm hook on company card
 NEW: Add function showValueWithClipboardCPButton() to add a copy/paste
-NEW: Add hook addSectionECMAuto method to add custom diretory into ECM auto files
 NEW: Upgrade Stripe PHP lib to 7.67.0
 NEW: Support sepa_debit in stripe paymentmethods list
 NEW: Update doleditor.class.php for easily activate SCAYT
@@ -193,6 +193,13 @@ NEW: add native compression in REST APIs
 NEW: Product Variants API, add variant stock to response by parameter
 NEW: Product API route added to get product stock and product with or without variants #13739 #17390 
 
+ Hooks
+NEW: hook printFieldListTitle for cabyprodserv.php
+NEW: Hook to allow external modules to add their own shortlist of recent objects
+NEW: SQL-altering hooks in the turnover by product report
+NEW: add form confirm hook on company card
+NEW: Add hook addSectionECMAuto method to add custom diretory into ECM auto files
+
 
 WARNING:
 

From e67062aea19c92590bb871eea5d8cc1b67efa1d6 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Thu, 17 Jun 2021 09:04:41 +0200
Subject: [PATCH 0697/1497] Update llx_00_c_country.sql
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Ouganda  ->  Uganda
Ukraine = Ukraine
United Arab Emirates (is yet EN)
Iles mineures éloignées des États-Unis  ->  United States Minor Outlying Islands
Uruguay = Uruguay
Ouzbékistan  ->  Uzbekistan

Vanuatu = Vanuatu
Vénézuela  ->  Venezuela
Viêt Nam  ->  Vietnam
Iles Vierges britanniques  ->  British Virgin Islands
Iles Vierges américaines  ->  Virgin Islands of the United States  (also called:  American Virgin Islands)

Wallis-et-Futuna  ->  Wallis and Futuna
Sahara occidental  ->  Western Sahara

Yémen  ->  Yemen

Zambie  ->  Zambia
Zimbabwe = Zimbabwe

Guernesey  ->  Guernsey
Ile de Man  ->  Isle of Man
Jersey = Jersey

Monténégro  ->  Montenegro
Saint-Barthélemy   (Saint Barthélemy)
Saint-Martin   (Saint Martin)
Kosovo = Kosovo
---
 .../install/mysql/data/llx_00_c_country.sql   | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_00_c_country.sql b/htdocs/install/mysql/data/llx_00_c_country.sql
index 7746c91f6ce..ac8eba73a28 100644
--- a/htdocs/install/mysql/data/llx_00_c_country.sql
+++ b/htdocs/install/mysql/data/llx_00_c_country.sql
@@ -253,26 +253,26 @@ INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (22
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (222,'TM','TKM','Turkmenistan',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (223,'TC','TCA','Turks and Caicos Islands',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (224,'TV','TUV','Tuvalu',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (225,'UG','UGA','Ouganda',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (225,'UG','UGA','Uganda',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (226,'UA','UKR','Ukraine',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (227,'AE','ARE','United Arab Emirates',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (228,'UM','UMI','Iles mineures éloignées des États-Unis',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (228,'UM','UMI','United States Minor Outlying Islands',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (229,'UY','URY','Uruguay',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (230,'UZ','UZB','Ouzbékistan',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (230,'UZ','UZB','Uzbekistan',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (231,'VU','VUT','Vanuatu',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (232,'VE','VEN','Vénézuela',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (233,'VN','VNM','Viêt Nam',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (234,'VG','VGB','Iles Vierges britanniques',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (235,'VI','VIR','Iles Vierges américaines',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (236,'WF','WLF','Wallis-et-Futuna',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (237,'EH','ESH','Sahara occidental',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (238,'YE','YEM','Yémen',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (239,'ZM','ZMB','Zambie',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (232,'VE','VEN','Venezuela',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (233,'VN','VNM','Vietnam',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (234,'VG','VGB','British Virgin Islands',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (235,'VI','VIR','Virgin Islands of the United States',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (236,'WF','WLF','Wallis and Futuna',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (237,'EH','ESH','Western Sahara',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (238,'YE','YEM','Yemen',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (239,'ZM','ZMB','Zambia',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (240,'ZW','ZWE','Zimbabwe',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (241,'GG','GGY','Guernesey',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (242,'IM','IMN','Ile de Man',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (241,'GG','GGY','Guernsey',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (242,'IM','IMN','Isle of Man',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (243,'JE','JEY','Jersey',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (244,'ME','MNE','Monténégro',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (244,'ME','MNE','Montenegro',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (245,'BL','BLM','Saint-Barthélemy',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (246,'MF','MAF','Saint-Martin',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (247,'XK','XKX','Kosovo',1,0);

From 053f8f8338cc3894846fc352a4d97220e708c4fd Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Thu, 17 Jun 2021 09:07:17 +0200
Subject: [PATCH 0698/1497] Update card.php

---
 htdocs/holiday/card.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index 97a70782e36..e7fc4014563 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -858,9 +858,10 @@ $object = new Holiday($db);
 
 $listhalfday = array('morning'=>$langs->trans("Morning"), "afternoon"=>$langs->trans("Afternoon"));
 
+$title = $langs->trans('CPTitreMenu');
 $help_url = 'EN:Module_Holiday';
 
-llxHeader('', $langs->trans('CPTitreMenu'), $help_url);
+llxHeader('', $title, $help_url);
 
 if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 	// If user has no permission to create a leave

From e62e6d96962c24af217a06688c619e6f71013ac7 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Thu, 17 Jun 2021 09:08:59 +0200
Subject: [PATCH 0699/1497] Update define_holiday.php

$title
---
 htdocs/holiday/define_holiday.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php
index 5daedf98ff5..fdcdb5f88e6 100644
--- a/htdocs/holiday/define_holiday.php
+++ b/htdocs/holiday/define_holiday.php
@@ -189,7 +189,10 @@ if (empty($reshook)) {
 $form = new Form($db);
 $userstatic = new User($db);
 
-llxHeader('', $langs->trans('CPTitreMenu'));
+
+$title = $langs->trans('CPTitreMenu');
+
+llxHeader('', $title);
 
 
 $typeleaves = $holiday->getTypes(1, 1);

From c1297d561dd2a91f9b9a8b22ab78999687487731 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Thu, 17 Jun 2021 09:11:07 +0200
Subject: [PATCH 0700/1497] Update document.php

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

diff --git a/htdocs/holiday/document.php b/htdocs/holiday/document.php
index 063a3330ffd..c4e779efe52 100644
--- a/htdocs/holiday/document.php
+++ b/htdocs/holiday/document.php
@@ -137,7 +137,9 @@ $form = new Form($db);
 
 $listhalfday = array('morning'=>$langs->trans("Morning"), "afternoon"=>$langs->trans("Afternoon"));
 
-llxHeader("", "", $langs->trans("InterventionCard"));
+$title = $langs->trans('InterventionCard');
+
+llxHeader('', $title);
 
 
 if ($object->id) {

From 789a2744f26d54815c66f4e82c6c17b1a237d46d Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Thu, 17 Jun 2021 09:13:54 +0200
Subject: [PATCH 0701/1497] Update month_report.php

$title
---
 htdocs/holiday/month_report.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/holiday/month_report.php b/htdocs/holiday/month_report.php
index 698d71e5dc7..1bb58ca98b0 100644
--- a/htdocs/holiday/month_report.php
+++ b/htdocs/holiday/month_report.php
@@ -133,7 +133,9 @@ $holidaystatic = new Holiday($db);
 
 $listhalfday = array('morning'=>$langs->trans("Morning"), "afternoon"=>$langs->trans("Afternoon"));
 
-llxHeader('', $langs->trans('CPTitreMenu'));
+$title = $langs->trans('CPTitreMenu');
+
+llxHeader('', $title);
 
 $search_month = GETPOST("remonth", 'int') ?GETPOST("remonth", 'int') : date("m", time());
 $search_year = GETPOST("reyear", 'int') ?GETPOST("reyear", 'int') : date("Y", time());

From 23b24c589e0bb42a660ead569349523c1fa44467 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Thu, 17 Jun 2021 09:15:24 +0200
Subject: [PATCH 0702/1497] Update view_log.php

$title
---
 htdocs/holiday/view_log.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/holiday/view_log.php b/htdocs/holiday/view_log.php
index cd43e03f957..1a621d55a98 100644
--- a/htdocs/holiday/view_log.php
+++ b/htdocs/holiday/view_log.php
@@ -180,7 +180,8 @@ $formother = new FormOther($db);
 $holidaylogstatic = new stdClass();
 $alltypeleaves = $object->getTypes(1, -1); // To have labels
 
-llxHeader('', $langs->trans('CPTitreMenu'));
+$title = $langs->trans('CPTitreMenu');
+llxHeader('', $title);
 
 $sqlwhere = '';
 

From 99655eeb39a1371510e4ae367dd91e6df05ab2db Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Thu, 17 Jun 2021 09:28:45 +0200
Subject: [PATCH 0703/1497] FIX: styles failure in tickets with very long
 messages

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

diff --git a/htdocs/ticket/class/actions_ticket.class.php b/htdocs/ticket/class/actions_ticket.class.php
index 40fc22e1347..8df5572c87c 100644
--- a/htdocs/ticket/class/actions_ticket.class.php
+++ b/htdocs/ticket/class/actions_ticket.class.php
@@ -191,7 +191,7 @@ class ActionsTicket
 
 		// Initial message
 		print '<div class="underbanner clearboth"></div>';
-		print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+		print '<div class="div-table-responsive-no-min" style="max-width: 70vw">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
 		print '<table class="noborder centpercent margintable">';
 		print '<tr class="liste_titre trforfield"><td class="nowrap titlefield">';
 		print $langs->trans("InitialMessage");

From cf3761eb2e3685aacf2678daab5c1a4bae562788 Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Thu, 17 Jun 2021 10:09:07 +0200
Subject: [PATCH 0704/1497] Fix #17906 : fix access denied

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

diff --git a/htdocs/user/notify/card.php b/htdocs/user/notify/card.php
index 469823f0358..978c2d990b7 100644
--- a/htdocs/user/notify/card.php
+++ b/htdocs/user/notify/card.php
@@ -72,7 +72,7 @@ $permissiontoadd = (($object->id == $user->id) || (!empty($user->rights->user->u
 if ($user->socid) {
 	$id = $user->socid;
 }
-$result = restrictedArea($user, 'user', '', '');
+$result = restrictedArea($user, 'user', '', '', 'user');
 
 
 /*

From eeef78760a260e90dda94bfe9d6a5049b3189526 Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Thu, 17 Jun 2021 10:29:43 +0200
Subject: [PATCH 0705/1497] fix: Bad position of the printFieldListWhere hook

---
 htdocs/product/stock/replenish.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index d316d6cdf98..a2bf8051a3c 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -352,6 +352,12 @@ if (!empty($canvas)) $sql .= ' AND p.canvas = "'.$db->escape($canvas).'"';
 if ($fk_supplier > 0) {
 	$sql .= ' AND EXISTS (SELECT pfp.rowid FROM '.MAIN_DB_PREFIX.'product_fournisseur_price as pfp WHERE pfp.fk_product = p.rowid AND pfp.fk_soc = '.((int) $fk_supplier).' AND pfp.entity IN ('.getEntity('product_fournisseur_price').'))';
 }
+
+// Add where from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
+
 $sql .= ' GROUP BY p.rowid, p.ref, p.label, p.description, p.price';
 $sql .= ', p.price_ttc, p.price_base_type,p.fk_product_type, p.tms';
 $sql .= ', p.duration, p.tobuy';
@@ -459,11 +465,6 @@ if ($usevirtualstock)
 	}
 }
 
-// Add where from hooks
-$parameters = array();
-$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
-$sql .= $hookmanager->resPrint;
-
 $sql .= $db->order($sortfield, $sortorder);
 $sql .= $db->plimit($limit + 1, $offset);
 

From 5b8a6f1d712601e5e6cbe87353fa2d8ff2fdf63a Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Thu, 17 Jun 2021 10:41:03 +0200
Subject: [PATCH 0706/1497] Add Trigger "MAILING_DELETE"

---
 htdocs/comm/mailing/class/mailing.class.php | 24 ++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/htdocs/comm/mailing/class/mailing.class.php b/htdocs/comm/mailing/class/mailing.class.php
index 75efe1f07b2..24531c53956 100644
--- a/htdocs/comm/mailing/class/mailing.class.php
+++ b/htdocs/comm/mailing/class/mailing.class.php
@@ -429,6 +429,10 @@ class Mailing extends CommonObject
 	 */
 	public function delete($rowid)
 	{
+		global $user;
+
+		$this->db->begin();
+
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."mailing";
 		$sql .= " WHERE rowid = ".$rowid;
 
@@ -436,13 +440,31 @@ class Mailing extends CommonObject
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			return $this->delete_targets();
+			$res = $this->delete_targets();
+			if(empty($res)){
+				$this->db->rollback();
+				$this->error = $this->db->lasterror();
+				return -1;
+			}
 		}
 		else
 		{
+			$this->db->rollback();
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
+
+		if(!$notrigger){
+			$result = $this->call_trigger('MAILING_DELETE', $user);
+			if ($result < 0)
+			{
+				$this->db->rollback();
+				return -1;
+			}
+		}
+
+		$this->db->commit();
+		return 1;
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

From 9769e33eab1d44c124f1a4e666eed788e8eaf391 Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Thu, 17 Jun 2021 10:41:55 +0200
Subject: [PATCH 0707/1497] notigger parameter

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

diff --git a/htdocs/comm/mailing/class/mailing.class.php b/htdocs/comm/mailing/class/mailing.class.php
index 24531c53956..a61ea3079e4 100644
--- a/htdocs/comm/mailing/class/mailing.class.php
+++ b/htdocs/comm/mailing/class/mailing.class.php
@@ -427,7 +427,7 @@ class Mailing extends CommonObject
 	 *  @param	int		$rowid      id du mailing a supprimer
 	 *  @return int         		1 en cas de succes
 	 */
-	public function delete($rowid)
+	public function delete($rowid, $notrigger = 0)
 	{
 		global $user;
 

From 50bc832532d58ccabbdf240906f87d4c274cd087 Mon Sep 17 00:00:00 2001
From: Gauthier PC portable 024 <gauthier.verdol@atm-consulting.fr>
Date: Thu, 17 Jun 2021 10:48:48 +0200
Subject: [PATCH 0708/1497] FIX : better correction

---
 htdocs/core/modules/expedition/doc/pdf_espadon.modules.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
index 69b6059e622..48e70b29a45 100644
--- a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
@@ -362,15 +362,12 @@ class pdf_espadon extends ModelePdfExpedition
 				{
 					$tab_top = 88 + $height_incoterms;
 					$tab_top_alt = $tab_top;
-
 					$pdf->SetFont('', 'B', $default_font_size - 2);
 					if(!empty($object->tracking_number)) {
 						$pdf->writeHTMLCell(60, 4, $this->posxdesc - 1, $tab_top - 1, $outputlangs->transnoentities("TrackingNumber")." : ".$object->tracking_number, 0, 1, false, true, 'L');
-					} else {
-						$pdf->writeHTMLCell(60, 4, $this->posxdesc - 1, $tab_top - 5, '', 0, 1, false, true, 'L');
 					}
 
-					$tab_top_alt = $pdf->GetY();
+					if(!empty($object->tracking_number)) $tab_top_alt = $pdf->GetY();
 					//$tab_top_alt += 1;
 
 					// Tracking number

From 7fb19b3ef9c5aa1742bd61a72f25ab82700e05ed Mon Sep 17 00:00:00 2001
From: lvessiller <lvessiller@open-dsi.fr>
Date: Thu, 17 Jun 2021 15:27:17 +0200
Subject: [PATCH 0709/1497] NEW prevent default submit form on enter key in
 expense card

---
 htdocs/expensereport/card.php | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index cb6dcfc94b8..0f911e55ae3 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -2191,17 +2191,34 @@ if ($action == 'create') {
         				        $( ".auploadnewfilenow" ).click(function() {
         				            jQuery(".truploadnewfilenow").toggle();
                                     jQuery(".trattachnewfilenow").hide();
+                                    if (jQuery(".truploadnewfilenow").is(":hidden")) {
+                                        jQuery("input[name=\"sendit\"]").prop("disabled", true);
+                                    } else {
+                                        jQuery("input[name=\"sendit\"]").prop("disabled", false);
+                                    }
                                     return false;
                                 });
         				        $( ".aattachtodoc" ).click(function() {
         				            jQuery(".trattachnewfilenow").toggle();
                                     jQuery(".truploadnewfilenow").hide();
+                                    if (jQuery(".truploadnewfilenow").is(":hidden")) {
+                                        jQuery("input[name=\"sendit\"]").prop("disabled", true);
+                                    } else {
+                                        jQuery("input[name=\"sendit\"]").prop("disabled", false);
+                                    }
                                     return false;
                                 });';
 							if (is_array(GETPOST('attachfile', 'array')) && count(GETPOST('attachfile', 'array'))) {
 								print 'jQuery(".trattachnewfilenow").toggle();'."\n";
 							}
 							print '
+                                if (jQuery(".truploadnewfilenow").is(":hidden")) {
+                                    jQuery("input[name=\"sendit\"]").prop("disabled", true);
+                                } else {
+                                    jQuery("input[name=\"sendit\"]").prop("disabled", false);
+                                }
+                            ';
+							print '
                             });
         				    ';
 							print '</script>'."\n";
@@ -2337,17 +2354,34 @@ if ($action == 'create') {
 				        $( ".auploadnewfilenow" ).click(function() {
 				            jQuery(".truploadnewfilenow").toggle();
                             jQuery(".trattachnewfilenow").hide();
+                            if (jQuery(".truploadnewfilenow").is(":hidden")) {
+                                jQuery("input[name=\"sendit\"]").prop("disabled", true);
+                            } else {
+                                jQuery("input[name=\"sendit\"]").prop("disabled", false);
+                            }
                             return false;
                         });
 				        $( ".aattachtodoc" ).click(function() {
 				            jQuery(".trattachnewfilenow").toggle();
                             jQuery(".truploadnewfilenow").hide();
+                            if (jQuery(".truploadnewfilenow").is(":hidden")) {
+                                jQuery("input[name=\"sendit\"]").prop("disabled", true);
+                            } else {
+                                jQuery("input[name=\"sendit\"]").prop("disabled", false);
+                            }
                             return false;
                         });'."\n";
 					if (is_array(GETPOST('attachfile', 'array')) && count(GETPOST('attachfile', 'array')) && $action != 'updateline') {
 						print 'jQuery(".trattachnewfilenow").show();'."\n";
 					}
 					print '
+                        if (jQuery(".truploadnewfilenow").is(":hidden")) {
+                            jQuery("input[name=\"sendit\"]").prop("disabled", true);
+                        } else {
+                            jQuery("input[name=\"sendit\"]").prop("disabled", false);
+                        }
+                    ';
+					print '
                     });
 				    ';
 					print '</script>'."\n";

From 3134f5be8f3ad7dce24c478271cdfe68997d0570 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Georg=20Mei=C3=9Fner?= <supergeorg@gmail.com>
Date: Thu, 17 Jun 2021 17:22:37 +0200
Subject: [PATCH 0710/1497] Make some product fields hidable

This commit allows to hide some more fields in the product card (e.g. you can hide SIZE but not WEIGHT).
To allow the product card to be customized a bit better, following new variables can be set to hide the corresponding fields:
PRODUCT_DISABLE_PUBLIC_URL
PRODUCT_DISABLE_STOCK_LEVELS
PRODUCT_DISABLE_NATURE
PRODUCT_DISABLE_WEIGHT
PRODUCT_DISABLE_PRICES
PRODUCT_DISABLE_ACCOUNTING
The documentation has to be adapted accordingly.
---
 htdocs/product/card.php | 544 +++++++++++++++++++++-------------------
 1 file changed, 286 insertions(+), 258 deletions(-)

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 1b04a77083c..019ec50dd1f 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1188,11 +1188,13 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 		print "</td></tr>";
 
-		// Public URL
-		print '<tr><td>'.$langs->trans("PublicUrl").'</td><td>';
-		print img_picto('', 'globe', 'class="pictofixedwidth"');
-		print '<input type="text" name="url" class="quatrevingtpercent" value="'.GETPOST('url').'">';
-		print '</td></tr>';
+		if (empty($conf->global->PRODUCT_DISABLE_PUBLIC_URL)) {
+			// Public URL
+			print '<tr><td>'.$langs->trans("PublicUrl").'</td><td>';
+			print img_picto('', 'globe', 'class="pictofixedwidth"');
+			print '<input type="text" name="url" class="quatrevingtpercent" value="'.GETPOST('url').'">';
+			print '</td></tr>';
+		}
 
 		if ($type != 1 && !empty($conf->stock->enabled)) {
 			// Default warehouse
@@ -1205,20 +1207,24 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print '</td>';
 			print '</tr>';
 
-			// Stock min level
-			print '<tr><td>'.$form->textwithpicto($langs->trans("StockLimit"), $langs->trans("StockLimitDesc"), 1).'</td><td>';
-			print '<input name="seuil_stock_alerte" class="maxwidth50" value="'.GETPOST('seuil_stock_alerte').'">';
-			print '</td>';
+			if (empty($conf->global->PRODUCT_DISABLE_STOCK_LEVELS)) {
+				// Stock min level
+				print '<tr><td>'.$form->textwithpicto($langs->trans("StockLimit"), $langs->trans("StockLimitDesc"), 1).'</td><td>';
+				print '<input name="seuil_stock_alerte" class="maxwidth50" value="'.GETPOST('seuil_stock_alerte').'">';
+				print '</td>';
 
-			print '</tr><tr>';
+				print '</tr><tr>';
 
-			// Stock desired level
-			print '<tr><td>'.$form->textwithpicto($langs->trans("DesiredStock"), $langs->trans("DesiredStockDesc"), 1).'</td><td>';
-			print '<input name="desiredstock" class="maxwidth50" value="'.GETPOST('desiredstock').'">';
-			print '</td></tr>';
+				// Stock desired level
+				print '<tr><td>'.$form->textwithpicto($langs->trans("DesiredStock"), $langs->trans("DesiredStockDesc"), 1).'</td><td>';
+				print '<input name="desiredstock" class="maxwidth50" value="'.GETPOST('desiredstock').'">';
+				print '</td></tr>';
+			}
 		} else {
-			print '<input name="seuil_stock_alerte" type="hidden" value="0">';
-			print '<input name="desiredstock" type="hidden" value="0">';
+			if (empty($conf->global->PRODUCT_DISABLE_STOCK_LEVELS)) {
+				print '<input name="seuil_stock_alerte" type="hidden" value="0">';
+				print '<input name="desiredstock" type="hidden" value="0">';
+			}
 		}
 
 		// Duration
@@ -1230,17 +1236,21 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		}
 
 		if ($type != 1) {	// Nature, Weight and volume only applies to products and not to services
-			// Nature
-			print '<tr><td>'.$form->textwithpicto($langs->trans("NatureOfProductShort"), $langs->trans("NatureOfProductDesc")).'</td><td>';
-			$statutarray = array('1' => $langs->trans("Finished"), '0' => $langs->trans("RowMaterial"));
-			print $form->selectarray('finished', $statutarray, GETPOST('finished', 'alpha'), 1);
-			print '</td></tr>';
+            if (empty($conf->global->PRODUCT_DISABLE_NATURE)) {
+                // Nature
+                print '<tr><td>'.$form->textwithpicto($langs->trans("NatureOfProductShort"), $langs->trans("NatureOfProductDesc")).'</td><td>';
+                $statutarray = array('1' => $langs->trans("Finished"), '0' => $langs->trans("RowMaterial"));
+                print $form->selectarray('finished', $statutarray, GETPOST('finished', 'alpha'), 1);
+                print '</td></tr>';
+            }
 
-			// Brut Weight
-			print '<tr><td>'.$langs->trans("Weight").'</td><td>';
-			print '<input name="weight" size="4" value="'.GETPOST('weight').'">';
-			print $formproduct->selectMeasuringUnits("weight_units", "weight", GETPOSTISSET('weight_units') ?GETPOST('weight_units', 'alpha') : (empty($conf->global->MAIN_WEIGHT_DEFAULT_UNIT) ? 0 : $conf->global->MAIN_WEIGHT_DEFAULT_UNIT), 0, 2);
-			print '</td></tr>';
+			if (empty($conf->global->PRODUCT_DISABLE_WEIGHT)) {
+				// Brut Weight
+				print '<tr><td>'.$langs->trans("Weight").'</td><td>';
+				print '<input name="weight" size="4" value="'.GETPOST('weight').'">';
+				print $formproduct->selectMeasuringUnits("weight_units", "weight", GETPOSTISSET('weight_units') ?GETPOST('weight_units', 'alpha') : (empty($conf->global->MAIN_WEIGHT_DEFAULT_UNIT) ? 0 : $conf->global->MAIN_WEIGHT_DEFAULT_UNIT), 0, 2);
+				print '</td></tr>';
+			}
 
 			// Brut Length
 			if (empty($conf->global->PRODUCT_DISABLE_SIZE)) {
@@ -1349,170 +1359,174 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 		print '<hr>';
 
-		if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
-			// We do no show price array on create when multiprices enabled.
-			// We must set them on prices tab.
-			print '<table class="border centpercent">';
-			// VAT
-			print '<tr><td class="titlefieldcreate">'.$langs->trans("VATRate").'</td><td>';
-			$defaultva = get_default_tva($mysoc, $mysoc);
-			print $form->load_tva("tva_tx", $defaultva, $mysoc, $mysoc, 0, 0, '', false, 1);
-			print '</td></tr>';
-			print '</table>';
+		if (empty($conf->global->PRODUCT_DISABLE_PRICES)) {
+			if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
+				// We do no show price array on create when multiprices enabled.
+				// We must set them on prices tab.
+				print '<table class="border centpercent">';
+				// VAT
+				print '<tr><td class="titlefieldcreate">'.$langs->trans("VATRate").'</td><td>';
+				$defaultva = get_default_tva($mysoc, $mysoc);
+				print $form->load_tva("tva_tx", $defaultva, $mysoc, $mysoc, 0, 0, '', false, 1);
+				print '</td></tr>';
+				print '</table>';
 
-			print '<br>';
-		} else {
-			print '<table class="border centpercent">';
+				print '<br>';
+			} else {
+				print '<table class="border centpercent">';
 
-			// Price
-			print '<tr><td class="titlefieldcreate">'.$langs->trans("SellingPrice").'</td>';
-			print '<td><input name="price" class="maxwidth50" value="'.$object->price.'">';
-			print $form->selectPriceBaseType($conf->global->PRODUCT_PRICE_BASE_TYPE, "price_base_type");
-			print '</td></tr>';
+				// Price
+				print '<tr><td class="titlefieldcreate">'.$langs->trans("SellingPrice").'</td>';
+				print '<td><input name="price" class="maxwidth50" value="'.$object->price.'">';
+				print $form->selectPriceBaseType($conf->global->PRODUCT_PRICE_BASE_TYPE, "price_base_type");
+				print '</td></tr>';
 
-			// Min price
-			print '<tr><td>'.$langs->trans("MinPrice").'</td>';
-			print '<td><input name="price_min" class="maxwidth50" value="'.$object->price_min.'">';
-			print '</td></tr>';
+				// Min price
+				print '<tr><td>'.$langs->trans("MinPrice").'</td>';
+				print '<td><input name="price_min" class="maxwidth50" value="'.$object->price_min.'">';
+				print '</td></tr>';
 
-			// VAT
-			print '<tr><td>'.$langs->trans("VATRate").'</td><td>';
-			$defaultva = get_default_tva($mysoc, $mysoc);
-			print $form->load_tva("tva_tx", $defaultva, $mysoc, $mysoc, 0, 0, '', false, 1);
-			print '</td></tr>';
+				// VAT
+				print '<tr><td>'.$langs->trans("VATRate").'</td><td>';
+				$defaultva = get_default_tva($mysoc, $mysoc);
+				print $form->load_tva("tva_tx", $defaultva, $mysoc, $mysoc, 0, 0, '', false, 1);
+				print '</td></tr>';
 
-			print '</table>';
+				print '</table>';
 
-			print '<br>';
+				print '<br>';
+			}
 		}
 
 		// Accountancy codes
 		print '<!-- accountancy codes -->'."\n";
 		print '<table class="border centpercent">';
 
-		if (!empty($conf->accounting->enabled)) {
-			// Accountancy_code_sell
-			print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellCode").'</td>';
-			print '<td>';
-			if ($type == 0) {
-				$accountancy_code_sell = (GETPOSTISSET('accountancy_code_sell') ? GETPOST('accountancy_code_sell', 'alpha') : $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT);
-			} else {
-				$accountancy_code_sell = (GETPOSTISSET('accountancy_code_sell') ? GETPOST('accountancy_code_sell', 'alpha') : $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT);
-			}
-			print $formaccounting->select_account($accountancy_code_sell, 'accountancy_code_sell', 1, null, 1, 1, 'minwidth150 maxwidth300', 1);
-			print '</td></tr>';
-
-			// Accountancy_code_sell_intra
-			if ($mysoc->isInEEC()) {
-				print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellIntraCode").'</td>';
+		if (empty($conf->global->PRODUCT_DISABLE_ACCOUNTING)) {
+			if (!empty($conf->accounting->enabled)) {
+				// Accountancy_code_sell
+				print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellCode").'</td>';
 				print '<td>';
 				if ($type == 0) {
-					$accountancy_code_sell_intra = (GETPOSTISSET('accountancy_code_sell_intra') ? GETPOST('accountancy_code_sell_intra', 'alpha') : $conf->global->ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT);
+					$accountancy_code_sell = (GETPOSTISSET('accountancy_code_sell') ? GETPOST('accountancy_code_sell', 'alpha') : $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT);
 				} else {
-					$accountancy_code_sell_intra = (GETPOSTISSET('accountancy_code_sell_intra') ? GETPOST('accountancy_code_sell_intra', 'alpha') : $conf->global->ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT);
+					$accountancy_code_sell = (GETPOSTISSET('accountancy_code_sell') ? GETPOST('accountancy_code_sell', 'alpha') : $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT);
 				}
-				print $formaccounting->select_account($accountancy_code_sell_intra, 'accountancy_code_sell_intra', 1, null, 1, 1, 'minwidth150 maxwidth300', 1);
+				print $formaccounting->select_account($accountancy_code_sell, 'accountancy_code_sell', 1, null, 1, 1, 'minwidth150 maxwidth300', 1);
 				print '</td></tr>';
-			}
 
-			// Accountancy_code_sell_export
-			print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellExportCode").'</td>';
-			print '<td>';
-			if ($type == 0) {
-				$accountancy_code_sell_export = (GETPOST('accountancy_code_sell_export') ? GETPOST('accountancy_code_sell_export', 'alpha') : $conf->global->ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT);
-			} else {
-				$accountancy_code_sell_export = (GETPOST('accountancy_code_sell_export') ? GETPOST('accountancy_code_sell_export', 'alpha') : $conf->global->ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT);
-			}
-			print $formaccounting->select_account($accountancy_code_sell_export, 'accountancy_code_sell_export', 1, null, 1, 1, 'minwidth150 maxwidth300', 1);
-			print '</td></tr>';
+				// Accountancy_code_sell_intra
+				if ($mysoc->isInEEC()) {
+					print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellIntraCode").'</td>';
+					print '<td>';
+					if ($type == 0) {
+						$accountancy_code_sell_intra = (GETPOSTISSET('accountancy_code_sell_intra') ? GETPOST('accountancy_code_sell_intra', 'alpha') : $conf->global->ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT);
+					} else {
+						$accountancy_code_sell_intra = (GETPOSTISSET('accountancy_code_sell_intra') ? GETPOST('accountancy_code_sell_intra', 'alpha') : $conf->global->ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT);
+					}
+					print $formaccounting->select_account($accountancy_code_sell_intra, 'accountancy_code_sell_intra', 1, null, 1, 1, 'minwidth150 maxwidth300', 1);
+					print '</td></tr>';
+				}
 
-			// Accountancy_code_buy
-			print '<tr><td>'.$langs->trans("ProductAccountancyBuyCode").'</td>';
-			print '<td>';
-			if ($type == 0) {
-				$accountancy_code_buy = (GETPOST('accountancy_code_buy', 'alpha') ? (GETPOST('accountancy_code_buy', 'alpha')) : $conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT);
-			} else {
-				$accountancy_code_buy = (GETPOST('accountancy_code_buy', 'alpha') ? (GETPOST('accountancy_code_buy', 'alpha')) : $conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT);
-			}
-			print $formaccounting->select_account($accountancy_code_buy, 'accountancy_code_buy', 1, null, 1, 1, 'minwidth150 maxwidth300', 1);
-			print '</td></tr>';
-
-			// Accountancy_code_buy_intra
-			if ($mysoc->isInEEC()) {
-				print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancyBuyIntraCode").'</td>';
+				// Accountancy_code_sell_export
+				print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellExportCode").'</td>';
 				print '<td>';
 				if ($type == 0) {
-					$accountancy_code_buy_intra = (GETPOSTISSET('accountancy_code_buy_intra') ? GETPOST('accountancy_code_buy_intra', 'alpha') : $conf->global->ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT);
+					$accountancy_code_sell_export = (GETPOST('accountancy_code_sell_export') ? GETPOST('accountancy_code_sell_export', 'alpha') : $conf->global->ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT);
 				} else {
-					$accountancy_code_buy_intra = (GETPOSTISSET('accountancy_code_buy_intra') ? GETPOST('accountancy_code_buy_intra', 'alpha') : $conf->global->ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT);
+					$accountancy_code_sell_export = (GETPOST('accountancy_code_sell_export') ? GETPOST('accountancy_code_sell_export', 'alpha') : $conf->global->ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT);
 				}
-				print $formaccounting->select_account($accountancy_code_buy_intra, 'accountancy_code_buy_intra', 1, null, 1, 1, 'minwidth150 maxwidth300', 1);
+				print $formaccounting->select_account($accountancy_code_sell_export, 'accountancy_code_sell_export', 1, null, 1, 1, 'minwidth150 maxwidth300', 1);
+				print '</td></tr>';
+
+				// Accountancy_code_buy
+				print '<tr><td>'.$langs->trans("ProductAccountancyBuyCode").'</td>';
+				print '<td>';
+				if ($type == 0) {
+					$accountancy_code_buy = (GETPOST('accountancy_code_buy', 'alpha') ? (GETPOST('accountancy_code_buy', 'alpha')) : $conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT);
+				} else {
+					$accountancy_code_buy = (GETPOST('accountancy_code_buy', 'alpha') ? (GETPOST('accountancy_code_buy', 'alpha')) : $conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT);
+				}
+				print $formaccounting->select_account($accountancy_code_buy, 'accountancy_code_buy', 1, null, 1, 1, 'minwidth150 maxwidth300', 1);
+				print '</td></tr>';
+
+				// Accountancy_code_buy_intra
+				if ($mysoc->isInEEC()) {
+					print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancyBuyIntraCode").'</td>';
+					print '<td>';
+					if ($type == 0) {
+						$accountancy_code_buy_intra = (GETPOSTISSET('accountancy_code_buy_intra') ? GETPOST('accountancy_code_buy_intra', 'alpha') : $conf->global->ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT);
+					} else {
+						$accountancy_code_buy_intra = (GETPOSTISSET('accountancy_code_buy_intra') ? GETPOST('accountancy_code_buy_intra', 'alpha') : $conf->global->ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT);
+					}
+					print $formaccounting->select_account($accountancy_code_buy_intra, 'accountancy_code_buy_intra', 1, null, 1, 1, 'minwidth150 maxwidth300', 1);
+					print '</td></tr>';
+				}
+
+				// Accountancy_code_buy_export
+				print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancyBuyExportCode").'</td>';
+				print '<td>';
+				if ($type == 0) {
+					$accountancy_code_buy_export = (GETPOST('accountancy_code_buy_export') ? GETPOST('accountancy_code_buy_export', 'alpha') : $conf->global->ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT);
+				} else {
+					$accountancy_code_buy_export = (GETPOST('accountancy_code_buy_export') ? GETPOST('accountancy_code_buy_export', 'alpha') : $conf->global->ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT);
+				}
+				print $formaccounting->select_account($accountancy_code_buy_export, 'accountancy_code_buy_export', 1, null, 1, 1, 'minwidth150 maxwidth300', 1);
+				print '</td></tr>';
+			} else {// For external software
+				if (!empty($accountancy_code_sell)) {
+					$object->accountancy_code_sell = $accountancy_code_sell;
+				}
+				if (!empty($accountancy_code_sell_intra)) {
+					$object->accountancy_code_sell_intra = $accountancy_code_sell_intra;
+				}
+				if (!empty($accountancy_code_sell_export)) {
+					$object->accountancy_code_sell_export = $accountancy_code_sell_export;
+				}
+				if (!empty($accountancy_code_buy)) {
+					$object->accountancy_code_buy = $accountancy_code_buy;
+				}
+				if (!empty($accountancy_code_buy_intra)) {
+					$object->accountancy_code_buy_intra = $accountancy_code_buy_intra;
+				}
+				if (!empty($accountancy_code_buy_export)) {
+					$object->accountancy_code_buy_export = $accountancy_code_buy_export;
+				}
+
+				// Accountancy_code_sell
+				print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellCode").'</td>';
+				print '<td class="maxwidthonsmartphone"><input class="minwidth150" name="accountancy_code_sell" value="'.$object->accountancy_code_sell.'">';
+				print '</td></tr>';
+
+				// Accountancy_code_sell_intra
+				if ($mysoc->isInEEC()) {
+					print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellIntraCode").'</td>';
+					print '<td class="maxwidthonsmartphone"><input class="minwidth150" name="accountancy_code_sell_intra" value="'.$object->accountancy_code_sell_intra.'">';
+					print '</td></tr>';
+				}
+
+				// Accountancy_code_sell_export
+				print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellExportCode").'</td>';
+				print '<td class="maxwidthonsmartphone"><input class="minwidth150" name="accountancy_code_sell_export" value="'.$object->accountancy_code_sell_export.'">';
+				print '</td></tr>';
+
+				// Accountancy_code_buy
+				print '<tr><td>'.$langs->trans("ProductAccountancyBuyCode").'</td>';
+				print '<td class="maxwidthonsmartphone"><input class="minwidth150" name="accountancy_code_buy" value="'.$object->accountancy_code_buy.'">';
+				print '</td></tr>';
+
+				// Accountancy_code_buy_intra
+				if ($mysoc->isInEEC()) {
+					print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancyBuyIntraCode").'</td>';
+					print '<td class="maxwidthonsmartphone"><input class="minwidth150" name="accountancy_code_buy_intra" value="'.$object->accountancy_code_buy_intra.'">';
+					print '</td></tr>';
+				}
+
+				// Accountancy_code_buy_export
+				print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancyBuyExportCode").'</td>';
+				print '<td class="maxwidthonsmartphone"><input class="minwidth150" name="accountancy_code_buy_export" value="'.$object->accountancy_code_buy_export.'">';
 				print '</td></tr>';
 			}
-
-			// Accountancy_code_buy_export
-			print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancyBuyExportCode").'</td>';
-			print '<td>';
-			if ($type == 0) {
-				$accountancy_code_buy_export = (GETPOST('accountancy_code_buy_export') ? GETPOST('accountancy_code_buy_export', 'alpha') : $conf->global->ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT);
-			} else {
-				$accountancy_code_buy_export = (GETPOST('accountancy_code_buy_export') ? GETPOST('accountancy_code_buy_export', 'alpha') : $conf->global->ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT);
-			}
-			print $formaccounting->select_account($accountancy_code_buy_export, 'accountancy_code_buy_export', 1, null, 1, 1, 'minwidth150 maxwidth300', 1);
-			print '</td></tr>';
-		} else {// For external software
-			if (!empty($accountancy_code_sell)) {
-				$object->accountancy_code_sell = $accountancy_code_sell;
-			}
-			if (!empty($accountancy_code_sell_intra)) {
-				$object->accountancy_code_sell_intra = $accountancy_code_sell_intra;
-			}
-			if (!empty($accountancy_code_sell_export)) {
-				$object->accountancy_code_sell_export = $accountancy_code_sell_export;
-			}
-			if (!empty($accountancy_code_buy)) {
-				$object->accountancy_code_buy = $accountancy_code_buy;
-			}
-			if (!empty($accountancy_code_buy_intra)) {
-				$object->accountancy_code_buy_intra = $accountancy_code_buy_intra;
-			}
-			if (!empty($accountancy_code_buy_export)) {
-				$object->accountancy_code_buy_export = $accountancy_code_buy_export;
-			}
-
-			// Accountancy_code_sell
-			print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellCode").'</td>';
-			print '<td class="maxwidthonsmartphone"><input class="minwidth150" name="accountancy_code_sell" value="'.$object->accountancy_code_sell.'">';
-			print '</td></tr>';
-
-			// Accountancy_code_sell_intra
-			if ($mysoc->isInEEC()) {
-				print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellIntraCode").'</td>';
-				print '<td class="maxwidthonsmartphone"><input class="minwidth150" name="accountancy_code_sell_intra" value="'.$object->accountancy_code_sell_intra.'">';
-				print '</td></tr>';
-			}
-
-			// Accountancy_code_sell_export
-			print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellExportCode").'</td>';
-			print '<td class="maxwidthonsmartphone"><input class="minwidth150" name="accountancy_code_sell_export" value="'.$object->accountancy_code_sell_export.'">';
-			print '</td></tr>';
-
-			// Accountancy_code_buy
-			print '<tr><td>'.$langs->trans("ProductAccountancyBuyCode").'</td>';
-			print '<td class="maxwidthonsmartphone"><input class="minwidth150" name="accountancy_code_buy" value="'.$object->accountancy_code_buy.'">';
-			print '</td></tr>';
-
-			// Accountancy_code_buy_intra
-			if ($mysoc->isInEEC()) {
-				print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancyBuyIntraCode").'</td>';
-				print '<td class="maxwidthonsmartphone"><input class="minwidth150" name="accountancy_code_buy_intra" value="'.$object->accountancy_code_buy_intra.'">';
-				print '</td></tr>';
-			}
-
-			// Accountancy_code_buy_export
-			print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancyBuyExportCode").'</td>';
-			print '<td class="maxwidthonsmartphone"><input class="minwidth150" name="accountancy_code_buy_export" value="'.$object->accountancy_code_buy_export.'">';
-			print '</td></tr>';
 		}
 		print '</table>';
 
@@ -1708,9 +1722,11 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print "\n";
 
 			// Public Url
-			print '<tr><td>'.$langs->trans("PublicUrl").'</td><td>';
-			print '<input type="text" name="url" class="quatrevingtpercent" value="'.$object->url.'">';
-			print '</td></tr>';
+			if (empty($conf->global->PRODUCT_DISABLE_PUBLIC_URL)) {
+				print '<tr><td>'.$langs->trans("PublicUrl").'</td><td>';
+				print '<input type="text" name="url" class="quatrevingtpercent" value="'.$object->url.'">';
+				print '</td></tr>';
+			}
 
 			// Stock
 			if ($object->isProduct() && !empty($conf->stock->enabled)) {
@@ -1743,16 +1759,20 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				print $formproduct->selectMeasuringUnits("duration_unit", "time", $object->duration_unit, 0, 1);
 				print '</td></tr>';
 			} else {
-				// Nature
-				print '<tr><td>'.$form->textwithpicto($langs->trans("NatureOfProductShort"), $langs->trans("NatureOfProductDesc")).'</td><td>';
-				print $formproduct->selectProductNature('finished', $object->finished);
-				print '</td></tr>';
+                if (empty($conf->global->PRODUCT_DISABLE_NATURE)) {
+                    // Nature
+                    print '<tr><td>'.$form->textwithpicto($langs->trans("NatureOfProductShort"), $langs->trans("NatureOfProductDesc")).'</td><td>';
+                    print $formproduct->selectProductNature('finished', $object->finished);
+                    print '</td></tr>';
+                }
 
-				// Brut Weight
-				print '<tr><td>'.$langs->trans("Weight").'</td><td>';
-				print '<input name="weight" size="5" value="'.$object->weight.'"> ';
-				print $formproduct->selectMeasuringUnits("weight_units", "weight", $object->weight_units, 0, 2);
-				print '</td></tr>';
+				if (empty($conf->global->PRODUCT_DISABLE_WEIGHT)) {
+					// Brut Weight
+					print '<tr><td>'.$langs->trans("Weight").'</td><td>';
+					print '<input name="weight" size="5" value="'.$object->weight.'"> ';
+					print $formproduct->selectMeasuringUnits("weight_units", "weight", $object->weight_units, 0, 2);
+					print '</td></tr>';
+				}
 
 				if (empty($conf->global->PRODUCT_DISABLE_SIZE)) {
 					// Brut Length
@@ -1867,81 +1887,83 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 			print '<table class="border centpercent">';
 
-			if (!empty($conf->accounting->enabled)) {
-				// Accountancy_code_sell
-				print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellCode").'</td>';
-				print '<td>';
-				print $formaccounting->select_account($object->accountancy_code_sell, 'accountancy_code_sell', 1, '', 1, 1, 'minwidth150 maxwidth300');
-				print '</td></tr>';
-
-				// Accountancy_code_sell_intra
-				if ($mysoc->isInEEC()) {
-					print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellIntraCode").'</td>';
+			if (empty($conf->global->PRODUCT_DISABLE_ACCOUNTING)) {
+				if (!empty($conf->accounting->enabled)) {
+					// Accountancy_code_sell
+					print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellCode").'</td>';
 					print '<td>';
-					print $formaccounting->select_account($object->accountancy_code_sell_intra, 'accountancy_code_sell_intra', 1, '', 1, 1, 'minwidth150 maxwidth300');
+					print $formaccounting->select_account($object->accountancy_code_sell, 'accountancy_code_sell', 1, '', 1, 1, 'minwidth150 maxwidth300');
 					print '</td></tr>';
-				}
 
-				// Accountancy_code_sell_export
-				print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellExportCode").'</td>';
-				print '<td>';
-				print $formaccounting->select_account($object->accountancy_code_sell_export, 'accountancy_code_sell_export', 1, '', 1, 1, 'minwidth150 maxwidth300');
-				print '</td></tr>';
+					// Accountancy_code_sell_intra
+					if ($mysoc->isInEEC()) {
+						print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellIntraCode").'</td>';
+						print '<td>';
+						print $formaccounting->select_account($object->accountancy_code_sell_intra, 'accountancy_code_sell_intra', 1, '', 1, 1, 'minwidth150 maxwidth300');
+						print '</td></tr>';
+					}
 
-				// Accountancy_code_buy
-				print '<tr><td>'.$langs->trans("ProductAccountancyBuyCode").'</td>';
-				print '<td>';
-				print $formaccounting->select_account($object->accountancy_code_buy, 'accountancy_code_buy', 1, '', 1, 1, 'minwidth150 maxwidth300');
-				print '</td></tr>';
-
-				// Accountancy_code_buy_intra
-				if ($mysoc->isInEEC()) {
-					print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancyBuyIntraCode").'</td>';
+					// Accountancy_code_sell_export
+					print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellExportCode").'</td>';
 					print '<td>';
-					print $formaccounting->select_account($object->accountancy_code_buy_intra, 'accountancy_code_buy_intra', 1, '', 1, 1, 'minwidth150 maxwidth300');
+					print $formaccounting->select_account($object->accountancy_code_sell_export, 'accountancy_code_sell_export', 1, '', 1, 1, 'minwidth150 maxwidth300');
+					print '</td></tr>';
+
+					// Accountancy_code_buy
+					print '<tr><td>'.$langs->trans("ProductAccountancyBuyCode").'</td>';
+					print '<td>';
+					print $formaccounting->select_account($object->accountancy_code_buy, 'accountancy_code_buy', 1, '', 1, 1, 'minwidth150 maxwidth300');
+					print '</td></tr>';
+
+					// Accountancy_code_buy_intra
+					if ($mysoc->isInEEC()) {
+						print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancyBuyIntraCode").'</td>';
+						print '<td>';
+						print $formaccounting->select_account($object->accountancy_code_buy_intra, 'accountancy_code_buy_intra', 1, '', 1, 1, 'minwidth150 maxwidth300');
+						print '</td></tr>';
+					}
+
+					// Accountancy_code_buy_export
+					print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancyBuyExportCode").'</td>';
+					print '<td>';
+					print $formaccounting->select_account($object->accountancy_code_buy_export, 'accountancy_code_buy_export', 1, '', 1, 1, 'minwidth150 maxwidth300');
+					print '</td></tr>';
+				} else {
+					// For external software
+					// Accountancy_code_sell
+					print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellCode").'</td>';
+					print '<td><input name="accountancy_code_sell" class="maxwidth200" value="'.$object->accountancy_code_sell.'">';
+					print '</td></tr>';
+
+					// Accountancy_code_sell_intra
+					if ($mysoc->isInEEC()) {
+						print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellIntraCode").'</td>';
+						print '<td><input name="accountancy_code_sell_intra" class="maxwidth200" value="'.$object->accountancy_code_sell_intra.'">';
+						print '</td></tr>';
+					}
+
+					// Accountancy_code_sell_export
+					print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellExportCode").'</td>';
+					print '<td><input name="accountancy_code_sell_export" class="maxwidth200" value="'.$object->accountancy_code_sell_export.'">';
+					print '</td></tr>';
+
+					// Accountancy_code_buy
+					print '<tr><td>'.$langs->trans("ProductAccountancyBuyCode").'</td>';
+					print '<td><input name="accountancy_code_buy" class="maxwidth200" value="'.$object->accountancy_code_buy.'">';
+					print '</td></tr>';
+
+					// Accountancy_code_buy_intra
+					if ($mysoc->isInEEC()) {
+						print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancyBuyIntraCode").'</td>';
+						print '<td><input name="accountancy_code_buy_intra" class="maxwidth200" value="'.$object->accountancy_code_buy_intra.'">';
+						print '</td></tr>';
+					}
+
+					// Accountancy_code_buy_export
+					print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancyBuyExportCode").'</td>';
+					print '<td><input name="accountancy_code_buy_export" class="maxwidth200" value="'.$object->accountancy_code_buy_export.'">';
 					print '</td></tr>';
 				}
-
-				// Accountancy_code_buy_export
-				print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancyBuyExportCode").'</td>';
-				print '<td>';
-				print $formaccounting->select_account($object->accountancy_code_buy_export, 'accountancy_code_buy_export', 1, '', 1, 1, 'minwidth150 maxwidth300');
-				print '</td></tr>';
-			} else {
-				// For external software
-				// Accountancy_code_sell
-				print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellCode").'</td>';
-				print '<td><input name="accountancy_code_sell" class="maxwidth200" value="'.$object->accountancy_code_sell.'">';
-				print '</td></tr>';
-
-				// Accountancy_code_sell_intra
-				if ($mysoc->isInEEC()) {
-					print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellIntraCode").'</td>';
-					print '<td><input name="accountancy_code_sell_intra" class="maxwidth200" value="'.$object->accountancy_code_sell_intra.'">';
-					print '</td></tr>';
-				}
-
-				// Accountancy_code_sell_export
-				print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellExportCode").'</td>';
-				print '<td><input name="accountancy_code_sell_export" class="maxwidth200" value="'.$object->accountancy_code_sell_export.'">';
-				print '</td></tr>';
-
-				// Accountancy_code_buy
-				print '<tr><td>'.$langs->trans("ProductAccountancyBuyCode").'</td>';
-				print '<td><input name="accountancy_code_buy" class="maxwidth200" value="'.$object->accountancy_code_buy.'">';
-				print '</td></tr>';
-
-				// Accountancy_code_buy_intra
-				if ($mysoc->isInEEC()) {
-					print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancyBuyIntraCode").'</td>';
-					print '<td><input name="accountancy_code_buy_intra" class="maxwidth200" value="'.$object->accountancy_code_buy_intra.'">';
-					print '</td></tr>';
-				}
-
-				// Accountancy_code_buy_export
-				print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancyBuyExportCode").'</td>';
-				print '<td><input name="accountancy_code_buy_export" class="maxwidth200" value="'.$object->accountancy_code_buy_export.'">';
-				print '</td></tr>';
 			}
 			print '</table>';
 
@@ -2170,9 +2192,11 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td>'.(dol_textishtml($object->description) ? $object->description : dol_nl2br($object->description, 1, true)).'</td></tr>';
 
 			// Public URL
-			print '<tr><td>'.$langs->trans("PublicUrl").'</td><td>';
-			print dol_print_url($object->url);
-			print '</td></tr>';
+			if (empty($conf->global->PRODUCT_DISABLE_PUBLIC_URL)) {
+				print '<tr><td>'.$langs->trans("PublicUrl").'</td><td>';
+				print dol_print_url($object->url);
+				print '</td></tr>';
+			}
 
 			// Default warehouse
 			if ($object->isProduct() && !empty($conf->stock->enabled)) {
@@ -2218,19 +2242,23 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 				print '</td></tr>';
 			} else {
-				// Nature
-				print '<tr><td class="titlefield">'.$form->textwithpicto($langs->trans("NatureOfProductShort"), $langs->trans("NatureOfProductDesc")).'</td><td>';
-				print $object->getLibFinished();
-				print '</td></tr>';
+                if (empty($conf->global->PRODUCT_DISABLE_NATURE)) {
+                    // Nature
+                    print '<tr><td class="titlefield">'.$form->textwithpicto($langs->trans("NatureOfProductShort"), $langs->trans("NatureOfProductDesc")).'</td><td>';
+                    print $object->getLibFinished();
+                    print '</td></tr>';
+                }
 
 				// Brut Weight
-				print '<tr><td class="titlefield">'.$langs->trans("Weight").'</td><td>';
-				if ($object->weight != '') {
-					print $object->weight." ".measuringUnitString(0, "weight", $object->weight_units);
-				} else {
-					print '&nbsp;';
+				if (empty($conf->global->PRODUCT_DISABLE_WEIGHT)) {
+					print '<tr><td class="titlefield">'.$langs->trans("Weight").'</td><td>';
+					if ($object->weight != '') {
+						print $object->weight." ".measuringUnitString(0, "weight", $object->weight_units);
+					} else {
+						print '&nbsp;';
+					}
+					print "</td></tr>\n";
 				}
-				print "</td></tr>\n";
 
 				if (empty($conf->global->PRODUCT_DISABLE_SIZE)) {
 					// Brut Length

From 047b9715fb343aad4645906933e2ce18e1f5ccf0 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Thu, 17 Jun 2021 15:26:31 +0000
Subject: [PATCH 0711/1497] Fixing style errors.

---
 htdocs/product/card.php | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 019ec50dd1f..3528d5ef299 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1236,13 +1236,13 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		}
 
 		if ($type != 1) {	// Nature, Weight and volume only applies to products and not to services
-            if (empty($conf->global->PRODUCT_DISABLE_NATURE)) {
-                // Nature
-                print '<tr><td>'.$form->textwithpicto($langs->trans("NatureOfProductShort"), $langs->trans("NatureOfProductDesc")).'</td><td>';
-                $statutarray = array('1' => $langs->trans("Finished"), '0' => $langs->trans("RowMaterial"));
-                print $form->selectarray('finished', $statutarray, GETPOST('finished', 'alpha'), 1);
-                print '</td></tr>';
-            }
+			if (empty($conf->global->PRODUCT_DISABLE_NATURE)) {
+				// Nature
+				print '<tr><td>'.$form->textwithpicto($langs->trans("NatureOfProductShort"), $langs->trans("NatureOfProductDesc")).'</td><td>';
+				$statutarray = array('1' => $langs->trans("Finished"), '0' => $langs->trans("RowMaterial"));
+				print $form->selectarray('finished', $statutarray, GETPOST('finished', 'alpha'), 1);
+				print '</td></tr>';
+			}
 
 			if (empty($conf->global->PRODUCT_DISABLE_WEIGHT)) {
 				// Brut Weight
@@ -1759,12 +1759,12 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				print $formproduct->selectMeasuringUnits("duration_unit", "time", $object->duration_unit, 0, 1);
 				print '</td></tr>';
 			} else {
-                if (empty($conf->global->PRODUCT_DISABLE_NATURE)) {
-                    // Nature
-                    print '<tr><td>'.$form->textwithpicto($langs->trans("NatureOfProductShort"), $langs->trans("NatureOfProductDesc")).'</td><td>';
-                    print $formproduct->selectProductNature('finished', $object->finished);
-                    print '</td></tr>';
-                }
+				if (empty($conf->global->PRODUCT_DISABLE_NATURE)) {
+					// Nature
+					print '<tr><td>'.$form->textwithpicto($langs->trans("NatureOfProductShort"), $langs->trans("NatureOfProductDesc")).'</td><td>';
+					print $formproduct->selectProductNature('finished', $object->finished);
+					print '</td></tr>';
+				}
 
 				if (empty($conf->global->PRODUCT_DISABLE_WEIGHT)) {
 					// Brut Weight
@@ -2242,12 +2242,12 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 				print '</td></tr>';
 			} else {
-                if (empty($conf->global->PRODUCT_DISABLE_NATURE)) {
-                    // Nature
-                    print '<tr><td class="titlefield">'.$form->textwithpicto($langs->trans("NatureOfProductShort"), $langs->trans("NatureOfProductDesc")).'</td><td>';
-                    print $object->getLibFinished();
-                    print '</td></tr>';
-                }
+				if (empty($conf->global->PRODUCT_DISABLE_NATURE)) {
+					// Nature
+					print '<tr><td class="titlefield">'.$form->textwithpicto($langs->trans("NatureOfProductShort"), $langs->trans("NatureOfProductDesc")).'</td><td>';
+					print $object->getLibFinished();
+					print '</td></tr>';
+				}
 
 				// Brut Weight
 				if (empty($conf->global->PRODUCT_DISABLE_WEIGHT)) {

From 5b8c93b0909febc1783dfaf5368d4acd943e93a9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 17 Jun 2021 18:01:31 +0200
Subject: [PATCH 0712/1497] FIX #17967

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

diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index 7ca69871238..8644faef8a7 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -539,6 +539,7 @@ class Contact extends CommonObject
 		$this->entity = ((isset($this->entity) && is_numeric($this->entity)) ? $this->entity : $conf->entity);
 
 		// Clean parameters
+		$this->ref_ext = trim($this->ref_ext);
 		$this->lastname = trim($this->lastname) ?trim($this->lastname) : trim($this->lastname);
 		$this->firstname = trim($this->firstname);
 		$this->email = trim($this->email);
@@ -565,7 +566,8 @@ class Contact extends CommonObject
 		} elseif ($this->socid == -1) {
 			$sql .= " fk_soc=null,";
 		}
-		$sql .= "  civility='".$this->db->escape($this->civility_code)."'";
+		$sql .= " ref_ext='".$this->db->escape($this->ref_ext)."'";
+		$sql .= ", civility='".$this->db->escape($this->civility_code)."'";
 		$sql .= ", lastname='".$this->db->escape($this->lastname)."'";
 		$sql .= ", firstname='".$this->db->escape($this->firstname)."'";
 		$sql .= ", address='".$this->db->escape($this->address)."'";

From 597e8ef671c499e6ecf0ec25e423977d13a34f48 Mon Sep 17 00:00:00 2001
From: a-schild <andre@schild.ws>
Date: Thu, 17 Jun 2021 18:17:08 +0200
Subject: [PATCH 0713/1497] Allow to update ref_ext via webservices See issue
 #17967

---
 htdocs/contact/class/contact.class.php | 2 ++
 htdocs/webservices/server_contact.php  | 1 +
 2 files changed, 3 insertions(+)

diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index 7ca69871238..f3a5f170380 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -549,6 +549,7 @@ class Contact extends CommonObject
 		$this->fax = trim($this->fax);
 		$this->zip = (empty($this->zip) ? '' : trim($this->zip));
 		$this->town = (empty($this->town) ? '' : trim($this->town));
+		$this->ref_ext = trim($this->ref_ext);		
 		$this->setUpperOrLowerCase();
 		$this->country_id = ($this->country_id > 0 ? $this->country_id : $this->country_id);
 		if (empty($this->statut)) {
@@ -571,6 +572,7 @@ class Contact extends CommonObject
 		$sql .= ", address='".$this->db->escape($this->address)."'";
 		$sql .= ", zip='".$this->db->escape($this->zip)."'";
 		$sql .= ", town='".$this->db->escape($this->town)."'";
+		$sql .= ", ref_ext = ".(!empty($this->ref_ext) ? "'".$this->db->escape($this->ref_ext)."'" : "null");
 		$sql .= ", fk_pays=".($this->country_id > 0 ? $this->country_id : 'NULL');
 		$sql .= ", fk_departement=".($this->state_id > 0 ? $this->state_id : 'NULL');
 		$sql .= ", poste='".$this->db->escape($this->poste)."'";
diff --git a/htdocs/webservices/server_contact.php b/htdocs/webservices/server_contact.php
index 37d86dcded9..3a1a627863a 100644
--- a/htdocs/webservices/server_contact.php
+++ b/htdocs/webservices/server_contact.php
@@ -626,6 +626,7 @@ function updateContact($authentication, $contact)
 		if (!empty($object->id)) {
 			$objectfound = true;
 
+			$object->ref_ext = $contact['ref_ext'];
 
 			$object->firstname = $contact['firstname'];
 			$object->lastname = $contact['lastname'];

From d4fa284f67ca6fb96ed5906d711e99af907dbae1 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Thu, 17 Jun 2021 16:18:55 +0000
Subject: [PATCH 0714/1497] Fixing style errors.

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

diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index f3a5f170380..bf65adc437a 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -549,7 +549,7 @@ class Contact extends CommonObject
 		$this->fax = trim($this->fax);
 		$this->zip = (empty($this->zip) ? '' : trim($this->zip));
 		$this->town = (empty($this->town) ? '' : trim($this->town));
-		$this->ref_ext = trim($this->ref_ext);		
+		$this->ref_ext = trim($this->ref_ext);
 		$this->setUpperOrLowerCase();
 		$this->country_id = ($this->country_id > 0 ? $this->country_id : $this->country_id);
 		if (empty($this->statut)) {

From 51eaecdc6b7e457fc75e3954e615f5b2da2b730e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 17 Jun 2021 22:02:06 +0200
Subject: [PATCH 0715/1497] Fix phpcs

---
 htdocs/comm/mailing/class/mailing.class.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/comm/mailing/class/mailing.class.php b/htdocs/comm/mailing/class/mailing.class.php
index a61ea3079e4..005b090105e 100644
--- a/htdocs/comm/mailing/class/mailing.class.php
+++ b/htdocs/comm/mailing/class/mailing.class.php
@@ -424,8 +424,9 @@ class Mailing extends CommonObject
 	/**
 	 *  Delete emailing
 	 *
-	 *  @param	int		$rowid      id du mailing a supprimer
-	 *  @return int         		1 en cas de succes
+	 *  @param	int		$rowid      Id if emailing to delete
+	 *  @param	int		$notrigger	Disable triggers
+	 *  @return int         		>0 if OK, <0 if KO
 	 */
 	public function delete($rowid, $notrigger = 0)
 	{

From 88ff0e4795ae88e2c4b7e09636cab38f2dc7bb4a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 18 Jun 2021 00:59:18 +0200
Subject: [PATCH 0716/1497] Fix PHPCS

---
 htdocs/comm/mailing/class/mailing.class.php       | 4 +---
 htdocs/compta/facture/class/facture-rec.class.php | 7 ++++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/htdocs/comm/mailing/class/mailing.class.php b/htdocs/comm/mailing/class/mailing.class.php
index e780dc3bdec..7c020729df9 100644
--- a/htdocs/comm/mailing/class/mailing.class.php
+++ b/htdocs/comm/mailing/class/mailing.class.php
@@ -500,9 +500,7 @@ class Mailing extends CommonObject
 				$this->error = $this->db->lasterror();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			$this->error = $this->db->lasterror();
 			return -1;
diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index 70fc1ae82d1..c4f898aec56 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -542,7 +542,6 @@ class FactureRec extends CommonInvoice
 				$this->titre                  = $obj->title; // deprecated
 				$this->title                  = $obj->title;
 				$this->ref                    = $obj->title;
-				$this->ref_client             = $obj->ref_client;
 				$this->suspended              = $obj->suspended;
 				$this->type                   = $obj->type;
 				$this->datep                  = $obj->dp;
@@ -595,7 +594,9 @@ class FactureRec extends CommonInvoice
 				$this->multicurrency_total_tva 	= $obj->multicurrency_total_tva;
 				$this->multicurrency_total_ttc 	= $obj->multicurrency_total_ttc;
 
-				if ($this->statut == self::STATUS_DRAFT)	$this->brouillon = 1;
+				if ($this->statut == self::STATUS_DRAFT) {
+					$this->brouillon = 1;
+				}
 
 				// Retrieve all extrafield
 				// fetch optionals attributes and labels
@@ -612,7 +613,7 @@ class FactureRec extends CommonInvoice
 				}
 				return 1;
 			} else {
-				$this->error = 'Bill with id '.$rowid.' or ref '.$ref.' not found sql='.$sql;
+				$this->error = 'Bill with id '.$rowid.' or ref '.$ref.' not found';
 				dol_syslog('Facture::Fetch Error '.$this->error, LOG_ERR);
 				return -2;
 			}

From 53295a0cb15f8a11f7ca367de76ec59afde58348 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 18 Jun 2021 01:06:28 +0200
Subject: [PATCH 0717/1497] Fix phpcs

---
 htdocs/compta/facture/class/facture-rec.class.php | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index c4f898aec56..1876e278922 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -543,9 +543,6 @@ class FactureRec extends CommonInvoice
 				$this->title                  = $obj->title;
 				$this->ref                    = $obj->title;
 				$this->suspended              = $obj->suspended;
-				$this->type                   = $obj->type;
-				$this->datep                  = $obj->dp;
-				$this->date                   = $obj->df;
 				$this->remise_percent         = $obj->remise_percent;
 				$this->remise_absolue         = $obj->remise_absolue;
 				$this->remise                 = $obj->remise;
@@ -554,9 +551,6 @@ class FactureRec extends CommonInvoice
 				$this->total_localtax1        = $obj->localtax1;
 				$this->total_localtax2        = $obj->localtax2;
 				$this->total_ttc              = $obj->total_ttc;
-				$this->paye                   = $obj->paye;
-				$this->close_code             = $obj->close_code;
-				$this->close_note             = $obj->close_note;
 				$this->socid                  = $obj->fk_soc;
 				$this->date_lim_reglement     = $this->db->jdate($obj->dlr);
 				$this->mode_reglement_id      = $obj->fk_mode_reglement;
@@ -568,14 +562,12 @@ class FactureRec extends CommonInvoice
 				$this->cond_reglement_doc     = $obj->cond_reglement_libelle_doc;
 				$this->fk_project             = $obj->fk_project;
 				$this->fk_account             = $obj->fk_account;
-				$this->fk_facture_source      = $obj->fk_facture_source;
 				$this->note_private           = $obj->note_private;
 				$this->note_public            = $obj->note_public;
 				$this->user_author            = $obj->fk_user_author;
 				$this->modelpdf               = $obj->model_pdf; // deprecatd
 				$this->model_pdf              = $obj->model_pdf;
-				$this->rang = $obj->rang;
-				$this->special_code = $obj->special_code;
+				//$this->special_code = $obj->special_code;
 				$this->frequency			  = $obj->frequency;
 				$this->unit_frequency = $obj->unit_frequency;
 				$this->date_when			  = $this->db->jdate($obj->date_when);
@@ -606,8 +598,7 @@ class FactureRec extends CommonInvoice
 				 * Lines
 				 */
 				$result = $this->fetch_lines();
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$this->error = $this->db->lasterror();
 					return -3;
 				}

From 41ef995e0111c54cc11ea48a52167691529cbbca Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Fri, 18 Jun 2021 10:33:23 +0200
Subject: [PATCH 0718/1497] Update ChangeLog

---
 ChangeLog | 47 +++++++++++++++++++++++++++++------------------
 1 file changed, 29 insertions(+), 18 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 115cfa9ee27..eb2d8d7c7cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,20 +10,16 @@ For users:
 NEW: Module Recruitement to follow application to job positions is now stable.
 NEW: Feature to make Stock Inventories
 NEW: Several security issues after a second private bug hunting campaign. 
-NEW: Add a security center page with all information and advices related to the security of your instance 
-NEW: Add a performance center page with all information and advices related to the performance of your instance 
 NEW: A lot of fix into english text after a small proofreading campaign (still not perfect, but really better)
 NEW: All main menu entries are using the picto of the module
 NEW: Add a copy to clipboard button on some fields 
 NEW: Add an example of scheduled job to send email reminder for unpaid invoices
-NEW: Add a check to avoid an invoice date in the future
 NEW: Add some color and picto for the direction of movement
 NEW: add the column "Channel" into the list of orders
 NEW: Add the column "alias" of company in the list of proposal, order, invoice
 NEW: Add the column "Office phone" and  "User mobile" in user list
 NEW: Add the column "Price level" in thirdparty list
 NEW: Add some company information in the dropdown login menu
-NEW: Add contact tag and bulk email status on the thirdparty + contact create form
 NEW: Add edit/delete action icons on categories list pages
 NEW: Add hidden option to auto load input line extrafield into new lines
 NEW: Add import profile to import BOM
@@ -33,8 +29,6 @@ NEW: Add bulk action Validate and Set to billed on order list.
 NEW: Add possibility to exports userGroups fields on user exports
 NEW: Can search on lots or serials into the quick search bar
 NEW: Add support for Friday as a non working day
-NEW: Add a total in page of margin by user
-NEW: Add the total of margin in invoice list
 NEW: auto notification with module Notification can use templated emails
 NEW: Can clone a cron job
 NEW: Can create a lot from the list view (Look and feel standardization).
@@ -48,7 +42,6 @@ NEW: Check update availability for externals modules using a button on module pa
 NEW: Choose lines to use while creating intervention card from origin
 NEW: Columns shipment method, payment mode, payment term in proposal and order list
 NEW: Conf for default actioncomm status
-NEW: customer ref for product customer prices
 NEW: Dictionary for availability - Add a column position
 NEW: Can set a user related to a social contribution
 NEW: ICS Direct debit can be set with a different value for each bank account
@@ -60,7 +53,6 @@ NEW: Enhance the multicurrency rate editor
 NEW: Normalyse Type company field with ajax combobox
 NEW: preload product description on selection for customer propal/order/invoice
 NEW: Search usergroups & resources
-NEW: Set status of all variants when changing status of parent
 NEW: Setup Page for module creation with module builder enhancement #FoundationFunding
 NEW: Show picto of module into the list of dictionaries
 NEW: Show the total of payment on the payment confirmation page
@@ -71,7 +63,7 @@ NEW: Salary payment request and Salary payment are 2 different steps in workflow
 NEW: VAT payment request and VAT payment are now 2 different steps in workflow on VAT payment recording
 NEW: VAT report - Optimisation & collapse by rate
 NEW: When a doc file is shared, link is visible from the main page of doc.
-NEW: #16378 More E-Mail Contact substitution Values for better salutation
+NEW: #16378 more E-Mail Contact substitution Values for better salutation
 NEW: option to keep the "Automatically create a total payment" checkbox empty on the tax creation page
 
  Accountancy
@@ -85,7 +77,8 @@ NEW: Accountancy - Add a page to list subledger accounts
 NEW: Multiselect ledger account code filter on book keeping list
 
  Agenda
-NEW: Can show the leave dates/holidays on the agenda view
+NEW: add support for Friday as a non working day
+NEW: can show the leave dates/holidays on the agenda view
 NEW: Support color for types of event
 
  Bank
@@ -94,12 +87,18 @@ NEW: Add bulk actions for Bank Transfer
 
  ECM/GED
 NEW: add DB fields note_public and note_private for ECM module
-NEW: Can filter files in ECM/GED on status Shared/Not shared
+NEW: can filter files in ECM/GED on status Shared / Not shared
 
  Invoices
-NEW: Can set a percentage when creating an invoice from another object
+NEW: add a check to avoid an invoice date in the future
+NEW: add the total of margin in invoice list
+NEW: can set a percentage when creating an invoice from another object
 NEW: Support down payment on supplier invoice (& somes ajustments)
 
+ Margin
+NEW: add the total of margin in invoice list
+NEW: add the total of margin in page by user
+
  Members
 NEW: #17292 default subscription amount by adherent type
 NEW: option to automatically create a login/user when a new subscription of a member is done online
@@ -108,11 +107,14 @@ NEW: option to select membership type on the online payment page for membership
  Products
 NEW: Add price min and price min including tax into product export 
 NEW: Add a ref in product customer price
+NEW: customer ref for product customer prices
+NEW: Set status of all variants when changing status of parent
 
  Projects/Tasks
 NEW: option to automatically close an open project when all its tasks are done (=progress 100%)
 NEW: can show the project ref into PDF documents
 NEW: when we add contacts/users to a project, ask to also affect them on tasks
+NEW: Can hide columns "time consumed" on timesheet per week
 
  Proposals
 NEW: add bulk action to set a commercial proposal to status "Refused"
@@ -130,8 +132,9 @@ NEW: edit sales lines rights in TakePOS
 NEW: option for TakePOS to show the total price without tax
 NEW: more permissions in TakePOS (can edit added line, can modify once order sent to kitchen)
 
- Third-Parties
-NEW: can set a warehouse on a Thirdparty
+ Third Party / Contacts
+NEW: add contact tag and bulk email status on the thirdparty + contact create form
+NEW: can set a warehouse on a thirdparty
 
  Tickets
 NEW: can use captcha on public page to create a ticket  #16347
@@ -142,7 +145,7 @@ NEW: Feature to make Stock Inventories
 NEW: can make massive stock transfers from a CSV file
 NEW: Stock movement list - add more complete date field
 NEW: can set a warehouse in a proposal
-NEW: can set a warehouse on a Thirdparty
+NEW: can set a warehouse on a thirdparty
 
  Website Module
 NEW: #17113 Can upload a favicon in website module
@@ -150,14 +153,22 @@ NEW: add a new permission "Export website"
 NEW: add last date of modification for website pages in the list of pages
 NEW: Save old page with .old extension on disk when editing a website page
 
+ Workflows
+NEW: add option in Workflow module to set a shipment as closed
 
- new Modules
+
+ for Admins
+NEW: Add a security center page with all information and advices related to the security of your instance 
+NEW: Add a performance center page with all information and advices related to the performance of your instance 
+
+ Modules
 NEW: Module Recruitement is now stable
 NEW: start new experimental module Event Organization Management
 NEW: start new experimental module Partnership Management
 NEW: start new experimental module Knowledge Management
 NEW: start new experimental module Workstations Management
 NEW: Check update availability for externals modules using a button on module page
+Module SimplePOS is deprecated - TakePOS is recommended for the future
 
  new Options
 NEW: add option  CONTRACT_ALLOW_EXTERNAL_DOWNLOAD            to make generated doc automatically shared
@@ -195,10 +206,10 @@ NEW: Product API route added to get product stock and product with or without va
 
  Hooks
 NEW: hook printFieldListTitle for cabyprodserv.php
-NEW: Hook to allow external modules to add their own shortlist of recent objects
+NEW: hook to allow external modules to add their own shortlist of recent objects
 NEW: SQL-altering hooks in the turnover by product report
 NEW: add form confirm hook on company card
-NEW: Add hook addSectionECMAuto method to add custom diretory into ECM auto files
+NEW: add hook addSectionECMAuto method to add custom diretory into ECM auto files
 
 
 WARNING:

From 2dba09356beab371f3039b861d7d90c8208ae813 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 18 Jun 2021 10:45:53 +0200
Subject: [PATCH 0719/1497] Disable nightly for v13

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 9403188d709..08fa830a6fe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -53,7 +53,7 @@ jobs:
     - if: type = push AND branch = develop
       php: nightly 
       env: DB=mysql
-    - if: type = push AND branch = 13.0
+    - if: type = push AND branch = 14.0
       php: nightly 
       env: DB=mysql
 

From af634b7f2b8d06787d4294dc5fc2afa4ee9a5bcd Mon Sep 17 00:00:00 2001
From: lvessiller <lvessiller@open-dsi.fr>
Date: Fri, 18 Jun 2021 10:51:39 +0200
Subject: [PATCH 0720/1497] FIX 17965 - Keep enter key only to submit expense
 lines form

---
 htdocs/expensereport/card.php | 46 ++++++++++-------------------------
 1 file changed, 13 insertions(+), 33 deletions(-)

diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 0f911e55ae3..d9450483423 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -159,7 +159,7 @@ if (empty($reshook)) {
 
 	include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
 
-	if (GETPOSTISSET('sendit')) {    // If we just submit a file
+	if (!empty(GETPOST('sendit', 'alpha'))) {   // If we just submit a file
 		if ($action == 'updateline') {
 			$action = 'editline'; // To avoid to make the updateline now
 		} else {
@@ -2191,33 +2191,23 @@ if ($action == 'create') {
         				        $( ".auploadnewfilenow" ).click(function() {
         				            jQuery(".truploadnewfilenow").toggle();
                                     jQuery(".trattachnewfilenow").hide();
-                                    if (jQuery(".truploadnewfilenow").is(":hidden")) {
-                                        jQuery("input[name=\"sendit\"]").prop("disabled", true);
-                                    } else {
-                                        jQuery("input[name=\"sendit\"]").prop("disabled", false);
-                                    }
                                     return false;
                                 });
         				        $( ".aattachtodoc" ).click(function() {
         				            jQuery(".trattachnewfilenow").toggle();
                                     jQuery(".truploadnewfilenow").hide();
-                                    if (jQuery(".truploadnewfilenow").is(":hidden")) {
-                                        jQuery("input[name=\"sendit\"]").prop("disabled", true);
-                                    } else {
-                                        jQuery("input[name=\"sendit\"]").prop("disabled", false);
-                                    }
                                     return false;
                                 });';
 							if (is_array(GETPOST('attachfile', 'array')) && count(GETPOST('attachfile', 'array'))) {
 								print 'jQuery(".trattachnewfilenow").toggle();'."\n";
 							}
 							print '
-                                if (jQuery(".truploadnewfilenow").is(":hidden")) {
-                                    jQuery("input[name=\"sendit\"]").prop("disabled", true);
-                                } else {
-                                    jQuery("input[name=\"sendit\"]").prop("disabled", false);
-                                }
-                            ';
+                        		jQuery("form[name=\"expensereport\"]").submit(function() {
+                            		if (jQuery(".truploadnewfilenow").is(":hidden")) {
+                                		jQuery("input[name=\"sendit\"]").val("");
+                            		}
+                        		});
+                    		';
 							print '
                             });
         				    ';
@@ -2354,33 +2344,23 @@ if ($action == 'create') {
 				        $( ".auploadnewfilenow" ).click(function() {
 				            jQuery(".truploadnewfilenow").toggle();
                             jQuery(".trattachnewfilenow").hide();
-                            if (jQuery(".truploadnewfilenow").is(":hidden")) {
-                                jQuery("input[name=\"sendit\"]").prop("disabled", true);
-                            } else {
-                                jQuery("input[name=\"sendit\"]").prop("disabled", false);
-                            }
                             return false;
                         });
 				        $( ".aattachtodoc" ).click(function() {
 				            jQuery(".trattachnewfilenow").toggle();
                             jQuery(".truploadnewfilenow").hide();
-                            if (jQuery(".truploadnewfilenow").is(":hidden")) {
-                                jQuery("input[name=\"sendit\"]").prop("disabled", true);
-                            } else {
-                                jQuery("input[name=\"sendit\"]").prop("disabled", false);
-                            }
                             return false;
                         });'."\n";
 					if (is_array(GETPOST('attachfile', 'array')) && count(GETPOST('attachfile', 'array')) && $action != 'updateline') {
 						print 'jQuery(".trattachnewfilenow").show();'."\n";
 					}
 					print '
-                        if (jQuery(".truploadnewfilenow").is(":hidden")) {
-                            jQuery("input[name=\"sendit\"]").prop("disabled", true);
-                        } else {
-                            jQuery("input[name=\"sendit\"]").prop("disabled", false);
-                        }
-                    ';
+						jQuery("form[name=\"expensereport\"]").submit(function() {
+							if (jQuery(".truploadnewfilenow").is(":hidden")) {
+								jQuery("input[name=\"sendit\"]").val("");
+							}
+						});
+					';
 					print '
                     });
 				    ';

From 9b4a8aca1b256506b636c213e18ebeea0578aeec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Fri, 18 Jun 2021 11:00:00 +0200
Subject: [PATCH 0721/1497] fix typo can't set mandatory

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

diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php
index aa738f0845b..ac11206b79e 100644
--- a/htdocs/societe/admin/societe.php
+++ b/htdocs/societe/admin/societe.php
@@ -693,7 +693,7 @@ foreach ($profid as $key => $val)
 			print img_picto($langs->trans("Activated"), 'switch_on');
 			print '</a></td>';
 		} else {
-			print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofidmandator&token='.newToken().'&value='.$key.'&status=1">';
+			print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofidmandatory&token='.newToken().'&value='.$key.'&status=1">';
 			print img_picto($langs->trans("Disabled"), 'switch_off');
 			print '</a></td>';
 		}

From b026c28ceebe9a3e414801bb4e2d69eb36e97644 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 18 Jun 2021 13:20:55 +0200
Subject: [PATCH 0722/1497] Hide pass

---
 htdocs/adherents/card.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index d20318090e0..da84fd5bf6b 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -1727,15 +1727,14 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 		// Password
 		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
-			print '<tr><td>'.$langs->trans("Password").'</td><td>'.preg_replace('/./i', '*', $object->pass);
+			print '<tr><td>'.$langs->trans("Password").'</td><td>';
 			if ($object->pass) {
 				print preg_replace('/./i', '*', $object->pass);
 			} else {
 				if ($user->admin) {
-					print $langs->trans("Crypted").': '.$object->pass_indatabase_crypted;
-				} else {
-					print $langs->trans("Hidden");
+					print '<!-- '.$langs->trans("Crypted").': '.$object->pass_indatabase_crypted.' -->';
 				}
+				print '<span class="opacitymedium"'.$langs->trans("Hidden").'</span>';
 			}
 			if ((!empty($object->pass) || !empty($object->pass_crypted)) && empty($object->user_id)) {
 				$langs->load("errors");

From ad105e97d11416bd814e23fc8f85fef4b4710d40 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 18 Jun 2021 13:57:08 +0200
Subject: [PATCH 0723/1497] Allow creation of client

---
 htdocs/emailcollector/class/emailcollector.class.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index c39f97994b4..573bb6bd5b3 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -1721,6 +1721,13 @@ class EmailCollector extends CommonObject
 										// Overwrite values with values extracted from source email
 										$errorforthisaction = $this->overwritePropertiesOfObject($thirdpartystatic, $operation['actionparam'], $messagetext, $subject, $header);
 
+										if ($thirdpartystatic->client && empty($thirdpartystatic->code_client)) {
+											$thirdpartystatic->code_client = 'auto';
+										}
+										if ($thirdpartystatic->fournisseur && empty($thirdpartystatic->code_fournisseur)) {
+											$thirdpartystatic->code_fournisseur = 'auto';
+										}
+
 										if ($errorforthisaction) {
 											$errorforactions++;
 										} else {

From 4346958455952ff9c65d7984f72bd403f01da7a8 Mon Sep 17 00:00:00 2001
From: Marc GUENNEUGUES <marc.guenneugues@simicar.fr>
Date: Fri, 18 Jun 2021 20:03:03 +0200
Subject: [PATCH 0724/1497] Correct rights in core/ajax/row.php

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

diff --git a/htdocs/core/ajax/row.php b/htdocs/core/ajax/row.php
index 96dc792938f..95518cbbf66 100644
--- a/htdocs/core/ajax/row.php
+++ b/htdocs/core/ajax/row.php
@@ -91,9 +91,9 @@ if (GETPOST('roworder', 'alpha', 3) && GETPOST('table_element_line', 'aZ09', 3)
 		$perm = 1;
 	} elseif ($table_element_line == 'supplier_proposaldet' && $user->rights->supplier_proposal->write) {
 		$perm = 1;
-	} elseif ($table_element_line == 'commande_fournisseurdet' && $user->rights->fourn->commande->creer) {
+	} elseif ($table_element_line == 'commande_fournisseurdet' && $user->rights->fournisseur->commande->creer) {
 		$perm = 1;
-	} elseif ($table_element_line == 'facture_fourn_det' && $user->rights->fourn->facture->creer) {
+	} elseif ($table_element_line == 'facture_fourn_det' && $user->rights->fournisseur->facture->creer) {
 		$perm = 1;
 	} elseif ($table_element_line == 'ecm_files' && $fk_element == 'fk_product' && (!empty($user->rights->produit->creer) || !empty($user->rights->service->creer))) {
 		$perm = 1;

From 3ef203500a514706ee12fdbaed6ae29226e25118 Mon Sep 17 00:00:00 2001
From: Dennis Priskorn <egils@riseup.net>
Date: Fri, 18 Jun 2021 22:35:16 +0200
Subject: [PATCH 0725/1497] Update README.md

Add precise PHP min and max versions
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ad4971f50db..5d739882e7f 100644
--- a/README.md
+++ b/README.md
@@ -169,7 +169,7 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
 
 ### System Environment / Requirements
 
-- Works with PHP 5.6+ and MariaDB 5.0.3+, MySQL 5.0.3+ or PostgreSQL 8.1.4+ (See requirements on the [Wiki](https://wiki.dolibarr.org/index.php/Prerequisite))
+- Works with PHP 5.6-7.4 and MariaDB 5.0.3+, MySQL 5.0.3+ or PostgreSQL 8.1.4+ (See exact requirements on the [Wiki](https://wiki.dolibarr.org/index.php/Prerequisite))
 - Compatible with all Cloud solutions that match PHP & MySQL or PostgreSQL prerequisites.
 
 

From 4cfb4bc5281fe39bdf9f314bbab3b42b39cd448a Mon Sep 17 00:00:00 2001
From: Dennis Priskorn <egils@riseup.net>
Date: Fri, 18 Jun 2021 22:53:04 +0200
Subject: [PATCH 0726/1497] Update README.md

Rewrite requirements section to leave out versions and only have to change it in one place on the wiki going forward.
---
 README.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index ad349f713c1..b7cbe471426 100644
--- a/README.md
+++ b/README.md
@@ -201,8 +201,9 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
 
 
 ### System Environment / Requirements
-
-- Works with PHP 5.6+ and MariaDB 5.0.3+, MySQL 5.0.3+ or PostgreSQL 8.1.4+ (See requirements on the [Wiki](https://wiki.dolibarr.org/index.php/Prerequisite))
+(See exact requirements on the [Wiki](https://wiki.dolibarr.org/index.php/Prerequisite))
+- PHP
+- MariaDB, MySQL or PostgreSQL 
 - Compatible with all Cloud solutions that match PHP & MySQL or PostgreSQL prerequisites.
 
 

From ad30e8efc05ceda23946be9ea20775b3eced8392 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 19 Jun 2021 00:47:57 +0200
Subject: [PATCH 0727/1497] Fix phpcs

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

diff --git a/ChangeLog b/ChangeLog
index 972a27bc896..d3cc6da9b9c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,8 @@ FIX: #17060
 FIX: #17192 - With tz < 0, event is show in bad day on calendar views
 FIX: #17363
 FIX: #17476 releve.php: Fix SQL statement
+FIX: #17967
+Fix: #17906 : fix access denied
 FIX: Accountancy - Import in general ledger
 FIX: Accountancy - Quadra export - wrong data on credit
 FIX: Accountancy - Warning on the pages of the preparatory statements of accounting entries

From 8372a79c1d15f3599a57d507358318a6e9149352 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 19 Jun 2021 14:22:41 +0200
Subject: [PATCH 0728/1497] Clean code

---
 htdocs/contact/class/contact.class.php | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index 713ea98bf4f..cc3688d03a0 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -550,7 +550,6 @@ class Contact extends CommonObject
 		$this->fax = trim($this->fax);
 		$this->zip = (empty($this->zip) ? '' : trim($this->zip));
 		$this->town = (empty($this->town) ? '' : trim($this->town));
-		$this->ref_ext = trim($this->ref_ext);
 		$this->setUpperOrLowerCase();
 		$this->country_id = ($this->country_id > 0 ? $this->country_id : $this->country_id);
 		if (empty($this->statut)) {
@@ -561,20 +560,19 @@ class Contact extends CommonObject
 		}
 		$this->db->begin();
 
-		$sql = "UPDATE ".MAIN_DB_PREFIX."socpeople SET ";
+		$sql = "UPDATE ".MAIN_DB_PREFIX."socpeople SET";
 		if ($this->socid > 0) {
-			$sql .= " fk_soc='".$this->db->escape($this->socid)."',";
+			$sql .= " fk_soc = ".((int) $this->socid).",";
 		} elseif ($this->socid == -1) {
-			$sql .= " fk_soc=null,";
+			$sql .= " fk_soc = NULL,";
 		}
-		$sql .= " ref_ext='".$this->db->escape($this->ref_ext)."'";
-		$sql .= ", civility='".$this->db->escape($this->civility_code)."'";
+		$sql .= " civility='".$this->db->escape($this->civility_code)."'";
 		$sql .= ", lastname='".$this->db->escape($this->lastname)."'";
 		$sql .= ", firstname='".$this->db->escape($this->firstname)."'";
 		$sql .= ", address='".$this->db->escape($this->address)."'";
 		$sql .= ", zip='".$this->db->escape($this->zip)."'";
 		$sql .= ", town='".$this->db->escape($this->town)."'";
-		$sql .= ", ref_ext = ".(!empty($this->ref_ext) ? "'".$this->db->escape($this->ref_ext)."'" : "null");
+		$sql .= ", ref_ext = ".(!empty($this->ref_ext) ? "'".$this->db->escape($this->ref_ext)."'" : "NULL");
 		$sql .= ", fk_pays=".($this->country_id > 0 ? $this->country_id : 'NULL');
 		$sql .= ", fk_departement=".($this->state_id > 0 ? $this->state_id : 'NULL');
 		$sql .= ", poste='".$this->db->escape($this->poste)."'";
@@ -583,11 +581,11 @@ class Contact extends CommonObject
 		$sql .= ", socialnetworks = '".$this->db->escape(json_encode($this->socialnetworks))."'";
 		$sql .= ", photo='".$this->db->escape($this->photo)."'";
 		$sql .= ", birthday=".($this->birthday ? "'".$this->db->idate($this->birthday)."'" : "null");
-		$sql .= ", note_private = ".(isset($this->note_private) ? "'".$this->db->escape($this->note_private)."'" : "null");
-		$sql .= ", note_public = ".(isset($this->note_public) ? "'".$this->db->escape($this->note_public)."'" : "null");
-		$sql .= ", phone = ".(isset($this->phone_pro) ? "'".$this->db->escape($this->phone_pro)."'" : "null");
-		$sql .= ", phone_perso = ".(isset($this->phone_perso) ? "'".$this->db->escape($this->phone_perso)."'" : "null");
-		$sql .= ", phone_mobile = ".(isset($this->phone_mobile) ? "'".$this->db->escape($this->phone_mobile)."'" : "null");
+		$sql .= ", note_private = ".(isset($this->note_private) ? "'".$this->db->escape($this->note_private)."'" : "NULL");
+		$sql .= ", note_public = ".(isset($this->note_public) ? "'".$this->db->escape($this->note_public)."'" : "NULL");
+		$sql .= ", phone = ".(isset($this->phone_pro) ? "'".$this->db->escape($this->phone_pro)."'" : "NULL");
+		$sql .= ", phone_perso = ".(isset($this->phone_perso) ? "'".$this->db->escape($this->phone_perso)."'" : "NULL");
+		$sql .= ", phone_mobile = ".(isset($this->phone_mobile) ? "'".$this->db->escape($this->phone_mobile)."'" : "NULL");
 		$sql .= ", priv = '".$this->db->escape($this->priv)."'";
 		$sql .= ", fk_prospectcontactlevel = '".$this->db->escape($this->fk_prospectlevel)."'";
 		if (isset($this->stcomm_id)) {

From dfa5c419b324233668520f4b8f2f8ca6e2b10311 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 19 Jun 2021 14:52:06 +0200
Subject: [PATCH 0729/1497] Update commande.class.php

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

diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 728fe45d7bd..608e1aa5199 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -3087,10 +3087,10 @@ class Commande extends CommonOrder
 				$this->line->rang = $rangmax + 1;
 			}
 
-			$this->line->rowid=$rowid;
-			$this->line->label=!empty($label)?$label:$this->line->oldline->label;
-			$this->line->desc=$desc;
-			$this->line->qty=$qty;
+			$this->line->rowid = $rowid;
+			$this->line->label = $label;
+			$this->line->desc = $desc;
+			$this->line->qty = $qty;
 
 			$this->line->vat_src_code	= $vat_src_code;
 			$this->line->tva_tx         = $txtva;

From 3669600242108201fffc17874089aad0ae7f17b7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 19 Jun 2021 14:55:41 +0200
Subject: [PATCH 0730/1497] Update commande.class.php

---
 htdocs/commande/class/commande.class.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 20b80bdef2f..dec941049a1 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -3181,7 +3181,6 @@ class Commande extends CommonOrder
 			}
 
 			$this->line->id = $rowid;
-			$this->line->rowid = $rowid;  // For backward compatibility
 			$this->line->label = $label;
 			$this->line->desc = $desc;
 			$this->line->qty = $qty;

From 26f72b7fff281fefd9c2277a8ee5b9ee02df1457 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Sat, 19 Jun 2021 12:58:08 +0000
Subject: [PATCH 0731/1497] Fixing style errors.

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

diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index dec941049a1..2805f4556d3 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -2351,10 +2351,10 @@ class Commande extends CommonOrder
 					$staticline = clone $line;
 					$line->oldline = $staticline;
 
-					if ($line->delete($user) > 0)	{
+					if ($line->delete($user) > 0) {
 						$result = $this->update_price(1);
 
-            if ($result > 0) {
+						if ($result > 0) {
 							$this->db->commit();
 							return 1;
 						} else {

From f303e6664b9525fa5282b078fa1e4e0fd5741bb0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 19 Jun 2021 15:32:20 +0200
Subject: [PATCH 0732/1497] Fix reposition do not add several times the page_y
 parameter.

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

diff --git a/htdocs/core/js/lib_foot.js.php b/htdocs/core/js/lib_foot.js.php
index 20debf50f12..dce74d93653 100644
--- a/htdocs/core/js/lib_foot.js.php
+++ b/htdocs/core/js/lib_foot.js.php
@@ -198,7 +198,9 @@ print '
 					{
 						if (this.href)
 						{
+							console.log("We click on tag with .reposition class. this.ref was "+this.href);
 							var hrefarray = this.href.split("#", 2);
+							hrefarray[0]=hrefarray[0].replace(/&page_y=(\d+)/, \'\');		/* remove page_y param if already present */
 							this.href=hrefarray[0]+\'&page_y=\'+page_y;
 							console.log("We click on tag with .reposition class. this.ref is now "+this.href);
 						}

From 6911cc93d18a7d43721bbb50a070afb021b334f4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 19 Jun 2021 15:53:36 +0200
Subject: [PATCH 0733/1497] Fix: do not open the section to link files
 automatically after submit

---
 htdocs/expensereport/card.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index d9450483423..1ac24b56e6b 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -2186,6 +2186,7 @@ if ($action == 'create') {
 								print '</a>';
 							}
 
+							print '<!-- Code to open/close section to submit or link files in edit mode -->'."\n";
 							print '<script language="javascript">'."\n";
 							print '$(document).ready(function() {
         				        $( ".auploadnewfilenow" ).click(function() {
@@ -2339,14 +2340,22 @@ if ($action == 'create') {
 						print '</a>';
 					}
 
+					print '<!-- Code to open/close section to submit or link files in the form to add new line -->'."\n";
 					print '<script language="javascript">'."\n";
 					print '$(document).ready(function() {
 				        $( ".auploadnewfilenow" ).click(function() {
+							console.log("We click on toggle of auploadnewfilenow");
 				            jQuery(".truploadnewfilenow").toggle();
                             jQuery(".trattachnewfilenow").hide();
+							if (jQuery(".truploadnewfilenow").is(":hidden")) {
+                            	jQuery("input[name=\"sendit\"]").prop("name", "senditdisabled");
+                            } else {
+                                jQuery("input[name=\"senditdisabled\"]").prop("name", "sendit");
+                            }
                             return false;
                         });
 				        $( ".aattachtodoc" ).click(function() {
+							console.log("We click on toggle of aattachtodoc");
 				            jQuery(".trattachnewfilenow").toggle();
                             jQuery(".truploadnewfilenow").hide();
                             return false;
@@ -2357,7 +2366,11 @@ if ($action == 'create') {
 					print '
 						jQuery("form[name=\"expensereport\"]").submit(function() {
 							if (jQuery(".truploadnewfilenow").is(":hidden")) {
+								/* When section to send file is not expanded, we disable the button sendit that submit form to add a new file, so button to submit line will work. */
 								jQuery("input[name=\"sendit\"]").val("");
+								jQuery("input[name=\"sendit\"]").prop("name", "senditdisabled");
+							} else {
+								jQuery("input[name=\"senditdisabled\"]").prop("name", "sendit");
 							}
 						});
 					';

From 8cc2cec5605cdc47b5a16e083fdf356d399e28da Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Sat, 19 Jun 2021 16:56:08 +0200
Subject: [PATCH 0734/1497] Fix search drop down

---
 htdocs/main.inc.php                | 23 +++++++++++++++++++++--
 htdocs/theme/eldy/dropdown.inc.php |  2 +-
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index bcda6447c06..affa435d389 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -2565,7 +2565,7 @@ function top_menu_search()
         <a class="dropdown-toggle login-dropdown-a" data-toggle="dropdown" href="#" title="'.$langs->trans('Search').' ('.$langs->trans('SearchMenuShortCut').')">
             <i class="fa fa-search" ></i>
         </a>
-        <div class="dropdown-search">
+        <div class="dropdown-menu dropdown-search">
             '.$dropDownHtml.'
         </div>
     </div>';
@@ -2587,6 +2587,26 @@ function top_menu_search()
             }
         });
 
+        // arrow key nav
+        $(document).keydown(function(e) {
+			// Get the focused element:
+			var $focused = $(":focus");
+			if($focused.length && $focused.hasClass("global-search-item")){
+
+           		// UP - move to the previous line
+				if (e.keyCode == 38) {
+				    e.preventDefault();
+					$focused.prev().focus();
+				}
+
+				// DOWN - move to the next line
+				if (e.keyCode == 40) {
+				    e.preventDefault();
+					$focused.next().focus();
+				}
+			}
+        });
+
 
         // submit form action
         $(".dropdown-global-search-button-list .global-search-item").on("click", function(event) {
@@ -2619,7 +2639,6 @@ function top_menu_search()
 
 
         var openGlobalSearchDropDown = function() {
-            event.preventDefault();
             $("#topmenu-global-search-dropdown").toggleClass("open");
             $("#top-global-search-input").focus();
         }
diff --git a/htdocs/theme/eldy/dropdown.inc.php b/htdocs/theme/eldy/dropdown.inc.php
index e0976e0e1db..cfd5415a90c 100644
--- a/htdocs/theme/eldy/dropdown.inc.php
+++ b/htdocs/theme/eldy/dropdown.inc.php
@@ -392,7 +392,7 @@ a.top-menu-dropdown-link {
 	background-repeat: no-repeat;
 	background-size: 16px 16px;
 	background-position: 95% center;
-	border-radius: 10px;
+	border-radius: 20px;
 	border: 1px solid #c4c4c2 !important;
 	transition: all 250ms ease-in-out;
 	backface-visibility: hidden;

From 94ab340bba53c5e7144d7c00b127fca0dc0f2b61 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 19 Jun 2021 19:12:57 +0200
Subject: [PATCH 0735/1497] Fix css

---
 htdocs/expensereport/card.php                 | 1625 +++++++++--------
 .../tpl/expensereport_linktofile.tpl.php      |   12 +-
 2 files changed, 823 insertions(+), 814 deletions(-)

diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 1ac24b56e6b..344c65832db 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -1438,16 +1438,15 @@ if ($action == 'create') {
 	print '</div>';
 
 	print '</form>';
-} else {
-	if ($id > 0 || $ref) {
-		$result = $object->fetch($id, $ref);
+} elseif ($id > 0 || $ref) {
+	$result = $object->fetch($id, $ref);
 
-		$res = $object->fetch_optionals();
+	$res = $object->fetch_optionals();
 
-		if ($result > 0) {
-			if (!in_array($object->fk_user_author, $user->getAllChildIds(1))) {
-				if (empty($user->rights->expensereport->readall) && empty($user->rights->expensereport->lire_tous)
-					&& (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->expensereport->writeall_advance))) {
+	if ($result > 0) {
+		if (!in_array($object->fk_user_author, $user->getAllChildIds(1))) {
+			if (empty($user->rights->expensereport->readall) && empty($user->rights->expensereport->lire_tous)
+				&& (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->expensereport->writeall_advance))) {
 					print load_fiche_titre($langs->trans('TripCard'), '', 'trip');
 
 					print '<div class="tabBar">';
@@ -1459,736 +1458,736 @@ if ($action == 'create') {
 					$db->close();
 
 					exit;
-				}
+			}
+		}
+
+		$head = expensereport_prepare_head($object);
+
+		if ($action == 'edit' && ($object->status < 3 || $object->status == 99)) {
+			print "<form name='update' action=\"".$_SERVER['PHP_SELF']."\" method=\"post\">\n";
+			print '<input type="hidden" name="token" value="'.newToken().'">';
+			print '<input type="hidden" name="id" value="'.$id.'">';
+
+			print dol_get_fiche_head($head, 'card', $langs->trans("ExpenseReport"), 0, 'trip');
+
+			if ($object->status == 99) {
+				print '<input type="hidden" name="action" value="updateFromRefuse">';
+			} else {
+				print '<input type="hidden" name="action" value="update">';
 			}
 
-			$head = expensereport_prepare_head($object);
+			$linkback = '<a href="'.DOL_URL_ROOT.'/expensereport/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
-			if ($action == 'edit' && ($object->status < 3 || $object->status == 99)) {
-				print "<form name='update' action=\"".$_SERVER['PHP_SELF']."\" method=\"post\">\n";
-				print '<input type="hidden" name="token" value="'.newToken().'">';
-				print '<input type="hidden" name="id" value="'.$id.'">';
+			print '<table class="border" style="width:100%;">';
 
-				print dol_get_fiche_head($head, 'card', $langs->trans("ExpenseReport"), 0, 'trip');
+			print '<tr>';
+			print '<td>'.$langs->trans("User").'</td>';
+			print '<td>';
+			$userfee = new User($db);
+			if ($object->fk_user_author > 0) {
+				$userfee->fetch($object->fk_user_author);
+				print $userfee->getNomUrl(-1);
+			}
+			print '</td></tr>';
 
-				if ($object->status == 99) {
-					print '<input type="hidden" name="action" value="updateFromRefuse">';
-				} else {
-					print '<input type="hidden" name="action" value="update">';
-				}
+			// Ref
+			print '<tr><td class="titlefieldcreate">'.$langs->trans("Ref").'</td><td>';
+			print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref', '');
+			print '</td></tr>';
 
-				$linkback = '<a href="'.DOL_URL_ROOT.'/expensereport/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
-
-				print '<table class="border" style="width:100%;">';
+			print '<tr>';
+			print '<td>'.$langs->trans("DateStart").'</td>';
+			print '<td>';
+			print $form->selectDate($object->date_debut, 'date_debut');
+			print '</td>';
+			print '</tr>';
+			print '<tr>';
+			print '<td>'.$langs->trans("DateEnd").'</td>';
+			print '<td>';
+			print $form->selectDate($object->date_fin, 'date_fin');
+			print '</td>';
+			print '</tr>';
 
+			if (!empty($conf->global->EXPENSEREPORT_ASK_PAYMENTMODE_ON_CREATION)) {
 				print '<tr>';
-				print '<td>'.$langs->trans("User").'</td>';
+				print '<td>'.$langs->trans("ModePaiement").'</td>';
+				print '<td>';
+				$form->select_types_paiements($object->fk_c_paiement, 'fk_c_paiement');
+				print '</td>';
+				print '</tr>';
+			}
+
+			if ($object->status < 3) {
+				print '<tr>';
+				print '<td>'.$langs->trans("VALIDATOR").'</td>'; // Approbator
+				print '<td>';
+				$include_users = $object->fetch_users_approver_expensereport();
+				$s = $form->select_dolusers($object->fk_user_validator, "fk_user_validator", 1, "", 0, $include_users);
+				print $form->textwithpicto($s, $langs->trans("AnyOtherInThisListCanValidate"));
+				print '</td>';
+				print '</tr>';
+			} else {
+				print '<tr>';
+				print '<td>'.$langs->trans("VALIDOR").'</td>';
 				print '<td>';
 				$userfee = new User($db);
-				if ($object->fk_user_author > 0) {
-					$userfee->fetch($object->fk_user_author);
-					print $userfee->getNomUrl(-1);
-				}
+				$userfee->fetch($object->fk_user_valid);
+				print $userfee->getNomUrl(-1);
 				print '</td></tr>';
+			}
 
-				// Ref
-				print '<tr><td class="titlefieldcreate">'.$langs->trans("Ref").'</td><td>';
-				print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref', '');
+			if ($object->status == 6) {
+				print '<tr>';
+				print '<td>'.$langs->trans("AUTHORPAIEMENT").'</td>';
+				print '<td>';
+				$userfee = new User($db);
+				$userfee->fetch($user->id);
+				print $userfee->getNomUrl(-1);
 				print '</td></tr>';
+			}
 
-				print '<tr>';
-				print '<td>'.$langs->trans("DateStart").'</td>';
-				print '<td>';
-				print $form->selectDate($object->date_debut, 'date_debut');
-				print '</td>';
-				print '</tr>';
-				print '<tr>';
-				print '<td>'.$langs->trans("DateEnd").'</td>';
-				print '<td>';
-				print $form->selectDate($object->date_fin, 'date_fin');
-				print '</td>';
-				print '</tr>';
+			// Other attributes
+			//$cols = 3;
+			//include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_edit.tpl.php';
 
-				if (!empty($conf->global->EXPENSEREPORT_ASK_PAYMENTMODE_ON_CREATION)) {
-					print '<tr>';
-					print '<td>'.$langs->trans("ModePaiement").'</td>';
-					print '<td>';
-					$form->select_types_paiements($object->fk_c_paiement, 'fk_c_paiement');
-					print '</td>';
-					print '</tr>';
+			print '</table>';
+
+			print dol_get_fiche_end();
+
+			print '<div class="center">';
+			print '<input type="submit" value="'.$langs->trans("Modify").'" name="bouton" class="button">';
+			print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="button" value="'.$langs->trans("Cancel").'" class="button button-cancel" onclick="history.go(-1)" />';
+			print '</div>';
+
+			print '</form>';
+		} else {
+			print dol_get_fiche_head($head, 'card', $langs->trans("ExpenseReport"), -1, 'trip');
+
+			// Clone confirmation
+			if ($action == 'clone') {
+				// Create an array for form
+				$criteriaforfilter = 'hierarchyme';
+				if (!empty($user->rights->expensereport->readall)) {
+					$criteriaforfilter = '';
 				}
+				$formquestion = array(
+					'text' => '',
+					array('type' => 'other', 'name' => 'fk_user_author', 'label' => $langs->trans("SelectTargetUser"), 'value' => $form->select_dolusers((GETPOST('fk_user_author', 'int') > 0 ? GETPOST('fk_user_author', 'int') : $user->id), 'fk_user_author', 0, null, 0, $criteriaforfilter, '', '0', 0, 0, '', 0, '', 'maxwidth150'))
+				);
+				// Paiement incomplet. On demande si motif = escompte ou autre
+				$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneExpenseReport', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
+			}
 
-				if ($object->status < 3) {
-					print '<tr>';
-					print '<td>'.$langs->trans("VALIDATOR").'</td>'; // Approbator
-					print '<td>';
-					$include_users = $object->fetch_users_approver_expensereport();
-					$s = $form->select_dolusers($object->fk_user_validator, "fk_user_validator", 1, "", 0, $include_users);
-					print $form->textwithpicto($s, $langs->trans("AnyOtherInThisListCanValidate"));
-					print '</td>';
-					print '</tr>';
-				} else {
-					print '<tr>';
-					print '<td>'.$langs->trans("VALIDOR").'</td>';
-					print '<td>';
+			if ($action == 'save') {
+				$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id, $langs->trans("SaveTrip"), $langs->trans("ConfirmSaveTrip"), "confirm_validate", "", "", 1);
+			}
+
+			if ($action == 'save_from_refuse') {
+				$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id, $langs->trans("SaveTrip"), $langs->trans("ConfirmSaveTrip"), "confirm_save_from_refuse", "", "", 1);
+			}
+
+			if ($action == 'delete') {
+				$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id, $langs->trans("DeleteTrip"), $langs->trans("ConfirmDeleteTrip"), "confirm_delete", "", "", 1);
+			}
+
+			if ($action == 'validate') {
+				$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id, $langs->trans("ValideTrip"), $langs->trans("ConfirmValideTrip"), "confirm_approve", "", "", 1);
+			}
+
+			if ($action == 'paid') {
+				$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id, $langs->trans("PaidTrip"), $langs->trans("ConfirmPaidTrip"), "confirm_paid", "", "", 1);
+			}
+
+			if ($action == 'cancel') {
+				$array_input = array('text'=>$langs->trans("ConfirmCancelTrip"), array('type'=>"text", 'label'=>'<strong>'.$langs->trans("Comment").'</strong>', 'name'=>"detail_cancel", 'value'=>""));
+				$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id, $langs->trans("Cancel"), "", "confirm_cancel", $array_input, "", 1);
+			}
+
+			if ($action == 'setdraft') {
+				$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id, $langs->trans("BrouillonnerTrip"), $langs->trans("ConfirmBrouillonnerTrip"), "confirm_setdraft", "", "", 1);
+			}
+
+			if ($action == 'refuse') {		// Deny
+				$array_input = array('text'=>$langs->trans("ConfirmRefuseTrip"), array('type'=>"text", 'label'=>$langs->trans("Comment"), 'name'=>"detail_refuse", 'value'=>""));
+				$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id, $langs->trans("Deny"), '', "confirm_refuse", $array_input, "yes", 1);
+			}
+
+			if ($action == 'delete_line') {
+				$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id."&rowid=".GETPOST('rowid', 'int'), $langs->trans("DeleteLine"), $langs->trans("ConfirmDeleteLine"), "confirm_delete_line", '', 'yes', 1);
+			}
+
+			// Print form confirm
+			print $formconfirm;
+
+			// Expense report card
+			$linkback = '<a href="'.DOL_URL_ROOT.'/expensereport/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+
+			$morehtmlref = '<div class="refidno">';
+			/*
+			 // Ref customer
+			 $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, $user->rights->commande->creer, 'string', '', 0, 1);
+			 $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, $user->rights->commande->creer, 'string', '', null, null, '', 1);
+			 // Thirdparty
+			 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $soc->getNomUrl(1);
+			 // Project
+			 if (! empty($conf->projet->enabled))
+			 {
+			 $langs->load("projects");
+			 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+			 if ($user->rights->commande->creer)
+			 {
+			 if ($action != 'classify')
+			 $morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+			 if ($action == 'classify') {
+			 //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+			 $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+			 $morehtmlref.='<input type="hidden" name="action" value="classin">';
+			 $morehtmlref.='<input type="hidden" name="token" value="'.newToken().'">';
+			 $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+			 $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+			 $morehtmlref.='</form>';
+			 } else {
+			 $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+			 }
+			 } else {
+			 if (! empty($object->fk_project)) {
+			 $proj = new Project($db);
+			 $proj->fetch($object->fk_project);
+			 $morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
+			 $morehtmlref.=$proj->ref;
+			 $morehtmlref.='</a>';
+			 } else {
+			 $morehtmlref.='';
+			 }
+			 }
+			 }*/
+			 $morehtmlref .= '</div>';
+
+			 dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+
+			 print '<div class="fichecenter">';
+			 print '<div class="fichehalfleft">';
+			 print '<div class="underbanner clearboth"></div>';
+
+			 print '<table class="border tableforfield centpercent">';
+
+			 // Author
+			 print '<tr>';
+			 print '<td class="titlefield">'.$langs->trans("User").'</td>';
+			 print '<td>';
+			if ($object->fk_user_author > 0) {
+				$userauthor = new User($db);
+				$result = $userauthor->fetch($object->fk_user_author);
+				if ($result < 0) {
+					dol_print_error('', $userauthor->error);
+				} elseif ($result > 0) {
+					print $userauthor->getNomUrl(-1);
+				}
+			}
+			 print '</td></tr>';
+
+			 // Period
+			 print '<tr>';
+			 print '<td class="titlefield">'.$langs->trans("Period").'</td>';
+			 print '<td>';
+			 print get_date_range($object->date_debut, $object->date_fin, 'day', $langs, 0);
+			 print '</td>';
+			 print '</tr>';
+			if (!empty($conf->global->EXPENSEREPORT_ASK_PAYMENTMODE_ON_CREATION)) {
+				print '<tr>';
+				print '<td>'.$langs->trans("ModePaiement").'</td>';
+				print '<td>'.$object->fk_c_paiement.'</td>';
+				print '</tr>';
+			}
+
+			 // Validation date
+			 print '<tr>';
+			 print '<td>'.$langs->trans("DATE_SAVE").'</td>';
+			 print '<td>'.dol_print_date($object->date_valid, 'dayhour', 'tzuser');
+			if ($object->status == 2 && $object->hasDelay('toapprove')) {
+				print ' '.img_warning($langs->trans("Late").' - '.$langs->trans("ToApprove"));
+			}
+			if ($object->status == 5 && $object->hasDelay('topay')) {
+				print ' '.img_warning($langs->trans("Late").' - '.$langs->trans("ToPay"));
+			}
+			 print '</td></tr>';
+			 print '</tr>';
+
+			 // User to inform for approval
+			if ($object->status <= ExpenseReport::STATUS_VALIDATED) {	// informed
+				print '<tr>';
+				print '<td>'.$langs->trans("VALIDATOR").'</td>'; // approver
+				print '<td>';
+				if ($object->fk_user_validator > 0) {
 					$userfee = new User($db);
-					$userfee->fetch($object->fk_user_valid);
-					print $userfee->getNomUrl(-1);
-					print '</td></tr>';
-				}
-
-				if ($object->status == 6) {
-					print '<tr>';
-					print '<td>'.$langs->trans("AUTHORPAIEMENT").'</td>';
-					print '<td>';
-					$userfee = new User($db);
-					$userfee->fetch($user->id);
-					print $userfee->getNomUrl(-1);
-					print '</td></tr>';
-				}
-
-				// Other attributes
-				//$cols = 3;
-				//include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_edit.tpl.php';
-
-				print '</table>';
-
-				print dol_get_fiche_end();
-
-				print '<div class="center">';
-				print '<input type="submit" value="'.$langs->trans("Modify").'" name="bouton" class="button">';
-				print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="button" value="'.$langs->trans("Cancel").'" class="button button-cancel" onclick="history.go(-1)" />';
-				print '</div>';
-
-				print '</form>';
-			} else {
-				print dol_get_fiche_head($head, 'card', $langs->trans("ExpenseReport"), -1, 'trip');
-
-				// Clone confirmation
-				if ($action == 'clone') {
-					// Create an array for form
-					$criteriaforfilter = 'hierarchyme';
-					if (!empty($user->rights->expensereport->readall)) {
-						$criteriaforfilter = '';
-					}
-					$formquestion = array(
-						'text' => '',
-						array('type' => 'other', 'name' => 'fk_user_author', 'label' => $langs->trans("SelectTargetUser"), 'value' => $form->select_dolusers((GETPOST('fk_user_author', 'int') > 0 ? GETPOST('fk_user_author', 'int') : $user->id), 'fk_user_author', 0, null, 0, $criteriaforfilter, '', '0', 0, 0, '', 0, '', 'maxwidth150'))
-					);
-					// Paiement incomplet. On demande si motif = escompte ou autre
-					$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneExpenseReport', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
-				}
-
-				if ($action == 'save') {
-					$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id, $langs->trans("SaveTrip"), $langs->trans("ConfirmSaveTrip"), "confirm_validate", "", "", 1);
-				}
-
-				if ($action == 'save_from_refuse') {
-					$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id, $langs->trans("SaveTrip"), $langs->trans("ConfirmSaveTrip"), "confirm_save_from_refuse", "", "", 1);
-				}
-
-				if ($action == 'delete') {
-					$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id, $langs->trans("DeleteTrip"), $langs->trans("ConfirmDeleteTrip"), "confirm_delete", "", "", 1);
-				}
-
-				if ($action == 'validate') {
-					$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id, $langs->trans("ValideTrip"), $langs->trans("ConfirmValideTrip"), "confirm_approve", "", "", 1);
-				}
-
-				if ($action == 'paid') {
-					$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id, $langs->trans("PaidTrip"), $langs->trans("ConfirmPaidTrip"), "confirm_paid", "", "", 1);
-				}
-
-				if ($action == 'cancel') {
-					$array_input = array('text'=>$langs->trans("ConfirmCancelTrip"), array('type'=>"text", 'label'=>'<strong>'.$langs->trans("Comment").'</strong>', 'name'=>"detail_cancel", 'value'=>""));
-					$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id, $langs->trans("Cancel"), "", "confirm_cancel", $array_input, "", 1);
-				}
-
-				if ($action == 'setdraft') {
-					$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id, $langs->trans("BrouillonnerTrip"), $langs->trans("ConfirmBrouillonnerTrip"), "confirm_setdraft", "", "", 1);
-				}
-
-				if ($action == 'refuse') {		// Deny
-					$array_input = array('text'=>$langs->trans("ConfirmRefuseTrip"), array('type'=>"text", 'label'=>$langs->trans("Comment"), 'name'=>"detail_refuse", 'value'=>""));
-					$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id, $langs->trans("Deny"), '', "confirm_refuse", $array_input, "yes", 1);
-				}
-
-				if ($action == 'delete_line') {
-					$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id."&rowid=".GETPOST('rowid', 'int'), $langs->trans("DeleteLine"), $langs->trans("ConfirmDeleteLine"), "confirm_delete_line", '', 'yes', 1);
-				}
-
-				// Print form confirm
-				print $formconfirm;
-
-				// Expense report card
-				$linkback = '<a href="'.DOL_URL_ROOT.'/expensereport/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
-
-				$morehtmlref = '<div class="refidno">';
-				/*
-				// Ref customer
-				$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, $user->rights->commande->creer, 'string', '', 0, 1);
-				$morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, $user->rights->commande->creer, 'string', '', null, null, '', 1);
-				// Thirdparty
-				$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $soc->getNomUrl(1);
-				// Project
-				if (! empty($conf->projet->enabled))
-				{
-					$langs->load("projects");
-					$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
-					if ($user->rights->commande->creer)
-					{
-						if ($action != 'classify')
-							$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-							if ($action == 'classify') {
-								//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-								$morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-								$morehtmlref.='<input type="hidden" name="action" value="classin">';
-								$morehtmlref.='<input type="hidden" name="token" value="'.newToken().'">';
-								$morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-								$morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-								$morehtmlref.='</form>';
-							} else {
-								$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-							}
-					} else {
-						if (! empty($object->fk_project)) {
-							$proj = new Project($db);
-							$proj->fetch($object->fk_project);
-							$morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
-							$morehtmlref.=$proj->ref;
-							$morehtmlref.='</a>';
-						} else {
-							$morehtmlref.='';
-						}
-					}
-				}*/
-				$morehtmlref .= '</div>';
-
-				dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
-
-				print '<div class="fichecenter">';
-				print '<div class="fichehalfleft">';
-				print '<div class="underbanner clearboth"></div>';
-
-				print '<table class="border tableforfield centpercent">';
-
-				// Author
-				print '<tr>';
-				print '<td class="titlefield">'.$langs->trans("User").'</td>';
-				print '<td>';
-				if ($object->fk_user_author > 0) {
-					$userauthor = new User($db);
-					$result = $userauthor->fetch($object->fk_user_author);
-					if ($result < 0) {
-						dol_print_error('', $userauthor->error);
-					} elseif ($result > 0) {
-						print $userauthor->getNomUrl(-1);
-					}
-				}
-				print '</td></tr>';
-
-				// Period
-				print '<tr>';
-				print '<td class="titlefield">'.$langs->trans("Period").'</td>';
-				print '<td>';
-				print get_date_range($object->date_debut, $object->date_fin, 'day', $langs, 0);
-				print '</td>';
-				print '</tr>';
-				if (!empty($conf->global->EXPENSEREPORT_ASK_PAYMENTMODE_ON_CREATION)) {
-					print '<tr>';
-					print '<td>'.$langs->trans("ModePaiement").'</td>';
-					print '<td>'.$object->fk_c_paiement.'</td>';
-					print '</tr>';
-				}
-
-				// Validation date
-				print '<tr>';
-				print '<td>'.$langs->trans("DATE_SAVE").'</td>';
-				print '<td>'.dol_print_date($object->date_valid, 'dayhour', 'tzuser');
-				if ($object->status == 2 && $object->hasDelay('toapprove')) {
-					print ' '.img_warning($langs->trans("Late").' - '.$langs->trans("ToApprove"));
-				}
-				if ($object->status == 5 && $object->hasDelay('topay')) {
-					print ' '.img_warning($langs->trans("Late").' - '.$langs->trans("ToPay"));
-				}
-				print '</td></tr>';
-				print '</tr>';
-
-				// User to inform for approval
-				if ($object->status <= ExpenseReport::STATUS_VALIDATED) {	// informed
-					print '<tr>';
-					print '<td>'.$langs->trans("VALIDATOR").'</td>'; // approver
-					print '<td>';
-					if ($object->fk_user_validator > 0) {
-						$userfee = new User($db);
-						$result = $userfee->fetch($object->fk_user_validator);
-						if ($result > 0) {
-							print $userfee->getNomUrl(-1);
-						}
-						if (empty($userfee->email) || !isValidEmail($userfee->email)) {
-							$langs->load("errors");
-							print img_warning($langs->trans("ErrorBadEMail", $userfee->email));
-						}
-					}
-					print '</td></tr>';
-				} elseif ($object->status == ExpenseReport::STATUS_CANCELED) {
-					print '<tr>';
-					print '<td>'.$langs->trans("CANCEL_USER").'</span></td>';
-					print '<td>';
-					if ($object->fk_user_cancel > 0) {
-						$userfee = new User($db);
-						$result = $userfee->fetch($object->fk_user_cancel);
-						if ($result > 0) {
-							print $userfee->getNomUrl(-1);
-						}
-					}
-					print '</td></tr>';
-
-					print '<tr>';
-					print '<td>'.$langs->trans("MOTIF_CANCEL").'</td>';
-					print '<td>'.$object->detail_cancel.'</td></tr>';
-					print '</tr>';
-					print '<tr>';
-					print '<td>'.$langs->trans("DATE_CANCEL").'</td>';
-					print '<td>'.dol_print_date($object->date_cancel, 'dayhour', 'tzuser').'</td></tr>';
-					print '</tr>';
-				} else {
-					print '<tr>';
-					print '<td>'.$langs->trans("ApprovedBy").'</td>';
-					print '<td>';
-					if ($object->fk_user_approve > 0) {
-						$userapp = new User($db);
-						$result = $userapp->fetch($object->fk_user_approve);
-						if ($result > 0) {
-							print $userapp->getNomUrl(-1);
-						}
-					}
-					print '</td></tr>';
-
-					print '<tr>';
-					print '<td>'.$langs->trans("DateApprove").'</td>';
-					print '<td>'.dol_print_date($object->date_approve, 'dayhour', 'tzuser').'</td></tr>';
-					print '</tr>';
-				}
-
-				if ($object->status == 99 || !empty($object->detail_refuse)) {
-					print '<tr>';
-					print '<td>'.$langs->trans("REFUSEUR").'</td>';
-					print '<td>';
-					$userfee = new User($db);
-					$result = $userfee->fetch($object->fk_user_refuse);
+					$result = $userfee->fetch($object->fk_user_validator);
 					if ($result > 0) {
 						print $userfee->getNomUrl(-1);
 					}
-					print '</td></tr>';
-
-					print '<tr>';
-					print '<td>'.$langs->trans("DATE_REFUS").'</td>';
-					print '<td>'.dol_print_date($object->date_refuse, 'dayhour', 'tzuser');
-					if ($object->detail_refuse) {
-						print ' - '.$object->detail_refuse;
+					if (empty($userfee->email) || !isValidEmail($userfee->email)) {
+						$langs->load("errors");
+						print img_warning($langs->trans("ErrorBadEMail", $userfee->email));
 					}
-					print '</td>';
-					print '</tr>';
 				}
+				print '</td></tr>';
+			} elseif ($object->status == ExpenseReport::STATUS_CANCELED) {
+				print '<tr>';
+				print '<td>'.$langs->trans("CANCEL_USER").'</span></td>';
+				print '<td>';
+				if ($object->fk_user_cancel > 0) {
+					$userfee = new User($db);
+					$result = $userfee->fetch($object->fk_user_cancel);
+					if ($result > 0) {
+						print $userfee->getNomUrl(-1);
+					}
+				}
+				print '</td></tr>';
 
-				if ($object->status == $object::STATUS_CLOSED) {
-					/* TODO this fields are not yet filled
-					print '<tr>';
-					print '<td>'.$langs->trans("AUTHORPAIEMENT").'</td>';
-					print '<td>';
-					$userfee=new User($db);
-					$userfee->fetch($object->fk_user_paid);
+				print '<tr>';
+				print '<td>'.$langs->trans("MOTIF_CANCEL").'</td>';
+				print '<td>'.$object->detail_cancel.'</td></tr>';
+				print '</tr>';
+				print '<tr>';
+				print '<td>'.$langs->trans("DATE_CANCEL").'</td>';
+				print '<td>'.dol_print_date($object->date_cancel, 'dayhour', 'tzuser').'</td></tr>';
+				print '</tr>';
+			} else {
+				print '<tr>';
+				print '<td>'.$langs->trans("ApprovedBy").'</td>';
+				print '<td>';
+				if ($object->fk_user_approve > 0) {
+					$userapp = new User($db);
+					$result = $userapp->fetch($object->fk_user_approve);
+					if ($result > 0) {
+						print $userapp->getNomUrl(-1);
+					}
+				}
+				print '</td></tr>';
+
+				print '<tr>';
+				print '<td>'.$langs->trans("DateApprove").'</td>';
+				print '<td>'.dol_print_date($object->date_approve, 'dayhour', 'tzuser').'</td></tr>';
+				print '</tr>';
+			}
+
+			if ($object->status == 99 || !empty($object->detail_refuse)) {
+				print '<tr>';
+				print '<td>'.$langs->trans("REFUSEUR").'</td>';
+				print '<td>';
+				$userfee = new User($db);
+				$result = $userfee->fetch($object->fk_user_refuse);
+				if ($result > 0) {
 					print $userfee->getNomUrl(-1);
-					print '</td></tr>';
-					print '<tr>';
-					print '<td>'.$langs->trans("DATE_PAIEMENT").'</td>';
-					print '<td>'.$object->date_paiement.'</td></tr>';
-					print '</tr>';
-					*/
 				}
-
-				// Other attributes
-				$cols = 2;
-				include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
-
-				print '</table>';
-
-				print '</div>';
-				print '<div class="fichehalfright">';
-				print '<div class="ficheaddleft">';
-				print '<div class="underbanner clearboth"></div>';
-
-				print '<table class="border tableforfield centpercent">';
-
-				// Amount
-				print '<tr>';
-				print '<td class="titlefieldmiddle">'.$langs->trans("AmountHT").'</td>';
-				print '<td class="nowrap amountcard">'.price($object->total_ht, 1, '', 1, - 1, - 1, $conf->currency).'</td>';
-				$rowspan = 5;
-				if ($object->status <= ExpenseReport::STATUS_VALIDATED) {
-					$rowspan++;
-				} elseif ($object->status == ExpenseReport::STATUS_CANCELED) {
-					$rowspan += 2;
-				} else {
-					$rowspan += 2;
-				}
-				if ($object->status == ExpenseReport::STATUS_REFUSED || !empty($object->detail_refuse)) {
-					$rowspan += 2;
-				}
-				if ($object->status == ExpenseReport::STATUS_CLOSED) {
-					$rowspan += 2;
-				}
-				print "</td>";
-				print '</tr>';
+				print '</td></tr>';
 
 				print '<tr>';
-				print '<td>'.$langs->trans("AmountVAT").'</td>';
-				print '<td class="nowrap amountcard">'.price($object->total_tva, 1, '', 1, - 1, - 1, $conf->currency).'</td>';
+				print '<td>'.$langs->trans("DATE_REFUS").'</td>';
+				print '<td>'.dol_print_date($object->date_refuse, 'dayhour', 'tzuser');
+				if ($object->detail_refuse) {
+					print ' - '.$object->detail_refuse;
+				}
+				print '</td>';
 				print '</tr>';
+			}
 
-				print '<tr>';
-				print '<td>'.$langs->trans("AmountTTC").'</td>';
-				print '<td class="nowrap amountcard">'.price($object->total_ttc, 1, '', 1, - 1, - 1, $conf->currency).'</td>';
-				print '</tr>';
+			if ($object->status == $object::STATUS_CLOSED) {
+				/* TODO this fields are not yet filled
+				  print '<tr>';
+				  print '<td>'.$langs->trans("AUTHORPAIEMENT").'</td>';
+				  print '<td>';
+				  $userfee=new User($db);
+				  $userfee->fetch($object->fk_user_paid);
+				  print $userfee->getNomUrl(-1);
+				  print '</td></tr>';
+				  print '<tr>';
+				  print '<td>'.$langs->trans("DATE_PAIEMENT").'</td>';
+				  print '<td>'.$object->date_paiement.'</td></tr>';
+				  print '</tr>';
+				  */
+			}
 
-				// List of payments already done
-				$nbcols = 3;
-				if (!empty($conf->banque->enabled)) {
-					$nbrows++;
-					$nbcols++;
+			 // Other attributes
+			 $cols = 2;
+			 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
+
+			 print '</table>';
+
+			 print '</div>';
+			 print '<div class="fichehalfright">';
+			 print '<div class="ficheaddleft">';
+			 print '<div class="underbanner clearboth"></div>';
+
+			 print '<table class="border tableforfield centpercent">';
+
+			 // Amount
+			 print '<tr>';
+			 print '<td class="titlefieldmiddle">'.$langs->trans("AmountHT").'</td>';
+			 print '<td class="nowrap amountcard">'.price($object->total_ht, 1, '', 1, - 1, - 1, $conf->currency).'</td>';
+			 $rowspan = 5;
+			if ($object->status <= ExpenseReport::STATUS_VALIDATED) {
+				$rowspan++;
+			} elseif ($object->status == ExpenseReport::STATUS_CANCELED) {
+				$rowspan += 2;
+			} else {
+				$rowspan += 2;
+			}
+			if ($object->status == ExpenseReport::STATUS_REFUSED || !empty($object->detail_refuse)) {
+				$rowspan += 2;
+			}
+			if ($object->status == ExpenseReport::STATUS_CLOSED) {
+				$rowspan += 2;
+			}
+			 print "</td>";
+			 print '</tr>';
+
+			 print '<tr>';
+			 print '<td>'.$langs->trans("AmountVAT").'</td>';
+			 print '<td class="nowrap amountcard">'.price($object->total_tva, 1, '', 1, - 1, - 1, $conf->currency).'</td>';
+			 print '</tr>';
+
+			 print '<tr>';
+			 print '<td>'.$langs->trans("AmountTTC").'</td>';
+			 print '<td class="nowrap amountcard">'.price($object->total_ttc, 1, '', 1, - 1, - 1, $conf->currency).'</td>';
+			 print '</tr>';
+
+			 // List of payments already done
+			 $nbcols = 3;
+			if (!empty($conf->banque->enabled)) {
+				$nbrows++;
+				$nbcols++;
+			}
+
+			 print '<table class="noborder paymenttable" width="100%">';
+
+			 print '<tr class="liste_titre">';
+			 print '<td class="liste_titre">'.$langs->trans('Payments').'</td>';
+			 print '<td class="liste_titre">'.$langs->trans('Date').'</td>';
+			 print '<td class="liste_titre">'.$langs->trans('Type').'</td>';
+			if (!empty($conf->banque->enabled)) {
+				print '<td class="liste_titre right">'.$langs->trans('BankAccount').'</td>';
+			}
+			 print '<td class="liste_titre right">'.$langs->trans('Amount').'</td>';
+			 print '<td class="liste_titre" width="18">&nbsp;</td>';
+			 print '</tr>';
+
+			 // Payments already done (from payment on this expensereport)
+			 $sql = "SELECT p.rowid, p.num_payment, p.datep as dp, p.amount, p.fk_bank,";
+			 $sql .= "c.code as p_code, c.libelle as payment_type,";
+			 $sql .= "ba.rowid as baid, ba.ref as baref, ba.label, ba.number as banumber, ba.account_number, ba.fk_accountancy_journal";
+			 $sql .= " FROM ".MAIN_DB_PREFIX."expensereport as e, ".MAIN_DB_PREFIX."payment_expensereport as p";
+			 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON p.fk_typepayment = c.id";
+			 $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON p.fk_bank = b.rowid';
+			 $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank_account as ba ON b.fk_account = ba.rowid';
+			 $sql .= " WHERE e.rowid = '".$id."'";
+			 $sql .= " AND p.fk_expensereport = e.rowid";
+			 $sql .= ' AND e.entity IN ('.getEntity('expensereport').')';
+			 $sql .= " ORDER BY dp";
+
+			 $resql = $db->query($sql);
+			if ($resql) {
+				$num = $db->num_rows($resql);
+				$i = 0; $totalpaid = 0;
+				while ($i < $num) {
+					$objp = $db->fetch_object($resql);
+
+					$paymentexpensereportstatic->id = $objp->rowid;
+					$paymentexpensereportstatic->datepaye = $db->jdate($objp->dp);
+					$paymentexpensereportstatic->ref = $objp->rowid;
+					$paymentexpensereportstatic->num_payment = $objp->num_payment;
+					$paymentexpensereportstatic->payment_code = $objp->payment_code;
+
+					print '<tr class="oddseven">';
+					print '<td>';
+					print $paymentexpensereportstatic->getNomUrl(1);
+					print '</td>';
+					print '<td>'.dol_print_date($db->jdate($objp->dp), 'day')."</td>\n";
+					$labeltype = $langs->trans("PaymentType".$objp->p_code) != ("PaymentType".$objp->p_code) ? $langs->trans("PaymentType".$objp->p_code) : $objp->payment_type;
+					print "<td>".$labeltype.' '.$objp->num_payment."</td>\n";
+					if (!empty($conf->banque->enabled)) {
+						$bankaccountstatic->id = $objp->baid;
+						$bankaccountstatic->ref = $objp->baref;
+						$bankaccountstatic->label = $objp->baref;
+						$bankaccountstatic->number = $objp->banumber;
+
+						if (!empty($conf->accounting->enabled)) {
+							$bankaccountstatic->account_number = $objp->account_number;
+
+							$accountingjournal = new AccountingJournal($db);
+							$accountingjournal->fetch($objp->fk_accountancy_journal);
+							$bankaccountstatic->accountancy_journal = $accountingjournal->getNomUrl(0, 1, 1, '', 1);
+						}
+
+						print '<td class="right">';
+						if ($bankaccountstatic->id) {
+							print $bankaccountstatic->getNomUrl(1, 'transactions');
+						}
+						print '</td>';
+					}
+					print '<td class="right">'.price($objp->amount)."</td>";
+					print '<td></td>';
+					print "</tr>";
+					$totalpaid += $objp->amount;
+					$i++;
+				}
+				if (!is_null($totalpaid)) {
+					$totalpaid = price2num($totalpaid); // Round $totalpaid to fix floating problem after addition into loop
 				}
 
-				print '<table class="noborder paymenttable" width="100%">';
+				$remaintopay = price2num($object->total_ttc - $totalpaid);
+				$resteapayeraffiche = $remaintopay;
+
+				$cssforamountpaymentcomplete = 'amountpaymentcomplete';
+
+				if ($object->status == ExpenseReport::STATUS_REFUSED) {
+					$cssforamountpaymentcomplete = 'amountpaymentneutral';
+					$resteapayeraffiche = 0;
+				} elseif ($object->paid == 0) {
+					$cssforamountpaymentcomplete = 'amountpaymentneutral';
+				}
+				print '<tr><td colspan="'.$nbcols.'" class="right">'.$langs->trans("AlreadyPaid").':</td><td class="right">'.price($totalpaid).'</td><td></td></tr>';
+				print '<tr><td colspan="'.$nbcols.'" class="right">'.$langs->trans("AmountExpected").':</td><td class="right">'.price($object->total_ttc).'</td><td></td></tr>';
+
+				print '<tr><td colspan="'.$nbcols.'" class="right">'.$langs->trans("RemainderToPay").':</td>';
+				print '<td class="right'.($resteapayeraffiche ? ' amountremaintopay' : (' '.$cssforamountpaymentcomplete)).'">'.price($resteapayeraffiche).'</td><td></td></tr>';
+
+				$db->free($resql);
+			} else {
+				dol_print_error($db);
+			}
+			 print "</table>";
+
+			 print '</div>';
+			 print '</div>';
+			 print '</div>';
+
+			 print '<div class="clearboth"></div><br>';
+
+			 print '<div style="clear: both;"></div>';
+
+			 $actiontouse = 'updateline';
+			if (($object->status == 0 || $object->status == 99) && $action != 'editline') {
+				$actiontouse = 'addline';
+			}
+
+			 print '<form name="expensereport" action="'.$_SERVER["PHP_SELF"].'" enctype="multipart/form-data" method="post" >';
+			 print '<input type="hidden" name="token" value="'.newToken().'">';
+			 print '<input type="hidden" name="action" value="'.$actiontouse.'">';
+			 print '<input type="hidden" name="id" value="'.$object->id.'">';
+			 print '<input type="hidden" name="fk_expensereport" value="'.$object->id.'" />';
+
+			 print '<div class="div-table-responsive-no-min">';
+			 print '<table id="tablelines" class="noborder centpercent">';
+
+			if (!empty($object->lines)) {
+				$i = 0; $total = 0;
 
 				print '<tr class="liste_titre">';
-				print '<td class="liste_titre">'.$langs->trans('Payments').'</td>';
-				print '<td class="liste_titre">'.$langs->trans('Date').'</td>';
-				print '<td class="liste_titre">'.$langs->trans('Type').'</td>';
-				if (!empty($conf->banque->enabled)) {
-					print '<td class="liste_titre right">'.$langs->trans('BankAccount').'</td>';
+				print '<td class="center">'.$langs->trans('LineNb').'</td>';
+				//print '<td class="center">'.$langs->trans('Piece').'</td>';
+				print '<td class="center">'.$langs->trans('Date').'</td>';
+				if (!empty($conf->projet->enabled)) {
+					print '<td class="minwidth100imp">'.$langs->trans('Project').'</td>';
+				}
+				print '<td class="center">'.$langs->trans('Type').'</td>';
+				if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
+					print '<td>'.$langs->trans('CarCategory').'</td>';
+				}
+				print '<td>'.$langs->trans('Description').'</td>';
+				print '<td class="right">'.$langs->trans('VAT').'</td>';
+				print '<td class="right">'.$langs->trans('PriceUHT').'</td>';
+				print '<td class="right">'.$langs->trans('PriceUTTC').'</td>';
+				print '<td class="right">'.$langs->trans('Qty').'</td>';
+				if ($action != 'editline') {
+					print '<td class="right">'.$langs->trans('AmountHT').'</td>';
+					print '<td class="right">'.$langs->trans('AmountTTC').'</td>';
+				}
+				// Picture
+				print '<td>';
+				print '</td>';
+				// Ajout des boutons de modification/suppression
+				if (($object->status < 2 || $object->status == 99) && $user->rights->expensereport->creer) {
+					print '<td class="right"></td>';
 				}
-				print '<td class="liste_titre right">'.$langs->trans('Amount').'</td>';
-				print '<td class="liste_titre" width="18">&nbsp;</td>';
 				print '</tr>';
 
-				// Payments already done (from payment on this expensereport)
-				$sql = "SELECT p.rowid, p.num_payment, p.datep as dp, p.amount, p.fk_bank,";
-				$sql .= "c.code as p_code, c.libelle as payment_type,";
-				$sql .= "ba.rowid as baid, ba.ref as baref, ba.label, ba.number as banumber, ba.account_number, ba.fk_accountancy_journal";
-				$sql .= " FROM ".MAIN_DB_PREFIX."expensereport as e, ".MAIN_DB_PREFIX."payment_expensereport as p";
-				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON p.fk_typepayment = c.id";
-				$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON p.fk_bank = b.rowid';
-				$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank_account as ba ON b.fk_account = ba.rowid';
-				$sql .= " WHERE e.rowid = '".$id."'";
-				$sql .= " AND p.fk_expensereport = e.rowid";
-				$sql .= ' AND e.entity IN ('.getEntity('expensereport').')';
-				$sql .= " ORDER BY dp";
+				foreach ($object->lines as &$line) {
+					$numline = $i + 1;
 
-				$resql = $db->query($sql);
-				if ($resql) {
-					$num = $db->num_rows($resql);
-					$i = 0; $totalpaid = 0;
-					while ($i < $num) {
-						$objp = $db->fetch_object($resql);
+					if ($action != 'editline' || $line->rowid != GETPOST('rowid', 'int')) {
+						print '<tr class="oddeven">';
 
-						$paymentexpensereportstatic->id = $objp->rowid;
-						$paymentexpensereportstatic->datepaye = $db->jdate($objp->dp);
-						$paymentexpensereportstatic->ref = $objp->rowid;
-						$paymentexpensereportstatic->num_payment = $objp->num_payment;
-						$paymentexpensereportstatic->payment_code = $objp->payment_code;
-
-						print '<tr class="oddseven">';
-						print '<td>';
-						print $paymentexpensereportstatic->getNomUrl(1);
+						// Num
+						print '<td class="center">';
+						print $numline;
 						print '</td>';
-						print '<td>'.dol_print_date($db->jdate($objp->dp), 'day')."</td>\n";
-						$labeltype = $langs->trans("PaymentType".$objp->p_code) != ("PaymentType".$objp->p_code) ? $langs->trans("PaymentType".$objp->p_code) : $objp->payment_type;
-						print "<td>".$labeltype.' '.$objp->num_payment."</td>\n";
-						if (!empty($conf->banque->enabled)) {
-							$bankaccountstatic->id = $objp->baid;
-							$bankaccountstatic->ref = $objp->baref;
-							$bankaccountstatic->label = $objp->baref;
-							$bankaccountstatic->number = $objp->banumber;
 
-							if (!empty($conf->accounting->enabled)) {
-								$bankaccountstatic->account_number = $objp->account_number;
+						// Date
+						print '<td class="center">'.dol_print_date($db->jdate($line->date), 'day').'</td>';
 
-								$accountingjournal = new AccountingJournal($db);
-								$accountingjournal->fetch($objp->fk_accountancy_journal);
-								$bankaccountstatic->accountancy_journal = $accountingjournal->getNomUrl(0, 1, 1, '', 1);
-							}
-
-							print '<td class="right">';
-							if ($bankaccountstatic->id) {
-								print $bankaccountstatic->getNomUrl(1, 'transactions');
+						// Project
+						if (!empty($conf->projet->enabled)) {
+							print '<td>';
+							if ($line->fk_project > 0) {
+								$projecttmp->id = $line->fk_project;
+								$projecttmp->ref = $line->projet_ref;
+								$projecttmp->title = $line->projet_title;
+								print $projecttmp->getNomUrl(1);
 							}
 							print '</td>';
 						}
-						print '<td class="right">'.price($objp->amount)."</td>";
-						print '<td></td>';
-						print "</tr>";
-						$totalpaid += $objp->amount;
-						$i++;
-					}
-					if (!is_null($totalpaid)) {
-						$totalpaid = price2num($totalpaid); // Round $totalpaid to fix floating problem after addition into loop
-					}
 
-					$remaintopay = price2num($object->total_ttc - $totalpaid);
-					$resteapayeraffiche = $remaintopay;
+						// Type of fee
+						print '<td class="center">';
+						$labeltype = ($langs->trans(($line->type_fees_code)) == $line->type_fees_code ? $line->type_fees_libelle : $langs->trans($line->type_fees_code));
+						print $labeltype;
+						print '</td>';
 
-					$cssforamountpaymentcomplete = 'amountpaymentcomplete';
-
-					if ($object->status == ExpenseReport::STATUS_REFUSED) {
-						$cssforamountpaymentcomplete = 'amountpaymentneutral';
-						$resteapayeraffiche = 0;
-					} elseif ($object->paid == 0) {
-						$cssforamountpaymentcomplete = 'amountpaymentneutral';
-					}
-					print '<tr><td colspan="'.$nbcols.'" class="right">'.$langs->trans("AlreadyPaid").':</td><td class="right">'.price($totalpaid).'</td><td></td></tr>';
-					print '<tr><td colspan="'.$nbcols.'" class="right">'.$langs->trans("AmountExpected").':</td><td class="right">'.price($object->total_ttc).'</td><td></td></tr>';
-
-					print '<tr><td colspan="'.$nbcols.'" class="right">'.$langs->trans("RemainderToPay").':</td>';
-					print '<td class="right'.($resteapayeraffiche ? ' amountremaintopay' : (' '.$cssforamountpaymentcomplete)).'">'.price($resteapayeraffiche).'</td><td></td></tr>';
-
-					$db->free($resql);
-				} else {
-					dol_print_error($db);
-				}
-				print "</table>";
-
-				print '</div>';
-				print '</div>';
-				print '</div>';
-
-				print '<div class="clearboth"></div><br>';
-
-				print '<div style="clear: both;"></div>';
-
-				$actiontouse = 'updateline';
-				if (($object->status == 0 || $object->status == 99) && $action != 'editline') {
-					$actiontouse = 'addline';
-				}
-
-				print '<form name="expensereport" action="'.$_SERVER["PHP_SELF"].'" enctype="multipart/form-data" method="post" >';
-				print '<input type="hidden" name="token" value="'.newToken().'">';
-				print '<input type="hidden" name="action" value="'.$actiontouse.'">';
-				print '<input type="hidden" name="id" value="'.$object->id.'">';
-				print '<input type="hidden" name="fk_expensereport" value="'.$object->id.'" />';
-
-				print '<div class="div-table-responsive-no-min">';
-				print '<table id="tablelines" class="noborder centpercent">';
-
-				if (!empty($object->lines)) {
-					$i = 0; $total = 0;
-
-					print '<tr class="liste_titre">';
-					print '<td class="center">'.$langs->trans('LineNb').'</td>';
-					//print '<td class="center">'.$langs->trans('Piece').'</td>';
-					print '<td class="center">'.$langs->trans('Date').'</td>';
-					if (!empty($conf->projet->enabled)) {
-						print '<td class="minwidth100imp">'.$langs->trans('Project').'</td>';
-					}
-					print '<td class="center">'.$langs->trans('Type').'</td>';
-					if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
-						print '<td>'.$langs->trans('CarCategory').'</td>';
-					}
-					print '<td>'.$langs->trans('Description').'</td>';
-					print '<td class="right">'.$langs->trans('VAT').'</td>';
-					print '<td class="right">'.$langs->trans('PriceUHT').'</td>';
-					print '<td class="right">'.$langs->trans('PriceUTTC').'</td>';
-					print '<td class="right">'.$langs->trans('Qty').'</td>';
-					if ($action != 'editline') {
-						print '<td class="right">'.$langs->trans('AmountHT').'</td>';
-						print '<td class="right">'.$langs->trans('AmountTTC').'</td>';
-					}
-					// Picture
-					print '<td>';
-					print '</td>';
-					// Ajout des boutons de modification/suppression
-					if (($object->status < 2 || $object->status == 99) && $user->rights->expensereport->creer) {
-						print '<td class="right"></td>';
-					}
-					print '</tr>';
-
-					foreach ($object->lines as &$line) {
-						$numline = $i + 1;
-
-						if ($action != 'editline' || $line->rowid != GETPOST('rowid', 'int')) {
-							print '<tr class="oddeven">';
-
-							// Num
-							print '<td class="center">';
-							print $numline;
+						// IK
+						if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
+							print '<td class="fk_c_exp_tax_cat">';
+							print dol_getIdFromCode($db, $line->fk_c_exp_tax_cat, 'c_exp_tax_cat', 'rowid', 'label');
 							print '</td>';
+						}
 
-							// Date
-							print '<td class="center">'.dol_print_date($db->jdate($line->date), 'day').'</td>';
+						// Comment
+						print '<td class="left">'.dol_nl2br($line->comments).'</td>';
+						// VAT rate
+						print '<td class="right">'.vatrate($line->vatrate, true).'</td>';
+						// Unit price HT
+						print '<td class="right">';
+						if (!empty($line->value_unit_ht)) {
+							print price($line->value_unit_ht);
+						} else {
+							$tmpvat = price2num(preg_replace('/\s*\(.*\)/', '', $line->vatrate));
+							$pricenettoshow = price2num($line->value_unit / (1 + $tmpvat / 100), 'MU');
+							print $pricenettoshow;
+						}
+						print '</td>';
 
-							// Project
-							if (!empty($conf->projet->enabled)) {
-								print '<td>';
-								if ($line->fk_project > 0) {
-									$projecttmp->id = $line->fk_project;
-									$projecttmp->ref = $line->projet_ref;
-									$projecttmp->title = $line->projet_title;
-									print $projecttmp->getNomUrl(1);
-								}
-								print '</td>';
-							}
+						print '<td class="right">'.price($line->value_unit).'</td>';
 
-							// Type of fee
-							print '<td class="center">';
-							$labeltype = ($langs->trans(($line->type_fees_code)) == $line->type_fees_code ? $line->type_fees_libelle : $langs->trans($line->type_fees_code));
-							print $labeltype;
-							print '</td>';
+						print '<td class="right">'.dol_escape_htmltag($line->qty).'</td>';
 
-							// IK
-							if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
-								print '<td class="fk_c_exp_tax_cat">';
-								print dol_getIdFromCode($db, $line->fk_c_exp_tax_cat, 'c_exp_tax_cat', 'rowid', 'label');
-								print '</td>';
-							}
+						if ($action != 'editline') {
+							print '<td class="right">'.price($line->total_ht).'</td>';
+							print '<td class="right">'.price($line->total_ttc).'</td>';
+						}
 
-							// Comment
-							print '<td class="left">'.dol_nl2br($line->comments).'</td>';
-							// VAT rate
-							print '<td class="right">'.vatrate($line->vatrate, true).'</td>';
-							// Unit price HT
-							print '<td class="right">';
-							if (!empty($line->value_unit_ht)) {
-								print price($line->value_unit_ht);
-							} else {
-								$tmpvat = price2num(preg_replace('/\s*\(.*\)/', '', $line->vatrate));
-								$pricenettoshow = price2num($line->value_unit / (1 + $tmpvat / 100), 'MU');
-								print $pricenettoshow;
-							}
-							print '</td>';
+						// Column with preview
+						print '<td class="center">';
+						if ($line->fk_ecm_files > 0) {
+							$modulepart = 'expensereport';
+							$maxheightmini = 32;
 
-							print '<td class="right">'.price($line->value_unit).'</td>';
-
-							print '<td class="right">'.dol_escape_htmltag($line->qty).'</td>';
-
-							if ($action != 'editline') {
-								print '<td class="right">'.price($line->total_ht).'</td>';
-								print '<td class="right">'.price($line->total_ttc).'</td>';
-							}
-
-							// Column with preview
-							print '<td class="center">';
-							if ($line->fk_ecm_files > 0) {
-								$modulepart = 'expensereport';
-								$maxheightmini = 32;
-
-								$result = $ecmfilesstatic->fetch($line->fk_ecm_files);
-								if ($result > 0) {
-									$relativepath = preg_replace('/expensereport\//', '', $ecmfilesstatic->filepath);
-									$fileinfo = pathinfo($ecmfilesstatic->filepath.'/'.$ecmfilesstatic->filename);
-									if (image_format_supported($fileinfo['basename']) > 0) {
-										$minifile = getImageFileNameForSize($fileinfo['basename'], '_mini'); // For new thumbs using same ext (in lower case howerver) than original
-										if (!dol_is_file($conf->expensereport->dir_output.'/'.$relativepath.'/'.$minifile)) {
-											$minifile = getImageFileNameForSize($fileinfo['basename'], '_mini', '.png'); // For backward compatibility of old thumbs that were created with filename in lower case and with .png extension
-										}
-										//print $file['path'].'/'.$minifile.'<br>';
-										$urlforhref = getAdvancedPreviewUrl($modulepart, $relativepath.'/'.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']), 1, '&entity='.(!empty($object->entity) ? $object->entity : $conf->entity));
-										if (empty($urlforhref)) {
-											$urlforhref = DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity) ? $object->entity : $conf->entity).'&file='.urlencode($relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']));
-											print '<a href="'.$urlforhref.'" class="aphoto" target="_blank">';
-										} else {
-											print '<a href="'.$urlforhref['url'].'" class="'.$urlforhref['css'].'" target="'.$urlforhref['target'].'" mime="'.$urlforhref['mime'].'">';
-										}
-										print '<img class="photo" height="'.$maxheightmini.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity) ? $object->entity : $conf->entity).'&file='.urlencode($relativepath.'/'.$minifile).'" title="">';
-										print '</a>';
+							$result = $ecmfilesstatic->fetch($line->fk_ecm_files);
+							if ($result > 0) {
+								$relativepath = preg_replace('/expensereport\//', '', $ecmfilesstatic->filepath);
+								$fileinfo = pathinfo($ecmfilesstatic->filepath.'/'.$ecmfilesstatic->filename);
+								if (image_format_supported($fileinfo['basename']) > 0) {
+									$minifile = getImageFileNameForSize($fileinfo['basename'], '_mini'); // For new thumbs using same ext (in lower case howerver) than original
+									if (!dol_is_file($conf->expensereport->dir_output.'/'.$relativepath.'/'.$minifile)) {
+										$minifile = getImageFileNameForSize($fileinfo['basename'], '_mini', '.png'); // For backward compatibility of old thumbs that were created with filename in lower case and with .png extension
+									}
+									//print $file['path'].'/'.$minifile.'<br>';
+									$urlforhref = getAdvancedPreviewUrl($modulepart, $relativepath.'/'.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']), 1, '&entity='.(!empty($object->entity) ? $object->entity : $conf->entity));
+									if (empty($urlforhref)) {
+										$urlforhref = DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity) ? $object->entity : $conf->entity).'&file='.urlencode($relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']));
+										print '<a href="'.$urlforhref.'" class="aphoto" target="_blank">';
 									} else {
-										$modulepart = 'expensereport';
-										$thumbshown = 0;
-										if (preg_match('/\.pdf$/i', $ecmfilesstatic->filename)) {
-											$filepdf = $conf->expensereport->dir_output.'/'.$relativepath.'/'.$ecmfilesstatic->filename;
-											$fileimage = $conf->expensereport->dir_output.'/'.$relativepath.'/'.$ecmfilesstatic->filename.'_preview.png';
-											$relativepathimage = $relativepath.'/'.$ecmfilesstatic->filename.'_preview.png';
+										print '<a href="'.$urlforhref['url'].'" class="'.$urlforhref['css'].'" target="'.$urlforhref['target'].'" mime="'.$urlforhref['mime'].'">';
+									}
+									print '<img class="photo" height="'.$maxheightmini.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity) ? $object->entity : $conf->entity).'&file='.urlencode($relativepath.'/'.$minifile).'" title="">';
+									print '</a>';
+								} else {
+									$modulepart = 'expensereport';
+									$thumbshown = 0;
+									if (preg_match('/\.pdf$/i', $ecmfilesstatic->filename)) {
+										$filepdf = $conf->expensereport->dir_output.'/'.$relativepath.'/'.$ecmfilesstatic->filename;
+										$fileimage = $conf->expensereport->dir_output.'/'.$relativepath.'/'.$ecmfilesstatic->filename.'_preview.png';
+										$relativepathimage = $relativepath.'/'.$ecmfilesstatic->filename.'_preview.png';
 
-											$pdfexists = file_exists($filepdf);
-											if ($pdfexists) {
-												// Conversion du PDF en image png si fichier png non existant
-												if (!file_exists($fileimage) || (filemtime($fileimage) < filemtime($filepdf))) {
-													if (empty($conf->global->MAIN_DISABLE_PDF_THUMBS)) {		// If you experience trouble with pdf thumb generation and imagick, you can disable here.
-														include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-														$ret = dol_convert_file($filepdf, 'png', $fileimage, '0'); // Convert first page of PDF into a file _preview.png
-														if ($ret < 0) {
-															$error++;
-														}
+										$pdfexists = file_exists($filepdf);
+										if ($pdfexists) {
+											// Conversion du PDF en image png si fichier png non existant
+											if (!file_exists($fileimage) || (filemtime($fileimage) < filemtime($filepdf))) {
+												if (empty($conf->global->MAIN_DISABLE_PDF_THUMBS)) {		// If you experience trouble with pdf thumb generation and imagick, you can disable here.
+													include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+													$ret = dol_convert_file($filepdf, 'png', $fileimage, '0'); // Convert first page of PDF into a file _preview.png
+													if ($ret < 0) {
+														$error++;
 													}
 												}
 											}
+										}
 
-											if ($pdfexists && !$error) {
-												$heightforphotref = 70;
-												if (!empty($conf->dol_optimize_smallscreen)) {
-													$heightforphotref = 60;
-												}
-												// If the preview file is found
-												if (file_exists($fileimage)) {
-													$thumbshown = 1;
-													print '<img height="'.$heightforphotref.'" class="photo photowithmargin photowithborder" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=apercu'.$modulepart.'&amp;file='.urlencode($relativepathimage).'">';
-												}
+										if ($pdfexists && !$error) {
+											$heightforphotref = 70;
+											if (!empty($conf->dol_optimize_smallscreen)) {
+												$heightforphotref = 60;
+											}
+											// If the preview file is found
+											if (file_exists($fileimage)) {
+												$thumbshown = 1;
+												print '<img height="'.$heightforphotref.'" class="photo photowithmargin photowithborder" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=apercu'.$modulepart.'&amp;file='.urlencode($relativepathimage).'">';
 											}
 										}
+									}
 
-										if (!$thumbshown) {
-											print img_mime($ecmfilesstatic->filename);
-										}
+									if (!$thumbshown) {
+										print img_mime($ecmfilesstatic->filename);
 									}
 								}
 							}
+						}
+						print '</td>';
+
+						// Ajout des boutons de modification/suppression
+						if (($object->status < ExpenseReport::STATUS_VALIDATED || $object->status == ExpenseReport::STATUS_REFUSED) && $user->rights->expensereport->creer) {
+							print '<td class="nowrap right">';
+
+							print '<a class="editfielda reposition paddingrightonly" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=editline&amp;token='.newToken().'&amp;rowid='.$line->rowid.'">';
+							print img_edit();
+							print '</a> &nbsp; ';
+							print '<a class="paddingrightonly" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete_line&amp;token='.newToken().'&amp;rowid='.$line->rowid.'">';
+							print img_delete();
+							print '</a>';
+
 							print '</td>';
-
-							// Ajout des boutons de modification/suppression
-							if (($object->status < ExpenseReport::STATUS_VALIDATED || $object->status == ExpenseReport::STATUS_REFUSED) && $user->rights->expensereport->creer) {
-								print '<td class="nowrap right">';
-
-								print '<a class="editfielda reposition paddingrightonly" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=editline&amp;token='.newToken().'&amp;rowid='.$line->rowid.'">';
-								print img_edit();
-								print '</a> &nbsp; ';
-								print '<a class="paddingrightonly" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete_line&amp;token='.newToken().'&amp;rowid='.$line->rowid.'">';
-								print img_delete();
-								print '</a>';
-
-								print '</td>';
-							}
-
-							print '</tr>';
 						}
 
-						if ($action == 'editline' && $line->rowid == GETPOST('rowid', 'int')) {
-							// Add line with link to add new file or attach line to an existing file
-							$colspan = 10;
-							if (!empty($conf->projet->enabled)) {
-								$colspan++;
-							}
-							if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
-								$colspan++;
-							}
+						print '</tr>';
+					}
 
-							print '<tr class="tredited">';
+					if ($action == 'editline' && $line->rowid == GETPOST('rowid', 'int')) {
+						// Add line with link to add new file or attach line to an existing file
+						$colspan = 10;
+						if (!empty($conf->projet->enabled)) {
+							$colspan++;
+						}
+						if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
+							$colspan++;
+						}
 
-							print '<td class="center">';
-							print $numline;
-							print '</td>';
+						print '<tr class="tredited">';
 
-							print '<td colspan="'.($colspan - 1).'" class="liste_titre">';
-							print '<a href="" class="commonlink auploadnewfilenow reposition">'.$langs->trans("UploadANewFileNow");
-							print img_picto($langs->trans("UploadANewFileNow"), 'chevron-down', '', false, 0, 0, '', 'marginleftonly');
+						print '<td class="center">';
+						print $numline;
+						print '</td>';
+
+						print '<td colspan="'.($colspan - 1).'" class="liste_titre">';
+						print '<a href="" class="commonlink auploadnewfilenow reposition">'.$langs->trans("UploadANewFileNow");
+						print img_picto($langs->trans("UploadANewFileNow"), 'chevron-down', '', false, 0, 0, '', 'marginleftonly');
+						print '</a>';
+						if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES)) {
+							print ' &nbsp; - &nbsp; <a href="" class="commonlink aattachtodoc reposition">'.$langs->trans("AttachTheNewLineToTheDocument");
+							print img_picto($langs->trans("AttachTheNewLineToTheDocument"), 'chevron-down', '', false, 0, 0, '', 'marginleftonly');
 							print '</a>';
-							if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES)) {
-								print ' &nbsp; - &nbsp; <a href="" class="commonlink aattachtodoc reposition">'.$langs->trans("AttachTheNewLineToTheDocument");
-								print img_picto($langs->trans("AttachTheNewLineToTheDocument"), 'chevron-down', '', false, 0, 0, '', 'marginleftonly');
-								print '</a>';
-							}
+						}
 
-							print '<!-- Code to open/close section to submit or link files in edit mode -->'."\n";
-							print '<script language="javascript">'."\n";
-							print '$(document).ready(function() {
+						print '<!-- Code to open/close section to submit or link files in edit mode -->'."\n";
+						print '<script language="javascript">'."\n";
+						print '$(document).ready(function() {
         				        $( ".auploadnewfilenow" ).click(function() {
         				            jQuery(".truploadnewfilenow").toggle();
                                     jQuery(".trattachnewfilenow").hide();
@@ -2199,134 +2198,134 @@ if ($action == 'create') {
                                     jQuery(".truploadnewfilenow").hide();
                                     return false;
                                 });';
-							if (is_array(GETPOST('attachfile', 'array')) && count(GETPOST('attachfile', 'array'))) {
-								print 'jQuery(".trattachnewfilenow").toggle();'."\n";
-							}
-							print '
+						if (is_array(GETPOST('attachfile', 'array')) && count(GETPOST('attachfile', 'array'))) {
+							print 'jQuery(".trattachnewfilenow").toggle();'."\n";
+						}
+						print '
                         		jQuery("form[name=\"expensereport\"]").submit(function() {
                             		if (jQuery(".truploadnewfilenow").is(":hidden")) {
                                 		jQuery("input[name=\"sendit\"]").val("");
                             		}
                         		});
                     		';
-							print '
+						print '
                             });
         				    ';
-							print '</script>'."\n";
-							print '</td></tr>';
+						print '</script>'."\n";
+						print '</td></tr>';
 
-							$filenamelinked = '';
-							if ($line->fk_ecm_files > 0) {
-								$result = $ecmfilesstatic->fetch($line->fk_ecm_files);
-								if ($result > 0) {
-									$filenamelinked = $ecmfilesstatic->filename;
-								}
+						$filenamelinked = '';
+						if ($line->fk_ecm_files > 0) {
+							$result = $ecmfilesstatic->fetch($line->fk_ecm_files);
+							if ($result > 0) {
+								$filenamelinked = $ecmfilesstatic->filename;
 							}
-
-							$tredited = 'tredited';
-							include DOL_DOCUMENT_ROOT.'/expensereport/tpl/expensereport_addfile.tpl.php';
-							include DOL_DOCUMENT_ROOT.'/expensereport/tpl/expensereport_linktofile.tpl.php';
-
-							print '<tr class="oddeven tredited">';
-
-							print '<td></td>';
-
-							// Select date
-							print '<td class="center">';
-							print $form->selectDate($line->date, 'date');
-							print '</td>';
-
-							// Select project
-							if (!empty($conf->projet->enabled)) {
-								print '<td>';
-								$formproject->select_projects(-1, $line->fk_project, 'fk_project', 0, 0, 1, 1, 0, 0, 0, '', 0, 0, 'maxwidth300');
-								print '</td>';
-							}
-
-							// Select type
-							print '<td class="center">';
-							print $formexpensereport->selectTypeExpenseReport($line->fk_c_type_fees, 'fk_c_type_fees');
-							print '</td>';
-
-							if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
-								print '<td class="fk_c_exp_tax_cat">';
-								$params = array('fk_expense' => $object->id, 'fk_expense_det' => $line->rowid, 'date' => $line->dates);
-								print $form->selectExpenseCategories($line->fk_c_exp_tax_cat, 'fk_c_exp_tax_cat', 1, array(), 'fk_c_type_fees', $userauthor->default_c_exp_tax_cat, $params);
-								print '</td>';
-							}
-
-							// Add comments
-							print '<td>';
-							print '<textarea name="comments" class="flat_ndf centpercent">'.dol_escape_htmltag($line->comments, 0, 1).'</textarea>';
-							print '</td>';
-
-							// VAT
-							print '<td class="right">';
-							print $form->load_tva('vatrate', (GETPOSTISSET("vatrate") ? GETPOST("vatrate") : $line->vatrate), $mysoc, '', 0, 0, '', false, 1);
-							print '</td>';
-
-							// Unit price
-							print '<td class="right">';
-							print '<input type="text" min="0" class="right maxwidth50" id="value_unit_ht" name="value_unit_ht" value="'.dol_escape_htmltag(price2num($line->value_unit_ht)).'" />';
-							print '</td>';
-
-							// Unit price with tax
-							print '<td class="right">';
-							print '<input type="text" min="0" class="right maxwidth50" id="value_unit" name="value_unit" value="'.dol_escape_htmltag(price2num($line->value_unit)).'" />';
-							print '</td>';
-
-							// Quantity
-							print '<td class="right">';
-							print '<input type="number" min="0" class="right maxwidth50" name="qty" value="'.dol_escape_htmltag($line->qty).'" />';
-							print '</td>';
-
-							//print '<td class="right">'.$langs->trans('AmountHT').'</td>';
-							//print '<td class="right">'.$langs->trans('AmountTTC').'</td>';
-
-							// Picture
-							print '<td class="center">';
-							//print $line->fk_ecm_files;
-							print '</td>';
-
-							print '<td class="center">';
-							print '<input type="hidden" name="rowid" value="'.$line->rowid.'">';
-							print '<input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
-							print '<br><input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
-							print '</td>';
-
-							print '</tr>';
 						}
 
-						$i++;
-					}
-				}
+						$tredited = 'tredited';
+						include DOL_DOCUMENT_ROOT.'/expensereport/tpl/expensereport_addfile.tpl.php';
+						include DOL_DOCUMENT_ROOT.'/expensereport/tpl/expensereport_linktofile.tpl.php';
 
-				// Add a new line
-				if (($object->status == ExpenseReport::STATUS_DRAFT || $object->status == ExpenseReport::STATUS_REFUSED)
-					&& $action != 'editline'
-					&& $user->rights->expensereport->creer) {
+						print '<tr class="oddeven tredited">';
+
+						print '<td></td>';
+
+						// Select date
+						print '<td class="center">';
+						print $form->selectDate($line->date, 'date');
+						print '</td>';
+
+						// Select project
+						if (!empty($conf->projet->enabled)) {
+							print '<td>';
+							$formproject->select_projects(-1, $line->fk_project, 'fk_project', 0, 0, 1, 1, 0, 0, 0, '', 0, 0, 'maxwidth300');
+							print '</td>';
+						}
+
+						// Select type
+						print '<td class="center">';
+						print $formexpensereport->selectTypeExpenseReport($line->fk_c_type_fees, 'fk_c_type_fees');
+						print '</td>';
+
+						if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
+							print '<td class="fk_c_exp_tax_cat">';
+							$params = array('fk_expense' => $object->id, 'fk_expense_det' => $line->rowid, 'date' => $line->dates);
+							print $form->selectExpenseCategories($line->fk_c_exp_tax_cat, 'fk_c_exp_tax_cat', 1, array(), 'fk_c_type_fees', $userauthor->default_c_exp_tax_cat, $params);
+							print '</td>';
+						}
+
+						// Add comments
+						print '<td>';
+						print '<textarea name="comments" class="flat_ndf centpercent">'.dol_escape_htmltag($line->comments, 0, 1).'</textarea>';
+						print '</td>';
+
+						// VAT
+						print '<td class="right">';
+						print $form->load_tva('vatrate', (GETPOSTISSET("vatrate") ? GETPOST("vatrate") : $line->vatrate), $mysoc, '', 0, 0, '', false, 1);
+						print '</td>';
+
+						// Unit price
+						print '<td class="right">';
+						print '<input type="text" min="0" class="right maxwidth50" id="value_unit_ht" name="value_unit_ht" value="'.dol_escape_htmltag(price2num($line->value_unit_ht)).'" />';
+						print '</td>';
+
+						// Unit price with tax
+						print '<td class="right">';
+						print '<input type="text" min="0" class="right maxwidth50" id="value_unit" name="value_unit" value="'.dol_escape_htmltag(price2num($line->value_unit)).'" />';
+						print '</td>';
+
+						// Quantity
+						print '<td class="right">';
+						print '<input type="number" min="0" class="right maxwidth50" name="qty" value="'.dol_escape_htmltag($line->qty).'" />';
+						print '</td>';
+
+						//print '<td class="right">'.$langs->trans('AmountHT').'</td>';
+						//print '<td class="right">'.$langs->trans('AmountTTC').'</td>';
+
+						// Picture
+						print '<td class="center">';
+						//print $line->fk_ecm_files;
+						print '</td>';
+
+						print '<td class="center">';
+						print '<input type="hidden" name="rowid" value="'.$line->rowid.'">';
+						print '<input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
+						print '<br><input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
+						print '</td>';
+
+						print '</tr>';
+					}
+
+					$i++;
+				}
+			}
+
+			 // Add a new line
+			if (($object->status == ExpenseReport::STATUS_DRAFT || $object->status == ExpenseReport::STATUS_REFUSED)
+				&& $action != 'editline'
+				&& $user->rights->expensereport->creer) {
 					$colspan = 11;
-					if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
-						$colspan++;
-					}
-					if (!empty($conf->projet->enabled)) {
-						$colspan++;
-					}
-					if ($action != 'editline') {
-						$colspan++;
-					}
+				if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
+					$colspan++;
+				}
+				if (!empty($conf->projet->enabled)) {
+					$colspan++;
+				}
+				if ($action != 'editline') {
+					$colspan++;
+				}
 
 					$nbFiles = $nbLinks = 0;
 					$arrayoffiles = array();
-					if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES)) {
-						require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-						require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
-						require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-						$upload_dir = $conf->expensereport->dir_output."/".dol_sanitizeFileName($object->ref);
-						$arrayoffiles = dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png|'.preg_quote(dol_sanitizeFileName($object->ref.'.pdf'), '/').')$');
-						$nbFiles = count($arrayoffiles);
-						$nbLinks = Link::count($db, $object->element, $object->id);
-					}
+				if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES)) {
+					require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+					require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
+					require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+					$upload_dir = $conf->expensereport->dir_output."/".dol_sanitizeFileName($object->ref);
+					$arrayoffiles = dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png|'.preg_quote(dol_sanitizeFileName($object->ref.'.pdf'), '/').')$');
+					$nbFiles = count($arrayoffiles);
+					$nbLinks = Link::count($db, $object->element, $object->id);
+				}
 
 					// Add line with link to add new file or attach to an existing file
 					print '<tr class="liste_titre">';
@@ -2334,11 +2333,11 @@ if ($action == 'create') {
 					print '<a href="" class="commonlink auploadnewfilenow reposition">'.$langs->trans("UploadANewFileNow");
 					print img_picto($langs->trans("UploadANewFileNow"), 'chevron-down', '', false, 0, 0, '', 'marginleftonly');
 					print '</a>';
-					if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES)) {
-						print ' &nbsp; - &nbsp; <a href="" class="commonlink aattachtodoc reposition">'.$langs->trans("AttachTheNewLineToTheDocument");
-						print img_picto($langs->trans("AttachTheNewLineToTheDocument"), 'chevron-down', '', false, 0, 0, '', 'marginleftonly');
-						print '</a>';
-					}
+				if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES)) {
+					print ' &nbsp; - &nbsp; <a href="" class="commonlink aattachtodoc reposition">'.$langs->trans("AttachTheNewLineToTheDocument");
+					print img_picto($langs->trans("AttachTheNewLineToTheDocument"), 'chevron-down', '', false, 0, 0, '', 'marginleftonly');
+					print '</a>';
+				}
 
 					print '<!-- Code to open/close section to submit or link files in the form to add new line -->'."\n";
 					print '<script language="javascript">'."\n";
@@ -2360,9 +2359,9 @@ if ($action == 'create') {
                             jQuery(".truploadnewfilenow").hide();
                             return false;
                         });'."\n";
-					if (is_array(GETPOST('attachfile', 'array')) && count(GETPOST('attachfile', 'array')) && $action != 'updateline') {
-						print 'jQuery(".trattachnewfilenow").show();'."\n";
-					}
+				if (is_array(GETPOST('attachfile', 'array')) && count(GETPOST('attachfile', 'array')) && $action != 'updateline') {
+					print 'jQuery(".trattachnewfilenow").show();'."\n";
+				}
 					print '
 						jQuery("form[name=\"expensereport\"]").submit(function() {
 							if (jQuery(".truploadnewfilenow").is(":hidden")) {
@@ -2380,19 +2379,19 @@ if ($action == 'create') {
 					print '</script>'."\n";
 					print '</td></tr>';
 
-					include DOL_DOCUMENT_ROOT.'/expensereport/tpl/expensereport_addfile.tpl.php';
 					include DOL_DOCUMENT_ROOT.'/expensereport/tpl/expensereport_linktofile.tpl.php';
+					include DOL_DOCUMENT_ROOT.'/expensereport/tpl/expensereport_addfile.tpl.php';
 
 					print '<tr class="liste_titre">';
 					print '<td></td>';
 					print '<td class="center">'.$langs->trans('Date').'</td>';
-					if (!empty($conf->projet->enabled)) {
-						print '<td class="minwidth100imp">'.$form->textwithpicto($langs->trans('Project'), $langs->trans("ClosedProjectsAreHidden")).'</td>';
-					}
+				if (!empty($conf->projet->enabled)) {
+					print '<td class="minwidth100imp">'.$form->textwithpicto($langs->trans('Project'), $langs->trans("ClosedProjectsAreHidden")).'</td>';
+				}
 					print '<td class="center">'.$langs->trans('Type').'</td>';
-					if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
-						print '<td>'.$langs->trans('CarCategory').'</td>';
-					}
+				if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
+					print '<td>'.$langs->trans('CarCategory').'</td>';
+				}
 					print '<td>'.$langs->trans('Description').'</td>';
 					print '<td class="right">'.$langs->trans('VAT').'</td>';
 					print '<td class="right">'.$langs->trans('PriceUHT').'</td>';
@@ -2415,23 +2414,23 @@ if ($action == 'create') {
 					print '</td>';
 
 					// Select project
-					if (!empty($conf->projet->enabled)) {
-						print '<td>';
-						$formproject->select_projects(-1, $fk_project, 'fk_project', 0, 0, 1, -1, 0, 0, 0, '', 0, 0, 'maxwidth300');
-						print '</td>';
-					}
+				if (!empty($conf->projet->enabled)) {
+					print '<td>';
+					$formproject->select_projects(-1, $fk_project, 'fk_project', 0, 0, 1, -1, 0, 0, 0, '', 0, 0, 'maxwidth300');
+					print '</td>';
+				}
 
 					// Select type
 					print '<td class="center">';
 					print $formexpensereport->selectTypeExpenseReport($fk_c_type_fees, 'fk_c_type_fees', 1);
 					print '</td>';
 
-					if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
-						print '<td class="fk_c_exp_tax_cat">';
-						$params = array('fk_expense' => $object->id);
-						print $form->selectExpenseCategories('', 'fk_c_exp_tax_cat', 1, array(), 'fk_c_type_fees', $userauthor->default_c_exp_tax_cat, $params, 0);
-						print '</td>';
-					}
+				if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
+					print '<td class="fk_c_exp_tax_cat">';
+					$params = array('fk_expense' => $object->id);
+					print $form->selectExpenseCategories('', 'fk_c_exp_tax_cat', 1, array(), 'fk_c_type_fees', $userauthor->default_c_exp_tax_cat, $params, 0);
+					print '</td>';
+				}
 
 					// Add comments
 					print '<td>';
@@ -2441,9 +2440,9 @@ if ($action == 'create') {
 					// Select VAT
 					print '<td class="right">';
 					$defaultvat = -1;
-					if (!empty($conf->global->EXPENSEREPORT_NO_DEFAULT_VAT)) {
-						$conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS = 'none';
-					}
+				if (!empty($conf->global->EXPENSEREPORT_NO_DEFAULT_VAT)) {
+					$conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS = 'none';
+				}
 					print $form->load_tva('vatrate', ($vatrate != '' ? $vatrate : $defaultvat), $mysoc, '', 0, 0, '', false, 1);
 					print '</td>';
 
@@ -2465,15 +2464,15 @@ if ($action == 'create') {
 					// Picture
 					print '<td></td>';
 
-					if ($action != 'editline') {
-						print '<td class="right"></td>';
-						print '<td class="right"></td>';
-					}
+				if ($action != 'editline') {
+					print '<td class="right"></td>';
+					print '<td class="right"></td>';
+				}
 
 					print '<td class="center"><input type="submit" value="'.$langs->trans("Add").'" name="bouton" class="button"></td>';
 
 					print '</tr>';
-				} // Fin si c'est payé/validé
+			} // Fin si c'est payé/validé
 
 				print '</table>';
 				print '</div>';
@@ -2501,11 +2500,15 @@ if ($action == 'create') {
 				print '</form>';
 
 				print dol_get_fiche_end();
-			}
-		} else {
-			dol_print_error($db);
 		}
+	} else {
+		dol_print_error($db);
 	}
+} else {
+	print 'Record not found';
+
+	llxFooter();
+	exit(1);
 }
 
 /*
diff --git a/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php b/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php
index 640f4c17b5d..42be03263a8 100644
--- a/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php
+++ b/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php
@@ -18,6 +18,7 @@ if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES)) {
 		$modulepart = 'expensereport'; $maxheightmini = 48;
 		$relativepath = (!empty($object->ref) ?dol_sanitizeFileName($object->ref) : '').'/';
 		$filei = 0;
+		// Loop on each attached file
 		foreach ($arrayoffiles as $file) {
 			$urlforhref = array();
 			$filei++;
@@ -77,7 +78,7 @@ if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES)) {
 				}
 
 				if (empty($urlforhref) || empty($thumbshown)) {
-					print '<a href="#" class="aphoto" target="_blank">';
+					print '<span href="" class="aphoto" target="_blank">';
 				} else {
 					print '<a href="'.$urlforhref['url'].'" class="'.$urlforhref['css'].'" target="'.$urlforhref['target'].'" mime="'.$urlforhref['mime'].'">';
 				}
@@ -85,7 +86,12 @@ if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES)) {
 
 				print $thumbshown ? $thumbshown : img_mime($minifile);
 
-				print '</div></a>';
+				print '</div>';
+				if (empty($urlforhref) || empty($thumbshown)) {
+					print '</span>';
+				} else {
+					print '</a>';
+				}
 			}
 			print '<br>';
 			$checked = '';
@@ -106,7 +112,7 @@ if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES)) {
 			if (!empty($filenamelinked) && $filenamelinked == $file['relativename']) {
 				$checked = ' checked';
 			}
-			print '<div class="margintoponly maxwidth150"><input type="checkbox"'.$checked.' id="radio'.$filei.'" name="attachfile[]" class="checkboxattachfile" value="'.$file['relativename'].'">';
+			print '<div class="margintoponly minwidth150 maxwidth150"><input type="checkbox"'.$checked.' id="radio'.$filei.'" name="attachfile[]" class="checkboxattachfile" value="'.$file['relativename'].'">';
 			print '<label class="wordbreak checkboxattachfilelabel" for="radio'.$filei.'"> '.$file['relativename'].'</label>';
 			print '</div>';
 

From bbb2cdfbdf19823d9a86d25c00b2960f68389437 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 19 Jun 2021 19:24:32 +0200
Subject: [PATCH 0736/1497] Prepare 13.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 e6c0ef4a176..a24a404262e 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', '13.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', '13.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 5d6b26ddb7474f991138df7b5472ee2a3ed5529d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 19 Jun 2021 19:45:13 +0200
Subject: [PATCH 0737/1497] Fix css

---
 htdocs/public/members/new.php              | 8 ++++++--
 htdocs/public/onlinesign/newonlinesign.php | 5 +++++
 htdocs/public/payment/newpayment.php       | 5 +++++
 htdocs/public/payment/paymentko.php        | 5 +++++
 htdocs/public/payment/paymentok.php        | 5 +++++
 htdocs/public/recruitment/view.php         | 5 +++++
 6 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index cddfd0524b1..46aac8dce3b 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -119,14 +119,18 @@ function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $
 	if ($urllogo) {
 		print '<div class="backgreypublicpayment">';
 		print '<div class="logopublicpayment">';
-		print '<img id="dolpaymentlogo" src="'.$urllogo.'"';
-		print '>';
+		print '<img id="dolpaymentlogo" src="'.$urllogo.'">';
 		print '</div>';
 		if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
 			print '<div class="poweredbypublicpayment opacitymedium right"><a class="poweredbyhref" href="https://www.dolibarr.org?utm_medium=website&utm_source=poweredby" target="dolibarr" rel="noopener">'.$langs->trans("PoweredBy").'<br><img class="poweredbyimg" src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
 		}
 		print '</div>';
 	}
+	if (!empty($conf->global->MEMBER_IMAGE_PUBLIC_REGISTRATION)) {
+		print '<div class="backimagepublicregistration">';
+		print '<img id="dolpaymentlogo" src="'.$conf->global->MEMBER_IMAGE_PUBLIC_REGISTRATION.'">';
+		print '</div>';
+	}
 	print '</div>';
 
 	print '<div class="divmainbodylarge">';
diff --git a/htdocs/public/onlinesign/newonlinesign.php b/htdocs/public/onlinesign/newonlinesign.php
index 56690f78a42..c656b04fef9 100644
--- a/htdocs/public/onlinesign/newonlinesign.php
+++ b/htdocs/public/onlinesign/newonlinesign.php
@@ -189,6 +189,11 @@ if ($urllogo)
 	}
 	print '</div>';
 }
+if (!empty($conf->global->PROPOSAL_IMAGE_PUBLIC_SIGN)) {
+	print '<div class="backimagepublicproposalsign">';
+	print '<img id="dolpaymentlogo" src="'.$conf->global->PROPOSAL_IMAGE_PUBLIC_SIGN.'">';
+	print '</div>';
+}
 
 // Output introduction text
 $text = '';
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index bda291b8d8a..9cecbc90885 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -792,6 +792,11 @@ if ($urllogo)
 	}
 	print '</div>';
 }
+if (!empty($conf->global->MAIN_IMAGE_PUBLIC_PAYMENT)) {
+	print '<div class="backimagepublicpayment">';
+	print '<img id="dolpaymentlogo" src="'.$conf->global->MAIN_IMAGE_PUBLIC_PAYMENT.'">';
+	print '</div>';
+}
 
 
 
diff --git a/htdocs/public/payment/paymentko.php b/htdocs/public/payment/paymentko.php
index b99c4a39392..218cf77215b 100644
--- a/htdocs/public/payment/paymentko.php
+++ b/htdocs/public/payment/paymentko.php
@@ -242,6 +242,11 @@ if ($urllogo)
 	}
 	print '</div>';
 }
+if (!empty($conf->global->MAIN_IMAGE_PUBLIC_PAYMENT)) {
+	print '<div class="backimagepublicpayment">';
+	print '<img id="dolpaymentlogo" src="'.$conf->global->MAIN_IMAGE_PUBLIC_PAYMENT.'">';
+	print '</div>';
+}
 
 
 print '<br><br>';
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index f4b9f0feb5b..60d763593fe 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -182,6 +182,11 @@ if ($urllogo)
 	}
 	print '</div>';
 }
+if (!empty($conf->global->MAIN_IMAGE_PUBLIC_PAYMENT)) {
+	print '<div class="backimagepublicpayment">';
+	print '<img id="dolpaymentlogo" src="'.$conf->global->MAIN_IMAGE_PUBLIC_PAYMENT.'">';
+	print '</div>';
+}
 
 
 print '<br><br><br>';
diff --git a/htdocs/public/recruitment/view.php b/htdocs/public/recruitment/view.php
index b8858b921e9..d1546dc4a02 100644
--- a/htdocs/public/recruitment/view.php
+++ b/htdocs/public/recruitment/view.php
@@ -216,6 +216,11 @@ if ($urllogo)
 	}
 	print '</div>';
 }
+if (!empty($conf->global->RECRUITMENT_IMAGE_PUBLIC_PAYMENT)) {
+	print '<div class="backimagepublicrecruitment">';
+	print '<img id="dolpaymentlogo" src="'.$conf->global->RECRUITMENT_IMAGE_PUBLIC_PAYMENT.'">';
+	print '</div>';
+}
 
 // Output introduction text
 $text = '';

From 414b5e612fae0eae285dffab5d164b1ac5bc4bc5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 19 Jun 2021 22:11:16 +0200
Subject: [PATCH 0738/1497] Better info on upload size limit

---
 htdocs/core/class/html.formfile.class.php | 3 ++-
 htdocs/langs/en_US/main.lang              | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 47506d5cbfa..83258f9c1cd 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -218,9 +218,10 @@ class FormFile
 
 			if (!empty($conf->global->MAIN_UPLOAD_DOC)) {
 				if ($perm) {
+					$menudolibarrsetupmax = $langs->transnoentitiesnoconv("Home").'-'.$langs->transnoentitiesnoconv("Setup").'-'.$langs->transnoentitiesnoconv("Security");
 					$langs->load('other');
 					$out .= ' ';
-					$out .= info_admin($langs->trans("ThisLimitIsDefinedInSetup", $max, $maxphptoshow), 1);
+					$out .= info_admin($langs->trans("ThisLimitIsDefinedInSetupAt", $menudolibarrsetupmax, $max, $maxphptoshowparam, $maxphptoshow), 1);
 				}
 			} else {
 				$out .= ' ('.$langs->trans("UploadDisabled").')';
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 23b1fb9413e..863b94af564 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -730,6 +730,7 @@ MenuMembers=Members
 MenuAgendaGoogle=Google agenda
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
+ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
 NoFileFound=No documents uploaded
 CurrentUserLanguage=Current language
 CurrentTheme=Current theme

From 4a3da84098979afc2dd5655f3727d9df70fcf308 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 19 Jun 2021 23:52:52 +0200
Subject: [PATCH 0739/1497] Clean code

---
 htdocs/core/ajax/ajaxdirpreview.php       | 11 +++----
 htdocs/core/class/html.form.class.php     |  2 +-
 htdocs/core/class/html.formfile.class.php | 36 ++++++++++++++---------
 htdocs/core/lib/functions.lib.php         | 30 ++++++++++---------
 htdocs/core/tpl/filemanager.tpl.php       |  5 ++--
 htdocs/website/index.php                  |  7 +++--
 6 files changed, 53 insertions(+), 38 deletions(-)

diff --git a/htdocs/core/ajax/ajaxdirpreview.php b/htdocs/core/ajax/ajaxdirpreview.php
index cf619f70de6..09292dd4991 100644
--- a/htdocs/core/ajax/ajaxdirpreview.php
+++ b/htdocs/core/ajax/ajaxdirpreview.php
@@ -54,8 +54,8 @@ if (!isset($mode) || $mode != 'noajax') {    // For ajax call
 	$search_doc_ref = GETPOST('search_doc_ref', 'alpha');
 
 	$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-	$sortfield = GETPOST("sortfield", 'alpha');
-	$sortorder = GETPOST("sortorder", 'alpha');
+	$sortfield = GETPOST("sortfield", 'aZ09comma');
+	$sortorder = GETPOST("sortorder", 'aZ09comma');
 	$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 	if (empty($page) || $page == -1) {
 		$page = 0;
@@ -82,8 +82,8 @@ if (!isset($mode) || $mode != 'noajax') {    // For ajax call
 			//exit;
 		}
 	}
-} else // For no ajax call
-{
+} else {
+	// For no ajax call
 	$rootdirfordoc = $conf->ecm->dir_output;
 
 	$ecmdir = new EcmDirectory($db);
@@ -376,7 +376,7 @@ if ($type == 'directory') {
 		// When we show list of files for ECM files, $filearray contains file list, and directory is defined with modulepart + section into $param
 		// When we show list of files for a directory, $filearray ciontains file list, and directory is defined with modulepart + $relativepath
 		//var_dump("section=".$section." title=".$title." modulepart=".$modulepart." useinecm=".$useinecm." perm=".$perm." relativepath=".$relativepath." param=".$param." url=".$url);
-		$formfile->list_of_documents($filearray, '', $modulepart, $param, 1, $relativepath, $perm, $useinecm, $textifempty, $maxlengthname, $title, $url, 0, $perm);
+		$formfile->list_of_documents($filearray, '', $modulepart, $param, 1, $relativepath, $perm, $useinecm, $textifempty, $maxlengthname, $title, $url, 0, $perm, '', $sortfield, $sortorder);
 	}
 }
 
@@ -430,6 +430,7 @@ if ($useajax || $action == 'delete') {
 }
 
 if ($useajax) {
+	print '<!-- ajaxdirpreview.php: js to manage preview of doc -->'."\n";
 	print '<script type="text/javascript">';
 
 	// Enable jquery handlers on new generated HTML objects (same code than into lib_footer.js.php)
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 911b679c928..6ad08a7c883 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4682,7 +4682,7 @@ class Form
 	{
 		global $langs, $conf;
 
-		$more = '<!-- formconfirm for page='.dol_escape_htmltag($page).' -->';
+		$more = '<!-- formconfirm before calling page='.dol_escape_htmltag($page).' -->';
 		$formconfirm = '';
 		$inputok = array();
 		$inputko = array();
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 83258f9c1cd..9fde21d24de 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -80,9 +80,10 @@ class FormFile
 	 *  @param  int         $usewithoutform 0=Default, 1=Disable <form> and style to use in existing area
 	 *  @param	int			$capture		1=Add tag capture="capture" to force use of micro or video recording to generate file. When setting this to 1, you must also provide a value for $accept.
 	 *  @param	int			$disablemulti	0=Default, 1=Disable multiple file upload
-	 * 	@return	int							<0 if KO, >0 if OK
+	 *  @param	int			$nooutput		0=Output result with print, 1=Return result
+	 * 	@return	int|string					<0 if KO, >0 if OK, or string if $noouput=1
 	 */
-	public function form_attach_new_file($url, $title = '', $addcancel = 0, $sectionid = 0, $perm = 1, $size = 50, $object = '', $options = '', $useajax = 1, $savingdocmask = '', $linkfiles = 1, $htmlname = 'formuserfile', $accept = '', $sectiondir = '', $usewithoutform = 0, $capture = 0, $disablemulti = 0)
+	public function form_attach_new_file($url, $title = '', $addcancel = 0, $sectionid = 0, $perm = 1, $size = 50, $object = '', $options = '', $useajax = 1, $savingdocmask = '', $linkfiles = 1, $htmlname = 'formuserfile', $accept = '', $sectiondir = '', $usewithoutform = 0, $capture = 0, $disablemulti = 0, $nooutput = 0)
 	{
 		// phpcs:enable
 		global $conf, $langs, $hookmanager;
@@ -102,11 +103,16 @@ class FormFile
 			// TODO: Check this works with GED module, otherwise, force useajax to 0
 			// TODO: This does not support option savingdocmask
 			// TODO: This break feature to upload links too
+			// TODO: Thisdoes not work when param nooutput=1
 			return $this->_formAjaxFileUpload($object);
 		} else {
 			//If there is no permission and the option to hide unauthorized actions is enabled, then nothing is printed
 			if (!$perm && !empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED)) {
-				return 1;
+				if ($nooutput) {
+					return '';
+				} else {
+					return 1;
+				}
 			}
 
 			$out = "\n\n".'<!-- Start form attach new file --><div class="formattachnewfile">'."\n";
@@ -122,12 +128,12 @@ class FormFile
 				// Add a param as GET parameter to detect when POST were cleaned by PHP because a file larger than post_max_size
 				$url .= (strpos($url, '?') === false ? '?' : '&').'uploadform=1';
 
-				$out .= '<form name="'.$htmlname.'" id="'.$htmlname.'" action="'.$url.'" enctype="multipart/form-data" method="POST">';
-				$out .= '<input type="hidden" name="token" value="'.newToken().'">';
-				$out .= '<input type="hidden" id="'.$htmlname.'_section_dir" name="section_dir" value="'.$sectiondir.'">';
-				$out .= '<input type="hidden" id="'.$htmlname.'_section_id"  name="section_id" value="'.$sectionid.'">';
-				$out .= '<input type="hidden" name="sortfield" value="'.GETPOST('sortfield', 'aZ09comma').'">';
-				$out .= '<input type="hidden" name="sortorder" value="'.GETPOST('sortorder', 'aZ09').'">';
+				$out .= '<form name="'.$htmlname.'" id="'.$htmlname.'" action="'.$url.'" enctype="multipart/form-data" method="POST">'."\n";
+				$out .= '<input type="hidden" name="token" value="'.newToken().'">'."\n";
+				$out .= '<input type="hidden" id="'.$htmlname.'_section_dir" name="section_dir" value="'.$sectiondir.'">'."\n";
+				$out .= '<input type="hidden" id="'.$htmlname.'_section_id"  name="section_id" value="'.$sectionid.'">'."\n";
+				$out .= '<input type="hidden" name="sortfield" value="'.GETPOST('sortfield', 'aZ09comma').'">'."\n";
+				$out .= '<input type="hidden" name="sortorder" value="'.GETPOST('sortorder', 'aZ09comma').'">'."\n";
 			}
 
 			$out .= '<table class="nobordernopadding centpercent">';
@@ -301,13 +307,15 @@ class FormFile
 			$parameters = array('socid'=>(isset($GLOBALS['socid']) ? $GLOBALS['socid'] : ''), 'id'=>(isset($GLOBALS['id']) ? $GLOBALS['id'] : ''), 'url'=>$url, 'perm'=>$perm, 'options'=>$options);
 			$res = $hookmanager->executeHooks('formattachOptions', $parameters, $object);
 			if (empty($res)) {
-				print '<div class="'.($usewithoutform ? 'inline-block valignmiddle' : 'attacharea attacharea'.$htmlname).'">';
-				print $out;
-				print '</div>';
+				$out = '<div class="'.($usewithoutform ? 'inline-block valignmiddle' : 'attacharea attacharea'.$htmlname).'">'.$out.'</div>';
 			}
-			print $hookmanager->resPrint;
+			$out .= $hookmanager->resPrint;
 
-			return 1;
+			if ($nooutput) {
+				return $out;
+			} else {
+				return 1;
+			}
 		}
 	}
 
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index f238b949420..531af8fe73a 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1473,21 +1473,23 @@ function dolButtonToOpenUrlInDialogPopup($name, $label, $buttonstring, $url, $di
 
 	//print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("MediaFiles")).'" name="file_manager">';
 	$out = '<a class="button bordertransp button_'.$name.'"'.$disabled.' title="'.dol_escape_htmltag($label).'">'.$buttonstring.'</a>';
+	$out .= '<!-- Add js code to open dialog popup on dialog -->';
 	$out .= '<script language="javascript">
-				 jQuery(document).ready(function () {
-					 jQuery(".button_'.$name.'").click(function () {
-						 var $dialog = $(\'<div></div>\').html(\'<iframe class="iframedialog" style="border: 0px;" src="'.DOL_URL_ROOT.$url.'" width="100%" height="98%"></iframe>\')
-						 .dialog({
-						 	autoOpen: false,
-						 	modal: true,
-						 	height: (window.innerHeight - 150),
-						 	width: \'80%\',
-						 	title: "'.dol_escape_js($label).'"
-						 });
-						 $dialog.dialog(\'open\');
-					 });
-				 });
-				 </script>';
+				jQuery(document).ready(function () {
+					jQuery(".button_'.$name.'").click(function () {
+						console.log("Open popup with jQuery(...).dialog() on URL '.dol_escape_js(DOL_URL_ROOT.$url).'")
+						var $dialog = $(\'<div></div>\').html(\'<iframe class="iframedialog" style="border: 0px;" src="'.DOL_URL_ROOT.$url.'" width="100%" height="98%"></iframe>\')
+							.dialog({
+								autoOpen: false,
+							 	modal: true,
+							 	height: (window.innerHeight - 150),
+							 	width: \'80%\',
+							 	title: "'.dol_escape_js($label).'"
+							});
+						$dialog.dialog(\'open\');
+					});
+				});
+			</script>';
 	return $out;
 }
 
diff --git a/htdocs/core/tpl/filemanager.tpl.php b/htdocs/core/tpl/filemanager.tpl.php
index d8bbe0c7cc0..41e7c937d6a 100644
--- a/htdocs/core/tpl/filemanager.tpl.php
+++ b/htdocs/core/tpl/filemanager.tpl.php
@@ -128,7 +128,7 @@ $nameforformuserfile = 'formuserfileecm';
 
 print '<div class="inline-block valignmiddle floatright">';
 
-// To attach new file
+// For to attach a new file
 if ((!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS)) || !empty($section)) {
 	if ((empty($section) || $section == -1) && ($module != 'medias')) {
 		?>
@@ -141,10 +141,11 @@ if ((!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE
 	}
 
 	$sectiondir = GETPOST('file', 'alpha') ?GETPOST('file', 'alpha') : GETPOST('section_dir', 'alpha');
+
 	print '<!-- Start form to attach new file in filemanager.tpl.php sectionid='.$section.' sectiondir='.$sectiondir.' -->'."\n";
 	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 	$formfile = new FormFile($db);
-	$formfile->form_attach_new_file($_SERVER["PHP_SELF"], 'none', 0, ($section ? $section : -1), $permtoupload, 48, null, '', 0, '', 0, $nameforformuserfile, '', $sectiondir);
+	print $formfile->form_attach_new_file($_SERVER["PHP_SELF"], 'none', 0, ($section ? $section : -1), $permtoupload, 48, null, '', 0, '', 0, $nameforformuserfile, '', $sectiondir, 0, 0, 0, 1);
 } else {
 	print '&nbsp;';
 }
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 9361aae865f..531a4a11d9f 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -403,8 +403,10 @@ if ($sortfield) {
 if ($sortorder) {
 	$backtopage .= '&sortorder='.urlencode($sortorder);
 }
-include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
+include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';	// This manage 'sendit' action when submitting new file.
+
 $backtopage = $savbacktopage;
+//var_dump($backtopage); var_dump($action);
 
 if ($action == 'renamefile') {	// Must be after include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php'; If action were renamefile, we set it to 'file_manager'
 	$action = 'file_manager';
@@ -2647,7 +2649,7 @@ if (!GETPOST('hide_websitemenu')) {
 			$out .= '	jQuery("#website").change(function () {';
 			$out .= '   	console.log("We select "+jQuery("#website option:selected").val());';
 			$out .= '   	if (jQuery("#website option:selected").val() == \'-2\') {';
-			$out .= '  			window.location.href = "'.$urltocreatenewwebsite.'";';
+			$out .= '  			window.location.href = "'.dol_escape_js($urltocreatenewwebsite).'";';
 			$out .= '		} else {';
 			$out .= '  			window.location.href = "'.$_SERVER["PHP_SEFL"].'?website="+jQuery("#website option:selected").val();';
 			$out .= '       }';
@@ -4039,6 +4041,7 @@ if ($action == 'editfile' || $action == 'file_manager' || $action == 'convertimg
 	print '<div class="fiche"><br>';
 	//print '<div class="center">'.$langs->trans("FeatureNotYetAvailable").'</center>';
 
+
 	$module = 'medias';
 	if (empty($url)) {
 		$url = DOL_URL_ROOT.'/website/index.php'; // Must be an url without param

From bf460526c055e5c44cb1f376614e0d3f16145eca Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 20 Jun 2021 00:27:24 +0200
Subject: [PATCH 0740/1497] Add warning when submiting file larger than
 post_max_size.

---
 htdocs/core/actions_linkedfiles.inc.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/core/actions_linkedfiles.inc.php b/htdocs/core/actions_linkedfiles.inc.php
index 750ed2b2d9a..e0bb6174948 100644
--- a/htdocs/core/actions_linkedfiles.inc.php
+++ b/htdocs/core/actions_linkedfiles.inc.php
@@ -26,6 +26,9 @@
 //var_dump($upload_dir);
 //var_dump($upload_dirold);
 
+if (GETPOST('uploadform', 'int') && empty($_FILES)) {
+	print "Error: The PHP parameter 'post_max_size' is too low. All POST parameters and FILES were set to empty.\n";
+}
 
 // Submit file/link
 if (GETPOST('sendit', 'alpha') && !empty($conf->global->MAIN_UPLOAD_DOC) && (!isset($permissiontoadd) || $permissiontoadd)) {

From 0e80784de973f632de90eddf257394704e02aa6e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 20 Jun 2021 00:32:25 +0200
Subject: [PATCH 0741/1497] Add warning to help understand bug of
 post_max_size.

---
 htdocs/core/actions_linkedfiles.inc.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/actions_linkedfiles.inc.php b/htdocs/core/actions_linkedfiles.inc.php
index e0bb6174948..3e2438f63d3 100644
--- a/htdocs/core/actions_linkedfiles.inc.php
+++ b/htdocs/core/actions_linkedfiles.inc.php
@@ -26,8 +26,14 @@
 //var_dump($upload_dir);
 //var_dump($upload_dirold);
 
-if (GETPOST('uploadform', 'int') && empty($_FILES)) {
-	print "Error: The PHP parameter 'post_max_size' is too low. All POST parameters and FILES were set to empty.\n";
+
+// Protection to understand what happen when submitting files larger than post_max_size
+if (GETPOST('uploadform', 'int') && empty($_POST) && empty($_FILES)) {
+	dol_syslog("The PHP parameter 'post_max_size' is too low. All POST parameters and FILES were set to empty.");
+	$langs->loadLangs(array("errors", "install"));
+	print $langs->trans("ErrorFileSizeTooLarge").' ';
+	print $langs->trans("ErrorGoBackAndCorrectParameters");
+	die;
 }
 
 // Submit file/link

From 8df981504931e1808476c48b47a22486404c347c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 20 Jun 2021 01:04:16 +0200
Subject: [PATCH 0742/1497] Add warning to help understand bug of
 post_max_size.

---
 htdocs/core/class/html.formfile.class.php | 4 +++-
 htdocs/core/tpl/filemanager.tpl.php       | 3 ++-
 htdocs/website/index.php                  | 4 +++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 9fde21d24de..7a1f2101ee7 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -77,7 +77,7 @@ class FormFile
 	 *  @param	string		$htmlname		Name and id of HTML form ('formuserfile' by default, 'formuserfileecm' when used to upload a file in ECM)
 	 *  @param	string		$accept			Specifies the types of files accepted (This is not a security check but an user interface facility. eg '.pdf,image/*' or '.png,.jpg' or 'video/*')
 	 *	@param	string		$sectiondir		If upload must be done inside a particular directory (if sectiondir defined, sectionid must not be)
-	 *  @param  int         $usewithoutform 0=Default, 1=Disable <form> and style to use in existing area
+	 *  @param  int         $usewithoutform 0=Default, 1=Disable <form> and <input hidden> to use in existing form area, 2=Disable the tag <form> only
 	 *  @param	int			$capture		1=Add tag capture="capture" to force use of micro or video recording to generate file. When setting this to 1, you must also provide a value for $accept.
 	 *  @param	int			$disablemulti	0=Default, 1=Disable multiple file upload
 	 *  @param	int			$nooutput		0=Output result with print, 1=Return result
@@ -129,6 +129,8 @@ class FormFile
 				$url .= (strpos($url, '?') === false ? '?' : '&').'uploadform=1';
 
 				$out .= '<form name="'.$htmlname.'" id="'.$htmlname.'" action="'.$url.'" enctype="multipart/form-data" method="POST">'."\n";
+			}
+			if (empty($usewithoutform) || $usewithoutform == 2) {
 				$out .= '<input type="hidden" name="token" value="'.newToken().'">'."\n";
 				$out .= '<input type="hidden" id="'.$htmlname.'_section_dir" name="section_dir" value="'.$sectiondir.'">'."\n";
 				$out .= '<input type="hidden" id="'.$htmlname.'_section_id"  name="section_id" value="'.$sectionid.'">'."\n";
diff --git a/htdocs/core/tpl/filemanager.tpl.php b/htdocs/core/tpl/filemanager.tpl.php
index 41e7c937d6a..57a95c48ece 100644
--- a/htdocs/core/tpl/filemanager.tpl.php
+++ b/htdocs/core/tpl/filemanager.tpl.php
@@ -16,6 +16,7 @@
  *
  * Output code for the filemanager
  * $module must be defined ('ecm', 'medias', ...)
+ * $formalreadyopen can be set to 1 to avoid to open the <form> to submit files a second time
  */
 
 // Protection to avoid direct call of template
@@ -145,7 +146,7 @@ if ((!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE
 	print '<!-- Start form to attach new file in filemanager.tpl.php sectionid='.$section.' sectiondir='.$sectiondir.' -->'."\n";
 	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 	$formfile = new FormFile($db);
-	print $formfile->form_attach_new_file($_SERVER["PHP_SELF"], 'none', 0, ($section ? $section : -1), $permtoupload, 48, null, '', 0, '', 0, $nameforformuserfile, '', $sectiondir, 0, 0, 0, 1);
+	print $formfile->form_attach_new_file($_SERVER["PHP_SELF"], 'none', 0, ($section ? $section : -1), $permtoupload, 48, null, '', 0, '', 0, $nameforformuserfile, '', $sectiondir, empty($formalreadyopen) ? 0 : $formalreadyopen, 0, 0, 1);
 } else {
 	print '&nbsp;';
 }
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 531a4a11d9f..aa2b357a794 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -2506,7 +2506,8 @@ $moreheadjs .= '</script>'."\n";
 llxHeader($moreheadcss.$moreheadjs, $langs->trans("WebsiteSetup"), $helpurl, '', 0, 0, $arrayofjs, $arrayofcss, '', '', '<!-- Begin div class="fiche" -->'."\n".'<div class="fichebutwithotherclass">');
 
 print "\n";
-print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST" enctype="multipart/form-data">';
+print '<!-- Open form for all page -->'."\n";
+print '<form action="'.$_SERVER["PHP_SELF"].($action == 'file_manager' ? '?uploadform=1': '').'" method="POST" enctype="multipart/form-data">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 
@@ -4043,6 +4044,7 @@ if ($action == 'editfile' || $action == 'file_manager' || $action == 'convertimg
 
 
 	$module = 'medias';
+	$formalreadyopen = 2;	// So the form to submit a new file will not be opened another time inside the core/tpl/filemanager.tpl.php
 	if (empty($url)) {
 		$url = DOL_URL_ROOT.'/website/index.php'; // Must be an url without param
 	}

From 597bdee0bc39263eb37b809c66a754152b6331c5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 20 Jun 2021 01:39:07 +0200
Subject: [PATCH 0743/1497] Trans

---
 htdocs/langs/en_US/admin.lang | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 4d28f2160c6..efe674e7ca8 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -2144,3 +2144,4 @@ YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You s
 RandomlySelectedIfSeveral=Randomly selected if several pictures are available
 DatabasePasswordObfuscated=Database password is obfuscated in conf file
 DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
+APIsAreNotEnabled=APIs modules are not enabled
\ No newline at end of file

From 2efd432946455daf5dd026d874a2f272cecded16 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 20 Jun 2021 01:54:55 +0200
Subject: [PATCH 0744/1497] Fix list of security events enabled

---
 htdocs/admin/system/security.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/htdocs/admin/system/security.php b/htdocs/admin/system/security.php
index 3e01a99cb61..dcf980cf907 100644
--- a/htdocs/admin/system/security.php
+++ b/htdocs/admin/system/security.php
@@ -329,6 +329,7 @@ $securityevent = new Events($db);
 $eventstolog = $securityevent->eventstolog;
 
 print '<strong>'.$langs->trans("AuditedSecurityEvents").'</strong>: ';
+$out = '';
 if (!empty($eventstolog) && is_array($eventstolog)) {
 	// Loop on each event type
 	$i = 0;
@@ -338,18 +339,22 @@ if (!empty($eventstolog) && is_array($eventstolog)) {
 			$value = empty($conf->global->$key) ? '' : $conf->global->$key;
 			if ($value) {
 				if ($i > 0) {
-					print ', ';
+					$out .= ', ';
 				}
-				print '<span class="opacitymedium">'.$key.'</span>';
+				$out .= '<span class="opacitymedium">'.$key.'</span>';
 				$i++;
 			}
 		}
 	}
-	print '<br>';
-} else {
+	print $out;
+}
+
+if (empty($out)) {
 	print img_warning().' '.$langs->trans("NoSecurityEventsAreAduited", $langs->transnoentities("Home").' - '.$langs->transnoentities("Setup").' - '.$langs->transnoentities("Audit")).'<br>';
 }
 
+print '<br>';
+
 
 // Modules/Applications
 

From 4b6427f92041f76d4262babe53c4772d646bd202 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 20 Jun 2021 01:55:56 +0200
Subject: [PATCH 0745/1497] Fix menu entry

---
 htdocs/admin/system/security.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/admin/system/security.php b/htdocs/admin/system/security.php
index dcf980cf907..a838a107d82 100644
--- a/htdocs/admin/system/security.php
+++ b/htdocs/admin/system/security.php
@@ -350,7 +350,7 @@ if (!empty($eventstolog) && is_array($eventstolog)) {
 }
 
 if (empty($out)) {
-	print img_warning().' '.$langs->trans("NoSecurityEventsAreAduited", $langs->transnoentities("Home").' - '.$langs->transnoentities("Setup").' - '.$langs->transnoentities("Audit")).'<br>';
+	print img_warning().' '.$langs->trans("NoSecurityEventsAreAduited", $langs->transnoentities("Home").' - '.$langs->transnoentities("Setup").' - '.$langs->transnoentities("Security")).'<br>';
 }
 
 print '<br>';

From 6e27ae6029b18c00667daf26bb8b37f271d9b6c2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 20 Jun 2021 01:56:26 +0200
Subject: [PATCH 0746/1497] Fix path

---
 htdocs/admin/system/security.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/admin/system/security.php b/htdocs/admin/system/security.php
index a838a107d82..0b2f2678521 100644
--- a/htdocs/admin/system/security.php
+++ b/htdocs/admin/system/security.php
@@ -350,7 +350,7 @@ if (!empty($eventstolog) && is_array($eventstolog)) {
 }
 
 if (empty($out)) {
-	print img_warning().' '.$langs->trans("NoSecurityEventsAreAduited", $langs->transnoentities("Home").' - '.$langs->transnoentities("Setup").' - '.$langs->transnoentities("Security")).'<br>';
+	print img_warning().' '.$langs->trans("NoSecurityEventsAreAduited", $langs->transnoentities("Home").' - '.$langs->transnoentities("Setup").' - '.$langs->transnoentities("Security").' - '.$langs->transnoentities("Audit")).'<br>';
 }
 
 print '<br>';

From ce818d4f449833312b23eaa86519419e0a957e62 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 20 Jun 2021 03:41:45 +0200
Subject: [PATCH 0747/1497] Debug doc templates of ODF

---
 .../mrp/doc/doc_generic_mo_odt.modules.php    | 11 ++++++-----
 .../doc/doc_generic_myobject_odt.modules.php  | 19 +++++++++++--------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php b/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
index 860e07d7d36..57c175a0112 100644
--- a/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
+++ b/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
@@ -175,7 +175,7 @@ class doc_generic_mo_odt extends ModelePDFMo
 			$texte .= '<div id="div_'.get_class($this).'" class="hiddenx">';
 			// Show list of found files
 			foreach ($listoffiles as $file) {
-				$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=mrps&file=invoices/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
+				$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=mrps/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
 			}
 			$texte .= '</div>';
 		}
@@ -284,7 +284,7 @@ class doc_generic_mo_odt extends ModelePDFMo
 				//print "file=".$file;
 				//print "conf->societe->dir_temp=".$conf->societe->dir_temp;
 
-				dol_mkdir($conf->bom->dir_temp);
+				dol_mkdir($conf->mrp->dir_temp);
 
 
 				// If CUSTOMER contact defined on order, we use it
@@ -379,14 +379,15 @@ class doc_generic_mo_odt extends ModelePDFMo
 
 				foreach ($tmparray as $key => $value) {
 					try {
-						if (preg_match('/logo$/', $key)) { // Image
+						if (preg_match('/logo$/', $key)) {
+							// Image
 							if (file_exists($value)) {
 								$odfHandler->setImage($key, $value);
 							} else {
 								$odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
 							}
-						} else // Text
-						{
+						} else {
+							// Text
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
 					} catch (OdfException $e) {
diff --git a/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php b/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
index d64c80c9355..3836381e5cc 100644
--- a/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
+++ b/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
@@ -86,7 +86,7 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 		$this->marge_basse = 0;
 
 		$this->option_logo = 1; // Affiche logo
-		$this->option_tva = 0; // Gere option tva COMMANDE_TVAOPTION
+		$this->option_tva = 0; // Gere option tva
 		$this->option_modereg = 0; // Affiche mode reglement
 		$this->option_condreg = 0; // Affiche conditions reglement
 		$this->option_codeproduitservice = 0; // Affiche code produit-service
@@ -135,7 +135,8 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 			$tmpdir = trim($tmpdir);
 			$tmpdir = preg_replace('/DOL_DATA_ROOT/', DOL_DATA_ROOT, $tmpdir);
 			if (!$tmpdir) {
-				unset($listofdir[$key]); continue;
+				unset($listofdir[$key]);
+				continue;
 			}
 			if (!is_dir($tmpdir)) {
 				$texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
@@ -173,7 +174,7 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 		if ($nbofiles) {
 			$texte .= '<div id="div_'.get_class($this).'" class="hidden">';
 			foreach ($listoffiles as $file) {
-				$texte .= $file['name'].'<br>';
+				$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=mymodule_myobject/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
 			}
 			$texte .= '</div>';
 		}
@@ -195,7 +196,7 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 	/**
 	 *  Function to build a document on disk using the generic odt module.
 	 *
-	 *	@param		Commande	$object				Object source to build document
+	 *	@param		MyObject	$object				Object source to build document
 	 *	@param		Translate	$outputlangs		Lang output object
 	 * 	@param		string		$srctemplatepath	Full path of source filename for generator using a template file
 	 *  @param		int			$hidedetails		Do not show line details
@@ -229,11 +230,11 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 
 		$outputlangs->loadLangs(array("main", "dict", "companies", "bills"));
 
-		if ($conf->commande->dir_output) {
+		if ($conf->mymodule->dir_output) {
 			// If $object is id instead of object
 			if (!is_object($object)) {
 				$id = $object;
-				$object = new Commande($this->db);
+				$object = new MyObject($this->db);
 				$result = $object->fetch($id);
 				if ($result < 0) {
 					dol_print_error($this->db, $object->error);
@@ -241,7 +242,9 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 				}
 			}
 
-			$dir = $conf->commande->multidir_output[isset($object->entity) ? $object->entity : 1];
+			$object->fetch_thirdparty();
+
+			$dir = $conf->mymodule->multidir_output[isset($object->entity) ? $object->entity : 1];
 			$objectref = dol_sanitizeFileName($object->ref);
 			if (!preg_match('/specimen/i', $objectref)) {
 				$dir .= "/".$objectref;
@@ -331,7 +334,7 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 					$odfHandler = new odf(
 						$srctemplatepath,
 						array(
-						'PATH_TO_TMP'	  => $conf->commande->dir_temp,
+						'PATH_TO_TMP'	  => $conf->mymodule->dir_temp,
 						'ZIP_PROXY'		  => 'PclZipProxy', // PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy.
 						'DELIMITER_LEFT'  => '{',
 						'DELIMITER_RIGHT' => '}'

From 1a6647e6909df223b9899b4c0d512d5cd24de80f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 20 Jun 2021 04:10:25 +0200
Subject: [PATCH 0748/1497] Debug v14

---
 htdocs/core/class/html.formfile.class.php | 6 +++---
 htdocs/core/modules/mrp/modules_mo.php    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 7a1f2101ee7..04b104ff0f1 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -356,7 +356,7 @@ class FormFile
 	 *      Return a string to show the box with list of available documents for object.
 	 *      This also set the property $this->numoffiles
 	 *
-	 *      @param      string				$modulepart         Module the files are related to ('propal', 'facture', 'facture_fourn', 'mymodule', 'mymodule:nameofsubmodule', 'mymodule_temp', ...)
+	 *      @param      string				$modulepart         Module the files are related to ('propal', 'facture', 'facture_fourn', 'mymodule', 'mymodule:myobject', 'mymodule_temp', ...)
 	 *      @param      string				$modulesubdir       Existing (so sanitized) sub-directory to scan (Example: '0/1/10', 'FA/DD/MM/YY/9999'). Use '' if file is not into subdir of module.
 	 *      @param      string				$filedir            Directory to scan
 	 *      @param      string				$urlsource          Url of origin page (for return)
@@ -678,7 +678,7 @@ class FormFile
 					$res = include_once $file;
 				}
 
-				$class = 'ModelePDF'.$submodulepart;
+				$class = 'ModelePDF'.ucfirst($submodulepart);
 
 				if (class_exists($class)) {
 					$modellist = call_user_func($class.'::liste_modeles', $this->db);
@@ -740,7 +740,7 @@ class FormFile
 			if (($allowgenifempty || (is_array($modellist) && count($modellist) > 0)) && !empty($conf->global->MAIN_MULTILANGS) && !$forcenomultilang && (!empty($modellist) || $showempty)) {
 				include_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
 				$formadmin = new FormAdmin($this->db);
-				$defaultlang = $codelang ? $codelang : $langs->getDefaultLang();
+				$defaultlang = ($codelang && $codelang != 'auto') ? $codelang : $langs->getDefaultLang();
 				$morecss = 'maxwidth150';
 				if ($conf->browser->layout == 'phone') {
 					$morecss = 'maxwidth100';
diff --git a/htdocs/core/modules/mrp/modules_mo.php b/htdocs/core/modules/mrp/modules_mo.php
index 82a1a9f3b56..454df89bcde 100644
--- a/htdocs/core/modules/mrp/modules_mo.php
+++ b/htdocs/core/modules/mrp/modules_mo.php
@@ -52,7 +52,7 @@ abstract class ModelePDFMo extends CommonDocGenerator
 		// phpcs:enable
 		global $conf;
 
-		$type = 'mo';
+		$type = 'mrp';
 		$list = array();
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';

From e3e2dfd7648fe5cd03714ce888be9b43026eb4ed Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 20 Jun 2021 05:11:46 +0200
Subject: [PATCH 0749/1497] Fix generation of ODT (test if temporary directory
 is writable)

---
 .../core/class/commondocgenerator.class.php   |  6 +--
 htdocs/core/class/commonobject.class.php      | 44 ++++++++++---------
 .../barcode/doc/phpbarcode.modules.php        |  5 +++
 .../barcode/doc/tcpdfbarcode.modules.php      |  6 +++
 .../bom/doc/doc_generic_bom_odt.modules.php   |  6 ++-
 .../doc/doc_generic_order_odt.modules.php     |  6 ++-
 .../doc/doc_generic_contract_odt.modules.php  |  6 ++-
 .../doc/doc_generic_shipment_odt.modules.php  |  6 ++-
 .../doc/doc_generic_invoice_odt.modules.php   |  6 ++-
 .../doc/doc_generic_member_odt.class.php      |  6 ++-
 .../mrp/doc/doc_generic_mo_odt.modules.php    | 16 +++++--
 .../doc/doc_generic_product_odt.modules.php   |  6 ++-
 .../doc/doc_generic_project_odt.modules.php   |  5 +++
 .../task/doc/doc_generic_task_odt.modules.php |  5 +++
 .../doc/doc_generic_proposal_odt.modules.php  |  6 ++-
 .../doc/doc_generic_reception_odt.modules.php |  6 ++-
 .../societe/doc/doc_generic_odt.modules.php   |  5 +++
 .../doc/doc_generic_stock_odt.modules.php     |  6 ++-
 ...doc_generic_supplier_order_odt.modules.php |  8 +++-
 ..._generic_supplier_proposal_odt.modules.php |  6 ++-
 .../doc/doc_generic_ticket_odt.modules.php    | 16 ++++---
 .../user/doc/doc_generic_user_odt.modules.php |  6 ++-
 .../doc/doc_generic_usergroup_odt.modules.php |  6 ++-
 .../doc/doc_generic_myobject_odt.modules.php  |  6 ++-
 htdocs/mrp/lib/mrp_mo.lib.php                 |  2 +-
 htdocs/mrp/mo_card.php                        | 17 ++++---
 26 files changed, 162 insertions(+), 57 deletions(-)

diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 6e91d9d175b..2a5e3391eb9 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -489,7 +489,7 @@ abstract class CommonDocGenerator
 		$array_key.'_remain_to_pay'=>price2num($object->total_ttc - $remain_to_pay, 'MT')
 		);
 
-		if (method_exists($object, 'getTotalDiscount')) {
+		if (method_exists($object, 'getTotalDiscount') && in_array(get_class($object), array('Proposal', 'Commande', 'Facture', 'SupplierProposal', 'CommandeFournisseur', 'FactureFournisseur'))) {
 			$resarray[$array_key.'_total_discount_ht_locale'] = price($object->getTotalDiscount(), 0, $outputlangs);
 			$resarray[$array_key.'_total_discount_ht'] = price2num($object->getTotalDiscount());
 		} else {
@@ -532,10 +532,10 @@ abstract class CommonDocGenerator
 			}
 
 			// @GS: Calculate total up and total discount percentage
-			// Note that this added fields correspond to nothing in Dolibarr (Dolibarr manage discount on lines not globally)
+			// Note that this added fields does not match a field into database in Dolibarr (Dolibarr manage discount on lines not as a global property of object)
 			$resarray['object_total_up'] = $totalUp;
 			$resarray['object_total_up_locale'] = price($resarray['object_total_up'], 0, $outputlangs);
-			if (method_exists($object, 'getTotalDiscount')) {
+			if (method_exists($object, 'getTotalDiscount') && in_array(get_class($object), array('Proposal', 'Commande', 'Facture', 'SupplierProposal', 'CommandeFournisseur', 'FactureFournisseur'))) {
 				$totalDiscount = $object->getTotalDiscount();
 			} else {
 				$totalDiscount = 0;
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index c927b833c71..eeae94ff880 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -4334,37 +4334,41 @@ abstract class CommonObject
 	/**
 	 * Function that returns the total amount HT of discounts applied for all lines.
 	 *
-	 * @return 	float
+	 * @return 	float|string			Total amout of discount
 	 */
 	public function getTotalDiscount()
 	{
-		$total_discount = 0.00;
+		if (!empty($this->table_element_line) ) {
+			$total_discount = 0.00;
 
-		$sql = "SELECT subprice as pu_ht, qty, remise_percent, total_ht";
-		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element."det";
-		$sql .= " WHERE ".$this->fk_element." = ".$this->id;
+			$sql = "SELECT subprice as pu_ht, qty, remise_percent, total_ht";
+			$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element_line;
+			$sql .= " WHERE ".$this->fk_element." = ".$this->id;
 
-		dol_syslog(get_class($this).'::getTotalDiscount', 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);
+			dol_syslog(get_class($this).'::getTotalDiscount', 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);
 
-				$pu_ht = $obj->pu_ht;
-				$qty = $obj->qty;
-				$total_ht = $obj->total_ht;
+					$pu_ht = $obj->pu_ht;
+					$qty = $obj->qty;
+					$total_ht = $obj->total_ht;
 
-				$total_discount_line = floatval(price2num(($pu_ht * $qty) - $total_ht, 'MT'));
-				$total_discount += $total_discount_line;
+					$total_discount_line = floatval(price2num(($pu_ht * $qty) - $total_ht, 'MT'));
+					$total_discount += $total_discount_line;
 
-				$i++;
+					$i++;
+				}
 			}
+
+			//print $total_discount; exit;
+			return price2num($total_discount);
 		}
 
-		//print $total_discount; exit;
-		return price2num($total_discount);
+		return null;
 	}
 
 
diff --git a/htdocs/core/modules/barcode/doc/phpbarcode.modules.php b/htdocs/core/modules/barcode/doc/phpbarcode.modules.php
index 56c2a12fee6..fe36f7604c2 100644
--- a/htdocs/core/modules/barcode/doc/phpbarcode.modules.php
+++ b/htdocs/core/modules/barcode/doc/phpbarcode.modules.php
@@ -186,6 +186,11 @@ class modPhpbarcode extends ModeleBarCode
 		global $conf, $filebarcode;
 
 		dol_mkdir($conf->barcode->dir_temp);
+		if (!is_writable($conf->barcode->dir_temp)) {
+			$this->error = "Failed to write in temp directory ".$conf->barcode->dir_temp;
+			dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
+			return -1;
+		}
 
 		$file = $conf->barcode->dir_temp.'/barcode_'.$code.'_'.$encoding.'.png';
 
diff --git a/htdocs/core/modules/barcode/doc/tcpdfbarcode.modules.php b/htdocs/core/modules/barcode/doc/tcpdfbarcode.modules.php
index 90b7cd4f543..df9ec39546d 100644
--- a/htdocs/core/modules/barcode/doc/tcpdfbarcode.modules.php
+++ b/htdocs/core/modules/barcode/doc/tcpdfbarcode.modules.php
@@ -158,6 +158,12 @@ class modTcpdfbarcode extends ModeleBarCode
 		global $conf, $_GET;
 
 		dol_mkdir($conf->barcode->dir_temp);
+		if (!is_writable($conf->barcode->dir_temp)) {
+			$this->error = "Failed to write in temp directory ".$conf->barcode->dir_temp;
+			dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
+			return -1;
+		}
+
 		$file = $conf->barcode->dir_temp.'/barcode_'.$code.'_'.$encoding.'.png';
 
 		$tcpdfEncoding = $this->getTcpdfEncodingType($encoding);
diff --git a/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php b/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php
index 30d93aedfa0..ce85203930f 100644
--- a/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php
+++ b/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php
@@ -278,7 +278,11 @@ class doc_generic_bom_odt extends ModelePDFBom
 				//print "conf->societe->dir_temp=".$conf->societe->dir_temp;
 
 				dol_mkdir($conf->bom->dir_temp);
-
+				if (!is_writable($conf->bom->dir_temp)) {
+					$this->error = "Failed to write in temp directory ".$conf->bom->dir_temp;
+					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
+					return -1;
+				}
 
 				// If CUSTOMER contact defined on order, we use it
 				$usecontact = false;
diff --git a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
index 603394b9797..e7fe92ba9f9 100644
--- a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
+++ b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
@@ -290,7 +290,11 @@ class doc_generic_order_odt extends ModelePDFCommandes
 				//print "conf->societe->dir_temp=".$conf->societe->dir_temp;
 
 				dol_mkdir($conf->commande->dir_temp);
-
+				if (!is_writable($conf->commande->dir_temp)) {
+					$this->error = "Failed to write in temp directory ".$conf->commande->dir_temp;
+					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
+					return -1;
+				}
 
 				// If CUSTOMER contact defined on order, we use it
 				$usecontact = false;
diff --git a/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php b/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
index 2b3e2905907..c8d1748124a 100644
--- a/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
+++ b/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
@@ -278,7 +278,11 @@ class doc_generic_contract_odt extends ModelePDFContract
 				//print "conf->contrat->dir_temp=".$conf->contrat->dir_temp;
 
 				dol_mkdir($conf->contrat->dir_temp);
-
+				if (!is_writable($conf->contrat->dir_temp)) {
+					$this->error = "Failed to write in temp directory ".$conf->contrat->dir_temp;
+					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
+					return -1;
+				}
 
 				// If CUSTOMER contact defined on contract, we use it
 				$usecontact = false;
diff --git a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
index 163392ead88..2eaca54b697 100644
--- a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
+++ b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
@@ -290,7 +290,11 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 				//print "conf->societe->dir_temp=".$conf->societe->dir_temp;
 
 				dol_mkdir($conf->expedition->dir_temp);
-
+				if (!is_writable($conf->expedition->dir_temp)) {
+					$this->error = "Failed to write in temp directory ".$conf->expedition->dir_temp;
+					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
+					return -1;
+				}
 
 				// If SHIPMENT contact defined on invoice, we use it
 				$usecontact = false;
diff --git a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
index ffba0717332..98269a0f019 100644
--- a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
+++ b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
@@ -291,7 +291,11 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 				//print "conf->societe->dir_temp=".$conf->societe->dir_temp;
 
 				dol_mkdir($conf->facture->dir_temp);
-
+				if (!is_writable($conf->facture->dir_temp)) {
+					$this->error = "Failed to write in temp directory ".$conf->facture->dir_temp;
+					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
+					return -1;
+				}
 
 				// If BILLING contact defined on invoice, we use it
 				$usecontact = false;
diff --git a/htdocs/core/modules/member/doc/doc_generic_member_odt.class.php b/htdocs/core/modules/member/doc/doc_generic_member_odt.class.php
index 9a14e96bc28..120efe93cf7 100644
--- a/htdocs/core/modules/member/doc/doc_generic_member_odt.class.php
+++ b/htdocs/core/modules/member/doc/doc_generic_member_odt.class.php
@@ -279,7 +279,11 @@ class doc_generic_member_odt extends ModelePDFMember
 				//print "conf->adherent->dir_temp=".$conf->adherent->dir_temp;
 
 				dol_mkdir($conf->adherent->dir_temp);
-
+				if (!is_writable($conf->adherent->dir_temp)) {
+					$this->error = "Failed to write in temp directory ".$conf->adherent->dir_temp;
+					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
+					return -1;
+				}
 
 				// If CUSTOMER contact defined on member, we use it
 				$usecontact = false;
diff --git a/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php b/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
index 57c175a0112..ac920d69269 100644
--- a/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
+++ b/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
@@ -285,7 +285,11 @@ class doc_generic_mo_odt extends ModelePDFMo
 				//print "conf->societe->dir_temp=".$conf->societe->dir_temp;
 
 				dol_mkdir($conf->mrp->dir_temp);
-
+				if (!is_writable($conf->mrp->dir_temp)) {
+					$this->error = "Failed to write in temp directory ".$conf->mrp->dir_temp;
+					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
+					return -1;
+				}
 
 				// If CUSTOMER contact defined on order, we use it
 				$usecontact = false;
@@ -342,11 +346,13 @@ class doc_generic_mo_odt extends ModelePDFMo
 					dol_syslog($e->getMessage(), LOG_INFO);
 					return -1;
 				}
+
 				// After construction $odfHandler->contentXml contains content and
 				// [!-- BEGIN row.lines --]*[!-- END row.lines --] has been replaced by
 				// [!-- BEGIN lines --]*[!-- END lines --]
 				//print html_entity_decode($odfHandler->__toString());
 				//print exit;
+				/*
 
 
 				// Make substitutions into odt of freetext
@@ -394,6 +400,7 @@ class doc_generic_mo_odt extends ModelePDFMo
 						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
+
 				// Replace tags of lines
 				try {
 					$foundtagforlines = 1;
@@ -404,6 +411,7 @@ class doc_generic_mo_odt extends ModelePDFMo
 						$foundtagforlines = 0;
 						dol_syslog($e->getMessage(), LOG_INFO);
 					}
+
 					if ($foundtagforlines) {
 						$linenumber = 0;
 						foreach ($object->lines as $line) {
@@ -446,14 +454,14 @@ class doc_generic_mo_odt extends ModelePDFMo
 
 				$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
 				$reshook = $hookmanager->executeHooks('beforeODTSave', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-
+				*/
 				// Write new file
 				if (!empty($conf->global->MAIN_ODT_AS_PDF)) {
 					try {
 						$odfHandler->exportAsAttachedPDF($file);
 					} catch (Exception $e) {
 						$this->error = $e->getMessage();
-						dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog('Error in exportAsAttachedPDF: '.$e->getMessage(), LOG_INFO);
 						return -1;
 					}
 				} else {
@@ -461,7 +469,7 @@ class doc_generic_mo_odt extends ModelePDFMo
 						$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
 						$this->error = $e->getMessage();
-						dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog('Error in saveToDisk: '.$e->getMessage(), LOG_INFO);
 						return -1;
 					}
 				}
diff --git a/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php b/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
index d038acd7ee5..b2d45a7ab6e 100644
--- a/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
+++ b/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
@@ -302,7 +302,11 @@ class doc_generic_product_odt extends ModelePDFProduct
 				//print "conf->product->dir_temp=".$conf->product->dir_temp;
 
 				dol_mkdir($conf->product->dir_temp);
-
+				if (!is_writable($conf->product->dir_temp)) {
+					$this->error = "Failed to write in temp directory ".$conf->product->dir_temp;
+					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
+					return -1;
+				}
 
 				// If CUSTOMER contact defined on product, we use it
 				$usecontact = false;
diff --git a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
index c085f1eeaac..52d56812d68 100644
--- a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
+++ b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
@@ -574,6 +574,11 @@ class doc_generic_project_odt extends ModelePDFProjects
 				//print "conf->societe->dir_temp=".$conf->societe->dir_temp;
 
 				dol_mkdir($conf->projet->dir_temp);
+				if (!is_writable($conf->projet->dir_temp)) {
+					$this->error = "Failed to write in temp directory ".$conf->projet->dir_temp;
+					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
+					return -1;
+				}
 
 				// If PROJECTLEADER contact defined on project, we use it
 				$usecontact = false;
diff --git a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
index a04e2e9c14a..961dab003e1 100644
--- a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
+++ b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
@@ -524,6 +524,11 @@ class doc_generic_task_odt extends ModelePDFTask
 				//print "conf->societe->dir_temp=".$conf->societe->dir_temp;
 
 				dol_mkdir($conf->projet->dir_temp);
+				if (!is_writable($conf->task->dir_temp)) {
+					$this->error = "Failed to write in temp directory ".$conf->task->dir_temp;
+					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
+					return -1;
+				}
 
 				$socobject = $project->thirdparty;
 
diff --git a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
index e7eade5de02..e892e9a7252 100644
--- a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
+++ b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
@@ -318,7 +318,11 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 				//print "conf->propal->dir_temp=".$conf->propal->dir_temp;
 
 				dol_mkdir($conf->propal->multidir_temp[$object->entity]);
-
+				if (!is_writable($conf->propal->dir_temp)) {
+					$this->error = "Failed to write in temp directory ".$conf->propal->dir_temp;
+					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
+					return -1;
+				}
 
 				// If CUSTOMER contact defined on proposal, we use it
 				$usecontact = false;
diff --git a/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php b/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php
index d70ecca00ad..a6701fe8bcd 100644
--- a/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php
+++ b/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php
@@ -282,7 +282,11 @@ class doc_generic_reception_odt extends ModelePdfReception
 				//print "conf->societe->dir_temp=".$conf->societe->dir_temp;
 
 				dol_mkdir($conf->reception->dir_temp);
-
+				if (!is_writable($conf->reception->dir_temp)) {
+					$this->error = "Failed to write in temp directory ".$conf->reception->dir_temp;
+					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
+					return -1;
+				}
 
 				// If BILLING contact defined on invoice, we use it
 				$usecontact = false;
diff --git a/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
index 9045ed0b281..900c7e465df 100644
--- a/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
+++ b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
@@ -266,6 +266,11 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 				//exit;
 
 				dol_mkdir($conf->societe->multidir_temp[$object->entity]);
+				if (!is_writable($conf->societe->multidir_temp[$object->entity])) {
+					$this->error = "Failed to write in temp directory ".$conf->societe->multidir_temp[$object->entity];
+					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
+					return -1;
+				}
 
 				// Open and load template
 				require_once ODTPHP_PATH.'odf.php';
diff --git a/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php b/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
index e2d474d2dd2..ccd66610f55 100644
--- a/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
+++ b/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
@@ -291,7 +291,11 @@ class doc_generic_stock_odt extends ModelePDFStock
 				//print "conf->product->dir_temp=".$conf->product->dir_temp;
 
 				dol_mkdir($conf->product->dir_temp);
-
+				if (!is_writable($conf->product->dir_temp)) {
+					$this->error = "Failed to write in temp directory ".$conf->product->dir_temp;
+					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
+					return -1;
+				}
 
 				// If CUSTOMER contact defined on stock, we use it
 				$usecontact = false;
diff --git a/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php b/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
index b7fd399edef..285ea50bebe 100644
--- a/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
@@ -280,8 +280,12 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 				//print "file=".$file;
 				//print "conf->societe->dir_temp=".$conf->societe->dir_temp;
 
-				dol_mkdir($conf->commande->dir_temp);
-
+				dol_mkdir($conf->fournisseur->commande->dir_temp);
+				if (!is_writable($conf->fournisseur->commande->dir_temp)) {
+					$this->error = "Failed to write in temp directory ".$conf->fournisseur->commande->dir_temp;
+					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
+					return -1;
+				}
 
 				// If CUSTOMER contact defined on order, we use it
 				$usecontact = false;
diff --git a/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php b/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
index 7e300c68643..ead5664c04a 100644
--- a/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
@@ -315,7 +315,11 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 				//print "conf->propal->dir_temp=".$conf->propal->dir_temp;
 
 				dol_mkdir($conf->supplier_proposal->dir_temp);
-
+				if (!is_writable($conf->supplier_proposal->dir_temp)) {
+					$this->error = "Failed to write in temp directory ".$conf->supplier_proposal->dir_temp;
+					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
+					return -1;
+				}
 
 				// If BILLING contact defined on invoice, we use it
 				$usecontact = false;
diff --git a/htdocs/core/modules/ticket/doc/doc_generic_ticket_odt.modules.php b/htdocs/core/modules/ticket/doc/doc_generic_ticket_odt.modules.php
index d1d3763fb2e..1bb48b82b42 100644
--- a/htdocs/core/modules/ticket/doc/doc_generic_ticket_odt.modules.php
+++ b/htdocs/core/modules/ticket/doc/doc_generic_ticket_odt.modules.php
@@ -222,7 +222,7 @@ class doc_generic_ticket_odt extends ModelePDFTicket
 		// Load translation files required by the page
 		$outputlangs->loadLangs(array("main", "companies", "bills", "dict"));
 
-		if ($conf->user->dir_output) {
+		if ($conf->ticket->dir_output) {
 			// If $object is id instead of object
 			if (!is_object($object)) {
 				$id = $object;
@@ -236,7 +236,7 @@ class doc_generic_ticket_odt extends ModelePDFTicket
 
 			$object->fetch_thirdparty();
 
-			$dir = $conf->user->dir_output;
+			$dir = $conf->ticket->dir_output;
 			$objectref = dol_sanitizeFileName($object->ref);
 			if (!preg_match('/specimen/i', $objectref)) {
 				$dir .= "/".$objectref;
@@ -274,10 +274,14 @@ class doc_generic_ticket_odt extends ModelePDFTicket
 				//print "newdir=".$dir;
 				//print "newfile=".$newfile;
 				//print "file=".$file;
-				//print "conf->user->dir_temp=".$conf->user->dir_temp;
-
-				dol_mkdir($conf->user->dir_temp);
+				//print "conf->ticket->dir_temp=".$conf->ticket->dir_temp;
 
+				dol_mkdir($conf->ticket->dir_temp);
+				if (!is_writable($conf->ticket->dir_temp)) {
+					$this->error = "Failed to write in temp directory ".$conf->ticket->dir_temp;
+					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
+					return -1;
+				}
 
 				// If CUSTOMER contact defined on user, we use it
 				$usecontact = false;
@@ -306,7 +310,7 @@ class doc_generic_ticket_odt extends ModelePDFTicket
 					$odfHandler = new odf(
 						$srctemplatepath,
 						array(
-							'PATH_TO_TMP'	  => $conf->user->dir_temp,
+							'PATH_TO_TMP'	  => $conf->ticket->dir_temp,
 							'ZIP_PROXY'		  => 'PclZipProxy', // PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy.
 							'DELIMITER_LEFT'  => '{',
 							'DELIMITER_RIGHT' => '}'
diff --git a/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php b/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
index 035a99fe744..80bbd0f2905 100644
--- a/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
+++ b/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
@@ -309,7 +309,11 @@ class doc_generic_user_odt extends ModelePDFUser
 				//print "conf->user->dir_temp=".$conf->user->dir_temp;
 
 				dol_mkdir($conf->user->dir_temp);
-
+				if (!is_writable($conf->user->dir_temp)) {
+					$this->error = "Failed to write in temp directory ".$conf->user->dir_temp;
+					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
+					return -1;
+				}
 
 				// If CUSTOMER contact defined on user, we use it
 				$usecontact = false;
diff --git a/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php b/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
index 04d9957458b..9ea1a27f045 100644
--- a/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
+++ b/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
@@ -299,7 +299,11 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 				//print "conf->user->dir_temp=".$conf->user->dir_temp;
 
 				dol_mkdir($conf->user->dir_temp);
-
+				if (!is_writable($conf->user->dir_temp)) {
+					$this->error = "Failed to write in temp directory ".$conf->user->dir_temp;
+					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
+					return -1;
+				}
 
 				// If CUSTOMER contact defined on user, we use it
 				$usecontact = false;
diff --git a/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php b/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
index 3836381e5cc..a74de9d7f9b 100644
--- a/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
+++ b/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
@@ -284,7 +284,11 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 				//print "conf->societe->dir_temp=".$conf->societe->dir_temp;
 
 				dol_mkdir($conf->mymodule->dir_temp);
-
+				if (!is_writable($conf->mymodule->dir_temp)) {
+					$this->error = "Failed to write in temp directory ".$conf->mymodule->dir_temp;
+					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
+					return -1;
+				}
 
 				// If CUSTOMER contact defined on order, we use it
 				$usecontact = false;
diff --git a/htdocs/mrp/lib/mrp_mo.lib.php b/htdocs/mrp/lib/mrp_mo.lib.php
index 62f74ce016e..8fe07df89c1 100644
--- a/htdocs/mrp/lib/mrp_mo.lib.php
+++ b/htdocs/mrp/lib/mrp_mo.lib.php
@@ -78,7 +78,7 @@ function moPrepareHead($object)
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$upload_dir = $conf->mrp->dir_output."/mo/".dol_sanitizeFileName($object->ref);
+	$upload_dir = $conf->mrp->dir_output."/".dol_sanitizeFileName($object->ref);
 	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
 	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = dol_buildpath("/mrp/mo_document.php", 1).'?id='.$object->id;
diff --git a/htdocs/mrp/mo_card.php b/htdocs/mrp/mo_card.php
index 093604df9a1..fad22645cd5 100644
--- a/htdocs/mrp/mo_card.php
+++ b/htdocs/mrp/mo_card.php
@@ -138,6 +138,16 @@ if (empty($reshook)) {
 	// Actions when printing a doc from card
 	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
 
+	// Action to build doc
+	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
+
+	if ($action == 'set_thirdparty' && $permissiontoadd) {
+		$object->setValueFrom('fk_soc', GETPOST('fk_soc', 'int'), '', '', 'date', '', $user, 'MO_MODIFY');
+	}
+	if ($action == 'classin' && $permissiontoadd) {
+		$object->setProject(GETPOST('projectid', 'int'));
+	}
+
 	// Actions to send emails
 	$triggersendname = 'MO_SENTBYMAIL';
 	$autocopy = 'MAIN_MAIL_AUTOCOPY_MO_TO';
@@ -147,13 +157,6 @@ if (empty($reshook)) {
 	// Action to move up and down lines of object
 	//include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php';	// Must be include, not include_once
 
-	if ($action == 'set_thirdparty' && $permissiontoadd) {
-		$object->setValueFrom('fk_soc', GETPOST('fk_soc', 'int'), '', '', 'date', '', $user, 'MO_MODIFY');
-	}
-	if ($action == 'classin' && $permissiontoadd) {
-		$object->setProject(GETPOST('projectid', 'int'));
-	}
-
 	// Action close produced
 	if ($action == 'confirm_produced' && $confirm == 'yes' && $permissiontoadd) {
 		$result = $object->setStatut($object::STATUS_PRODUCED, 0, '', 'MRP_MO_PRODUCED');

From e61d60e12546085957194dc2b221b71b8aa8860f Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 20 Jun 2021 10:49:05 +0200
Subject: [PATCH 0750/1497] internationalization

---
 .../supplier_order/doc/pdf_cornas.modules.php      | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
index 245897e1956..dc898c98cb5 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
@@ -148,13 +148,13 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 		$this->marge_haute = isset($conf->global->MAIN_PDF_MARGIN_TOP) ? $conf->global->MAIN_PDF_MARGIN_TOP : 10;
 		$this->marge_basse = isset($conf->global->MAIN_PDF_MARGIN_BOTTOM) ? $conf->global->MAIN_PDF_MARGIN_BOTTOM : 10;
 
-		$this->option_logo = 1; // Affiche logo
-		$this->option_tva = 1; // Gere option tva FACTURE_TVAOPTION
-		$this->option_modereg = 1; // Affiche mode reglement
-		$this->option_condreg = 1; // Affiche conditions reglement
-		$this->option_codeproduitservice = 1; // Affiche code produit-service
-		$this->option_multilang = 1; // Dispo en plusieurs langues
-		$this->option_escompte = 0; // Affiche si il y a eu escompte
+		$this->option_logo = 1; // Display logo
+		$this->option_tva = 1; // Manage the vat option FACTURE_TVAOPTION
+		$this->option_modereg = 1; // Display payment mode
+		$this->option_condreg = 1; // Display payment terms
+		$this->option_codeproduitservice = 1; // Display product-service code
+		$this->option_multilang = 1; //Available in several languages
+		$this->option_escompte = 0; // Displays if there has been a discount
 		$this->option_credit_note = 0; // Support credit notes
 		$this->option_freetext = 1; // Support add of a personalised text
 		$this->option_draft_watermark = 1; // Support add of a watermark on drafts

From fa3e75c68a4fa5b353db18b06e02889618984c88 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 20 Jun 2021 10:58:20 +0200
Subject: [PATCH 0751/1497] internationalization

---
 .../doc/doc_generic_myobject_odt.modules.php       | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php b/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
index a74de9d7f9b..b7ea52d939d 100644
--- a/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
+++ b/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
@@ -85,13 +85,13 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 		$this->marge_haute = 0;
 		$this->marge_basse = 0;
 
-		$this->option_logo = 1; // Affiche logo
-		$this->option_tva = 0; // Gere option tva
-		$this->option_modereg = 0; // Affiche mode reglement
-		$this->option_condreg = 0; // Affiche conditions reglement
-		$this->option_codeproduitservice = 0; // Affiche code produit-service
-		$this->option_multilang = 1; // Dispo en plusieurs langues
-		$this->option_escompte = 0; // Affiche si il y a eu escompte
+		$this->option_logo = 1; // Display logo
+		$this->option_tva = 0; // Manage the vat option FACTURE_TVAOPTION
+		$this->option_modereg = 0; // Display payment mode
+		$this->option_condreg = 0; // Display payment terms
+		$this->option_codeproduitservice = 0; // Display product-service code
+		$this->option_multilang = 1; // Available in several languages
+		$this->option_escompte = 0; // Displays if there has been a discount
 		$this->option_credit_note = 0; // Support credit notes
 		$this->option_freetext = 1; // Support add of a personalised text
 		$this->option_draft_watermark = 0; // Support add of a watermark on drafts

From 33ffb8b943e40f49a8bcceded6b21017e889ab7e Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 20 Jun 2021 11:01:38 +0200
Subject: [PATCH 0752/1497] internationalization

---
 htdocs/core/modules/bank/doc/pdf_ban.modules.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/modules/bank/doc/pdf_ban.modules.php b/htdocs/core/modules/bank/doc/pdf_ban.modules.php
index 1bbf2e14cc0..a87817cdc73 100644
--- a/htdocs/core/modules/bank/doc/pdf_ban.modules.php
+++ b/htdocs/core/modules/bank/doc/pdf_ban.modules.php
@@ -72,9 +72,9 @@ class pdf_ban extends ModeleBankAccountDoc
 		$this->marge_haute = isset($conf->global->MAIN_PDF_MARGIN_TOP) ? $conf->global->MAIN_PDF_MARGIN_TOP : 10;
 		$this->marge_basse = isset($conf->global->MAIN_PDF_MARGIN_BOTTOM) ? $conf->global->MAIN_PDF_MARGIN_BOTTOM : 10;
 
-		$this->option_logo = 1; // Affiche logo FAC_PDF_LOGO
-		$this->option_tva = 1; // Gere option tva FACTURE_TVAOPTION
-		$this->option_codeproduitservice = 1; // Affiche code produit-service
+		$this->option_logo = 1; // Display logo FAC_PDF_LOGO
+		$this->option_tva = 1; // Manage the vat option FACTURE_TVAOPTION
+		$this->option_codeproduitservice = 1; // Display product-service code
 
 		// Retrieves transmitter
 		$this->emetteur = $mysoc;

From e5f43cc67890430c43150fb42aaef8bb3ce14926 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 20 Jun 2021 11:03:28 +0200
Subject: [PATCH 0753/1497] internationalization

---
 htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php b/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
index f1ebc5bf64f..49e311f1c89 100644
--- a/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
+++ b/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
@@ -75,9 +75,9 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 		$this->marge_haute = isset($conf->global->MAIN_PDF_MARGIN_TOP) ? $conf->global->MAIN_PDF_MARGIN_TOP : 10;
 		$this->marge_basse = isset($conf->global->MAIN_PDF_MARGIN_BOTTOM) ? $conf->global->MAIN_PDF_MARGIN_BOTTOM : 10;
 
-		$this->option_logo = 1; // Affiche logo FAC_PDF_LOGO
-		$this->option_tva = 1; // Gere option tva FACTURE_TVAOPTION
-		$this->option_codeproduitservice = 1; // Affiche code produit-service
+		$this->option_logo = 1; // Display logo FAC_PDF_LOGO
+		$this->option_tva = 1; // Manage the vat option FACTURE_TVAOPTION
+		$this->option_codeproduitservice = 1; //Display product-service code
 
 		// Retrieves transmitter
 		$this->emetteur = $mysoc;

From f4199ca99ee4a14de5184e54ee06f089db318445 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 20 Jun 2021 11:06:04 +0200
Subject: [PATCH 0754/1497] internationalization

---
 .../doc/doc_generic_order_odt.modules.php        | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
index e7fe92ba9f9..239ec7639ec 100644
--- a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
+++ b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2012		Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2014		Marcos García		<marcosgdf@gmail.com>
  * Copyright (C) 2016		Charlie Benke		<charlie@patas-monkey.com>
- * Copyright (C) 2018-2019  Philippe Grand      <philippe.grand@atoo-net.com>
+ * Copyright (C) 2018-2021  Philippe Grand      <philippe.grand@atoo-net.com>
  * Copyright (C) 2018-2019  Frédéric France     <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -85,13 +85,13 @@ class doc_generic_order_odt extends ModelePDFCommandes
 		$this->marge_haute = 0;
 		$this->marge_basse = 0;
 
-		$this->option_logo = 1; // Affiche logo
-		$this->option_tva = 0; // Gere option tva COMMANDE_TVAOPTION
-		$this->option_modereg = 0; // Affiche mode reglement
-		$this->option_condreg = 0; // Affiche conditions reglement
-		$this->option_codeproduitservice = 0; // Affiche code produit-service
-		$this->option_multilang = 1; // Dispo en plusieurs langues
-		$this->option_escompte = 0; // Affiche si il y a eu escompte
+		$this->option_logo = 1; // Display logo
+		$this->option_tva = 0; // Manage the vat option COMMANDE_TVAOPTION
+		$this->option_modereg = 0; // Display payment mode
+		$this->option_condreg = 0; // Display payment terms
+		$this->option_codeproduitservice = 0; // Display product-service code
+		$this->option_multilang = 1; // Available in several languages
+		$this->option_escompte = 0; // Displays if there has been a discount
 		$this->option_credit_note = 0; // Support credit notes
 		$this->option_freetext = 1; // Support add of a personalised text
 		$this->option_draft_watermark = 0; // Support add of a watermark on drafts

From d3a9b03c89fd20870892b5b235d5746eb41c5502 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 20 Jun 2021 11:08:53 +0200
Subject: [PATCH 0755/1497] internationalization

---
 .../doc/doc_generic_contract_odt.modules.php       | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php b/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
index c8d1748124a..b1e441175d9 100644
--- a/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
+++ b/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
@@ -84,13 +84,13 @@ class doc_generic_contract_odt extends ModelePDFContract
 		$this->marge_haute = 0;
 		$this->marge_basse = 0;
 
-		$this->option_logo = 1; // Affiche logo
-		$this->option_tva = 0; // Gere option tva CONTRACT_TVAOPTION
-		$this->option_modereg = 0; // Affiche mode reglement
-		$this->option_condreg = 0; // Affiche conditions reglement
-		$this->option_codeproduitservice = 0; // Affiche code produit-service
-		$this->option_multilang = 1; // Dispo en plusieurs langues
-		$this->option_escompte = 0; // Affiche si il y a eu escompte
+		$this->option_logo = 1; // Display logo
+		$this->option_tva = 0; // Manage the vat CONTRACT_TVAOPTION
+		$this->option_modereg = 0; // Display payment mode
+		$this->option_condreg = 0; // Display payment terms
+		$this->option_codeproduitservice = 0; // Display product-service code
+		$this->option_multilang = 1; // Available in several languages
+		$this->option_escompte = 0; // Displays if there has been a discount
 		$this->option_credit_note = 0; // Support credit notes
 		$this->option_freetext = 1; // Support add of a personalised text
 		$this->option_draft_watermark = 0; // Support add of a watermark on drafts

From e2ef205036fe641326a0620557e18635a053071d Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 20 Jun 2021 11:11:41 +0200
Subject: [PATCH 0756/1497] internationalization

---
 .../doc/doc_generic_shipment_odt.modules.php     | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
index 2eaca54b697..8a2b6b2b121 100644
--- a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
+++ b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2012		Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2014		Marcos García		<marcosgdf@gmail.com>
  * Copyright (C) 2016		Charlie Benke		<charlie@patas-monkey.com>
- * Copyright (C) 2018-2019  Philippe Grand      <philippe.grand@atoo-net.com>
+ * Copyright (C) 2018-2021  Philippe Grand      <philippe.grand@atoo-net.com>
  * Copyright (C) 2018-2019  Frédéric France     <frederic.france@netlogic.fr>
  *
 * This program is free software; you can redistribute it and/or modify
@@ -86,13 +86,13 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 		$this->marge_haute = 0;
 		$this->marge_basse = 0;
 
-		$this->option_logo = 1; // Affiche logo
-		$this->option_tva = 0; // Gere option tva EXPEDITION_TVAOPTION
-		$this->option_modereg = 0; // Affiche mode reglement
-		$this->option_condreg = 0; // Affiche conditions reglement
-		$this->option_codeproduitservice = 0; // Affiche code produit-service
-		$this->option_multilang = 1; // Dispo en plusieurs langues
-		$this->option_escompte = 0; // Affiche si il y a eu escompte
+		$this->option_logo = 1; // Display logo
+		$this->option_tva = 0; // Manage the vat option EXPEDITION_TVAOPTION
+		$this->option_modereg = 0; // Display payment mode
+		$this->option_condreg = 0; // Display payment terms
+		$this->option_codeproduitservice = 0; // Display product-service code
+		$this->option_multilang = 1; // Available in several languages
+		$this->option_escompte = 0; // Displays if there has been a discount
 		$this->option_credit_note = 0; // Support credit notes
 		$this->option_freetext = 1; // Support add of a personalised text
 		$this->option_draft_watermark = 0; // Support add of a watermark on drafts

From 0d60323e4101df3d7861889069f8ca25d14038cf Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 20 Jun 2021 11:13:31 +0200
Subject: [PATCH 0757/1497] internationalization

---
 htdocs/core/modules/expedition/doc/pdf_espadon.modules.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
index 42999248026..aed43ea40ac 100644
--- a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
@@ -139,7 +139,7 @@ class pdf_espadon extends ModelePdfExpedition
 		$this->marge_haute = isset($conf->global->MAIN_PDF_MARGIN_TOP) ? $conf->global->MAIN_PDF_MARGIN_TOP : 10;
 		$this->marge_basse = isset($conf->global->MAIN_PDF_MARGIN_BOTTOM) ? $conf->global->MAIN_PDF_MARGIN_BOTTOM : 10;
 
-		$this->option_logo = 1;
+		$this->option_logo = 1; // Display logo
 
 		// Get source company
 		$this->emetteur = $mysoc;

From f8187eb70e86436bf671fba5cbdaf09a80e43b7e Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 20 Jun 2021 11:16:03 +0200
Subject: [PATCH 0758/1497] internationalization

---
 .../expensereport/doc/pdf_standard.modules.php   | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
index 1815321ab18..b1f48450d0d 100644
--- a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2015       Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2015       Alexandre Spangaro      <aspangaro@open-dsi.fr>
- * Copyright (C) 2016-2019  Philippe Grand          <philippe.grand@atoo-net.com>
+ * Copyright (C) 2016-2021  Philippe Grand          <philippe.grand@atoo-net.com>
  * Copyright (C) 2018-2020  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2018       Francis Appels          <francis.appels@z-application.com>
  * Copyright (C) 2019       Markus Welters          <markus@welters.de>
@@ -151,13 +151,13 @@ class pdf_standard extends ModeleExpenseReport
 		$this->marge_haute = isset($conf->global->MAIN_PDF_MARGIN_TOP) ? $conf->global->MAIN_PDF_MARGIN_TOP : 10;
 		$this->marge_basse = isset($conf->global->MAIN_PDF_MARGIN_BOTTOM) ? $conf->global->MAIN_PDF_MARGIN_BOTTOM : 10;
 
-		$this->option_logo = 1; // Affiche logo
-		$this->option_tva = 1; // Gere option tva FACTURE_TVAOPTION
-		$this->option_modereg = 1; // Affiche mode reglement
-		$this->option_condreg = 1; // Affiche conditions reglement
-		$this->option_codeproduitservice = 1; // Affiche code produit-service
-		$this->option_multilang = 1; // Dispo en plusieurs langues
-		$this->option_escompte = 0; // Affiche si il y a eu escompte
+		$this->option_logo = 1; // Display logo
+		$this->option_tva = 1; // Manage the vat option FACTURE_TVAOPTION
+		$this->option_modereg = 1; // Display payment mode
+		$this->option_condreg = 1; // Display payment terms
+		$this->option_codeproduitservice = 1; // Display product-service code
+		$this->option_multilang = 1; // Available in several languages
+		$this->option_escompte = 0; // Displays if there has been a discount
 		$this->option_credit_note = 0; // Support credit notes
 		$this->option_freetext = 1; // Support add of a personalised text
 		$this->option_draft_watermark = 1; // Support add of a watermark on drafts

From 5977fe23e72ca138e30e21fcdd026c4a1485ca78 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 20 Jun 2021 11:18:07 +0200
Subject: [PATCH 0759/1497] internationalization

---
 .../doc/doc_generic_invoice_odt.modules.php        | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
index 98269a0f019..0d360269d46 100644
--- a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
+++ b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
@@ -85,13 +85,13 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 		$this->marge_haute = 0;
 		$this->marge_basse = 0;
 
-		$this->option_logo = 1; // Affiche logo
-		$this->option_tva = 0; // Gere option tva FACTURE_TVAOPTION
-		$this->option_modereg = 0; // Affiche mode reglement
-		$this->option_condreg = 0; // Affiche conditions reglement
-		$this->option_codeproduitservice = 0; // Affiche code produit-service
-		$this->option_multilang = 1; // Dispo en plusieurs langues
-		$this->option_escompte = 0; // Affiche si il y a eu escompte
+		$this->option_logo = 1; // Display logo
+		$this->option_tva = 0; // Manage the vat option FACTURE_TVAOPTION
+		$this->option_modereg = 0; // Display payment mode
+		$this->option_condreg = 0; // Display payment terms
+		$this->option_codeproduitservice = 0; // Display product-service code
+		$this->option_multilang = 1; // Available in several languages
+		$this->option_escompte = 0; // Displays if there has been a discount
 		$this->option_credit_note = 0; // Support credit notes
 		$this->option_freetext = 1; // Support add of a personalised text
 		$this->option_draft_watermark = 0; // Support add of a watermark on drafts

From e5083d18af86f8610ae5ba114011dc990df46b22 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 20 Jun 2021 11:20:20 +0200
Subject: [PATCH 0760/1497] internationalization

---
 .../member/doc/doc_generic_member_odt.class.php    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/modules/member/doc/doc_generic_member_odt.class.php b/htdocs/core/modules/member/doc/doc_generic_member_odt.class.php
index 120efe93cf7..939c78f32e3 100644
--- a/htdocs/core/modules/member/doc/doc_generic_member_odt.class.php
+++ b/htdocs/core/modules/member/doc/doc_generic_member_odt.class.php
@@ -81,13 +81,13 @@ class doc_generic_member_odt extends ModelePDFMember
 		$this->marge_haute = 0;
 		$this->marge_basse = 0;
 
-		$this->option_logo = 1; // Affiche logo
-		$this->option_tva = 0; // Gere option tva MEMBER_TVAOPTION
-		$this->option_modereg = 0; // Affiche mode reglement
-		$this->option_condreg = 0; // Affiche conditions reglement
-		$this->option_codeproduitservice = 0; // Affiche code produit-service
-		$this->option_multilang = 1; // Dispo en plusieurs langues
-		$this->option_escompte = 0; // Affiche si il y a eu escompte
+		$this->option_logo = 1; // Display logo
+		$this->option_tva = 0; // Manage the vat option FACTURE_TVAOPTION
+		$this->option_modereg = 0; // Display payment mode
+		$this->option_condreg = 0; // Display payment terms
+		$this->option_codeproduitservice = 0; // Display product-service code
+		$this->option_multilang = 1; // Available in several languages
+		$this->option_escompte = 0; // Displays if there has been a discount
 		$this->option_credit_note = 0; // Support credit notes
 		$this->option_freetext = 1; // Support add of a personalised text
 		$this->option_draft_watermark = 0; // Support add of a watermark on drafts

From 9acbb984a1f9c54a45e5f93af0110f7565572264 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 20 Jun 2021 11:22:17 +0200
Subject: [PATCH 0761/1497] internationalization

---
 htdocs/core/modules/movement/doc/pdf_standard.modules.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/modules/movement/doc/pdf_standard.modules.php b/htdocs/core/modules/movement/doc/pdf_standard.modules.php
index 872890958ff..e029c4d5d66 100644
--- a/htdocs/core/modules/movement/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/movement/doc/pdf_standard.modules.php
@@ -137,12 +137,12 @@ class pdf_stdandard extends ModelePDFMovement
 		$this->marge_haute = isset($conf->global->MAIN_PDF_MARGIN_TOP) ? $conf->global->MAIN_PDF_MARGIN_TOP : 10;
 		$this->marge_basse = isset($conf->global->MAIN_PDF_MARGIN_BOTTOM) ? $conf->global->MAIN_PDF_MARGIN_BOTTOM : 10;
 
-		$this->option_logo = 1; // Affiche logo
-		$this->option_codestockservice = 0; // Affiche code stock-service
-		$this->option_multilang = 1; // Dispo en plusieurs langues
+		$this->option_logo = 1; // Display logo
+		$this->option_codestockservice = 0; // Display stock-service code
+		$this->option_multilang = 1; // Available in several languages
 		$this->option_freetext = 0; // Support add of a personalised text
 
-		// Recupere emetteur
+		// Get source company
 		$this->emetteur = $mysoc;
 		if (!$this->emetteur->country_code) {
 			$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined

From ddaa9ecfc1a5b85a336b97761bba6ce284bfe3a2 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 20 Jun 2021 11:24:36 +0200
Subject: [PATCH 0762/1497] internationalization

---
 .../mrp/doc/doc_generic_mo_odt.modules.php     | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php b/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
index ac920d69269..e93ecd1af0a 100644
--- a/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
+++ b/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2012		Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2014		Marcos García		<marcosgdf@gmail.com>
  * Copyright (C) 2016		Charlie Benke		<charlie@patas-monkey.com>
- * Copyright (C) 2018-2019  Philippe Grand      <philippe.grand@atoo-net.com>
+ * Copyright (C) 2018-2021  Philippe Grand      <philippe.grand@atoo-net.com>
  * Copyright (C) 2018       Frédéric France     <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -85,18 +85,18 @@ class doc_generic_mo_odt extends ModelePDFMo
 		$this->marge_haute = 0;
 		$this->marge_basse = 0;
 
-		$this->option_logo = 1; // Affiche logo
-		$this->option_tva = 0; // Gere option tva
-		$this->option_modereg = 0; // Affiche mode reglement
-		$this->option_condreg = 0; // Affiche conditions reglement
-		$this->option_codeproduitservice = 0; // Affiche code produit-service
-		$this->option_multilang = 1; // Dispo en plusieurs langues
-		$this->option_escompte = 0; // Affiche si il y a eu escompte
+		$this->option_logo = 1; // Display logo
+		$this->option_tva = 0; // Manage the vat option
+		$this->option_modereg = 0; // Display payment mode
+		$this->option_condreg = 0; // Display payment terms
+		$this->option_codeproduitservice = 0; // Display product-service code
+		$this->option_multilang = 1; // Available in several languages
+		$this->option_escompte = 0; // Displays if there has been a discount
 		$this->option_credit_note = 0; // Support credit notes
 		$this->option_freetext = 1; // Support add of a personalised text
 		$this->option_draft_watermark = 0; // Support add of a watermark on drafts
 
-		// Recupere emetteur
+		// Get source company
 		$this->emetteur = $mysoc;
 		if (!$this->emetteur->country_code) {
 			$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined

From 93512fd501c21180233b419e9d35265a9086947f Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 20 Jun 2021 11:26:25 +0200
Subject: [PATCH 0763/1497] internationalization

---
 .../doc/doc_generic_product_odt.modules.php      | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php b/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
index b2d45a7ab6e..1acf50dd95a 100644
--- a/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
+++ b/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
@@ -83,18 +83,18 @@ class doc_generic_product_odt extends ModelePDFProduct
 		$this->marge_haute = 0;
 		$this->marge_basse = 0;
 
-		$this->option_logo = 1; // Affiche logo
-		$this->option_tva = 0; // Gere option tva PRODUCT_TVAOPTION
-		$this->option_modereg = 0; // Affiche mode reglement
-		$this->option_condreg = 0; // Affiche conditions reglement
-		$this->option_codeproduitservice = 0; // Affiche code produit-service
-		$this->option_multilang = 1; // Dispo en plusieurs langues
-		$this->option_escompte = 0; // Affiche si il y a eu escompte
+		$this->option_logo = 1; // Display logo
+		$this->option_tva = 0; // Manage the vat option PRODUCT_TVAOPTION
+		$this->option_modereg = 0; // Display payment mode
+		$this->option_condreg = 0; // Display payment terms
+		$this->option_codeproduitservice = 0; // Display product-service code
+		$this->option_multilang = 1; // Available in several languages
+		$this->option_escompte = 0; // Displays if there has been a discount
 		$this->option_credit_note = 0; // Support credit notes
 		$this->option_freetext = 1; // Support add of a personalised text
 		$this->option_draft_watermark = 0; // Support add of a watermark on drafts
 
-		// Recupere emetteur
+		// Get source company
 		$this->emetteur = $mysoc;
 		if (!$this->emetteur->country_code) {
 			$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined

From 9ccc9d0d3d44dff8addf1244ee9fd4d125dabb3f Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 20 Jun 2021 11:27:49 +0200
Subject: [PATCH 0764/1497] internationalization

---
 htdocs/core/modules/product/doc/pdf_standard.modules.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/modules/product/doc/pdf_standard.modules.php b/htdocs/core/modules/product/doc/pdf_standard.modules.php
index 99b6ff69236..815fc4d1c66 100644
--- a/htdocs/core/modules/product/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/product/doc/pdf_standard.modules.php
@@ -137,12 +137,12 @@ class pdf_standard extends ModelePDFProduct
 		$this->marge_haute = isset($conf->global->MAIN_PDF_MARGIN_TOP) ? $conf->global->MAIN_PDF_MARGIN_TOP : 10;
 		$this->marge_basse = isset($conf->global->MAIN_PDF_MARGIN_BOTTOM) ? $conf->global->MAIN_PDF_MARGIN_BOTTOM : 10;
 
-		$this->option_logo = 1; // Affiche logo
-		$this->option_codeproduitservice = 0; // Affiche code produit-service
-		$this->option_multilang = 1; // Dispo en plusieurs langues
+		$this->option_logo = 1; // Display logo
+		$this->option_codeproduitservice = 0; // Display product-service code
+		$this->option_multilang = 1; // Available in several languages
 		$this->option_freetext = 0; // Support add of a personalised text
 
-		// Recupere emetteur
+		// Get source company
 		$this->emetteur = $mysoc;
 		if (!$this->emetteur->country_code) {
 			$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined

From 12079447618448e0956bcaa655f30f96808fd5b9 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 20 Jun 2021 11:29:47 +0200
Subject: [PATCH 0765/1497] internationalization

---
 .../doc/doc_generic_project_odt.modules.php      | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
index 52d56812d68..233180630b0 100644
--- a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
+++ b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
@@ -120,18 +120,18 @@ class doc_generic_project_odt extends ModelePDFProjects
 		$this->marge_haute = 0;
 		$this->marge_basse = 0;
 
-		$this->option_logo = 1; // Affiche logo
-		$this->option_tva = 0; // Gere option tva COMMANDE_TVAOPTION
-		$this->option_modereg = 0; // Affiche mode reglement
-		$this->option_condreg = 0; // Affiche conditions reglement
-		$this->option_codeproduitservice = 0; // Affiche code produit-service
-		$this->option_multilang = 1; // Dispo en plusieurs langues
-		$this->option_escompte = 0; // Affiche si il y a eu escompte
+		$this->option_logo = 1; // Display logo
+		$this->option_tva = 0; // Manage the vat option COMMANDE_TVAOPTION
+		$this->option_modereg = 0; // Display payment mode
+		$this->option_condreg = 0; // Display payment terms
+		$this->option_codeproduitservice = 0; // Display product-service code
+		$this->option_multilang = 1; // Available in several languages
+		$this->option_escompte = 0; // Displays if there has been a discount
 		$this->option_credit_note = 0; // Support credit notes
 		$this->option_freetext = 1; // Support add of a personalised text
 		$this->option_draft_watermark = 0; // Support add of a watermark on drafts
 
-		// Recupere emetteur
+		// Get source company
 		$this->emetteur = $mysoc;
 		if (!$this->emetteur->pays_code) {
 			$this->emetteur->pays_code = substr($langs->defaultlang, -2); // Par defaut, si n'etait pas defini

From 748c10c2f9722c9560745f0f2e2f6f5b5d4a7c11 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 20 Jun 2021 11:32:25 +0200
Subject: [PATCH 0766/1497] internationalization

---
 .../task/doc/doc_generic_task_odt.modules.php  | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
index 961dab003e1..566c7f07a2e 100644
--- a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
+++ b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
@@ -121,21 +121,21 @@ class doc_generic_task_odt extends ModelePDFTask
 		$this->marge_haute = 0;
 		$this->marge_basse = 0;
 
-		$this->option_logo = 1; // Affiche logo
-		$this->option_tva = 0; // Gere option tva COMMANDE_TVAOPTION
-		$this->option_modereg = 0; // Affiche mode reglement
-		$this->option_condreg = 0; // Affiche conditions reglement
-		$this->option_codeproduitservice = 0; // Affiche code produit-service
-		$this->option_multilang = 0; // Dispo en plusieurs langues
-		$this->option_escompte = 0; // Affiche si il y a eu escompte
+		$this->option_logo = 1; // Display logo
+		$this->option_tva = 0; // Manage the vat option COMMANDE_TVAOPTION
+		$this->option_modereg = 0; // Display payment mode
+		$this->option_condreg = 0; // Display payment terms
+		$this->option_codeproduitservice = 0; // Display product-service code
+		$this->option_multilang = 0; // Available in several languages
+		$this->option_escompte = 0; // Displays if there has been a discount
 		$this->option_credit_note = 0; // Support credit notes
 		$this->option_freetext = 1; // Support add of a personalised text
 		$this->option_draft_watermark = 0; // Support add of a watermark on drafts
 
-		// Recupere emetteur
+		// Get source company
 		$this->emetteur = $mysoc;
 		if (!$this->emetteur->pays_code) {
-			$this->emetteur->pays_code = substr($langs->defaultlang, -2); // Par defaut, si n'etait pas defini
+			$this->emetteur->pays_code = substr($langs->defaultlang, -2); // By default, if was not defined
 		}
 	}
 

From 14af45057cfb8f5796f9159b8908f70191520995 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 20 Jun 2021 11:35:37 +0200
Subject: [PATCH 0767/1497] internationalization

---
 .../doc/doc_generic_proposal_odt.modules.php     | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
index e892e9a7252..9c7e0af4df0 100644
--- a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
+++ b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
@@ -82,18 +82,18 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 		$this->marge_haute = 0;
 		$this->marge_basse = 0;
 
-		$this->option_logo = 1; // Affiche logo
-		$this->option_tva = 0; // Gere option tva PROPALE_TVAOPTION
-		$this->option_modereg = 0; // Affiche mode reglement
-		$this->option_condreg = 0; // Affiche conditions reglement
-		$this->option_codeproduitservice = 0; // Affiche code produit-service
-		$this->option_multilang = 1; // Dispo en plusieurs langues
-		$this->option_escompte = 0; // Affiche si il y a eu escompte
+		$this->option_logo = 1; // Display logo
+		$this->option_tva = 0; // Manage the vat option PROPALE_TVAOPTION
+		$this->option_modereg = 0; // Display payment mode
+		$this->option_condreg = 0; // Display payment terms
+		$this->option_codeproduitservice = 0; // Display product-service code
+		$this->option_multilang = 1; // Available in several languages
+		$this->option_escompte = 0; // Displays if there has been a discount
 		$this->option_credit_note = 0; // Support credit notes
 		$this->option_freetext = 1; // Support add of a personalised text
 		$this->option_draft_watermark = 0; // Support add of a watermark on drafts
 
-		// Recupere emetteur
+		// Get source company
 		$this->emetteur = $mysoc;
 		if (!$this->emetteur->country_code) {
 			$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined

From b07d2f257a9f00633ac65598e0f318279c15eeb6 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 20 Jun 2021 11:37:51 +0200
Subject: [PATCH 0768/1497] internationalization

---
 .../doc/doc_generic_reception_odt.modules.php    | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php b/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php
index a6701fe8bcd..93dbc4995b4 100644
--- a/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php
+++ b/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php
@@ -80,18 +80,18 @@ class doc_generic_reception_odt extends ModelePdfReception
 		$this->marge_haute = 0;
 		$this->marge_basse = 0;
 
-		$this->option_logo = 1; // Affiche logo
-		$this->option_tva = 0; // Gere option tva RECEPTION_TVAOPTION
-		$this->option_modereg = 0; // Affiche mode reglement
-		$this->option_condreg = 0; // Affiche conditions reglement
-		$this->option_codeproduitservice = 0; // Affiche code produit-service
-		$this->option_multilang = 1; // Dispo en plusieurs langues
-		$this->option_escompte = 0; // Affiche si il y a eu escompte
+		$this->option_logo = 1; // Display logo
+		$this->option_tva = 0; // Manage the vat option RECEPTION_TVAOPTION
+		$this->option_modereg = 0; // Display payment mode
+		$this->option_condreg = 0; // Display payment terms
+		$this->option_codeproduitservice = 0; // Display product-service code
+		$this->option_multilang = 1; // Available in several languages
+		$this->option_escompte = 0; // Displays if there has been a discount
 		$this->option_credit_note = 0; // Support credit notes
 		$this->option_freetext = 1; // Support add of a personalised text
 		$this->option_draft_watermark = 0; // Support add of a watermark on drafts
 
-		// Recupere emetteur
+		// Get source company
 		$this->emetteur = $mysoc;
 		if (!$this->emetteur->country_code) {
 			$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined

From 057e78d8c37a8eb2920a88cefd6977f583f35f04 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 20 Jun 2021 11:40:54 +0200
Subject: [PATCH 0769/1497] internationalization

---
 htdocs/core/modules/reception/doc/pdf_squille.modules.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/modules/reception/doc/pdf_squille.modules.php b/htdocs/core/modules/reception/doc/pdf_squille.modules.php
index 0e4474b6b8c..f7ba7a42842 100644
--- a/htdocs/core/modules/reception/doc/pdf_squille.modules.php
+++ b/htdocs/core/modules/reception/doc/pdf_squille.modules.php
@@ -32,7 +32,11 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
  */
 class pdf_squille extends ModelePdfReception
 {
-	public $emetteur; // Objet societe qui emet
+	/**
+	 * Issuer
+	 * @var Societe object that emits
+	 */
+	public $emetteur;
 
 
 	/**
@@ -58,7 +62,7 @@ class pdf_squille extends ModelePdfReception
 		$this->marge_haute = isset($conf->global->MAIN_PDF_MARGIN_TOP) ? $conf->global->MAIN_PDF_MARGIN_TOP : 10;
 		$this->marge_basse = isset($conf->global->MAIN_PDF_MARGIN_BOTTOM) ? $conf->global->MAIN_PDF_MARGIN_BOTTOM : 10;
 
-		$this->option_logo = 1;
+		$this->option_logo = 1; // Display logo
 
 		// Get source company
 		$this->emetteur = $mysoc;

From a4e63a1a26288292cd5bd0f3d6d126ad7b5fce99 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 20 Jun 2021 11:43:05 +0200
Subject: [PATCH 0770/1497] internationalization

---
 htdocs/core/modules/societe/doc/doc_generic_odt.modules.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
index 900c7e465df..fdafb22e96b 100644
--- a/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
+++ b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
@@ -76,12 +76,12 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 		$this->marge_haute = 0;
 		$this->marge_basse = 0;
 
-		$this->option_logo = 1; // Affiche logo
+		$this->option_logo = 1; // Display logo
 
 		// Retrieves transmitter
 		$this->emetteur = $mysoc;
 		if (!$this->emetteur->country_code) {
-			$this->emetteur->country_code = substr($langs->defaultlang, -2); // Par defaut, si n'etait pas defini
+			$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default, if was not defined
 		}
 	}
 

From d60d15883f3be08591971cff40c4687fc3dbcb0b Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 20 Jun 2021 11:46:22 +0200
Subject: [PATCH 0771/1497] internationalization

---
 .../stock/doc/doc_generic_stock_odt.modules.php  | 16 ++++++++--------
 .../modules/stock/doc/pdf_standard.modules.php   |  8 ++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php b/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
index ccd66610f55..5ca5019588a 100644
--- a/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
+++ b/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
@@ -82,18 +82,18 @@ class doc_generic_stock_odt extends ModelePDFStock
 		$this->marge_haute = 0;
 		$this->marge_basse = 0;
 
-		$this->option_logo = 1; // Affiche logo
-		$this->option_tva = 0; // Gere option tva STOCK_TVAOPTION
-		$this->option_modereg = 0; // Affiche mode reglement
-		$this->option_condreg = 0; // Affiche conditions reglement
-		$this->option_codeproduitservice = 0; // Affiche code produit-service
-		$this->option_multilang = 1; // Dispo en plusieurs langues
-		$this->option_escompte = 0; // Affiche si il y a eu escompte
+		$this->option_logo = 1; // Display logo
+		$this->option_tva = 0; // Manage the vat option STOCK_TVAOPTION
+		$this->option_modereg = 0; // Display payment mode
+		$this->option_condreg = 0; // Display payment terms
+		$this->option_codeproduitservice = 0; // Display product-service code
+		$this->option_multilang = 1; // Available in several languages
+		$this->option_escompte = 0; // Displays if there has been a discount
 		$this->option_credit_note = 0; // Support credit notes
 		$this->option_freetext = 1; // Support add of a personalised text
 		$this->option_draft_watermark = 0; // Support add of a watermark on drafts
 
-		// Recupere emetteur
+		// Get source company
 		$this->emetteur = $mysoc;
 		if (!$this->emetteur->country_code) {
 			$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
diff --git a/htdocs/core/modules/stock/doc/pdf_standard.modules.php b/htdocs/core/modules/stock/doc/pdf_standard.modules.php
index b0cc07dcb62..ebc109151d6 100644
--- a/htdocs/core/modules/stock/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/stock/doc/pdf_standard.modules.php
@@ -137,12 +137,12 @@ class pdf_standard extends ModelePDFStock
 		$this->marge_haute = isset($conf->global->MAIN_PDF_MARGIN_TOP) ? $conf->global->MAIN_PDF_MARGIN_TOP : 10;
 		$this->marge_basse = isset($conf->global->MAIN_PDF_MARGIN_BOTTOM) ? $conf->global->MAIN_PDF_MARGIN_BOTTOM : 10;
 
-		$this->option_logo = 1; // Affiche logo
-		$this->option_codestockservice = 0; // Affiche code stock-service
-		$this->option_multilang = 1; // Dispo en plusieurs langues
+		$this->option_logo = 1; // Display logo
+		$this->option_codestockservice = 0; // Display product-service code
+		$this->option_multilang = 1; // Available in several languages
 		$this->option_freetext = 0; // Support add of a personalised text
 
-		// Recupere emetteur
+		// Get source company
 		$this->emetteur = $mysoc;
 		if (!$this->emetteur->country_code) {
 			$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined

From c06fcd36fb33f699f39378ea13c4ab91224c2ec8 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 20 Jun 2021 11:48:30 +0200
Subject: [PATCH 0772/1497] internationalization

---
 .../doc/doc_generic_supplier_order_odt.modules.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php b/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
index 285ea50bebe..3a2775bef82 100644
--- a/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
@@ -86,13 +86,13 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 		$this->marge_haute = 0;
 		$this->marge_basse = 0;
 
-		$this->option_logo = 1; // Affiche logo
-		$this->option_tva = 0; // Gere option tva COMMANDE_TVAOPTION
-		$this->option_modereg = 0; // Affiche mode reglement
-		$this->option_condreg = 0; // Affiche conditions reglement
-		$this->option_codeproduitservice = 0; // Affiche code produit-service
-		$this->option_multilang = 1; // Dispo en plusieurs langues
-		$this->option_escompte = 0; // Affiche si il y a eu escompte
+		$this->option_logo = 1; // Display logo
+		$this->option_tva = 0; // Manage the vat option COMMANDE_TVAOPTION
+		$this->option_modereg = 0; // Display payment mode
+		$this->option_condreg = 0; // Display payment terms
+		$this->option_codeproduitservice = 0; // Display product-service code
+		$this->option_multilang = 1; // Available in several languages
+		$this->option_escompte = 0; // Displays if there has been a discount
 		$this->option_credit_note = 0; // Support credit notes
 		$this->option_freetext = 1; // Support add of a personalised text
 		$this->option_draft_watermark = 0; // Support add of a watermark on drafts

From e33db2876a0e8cad33500034a919bfa54748b58b Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 20 Jun 2021 11:51:02 +0200
Subject: [PATCH 0773/1497] internationalization

---
 .../doc_generic_supplier_proposal_odt.modules.php  | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php b/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
index ead5664c04a..717818448ec 100644
--- a/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
@@ -84,13 +84,13 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 		$this->marge_haute = 0;
 		$this->marge_basse = 0;
 
-		$this->option_logo = 1; // Affiche logo
-		$this->option_tva = 0; // Gere option tva PROPALE_TVAOPTION
-		$this->option_modereg = 0; // Affiche mode reglement
-		$this->option_condreg = 0; // Affiche conditions reglement
-		$this->option_codeproduitservice = 0; // Affiche code produit-service
-		$this->option_multilang = 1; // Dispo en plusieurs langues
-		$this->option_escompte = 0; // Affiche si il y a eu escompte
+		$this->option_logo = 1; // Display logo
+		$this->option_tva = 0; // Manage the vat option PROPALE_TVAOPTION
+		$this->option_modereg = 0; // Display payment mode
+		$this->option_condreg = 0; // Display payment terms
+		$this->option_codeproduitservice = 0; // Display product-service code
+		$this->option_multilang = 1; // Available in several languages
+		$this->option_escompte = 0; // Displays if there has been a discount
 		$this->option_credit_note = 0; // Support credit notes
 		$this->option_freetext = 1; // Support add of a personalised text
 		$this->option_draft_watermark = 0; // Support add of a watermark on drafts

From 1480123f7d2418a814192ec953d07adadc33043b Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 20 Jun 2021 11:53:21 +0200
Subject: [PATCH 0774/1497] internationalization

---
 .../supplier_proposal/doc/pdf_aurore.modules.php   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
index cbcec7cfdd9..5bd9b8cf339 100644
--- a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
@@ -145,13 +145,13 @@ class pdf_aurore extends ModelePDFSupplierProposal
 		$this->marge_haute = isset($conf->global->MAIN_PDF_MARGIN_TOP) ? $conf->global->MAIN_PDF_MARGIN_TOP : 10;
 		$this->marge_basse = isset($conf->global->MAIN_PDF_MARGIN_BOTTOM) ? $conf->global->MAIN_PDF_MARGIN_BOTTOM : 10;
 
-		$this->option_logo = 1; // Affiche logo
-		$this->option_tva = 1; // Gere option tva FACTURE_TVAOPTION
-		$this->option_modereg = 1; // Affiche mode reglement
-		$this->option_condreg = 1; // Affiche conditions reglement
-		$this->option_codeproduitservice = 1; // Affiche code produit-service
-		$this->option_multilang = 1; // Dispo en plusieurs langues
-		$this->option_escompte = 1; // Affiche si il y a eu escompte
+		$this->option_logo = 1; // Display logo
+		$this->option_tva = 1; // Manage the vat option FACTURE_TVAOPTION
+		$this->option_modereg = 1; // Display payment mode
+		$this->option_condreg = 1; // Display payment terms
+		$this->option_codeproduitservice = 1; // Display product-service code
+		$this->option_multilang = 1; // Available in several languages
+		$this->option_escompte = 1; // Displays if there has been a discount
 		$this->option_credit_note = 1; // Support credit notes
 		$this->option_freetext = 1; // Support add of a personalised text
 		$this->option_draft_watermark = 1; //Support add of a watermark on drafts

From dbee213db195d1137364164602f98a37ae8330cb Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 20 Jun 2021 11:54:51 +0200
Subject: [PATCH 0775/1497] internationalization

---
 .../modules/ticket/doc/doc_generic_ticket_odt.modules.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/modules/ticket/doc/doc_generic_ticket_odt.modules.php b/htdocs/core/modules/ticket/doc/doc_generic_ticket_odt.modules.php
index 1bb48b82b42..2e6172d4181 100644
--- a/htdocs/core/modules/ticket/doc/doc_generic_ticket_odt.modules.php
+++ b/htdocs/core/modules/ticket/doc/doc_generic_ticket_odt.modules.php
@@ -81,13 +81,13 @@ class doc_generic_ticket_odt extends ModelePDFTicket
 		$this->marge_haute = 0;
 		$this->marge_basse = 0;
 
-		$this->option_logo = 1; // Affiche logo
-		$this->option_tva = 0; // Gere option tva USER_TVAOPTION
-		$this->option_multilang = 1; // Dispo en plusieurs langues
+		$this->option_logo = 1; // Display logo
+		$this->option_tva = 0; // Manage the vat option USER_TVAOPTION
+		$this->option_multilang = 1; // Available in several languages
 		$this->option_freetext = 0; // Support add of a personalised text
 		$this->option_draft_watermark = 0; // Support add of a watermark on drafts
 
-		// Recupere emetteur
+		// Get source company
 		$this->emetteur = $mysoc;
 		if (!$this->emetteur->country_code) {
 			$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined

From fb13d74467ef522a6b8d84ae4b346d4681349b57 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 20 Jun 2021 11:56:49 +0200
Subject: [PATCH 0776/1497] internationalization

---
 .../user/doc/doc_generic_user_odt.modules.php    | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php b/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
index 80bbd0f2905..b0d98a525df 100644
--- a/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
+++ b/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
@@ -81,18 +81,18 @@ class doc_generic_user_odt extends ModelePDFUser
 		$this->marge_haute = 0;
 		$this->marge_basse = 0;
 
-		$this->option_logo = 1; // Affiche logo
-		$this->option_tva = 0; // Gere option tva USER_TVAOPTION
-		$this->option_modereg = 0; // Affiche mode reglement
-		$this->option_condreg = 0; // Affiche conditions reglement
-		$this->option_codeproduitservice = 0; // Affiche code produit-service
-		$this->option_multilang = 1; // Dispo en plusieurs langues
-		$this->option_escompte = 0; // Affiche si il y a eu escompte
+		$this->option_logo = 1; // Display logo
+		$this->option_tva = 0; // Manage the vat option USER_TVAOPTION
+		$this->option_modereg = 0; // Display payment mode
+		$this->option_condreg = 0; // Display payment terms
+		$this->option_codeproduitservice = 0; // Display product-service code
+		$this->option_multilang = 1; // Available in several languages
+		$this->option_escompte = 0; // Displays if there has been a discount
 		$this->option_credit_note = 0; // Support credit notes
 		$this->option_freetext = 1; // Support add of a personalised text
 		$this->option_draft_watermark = 0; // Support add of a watermark on drafts
 
-		// Recupere emetteur
+		// Get source company
 		$this->emetteur = $mysoc;
 		if (!$this->emetteur->country_code) {
 			$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined

From ae293d61c6ad63ece0d8f181b6160b5ba70bd541 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 20 Jun 2021 11:59:02 +0200
Subject: [PATCH 0777/1497] internationalization

---
 .../doc/doc_generic_usergroup_odt.modules.php    | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php b/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
index 9ea1a27f045..5a1bca6377d 100644
--- a/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
+++ b/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
@@ -84,18 +84,18 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 		$this->marge_haute = 0;
 		$this->marge_basse = 0;
 
-		$this->option_logo = 1; // Affiche logo
-		$this->option_tva = 0; // Gere option tva USERGROUP_TVAOPTION
-		$this->option_modereg = 0; // Affiche mode reglement
-		$this->option_condreg = 0; // Affiche conditions reglement
-		$this->option_codeproduitservice = 0; // Affiche code produit-service
-		$this->option_multilang = 1; // Dispo en plusieurs langues
-		$this->option_escompte = 0; // Affiche si il y a eu escompte
+		$this->option_logo = 1; // Display logo
+		$this->option_tva = 0; // Manage the vat option USERGROUP_TVAOPTION
+		$this->option_modereg = 0; // Display payment mode
+		$this->option_condreg = 0; // Display payment terms
+		$this->option_codeproduitservice = 0; // Display product-service code
+		$this->option_multilang = 1; // Available in several languages
+		$this->option_escompte = 0; // Displays if there has been a discount
 		$this->option_credit_note = 0; // Support credit notes
 		$this->option_freetext = 1; // Support add of a personalised text
 		$this->option_draft_watermark = 0; // Support add of a watermark on drafts
 
-		// Recupere emetteur
+		// Get source company
 		$this->emetteur = $mysoc;
 		if (!$this->emetteur->country_code) {
 			$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined

From 5bde0dbc16f59b95cda7ffbf681109c20e5d2072 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 20 Jun 2021 12:00:27 +0200
Subject: [PATCH 0778/1497] internationalization

---
 .../modules/mymodule/doc/doc_generic_myobject_odt.modules.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php b/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
index b7ea52d939d..f3228915592 100644
--- a/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
+++ b/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2012		Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2014		Marcos García		<marcosgdf@gmail.com>
  * Copyright (C) 2016		Charlie Benke		<charlie@patas-monkey.com>
- * Copyright (C) 2018-2019  Philippe Grand      <philippe.grand@atoo-net.com>
+ * Copyright (C) 2018-2021  Philippe Grand      <philippe.grand@atoo-net.com>
  * Copyright (C) 2018       Frédéric France     <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -96,7 +96,7 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 		$this->option_freetext = 1; // Support add of a personalised text
 		$this->option_draft_watermark = 0; // Support add of a watermark on drafts
 
-		// Recupere emetteur
+		// Get source company
 		$this->emetteur = $mysoc;
 		if (!$this->emetteur->country_code) {
 			$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined

From ebe7b696a6614ac321fbf9f747f4c9466fc5fad9 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 20 Jun 2021 12:02:52 +0200
Subject: [PATCH 0779/1497] internationalization

---
 ...eric_recruitmentjobposition_odt.modules.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php b/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php
index 47867e40c5f..06b24ec8b65 100644
--- a/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php
+++ b/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2012		Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2014		Marcos García		<marcosgdf@gmail.com>
  * Copyright (C) 2016		Charlie Benke		<charlie@patas-monkey.com>
- * Copyright (C) 2018-2019  Philippe Grand      <philippe.grand@atoo-net.com>
+ * Copyright (C) 2018-2021  Philippe Grand      <philippe.grand@atoo-net.com>
  * Copyright (C) 2018       Frédéric France     <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -85,18 +85,18 @@ class doc_generic_recruitmentjobposition_odt extends ModelePDFRecruitmentJobPosi
 		$this->marge_haute = 0;
 		$this->marge_basse = 0;
 
-		$this->option_logo = 1; // Affiche logo
-		$this->option_tva = 0; // Gere option tva COMMANDE_TVAOPTION
-		$this->option_modereg = 0; // Affiche mode reglement
-		$this->option_condreg = 0; // Affiche conditions reglement
-		$this->option_codeproduitservice = 0; // Affiche code produit-service
-		$this->option_multilang = 1; // Dispo en plusieurs langues
-		$this->option_escompte = 0; // Affiche si il y a eu escompte
+		$this->option_logo = 1; // Display logo
+		$this->option_tva = 0; // Manage the vat option COMMANDE_TVAOPTION
+		$this->option_modereg = 0; // Display payment mode
+		$this->option_condreg = 0; // Display payment terms
+		$this->option_codeproduitservice = 0; // Display product-service code
+		$this->option_multilang = 1; // Available in several languages
+		$this->option_escompte = 0; // Displays if there has been a discount
 		$this->option_credit_note = 0; // Support credit notes
 		$this->option_freetext = 1; // Support add of a personalised text
 		$this->option_draft_watermark = 0; // Support add of a watermark on drafts
 
-		// Recupere emetteur
+		// Get source company
 		$this->emetteur = $mysoc;
 		if (!$this->emetteur->country_code) {
 			$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined

From a9dd5e87641739f23603d9531e0885dd9f7760b3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 20 Jun 2021 12:52:04 +0200
Subject: [PATCH 0780/1497] Fix css hidoneprint

---
 htdocs/core/class/html.formother.class.php | 2 +-
 htdocs/theme/eldy/global.inc.php           | 2 +-
 htdocs/theme/md/style.css.php              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index 46858191c7b..d352b996ef2 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -1177,7 +1177,7 @@ class FormOther
 			$selectboxlist .= '<input type="hidden" name="userid" value="'.$user->id.'">';
 			$selectboxlist .= '<input type="hidden" name="areacode" value="'.$areacode.'">';
 			$selectboxlist .= '<input type="hidden" name="boxorder" value="'.$boxorder.'">';
-			$selectboxlist .= Form::selectarray('boxcombo', $arrayboxtoactivatelabel, -1, $langs->trans("ChooseBoxToAdd").'...', 0, 0, '', 0, 0, 0, 'ASC', 'maxwidth150onsmartphone', 0, 'hidden selected', 0, 1);
+			$selectboxlist .= Form::selectarray('boxcombo', $arrayboxtoactivatelabel, -1, $langs->trans("ChooseBoxToAdd").'...', 0, 0, '', 0, 0, 0, 'ASC', 'maxwidth150onsmartphone hideonprint', 0, 'hidden selected', 0, 1);
 			if (empty($conf->use_javascript_ajax)) {
 				$selectboxlist .= ' <input type="submit" class="button" value="'.$langs->trans("AddBox").'">';
 			}
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index e039779c96d..d223a70fbc9 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -1652,7 +1652,7 @@ table.tableforfield tr>td:first-of-type, tr.trforfield>td:first-of-type, div.tab
 }
 
 <?php if (GETPOST('optioncss', 'aZ09') == 'print') { ?>
-.hideonprint { display: none; }
+.hideonprint { display: none !important; }
 <?php } ?>
 
 
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 2c91aa0299b..5027c1501e9 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1668,7 +1668,7 @@ table.tableforfield tr>td:first-of-type, tr.trforfield>td:first-of-type, div.tab
 }
 
 <?php if (GETPOST('optioncss', 'aZ09') == 'print') { ?>
-.hideonprint { display: none; }
+.hideonprint { display: none !important; }
 <?php } ?>
 
 

From 831cc4f4b71b7f8849d08a6318aa7261d4856083 Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Sun, 20 Jun 2021 14:19:05 +0200
Subject: [PATCH 0781/1497] Fix 17986 error on comparing integer and string in
 strict sql

---
 htdocs/adherents/class/adherentstats.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/adherents/class/adherentstats.class.php b/htdocs/adherents/class/adherentstats.class.php
index 62d0e03e27e..e042331b9eb 100644
--- a/htdocs/adherents/class/adherentstats.class.php
+++ b/htdocs/adherents/class/adherentstats.class.php
@@ -92,7 +92,7 @@ class AdherentStats extends Stats
 		$sql = "SELECT date_format(p.dateadh,'%m') as dm, count(*)";
 		$sql .= " FROM ".$this->from;
 		//if (!$user->rights->societe->client->voir && !$user->socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-		$sql .= " WHERE date_format(p.dateadh,'%Y') = ".((int) $year);
+		$sql .= " WHERE date_format(p.dateadh,'%Y') = '".((int) $year)."'";
 		$sql .= " AND ".$this->where;
 		$sql .= " GROUP BY dm";
 		$sql .= $this->db->order('dm', 'DESC');
@@ -133,7 +133,7 @@ class AdherentStats extends Stats
 		$sql = "SELECT date_format(p.dateadh,'%m') as dm, sum(p.".$this->field.")";
 		$sql .= " FROM ".$this->from;
 		//if (!$user->rights->societe->client->voir && !$user->socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-		$sql .= " WHERE date_format(p.dateadh,'%Y') = ".((int) $year);
+		$sql .= " WHERE date_format(p.dateadh,'%Y') = '".((int) $year)."'";
 		$sql .= " AND ".$this->where;
 		$sql .= " GROUP BY dm";
 		$sql .= $this->db->order('dm', 'DESC');
@@ -154,7 +154,7 @@ class AdherentStats extends Stats
 		$sql = "SELECT date_format(p.dateadh,'%m') as dm, avg(p.".$this->field.")";
 		$sql .= " FROM ".$this->from;
 		//if (!$user->rights->societe->client->voir && !$this->socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-		$sql .= " WHERE date_format(p.dateadh,'%Y') = ".((int) $year);
+		$sql .= " WHERE date_format(p.dateadh,'%Y') = '".((int) $year)."'";
 		$sql .= " AND ".$this->where;
 		$sql .= " GROUP BY dm";
 		$sql .= $this->db->order('dm', 'DESC');

From a54a955a652515a933ab14a0bbf118a96350583e Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Sun, 20 Jun 2021 15:40:32 +0200
Subject: [PATCH 0782/1497] Use year() instead of date_format

---
 htdocs/adherents/class/adherentstats.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/adherents/class/adherentstats.class.php b/htdocs/adherents/class/adherentstats.class.php
index e042331b9eb..ea106e4b4c5 100644
--- a/htdocs/adherents/class/adherentstats.class.php
+++ b/htdocs/adherents/class/adherentstats.class.php
@@ -92,7 +92,7 @@ class AdherentStats extends Stats
 		$sql = "SELECT date_format(p.dateadh,'%m') as dm, count(*)";
 		$sql .= " FROM ".$this->from;
 		//if (!$user->rights->societe->client->voir && !$user->socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-		$sql .= " WHERE date_format(p.dateadh,'%Y') = '".((int) $year)."'";
+		$sql .= " WHERE YEAR(p.dateadh) = ".((int) $year);
 		$sql .= " AND ".$this->where;
 		$sql .= " GROUP BY dm";
 		$sql .= $this->db->order('dm', 'DESC');
@@ -133,7 +133,7 @@ class AdherentStats extends Stats
 		$sql = "SELECT date_format(p.dateadh,'%m') as dm, sum(p.".$this->field.")";
 		$sql .= " FROM ".$this->from;
 		//if (!$user->rights->societe->client->voir && !$user->socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-		$sql .= " WHERE date_format(p.dateadh,'%Y') = '".((int) $year)."'";
+		$sql .= " WHERE YEAR(p.dateadh) = ".((int) $year);
 		$sql .= " AND ".$this->where;
 		$sql .= " GROUP BY dm";
 		$sql .= $this->db->order('dm', 'DESC');
@@ -154,7 +154,7 @@ class AdherentStats extends Stats
 		$sql = "SELECT date_format(p.dateadh,'%m') as dm, avg(p.".$this->field.")";
 		$sql .= " FROM ".$this->from;
 		//if (!$user->rights->societe->client->voir && !$this->socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-		$sql .= " WHERE date_format(p.dateadh,'%Y') = '".((int) $year)."'";
+		$sql .= " WHERE YEAR(p.dateadh) = ".((int) $year);
 		$sql .= " AND ".$this->where;
 		$sql .= " GROUP BY dm";
 		$sql .= $this->db->order('dm', 'DESC');

From 4739694ad7dc4e00df1410c00251d99bba4d1de9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 20 Jun 2021 16:24:58 +0200
Subject: [PATCH 0783/1497] fix php warning

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

diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 04b104ff0f1..831b0f50f04 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -870,7 +870,7 @@ class FormFile
 
 					// Show share link
 					$out .= '<td class="nowrap">';
-					if ($file['share']) {
+					if (!empty($file['share'])) {
 						// 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

From 4e7af173a64d0efc4ac0301527a84729cc3d4777 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 20 Jun 2021 16:33:41 +0200
Subject: [PATCH 0784/1497] fix php warnings

---
 htdocs/societe/project.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/societe/project.php b/htdocs/societe/project.php
index d2ad361034f..1bf43864cdd 100644
--- a/htdocs/societe/project.php
+++ b/htdocs/societe/project.php
@@ -6,6 +6,7 @@
  * Copyright (C) 2007      Patrick Raguin  		<patrick.raguin@gmail.com>
  * Copyright (C) 2010      Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2015      Marcos García        <marcosgdf@gmail.com>
+ * Copyright (C) 2021		Frédéric France		<frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -129,8 +130,8 @@ if ($socid) {
 	print dol_get_fiche_end();
 
 	$params = '';
-
-	$newcardbutton .= dolGetButtonTitle($langs->trans("NewProject"), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/projet/card.php?action=create&socid='.$object->id.'&amp;backtopage='.urlencode($backtopage), '', 1, $params);
+	$backtopage = $_SERVER['PHP_SELF'].'?socid='.$object->id;
+	$newcardbutton = dolGetButtonTitle($langs->trans("NewProject"), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/projet/card.php?action=create&socid='.$object->id.'&amp;backtopage='.urlencode($backtopage), '', 1, $params);
 
 	print '<br>';
 

From 68b8a6a916650dd90028d6345579ad66581947fe Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 20 Jun 2021 16:35:49 +0200
Subject: [PATCH 0785/1497] css

---
 htdocs/compta/paiement/card.php         | 2 +-
 htdocs/core/boxes/box_clients.php       | 2 +-
 htdocs/core/boxes/box_ficheinter.php    | 2 +-
 htdocs/core/boxes/box_goodcustomers.php | 2 +-
 htdocs/core/boxes/box_prospect.php      | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/compta/paiement/card.php b/htdocs/compta/paiement/card.php
index c971ccbf4fd..2b65ad4a84a 100644
--- a/htdocs/compta/paiement/card.php
+++ b/htdocs/compta/paiement/card.php
@@ -392,7 +392,7 @@ if ($resql) {
 			print "</td>\n";
 
 			// Third party
-			print '<td>';
+			print '<td class="tdoverflowmax150">';
 			print $thirdpartystatic->getNomUrl(1);
 			print '</td>';
 
diff --git a/htdocs/core/boxes/box_clients.php b/htdocs/core/boxes/box_clients.php
index df56b510823..3c83d7521f2 100644
--- a/htdocs/core/boxes/box_clients.php
+++ b/htdocs/core/boxes/box_clients.php
@@ -128,7 +128,7 @@ class box_clients extends ModeleBoxes
 					$thirdpartystatic->entity = $objp->entity;
 
 					$this->info_box_contents[$line][] = array(
-						'td' => '',
+						'td' => 'class="tdoverflowmax150"',
 						'text' => $thirdpartystatic->getNomUrl(1),
 						'asis' => 1,
 					);
diff --git a/htdocs/core/boxes/box_ficheinter.php b/htdocs/core/boxes/box_ficheinter.php
index edf4daa5191..7179be0cfbb 100644
--- a/htdocs/core/boxes/box_ficheinter.php
+++ b/htdocs/core/boxes/box_ficheinter.php
@@ -138,7 +138,7 @@ class box_ficheinter extends ModeleBoxes
 					);
 
 					$this->info_box_contents[$i][] = array(
-						'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
+						'td' => 'class="tdoverflowmax150"',
 						'text' => $thirdpartystatic->getNomUrl(1),
 						'asis' => 1,
 					);
diff --git a/htdocs/core/boxes/box_goodcustomers.php b/htdocs/core/boxes/box_goodcustomers.php
index aef7cdc9f3d..ab425ceac87 100644
--- a/htdocs/core/boxes/box_goodcustomers.php
+++ b/htdocs/core/boxes/box_goodcustomers.php
@@ -120,7 +120,7 @@ class box_goodcustomers extends ModeleBoxes
 					$nbimpaye = $objp->nbfact - $objp->nbfactpaye;
 
 					$this->info_box_contents[$line][] = array(
-						'td' => '',
+						'td' => 'class="tdoverflowmax150"',
 						'text' => $thirdpartystatic->getNomUrl(1),
 						'asis' => 1,
 					);
diff --git a/htdocs/core/boxes/box_prospect.php b/htdocs/core/boxes/box_prospect.php
index a8959202082..7489cc997ea 100644
--- a/htdocs/core/boxes/box_prospect.php
+++ b/htdocs/core/boxes/box_prospect.php
@@ -129,7 +129,7 @@ class box_prospect extends ModeleBoxes
 					$thirdpartystatic->entity = $objp->entity;
 
 					$this->info_box_contents[$line][] = array(
-						'td' => '',
+						'td' => 'class="tdoverflowmax150"',
 						'text' => $thirdpartystatic->getNomUrl(1),
 						'asis' => 1,
 					);

From 5ad999e46de0dc5c0a2498391f691ccb27517d17 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 20 Jun 2021 16:39:30 +0200
Subject: [PATCH 0786/1497] css

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

diff --git a/htdocs/core/boxes/box_actions.php b/htdocs/core/boxes/box_actions.php
index 45c9d580ad2..121137fd1a6 100644
--- a/htdocs/core/boxes/box_actions.php
+++ b/htdocs/core/boxes/box_actions.php
@@ -148,14 +148,14 @@ class box_actions extends ModeleBoxes
 					$label = empty($objp->label) ? $objp->type_label : $objp->label;
 
 					$this->info_box_contents[$line][0] = array(
-						'td' => '',
+						'td' => 'class="tdoverflowmax200"',
 						'text' => $actionstatic->getNomUrl(1),
 						'text2'=> $late,
 						'asis' => 1
 					);
 
 					$this->info_box_contents[$line][1] = array(
-						'td' => '',
+						'td' => 'class="tdoverflowmax100"',
 						'text' => ($societestatic->id > 0 ? $societestatic->getNomUrl(1) : ''),
 						'asis' => 1
 					);

From f486595e13ef66dd16994d60f3dd5199b35d10c9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 20 Jun 2021 16:55:22 +0200
Subject: [PATCH 0787/1497] Fix dolSqlDateFilter

---
 htdocs/core/lib/date.lib.php | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php
index 0dde3a93159..864fea050a0 100644
--- a/htdocs/core/lib/date.lib.php
+++ b/htdocs/core/lib/date.lib.php
@@ -294,32 +294,35 @@ function convertSecondToTime($iSecond, $format = 'all', $lengthOfDay = 86400, $l
 
 
 /**
- * Generate a SQL string to make a filter into a range (for second of date until last second of date)
+ * Generate a SQL string to make a filter into a range (for second of date until last second of date).
+ * This method allows to maje SQL request that will deal correctly the timezone of server.
  *
  * @param      string	$datefield			Name of SQL field where apply sql date filter
  * @param      int		$day_date			Day date
  * @param      int		$month_date			Month date
  * @param      int		$year_date			Year date
  * @param	   int      $excludefirstand	Exclude first and
+ * @param	   mixed	$gm					False or 0 or 'tzserver' = Return date to compare with server TZ,
  * @return     string	$sqldate			String with SQL filter
  */
-function dolSqlDateFilter($datefield, $day_date, $month_date, $year_date, $excludefirstand = 0)
+function dolSqlDateFilter($datefield, $day_date, $month_date, $year_date, $excludefirstand = 0, $gm = false)
 {
 	global $db;
 	$sqldate = "";
 	if ($month_date > 0) {
 		if ($year_date > 0 && empty($day_date)) {
-			$sqldate .= ($excludefirstand ? "" : " AND ").$datefield." BETWEEN '".$db->idate(dol_get_first_day($year_date, $month_date, false));
-			$sqldate .= "' AND '".$db->idate(dol_get_last_day($year_date, $month_date, false))."'";
+			$sqldate .= ($excludefirstand ? "" : " AND ").$datefield." BETWEEN '".$db->idate(dol_get_first_day($year_date, $month_date, $gm));
+			$sqldate .= "' AND '".$db->idate(dol_get_last_day($year_date, $month_date, $gm))."'";
 		} elseif ($year_date > 0 && !empty($day_date)) {
-			$sqldate .= ($excludefirstand ? "" : " AND ").$datefield." BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month_date, $day_date, $year_date));
-			$sqldate .= "' AND '".$db->idate(dol_mktime(23, 59, 59, $month_date, $day_date, $year_date))."'";
+			$sqldate .= ($excludefirstand ? "" : " AND ").$datefield." BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month_date, $day_date, $year_date, $gm));
+			$sqldate .= "' AND '".$db->idate(dol_mktime(23, 59, 59, $month_date, $day_date, $year_date, $gm))."'";
 		} else {
+			// This case is not reliable on TZ, but we should not need it.
 			$sqldate .= ($excludefirstand ? "" : " AND ")." date_format( ".$datefield.", '%c') = '".$db->escape($month_date)."'";
 		}
 	} elseif ($year_date > 0) {
-		$sqldate .= ($excludefirstand ? "" : " AND ").$datefield." BETWEEN '".$db->idate(dol_get_first_day($year_date, 1, false));
-		$sqldate .= "' AND '".$db->idate(dol_get_last_day($year_date, 12, false))."'";
+		$sqldate .= ($excludefirstand ? "" : " AND ").$datefield." BETWEEN '".$db->idate(dol_get_first_day($year_date, 1, $gm));
+		$sqldate .= "' AND '".$db->idate(dol_get_last_day($year_date, 12, $gm))."'";
 	}
 	return $sqldate;
 }

From c820193d11b6e7d775659913eba638d2d68f2a25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 20 Jun 2021 17:01:41 +0200
Subject: [PATCH 0788/1497] remove not used var and fix php warnings

---
 htdocs/admin/agenda_extsites.php | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/htdocs/admin/agenda_extsites.php b/htdocs/admin/agenda_extsites.php
index 9ce55583d99..272da835741 100644
--- a/htdocs/admin/agenda_extsites.php
+++ b/htdocs/admin/agenda_extsites.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2011-2015	Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2015       Jean-François Ferry		<jfefe@aternatik.fr>
  * Copyright (C) 2016       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
+ * Copyright (C) 2021		Frédéric France			<frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -158,14 +159,6 @@ print dol_get_fiche_head($head, 'extsites', $langs->trans("Agenda"), -1, 'action
 print '<span class="opacitymedium">'.$langs->trans("AgendaExtSitesDesc")."</span><br>\n";
 print "<br>\n";
 
-
-$selectedvalue = $conf->global->AGENDA_DISABLE_EXT;
-if ($selectedvalue == 1) {
-	$selectedvalue = 0;
-} else {
-	$selectedvalue = 1;
-}
-
 print "<table class=\"noborder\" width=\"100%\">";
 
 print "<tr class=\"liste_titre\">";
@@ -226,15 +219,15 @@ while ($i <= $MAXAGENDA) {
 	// Nb
 	print '<td width="180" class="nowrap">'.$langs->trans("AgendaExtNb", $key)."</td>";
 	// Name
-	print '<td><input type="text" class="flat hideifnotset" name="AGENDA_EXT_NAME'.$key.'" value="'.(GETPOST('AGENDA_EXT_NAME'.$key) ?GETPOST('AGENDA_EXT_NAME'.$key, 'alpha') : $conf->global->$name).'" size="28"></td>';
+	print '<td><input type="text" class="flat hideifnotset" name="AGENDA_EXT_NAME'.$key.'" value="'.(GETPOST('AGENDA_EXT_NAME'.$key) ?GETPOST('AGENDA_EXT_NAME'.$key, 'alpha') : getDolGlobalString($name)).'" size="28"></td>';
 	// URL
-	print '<td><input type="url" class="flat hideifnotset" name="AGENDA_EXT_SRC'.$key.'" value="'.(GETPOST('AGENDA_EXT_SRC'.$key) ?GETPOST('AGENDA_EXT_SRC'.$key, 'alpha') : $conf->global->$src).'" size="60"></td>';
+	print '<td><input type="url" class="flat hideifnotset" name="AGENDA_EXT_SRC'.$key.'" value="'.(GETPOST('AGENDA_EXT_SRC'.$key) ?GETPOST('AGENDA_EXT_SRC'.$key, 'alpha') : getDolGlobalString($src)).'" size="60"></td>';
 	// Offset TZ
-	print '<td><input type="text" class="flat hideifnotset" name="AGENDA_EXT_OFFSETTZ'.$key.'" value="'.(GETPOST('AGENDA_EXT_OFFSETTZ'.$key) ?GETPOST('AGENDA_EXT_OFFSETTZ'.$key) : $conf->global->$offsettz).'" size="2"></td>';
+	print '<td><input type="text" class="flat hideifnotset" name="AGENDA_EXT_OFFSETTZ'.$key.'" value="'.(GETPOST('AGENDA_EXT_OFFSETTZ'.$key) ? GETPOST('AGENDA_EXT_OFFSETTZ'.$key) : getDolGlobalString($offsettz)).'" size="2"></td>';
 	// Color (Possible colors are limited by Google)
 	print '<td class="nowrap right">';
 	//print $formadmin->selectColor($conf->global->$color, "google_agenda_color".$key, $colorlist);
-	print $formother->selectColor((GETPOST("AGENDA_EXT_COLOR".$key) ?GETPOST("AGENDA_EXT_COLOR".$key) : $conf->global->$color), "AGENDA_EXT_COLOR".$key, 'extsitesconfig', 1, '', 'hideifnotset');
+	print $formother->selectColor((GETPOST("AGENDA_EXT_COLOR".$key) ?GETPOST("AGENDA_EXT_COLOR".$key) : getDolGlobalString($color)), "AGENDA_EXT_COLOR".$key, 'extsitesconfig', 1, '', 'hideifnotset');
 	print '</td>';
 	print "</tr>";
 	$i++;

From d4fc23678a17907af58594e42935bec9f3ec19ee Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 20 Jun 2021 17:12:18 +0200
Subject: [PATCH 0789/1497] Add phpunit test for dolSqlDateFilter()

---
 test/phpunit/DateLibTest.php | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/test/phpunit/DateLibTest.php b/test/phpunit/DateLibTest.php
index 7ff09de495e..7c6cda9f997 100644
--- a/test/phpunit/DateLibTest.php
+++ b/test/phpunit/DateLibTest.php
@@ -528,4 +528,26 @@ class DateLibTest extends PHPUnit\Framework\TestCase
 
 		return 1;
 	}
+
+	/**
+	 * testDolSqlDateFilter
+	 *
+	 * @return int
+	 */
+	public function testDolSqlDateFilter()
+	{
+		global $conf;
+
+		$result = dolSqlDateFilter('field1', 0, 0, 1970, 0);
+		print __METHOD__." result = ".$result."\n";
+		$this->assertEquals(" AND field1 BETWEEN '1970-01-01 00:00:00' AND '1970-12-31 23:59:59'", $result, 'Test dolSqlDateFilter 1');
+
+		/* If server/company is in TZ America/Bahia, and we need range with a date set in GMT
+		$result = dolSqlDateFilter('field1', 0, 0, 1970, 0, 'gmt');
+		print __METHOD__." result = ".$result."\n";
+		$this->assertEquals(" AND field1 BETWEEN '1969-12-31 21:00:00' AND '1970-12-31 20:59:59'", $result, 'Test dolSqlDateFilter 2');
+		*/
+
+		return 1;
+	}
 }

From cfd7c610db7d1ae960c8e601be519c2348752f41 Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Sun, 20 Jun 2021 17:14:28 +0200
Subject: [PATCH 0790/1497] Use dolSqlDateFilter instead of SQL function YEAR

---
 htdocs/adherents/class/adherentstats.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/adherents/class/adherentstats.class.php b/htdocs/adherents/class/adherentstats.class.php
index ea106e4b4c5..bf8cf92bc33 100644
--- a/htdocs/adherents/class/adherentstats.class.php
+++ b/htdocs/adherents/class/adherentstats.class.php
@@ -92,7 +92,7 @@ class AdherentStats extends Stats
 		$sql = "SELECT date_format(p.dateadh,'%m') as dm, count(*)";
 		$sql .= " FROM ".$this->from;
 		//if (!$user->rights->societe->client->voir && !$user->socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-		$sql .= " WHERE YEAR(p.dateadh) = ".((int) $year);
+		$sql .= " WHERE ".dolSqlDateFilter('p.dateadh', 0, 0, $year, 1);
 		$sql .= " AND ".$this->where;
 		$sql .= " GROUP BY dm";
 		$sql .= $this->db->order('dm', 'DESC');
@@ -133,7 +133,7 @@ class AdherentStats extends Stats
 		$sql = "SELECT date_format(p.dateadh,'%m') as dm, sum(p.".$this->field.")";
 		$sql .= " FROM ".$this->from;
 		//if (!$user->rights->societe->client->voir && !$user->socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-		$sql .= " WHERE YEAR(p.dateadh) = ".((int) $year);
+		$sql .= " WHERE ".dolSqlDateFilter('p.dateadh', 0, 0, $year, 1);
 		$sql .= " AND ".$this->where;
 		$sql .= " GROUP BY dm";
 		$sql .= $this->db->order('dm', 'DESC');
@@ -154,7 +154,7 @@ class AdherentStats extends Stats
 		$sql = "SELECT date_format(p.dateadh,'%m') as dm, avg(p.".$this->field.")";
 		$sql .= " FROM ".$this->from;
 		//if (!$user->rights->societe->client->voir && !$this->socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-		$sql .= " WHERE YEAR(p.dateadh) = ".((int) $year);
+		$sql .= " WHERE ".dolSqlDateFilter('p.dateadh', 0, 0, $year, 1);
 		$sql .= " AND ".$this->where;
 		$sql .= " GROUP BY dm";
 		$sql .= $this->db->order('dm', 'DESC');

From 65110411ac40d76da0aeb901233b875329c124a9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 20 Jun 2021 17:20:12 +0200
Subject: [PATCH 0791/1497] Doc

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

diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php
index 864fea050a0..fe21071901a 100644
--- a/htdocs/core/lib/date.lib.php
+++ b/htdocs/core/lib/date.lib.php
@@ -302,7 +302,8 @@ function convertSecondToTime($iSecond, $format = 'all', $lengthOfDay = 86400, $l
  * @param      int		$month_date			Month date
  * @param      int		$year_date			Year date
  * @param	   int      $excludefirstand	Exclude first and
- * @param	   mixed	$gm					False or 0 or 'tzserver' = Return date to compare with server TZ,
+ * @param	   mixed	$gm					False or 0 or 'tzserver' = Input date fields are date info in the server TZ. True or 1 or 'gmt' = Input are date info in GMT TZ.
+ * 											Note: In database, dates are always fot the server TZ.
  * @return     string	$sqldate			String with SQL filter
  */
 function dolSqlDateFilter($datefield, $day_date, $month_date, $year_date, $excludefirstand = 0, $gm = false)

From 002471b1fe1177c81bfa4cefd36707dbf3bf12f3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 20 Jun 2021 17:25:58 +0200
Subject: [PATCH 0792/1497] Update adherentstats.class.php

---
 htdocs/adherents/class/adherentstats.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/adherents/class/adherentstats.class.php b/htdocs/adherents/class/adherentstats.class.php
index bf8cf92bc33..cfa83290551 100644
--- a/htdocs/adherents/class/adherentstats.class.php
+++ b/htdocs/adherents/class/adherentstats.class.php
@@ -92,7 +92,7 @@ class AdherentStats extends Stats
 		$sql = "SELECT date_format(p.dateadh,'%m') as dm, count(*)";
 		$sql .= " FROM ".$this->from;
 		//if (!$user->rights->societe->client->voir && !$user->socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-		$sql .= " WHERE ".dolSqlDateFilter('p.dateadh', 0, 0, $year, 1);
+		$sql .= " WHERE ".dolSqlDateFilter('p.dateadh', 0, 0, (int) $year, 1);
 		$sql .= " AND ".$this->where;
 		$sql .= " GROUP BY dm";
 		$sql .= $this->db->order('dm', 'DESC');
@@ -133,7 +133,7 @@ class AdherentStats extends Stats
 		$sql = "SELECT date_format(p.dateadh,'%m') as dm, sum(p.".$this->field.")";
 		$sql .= " FROM ".$this->from;
 		//if (!$user->rights->societe->client->voir && !$user->socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-		$sql .= " WHERE ".dolSqlDateFilter('p.dateadh', 0, 0, $year, 1);
+		$sql .= " WHERE ".dolSqlDateFilter('p.dateadh', 0, 0, (int) $year, 1);
 		$sql .= " AND ".$this->where;
 		$sql .= " GROUP BY dm";
 		$sql .= $this->db->order('dm', 'DESC');
@@ -154,7 +154,7 @@ class AdherentStats extends Stats
 		$sql = "SELECT date_format(p.dateadh,'%m') as dm, avg(p.".$this->field.")";
 		$sql .= " FROM ".$this->from;
 		//if (!$user->rights->societe->client->voir && !$this->socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-		$sql .= " WHERE ".dolSqlDateFilter('p.dateadh', 0, 0, $year, 1);
+		$sql .= " WHERE ".dolSqlDateFilter('p.dateadh', 0, 0, (int) $year, 1);
 		$sql .= " AND ".$this->where;
 		$sql .= " GROUP BY dm";
 		$sql .= $this->db->order('dm', 'DESC');

From 40afa5b1cc6e4f0cd294c304aa143835291c7a48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 20 Jun 2021 18:21:10 +0200
Subject: [PATCH 0793/1497] fix warning

there is already an array called $option
---
 htdocs/admin/syslog.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/admin/syslog.php b/htdocs/admin/syslog.php
index dfdc53e0f18..a0454a5c8b2 100644
--- a/htdocs/admin/syslog.php
+++ b/htdocs/admin/syslog.php
@@ -180,8 +180,8 @@ if (!$defaultsyslogfacility) {
 if (!$defaultsyslogfile) {
 	$defaultsyslogfile = 'dolibarr.log';
 }
-
-if ($conf->global->MAIN_MODULE_MULTICOMPANY && $user->entity) {
+$optionmc = '';
+if (!empty($conf->global->MAIN_MODULE_MULTICOMPANY) && $user->entity) {
 	print '<div class="error">'.$langs->trans("ContactSuperAdminForChange").'</div>';
 	$option = 'disabled';
 }
@@ -199,7 +199,7 @@ print '<input type="hidden" name="action" value="set">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Type").'</td><td>'.$langs->trans("Value").'</td>';
-print '<td class="right" colspan="2"><input type="submit" class="button" '.$option.' value="'.$langs->trans("Modify").'"></td>';
+print '<td class="right" colspan="2"><input type="submit" class="button" '.$optionmc.' value="'.$langs->trans("Modify").'"></td>';
 print "</tr>\n";
 
 foreach ($syslogModules as $moduleName) {

From cff5edd6047b9173bef737c9a40ccffdfff536ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 20 Jun 2021 18:24:00 +0200
Subject: [PATCH 0794/1497] Update syslog.php

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

diff --git a/htdocs/admin/syslog.php b/htdocs/admin/syslog.php
index a0454a5c8b2..7a885c0b74f 100644
--- a/htdocs/admin/syslog.php
+++ b/htdocs/admin/syslog.php
@@ -279,11 +279,11 @@ print '<input type="hidden" name="action" value="setlevel">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td>';
-print '<td class="right"><input type="submit" class="button" '.$option.' value="'.$langs->trans("Modify").'"></td>';
+print '<td class="right"><input type="submit" class="button" '.$optionmc.' value="'.$langs->trans("Modify").'"></td>';
 print "</tr>\n";
 
 print '<tr class="oddeven"><td width="140">'.$langs->trans("SyslogLevel").'</td>';
-print '<td colspan="2"><select class="flat" name="level" '.$option.'>';
+print '<td colspan="2"><select class="flat" name="level" '.$optionmc.'>';
 print '<option value="'.LOG_EMERG.'" '.($conf->global->SYSLOG_LEVEL == LOG_EMERG ? 'SELECTED' : '').'>LOG_EMERG ('.LOG_EMERG.')</option>';
 print '<option value="'.LOG_ALERT.'" '.($conf->global->SYSLOG_LEVEL == LOG_ALERT ? 'SELECTED' : '').'>LOG_ALERT ('.LOG_ALERT.')</option>';
 print '<option value="'.LOG_CRIT.'" '.($conf->global->SYSLOG_LEVEL == LOG_CRIT ? 'SELECTED' : '').'>LOG_CRIT ('.LOG_CRIT.')</option>';

From 6fb17b97770b7ef0796bda82b2fb2dac4c50a959 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 20 Jun 2021 18:28:25 +0200
Subject: [PATCH 0795/1497] fix warnings

---
 .../core/modules/user/doc/doc_generic_user_odt.modules.php  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php b/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
index b0d98a525df..7ca8d29c380 100644
--- a/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
+++ b/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2010-2012 	Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2012		Juanjo Menent		<jmenent@2byte.es>
- * Copyright (C) 2018-2020  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2021  Frédéric France         <frederic.france@netlogic.fr>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -120,7 +120,7 @@ class doc_generic_user_odt extends ModelePDFUser
 		$texte .= '<input type="hidden" name="token" value="'.newToken().'">';
 		$texte .= '<input type="hidden" name="action" value="setModuleOptions">';
 		$texte .= '<input type="hidden" name="param1" value="USER_ADDON_PDF_ODT_PATH">';
-		if ($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT > 0) {
+		if (!empty($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT)) {
 			$texte .= '<input type="hidden" name="param2" value="USER_ADDON_PDF_ODT_DEFAULT">';
 			$texte .= '<input type="hidden" name="param3" value="USER_ADDON_PDF_ODT_TOBILL">';
 			$texte .= '<input type="hidden" name="param4" value="USER_ADDON_PDF_ODT_CLOSED">';
@@ -166,7 +166,7 @@ class doc_generic_user_odt extends ModelePDFUser
 		if (count($listofdir)) {
 			$texte .= $langs->trans("NumberOfModelFilesFound").': <b>'.count($listoffiles).'</b>';
 
-			if ($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT > 0) {
+			if (!empty($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT)) {
 				// Model for creation
 				$list = ModelePDFUser::liste_modeles($this->db);
 				$texte .= '<table width="50%;">';

From 9ee95562004e35f4582609dd62fa6179607a9e7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 20 Jun 2021 18:37:43 +0200
Subject: [PATCH 0796/1497] Update user.php

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

diff --git a/htdocs/admin/user.php b/htdocs/admin/user.php
index 6d8cfe21f00..da3a1913d64 100644
--- a/htdocs/admin/user.php
+++ b/htdocs/admin/user.php
@@ -268,7 +268,7 @@ foreach ($dirmodels as $reldir) {
 
 								// Defaut
 								print '<td class="center">';
-								if ($conf->global->USER_ADDON_PDF == $name) {
+								if (getDolGlobalString('USER_ADDON_PDF_ODT') == $name) {
 									print img_picto($langs->trans("Default"), 'on');
 								} else {
 									print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';

From c9c3cef5d768830cad64496c16d2a629fb32d493 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 20 Jun 2021 20:15:19 +0200
Subject: [PATCH 0797/1497] Update syslog.php

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

diff --git a/htdocs/admin/syslog.php b/htdocs/admin/syslog.php
index 7a885c0b74f..10b3d1bd47b 100644
--- a/htdocs/admin/syslog.php
+++ b/htdocs/admin/syslog.php
@@ -183,7 +183,7 @@ if (!$defaultsyslogfile) {
 $optionmc = '';
 if (!empty($conf->global->MAIN_MODULE_MULTICOMPANY) && $user->entity) {
 	print '<div class="error">'.$langs->trans("ContactSuperAdminForChange").'</div>';
-	$option = 'disabled';
+	$optionmc = 'disabled';
 }
 
 

From c8326c1365a54f060c7a5358219df6cc3ff6feb5 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sun, 20 Jun 2021 21:55:48 +0200
Subject: [PATCH 0798/1497] FIX Accoutancy Limit date payment not register on
 purchases operations

---
 htdocs/accountancy/journal/purchasesjournal.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index 42bff74097f..5238ee993e1 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -92,7 +92,7 @@ if (!GETPOSTISSET('date_startmonth') && (empty($date_start) || empty($date_end))
 	$date_end = dol_get_last_day($pastmonthyear, $pastmonth, false);
 }
 
-$sql = "SELECT f.rowid, f.ref as ref, f.type, f.datef as df, f.libelle,f.ref_supplier, f.date_lim_reglement as dlf, f.close_code,";
+$sql = "SELECT f.rowid, f.ref as ref, f.type, f.datef as df, f.libelle,f.ref_supplier, f.date_lim_reglement as dlr, f.close_code,";
 $sql .= " fd.rowid as fdid, fd.description, fd.product_type, fd.total_ht, fd.tva as total_tva, fd.total_localtax1, fd.total_localtax2, fd.tva_tx, fd.total_ttc, fd.vat_src_code,";
 $sql .= " s.rowid as socid, s.nom as name, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur,";
 $sql .= " p.accountancy_code_buy , aa.rowid as fk_compte, aa.account_number as compte, aa.label as label_compte";

From 0dc16b135d27d30c546808ddcd7c3df1924a7b34 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 21 Jun 2021 00:05:01 +0200
Subject: [PATCH 0799/1497] FIX allow disabling of a module (not dangerous)
 even if pb with token.

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

diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 56b6e6e1f01..674cbbf52f5 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -28,7 +28,7 @@
  *  \brief      Page to activate/disable all modules
  */
 
-if (!defined('CSRFCHECK_WITH_TOKEN')) {
+if (!defined('CSRFCHECK_WITH_TOKEN') && (empty($_GET['action']) || $_GET['action'] != 'reset')) {	// We do not force security to disable modules so we can do it if problem
 	define('CSRFCHECK_WITH_TOKEN', '1'); // Force use of CSRF protection with tokens even for GET
 }
 

From 9fd06537b7961c1594d1d0c60fa55aa7bce95575 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Mon, 21 Jun 2021 10:42:20 +0200
Subject: [PATCH 0800/1497] move admin warnings on top instead bottom

---
 htdocs/index.php | 62 +++++++++++++++++++++++-------------------------
 1 file changed, 30 insertions(+), 32 deletions(-)

diff --git a/htdocs/index.php b/htdocs/index.php
index 7eaf517b321..0f457b0f40b 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2005-2017	Regis Houssin			<regis.houssin@inodbox.com>
  * Copyright (C) 2011-2012	Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2015		Marcos García			<marcosgdf@gmail.com>
+ * Copyright (C) 2021		Frédéric France			<frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -101,7 +102,36 @@ if (!empty($conf->global->MAIN_MOTD)) {
 	}
 }
 
+/*
+ * Show security warnings
+ */
 
+// Security warning repertoire install existe (si utilisateur admin)
+if ($user->admin && empty($conf->global->MAIN_REMOVE_INSTALL_WARNING)) {
+	$message = '';
+
+	// Check if install lock file is present
+	$lockfile = DOL_DATA_ROOT.'/install.lock';
+	if (!empty($lockfile) && !file_exists($lockfile) && is_dir(DOL_DOCUMENT_ROOT."/install")) {
+		$langs->load("errors");
+		//if (! empty($message)) $message.='<br>';
+		$message .= info_admin($langs->trans("WarningLockFileDoesNotExists", DOL_DATA_ROOT).' '.$langs->trans("WarningUntilDirRemoved", DOL_DOCUMENT_ROOT."/install"), 0, 0, '1', 'clearboth');
+	}
+
+	// Conf files must be in read only mode
+	if (is_writable($conffile)) {
+		$langs->load("errors");
+		//$langs->load("other");
+		//if (! empty($message)) $message.='<br>';
+		$message .= info_admin($langs->transnoentities("WarningConfFileMustBeReadOnly").' '.$langs->trans("WarningUntilDirRemoved", DOL_DOCUMENT_ROOT."/install"), 0, 0, '1', 'clearboth');
+	}
+
+	if ($message) {
+		print $message;
+		//$message.='<br>';
+		//print info_admin($langs->trans("WarningUntilDirRemoved",DOL_DOCUMENT_ROOT."/install"));
+	}
+}
 
 /*
  * Dashboard Dolibarr states (statistics)
@@ -722,38 +752,6 @@ print $boxlist;
 
 print '</div>';
 
-
-/*
- * Show security warnings
- */
-
-// Security warning repertoire install existe (si utilisateur admin)
-if ($user->admin && empty($conf->global->MAIN_REMOVE_INSTALL_WARNING)) {
-	$message = '';
-
-	// Check if install lock file is present
-	$lockfile = DOL_DATA_ROOT.'/install.lock';
-	if (!empty($lockfile) && !file_exists($lockfile) && is_dir(DOL_DOCUMENT_ROOT."/install")) {
-		$langs->load("errors");
-		//if (! empty($message)) $message.='<br>';
-		$message .= info_admin($langs->trans("WarningLockFileDoesNotExists", DOL_DATA_ROOT).' '.$langs->trans("WarningUntilDirRemoved", DOL_DOCUMENT_ROOT."/install"), 0, 0, '1', 'clearboth');
-	}
-
-	// Conf files must be in read only mode
-	if (is_writable($conffile)) {
-		$langs->load("errors");
-		//$langs->load("other");
-		//if (! empty($message)) $message.='<br>';
-		$message .= info_admin($langs->transnoentities("WarningConfFileMustBeReadOnly").' '.$langs->trans("WarningUntilDirRemoved", DOL_DOCUMENT_ROOT."/install"), 0, 0, '1', 'clearboth');
-	}
-
-	if ($message) {
-		print $message;
-		//$message.='<br>';
-		//print info_admin($langs->trans("WarningUntilDirRemoved",DOL_DOCUMENT_ROOT."/install"));
-	}
-}
-
 //print 'mem='.memory_get_usage().' - '.memory_get_peak_usage();
 
 // End of page

From 59a7d5b89d1ed250bb91cab2c1fe0a7b4197a604 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 21 Jun 2021 11:13:30 +0200
Subject: [PATCH 0801/1497] Introduce option
 MAIN_USE_VAT_COMPANIES_IN_EEC_WITH_INVALID_VAT_ID_ARE_INDIVIDUAL

---
 htdocs/core/lib/functions.lib.php | 35 ++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 531af8fe73a..20b944b4da2 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -5867,36 +5867,41 @@ function get_default_tva(Societe $thirdparty_seller, Societe $thirdparty_buyer,
 	}
 
 	// Si (vendeur et acheteur dans Communaute europeenne) et (bien vendu = moyen de transports neuf comme auto, bateau, avion) alors TVA par defaut=0 (La TVA doit etre paye par l'acheteur au centre d'impots de son pays et non au vendeur). Fin de regle.
-	// Not supported
+	// 'VATRULE 3' - Not supported
 
 	// Si (vendeur et acheteur dans Communaute europeenne) et (acheteur = entreprise) alors TVA par defaut=0. Fin de regle
 	// Si (vendeur et acheteur dans Communaute europeenne) et (acheteur = particulier) alors TVA par defaut=TVA du produit vendu. Fin de regle
 	if (($seller_in_cee && $buyer_in_cee)) {
 		$isacompany = $thirdparty_buyer->isACompany();
-		if ($isacompany) {
-			if (!empty($conf->global->MAIN_USE_VAT_OF_PRODUCT_FOR_COMPANIES_IN_EEC_WITH_INVALID_VAT_ID)) {
-				require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-				if (!isValidVATID($thirdparty_buyer)) {
-					//print 'VATRULE 6';
-					return get_product_vat_for_country($idprod, $thirdparty_seller, $idprodfournprice);
-				}
+		if ($isacompany && !empty($conf->global->MAIN_USE_VAT_COMPANIES_IN_EEC_WITH_INVALID_VAT_ID_ARE_INDIVIDUAL)) {
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+			if (!isValidVATID($thirdparty_buyer)) {
+				$isacompany = 0;
 			}
-			//print 'VATRULE 3';
-			return 0;
-		} else {
+		}
+
+		if (!$isacompany) {
 			//print 'VATRULE 4';
 			return get_product_vat_for_country($idprod, $thirdparty_seller, $idprodfournprice);
+		} else {
+			//print 'VATRULE 5';
+			return 0;
 		}
 	}
 
-	// Si (vendeur en France et acheteur hors Communaute europeenne et acheteur particulier) alors TVA par defaut=TVA du produit vendu. Fin de regle
-	if (!empty($conf->global->MAIN_USE_VAT_OF_PRODUCT_FOR_INDIVIDUAL_CUSTOMER_OUT_OF_EEC) && empty($buyer_in_cee) && !$thirdparty_buyer->isACompany()) {
-		return get_product_vat_for_country($idprod, $thirdparty_seller, $idprodfournprice);
+	// Si (vendeur dans Communaute europeene et acheteur hors Communaute europeenne et acheteur particulier) alors TVA par defaut=TVA du produit vendu. Fin de regle
+	// I don't see any use case that need this rule
+	if (!empty($conf->global->MAIN_USE_VAT_OF_PRODUCT_FOR_INDIVIDUAL_CUSTOMER_OUT_OF_EEC) && empty($buyer_in_cee)) {
+		$isacompany = $thirdparty_buyer->isACompany();
+		if (!$isacompany) {
+			return get_product_vat_for_country($idprod, $thirdparty_seller, $idprodfournprice);
+			//print 'VATRULE extra';
+		}
 	}
 
 	// Sinon la TVA proposee par defaut=0. Fin de regle.
 	// Rem: Cela signifie qu'au moins un des 2 est hors Communaute europeenne et que le pays differe
-	//print 'VATRULE 5';
+	//print 'VATRULE 6';
 	return 0;
 }
 

From 5bfd82e5284211673f9030953a096354d3e0f97d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 21 Jun 2021 11:23:53 +0200
Subject: [PATCH 0802/1497] Clean code

---
 ChangeLog                       | 1 +
 htdocs/core/lib/company.lib.php | 5 +----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1fdb321822f..ef4f01d84c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -225,6 +225,7 @@ Following changes may create regressions for some external modules, but were nec
 * If your database is MySQL or MariaDB, you need at least version 5.1
 * Function set_price_level() has been renamed into setPriceLevel() to follow camelcase rules
 * removed deprecated subtituion key  __REFCLIENT__  (replaced with __REF_CLIENT__)
+* Removed constant MAIN_COUNTRIES_IN_EEC. You can now set if country is in Europe or not from the dictionary of countries.
 
 
 ***** ChangeLog for 13.0.3 compared to 13.0.2 *****
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index f6d07e32f01..21b6f9a68e4 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -715,10 +715,7 @@ function getCountriesInEEC()
 	global $conf, $db;
 	$country_code_in_EEC = array();
 
-	if (!empty($conf->global->MAIN_COUNTRIES_IN_EEC)) {
-		// For example MAIN_COUNTRIES_IN_EEC = 'AT,BE,BG,CY,CZ,DE,DK,EE,ES,FI,FR,GB,GR,HR,NL,HU,IE,IM,IT,LT,LU,LV,MC,MT,PL,PT,RO,SE,SK,SI,UK'
-		$country_code_in_EEC = explode(',', $conf->global->MAIN_COUNTRIES_IN_EEC);
-	} elseif (!empty($conf->cache['country_code_in_EEC'])) {
+	if (!empty($conf->cache['country_code_in_EEC'])) {
 		// Use of cache to reduce number of database requests
 		$country_code_in_EEC = $conf->cache['country_code_in_EEC'];
 	} else {

From bb8d5cec1b88759e06d6642c20d2f0f65b55b3fe Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 21 Jun 2021 11:36:28 +0200
Subject: [PATCH 0803/1497] More complete management of
 MAIN_USE_VAT_COMPANIES_IN_EEC_WITH_INVALID_VAT_ID_ARE_INDIVIDUAL

---
 htdocs/core/lib/functions.lib.php | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 20b944b4da2..fed3f697cb6 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -5811,12 +5811,12 @@ function get_product_localtax_for_country($idprod, $local, $thirdparty_seller)
 
 /**
  *	Function that return vat rate of a product line (according to seller, buyer and product vat rate)
- *   Si vendeur non assujeti a TVA, TVA par defaut=0. Fin de regle.
- *	 Si le (pays vendeur = pays acheteur) alors TVA par defaut=TVA du produit vendu. Fin de regle.
- *	 Si (vendeur et acheteur dans Communaute europeenne) et (bien vendu = moyen de transports neuf comme auto, bateau, avion) alors TVA par defaut=0 (La TVA doit etre paye par acheteur au centre d'impots de son pays et non au vendeur). Fin de regle.
- *	 Si (vendeur et acheteur dans Communaute europeenne) et (acheteur = particulier ou entreprise sans num TVA intra) alors TVA par defaut=TVA du produit vendu. Fin de regle
- *	 Si (vendeur et acheteur dans Communaute europeenne) et (acheteur = entreprise avec num TVA) intra alors TVA par defaut=0. Fin de regle
- *	 Sinon TVA proposee par defaut=0. Fin de regle.
+ *   VATRULE 1: Si vendeur non assujeti a TVA, TVA par defaut=0. Fin de regle.
+ *	 VATRULE 2: Si le (pays vendeur = pays acheteur) alors TVA par defaut=TVA du produit vendu. Fin de regle.
+ *	 VATRULE 3: Si (vendeur et acheteur dans Communaute europeenne) et (bien vendu = moyen de transports neuf comme auto, bateau, avion) alors TVA par defaut=0 (La TVA doit etre paye par acheteur au centre d'impots de son pays et non au vendeur). Fin de regle.
+ *	 VATRULE 4: Si (vendeur et acheteur dans Communaute europeenne) et (acheteur = particulier) alors TVA par defaut=TVA du produit vendu. Fin de regle
+ *	 VATRULE 5: Si (vendeur et acheteur dans Communaute europeenne) et (acheteur = entreprise) alors TVA par defaut=0. Fin de regle
+ *	 VATRULE 6: Sinon TVA proposee par defaut=0. Fin de regle.
  *
  *	@param	Societe		$thirdparty_seller    	Objet societe vendeuse
  *	@param  Societe		$thirdparty_buyer   	Objet societe acheteuse
@@ -5845,9 +5845,19 @@ function get_default_tva(Societe $thirdparty_seller, Societe $thirdparty_buyer,
 	// If services are eServices according to EU Council Directive 2002/38/EC (http://ec.europa.eu/taxation_customs/taxation/vat/traders/e-commerce/article_1610_en.htm)
 	// we use the buyer VAT.
 	if (!empty($conf->global->SERVICE_ARE_ECOMMERCE_200238EC)) {
-		if ($seller_in_cee && $buyer_in_cee && !$thirdparty_buyer->isACompany()) {
-			//print 'VATRULE 0';
-			return get_product_vat_for_country($idprod, $thirdparty_buyer, $idprodfournprice);
+		if ($seller_in_cee && $buyer_in_cee) {
+			$isacompany = $thirdparty_buyer->isACompany();
+			if ($isacompany && !empty($conf->global->MAIN_USE_VAT_COMPANIES_IN_EEC_WITH_INVALID_VAT_ID_ARE_INDIVIDUAL)) {
+				require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+				if (!isValidVATID($thirdparty_buyer)) {
+					$isacompany = 0;
+				}
+			}
+
+			if (!$isacompany) {
+				//print 'VATRULE 0';
+				return get_product_vat_for_country($idprod, $thirdparty_buyer, $idprodfournprice);
+			}
 		}
 	}
 
@@ -5890,7 +5900,7 @@ function get_default_tva(Societe $thirdparty_seller, Societe $thirdparty_buyer,
 	}
 
 	// Si (vendeur dans Communaute europeene et acheteur hors Communaute europeenne et acheteur particulier) alors TVA par defaut=TVA du produit vendu. Fin de regle
-	// I don't see any use case that need this rule
+	// I don't see any use case that need this rule.
 	if (!empty($conf->global->MAIN_USE_VAT_OF_PRODUCT_FOR_INDIVIDUAL_CUSTOMER_OUT_OF_EEC) && empty($buyer_in_cee)) {
 		$isacompany = $thirdparty_buyer->isACompany();
 		if (!$isacompany) {

From ab2e50ef49d9b20d98a3a0dffcd6752940564538 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 21 Jun 2021 12:46:03 +0200
Subject: [PATCH 0804/1497] Fix css

---
 htdocs/comm/action/index.php | 62 ++++++++++++++++++------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 465f1be8701..d619fafe850 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -363,9 +363,9 @@ if ($action == 'show_day') {
 //print dol_print_date($firstdaytoshow,'dayhour').' '.dol_print_date($lastdaytoshow,'dayhour');
 
 /*$title = $langs->trans("DoneAndToDoActions");
-if ($status == 'done') $title = $langs->trans("DoneActions");
-if ($status == 'todo') $title = $langs->trans("ToDoActions");
-*/
+ if ($status == 'done') $title = $langs->trans("DoneActions");
+ if ($status == 'todo') $title = $langs->trans("ToDoActions");
+ */
 
 $param = '';
 if ($actioncode || GETPOSTISSET('search_actioncode')) {
@@ -454,13 +454,13 @@ $param .= '&year='.$year.'&month='.$month.($day ? '&day='.$day : '');
 
 
 /*$tabactive = '';
-if ($action == 'show_month') $tabactive = 'cardmonth';
-if ($action == 'show_week') $tabactive = 'cardweek';
-if ($action == 'show_day')  $tabactive = 'cardday';
-if ($action == 'show_list') $tabactive = 'cardlist';
-if ($action == 'show_pertuser') $tabactive = 'cardperuser';
-if ($action == 'show_pertype') $tabactive = 'cardpertype';
-*/
+ if ($action == 'show_month') $tabactive = 'cardmonth';
+ if ($action == 'show_week') $tabactive = 'cardweek';
+ if ($action == 'show_day')  $tabactive = 'cardday';
+ if ($action == 'show_list') $tabactive = 'cardlist';
+ if ($action == 'show_pertuser') $tabactive = 'cardperuser';
+ if ($action == 'show_pertype') $tabactive = 'cardpertype';
+ */
 
 $paramnoaction = preg_replace('/action=[a-z_]+/', '', $param);
 $paramnoactionodate = preg_replace('/action=[a-z_]+/', '', $paramnodate);
@@ -502,14 +502,12 @@ $viewmode .= img_picto($langs->trans("ViewDay"), 'object_calendarday', 'class="p
 //$viewmode .= '</span>';
 $viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsmartphone">'.$langs->trans("ViewDay").'</span></a>';
 
-$viewmode .= '<a class="btnTitle reposition marginrightonly" href="'.DOL_URL_ROOT.'/comm/action/peruser.php?action=show_peruser&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').$paramnoactionodate.'">';
+$viewmode .= '<a class="btnTitle reposition" href="'.DOL_URL_ROOT.'/comm/action/peruser.php?action=show_peruser&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').$paramnoactionodate.'">';
 //$viewmode .= '<span class="fa paddingleft imgforviewmode valignmiddle btnTitle-icon">';
 $viewmode .= img_picto($langs->trans("ViewPerUser"), 'object_calendarperuser', 'class="pictoactionview block"');
 //$viewmode .= '</span>';
 $viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsmartphone">'.$langs->trans("ViewPerUser").'</span></a>';
 
-$viewmode .= '<span class="marginrightonly"></span>';
-
 // Add more views from hooks
 $parameters = array(); $object = null;
 $reshook = $hookmanager->executeHooks('addCalendarView', $parameters, $object, $action);
@@ -519,6 +517,8 @@ if (empty($reshook)) {
 	$viewmode = $hookmanager->resPrint;
 }
 
+$viewmode .= '<span class="marginrightonly"></span>';	// To add a space before the navigation tools
+
 
 $newcardbutton = '';
 if ($user->rights->agenda->myactions->create || $user->rights->agenda->allactions->create) {
@@ -925,13 +925,13 @@ if ($showbirthday) {
 			$eventarray[$daykey][] = $event;
 
 			/*$loop = true;
-			$daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee);
-			do {
-				$eventarray[$daykey][] = $event;
-				$daykey += 60 * 60 * 24;
-				if ($daykey > $event->date_end_in_calendar) $loop = false;
-			} while ($loop);
-			*/
+			 $daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee);
+			 do {
+			 $eventarray[$daykey][] = $event;
+			 $daykey += 60 * 60 * 24;
+			 if ($daykey > $event->date_end_in_calendar) $loop = false;
+			 } while ($loop);
+			 */
 			$i++;
 		}
 	} else {
@@ -1543,13 +1543,13 @@ if (empty($action) || $action == 'show_month') {      // View by month
 	echo " </td>\n";
 
 	/*
-	echo ' <div class="tagtr">';
-	echo '  <div class="tagtd width100"></div>';
-	echo '  <div class="tagtd center">';
-	echo show_day_events($db, $day, $month, $year, $month, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300, -1);
-	echo '  </div>'."\n";
-	echo " </div>\n";
-	*/
+	 echo ' <div class="tagtr">';
+	 echo '  <div class="tagtd width100"></div>';
+	 echo '  <div class="tagtd center">';
+	 echo show_day_events($db, $day, $month, $year, $month, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300, -1);
+	 echo '  </div>'."\n";
+	 echo " </div>\n";
+	 */
 
 	echo '</table>';
 	print '</div>';
@@ -1793,10 +1793,10 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 					} else {
 						if ($user->rights->agenda->allactions->create ||
 							(($event->authorid == $user->id || $event->userownerid == $user->id) && $user->rights->agenda->myactions->create)) {
-							$cssclass .= " movable cursormove";
-						} else {
-							$cssclass .= " unmovable";
-						}
+								$cssclass .= " movable cursormove";
+							} else {
+								$cssclass .= " unmovable";
+							}
 					}
 
 					$h = ''; $nowrapontd = 1;

From aca190d97723be3310aef5c26da7909a776eb0ba Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 21 Jun 2021 12:46:24 +0200
Subject: [PATCH 0805/1497] Fix css

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

diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index d619fafe850..9b76329d8da 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -1794,9 +1794,9 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 						if ($user->rights->agenda->allactions->create ||
 							(($event->authorid == $user->id || $event->userownerid == $user->id) && $user->rights->agenda->myactions->create)) {
 								$cssclass .= " movable cursormove";
-							} else {
-								$cssclass .= " unmovable";
-							}
+						} else {
+							$cssclass .= " unmovable";
+						}
 					}
 
 					$h = ''; $nowrapontd = 1;

From ac8564dc34f3df651970e31873ab1371b809689b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 21 Jun 2021 13:06:40 +0200
Subject: [PATCH 0806/1497] Fix disable token renewal on .css.php, .js.php and
 .json.php

---
 htdocs/main.inc.php | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 437e024a3ae..2301ca75161 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -413,15 +413,17 @@ if ((!empty($conf->global->MAIN_VERSION_LAST_UPGRADE) && ($conf->global->MAIN_VE
 }
 
 // Creation of a token against CSRF vulnerabilities
-if (!defined('NOTOKENRENEWAL'))
-{
-	// Rolling token at each call ($_SESSION['token'] contains token of previous page)
-	if (isset($_SESSION['newtoken'])) $_SESSION['token'] = $_SESSION['newtoken'];
+if (!defined('NOTOKENRENEWAL')) {
+	// No token renewal on .css.php, .js.php and .json.php
+	if (!preg_match('/\.(css|js|json)\.php$/', $_SERVER["PHP_SELF"])) {
+		// Rolling token at each call ($_SESSION['token'] contains token of previous page)
+		if (isset($_SESSION['newtoken'])) $_SESSION['token'] = $_SESSION['newtoken'];
 
-	// Save in $_SESSION['newtoken'] what will be next token. Into forms, we will add param token = $_SESSION['newtoken']
-	$token = dol_hash(uniqid(mt_rand(), true)); // Generates a hash of a random number
-	$_SESSION['newtoken'] = $token;
-	dol_syslog("NEW TOKEN reclaimed by : " . $_SERVER['PHP_SELF'], LOG_DEBUG);
+		// Save in $_SESSION['newtoken'] what will be next token. Into forms, we will add param token = $_SESSION['newtoken']
+		$token = dol_hash(uniqid(mt_rand(), true)); // Generates a hash of a random number
+		$_SESSION['newtoken'] = $token;
+		dol_syslog("NEW TOKEN generated by : " . $_SERVER['PHP_SELF'], LOG_DEBUG);
+	}
 }
 
 //dol_syslog("aaaa - ".defined('NOCSRFCHECK')." - ".$dolibarr_nocsrfcheck." - ".$conf->global->MAIN_SECURITY_CSRF_WITH_TOKEN." - ".$_SERVER['REQUEST_METHOD']." - ".GETPOST('token', 'alpha').' '.$_SESSION['token']);

From 5697e86c090b98b051b57cdf6022200a51dd597a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 21 Jun 2021 14:11:59 +0200
Subject: [PATCH 0807/1497] Fix columns for export/import profile

---
 htdocs/install/mysql/migration/13.0.0-14.0.0.sql | 9 ++++++---
 htdocs/install/mysql/tables/llx_export_model.sql | 2 +-
 htdocs/install/mysql/tables/llx_import_model.sql | 3 ++-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index deb40d9c7fd..8caf6e9a401 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -67,9 +67,6 @@ insert into llx_c_actioncomm (id, code, type, libelle, module, active, position)
 
 UPDATE llx_c_country SET eec = 1 WHERE code IN ('AT','BE','BG','CY','CZ','DE','DK','EE','ES','FI','FR','GR','HR','NL','HU','IE','IM','IT','LT','LU','LV','MC','MT','PL','PT','RO','SE','SK','SI');
 
-ALTER TABLE llx_export_model MODIFY COLUMN type varchar(64);
-
-
 INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES (  11, 'US-BASE', 'USA basic chart of accounts', 1);
 INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 14, 'CA-ENG-BASE', 'Canadian basic chart of accounts - English', 1);
 INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 154, 'SAT/24-2019', 'Catalogo y codigo agrupador fiscal del 2019', 1);
@@ -84,6 +81,12 @@ DELETE FROM llx_user_param where param = 'MAIN_THEME' and value in ('auguria', '
 
 -- For v14
 
+ALTER TABLE llx_import_model MODIFY COLUMN type varchar(64);
+ALTER TABLE llx_export_model MODIFY COLUMN type varchar(64);
+
+ALTER TABLE llx_import_model ADD COLUMN entity integer DEFAULT 0 NOT NULL;
+ALTER TABLE llx_export_model ADD COLUMN entity integer DEFAULT 0 NOT NULL;
+
 ALTER TABLE llx_product_lot ADD COLUMN eol_date datetime NULL;
 ALTER TABLE llx_product_lot ADD COLUMN manufacturing_date datetime NULL;
 ALTER TABLE llx_product_lot ADD COLUMN scrapping_date datetime NULL;
diff --git a/htdocs/install/mysql/tables/llx_export_model.sql b/htdocs/install/mysql/tables/llx_export_model.sql
index 7e68eab4ad5..cfdb2fdc530 100644
--- a/htdocs/install/mysql/tables/llx_export_model.sql
+++ b/htdocs/install/mysql/tables/llx_export_model.sql
@@ -22,10 +22,10 @@
 create table llx_export_model
 (
   	rowid		integer AUTO_INCREMENT PRIMARY KEY,
+  	entity      integer DEFAULT 0,      				-- by default on all entities for compatibility
 	fk_user		integer DEFAULT 0 NOT NULL,
   	label		varchar(50) NOT NULL,
   	type		varchar(64) NOT NULL,
   	field		text NOT NULL,
   	filter		text
-  	
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_import_model.sql b/htdocs/install/mysql/tables/llx_import_model.sql
index 2a110a2d80a..ceb3ae9f323 100644
--- a/htdocs/install/mysql/tables/llx_import_model.sql
+++ b/htdocs/install/mysql/tables/llx_import_model.sql
@@ -21,8 +21,9 @@
 create table llx_import_model
 (
   	rowid         integer AUTO_INCREMENT PRIMARY KEY,
+  	entity        integer DEFAULT 0 NOT NULL,      				-- by default on all entities for compatibility
 	fk_user		  integer DEFAULT 0 NOT NULL,
   	label         varchar(50) NOT NULL,
-  	type		  varchar(50) NOT NULL,
+  	type		  varchar(64) NOT NULL,
   	field         text NOT NULL
 )ENGINE=innodb;

From 31db1dc412549476fd2713f0be0628f5676c6f30 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 21 Jun 2021 15:03:45 +0200
Subject: [PATCH 0808/1497] Fix management of visibility of export/import
 templates.

---
 htdocs/admin/export.php                    |  3 +-
 htdocs/core/class/html.formother.class.php | 24 +++++++-------
 htdocs/exports/class/export.class.php      |  8 ++---
 htdocs/exports/export.php                  | 37 +++++++++++++++-------
 htdocs/imports/class/import.class.php      | 19 +++++++++--
 htdocs/imports/import.php                  | 34 +++++++++++++++++---
 6 files changed, 89 insertions(+), 36 deletions(-)

diff --git a/htdocs/admin/export.php b/htdocs/admin/export.php
index b83b15571b8..9b154e88789 100644
--- a/htdocs/admin/export.php
+++ b/htdocs/admin/export.php
@@ -86,13 +86,14 @@ print '<td class="center" width="20">&nbsp;</td>';
 print '<td class="center" width="100"></td>'."\n";
 print '</tr>';
 
-// Example with a yes / no select
+/* No more need for this, you can set that a profile is public when saving it.
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("EXPORTS_SHARE_MODELS").'</td>';
 print '<td class="center" width="20">&nbsp;</td>';
 print '<td class="center" width="100">';
 print ajax_constantonoff('EXPORTS_SHARE_MODELS');
 print '</td></tr>';
+*/
 
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("ExportCsvSeparator").'</td>';
diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index d352b996ef2..991e3cb37cc 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -110,7 +110,7 @@ class FormOther
 	 *    @param    string	$htmlname          Nom de la zone select
 	 *    @param    string	$type              Type des modeles recherches
 	 *    @param    int		$useempty          Show an empty value in list
-	 *    @param    int		$fk_user           User that has created the template (this is set to null to get all export model when EXPORTS_SHARE_MODELS is on)
+	 *    @param    int		$fk_user           User we want templates
 	 *    @return	void
 	 */
 	public function select_export_model($selected = '', $htmlname = 'exportmodelid', $type = '', $useempty = 0, $fk_user = null)
@@ -121,8 +121,8 @@ class FormOther
 		$sql = "SELECT rowid, label, fk_user";
 		$sql .= " FROM ".MAIN_DB_PREFIX."export_model";
 		$sql .= " WHERE type = '".$this->db->escape($type)."'";
-		if (!empty($fk_user)) {
-			$sql .= " AND fk_user IN (0, ".$fk_user.")"; // An export model
+		if (empty($conf->global->EXPORTS_SHARE_MODELS)) {	// EXPORTS_SHARE_MODELS means all templates are visible, whatever is owner.
+			$sql .= " AND fk_user IN (0, ".((int) $fk_user).")";
 		}
 		$sql .= " ORDER BY label";
 		$result = $this->db->query($sql);
@@ -132,6 +132,8 @@ class FormOther
 				print '<option value="-1">&nbsp;</option>';
 			}
 
+			$tmpuser = new User($this->db);
+
 			$num = $this->db->num_rows($result);
 			$i = 0;
 			while ($i < $num) {
@@ -140,8 +142,7 @@ class FormOther
 				$label = $obj->label;
 				if ($obj->fk_user == 0) {
 					$label .= ' <span class="opacitymedium">('.$langs->trans("Everybody").')</span>';
-				} elseif (!empty($conf->global->EXPORTS_SHARE_MODELS) && empty($fk_user) && is_object($user) && $user->id != $obj->fk_user) {
-					$tmpuser = new User($this->db);
+				} elseif ($obj->fk_user > 0) {
 					$tmpuser->fetch($obj->fk_user);
 					$label .= ' <span class="opacitymedium">('.$tmpuser->getFullName($langs).')</span>';
 				}
@@ -171,7 +172,7 @@ class FormOther
 	 *    @param    string	$htmlname          Nom de la zone select
 	 *    @param    string	$type              Type des modeles recherches
 	 *    @param    int		$useempty          Affiche valeur vide dans liste
-	 *    @param    int		$fk_user           User that has created the template (this is set to null to get all export model when EXPORTS_SHARE_MODELS is on)
+	 *    @param    int		$fk_user           User that has created the template
 	 *    @return	void
 	 */
 	public function select_import_model($selected = '', $htmlname = 'importmodelid', $type = '', $useempty = 0, $fk_user = null)
@@ -182,10 +183,10 @@ class FormOther
 		$sql = "SELECT rowid, label, fk_user";
 		$sql .= " FROM ".MAIN_DB_PREFIX."import_model";
 		$sql .= " WHERE type = '".$this->db->escape($type)."'";
-		if (!empty($fk_user)) {
-			$sql .= " AND fk_user IN (0, ".$fk_user.")"; // An export model
+		if (empty($conf->global->EXPORTS_SHARE_MODELS)) {	// EXPORTS_SHARE_MODELS means all templates are visible, whatever is owner.
+			$sql .= " AND fk_user IN (0, ".((int) $fk_user).")";
 		}
-		$sql .= " ORDER BY rowid";
+		$sql .= " ORDER BY label";
 		$result = $this->db->query($sql);
 		if ($result) {
 			print '<select class="flat minwidth200" name="'.$htmlname.'" id="'.$htmlname.'">';
@@ -193,6 +194,8 @@ class FormOther
 				print '<option value="-1">&nbsp;</option>';
 			}
 
+			$tmpuser = new User($this->db);
+
 			$num = $this->db->num_rows($result);
 			$i = 0;
 			while ($i < $num) {
@@ -201,8 +204,7 @@ class FormOther
 				$label = $obj->label;
 				if ($obj->fk_user == 0) {
 					$label .= ' <span class="opacitymedium">('.$langs->trans("Everybody").')</span>';
-				} elseif (!empty($conf->global->EXPORTS_SHARE_MODELS) && empty($fk_user) && is_object($user) && $user->id != $obj->fk_user) {
-					$tmpuser = new User($this->db);
+				} elseif ($obj->fk_user > 0) {
 					$tmpuser->fetch($obj->fk_user);
 					$label .= ' <span class="opacitymedium">('.$tmpuser->getFullName($langs).')</span>';
 				}
diff --git a/htdocs/exports/class/export.class.php b/htdocs/exports/class/export.class.php
index 8c1bf9642b1..b8960572255 100644
--- a/htdocs/exports/class/export.class.php
+++ b/htdocs/exports/class/export.class.php
@@ -54,11 +54,12 @@ class Export
 	public $array_export_examplevalues = array(); // array with examples for fields
 	public $array_export_help = array(); // array with tooltip help for fields
 
-	// To store export modules
+	// To store export templates
 	public $hexa; // List of fields in the export profile
 	public $hexafiltervalue; // List of search criteria in the export profile
 	public $datatoexport;
 	public $model_name; // Name of export profile
+	public $fk_user;
 
 	public $sqlusedforexport;
 
@@ -720,8 +721,6 @@ class Export
 
 		$this->db->begin();
 
-		$filter = '';
-
 		$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'export_model (';
 		$sql .= 'label,';
 		$sql .= 'type,';
@@ -732,11 +731,10 @@ class Export
 		$sql .= "'".$this->db->escape($this->model_name)."',";
 		$sql .= " '".$this->db->escape($this->datatoexport)."',";
 		$sql .= " '".$this->db->escape($this->hexa)."',";
-		$sql .= ' '.($user->id > 0 ? $user->id : 'null').",";
+		$sql .= ' '.(isset($this->fk_user) ? (int) $this->fk_user : 'null').",";
 		$sql .= " '".$this->db->escape($this->hexafiltervalue)."'";
 		$sql .= ")";
 
-		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$this->db->commit();
diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php
index b3d0cf49a32..1dd3400ff80 100644
--- a/htdocs/exports/export.php
+++ b/htdocs/exports/export.php
@@ -335,6 +335,7 @@ if ($action == 'add_export_model') {
 		$objexport->datatoexport = $datatoexport;
 		$objexport->hexa = $hexa;
 		$objexport->hexafiltervalue = $hexafiltervalue;
+		$objexport->fk_user = (GETPOST('visibility', 'aZ09') == 'all' ? 0 : $user->id);
 
 		$result = $objexport->create($user);
 		if ($result >= 0) {
@@ -516,11 +517,7 @@ if ($step == 2 && $datatoexport) {
 	print '<input type="hidden" name="datatoexport" value="'.$datatoexport.'">';
 	print '<div class="valignmiddle marginbottomonly">';
 	print '<span class="opacitymedium">'.$langs->trans("SelectExportFields").'</span> ';
-	if (empty($conf->global->EXPORTS_SHARE_MODELS)) {
-		$htmlother->select_export_model($exportmodelid, 'exportmodelid', $datatoexport, 1, $user->id);
-	} else {
-		$htmlother->select_export_model($exportmodelid, 'exportmodelid', $datatoexport, 1);
-	}
+	$htmlother->select_export_model($exportmodelid, 'exportmodelid', $datatoexport, 1, $user->id);
 	print ' ';
 	print '<input type="submit" class="button" value="'.$langs->trans("Select").'">';
 	print '</div>';
@@ -1007,20 +1004,28 @@ if ($step == 4 && $datatoexport) {
 		print '<table class="noborder centpercent">';
 		print '<tr class="liste_titre">';
 		print '<td>'.$langs->trans("ExportModelName").'</td>';
-		print '<td>&nbsp;</td>';
+		print '<td>'.$langs->trans("Visibility").'</td>';
+		print '<td></td>';
 		print '</tr>';
 
 		print '<tr class="oddeven">';
-		print '<td><input name="export_name" size="32" value=""></td><td class="right">';
+		print '<td><input name="export_name" size="32" value=""></td>';
+		print '<td>';
+		$arrayvisibility = array('private'=>$langs->trans("Private"), 'all'=>$langs->trans("Everybody"));
+		print $form->selectarray('visibility', $arrayvisibility, 'private');
+		print '</td>';
+		print '<td class="right">';
 		print '<input type="submit" class="button reposition button-save" value="'.$langs->trans("Save").'">';
 		print '</td></tr>';
 
+		$tmpuser = new User($db);
+
 		// List of existing export profils
-		$sql = "SELECT rowid, label";
+		$sql = "SELECT rowid, label, fk_user, entity";
 		$sql .= " FROM ".MAIN_DB_PREFIX."export_model";
 		$sql .= " WHERE type = '".$db->escape($datatoexport)."'";
-		if (empty($conf->global->EXPORTS_SHARE_MODELS)) {
-			$sql .= " AND fk_user=".$user->id;
+		if (empty($conf->global->EXPORTS_SHARE_MODELS)) {	// EXPORTS_SHARE_MODELS means all templates are visible, whatever is owner.
+			$sql .= " AND fk_user IN (0, ".((int) $user->id).")";
 		}
 		$sql .= " ORDER BY rowid";
 		$resql = $db->query($sql);
@@ -1029,9 +1034,19 @@ if ($step == 4 && $datatoexport) {
 			$i = 0;
 			while ($i < $num) {
 				$obj = $db->fetch_object($resql);
+
 				print '<tr class="oddeven"><td>';
 				print $obj->label;
-				print '</td><td class="right">';
+				print '</td>';
+				print '<td>';
+				if (empty($obj->fk_user)) {
+					print $langs->trans("Everybody");
+				} else {
+					$tmpuser->fetch($obj->fk_user);
+					print $tmpuser->getNomUrl(1);
+				}
+				print '</td>';
+				print '<td class="right">';
 				print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?step='.$step.'&datatoexport='.$datatoexport.'&action=deleteprof&token='.newToken().'&id='.$obj->rowid.'">';
 				print img_delete();
 				print '</a>';
diff --git a/htdocs/imports/class/import.class.php b/htdocs/imports/class/import.class.php
index 567aaf754a8..44ec5935d49 100644
--- a/htdocs/imports/class/import.class.php
+++ b/htdocs/imports/class/import.class.php
@@ -55,6 +55,12 @@ class Import
 	 */
 	public $errors = array();
 
+	// To store import templates
+	public $hexa; // List of fields in the export profile
+	public $datatoimport;
+	public $model_name; // Name of export profile
+	public $fk_user;
+
 
 	/**
 	 *    Constructor
@@ -266,11 +272,18 @@ class Import
 		$this->db->begin();
 
 		$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'import_model (';
-		$sql .= 'fk_user, label, type, field';
+		$sql .= 'fk_user,';
+		$sql .= ' label,';
+		$sql .= ' type,';
+		$sql .= ' field';
 		$sql .= ')';
-		$sql .= " VALUES (".($user->id > 0 ? $user->id : 0).", '".$this->db->escape($this->model_name)."', '".$this->db->escape($this->datatoimport)."', '".$this->db->escape($this->hexa)."')";
+		$sql .= " VALUES (";
+		$sql .= (isset($this->fk_user) ? (int) $this->fk_user : 'null').",";
+		$sql .= " '".$this->db->escape($this->model_name)."',";
+		$sql .= " '".$this->db->escape($this->datatoimport)."',";
+		$sql .= " '".$this->db->escape($this->hexa)."'";
+		$sql .= ")";
 
-		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$this->db->commit();
diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php
index 20a846123f1..4c5975ecb43 100644
--- a/htdocs/imports/import.php
+++ b/htdocs/imports/import.php
@@ -226,6 +226,7 @@ if ($action == 'add_import_model') {
 		$objimport->model_name = $import_name;
 		$objimport->datatoimport = $datatoimport;
 		$objimport->hexa = $hexa;
+		$objimport->fk_user = (GETPOST('visibility', 'aZ09') == 'all' ? 0 : $user->id);
 
 		$result = $objimport->create($user);
 		if ($result >= 0) {
@@ -968,7 +969,7 @@ if ($step == 4 && $datatoimport) {
 	$s = str_replace('{s1}', img_picto('', 'grip_title', '', false, 0, 0, '', '', 0), $s);
 	print $s;
 	print '</span> ';
-	$htmlother->select_import_model($importmodelid, 'importmodelid', $datatoimport, 1);
+	$htmlother->select_import_model($importmodelid, 'importmodelid', $datatoimport, 1, $user->id);
 	print '<input type="submit" class="button" value="'.$langs->trans("Select").'">';
 	print '</div>';
 	print '</form>';
@@ -1249,28 +1250,51 @@ if ($step == 4 && $datatoimport) {
 		print '<table summary="selectofimportprofil" class="noborder centpercent">';
 		print '<tr class="liste_titre">';
 		print '<td>'.$langs->trans("ImportModelName").'</td>';
-		print '<td>&nbsp;</td>';
+		print '<td>'.$langs->trans("Visibility").'</td>';
+		print '<td></td>';
 		print '</tr>';
 
 		print '<tr class="oddeven">';
-		print '<td><input name="import_name" size="48" value=""></td><td style="text-align:right">';
+		print '<td><input name="import_name" size="48" value=""></td>';
+		print '<td>';
+		$arrayvisibility = array('private'=>$langs->trans("Private"), 'all'=>$langs->trans("Everybody"));
+		print $form->selectarray('visibility', $arrayvisibility, 'private');
+		print '</td>';
+		print '<td class="right">';
 		print '<input type="submit" class="button" value="'.$langs->trans("SaveImportProfile").'">';
 		print '</td></tr>';
 
 		// List of existing import profils
-		$sql = "SELECT rowid, label";
+		$sql = "SELECT rowid, label, fk_user, entity";
 		$sql .= " FROM ".MAIN_DB_PREFIX."import_model";
 		$sql .= " WHERE type = '".$db->escape($datatoimport)."'";
+		if (empty($conf->global->EXPORTS_SHARE_MODELS)) {	// EXPORTS_SHARE_MODELS means all templates are visible, whatever is owner.
+			$sql .= " AND fk_user IN (0, ".((int) $user->id).")";
+		}
 		$sql .= " ORDER BY rowid";
+
 		$resql = $db->query($sql);
 		if ($resql) {
 			$num = $db->num_rows($resql);
+
+			$tmpuser = new user($db);
+
 			$i = 0;
 			while ($i < $num) {
 				$obj = $db->fetch_object($resql);
+
 				print '<tr class="oddeven"><td>';
 				print $obj->label;
-				print '</td><td style="text-align:right">';
+				print '</td>';
+				print '<td>';
+				if (empty($obj->fk_user)) {
+					print $langs->trans("Everybody");
+				} else {
+					$tmpuser->fetch($obj->fk_user);
+					print $tmpuser->getNomUrl(1);
+				}
+				print '</td>';
+				print '<td class="right">';
 				print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?step='.$step.$param.'&action=deleteprof&token='.newToken().'&id='.$obj->rowid.'&filetoimport='.urlencode($filetoimport).'">';
 				print img_delete();
 				print '</a>';

From f48b2812a3d263da54e08818168e8f68a1e9d5be Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 21 Jun 2021 15:26:14 +0200
Subject: [PATCH 0809/1497] Doc

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

diff --git a/ChangeLog b/ChangeLog
index ef4f01d84c7..98c22d90bf7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -64,7 +64,7 @@ NEW: VAT payment request and VAT payment are now 2 different steps in workflow o
 NEW: VAT report - Optimisation & collapse by rate
 NEW: When a doc file is shared, link is visible from the main page of doc.
 NEW: #16378 more E-Mail Contact substitution Values for better salutation
-NEW: option to keep the "Automatically create a total payment" checkbox empty on the tax creation page
+NEW: option to keep the "Automatically create the payment" checkbox empty on the tax creation page
 
  Accountancy
 NEW: Accountancy - Add FEC import
@@ -285,7 +285,6 @@ FIX: test must be === and not ==
 FIX: test on link type
 FIX: type link extrafield case for advanced target emailing
 FIX: Write right on document
->>>>>>> branch '13.0' of git@github.com:Dolibarr/dolibarr.git
 
 
 ***** ChangeLog for 13.0.2 compared to 13.0.1 *****

From 05bb2c720d06501eb6e744996201e0b9c5b0bd7e Mon Sep 17 00:00:00 2001
From: damien clochard <damien@dalibo.com>
Date: Mon, 21 Jun 2021 18:24:52 +0200
Subject: [PATCH 0810/1497] FIX #17996: Avoid implicit type casts for
 llx_adherent_type.subscription

The llx_adherent_type.subscription column is VARCHAR so we need to
compare it with a string, not an int.
---
 htdocs/adherents/list.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index 7a4a7d5bc1f..d669270b565 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -363,13 +363,13 @@ if ($search_type > 0) {
 	$sql .= " AND t.rowid=".((int) $search_type);
 }
 if ($search_filter == 'withoutsubscription') {
-	$sql .= " AND (datefin IS NULL OR t.subscription = 0)";
+	$sql .= " AND (datefin IS NULL OR t.subscription = '0')";
 }
 if ($search_filter == 'uptodate') {
-	$sql .= " AND (datefin >= '".$db->idate($now)."' OR t.subscription = 0)";
+	$sql .= " AND (datefin >= '".$db->idate($now)."' OR t.subscription = '0')";
 }
 if ($search_filter == 'outofdate') {
-	$sql .= " AND (datefin < '".$db->idate($now)."' AND t.subscription = 1)";
+	$sql .= " AND (datefin < '".$db->idate($now)."' AND t.subscription = '1')";
 }
 if ($search_status != '') {
 	// Peut valoir un nombre ou liste de nombre separes par virgules

From a0b594fbdc5b490a99107a10903aea89d87c5a3b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 21 Jun 2021 19:47:43 +0200
Subject: [PATCH 0811/1497] Debug emailcollector

---
 htdocs/admin/emailcollector_card.php          |  28 +--
 htdocs/core/class/commonobject.class.php      |  10 +-
 htdocs/core/class/translate.class.php         |   2 +-
 .../class/emailcollector.class.php            |   5 +-
 .../template/class/myobject.class.php         |   4 +
 test/phpunit/AllTests.php                     |   4 +
 test/phpunit/EmailCollector.php               | 235 ++++++++++++++++++
 7 files changed, 269 insertions(+), 19 deletions(-)
 create mode 100644 test/phpunit/EmailCollector.php

diff --git a/htdocs/admin/emailcollector_card.php b/htdocs/admin/emailcollector_card.php
index 724c4ab6dd4..4e2c9e34bf9 100644
--- a/htdocs/admin/emailcollector_card.php
+++ b/htdocs/admin/emailcollector_card.php
@@ -482,13 +482,13 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	print '<input type="hidden" name="id" value="'.$object->id.'">';
 
 	// Filters
-	print '<div class="div-table-responsive">';
-	print '<table class="border centpercent tableforfield">';
-	print '<tr class="liste_titre">';
+	print '<div class="div-table-responsive-no-min">';
+	print '<table id="tablelineoffilters" class="noborder margintable noshadow">';
+	print '<tr class="liste_titre nodrag nodrop">';
 	print '<td>'.$form->textwithpicto($langs->trans("Filters"), $langs->trans("EmailCollectorFilterDesc")).'</td><td></td><td></td>';
 	print '</tr>';
 	// Add filter
-	print '<tr class="oddeven">';
+	print '<tr class="oddeven nodrag nodrop">';
 	print '<td>';
 	$arrayoftypes = array(
 		'from'=>array('label'=>'MailFrom', 'data-placeholder'=>$langs->trans('SearchString')),
@@ -518,7 +518,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		'isnotanswer'=>array('label'=>'IsNotAnAnswer', 'data-noparam'=>1),
 		'isanswer'=>array('label'=>'IsAnAnswer', 'data-noparam'=>1)
 	);
-	print $form->selectarray('filtertype', $arrayoftypes, '', 1, 0, 0, '', 1, 0, 0, '', 'maxwidth500', 1, '', 2);
+	print $form->selectarray('filtertype', $arrayoftypes, '', 1, 0, 0, '', 1, 0, 0, '', 'maxwidth300', 1, '', 2);
 
 	print "\n";
 	print '<script>';
@@ -542,7 +542,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	print '</td><td>';
 	print '<input type="text" name="rulevalue" id="rulevalue">';
 	print '</td>';
-	print '<td class="right"><input type="submit" name="addfilter" id="addfilter" class="flat button" value="'.$langs->trans("Add").'"></td>';
+	print '<td class="right"><input type="submit" name="addfilter" id="addfilter" class="flat button small" value="'.$langs->trans("Add").'"></td>';
 	print '</tr>';
 	// List filters
 	foreach ($object->filters as $rulefilter) {
@@ -568,12 +568,12 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	// Operations
 	print '<div class="div-table-responsive">';
-	print '<table id="tablelines" class="noborder noshadow tableforfield">';
-	print '<tr class="liste_titre">';
+	print '<table id="tablelines" class="noborder margintable noshadow">';
+	print '<tr class="liste_titre nodrag nodrop">';
 	print '<td>'.$form->textwithpicto($langs->trans("EmailcollectorOperations"), $langs->trans("EmailcollectorOperationsDesc")).'</td><td></td><td></td><td></td>';
 	print '</tr>';
 	// Add operation
-	print '<tr class="oddeven">';
+	print '<tr class="oddeven nodrag nodrop">';
 	print '<td>';
 	$arrayoftypes = array(
 		'loadthirdparty'=>$langs->trans('LoadThirdPartyFromName', $langs->transnoentities("ThirdPartyName")),
@@ -609,7 +609,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	$htmltext = $langs->transnoentitiesnoconv("OperationParamDesc");
 	print $form->textwithpicto('', $htmltext, 1, 'help', '', 0, 2, 'operationparamtt');
 	print '</td>';
-	print '<td class="right"><input type="submit" name="addoperation" id="addoperation" class="flat button" value="'.$langs->trans("Add").'"></td>';
+	print '<td class="right"><input type="submit" name="addoperation" id="addoperation" class="flat button small" value="'.$langs->trans("Add").'"></td>';
 	print '</tr>';
 	// List operations
 	$nboflines = count($object->actions);
@@ -630,12 +630,12 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			print $form->textwithpicto('', $langs->transnoentitiesnoconv('EmailCollectorLoadThirdPartyHelp'));
 		}
 		print '</td>';
-		print '<td class="wordbreak">';
+		print '<td class="wordbreak minwidth300">';
 		if ($action == 'editoperation' && $ruleaction['id'] == $operationid) {
 			print '<input type="text" class="quatrevingtquinzepercent" name="operationparam2" value="'.$ruleaction['actionparam'].'"><br>';
-			print '<input type="hidden" name="rowidoperation2" value="'.$ruleaction['id'].'"><br>';
-			print '<input type="submit" class="button button-save" name="saveoperation2" value="'.$langs->trans("Save").'">';
-			print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
+			print '<input type="hidden" name="rowidoperation2" value="'.$ruleaction['id'].'">';
+			print '<input type="submit" class="button small button-save" name="saveoperation2" value="'.$langs->trans("Save").'">';
+			print '<input type="submit" class="button small button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 		} else {
 			print $ruleaction['actionparam'];
 		}
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index eeae94ff880..ce7efebba33 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -5835,7 +5835,8 @@ abstract class CommonObject
 						$mandatorypb = true;
 					}
 					if ($mandatorypb) {
-						dol_syslog("Mandatory extra field ".$key." is empty");
+						$langs->load("errors");
+						dol_syslog("Mandatory field '".$key."' is empty during create and set to required into definition of extrafields");
 						$this->errors[] = $langs->trans('ErrorFieldRequired', $attributeLabel);
 						return -1;
 					}
@@ -6201,7 +6202,8 @@ abstract class CommonObject
 					$mandatorypb = true;
 				}
 				if ($mandatorypb) {
-					dol_syslog("Mandatory extra field options_".$key." is empty");
+					$langs->load("errors");
+					dol_syslog("Mandatory field 'options_".$key."' is empty during update and set to required into definition of extrafields");
 					$this->errors[] = $langs->trans('ErrorFieldRequired', $attributeLabel);
 					return -1;
 				}
@@ -8380,12 +8382,14 @@ abstract class CommonObject
 
 			if (isset($this->fields[$key]['notnull']) && $this->fields[$key]['notnull'] == 1 && (!isset($values[$key]) || $values[$key] === 'NULL') && is_null($this->fields[$key]['default'])) {
 				$error++;
+				$langs->load("errors");
+				dol_syslog("Mandatory field '".$key."' is empty and required into ->fields definition of class");
 				$this->errors[] = $langs->trans("ErrorFieldRequired", $this->fields[$key]['label']);
 			}
 
 			// If value is null and there is a default value for field
 			if (isset($this->fields[$key]['notnull']) && $this->fields[$key]['notnull'] == 1 && (!isset($values[$key]) || $values[$key] === 'NULL') && !is_null($this->fields[$key]['default'])) {
-				$values[$key] = $this->fields[$key]['default'];
+				$values[$key] = $this->quote($this->fields[$key]['default'], $this->fields[$key]);
 			}
 
 			// If field is an implicit foreign key field
diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php
index 2a25652761d..b535d2b3585 100644
--- a/htdocs/core/class/translate.class.php
+++ b/htdocs/core/class/translate.class.php
@@ -204,7 +204,7 @@ class Translate
 			dol_print_error('', get_class($this)."::Load ErrorWrongParameters");
 			return -1;
 		}
-		if ($this->defaultlang == 'none_NONE') {
+		if ($this->defaultlang === 'none_NONE') {
 			return 0; // Special language code to not translate keys
 		}
 
diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index 573bb6bd5b3..1e7ce0fa195 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -274,7 +274,7 @@ class EmailCollector extends CommonObject
 			}
 		}
 
-		if (is_array($this->filters) && count($this->filters)) {
+		if (is_array($this->actions) && count($this->actions)) {
 			$emailcollectoroperation = new EmailCollectorAction($this->db);
 
 			foreach ($this->actions as $operation) {
@@ -653,6 +653,9 @@ class EmailCollector extends CommonObject
 	 */
 	public function initAsSpecimen()
 	{
+		$this->host = 'localhost';
+		$this->login = 'alogin';
+
 		$this->initAsSpecimenCommon();
 	}
 
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index 76c6bb691f5..41ea75ec515 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -941,6 +941,10 @@ class MyObject extends CommonObject
 	 */
 	public function initAsSpecimen()
 	{
+		// Set here init that are not commonf fields
+		// $this->property1 = ...
+		// $this->property2 = ...
+
 		$this->initAsSpecimenCommon();
 	}
 
diff --git a/test/phpunit/AllTests.php b/test/phpunit/AllTests.php
index 2444e8fe9dc..09c5226e059 100644
--- a/test/phpunit/AllTests.php
+++ b/test/phpunit/AllTests.php
@@ -256,6 +256,10 @@ class AllTests
 		require_once dirname(__FILE__).'/StripeTest.php';
 		$suite->addTestSuite('StripeTest');
 
+		// Email collector
+		require_once dirname(__FILE__).'/EmailCollectorTest.php';
+		$suite->addTestSuite('EmailCollectorTest');
+
 		return $suite;
 	}
 }
diff --git a/test/phpunit/EmailCollector.php b/test/phpunit/EmailCollector.php
new file mode 100644
index 00000000000..da77825b3b9
--- /dev/null
+++ b/test/phpunit/EmailCollector.php
@@ -0,0 +1,235 @@
+<?php
+/* Copyright (C) 2010 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 <https://www.gnu.org/licenses/>.
+ * or see https://www.gnu.org/
+ */
+
+/**
+ *      \file       test/phpunit/EmailCollectorTest.php
+ *      \ingroup    test
+ *      \brief      PHPUnit test
+ *      \remarks    To run this script as CLI:  phpunit filename.php
+ */
+
+global $conf,$user,$langs,$db;
+//define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
+//require_once 'PHPUnit/Autoload.php';
+require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
+require_once dirname(__FILE__).'/../../htdocs/emailcollector/class/emailcollector.class.php';
+
+if (empty($user->id)) {
+	print "Load permissions for admin user nb 1\n";
+	$user->fetch(1);
+	$user->getrights();
+}
+$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+
+
+
+
+/**
+ * Class for PHPUnit tests
+ *
+ * @backupGlobals disabled
+ * @backupStaticAttributes enabled
+ * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
+ */
+class EmailCollectorTest extends PHPUnit\Framework\TestCase
+{
+	protected $savconf;
+	protected $savuser;
+	protected $savlangs;
+	protected $savdb;
+
+	/**
+	 * Constructor
+	 * We save global variables into local variables
+	 *
+	 * @return ExpenseReportTest
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+
+		//$this->sharedFixture
+		global $conf,$user,$langs,$db;
+		$this->savconf=$conf;
+		$this->savuser=$user;
+		$this->savlangs=$langs;
+		$this->savdb=$db;
+
+		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+		//print " - db ".$db->db;
+		print "\n";
+	}
+
+	/**
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
+
+		print __METHOD__."\n";
+	}
+
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->rollback();
+
+		print __METHOD__."\n";
+	}
+
+	/**
+	 * Init phpunit tests
+	 *
+	 * @return  void
+	 */
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
+
+		print __METHOD__."\n";
+		//print $db->getVersion()."\n";
+	}
+	/**
+	 * End phpunit tests
+	 *
+	 * @return	void
+	 */
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
+
+	/**
+	 * testEmailCollectorCreate
+	 *
+	 * @return	void
+	 */
+	public function testEmailCollectorCreate()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
+
+		$langs->load("main");
+
+		// Create supplier order with a too low quantity
+		$localobject=new EmailCollector($db);
+		$localobject->initAsSpecimen();         // Init a specimen with lines
+
+		$this->filters = array();
+
+		$this->actions = array();
+
+		$result=$localobject->create($user);
+		print __METHOD__." result=".$result."\n";
+		$this->assertGreaterThan(0, $result, "Error on test EmailCollector create: ".$localobject->error.' '.join(',', $localobject->errors));
+
+		return $result;
+	}
+
+
+	/**
+	 * testEmailCollectorFetch
+	 *
+	 * @param   int $id     Id of supplier order
+	 * @return  void
+	 *
+	 * @depends testEmailCollectorCreate
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testEmailCollectorFetch($id)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
+
+		$localobject=new EmailCollector($this->savdb);
+		$result=$localobject->fetch($id);
+
+		print __METHOD__." id=".$id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
+		return $localobject;
+	}
+
+	/**
+	 * testEmailCollectorOther
+	 *
+	 * @param   EmailCollector $localobject     EmailCollector
+	 * @return  void
+	 *
+	 * @depends testEmailCollectorFetch
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testEmailCollectorCollect($localobject)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
+
+		$result=$localobject->getConnectStringIMAP();
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$this->assertEquals('{localhost:993/service=imap/ssl/novalidate-cert}', $result, 'Error in getConnectStringIMAP '.$localobject->error);
+
+		return $localobject->id;
+	}
+
+	/**
+	 * testEmailCollectorDelete
+	 *
+	 * @param   int $id     Id of order
+	 * @return  void
+	 *
+	 * @depends testEmailCollectorCollect
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testEmailCollectorDelete($id)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
+
+		$localobject=new EmailCollector($this->savdb);
+		$result=$localobject->fetch($id);
+		$result=$localobject->delete($user);
+
+		print __METHOD__." id=".$id." result=".$result."\n";
+		$this->assertGreaterThan(0, $result);
+		return $result;
+	}
+}

From 6014e4407f158c31f47e4d9ce54e5e5f46cca3ce Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 21 Jun 2021 20:50:56 +0200
Subject: [PATCH 0812/1497] Clean code

---
 htdocs/core/class/conf.class.php | 79 +++++++++++++++++++-------------
 1 file changed, 46 insertions(+), 33 deletions(-)

diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 8766d68c25b..7a2e1866871 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -32,8 +32,9 @@
  */
 class Conf
 {
-	/** \public */
-	//! To store properties found in conf file
+	/**
+	 * @var Object 	Associative array with properties found in conf file
+	 */
 	public $file;
 
 	/**
@@ -60,29 +61,16 @@ class Conf
 	//! Used to store current menu handler
 	public $standard_menu;
 	// List of activated modules
-	public $modules = array();
-	public $modules_parts = array(
-		'css' => array(),
-		'js' => array(),
-		'tabs' => array(),
-		'triggers' => array(),
-		'login' => array(),
-		'substitutions' => array(),
-		'menus' => array(),
-		'theme' => array(),
-		'sms' => array(),
-		'tpl' => array(),
-		'barcode' => array(),
-		'models' => array(),
-		'societe' => array(),
-		'hooks' => array(),
-		'dir' => array(),
-		'syslog' => array(),
-	);
+	public $modules;
+	public $modules_parts;
 
 	// An array to store cache results ->cache['nameofcache']=...
-	public $cache = array();
+	public $cache;
 
+
+	/**
+	 * @var string[]
+	 */
 	public $logbuffer = array();
 
 	/**
@@ -116,20 +104,42 @@ class Conf
 		// Properly declare multi-modules objects.
 		$this->file = new stdClass();
 		$this->db = new stdClass();
-		$this->global = new stdClass();
-		$this->mycompany = new stdClass();
-		$this->admin			= new stdClass();
-		$this->user				= new stdClass();
-		$this->syslog			= new stdClass();
-		$this->browser = new stdClass();
-		$this->medias			= new stdClass();
-		$this->multicompany = new stdClass();
-
 		//! Charset for HTML output and for storing data in memory
 		$this->file->character_set_client = 'UTF-8'; // UTF-8, ISO-8859-1
 
+		// Common objects that are not modules
+		$this->mycompany = new stdClass();
+		$this->admin = new stdClass();
+		$this->user	= new stdClass();
+		$this->browser = new stdClass();
+		$this->medias = new stdClass();
+		$this->global = new stdClass();
+
+		$this->cache = array();
+		$this->modules = array();
+		$this->modules_parts = array(
+			'css' => array(),
+			'js' => array(),
+			'tabs' => array(),
+			'triggers' => array(),
+			'login' => array(),
+			'substitutions' => array(),
+			'menus' => array(),
+			'theme' => array(),
+			'sms' => array(),
+			'tpl' => array(),
+			'barcode' => array(),
+			'models' => array(),
+			'societe' => array(),
+			'hooks' => array(),
+			'dir' => array(),
+			'syslog' => array()
+		);
+
 		// First level object
 		// TODO Remove this part.
+		$this->syslog = new stdClass();
+		$this->multicompany = new stdClass();
 		$this->expedition_bon = new stdClass();
 		$this->delivery_note = new stdClass();
 		$this->fournisseur = new stdClass();
@@ -154,7 +164,7 @@ class Conf
 
 	/**
 	 *  Load setup values into conf object (read llx_const)
-	 *  Note that this->db->xxx, this->file->xxx and this->multicompany have been already loaded when setValues is called.
+	 *  Note that this->db->xxx, this->file->xxx have been already set when setValues is called.
 	 *
 	 *  @param      DoliDB      $db     Database handler
 	 *  @return     int                 < 0 if KO, >= 0 if OK
@@ -876,7 +886,10 @@ class Conf
 			}
 			foreach ($handlers as $handler) {
 				$handler_file_found = '';
-				$dirsyslogs = array_merge(array('/core/modules/syslog/'), $this->modules_parts['syslog']);
+				$dirsyslogs = array('/core/modules/syslog/');
+				if (!empty($this->modules_parts['syslog']) && is_array($this->modules_parts['syslog'])) {
+					$dirsyslogs = array_merge($dirsyslogs, $this->modules_parts['syslog']);
+				}
 				foreach ($dirsyslogs as $reldir) {
 					$dir = dol_buildpath($reldir, 0);
 					$newdir = dol_osencode($dir);

From 23f6e183d3e5b480964d16c96b14caa2aad9ce15 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 21 Jun 2021 21:51:41 +0200
Subject: [PATCH 0813/1497] Forget information in tooltip for direct download

---
 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 fed3f697cb6..380a50a22fe 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -6872,6 +6872,8 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 			$substitutionarray['__DIRECTDOWNLOAD_URL_PROPOSAL__'] = 'Direct download url of a proposal';
 			$substitutionarray['__DIRECTDOWNLOAD_URL_ORDER__'] = 'Direct download url of an order';
 			$substitutionarray['__DIRECTDOWNLOAD_URL_INVOICE__'] = 'Direct download url of an invoice';
+			$substitutionarray['__DIRECTDOWNLOAD_URL_CONTRACT__'] = 'Direct download url of a contract';
+			$substitutionarray['__DIRECTDOWNLOAD_URL_SUPPLIER_PROPOSAL__'] = 'Direct download url of a supplier proposal';
 
 			if (!empty($conf->expedition->enabled) && (!is_object($object) || $object->element == 'shipping')) {
 				$substitutionarray['__SHIPPINGTRACKNUM__'] = 'Shipping tracking number';

From 05c0bc4facefd0fdd23f82bd3c059f4df1989064 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 22 Jun 2021 10:44:49 +0200
Subject: [PATCH 0814/1497] css

---
 htdocs/comm/action/list.php      | 6 +++---
 htdocs/theme/eldy/global.inc.php | 3 +++
 htdocs/theme/md/style.css.php    | 3 +++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index 8bf35df622d..e95cc3366c5 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -391,7 +391,7 @@ $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // N
 $sql .= $hookmanager->resPrint;
 
 $sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a";
-$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."actioncomm_extrafields as ef ON (a.id = ef.fk_object) ";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."actioncomm_extrafields as ef ON (a.id = ef.fk_object)";
 if (!$user->rights->societe->client->voir && !$socid) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
 }
@@ -578,8 +578,8 @@ if ($resql) {
 	//print dol_get_fiche_end();
 
 	// Add link to show birthdays
-	$link = '';
 	/*
+	$link = '';
 	if (empty($conf->use_javascript_ajax))
 	{
 		$newparam=$param;   // newparam is for birthday links
@@ -841,7 +841,7 @@ if ($resql) {
 
 		// Ref
 		if (!empty($arrayfields['a.id']['checked'])) {
-			print '<td>';
+			print '<td class="nowraponall">';
 			print $actionstatic->getNomUrl(1, -1);
 			print '</td>';
 		}
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index d223a70fbc9..754fcd930a5 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -6064,6 +6064,9 @@ dl.dropdown {
 	display:inline-block;
 	padding: 0 3px 2px 0;
 }
+.maxwidthsearch .dropdown dt a span, .multiSel span {
+	padding: 0 3px 2px 3px;
+}
 .dropdown span.value {
 	display:none;
 }
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 5027c1501e9..9a04b44c96d 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -5931,6 +5931,9 @@ dl.dropdown {
 	display:inline-block;
 	padding: 0 3px 2px 0;
 }
+.maxwidthsearch .dropdown dt a span, .multiSel span {
+	padding: 0 3px 2px 3px;
+}
 .dropdown span.value {
 	display:none;
 }

From 8887f71c261ee4914059bae91e5d7d4300f7c30a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 22 Jun 2021 10:57:16 +0200
Subject: [PATCH 0815/1497] Doc

---
 htdocs/core/lib/functions.lib.php | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index fed3f697cb6..08c8a303cc9 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -5672,16 +5672,16 @@ function getLocalTaxesFromRate($vatrate, $local, $buyer, $seller, $firstparamisi
 }
 
 /**
- *	Return vat rate of a product in a particular selling country or default country vat if product is unknown
- *  Function called by get_default_tva
+ *	Return vat rate of a product in a particular country, or default country vat if product is unknown.
+ *  Function called by get_default_tva().
  *
  *  @param	int			$idprod          	Id of product or 0 if not a predefined product
- *  @param  Societe		$thirdparty_seller  Thirdparty with a ->country_code defined (FR, US, IT, ...)
+ *  @param  Societe		$thirdpartytouse  	Thirdparty with a ->country_code defined (FR, US, IT, ...)
  *	@param	int			$idprodfournprice	Id product_fournisseur_price (for "supplier" proposal/order/invoice)
  *  @return float|string   				    Vat rate to use with format 5.0 or '5.0 (XXX)'
  *  @see get_product_localtax_for_country()
  */
-function get_product_vat_for_country($idprod, $thirdparty_seller, $idprodfournprice = 0)
+function get_product_vat_for_country($idprod, $thirdpartytouse, $idprodfournprice = 0)
 {
 	global $db, $conf, $mysoc;
 
@@ -5695,7 +5695,7 @@ function get_product_vat_for_country($idprod, $thirdparty_seller, $idprodfournpr
 		$product = new Product($db);
 		$result = $product->fetch($idprod);
 
-		if ($mysoc->country_code == $thirdparty_seller->country_code) { // If selling country is ours
+		if ($mysoc->country_code == $thirdpartytouse->country_code) { // If country to consider is ours
 			if ($idprodfournprice > 0) {     // We want vat for product for a "supplier" object
 				$product->get_buyprice($idprodfournprice, 0, 0, 0);
 				$ret = $product->vatrate_supplier;
@@ -5710,8 +5710,8 @@ function get_product_vat_for_country($idprod, $thirdparty_seller, $idprodfournpr
 			}
 			$found = 1;
 		} else {
-			// TODO Read default product vat according to countrycode and product. Vat for couple countrycode/product is a feature not implemeted yet.
-			// May be usefull/required if hidden option SERVICE_ARE_ECOMMERCE_200238EC is on
+			// TODO Read default product vat according to product and another countrycode.
+			// Vat for couple anothercountrycode/product is data that is not managed and store yet, so we will fallback on next rule.
 		}
 	}
 
@@ -5720,7 +5720,7 @@ function get_product_vat_for_country($idprod, $thirdparty_seller, $idprodfournpr
 			// If vat of product for the country not found or not defined, we return the first higher vat of country.
 			$sql = "SELECT t.taux as vat_rate, t.code as default_vat_code";
 			$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
-			$sql .= " WHERE t.active=1 AND t.fk_pays = c.rowid AND c.code='".$db->escape($thirdparty_seller->country_code)."'";
+			$sql .= " WHERE t.active=1 AND t.fk_pays = c.rowid AND c.code='".$db->escape($thirdpartytouse->country_code)."'";
 			$sql .= " ORDER BY t.taux DESC, t.code ASC, t.recuperableonly ASC";
 			$sql .= $db->plimit(1);
 
@@ -5747,15 +5747,15 @@ function get_product_vat_for_country($idprod, $thirdparty_seller, $idprodfournpr
 }
 
 /**
- *	Return localtax vat rate of a product in a particular selling country or default country vat if product is unknown
+ *	Return localtax vat rate of a product in a particular country or default country vat if product is unknown
  *
  *  @param	int		$idprod         		Id of product
  *  @param  int		$local          		1 for localtax1, 2 for localtax 2
- *  @param  Societe	$thirdparty_seller    	Thirdparty with a ->country_code defined (FR, US, IT, ...)
+ *  @param  Societe	$thirdpartytouse    	Thirdparty with a ->country_code defined (FR, US, IT, ...)
  *  @return int             				<0 if KO, Vat rate if OK
  *  @see get_product_vat_for_country()
  */
-function get_product_localtax_for_country($idprod, $local, $thirdparty_seller)
+function get_product_localtax_for_country($idprod, $local, $thirdpartytouse)
 {
 	global $db, $mysoc;
 
@@ -5771,14 +5771,15 @@ function get_product_localtax_for_country($idprod, $local, $thirdparty_seller)
 		$product = new Product($db);
 		$result = $product->fetch($idprod);
 
-		if ($mysoc->country_code == $thirdparty_seller->country_code) { // If selling country is ours
+		if ($mysoc->country_code == $thirdpartytouse->country_code) { // If selling country is ours
 			/* Not defined yet, so we don't use this
 			if ($local==1) $ret=$product->localtax1_tx;
 			elseif ($local==2) $ret=$product->localtax2_tx;
 			$found=1;
 			*/
 		} else {
-			// TODO Read default product vat according to countrycode and product
+			// TODO Read default product vat according to product and another countrycode.
+			// Vat for couple anothercountrycode/product is data that is not managed and store yet, so we will fallback on next rule.
 		}
 	}
 
@@ -5786,7 +5787,7 @@ function get_product_localtax_for_country($idprod, $local, $thirdparty_seller)
 		// If vat of product for the country not found or not defined, we return higher vat of country.
 		$sql = "SELECT taux as vat_rate, localtax1, localtax2";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
-		$sql .= " WHERE t.active=1 AND t.fk_pays = c.rowid AND c.code='".$db->escape($thirdparty_seller->country_code)."'";
+		$sql .= " WHERE t.active=1 AND t.fk_pays = c.rowid AND c.code='".$db->escape($thirdpartytouse->country_code)."'";
 		$sql .= " ORDER BY t.taux DESC, t.recuperableonly ASC";
 		$sql .= $db->plimit(1);
 

From 312968eeac06c75415ec59f42141d3cfa6265585 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 22 Jun 2021 11:38:02 +0200
Subject: [PATCH 0816/1497] Clean code

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

diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 04b631b7ee1..7fd294b89b2 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -382,6 +382,7 @@ class ActionComm extends CommonObject
 	 */
 	const EVENT_FINISHED = 100;
 
+
 	/**
 	 *      Constructor
 	 *
@@ -752,7 +753,7 @@ class ActionComm extends CommonObject
 		$sql .= " a.durationp,"; // deprecated
 		$sql .= " a.datec,";
 		$sql .= " a.tms as datem,";
-		$sql .= " a.code, a.label, a.note,";
+		$sql .= " a.code, a.label, a.note as note_private,";
 		$sql .= " a.fk_soc,";
 		$sql .= " a.fk_project,";
 		$sql .= " a.fk_user_author, a.fk_user_mod,";
@@ -811,8 +812,8 @@ class ActionComm extends CommonObject
 				$this->datec = $this->db->jdate($obj->datec);
 				$this->datem = $this->db->jdate($obj->datem);
 
-				$this->note = $obj->note; // deprecated
-				$this->note_private = $obj->note;
+				$this->note = $obj->note_private; // deprecated
+				$this->note_private = $obj->note_private;
 				$this->percentage = $obj->percentage;
 
 				$this->authorid = $obj->fk_user_author;
@@ -1822,7 +1823,7 @@ class ActionComm extends CommonObject
 			$sql .= " a.datep2,"; // End
 			$sql .= " a.durationp,"; // deprecated
 			$sql .= " a.datec, a.tms as datem,";
-			$sql .= " a.label, a.code, a.note, a.fk_action as type_id,";
+			$sql .= " a.label, a.code, a.note as note_private, a.fk_action as type_id,";
 			$sql .= " a.fk_soc,";
 			$sql .= " a.fk_user_author, a.fk_user_mod,";
 			$sql .= " a.fk_user_action,";
@@ -1950,7 +1951,7 @@ class ActionComm extends CommonObject
 					$duration = ($datestart && $dateend) ? ($dateend - $datestart) : 0;
 					$event['summary'] = $obj->label.($obj->socname ? " (".$obj->socname.")" : "");
 
-					$event['desc'] = $obj->note;
+					$event['desc'] = $obj->note_private;
 					$event['startdate'] = $datestart;
 					$event['enddate'] = $dateend; // Not required with type 'journal'
 					$event['duration'] = $duration; // Not required with type 'journal'

From d6e9947cd440771e76da1e27df92f38c4a0a03cf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 22 Jun 2021 12:30:50 +0200
Subject: [PATCH 0817/1497] CSS

---
 htdocs/core/boxes/box_graph_product_distribution.php | 2 +-
 htdocs/core/boxes/modules_boxes.php                  | 2 +-
 htdocs/theme/eldy/global.inc.php                     | 6 ++++++
 htdocs/theme/md/style.css.php                        | 6 ++++++
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/boxes/box_graph_product_distribution.php b/htdocs/core/boxes/box_graph_product_distribution.php
index c9ab7372c4c..2db8dd287b3 100644
--- a/htdocs/core/boxes/box_graph_product_distribution.php
+++ b/htdocs/core/boxes/box_graph_product_distribution.php
@@ -408,7 +408,7 @@ class box_graph_product_distribution extends ModeleBoxes
 				$stringtoshow .= '</div></div>';
 			}
 			$this->info_box_contents[0][0] = array(
-				'tr'=>'class="oddeven nohover"',
+				'tr' => 'class="oddeven nohover"',
 				'td' => 'class="nohover center"',
 				'textnoformat'=>$stringtoshow,
 			);
diff --git a/htdocs/core/boxes/modules_boxes.php b/htdocs/core/boxes/modules_boxes.php
index 45cc02ac67e..246bec42ba4 100644
--- a/htdocs/core/boxes/modules_boxes.php
+++ b/htdocs/core/boxes/modules_boxes.php
@@ -229,7 +229,7 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" box
 				$out .= '>';
 				if (!empty($conf->use_javascript_ajax)) {
 					//$out.= '<table summary="" class="nobordernopadding" width="100%"><tr><td class="tdoverflowmax150 maxwidth150onsmartphone">';
-					$out .= '<div class="tdoverflowmax250 maxwidth150onsmartphone float">';
+					$out .= '<div class="tdoverflowmax400 maxwidth250onsmartphone float">';
 				}
 				if (!empty($head['text'])) {
 					$s = dol_trunc($head['text'], isset($head['limit']) ? $head['limit'] : $MAXLENGTHBOX);
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 754fcd930a5..7847088dfa1 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -1136,6 +1136,12 @@ select.flat.selectlimit {
 	text-overflow: ellipsis;
 	white-space: nowrap;
 }
+.tdoverflowmax250 {			/* For tdoverflow, the max-midth become a minimum ! */
+	max-width: 250px;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
 .tdoverflowmax300 {			/* For tdoverflow, the max-midth become a minimum ! */
 	max-width: 300px;
 	overflow: hidden;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 9a04b44c96d..9e7501f58ec 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1211,6 +1211,12 @@ select.flat.selectlimit {
 	text-overflow: ellipsis;
 	white-space: nowrap;
 }
+.tdoverflowmax250 {			/* For tdoverflow, the max-midth become a minimum ! */
+	max-width: 250px;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
 .tdoverflowmax300 {			/* For tdoverflow, the max-midth become a minimum ! */
 	max-width: 300px;
 	overflow: hidden;

From 21ebfb60948af94070960a00e9b9886bc362511a Mon Sep 17 00:00:00 2001
From: lvessiller <lvessiller@open-dsi.fr>
Date: Tue, 22 Jun 2021 14:13:18 +0200
Subject: [PATCH 0818/1497] NEW parent company on exports

---
 htdocs/core/modules/modCommande.class.php    |  9 +++++----
 htdocs/core/modules/modFacture.class.php     | 12 +++++++++---
 htdocs/core/modules/modFournisseur.class.php |  7 ++++---
 htdocs/core/modules/modPropale.class.php     | 10 +++++-----
 4 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/htdocs/core/modules/modCommande.class.php b/htdocs/core/modules/modCommande.class.php
index 6a44075822c..4275d806d40 100644
--- a/htdocs/core/modules/modCommande.class.php
+++ b/htdocs/core/modules/modCommande.class.php
@@ -193,7 +193,7 @@ class modCommande extends DolibarrModules
 		$this->export_label[$r] = 'CustomersOrdersAndOrdersLines'; // Translation key (used only if key ExportDataset_xxx_z not found)
 		$this->export_permission[$r] = array(array("commande", "commande", "export"));
 		$this->export_fields_array[$r] = array(
-			's.rowid'=>"IdCompany", 's.nom'=>'CompanyName', 's.address'=>'Address', 's.zip'=>'Zip', 's.town'=>'Town', 'd.nom'=>'State', 'co.label'=>'Country',
+			's.rowid'=>"IdCompany", 's.nom'=>'CompanyName', 'ps.nom'=>'ParentCompany', 's.address'=>'Address', 's.zip'=>'Zip', 's.town'=>'Town', 'd.nom'=>'State', 'co.label'=>'Country',
 			'co.code'=>"CountryCode", 's.phone'=>'Phone', 's.siren'=>'ProfId1', 's.siret'=>'ProfId2', 's.ape'=>'ProfId3', 's.idprof4'=>'ProfId4', 'c.rowid'=>"Id",
 			'c.ref'=>"Ref", 'c.ref_client'=>"RefCustomer", 'c.fk_soc'=>"IdCompany", 'c.date_creation'=>"DateCreation", 'c.date_commande'=>"OrderDate",
 			'c.date_livraison'=>"DateDeliveryPlanned", 'c.amount_ht'=>"Amount", 'c.remise_percent'=>"GlobalDiscount", 'c.total_ht'=>"TotalHT",
@@ -219,7 +219,7 @@ class modCommande extends DolibarrModules
 		//	'p.rowid'=>'List:product:ref','p.ref'=>'Text','p.label'=>'Text'
 		//);
 		$this->export_TypeFields_array[$r] = array(
-			's.nom'=>'Text', 's.address'=>'Text', 's.zip'=>'Text', 's.town'=>'Text', 'co.label'=>'List:c_country:label:label', 'co.code'=>'Text', 's.phone'=>'Text',
+			's.nom'=>'Text', 'ps.nom'=>'Text', 's.address'=>'Text', 's.zip'=>'Text', 's.town'=>'Text', 'co.label'=>'List:c_country:label:label', 'co.code'=>'Text', 's.phone'=>'Text',
 			's.siren'=>'Text', 's.siret'=>'Text', 's.ape'=>'Text', 's.idprof4'=>'Text', 'c.ref'=>"Text", 'c.ref_client'=>"Text", 'c.date_creation'=>"Date",
 			'c.date_commande'=>"Date", 'c.date_livraison'=>"Date", 'c.amount_ht'=>"Numeric", 'c.remise_percent'=>"Numeric", 'c.total_ht'=>"Numeric",
 			'c.total_ttc'=>"Numeric", 'c.facture'=>"Boolean", 'c.fk_statut'=>'Status', 'c.note_public'=>"Text", 'c.date_livraison'=>'Date', 'pj.ref'=>'Text',
@@ -227,7 +227,7 @@ class modCommande extends DolibarrModules
 			'cd.total_ttc'=>"Numeric", 'p.rowid'=>'List:product:ref::product', 'p.ref'=>'Text', 'p.label'=>'Text', 'd.nom'=>'Text'
 		);
 		$this->export_entities_array[$r] = array(
-			's.rowid'=>"company", 's.nom'=>'company', 's.address'=>'company', 's.zip'=>'company', 's.town'=>'company', 'd.nom'=>'company', 'co.label'=>'company',
+			's.rowid'=>"company", 's.nom'=>'company', 'ps.nom'=>'company', 's.address'=>'company', 's.zip'=>'company', 's.town'=>'company', 'd.nom'=>'company', 'co.label'=>'company',
 			'co.code'=>'company', 's.phone'=>'company', 's.siren'=>'company', 's.ape'=>'company', 's.idprof4'=>'company', 's.siret'=>'company', 'c.rowid'=>"order",
 			'c.ref'=>"order", 'c.ref_client'=>"order", 'c.fk_soc'=>"order", 'c.date_creation'=>"order", 'c.date_commande'=>"order", 'c.amount_ht'=>"order",
 			'c.remise_percent'=>"order", 'c.total_ht'=>"order", 'c.total_ttc'=>"order", 'c.facture'=>"order", 'c.fk_statut'=>"order", 'c.note'=>"order",
@@ -254,10 +254,11 @@ class modCommande extends DolibarrModules
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'societe as s';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_extrafields as extra4 ON s.rowid = extra4.fk_object';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as ps ON ps.rowid = s.parent';
 		if (empty($user->rights->societe->client->voir)) {
 			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
 		}
-		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_extrafields as extra4 ON s.rowid = extra4.fk_object';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON s.fk_departement = d.rowid';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON s.fk_pays = co.rowid,';
 		$this->export_sql_end[$r] .= ' '.MAIN_DB_PREFIX.'commande as c';
diff --git a/htdocs/core/modules/modFacture.class.php b/htdocs/core/modules/modFacture.class.php
index a9765f45ada..475c8fc5996 100644
--- a/htdocs/core/modules/modFacture.class.php
+++ b/htdocs/core/modules/modFacture.class.php
@@ -242,7 +242,7 @@ class modFacture extends DolibarrModules
 		$this->export_icon[$r] = 'invoice';
 		$this->export_permission[$r] = array(array("facture", "facture", "export", "other"));
 		$this->export_fields_array[$r] = array(
-			's.rowid'=>"IdCompany", 's.nom'=>'CompanyName', 's.code_client'=>'CustomerCode', 's.address'=>'Address', 's.zip'=>'Zip', 's.town'=>'Town', 'c.code'=>'CountryCode', 'cd.nom'=>'State',
+			's.rowid'=>"IdCompany", 's.nom'=>'CompanyName', 'ps.nom' => 'ParentCompany', 's.code_client'=>'CustomerCode', 's.address'=>'Address', 's.zip'=>'Zip', 's.town'=>'Town', 'c.code'=>'CountryCode', 'cd.nom'=>'State',
 			's.phone'=>'Phone',
 			's.siren'=>'ProfId1', 's.siret'=>'ProfId2', 's.ape'=>'ProfId3', 's.idprof4'=>'ProfId4',
 			's.code_compta'=>'CustomerAccountancyCode',
@@ -271,7 +271,7 @@ class modFacture extends DolibarrModules
 			$this->export_fields_array[$r]['f.pos_source'] = 'POSTerminal';
 		}
 		$this->export_TypeFields_array[$r] = array(
-			's.rowid'=>'Numeric', 's.nom'=>'Text', 's.code_client'=>'Text', 's.address'=>'Text', 's.zip'=>'Text', 's.town'=>'Text', 'c.code'=>'Text', 'cd.nom'=>'Text', 's.phone'=>'Text', 's.siren'=>'Text',
+			's.rowid'=>'Numeric', 's.nom'=>'Text', 'ps.nom'=>'Text', 's.code_client'=>'Text', 's.address'=>'Text', 's.zip'=>'Text', 's.town'=>'Text', 'c.code'=>'Text', 'cd.nom'=>'Text', 's.phone'=>'Text', 's.siren'=>'Text',
 			's.siret'=>'Text', 's.ape'=>'Text', 's.idprof4'=>'Text', 's.code_compta'=>'Text', 's.code_compta_fournisseur'=>'Text', 's.tva_intra'=>'Text',
 			'f.rowid'=>'Numeric', 'f.ref'=>"Text", 'f.ref_client'=>'Text', 'f.type'=>"Numeric", 'f.datec'=>"Date", 'f.datef'=>"Date", 'f.date_lim_reglement'=>"Date",
 			'f.total_ht'=>"Numeric", 'f.total_ttc'=>"Numeric", 'f.total_tva'=>"Numeric", 'f.localtax1'=>'Numeric', 'f.localtax2'=>'Numeric', 'f.paye'=>"Boolean", 'f.fk_statut'=>'Numeric', 'f.close_code'=>'Text', 'f.close_note'=>'Text',
@@ -287,7 +287,7 @@ class modFacture extends DolibarrModules
 			$this->export_TypeFields_array[$r]['f.pos_source'] = 'Text';
 		}
 		$this->export_entities_array[$r] = array(
-			's.rowid'=>"company", 's.nom'=>'company', 's.code_client'=>'company', 's.address'=>'company', 's.zip'=>'company', 's.town'=>'company', 'c.code'=>'company', 'cd.nom'=>'company', 's.phone'=>'company',
+			's.rowid'=>"company", 's.nom'=>'company', 'ps.nom'=>'company', 's.code_client'=>'company', 's.address'=>'company', 's.zip'=>'company', 's.town'=>'company', 'c.code'=>'company', 'cd.nom'=>'company', 's.phone'=>'company',
 			's.siren'=>'company', 's.siret'=>'company', 's.ape'=>'company', 's.idprof4'=>'company', 's.code_compta'=>'company', 's.code_compta_fournisseur'=>'company',
 			's.tva_intra'=>'company', 'pj.ref'=>'project', 'pj.title'=>'project', 'fd.rowid'=>'invoice_line', 'fd.label'=>"invoice_line", 'fd.description'=>"invoice_line",
 			'fd.subprice'=>"invoice_line", 'fd.total_ht'=>"invoice_line", 'fd.total_tva'=>"invoice_line", 'fd.total_ttc'=>"invoice_line", 'fd.tva_tx'=>"invoice_line",
@@ -309,8 +309,14 @@ class modFacture extends DolibarrModules
 		$keyforelement = 'product';
 		$keyforaliasextra = 'extra3';
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+		$keyforselect = 'societe';
+		$keyforelement = 'company';
+		$keyforaliasextra = 'extra4';
+		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'societe as s';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_extrafields as extra4 ON s.rowid = extra4.fk_object';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as ps ON ps.rowid = s.parent';
 		if (empty($user->rights->societe->client->voir)) {
 			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
 		}
diff --git a/htdocs/core/modules/modFournisseur.class.php b/htdocs/core/modules/modFournisseur.class.php
index fae1cfc0eb8..7696fd41683 100644
--- a/htdocs/core/modules/modFournisseur.class.php
+++ b/htdocs/core/modules/modFournisseur.class.php
@@ -288,7 +288,7 @@ class modFournisseur extends DolibarrModules
 		$this->export_icon[$r] = 'bill';
 		$this->export_permission[$r] = array(array("fournisseur", "facture", "export"));
 		$this->export_fields_array[$r] = array(
-			's.rowid'=>"IdCompany", 's.nom'=>'CompanyName', 's.address'=>'Address', 's.zip'=>'Zip', 's.town'=>'Town', 'c.code'=>'CountryCode', 's.phone'=>'Phone',
+			's.rowid'=>"IdCompany", 's.nom'=>'CompanyName', 'ps.nom'=>'ParentCompany', 's.address'=>'Address', 's.zip'=>'Zip', 's.town'=>'Town', 'c.code'=>'CountryCode', 's.phone'=>'Phone',
 			's.siren'=>'ProfId1', 's.siret'=>'ProfId2', 's.ape'=>'ProfId3', 's.idprof4'=>'ProfId4', 's.idprof5'=>'ProfId5', 's.idprof6'=>'ProfId6',
 			's.code_compta'=>'CustomerAccountancyCode', 's.code_compta_fournisseur'=>'SupplierAccountancyCode', 's.tva_intra'=>'VATIntra',
 			'f.rowid'=>"InvoiceId", 'f.ref'=>"InvoiceRef", 'f.ref_supplier'=>"RefSupplier", 'f.datec'=>"InvoiceDateCreation", 'f.datef'=>"DateInvoice", 'f.date_lim_reglement'=>'DateMaxPayment',
@@ -312,14 +312,14 @@ class modFournisseur extends DolibarrModules
 		//     'fd.tva'=>"Numeric",'fd.product_type'=>'Numeric','fd.fk_product'=>'List:product:label','p.ref'=>'Text','p.label'=>'Text'
 		//);
 		$this->export_TypeFields_array[$r] = array(
-			's.nom'=>'Text', 's.address'=>'Text', 's.zip'=>'Text', 's.town'=>'Text', 'c.code'=>'Text', 's.phone'=>'Text', 's.siren'=>'Text', 's.siret'=>'Text', 's.ape'=>'Text', 's.idprof4'=>'Text', 's.idprof5'=>'Text', 's.idprof6'=>'Text',
+			's.nom'=>'Text', 'ps.nom'=>'Text', 's.address'=>'Text', 's.zip'=>'Text', 's.town'=>'Text', 'c.code'=>'Text', 's.phone'=>'Text', 's.siren'=>'Text', 's.siret'=>'Text', 's.ape'=>'Text', 's.idprof4'=>'Text', 's.idprof5'=>'Text', 's.idprof6'=>'Text',
 			's.code_compta'=>'Text', 's.code_compta_fournisseur'=>'Text', 's.tva_intra'=>'Text', 'f.ref'=>"Text", 'f.ref_supplier'=>"Text", 'f.datec'=>"Date", 'f.datef'=>"Date", 'f.date_lim_reglement'=>'Date',
 			'f.total_ht'=>"Numeric", 'f.total_ttc'=>"Numeric", 'f.total_tva'=>"Numeric", 'f.paye'=>"Boolean", 'f.fk_statut'=>'Status', 'f.note_public'=>"Text", 'fd.description'=>"Text", 'fd.tva_tx'=>"Text",
 			'fd.qty'=>"Numeric", 'fd.total_ht'=>"Numeric", 'fd.total_ttc'=>"Numeric", 'fd.tva'=>"Numeric", 'fd.product_type'=>'Numeric', 'fd.fk_product'=>'List:product:label',
 			'p.ref'=>'Text', 'p.label'=>'Text', 'project.ref'=>'Text', 'project.title'=>'Text'
 		);
 		$this->export_entities_array[$r] = array(
-			's.rowid'=>"company", 's.nom'=>'company', 's.address'=>'company', 's.zip'=>'company', 's.town'=>'company', 'c.code'=>'company', 's.phone'=>'company', 's.siren'=>'company', 's.siret'=>'company',
+			's.rowid'=>"company", 's.nom'=>'company', 'ps.nom'=>'company', 's.address'=>'company', 's.zip'=>'company', 's.town'=>'company', 'c.code'=>'company', 's.phone'=>'company', 's.siren'=>'company', 's.siret'=>'company',
 			's.ape'=>'company', 's.idprof4'=>'company', 's.idprof5'=>'company', 's.idprof6'=>'company', 's.code_compta'=>'company', 's.code_compta_fournisseur'=>'company', 's.tva_intra'=>'company', 'f.rowid'=>"invoice",
 			'f.ref'=>"invoice", 'f.ref_supplier'=>"invoice", 'f.datec'=>"invoice", 'f.datef'=>"invoice", 'f.date_lim_reglement'=>'invoice', 'f.total_ht'=>"invoice", 'f.total_ttc'=>"invoice", 'f.total_tva'=>"invoice",
 			'f.paye'=>"invoice", 'f.fk_statut'=>'invoice', 'f.note_public'=>"invoice", 'fd.rowid'=>'invoice_line', 'fd.description'=>"invoice_line", 'fd.tva_tx'=>"invoice_line", 'fd.qty'=>"invoice_line",
@@ -406,6 +406,7 @@ class modFournisseur extends DolibarrModules
 		// End add extra fields line
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'societe as s';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as ps ON ps.rowid = s.parent';
 		if (is_object($user) && empty($user->rights->societe->client->voir)) {
 			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
 		}
diff --git a/htdocs/core/modules/modPropale.class.php b/htdocs/core/modules/modPropale.class.php
index 048f8fcb508..83e2b5a0402 100644
--- a/htdocs/core/modules/modPropale.class.php
+++ b/htdocs/core/modules/modPropale.class.php
@@ -189,7 +189,7 @@ class modPropale extends DolibarrModules
 		$this->export_label[$r] = 'ProposalsAndProposalsLines'; // Translation key (used only if key ExportDataset_xxx_z not found)
 		$this->export_permission[$r] = array(array("propale", "export"));
 		$this->export_fields_array[$r] = array(
-			's.rowid'=>"IdCompany", 's.nom'=>'CompanyName', 's.address'=>'Address', 's.zip'=>'Zip', 's.town'=>'Town', 'co.code'=>'CountryCode', 's.phone'=>'Phone',
+			's.rowid'=>"IdCompany", 's.nom'=>'CompanyName', 'ps.nom'=>'ParentCompany', 's.address'=>'Address', 's.zip'=>'Zip', 's.town'=>'Town', 'co.code'=>'CountryCode', 's.phone'=>'Phone',
 			's.siren'=>'ProfId1', 's.siret'=>'ProfId2', 's.ape'=>'ProfId3', 's.idprof4'=>'ProfId4', 'c.rowid'=>"Id", 'c.ref'=>"Ref", 'c.ref_client'=>"RefCustomer",
 			'c.fk_soc'=>"IdCompany", 'c.datec'=>"DateCreation", 'c.datep'=>"DatePropal", 'c.fin_validite'=>"DateEndPropal", 'c.remise_percent'=>"GlobalDiscount",
 			'c.total_ht'=>"TotalHT", 'c.total_ttc'=>"TotalTTC", 'c.fk_statut'=>'Status', 'c.note_public'=>"Note", 'c.date_livraison'=>'DeliveryDate',
@@ -213,14 +213,14 @@ class modPropale extends DolibarrModules
 		//	'cd.total_tva'=>"Numeric",'cd.total_ttc'=>"Numeric",'p.rowid'=>'List:product:label','p.ref'=>'Text','p.label'=>'Text'
 		//);
 		$this->export_TypeFields_array[$r] = array(
-			's.nom'=>'Text', 's.address'=>'Text', 's.zip'=>'Text', 's.town'=>'Text', 'co.code'=>'Text', 's.phone'=>'Text', 's.siren'=>'Text', 's.siret'=>'Text',
+			's.nom'=>'Text', 'ps.nom'=>'Text', 's.address'=>'Text', 's.zip'=>'Text', 's.town'=>'Text', 'co.code'=>'Text', 's.phone'=>'Text', 's.siren'=>'Text', 's.siret'=>'Text',
 			's.ape'=>'Text', 's.idprof4'=>'Text', 'c.ref'=>"Text", 'c.ref_client'=>"Text", 'c.datec'=>"Date", 'c.datep'=>"Date", 'c.fin_validite'=>"Date",
 			'c.remise_percent'=>"Numeric", 'c.total_ht'=>"Numeric", 'c.total_ttc'=>"Numeric", 'c.fk_statut'=>'Status', 'c.note_public'=>"Text", 'c.date_livraison'=>'Date',
 			'pj.ref'=>'Text', 'cd.description'=>"Text", 'cd.product_type'=>'Boolean', 'cd.tva_tx'=>"Numeric", 'cd.qty'=>"Numeric", 'cd.total_ht'=>"Numeric",
 			'cd.total_tva'=>"Numeric", 'cd.total_ttc'=>"Numeric", 'p.ref'=>'Text', 'p.label'=>'Text'
 		);
 		$this->export_entities_array[$r] = array(
-			's.rowid'=>"company", 's.nom'=>'company', 's.address'=>'company', 's.zip'=>'company', 's.town'=>'company', 'co.code'=>'company', 's.phone'=>'company',
+			's.rowid'=>"company", 's.nom'=>'company', 'ps.nom'=>'company', 's.address'=>'company', 's.zip'=>'company', 's.town'=>'company', 'co.code'=>'company', 's.phone'=>'company',
 			's.siren'=>'company', 's.ape'=>'company', 's.idprof4'=>'company', 's.siret'=>'company', 'c.rowid'=>"propal", 'c.ref'=>"propal", 'c.ref_client'=>"propal",
 			'c.fk_soc'=>"propal", 'c.datec'=>"propal", 'c.datep'=>"propal", 'c.fin_validite'=>"propal", 'c.remise_percent'=>"propal", 'c.total_ht'=>"propal",
 			'c.total_ttc'=>"propal", 'c.fk_statut'=>"propal", 'c.note_public'=>"propal", 'c.date_livraison'=>"propal", 'pj.ref'=>'project', 'cd.rowid'=>'propal_line',
@@ -241,14 +241,14 @@ class modPropale extends DolibarrModules
 		$keyforaliasextra = 'extra3';
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 		$keyforselect = 'societe';
-		$keyforelement = 'societe';
+		$keyforelement = 'company';
 		$keyforaliasextra = 'extra4';
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'societe as s ';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_extrafields as extra4 ON s.rowid = extra4.fk_object';
-
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as ps ON ps.rowid = s.parent';
 		if (empty($user->rights->societe->client->voir)) {
 			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
 		}

From 26c5875f9792259204b240f4f947027a325ec856 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Tue, 22 Jun 2021 14:20:08 +0200
Subject: [PATCH 0819/1497] Uniformize accounting dyiplays

---
 htdocs/accountancy/customer/lines.php | 4 ++--
 htdocs/accountancy/supplier/lines.php | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php
index 884de9dd232..55700fe8439 100644
--- a/htdocs/accountancy/customer/lines.php
+++ b/htdocs/accountancy/customer/lines.php
@@ -458,8 +458,8 @@ if ($result) {
 		$productstatic->accountancy_code_sell_export = $objp->accountancy_code_sell_export;
 
 		$accountingaccountstatic->rowid = $objp->fk_compte;
-		$accountingaccountstatic->label = $objp->label;
-		$accountingaccountstatic->labelshort = $objp->labelshort;
+		$accountingaccountstatic->label = $objp->label_account;
+		$accountingaccountstatic->labelshort = $objp->labelshort_account;
 		$accountingaccountstatic->account_number = $objp->account_number;
 
 		print '<tr class="oddeven">';
diff --git a/htdocs/accountancy/supplier/lines.php b/htdocs/accountancy/supplier/lines.php
index 4a3b8cd53ac..da8bc0cd5e9 100644
--- a/htdocs/accountancy/supplier/lines.php
+++ b/htdocs/accountancy/supplier/lines.php
@@ -194,7 +194,7 @@ print '<script type="text/javascript">
  */
 $sql = "SELECT f.rowid as facid, f.ref as ref, f.ref_supplier, f.libelle as invoice_label, f.datef, f.fk_soc,";
 $sql .= " l.rowid, l.fk_product, l.product_type as line_type, l.description, l.total_ht , l.qty, l.tva_tx, l.vat_src_code,";
-$sql .= " aa.label, aa.labelshort, aa.account_number,";
+$sql .= " aa.label as label_account, aa.labelshort as labelshort_account, aa.account_number,";
 $sql .= " p.rowid as product_id, p.fk_product_type as product_type, p.ref as product_ref, p.label as product_label, p.fk_product_type as type, p.tobuy, p.tosell,";
 if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
 	$sql .= " ppe.accountancy_code_buy, ppe.accountancy_code_buy_intra, ppe.accountancy_code_buy_export,";
@@ -459,8 +459,8 @@ if ($result) {
 		$productstatic->accountancy_code_buy_export = $objp->accountancy_code_sell_buy;
 
 		$accountingaccountstatic->rowid = $objp->fk_compte;
-		$accountingaccountstatic->label = $objp->label;
-		$accountingaccountstatic->labelshort = $objp->labelshort;
+		$accountingaccountstatic->label = $objp->label_account;
+		$accountingaccountstatic->labelshort = $objp->labelshort_account;
 		$accountingaccountstatic->account_number = $objp->account_number;
 
 		print '<tr class="oddeven">';
@@ -513,7 +513,7 @@ if ($result) {
 
 		print '<td>'.$objp->tva_intra.'</td>';
 
-		print '<td class="center">';
+		print '<td>';
 		print $accountingaccountstatic->getNomUrl(0, 1, 1, '', 1);
 		print ' <a class="editfielda" href="./card.php?id='.$objp->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"].($param ? '?'.$param : '')).'">';
 		print img_edit();

From 83d30be10656ce33ba49dbd6db317d8e67209919 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 22 Jun 2021 14:40:48 +0200
Subject: [PATCH 0820/1497] Fix Add missing phpunits

---
 test/phpunit/AllTests.php                              | 10 ++++++++++
 ...knowledgerecordTest.php => KnowledgeRecordTest.php} |  0
 2 files changed, 10 insertions(+)
 rename test/phpunit/{knowledgerecordTest.php => KnowledgeRecordTest.php} (100%)

diff --git a/test/phpunit/AllTests.php b/test/phpunit/AllTests.php
index 09c5226e059..898007972b2 100644
--- a/test/phpunit/AllTests.php
+++ b/test/phpunit/AllTests.php
@@ -173,6 +173,8 @@ class AllTests
 		require_once dirname(__FILE__).'/CommandeFournisseurTest.php';
 		$suite->addTestSuite('CommandeFournisseurTest');
 
+		require_once dirname(__FILE__).'/CommonInvoiceTest.php';
+		$suite->addTestSuite('CommonInvoiceTest');
 		require_once dirname(__FILE__).'/FactureTest.php';
 		$suite->addTestSuite('FactureTest');
 		require_once dirname(__FILE__).'/FactureRecTest.php';
@@ -202,10 +204,18 @@ class AllTests
 		$suite->addTestSuite('EntrepotTest');
 		require_once dirname(__FILE__).'/MouvementStockTest.php';
 		$suite->addTestSuite('MouvementStockTest');
+		require_once dirname(__FILE__).'/InventoryTest.php';
+		$suite->addTestSuite('InventoryTest');
 
 		require_once dirname(__FILE__).'/CategorieTest.php';
 		$suite->addTestSuite('CategorieTest');
 
+		require_once dirname(__FILE__).'/ProjectTest.php';
+		$suite->addTestSuite('ProjectTest');
+
+		require_once dirname(__FILE__).'/KnowledgeRecord.php';
+		$suite->addTestSuite('KnowledgeRecord');
+
 		require_once dirname(__FILE__).'/AccountingAccountTest.php';
 		$suite->addTestSuite('AccountingAccountTest');
 
diff --git a/test/phpunit/knowledgerecordTest.php b/test/phpunit/KnowledgeRecordTest.php
similarity index 100%
rename from test/phpunit/knowledgerecordTest.php
rename to test/phpunit/KnowledgeRecordTest.php

From 2f6a91f506a519298d91a1049414ccba603398c4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 22 Jun 2021 15:25:49 +0200
Subject: [PATCH 0821/1497] Look and feel v14

---
 htdocs/core/boxes/box_funnel_of_prospection.php      |  3 +++
 htdocs/core/boxes/box_graph_nb_tickets_type.php      |  3 +++
 htdocs/core/boxes/box_graph_new_vs_close_ticket.php  |  3 +++
 htdocs/core/boxes/box_graph_product_distribution.php |  9 +++++++++
 htdocs/core/boxes/box_graph_ticket_by_severity.php   |  1 -
 htdocs/core/boxes/box_last_modified_ticket.php       |  4 ++--
 htdocs/imports/import.php                            |  8 +++++---
 htdocs/langs/en_US/exports.lang                      |  3 ++-
 htdocs/ticket/index.php                              | 10 ++++++++--
 9 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/htdocs/core/boxes/box_funnel_of_prospection.php b/htdocs/core/boxes/box_funnel_of_prospection.php
index 2736028d668..28c3b22788d 100644
--- a/htdocs/core/boxes/box_funnel_of_prospection.php
+++ b/htdocs/core/boxes/box_funnel_of_prospection.php
@@ -236,6 +236,9 @@ class box_funnel_of_prospection extends ModeleBoxes
 					$dolgraph->SetDataColor(array_values($colorseriesstat));
 					$dolgraph->setBorderColor(array_values($bordercolorseries));
 					$dolgraph->setShowLegend(2);
+					if (!empty($conf->dol_optimize_smallscreen)) {
+						$px1->SetWidth(320);
+					}
 					$dolgraph->setShowPercent(1);
 					$dolgraph->setMirrorGraphValues(true);
 					$dolgraph->setBorderWidth(2);
diff --git a/htdocs/core/boxes/box_graph_nb_tickets_type.php b/htdocs/core/boxes/box_graph_nb_tickets_type.php
index 712c28df851..86ea5e2a11c 100644
--- a/htdocs/core/boxes/box_graph_nb_tickets_type.php
+++ b/htdocs/core/boxes/box_graph_nb_tickets_type.php
@@ -165,6 +165,9 @@ class box_graph_nb_tickets_type extends ModeleBoxes
 					}
 					$px1->SetData($data);
 					$px1->setShowLegend(2);
+					if (!empty($conf->dol_optimize_smallscreen)) {
+						$px1->SetWidth(320);
+					}
 					$px1->SetType(array('pie'));
 					$px1->SetLegend($legend);
 					$px1->SetMaxValue($px1->GetCeilMaxValue());
diff --git a/htdocs/core/boxes/box_graph_new_vs_close_ticket.php b/htdocs/core/boxes/box_graph_new_vs_close_ticket.php
index f2e2170a1b8..a4bf2d6990f 100644
--- a/htdocs/core/boxes/box_graph_new_vs_close_ticket.php
+++ b/htdocs/core/boxes/box_graph_new_vs_close_ticket.php
@@ -137,6 +137,9 @@ class box_graph_new_vs_close_ticket extends ModeleBoxes
 					$px1->SetDataColor(array_values($colorseries));
 					$px1->SetData($data);
 					$px1->setShowLegend(2);
+					if (!empty($conf->dol_optimize_smallscreen)) {
+						$px1->SetWidth(320);
+					}
 					$px1->SetType(array('pie'));
 					$px1->SetMaxValue($px1->GetCeilMaxValue());
 					$px1->SetShading(3);
diff --git a/htdocs/core/boxes/box_graph_product_distribution.php b/htdocs/core/boxes/box_graph_product_distribution.php
index 2db8dd287b3..dd85c3e1fcd 100644
--- a/htdocs/core/boxes/box_graph_product_distribution.php
+++ b/htdocs/core/boxes/box_graph_product_distribution.php
@@ -192,6 +192,9 @@ class box_graph_product_distribution extends ModeleBoxes
 					}
 					$px2->SetLegend($legend);
 					$px2->setShowLegend(2);
+					if (!empty($conf->dol_optimize_smallscreen)) {
+						$px1->SetWidth(320);
+					}
 					$px2->setShowPointValue($showpointvalue);
 					$px2->setShowPercent(0);
 					$px2->SetMaxValue($px2->GetCeilMaxValue());
@@ -252,6 +255,9 @@ class box_graph_product_distribution extends ModeleBoxes
 					}
 					$px3->SetLegend($legend);
 					$px3->setShowLegend(2);
+					if (!empty($conf->dol_optimize_smallscreen)) {
+						$px1->SetWidth(320);
+					}
 					$px3->setShowPointValue($showpointvalue);
 					$px3->setShowPercent(0);
 					$px3->SetMaxValue($px3->GetCeilMaxValue());
@@ -313,6 +319,9 @@ class box_graph_product_distribution extends ModeleBoxes
 					}
 					$px1->SetLegend($legend);
 					$px1->setShowLegend(2);
+					if (!empty($conf->dol_optimize_smallscreen)) {
+						$px1->SetWidth(320);
+					}
 					$px1->setShowPointValue($showpointvalue);
 					$px1->setShowPercent(0);
 					$px1->SetMaxValue($px1->GetCeilMaxValue());
diff --git a/htdocs/core/boxes/box_graph_ticket_by_severity.php b/htdocs/core/boxes/box_graph_ticket_by_severity.php
index 787e9cebb33..13cd0c40c86 100644
--- a/htdocs/core/boxes/box_graph_ticket_by_severity.php
+++ b/htdocs/core/boxes/box_graph_ticket_by_severity.php
@@ -176,7 +176,6 @@ class box_graph_ticket_by_severity extends ModeleBoxes
 					}
 
 					$px1->SetData($data);
-					//$px1->setShowLegend(2);
 					$px1->setShowLegend(0);
 					$px1->SetType(array('bars'));
 					$px1->SetLegend($legend);
diff --git a/htdocs/core/boxes/box_last_modified_ticket.php b/htdocs/core/boxes/box_last_modified_ticket.php
index 4d5097e23ba..33d2bab0485 100644
--- a/htdocs/core/boxes/box_last_modified_ticket.php
+++ b/htdocs/core/boxes/box_last_modified_ticket.php
@@ -145,7 +145,7 @@ class box_last_modified_ticket extends ModeleBoxes
 
 					// Subject
 					$this->info_box_contents[$i][$r] = array(
-						'td' => 'class="nowrap"',
+						'td' => 'class="nowrap tdoverflowmax150"',
 						'text' => $objp->subject, // Some event have no ref
 						'url' => DOL_URL_ROOT."/ticket/card.php?track_id=".$objp->track_id,
 					);
@@ -153,7 +153,7 @@ class box_last_modified_ticket extends ModeleBoxes
 
 					// Customer
 					$this->info_box_contents[$i][$r] = array(
-						'td' => 'class="tdoverflowmax150 maxwidth300onsmartphone"',
+						'td' => 'class="tdoverflowmax150"',
 						'text' => $link,
 						'asis' => 1,
 					);
diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php
index 4c5975ecb43..45927ca24e7 100644
--- a/htdocs/imports/import.php
+++ b/htdocs/imports/import.php
@@ -462,7 +462,7 @@ if ($step == 2 && $datatoimport) {
 	print '<div class="underbanner clearboth"></div>';
 	print '<div class="fichecenter">';
 
-	print '<table width="100%" class="border tableforfield">';
+	print '<table class="border tableforfield centpercent">';
 
 	// Module
 	print '<tr><td class="titlefield">'.$langs->trans("Module").'</td>';
@@ -475,7 +475,7 @@ if ($step == 2 && $datatoimport) {
 	print $titleofmodule;
 	print '</td></tr>';
 
-	// Lot de donnees a importer
+	// Dataset to import
 	print '<tr><td>'.$langs->trans("DatasetToImport").'</td>';
 	print '<td>';
 	$entity = preg_replace('/:.*$/', '', $objimport->array_import_icon[0]);
@@ -519,7 +519,9 @@ if ($step == 2 && $datatoimport) {
 		$text = $objmodelimport->getDriverDescForKey($key);
 		print '<td>'.$form->textwithpicto($objmodelimport->getDriverLabelForKey($key), $text).'</td>';
 		print '<td style="text-align:center">';
-		print img_picto('', 'download', 'class="paddingright opacitymedium"').'<a href="'.DOL_URL_ROOT.'/imports/emptyexample.php?format='.$key.$param.'" target="_blank">'.$langs->trans("DownloadEmptyExample").'</a>';
+		print img_picto('', 'download', 'class="paddingright opacitymedium"').'<a href="'.DOL_URL_ROOT.'/imports/emptyexample.php?format='.$key.$param.'" target="_blank">'.$langs->trans("DownloadEmptyExample");
+		print '</a>';
+		print ' <span class="opacitymedium hideonsmartphone">('.$langs->trans("StarAreMandatory").')</span>';
 		print '</td>';
 		// Action button
 		print '<td style="text-align:right">';
diff --git a/htdocs/langs/en_US/exports.lang b/htdocs/langs/en_US/exports.lang
index a0eb7161ef2..cb652229825 100644
--- a/htdocs/langs/en_US/exports.lang
+++ b/htdocs/langs/en_US/exports.lang
@@ -53,7 +53,8 @@ TypeOfLineServiceOrProduct=Type of line (0=product, 1=service)
 FileWithDataToImport=File with data to import
 FileToImport=Source file to import
 FileMustHaveOneOfFollowingFormat=File to import must have one of following formats
-DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
+DownloadEmptyExample=Download template file with field content information
+StarAreMandatory=* are mandatory fields
 ChooseFormatOfFileToImport=Choose the file format to use as import file format by clicking on the %s icon to select it...
 ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
 SourceFileFormat=Source file format
diff --git a/htdocs/ticket/index.php b/htdocs/ticket/index.php
index 9e085d468ef..c3027e5044b 100644
--- a/htdocs/ticket/index.php
+++ b/htdocs/ticket/index.php
@@ -112,8 +112,14 @@ if (empty($endyear)) {
 }
 
 $startyear = $endyear - 1;
+
+// Change default WIDHT and HEIGHT (we need a smaller than default for both desktop and smartphone)
 $WIDTH = (($shownb && $showtot) || !empty($conf->dol_optimize_smallscreen)) ? '100%' : '80%';
-$HEIGHT = '200';
+if (empty($conf->dol_optimize_smallscreen)) {
+	$HEIGHT = '200';
+} else {
+	$HEIGHT = '160';
+}
 
 print '<div class="clearboth"></div>';
 print '<div class="fichecenter fichecenterbis">';
@@ -298,7 +304,7 @@ print '</div>'."\n";
 print '<div class="secondcolumn fichehalfright boxhalfright" id="boxhalfright">';
 
 /*
- * Latest tickets
+ * Latest unread tickets
  */
 
 $max = 10;

From f6eb5b76f5d0813bbf6435b1b29cbf8f02569282 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 22 Jun 2021 15:45:47 +0200
Subject: [PATCH 0822/1497] css

---
 htdocs/exports/export.php |  2 +-
 htdocs/imports/import.php | 39 ++++++++++++++++++++-------------------
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php
index 1dd3400ff80..c0a48b97222 100644
--- a/htdocs/exports/export.php
+++ b/htdocs/exports/export.php
@@ -1009,7 +1009,7 @@ if ($step == 4 && $datatoexport) {
 		print '</tr>';
 
 		print '<tr class="oddeven">';
-		print '<td><input name="export_name" size="32" value=""></td>';
+		print '<td><input name="export_name" value=""></td>';
 		print '<td>';
 		$arrayvisibility = array('private'=>$langs->trans("Private"), 'all'=>$langs->trans("Everybody"));
 		print $form->selectarray('visibility', $arrayvisibility, 'private');
diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php
index 45927ca24e7..5139e12ab7a 100644
--- a/htdocs/imports/import.php
+++ b/htdocs/imports/import.php
@@ -604,11 +604,13 @@ if ($step == 3 && $datatoimport) {
 
 	// Source file format
 	print '<tr><td class="titlefield">'.$langs->trans("SourceFileFormat").'</td>';
-	print '<td>';
+	print '<td class="nowraponall">';
 	$text = $objmodelimport->getDriverDescForKey($format);
 	print $form->textwithpicto($objmodelimport->getDriverLabelForKey($format), $text);
 	print '</td><td style="text-align:right" class="nowrap">';
-	print img_picto('', 'download', 'class="paddingright opacitymedium"').'<a href="'.DOL_URL_ROOT.'/imports/emptyexample.php?format='.$format.$param.'" target="_blank">'.$langs->trans("DownloadEmptyExample").'</a>';
+	print img_picto('', 'download', 'class="paddingright opacitymedium"').'<a href="'.DOL_URL_ROOT.'/imports/emptyexample.php?format='.$format.$param.'" target="_blank">'.$langs->trans("DownloadEmptyExample");
+	print '</a>';
+	print ' <span class="opacitymedium hideonsmartphone">('.$langs->trans("StarAreMandatory").')</span>';
 	print '</td></tr>';
 
 	print '</table>';
@@ -643,18 +645,13 @@ if ($step == 3 && $datatoimport) {
 	print $s;
 	print '</span><br><br>';
 
-	print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
-	print '<table class="noborder centpercent" width="100%" cellpadding="4">';
-
 	$filetoimport = '';
 
-	//print '<tr class="liste_titre"><td colspan="6">'.$langs->trans("FileWithDataToImport").'</td></tr>';
-
 	// Input file name box
-	print '<tr class="oddeven nohover"><td colspan="6">';
+	print '<div class="marginbottomonly">';
 	print '<input type="file" name="userfile" size="20" maxlength="80"> &nbsp; &nbsp; ';
 	$out = (empty($conf->global->MAIN_UPLOAD_DOC) ? ' disabled' : '');
-	print '<input type="submit" class="button" value="'.$langs->trans("AddFile").'"'.$out.' name="sendit">';
+	print '<input type="submit" class="button small" value="'.$langs->trans("AddFile").'"'.$out.' name="sendit">';
 	$out = '';
 	if (!empty($conf->global->MAIN_UPLOAD_DOC)) {
 		$max = $conf->global->MAIN_UPLOAD_DOC; // In Kb
@@ -707,8 +704,10 @@ if ($step == 3 && $datatoimport) {
 		$out .= ' ('.$langs->trans("UploadDisabled").')';
 	}
 	print $out;
-	print '</td>';
-	print "</tr>\n";
+	print '</div>';
+
+	print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+	print '<table class="noborder centpercent" width="100%" cellpadding="4">';
 
 	// Search available imports
 	$filearray = dol_dir_list($conf->import->dir_temp, 'files', 0, '', '', 'name', SORT_DESC);
@@ -1053,8 +1052,8 @@ if ($step == 4 && $datatoimport) {
 		$entityicon = $entitytoicon[$entity] ? $entitytoicon[$entity] : $entity; // $entityicon must string name of picto of the field like 'project', 'company', 'contact', 'modulename', ...
 		$entitylang = $entitytolang[$entity] ? $entitytolang[$entity] : $objimport->array_import_label[0]; // $entitylang must be a translation key to describe object the field is related to, like 'Company', 'Contact', 'MyModyle', ...
 
-		print '<td class="nowrap" style="font-weight: normal">=>'.img_object('', $entityicon).' '.$langs->trans($entitylang).'</td>';
-		print '<td style="font-weight: normal">';
+		print '<td class="nowraponall" style="font-weight: normal">=>'.img_object('', $entityicon).' '.$langs->trans($entitylang).'</td>';
+		print '<td class="nowraponall" style="font-weight: normal">';
 		$newlabel = preg_replace('/\*$/', '', $label);
 		$text = $langs->trans($newlabel);
 		$more = '';
@@ -1069,7 +1068,7 @@ if ($step == 4 && $datatoimport) {
 		print $text;
 		print '</td>';
 		// Info field
-		print '<td style="font-weight:normal; text-align:right">';
+		print '<td class="nowraponall" style="font-weight:normal; text-align:right">';
 		$filecolumn = $array_match_database_to_file[$code];
 		// Source field info
 		$htmltext = '<b><u>'.$langs->trans("FieldSource").'</u></b><br>';
@@ -1128,7 +1127,6 @@ if ($step == 4 && $datatoimport) {
 		print '</td>';
 
 		print '</tr>';
-		$save_select .= $bit;
 	}
 	print '</table>';
 
@@ -1249,6 +1247,7 @@ if ($step == 4 && $datatoimport) {
 		print '<input type="hidden" value="'.dol_escape_htmltag($separator).'" name="separator">';
 		print '<input type="hidden" value="'.dol_escape_htmltag($enclosure).'" name="enclosure">';
 
+		print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
 		print '<table summary="selectofimportprofil" class="noborder centpercent">';
 		print '<tr class="liste_titre">';
 		print '<td>'.$langs->trans("ImportModelName").'</td>';
@@ -1257,7 +1256,7 @@ if ($step == 4 && $datatoimport) {
 		print '</tr>';
 
 		print '<tr class="oddeven">';
-		print '<td><input name="import_name" size="48" value=""></td>';
+		print '<td><input name="import_name" value=""></td>';
 		print '<td>';
 		$arrayvisibility = array('private'=>$langs->trans("Private"), 'all'=>$langs->trans("Everybody"));
 		print $form->selectarray('visibility', $arrayvisibility, 'private');
@@ -1308,6 +1307,8 @@ if ($step == 4 && $datatoimport) {
 		}
 
 		print '</table>';
+		print '</div>';
+
 		print '</form>';
 	}
 }
@@ -2126,14 +2127,14 @@ function show_elem($fieldssource, $pos, $key, $var, $nostyle = '')
 		print '&nbsp;';
 		print '</td>';
 		print '</tr>';
-	} else // Print field of source file
-	{
+	} else {
+		// Print field of source file
 		print '<tr'.($nostyle ? '' : ' '.$bc[$var]).' style="height:'.$height.'">';
 		print '<td class="nocellnopadding" width="16" style="font-weight: normal">';
 		// The image must have the class 'boxhandle' beause it's value used in DOM draggable objects to define the area used to catch the full object
 		print img_picto($langs->trans("MoveField", $pos), 'grip_title', 'class="boxhandle" style="cursor:move;"');
 		print '</td>';
-		print '<td style="font-weight: normal">';
+		print '<td class="nowraponall" style="font-weight: normal">';
 		print $langs->trans("Field").' '.$pos;
 		$example = $fieldssource[$pos]['example1'];
 		if ($example) {

From 6b93f58de64c7f6f8a432c62995f2114cc7b1fba Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 22 Jun 2021 15:46:51 +0200
Subject: [PATCH 0823/1497] Fix bad test

---
 test/phpunit/AllTests.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/phpunit/AllTests.php b/test/phpunit/AllTests.php
index 898007972b2..98d7f716565 100644
--- a/test/phpunit/AllTests.php
+++ b/test/phpunit/AllTests.php
@@ -214,7 +214,7 @@ class AllTests
 		$suite->addTestSuite('ProjectTest');
 
 		require_once dirname(__FILE__).'/KnowledgeRecord.php';
-		$suite->addTestSuite('KnowledgeRecord');
+		$suite->addTestSuite('KnowledgeRecordTest');
 
 		require_once dirname(__FILE__).'/AccountingAccountTest.php';
 		$suite->addTestSuite('AccountingAccountTest');

From 42c24de2ae4de0461a946d84a3cc1b597298a2c5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 22 Jun 2021 15:53:14 +0200
Subject: [PATCH 0824/1497] Fix bad test

---
 test/phpunit/AllTests.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/phpunit/AllTests.php b/test/phpunit/AllTests.php
index 98d7f716565..5979adabcec 100644
--- a/test/phpunit/AllTests.php
+++ b/test/phpunit/AllTests.php
@@ -213,7 +213,7 @@ class AllTests
 		require_once dirname(__FILE__).'/ProjectTest.php';
 		$suite->addTestSuite('ProjectTest');
 
-		require_once dirname(__FILE__).'/KnowledgeRecord.php';
+		require_once dirname(__FILE__).'/KnowledgeRecordTest.php';
 		$suite->addTestSuite('KnowledgeRecordTest');
 
 		require_once dirname(__FILE__).'/AccountingAccountTest.php';

From 618184f94a5dea9ff5f5913c48f5df7fdb90ac43 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 22 Jun 2021 16:02:38 +0200
Subject: [PATCH 0825/1497] Fix bad name of test

---
 test/phpunit/{EmailCollector.php => EmailCollectorTest.php} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename test/phpunit/{EmailCollector.php => EmailCollectorTest.php} (100%)

diff --git a/test/phpunit/EmailCollector.php b/test/phpunit/EmailCollectorTest.php
similarity index 100%
rename from test/phpunit/EmailCollector.php
rename to test/phpunit/EmailCollectorTest.php

From bcffbe3d675b7bea3c69d9eef96a07dc983cec7c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 22 Jun 2021 17:09:02 +0200
Subject: [PATCH 0826/1497] Test fix

---
 .travis.yml                              | 13 ++++++++-----
 htdocs/core/class/commonobject.class.php | 17 +++++++++--------
 htdocs/core/db/pgsql.class.php           |  1 +
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index df6e24a7e02..095a3c1e010 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -44,16 +44,20 @@ jobs:
   #allow_failures:
   #- php: nightly
   include:
-    - if: type = push
+    - stage: PHP 5.6
+      if: type = push
       php: '5.6'
       env: DB=postgresql
-    - if: type = pull_request OR type = push
+    - stage: PHP 7.4
+      if: type = pull_request OR type = push
       php: '7.4'
       env: DB=mysql
-    - if: type = push AND branch = develop
+    - stage: PHP Dev
+      if: type = push AND branch = develop
       php: nightly 
       env: DB=mysql
-    - if: type = push AND branch = 14.0
+    - stage: PHP Dev
+      if: type = push AND branch = 14.0
       php: nightly 
       env: DB=mysql
 
@@ -412,7 +416,6 @@ script:
 - |
   echo "Enabling new modules"
   # Enable modules not enabled into original dump
-  cd htdocs/install
   php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_API,MAIN_MODULE_PRODUCTBATCH,MAIN_MODULE_SUPPLIERPROPOSAL,MAIN_MODULE_STRIPE > $TRAVIS_BUILD_DIR/enablemodule.log
   php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_WEBSITE,MAIN_MODULE_TICKET,MAIN_MODULE_ACCOUNTING,MAIN_MODULE_MRP >> $TRAVIS_BUILD_DIR/enablemodule.log
   php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_RECEPTION,MAIN_MODULE_RECRUITMENT >> $TRAVIS_BUILD_DIR/enablemodule.log
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index ce7efebba33..6804a0ec13b 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -1095,7 +1095,7 @@ abstract class CommonObject
 					$this->db->rollback();
 					return -2;
 				} else {
-					$this->error = $this->db->error();
+					$this->error = $this->db->lasterror();
 					$this->db->rollback();
 					return -1;
 				}
@@ -1119,7 +1119,6 @@ abstract class CommonObject
 		$contacts = $objFrom->liste_contact(-1, $source);
 		foreach ($contacts as $contact) {
 			if ($this->add_contact($contact['id'], $contact['fk_c_type_contact'], $contact['source']) < 0) {
-				$this->error = $this->db->lasterror();
 				return -1;
 			}
 		}
@@ -5760,8 +5759,10 @@ abstract class CommonObject
 			$table_element = 'categories'; // For compatibility
 		}
 
-		$sql_del = "DELETE FROM ".MAIN_DB_PREFIX.$table_element."_extrafields WHERE fk_object = ".$this->id;
 		dol_syslog(get_class($this)."::deleteExtraFields delete", LOG_DEBUG);
+
+		$sql_del = "DELETE FROM ".MAIN_DB_PREFIX.$table_element."_extrafields WHERE fk_object = ".$this->id;
+
 		$resql = $this->db->query($sql_del);
 		if (!$resql) {
 			$this->error = $this->db->lasterror();
@@ -8467,7 +8468,7 @@ abstract class CommonObject
 
 				$result = $line->create($user, 1);
 				if ($result < 0) {
-					$this->error = $this->db->lasterror();
+					$this->error = $line->error;
 					$this->db->rollback();
 					return -1;
 				}
@@ -8498,8 +8499,8 @@ abstract class CommonObject
 	/**
 	 * Load object in memory from the database
 	 *
-	 * @param	int    $id				Id object
-	 * @param	string $ref				Ref
+	 * @param	int    	$id				Id object
+	 * @param	string 	$ref			Ref
 	 * @param	string	$morewhere		More SQL filters (' AND ...')
 	 * @return 	int         			<0 if KO, 0 if not found, >0 if OK
 	 */
@@ -8808,8 +8809,8 @@ abstract class CommonObject
 		if (!$error) {
 			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element.' WHERE rowid='.((int) $this->id);
 
-			$res = $this->db->query($sql);
-			if ($res === false) {
+			$resql = $this->db->query($sql);
+			if (!$resql) {
 				$error++;
 				$this->errors[] = $this->db->lasterror();
 			}
diff --git a/htdocs/core/db/pgsql.class.php b/htdocs/core/db/pgsql.class.php
index 83d00ba8a2a..7db45911c1e 100644
--- a/htdocs/core/db/pgsql.class.php
+++ b/htdocs/core/db/pgsql.class.php
@@ -757,6 +757,7 @@ class DoliDBPgsql extends DoliDB
 
 			$errorlabel = pg_last_error($this->db);
 			$errorcode = '';
+			$reg = array();
 			if (preg_match('/: *([0-9P]+):/', $errorlabel, $reg)) {
 				$errorcode = $reg[1];
 				if (isset($errorcode_map[$errorcode])) {

From 664e64a2ba4e3d18b3b03283f0e34feb0b44c4be Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 22 Jun 2021 17:22:50 +0200
Subject: [PATCH 0827/1497] Fix phpuni

---
 test/phpunit/KnowledgeRecordTest.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/phpunit/KnowledgeRecordTest.php b/test/phpunit/KnowledgeRecordTest.php
index b88c2f1f3fe..948bbe43370 100644
--- a/test/phpunit/KnowledgeRecordTest.php
+++ b/test/phpunit/KnowledgeRecordTest.php
@@ -159,7 +159,7 @@ class KnowledgeRecordTest extends \PHPUnit\Framework\TestCase
 		$result = $localobject->create($user);
 
 		print __METHOD__." result=".$result."\n";
-		$this->assertLessThan($result, 0);
+		$this->assertGreaterThanOrEqual(0, $result);
 
 		return $result;
 	}
@@ -183,10 +183,12 @@ class KnowledgeRecordTest extends \PHPUnit\Framework\TestCase
 
 		$localobject = new KnowledgeRecord($this->savdb);
 		$result = $localobject->fetch($id);
+		$this->assertGreaterThanOrEqual(0, $result, 'fetch in testKnowledgeRecordDelete with id='.$id);
+
 		$result = $localobject->delete($user);
 
 		print __METHOD__." id=".$id." result=".$result."\n";
-		$this->assertLessThan($result, 0);
+		$this->assertGreaterThanOrEqual(0, $result, 'delete in testKnowledgeRecordDelete');
 		return $result;
 	}
 }

From ecd028d12402f0d763fe16ea2083af360f9e1a2e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 22 Jun 2021 17:33:33 +0200
Subject: [PATCH 0828/1497] Clean code

---
 .../modulebuilder/template/test/phpunit/MyObjectTest.php | 2 +-
 test/phpunit/KnowledgeRecordTest.php                     | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/htdocs/modulebuilder/template/test/phpunit/MyObjectTest.php b/htdocs/modulebuilder/template/test/phpunit/MyObjectTest.php
index c37086f2219..9301737d5f5 100644
--- a/htdocs/modulebuilder/template/test/phpunit/MyObjectTest.php
+++ b/htdocs/modulebuilder/template/test/phpunit/MyObjectTest.php
@@ -53,7 +53,7 @@ class MyObjectTest extends \PHPUnit_Framework_TestCase
 	 * Constructor
 	 * We save global variables into local variables
 	 *
-	 * @return MyObject
+	 * @return MyObjectTest
 	 */
 	public function __construct()
 	{
diff --git a/test/phpunit/KnowledgeRecordTest.php b/test/phpunit/KnowledgeRecordTest.php
index 948bbe43370..ba0d24c854a 100644
--- a/test/phpunit/KnowledgeRecordTest.php
+++ b/test/phpunit/KnowledgeRecordTest.php
@@ -53,7 +53,7 @@ class KnowledgeRecordTest extends \PHPUnit\Framework\TestCase
 	 * Constructor
 	 * We save global variables into local variables
 	 *
-	 * @return KnowledgeRecord
+	 * @return KnowledgeRecordTest
 	 */
 	public function __construct()
 	{
@@ -80,7 +80,9 @@ class KnowledgeRecordTest extends \PHPUnit\Framework\TestCase
 		global $conf, $user, $langs, $db;
 		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
-		print __METHOD__."\n";
+		if (empty($conf->knowledgemanagement->enabled)) {
+			//	print __METHOD__." module knowledgemanagement order must be enabled.\n"; die(1);
+		}
 	}
 
 	/**
@@ -183,11 +185,12 @@ class KnowledgeRecordTest extends \PHPUnit\Framework\TestCase
 
 		$localobject = new KnowledgeRecord($this->savdb);
 		$result = $localobject->fetch($id);
+		print __METHOD__." id=".$id." result=".$result."\n";
 		$this->assertGreaterThanOrEqual(0, $result, 'fetch in testKnowledgeRecordDelete with id='.$id);
 
 		$result = $localobject->delete($user);
 
-		print __METHOD__." id=".$id." result=".$result."\n";
+		print __METHOD__." result=".$result."\n";
 		$this->assertGreaterThanOrEqual(0, $result, 'delete in testKnowledgeRecordDelete');
 		return $result;
 	}

From 9557b62e01f7a59e1537e8c393c992bb37a0277f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 22 Jun 2021 17:43:29 +0200
Subject: [PATCH 0829/1497] Show log file

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 095a3c1e010..1ee46ea483f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -429,7 +429,7 @@ script:
 - |
   echo "Unit testing"
   # Ensure we catch errors. Set this to +e if you want to go to the end to see dolibarr.log file.
-  set -e
+  set +e
   phpunit -d memory_limit=-1 -c test/phpunit/phpunittest.xml test/phpunit/AllTests.php
   phpunitresult=$?
   echo "Phpunit return code = $phpunitresult"

From 12748640a5b6ada341a47521c13351d3fabb9280 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 22 Jun 2021 18:04:06 +0200
Subject: [PATCH 0830/1497] Add log

---
 htdocs/core/class/commonobject.class.php | 1 +
 test/phpunit/KnowledgeRecordTest.php     | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 6804a0ec13b..502d14be39c 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -8542,6 +8542,7 @@ abstract class CommonObject
 				// Retrieve all extrafield
 				// fetch optionals attributes and labels
 				$this->fetch_optionals();
+				dol_syslog("aaa=".$this->id);
 
 				return $this->id;
 			} else {
diff --git a/test/phpunit/KnowledgeRecordTest.php b/test/phpunit/KnowledgeRecordTest.php
index ba0d24c854a..0122d8a8e6b 100644
--- a/test/phpunit/KnowledgeRecordTest.php
+++ b/test/phpunit/KnowledgeRecordTest.php
@@ -184,8 +184,9 @@ class KnowledgeRecordTest extends \PHPUnit\Framework\TestCase
 		$db = $this->savdb;
 
 		$localobject = new KnowledgeRecord($this->savdb);
+		print __METHOD__." id=".$id."\n";
 		$result = $localobject->fetch($id);
-		print __METHOD__." id=".$id." result=".$result."\n";
+		print __METHOD__." result=".$result."\n";
 		$this->assertGreaterThanOrEqual(0, $result, 'fetch in testKnowledgeRecordDelete with id='.$id);
 
 		$result = $localobject->delete($user);

From c08255657e37fc2569a3c2506d4f9fa8f9b8165f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 22 Jun 2021 18:59:14 +0200
Subject: [PATCH 0831/1497] Fix pgsql

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

diff --git a/htdocs/core/db/pgsql.class.php b/htdocs/core/db/pgsql.class.php
index 7db45911c1e..5a9d47dc40c 100644
--- a/htdocs/core/db/pgsql.class.php
+++ b/htdocs/core/db/pgsql.class.php
@@ -211,7 +211,7 @@ class DoliDBPgsql extends DoliDB
 				$line = preg_replace('/tinyint/i', 'smallint', $line);
 
 				// nuke unsigned
-				$line = preg_replace('/(int\w+|smallint)\s+unsigned/i', '\\1', $line);
+				$line = preg_replace('/(int\w+|smallint|bigint)\s+unsigned/i', '\\1', $line);
 
 				// blob -> text
 				$line = preg_replace('/\w*blob/i', 'text', $line);

From de7df8ad9fcef3da069cc1e729719bf710bfd287 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 22 Jun 2021 19:11:58 +0200
Subject: [PATCH 0832/1497] Fix lang

---
 htdocs/admin/mails_templates.php  | 5 +++--
 htdocs/langs/en_US/languages.lang | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index c2a54e31a3a..8d0fb1165a8 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -175,6 +175,7 @@ $elementList = array();
 // We save list of template email Dolibarr can manage. This list can found by a grep into code on "->param['models']"
 $elementList = array();
 // Add all and none after the sort
+
 $elementList['all'] = '-- '.dol_escape_htmltag($langs->trans("All")).' --';
 $elementList['none'] = '-- '.dol_escape_htmltag($langs->trans("None")).' --';
 $elementList['user'] = img_picto('', 'user', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToUser'));
@@ -824,7 +825,7 @@ if ($resql) {
 			print '<td class="liste_titre"><input type="text" name="search_topic" value="'.dol_escape_htmltag($search_topic).'"></td>';
 		} elseif ($value == 'type_template') {
 			print '<td class="liste_titre center">';
-			print $form->selectarray('search_type_template', $elementList, $search_type_template, 1, 0, 0, '', 0, 0, 0, '', 'maxwidth200', 1, '', 0, 1);
+			print $form->selectarray('search_type_template', $elementList, $search_type_template, 1, 0, 0, '', 0, 0, 0, '', 'minwidth150', 1, '', 0, 1);
 			print '</td>';
 		} elseif (!in_array($value, array('content', 'content_lines'))) {
 			print '<td class="liste_titre"></td>';
@@ -1229,7 +1230,7 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 				print '<input type="hidden" name="type_template" value="'.$obj->{$value}.'">';
 				print $obj->{$value};
 			} else {
-				print $form->selectarray('type_template', $elementList, (!empty($obj->{$value}) ? $obj->{$value}:''), 1, 0, 0, '', 0, 0, 0, '', 'maxwidth200', 1, '', 0, 1);
+				print $form->selectarray('type_template', $elementList, (!empty($obj->{$value}) ? $obj->{$value}:''), 1, 0, 0, '', 0, 0, 0, '', 'minwidth150', 1, '', 0, 1);
 			}
 			print '</td>';
 		} elseif ($context == 'add' && in_array($value, array('topic', 'joinfiles', 'content', 'content_lines'))) {
diff --git a/htdocs/langs/en_US/languages.lang b/htdocs/langs/en_US/languages.lang
index 598eec1fdca..373fdf2eab5 100644
--- a/htdocs/langs/en_US/languages.lang
+++ b/htdocs/langs/en_US/languages.lang
@@ -4,6 +4,7 @@ Language_ar_AR=Arabic
 Language_ar_EG=Arabic (Egypt)
 Language_ar_SA=Arabic
 Language_ar_TN=Arabic (Tunisia)
+Language_ar_IQ=Arabic (Iraq)
 Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengali
 Language_bn_IN=Bengali (India)
@@ -83,6 +84,7 @@ Language_ne_NP=Nepali
 Language_nl_BE=Dutch (Belgium)
 Language_nl_NL=Dutch
 Language_pl_PL=Polish
+Language_pt_AO=Portuguese (Angola)
 Language_pt_BR=Portuguese (Brazil)
 Language_pt_PT=Portuguese
 Language_ro_MD=Romanian (Moldavia)

From 28d416a00d7ae01d4b562d00fb5ec3dde2a64200 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 23 Jun 2021 00:58:27 +0200
Subject: [PATCH 0833/1497] Try fix of phpunit

---
 .travis.yml                                       |  3 ++-
 .../template/test/phpunit/MyObjectTest.php        |  9 ++++++++-
 test/phpunit/HolidayTest.php                      |  2 +-
 test/phpunit/KnowledgeRecordTest.php              | 15 ++++++++++++---
 test/phpunit/ProjectTest.php                      |  2 +-
 5 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1ee46ea483f..75c688e735d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -419,6 +419,7 @@ script:
   php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_API,MAIN_MODULE_PRODUCTBATCH,MAIN_MODULE_SUPPLIERPROPOSAL,MAIN_MODULE_STRIPE > $TRAVIS_BUILD_DIR/enablemodule.log
   php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_WEBSITE,MAIN_MODULE_TICKET,MAIN_MODULE_ACCOUNTING,MAIN_MODULE_MRP >> $TRAVIS_BUILD_DIR/enablemodule.log
   php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_RECEPTION,MAIN_MODULE_RECRUITMENT >> $TRAVIS_BUILD_DIR/enablemodule.log
+  php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_KNOWLEDGEMANAGEMENT,MAIN_MODULE_EVENTORGANIZATION,MAIN_MODULE_PARTNERSHIP >> $TRAVIS_BUILD_DIR/enablemodule.log
   echo $?
   cd -
   set +e
@@ -429,7 +430,7 @@ script:
 - |
   echo "Unit testing"
   # Ensure we catch errors. Set this to +e if you want to go to the end to see dolibarr.log file.
-  set +e
+  set -e
   phpunit -d memory_limit=-1 -c test/phpunit/phpunittest.xml test/phpunit/AllTests.php
   phpunitresult=$?
   echo "Phpunit return code = $phpunitresult"
diff --git a/htdocs/modulebuilder/template/test/phpunit/MyObjectTest.php b/htdocs/modulebuilder/template/test/phpunit/MyObjectTest.php
index 9301737d5f5..5de2ca29b83 100644
--- a/htdocs/modulebuilder/template/test/phpunit/MyObjectTest.php
+++ b/htdocs/modulebuilder/template/test/phpunit/MyObjectTest.php
@@ -40,7 +40,10 @@ $langs->load("main");
 
 /**
  * Class MyObjectTest
- * @package Testmymodule
+ *
+ * @backupGlobals disabled
+ * @backupStaticAttributes enabled
+ * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
 class MyObjectTest extends \PHPUnit_Framework_TestCase
 {
@@ -73,6 +76,7 @@ class MyObjectTest extends \PHPUnit_Framework_TestCase
 
 	/**
 	 * Global test setup
+	 *
 	 * @return void
 	 */
 	public static function setUpBeforeClass()
@@ -85,6 +89,7 @@ class MyObjectTest extends \PHPUnit_Framework_TestCase
 
 	/**
 	 * Unit test setup
+	 *
 	 * @return void
 	 */
 	protected function setUp()
@@ -100,6 +105,7 @@ class MyObjectTest extends \PHPUnit_Framework_TestCase
 
 	/**
 	 * Unit test teardown
+	 *
 	 * @return void
 	 */
 	protected function tearDown()
@@ -109,6 +115,7 @@ class MyObjectTest extends \PHPUnit_Framework_TestCase
 
 	/**
 	 * Global test teardown
+	 *
 	 * @return void
 	 */
 	public static function tearDownAfterClass()
diff --git a/test/phpunit/HolidayTest.php b/test/phpunit/HolidayTest.php
index bba5d68c41e..418b81f8b41 100644
--- a/test/phpunit/HolidayTest.php
+++ b/test/phpunit/HolidayTest.php
@@ -36,7 +36,7 @@ if (empty($user->id)) {
 	$user->getrights();
 }
 
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
diff --git a/test/phpunit/KnowledgeRecordTest.php b/test/phpunit/KnowledgeRecordTest.php
index 0122d8a8e6b..a1d2c0a854b 100644
--- a/test/phpunit/KnowledgeRecordTest.php
+++ b/test/phpunit/KnowledgeRecordTest.php
@@ -27,22 +27,27 @@ global $conf, $user, $langs, $db;
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/knowledgemanagement/class/knowledgerecord.class.php';
+$langs->load("main");
 
 if (empty($user->id)) {
 	print "Load permissions for admin user nb 1\n";
 	$user->fetch(1);
 	$user->getrights();
 }
+
 $conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
-$langs->load("main");
+
 
 
 /**
  * Class KnowledgeRecordTest
- * @package Testknowledgemanagement
+ *
+ * @backupGlobals disabled
+ * @backupStaticAttributes enabled
+ * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class KnowledgeRecordTest extends \PHPUnit\Framework\TestCase
+class KnowledgeRecordTest extends PHPUnit\Framework\TestCase
 {
 	protected $savconf;
 	protected $savuser;
@@ -73,6 +78,7 @@ class KnowledgeRecordTest extends \PHPUnit\Framework\TestCase
 
 	/**
 	 * Global test setup
+	 *
 	 * @return void
 	 */
 	public static function setUpBeforeClass()
@@ -87,6 +93,7 @@ class KnowledgeRecordTest extends \PHPUnit\Framework\TestCase
 
 	/**
 	 * Unit test setup
+	 *
 	 * @return void
 	 */
 	protected function setUp()
@@ -102,6 +109,7 @@ class KnowledgeRecordTest extends \PHPUnit\Framework\TestCase
 
 	/**
 	 * Unit test teardown
+	 *
 	 * @return void
 	 */
 	protected function tearDown()
@@ -111,6 +119,7 @@ class KnowledgeRecordTest extends \PHPUnit\Framework\TestCase
 
 	/**
 	 * Global test teardown
+	 *
 	 * @return void
 	 */
 	public static function tearDownAfterClass()
diff --git a/test/phpunit/ProjectTest.php b/test/phpunit/ProjectTest.php
index d9f76f26635..7aa73181436 100644
--- a/test/phpunit/ProjectTest.php
+++ b/test/phpunit/ProjectTest.php
@@ -198,7 +198,7 @@ class ProjectTest extends PHPUnit\Framework\TestCase
 	}
 
 	/**
-	 * testProjectClose
+	 * testProjectOther
 	 *
 	 * @param	Project	$localobject	Project
 	 * @return	int

From 08076503119980d522a97b8f85a1695ff114ef96 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 23 Jun 2021 01:12:48 +0200
Subject: [PATCH 0834/1497] Fix phpunit dependency

---
 test/phpunit/ProjectTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/phpunit/ProjectTest.php b/test/phpunit/ProjectTest.php
index 7aa73181436..0a5812036d3 100644
--- a/test/phpunit/ProjectTest.php
+++ b/test/phpunit/ProjectTest.php
@@ -227,7 +227,7 @@ class ProjectTest extends PHPUnit\Framework\TestCase
 	 * @param	int		$id		Id of project
 	 * @return	void
 	 *
-	 * @depends	testProjectClose
+	 * @depends	testProjectOther
 	 * The depends says test is run only if previous is ok
 	 */
 	public function testProjectDelete($id)

From 62822c424ccb3a8d0fd03b4b97f76a6be420ae9b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 23 Jun 2021 01:34:14 +0200
Subject: [PATCH 0835/1497] Fix php8

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 502d14be39c..789bfb4e8b2 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -8430,7 +8430,7 @@ abstract class CommonObject
 
 		// If we have a field ref with a default value of (PROV)
 		if (!$error) {
-			if (key_exists('ref', $this->fields) && $this->fields['ref']['notnull'] > 0 && !is_null($this->fields['ref']['default']) && $this->fields['ref']['default'] == '(PROV)') {
+			if (key_exists('ref', $this->fields) && $this->fields['ref']['notnull'] > 0 && key_exists('default', $this->fields['ref']) && $this->fields['ref']['default'] == '(PROV)') {
 				$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET ref = '(PROV".$this->id.")' WHERE (ref = '(PROV)' OR ref = '') AND rowid = ".((int) $this->id);
 				$resqlupdate = $this->db->query($sql);
 

From cf28fcc8cd14bc562d0ba405f7a8b19fbe6673eb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 23 Jun 2021 02:22:49 +0200
Subject: [PATCH 0836/1497] CSS

---
 htdocs/core/class/html.formbarcode.class.php | 2 +-
 htdocs/langs/en_US/products.lang             | 3 ++-
 htdocs/product/card.php                      | 6 +++---
 htdocs/product/price.php                     | 7 ++++---
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/class/html.formbarcode.class.php b/htdocs/core/class/html.formbarcode.class.php
index 34bcbd86cfa..23811b1f5b7 100644
--- a/htdocs/core/class/html.formbarcode.class.php
+++ b/htdocs/core/class/html.formbarcode.class.php
@@ -213,7 +213,7 @@ class FormBarCode
 			$out .= '<tr><td>';
 			$out .= $this->selectBarcodeType($selected, $htmlname, 1);
 			$out .= '</td>';
-			$out .= '<td class="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+			$out .= '<td class="left"><input type="submit" class="button smallpaddingimp" value="'.$langs->trans("Modify").'">';
 			$out .= '</td></tr></table></form>';
 		}
 		return $out;
diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index 9638dfe5a25..fecbe7450c2 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -277,7 +277,7 @@ PriceByCustomer=Different prices for each customer
 PriceCatalogue=A single sell price per product/service
 PricingRule=Rules for selling prices
 AddCustomerPrice=Add price by customer
-ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
+ForceUpdateChildPriceSoc=Set same price on customer's subsidiaries
 PriceByCustomerLog=Log of previous customer prices
 MinimumPriceLimit=Minimum price can't be lower then %s
 MinimumRecommendedPrice=Minimum recommended price is: %s
@@ -296,6 +296,7 @@ ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Child products
 MinSupplierPrice=Minimum buying price
 MinCustomerPrice=Minimum selling price
+NoDynamicPrice=No dynamic price
 DynamicPriceConfiguration=Dynamic price configuration
 DynamicPriceDesc=You may define mathematical formulae to calculate Customer or Vendor prices. Such formulas can use all mathematical operators, some constants and variables. You can define here the variables you wish to use. If the variable needs an automatic update, you may define the external URL to allow Dolibarr to update the value automatically.
 AddVariable=Add Variable
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 3528d5ef299..0aff87cc28b 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -2024,7 +2024,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				print $langs->trans("BarcodeType");
 				print '</td>';
 				if (($action != 'editbarcodetype') && $usercancreate && $createbarcode) {
-					print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editbarcodetype&amp;id='.$object->id.'">'.img_edit($langs->trans('Edit'), 1).'</a></td>';
+					print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editbarcodetype&id='.$object->id.'&token='.newToken().'">'.img_edit($langs->trans('Edit'), 1).'</a></td>';
 				}
 				print '</tr></table>';
 				print '</td><td>';
@@ -2050,7 +2050,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				print $langs->trans("BarcodeValue");
 				print '</td>';
 				if (($action != 'editbarcode') && $usercancreate && $createbarcode) {
-					print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editbarcode&amp;id='.$object->id.'">'.img_edit($langs->trans('Edit'), 1).'</a></td>';
+					print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editbarcode&id='.$object->id.'&token='.newToken().'">'.img_edit($langs->trans('Edit'), 1).'</a></td>';
 				}
 				print '</tr></table>';
 				print '</td><td>';
@@ -2065,7 +2065,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 					print '<input type="hidden" name="action" value="setbarcode">';
 					print '<input type="hidden" name="barcode_type_code" value="'.$object->barcode_type_code.'">';
 					print '<input size="40" class="maxwidthonsmartphone" type="text" name="barcode" value="'.$tmpcode.'">';
-					print '&nbsp;<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+					print '&nbsp;<input type="submit" class="button smallpaddingimp" value="'.$langs->trans("Modify").'">';
 					print '</form>';
 				} else {
 					print showValueWithClipboardCPButton($object->barcode);
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 6cb782f00dd..aad0311502d 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -50,7 +50,6 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 // Load translation files required by the page
 $langs->loadLangs(array('products', 'bills', 'companies', 'other'));
 
-$mesg = '';
 $error = 0;
 $errors = array();
 
@@ -1212,15 +1211,17 @@ if ($action == 'edit_price' && $object->getRights()->creer) {
 		// Only show price mode and expression selector if module is enabled
 		if (!empty($conf->dynamicprices->enabled)) {
 			// Price mode selector
+			print '<!-- Show price mode of dynamicprices editor -->'."\n";
 			print '<tr><td>'.$langs->trans("PriceMode").'</td><td>';
+			print img_picto('', 'dynamicprice', 'class="pictofixedwidth"');
 			$price_expression = new PriceExpression($db);
-			$price_expression_list = array(0 => $langs->trans("PriceNumeric")); //Put the numeric mode as first option
+			$price_expression_list = array(0 => $langs->trans("Numeric").' <span class="opacitymedium">('.$langs->trans("NoDynamicPrice").')</span>'); //Put the numeric mode as first option
 			foreach ($price_expression->list_price_expression() as $entry) {
 				$price_expression_list[$entry->id] = $entry->title;
 			}
 			$price_expression_preselection = GETPOST('eid') ? GETPOST('eid') : ($object->fk_price_expression ? $object->fk_price_expression : '0');
 			print $form->selectarray('eid', $price_expression_list, $price_expression_preselection);
-			print '&nbsp; <div id="expression_editor" class="button">'.$langs->trans("PriceExpressionEditor").'</div>';
+			print '&nbsp; <a id="expression_editor" class="classlink">'.$langs->trans("PriceExpressionEditor").'</a>';
 			print '</td></tr>';
 
 			// This code hides the numeric price input if is not selected, loads the editor page if editor button is pressed

From 40b35cc44aed4bd70ac98d6635b198a80f45d8c0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 23 Jun 2021 02:45:06 +0200
Subject: [PATCH 0837/1497] Fix upload file form has disappear

---
 htdocs/core/class/html.formfile.class.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 831b0f50f04..a0fa92ad207 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -316,6 +316,7 @@ class FormFile
 			if ($nooutput) {
 				return $out;
 			} else {
+				print $out;
 				return 1;
 			}
 		}

From 508d9fed9256be224ff8773f64078ba97e885a90 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 23 Jun 2021 02:45:06 +0200
Subject: [PATCH 0838/1497] Fix upload file form has disappear


From 3bc1f905890d32d2c743db70c40d2032e5c3fd9a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 23 Jun 2021 02:51:31 +0200
Subject: [PATCH 0839/1497] Fix rounding

---
 htdocs/product/class/product.class.php | 2 +-
 htdocs/product/stats/mo.php            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 9957641c13b..aa07673f5cc 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -2666,7 +2666,7 @@ class Product extends CommonObject
 				$obj = $this->db->fetch_object($result);
 				$this->stats_mo['customers_'.$role] = $obj->nb_customers ? $obj->nb_customers : 0;
 				$this->stats_mo['nb_'.$role] = $obj->nb ? $obj->nb : 0;
-				$this->stats_mo['qty_'.$role] = $obj->qty ? $obj->qty : 0;
+				$this->stats_mo['qty_'.$role] = $obj->qty ? price2num($obj->qty, 'MS') : 0;		// qty may be a float due to the SUM()
 			} else {
 				$this->error = $this->db->error();
 				$error++;
diff --git a/htdocs/product/stats/mo.php b/htdocs/product/stats/mo.php
index 3781d23699a..5a5c33312ca 100644
--- a/htdocs/product/stats/mo.php
+++ b/htdocs/product/stats/mo.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2003-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2021 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
  *
  * This program is free software; you can redistribute it and/or modify

From 4fdb3aabd586c4cfaa9a86dc3b0f7b5b06871c26 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 23 Jun 2021 03:00:46 +0200
Subject: [PATCH 0840/1497] Merge 2 stages

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 75c688e735d..0e5cd2d1192 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -44,11 +44,11 @@ jobs:
   #allow_failures:
   #- php: nightly
   include:
-    - stage: PHP 5.6
+    - stage: PHP 5.6-7.4
       if: type = push
       php: '5.6'
       env: DB=postgresql
-    - stage: PHP 7.4
+    - stage: PHP 5.6-7.4
       if: type = pull_request OR type = push
       php: '7.4'
       env: DB=mysql

From d57699b7d771a1cdb83b3b9fb37628c7adf47dc7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 23 Jun 2021 10:22:51 +0200
Subject: [PATCH 0841/1497] css

---
 htdocs/core/lib/agenda.lib.php   | 7 ++++---
 htdocs/hrm/index.php             | 4 ++--
 htdocs/theme/eldy/global.inc.php | 2 ++
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php
index ef635b259ff..0e5e8538c25 100644
--- a/htdocs/core/lib/agenda.lib.php
+++ b/htdocs/core/lib/agenda.lib.php
@@ -80,14 +80,15 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
 		print $formactions->select_type_actions($actioncode, "search_actioncode", $excludetype, (empty($conf->global->AGENDA_USE_EVENT_TYPE) ? 1 : -1), 0, $multiselect, 0, 'maxwidth500');
 		print '</div>';
 
-		// Assigned to
+		// Assigned to user
 		print '<div class="divsearchfield">';
 		print img_picto($langs->trans("ActionsToDoBy"), 'user', 'class="fawidth30 inline-block"');
-		print $form->select_dolusers($filtert, 'search_filtert', 1, '', !$canedit, '', '', 0, 0, 0, '', 0, '', 'maxwidth500 widthcentpercentminusxx');
+		print $form->select_dolusers($filtert, 'search_filtert', 1, '', !$canedit, '', '', 0, 0, 0, '', 0, '', 'minwidth150 maxwidth500 widthcentpercentminusxx');
 		print '</div>';
+		// Assigned to user group
 		print '<div class="divsearchfield">';
 		print img_picto($langs->trans("ToUserOfGroup"), 'object_group', 'class="fawidth30 inline-block"');
-		print $form->select_dolgroups($usergroupid, 'usergroup', 1, '', !$canedit, '', '', '0', false, 'maxwidth500');
+		print $form->select_dolgroups($usergroupid, 'usergroup', 1, '', !$canedit, '', '', '0', false, 'minwidth100 maxwidth500 widthcentpercentminusxx');
 		print '</div>';
 
 		if ($conf->resource->enabled) {
diff --git a/htdocs/hrm/index.php b/htdocs/hrm/index.php
index cdce14780f9..23d0899cc18 100644
--- a/htdocs/hrm/index.php
+++ b/htdocs/hrm/index.php
@@ -381,9 +381,9 @@ if (!empty($conf->recruitment->enabled) && $user->rights->recruitment->recruitme
 				$staticrecruitmentjobposition->label = $objp->label;
 
 				print '<tr class="oddeven">';
-				print '<td class="nowrap">'.$staticrecruitmentcandidature->getNomUrl(1, '').'</td>';
+				print '<td class="nowraponall">'.$staticrecruitmentcandidature->getNomUrl(1, '').'</td>';
 				print '<td class="tdoverflowmax150">'.$staticrecruitmentcandidature->getFullName($langs).'</td>';
-				print '<td class="nowrap">'.$staticrecruitmentjobposition->getNomUrl(1).'</td>';
+				print '<td class="nowraponall">'.$staticrecruitmentjobposition->getNomUrl(1).'</td>';
 				print '<td class="right nowrap">'.dol_print_date($db->jdate($objp->tms), 'day').'</td>';
 				print '<td class="right nowrap" width="16">';
 				print $staticrecruitmentcandidature->getLibStatut(3);
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 7847088dfa1..18be87e5bd1 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -6835,6 +6835,8 @@ span.clipboardCPValue.hidewithsize {
 		border-right: none;
 		border-left: none;
 	}
+
+	td.widthpictotitle { width: 30px; }
 }
 
 @media only screen and (max-width: 1024px)

From 82ee5c2825b17c4ba80c547d04749a01aa053117 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 23 Jun 2021 10:42:27 +0200
Subject: [PATCH 0842/1497] Clean code

---
 htdocs/core/class/conf.class.php | 1449 +++++++++++++++---------------
 htdocs/master.inc.php            |   19 +-
 2 files changed, 734 insertions(+), 734 deletions(-)

diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 7a2e1866871..0eeed26b0e2 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -110,7 +110,6 @@ class Conf
 		// Common objects that are not modules
 		$this->mycompany = new stdClass();
 		$this->admin = new stdClass();
-		$this->user	= new stdClass();
 		$this->browser = new stdClass();
 		$this->medias = new stdClass();
 		$this->global = new stdClass();
@@ -136,7 +135,7 @@ class Conf
 			'syslog' => array()
 		);
 
-		// First level object
+		// First level object that are modules.
 		// TODO Remove this part.
 		$this->syslog = new stdClass();
 		$this->multicompany = new stdClass();
@@ -152,6 +151,7 @@ class Conf
 		$this->propal = new stdClass();
 		$this->facture			= new stdClass();
 		$this->contrat			= new stdClass();
+		$this->user	= new stdClass();
 		$this->usergroup		= new stdClass();
 		$this->adherent			= new stdClass();
 		$this->bank = new stdClass();
@@ -173,751 +173,764 @@ class Conf
 	{
 		dol_syslog(get_class($this)."::setValues");
 
-		//Define all global constants into $this->global->key=value
-		$sql = "SELECT ".$db->decrypt('name')." as name,";
-		$sql .= " ".$db->decrypt('value')." as value, entity";
-		$sql .= " FROM ".MAIN_DB_PREFIX."const";
-		$sql .= " WHERE entity IN (0,".$this->entity.")";
-		$sql .= " ORDER BY entity"; // This is to have entity 0 first, then entity 1 that overwrite.
+		if (!defined('NOREQUIREDB')) {
+			// Define all global constants into $this->global->key=value
+			$sql = "SELECT ".$db->decrypt('name')." as name,";
+			$sql .= " ".$db->decrypt('value')." as value, entity";
+			$sql .= " FROM ".MAIN_DB_PREFIX."const";
+			$sql .= " WHERE entity IN (0,".$this->entity.")";
+			$sql .= " ORDER BY entity"; // This is to have entity 0 first, then entity 1 that overwrite.
 
-		$resql = $db->query($sql);
-		if ($resql) {
-			$i = 0;
-			$numr = $db->num_rows($resql);
-			while ($i < $numr) {
-				$objp = $db->fetch_object($resql);
-				$key = $objp->name;
-				$value = $objp->value;
-				if ($key) {
-					// Allow constants values to be overridden by environment variables
-					if (isset($_SERVER['DOLIBARR_'.$key])) {
-						$value = $_SERVER['DOLIBARR_'.$key];
-					} elseif (isset($_ENV['DOLIBARR_'.$key])) {
-						$value = $_ENV['DOLIBARR_'.$key];
+			$resql = $db->query($sql);
+			if ($resql) {
+				$i = 0;
+				$numr = $db->num_rows($resql);
+				while ($i < $numr) {
+					$objp = $db->fetch_object($resql);
+					$key = $objp->name;
+					$value = $objp->value;
+					if ($key) {
+						// Allow constants values to be overridden by environment variables
+						if (isset($_SERVER['DOLIBARR_'.$key])) {
+							$value = $_SERVER['DOLIBARR_'.$key];
+						} elseif (isset($_ENV['DOLIBARR_'.$key])) {
+							$value = $_ENV['DOLIBARR_'.$key];
+						}
+
+						//if (! defined("$key")) define("$key", $value);	// In some cases, the constant might be already forced (Example: SYSLOG_HANDLERS during install)
+						$this->global->$key = $value;
+
+						if ($value && strpos($key, 'MAIN_MODULE_') === 0) {
+							$reg = array();
+							// If this is constant for a new tab page activated by a module. It initializes modules_parts['tabs'].
+							if (preg_match('/^MAIN_MODULE_([0-9A-Z_]+)_TABS_/i', $key)) {
+								$partname = 'tabs';
+								$params = explode(':', $value, 2);
+								if (!is_array($this->modules_parts[$partname])) {
+									$this->modules_parts[$partname] = array();
+								}
+								$this->modules_parts[$partname][$params[0]][] = $value; // $value may be a string or an array
+							} elseif (preg_match('/^MAIN_MODULE_([0-9A-Z_]+)_([A-Z]+)$/i', $key, $reg)) {
+								// If this is constant for all generic part activated by a module. It initializes
+								// modules_parts['login'], modules_parts['menus'], modules_parts['substitutions'], modules_parts['triggers'], modules_parts['tpl'],
+								// modules_parts['models'], modules_parts['theme']
+								// modules_parts['sms'],
+								// modules_parts['css'], ...
+
+								$modulename = strtolower($reg[1]);
+								$partname = strtolower($reg[2]);
+								if (!isset($this->modules_parts[$partname]) || !is_array($this->modules_parts[$partname])) {
+									$this->modules_parts[$partname] = array();
+								}
+								$arrValue = json_decode($value, true);
+								if (is_array($arrValue) && !empty($arrValue)) {
+									$value = $arrValue;
+								} elseif (in_array($partname, array('login', 'menus', 'substitutions', 'triggers', 'tpl'))) {
+									$value = '/'.$modulename.'/core/'.$partname.'/';
+								} elseif (in_array($partname, array('models', 'theme'))) {
+									$value = '/'.$modulename.'/';
+								} elseif (in_array($partname, array('sms'))) {
+									$value = '/'.$modulename.'/';
+								} elseif ($value == 1) {
+									$value = '/'.$modulename.'/core/modules/'.$partname.'/'; // ex: partname = societe
+								}
+								$this->modules_parts[$partname] = array_merge($this->modules_parts[$partname], array($modulename => $value)); // $value may be a string or an array
+							} elseif (preg_match('/^MAIN_MODULE_([0-9A-Z_]+)$/i', $key, $reg)) {
+								// If this is a module constant (must be at end)
+								$modulename = strtolower($reg[1]);
+								if ($modulename == 'propale') {
+									$modulename = 'propal';
+								}
+								if ($modulename == 'supplierproposal') {
+									$modulename = 'supplier_proposal';
+								}
+								if (!isset($this->$modulename) || !is_object($this->$modulename)) {
+									$this->$modulename = new stdClass();
+								}
+								$this->$modulename->enabled = true;
+								$this->modules[] = $modulename; // Add this module in list of enabled modules
+							}
+						}
 					}
+					$i++;
+				}
 
-					//if (! defined("$key")) define("$key", $value);	// In some cases, the constant might be already forced (Example: SYSLOG_HANDLERS during install)
-					$this->global->$key = $value;
+				$db->free($resql);
+			}
 
-					if ($value && strpos($key, 'MAIN_MODULE_') === 0) {
-						$reg = array();
-						// If this is constant for a new tab page activated by a module. It initializes modules_parts['tabs'].
-						if (preg_match('/^MAIN_MODULE_([0-9A-Z_]+)_TABS_/i', $key)) {
-							$partname = 'tabs';
-							$params = explode(':', $value, 2);
-							if (!is_array($this->modules_parts[$partname])) {
-								$this->modules_parts[$partname] = array();
-							}
-							$this->modules_parts[$partname][$params[0]][] = $value; // $value may be a string or an array
-						} elseif (preg_match('/^MAIN_MODULE_([0-9A-Z_]+)_([A-Z]+)$/i', $key, $reg)) {
-							// If this is constant for all generic part activated by a module. It initializes
-							// modules_parts['login'], modules_parts['menus'], modules_parts['substitutions'], modules_parts['triggers'], modules_parts['tpl'],
-							// modules_parts['models'], modules_parts['theme']
-							// modules_parts['sms'],
-							// modules_parts['css'], ...
+			// Include other local consts.php files and fetch their values to the corresponding database constants.
+			if (!empty($this->global->LOCAL_CONSTS_FILES)) {
+				$filesList = explode(":", $this->global->LOCAL_CONSTS_FILES);
+				foreach ($filesList as $file) {
+					$file = dol_sanitizeFileName($file);
+					dol_include_once($file."/".$file."_consts.php"); // This file can run code like setting $this->global->XXX vars.
+				}
+			}
 
-							$modulename = strtolower($reg[1]);
-							$partname = strtolower($reg[2]);
-							if (!isset($this->modules_parts[$partname]) || !is_array($this->modules_parts[$partname])) {
-								$this->modules_parts[$partname] = array();
+			//var_dump($this->modules);
+			//var_dump($this->modules_parts['theme']);
+
+			// If you can't set timezone of your PHP, set this constant. Better is to set it to UTC.
+			// In future, this constant will be forced to 'UTC' so PHP server timezone will not have effect anymore.
+			//$this->global->MAIN_SERVER_TZ='Europe/Paris';
+			if (!empty($this->global->MAIN_SERVER_TZ) && $this->global->MAIN_SERVER_TZ != 'auto') {
+				try {
+					date_default_timezone_set($this->global->MAIN_SERVER_TZ);
+				} catch (Exception $e) {
+					dol_syslog("Error: Bad value for parameter MAIN_SERVER_TZ=".$this->global->MAIN_SERVER_TZ, LOG_ERR);
+				}
+			}
+
+			// Object $mc
+			if (!defined('NOREQUIREMC') && !empty($this->multicompany->enabled)) {
+				global $mc;
+				$ret = @dol_include_once('/multicompany/class/actions_multicompany.class.php');
+				if ($ret) {
+					$mc = new ActionsMulticompany($db);
+					$this->mc = $mc;
+				}
+			}
+
+			// Clean some variables
+			if (empty($this->global->MAIN_MENU_STANDARD)) {
+				$this->global->MAIN_MENU_STANDARD = "eldy_menu.php";
+			}
+			if (empty($this->global->MAIN_MENUFRONT_STANDARD)) {
+				$this->global->MAIN_MENUFRONT_STANDARD = "eldy_menu.php";
+			}
+			if (empty($this->global->MAIN_MENU_SMARTPHONE)) {
+				$this->global->MAIN_MENU_SMARTPHONE = "eldy_menu.php"; // Use eldy by default because smartphone does not work on all phones
+			}
+			if (empty($this->global->MAIN_MENUFRONT_SMARTPHONE)) {
+				$this->global->MAIN_MENUFRONT_SMARTPHONE = "eldy_menu.php"; // Use eldy by default because smartphone does not work on all phones
+			}
+			if (!isset($this->global->FACTURE_TVAOPTION)) {
+				$this->global->FACTURE_TVAOPTION = 1;
+			}
+
+			// Variable globales LDAP
+			if (empty($this->global->LDAP_FIELD_FULLNAME)) {
+				$this->global->LDAP_FIELD_FULLNAME = '';
+			}
+			if (!isset($this->global->LDAP_KEY_USERS)) {
+				$this->global->LDAP_KEY_USERS = $this->global->LDAP_FIELD_FULLNAME;
+			}
+			if (!isset($this->global->LDAP_KEY_GROUPS)) {
+				$this->global->LDAP_KEY_GROUPS = $this->global->LDAP_FIELD_FULLNAME;
+			}
+			if (!isset($this->global->LDAP_KEY_CONTACTS)) {
+				$this->global->LDAP_KEY_CONTACTS = $this->global->LDAP_FIELD_FULLNAME;
+			}
+			if (!isset($this->global->LDAP_KEY_MEMBERS)) {
+				$this->global->LDAP_KEY_MEMBERS = $this->global->LDAP_FIELD_FULLNAME;
+			}
+			if (!isset($this->global->LDAP_KEY_MEMBERS_TYPES)) {
+				$this->global->LDAP_KEY_MEMBERS_TYPES = $this->global->LDAP_FIELD_FULLNAME;
+			}
+
+			// Load translation object with current language
+			if (empty($this->global->MAIN_LANG_DEFAULT)) {
+				$this->global->MAIN_LANG_DEFAULT = "en_US";
+			}
+
+			$rootfordata = DOL_DATA_ROOT;
+			$rootforuser = DOL_DATA_ROOT;
+			// If multicompany module is enabled, we redefine the root of data
+			if (!empty($this->multicompany->enabled) && !empty($this->entity) && $this->entity > 1) {
+				$rootfordata .= '/'.$this->entity;
+			}
+			// Set standard temporary folder name or global override
+			$rootfortemp = empty($this->global->MAIN_TEMP_DIR) ? $rootfordata : $this->global->MAIN_TEMP_DIR;
+
+			// Define default dir_output and dir_temp for directories of modules
+			foreach ($this->modules as $module) {
+				//var_dump($module);
+				// For multicompany sharings
+				$this->$module->multidir_output = array($this->entity => $rootfordata."/".$module);
+				$this->$module->multidir_temp = array($this->entity => $rootfortemp."/".$module."/temp");
+				// For backward compatibility
+				$this->$module->dir_output = $rootfordata."/".$module;
+				$this->$module->dir_temp = $rootfortemp."/".$module."/temp";
+			}
+
+			// External modules storage
+			if (!empty($this->modules_parts['dir'])) {
+				foreach ($this->modules_parts['dir'] as $module => $dirs) {
+					if (!empty($this->$module->enabled)) {
+						foreach ($dirs as $type => $name) {  // $type is 'output' or 'temp'
+							$multidirname = 'multidir_'.$type;
+							$dirname = 'dir_'.$type;
+
+							if ($type != 'temp') {
+								// For multicompany sharings
+								$this->$module->$multidirname = array($this->entity => $rootfordata."/".$name);
+
+								// For backward compatibility
+								$this->$module->$dirname = $rootfordata."/".$name;
+							} else {
+								// For multicompany sharings
+								$this->$module->$multidirname = array($this->entity => $rootfortemp."/".$name."/temp");
+
+								// For backward compatibility
+								$this->$module->$dirname = $rootfortemp."/".$name."/temp";
 							}
-							$arrValue = json_decode($value, true);
-							if (is_array($arrValue) && !empty($arrValue)) {
-								$value = $arrValue;
-							} elseif (in_array($partname, array('login', 'menus', 'substitutions', 'triggers', 'tpl'))) {
-								$value = '/'.$modulename.'/core/'.$partname.'/';
-							} elseif (in_array($partname, array('models', 'theme'))) {
-								$value = '/'.$modulename.'/';
-							} elseif (in_array($partname, array('sms'))) {
-								$value = '/'.$modulename.'/';
-							} elseif ($value == 1) {
-								$value = '/'.$modulename.'/core/modules/'.$partname.'/'; // ex: partname = societe
-							}
-							$this->modules_parts[$partname] = array_merge($this->modules_parts[$partname], array($modulename => $value)); // $value may be a string or an array
-						} elseif (preg_match('/^MAIN_MODULE_([0-9A-Z_]+)$/i', $key, $reg)) {
-							// If this is a module constant (must be at end)
-							$modulename = strtolower($reg[1]);
-							if ($modulename == 'propale') {
-								$modulename = 'propal';
-							}
-							if ($modulename == 'supplierproposal') {
-								$modulename = 'supplier_proposal';
-							}
-							if (!isset($this->$modulename) || !is_object($this->$modulename)) {
-								$this->$modulename = new stdClass();
-							}
-							$this->$modulename->enabled = true;
-							$this->modules[] = $modulename; // Add this module in list of enabled modules
 						}
 					}
 				}
-				$i++;
 			}
 
-			$db->free($resql);
-		}
+			// For mycompany storage
+			$this->mycompany->dir_output = $rootfordata."/mycompany";
+			$this->mycompany->dir_temp = $rootfortemp."/mycompany/temp";
 
-		// Include other local consts.php files and fetch their values to the corresponding database constants.
-		if (!empty($this->global->LOCAL_CONSTS_FILES)) {
-			$filesList = explode(":", $this->global->LOCAL_CONSTS_FILES);
-			foreach ($filesList as $file) {
-				$file = dol_sanitizeFileName($file);
-				dol_include_once($file."/".$file."_consts.php"); // This file can run code like setting $this->global->XXX vars.
-			}
-		}
+			// For admin storage
+			$this->admin->dir_output = $rootfordata.'/admin';
+			$this->admin->dir_temp = $rootfortemp.'/admin/temp';
 
-		//var_dump($this->modules);
-		//var_dump($this->modules_parts['theme']);
-
-		// If you can't set timezone of your PHP, set this constant. Better is to set it to UTC.
-		// In future, this constant will be forced to 'UTC' so PHP server timezone will not have effect anymore.
-		//$this->global->MAIN_SERVER_TZ='Europe/Paris';
-		if (!empty($this->global->MAIN_SERVER_TZ) && $this->global->MAIN_SERVER_TZ != 'auto') {
-			try {
-				date_default_timezone_set($this->global->MAIN_SERVER_TZ);
-			} catch (Exception $e) {
-				dol_syslog("Error: Bad value for parameter MAIN_SERVER_TZ=".$this->global->MAIN_SERVER_TZ, LOG_ERR);
-			}
-		}
-
-		// Object $mc
-		if (!defined('NOREQUIREMC') && !empty($this->multicompany->enabled)) {
-			global $mc;
-			$ret = @dol_include_once('/multicompany/class/actions_multicompany.class.php');
-			if ($ret) {
-				$mc = new ActionsMulticompany($db);
-				$this->mc = $mc;
-			}
-		}
-
-		// Clean some variables
-		if (empty($this->global->MAIN_MENU_STANDARD)) {
-			$this->global->MAIN_MENU_STANDARD = "eldy_menu.php";
-		}
-		if (empty($this->global->MAIN_MENUFRONT_STANDARD)) {
-			$this->global->MAIN_MENUFRONT_STANDARD = "eldy_menu.php";
-		}
-		if (empty($this->global->MAIN_MENU_SMARTPHONE)) {
-			$this->global->MAIN_MENU_SMARTPHONE = "eldy_menu.php"; // Use eldy by default because smartphone does not work on all phones
-		}
-		if (empty($this->global->MAIN_MENUFRONT_SMARTPHONE)) {
-			$this->global->MAIN_MENUFRONT_SMARTPHONE = "eldy_menu.php"; // Use eldy by default because smartphone does not work on all phones
-		}
-		if (!isset($this->global->FACTURE_TVAOPTION)) {
-			$this->global->FACTURE_TVAOPTION = 1;
-		}
-
-		// Variable globales LDAP
-		if (empty($this->global->LDAP_FIELD_FULLNAME)) {
-			$this->global->LDAP_FIELD_FULLNAME = '';
-		}
-		if (!isset($this->global->LDAP_KEY_USERS)) {
-			$this->global->LDAP_KEY_USERS = $this->global->LDAP_FIELD_FULLNAME;
-		}
-		if (!isset($this->global->LDAP_KEY_GROUPS)) {
-			$this->global->LDAP_KEY_GROUPS = $this->global->LDAP_FIELD_FULLNAME;
-		}
-		if (!isset($this->global->LDAP_KEY_CONTACTS)) {
-			$this->global->LDAP_KEY_CONTACTS = $this->global->LDAP_FIELD_FULLNAME;
-		}
-		if (!isset($this->global->LDAP_KEY_MEMBERS)) {
-			$this->global->LDAP_KEY_MEMBERS = $this->global->LDAP_FIELD_FULLNAME;
-		}
-		if (!isset($this->global->LDAP_KEY_MEMBERS_TYPES)) {
-			$this->global->LDAP_KEY_MEMBERS_TYPES = $this->global->LDAP_FIELD_FULLNAME;
-		}
-
-		// Load translation object with current language
-		if (empty($this->global->MAIN_LANG_DEFAULT)) {
-			$this->global->MAIN_LANG_DEFAULT = "en_US";
-		}
-
-		$rootfordata = DOL_DATA_ROOT;
-		$rootforuser = DOL_DATA_ROOT;
-		// If multicompany module is enabled, we redefine the root of data
-		if (!empty($this->multicompany->enabled) && !empty($this->entity) && $this->entity > 1) {
-			$rootfordata .= '/'.$this->entity;
-		}
-		// Set standard temporary folder name or global override
-		$rootfortemp = empty($this->global->MAIN_TEMP_DIR) ? $rootfordata : $this->global->MAIN_TEMP_DIR;
-
-		// Define default dir_output and dir_temp for directories of modules
-		foreach ($this->modules as $module) {
-			//var_dump($module);
-			// For multicompany sharings
-			$this->$module->multidir_output = array($this->entity => $rootfordata."/".$module);
-			$this->$module->multidir_temp = array($this->entity => $rootfortemp."/".$module."/temp");
+			// For user storage
+			$this->user->multidir_output = array($this->entity => $rootfordata."/users");
+			$this->user->multidir_temp = array($this->entity => $rootfortemp."/users/temp");
 			// For backward compatibility
-			$this->$module->dir_output = $rootfordata."/".$module;
-			$this->$module->dir_temp = $rootfortemp."/".$module."/temp";
-		}
+			$this->user->dir_output = $rootforuser."/users";
+			$this->user->dir_temp = $rootfortemp."/users/temp";
 
-		// External modules storage
-		if (!empty($this->modules_parts['dir'])) {
-			foreach ($this->modules_parts['dir'] as $module => $dirs) {
-				if (!empty($this->$module->enabled)) {
-					foreach ($dirs as $type => $name) {  // $type is 'output' or 'temp'
-						$multidirname = 'multidir_'.$type;
-						$dirname = 'dir_'.$type;
+			// For usergroup storage
+			$this->usergroup->dir_output = $rootforuser."/usergroups";
+			$this->usergroup->dir_temp = $rootfortemp."/usergroups/temp";
 
-						if ($type != 'temp') {
-							// For multicompany sharings
-							$this->$module->$multidirname = array($this->entity => $rootfordata."/".$name);
-
-							// For backward compatibility
-							$this->$module->$dirname = $rootfordata."/".$name;
-						} else {
-							// For multicompany sharings
-							$this->$module->$multidirname = array($this->entity => $rootfortemp."/".$name."/temp");
-
-							// For backward compatibility
-							$this->$module->$dirname = $rootfortemp."/".$name."/temp";
-						}
-					}
-				}
-			}
-		}
-
-		// For mycompany storage
-		$this->mycompany->dir_output = $rootfordata."/mycompany";
-		$this->mycompany->dir_temp = $rootfortemp."/mycompany/temp";
-
-		// For admin storage
-		$this->admin->dir_output = $rootfordata.'/admin';
-		$this->admin->dir_temp = $rootfortemp.'/admin/temp';
-
-		// For user storage
-		$this->user->multidir_output = array($this->entity => $rootfordata."/users");
-		$this->user->multidir_temp = array($this->entity => $rootfortemp."/users/temp");
-		// For backward compatibility
-		$this->user->dir_output = $rootforuser."/users";
-		$this->user->dir_temp = $rootfortemp."/users/temp";
-
-		// For usergroup storage
-		$this->usergroup->dir_output = $rootforuser."/usergroups";
-		$this->usergroup->dir_temp = $rootfortemp."/usergroups/temp";
-
-		// For proposal storage
-		$this->propal->multidir_output = array($this->entity => $rootfordata."/propale");
-		$this->propal->multidir_temp = array($this->entity => $rootfortemp."/propale/temp");
-		// For backward compatibility
-		$this->propal->dir_output = $rootfordata."/propale";
-		$this->propal->dir_temp = $rootfortemp."/propale/temp";
-
-		// For medias storage
-		$this->medias->multidir_output = array($this->entity => $rootfordata."/medias");
-		$this->medias->multidir_temp = array($this->entity => $rootfortemp."/medias/temp");
-
-		// Exception: Some dir are not the name of module. So we keep exception here for backward compatibility.
-
-		// Sous module bons d'expedition
-		$this->expedition_bon->enabled = (!empty($this->global->MAIN_SUBMODULE_EXPEDITION) ? $this->global->MAIN_SUBMODULE_EXPEDITION : 0);
-		// Sub module delivery note  Sous module bons de livraison
-		$this->delivery_note->enabled = (!empty($this->global->MAIN_SUBMODULE_DELIVERY) ? $this->global->MAIN_SUBMODULE_DELIVERY : 0);
-
-		// Module fournisseur
-		if (!empty($this->fournisseur)) {
-			$this->fournisseur->commande = new stdClass();
-			$this->fournisseur->commande->multidir_output = array($this->entity => $rootfordata."/fournisseur/commande");
-			$this->fournisseur->commande->multidir_temp = array($this->entity => $rootfortemp."/fournisseur/commande/temp");
-			$this->fournisseur->commande->dir_output = $rootfordata."/fournisseur/commande"; // For backward compatibility
-			$this->fournisseur->commande->dir_temp = $rootfortemp."/fournisseur/commande/temp"; // For backward compatibility
-
-			$this->fournisseur->facture = new stdClass();
-			$this->fournisseur->facture->multidir_output = array($this->entity => $rootfordata."/fournisseur/facture");
-			$this->fournisseur->facture->multidir_temp = array($this->entity => $rootfortemp."/fournisseur/facture/temp");
-			$this->fournisseur->facture->dir_output = $rootfordata."/fournisseur/facture"; // For backward compatibility
-			$this->fournisseur->facture->dir_temp = $rootfortemp."/fournisseur/facture/temp"; // For backward compatibility
-
-			$this->supplierproposal = new stdClass();
-			$this->supplierproposal->multidir_output = array($this->entity => $rootfordata."/supplier_proposal");
-			$this->supplierproposal->multidir_temp = array($this->entity => $rootfortemp."/supplier_proposal/temp");
-			$this->supplierproposal->dir_output = $rootfordata."/supplier_proposal"; // For backward compatibility
-			$this->supplierproposal->dir_temp = $rootfortemp."/supplier_proposal/temp"; // For backward compatibility
-
-			$this->fournisseur->payment = new stdClass();
-			$this->fournisseur->payment->multidir_output = array($this->entity => $rootfordata."/fournisseur/payment");
-			$this->fournisseur->payment->multidir_temp = array($this->entity => $rootfortemp."/fournisseur/payment/temp");
-			$this->fournisseur->payment->dir_output = $rootfordata."/fournisseur/payment"; // For backward compatibility
-			$this->fournisseur->payment->dir_temp = $rootfortemp."/fournisseur/payment/temp"; // For backward compatibility
-
-			// To prepare split of module fournisseur into module 'fournisseur' + supplier_order + supplier_invoice
-			if (!empty($this->fournisseur->enabled) && empty($this->global->MAIN_USE_NEW_SUPPLIERMOD)) {  // By default, if module supplier is on, and we don't use yet the new modules, we set artificially the module properties
-				$this->supplier_order = new stdClass();
-				$this->supplier_order->enabled = 1;
-				$this->supplier_order->multidir_output = array($this->entity => $rootfordata."/fournisseur/commande");
-				$this->supplier_order->multidir_temp = array($this->entity => $rootfortemp."/fournisseur/commande/temp");
-				$this->supplier_order->dir_output = $rootfordata."/fournisseur/commande"; // For backward compatibility
-				$this->supplier_order->dir_temp = $rootfortemp."/fournisseur/commande/temp"; // For backward compatibility
-
-				$this->supplier_invoice = new stdClass();
-				$this->supplier_invoice->enabled = 1;
-				$this->supplier_invoice->multidir_output = array($this->entity => $rootfordata."/fournisseur/facture");
-				$this->supplier_invoice->multidir_temp = array($this->entity => $rootfortemp."/fournisseur/facture/temp");
-				$this->supplier_invoice->dir_output = $rootfordata."/fournisseur/facture"; // For backward compatibility
-				$this->supplier_invoice->dir_temp = $rootfortemp."/fournisseur/facture/temp"; // For backward compatibility
-			}
-		}
-
-		// Module product/service
-		$this->product->multidir_output 		= array($this->entity => $rootfordata."/produit");
-		$this->product->multidir_temp			= array($this->entity => $rootfortemp."/produit/temp");
-		$this->service->multidir_output			= array($this->entity => $rootfordata."/produit");
-		$this->service->multidir_temp			= array($this->entity => $rootfortemp."/produit/temp");
-		// For backward compatibility
-		$this->product->dir_output				= $rootfordata."/produit";
-		$this->product->dir_temp				= $rootfortemp."/produit/temp";
-		$this->service->dir_output				= $rootfordata."/produit";
-		$this->service->dir_temp				= $rootfortemp."/produit/temp";
-
-		// Module productbatch
-		$this->productbatch->multidir_output = array($this->entity => $rootfordata."/productlot");
-		$this->productbatch->multidir_temp = array($this->entity => $rootfortemp."/productlot/temp");
-
-		// Module contrat
-		$this->contrat->multidir_output = array($this->entity => $rootfordata."/contract");
-		$this->contrat->multidir_temp = array($this->entity => $rootfortemp."/contract/temp");
-		// For backward compatibility
-		$this->contrat->dir_output = $rootfordata."/contract";
-		$this->contrat->dir_temp = $rootfortemp."/contract/temp";
-
-		// Module bank
-		$this->bank->multidir_output = array($this->entity => $rootfordata."/bank");
-		$this->bank->multidir_temp = array($this->entity => $rootfortemp."/bank/temp");
-		// For backward compatibility
-		$this->bank->dir_output = $rootfordata."/bank";
-		$this->bank->dir_temp = $rootfortemp."/bank/temp";
-
-		// Set some default values
-		//$this->global->MAIN_LIST_FILTER_ON_DAY=1;		// On filter that show date, we must show input field for day before or after month
-		$this->global->MAIN_MAIL_USE_MULTI_PART = 1;
-
-		// societe
-		if (empty($this->global->SOCIETE_CODECLIENT_ADDON)) {
-			$this->global->SOCIETE_CODECLIENT_ADDON = "mod_codeclient_leopard";
-		}
-		if (empty($this->global->SOCIETE_CODECOMPTA_ADDON)) {
-			$this->global->SOCIETE_CODECOMPTA_ADDON = "mod_codecompta_panicum";
-		}
-
-		if (empty($this->global->CHEQUERECEIPTS_ADDON)) {
-			$this->global->CHEQUERECEIPTS_ADDON = 'mod_chequereceipt_mint';
-		}
-		if (empty($this->global->TICKET_ADDON)) {
-			$this->global->TICKET_ADDON = 'mod_ticket_simple';
-		}
-
-		// Security
-		if (empty($this->global->USER_PASSWORD_GENERATED)) {
-			$this->global->USER_PASSWORD_GENERATED = 'standard'; // Default password generator
-		}
-		if (empty($this->global->MAIN_UMASK)) {
-			$this->global->MAIN_UMASK = '0664'; // Default mask
-		}
-
-		// conf->use_javascript_ajax
-		$this->use_javascript_ajax = 1;
-		if (isset($this->global->MAIN_DISABLE_JAVASCRIPT)) {
-			$this->use_javascript_ajax = !$this->global->MAIN_DISABLE_JAVASCRIPT;
-		}
-		// If no javascript_ajax, Ajax features are disabled.
-		if (empty($this->use_javascript_ajax)) {
-			unset($this->global->PRODUIT_USE_SEARCH_TO_SELECT);
-			unset($this->global->COMPANY_USE_SEARCH_TO_SELECT);
-			unset($this->global->CONTACT_USE_SEARCH_TO_SELECT);
-			unset($this->global->PROJECT_USE_SEARCH_TO_SELECT);
-		}
-
-		if (!empty($this->productbatch->enabled)) {
-			$this->global->STOCK_CALCULATE_ON_BILL = 0;
-			$this->global->STOCK_CALCULATE_ON_VALIDATE_ORDER = 0;
-			$this->global->STOCK_CALCULATE_ON_SHIPMENT = 1;
-			$this->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE = 0;
-			$this->global->STOCK_CALCULATE_ON_SUPPLIER_BILL = 0;
-			$this->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER = 0;
-			if (empty($this->reception->enabled)) {
-				$this->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER = 1;
-			} else {
-				$this->global->STOCK_CALCULATE_ON_RECEPTION = 1;
-				$this->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE = 0;
-			}
-		}
-
-		if (!isset($this->global->STOCK_SHOW_ALL_BATCH_BY_DEFAULT)) {
-			$this->global->STOCK_SHOW_ALL_BATCH_BY_DEFAULT = 1;
-		}
-
-		// conf->currency
-		if (empty($this->global->MAIN_MONNAIE)) {
-			$this->global->MAIN_MONNAIE = 'EUR';
-		}
-		$this->currency = $this->global->MAIN_MONNAIE;
-
-		if (empty($this->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY)) {
-			$this->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY = 30; // Less than 1 minutes to be sure
-		}
-
-		// conf->global->ACCOUNTING_MODE = Option des modules Comptabilites (simple ou expert). Defini le mode de calcul des etats comptables (CA,...)
-		if (empty($this->global->ACCOUNTING_MODE)) {
-			$this->global->ACCOUNTING_MODE = 'RECETTES-DEPENSES'; // By default. Can be 'RECETTES-DEPENSES' ou 'CREANCES-DETTES'
-		}
-
-		// By default, suppliers objects can be linked to all projects
-		if (!isset($this->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS)) {
-			$this->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS = 1;
-		}
-
-		// By default we enable feature to bill time spent
-		if (!isset($this->global->PROJECT_BILL_TIME_SPENT)) {
-			$this->global->PROJECT_BILL_TIME_SPENT = 1;
-		}
-
-		// MAIN_HTML_TITLE
-		if (!isset($this->global->MAIN_HTML_TITLE)) {
-			$this->global->MAIN_HTML_TITLE = 'noapp,thirdpartynameonly,contactnameonly,projectnameonly';
-		}
-
-		// conf->liste_limit = constante de taille maximale des listes
-		if (empty($this->global->MAIN_SIZE_LISTE_LIMIT)) {
-			$this->global->MAIN_SIZE_LISTE_LIMIT = 25;
-		}
-		$this->liste_limit = $this->global->MAIN_SIZE_LISTE_LIMIT;
-
-		// conf->product->limit_size = constante de taille maximale des select de produit
-		if (!isset($this->global->PRODUIT_LIMIT_SIZE)) {
-			$this->global->PRODUIT_LIMIT_SIZE = 1000;
-		}
-		$this->product->limit_size = $this->global->PRODUIT_LIMIT_SIZE;
-
-		// conf->theme et $this->css
-		if (empty($this->global->MAIN_THEME)) {
-			$this->global->MAIN_THEME = "eldy";
-		}
-		if (!empty($this->global->MAIN_FORCETHEME)) {
-			$this->global->MAIN_THEME = $this->global->MAIN_FORCETHEME;
-		}
-		$this->theme = $this->global->MAIN_THEME;
-		$this->css = "/theme/".$this->theme."/style.css.php";
-
-		// conf->email_from = email pour envoi par dolibarr des mails automatiques
-		$this->email_from = "robot@example.com";
-		if (!empty($this->global->MAIN_MAIL_EMAIL_FROM)) {
-			$this->email_from = $this->global->MAIN_MAIL_EMAIL_FROM;
-		}
-
-		// conf->notification->email_from = email pour envoi par Dolibarr des notifications
-		$this->notification->email_from = $this->email_from;
-		if (!empty($this->global->NOTIFICATION_EMAIL_FROM)) {
-			$this->notification->email_from = $this->global->NOTIFICATION_EMAIL_FROM;
-		}
-
-		// conf->mailing->email_from = email pour envoi par Dolibarr des mailings
-		$this->mailing->email_from = $this->email_from;
-		if (!empty($this->global->MAILING_EMAIL_FROM)) {
-			$this->mailing->email_from = $this->global->MAILING_EMAIL_FROM;
-		}
-		if (!isset($this->global->MAIN_EMAIL_ADD_TRACK_ID)) {
-			$this->global->MAIN_EMAIL_ADD_TRACK_ID = 1;
-		}
-
-		if (!isset($this->global->MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP)) {
-			$this->global->MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP = 1;
-		}
-
-		// Format for date (used by default when not found or not searched in lang)
-		$this->format_date_short = "%d/%m/%Y"; // Format of day with PHP/C tags (strftime functions)
-		$this->format_date_short_java = "dd/MM/yyyy"; // Format of day with Java tags
-		$this->format_hour_short = "%H:%M";
-		$this->format_hour_short_duration = "%H:%M";
-		$this->format_date_text_short = "%d %b %Y";
-		$this->format_date_text = "%d %B %Y";
-		$this->format_date_hour_short = "%d/%m/%Y %H:%M";
-		$this->format_date_hour_sec_short = "%d/%m/%Y %H:%M:%S";
-		$this->format_date_hour_text_short = "%d %b %Y %H:%M";
-		$this->format_date_hour_text = "%d %B %Y %H:%M";
-
-		// Duration of workday
-		if (!isset($this->global->MAIN_DURATION_OF_WORKDAY)) {
-			$this->global->MAIN_DURATION_OF_WORKDAY = 86400;
-		}
-
-		// Limites decimales si non definie (peuvent etre egale a 0)
-		if (!isset($this->global->MAIN_MAX_DECIMALS_UNIT)) {
-			$this->global->MAIN_MAX_DECIMALS_UNIT = 5;
-		}
-		if (!isset($this->global->MAIN_MAX_DECIMALS_TOT)) {
-			$this->global->MAIN_MAX_DECIMALS_TOT = 2;
-		}
-		if (!isset($this->global->MAIN_MAX_DECIMALS_SHOWN)) {
-			$this->global->MAIN_MAX_DECIMALS_SHOWN = 8;
-		}
-
-		// Default pdf option
-		if (!isset($this->global->MAIN_PDF_DASH_BETWEEN_LINES)) {
-			$this->global->MAIN_PDF_DASH_BETWEEN_LINES = 1; // use dash between lines
-		}
-		if (!isset($this->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) {
-			$this->global->PDF_ALLOW_HTML_FOR_FREE_TEXT = 1; // allow html content into free footer text
-		}
-
-		// Default max file size for upload
-		$this->maxfilesize = (empty($this->global->MAIN_UPLOAD_DOC) ? 0 : (int) $this->global->MAIN_UPLOAD_DOC * 1024);
-
-		// By default, we propagate contacts
-		if (!isset($this->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN)) {
-			$this->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN = '*'; // Can be also '*' or '^(BILLING|SHIPPING|CUSTOMER|.*)$' (regex not yet implemented)
-		}
-
-		// By default, we do not use the zip town table but the table of third parties
-		if (!isset($this->global->MAIN_USE_ZIPTOWN_DICTIONNARY)) {
-			$this->global->MAIN_USE_ZIPTOWN_DICTIONNARY = 0;
-		}
-
-		// By default, we open card if one found
-		if (!isset($this->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE)) {
-			$this->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE = 1;
-		}
-
-		// By default, we show state code in combo list
-		if (!isset($this->global->MAIN_SHOW_STATE_CODE)) {
-			$this->global->MAIN_SHOW_STATE_CODE = 1;
-		}
-
-		// Use a SCA ready workflow with Stripe module (STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION by default if nothing defined)
-		if (!isset($this->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION) && empty($this->global->STRIPE_USE_NEW_CHECKOUT)) {
-			$this->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION = 1;
-		}
-
-		// Define list of limited modules (value must be key found for "name" property of module, so for example 'supplierproposal' for Module "Supplier Proposal"
-		if (!isset($this->global->MAIN_MODULES_FOR_EXTERNAL)) {
-			$this->global->MAIN_MODULES_FOR_EXTERNAL = 'user,societe,propal,commande,facture,categorie,supplierproposal,fournisseur,contact,projet,contrat,ficheinter,expedition,agenda,resource,adherent,blockedlog'; // '' means 'all'. Note that contact is added here as it should be a module later.
-		}
-		if (!empty($this->modules_parts['moduleforexternal'])) {		// Module part to include an external module into the MAIN_MODULES_FOR_EXTERNAL list
-			foreach ($this->modules_parts['moduleforexternal'] as $key => $value) {
-				$this->global->MAIN_MODULES_FOR_EXTERNAL .= ",".$key;
-			}
-		}
-
-		// Enable select2
-		if (empty($this->global->MAIN_USE_JQUERY_MULTISELECT) || $this->global->MAIN_USE_JQUERY_MULTISELECT == '1') {
-			$this->global->MAIN_USE_JQUERY_MULTISELECT = 'select2';
-		}
-
-		// Timeouts
-		if (empty($this->global->MAIN_USE_CONNECT_TIMEOUT)) {
-			$this->global->MAIN_USE_CONNECT_TIMEOUT = 10;
-		}
-		if (empty($this->global->MAIN_USE_RESPONSE_TIMEOUT)) {
-			$this->global->MAIN_USE_RESPONSE_TIMEOUT = 30;
-		}
-
-		// Set default variable to calculate VAT as if option tax_mode was 0 (standard)
-		if (empty($this->global->TAX_MODE_SELL_PRODUCT)) {
-			$this->global->TAX_MODE_SELL_PRODUCT = 'invoice';
-		}
-		if (empty($this->global->TAX_MODE_BUY_PRODUCT)) {
-			$this->global->TAX_MODE_BUY_PRODUCT = 'invoice';
-		}
-		if (empty($this->global->TAX_MODE_SELL_SERVICE)) {
-			$this->global->TAX_MODE_SELL_SERVICE = 'payment';
-		}
-		if (empty($this->global->TAX_MODE_BUY_SERVICE)) {
-			$this->global->TAX_MODE_BUY_SERVICE = 'payment';
-		}
-
-		// Delay before warnings
-		// Avoid strict errors. TODO: Replace xxx->warning_delay with a property ->warning_delay_xxx
-		if (isset($this->agenda)) {
-			$this->adherent->subscription = new stdClass();
-			$this->adherent->subscription->warning_delay = (isset($this->global->MAIN_DELAY_MEMBERS) ? $this->global->MAIN_DELAY_MEMBERS : 0) * 86400;
-		}
-		if (isset($this->agenda)) {
-			$this->agenda->warning_delay = (isset($this->global->MAIN_DELAY_ACTIONS_TODO) ? $this->global->MAIN_DELAY_ACTIONS_TODO : 7) * 86400;
-		}
-		if (isset($this->projet)) {
-			$this->projet->warning_delay = (isset($this->global->MAIN_DELAY_PROJECT_TO_CLOSE) ? $this->global->MAIN_DELAY_PROJECT_TO_CLOSE : 7) * 86400;
-			$this->projet->task = new StdClass();
-			$this->projet->task->warning_delay = (isset($this->global->MAIN_DELAY_TASKS_TODO) ? $this->global->MAIN_DELAY_TASKS_TODO : 7) * 86400;
-		}
-
-		if (isset($this->commande)) {
-			$this->commande->client = new stdClass();
-			$this->commande->fournisseur = new stdClass();
-			$this->commande->client->warning_delay = (isset($this->global->MAIN_DELAY_ORDERS_TO_PROCESS) ? $this->global->MAIN_DELAY_ORDERS_TO_PROCESS : 2) * 86400;
-			$this->commande->fournisseur->warning_delay = (isset($this->global->MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS) ? $this->global->MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS : 7) * 86400;
-		}
-		if (isset($this->propal)) {
-			$this->propal->cloture = new stdClass();
-			$this->propal->facturation = new stdClass();
-			$this->propal->cloture->warning_delay = (isset($this->global->MAIN_DELAY_PROPALS_TO_CLOSE) ? $this->global->MAIN_DELAY_PROPALS_TO_CLOSE : 0) * 86400;
-			$this->propal->facturation->warning_delay = (isset($this->global->MAIN_DELAY_PROPALS_TO_BILL) ? $this->global->MAIN_DELAY_PROPALS_TO_BILL : 0) * 86400;
-		}
-		if (isset($this->facture)) {
-			$this->facture->client = new stdClass();
-			$this->facture->fournisseur = new stdClass();
-			$this->facture->client->warning_delay = (isset($this->global->MAIN_DELAY_CUSTOMER_BILLS_UNPAYED) ? $this->global->MAIN_DELAY_CUSTOMER_BILLS_UNPAYED : 0) * 86400;
-			$this->facture->fournisseur->warning_delay = (isset($this->global->MAIN_DELAY_SUPPLIER_BILLS_TO_PAY) ? $this->global->MAIN_DELAY_SUPPLIER_BILLS_TO_PAY : 0) * 86400;
-		}
-		if (isset($this->contrat)) {
-			$this->contrat->services = new stdClass();
-			$this->contrat->services->inactifs = new stdClass();
-			$this->contrat->services->expires = new stdClass();
-			$this->contrat->services->inactifs->warning_delay = (isset($this->global->MAIN_DELAY_NOT_ACTIVATED_SERVICES) ? $this->global->MAIN_DELAY_NOT_ACTIVATED_SERVICES : 0) * 86400;
-			$this->contrat->services->expires->warning_delay = (isset($this->global->MAIN_DELAY_RUNNING_SERVICES) ? $this->global->MAIN_DELAY_RUNNING_SERVICES : 0) * 86400;
-		}
-		if (isset($this->commande)) {
-			$this->bank->rappro					= new stdClass();
-			$this->bank->cheque					= new stdClass();
-			$this->bank->rappro->warning_delay = (isset($this->global->MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE) ? $this->global->MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE : 0) * 86400;
-			$this->bank->cheque->warning_delay = (isset($this->global->MAIN_DELAY_CHEQUES_TO_DEPOSIT) ? $this->global->MAIN_DELAY_CHEQUES_TO_DEPOSIT : 0) * 86400;
-		}
-		if (isset($this->expensereport)) {
-			$this->expensereport->approve = new stdClass();
-			$this->expensereport->approve->warning_delay = (isset($this->global->MAIN_DELAY_EXPENSEREPORTS) ? $this->global->MAIN_DELAY_EXPENSEREPORTS : 0) * 86400;
-			$this->expensereport->payment = new stdClass();
-			$this->expensereport->payment->warning_delay = (isset($this->global->MAIN_DELAY_EXPENSEREPORTS_TO_PAY) ? $this->global->MAIN_DELAY_EXPENSEREPORTS_TO_PAY : 0) * 86400;
-		}
-		if (isset($this->holiday)) {
-			$this->holiday->approve = new stdClass();
-			$this->holiday->approve->warning_delay = (isset($this->global->MAIN_DELAY_HOLIDAYS) ? $this->global->MAIN_DELAY_HOLIDAYS : 0) * 86400;
-		}
-
-		if (!empty($this->global->PRODUIT_MULTIPRICES) && empty($this->global->PRODUIT_MULTIPRICES_LIMIT)) {
-			$this->global->PRODUIT_MULTIPRICES_LIMIT = 5;
-		}
-
-		// For modules that want to disable top or left menu
-		if (!empty($this->global->MAIN_HIDE_TOP_MENU)) {
-			$this->dol_hide_topmenu = $this->global->MAIN_HIDE_TOP_MENU;
-		}
-		if (!empty($this->global->MAIN_HIDE_LEFT_MENU)) {
-			$this->dol_hide_leftmenu = $this->global->MAIN_HIDE_LEFT_MENU;
-		}
-
-		if (empty($this->global->MAIN_SIZE_SHORTLIST_LIMIT)) {
-			$this->global->MAIN_SIZE_SHORTLIST_LIMIT = 3;
-		}
-
-		if (!isset($this->global->THEME_HIDE_BORDER_ON_INPUT)) {
-			$this->global->THEME_HIDE_BORDER_ON_INPUT = 0;
-		}
-
-		// Save inconsistent option
-		if (empty($this->global->AGENDA_USE_EVENT_TYPE) && (!isset($this->global->AGENDA_DEFAULT_FILTER_TYPE) || $this->global->AGENDA_DEFAULT_FILTER_TYPE == 'AC_NON_AUTO')) {
-			$this->global->AGENDA_DEFAULT_FILTER_TYPE = '0'; // 'AC_NON_AUTO' does not exists when AGENDA_DEFAULT_FILTER_TYPE is not on.
-		}
-
-		if (!isset($this->global->MAIN_JS_GRAPH)) {
-			$this->global->MAIN_JS_GRAPH = 'chart'; // Use chart.js library
-		}
-
-		if (empty($this->global->MAIN_MODULE_DOLISTORE_API_SRV)) {
-			$this->global->MAIN_MODULE_DOLISTORE_API_SRV = 'https://www.dolistore.com';
-		}
-		if (empty($this->global->MAIN_MODULE_DOLISTORE_API_KEY)) {
-			$this->global->MAIN_MODULE_DOLISTORE_API_KEY = 'dolistorecatalogpublickey1234567';
-		}
-
-		// If we are in develop mode, we activate the option MAIN_SECURITY_CSRF_WITH_TOKEN to 1 if not already defined.
-		if (!isset($this->global->MAIN_SECURITY_CSRF_WITH_TOKEN) && $this->global->MAIN_FEATURES_LEVEL >= 2) {
-			$this->global->MAIN_SECURITY_CSRF_WITH_TOKEN = 1;
-		}
-
-		if (defined('MAIN_ANTIVIRUS_COMMAND')) {
-			$this->global->MAIN_ANTIVIRUS_COMMAND = constant('MAIN_ANTIVIRUS_COMMAND');
-		}
-		if (defined('MAIN_ANTIVIRUS_PARAM')) {
-			$this->global->MAIN_ANTIVIRUS_PARAM = constant('MAIN_ANTIVIRUS_PARAM');
-		}
-
-		if (!empty($this->global->MAIN_TZUSERINPUTKEY)) {
-			$this->tzuserinputkey = $this->global->MAIN_TZUSERINPUTKEY;	// 'tzserver' or 'tzuserrel'
-		}
-
-		if (!empty($this->global->PRODUIT_AUTOFILL_DESC)) {
-			$this->global->MAIN_NO_CONCAT_DESCRIPTION = 1;
-		} else {
-			unset($this->global->MAIN_NO_CONCAT_DESCRIPTION);
-		}
-
-		// product is new use
-		if (isset($this->product)) {
+			// For proposal storage
+			$this->propal->multidir_output = array($this->entity => $rootfordata."/propale");
+			$this->propal->multidir_temp = array($this->entity => $rootfortemp."/propale/temp");
 			// For backward compatibility
-			$this->produit = $this->product;
-		}
-		// invoice is new use, facture is old use still initialised
-		if (isset($this->facture)) {
-			$this->invoice = $this->facture;
-		}
-		// order is new use, commande is old use still initialised
-		if (isset($this->commande)) {
-			$this->order = $this->commande;
-		}
-		// contract is new use, contrat is old use still initialised
-		if (isset($this->contrat)) {
-			$this->contract = $this->contrat;
-		}
-		// category is new use, categorie is old use still initialised
-		if (isset($this->categorie)) {
-			$this->category = $this->categorie;
-		}
-		// project is new use, projet is old use still initialised
-		if (isset($this->projet) && !isset($this->project)) {
-			$this->project = $this->projet;
-		}
-		// member is new use, adherent is old use still initialised
-		if (isset($this->adherent) && !isset($this->member)) {
-			$this->member = $this->adherent;
-		}
+			$this->propal->dir_output = $rootfordata."/propale";
+			$this->propal->dir_temp = $rootfortemp."/propale/temp";
 
-		// Object $mc
-		if (!defined('NOREQUIREMC') && !empty($this->multicompany->enabled)) {
-			if (is_object($mc)) {
-				$mc->setValues($this);
-			}
-		}
+			// For medias storage
+			$this->medias->multidir_output = array($this->entity => $rootfordata."/medias");
+			$this->medias->multidir_temp = array($this->entity => $rootfortemp."/medias/temp");
 
-		if (!empty($this->syslog->enabled)) {
-			// We init log handlers
-			if (!empty($this->global->SYSLOG_HANDLERS)) {
-				$handlers = json_decode($this->global->SYSLOG_HANDLERS);
-			} else {
-				$handlers = array();
-			}
-			foreach ($handlers as $handler) {
-				$handler_file_found = '';
-				$dirsyslogs = array('/core/modules/syslog/');
-				if (!empty($this->modules_parts['syslog']) && is_array($this->modules_parts['syslog'])) {
-					$dirsyslogs = array_merge($dirsyslogs, $this->modules_parts['syslog']);
+			// Exception: Some dir are not the name of module. So we keep exception here for backward compatibility.
+
+			// Sous module bons d'expedition
+			$this->expedition_bon->enabled = (!empty($this->global->MAIN_SUBMODULE_EXPEDITION) ? $this->global->MAIN_SUBMODULE_EXPEDITION : 0);
+			// Sub module delivery note  Sous module bons de livraison
+			$this->delivery_note->enabled = (!empty($this->global->MAIN_SUBMODULE_DELIVERY) ? $this->global->MAIN_SUBMODULE_DELIVERY : 0);
+
+			// Module fournisseur
+			if (!empty($this->fournisseur)) {
+				$this->fournisseur->commande = new stdClass();
+				$this->fournisseur->commande->multidir_output = array($this->entity => $rootfordata."/fournisseur/commande");
+				$this->fournisseur->commande->multidir_temp = array($this->entity => $rootfortemp."/fournisseur/commande/temp");
+				$this->fournisseur->commande->dir_output = $rootfordata."/fournisseur/commande"; // For backward compatibility
+				$this->fournisseur->commande->dir_temp = $rootfortemp."/fournisseur/commande/temp"; // For backward compatibility
+
+				$this->fournisseur->facture = new stdClass();
+				$this->fournisseur->facture->multidir_output = array($this->entity => $rootfordata."/fournisseur/facture");
+				$this->fournisseur->facture->multidir_temp = array($this->entity => $rootfortemp."/fournisseur/facture/temp");
+				$this->fournisseur->facture->dir_output = $rootfordata."/fournisseur/facture"; // For backward compatibility
+				$this->fournisseur->facture->dir_temp = $rootfortemp."/fournisseur/facture/temp"; // For backward compatibility
+
+				$this->supplierproposal = new stdClass();
+				$this->supplierproposal->multidir_output = array($this->entity => $rootfordata."/supplier_proposal");
+				$this->supplierproposal->multidir_temp = array($this->entity => $rootfortemp."/supplier_proposal/temp");
+				$this->supplierproposal->dir_output = $rootfordata."/supplier_proposal"; // For backward compatibility
+				$this->supplierproposal->dir_temp = $rootfortemp."/supplier_proposal/temp"; // For backward compatibility
+
+				$this->fournisseur->payment = new stdClass();
+				$this->fournisseur->payment->multidir_output = array($this->entity => $rootfordata."/fournisseur/payment");
+				$this->fournisseur->payment->multidir_temp = array($this->entity => $rootfortemp."/fournisseur/payment/temp");
+				$this->fournisseur->payment->dir_output = $rootfordata."/fournisseur/payment"; // For backward compatibility
+				$this->fournisseur->payment->dir_temp = $rootfortemp."/fournisseur/payment/temp"; // For backward compatibility
+
+				// To prepare split of module fournisseur into module 'fournisseur' + supplier_order + supplier_invoice
+				if (!empty($this->fournisseur->enabled) && empty($this->global->MAIN_USE_NEW_SUPPLIERMOD)) {  // By default, if module supplier is on, and we don't use yet the new modules, we set artificially the module properties
+					$this->supplier_order = new stdClass();
+					$this->supplier_order->enabled = 1;
+					$this->supplier_order->multidir_output = array($this->entity => $rootfordata."/fournisseur/commande");
+					$this->supplier_order->multidir_temp = array($this->entity => $rootfortemp."/fournisseur/commande/temp");
+					$this->supplier_order->dir_output = $rootfordata."/fournisseur/commande"; // For backward compatibility
+					$this->supplier_order->dir_temp = $rootfortemp."/fournisseur/commande/temp"; // For backward compatibility
+
+					$this->supplier_invoice = new stdClass();
+					$this->supplier_invoice->enabled = 1;
+					$this->supplier_invoice->multidir_output = array($this->entity => $rootfordata."/fournisseur/facture");
+					$this->supplier_invoice->multidir_temp = array($this->entity => $rootfortemp."/fournisseur/facture/temp");
+					$this->supplier_invoice->dir_output = $rootfordata."/fournisseur/facture"; // For backward compatibility
+					$this->supplier_invoice->dir_temp = $rootfortemp."/fournisseur/facture/temp"; // For backward compatibility
 				}
-				foreach ($dirsyslogs as $reldir) {
-					$dir = dol_buildpath($reldir, 0);
-					$newdir = dol_osencode($dir);
-					if (is_dir($newdir)) {
-						$file = $newdir.$handler.'.php';
-						if (file_exists($file)) {
-							$handler_file_found = $file;
-							break;
+			}
+
+			// Module product/service
+			$this->product->multidir_output 		= array($this->entity => $rootfordata."/produit");
+			$this->product->multidir_temp			= array($this->entity => $rootfortemp."/produit/temp");
+			$this->service->multidir_output			= array($this->entity => $rootfordata."/produit");
+			$this->service->multidir_temp			= array($this->entity => $rootfortemp."/produit/temp");
+			// For backward compatibility
+			$this->product->dir_output				= $rootfordata."/produit";
+			$this->product->dir_temp				= $rootfortemp."/produit/temp";
+			$this->service->dir_output				= $rootfordata."/produit";
+			$this->service->dir_temp				= $rootfortemp."/produit/temp";
+
+			// Module productbatch
+			$this->productbatch->multidir_output = array($this->entity => $rootfordata."/productlot");
+			$this->productbatch->multidir_temp = array($this->entity => $rootfortemp."/productlot/temp");
+
+			// Module contrat
+			$this->contrat->multidir_output = array($this->entity => $rootfordata."/contract");
+			$this->contrat->multidir_temp = array($this->entity => $rootfortemp."/contract/temp");
+			// For backward compatibility
+			$this->contrat->dir_output = $rootfordata."/contract";
+			$this->contrat->dir_temp = $rootfortemp."/contract/temp";
+
+			// Module bank
+			$this->bank->multidir_output = array($this->entity => $rootfordata."/bank");
+			$this->bank->multidir_temp = array($this->entity => $rootfortemp."/bank/temp");
+			// For backward compatibility
+			$this->bank->dir_output = $rootfordata."/bank";
+			$this->bank->dir_temp = $rootfortemp."/bank/temp";
+
+			// Set some default values
+			//$this->global->MAIN_LIST_FILTER_ON_DAY=1;		// On filter that show date, we must show input field for day before or after month
+			$this->global->MAIN_MAIL_USE_MULTI_PART = 1;
+
+			// societe
+			if (empty($this->global->SOCIETE_CODECLIENT_ADDON)) {
+				$this->global->SOCIETE_CODECLIENT_ADDON = "mod_codeclient_leopard";
+			}
+			if (empty($this->global->SOCIETE_CODECOMPTA_ADDON)) {
+				$this->global->SOCIETE_CODECOMPTA_ADDON = "mod_codecompta_panicum";
+			}
+
+			if (empty($this->global->CHEQUERECEIPTS_ADDON)) {
+				$this->global->CHEQUERECEIPTS_ADDON = 'mod_chequereceipt_mint';
+			}
+			if (empty($this->global->TICKET_ADDON)) {
+				$this->global->TICKET_ADDON = 'mod_ticket_simple';
+			}
+
+			// Security
+			if (empty($this->global->USER_PASSWORD_GENERATED)) {
+				$this->global->USER_PASSWORD_GENERATED = 'standard'; // Default password generator
+			}
+			if (empty($this->global->MAIN_UMASK)) {
+				$this->global->MAIN_UMASK = '0664'; // Default mask
+			}
+
+			// conf->use_javascript_ajax
+			$this->use_javascript_ajax = 1;
+			if (isset($this->global->MAIN_DISABLE_JAVASCRIPT)) {
+				$this->use_javascript_ajax = !$this->global->MAIN_DISABLE_JAVASCRIPT;
+			}
+			// If no javascript_ajax, Ajax features are disabled.
+			if (empty($this->use_javascript_ajax)) {
+				unset($this->global->PRODUIT_USE_SEARCH_TO_SELECT);
+				unset($this->global->COMPANY_USE_SEARCH_TO_SELECT);
+				unset($this->global->CONTACT_USE_SEARCH_TO_SELECT);
+				unset($this->global->PROJECT_USE_SEARCH_TO_SELECT);
+			}
+
+			if (!empty($this->productbatch->enabled)) {
+				$this->global->STOCK_CALCULATE_ON_BILL = 0;
+				$this->global->STOCK_CALCULATE_ON_VALIDATE_ORDER = 0;
+				$this->global->STOCK_CALCULATE_ON_SHIPMENT = 1;
+				$this->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE = 0;
+				$this->global->STOCK_CALCULATE_ON_SUPPLIER_BILL = 0;
+				$this->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER = 0;
+				if (empty($this->reception->enabled)) {
+					$this->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER = 1;
+				} else {
+					$this->global->STOCK_CALCULATE_ON_RECEPTION = 1;
+					$this->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE = 0;
+				}
+			}
+
+			if (!isset($this->global->STOCK_SHOW_ALL_BATCH_BY_DEFAULT)) {
+				$this->global->STOCK_SHOW_ALL_BATCH_BY_DEFAULT = 1;
+			}
+
+			// conf->currency
+			if (empty($this->global->MAIN_MONNAIE)) {
+				$this->global->MAIN_MONNAIE = 'EUR';
+			}
+			$this->currency = $this->global->MAIN_MONNAIE;
+
+			if (empty($this->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY)) {
+				$this->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY = 30; // Less than 1 minutes to be sure
+			}
+
+			// conf->global->ACCOUNTING_MODE = Option des modules Comptabilites (simple ou expert). Defini le mode de calcul des etats comptables (CA,...)
+			if (empty($this->global->ACCOUNTING_MODE)) {
+				$this->global->ACCOUNTING_MODE = 'RECETTES-DEPENSES'; // By default. Can be 'RECETTES-DEPENSES' ou 'CREANCES-DETTES'
+			}
+
+			// By default, suppliers objects can be linked to all projects
+			if (!isset($this->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS)) {
+				$this->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS = 1;
+			}
+
+			// By default we enable feature to bill time spent
+			if (!isset($this->global->PROJECT_BILL_TIME_SPENT)) {
+				$this->global->PROJECT_BILL_TIME_SPENT = 1;
+			}
+
+			// MAIN_HTML_TITLE
+			if (!isset($this->global->MAIN_HTML_TITLE)) {
+				$this->global->MAIN_HTML_TITLE = 'noapp,thirdpartynameonly,contactnameonly,projectnameonly';
+			}
+
+			// conf->liste_limit = constante de taille maximale des listes
+			if (empty($this->global->MAIN_SIZE_LISTE_LIMIT)) {
+				$this->global->MAIN_SIZE_LISTE_LIMIT = 25;
+			}
+			$this->liste_limit = $this->global->MAIN_SIZE_LISTE_LIMIT;
+
+			// conf->product->limit_size = constante de taille maximale des select de produit
+			if (!isset($this->global->PRODUIT_LIMIT_SIZE)) {
+				$this->global->PRODUIT_LIMIT_SIZE = 1000;
+			}
+			$this->product->limit_size = $this->global->PRODUIT_LIMIT_SIZE;
+
+			// conf->theme et $this->css
+			if (empty($this->global->MAIN_THEME)) {
+				$this->global->MAIN_THEME = "eldy";
+			}
+			if (!empty($this->global->MAIN_FORCETHEME)) {
+				$this->global->MAIN_THEME = $this->global->MAIN_FORCETHEME;
+			}
+			$this->theme = $this->global->MAIN_THEME;
+			$this->css = "/theme/".$this->theme."/style.css.php";
+
+			// conf->email_from = email pour envoi par dolibarr des mails automatiques
+			$this->email_from = "robot@example.com";
+			if (!empty($this->global->MAIN_MAIL_EMAIL_FROM)) {
+				$this->email_from = $this->global->MAIN_MAIL_EMAIL_FROM;
+			}
+
+			// conf->notification->email_from = email pour envoi par Dolibarr des notifications
+			$this->notification->email_from = $this->email_from;
+			if (!empty($this->global->NOTIFICATION_EMAIL_FROM)) {
+				$this->notification->email_from = $this->global->NOTIFICATION_EMAIL_FROM;
+			}
+
+			// conf->mailing->email_from = email pour envoi par Dolibarr des mailings
+			$this->mailing->email_from = $this->email_from;
+			if (!empty($this->global->MAILING_EMAIL_FROM)) {
+				$this->mailing->email_from = $this->global->MAILING_EMAIL_FROM;
+			}
+			if (!isset($this->global->MAIN_EMAIL_ADD_TRACK_ID)) {
+				$this->global->MAIN_EMAIL_ADD_TRACK_ID = 1;
+			}
+
+			if (!isset($this->global->MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP)) {
+				$this->global->MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP = 1;
+			}
+
+			// Format for date (used by default when not found or not searched in lang)
+			$this->format_date_short = "%d/%m/%Y"; // Format of day with PHP/C tags (strftime functions)
+			$this->format_date_short_java = "dd/MM/yyyy"; // Format of day with Java tags
+			$this->format_hour_short = "%H:%M";
+			$this->format_hour_short_duration = "%H:%M";
+			$this->format_date_text_short = "%d %b %Y";
+			$this->format_date_text = "%d %B %Y";
+			$this->format_date_hour_short = "%d/%m/%Y %H:%M";
+			$this->format_date_hour_sec_short = "%d/%m/%Y %H:%M:%S";
+			$this->format_date_hour_text_short = "%d %b %Y %H:%M";
+			$this->format_date_hour_text = "%d %B %Y %H:%M";
+
+			// Duration of workday
+			if (!isset($this->global->MAIN_DURATION_OF_WORKDAY)) {
+				$this->global->MAIN_DURATION_OF_WORKDAY = 86400;
+			}
+
+			// Limites decimales si non definie (peuvent etre egale a 0)
+			if (!isset($this->global->MAIN_MAX_DECIMALS_UNIT)) {
+				$this->global->MAIN_MAX_DECIMALS_UNIT = 5;
+			}
+			if (!isset($this->global->MAIN_MAX_DECIMALS_TOT)) {
+				$this->global->MAIN_MAX_DECIMALS_TOT = 2;
+			}
+			if (!isset($this->global->MAIN_MAX_DECIMALS_SHOWN)) {
+				$this->global->MAIN_MAX_DECIMALS_SHOWN = 8;
+			}
+
+			// Default pdf option
+			if (!isset($this->global->MAIN_PDF_DASH_BETWEEN_LINES)) {
+				$this->global->MAIN_PDF_DASH_BETWEEN_LINES = 1; // use dash between lines
+			}
+			if (!isset($this->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) {
+				$this->global->PDF_ALLOW_HTML_FOR_FREE_TEXT = 1; // allow html content into free footer text
+			}
+
+			// Default max file size for upload
+			$this->maxfilesize = (empty($this->global->MAIN_UPLOAD_DOC) ? 0 : (int) $this->global->MAIN_UPLOAD_DOC * 1024);
+
+			// By default, we propagate contacts
+			if (!isset($this->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN)) {
+				$this->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN = '*'; // Can be also '*' or '^(BILLING|SHIPPING|CUSTOMER|.*)$' (regex not yet implemented)
+			}
+
+			// By default, we do not use the zip town table but the table of third parties
+			if (!isset($this->global->MAIN_USE_ZIPTOWN_DICTIONNARY)) {
+				$this->global->MAIN_USE_ZIPTOWN_DICTIONNARY = 0;
+			}
+
+			// By default, we open card if one found
+			if (!isset($this->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE)) {
+				$this->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE = 1;
+			}
+
+			// By default, we show state code in combo list
+			if (!isset($this->global->MAIN_SHOW_STATE_CODE)) {
+				$this->global->MAIN_SHOW_STATE_CODE = 1;
+			}
+
+			// Use a SCA ready workflow with Stripe module (STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION by default if nothing defined)
+			if (!isset($this->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION) && empty($this->global->STRIPE_USE_NEW_CHECKOUT)) {
+				$this->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION = 1;
+			}
+
+			// Define list of limited modules (value must be key found for "name" property of module, so for example 'supplierproposal' for Module "Supplier Proposal"
+			if (!isset($this->global->MAIN_MODULES_FOR_EXTERNAL)) {
+				$this->global->MAIN_MODULES_FOR_EXTERNAL = 'user,societe,propal,commande,facture,categorie,supplierproposal,fournisseur,contact,projet,contrat,ficheinter,expedition,agenda,resource,adherent,blockedlog'; // '' means 'all'. Note that contact is added here as it should be a module later.
+			}
+			if (!empty($this->modules_parts['moduleforexternal'])) {		// Module part to include an external module into the MAIN_MODULES_FOR_EXTERNAL list
+				foreach ($this->modules_parts['moduleforexternal'] as $key => $value) {
+					$this->global->MAIN_MODULES_FOR_EXTERNAL .= ",".$key;
+				}
+			}
+
+			// Enable select2
+			if (empty($this->global->MAIN_USE_JQUERY_MULTISELECT) || $this->global->MAIN_USE_JQUERY_MULTISELECT == '1') {
+				$this->global->MAIN_USE_JQUERY_MULTISELECT = 'select2';
+			}
+
+			// Timeouts
+			if (empty($this->global->MAIN_USE_CONNECT_TIMEOUT)) {
+				$this->global->MAIN_USE_CONNECT_TIMEOUT = 10;
+			}
+			if (empty($this->global->MAIN_USE_RESPONSE_TIMEOUT)) {
+				$this->global->MAIN_USE_RESPONSE_TIMEOUT = 30;
+			}
+
+			// Set default variable to calculate VAT as if option tax_mode was 0 (standard)
+			if (empty($this->global->TAX_MODE_SELL_PRODUCT)) {
+				$this->global->TAX_MODE_SELL_PRODUCT = 'invoice';
+			}
+			if (empty($this->global->TAX_MODE_BUY_PRODUCT)) {
+				$this->global->TAX_MODE_BUY_PRODUCT = 'invoice';
+			}
+			if (empty($this->global->TAX_MODE_SELL_SERVICE)) {
+				$this->global->TAX_MODE_SELL_SERVICE = 'payment';
+			}
+			if (empty($this->global->TAX_MODE_BUY_SERVICE)) {
+				$this->global->TAX_MODE_BUY_SERVICE = 'payment';
+			}
+
+			// Delay before warnings
+			// Avoid strict errors. TODO: Replace xxx->warning_delay with a property ->warning_delay_xxx
+			if (isset($this->agenda)) {
+				$this->adherent->subscription = new stdClass();
+				$this->adherent->subscription->warning_delay = (isset($this->global->MAIN_DELAY_MEMBERS) ? $this->global->MAIN_DELAY_MEMBERS : 0) * 86400;
+			}
+			if (isset($this->agenda)) {
+				$this->agenda->warning_delay = (isset($this->global->MAIN_DELAY_ACTIONS_TODO) ? $this->global->MAIN_DELAY_ACTIONS_TODO : 7) * 86400;
+			}
+			if (isset($this->projet)) {
+				$this->projet->warning_delay = (isset($this->global->MAIN_DELAY_PROJECT_TO_CLOSE) ? $this->global->MAIN_DELAY_PROJECT_TO_CLOSE : 7) * 86400;
+				$this->projet->task = new StdClass();
+				$this->projet->task->warning_delay = (isset($this->global->MAIN_DELAY_TASKS_TODO) ? $this->global->MAIN_DELAY_TASKS_TODO : 7) * 86400;
+			}
+
+			if (isset($this->commande)) {
+				$this->commande->client = new stdClass();
+				$this->commande->fournisseur = new stdClass();
+				$this->commande->client->warning_delay = (isset($this->global->MAIN_DELAY_ORDERS_TO_PROCESS) ? $this->global->MAIN_DELAY_ORDERS_TO_PROCESS : 2) * 86400;
+				$this->commande->fournisseur->warning_delay = (isset($this->global->MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS) ? $this->global->MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS : 7) * 86400;
+			}
+			if (isset($this->propal)) {
+				$this->propal->cloture = new stdClass();
+				$this->propal->facturation = new stdClass();
+				$this->propal->cloture->warning_delay = (isset($this->global->MAIN_DELAY_PROPALS_TO_CLOSE) ? $this->global->MAIN_DELAY_PROPALS_TO_CLOSE : 0) * 86400;
+				$this->propal->facturation->warning_delay = (isset($this->global->MAIN_DELAY_PROPALS_TO_BILL) ? $this->global->MAIN_DELAY_PROPALS_TO_BILL : 0) * 86400;
+			}
+			if (isset($this->facture)) {
+				$this->facture->client = new stdClass();
+				$this->facture->fournisseur = new stdClass();
+				$this->facture->client->warning_delay = (isset($this->global->MAIN_DELAY_CUSTOMER_BILLS_UNPAYED) ? $this->global->MAIN_DELAY_CUSTOMER_BILLS_UNPAYED : 0) * 86400;
+				$this->facture->fournisseur->warning_delay = (isset($this->global->MAIN_DELAY_SUPPLIER_BILLS_TO_PAY) ? $this->global->MAIN_DELAY_SUPPLIER_BILLS_TO_PAY : 0) * 86400;
+			}
+			if (isset($this->contrat)) {
+				$this->contrat->services = new stdClass();
+				$this->contrat->services->inactifs = new stdClass();
+				$this->contrat->services->expires = new stdClass();
+				$this->contrat->services->inactifs->warning_delay = (isset($this->global->MAIN_DELAY_NOT_ACTIVATED_SERVICES) ? $this->global->MAIN_DELAY_NOT_ACTIVATED_SERVICES : 0) * 86400;
+				$this->contrat->services->expires->warning_delay = (isset($this->global->MAIN_DELAY_RUNNING_SERVICES) ? $this->global->MAIN_DELAY_RUNNING_SERVICES : 0) * 86400;
+			}
+			if (isset($this->commande)) {
+				$this->bank->rappro					= new stdClass();
+				$this->bank->cheque					= new stdClass();
+				$this->bank->rappro->warning_delay = (isset($this->global->MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE) ? $this->global->MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE : 0) * 86400;
+				$this->bank->cheque->warning_delay = (isset($this->global->MAIN_DELAY_CHEQUES_TO_DEPOSIT) ? $this->global->MAIN_DELAY_CHEQUES_TO_DEPOSIT : 0) * 86400;
+			}
+			if (isset($this->expensereport)) {
+				$this->expensereport->approve = new stdClass();
+				$this->expensereport->approve->warning_delay = (isset($this->global->MAIN_DELAY_EXPENSEREPORTS) ? $this->global->MAIN_DELAY_EXPENSEREPORTS : 0) * 86400;
+				$this->expensereport->payment = new stdClass();
+				$this->expensereport->payment->warning_delay = (isset($this->global->MAIN_DELAY_EXPENSEREPORTS_TO_PAY) ? $this->global->MAIN_DELAY_EXPENSEREPORTS_TO_PAY : 0) * 86400;
+			}
+			if (isset($this->holiday)) {
+				$this->holiday->approve = new stdClass();
+				$this->holiday->approve->warning_delay = (isset($this->global->MAIN_DELAY_HOLIDAYS) ? $this->global->MAIN_DELAY_HOLIDAYS : 0) * 86400;
+			}
+
+			if (!empty($this->global->PRODUIT_MULTIPRICES) && empty($this->global->PRODUIT_MULTIPRICES_LIMIT)) {
+				$this->global->PRODUIT_MULTIPRICES_LIMIT = 5;
+			}
+
+			// For modules that want to disable top or left menu
+			if (!empty($this->global->MAIN_HIDE_TOP_MENU)) {
+				$this->dol_hide_topmenu = $this->global->MAIN_HIDE_TOP_MENU;
+			}
+			if (!empty($this->global->MAIN_HIDE_LEFT_MENU)) {
+				$this->dol_hide_leftmenu = $this->global->MAIN_HIDE_LEFT_MENU;
+			}
+
+			if (empty($this->global->MAIN_SIZE_SHORTLIST_LIMIT)) {
+				$this->global->MAIN_SIZE_SHORTLIST_LIMIT = 3;
+			}
+
+			if (!isset($this->global->THEME_HIDE_BORDER_ON_INPUT)) {
+				$this->global->THEME_HIDE_BORDER_ON_INPUT = 0;
+			}
+
+			// Save inconsistent option
+			if (empty($this->global->AGENDA_USE_EVENT_TYPE) && (!isset($this->global->AGENDA_DEFAULT_FILTER_TYPE) || $this->global->AGENDA_DEFAULT_FILTER_TYPE == 'AC_NON_AUTO')) {
+				$this->global->AGENDA_DEFAULT_FILTER_TYPE = '0'; // 'AC_NON_AUTO' does not exists when AGENDA_DEFAULT_FILTER_TYPE is not on.
+			}
+
+			if (!isset($this->global->MAIN_JS_GRAPH)) {
+				$this->global->MAIN_JS_GRAPH = 'chart'; // Use chart.js library
+			}
+
+			if (empty($this->global->MAIN_MODULE_DOLISTORE_API_SRV)) {
+				$this->global->MAIN_MODULE_DOLISTORE_API_SRV = 'https://www.dolistore.com';
+			}
+			if (empty($this->global->MAIN_MODULE_DOLISTORE_API_KEY)) {
+				$this->global->MAIN_MODULE_DOLISTORE_API_KEY = 'dolistorecatalogpublickey1234567';
+			}
+
+			// If we are in develop mode, we activate the option MAIN_SECURITY_CSRF_WITH_TOKEN to 1 if not already defined.
+			if (!isset($this->global->MAIN_SECURITY_CSRF_WITH_TOKEN) && $this->global->MAIN_FEATURES_LEVEL >= 2) {
+				$this->global->MAIN_SECURITY_CSRF_WITH_TOKEN = 1;
+			}
+
+			if (defined('MAIN_ANTIVIRUS_COMMAND')) {
+				$this->global->MAIN_ANTIVIRUS_COMMAND = constant('MAIN_ANTIVIRUS_COMMAND');
+			}
+			if (defined('MAIN_ANTIVIRUS_PARAM')) {
+				$this->global->MAIN_ANTIVIRUS_PARAM = constant('MAIN_ANTIVIRUS_PARAM');
+			}
+
+			if (!empty($this->global->MAIN_TZUSERINPUTKEY)) {
+				$this->tzuserinputkey = $this->global->MAIN_TZUSERINPUTKEY;	// 'tzserver' or 'tzuserrel'
+			}
+
+			if (!empty($this->global->PRODUIT_AUTOFILL_DESC)) {
+				$this->global->MAIN_NO_CONCAT_DESCRIPTION = 1;
+			} else {
+				unset($this->global->MAIN_NO_CONCAT_DESCRIPTION);
+			}
+
+			// product is new use
+			if (isset($this->product)) {
+				// For backward compatibility
+				$this->produit = $this->product;
+			}
+			// invoice is new use, facture is old use still initialised
+			if (isset($this->facture)) {
+				$this->invoice = $this->facture;
+			}
+			// order is new use, commande is old use still initialised
+			if (isset($this->commande)) {
+				$this->order = $this->commande;
+			}
+			// contract is new use, contrat is old use still initialised
+			if (isset($this->contrat)) {
+				$this->contract = $this->contrat;
+			}
+			// category is new use, categorie is old use still initialised
+			if (isset($this->categorie)) {
+				$this->category = $this->categorie;
+			}
+			// project is new use, projet is old use still initialised
+			if (isset($this->projet) && !isset($this->project)) {
+				$this->project = $this->projet;
+			}
+			// member is new use, adherent is old use still initialised
+			if (isset($this->adherent) && !isset($this->member)) {
+				$this->member = $this->adherent;
+			}
+
+			// Object $mc
+			if (!defined('NOREQUIREMC') && !empty($this->multicompany->enabled)) {
+				if (is_object($mc)) {
+					$mc->setValues($this);
+				}
+			}
+
+			if (!empty($this->syslog->enabled)) {
+				// We init log handlers
+				if (!empty($this->global->SYSLOG_HANDLERS)) {
+					$handlers = json_decode($this->global->SYSLOG_HANDLERS);
+				} else {
+					$handlers = array();
+				}
+				foreach ($handlers as $handler) {
+					$handler_file_found = '';
+					$dirsyslogs = array('/core/modules/syslog/');
+					if (!empty($this->modules_parts['syslog']) && is_array($this->modules_parts['syslog'])) {
+						$dirsyslogs = array_merge($dirsyslogs, $this->modules_parts['syslog']);
+					}
+					foreach ($dirsyslogs as $reldir) {
+						$dir = dol_buildpath($reldir, 0);
+						$newdir = dol_osencode($dir);
+						if (is_dir($newdir)) {
+							$file = $newdir.$handler.'.php';
+							if (file_exists($file)) {
+								$handler_file_found = $file;
+								break;
+							}
 						}
 					}
-				}
 
-				if (empty($handler_file_found)) {
-					throw new Exception('Missing log handler file '.$handler.'.php');
-				}
+					if (empty($handler_file_found)) {
+						throw new Exception('Missing log handler file '.$handler.'.php');
+					}
 
-				require_once $handler_file_found;
-				$loghandlerinstance = new $handler();
-				if (!$loghandlerinstance instanceof LogHandlerInterface) {
-					throw new Exception('Log handler does not extend LogHandlerInterface');
-				}
+					require_once $handler_file_found;
+					$loghandlerinstance = new $handler();
+					if (!$loghandlerinstance instanceof LogHandlerInterface) {
+						throw new Exception('Log handler does not extend LogHandlerInterface');
+					}
 
-				if (empty($this->loghandlers[$handler])) {
-					$this->loghandlers[$handler] = $loghandlerinstance;
+					if (empty($this->loghandlers[$handler])) {
+						$this->loghandlers[$handler] = $loghandlerinstance;
+					}
 				}
 			}
 		}
 
+		// Overwrite database values from conf into the conf.php file.
+		if (!empty($this->file->mailing_limit_sendbyweb)) {
+			$this->global->MAILING_LIMIT_SENDBYWEB = $this->file->mailing_limit_sendbyweb;
+		}
+		if (empty($this->global->MAILING_LIMIT_SENDBYWEB)) {
+			$this->global->MAILING_LIMIT_SENDBYWEB = 25;
+		}
+		if (!empty($this->file->mailing_limit_sendbycli)) {
+			$this->global->MAILING_LIMIT_SENDBYCLI = $this->file->mailing_limit_sendbycli;
+		}
+
 		return 0;
 	}
 }
diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index 00cfcf842d5..a24b52859c4 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -195,23 +195,10 @@ if (!is_numeric($conf->entity)) {
 	$conf->entity = 1;
 }
 
-if (!defined('NOREQUIREDB')) {
-	//print "Will work with data into entity instance number '".$conf->entity."'";
+//print "We work with data into entity instance number '".$conf->entity."'";
 
-	// Here we read database (llx_const table) and define $conf->global->XXX var.
-	$conf->setValues($db);
-}
-
-// Overwrite database value
-if (!empty($conf->file->mailing_limit_sendbyweb)) {
-	$conf->global->MAILING_LIMIT_SENDBYWEB = $conf->file->mailing_limit_sendbyweb;
-}
-if (empty($conf->global->MAILING_LIMIT_SENDBYWEB)) {
-	$conf->global->MAILING_LIMIT_SENDBYWEB = 25;
-}
-if (!empty($conf->file->mailing_limit_sendbycli)) {
-	$conf->global->MAILING_LIMIT_SENDBYCLI = $conf->file->mailing_limit_sendbycli;
-}
+// Here we read database (llx_const table) and define $conf->global->XXX var.
+$conf->setValues($db);
 
 // Create object $mysoc (A thirdparty object that contains properties of companies managed by Dolibarr.
 if (!defined('NOREQUIREDB') && !defined('NOREQUIRESOC')) {

From 56212508e7b2f2f39a2e37aed32abf49146250bf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 23 Jun 2021 10:47:23 +0200
Subject: [PATCH 0843/1497] Update linkedobjectblock.tpl.php

---
 htdocs/compta/facture/tpl/linkedobjectblock.tpl.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
index 1b81446c243..60a4cced4d0 100644
--- a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
@@ -86,8 +86,12 @@ foreach ($linkedObjectBlock as $key => $objectlink)
 	}
     print '</td>';
     print '<td class="linkedcol-statut right">';
-    if(method_exists($objectlink, 'getSommePaiement')) print $objectlink->getLibStatut(3, $objectlink->getSommePaiement());
-    else print $objectlink->getLibStatut(3);
+    if (method_exists($objectlink, 'getSommePaiement')) {
+		print $objectlink->getLibStatut(3, $objectlink->getSommePaiement());
+	}
+    else {
+		print $objectlink->getLibStatut(3);
+	}
     print '</td>';
     print '<td class="linkedcol-action right"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key.'">'.img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink').'</a></td>';
     print "</tr>\n";

From 9c657206b3ddf2268452f7ab4c5b6792ddf5c75f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 23 Jun 2021 10:47:51 +0200
Subject: [PATCH 0844/1497] Update linkedobjectblock.tpl.php

---
 htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
index 20969cddf22..b8954e7f5c2 100644
--- a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
@@ -66,8 +66,11 @@ foreach ($linkedObjectBlock as $key => $objectlink)
     		}
     	} ?></td>
     	<td class="right"><?php
-		if(method_exists($objectlink, 'getSommePaiement')) echo $objectlink->getLibStatut(3, $objectlink->getSommePaiement());
-		else echo $objectlink->getLibStatut(3);
+		if (method_exists($objectlink, 'getSommePaiement')) {
+			echo $objectlink->getLibStatut(3, $objectlink->getSommePaiement());
+		} else {
+			echo $objectlink->getLibStatut(3);
+		}
 		?></td>
     	<td class="right"><a class="reposition" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>
     </tr>

From eb9be15c4cac7b14e18352cffbc2d3331141a39b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 23 Jun 2021 10:52:05 +0200
Subject: [PATCH 0845/1497] Fix php8

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

diff --git a/htdocs/product/inventory/class/inventory.class.php b/htdocs/product/inventory/class/inventory.class.php
index 126fff5b96b..22e209f31aa 100644
--- a/htdocs/product/inventory/class/inventory.class.php
+++ b/htdocs/product/inventory/class/inventory.class.php
@@ -644,9 +644,9 @@ class Inventory extends CommonObject
 			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 				$this->id = $obj->rowid;
-				if ($obj->fk_user_author) {
+				if ($obj->fk_user_creat) {
 					$cuser = new User($this->db);
-					$cuser->fetch($obj->fk_user_author);
+					$cuser->fetch($obj->fk_user_creat);
 					$this->user_creation = $cuser;
 				}
 

From f24d8a31af069e94db001792400a9a5270039c1c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 23 Jun 2021 11:14:28 +0200
Subject: [PATCH 0846/1497] Fix migration

---
 .travis.yml                          |  2 +-
 htdocs/install/upgrade2.php          | 35 +++++++++++++++++++++++-----
 test/phpunit/KnowledgeRecordTest.php |  2 +-
 3 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0e5cd2d1192..1bd94be4375 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -416,7 +416,7 @@ script:
 - |
   echo "Enabling new modules"
   # Enable modules not enabled into original dump
-  php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_API,MAIN_MODULE_PRODUCTBATCH,MAIN_MODULE_SUPPLIERPROPOSAL,MAIN_MODULE_STRIPE > $TRAVIS_BUILD_DIR/enablemodule.log
+  php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_API,MAIN_MODULE_PRODUCTBATCH,MAIN_MODULE_SUPPLIERPROPOSAL,MAIN_MODULE_STRIPE,MAIN_MODULE_EXPENSEREPORT > $TRAVIS_BUILD_DIR/enablemodule.log
   php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_WEBSITE,MAIN_MODULE_TICKET,MAIN_MODULE_ACCOUNTING,MAIN_MODULE_MRP >> $TRAVIS_BUILD_DIR/enablemodule.log
   php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_RECEPTION,MAIN_MODULE_RECRUITMENT >> $TRAVIS_BUILD_DIR/enablemodule.log
   php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_KNOWLEDGEMANAGEMENT,MAIN_MODULE_EVENTORGANIZATION,MAIN_MODULE_PARTNERSHIP >> $TRAVIS_BUILD_DIR/enablemodule.log
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index 824f05bc059..d0d1ae256b4 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -489,10 +489,16 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
 			'MAIN_MODULE_VARIANTS'=>'newboxdefonly',
 			'MAIN_MODULE_WEBSITE'=>'newboxdefonly',
 		);
-		migrate_reload_modules($db, $langs, $conf, $listofmodule);
 
+		$result = migrate_reload_modules($db, $langs, $conf, $listofmodule);
+		if ($result < 0) {
+			$error++;
+		}
 		// Reload menus (this must be always and only into last targeted version)
-		migrate_reload_menu($db, $langs, $conf);
+		$result = migrate_reload_menu($db, $langs, $conf);
+		if ($result < 0) {
+			$error++;
+		}
 	}
 
 	// Can force activation of some module during migration with parameter 'enablemodules=MAIN_MODULE_XXX,MAIN_MODULE_YYY,...'
@@ -545,10 +551,11 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
 	print '</table>';
 
 
-	// Set constant to ask to remake a new ping to inform about upgrade (if first ping was done and OK)
-	$sql = 'UPDATE '.MAIN_DB_PREFIX."const SET VALUE = 'torefresh' WHERE name = 'MAIN_FIRST_PING_OK_ID'";
-	$db->query($sql, 1);
-
+	if (!$error) {
+		// Set constant to ask to remake a new ping to inform about upgrade (if first ping was done and OK)
+		$sql = 'UPDATE '.MAIN_DB_PREFIX."const SET VALUE = 'torefresh' WHERE name = 'MAIN_FIRST_PING_OK_ID'";
+		$db->query($sql, 1);
+	}
 
 	// We always commit.
 	// Process is designed so we can run it several times whatever is situation.
@@ -4282,6 +4289,22 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				$mod->remove('noboxes'); // We need to remove because a permission id has been removed
 				$mod->init($reloadmode);
 			}
+		} elseif ($moduletoreload == 'MAIN_MODULE_KNOWLEDGEMANAGEMENT') {    // Permission has changed into 3.0 and 3.1
+			dolibarr_install_syslog("upgrade2::migrate_reload_modules Knowledge Management");
+			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modKnowledgeManagement.class.php';
+			if ($res) {
+				$mod = new modKnowledgeManagement($db);
+				$mod->remove('noboxes'); // We need to remove because a permission id has been removed
+				$mod->init($reloadmode);
+			}
+		} elseif ($moduletoreload == 'MAIN_MODULE_EVENTORGANIZATION') {    // Permission has changed into 3.0 and 3.1
+			dolibarr_install_syslog("upgrade2::migrate_reload_modules EventOrganization");
+			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modEventOrganization.class.php';
+			if ($res) {
+				$mod = new modEventOrganization($db);
+				$mod->remove('noboxes'); // We need to remove because a permission id has been removed
+				$mod->init($reloadmode);
+			}
 		} elseif ($moduletoreload == 'MAIN_MODULE_PAYBOX') {    // Permission has changed into 3.0
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Paybox module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modPaybox.class.php';
diff --git a/test/phpunit/KnowledgeRecordTest.php b/test/phpunit/KnowledgeRecordTest.php
index a1d2c0a854b..fc6f385e25d 100644
--- a/test/phpunit/KnowledgeRecordTest.php
+++ b/test/phpunit/KnowledgeRecordTest.php
@@ -87,7 +87,7 @@ class KnowledgeRecordTest extends PHPUnit\Framework\TestCase
 		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
 		if (empty($conf->knowledgemanagement->enabled)) {
-			//	print __METHOD__." module knowledgemanagement order must be enabled.\n"; die(1);
+			print __METHOD__." module knowledgemanagement order must be enabled.\n"; die(1);
 		}
 	}
 

From c10e4b3a29fe520c4de2fedc98e66bf47dc62bd7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 23 Jun 2021 11:19:48 +0200
Subject: [PATCH 0847/1497] Enhance error detection

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 1bd94be4375..b48a3667bb0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -416,6 +416,7 @@ script:
 - |
   echo "Enabling new modules"
   # Enable modules not enabled into original dump
+  set -e
   php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_API,MAIN_MODULE_PRODUCTBATCH,MAIN_MODULE_SUPPLIERPROPOSAL,MAIN_MODULE_STRIPE,MAIN_MODULE_EXPENSEREPORT > $TRAVIS_BUILD_DIR/enablemodule.log
   php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_WEBSITE,MAIN_MODULE_TICKET,MAIN_MODULE_ACCOUNTING,MAIN_MODULE_MRP >> $TRAVIS_BUILD_DIR/enablemodule.log
   php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_RECEPTION,MAIN_MODULE_RECRUITMENT >> $TRAVIS_BUILD_DIR/enablemodule.log

From 3a30d41fbfe18b071a7873bcc9030cceccfb5bc8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 23 Jun 2021 11:44:10 +0200
Subject: [PATCH 0848/1497] Fix missing properties

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

diff --git a/htdocs/product/inventory/class/inventory.class.php b/htdocs/product/inventory/class/inventory.class.php
index 22e209f31aa..47b902d70cc 100644
--- a/htdocs/product/inventory/class/inventory.class.php
+++ b/htdocs/product/inventory/class/inventory.class.php
@@ -635,8 +635,8 @@ class Inventory extends CommonObject
 	 */
 	public function info($id)
 	{
-		$sql = 'SELECT rowid, date_creation as datec, tms as datem,';
-		$sql .= ' fk_user_creat, fk_user_modif';
+		$sql = 'SELECT rowid, date_creation as datec, tms as datem, date_validation as datev,';
+		$sql .= ' fk_user_creat, fk_user_modif, fk_user_valid';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
 		$sql .= ' WHERE t.rowid = '.((int) $id);
 		$result = $this->db->query($sql);

From 6fa0532c1a545e9de88a426c20cfa2ac51a85d29 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 23 Jun 2021 13:00:04 +0200
Subject: [PATCH 0849/1497] Debug cash fence feature (missing report per vat
 rate)

---
 .../compta/cashcontrol/cashcontrol_list.php   | 55 ++++++++++++-------
 .../cashcontrol/class/cashcontrol.class.php   |  6 +-
 htdocs/compta/cashcontrol/report.php          | 47 ++++++++++++----
 htdocs/core/tpl/list_print_total.tpl.php      |  2 +-
 .../modulebuilder/template/myobject_list.php  |  2 +
 htdocs/theme/eldy/global.inc.php              |  4 +-
 htdocs/theme/md/style.css.php                 |  3 +
 7 files changed, 83 insertions(+), 36 deletions(-)

diff --git a/htdocs/compta/cashcontrol/cashcontrol_list.php b/htdocs/compta/cashcontrol/cashcontrol_list.php
index 876fd6703d3..ab8451c9e59 100644
--- a/htdocs/compta/cashcontrol/cashcontrol_list.php
+++ b/htdocs/compta/cashcontrol/cashcontrol_list.php
@@ -120,12 +120,19 @@ foreach ($object->fields as $key => $val) {
 	}
 }
 
-// Definition of fields for list
+// Definition of array of fields for columns
 $arrayfields = array();
 foreach ($object->fields as $key => $val) {
 	// If $val['visible']==0, then we never show the field
 	if (!empty($val['visible'])) {
-		$arrayfields['t.'.$key] = array('label'=>$val['label'], 'checked'=>(($val['visible'] < 0) ? 0 : 1), 'enabled'=>$val['enabled'], 'position'=>$val['position']);
+		$visible = (int) dol_eval($val['visible'], 1);
+		$arrayfields['t.'.$key] = array(
+			'label'=>$val['label'],
+			'checked'=>(($visible < 0) ? 0 : 1),
+			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
+			'position'=>$val['position'],
+			'help'=>$val['help']
+		);
 	}
 }
 // Extra fields
@@ -134,6 +141,10 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
+$permissiontoread = ($user->rights->cashdesk->run || $user->rights->takepos->run);
+$permissiontoadd = ($user->rights->cashdesk->run || $user->rights->takepos->run);
+$permissiontodelete = ($user->rights->cashdesk->run || $user->rights->takepos->run);
+
 // Security check
 if ($user->socid > 0) {	// Protection if external user
 	//$socid = $user->socid;
@@ -186,9 +197,6 @@ if (empty($reshook)) {
 	// Mass actions
 	$objectclass = 'CashControl';
 	$objectlabel = 'CashControl';
-	$permissiontoread = ($user->rights->cashdesk->run || $user->rights->takepos->run);
-	$permissiontodelete = ($user->rights->cashdesk->run || $user->rights->takepos->run);
-
 	//$uploaddir = '';
 	//include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
@@ -215,7 +223,7 @@ $sql .= $object->getFieldList('t');
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.' as options_'.$key.', ' : '');
+		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key.' as options_'.$key.', ' : '');
 	}
 }
 // Add fields from hooks
@@ -224,7 +232,7 @@ $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $obje
 $sql .= preg_replace('/^,/', '', $hookmanager->resPrint);
 $sql = preg_replace('/,\s*$/', '', $sql);
 $sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
+if (isset($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (t.rowid = ef.fk_object)";
 }
 // Add table from hooks
@@ -242,7 +250,7 @@ foreach ($search as $key => $val) {
 			continue;
 		}
 		$mode_search = (($object->isInt($object->fields[$key]) || $object->isFloat($object->fields[$key])) ? 1 : 0);
-		if ((strpos($object->fields[$key]['type'], 'integer:') === 0) || (strpos($object->fields[$key]['type'], 'sellist:') === 0)) {
+		if ((strpos($object->fields[$key]['type'], 'integer:') === 0) || (strpos($object->fields[$key]['type'], 'sellist:') === 0) || !empty($object->fields[$key]['arrayofkeyval'])) {
 			if ($search[$key] == '-1' || $search[$key] === '0') {
 				$search[$key] = '';
 			}
@@ -268,6 +276,7 @@ foreach ($search as $key => $val) {
 if ($search_all) {
 	$sql .= natural_search(array_keys($fieldstosearchall), $search_all);
 }
+//$sql.= dolSqlDateFilter("t.field", $search_xxxday, $search_xxxmonth, $search_xxxyear);
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 // Add where from hooks
@@ -382,7 +391,9 @@ $arrayofmassactions = array(
 //'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
 //'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
 );
-//if ($user->rights->monmodule->delete) $arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
+//if ($permissiontodelete) {
+//	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
+//}
 if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
 	$arrayofmassactions = array();
 }
@@ -450,24 +461,24 @@ print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwit
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
 foreach ($object->fields as $key => $val) {
-	$cssforfield = (empty($val['css']) ? '' : $val['css']);
+	$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 	if ($key == 'status') {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
 	} elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
 	} elseif (in_array($val['type'], array('timestamp'))) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') {
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
 	}
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
 		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
-			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
+			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], (isset($search[$key]) ? $search[$key] : ''), $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
 		} elseif ((strpos($val['type'], 'integer:') === 0) || (strpos($val['type'], 'sellist:')=== 0)) {
-			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth125', 1);
+			print $object->showInputField($val, $key, (isset($search[$key]) ? $search[$key] : ''), '', '', 'search_', 'maxwidth125', 1);
 		} elseif (!preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
-			print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
+			print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag(isset($search[$key]) ? $search[$key] : '').'">';
 		} elseif (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
 			print '<div class="nowrap">';
 			print $form->selectDate($search[$key.'_dtstart'] ? $search[$key.'_dtstart'] : '', "search_".$key."_dtstart", 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
@@ -505,7 +516,7 @@ foreach ($object->fields as $key => $val) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
 	} elseif (in_array($val['type'], array('timestamp'))) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') {
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
 	}
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
@@ -519,13 +530,13 @@ $parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
-print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ')."\n";
+print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
 print '</tr>'."\n";
 
 
 // Detect if we need a fetch on each output line
 $needToFetchEachLine = 0;
-if (is_array($extrafields->attributes[$object->table_element]['computed']) && count($extrafields->attributes[$object->table_element]['computed']) > 0) {
+if (isset($extrafields->attributes[$object->table_element]['computed']) && is_array($extrafields->attributes[$object->table_element]['computed']) && count($extrafields->attributes[$object->table_element]['computed']) > 0) {
 	foreach ($extrafields->attributes[$object->table_element]['computed'] as $key => $val) {
 		if (preg_match('/\$object/', $val)) {
 			$needToFetchEachLine++; // There is at least one compute field that use $object
@@ -538,6 +549,7 @@ if (is_array($extrafields->attributes[$object->table_element]['computed']) && co
 // --------------------------------------------------------------------
 $i = 0;
 $totalarray = array();
+$totalarray['nbfield'] = 0;
 while ($i < ($limit ? min($num, $limit) : $num)) {
 	$obj = $db->fetch_object($resql);
 	if (empty($obj)) {
@@ -563,14 +575,17 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
 		}
 
-		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', 'status'))) {
+		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', 'status')) && empty($val['arrayofkeyval'])) {
 			$cssforfield .= ($cssforfield ? ' ' : '').'right';
 		}
+		//if (in_array($key, array('fk_soc', 'fk_user', 'fk_warehouse'))) $cssforfield = 'tdoverflowmax100';
 
 		if (!empty($arrayfields['t.'.$key]['checked'])) {
 			print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '').'>';
 			if ($key == 'status') {
 				print $object->getLibStatut(5);
+			} elseif ($key == 'rowid') {
+				print $object->showOutputField($val, $key, $object->id, '');
 			} else {
 				print $object->showOutputField($val, $key, $object->$key, '');
 			}
@@ -605,14 +620,14 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 		if (in_array($object->id, $arrayofselected)) {
 			$selected = 1;
 		}
-		print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+		print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
 	}
 	print '</td>';
 	if (!$i) {
 		$totalarray['nbfield']++;
 	}
 
-	print '</tr>';
+	print '</tr>'."\n";
 
 	$i++;
 }
diff --git a/htdocs/compta/cashcontrol/class/cashcontrol.class.php b/htdocs/compta/cashcontrol/class/cashcontrol.class.php
index 59580cb7c46..dccfc852213 100644
--- a/htdocs/compta/cashcontrol/class/cashcontrol.class.php
+++ b/htdocs/compta/cashcontrol/class/cashcontrol.class.php
@@ -80,7 +80,7 @@ class CashControl extends CommonObject
 	 *  Note: To have value dynamic, you can set value to 0 in definition and edit the value on the fly into the constructor.
 	 */
 	public $fields = array(
-	'rowid' =>array('type'=>'integer', 'label'=>'ID', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>10),
+	'rowid' =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>10),
 	'entity' =>array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'notnull'=>1, 'position'=>15),
 	'ref' =>array('type'=>'varchar(64)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'position'=>18),
 	'posmodule' =>array('type'=>'varchar(30)', 'label'=>'Module', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'position'=>19),
@@ -96,7 +96,7 @@ class CashControl extends CommonObject
 	'date_creation' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>500),
 	'date_valid' =>array('type'=>'datetime', 'label'=>'DateValidation', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>502),
 	'tms' =>array('type'=>'timestamp', 'label'=>'Tms', 'enabled'=>1, 'visible'=>0, 'notnull'=>1, 'position'=>505),
-	'fk_user_creat' =>array('type'=>'integer:User', 'label'=>'userCreation', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>600),
+	'fk_user_creat' =>array('type'=>'integer:User', 'label'=>'UserCreation', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>600),
 	'fk_user_valid' =>array('type'=>'integer:User', 'label'=>'UserValidation', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>602),
 	'import_key' =>array('type'=>'varchar(14)', 'label'=>'Import key', 'enabled'=>1, 'visible'=>0, 'position'=>700),
 	'status' => array('type'=>'integer', 'label'=>'Status', 'enabled'=>1, 'visible'=>1, 'position'=>1000, 'notnull'=>1, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Brouillon', '1'=>'Validated')),
@@ -414,7 +414,7 @@ class CashControl extends CommonObject
 
 		$newref = ($this->ref ? $this->ref : $this->id);
 
-		$label = '<u>'.$langs->trans("CashFence").'</u>';
+		$label = '<u>'.$langs->trans("CashControl").'</u>';
 		$label .= '<br>';
 		$label .= '<b>'.$langs->trans('Ref').':</b> '.($this->ref ? $this->ref : $this->id);
 
diff --git a/htdocs/compta/cashcontrol/report.php b/htdocs/compta/cashcontrol/report.php
index 6a23beab86b..f13c625c75f 100644
--- a/htdocs/compta/cashcontrol/report.php
+++ b/htdocs/compta/cashcontrol/report.php
@@ -177,7 +177,7 @@ if ($resql) {
 	$invoicetmp = new Facture($db);
 
 	print "<div style='text-align: right'><h2>";
-	print $langs->trans("InitialBankBalance").' - '.$langs->trans("Cash").' : <span class="amount">'.price($object->opening).'</span>';
+	print $langs->trans("InitialBankBalance").' - '.$langs->trans("Cash").' : <div class="inline-block amount width100">'.price($object->opening).'</div>';
 	print "</h2></div>";
 
 	print '<div class="div-table-responsive">';
@@ -200,6 +200,9 @@ if ($resql) {
 
 	$totalqty = 0;
 	$totalvat = 0;
+	$totalvatperrate = array();
+	$totallocaltax1 = 0;
+	$totallocaltax2 = 0;
 	$cachebankaccount = array();
 	$cacheinvoiceid = array();
 	$transactionspertype = array();
@@ -226,6 +229,14 @@ if ($resql) {
 			foreach ($invoicetmp->lines as $line) {
 				$totalqty += $line->qty;
 				$totalvat += $line->total_tva;
+				if ($line->tva_tx) {
+					if (empty($totalvatperrate[$line->tva_tx])) {
+						$totalvatperrate[$line->tva_tx] = 0;
+					}
+					$totalvatperrate[$line->tva_tx] += $line->total_tva;
+				}
+				$totallocaltax1 += $line->total_localtax1;
+				$totallocaltax2 += $line->total_localtax2;
 			}
 		}
 
@@ -348,35 +359,49 @@ if ($resql) {
 	print '<div style="text-align: right">';
 	print '<h2>';
 
-	print $langs->trans("Cash").' '.($transactionspertype['CASH'] ? '('.$transactionspertype['CASH'].')' : '').': <span class="amount">'.price($cash).'</span>';
+	print $langs->trans("Cash").($transactionspertype['CASH'] ? ' ('.$transactionspertype['CASH'].')' : '').' : <div class="inline-block amount width100">'.price($cash).'</div>';
 	if ($object->status == $object::STATUS_VALIDATED && $cash != $object->cash) {
-		print ' <> <span class="amountremaintopay">'.$langs->trans("Declared").': '.price($object->cash).'</span>';
+		print ' <> <div class="inline-block amountremaintopay fontsizeunset">'.$langs->trans("Declared").': '.price($object->cash).'</div>';
 	}
 	print "<br>";
 
 	//print '<br>';
-	print $langs->trans("PaymentTypeCHQ").' '.($transactionspertype['CHQ'] ? '('.$transactionspertype['CHQ'].')' : '').': <span class="amount">'.price($cheque).'</span>';
+	print $langs->trans("PaymentTypeCHQ").($transactionspertype['CHQ'] ? ' ('.$transactionspertype['CHQ'].')' : '').' : <div class="inline-block amount width100">'.price($cheque).'</div>';
 	if ($object->status == $object::STATUS_VALIDATED && $cheque != $object->cheque) {
-		print ' <> <span class="amountremaintopay">'.$langs->trans("Declared").': '.price($object->cheque).'</span>';
+		print ' <> <div class="inline-block amountremaintopay fontsizeunset">'.$langs->trans("Declared").' : '.price($object->cheque).'</div>';
 	}
 	print "<br>";
 
 	//print '<br>';
-	print $langs->trans("PaymentTypeCB").' '.($transactionspertype['CB'] ? '('.$transactionspertype['CB'].')' : '').': <span class="amount">'.price($bank).'</span>';
+	print $langs->trans("PaymentTypeCB").($transactionspertype['CB'] ? ' ('.$transactionspertype['CB'].')' : '').' : <div class="inline-block amount width100">'.price($bank).'</div>';
 	if ($object->status == $object::STATUS_VALIDATED && $bank != $object->card) {
-		print ' <> <span class="amountremaintopay">'.$langs->trans("Declared").': '.price($object->card).'</span>';
+		print ' <> <div class="inline-block amountremaintopay fontsizeunset">'.$langs->trans("Declared").': '.price($object->card).'</div>';
 	}
 	print "<br>";
 
 	// print '<br>';
 	if ($other) {
-		print ''.$langs->trans("Other").' '.($transactionspertype['OTHER'] ? '('.$transactionspertype['OTHER'].')' : '').': <span class="amount">'.price($other)."</span>";
+		print ''.$langs->trans("Other").($transactionspertype['OTHER'] ? ' ('.$transactionspertype['OTHER'].')' : '').' : <div class="inline-block amount width100">'.price($other)."</div>";
 		print '<br>';
 	}
 
-	print $langs->trans("Total").' ('.$totalqty.' '.$langs->trans("Articles").') : <span class="amount">'.price($cash + $cheque + $bank + $other).'</span>';
-	print '<br>'.$langs->trans("TotalVAT").' : <span class="amount">'.price($totalvat).'</span>';
-	// TODO Add total localtaxes.
+	print $langs->trans("Total").' ('.$totalqty.' '.$langs->trans("Articles").') : <div class="inline-block amount width100">'.price($cash + $cheque + $bank + $other).'</div>';
+
+	print '<br>'.$langs->trans("TotalVAT").' : <div class="inline-block amount width100">'.price($totalvat).'</div>';
+
+	if ($mysoc->useLocalTax(1)) {
+		print '<br>'.$langs->trans("TotalLT1").' : <div class="inline-block amount width100">'.price($totallocaltax1).'</div>';
+	}
+	if ($mysoc->useLocalTax(1)) {
+		print '<br>'.$langs->trans("TotalLT2").' : <div class="inline-block amount width100">'.price($totallocaltax2).'</div>';
+	}
+
+	if (!empty($totalvatperrate) && is_array($totalvatperrate)) {
+		print '<br><br><div class="small inline-block">'.$langs->trans("VATRate").'</div>';
+		foreach($totalvatperrate as $keyrate => $valuerate) {
+			print '<br><div class="small">'.$langs->trans("VATRate").' '.vatrate($keyrate, 1).' : <div class="inline-block amount width100">'.price($valuerate).'</div></div>';
+		}
+	}
 
 	print '</h2>';
 	print '</div>';
diff --git a/htdocs/core/tpl/list_print_total.tpl.php b/htdocs/core/tpl/list_print_total.tpl.php
index 62052b82cec..543bb939850 100644
--- a/htdocs/core/tpl/list_print_total.tpl.php
+++ b/htdocs/core/tpl/list_print_total.tpl.php
@@ -16,7 +16,7 @@ if (isset($totalarray['pos'])) {
 			print '<td class="right">'.price($totalarray['val'][$totalarray['pos'][$i]]).'</td>';
 		} else {
 			if ($i == 1) {
-				if ($num < $limit) {
+				if (is_null($limit) || $num < $limit) {
 					print '<td>'.$langs->trans("Total").'</td>';
 				} else {
 					print '<td>';
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 59af3c6b383..6258b390432 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -626,6 +626,8 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 			print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '').'>';
 			if ($key == 'status') {
 				print $object->getLibStatut(5);
+			} elseif ($key == 'rowid') {
+				print $object->showOutputField($val, $key, $object->id, '');
 			} else {
 				print $object->showOutputField($val, $key, $object->$key, '');
 			}
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 18be87e5bd1..81859c3a2fd 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -425,7 +425,9 @@ input.pageplusone {
 .colorblack {
 	color: #000;
 }
-
+.fontsizeunset {
+	font-size: unset !important;
+}
 .vmirror {
 	transform: scale(1, -1);
 }
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 9e7501f58ec..c8241cd6317 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -599,6 +599,9 @@ input.pageplusone {
 .colorblack {
 	color: #000;
 }
+.fontsizeunset {
+	font-size: unset !important;
+}
 
 .vmirror {
 	transform: scale(1, -1);

From acce226c05b047e8747f77bebdb7f3445a140955 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 23 Jun 2021 13:00:04 +0200
Subject: [PATCH 0850/1497] Debug cash fence feature (missing report per vat
 rate)

---
 .../compta/cashcontrol/cashcontrol_list.php   | 55 ++++++++++++-------
 .../cashcontrol/class/cashcontrol.class.php   |  6 +-
 htdocs/compta/cashcontrol/report.php          | 47 ++++++++++++----
 htdocs/core/tpl/list_print_total.tpl.php      |  2 +-
 .../modulebuilder/template/myobject_list.php  |  2 +
 htdocs/theme/eldy/global.inc.php              |  4 +-
 htdocs/theme/md/style.css.php                 |  3 +
 7 files changed, 83 insertions(+), 36 deletions(-)

diff --git a/htdocs/compta/cashcontrol/cashcontrol_list.php b/htdocs/compta/cashcontrol/cashcontrol_list.php
index 876fd6703d3..ab8451c9e59 100644
--- a/htdocs/compta/cashcontrol/cashcontrol_list.php
+++ b/htdocs/compta/cashcontrol/cashcontrol_list.php
@@ -120,12 +120,19 @@ foreach ($object->fields as $key => $val) {
 	}
 }
 
-// Definition of fields for list
+// Definition of array of fields for columns
 $arrayfields = array();
 foreach ($object->fields as $key => $val) {
 	// If $val['visible']==0, then we never show the field
 	if (!empty($val['visible'])) {
-		$arrayfields['t.'.$key] = array('label'=>$val['label'], 'checked'=>(($val['visible'] < 0) ? 0 : 1), 'enabled'=>$val['enabled'], 'position'=>$val['position']);
+		$visible = (int) dol_eval($val['visible'], 1);
+		$arrayfields['t.'.$key] = array(
+			'label'=>$val['label'],
+			'checked'=>(($visible < 0) ? 0 : 1),
+			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
+			'position'=>$val['position'],
+			'help'=>$val['help']
+		);
 	}
 }
 // Extra fields
@@ -134,6 +141,10 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
+$permissiontoread = ($user->rights->cashdesk->run || $user->rights->takepos->run);
+$permissiontoadd = ($user->rights->cashdesk->run || $user->rights->takepos->run);
+$permissiontodelete = ($user->rights->cashdesk->run || $user->rights->takepos->run);
+
 // Security check
 if ($user->socid > 0) {	// Protection if external user
 	//$socid = $user->socid;
@@ -186,9 +197,6 @@ if (empty($reshook)) {
 	// Mass actions
 	$objectclass = 'CashControl';
 	$objectlabel = 'CashControl';
-	$permissiontoread = ($user->rights->cashdesk->run || $user->rights->takepos->run);
-	$permissiontodelete = ($user->rights->cashdesk->run || $user->rights->takepos->run);
-
 	//$uploaddir = '';
 	//include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
@@ -215,7 +223,7 @@ $sql .= $object->getFieldList('t');
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.' as options_'.$key.', ' : '');
+		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key.' as options_'.$key.', ' : '');
 	}
 }
 // Add fields from hooks
@@ -224,7 +232,7 @@ $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $obje
 $sql .= preg_replace('/^,/', '', $hookmanager->resPrint);
 $sql = preg_replace('/,\s*$/', '', $sql);
 $sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
+if (isset($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (t.rowid = ef.fk_object)";
 }
 // Add table from hooks
@@ -242,7 +250,7 @@ foreach ($search as $key => $val) {
 			continue;
 		}
 		$mode_search = (($object->isInt($object->fields[$key]) || $object->isFloat($object->fields[$key])) ? 1 : 0);
-		if ((strpos($object->fields[$key]['type'], 'integer:') === 0) || (strpos($object->fields[$key]['type'], 'sellist:') === 0)) {
+		if ((strpos($object->fields[$key]['type'], 'integer:') === 0) || (strpos($object->fields[$key]['type'], 'sellist:') === 0) || !empty($object->fields[$key]['arrayofkeyval'])) {
 			if ($search[$key] == '-1' || $search[$key] === '0') {
 				$search[$key] = '';
 			}
@@ -268,6 +276,7 @@ foreach ($search as $key => $val) {
 if ($search_all) {
 	$sql .= natural_search(array_keys($fieldstosearchall), $search_all);
 }
+//$sql.= dolSqlDateFilter("t.field", $search_xxxday, $search_xxxmonth, $search_xxxyear);
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 // Add where from hooks
@@ -382,7 +391,9 @@ $arrayofmassactions = array(
 //'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
 //'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
 );
-//if ($user->rights->monmodule->delete) $arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
+//if ($permissiontodelete) {
+//	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
+//}
 if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
 	$arrayofmassactions = array();
 }
@@ -450,24 +461,24 @@ print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwit
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
 foreach ($object->fields as $key => $val) {
-	$cssforfield = (empty($val['css']) ? '' : $val['css']);
+	$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 	if ($key == 'status') {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
 	} elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
 	} elseif (in_array($val['type'], array('timestamp'))) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') {
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
 	}
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
 		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
-			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
+			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], (isset($search[$key]) ? $search[$key] : ''), $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
 		} elseif ((strpos($val['type'], 'integer:') === 0) || (strpos($val['type'], 'sellist:')=== 0)) {
-			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth125', 1);
+			print $object->showInputField($val, $key, (isset($search[$key]) ? $search[$key] : ''), '', '', 'search_', 'maxwidth125', 1);
 		} elseif (!preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
-			print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
+			print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag(isset($search[$key]) ? $search[$key] : '').'">';
 		} elseif (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
 			print '<div class="nowrap">';
 			print $form->selectDate($search[$key.'_dtstart'] ? $search[$key.'_dtstart'] : '', "search_".$key."_dtstart", 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
@@ -505,7 +516,7 @@ foreach ($object->fields as $key => $val) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
 	} elseif (in_array($val['type'], array('timestamp'))) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') {
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
 	}
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
@@ -519,13 +530,13 @@ $parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
-print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ')."\n";
+print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
 print '</tr>'."\n";
 
 
 // Detect if we need a fetch on each output line
 $needToFetchEachLine = 0;
-if (is_array($extrafields->attributes[$object->table_element]['computed']) && count($extrafields->attributes[$object->table_element]['computed']) > 0) {
+if (isset($extrafields->attributes[$object->table_element]['computed']) && is_array($extrafields->attributes[$object->table_element]['computed']) && count($extrafields->attributes[$object->table_element]['computed']) > 0) {
 	foreach ($extrafields->attributes[$object->table_element]['computed'] as $key => $val) {
 		if (preg_match('/\$object/', $val)) {
 			$needToFetchEachLine++; // There is at least one compute field that use $object
@@ -538,6 +549,7 @@ if (is_array($extrafields->attributes[$object->table_element]['computed']) && co
 // --------------------------------------------------------------------
 $i = 0;
 $totalarray = array();
+$totalarray['nbfield'] = 0;
 while ($i < ($limit ? min($num, $limit) : $num)) {
 	$obj = $db->fetch_object($resql);
 	if (empty($obj)) {
@@ -563,14 +575,17 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
 		}
 
-		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', 'status'))) {
+		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', 'status')) && empty($val['arrayofkeyval'])) {
 			$cssforfield .= ($cssforfield ? ' ' : '').'right';
 		}
+		//if (in_array($key, array('fk_soc', 'fk_user', 'fk_warehouse'))) $cssforfield = 'tdoverflowmax100';
 
 		if (!empty($arrayfields['t.'.$key]['checked'])) {
 			print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '').'>';
 			if ($key == 'status') {
 				print $object->getLibStatut(5);
+			} elseif ($key == 'rowid') {
+				print $object->showOutputField($val, $key, $object->id, '');
 			} else {
 				print $object->showOutputField($val, $key, $object->$key, '');
 			}
@@ -605,14 +620,14 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 		if (in_array($object->id, $arrayofselected)) {
 			$selected = 1;
 		}
-		print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+		print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
 	}
 	print '</td>';
 	if (!$i) {
 		$totalarray['nbfield']++;
 	}
 
-	print '</tr>';
+	print '</tr>'."\n";
 
 	$i++;
 }
diff --git a/htdocs/compta/cashcontrol/class/cashcontrol.class.php b/htdocs/compta/cashcontrol/class/cashcontrol.class.php
index 59580cb7c46..dccfc852213 100644
--- a/htdocs/compta/cashcontrol/class/cashcontrol.class.php
+++ b/htdocs/compta/cashcontrol/class/cashcontrol.class.php
@@ -80,7 +80,7 @@ class CashControl extends CommonObject
 	 *  Note: To have value dynamic, you can set value to 0 in definition and edit the value on the fly into the constructor.
 	 */
 	public $fields = array(
-	'rowid' =>array('type'=>'integer', 'label'=>'ID', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>10),
+	'rowid' =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>10),
 	'entity' =>array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'notnull'=>1, 'position'=>15),
 	'ref' =>array('type'=>'varchar(64)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'position'=>18),
 	'posmodule' =>array('type'=>'varchar(30)', 'label'=>'Module', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'position'=>19),
@@ -96,7 +96,7 @@ class CashControl extends CommonObject
 	'date_creation' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>500),
 	'date_valid' =>array('type'=>'datetime', 'label'=>'DateValidation', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>502),
 	'tms' =>array('type'=>'timestamp', 'label'=>'Tms', 'enabled'=>1, 'visible'=>0, 'notnull'=>1, 'position'=>505),
-	'fk_user_creat' =>array('type'=>'integer:User', 'label'=>'userCreation', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>600),
+	'fk_user_creat' =>array('type'=>'integer:User', 'label'=>'UserCreation', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>600),
 	'fk_user_valid' =>array('type'=>'integer:User', 'label'=>'UserValidation', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>602),
 	'import_key' =>array('type'=>'varchar(14)', 'label'=>'Import key', 'enabled'=>1, 'visible'=>0, 'position'=>700),
 	'status' => array('type'=>'integer', 'label'=>'Status', 'enabled'=>1, 'visible'=>1, 'position'=>1000, 'notnull'=>1, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Brouillon', '1'=>'Validated')),
@@ -414,7 +414,7 @@ class CashControl extends CommonObject
 
 		$newref = ($this->ref ? $this->ref : $this->id);
 
-		$label = '<u>'.$langs->trans("CashFence").'</u>';
+		$label = '<u>'.$langs->trans("CashControl").'</u>';
 		$label .= '<br>';
 		$label .= '<b>'.$langs->trans('Ref').':</b> '.($this->ref ? $this->ref : $this->id);
 
diff --git a/htdocs/compta/cashcontrol/report.php b/htdocs/compta/cashcontrol/report.php
index 6a23beab86b..0bc18e31bde 100644
--- a/htdocs/compta/cashcontrol/report.php
+++ b/htdocs/compta/cashcontrol/report.php
@@ -177,7 +177,7 @@ if ($resql) {
 	$invoicetmp = new Facture($db);
 
 	print "<div style='text-align: right'><h2>";
-	print $langs->trans("InitialBankBalance").' - '.$langs->trans("Cash").' : <span class="amount">'.price($object->opening).'</span>';
+	print $langs->trans("InitialBankBalance").' - '.$langs->trans("Cash").' : <div class="inline-block amount width100">'.price($object->opening).'</div>';
 	print "</h2></div>";
 
 	print '<div class="div-table-responsive">';
@@ -200,6 +200,9 @@ if ($resql) {
 
 	$totalqty = 0;
 	$totalvat = 0;
+	$totalvatperrate = array();
+	$totallocaltax1 = 0;
+	$totallocaltax2 = 0;
 	$cachebankaccount = array();
 	$cacheinvoiceid = array();
 	$transactionspertype = array();
@@ -226,6 +229,14 @@ if ($resql) {
 			foreach ($invoicetmp->lines as $line) {
 				$totalqty += $line->qty;
 				$totalvat += $line->total_tva;
+				if ($line->tva_tx) {
+					if (empty($totalvatperrate[$line->tva_tx])) {
+						$totalvatperrate[$line->tva_tx] = 0;
+					}
+					$totalvatperrate[$line->tva_tx] += $line->total_tva;
+				}
+				$totallocaltax1 += $line->total_localtax1;
+				$totallocaltax2 += $line->total_localtax2;
 			}
 		}
 
@@ -348,35 +359,49 @@ if ($resql) {
 	print '<div style="text-align: right">';
 	print '<h2>';
 
-	print $langs->trans("Cash").' '.($transactionspertype['CASH'] ? '('.$transactionspertype['CASH'].')' : '').': <span class="amount">'.price($cash).'</span>';
+	print $langs->trans("Cash").($transactionspertype['CASH'] ? ' ('.$transactionspertype['CASH'].')' : '').' : <div class="inline-block amount width100">'.price($cash).'</div>';
 	if ($object->status == $object::STATUS_VALIDATED && $cash != $object->cash) {
-		print ' <> <span class="amountremaintopay">'.$langs->trans("Declared").': '.price($object->cash).'</span>';
+		print ' <> <div class="inline-block amountremaintopay fontsizeunset">'.$langs->trans("Declared").': '.price($object->cash).'</div>';
 	}
 	print "<br>";
 
 	//print '<br>';
-	print $langs->trans("PaymentTypeCHQ").' '.($transactionspertype['CHQ'] ? '('.$transactionspertype['CHQ'].')' : '').': <span class="amount">'.price($cheque).'</span>';
+	print $langs->trans("PaymentTypeCHQ").($transactionspertype['CHQ'] ? ' ('.$transactionspertype['CHQ'].')' : '').' : <div class="inline-block amount width100">'.price($cheque).'</div>';
 	if ($object->status == $object::STATUS_VALIDATED && $cheque != $object->cheque) {
-		print ' <> <span class="amountremaintopay">'.$langs->trans("Declared").': '.price($object->cheque).'</span>';
+		print ' <> <div class="inline-block amountremaintopay fontsizeunset">'.$langs->trans("Declared").' : '.price($object->cheque).'</div>';
 	}
 	print "<br>";
 
 	//print '<br>';
-	print $langs->trans("PaymentTypeCB").' '.($transactionspertype['CB'] ? '('.$transactionspertype['CB'].')' : '').': <span class="amount">'.price($bank).'</span>';
+	print $langs->trans("PaymentTypeCB").($transactionspertype['CB'] ? ' ('.$transactionspertype['CB'].')' : '').' : <div class="inline-block amount width100">'.price($bank).'</div>';
 	if ($object->status == $object::STATUS_VALIDATED && $bank != $object->card) {
-		print ' <> <span class="amountremaintopay">'.$langs->trans("Declared").': '.price($object->card).'</span>';
+		print ' <> <div class="inline-block amountremaintopay fontsizeunset">'.$langs->trans("Declared").': '.price($object->card).'</div>';
 	}
 	print "<br>";
 
 	// print '<br>';
 	if ($other) {
-		print ''.$langs->trans("Other").' '.($transactionspertype['OTHER'] ? '('.$transactionspertype['OTHER'].')' : '').': <span class="amount">'.price($other)."</span>";
+		print ''.$langs->trans("Other").($transactionspertype['OTHER'] ? ' ('.$transactionspertype['OTHER'].')' : '').' : <div class="inline-block amount width100">'.price($other)."</div>";
 		print '<br>';
 	}
 
-	print $langs->trans("Total").' ('.$totalqty.' '.$langs->trans("Articles").') : <span class="amount">'.price($cash + $cheque + $bank + $other).'</span>';
-	print '<br>'.$langs->trans("TotalVAT").' : <span class="amount">'.price($totalvat).'</span>';
-	// TODO Add total localtaxes.
+	print $langs->trans("Total").' ('.$totalqty.' '.$langs->trans("Articles").') : <div class="inline-block amount width100">'.price($cash + $cheque + $bank + $other).'</div>';
+
+	print '<br>'.$langs->trans("TotalVAT").' : <div class="inline-block amount width100">'.price($totalvat).'</div>';
+
+	if ($mysoc->useLocalTax(1)) {
+		print '<br>'.$langs->trans("TotalLT1").' : <div class="inline-block amount width100">'.price($totallocaltax1).'</div>';
+	}
+	if ($mysoc->useLocalTax(1)) {
+		print '<br>'.$langs->trans("TotalLT2").' : <div class="inline-block amount width100">'.price($totallocaltax2).'</div>';
+	}
+
+	if (!empty($totalvatperrate) && is_array($totalvatperrate)) {
+		print '<br><br><div class="small inline-block">'.$langs->trans("VATRate").'</div>';
+		foreach ($totalvatperrate as $keyrate => $valuerate) {
+			print '<br><div class="small">'.$langs->trans("VATRate").' '.vatrate($keyrate, 1).' : <div class="inline-block amount width100">'.price($valuerate).'</div></div>';
+		}
+	}
 
 	print '</h2>';
 	print '</div>';
diff --git a/htdocs/core/tpl/list_print_total.tpl.php b/htdocs/core/tpl/list_print_total.tpl.php
index 62052b82cec..543bb939850 100644
--- a/htdocs/core/tpl/list_print_total.tpl.php
+++ b/htdocs/core/tpl/list_print_total.tpl.php
@@ -16,7 +16,7 @@ if (isset($totalarray['pos'])) {
 			print '<td class="right">'.price($totalarray['val'][$totalarray['pos'][$i]]).'</td>';
 		} else {
 			if ($i == 1) {
-				if ($num < $limit) {
+				if (is_null($limit) || $num < $limit) {
 					print '<td>'.$langs->trans("Total").'</td>';
 				} else {
 					print '<td>';
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 59af3c6b383..6258b390432 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -626,6 +626,8 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 			print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '').'>';
 			if ($key == 'status') {
 				print $object->getLibStatut(5);
+			} elseif ($key == 'rowid') {
+				print $object->showOutputField($val, $key, $object->id, '');
 			} else {
 				print $object->showOutputField($val, $key, $object->$key, '');
 			}
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 18be87e5bd1..81859c3a2fd 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -425,7 +425,9 @@ input.pageplusone {
 .colorblack {
 	color: #000;
 }
-
+.fontsizeunset {
+	font-size: unset !important;
+}
 .vmirror {
 	transform: scale(1, -1);
 }
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 9e7501f58ec..c8241cd6317 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -599,6 +599,9 @@ input.pageplusone {
 .colorblack {
 	color: #000;
 }
+.fontsizeunset {
+	font-size: unset !important;
+}
 
 .vmirror {
 	transform: scale(1, -1);

From 293b67a693bb543f37756a03b84cd1fc777f8158 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 23 Jun 2021 13:08:05 +0200
Subject: [PATCH 0851/1497] Merge branch 'develop' of
 git@github.com:Dolibarr/dolibarr.git into develop

Conflicts:
	htdocs/compta/cashcontrol/report.php
---
 .../inventory/class/inventory.class.php        | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/htdocs/product/inventory/class/inventory.class.php b/htdocs/product/inventory/class/inventory.class.php
index 47b902d70cc..1adc9189892 100644
--- a/htdocs/product/inventory/class/inventory.class.php
+++ b/htdocs/product/inventory/class/inventory.class.php
@@ -643,25 +643,27 @@ class Inventory extends CommonObject
 		if ($result) {
 			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
+
 				$this->id = $obj->rowid;
-				if ($obj->fk_user_creat) {
+
+				if ($obj->fk_user_creat > 0) {
 					$cuser = new User($this->db);
 					$cuser->fetch($obj->fk_user_creat);
 					$this->user_creation = $cuser;
 				}
 
-				if ($obj->fk_user_valid) {
+				if ($obj->fk_user_modif > 0) {
+					$muser = new User($this->db);
+					$muser->fetch($obj->fk_user_modif);
+					$this->user_creation = $muser;
+				}
+
+				if ($obj->fk_user_valid > 0) {
 					$vuser = new User($this->db);
 					$vuser->fetch($obj->fk_user_valid);
 					$this->user_validation = $vuser;
 				}
 
-				if ($obj->fk_user_cloture) {
-					$cluser = new User($this->db);
-					$cluser->fetch($obj->fk_user_cloture);
-					$this->user_cloture = $cluser;
-				}
-
 				$this->date_creation     = $this->db->jdate($obj->datec);
 				$this->date_modification = $this->db->jdate($obj->datem);
 				$this->date_validation   = $this->db->jdate($obj->datev);

From 6db44e66d69f137064f2529a424379f41c1c537b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 23 Jun 2021 13:30:00 +0200
Subject: [PATCH 0852/1497] FIX #18006

---
 htdocs/admin/prelevement.php        | 2 +-
 htdocs/compta/prelevement/index.php | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/htdocs/admin/prelevement.php b/htdocs/admin/prelevement.php
index 2871049108b..8719263aa08 100644
--- a/htdocs/admin/prelevement.php
+++ b/htdocs/admin/prelevement.php
@@ -142,7 +142,7 @@ print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<table class="noborder centpercent">';
 
 print '<tr class="liste_titre">';
-print '<td class="titlefieldcreate">'.$langs->trans("Parameter").'</td>';
+print '<td class="titlefieldmiddle">'.$langs->trans("Parameter").'</td>';
 print '<td>'.$langs->trans("Value").'</td>';
 print "</tr>";
 
diff --git a/htdocs/compta/prelevement/index.php b/htdocs/compta/prelevement/index.php
index 2ce24d20d90..f6149741952 100644
--- a/htdocs/compta/prelevement/index.php
+++ b/htdocs/compta/prelevement/index.php
@@ -55,10 +55,9 @@ $result = restrictedArea($user, 'prelevement', '', '');
 
 llxHeader('', $langs->trans("CustomersStandingOrdersArea"));
 
-if (prelevement_check_config() < 0)
-{
+if (prelevement_check_config() < 0) {
 	$langs->load("errors");
-	setEventMessages($langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Withdraw")), null, 'errors');
+	setEventMessages($langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("PaymentByDirectDebit")), null, 'errors');
 }
 
 print load_fiche_titre($langs->trans("CustomersStandingOrdersArea"));

From 4327d53c6051af9b9e16db79bf85aac4cc79ff30 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 23 Jun 2021 14:38:24 +0200
Subject: [PATCH 0853/1497] Fix closing linkto section when js on.

---
 htdocs/core/class/html.form.class.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 6ad08a7c883..b3ed477596c 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -7791,8 +7791,13 @@ class Form
 						$i++;
 					}
 					print '</table>';
-					print '<div class="center"><input type="submit" class="button valignmiddle" value="'.$langs->trans('ToLink').'">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'"></div>';
-
+					print '<div class="center">';
+					print '<input type="submit" class="button valignmiddle marginleftonly marginrightonly" value="'.$langs->trans('ToLink').'">';
+					if (empty($conf->use_javascript_ajax)) {
+						print '<input type="submit" class="button button-cancel marginleftonly marginrightonly" name="cancel" value="'.$langs->trans("Cancel").'"></div>';
+					} else {
+						print '<input type="submit"; onclick="javascript:jQuery(\'#'.$key.'list\').toggle(); return false;" class="button button-cancel marginleftonly marginrightonly" name="cancel" value="'.$langs->trans("Cancel").'"></div>';
+					}
 					print '</form>';
 					$this->db->free($resqllist);
 				} else {
@@ -7833,7 +7838,7 @@ class Form
 				<script>
 				jQuery(document).ready(function() {
 					jQuery(".linkto").click(function() {
-						console.log("We choose to show/hide link for rel="+jQuery(this).attr(\'rel\'));
+						console.log("We choose to show/hide links for rel="+jQuery(this).attr(\'rel\')+" so #"+jQuery(this).attr(\'rel\')+"list");
 					    jQuery("#"+jQuery(this).attr(\'rel\')+"list").toggle();
 					});
 				});

From 743474513bfbe5270bdbe6153c02f2a5c96a5f62 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 23 Jun 2021 16:53:26 +0200
Subject: [PATCH 0854/1497] Fix option SOCIETE_ASK_FOR_WAREHOUSE

---
 htdocs/societe/card.php | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index aa5848f1659..07cfd136c18 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -866,6 +866,11 @@ if (empty($reshook)) {
 		$result = $object->setSalesRep(GETPOST('commercial', 'array'));
 	}
 
+	// warehouse
+	if ($action == 'setwarehouse' && $user->rights->societe->creer) {
+		$result = $object->setWarehouse(GETPOST('fk_warehouse', 'int'));
+	}
+
 	$id = $socid;
 	$object->fetch($socid);
 
@@ -2664,6 +2669,24 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print '<tr><td>'.$langs->trans("Workforce").'</td><td>'.$object->effectif.'</td></tr>';
 		}
 
+		// Warehouse
+		if (!empty($conf->stock->enabled) && !empty($conf->global->SOCIETE_ASK_FOR_WAREHOUSE)) {
+			$langs->load('stocks');
+			require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
+			$formproduct = new FormProduct($db);
+			print '<tr class="nowrap">';
+			print '<td>';
+			print $form->editfieldkey("Warehouse", 'warehouse', '', $object, $user->rights->societe->creer);
+			print '</td><td>';
+			if ($action == 'editwarehouse') {
+				$formproduct->formSelectWarehouses($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_warehouse, 'fk_warehouse', 1);
+			} else {
+				$formproduct->formSelectWarehouses($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_warehouse, 'none');
+			}
+			print '</td>';
+			print '</tr>';
+		}
+
 		print '</table>';
 		print '</div>';
 

From 7eddf43aefa626db67aa4748074216ba3447a449 Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Wed, 23 Jun 2021 17:33:02 +0200
Subject: [PATCH 0855/1497] FIX List and Create Companies Left Menus

---
 htdocs/core/menus/init_menu_auguria.sql          | 4 ++--
 htdocs/install/mysql/migration/11.0.0-12.0.0.sql | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql
index ec75b35073c..a4485bcb8b6 100644
--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@@ -76,8 +76,8 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 
 -- Third parties
 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->societe->enabled', __HANDLER__, 'left', 500__+MAX_llx_menu__, 'companies', 'thirdparties', 2__+MAX_llx_menu__, '/societe/index.php?mainmenu=companies&amp;leftmenu=thirdparties', 'ThirdParty', 0, 'companies', '$user->rights->societe->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->societe->enabled', __HANDLER__, 'left', 501__+MAX_llx_menu__, 'companies', '', 500__+MAX_llx_menu__, '/societe/card.php?mainmenu=companies&amp;action=create', 'MenuNewThirdParty', 1, 'companies', '$user->rights->societe->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->societe->enabled', __HANDLER__, 'left', 502__+MAX_llx_menu__, 'companies', '', 500__+MAX_llx_menu__, '/societe/list.php?mainmenu=companies&amp;action=create', 'List', 1, 'companies', '$user->rights->societe->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->societe->enabled', __HANDLER__, 'left', 501__+MAX_llx_menu__, 'companies', '', 500__+MAX_llx_menu__, '/societe/card.php?mainmenu=companies&amp;action=create', 'MenuNewThirdParty', 1, 'companies', '$user->rights->societe->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->societe->enabled', __HANDLER__, 'left', 502__+MAX_llx_menu__, 'companies', '', 500__+MAX_llx_menu__, '/societe/list.php?mainmenu=companies&amp;leftmenu=thirdparties', 'List', 1, 'companies', '$user->rights->societe->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->societe->enabled && (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled))', __HANDLER__, 'left', 503__+MAX_llx_menu__, 'companies', '', 500__+MAX_llx_menu__, '/societe/list.php?mainmenu=companies&amp;type=f&leftmenu=suppliers', 'ListSuppliersShort', 1, 'suppliers', '$user->rights->societe->lire && $user->rights->fournisseur->lire', '', 2, 5, __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->societe->enabled && (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled))', __HANDLER__, 'left', 504__+MAX_llx_menu__, 'companies', '', 503__+MAX_llx_menu__, '/societe/card.php?mainmenu=companies&amp;leftmenu=supplier&amp;action=create&amp;type=f', 'NewSupplier', 2, 'suppliers', '$user->rights->societe->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->societe->enabled', __HANDLER__, 'left', 506__+MAX_llx_menu__, 'companies', '', 500__+MAX_llx_menu__, '/societe/list.php?mainmenu=companies&amp;type=p&leftmenu=prospects', 'ListProspectsShort', 1, 'companies', '$user->rights->societe->lire', '', 2, 3, __ENTITY__);
diff --git a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
index 02eb3c77d4d..c92bc298197 100644
--- a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
+++ b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
@@ -353,3 +353,6 @@ INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active)
 INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (14,'MAINFREIGHT', 'Mainfreight', NULL, 'https://www.mainfreight.com/track?{TRACKID}', 0);
 
 
+UPDATE llx_menu SET perms = '$user->rights->societe->creer' WHERE titre = 'MenuNewThirdParty' AND url = '/societe/card.php?mainmenu=companies&amp;action=create';
+UPDATE llx_menu SET url = '/societe/list.php?mainmenu=companies&amp;leftmenu=thirdparties' WHERE titre = 'List' AND url = '/societe/list.php?mainmenu=companies&amp;action=create';
+

From c03958a867d1180e5bcaf99feee94de8acdb334a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 23 Jun 2021 19:02:14 +0200
Subject: [PATCH 0856/1497] Fix look and feel v14

---
 htdocs/comm/card.php                          |  5 +++
 htdocs/margin/tabs/thirdpartyMargins.php      |  5 +++
 .../product/class/html.formproduct.class.php  |  2 +-
 htdocs/societe/card.php                       | 38 ++++++++++---------
 htdocs/societe/consumption.php                |  5 +++
 htdocs/societe/document.php                   |  5 +++
 htdocs/societe/note.php                       |  5 +++
 htdocs/societe/notify/card.php                |  5 +++
 htdocs/societe/paymentmodes.php               | 16 ++++----
 htdocs/societe/project.php                    |  5 +++
 htdocs/ticket/list.php                        |  5 +++
 11 files changed, 71 insertions(+), 25 deletions(-)

diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index fab7cfa6fa9..fefee1c07dd 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -540,6 +540,7 @@ if ($object->id > 0) {
 		print "</td>";
 		print '</tr>';
 	}
+
 	// Warehouse
 	if (!empty($conf->stock->enabled) && !empty($conf->global->SOCIETE_ASK_FOR_WAREHOUSE)) {
 		$langs->load('stocks');
@@ -552,11 +553,15 @@ if ($object->id > 0) {
 		if ($action == 'editwarehouse') {
 			$formproduct->formSelectWarehouses($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_warehouse, 'fk_warehouse', 1);
 		} else {
+			if ($object->fk_warehouse > 0) {
+				print img_picto('', 'stock', 'class="paddingrightonly"');
+			}
 			$formproduct->formSelectWarehouses($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_warehouse, 'none');
 		}
 		print '</td>';
 		print '</tr>';
 	}
+
 	// Preferred shipping Method
 	if (!empty($conf->global->SOCIETE_ASK_FOR_SHIPPING_METHOD)) {
 		print '<tr><td class="nowrap">';
diff --git a/htdocs/margin/tabs/thirdpartyMargins.php b/htdocs/margin/tabs/thirdpartyMargins.php
index 505ff9f9f31..21e922a9fa7 100644
--- a/htdocs/margin/tabs/thirdpartyMargins.php
+++ b/htdocs/margin/tabs/thirdpartyMargins.php
@@ -113,6 +113,11 @@ if ($socid > 0) {
 	print '<div class="underbanner clearboth"></div>';
 	print '<table class="border tableforfield" width="100%">';
 
+	// Type Prospect/Customer/Supplier
+	print '<tr><td class="titlefield">'.$langs->trans('NatureOfThirdParty').'</td><td>';
+	print $object->getTypeUrl(1);
+	print '</td></tr>';
+
 	if ($object->client) {
 		print '<tr><td class="titlefield">';
 		print $langs->trans('CustomerCode').'</td><td colspan="3">';
diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index 637e186a3f3..5f4f13056a3 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -340,7 +340,7 @@ class FormProduct
 			print '<tr><td>';
 			print $this->selectWarehouses($selected, $htmlname, '', $addempty);
 			print '</td>';
-			print '<td class="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
+			print '<td class="left"><input type="submit" class="button smallpaddingimp" value="'.$langs->trans("Modify").'"></td>';
 			print '</tr></table></form>';
 		} else {
 			if ($selected) {
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 07cfd136c18..a2b229147fa 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -2652,23 +2652,6 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		}
 		print '</td></tr>';
 
-		// Third-Party Type
-		print '<tr><td>';
-		print '<table class="nobordernopadding" width="100%"><tr><td>'.$langs->trans('ThirdPartyType').'</td>';
-		if ($action != 'editthirdpartytype' && $user->rights->societe->creer) {
-			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editthirdpartytype&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</a></td>';
-		}
-		print '</tr></table>';
-		print '</td><td>';
-		$html_name = ($action == 'editthirdpartytype') ? 'typent_id' : 'none';
-		$formcompany->formThirdpartyType($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->typent_id, $html_name, '');
-		print '</td></tr>';
-
-		// Workforce/Staff
-		if (empty($conf->global->SOCIETE_DISABLE_WORKFORCE)) {
-			print '<tr><td>'.$langs->trans("Workforce").'</td><td>'.$object->effectif.'</td></tr>';
-		}
-
 		// Warehouse
 		if (!empty($conf->stock->enabled) && !empty($conf->global->SOCIETE_ASK_FOR_WAREHOUSE)) {
 			$langs->load('stocks');
@@ -2681,6 +2664,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			if ($action == 'editwarehouse') {
 				$formproduct->formSelectWarehouses($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_warehouse, 'fk_warehouse', 1);
 			} else {
+				if ($object->fk_warehouse > 0) {
+					print img_picto('', 'stock', 'class="paddingrightonly"');
+				}
 				$formproduct->formSelectWarehouses($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_warehouse, 'none');
 			}
 			print '</td>';
@@ -2714,6 +2700,24 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			}
 		}
 
+
+		// Third-Party Type
+		print '<tr><td>';
+		print '<table class="nobordernopadding" width="100%"><tr><td>'.$langs->trans('ThirdPartyType').'</td>';
+		if ($action != 'editthirdpartytype' && $user->rights->societe->creer) {
+			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editthirdpartytype&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</a></td>';
+		}
+		print '</tr></table>';
+		print '</td><td>';
+		$html_name = ($action == 'editthirdpartytype') ? 'typent_id' : 'none';
+		$formcompany->formThirdpartyType($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->typent_id, $html_name, '');
+		print '</td></tr>';
+
+		// Workforce/Staff
+		if (empty($conf->global->SOCIETE_DISABLE_WORKFORCE)) {
+			print '<tr><td>'.$langs->trans("Workforce").'</td><td>'.$object->effectif.'</td></tr>';
+		}
+
 		// Legal
 		print '<tr><td class="titlefield">'.$langs->trans('JuridicalStatus').'</td><td>'.$object->forme_juridique.'</td></tr>';
 
diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index 4c5b2b95b8d..cb2802da385 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -131,6 +131,11 @@ print '<div class="fichecenter">';
 print '<div class="underbanner clearboth"></div>';
 print '<table class="border centpercent tableforfield">';
 
+// Type Prospect/Customer/Supplier
+print '<tr><td class="titlefield">'.$langs->trans('NatureOfThirdParty').'</td><td>';
+print $object->getTypeUrl(1);
+print '</td></tr>';
+
 if (!empty($conf->global->SOCIETE_USEPREFIX)) {  // Old not used prefix field
 	print '<tr><td class="titlefield">'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
 }
diff --git a/htdocs/societe/document.php b/htdocs/societe/document.php
index 0b8376e4f88..60184d4ed15 100644
--- a/htdocs/societe/document.php
+++ b/htdocs/societe/document.php
@@ -136,6 +136,11 @@ if ($object->id) {
 	print '<div class="underbanner clearboth"></div>';
 	print '<table class="border tableforfield centpercent">';
 
+	// Type Prospect/Customer/Supplier
+	print '<tr><td class="titlefield">'.$langs->trans('NatureOfThirdParty').'</td><td>';
+	print $object->getTypeUrl(1);
+	print '</td></tr>';
+
 	// Prefix
 	if (!empty($conf->global->SOCIETE_USEPREFIX)) {  // Old not used prefix field
 		print '<tr><td class="titlefield">'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
diff --git a/htdocs/societe/note.php b/htdocs/societe/note.php
index 2ebe97848f2..d4396738966 100644
--- a/htdocs/societe/note.php
+++ b/htdocs/societe/note.php
@@ -98,6 +98,11 @@ if ($object->id > 0) {
 	print '<div class="underbanner clearboth"></div>';
 	print '<table class="border centpercent tableforfield">';
 
+	// Type Prospect/Customer/Supplier
+	print '<tr><td class="titlefield">'.$langs->trans('NatureOfThirdParty').'</td><td>';
+	print $object->getTypeUrl(1);
+	print '</td></tr>';
+
 	if (!empty($conf->global->SOCIETE_USEPREFIX)) {  // Old not used prefix field
 		print '<tr><td class="'.$cssclass.'">'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
 	}
diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php
index 7e4a1084ec1..d62ca943fb1 100644
--- a/htdocs/societe/notify/card.php
+++ b/htdocs/societe/notify/card.php
@@ -162,6 +162,11 @@ if ($result > 0) {
 	print '<div class="underbanner clearboth"></div>';
 	print '<table class="border centpercent tableforfield">';
 
+	// Type Prospect/Customer/Supplier
+	print '<tr><td class="titlefield">'.$langs->trans('NatureOfThirdParty').'</td><td>';
+	print $object->getTypeUrl(1);
+	print '</td></tr>';
+
 	// Prefix
 	if (!empty($conf->global->SOCIETE_USEPREFIX)) {  // Old not used prefix field
 		print '<tr><td class="titlefield">'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php
index 2d2869fd1cc..93c4fbc2202 100644
--- a/htdocs/societe/paymentmodes.php
+++ b/htdocs/societe/paymentmodes.php
@@ -745,18 +745,20 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 
 	dol_banner_tab($object, 'socid', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom');
 
-
-	if (!empty($conf->global->SOCIETE_USEPREFIX)) {  // Old not used prefix field
-		print '<tr><td class="titlefield">'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
-	}
-
-	//if ($conf->agenda->enabled && $user->rights->agenda->myactions->read) $elementTypeArray['action']=$langs->transnoentitiesnoconv('Events');
-
 	print '<div class="fichecenter">';
 
 	print '<div class="underbanner clearboth"></div>';
 	print '<table class="border tableforfield centpercent">';
 
+	// Type Prospect/Customer/Supplier
+	print '<tr><td class="titlefield">'.$langs->trans('NatureOfThirdParty').'</td><td>';
+	print $object->getTypeUrl(1);
+	print '</td></tr>';
+
+	if (!empty($conf->global->SOCIETE_USEPREFIX)) {  // Old not used prefix field
+		print '<tr><td class="titlefield">'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
+	}
+
 	if ($object->client) {
 		print '<tr><td class="titlefield">';
 		print $langs->trans('CustomerCode').'</td><td colspan="2">';
diff --git a/htdocs/societe/project.php b/htdocs/societe/project.php
index 1bf43864cdd..038ed7350d5 100644
--- a/htdocs/societe/project.php
+++ b/htdocs/societe/project.php
@@ -97,6 +97,11 @@ if ($socid) {
 	print '<div class="underbanner clearboth"></div>';
 	print '<table class="border centpercent tableforfield">';
 
+	// Type Prospect/Customer/Supplier
+	print '<tr><td class="titlefield">'.$langs->trans('NatureOfThirdParty').'</td><td>';
+	print $object->getTypeUrl(1);
+	print '</td></tr>';
+
 	if (!empty($conf->global->SOCIETE_USEPREFIX)) {  // Old not used prefix field
 		print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
 	}
diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php
index 7e5c1aa968f..42445ce1701 100644
--- a/htdocs/ticket/list.php
+++ b/htdocs/ticket/list.php
@@ -490,6 +490,11 @@ if ($socid && !$projectid && !$project_ref && $user->rights->societe->lire) {
 		print '<div class="underbanner clearboth"></div>';
 		print '<table class="border centpercent tableforfield">';
 
+		// Type Prospect/Customer/Supplier
+		print '<tr><td class="titlefield">'.$langs->trans('NatureOfThirdParty').'</td><td>';
+		print $socstat->getTypeUrl(1);
+		print '</td></tr>';
+
 		// Customer code
 		if ($socstat->client && !empty($socstat->code_client)) {
 			print '<tr><td class="titlefield">';

From 8d3b156d473e8a537e04d0e5012059f67bbbe37f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 23 Jun 2021 19:07:42 +0200
Subject: [PATCH 0857/1497] Fix php8

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

diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index 1e7ce0fa195..0b45db6a808 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -193,8 +193,9 @@ class EmailCollector extends CommonObject
 	 */
 	public $datelastresult;
 
-
+	public $codelastresult;
 	public $lastresult;
+	public $datelastok;
 	// END MODULEBUILDER PROPERTIES
 
 	public $filters;

From 594f7c8e9ee2afab68272e2556e940da0c936f60 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 24 Jun 2021 09:54:30 +0200
Subject: [PATCH 0858/1497] Fix code for v14

---
 htdocs/bom/bom_list.php                       |  42 ++-
 htdocs/bom/class/bom.class.php                |   3 +-
 .../modulebuilder/template/myobject_list.php  |   4 +-
 htdocs/mrp/mo_list.php                        |  24 +-
 htdocs/product/stock/class/entrepot.class.php |  25 +-
 htdocs/product/stock/list.php                 | 310 +++++++++---------
 6 files changed, 212 insertions(+), 196 deletions(-)

diff --git a/htdocs/bom/bom_list.php b/htdocs/bom/bom_list.php
index e8511ab6e5c..a47b1692ca9 100644
--- a/htdocs/bom/bom_list.php
+++ b/htdocs/bom/bom_list.php
@@ -93,27 +93,24 @@ foreach ($object->fields as $key => $val) {
 	}
 }
 
-// Definition of fields for list
+// Definition of array of fields for columns
 $arrayfields = array();
 foreach ($object->fields as $key => $val) {
 	// If $val['visible']==0, then we never show the field
 	if (!empty($val['visible'])) {
-		$arrayfields['t.'.$key] = array('label'=>$val['label'], 'checked'=>(($val['visible'] < 0) ? 0 : 1), 'enabled'=>($val['enabled'] && ($val['visible'] != 3)), 'position'=>$val['position']);
+		$visible = (int) dol_eval($val['visible'], 1);
+		$arrayfields['t.'.$key] = array(
+			'label'=>$val['label'],
+			'checked'=>(($visible < 0) ? 0 : 1),
+			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
+			'position'=>$val['position'],
+			'help'=>$val['help']
+		);
 	}
 }
 // Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0) {
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-		if (!empty($extrafields->attributes[$object->table_element]['list'][$key])) {
-			$arrayfields["ef.".$key] = array(
-				'label'=>$extrafields->attributes[$object->table_element]['label'][$key],
-				'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1),
-				'position'=>$extrafields->attributes[$object->table_element]['pos'][$key],
-				'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key])
-			);
-		}
-	}
-}
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
+
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
@@ -155,7 +152,7 @@ if (empty($reshook)) {
 		foreach ($object->fields as $key => $val) {
 			$search[$key] = '';
 		}
-		$toselect = '';
+		$toselect = array();
 		$search_array_options = array();
 	}
 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
@@ -279,11 +276,8 @@ $form = new Form($db);
 $now = dol_now();
 
 $help_url = 'EN:Module_BOM';
-
 $title = $langs->trans('ListOfBOMs');
 
-llxHeader('', $title, $help_url);
-
 
 // Build and execute select
 // --------------------------------------------------------------------
@@ -345,7 +339,9 @@ foreach($object->fields as $key => $val)
 }
 // Add fields from extrafields
 if (! empty($extrafields->attributes[$object->table_element]['label'])) {
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql.=($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.', ' : '');
+	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
+		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.', ' : '');
+	}
 }
 // Add where from hooks
 $parameters=array();
@@ -395,7 +391,7 @@ if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $
 // Output page
 // --------------------------------------------------------------------
 
-// llxHeader('', $title, $help_url);
+llxHeader('', $title, $help_url);
 
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
@@ -508,9 +504,9 @@ foreach ($object->fields as $key => $val) {
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
 		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
-			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth150', 1);
-		} elseif (strpos($val['type'], 'integer:') === 0) {
-			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
+			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
+		} elseif ((strpos($val['type'], 'integer:') === 0) || (strpos($val['type'], 'sellist:') === 0)) {
+			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth125', 1);
 		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) {
 			print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
 		}
diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index 728bdef6cf6..0fe08bb1a4a 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -26,6 +26,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 //require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
 //require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
 
+
 /**
  * Class for BOM
  */
@@ -786,7 +787,7 @@ class BOM extends CommonObject
 		$label .= '<br>';
 		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
 
-		$url = dol_buildpath('/bom/bom_card.php', 1).'?id='.$this->id;
+		$url = DOL_URL_ROOT.'/bom/bom_card.php?id='.$this->id;
 
 		if ($option != 'nolink') {
 			// Add param to save lastsearch_values or not
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 6258b390432..41561a5a45b 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -226,7 +226,7 @@ if (empty($reshook)) {
 				$search[$key.'_dtend'] = '';
 			}
 		}
-		$toselect = '';
+		$toselect = array();
 		$search_array_options = array();
 	}
 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
@@ -517,7 +517,7 @@ foreach ($object->fields as $key => $val) {
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
 		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
 			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], (isset($search[$key]) ? $search[$key] : ''), $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
-		} elseif ((strpos($val['type'], 'integer:') === 0) || (strpos($val['type'], 'sellist:')=== 0)) {
+		} elseif ((strpos($val['type'], 'integer:') === 0) || (strpos($val['type'], 'sellist:') === 0)) {
 			print $object->showInputField($val, $key, (isset($search[$key]) ? $search[$key] : ''), '', '', 'search_', 'maxwidth125', 1);
 		} elseif (!preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
 			print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag(isset($search[$key]) ? $search[$key] : '').'">';
diff --git a/htdocs/mrp/mo_list.php b/htdocs/mrp/mo_list.php
index 7786bf9eca6..1883517470c 100644
--- a/htdocs/mrp/mo_list.php
+++ b/htdocs/mrp/mo_list.php
@@ -104,22 +104,18 @@ $arrayfields = array();
 foreach ($object->fields as $key => $val) {
 	// If $val['visible']==0, then we never show the field
 	if (!empty($val['visible'])) {
-		$arrayfields['t.'.$key] = array('label'=>$val['label'], 'checked'=>(($val['visible'] < 0) ? 0 : 1), 'enabled'=>($val['enabled'] && ($val['visible'] != 3)), 'position'=>$val['position']);
+		$arrayfields['t.'.$key] = array(
+			'label'=>$val['label'],
+			'checked'=>(($visible < 0) ? 0 : 1),
+			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
+			'position'=>$val['position'],
+			'help'=>$val['help']
+		);
 	}
 }
 // Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0) {
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-		if (!empty($extrafields->attributes[$object->table_element]['list'][$key])) {
-			$arrayfields["ef.".$key] = array(
-				'label'=>$extrafields->attributes[$object->table_element]['label'][$key],
-				'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1),
-				'position'=>$extrafields->attributes[$object->table_element]['pos'][$key],
-				'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key])
-			);
-		}
-	}
-}
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
+
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
@@ -161,7 +157,7 @@ if (empty($reshook)) {
 		foreach ($object->fields as $key => $val) {
 			$search[$key] = '';
 		}
-		$toselect = '';
+		$toselect = array();
 		$search_array_options = array();
 	}
 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index c7516066e7f..6667246d7ed 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -690,13 +690,15 @@ class Entrepot extends CommonObject
 	/**
 	 *	Return clickable name (possibility with the pictogram)
 	 *
-	 *	@param		int		$withpicto		with pictogram
-	 *	@param		string	$option			Where the link point to
-	 *  @param      int     $showfullpath   0=Show ref only. 1=Show full path instead of Ref (this->fk_parent must be defined)
-	 *  @param	    int   	$notooltip		1=Disable tooltip
-	 *	@return		string					String with URL
+	 *	@param		int		$withpicto				with pictogram
+	 *	@param		string	$option					Where the link point to
+	 *  @param      int     $showfullpath   		0=Show ref only. 1=Show full path instead of Ref (this->fk_parent must be defined)
+	 *  @param	    int   	$notooltip				1=Disable tooltip
+	 *  @param  	string  $morecss            	Add more css on link
+	 *  @param  	int     $save_lastsearch_value  -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *	@return		string							String with URL
 	 */
-	public function getNomUrl($withpicto = 0, $option = '', $showfullpath = 0, $notooltip = 0)
+	public function getNomUrl($withpicto = 0, $option = '', $showfullpath = 0, $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
 	{
 		global $conf, $langs, $hookmanager;
 		$langs->load("stocks");
@@ -722,6 +724,17 @@ class Entrepot extends CommonObject
 
 		$url = DOL_URL_ROOT.'/product/stock/card.php?id='.$this->id;
 
+		if ($option != 'nolink') {
+			// Add param to save lastsearch_values or not
+			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {
+				$add_save_lastsearch_values = 1;
+			}
+			if ($add_save_lastsearch_values) {
+				$url .= '&save_lastsearch_values=1';
+			}
+		}
+
 		$linkclose = '';
 		if (empty($notooltip)) {
 			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index 1d54244d4f0..79f74343fb2 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -75,9 +75,6 @@ if (!$sortorder) {
 	$sortorder = "ASC";
 }
 
-// Security check
-$result = restrictedArea($user, 'stock');
-
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $object = new Entrepot($db);
 $extrafields = new ExtraFields($db);
@@ -136,6 +133,9 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
+// Security check
+$result = restrictedArea($user, 'stock');
+
 
 /*
  * Actions
@@ -165,6 +165,7 @@ if (empty($reshook)) {
 		}
 		$toselect = array();
 		$search_array_options = array();
+		$search_category_list = array();
 	}
 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
 		|| GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha')) {
@@ -189,7 +190,6 @@ if (empty($reshook)) {
 $form = new Form($db);
 $warehouse = new Entrepot($db);
 
-$totalarray = array();
 $now = dol_now();
 
 $help_url = 'EN:Module_Stocks_En|FR:Module_Stock|ES:M&oacute;dulo_Stocks';
@@ -246,7 +246,7 @@ if (!empty($conf->categorie->enabled)) {
 foreach ($search as $key => $val) {
 	$class_key = $key;
 	if ($class_key == 'status') {
-		$class_key = 'statut'; // remove this after refactor entrepot.class property statut to status
+		$class_key = 'statut'; // remove this after refactoring entrepot.class property statut to status
 	}
 	if (($key == 'status' && $search[$key] == -1) || $key == 'entity') {
 		continue;
@@ -317,10 +317,12 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	}
 }
 // if total of record found is smaller than limit, no need to do paging and to restart another select with limits set.
-if (is_numeric($nbtotalofrecords) && $limit > $nbtotalofrecords) {
+if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit))) {
 	$num = $nbtotalofrecords;
 } else {
-	$sql .= $db->plimit($limit + 1, $offset);
+	if ($limit) {
+		$sql .= $db->plimit($limit + 1, $offset);
+	}
 
 	$resql = $db->query($sql);
 	if (!$resql) {
@@ -332,7 +334,7 @@ if (is_numeric($nbtotalofrecords) && $limit > $nbtotalofrecords) {
 }
 
 // Direct jump if only one record found
-if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all) {
+if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all && !$page) {
 	$obj = $db->fetch_object($resql);
 	$id = $obj->rowid;
 	header("Location: ".DOL_URL_ROOT.'/product/stock/card.php?id='.$id);
@@ -442,7 +444,7 @@ $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
-print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print '<div class="div-table-responsive">';
 print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 // Fields title search
@@ -453,22 +455,22 @@ foreach ($object->fields as $key => $val) {
 	if ($key == 'statut') {
 		continue;
 	}
-	$cssforfield = (empty($val['css']) ? '' : $val['css']);
+	$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 	if ($key == 'status') {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
 	} elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
 	} elseif (in_array($val['type'], array('timestamp'))) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') {
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
 	}
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
 		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
 			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
-		} elseif (strpos($val['type'], 'integer:') === 0 || strpos($val['type'], 'sellist:') === 0) {
-			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
+		} elseif ((strpos($val['type'], 'integer:') === 0) || (strpos($val['type'], 'sellist:') === 0)) {
+			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth125', 1);
 		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) {
 			print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
 		}
@@ -518,14 +520,14 @@ foreach ($object->fields as $key => $val) {
 	if ($key == 'statut') {
 		continue;
 	}
-	$cssforfield = (empty($val['css']) ? '' : $val['css']);
+	$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 	if ($key == 'status') {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
 	} elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
 	} elseif (in_array($val['type'], array('timestamp'))) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') {
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
 	}
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
@@ -564,168 +566,176 @@ print '</tr>'."\n";
 // Loop on record
 // --------------------------------------------------------------------
 $i = 0;
-if ($num) {
-	$warehouse = new Entrepot($db);
+$totalarray = array();
 
-	while ($i < min($num, $limit)) {
-		$obj = $db->fetch_object($resql);
-		if (empty($obj)) {
-			break; // Should not happen
+$warehouse = new Entrepot($db);
+
+while ($i < min($num, $limit)) {
+	$obj = $db->fetch_object($resql);
+	if (empty($obj)) {
+		break; // Should not happen
+	}
+
+	// Store properties in $object
+	$warehouse->setVarsFromFetchObj($obj);
+
+	$warehouse->label = $warehouse->ref;
+
+	// Show here line of result
+	print '<tr class="oddeven">';
+
+	foreach ($warehouse->fields as $key => $val) {
+		if ($key == 'statut') {
+			continue;
+		}
+		$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
+		if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
+			$cssforfield .= ($cssforfield ? ' ' : '').'center';
+		} elseif ($key == 'status') {
+			$cssforfield .= ($cssforfield ? ' ' : '').'center';
 		}
 
-		$warehouse->id = $obj->rowid;
-		$warehouse->ref = $obj->ref;
-		$warehouse->label = $obj->ref;
-		$warehouse->lieu = $obj->lieu;
-		$warehouse->fk_parent = $obj->fk_parent;
-		$warehouse->statut = $obj->statut;
-
-		foreach ($object->fields as $key => $val) {
-			$warehouse->{$key} = $obj->{$key};
+		if (in_array($val['type'], array('timestamp'))) {
+			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+		} elseif ($key == 'ref') {
+			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
 		}
 
-		// Show here line of result
-		print '<tr class="oddeven">';
+		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $key != 'status' && empty($val['arrayofkeyval'])) {
+			$cssforfield .= ($cssforfield ? ' ' : '').'right';
+		}
+		if (in_array($key, array('fk_soc', 'fk_user', 'fk_warehouse'))) {
+			$cssforfield = 'tdoverflowmax100';
+		}
 
-		foreach ($warehouse->fields as $key => $val) {
+		if (!empty($arrayfields['t.'.$key]['checked'])) {
+			print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '').'>';
 			if ($key == 'statut') {
-				continue;
+				print $warehouse->getLibStatut(5);
 			}
-			$cssforfield = (empty($val['css']) ? '' : $val['css']);
-			if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
-				$cssforfield .= ($cssforfield ? ' ' : '').'center';
-			} elseif ($key == 'status') {
-				$cssforfield .= ($cssforfield ? ' ' : '').'center';
+			if ($key == 'phone') {
+				print dol_print_phone($obj->phone, '', 0, $obj->rowid, 'AC_TEL');
+			} elseif ($key == 'fax') {
+				print dol_print_phone($obj->fax, '', 0, $obj->rowid, 'AC_FAX');
+			} else {
+				print $warehouse->showOutputField($val, $key, $warehouse->$key, '');
 			}
-
-			if (in_array($val['type'], array('timestamp'))) {
-				$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-			} elseif ($key == 'ref') {
-				$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
 			}
-
-			if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $key != 'status') {
-				$cssforfield .= ($cssforfield ? ' ' : '').'right';
-			}
-
-			if (!empty($arrayfields['t.'.$key]['checked'])) {
-				print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '').'>';
-				if ($key == 'statut') {
-					print $warehouse->getLibStatut(5);
-				}
-				if ($key == 'phone') {
-					print dol_print_phone($obj->phone, '', 0, $obj->rowid, 'AC_TEL');
-				} elseif ($key == 'fax') {
-					print dol_print_phone($obj->fax, '', 0, $obj->rowid, 'AC_FAX');
-				} else {
-					print $warehouse->showOutputField($val, $key, $warehouse->$key, '');
-				}
-				print '</td>';
+			if (!empty($val['isameasure'])) {
 				if (!$i) {
-					$totalarray['nbfield']++;
+					$totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
 				}
-				if (!empty($val['isameasure'])) {
-					if (!$i) {
-						$totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
-					}
-					if (!isset($totalarray['val'])) {
-						$totalarray['val'] = array();
-					}
-					if (!isset($totalarray['val']['t.'.$key])) {
-						$totalarray['val']['t.'.$key] = 0;
-					}
-					$totalarray['val']['t.'.$key] += $warehouse->$key;
+				if (!isset($totalarray['val'])) {
+					$totalarray['val'] = array();
 				}
-			}
-		}
-
-		// Stock qty
-		if (!empty($arrayfields["stockqty"]['checked'])) {
-			print '<td class="right">'.price2num($obj->stockqty, 5).'</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-			if (!$i) {
-				$totalarray['pos'][$totalarray['nbfield']] = 'stockqty';
-			}
-		}
-
-		// PMP value
-		if (!empty($arrayfields["estimatedvalue"]['checked'])) {
-			print '<td class="right">';
-			if (price2num($obj->estimatedvalue, 'MT')) {
-				print '<span class="amount">'.price(price2num($obj->estimatedvalue, 'MT'), 1).'</span>';
-			} else {
-				print '';
-			}
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-			if (!$i) {
-				$totalarray['pos'][$totalarray['nbfield']] = 'estimatedvalue';
-			}
-		}
-
-		// Selling value
-		if (!empty($arrayfields["estimatedstockvaluesell"]['checked'])) {
-			print '<td class="right">';
-			if (empty($conf->global->PRODUIT_MULTIPRICES)) {
-				if ($obj->sellvalue) {
-					print '<span class="amount">'.price(price2num($obj->sellvalue, 'MT'), 1).'</span>';
+				if (!isset($totalarray['val']['t.'.$key])) {
+					$totalarray['val']['t.'.$key] = 0;
 				}
-			} else {
-				$htmltext = $langs->trans("OptionMULTIPRICESIsOn");
-				print $form->textwithtooltip($langs->trans("Variable"), $htmltext);
-			}
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-			if (!$i) {
-				$totalarray['pos'][$totalarray['nbfield']] = 'estimatedstockvaluesell';
+				$totalarray['val']['t.'.$key] += $warehouse->$key;
 			}
 		}
+	}
 
-		// Extra fields
-		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
-		// Fields from hook
-		$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
-		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
-		print $hookmanager->resPrint;
-
-		// Status
-		if (!empty($arrayfields['t.statut']['checked'])) {
-			print '<td class="center">'.$warehouse->LibStatut($obj->statut, 5).'</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
+	// Stock qty
+	if (!empty($arrayfields["stockqty"]['checked'])) {
+		print '<td class="right">'.price2num($obj->stockqty, 5).'</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
 		}
+		if (!$i) {
+			$totalarray['pos'][$totalarray['nbfield']] = 'stockqty';
+		}
+	}
 
-		// Action column
-		print '<td class="nowrap center">';
-		if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-			$selected = 0;
-			if (in_array($obj->rowid, $arrayofselected)) {
-				$selected = 1;
-			}
-			print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+	// PMP value
+	if (!empty($arrayfields["estimatedvalue"]['checked'])) {
+		print '<td class="right">';
+		if (price2num($obj->estimatedvalue, 'MT')) {
+			print '<span class="amount">'.price(price2num($obj->estimatedvalue, 'MT'), 1).'</span>';
+		} else {
+			print '';
 		}
 		print '</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
-
-		print '</tr>'."\n";
-
-
-		$i++;
+		if (!$i) {
+			$totalarray['pos'][$totalarray['nbfield']] = 'estimatedvalue';
+		}
 	}
 
-	if ($totalnboflines - $offset <= $limit) {
-		// Show total line
-		include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
+	// Selling value
+	if (!empty($arrayfields["estimatedstockvaluesell"]['checked'])) {
+		print '<td class="right">';
+		if (empty($conf->global->PRODUIT_MULTIPRICES)) {
+			if ($obj->sellvalue) {
+				print '<span class="amount">'.price(price2num($obj->sellvalue, 'MT'), 1).'</span>';
+			}
+		} else {
+			$htmltext = $langs->trans("OptionMULTIPRICESIsOn");
+			print $form->textwithtooltip($langs->trans("Variable"), $htmltext);
+		}
+		print '</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+		if (!$i) {
+			$totalarray['pos'][$totalarray['nbfield']] = 'estimatedstockvaluesell';
+		}
 	}
+
+	// Extra fields
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+	// Fields from hook
+	$parameters = array('arrayfields'=>$arrayfields, 'object'=>$object, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+
+	// Status
+	if (!empty($arrayfields['t.statut']['checked'])) {
+		print '<td class="center">'.$warehouse->LibStatut($obj->statut, 5).'</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+	}
+
+	// Action column
+	print '<td class="nowrap center">';
+	if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+		$selected = 0;
+		if (in_array($obj->rowid, $arrayofselected)) {
+			$selected = 1;
+		}
+		print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+	}
+	print '</td>';
+	if (!$i) {
+		$totalarray['nbfield']++;
+	}
+
+	print '</tr>'."\n";
+
+
+	$i++;
+}
+
+if ($totalnboflines - $offset <= $limit) {
+	// Show total line
+	include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
+}
+
+// If no record found
+if ($num == 0) {
+	$colspan = 1;
+	foreach ($arrayfields as $key => $val) {
+		if (!empty($val['checked'])) {
+			$colspan++;
+		}
+	}
+	print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
 }
 
 $db->free($resql);

From e23ce0bb971581bf2dc64bffeb763b7bd76e6262 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 24 Jun 2021 09:57:54 +0200
Subject: [PATCH 0859/1497] Trans

---
 htdocs/langs/en_US/stocks.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang
index 977aab588a2..d79158ab01b 100644
--- a/htdocs/langs/en_US/stocks.lang
+++ b/htdocs/langs/en_US/stocks.lang
@@ -60,7 +60,7 @@ EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
 RuleForWarehouse=Rule for warehouses
-WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+WarehouseAskWarehouseOnThirparty=Set a warehouse on Third-parties
 WarehouseAskWarehouseDuringPropal=Set a warehouse on Commercial proposals
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users

From 09382e050585849da9b4a429cb1c094295bfb9f5 Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Thu, 24 Jun 2021 10:12:34 +0200
Subject: [PATCH 0860/1497] FIX #17919 pictures in docs. Supplier order and
 proposal worked for me. Supplier invoice not implemented need new feature
 request.

---
 htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php   | 2 +-
 htdocs/core/modules/delivery/doc/pdf_storm.modules.php         | 2 +-
 htdocs/core/modules/expedition/doc/pdf_espadon.modules.php     | 3 +--
 htdocs/core/modules/facture/doc/pdf_sponge.modules.php         | 2 +-
 .../modules/mymodule/doc/pdf_standard_myobject.modules.php     | 2 +-
 .../doc/pdf_standard_recruitmentjobposition.modules.php        | 2 +-
 6 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
index 16f29f95dcb..23bd449f940 100644
--- a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
@@ -241,7 +241,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 					$pdir[0] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/";
 					$pdir[1] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/';
 				} else {
-					$pdir[0] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/'; // default
+					$pdir[0] = get_exdir(0, 0, 0, 0, $objphoto, 'product'); // default
 					$pdir[1] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/"; // alternative
 				}
 
diff --git a/htdocs/core/modules/delivery/doc/pdf_storm.modules.php b/htdocs/core/modules/delivery/doc/pdf_storm.modules.php
index d6376e6cd17..ea1c142be67 100644
--- a/htdocs/core/modules/delivery/doc/pdf_storm.modules.php
+++ b/htdocs/core/modules/delivery/doc/pdf_storm.modules.php
@@ -237,7 +237,7 @@ class pdf_storm extends ModelePDFDeliveryOrder
 							$pdir[1] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/';
 						}
 						else {
-							$pdir[0] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/'; // default
+							$pdir[0] = get_exdir(0, 0, 0, 0, $objphoto, 'product'); // default
 							$pdir[1] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/"; // alternative
 						}
 
diff --git a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
index e0d9695f79f..e3a90ff75a5 100644
--- a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
@@ -189,7 +189,6 @@ class pdf_espadon extends ModelePdfExpedition
 			{
 				if (empty($object->lines[$i]->fk_product)) continue;
 
-				$objphoto = new Product($this->db);
 				$objphoto->fetch($object->lines[$i]->fk_product);
 
 				if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
@@ -197,7 +196,7 @@ class pdf_espadon extends ModelePdfExpedition
 					$pdir = get_exdir($object->lines[$i]->fk_product, 2, 0, 0, $objphoto, 'product').$object->lines[$i]->fk_product."/photos/";
 					$dir = $conf->product->dir_output.'/'.$pdir;
 				} else {
-					$pdir = get_exdir(0, 2, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/';
+					$pdir = get_exdir(0, 2, 0, 0, $objphoto, 'product').'/';
 					$dir = $conf->product->dir_output.'/'.$pdir;
 				}
 
diff --git a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
index b42858ca4c9..bce11c25c25 100644
--- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
@@ -252,7 +252,7 @@ class pdf_sponge extends ModelePDFFactures
 					$pdir[0] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/";
 					$pdir[1] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/';
 				} else {
-					$pdir[0] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/'; // default
+					$pdir[0] = get_exdir(0, 0, 0, 0, $objphoto, 'product'); // default
 					$pdir[1] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/"; // alternative
 				}
 
diff --git a/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php b/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
index cb9e4f0a6dd..585c56da035 100644
--- a/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
+++ b/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
@@ -241,7 +241,7 @@ class pdf_standard_myobject extends ModelePDFMyObject
 	                $pdir[0] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/";
 	                $pdir[1] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/';
 	            } else {
-	                $pdir[0] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/'; // default
+	                $pdir[0] = get_exdir(0, 0, 0, 0, $objphoto, 'product'); // default
 	                $pdir[1] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/"; // alternative
 	            }
 
diff --git a/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php b/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
index 5f257f594cf..1970dda9226 100644
--- a/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
+++ b/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
@@ -252,7 +252,7 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
 	                $pdir[0] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/";
 	                $pdir[1] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/';
 	            } else {
-	                $pdir[0] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/'; // default
+	                $pdir[0] = get_exdir(0, 0, 0, 0, $objphoto, 'product'); // default
 	                $pdir[1] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/"; // alternative
 	            }
 

From d20bd5bcf612604bd2204424a350a6971f782e71 Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Thu, 24 Jun 2021 10:18:21 +0200
Subject: [PATCH 0861/1497] fix ctrl-y

---
 htdocs/core/modules/expedition/doc/pdf_espadon.modules.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
index e3a90ff75a5..b680d4998bf 100644
--- a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
@@ -196,7 +196,7 @@ class pdf_espadon extends ModelePdfExpedition
 					$pdir = get_exdir($object->lines[$i]->fk_product, 2, 0, 0, $objphoto, 'product').$object->lines[$i]->fk_product."/photos/";
 					$dir = $conf->product->dir_output.'/'.$pdir;
 				} else {
-					$pdir = get_exdir(0, 2, 0, 0, $objphoto, 'product').'/';
+					$pdir = get_exdir(0, 2, 0, 0, $objphoto, 'product');
 					$dir = $conf->product->dir_output.'/'.$pdir;
 				}
 

From d0a4ae88b144d1d6fa03ebd8001f1f2b6807d9a8 Mon Sep 17 00:00:00 2001
From: Florian Mortgat <florian.mortgat@atm-consulting.fr>
Date: Thu, 24 Jun 2021 10:21:56 +0200
Subject: [PATCH 0862/1497] NEW: make it easier to set the `keyword`,
 `keywords` and `description` attributes of an ecm file object

---
 htdocs/core/lib/files.lib.php       | 4 +++-
 htdocs/ecm/class/ecmfiles.class.php | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 7e34eec5ecd..8e44e30f445 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1789,7 +1789,9 @@ function addFileIntoDatabaseIndex($dir, $file, $fullpathorig = '', $mode = 'uplo
 
 		if (is_object($object) && $object->id > 0) {
 			$ecmfile->src_object_id = $object->id;
-			$ecmfile->src_object_type = $object->table_element;
+			if (isset($object->table_element)) $ecmfile->src_object_type = $object->table_element;
+			if (isset($object->src_object_description)) $ecmfile->description = $object->src_object_description;
+			if (isset($object->src_object_keyword)) $ecmfile->keyword = $object->src_object_keyword;
 		}
 
 		if ($setsharekey) {
diff --git a/htdocs/ecm/class/ecmfiles.class.php b/htdocs/ecm/class/ecmfiles.class.php
index 035a7aee9c6..df18aa13d2f 100644
--- a/htdocs/ecm/class/ecmfiles.class.php
+++ b/htdocs/ecm/class/ecmfiles.class.php
@@ -288,6 +288,7 @@ class EcmFiles extends CommonObject
 		$sql .= 'fullpath_orig,';
 		$sql .= 'description,';
 		$sql .= 'keywords,';
+		$sql .= 'keyword,';
 		$sql .= 'cover,';
 		$sql .= 'position,';
 		$sql .= 'gen_or_uploaded,';
@@ -309,6 +310,7 @@ class EcmFiles extends CommonObject
 		$sql .= ' '.(!isset($this->fullpath_orig) ? 'NULL' : "'".$this->db->escape($this->fullpath_orig)."'").',';
 		$sql .= ' '.(!isset($this->description) ? 'NULL' : "'".$this->db->escape($this->description)."'").',';
 		$sql .= ' '.(!isset($this->keywords) ? 'NULL' : "'".$this->db->escape($this->keywords)."'").',';
+		$sql .= ' '.(!isset($this->keyword) ? 'NULL' : "'".$this->db->escape($this->keyword)."'").',';
 		$sql .= ' '.(!isset($this->cover) ? 'NULL' : "'".$this->db->escape($this->cover)."'").',';
 		$sql .= ' '.$maxposition.',';
 		$sql .= ' '.(!isset($this->gen_or_uploaded) ? 'NULL' : "'".$this->db->escape($this->gen_or_uploaded)."'").',';

From 2c4fd9e409d0dcede0586ca419c5bbf8d5548145 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 24 Jun 2021 11:51:10 +0200
Subject: [PATCH 0863/1497] Debug ENTREPOT_EXTRA_STATUS

---
 htdocs/langs/en_US/stocks.lang                |  4 +--
 htdocs/langs/fr_FR/stocks.lang                |  4 +--
 htdocs/product/class/product.class.php        | 17 +++++----
 htdocs/product/stock/card.php                 | 19 ++++++----
 htdocs/product/stock/class/entrepot.class.php |  2 +-
 htdocs/product/stock/product.php              | 35 +++++++++++--------
 6 files changed, 48 insertions(+), 33 deletions(-)

diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang
index d79158ab01b..efa5257498c 100644
--- a/htdocs/langs/en_US/stocks.lang
+++ b/htdocs/langs/en_US/stocks.lang
@@ -167,8 +167,8 @@ MovementTransferStock=Stock transfer of product %s into another warehouse
 InventoryCodeShort=Inv./Mov. code
 NoPendingReceptionOnSupplierOrder=No pending reception due to open purchase order
 ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
-OpenAll=Open for all actions
-OpenInternal=Open only for internal actions
+OpenAnyMovement=Open (all movement)
+OpenInternal=Open (only internal movement)
 UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on purchase order reception
 OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a product has several selling price so value for sell can't be calculated
 ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock correctly created
diff --git a/htdocs/langs/fr_FR/stocks.lang b/htdocs/langs/fr_FR/stocks.lang
index c03fe42f01e..9db98593448 100644
--- a/htdocs/langs/fr_FR/stocks.lang
+++ b/htdocs/langs/fr_FR/stocks.lang
@@ -169,8 +169,8 @@ MovementTransferStock=Transfert de stock du produit %s dans un autre entrepôt
 InventoryCodeShort=Code Inv./Mouv.
 NoPendingReceptionOnSupplierOrder=Pas de réception en attente consécutive à des commandes fournisseurs
 ThisSerialAlreadyExistWithDifferentDate=Ce lot/numéro de série (<strong>%s</strong>) existe déjà mais avec des dates de consommation ou péremption différente (trouvé <strong>%s</strong> mais vous avez entré <strong>%s</strong>).
-OpenAll=Accepte tous les mouvements
-OpenInternal=Limité aux mouvements internes
+OpenAnyMovement=Ouvert (tous les mouvements)
+OpenInternal=Ouvert (limité aux mouvements internes)
 UseDispatchStatus=Utiliser un statut de contrôle (approuvé / refusé) pour les lignes de produits lors de la réception de la commande
 OptionMULTIPRICESIsOn=L'option "plusieurs prix par tranches" est activée. Cela signifie qu'un produit à plusieurs prix de vente donc sa valeur de vente ne peut être calculée.
 ProductStockWarehouseCreated=Alerte de limite de stock et de stock désiré ajoutée
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index aa07673f5cc..fdc50d5fe87 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -5154,9 +5154,10 @@ class Product extends CommonObject
 	/**
 	 * Load information about stock of a product into ->stock_reel, ->stock_warehouse[] (including stock_warehouse[idwarehouse]->detail_batch for batch products)
 	 * This function need a lot of load. If you use it on list, use a cache to execute it once for each product id.
-	 * If ENTREPOT_EXTRA_STATUS set, filtering on warehouse status possible.
+	 * If ENTREPOT_EXTRA_STATUS is set, filtering on warehouse status is possible.
 	 *
 	 * @param  	string 	$option 					'' = Load all stock info, also from closed and internal warehouses, 'nobatch', 'novirtual'
+	 * 												You can also filter on 'warehouseclosed', 'warehouseopen', 'warehouseinternal'
 	 * @param	int		$includedraftpoforvirtual	Include draft status of PO for virtual stock calculation
 	 * @return 	int                  				< 0 if KO, > 0 if OK
 	 * @see    	load_virtual_stock(), loadBatchInfo()
@@ -5170,16 +5171,20 @@ class Product extends CommonObject
 		$this->stock_warehouse = array();
 		$this->stock_theorique = 0;
 
+		// Set filter on warehouse status
 		$warehouseStatus = array();
-
 		if (preg_match('/warehouseclosed/', $option)) {
-			$warehouseStatus[] = Entrepot::STATUS_CLOSED;
+			$warehouseStatus[Entrepot::STATUS_CLOSED] = Entrepot::STATUS_CLOSED;
 		}
 		if (preg_match('/warehouseopen/', $option)) {
-			$warehouseStatus[] = Entrepot::STATUS_OPEN_ALL;
+			$warehouseStatus[Entrepot::STATUS_OPEN_ALL] = Entrepot::STATUS_OPEN_ALL;
 		}
 		if (preg_match('/warehouseinternal/', $option)) {
-			$warehouseStatus[] = Entrepot::STATUS_OPEN_INTERNAL;
+			if (!empty($conf->global->ENTREPOT_EXTRA_STATUS)) {
+				$warehouseStatus[Entrepot::STATUS_OPEN_INTERNAL] = Entrepot::STATUS_OPEN_INTERNAL;
+			} else {
+				$warehouseStatus[Entrepot::STATUS_OPEN_ALL] = Entrepot::STATUS_OPEN_ALL;
+			}
 		}
 
 		$sql = "SELECT ps.rowid, ps.reel, ps.fk_entrepot";
@@ -5188,7 +5193,7 @@ class Product extends CommonObject
 		$sql .= " WHERE w.entity IN (".getEntity('stock').")";
 		$sql .= " AND w.rowid = ps.fk_entrepot";
 		$sql .= " AND ps.fk_product = ".$this->id;
-		if (!empty($conf->global->ENTREPOT_EXTRA_STATUS) && count($warehouseStatus)) {
+		if (count($warehouseStatus)) {
 			$sql .= " AND w.statut IN (".$this->db->sanitize(implode(',', $warehouseStatus)).")";
 		}
 
diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php
index 876ced9892c..5ea58da6deb 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -332,7 +332,7 @@ if ($action == 'create') {
 
 	// Status
 	print '<tr><td>'.$langs->trans("Status").'</td><td>';
-	print '<select name="statut" class="flat">';
+	print '<select id="warehousestatus" name="statut" class="flat">';
 	foreach ($object->statuts as $key => $value) {
 		if ($key == 1) {
 			print '<option value="'.$key.'" selected>'.$langs->trans($value).'</option>';
@@ -341,6 +341,7 @@ if ($action == 'create') {
 		}
 	}
 	print '</select>';
+	print ajax_combobox('warehousestatus');
 	print '</td></tr>';
 
 	// Other attributes
@@ -678,13 +679,13 @@ if ($action == 'create') {
 						}
 					}
 
-
 					//print '<td>'.dol_print_date($objp->datem).'</td>';
 					print '<tr class="oddeven">';
+
 					$parameters = array('obj'=>$objp);
 					$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
 					print $hookmanager->resPrint;
-					print "<td>";
+
 					$productstatic->id = $objp->rowid;
 					$productstatic->ref = $objp->ref;
 					$productstatic->label = $objp->produit;
@@ -701,11 +702,13 @@ if ($action == 'create') {
 					$productstatic->accountancy_code_buy = $objp->accountancy_code_buy;
 					$productstatic->accountancy_code_buy_intra = $objp->accountancy_code_buy_intra;
 					$productstatic->accountancy_code_buy_export = $objp->accountancy_code_buy_export;
+
+					print "<td>";
 					print $productstatic->getNomUrl(1, 'stock', 16);
 					print '</td>';
 
 					// Label
-					print '<td>'.$objp->produit.'</td>';
+					print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($objp->produit).'">'.dol_escape_htmltag($objp->produit).'</td>';
 
 					print '<td class="right">';
 					$valtoshow = price(price2num($objp->value, 'MS'), 0, '', 0, 0); // TODO replace with a qty() function
@@ -723,10 +726,10 @@ if ($action == 'create') {
 						print '</td>';
 					}
 					// Price buy PMP
-					print '<td class="right">'.price(price2num($objp->ppmp, 'MU')).'</td>';
+					print '<td class="right nowraponall">'.price(price2num($objp->ppmp, 'MU')).'</td>';
 
 					// Total PMP
-					print '<td class="right">'.price(price2num($objp->ppmp * $objp->value, 'MT')).'</td>';
+					print '<td class="right amount nowraponall">'.price(price2num($objp->ppmp * $objp->value, 'MT')).'</td>';
 					$totalvalue += price2num($objp->ppmp * $objp->value, 'MT');
 
 					// Price sell min
@@ -871,7 +874,7 @@ if ($action == 'create') {
 
 			// Status
 			print '<tr><td>'.$langs->trans("Status").'</td><td>';
-			print '<select name="statut" class="flat">';
+			print '<select id="warehousestatus" name="statut" class="flat">';
 			foreach ($object->statuts as $key => $value) {
 				if ($key == $object->statut) {
 					print '<option value="'.$key.'" selected>'.$langs->trans($value).'</option>';
@@ -880,6 +883,8 @@ if ($action == 'create') {
 				}
 			}
 			print '</select>';
+			print ajax_combobox('warehousestatus');
+
 			print '</td></tr>';
 
 			// Other attributes
diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index 6667246d7ed..92df16fa867 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -173,7 +173,7 @@ class Entrepot extends CommonObject
 
 		$this->statuts[self::STATUS_CLOSED] = 'Closed2';
 		if (!empty($conf->global->ENTREPOT_EXTRA_STATUS)) {
-			$this->statuts[self::STATUS_OPEN_ALL] = 'OpenAll';
+			$this->statuts[self::STATUS_OPEN_ALL] = 'OpenAnyMovement';
 			$this->statuts[self::STATUS_OPEN_INTERNAL] = 'OpenInternal';
 		} else {
 			$this->statuts[self::STATUS_OPEN_ALL] = 'Opened';
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index ef1393dfb63..a00feb194a0 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -916,6 +916,7 @@ if (!$variants) {
 	print '<td></td>';
 	print '<td></td>';
 	print '</tr>';
+
 	if ((!empty($conf->productbatch->enabled)) && $object->hasbatch()) {
 		$colspan = 3;
 		print '<tr class="liste_titre"><td width="14%">';
@@ -979,6 +980,8 @@ if (!$variants) {
 
 			$stock_real = price2num($obj->reel, 'MS');
 			print '<tr class="oddeven">';
+
+			// Warehouse
 			print '<td colspan="4">';
 			print $entrepotstatic->getNomUrl(1);
 			if (!empty($conf->use_javascript_ajax) && !empty($conf->productbatch->enabled) && $object->hasbatch()) {
@@ -987,25 +990,28 @@ if (!$variants) {
 				print '</a>';
 			}
 			print '</td>';
+
 			print '<td class="right">'.$stock_real.($stock_real < 0 ? ' '.img_warning() : '').'</td>';
+
 			// PMP
-			print '<td class="right">'.(price2num($object->pmp) ? price2num($object->pmp, 'MU') : '').'</td>';
+			print '<td class="right nowraponall">'.(price2num($object->pmp) ? price2num($object->pmp, 'MU') : '').'</td>';
+
 			// Value purchase
-			print '<td class="right">'.(price2num($object->pmp) ? price(price2num($object->pmp * $obj->reel, 'MT')) : '').'</td>';
+			print '<td class="right amount nowraponall">'.(price2num($object->pmp) ? price(price2num($object->pmp * $obj->reel, 'MT')) : '').'</td>';
+
 			// Sell price
 			print '<td class="right">';
-			if (empty($conf->global->PRODUIT_MULTIPRICES)) {
-				print price(price2num($object->price, 'MU'), 1);
-			} else {
-				print $langs->trans("Variable");
+			print price(price2num($object->price, 'MU'), 1);
+			if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
+				print $form->textwithpicto('', $langs->trans("Variable"));
 			}
 			print '</td>';
+
 			// Value sell
-			print '<td class="right">';
-			if (empty($conf->global->PRODUIT_MULTIPRICES)) {
-				print price(price2num($object->price * $obj->reel, 'MT'), 1);
-			} else {
-				print $langs->trans("Variable");
+			print '<td class="right amount nowraponall">';
+			print price(price2num($object->price * $obj->reel, 'MT'), 1);
+			if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
+				print $form->textwithpicto('', $langs->trans("Variable"));
 			}
 			print '</td>';
 			print '<td></td>';
@@ -1117,10 +1123,9 @@ if (!$variants) {
 	print $totalvalue ? price(price2num($totalvalue, 'MT'), 1) : '&nbsp;';
 	print '</td>';
 	print '<td class="liste_total right">';
-	if (empty($conf->global->PRODUIT_MULTIPRICES)) {
-		print ($total ? price($totalvaluesell / $total, 1) : '&nbsp;');
-	} else {
-		print $langs->trans("Variable");
+	print ($total ? price($totalvaluesell / $total, 1) : '&nbsp;');
+	if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
+		print $form->textwithpicto('', $langs->trans("Variable"));
 	}
 	print '</td>';
 	// Value to sell

From 47b1d2b7df7225934d5f15f29f00ce6ae28a3b48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 24 Jun 2021 11:54:05 +0200
Subject: [PATCH 0864/1497] export value of checkbox instead id with
 EXPORT_LABEL_FOR_SELECT

---
 htdocs/core/extrafieldsinexport.inc.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/core/extrafieldsinexport.inc.php b/htdocs/core/extrafieldsinexport.inc.php
index a868c99a66f..861ef142c25 100644
--- a/htdocs/core/extrafieldsinexport.inc.php
+++ b/htdocs/core/extrafieldsinexport.inc.php
@@ -36,6 +36,7 @@ if ($resql) {    // This can fail when class is used on old database (during mig
 			case 'boolean':
 				$typeFilter = "Boolean";
 				break;
+			case 'checkbox':
 			case 'select':
 				if (!empty($conf->global->EXPORT_LABEL_FOR_SELECT)) {
 					$tmpparam = unserialize($obj->param); // $tmpparam may be array with 'options' = array(key1=>val1, key2=>val2 ...)

From 2859ff46b53a4f96e902ec5912d038bcdd589d4c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 24 Jun 2021 12:08:11 +0200
Subject: [PATCH 0865/1497] Fix link of type of membership

---
 .../adherents/class/adherent_type.class.php   | 31 ++++++++++++++-----
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php
index 1cb9fcdb12c..ad24b9f1c05 100644
--- a/htdocs/adherents/class/adherent_type.class.php
+++ b/htdocs/adherents/class/adherent_type.class.php
@@ -656,19 +656,19 @@ class AdherentType extends CommonObject
 	/**
 	 *  Return clicable name (with picto eventually)
 	 *
-	 *  @param		int		$withpicto		0=No picto, 1=Include picto into link, 2=Only picto
-	 *  @param		int		$maxlen			length max label
-	 *  @param		int  	$notooltip		1=Disable tooltip
-	 *  @return		string					String with URL
+	 *  @param		int		$withpicto					0=No picto, 1=Include picto into link, 2=Only picto
+	 *  @param		int		$maxlen						length max label
+	 *  @param		int  	$notooltip					1=Disable tooltip
+	 *  @param  	string  $morecss                    Add more css on link
+	 *  @param  	int     $save_lastsearch_value      -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *  @return		string								String with URL
 	 */
-	public function getNomUrl($withpicto = 0, $maxlen = 0, $notooltip = 0)
+	public function getNomUrl($withpicto = 0, $maxlen = 0, $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
 	{
 		global $langs;
 
 		$result = '';
 
-		$label = '';
-
 		$label = img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("MemberType").'</u>';
 		$label .= ' '.$this->getLibStatut(4);
 		$label .= '<br>'.$langs->trans("Label").': '.$this->label;
@@ -676,7 +676,22 @@ class AdherentType extends CommonObject
 			$label .= '<br>'.$langs->trans("SubscriptionRequired").': '.yn($this->subscription);
 		}
 
-		$linkstart = '<a href="'.DOL_URL_ROOT.'/adherents/type.php?rowid='.((int) $this->id).'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
+		$option = '';
+
+		$url = DOL_URL_ROOT.'/adherents/type.php?rowid='.((int) $this->id);
+
+		if ($option != 'nolink') {
+			// Add param to save lastsearch_values or not
+			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {
+				$add_save_lastsearch_values = 1;
+			}
+			if ($add_save_lastsearch_values) {
+				$url .= '&save_lastsearch_values=1';
+			}
+		}
+
+		$linkstart = '<a href="'.$url.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
 		$linkend = '</a>';
 
 		$result .= $linkstart;

From dc9e71084bb78c1f76ebbea3bee833780211bb28 Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Thu, 24 Jun 2021 12:15:29 +0200
Subject: [PATCH 0866/1497] Fix missing posYAfterImage for nexy for espadon and
 squille

---
 htdocs/core/modules/expedition/doc/pdf_espadon.modules.php | 2 +-
 htdocs/core/modules/reception/doc/pdf_squille.modules.php  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
index b680d4998bf..c13ba0d7dd8 100644
--- a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
@@ -608,7 +608,7 @@ class pdf_espadon extends ModelePdfExpedition
 						$posYAfterDescription = $pdf->GetY();
 					}
 
-					$nexY = $pdf->GetY();
+					$nexY = max($pdf->GetY(), $posYAfterImage);
 					$pageposafter = $pdf->getPage();
 
 					$pdf->setPage($pageposbefore);
diff --git a/htdocs/core/modules/reception/doc/pdf_squille.modules.php b/htdocs/core/modules/reception/doc/pdf_squille.modules.php
index 8043f9f9ba6..4642e77f3e3 100644
--- a/htdocs/core/modules/reception/doc/pdf_squille.modules.php
+++ b/htdocs/core/modules/reception/doc/pdf_squille.modules.php
@@ -423,7 +423,7 @@ class pdf_squille extends ModelePdfReception
 					}
 					$posYAfterDescription = $pdf->GetY();
 
-					$nexY = $pdf->GetY();
+					$nexY = max($pdf->GetY(), $posYAfterImage);
 					$pageposafter = $pdf->getPage();
 
 					$pdf->setPage($pageposbefore);

From a2d451dbfbf63e2eb843e152d40bf82e9fdb7f4a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 24 Jun 2021 12:17:32 +0200
Subject: [PATCH 0867/1497] Missing extrafield on report

---
 htdocs/core/modules/modExpenseReport.class.php | 14 ++++++++++----
 htdocs/core/modules/modHoliday.class.php       | 15 +++++++++++----
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/modules/modExpenseReport.class.php b/htdocs/core/modules/modExpenseReport.class.php
index befafbc6767..2e05bb85ca5 100644
--- a/htdocs/core/modules/modExpenseReport.class.php
+++ b/htdocs/core/modules/modExpenseReport.class.php
@@ -185,8 +185,9 @@ class modExpenseReport extends DolibarrModules
 			'd.total_ht'=>"TotalHT", 'd.total_tva'=>'TotalVAT', 'd.total_ttc'=>'TotalTTC',
 			'd.fk_statut'=>'Status', 'd.paid'=>'Paid',
 			'd.note_private'=>'NotePrivate', 'd.note_public'=>'NotePublic', 'd.detail_cancel'=>'MOTIF_CANCEL', 'd.detail_refuse'=>'MOTIF_REFUS',
-			'u.lastname'=>'Lastname', 'u.firstname'=>'Firstname', 'u.login'=>"Login", 'ed.rowid'=>'LineId', 'tf.code'=>'Type', 'ed.date'=>'Date', 'ed.tva_tx'=>'VATRate',
+			'ed.rowid'=>'LineId', 'tf.code'=>'Type', 'ed.date'=>'Date', 'ed.tva_tx'=>'VATRate',
 			'ed.total_ht'=>'TotalHT', 'ed.total_tva'=>'TotalVAT', 'ed.total_ttc'=>'TotalTTC', 'ed.comments'=>'Comment', 'p.rowid'=>'ProjectId', 'p.ref'=>'Ref',
+			'u.lastname'=>'Lastname', 'u.firstname'=>'Firstname', 'u.login'=>"Login",
 			'user_rib.iban_prefix' => 'IBAN', 'user_rib.bic' => 'BIC', 'user_rib.code_banque' => 'BankCode', 'user_rib.bank' => 'BankName', 'user_rib.proprio' => 'BankAccountOwner',
 			'user_rib.owner_address' => 'BankAccountOwnerAddress'
 		);
@@ -195,15 +196,17 @@ class modExpenseReport extends DolibarrModules
 			'd.total_ht'=>"Numeric", 'd.total_tva'=>'Numeric', 'd.total_ttc'=>'Numeric',
 			'd.fk_statut'=>"Numeric", 'd.paid'=>'Numeric',
 			'd.note_private'=>'Text', 'd.note_public'=>'Text', 'd.detail_cancel'=>'Text', 'd.detail_refuse'=>'Text',
-			'u.lastname'=>'Text', 'u.firstname'=>'Text', 'u.login'=>"Text", 'ed.rowid'=>'Numeric', 'tf.code'=>'Code', 'ed.date'=>'Date', 'ed.tva_tx'=>'Numeric',
+			'ed.rowid'=>'Numeric', 'tf.code'=>'Code', 'ed.date'=>'Date', 'ed.tva_tx'=>'Numeric',
 			'ed.total_ht'=>'Numeric', 'ed.total_tva'=>'Numeric', 'ed.total_ttc'=>'Numeric', 'ed.comments'=>'Text', 'p.rowid'=>'Numeric', 'p.ref'=>'Text',
+			'u.lastname'=>'Text', 'u.firstname'=>'Text', 'u.login'=>"Text",
 			'user_rib.iban_prefix' => 'Text', 'user_rib.bic' => 'Text', 'user_rib.code_banque' => 'Text', 'user_rib.bank' => 'Text', 'user_rib.proprio' => 'Text',
 			'user_rib.owner_address' => 'Text'
 		);
 		$this->export_entities_array[$r] = array(
-			'u.lastname'=>'user', 'u.firstname'=>'user', 'u.login'=>'user', 'ed.rowid'=>'expensereport_line', 'ed.date'=>'expensereport_line',
+			'ed.rowid'=>'expensereport_line', 'ed.date'=>'expensereport_line',
 			'ed.tva_tx'=>'expensereport_line', 'ed.total_ht'=>'expensereport_line', 'ed.total_tva'=>'expensereport_line', 'ed.total_ttc'=>'expensereport_line',
 			'ed.comments'=>'expensereport_line', 'tf.code'=>'expensereport_line', 'p.project_ref'=>'expensereport_line', 'p.rowid'=>'project', 'p.ref'=>'project',
+			'u.lastname'=>'user', 'u.firstname'=>'user', 'u.login'=>'user',
 			'user_rib.iban_prefix' => 'user', 'user_rib.bic' => 'user', 'user_rib.code_banque' => 'user', 'user_rib.bank' => 'user', 'user_rib.proprio' => 'user',
 			'user_rib.owner_address' => 'user'
 
@@ -213,12 +216,15 @@ class modExpenseReport extends DolibarrModules
 
 		$keyforselect = 'expensereport'; $keyforelement = 'expensereport'; $keyforaliasextra = 'extra';
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+		$keyforselect = 'user'; $keyforelement = 'user'; $keyforaliasextra = 'extrau';
+		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'expensereport as d';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'expensereport_extrafields as extra on d.rowid = extra.fk_object';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'user_rib as user_rib ON user_rib.fk_user = d.fk_user_author,';
-		$this->export_sql_end[$r] .= ' '.MAIN_DB_PREFIX.'user as u,';
+		$this->export_sql_end[$r] .= ' '.MAIN_DB_PREFIX.'user as u';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'user_extrafields as extrau ON u.rowid = extrau.fk_object,';
 		$this->export_sql_end[$r] .= ' '.MAIN_DB_PREFIX.'expensereport_det as ed LEFT JOIN '.MAIN_DB_PREFIX.'c_type_fees as tf ON ed.fk_c_type_fees = tf.id';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'projet as p ON ed.fk_projet = p.rowid';
 		$this->export_sql_end[$r] .= ' WHERE ed.fk_expensereport = d.rowid AND d.fk_user_author = u.rowid';
diff --git a/htdocs/core/modules/modHoliday.class.php b/htdocs/core/modules/modHoliday.class.php
index 6c6eaba69e0..a7fb6429fed 100644
--- a/htdocs/core/modules/modHoliday.class.php
+++ b/htdocs/core/modules/modHoliday.class.php
@@ -204,14 +204,18 @@ class modHoliday extends DolibarrModules
 		$this->export_permission[$r] = array(array("holiday", "readall"));
 		$this->export_fields_array[$r] = array(
 			'd.rowid'=>"LeaveId", 'd.fk_type'=>'TypeOfLeaveId', 't.code'=>'TypeOfLeaveCode', 't.label'=>'TypeOfLeaveLabel', 'd.fk_user'=>'UserID',
-			'u.lastname'=>'Lastname', 'u.firstname'=>'Firstname', 'u.login'=>"Login", 'd.date_debut'=>'DateStart', 'd.date_fin'=>'DateEnd', 'd.halfday'=>'HalfDay', 'none.num_open_days'=>'NbUseDaysCP',
-			'd.date_valid'=>'DateApprove', 'd.fk_validator'=>"UserForApprovalID", 'ua.lastname'=>"UserForApprovalLastname", 'ua.firstname'=>"UserForApprovalFirstname",
+			'd.date_debut'=>'DateStart', 'd.date_fin'=>'DateEnd', 'd.halfday'=>'HalfDay', 'none.num_open_days'=>'NbUseDaysCP',
+			'd.date_valid'=>'DateApprove', 'd.fk_validator'=>"UserForApprovalID",
+			'u.lastname'=>'Lastname', 'u.firstname'=>'Firstname', 'u.login'=>"Login",
+			'ua.lastname'=>"UserForApprovalLastname", 'ua.firstname'=>"UserForApprovalFirstname",
 			'ua.login'=>"UserForApprovalLogin", 'd.description'=>'Description', 'd.statut'=>'Status'
 		);
 		$this->export_TypeFields_array[$r] = array(
 			'd.rowid'=>"Numeric", 't.code'=>'Text', 't.label'=>'Text', 'd.fk_user'=>'Numeric',
-			'u.lastname'=>'Text', 'u.firstname'=>'Text', 'u.login'=>"Text", 'd.date_debut'=>'Date', 'd.date_fin'=>'Date', 'none.num_open_days'=>'NumericCompute',
-			'd.date_valid'=>'Date', 'd.fk_validator'=>"Numeric", 'ua.lastname'=>"Text", 'ua.firstname'=>"Text",
+			'd.date_debut'=>'Date', 'd.date_fin'=>'Date', 'none.num_open_days'=>'NumericCompute',
+			'd.date_valid'=>'Date', 'd.fk_validator'=>"Numeric",
+			'u.lastname'=>'Text', 'u.firstname'=>'Text', 'u.login'=>"Text",
+			'ua.lastname'=>"Text", 'ua.firstname'=>"Text",
 			'ua.login'=>"Text", 'd.description'=>'Text', 'd.statut'=>'Numeric'
 		);
 		$this->export_entities_array[$r] = array(
@@ -223,6 +227,8 @@ class modHoliday extends DolibarrModules
 
 		$keyforselect = 'holiday'; $keyforelement = 'holiday'; $keyforaliasextra = 'extra';
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+		$keyforselect = 'user'; $keyforelement = 'user'; $keyforaliasextra = 'extrau';
+		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'holiday as d';
@@ -230,6 +236,7 @@ class modHoliday extends DolibarrModules
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_holiday_types as t ON t.rowid = d.fk_type';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'user as ua ON ua.rowid = d.fk_validator,';
 		$this->export_sql_end[$r] .= ' '.MAIN_DB_PREFIX.'user as u';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'user_extrafields as extrau ON u.rowid = extrau.fk_object';
 		$this->export_sql_end[$r] .= ' WHERE d.fk_user = u.rowid';
 		$this->export_sql_end[$r] .= ' AND d.entity IN ('.getEntity('holiday').')';
 

From 88f7ca9214048a88d0db09d5d2ac74e69ed791ff Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Thu, 24 Jun 2021 12:27:39 +0200
Subject: [PATCH 0868/1497] Fix MAIN_GENERATE_RECEPTION_WITH_PICTURE

---
 .../modules/reception/doc/pdf_squille.modules.php    | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/modules/reception/doc/pdf_squille.modules.php b/htdocs/core/modules/reception/doc/pdf_squille.modules.php
index 4642e77f3e3..ee123471aa1 100644
--- a/htdocs/core/modules/reception/doc/pdf_squille.modules.php
+++ b/htdocs/core/modules/reception/doc/pdf_squille.modules.php
@@ -126,7 +126,7 @@ class pdf_squille extends ModelePdfReception
 
 		// Loop on each lines to detect if there is at least one image to show
 		$realpatharray = array();
-		if (!empty($conf->global->MAIN_GENERATE_SHIPMENT_WITH_PICTURE))
+		if (!empty($conf->global->MAIN_GENERATE_RECEPTION_WITH_PICTURE))
 		{
 			$objphoto = new Product($this->db);
 
@@ -137,8 +137,14 @@ class pdf_squille extends ModelePdfReception
 				$objphoto = new Product($this->db);
 				$objphoto->fetch($object->lines[$i]->fk_product);
 
-				$pdir = get_exdir($object->lines[$i]->fk_product, 2, 0, 0, $objphoto, 'product').$object->lines[$i]->fk_product."/photos/";
-				$dir = $conf->product->dir_output.'/'.$pdir;
+				if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
+				{
+					$pdir = get_exdir($object->lines[$i]->fk_product, 2, 0, 0, $objphoto, 'product').$object->lines[$i]->fk_product."/photos/";
+					$dir = $conf->product->dir_output.'/'.$pdir;
+				} else {
+					$pdir = get_exdir(0, 2, 0, 0, $objphoto, 'product');
+					$dir = $conf->product->dir_output.'/'.$pdir;
+				}
 
 				$realpath = '';
 

From b47fa50d0573b6fcaf7e7347df0b3dca3b408cec Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 24 Jun 2021 12:46:04 +0200
Subject: [PATCH 0869/1497] Try postgresl migration fix

---
 htdocs/install/mysql/migration/12.0.0-13.0.0.sql | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
index 81471e18e4c..da4d0fd0a42 100644
--- a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
+++ b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
@@ -576,6 +576,11 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value
 
 -- Removed no more used function
 -- VPGSQL8.2 DROP FUNCTION IF EXISTS update_modified_column_date_m() CASCADE;
+-- VPGSQL8.2 DROP TRIGGER update_customer_modtime ON llx_ecm_directories;
+-- VPGSQL8.2 DROP TRIGGER update_customer_modtime ON llx_ecm_files;
+-- VPGSQL8.2 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_ecm_directories FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
+-- VPGSQL8.2 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_ecm_files FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
+
 
 insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 6,'AC_EMAIL_IN','system','reception Email',NULL, 1, 4);
 

From a4e6eb12a80ae5fa9cada7f587f9cdecc7b871a1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 24 Jun 2021 12:46:50 +0200
Subject: [PATCH 0870/1497] Fix migration pgsql

---
 htdocs/install/mysql/migration/13.0.0-14.0.0.sql | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index 8caf6e9a401..ade8f867160 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -37,6 +37,11 @@
 -- VMYSQL4.1 SET sql_mode = 'NO_ZERO_DATE';
 -- VMYSQL4.1 update llx_propal set tms = null where DATE(STR_TO_DATE(tms, '%Y-%m-%d')) IS NULL;
 
+-- VPGSQL8.2 DROP TRIGGER update_customer_modtime ON llx_ecm_directories;
+-- VPGSQL8.2 DROP TRIGGER update_customer_modtime ON llx_ecm_files;
+-- VPGSQL8.2 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_ecm_directories FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
+-- VPGSQL8.2 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_ecm_files FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
+
 ALTER TABLE llx_ecm_files ADD COLUMN note_private text AFTER fk_user_m;
 ALTER TABLE llx_ecm_files ADD COLUMN note_public text AFTER note_private;
 

From 98244a5e44b84e96da9c53d7eff2f246959f3b39 Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Thu, 24 Jun 2021 14:20:19 +0200
Subject: [PATCH 0871/1497] Fix : error display fr phone number

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 915282ed0d8..e46d627c2a2 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2826,7 +2826,7 @@ function dol_print_phone($phone, $countrycode = '', $cid = 0, $socid = 0, $addli
 		} elseif (dol_strlen($phone) == 11) {
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 2).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2);
 		} elseif (dol_strlen($phone) == 12) {
-			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);
+			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 1).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);
 		}
 	} elseif (strtoupper($countrycode) == "CA") {
 		if (dol_strlen($phone) == 10) {

From 7a2ec389a14179a1793a085b3649b68d42cdc87e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 24 Jun 2021 18:57:22 +0200
Subject: [PATCH 0872/1497] fix inexistent right

---
 htdocs/comm/propal/list.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 95d461eac39..8ea0abd30f0 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -216,15 +216,15 @@ $arrayfields = array(
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
 
 $permissiontoread = $user->rights->propal->lire;
-$permissiontoadd = $user->rights->propal->write;
+$permissiontoadd = $user->rights->propal->creer;
 $permissiontodelete = $user->rights->propal->supprimer;
 if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
 	$permissiontovalidate = $user->rights->propale->propal_advance->validate;
 	$permissiontoclose = $user->rights->propale->propal_advance->close;
 	$permissiontosendbymail = $user->rights->propale->propal_advance->send;
 } else {
-	$permissiontovalidate = $user->rights->propal->write;
-	$permissiontoclose = $user->rights->propal->write;
+	$permissiontovalidate = $user->rights->propal->creer;
+	$permissiontoclose = $user->rights->propal->creer;
 }
 
 

From f92cc8f5a3bf171d635bd8782a644224a79b4fcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 24 Jun 2021 20:11:40 +0200
Subject: [PATCH 0873/1497] fix warnings in propal list

---
 htdocs/societe/class/societe.class.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 07da47dc2ce..fdfd32cb5d8 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -2294,6 +2294,7 @@ class Societe extends CommonObject
 		$reparray = array();
 
 		$sql = "SELECT DISTINCT u.rowid, u.login, u.lastname, u.firstname, u.office_phone, u.job, u.email, u.statut as status, u.entity, u.photo, u.gender";
+		$sql .= ", u.office_fax, u.user_mobile, u.personal_mobile";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc, ".MAIN_DB_PREFIX."user as u";
 		if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
 			$sql .= ", ".MAIN_DB_PREFIX."usergroup_user as ug";
@@ -2324,6 +2325,10 @@ class Societe extends CommonObject
 					$reparray[$i]['firstname'] = $obj->firstname;
 					$reparray[$i]['email'] = $obj->email;
 					$reparray[$i]['phone'] = $obj->office_phone;
+					$reparray[$i]['office_phone'] = $obj->office_phone;
+					$reparray[$i]['office_fax'] = $obj->office_fax;
+					$reparray[$i]['user_mobile'] = $obj->user_mobile;
+					$reparray[$i]['personal_mobile'] = $obj->personal_mobile;
 					$reparray[$i]['job'] = $obj->job;
 					$reparray[$i]['statut'] = $obj->status; // deprecated
 					$reparray[$i]['status'] = $obj->status;

From aad45a8157f54e0fdec6a7dd47c39ecf7a49a45f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 24 Jun 2021 20:15:57 +0200
Subject: [PATCH 0874/1497] fix warnings in propal list

---
 htdocs/comm/propal/list.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 95d461eac39..6041fb0681b 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -15,6 +15,7 @@
  * Copyright (C) 2018	   Nicolas ZABOURI			<info@inovea-conseil.com>
  * Copyright (C) 2019	   Alexandre Spangaro		<aspangaro@open-dsi.fr>
  * Copyright (C) 2021	   Anthony Berton			<anthony.berton@bb2a.fr>
+ * Copyright (C) 2021		Frédéric France			<frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -465,13 +466,13 @@ $sql .= " typent.code as typent_code,";
 $sql .= " ava.rowid as availability,";
 $sql .= " country.code as country_code,";
 $sql .= " state.code_departement as state_code, state.nom as state_name,";
-$sql .= ' p.rowid, p.entity, p.note_private, p.total_ht, p.total_tva, p.total_ttc, p.localtax1, p.localtax2, p.ref, p.ref_client, p.fk_statut as status, p.fk_user_author, p.datep as dp, p.fin_validite as dfv,p.date_livraison as ddelivery,';
+$sql .= ' p.rowid, p.entity as propal_entity, p.note_private, p.total_ht, p.total_tva, p.total_ttc, p.localtax1, p.localtax2, p.ref, p.ref_client, p.fk_statut as status, p.fk_user_author, p.datep as dp, p.fin_validite as dfv,p.date_livraison as ddelivery,';
 $sql .= ' p.fk_multicurrency, p.multicurrency_code, p.multicurrency_tx, p.multicurrency_total_ht, p.multicurrency_total_tva, p.multicurrency_total_ttc,';
 $sql .= ' p.datec as date_creation, p.tms as date_update, p.date_cloture as date_cloture,';
 $sql .= ' p.note_public, p.note_private,';
 $sql .= ' p.fk_cond_reglement,p.fk_mode_reglement,p.fk_shipping_method,p.fk_input_reason,';
 $sql .= " pr.rowid as project_id, pr.ref as project_ref, pr.title as project_label,";
-$sql .= ' u.login, u.lastname, u.firstname, u.email, u.statut, u.entity, u.photo, u.office_phone, u.office_fax, u.user_mobile, u.job, u.gender';
+$sql .= ' u.login, u.lastname, u.firstname, u.email, u.statut, u.entity as user_entity, u.photo, u.office_phone, u.office_fax, u.user_mobile, u.job, u.gender';
 if (!$user->rights->societe->client->voir && !$socid) {
 	$sql .= ", sc.fk_soc, sc.fk_user";
 }
@@ -1396,7 +1397,7 @@ if ($resql) {
 			// Other picto tool
 			print '<td width="16" class="nobordernopadding right">';
 			$filename = dol_sanitizeFileName($obj->ref);
-			$filedir = $conf->propal->multidir_output[$obj->entity].'/'.dol_sanitizeFileName($obj->ref);
+			$filedir = $conf->propal->multidir_output[$obj->propal_entity].'/'.dol_sanitizeFileName($obj->ref);
 			$urlsource = $_SERVER['PHP_SELF'].'?id='.$obj->rowid;
 			print $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
 			print '</td></tr></table>';
@@ -1705,7 +1706,7 @@ if ($resql) {
 		$userstatic->firstname = $obj->firstname;
 		$userstatic->email = $obj->email;
 		$userstatic->statut = $obj->statut;
-		$userstatic->entity = $obj->entity;
+		$userstatic->entity = $obj->user_entity;
 		$userstatic->photo = $obj->photo;
 		$userstatic->office_phone = $obj->office_phone;
 		$userstatic->office_fax = $obj->office_fax;

From fde23632ce62c1d49020ddd378002f35ca646eaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 24 Jun 2021 20:20:50 +0200
Subject: [PATCH 0875/1497] Update list.php

---
 htdocs/comm/propal/list.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 6041fb0681b..55408c95626 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -1322,6 +1322,11 @@ if ($resql) {
 	$now = dol_now();
 	$i = 0;
 	$totalarray = array();
+	$totalarray['nbfield'] = 0;
+	$totalarray['val'] = array();
+	$totalarray['val']['p.total_ht'] = 0;
+	$totalarray['val']['p.total_tva'] = 0;
+	$totalarray['val']['p.total_ttc'] = 0;
 	$typenArray = null;
 
 	while ($i < min($num, $limit)) {

From 6e1c4ed980b2f68bd812102d5a7c60e65747a26c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 24 Jun 2021 20:30:11 +0200
Subject: [PATCH 0876/1497] fix warnings

---
 htdocs/fichinter/list.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index f96b9e62f88..3f86fc18795 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -6,6 +6,7 @@
  * Copyright (C) 2013		Cédric Salvador			<csalvador@gpcsolutions.fr>
  * Copyright (C) 2015       Jean-François Ferry		<jfefe@aternatik.fr>
  * Copyright (C) 2018    	Ferran Marcet			<fmarcet@2byte.es>
+ * Copyright (C) 2021		Frédéric France			<frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -225,7 +226,7 @@ if (!empty($conf->projet->enabled)) {
 	$sql .= ", pr.rowid as projet_id, pr.ref as projet_ref, pr.title as projet_title";
 }
 if (!empty($conf->contrat->enabled)) {
-	$sql .= ", c.rowid as contrat_id, c.ref as contrat_ref, c.ref_customer as contrat_ref_supplier, c.ref_supplier as contrat_ref_supplier";
+	$sql .= ", c.rowid as contrat_id, c.ref as contrat_ref, c.ref_customer as contrat_ref_customer, c.ref_supplier as contrat_ref_supplier";
 }
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
@@ -573,6 +574,8 @@ if ($resql) {
 	$i = 0;
 	$totalarray = array();
 	$totalarray['nbfield'] = 0;
+	$totalarray['val'] = array();
+	$totalarray['val']['fd.duree'] = 0;
 	while ($i < min($num, $limit)) {
 		$obj = $db->fetch_object($resql);
 

From 06522d5b2ef9df4548042df80f8df1c9c96186a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 24 Jun 2021 21:01:23 +0200
Subject: [PATCH 0877/1497] fix warning

---
 htdocs/product/stock/stockatdate.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/product/stock/stockatdate.php b/htdocs/product/stock/stockatdate.php
index 77923d9e7c9..194616b6cdf 100644
--- a/htdocs/product/stock/stockatdate.php
+++ b/htdocs/product/stock/stockatdate.php
@@ -116,7 +116,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 }
 
 $warehouseStatus = array();
-if ($conf->global->ENTREPOT_EXTRA_STATUS) {
+if (!empty($conf->global->ENTREPOT_EXTRA_STATUS)) {
 	//$warehouseStatus[] = Entrepot::STATUS_CLOSED;
 	$warehouseStatus[] = Entrepot::STATUS_OPEN_ALL;
 	$warehouseStatus[] = Entrepot::STATUS_OPEN_INTERNAL;

From 438e37ed59b3594948490dc25624ae580da9c685 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 24 Jun 2021 21:12:32 +0200
Subject: [PATCH 0878/1497] fix warnings

---
 htdocs/product/stock/stockatdate.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/product/stock/stockatdate.php b/htdocs/product/stock/stockatdate.php
index 77923d9e7c9..63c8172568d 100644
--- a/htdocs/product/stock/stockatdate.php
+++ b/htdocs/product/stock/stockatdate.php
@@ -294,8 +294,8 @@ if ($sortfield == 'stock' && $fk_warehouse > 0) {
 }
 $sql .= $db->order($sortfield, $sortorder);
 
+$nbtotalofrecords = 0;
 if ($date && $dateIsValid) {	// We avoid a heavy sql if mandatory parameter date not yet defined
-	$nbtotalofrecords = '';
 	if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 		$result = $db->query($sql);
 		$nbtotalofrecords = $db->num_rows($result);
@@ -618,7 +618,9 @@ if (empty($date) || ! $dateIsValid) {
 print '</table>';
 print '</div>';
 
-$db->free($resql);
+if (!empty($resql)) {
+	$db->free($resql);
+}
 
 print dol_get_fiche_end();
 

From ec805d36fe2d8faf0fb801f3383c069779e97f16 Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Fri, 25 Jun 2021 10:02:23 +0200
Subject: [PATCH 0879/1497] Remove deprecated level parameter.

---
 htdocs/core/modules/expedition/doc/pdf_espadon.modules.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
index c13ba0d7dd8..c1c0cbef2db 100644
--- a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
@@ -196,7 +196,7 @@ class pdf_espadon extends ModelePdfExpedition
 					$pdir = get_exdir($object->lines[$i]->fk_product, 2, 0, 0, $objphoto, 'product').$object->lines[$i]->fk_product."/photos/";
 					$dir = $conf->product->dir_output.'/'.$pdir;
 				} else {
-					$pdir = get_exdir(0, 2, 0, 0, $objphoto, 'product');
+					$pdir = get_exdir(0, 0, 0, 0, $objphoto, 'product');
 					$dir = $conf->product->dir_output.'/'.$pdir;
 				}
 

From 46ae7180f832d74643b0a1c259f238493c657924 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 25 Jun 2021 10:47:31 +0200
Subject: [PATCH 0880/1497] Fix phpunit. Refused @@ char in sql.

---
 htdocs/main.inc.php           |  7 ++++---
 test/phpunit/SecurityTest.php | 15 +++++++++++++++
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 266cb541c7b..7ef504bbf91 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -104,7 +104,7 @@ function testSqlAndScriptInject($val, $type)
 	$val = preg_replace('/<!--[^>]*-->/', '', $val);
 
 	$inj = 0;
-	// For SQL Injection (only GET are used to be included into bad escaped SQL requests)
+	// For SQL Injection (only GET are used to scan for such injection strings)
 	if ($type == 1 || $type == 3) {
 		$inj += preg_match('/delete\s+from/i', $val);
 		$inj += preg_match('/create\s+table/i', $val);
@@ -114,15 +114,16 @@ function testSqlAndScriptInject($val, $type)
 		$inj += preg_match('/user\s*\(/i', $val); // avoid to use function user() that return current database login
 		$inj += preg_match('/information_schema/i', $val); // avoid to use request that read information_schema database
 		$inj += preg_match('/<svg/i', $val); // <svg can be allowed in POST
+		$inj += preg_match('/update.+set.+=/i', $val);
+		$inj += preg_match('/union.+select/i', $val);
 	}
 	if ($type == 3) {
 		$inj += preg_match('/select|update|delete|truncate|replace|group\s+by|concat|count|from|union/i', $val);
 	}
 	if ($type != 2) {	// Not common key strings, so we can check them both on GET and POST
 		$inj += preg_match('/updatexml\(/i', $val);
-		$inj += preg_match('/update.+set.+=/i', $val);
-		$inj += preg_match('/union.+select/i', $val);
 		$inj += preg_match('/(\.\.%2f)+/i', $val);
+		$inj += preg_match('/\s@@/', $val);
 	}
 	// For XSS Injection done by closing textarea to execute content into a textarea field
 	$inj += preg_match('/<\/textarea/i', $val);
diff --git a/test/phpunit/SecurityTest.php b/test/phpunit/SecurityTest.php
index b1a32249ffc..7e93f7673f2 100644
--- a/test/phpunit/SecurityTest.php
+++ b/test/phpunit/SecurityTest.php
@@ -198,6 +198,9 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 		$result=testSqlAndScriptInject($test, 0);
 		$this->assertEquals($expectedresult, $result, 'Error on testSqlAndScriptInject expected 0b');
 
+		$test = 'This is the union of all for the selection of the best';
+		$result=testSqlAndScriptInject($test, 0);
+		$this->assertEquals($expectedresult, $result, 'Error on testSqlAndScriptInject expected 0c');
 
 		// Should detect attack
 		$expectedresult=1;
@@ -206,6 +209,18 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 		$result=testSqlAndScriptInject($_SERVER["PHP_SELF"], 2);
 		$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject for PHP_SELF that should detect XSS');
 
+		$test = 'select @@version';
+		$result=testSqlAndScriptInject($test, 0);
+		$this->assertEquals($expectedresult, $result, 'Error on testSqlAndScriptInject for SQL1a. Should find an attack on POST param and did not.');
+
+		$test = 'select @@version';
+		$result=testSqlAndScriptInject($test, 1);
+		$this->assertEquals($expectedresult, $result, 'Error on testSqlAndScriptInject for SQL1b. Should find an attack on GET param and did not.');
+
+		$test = '... union ... selection ';
+		$result=testSqlAndScriptInject($test, 1);
+		$this->assertEquals($expectedresult, $result, 'Error on testSqlAndScriptInject for SQL2. Should find an attack on GET param and did not.');
+
 		$test = 'j&#x61;vascript:';
 		$result=testSqlAndScriptInject($test, 0);
 		$this->assertEquals($expectedresult, $result, 'Error on testSqlAndScriptInject for javascript1. Should find an attack and did not.');

From c4e9e1c8df172891dba9b8d64c6805cc48fa6ca2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 25 Jun 2021 10:50:58 +0200
Subject: [PATCH 0881/1497] Comment

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

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 7ef504bbf91..d984080d442 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -111,7 +111,7 @@ function testSqlAndScriptInject($val, $type)
 		$inj += preg_match('/insert\s+into/i', $val);
 		$inj += preg_match('/select\s+from/i', $val);
 		$inj += preg_match('/into\s+(outfile|dumpfile)/i', $val);
-		$inj += preg_match('/user\s*\(/i', $val); // avoid to use function user() that return current database login
+		$inj += preg_match('/user\s*\(/i', $val); // avoid to use function user() or mysql_user() that return current database login
 		$inj += preg_match('/information_schema/i', $val); // avoid to use request that read information_schema database
 		$inj += preg_match('/<svg/i', $val); // <svg can be allowed in POST
 		$inj += preg_match('/update.+set.+=/i', $val);

From fc9760f730c36af5dcffd3d8fcc378cfefb4a2b6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 25 Jun 2021 14:04:44 +0200
Subject: [PATCH 0882/1497] Add test for MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY
 and MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY

---
 test/phpunit/DateLibTest.php | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/test/phpunit/DateLibTest.php b/test/phpunit/DateLibTest.php
index 7c6cda9f997..c40d9dabbfa 100644
--- a/test/phpunit/DateLibTest.php
+++ b/test/phpunit/DateLibTest.php
@@ -265,9 +265,9 @@ class DateLibTest extends PHPUnit\Framework\TestCase
 		$db=$this->savdb;
 
 		// With same hours - Tuesday/Wednesday jan 2013
-		$date1=dol_mktime(0, 0, 0, 1, 1, 2013, 'gmt');
-		$date2=dol_mktime(0, 0, 0, 1, 2, 2013, 'gmt');
-		$date3=dol_mktime(0, 0, 0, 1, 3, 2013, 'gmt');
+		$date1=dol_mktime(0, 0, 0, 1, 1, 2013, 'gmt');	// tuesday
+		$date2=dol_mktime(0, 0, 0, 1, 2, 2013, 'gmt');	// wednesday
+		$date3=dol_mktime(0, 0, 0, 1, 3, 2013, 'gmt');	// thursday
 
 		$result=num_open_day($date1, $date2, 0, 1, 0, 'FR');
 		print __METHOD__." result=".$result."\n";
@@ -282,8 +282,8 @@ class DateLibTest extends PHPUnit\Framework\TestCase
 		$this->assertEquals(2, $result, 'NumOpenDay Wednesday 2 - Thursday 3 jan 2013 for FR');   // 2 opened days
 
 		// With same hours - Friday/Sunday jan 2013
-		$date1=dol_mktime(0, 0, 0, 1, 4, 2013, 'gmt');
-		$date2=dol_mktime(0, 0, 0, 1, 6, 2013, 'gmt');
+		$date1=dol_mktime(0, 0, 0, 1, 4, 2013, 'gmt');	// friday
+		$date2=dol_mktime(0, 0, 0, 1, 6, 2013, 'gmt');	// sunday
 
 		$result=num_open_day($date1, $date2, 0, 1, 0, 'FR');
 		print __METHOD__." result=".$result."\n";
@@ -292,6 +292,17 @@ class DateLibTest extends PHPUnit\Framework\TestCase
 		$result=num_open_day($date1, $date2, 'XX', 1);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals(1, $result, 'NumOpenDay for XX');   // 1 opened day, 2 closes (even if country unknown)
+
+		// Test option MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY and MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY
+		$conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY = 0;
+		$result=num_open_day($date1, $date2, 0, 1, 0, 'FR');
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals(2, $result, 'NumOpenDay for FR when saturday is a working day');   //2 opened day, 1 closed
+
+		$conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY = 0;
+		$result=num_open_day($date1, $date2, 'XX', 1);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals(3, $result, 'NumOpenDay for XX when saturday + sunday are working days');   // 3 opened day, 0 closes (even if country unknown)
 	}
 
 	/**

From 24acc82ca6dd944b7e0c05cfcc21dd1397c211c4 Mon Sep 17 00:00:00 2001
From: lvessiller <lvessiller@open-dsi.fr>
Date: Fri, 25 Jun 2021 16:40:39 +0200
Subject: [PATCH 0883/1497] NEW get errors on create invoice from clone

---
 htdocs/compta/facture/card.php                | 2 +-
 htdocs/compta/facture/class/facture.class.php | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 5eaed91db56..b88abc9c6d5 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -193,7 +193,7 @@ if (empty($reshook)) {
 			exit();
 		} else {
 			$langs->load("errors");
-			setEventMessages($object->error, $object->errors, 'errors');
+			setEventMessages($objectutil->error, $objectutil->errors, 'errors');
 			$action = '';
 		}
 	} elseif ($action == 'reopen' && $usercanreopen) {
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 940cd146f7b..fab10da3751 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -1235,14 +1235,20 @@ class Facture extends CommonInvoice
 		$result = $object->create($user);
 		if ($result < 0) {
 			$error++;
+			$this->error = $object->error;
+			$this->errors = $object->errors;
 		} else {
 			// copy internal contacts
 			if ($object->copy_linked_contact($this, 'internal') < 0) {
 				$error++;
+				$this->error = $object->error;
+				$this->errors = $object->errors;
 			} elseif ($this->socid == $object->socid) {
 				// copy external contacts if same company
 				if ($object->copy_linked_contact($this, 'external') < 0) {
 					$error++;
+					$this->error = $object->error;
+					$this->errors = $object->errors;
 				}
 			}
 		}

From 2cb2ec02d6472ee3dcc71a2d9370e9b6714b4ac2 Mon Sep 17 00:00:00 2001
From: lvessiller <lvessiller@open-dsi.fr>
Date: Fri, 25 Jun 2021 17:04:19 +0200
Subject: [PATCH 0884/1497] NEW parent compnay in order supplier lines export

---
 htdocs/core/modules/modFournisseur.class.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/modules/modFournisseur.class.php b/htdocs/core/modules/modFournisseur.class.php
index 7696fd41683..41107d5c34a 100644
--- a/htdocs/core/modules/modFournisseur.class.php
+++ b/htdocs/core/modules/modFournisseur.class.php
@@ -527,7 +527,7 @@ class modFournisseur extends DolibarrModules
 		$this->export_icon[$r] = 'order';
 		$this->export_permission[$r] = array(array("fournisseur", "commande", "export"));
 		$this->export_fields_array[$r] = array(
-			's.rowid'=>"IdCompany", 's.nom'=>'CompanyName', 's.address'=>'Address', 's.zip'=>'Zip', 's.town'=>'Town', 'c.code'=>'CountryCode', 's.phone'=>'Phone',
+			's.rowid'=>"IdCompany", 's.nom'=>'CompanyName', 'ps.nom'=>'ParentCompany', 's.address'=>'Address', 's.zip'=>'Zip', 's.town'=>'Town', 'c.code'=>'CountryCode', 's.phone'=>'Phone',
 			's.siren'=>'ProfId1', 's.siret'=>'ProfId2', 's.ape'=>'ProfId3', 's.idprof4'=>'ProfId4', 's.idprof5'=>'ProfId5', 's.idprof6'=>'ProfId6', 's.tva_intra'=>'VATIntra',
 			'f.rowid'=>"OrderId", 'f.ref'=>"Ref", 'f.ref_supplier'=>"RefSupplier", 'f.date_creation'=>"DateCreation", 'f.date_commande'=>"OrderDate", 'f.date_livraison'=>"DateDeliveryPlanned",
 			'f.total_ht'=>"TotalHT", 'f.total_ttc'=>"TotalTTC", 'f.total_tva'=>"TotalVAT", 'f.fk_statut'=>'Status', 'f.date_approve'=>'DateApprove', 'f.date_approve2'=>'DateApprove2',
@@ -548,7 +548,7 @@ class modFournisseur extends DolibarrModules
 			unset($this->export_fields_array['ua2.login']);
 		}
 		$this->export_TypeFields_array[$r] = array(
-			's.rowid'=>"company", 's.nom'=>'Text', 's.address'=>'Text', 's.cp'=>'Text', 's.ville'=>'Text', 'c.code'=>'Text', 's.tel'=>'Text', 's.siren'=>'Text',
+			's.rowid'=>"company", 's.nom'=>'Text', 'ps.nom'=>'Text', 's.address'=>'Text', 's.cp'=>'Text', 's.ville'=>'Text', 'c.code'=>'Text', 's.tel'=>'Text', 's.siren'=>'Text',
 			's.siret'=>'Text', 's.ape'=>'Text', 's.idprof4'=>'Text', 's.idprof5'=>'Text', 's.idprof6'=>'Text', 's.tva_intra'=>'Text', 'f.ref'=>"Text", 'f.ref_supplier'=>"Text",
 			'f.date_creation'=>"Date", 'f.date_commande'=>"Date", 'f.date_livraison'=>"Date", 'f.total_ht'=>"Numeric", 'f.total_ttc'=>"Numeric", 'f.total_tva'=>"Numeric",
 			'f.fk_statut'=>'Status', 'f.date_approve'=>'Date', 'f.date_approve2'=>'Date', 'f.note_public'=>"Text", 'f.note_private'=>"Text", 'fd.description'=>"Text",
@@ -556,7 +556,7 @@ class modFournisseur extends DolibarrModules
 			'fd.product_type'=>'Numeric', 'fd.ref'=>'Text', 'fd.fk_product'=>'List:product:label', 'p.ref'=>'Text', 'p.label'=>'Text', 'project.ref'=>'Text', 'project.title'=>'Text'
 		);
 		$this->export_entities_array[$r] = array(
-			's.rowid'=>"company", 's.nom'=>'company', 's.address'=>'company', 's.zip'=>'company', 's.town'=>'company', 'c.code'=>'company', 's.phone'=>'company', 's.siren'=>'company',
+			's.rowid'=>"company", 's.nom'=>'company', 'ps.nom'=>'company', 's.address'=>'company', 's.zip'=>'company', 's.town'=>'company', 'c.code'=>'company', 's.phone'=>'company', 's.siren'=>'company',
 			's.siret'=>'company', 's.ape'=>'company', 's.idprof4'=>'company', 's.idprof5'=>'company', 's.idprof6'=>'company', 's.tva_intra'=>'company', 'ua1.login'=>'user',
 			'ua2.login'=>'user', 'fd.rowid'=>'order_line', 'fd.description'=>"order_line", 'fd.tva_tx'=>"order_line", 'fd.qty'=>"order_line", 'fd.remise_percent'=>"order_line",
 			'fd.total_ht'=>"order_line", 'fd.total_ttc'=>"order_line", 'fd.total_tva'=>"order_line", 'fd.product_type'=>'order_line', 'fd.ref'=>'order_line', 'fd.fk_product'=>'product',
@@ -644,6 +644,7 @@ class modFournisseur extends DolibarrModules
 		// End add extra fields line
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'societe as s';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as ps ON ps.rowid = s.parent';
 		if (is_object($user) && empty($user->rights->societe->client->voir)) {
 			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
 		}

From d2485033d7f40e4f151387a9206ee36f8eeb2e9e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 25 Jun 2021 23:10:42 +0200
Subject: [PATCH 0885/1497] Fix deletion of template invoice

---
 htdocs/compta/facture/class/facture-rec.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index 0d827a53b0a..6b9837e77bd 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -772,10 +772,10 @@ class FactureRec extends CommonInvoice
 
 		$main = MAIN_DB_PREFIX.'facturedet_rec';
 		$ef = $main."_extrafields";
-		$sqlef = "DELETE FROM $ef WHERE fk_object IN (SELECT rowid FROM ".$main." WHERE fk_facture = ".((int) $rowid);
-		dol_syslog($sqlef);
+
+		$sqlef = "DELETE FROM $ef WHERE fk_object IN (SELECT rowid FROM ".$main." WHERE fk_facture = ".((int) $rowid).")";
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."facturedet_rec WHERE fk_facture = ".((int) $rowid);
-		dol_syslog($sql);
+
 		if ($this->db->query($sqlef) && $this->db->query($sql)) {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."facture_rec WHERE rowid = ".((int) $rowid);
 			dol_syslog($sql);

From c7b03da7e620a0b2c258ba1d44561ba380946fe2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 25 Jun 2021 23:43:22 +0200
Subject: [PATCH 0886/1497] Fix bad object used

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

diff --git a/htdocs/core/boxes/box_graph_product_distribution.php b/htdocs/core/boxes/box_graph_product_distribution.php
index dd85c3e1fcd..5110b929a2e 100644
--- a/htdocs/core/boxes/box_graph_product_distribution.php
+++ b/htdocs/core/boxes/box_graph_product_distribution.php
@@ -193,7 +193,7 @@ class box_graph_product_distribution extends ModeleBoxes
 					$px2->SetLegend($legend);
 					$px2->setShowLegend(2);
 					if (!empty($conf->dol_optimize_smallscreen)) {
-						$px1->SetWidth(320);
+						$px2->SetWidth(320);
 					}
 					$px2->setShowPointValue($showpointvalue);
 					$px2->setShowPercent(0);
@@ -256,7 +256,7 @@ class box_graph_product_distribution extends ModeleBoxes
 					$px3->SetLegend($legend);
 					$px3->setShowLegend(2);
 					if (!empty($conf->dol_optimize_smallscreen)) {
-						$px1->SetWidth(320);
+						$px3->SetWidth(320);
 					}
 					$px3->setShowPointValue($showpointvalue);
 					$px3->setShowPercent(0);

From 6e3647af2c4df126e7d4284b5afc4c2bba1543fb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 26 Jun 2021 00:08:19 +0200
Subject: [PATCH 0887/1497] Debug v14

---
 htdocs/compta/facture/card-rec.php        | 6 +++---
 htdocs/compta/facture/card.php            | 3 +--
 htdocs/contrat/list.php                   | 6 +++---
 htdocs/core/class/html.formfile.class.php | 6 +++---
 htdocs/core/tpl/objectline_create.tpl.php | 6 +++---
 5 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/htdocs/compta/facture/card-rec.php b/htdocs/compta/facture/card-rec.php
index 9341197c312..fb503ccac4d 100644
--- a/htdocs/compta/facture/card-rec.php
+++ b/htdocs/compta/facture/card-rec.php
@@ -193,11 +193,11 @@ if (empty($reshook)) {
 				$action = "create";
 				$error++;
 			}
-			if ($nb_gen_max === '') {
+			/*if ($nb_gen_max === '') {
 				setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->trans("MaxPeriodNumber")), null, 'errors');
 				$action = "create";
 				$error++;
-			}
+			}*/
 		}
 
 		if (!$error) {
@@ -964,7 +964,7 @@ if ($action == 'create') {
 
 		// Title
 		print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("Title").'</td><td>';
-		print '<input class="flat quatrevingtpercent" type="text" name="title" value="'.dol_escape_htmltag(GETPOST("titre", 'alphanohtml')).'">';
+		print '<input class="flat quatrevingtpercent" type="text" name="title" value="'.dol_escape_htmltag(GETPOST("title", 'alphanohtml')).'">';
 		print '</td></tr>';
 
 		// Third party
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 5eaed91db56..675653975fc 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -3061,7 +3061,7 @@ if ($action == 'create') {
 	} else {
 		print '<tr><td class="fieldrequired">'.$langs->trans('Customer').'</td>';
 		print '<td colspan="2">';
-		print img_picto('', 'company').$form->select_company($soc->id, 'socid', '((s.client = 1 OR s.client = 3) AND s.status=1)', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
+		print img_picto('', 'company').$form->select_company($soc->id, 'socid', '((s.client = 1 OR s.client = 3) AND s.status=1)', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300 widthcentpercentminusxx maxwidth500');
 		// Option to reload page to retrieve customer informations.
 		if (empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE_DISABLED)) {
 			print '<script type="text/javascript">
@@ -3782,7 +3782,6 @@ if ($action == 'create') {
 	// Button "Create Draft"
 	print '<div class="center">';
 	print '<input type="submit" class="button" name="bouton" value="'.$langs->trans('CreateDraft').'">';
-	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
 	print '<input type="button" class="button button-cancel" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
 	print '</div>';
 
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index ccb36830844..a744b2c1bf7 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -495,14 +495,14 @@ if ($user->rights->societe->client->voir || $socid) {
 	$langs->load("commercial");
 	$moreforfilter .= '<div class="divsearchfield">';
 	$tmptitle = $langs->trans('ThirdPartiesOfSaleRepresentative');
-	$moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, $tmptitle, 'maxwidth250');
+	$moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, $tmptitle, 'widthcentpercentminusx maxwidth300');
 	$moreforfilter .= '</div>';
 }
 // If the user can view other users
 if ($user->rights->user->user->lire) {
 	$moreforfilter .= '<div class="divsearchfield">';
 	$tmptitle = $langs->trans('LinkedToSpecificUsers');
-	$moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$form->select_dolusers($search_user, 'search_user', $tmptitle, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth250');
+	$moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$form->select_dolusers($search_user, 'search_user', $tmptitle, '', 0, '', '', 0, 0, 0, '', 0, '', 'widthcentpercentminusx maxwidth300');
 	$moreforfilter .= '</div>';
 }
 // If the user can view categories of products
@@ -511,7 +511,7 @@ if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire && ($use
 	$moreforfilter .= '<div class="divsearchfield">';
 	$tmptitle = $langs->trans('IncludingProductWithTag');
 	$cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, null, 'parent', null, null, 1);
-	$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$form->selectarray('search_product_category', $cate_arbo, $search_product_category, $tmptitle, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1);
+	$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$form->selectarray('search_product_category', $cate_arbo, $search_product_category, $tmptitle, 0, 0, '', 0, 0, 0, 0, 'widthcentpercentminusx maxwidth300', 1);
 	$moreforfilter .= '</div>';
 }
 
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index a0fa92ad207..110d80b45d1 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -847,7 +847,7 @@ class FormFile
 					}
 
 					// Show file name with link to download
-					$out .= '<td class="minwidth200">';
+					$out .= '<td class="minwidth200 tdoverflowmax300">';
 					$out .= '<a class="documentdownload paddingright" href="'.$documenturl.'?modulepart='.$modulepart.'&amp;file='.urlencode($relativepath).($param ? '&'.$param : '').'"';
 
 					$mime = dol_mimetype($relativepath, '', 0);
@@ -870,7 +870,7 @@ class FormFile
 					$out .= '<td class="nowrap right">'.dol_print_date($date, 'dayhour', 'tzuser').'</td>';
 
 					// Show share link
-					$out .= '<td class="nowrap">';
+					$out .= '<td class="nowraponall">';
 					if (!empty($file['share'])) {
 						// Define $urlwithroot
 						$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
@@ -890,7 +890,7 @@ class FormFile
 						$fulllink = $urlwithroot.'/document.php'.($paramlink ? '?'.$paramlink : '');
 
 						$out .= img_picto($langs->trans("FileSharedViaALink"), 'globe').' ';
-						$out .= '<input type="text" class="quatrevingtpercent width75" id="downloadlink'.$file['rowid'].'" name="downloadexternallink" title="'.dol_escape_htmltag($langs->trans("FileSharedViaALink")).'" value="'.dol_escape_htmltag($fulllink).'">';
+						$out .= '<input type="text" class="quatrevingtpercentminusx width75" id="downloadlink'.$file['rowid'].'" name="downloadexternallink" title="'.dol_escape_htmltag($langs->trans("FileSharedViaALink")).'" value="'.dol_escape_htmltag($fulllink).'">';
 						$out .= ajax_autoselect('downloadlink'.$file['rowid']);
 					} else {
 						//print '<span class="opacitymedium">'.$langs->trans("FileNotShared").'</span>';
diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index dc181f891b1..e181acd16e1 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -432,15 +432,15 @@ if ($nolinesbefore) {
 					<select id="fournprice_predef" name="fournprice_predef" class="flat minwidth75imp maxwidth150" style="display: none;"></select>
 				<?php } ?>
 				<!-- For free product -->
-				<input type="text" id="buying_price" name="buying_price" class="flat maxwidth75 maxwidth150 right" value="<?php echo (GETPOSTISSET("buying_price") ? GETPOST("buying_price", 'alpha', 2) : ''); ?>">
+				<input type="text" id="buying_price" name="buying_price" class="flat maxwidth75 right" value="<?php echo (GETPOSTISSET("buying_price") ? GETPOST("buying_price", 'alpha', 2) : ''); ?>">
 			</td>
 			<?php
 			if (!empty($conf->global->DISPLAY_MARGIN_RATES)) {
-				echo '<td class="nobottom nowrap margininfos right"><input class="flat right" type="text" size="2" id="np_marginRate" name="np_marginRate" value="'.(GETPOSTISSET("np_marginRate") ? GETPOST("np_marginRate", 'alpha', 2) : '').'"><span class="np_marginRate hideonsmartphone">%</span></td>';
+				echo '<td class="nobottom nowraponall margininfos right"><input class="flat right" type="text" size="2" id="np_marginRate" name="np_marginRate" value="'.(GETPOSTISSET("np_marginRate") ? GETPOST("np_marginRate", 'alpha', 2) : '').'"><span class="np_marginRate hideonsmartphone">%</span></td>';
 				$coldisplay++;
 			}
 			if (!empty($conf->global->DISPLAY_MARK_RATES)) {
-				echo '<td class="nobottom nowrap margininfos right"><input class="flat right" type="text" size="2" id="np_markRate" name="np_markRate" value="'.(GETPOSTISSET("np_markRate") ? GETPOST("np_markRate", 'alpha', 2) : '').'"><span class="np_markRate hideonsmartphone">%</span></td>';
+				echo '<td class="nobottom nowraponall margininfos right"><input class="flat right" type="text" size="2" id="np_markRate" name="np_markRate" value="'.(GETPOSTISSET("np_markRate") ? GETPOST("np_markRate", 'alpha', 2) : '').'"><span class="np_markRate hideonsmartphone">%</span></td>';
 				$coldisplay++;
 			}
 		}

From ccffb36a3795bc0a0ba53cc3ef5ab2e84c20bf5a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 26 Jun 2021 00:14:53 +0200
Subject: [PATCH 0888/1497] CSS

---
 htdocs/compta/facture/card-rec.php             | 2 +-
 htdocs/compta/facture/invoicetemplate_list.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/facture/card-rec.php b/htdocs/compta/facture/card-rec.php
index fb503ccac4d..dd4042b9e34 100644
--- a/htdocs/compta/facture/card-rec.php
+++ b/htdocs/compta/facture/card-rec.php
@@ -44,7 +44,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array('bills', 'compta', 'admin', 'other', 'products', 'banks'));
+$langs->loadLangs(array('bills', 'companies', 'compta', 'admin', 'other', 'products', 'banks'));
 
 $action     = GETPOST('action', 'alpha');
 $massaction = GETPOST('massaction', 'alpha');
diff --git a/htdocs/compta/facture/invoicetemplate_list.php b/htdocs/compta/facture/invoicetemplate_list.php
index c60690ce96b..d099bfd57bc 100644
--- a/htdocs/compta/facture/invoicetemplate_list.php
+++ b/htdocs/compta/facture/invoicetemplate_list.php
@@ -565,7 +565,7 @@ if ($resql) {
 			1=>$langs->trans("Active"),
 			-1=>$langs->trans("Disabled"),
 		);
-		print $form->selectarray('search_status', $liststatus, $search_status, -2);
+		print $form->selectarray('search_status', $liststatus, $search_status, -2, 0, 0, '', 0, 0, 0, '', 'width100');
 		print '</td>';
 	}
 	// Action column

From 12d591b8484289aff01d0fd2e3822baf527da511 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 26 Jun 2021 00:18:46 +0200
Subject: [PATCH 0889/1497] css

---
 htdocs/compta/facture/stats/index.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php
index 9b9630a5d5f..ca4d3d6ccaf 100644
--- a/htdocs/compta/facture/stats/index.php
+++ b/htdocs/compta/facture/stats/index.php
@@ -372,9 +372,9 @@ foreach ($data as $val) {
 		print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$oldyear.'&amp;mode='.$mode.($socid > 0 ? '&socid='.$socid : '').($userid > 0 ? '&userid='.$userid : '').'">'.$oldyear.'</a></td>';
 		print '<td class="right">0</td>';
 		print '<td class="right"></td>';
-		print '<td class="right">0</td>';
+		print '<td class="right amount">0</td>';
 		print '<td class="right"></td>';
-		print '<td class="right">0</td>';
+		print '<td class="right amount">0</td>';
 		print '<td class="right"></td>';
 		print '</tr>';
 	}

From 2fd47615ebc723037513d7c25768e4624aff801c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 26 Jun 2021 01:46:14 +0200
Subject: [PATCH 0890/1497] Fix load of conf when using alternative $db

---
 htdocs/core/class/conf.class.php | 2 +-
 htdocs/master.inc.php            | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 0eeed26b0e2..60ee78bbff5 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -173,7 +173,7 @@ class Conf
 	{
 		dol_syslog(get_class($this)."::setValues");
 
-		if (!defined('NOREQUIREDB')) {
+		if (!is_null($db) && is_object($db)) {
 			// Define all global constants into $this->global->key=value
 			$sql = "SELECT ".$db->decrypt('name')." as name,";
 			$sql .= " ".$db->decrypt('value')." as value, entity";
diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index a24b52859c4..e04adb4ee86 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -133,6 +133,7 @@ if (!defined('NOREQUIRETRAN')) {
 /*
  * Object $db
  */
+$db = null;
 if (!defined('NOREQUIREDB')) {
 	$db = getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf->db->pass, $conf->db->name, $conf->db->port);
 

From 720ea16bb1099feaec3a67a6b696b13e4f3bdc42 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 26 Jun 2021 02:00:30 +0200
Subject: [PATCH 0891/1497] css

---
 htdocs/main.inc.php              | 4 +---
 htdocs/theme/eldy/global.inc.php | 4 +++-
 htdocs/theme/md/style.css.php    | 4 ++++
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index d984080d442..6b15f8641cb 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1909,9 +1909,7 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 				}
 				$text .= '">';
 				$text .= '<span class="fa fa-question-circle atoplogin valignmiddle'.($helppresent ? ' '.$helppresent : '').'"></span>';
-				if ($helppresent) {
-					$text .= '<span class="fa fa-circle helppresentcircle"></span>';
-				}
+				$text .= '<span class="fa fa-circle helppresentcircle'.($helppresent ? '' : ' unvisible').'"></span>';
 				$text .= '</a>';
 				$toprightmenu .= $form->textwithtooltip('', $title, 2, 1, $text, 'login_block_elem', 2);
 			}
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 81859c3a2fd..89cb19c129b 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -4708,7 +4708,9 @@ div.visible {
 div.hidden, td.hidden, img.hidden, span.hidden, div.showifmore {
 	display: none;
 }
-
+.unvisible {
+	visibility: hidden;
+}
 tr.visible {
 	display: block;
 }
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index c8241cd6317..5ad564ea5c0 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -4648,6 +4648,10 @@ div.hidden, td.hidden, img.hidden, span.hidden, div.showifmore {
 	display: none;
 }
 
+.unvisible {
+	visibility: hidden;
+}
+
 tr.visible {
 	display: block;
 }

From bc816f253cb2893e87401dc0b2f2619e63b654cc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 26 Jun 2021 02:07:18 +0200
Subject: [PATCH 0892/1497] Fix tooltip

---
 htdocs/compta/accounting-files.php  | 6 +++++-
 htdocs/langs/en_US/accountancy.lang | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/accounting-files.php b/htdocs/compta/accounting-files.php
index fa42a73e656..2c94cea750c 100644
--- a/htdocs/compta/accounting-files.php
+++ b/htdocs/compta/accounting-files.php
@@ -547,7 +547,11 @@ print dol_get_fiche_head($head, 'AccountancyFiles');
 print '<form name="searchfiles" action="?action=searchfiles" method="POST">'."\n";
 print '<input type="hidden" name="token" value="'.newToken().'">';
 
-print '<span class="opacitymedium">'.$langs->trans("ExportAccountingSourceDocHelp", $langs->transnoentitiesnoconv("Accounting"), $langs->transnoentitiesnoconv("Journals")).'</span><br>';
+print '<span class="opacitymedium">'.$langs->trans("ExportAccountingSourceDocHelp");
+if (!empty($conf->accounting->enabled)) {
+	print ' '.$langs->trans("ExportAccountingSourceDocHelp2", $langs->transnoentitiesnoconv("Accounting"), $langs->transnoentitiesnoconv("Journals"));
+}
+print '</span><br>';
 print '<br>';
 
 print $langs->trans("ReportPeriod").': ';
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index 27be673dd9c..27a6b3337a4 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -48,7 +48,8 @@ CountriesNotInEEC=Countries not in EEC
 CountriesInEECExceptMe=Countries in EEC except %s
 CountriesExceptMe=All countries except %s
 AccountantFiles=Export source documents
-ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list in CSV and PDFs) that were used to generate your accountancy.
+ExportAccountingSourceDocHelp2=To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
 VueBySubAccountAccounting=View by accounting subaccount
 

From cc65e4bb380b4a20d13fc3b9835ab6892dfad2eb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 26 Jun 2021 12:00:25 +0200
Subject: [PATCH 0893/1497] FIX #18030

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

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 6b15f8641cb..93388190275 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -662,7 +662,7 @@ if (!defined('NOLOGIN')) {
 				// Hooks on failed login
 				$action = '';
 				$hookmanager->initHooks(array('login'));
-				$parameters = array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
+				$parameters = array('dol_authmode'=>$authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
 				$reshook = $hookmanager->executeHooks('afterLoginFailed', $parameters, $user, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
 					$error++;

From e62ed2870194414138b198da89ebc680efb3db3a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 26 Jun 2021 15:39:52 +0200
Subject: [PATCH 0894/1497] Debug v14

---
 htdocs/core/lib/project.lib.php               |  2 +-
 htdocs/core/menus/standard/eldy.lib.php       | 25 +++++++
 .../modules/modEventOrganization.class.php    |  2 +-
 .../modules/modKnowledgeManagement.class.php  | 67 ++++---------------
 htdocs/core/modules/modTicket.class.php       |  6 +-
 .../install/mysql/data/llx_c_ticket_type.sql  |  3 +-
 .../install/mysql/migration/13.0.0-14.0.0.sql |  3 +
 htdocs/knowledgemanagement/README.md          |  9 +++
 .../class/knowledgerecord.class.php           |  2 +-
 .../knowledgerecord_card.php                  |  2 +-
 htdocs/langs/en_US/knowledgemanagement.lang   | 10 +--
 htdocs/langs/en_US/ticket.lang                |  9 +--
 htdocs/projet/list.php                        | 17 ++++-
 htdocs/projet/tasks.php                       |  6 +-
 htdocs/projet/tasks/list.php                  |  6 +-
 htdocs/ticket/README.md                       |  2 +-
 htdocs/ticket/list.php                        | 26 +++++--
 17 files changed, 110 insertions(+), 87 deletions(-)
 create mode 100644 htdocs/knowledgemanagement/README.md

diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 9c33744ceb0..d20a0348d3d 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -681,7 +681,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 
 				// Title of task
 				if (count($arrayfields) > 0 && !empty($arrayfields['t.label']['checked'])) {
-					print "<td>";
+					print '<td>';
 					if ($showlineingray) {
 						print '<i>';
 					}
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 80ea1d5ea7b..90de417c767 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -382,6 +382,31 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 		'submenus' => array(),
 	);
 
+	// Tickets and knwoledge base
+	$tmpentry = array(
+		'enabled'=>(!empty($conf->ticket->enabled) || !empty($conf->knwoledgemanagement->enabled)),
+		'perms'=>(!empty($user->rights->ticket->read) || !empty($user->rights->knwoledgemanagement->read)),
+		'module'=>'ticket|knwoledgemanagement'
+	);
+	$menu_arr[] = array(
+		'name' => 'Ticket',
+		'link' => '/ticket/index.php?mainmenu=ticket&amp;leftmenu=',
+		'title' =>  "Tickets",
+		'level' => 0,
+		'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
+		'target' => $atarget,
+		'mainmenu' => "ticket",
+		'leftmenu' => '',
+		'position' => 88,
+		'id' => $id,
+		'idsel' => 'ticket',
+		'classname' =>  $classname = ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "ticket") ? 'class="tmenusel"' : 'class="tmenu"',
+		'prefix' => img_picto('', 'ticket', 'class="fa-fw paddingright"'),
+		'session' => (($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "ticket") ? 0 : 1),
+		'loadLangs' => array("other"),
+		'submenus' => array(),
+	);
+
 	// Tools
 	$tmpentry = array(
 		'enabled'=>1,
diff --git a/htdocs/core/modules/modEventOrganization.class.php b/htdocs/core/modules/modEventOrganization.class.php
index 3a81102f4bd..4ba73d4fe2c 100644
--- a/htdocs/core/modules/modEventOrganization.class.php
+++ b/htdocs/core/modules/modEventOrganization.class.php
@@ -268,7 +268,7 @@ class modEventOrganization extends DolibarrModules
 			'fk_menu'=>'fk_mainmenu=project,fk_leftmenu=eventorganization',	    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
 			'type'=>'left',			                // This is a Left menu entry
 			'titre'=>'List',
-			'url'=>'/projet/list.php?search_usage_event_organization=1&mainmenu=project&contextpage=organizedevents',
+			'url'=>'/projet/list.php?search_usage_event_organization=1&search_status=99&mainmenu=project&contextpage=organizedevents',
 			'langs'=>'eventorganization@eventorganization',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 			'position'=>1000+$r,
 			'enabled'=>'$conf->eventorganization->enabled',  // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
diff --git a/htdocs/core/modules/modKnowledgeManagement.class.php b/htdocs/core/modules/modKnowledgeManagement.class.php
index 504c363b648..14e5aabb681 100644
--- a/htdocs/core/modules/modKnowledgeManagement.class.php
+++ b/htdocs/core/modules/modKnowledgeManagement.class.php
@@ -261,17 +261,17 @@ class modKnowledgeManagement extends DolibarrModules
 		// Add here entries to declare new permissions
 		/* BEGIN MODULEBUILDER PERMISSIONS */
 		$this->rights[$r][0] = $this->numero + $r + 1; // Permission id (must not be already used)
-		$this->rights[$r][1] = 'Read objects of Knowledge Management'; // Permission label
+		$this->rights[$r][1] = 'Read articles'; // Permission label
 		$this->rights[$r][4] = 'knowledgerecord'; // In php code, permission will be checked by test if ($user->rights->knowledgemanagement->level1->level2)
 		$this->rights[$r][5] = 'read'; // In php code, permission will be checked by test if ($user->rights->knowledgemanagement->level1->level2)
 		$r++;
 		$this->rights[$r][0] = $this->numero + $r + 1; // Permission id (must not be already used)
-		$this->rights[$r][1] = 'Create/Update objects of Knowledge Management'; // Permission label
+		$this->rights[$r][1] = 'Create/Update articles'; // Permission label
 		$this->rights[$r][4] = 'knowledgerecord'; // In php code, permission will be checked by test if ($user->rights->knowledgemanagement->level1->level2)
 		$this->rights[$r][5] = 'write'; // In php code, permission will be checked by test if ($user->rights->knowledgemanagement->level1->level2)
 		$r++;
 		$this->rights[$r][0] = $this->numero + $r + 1; // Permission id (must not be already used)
-		$this->rights[$r][1] = 'Delete objects of Knowledge Management'; // Permission label
+		$this->rights[$r][1] = 'Delete articles'; // Permission label
 		$this->rights[$r][4] = 'knowledgerecord'; // In php code, permission will be checked by test if ($user->rights->knowledgemanagement->level1->level2)
 		$this->rights[$r][5] = 'delete'; // In php code, permission will be checked by test if ($user->rights->knowledgemanagement->level1->level2)
 		$r++;
@@ -282,6 +282,7 @@ class modKnowledgeManagement extends DolibarrModules
 		$r = 0;
 		// Add here entries to declare new menus
 		/* BEGIN MODULEBUILDER TOPMENU */
+		/*
 		$this->menu[$r++] = array(
 			'fk_menu'=>'', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
 			'type'=>'top', // This is a Top menu entry
@@ -297,60 +298,17 @@ class modKnowledgeManagement extends DolibarrModules
 			'target'=>'',
 			'user'=>2, // 0=Menu for internal users, 1=external users, 2=both
 		);
-		/* END MODULEBUILDER TOPMENU */
-		/* BEGIN MODULEBUILDER LEFTMENU KNOWLEDGERECORD
-		$this->menu[$r++]=array(
-			'fk_menu'=>'fk_mainmenu=knowledgemanagement',      // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-			'type'=>'left',                          // This is a Top menu entry
-			'titre'=>'KnowledgeRecord',
-			'prefix' => img_picto('', $this->picto, 'class="paddingright pictofixedwidth"'),
-			'mainmenu'=>'knowledgemanagement',
-			'leftmenu'=>'knowledgerecord',
-			'url'=>'/knowledgemanagement/knowledgemanagementindex.php',
-			'langs'=>'knowledgemanagement@knowledgemanagement',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-			'position'=>1000+$r,
-			'enabled'=>'$conf->knowledgemanagement->enabled',  // Define condition to show or hide menu entry. Use '$conf->knowledgemanagement->enabled' if entry must be visible if module is enabled.
-			'perms'=>'$user->rights->knowledgemanagement->knowledgerecord->read',			                // Use 'perms'=>'$user->rights->knowledgemanagement->level1->level2' if you want your menu with a permission rules
-			'target'=>'',
-			'user'=>2,				                // 0=Menu for internal users, 1=external users, 2=both
-		);
-		$this->menu[$r++]=array(
-			'fk_menu'=>'fk_mainmenu=knowledgemanagement,fk_leftmenu=knowledgerecord',	    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-			'type'=>'left',			                // This is a Left menu entry
-			'titre'=>'List_KnowledgeRecord',
-			'mainmenu'=>'knowledgemanagement',
-			'leftmenu'=>'knowledgemanagement_knowledgerecord_list',
-			'url'=>'/knowledgemanagement/knowledgerecord_list.php',
-			'langs'=>'knowledgemanagement@knowledgemanagement',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-			'position'=>1000+$r,
-			'enabled'=>'$conf->knowledgemanagement->enabled',  // Define condition to show or hide menu entry. Use '$conf->knowledgemanagement->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-			'perms'=>'$user->rights->knowledgemanagement->knowledgerecord->read',			                // Use 'perms'=>'$user->rights->knowledgemanagement->level1->level2' if you want your menu with a permission rules
-			'target'=>'',
-			'user'=>2,				                // 0=Menu for internal users, 1=external users, 2=both
-		);
-		$this->menu[$r++]=array(
-			'fk_menu'=>'fk_mainmenu=knowledgemanagement,fk_leftmenu=knowledgerecord',	    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-			'type'=>'left',			                // This is a Left menu entry
-			'titre'=>'New_KnowledgeRecord',
-			'mainmenu'=>'knowledgemanagement',
-			'leftmenu'=>'knowledgemanagement_knowledgerecord_new',
-			'url'=>'/knowledgemanagement/knowledgerecord_card.php?action=create',
-			'langs'=>'knowledgemanagement@knowledgemanagement',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-			'position'=>1000+$r,
-			'enabled'=>'$conf->knowledgemanagement->enabled',  // Define condition to show or hide menu entry. Use '$conf->knowledgemanagement->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-			'perms'=>'$user->rights->knowledgemanagement->knowledgerecord->write',			                // Use 'perms'=>'$user->rights->knowledgemanagement->level1->level2' if you want your menu with a permission rules
-			'target'=>'',
-			'user'=>2,				                // 0=Menu for internal users, 1=external users, 2=both
-		);
 		*/
+		/* END MODULEBUILDER TOPMENU */
 
 		$this->menu[$r++]=array(
 			// '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-			'fk_menu'=>'fk_mainmenu=knowledgemanagement',
+			'fk_menu'=>'fk_mainmenu=ticket',
 			// This is a Left menu entry
 			'type'=>'left',
 			'titre'=>'MenuKnowledgeRecord',
-			'mainmenu'=>'knowledgemanagement',
+			'prefix' => img_picto('', $this->picto, 'class="paddingright pictofixedwidth em092"'),
+			'mainmenu'=>'ticket',
 			'leftmenu'=>'knowledgemanagement_knowledgerecord',
 			'url'=>'/knowledgemanagement/knowledgerecord_list.php',
 			// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
@@ -366,11 +324,11 @@ class modKnowledgeManagement extends DolibarrModules
 		);
 		$this->menu[$r++]=array(
 			// '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-			'fk_menu'=>'fk_mainmenu=knowledgemanagement,fk_leftmenu=knowledgemanagement_knowledgerecord',
+			'fk_menu'=>'fk_mainmenu=ticket,fk_leftmenu=knowledgemanagement_knowledgerecord',
 			// This is a Left menu entry
 			'type'=>'left',
 			'titre'=>'ListKnowledgeRecord',
-			'mainmenu'=>'knowledgemanagement',
+			'mainmenu'=>'ticket',
 			'leftmenu'=>'knowledgemanagement_list',
 			'url'=>'/knowledgemanagement/knowledgerecord_list.php',
 			// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
@@ -386,11 +344,11 @@ class modKnowledgeManagement extends DolibarrModules
 		);
 		$this->menu[$r++]=array(
 			// '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-			'fk_menu'=>'fk_mainmenu=knowledgemanagement,fk_leftmenu=knowledgemanagement_knowledgerecord',
+			'fk_menu'=>'fk_mainmenu=ticket,fk_leftmenu=knowledgemanagement_knowledgerecord',
 			// This is a Left menu entry
 			'type'=>'left',
 			'titre'=>'NewKnowledgeRecord',
-			'mainmenu'=>'knowledgemanagement',
+			'mainmenu'=>'ticket',
 			'leftmenu'=>'knowledgemanagement_new',
 			'url'=>'/knowledgemanagement/knowledgerecord_card.php?action=create',
 			// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
@@ -406,6 +364,7 @@ class modKnowledgeManagement extends DolibarrModules
 		);
 
 		/* END MODULEBUILDER LEFTMENU KNOWLEDGERECORD */
+
 		// Exports profiles provided by this module
 		$r = 1;
 		/* BEGIN MODULEBUILDER EXPORT KNOWLEDGERECORD */
diff --git a/htdocs/core/modules/modTicket.class.php b/htdocs/core/modules/modTicket.class.php
index b374000c74c..8b1a1dc8525 100644
--- a/htdocs/core/modules/modTicket.class.php
+++ b/htdocs/core/modules/modTicket.class.php
@@ -200,7 +200,7 @@ class modTicket extends DolibarrModules
 		$this->menus = array(); // List of menus to add
 		$r = 0;
 
-		$this->menu[$r] = array('fk_menu' => 0, // Put 0 if this is a top menu
+		/*$this->menu[$r] = array('fk_menu' => 0, // Put 0 if this is a top menu
 			'type' => 'top', // This is a Top menu entry
 			'titre' => 'Ticket',
 			'prefix' => img_picto('', $this->picto, 'class="paddingright pictofixedwidth em092"'),
@@ -209,11 +209,11 @@ class modTicket extends DolibarrModules
 			'url' => '/ticket/index.php',
 			'langs' => 'ticket', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 			'position' => 88,
-			'enabled' => '$conf->ticket->enabled', // Define condition to show or hide menu entry. Use '$conf->ticket->enabled' if entry must be visible if module is enabled.
+			'enabled' => '$conf->ticket->enabled',
 			'perms' => '$user->rights->ticket->read', // Use 'perms'=>'$user->rights->ticket->level1->level2' if you want your menu with a permission rules
 			'target' => '',
 			'user' => 2); // 0=Menu for internal users, 1=external users, 2=both
-		$r++;
+		$r++;*/
 
 		$this->menu[$r] = array('fk_menu' => 'fk_mainmenu=ticket',
 			'type' => 'left',
diff --git a/htdocs/install/mysql/data/llx_c_ticket_type.sql b/htdocs/install/mysql/data/llx_c_ticket_type.sql
index 660f1444b43..3b6fda322ad 100644
--- a/htdocs/install/mysql/data/llx_c_ticket_type.sql
+++ b/htdocs/install/mysql/data/llx_c_ticket_type.sql
@@ -19,7 +19,8 @@
 
 INSERT INTO llx_c_ticket_type (code, pos, label, active, use_default, description) VALUES('COM',     '10', 'Commercial question',           1, 0, NULL);
 INSERT INTO llx_c_ticket_type (code, pos, label, active, use_default, description) VALUES('HELP',    '15', 'Request for functionnal help',  1, 0, NULL);
-INSERT INTO llx_c_ticket_type (code, pos, label, active, use_default, description) VALUES('ISSUE',   '20', 'Issue or problem',              1, 0, NULL);
+INSERT INTO llx_c_ticket_type (code, pos, label, active, use_default, description) VALUES('ISSUE',   '20', 'Issue or bug',                  1, 0, NULL);
+INSERT INTO llx_c_ticket_type (code, pos, label, active, use_default, description) VALUES('PROBLEM', '22', 'Problem',                       0, 0, NULL);
 INSERT INTO llx_c_ticket_type (code, pos, label, active, use_default, description) VALUES('REQUEST', '25', 'Change or enhancement request', 1, 0, NULL);
 INSERT INTO llx_c_ticket_type (code, pos, label, active, use_default, description) VALUES('PROJECT', '30', 'Project',                       0, 0, NULL);
 INSERT INTO llx_c_ticket_type (code, pos, label, active, use_default, description) VALUES('OTHER',   '40', 'Other',                         1, 0, NULL);
diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index ade8f867160..a01f589aa20 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -86,6 +86,9 @@ DELETE FROM llx_user_param where param = 'MAIN_THEME' and value in ('auguria', '
 
 -- For v14
 
+UPDATE llx_c_ticket_type set label = 'Issue or bug' WHERE code = 'ISSUE';
+INSERT INTO llx_c_ticket_type (code, pos, label, active, use_default, description) VALUES('PROBLEM', '22', 'Problem', 0, 0, NULL);
+
 ALTER TABLE llx_import_model MODIFY COLUMN type varchar(64);
 ALTER TABLE llx_export_model MODIFY COLUMN type varchar(64);
 
diff --git a/htdocs/knowledgemanagement/README.md b/htdocs/knowledgemanagement/README.md
new file mode 100644
index 00000000000..406e9032154
--- /dev/null
+++ b/htdocs/knowledgemanagement/README.md
@@ -0,0 +1,9 @@
+Knowledge Management base
+=========================
+
+
+A complete knowledge database inside your application.
+Store, search and retreive any article to keep your knowledge into a database. It can be used to manage a list of FAQ, or a database
+of process, or solutions of common problems.
+ 
+If you are using the Ticket module, you can also link each article of your knowledge management database to the main  
diff --git a/htdocs/knowledgemanagement/class/knowledgerecord.class.php b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
index 872c5289c61..550ef976aba 100644
--- a/htdocs/knowledgemanagement/class/knowledgerecord.class.php
+++ b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
@@ -113,7 +113,7 @@ class KnowledgeRecord extends CommonObject
 		'question' => array('type'=>'text', 'label'=>'Question', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1, 'csslist'=>'tdoverflow300'),
 		'answer' => array('type'=>'html', 'label'=>'Solution', 'enabled'=>'1', 'position'=>50, 'notnull'=>0, 'visible'=>3, 'csslist'=>'tdoverflow300'),
 		//'url' => array('type'=>'varchar(255)', 'label'=>'URL', 'enabled'=>'1', 'position'=>55, 'notnull'=>0, 'visible'=>-1, 'csslist'=>'tdoverflow200', 'help'=>'UrlForInfoPage'),
-		'fk_c_ticket_category' => array('type'=>'integer:CTicketCategory:ticket/class/cticketcategory.class.php', 'label'=>'TicketGroup', 'enabled'=>'$conf->ticket->enabled', 'position'=>512, 'notnull'=>0, 'visible'=>-1, 'help'=>'YouCanLinkArticleToATicketCategory'),
+		'fk_c_ticket_category' => array('type'=>'integer:CTicketCategory:ticket/class/cticketcategory.class.php', 'label'=>'GroupOfTicket', 'enabled'=>'$conf->ticket->enabled', 'position'=>512, 'notnull'=>0, 'visible'=>-1, 'help'=>'YouCanLinkArticleToATicketCategory'),
 		'status' => array('type'=>'integer', 'label'=>'Status', 'enabled'=>'1', 'position'=>1000, 'notnull'=>1, 'visible'=>1, 'default'=>0, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Draft', '1'=>'Valid'),),
 	);
 	public $rowid;
diff --git a/htdocs/knowledgemanagement/knowledgerecord_card.php b/htdocs/knowledgemanagement/knowledgerecord_card.php
index c96319eb022..dbab7ec0528 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_card.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_card.php
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/knowledgemanagement/class/knowledgerecord.class
 require_once DOL_DOCUMENT_ROOT.'/knowledgemanagement/lib/knowledgemanagement_knowledgerecord.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("knowledgemanagement", "other"));
+$langs->loadLangs(array("knowledgemanagement", "ticket", "other"));
 
 // Get parameters
 $id = GETPOST('id', 'int');
diff --git a/htdocs/langs/en_US/knowledgemanagement.lang b/htdocs/langs/en_US/knowledgemanagement.lang
index 68f5cced76c..757ab01fc35 100644
--- a/htdocs/langs/en_US/knowledgemanagement.lang
+++ b/htdocs/langs/en_US/knowledgemanagement.lang
@@ -37,15 +37,7 @@ About = About
 KnowledgeManagementAbout = About Knowledge Management
 KnowledgeManagementAboutPage = Knowledge Management about page
 
-#
-# Sample page
-#
 KnowledgeManagementArea = Knowledge Management
-
-
-#
-# Menu
-#
 MenuKnowledgeRecord = Knowledge base
 ListKnowledgeRecord = List of articles
 NewKnowledgeRecord = New article
@@ -53,3 +45,5 @@ ValidateReply = Validate solution
 KnowledgeRecords = Articles
 KnowledgeRecord = Article
 KnowledgeRecordExtraFields = Extrafields for Article
+GroupOfTicket=Group of tickets
+YouCanLinkArticleToATicketCategory=You can link an article to a ticket group (so the article will be suggested during qualification of new tickets)
\ No newline at end of file
diff --git a/htdocs/langs/en_US/ticket.lang b/htdocs/langs/en_US/ticket.lang
index 0f87504a0a5..a039ee1b38b 100644
--- a/htdocs/langs/en_US/ticket.lang
+++ b/htdocs/langs/en_US/ticket.lang
@@ -34,7 +34,8 @@ TicketDictResolution=Ticket - Resolution
 
 TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
-TicketTypeShortISSUE=Issue, bug or problem
+TicketTypeShortISSUE=Issue or bug
+TicketTypeShortPROBLEM=Problem
 TicketTypeShortREQUEST=Change or enhancement request
 TicketTypeShortPROJET=Project
 TicketTypeShortOTHER=Other
@@ -54,14 +55,14 @@ TypeContact_ticket_internal_SUPPORTTEC=Assigned user
 TypeContact_ticket_external_SUPPORTCLI=Customer contact / incident tracking
 TypeContact_ticket_external_CONTRIBUTOR=External contributor
 
-OriginEmail=Email source
+OriginEmail=Email reporter
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
 Read=Read
 Assigned=Assigned
 InProgress=In progress
-NeedMoreInformation=Waiting for information
+NeedMoreInformation=Waiting for customer feedback
 Answered=Answered
 Waiting=Waiting
 Closed=Closed
@@ -160,7 +161,7 @@ CreatedBy=Created by
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Group
+TicketCategory=Ticket categorization
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index cd532ecd048..39a47e969a8 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -174,16 +174,28 @@ foreach ($object->fields as $key => $val) {
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
 
-// Add none object fields to fields for list
+// Add non object fields to fields for list
 $arrayfields['s.nom'] = array('label'=>$langs->trans("ThirdParty"), 'checked'=>1, 'position'=>21, 'enabled'=>(empty($conf->societe->enabled) ? 0 : 1));
 $arrayfields['commercial'] = array('label'=>$langs->trans("SaleRepresentativesOfThirdParty"), 'checked'=>0, 'position'=>23);
 $arrayfields['opp_weighted_amount'] = array('label'=>$langs->trans('OpportunityWeightedAmountShort'), 'checked'=>0, 'position'=> 116, 'enabled'=>(empty($conf->global->PROJECT_USE_OPPORTUNITIES) ? 0 : 1), 'position'=>106);
+// Force some fields according to search_usage filter...
+if (GETPOST('search_usage_opportunity')) {
+	//$arrayfields['p.usage_opportunity']['visible'] = 1;	// Not require, filter on search_opp_status is enough
+	//$arrayfields['p.usage_opportunity']['checked'] = 1;	// Not require, filter on search_opp_status is enough
+}
+if (GETPOST('search_usage_event_organization')) {
+	$arrayfields['p.fk_opp_status']['enabled'] = 0;
+	$arrayfields['p.opp_amount']['enabled'] = 0;
+	$arrayfields['p.opp_percent']['enabled'] = 0;
+	$arrayfields['opp_weighted_amount']['enabled'] = 0;
+	$arrayfields['p.usage_organize_event']['visible'] = 1;
+	$arrayfields['p.usage_organize_event']['checked'] = 1;
+}
 
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
 
-
 /*
  * Actions
  */
@@ -720,6 +732,7 @@ $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
+
 print '<div class="div-table-responsive">';
 print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index df4a94b6dfd..9de05d67e29 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -614,22 +614,24 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 	print '<input type="hidden" name="taskref" value="'.(GETPOSTISSET("ref") ? GETPOST("ref", 'alpha') : $defaultref).'">';
 	print '</td></tr>';
 
+	// Label
 	print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td>';
 	print '<input type="text" name="label" autofocus class="minwidth500 maxwidthonsmartphone" value="'.$label.'">';
 	print '</td></tr>';
 
-	// List of projects
+	// Project
 	print '<tr><td class="fieldrequired">'.$langs->trans("ChildOfProjectTask").'</td><td>';
 	print img_picto('', 'project');
 	$formother->selectProjectTasks(GETPOST('task_parent'), $projectid ? $projectid : $object->id, 'task_parent', 0, 0, 1, 1, 0, '0,1', 'maxwidth500');
 	print '</td></tr>';
 
+	// Assigned to
 	print '<tr><td>'.$langs->trans("AffectedTo").'</td><td>';
 	$contactsofproject = (!empty($object->id) ? $object->getListContactId('internal') : '');
 	if (is_array($contactsofproject) && count($contactsofproject)) {
 		print $form->select_dolusers($user->id, 'userid', 0, '', 0, '', $contactsofproject, 0, 0, 0, '', 0, '', 'maxwidth300');
 	} else {
-		print $langs->trans("NoUserAssignedToTheProject");
+		print '<span class="opacitymedium">'.$langs->trans("NoUserAssignedToTheProject").'</span>';
 	}
 	print '</td></tr>';
 
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index bbb7b1e51f9..d053866fd62 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -878,8 +878,8 @@ while ($i < min($num, $limit)) {
 		}
 		// Label
 		if (!empty($arrayfields['t.label']['checked'])) {
-			print '<td>';
-			print $object->label;
+			print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($object->label).'">';
+			print dol_escape_htmltag($object->label);
 			print '</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;
@@ -888,7 +888,7 @@ while ($i < min($num, $limit)) {
 		// Description
 		if (!empty($arrayfields['t.description']['checked'])) {
 			print '<td>';
-			print $object->description;
+			print dol_escape_htmltag($object->description);
 			print '</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;
diff --git a/htdocs/ticket/README.md b/htdocs/ticket/README.md
index e4c9b49f6b3..ee91036a0be 100644
--- a/htdocs/ticket/README.md
+++ b/htdocs/ticket/README.md
@@ -6,5 +6,5 @@ An issue tracker that provides a delicate balance between simplicity and power a
 Offer your customers an easy to use interface to report and follow status of their issue. Manage your issues from
 your backoffice.
  
+By enabling the Email Collector module, you can also having your ticket created automatically from input emails.
 
-(c) The development of this module has been initiated by the company <a href="https://librethic.io">Libr&thic</a> and is now part of Dolibarr ERP CRM core.
diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php
index 42445ce1701..3cefec17686 100644
--- a/htdocs/ticket/list.php
+++ b/htdocs/ticket/list.php
@@ -45,7 +45,7 @@ $show_files = GETPOST('show_files', 'int'); // Show files area generated by bulk
 $confirm    = GETPOST('confirm', 'alpha'); // Result of a confirmation
 $cancel     = GETPOST('cancel', 'alpha'); // We click on a Cancel button
 $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'ticketlist'; // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'tickep#selectedfieldstlist'; // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
 $optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 
@@ -314,8 +314,7 @@ $formTicket = new FormTicket($db);
 
 $now = dol_now();
 
-$user_assign = new User($db);
-$user_create = new User($db);
+$user_temp = new User($db);
 $socstatic = new Societe($db);
 
 $help_url = '';
@@ -973,8 +972,25 @@ while ($i < min($num, $limit)) {
 				print dol_print_date($db->jdate($obj->$key), 'dayhour', 'tzuser');
 			} elseif ($key == 'fk_user_create') {
 				if ($object->fk_user_create > 0) {
-					$user_create->fetch($object->fk_user_create);
-					print $user_create->getNomUrl(-1);
+					if (isset($conf->cache['user'][$object->fk_user_create])) {
+						$user_temp = $conf->cache['user'][$object->fk_user_create];
+					} else {
+						$user_temp = new User($db);
+						$user_temp->fetch($object->fk_user_create);
+						$conf->cache['user'][$object->fk_user_create] = $user_temp;
+					}
+					print $user_temp->getNomUrl(-1);
+				}
+			} elseif ($key == 'fk_user_assign') {
+				if ($object->fk_user_assign > 0) {
+					if (isset($conf->cache['user'][$object->fk_user_assign])) {
+						$user_temp = $conf->cache['user'][$object->fk_user_assign];
+					} else {
+						$user_temp = new User($db);
+						$user_temp->fetch($object->fk_user_assign);
+						$conf->cache['user'][$object->fk_user_assign] = $user_temp;
+					}
+					print $user_temp->getNomUrl(-1);
 				}
 			} elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
 				print $object->showOutputField($val, $key, $db->jdate($obj->$key), '');

From bbc6b9aa1bed3e00370b23bb34fb1d7e1bd50048 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 26 Jun 2021 16:10:56 +0200
Subject: [PATCH 0895/1497] Look and feel v14

---
 htdocs/core/lib/agenda.lib.php       |  4 +++-
 htdocs/core/lib/functions.lib.php    |  4 ++--
 htdocs/core/lib/ticket.lib.php       |  6 +++---
 htdocs/langs/en_US/ticket.lang       |  4 +++-
 htdocs/ticket/card.php               | 15 ++++++++-------
 htdocs/ticket/class/ticket.class.php |  2 +-
 6 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php
index 0e5e8538c25..ae96f59d407 100644
--- a/htdocs/core/lib/agenda.lib.php
+++ b/htdocs/core/lib/agenda.lib.php
@@ -71,8 +71,9 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
 
 	if ($canedit) {
 		print '<div class="divsearchfield">';
+
 		// Type
-		print '<span class="fas fa-square inline-block fawidth30" style=" color: #ddd;" title="'.$langs->trans("Type").'"></span>';
+		print '<span class="fas fa-square inline-block fawidth30" style=" color: #ddd;" title="'.$langs->trans("ActionType").'"></span>';
 		$multiselect = 0;
 		if (!empty($conf->global->MAIN_ENABLE_MULTISELECT_TYPE)) {     // We use an option here because it adds bugs when used on agenda page "peruser" and "list"
 			$multiselect = (!empty($conf->global->AGENDA_USE_EVENT_TYPE));
@@ -85,6 +86,7 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
 		print img_picto($langs->trans("ActionsToDoBy"), 'user', 'class="fawidth30 inline-block"');
 		print $form->select_dolusers($filtert, 'search_filtert', 1, '', !$canedit, '', '', 0, 0, 0, '', 0, '', 'minwidth150 maxwidth500 widthcentpercentminusxx');
 		print '</div>';
+
 		// Assigned to user group
 		print '<div class="divsearchfield">';
 		print img_picto($langs->trans("ToUserOfGroup"), 'object_group', 'class="fawidth30 inline-block"');
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 915282ed0d8..12857823b80 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1739,10 +1739,10 @@ function dol_get_fiche_end($notab = 0)
  *  @param	int		$shownav	  	Show Condition (navigation is shown if value is 1)
  *  @param	string	$fieldid   		Nom du champ en base a utiliser pour select next et previous (we make the select max and min on this field). Use 'none' for no prev/next search.
  *  @param	string	$fieldref   	Nom du champ objet ref (object->ref) a utiliser pour select next et previous
- *  @param	string	$morehtmlref  	More html to show after ref
+ *  @param	string	$morehtmlref  	More html to show after the ref (see $morehtmlleft for before)
  *  @param	string	$moreparam  	More param to add in nav link url.
  *	@param	int		$nodbprefix		Do not include DB prefix to forge table name
- *	@param	string	$morehtmlleft	More html code to show before ref
+ *	@param	string	$morehtmlleft	More html code to show before the ref (see $morehtmlref for after)
  *	@param	string	$morehtmlstatus	More html code to show under navigation arrows
  *  @param  int     $onlybanner     Put this to 1, if the card will contains only a banner (this add css 'arearefnobottom' on div)
  *	@param	string	$morehtmlright	More html code to show before navigation arrows
diff --git a/htdocs/core/lib/ticket.lib.php b/htdocs/core/lib/ticket.lib.php
index 43e12c9c490..863131572b9 100644
--- a/htdocs/core/lib/ticket.lib.php
+++ b/htdocs/core/lib/ticket.lib.php
@@ -601,15 +601,15 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
 
 		$out .= '<tr class="liste_titre">';
 
-		//$out.='<td class="liste_titre">';
 		$out .= getTitleFieldOfList('Date', 0, $_SERVER["PHP_SELF"], 'a.datep', '', $param, '', $sortfield, $sortorder, '')."\n";
-		//$out.='</td>';
 
 		$out .= '<th class="liste_titre"><strong class="hideonsmartphone">'.$langs->trans("Search").' : </strong></th>';
 		if ($donetodo) {
 			$out .= '<th class="liste_titre"></th>';
 		}
-		$out .= '<th class="liste_titre">'.$langs->trans("Type").' ';
+		$out .= '<th class="liste_titre">';
+		$out .= '<span class="fas fa-square inline-block fawidth30" style=" color: #ddd;" title="'.$langs->trans("ActionType").'"></span>';
+		//$out .= img_picto($langs->trans("Type"), 'type');
 		$out .= $formactions->select_type_actions($actioncode, "actioncode", '', empty($conf->global->AGENDA_USE_EVENT_TYPE) ? 1 : -1, 0, 0, 1, 'minwidth200imp');
 		$out .= '</th>';
 		$out .= '<th class="liste_titre maxwidth100onsmartphone">';
diff --git a/htdocs/langs/en_US/ticket.lang b/htdocs/langs/en_US/ticket.lang
index a039ee1b38b..eea045bdc89 100644
--- a/htdocs/langs/en_US/ticket.lang
+++ b/htdocs/langs/en_US/ticket.lang
@@ -62,7 +62,8 @@ Notify_TICKET_SENTBYMAIL=Send ticket message by email
 Read=Read
 Assigned=Assigned
 InProgress=In progress
-NeedMoreInformation=Waiting for customer feedback
+NeedMoreInformation=Waiting for reporter feedback
+NeedMoreInformationShort=Waiting for feedback
 Answered=Answered
 Waiting=Waiting
 Closed=Closed
@@ -212,6 +213,7 @@ TicketMessageHelp=Only this text will be saved in the message list on ticket car
 TicketMessageSubstitutionReplacedByGenericValues=Substitutions variables are replaced by generic values.
 TimeElapsedSince=Time elapsed since
 TicketTimeToRead=Time elapsed before read
+TicketTimeElapsedBeforeSince=Time elapsed before / since
 TicketContacts=Contacts ticket
 TicketDocumentsLinked=Documents linked to ticket
 ConfirmReOpenTicket=Confirm reopen this ticket ?
diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index 1831a4078c5..5aeed2c4587 100644
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -874,10 +874,11 @@ if ($action == 'create' || $action == 'presend') {
 			$langs->load("users");
 			$fuser = new User($db);
 			$fuser->fetch($object->fk_user_create);
-			$morehtmlref .= $fuser->getNomUrl(0);
+			$morehtmlref .= $fuser->getNomUrl(-1);
 		}
 		if (!empty($object->origin_email)) {
 			$morehtmlref .= '<br>'.$langs->trans("CreatedBy").' : ';
+			$morehtmlref .= img_picto('', 'email', 'class="paddingrightonly"');
 			$morehtmlref .= dol_escape_htmltag($object->origin_email).' <small>('.$langs->trans("TicketEmailOriginIssuer").')</small>';
 		}
 
@@ -968,8 +969,8 @@ if ($action == 'create' || $action == 'presend') {
 		print '<tr><td>'.$langs->trans("TicketReadOn").'</td><td>';
 		if (!empty($object->date_read)) {
 			print dol_print_date($object->date_read, 'dayhour', 'tzuser');
-			print '<span class="opacitymedium"> - '.$langs->trans("TicketTimeToRead").': <i>'.convertSecondToTime(roundUpToNextMultiple($object->date_read - $object->datec, 60)).'</i>';
-			print ' - '.$langs->trans("TimeElapsedSince").': <i>'.convertSecondToTime(roundUpToNextMultiple($now - $object->date_read, 60)).'</i></span>';
+			print '<span class="opacitymedium"> - '.$langs->trans("TicketTimeElapsedBeforeSince").': <i>'.convertSecondToTime(roundUpToNextMultiple($object->date_read - $object->datec, 60)).'</i>';
+			print ' / <i>'.convertSecondToTime(roundUpToNextMultiple($now - $object->date_read, 60)).'</i></span>';
 		}
 		print '</td></tr>';
 
@@ -991,7 +992,7 @@ if ($action == 'create' || $action == 'presend') {
 		print '</td><td>';
 		if ($object->fk_user_assign > 0) {
 			$userstat->fetch($object->fk_user_assign);
-			print $userstat->getNomUrl(1);
+			print $userstat->getNomUrl(-1);
 		}
 
 		// Show user list to assignate one if status is "read"
@@ -1183,7 +1184,7 @@ if ($action == 'create' || $action == 'presend') {
 
 					if ($tab[$i]['socid'] > 0) {
 						$companystatic->fetch($tab[$i]['socid']);
-						echo $companystatic->getNomUrl(1);
+						echo $companystatic->getNomUrl(-1);
 					}
 					if ($tab[$i]['socid'] < 0) {
 						echo $conf->global->MAIN_INFO_SOCIETE_NOM;
@@ -1196,12 +1197,12 @@ if ($action == 'create' || $action == 'presend') {
 					print '<div class="tagtd">';
 					if ($tab[$i]['source'] == 'internal') {
 						if ($userstatic->fetch($tab[$i]['id'])) {
-							print $userstatic->getNomUrl(1);
+							print $userstatic->getNomUrl(-1);
 						}
 					}
 					if ($tab[$i]['source'] == 'external') {
 						if ($contactstatic->fetch($tab[$i]['id'])) {
-							print $contactstatic->getNomUrl(1);
+							print $contactstatic->getNomUrl(-1);
 						}
 					}
 					print ' </div>
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index 42b04640def..89f239db6c6 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -294,7 +294,7 @@ class Ticket extends CommonObject
 			self::STATUS_ASSIGNED => 'Assigned',
 			self::STATUS_IN_PROGRESS => 'InProgress',
 			self::STATUS_WAITING => 'OnHold',
-			self::STATUS_NEED_MORE_INFO => 'NeedMoreInformation',
+			self::STATUS_NEED_MORE_INFO => 'NeedMoreInformationShort',
 			self::STATUS_CLOSED => 'Closed',
 			self::STATUS_CANCELED => 'Canceled'
 		);

From b051f6e2d1d670bdf77baa562aec1d425b23bb6f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 26 Jun 2021 16:13:39 +0200
Subject: [PATCH 0896/1497] CSS

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

diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index 5aeed2c4587..e2409c1fe5c 100644
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -879,7 +879,7 @@ if ($action == 'create' || $action == 'presend') {
 		if (!empty($object->origin_email)) {
 			$morehtmlref .= '<br>'.$langs->trans("CreatedBy").' : ';
 			$morehtmlref .= img_picto('', 'email', 'class="paddingrightonly"');
-			$morehtmlref .= dol_escape_htmltag($object->origin_email).' <small>('.$langs->trans("TicketEmailOriginIssuer").')</small>';
+			$morehtmlref .= dol_escape_htmltag($object->origin_email).' <small class="hideonsmartphone opacitymedium">('.$langs->trans("TicketEmailOriginIssuer").')</small>';
 		}
 
 		// Thirdparty

From 4ff2ff779b3cff39b69c19185a832b6e8e8be089 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 26 Jun 2021 16:35:33 +0200
Subject: [PATCH 0897/1497] css

---
 htdocs/core/lib/ticket.lib.php | 2 +-
 htdocs/ticket/card.php         | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/ticket.lib.php b/htdocs/core/lib/ticket.lib.php
index 863131572b9..f2a6194ab06 100644
--- a/htdocs/core/lib/ticket.lib.php
+++ b/htdocs/core/lib/ticket.lib.php
@@ -163,7 +163,7 @@ function showDirectPublicLink($object)
 		$out .= img_picto('', 'object_globe.png').' <span class="opacitymedium">'.$langs->trans("TicketPublicAccess").'</span><br>';
 		if ($url) {
 			$out .= '<div class="urllink">';
-			$out .= '<input type="text" id="directpubliclink" class="quatrevingtpercent" value="'.$url.'">';
+			$out .= '<input type="text" id="directpubliclink" class="quatrevingtpercentminusx" value="'.$url.'">';
 			$out .= '<a href="'.$url.'" target="_blank" rel="noopener">'.img_picto('', 'object_globe.png', 'class="paddingleft"').'</a>';
 			$out .= '</div>';
 			$out .= ajax_autoselect("directpubliclink", 0);
diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index e2409c1fe5c..5faa7b201b7 100644
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -1461,9 +1461,11 @@ if ($action == 'create' || $action == 'presend') {
 
 				$MAXEVENT = 10;
 
-				$morehtmlcenter = dolGetButtonTitle($langs->trans('FullConversation'), '', 'fa fa-comments imgforviewmode', DOL_URL_ROOT.'/ticket/messaging.php?id='.$object->id);
+				$morehtmlcenter = '<div class="nowraponall">';
+				$morehtmlcenter .= dolGetButtonTitle($langs->trans('FullConversation'), '', 'fa fa-comments imgforviewmode', DOL_URL_ROOT.'/ticket/messaging.php?id='.$object->id);
 				$morehtmlcenter .= ' ';
 				$morehtmlcenter .= dolGetButtonTitle($langs->trans('FullList'), '', 'fa fa-list-alt imgforviewmode', DOL_URL_ROOT.'/ticket/agenda.php?id='.$object->id);
+				$morehtmlcenter .= '</div>';
 
 				// List of actions on element
 				include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';

From 4b8f2f42b9736e61175b207bdf351e08f25be278 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 26 Jun 2021 16:42:35 +0200
Subject: [PATCH 0898/1497] Lookd and feel v14

---
 .../knowledgerecord_list.php                  | 35 ++++++++++++++++++-
 htdocs/ticket/list.php                        |  8 ++---
 2 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/htdocs/knowledgemanagement/knowledgerecord_list.php b/htdocs/knowledgemanagement/knowledgerecord_list.php
index 87be91f51f6..efaf99b63a9 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_list.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_list.php
@@ -196,6 +196,7 @@ if (empty($reshook)) {
  */
 
 $form = new Form($db);
+$user_temp = new User($db);
 
 $now = dol_now();
 
@@ -554,11 +555,43 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 			$cssforfield .= ($cssforfield ? ' ' : '').'right';
 		}
 		//if (in_array($key, array('fk_soc', 'fk_user', 'fk_warehouse'))) $cssforfield = 'tdoverflowmax100';
-
 		if (!empty($arrayfields['t.'.$key]['checked'])) {
 			print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '').'>';
 			if ($key == 'status') {
 				print $object->getLibStatut(5);
+			} elseif ($key == 'fk_user_creat') {
+				if ($object->fk_user_creat > 0) {
+					if (isset($conf->cache['user'][$object->fk_user_creat])) {
+						$user_temp = $conf->cache['user'][$object->fk_user_creat];
+					} else {
+						$user_temp = new User($db);
+						$user_temp->fetch($object->fk_user_creat);
+						$conf->cache['user'][$object->fk_user_creat] = $user_temp;
+					}
+					print $user_temp->getNomUrl(-1);
+				}
+			} elseif ($key == 'fk_user_modif') {
+				if ($object->fk_user_modif > 0) {
+					if (isset($conf->cache['user'][$object->fk_user_modif])) {
+						$user_temp = $conf->cache['user'][$object->fk_user_modif];
+					} else {
+						$user_temp = new User($db);
+						$user_temp->fetch($object->fk_user_modif);
+						$conf->cache['user'][$object->fk_user_modif] = $user_temp;
+					}
+					print $user_temp->getNomUrl(-1);
+				}
+			} elseif ($key == 'fk_user_valid') {
+				if ($object->fk_user_valid > 0) {
+					if (isset($conf->cache['user'][$object->fk_user_valid])) {
+						$user_temp = $conf->cache['user'][$object->fk_user_valid];
+					} else {
+						$user_temp = new User($db);
+						$user_temp->fetch($object->fk_user_valid);
+						$conf->cache['user'][$object->fk_user_valid] = $user_temp;
+					}
+					print $user_temp->getNomUrl(-1);
+				}
 			} else {
 				print $object->showOutputField($val, $key, $object->$key, '');
 			}
diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php
index 3cefec17686..84ea65fef71 100644
--- a/htdocs/ticket/list.php
+++ b/htdocs/ticket/list.php
@@ -950,22 +950,22 @@ while ($i < min($num, $limit)) {
 				print $object->getLibStatut(5);
 			} elseif ($key == 'subject') {
 				$s = $obj->subject;
-				print '<span title="'.$s.'">';
+				print '<span title="'.dol_escape_htmltag($s).'">';
 				print $s;
 				print '</span>';
 			} elseif ($key == 'type_code') {
 				$s = $langs->getLabelFromKey($db, 'TicketTypeShort'.$object->type_code, 'c_ticket_type', 'code', 'label', $object->type_code);
-				print '<span title="'.$s.'">';
+				print '<span title="'.dol_escape_htmltag($s).'">';
 				print $s;
 				print '</span>';
 			} elseif ($key == 'category_code') {
 				$s = $langs->getLabelFromKey($db, 'TicketCategoryShort'.$object->category_code, 'c_ticket_category', 'code', 'label', $object->category_code);
-				print '<span title="'.$s.'">';
+				print '<span title="'.dol_escape_htmltag($s).'">';
 				print $s;
 				print '</span>';
 			} elseif ($key == 'severity_code') {
 				$s = $langs->getLabelFromKey($db, 'TicketSeverityShort'.$object->severity_code, 'c_ticket_severity', 'code', 'label', $object->severity_code);
-				print '<span title="'.$s.'">';
+				print '<span title="'.dol_escape_htmltag($s).'">';
 				print $s;
 				print '</span>';
 			} elseif ($key == 'tms') {

From f57bb78c782ed7194b1c2e59e6669a0d154bd068 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sat, 26 Jun 2021 20:26:32 +0200
Subject: [PATCH 0899/1497] fix php warning

---
 htdocs/fourn/commande/list.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index c644f9e35a5..7b2dc8cdb02 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -610,7 +610,7 @@ $sql .= ' cf.fk_multicurrency, cf.multicurrency_code, cf.multicurrency_tx, cf.mu
 $sql .= ' cf.date_creation as date_creation, cf.tms as date_update,';
 $sql .= ' cf.note_public, cf.note_private,';
 $sql .= " p.rowid as project_id, p.ref as project_ref, p.title as project_title,";
-$sql .= " u.firstname, u.lastname, u.photo, u.login, u.email as user_email";
+$sql .= " u.firstname, u.lastname, u.photo, u.login, u.email as user_email, u.statut as user_statut";
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
@@ -1346,6 +1346,7 @@ if ($resql) {
 		$userstatic->login = $obj->login;
 		$userstatic->photo = $obj->photo;
 		$userstatic->email = $obj->user_email;
+		$userstatic->statut = $obj->user_statut;
 		if (!empty($arrayfields['u.login']['checked'])) {
 			print '<td class="tdoverflowmax150">';
 			if ($userstatic->id) {

From 58701bef5d985d16f21efe6d9fe23a100a9f3b16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 26 Jun 2021 21:10:59 +0200
Subject: [PATCH 0900/1497] remove unused code

---
 htdocs/admin/emailcollector_list.php          | 15 -----------
 htdocs/asset/list.php                         | 15 -----------
 htdocs/bom/bom_card.php                       | 16 ------------
 .../compta/cashcontrol/cashcontrol_list.php   | 15 -----------
 .../conferenceorbooth_list.php                | 14 ----------
 .../modulebuilder/template/myobject_card.php  | 26 +++++++++----------
 .../modulebuilder/template/myobject_list.php  | 26 +++++++++----------
 htdocs/mrp/mo_card.php                        | 14 ----------
 htdocs/mrp/mo_list.php                        | 14 ----------
 htdocs/partnership/partnership_list.php       | 14 ----------
 htdocs/product/inventory/card.php             | 14 ----------
 .../recruitmentcandidature_card.php           | 15 -----------
 .../recruitmentcandidature_list.php           | 15 -----------
 .../recruitmentjobposition_list.php           | 15 -----------
 htdocs/website/websiteaccount_card.php        | 16 ------------
 htdocs/workstation/workstation_card.php       |  2 +-
 16 files changed, 27 insertions(+), 219 deletions(-)

diff --git a/htdocs/admin/emailcollector_list.php b/htdocs/admin/emailcollector_list.php
index 55b2052936c..c57e681be34 100644
--- a/htdocs/admin/emailcollector_list.php
+++ b/htdocs/admin/emailcollector_list.php
@@ -315,21 +315,6 @@ if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $
 
 llxHeader('', $title, $help_url);
 
-// Example : Adding jquery code
-print '<script type="text/javascript" language="javascript">
-jQuery(document).ready(function() {
-	function init_myfunc()
-	{
-		jQuery("#myid").removeAttr(\'disabled\');
-		jQuery("#myid").attr(\'disabled\',\'disabled\');
-	}
-	init_myfunc();
-	jQuery("#mybutton").click(function() {
-		init_myfunc();
-	});
-});
-</script>';
-
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
 $param = '';
diff --git a/htdocs/asset/list.php b/htdocs/asset/list.php
index 056a73328dc..1d994e25177 100644
--- a/htdocs/asset/list.php
+++ b/htdocs/asset/list.php
@@ -305,21 +305,6 @@ if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $
 
 llxHeader('', $title, $help_url);
 
-// Example : Adding jquery code
-print '<script type="text/javascript" language="javascript">
-jQuery(document).ready(function() {
-	function init_myfunc()
-	{
-		jQuery("#myid").removeAttr(\'disabled\');
-		jQuery("#myid").attr(\'disabled\',\'disabled\');
-	}
-	init_myfunc();
-	jQuery("#mybutton").click(function() {
-		init_myfunc();
-	});
-});
-</script>';
-
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
 $param = '';
diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php
index fbd219a298b..b598b95ae0a 100644
--- a/htdocs/bom/bom_card.php
+++ b/htdocs/bom/bom_card.php
@@ -244,22 +244,6 @@ $title = $langs->trans('BOM');
 $help_url ='EN:Module_BOM';
 llxHeader('', $title, $help_url);
 
-// Example : Adding jquery code
-print '<script type="text/javascript" language="javascript">
-jQuery(document).ready(function() {
-	function init_myfunc()
-	{
-		jQuery("#myid").removeAttr(\'disabled\');
-		jQuery("#myid").attr(\'disabled\',\'disabled\');
-	}
-	init_myfunc();
-	jQuery("#mybutton").click(function() {
-		init_myfunc();
-	});
-});
-</script>';
-
-
 // Part to create
 if ($action == 'create') {
 	print load_fiche_titre($langs->trans("NewBOM"), '', 'bom');
diff --git a/htdocs/compta/cashcontrol/cashcontrol_list.php b/htdocs/compta/cashcontrol/cashcontrol_list.php
index ab8451c9e59..ec7af37940c 100644
--- a/htdocs/compta/cashcontrol/cashcontrol_list.php
+++ b/htdocs/compta/cashcontrol/cashcontrol_list.php
@@ -343,21 +343,6 @@ if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $
 
 llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'classforhorizontalscrolloftabs');
 
-// Example : Adding jquery code
-print '<script type="text/javascript" language="javascript">
-jQuery(document).ready(function() {
-	function init_myfunc()
-	{
-		jQuery("#myid").removeAttr(\'disabled\');
-		jQuery("#myid").attr(\'disabled\',\'disabled\');
-	}
-	init_myfunc();
-	jQuery("#mybutton").click(function() {
-		init_myfunc();
-	});
-});
-</script>';
-
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
 $param = '';
diff --git a/htdocs/eventorganization/conferenceorbooth_list.php b/htdocs/eventorganization/conferenceorbooth_list.php
index b51823242f8..d7f7cdb8bb1 100644
--- a/htdocs/eventorganization/conferenceorbooth_list.php
+++ b/htdocs/eventorganization/conferenceorbooth_list.php
@@ -253,20 +253,6 @@ if ($projectid > 0) {
 
 llxHeader('', $title, $help_url);
 
-// Example : Adding jquery code
-print '<script type="text/javascript" language="javascript">
-jQuery(document).ready(function() {
-	function init_myfunc()
-	{
-		jQuery("#myid").removeAttr(\'disabled\');
-		jQuery("#myid").attr(\'disabled\',\'disabled\');
-	}
-	init_myfunc();
-	jQuery("#mybutton").click(function() {
-		init_myfunc();
-	});
-});
-</script>';
 
 if ($projectid > 0) {
 	// To verify role of users
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index 9a689c79a08..cac59593950 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -212,19 +212,19 @@ $help_url = '';
 llxHeader('', $title, $help_url);
 
 // Example : Adding jquery code
-print '<script type="text/javascript" language="javascript">
-jQuery(document).ready(function() {
-	function init_myfunc()
-	{
-		jQuery("#myid").removeAttr(\'disabled\');
-		jQuery("#myid").attr(\'disabled\',\'disabled\');
-	}
-	init_myfunc();
-	jQuery("#mybutton").click(function() {
-		init_myfunc();
-	});
-});
-</script>';
+// print '<script type="text/javascript" language="javascript">
+// jQuery(document).ready(function() {
+// 	function init_myfunc()
+// 	{
+// 		jQuery("#myid").removeAttr(\'disabled\');
+// 		jQuery("#myid").attr(\'disabled\',\'disabled\');
+// 	}
+// 	init_myfunc();
+// 	jQuery("#mybutton").click(function() {
+// 		init_myfunc();
+// 	});
+// });
+// </script>';
 
 
 // Part to create
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 41561a5a45b..abc8b879d33 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -386,19 +386,19 @@ if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $
 llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'classforhorizontalscrolloftabs');
 
 // Example : Adding jquery code
-print '<script type="text/javascript" language="javascript">
-jQuery(document).ready(function() {
-	function init_myfunc()
-	{
-		jQuery("#myid").removeAttr(\'disabled\');
-		jQuery("#myid").attr(\'disabled\',\'disabled\');
-	}
-	init_myfunc();
-	jQuery("#mybutton").click(function() {
-		init_myfunc();
-	});
-});
-</script>';
+// print '<script type="text/javascript" language="javascript">
+// jQuery(document).ready(function() {
+// 	function init_myfunc()
+// 	{
+// 		jQuery("#myid").removeAttr(\'disabled\');
+// 		jQuery("#myid").attr(\'disabled\',\'disabled\');
+// 	}
+// 	init_myfunc();
+// 	jQuery("#mybutton").click(function() {
+// 		init_myfunc();
+// 	});
+// });
+// </script>';
 
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
diff --git a/htdocs/mrp/mo_card.php b/htdocs/mrp/mo_card.php
index fad22645cd5..b6cc502bd60 100644
--- a/htdocs/mrp/mo_card.php
+++ b/htdocs/mrp/mo_card.php
@@ -201,20 +201,6 @@ $title = $langs->trans('Mo')." - ".$langs->trans("Card");
 
 llxHeader('', $title, '');
 
-// Example : Adding jquery code
-print '<script type="text/javascript" language="javascript">
-jQuery(document).ready(function() {
-	function init_myfunc()
-	{
-		jQuery("#myid").removeAttr(\'disabled\');
-		jQuery("#myid").attr(\'disabled\',\'disabled\');
-	}
-	init_myfunc();
-	jQuery("#mybutton").click(function() {
-		init_myfunc();
-	});
-});
-</script>';
 
 
 // Part to create
diff --git a/htdocs/mrp/mo_list.php b/htdocs/mrp/mo_list.php
index 1883517470c..731a7bcfc50 100644
--- a/htdocs/mrp/mo_list.php
+++ b/htdocs/mrp/mo_list.php
@@ -299,20 +299,6 @@ if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $
 
 llxHeader('', $title, $help_url);
 
-// Example : Adding jquery code
-print '<script type="text/javascript" language="javascript">
-jQuery(document).ready(function() {
-	function init_myfunc()
-	{
-		jQuery("#myid").removeAttr(\'disabled\');
-		jQuery("#myid").attr(\'disabled\',\'disabled\');
-	}
-	init_myfunc();
-	jQuery("#mybutton").click(function() {
-		init_myfunc();
-	});
-});
-</script>';
 
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
diff --git a/htdocs/partnership/partnership_list.php b/htdocs/partnership/partnership_list.php
index 79f51be6ca9..49d46c652fd 100644
--- a/htdocs/partnership/partnership_list.php
+++ b/htdocs/partnership/partnership_list.php
@@ -398,20 +398,6 @@ if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $
 
 llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'classforhorizontalscrolloftabs');
 
-// Example : Adding jquery code
-print '<script type="text/javascript" language="javascript">
-jQuery(document).ready(function() {
-	function init_myfunc()
-	{
-		jQuery("#myid").removeAttr(\'disabled\');
-		jQuery("#myid").attr(\'disabled\',\'disabled\');
-	}
-	init_myfunc();
-	jQuery("#mybutton").click(function() {
-		init_myfunc();
-	});
-});
-</script>';
 
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
diff --git a/htdocs/product/inventory/card.php b/htdocs/product/inventory/card.php
index 6a29a414ed7..5ec359e5d8a 100644
--- a/htdocs/product/inventory/card.php
+++ b/htdocs/product/inventory/card.php
@@ -168,20 +168,6 @@ $help_url = 'EN:Module_Stocks_En|FR:Module_Stock|ES:Módulo_Stocks|DE:Modul_Best
 
 llxHeader('', $title, $help_url);
 
-// Example : Adding jquery code
-print '<script type="text/javascript" language="javascript">
-jQuery(document).ready(function() {
-	function init_myfunc()
-	{
-		jQuery("#myid").removeAttr(\'disabled\');
-		jQuery("#myid").attr(\'disabled\',\'disabled\');
-	}
-	init_myfunc();
-	jQuery("#mybutton").click(function() {
-		init_myfunc();
-	});
-});
-</script>';
 
 
 // Part to create
diff --git a/htdocs/recruitment/recruitmentcandidature_card.php b/htdocs/recruitment/recruitmentcandidature_card.php
index 4826dc735ef..a1e98ded601 100644
--- a/htdocs/recruitment/recruitmentcandidature_card.php
+++ b/htdocs/recruitment/recruitmentcandidature_card.php
@@ -305,21 +305,6 @@ $title = $langs->trans("RecruitmentCandidature");
 $help_url = '';
 llxHeader('', $title, $help_url);
 
-// Example : Adding jquery code
-print '<script type="text/javascript" language="javascript">
-jQuery(document).ready(function() {
-	function init_myfunc()
-	{
-		jQuery("#myid").removeAttr(\'disabled\');
-		jQuery("#myid").attr(\'disabled\',\'disabled\');
-	}
-	init_myfunc();
-	jQuery("#mybutton").click(function() {
-		init_myfunc();
-	});
-});
-</script>';
-
 
 // Part to create
 if ($action == 'create') {
diff --git a/htdocs/recruitment/recruitmentcandidature_list.php b/htdocs/recruitment/recruitmentcandidature_list.php
index 1caeb05095f..7a5a88bc6c4 100644
--- a/htdocs/recruitment/recruitmentcandidature_list.php
+++ b/htdocs/recruitment/recruitmentcandidature_list.php
@@ -348,21 +348,6 @@ if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $
 
 llxHeader('', $title, $help_url);
 
-// Example : Adding jquery code
-print '<script type="text/javascript" language="javascript">
-jQuery(document).ready(function() {
-	function init_myfunc()
-	{
-		jQuery("#myid").removeAttr(\'disabled\');
-		jQuery("#myid").attr(\'disabled\',\'disabled\');
-	}
-	init_myfunc();
-	jQuery("#mybutton").click(function() {
-		init_myfunc();
-	});
-});
-</script>';
-
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
 $param = '';
diff --git a/htdocs/recruitment/recruitmentjobposition_list.php b/htdocs/recruitment/recruitmentjobposition_list.php
index 6475a60a8ed..7ccad1de16a 100644
--- a/htdocs/recruitment/recruitmentjobposition_list.php
+++ b/htdocs/recruitment/recruitmentjobposition_list.php
@@ -349,21 +349,6 @@ if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $
 
 llxHeader('', $title, $help_url);
 
-// Example : Adding jquery code
-print '<script type="text/javascript" language="javascript">
-jQuery(document).ready(function() {
-	function init_myfunc()
-	{
-		jQuery("#myid").removeAttr(\'disabled\');
-		jQuery("#myid").attr(\'disabled\',\'disabled\');
-	}
-	init_myfunc();
-	jQuery("#mybutton").click(function() {
-		init_myfunc();
-	});
-});
-</script>';
-
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
 $param = '';
diff --git a/htdocs/website/websiteaccount_card.php b/htdocs/website/websiteaccount_card.php
index 2074873a031..cf4d26b2c33 100644
--- a/htdocs/website/websiteaccount_card.php
+++ b/htdocs/website/websiteaccount_card.php
@@ -117,22 +117,6 @@ $formfile = new FormFile($db);
 
 llxHeader('', 'WebsiteAccount', '');
 
-// Example : Adding jquery code
-print '<script type="text/javascript" language="javascript">
-jQuery(document).ready(function() {
-	function init_myfunc()
-	{
-		jQuery("#myid").removeAttr(\'disabled\');
-		jQuery("#myid").attr(\'disabled\',\'disabled\');
-	}
-	init_myfunc();
-	jQuery("#mybutton").click(function() {
-		init_myfunc();
-	});
-});
-</script>';
-
-
 // Part to create
 if ($action == 'create') {
 	print load_fiche_titre($langs->trans("NewObject", $langs->transnoentitiesnoconv("WebsiteAccount")));
diff --git a/htdocs/workstation/workstation_card.php b/htdocs/workstation/workstation_card.php
index 673b1db935d..5b63ca2d481 100755
--- a/htdocs/workstation/workstation_card.php
+++ b/htdocs/workstation/workstation_card.php
@@ -159,7 +159,7 @@ $help_url = 'EN:Module_Workstation';
 
 llxHeader('', $title, $help_url);
 
-// Example : Adding jquery code
+// jquery code
 ?>
 	<script type="text/javascript" language="javascript">
 

From 6ef08852f32702583ef8796ff9d77c14f389229e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 26 Jun 2021 22:51:23 +0200
Subject: [PATCH 0901/1497] Transifex sync

---
 htdocs/langs/am_ET/accountancy.lang         |    5 +-
 htdocs/langs/am_ET/admin.lang               |   41 +-
 htdocs/langs/am_ET/agenda.lang              |   14 +-
 htdocs/langs/am_ET/bills.lang               |    2 +
 htdocs/langs/am_ET/cashdesk.lang            |    6 +-
 htdocs/langs/am_ET/compta.lang              |    6 +
 htdocs/langs/am_ET/cron.lang                |    2 +-
 htdocs/langs/am_ET/errors.lang              |    5 +-
 htdocs/langs/am_ET/eventorganization.lang   |   48 +-
 htdocs/langs/am_ET/hrm.lang                 |    2 +-
 htdocs/langs/am_ET/knowledgemanagement.lang |    2 +-
 htdocs/langs/am_ET/languages.lang           |    2 +
 htdocs/langs/am_ET/main.lang                |    5 +
 htdocs/langs/am_ET/members.lang             |    2 +
 htdocs/langs/am_ET/modulebuilder.lang       |    1 +
 htdocs/langs/am_ET/mrp.lang                 |   21 +-
 htdocs/langs/am_ET/orders.lang              |    2 +
 htdocs/langs/am_ET/other.lang               |    3 +-
 htdocs/langs/am_ET/partnership.lang         |   57 +-
 htdocs/langs/am_ET/productbatch.lang        |   12 +-
 htdocs/langs/am_ET/products.lang            |    2 +
 htdocs/langs/am_ET/projects.lang            |    2 +
 htdocs/langs/am_ET/receptions.lang          |    2 +-
 htdocs/langs/am_ET/stocks.lang              |    7 +-
 htdocs/langs/am_ET/ticket.lang              |    2 +-
 htdocs/langs/ar_EG/accountancy.lang         |    2 +-
 htdocs/langs/ar_EG/cron.lang                |    2 -
 htdocs/langs/ar_EG/orders.lang              |    1 +
 htdocs/langs/ar_EG/partnership.lang         |    6 +-
 htdocs/langs/ar_EG/products.lang            |    2 +
 htdocs/langs/ar_EG/ticket.lang              |    1 +
 htdocs/langs/ar_IQ/accountancy.lang         |    5 +-
 htdocs/langs/ar_IQ/admin.lang               |   41 +-
 htdocs/langs/ar_IQ/agenda.lang              |    2 +
 htdocs/langs/ar_IQ/bills.lang               |    2 +
 htdocs/langs/ar_IQ/cashdesk.lang            |    6 +-
 htdocs/langs/ar_IQ/compta.lang              |    6 +
 htdocs/langs/ar_IQ/cron.lang                |    2 +-
 htdocs/langs/ar_IQ/errors.lang              |    5 +-
 htdocs/langs/ar_IQ/eventorganization.lang   |   48 +-
 htdocs/langs/ar_IQ/hrm.lang                 |    2 +-
 htdocs/langs/ar_IQ/knowledgemanagement.lang |    2 +-
 htdocs/langs/ar_IQ/languages.lang           |    2 +
 htdocs/langs/ar_IQ/main.lang                |    5 +
 htdocs/langs/ar_IQ/members.lang             |    2 +
 htdocs/langs/ar_IQ/modulebuilder.lang       |    1 +
 htdocs/langs/ar_IQ/mrp.lang                 |    7 +-
 htdocs/langs/ar_IQ/orders.lang              |    2 +
 htdocs/langs/ar_IQ/other.lang               |    3 +-
 htdocs/langs/ar_IQ/partnership.lang         |   57 +-
 htdocs/langs/ar_IQ/productbatch.lang        |   12 +-
 htdocs/langs/ar_IQ/products.lang            |    2 +
 htdocs/langs/ar_IQ/projects.lang            |    2 +
 htdocs/langs/ar_IQ/receptions.lang          |    2 +-
 htdocs/langs/ar_IQ/stocks.lang              |    7 +-
 htdocs/langs/ar_IQ/ticket.lang              |    2 +-
 htdocs/langs/ar_SA/accountancy.lang         |    5 +-
 htdocs/langs/ar_SA/admin.lang               |   45 +-
 htdocs/langs/ar_SA/agenda.lang              |   16 +-
 htdocs/langs/ar_SA/banks.lang               |   10 +-
 htdocs/langs/ar_SA/bills.lang               |    2 +
 htdocs/langs/ar_SA/cashdesk.lang            |    6 +-
 htdocs/langs/ar_SA/commercial.lang          |  111 +-
 htdocs/langs/ar_SA/compta.lang              |    6 +
 htdocs/langs/ar_SA/cron.lang                |    2 +-
 htdocs/langs/ar_SA/deliveries.lang          |    9 +-
 htdocs/langs/ar_SA/donations.lang           |    7 +-
 htdocs/langs/ar_SA/errors.lang              |    5 +-
 htdocs/langs/ar_SA/eventorganization.lang   |   48 +-
 htdocs/langs/ar_SA/externalsite.lang        |    2 +-
 htdocs/langs/ar_SA/hrm.lang                 |    6 +-
 htdocs/langs/ar_SA/knowledgemanagement.lang |    2 +-
 htdocs/langs/ar_SA/languages.lang           |   42 +-
 htdocs/langs/ar_SA/ldap.lang                |   48 +-
 htdocs/langs/ar_SA/link.lang                |    2 +-
 htdocs/langs/ar_SA/main.lang                |    5 +
 htdocs/langs/ar_SA/margins.lang             |    6 +-
 htdocs/langs/ar_SA/members.lang             |    2 +
 htdocs/langs/ar_SA/modulebuilder.lang       |    1 +
 htdocs/langs/ar_SA/mrp.lang                 |   25 +-
 htdocs/langs/ar_SA/orders.lang              |    6 +-
 htdocs/langs/ar_SA/other.lang               |    3 +-
 htdocs/langs/ar_SA/partnership.lang         |   57 +-
 htdocs/langs/ar_SA/productbatch.lang        |   12 +-
 htdocs/langs/ar_SA/products.lang            |    2 +
 htdocs/langs/ar_SA/projects.lang            |    2 +
 htdocs/langs/ar_SA/receptions.lang          |    2 +-
 htdocs/langs/ar_SA/stocks.lang              |    7 +-
 htdocs/langs/ar_SA/ticket.lang              |    2 +-
 htdocs/langs/ar_SA/website.lang             |  284 +-
 htdocs/langs/az_AZ/accountancy.lang         |    5 +-
 htdocs/langs/az_AZ/admin.lang               |   41 +-
 htdocs/langs/az_AZ/agenda.lang              |   14 +-
 htdocs/langs/az_AZ/bills.lang               |    2 +
 htdocs/langs/az_AZ/cashdesk.lang            |    6 +-
 htdocs/langs/az_AZ/compta.lang              |    6 +
 htdocs/langs/az_AZ/cron.lang                |    2 +-
 htdocs/langs/az_AZ/errors.lang              |    5 +-
 htdocs/langs/az_AZ/eventorganization.lang   |   48 +-
 htdocs/langs/az_AZ/hrm.lang                 |    2 +-
 htdocs/langs/az_AZ/knowledgemanagement.lang |    2 +-
 htdocs/langs/az_AZ/languages.lang           |    2 +
 htdocs/langs/az_AZ/main.lang                |    5 +
 htdocs/langs/az_AZ/members.lang             |    2 +
 htdocs/langs/az_AZ/modulebuilder.lang       |    1 +
 htdocs/langs/az_AZ/mrp.lang                 |   21 +-
 htdocs/langs/az_AZ/orders.lang              |    2 +
 htdocs/langs/az_AZ/other.lang               |    3 +-
 htdocs/langs/az_AZ/partnership.lang         |   57 +-
 htdocs/langs/az_AZ/productbatch.lang        |   12 +-
 htdocs/langs/az_AZ/products.lang            |    2 +
 htdocs/langs/az_AZ/projects.lang            |    2 +
 htdocs/langs/az_AZ/receptions.lang          |    2 +-
 htdocs/langs/az_AZ/stocks.lang              |    7 +-
 htdocs/langs/az_AZ/ticket.lang              |    2 +-
 htdocs/langs/bg_BG/accountancy.lang         |    5 +-
 htdocs/langs/bg_BG/admin.lang               |   41 +-
 htdocs/langs/bg_BG/agenda.lang              |   14 +-
 htdocs/langs/bg_BG/bills.lang               |    2 +
 htdocs/langs/bg_BG/cashdesk.lang            |    6 +-
 htdocs/langs/bg_BG/compta.lang              |    6 +
 htdocs/langs/bg_BG/cron.lang                |    2 +-
 htdocs/langs/bg_BG/errors.lang              |    5 +-
 htdocs/langs/bg_BG/eventorganization.lang   |   48 +-
 htdocs/langs/bg_BG/hrm.lang                 |    2 +-
 htdocs/langs/bg_BG/knowledgemanagement.lang |    2 +-
 htdocs/langs/bg_BG/languages.lang           |    2 +
 htdocs/langs/bg_BG/main.lang                |    5 +
 htdocs/langs/bg_BG/members.lang             |    2 +
 htdocs/langs/bg_BG/modulebuilder.lang       |    1 +
 htdocs/langs/bg_BG/mrp.lang                 |   21 +-
 htdocs/langs/bg_BG/orders.lang              |    2 +
 htdocs/langs/bg_BG/other.lang               |    3 +-
 htdocs/langs/bg_BG/partnership.lang         |   57 +-
 htdocs/langs/bg_BG/productbatch.lang        |   12 +-
 htdocs/langs/bg_BG/products.lang            |    2 +
 htdocs/langs/bg_BG/projects.lang            |    2 +
 htdocs/langs/bg_BG/receptions.lang          |    2 +-
 htdocs/langs/bg_BG/stocks.lang              |    7 +-
 htdocs/langs/bg_BG/ticket.lang              |    2 +-
 htdocs/langs/bn_BD/accountancy.lang         |    5 +-
 htdocs/langs/bn_BD/admin.lang               |   41 +-
 htdocs/langs/bn_BD/agenda.lang              |   14 +-
 htdocs/langs/bn_BD/bills.lang               |    2 +
 htdocs/langs/bn_BD/cashdesk.lang            |    6 +-
 htdocs/langs/bn_BD/compta.lang              |    6 +
 htdocs/langs/bn_BD/cron.lang                |    2 +-
 htdocs/langs/bn_BD/errors.lang              |    5 +-
 htdocs/langs/bn_BD/eventorganization.lang   |   48 +-
 htdocs/langs/bn_BD/hrm.lang                 |    2 +-
 htdocs/langs/bn_BD/knowledgemanagement.lang |    2 +-
 htdocs/langs/bn_BD/languages.lang           |    2 +
 htdocs/langs/bn_BD/main.lang                |    5 +
 htdocs/langs/bn_BD/members.lang             |    2 +
 htdocs/langs/bn_BD/modulebuilder.lang       |    1 +
 htdocs/langs/bn_BD/mrp.lang                 |   21 +-
 htdocs/langs/bn_BD/orders.lang              |    2 +
 htdocs/langs/bn_BD/other.lang               |    3 +-
 htdocs/langs/bn_BD/partnership.lang         |   57 +-
 htdocs/langs/bn_BD/productbatch.lang        |   12 +-
 htdocs/langs/bn_BD/products.lang            |    2 +
 htdocs/langs/bn_BD/projects.lang            |    2 +
 htdocs/langs/bn_BD/receptions.lang          |    2 +-
 htdocs/langs/bn_BD/stocks.lang              |    7 +-
 htdocs/langs/bn_BD/ticket.lang              |    2 +-
 htdocs/langs/bn_IN/accountancy.lang         |    5 +-
 htdocs/langs/bn_IN/admin.lang               |   41 +-
 htdocs/langs/bn_IN/agenda.lang              |   14 +-
 htdocs/langs/bn_IN/bills.lang               |    2 +
 htdocs/langs/bn_IN/cashdesk.lang            |    6 +-
 htdocs/langs/bn_IN/compta.lang              |    6 +
 htdocs/langs/bn_IN/cron.lang                |    2 +-
 htdocs/langs/bn_IN/errors.lang              |    5 +-
 htdocs/langs/bn_IN/eventorganization.lang   |   48 +-
 htdocs/langs/bn_IN/hrm.lang                 |    2 +-
 htdocs/langs/bn_IN/knowledgemanagement.lang |    2 +-
 htdocs/langs/bn_IN/languages.lang           |    2 +
 htdocs/langs/bn_IN/main.lang                |    5 +
 htdocs/langs/bn_IN/members.lang             |    2 +
 htdocs/langs/bn_IN/modulebuilder.lang       |    1 +
 htdocs/langs/bn_IN/mrp.lang                 |   21 +-
 htdocs/langs/bn_IN/orders.lang              |    2 +
 htdocs/langs/bn_IN/other.lang               |    3 +-
 htdocs/langs/bn_IN/partnership.lang         |   57 +-
 htdocs/langs/bn_IN/productbatch.lang        |   12 +-
 htdocs/langs/bn_IN/products.lang            |    2 +
 htdocs/langs/bn_IN/projects.lang            |    2 +
 htdocs/langs/bn_IN/receptions.lang          |    2 +-
 htdocs/langs/bn_IN/stocks.lang              |    7 +-
 htdocs/langs/bn_IN/ticket.lang              |    2 +-
 htdocs/langs/bs_BA/accountancy.lang         |    5 +-
 htdocs/langs/bs_BA/admin.lang               |   41 +-
 htdocs/langs/bs_BA/agenda.lang              |   14 +-
 htdocs/langs/bs_BA/bills.lang               |    2 +
 htdocs/langs/bs_BA/cashdesk.lang            |    6 +-
 htdocs/langs/bs_BA/compta.lang              |    6 +
 htdocs/langs/bs_BA/cron.lang                |    2 +-
 htdocs/langs/bs_BA/errors.lang              |    5 +-
 htdocs/langs/bs_BA/eventorganization.lang   |   48 +-
 htdocs/langs/bs_BA/hrm.lang                 |    2 +-
 htdocs/langs/bs_BA/knowledgemanagement.lang |    2 +-
 htdocs/langs/bs_BA/languages.lang           |    2 +
 htdocs/langs/bs_BA/main.lang                |    5 +
 htdocs/langs/bs_BA/members.lang             |    2 +
 htdocs/langs/bs_BA/modulebuilder.lang       |    1 +
 htdocs/langs/bs_BA/mrp.lang                 |   21 +-
 htdocs/langs/bs_BA/orders.lang              |    2 +
 htdocs/langs/bs_BA/other.lang               |    3 +-
 htdocs/langs/bs_BA/partnership.lang         |   57 +-
 htdocs/langs/bs_BA/productbatch.lang        |   12 +-
 htdocs/langs/bs_BA/products.lang            |    2 +
 htdocs/langs/bs_BA/projects.lang            |    2 +
 htdocs/langs/bs_BA/receptions.lang          |    2 +-
 htdocs/langs/bs_BA/stocks.lang              |    7 +-
 htdocs/langs/bs_BA/ticket.lang              |    2 +-
 htdocs/langs/ca_ES/accountancy.lang         |   51 +-
 htdocs/langs/ca_ES/admin.lang               |   95 +-
 htdocs/langs/ca_ES/agenda.lang              |   11 +-
 htdocs/langs/ca_ES/banks.lang               |    8 +-
 htdocs/langs/ca_ES/bills.lang               |   24 +-
 htdocs/langs/ca_ES/boxes.lang               |   22 +-
 htdocs/langs/ca_ES/cashdesk.lang            |   16 +-
 htdocs/langs/ca_ES/categories.lang          |   20 +-
 htdocs/langs/ca_ES/companies.lang           |   24 +-
 htdocs/langs/ca_ES/compta.lang              |   20 +-
 htdocs/langs/ca_ES/cron.lang                |   14 +-
 htdocs/langs/ca_ES/donations.lang           |    3 +-
 htdocs/langs/ca_ES/ecm.lang                 |    2 +-
 htdocs/langs/ca_ES/errors.lang              |   27 +-
 htdocs/langs/ca_ES/eventorganization.lang   |  116 +-
 htdocs/langs/ca_ES/holiday.lang             |    4 +-
 htdocs/langs/ca_ES/hrm.lang                 |    2 +-
 htdocs/langs/ca_ES/knowledgemanagement.lang |   24 +-
 htdocs/langs/ca_ES/languages.lang           |    2 +
 htdocs/langs/ca_ES/mails.lang               |    6 +-
 htdocs/langs/ca_ES/main.lang                |   27 +-
 htdocs/langs/ca_ES/margins.lang             |    2 +-
 htdocs/langs/ca_ES/members.lang             |   40 +-
 htdocs/langs/ca_ES/modulebuilder.lang       |    3 +-
 htdocs/langs/ca_ES/mrp.lang                 |   41 +-
 htdocs/langs/ca_ES/orders.lang              |    6 +-
 htdocs/langs/ca_ES/other.lang               |   11 +-
 htdocs/langs/ca_ES/partnership.lang         |   61 +-
 htdocs/langs/ca_ES/productbatch.lang        |   30 +-
 htdocs/langs/ca_ES/products.lang            |   28 +-
 htdocs/langs/ca_ES/projects.lang            |   12 +-
 htdocs/langs/ca_ES/receptions.lang          |    6 +-
 htdocs/langs/ca_ES/salaries.lang            |    4 +-
 htdocs/langs/ca_ES/sendings.lang            |    2 +-
 htdocs/langs/ca_ES/stocks.lang              |   35 +-
 htdocs/langs/ca_ES/ticket.lang              |   30 +-
 htdocs/langs/ca_ES/trips.lang               |    2 +-
 htdocs/langs/ca_ES/users.lang               |    8 +-
 htdocs/langs/ca_ES/website.lang             |    8 +-
 htdocs/langs/ca_ES/zapier.lang              |    2 +-
 htdocs/langs/cs_CZ/accountancy.lang         |    5 +-
 htdocs/langs/cs_CZ/admin.lang               |   41 +-
 htdocs/langs/cs_CZ/agenda.lang              |   14 +-
 htdocs/langs/cs_CZ/bills.lang               |    2 +
 htdocs/langs/cs_CZ/cashdesk.lang            |    6 +-
 htdocs/langs/cs_CZ/compta.lang              |    6 +
 htdocs/langs/cs_CZ/cron.lang                |    2 +-
 htdocs/langs/cs_CZ/errors.lang              |    5 +-
 htdocs/langs/cs_CZ/eventorganization.lang   |   48 +-
 htdocs/langs/cs_CZ/hrm.lang                 |    2 +-
 htdocs/langs/cs_CZ/knowledgemanagement.lang |    2 +-
 htdocs/langs/cs_CZ/languages.lang           |    2 +
 htdocs/langs/cs_CZ/main.lang                |    5 +
 htdocs/langs/cs_CZ/members.lang             |    2 +
 htdocs/langs/cs_CZ/modulebuilder.lang       |    1 +
 htdocs/langs/cs_CZ/mrp.lang                 |   21 +-
 htdocs/langs/cs_CZ/orders.lang              |    2 +
 htdocs/langs/cs_CZ/other.lang               |    3 +-
 htdocs/langs/cs_CZ/partnership.lang         |   57 +-
 htdocs/langs/cs_CZ/productbatch.lang        |   12 +-
 htdocs/langs/cs_CZ/products.lang            |    2 +
 htdocs/langs/cs_CZ/projects.lang            |    2 +
 htdocs/langs/cs_CZ/receptions.lang          |    2 +-
 htdocs/langs/cs_CZ/stocks.lang              |    7 +-
 htdocs/langs/cs_CZ/ticket.lang              |    2 +-
 htdocs/langs/da_DK/accountancy.lang         |    5 +-
 htdocs/langs/da_DK/admin.lang               |   41 +-
 htdocs/langs/da_DK/agenda.lang              |   26 +-
 htdocs/langs/da_DK/bills.lang               |    2 +
 htdocs/langs/da_DK/cashdesk.lang            |    6 +-
 htdocs/langs/da_DK/compta.lang              |    6 +
 htdocs/langs/da_DK/cron.lang                |    2 +-
 htdocs/langs/da_DK/errors.lang              |    5 +-
 htdocs/langs/da_DK/eventorganization.lang   |   48 +-
 htdocs/langs/da_DK/hrm.lang                 |    2 +-
 htdocs/langs/da_DK/knowledgemanagement.lang |    2 +-
 htdocs/langs/da_DK/languages.lang           |    2 +
 htdocs/langs/da_DK/main.lang                |    5 +
 htdocs/langs/da_DK/members.lang             |    2 +
 htdocs/langs/da_DK/modulebuilder.lang       |    1 +
 htdocs/langs/da_DK/mrp.lang                 |   21 +-
 htdocs/langs/da_DK/orders.lang              |    2 +
 htdocs/langs/da_DK/other.lang               |    3 +-
 htdocs/langs/da_DK/partnership.lang         |   57 +-
 htdocs/langs/da_DK/productbatch.lang        |   12 +-
 htdocs/langs/da_DK/products.lang            |    2 +
 htdocs/langs/da_DK/projects.lang            |    2 +
 htdocs/langs/da_DK/receptions.lang          |    2 +-
 htdocs/langs/da_DK/stocks.lang              |    7 +-
 htdocs/langs/da_DK/ticket.lang              |    2 +-
 htdocs/langs/de_AT/accountancy.lang         |    2 +-
 htdocs/langs/de_AT/agenda.lang              |    1 -
 htdocs/langs/de_AT/cron.lang                |    2 -
 htdocs/langs/de_AT/mrp.lang                 |    6 -
 htdocs/langs/de_AT/products.lang            |    2 +
 htdocs/langs/de_AT/stocks.lang              |    3 +-
 htdocs/langs/de_AT/ticket.lang              |    4 +
 htdocs/langs/de_CH/accountancy.lang         |    2 +-
 htdocs/langs/de_CH/admin.lang               |    2 -
 htdocs/langs/de_CH/agenda.lang              |    2 +
 htdocs/langs/de_CH/cron.lang                |    2 +
 htdocs/langs/de_CH/mrp.lang                 |    6 +-
 htdocs/langs/de_CH/partnership.lang         |    4 +-
 htdocs/langs/de_CH/stocks.lang              |    3 +-
 htdocs/langs/de_CH/ticket.lang              |    3 +
 htdocs/langs/de_DE/accountancy.lang         |    7 +-
 htdocs/langs/de_DE/admin.lang               |   43 +-
 htdocs/langs/de_DE/agenda.lang              |    9 +-
 htdocs/langs/de_DE/banks.lang               |    2 +-
 htdocs/langs/de_DE/bills.lang               |    6 +-
 htdocs/langs/de_DE/cashdesk.lang            |    6 +-
 htdocs/langs/de_DE/compta.lang              |    6 +
 htdocs/langs/de_DE/cron.lang                |    8 +-
 htdocs/langs/de_DE/errors.lang              |    5 +-
 htdocs/langs/de_DE/eventorganization.lang   |   48 +-
 htdocs/langs/de_DE/hrm.lang                 |    2 +-
 htdocs/langs/de_DE/knowledgemanagement.lang |    2 +-
 htdocs/langs/de_DE/languages.lang           |    2 +
 htdocs/langs/de_DE/main.lang                |    5 +
 htdocs/langs/de_DE/members.lang             |    2 +
 htdocs/langs/de_DE/modulebuilder.lang       |    7 +-
 htdocs/langs/de_DE/mrp.lang                 |    7 +-
 htdocs/langs/de_DE/orders.lang              |    2 +
 htdocs/langs/de_DE/other.lang               |    3 +-
 htdocs/langs/de_DE/partnership.lang         |   61 +-
 htdocs/langs/de_DE/productbatch.lang        |   12 +-
 htdocs/langs/de_DE/products.lang            |    4 +-
 htdocs/langs/de_DE/projects.lang            |    2 +
 htdocs/langs/de_DE/receptions.lang          |    2 +-
 htdocs/langs/de_DE/stocks.lang              |    7 +-
 htdocs/langs/de_DE/ticket.lang              |   18 +-
 htdocs/langs/de_DE/users.lang               |    4 +-
 htdocs/langs/el_CY/accountancy.lang         |    2 -
 htdocs/langs/el_CY/cron.lang                |    2 -
 htdocs/langs/el_CY/exports.lang             |    2 +
 htdocs/langs/el_CY/mrp.lang                 |    6 -
 htdocs/langs/el_CY/products.lang            |    2 +
 htdocs/langs/el_CY/stocks.lang              |    2 +
 htdocs/langs/el_CY/ticket.lang              |    5 +
 htdocs/langs/el_GR/accountancy.lang         |    5 +-
 htdocs/langs/el_GR/admin.lang               |   43 +-
 htdocs/langs/el_GR/agenda.lang              |   14 +-
 htdocs/langs/el_GR/banks.lang               |   10 +-
 htdocs/langs/el_GR/bills.lang               |    2 +
 htdocs/langs/el_GR/cashdesk.lang            |    6 +-
 htdocs/langs/el_GR/categories.lang          |    6 +-
 htdocs/langs/el_GR/compta.lang              |    6 +
 htdocs/langs/el_GR/cron.lang                |    2 +-
 htdocs/langs/el_GR/errors.lang              |    5 +-
 htdocs/langs/el_GR/eventorganization.lang   |   48 +-
 htdocs/langs/el_GR/hrm.lang                 |    2 +-
 htdocs/langs/el_GR/knowledgemanagement.lang |    2 +-
 htdocs/langs/el_GR/languages.lang           |    2 +
 htdocs/langs/el_GR/main.lang                |    5 +
 htdocs/langs/el_GR/members.lang             |    2 +
 htdocs/langs/el_GR/modulebuilder.lang       |    1 +
 htdocs/langs/el_GR/mrp.lang                 |   21 +-
 htdocs/langs/el_GR/orders.lang              |    2 +
 htdocs/langs/el_GR/other.lang               |    3 +-
 htdocs/langs/el_GR/partnership.lang         |   57 +-
 htdocs/langs/el_GR/productbatch.lang        |   12 +-
 htdocs/langs/el_GR/products.lang            |    2 +
 htdocs/langs/el_GR/projects.lang            |    2 +
 htdocs/langs/el_GR/receptions.lang          |    2 +-
 htdocs/langs/el_GR/stocks.lang              |    7 +-
 htdocs/langs/el_GR/ticket.lang              |    2 +-
 htdocs/langs/en_AU/accountancy.lang         |    2 +-
 htdocs/langs/en_AU/cron.lang                |    2 -
 htdocs/langs/en_AU/exports.lang             |    2 +
 htdocs/langs/en_AU/main.lang                |    1 +
 htdocs/langs/en_AU/mrp.lang                 |    6 -
 htdocs/langs/en_AU/products.lang            |    2 +
 htdocs/langs/en_AU/stocks.lang              |    3 +
 htdocs/langs/en_AU/ticket.lang              |    5 +
 htdocs/langs/en_CA/accountancy.lang         |    2 +-
 htdocs/langs/en_CA/cron.lang                |    2 -
 htdocs/langs/en_CA/exports.lang             |    2 +
 htdocs/langs/en_CA/main.lang                |    1 +
 htdocs/langs/en_CA/mrp.lang                 |    6 -
 htdocs/langs/en_CA/products.lang            |    2 +
 htdocs/langs/en_CA/stocks.lang              |    3 +
 htdocs/langs/en_CA/ticket.lang              |    5 +
 htdocs/langs/en_GB/accountancy.lang         |    2 +-
 htdocs/langs/en_GB/cron.lang                |    2 -
 htdocs/langs/en_GB/exports.lang             |    2 +
 htdocs/langs/en_GB/main.lang                |    1 +
 htdocs/langs/en_GB/mrp.lang                 |    6 -
 htdocs/langs/en_GB/partnership.lang         |    2 +-
 htdocs/langs/en_GB/products.lang            |    1 +
 htdocs/langs/en_GB/stocks.lang              |    2 +
 htdocs/langs/en_GB/ticket.lang              |    5 +
 htdocs/langs/en_IN/accountancy.lang         |    2 +-
 htdocs/langs/en_IN/cron.lang                |    2 -
 htdocs/langs/en_IN/exports.lang             |    2 +
 htdocs/langs/en_IN/main.lang                |    1 +
 htdocs/langs/en_IN/mrp.lang                 |    6 -
 htdocs/langs/en_IN/products.lang            |    2 +
 htdocs/langs/en_IN/stocks.lang              |    3 +
 htdocs/langs/en_IN/ticket.lang              |    5 +
 htdocs/langs/en_SG/accountancy.lang         |    2 +-
 htdocs/langs/en_SG/cron.lang                |    2 -
 htdocs/langs/en_SG/exports.lang             |    2 +
 htdocs/langs/en_SG/main.lang                |    1 +
 htdocs/langs/en_SG/mrp.lang                 |    6 -
 htdocs/langs/en_SG/products.lang            |    2 +
 htdocs/langs/en_SG/stocks.lang              |    3 +
 htdocs/langs/en_SG/ticket.lang              |    5 +
 htdocs/langs/es_AR/accountancy.lang         |    2 +-
 htdocs/langs/es_AR/agenda.lang              |   26 +
 htdocs/langs/es_AR/cron.lang                |    1 -
 htdocs/langs/es_AR/exports.lang             |    2 +
 htdocs/langs/es_AR/hrm.lang                 |    1 -
 htdocs/langs/es_AR/mrp.lang                 |    5 -
 htdocs/langs/es_AR/orders.lang              |    1 +
 htdocs/langs/es_AR/partnership.lang         |    2 +-
 htdocs/langs/es_AR/products.lang            |    1 +
 htdocs/langs/es_AR/stocks.lang              |    2 +
 htdocs/langs/es_AR/ticket.lang              |    3 +
 htdocs/langs/es_BO/accountancy.lang         |    2 +-
 htdocs/langs/es_BO/cron.lang                |    2 -
 htdocs/langs/es_BO/exports.lang             |    2 +
 htdocs/langs/es_BO/mrp.lang                 |    6 -
 htdocs/langs/es_BO/products.lang            |    2 +
 htdocs/langs/es_BO/stocks.lang              |    3 +
 htdocs/langs/es_BO/ticket.lang              |    5 +
 htdocs/langs/es_CL/accountancy.lang         |    2 +-
 htdocs/langs/es_CL/admin.lang               |    5 -
 htdocs/langs/es_CL/agenda.lang              |    2 -
 htdocs/langs/es_CL/cron.lang                |    1 -
 htdocs/langs/es_CL/errors.lang              |    1 -
 htdocs/langs/es_CL/hrm.lang                 |    1 -
 htdocs/langs/es_CL/mrp.lang                 |    7 +-
 htdocs/langs/es_CL/orders.lang              |    1 +
 htdocs/langs/es_CL/partnership.lang         |    2 +-
 htdocs/langs/es_CL/stocks.lang              |    2 +-
 htdocs/langs/es_CL/ticket.lang              |    1 +
 htdocs/langs/es_CO/accountancy.lang         |    1 -
 htdocs/langs/es_CO/admin.lang               |    6 -
 htdocs/langs/es_CO/errors.lang              |    1 -
 htdocs/langs/es_CO/hrm.lang                 |    1 -
 htdocs/langs/es_CO/mrp.lang                 |    6 -
 htdocs/langs/es_CO/partnership.lang         |   16 +-
 htdocs/langs/es_CO/products.lang            |    1 +
 htdocs/langs/es_CO/stocks.lang              |    2 -
 htdocs/langs/es_DO/accountancy.lang         |    2 +-
 htdocs/langs/es_DO/cron.lang                |    2 -
 htdocs/langs/es_DO/exports.lang             |    2 +
 htdocs/langs/es_DO/mrp.lang                 |    6 -
 htdocs/langs/es_DO/products.lang            |    2 +
 htdocs/langs/es_DO/stocks.lang              |    3 +
 htdocs/langs/es_DO/ticket.lang              |    5 +
 htdocs/langs/es_EC/accountancy.lang         |    2 +-
 htdocs/langs/es_EC/admin.lang               |    6 -
 htdocs/langs/es_EC/agenda.lang              |    1 -
 htdocs/langs/es_EC/cron.lang                |    1 -
 htdocs/langs/es_EC/errors.lang              |    1 -
 htdocs/langs/es_EC/hrm.lang                 |    1 -
 htdocs/langs/es_EC/mrp.lang                 |    7 +-
 htdocs/langs/es_EC/orders.lang              |    1 +
 htdocs/langs/es_EC/partnership.lang         |    2 +-
 htdocs/langs/es_EC/products.lang            |    1 +
 htdocs/langs/es_EC/stocks.lang              |    2 +-
 htdocs/langs/es_ES/accountancy.lang         |    5 +-
 htdocs/langs/es_ES/admin.lang               |   41 +-
 htdocs/langs/es_ES/agenda.lang              |    9 +-
 htdocs/langs/es_ES/bills.lang               |    2 +
 htdocs/langs/es_ES/cashdesk.lang            |    6 +-
 htdocs/langs/es_ES/compta.lang              |    6 +
 htdocs/langs/es_ES/cron.lang                |    2 +-
 htdocs/langs/es_ES/errors.lang              |    5 +-
 htdocs/langs/es_ES/eventorganization.lang   |   48 +-
 htdocs/langs/es_ES/hrm.lang                 |    2 +-
 htdocs/langs/es_ES/knowledgemanagement.lang |    2 +-
 htdocs/langs/es_ES/languages.lang           |    2 +
 htdocs/langs/es_ES/main.lang                |    5 +
 htdocs/langs/es_ES/members.lang             |    2 +
 htdocs/langs/es_ES/modulebuilder.lang       |    1 +
 htdocs/langs/es_ES/mrp.lang                 |   19 +-
 htdocs/langs/es_ES/orders.lang              |    2 +
 htdocs/langs/es_ES/other.lang               |    3 +-
 htdocs/langs/es_ES/partnership.lang         |   57 +-
 htdocs/langs/es_ES/productbatch.lang        |   12 +-
 htdocs/langs/es_ES/products.lang            |    2 +
 htdocs/langs/es_ES/projects.lang            |    2 +
 htdocs/langs/es_ES/receptions.lang          |    2 +-
 htdocs/langs/es_ES/stocks.lang              |    7 +-
 htdocs/langs/es_ES/ticket.lang              |    2 +-
 htdocs/langs/es_GT/accountancy.lang         |    2 +-
 htdocs/langs/es_GT/cron.lang                |    2 -
 htdocs/langs/es_GT/exports.lang             |    2 +
 htdocs/langs/es_GT/mrp.lang                 |    6 -
 htdocs/langs/es_GT/products.lang            |    2 +
 htdocs/langs/es_GT/stocks.lang              |    3 +
 htdocs/langs/es_GT/ticket.lang              |    5 +
 htdocs/langs/es_HN/accountancy.lang         |    2 +-
 htdocs/langs/es_HN/cron.lang                |    2 -
 htdocs/langs/es_HN/exports.lang             |    2 +
 htdocs/langs/es_HN/mrp.lang                 |    6 -
 htdocs/langs/es_HN/products.lang            |    2 +
 htdocs/langs/es_HN/stocks.lang              |    3 +
 htdocs/langs/es_HN/ticket.lang              |    5 +
 htdocs/langs/es_MX/accountancy.lang         |    6 +-
 htdocs/langs/es_MX/admin.lang               |   40 +
 htdocs/langs/es_MX/agenda.lang              |    2 -
 htdocs/langs/es_MX/cron.lang                |    1 +
 htdocs/langs/es_MX/exports.lang             |    3 +
 htdocs/langs/es_MX/main.lang                |    1 +
 htdocs/langs/es_MX/mrp.lang                 |    5 -
 htdocs/langs/es_MX/partnership.lang         |    2 +-
 htdocs/langs/es_MX/products.lang            |    1 +
 htdocs/langs/es_MX/stocks.lang              |    2 +
 htdocs/langs/es_MX/ticket.lang              |    3 +
 htdocs/langs/es_PA/accountancy.lang         |    2 +-
 htdocs/langs/es_PA/cron.lang                |    2 -
 htdocs/langs/es_PA/exports.lang             |    2 +
 htdocs/langs/es_PA/mrp.lang                 |    6 -
 htdocs/langs/es_PA/products.lang            |    2 +
 htdocs/langs/es_PA/stocks.lang              |    3 +
 htdocs/langs/es_PA/ticket.lang              |    5 +
 htdocs/langs/es_PE/accountancy.lang         |    2 +-
 htdocs/langs/es_PE/exports.lang             |    2 +
 htdocs/langs/es_PE/mrp.lang                 |    9 +-
 htdocs/langs/es_PE/products.lang            |    1 +
 htdocs/langs/es_PE/stocks.lang              |    2 +
 htdocs/langs/es_PE/ticket.lang              |    4 +
 htdocs/langs/es_PY/accountancy.lang         |    2 +-
 htdocs/langs/es_PY/cron.lang                |    2 -
 htdocs/langs/es_PY/exports.lang             |    2 +
 htdocs/langs/es_PY/mrp.lang                 |    6 -
 htdocs/langs/es_PY/products.lang            |    2 +
 htdocs/langs/es_PY/stocks.lang              |    3 +
 htdocs/langs/es_PY/ticket.lang              |    5 +
 htdocs/langs/es_US/accountancy.lang         |    2 +-
 htdocs/langs/es_US/cron.lang                |    2 -
 htdocs/langs/es_US/exports.lang             |    2 +
 htdocs/langs/es_US/mrp.lang                 |    6 -
 htdocs/langs/es_US/products.lang            |    2 +
 htdocs/langs/es_US/stocks.lang              |    3 +
 htdocs/langs/es_US/ticket.lang              |    5 +
 htdocs/langs/es_UY/accountancy.lang         |    2 +-
 htdocs/langs/es_UY/cron.lang                |    2 -
 htdocs/langs/es_UY/exports.lang             |    2 +
 htdocs/langs/es_UY/mrp.lang                 |    6 -
 htdocs/langs/es_UY/products.lang            |    2 +
 htdocs/langs/es_UY/stocks.lang              |    3 +
 htdocs/langs/es_UY/ticket.lang              |    5 +
 htdocs/langs/es_VE/accountancy.lang         |    2 +-
 htdocs/langs/es_VE/agenda.lang              |    2 -
 htdocs/langs/es_VE/exports.lang             |    2 +
 htdocs/langs/es_VE/mrp.lang                 |    6 -
 htdocs/langs/es_VE/partnership.lang         |    6 +-
 htdocs/langs/es_VE/stocks.lang              |    2 +
 htdocs/langs/es_VE/ticket.lang              |    3 +
 htdocs/langs/et_EE/accountancy.lang         |    5 +-
 htdocs/langs/et_EE/admin.lang               |   41 +-
 htdocs/langs/et_EE/agenda.lang              |   14 +-
 htdocs/langs/et_EE/bills.lang               |    2 +
 htdocs/langs/et_EE/cashdesk.lang            |    6 +-
 htdocs/langs/et_EE/compta.lang              |    6 +
 htdocs/langs/et_EE/cron.lang                |    2 +-
 htdocs/langs/et_EE/errors.lang              |    5 +-
 htdocs/langs/et_EE/eventorganization.lang   |   48 +-
 htdocs/langs/et_EE/hrm.lang                 |    2 +-
 htdocs/langs/et_EE/knowledgemanagement.lang |    2 +-
 htdocs/langs/et_EE/languages.lang           |    2 +
 htdocs/langs/et_EE/main.lang                |    5 +
 htdocs/langs/et_EE/members.lang             |    2 +
 htdocs/langs/et_EE/modulebuilder.lang       |    1 +
 htdocs/langs/et_EE/mrp.lang                 |   21 +-
 htdocs/langs/et_EE/orders.lang              |    2 +
 htdocs/langs/et_EE/other.lang               |    3 +-
 htdocs/langs/et_EE/partnership.lang         |   57 +-
 htdocs/langs/et_EE/productbatch.lang        |   12 +-
 htdocs/langs/et_EE/products.lang            |    2 +
 htdocs/langs/et_EE/projects.lang            |    2 +
 htdocs/langs/et_EE/receptions.lang          |    2 +-
 htdocs/langs/et_EE/stocks.lang              |    7 +-
 htdocs/langs/et_EE/ticket.lang              |    2 +-
 htdocs/langs/eu_ES/accountancy.lang         |    5 +-
 htdocs/langs/eu_ES/admin.lang               |   41 +-
 htdocs/langs/eu_ES/agenda.lang              |   14 +-
 htdocs/langs/eu_ES/bills.lang               |    2 +
 htdocs/langs/eu_ES/cashdesk.lang            |    6 +-
 htdocs/langs/eu_ES/compta.lang              |    6 +
 htdocs/langs/eu_ES/cron.lang                |    2 +-
 htdocs/langs/eu_ES/errors.lang              |    5 +-
 htdocs/langs/eu_ES/eventorganization.lang   |   48 +-
 htdocs/langs/eu_ES/hrm.lang                 |    2 +-
 htdocs/langs/eu_ES/knowledgemanagement.lang |    2 +-
 htdocs/langs/eu_ES/languages.lang           |    2 +
 htdocs/langs/eu_ES/main.lang                |    5 +
 htdocs/langs/eu_ES/members.lang             |    2 +
 htdocs/langs/eu_ES/modulebuilder.lang       |    1 +
 htdocs/langs/eu_ES/mrp.lang                 |   21 +-
 htdocs/langs/eu_ES/orders.lang              |    2 +
 htdocs/langs/eu_ES/other.lang               |    3 +-
 htdocs/langs/eu_ES/partnership.lang         |   57 +-
 htdocs/langs/eu_ES/productbatch.lang        |   12 +-
 htdocs/langs/eu_ES/products.lang            |    2 +
 htdocs/langs/eu_ES/projects.lang            |    2 +
 htdocs/langs/eu_ES/receptions.lang          |    2 +-
 htdocs/langs/eu_ES/stocks.lang              |    7 +-
 htdocs/langs/eu_ES/ticket.lang              |    2 +-
 htdocs/langs/fa_IR/accountancy.lang         |    5 +-
 htdocs/langs/fa_IR/admin.lang               |   41 +-
 htdocs/langs/fa_IR/agenda.lang              |   14 +-
 htdocs/langs/fa_IR/bills.lang               |    2 +
 htdocs/langs/fa_IR/cashdesk.lang            |    6 +-
 htdocs/langs/fa_IR/compta.lang              |    6 +
 htdocs/langs/fa_IR/cron.lang                |    2 +-
 htdocs/langs/fa_IR/errors.lang              |    5 +-
 htdocs/langs/fa_IR/eventorganization.lang   |   48 +-
 htdocs/langs/fa_IR/hrm.lang                 |    2 +-
 htdocs/langs/fa_IR/knowledgemanagement.lang |    2 +-
 htdocs/langs/fa_IR/languages.lang           |    2 +
 htdocs/langs/fa_IR/main.lang                |    5 +
 htdocs/langs/fa_IR/members.lang             |    2 +
 htdocs/langs/fa_IR/modulebuilder.lang       |    1 +
 htdocs/langs/fa_IR/mrp.lang                 |   21 +-
 htdocs/langs/fa_IR/orders.lang              |    2 +
 htdocs/langs/fa_IR/other.lang               |    3 +-
 htdocs/langs/fa_IR/partnership.lang         |   57 +-
 htdocs/langs/fa_IR/productbatch.lang        |   12 +-
 htdocs/langs/fa_IR/products.lang            |    2 +
 htdocs/langs/fa_IR/projects.lang            |    2 +
 htdocs/langs/fa_IR/receptions.lang          |    2 +-
 htdocs/langs/fa_IR/stocks.lang              |    7 +-
 htdocs/langs/fa_IR/ticket.lang              |    2 +-
 htdocs/langs/fi_FI/accountancy.lang         |    5 +-
 htdocs/langs/fi_FI/admin.lang               |   41 +-
 htdocs/langs/fi_FI/agenda.lang              |   14 +-
 htdocs/langs/fi_FI/bills.lang               |    2 +
 htdocs/langs/fi_FI/cashdesk.lang            |    6 +-
 htdocs/langs/fi_FI/compta.lang              |    6 +
 htdocs/langs/fi_FI/cron.lang                |    4 +-
 htdocs/langs/fi_FI/errors.lang              |    5 +-
 htdocs/langs/fi_FI/eventorganization.lang   |   48 +-
 htdocs/langs/fi_FI/hrm.lang                 |    2 +-
 htdocs/langs/fi_FI/knowledgemanagement.lang |    2 +-
 htdocs/langs/fi_FI/languages.lang           |    2 +
 htdocs/langs/fi_FI/main.lang                |    5 +
 htdocs/langs/fi_FI/members.lang             |    2 +
 htdocs/langs/fi_FI/modulebuilder.lang       |    1 +
 htdocs/langs/fi_FI/mrp.lang                 |   21 +-
 htdocs/langs/fi_FI/orders.lang              |    2 +
 htdocs/langs/fi_FI/other.lang               |    3 +-
 htdocs/langs/fi_FI/partnership.lang         |   57 +-
 htdocs/langs/fi_FI/productbatch.lang        |   12 +-
 htdocs/langs/fi_FI/products.lang            |    2 +
 htdocs/langs/fi_FI/projects.lang            |    2 +
 htdocs/langs/fi_FI/receptions.lang          |    2 +-
 htdocs/langs/fi_FI/stocks.lang              |    7 +-
 htdocs/langs/fi_FI/ticket.lang              |    2 +-
 htdocs/langs/fr_BE/accountancy.lang         |    2 +-
 htdocs/langs/fr_BE/agenda.lang              |    1 -
 htdocs/langs/fr_BE/cron.lang                |    2 -
 htdocs/langs/fr_BE/exports.lang             |    2 +
 htdocs/langs/fr_BE/main.lang                |    1 +
 htdocs/langs/fr_BE/mrp.lang                 |    6 -
 htdocs/langs/fr_BE/products.lang            |    2 +
 htdocs/langs/fr_BE/stocks.lang              |    3 +
 htdocs/langs/fr_BE/ticket.lang              |    5 +
 htdocs/langs/fr_CA/accountancy.lang         |    2 +-
 htdocs/langs/fr_CA/agenda.lang              |    1 -
 htdocs/langs/fr_CA/compta.lang              |    1 +
 htdocs/langs/fr_CA/cron.lang                |    1 -
 htdocs/langs/fr_CA/errors.lang              |    1 -
 htdocs/langs/fr_CA/main.lang                |    1 +
 htdocs/langs/fr_CA/mrp.lang                 |    6 -
 htdocs/langs/fr_CA/stocks.lang              |    3 +-
 htdocs/langs/fr_CA/ticket.lang              |    3 +
 htdocs/langs/fr_CH/accountancy.lang         |    2 +-
 htdocs/langs/fr_CH/cron.lang                |    2 -
 htdocs/langs/fr_CH/exports.lang             |    2 +
 htdocs/langs/fr_CH/main.lang                |    1 +
 htdocs/langs/fr_CH/mrp.lang                 |    6 -
 htdocs/langs/fr_CH/products.lang            |    2 +
 htdocs/langs/fr_CH/stocks.lang              |    3 +
 htdocs/langs/fr_CH/ticket.lang              |    5 +
 htdocs/langs/fr_CI/accountancy.lang         |    2 +-
 htdocs/langs/fr_CI/cron.lang                |    2 -
 htdocs/langs/fr_CI/exports.lang             |    2 +
 htdocs/langs/fr_CI/main.lang                |    1 +
 htdocs/langs/fr_CI/mrp.lang                 |    6 -
 htdocs/langs/fr_CI/products.lang            |    2 +
 htdocs/langs/fr_CI/stocks.lang              |    3 +
 htdocs/langs/fr_CI/ticket.lang              |    5 +
 htdocs/langs/fr_CM/accountancy.lang         |    2 +-
 htdocs/langs/fr_CM/cron.lang                |    2 -
 htdocs/langs/fr_CM/exports.lang             |    2 +
 htdocs/langs/fr_CM/main.lang                |    1 +
 htdocs/langs/fr_CM/mrp.lang                 |    6 -
 htdocs/langs/fr_CM/products.lang            |    2 +
 htdocs/langs/fr_CM/stocks.lang              |    3 +
 htdocs/langs/fr_CM/ticket.lang              |    5 +
 htdocs/langs/fr_FR/accountancy.lang         |   19 +-
 htdocs/langs/fr_FR/admin.lang               |   52 +-
 htdocs/langs/fr_FR/agenda.lang              |    2 +
 htdocs/langs/fr_FR/banks.lang               |    2 +-
 htdocs/langs/fr_FR/bills.lang               |    6 +-
 htdocs/langs/fr_FR/boxes.lang               |   10 +-
 htdocs/langs/fr_FR/cashdesk.lang            |   10 +-
 htdocs/langs/fr_FR/categories.lang          |   20 +-
 htdocs/langs/fr_FR/companies.lang           |   16 +-
 htdocs/langs/fr_FR/compta.lang              |   10 +-
 htdocs/langs/fr_FR/cron.lang                |    2 +-
 htdocs/langs/fr_FR/errors.lang              |   15 +-
 htdocs/langs/fr_FR/eventorganization.lang   |   48 +-
 htdocs/langs/fr_FR/hrm.lang                 |    2 +-
 htdocs/langs/fr_FR/knowledgemanagement.lang |   14 +-
 htdocs/langs/fr_FR/languages.lang           |    2 +
 htdocs/langs/fr_FR/mails.lang               |    6 +-
 htdocs/langs/fr_FR/main.lang                |   19 +-
 htdocs/langs/fr_FR/members.lang             |   39 +-
 htdocs/langs/fr_FR/modulebuilder.lang       |    1 +
 htdocs/langs/fr_FR/mrp.lang                 |    7 +-
 htdocs/langs/fr_FR/other.lang               |    5 +-
 htdocs/langs/fr_FR/partnership.lang         |   59 +-
 htdocs/langs/fr_FR/productbatch.lang        |   16 +-
 htdocs/langs/fr_FR/products.lang            |   24 +-
 htdocs/langs/fr_FR/projects.lang            |   10 +-
 htdocs/langs/fr_FR/receptions.lang          |    2 +-
 htdocs/langs/fr_FR/sendings.lang            |    2 +-
 htdocs/langs/fr_FR/ticket.lang              |    4 +-
 htdocs/langs/fr_FR/users.lang               |    6 +-
 htdocs/langs/fr_FR/website.lang             |    2 +-
 htdocs/langs/fr_GA/accountancy.lang         |    2 +-
 htdocs/langs/fr_GA/cron.lang                |    2 -
 htdocs/langs/fr_GA/exports.lang             |    2 +
 htdocs/langs/fr_GA/main.lang                |    1 +
 htdocs/langs/fr_GA/mrp.lang                 |    6 -
 htdocs/langs/fr_GA/products.lang            |    2 +
 htdocs/langs/fr_GA/stocks.lang              |    3 +
 htdocs/langs/fr_GA/ticket.lang              |    5 +
 htdocs/langs/gl_ES/accountancy.lang         |    5 +-
 htdocs/langs/gl_ES/admin.lang               |   79 +-
 htdocs/langs/gl_ES/agenda.lang              |   12 +-
 htdocs/langs/gl_ES/banks.lang               |    4 +-
 htdocs/langs/gl_ES/bills.lang               |   30 +-
 htdocs/langs/gl_ES/cashdesk.lang            |    6 +-
 htdocs/langs/gl_ES/compta.lang              |    6 +
 htdocs/langs/gl_ES/cron.lang                |    4 +-
 htdocs/langs/gl_ES/errors.lang              |    5 +-
 htdocs/langs/gl_ES/eventorganization.lang   |   48 +-
 htdocs/langs/gl_ES/holiday.lang             |   78 +-
 htdocs/langs/gl_ES/hrm.lang                 |    2 +-
 htdocs/langs/gl_ES/knowledgemanagement.lang |    2 +-
 htdocs/langs/gl_ES/languages.lang           |    2 +
 htdocs/langs/gl_ES/mails.lang               |    6 +-
 htdocs/langs/gl_ES/main.lang                |   21 +-
 htdocs/langs/gl_ES/members.lang             |    6 +-
 htdocs/langs/gl_ES/modulebuilder.lang       |    1 +
 htdocs/langs/gl_ES/mrp.lang                 |   51 +-
 htdocs/langs/gl_ES/orders.lang              |    2 +
 htdocs/langs/gl_ES/other.lang               |    3 +-
 htdocs/langs/gl_ES/partnership.lang         |   57 +-
 htdocs/langs/gl_ES/productbatch.lang        |   12 +-
 htdocs/langs/gl_ES/products.lang            |    2 +
 htdocs/langs/gl_ES/projects.lang            |    8 +-
 htdocs/langs/gl_ES/receptions.lang          |    2 +-
 htdocs/langs/gl_ES/stocks.lang              |    7 +-
 htdocs/langs/gl_ES/ticket.lang              |    2 +-
 htdocs/langs/gl_ES/trips.lang               |    2 +-
 htdocs/langs/gl_ES/website.lang             |    4 +-
 htdocs/langs/gl_ES/withdrawals.lang         |   57 +-
 htdocs/langs/he_IL/accountancy.lang         |    5 +-
 htdocs/langs/he_IL/admin.lang               |   41 +-
 htdocs/langs/he_IL/agenda.lang              |   14 +-
 htdocs/langs/he_IL/bills.lang               |    2 +
 htdocs/langs/he_IL/cashdesk.lang            |    6 +-
 htdocs/langs/he_IL/compta.lang              |    6 +
 htdocs/langs/he_IL/cron.lang                |    2 +-
 htdocs/langs/he_IL/errors.lang              |    5 +-
 htdocs/langs/he_IL/eventorganization.lang   |   48 +-
 htdocs/langs/he_IL/hrm.lang                 |    2 +-
 htdocs/langs/he_IL/knowledgemanagement.lang |    2 +-
 htdocs/langs/he_IL/languages.lang           |    2 +
 htdocs/langs/he_IL/main.lang                |    5 +
 htdocs/langs/he_IL/members.lang             |    2 +
 htdocs/langs/he_IL/modulebuilder.lang       |    1 +
 htdocs/langs/he_IL/mrp.lang                 |   21 +-
 htdocs/langs/he_IL/orders.lang              |    2 +
 htdocs/langs/he_IL/other.lang               |    3 +-
 htdocs/langs/he_IL/partnership.lang         |   57 +-
 htdocs/langs/he_IL/productbatch.lang        |   12 +-
 htdocs/langs/he_IL/products.lang            |    2 +
 htdocs/langs/he_IL/projects.lang            |    2 +
 htdocs/langs/he_IL/receptions.lang          |    2 +-
 htdocs/langs/he_IL/stocks.lang              |    7 +-
 htdocs/langs/he_IL/ticket.lang              |    2 +-
 htdocs/langs/hi_IN/accountancy.lang         |    5 +-
 htdocs/langs/hi_IN/admin.lang               |   41 +-
 htdocs/langs/hi_IN/agenda.lang              |   14 +-
 htdocs/langs/hi_IN/bills.lang               |    2 +
 htdocs/langs/hi_IN/cashdesk.lang            |    6 +-
 htdocs/langs/hi_IN/compta.lang              |    6 +
 htdocs/langs/hi_IN/cron.lang                |    2 +-
 htdocs/langs/hi_IN/errors.lang              |    5 +-
 htdocs/langs/hi_IN/eventorganization.lang   |   48 +-
 htdocs/langs/hi_IN/hrm.lang                 |    2 +-
 htdocs/langs/hi_IN/knowledgemanagement.lang |    2 +-
 htdocs/langs/hi_IN/languages.lang           |    2 +
 htdocs/langs/hi_IN/main.lang                |    5 +
 htdocs/langs/hi_IN/members.lang             |    2 +
 htdocs/langs/hi_IN/modulebuilder.lang       |    1 +
 htdocs/langs/hi_IN/mrp.lang                 |   21 +-
 htdocs/langs/hi_IN/orders.lang              |    2 +
 htdocs/langs/hi_IN/other.lang               |    3 +-
 htdocs/langs/hi_IN/partnership.lang         |   57 +-
 htdocs/langs/hi_IN/productbatch.lang        |   12 +-
 htdocs/langs/hi_IN/products.lang            |    2 +
 htdocs/langs/hi_IN/projects.lang            |    2 +
 htdocs/langs/hi_IN/receptions.lang          |    2 +-
 htdocs/langs/hi_IN/stocks.lang              |    7 +-
 htdocs/langs/hi_IN/ticket.lang              |    2 +-
 htdocs/langs/hr_HR/accountancy.lang         |    7 +-
 htdocs/langs/hr_HR/admin.lang               |   41 +-
 htdocs/langs/hr_HR/agenda.lang              |   14 +-
 htdocs/langs/hr_HR/bills.lang               |    2 +
 htdocs/langs/hr_HR/cashdesk.lang            |    6 +-
 htdocs/langs/hr_HR/compta.lang              |    6 +
 htdocs/langs/hr_HR/cron.lang                |    2 +-
 htdocs/langs/hr_HR/errors.lang              |    5 +-
 htdocs/langs/hr_HR/eventorganization.lang   |   48 +-
 htdocs/langs/hr_HR/hrm.lang                 |    2 +-
 htdocs/langs/hr_HR/knowledgemanagement.lang |    2 +-
 htdocs/langs/hr_HR/languages.lang           |    2 +
 htdocs/langs/hr_HR/main.lang                |    5 +
 htdocs/langs/hr_HR/members.lang             |    2 +
 htdocs/langs/hr_HR/modulebuilder.lang       |    1 +
 htdocs/langs/hr_HR/mrp.lang                 |   21 +-
 htdocs/langs/hr_HR/orders.lang              |    2 +
 htdocs/langs/hr_HR/other.lang               |    3 +-
 htdocs/langs/hr_HR/partnership.lang         |   57 +-
 htdocs/langs/hr_HR/productbatch.lang        |   12 +-
 htdocs/langs/hr_HR/products.lang            |    2 +
 htdocs/langs/hr_HR/projects.lang            |    2 +
 htdocs/langs/hr_HR/receptions.lang          |    2 +-
 htdocs/langs/hr_HR/stocks.lang              |    7 +-
 htdocs/langs/hr_HR/ticket.lang              |    2 +-
 htdocs/langs/hu_HU/accountancy.lang         |    5 +-
 htdocs/langs/hu_HU/admin.lang               |   41 +-
 htdocs/langs/hu_HU/agenda.lang              |   14 +-
 htdocs/langs/hu_HU/bills.lang               |    2 +
 htdocs/langs/hu_HU/cashdesk.lang            |    6 +-
 htdocs/langs/hu_HU/compta.lang              |    6 +
 htdocs/langs/hu_HU/cron.lang                |    2 +-
 htdocs/langs/hu_HU/errors.lang              |    5 +-
 htdocs/langs/hu_HU/eventorganization.lang   |   48 +-
 htdocs/langs/hu_HU/hrm.lang                 |    2 +-
 htdocs/langs/hu_HU/knowledgemanagement.lang |    2 +-
 htdocs/langs/hu_HU/languages.lang           |    2 +
 htdocs/langs/hu_HU/main.lang                |    5 +
 htdocs/langs/hu_HU/members.lang             |    2 +
 htdocs/langs/hu_HU/modulebuilder.lang       |    1 +
 htdocs/langs/hu_HU/mrp.lang                 |   21 +-
 htdocs/langs/hu_HU/orders.lang              |    2 +
 htdocs/langs/hu_HU/other.lang               |    3 +-
 htdocs/langs/hu_HU/partnership.lang         |   57 +-
 htdocs/langs/hu_HU/productbatch.lang        |   12 +-
 htdocs/langs/hu_HU/products.lang            |    2 +
 htdocs/langs/hu_HU/projects.lang            |    2 +
 htdocs/langs/hu_HU/receptions.lang          |    2 +-
 htdocs/langs/hu_HU/stocks.lang              |    7 +-
 htdocs/langs/hu_HU/ticket.lang              |    2 +-
 htdocs/langs/id_ID/accountancy.lang         |    5 +-
 htdocs/langs/id_ID/admin.lang               |   41 +-
 htdocs/langs/id_ID/agenda.lang              |    2 +
 htdocs/langs/id_ID/bills.lang               |    2 +
 htdocs/langs/id_ID/cashdesk.lang            |    6 +-
 htdocs/langs/id_ID/compta.lang              |    6 +
 htdocs/langs/id_ID/cron.lang                |    2 +-
 htdocs/langs/id_ID/errors.lang              |    5 +-
 htdocs/langs/id_ID/eventorganization.lang   |   48 +-
 htdocs/langs/id_ID/hrm.lang                 |    2 +-
 htdocs/langs/id_ID/knowledgemanagement.lang |    2 +-
 htdocs/langs/id_ID/languages.lang           |    2 +
 htdocs/langs/id_ID/main.lang                |    5 +
 htdocs/langs/id_ID/members.lang             |    2 +
 htdocs/langs/id_ID/modulebuilder.lang       |    1 +
 htdocs/langs/id_ID/mrp.lang                 |   21 +-
 htdocs/langs/id_ID/orders.lang              |    2 +
 htdocs/langs/id_ID/other.lang               |    3 +-
 htdocs/langs/id_ID/partnership.lang         |   57 +-
 htdocs/langs/id_ID/productbatch.lang        |   12 +-
 htdocs/langs/id_ID/products.lang            |    2 +
 htdocs/langs/id_ID/projects.lang            |    2 +
 htdocs/langs/id_ID/receptions.lang          |    2 +-
 htdocs/langs/id_ID/stocks.lang              |    7 +-
 htdocs/langs/id_ID/ticket.lang              |    2 +-
 htdocs/langs/is_IS/accountancy.lang         |    5 +-
 htdocs/langs/is_IS/admin.lang               |   41 +-
 htdocs/langs/is_IS/agenda.lang              |   14 +-
 htdocs/langs/is_IS/bills.lang               |    2 +
 htdocs/langs/is_IS/cashdesk.lang            |    6 +-
 htdocs/langs/is_IS/compta.lang              |    6 +
 htdocs/langs/is_IS/cron.lang                |    2 +-
 htdocs/langs/is_IS/errors.lang              |    5 +-
 htdocs/langs/is_IS/eventorganization.lang   |   48 +-
 htdocs/langs/is_IS/hrm.lang                 |    2 +-
 htdocs/langs/is_IS/knowledgemanagement.lang |    2 +-
 htdocs/langs/is_IS/languages.lang           |    2 +
 htdocs/langs/is_IS/main.lang                |    5 +
 htdocs/langs/is_IS/members.lang             |    2 +
 htdocs/langs/is_IS/modulebuilder.lang       |    1 +
 htdocs/langs/is_IS/mrp.lang                 |   21 +-
 htdocs/langs/is_IS/orders.lang              |    2 +
 htdocs/langs/is_IS/other.lang               |    3 +-
 htdocs/langs/is_IS/partnership.lang         |   57 +-
 htdocs/langs/is_IS/productbatch.lang        |   12 +-
 htdocs/langs/is_IS/products.lang            |    2 +
 htdocs/langs/is_IS/projects.lang            |    2 +
 htdocs/langs/is_IS/receptions.lang          |    2 +-
 htdocs/langs/is_IS/stocks.lang              |    7 +-
 htdocs/langs/is_IS/ticket.lang              |    2 +-
 htdocs/langs/it_CH/accountancy.lang         |    2 -
 htdocs/langs/it_CH/cron.lang                |    2 -
 htdocs/langs/it_CH/exports.lang             |    2 +
 htdocs/langs/it_CH/mrp.lang                 |    2 -
 htdocs/langs/it_CH/products.lang            |    2 +
 htdocs/langs/it_CH/stocks.lang              |    2 +
 htdocs/langs/it_CH/ticket.lang              |    4 +
 htdocs/langs/it_IT/accountancy.lang         |    5 +-
 htdocs/langs/it_IT/admin.lang               |   43 +-
 htdocs/langs/it_IT/agenda.lang              |   16 +-
 htdocs/langs/it_IT/bills.lang               |    2 +
 htdocs/langs/it_IT/cashdesk.lang            |    6 +-
 htdocs/langs/it_IT/compta.lang              |    6 +
 htdocs/langs/it_IT/cron.lang                |    2 +-
 htdocs/langs/it_IT/errors.lang              |    5 +-
 htdocs/langs/it_IT/eventorganization.lang   |   48 +-
 htdocs/langs/it_IT/hrm.lang                 |    2 +-
 htdocs/langs/it_IT/knowledgemanagement.lang |    2 +-
 htdocs/langs/it_IT/languages.lang           |    2 +
 htdocs/langs/it_IT/main.lang                |    5 +
 htdocs/langs/it_IT/members.lang             |    2 +
 htdocs/langs/it_IT/modulebuilder.lang       |    1 +
 htdocs/langs/it_IT/mrp.lang                 |   21 +-
 htdocs/langs/it_IT/orders.lang              |    6 +-
 htdocs/langs/it_IT/other.lang               |    3 +-
 htdocs/langs/it_IT/partnership.lang         |   57 +-
 htdocs/langs/it_IT/productbatch.lang        |   12 +-
 htdocs/langs/it_IT/products.lang            |    2 +
 htdocs/langs/it_IT/projects.lang            |    2 +
 htdocs/langs/it_IT/receptions.lang          |    4 +-
 htdocs/langs/it_IT/stocks.lang              |    7 +-
 htdocs/langs/it_IT/ticket.lang              |    2 +-
 htdocs/langs/ja_JP/accountancy.lang         |   13 +-
 htdocs/langs/ja_JP/admin.lang               |   59 +-
 htdocs/langs/ja_JP/agenda.lang              |    2 +
 htdocs/langs/ja_JP/banks.lang               |    8 +-
 htdocs/langs/ja_JP/bills.lang               |   10 +-
 htdocs/langs/ja_JP/boxes.lang               |   40 +-
 htdocs/langs/ja_JP/cashdesk.lang            |   16 +-
 htdocs/langs/ja_JP/categories.lang          |   20 +-
 htdocs/langs/ja_JP/commercial.lang          |   11 +-
 htdocs/langs/ja_JP/companies.lang           |   18 +-
 htdocs/langs/ja_JP/compta.lang              |    8 +-
 htdocs/langs/ja_JP/cron.lang                |    6 +-
 htdocs/langs/ja_JP/ecm.lang                 |    2 +-
 htdocs/langs/ja_JP/errors.lang              |   15 +-
 htdocs/langs/ja_JP/eventorganization.lang   |   48 +-
 htdocs/langs/ja_JP/exports.lang             |    8 +-
 htdocs/langs/ja_JP/hrm.lang                 |    2 +-
 htdocs/langs/ja_JP/knowledgemanagement.lang |   20 +-
 htdocs/langs/ja_JP/languages.lang           |    2 +
 htdocs/langs/ja_JP/mails.lang               |    6 +-
 htdocs/langs/ja_JP/main.lang                |   35 +-
 htdocs/langs/ja_JP/members.lang             |   40 +-
 htdocs/langs/ja_JP/modulebuilder.lang       |    1 +
 htdocs/langs/ja_JP/mrp.lang                 |   15 +-
 htdocs/langs/ja_JP/orders.lang              |    2 +
 htdocs/langs/ja_JP/other.lang               |   39 +-
 htdocs/langs/ja_JP/partnership.lang         |   59 +-
 htdocs/langs/ja_JP/productbatch.lang        |   16 +-
 htdocs/langs/ja_JP/products.lang            |   56 +-
 htdocs/langs/ja_JP/projects.lang            |   20 +-
 htdocs/langs/ja_JP/receptions.lang          |    2 +-
 htdocs/langs/ja_JP/sendings.lang            |    2 +-
 htdocs/langs/ja_JP/stocks.lang              |   49 +-
 htdocs/langs/ja_JP/ticket.lang              |    2 +-
 htdocs/langs/ja_JP/users.lang               |    6 +-
 htdocs/langs/ja_JP/website.lang             |    2 +-
 htdocs/langs/ka_GE/accountancy.lang         |    5 +-
 htdocs/langs/ka_GE/admin.lang               |   41 +-
 htdocs/langs/ka_GE/agenda.lang              |   14 +-
 htdocs/langs/ka_GE/bills.lang               |    2 +
 htdocs/langs/ka_GE/cashdesk.lang            |    6 +-
 htdocs/langs/ka_GE/compta.lang              |    6 +
 htdocs/langs/ka_GE/cron.lang                |    2 +-
 htdocs/langs/ka_GE/errors.lang              |    5 +-
 htdocs/langs/ka_GE/eventorganization.lang   |   48 +-
 htdocs/langs/ka_GE/hrm.lang                 |    2 +-
 htdocs/langs/ka_GE/knowledgemanagement.lang |    2 +-
 htdocs/langs/ka_GE/languages.lang           |    2 +
 htdocs/langs/ka_GE/main.lang                |    5 +
 htdocs/langs/ka_GE/members.lang             |    2 +
 htdocs/langs/ka_GE/modulebuilder.lang       |    1 +
 htdocs/langs/ka_GE/mrp.lang                 |   21 +-
 htdocs/langs/ka_GE/orders.lang              |    2 +
 htdocs/langs/ka_GE/other.lang               |    3 +-
 htdocs/langs/ka_GE/partnership.lang         |   57 +-
 htdocs/langs/ka_GE/productbatch.lang        |   12 +-
 htdocs/langs/ka_GE/products.lang            |    2 +
 htdocs/langs/ka_GE/projects.lang            |    2 +
 htdocs/langs/ka_GE/receptions.lang          |    2 +-
 htdocs/langs/ka_GE/stocks.lang              |    7 +-
 htdocs/langs/ka_GE/ticket.lang              |    2 +-
 htdocs/langs/km_KH/accountancy.lang         |    5 +-
 htdocs/langs/km_KH/admin.lang               |   41 +-
 htdocs/langs/km_KH/agenda.lang              |   14 +-
 htdocs/langs/km_KH/bills.lang               |    2 +
 htdocs/langs/km_KH/cashdesk.lang            |    6 +-
 htdocs/langs/km_KH/compta.lang              |    6 +
 htdocs/langs/km_KH/cron.lang                |    2 +-
 htdocs/langs/km_KH/errors.lang              |    5 +-
 htdocs/langs/km_KH/eventorganization.lang   |   48 +-
 htdocs/langs/km_KH/hrm.lang                 |    2 +-
 htdocs/langs/km_KH/knowledgemanagement.lang |    2 +-
 htdocs/langs/km_KH/languages.lang           |    2 +
 htdocs/langs/km_KH/main.lang                |    5 +
 htdocs/langs/km_KH/members.lang             |    2 +
 htdocs/langs/km_KH/modulebuilder.lang       |    1 +
 htdocs/langs/km_KH/mrp.lang                 |   21 +-
 htdocs/langs/km_KH/orders.lang              |    2 +
 htdocs/langs/km_KH/other.lang               |    3 +-
 htdocs/langs/km_KH/partnership.lang         |   57 +-
 htdocs/langs/km_KH/productbatch.lang        |   12 +-
 htdocs/langs/km_KH/products.lang            |    2 +
 htdocs/langs/km_KH/projects.lang            |    2 +
 htdocs/langs/km_KH/receptions.lang          |    2 +-
 htdocs/langs/km_KH/stocks.lang              |    7 +-
 htdocs/langs/km_KH/ticket.lang              |    2 +-
 htdocs/langs/kn_IN/accountancy.lang         |    5 +-
 htdocs/langs/kn_IN/admin.lang               |   41 +-
 htdocs/langs/kn_IN/agenda.lang              |   14 +-
 htdocs/langs/kn_IN/bills.lang               |    2 +
 htdocs/langs/kn_IN/cashdesk.lang            |    6 +-
 htdocs/langs/kn_IN/compta.lang              |    6 +
 htdocs/langs/kn_IN/cron.lang                |    2 +-
 htdocs/langs/kn_IN/errors.lang              |    5 +-
 htdocs/langs/kn_IN/eventorganization.lang   |   48 +-
 htdocs/langs/kn_IN/hrm.lang                 |    2 +-
 htdocs/langs/kn_IN/knowledgemanagement.lang |    2 +-
 htdocs/langs/kn_IN/languages.lang           |    2 +
 htdocs/langs/kn_IN/main.lang                |    5 +
 htdocs/langs/kn_IN/members.lang             |    2 +
 htdocs/langs/kn_IN/modulebuilder.lang       |    1 +
 htdocs/langs/kn_IN/mrp.lang                 |   21 +-
 htdocs/langs/kn_IN/orders.lang              |    2 +
 htdocs/langs/kn_IN/other.lang               |    3 +-
 htdocs/langs/kn_IN/partnership.lang         |   57 +-
 htdocs/langs/kn_IN/productbatch.lang        |   12 +-
 htdocs/langs/kn_IN/products.lang            |    2 +
 htdocs/langs/kn_IN/projects.lang            |    2 +
 htdocs/langs/kn_IN/receptions.lang          |    2 +-
 htdocs/langs/kn_IN/stocks.lang              |    7 +-
 htdocs/langs/kn_IN/ticket.lang              |    2 +-
 htdocs/langs/ko_KR/accountancy.lang         |    5 +-
 htdocs/langs/ko_KR/admin.lang               |   41 +-
 htdocs/langs/ko_KR/agenda.lang              |   14 +-
 htdocs/langs/ko_KR/bills.lang               |    2 +
 htdocs/langs/ko_KR/cashdesk.lang            |    6 +-
 htdocs/langs/ko_KR/compta.lang              |    6 +
 htdocs/langs/ko_KR/cron.lang                |    2 +-
 htdocs/langs/ko_KR/errors.lang              |    5 +-
 htdocs/langs/ko_KR/eventorganization.lang   |   48 +-
 htdocs/langs/ko_KR/hrm.lang                 |    2 +-
 htdocs/langs/ko_KR/knowledgemanagement.lang |    2 +-
 htdocs/langs/ko_KR/languages.lang           |    2 +
 htdocs/langs/ko_KR/main.lang                |    5 +
 htdocs/langs/ko_KR/members.lang             |    2 +
 htdocs/langs/ko_KR/modulebuilder.lang       |    1 +
 htdocs/langs/ko_KR/mrp.lang                 |   21 +-
 htdocs/langs/ko_KR/orders.lang              |    2 +
 htdocs/langs/ko_KR/other.lang               |    3 +-
 htdocs/langs/ko_KR/partnership.lang         |   57 +-
 htdocs/langs/ko_KR/productbatch.lang        |   12 +-
 htdocs/langs/ko_KR/products.lang            |    2 +
 htdocs/langs/ko_KR/projects.lang            |    2 +
 htdocs/langs/ko_KR/receptions.lang          |    2 +-
 htdocs/langs/ko_KR/stocks.lang              |    7 +-
 htdocs/langs/ko_KR/ticket.lang              |    2 +-
 htdocs/langs/lo_LA/accountancy.lang         |    5 +-
 htdocs/langs/lo_LA/admin.lang               |   41 +-
 htdocs/langs/lo_LA/agenda.lang              |   14 +-
 htdocs/langs/lo_LA/bills.lang               |    2 +
 htdocs/langs/lo_LA/cashdesk.lang            |    6 +-
 htdocs/langs/lo_LA/compta.lang              |    6 +
 htdocs/langs/lo_LA/cron.lang                |    2 +-
 htdocs/langs/lo_LA/errors.lang              |    5 +-
 htdocs/langs/lo_LA/eventorganization.lang   |   48 +-
 htdocs/langs/lo_LA/hrm.lang                 |    2 +-
 htdocs/langs/lo_LA/knowledgemanagement.lang |    2 +-
 htdocs/langs/lo_LA/languages.lang           |    2 +
 htdocs/langs/lo_LA/main.lang                |    5 +
 htdocs/langs/lo_LA/members.lang             |    2 +
 htdocs/langs/lo_LA/modulebuilder.lang       |    1 +
 htdocs/langs/lo_LA/mrp.lang                 |   21 +-
 htdocs/langs/lo_LA/orders.lang              |    2 +
 htdocs/langs/lo_LA/other.lang               |    3 +-
 htdocs/langs/lo_LA/partnership.lang         |   57 +-
 htdocs/langs/lo_LA/productbatch.lang        |   12 +-
 htdocs/langs/lo_LA/products.lang            |    2 +
 htdocs/langs/lo_LA/projects.lang            |    2 +
 htdocs/langs/lo_LA/receptions.lang          |    2 +-
 htdocs/langs/lo_LA/stocks.lang              |    7 +-
 htdocs/langs/lo_LA/ticket.lang              |    2 +-
 htdocs/langs/lt_LT/accountancy.lang         |    5 +-
 htdocs/langs/lt_LT/admin.lang               |   41 +-
 htdocs/langs/lt_LT/agenda.lang              |   14 +-
 htdocs/langs/lt_LT/bills.lang               |    2 +
 htdocs/langs/lt_LT/cashdesk.lang            |    6 +-
 htdocs/langs/lt_LT/compta.lang              |    6 +
 htdocs/langs/lt_LT/cron.lang                |    2 +-
 htdocs/langs/lt_LT/errors.lang              |    5 +-
 htdocs/langs/lt_LT/eventorganization.lang   |   48 +-
 htdocs/langs/lt_LT/hrm.lang                 |    2 +-
 htdocs/langs/lt_LT/knowledgemanagement.lang |    2 +-
 htdocs/langs/lt_LT/languages.lang           |    2 +
 htdocs/langs/lt_LT/main.lang                |    5 +
 htdocs/langs/lt_LT/members.lang             |    2 +
 htdocs/langs/lt_LT/modulebuilder.lang       |    1 +
 htdocs/langs/lt_LT/mrp.lang                 |   21 +-
 htdocs/langs/lt_LT/orders.lang              |    2 +
 htdocs/langs/lt_LT/other.lang               |    3 +-
 htdocs/langs/lt_LT/partnership.lang         |   57 +-
 htdocs/langs/lt_LT/productbatch.lang        |   12 +-
 htdocs/langs/lt_LT/products.lang            |    2 +
 htdocs/langs/lt_LT/projects.lang            |    2 +
 htdocs/langs/lt_LT/receptions.lang          |    2 +-
 htdocs/langs/lt_LT/stocks.lang              |    7 +-
 htdocs/langs/lt_LT/ticket.lang              |    2 +-
 htdocs/langs/lv_LV/accountancy.lang         |    5 +-
 htdocs/langs/lv_LV/admin.lang               |   41 +-
 htdocs/langs/lv_LV/agenda.lang              |   22 +-
 htdocs/langs/lv_LV/bills.lang               |    2 +
 htdocs/langs/lv_LV/cashdesk.lang            |    6 +-
 htdocs/langs/lv_LV/compta.lang              |    6 +
 htdocs/langs/lv_LV/cron.lang                |   14 +-
 htdocs/langs/lv_LV/errors.lang              |    5 +-
 htdocs/langs/lv_LV/eventorganization.lang   |   48 +-
 htdocs/langs/lv_LV/hrm.lang                 |    2 +-
 htdocs/langs/lv_LV/knowledgemanagement.lang |    2 +-
 htdocs/langs/lv_LV/languages.lang           |    4 +-
 htdocs/langs/lv_LV/main.lang                |    5 +
 htdocs/langs/lv_LV/members.lang             |    2 +
 htdocs/langs/lv_LV/modulebuilder.lang       |    1 +
 htdocs/langs/lv_LV/mrp.lang                 |   63 +-
 htdocs/langs/lv_LV/orders.lang              |    2 +
 htdocs/langs/lv_LV/other.lang               |    3 +-
 htdocs/langs/lv_LV/partnership.lang         |   57 +-
 htdocs/langs/lv_LV/productbatch.lang        |   12 +-
 htdocs/langs/lv_LV/products.lang            |    2 +
 htdocs/langs/lv_LV/projects.lang            |    2 +
 htdocs/langs/lv_LV/receptions.lang          |    2 +-
 htdocs/langs/lv_LV/stocks.lang              |    7 +-
 htdocs/langs/lv_LV/ticket.lang              |    2 +-
 htdocs/langs/mk_MK/accountancy.lang         |    5 +-
 htdocs/langs/mk_MK/admin.lang               |   41 +-
 htdocs/langs/mk_MK/agenda.lang              |   14 +-
 htdocs/langs/mk_MK/bills.lang               |    2 +
 htdocs/langs/mk_MK/cashdesk.lang            |    6 +-
 htdocs/langs/mk_MK/compta.lang              |    6 +
 htdocs/langs/mk_MK/cron.lang                |    2 +-
 htdocs/langs/mk_MK/errors.lang              |    5 +-
 htdocs/langs/mk_MK/eventorganization.lang   |   48 +-
 htdocs/langs/mk_MK/hrm.lang                 |    2 +-
 htdocs/langs/mk_MK/knowledgemanagement.lang |    2 +-
 htdocs/langs/mk_MK/languages.lang           |    2 +
 htdocs/langs/mk_MK/main.lang                |    5 +
 htdocs/langs/mk_MK/members.lang             |    2 +
 htdocs/langs/mk_MK/modulebuilder.lang       |    1 +
 htdocs/langs/mk_MK/mrp.lang                 |   21 +-
 htdocs/langs/mk_MK/orders.lang              |    2 +
 htdocs/langs/mk_MK/other.lang               |    3 +-
 htdocs/langs/mk_MK/partnership.lang         |   57 +-
 htdocs/langs/mk_MK/productbatch.lang        |   12 +-
 htdocs/langs/mk_MK/products.lang            |    2 +
 htdocs/langs/mk_MK/projects.lang            |    2 +
 htdocs/langs/mk_MK/receptions.lang          |    2 +-
 htdocs/langs/mk_MK/stocks.lang              |    7 +-
 htdocs/langs/mk_MK/ticket.lang              |    2 +-
 htdocs/langs/mn_MN/accountancy.lang         |    5 +-
 htdocs/langs/mn_MN/admin.lang               |   41 +-
 htdocs/langs/mn_MN/agenda.lang              |   14 +-
 htdocs/langs/mn_MN/bills.lang               |    2 +
 htdocs/langs/mn_MN/cashdesk.lang            |    6 +-
 htdocs/langs/mn_MN/compta.lang              |    6 +
 htdocs/langs/mn_MN/cron.lang                |    2 +-
 htdocs/langs/mn_MN/errors.lang              |    5 +-
 htdocs/langs/mn_MN/eventorganization.lang   |   48 +-
 htdocs/langs/mn_MN/hrm.lang                 |    2 +-
 htdocs/langs/mn_MN/knowledgemanagement.lang |    2 +-
 htdocs/langs/mn_MN/languages.lang           |    2 +
 htdocs/langs/mn_MN/main.lang                |    5 +
 htdocs/langs/mn_MN/members.lang             |    2 +
 htdocs/langs/mn_MN/modulebuilder.lang       |    1 +
 htdocs/langs/mn_MN/mrp.lang                 |   21 +-
 htdocs/langs/mn_MN/orders.lang              |    2 +
 htdocs/langs/mn_MN/other.lang               |    3 +-
 htdocs/langs/mn_MN/partnership.lang         |   57 +-
 htdocs/langs/mn_MN/productbatch.lang        |   12 +-
 htdocs/langs/mn_MN/products.lang            |    2 +
 htdocs/langs/mn_MN/projects.lang            |    2 +
 htdocs/langs/mn_MN/receptions.lang          |    2 +-
 htdocs/langs/mn_MN/stocks.lang              |    7 +-
 htdocs/langs/mn_MN/ticket.lang              |    2 +-
 htdocs/langs/nb_NO/accountancy.lang         |   15 +-
 htdocs/langs/nb_NO/admin.lang               |   41 +-
 htdocs/langs/nb_NO/agenda.lang              |    9 +-
 htdocs/langs/nb_NO/bills.lang               |    2 +
 htdocs/langs/nb_NO/cashdesk.lang            |    6 +-
 htdocs/langs/nb_NO/commercial.lang          |    5 +-
 htdocs/langs/nb_NO/compta.lang              |    6 +
 htdocs/langs/nb_NO/cron.lang                |    2 +-
 htdocs/langs/nb_NO/donations.lang           |    2 +-
 htdocs/langs/nb_NO/errors.lang              |    5 +-
 htdocs/langs/nb_NO/eventorganization.lang   |   48 +-
 htdocs/langs/nb_NO/hrm.lang                 |    2 +-
 htdocs/langs/nb_NO/knowledgemanagement.lang |    2 +-
 htdocs/langs/nb_NO/languages.lang           |    2 +
 htdocs/langs/nb_NO/main.lang                |    5 +
 htdocs/langs/nb_NO/members.lang             |   44 +-
 htdocs/langs/nb_NO/modulebuilder.lang       |    1 +
 htdocs/langs/nb_NO/mrp.lang                 |   19 +-
 htdocs/langs/nb_NO/orders.lang              |    6 +-
 htdocs/langs/nb_NO/other.lang               |    3 +-
 htdocs/langs/nb_NO/partnership.lang         |   61 +-
 htdocs/langs/nb_NO/productbatch.lang        |   12 +-
 htdocs/langs/nb_NO/products.lang            |    2 +
 htdocs/langs/nb_NO/projects.lang            |    2 +
 htdocs/langs/nb_NO/receptions.lang          |    2 +-
 htdocs/langs/nb_NO/salaries.lang            |    2 +-
 htdocs/langs/nb_NO/sendings.lang            |    2 +-
 htdocs/langs/nb_NO/stocks.lang              |   11 +-
 htdocs/langs/nb_NO/ticket.lang              |    2 +-
 htdocs/langs/nb_NO/trips.lang               |    6 +-
 htdocs/langs/ne_NP/accountancy.lang         |    5 +-
 htdocs/langs/ne_NP/admin.lang               |   41 +-
 htdocs/langs/ne_NP/agenda.lang              |   14 +-
 htdocs/langs/ne_NP/bills.lang               |    2 +
 htdocs/langs/ne_NP/cashdesk.lang            |    6 +-
 htdocs/langs/ne_NP/compta.lang              |    6 +
 htdocs/langs/ne_NP/cron.lang                |    2 +-
 htdocs/langs/ne_NP/errors.lang              |    5 +-
 htdocs/langs/ne_NP/eventorganization.lang   |   48 +-
 htdocs/langs/ne_NP/hrm.lang                 |    2 +-
 htdocs/langs/ne_NP/knowledgemanagement.lang |    2 +-
 htdocs/langs/ne_NP/languages.lang           |    2 +
 htdocs/langs/ne_NP/main.lang                |    5 +
 htdocs/langs/ne_NP/members.lang             |    2 +
 htdocs/langs/ne_NP/modulebuilder.lang       |    1 +
 htdocs/langs/ne_NP/mrp.lang                 |   21 +-
 htdocs/langs/ne_NP/orders.lang              |    2 +
 htdocs/langs/ne_NP/other.lang               |    3 +-
 htdocs/langs/ne_NP/partnership.lang         |   57 +-
 htdocs/langs/ne_NP/productbatch.lang        |   12 +-
 htdocs/langs/ne_NP/products.lang            |    2 +
 htdocs/langs/ne_NP/projects.lang            |    2 +
 htdocs/langs/ne_NP/receptions.lang          |    2 +-
 htdocs/langs/ne_NP/stocks.lang              |    7 +-
 htdocs/langs/ne_NP/ticket.lang              |    2 +-
 htdocs/langs/nl_BE/accountancy.lang         |    2 +-
 htdocs/langs/nl_BE/agenda.lang              |    1 -
 htdocs/langs/nl_BE/cashdesk.lang            |    1 +
 htdocs/langs/nl_BE/help.lang                |   10 +
 htdocs/langs/nl_BE/mrp.lang                 |    6 -
 htdocs/langs/nl_BE/orders.lang              |    1 +
 htdocs/langs/nl_BE/other.lang               |    2 +
 htdocs/langs/nl_BE/paybox.lang              |    2 +
 htdocs/langs/nl_BE/stocks.lang              |    2 +
 htdocs/langs/nl_NL/accountancy.lang         |   51 +-
 htdocs/langs/nl_NL/admin.lang               |  147 +-
 htdocs/langs/nl_NL/agenda.lang              |    9 +-
 htdocs/langs/nl_NL/assets.lang              |    2 +
 htdocs/langs/nl_NL/banks.lang               |   10 +-
 htdocs/langs/nl_NL/bills.lang               |   34 +-
 htdocs/langs/nl_NL/blockedlog.lang          |    2 +-
 htdocs/langs/nl_NL/boxes.lang               |   28 +-
 htdocs/langs/nl_NL/cashdesk.lang            |   22 +-
 htdocs/langs/nl_NL/categories.lang          |   24 +-
 htdocs/langs/nl_NL/commercial.lang          |    5 +-
 htdocs/langs/nl_NL/companies.lang           |   36 +-
 htdocs/langs/nl_NL/compta.lang              |   54 +-
 htdocs/langs/nl_NL/cron.lang                |    2 +-
 htdocs/langs/nl_NL/donations.lang           |    2 +-
 htdocs/langs/nl_NL/ecm.lang                 |    8 +-
 htdocs/langs/nl_NL/errors.lang              |   37 +-
 htdocs/langs/nl_NL/eventorganization.lang   |  150 +-
 htdocs/langs/nl_NL/externalsite.lang        |    2 +-
 htdocs/langs/nl_NL/help.lang                |   36 +-
 htdocs/langs/nl_NL/holiday.lang             |   30 +-
 htdocs/langs/nl_NL/hrm.lang                 |    2 +-
 htdocs/langs/nl_NL/knowledgemanagement.lang |   20 +-
 htdocs/langs/nl_NL/languages.lang           |    2 +
 htdocs/langs/nl_NL/mails.lang               |   10 +-
 htdocs/langs/nl_NL/main.lang                |   85 +-
 htdocs/langs/nl_NL/margins.lang             |    2 +-
 htdocs/langs/nl_NL/members.lang             |   58 +-
 htdocs/langs/nl_NL/modulebuilder.lang       |    9 +-
 htdocs/langs/nl_NL/mrp.lang                 |   51 +-
 htdocs/langs/nl_NL/orders.lang              |    6 +-
 htdocs/langs/nl_NL/other.lang               |   23 +-
 htdocs/langs/nl_NL/partnership.lang         |   59 +-
 htdocs/langs/nl_NL/paybox.lang              |    3 +-
 htdocs/langs/nl_NL/productbatch.lang        |   36 +-
 htdocs/langs/nl_NL/products.lang            |   32 +-
 htdocs/langs/nl_NL/projects.lang            |   24 +-
 htdocs/langs/nl_NL/propal.lang              |    2 +-
 htdocs/langs/nl_NL/receptions.lang          |    2 +-
 htdocs/langs/nl_NL/salaries.lang            |    5 +-
 htdocs/langs/nl_NL/sendings.lang            |    2 +-
 htdocs/langs/nl_NL/stocks.lang              |   53 +-
 htdocs/langs/nl_NL/supplier_proposal.lang   |    4 +
 htdocs/langs/nl_NL/ticket.lang              |   32 +-
 htdocs/langs/nl_NL/trips.lang               |    2 +-
 htdocs/langs/nl_NL/users.lang               |    8 +-
 htdocs/langs/nl_NL/website.lang             |   18 +-
 htdocs/langs/nl_NL/withdrawals.lang         |    3 +-
 htdocs/langs/pl_PL/accountancy.lang         |   13 +-
 htdocs/langs/pl_PL/admin.lang               |   77 +-
 htdocs/langs/pl_PL/agenda.lang              |  120 +-
 htdocs/langs/pl_PL/banks.lang               |    8 +-
 htdocs/langs/pl_PL/bills.lang               |   12 +-
 htdocs/langs/pl_PL/boxes.lang               |   10 +-
 htdocs/langs/pl_PL/cashdesk.lang            |   16 +-
 htdocs/langs/pl_PL/categories.lang          |   24 +-
 htdocs/langs/pl_PL/commercial.lang          |   25 +-
 htdocs/langs/pl_PL/companies.lang           |   18 +-
 htdocs/langs/pl_PL/compta.lang              |   10 +-
 htdocs/langs/pl_PL/cron.lang                |   66 +-
 htdocs/langs/pl_PL/ecm.lang                 |    8 +-
 htdocs/langs/pl_PL/errors.lang              |   19 +-
 htdocs/langs/pl_PL/eventorganization.lang   |  152 +-
 htdocs/langs/pl_PL/hrm.lang                 |    4 +-
 htdocs/langs/pl_PL/knowledgemanagement.lang |   26 +-
 htdocs/langs/pl_PL/languages.lang           |   36 +-
 htdocs/langs/pl_PL/mails.lang               |    6 +-
 htdocs/langs/pl_PL/main.lang                |   21 +-
 htdocs/langs/pl_PL/members.lang             |   44 +-
 htdocs/langs/pl_PL/modulebuilder.lang       |    9 +-
 htdocs/langs/pl_PL/mrp.lang                 |  205 +-
 htdocs/langs/pl_PL/orders.lang              |    2 +
 htdocs/langs/pl_PL/other.lang               |    9 +-
 htdocs/langs/pl_PL/partnership.lang         |   61 +-
 htdocs/langs/pl_PL/productbatch.lang        |   24 +-
 htdocs/langs/pl_PL/products.lang            |   28 +-
 htdocs/langs/pl_PL/projects.lang            |   12 +-
 htdocs/langs/pl_PL/receptions.lang          |   74 +-
 htdocs/langs/pl_PL/recruitment.lang         |    2 +-
 htdocs/langs/pl_PL/sendings.lang            |    2 +-
 htdocs/langs/pl_PL/stocks.lang              |   33 +-
 htdocs/langs/pl_PL/ticket.lang              |   10 +-
 htdocs/langs/pl_PL/users.lang               |    6 +-
 htdocs/langs/pl_PL/website.lang             |    8 +-
 htdocs/langs/pt_AO/cron.lang                |    2 -
 htdocs/langs/pt_AO/exports.lang             |    2 +
 htdocs/langs/pt_AO/mrp.lang                 |    3 -
 htdocs/langs/pt_AO/products.lang            |    2 +
 htdocs/langs/pt_AO/stocks.lang              |    2 +
 htdocs/langs/pt_AO/ticket.lang              |    3 +
 htdocs/langs/pt_BR/accountancy.lang         |    1 -
 htdocs/langs/pt_BR/admin.lang               |    9 -
 htdocs/langs/pt_BR/agenda.lang              |   18 +-
 htdocs/langs/pt_BR/cashdesk.lang            |    3 -
 htdocs/langs/pt_BR/cron.lang                |    1 -
 htdocs/langs/pt_BR/errors.lang              |    1 -
 htdocs/langs/pt_BR/hrm.lang                 |    1 -
 htdocs/langs/pt_BR/mrp.lang                 |    9 +-
 htdocs/langs/pt_BR/orders.lang              |    2 +
 htdocs/langs/pt_BR/partnership.lang         |   19 +-
 htdocs/langs/pt_BR/receptions.lang          |    1 +
 htdocs/langs/pt_BR/stocks.lang              |    2 +-
 htdocs/langs/pt_PT/accountancy.lang         |    5 +-
 htdocs/langs/pt_PT/admin.lang               |   65 +-
 htdocs/langs/pt_PT/agenda.lang              |    2 +
 htdocs/langs/pt_PT/bills.lang               |    2 +
 htdocs/langs/pt_PT/cashdesk.lang            |    6 +-
 htdocs/langs/pt_PT/compta.lang              |    6 +
 htdocs/langs/pt_PT/cron.lang                |    2 +-
 htdocs/langs/pt_PT/errors.lang              |    5 +-
 htdocs/langs/pt_PT/eventorganization.lang   |   48 +-
 htdocs/langs/pt_PT/hrm.lang                 |    2 +-
 htdocs/langs/pt_PT/knowledgemanagement.lang |   26 +-
 htdocs/langs/pt_PT/languages.lang           |    2 +
 htdocs/langs/pt_PT/main.lang                |    5 +
 htdocs/langs/pt_PT/members.lang             |    2 +
 htdocs/langs/pt_PT/modulebuilder.lang       |    1 +
 htdocs/langs/pt_PT/mrp.lang                 |   21 +-
 htdocs/langs/pt_PT/orders.lang              |    2 +
 htdocs/langs/pt_PT/other.lang               |    3 +-
 htdocs/langs/pt_PT/partnership.lang         |   63 +-
 htdocs/langs/pt_PT/productbatch.lang        |   12 +-
 htdocs/langs/pt_PT/products.lang            |    2 +
 htdocs/langs/pt_PT/projects.lang            |    2 +
 htdocs/langs/pt_PT/receptions.lang          |    2 +-
 htdocs/langs/pt_PT/stocks.lang              |    7 +-
 htdocs/langs/pt_PT/ticket.lang              |    2 +-
 htdocs/langs/ro_RO/accountancy.lang         |    5 +-
 htdocs/langs/ro_RO/admin.lang               |   45 +-
 htdocs/langs/ro_RO/agenda.lang              |  170 +-
 htdocs/langs/ro_RO/assets.lang              |   18 +-
 htdocs/langs/ro_RO/banks.lang               |    4 +-
 htdocs/langs/ro_RO/bills.lang               |    2 +
 htdocs/langs/ro_RO/cashdesk.lang            |    6 +-
 htdocs/langs/ro_RO/companies.lang           |    4 +-
 htdocs/langs/ro_RO/compta.lang              |    6 +
 htdocs/langs/ro_RO/cron.lang                |   72 +-
 htdocs/langs/ro_RO/errors.lang              |    5 +-
 htdocs/langs/ro_RO/eventorganization.lang   |   58 +-
 htdocs/langs/ro_RO/holiday.lang             |  124 +-
 htdocs/langs/ro_RO/hrm.lang                 |   18 +-
 htdocs/langs/ro_RO/knowledgemanagement.lang |    6 +-
 htdocs/langs/ro_RO/languages.lang           |   28 +-
 htdocs/langs/ro_RO/main.lang                |    5 +
 htdocs/langs/ro_RO/members.lang             |    2 +
 htdocs/langs/ro_RO/modulebuilder.lang       |    1 +
 htdocs/langs/ro_RO/mrp.lang                 |   31 +-
 htdocs/langs/ro_RO/opensurvey.lang          |   60 +-
 htdocs/langs/ro_RO/orders.lang              |    2 +
 htdocs/langs/ro_RO/other.lang               |    3 +-
 htdocs/langs/ro_RO/partnership.lang         |   57 +-
 htdocs/langs/ro_RO/productbatch.lang        |   12 +-
 htdocs/langs/ro_RO/products.lang            |    2 +
 htdocs/langs/ro_RO/projects.lang            |    2 +
 htdocs/langs/ro_RO/receptions.lang          |   50 +-
 htdocs/langs/ro_RO/stocks.lang              |    7 +-
 htdocs/langs/ro_RO/ticket.lang              |    4 +-
 htdocs/langs/ru_RU/accountancy.lang         |  627 ++--
 htdocs/langs/ru_RU/admin.lang               |  823 ++---
 htdocs/langs/ru_RU/agenda.lang              |  116 +-
 htdocs/langs/ru_RU/assets.lang              |   12 +-
 htdocs/langs/ru_RU/banks.lang               |   82 +-
 htdocs/langs/ru_RU/bills.lang               |  638 ++--
 htdocs/langs/ru_RU/blockedlog.lang          |   82 +-
 htdocs/langs/ru_RU/boxes.lang               |  114 +-
 htdocs/langs/ru_RU/cashdesk.lang            |  142 +-
 htdocs/langs/ru_RU/categories.lang          |   20 +-
 htdocs/langs/ru_RU/commercial.lang          |   27 +-
 htdocs/langs/ru_RU/companies.lang           |  102 +-
 htdocs/langs/ru_RU/compta.lang              |  372 +--
 htdocs/langs/ru_RU/cron.lang                |   90 +-
 htdocs/langs/ru_RU/deliveries.lang          |   23 +-
 htdocs/langs/ru_RU/dict.lang                |   62 +-
 htdocs/langs/ru_RU/donations.lang           |    3 +-
 htdocs/langs/ru_RU/ecm.lang                 |   42 +-
 htdocs/langs/ru_RU/errors.lang              |  357 +--
 htdocs/langs/ru_RU/eventorganization.lang   |  152 +-
 htdocs/langs/ru_RU/exports.lang             |  142 +-
 htdocs/langs/ru_RU/externalsite.lang        |    2 +-
 htdocs/langs/ru_RU/ftp.lang                 |   14 +-
 htdocs/langs/ru_RU/help.lang                |   20 +-
 htdocs/langs/ru_RU/holiday.lang             |  114 +-
 htdocs/langs/ru_RU/hrm.lang                 |   26 +-
 htdocs/langs/ru_RU/install.lang             |  150 +-
 htdocs/langs/ru_RU/interventions.lang       |   84 +-
 htdocs/langs/ru_RU/intracommreport.lang     |   44 +-
 htdocs/langs/ru_RU/knowledgemanagement.lang |   26 +-
 htdocs/langs/ru_RU/languages.lang           |   72 +-
 htdocs/langs/ru_RU/ldap.lang                |   14 +-
 htdocs/langs/ru_RU/link.lang                |    4 +-
 htdocs/langs/ru_RU/loan.lang                |   30 +-
 htdocs/langs/ru_RU/mailmanspip.lang         |    8 +-
 htdocs/langs/ru_RU/mails.lang               |  204 +-
 htdocs/langs/ru_RU/main.lang                |  297 +-
 htdocs/langs/ru_RU/margins.lang             |   36 +-
 htdocs/langs/ru_RU/members.lang             |  208 +-
 htdocs/langs/ru_RU/modulebuilder.lang       |  287 +-
 htdocs/langs/ru_RU/mrp.lang                 |  205 +-
 htdocs/langs/ru_RU/multicurrency.lang       |   52 +-
 htdocs/langs/ru_RU/oauth.lang               |   54 +-
 htdocs/langs/ru_RU/opensurvey.lang          |   12 +-
 htdocs/langs/ru_RU/orders.lang              |  124 +-
 htdocs/langs/ru_RU/other.lang               |  329 +-
 htdocs/langs/ru_RU/partnership.lang         |   61 +-
 htdocs/langs/ru_RU/paybox.lang              |   13 +-
 htdocs/langs/ru_RU/paypal.lang              |   52 +-
 htdocs/langs/ru_RU/printing.lang            |   48 +-
 htdocs/langs/ru_RU/productbatch.lang        |   16 +-
 htdocs/langs/ru_RU/products.lang            |  220 +-
 htdocs/langs/ru_RU/projects.lang            |  350 +--
 htdocs/langs/ru_RU/propal.lang              |   46 +-
 htdocs/langs/ru_RU/receiptprinter.lang      |  160 +-
 htdocs/langs/ru_RU/receptions.lang          |   74 +-
 htdocs/langs/ru_RU/recruitment.lang         |   86 +-
 htdocs/langs/ru_RU/resource.lang            |    3 +
 htdocs/langs/ru_RU/salaries.lang            |    5 +-
 htdocs/langs/ru_RU/sendings.lang            |   52 +-
 htdocs/langs/ru_RU/sms.lang                 |   40 +-
 htdocs/langs/ru_RU/stocks.lang              |  341 +-
 htdocs/langs/ru_RU/stripe.lang              |  111 +-
 htdocs/langs/ru_RU/supplier_proposal.lang   |   80 +-
 htdocs/langs/ru_RU/suppliers.lang           |   72 +-
 htdocs/langs/ru_RU/ticket.lang              |  472 +--
 htdocs/langs/ru_RU/trips.lang               |  196 +-
 htdocs/langs/ru_RU/users.lang               |   32 +-
 htdocs/langs/ru_RU/website.lang             |  270 +-
 htdocs/langs/ru_RU/withdrawals.lang         |  213 +-
 htdocs/langs/ru_RU/workflow.lang            |   26 +-
 htdocs/langs/ru_RU/zapier.lang              |   12 +-
 htdocs/langs/ru_UA/accountancy.lang         |    2 +
 htdocs/langs/ru_UA/admin.lang               |    3 +
 htdocs/langs/ru_UA/cron.lang                |    2 -
 htdocs/langs/ru_UA/exports.lang             |    2 +
 htdocs/langs/ru_UA/mrp.lang                 |    5 -
 htdocs/langs/ru_UA/products.lang            |    2 +
 htdocs/langs/ru_UA/stocks.lang              |    3 +
 htdocs/langs/ru_UA/ticket.lang              |    5 +
 htdocs/langs/sk_SK/accountancy.lang         |    5 +-
 htdocs/langs/sk_SK/admin.lang               |   41 +-
 htdocs/langs/sk_SK/agenda.lang              |   14 +-
 htdocs/langs/sk_SK/bills.lang               |    2 +
 htdocs/langs/sk_SK/cashdesk.lang            |    6 +-
 htdocs/langs/sk_SK/compta.lang              |    6 +
 htdocs/langs/sk_SK/cron.lang                |    2 +-
 htdocs/langs/sk_SK/errors.lang              |    5 +-
 htdocs/langs/sk_SK/eventorganization.lang   |   48 +-
 htdocs/langs/sk_SK/hrm.lang                 |    2 +-
 htdocs/langs/sk_SK/knowledgemanagement.lang |    2 +-
 htdocs/langs/sk_SK/languages.lang           |    2 +
 htdocs/langs/sk_SK/main.lang                |    5 +
 htdocs/langs/sk_SK/members.lang             |    2 +
 htdocs/langs/sk_SK/modulebuilder.lang       |    1 +
 htdocs/langs/sk_SK/mrp.lang                 |   21 +-
 htdocs/langs/sk_SK/orders.lang              |    2 +
 htdocs/langs/sk_SK/other.lang               |    3 +-
 htdocs/langs/sk_SK/partnership.lang         |   57 +-
 htdocs/langs/sk_SK/productbatch.lang        |   12 +-
 htdocs/langs/sk_SK/products.lang            |    2 +
 htdocs/langs/sk_SK/projects.lang            |    2 +
 htdocs/langs/sk_SK/receptions.lang          |    2 +-
 htdocs/langs/sk_SK/stocks.lang              |    7 +-
 htdocs/langs/sk_SK/ticket.lang              |    2 +-
 htdocs/langs/sl_SI/accountancy.lang         |    5 +-
 htdocs/langs/sl_SI/admin.lang               |   41 +-
 htdocs/langs/sl_SI/agenda.lang              |   14 +-
 htdocs/langs/sl_SI/bills.lang               |    2 +
 htdocs/langs/sl_SI/cashdesk.lang            |    6 +-
 htdocs/langs/sl_SI/compta.lang              |    6 +
 htdocs/langs/sl_SI/cron.lang                |    2 +-
 htdocs/langs/sl_SI/errors.lang              |    5 +-
 htdocs/langs/sl_SI/eventorganization.lang   |   48 +-
 htdocs/langs/sl_SI/hrm.lang                 |    2 +-
 htdocs/langs/sl_SI/knowledgemanagement.lang |    2 +-
 htdocs/langs/sl_SI/languages.lang           |    2 +
 htdocs/langs/sl_SI/main.lang                |    5 +
 htdocs/langs/sl_SI/members.lang             |    2 +
 htdocs/langs/sl_SI/modulebuilder.lang       |    1 +
 htdocs/langs/sl_SI/mrp.lang                 |   21 +-
 htdocs/langs/sl_SI/orders.lang              |    2 +
 htdocs/langs/sl_SI/other.lang               |    3 +-
 htdocs/langs/sl_SI/partnership.lang         |   57 +-
 htdocs/langs/sl_SI/productbatch.lang        |   12 +-
 htdocs/langs/sl_SI/products.lang            |    2 +
 htdocs/langs/sl_SI/projects.lang            |    2 +
 htdocs/langs/sl_SI/receptions.lang          |    2 +-
 htdocs/langs/sl_SI/stocks.lang              |    7 +-
 htdocs/langs/sl_SI/ticket.lang              |    2 +-
 htdocs/langs/sq_AL/accountancy.lang         |    5 +-
 htdocs/langs/sq_AL/admin.lang               |   41 +-
 htdocs/langs/sq_AL/agenda.lang              |   14 +-
 htdocs/langs/sq_AL/bills.lang               |    2 +
 htdocs/langs/sq_AL/cashdesk.lang            |    6 +-
 htdocs/langs/sq_AL/compta.lang              |    6 +
 htdocs/langs/sq_AL/cron.lang                |    2 +-
 htdocs/langs/sq_AL/errors.lang              |    5 +-
 htdocs/langs/sq_AL/eventorganization.lang   |   48 +-
 htdocs/langs/sq_AL/hrm.lang                 |    2 +-
 htdocs/langs/sq_AL/knowledgemanagement.lang |    2 +-
 htdocs/langs/sq_AL/languages.lang           |    2 +
 htdocs/langs/sq_AL/main.lang                |    5 +
 htdocs/langs/sq_AL/members.lang             |    2 +
 htdocs/langs/sq_AL/modulebuilder.lang       |    1 +
 htdocs/langs/sq_AL/mrp.lang                 |   21 +-
 htdocs/langs/sq_AL/orders.lang              |    2 +
 htdocs/langs/sq_AL/other.lang               |    3 +-
 htdocs/langs/sq_AL/partnership.lang         |   57 +-
 htdocs/langs/sq_AL/productbatch.lang        |   12 +-
 htdocs/langs/sq_AL/products.lang            |    2 +
 htdocs/langs/sq_AL/projects.lang            |    2 +
 htdocs/langs/sq_AL/receptions.lang          |    2 +-
 htdocs/langs/sq_AL/stocks.lang              |    7 +-
 htdocs/langs/sq_AL/ticket.lang              |    2 +-
 htdocs/langs/sr_RS/accountancy.lang         |    5 +-
 htdocs/langs/sr_RS/admin.lang               |   41 +-
 htdocs/langs/sr_RS/agenda.lang              |   14 +-
 htdocs/langs/sr_RS/bills.lang               |    2 +
 htdocs/langs/sr_RS/cashdesk.lang            |    6 +-
 htdocs/langs/sr_RS/compta.lang              |    6 +
 htdocs/langs/sr_RS/cron.lang                |    2 +-
 htdocs/langs/sr_RS/errors.lang              |    5 +-
 htdocs/langs/sr_RS/eventorganization.lang   |   48 +-
 htdocs/langs/sr_RS/hrm.lang                 |    2 +-
 htdocs/langs/sr_RS/knowledgemanagement.lang |    2 +-
 htdocs/langs/sr_RS/languages.lang           |    2 +
 htdocs/langs/sr_RS/main.lang                |    5 +
 htdocs/langs/sr_RS/members.lang             |    2 +
 htdocs/langs/sr_RS/modulebuilder.lang       |    1 +
 htdocs/langs/sr_RS/mrp.lang                 |   21 +-
 htdocs/langs/sr_RS/orders.lang              |    2 +
 htdocs/langs/sr_RS/other.lang               |    3 +-
 htdocs/langs/sr_RS/partnership.lang         |   57 +-
 htdocs/langs/sr_RS/productbatch.lang        |   12 +-
 htdocs/langs/sr_RS/products.lang            |    2 +
 htdocs/langs/sr_RS/projects.lang            |    2 +
 htdocs/langs/sr_RS/receptions.lang          |    2 +-
 htdocs/langs/sr_RS/stocks.lang              |    7 +-
 htdocs/langs/sr_RS/ticket.lang              |    2 +-
 htdocs/langs/sv_SE/accountancy.lang         |  227 +-
 htdocs/langs/sv_SE/admin.lang               |  749 ++---
 htdocs/langs/sv_SE/agenda.lang              |   14 +-
 htdocs/langs/sv_SE/bills.lang               |  140 +-
 htdocs/langs/sv_SE/cashdesk.lang            |  136 +-
 htdocs/langs/sv_SE/commercial.lang          |    9 +-
 htdocs/langs/sv_SE/companies.lang           |   94 +-
 htdocs/langs/sv_SE/compta.lang              |    6 +
 htdocs/langs/sv_SE/cron.lang                |    2 +-
 htdocs/langs/sv_SE/deliveries.lang          |    3 +-
 htdocs/langs/sv_SE/donations.lang           |    3 +-
 htdocs/langs/sv_SE/errors.lang              |  137 +-
 htdocs/langs/sv_SE/eventorganization.lang   |  150 +-
 htdocs/langs/sv_SE/exports.lang             |   46 +-
 htdocs/langs/sv_SE/hrm.lang                 |    6 +-
 htdocs/langs/sv_SE/install.lang             |   18 +-
 htdocs/langs/sv_SE/knowledgemanagement.lang |    2 +-
 htdocs/langs/sv_SE/languages.lang           |   36 +-
 htdocs/langs/sv_SE/mails.lang               |   50 +-
 htdocs/langs/sv_SE/main.lang                |  313 +-
 htdocs/langs/sv_SE/margins.lang             |    6 +-
 htdocs/langs/sv_SE/members.lang             |   72 +-
 htdocs/langs/sv_SE/modulebuilder.lang       |    1 +
 htdocs/langs/sv_SE/mrp.lang                 |  189 +-
 htdocs/langs/sv_SE/orders.lang              |    2 +
 htdocs/langs/sv_SE/other.lang               |    3 +-
 htdocs/langs/sv_SE/partnership.lang         |   57 +-
 htdocs/langs/sv_SE/productbatch.lang        |   12 +-
 htdocs/langs/sv_SE/products.lang            |  114 +-
 htdocs/langs/sv_SE/projects.lang            |    2 +
 htdocs/langs/sv_SE/receptions.lang          |    2 +-
 htdocs/langs/sv_SE/stocks.lang              |    7 +-
 htdocs/langs/sv_SE/ticket.lang              |   78 +-
 htdocs/langs/sv_SE/trips.lang               |   30 +-
 htdocs/langs/sv_SE/users.lang               |   30 +-
 htdocs/langs/sv_SE/website.lang             |  104 +-
 htdocs/langs/sv_SE/withdrawals.lang         |   95 +-
 htdocs/langs/sv_SE/workflow.lang            |    6 +-
 htdocs/langs/sv_SE/zapier.lang              |   12 +-
 htdocs/langs/sw_SW/accountancy.lang         |    5 +-
 htdocs/langs/sw_SW/admin.lang               |   41 +-
 htdocs/langs/sw_SW/agenda.lang              |   14 +-
 htdocs/langs/sw_SW/bills.lang               |    2 +
 htdocs/langs/sw_SW/cashdesk.lang            |    6 +-
 htdocs/langs/sw_SW/compta.lang              |    6 +
 htdocs/langs/sw_SW/cron.lang                |    2 +-
 htdocs/langs/sw_SW/errors.lang              |    5 +-
 htdocs/langs/sw_SW/eventorganization.lang   |   48 +-
 htdocs/langs/sw_SW/hrm.lang                 |    2 +-
 htdocs/langs/sw_SW/knowledgemanagement.lang |    2 +-
 htdocs/langs/sw_SW/languages.lang           |    2 +
 htdocs/langs/sw_SW/main.lang                |    5 +
 htdocs/langs/sw_SW/members.lang             |    2 +
 htdocs/langs/sw_SW/modulebuilder.lang       |    1 +
 htdocs/langs/sw_SW/mrp.lang                 |   21 +-
 htdocs/langs/sw_SW/orders.lang              |    2 +
 htdocs/langs/sw_SW/other.lang               |    3 +-
 htdocs/langs/sw_SW/partnership.lang         |   57 +-
 htdocs/langs/sw_SW/productbatch.lang        |   12 +-
 htdocs/langs/sw_SW/products.lang            |    2 +
 htdocs/langs/sw_SW/projects.lang            |    2 +
 htdocs/langs/sw_SW/receptions.lang          |    2 +-
 htdocs/langs/sw_SW/stocks.lang              |    7 +-
 htdocs/langs/sw_SW/ticket.lang              |    2 +-
 htdocs/langs/th_TH/accountancy.lang         |    5 +-
 htdocs/langs/th_TH/admin.lang               |   41 +-
 htdocs/langs/th_TH/agenda.lang              |   14 +-
 htdocs/langs/th_TH/bills.lang               |    2 +
 htdocs/langs/th_TH/cashdesk.lang            |    6 +-
 htdocs/langs/th_TH/compta.lang              |    6 +
 htdocs/langs/th_TH/cron.lang                |    2 +-
 htdocs/langs/th_TH/errors.lang              |    5 +-
 htdocs/langs/th_TH/eventorganization.lang   |   48 +-
 htdocs/langs/th_TH/hrm.lang                 |    2 +-
 htdocs/langs/th_TH/knowledgemanagement.lang |    2 +-
 htdocs/langs/th_TH/languages.lang           |    2 +
 htdocs/langs/th_TH/main.lang                |    5 +
 htdocs/langs/th_TH/members.lang             |    2 +
 htdocs/langs/th_TH/modulebuilder.lang       |    1 +
 htdocs/langs/th_TH/mrp.lang                 |   21 +-
 htdocs/langs/th_TH/orders.lang              |    2 +
 htdocs/langs/th_TH/other.lang               |    3 +-
 htdocs/langs/th_TH/partnership.lang         |   57 +-
 htdocs/langs/th_TH/productbatch.lang        |   12 +-
 htdocs/langs/th_TH/products.lang            |    2 +
 htdocs/langs/th_TH/projects.lang            |    2 +
 htdocs/langs/th_TH/receptions.lang          |    2 +-
 htdocs/langs/th_TH/stocks.lang              |    7 +-
 htdocs/langs/th_TH/ticket.lang              |    2 +-
 htdocs/langs/tr_TR/accountancy.lang         |    5 +-
 htdocs/langs/tr_TR/admin.lang               |   41 +-
 htdocs/langs/tr_TR/agenda.lang              |   14 +-
 htdocs/langs/tr_TR/bills.lang               |    2 +
 htdocs/langs/tr_TR/cashdesk.lang            |    6 +-
 htdocs/langs/tr_TR/compta.lang              |    6 +
 htdocs/langs/tr_TR/cron.lang                |    2 +-
 htdocs/langs/tr_TR/errors.lang              |    5 +-
 htdocs/langs/tr_TR/eventorganization.lang   |   48 +-
 htdocs/langs/tr_TR/hrm.lang                 |    2 +-
 htdocs/langs/tr_TR/knowledgemanagement.lang |    2 +-
 htdocs/langs/tr_TR/languages.lang           |    2 +
 htdocs/langs/tr_TR/main.lang                |    5 +
 htdocs/langs/tr_TR/members.lang             |    2 +
 htdocs/langs/tr_TR/modulebuilder.lang       |    1 +
 htdocs/langs/tr_TR/mrp.lang                 |   21 +-
 htdocs/langs/tr_TR/orders.lang              |    2 +
 htdocs/langs/tr_TR/other.lang               |    3 +-
 htdocs/langs/tr_TR/partnership.lang         |   57 +-
 htdocs/langs/tr_TR/productbatch.lang        |   12 +-
 htdocs/langs/tr_TR/products.lang            |    2 +
 htdocs/langs/tr_TR/projects.lang            |    2 +
 htdocs/langs/tr_TR/receptions.lang          |    2 +-
 htdocs/langs/tr_TR/stocks.lang              |    7 +-
 htdocs/langs/tr_TR/ticket.lang              |    2 +-
 htdocs/langs/uk_UA/accountancy.lang         |    5 +-
 htdocs/langs/uk_UA/admin.lang               |   41 +-
 htdocs/langs/uk_UA/agenda.lang              |   14 +-
 htdocs/langs/uk_UA/bills.lang               |    2 +
 htdocs/langs/uk_UA/cashdesk.lang            |    6 +-
 htdocs/langs/uk_UA/compta.lang              |    6 +
 htdocs/langs/uk_UA/cron.lang                |    2 +-
 htdocs/langs/uk_UA/errors.lang              |    5 +-
 htdocs/langs/uk_UA/eventorganization.lang   |   48 +-
 htdocs/langs/uk_UA/hrm.lang                 |    2 +-
 htdocs/langs/uk_UA/knowledgemanagement.lang |    2 +-
 htdocs/langs/uk_UA/languages.lang           |    2 +
 htdocs/langs/uk_UA/main.lang                |    5 +
 htdocs/langs/uk_UA/members.lang             |    2 +
 htdocs/langs/uk_UA/modulebuilder.lang       |    1 +
 htdocs/langs/uk_UA/mrp.lang                 |   21 +-
 htdocs/langs/uk_UA/orders.lang              |    2 +
 htdocs/langs/uk_UA/other.lang               |    3 +-
 htdocs/langs/uk_UA/partnership.lang         |   57 +-
 htdocs/langs/uk_UA/productbatch.lang        |   12 +-
 htdocs/langs/uk_UA/products.lang            |    2 +
 htdocs/langs/uk_UA/projects.lang            |    2 +
 htdocs/langs/uk_UA/receptions.lang          |    2 +-
 htdocs/langs/uk_UA/stocks.lang              |    7 +-
 htdocs/langs/uk_UA/ticket.lang              |    2 +-
 htdocs/langs/uz_UZ/accountancy.lang         |  333 +-
 htdocs/langs/uz_UZ/admin.lang               | 3129 ++++++++++---------
 htdocs/langs/uz_UZ/agenda.lang              |  218 +-
 htdocs/langs/uz_UZ/banks.lang               |  294 +-
 htdocs/langs/uz_UZ/bills.lang               |  966 +++---
 htdocs/langs/uz_UZ/bookmarks.lang           |   35 +-
 htdocs/langs/uz_UZ/boxes.lang               |  162 +-
 htdocs/langs/uz_UZ/cashdesk.lang            |   72 +-
 htdocs/langs/uz_UZ/categories.lang          |  154 +-
 htdocs/langs/uz_UZ/commercial.lang          |  143 +-
 htdocs/langs/uz_UZ/companies.lang           |  560 ++--
 htdocs/langs/uz_UZ/compta.lang              |  388 +--
 htdocs/langs/uz_UZ/contracts.lang           |  176 +-
 htdocs/langs/uz_UZ/cron.lang                |  136 +-
 htdocs/langs/uz_UZ/deliveries.lang          |   57 +-
 htdocs/langs/uz_UZ/dict.lang                |  540 ++--
 htdocs/langs/uz_UZ/donations.lang           |   61 +-
 htdocs/langs/uz_UZ/ecm.lang                 |   64 +-
 htdocs/langs/uz_UZ/errors.lang              |  401 +--
 htdocs/langs/uz_UZ/eventorganization.lang   |   48 +-
 htdocs/langs/uz_UZ/exports.lang             |  236 +-
 htdocs/langs/uz_UZ/externalsite.lang        |    8 +-
 htdocs/langs/uz_UZ/ftp.lang                 |   26 +-
 htdocs/langs/uz_UZ/help.lang                |   44 +-
 htdocs/langs/uz_UZ/holiday.lang             |  208 +-
 htdocs/langs/uz_UZ/hrm.lang                 |   28 +-
 htdocs/langs/uz_UZ/install.lang             |  374 +--
 htdocs/langs/uz_UZ/interventions.lang       |  118 +-
 htdocs/langs/uz_UZ/knowledgemanagement.lang |    2 +-
 htdocs/langs/uz_UZ/languages.lang           |  170 +-
 htdocs/langs/uz_UZ/ldap.lang                |   46 +-
 htdocs/langs/uz_UZ/link.lang                |   18 +-
 htdocs/langs/uz_UZ/loan.lang                |   46 +-
 htdocs/langs/uz_UZ/mailmanspip.lang         |   52 +-
 htdocs/langs/uz_UZ/mails.lang               |  292 +-
 htdocs/langs/uz_UZ/main.lang                | 1485 ++++-----
 htdocs/langs/uz_UZ/margins.lang             |   84 +-
 htdocs/langs/uz_UZ/members.lang             |    2 +
 htdocs/langs/uz_UZ/modulebuilder.lang       |    1 +
 htdocs/langs/uz_UZ/mrp.lang                 |   21 +-
 htdocs/langs/uz_UZ/oauth.lang               |   50 +-
 htdocs/langs/uz_UZ/opensurvey.lang          |  116 +-
 htdocs/langs/uz_UZ/orders.lang              |  296 +-
 htdocs/langs/uz_UZ/other.lang               |  375 +--
 htdocs/langs/uz_UZ/partnership.lang         |   57 +-
 htdocs/langs/uz_UZ/paybox.lang              |   57 +-
 htdocs/langs/uz_UZ/paypal.lang              |   42 +-
 htdocs/langs/uz_UZ/printing.lang            |   92 +-
 htdocs/langs/uz_UZ/productbatch.lang        |   54 +-
 htdocs/langs/uz_UZ/products.lang            |  494 +--
 htdocs/langs/uz_UZ/projects.lang            |  370 +--
 htdocs/langs/uz_UZ/propal.lang              |  150 +-
 htdocs/langs/uz_UZ/receiptprinter.lang      |   88 +-
 htdocs/langs/uz_UZ/receptions.lang          |    2 +-
 htdocs/langs/uz_UZ/resource.lang            |   53 +-
 htdocs/langs/uz_UZ/salaries.lang            |   29 +-
 htdocs/langs/uz_UZ/sendings.lang            |  128 +-
 htdocs/langs/uz_UZ/sms.lang                 |   98 +-
 htdocs/langs/uz_UZ/stocks.lang              |  281 +-
 htdocs/langs/uz_UZ/supplier_proposal.lang   |  108 +-
 htdocs/langs/uz_UZ/suppliers.lang           |   84 +-
 htdocs/langs/uz_UZ/ticket.lang              |    2 +-
 htdocs/langs/uz_UZ/trips.lang               |  164 +-
 htdocs/langs/uz_UZ/users.lang               |  204 +-
 htdocs/langs/uz_UZ/website.lang             |   46 +-
 htdocs/langs/uz_UZ/withdrawals.lang         |  193 +-
 htdocs/langs/uz_UZ/workflow.lang            |   28 +-
 htdocs/langs/vi_VN/accountancy.lang         |    5 +-
 htdocs/langs/vi_VN/admin.lang               |   41 +-
 htdocs/langs/vi_VN/agenda.lang              |   14 +-
 htdocs/langs/vi_VN/bills.lang               |    2 +
 htdocs/langs/vi_VN/cashdesk.lang            |    6 +-
 htdocs/langs/vi_VN/compta.lang              |    6 +
 htdocs/langs/vi_VN/cron.lang                |    2 +-
 htdocs/langs/vi_VN/errors.lang              |    5 +-
 htdocs/langs/vi_VN/eventorganization.lang   |   48 +-
 htdocs/langs/vi_VN/hrm.lang                 |    2 +-
 htdocs/langs/vi_VN/knowledgemanagement.lang |    2 +-
 htdocs/langs/vi_VN/languages.lang           |    2 +
 htdocs/langs/vi_VN/main.lang                |    5 +
 htdocs/langs/vi_VN/members.lang             |    2 +
 htdocs/langs/vi_VN/modulebuilder.lang       |    1 +
 htdocs/langs/vi_VN/mrp.lang                 |   21 +-
 htdocs/langs/vi_VN/orders.lang              |    2 +
 htdocs/langs/vi_VN/other.lang               |    3 +-
 htdocs/langs/vi_VN/partnership.lang         |   57 +-
 htdocs/langs/vi_VN/productbatch.lang        |   12 +-
 htdocs/langs/vi_VN/products.lang            |    2 +
 htdocs/langs/vi_VN/projects.lang            |    2 +
 htdocs/langs/vi_VN/receptions.lang          |    2 +-
 htdocs/langs/vi_VN/stocks.lang              |    7 +-
 htdocs/langs/vi_VN/ticket.lang              |    2 +-
 htdocs/langs/zh_CN/accountancy.lang         |    5 +-
 htdocs/langs/zh_CN/admin.lang               |   41 +-
 htdocs/langs/zh_CN/agenda.lang              |   14 +-
 htdocs/langs/zh_CN/bills.lang               |    2 +
 htdocs/langs/zh_CN/cashdesk.lang            |    6 +-
 htdocs/langs/zh_CN/compta.lang              |    6 +
 htdocs/langs/zh_CN/cron.lang                |    2 +-
 htdocs/langs/zh_CN/errors.lang              |    5 +-
 htdocs/langs/zh_CN/eventorganization.lang   |   48 +-
 htdocs/langs/zh_CN/hrm.lang                 |    2 +-
 htdocs/langs/zh_CN/knowledgemanagement.lang |    2 +-
 htdocs/langs/zh_CN/languages.lang           |    2 +
 htdocs/langs/zh_CN/main.lang                |   24 +-
 htdocs/langs/zh_CN/members.lang             |    2 +
 htdocs/langs/zh_CN/modulebuilder.lang       |    1 +
 htdocs/langs/zh_CN/mrp.lang                 |   21 +-
 htdocs/langs/zh_CN/orders.lang              |    2 +
 htdocs/langs/zh_CN/other.lang               |    3 +-
 htdocs/langs/zh_CN/partnership.lang         |   57 +-
 htdocs/langs/zh_CN/productbatch.lang        |   12 +-
 htdocs/langs/zh_CN/products.lang            |    2 +
 htdocs/langs/zh_CN/projects.lang            |    2 +
 htdocs/langs/zh_CN/receptions.lang          |    2 +-
 htdocs/langs/zh_CN/stocks.lang              |    7 +-
 htdocs/langs/zh_CN/ticket.lang              |    2 +-
 htdocs/langs/zh_HK/accountancy.lang         |    5 +-
 htdocs/langs/zh_HK/admin.lang               |   41 +-
 htdocs/langs/zh_HK/agenda.lang              |   14 +-
 htdocs/langs/zh_HK/bills.lang               |    2 +
 htdocs/langs/zh_HK/cashdesk.lang            |    6 +-
 htdocs/langs/zh_HK/compta.lang              |    6 +
 htdocs/langs/zh_HK/cron.lang                |    2 +-
 htdocs/langs/zh_HK/errors.lang              |    5 +-
 htdocs/langs/zh_HK/eventorganization.lang   |   48 +-
 htdocs/langs/zh_HK/hrm.lang                 |    2 +-
 htdocs/langs/zh_HK/knowledgemanagement.lang |    2 +-
 htdocs/langs/zh_HK/languages.lang           |    2 +
 htdocs/langs/zh_HK/main.lang                |    5 +
 htdocs/langs/zh_HK/members.lang             |    2 +
 htdocs/langs/zh_HK/modulebuilder.lang       |    1 +
 htdocs/langs/zh_HK/mrp.lang                 |   21 +-
 htdocs/langs/zh_HK/orders.lang              |    2 +
 htdocs/langs/zh_HK/other.lang               |    3 +-
 htdocs/langs/zh_HK/partnership.lang         |   57 +-
 htdocs/langs/zh_HK/productbatch.lang        |   12 +-
 htdocs/langs/zh_HK/products.lang            |    2 +
 htdocs/langs/zh_HK/projects.lang            |    2 +
 htdocs/langs/zh_HK/receptions.lang          |    2 +-
 htdocs/langs/zh_HK/stocks.lang              |    7 +-
 htdocs/langs/zh_HK/ticket.lang              |    2 +-
 htdocs/langs/zh_TW/accountancy.lang         |    5 +-
 htdocs/langs/zh_TW/admin.lang               |   55 +-
 htdocs/langs/zh_TW/agenda.lang              |    9 +-
 htdocs/langs/zh_TW/assets.lang              |    2 +
 htdocs/langs/zh_TW/bills.lang               |    2 +
 htdocs/langs/zh_TW/blockedlog.lang          |    2 +-
 htdocs/langs/zh_TW/cashdesk.lang            |    6 +-
 htdocs/langs/zh_TW/categories.lang          |   24 +-
 htdocs/langs/zh_TW/companies.lang           |   20 +-
 htdocs/langs/zh_TW/compta.lang              |    6 +
 htdocs/langs/zh_TW/cron.lang                |    2 +-
 htdocs/langs/zh_TW/donations.lang           |    2 +-
 htdocs/langs/zh_TW/ecm.lang                 |   12 +-
 htdocs/langs/zh_TW/errors.lang              |    5 +-
 htdocs/langs/zh_TW/eventorganization.lang   |   48 +-
 htdocs/langs/zh_TW/hrm.lang                 |    2 +-
 htdocs/langs/zh_TW/knowledgemanagement.lang |    2 +-
 htdocs/langs/zh_TW/languages.lang           |    2 +
 htdocs/langs/zh_TW/main.lang                |    5 +
 htdocs/langs/zh_TW/members.lang             |    2 +
 htdocs/langs/zh_TW/modulebuilder.lang       |    1 +
 htdocs/langs/zh_TW/mrp.lang                 |   55 +-
 htdocs/langs/zh_TW/orders.lang              |    2 +
 htdocs/langs/zh_TW/other.lang               |    3 +-
 htdocs/langs/zh_TW/partnership.lang         |   57 +-
 htdocs/langs/zh_TW/productbatch.lang        |   12 +-
 htdocs/langs/zh_TW/products.lang            |    2 +
 htdocs/langs/zh_TW/projects.lang            |    2 +
 htdocs/langs/zh_TW/receptions.lang          |    2 +-
 htdocs/langs/zh_TW/stocks.lang              |    7 +-
 htdocs/langs/zh_TW/ticket.lang              |   36 +-
 htdocs/langs/zh_TW/trips.lang               |   16 +-
 htdocs/langs/zh_TW/users.lang               |    8 +-
 htdocs/langs/zh_TW/withdrawals.lang         |   23 +-
 1939 files changed, 27460 insertions(+), 19563 deletions(-)
 delete mode 100644 htdocs/langs/ar_EG/cron.lang
 create mode 100644 htdocs/langs/ar_EG/products.lang
 delete mode 100644 htdocs/langs/de_AT/cron.lang
 delete mode 100644 htdocs/langs/de_AT/mrp.lang
 delete mode 100644 htdocs/langs/el_CY/accountancy.lang
 delete mode 100644 htdocs/langs/el_CY/cron.lang
 create mode 100644 htdocs/langs/el_CY/exports.lang
 delete mode 100644 htdocs/langs/el_CY/mrp.lang
 create mode 100644 htdocs/langs/el_CY/products.lang
 create mode 100644 htdocs/langs/el_CY/stocks.lang
 create mode 100644 htdocs/langs/el_CY/ticket.lang
 delete mode 100644 htdocs/langs/en_AU/cron.lang
 create mode 100644 htdocs/langs/en_AU/exports.lang
 delete mode 100644 htdocs/langs/en_AU/mrp.lang
 create mode 100644 htdocs/langs/en_AU/products.lang
 create mode 100644 htdocs/langs/en_AU/stocks.lang
 create mode 100644 htdocs/langs/en_AU/ticket.lang
 delete mode 100644 htdocs/langs/en_CA/cron.lang
 create mode 100644 htdocs/langs/en_CA/exports.lang
 delete mode 100644 htdocs/langs/en_CA/mrp.lang
 create mode 100644 htdocs/langs/en_CA/products.lang
 create mode 100644 htdocs/langs/en_CA/stocks.lang
 create mode 100644 htdocs/langs/en_CA/ticket.lang
 delete mode 100644 htdocs/langs/en_GB/cron.lang
 create mode 100644 htdocs/langs/en_GB/exports.lang
 delete mode 100644 htdocs/langs/en_GB/mrp.lang
 create mode 100644 htdocs/langs/en_GB/ticket.lang
 delete mode 100644 htdocs/langs/en_IN/cron.lang
 create mode 100644 htdocs/langs/en_IN/exports.lang
 delete mode 100644 htdocs/langs/en_IN/mrp.lang
 create mode 100644 htdocs/langs/en_IN/products.lang
 create mode 100644 htdocs/langs/en_IN/stocks.lang
 create mode 100644 htdocs/langs/en_IN/ticket.lang
 delete mode 100644 htdocs/langs/en_SG/cron.lang
 create mode 100644 htdocs/langs/en_SG/exports.lang
 delete mode 100644 htdocs/langs/en_SG/mrp.lang
 create mode 100644 htdocs/langs/en_SG/products.lang
 create mode 100644 htdocs/langs/en_SG/stocks.lang
 create mode 100644 htdocs/langs/en_SG/ticket.lang
 create mode 100644 htdocs/langs/es_AR/exports.lang
 delete mode 100644 htdocs/langs/es_BO/cron.lang
 create mode 100644 htdocs/langs/es_BO/exports.lang
 delete mode 100644 htdocs/langs/es_BO/mrp.lang
 create mode 100644 htdocs/langs/es_BO/products.lang
 create mode 100644 htdocs/langs/es_BO/stocks.lang
 create mode 100644 htdocs/langs/es_BO/ticket.lang
 delete mode 100644 htdocs/langs/es_CO/mrp.lang
 delete mode 100644 htdocs/langs/es_DO/cron.lang
 create mode 100644 htdocs/langs/es_DO/exports.lang
 delete mode 100644 htdocs/langs/es_DO/mrp.lang
 create mode 100644 htdocs/langs/es_DO/products.lang
 create mode 100644 htdocs/langs/es_DO/stocks.lang
 create mode 100644 htdocs/langs/es_DO/ticket.lang
 delete mode 100644 htdocs/langs/es_GT/cron.lang
 create mode 100644 htdocs/langs/es_GT/exports.lang
 delete mode 100644 htdocs/langs/es_GT/mrp.lang
 create mode 100644 htdocs/langs/es_GT/products.lang
 create mode 100644 htdocs/langs/es_GT/stocks.lang
 create mode 100644 htdocs/langs/es_GT/ticket.lang
 delete mode 100644 htdocs/langs/es_HN/cron.lang
 create mode 100644 htdocs/langs/es_HN/exports.lang
 delete mode 100644 htdocs/langs/es_HN/mrp.lang
 create mode 100644 htdocs/langs/es_HN/products.lang
 create mode 100644 htdocs/langs/es_HN/stocks.lang
 create mode 100644 htdocs/langs/es_HN/ticket.lang
 create mode 100644 htdocs/langs/es_MX/exports.lang
 delete mode 100644 htdocs/langs/es_PA/cron.lang
 create mode 100644 htdocs/langs/es_PA/exports.lang
 delete mode 100644 htdocs/langs/es_PA/mrp.lang
 create mode 100644 htdocs/langs/es_PA/products.lang
 create mode 100644 htdocs/langs/es_PA/stocks.lang
 create mode 100644 htdocs/langs/es_PA/ticket.lang
 create mode 100644 htdocs/langs/es_PE/exports.lang
 delete mode 100644 htdocs/langs/es_PY/cron.lang
 create mode 100644 htdocs/langs/es_PY/exports.lang
 delete mode 100644 htdocs/langs/es_PY/mrp.lang
 create mode 100644 htdocs/langs/es_PY/products.lang
 create mode 100644 htdocs/langs/es_PY/stocks.lang
 create mode 100644 htdocs/langs/es_PY/ticket.lang
 delete mode 100644 htdocs/langs/es_US/cron.lang
 create mode 100644 htdocs/langs/es_US/exports.lang
 delete mode 100644 htdocs/langs/es_US/mrp.lang
 create mode 100644 htdocs/langs/es_US/products.lang
 create mode 100644 htdocs/langs/es_US/stocks.lang
 create mode 100644 htdocs/langs/es_US/ticket.lang
 delete mode 100644 htdocs/langs/es_UY/cron.lang
 create mode 100644 htdocs/langs/es_UY/exports.lang
 delete mode 100644 htdocs/langs/es_UY/mrp.lang
 create mode 100644 htdocs/langs/es_UY/products.lang
 create mode 100644 htdocs/langs/es_UY/stocks.lang
 create mode 100644 htdocs/langs/es_UY/ticket.lang
 delete mode 100644 htdocs/langs/es_VE/agenda.lang
 create mode 100644 htdocs/langs/es_VE/exports.lang
 delete mode 100644 htdocs/langs/es_VE/mrp.lang
 delete mode 100644 htdocs/langs/fr_BE/cron.lang
 create mode 100644 htdocs/langs/fr_BE/exports.lang
 delete mode 100644 htdocs/langs/fr_BE/mrp.lang
 create mode 100644 htdocs/langs/fr_BE/products.lang
 create mode 100644 htdocs/langs/fr_BE/stocks.lang
 create mode 100644 htdocs/langs/fr_BE/ticket.lang
 delete mode 100644 htdocs/langs/fr_CA/mrp.lang
 delete mode 100644 htdocs/langs/fr_CH/cron.lang
 create mode 100644 htdocs/langs/fr_CH/exports.lang
 delete mode 100644 htdocs/langs/fr_CH/mrp.lang
 create mode 100644 htdocs/langs/fr_CH/products.lang
 create mode 100644 htdocs/langs/fr_CH/stocks.lang
 create mode 100644 htdocs/langs/fr_CH/ticket.lang
 delete mode 100644 htdocs/langs/fr_CI/cron.lang
 create mode 100644 htdocs/langs/fr_CI/exports.lang
 delete mode 100644 htdocs/langs/fr_CI/mrp.lang
 create mode 100644 htdocs/langs/fr_CI/products.lang
 create mode 100644 htdocs/langs/fr_CI/stocks.lang
 create mode 100644 htdocs/langs/fr_CI/ticket.lang
 delete mode 100644 htdocs/langs/fr_CM/cron.lang
 create mode 100644 htdocs/langs/fr_CM/exports.lang
 delete mode 100644 htdocs/langs/fr_CM/mrp.lang
 create mode 100644 htdocs/langs/fr_CM/products.lang
 create mode 100644 htdocs/langs/fr_CM/stocks.lang
 create mode 100644 htdocs/langs/fr_CM/ticket.lang
 delete mode 100644 htdocs/langs/fr_GA/cron.lang
 create mode 100644 htdocs/langs/fr_GA/exports.lang
 delete mode 100644 htdocs/langs/fr_GA/mrp.lang
 create mode 100644 htdocs/langs/fr_GA/products.lang
 create mode 100644 htdocs/langs/fr_GA/stocks.lang
 create mode 100644 htdocs/langs/fr_GA/ticket.lang
 delete mode 100644 htdocs/langs/it_CH/accountancy.lang
 delete mode 100644 htdocs/langs/it_CH/cron.lang
 create mode 100644 htdocs/langs/it_CH/exports.lang
 delete mode 100644 htdocs/langs/it_CH/mrp.lang
 create mode 100644 htdocs/langs/it_CH/products.lang
 create mode 100644 htdocs/langs/it_CH/stocks.lang
 create mode 100644 htdocs/langs/it_CH/ticket.lang
 create mode 100644 htdocs/langs/nl_BE/help.lang
 delete mode 100644 htdocs/langs/nl_BE/mrp.lang
 create mode 100644 htdocs/langs/nl_BE/paybox.lang
 delete mode 100644 htdocs/langs/pt_AO/cron.lang
 create mode 100644 htdocs/langs/pt_AO/exports.lang
 delete mode 100644 htdocs/langs/pt_AO/mrp.lang
 create mode 100644 htdocs/langs/pt_AO/products.lang
 create mode 100644 htdocs/langs/pt_AO/stocks.lang
 create mode 100644 htdocs/langs/pt_AO/ticket.lang
 create mode 100644 htdocs/langs/ru_UA/accountancy.lang
 create mode 100644 htdocs/langs/ru_UA/admin.lang
 delete mode 100644 htdocs/langs/ru_UA/cron.lang
 create mode 100644 htdocs/langs/ru_UA/exports.lang
 delete mode 100644 htdocs/langs/ru_UA/mrp.lang
 create mode 100644 htdocs/langs/ru_UA/products.lang
 create mode 100644 htdocs/langs/ru_UA/stocks.lang
 create mode 100644 htdocs/langs/ru_UA/ticket.lang

diff --git a/htdocs/langs/am_ET/accountancy.lang b/htdocs/langs/am_ET/accountancy.lang
index 354cddb62c2..27be673dd9c 100644
--- a/htdocs/langs/am_ET/accountancy.lang
+++ b/htdocs/langs/am_ET/accountancy.lang
@@ -158,7 +158,7 @@ ACCOUNTING_LENGTH_AACCOUNT=Length of the third-party accounting accounts (If you
 ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of an accounting account. Needed by some countries (like Switzerland). If set to off (default), you can set the following two parameters to ask the application to add virtual zeros.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties, break ability to search on a part of value)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
@@ -328,6 +328,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountanc
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
+NotifiedExportDate=Notified export date (modification of the entries will not be possible)
+NotifiedValidationDate=Validation of the entries (modification or deletion of the entries will not be possible)
+ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=Export draft journal
 Modelcsv=Model of export
 Selectmodelcsv=Select a model of export
diff --git a/htdocs/langs/am_ET/admin.lang b/htdocs/langs/am_ET/admin.lang
index fb4513a09b4..be9aca94599 100644
--- a/htdocs/langs/am_ET/admin.lang
+++ b/htdocs/langs/am_ET/admin.lang
@@ -221,8 +221,8 @@ NotCompatible=This module does not seem compatible with your Dolibarr %s (Min %s
 CompatibleAfterUpdate=This module requires an update to your Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=See in Market place
 SeeSetupOfModule=See setup of module %s
+SetOptionTo=Set option <b>%s</b> to %s
 Updated=Updated
-Nouveauté=Novelty
 AchatTelechargement=Buy / Download
 GoModuleSetupArea=To deploy/install a new module, go to the Module setup area: <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
@@ -399,6 +399,7 @@ SecurityToken=Key to secure URLs
 NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
 PDF=PDF
 PDFDesc=Global options for PDF generation
+PDFOtherDesc=PDF Option specific to some modules
 PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
 PDFRulesForSalesTax=Rules for Sales Tax / VAT
@@ -561,7 +562,7 @@ Module53Desc=Management of Services
 Module54Name=Contracts/Subscriptions
 Module54Desc=Management of contracts (services or recurring subscriptions)
 Module55Name=Barcodes
-Module55Desc=Barcode management
+Module55Desc=Barcode or QR code management
 Module56Name=Payment by credit transfer
 Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
 Module57Name=Payments by Direct Debit
@@ -848,10 +849,10 @@ Permission402=Create/modify discounts
 Permission403=Validate discounts
 Permission404=Delete discounts
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries (yours and subordinates)
-Permission512=Create/modify payments of salaries
-Permission514=Delete payments of salaries
-Permission517=Read payments of salaries of everybody
+Permission511=Read salaries and payments (yours and subordinates)
+Permission512=Create/modify salaries and payments
+Permission514=Delete salaries and payments
+Permission517=Read salaries and payments everybody
 Permission519=Export salaries
 Permission520=Read Loans
 Permission522=Create/modify loans
@@ -965,6 +966,8 @@ Permission23003=Delete Scheduled job
 Permission23004=Execute Scheduled job
 Permission50101=Use Point of Sale (SimplePOS)
 Permission50151=Use Point of Sale (TakePOS)
+Permission50152=Edit sales lines
+Permission50153=Edit ordered sales lines
 Permission50201=Read transactions
 Permission50202=Import transactions
 Permission50330=Read objects of Zapier
@@ -1039,11 +1042,12 @@ DictionaryMeasuringUnits=Measuring Units
 DictionarySocialNetworks=Social Networks
 DictionaryProspectStatus=Prospect status for companies
 DictionaryProspectContactStatus=Prospect status for contacts
-DictionaryHolidayTypes=Types of leave
+DictionaryHolidayTypes=Leave - Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
 DictionaryTransportMode=Intracomm report - Transport mode
+DictionaryBatchStatus=Product lot/serial Quality Control status
 TypeOfUnit=Type of unit
 SetupSaved=Setup saved
 SetupNotSaved=Setup not saved
@@ -1187,7 +1191,7 @@ SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of m
 SetupDescription5=Other Setup menu entries manage optional parameters.
 AuditedSecurityEvents=Security events that are audited
 NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
-Audit=Audit
+Audit=Security events
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
 InfoOS=About OS
@@ -1319,9 +1323,12 @@ ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
 NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
+ComboListOptim=Combo list loading optimization
 SearchOptim=Search optimization
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
-YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
+YouHaveXObjectUseComboOptim=You have %s %s in the database. You can go into setup of module to enable loading of combo list on key pressed event.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other.
+YouHaveXObjectUseSearchOptimDesc=This limits the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to %s in Home-Setup-Other.
 BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
 BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
 PHPModuleLoaded=PHP component %s is loaded
@@ -1433,6 +1440,7 @@ MemberMainOptions=Main options
 AdherentLoginRequired= Manage a Login for each member
 AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
+MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
 MembersDocModules=Document templates for documents generated from member record
@@ -1763,7 +1771,7 @@ AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting men
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
-AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the scheduled job %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
@@ -1979,6 +1987,8 @@ 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_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add picture on proposal line
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add electronic sign in PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
@@ -2096,7 +2106,6 @@ PDF_SHOW_PROJECT=Show project on document
 ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
-FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
@@ -2120,12 +2129,18 @@ ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by
 MailToSendEventOrganization=Event Organization
 AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
 YouShouldDisablePHPFunctions=You should disable PHP functions
-IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands in custom code, you shoud disable PHP functions
+PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
+NotRecommended=Not recommanded
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
 ModuleUpdateAvailable=An update is available
 NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
+RandomlySelectedIfSeveral=Randomly selected if several pictures are available
+DatabasePasswordObfuscated=Database password is obfuscated in conf file
+DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
diff --git a/htdocs/langs/am_ET/agenda.lang b/htdocs/langs/am_ET/agenda.lang
index 09d82139a49..a1183841b00 100644
--- a/htdocs/langs/am_ET/agenda.lang
+++ b/htdocs/langs/am_ET/agenda.lang
@@ -4,7 +4,7 @@ Actions=Events
 Agenda=Agenda
 TMenuAgenda=Agenda
 Agendas=Agendas
-LocalAgenda=Internal calendar
+LocalAgenda=Default calendar
 ActionsOwnedBy=Event owned by
 ActionsOwnedByShort=Owner
 AffectedTo=Assigned to
@@ -14,13 +14,13 @@ EventsNb=Number of events
 ListOfActions=List of events
 EventReports=Event reports
 Location=Location
-ToUserOfGroup=Event assigned to any user in group
+ToUserOfGroup=Event assigned to any user in the group
 EventOnFullDay=Event on all day(s)
 MenuToDoActions=All incomplete events
 MenuDoneActions=All terminated events
 MenuToDoMyActions=My incomplete events
 MenuDoneMyActions=My terminated events
-ListOfEvents=List of events (internal calendar)
+ListOfEvents=List of events (default calendar)
 ActionsAskedBy=Events reported by
 ActionsToDoBy=Events assigned to
 ActionsDoneBy=Events done by
@@ -38,6 +38,7 @@ ActionsEvents=Events for which Dolibarr will create an action in agenda automati
 EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Third party %s created
+COMPANY_MODIFYInDolibarr=Third party %s modified
 COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=Contract %s validated
 CONTRACT_DELETEInDolibarr=Contract %s deleted
@@ -87,6 +88,7 @@ OrderDeleted=Order deleted
 InvoiceDeleted=Invoice deleted
 DraftInvoiceDeleted=Draft invoice deleted
 CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_MODIFYInDolibarr=Contact %s modified
 CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Product %s created
 PRODUCT_MODIFYInDolibarr=Product %s modified
@@ -119,6 +121,7 @@ MRP_MO_UNVALIDATEInDolibarr=MO set to draft status
 MRP_MO_PRODUCEDInDolibarr=MO produced
 MRP_MO_DELETEInDolibarr=MO deleted
 MRP_MO_CANCELInDolibarr=MO canceled
+PAIDInDolibarr=%s paid
 ##### End agenda events #####
 AgendaModelModule=Document templates for event
 DateActionStart=Start date
@@ -130,7 +133,7 @@ AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to use
 AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
 AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic events.
 AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> to include events of holidays.
-AgendaShowBirthdayEvents=Show birthdays of contacts
+AgendaShowBirthdayEvents=Birthdays of contacts
 AgendaHideBirthdayEvents=Hide birthdays of contacts
 Busy=Busy
 ExportDataset_event1=List of agenda events
@@ -152,6 +155,7 @@ ActionType=Event type
 DateActionBegin=Start event date
 ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b>?
 RepeatEvent=Repeat event
+OnceOnly=Once only
 EveryWeek=Every week
 EveryMonth=Every month
 DayOfMonth=Day of month
@@ -165,4 +169,4 @@ TimeType=Duration type
 ReminderType=Callback type
 AddReminder=Create an automatic reminder notification for this event
 ErrorReminderActionCommCreation=Error creating the reminder notification for this event
-BrowserPush=Browser Notification
+BrowserPush=Browser Popup Notification
diff --git a/htdocs/langs/am_ET/bills.lang b/htdocs/langs/am_ET/bills.lang
index c55f483873b..7b8c997d2e6 100644
--- a/htdocs/langs/am_ET/bills.lang
+++ b/htdocs/langs/am_ET/bills.lang
@@ -259,6 +259,7 @@ DateMaxPayment=Payment due on
 DateInvoice=Invoice date
 DatePointOfTax=Point of tax
 NoInvoice=No invoice
+NoOpenInvoice=No open invoice
 ClassifyBill=Classify invoice
 SupplierBillsToPay=Unpaid vendor invoices
 CustomerBillsUnpaid=Unpaid customer invoices
@@ -589,3 +590,4 @@ FacParentLine=Invoice Line Parent
 SituationTotalRayToRest=Remainder to pay without taxe
 PDFSituationTitle=Situation n° %d
 SituationTotalProgress=Total progress %d %%
+SearchUnpaidInvoicesWithDueDate=Search unpaid invoices with a due date = %s
diff --git a/htdocs/langs/am_ET/cashdesk.lang b/htdocs/langs/am_ET/cashdesk.lang
index 240503842f3..aea1f02f834 100644
--- a/htdocs/langs/am_ET/cashdesk.lang
+++ b/htdocs/langs/am_ET/cashdesk.lang
@@ -102,7 +102,7 @@ CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal numb
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
 SaleStartedAt=Sale started at %s
-ControlCashOpening=Control cash popup at opening POS
+ControlCashOpening=Open the "Control cash" popup when opening the POS
 CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -126,5 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
-ShowPriceHT = Display the price excluding tax column
-ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
+ShowPriceHT = Display the column with the price excluding tax (on screen)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
diff --git a/htdocs/langs/am_ET/compta.lang b/htdocs/langs/am_ET/compta.lang
index 7cae82e6ac7..8329346c163 100644
--- a/htdocs/langs/am_ET/compta.lang
+++ b/htdocs/langs/am_ET/compta.lang
@@ -286,3 +286,9 @@ ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
 IncludeLoansInResults = Include loans in reports
+InvoiceLate30Days = Invoices late > 30 days
+InvoiceLate15Days = Invoices late > 15 days
+InvoiceLateMinus15Days = Invoices late
+InvoiceNotLate = To be collected < 15 days
+InvoiceNotLate15Days = To be collected in 15 days
+InvoiceNotLate30Days = To be collected in 30 days
diff --git a/htdocs/langs/am_ET/cron.lang b/htdocs/langs/am_ET/cron.lang
index 2ebdda1e685..4fd2220dea6 100644
--- a/htdocs/langs/am_ET/cron.lang
+++ b/htdocs/langs/am_ET/cron.lang
@@ -60,7 +60,7 @@ CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
 CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Disable
-CronTaskInactive=This job is disabled
+CronTaskInactive=This job is disabled (not scheduled)
 CronId=Id
 CronClassFile=Filename with class
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example 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>
diff --git a/htdocs/langs/am_ET/errors.lang b/htdocs/langs/am_ET/errors.lang
index 9b14b5ad1d2..670f8c7a6bc 100644
--- a/htdocs/langs/am_ET/errors.lang
+++ b/htdocs/langs/am_ET/errors.lang
@@ -11,6 +11,7 @@ ErrorBadValueForParamNotAString=Bad value for your parameter. It appends general
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s already exists.
 ErrorGroupAlreadyExists=Group %s already exists.
+ErrorEmailAlreadyExists=Email %s already exists.
 ErrorRecordNotFound=Record not found.
 ErrorFailToCopyFile=Failed to copy file '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
@@ -117,7 +118,7 @@ ErrorCantReadFile=Failed to read file '%s'
 ErrorCantReadDir=Failed to read directory '%s'
 ErrorBadLoginPassword=Bad value for login or password
 ErrorLoginDisabled=Your account has been disabled
-ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server. If PHP <b>Safe Mode</b> is enabled, check that command is inside a directory defined by parameter <b>safe_mode_exec_dir</b>.
+ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server user. Check also the command is not protected on shell level by a security layer like apparmor.
 ErrorFailedToChangePassword=Failed to change password
 ErrorLoginDoesNotExists=User with login <b>%s</b> could not be found.
 ErrorLoginHasNoEmail=This user has no email address. Process aborted.
@@ -262,6 +263,7 @@ ErrorDateIsInFuture=Error, the date can't be in the future
 ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
 ErrorAPercentIsRequired=Error, please fill in the percentage correctly
 ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
+ErrorFailedToFindEmailTemplate=Failed to find template with code name %s
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -298,3 +300,4 @@ WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So y
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
+ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
diff --git a/htdocs/langs/am_ET/eventorganization.lang b/htdocs/langs/am_ET/eventorganization.lang
index 75b798fbc3a..335c257b224 100644
--- a/htdocs/langs/am_ET/eventorganization.lang
+++ b/htdocs/langs/am_ET/eventorganization.lang
@@ -1,4 +1,5 @@
 # Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+# Copyright (C) 2021		Dorian Vabre			<dorian.vabre@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
@@ -81,7 +82,10 @@ PriceOfBoothHelp=Subscription price to stand a booth
 EventOrganizationICSLink=Link ICS for events
 ConferenceOrBoothInformation=Conference Or Booth informations
 Attendees = Attendees
+DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
 #
 # Status
 #
@@ -94,8 +98,46 @@ EvntOrgCancelled = Cancelled
 #
 # Public page
 #
+SuggestForm = Suggestion page
+RegisterPage = Page for conferences or booth
+EvntOrgRegistrationHelpMessage = Here, you can vote for an event, or suggest a new conference or booth for the project
+EvntOrgRegistrationConfHelpMessage = Here, you can suggest a new conference for the project
+EvntOrgRegistrationBoothHelpMessage = Here, you can suggest a new booth for the project
+ListOfSuggestedConferences = List of suggested conferences
+ListOfSuggestedBooths = List of suggested booths
+SuggestConference = Suggest a new conference
+SuggestBooth = Suggest a booth
+ViewAndVote = View and vote for suggested events
 PublicAttendeeSubscriptionPage = Public link of registration to a conference
 MissingOrBadSecureKey = The security key is invalid or missing
-EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
-EvntOrgStartDuration = This conference starts on
-EvntOrgEndDuration =  and ends on
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference : '%s'
+EvntOrgDuration = This conference starts on %s and ends on %s.
+ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
+BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
+EventType = Event type
+
+#
+# Vote page
+#
+EvntOrgRegistrationWelcomeMessage = Welcome on the conference or booth suggestion page.
+EvntOrgRegistrationConfWelcomeMessage = Welcome on the conference suggestion page.
+EvntOrgRegistrationBoothWelcomeMessage = Welcome on the booth suggestion page.
+EvntOrgVoteHelpMessage = Here, you can view and vote for the suggested events for the project
+VoteOk = Your vote has been accepted.
+AlreadyVoted = You have already voted for this event.
+VoteError = An error has occurred during the vote, please try again.
+
+#
+# SubscriptionOk page
+#
+SubscriptionOk = Your subscription to this conference has been validated
+#
+# Subscription validation mail
+#
+ConfAttendeeSubscriptionConfirmation = Confirmation of your subscription to a conference
+#
+# Payment page
+#
+Attendee = Attendee
+PaymentConferenceAttendee = Conference attendee payment
+PaymentBoothLocation = Booth location payment
diff --git a/htdocs/langs/am_ET/hrm.lang b/htdocs/langs/am_ET/hrm.lang
index 3b8f137e103..da098e10bdb 100644
--- a/htdocs/langs/am_ET/hrm.lang
+++ b/htdocs/langs/am_ET/hrm.lang
@@ -9,7 +9,7 @@ ConfirmDeleteEstablishment=Are you sure you wish to delete this establishment?
 OpenEtablishment=Open establishment
 CloseEtablishment=Close establishment
 # Dictionary
-DictionaryPublicHolidays=HRM - Public holidays
+DictionaryPublicHolidays=Leave - Public holidays
 DictionaryDepartment=HRM - Department list
 DictionaryFunction=HRM - Job positions
 # Module
diff --git a/htdocs/langs/am_ET/knowledgemanagement.lang b/htdocs/langs/am_ET/knowledgemanagement.lang
index 269007e60f8..68f5cced76c 100644
--- a/htdocs/langs/am_ET/knowledgemanagement.lang
+++ b/htdocs/langs/am_ET/knowledgemanagement.lang
@@ -47,7 +47,7 @@ KnowledgeManagementArea = Knowledge Management
 # Menu
 #
 MenuKnowledgeRecord = Knowledge base
-ListOfArticles = List of articles
+ListKnowledgeRecord = List of articles
 NewKnowledgeRecord = New article
 ValidateReply = Validate solution
 KnowledgeRecords = Articles
diff --git a/htdocs/langs/am_ET/languages.lang b/htdocs/langs/am_ET/languages.lang
index ba187326705..da8ad5376a1 100644
--- a/htdocs/langs/am_ET/languages.lang
+++ b/htdocs/langs/am_ET/languages.lang
@@ -3,6 +3,7 @@ Language_am_ET=Ethiopian
 Language_ar_AR=Arabic
 Language_ar_EG=Arabic (Egypt)
 Language_ar_SA=Arabic
+Language_ar_TN=Arabic (Tunisia)
 Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengali
 Language_bn_IN=Bengali (India)
@@ -84,6 +85,7 @@ Language_nl_NL=Dutch
 Language_pl_PL=Polish
 Language_pt_BR=Portuguese (Brazil)
 Language_pt_PT=Portuguese
+Language_ro_MD=Romanian (Moldavia)
 Language_ro_RO=Romanian
 Language_ru_RU=Russian
 Language_ru_UA=Russian (Ukraine)
diff --git a/htdocs/langs/am_ET/main.lang b/htdocs/langs/am_ET/main.lang
index 13793aad13f..863b94af564 100644
--- a/htdocs/langs/am_ET/main.lang
+++ b/htdocs/langs/am_ET/main.lang
@@ -430,6 +430,7 @@ LT1IN=CGST
 LT2IN=SGST
 LT1GC=Additionnal cents
 VATRate=Tax Rate
+RateOfTaxN=Rate of tax %s
 VATCode=Tax Rate code
 VATNPR=Tax Rate NPR
 DefaultTaxRate=Default tax rate
@@ -729,6 +730,7 @@ MenuMembers=Members
 MenuAgendaGoogle=Google agenda
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
+ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
 NoFileFound=No documents uploaded
 CurrentUserLanguage=Current language
 CurrentTheme=Current theme
@@ -1072,6 +1074,7 @@ ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
 ToClose=To close
+ToRefuse=To refuse
 ToProcess=To process
 ToApprove=To approve
 GlobalOpenedElemView=Global view
@@ -1126,9 +1129,11 @@ UpdateForAllLines=Update for all lines
 OnHold=On hold
 Civility=Civility
 AffectTag=Affect Tag
+CreateExternalUser=Create external user
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
 ConfirmCancel=Are you sure you want to cancel
+EmailMsgID=Email MsgID
diff --git a/htdocs/langs/am_ET/members.lang b/htdocs/langs/am_ET/members.lang
index 042b85598c0..d8b9c2f59f3 100644
--- a/htdocs/langs/am_ET/members.lang
+++ b/htdocs/langs/am_ET/members.lang
@@ -213,3 +213,5 @@ SendReminderForExpiredSubscription=Send reminder by email to members when subscr
 MembershipPaid=Membership paid for current period (until %s)
 YouMayFindYourInvoiceInThisEmail=You may find your invoice attached to this email
 XMembersClosed=%s member(s) closed
+XExternalUserCreated=%s external user(s) created
+ForceMemberNature=Force member nature (Individual or Corporation)
diff --git a/htdocs/langs/am_ET/modulebuilder.lang b/htdocs/langs/am_ET/modulebuilder.lang
index 9fdaa1a533a..23a098be2e5 100644
--- a/htdocs/langs/am_ET/modulebuilder.lang
+++ b/htdocs/langs/am_ET/modulebuilder.lang
@@ -143,3 +143,4 @@ AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
 ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
+ImportExportProfiles=Import and export profiles
diff --git a/htdocs/langs/am_ET/mrp.lang b/htdocs/langs/am_ET/mrp.lang
index ec999a473a4..2414a92cefb 100644
--- a/htdocs/langs/am_ET/mrp.lang
+++ b/htdocs/langs/am_ET/mrp.lang
@@ -8,12 +8,12 @@ MenuBOM=Bills of material
 LatestBOMModified=Latest %s Bills of materials modified
 LatestMOModified=Latest %s Manufacturing Orders modified
 Bom=Bills of Material
-BillOfMaterials=Bill of Material
+BillOfMaterials=Bill of Materials
 BOMsSetup=Setup of module BOM
 ListOfBOMs=List of bills of material - BOM
 ListOfManufacturingOrders=List of Manufacturing Orders
-NewBOM=New bill of material
-ProductBOMHelp=Product to create with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
+NewBOM=New bill of materials
+ProductBOMHelp=Product to create (or disassemble) with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
 BOMsNumberingModules=BOM numbering templates
 BOMsModelModule=BOM document templates
 MOsNumberingModules=MO numbering templates
@@ -22,7 +22,7 @@ FreeLegalTextOnBOMs=Free text on document of BOM
 WatermarkOnDraftBOMs=Watermark on draft BOM
 FreeLegalTextOnMOs=Free text on document of MO
 WatermarkOnDraftMOs=Watermark on draft MO
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials %s ?
 ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
 ManufacturingEfficiency=Manufacturing efficiency
 ConsumptionEfficiency=Consumption efficiency
@@ -30,8 +30,8 @@ ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the produc
 ValueOfMeansLossForProductProduced=Value of 0.95 means an average of 5%% of loss of produced product
 DeleteBillOfMaterials=Delete Bill Of Materials
 DeleteMo=Delete Manufacturing Order
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Materials?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Materials?
 MenuMRP=Manufacturing Orders
 NewMO=New Manufacturing Order
 QtyToProduce=Qty to produce
@@ -39,7 +39,7 @@ DateStartPlannedMo=Date start planned
 DateEndPlannedMo=Date end planned
 KeepEmptyForAsap=Empty means 'As Soon As Possible'
 EstimatedDuration=Estimated duration
-EstimatedDurationDesc=Estimated duration to manufacture this product using this BOM
+EstimatedDurationDesc=Estimated duration to manufacture (or disassemble) this product using this BOM
 ConfirmValidateBom=Are you sure you want to validate the BOM with the reference <strong>%s</strong> (you will be able to use it to build new Manufacturing Orders)
 ConfirmCloseBom=Are you sure you want to cancel this BOM (you won't be able to use it to build new Manufacturing Orders anymore) ?
 ConfirmReopenBom=Are you sure you want to re-open this BOM (you will be able to use it to build new Manufacturing Orders)
@@ -63,13 +63,14 @@ ConsumeAndProduceAll=Consume and Produce All
 Manufactured=Manufactured
 TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
 ForAQuantityOf=For a quantity to produce of %s
+ForAQuantityToConsumeOf=For a quantity to disassemble of %s
 ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
 ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
 ProductionForRef=Production of %s
 AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
 NoStockChangeOnServices=No stock change on services
 ProductQtyToConsumeByMO=Product quantity still to consume by open MO
-ProductQtyToProduceByMO=Product quentity still to produce by open MO
+ProductQtyToProduceByMO=Product quantity still to produce by open MO
 AddNewConsumeLines=Add new line to consume
 ProductsToConsume=Products to consume
 ProductsToProduce=Products to produce
@@ -83,15 +84,13 @@ Workstations=Workstations
 WorkstationsDescription=Workstations management
 WorkstationSetup = Workstations setup
 WorkstationSetupPage = Workstations setup page
-WorkstationAbout = About Workstation
-WorkstationAboutPage = Workstations about page
 WorkstationList=Workstation list
 WorkstationCreate=Add new workstation
 ConfirmEnableWorkstation=Are you sure you want to enable workstation <b>%s</b> ?
 EnableAWorkstation=Enable a workstation
 ConfirmDisableWorkstation=Are you sure you want to disable workstation <b>%s</b> ?
 DisableAWorkstation=Disable a workstation
-DeleteWorkstation=Supprimer
+DeleteWorkstation=Delete
 NbOperatorsRequired=Number of operators required
 THMOperatorEstimated=Estimated operator THM
 THMMachineEstimated=Estimated machine THM
diff --git a/htdocs/langs/am_ET/orders.lang b/htdocs/langs/am_ET/orders.lang
index 87d196eb22f..5dab5b99bf1 100644
--- a/htdocs/langs/am_ET/orders.lang
+++ b/htdocs/langs/am_ET/orders.lang
@@ -11,6 +11,7 @@ OrderDate=Order date
 OrderDateShort=Order date
 OrderToProcess=Order to process
 NewOrder=New order
+NewSupplierOrderShort=New order
 NewOrderSupplier=New Purchase Order
 ToOrder=Make order
 MakeOrder=Make order
@@ -73,6 +74,7 @@ DeleteOrder=Delete order
 CancelOrder=Cancel order
 OrderReopened= Order %s re-open
 AddOrder=Create order
+AddSupplierOrderShort=Create order
 AddPurchaseOrder=Create purchase order
 AddToDraftOrders=Add to draft order
 ShowOrder=Show order
diff --git a/htdocs/langs/am_ET/other.lang b/htdocs/langs/am_ET/other.lang
index 95297a98859..bb35099ab82 100644
--- a/htdocs/langs/am_ET/other.lang
+++ b/htdocs/langs/am_ET/other.lang
@@ -129,6 +129,7 @@ ClosedByLogin=User login who closed
 FileWasRemoved=File %s was removed
 DirWasRemoved=Directory %s was removed
 FeatureNotYetAvailable=Feature not yet available in the current version
+FeatureNotAvailableOnDevicesWithoutMouse=Feature not available on devices without mouse
 FeaturesSupported=Supported features
 Width=Width
 Height=Height
@@ -263,7 +264,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
-PrefixSession=Prefix for session ID
+SuffixSessionName=Suffix for session name
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/am_ET/partnership.lang b/htdocs/langs/am_ET/partnership.lang
index 09059995a8d..2fb10e8159e 100644
--- a/htdocs/langs/am_ET/partnership.lang
+++ b/htdocs/langs/am_ET/partnership.lang
@@ -16,41 +16,72 @@
 #
 # Generic
 #
-ModulePartnershipName = Partnership management
-PartnershipDescription = Module Partnership management
+ModulePartnershipName=Partnership management
+PartnershipDescription=Module Partnership management
 PartnershipDescriptionLong= Module Partnership management
 
+AddPartnership=Add partnership
+CancelPartnershipForExpiredMembers=Partnership: Cancel partnership of members with expired subscriptions
+PartnershipCheckBacklink=Partnership: Check referring backlink
+
 #
 # Menu
 #
-NewPartnership = New Partnership
-ListOfPartnerships = List of partnership
+NewPartnership=New Partnership
+ListOfPartnerships=List of partnership
 
 #
 # Admin page
 #
-PartnershipSetup = Partnership setup
-PartnershipAbout = About Partnership
-PartnershipAboutPage = Partnership about page
-
+PartnershipSetup=Partnership setup
+PartnershipAbout=About Partnership
+PartnershipAboutPage=Partnership about page
+partnershipforthirdpartyormember=Partner status must be set on a 'thirdparty' or a 'member'
+PARTNERSHIP_IS_MANAGED_FOR=Partnership managed for
+PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks to check
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb of days before cancelling status of a partnership when a subscription has expired
+ReferingWebsiteCheck=Check of website referring
+ReferingWebsiteCheckDesc=You can enable a feature to check that your partners has added a backlink to your website domains on their own website.
 
 #
 # Object
 #
+DeletePartnership=Delete a partnership
+PartnershipDedicatedToThisThirdParty=Partnership dedicated to this third party
+PartnershipDedicatedToThisMember=Partnership dedicated to this member
 DatePartnershipStart=Start date
 DatePartnershipEnd=End date
+ReasonDecline=Decline reason
+ReasonDeclineOrCancel=Decline reason
+PartnershipAlreadyExist=Partnership already exist
+ManagePartnership=Manage partnership
+BacklinkNotFoundOnPartnerWebsite=Backlink not found on partner website
+ConfirmClosePartnershipAsk=Are you sure you want to cancel this partnership?
+PartnershipType=Partnership type
 
 #
 # Template Mail
 #
+SendingEmailOnPartnershipWillSoonBeCanceled=Partnership will soon be canceled
+SendingEmailOnPartnershipRefused=Partnership refused
+SendingEmailOnPartnershipAccepted=Partnership accepted
+SendingEmailOnPartnershipCanceled=Partnership canceled
 
+YourPartnershipWillSoonBeCanceledTopic=Partnership will soon be canceled
+YourPartnershipRefusedTopic=Partnership refused
+YourPartnershipAcceptedTopic=Partnership accepted
+YourPartnershipCanceledTopic=Partnership canceled
+
+YourPartnershipWillSoonBeCanceledContent=We inform you that your partnership will soon be canceled (Backlink not found)
+YourPartnershipRefusedContent=We inform you that your partnership request has been refused.
+YourPartnershipAcceptedContent=We inform you that your partnership request has been accepted.
+YourPartnershipCanceledContent=We inform you that your partnership has been canceled.
 
 #
 # Status
 #
-PartnershipDraft = Draft
-PartnershipAccepted = Accepted
-PartnershipRefused = Refused
-PartnershipCanceled = Canceled
-
+PartnershipDraft=Draft
+PartnershipAccepted=Accepted
+PartnershipRefused=Refused
+PartnershipCanceled=Canceled
 PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/am_ET/productbatch.lang b/htdocs/langs/am_ET/productbatch.lang
index ad2db658e2e..450d0285819 100644
--- a/htdocs/langs/am_ET/productbatch.lang
+++ b/htdocs/langs/am_ET/productbatch.lang
@@ -1,4 +1,4 @@
-# ProductBATCH language file - en_US - ProductBATCH
+# ProductBATCH language file - Source file is en_US - ProductBATCH
 ManageLotSerial=Use lot/serial number
 ProductStatusOnBatch=Yes (lot required)
 ProductStatusOnSerial=Yes (unique serial number required)
@@ -33,3 +33,13 @@ CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+LifeTime=Life span (in days)
+EndOfLife=End of life
+ManufacturingDate=Manufacturing date
+DestructionDate=Destruction date
+FirstUseDate=First use date
+QCFrequency=Quality control frequency (in days)
+
+#Traceability - qc status
+OutOfOrder=Out of order
+InWorkingOrder=In working order
diff --git a/htdocs/langs/am_ET/products.lang b/htdocs/langs/am_ET/products.lang
index 0875be0dc07..9638dfe5a25 100644
--- a/htdocs/langs/am_ET/products.lang
+++ b/htdocs/langs/am_ET/products.lang
@@ -396,3 +396,5 @@ ActionAvailableOnVariantProductOnly=Action only available on the variant of prod
 ProductsPricePerCustomer=Product prices per customers
 ProductSupplierExtraFields=Additional Attributes (Supplier Prices)
 DeleteLinkedProduct=Delete the child product linked to the combination
+PMPValue=Weighted average price
+PMPValueShort=WAP
diff --git a/htdocs/langs/am_ET/projects.lang b/htdocs/langs/am_ET/projects.lang
index 79c974f6e24..6c96fadb5c1 100644
--- a/htdocs/langs/am_ET/projects.lang
+++ b/htdocs/langs/am_ET/projects.lang
@@ -267,9 +267,11 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=New invoice
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+OneLinePerTimeSpentLine=One line for each time spent declaration
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
 AddPersonToTask=Add also to tasks
 UsageOrganizeEvent=Usage: Event Organization
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
+SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
diff --git a/htdocs/langs/am_ET/receptions.lang b/htdocs/langs/am_ET/receptions.lang
index 760ff884fa0..338602e722e 100644
--- a/htdocs/langs/am_ET/receptions.lang
+++ b/htdocs/langs/am_ET/receptions.lang
@@ -44,4 +44,4 @@ ValidateOrderFirstBeforeReception=You must first validate the order before being
 ReceptionsNumberingModules=Numbering module for receptions
 ReceptionsReceiptModel=Document templates for receptions
 NoMorePredefinedProductToDispatch=No more predefined products to dispatch
-
+ReceptionExist=A reception exists
diff --git a/htdocs/langs/am_ET/stocks.lang b/htdocs/langs/am_ET/stocks.lang
index 9ec523427b1..d39791932a3 100644
--- a/htdocs/langs/am_ET/stocks.lang
+++ b/htdocs/langs/am_ET/stocks.lang
@@ -56,8 +56,6 @@ UnitPurchaseValue=Unit purchase price
 StockTooLow=Stock too low
 StockLowerThanLimit=Stock lower than alert limit (%s)
 EnhancedValue=Value
-PMPValue=Weighted average price
-PMPValueShort=WAP
 EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
@@ -251,7 +249,10 @@ SelectAStockMovementFileToImport=select a stock movement file to import
 InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
 LabelOfInventoryMovemement=Inventory %s
 ReOpen=Reopen
-ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock to the real qty you entered into the inventory.
 ObjectNotFound=%s not found
 MakeMovementsAndClose=Generate movements and close
 AutofillWithExpected=Fill real quantity with expected quantity
+ShowAllBatchByDefault=By default, show batch details on product "stock" tab
+CollapseBatchDetailHelp=You can set batch detail default display in stocks module configuration
+FieldCannotBeNegative=Field "%s" cannot be negative
diff --git a/htdocs/langs/am_ET/ticket.lang b/htdocs/langs/am_ET/ticket.lang
index df73daf4a0d..1da32a5a99e 100644
--- a/htdocs/langs/am_ET/ticket.lang
+++ b/htdocs/langs/am_ET/ticket.lang
@@ -304,7 +304,7 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
-BoxTicketType=Number of open tickets by type
+BoxTicketType=Distribution of open tickets by type
 BoxTicketSeverity=Number of open tickets by severity
 BoxNoTicketSeverity=No tickets opened
 BoxTicketLastXDays=Number of new tickets by days the last %s days
diff --git a/htdocs/langs/ar_EG/accountancy.lang b/htdocs/langs/ar_EG/accountancy.lang
index 4dbdd035d6e..ef9e69e554a 100644
--- a/htdocs/langs/ar_EG/accountancy.lang
+++ b/htdocs/langs/ar_EG/accountancy.lang
@@ -1,2 +1,2 @@
 # Dolibarr language file - Source file is en_US - accountancy
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
diff --git a/htdocs/langs/ar_EG/cron.lang b/htdocs/langs/ar_EG/cron.lang
deleted file mode 100644
index 67ecfc77567..00000000000
--- a/htdocs/langs/ar_EG/cron.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - cron
-CronTaskInactive=This job is disabled
diff --git a/htdocs/langs/ar_EG/orders.lang b/htdocs/langs/ar_EG/orders.lang
index 7f814594ec4..a239c4b27a6 100644
--- a/htdocs/langs/ar_EG/orders.lang
+++ b/htdocs/langs/ar_EG/orders.lang
@@ -8,6 +8,7 @@ Orders=الطلبات
 OrderDateShort=تاريخ الأمر
 OrderToProcess=طلب تحت التشغيل
 NewOrder=أمر جديد
+NewSupplierOrderShort=أمر جديد
 ToOrder=إصدار أمر
 MakeOrder=إصدار أمر
 SuppliersOrders=أوامر الشراء
diff --git a/htdocs/langs/ar_EG/partnership.lang b/htdocs/langs/ar_EG/partnership.lang
index b617038bda4..3088f385a77 100644
--- a/htdocs/langs/ar_EG/partnership.lang
+++ b/htdocs/langs/ar_EG/partnership.lang
@@ -1,4 +1,4 @@
 # Dolibarr language file - Source file is en_US - partnership
-PartnershipDraft =مسودة
-PartnershipAccepted =مقبول
-PartnershipRefused =مرفوض
+PartnershipDraft=مسودة
+PartnershipAccepted=مقبول
+PartnershipRefused=مرفوض
diff --git a/htdocs/langs/ar_EG/products.lang b/htdocs/langs/ar_EG/products.lang
new file mode 100644
index 00000000000..e0628dbec00
--- /dev/null
+++ b/htdocs/langs/ar_EG/products.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - products
+ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
diff --git a/htdocs/langs/ar_EG/ticket.lang b/htdocs/langs/ar_EG/ticket.lang
index 9aadaa6918b..41152eed334 100644
--- a/htdocs/langs/ar_EG/ticket.lang
+++ b/htdocs/langs/ar_EG/ticket.lang
@@ -1,3 +1,4 @@
 # Dolibarr language file - Source file is en_US - ticket
 Closed=مقفول
 TicketSettings=الإعدادات
+TicketCategory=Group
diff --git a/htdocs/langs/ar_IQ/accountancy.lang b/htdocs/langs/ar_IQ/accountancy.lang
index 354cddb62c2..27be673dd9c 100644
--- a/htdocs/langs/ar_IQ/accountancy.lang
+++ b/htdocs/langs/ar_IQ/accountancy.lang
@@ -158,7 +158,7 @@ ACCOUNTING_LENGTH_AACCOUNT=Length of the third-party accounting accounts (If you
 ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of an accounting account. Needed by some countries (like Switzerland). If set to off (default), you can set the following two parameters to ask the application to add virtual zeros.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties, break ability to search on a part of value)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
@@ -328,6 +328,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountanc
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
+NotifiedExportDate=Notified export date (modification of the entries will not be possible)
+NotifiedValidationDate=Validation of the entries (modification or deletion of the entries will not be possible)
+ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=Export draft journal
 Modelcsv=Model of export
 Selectmodelcsv=Select a model of export
diff --git a/htdocs/langs/ar_IQ/admin.lang b/htdocs/langs/ar_IQ/admin.lang
index fb4513a09b4..be9aca94599 100644
--- a/htdocs/langs/ar_IQ/admin.lang
+++ b/htdocs/langs/ar_IQ/admin.lang
@@ -221,8 +221,8 @@ NotCompatible=This module does not seem compatible with your Dolibarr %s (Min %s
 CompatibleAfterUpdate=This module requires an update to your Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=See in Market place
 SeeSetupOfModule=See setup of module %s
+SetOptionTo=Set option <b>%s</b> to %s
 Updated=Updated
-Nouveauté=Novelty
 AchatTelechargement=Buy / Download
 GoModuleSetupArea=To deploy/install a new module, go to the Module setup area: <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
@@ -399,6 +399,7 @@ SecurityToken=Key to secure URLs
 NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
 PDF=PDF
 PDFDesc=Global options for PDF generation
+PDFOtherDesc=PDF Option specific to some modules
 PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
 PDFRulesForSalesTax=Rules for Sales Tax / VAT
@@ -561,7 +562,7 @@ Module53Desc=Management of Services
 Module54Name=Contracts/Subscriptions
 Module54Desc=Management of contracts (services or recurring subscriptions)
 Module55Name=Barcodes
-Module55Desc=Barcode management
+Module55Desc=Barcode or QR code management
 Module56Name=Payment by credit transfer
 Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
 Module57Name=Payments by Direct Debit
@@ -848,10 +849,10 @@ Permission402=Create/modify discounts
 Permission403=Validate discounts
 Permission404=Delete discounts
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries (yours and subordinates)
-Permission512=Create/modify payments of salaries
-Permission514=Delete payments of salaries
-Permission517=Read payments of salaries of everybody
+Permission511=Read salaries and payments (yours and subordinates)
+Permission512=Create/modify salaries and payments
+Permission514=Delete salaries and payments
+Permission517=Read salaries and payments everybody
 Permission519=Export salaries
 Permission520=Read Loans
 Permission522=Create/modify loans
@@ -965,6 +966,8 @@ Permission23003=Delete Scheduled job
 Permission23004=Execute Scheduled job
 Permission50101=Use Point of Sale (SimplePOS)
 Permission50151=Use Point of Sale (TakePOS)
+Permission50152=Edit sales lines
+Permission50153=Edit ordered sales lines
 Permission50201=Read transactions
 Permission50202=Import transactions
 Permission50330=Read objects of Zapier
@@ -1039,11 +1042,12 @@ DictionaryMeasuringUnits=Measuring Units
 DictionarySocialNetworks=Social Networks
 DictionaryProspectStatus=Prospect status for companies
 DictionaryProspectContactStatus=Prospect status for contacts
-DictionaryHolidayTypes=Types of leave
+DictionaryHolidayTypes=Leave - Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
 DictionaryTransportMode=Intracomm report - Transport mode
+DictionaryBatchStatus=Product lot/serial Quality Control status
 TypeOfUnit=Type of unit
 SetupSaved=Setup saved
 SetupNotSaved=Setup not saved
@@ -1187,7 +1191,7 @@ SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of m
 SetupDescription5=Other Setup menu entries manage optional parameters.
 AuditedSecurityEvents=Security events that are audited
 NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
-Audit=Audit
+Audit=Security events
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
 InfoOS=About OS
@@ -1319,9 +1323,12 @@ ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
 NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
+ComboListOptim=Combo list loading optimization
 SearchOptim=Search optimization
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
-YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
+YouHaveXObjectUseComboOptim=You have %s %s in the database. You can go into setup of module to enable loading of combo list on key pressed event.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other.
+YouHaveXObjectUseSearchOptimDesc=This limits the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to %s in Home-Setup-Other.
 BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
 BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
 PHPModuleLoaded=PHP component %s is loaded
@@ -1433,6 +1440,7 @@ MemberMainOptions=Main options
 AdherentLoginRequired= Manage a Login for each member
 AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
+MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
 MembersDocModules=Document templates for documents generated from member record
@@ -1763,7 +1771,7 @@ AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting men
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
-AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the scheduled job %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
@@ -1979,6 +1987,8 @@ 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_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add picture on proposal line
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add electronic sign in PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
@@ -2096,7 +2106,6 @@ PDF_SHOW_PROJECT=Show project on document
 ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
-FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
@@ -2120,12 +2129,18 @@ ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by
 MailToSendEventOrganization=Event Organization
 AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
 YouShouldDisablePHPFunctions=You should disable PHP functions
-IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands in custom code, you shoud disable PHP functions
+PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
+NotRecommended=Not recommanded
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
 ModuleUpdateAvailable=An update is available
 NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
+RandomlySelectedIfSeveral=Randomly selected if several pictures are available
+DatabasePasswordObfuscated=Database password is obfuscated in conf file
+DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
diff --git a/htdocs/langs/ar_IQ/agenda.lang b/htdocs/langs/ar_IQ/agenda.lang
index ca614595a65..a1183841b00 100644
--- a/htdocs/langs/ar_IQ/agenda.lang
+++ b/htdocs/langs/ar_IQ/agenda.lang
@@ -38,6 +38,7 @@ ActionsEvents=Events for which Dolibarr will create an action in agenda automati
 EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Third party %s created
+COMPANY_MODIFYInDolibarr=Third party %s modified
 COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=Contract %s validated
 CONTRACT_DELETEInDolibarr=Contract %s deleted
@@ -87,6 +88,7 @@ OrderDeleted=Order deleted
 InvoiceDeleted=Invoice deleted
 DraftInvoiceDeleted=Draft invoice deleted
 CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_MODIFYInDolibarr=Contact %s modified
 CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Product %s created
 PRODUCT_MODIFYInDolibarr=Product %s modified
diff --git a/htdocs/langs/ar_IQ/bills.lang b/htdocs/langs/ar_IQ/bills.lang
index c55f483873b..7b8c997d2e6 100644
--- a/htdocs/langs/ar_IQ/bills.lang
+++ b/htdocs/langs/ar_IQ/bills.lang
@@ -259,6 +259,7 @@ DateMaxPayment=Payment due on
 DateInvoice=Invoice date
 DatePointOfTax=Point of tax
 NoInvoice=No invoice
+NoOpenInvoice=No open invoice
 ClassifyBill=Classify invoice
 SupplierBillsToPay=Unpaid vendor invoices
 CustomerBillsUnpaid=Unpaid customer invoices
@@ -589,3 +590,4 @@ FacParentLine=Invoice Line Parent
 SituationTotalRayToRest=Remainder to pay without taxe
 PDFSituationTitle=Situation n° %d
 SituationTotalProgress=Total progress %d %%
+SearchUnpaidInvoicesWithDueDate=Search unpaid invoices with a due date = %s
diff --git a/htdocs/langs/ar_IQ/cashdesk.lang b/htdocs/langs/ar_IQ/cashdesk.lang
index 240503842f3..aea1f02f834 100644
--- a/htdocs/langs/ar_IQ/cashdesk.lang
+++ b/htdocs/langs/ar_IQ/cashdesk.lang
@@ -102,7 +102,7 @@ CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal numb
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
 SaleStartedAt=Sale started at %s
-ControlCashOpening=Control cash popup at opening POS
+ControlCashOpening=Open the "Control cash" popup when opening the POS
 CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -126,5 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
-ShowPriceHT = Display the price excluding tax column
-ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
+ShowPriceHT = Display the column with the price excluding tax (on screen)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
diff --git a/htdocs/langs/ar_IQ/compta.lang b/htdocs/langs/ar_IQ/compta.lang
index 7cae82e6ac7..8329346c163 100644
--- a/htdocs/langs/ar_IQ/compta.lang
+++ b/htdocs/langs/ar_IQ/compta.lang
@@ -286,3 +286,9 @@ ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
 IncludeLoansInResults = Include loans in reports
+InvoiceLate30Days = Invoices late > 30 days
+InvoiceLate15Days = Invoices late > 15 days
+InvoiceLateMinus15Days = Invoices late
+InvoiceNotLate = To be collected < 15 days
+InvoiceNotLate15Days = To be collected in 15 days
+InvoiceNotLate30Days = To be collected in 30 days
diff --git a/htdocs/langs/ar_IQ/cron.lang b/htdocs/langs/ar_IQ/cron.lang
index 2ebdda1e685..4fd2220dea6 100644
--- a/htdocs/langs/ar_IQ/cron.lang
+++ b/htdocs/langs/ar_IQ/cron.lang
@@ -60,7 +60,7 @@ CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
 CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Disable
-CronTaskInactive=This job is disabled
+CronTaskInactive=This job is disabled (not scheduled)
 CronId=Id
 CronClassFile=Filename with class
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example 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>
diff --git a/htdocs/langs/ar_IQ/errors.lang b/htdocs/langs/ar_IQ/errors.lang
index 9b14b5ad1d2..670f8c7a6bc 100644
--- a/htdocs/langs/ar_IQ/errors.lang
+++ b/htdocs/langs/ar_IQ/errors.lang
@@ -11,6 +11,7 @@ ErrorBadValueForParamNotAString=Bad value for your parameter. It appends general
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s already exists.
 ErrorGroupAlreadyExists=Group %s already exists.
+ErrorEmailAlreadyExists=Email %s already exists.
 ErrorRecordNotFound=Record not found.
 ErrorFailToCopyFile=Failed to copy file '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
@@ -117,7 +118,7 @@ ErrorCantReadFile=Failed to read file '%s'
 ErrorCantReadDir=Failed to read directory '%s'
 ErrorBadLoginPassword=Bad value for login or password
 ErrorLoginDisabled=Your account has been disabled
-ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server. If PHP <b>Safe Mode</b> is enabled, check that command is inside a directory defined by parameter <b>safe_mode_exec_dir</b>.
+ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server user. Check also the command is not protected on shell level by a security layer like apparmor.
 ErrorFailedToChangePassword=Failed to change password
 ErrorLoginDoesNotExists=User with login <b>%s</b> could not be found.
 ErrorLoginHasNoEmail=This user has no email address. Process aborted.
@@ -262,6 +263,7 @@ ErrorDateIsInFuture=Error, the date can't be in the future
 ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
 ErrorAPercentIsRequired=Error, please fill in the percentage correctly
 ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
+ErrorFailedToFindEmailTemplate=Failed to find template with code name %s
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -298,3 +300,4 @@ WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So y
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
+ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
diff --git a/htdocs/langs/ar_IQ/eventorganization.lang b/htdocs/langs/ar_IQ/eventorganization.lang
index 75b798fbc3a..335c257b224 100644
--- a/htdocs/langs/ar_IQ/eventorganization.lang
+++ b/htdocs/langs/ar_IQ/eventorganization.lang
@@ -1,4 +1,5 @@
 # Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+# Copyright (C) 2021		Dorian Vabre			<dorian.vabre@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
@@ -81,7 +82,10 @@ PriceOfBoothHelp=Subscription price to stand a booth
 EventOrganizationICSLink=Link ICS for events
 ConferenceOrBoothInformation=Conference Or Booth informations
 Attendees = Attendees
+DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
 #
 # Status
 #
@@ -94,8 +98,46 @@ EvntOrgCancelled = Cancelled
 #
 # Public page
 #
+SuggestForm = Suggestion page
+RegisterPage = Page for conferences or booth
+EvntOrgRegistrationHelpMessage = Here, you can vote for an event, or suggest a new conference or booth for the project
+EvntOrgRegistrationConfHelpMessage = Here, you can suggest a new conference for the project
+EvntOrgRegistrationBoothHelpMessage = Here, you can suggest a new booth for the project
+ListOfSuggestedConferences = List of suggested conferences
+ListOfSuggestedBooths = List of suggested booths
+SuggestConference = Suggest a new conference
+SuggestBooth = Suggest a booth
+ViewAndVote = View and vote for suggested events
 PublicAttendeeSubscriptionPage = Public link of registration to a conference
 MissingOrBadSecureKey = The security key is invalid or missing
-EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
-EvntOrgStartDuration = This conference starts on
-EvntOrgEndDuration =  and ends on
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference : '%s'
+EvntOrgDuration = This conference starts on %s and ends on %s.
+ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
+BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
+EventType = Event type
+
+#
+# Vote page
+#
+EvntOrgRegistrationWelcomeMessage = Welcome on the conference or booth suggestion page.
+EvntOrgRegistrationConfWelcomeMessage = Welcome on the conference suggestion page.
+EvntOrgRegistrationBoothWelcomeMessage = Welcome on the booth suggestion page.
+EvntOrgVoteHelpMessage = Here, you can view and vote for the suggested events for the project
+VoteOk = Your vote has been accepted.
+AlreadyVoted = You have already voted for this event.
+VoteError = An error has occurred during the vote, please try again.
+
+#
+# SubscriptionOk page
+#
+SubscriptionOk = Your subscription to this conference has been validated
+#
+# Subscription validation mail
+#
+ConfAttendeeSubscriptionConfirmation = Confirmation of your subscription to a conference
+#
+# Payment page
+#
+Attendee = Attendee
+PaymentConferenceAttendee = Conference attendee payment
+PaymentBoothLocation = Booth location payment
diff --git a/htdocs/langs/ar_IQ/hrm.lang b/htdocs/langs/ar_IQ/hrm.lang
index 3b8f137e103..da098e10bdb 100644
--- a/htdocs/langs/ar_IQ/hrm.lang
+++ b/htdocs/langs/ar_IQ/hrm.lang
@@ -9,7 +9,7 @@ ConfirmDeleteEstablishment=Are you sure you wish to delete this establishment?
 OpenEtablishment=Open establishment
 CloseEtablishment=Close establishment
 # Dictionary
-DictionaryPublicHolidays=HRM - Public holidays
+DictionaryPublicHolidays=Leave - Public holidays
 DictionaryDepartment=HRM - Department list
 DictionaryFunction=HRM - Job positions
 # Module
diff --git a/htdocs/langs/ar_IQ/knowledgemanagement.lang b/htdocs/langs/ar_IQ/knowledgemanagement.lang
index 269007e60f8..68f5cced76c 100644
--- a/htdocs/langs/ar_IQ/knowledgemanagement.lang
+++ b/htdocs/langs/ar_IQ/knowledgemanagement.lang
@@ -47,7 +47,7 @@ KnowledgeManagementArea = Knowledge Management
 # Menu
 #
 MenuKnowledgeRecord = Knowledge base
-ListOfArticles = List of articles
+ListKnowledgeRecord = List of articles
 NewKnowledgeRecord = New article
 ValidateReply = Validate solution
 KnowledgeRecords = Articles
diff --git a/htdocs/langs/ar_IQ/languages.lang b/htdocs/langs/ar_IQ/languages.lang
index ba187326705..da8ad5376a1 100644
--- a/htdocs/langs/ar_IQ/languages.lang
+++ b/htdocs/langs/ar_IQ/languages.lang
@@ -3,6 +3,7 @@ Language_am_ET=Ethiopian
 Language_ar_AR=Arabic
 Language_ar_EG=Arabic (Egypt)
 Language_ar_SA=Arabic
+Language_ar_TN=Arabic (Tunisia)
 Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengali
 Language_bn_IN=Bengali (India)
@@ -84,6 +85,7 @@ Language_nl_NL=Dutch
 Language_pl_PL=Polish
 Language_pt_BR=Portuguese (Brazil)
 Language_pt_PT=Portuguese
+Language_ro_MD=Romanian (Moldavia)
 Language_ro_RO=Romanian
 Language_ru_RU=Russian
 Language_ru_UA=Russian (Ukraine)
diff --git a/htdocs/langs/ar_IQ/main.lang b/htdocs/langs/ar_IQ/main.lang
index 13793aad13f..863b94af564 100644
--- a/htdocs/langs/ar_IQ/main.lang
+++ b/htdocs/langs/ar_IQ/main.lang
@@ -430,6 +430,7 @@ LT1IN=CGST
 LT2IN=SGST
 LT1GC=Additionnal cents
 VATRate=Tax Rate
+RateOfTaxN=Rate of tax %s
 VATCode=Tax Rate code
 VATNPR=Tax Rate NPR
 DefaultTaxRate=Default tax rate
@@ -729,6 +730,7 @@ MenuMembers=Members
 MenuAgendaGoogle=Google agenda
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
+ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
 NoFileFound=No documents uploaded
 CurrentUserLanguage=Current language
 CurrentTheme=Current theme
@@ -1072,6 +1074,7 @@ ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
 ToClose=To close
+ToRefuse=To refuse
 ToProcess=To process
 ToApprove=To approve
 GlobalOpenedElemView=Global view
@@ -1126,9 +1129,11 @@ UpdateForAllLines=Update for all lines
 OnHold=On hold
 Civility=Civility
 AffectTag=Affect Tag
+CreateExternalUser=Create external user
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
 ConfirmCancel=Are you sure you want to cancel
+EmailMsgID=Email MsgID
diff --git a/htdocs/langs/ar_IQ/members.lang b/htdocs/langs/ar_IQ/members.lang
index 042b85598c0..d8b9c2f59f3 100644
--- a/htdocs/langs/ar_IQ/members.lang
+++ b/htdocs/langs/ar_IQ/members.lang
@@ -213,3 +213,5 @@ SendReminderForExpiredSubscription=Send reminder by email to members when subscr
 MembershipPaid=Membership paid for current period (until %s)
 YouMayFindYourInvoiceInThisEmail=You may find your invoice attached to this email
 XMembersClosed=%s member(s) closed
+XExternalUserCreated=%s external user(s) created
+ForceMemberNature=Force member nature (Individual or Corporation)
diff --git a/htdocs/langs/ar_IQ/modulebuilder.lang b/htdocs/langs/ar_IQ/modulebuilder.lang
index 9fdaa1a533a..23a098be2e5 100644
--- a/htdocs/langs/ar_IQ/modulebuilder.lang
+++ b/htdocs/langs/ar_IQ/modulebuilder.lang
@@ -143,3 +143,4 @@ AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
 ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
+ImportExportProfiles=Import and export profiles
diff --git a/htdocs/langs/ar_IQ/mrp.lang b/htdocs/langs/ar_IQ/mrp.lang
index fceeb1a15f1..2414a92cefb 100644
--- a/htdocs/langs/ar_IQ/mrp.lang
+++ b/htdocs/langs/ar_IQ/mrp.lang
@@ -13,7 +13,7 @@ BOMsSetup=Setup of module BOM
 ListOfBOMs=List of bills of material - BOM
 ListOfManufacturingOrders=List of Manufacturing Orders
 NewBOM=New bill of materials
-ProductBOMHelp=Product to create with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
+ProductBOMHelp=Product to create (or disassemble) with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
 BOMsNumberingModules=BOM numbering templates
 BOMsModelModule=BOM document templates
 MOsNumberingModules=MO numbering templates
@@ -39,7 +39,7 @@ DateStartPlannedMo=Date start planned
 DateEndPlannedMo=Date end planned
 KeepEmptyForAsap=Empty means 'As Soon As Possible'
 EstimatedDuration=Estimated duration
-EstimatedDurationDesc=Estimated duration to manufacture this product using this BOM
+EstimatedDurationDesc=Estimated duration to manufacture (or disassemble) this product using this BOM
 ConfirmValidateBom=Are you sure you want to validate the BOM with the reference <strong>%s</strong> (you will be able to use it to build new Manufacturing Orders)
 ConfirmCloseBom=Are you sure you want to cancel this BOM (you won't be able to use it to build new Manufacturing Orders anymore) ?
 ConfirmReopenBom=Are you sure you want to re-open this BOM (you will be able to use it to build new Manufacturing Orders)
@@ -63,13 +63,14 @@ ConsumeAndProduceAll=Consume and Produce All
 Manufactured=Manufactured
 TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
 ForAQuantityOf=For a quantity to produce of %s
+ForAQuantityToConsumeOf=For a quantity to disassemble of %s
 ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
 ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
 ProductionForRef=Production of %s
 AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
 NoStockChangeOnServices=No stock change on services
 ProductQtyToConsumeByMO=Product quantity still to consume by open MO
-ProductQtyToProduceByMO=Product quentity still to produce by open MO
+ProductQtyToProduceByMO=Product quantity still to produce by open MO
 AddNewConsumeLines=Add new line to consume
 ProductsToConsume=Products to consume
 ProductsToProduce=Products to produce
diff --git a/htdocs/langs/ar_IQ/orders.lang b/htdocs/langs/ar_IQ/orders.lang
index 87d196eb22f..5dab5b99bf1 100644
--- a/htdocs/langs/ar_IQ/orders.lang
+++ b/htdocs/langs/ar_IQ/orders.lang
@@ -11,6 +11,7 @@ OrderDate=Order date
 OrderDateShort=Order date
 OrderToProcess=Order to process
 NewOrder=New order
+NewSupplierOrderShort=New order
 NewOrderSupplier=New Purchase Order
 ToOrder=Make order
 MakeOrder=Make order
@@ -73,6 +74,7 @@ DeleteOrder=Delete order
 CancelOrder=Cancel order
 OrderReopened= Order %s re-open
 AddOrder=Create order
+AddSupplierOrderShort=Create order
 AddPurchaseOrder=Create purchase order
 AddToDraftOrders=Add to draft order
 ShowOrder=Show order
diff --git a/htdocs/langs/ar_IQ/other.lang b/htdocs/langs/ar_IQ/other.lang
index 95297a98859..bb35099ab82 100644
--- a/htdocs/langs/ar_IQ/other.lang
+++ b/htdocs/langs/ar_IQ/other.lang
@@ -129,6 +129,7 @@ ClosedByLogin=User login who closed
 FileWasRemoved=File %s was removed
 DirWasRemoved=Directory %s was removed
 FeatureNotYetAvailable=Feature not yet available in the current version
+FeatureNotAvailableOnDevicesWithoutMouse=Feature not available on devices without mouse
 FeaturesSupported=Supported features
 Width=Width
 Height=Height
@@ -263,7 +264,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
-PrefixSession=Prefix for session ID
+SuffixSessionName=Suffix for session name
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/ar_IQ/partnership.lang b/htdocs/langs/ar_IQ/partnership.lang
index 09059995a8d..2fb10e8159e 100644
--- a/htdocs/langs/ar_IQ/partnership.lang
+++ b/htdocs/langs/ar_IQ/partnership.lang
@@ -16,41 +16,72 @@
 #
 # Generic
 #
-ModulePartnershipName = Partnership management
-PartnershipDescription = Module Partnership management
+ModulePartnershipName=Partnership management
+PartnershipDescription=Module Partnership management
 PartnershipDescriptionLong= Module Partnership management
 
+AddPartnership=Add partnership
+CancelPartnershipForExpiredMembers=Partnership: Cancel partnership of members with expired subscriptions
+PartnershipCheckBacklink=Partnership: Check referring backlink
+
 #
 # Menu
 #
-NewPartnership = New Partnership
-ListOfPartnerships = List of partnership
+NewPartnership=New Partnership
+ListOfPartnerships=List of partnership
 
 #
 # Admin page
 #
-PartnershipSetup = Partnership setup
-PartnershipAbout = About Partnership
-PartnershipAboutPage = Partnership about page
-
+PartnershipSetup=Partnership setup
+PartnershipAbout=About Partnership
+PartnershipAboutPage=Partnership about page
+partnershipforthirdpartyormember=Partner status must be set on a 'thirdparty' or a 'member'
+PARTNERSHIP_IS_MANAGED_FOR=Partnership managed for
+PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks to check
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb of days before cancelling status of a partnership when a subscription has expired
+ReferingWebsiteCheck=Check of website referring
+ReferingWebsiteCheckDesc=You can enable a feature to check that your partners has added a backlink to your website domains on their own website.
 
 #
 # Object
 #
+DeletePartnership=Delete a partnership
+PartnershipDedicatedToThisThirdParty=Partnership dedicated to this third party
+PartnershipDedicatedToThisMember=Partnership dedicated to this member
 DatePartnershipStart=Start date
 DatePartnershipEnd=End date
+ReasonDecline=Decline reason
+ReasonDeclineOrCancel=Decline reason
+PartnershipAlreadyExist=Partnership already exist
+ManagePartnership=Manage partnership
+BacklinkNotFoundOnPartnerWebsite=Backlink not found on partner website
+ConfirmClosePartnershipAsk=Are you sure you want to cancel this partnership?
+PartnershipType=Partnership type
 
 #
 # Template Mail
 #
+SendingEmailOnPartnershipWillSoonBeCanceled=Partnership will soon be canceled
+SendingEmailOnPartnershipRefused=Partnership refused
+SendingEmailOnPartnershipAccepted=Partnership accepted
+SendingEmailOnPartnershipCanceled=Partnership canceled
 
+YourPartnershipWillSoonBeCanceledTopic=Partnership will soon be canceled
+YourPartnershipRefusedTopic=Partnership refused
+YourPartnershipAcceptedTopic=Partnership accepted
+YourPartnershipCanceledTopic=Partnership canceled
+
+YourPartnershipWillSoonBeCanceledContent=We inform you that your partnership will soon be canceled (Backlink not found)
+YourPartnershipRefusedContent=We inform you that your partnership request has been refused.
+YourPartnershipAcceptedContent=We inform you that your partnership request has been accepted.
+YourPartnershipCanceledContent=We inform you that your partnership has been canceled.
 
 #
 # Status
 #
-PartnershipDraft = Draft
-PartnershipAccepted = Accepted
-PartnershipRefused = Refused
-PartnershipCanceled = Canceled
-
+PartnershipDraft=Draft
+PartnershipAccepted=Accepted
+PartnershipRefused=Refused
+PartnershipCanceled=Canceled
 PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/ar_IQ/productbatch.lang b/htdocs/langs/ar_IQ/productbatch.lang
index ad2db658e2e..450d0285819 100644
--- a/htdocs/langs/ar_IQ/productbatch.lang
+++ b/htdocs/langs/ar_IQ/productbatch.lang
@@ -1,4 +1,4 @@
-# ProductBATCH language file - en_US - ProductBATCH
+# ProductBATCH language file - Source file is en_US - ProductBATCH
 ManageLotSerial=Use lot/serial number
 ProductStatusOnBatch=Yes (lot required)
 ProductStatusOnSerial=Yes (unique serial number required)
@@ -33,3 +33,13 @@ CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+LifeTime=Life span (in days)
+EndOfLife=End of life
+ManufacturingDate=Manufacturing date
+DestructionDate=Destruction date
+FirstUseDate=First use date
+QCFrequency=Quality control frequency (in days)
+
+#Traceability - qc status
+OutOfOrder=Out of order
+InWorkingOrder=In working order
diff --git a/htdocs/langs/ar_IQ/products.lang b/htdocs/langs/ar_IQ/products.lang
index 0875be0dc07..9638dfe5a25 100644
--- a/htdocs/langs/ar_IQ/products.lang
+++ b/htdocs/langs/ar_IQ/products.lang
@@ -396,3 +396,5 @@ ActionAvailableOnVariantProductOnly=Action only available on the variant of prod
 ProductsPricePerCustomer=Product prices per customers
 ProductSupplierExtraFields=Additional Attributes (Supplier Prices)
 DeleteLinkedProduct=Delete the child product linked to the combination
+PMPValue=Weighted average price
+PMPValueShort=WAP
diff --git a/htdocs/langs/ar_IQ/projects.lang b/htdocs/langs/ar_IQ/projects.lang
index 79c974f6e24..6c96fadb5c1 100644
--- a/htdocs/langs/ar_IQ/projects.lang
+++ b/htdocs/langs/ar_IQ/projects.lang
@@ -267,9 +267,11 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=New invoice
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+OneLinePerTimeSpentLine=One line for each time spent declaration
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
 AddPersonToTask=Add also to tasks
 UsageOrganizeEvent=Usage: Event Organization
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
+SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
diff --git a/htdocs/langs/ar_IQ/receptions.lang b/htdocs/langs/ar_IQ/receptions.lang
index 760ff884fa0..338602e722e 100644
--- a/htdocs/langs/ar_IQ/receptions.lang
+++ b/htdocs/langs/ar_IQ/receptions.lang
@@ -44,4 +44,4 @@ ValidateOrderFirstBeforeReception=You must first validate the order before being
 ReceptionsNumberingModules=Numbering module for receptions
 ReceptionsReceiptModel=Document templates for receptions
 NoMorePredefinedProductToDispatch=No more predefined products to dispatch
-
+ReceptionExist=A reception exists
diff --git a/htdocs/langs/ar_IQ/stocks.lang b/htdocs/langs/ar_IQ/stocks.lang
index 9ec523427b1..d39791932a3 100644
--- a/htdocs/langs/ar_IQ/stocks.lang
+++ b/htdocs/langs/ar_IQ/stocks.lang
@@ -56,8 +56,6 @@ UnitPurchaseValue=Unit purchase price
 StockTooLow=Stock too low
 StockLowerThanLimit=Stock lower than alert limit (%s)
 EnhancedValue=Value
-PMPValue=Weighted average price
-PMPValueShort=WAP
 EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
@@ -251,7 +249,10 @@ SelectAStockMovementFileToImport=select a stock movement file to import
 InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
 LabelOfInventoryMovemement=Inventory %s
 ReOpen=Reopen
-ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock to the real qty you entered into the inventory.
 ObjectNotFound=%s not found
 MakeMovementsAndClose=Generate movements and close
 AutofillWithExpected=Fill real quantity with expected quantity
+ShowAllBatchByDefault=By default, show batch details on product "stock" tab
+CollapseBatchDetailHelp=You can set batch detail default display in stocks module configuration
+FieldCannotBeNegative=Field "%s" cannot be negative
diff --git a/htdocs/langs/ar_IQ/ticket.lang b/htdocs/langs/ar_IQ/ticket.lang
index df73daf4a0d..1da32a5a99e 100644
--- a/htdocs/langs/ar_IQ/ticket.lang
+++ b/htdocs/langs/ar_IQ/ticket.lang
@@ -304,7 +304,7 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
-BoxTicketType=Number of open tickets by type
+BoxTicketType=Distribution of open tickets by type
 BoxTicketSeverity=Number of open tickets by severity
 BoxNoTicketSeverity=No tickets opened
 BoxTicketLastXDays=Number of new tickets by days the last %s days
diff --git a/htdocs/langs/ar_SA/accountancy.lang b/htdocs/langs/ar_SA/accountancy.lang
index a53fdba50a3..e5a969a85ad 100644
--- a/htdocs/langs/ar_SA/accountancy.lang
+++ b/htdocs/langs/ar_SA/accountancy.lang
@@ -158,7 +158,7 @@ ACCOUNTING_LENGTH_AACCOUNT=طول حسابات الطرف الثالث المح
 ACCOUNTING_MANAGE_ZERO=السماح بإدارة عدد مختلف من الأصفار في نهاية الحساب المحاسبي. تحتاجه بعض الدول (مثل سويسرا). إذا تم الضبط على إيقاف (افتراضي) ، يمكنك تعيين المعاملين التاليتين لتطلب من التطبيق إضافة أصفار افتراضية.
 BANK_DISABLE_DIRECT_INPUT=تعطيل التسجيل المباشر للمعاملة في الحساب المصرفي
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=تفعيل تصدير المسودة الى دفتر اليومية
-ACCOUNTANCY_COMBO_FOR_AUX=تمكين قائمة التحرير والسرد للحساب الفرعي (قد يكون بطيئًا إذا كان لديك الكثير من الأطراف الثالثة)
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties, break ability to search on a part of value)
 ACCOUNTING_DATE_START_BINDING=تحديد موعد لبدء الربط والتحويل في المحاسبة. بعد هذا التاريخ ، لن يتم تحويل المعاملات إلى المحاسبة.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=في نقل المحاسبة ، حدد فترة العرض بشكل افتراضي
 
@@ -328,6 +328,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=تعطيل الربط والتحويل 
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=تعطيل الربط والتحويل في المحاسبة على تقارير المصروفات (لن يتم أخذ تقارير المصروفات في الاعتبار في المحاسبة)
 
 ## Export
+NotifiedExportDate=Notified export date (modification of the entries will not be possible)
+NotifiedValidationDate=Validation of the entries (modification or deletion of the entries will not be possible)
+ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=تصدير مسودة دفتر اليومية
 Modelcsv=نموذج التصدير
 Selectmodelcsv=تحديد نموذج للتصدير
diff --git a/htdocs/langs/ar_SA/admin.lang b/htdocs/langs/ar_SA/admin.lang
index a01a5a8b940..9db36b039d7 100644
--- a/htdocs/langs/ar_SA/admin.lang
+++ b/htdocs/langs/ar_SA/admin.lang
@@ -221,8 +221,8 @@ NotCompatible=This module does not seem compatible with your Dolibarr %s (Min %s
 CompatibleAfterUpdate=This module requires an update to your Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=See in Market place
 SeeSetupOfModule=انظر إعداد وحدة٪ الصورة
+SetOptionTo=Set option <b>%s</b> to %s
 Updated=Updated
-Nouveauté=Novelty
 AchatTelechargement=Buy / Download
 GoModuleSetupArea=To deploy/install a new module, go to the Module setup area: <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore ، في السوق الرسمي لتخطيط موارد المؤسسات وحدات Dolibarr / خارجي إدارة علاقات العملاء
@@ -399,6 +399,7 @@ SecurityToken=المفتاح لعناوين المواقع الآمنة
 NoSmsEngine=لايوجد مدير إرسال الرسائل النصية القصيرة . مدير إرسال الرسائل النصية القصيرة غير مثبت بصورة اولية لانه يعتمد على مورد خارجي ، لكن يمكنك ايجاد واحد هنا %s
 PDF=صيغة المستندات المتنقلة
 PDFDesc=الخيارات العامة لتوليد ملفات صيغة المستندات المتنقلة
+PDFOtherDesc=PDF Option specific to some modules
 PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
 PDFRulesForSalesTax=Rules for Sales Tax / VAT
@@ -561,7 +562,7 @@ Module53Desc=Management of Services
 Module54Name=Contracts/Subscriptions
 Module54Desc=Management of contracts (services or recurring subscriptions)
 Module55Name=Barcodes
-Module55Desc=Barcodes إدارة
+Module55Desc=Barcode or QR code management
 Module56Name=الدفع عن طريق تحويل من الرصيد
 Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
 Module57Name=Payments by Direct Debit
@@ -848,10 +849,10 @@ Permission402=إنشاء / تعديل الخصومات
 Permission403=تحقق من الخصومات
 Permission404=حذف خصومات
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries (yours and subordinates)
-Permission512=Create/modify payments of salaries
-Permission514=Delete payments of salaries
-Permission517=Read payments of salaries of everybody
+Permission511=Read salaries and payments (yours and subordinates)
+Permission512=Create/modify salaries and payments
+Permission514=Delete salaries and payments
+Permission517=Read salaries and payments everybody
 Permission519=رواتب التصدير
 Permission520=قراءة القروض
 Permission522=إنشاء / تعديل القروض
@@ -965,6 +966,8 @@ Permission23003=حذف مهمة مجدولة
 Permission23004=تنفيذ مهمة مجدولة
 Permission50101=Use Point of Sale (SimplePOS)
 Permission50151=Use Point of Sale (TakePOS)
+Permission50152=Edit sales lines
+Permission50153=Edit ordered sales lines
 Permission50201=قراءة المعاملات
 Permission50202=استيراد المعاملات
 Permission50330=Read objects of Zapier
@@ -1039,14 +1042,15 @@ DictionaryMeasuringUnits=Measuring Units
 DictionarySocialNetworks=Social Networks
 DictionaryProspectStatus=Prospect status for companies
 DictionaryProspectContactStatus=Prospect status for contacts
-DictionaryHolidayTypes=Types of leave
+DictionaryHolidayTypes=Leave - Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
 DictionaryTransportMode=Intracomm report - Transport mode
+DictionaryBatchStatus=Product lot/serial Quality Control status
 TypeOfUnit=Type of unit
-SetupSaved=الإعداد المحفوظة
-SetupNotSaved=Setup not saved
+SetupSaved=تم حفظ الإعدادات
+SetupNotSaved=الإعدادات لم تحفظ
 BackToModuleList=Back to Module list
 BackToDictionaryList=Back to Dictionaries list
 TypeOfRevenueStamp=Type of tax stamp
@@ -1187,7 +1191,7 @@ SetupDescription4= <a href="%s"> %s -> %s </a> <br> <br> هذا البرنامج
 SetupDescription5=قائمة الإعدادات الأخرى تقوم بإدارة المعطيات الاختيارية.
 AuditedSecurityEvents=Security events that are audited
 NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
-Audit=المراجعة
+Audit=Security events
 InfoDolibarr=حول دوليبار
 InfoBrowser=حول المتصفح
 InfoOS=About OS
@@ -1319,9 +1323,12 @@ ConditionIsCurrently=الشرط هو حاليا %s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
 NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
+ComboListOptim=Combo list loading optimization
 SearchOptim=البحث الأمثل
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
-YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
+YouHaveXObjectUseComboOptim=You have %s %s in the database. You can go into setup of module to enable loading of combo list on key pressed event.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other.
+YouHaveXObjectUseSearchOptimDesc=This limits the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to %s in Home-Setup-Other.
 BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
 BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
 PHPModuleLoaded=PHP component %s is loaded
@@ -1433,6 +1440,7 @@ MemberMainOptions=الخيارات الرئيسية
 AdherentLoginRequired= إدارة تسجيل الدخول لكل عضو
 AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=مربع لإرسال الرسائل للأعضاء تأكيدا على افتراضي
+MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
 MembersDocModules=Document templates for documents generated from member record
@@ -1763,7 +1771,7 @@ AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting men
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
-AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the scheduled job %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=انقر لإعداد وحدة الاتصال الهاتفي
@@ -1979,6 +1987,8 @@ MAIN_PDF_MARGIN_RIGHT=الهامش الايمن لملفات صيغة المست
 MAIN_PDF_MARGIN_TOP=الهامش العلوي لصيغة المستندات المتنقلة
 MAIN_PDF_MARGIN_BOTTOM=الهامش العلوي لصيغة المستندات المتنقلة
 MAIN_DOCUMENTS_LOGO_HEIGHT=ارتفاع الشعار على صيغة المستندات المتنقلة
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add picture on proposal line
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add electronic sign in PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
@@ -2096,7 +2106,6 @@ PDF_SHOW_PROJECT=Show project on document
 ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=اذا كنت ترغب في تكرار بعض النصوص بلغتين مختلفتين  في ملفاتك المولدة بصيغة المستندات المتنقلة . يجب عليك ان ان تحدد اللغة الثانية هنا حتى يتسنى للملفات المولدة ان تحتوي على لغتين في نفس الصفحة . اللغة المختارة اثناء توليد المستند واللغة المختارة هنا (فقط بعض قوالب صيغة المستندات المتنقلة تدعم هذه الميزة) . ابق الخيار فارغاً للتوليد بلغة واحدة 
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
-FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 RssNote=ملاحظة: كل تعريف لمصدر اخبار مختصرة يوفر بريمج يجب تفعيله ليكون متاحا في لوحة المعلومات
 JumpToBoxes=اذهب الى الاعدادت -> البريمجات
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
@@ -2120,12 +2129,18 @@ ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by
 MailToSendEventOrganization=Event Organization
 AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
 YouShouldDisablePHPFunctions=You should disable PHP functions
-IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands in custom code, you shoud disable PHP functions
+PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
+NotRecommended=Not recommanded
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
 ModuleUpdateAvailable=An update is available
 NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
+RandomlySelectedIfSeveral=Randomly selected if several pictures are available
+DatabasePasswordObfuscated=Database password is obfuscated in conf file
+DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
diff --git a/htdocs/langs/ar_SA/agenda.lang b/htdocs/langs/ar_SA/agenda.lang
index 98168cd43b1..07477356b5f 100644
--- a/htdocs/langs/ar_SA/agenda.lang
+++ b/htdocs/langs/ar_SA/agenda.lang
@@ -4,7 +4,7 @@ Actions=الأحداث
 Agenda=جدول الأعمال
 TMenuAgenda=جدول الأعمال
 Agendas=جداول الأعمال
-LocalAgenda=التقويم الداخلي
+LocalAgenda=التقويم الافتراضي
 ActionsOwnedBy=الحدث مملوك بواسطة
 ActionsOwnedByShort=مالك
 AffectedTo=مخصص ل
@@ -14,13 +14,13 @@ EventsNb=عدد الأحداث
 ListOfActions=قائمة الأحداث
 EventReports=تقارير الحدث
 Location=الموقع
-ToUserOfGroup=Event assigned to any user in group
+ToUserOfGroup=حدث مخصص لأي مستخدم في المجموعة
 EventOnFullDay=الأحداث في كامل اليوم (أيام)
 MenuToDoActions=جميع الأحداث الغير مكتملة
 MenuDoneActions=جميع الأحداث الملغية
 MenuToDoMyActions=أحداثي الغير مكتملة
 MenuDoneMyActions=أحداثي الملغاة
-ListOfEvents=قائمة الأحداث (التقويم الداخلي)
+ListOfEvents=قائمة الأحداث (التقويم الافتراضي)
 ActionsAskedBy=أحداث تم إعداد التقرير عنها بواسطة
 ActionsToDoBy=أحداث عينت لـ
 ActionsDoneBy=أحداث تم اتمامها بواسطة
@@ -33,11 +33,12 @@ ViewPerType=العرض حسب النوع
 AutoActions= إكمال تلقائي
 AgendaAutoActionDesc= Here you may define events which you want Dolibarr to create automatically  in Agenda. If nothing is checked, only manual actions will be included in logs and displayed in Agenda. Automatic tracking of business actions done on objects (validation, status change) will not be saved.
 AgendaSetupOtherDesc= This page provides options to allow the export of your Dolibarr events into an external calendar (Thunderbird, Google Calendar etc...)
-AgendaExtSitesDesc=تسمح هذه الصفحة بإعلان المصادر الخارجية للتقاويم لمشاهدة أحداثها في جدول أعمال دوليبار.
+AgendaExtSitesDesc=تسمح هذه الصفحة بالإعلان عن المصادر الخارجية للتقويمات لرؤية أحداثها في جدول أعمال Dolibarr.
 ActionsEvents=الأحداث التي سيقوم دوليبار بإنشاء أعمال في جدول الأعمال بشكل تلقائي
 EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=تم إنشاء الطرف الثالث %s
+COMPANY_MODIFYInDolibarr=Third party %s modified
 COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=العقد%s  تم التأكد من صلاحيته
 CONTRACT_DELETEInDolibarr=Contract %s deleted
@@ -87,6 +88,7 @@ OrderDeleted=تم حذف الطلب
 InvoiceDeleted=تم حذف الفاتورة
 DraftInvoiceDeleted=Draft invoice deleted
 CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_MODIFYInDolibarr=Contact %s modified
 CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=المنتج %s تم انشاؤه
 PRODUCT_MODIFYInDolibarr=المنتج %sتم تعديلة
@@ -119,6 +121,7 @@ MRP_MO_UNVALIDATEInDolibarr=MO set to draft status
 MRP_MO_PRODUCEDInDolibarr=MO produced
 MRP_MO_DELETEInDolibarr=MO deleted
 MRP_MO_CANCELInDolibarr=MO canceled
+PAIDInDolibarr=%s paid
 ##### End agenda events #####
 AgendaModelModule=نماذج المستندات للحدث
 DateActionStart=تاريخ البدء
@@ -130,7 +133,7 @@ AgendaUrlOptions4=<b>لوجينت =%s</b> لتقييد الإخراج على ا
 AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
 AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic events.
 AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> to include events of holidays.
-AgendaShowBirthdayEvents=عرض تواريخ ميلاد جهات الإتصال
+AgendaShowBirthdayEvents=Birthdays of contacts
 AgendaHideBirthdayEvents=إخفاء تواريخ ميلاد جهات الإتصال
 Busy=مشغول
 ExportDataset_event1=قائمة الأحداث في جدول الأعمال
@@ -152,6 +155,7 @@ ActionType=نوع الحدث
 DateActionBegin=تاريخ البدء الحدث
 ConfirmCloneEvent=هل انت متأكد انك ترغب في استنساخ الحدث <b>%s</b> ؟
 RepeatEvent=تكرار الحدث
+OnceOnly=Once only
 EveryWeek=كل اسبوع
 EveryMonth=كل شهر
 DayOfMonth=يوم من الشهر
@@ -165,4 +169,4 @@ TimeType=Duration type
 ReminderType=Callback type
 AddReminder=Create an automatic reminder notification for this event
 ErrorReminderActionCommCreation=Error creating the reminder notification for this event
-BrowserPush=Browser Notification
+BrowserPush=Browser Popup Notification
diff --git a/htdocs/langs/ar_SA/banks.lang b/htdocs/langs/ar_SA/banks.lang
index 98a3eedaaf9..d5e01691731 100644
--- a/htdocs/langs/ar_SA/banks.lang
+++ b/htdocs/langs/ar_SA/banks.lang
@@ -109,13 +109,13 @@ SocialContributionPayment=مدفوعات الضرائب الاجتماعية / 
 BankTransfer=تحويل الرصيد
 BankTransfers=تحويلات الرصيد
 MenuBankInternalTransfer=حوالة داخلية
-TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
+TransferDesc=إستخدم التحويل الداخلي للتحويل من حساب الى اخر، سيقوم البرنامج بكتابة قيدين: قيد دائن في حساب المحول وقيد مدين في حساب المستلم. يستخدم نفس المبلغ والعنوان والتاريخ في المعاملة.
 TransferFrom=من
 TransferTo=إلى
 TransferFromToDone=التحويل من <b>%s</b>إلى <b>%s</b>من <b>%s</b>%s قد تم تسجيلة.
 CheckTransmitter=مرسل
 ValidateCheckReceipt=تأكيد صحة الشيك المستلم؟
-ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
+ConfirmValidateCheckReceipt=هل انت متأكد من رغبتك بإرسال إيصال هذا الشيك للتأكيد ؟ لا تغيير ممكن بعد الاكمال.
 DeleteCheckReceipt=حذف هذا الشيك ؟
 ConfirmDeleteCheckReceipt=هل انت متأكد أنك تريد حذف هذا الشيك؟
 BankChecks=الشيكات المصرفية
@@ -128,7 +128,7 @@ ConfirmDeleteTransaction=هل تريد بالتأكيد حذف هذه المعا
 ThisWillAlsoDeleteBankRecord=سيؤدي هذا أيضا إلى حذف القيد البنكي الذي تم إنشاؤه
 BankMovements=حركات
 PlannedTransactions=المعاملات المخططة
-Graph=Graphs
+Graph=الرسوم البيانية
 ExportDataset_banque_1=القيود البنكية وكشف الحساب
 ExportDataset_banque_2=قسيمة الإيداع
 TransactionOnTheOtherAccount=معاملة على الحساب الآخر
@@ -142,7 +142,7 @@ AllAccounts=جميع الحسابات المصرفية والنقدية
 BackToAccount=عودة إلى الحساب
 ShowAllAccounts=عرض لجميع الحسابات
 FutureTransaction=الصفقة المستقبلية. غير قادر على التسوية.
-SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
+SelectChequeTransactionAndGenerate=قم بتحديد / تصفية الشيكات لتضمينها في إيصال إيداع الشيك واضغط على "إنشاء".
 InputReceiptNumber=اختيار كشف الحساب البنكي ذات الصلة مع التسوية. استخدام قيمة رقمية للفرز: شهر سنة أو يوم شهر سنة
 EventualyAddCategory=في نهاية المطاف، حدد الفئة التي لتصنيف السجلات
 ToConciliate=للتسوية؟
@@ -174,7 +174,7 @@ YourSEPAMandate=تفويض سيبا الخاص بك
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
 AutoReportLastAccountStatement=قم تلقائيًا بتعبئة الحقل "رقم كشف الحساب البنكي" برقم كشف الحساب الأخير عند إجراء التسوية
 CashControl=مراقبة مكتب النقدية في نقاط البيع
-NewCashFence=New cash desk opening or closing
+NewCashFence=إفتتاح او إغلاق جديد لصنوق النقدية
 BankColorizeMovement=تلوين الحركات
 BankColorizeMovementDesc=إذا تم تمكين هذه الوظيفة ، يمكنك اختيار لون خلفية محدد لحركات الخصم أو الائتمان
 BankColorizeMovementName1=لون الخلفية لحركة الخصم
diff --git a/htdocs/langs/ar_SA/bills.lang b/htdocs/langs/ar_SA/bills.lang
index 4f33681d88c..5159a89b80f 100644
--- a/htdocs/langs/ar_SA/bills.lang
+++ b/htdocs/langs/ar_SA/bills.lang
@@ -259,6 +259,7 @@ DateMaxPayment=السداد المستحق في
 DateInvoice=تاريخ الفاتورة
 DatePointOfTax=Point of tax
 NoInvoice=لا فاتورة
+NoOpenInvoice=No open invoice
 ClassifyBill=صنف كفاتورة
 SupplierBillsToPay=فواتير المورد الغير مسددة
 CustomerBillsUnpaid=فواتير العملاء غير المسددة
@@ -589,3 +590,4 @@ FacParentLine=أصل سطر الفاتورة
 SituationTotalRayToRest=ما تبقى للدفع بدون ضريبة
 PDFSituationTitle=Situation n° %d
 SituationTotalProgress=إجمالي التقدم %d %%
+SearchUnpaidInvoicesWithDueDate=Search unpaid invoices with a due date = %s
diff --git a/htdocs/langs/ar_SA/cashdesk.lang b/htdocs/langs/ar_SA/cashdesk.lang
index 5a185a25ed9..0590fbb5aab 100644
--- a/htdocs/langs/ar_SA/cashdesk.lang
+++ b/htdocs/langs/ar_SA/cashdesk.lang
@@ -102,7 +102,7 @@ CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal numb
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
 SaleStartedAt=Sale started at %s
-ControlCashOpening=Control cash popup at opening POS
+ControlCashOpening=Open the "Control cash" popup when opening the POS
 CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -126,5 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
-ShowPriceHT = Display the price excluding tax column
-ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
+ShowPriceHT = Display the column with the price excluding tax (on screen)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
diff --git a/htdocs/langs/ar_SA/commercial.lang b/htdocs/langs/ar_SA/commercial.lang
index cffbca48085..e3a95602dec 100644
--- a/htdocs/langs/ar_SA/commercial.lang
+++ b/htdocs/langs/ar_SA/commercial.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - commercial
-Commercial=Commerce
-CommercialArea=Commerce area
+Commercial=التجارة
+CommercialArea=منطقة التجارة
 Customer=العميل
 Customers=العملاء
 Prospect=احتمال
@@ -9,72 +9,73 @@ DeleteAction=حذف حدث
 NewAction=حدث جديد
 AddAction=إنشاء الحدث
 AddAnAction=إنشاء حدث
-AddActionRendezVous=إنشاء الحدث RENDEZ المفكرة
-ConfirmDeleteAction=Are you sure you want to delete this event?
-CardAction=بطاقة العمل
-ActionOnCompany=Related company
-ActionOnContact=Related contact
-TaskRDVWith=لقاء مع ق ٪
-ShowTask=وتظهر هذه المهمة
-ShowAction=وتظهر العمل
-ActionsReport=تقرير الأعمال
-ThirdPartiesOfSaleRepresentative=Thirdparties مع مندوب مبيعات
-SaleRepresentativesOfThirdParty=Sales representatives of third party
-SalesRepresentative=ممثل مبيعات
+AddActionRendezVous=اضافة حدث اتماعى او اجتماع
+ConfirmDeleteAction=هل أنت متأكد من حذف هذا الحدث؟
+CardAction=بطاقة الحدث
+ActionOnCompany=شركة ذات صلة
+ActionOnContact=جهة اتصال ذات صلة
+TaskRDVWith=لقاء مع %s
+ShowTask=عرض المهمة
+ShowAction=عرض الحدث
+ActionsReport=تقرير الأحداث
+ThirdPartiesOfSaleRepresentative=أطراف ثالثة مع مندوب مبيعات
+SaleRepresentativesOfThirdParty=مندوبي مبيعات الطرف الثالث
+SalesRepresentative=مندوب مبيعات
 SalesRepresentatives=مندوبي المبيعات
-SalesRepresentativeFollowUp=ممثل مبيعات (متابعة)
-SalesRepresentativeSignature=ممثل مبيعات (التوقيع)
-NoSalesRepresentativeAffected=أي ممثل مبيعات المتضررة
-ShowCustomer=وتبين للعملاء
-ShowProspect=وتظهر احتمال
-ListOfProspects=قائمة التوقعات
+SalesRepresentativeFollowUp=مندوب مبيعات (متابعة)
+SalesRepresentativeSignature=مندوب مبيعات (توقيع)
+NoSalesRepresentativeAffected=لم يتم تعيين مندوب مبيعات معين
+ShowCustomer=عرض العميل
+ShowProspect=عرض العميل المحتمل
+ListOfProspects=قائمة العملاء المحتملين
 ListOfCustomers=قائمة العملاء
-LastDoneTasks=Latest %s completed actions
-LastActionsToDo=Oldest %s not completed actions
-DoneAndToDoActions=ويتم القيام بمهام
-DoneActions=إجراءات عمله
-ToDoActions=عدم اكتمال الإجراءات
-SendPropalRef=تقديم اقتراح التجاري٪ الصورة
-SendOrderRef=تقديم النظام %s
+LastDoneTasks=أحدث %s إجراءات مكتملة
+LastActionsToDo=أقدم %s إجراءات غير مكتملة
+DoneAndToDoActions=الأحداث المنجزة والمهام المتبقية
+DoneActions=الأحداث المنجزة
+ToDoActions=أحداث غير منجزة
+SendPropalRef=تقديم العرض التجاري لـ %s
+SendOrderRef=تقديم طلب او امر لـ %s
 StatusNotApplicable=لا ينطبق
-StatusActionToDo=القيام
-StatusActionDone=فعل
-StatusActionInProcess=في العملية
-TasksHistoryForThisContact=إجراءات لهذا الاتصال
-LastProspectDoNotContact=لا اتصال
-LastProspectNeverContacted=اتصل أبدا
+StatusActionToDo=لكى يفعل
+StatusActionDone=اكتمل
+StatusActionInProcess=تحت الانجاز
+TasksHistoryForThisContact=أحداث لجهة الاتصال هذه
+LastProspectDoNotContact=لا تتصل
+LastProspectNeverContacted=لا تتصل ابدا
 LastProspectToContact=للاتصال
-LastProspectContactInProcess=في عملية الاتصال
-LastProspectContactDone=الاتصال به
-ActionAffectedTo=الحدث المخصصة ل
-ActionDoneBy=العمل الذي قام به
+LastProspectContactInProcess=الاتصال قيد الانجاز
+LastProspectContactDone=تم الاتصال
+ActionAffectedTo=تم تعيين الحدث لـ
+ActionDoneBy=تم تنفيذ الحدث بواسطة
 ActionAC_TEL=اتصال هاتفي
 ActionAC_FAX=إرسال فاكس
-ActionAC_PROP=إرسال اقتراح
+ActionAC_PROP=إرسال الاقتراح بالبريد
 ActionAC_EMAIL=ارسال بريد الكتروني
-ActionAC_EMAIL_IN=Reception of Email
+ActionAC_EMAIL_IN=استقبال البريد الإلكتروني
 ActionAC_RDV=اجتماعات
-ActionAC_INT=تدخل على الموقع
-ActionAC_FAC=ارسال الفواتير
-ActionAC_REL=ارسال الفواتير (للتذكير)
+ActionAC_INT=تدخل في الموقع
+ActionAC_FAC=إرسال فاتورة العميل بالبريد
+ActionAC_REL=إرسال فاتورة العميل بالبريد (تذكير)
 ActionAC_CLO=إغلاق
 ActionAC_EMAILING=إرسال البريد الإلكتروني الجماعي
-ActionAC_COM=Send sales order by mail
+ActionAC_COM=إرسال أمر المبيعات بالبريد
 ActionAC_SHIP=إرسال الشحن عن طريق البريد
-ActionAC_SUP_ORD=Send purchase order by mail
-ActionAC_SUP_INV=Send vendor invoice by mail
+ActionAC_SUP_ORD=إرسال أمر الشراء عن طريق البريد
+ActionAC_SUP_INV=إرسال فاتورة المورد بالبريد
 ActionAC_OTH=آخر
-ActionAC_OTH_AUTO=أحداث إدراجها تلقائيا
-ActionAC_MANUAL=أحداث إدراجها يدويا
-ActionAC_AUTO=أحداث إدراجها تلقائيا
-ActionAC_OTH_AUTOShort=Auto
+ActionAC_OTH_AUTO=Other auto
+ActionAC_MANUAL=الأحداث المدرجة يدويًا
+ActionAC_AUTO=الأحداث المدرجة تلقائيًا
+ActionAC_OTH_AUTOShort=الآخر
+ActionAC_EVENTORGANIZATION=حدث فعاليات للمنظمة
 Stats=إحصاءات المبيعات
 StatusProsp=احتمال وضع
 DraftPropals=صياغة مقترحات تجارية
 NoLimit=لا حدود
-ToOfferALinkForOnlineSignature=Link for online signature
-WelcomeOnOnlineSignaturePage=Welcome to the page to accept commercial 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/commercial proposal %s
-FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
+ToOfferALinkForOnlineSignature=رابط للتوقيع عبر الإنترنت
+WelcomeOnOnlineSignaturePage=مرحبًا بك في الصفحة لقبول العروض التجارية من %s
+ThisScreenAllowsYouToSignDocFrom=تسمح لك هذه الشاشة بقبول وتوقيع أو رفض عرض أسعار / عرض تجاري
+ThisIsInformationOnDocumentToSign=هذه معلومات على الوثيقة لقبولها أو رفضها
+SignatureProposalRef=توقيع عرض الأسعار / العرض التجاري %s
+FeatureOnlineSignDisabled=تم تعطيل ميزة التوقيع عبر الإنترنت أو تم إنشاء المستند قبل تمكين الميزة
diff --git a/htdocs/langs/ar_SA/compta.lang b/htdocs/langs/ar_SA/compta.lang
index ec9245b6d0e..8b8294b493d 100644
--- a/htdocs/langs/ar_SA/compta.lang
+++ b/htdocs/langs/ar_SA/compta.lang
@@ -286,3 +286,9 @@ ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
 IncludeLoansInResults = Include loans in reports
+InvoiceLate30Days = Invoices late > 30 days
+InvoiceLate15Days = Invoices late > 15 days
+InvoiceLateMinus15Days = Invoices late
+InvoiceNotLate = To be collected < 15 days
+InvoiceNotLate15Days = To be collected in 15 days
+InvoiceNotLate30Days = To be collected in 30 days
diff --git a/htdocs/langs/ar_SA/cron.lang b/htdocs/langs/ar_SA/cron.lang
index 338d3adb957..eb03a59b91e 100644
--- a/htdocs/langs/ar_SA/cron.lang
+++ b/htdocs/langs/ar_SA/cron.lang
@@ -60,7 +60,7 @@ CronErrEndDateStartDt=تاريخ نهاية لا يمكن أن يكون قبل 
 StatusAtInstall=Status at module installation
 CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=يعطل
-CronTaskInactive=تم تعطيل هذه الوظائف
+CronTaskInactive=This job is disabled (not scheduled)
 CronId=هوية شخصية
 CronClassFile=Filename with class
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example 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>
diff --git a/htdocs/langs/ar_SA/deliveries.lang b/htdocs/langs/ar_SA/deliveries.lang
index 93a9c9efe14..920fa226b0f 100644
--- a/htdocs/langs/ar_SA/deliveries.lang
+++ b/htdocs/langs/ar_SA/deliveries.lang
@@ -2,7 +2,7 @@
 Delivery=توصيل
 DeliveryRef=معرف التسليم
 DeliveryCard=بطاقة استلام
-DeliveryOrder=Delivery receipt
+DeliveryOrder=إيصال التسليم
 DeliveryDate=تاريخ التسليم او الوصول
 CreateDeliveryOrder=إنشاء إيصال الاستلام
 DeliveryStateSaved=تم حفظ حالة التسليم
@@ -18,14 +18,15 @@ StatusDeliveryCanceled=ألغيت
 StatusDeliveryDraft=مسودة
 StatusDeliveryValidated=تم الاستلام
 # merou PDF model
-NameAndSignature=Name and Signature:
+NameAndSignature=الاسم والتوقيع :
 ToAndDate=إلى ___________________________________ في ____ / _____ / __________
 GoodStatusDeclaration=تلقيت البضائع أعلاه في حالة جيدة،
-Deliverer=Deliverer:
+Deliverer=الموصل:
 Sender=مرسل
 Recipient=مستلم
 ErrorStockIsNotEnough=ليس هناك مخزون كاف
 Shippable=قابل للشحن
 NonShippable=غير قابل للشحن
+ShowShippableStatus=إظهار علامة قابل للشحن
 ShowReceiving=عرض إيصال الاستلام
-NonExistentOrder=Nonexistent order
+NonExistentOrder=امر غير موجود
diff --git a/htdocs/langs/ar_SA/donations.lang b/htdocs/langs/ar_SA/donations.lang
index 1cba54ca878..d6d05924921 100644
--- a/htdocs/langs/ar_SA/donations.lang
+++ b/htdocs/langs/ar_SA/donations.lang
@@ -6,7 +6,7 @@ Donor=الجهات المانحة
 AddDonation=إنشاء التبرع
 NewDonation=منحة جديدة
 DeleteADonation=حذف التبرع
-ConfirmDeleteADonation=Are you sure you want to delete this donation?
+ConfirmDeleteADonation=هل أنت متأكد أنك تريد حذف هذا التبرع؟
 PublicDonation=تبرع العامة
 DonationsArea=التبرعات المنطقة
 DonationStatusPromiseNotValidated=مشروع وعد
@@ -16,7 +16,7 @@ DonationStatusPromiseNotValidatedShort=مسودة
 DonationStatusPromiseValidatedShort=صادق
 DonationStatusPaidShort=وردت
 DonationTitle=استلام التبرع
-DonationDate=Donation date
+DonationDate=تاريخ التبرع
 DonationDatePayment=تاريخ الدفع
 ValidPromess=التحقق من صحة الوعد
 DonationReceipt=استلام التبرع
@@ -31,4 +31,5 @@ DONATION_ART200=تبين المادة 200 من CGI إذا كنت تشعر بال
 DONATION_ART238=تبين المادة 238 من CGI إذا كنت تشعر بالقلق
 DONATION_ART885=تبين المادة 885 من CGI إذا كنت تشعر بالقلق
 DonationPayment=دفع التبرع
-DonationValidated=Donation %s validated
+DonationValidated=تم تأكيد التبرع %s
+DonationUseThirdparties=إستخدام طرف ثالث موجود كمنسق للمتبرعين
diff --git a/htdocs/langs/ar_SA/errors.lang b/htdocs/langs/ar_SA/errors.lang
index fdb1bef1b89..dbc501cf54e 100644
--- a/htdocs/langs/ar_SA/errors.lang
+++ b/htdocs/langs/ar_SA/errors.lang
@@ -11,6 +11,7 @@ ErrorBadValueForParamNotAString=Bad value for your parameter. It appends general
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=ادخل ٪ ق موجود بالفعل.
 ErrorGroupAlreadyExists=المجموعة ٪ ق موجود بالفعل.
+ErrorEmailAlreadyExists=Email %s already exists.
 ErrorRecordNotFound=لم يتم العثور على السجل.
 ErrorFailToCopyFile=فشل في نسخ الملف <b>'%s'</b> إلى <b>'%s</b> &quot;.
 ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
@@ -117,7 +118,7 @@ ErrorCantReadFile=فشل في قراءة الملف '%s'
 ErrorCantReadDir=فشل في قراءة '%s' الدليل
 ErrorBadLoginPassword=سيئة قيمة لتسجيل الدخول أو كلمة السر
 ErrorLoginDisabled=لقد تم تعطيل حسابك
-ErrorFailedToRunExternalCommand=فشل لتشغيل الأوامر الخارجية. التحقق من ذلك هو متاح وrunnable من قبل خادم PHP. إذا تم تمكين PHP <b>الوضع الآمن،</b> والتحقق من أن الأمر داخل دليل يحددها <b>safe_mode_exec_dir</b> المعلمة.
+ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server user. Check also the command is not protected on shell level by a security layer like apparmor.
 ErrorFailedToChangePassword=فشل في تغيير كلمة السر
 ErrorLoginDoesNotExists=لا يستطيع المستخدم الدخول مع <b>%s</b> يمكن العثور عليها.
 ErrorLoginHasNoEmail=هذا المستخدم ليس لديه عنوان البريد الإلكتروني. إحباط عملية.
@@ -262,6 +263,7 @@ ErrorDateIsInFuture=Error, the date can't be in the future
 ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
 ErrorAPercentIsRequired=Error, please fill in the percentage correctly
 ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
+ErrorFailedToFindEmailTemplate=Failed to find template with code name %s
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -298,3 +300,4 @@ WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So y
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
+ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
diff --git a/htdocs/langs/ar_SA/eventorganization.lang b/htdocs/langs/ar_SA/eventorganization.lang
index 125a62775f9..701d28ece6b 100644
--- a/htdocs/langs/ar_SA/eventorganization.lang
+++ b/htdocs/langs/ar_SA/eventorganization.lang
@@ -1,4 +1,5 @@
 # Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+# Copyright (C) 2021		Dorian Vabre			<dorian.vabre@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
@@ -81,7 +82,10 @@ PriceOfBoothHelp=Subscription price to stand a booth
 EventOrganizationICSLink=Link ICS for events
 ConferenceOrBoothInformation=Conference Or Booth informations
 Attendees = Attendees
+DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
 #
 # Status
 #
@@ -94,8 +98,46 @@ EvntOrgCancelled = Cancelled
 #
 # Public page
 #
+SuggestForm = Suggestion page
+RegisterPage = Page for conferences or booth
+EvntOrgRegistrationHelpMessage = Here, you can vote for an event, or suggest a new conference or booth for the project
+EvntOrgRegistrationConfHelpMessage = Here, you can suggest a new conference for the project
+EvntOrgRegistrationBoothHelpMessage = Here, you can suggest a new booth for the project
+ListOfSuggestedConferences = List of suggested conferences
+ListOfSuggestedBooths = List of suggested booths
+SuggestConference = Suggest a new conference
+SuggestBooth = Suggest a booth
+ViewAndVote = View and vote for suggested events
 PublicAttendeeSubscriptionPage = Public link of registration to a conference
 MissingOrBadSecureKey = The security key is invalid or missing
-EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
-EvntOrgStartDuration = This conference starts on
-EvntOrgEndDuration =  and ends on
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference : '%s'
+EvntOrgDuration = This conference starts on %s and ends on %s.
+ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
+BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
+EventType = نوع الحدث
+
+#
+# Vote page
+#
+EvntOrgRegistrationWelcomeMessage = Welcome on the conference or booth suggestion page.
+EvntOrgRegistrationConfWelcomeMessage = Welcome on the conference suggestion page.
+EvntOrgRegistrationBoothWelcomeMessage = Welcome on the booth suggestion page.
+EvntOrgVoteHelpMessage = Here, you can view and vote for the suggested events for the project
+VoteOk = Your vote has been accepted.
+AlreadyVoted = You have already voted for this event.
+VoteError = An error has occurred during the vote, please try again.
+
+#
+# SubscriptionOk page
+#
+SubscriptionOk = Your subscription to this conference has been validated
+#
+# Subscription validation mail
+#
+ConfAttendeeSubscriptionConfirmation = Confirmation of your subscription to a conference
+#
+# Payment page
+#
+Attendee = Attendee
+PaymentConferenceAttendee = Conference attendee payment
+PaymentBoothLocation = Booth location payment
diff --git a/htdocs/langs/ar_SA/externalsite.lang b/htdocs/langs/ar_SA/externalsite.lang
index e1c326b4787..ac4d267c40d 100644
--- a/htdocs/langs/ar_SA/externalsite.lang
+++ b/htdocs/langs/ar_SA/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
 ExternalSiteSetup=إعداد رابط لموقع خارجي
-ExternalSiteURL=External Site URL of HTML iframe content
+ExternalSiteURL=رابط موقع خارجي لمحتوى إطار داخلي في لغة توصيف النص التشعبي
 ExternalSiteModuleNotComplete=لم يتم تهيئة نموذج الموقع الخارجي بصورة صحيحة.
 ExampleMyMenuEntry=مُدخل قائمتي
diff --git a/htdocs/langs/ar_SA/hrm.lang b/htdocs/langs/ar_SA/hrm.lang
index 0cfee9469dd..a8791385f0f 100644
--- a/htdocs/langs/ar_SA/hrm.lang
+++ b/htdocs/langs/ar_SA/hrm.lang
@@ -5,13 +5,13 @@ Establishments=مؤسسات
 Establishment=مؤسسة
 NewEstablishment=مؤسسة جديدة
 DeleteEstablishment=حذف المؤسسة
-ConfirmDeleteEstablishment=Are you sure you wish to delete this establishment?
+ConfirmDeleteEstablishment=هل انت متأكد أنك تريد حذف هذة المؤسسة ؟
 OpenEtablishment=فتح المؤسسة
 CloseEtablishment=إغلاق المؤسسة
 # Dictionary
-DictionaryPublicHolidays=HRM - Public holidays
+DictionaryPublicHolidays=الإجازات - الإجازات عامة
 DictionaryDepartment=إدارة الموارد البشرية - قائمة القسم
-DictionaryFunction=HRM - Job positions
+DictionaryFunction=إدارة الموارد البشرية - المسميات الوظيفية
 # Module
 Employees=الموظفين
 Employee=الموظف
diff --git a/htdocs/langs/ar_SA/knowledgemanagement.lang b/htdocs/langs/ar_SA/knowledgemanagement.lang
index 1648a9582a8..0da74f0cde6 100644
--- a/htdocs/langs/ar_SA/knowledgemanagement.lang
+++ b/htdocs/langs/ar_SA/knowledgemanagement.lang
@@ -47,7 +47,7 @@ KnowledgeManagementArea = Knowledge Management
 # Menu
 #
 MenuKnowledgeRecord = Knowledge base
-ListOfArticles = List of articles
+ListKnowledgeRecord = List of articles
 NewKnowledgeRecord = New article
 ValidateReply = Validate solution
 KnowledgeRecords = Articles
diff --git a/htdocs/langs/ar_SA/languages.lang b/htdocs/langs/ar_SA/languages.lang
index e239913fec6..4095d271fb8 100644
--- a/htdocs/langs/ar_SA/languages.lang
+++ b/htdocs/langs/ar_SA/languages.lang
@@ -1,11 +1,12 @@
 # Dolibarr language file - Source file is en_US - languages
-Language_am_ET=Ethiopian
+Language_am_ET=إثيوبي
 Language_ar_AR=العربية
-Language_ar_EG=Arabic (Egypt)
+Language_ar_EG=العربية (مصر)
 Language_ar_SA=العربية
-Language_az_AZ=Azerbaijani
+Language_ar_TN=Arabic (Tunisia)
+Language_az_AZ=أذربيجان
 Language_bn_BD=بنغالي
-Language_bn_IN=Bengali (India)
+Language_bn_IN=البنغالية (الهند)
 Language_bg_BG=البلغارية
 Language_bs_BA=البوسنية
 Language_ca_ES=كاتالاني
@@ -23,7 +24,7 @@ Language_en_GB=الانجليزية (المملكة المتحدة)
 Language_en_IN=الإنكليزية (الهند)
 Language_en_NZ=الإنجليزية (نيوزيلندا)
 Language_en_SA=الإنجليزية (المملكة العربية السعودية)
-Language_en_SG=English (Singapore)
+Language_en_SG=الإنجليزية (سنغافورة)
 Language_en_US=الإنكليزية (الولايات المتحدة)
 Language_en_ZA=الإنكليزية (جنوب أفريقيا)
 Language_es_ES=الأسبانية
@@ -33,16 +34,16 @@ Language_es_CL=الإسبانية (تشيلي)
 Language_es_CO=الأسبانية (كولومبيا)
 Language_es_DO=الأسبانية (جمهورية الدومنيكان)
 Language_es_EC=الإسبانية (إكوادور)
-Language_es_GT=Spanish (Guatemala)
+Language_es_GT=الإسبانية (غواتيمالا)
 Language_es_HN=الأسبانية (هندوراس)
 Language_es_MX=الإسبانية (المكسيك)
 Language_es_PA=الإسبانية (بنما)
 Language_es_PY=الأسبانية (باراغواي)
 Language_es_PE=الإسبانية (بيرو)
 Language_es_PR=الأسبانية (بورتو ريكو)
-Language_es_US=Spanish (USA)
-Language_es_UY=Spanish (Uruguay)
-Language_es_GT=Spanish (Guatemala)
+Language_es_US=الإسبانية (الولايات المتحدة الأمريكية)
+Language_es_UY=الإسبانية (أوروغواي)
+Language_es_GT=الإسبانية (غواتيمالا)
 Language_es_VE=الإسبانية (فنزويلا)
 Language_et_EE=الإستونية
 Language_eu_ES=الباسكي
@@ -51,22 +52,22 @@ Language_fi_FI=اللغة الفنلندية
 Language_fr_BE=الفرنسية (بلجيكا)
 Language_fr_CA=الفرنسية (كندا)
 Language_fr_CH=الفرنسية (سويسرا)
-Language_fr_CI=French (Cost Ivory)
-Language_fr_CM=French (Cameroun)
+Language_fr_CI=الفرنسية (ساحل العاج)
+Language_fr_CM=الفرنسية (الكاميرون)
 Language_fr_FR=الفرنسية
-Language_fr_GA=French (Gabon)
+Language_fr_GA=الفرنسية (الجابون)
 Language_fr_NC=الفرنسية (كاليدونيا الجديدة)
-Language_fr_SN=French (Senegal)
+Language_fr_SN=الفرنسية (السنغال)
 Language_fy_NL=الفريزية
-Language_gl_ES=Galician
+Language_gl_ES=الجاليكية
 Language_he_IL=اللغة العبرية
-Language_hi_IN=Hindi (India)
+Language_hi_IN=الهندية (الهند)
 Language_hr_HR=الكرواتية
 Language_hu_HU=المجري
 Language_id_ID=الأندونيسية
 Language_is_IS=الآيسلندي
 Language_it_IT=الإيطالي
-Language_it_CH=Italian (Switzerland)
+Language_it_CH=الإيطالية (سويسرا)
 Language_ja_JP=اليابانية
 Language_ka_GE=الجورجية
 Language_km_KH=الخمير
@@ -78,12 +79,13 @@ Language_lv_LV=اللاتفية
 Language_mk_MK=المقدونية
 Language_mn_MN=المنغولية
 Language_nb_NO=النرويجية (بوكمال)
-Language_ne_NP=Nepali
+Language_ne_NP=النيبالية
 Language_nl_BE=الهولندية (بلجيكا)
-Language_nl_NL=Dutch
+Language_nl_NL=اللغة الهولندية
 Language_pl_PL=بولندي
 Language_pt_BR=البرتغالية (البرازيل)
 Language_pt_PT=البرتغالية
+Language_ro_MD=Romanian (Moldavia)
 Language_ro_RO=الرومانية
 Language_ru_RU=الروسية
 Language_ru_UA=الروسية (أوكرانيا)
@@ -101,5 +103,5 @@ Language_uz_UZ=الأوزبكي
 Language_vi_VN=الفيتنامية
 Language_zh_CN=الصينية
 Language_zh_TW=الصينية (التقليدية)
-Language_zh_HK=Chinese (Hong Kong)
-Language_bh_MY=Malay
+Language_zh_HK=الصينية (هونج كونج)
+Language_bh_MY=لغة الملايو
diff --git a/htdocs/langs/ar_SA/ldap.lang b/htdocs/langs/ar_SA/ldap.lang
index 6b6c34bdba7..b84a13ba7a7 100644
--- a/htdocs/langs/ar_SA/ldap.lang
+++ b/htdocs/langs/ar_SA/ldap.lang
@@ -1,27 +1,27 @@
 # Dolibarr language file - Source file is en_US - ldap
 YouMustChangePassNextLogon=كلمة السر للمستخدم <b>٪</b> على النطاق <b>ق ق ٪</b> ويجب أن يتغير.
 UserMustChangePassNextLogon=يجب على المستخدم تغيير كلمة المرور على المجال ق ٪
-LDAPInformationsForThisContact=المعلومات في قاعدة البيانات LDAP لهذا الاتصال
-LDAPInformationsForThisUser=المعلومات في قاعدة البيانات LDAP لهذا المستخدم
-LDAPInformationsForThisGroup=المعلومات في قاعدة البيانات LDAP لهذه المجموعة
-LDAPInformationsForThisMember=المعلومات في قاعدة البيانات LDAP لهذا العضو
-LDAPInformationsForThisMemberType=Information in LDAP database for this member type
-LDAPAttributes=LDAP الصفات
-LDAPCard=بطاقة LDAP
-LDAPRecordNotFound=سجل غير موجود في قاعدة البيانات LDAP
-LDAPUsers=المستخدمين في قاعدة البيانات LDAP
-LDAPFieldStatus=حالة
-LDAPFieldFirstSubscriptionDate=أول موعد الاكتتاب
-LDAPFieldFirstSubscriptionAmount=قبضة مبلغ الاشتراك
-LDAPFieldLastSubscriptionDate=Latest subscription date
-LDAPFieldLastSubscriptionAmount=Latest subscription amount
-LDAPFieldSkype=Skype id
-LDAPFieldSkypeExample=Example : skypeName
-UserSynchronized=وتزامن المستخدم
-GroupSynchronized=مجموعة متزامنة
-MemberSynchronized=عضو متزامنة
-MemberTypeSynchronized=Member type synchronized
-ContactSynchronized=وتزامن الاتصال
-ForceSynchronize=واكبت قوة Dolibarr --> LDAP
-ErrorFailedToReadLDAP=فشل في قراءة قاعدة البيانات LDAP. LDAP وحدة التحقق من الإعداد ، وإمكانية الوصول إلى قاعدة البيانات.
-PasswordOfUserInLDAP=Password of user in LDAP
+LDAPInformationsForThisContact=المعلومات في قاعدة بيانات  خادم الوصول الخفيف للأدلة لهذا الاتصال
+LDAPInformationsForThisUser=المعلومات في قاعدة بيانات خادم الوصول الخفيف للأدلة لهذا المستخدم
+LDAPInformationsForThisGroup=المعلومات في قاعدة بيانات خادم الوصول الخفيف للأدلة لهذه المجموعة
+LDAPInformationsForThisMember=المعلومات في قاعدة بيانات خادم الوصول الخفيف للأدلة لهذا العضو
+LDAPInformationsForThisMemberType=المعلومات في قاعدة بيانات خادم الوصول للأدلة الخفيق لنوع العضو
+LDAPAttributes=خصائص خادم الوصول الخفيف للأدلة
+LDAPCard=بطاقة خادم الوصول الخفيف للأدلة
+LDAPRecordNotFound=سجل غير موجود في قاعدة بيانات خادم الوصول الخفيف للأدلة
+LDAPUsers=المستخدمين في قاعدة بيانات خادم الوصول الخفيف للأدلة
+LDAPFieldStatus=الحالة
+LDAPFieldFirstSubscriptionDate=تاريخ اول إشتراك
+LDAPFieldFirstSubscriptionAmount=مبلغ اول إشتراك
+LDAPFieldLastSubscriptionDate=تاريخ اخر إشتراك
+LDAPFieldLastSubscriptionAmount=مبلغ اخر إشتراك
+LDAPFieldSkype=معرف سكايبي
+LDAPFieldSkypeExample=مثال : اسم إسكايبي
+UserSynchronized=تمت مزامنة المستخدم
+GroupSynchronized=تمت مزامنة المجموعة
+MemberSynchronized=تمت مزامنة العضو
+MemberTypeSynchronized=تمت مزامنة نوع العضو
+ContactSynchronized=تمت مزامنة جهة الاتصال
+ForceSynchronize=إجبار التزامن بين دوليبار و خادم الوصول الخفيف للأدلة
+ErrorFailedToReadLDAP=فشل في قراءة قاعدة بيانات خادم الوصول الخفيف للأدلة. راجع إعدادات وحدة خادم الوصول الخفيف للأدلة، وإمكانية الوصول إلى قاعدة البيانات.
+PasswordOfUserInLDAP=كلمة سر المستخدم في  خادم الوصول الخفيف للأدلة
diff --git a/htdocs/langs/ar_SA/link.lang b/htdocs/langs/ar_SA/link.lang
index 18b8a80fecb..2e0aa65c6f3 100644
--- a/htdocs/langs/ar_SA/link.lang
+++ b/htdocs/langs/ar_SA/link.lang
@@ -8,4 +8,4 @@ LinkRemoved= الرابط%sتم إزالتة
 ErrorFailedToDeleteLink= فشل في إزالة الرابط '<b> %s </b>'
 ErrorFailedToUpdateLink= فشل تحديث الرابط '<b> %s </b>'
 URLToLink=عنوان URL للربط
-OverwriteIfExists=Overwrite file if exists
+OverwriteIfExists=إستبدال محتوى الملف إذا كان موجوداً
diff --git a/htdocs/langs/ar_SA/main.lang b/htdocs/langs/ar_SA/main.lang
index ce51cd01c65..1916ea03ef3 100644
--- a/htdocs/langs/ar_SA/main.lang
+++ b/htdocs/langs/ar_SA/main.lang
@@ -430,6 +430,7 @@ LT1IN=CGST
 LT2IN=SGST
 LT1GC=Additionnal cents
 VATRate=معدل الضريبة
+RateOfTaxN=Rate of tax %s
 VATCode=كود معدل الضريبة
 VATNPR=معدل ضريبة NPR
 DefaultTaxRate=معدل الضريبة الافتراضي
@@ -729,6 +730,7 @@ MenuMembers=أعضاء
 MenuAgendaGoogle=أجندة غوغل
 MenuTaxesAndSpecialExpenses=الضرائب | مصاريف خاصة
 ThisLimitIsDefinedInSetup=حدود دوليبار (Menu home-setup-security): %s كيلوبايت ، حد PHP: %s كيلوبايت
+ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
 NoFileFound=لم يتم رفع مستند
 CurrentUserLanguage=اللغة الحالية
 CurrentTheme=الواجهة الحالية
@@ -1072,6 +1074,7 @@ ValidFrom=صالح من
 ValidUntil=صالح حتى
 NoRecordedUsers=لايوجد مستخدمين
 ToClose=لغلق
+ToRefuse=To refuse
 ToProcess=لعملية
 ToApprove=للموافقة
 GlobalOpenedElemView=نظرة شاملة
@@ -1126,9 +1129,11 @@ UpdateForAllLines=تحديث لجميع البنود
 OnHold=في الانتظار
 Civility=Civility
 AffectTag=Affect Tag
+CreateExternalUser=Create external user
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=لا يوجد ملصق لنوع السجل
 CopiedToClipboard=تم النسخ الى الحافظة
 InformationOnLinkToContract=هذا المبلغ هو مجموع بنود العقد . دون مراعاة قيمة الزمن
 ConfirmCancel=Are you sure you want to cancel
+EmailMsgID=Email MsgID
diff --git a/htdocs/langs/ar_SA/margins.lang b/htdocs/langs/ar_SA/margins.lang
index 964d6de11fa..24d82f7e7c9 100644
--- a/htdocs/langs/ar_SA/margins.lang
+++ b/htdocs/langs/ar_SA/margins.lang
@@ -16,20 +16,20 @@ MarginDetails=تفاصيل الهامش
 ProductMargins=هوامش المنتج
 CustomerMargins=هوامش العملاء
 SalesRepresentativeMargins=هوامش ممثل المبيعات
-ContactOfInvoice=Contact of invoice
+ContactOfInvoice=جهة إتصال الفاتورة
 UserMargins=هوامش المستخدم
 ProductService=المنتج أو الخدمة
 AllProducts=جميع المنتجات والخدمات
 ChooseProduct/Service=اختيار المنتج أو الخدمة
 ForceBuyingPriceIfNull=فرض سعر  شراء / تكلفة إلى سعر البيع إذا لم يتم تحديدها
-ForceBuyingPriceIfNullDetails=If buying/cost price not provided when we add a new line, and this option is "ON", the margin will be 0 on the new line (buying/cost price = selling price). If this option is "OFF" (recommended), margin will be equal to the value suggested by default (and may be 100% if no default value can be found).
+ForceBuyingPriceIfNullDetails=إذا لم يتم تحديد سعر / تكلفة الشراء عند إضافة بند جديد، وتم "تشغيل" هذا الخيار ، فإن الهامش على البند المضاف سيكون صفراَ (سعر /لتكلفة الشراء  = سعر البيع). إذا تم  "إيقاف" هذا الخيار(مستحسن)، فإن الهامش يساوي القيمة الاولية المقترحة (وربما تكون 100% إذا لم توجد قيمة اولية).
 MARGIN_METHODE_FOR_DISCOUNT=طريقة الهامش للخصومات العالمية
 UseDiscountAsProduct=كمنتج
 UseDiscountAsService=كخدمة
 UseDiscountOnTotal=على المجموع الفرعي
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=يحدد ما إذا كان يتم التعامل مع الخصم العالمي كمنتج أو خدمة أو فقط على المجموع الفرعي لحساب الهامش.
 MARGIN_TYPE=سعر الشراء / التكلفة المقترحة افتراضيا لحساب الهامش
-MargeType1=Margin on Best vendor price
+MargeType1=الهامش على سعر المورد الافضل
 MargeType2=الهامش على متوسط ​​السعر المرجح (واب)
 MargeType3=هامش على سعر التكلفة
 MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best vendor price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best vendor price if WAP not yet defined
diff --git a/htdocs/langs/ar_SA/members.lang b/htdocs/langs/ar_SA/members.lang
index ecb209b3f8b..b78376133b4 100644
--- a/htdocs/langs/ar_SA/members.lang
+++ b/htdocs/langs/ar_SA/members.lang
@@ -213,3 +213,5 @@ SendReminderForExpiredSubscription=Send reminder by email to members when subscr
 MembershipPaid=Membership paid for current period (until %s)
 YouMayFindYourInvoiceInThisEmail=You may find your invoice attached to this email
 XMembersClosed=%s member(s) closed
+XExternalUserCreated=%s external user(s) created
+ForceMemberNature=Force member nature (Individual or Corporation)
diff --git a/htdocs/langs/ar_SA/modulebuilder.lang b/htdocs/langs/ar_SA/modulebuilder.lang
index a430c605f45..3ff076f37fa 100644
--- a/htdocs/langs/ar_SA/modulebuilder.lang
+++ b/htdocs/langs/ar_SA/modulebuilder.lang
@@ -143,3 +143,4 @@ AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
 ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
+ImportExportProfiles=Import and export profiles
diff --git a/htdocs/langs/ar_SA/mrp.lang b/htdocs/langs/ar_SA/mrp.lang
index ec999a473a4..97c6e6378bb 100644
--- a/htdocs/langs/ar_SA/mrp.lang
+++ b/htdocs/langs/ar_SA/mrp.lang
@@ -1,4 +1,4 @@
-Mrp=Manufacturing Orders
+Mrp=أوامر التصنيع
 MOs=Manufacturing orders
 ManufacturingOrder=Manufacturing Order
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
@@ -8,12 +8,12 @@ MenuBOM=Bills of material
 LatestBOMModified=Latest %s Bills of materials modified
 LatestMOModified=Latest %s Manufacturing Orders modified
 Bom=Bills of Material
-BillOfMaterials=Bill of Material
+BillOfMaterials=Bill of Materials
 BOMsSetup=Setup of module BOM
 ListOfBOMs=List of bills of material - BOM
 ListOfManufacturingOrders=List of Manufacturing Orders
-NewBOM=New bill of material
-ProductBOMHelp=Product to create with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
+NewBOM=New bill of materials
+ProductBOMHelp=Product to create (or disassemble) with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
 BOMsNumberingModules=BOM numbering templates
 BOMsModelModule=BOM document templates
 MOsNumberingModules=MO numbering templates
@@ -22,7 +22,7 @@ FreeLegalTextOnBOMs=Free text on document of BOM
 WatermarkOnDraftBOMs=Watermark on draft BOM
 FreeLegalTextOnMOs=Free text on document of MO
 WatermarkOnDraftMOs=Watermark on draft MO
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials %s ?
 ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
 ManufacturingEfficiency=Manufacturing efficiency
 ConsumptionEfficiency=Consumption efficiency
@@ -30,16 +30,16 @@ ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the produc
 ValueOfMeansLossForProductProduced=Value of 0.95 means an average of 5%% of loss of produced product
 DeleteBillOfMaterials=Delete Bill Of Materials
 DeleteMo=Delete Manufacturing Order
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
-MenuMRP=Manufacturing Orders
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Materials?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Materials?
+MenuMRP=أوامر التصنيع
 NewMO=New Manufacturing Order
 QtyToProduce=Qty to produce
 DateStartPlannedMo=Date start planned
 DateEndPlannedMo=Date end planned
 KeepEmptyForAsap=Empty means 'As Soon As Possible'
 EstimatedDuration=Estimated duration
-EstimatedDurationDesc=Estimated duration to manufacture this product using this BOM
+EstimatedDurationDesc=Estimated duration to manufacture (or disassemble) this product using this BOM
 ConfirmValidateBom=Are you sure you want to validate the BOM with the reference <strong>%s</strong> (you will be able to use it to build new Manufacturing Orders)
 ConfirmCloseBom=Are you sure you want to cancel this BOM (you won't be able to use it to build new Manufacturing Orders anymore) ?
 ConfirmReopenBom=Are you sure you want to re-open this BOM (you will be able to use it to build new Manufacturing Orders)
@@ -63,13 +63,14 @@ ConsumeAndProduceAll=Consume and Produce All
 Manufactured=Manufactured
 TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
 ForAQuantityOf=For a quantity to produce of %s
+ForAQuantityToConsumeOf=For a quantity to disassemble of %s
 ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
 ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
 ProductionForRef=Production of %s
 AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
 NoStockChangeOnServices=No stock change on services
 ProductQtyToConsumeByMO=Product quantity still to consume by open MO
-ProductQtyToProduceByMO=Product quentity still to produce by open MO
+ProductQtyToProduceByMO=Product quantity still to produce by open MO
 AddNewConsumeLines=Add new line to consume
 ProductsToConsume=Products to consume
 ProductsToProduce=Products to produce
@@ -83,15 +84,13 @@ Workstations=Workstations
 WorkstationsDescription=Workstations management
 WorkstationSetup = Workstations setup
 WorkstationSetupPage = Workstations setup page
-WorkstationAbout = About Workstation
-WorkstationAboutPage = Workstations about page
 WorkstationList=Workstation list
 WorkstationCreate=Add new workstation
 ConfirmEnableWorkstation=Are you sure you want to enable workstation <b>%s</b> ?
 EnableAWorkstation=Enable a workstation
 ConfirmDisableWorkstation=Are you sure you want to disable workstation <b>%s</b> ?
 DisableAWorkstation=Disable a workstation
-DeleteWorkstation=Supprimer
+DeleteWorkstation=حذف
 NbOperatorsRequired=Number of operators required
 THMOperatorEstimated=Estimated operator THM
 THMMachineEstimated=Estimated machine THM
diff --git a/htdocs/langs/ar_SA/orders.lang b/htdocs/langs/ar_SA/orders.lang
index 24d3349a1d3..e7f94524121 100644
--- a/htdocs/langs/ar_SA/orders.lang
+++ b/htdocs/langs/ar_SA/orders.lang
@@ -11,13 +11,14 @@ OrderDate=تاريخ الامر
 OrderDateShort=تاريخ الامر
 OrderToProcess=امر للعمل
 NewOrder=امر جديد
+NewSupplierOrderShort=امر جديد
 NewOrderSupplier=أمر شراء جديد
 ToOrder=قم بالامر
 MakeOrder=قم بالامر
 SupplierOrder=أمر شراء
 SuppliersOrders=اوامر الشراء
-SaleOrderLines=Sale order lines
-PurchaseOrderLines=Puchase order lines
+SaleOrderLines=بنود امر البيع
+PurchaseOrderLines=بنود امر الشراء
 SuppliersOrdersRunning=أوامر الشراء الحالية
 CustomerOrder=امر بيع
 CustomersOrders=اوامر البيع
@@ -73,6 +74,7 @@ DeleteOrder=حذف الامر
 CancelOrder=الغاء الامر
 OrderReopened= إعادة فتح الامر %s
 AddOrder=إنشاء امر
+AddSupplierOrderShort=إنشاء امر
 AddPurchaseOrder=إنشاء أمر شراء
 AddToDraftOrders=أضف إلى مسودة امر
 ShowOrder=عرض الامر
diff --git a/htdocs/langs/ar_SA/other.lang b/htdocs/langs/ar_SA/other.lang
index 7d4928f2519..74e9f082e39 100644
--- a/htdocs/langs/ar_SA/other.lang
+++ b/htdocs/langs/ar_SA/other.lang
@@ -129,6 +129,7 @@ ClosedByLogin=تسجيل دخول المستخدم الذي أغلق
 FileWasRemoved=تم حذف الملف
 DirWasRemoved=دليل أزيل
 FeatureNotYetAvailable=Feature not yet available in the current version
+FeatureNotAvailableOnDevicesWithoutMouse=Feature not available on devices without mouse
 FeaturesSupported=Supported features
 Width=عرض
 Height=ارتفاع
@@ -263,7 +264,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
-PrefixSession=Prefix for session ID
+SuffixSessionName=Suffix for session name
 
 ##### Export #####
 ExportsArea=صادرات المنطقة
diff --git a/htdocs/langs/ar_SA/partnership.lang b/htdocs/langs/ar_SA/partnership.lang
index e564bce07c2..63cfa214cad 100644
--- a/htdocs/langs/ar_SA/partnership.lang
+++ b/htdocs/langs/ar_SA/partnership.lang
@@ -16,41 +16,72 @@
 #
 # Generic
 #
-ModulePartnershipName = إدارة الشراكة
-PartnershipDescription = وحدة إدارة الشراكة
+ModulePartnershipName=إدارة الشراكة
+PartnershipDescription=وحدة إدارة الشراكة
 PartnershipDescriptionLong= وحدة إدارة الشراكة
 
+AddPartnership=Add partnership
+CancelPartnershipForExpiredMembers=Partnership: Cancel partnership of members with expired subscriptions
+PartnershipCheckBacklink=Partnership: Check referring backlink
+
 #
 # Menu
 #
-NewPartnership = شراكة جديدة
-ListOfPartnerships = قائمة الشراكات
+NewPartnership=شراكة جديدة
+ListOfPartnerships=قائمة الشراكات
 
 #
 # Admin page
 #
-PartnershipSetup = إعدادات الشراكة
-PartnershipAbout = حول الشراكة
-PartnershipAboutPage = صفحة حول الشراكة 
-
+PartnershipSetup=إعدادات الشراكة
+PartnershipAbout=حول الشراكة
+PartnershipAboutPage=صفحة حول الشراكة 
+partnershipforthirdpartyormember=Partner status must be set on a 'thirdparty' or a 'member'
+PARTNERSHIP_IS_MANAGED_FOR=Partnership managed for
+PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks to check
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb of days before cancelling status of a partnership when a subscription has expired
+ReferingWebsiteCheck=Check of website referring
+ReferingWebsiteCheckDesc=You can enable a feature to check that your partners has added a backlink to your website domains on their own website.
 
 #
 # Object
 #
+DeletePartnership=Delete a partnership
+PartnershipDedicatedToThisThirdParty=Partnership dedicated to this third party
+PartnershipDedicatedToThisMember=Partnership dedicated to this member
 DatePartnershipStart=تاريخ البدء
 DatePartnershipEnd=تاريخ الانتهاء
+ReasonDecline=Decline reason
+ReasonDeclineOrCancel=Decline reason
+PartnershipAlreadyExist=Partnership already exist
+ManagePartnership=Manage partnership
+BacklinkNotFoundOnPartnerWebsite=Backlink not found on partner website
+ConfirmClosePartnershipAsk=Are you sure you want to cancel this partnership?
+PartnershipType=Partnership type
 
 #
 # Template Mail
 #
+SendingEmailOnPartnershipWillSoonBeCanceled=Partnership will soon be canceled
+SendingEmailOnPartnershipRefused=Partnership refused
+SendingEmailOnPartnershipAccepted=Partnership accepted
+SendingEmailOnPartnershipCanceled=Partnership canceled
 
+YourPartnershipWillSoonBeCanceledTopic=Partnership will soon be canceled
+YourPartnershipRefusedTopic=Partnership refused
+YourPartnershipAcceptedTopic=Partnership accepted
+YourPartnershipCanceledTopic=Partnership canceled
+
+YourPartnershipWillSoonBeCanceledContent=We inform you that your partnership will soon be canceled (Backlink not found)
+YourPartnershipRefusedContent=We inform you that your partnership request has been refused.
+YourPartnershipAcceptedContent=We inform you that your partnership request has been accepted.
+YourPartnershipCanceledContent=We inform you that your partnership has been canceled.
 
 #
 # Status
 #
-PartnershipDraft = حوالة مصرفية
-PartnershipAccepted = قبلت
-PartnershipRefused = رفض
-PartnershipCanceled = ملغي
-
+PartnershipDraft=حوالة مصرفية
+PartnershipAccepted=قبلت
+PartnershipRefused=رفض
+PartnershipCanceled=ملغي
 PartnershipManagedFor=الشركاء هم
diff --git a/htdocs/langs/ar_SA/productbatch.lang b/htdocs/langs/ar_SA/productbatch.lang
index 5c01404e42f..5e8039205d3 100644
--- a/htdocs/langs/ar_SA/productbatch.lang
+++ b/htdocs/langs/ar_SA/productbatch.lang
@@ -1,4 +1,4 @@
-# ProductBATCH language file - en_US - ProductBATCH
+# ProductBATCH language file - Source file is en_US - ProductBATCH
 ManageLotSerial=استخدام الكثير / الرقم التسلسلي
 ProductStatusOnBatch=Yes (lot required)
 ProductStatusOnSerial=Yes (unique serial number required)
@@ -33,3 +33,13 @@ CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+LifeTime=Life span (in days)
+EndOfLife=End of life
+ManufacturingDate=Manufacturing date
+DestructionDate=Destruction date
+FirstUseDate=First use date
+QCFrequency=Quality control frequency (in days)
+
+#Traceability - qc status
+OutOfOrder=Out of order
+InWorkingOrder=In working order
diff --git a/htdocs/langs/ar_SA/products.lang b/htdocs/langs/ar_SA/products.lang
index 9632cb061db..75ced2b4df0 100644
--- a/htdocs/langs/ar_SA/products.lang
+++ b/htdocs/langs/ar_SA/products.lang
@@ -396,3 +396,5 @@ ActionAvailableOnVariantProductOnly=Action only available on the variant of prod
 ProductsPricePerCustomer=Product prices per customers
 ProductSupplierExtraFields=Additional Attributes (Supplier Prices)
 DeleteLinkedProduct=Delete the child product linked to the combination
+PMPValue=المتوسط المرجح لسعر
+PMPValueShort=الواب
diff --git a/htdocs/langs/ar_SA/projects.lang b/htdocs/langs/ar_SA/projects.lang
index a2305967521..bbf4f98c732 100644
--- a/htdocs/langs/ar_SA/projects.lang
+++ b/htdocs/langs/ar_SA/projects.lang
@@ -267,9 +267,11 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=فاتورة جديدة
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+OneLinePerTimeSpentLine=One line for each time spent declaration
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
 AddPersonToTask=Add also to tasks
 UsageOrganizeEvent=Usage: Event Organization
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
+SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
diff --git a/htdocs/langs/ar_SA/receptions.lang b/htdocs/langs/ar_SA/receptions.lang
index fc1b05cf47c..9ae42683be8 100644
--- a/htdocs/langs/ar_SA/receptions.lang
+++ b/htdocs/langs/ar_SA/receptions.lang
@@ -44,4 +44,4 @@ ValidateOrderFirstBeforeReception=You must first validate the order before being
 ReceptionsNumberingModules=Numbering module for receptions
 ReceptionsReceiptModel=Document templates for receptions
 NoMorePredefinedProductToDispatch=No more predefined products to dispatch
-
+ReceptionExist=A reception exists
diff --git a/htdocs/langs/ar_SA/stocks.lang b/htdocs/langs/ar_SA/stocks.lang
index 6b7e98f782d..0cc423b3543 100644
--- a/htdocs/langs/ar_SA/stocks.lang
+++ b/htdocs/langs/ar_SA/stocks.lang
@@ -56,8 +56,6 @@ UnitPurchaseValue=وحدة سعر الشراء
 StockTooLow=الاسهم منخفضة جدا
 StockLowerThanLimit=Stock lower than alert limit (%s)
 EnhancedValue=القيمة
-PMPValue=المتوسط المرجح لسعر
-PMPValueShort=الواب
 EnhancedValueOfWarehouses=قيمة المستودعات
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
@@ -251,7 +249,10 @@ SelectAStockMovementFileToImport=select a stock movement file to import
 InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
 LabelOfInventoryMovemement=Inventory %s
 ReOpen=إعادة فتح
-ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock to the real qty you entered into the inventory.
 ObjectNotFound=%s not found
 MakeMovementsAndClose=Generate movements and close
 AutofillWithExpected=Fill real quantity with expected quantity
+ShowAllBatchByDefault=By default, show batch details on product "stock" tab
+CollapseBatchDetailHelp=You can set batch detail default display in stocks module configuration
+FieldCannotBeNegative=Field "%s" cannot be negative
diff --git a/htdocs/langs/ar_SA/ticket.lang b/htdocs/langs/ar_SA/ticket.lang
index 23feb81ae34..0c32265c100 100644
--- a/htdocs/langs/ar_SA/ticket.lang
+++ b/htdocs/langs/ar_SA/ticket.lang
@@ -304,7 +304,7 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
-BoxTicketType=Number of open tickets by type
+BoxTicketType=Distribution of open tickets by type
 BoxTicketSeverity=Number of open tickets by severity
 BoxNoTicketSeverity=No tickets opened
 BoxTicketLastXDays=Number of new tickets by days the last %s days
diff --git a/htdocs/langs/ar_SA/website.lang b/htdocs/langs/ar_SA/website.lang
index 76471f88558..980b532e823 100644
--- a/htdocs/langs/ar_SA/website.lang
+++ b/htdocs/langs/ar_SA/website.lang
@@ -1,147 +1,147 @@
 # Dolibarr language file - Source file is en_US - website
-Shortname=رمز
-WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
-DeleteWebsite=Delete website
-ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain.
-WEBSITE_TYPE_CONTAINER=Type of page/container
-WEBSITE_PAGE_EXAMPLE=Web page to use as example
-WEBSITE_PAGENAME=Page name/alias
-WEBSITE_ALIASALT=Alternative page names/aliases
-WEBSITE_ALIASALTDesc=Use here list of other name/aliases so the page can also be accessed using this other names/aliases (for example the old name after renaming the alias to keep backlink on old link/name working). Syntax is:<br>alternativename1, alternativename2, ...
-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)
-WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
-WEBSITE_ROBOT=Robot file (robots.txt)
-WEBSITE_HTACCESS=Website .htaccess file
-WEBSITE_MANIFEST_JSON=Website manifest.json file
-WEBSITE_README=README.md file
-WEBSITE_KEYWORDSDesc=Use a comma to separate values
-EnterHereLicenseInformation=Enter here meta data or license information to fille a README.md file. if you distribute your website as a template, the file will be included into the temptate package.
-HtmlHeaderPage=HTML header (specific to this page only)
-PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
-EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
-MediaFiles=Media library
-EditCss=Edit website properties
-EditMenu=Edit menu
-EditMedias=Edit medias
-EditPageMeta=Edit page/container properties
-EditInLine=Edit inline
-AddWebsite=Add website
-Webpage=Web page/container
-AddPage=Add page/container
+Shortname=نص مرمز
+WebsiteSetupDesc=قم بإنشاء الموقع الالكتروني الذي ترغب باستخدامه ثم اذهب الى القائمة المواقع الإلكترونية لتعديلها
+DeleteWebsite=حذف الموقع الإلكتروني
+ConfirmDeleteWebsite=هل انت متأكد من رغبتك بحذف هذا الموقع الإلكتروني ؟ سيتم حذف جميع الصفحات والمحتويات ايضا. الملفات المحملة (كما في المسار الاستديو و وحدة وإدارة المحتوى الرقمي) ستبقى دون حذف.
+WEBSITE_TYPE_CONTAINER=نوع الصفحة \\ الحاوية
+WEBSITE_PAGE_EXAMPLE=الصفحة التي تريد إستخدامها كمثال
+WEBSITE_PAGENAME=اسم\\لقب الصفحة
+WEBSITE_ALIASALT=اسم\\لقب بديل للصفحة
+WEBSITE_ALIASALTDesc=إستخدم هنا قائمة من اسماء\\القاب الصفحة حتى يتم الوصول للصفحة باكثر من اسم\\لقب (على سبيل المثال اسم الصفحة القديم بعد إعادة تسميتها للمحافظة على عمل الروابط القديمة) . الطريقة هي <br> الاسم ابديل1 ، الاسم البديل2، ...
+WEBSITE_CSS_URL=رابط خارجي لملف المظهر
+WEBSITE_CSS_INLINE=محتوى ملف مظهر (مشترك بين كل الصفحات)
+WEBSITE_JS_INLINE=محتوى ملف جافاسكربت (مشترك بين كل الصفحات)
+WEBSITE_HTML_HEADER=ترويسات لغة ترميز النصوص التشعبية (مشتركة بين كل الصفحات)
+WEBSITE_ROBOT=محتوى ملف الروبوتات النصي 
+WEBSITE_HTACCESS=محتوى ملف ضبط الوصول
+WEBSITE_MANIFEST_JSON=ملف قوائم جسون للموقع
+WEBSITE_README=ملف إقرأني الوصفي
+WEBSITE_KEYWORDSDesc=إستخدم الشولة لفصل القيم 
+EnterHereLicenseInformation=أدخل هنا المعلومات الوصفية او معلومات الترخيص لملئ محتوى ملف إقرأني الوصفي . إذا قمت بتوزيع موقعك كقالب ، سيتم تصمين الملف في الحزمة.
+HtmlHeaderPage=ترويسات لغة ترميز النصوص التشعبية (لهذه الصفحة فقظ)
+PageNameAliasHelp=اسم او لقب الصفحة. <br> هذا يستخدم ايضا لانشاء رابط تسريع محركات البحث عندما يتم تشغيل الموقع عبر خادم إستضافة افتراضي (مثل اباتشي او انجنكس..) إستخدم الزر "<strong>%s</strong>" لتعديل هذا الاسم او اللقب.
+EditTheWebSiteForACommonHeader=ملاحظة: اذا كنت ترغب في تعيين ترويسة لكل الصفحات إستخدم الترويسات على مستوى الموقع بدلا عن ترويسات الصفحة\\الحاوية
+MediaFiles=الاستديو
+EditCss=تعديل خصائص الموقع الإلكتروني
+EditMenu=تعديل القائمة
+EditMedias=تعديل الاستديو
+EditPageMeta=تعديل خصائص الصفحة\\الحاوية
+EditInLine=تعديل على السطور
+AddWebsite=إضافة موقع إلكتروني
+Webpage=الصفحة\\الحاوية
+AddPage=إضافة صفحة\\حاوية
 PageContainer=صفحة
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
-RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
-SiteDeleted=Web site '%s' deleted
-PageContent=Page/Contenair
-PageDeleted=Page/Contenair '%s' of website %s deleted
-PageAdded=Page/Contenair '%s' added
-ViewSiteInNewTab=View site in new tab
-ViewPageInNewTab=View page in new tab
-SetAsHomePage=Set as Home page
-RealURL=Real URL
-ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server (Apache, Nginx, ...) a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong>
-ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
-YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
-YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
-CheckVirtualHostPerms=Check also that the virtual host user (for example www-data) has <strong>%s</strong> permissions on files into<br><strong>%s</strong>
+PreviewOfSiteNotYetAvailable=إستعراض موقعك الإلكتروني <strong>%s</strong> غير متاح الان . عليك اولاً  "<strong>إستيراد قالب موقع إلكتروني </strong>"  او فقط  "<strong>إضافة صفحة\\حاوية</strong>".
+RequestedPageHasNoContentYet=الصفحة المطلوبة بالمعرف  %s لاتحتوي بعد على محتوى ، او ان ملف القالب الخاص بها قد تم حذفه. قم بتعديل محتويات الصفحة لحل ذلك
+SiteDeleted= الموقع "%s" تم حذهف
+PageContent=الصفحة\\الحاوية
+PageDeleted=الصفحة\\الحاوية  "%s" من الموقع الإلكتروني %s تم حذفها
+PageAdded=الصفحة\\الحاوية "%s" تم إضافتها
+ViewSiteInNewTab=عرض الموقع في علامة تبويب جديدة
+ViewPageInNewTab=عرض الصفحة في علامة تبويب جديدة
+SetAsHomePage=إجعلها الصفحة الرئيسية
+RealURL=الرابط الحقيقة
+ViewWebsiteInProduction=عرض الموقع باستخدام رابط الصفحة الرئيسية
+SetHereVirtualHost=<u>بإستخدام اباتشي \\انجنكس\\...</u><br> على خادمك (اباتشي او انجنكس..) قم بإنشاء خادم افتراضي يدعم البي اتش بي واجعل المسار الجذر له<br><strong>%s</strong>
+ExampleToUseInApacheVirtualHostConfig=مثال إعدادات لاستخدامه مع خادم اباتشي افتراضي
+YouCanAlsoTestWithPHPS=<u>لاستخدام خادم بي اتش بي المضمن </u><br>على بيئة التطوير ربما تفضل تجربة موقعك بخادم بي اتش بي المضمن (النسخة 5.5 فما فوق) عبر تشغيل <br><strong> php -S 0.0.0.0:8080 -t %s</strong> 
+YouCanAlsoDeployToAnotherWHP=<u>انشر موقعك الإلكتروني مع مقدم إستضافة اخر</u><br>إذا كنت لا تمتلك خادم مواقع مثل اباتشي او انجنكس على الأنترنت، يمكنك تصدير وإستيراد الى نظام دوليبار اخر المقدم بواسطة مقدم استضافة دوليبار والذي يوفر تكامل مكتمل مع وحدة الموقع الإلكتروني. يمكنك ايجاد قائمة من مقدمين إستضافة دوليبار على <a href="https://saas.dolibarr.org" target="_blank">موقع إستضافات دوليبار</a>
+CheckVirtualHostPerms=ايضاً تأكد من ان مستخدم الخادم (مثلا www-data ) لديه صلاحيات <strong>%s</strong> على الملفات <br><strong>%s</strong>
 ReadPerm=قرأ
-WritePerm=Write
-TestDeployOnWeb=Test/deploy on web
-PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
-VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
-NoPageYet=No pages yet
-YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
-SyntaxHelp=Help on specific syntax tips
-YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-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, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<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 includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&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 a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&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/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+WritePerm=التعديل والكتابة
+TestDeployOnWeb=تجربة \\نشر على الانترنت
+PreviewSiteServedByWebServer=<u>إستعراض %s في علامة تبويب جديدة.</u><br><br> الرابط %s سيتم إنشائه بواسطة خادم خارجي (اباتشي او انجنكس مثلاً). لابد ان تثبت هذا الخادم بنفسك وتقوم بإعداده ليشير الى المسار : <br><strong>%s</strong><br>الرابط المخدوم بواسطة خادم خارجي هو : <br><strong>%s</strong>
+PreviewSiteServedByDolibarr=<u>إستعراض %s في علامة تبويب جديدة.</u><br><br> الرابط %s سيتم إنشائه بواسطة خادم نظام دوليبار وبذالك لا يحتاج لتثبيت خادم خارجي (مثل اباتشي او انجنكس) .<br>المزعج في الامر ان روابط الصفحات صعبة للمستخدمين وستحتوي على مسار نظام دوليبار.<br> الرابط المخدوم بواسطة دوليبار :<br><strong>%s</strong><br><br>لإستخدام خادمك الخاص لتقديم موقعك الإلكتروني قم بأنشاء خادم إفتراضي (كما في اباتشي) واجعله يشير الى المسار<br><strong>%s</strong><br>ثم قم باضافة الرابط في إعدادات الموقع الإلكتروني ثم قم بالضغط على "تجربة\\نشر موقعك الإلكتروني"
+VirtualHostUrlNotDefined=رابط الخادم الافتراضي المخدوم بواسطة خادم خارجي غير معرف
+NoPageYet=لا يوجد صفحات بعد
+YouCanCreatePageOrImportTemplate=يمكنك انشاء صفحة جديدة او إستيراد موقع إلكتروني كامل
+SyntaxHelp=مساعدة ونصائح في تكريب جمل معينة
+YouCanEditHtmlSourceckeditor=يمكن تحرير مصدر  لغة ترميز النصوص التشعبية باستخدام زر "تحرير المصدر" في المحرر
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span>يمكنك تضمين نصوص بي اتش بي بإستخدام أوسمة <strong>&gt;?php?&lt;</strong>.  و المتغيرات العامة التالية متاحة : $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> يمكنك ايضا تضمين محتوى صفحة \\حاوية اخرى عن طريق تركيب الجملة التالي <br><strong>&lt;?php includeContainer('لقب_الصفحة_المطلوبة'); ?&gt; </strong><br><br><span class="fa fa-bug"></span>يمكنك إعادة التوجيه الى صفحة \\حاوية اخرى عن طريق تركيب الجملة التالي (ملاحظة لاتقم باي طباعة لمخرجات قبل عملية إعادة التوجهي ) : <br><strong>&lt;?php redirectToContainer('لقب_الصفحة_المطلوبة'); ?&gt;</strong><br><br><span class="fa fa-link"></span> لإضافة رابط رابط صفحة اخرى يمكنك إستخدام تركيب الجملة التالي :<br><strong> &lt;a href="لقب_الصفحة_المطلوبة.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> لتضمين <strong>رابط لتحميل </strong> ملف موجود ضمن مسار <strong> المستندات </strong> إستخدم المغلف <strong>document.php</strong>:<br> على سبيل المثال لمف موجود على المسار /documents/ecm (يجب تسجيل الدخول اولاً) إستخدم تركيب الجملة التالي :<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br> ولملف في المسار documents/medias (مسار مفتوح الوصول للجميع) إستخدم تركيب الجملة التالي: <br><strong> &lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br> للمفات المشاركة بواسطة رابط المشاركة (وصول مفتوح بإستخدام مفتاح رمز دالة الملف ) إستخدم تركيب الجملة التالي:<br><strong> &lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> لتضمين <strong>صورة </strong> مخزنة في مسار <strong>المستندات</strong> إستخدم المغلف <strong> viewimage.php</strong>: <br> على سبيل المثال لتضمين صورة موجودة في المسار documents/medias (مسار مفتوح الوصول للعامة)، إستخدم تركيب الجملة التالي:<br><strong> &lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 #YouCanEditHtmlSource2=<br><span class="fa fa-picture-o"></span> To include a <strong>image</strong> shared publicaly, use the <strong>viewimage.php</strong> wrapper:<br>Example with a shared key 123456789, syntax is:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
-YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
-YouCanEditHtmlSourceMore=<br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
-ClonePage=Clone page/container
-CloneSite=Clone site
-SiteAdded=Website 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.
-ParentPageId=Parent page ID
-WebsiteId=Website ID
-CreateByFetchingExternalPage=Create page/container by fetching page from external URL...
-OrEnterPageInfoManually=Or create page from scratch or from a page template...
-FetchAndCreate=Fetch and Create
-ExportSite=Export website
-ImportSite=Import website template
-IDOfPage=Id of page
-Banner=Banner
-BlogPost=Blog post
-WebsiteAccount=Website account
+YouCanEditHtmlSource2=لتضمين صورة مشاركة عن طريق رابط المشاركة (وصول عام باستخدام رمز دالة الملف) إستخدم تركيب الجملة التالي:<br><strong> &lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
+YouCanEditHtmlSourceMore=<br>امثلة اكثر  للغة ترميز النصوص التشعبية متاحة على <a href="%s" target="_blank">مدونة التوثيق</a><br>
+ClonePage=نسخ الصفحة\\الحاوية
+CloneSite=نسخ الموقع
+SiteAdded=تم إضافة الموقع الإلكتروني
+ConfirmClonePage=الرجاء ادخال الرمز\\اللقب للصفحة الجديدة او اذا كانت هذه الصفحة هي ترجمة للصفحة المنسوخة
+PageIsANewTranslation=هل الصفحة الجديدة هي ترجمة للصفحة الحالية ؟
+LanguageMustNotBeSameThanClonedPage=لقد نسخت الصفحة كترجمة . لغة الصفحة الجديدة لابد ان تكون مختلفة عن الصفحة المصدر.
+ParentPageId=معرف الصفحة الام
+WebsiteId=معرف الموقع الإلكتروني
+CreateByFetchingExternalPage=إنشاء صفحة\\حاوية عن طريق جلبها من رابط خارجي
+OrEnterPageInfoManually=او انشئ صفحة من البداية او من قالب صفحة..
+FetchAndCreate=جلب و إنشاء
+ExportSite=تصدير الموقع الالكتروني
+ImportSite=إستيراد قالب موقع إلكتروني
+IDOfPage=معرف الصفحة
+Banner=لافتة
+BlogPost=تدوينة
+WebsiteAccount=حساب موقع إلكتروني
 WebsiteAccounts=حسابات الموقع
-AddWebsiteAccount=Create web site account
-BackToListForThirdParty=Back to list for the third-party
-DisableSiteFirst=Disable website first
-MyContainerTitle=My web site title
-AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
-SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
-WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party
-YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting javascript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor may not works correclty when used on a grabbed external page.
-OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
-GrabImagesInto=Grab also images found into css and page.
-ImagesShouldBeSavedInto=Images should be saved into directory
-WebsiteRootOfImages=Root directory for website images
-SubdirOfPage=Sub-directory dedicated to page
-AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
-CorporateHomePage=Corporate Home page
-EmptyPage=Empty page
-ExternalURLMustStartWithHttp=External URL must start with http:// or https://
-ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
-ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
-ShowSubcontainers=Show dynamic content
-InternalURLOfPage=Internal URL of page
-ThisPageIsTranslationOf=This page/container is a translation of
-ThisPageHasTranslationPages=This page/container has translation
-NoWebSiteCreateOneFirst=No website has been created yet. Create one first.
-GoTo=Go to
-DynamicPHPCodeContainsAForbiddenInstruction=You add dynamic PHP code that contains the PHP instruction '<strong>%s</strong>' that is forbidden by default as dynamic content (see hidden options WEBSITE_PHP_ALLOW_xxx to increase list of allowed commands).
-NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynamic content in websites. Ask permission or just keep code into php tags unmodified.
-ReplaceWebsiteContent=Search or Replace website content
-DeleteAlsoJs=Delete also all javascript files specific to this website?
-DeleteAlsoMedias=Delete also all medias files specific to this website?
-MyWebsitePages=My website pages
-SearchReplaceInto=Search | Replace into
-ReplaceString=New string
-CSSContentTooltipHelp=Enter here CSS content. To avoid any conflict with the CSS of the application, be sure to prepend all declaration with the .bodywebsite class. For example:<br><br>#mycssselector, input.myclass:hover { ... }<br>must be<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>Note: If you have a large file without this prefix, you can use 'lessc' to convert it to append the .bodywebsite prefix everywhere.
-LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page.
-Dynamiccontent=Sample of a page with dynamic content
-ImportSite=Import website template
-EditInLineOnOff=Mode 'Edit inline' is %s
-ShowSubContainersOnOff=Mode to execute 'dynamic content' is %s
-GlobalCSSorJS=Global CSS/JS/Header file of web site
-BackToHomePage=Back to home page...
-TranslationLinks=Translation links
-YouTryToAccessToAFileThatIsNotAWebsitePage=You try to access to a page that is not available.<br>(ref=%s, type=%s, status=%s)
-UseTextBetween5And70Chars=For good SEO practices, use a text between 5 and 70 characters
-MainLanguage=Main language
-OtherLanguages=Other languages
-UseManifest=Provide a manifest.json file
-PublicAuthorAlias=Public author alias
-AvailableLanguagesAreDefinedIntoWebsiteProperties=Available languages are defined into website properties
-ReplacementDoneInXPages=Replacement done in %s pages or containers
-RSSFeed=تغذية RSS
-RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL
-PagesRegenerated=%s page(s)/container(s) regenerated
-RegenerateWebsiteContent=Regenerate web site cache files
-AllowedInFrames=Allowed in Frames
-DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
-GenerateSitemaps=Generate website sitemap file
-ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
-ConfirmSitemapsCreation=Confirm sitemap generation
-SitemapGenerated=Sitemap file <b>%s</b> generated
-ImportFavicon=Favicon
-ErrorFaviconType=Favicon must be png
-ErrorFaviconSize=Favicon must be sized 16x16, 32x32 or 64x64
-FaviconTooltip=Upload an image which needs to be a png (16x16, 32x32 or 64x64)
+AddWebsiteAccount=إنشاء حساب موقع إلكتروني
+BackToListForThirdParty=عودة الى قائمة الاطراف الثالثة
+DisableSiteFirst=عطل الموقع الإلكتروني اولاً
+MyContainerTitle=عنوان موقعي
+AnotherContainer=هذه هي الطريقة لتضمين محتوى صفحة\\حاوية اخرى (ربما يظهر لك خطأ عند تمكين المحتوى المتحرك وذلك لان الحاوية الجزئية المضمنة غير موجودة!)
+SorryWebsiteIsCurrentlyOffLine=للأسف، هذا الموقع غير متصل حاليا. يرجى العودة في وقت لاحق...
+WEBSITE_USE_WEBSITE_ACCOUNTS=تمكين جدول الموقع الالكتروني
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=تمكين جدول لتخزين حسابات الموقع الإلكتروني (إسم المستخدم\\كلمة السر) لكل موقع إلكتروني \\ طرف ثالث
+YouMustDefineTheHomePage=لابد ان تُعرف الصفحة الرئيسية المبدئية اولاً
+OnlyEditionOfSourceForGrabbedContentFuture=تحذير: إنشاء صفحة عن طريق جلبها من صفحة خارجية هي خاصية للمستخديمن المتمرسين. إعتماداً على تعقيد مصدر الصفحة ، نتيجة الجلب قد تختلف من الاصل. ايضا قد تستخدم الصفحة الاصل ملفات مظهر متعارضة او جافاسكربت تؤدي الى تعطل مظهر الصفحة او تعطل خصائص محرر صفحات الموقع الإلكتروني عند العمل على الصفحة. هذه الخاصية اسرع عند إنشاء الصفحات لكن من المستحسن إنشاء صفحة جديدة من البداية او من قالب صفحة .<br> لاحظ ايضا ان التحرير على السطر قد لا يعمل بصورة صحيحة عند العمل على الصفحة المجلوبة.
+OnlyEditionOfSourceForGrabbedContent=يتاح فقط مصدر لغة ترميز النصوص التشعبية عند الأستجلاب من موقع خارجي
+GrabImagesInto=جلب الصور الموجودة في الصفحة او في ملف المظهر ايضاً.
+ImagesShouldBeSavedInto=يجب ان تُحفظ الصور في مسار
+WebsiteRootOfImages=المسار الجذر لصور الموقع الإلكتروني
+SubdirOfPage=مسار فرعي مخصص للصفحة
+AliasPageAlreadyExists=لقب الصفحة <strong>%s</strong> موجود مسبقاً
+CorporateHomePage=الصفحة الرئيسية للمؤسسة
+EmptyPage=صفحة فارغة
+ExternalURLMustStartWithHttp=العنوان الخارجي لابد ان يبدأ ب http:// او https://
+ZipOfWebsitePackageToImport=قم برفع الملف المضغوط لقالب الموقع الإلكتروني
+ZipOfWebsitePackageToLoad=او إختر قالب موقع إلكتروني متاحا من القوالب المضمنة
+ShowSubcontainers=إظهار المحتوى المتحرك
+InternalURLOfPage=العنوان الداخلي للصفحة
+ThisPageIsTranslationOf=الصفخة\\الحاوية هي ترجمة لـ
+ThisPageHasTranslationPages=هذه الصفحة \\الحاوية لديها ترجمة
+NoWebSiteCreateOneFirst=لم يتم إنشاء موقع إلكتروني . قم بإنشاء واحد اولاً
+GoTo=ذهاب الى
+DynamicPHPCodeContainsAForbiddenInstruction=لقد اضفت ترميز نص بي اتش بي والذي يحتوي على التعليمة "<strong>%s</strong>" وهو ممنوع إبتداءاً في المحتوى المتحرك (راجع الخيار المخفي WEBSITE_PHP_ALLOW_xxx لزيادة قائمة التلعيمات المسموح بها).
+NotAllowedToAddDynamicContent=ليس لديك إذن لإضافة او تعديل محتوى بي اتش بي متحرك في المواقع الإلكترونية. اطلب اذناً او حافظ على الترميز داخل رموز بي اتش بي بدون تعديل
+ReplaceWebsiteContent=بحث او إستبدال محتوى الموقع
+DeleteAlsoJs=حذف جميع ملفات الجافا سكربت الخاصة بهذا الموقع الإلكتروني ؟
+DeleteAlsoMedias=حذف محتويات الاستديو الخاصة بهذا الموقع الإلكتروني ؟
+MyWebsitePages=صفحات موقعي الإلكتروني
+SearchReplaceInto=بحث|إستبدال
+ReplaceString=النص البديل
+CSSContentTooltipHelp=ادخل هنا محتوى نصوص المظهر المتشعبة . لتجنب اي تعارض مع ملفات مظهر لتطبيقات اخرى تأكد من إستباق جميع التعريفات بالفئة .bodywebsite  . على بيل المثال :<br><br>#mycssselector, input.myclass:hover { ... }<br> لابد ان تكتب <br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>ملاحظة : إذا كان لديك ملف كبير بدون السابقة يمكنك إستخدام lessc لتحويل الملف وإضافة السابقة .bodywebsite في كل مكان.
+LinkAndScriptsHereAreNotLoadedInEditor=تحذير : هذا المحتوى هو المخرجات فقط عند الوصول للموقع من جهة الخادم. وهو ليس المحتوى المستخدم في وضع التعديل لذلك اذا كنت تريد تحميل ملف جافاسكربت في وضع التعديل فقط اضف وسمك 'script src=...' للصفحة
+Dynamiccontent=مثال على صفحة مع محتوى متحرك
+ImportSite=إستيراد قالب موقع إلكتروني
+EditInLineOnOff=وضع التعديل على السطر %s
+ShowSubContainersOnOff=وضع تنفيذ المحتوى المتحرك %s
+GlobalCSSorJS=ملف ترويسات المظهر\\جافاسكربت للموقع الإلكتروني
+BackToHomePage=عودة الى الصفحة الرئيسية
+TranslationLinks=روابط الترجمة
+YouTryToAccessToAFileThatIsNotAWebsitePage=انت تحاول الوصول الى صفحة غير متاحة <br>(مرجع=%s،النوع=%s،الحالة=%s)
+UseTextBetween5And70Chars=لافضل إستخدام لتسريع محركات البحث، إستخدم نص ما بين 5 و 70 حرف.
+MainLanguage=اللغة الرئيسية
+OtherLanguages=لغات اخرى
+UseManifest=تقديم ملف قائمة جسون
+PublicAuthorAlias=لقب المحرر العام
+AvailableLanguagesAreDefinedIntoWebsiteProperties=اللغات المتاحة معرفة في خصائص الموقع الإلكتروني
+ReplacementDoneInXPages=تم الاستبدال في %s صفحة او حاوية
+RSSFeed=خلاصات المقالات
+RSSFeedDesc=يمكنك الحصول على خلاصات المقالات من النوع "مدونة" بإستخدام الرابط
+PagesRegenerated=تم توليد %s صفحة\\حاوية
+RegenerateWebsiteContent=إعادة توليد ملفات الموقع الإلكترونية المؤقتة 
+AllowedInFrames=مسموح بها في الإطارات
+DefineListOfAltLanguagesInWebsiteProperties=عرف قائمة بكل اللغات المتاحة في خصائص الموقع
+GenerateSitemaps=توليد ملف خريطة الموقع
+ConfirmGenerateSitemaps=إذا اكدت ، ستقوم بحذف ملف خرطة الموقع الحالي...
+ConfirmSitemapsCreation=تأكيد توليد خريطة الموقع
+SitemapGenerated=تم توليد ملف خريطة الموقع <b>%s</b>
+ImportFavicon=الايقونة
+ErrorFaviconType=الأيقونة لابد ان تكون بي ان جي
+ErrorFaviconSize=لابد ان يكون حجم الأيقونة 16x16 ، 32x32 او 64x64 
+FaviconTooltip=رفع صورة بي ان جي (16x16،32x32 او 64x64)
diff --git a/htdocs/langs/az_AZ/accountancy.lang b/htdocs/langs/az_AZ/accountancy.lang
index 354cddb62c2..27be673dd9c 100644
--- a/htdocs/langs/az_AZ/accountancy.lang
+++ b/htdocs/langs/az_AZ/accountancy.lang
@@ -158,7 +158,7 @@ ACCOUNTING_LENGTH_AACCOUNT=Length of the third-party accounting accounts (If you
 ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of an accounting account. Needed by some countries (like Switzerland). If set to off (default), you can set the following two parameters to ask the application to add virtual zeros.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties, break ability to search on a part of value)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
@@ -328,6 +328,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountanc
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
+NotifiedExportDate=Notified export date (modification of the entries will not be possible)
+NotifiedValidationDate=Validation of the entries (modification or deletion of the entries will not be possible)
+ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=Export draft journal
 Modelcsv=Model of export
 Selectmodelcsv=Select a model of export
diff --git a/htdocs/langs/az_AZ/admin.lang b/htdocs/langs/az_AZ/admin.lang
index fb4513a09b4..be9aca94599 100644
--- a/htdocs/langs/az_AZ/admin.lang
+++ b/htdocs/langs/az_AZ/admin.lang
@@ -221,8 +221,8 @@ NotCompatible=This module does not seem compatible with your Dolibarr %s (Min %s
 CompatibleAfterUpdate=This module requires an update to your Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=See in Market place
 SeeSetupOfModule=See setup of module %s
+SetOptionTo=Set option <b>%s</b> to %s
 Updated=Updated
-Nouveauté=Novelty
 AchatTelechargement=Buy / Download
 GoModuleSetupArea=To deploy/install a new module, go to the Module setup area: <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
@@ -399,6 +399,7 @@ SecurityToken=Key to secure URLs
 NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
 PDF=PDF
 PDFDesc=Global options for PDF generation
+PDFOtherDesc=PDF Option specific to some modules
 PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
 PDFRulesForSalesTax=Rules for Sales Tax / VAT
@@ -561,7 +562,7 @@ Module53Desc=Management of Services
 Module54Name=Contracts/Subscriptions
 Module54Desc=Management of contracts (services or recurring subscriptions)
 Module55Name=Barcodes
-Module55Desc=Barcode management
+Module55Desc=Barcode or QR code management
 Module56Name=Payment by credit transfer
 Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
 Module57Name=Payments by Direct Debit
@@ -848,10 +849,10 @@ Permission402=Create/modify discounts
 Permission403=Validate discounts
 Permission404=Delete discounts
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries (yours and subordinates)
-Permission512=Create/modify payments of salaries
-Permission514=Delete payments of salaries
-Permission517=Read payments of salaries of everybody
+Permission511=Read salaries and payments (yours and subordinates)
+Permission512=Create/modify salaries and payments
+Permission514=Delete salaries and payments
+Permission517=Read salaries and payments everybody
 Permission519=Export salaries
 Permission520=Read Loans
 Permission522=Create/modify loans
@@ -965,6 +966,8 @@ Permission23003=Delete Scheduled job
 Permission23004=Execute Scheduled job
 Permission50101=Use Point of Sale (SimplePOS)
 Permission50151=Use Point of Sale (TakePOS)
+Permission50152=Edit sales lines
+Permission50153=Edit ordered sales lines
 Permission50201=Read transactions
 Permission50202=Import transactions
 Permission50330=Read objects of Zapier
@@ -1039,11 +1042,12 @@ DictionaryMeasuringUnits=Measuring Units
 DictionarySocialNetworks=Social Networks
 DictionaryProspectStatus=Prospect status for companies
 DictionaryProspectContactStatus=Prospect status for contacts
-DictionaryHolidayTypes=Types of leave
+DictionaryHolidayTypes=Leave - Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
 DictionaryTransportMode=Intracomm report - Transport mode
+DictionaryBatchStatus=Product lot/serial Quality Control status
 TypeOfUnit=Type of unit
 SetupSaved=Setup saved
 SetupNotSaved=Setup not saved
@@ -1187,7 +1191,7 @@ SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of m
 SetupDescription5=Other Setup menu entries manage optional parameters.
 AuditedSecurityEvents=Security events that are audited
 NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
-Audit=Audit
+Audit=Security events
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
 InfoOS=About OS
@@ -1319,9 +1323,12 @@ ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
 NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
+ComboListOptim=Combo list loading optimization
 SearchOptim=Search optimization
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
-YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
+YouHaveXObjectUseComboOptim=You have %s %s in the database. You can go into setup of module to enable loading of combo list on key pressed event.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other.
+YouHaveXObjectUseSearchOptimDesc=This limits the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to %s in Home-Setup-Other.
 BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
 BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
 PHPModuleLoaded=PHP component %s is loaded
@@ -1433,6 +1440,7 @@ MemberMainOptions=Main options
 AdherentLoginRequired= Manage a Login for each member
 AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
+MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
 MembersDocModules=Document templates for documents generated from member record
@@ -1763,7 +1771,7 @@ AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting men
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
-AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the scheduled job %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
@@ -1979,6 +1987,8 @@ 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_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add picture on proposal line
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add electronic sign in PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
@@ -2096,7 +2106,6 @@ PDF_SHOW_PROJECT=Show project on document
 ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
-FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
@@ -2120,12 +2129,18 @@ ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by
 MailToSendEventOrganization=Event Organization
 AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
 YouShouldDisablePHPFunctions=You should disable PHP functions
-IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands in custom code, you shoud disable PHP functions
+PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
+NotRecommended=Not recommanded
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
 ModuleUpdateAvailable=An update is available
 NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
+RandomlySelectedIfSeveral=Randomly selected if several pictures are available
+DatabasePasswordObfuscated=Database password is obfuscated in conf file
+DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
diff --git a/htdocs/langs/az_AZ/agenda.lang b/htdocs/langs/az_AZ/agenda.lang
index 09d82139a49..a1183841b00 100644
--- a/htdocs/langs/az_AZ/agenda.lang
+++ b/htdocs/langs/az_AZ/agenda.lang
@@ -4,7 +4,7 @@ Actions=Events
 Agenda=Agenda
 TMenuAgenda=Agenda
 Agendas=Agendas
-LocalAgenda=Internal calendar
+LocalAgenda=Default calendar
 ActionsOwnedBy=Event owned by
 ActionsOwnedByShort=Owner
 AffectedTo=Assigned to
@@ -14,13 +14,13 @@ EventsNb=Number of events
 ListOfActions=List of events
 EventReports=Event reports
 Location=Location
-ToUserOfGroup=Event assigned to any user in group
+ToUserOfGroup=Event assigned to any user in the group
 EventOnFullDay=Event on all day(s)
 MenuToDoActions=All incomplete events
 MenuDoneActions=All terminated events
 MenuToDoMyActions=My incomplete events
 MenuDoneMyActions=My terminated events
-ListOfEvents=List of events (internal calendar)
+ListOfEvents=List of events (default calendar)
 ActionsAskedBy=Events reported by
 ActionsToDoBy=Events assigned to
 ActionsDoneBy=Events done by
@@ -38,6 +38,7 @@ ActionsEvents=Events for which Dolibarr will create an action in agenda automati
 EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Third party %s created
+COMPANY_MODIFYInDolibarr=Third party %s modified
 COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=Contract %s validated
 CONTRACT_DELETEInDolibarr=Contract %s deleted
@@ -87,6 +88,7 @@ OrderDeleted=Order deleted
 InvoiceDeleted=Invoice deleted
 DraftInvoiceDeleted=Draft invoice deleted
 CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_MODIFYInDolibarr=Contact %s modified
 CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Product %s created
 PRODUCT_MODIFYInDolibarr=Product %s modified
@@ -119,6 +121,7 @@ MRP_MO_UNVALIDATEInDolibarr=MO set to draft status
 MRP_MO_PRODUCEDInDolibarr=MO produced
 MRP_MO_DELETEInDolibarr=MO deleted
 MRP_MO_CANCELInDolibarr=MO canceled
+PAIDInDolibarr=%s paid
 ##### End agenda events #####
 AgendaModelModule=Document templates for event
 DateActionStart=Start date
@@ -130,7 +133,7 @@ AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to use
 AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
 AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic events.
 AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> to include events of holidays.
-AgendaShowBirthdayEvents=Show birthdays of contacts
+AgendaShowBirthdayEvents=Birthdays of contacts
 AgendaHideBirthdayEvents=Hide birthdays of contacts
 Busy=Busy
 ExportDataset_event1=List of agenda events
@@ -152,6 +155,7 @@ ActionType=Event type
 DateActionBegin=Start event date
 ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b>?
 RepeatEvent=Repeat event
+OnceOnly=Once only
 EveryWeek=Every week
 EveryMonth=Every month
 DayOfMonth=Day of month
@@ -165,4 +169,4 @@ TimeType=Duration type
 ReminderType=Callback type
 AddReminder=Create an automatic reminder notification for this event
 ErrorReminderActionCommCreation=Error creating the reminder notification for this event
-BrowserPush=Browser Notification
+BrowserPush=Browser Popup Notification
diff --git a/htdocs/langs/az_AZ/bills.lang b/htdocs/langs/az_AZ/bills.lang
index c55f483873b..7b8c997d2e6 100644
--- a/htdocs/langs/az_AZ/bills.lang
+++ b/htdocs/langs/az_AZ/bills.lang
@@ -259,6 +259,7 @@ DateMaxPayment=Payment due on
 DateInvoice=Invoice date
 DatePointOfTax=Point of tax
 NoInvoice=No invoice
+NoOpenInvoice=No open invoice
 ClassifyBill=Classify invoice
 SupplierBillsToPay=Unpaid vendor invoices
 CustomerBillsUnpaid=Unpaid customer invoices
@@ -589,3 +590,4 @@ FacParentLine=Invoice Line Parent
 SituationTotalRayToRest=Remainder to pay without taxe
 PDFSituationTitle=Situation n° %d
 SituationTotalProgress=Total progress %d %%
+SearchUnpaidInvoicesWithDueDate=Search unpaid invoices with a due date = %s
diff --git a/htdocs/langs/az_AZ/cashdesk.lang b/htdocs/langs/az_AZ/cashdesk.lang
index 240503842f3..aea1f02f834 100644
--- a/htdocs/langs/az_AZ/cashdesk.lang
+++ b/htdocs/langs/az_AZ/cashdesk.lang
@@ -102,7 +102,7 @@ CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal numb
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
 SaleStartedAt=Sale started at %s
-ControlCashOpening=Control cash popup at opening POS
+ControlCashOpening=Open the "Control cash" popup when opening the POS
 CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -126,5 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
-ShowPriceHT = Display the price excluding tax column
-ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
+ShowPriceHT = Display the column with the price excluding tax (on screen)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
diff --git a/htdocs/langs/az_AZ/compta.lang b/htdocs/langs/az_AZ/compta.lang
index 7cae82e6ac7..8329346c163 100644
--- a/htdocs/langs/az_AZ/compta.lang
+++ b/htdocs/langs/az_AZ/compta.lang
@@ -286,3 +286,9 @@ ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
 IncludeLoansInResults = Include loans in reports
+InvoiceLate30Days = Invoices late > 30 days
+InvoiceLate15Days = Invoices late > 15 days
+InvoiceLateMinus15Days = Invoices late
+InvoiceNotLate = To be collected < 15 days
+InvoiceNotLate15Days = To be collected in 15 days
+InvoiceNotLate30Days = To be collected in 30 days
diff --git a/htdocs/langs/az_AZ/cron.lang b/htdocs/langs/az_AZ/cron.lang
index 2ebdda1e685..4fd2220dea6 100644
--- a/htdocs/langs/az_AZ/cron.lang
+++ b/htdocs/langs/az_AZ/cron.lang
@@ -60,7 +60,7 @@ CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
 CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Disable
-CronTaskInactive=This job is disabled
+CronTaskInactive=This job is disabled (not scheduled)
 CronId=Id
 CronClassFile=Filename with class
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example 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>
diff --git a/htdocs/langs/az_AZ/errors.lang b/htdocs/langs/az_AZ/errors.lang
index 9b14b5ad1d2..670f8c7a6bc 100644
--- a/htdocs/langs/az_AZ/errors.lang
+++ b/htdocs/langs/az_AZ/errors.lang
@@ -11,6 +11,7 @@ ErrorBadValueForParamNotAString=Bad value for your parameter. It appends general
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s already exists.
 ErrorGroupAlreadyExists=Group %s already exists.
+ErrorEmailAlreadyExists=Email %s already exists.
 ErrorRecordNotFound=Record not found.
 ErrorFailToCopyFile=Failed to copy file '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
@@ -117,7 +118,7 @@ ErrorCantReadFile=Failed to read file '%s'
 ErrorCantReadDir=Failed to read directory '%s'
 ErrorBadLoginPassword=Bad value for login or password
 ErrorLoginDisabled=Your account has been disabled
-ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server. If PHP <b>Safe Mode</b> is enabled, check that command is inside a directory defined by parameter <b>safe_mode_exec_dir</b>.
+ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server user. Check also the command is not protected on shell level by a security layer like apparmor.
 ErrorFailedToChangePassword=Failed to change password
 ErrorLoginDoesNotExists=User with login <b>%s</b> could not be found.
 ErrorLoginHasNoEmail=This user has no email address. Process aborted.
@@ -262,6 +263,7 @@ ErrorDateIsInFuture=Error, the date can't be in the future
 ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
 ErrorAPercentIsRequired=Error, please fill in the percentage correctly
 ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
+ErrorFailedToFindEmailTemplate=Failed to find template with code name %s
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -298,3 +300,4 @@ WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So y
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
+ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
diff --git a/htdocs/langs/az_AZ/eventorganization.lang b/htdocs/langs/az_AZ/eventorganization.lang
index 75b798fbc3a..335c257b224 100644
--- a/htdocs/langs/az_AZ/eventorganization.lang
+++ b/htdocs/langs/az_AZ/eventorganization.lang
@@ -1,4 +1,5 @@
 # Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+# Copyright (C) 2021		Dorian Vabre			<dorian.vabre@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
@@ -81,7 +82,10 @@ PriceOfBoothHelp=Subscription price to stand a booth
 EventOrganizationICSLink=Link ICS for events
 ConferenceOrBoothInformation=Conference Or Booth informations
 Attendees = Attendees
+DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
 #
 # Status
 #
@@ -94,8 +98,46 @@ EvntOrgCancelled = Cancelled
 #
 # Public page
 #
+SuggestForm = Suggestion page
+RegisterPage = Page for conferences or booth
+EvntOrgRegistrationHelpMessage = Here, you can vote for an event, or suggest a new conference or booth for the project
+EvntOrgRegistrationConfHelpMessage = Here, you can suggest a new conference for the project
+EvntOrgRegistrationBoothHelpMessage = Here, you can suggest a new booth for the project
+ListOfSuggestedConferences = List of suggested conferences
+ListOfSuggestedBooths = List of suggested booths
+SuggestConference = Suggest a new conference
+SuggestBooth = Suggest a booth
+ViewAndVote = View and vote for suggested events
 PublicAttendeeSubscriptionPage = Public link of registration to a conference
 MissingOrBadSecureKey = The security key is invalid or missing
-EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
-EvntOrgStartDuration = This conference starts on
-EvntOrgEndDuration =  and ends on
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference : '%s'
+EvntOrgDuration = This conference starts on %s and ends on %s.
+ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
+BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
+EventType = Event type
+
+#
+# Vote page
+#
+EvntOrgRegistrationWelcomeMessage = Welcome on the conference or booth suggestion page.
+EvntOrgRegistrationConfWelcomeMessage = Welcome on the conference suggestion page.
+EvntOrgRegistrationBoothWelcomeMessage = Welcome on the booth suggestion page.
+EvntOrgVoteHelpMessage = Here, you can view and vote for the suggested events for the project
+VoteOk = Your vote has been accepted.
+AlreadyVoted = You have already voted for this event.
+VoteError = An error has occurred during the vote, please try again.
+
+#
+# SubscriptionOk page
+#
+SubscriptionOk = Your subscription to this conference has been validated
+#
+# Subscription validation mail
+#
+ConfAttendeeSubscriptionConfirmation = Confirmation of your subscription to a conference
+#
+# Payment page
+#
+Attendee = Attendee
+PaymentConferenceAttendee = Conference attendee payment
+PaymentBoothLocation = Booth location payment
diff --git a/htdocs/langs/az_AZ/hrm.lang b/htdocs/langs/az_AZ/hrm.lang
index 3b8f137e103..da098e10bdb 100644
--- a/htdocs/langs/az_AZ/hrm.lang
+++ b/htdocs/langs/az_AZ/hrm.lang
@@ -9,7 +9,7 @@ ConfirmDeleteEstablishment=Are you sure you wish to delete this establishment?
 OpenEtablishment=Open establishment
 CloseEtablishment=Close establishment
 # Dictionary
-DictionaryPublicHolidays=HRM - Public holidays
+DictionaryPublicHolidays=Leave - Public holidays
 DictionaryDepartment=HRM - Department list
 DictionaryFunction=HRM - Job positions
 # Module
diff --git a/htdocs/langs/az_AZ/knowledgemanagement.lang b/htdocs/langs/az_AZ/knowledgemanagement.lang
index 269007e60f8..68f5cced76c 100644
--- a/htdocs/langs/az_AZ/knowledgemanagement.lang
+++ b/htdocs/langs/az_AZ/knowledgemanagement.lang
@@ -47,7 +47,7 @@ KnowledgeManagementArea = Knowledge Management
 # Menu
 #
 MenuKnowledgeRecord = Knowledge base
-ListOfArticles = List of articles
+ListKnowledgeRecord = List of articles
 NewKnowledgeRecord = New article
 ValidateReply = Validate solution
 KnowledgeRecords = Articles
diff --git a/htdocs/langs/az_AZ/languages.lang b/htdocs/langs/az_AZ/languages.lang
index ba187326705..da8ad5376a1 100644
--- a/htdocs/langs/az_AZ/languages.lang
+++ b/htdocs/langs/az_AZ/languages.lang
@@ -3,6 +3,7 @@ Language_am_ET=Ethiopian
 Language_ar_AR=Arabic
 Language_ar_EG=Arabic (Egypt)
 Language_ar_SA=Arabic
+Language_ar_TN=Arabic (Tunisia)
 Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengali
 Language_bn_IN=Bengali (India)
@@ -84,6 +85,7 @@ Language_nl_NL=Dutch
 Language_pl_PL=Polish
 Language_pt_BR=Portuguese (Brazil)
 Language_pt_PT=Portuguese
+Language_ro_MD=Romanian (Moldavia)
 Language_ro_RO=Romanian
 Language_ru_RU=Russian
 Language_ru_UA=Russian (Ukraine)
diff --git a/htdocs/langs/az_AZ/main.lang b/htdocs/langs/az_AZ/main.lang
index 13793aad13f..863b94af564 100644
--- a/htdocs/langs/az_AZ/main.lang
+++ b/htdocs/langs/az_AZ/main.lang
@@ -430,6 +430,7 @@ LT1IN=CGST
 LT2IN=SGST
 LT1GC=Additionnal cents
 VATRate=Tax Rate
+RateOfTaxN=Rate of tax %s
 VATCode=Tax Rate code
 VATNPR=Tax Rate NPR
 DefaultTaxRate=Default tax rate
@@ -729,6 +730,7 @@ MenuMembers=Members
 MenuAgendaGoogle=Google agenda
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
+ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
 NoFileFound=No documents uploaded
 CurrentUserLanguage=Current language
 CurrentTheme=Current theme
@@ -1072,6 +1074,7 @@ ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
 ToClose=To close
+ToRefuse=To refuse
 ToProcess=To process
 ToApprove=To approve
 GlobalOpenedElemView=Global view
@@ -1126,9 +1129,11 @@ UpdateForAllLines=Update for all lines
 OnHold=On hold
 Civility=Civility
 AffectTag=Affect Tag
+CreateExternalUser=Create external user
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
 ConfirmCancel=Are you sure you want to cancel
+EmailMsgID=Email MsgID
diff --git a/htdocs/langs/az_AZ/members.lang b/htdocs/langs/az_AZ/members.lang
index 042b85598c0..d8b9c2f59f3 100644
--- a/htdocs/langs/az_AZ/members.lang
+++ b/htdocs/langs/az_AZ/members.lang
@@ -213,3 +213,5 @@ SendReminderForExpiredSubscription=Send reminder by email to members when subscr
 MembershipPaid=Membership paid for current period (until %s)
 YouMayFindYourInvoiceInThisEmail=You may find your invoice attached to this email
 XMembersClosed=%s member(s) closed
+XExternalUserCreated=%s external user(s) created
+ForceMemberNature=Force member nature (Individual or Corporation)
diff --git a/htdocs/langs/az_AZ/modulebuilder.lang b/htdocs/langs/az_AZ/modulebuilder.lang
index 9fdaa1a533a..23a098be2e5 100644
--- a/htdocs/langs/az_AZ/modulebuilder.lang
+++ b/htdocs/langs/az_AZ/modulebuilder.lang
@@ -143,3 +143,4 @@ AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
 ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
+ImportExportProfiles=Import and export profiles
diff --git a/htdocs/langs/az_AZ/mrp.lang b/htdocs/langs/az_AZ/mrp.lang
index ec999a473a4..2414a92cefb 100644
--- a/htdocs/langs/az_AZ/mrp.lang
+++ b/htdocs/langs/az_AZ/mrp.lang
@@ -8,12 +8,12 @@ MenuBOM=Bills of material
 LatestBOMModified=Latest %s Bills of materials modified
 LatestMOModified=Latest %s Manufacturing Orders modified
 Bom=Bills of Material
-BillOfMaterials=Bill of Material
+BillOfMaterials=Bill of Materials
 BOMsSetup=Setup of module BOM
 ListOfBOMs=List of bills of material - BOM
 ListOfManufacturingOrders=List of Manufacturing Orders
-NewBOM=New bill of material
-ProductBOMHelp=Product to create with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
+NewBOM=New bill of materials
+ProductBOMHelp=Product to create (or disassemble) with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
 BOMsNumberingModules=BOM numbering templates
 BOMsModelModule=BOM document templates
 MOsNumberingModules=MO numbering templates
@@ -22,7 +22,7 @@ FreeLegalTextOnBOMs=Free text on document of BOM
 WatermarkOnDraftBOMs=Watermark on draft BOM
 FreeLegalTextOnMOs=Free text on document of MO
 WatermarkOnDraftMOs=Watermark on draft MO
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials %s ?
 ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
 ManufacturingEfficiency=Manufacturing efficiency
 ConsumptionEfficiency=Consumption efficiency
@@ -30,8 +30,8 @@ ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the produc
 ValueOfMeansLossForProductProduced=Value of 0.95 means an average of 5%% of loss of produced product
 DeleteBillOfMaterials=Delete Bill Of Materials
 DeleteMo=Delete Manufacturing Order
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Materials?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Materials?
 MenuMRP=Manufacturing Orders
 NewMO=New Manufacturing Order
 QtyToProduce=Qty to produce
@@ -39,7 +39,7 @@ DateStartPlannedMo=Date start planned
 DateEndPlannedMo=Date end planned
 KeepEmptyForAsap=Empty means 'As Soon As Possible'
 EstimatedDuration=Estimated duration
-EstimatedDurationDesc=Estimated duration to manufacture this product using this BOM
+EstimatedDurationDesc=Estimated duration to manufacture (or disassemble) this product using this BOM
 ConfirmValidateBom=Are you sure you want to validate the BOM with the reference <strong>%s</strong> (you will be able to use it to build new Manufacturing Orders)
 ConfirmCloseBom=Are you sure you want to cancel this BOM (you won't be able to use it to build new Manufacturing Orders anymore) ?
 ConfirmReopenBom=Are you sure you want to re-open this BOM (you will be able to use it to build new Manufacturing Orders)
@@ -63,13 +63,14 @@ ConsumeAndProduceAll=Consume and Produce All
 Manufactured=Manufactured
 TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
 ForAQuantityOf=For a quantity to produce of %s
+ForAQuantityToConsumeOf=For a quantity to disassemble of %s
 ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
 ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
 ProductionForRef=Production of %s
 AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
 NoStockChangeOnServices=No stock change on services
 ProductQtyToConsumeByMO=Product quantity still to consume by open MO
-ProductQtyToProduceByMO=Product quentity still to produce by open MO
+ProductQtyToProduceByMO=Product quantity still to produce by open MO
 AddNewConsumeLines=Add new line to consume
 ProductsToConsume=Products to consume
 ProductsToProduce=Products to produce
@@ -83,15 +84,13 @@ Workstations=Workstations
 WorkstationsDescription=Workstations management
 WorkstationSetup = Workstations setup
 WorkstationSetupPage = Workstations setup page
-WorkstationAbout = About Workstation
-WorkstationAboutPage = Workstations about page
 WorkstationList=Workstation list
 WorkstationCreate=Add new workstation
 ConfirmEnableWorkstation=Are you sure you want to enable workstation <b>%s</b> ?
 EnableAWorkstation=Enable a workstation
 ConfirmDisableWorkstation=Are you sure you want to disable workstation <b>%s</b> ?
 DisableAWorkstation=Disable a workstation
-DeleteWorkstation=Supprimer
+DeleteWorkstation=Delete
 NbOperatorsRequired=Number of operators required
 THMOperatorEstimated=Estimated operator THM
 THMMachineEstimated=Estimated machine THM
diff --git a/htdocs/langs/az_AZ/orders.lang b/htdocs/langs/az_AZ/orders.lang
index 87d196eb22f..5dab5b99bf1 100644
--- a/htdocs/langs/az_AZ/orders.lang
+++ b/htdocs/langs/az_AZ/orders.lang
@@ -11,6 +11,7 @@ OrderDate=Order date
 OrderDateShort=Order date
 OrderToProcess=Order to process
 NewOrder=New order
+NewSupplierOrderShort=New order
 NewOrderSupplier=New Purchase Order
 ToOrder=Make order
 MakeOrder=Make order
@@ -73,6 +74,7 @@ DeleteOrder=Delete order
 CancelOrder=Cancel order
 OrderReopened= Order %s re-open
 AddOrder=Create order
+AddSupplierOrderShort=Create order
 AddPurchaseOrder=Create purchase order
 AddToDraftOrders=Add to draft order
 ShowOrder=Show order
diff --git a/htdocs/langs/az_AZ/other.lang b/htdocs/langs/az_AZ/other.lang
index 95297a98859..bb35099ab82 100644
--- a/htdocs/langs/az_AZ/other.lang
+++ b/htdocs/langs/az_AZ/other.lang
@@ -129,6 +129,7 @@ ClosedByLogin=User login who closed
 FileWasRemoved=File %s was removed
 DirWasRemoved=Directory %s was removed
 FeatureNotYetAvailable=Feature not yet available in the current version
+FeatureNotAvailableOnDevicesWithoutMouse=Feature not available on devices without mouse
 FeaturesSupported=Supported features
 Width=Width
 Height=Height
@@ -263,7 +264,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
-PrefixSession=Prefix for session ID
+SuffixSessionName=Suffix for session name
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/az_AZ/partnership.lang b/htdocs/langs/az_AZ/partnership.lang
index 09059995a8d..2fb10e8159e 100644
--- a/htdocs/langs/az_AZ/partnership.lang
+++ b/htdocs/langs/az_AZ/partnership.lang
@@ -16,41 +16,72 @@
 #
 # Generic
 #
-ModulePartnershipName = Partnership management
-PartnershipDescription = Module Partnership management
+ModulePartnershipName=Partnership management
+PartnershipDescription=Module Partnership management
 PartnershipDescriptionLong= Module Partnership management
 
+AddPartnership=Add partnership
+CancelPartnershipForExpiredMembers=Partnership: Cancel partnership of members with expired subscriptions
+PartnershipCheckBacklink=Partnership: Check referring backlink
+
 #
 # Menu
 #
-NewPartnership = New Partnership
-ListOfPartnerships = List of partnership
+NewPartnership=New Partnership
+ListOfPartnerships=List of partnership
 
 #
 # Admin page
 #
-PartnershipSetup = Partnership setup
-PartnershipAbout = About Partnership
-PartnershipAboutPage = Partnership about page
-
+PartnershipSetup=Partnership setup
+PartnershipAbout=About Partnership
+PartnershipAboutPage=Partnership about page
+partnershipforthirdpartyormember=Partner status must be set on a 'thirdparty' or a 'member'
+PARTNERSHIP_IS_MANAGED_FOR=Partnership managed for
+PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks to check
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb of days before cancelling status of a partnership when a subscription has expired
+ReferingWebsiteCheck=Check of website referring
+ReferingWebsiteCheckDesc=You can enable a feature to check that your partners has added a backlink to your website domains on their own website.
 
 #
 # Object
 #
+DeletePartnership=Delete a partnership
+PartnershipDedicatedToThisThirdParty=Partnership dedicated to this third party
+PartnershipDedicatedToThisMember=Partnership dedicated to this member
 DatePartnershipStart=Start date
 DatePartnershipEnd=End date
+ReasonDecline=Decline reason
+ReasonDeclineOrCancel=Decline reason
+PartnershipAlreadyExist=Partnership already exist
+ManagePartnership=Manage partnership
+BacklinkNotFoundOnPartnerWebsite=Backlink not found on partner website
+ConfirmClosePartnershipAsk=Are you sure you want to cancel this partnership?
+PartnershipType=Partnership type
 
 #
 # Template Mail
 #
+SendingEmailOnPartnershipWillSoonBeCanceled=Partnership will soon be canceled
+SendingEmailOnPartnershipRefused=Partnership refused
+SendingEmailOnPartnershipAccepted=Partnership accepted
+SendingEmailOnPartnershipCanceled=Partnership canceled
 
+YourPartnershipWillSoonBeCanceledTopic=Partnership will soon be canceled
+YourPartnershipRefusedTopic=Partnership refused
+YourPartnershipAcceptedTopic=Partnership accepted
+YourPartnershipCanceledTopic=Partnership canceled
+
+YourPartnershipWillSoonBeCanceledContent=We inform you that your partnership will soon be canceled (Backlink not found)
+YourPartnershipRefusedContent=We inform you that your partnership request has been refused.
+YourPartnershipAcceptedContent=We inform you that your partnership request has been accepted.
+YourPartnershipCanceledContent=We inform you that your partnership has been canceled.
 
 #
 # Status
 #
-PartnershipDraft = Draft
-PartnershipAccepted = Accepted
-PartnershipRefused = Refused
-PartnershipCanceled = Canceled
-
+PartnershipDraft=Draft
+PartnershipAccepted=Accepted
+PartnershipRefused=Refused
+PartnershipCanceled=Canceled
 PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/az_AZ/productbatch.lang b/htdocs/langs/az_AZ/productbatch.lang
index ad2db658e2e..450d0285819 100644
--- a/htdocs/langs/az_AZ/productbatch.lang
+++ b/htdocs/langs/az_AZ/productbatch.lang
@@ -1,4 +1,4 @@
-# ProductBATCH language file - en_US - ProductBATCH
+# ProductBATCH language file - Source file is en_US - ProductBATCH
 ManageLotSerial=Use lot/serial number
 ProductStatusOnBatch=Yes (lot required)
 ProductStatusOnSerial=Yes (unique serial number required)
@@ -33,3 +33,13 @@ CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+LifeTime=Life span (in days)
+EndOfLife=End of life
+ManufacturingDate=Manufacturing date
+DestructionDate=Destruction date
+FirstUseDate=First use date
+QCFrequency=Quality control frequency (in days)
+
+#Traceability - qc status
+OutOfOrder=Out of order
+InWorkingOrder=In working order
diff --git a/htdocs/langs/az_AZ/products.lang b/htdocs/langs/az_AZ/products.lang
index 0875be0dc07..9638dfe5a25 100644
--- a/htdocs/langs/az_AZ/products.lang
+++ b/htdocs/langs/az_AZ/products.lang
@@ -396,3 +396,5 @@ ActionAvailableOnVariantProductOnly=Action only available on the variant of prod
 ProductsPricePerCustomer=Product prices per customers
 ProductSupplierExtraFields=Additional Attributes (Supplier Prices)
 DeleteLinkedProduct=Delete the child product linked to the combination
+PMPValue=Weighted average price
+PMPValueShort=WAP
diff --git a/htdocs/langs/az_AZ/projects.lang b/htdocs/langs/az_AZ/projects.lang
index 79c974f6e24..6c96fadb5c1 100644
--- a/htdocs/langs/az_AZ/projects.lang
+++ b/htdocs/langs/az_AZ/projects.lang
@@ -267,9 +267,11 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=New invoice
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+OneLinePerTimeSpentLine=One line for each time spent declaration
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
 AddPersonToTask=Add also to tasks
 UsageOrganizeEvent=Usage: Event Organization
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
+SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
diff --git a/htdocs/langs/az_AZ/receptions.lang b/htdocs/langs/az_AZ/receptions.lang
index 760ff884fa0..338602e722e 100644
--- a/htdocs/langs/az_AZ/receptions.lang
+++ b/htdocs/langs/az_AZ/receptions.lang
@@ -44,4 +44,4 @@ ValidateOrderFirstBeforeReception=You must first validate the order before being
 ReceptionsNumberingModules=Numbering module for receptions
 ReceptionsReceiptModel=Document templates for receptions
 NoMorePredefinedProductToDispatch=No more predefined products to dispatch
-
+ReceptionExist=A reception exists
diff --git a/htdocs/langs/az_AZ/stocks.lang b/htdocs/langs/az_AZ/stocks.lang
index 9ec523427b1..d39791932a3 100644
--- a/htdocs/langs/az_AZ/stocks.lang
+++ b/htdocs/langs/az_AZ/stocks.lang
@@ -56,8 +56,6 @@ UnitPurchaseValue=Unit purchase price
 StockTooLow=Stock too low
 StockLowerThanLimit=Stock lower than alert limit (%s)
 EnhancedValue=Value
-PMPValue=Weighted average price
-PMPValueShort=WAP
 EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
@@ -251,7 +249,10 @@ SelectAStockMovementFileToImport=select a stock movement file to import
 InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
 LabelOfInventoryMovemement=Inventory %s
 ReOpen=Reopen
-ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock to the real qty you entered into the inventory.
 ObjectNotFound=%s not found
 MakeMovementsAndClose=Generate movements and close
 AutofillWithExpected=Fill real quantity with expected quantity
+ShowAllBatchByDefault=By default, show batch details on product "stock" tab
+CollapseBatchDetailHelp=You can set batch detail default display in stocks module configuration
+FieldCannotBeNegative=Field "%s" cannot be negative
diff --git a/htdocs/langs/az_AZ/ticket.lang b/htdocs/langs/az_AZ/ticket.lang
index df73daf4a0d..1da32a5a99e 100644
--- a/htdocs/langs/az_AZ/ticket.lang
+++ b/htdocs/langs/az_AZ/ticket.lang
@@ -304,7 +304,7 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
-BoxTicketType=Number of open tickets by type
+BoxTicketType=Distribution of open tickets by type
 BoxTicketSeverity=Number of open tickets by severity
 BoxNoTicketSeverity=No tickets opened
 BoxTicketLastXDays=Number of new tickets by days the last %s days
diff --git a/htdocs/langs/bg_BG/accountancy.lang b/htdocs/langs/bg_BG/accountancy.lang
index 8d5723bf0e8..1fc1c6ca5b9 100644
--- a/htdocs/langs/bg_BG/accountancy.lang
+++ b/htdocs/langs/bg_BG/accountancy.lang
@@ -158,7 +158,7 @@ ACCOUNTING_LENGTH_AACCOUNT=Дължина на счетоводните смет
 ACCOUNTING_MANAGE_ZERO=Разрешава управление на различен брой нули в края на счетоводна сметка. Необходимо е в някои страни като Швейцария. Ако е изключено (по подразбиране) може да зададете следните два параметъра, за да поискате от системата да добави виртуални нули.
 BANK_DISABLE_DIRECT_INPUT=Деактивиране на директно добавяне на транзакция в банкова сметка
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Активиране на експортиране на журнали в състояние на чернова
-ACCOUNTANCY_COMBO_FOR_AUX=Активиране на комбиниран списък за дъщерна сметка (може да създаде забавяне, ако имате много контрагенти)
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties, break ability to search on a part of value)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
@@ -328,6 +328,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountanc
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
+NotifiedExportDate=Notified export date (modification of the entries will not be possible)
+NotifiedValidationDate=Validation of the entries (modification or deletion of the entries will not be possible)
+ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=Експортиране на журнал в чернова
 Modelcsv=Модел на експортиране
 Selectmodelcsv=Изберете модел на експортиране
diff --git a/htdocs/langs/bg_BG/admin.lang b/htdocs/langs/bg_BG/admin.lang
index 80fdece280d..94427c860b1 100644
--- a/htdocs/langs/bg_BG/admin.lang
+++ b/htdocs/langs/bg_BG/admin.lang
@@ -221,8 +221,8 @@ NotCompatible=Този модул не изглежда съвместим с Do
 CompatibleAfterUpdate=Този модул изисква актуализация на вашия Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=Вижте в онлайн магазина
 SeeSetupOfModule=Вижте настройката на модул %s
+SetOptionTo=Set option <b>%s</b> to %s
 Updated=Актуализиран
-Nouveauté=Новост
 AchatTelechargement=Купуване / Изтегляне
 GoModuleSetupArea=За да разположите / инсталирате нов модул, отидете в секцията за настройка на модул: <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, официалният пазар за Dolibarr ERP / CRM външни модули
@@ -399,6 +399,7 @@ SecurityToken=Ключ за защитени URL адреси
 NoSmsEngine=Няма наличен мениджър за подател на SMS. Мениджърът на подателя на SMS не е инсталиран по подразбиране, защото зависи от външен доставчик, но можете да намерите някои от тях на адрес %s
 PDF=PDF
 PDFDesc=Global options for PDF generation
+PDFOtherDesc=PDF Option specific to some modules
 PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Скриване на цялата информация, свързана с данък върху продажбите / ДДС
 PDFRulesForSalesTax=Правила за данък върху продажбите / ДДС
@@ -561,7 +562,7 @@ Module53Desc=Управление на услуги
 Module54Name=Договори / Абонаменти
 Module54Desc=Управление на договори (услуги или периодични абонаменти)
 Module55Name=Баркодове
-Module55Desc=Управление на баркодове
+Module55Desc=Barcode or QR code management
 Module56Name=Плащане с кредитен превод
 Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
 Module57Name=Payments by Direct Debit
@@ -848,10 +849,10 @@ Permission402=Създаване / променяне на отстъпки
 Permission403=Валидиране на отстъпки
 Permission404=Изтриване на отстъпки
 Permission430=Използване на инструменти за отстраняване на грешки
-Permission511=Read payments of salaries (yours and subordinates)
-Permission512=Създаване / променяне на плащания на заплати
-Permission514=Изтриване на плащания на заплати
-Permission517=Read payments of salaries of everybody
+Permission511=Read salaries and payments (yours and subordinates)
+Permission512=Create/modify salaries and payments
+Permission514=Delete salaries and payments
+Permission517=Read salaries and payments everybody
 Permission519=Експортиране на заплати
 Permission520=Преглед на кредити
 Permission522=Създаване / променяне на кредити
@@ -965,6 +966,8 @@ Permission23003=Изтриване на планирани задачи
 Permission23004=Стартиране на планирани задачи
 Permission50101=Use Point of Sale (SimplePOS)
 Permission50151=Use Point of Sale (TakePOS)
+Permission50152=Edit sales lines
+Permission50153=Edit ordered sales lines
 Permission50201=Преглед на транзакции
 Permission50202=Импортиране на транзакции
 Permission50330=Read objects of Zapier
@@ -1039,11 +1042,12 @@ DictionaryMeasuringUnits=Измервателни единици
 DictionarySocialNetworks=Социални мрежи
 DictionaryProspectStatus=Prospect status for companies
 DictionaryProspectContactStatus=Prospect status for contacts
-DictionaryHolidayTypes=Видове отпуск
+DictionaryHolidayTypes=Leave - Types of leave
 DictionaryOpportunityStatus=Статус на възможността за проект / възможност
 DictionaryExpenseTaxCat=Разходен отчет - Транспортни категории
 DictionaryExpenseTaxRange=Разходен отчет - Обхват на транспортни категории
 DictionaryTransportMode=Intracomm report - Transport mode
+DictionaryBatchStatus=Product lot/serial Quality Control status
 TypeOfUnit=Type of unit
 SetupSaved=Настройката е запазена
 SetupNotSaved=Настройката не е запазена
@@ -1187,7 +1191,7 @@ SetupDescription4=<a href="%s">%s -> %s</a><br><br>Този софтуер е п
 SetupDescription5=Менюто "Други настройки" управлява допълнителни параметри.
 AuditedSecurityEvents=Security events that are audited
 NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
-Audit=Проверка
+Audit=Security events
 InfoDolibarr=Относно Dolibarr
 InfoBrowser=Относно браузър
 InfoOS=Относно ОС
@@ -1319,9 +1323,12 @@ ConditionIsCurrently=Понастоящем състоянието е %s
 YouUseBestDriver=Използвате драйвер %s, който е най-добрият драйвер в момента.
 YouDoNotUseBestDriver=Използвате драйвер %s, но драйвер %s е препоръчителен.
 NbOfObjectIsLowerThanNoPb=Имате само %s %s в базата данни. Това не изисква особена оптимизация.
+ComboListOptim=Combo list loading optimization
 SearchOptim=Оптимизация на търсене
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
-YouHaveXObjectAndSearchOptimOn=Имате %s %s в базата данни и константата %s е със стойност 1 в Начало -> Настройка -> Други настройки.
+YouHaveXObjectUseComboOptim=You have %s %s in the database. You can go into setup of module to enable loading of combo list on key pressed event.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other.
+YouHaveXObjectUseSearchOptimDesc=This limits the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to %s in Home-Setup-Other.
 BrowserIsOK=Използвате уеб браузъра %s. Този браузър е добър от гледна точка на сигурност и производителност.
 BrowserIsKO=Използвате уеб браузъра %s. Известно е, че този браузър е лош избор от гледна точка на сигурност, производителност и надеждност. Препоръчително е да използвате Firefox, Chrome, Opera или Safari.
 PHPModuleLoaded=PHP компонент %s е зареден
@@ -1433,6 +1440,7 @@ MemberMainOptions=Основни параметри
 AdherentLoginRequired= Управление на входни данни за всеки член
 AdherentMailRequired=Необходим е имейл при създаване на нов член
 MemberSendInformationByMailByDefault=По подразбиране е активирано изпращането на потвърждение, чрез имейл до членове (валидиране или нов абонамент)
+MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
 VisitorCanChooseItsPaymentMode=Посетителят може да избира от наличните начини на плащане
 MEMBER_REMINDER_EMAIL=Активиране на автоматично напомняне, <b>чрез имейл </b> за изтекли абонаменти. Забележка: Модул <strong>%s</strong> трябва да е активиран и правилно настроен за изпращане на напомняния.
 MembersDocModules=Document templates for documents generated from member record
@@ -1763,7 +1771,7 @@ AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting men
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Активиране на звуково известяване
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
-AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the scheduled job %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Показване на свързания обект в календара
 ##### Clicktodial #####
 ClickToDialSetup=Настройка на модула за набиране (ClickToDial)
@@ -1979,6 +1987,8 @@ MAIN_PDF_MARGIN_RIGHT=Дясна граница в PDF
 MAIN_PDF_MARGIN_TOP=Горна граница в PDF
 MAIN_PDF_MARGIN_BOTTOM=Долна граница в PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add picture on proposal line
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add electronic sign in PDF
 NothingToSetup=За този модул не е необходима специфична настройка.
 SetToYesIfGroupIsComputationOfOtherGroups=Посочете стойност 'Да', ако тази група е съвкупност от други групи.
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
@@ -2096,7 +2106,6 @@ PDF_SHOW_PROJECT=Show project on document
 ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=Ако искате да имате някои текстове във вашия PDF файл, дублирани на 2 различни езика в един и същ генериран PDF файл, трябва да посочите тук този втори език, така че генерираният PDF файл да съдържа 2 различни езика на една и съща страница, избраният при генериране на PDF и този (само няколко PDF шаблона поддържат това). Запазете празно за един език в PDF файла.
 FafaIconSocialNetworksDesc=Въведете тук кода за FontAwesome икона. Ако не знаете какво е FontAwesome, може да използвате стандартната стойност fa-address book.
-FeatureNotAvailableWithReceptionModule=Функцията не е налична, когато е активиран модул Приемане
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
@@ -2120,12 +2129,18 @@ ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by
 MailToSendEventOrganization=Event Organization
 AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
 YouShouldDisablePHPFunctions=You should disable PHP functions
-IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands in custom code, you shoud disable PHP functions
+PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
+NotRecommended=Not recommanded
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
 ModuleUpdateAvailable=An update is available
 NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
+RandomlySelectedIfSeveral=Randomly selected if several pictures are available
+DatabasePasswordObfuscated=Database password is obfuscated in conf file
+DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
diff --git a/htdocs/langs/bg_BG/agenda.lang b/htdocs/langs/bg_BG/agenda.lang
index d2fbae50f13..c107bd51412 100644
--- a/htdocs/langs/bg_BG/agenda.lang
+++ b/htdocs/langs/bg_BG/agenda.lang
@@ -4,7 +4,7 @@ Actions=Събития
 Agenda=Календар
 TMenuAgenda=Календар
 Agendas=Календари
-LocalAgenda=Вътрешен календар
+LocalAgenda=Default calendar
 ActionsOwnedBy=Събитие принадлежащо на
 ActionsOwnedByShort=Собственик
 AffectedTo=Възложено на
@@ -14,13 +14,13 @@ EventsNb=Брой събития
 ListOfActions=Списък на събития
 EventReports=Справки за събития
 Location=Местоположение
-ToUserOfGroup=Event assigned to any user in group
+ToUserOfGroup=Event assigned to any user in the group
 EventOnFullDay=Целодневно събитие
 MenuToDoActions=Всички незавършени събития
 MenuDoneActions=Всички завършени събития
 MenuToDoMyActions=Мои незавършени събития
 MenuDoneMyActions=Мои завършени събития
-ListOfEvents=Списък на събития (Вътрешен календар)
+ListOfEvents=List of events (default calendar)
 ActionsAskedBy=Събития, съобщени от
 ActionsToDoBy=Събития, възложени на
 ActionsDoneBy=Събития, извършени от
@@ -38,6 +38,7 @@ ActionsEvents=Събития, за които Dolibarr ще създаде ав
 EventRemindersByEmailNotEnabled=Напомнянията за събития по имейл не са активирани в настройката на модул %s.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Контрагент %s е създаден
+COMPANY_MODIFYInDolibarr=Third party %s modified
 COMPANY_DELETEInDolibarr=Контрагент %s е изтрит
 ContractValidatedInDolibarr=Договор %s е валидиран
 CONTRACT_DELETEInDolibarr=Договор %s е изтрит
@@ -87,6 +88,7 @@ OrderDeleted=Поръчката е изтрита
 InvoiceDeleted=Фактурата е изтрита
 DraftInvoiceDeleted=Черновата фактура е изтрита
 CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_MODIFYInDolibarr=Contact %s modified
 CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Продукт %s е създаден
 PRODUCT_MODIFYInDolibarr=Продукт %s е променен
@@ -119,6 +121,7 @@ MRP_MO_UNVALIDATEInDolibarr=Поръчка за производство е въ
 MRP_MO_PRODUCEDInDolibarr=Поръчка за производство е произведена
 MRP_MO_DELETEInDolibarr=Поръчка за производство е изтрита
 MRP_MO_CANCELInDolibarr=Поръчка за производство е анулирана
+PAIDInDolibarr=%s paid
 ##### End agenda events #####
 AgendaModelModule=Шаблони за събитие
 DateActionStart=Начална дата
@@ -130,7 +133,7 @@ AgendaUrlOptions4=<b>logint=%s</b>, за да ограничи показван
 AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b>, за да ограничи показването до събития, които са свързани с проект <b>__PROJECT_ID__</b>.
 AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b>, за да изключи автоматичните събития.
 AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b>, за да включи събитията с почивни дни.
-AgendaShowBirthdayEvents=Показване на рождени дни на контакти
+AgendaShowBirthdayEvents=Birthdays of contacts
 AgendaHideBirthdayEvents=Скриване на рождени дни на контакти
 Busy=Зает
 ExportDataset_event1=Списък на събития в календар
@@ -152,6 +155,7 @@ ActionType=Тип събитие
 DateActionBegin=Начална дата на събитие
 ConfirmCloneEvent=Сигурни ли сте, че искате да клонирате събитие <b>%s</b>?
 RepeatEvent=Повтаряне на събитие
+OnceOnly=Once only
 EveryWeek=Всяка седмица
 EveryMonth=Всеки месец
 DayOfMonth=Ден от месеца
@@ -165,4 +169,4 @@ TimeType=Duration type
 ReminderType=Callback type
 AddReminder=Create an automatic reminder notification for this event
 ErrorReminderActionCommCreation=Error creating the reminder notification for this event
-BrowserPush=Browser Notification
+BrowserPush=Browser Popup Notification
diff --git a/htdocs/langs/bg_BG/bills.lang b/htdocs/langs/bg_BG/bills.lang
index 2933e5264e4..3a133fecad2 100644
--- a/htdocs/langs/bg_BG/bills.lang
+++ b/htdocs/langs/bg_BG/bills.lang
@@ -259,6 +259,7 @@ DateMaxPayment=Краен срок за плащане
 DateInvoice=Дата на документ
 DatePointOfTax=Дата на данъчно събитие
 NoInvoice=Няма фактура
+NoOpenInvoice=No open invoice
 ClassifyBill=Класифициране на фактура
 SupplierBillsToPay=Неплатени фактури за доставка
 CustomerBillsUnpaid=Неплатени фактури за продажба
@@ -589,3 +590,4 @@ FacParentLine=Invoice Line Parent
 SituationTotalRayToRest=Remainder to pay without taxe
 PDFSituationTitle=Situation n° %d
 SituationTotalProgress=Total progress %d %%
+SearchUnpaidInvoicesWithDueDate=Search unpaid invoices with a due date = %s
diff --git a/htdocs/langs/bg_BG/cashdesk.lang b/htdocs/langs/bg_BG/cashdesk.lang
index 84872e797c1..c5033d79e12 100644
--- a/htdocs/langs/bg_BG/cashdesk.lang
+++ b/htdocs/langs/bg_BG/cashdesk.lang
@@ -102,7 +102,7 @@ CashDeskGenericMaskCodes6 = <br><b>{TN}</b> тагът се използва з
 TakeposGroupSameProduct=Групиране на едни и същи продукти
 StartAParallelSale=Стартиране на нова паралелна продажба
 SaleStartedAt=Sale started at %s
-ControlCashOpening=Control cash popup at opening POS
+ControlCashOpening=Open the "Control cash" popup when opening the POS
 CloseCashFence=Close cash desk control
 CashReport=Паричен отчет
 MainPrinterToUse=Main printer to use
@@ -126,5 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
-ShowPriceHT = Display the price excluding tax column
-ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
+ShowPriceHT = Display the column with the price excluding tax (on screen)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
diff --git a/htdocs/langs/bg_BG/compta.lang b/htdocs/langs/bg_BG/compta.lang
index fcb986aed2f..7a960bb4593 100644
--- a/htdocs/langs/bg_BG/compta.lang
+++ b/htdocs/langs/bg_BG/compta.lang
@@ -286,3 +286,9 @@ ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
 IncludeLoansInResults = Include loans in reports
+InvoiceLate30Days = Invoices late > 30 days
+InvoiceLate15Days = Invoices late > 15 days
+InvoiceLateMinus15Days = Invoices late
+InvoiceNotLate = To be collected < 15 days
+InvoiceNotLate15Days = To be collected in 15 days
+InvoiceNotLate30Days = To be collected in 30 days
diff --git a/htdocs/langs/bg_BG/cron.lang b/htdocs/langs/bg_BG/cron.lang
index 91af655214e..797d98b0ff3 100644
--- a/htdocs/langs/bg_BG/cron.lang
+++ b/htdocs/langs/bg_BG/cron.lang
@@ -60,7 +60,7 @@ CronErrEndDateStartDt=Крайната дата не може да бъде пр
 StatusAtInstall=Състояние при инсталиране на модула
 CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Деактивиране
-CronTaskInactive=Тази задача е деактивирана
+CronTaskInactive=This job is disabled (not scheduled)
 CronId=Идентификатор
 CronClassFile=Име на файл с клас
 CronModuleHelp=Име на Dolibarr директорията с модули (работи и с външен Dolibarr модул).<BR>Например, за да извикате метода на извличане от Dolibarr продуктов обект /htdocs/<u>product</u>/class/product.class.php, стойността за модула е<br><i>product</i>
diff --git a/htdocs/langs/bg_BG/errors.lang b/htdocs/langs/bg_BG/errors.lang
index 183b517323b..a081e492b2e 100644
--- a/htdocs/langs/bg_BG/errors.lang
+++ b/htdocs/langs/bg_BG/errors.lang
@@ -11,6 +11,7 @@ ErrorBadValueForParamNotAString=Неправилна стойност за ва
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Потребител %s вече съществува.
 ErrorGroupAlreadyExists=Група %s вече съществува.
+ErrorEmailAlreadyExists=Email %s already exists.
 ErrorRecordNotFound=Записът не е намерен.
 ErrorFailToCopyFile=Неуспешно копиране на файл '<b>%s</b>' в '<b>%s</b>'.
 ErrorFailToCopyDir=Неуспешно копиране на директория '<b>%s</b>' в '<b>%s</b>'.
@@ -117,7 +118,7 @@ ErrorCantReadFile=Не може да се прочете файла &quot;%s&quo
 ErrorCantReadDir=Неуспех при четенето на &quot;%s&quot; директорията
 ErrorBadLoginPassword=Неправилна стойност за потребителско име или парола
 ErrorLoginDisabled=Вашият акаунт е забранено
-ErrorFailedToRunExternalCommand=Не може да се работи на външна команда. Уверете се, тя е достъпна и изпълнима от PHP на вашия сървър. Ако PHP <b>Safe Mode</b> е активирана, тази команда е вътре в директория, определена от параметър <b>safe_mode_exec_dir.</b>
+ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server user. Check also the command is not protected on shell level by a security layer like apparmor.
 ErrorFailedToChangePassword=Неуспешно да смените паролата
 ErrorLoginDoesNotExists=Потребителя <b>%s</b> не е намерен.
 ErrorLoginHasNoEmail=Този потребител няма имейл адрес. Процес прекратено.
@@ -262,6 +263,7 @@ ErrorDateIsInFuture=Error, the date can't be in the future
 ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
 ErrorAPercentIsRequired=Error, please fill in the percentage correctly
 ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
+ErrorFailedToFindEmailTemplate=Failed to find template with code name %s
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Вашата стойност на PHP параметър upload_max_filesize (%s) е по-голяма от стойността на PHP параметър post_max_size (%s). Това не е последователна настройка.
@@ -298,3 +300,4 @@ WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So y
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
+ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
diff --git a/htdocs/langs/bg_BG/eventorganization.lang b/htdocs/langs/bg_BG/eventorganization.lang
index 2b711234122..01691dec9e3 100644
--- a/htdocs/langs/bg_BG/eventorganization.lang
+++ b/htdocs/langs/bg_BG/eventorganization.lang
@@ -1,4 +1,5 @@
 # Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+# Copyright (C) 2021		Dorian Vabre			<dorian.vabre@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
@@ -81,7 +82,10 @@ PriceOfBoothHelp=Subscription price to stand a booth
 EventOrganizationICSLink=Link ICS for events
 ConferenceOrBoothInformation=Conference Or Booth informations
 Attendees = Attendees
+DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
 #
 # Status
 #
@@ -94,8 +98,46 @@ EvntOrgCancelled = Cancelled
 #
 # Public page
 #
+SuggestForm = Suggestion page
+RegisterPage = Page for conferences or booth
+EvntOrgRegistrationHelpMessage = Here, you can vote for an event, or suggest a new conference or booth for the project
+EvntOrgRegistrationConfHelpMessage = Here, you can suggest a new conference for the project
+EvntOrgRegistrationBoothHelpMessage = Here, you can suggest a new booth for the project
+ListOfSuggestedConferences = List of suggested conferences
+ListOfSuggestedBooths = List of suggested booths
+SuggestConference = Suggest a new conference
+SuggestBooth = Suggest a booth
+ViewAndVote = View and vote for suggested events
 PublicAttendeeSubscriptionPage = Public link of registration to a conference
 MissingOrBadSecureKey = The security key is invalid or missing
-EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
-EvntOrgStartDuration = This conference starts on
-EvntOrgEndDuration =  and ends on
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference : '%s'
+EvntOrgDuration = This conference starts on %s and ends on %s.
+ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
+BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
+EventType = Тип събитие
+
+#
+# Vote page
+#
+EvntOrgRegistrationWelcomeMessage = Welcome on the conference or booth suggestion page.
+EvntOrgRegistrationConfWelcomeMessage = Welcome on the conference suggestion page.
+EvntOrgRegistrationBoothWelcomeMessage = Welcome on the booth suggestion page.
+EvntOrgVoteHelpMessage = Here, you can view and vote for the suggested events for the project
+VoteOk = Your vote has been accepted.
+AlreadyVoted = You have already voted for this event.
+VoteError = An error has occurred during the vote, please try again.
+
+#
+# SubscriptionOk page
+#
+SubscriptionOk = Your subscription to this conference has been validated
+#
+# Subscription validation mail
+#
+ConfAttendeeSubscriptionConfirmation = Confirmation of your subscription to a conference
+#
+# Payment page
+#
+Attendee = Attendee
+PaymentConferenceAttendee = Conference attendee payment
+PaymentBoothLocation = Booth location payment
diff --git a/htdocs/langs/bg_BG/hrm.lang b/htdocs/langs/bg_BG/hrm.lang
index 0279096bd62..82a0173d991 100644
--- a/htdocs/langs/bg_BG/hrm.lang
+++ b/htdocs/langs/bg_BG/hrm.lang
@@ -9,7 +9,7 @@ ConfirmDeleteEstablishment=Сигурни ли сте, че искате да и
 OpenEtablishment=Отваряне на обект
 CloseEtablishment=Затваряне на обект
 # Dictionary
-DictionaryPublicHolidays=ЧР - Национални празници
+DictionaryPublicHolidays=Leave - Public holidays
 DictionaryDepartment=ЧР - Списък с отдели
 DictionaryFunction=ЧР - Длъжности
 # Module
diff --git a/htdocs/langs/bg_BG/knowledgemanagement.lang b/htdocs/langs/bg_BG/knowledgemanagement.lang
index 9bbff8be3b4..334e6163401 100644
--- a/htdocs/langs/bg_BG/knowledgemanagement.lang
+++ b/htdocs/langs/bg_BG/knowledgemanagement.lang
@@ -47,7 +47,7 @@ KnowledgeManagementArea = Knowledge Management
 # Menu
 #
 MenuKnowledgeRecord = Knowledge base
-ListOfArticles = List of articles
+ListKnowledgeRecord = List of articles
 NewKnowledgeRecord = New article
 ValidateReply = Validate solution
 KnowledgeRecords = Articles
diff --git a/htdocs/langs/bg_BG/languages.lang b/htdocs/langs/bg_BG/languages.lang
index 110313b194e..2e3038b26e1 100644
--- a/htdocs/langs/bg_BG/languages.lang
+++ b/htdocs/langs/bg_BG/languages.lang
@@ -3,6 +3,7 @@ Language_am_ET=Ethiopian
 Language_ar_AR=Арабски
 Language_ar_EG=Арабски (Египет)
 Language_ar_SA=Арабски
+Language_ar_TN=Arabic (Tunisia)
 Language_az_AZ=Azerbaijani
 Language_bn_BD=Бенгали
 Language_bn_IN=Bengali (India)
@@ -84,6 +85,7 @@ Language_nl_NL=Холандски
 Language_pl_PL=Полски
 Language_pt_BR=Португалски (Бразилия)
 Language_pt_PT=Португалски
+Language_ro_MD=Romanian (Moldavia)
 Language_ro_RO=Румънски
 Language_ru_RU=Руски
 Language_ru_UA=Руски (Украйна)
diff --git a/htdocs/langs/bg_BG/main.lang b/htdocs/langs/bg_BG/main.lang
index 8b8fb5c5add..51ba4c03587 100644
--- a/htdocs/langs/bg_BG/main.lang
+++ b/htdocs/langs/bg_BG/main.lang
@@ -430,6 +430,7 @@ LT1IN=CGST
 LT2IN=SGST
 LT1GC=Допълнителни центове
 VATRate=Данъчна ставка
+RateOfTaxN=Rate of tax %s
 VATCode=Код на данъчна ставка
 VATNPR=Данъчна ставка NPR
 DefaultTaxRate=Данъчна ставка по подразбиране
@@ -729,6 +730,7 @@ MenuMembers=Членове
 MenuAgendaGoogle=Google календар
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Ограничение на системата (Меню Начало - Настройка - Сигурност): %s Kb, ограничение на PHP: %s Kb
+ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
 NoFileFound=No documents uploaded
 CurrentUserLanguage=Текущ език
 CurrentTheme=Текуща тема
@@ -1072,6 +1074,7 @@ ValidFrom=Валидно от
 ValidUntil=Валидно до
 NoRecordedUsers=Няма потребители
 ToClose=За приключване
+ToRefuse=To refuse
 ToProcess=За изпълнение
 ToApprove=За одобрение
 GlobalOpenedElemView=Глобален изглед
@@ -1126,9 +1129,11 @@ UpdateForAllLines=Update for all lines
 OnHold=На изчакване
 Civility=Civility
 AffectTag=Affect Tag
+CreateExternalUser=Create external user
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
 ConfirmCancel=Are you sure you want to cancel
+EmailMsgID=Email MsgID
diff --git a/htdocs/langs/bg_BG/members.lang b/htdocs/langs/bg_BG/members.lang
index 8b026d2e1e0..eb55e16e8c9 100644
--- a/htdocs/langs/bg_BG/members.lang
+++ b/htdocs/langs/bg_BG/members.lang
@@ -213,3 +213,5 @@ SendReminderForExpiredSubscription=Изпращане на напомняне п
 MembershipPaid=Членството е платено за текущия период (до %s)
 YouMayFindYourInvoiceInThisEmail=Може да откриете вашата фактура, прикачена към този имейл.
 XMembersClosed=%s член(а) е(са) приключен(и)
+XExternalUserCreated=%s external user(s) created
+ForceMemberNature=Force member nature (Individual or Corporation)
diff --git a/htdocs/langs/bg_BG/modulebuilder.lang b/htdocs/langs/bg_BG/modulebuilder.lang
index c9e7b270a44..8413ba0640e 100644
--- a/htdocs/langs/bg_BG/modulebuilder.lang
+++ b/htdocs/langs/bg_BG/modulebuilder.lang
@@ -143,3 +143,4 @@ AsciiToHtmlConverter=Ascii към HTML конвертор
 AsciiToPdfConverter=Ascii към PDF конвертор
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
 ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
+ImportExportProfiles=Import and export profiles
diff --git a/htdocs/langs/bg_BG/mrp.lang b/htdocs/langs/bg_BG/mrp.lang
index a8aea279320..0c39bca3291 100644
--- a/htdocs/langs/bg_BG/mrp.lang
+++ b/htdocs/langs/bg_BG/mrp.lang
@@ -8,12 +8,12 @@ MenuBOM=Списъци с материали
 LatestBOMModified=Списъци с материали: %s последно променени
 LatestMOModified=Поръчки за производство: %s последно променени
 Bom=Списъци с материали
-BillOfMaterials=Списък с материали
+BillOfMaterials=Bill of Materials
 BOMsSetup=Настройка на модул списъци с материали
 ListOfBOMs=Списък на списъци с материали
 ListOfManufacturingOrders=Списък на поръчки за производство
-NewBOM=Нов списък с материали
-ProductBOMHelp=Продукт за създаване с този списък с материали.<br>Забележка: Продукти с параметър 'Характер на продукта' = 'Суровина' не се виждат в този списък.
+NewBOM=New bill of materials
+ProductBOMHelp=Product to create (or disassemble) with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
 BOMsNumberingModules=Модули за номериране на списъци с материали
 BOMsModelModule=Шаблони на документи за списъци с материали
 MOsNumberingModules=Модули за номериране на поръчки за производство
@@ -22,7 +22,7 @@ FreeLegalTextOnBOMs=Свободен текст в списъци с матер
 WatermarkOnDraftBOMs=Воден знак върху чернови списъци с материали
 FreeLegalTextOnMOs=Свободен текст в поръчки за производство
 WatermarkOnDraftMOs=Воден знак върху чернови поръчки за производство
-ConfirmCloneBillOfMaterials=Сигурни ли сте, че искате да клонирате списък с материали %s?
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials %s ?
 ConfirmCloneMo=Сигурни ли сте, че искате да клонирате поръчката за производство %s?
 ManufacturingEfficiency=Производствена ефективност
 ConsumptionEfficiency=Потребляема ефективност
@@ -30,8 +30,8 @@ ValueOfMeansLoss=Стойност 0,95 означава средно 5%% заг
 ValueOfMeansLossForProductProduced=Стойност 0,95 означава средно 5%% загуба от произведен продукт
 DeleteBillOfMaterials=Изтриване на списък с материали
 DeleteMo=Изтриване на поръчка за производство
-ConfirmDeleteBillOfMaterials=Сигурни ли сте, че искате да изтриете този списък с материали?
-ConfirmDeleteMo=Сигурни ли сте, че искате да изтриете тази поръчка за производство?
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Materials?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Materials?
 MenuMRP=Поръчки за производство
 NewMO=Нова поръчка за производство
 QtyToProduce=Кол. за производство
@@ -39,7 +39,7 @@ DateStartPlannedMo=Планирана начална дата
 DateEndPlannedMo=Планирана крайна дата
 KeepEmptyForAsap=Празно означава 'Колкото е възможно по-скоро'
 EstimatedDuration=Очаквана продължителност
-EstimatedDurationDesc=Приблизителна продължителност за производство на този продукт, използвайки този списък с материали
+EstimatedDurationDesc=Estimated duration to manufacture (or disassemble) this product using this BOM
 ConfirmValidateBom=Сигурни ли сте, че искате да валидирате този списък с материали с № <strong>%s</strong> (ще може да я използвате за създаване на нови поръчки за производство)?
 ConfirmCloseBom=Сигурни ли сте, че искате да анулирате този списък с материали (няма да може да я използвате за създаване на нови поръчки за производство)?
 ConfirmReopenBom=Сигурни ли сте, че искате да отворите отново този списък с материали (ще може да я използвате за създаване на нови поръчки за производство)
@@ -63,13 +63,14 @@ ConsumeAndProduceAll=Общо използвано и произведено
 Manufactured=Произведено
 TheProductXIsAlreadyTheProductToProduce=Продуктът, който добавяте, вече е продукт, който трябва да произведете.
 ForAQuantityOf=Количество за производство на %s
+ForAQuantityToConsumeOf=For a quantity to disassemble of %s
 ConfirmValidateMo=Сигурни ли сте, че искате да валидирате тази поръчка за производство?
 ConfirmProductionDesc=С кликване върху '%s' ще потвърдите потреблението и / или производството за определените количества. Това също така ще актуализира наличностите и ще регистрира движението им.
 ProductionForRef=Производство на %s
 AutoCloseMO=Автоматично приключване на поръчка за производство при достигнати количества за потребление и производство
 NoStockChangeOnServices=Без променяне на наличности за услуги
 ProductQtyToConsumeByMO=Количество продукт, което да се използва от активна ПП
-ProductQtyToProduceByMO=Количество продукт, което да се произведе за активна ПП
+ProductQtyToProduceByMO=Product quantity still to produce by open MO
 AddNewConsumeLines=Добавяне на нов ред за използване
 ProductsToConsume=Продукти за използване
 ProductsToProduce=Продукти за производство
@@ -83,15 +84,13 @@ Workstations=Workstations
 WorkstationsDescription=Workstations management
 WorkstationSetup = Workstations setup
 WorkstationSetupPage = Workstations setup page
-WorkstationAbout = About Workstation
-WorkstationAboutPage = Workstations about page
 WorkstationList=Workstation list
 WorkstationCreate=Add new workstation
 ConfirmEnableWorkstation=Are you sure you want to enable workstation <b>%s</b> ?
 EnableAWorkstation=Enable a workstation
 ConfirmDisableWorkstation=Are you sure you want to disable workstation <b>%s</b> ?
 DisableAWorkstation=Disable a workstation
-DeleteWorkstation=Supprimer
+DeleteWorkstation=Изтриване
 NbOperatorsRequired=Number of operators required
 THMOperatorEstimated=Estimated operator THM
 THMMachineEstimated=Estimated machine THM
diff --git a/htdocs/langs/bg_BG/orders.lang b/htdocs/langs/bg_BG/orders.lang
index e921bcb43cf..ea33f551f98 100644
--- a/htdocs/langs/bg_BG/orders.lang
+++ b/htdocs/langs/bg_BG/orders.lang
@@ -11,6 +11,7 @@ OrderDate=Дата на поръчка
 OrderDateShort=Дата на поръчка
 OrderToProcess=Поръчка за обработване
 NewOrder=Нова поръчка
+NewSupplierOrderShort=Нова поръчка
 NewOrderSupplier=Нова поръчка за покупка
 ToOrder=Възлагане на поръчка
 MakeOrder=Възлагане на поръчка
@@ -73,6 +74,7 @@ DeleteOrder=Изтриване на поръчка
 CancelOrder=Анулиране
 OrderReopened= Поръчка %s е активна отново
 AddOrder=Създаване на поръчка
+AddSupplierOrderShort=Създаване на поръчка
 AddPurchaseOrder=Създаване на поръчка за покупка
 AddToDraftOrders=Добавяне към чернови поръчки
 ShowOrder=Показване на поръчка
diff --git a/htdocs/langs/bg_BG/other.lang b/htdocs/langs/bg_BG/other.lang
index 8085469e87c..7c4755661ad 100644
--- a/htdocs/langs/bg_BG/other.lang
+++ b/htdocs/langs/bg_BG/other.lang
@@ -129,6 +129,7 @@ ClosedByLogin=Потребител, който е приключил
 FileWasRemoved=Файл %s е премахнат
 DirWasRemoved=Директория %s е премахната
 FeatureNotYetAvailable=Функцията все още не е налице в текущата версия
+FeatureNotAvailableOnDevicesWithoutMouse=Feature not available on devices without mouse
 FeaturesSupported=Поддържани функции
 Width=Ширина
 Height=Височина
@@ -263,7 +264,7 @@ ContactCreatedByEmailCollector=Контактът / адресът е създа
 ProjectCreatedByEmailCollector=Проектът е създаден, чрез имейл колектор от имейл MSGID %s
 TicketCreatedByEmailCollector=Тикетът е създаден, чрез имейл колектор от имейл MSGID %s
 OpeningHoursFormatDesc=Използвайте средно тире '-' за разделяне на часовете на отваряне и затваряне.<br> Използвайте интервал, за да въведете различни диапазони.<br> Пример: 8-12 14-18
-PrefixSession=Prefix for session ID
+SuffixSessionName=Suffix for session name
 
 ##### Export #####
 ExportsArea=Секция с експортирания
diff --git a/htdocs/langs/bg_BG/partnership.lang b/htdocs/langs/bg_BG/partnership.lang
index 6a9bb75cd16..023f855d0c1 100644
--- a/htdocs/langs/bg_BG/partnership.lang
+++ b/htdocs/langs/bg_BG/partnership.lang
@@ -16,41 +16,72 @@
 #
 # Generic
 #
-ModulePartnershipName = Partnership management
-PartnershipDescription = Module Partnership management
+ModulePartnershipName=Partnership management
+PartnershipDescription=Module Partnership management
 PartnershipDescriptionLong= Module Partnership management
 
+AddPartnership=Add partnership
+CancelPartnershipForExpiredMembers=Partnership: Cancel partnership of members with expired subscriptions
+PartnershipCheckBacklink=Partnership: Check referring backlink
+
 #
 # Menu
 #
-NewPartnership = New Partnership
-ListOfPartnerships = List of partnership
+NewPartnership=New Partnership
+ListOfPartnerships=List of partnership
 
 #
 # Admin page
 #
-PartnershipSetup = Partnership setup
-PartnershipAbout = About Partnership
-PartnershipAboutPage = Partnership about page
-
+PartnershipSetup=Partnership setup
+PartnershipAbout=About Partnership
+PartnershipAboutPage=Partnership about page
+partnershipforthirdpartyormember=Partner status must be set on a 'thirdparty' or a 'member'
+PARTNERSHIP_IS_MANAGED_FOR=Partnership managed for
+PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks to check
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb of days before cancelling status of a partnership when a subscription has expired
+ReferingWebsiteCheck=Check of website referring
+ReferingWebsiteCheckDesc=You can enable a feature to check that your partners has added a backlink to your website domains on their own website.
 
 #
 # Object
 #
+DeletePartnership=Delete a partnership
+PartnershipDedicatedToThisThirdParty=Partnership dedicated to this third party
+PartnershipDedicatedToThisMember=Partnership dedicated to this member
 DatePartnershipStart=Начална дата
 DatePartnershipEnd=Крайна дата
+ReasonDecline=Decline reason
+ReasonDeclineOrCancel=Decline reason
+PartnershipAlreadyExist=Partnership already exist
+ManagePartnership=Manage partnership
+BacklinkNotFoundOnPartnerWebsite=Backlink not found on partner website
+ConfirmClosePartnershipAsk=Are you sure you want to cancel this partnership?
+PartnershipType=Partnership type
 
 #
 # Template Mail
 #
+SendingEmailOnPartnershipWillSoonBeCanceled=Partnership will soon be canceled
+SendingEmailOnPartnershipRefused=Partnership refused
+SendingEmailOnPartnershipAccepted=Partnership accepted
+SendingEmailOnPartnershipCanceled=Partnership canceled
 
+YourPartnershipWillSoonBeCanceledTopic=Partnership will soon be canceled
+YourPartnershipRefusedTopic=Partnership refused
+YourPartnershipAcceptedTopic=Partnership accepted
+YourPartnershipCanceledTopic=Partnership canceled
+
+YourPartnershipWillSoonBeCanceledContent=We inform you that your partnership will soon be canceled (Backlink not found)
+YourPartnershipRefusedContent=We inform you that your partnership request has been refused.
+YourPartnershipAcceptedContent=We inform you that your partnership request has been accepted.
+YourPartnershipCanceledContent=We inform you that your partnership has been canceled.
 
 #
 # Status
 #
-PartnershipDraft = Чернова
-PartnershipAccepted = Прието
-PartnershipRefused = Отхвърлено
-PartnershipCanceled = Анулирана
-
+PartnershipDraft=Чернова
+PartnershipAccepted=Прието
+PartnershipRefused=Отхвърлено
+PartnershipCanceled=Анулирана
 PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/bg_BG/productbatch.lang b/htdocs/langs/bg_BG/productbatch.lang
index 1576ae17bed..1c2d8a20d4f 100644
--- a/htdocs/langs/bg_BG/productbatch.lang
+++ b/htdocs/langs/bg_BG/productbatch.lang
@@ -1,4 +1,4 @@
-# ProductBATCH language file - en_US - ProductBATCH
+# ProductBATCH language file - Source file is en_US - ProductBATCH
 ManageLotSerial=Използване на партиден / сериен №
 ProductStatusOnBatch=Yes (lot required)
 ProductStatusOnSerial=Да (уникалният сериен номер е задължителен)
@@ -33,3 +33,13 @@ CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+LifeTime=Life span (in days)
+EndOfLife=End of life
+ManufacturingDate=Manufacturing date
+DestructionDate=Destruction date
+FirstUseDate=First use date
+QCFrequency=Quality control frequency (in days)
+
+#Traceability - qc status
+OutOfOrder=Out of order
+InWorkingOrder=In working order
diff --git a/htdocs/langs/bg_BG/products.lang b/htdocs/langs/bg_BG/products.lang
index 0c8cef17666..5b920f757db 100644
--- a/htdocs/langs/bg_BG/products.lang
+++ b/htdocs/langs/bg_BG/products.lang
@@ -396,3 +396,5 @@ ActionAvailableOnVariantProductOnly=Действието е достъпно с
 ProductsPricePerCustomer=Цени на продукта в зависимост от клиента
 ProductSupplierExtraFields=Допълнителни атрибути (цени на доставчици)
 DeleteLinkedProduct=Изтриване на подпродукт, свързан с комбинацията
+PMPValue=Средно измерена цена
+PMPValueShort=СИЦ
diff --git a/htdocs/langs/bg_BG/projects.lang b/htdocs/langs/bg_BG/projects.lang
index a4f9de78a00..1e901a03f08 100644
--- a/htdocs/langs/bg_BG/projects.lang
+++ b/htdocs/langs/bg_BG/projects.lang
@@ -267,9 +267,11 @@ InvoiceToUse=Чернова фактура, която да използвате
 NewInvoice=Нова фактура
 OneLinePerTask=Един ред на задача
 OneLinePerPeriod=Един ред на период
+OneLinePerTimeSpentLine=One line for each time spent declaration
 RefTaskParent=Съгласно главна задача №
 ProfitIsCalculatedWith=Profit is calculated using
 AddPersonToTask=Add also to tasks
 UsageOrganizeEvent=Usage: Event Organization
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
+SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
diff --git a/htdocs/langs/bg_BG/receptions.lang b/htdocs/langs/bg_BG/receptions.lang
index e3e80183b1d..6c5f1e2221d 100644
--- a/htdocs/langs/bg_BG/receptions.lang
+++ b/htdocs/langs/bg_BG/receptions.lang
@@ -44,4 +44,4 @@ ValidateOrderFirstBeforeReception=Първо трябва да валидира
 ReceptionsNumberingModules=Модул за номериране на стокови разписки
 ReceptionsReceiptModel=Шаблони на документи за стокови разписки
 NoMorePredefinedProductToDispatch=No more predefined products to dispatch
-
+ReceptionExist=A reception exists
diff --git a/htdocs/langs/bg_BG/stocks.lang b/htdocs/langs/bg_BG/stocks.lang
index c34e94c2699..d46dc25e21e 100644
--- a/htdocs/langs/bg_BG/stocks.lang
+++ b/htdocs/langs/bg_BG/stocks.lang
@@ -56,8 +56,6 @@ UnitPurchaseValue=Единична покупна цена
 StockTooLow=Наличността е твърде малка
 StockLowerThanLimit=Наличността е по-малка от лимита за предупреждение (%s)
 EnhancedValue=Стойност
-PMPValue=Средно измерена цена
-PMPValueShort=СИЦ
 EnhancedValueOfWarehouses=Складова стойност
 UserWarehouseAutoCreate=Автоматично създаване на личен потребителски склад при създаване на потребител
 AllowAddLimitStockByWarehouse=Управляване също и на стойност за минимална и желана наличност за двойка (продукт - склад) в допълнение към стойността за минимална и желана наличност за продукт
@@ -251,7 +249,10 @@ SelectAStockMovementFileToImport=select a stock movement file to import
 InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
 LabelOfInventoryMovemement=Inventory %s
 ReOpen=Повторно отваряне
-ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock to the real qty you entered into the inventory.
 ObjectNotFound=%s not found
 MakeMovementsAndClose=Generate movements and close
 AutofillWithExpected=Fill real quantity with expected quantity
+ShowAllBatchByDefault=By default, show batch details on product "stock" tab
+CollapseBatchDetailHelp=You can set batch detail default display in stocks module configuration
+FieldCannotBeNegative=Field "%s" cannot be negative
diff --git a/htdocs/langs/bg_BG/ticket.lang b/htdocs/langs/bg_BG/ticket.lang
index b777b181aae..e7c6cfffe12 100644
--- a/htdocs/langs/bg_BG/ticket.lang
+++ b/htdocs/langs/bg_BG/ticket.lang
@@ -304,7 +304,7 @@ BoxLastModifiedTicket=Последно променени тикети
 BoxLastModifiedTicketDescription=Тикети: %s последно променени
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=Няма скорошни променени тикети
-BoxTicketType=Number of open tickets by type
+BoxTicketType=Distribution of open tickets by type
 BoxTicketSeverity=Number of open tickets by severity
 BoxNoTicketSeverity=No tickets opened
 BoxTicketLastXDays=Number of new tickets by days the last %s days
diff --git a/htdocs/langs/bn_BD/accountancy.lang b/htdocs/langs/bn_BD/accountancy.lang
index 354cddb62c2..27be673dd9c 100644
--- a/htdocs/langs/bn_BD/accountancy.lang
+++ b/htdocs/langs/bn_BD/accountancy.lang
@@ -158,7 +158,7 @@ ACCOUNTING_LENGTH_AACCOUNT=Length of the third-party accounting accounts (If you
 ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of an accounting account. Needed by some countries (like Switzerland). If set to off (default), you can set the following two parameters to ask the application to add virtual zeros.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties, break ability to search on a part of value)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
@@ -328,6 +328,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountanc
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
+NotifiedExportDate=Notified export date (modification of the entries will not be possible)
+NotifiedValidationDate=Validation of the entries (modification or deletion of the entries will not be possible)
+ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=Export draft journal
 Modelcsv=Model of export
 Selectmodelcsv=Select a model of export
diff --git a/htdocs/langs/bn_BD/admin.lang b/htdocs/langs/bn_BD/admin.lang
index fb4513a09b4..be9aca94599 100644
--- a/htdocs/langs/bn_BD/admin.lang
+++ b/htdocs/langs/bn_BD/admin.lang
@@ -221,8 +221,8 @@ NotCompatible=This module does not seem compatible with your Dolibarr %s (Min %s
 CompatibleAfterUpdate=This module requires an update to your Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=See in Market place
 SeeSetupOfModule=See setup of module %s
+SetOptionTo=Set option <b>%s</b> to %s
 Updated=Updated
-Nouveauté=Novelty
 AchatTelechargement=Buy / Download
 GoModuleSetupArea=To deploy/install a new module, go to the Module setup area: <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
@@ -399,6 +399,7 @@ SecurityToken=Key to secure URLs
 NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
 PDF=PDF
 PDFDesc=Global options for PDF generation
+PDFOtherDesc=PDF Option specific to some modules
 PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
 PDFRulesForSalesTax=Rules for Sales Tax / VAT
@@ -561,7 +562,7 @@ Module53Desc=Management of Services
 Module54Name=Contracts/Subscriptions
 Module54Desc=Management of contracts (services or recurring subscriptions)
 Module55Name=Barcodes
-Module55Desc=Barcode management
+Module55Desc=Barcode or QR code management
 Module56Name=Payment by credit transfer
 Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
 Module57Name=Payments by Direct Debit
@@ -848,10 +849,10 @@ Permission402=Create/modify discounts
 Permission403=Validate discounts
 Permission404=Delete discounts
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries (yours and subordinates)
-Permission512=Create/modify payments of salaries
-Permission514=Delete payments of salaries
-Permission517=Read payments of salaries of everybody
+Permission511=Read salaries and payments (yours and subordinates)
+Permission512=Create/modify salaries and payments
+Permission514=Delete salaries and payments
+Permission517=Read salaries and payments everybody
 Permission519=Export salaries
 Permission520=Read Loans
 Permission522=Create/modify loans
@@ -965,6 +966,8 @@ Permission23003=Delete Scheduled job
 Permission23004=Execute Scheduled job
 Permission50101=Use Point of Sale (SimplePOS)
 Permission50151=Use Point of Sale (TakePOS)
+Permission50152=Edit sales lines
+Permission50153=Edit ordered sales lines
 Permission50201=Read transactions
 Permission50202=Import transactions
 Permission50330=Read objects of Zapier
@@ -1039,11 +1042,12 @@ DictionaryMeasuringUnits=Measuring Units
 DictionarySocialNetworks=Social Networks
 DictionaryProspectStatus=Prospect status for companies
 DictionaryProspectContactStatus=Prospect status for contacts
-DictionaryHolidayTypes=Types of leave
+DictionaryHolidayTypes=Leave - Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
 DictionaryTransportMode=Intracomm report - Transport mode
+DictionaryBatchStatus=Product lot/serial Quality Control status
 TypeOfUnit=Type of unit
 SetupSaved=Setup saved
 SetupNotSaved=Setup not saved
@@ -1187,7 +1191,7 @@ SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of m
 SetupDescription5=Other Setup menu entries manage optional parameters.
 AuditedSecurityEvents=Security events that are audited
 NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
-Audit=Audit
+Audit=Security events
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
 InfoOS=About OS
@@ -1319,9 +1323,12 @@ ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
 NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
+ComboListOptim=Combo list loading optimization
 SearchOptim=Search optimization
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
-YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
+YouHaveXObjectUseComboOptim=You have %s %s in the database. You can go into setup of module to enable loading of combo list on key pressed event.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other.
+YouHaveXObjectUseSearchOptimDesc=This limits the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to %s in Home-Setup-Other.
 BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
 BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
 PHPModuleLoaded=PHP component %s is loaded
@@ -1433,6 +1440,7 @@ MemberMainOptions=Main options
 AdherentLoginRequired= Manage a Login for each member
 AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
+MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
 MembersDocModules=Document templates for documents generated from member record
@@ -1763,7 +1771,7 @@ AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting men
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
-AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the scheduled job %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
@@ -1979,6 +1987,8 @@ 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_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add picture on proposal line
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add electronic sign in PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
@@ -2096,7 +2106,6 @@ PDF_SHOW_PROJECT=Show project on document
 ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
-FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
@@ -2120,12 +2129,18 @@ ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by
 MailToSendEventOrganization=Event Organization
 AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
 YouShouldDisablePHPFunctions=You should disable PHP functions
-IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands in custom code, you shoud disable PHP functions
+PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
+NotRecommended=Not recommanded
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
 ModuleUpdateAvailable=An update is available
 NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
+RandomlySelectedIfSeveral=Randomly selected if several pictures are available
+DatabasePasswordObfuscated=Database password is obfuscated in conf file
+DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
diff --git a/htdocs/langs/bn_BD/agenda.lang b/htdocs/langs/bn_BD/agenda.lang
index 09d82139a49..a1183841b00 100644
--- a/htdocs/langs/bn_BD/agenda.lang
+++ b/htdocs/langs/bn_BD/agenda.lang
@@ -4,7 +4,7 @@ Actions=Events
 Agenda=Agenda
 TMenuAgenda=Agenda
 Agendas=Agendas
-LocalAgenda=Internal calendar
+LocalAgenda=Default calendar
 ActionsOwnedBy=Event owned by
 ActionsOwnedByShort=Owner
 AffectedTo=Assigned to
@@ -14,13 +14,13 @@ EventsNb=Number of events
 ListOfActions=List of events
 EventReports=Event reports
 Location=Location
-ToUserOfGroup=Event assigned to any user in group
+ToUserOfGroup=Event assigned to any user in the group
 EventOnFullDay=Event on all day(s)
 MenuToDoActions=All incomplete events
 MenuDoneActions=All terminated events
 MenuToDoMyActions=My incomplete events
 MenuDoneMyActions=My terminated events
-ListOfEvents=List of events (internal calendar)
+ListOfEvents=List of events (default calendar)
 ActionsAskedBy=Events reported by
 ActionsToDoBy=Events assigned to
 ActionsDoneBy=Events done by
@@ -38,6 +38,7 @@ ActionsEvents=Events for which Dolibarr will create an action in agenda automati
 EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Third party %s created
+COMPANY_MODIFYInDolibarr=Third party %s modified
 COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=Contract %s validated
 CONTRACT_DELETEInDolibarr=Contract %s deleted
@@ -87,6 +88,7 @@ OrderDeleted=Order deleted
 InvoiceDeleted=Invoice deleted
 DraftInvoiceDeleted=Draft invoice deleted
 CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_MODIFYInDolibarr=Contact %s modified
 CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Product %s created
 PRODUCT_MODIFYInDolibarr=Product %s modified
@@ -119,6 +121,7 @@ MRP_MO_UNVALIDATEInDolibarr=MO set to draft status
 MRP_MO_PRODUCEDInDolibarr=MO produced
 MRP_MO_DELETEInDolibarr=MO deleted
 MRP_MO_CANCELInDolibarr=MO canceled
+PAIDInDolibarr=%s paid
 ##### End agenda events #####
 AgendaModelModule=Document templates for event
 DateActionStart=Start date
@@ -130,7 +133,7 @@ AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to use
 AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
 AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic events.
 AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> to include events of holidays.
-AgendaShowBirthdayEvents=Show birthdays of contacts
+AgendaShowBirthdayEvents=Birthdays of contacts
 AgendaHideBirthdayEvents=Hide birthdays of contacts
 Busy=Busy
 ExportDataset_event1=List of agenda events
@@ -152,6 +155,7 @@ ActionType=Event type
 DateActionBegin=Start event date
 ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b>?
 RepeatEvent=Repeat event
+OnceOnly=Once only
 EveryWeek=Every week
 EveryMonth=Every month
 DayOfMonth=Day of month
@@ -165,4 +169,4 @@ TimeType=Duration type
 ReminderType=Callback type
 AddReminder=Create an automatic reminder notification for this event
 ErrorReminderActionCommCreation=Error creating the reminder notification for this event
-BrowserPush=Browser Notification
+BrowserPush=Browser Popup Notification
diff --git a/htdocs/langs/bn_BD/bills.lang b/htdocs/langs/bn_BD/bills.lang
index eedbf2893ff..8dc841e564d 100644
--- a/htdocs/langs/bn_BD/bills.lang
+++ b/htdocs/langs/bn_BD/bills.lang
@@ -259,6 +259,7 @@ DateMaxPayment=Payment due on
 DateInvoice=Invoice date
 DatePointOfTax=Point of tax
 NoInvoice=No invoice
+NoOpenInvoice=No open invoice
 ClassifyBill=Classify invoice
 SupplierBillsToPay=Unpaid vendor invoices
 CustomerBillsUnpaid=Unpaid customer invoices
@@ -589,3 +590,4 @@ FacParentLine=Invoice Line Parent
 SituationTotalRayToRest=Remainder to pay without taxe
 PDFSituationTitle=Situation n° %d
 SituationTotalProgress=Total progress %d %%
+SearchUnpaidInvoicesWithDueDate=Search unpaid invoices with a due date = %s
diff --git a/htdocs/langs/bn_BD/cashdesk.lang b/htdocs/langs/bn_BD/cashdesk.lang
index 240503842f3..aea1f02f834 100644
--- a/htdocs/langs/bn_BD/cashdesk.lang
+++ b/htdocs/langs/bn_BD/cashdesk.lang
@@ -102,7 +102,7 @@ CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal numb
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
 SaleStartedAt=Sale started at %s
-ControlCashOpening=Control cash popup at opening POS
+ControlCashOpening=Open the "Control cash" popup when opening the POS
 CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -126,5 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
-ShowPriceHT = Display the price excluding tax column
-ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
+ShowPriceHT = Display the column with the price excluding tax (on screen)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
diff --git a/htdocs/langs/bn_BD/compta.lang b/htdocs/langs/bn_BD/compta.lang
index 7cae82e6ac7..8329346c163 100644
--- a/htdocs/langs/bn_BD/compta.lang
+++ b/htdocs/langs/bn_BD/compta.lang
@@ -286,3 +286,9 @@ ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
 IncludeLoansInResults = Include loans in reports
+InvoiceLate30Days = Invoices late > 30 days
+InvoiceLate15Days = Invoices late > 15 days
+InvoiceLateMinus15Days = Invoices late
+InvoiceNotLate = To be collected < 15 days
+InvoiceNotLate15Days = To be collected in 15 days
+InvoiceNotLate30Days = To be collected in 30 days
diff --git a/htdocs/langs/bn_BD/cron.lang b/htdocs/langs/bn_BD/cron.lang
index 2ebdda1e685..4fd2220dea6 100644
--- a/htdocs/langs/bn_BD/cron.lang
+++ b/htdocs/langs/bn_BD/cron.lang
@@ -60,7 +60,7 @@ CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
 CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Disable
-CronTaskInactive=This job is disabled
+CronTaskInactive=This job is disabled (not scheduled)
 CronId=Id
 CronClassFile=Filename with class
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example 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>
diff --git a/htdocs/langs/bn_BD/errors.lang b/htdocs/langs/bn_BD/errors.lang
index 9b14b5ad1d2..670f8c7a6bc 100644
--- a/htdocs/langs/bn_BD/errors.lang
+++ b/htdocs/langs/bn_BD/errors.lang
@@ -11,6 +11,7 @@ ErrorBadValueForParamNotAString=Bad value for your parameter. It appends general
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s already exists.
 ErrorGroupAlreadyExists=Group %s already exists.
+ErrorEmailAlreadyExists=Email %s already exists.
 ErrorRecordNotFound=Record not found.
 ErrorFailToCopyFile=Failed to copy file '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
@@ -117,7 +118,7 @@ ErrorCantReadFile=Failed to read file '%s'
 ErrorCantReadDir=Failed to read directory '%s'
 ErrorBadLoginPassword=Bad value for login or password
 ErrorLoginDisabled=Your account has been disabled
-ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server. If PHP <b>Safe Mode</b> is enabled, check that command is inside a directory defined by parameter <b>safe_mode_exec_dir</b>.
+ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server user. Check also the command is not protected on shell level by a security layer like apparmor.
 ErrorFailedToChangePassword=Failed to change password
 ErrorLoginDoesNotExists=User with login <b>%s</b> could not be found.
 ErrorLoginHasNoEmail=This user has no email address. Process aborted.
@@ -262,6 +263,7 @@ ErrorDateIsInFuture=Error, the date can't be in the future
 ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
 ErrorAPercentIsRequired=Error, please fill in the percentage correctly
 ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
+ErrorFailedToFindEmailTemplate=Failed to find template with code name %s
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -298,3 +300,4 @@ WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So y
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
+ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
diff --git a/htdocs/langs/bn_BD/eventorganization.lang b/htdocs/langs/bn_BD/eventorganization.lang
index 75b798fbc3a..335c257b224 100644
--- a/htdocs/langs/bn_BD/eventorganization.lang
+++ b/htdocs/langs/bn_BD/eventorganization.lang
@@ -1,4 +1,5 @@
 # Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+# Copyright (C) 2021		Dorian Vabre			<dorian.vabre@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
@@ -81,7 +82,10 @@ PriceOfBoothHelp=Subscription price to stand a booth
 EventOrganizationICSLink=Link ICS for events
 ConferenceOrBoothInformation=Conference Or Booth informations
 Attendees = Attendees
+DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
 #
 # Status
 #
@@ -94,8 +98,46 @@ EvntOrgCancelled = Cancelled
 #
 # Public page
 #
+SuggestForm = Suggestion page
+RegisterPage = Page for conferences or booth
+EvntOrgRegistrationHelpMessage = Here, you can vote for an event, or suggest a new conference or booth for the project
+EvntOrgRegistrationConfHelpMessage = Here, you can suggest a new conference for the project
+EvntOrgRegistrationBoothHelpMessage = Here, you can suggest a new booth for the project
+ListOfSuggestedConferences = List of suggested conferences
+ListOfSuggestedBooths = List of suggested booths
+SuggestConference = Suggest a new conference
+SuggestBooth = Suggest a booth
+ViewAndVote = View and vote for suggested events
 PublicAttendeeSubscriptionPage = Public link of registration to a conference
 MissingOrBadSecureKey = The security key is invalid or missing
-EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
-EvntOrgStartDuration = This conference starts on
-EvntOrgEndDuration =  and ends on
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference : '%s'
+EvntOrgDuration = This conference starts on %s and ends on %s.
+ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
+BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
+EventType = Event type
+
+#
+# Vote page
+#
+EvntOrgRegistrationWelcomeMessage = Welcome on the conference or booth suggestion page.
+EvntOrgRegistrationConfWelcomeMessage = Welcome on the conference suggestion page.
+EvntOrgRegistrationBoothWelcomeMessage = Welcome on the booth suggestion page.
+EvntOrgVoteHelpMessage = Here, you can view and vote for the suggested events for the project
+VoteOk = Your vote has been accepted.
+AlreadyVoted = You have already voted for this event.
+VoteError = An error has occurred during the vote, please try again.
+
+#
+# SubscriptionOk page
+#
+SubscriptionOk = Your subscription to this conference has been validated
+#
+# Subscription validation mail
+#
+ConfAttendeeSubscriptionConfirmation = Confirmation of your subscription to a conference
+#
+# Payment page
+#
+Attendee = Attendee
+PaymentConferenceAttendee = Conference attendee payment
+PaymentBoothLocation = Booth location payment
diff --git a/htdocs/langs/bn_BD/hrm.lang b/htdocs/langs/bn_BD/hrm.lang
index 3b8f137e103..da098e10bdb 100644
--- a/htdocs/langs/bn_BD/hrm.lang
+++ b/htdocs/langs/bn_BD/hrm.lang
@@ -9,7 +9,7 @@ ConfirmDeleteEstablishment=Are you sure you wish to delete this establishment?
 OpenEtablishment=Open establishment
 CloseEtablishment=Close establishment
 # Dictionary
-DictionaryPublicHolidays=HRM - Public holidays
+DictionaryPublicHolidays=Leave - Public holidays
 DictionaryDepartment=HRM - Department list
 DictionaryFunction=HRM - Job positions
 # Module
diff --git a/htdocs/langs/bn_BD/knowledgemanagement.lang b/htdocs/langs/bn_BD/knowledgemanagement.lang
index 269007e60f8..68f5cced76c 100644
--- a/htdocs/langs/bn_BD/knowledgemanagement.lang
+++ b/htdocs/langs/bn_BD/knowledgemanagement.lang
@@ -47,7 +47,7 @@ KnowledgeManagementArea = Knowledge Management
 # Menu
 #
 MenuKnowledgeRecord = Knowledge base
-ListOfArticles = List of articles
+ListKnowledgeRecord = List of articles
 NewKnowledgeRecord = New article
 ValidateReply = Validate solution
 KnowledgeRecords = Articles
diff --git a/htdocs/langs/bn_BD/languages.lang b/htdocs/langs/bn_BD/languages.lang
index ba187326705..da8ad5376a1 100644
--- a/htdocs/langs/bn_BD/languages.lang
+++ b/htdocs/langs/bn_BD/languages.lang
@@ -3,6 +3,7 @@ Language_am_ET=Ethiopian
 Language_ar_AR=Arabic
 Language_ar_EG=Arabic (Egypt)
 Language_ar_SA=Arabic
+Language_ar_TN=Arabic (Tunisia)
 Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengali
 Language_bn_IN=Bengali (India)
@@ -84,6 +85,7 @@ Language_nl_NL=Dutch
 Language_pl_PL=Polish
 Language_pt_BR=Portuguese (Brazil)
 Language_pt_PT=Portuguese
+Language_ro_MD=Romanian (Moldavia)
 Language_ro_RO=Romanian
 Language_ru_RU=Russian
 Language_ru_UA=Russian (Ukraine)
diff --git a/htdocs/langs/bn_BD/main.lang b/htdocs/langs/bn_BD/main.lang
index 59536b0ad17..207f7f5f1d7 100644
--- a/htdocs/langs/bn_BD/main.lang
+++ b/htdocs/langs/bn_BD/main.lang
@@ -430,6 +430,7 @@ LT1IN=CGST
 LT2IN=SGST
 LT1GC=Additionnal cents
 VATRate=Tax Rate
+RateOfTaxN=Rate of tax %s
 VATCode=Tax Rate code
 VATNPR=Tax Rate NPR
 DefaultTaxRate=Default tax rate
@@ -729,6 +730,7 @@ MenuMembers=Members
 MenuAgendaGoogle=Google agenda
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
+ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
 NoFileFound=No documents uploaded
 CurrentUserLanguage=Current language
 CurrentTheme=Current theme
@@ -1072,6 +1074,7 @@ ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
 ToClose=To close
+ToRefuse=To refuse
 ToProcess=To process
 ToApprove=To approve
 GlobalOpenedElemView=Global view
@@ -1126,9 +1129,11 @@ UpdateForAllLines=Update for all lines
 OnHold=On hold
 Civility=Civility
 AffectTag=Affect Tag
+CreateExternalUser=Create external user
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
 ConfirmCancel=Are you sure you want to cancel
+EmailMsgID=Email MsgID
diff --git a/htdocs/langs/bn_BD/members.lang b/htdocs/langs/bn_BD/members.lang
index 042b85598c0..d8b9c2f59f3 100644
--- a/htdocs/langs/bn_BD/members.lang
+++ b/htdocs/langs/bn_BD/members.lang
@@ -213,3 +213,5 @@ SendReminderForExpiredSubscription=Send reminder by email to members when subscr
 MembershipPaid=Membership paid for current period (until %s)
 YouMayFindYourInvoiceInThisEmail=You may find your invoice attached to this email
 XMembersClosed=%s member(s) closed
+XExternalUserCreated=%s external user(s) created
+ForceMemberNature=Force member nature (Individual or Corporation)
diff --git a/htdocs/langs/bn_BD/modulebuilder.lang b/htdocs/langs/bn_BD/modulebuilder.lang
index 9fdaa1a533a..23a098be2e5 100644
--- a/htdocs/langs/bn_BD/modulebuilder.lang
+++ b/htdocs/langs/bn_BD/modulebuilder.lang
@@ -143,3 +143,4 @@ AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
 ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
+ImportExportProfiles=Import and export profiles
diff --git a/htdocs/langs/bn_BD/mrp.lang b/htdocs/langs/bn_BD/mrp.lang
index ec999a473a4..2414a92cefb 100644
--- a/htdocs/langs/bn_BD/mrp.lang
+++ b/htdocs/langs/bn_BD/mrp.lang
@@ -8,12 +8,12 @@ MenuBOM=Bills of material
 LatestBOMModified=Latest %s Bills of materials modified
 LatestMOModified=Latest %s Manufacturing Orders modified
 Bom=Bills of Material
-BillOfMaterials=Bill of Material
+BillOfMaterials=Bill of Materials
 BOMsSetup=Setup of module BOM
 ListOfBOMs=List of bills of material - BOM
 ListOfManufacturingOrders=List of Manufacturing Orders
-NewBOM=New bill of material
-ProductBOMHelp=Product to create with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
+NewBOM=New bill of materials
+ProductBOMHelp=Product to create (or disassemble) with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
 BOMsNumberingModules=BOM numbering templates
 BOMsModelModule=BOM document templates
 MOsNumberingModules=MO numbering templates
@@ -22,7 +22,7 @@ FreeLegalTextOnBOMs=Free text on document of BOM
 WatermarkOnDraftBOMs=Watermark on draft BOM
 FreeLegalTextOnMOs=Free text on document of MO
 WatermarkOnDraftMOs=Watermark on draft MO
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials %s ?
 ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
 ManufacturingEfficiency=Manufacturing efficiency
 ConsumptionEfficiency=Consumption efficiency
@@ -30,8 +30,8 @@ ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the produc
 ValueOfMeansLossForProductProduced=Value of 0.95 means an average of 5%% of loss of produced product
 DeleteBillOfMaterials=Delete Bill Of Materials
 DeleteMo=Delete Manufacturing Order
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Materials?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Materials?
 MenuMRP=Manufacturing Orders
 NewMO=New Manufacturing Order
 QtyToProduce=Qty to produce
@@ -39,7 +39,7 @@ DateStartPlannedMo=Date start planned
 DateEndPlannedMo=Date end planned
 KeepEmptyForAsap=Empty means 'As Soon As Possible'
 EstimatedDuration=Estimated duration
-EstimatedDurationDesc=Estimated duration to manufacture this product using this BOM
+EstimatedDurationDesc=Estimated duration to manufacture (or disassemble) this product using this BOM
 ConfirmValidateBom=Are you sure you want to validate the BOM with the reference <strong>%s</strong> (you will be able to use it to build new Manufacturing Orders)
 ConfirmCloseBom=Are you sure you want to cancel this BOM (you won't be able to use it to build new Manufacturing Orders anymore) ?
 ConfirmReopenBom=Are you sure you want to re-open this BOM (you will be able to use it to build new Manufacturing Orders)
@@ -63,13 +63,14 @@ ConsumeAndProduceAll=Consume and Produce All
 Manufactured=Manufactured
 TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
 ForAQuantityOf=For a quantity to produce of %s
+ForAQuantityToConsumeOf=For a quantity to disassemble of %s
 ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
 ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
 ProductionForRef=Production of %s
 AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
 NoStockChangeOnServices=No stock change on services
 ProductQtyToConsumeByMO=Product quantity still to consume by open MO
-ProductQtyToProduceByMO=Product quentity still to produce by open MO
+ProductQtyToProduceByMO=Product quantity still to produce by open MO
 AddNewConsumeLines=Add new line to consume
 ProductsToConsume=Products to consume
 ProductsToProduce=Products to produce
@@ -83,15 +84,13 @@ Workstations=Workstations
 WorkstationsDescription=Workstations management
 WorkstationSetup = Workstations setup
 WorkstationSetupPage = Workstations setup page
-WorkstationAbout = About Workstation
-WorkstationAboutPage = Workstations about page
 WorkstationList=Workstation list
 WorkstationCreate=Add new workstation
 ConfirmEnableWorkstation=Are you sure you want to enable workstation <b>%s</b> ?
 EnableAWorkstation=Enable a workstation
 ConfirmDisableWorkstation=Are you sure you want to disable workstation <b>%s</b> ?
 DisableAWorkstation=Disable a workstation
-DeleteWorkstation=Supprimer
+DeleteWorkstation=Delete
 NbOperatorsRequired=Number of operators required
 THMOperatorEstimated=Estimated operator THM
 THMMachineEstimated=Estimated machine THM
diff --git a/htdocs/langs/bn_BD/orders.lang b/htdocs/langs/bn_BD/orders.lang
index 87d196eb22f..5dab5b99bf1 100644
--- a/htdocs/langs/bn_BD/orders.lang
+++ b/htdocs/langs/bn_BD/orders.lang
@@ -11,6 +11,7 @@ OrderDate=Order date
 OrderDateShort=Order date
 OrderToProcess=Order to process
 NewOrder=New order
+NewSupplierOrderShort=New order
 NewOrderSupplier=New Purchase Order
 ToOrder=Make order
 MakeOrder=Make order
@@ -73,6 +74,7 @@ DeleteOrder=Delete order
 CancelOrder=Cancel order
 OrderReopened= Order %s re-open
 AddOrder=Create order
+AddSupplierOrderShort=Create order
 AddPurchaseOrder=Create purchase order
 AddToDraftOrders=Add to draft order
 ShowOrder=Show order
diff --git a/htdocs/langs/bn_BD/other.lang b/htdocs/langs/bn_BD/other.lang
index 95297a98859..bb35099ab82 100644
--- a/htdocs/langs/bn_BD/other.lang
+++ b/htdocs/langs/bn_BD/other.lang
@@ -129,6 +129,7 @@ ClosedByLogin=User login who closed
 FileWasRemoved=File %s was removed
 DirWasRemoved=Directory %s was removed
 FeatureNotYetAvailable=Feature not yet available in the current version
+FeatureNotAvailableOnDevicesWithoutMouse=Feature not available on devices without mouse
 FeaturesSupported=Supported features
 Width=Width
 Height=Height
@@ -263,7 +264,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
-PrefixSession=Prefix for session ID
+SuffixSessionName=Suffix for session name
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/bn_BD/partnership.lang b/htdocs/langs/bn_BD/partnership.lang
index 09059995a8d..2fb10e8159e 100644
--- a/htdocs/langs/bn_BD/partnership.lang
+++ b/htdocs/langs/bn_BD/partnership.lang
@@ -16,41 +16,72 @@
 #
 # Generic
 #
-ModulePartnershipName = Partnership management
-PartnershipDescription = Module Partnership management
+ModulePartnershipName=Partnership management
+PartnershipDescription=Module Partnership management
 PartnershipDescriptionLong= Module Partnership management
 
+AddPartnership=Add partnership
+CancelPartnershipForExpiredMembers=Partnership: Cancel partnership of members with expired subscriptions
+PartnershipCheckBacklink=Partnership: Check referring backlink
+
 #
 # Menu
 #
-NewPartnership = New Partnership
-ListOfPartnerships = List of partnership
+NewPartnership=New Partnership
+ListOfPartnerships=List of partnership
 
 #
 # Admin page
 #
-PartnershipSetup = Partnership setup
-PartnershipAbout = About Partnership
-PartnershipAboutPage = Partnership about page
-
+PartnershipSetup=Partnership setup
+PartnershipAbout=About Partnership
+PartnershipAboutPage=Partnership about page
+partnershipforthirdpartyormember=Partner status must be set on a 'thirdparty' or a 'member'
+PARTNERSHIP_IS_MANAGED_FOR=Partnership managed for
+PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks to check
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb of days before cancelling status of a partnership when a subscription has expired
+ReferingWebsiteCheck=Check of website referring
+ReferingWebsiteCheckDesc=You can enable a feature to check that your partners has added a backlink to your website domains on their own website.
 
 #
 # Object
 #
+DeletePartnership=Delete a partnership
+PartnershipDedicatedToThisThirdParty=Partnership dedicated to this third party
+PartnershipDedicatedToThisMember=Partnership dedicated to this member
 DatePartnershipStart=Start date
 DatePartnershipEnd=End date
+ReasonDecline=Decline reason
+ReasonDeclineOrCancel=Decline reason
+PartnershipAlreadyExist=Partnership already exist
+ManagePartnership=Manage partnership
+BacklinkNotFoundOnPartnerWebsite=Backlink not found on partner website
+ConfirmClosePartnershipAsk=Are you sure you want to cancel this partnership?
+PartnershipType=Partnership type
 
 #
 # Template Mail
 #
+SendingEmailOnPartnershipWillSoonBeCanceled=Partnership will soon be canceled
+SendingEmailOnPartnershipRefused=Partnership refused
+SendingEmailOnPartnershipAccepted=Partnership accepted
+SendingEmailOnPartnershipCanceled=Partnership canceled
 
+YourPartnershipWillSoonBeCanceledTopic=Partnership will soon be canceled
+YourPartnershipRefusedTopic=Partnership refused
+YourPartnershipAcceptedTopic=Partnership accepted
+YourPartnershipCanceledTopic=Partnership canceled
+
+YourPartnershipWillSoonBeCanceledContent=We inform you that your partnership will soon be canceled (Backlink not found)
+YourPartnershipRefusedContent=We inform you that your partnership request has been refused.
+YourPartnershipAcceptedContent=We inform you that your partnership request has been accepted.
+YourPartnershipCanceledContent=We inform you that your partnership has been canceled.
 
 #
 # Status
 #
-PartnershipDraft = Draft
-PartnershipAccepted = Accepted
-PartnershipRefused = Refused
-PartnershipCanceled = Canceled
-
+PartnershipDraft=Draft
+PartnershipAccepted=Accepted
+PartnershipRefused=Refused
+PartnershipCanceled=Canceled
 PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/bn_BD/productbatch.lang b/htdocs/langs/bn_BD/productbatch.lang
index ad2db658e2e..450d0285819 100644
--- a/htdocs/langs/bn_BD/productbatch.lang
+++ b/htdocs/langs/bn_BD/productbatch.lang
@@ -1,4 +1,4 @@
-# ProductBATCH language file - en_US - ProductBATCH
+# ProductBATCH language file - Source file is en_US - ProductBATCH
 ManageLotSerial=Use lot/serial number
 ProductStatusOnBatch=Yes (lot required)
 ProductStatusOnSerial=Yes (unique serial number required)
@@ -33,3 +33,13 @@ CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+LifeTime=Life span (in days)
+EndOfLife=End of life
+ManufacturingDate=Manufacturing date
+DestructionDate=Destruction date
+FirstUseDate=First use date
+QCFrequency=Quality control frequency (in days)
+
+#Traceability - qc status
+OutOfOrder=Out of order
+InWorkingOrder=In working order
diff --git a/htdocs/langs/bn_BD/products.lang b/htdocs/langs/bn_BD/products.lang
index 0875be0dc07..9638dfe5a25 100644
--- a/htdocs/langs/bn_BD/products.lang
+++ b/htdocs/langs/bn_BD/products.lang
@@ -396,3 +396,5 @@ ActionAvailableOnVariantProductOnly=Action only available on the variant of prod
 ProductsPricePerCustomer=Product prices per customers
 ProductSupplierExtraFields=Additional Attributes (Supplier Prices)
 DeleteLinkedProduct=Delete the child product linked to the combination
+PMPValue=Weighted average price
+PMPValueShort=WAP
diff --git a/htdocs/langs/bn_BD/projects.lang b/htdocs/langs/bn_BD/projects.lang
index 79c974f6e24..6c96fadb5c1 100644
--- a/htdocs/langs/bn_BD/projects.lang
+++ b/htdocs/langs/bn_BD/projects.lang
@@ -267,9 +267,11 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=New invoice
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+OneLinePerTimeSpentLine=One line for each time spent declaration
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
 AddPersonToTask=Add also to tasks
 UsageOrganizeEvent=Usage: Event Organization
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
+SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
diff --git a/htdocs/langs/bn_BD/receptions.lang b/htdocs/langs/bn_BD/receptions.lang
index 760ff884fa0..338602e722e 100644
--- a/htdocs/langs/bn_BD/receptions.lang
+++ b/htdocs/langs/bn_BD/receptions.lang
@@ -44,4 +44,4 @@ ValidateOrderFirstBeforeReception=You must first validate the order before being
 ReceptionsNumberingModules=Numbering module for receptions
 ReceptionsReceiptModel=Document templates for receptions
 NoMorePredefinedProductToDispatch=No more predefined products to dispatch
-
+ReceptionExist=A reception exists
diff --git a/htdocs/langs/bn_BD/stocks.lang b/htdocs/langs/bn_BD/stocks.lang
index 9ec523427b1..d39791932a3 100644
--- a/htdocs/langs/bn_BD/stocks.lang
+++ b/htdocs/langs/bn_BD/stocks.lang
@@ -56,8 +56,6 @@ UnitPurchaseValue=Unit purchase price
 StockTooLow=Stock too low
 StockLowerThanLimit=Stock lower than alert limit (%s)
 EnhancedValue=Value
-PMPValue=Weighted average price
-PMPValueShort=WAP
 EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
@@ -251,7 +249,10 @@ SelectAStockMovementFileToImport=select a stock movement file to import
 InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
 LabelOfInventoryMovemement=Inventory %s
 ReOpen=Reopen
-ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock to the real qty you entered into the inventory.
 ObjectNotFound=%s not found
 MakeMovementsAndClose=Generate movements and close
 AutofillWithExpected=Fill real quantity with expected quantity
+ShowAllBatchByDefault=By default, show batch details on product "stock" tab
+CollapseBatchDetailHelp=You can set batch detail default display in stocks module configuration
+FieldCannotBeNegative=Field "%s" cannot be negative
diff --git a/htdocs/langs/bn_BD/ticket.lang b/htdocs/langs/bn_BD/ticket.lang
index df73daf4a0d..1da32a5a99e 100644
--- a/htdocs/langs/bn_BD/ticket.lang
+++ b/htdocs/langs/bn_BD/ticket.lang
@@ -304,7 +304,7 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
-BoxTicketType=Number of open tickets by type
+BoxTicketType=Distribution of open tickets by type
 BoxTicketSeverity=Number of open tickets by severity
 BoxNoTicketSeverity=No tickets opened
 BoxTicketLastXDays=Number of new tickets by days the last %s days
diff --git a/htdocs/langs/bn_IN/accountancy.lang b/htdocs/langs/bn_IN/accountancy.lang
index 354cddb62c2..27be673dd9c 100644
--- a/htdocs/langs/bn_IN/accountancy.lang
+++ b/htdocs/langs/bn_IN/accountancy.lang
@@ -158,7 +158,7 @@ ACCOUNTING_LENGTH_AACCOUNT=Length of the third-party accounting accounts (If you
 ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of an accounting account. Needed by some countries (like Switzerland). If set to off (default), you can set the following two parameters to ask the application to add virtual zeros.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties, break ability to search on a part of value)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
@@ -328,6 +328,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountanc
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
+NotifiedExportDate=Notified export date (modification of the entries will not be possible)
+NotifiedValidationDate=Validation of the entries (modification or deletion of the entries will not be possible)
+ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=Export draft journal
 Modelcsv=Model of export
 Selectmodelcsv=Select a model of export
diff --git a/htdocs/langs/bn_IN/admin.lang b/htdocs/langs/bn_IN/admin.lang
index fb4513a09b4..be9aca94599 100644
--- a/htdocs/langs/bn_IN/admin.lang
+++ b/htdocs/langs/bn_IN/admin.lang
@@ -221,8 +221,8 @@ NotCompatible=This module does not seem compatible with your Dolibarr %s (Min %s
 CompatibleAfterUpdate=This module requires an update to your Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=See in Market place
 SeeSetupOfModule=See setup of module %s
+SetOptionTo=Set option <b>%s</b> to %s
 Updated=Updated
-Nouveauté=Novelty
 AchatTelechargement=Buy / Download
 GoModuleSetupArea=To deploy/install a new module, go to the Module setup area: <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
@@ -399,6 +399,7 @@ SecurityToken=Key to secure URLs
 NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
 PDF=PDF
 PDFDesc=Global options for PDF generation
+PDFOtherDesc=PDF Option specific to some modules
 PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
 PDFRulesForSalesTax=Rules for Sales Tax / VAT
@@ -561,7 +562,7 @@ Module53Desc=Management of Services
 Module54Name=Contracts/Subscriptions
 Module54Desc=Management of contracts (services or recurring subscriptions)
 Module55Name=Barcodes
-Module55Desc=Barcode management
+Module55Desc=Barcode or QR code management
 Module56Name=Payment by credit transfer
 Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
 Module57Name=Payments by Direct Debit
@@ -848,10 +849,10 @@ Permission402=Create/modify discounts
 Permission403=Validate discounts
 Permission404=Delete discounts
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries (yours and subordinates)
-Permission512=Create/modify payments of salaries
-Permission514=Delete payments of salaries
-Permission517=Read payments of salaries of everybody
+Permission511=Read salaries and payments (yours and subordinates)
+Permission512=Create/modify salaries and payments
+Permission514=Delete salaries and payments
+Permission517=Read salaries and payments everybody
 Permission519=Export salaries
 Permission520=Read Loans
 Permission522=Create/modify loans
@@ -965,6 +966,8 @@ Permission23003=Delete Scheduled job
 Permission23004=Execute Scheduled job
 Permission50101=Use Point of Sale (SimplePOS)
 Permission50151=Use Point of Sale (TakePOS)
+Permission50152=Edit sales lines
+Permission50153=Edit ordered sales lines
 Permission50201=Read transactions
 Permission50202=Import transactions
 Permission50330=Read objects of Zapier
@@ -1039,11 +1042,12 @@ DictionaryMeasuringUnits=Measuring Units
 DictionarySocialNetworks=Social Networks
 DictionaryProspectStatus=Prospect status for companies
 DictionaryProspectContactStatus=Prospect status for contacts
-DictionaryHolidayTypes=Types of leave
+DictionaryHolidayTypes=Leave - Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
 DictionaryTransportMode=Intracomm report - Transport mode
+DictionaryBatchStatus=Product lot/serial Quality Control status
 TypeOfUnit=Type of unit
 SetupSaved=Setup saved
 SetupNotSaved=Setup not saved
@@ -1187,7 +1191,7 @@ SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of m
 SetupDescription5=Other Setup menu entries manage optional parameters.
 AuditedSecurityEvents=Security events that are audited
 NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
-Audit=Audit
+Audit=Security events
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
 InfoOS=About OS
@@ -1319,9 +1323,12 @@ ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
 NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
+ComboListOptim=Combo list loading optimization
 SearchOptim=Search optimization
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
-YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
+YouHaveXObjectUseComboOptim=You have %s %s in the database. You can go into setup of module to enable loading of combo list on key pressed event.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other.
+YouHaveXObjectUseSearchOptimDesc=This limits the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to %s in Home-Setup-Other.
 BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
 BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
 PHPModuleLoaded=PHP component %s is loaded
@@ -1433,6 +1440,7 @@ MemberMainOptions=Main options
 AdherentLoginRequired= Manage a Login for each member
 AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
+MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
 MembersDocModules=Document templates for documents generated from member record
@@ -1763,7 +1771,7 @@ AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting men
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
-AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the scheduled job %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
@@ -1979,6 +1987,8 @@ 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_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add picture on proposal line
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add electronic sign in PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
@@ -2096,7 +2106,6 @@ PDF_SHOW_PROJECT=Show project on document
 ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
-FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
@@ -2120,12 +2129,18 @@ ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by
 MailToSendEventOrganization=Event Organization
 AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
 YouShouldDisablePHPFunctions=You should disable PHP functions
-IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands in custom code, you shoud disable PHP functions
+PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
+NotRecommended=Not recommanded
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
 ModuleUpdateAvailable=An update is available
 NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
+RandomlySelectedIfSeveral=Randomly selected if several pictures are available
+DatabasePasswordObfuscated=Database password is obfuscated in conf file
+DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
diff --git a/htdocs/langs/bn_IN/agenda.lang b/htdocs/langs/bn_IN/agenda.lang
index 09d82139a49..a1183841b00 100644
--- a/htdocs/langs/bn_IN/agenda.lang
+++ b/htdocs/langs/bn_IN/agenda.lang
@@ -4,7 +4,7 @@ Actions=Events
 Agenda=Agenda
 TMenuAgenda=Agenda
 Agendas=Agendas
-LocalAgenda=Internal calendar
+LocalAgenda=Default calendar
 ActionsOwnedBy=Event owned by
 ActionsOwnedByShort=Owner
 AffectedTo=Assigned to
@@ -14,13 +14,13 @@ EventsNb=Number of events
 ListOfActions=List of events
 EventReports=Event reports
 Location=Location
-ToUserOfGroup=Event assigned to any user in group
+ToUserOfGroup=Event assigned to any user in the group
 EventOnFullDay=Event on all day(s)
 MenuToDoActions=All incomplete events
 MenuDoneActions=All terminated events
 MenuToDoMyActions=My incomplete events
 MenuDoneMyActions=My terminated events
-ListOfEvents=List of events (internal calendar)
+ListOfEvents=List of events (default calendar)
 ActionsAskedBy=Events reported by
 ActionsToDoBy=Events assigned to
 ActionsDoneBy=Events done by
@@ -38,6 +38,7 @@ ActionsEvents=Events for which Dolibarr will create an action in agenda automati
 EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Third party %s created
+COMPANY_MODIFYInDolibarr=Third party %s modified
 COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=Contract %s validated
 CONTRACT_DELETEInDolibarr=Contract %s deleted
@@ -87,6 +88,7 @@ OrderDeleted=Order deleted
 InvoiceDeleted=Invoice deleted
 DraftInvoiceDeleted=Draft invoice deleted
 CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_MODIFYInDolibarr=Contact %s modified
 CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Product %s created
 PRODUCT_MODIFYInDolibarr=Product %s modified
@@ -119,6 +121,7 @@ MRP_MO_UNVALIDATEInDolibarr=MO set to draft status
 MRP_MO_PRODUCEDInDolibarr=MO produced
 MRP_MO_DELETEInDolibarr=MO deleted
 MRP_MO_CANCELInDolibarr=MO canceled
+PAIDInDolibarr=%s paid
 ##### End agenda events #####
 AgendaModelModule=Document templates for event
 DateActionStart=Start date
@@ -130,7 +133,7 @@ AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to use
 AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
 AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic events.
 AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> to include events of holidays.
-AgendaShowBirthdayEvents=Show birthdays of contacts
+AgendaShowBirthdayEvents=Birthdays of contacts
 AgendaHideBirthdayEvents=Hide birthdays of contacts
 Busy=Busy
 ExportDataset_event1=List of agenda events
@@ -152,6 +155,7 @@ ActionType=Event type
 DateActionBegin=Start event date
 ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b>?
 RepeatEvent=Repeat event
+OnceOnly=Once only
 EveryWeek=Every week
 EveryMonth=Every month
 DayOfMonth=Day of month
@@ -165,4 +169,4 @@ TimeType=Duration type
 ReminderType=Callback type
 AddReminder=Create an automatic reminder notification for this event
 ErrorReminderActionCommCreation=Error creating the reminder notification for this event
-BrowserPush=Browser Notification
+BrowserPush=Browser Popup Notification
diff --git a/htdocs/langs/bn_IN/bills.lang b/htdocs/langs/bn_IN/bills.lang
index c55f483873b..7b8c997d2e6 100644
--- a/htdocs/langs/bn_IN/bills.lang
+++ b/htdocs/langs/bn_IN/bills.lang
@@ -259,6 +259,7 @@ DateMaxPayment=Payment due on
 DateInvoice=Invoice date
 DatePointOfTax=Point of tax
 NoInvoice=No invoice
+NoOpenInvoice=No open invoice
 ClassifyBill=Classify invoice
 SupplierBillsToPay=Unpaid vendor invoices
 CustomerBillsUnpaid=Unpaid customer invoices
@@ -589,3 +590,4 @@ FacParentLine=Invoice Line Parent
 SituationTotalRayToRest=Remainder to pay without taxe
 PDFSituationTitle=Situation n° %d
 SituationTotalProgress=Total progress %d %%
+SearchUnpaidInvoicesWithDueDate=Search unpaid invoices with a due date = %s
diff --git a/htdocs/langs/bn_IN/cashdesk.lang b/htdocs/langs/bn_IN/cashdesk.lang
index 240503842f3..aea1f02f834 100644
--- a/htdocs/langs/bn_IN/cashdesk.lang
+++ b/htdocs/langs/bn_IN/cashdesk.lang
@@ -102,7 +102,7 @@ CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal numb
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
 SaleStartedAt=Sale started at %s
-ControlCashOpening=Control cash popup at opening POS
+ControlCashOpening=Open the "Control cash" popup when opening the POS
 CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -126,5 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
-ShowPriceHT = Display the price excluding tax column
-ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
+ShowPriceHT = Display the column with the price excluding tax (on screen)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
diff --git a/htdocs/langs/bn_IN/compta.lang b/htdocs/langs/bn_IN/compta.lang
index 7cae82e6ac7..8329346c163 100644
--- a/htdocs/langs/bn_IN/compta.lang
+++ b/htdocs/langs/bn_IN/compta.lang
@@ -286,3 +286,9 @@ ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
 IncludeLoansInResults = Include loans in reports
+InvoiceLate30Days = Invoices late > 30 days
+InvoiceLate15Days = Invoices late > 15 days
+InvoiceLateMinus15Days = Invoices late
+InvoiceNotLate = To be collected < 15 days
+InvoiceNotLate15Days = To be collected in 15 days
+InvoiceNotLate30Days = To be collected in 30 days
diff --git a/htdocs/langs/bn_IN/cron.lang b/htdocs/langs/bn_IN/cron.lang
index 2ebdda1e685..4fd2220dea6 100644
--- a/htdocs/langs/bn_IN/cron.lang
+++ b/htdocs/langs/bn_IN/cron.lang
@@ -60,7 +60,7 @@ CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
 CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Disable
-CronTaskInactive=This job is disabled
+CronTaskInactive=This job is disabled (not scheduled)
 CronId=Id
 CronClassFile=Filename with class
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example 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>
diff --git a/htdocs/langs/bn_IN/errors.lang b/htdocs/langs/bn_IN/errors.lang
index 9b14b5ad1d2..670f8c7a6bc 100644
--- a/htdocs/langs/bn_IN/errors.lang
+++ b/htdocs/langs/bn_IN/errors.lang
@@ -11,6 +11,7 @@ ErrorBadValueForParamNotAString=Bad value for your parameter. It appends general
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s already exists.
 ErrorGroupAlreadyExists=Group %s already exists.
+ErrorEmailAlreadyExists=Email %s already exists.
 ErrorRecordNotFound=Record not found.
 ErrorFailToCopyFile=Failed to copy file '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
@@ -117,7 +118,7 @@ ErrorCantReadFile=Failed to read file '%s'
 ErrorCantReadDir=Failed to read directory '%s'
 ErrorBadLoginPassword=Bad value for login or password
 ErrorLoginDisabled=Your account has been disabled
-ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server. If PHP <b>Safe Mode</b> is enabled, check that command is inside a directory defined by parameter <b>safe_mode_exec_dir</b>.
+ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server user. Check also the command is not protected on shell level by a security layer like apparmor.
 ErrorFailedToChangePassword=Failed to change password
 ErrorLoginDoesNotExists=User with login <b>%s</b> could not be found.
 ErrorLoginHasNoEmail=This user has no email address. Process aborted.
@@ -262,6 +263,7 @@ ErrorDateIsInFuture=Error, the date can't be in the future
 ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
 ErrorAPercentIsRequired=Error, please fill in the percentage correctly
 ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
+ErrorFailedToFindEmailTemplate=Failed to find template with code name %s
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -298,3 +300,4 @@ WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So y
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
+ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
diff --git a/htdocs/langs/bn_IN/eventorganization.lang b/htdocs/langs/bn_IN/eventorganization.lang
index 75b798fbc3a..335c257b224 100644
--- a/htdocs/langs/bn_IN/eventorganization.lang
+++ b/htdocs/langs/bn_IN/eventorganization.lang
@@ -1,4 +1,5 @@
 # Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+# Copyright (C) 2021		Dorian Vabre			<dorian.vabre@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
@@ -81,7 +82,10 @@ PriceOfBoothHelp=Subscription price to stand a booth
 EventOrganizationICSLink=Link ICS for events
 ConferenceOrBoothInformation=Conference Or Booth informations
 Attendees = Attendees
+DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
 #
 # Status
 #
@@ -94,8 +98,46 @@ EvntOrgCancelled = Cancelled
 #
 # Public page
 #
+SuggestForm = Suggestion page
+RegisterPage = Page for conferences or booth
+EvntOrgRegistrationHelpMessage = Here, you can vote for an event, or suggest a new conference or booth for the project
+EvntOrgRegistrationConfHelpMessage = Here, you can suggest a new conference for the project
+EvntOrgRegistrationBoothHelpMessage = Here, you can suggest a new booth for the project
+ListOfSuggestedConferences = List of suggested conferences
+ListOfSuggestedBooths = List of suggested booths
+SuggestConference = Suggest a new conference
+SuggestBooth = Suggest a booth
+ViewAndVote = View and vote for suggested events
 PublicAttendeeSubscriptionPage = Public link of registration to a conference
 MissingOrBadSecureKey = The security key is invalid or missing
-EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
-EvntOrgStartDuration = This conference starts on
-EvntOrgEndDuration =  and ends on
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference : '%s'
+EvntOrgDuration = This conference starts on %s and ends on %s.
+ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
+BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
+EventType = Event type
+
+#
+# Vote page
+#
+EvntOrgRegistrationWelcomeMessage = Welcome on the conference or booth suggestion page.
+EvntOrgRegistrationConfWelcomeMessage = Welcome on the conference suggestion page.
+EvntOrgRegistrationBoothWelcomeMessage = Welcome on the booth suggestion page.
+EvntOrgVoteHelpMessage = Here, you can view and vote for the suggested events for the project
+VoteOk = Your vote has been accepted.
+AlreadyVoted = You have already voted for this event.
+VoteError = An error has occurred during the vote, please try again.
+
+#
+# SubscriptionOk page
+#
+SubscriptionOk = Your subscription to this conference has been validated
+#
+# Subscription validation mail
+#
+ConfAttendeeSubscriptionConfirmation = Confirmation of your subscription to a conference
+#
+# Payment page
+#
+Attendee = Attendee
+PaymentConferenceAttendee = Conference attendee payment
+PaymentBoothLocation = Booth location payment
diff --git a/htdocs/langs/bn_IN/hrm.lang b/htdocs/langs/bn_IN/hrm.lang
index 3b8f137e103..da098e10bdb 100644
--- a/htdocs/langs/bn_IN/hrm.lang
+++ b/htdocs/langs/bn_IN/hrm.lang
@@ -9,7 +9,7 @@ ConfirmDeleteEstablishment=Are you sure you wish to delete this establishment?
 OpenEtablishment=Open establishment
 CloseEtablishment=Close establishment
 # Dictionary
-DictionaryPublicHolidays=HRM - Public holidays
+DictionaryPublicHolidays=Leave - Public holidays
 DictionaryDepartment=HRM - Department list
 DictionaryFunction=HRM - Job positions
 # Module
diff --git a/htdocs/langs/bn_IN/knowledgemanagement.lang b/htdocs/langs/bn_IN/knowledgemanagement.lang
index 269007e60f8..68f5cced76c 100644
--- a/htdocs/langs/bn_IN/knowledgemanagement.lang
+++ b/htdocs/langs/bn_IN/knowledgemanagement.lang
@@ -47,7 +47,7 @@ KnowledgeManagementArea = Knowledge Management
 # Menu
 #
 MenuKnowledgeRecord = Knowledge base
-ListOfArticles = List of articles
+ListKnowledgeRecord = List of articles
 NewKnowledgeRecord = New article
 ValidateReply = Validate solution
 KnowledgeRecords = Articles
diff --git a/htdocs/langs/bn_IN/languages.lang b/htdocs/langs/bn_IN/languages.lang
index ba187326705..da8ad5376a1 100644
--- a/htdocs/langs/bn_IN/languages.lang
+++ b/htdocs/langs/bn_IN/languages.lang
@@ -3,6 +3,7 @@ Language_am_ET=Ethiopian
 Language_ar_AR=Arabic
 Language_ar_EG=Arabic (Egypt)
 Language_ar_SA=Arabic
+Language_ar_TN=Arabic (Tunisia)
 Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengali
 Language_bn_IN=Bengali (India)
@@ -84,6 +85,7 @@ Language_nl_NL=Dutch
 Language_pl_PL=Polish
 Language_pt_BR=Portuguese (Brazil)
 Language_pt_PT=Portuguese
+Language_ro_MD=Romanian (Moldavia)
 Language_ro_RO=Romanian
 Language_ru_RU=Russian
 Language_ru_UA=Russian (Ukraine)
diff --git a/htdocs/langs/bn_IN/main.lang b/htdocs/langs/bn_IN/main.lang
index 13793aad13f..863b94af564 100644
--- a/htdocs/langs/bn_IN/main.lang
+++ b/htdocs/langs/bn_IN/main.lang
@@ -430,6 +430,7 @@ LT1IN=CGST
 LT2IN=SGST
 LT1GC=Additionnal cents
 VATRate=Tax Rate
+RateOfTaxN=Rate of tax %s
 VATCode=Tax Rate code
 VATNPR=Tax Rate NPR
 DefaultTaxRate=Default tax rate
@@ -729,6 +730,7 @@ MenuMembers=Members
 MenuAgendaGoogle=Google agenda
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
+ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
 NoFileFound=No documents uploaded
 CurrentUserLanguage=Current language
 CurrentTheme=Current theme
@@ -1072,6 +1074,7 @@ ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
 ToClose=To close
+ToRefuse=To refuse
 ToProcess=To process
 ToApprove=To approve
 GlobalOpenedElemView=Global view
@@ -1126,9 +1129,11 @@ UpdateForAllLines=Update for all lines
 OnHold=On hold
 Civility=Civility
 AffectTag=Affect Tag
+CreateExternalUser=Create external user
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
 ConfirmCancel=Are you sure you want to cancel
+EmailMsgID=Email MsgID
diff --git a/htdocs/langs/bn_IN/members.lang b/htdocs/langs/bn_IN/members.lang
index 042b85598c0..d8b9c2f59f3 100644
--- a/htdocs/langs/bn_IN/members.lang
+++ b/htdocs/langs/bn_IN/members.lang
@@ -213,3 +213,5 @@ SendReminderForExpiredSubscription=Send reminder by email to members when subscr
 MembershipPaid=Membership paid for current period (until %s)
 YouMayFindYourInvoiceInThisEmail=You may find your invoice attached to this email
 XMembersClosed=%s member(s) closed
+XExternalUserCreated=%s external user(s) created
+ForceMemberNature=Force member nature (Individual or Corporation)
diff --git a/htdocs/langs/bn_IN/modulebuilder.lang b/htdocs/langs/bn_IN/modulebuilder.lang
index 9fdaa1a533a..23a098be2e5 100644
--- a/htdocs/langs/bn_IN/modulebuilder.lang
+++ b/htdocs/langs/bn_IN/modulebuilder.lang
@@ -143,3 +143,4 @@ AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
 ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
+ImportExportProfiles=Import and export profiles
diff --git a/htdocs/langs/bn_IN/mrp.lang b/htdocs/langs/bn_IN/mrp.lang
index ec999a473a4..2414a92cefb 100644
--- a/htdocs/langs/bn_IN/mrp.lang
+++ b/htdocs/langs/bn_IN/mrp.lang
@@ -8,12 +8,12 @@ MenuBOM=Bills of material
 LatestBOMModified=Latest %s Bills of materials modified
 LatestMOModified=Latest %s Manufacturing Orders modified
 Bom=Bills of Material
-BillOfMaterials=Bill of Material
+BillOfMaterials=Bill of Materials
 BOMsSetup=Setup of module BOM
 ListOfBOMs=List of bills of material - BOM
 ListOfManufacturingOrders=List of Manufacturing Orders
-NewBOM=New bill of material
-ProductBOMHelp=Product to create with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
+NewBOM=New bill of materials
+ProductBOMHelp=Product to create (or disassemble) with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
 BOMsNumberingModules=BOM numbering templates
 BOMsModelModule=BOM document templates
 MOsNumberingModules=MO numbering templates
@@ -22,7 +22,7 @@ FreeLegalTextOnBOMs=Free text on document of BOM
 WatermarkOnDraftBOMs=Watermark on draft BOM
 FreeLegalTextOnMOs=Free text on document of MO
 WatermarkOnDraftMOs=Watermark on draft MO
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials %s ?
 ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
 ManufacturingEfficiency=Manufacturing efficiency
 ConsumptionEfficiency=Consumption efficiency
@@ -30,8 +30,8 @@ ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the produc
 ValueOfMeansLossForProductProduced=Value of 0.95 means an average of 5%% of loss of produced product
 DeleteBillOfMaterials=Delete Bill Of Materials
 DeleteMo=Delete Manufacturing Order
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Materials?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Materials?
 MenuMRP=Manufacturing Orders
 NewMO=New Manufacturing Order
 QtyToProduce=Qty to produce
@@ -39,7 +39,7 @@ DateStartPlannedMo=Date start planned
 DateEndPlannedMo=Date end planned
 KeepEmptyForAsap=Empty means 'As Soon As Possible'
 EstimatedDuration=Estimated duration
-EstimatedDurationDesc=Estimated duration to manufacture this product using this BOM
+EstimatedDurationDesc=Estimated duration to manufacture (or disassemble) this product using this BOM
 ConfirmValidateBom=Are you sure you want to validate the BOM with the reference <strong>%s</strong> (you will be able to use it to build new Manufacturing Orders)
 ConfirmCloseBom=Are you sure you want to cancel this BOM (you won't be able to use it to build new Manufacturing Orders anymore) ?
 ConfirmReopenBom=Are you sure you want to re-open this BOM (you will be able to use it to build new Manufacturing Orders)
@@ -63,13 +63,14 @@ ConsumeAndProduceAll=Consume and Produce All
 Manufactured=Manufactured
 TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
 ForAQuantityOf=For a quantity to produce of %s
+ForAQuantityToConsumeOf=For a quantity to disassemble of %s
 ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
 ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
 ProductionForRef=Production of %s
 AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
 NoStockChangeOnServices=No stock change on services
 ProductQtyToConsumeByMO=Product quantity still to consume by open MO
-ProductQtyToProduceByMO=Product quentity still to produce by open MO
+ProductQtyToProduceByMO=Product quantity still to produce by open MO
 AddNewConsumeLines=Add new line to consume
 ProductsToConsume=Products to consume
 ProductsToProduce=Products to produce
@@ -83,15 +84,13 @@ Workstations=Workstations
 WorkstationsDescription=Workstations management
 WorkstationSetup = Workstations setup
 WorkstationSetupPage = Workstations setup page
-WorkstationAbout = About Workstation
-WorkstationAboutPage = Workstations about page
 WorkstationList=Workstation list
 WorkstationCreate=Add new workstation
 ConfirmEnableWorkstation=Are you sure you want to enable workstation <b>%s</b> ?
 EnableAWorkstation=Enable a workstation
 ConfirmDisableWorkstation=Are you sure you want to disable workstation <b>%s</b> ?
 DisableAWorkstation=Disable a workstation
-DeleteWorkstation=Supprimer
+DeleteWorkstation=Delete
 NbOperatorsRequired=Number of operators required
 THMOperatorEstimated=Estimated operator THM
 THMMachineEstimated=Estimated machine THM
diff --git a/htdocs/langs/bn_IN/orders.lang b/htdocs/langs/bn_IN/orders.lang
index 87d196eb22f..5dab5b99bf1 100644
--- a/htdocs/langs/bn_IN/orders.lang
+++ b/htdocs/langs/bn_IN/orders.lang
@@ -11,6 +11,7 @@ OrderDate=Order date
 OrderDateShort=Order date
 OrderToProcess=Order to process
 NewOrder=New order
+NewSupplierOrderShort=New order
 NewOrderSupplier=New Purchase Order
 ToOrder=Make order
 MakeOrder=Make order
@@ -73,6 +74,7 @@ DeleteOrder=Delete order
 CancelOrder=Cancel order
 OrderReopened= Order %s re-open
 AddOrder=Create order
+AddSupplierOrderShort=Create order
 AddPurchaseOrder=Create purchase order
 AddToDraftOrders=Add to draft order
 ShowOrder=Show order
diff --git a/htdocs/langs/bn_IN/other.lang b/htdocs/langs/bn_IN/other.lang
index 95297a98859..bb35099ab82 100644
--- a/htdocs/langs/bn_IN/other.lang
+++ b/htdocs/langs/bn_IN/other.lang
@@ -129,6 +129,7 @@ ClosedByLogin=User login who closed
 FileWasRemoved=File %s was removed
 DirWasRemoved=Directory %s was removed
 FeatureNotYetAvailable=Feature not yet available in the current version
+FeatureNotAvailableOnDevicesWithoutMouse=Feature not available on devices without mouse
 FeaturesSupported=Supported features
 Width=Width
 Height=Height
@@ -263,7 +264,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
-PrefixSession=Prefix for session ID
+SuffixSessionName=Suffix for session name
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/bn_IN/partnership.lang b/htdocs/langs/bn_IN/partnership.lang
index 09059995a8d..2fb10e8159e 100644
--- a/htdocs/langs/bn_IN/partnership.lang
+++ b/htdocs/langs/bn_IN/partnership.lang
@@ -16,41 +16,72 @@
 #
 # Generic
 #
-ModulePartnershipName = Partnership management
-PartnershipDescription = Module Partnership management
+ModulePartnershipName=Partnership management
+PartnershipDescription=Module Partnership management
 PartnershipDescriptionLong= Module Partnership management
 
+AddPartnership=Add partnership
+CancelPartnershipForExpiredMembers=Partnership: Cancel partnership of members with expired subscriptions
+PartnershipCheckBacklink=Partnership: Check referring backlink
+
 #
 # Menu
 #
-NewPartnership = New Partnership
-ListOfPartnerships = List of partnership
+NewPartnership=New Partnership
+ListOfPartnerships=List of partnership
 
 #
 # Admin page
 #
-PartnershipSetup = Partnership setup
-PartnershipAbout = About Partnership
-PartnershipAboutPage = Partnership about page
-
+PartnershipSetup=Partnership setup
+PartnershipAbout=About Partnership
+PartnershipAboutPage=Partnership about page
+partnershipforthirdpartyormember=Partner status must be set on a 'thirdparty' or a 'member'
+PARTNERSHIP_IS_MANAGED_FOR=Partnership managed for
+PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks to check
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb of days before cancelling status of a partnership when a subscription has expired
+ReferingWebsiteCheck=Check of website referring
+ReferingWebsiteCheckDesc=You can enable a feature to check that your partners has added a backlink to your website domains on their own website.
 
 #
 # Object
 #
+DeletePartnership=Delete a partnership
+PartnershipDedicatedToThisThirdParty=Partnership dedicated to this third party
+PartnershipDedicatedToThisMember=Partnership dedicated to this member
 DatePartnershipStart=Start date
 DatePartnershipEnd=End date
+ReasonDecline=Decline reason
+ReasonDeclineOrCancel=Decline reason
+PartnershipAlreadyExist=Partnership already exist
+ManagePartnership=Manage partnership
+BacklinkNotFoundOnPartnerWebsite=Backlink not found on partner website
+ConfirmClosePartnershipAsk=Are you sure you want to cancel this partnership?
+PartnershipType=Partnership type
 
 #
 # Template Mail
 #
+SendingEmailOnPartnershipWillSoonBeCanceled=Partnership will soon be canceled
+SendingEmailOnPartnershipRefused=Partnership refused
+SendingEmailOnPartnershipAccepted=Partnership accepted
+SendingEmailOnPartnershipCanceled=Partnership canceled
 
+YourPartnershipWillSoonBeCanceledTopic=Partnership will soon be canceled
+YourPartnershipRefusedTopic=Partnership refused
+YourPartnershipAcceptedTopic=Partnership accepted
+YourPartnershipCanceledTopic=Partnership canceled
+
+YourPartnershipWillSoonBeCanceledContent=We inform you that your partnership will soon be canceled (Backlink not found)
+YourPartnershipRefusedContent=We inform you that your partnership request has been refused.
+YourPartnershipAcceptedContent=We inform you that your partnership request has been accepted.
+YourPartnershipCanceledContent=We inform you that your partnership has been canceled.
 
 #
 # Status
 #
-PartnershipDraft = Draft
-PartnershipAccepted = Accepted
-PartnershipRefused = Refused
-PartnershipCanceled = Canceled
-
+PartnershipDraft=Draft
+PartnershipAccepted=Accepted
+PartnershipRefused=Refused
+PartnershipCanceled=Canceled
 PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/bn_IN/productbatch.lang b/htdocs/langs/bn_IN/productbatch.lang
index ad2db658e2e..450d0285819 100644
--- a/htdocs/langs/bn_IN/productbatch.lang
+++ b/htdocs/langs/bn_IN/productbatch.lang
@@ -1,4 +1,4 @@
-# ProductBATCH language file - en_US - ProductBATCH
+# ProductBATCH language file - Source file is en_US - ProductBATCH
 ManageLotSerial=Use lot/serial number
 ProductStatusOnBatch=Yes (lot required)
 ProductStatusOnSerial=Yes (unique serial number required)
@@ -33,3 +33,13 @@ CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+LifeTime=Life span (in days)
+EndOfLife=End of life
+ManufacturingDate=Manufacturing date
+DestructionDate=Destruction date
+FirstUseDate=First use date
+QCFrequency=Quality control frequency (in days)
+
+#Traceability - qc status
+OutOfOrder=Out of order
+InWorkingOrder=In working order
diff --git a/htdocs/langs/bn_IN/products.lang b/htdocs/langs/bn_IN/products.lang
index 0875be0dc07..9638dfe5a25 100644
--- a/htdocs/langs/bn_IN/products.lang
+++ b/htdocs/langs/bn_IN/products.lang
@@ -396,3 +396,5 @@ ActionAvailableOnVariantProductOnly=Action only available on the variant of prod
 ProductsPricePerCustomer=Product prices per customers
 ProductSupplierExtraFields=Additional Attributes (Supplier Prices)
 DeleteLinkedProduct=Delete the child product linked to the combination
+PMPValue=Weighted average price
+PMPValueShort=WAP
diff --git a/htdocs/langs/bn_IN/projects.lang b/htdocs/langs/bn_IN/projects.lang
index 79c974f6e24..6c96fadb5c1 100644
--- a/htdocs/langs/bn_IN/projects.lang
+++ b/htdocs/langs/bn_IN/projects.lang
@@ -267,9 +267,11 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=New invoice
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+OneLinePerTimeSpentLine=One line for each time spent declaration
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
 AddPersonToTask=Add also to tasks
 UsageOrganizeEvent=Usage: Event Organization
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
+SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
diff --git a/htdocs/langs/bn_IN/receptions.lang b/htdocs/langs/bn_IN/receptions.lang
index 760ff884fa0..338602e722e 100644
--- a/htdocs/langs/bn_IN/receptions.lang
+++ b/htdocs/langs/bn_IN/receptions.lang
@@ -44,4 +44,4 @@ ValidateOrderFirstBeforeReception=You must first validate the order before being
 ReceptionsNumberingModules=Numbering module for receptions
 ReceptionsReceiptModel=Document templates for receptions
 NoMorePredefinedProductToDispatch=No more predefined products to dispatch
-
+ReceptionExist=A reception exists
diff --git a/htdocs/langs/bn_IN/stocks.lang b/htdocs/langs/bn_IN/stocks.lang
index 9ec523427b1..d39791932a3 100644
--- a/htdocs/langs/bn_IN/stocks.lang
+++ b/htdocs/langs/bn_IN/stocks.lang
@@ -56,8 +56,6 @@ UnitPurchaseValue=Unit purchase price
 StockTooLow=Stock too low
 StockLowerThanLimit=Stock lower than alert limit (%s)
 EnhancedValue=Value
-PMPValue=Weighted average price
-PMPValueShort=WAP
 EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
@@ -251,7 +249,10 @@ SelectAStockMovementFileToImport=select a stock movement file to import
 InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
 LabelOfInventoryMovemement=Inventory %s
 ReOpen=Reopen
-ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock to the real qty you entered into the inventory.
 ObjectNotFound=%s not found
 MakeMovementsAndClose=Generate movements and close
 AutofillWithExpected=Fill real quantity with expected quantity
+ShowAllBatchByDefault=By default, show batch details on product "stock" tab
+CollapseBatchDetailHelp=You can set batch detail default display in stocks module configuration
+FieldCannotBeNegative=Field "%s" cannot be negative
diff --git a/htdocs/langs/bn_IN/ticket.lang b/htdocs/langs/bn_IN/ticket.lang
index df73daf4a0d..1da32a5a99e 100644
--- a/htdocs/langs/bn_IN/ticket.lang
+++ b/htdocs/langs/bn_IN/ticket.lang
@@ -304,7 +304,7 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
-BoxTicketType=Number of open tickets by type
+BoxTicketType=Distribution of open tickets by type
 BoxTicketSeverity=Number of open tickets by severity
 BoxNoTicketSeverity=No tickets opened
 BoxTicketLastXDays=Number of new tickets by days the last %s days
diff --git a/htdocs/langs/bs_BA/accountancy.lang b/htdocs/langs/bs_BA/accountancy.lang
index 208b819e9a1..5348ec9819a 100644
--- a/htdocs/langs/bs_BA/accountancy.lang
+++ b/htdocs/langs/bs_BA/accountancy.lang
@@ -158,7 +158,7 @@ ACCOUNTING_LENGTH_AACCOUNT=Length of the third-party accounting accounts (If you
 ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of an accounting account. Needed by some countries (like Switzerland). If set to off (default), you can set the following two parameters to ask the application to add virtual zeros.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties, break ability to search on a part of value)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
@@ -328,6 +328,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountanc
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
+NotifiedExportDate=Notified export date (modification of the entries will not be possible)
+NotifiedValidationDate=Validation of the entries (modification or deletion of the entries will not be possible)
+ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=Export draft journal
 Modelcsv=Model izvoza
 Selectmodelcsv=Odaberi model izvoza
diff --git a/htdocs/langs/bs_BA/admin.lang b/htdocs/langs/bs_BA/admin.lang
index 9fc633b8dd1..ed5b59577b2 100644
--- a/htdocs/langs/bs_BA/admin.lang
+++ b/htdocs/langs/bs_BA/admin.lang
@@ -221,8 +221,8 @@ NotCompatible=This module does not seem compatible with your Dolibarr %s (Min %s
 CompatibleAfterUpdate=This module requires an update to your Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=See in Market place
 SeeSetupOfModule=See setup of module %s
+SetOptionTo=Set option <b>%s</b> to %s
 Updated=Updated
-Nouveauté=Novelty
 AchatTelechargement=Buy / Download
 GoModuleSetupArea=To deploy/install a new module, go to the Module setup area: <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
@@ -399,6 +399,7 @@ SecurityToken=Key to secure URLs
 NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
 PDF=PDF
 PDFDesc=Global options for PDF generation
+PDFOtherDesc=PDF Option specific to some modules
 PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
 PDFRulesForSalesTax=Rules for Sales Tax / VAT
@@ -561,7 +562,7 @@ Module53Desc=Management of Services
 Module54Name=Contracts/Subscriptions
 Module54Desc=Management of contracts (services or recurring subscriptions)
 Module55Name=Barcodes
-Module55Desc=Barcode management
+Module55Desc=Barcode or QR code management
 Module56Name=Payment by credit transfer
 Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
 Module57Name=Payments by Direct Debit
@@ -848,10 +849,10 @@ Permission402=Create/modify discounts
 Permission403=Validate discounts
 Permission404=Delete discounts
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries (yours and subordinates)
-Permission512=Create/modify payments of salaries
-Permission514=Delete payments of salaries
-Permission517=Read payments of salaries of everybody
+Permission511=Read salaries and payments (yours and subordinates)
+Permission512=Create/modify salaries and payments
+Permission514=Delete salaries and payments
+Permission517=Read salaries and payments everybody
 Permission519=Export salaries
 Permission520=Read Loans
 Permission522=Create/modify loans
@@ -965,6 +966,8 @@ Permission23003=Delete Scheduled job
 Permission23004=Execute Scheduled job
 Permission50101=Use Point of Sale (SimplePOS)
 Permission50151=Use Point of Sale (TakePOS)
+Permission50152=Edit sales lines
+Permission50153=Edit ordered sales lines
 Permission50201=Read transactions
 Permission50202=Import transactions
 Permission50330=Read objects of Zapier
@@ -1039,11 +1042,12 @@ DictionaryMeasuringUnits=Measuring Units
 DictionarySocialNetworks=Social Networks
 DictionaryProspectStatus=Prospect status for companies
 DictionaryProspectContactStatus=Prospect status for contacts
-DictionaryHolidayTypes=Types of leave
+DictionaryHolidayTypes=Leave - Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
 DictionaryTransportMode=Intracomm report - Transport mode
+DictionaryBatchStatus=Product lot/serial Quality Control status
 TypeOfUnit=Type of unit
 SetupSaved=Postavke snimljene
 SetupNotSaved=Setup not saved
@@ -1187,7 +1191,7 @@ SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of m
 SetupDescription5=Other Setup menu entries manage optional parameters.
 AuditedSecurityEvents=Security events that are audited
 NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
-Audit=Audit
+Audit=Security events
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
 InfoOS=About OS
@@ -1319,9 +1323,12 @@ ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
 NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
+ComboListOptim=Combo list loading optimization
 SearchOptim=Optimizacija pretraživanja
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
-YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
+YouHaveXObjectUseComboOptim=You have %s %s in the database. You can go into setup of module to enable loading of combo list on key pressed event.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other.
+YouHaveXObjectUseSearchOptimDesc=This limits the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to %s in Home-Setup-Other.
 BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
 BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
 PHPModuleLoaded=PHP component %s is loaded
@@ -1433,6 +1440,7 @@ MemberMainOptions=Main options
 AdherentLoginRequired= Manage a Login for each member
 AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
+MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
 MembersDocModules=Document templates for documents generated from member record
@@ -1763,7 +1771,7 @@ AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting men
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
-AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the scheduled job %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
@@ -1979,6 +1987,8 @@ 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_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add picture on proposal line
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add electronic sign in PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
@@ -2096,7 +2106,6 @@ PDF_SHOW_PROJECT=Show project on document
 ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
-FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
@@ -2120,12 +2129,18 @@ ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by
 MailToSendEventOrganization=Event Organization
 AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
 YouShouldDisablePHPFunctions=You should disable PHP functions
-IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands in custom code, you shoud disable PHP functions
+PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
+NotRecommended=Not recommanded
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
 ModuleUpdateAvailable=An update is available
 NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
+RandomlySelectedIfSeveral=Randomly selected if several pictures are available
+DatabasePasswordObfuscated=Database password is obfuscated in conf file
+DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
diff --git a/htdocs/langs/bs_BA/agenda.lang b/htdocs/langs/bs_BA/agenda.lang
index e3fd4c2b551..e49ae9b3ccf 100644
--- a/htdocs/langs/bs_BA/agenda.lang
+++ b/htdocs/langs/bs_BA/agenda.lang
@@ -4,7 +4,7 @@ Actions=Događaji
 Agenda=Agenda
 TMenuAgenda=Agenda
 Agendas=Agende
-LocalAgenda=Lokalni kalendar
+LocalAgenda=Default calendar
 ActionsOwnedBy=Događaj u vlasništvu
 ActionsOwnedByShort=Vlasnik
 AffectedTo=Dodijeljeno korisniku
@@ -14,13 +14,13 @@ EventsNb=Broj događaja
 ListOfActions=Lista događaja
 EventReports=Event reports
 Location=Lokacija
-ToUserOfGroup=Event assigned to any user in group
+ToUserOfGroup=Event assigned to any user in the group
 EventOnFullDay=Događaj za cijeli dan(e)
 MenuToDoActions=Svi nepotpuni događaji
 MenuDoneActions=Sve završeni događaji
 MenuToDoMyActions=Moji nepotpuni događaji
 MenuDoneMyActions=Moji završeni događaji
-ListOfEvents=Spisak događaja (lokalni kalendar)
+ListOfEvents=List of events (default calendar)
 ActionsAskedBy=Događaje izvijestio/la
 ActionsToDoBy=Događaji dodijeljeni korisniku
 ActionsDoneBy=Događaji završeni od strane korisnika
@@ -38,6 +38,7 @@ ActionsEvents=Događaji za koje će Dolibarr stvoriti akciju u dnevni red automa
 EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Kreirana treća strana %s
+COMPANY_MODIFYInDolibarr=Third party %s modified
 COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=Ugovor %s potvrđen
 CONTRACT_DELETEInDolibarr=Contract %s deleted
@@ -87,6 +88,7 @@ OrderDeleted=Narudžba obrisana
 InvoiceDeleted=Faktura obrisana
 DraftInvoiceDeleted=Draft invoice deleted
 CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_MODIFYInDolibarr=Contact %s modified
 CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Product %s created
 PRODUCT_MODIFYInDolibarr=Product %s modified
@@ -119,6 +121,7 @@ MRP_MO_UNVALIDATEInDolibarr=MO set to draft status
 MRP_MO_PRODUCEDInDolibarr=MO produced
 MRP_MO_DELETEInDolibarr=MO deleted
 MRP_MO_CANCELInDolibarr=MO canceled
+PAIDInDolibarr=%s paid
 ##### End agenda events #####
 AgendaModelModule=Document templates for event
 DateActionStart=Datum početka
@@ -130,7 +133,7 @@ AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to use
 AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
 AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic events.
 AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> to include events of holidays.
-AgendaShowBirthdayEvents=Pokaži rođendane kontakata
+AgendaShowBirthdayEvents=Birthdays of contacts
 AgendaHideBirthdayEvents=Sakrij rođendane kontakata
 Busy=Zauzet
 ExportDataset_event1=Lista događaja u agendi
@@ -152,6 +155,7 @@ ActionType=Vrsta događaja
 DateActionBegin=Početni datum događaja
 ConfirmCloneEvent=Jeste li sigurni da želite duplirati događaj <b>%s</b>?
 RepeatEvent=Ponovi događaj
+OnceOnly=Once only
 EveryWeek=Svake sedmice
 EveryMonth=Svakog mjeseca
 DayOfMonth=Dan u mjesecu
@@ -165,4 +169,4 @@ TimeType=Duration type
 ReminderType=Callback type
 AddReminder=Create an automatic reminder notification for this event
 ErrorReminderActionCommCreation=Error creating the reminder notification for this event
-BrowserPush=Browser Notification
+BrowserPush=Browser Popup Notification
diff --git a/htdocs/langs/bs_BA/bills.lang b/htdocs/langs/bs_BA/bills.lang
index a063f16c5e5..05c70ab4cf6 100644
--- a/htdocs/langs/bs_BA/bills.lang
+++ b/htdocs/langs/bs_BA/bills.lang
@@ -259,6 +259,7 @@ DateMaxPayment=Payment due on
 DateInvoice=Datum fakture
 DatePointOfTax=Point of tax
 NoInvoice=Nema fakture
+NoOpenInvoice=No open invoice
 ClassifyBill=Označi fakturu
 SupplierBillsToPay=Neplaćene fakture dobavljača
 CustomerBillsUnpaid=Nenaplaćene fakture od kupca
@@ -589,3 +590,4 @@ FacParentLine=Invoice Line Parent
 SituationTotalRayToRest=Remainder to pay without taxe
 PDFSituationTitle=Situation n° %d
 SituationTotalProgress=Total progress %d %%
+SearchUnpaidInvoicesWithDueDate=Search unpaid invoices with a due date = %s
diff --git a/htdocs/langs/bs_BA/cashdesk.lang b/htdocs/langs/bs_BA/cashdesk.lang
index 6f6da52648e..42ed6775627 100644
--- a/htdocs/langs/bs_BA/cashdesk.lang
+++ b/htdocs/langs/bs_BA/cashdesk.lang
@@ -102,7 +102,7 @@ CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal numb
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
 SaleStartedAt=Sale started at %s
-ControlCashOpening=Control cash popup at opening POS
+ControlCashOpening=Open the "Control cash" popup when opening the POS
 CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -126,5 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
-ShowPriceHT = Display the price excluding tax column
-ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
+ShowPriceHT = Display the column with the price excluding tax (on screen)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
diff --git a/htdocs/langs/bs_BA/compta.lang b/htdocs/langs/bs_BA/compta.lang
index 1131f3f0421..4a78b3185f6 100644
--- a/htdocs/langs/bs_BA/compta.lang
+++ b/htdocs/langs/bs_BA/compta.lang
@@ -286,3 +286,9 @@ ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
 IncludeLoansInResults = Include loans in reports
+InvoiceLate30Days = Invoices late > 30 days
+InvoiceLate15Days = Invoices late > 15 days
+InvoiceLateMinus15Days = Invoices late
+InvoiceNotLate = To be collected < 15 days
+InvoiceNotLate15Days = To be collected in 15 days
+InvoiceNotLate30Days = To be collected in 30 days
diff --git a/htdocs/langs/bs_BA/cron.lang b/htdocs/langs/bs_BA/cron.lang
index cb278ba6885..9d02c089388 100644
--- a/htdocs/langs/bs_BA/cron.lang
+++ b/htdocs/langs/bs_BA/cron.lang
@@ -60,7 +60,7 @@ CronErrEndDateStartDt=Datum završetka ne može biti prije datuma početka
 StatusAtInstall=Status at module installation
 CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Iskljući
-CronTaskInactive=This job is disabled
+CronTaskInactive=This job is disabled (not scheduled)
 CronId=ID
 CronClassFile=Filename with class
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example 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>
diff --git a/htdocs/langs/bs_BA/errors.lang b/htdocs/langs/bs_BA/errors.lang
index 276213d59ef..7c60c959313 100644
--- a/htdocs/langs/bs_BA/errors.lang
+++ b/htdocs/langs/bs_BA/errors.lang
@@ -11,6 +11,7 @@ ErrorBadValueForParamNotAString=Bad value for your parameter. It appends general
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Prijava %s već postoji.
 ErrorGroupAlreadyExists=Grupa %s već postoji.
+ErrorEmailAlreadyExists=Email %s already exists.
 ErrorRecordNotFound=Zapis nije pronađen.
 ErrorFailToCopyFile=Failed to copy file '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
@@ -117,7 +118,7 @@ ErrorCantReadFile=Failed to read file '%s'
 ErrorCantReadDir=Failed to read directory '%s'
 ErrorBadLoginPassword=Bad value for login or password
 ErrorLoginDisabled=Your account has been disabled
-ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server. If PHP <b>Safe Mode</b> is enabled, check that command is inside a directory defined by parameter <b>safe_mode_exec_dir</b>.
+ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server user. Check also the command is not protected on shell level by a security layer like apparmor.
 ErrorFailedToChangePassword=Failed to change password
 ErrorLoginDoesNotExists=User with login <b>%s</b> could not be found.
 ErrorLoginHasNoEmail=This user has no email address. Process aborted.
@@ -262,6 +263,7 @@ ErrorDateIsInFuture=Error, the date can't be in the future
 ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
 ErrorAPercentIsRequired=Error, please fill in the percentage correctly
 ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
+ErrorFailedToFindEmailTemplate=Failed to find template with code name %s
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -298,3 +300,4 @@ WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So y
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
+ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
diff --git a/htdocs/langs/bs_BA/eventorganization.lang b/htdocs/langs/bs_BA/eventorganization.lang
index 3be4026e6d2..da6aff77b91 100644
--- a/htdocs/langs/bs_BA/eventorganization.lang
+++ b/htdocs/langs/bs_BA/eventorganization.lang
@@ -1,4 +1,5 @@
 # Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+# Copyright (C) 2021		Dorian Vabre			<dorian.vabre@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
@@ -81,7 +82,10 @@ PriceOfBoothHelp=Subscription price to stand a booth
 EventOrganizationICSLink=Link ICS for events
 ConferenceOrBoothInformation=Conference Or Booth informations
 Attendees = Attendees
+DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
 #
 # Status
 #
@@ -94,8 +98,46 @@ EvntOrgCancelled = Cancelled
 #
 # Public page
 #
+SuggestForm = Suggestion page
+RegisterPage = Page for conferences or booth
+EvntOrgRegistrationHelpMessage = Here, you can vote for an event, or suggest a new conference or booth for the project
+EvntOrgRegistrationConfHelpMessage = Here, you can suggest a new conference for the project
+EvntOrgRegistrationBoothHelpMessage = Here, you can suggest a new booth for the project
+ListOfSuggestedConferences = List of suggested conferences
+ListOfSuggestedBooths = List of suggested booths
+SuggestConference = Suggest a new conference
+SuggestBooth = Suggest a booth
+ViewAndVote = View and vote for suggested events
 PublicAttendeeSubscriptionPage = Public link of registration to a conference
 MissingOrBadSecureKey = The security key is invalid or missing
-EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
-EvntOrgStartDuration = This conference starts on
-EvntOrgEndDuration =  and ends on
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference : '%s'
+EvntOrgDuration = This conference starts on %s and ends on %s.
+ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
+BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
+EventType = Vrsta događaja
+
+#
+# Vote page
+#
+EvntOrgRegistrationWelcomeMessage = Welcome on the conference or booth suggestion page.
+EvntOrgRegistrationConfWelcomeMessage = Welcome on the conference suggestion page.
+EvntOrgRegistrationBoothWelcomeMessage = Welcome on the booth suggestion page.
+EvntOrgVoteHelpMessage = Here, you can view and vote for the suggested events for the project
+VoteOk = Your vote has been accepted.
+AlreadyVoted = You have already voted for this event.
+VoteError = An error has occurred during the vote, please try again.
+
+#
+# SubscriptionOk page
+#
+SubscriptionOk = Your subscription to this conference has been validated
+#
+# Subscription validation mail
+#
+ConfAttendeeSubscriptionConfirmation = Confirmation of your subscription to a conference
+#
+# Payment page
+#
+Attendee = Attendee
+PaymentConferenceAttendee = Conference attendee payment
+PaymentBoothLocation = Booth location payment
diff --git a/htdocs/langs/bs_BA/hrm.lang b/htdocs/langs/bs_BA/hrm.lang
index df8b7b1b849..45cd51275f8 100644
--- a/htdocs/langs/bs_BA/hrm.lang
+++ b/htdocs/langs/bs_BA/hrm.lang
@@ -9,7 +9,7 @@ ConfirmDeleteEstablishment=Are you sure you wish to delete this establishment?
 OpenEtablishment=Open establishment
 CloseEtablishment=Close establishment
 # Dictionary
-DictionaryPublicHolidays=HRM - Public holidays
+DictionaryPublicHolidays=Leave - Public holidays
 DictionaryDepartment=HRM - Department list
 DictionaryFunction=HRM - Job positions
 # Module
diff --git a/htdocs/langs/bs_BA/knowledgemanagement.lang b/htdocs/langs/bs_BA/knowledgemanagement.lang
index 58a24a1a8cf..151ffbf2def 100644
--- a/htdocs/langs/bs_BA/knowledgemanagement.lang
+++ b/htdocs/langs/bs_BA/knowledgemanagement.lang
@@ -47,7 +47,7 @@ KnowledgeManagementArea = Knowledge Management
 # Menu
 #
 MenuKnowledgeRecord = Knowledge base
-ListOfArticles = List of articles
+ListKnowledgeRecord = List of articles
 NewKnowledgeRecord = New article
 ValidateReply = Validate solution
 KnowledgeRecords = Articles
diff --git a/htdocs/langs/bs_BA/languages.lang b/htdocs/langs/bs_BA/languages.lang
index 203d794aa05..bea0d9ba760 100644
--- a/htdocs/langs/bs_BA/languages.lang
+++ b/htdocs/langs/bs_BA/languages.lang
@@ -3,6 +3,7 @@ Language_am_ET=Ethiopian
 Language_ar_AR=Arapski
 Language_ar_EG=Arabic (Egypt)
 Language_ar_SA=Arapski
+Language_ar_TN=Arabic (Tunisia)
 Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengali
 Language_bn_IN=Bengali (India)
@@ -84,6 +85,7 @@ Language_nl_NL=Dutch
 Language_pl_PL=Poljski
 Language_pt_BR=Portugalski (Brazil)
 Language_pt_PT=Portugalski
+Language_ro_MD=Romanian (Moldavia)
 Language_ro_RO=Rumunski
 Language_ru_RU=Ruski
 Language_ru_UA=Ruski (Ukrajina)
diff --git a/htdocs/langs/bs_BA/main.lang b/htdocs/langs/bs_BA/main.lang
index 371121cd248..27cae4b3571 100644
--- a/htdocs/langs/bs_BA/main.lang
+++ b/htdocs/langs/bs_BA/main.lang
@@ -430,6 +430,7 @@ LT1IN=CGST
 LT2IN=SGST
 LT1GC=Additionnal cents
 VATRate=Stopa poreza
+RateOfTaxN=Rate of tax %s
 VATCode=Šifra stope poreza
 VATNPR=NPR stopa poreza
 DefaultTaxRate=Pretpostavljena stopa poreza
@@ -729,6 +730,7 @@ MenuMembers=Članovi
 MenuAgendaGoogle=Google kalendar
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr ograničenje (Meni Početna-Postavke-Sigurnost): %s Kb, PHP ograničenje: %s Kb
+ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
 NoFileFound=No documents uploaded
 CurrentUserLanguage=Trenutni jezik
 CurrentTheme=Trenutna tema
@@ -1072,6 +1074,7 @@ ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
 ToClose=To close
+ToRefuse=To refuse
 ToProcess=Za obradu
 ToApprove=To approve
 GlobalOpenedElemView=Global view
@@ -1126,9 +1129,11 @@ UpdateForAllLines=Update for all lines
 OnHold=On hold
 Civility=Civility
 AffectTag=Affect Tag
+CreateExternalUser=Create external user
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
 ConfirmCancel=Are you sure you want to cancel
+EmailMsgID=Email MsgID
diff --git a/htdocs/langs/bs_BA/members.lang b/htdocs/langs/bs_BA/members.lang
index 48d7b399068..46eeff19e4c 100644
--- a/htdocs/langs/bs_BA/members.lang
+++ b/htdocs/langs/bs_BA/members.lang
@@ -213,3 +213,5 @@ SendReminderForExpiredSubscription=Send reminder by email to members when subscr
 MembershipPaid=Membership paid for current period (until %s)
 YouMayFindYourInvoiceInThisEmail=You may find your invoice attached to this email
 XMembersClosed=%s member(s) closed
+XExternalUserCreated=%s external user(s) created
+ForceMemberNature=Force member nature (Individual or Corporation)
diff --git a/htdocs/langs/bs_BA/modulebuilder.lang b/htdocs/langs/bs_BA/modulebuilder.lang
index 616bbfb2511..8f13e72ae13 100644
--- a/htdocs/langs/bs_BA/modulebuilder.lang
+++ b/htdocs/langs/bs_BA/modulebuilder.lang
@@ -143,3 +143,4 @@ AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
 ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
+ImportExportProfiles=Import and export profiles
diff --git a/htdocs/langs/bs_BA/mrp.lang b/htdocs/langs/bs_BA/mrp.lang
index ec999a473a4..16ab0c8ac49 100644
--- a/htdocs/langs/bs_BA/mrp.lang
+++ b/htdocs/langs/bs_BA/mrp.lang
@@ -8,12 +8,12 @@ MenuBOM=Bills of material
 LatestBOMModified=Latest %s Bills of materials modified
 LatestMOModified=Latest %s Manufacturing Orders modified
 Bom=Bills of Material
-BillOfMaterials=Bill of Material
+BillOfMaterials=Bill of Materials
 BOMsSetup=Setup of module BOM
 ListOfBOMs=List of bills of material - BOM
 ListOfManufacturingOrders=List of Manufacturing Orders
-NewBOM=New bill of material
-ProductBOMHelp=Product to create with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
+NewBOM=New bill of materials
+ProductBOMHelp=Product to create (or disassemble) with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
 BOMsNumberingModules=BOM numbering templates
 BOMsModelModule=BOM document templates
 MOsNumberingModules=MO numbering templates
@@ -22,7 +22,7 @@ FreeLegalTextOnBOMs=Free text on document of BOM
 WatermarkOnDraftBOMs=Watermark on draft BOM
 FreeLegalTextOnMOs=Free text on document of MO
 WatermarkOnDraftMOs=Watermark on draft MO
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials %s ?
 ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
 ManufacturingEfficiency=Manufacturing efficiency
 ConsumptionEfficiency=Consumption efficiency
@@ -30,8 +30,8 @@ ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the produc
 ValueOfMeansLossForProductProduced=Value of 0.95 means an average of 5%% of loss of produced product
 DeleteBillOfMaterials=Delete Bill Of Materials
 DeleteMo=Delete Manufacturing Order
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Materials?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Materials?
 MenuMRP=Manufacturing Orders
 NewMO=New Manufacturing Order
 QtyToProduce=Qty to produce
@@ -39,7 +39,7 @@ DateStartPlannedMo=Date start planned
 DateEndPlannedMo=Date end planned
 KeepEmptyForAsap=Empty means 'As Soon As Possible'
 EstimatedDuration=Estimated duration
-EstimatedDurationDesc=Estimated duration to manufacture this product using this BOM
+EstimatedDurationDesc=Estimated duration to manufacture (or disassemble) this product using this BOM
 ConfirmValidateBom=Are you sure you want to validate the BOM with the reference <strong>%s</strong> (you will be able to use it to build new Manufacturing Orders)
 ConfirmCloseBom=Are you sure you want to cancel this BOM (you won't be able to use it to build new Manufacturing Orders anymore) ?
 ConfirmReopenBom=Are you sure you want to re-open this BOM (you will be able to use it to build new Manufacturing Orders)
@@ -63,13 +63,14 @@ ConsumeAndProduceAll=Consume and Produce All
 Manufactured=Manufactured
 TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
 ForAQuantityOf=For a quantity to produce of %s
+ForAQuantityToConsumeOf=For a quantity to disassemble of %s
 ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
 ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
 ProductionForRef=Production of %s
 AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
 NoStockChangeOnServices=No stock change on services
 ProductQtyToConsumeByMO=Product quantity still to consume by open MO
-ProductQtyToProduceByMO=Product quentity still to produce by open MO
+ProductQtyToProduceByMO=Product quantity still to produce by open MO
 AddNewConsumeLines=Add new line to consume
 ProductsToConsume=Products to consume
 ProductsToProduce=Products to produce
@@ -83,15 +84,13 @@ Workstations=Workstations
 WorkstationsDescription=Workstations management
 WorkstationSetup = Workstations setup
 WorkstationSetupPage = Workstations setup page
-WorkstationAbout = About Workstation
-WorkstationAboutPage = Workstations about page
 WorkstationList=Workstation list
 WorkstationCreate=Add new workstation
 ConfirmEnableWorkstation=Are you sure you want to enable workstation <b>%s</b> ?
 EnableAWorkstation=Enable a workstation
 ConfirmDisableWorkstation=Are you sure you want to disable workstation <b>%s</b> ?
 DisableAWorkstation=Disable a workstation
-DeleteWorkstation=Supprimer
+DeleteWorkstation=Obriši
 NbOperatorsRequired=Number of operators required
 THMOperatorEstimated=Estimated operator THM
 THMMachineEstimated=Estimated machine THM
diff --git a/htdocs/langs/bs_BA/orders.lang b/htdocs/langs/bs_BA/orders.lang
index 60192a26650..04a5fa64987 100644
--- a/htdocs/langs/bs_BA/orders.lang
+++ b/htdocs/langs/bs_BA/orders.lang
@@ -11,6 +11,7 @@ OrderDate=Datum narudžbe
 OrderDateShort=Datum narudžbe
 OrderToProcess=Order to process
 NewOrder=New order
+NewSupplierOrderShort=New order
 NewOrderSupplier=New Purchase Order
 ToOrder=Make order
 MakeOrder=Make order
@@ -73,6 +74,7 @@ DeleteOrder=Delete order
 CancelOrder=Cancel order
 OrderReopened= Order %s re-open
 AddOrder=Create order
+AddSupplierOrderShort=Create order
 AddPurchaseOrder=Create purchase order
 AddToDraftOrders=Add to draft order
 ShowOrder=Show order
diff --git a/htdocs/langs/bs_BA/other.lang b/htdocs/langs/bs_BA/other.lang
index 2d4d2752ed8..1c650cd61ec 100644
--- a/htdocs/langs/bs_BA/other.lang
+++ b/htdocs/langs/bs_BA/other.lang
@@ -129,6 +129,7 @@ ClosedByLogin=User login who closed
 FileWasRemoved=File %s was removed
 DirWasRemoved=Directory %s was removed
 FeatureNotYetAvailable=Feature not yet available in the current version
+FeatureNotAvailableOnDevicesWithoutMouse=Feature not available on devices without mouse
 FeaturesSupported=Supported features
 Width=Width
 Height=Height
@@ -263,7 +264,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
-PrefixSession=Prefix for session ID
+SuffixSessionName=Suffix for session name
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/bs_BA/partnership.lang b/htdocs/langs/bs_BA/partnership.lang
index ecaff28a0d1..31eba053e31 100644
--- a/htdocs/langs/bs_BA/partnership.lang
+++ b/htdocs/langs/bs_BA/partnership.lang
@@ -16,41 +16,72 @@
 #
 # Generic
 #
-ModulePartnershipName = Partnership management
-PartnershipDescription = Module Partnership management
+ModulePartnershipName=Partnership management
+PartnershipDescription=Module Partnership management
 PartnershipDescriptionLong= Module Partnership management
 
+AddPartnership=Add partnership
+CancelPartnershipForExpiredMembers=Partnership: Cancel partnership of members with expired subscriptions
+PartnershipCheckBacklink=Partnership: Check referring backlink
+
 #
 # Menu
 #
-NewPartnership = New Partnership
-ListOfPartnerships = List of partnership
+NewPartnership=New Partnership
+ListOfPartnerships=List of partnership
 
 #
 # Admin page
 #
-PartnershipSetup = Partnership setup
-PartnershipAbout = About Partnership
-PartnershipAboutPage = Partnership about page
-
+PartnershipSetup=Partnership setup
+PartnershipAbout=About Partnership
+PartnershipAboutPage=Partnership about page
+partnershipforthirdpartyormember=Partner status must be set on a 'thirdparty' or a 'member'
+PARTNERSHIP_IS_MANAGED_FOR=Partnership managed for
+PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks to check
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb of days before cancelling status of a partnership when a subscription has expired
+ReferingWebsiteCheck=Check of website referring
+ReferingWebsiteCheckDesc=You can enable a feature to check that your partners has added a backlink to your website domains on their own website.
 
 #
 # Object
 #
+DeletePartnership=Delete a partnership
+PartnershipDedicatedToThisThirdParty=Partnership dedicated to this third party
+PartnershipDedicatedToThisMember=Partnership dedicated to this member
 DatePartnershipStart=Datum početka
 DatePartnershipEnd=Datum završetka
+ReasonDecline=Decline reason
+ReasonDeclineOrCancel=Decline reason
+PartnershipAlreadyExist=Partnership already exist
+ManagePartnership=Manage partnership
+BacklinkNotFoundOnPartnerWebsite=Backlink not found on partner website
+ConfirmClosePartnershipAsk=Are you sure you want to cancel this partnership?
+PartnershipType=Partnership type
 
 #
 # Template Mail
 #
+SendingEmailOnPartnershipWillSoonBeCanceled=Partnership will soon be canceled
+SendingEmailOnPartnershipRefused=Partnership refused
+SendingEmailOnPartnershipAccepted=Partnership accepted
+SendingEmailOnPartnershipCanceled=Partnership canceled
 
+YourPartnershipWillSoonBeCanceledTopic=Partnership will soon be canceled
+YourPartnershipRefusedTopic=Partnership refused
+YourPartnershipAcceptedTopic=Partnership accepted
+YourPartnershipCanceledTopic=Partnership canceled
+
+YourPartnershipWillSoonBeCanceledContent=We inform you that your partnership will soon be canceled (Backlink not found)
+YourPartnershipRefusedContent=We inform you that your partnership request has been refused.
+YourPartnershipAcceptedContent=We inform you that your partnership request has been accepted.
+YourPartnershipCanceledContent=We inform you that your partnership has been canceled.
 
 #
 # Status
 #
-PartnershipDraft = Nacrt
-PartnershipAccepted = Accepted
-PartnershipRefused = Odbijen
-PartnershipCanceled = Otkazan
-
+PartnershipDraft=Nacrt
+PartnershipAccepted=Accepted
+PartnershipRefused=Odbijen
+PartnershipCanceled=Otkazan
 PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/bs_BA/productbatch.lang b/htdocs/langs/bs_BA/productbatch.lang
index 70b54abbca6..ed69e7c1517 100644
--- a/htdocs/langs/bs_BA/productbatch.lang
+++ b/htdocs/langs/bs_BA/productbatch.lang
@@ -1,4 +1,4 @@
-# ProductBATCH language file - en_US - ProductBATCH
+# ProductBATCH language file - Source file is en_US - ProductBATCH
 ManageLotSerial=Use lot/serial number
 ProductStatusOnBatch=Yes (lot required)
 ProductStatusOnSerial=Yes (unique serial number required)
@@ -33,3 +33,13 @@ CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+LifeTime=Life span (in days)
+EndOfLife=End of life
+ManufacturingDate=Manufacturing date
+DestructionDate=Destruction date
+FirstUseDate=First use date
+QCFrequency=Quality control frequency (in days)
+
+#Traceability - qc status
+OutOfOrder=Out of order
+InWorkingOrder=In working order
diff --git a/htdocs/langs/bs_BA/products.lang b/htdocs/langs/bs_BA/products.lang
index 6893f9da7c4..1da68418142 100644
--- a/htdocs/langs/bs_BA/products.lang
+++ b/htdocs/langs/bs_BA/products.lang
@@ -396,3 +396,5 @@ ActionAvailableOnVariantProductOnly=Action only available on the variant of prod
 ProductsPricePerCustomer=Product prices per customers
 ProductSupplierExtraFields=Additional Attributes (Supplier Prices)
 DeleteLinkedProduct=Delete the child product linked to the combination
+PMPValue=Ponderirana/vagana aritmetička sredina - PAS
+PMPValueShort=PAS
diff --git a/htdocs/langs/bs_BA/projects.lang b/htdocs/langs/bs_BA/projects.lang
index ac43cefc2ea..30ccf8cfa4d 100644
--- a/htdocs/langs/bs_BA/projects.lang
+++ b/htdocs/langs/bs_BA/projects.lang
@@ -267,9 +267,11 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=Nova faktura
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+OneLinePerTimeSpentLine=One line for each time spent declaration
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
 AddPersonToTask=Add also to tasks
 UsageOrganizeEvent=Usage: Event Organization
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
+SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
diff --git a/htdocs/langs/bs_BA/receptions.lang b/htdocs/langs/bs_BA/receptions.lang
index 046136a95ab..9b2aedf7c16 100644
--- a/htdocs/langs/bs_BA/receptions.lang
+++ b/htdocs/langs/bs_BA/receptions.lang
@@ -44,4 +44,4 @@ ValidateOrderFirstBeforeReception=You must first validate the order before being
 ReceptionsNumberingModules=Numbering module for receptions
 ReceptionsReceiptModel=Document templates for receptions
 NoMorePredefinedProductToDispatch=No more predefined products to dispatch
-
+ReceptionExist=A reception exists
diff --git a/htdocs/langs/bs_BA/stocks.lang b/htdocs/langs/bs_BA/stocks.lang
index 794cbcac14f..cf41fd8cc2e 100644
--- a/htdocs/langs/bs_BA/stocks.lang
+++ b/htdocs/langs/bs_BA/stocks.lang
@@ -56,8 +56,6 @@ UnitPurchaseValue=Kupovna cijena jedinice
 StockTooLow=Zaliha preniska
 StockLowerThanLimit=Stock lower than alert limit (%s)
 EnhancedValue=Vrijednost
-PMPValue=Ponderirana/vagana aritmetička sredina - PAS
-PMPValueShort=PAS
 EnhancedValueOfWarehouses=Skladišna vrijednost
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
@@ -251,7 +249,10 @@ SelectAStockMovementFileToImport=select a stock movement file to import
 InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
 LabelOfInventoryMovemement=Inventory %s
 ReOpen=Reopen
-ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock to the real qty you entered into the inventory.
 ObjectNotFound=%s not found
 MakeMovementsAndClose=Generate movements and close
 AutofillWithExpected=Fill real quantity with expected quantity
+ShowAllBatchByDefault=By default, show batch details on product "stock" tab
+CollapseBatchDetailHelp=You can set batch detail default display in stocks module configuration
+FieldCannotBeNegative=Field "%s" cannot be negative
diff --git a/htdocs/langs/bs_BA/ticket.lang b/htdocs/langs/bs_BA/ticket.lang
index d0becaf2768..156fe5a1c75 100644
--- a/htdocs/langs/bs_BA/ticket.lang
+++ b/htdocs/langs/bs_BA/ticket.lang
@@ -304,7 +304,7 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
-BoxTicketType=Number of open tickets by type
+BoxTicketType=Distribution of open tickets by type
 BoxTicketSeverity=Number of open tickets by severity
 BoxNoTicketSeverity=No tickets opened
 BoxTicketLastXDays=Number of new tickets by days the last %s days
diff --git a/htdocs/langs/ca_ES/accountancy.lang b/htdocs/langs/ca_ES/accountancy.lang
index ac00e7e054f..46b9ee6c75f 100644
--- a/htdocs/langs/ca_ES/accountancy.lang
+++ b/htdocs/langs/ca_ES/accountancy.lang
@@ -131,7 +131,7 @@ InvoiceLinesDone=Línies de factura comptabilitzades
 ExpenseReportLines=Línies d'informes de despeses a comptabilitzar
 ExpenseReportLinesDone=Línies comptabilitzades d'informes de despeses
 IntoAccount=Línia comptabilitzada amb el compte comptable
-TotalForAccount=Total accounting account
+TotalForAccount=Compte comptable total
 
 
 Ventilate=Comptabilitza
@@ -158,7 +158,7 @@ ACCOUNTING_LENGTH_AACCOUNT=Longitud dels subcomptes (Si s'estableix el valor a 6
 ACCOUNTING_MANAGE_ZERO=Gestiona un nombre diferent de zero al final d'un compte comptable. És necessari per a alguns països (com Suïssa). Si es manté apagat (per defecte), podeu configurar els següents dos paràmetres per a demanar a l'aplicació d'afegir zeros virtuals.
 BANK_DISABLE_DIRECT_INPUT=Desactiva el registre directe de transaccions al compte bancari
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Habilita l'exportació d'esborrany en el diari
-ACCOUNTANCY_COMBO_FOR_AUX=Activa la llista de combo per al compte subsidiari (pot ser lent si tens molts tercers)
+ACCOUNTANCY_COMBO_FOR_AUX=Activa la llista combinada per a un compte subsidiari (pot ser lent si tens molts tercers, trenca la capacitat de cerca en una part del valor)
 ACCOUNTING_DATE_START_BINDING=Definiu una data per a començar la vinculació i transferència a la comptabilitat. Per sota d’aquesta data, les transaccions no es transferiran a la comptabilitat.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=En el cas de transferència de comptabilitat, seleccioneu el període a mostrar per defecte
 
@@ -202,7 +202,7 @@ Docref=Referència
 LabelAccount=Etiqueta de compte
 LabelOperation=Etiqueta de l'operació
 Sens=Direcció
-AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you have received<br>For an accounting account of a supplier, use Debit to record a payment you made
+AccountingDirectionHelp=Per a un compte comptable d'un client, utilitzeu Crèdit per registrar un pagament que heu rebut <br> Per a un compte comptable d'un proveïdor, utilitzeu Dèbit per registrar el pagament que heu fet
 LetteringCode=Codi de retolació
 Lettering=Lletres
 Codejournal=Diari
@@ -297,7 +297,7 @@ NoNewRecordSaved=No hi ha més registres pel diari
 ListOfProductsWithoutAccountingAccount=Llista de productes no comptabilitzats en cap compte comptable
 ChangeBinding=Canvia la comptabilització
 Accounted=Comptabilitzat en el llibre major
-NotYetAccounted=Not yet accounted in the ledger
+NotYetAccounted=Encara no es dóna compte al llibre major
 ShowTutorial=Mostrar Tutorial
 NotReconciled=No conciliat
 WarningRecordWithoutSubledgerAreExcluded=Advertiment: totes les operacions sense subcompte comptable definit es filtren i s'exclouen d'aquesta vista
@@ -328,6 +328,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Desactiva la vinculació i transferènci
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Desactiva la vinculació i transferència de comptes en els informes de despeses (els informes de despeses no es tindran en compte a la comptabilitat)
 
 ## Export
+NotifiedExportDate=Notified export date (modification of the entries will not be possible)
+NotifiedValidationDate=Validation of the entries (modification or deletion of the entries will not be possible)
+ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=Exporta els esborranys del llibre
 Modelcsv=Model d'exportació
 Selectmodelcsv=Selecciona un model d'exportació
@@ -402,29 +405,29 @@ UseMenuToSetBindindManualy=Línies encara no enllaçades, utilitzeu el menú <a
 
 ## Import
 ImportAccountingEntries=Entrades de comptabilitat
-ImportAccountingEntriesFECFormat=Accounting entries - FEC format
-FECFormatJournalCode=Code journal (JournalCode)
-FECFormatJournalLabel=Label journal (JournalLib)
-FECFormatEntryNum=Piece number (EcritureNum)
-FECFormatEntryDate=Piece date (EcritureDate)
-FECFormatGeneralAccountNumber=General account number (CompteNum)
-FECFormatGeneralAccountLabel=General account label (CompteLib)
-FECFormatSubledgerAccountNumber=Subledger account number (CompAuxNum)
-FECFormatSubledgerAccountLabel=Subledger account number (CompAuxLib)
-FECFormatPieceRef=Piece ref (PieceRef)
-FECFormatPieceDate=Piece date creation (PieceDate)
-FECFormatLabelOperation=Label operation (EcritureLib)
-FECFormatDebit=Debit (Debit)
-FECFormatCredit=Credit (Credit)
-FECFormatReconcilableCode=Reconcilable code (EcritureLet)
-FECFormatReconcilableDate=Reconcilable date (DateLet)
-FECFormatValidateDate=Piece date validated (ValidDate)
-FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
-FECFormatMulticurrencyCode=Multicurrency code (Idevise)
+ImportAccountingEntriesFECFormat=Entrades comptables: format FEC
+FECFormatJournalCode=Diari de codis (JournalCode)
+FECFormatJournalLabel=Etiqueta de diari (JournalLib)
+FECFormatEntryNum=Número de peça (EcritureNum)
+FECFormatEntryDate=Data de la peça (EcritureDate)
+FECFormatGeneralAccountNumber=Número de compte general (CompteNum)
+FECFormatGeneralAccountLabel=Etiqueta de compte general (CompteLib)
+FECFormatSubledgerAccountNumber=Número de compte de Subledger (CompAuxNum)
+FECFormatSubledgerAccountLabel=Número de compte de Subledger (CompAuxLib)
+FECFormatPieceRef=Peça ref (PieceRef)
+FECFormatPieceDate=Creació de la data de la peça (PieceDate)
+FECFormatLabelOperation=Funcionament de l'etiqueta (EcritureLib)
+FECFormatDebit=Dèbit (dèbit)
+FECFormatCredit=Crèdit (Crèdit)
+FECFormatReconcilableCode=Codi reconciliable (EcritureLet)
+FECFormatReconcilableDate=Data conciliable (DateLet)
+FECFormatValidateDate=Data de validació de la peça (ValidDate)
+FECFormatMulticurrencyAmount=Import de múltiples divises (Montantdevise)
+FECFormatMulticurrencyCode=Codi multidivisa (Idevise)
 
 DateExport=Data d'exportació
 WarningReportNotReliable=Avís, aquest informe no està basat en el Llibre Major, de manera que no conté assentaments modificats manualment en el Llibre Major. Si el registre diari està actualitzat, la vista de comptes és més precisa.
 ExpenseReportJournal=Diari d'informe de despeses
 InventoryJournal=Diari d'inventari
 
-NAccounts=%s accounts
+NAccounts=comptes %s
diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang
index b5d0c388795..d69f11ae766 100644
--- a/htdocs/langs/ca_ES/admin.lang
+++ b/htdocs/langs/ca_ES/admin.lang
@@ -64,7 +64,7 @@ RemoveLock=Elimineu/reanomeneu el fitxer <b> %s </b> si existeix, per a permetre
 RestoreLock=Substituir un arxiu <b>%s</b>, donant-li només drets de lectura a aquest arxiu per tal de prohibir noves actualitzacions.
 SecuritySetup=Configuració de seguretat
 PHPSetup=Configuració de PHP
-OSSetup=OS setup
+OSSetup=Configuració del sistema operatiu
 SecurityFilesDesc=Defineix les opcions relacionades amb la seguretat de càrrega de fitxers.
 ErrorModuleRequirePHPVersion=Error, aquest mòdul requereix una versió %s o superior de PHP
 ErrorModuleRequireDolibarrVersion=Error, aquest mòdul requereix una versió %s o superior de Dolibarr
@@ -221,8 +221,8 @@ NotCompatible=Aquest mòdul no sembla compatible amb el vostre Dolibarr %s (Mín
 CompatibleAfterUpdate=Aquest mòdul requereix actualitzar el vostre Dolibarr %s (Mín. %s - Màx. %s).
 SeeInMarkerPlace=Veure a la tenda d'apps
 SeeSetupOfModule=Vegi la configuració del mòdul %s
+SetOptionTo=Set option <b>%s</b> to %s
 Updated=Actualitzat
-Nouveauté=Novetat
 AchatTelechargement=Comprar / Descarregar
 GoModuleSetupArea=Per a desplegar/instal·lar un mòdul nou, aneu a l'àrea de configuració del mòdul: <a href="%s"> %s </a>.
 DoliStoreDesc=DoliStore, el lloc oficial de mòduls complementaris per Dolibarr ERP / CRM
@@ -351,8 +351,8 @@ LastActivationAuthor=Últim autor d'activació
 LastActivationIP=Última IP d'activació
 UpdateServerOffline=Actualitza el servidor fora de línia
 WithCounter=Gestiona un comptador
-GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first %s. <br><b>{000000@x}</b> same as the previous one but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then the sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated to the customer. This counter dedicated to customer is reset at same time as the global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
+GenericMaskCodes=Podeu introduir qualsevol màscara de numeració. En aquesta màscara, es poden utilitzar les etiquetes següents: <br> <b> {000000} </b> correspon a un número que s'incrementarà a cada %s. Introduïu tants zeros com la longitud desitjada del comptador. El comptador es completarà amb zeros de l'esquerra per tal de tenir tants zeros com la màscara. <br> <b> {000000 + 000} </b> igual que l'anterior, però s'aplica un desplaçament que correspon al número a la dreta del signe + a partir del primer %s. <br> <b> {000000 @ x} </b> igual que l'anterior, però el comptador es restableix a zero quan s'arriba al mes x (x entre 1 i 12, o 0 per utilitzar els primers mesos de l'any fiscal definits a la vostra configuració, o 99 a restableix a zero cada mes). Si s’utilitza aquesta opció i x és 2 o superior, també és obligatòria la seqüència {yy} {mm} o {yyyy} {mm}. <br> <b> {dd} </b> dia (de l'1 al 31). <br> <b> {mm} </b> mes (01 a 12). <br> <b> {aa} </b>, <b> {aaaa} </b> o <b> {y} a09a4b. <br>
+GenericMaskCodes2= <b> {cccc} </b> el codi del client en n caràcters <br> <b> {cccc000} a09a4b739f17f8z. Aquest comptador dedicat al client es restableix al mateix temps que el comptador global. <br> <b> {tttt} </b> El codi del tipus de tercers en n caràcters (vegeu el menú Inici - Configuració - Diccionari - Tipus de tercers). Si afegiu aquesta etiqueta, el comptador serà diferent per a cada tipus de tercer. <br>
 GenericMaskCodes3=Qualsevol altre caràcter a la màscara es quedarà sense canvis. <br> No es permeten espais<br>
 GenericMaskCodes3EAN=La resta de caràcters de la màscara romandran intactes (excepte * o ? En 13a posició a EAN13). <br>No es permeten espais. <br> A EAN13, l'últim caràcter després de l'últim } a la 13a posició hauria de ser * o ? . Se substituirà per la clau calculada.<br>
 GenericMaskCodes4a=<u>Exemple en el 99 %s del tercer L'Empresa, amb data 31/01/2007:</u><br>
@@ -399,6 +399,7 @@ SecurityToken=Clau per a protegir els URL
 NoSmsEngine=No hi ha cap gestor d'enviament de SMS. Els gestors d'enviament de SMS no s'instal·len per defecte ja que depenen de cada proveïdor, però pot trobar-los a la plataforma %s
 PDF=PDF
 PDFDesc=Opcions globals de generació de PDF
+PDFOtherDesc=Opció PDF específica per a alguns mòduls
 PDFAddressForging=Regles per a la secció d’adreces
 HideAnyVATInformationOnPDF=Amaga tota la informació relacionada amb l'IVA
 PDFRulesForSalesTax=Regles per l'IVA
@@ -561,7 +562,7 @@ Module53Desc=Gestió de serveis
 Module54Name=Contractes/Subscripcions
 Module54Desc=Gestió de contractes (serveis o subscripcions recurrents)
 Module55Name=Codis de barra
-Module55Desc=Gestió dels codis de barra
+Module55Desc=Barcode or QR code management
 Module56Name=Pagament per transferència bancària
 Module56Desc=Gestió del pagament de proveïdors mitjançant comandes de transferència de crèdit. Inclou la generació de fitxers SEPA per a països europeus.
 Module57Name=Cobraments per domiciliació bancària
@@ -848,10 +849,10 @@ Permission402=Crear/modificar havers
 Permission403=Valida els descomptes
 Permission404=Eliminar havers
 Permission430=Utilitzeu la barra de depuració
-Permission511=Consulta els pagaments dels sous (vostres i subordinats)
-Permission512=Crea/modifica el pagament dels salaris
-Permission514=Elimina pagament de salaris
-Permission517=Consulta els pagaments dels sous de tothom
+Permission511=Read salaries and payments (yours and subordinates)
+Permission512=Create/modify salaries and payments
+Permission514=Delete salaries and payments
+Permission517=Read salaries and payments everybody
 Permission519=Exportació salaris
 Permission520=Consulta préstecs
 Permission522=Crear/modificar préstecs
@@ -965,6 +966,8 @@ Permission23003=Eliminar tasques programades
 Permission23004=Executar tasca programada
 Permission50101=Utilitza el Punt de venda (SimplePOS)
 Permission50151=Utilitza el Punt de venda (TakePOS)
+Permission50152=Editeu les línies de vendes
+Permission50153=Editeu les línies de vendes ordenades
 Permission50201=Consultar les transaccions
 Permission50202=Importar les transaccions
 Permission50330=Consulta objectes de Zapier
@@ -1039,11 +1042,12 @@ DictionaryMeasuringUnits=Unitats de mesura
 DictionarySocialNetworks=Xarxes socials
 DictionaryProspectStatus=Estat de perspectiva de les empreses
 DictionaryProspectContactStatus=Estat de perspectiva dels contactes
-DictionaryHolidayTypes=Tipus de dies lliures
+DictionaryHolidayTypes=Permís - Tipus de permís
 DictionaryOpportunityStatus=Estat d'oportunitat del projecte/oportunitat
 DictionaryExpenseTaxCat=Informe de despeses - Categories de transport
 DictionaryExpenseTaxRange=Informe de despeses - Rang per categoria de transport
 DictionaryTransportMode=Informe intracomm: mode de transport
+DictionaryBatchStatus=Estat del control de qualitat del lot / sèrie del producte
 TypeOfUnit=Tipus d’unitat
 SetupSaved=Configuració desada
 SetupNotSaved=Configuració no desada
@@ -1160,7 +1164,7 @@ DoNotSuggestPaymentMode=No ho suggereixis
 NoActiveBankAccountDefined=Cap compte bancari actiu definit
 OwnerOfBankAccount=Titular del compte %s
 BankModuleNotActive=Mòdul comptes bancaris no activat
-ShowBugTrackLink=Define the link "<strong>%s</strong>" (empty to not display this link, 'github' for the link to the Dolibarr project or define directly an url 'https://...')
+ShowBugTrackLink=Definiu l'enllaç "<strong> %s </strong>" (buit per no mostrar aquest enllaç, 'github' per a l'enllaç al projecte Dolibarr o definiu directament una URL 'https: // ...')
 Alerts=Alertes
 DelaysOfToleranceBeforeWarning=Retard abans de mostrar una alerta d'advertència per a:
 DelaysOfToleranceDesc=Establiu el retard abans que es mostri a la pantalla una icona d'alerta %s per a l'element final.
@@ -1186,8 +1190,8 @@ SetupDescription3= <a href="%s"> %s -> %s </a> <br> <br> Paràmetres bàsics uti
 SetupDescription4= <a href="%s"> %s -> %s </a> <br> <br> Aquest programari és un conjunt de molts mòduls / aplicacions. Els mòduls relacionats amb les vostres necessitats s’han d’activar i configurar. Les entrades del menú apareixen amb l’activació d’aquests mòduls.
 SetupDescription5=Altres entrades del menú d'instal·lació gestionen paràmetres opcionals.
 AuditedSecurityEvents=Esdeveniments de seguretat que s’auditen
-NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
-Audit=Auditoria
+NoSecurityEventsAreAduited=No s’audita cap esdeveniment de seguretat. Podeu activar-les des del menú %s
+Audit=Security events
 InfoDolibarr=Quant al Dolibarr
 InfoBrowser=Quant al Navegador
 InfoOS=Quant al S.O.
@@ -1254,8 +1258,8 @@ RunningUpdateProcessMayBeRequired=Sembla que cal executar el procés d’actuali
 YouMustRunCommandFromCommandLineAfterLoginToUser=Ha d'executar la comanda des d'un shell després d'haver iniciat sessió amb el compte <b>%s</b>.
 YourPHPDoesNotHaveSSLSupport=Funcions SSL no disponibles al vostre PHP
 DownloadMoreSkins=Més temes per a descarregar
-SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
-SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
+SimpleNumRefModelDesc=Retorna el número de referència en el format %syymm-nnnn on yy és l'any, mm és el mes i nnnn és un número d'increment automàtic seqüencial sense restablir
+SimpleNumRefNoDateModelDesc=Retorna el número de referència en el format %s-nnnn on nnnn és un número d’increment automàtic seqüencial sense restablir
 ShowProfIdInAddress=Mostra l'identificador professional amb adreces
 ShowVATIntaInAddress=Amaga el número d'IVA intracomunitari amb adreces
 TranslationUncomplete=Traducció parcial
@@ -1273,7 +1277,7 @@ MAIN_PROXY_HOST=Servidor proxy: nom / adreça
 MAIN_PROXY_PORT=Servidor proxy: port
 MAIN_PROXY_USER=Servidor proxy: inici de sessió / usuari
 MAIN_PROXY_PASS=Servidor proxy: contrasenya
-DefineHereComplementaryAttributes=Define any additional / custom attributes that must be added to: %s
+DefineHereComplementaryAttributes=Definiu qualsevol atribut addicional / personalitzat que cal afegir a: %s
 ExtraFields=Atributs complementaris
 ExtraFieldsLines=Atributs complementaris (línies)
 ExtraFieldsLinesRec=Atributs complementaris (línies de plantilles de factures)
@@ -1319,9 +1323,12 @@ ConditionIsCurrently=Actualment la condició és %s
 YouUseBestDriver=Utilitzeu el controlador %s, que és el millor controlador disponible actualment.
 YouDoNotUseBestDriver=S'utilitza el controlador %s, però es recomana utilitzar el controlador %s.
 NbOfObjectIsLowerThanNoPb=Només teniu %s %s a la base de dades. Això no requereix cap optimització particular.
+ComboListOptim=Optimització de càrrega de llista combinada
 SearchOptim=Cerca optimització
-YouHaveXObjectUseSearchOptim=Teniu %s %s a la base de dades. Podeu afegir la constant %s a 1 a Inici-Configuració-Altres. Limiteu la cerca al començament de les cadenes, cosa que fa possible que la base de dades utilitzi índexs i hauríeu d'obtenir una resposta immediata.
-YouHaveXObjectAndSearchOptimOn=Teniu %s %s a la base de dades i %s constant es configura com a 1 a Home-Setup-Other.
+YouHaveXObjectUseComboOptim=Teniu %s %s a la base de dades. Podeu entrar a la configuració del mòdul per habilitar la càrrega de la llista combinada en un esdeveniment premut amb la tecla.
+YouHaveXObjectUseSearchOptim=Teniu %s %s a la base de dades. Podeu afegir la constant %s a 1 a Inici-Configuració-Altres.
+YouHaveXObjectUseSearchOptimDesc=Això limita la cerca al començament de les cadenes, cosa que fa que la base de dades pugui utilitzar índexs i hauríeu d'obtenir una resposta immediata.
+YouHaveXObjectAndSearchOptimOn=Teniu %s %s a la base de dades i la constant %s s'estableix en %s a Home-Setup-Other.
 BrowserIsOK=Esteu utilitzant el navegador web %s. Aquest navegador està bé per a la seguretat i el rendiment.
 BrowserIsKO=Esteu utilitzant el navegador web %s. Es considera que aquest navegador és una mala elecció per a la seguretat, el rendiment i la fiabilitat. Recomanem utilitzar Firefox, Chrome, Opera o Safari.
 PHPModuleLoaded=Es carrega el component PHP %s
@@ -1433,6 +1440,7 @@ MemberMainOptions=Opcions principals
 AdherentLoginRequired= Gestiona un compte d'usuari per a cada soci
 AdherentMailRequired=Cal un correu electrònic per a crear un soci nou
 MemberSendInformationByMailByDefault=La casella de selecció per a enviar una confirmació per correu electrònic als socis (validació o nova subscripció) està activada per defecte
+MemberCreateAnExternalUserForSubscriptionValidated=Creeu un usuari extern per a cada subscripció nova membre validada
 VisitorCanChooseItsPaymentMode=El visitant pot triar entre els modes de pagament disponibles
 MEMBER_REMINDER_EMAIL=Activa el recordatori automàtic <b> per correu electrònic </b> de les subscripcions caducades. Nota: El mòdul <strong> %s </strong> s'ha d'habilitar i configurar correctament per a enviar recordatoris.
 MembersDocModules=Plantilles de documents per a documents generats a partir del registre de socis
@@ -1517,7 +1525,7 @@ LDAPFieldLoginUnix=Nom d'usuari (unix)
 LDAPFieldLoginExample=Exemple: uid
 LDAPFilterConnection=Filtre de cerca
 LDAPFilterConnectionExample=Exemple: & (objectClass = inetOrgPerson)
-LDAPGroupFilterExample=Example: &(objectClass=groupOfUsers)
+LDAPGroupFilterExample=Exemple: & (objectClass = groupOfUsers)
 LDAPFieldLoginSamba=Nom d'usuari (samba, activedirectory)
 LDAPFieldLoginSambaExample=Exemple: samaccountname
 LDAPFieldFullname=Nom complet
@@ -1753,7 +1761,7 @@ CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Mantenir buida per defecte la casella “Cre
 ##### Agenda #####
 AgendaSetup=Mòdul configuració d'accions i agenda
 PasswordTogetVCalExport=Clau d'autorització vCal export link
-SecurityKey = Security Key
+SecurityKey = Clau de seguretat
 PastDelayVCalExport=No exportar els esdeveniments de més de
 AGENDA_USE_EVENT_TYPE=Utilitzeu tipus d'esdeveniments (gestionats en el menú Configuració -> Diccionaris -> Tipus d'esdeveniments d'agenda)
 AGENDA_USE_EVENT_TYPE_DEFAULT=Estableix automàticament aquest valor predeterminat per al tipus d'esdeveniment en el formulari de creació de l'esdeveniment
@@ -1763,7 +1771,7 @@ AGENDA_DEFAULT_VIEW=Quina vista voleu obrir de manera predeterminada en seleccio
 AGENDA_REMINDER_BROWSER=Activa el recordatori d'esdeveniments <b> al navegador de l'usuari </b> (Quan s'arriba a la data de recordatori, el navegador mostra una finestra emergent. Cada usuari pot desactivar aquestes notificacions des de la configuració de notificacions del navegador).
 AGENDA_REMINDER_BROWSER_SOUND=Habilita les notificacions sonores
 AGENDA_REMINDER_EMAIL=Activa el recordatori d'esdeveniments <b> per correu electrònic </b> (es pot definir l'opció de recordatori/retard a cada esdeveniment).
-AGENDA_REMINDER_EMAIL_NOTE=Nota: La freqüència de la tasca %s ha de ser suficient per a assegurar-se que els recordatoris s’envien en el moment correcte.
+AGENDA_REMINDER_EMAIL_NOTE=Nota: La freqüència del treball programat %s ha de ser suficient per assegurar-se que els recordatoris s’envien en el moment correcte.
 AGENDA_SHOW_LINKED_OBJECT=Mostra l'objecte vinculat a la vista d'agenda
 ##### Clicktodial #####
 ClickToDialSetup=Configuració del mòdul Click To Dial
@@ -1979,9 +1987,11 @@ MAIN_PDF_MARGIN_RIGHT=Marge dret al PDF
 MAIN_PDF_MARGIN_TOP=Marge superior al PDF
 MAIN_PDF_MARGIN_BOTTOM=Marge inferior al PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Alçada del logotip en PDF
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add picture on proposal line
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Afegir signe electrònic en PDF
 NothingToSetup=No hi ha cap configuració específica necessària per a aquest mòdul.
 SetToYesIfGroupIsComputationOfOtherGroups=Estableixi a SÍ si aquest grup és un càlcul d'altres grups
-EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
+EnterCalculationRuleIfPreviousFieldIsYes=Introduïu la regla de càlcul si el camp anterior s'ha definit a Sí. <br> Per exemple: <br> CODEGRP1 + CODEGRP2
 SeveralLangugeVariatFound=S'ha trobat diverses variants d'idiomes
 RemoveSpecialChars=Elimina els caràcters especials
 COMPANY_AQUARIUM_CLEAN_REGEX=Filtre Regex per a netejar el valor (COMPANY_AQUARIUM_CLEAN_REGEX)
@@ -2064,11 +2074,11 @@ UseDebugBar=Utilitzeu la barra de depuració
 DEBUGBAR_LOGS_LINES_NUMBER=Nombre d’últimes línies de registre que cal mantenir a la consola
 WarningValueHigherSlowsDramaticalyOutput=Advertència, els valors més alts frenen molt la producció
 ModuleActivated=El mòdul %s està activat i alenteix la interfície
-ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances and security)
-ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
+ModuleActivatedWithTooHighLogLevel=El mòdul %s s'activa amb un nivell de registre massa alt (intenteu utilitzar un nivell inferior per obtenir millors prestacions i seguretat)
+ModuleSyslogActivatedButLevelNotTooVerbose=El mòdul %s està activat i el nivell de registre (%s) és correcte (no massa detallat)
 IfYouAreOnAProductionSetThis=Si esteu en un entorn de producció, s'hauria d'establir aquesta propietat en %s.
 AntivirusEnabledOnUpload=Antivirus activat als fitxers penjats
-SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
+SomeFilesOrDirInRootAreWritable=Alguns fitxers o directoris no estan en mode de només lectura
 EXPORTS_SHARE_MODELS=Els models d’exportació es comparteixen amb tothom
 ExportSetup=Configuració del mòdul Export
 ImportSetup=Configuració del mòdul Import
@@ -2092,11 +2102,10 @@ MakeAnonymousPing=Feu un Ping anònim '+1' al servidor de la fundació Dolibarr
 FeatureNotAvailableWithReceptionModule=Funció no disponible quan el mòdul Recepció està habilitat
 EmailTemplate=Plantilla per correu electrònic
 EMailsWillHaveMessageID=Els correus electrònics tindran una etiqueta "Referències" que coincideix amb aquesta sintaxi
-PDF_SHOW_PROJECT=Show project on document
-ShowProjectLabel=Project Label
+PDF_SHOW_PROJECT=Mostra el projecte al document
+ShowProjectLabel=Etiqueta del projecte
 PDF_USE_ALSO_LANGUAGE_CODE=Si voleu que alguns textos del vostre PDF es copiïn en 2 idiomes diferents en el mateix PDF generat, heu d’establir aquí aquest segon idioma perquè el PDF generat contingui 2 idiomes diferents en la mateixa pàgina, l’escollit en generar el PDF i aquesta (només poques plantilles de PDF admeten això). Mantingueu-lo buit per a 1 idioma per PDF.
 FafaIconSocialNetworksDesc=Introduïu aquí el codi de la icona de FontAwesome. Si no sabeu què és FontAwesome, podeu utilitzar el llibre genèric d’adreces.
-FeatureNotAvailableWithReceptionModule=Funció no disponible quan el mòdul Recepció està habilitat
 RssNote=Nota: Cada definició del canal RSS proporciona un giny que heu d’habilitar per a tenir-lo disponible al tauler de control
 JumpToBoxes=Aneu a Configuració -> Ginys
 MeasuringUnitTypeDesc=Utilitzeu aquí un valor com "mida", "superfície", "volum", "pes", "temps"
@@ -2116,16 +2125,22 @@ SeeLinkToOnlineDocumentation=Vegeu l'enllaç a la documentació en línia al men
 SHOW_SUBPRODUCT_REF_IN_PDF=Si s'utilitza la funció "%s" del mòdul <b> %s </b>, mostra els detalls dels subproductes d'un kit en el PDF.
 AskThisIDToYourBank=Poseu-vos en contacte amb el vostre banc per a obtenir aquesta identificació
 AdvancedModeOnly=El permís està disponible només en mode de permís avançat
-ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
+ConfFileIsReadableOrWritableByAnyUsers=Els usuaris poden llegir o escriure el fitxer conf. Doneu permís només a l'usuari i al grup del servidor web.
 MailToSendEventOrganization=Organització d'esdeveniments
-AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
-YouShouldDisablePHPFunctions=You should disable PHP functions
-IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
-NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
-RecommendedValueIs=Recommended: %s
-ARestrictedPath=A restricted path
-CheckForModuleUpdate=Check for external modules updates
-CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
-ModuleUpdateAvailable=An update is available
-NoExternalModuleWithUpdate=No updates found for external modules
-SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
+AGENDA_EVENT_DEFAULT_STATUS=Estat de l'esdeveniment per defecte en crear un esdeveniment des del formulari
+YouShouldDisablePHPFunctions=Hauríeu de desactivar les funcions PHP
+IfCLINotRequiredYouShouldDisablePHPFunctions=Excepte si heu d'executar ordres del sistema en codi personalitzat, hauríeu de desactivar les funcions PHP
+PHPFunctionsRequiredForCLI=Per al propòsit de l'intèrpret d'ordres (com fer còpies de seguretat programades o executar un programa anitivurs), heu de mantenir les funcions PHP
+NoWritableFilesFoundIntoRootDir=No s'ha trobat cap fitxer ni directori d'escriptura dels programes comuns al directori arrel (Bo)
+RecommendedValueIs=Recomanat: %s
+NotRecommended=No recomanat
+ARestrictedPath=Un camí restringit
+CheckForModuleUpdate=Comproveu si hi ha actualitzacions de mòduls externs
+CheckForModuleUpdateHelp=Aquesta acció es connectarà als editors de mòduls externs per comprovar si hi ha disponible una nova versió.
+ModuleUpdateAvailable=Hi ha disponible una actualització
+NoExternalModuleWithUpdate=No s'han trobat actualitzacions per a mòduls externs
+SwaggerDescriptionFile=Fitxer de descripció de l'API Swagger (per utilitzar-lo amb redoc per exemple)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=Heu activat l'API WS obsoleta. Haureu d’utilitzar l’API REST.
+RandomlySelectedIfSeveral=Randomly selected if several pictures are available
+DatabasePasswordObfuscated=Database password is obfuscated in conf file
+DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
diff --git a/htdocs/langs/ca_ES/agenda.lang b/htdocs/langs/ca_ES/agenda.lang
index 7950ff65d5b..21f844fd26c 100644
--- a/htdocs/langs/ca_ES/agenda.lang
+++ b/htdocs/langs/ca_ES/agenda.lang
@@ -4,7 +4,7 @@ Actions=Esdeveniments
 Agenda=Agenda
 TMenuAgenda=Agenda
 Agendas=Agendes
-LocalAgenda=Calendari intern
+LocalAgenda=Calendari per defecte
 ActionsOwnedBy=Esdeveniment propietat de
 ActionsOwnedByShort=Propietari
 AffectedTo=Assignada a
@@ -20,7 +20,7 @@ MenuToDoActions=Tots els esdeveniments incomplets
 MenuDoneActions=Esdeveniments acabats
 MenuToDoMyActions=Els meus esdeveniments incomplets
 MenuDoneMyActions=Els meus esdeveniments acabats
-ListOfEvents=Llista d'esdeveniments (calendari intern)
+ListOfEvents=Llista d'esdeveniments (calendari predeterminat)
 ActionsAskedBy=Esdeveniments registrats per
 ActionsToDoBy=Esdeveniments assignats a
 ActionsDoneBy=Esdeveniments realitzats per
@@ -32,12 +32,13 @@ ViewPerUser=Vista d'usuaris
 ViewPerType=Vista per tipus
 AutoActions= Inclusió automàtica a l'agenda
 AgendaAutoActionDesc= Aquí pots definir esdeveniments que vols que Dolibarr creï automàticament a Agenda. Si no hi ha res comprovat, només s'inclouran les accions manuals als registres i es mostraran a Agenda. El seguiment automàtic de les accions empresarials realitzades en objectes (validació, canvi d'estat) no es desarà.
-AgendaSetupOtherDesc= Aquesta pàgina permet configurar algunes opcions que permeten exportar una vista de la seva agenda Dolibar a un calendari extern (thunderbird, google calendar, ...)
+AgendaSetupOtherDesc= Aquesta pàgina proporciona opcions per a permetre l'exportació dels vostres esdeveniments Dolibarr a un calendari extern (Thunderbird, Google Calendar, etc.)
 AgendaExtSitesDesc=Aquesta pàgina permet configurar calendaris externs per a la seva visualització en l'agenda de Dolibarr.
 ActionsEvents=Esdeveniments pels quals Dolibarr crearà una acció a l'agenda automàticament
 EventRemindersByEmailNotEnabled=Els recordatoris d'esdeveniments per correu electrònic no estaven habilitats en la configuració del mòdul %s.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Tercer %s creat
+COMPANY_MODIFYInDolibarr=Tercer modificat %s
 COMPANY_DELETEInDolibarr=Tercer %s suprimit
 ContractValidatedInDolibarr=Contracte %s validat
 CONTRACT_DELETEInDolibarr=Contracte %s eliminat
@@ -87,6 +88,7 @@ OrderDeleted=Comanda esborrada
 InvoiceDeleted=Factura esborrada
 DraftInvoiceDeleted=S'ha suprimit l'esborrany de factura
 CONTACT_CREATEInDolibarr=S'ha creat el contacte %s
+CONTACT_MODIFYInDolibarr=Es va modificar el contacte %s
 CONTACT_DELETEInDolibarr=S'ha eliminat el contacte %s
 PRODUCT_CREATEInDolibarr=Producte %s creat
 PRODUCT_MODIFYInDolibarr=Producte %s modificat
@@ -119,6 +121,7 @@ MRP_MO_UNVALIDATEInDolibarr=OF definida a l'estat d'esborrany
 MRP_MO_PRODUCEDInDolibarr=OF fabricada
 MRP_MO_DELETEInDolibarr=OF eliminada
 MRP_MO_CANCELInDolibarr=OF cancel·lada
+PAIDInDolibarr=%s pagat
 ##### End agenda events #####
 AgendaModelModule=Plantilles de documents per esdeveniments
 DateActionStart=Data d'inici
@@ -130,7 +133,7 @@ AgendaUrlOptions4=<b>logint=%s</b> per a restringir la producció d'accions assi
 AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> per a restringir la sortida d'accions associades al projecta <b>PROJECT_ID</b>.
 AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> per excloure esdeveniments automàtics.
 AgendaUrlOptionsIncludeHolidays= <b> includeholidays = 1 </b> per incloure esdeveniments de vacances.
-AgendaShowBirthdayEvents=Mostra aniversaris dels contactes
+AgendaShowBirthdayEvents=Aniversaris de contactes
 AgendaHideBirthdayEvents=Amaga els aniversaris dels contactes
 Busy=Ocupat
 ExportDataset_event1=Llista d'esdeveniments de l'agenda
diff --git a/htdocs/langs/ca_ES/banks.lang b/htdocs/langs/ca_ES/banks.lang
index 75647bece01..4f92c6bf2b7 100644
--- a/htdocs/langs/ca_ES/banks.lang
+++ b/htdocs/langs/ca_ES/banks.lang
@@ -109,13 +109,13 @@ SocialContributionPayment=Pagament d'impostos varis
 BankTransfer=Transferència bancària
 BankTransfers=Transferències bancàries
 MenuBankInternalTransfer=Transferència interna
-TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
+TransferDesc=Utilitzeu la transferència interna per transferir d'un compte a un altre, l'aplicació escriurà dos registres: un dèbit al compte d'origen i un crèdit al compte objectiu. Es farà servir el mateix import, etiqueta i data per a aquesta transacció.
 TransferFrom=De
 TransferTo=Cap a
 TransferFromToDone=La transferència de <b>%s</b> cap a <b>%s</b> de <b>%s</b> %s s'ha creat.
 CheckTransmitter=Remitent
 ValidateCheckReceipt=Vols validar aquesta remesa de xec?
-ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
+ConfirmValidateCheckReceipt=Esteu segur que voleu enviar aquest rebut de xec per validar-lo? No es poden fer canvis.
 DeleteCheckReceipt=Vols suprimir aquesta remesa de xec?
 ConfirmDeleteCheckReceipt=Vols eliminar aquesta remesa de xec?
 BankChecks=Xec bancari
@@ -128,7 +128,7 @@ ConfirmDeleteTransaction=Esteu segur que voleu suprimir aquest registre?
 ThisWillAlsoDeleteBankRecord=Açò eliminarà també els registres bancaris generats
 BankMovements=Moviments
 PlannedTransactions=Registres prevists
-Graph=Graphs
+Graph=Gràfics
 ExportDataset_banque_1=Registres bancaris i extractes
 ExportDataset_banque_2=Resguard
 TransactionOnTheOtherAccount=Transacció sobre l'altra compte
@@ -142,7 +142,7 @@ AllAccounts=Tots els comptes bancaris i en efectiu
 BackToAccount=Tornar al compte
 ShowAllAccounts=Mostra per a tots els comptes
 FutureTransaction=Transacció futura. No és possible conciliar.
-SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
+SelectChequeTransactionAndGenerate=Seleccioneu / filtreu els xecs que s’inclouran al rebut del dipòsit de xecs. A continuació, feu clic a "Crea".
 InputReceiptNumber=Selecciona l'estat del compte bancari relacionat amb la conciliació. Utilitza un valor numèric que es pugui ordenar: AAAAMM o AAAAMMDD
 EventualyAddCategory=Eventualment, indiqui una categoria en la qual classificar els registres
 ToConciliate=A conciliar?
diff --git a/htdocs/langs/ca_ES/bills.lang b/htdocs/langs/ca_ES/bills.lang
index 85e701cdfa3..7cdd422fee0 100644
--- a/htdocs/langs/ca_ES/bills.lang
+++ b/htdocs/langs/ca_ES/bills.lang
@@ -55,7 +55,7 @@ CustomerInvoice=Factura a client
 CustomersInvoices=Factures a clients
 SupplierInvoice=Factura del proveïdor
 SuppliersInvoices=Factures de proveïdor
-SupplierInvoiceLines=Vendor invoice lines
+SupplierInvoiceLines=Línies de facturació del proveïdor
 SupplierBill=Factura del proveïdor
 SupplierBills=Factures de proveïdor
 Payment=Pagament
@@ -82,8 +82,8 @@ PaymentsAlreadyDone=Pagaments efectuats
 PaymentsBackAlreadyDone=Devolucions realitzades
 PaymentRule=Regla de pagament
 PaymentMode=Forma de pagament
-DefaultPaymentMode=Default Payment Type
-DefaultBankAccount=Default Bank Account
+DefaultPaymentMode=Tipus de pagament predeterminat
+DefaultBankAccount=Compte bancari per defecte
 PaymentTypeDC=Dèbit/Crèdit Tarja
 PaymentTypePP=PayPal
 IdPaymentMode=Forma de pagament (Id)
@@ -120,7 +120,7 @@ ConvertExcessPaidToReduc=Converteix l'excés pagat en descompte disponible
 EnterPaymentReceivedFromCustomer=Afegir cobrament rebut del client
 EnterPaymentDueToCustomer=Fer pagament del client
 DisabledBecauseRemainderToPayIsZero=Desactivar ja que la resta a pagar és 0
-PriceBase=Base price
+PriceBase=Preu base
 BillStatus=Estat de la factura
 StatusOfGeneratedInvoices=Estat de factures generades
 BillStatusDraft=Esborrany (a validar)
@@ -259,6 +259,7 @@ DateMaxPayment=Venciment de pagament
 DateInvoice=Data facturació
 DatePointOfTax=Punt d'impostos
 NoInvoice=Cap factura
+NoOpenInvoice=No open invoice
 ClassifyBill=Classifica la factura
 SupplierBillsToPay=Factures de proveïdors pendents de pagament
 CustomerBillsUnpaid=Factures de client pendents de cobrament
@@ -376,7 +377,7 @@ DateLastGeneration=Data de l'última generació
 DateLastGenerationShort=Data última gen.
 MaxPeriodNumber=Màx. nombre de generació de factures
 NbOfGenerationDone=Nombre de generació de factura ja realitzat
-NbOfGenerationOfRecordDone=Number of record generation already done
+NbOfGenerationOfRecordDone=Nombre de generacions de discs ja realitzades
 NbOfGenerationDoneShort=Número de generació realitzat
 MaxGenerationReached=Nombre màxim de generacions assolides
 InvoiceAutoValidate=Valida les factures automàticament
@@ -454,7 +455,7 @@ RegulatedOn=Pagar el
 ChequeNumber=Número de xec
 ChequeOrTransferNumber=Núm. de xec/transferència
 ChequeBordereau=Comprova horari
-ChequeMaker=Check/Transfer sender
+ChequeMaker=Remitent de xec / transferència
 ChequeBank=Banc del xec
 CheckBank=Xec
 NetToBePaid=Net a pagar
@@ -499,7 +500,7 @@ Reported=Ajornat
 DisabledBecausePayments=No disponible ja que hi ha pagaments
 CantRemovePaymentWithOneInvoicePaid=Eliminació impossible quan hi ha almenys una factura classificada com a pagada.
 CantRemovePaymentVATPaid=No es pot eliminar el pagament ja que la declaració de l'IVA està classificada com a pagada
-CantRemovePaymentSalaryPaid=Can't remove payment since salary is classified paid
+CantRemovePaymentSalaryPaid=No es pot eliminar el pagament perquè el salari està classificat com a pagat
 ExpectedToPay=Esperant el pagament
 CantRemoveConciliatedPayment=No es pot eliminar el pagament reconciliat
 PayedByThisPayment=Pagada per aquest pagament
@@ -507,7 +508,7 @@ ClosePaidInvoicesAutomatically=Classifiqueu automàticament totes les factures e
 ClosePaidCreditNotesAutomatically=Classifiqueu automàticament totes les notes de crèdit com a "Pagades" quan es faci la devolució íntegra.
 ClosePaidContributionsAutomatically=Classifiqueu automàticament totes les contribucions socials o fiscals com a "Pagades" quan el pagament es realitzi íntegrament.
 ClosePaidVATAutomatically=Classifica automàticament la declaració d'IVA com a "Pagada" quan el pagament es realitzi completament.
-ClosePaidSalaryAutomatically=Classify automatically salary as "Paid" when payment is done entirely.
+ClosePaidSalaryAutomatically=Classifiqueu automàticament el salari com a "Pagat" quan el pagament es faci completament.
 AllCompletelyPayedInvoiceWillBeClosed=Totes les factures no pendents de pagament es tancaran automàticament amb l'estat "Pagat".
 ToMakePayment=Pagar
 ToMakePaymentBack=Reemborsar
@@ -520,10 +521,10 @@ YouMustCreateStandardInvoiceFirstDesc=Primer heu de crear una factura estàndard
 PDFCrabeDescription=Plantilla de factura PDF Crabe. Una plantilla de factura completa (implementació antiga de la plantilla Sponge)
 PDFSpongeDescription=Plantilla PDF de factures Sponge. Una plantilla de factura completa
 PDFCrevetteDescription=Plantilla Crevette per factures PDF. Una plantilla de factura completa per factures de situació.
-TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
-MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+TerreNumRefModelDesc1=Retorna el número en el format %syymm-nnnn per a les factures estàndard i %syymm-nnnn per a les notes de crèdit on aa és any, mm és mes i nnnn és un número d’increment automàtic seqüencial sense interrupció i sense retorn a 0
+MarsNumRefModelDesc1=Número de devolució en el format %syymm-nnnn per a factures estàndard, %syymm-nnnn per a factures de substitució, %syymm-nnnn per a factures d’avançament i %syymm notes i any sense descans i sense retorn a 0
 TerreNumRefModelError=Ja existeix una factura que comença amb $syymm i no és compatible amb aquest model de seqüència. Elimineu-la o canvieu-li el nom per a activar aquest mòdul.
-CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+CactusNumRefModelDesc1=Número de devolució en el format %syymm-nnnn per a les factures estàndard, %syymm-nnnn per a les notes de crèdit i %syymm-nnnn per a les factures d’avançament en què yy és any, mm és mes i nnnn és un número que no ha de retorn automàtic 0
 EarlyClosingReason=Motiu de tancament anticipat
 EarlyClosingComment=Nota de tancament anticipat
 ##### Types de contacts #####
@@ -589,3 +590,4 @@ FacParentLine=Línia de factura origen
 SituationTotalRayToRest=Resta a pagar sense impostos
 PDFSituationTitle=Situació núm. %d
 SituationTotalProgress=Progrés total %d %%
+SearchUnpaidInvoicesWithDueDate=Cerqueu factures pendents de pagament amb data de venciment = %s
diff --git a/htdocs/langs/ca_ES/boxes.lang b/htdocs/langs/ca_ES/boxes.lang
index 239fa73d3dd..bda2c645372 100644
--- a/htdocs/langs/ca_ES/boxes.lang
+++ b/htdocs/langs/ca_ES/boxes.lang
@@ -18,13 +18,13 @@ BoxLastActions=Últimes accions
 BoxLastContracts=Últims contractes
 BoxLastContacts=Últims contactes/adreces
 BoxLastMembers=Últims socis
-BoxLastModifiedMembers=Latest modified members
-BoxLastMembersSubscriptions=Latest member subscriptions
+BoxLastModifiedMembers=Darrers membres modificats
+BoxLastMembersSubscriptions=Últimes subscripcions de membres
 BoxFicheInter=Últimes intervencions
 BoxCurrentAccounts=Balanç de comptes oberts
 BoxTitleMemberNextBirthdays=Aniversaris d'aquest mes (membres)
 BoxTitleMembersByType=Socis per tipus
-BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
+BoxTitleMembersSubscriptionsByYear=Subscripcions de membres per any
 BoxTitleLastRssInfos=Últimes %s notícies de %s
 BoxTitleLastProducts=Productes / Serveis: últims %s modificats
 BoxTitleProductsAlertStock=Productes: alerta d'estoc
@@ -46,11 +46,11 @@ BoxMyLastBookmarks=Adreces d'interès: últims %s
 BoxOldestExpiredServices=Serveis antics expirats
 BoxLastExpiredServices=Últims %s contactes amb serveis actius expirats
 BoxTitleLastActionsToDo=Últimes %s accions a fer
-BoxTitleLastContracts=Latest %s contracts which were modified
-BoxTitleLastModifiedDonations=Latest %s donations which were modified
-BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
-BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
-BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
+BoxTitleLastContracts=Últims contractes %s que es van modificar
+BoxTitleLastModifiedDonations=Últimes donacions %s que es van modificar
+BoxTitleLastModifiedExpenses=Últims informes de despeses %s que es van modificar
+BoxTitleLatestModifiedBoms=Últims BOMs %s que es van modificar
+BoxTitleLatestModifiedMos=Últimes comandes de fabricació %s que es van modificar
 BoxTitleLastOutstandingBillReached=Clients que han superat el màxim pendent
 BoxGlobalActivity=Activitat global
 BoxGoodCustomers=Bons clients
@@ -112,9 +112,9 @@ BoxTitleLastCustomerShipments=Últims %s enviaments de clients
 NoRecordedShipments=Cap enviament de client registrat
 BoxCustomersOutstandingBillReached=Clients que superen el límit pendent
 # Pages
-UsersHome=Home users and groups
-MembersHome=Home Membership
+UsersHome=Usuaris i grups domèstics
+MembersHome=Membres a casa
 ThirdpartiesHome=Inici Tercers
-TicketsHome=Home Tickets
+TicketsHome=Entrades a casa
 AccountancyHome=Inici Comptabilitat
 ValidatedProjects=Projectes validats
diff --git a/htdocs/langs/ca_ES/cashdesk.lang b/htdocs/langs/ca_ES/cashdesk.lang
index c8ba9314116..f00c5018ac0 100644
--- a/htdocs/langs/ca_ES/cashdesk.lang
+++ b/htdocs/langs/ca_ES/cashdesk.lang
@@ -41,8 +41,8 @@ Floor=Sala
 AddTable=Afegeix taula
 Place=Lloc
 TakeposConnectorNecesary=Es requereix el 'connector TakePOS'
-OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
-NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser:
+OrderPrinters=Afegiu un botó per enviar la comanda a algunes impressores donades, sense pagament (per exemple, per enviar una comanda a una cuina)
+NotAvailableWithBrowserPrinter=No disponible quan la impressora per a recepció està configurada com a navegador:
 SearchProduct=Cerca producte
 Receipt=Ordre
 Header=Capçalera
@@ -59,7 +59,7 @@ BillsCoinsPad=Pad de monedes i bitllets
 DolistorePosCategory=Mòduls TakePOS i altres solucions POS per a Dolibarr
 TakeposNeedsCategories=TakePOS necessita almenys una categoria de productes per a funcionar
 TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS necessita almenys una categoria a sota de la categoria  <b>%s</b> per funcionar
-OrderNotes=Can add some notes to each ordered items
+OrderNotes=Pot afegir algunes notes a cada element ordenat
 CashDeskBankAccountFor=Compte predeterminat a utilitzar per als pagaments
 NoPaimementModesDefined=No hi ha cap mode de pagament definit a la configuració de TakePOS
 TicketVatGrouped=Agrupa IVA per tipus als tiquets|rebuts
@@ -84,7 +84,7 @@ InvoiceIsAlreadyValidated=La factura ja està validada
 NoLinesToBill=No hi ha línies a facturar
 CustomReceipt=Rebut personalitzat
 ReceiptName=Nom del rebut
-ProductSupplements=Manage supplements of products
+ProductSupplements=Gestionar suplements de productes
 SupplementCategory=Categoria de suplement
 ColorTheme=Color del tema
 Colorful=Colorit
@@ -94,7 +94,7 @@ Browser=Navegador
 BrowserMethodDescription=Impressió de rebuts fàcil i senzilla. Només uns quants paràmetres per a configurar el rebut. Imprimeix mitjançant el navegador.
 TakeposConnectorMethodDescription=Mòdul extern amb funcions addicionals. Possibilitat d’imprimir des del núvol.
 PrintMethod=Mètode d'impressió
-ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. The server hosting the application can't be in the Cloud (must be able to reach the printers in your network).
+ReceiptPrinterMethodDescription=Mètode potent amb molts paràmetres. Completament personalitzable amb plantilles. El servidor que allotja l'aplicació no pot estar al núvol (ha de poder arribar a les impressores de la vostra xarxa).
 ByTerminal=Per terminal
 TakeposNumpadUsePaymentIcon=Utilitzeu la icona en lloc del text als botons de pagament del teclat numèric
 CashDeskRefNumberingModules=Mòdul de numeració per a vendes des del TPV (Punt de Venda)
@@ -102,7 +102,7 @@ CashDeskGenericMaskCodes6 =  L'etiqueta <br><b>{TN}</b> s'utilitza per a afegir
 TakeposGroupSameProduct=Agrupa les mateixes línies de productes
 StartAParallelSale=Comenceu una venda nova paral·lela
 SaleStartedAt=La venda va començar a %s
-ControlCashOpening=Finestra emergent de control de caixa en obrir el TPV
+ControlCashOpening=Obriu la finestra emergent "Control efectiu" en obrir el TPV
 CloseCashFence=Tanca el control de caixa
 CashReport=Informe d'efectiu
 MainPrinterToUse=Impressora principal a utilitzar
@@ -126,5 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=La impressora de recepció del mòdul deu have
 AllowDelayedPayment=Permet un pagament retardat
 PrintPaymentMethodOnReceipts=Imprimeix el mètode de pagament en els tiquets/rebuts
 WeighingScale=Balança de pesatge
-ShowPriceHT = Mostra el preu sense la columna d'impostos
-ShowPriceHTOnReceipt = Mostra el preu sense la columna d’impostos al rebut
+ShowPriceHT = Mostra la columna amb el preu sense impostos (a la pantalla)
+ShowPriceHTOnReceipt = Mostra la columna amb el preu sense impostos (al rebut)
diff --git a/htdocs/langs/ca_ES/categories.lang b/htdocs/langs/ca_ES/categories.lang
index 1e9afb3dc9d..d7ce09713e9 100644
--- a/htdocs/langs/ca_ES/categories.lang
+++ b/htdocs/langs/ca_ES/categories.lang
@@ -3,20 +3,20 @@ Rubrique=Etiqueta
 Rubriques=Etiquetes
 RubriquesTransactions=Etiquetes d'assentaments
 categories=etiquetes
-NoCategoryYet=No tag/category of this type has been created
+NoCategoryYet=No s'ha creat cap etiqueta / categoria d'aquest tipus
 In=En
 AddIn=Afegeix
 modify=Modifica
 Classify=Classifica
 CategoriesArea=Àrea d'etiquetes
-ProductsCategoriesArea=Product/Service tags/categories area
-SuppliersCategoriesArea=Vendor tags/categories area
-CustomersCategoriesArea=Customer tags/categories area
-MembersCategoriesArea=Member tags/categories area
-ContactsCategoriesArea=Contact tags/categories area
-AccountsCategoriesArea=Bank account tags/categories area
-ProjectsCategoriesArea=Project tags/categories area
-UsersCategoriesArea=User tags/categories area
+ProductsCategoriesArea=Àrea de categories / etiquetes de producte / servei
+SuppliersCategoriesArea=Àrea d'etiquetes / categories de proveïdor
+CustomersCategoriesArea=Àrea d'etiquetes / categories de client
+MembersCategoriesArea=Àrea d'etiquetes / categories de membres
+ContactsCategoriesArea=Àrea d'etiquetes / categories de contacte
+AccountsCategoriesArea=Àrea d'etiquetes / categories de comptes bancaris
+ProjectsCategoriesArea=Àrea d'etiquetes / categories del projecte
+UsersCategoriesArea=Àrea d'etiquetes / categories d'usuari
 SubCats=Subcategories
 CatList=Llistat d'etiquetes
 CatListAll=Llista d'etiquetes (tots els tipus)
@@ -96,4 +96,4 @@ ChooseCategory=Tria la categoria
 StocksCategoriesArea=Categories de magatzems
 ActionCommCategoriesArea=Categories d'esdeveniments
 WebsitePagesCategoriesArea=Categories de Pàgines/Contenidors
-UseOrOperatorForCategories=Use 'OR' operator for categories
+UseOrOperatorForCategories=Utilitzeu l'operador "O" per a les categories
diff --git a/htdocs/langs/ca_ES/companies.lang b/htdocs/langs/ca_ES/companies.lang
index db2493cb144..fc3be9be348 100644
--- a/htdocs/langs/ca_ES/companies.lang
+++ b/htdocs/langs/ca_ES/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=El nom de l'empresa %s ja existeix. Indica un altre.
 ErrorSetACountryFirst=Indica en primer lloc el país
 SelectThirdParty=Seleccionar un tercer
-ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
+ConfirmDeleteCompany=Esteu segur que voleu eliminar aquesta empresa i tota la informació relacionada?
 DeleteContact=Eliminar un contacte
-ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
+ConfirmDeleteContact=Esteu segur que voleu suprimir aquest contacte i tota la informació relacionada?
 MenuNewThirdParty=Tercer nou
 MenuNewCustomer=Client nou
 MenuNewProspect=Client potencial nou
@@ -69,7 +69,7 @@ PhoneShort=Telèfon
 Skype=Skype
 Call=Trucar
 Chat=Xat
-PhonePro=Bus. phone
+PhonePro=Autobús. telèfon
 PhonePerso=Tel. personal
 PhoneMobile=Mòbil
 No_Email=No enviar e-mailings massius
@@ -181,7 +181,7 @@ ProfId3FR=CNAE
 ProfId4FR=RCS/RM
 ProfId5FR=Prof Id 5 (número EORI)
 ProfId6FR=-
-ProfId1ShortFR=SIREN
+ProfId1ShortFR=SIRENA
 ProfId2ShortFR=SIRET
 ProfId3ShortFR=NAF
 ProfId4ShortFR=RCS
@@ -275,8 +275,8 @@ ProfId1DZ=RC
 ProfId2DZ=Art.
 ProfId3DZ=NIF
 ProfId4DZ=NIS
-VATIntra=CIF/NIF
-VATIntraShort=CIF/NIF
+VATIntra=CIF/NIF Intracomunitari
+VATIntraShort=CIF/NIF Intracomunitari
 VATIntraSyntaxIsValid=Sintaxi vàlida
 VATReturn=Devolució de l'IVA
 ProspectCustomer=Client potencial/Client
@@ -331,7 +331,7 @@ CustomerCodeDesc=Codi client, únic per a tots els clients
 SupplierCodeDesc=Codi de proveïdor, únic per a tots els proveïdors
 RequiredIfCustomer=Requerida si el tercer és un client o client potencial
 RequiredIfSupplier=Obligatori si un tercer és proveïdor
-ValidityControledByModule=Validity controlled by the module
+ValidityControledByModule=Validesa controlada pel mòdul
 ThisIsModuleRules=Regles per a aquest mòdul
 ProspectToContact=Client potencial a contactar
 CompanyDeleted=L'empresa "%s" ha estat eliminada
@@ -439,22 +439,22 @@ ListSuppliersShort=Llistat de proveïdors
 ListProspectsShort=Llistat de clients potencials
 ListCustomersShort=Llistat de clients
 ThirdPartiesArea=Àrea de tercers i contactes
-LastModifiedThirdParties=Latest %s Third Parties which were modified
-UniqueThirdParties=Total number of Third Parties
+LastModifiedThirdParties=Últims tercers %s que van ser modificats
+UniqueThirdParties=Nombre total de tercers
 InActivity=Actiu
 ActivityCeased=Tancat
 ThirdPartyIsClosed=Tercer està tancat
-ProductsIntoElements=List of products/services mapped to %s
+ProductsIntoElements=Llista de productes / serveis mapats a %s
 CurrentOutstandingBill=Factura pendent actual
 OutstandingBill=Max. de factures pendents
 OutstandingBillReached=S'ha arribat al màx. de factures pendents
 OrderMinAmount=Import mínim per comanda
-MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
+MonkeyNumRefModelDesc=Torneu un número amb el format %syymm-nnnn per al codi de client i %syymm-nnnn per al codi del proveïdor on yy és any, mm és mes i nnnn és un número d’increment automàtic seqüencial sense interrupció i sense retorn a 0.
 LeopardNumRefModelDesc=El codi és lliure. Aquest codi es pot modificar en qualsevol moment.
 ManagingDirectors=Nom del gerent(s) (CEO, director, president ...)
 MergeOriginThirdparty=Duplicar tercer (tercer que vols eliminar)
 MergeThirdparties=Fusionar tercers
-ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
+ConfirmMergeThirdparties=Esteu segur que voleu combinar el tercer triat amb l'actual? Tots els objectes enllaçats (factures, comandes, ...) es mouran al tercer actual, i després se suprimirà el tercer triat.
 ThirdpartiesMergeSuccess=S'han fusionat els tercers
 SaleRepresentativeLogin=Nom d'usuari de l'agent comercial
 SaleRepresentativeFirstname=Nom de l'agent comercial
diff --git a/htdocs/langs/ca_ES/compta.lang b/htdocs/langs/ca_ES/compta.lang
index 26dfb20751e..7cd14979da8 100644
--- a/htdocs/langs/ca_ES/compta.lang
+++ b/htdocs/langs/ca_ES/compta.lang
@@ -135,14 +135,14 @@ NewCheckReceipt=Descompte nou
 NewCheckDeposit=Ingrés nou
 NewCheckDepositOn=Crea remesa per ingressar al compte: %s
 NoWaitingChecks=Sense xecs en espera de l'ingrés.
-DateChequeReceived=Check receiving date
+DateChequeReceived=Comproveu la data de recepció
 NbOfCheques=Nombre de xecs
 PaySocialContribution=Pagar un impost varis
 PayVAT=Paga una declaració d’IVA
-PaySalary=Pay a salary card
+PaySalary=Pagar una targeta salarial
 ConfirmPaySocialContribution=Esteu segur que voleu classificar aquest impost varis com a pagat?
 ConfirmPayVAT=Esteu segur que voleu classificar aquesta declaració d'IVA com a pagada?
-ConfirmPaySalary=Are you sure you want to classify this salary card as paid?
+ConfirmPaySalary=Esteu segur que voleu classificar aquesta targeta salarial com a pagada?
 DeleteSocialContribution=Elimina un pagament d'impost varis
 DeleteVAT=Suprimeix una declaració d’IVA
 DeleteSalary=Elimina una fitxa salarial
@@ -175,7 +175,7 @@ RulesResultInOut=- Inclou els pagaments reals realitzats en les factures, les de
 RulesCADue=- Inclou les factures degudes al client tant si són pagades com si no. <br> - Es basa en la data de facturació d'aquestes factures. <br>
 RulesCAIn=- Inclou tots els pagaments efectius de factures rebuts dels clients. <br> - Es basa en la data de pagament d'aquestes factures <br>
 RulesCATotalSaleJournal=Inclou totes les línies de crèdit del Diari de venda.
-RulesSalesTurnoverOfIncomeAccounts=It includes (credit - debit) of lines for product accounts in group INCOME
+RulesSalesTurnoverOfIncomeAccounts=Inclou (crèdit-dèbit) de línies per a comptes de producte del grup INGRESSOS
 RulesAmountOnInOutBookkeepingRecord=Inclou un registre al vostre Llibre Major amb comptes comptables que tenen el grup "DESPESA" o "INGRÉS"
 RulesResultBookkeepingPredefined=Inclou un registre al vostre Llibre Major amb comptes comptables que tenen el grup "DESPESA" o "INGRÉS"
 RulesResultBookkeepingPersonalized=Mostra un registre al vostre Llibre Major amb comptes comptables <b> agrupats per grups personalitzats </b>
@@ -196,7 +196,7 @@ VATReportByThirdParties=Informe d'impostos sobre vendes per tercers
 VATReportByCustomers=Informe d'IVA sobre vendes per client
 VATReportByCustomersInInputOutputMode=Informe per clients d'IVA cobrat i pagat
 VATReportByQuartersInInputOutputMode=Taxa impositiva d'informe per vendes de l'impost recaptat i pagat
-VATReportShowByRateDetails=Show details of this rate
+VATReportShowByRateDetails=Mostra els detalls d'aquesta tarifa
 LT1ReportByQuarters=Informe impost 2 per tipus
 LT2ReportByQuarters=Informe impost 3 per tipus
 LT1ReportByQuartersES=Informe per taxa de RE
@@ -231,7 +231,7 @@ Pcg_subtype=Subtipus de compte
 InvoiceLinesToDispatch=Línies de factures a desglossar
 ByProductsAndServices=Per producte i servei
 RefExt=Ref. externa
-ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
+ToCreateAPredefinedInvoice=Per crear una factura de plantilla, creeu una factura estàndard i, després, sense validar-la, feu clic al botó "%s".
 LinkedOrder=Enllaçar a una comanda
 Mode1=Mètode 1
 Mode2=Mètode 2
@@ -281,8 +281,14 @@ PurchaseTurnoverCollected=Volum de compres recollit
 RulesPurchaseTurnoverDue=- Inclou les factures pendents del proveïdor, tant si es paguen com si no. <br>- Es basa en la data de factura d'aquestes factures.<br>
 RulesPurchaseTurnoverIn=- Inclou tots els pagaments realitzats de les factures de proveïdors. <br> - Es basa en la data de pagament d’aquestes factures <br>
 RulesPurchaseTurnoverTotalPurchaseJournal=Inclou totes les línies de dèbit del diari de compra.
-RulesPurchaseTurnoverOfExpenseAccounts=It includes (debit - credit) of lines for product accounts in group EXPENSE
+RulesPurchaseTurnoverOfExpenseAccounts=Inclou (dèbit-crèdit) de línies per a comptes de producte del grup DESPESES
 ReportPurchaseTurnover=Volum de compres facturat
 ReportPurchaseTurnoverCollected=Volum de compres recollit
 IncludeVarpaysInResults = Incloure varis pagaments als informes
 IncludeLoansInResults = Inclou préstecs en informes
+InvoiceLate30Days = Factures tardanes> 30 dies
+InvoiceLate15Days = Factures tardanes> 15 dies
+InvoiceLateMinus15Days = Factures tardanes
+InvoiceNotLate = A recollir <15 dies
+InvoiceNotLate15Days = A recollir en 15 dies
+InvoiceNotLate30Days = A recollir en 30 dies
diff --git a/htdocs/langs/ca_ES/cron.lang b/htdocs/langs/ca_ES/cron.lang
index 96066b666fe..722eadf7bed 100644
--- a/htdocs/langs/ca_ES/cron.lang
+++ b/htdocs/langs/ca_ES/cron.lang
@@ -7,15 +7,15 @@ Permission23103 = Elimina la tasca programada
 Permission23104 = Executa les tasques programades
 # Admin
 CronSetup=Pàgina de configuració del mòdul - Gestió de tasques planificades
-URLToLaunchCronJobs=URL per comprovar i iniciar les tasques programades des d'un navegador
-OrToLaunchASpecificJob=O per comprovar i iniciar una tasca específica des d’un navegador
-KeyForCronAccess=Codi de seguretat per a la URL de llançament de tasques automàtiques
+URLToLaunchCronJobs=URL per a comprovar i iniciar les tasques programades des d'un navegador
+OrToLaunchASpecificJob=O per a comprovar i iniciar una tasca específica des d’un navegador
+KeyForCronAccess=Clau de seguretat de l'URL per a iniciar les tasques programades
 FileToLaunchCronJobs=Línia d'ordres per a comprovar i iniciar les tasques cron qualificades
 CronExplainHowToRunUnix=A entorns Unix s'ha d'utilitzar la següent entrada crontab per executar la comanda cada 5 minuts
 CronExplainHowToRunWin=En l'entorn de Microsoft (tm) de Windows, podeu utilitzar les Eines de tasques programades per executar la línia de comandaments cada 5 minuts
 CronMethodDoesNotExists=La classe %s no conté cap mètode %s
 CronMethodNotAllowed=El mètode %s de la classe %s es troba a la llista negra de mètodes prohibits
-CronJobDefDesc=Els perfils de tasques programades es defineixen a la fitxa del mòdul descriptor. Quan s'activa el mòdul, es carreguen i estan disponibles per poder administrar les tasques des del menú d'eines d'administració %s.
+CronJobDefDesc=Els perfils de tasques programades es defineixen al fitxer descriptor del mòdul. Quan el mòdul està activat, es carreguen i estan disponibles perquè pugueu administrar les tasques des del menú d'eines d'administració %s.
 CronJobProfiles=Llista de perfils predefinits de tasques programades
 # Menu
 EnabledAndDisabled=Habilitat i deshabilitat
@@ -60,7 +60,7 @@ CronErrEndDateStartDt=La data de fi no pot ser anterior a la d'inici
 StatusAtInstall=Estat a la instal·lació del mòdul
 CronStatusActiveBtn=Programa-ho
 CronStatusInactiveBtn=Desactivar
-CronTaskInactive=Aquesta tasca es troba desactivada
+CronTaskInactive=Aquest treball està desactivat (no programat)
 CronId=Id
 CronClassFile=Filename with class
 CronModuleHelp=Nom del directori del mòdul de Dolibarr (també funciona amb mòduls externs). <BR> Per exemple, per cridar al mètode "fetch" de l'objecte Producte de Dolibarr /htdocs/<u>product</u>/class/product.class.php, el valor pel mòdul és <br><i>product</i>
@@ -78,11 +78,11 @@ CronType_method=Mètode per cridar una classe PHP
 CronType_command=Ordre Shell
 CronCannotLoadClass=Impossible carregar el fitxer de la classe %s (per a utilitzar la classe %s)
 CronCannotLoadObject=El "class file" %s s'ha carregat, però l'objecte %s no s'ha trobat dins d'ell
-UseMenuModuleToolsToAddCronJobs=Vés al menú "<a href="%s">Inici - Eines d'administració: treballs programats</a>" per veure i editar les tasques programades.
+UseMenuModuleToolsToAddCronJobs=Aneu al menú "<a href="%s"> Inici - Eines d'administració - Tasques programades </a>" per a veure i editar les tasques programades.
 JobDisabled=Tasca desactivada
 MakeLocalDatabaseDumpShort=Còpia de seguretat de la base de dades local
 MakeLocalDatabaseDump=Crear un bolcat de la base de dades local. Els paràmetres són: compressió ('gz' o 'bz' o 'none'), tipus de còpia de seguretat ('mysql' o 'pgsql'), 1, 'auto' o nom de fitxer per a compilar, nombre de fitxers de còpia de seguretat per conservar
-WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
+WarningCronDelayed=Atenció, a efectes de rendiment, sigui quina sigui la propera data d'execució de les tasques habilitades, és possible que les vostres tasques es retardin a un màxim de %s hores abans de ser executades.
 DATAPOLICYJob=Netejador de dades i anonimitzador
 JobXMustBeEnabled=La tasca %s s'ha d'activar
 # Cron Boxes
diff --git a/htdocs/langs/ca_ES/donations.lang b/htdocs/langs/ca_ES/donations.lang
index cd56b4d10af..5229c4a0197 100644
--- a/htdocs/langs/ca_ES/donations.lang
+++ b/htdocs/langs/ca_ES/donations.lang
@@ -4,7 +4,7 @@ Donations=Donacions
 DonationRef=Ref. donació
 Donor=Donant
 AddDonation=Crear una donació
-NewDonation=Nova donació
+NewDonation=Donació nova
 DeleteADonation=Elimina una donació
 ConfirmDeleteADonation=Vols eliminar aquesta donació?
 PublicDonation=Donació pública
@@ -32,3 +32,4 @@ DONATION_ART238=Mostrar article 238 del CGI si s'està interessat
 DONATION_ART885=Mostra l’article 885 de CGI si us preocupa
 DonationPayment=Pagament de la donació
 DonationValidated=Donació %s validada
+DonationUseThirdparties=Utilitzeu un tercer existent com a coordenades de donants
diff --git a/htdocs/langs/ca_ES/ecm.lang b/htdocs/langs/ca_ES/ecm.lang
index 4afe9c44f65..5051618f9ae 100644
--- a/htdocs/langs/ca_ES/ecm.lang
+++ b/htdocs/langs/ca_ES/ecm.lang
@@ -42,6 +42,6 @@ ExtraFieldsEcmFiles=Atributs addicionals dels fitxers ECM
 ExtraFieldsEcmDirectories=Atributs addicionals dels directoris ECM
 ECMSetup=Configuració de l'ECM
 GenerateImgWebp=Duplica totes les imatges amb una altra versió amb format .webp
-ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
+ConfirmGenerateImgWebp=Si ho confirmeu, generareu una imatge en format .webp per a totes les imatges actualment en aquesta carpeta (no s’inclouen les subcarpetes) ...
 ConfirmImgWebpCreation=Confirmeu la duplicació de totes les imatges
 SucessConvertImgWebp=Les imatges s'han duplicat correctament
diff --git a/htdocs/langs/ca_ES/errors.lang b/htdocs/langs/ca_ES/errors.lang
index 89922bbc91d..c93e096dd96 100644
--- a/htdocs/langs/ca_ES/errors.lang
+++ b/htdocs/langs/ca_ES/errors.lang
@@ -4,13 +4,14 @@
 NoErrorCommitIsDone=Sense errors, és vàlid
 # Errors
 ErrorButCommitIsDone=Errors trobats, però és vàlid malgrat tot
-ErrorBadEMail=Email %s is incorrect
-ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
-ErrorBadUrl=Url %s is incorrect
+ErrorBadEMail=El correu electrònic %s és incorrecte
+ErrorBadMXDomain=El correu electrònic %s sembla incorrecte (el domini no té cap registre MX vàlid)
+ErrorBadUrl=L'URL %s no és correcta
 ErrorBadValueForParamNotAString=Valor incorrecte del paràmetre. Acostuma a passar quan falta la traducció.
 ErrorRefAlreadyExists=La referència <b> %s </b> ja existeix.
 ErrorLoginAlreadyExists=El nom d'usuari %s ja existeix.
 ErrorGroupAlreadyExists=El grup %s ja existeix.
+ErrorEmailAlreadyExists=Email %s already exists.
 ErrorRecordNotFound=Registre no trobat
 ErrorFailToCopyFile=No s'ha pogut copiar el fitxer "<b> %s </b>" a "<b> %s </b>".
 ErrorFailToCopyDir=No s'ha pogut copiar el directori '<b> %s </b>' a '<b> %s </b>'.
@@ -46,8 +47,8 @@ ErrorWrongDate=La data no és correcta.
 ErrorFailedToWriteInDir=No es pot escriure a la carpeta %s
 ErrorFoundBadEmailInFile=S'ha trobat una sintaxi incorrecta del correu electrònic per a les línies %s al fitxer (exemple de la línia %s amb email=%s)
 ErrorUserCannotBeDelete=No es pot eliminar l'usuari. És possible que estigui relacionat amb entitats de Dolibarr.
-ErrorFieldsRequired=Some required fields have been left blank.
-ErrorSubjectIsRequired=The email subject is required
+ErrorFieldsRequired=Alguns camps obligatoris s'han deixat en blanc.
+ErrorSubjectIsRequired=L'assumpte del correu electrònic és obligatori
 ErrorFailedToCreateDir=Error en la creació d'una carpeta. Comprovi que l'usuari del servidor web té drets d'escriptura en les carpetes de documents de Dolibarr. Si el paràmetre <b>safe_mode</b> està actiu en aquest PHP, Comproveu que els fitxers php dolibarr pertanyen a l'usuari del servidor web.
 ErrorNoMailDefinedForThisUser=E-Mail no definit per a aquest usuari
 ErrorSetupOfEmailsNotComplete=La configuració dels correus electrònics no s'ha completat
@@ -117,7 +118,7 @@ ErrorCantReadFile=Error de lectura del fitxer '%s'
 ErrorCantReadDir=Error de lectura de la carpeta '%s'
 ErrorBadLoginPassword=Identificadors d'usuari o contrasenya incorrectes
 ErrorLoginDisabled=El seu compte està desactivat
-ErrorFailedToRunExternalCommand=Error d'execució de la comanda extern. Comproveu que està disponible i executable per el seu servidor PHP. Si l'PHP <b>Safe Mode </b> està activat, comproveu que la comanda es troba en una carpeta definida en el paràmetre <b>safe_mode_exec_dir</b>.
+ErrorFailedToRunExternalCommand=No s'ha pogut executar l'ordre extern. Comproveu que estigui disponible i executable pel vostre usuari del servidor PHP. Comproveu que l'ordre no estigui protegida a nivell d'intèrpret d'ordres per una capa de seguretat com apparmor.
 ErrorFailedToChangePassword=Error en la modificació de la contrasenya
 ErrorLoginDoesNotExists=El compte d'usuari de <b>%s</b> no s'ha trobat.
 ErrorLoginHasNoEmail=Aquest usuari no té e-mail. Impossible continuar.
@@ -226,7 +227,7 @@ ErrorAPageWithThisNameOrAliasAlreadyExists=La pàgina / contenidor <strong> %s <
 ErrorDuringChartLoad=S'ha produït un error en carregar el gràfic de comptes. Si pocs comptes no s'han carregat, podeu introduir-los manualment.
 ErrorBadSyntaxForParamKeyForContent=Sintaxi incorrecta per a la clau de contingut del paràmetre. Ha de tenir un valor que comenci per %s o %s
 ErrorVariableKeyForContentMustBeSet=Error, s’ha d’establir la constant amb el nom %s (amb el contingut de text a mostrar) o %s (amb una URL externa a mostrar).
-ErrorURLMustEndWith=URL %s must end %s
+ErrorURLMustEndWith=L'URL %s ha de finalitzar %s
 ErrorURLMustStartWithHttp=L'URL %s ha de començar amb http: // o https: //
 ErrorHostMustNotStartWithHttp=El nom d'amfitrió %s NO ha de començar amb http: // o https: //
 ErrorNewRefIsAlreadyUsed=Error, la referència nova ja s’està utilitzant
@@ -261,7 +262,8 @@ ErrorAParameterIsRequiredForThisOperation=Un paràmetre és obligatori per a aqu
 ErrorDateIsInFuture=Error, la data no pot ser en el futur
 ErrorAnAmountWithoutTaxIsRequired=Error, l'import és obligatori
 ErrorAPercentIsRequired=Error, empleneu el percentatge correctament
-ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
+ErrorYouMustFirstSetupYourChartOfAccount=Primer heu de configurar el vostre pla de comptes
+ErrorFailedToFindEmailTemplate=No s'ha pogut trobar la plantilla amb el nom de codi %s
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=El paràmetre PHP upload_max_filesize (%s) és superior al paràmetre PHP post_max_size (%s). No es tracta d’una configuració consistent.
@@ -294,7 +296,8 @@ WarningFailedToAddFileIntoDatabaseIndex=Advertiment: no s'ha pogut afegir l'entr
 WarningTheHiddenOptionIsOn=Advertiment, l'opció oculta <b> %s </b> està activada.
 WarningCreateSubAccounts=Atenció, no podeu crear directament un subcompte, heu de crear un tercer o un usuari i assignar-los un codi comptable per a trobar-los en aquesta llista.
 WarningAvailableOnlyForHTTPSServers=Disponible només si s'utilitza una connexió segura HTTPS.
-WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
-ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
-ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
-CheckVersionFail=Version check fail
+WarningModuleXDisabledSoYouMayMissEventHere=El mòdul %s no s'ha habilitat. Per tant, potser us perdeu molts esdeveniments aquí.
+ErrorActionCommPropertyUserowneridNotDefined=El propietari de l'usuari és obligatori
+ErrorActionCommBadType=El tipus d'esdeveniment seleccionat (identificador: %n, codi: %s) no existeix al diccionari del tipus d'esdeveniment
+CheckVersionFail=Error de comprovació de versió
+ErrorWrongFileName=El nom del fitxer no pot contenir __COSA__
diff --git a/htdocs/langs/ca_ES/eventorganization.lang b/htdocs/langs/ca_ES/eventorganization.lang
index 4f0b2546196..2a2511c5b65 100644
--- a/htdocs/langs/ca_ES/eventorganization.lang
+++ b/htdocs/langs/ca_ES/eventorganization.lang
@@ -1,4 +1,5 @@
 # Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+# Copyright (C) 2021		Dorian Vabre			<dorian.vabre@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
@@ -17,85 +18,126 @@
 # Generic
 #
 ModuleEventOrganizationName = Organització d'esdeveniments
-EventOrganizationDescription = Event Organization through Module Project
-EventOrganizationDescriptionLong= Manage Event organization for conference, attendees, speaker, and attendees, with public subcription page
+EventOrganizationDescription = Organització d’esdeveniments mitjançant Projecte de mòduls
+EventOrganizationDescriptionLong= Gestioneu l’organització d’esdeveniments per a conferències, assistents, ponents i assistents, amb una pàgina de subscripció pública
 #
 # Menu
 #
 EventOrganizationMenuLeft = Esdeveniments organitzats
-EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
+EventOrganizationConferenceOrBoothMenuLeft = Conferència o estand
 
 #
 # Admin page
 #
 EventOrganizationSetup = Configuració de l'organització d'esdeveniments
 Settings = Configuració
-EventOrganizationSetupPage = Event Organization setup page
+EventOrganizationSetupPage = Pàgina de configuració de l'organització d'esdeveniments
 EVENTORGANIZATION_TASK_LABEL = Etiqueta de tasques per a crear automàticament quan es validi el projecte
-EVENTORGANIZATION_TASK_LABELTooltip = When you validate an organized event, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conference<br>Send Call for Booth<br>Receive call for conferences<br>Receive call for Booth<br>Open subscriptions to events for attendees<br>Send remind of event to speakers<br>Send remind of event to Booth hoster<br>Send remind of event to attendees
-EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties automatically created when someone suggests a conference
+EVENTORGANIZATION_TASK_LABELTooltip = Quan es valida un esdeveniment organitzat, es poden crear automàticament algunes tasques al projecte <br> <br> Per exemple: <br> Enviar trucada per a conferències <br> Enviar trucades per a Booth <br> Rebre trucades per a conferències a034 recordatori de l'esdeveniment als altaveus <br> Enviar recordatori de l'esdeveniment a l'allotjament de l'estand <br> Enviar recordatori de l'esdeveniment als assistents
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Categoria per afegir a tercers creada automàticament quan algú suggereix una conferència
 EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Categoria per a afegir a tercers creada automàticament quan suggereixen un estand
-EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Template of email to send after receiving a suggestion of a conference.
-EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Template of email to send after receiving a suggestion of a booth.
-EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Template of email to send  after a subscription to a booth has been paid.
-EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Template of email to send after a subscription to an event has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Plantilla de correu electrònic per enviar després de rebre un suggeriment d'una conferència.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Plantilla de correu electrònic per enviar després de rebre un suggeriment d'un estand.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Plantilla de correu electrònic per enviar després de pagar una subscripció a un estand.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Plantilla de correu electrònic per enviar després de pagar una subscripció a un esdeveniment.
 EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Plantilla de correu electrònic d'acció massiva als assistents
 EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Plantilla de correu electrònic d'acció massiva als ponents
-EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Filtra la llista de selecció de tercers a la targeta / formulari de creació d'assistents amb categoria
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filtra la llista de selecció de tercers a la targeta / formulari de creació d'assistents amb el tipus de client
 
 #
 # Object
 #
-EventOrganizationConfOrBooth= Conference Or Booth
+EventOrganizationConfOrBooth= Conferència o estand
 ManageOrganizeEvent = Gestiona l'organització d'esdeveniments
-ConferenceOrBooth = Conference Or Booth
-ConferenceOrBoothTab = Conference Or Booth
-AmountOfSubscriptionPaid = Amount of subscription paid
+ConferenceOrBooth = Conferència o estand
+ConferenceOrBoothTab = Conferència o estand
+AmountOfSubscriptionPaid = Import de la subscripció pagada
 DateSubscription = Data de subscripció
-ConferenceOrBoothAttendee = Conference Or Booth Attendee
+ConferenceOrBoothAttendee = Assistent a conferències o estands
 
 #
 # Template Mail
 #
 YourOrganizationEventConfRequestWasReceived = S'ha rebut la vostra sol·licitud de conferència
-YourOrganizationEventBoothRequestWasReceived = Your request for booth was received
+YourOrganizationEventBoothRequestWasReceived = La vostra sol·licitud d’estand s’ha rebut
 EventOrganizationEmailAskConf = Sol·licitud de conferència
-EventOrganizationEmailAskBooth = Request for booth
+EventOrganizationEmailAskBooth = Sol·licitud d’estand
 EventOrganizationEmailSubsBooth = Subscripció a estand
-EventOrganizationEmailSubsEvent = Subscription for an event
-EventOrganizationMassEmailAttendees = Communication to attendees
-EventOrganizationMassEmailSpeakers = Communication to speakers
+EventOrganizationEmailSubsEvent = Subscripció a un esdeveniment
+EventOrganizationMassEmailAttendees = Comunicació als assistents
+EventOrganizationMassEmailSpeakers = Comunicació als altaveus
 
 #
 # Event
 #
-AllowUnknownPeopleSuggestConf=Allow unknown people to suggest conferences
-AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest conferences
-AllowUnknownPeopleSuggestBooth=Allow unknown people to suggest booth
-AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to suggest booth
+AllowUnknownPeopleSuggestConf=Permetre que persones desconegudes suggereixin conferències
+AllowUnknownPeopleSuggestConfHelp=Permetre que persones desconegudes suggereixin conferències
+AllowUnknownPeopleSuggestBooth=Permetre que persones desconegudes suggereixin estand
+AllowUnknownPeopleSuggestBoothHelp=Permetre que persones desconegudes suggereixin estand
 PriceOfRegistration=Preu de la inscripció
 PriceOfRegistrationHelp=Preu de la inscripció
-PriceOfBooth=Subscription price to stand a booth
-PriceOfBoothHelp=Subscription price to stand a booth
-EventOrganizationICSLink=Link ICS for events
+PriceOfBooth=Preu de la subscripció per a estand
+PriceOfBoothHelp=Preu de la subscripció per a estand
+EventOrganizationICSLink=Enllaç ICS per a esdeveniments
 ConferenceOrBoothInformation=Informació sobre conferències o estands
 Attendees = Assistents
-EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+DownloadICSLink = Download ICS link
+EVENTORGANIZATION_SECUREKEY = Clau segura de l'enllaç de registre públic a una conferència
+SERVICE_BOOTH_LOCATION = Servei que s'utilitza per a la fila de factures sobre una ubicació de l'estand
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Servei que s'utilitza per a la fila de factures sobre una subscripció d'assistent a una conferència
 #
 # Status
 #
 EvntOrgDraft = Esborrany
 EvntOrgSuggested = Suggerit
 EvntOrgConfirmed = Confirmat
-EvntOrgNotQualified = Not Qualified
+EvntOrgNotQualified = No qualificat
 EvntOrgDone = Realitzades
-EvntOrgCancelled = Cancelled
+EvntOrgCancelled = Cancel·lat
 #
 # Public page
 #
-PublicAttendeeSubscriptionPage = Public link of registration to a conference
-MissingOrBadSecureKey = The security key is invalid or missing
-EvntOrgWelcomeMessage = Aquest formulari us permet registrar-vos com a nou participant a la conferència
-EvntOrgStartDuration = This conference starts on
-EvntOrgEndDuration =  and ends on
+SuggestForm = Suggestion page
+RegisterPage = Pàgina per a conferències o estand
+EvntOrgRegistrationHelpMessage = Here, you can vote for an event, or suggest a new conference or booth for the project
+EvntOrgRegistrationConfHelpMessage = Here, you can suggest a new conference for the project
+EvntOrgRegistrationBoothHelpMessage = Here, you can suggest a new booth for the project
+ListOfSuggestedConferences = List of suggested conferences
+ListOfSuggestedBooths = List of suggested booths
+SuggestConference = Suggereixi una conferència nova
+SuggestBooth = Suggereixi un estand
+ViewAndVote = Consulteu i voteu els esdeveniments suggerits
+PublicAttendeeSubscriptionPage = Enllaç públic de registre a una conferència
+MissingOrBadSecureKey = Falta la clau de seguretat o no és vàlida
+EvntOrgWelcomeMessage = Aquest formulari us permet registrar-vos com a nou participant a la conferència: '%s'
+EvntOrgDuration = Aquesta conferència comença el dia %s i finalitza el dia %s.
+ConferenceAttendeeFee = Tarifa de l'assistent a la conferència per a l'esdeveniment: "%s" que passa de %s a %s.
+BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
+EventType = Tipus d'esdeveniment
+
+#
+# Vote page
+#
+EvntOrgRegistrationWelcomeMessage = Benvingut a la pàgina de suggeriments de conferències o estands.
+EvntOrgRegistrationConfWelcomeMessage = Welcome on the conference suggestion page.
+EvntOrgRegistrationBoothWelcomeMessage = Welcome on the booth suggestion page.
+EvntOrgVoteHelpMessage = Here, you can view and vote for the suggested events for the project
+VoteOk = Your vote has been accepted.
+AlreadyVoted = You have already voted for this event.
+VoteError = An error has occurred during the vote, please try again.
+
+#
+# SubscriptionOk page
+#
+SubscriptionOk = La vostra subscripció a aquesta conferència s'ha validat
+#
+# Subscription validation mail
+#
+ConfAttendeeSubscriptionConfirmation = Confirmació de la subscripció a una conferència
+#
+# Payment page
+#
+Attendee = Attendee
+PaymentConferenceAttendee = Conference attendee payment
+PaymentBoothLocation = Booth location payment
diff --git a/htdocs/langs/ca_ES/holiday.lang b/htdocs/langs/ca_ES/holiday.lang
index de0b9e084a8..f93986fe6ef 100644
--- a/htdocs/langs/ca_ES/holiday.lang
+++ b/htdocs/langs/ca_ES/holiday.lang
@@ -40,7 +40,7 @@ TypeOfLeaveId=Tipus d'identificador de baixa
 TypeOfLeaveCode=Tipus de codi de baixa
 TypeOfLeaveLabel=Tipus d'etiqueta de baixa
 NbUseDaysCP=Nombre de dies de permís utilitzats
-NbUseDaysCPHelp=The calculation takes into account the non-working days and the holidays defined in the dictionary.
+NbUseDaysCPHelp=El càlcul té en compte els dies inhàbils i les vacances definides al diccionari.
 NbUseDaysCPShort=Dies de permís
 NbUseDaysCPShortInMonth=Dies de permís al mes
 DayIsANonWorkingDay=%s és un dia no laborable
@@ -105,7 +105,7 @@ LEAVE_OTHER=Altres sortides
 LEAVE_PAID_FR=Vacances pagades
 ## Configuration du Module ##
 LastUpdateCP=Última actualització automàtica de l'assignació de dies de permís
-MonthOfLastMonthlyUpdate=Month of last automatic update of leave allocation
+MonthOfLastMonthlyUpdate=Mes de l'última actualització automàtica de l'assignació de permisos
 UpdateConfCPOK=Actualització efectuada correctament.
 Module27130Name= Gestió de dies lliures
 Module27130Desc= Gestió de dies lliures
diff --git a/htdocs/langs/ca_ES/hrm.lang b/htdocs/langs/ca_ES/hrm.lang
index cc584a4d291..baedb7e141b 100644
--- a/htdocs/langs/ca_ES/hrm.lang
+++ b/htdocs/langs/ca_ES/hrm.lang
@@ -9,7 +9,7 @@ ConfirmDeleteEstablishment=Vols eliminar aquest establiment?
 OpenEtablishment=Obre l'establiment
 CloseEtablishment=Tanca l'establiment
 # Dictionary
-DictionaryPublicHolidays=HRM - Festius
+DictionaryPublicHolidays=Permís - Dies festius
 DictionaryDepartment=HRM - Llistat de departament
 DictionaryFunction=HRM: llocs de treball
 # Module
diff --git a/htdocs/langs/ca_ES/knowledgemanagement.lang b/htdocs/langs/ca_ES/knowledgemanagement.lang
index 29e628befcc..2cc3f34e892 100644
--- a/htdocs/langs/ca_ES/knowledgemanagement.lang
+++ b/htdocs/langs/ca_ES/knowledgemanagement.lang
@@ -18,38 +18,38 @@
 #
 
 # Module label 'ModuleKnowledgeManagementName'
-ModuleKnowledgeManagementName = Knowledge Management System
+ModuleKnowledgeManagementName = Sistema de gestió del coneixement
 # Module description 'ModuleKnowledgeManagementDesc'
-ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+ModuleKnowledgeManagementDesc=Gestioneu una base de Gestió del Coneixement (KM) o Help-Desk
 
 #
 # Admin page
 #
-KnowledgeManagementSetup = Knowledge Management System setup
+KnowledgeManagementSetup = Configuració del sistema de gestió del coneixement
 Settings = Configuració
-KnowledgeManagementSetupPage = Knowledge Management System setup page
+KnowledgeManagementSetupPage = Pàgina de configuració del sistema de gestió del coneixement
 
 
 #
 # About page
 #
 About = Quant a
-KnowledgeManagementAbout = About Knowledge Management
-KnowledgeManagementAboutPage = Knowledge Management about page
+KnowledgeManagementAbout = Sobre la gestió del coneixement
+KnowledgeManagementAboutPage = Gestió del coneixement sobre la pàgina
 
 #
 # Sample page
 #
-KnowledgeManagementArea = Knowledge Management
+KnowledgeManagementArea = Gestió del coneixement
 
 
 #
 # Menu
 #
-MenuKnowledgeRecord = Knowledge base
-ListOfArticles = List of articles
-NewKnowledgeRecord = New article
-ValidateReply = Validate solution
+MenuKnowledgeRecord = Base de coneixements
+ListKnowledgeRecord = List of articles
+NewKnowledgeRecord = Nou article
+ValidateReply = Validar la solució
 KnowledgeRecords = Articles
 KnowledgeRecord = Article
-KnowledgeRecordExtraFields = Extrafields for Article
+KnowledgeRecordExtraFields = Camps extra per a l'article
diff --git a/htdocs/langs/ca_ES/languages.lang b/htdocs/langs/ca_ES/languages.lang
index 9d2b881f655..0c33e6cf384 100644
--- a/htdocs/langs/ca_ES/languages.lang
+++ b/htdocs/langs/ca_ES/languages.lang
@@ -3,6 +3,7 @@ Language_am_ET=Etíop
 Language_ar_AR=Àrab
 Language_ar_EG=Àrab (Egipte)
 Language_ar_SA=Àrab
+Language_ar_TN=Arabic (Tunisia)
 Language_az_AZ=Azerbaidjan
 Language_bn_BD=Bengalí
 Language_bn_IN=Bengalí (Índia)
@@ -84,6 +85,7 @@ Language_nl_NL=Holandès
 Language_pl_PL=Polonès
 Language_pt_BR=Portuguès (Brasil)
 Language_pt_PT=Portuguès
+Language_ro_MD=Romanian (Moldavia)
 Language_ro_RO=Romanès
 Language_ru_RU=Rus
 Language_ru_UA=Rus (Ucraïna)
diff --git a/htdocs/langs/ca_ES/mails.lang b/htdocs/langs/ca_ES/mails.lang
index 20115c14e6b..74ec3988880 100644
--- a/htdocs/langs/ca_ES/mails.lang
+++ b/htdocs/langs/ca_ES/mails.lang
@@ -15,7 +15,7 @@ MailToUsers=A l'usuari(s)
 MailCC=Còpia a
 MailToCCUsers=Còpia l'usuari(s)
 MailCCC=Còpia oculta a
-MailTopic=Email subject
+MailTopic=Assumpte del correu electrònic
 MailText=Missatge
 MailFile=Fitxers adjunts
 MailMessage=Text utilitzat en el cos del missatge
@@ -131,8 +131,8 @@ NoNotificationsWillBeSent=No hi ha previstes notificacions automàtiques per cor
 ANotificationsWillBeSent=S'enviarà 1 notificació automàtica per correu electrònic
 SomeNotificationsWillBeSent=S'enviaran %s notificacions automàtiques per correu electrònic
 AddNewNotification=Subscriviu-vos a una nova notificació automàtica per correu electrònic (destinatari/esdeveniment)
-ListOfActiveNotifications=List of all active subscriptions (targets/events) for automatic email notification
-ListOfNotificationsDone=List of all automatic email notifications sent
+ListOfActiveNotifications=Llista de totes les subscripcions actives (objectius / esdeveniments) per a notificacions automàtiques per correu electrònic
+ListOfNotificationsDone=Llista de totes les notificacions automàtiques enviades per correu electrònic
 MailSendSetupIs=La configuració de l'enviament de correu electrònic s'ha configurat a '%s'. Aquest mode no es pot utilitzar per a enviar correus electrònics massius.
 MailSendSetupIs2=Primer heu d’anar, amb un compte d’administrador, al menú %sInici - Configuració - Correus electrònics%s per a canviar el paràmetre <strong>'%s'</strong> per a utilitzar el mode '%s'. Amb aquest mode, podeu introduir la configuració del servidor SMTP proporcionat pel vostre proveïdor de serveis d'Internet i utilitzar la funció de correu electrònic massiu.
 MailSendSetupIs3=Si teniu cap pregunta sobre com configurar el servidor SMTP, podeu demanar-li a %s.
diff --git a/htdocs/langs/ca_ES/main.lang b/htdocs/langs/ca_ES/main.lang
index 8287e64d69d..642168d2711 100644
--- a/htdocs/langs/ca_ES/main.lang
+++ b/htdocs/langs/ca_ES/main.lang
@@ -180,7 +180,7 @@ SaveAndNew=Desa i nou
 TestConnection=Provar la connexió
 ToClone=Clona
 ConfirmCloneAsk=Esteu segur que voleu clonar l'objecte <b> %s </b>?
-ConfirmClone=Choose the data you want to clone:
+ConfirmClone=Trieu les dades que vulgueu clonar:
 NoCloneOptionsSpecified=No s'ha definit cap dada per a clonar.
 Of=de
 Go=Anar
@@ -246,7 +246,7 @@ DefaultModel=Plantilla del document per defecte
 Action=Acció
 About=Quant a
 Number=Número
-NumberByMonth=Total reports by month
+NumberByMonth=Total d'informes per mes
 AmountByMonth=Import per mes
 Numero=Número
 Limit=Límit
@@ -278,7 +278,7 @@ DateModificationShort=Data modif.
 IPModification=IP de modificació
 DateLastModification=Data de l'última modificació
 DateValidation=Data validació
-DateSigning=Signing date
+DateSigning=Data de signatura
 DateClosing=Data tancament
 DateDue=Data venciment
 DateValue=Data valor
@@ -341,7 +341,7 @@ KiloBytes=Kilobytes
 MegaBytes=Megabytes
 GigaBytes=Gigabytes
 TeraBytes=Terabytes
-UserAuthor=Ceated by
+UserAuthor=Enganyat per
 UserModif=Actualitzat per
 b=b.
 Kb=Kb
@@ -362,7 +362,7 @@ UnitPriceHTCurrency=Preu unitari (exclòs) (moneda)
 UnitPriceTTC=Preu unitari total
 PriceU=P.U.
 PriceUHT=P.U.
-PriceUHTCurrency=U.P (net) (currency)
+PriceUHTCurrency=U.P (net) (moneda)
 PriceUTTC=Preu unitari (IVA inclòs)
 Amount=Import
 AmountInvoice=Import factura
@@ -430,6 +430,7 @@ LT1IN=RE
 LT2IN=IRPF
 LT1GC=Cèntims addicionals
 VATRate=Taxa IVA
+RateOfTaxN=Tipus d’impost %s
 VATCode=Codi de la taxa impositiva
 VATNPR=Taxa impositiva NPR
 DefaultTaxRate=Tipus impositiu per defecte
@@ -729,6 +730,7 @@ MenuMembers=Socis
 MenuAgendaGoogle=Agenda Google
 MenuTaxesAndSpecialExpenses=Impostos | Despeses especials
 ThisLimitIsDefinedInSetup=Límit Dolibarr (Menú inici-configuració-seguretat): %s Kb, límit PHP: %s Kb
+ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
 NoFileFound=No s'ha penjat cap document
 CurrentUserLanguage=Idioma actual
 CurrentTheme=Tema actual
@@ -845,7 +847,7 @@ XMoreLines=%s línia(es)  oculta(es)
 ShowMoreLines=Mostra més/menys línies
 PublicUrl=URL pública
 AddBox=Afegir quadre
-SelectElementAndClick=Select an element and click on %s
+SelectElementAndClick=Seleccioneu un element i feu clic a %s
 PrintFile=%s arxius a imprimir
 ShowTransaction=Mostra la transacció en el compte bancari
 ShowIntervention=Mostrar intervenció
@@ -856,8 +858,8 @@ Denied=Denegat
 ListOf=Llista de %s
 ListOfTemplates=Llistat de plantilles
 Gender=Sexe
-Genderman=Male
-Genderwoman=Female
+Genderman=Home
+Genderwoman=Dona
 Genderother=Altres
 ViewList=Vista llistat
 ViewGantt=Vista Gantt
@@ -1063,7 +1065,7 @@ YouAreCurrentlyInSandboxMode=Actualment esteu en el mode %s "sandbox"
 Inventory=Inventari
 AnalyticCode=Codi analític
 TMenuMRP=MRP
-ShowCompanyInfos=Show company infos
+ShowCompanyInfos=Mostra informació de la companyia
 ShowMoreInfos=Mostra més informació
 NoFilesUploadedYet=Carregueu primer un document
 SeePrivateNote=Veure nota privada
@@ -1072,6 +1074,7 @@ ValidFrom=Vàlid des de
 ValidUntil=Vàlid fins
 NoRecordedUsers=No hi ha usuaris
 ToClose=Per tancar
+ToRefuse=Refusar
 ToProcess=A processar
 ToApprove=Per a aprovar
 GlobalOpenedElemView=Vista global
@@ -1126,9 +1129,11 @@ UpdateForAllLines=Actualització per a totes les línies
 OnHold=Fora de servei
 Civility=Civilitat
 AffectTag=Afecta l'etiqueta
+CreateExternalUser=Crea un usuari extern
 ConfirmAffectTag=Afecta l'etiqueta massivament
 ConfirmAffectTagQuestion=Esteu segur que voleu afectar les etiquetes als registres seleccionats %s?
 CategTypeNotFound=No s'ha trobat cap tipus d'etiqueta per al tipus de registres
 CopiedToClipboard=Copiat al porta-retalls
-InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
-ConfirmCancel=Are you sure you want to cancel
+InformationOnLinkToContract=Aquest import només és el total de totes les línies del contracte. No es té en compte cap noció de temps.
+ConfirmCancel=Esteu segur que voleu cancel·lar-la?
+EmailMsgID=Email MsgID
diff --git a/htdocs/langs/ca_ES/margins.lang b/htdocs/langs/ca_ES/margins.lang
index cbf1a27be62..1393b03e349 100644
--- a/htdocs/langs/ca_ES/margins.lang
+++ b/htdocs/langs/ca_ES/margins.lang
@@ -22,7 +22,7 @@ ProductService=Producte o servei
 AllProducts=Tots els productes i serveis
 ChooseProduct/Service=Tria el producte o servei
 ForceBuyingPriceIfNull=Forçar preu de cost/compra al preu de venda si no s'ha definit
-ForceBuyingPriceIfNullDetails=If buying/cost price not provided when we add a new line, and this option is "ON", the margin will be 0 on the new line (buying/cost price = selling price). If this option is "OFF" (recommended), margin will be equal to the value suggested by default (and may be 100% if no default value can be found).
+ForceBuyingPriceIfNullDetails=Si no es proporciona el preu de compra / cost quan afegim una nova línia i aquesta opció està "ACTIVADA", el marge serà 0 a la nova línia (preu de compra / cost = preu de venda). Si aquesta opció està "DESACTIVADA" (recomanat), el marge serà igual al valor suggerit per defecte (i pot ser del 100% si no es pot trobar cap valor per defecte).
 MARGIN_METHODE_FOR_DISCOUNT=Mètode de gestió de descomptes globals
 UseDiscountAsProduct=Com un producte
 UseDiscountAsService=Com un servei
diff --git a/htdocs/langs/ca_ES/members.lang b/htdocs/langs/ca_ES/members.lang
index 9dc9b995352..35c58e9f008 100644
--- a/htdocs/langs/ca_ES/members.lang
+++ b/htdocs/langs/ca_ES/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Un altre soci (nom: <b>%s</b>, nom d'
 ErrorUserPermissionAllowsToLinksToItselfOnly=Per motius de seguretat, se us ha de concedir permisos per a editar tots els usuaris per a poder enllaçar un soci a un usuari que no és vostre.
 SetLinkToUser=Vincular a un usuari Dolibarr
 SetLinkToThirdParty=Vincular a un tercer Dolibarr
-MembersCards=Business cards for members
+MembersCards=Targetes de visita per a socis
 MembersList=Llistat de socis
 MembersListToValid=Llistat de socis esborrany (per a validar)
 MembersListValid=Llistat de socis validats
@@ -32,7 +32,7 @@ MembersWithSubscriptionToReceive=Socis amb afiliació per rebre
 MembersWithSubscriptionToReceiveShort=Subscripcions per rebre
 DateSubscription=Data afiliació
 DateEndSubscription=Data final d'afiliació
-EndSubscription=Subscription Ends
+EndSubscription=La subscripció finalitza
 SubscriptionId=ID d'afiliació
 WithoutSubscription=Sense afiliació
 MemberId=ID de soci
@@ -84,9 +84,9 @@ SubscriptionRequired=Subjecte a cotització
 DeleteType=Elimina
 VoteAllowed=Vot autoritzat
 Physical=Individual
-Moral=Corporation
-MorAndPhy=Corporation and Individual
-Reenable=Re-Enable
+Moral=Corporació
+MorAndPhy=Corporació i Particular
+Reenable=Torneu a activar-lo
 ExcludeMember=Exclou un soci
 ConfirmExcludeMember=Esteu segur que voleu excloure aquest soci?
 ResiliateMember=Dona de baixa un soci
@@ -144,7 +144,7 @@ DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Plantilla de correu electrònic qu
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Plantilla de correu electrònic que s'utilitzarà per a enviar un correu electrònic a un soci sobre la nova gravació de la subscripció
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Plantilla de correu electrònic que cal utilitzar per a enviar un recordatori de correu electrònic quan la subscripció estigui a punt de caducar
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Plantilla de correu electrònic que s'utilitzarà per a enviar un correu electrònic a un soci en la seva cancel·lació
-DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Plantilla de correu electrònic que s'utilitzarà per enviar un correu electrònic a un membre en cas d'exclusió de membre
 DescADHERENT_MAIL_FROM=Correu electrònic del remitent per a correus electrònics automàtics
 DescADHERENT_ETIQUETTE_TYPE=Format pàgines etiquetes
 DescADHERENT_ETIQUETTE_TEXT=Text a imprimir a la direcció de les etiquetes de soci
@@ -175,26 +175,26 @@ MembersStatisticsByCountries=Estadístiques de socis per país
 MembersStatisticsByState=Estadístiques de socis per província
 MembersStatisticsByTown=Estadístiques de socis per població
 MembersStatisticsByRegion=Estadístiques de socis per regió
-NbOfMembers=Total number of members
-NbOfActiveMembers=Total number of current active members
+NbOfMembers=Nombre total de membres
+NbOfActiveMembers=Nombre total de membres actius actuals
 NoValidatedMemberYet=No s'ha trobat cap soci validat
-MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
-MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
-MembersByTownDesc=This screen show you statistics of members by town.
-MembersByNature=This screen show you statistics of members by nature.
-MembersByRegion=This screen show you statistics of members by region.
+MembersByCountryDesc=Aquesta pantalla mostra les estadístiques dels membres per països. Els gràfics i els gràfics depenen de la disponibilitat del servei de gràfics en línia de Google, així com de la disponibilitat d’una connexió a Internet que funcioni.
+MembersByStateDesc=Aquesta pantalla us mostra les estadístiques dels membres per estat / províncies / cantó.
+MembersByTownDesc=Aquesta pantalla us mostra les estadístiques dels membres per ciutat.
+MembersByNature=Aquesta pantalla us mostra estadístiques dels membres per naturalesa.
+MembersByRegion=Aquesta pantalla us mostra les estadístiques dels membres per regió.
 MembersStatisticsDesc=Tria les estadístiques que vols consultar...
 MenuMembersStats=Estadístiques
-LastMemberDate=Latest membership date
+LastMemberDate=Darrera data de subscripció
 LatestSubscriptionDate=Data de l'última afiliació
-MemberNature=Nature of the member
-MembersNature=Nature of the members
-Public=Information is public
+MemberNature=Naturalesa del membre
+MembersNature=Naturalesa dels membres
+Public=La informació és pública
 NewMemberbyWeb=S'ha afegit un soci nou. Esperant l'aprovació
 NewMemberForm=Formulari de soci nou
-SubscriptionsStatistics=Subscriptions statistics
+SubscriptionsStatistics=Estadístiques de subscripcions
 NbOfSubscriptions=Nombre d'afiliacions
-AmountOfSubscriptions=Amount collected from subscriptions
+AmountOfSubscriptions=Import recollit de les subscripcions
 TurnoverOrBudget=Volum de vendes (empresa) o Pressupost (associació o col.lectiu)
 DefaultAmount=Import per defecte cotització
 CanEditAmount=El visitant pot triar/modificar l'import de la seva cotització
@@ -213,3 +213,5 @@ SendReminderForExpiredSubscription=Envia un recordatori per correu electrònic a
 MembershipPaid=Membres pagats pel període actual (fins a %s)
 YouMayFindYourInvoiceInThisEmail=Podeu trobar la factura adjunta a aquest correu electrònic
 XMembersClosed=%s soci(s) tancat(s)
+XExternalUserCreated=%s creats (s) usuaris externs
+ForceMemberNature=Naturalesa del membre de la força (individual o corporació)
diff --git a/htdocs/langs/ca_ES/modulebuilder.lang b/htdocs/langs/ca_ES/modulebuilder.lang
index 4845f988a0e..c66ff74c52a 100644
--- a/htdocs/langs/ca_ES/modulebuilder.lang
+++ b/htdocs/langs/ca_ES/modulebuilder.lang
@@ -85,7 +85,7 @@ ListOfPermissionsDefined=Llista de permisos definits
 SeeExamples=Mira exemples aquí
 EnabledDesc=Condició per a tenir aquest camp actiu (Exemples: 1 ó $conf->global->MYMODULE_MYOPTION)
 VisibleDesc=És visible el camp ? (Exemples: 0=Mai visible, 1=Visible als llistats i als formularis crear/modificar/veure, 2=Visible només als llistats, 3=Visible només als formularis crear/modificar/veure (no als llistats), 4=Visible als llistats i només als formularis modificar/veure (no al de crear), 5=Visible als llistats i només al formulari de veure (però no als formularis de crear i modificar).<br><br>Utilitzant un valor negatiu implicarà que el camp no es mostrarà per defecte als llistats però podrà ser escollit per veure's).<br><br>pot ser una expressió, per exemple:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br><br><strong>For document :</strong><br>0 = not displayed <br>1 = display<br>2 = display only if not empty<br><br><strong>For document lines :</strong><br>0 = not displayed <br>1 = displayed in a column<br>3 = display in line description column after the description<br>4 = display in description column after the description only if not empty
+DisplayOnPdfDesc=Mostra aquest camp en documents PDF compatibles, podeu gestionar la posició amb el camp "Posició". <br> Actualment, els models PDF compatibles coneguts són: eratostene (comanda), espadon (enviament), esponja (factures), cian (propal / pressupost), cornas (comanda del proveïdor) <br> <br> <strong> = display <br> 2 = només si no està buit <br> <br> <strong> Per a les línies de documents: </strong> <br> 0 = no es veuen les <br> 1 = mostren en una columna <br> = 3 = display a la columna de descripció de línia després de la descripció <br> 4 = display a la columna de descripció després de la descripció només si no està buida
 DisplayOnPdf=Visualització en PDF
 IsAMeasureDesc=Es pot acumular el valor del camp per a obtenir un total a la llista? (Exemples: 1 o 0)
 SearchAllDesc=El camp utilitzat per realitzar una cerca des de l'eina de cerca ràpida? (Exemples: 1 o 0)
@@ -143,3 +143,4 @@ AsciiToHtmlConverter=Convertidor Ascii a HTML
 AsciiToPdfConverter=Convertidor Ascii a PDF
 TableNotEmptyDropCanceled=La taula no està buida. S'ha cancel·lat l'eliminació.
 ModuleBuilderNotAllowed=El creador de mòduls està disponible però no permès al vostre usuari.
+ImportExportProfiles=Importar i exportar perfils
diff --git a/htdocs/langs/ca_ES/mrp.lang b/htdocs/langs/ca_ES/mrp.lang
index fe06e690cd0..01addb034e3 100644
--- a/htdocs/langs/ca_ES/mrp.lang
+++ b/htdocs/langs/ca_ES/mrp.lang
@@ -8,12 +8,12 @@ MenuBOM=Llistes de material
 LatestBOMModified=Últimes %s llistes de materials modificades
 LatestMOModified=Últimes %s Ordres de Fabricació modificades
 Bom=Llista de materials
-BillOfMaterials=Llista de material
+BillOfMaterials=Llista de materials
 BOMsSetup=Configuració del mòdul BOM
 ListOfBOMs=Llista de factures de material - BOM
 ListOfManufacturingOrders=Llista d'ordres de fabricació
-NewBOM=Llista nova de material
-ProductBOMHelp=Producte a crear amb aquest BOM. <br> Nota: els productes amb la propietat &quot;Natura del producte&quot; = &quot;Matèria primera&quot; no són visibles a aquesta llista.
+NewBOM=Llista nova de materials
+ProductBOMHelp=Producte per crear (o desmuntar) amb aquesta llista de material. <br> Nota: Els productes amb la propietat 'Nature of product' = 'Matèria primera' no són visibles en aquesta llista.
 BOMsNumberingModules=Plantilles de numeració BOM
 BOMsModelModule=Plantilles de document BOM
 MOsNumberingModules=Models de numeració OF
@@ -22,7 +22,7 @@ FreeLegalTextOnBOMs=Text lliure sobre el document de BOM
 WatermarkOnDraftBOMs=Marca d'aigua en els esborranys BOM
 FreeLegalTextOnMOs=Text lliure en el document OF
 WatermarkOnDraftMOs=Marca d'aigua en el document OF
-ConfirmCloneBillOfMaterials=Esteu segur que voleu clonar la factura del material %s?
+ConfirmCloneBillOfMaterials=Esteu segur que voleu clonar la llista de materials %s?
 ConfirmCloneMo=Esteu segur que voleu clonar la Ordre de Fabricació %s?
 ManufacturingEfficiency=Eficiència en la fabricació
 ConsumptionEfficiency=Eficiència del consum
@@ -30,8 +30,8 @@ ValueOfMeansLoss=El valor de 0,95 significa una mitjana de 5%% de pèrdues duran
 ValueOfMeansLossForProductProduced=Un valor de 0,95 significa una mitjana de 5%% de pèrdues de producte produït
 DeleteBillOfMaterials=Suprimeix la llista de materials
 DeleteMo=Eliminar Ordre de Fabricació
-ConfirmDeleteBillOfMaterials=Estàs segur que vols suprimir aquesta llista de material?
-ConfirmDeleteMo=Esteu segur que voleu suprimir aquesta factura de material?
+ConfirmDeleteBillOfMaterials=Esteu segur que voleu suprimir aquesta llista de materials?
+ConfirmDeleteMo=Esteu segur que voleu suprimir aquesta llista de materials?
 MenuMRP=Ordres de fabricació
 NewMO=Ordre de fabricació nova
 QtyToProduce=Quantitat a produir
@@ -39,10 +39,10 @@ DateStartPlannedMo=Data d’inici prevista
 DateEndPlannedMo=Data prevista de finalització
 KeepEmptyForAsap=Buit significa "Tan aviat com sigui possible"
 EstimatedDuration=Durada estimada
-EstimatedDurationDesc=Durada estimada per fabricar aquest producte mitjançant aquesta llista de material
-ConfirmValidateBom=Segur que voleu validar la llista de material amb la referència <strong>%s</strong> (podreu utilitzar-lo per crear noves Ordres de Fabricació)
-ConfirmCloseBom=Esteu segur que voleu cancel·lar aquesta llista de materials (ja no la podreu utilitzar per crear noves Ordres de Fabricació)?
-ConfirmReopenBom=Segur que voleu tornar a obrir aquesta llista de material (podreu utilitzar-lo per crear noves Ordres de Fabricació)
+EstimatedDurationDesc=Durada estimada per fabricar (o desmuntar) aquest producte mitjançant aquesta llista de material
+ConfirmValidateBom=Esteu segur que voleu validar la llista de materials amb la referència <strong> %s </strong> (podreu utilitzar-la per a crear noves Ordres de fabricació)
+ConfirmCloseBom=Esteu segur que voleu cancel·lar aquesta llista de materials (ja no la podreu utilitzar per a crear noves Ordres de Fabricació)?
+ConfirmReopenBom=Esteu segur que voleu tornar a obrir aquesta llista de materials (podreu utilitzar-la per a crear Ordres de fabricació noves)?
 StatusMOProduced=Produït
 QtyFrozen=Qtat. congelada
 QuantityFrozen=Quantitat congelada
@@ -63,13 +63,14 @@ ConsumeAndProduceAll=Consumir i produir tot
 Manufactured=Fabricat
 TheProductXIsAlreadyTheProductToProduce=El producte a afegir ja és el producte a produir.
 ForAQuantityOf=Per a produir una quantitat de %s
+ForAQuantityToConsumeOf=Per desmuntar una quantitat de %s
 ConfirmValidateMo=Voleu validar aquesta Ordre de Fabricació?
 ConfirmProductionDesc=Fent clic a '%s' validareu el consum i/o la producció per a les quantitats establertes. També s’actualitzarà l'estoc i es registrarà els moviments d'estoc.
 ProductionForRef=Producció de %s
 AutoCloseMO=Tancar automàticament l’Ordre de Fabricació si s’arriba a les quantitats establertes a consumir i produir
 NoStockChangeOnServices=Sense canvi d’estoc en serveis
 ProductQtyToConsumeByMO=Quantitat de producte que encara es pot consumir amb OP obertes
-ProductQtyToProduceByMO=Quantitat de producte que encara es pot produir mitjançant OP obertes
+ProductQtyToProduceByMO=Quantitat de producte encara per produir per MO obert
 AddNewConsumeLines=Afegiu una nova línia per a consumir
 ProductsToConsume=Productes a consumir
 ProductsToProduce=Productes a produir
@@ -81,24 +82,22 @@ ErrorAVirtualProductCantBeUsedIntoABomOrMo=Un kit no es pot utilitzar en una lli
 Workstation=Estació de treball
 Workstations=Estacions de treball
 WorkstationsDescription=Gestió d’estacions de treball
-WorkstationSetup = Workstations setup
-WorkstationSetupPage = Workstations setup page
-WorkstationAbout = About Workstation
-WorkstationAboutPage = Workstations about page
+WorkstationSetup = Configuració d’estacions de treball
+WorkstationSetupPage = Pàgina de configuració de les estacions de treball
 WorkstationList=Llista d’estacions de treball
 WorkstationCreate=Afegeix una nova estació de treball
 ConfirmEnableWorkstation=Esteu segur que voleu habilitar l'estació de treball <b> %s </b>?
 EnableAWorkstation=Activa una estació de treball
 ConfirmDisableWorkstation=Esteu segur que voleu desactivar l'estació de treball <b> %s </b>?
 DisableAWorkstation=Desactiva una estació de treball
-DeleteWorkstation=Supprimer
-NbOperatorsRequired=Number of operators required
-THMOperatorEstimated=Estimated operator THM
-THMMachineEstimated=Estimated machine THM
+DeleteWorkstation=Elimina
+NbOperatorsRequired=Nombre d'operadors necessaris
+THMOperatorEstimated=Operador estimat THM
+THMMachineEstimated=Màquina THM estimada
 WorkstationType=Tipus d'estació de treball
 Human=Humà
 Machine=Màquina
 HumanMachine=Humà / Màquina
-WorkstationArea=Workstation area
+WorkstationArea=Zona d’estació de treball
 Machines=Màquines
-THMEstimatedHelp=This rate makes it possible to define a forecast cost of the item
+THMEstimatedHelp=Aquesta taxa permet definir un cost previst de l'article
diff --git a/htdocs/langs/ca_ES/orders.lang b/htdocs/langs/ca_ES/orders.lang
index 0a94644b72e..d886cf3b54e 100644
--- a/htdocs/langs/ca_ES/orders.lang
+++ b/htdocs/langs/ca_ES/orders.lang
@@ -11,13 +11,14 @@ OrderDate=Data comanda
 OrderDateShort=Data comanda
 OrderToProcess=Comanda a processar
 NewOrder=Comanda nova
+NewSupplierOrderShort=Comanda nova
 NewOrderSupplier=Comanda de compra nova
 ToOrder=Realitzar comanda
 MakeOrder=Realitzar comanda
 SupplierOrder=Comanda de compra
 SuppliersOrders=Comandes de compra
-SaleOrderLines=Sale order lines
-PurchaseOrderLines=Puchase order lines
+SaleOrderLines=Línies de comandes de venda
+PurchaseOrderLines=Línies de comandes compra
 SuppliersOrdersRunning=Comandes de compra actuals
 CustomerOrder=Comanda de vendes
 CustomersOrders=Comanda de vendes
@@ -73,6 +74,7 @@ DeleteOrder=Elimina la comanda
 CancelOrder=Anul·lar la comanda
 OrderReopened= Comanda %s reoberta
 AddOrder=Crear comanda
+AddSupplierOrderShort=Crear comanda
 AddPurchaseOrder=Crea una comanda de compra
 AddToDraftOrders=Afegir a comanda esborrany
 ShowOrder=Mostrar comanda
diff --git a/htdocs/langs/ca_ES/other.lang b/htdocs/langs/ca_ES/other.lang
index 19c6ee764e8..5d71c2826ba 100644
--- a/htdocs/langs/ca_ES/other.lang
+++ b/htdocs/langs/ca_ES/other.lang
@@ -114,7 +114,7 @@ DemoCompanyAll=Empresa amb activitats múltiples (tots els mòduls principals)
 CreatedBy=Creat per %s
 ModifiedBy=Modificat per %s
 ValidatedBy=Validat per %s
-SignedBy=Signed by %s
+SignedBy=Signat per %s
 ClosedBy=Tancat per %s
 CreatedById=ID d'usuari que ha creat
 ModifiedById=Id de l'usuari que ha fet l'últim canvi
@@ -129,6 +129,7 @@ ClosedByLogin=Usuari que ha tancat
 FileWasRemoved=L'arxiu %s s'ha eliminat
 DirWasRemoved=La carpeta %s s'ha eliminat
 FeatureNotYetAvailable=Funcionalitat encara no disponible en aquesta versió
+FeatureNotAvailableOnDevicesWithoutMouse=La funció no està disponible en dispositius sense ratolí
 FeaturesSupported=Característiques disponibles
 Width=llarg
 Height=alt
@@ -183,7 +184,7 @@ EnableGDLibraryDesc=Instal·leu o activeu la biblioteca GD a la instal·lació d
 ProfIdShortDesc=<b>Prof Id %s </b> és una informació que depèn del país del tercer. <br>Per exemple, per al país <b>%s</b>, és el codi <b>%s</b>.
 DolibarrDemo=Demo de Dolibarr ERP/CRM
 StatsByNumberOfUnits=Estadístiques de suma de la quantitat de productes/serveis
-StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
+StatsByNumberOfEntities=Estadístiques del nombre d'entitats referents (núm. De factures o comandes ...)
 NumberOfProposals=Nombre de pressupostos
 NumberOfCustomerOrders=Nombre de comandes de venda
 NumberOfCustomerInvoices=Nombre de factures de client
@@ -245,7 +246,7 @@ NewKeyIs=Aquesta és la nova contrasenya per a iniciar la sessió
 NewKeyWillBe=La contrasenya nova per a iniciar la sessió al programari serà
 ClickHereToGoTo=Clica aquí per anar a %s
 YouMustClickToChange=De totes formes, primer heu de fer clic al següent enllaç per a validar aquest canvi de contrasenya
-ConfirmPasswordChange=Confirm password change
+ConfirmPasswordChange=Confirmeu el canvi de contrasenya
 ForgetIfNothing=Si vostè no ha sol·licitat aquest canvi, simplement ignori aquest e-mail. Les seves credencials són guardades de forma segura
 IfAmountHigherThan=si l'import es major que <strong>%s</strong>
 SourcesRepository=Repositori de fonts
@@ -263,7 +264,7 @@ ContactCreatedByEmailCollector=Contacte / adreça creada pel recollidor de corre
 ProjectCreatedByEmailCollector=Projecte creat pel recollidor de correus electrònics MSGID %s
 TicketCreatedByEmailCollector=Tiquet creat pel recollidor de correus electrònics MSGID %s
 OpeningHoursFormatDesc=Utilitzeu a - per separar l’horari d’obertura i tancament. <br> Utilitzeu un espai per introduir diferents intervals. <br> Exemple: 8-12 14-18
-PrefixSession=Prefix per a l'identificador de sessió
+SuffixSessionName=Sufix per al nom de la sessió
 
 ##### Export #####
 ExportsArea=Àrea d'exportacions
@@ -289,4 +290,4 @@ PopuProp=Productes / Serveis per popularitat als pressupostos
 PopuCom=Productes / Serveis per popularitat a les comandes
 ProductStatistics=Productes / Serveis Estadístiques
 NbOfQtyInOrders=Quantitat en comandes
-SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
+SelectTheTypeOfObjectToAnalyze=Seleccioneu un objecte per veure'n les estadístiques ...
diff --git a/htdocs/langs/ca_ES/partnership.lang b/htdocs/langs/ca_ES/partnership.lang
index 6ee81ae5692..6b0ec8a7271 100644
--- a/htdocs/langs/ca_ES/partnership.lang
+++ b/htdocs/langs/ca_ES/partnership.lang
@@ -16,41 +16,72 @@
 #
 # Generic
 #
-ModulePartnershipName = Partnership management
-PartnershipDescription = Module Partnership management
-PartnershipDescriptionLong= Module Partnership management
+ModulePartnershipName=Gestió de la col·laboració
+PartnershipDescription=Mòdul Gestió de la col·laboració
+PartnershipDescriptionLong= Mòdul Gestió de la col·laboració
+
+AddPartnership=Add partnership
+CancelPartnershipForExpiredMembers=Partnership: Cancel partnership of members with expired subscriptions
+PartnershipCheckBacklink=Partnership: Check referring backlink
 
 #
 # Menu
 #
-NewPartnership = New Partnership
-ListOfPartnerships = List of partnership
+NewPartnership=Nova associació
+ListOfPartnerships=Llista d'associació
 
 #
 # Admin page
 #
-PartnershipSetup = Partnership setup
-PartnershipAbout = About Partnership
-PartnershipAboutPage = Partnership about page
-
+PartnershipSetup=Configuració de l'associació
+PartnershipAbout=Quant a Partnership
+PartnershipAboutPage=Associació sobre la pàgina
+partnershipforthirdpartyormember=Partner status must be set on a 'thirdparty' or a 'member'
+PARTNERSHIP_IS_MANAGED_FOR=Associació gestionada per
+PARTNERSHIP_BACKLINKS_TO_CHECK=Enllaços enrere per comprovar
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb of days before cancelling status of a partnership when a subscription has expired
+ReferingWebsiteCheck=Check of website referring
+ReferingWebsiteCheckDesc=You can enable a feature to check that your partners has added a backlink to your website domains on their own website.
 
 #
 # Object
 #
+DeletePartnership=Suprimiu una associació
+PartnershipDedicatedToThisThirdParty=Associació dedicada a aquest tercer
+PartnershipDedicatedToThisMember=Associació dedicada a aquest membre
 DatePartnershipStart=Data inicial
 DatePartnershipEnd=Data final
+ReasonDecline=Rebutjar la raó
+ReasonDeclineOrCancel=Rebutjar la raó
+PartnershipAlreadyExist=L’associació ja existeix
+ManagePartnership=Manage partnership
+BacklinkNotFoundOnPartnerWebsite=Enllaç de retrocés no trobat al lloc web associat
+ConfirmClosePartnershipAsk=Esteu segur que voleu cancel·lar aquesta associació?
+PartnershipType=Partnership type
 
 #
 # Template Mail
 #
+SendingEmailOnPartnershipWillSoonBeCanceled=Aviat es cancel·larà l'associació
+SendingEmailOnPartnershipRefused=L'associació es va negar
+SendingEmailOnPartnershipAccepted=S'ha acceptat l'associació
+SendingEmailOnPartnershipCanceled=S'ha cancel·lat l'associació
 
+YourPartnershipWillSoonBeCanceledTopic=Aviat es cancel·larà l'associació
+YourPartnershipRefusedTopic=L'associació es va negar
+YourPartnershipAcceptedTopic=S'ha acceptat l'associació
+YourPartnershipCanceledTopic=S'ha cancel·lat l'associació
+
+YourPartnershipWillSoonBeCanceledContent=Us informem que la vostra associació aviat es cancel·larà (no s'ha trobat el backlink)
+YourPartnershipRefusedContent=Us informem que la vostra sol·licitud de col·laboració s’ha rebutjat.
+YourPartnershipAcceptedContent=Us informem que la vostra sol·licitud de col·laboració ha estat acceptada.
+YourPartnershipCanceledContent=Us informem que la vostra associació s’ha cancel·lat.
 
 #
 # Status
 #
-PartnershipDraft = Esborrany
-PartnershipAccepted = Acceptat
-PartnershipRefused = Rebutjat
-PartnershipCanceled = Cancel·lat
-
-PartnershipManagedFor=Partners are
+PartnershipDraft=Esborrany
+PartnershipAccepted=Acceptat
+PartnershipRefused=Rebutjat
+PartnershipCanceled=Cancel·lat
+PartnershipManagedFor=Els socis ho són
diff --git a/htdocs/langs/ca_ES/productbatch.lang b/htdocs/langs/ca_ES/productbatch.lang
index 2b1ea9d1a1f..4ae913e4918 100644
--- a/htdocs/langs/ca_ES/productbatch.lang
+++ b/htdocs/langs/ca_ES/productbatch.lang
@@ -1,4 +1,4 @@
-# ProductBATCH language file - en_US - ProductBATCH
+# ProductBATCH language file - Source file is en_US - ProductBATCH
 ManageLotSerial=Utilitza el número de lot/sèrie
 ProductStatusOnBatch=Sí (es requereix lot)
 ProductStatusOnSerial=Sí (es requereix un número de sèrie únic)
@@ -24,12 +24,22 @@ ProductLotSetup=Configuració del mòdul lot/sèries
 ShowCurrentStockOfLot=Mostra l'estoc actual de la parella producte/lot
 ShowLogOfMovementIfLot=Mostra el registre de moviments de la parella producte/lot
 StockDetailPerBatch=Detall d’estoc per lot
-SerialNumberAlreadyInUse=Serial number %s is already used for product %s
-TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
-BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
-BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
-ManageLotMask=Custom mask
-CustomMasks=Adds an option to define mask in the product card
-LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
-SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
-QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+SerialNumberAlreadyInUse=El número de sèrie %s ja s’utilitza per al producte %s
+TooManyQtyForSerialNumber=Només podeu tenir un producte %s per al número de sèrie %s
+BatchLotNumberingModules=Opcions per a la generació automàtica de productes per lots gestionats per lots
+BatchSerialNumberingModules=Opcions per a la generació automàtica de productes per lots gestionats per números de sèrie
+ManageLotMask=Màscara personalitzada
+CustomMasks=Afegeix una opció per definir la màscara a la targeta del producte
+LotProductTooltip=Afegeix una opció a la targeta de producte per definir una màscara de número de lot dedicada
+SNProductTooltip=Afegeix una opció a la targeta del producte per definir una màscara de número de sèrie dedicada
+QtyToAddAfterBarcodeScan=Quantitat per afegir per a cada codi de barres / lot / sèrie escanejat
+LifeTime=Vida útil (en dies)
+EndOfLife=Final de la vida
+ManufacturingDate=Data de fabricació
+DestructionDate=Data de destrucció
+FirstUseDate=Data del primer ús
+QCFrequency=Freqüència de control de qualitat (en dies)
+
+#Traceability - qc status
+OutOfOrder=No funciona
+InWorkingOrder=En procés
diff --git a/htdocs/langs/ca_ES/products.lang b/htdocs/langs/ca_ES/products.lang
index 40e9267f8ad..f979f5c076a 100644
--- a/htdocs/langs/ca_ES/products.lang
+++ b/htdocs/langs/ca_ES/products.lang
@@ -43,7 +43,7 @@ ServicesOnSaleOnly=Serveis només en venda
 ServicesOnPurchaseOnly=Serveis només per compra
 ServicesNotOnSell=Serveis no a la venda i no per a la compra
 ServicesOnSellAndOnBuy=Serveis en venda o de compra
-LastModifiedProductsAndServices=Latest %s products/services which were modified
+LastModifiedProductsAndServices=Últims productes / serveis %s que es van modificar
 LastRecordedProducts=Últims %s productes registrats
 LastRecordedServices=Últims %s serveis registrats
 CardProduct0=Producte
@@ -73,12 +73,12 @@ SellingPrice=Preu de venda
 SellingPriceHT=Preu de venda (sense IVA)
 SellingPriceTTC=PVP amb IVA
 SellingMinPriceTTC=Preu mínim de venda (IVA inclòs)
-CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
+CostPriceDescription=Aquest camp de preus (sense impostos) es pot utilitzar per capturar l'import mitjà que aquest producte costa a la vostra empresa. Pot ser qualsevol preu que calculeu vosaltres mateixos, per exemple, a partir del preu de compra mitjà més el cost mitjà de producció i distribució.
 CostPriceUsage=Aquest valor pot utilitzar-se per al càlcul de marges
 SoldAmount=Import venut
 PurchasedAmount=Import comprat
 NewPrice=Preu nou
-MinPrice=Min. selling price
+MinPrice=Mín. preu de venda
 EditSellingPriceLabel=Edita l'etiqueta de preu de venda
 CantBeLessThanMinPrice=El preu de venda no pot ser inferior al mínim permès per a aquest producte (%s sense IVA). Aquest missatge també pot aparèixer si escriviu un descompte massa gran.
 ContractStatusClosed=Tancat
@@ -157,11 +157,11 @@ ListServiceByPopularity=Llistat de serveis per popularitat
 Finished=Producte fabricat
 RowMaterial=Matèria primera
 ConfirmCloneProduct=Estàs segur que vols clonar el producte o servei <b>%s</b>?
-CloneContentProduct=Clone all main information of the product/service
+CloneContentProduct=Cloneu tota la informació principal del producte / servei
 ClonePricesProduct=Clonar preus
-CloneCategoriesProduct=Clone linked tags/categories
-CloneCompositionProduct=Clone virtual products/services
-CloneCombinationsProduct=Clone the product variants
+CloneCategoriesProduct=Clona etiquetes / categories enllaçades
+CloneCompositionProduct=Clona productes / serveis virtuals
+CloneCombinationsProduct=Cloneu les variants del producte
 ProductIsUsed=Aquest producte és utilitzat
 NewRefForClone=Ref. del producte/servei nou
 SellingPrices=Preus de venda
@@ -170,12 +170,12 @@ CustomerPrices=Preus de client
 SuppliersPrices=Preus del proveïdor
 SuppliersPricesOfProductsOrServices=Preus del venedor (de productes o serveis)
 CustomCode=Duanes | Productes bàsics | Codi HS
-CountryOrigin=Country of origin
-RegionStateOrigin=Region of origin
-StateOrigin=State|Province of origin
-Nature=Nature of product (raw/manufactured)
+CountryOrigin=País d'origen
+RegionStateOrigin=Regió d'origen
+StateOrigin=Estat | Província d'origen
+Nature=Naturalesa del producte (en brut / fabricat)
 NatureOfProductShort=Naturalesa del producte
-NatureOfProductDesc=Raw material or manufactured product
+NatureOfProductDesc=Matèria primera o producte fabricat
 ShortLabel=Etiqueta curta
 Unit=Unitat
 p=u.
@@ -314,7 +314,7 @@ LastUpdated=Última actualització
 CorrectlyUpdated=Actualitzat correctament
 PropalMergePdfProductActualFile=Els fitxers que s’utilitzen per a afegir-se al PDF Azur són
 PropalMergePdfProductChooseFile=Selecciona fitxers PDF
-IncludingProductWithTag=Include products/services with tag
+IncludingProductWithTag=Incloeu productes / serveis amb etiqueta
 DefaultPriceRealPriceMayDependOnCustomer=Preu predeterminat, el preu real pot dependre del client
 WarningSelectOneDocument=Selecciona com a mínim un document
 DefaultUnitToShow=Unitat
@@ -396,3 +396,5 @@ ActionAvailableOnVariantProductOnly=Acció només disponible sobre la variant de
 ProductsPricePerCustomer=Preus dels productes per clients
 ProductSupplierExtraFields=Atributs addicionals (preus de proveïdors)
 DeleteLinkedProduct=Suprimeix el producte fill enllaçat a la combinació
+PMPValue=Preu mitjà ponderat
+PMPValueShort=PMP
diff --git a/htdocs/langs/ca_ES/projects.lang b/htdocs/langs/ca_ES/projects.lang
index 72b37f52286..e1b96348abc 100644
--- a/htdocs/langs/ca_ES/projects.lang
+++ b/htdocs/langs/ca_ES/projects.lang
@@ -10,19 +10,19 @@ PrivateProject=Contactes del projecte
 ProjectsImContactFor=Projectes dels qui en soc explícitament un contacte
 AllAllowedProjects=Tots els projectes que puc llegir (meu + públic)
 AllProjects=Tots els projectes
-MyProjectsDesc=This view is limited to the projects that you are a contact for
+MyProjectsDesc=Aquesta visualització es limita als projectes als quals us contacteu
 ProjectsPublicDesc=Aquesta vista mostra tots els projectes en els que vostè té dret a tenir visibilitat.
 TasksOnProjectsPublicDesc=Aquesta vista mostra totes les tasques en projectes en els que tens permisos de lectura.
 ProjectsPublicTaskDesc=Aquesta vista mostra tots els projectes als que té dret a visualitzar
 ProjectsDesc=Aquesta vista mostra tots els projectes (les seves autoritzacions li ofereixen una visió completa).
 TasksOnProjectsDesc=Aquesta vista mostra totes les tasques en tots els projectes (els teus permisos d'usuari et donen dret a visualitzar-ho tot).
-MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
+MyTasksDesc=Aquesta visualització es limita als projectes o tasques amb què us contacteu
 OnlyOpenedProject=Només visibles els projectes oberts (els projectes en estat d'esborrany o tancats no són visibles)
 ClosedProjectsAreHidden=Els projectes tancats no són visibles.
 TasksPublicDesc=Aquesta vista mostra tots els projectes i tasques en els que vostè té dret a tenir visibilitat.
 TasksDesc=Aquesta vista presenta tots els projectes i tasques (els permisos d'usuari us concedeixen permís per veure-ho tot).
 AllTaskVisibleButEditIfYouAreAssigned=Totes les tasques per a projectes qualificats són visibles, però podeu ingressar només el temps per a la tasca assignada a l'usuari seleccionat. Assigneu la tasca si necessiteu introduir-hi el temps.
-OnlyYourTaskAreVisible=Only tasks assigned to you are visible. If you need to enter time on a task and if the task is not visible here, then you need to assign the task to yourself.
+OnlyYourTaskAreVisible=Només són visibles les tasques assignades. Si heu d'introduir el temps en una tasca i si la tasca no és visible aquí, heu d'assignar-la a vosaltres mateixos.
 ImportDatasetTasks=Tasques de projectes
 ProjectCategories=Etiquetes de projecte
 NewProject=Projecte nou
@@ -89,7 +89,7 @@ TimeConsumed=Consumit
 ListOfTasks=Llistat de tasques
 GoToListOfTimeConsumed=Aneu al llistat del temps consumit
 GanttView=Vista de Gantt
-ListWarehouseAssociatedProject=List of warehouses associated to the project
+ListWarehouseAssociatedProject=Llista de magatzems associats al projecte
 ListProposalsAssociatedProject=Llista de propostes comercials relacionades amb el projecte
 ListOrdersAssociatedProject=Llista de comandes de vendes relacionades amb el projecte
 ListInvoicesAssociatedProject=Llista de factures a clients relacionades amb el projecte
@@ -202,7 +202,7 @@ ResourceNotAssignedToTheTask=No assignat a la tasca
 NoUserAssignedToTheProject=No hi ha usuaris assignats a aquest projecte
 TimeSpentBy=Temps gastat per
 TasksAssignedTo=Tasques assignades a
-AssignTaskToMe=Assign task to myself
+AssignTaskToMe=Assignar-me la tasca
 AssignTaskToUser=Assigna una tasca a %s
 SelectTaskToAssign=Selecciona la tasca per a assignar ...
 AssignTask=Assigna
@@ -267,9 +267,11 @@ InvoiceToUse=Esborrany de factura a utilitzar
 NewInvoice=Factura nova
 OneLinePerTask=Una línia per tasca
 OneLinePerPeriod=Una línia per període
+OneLinePerTimeSpentLine=Una línia per cada declaració dedicada
 RefTaskParent=Ref. Tasca pare
 ProfitIsCalculatedWith=El benefici es calcula utilitzant
 AddPersonToTask=Afegeix també a les tasques
 UsageOrganizeEvent=Ús: organització d'esdeveniments
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classifica un projecte com a tancat quan s'hagin completat totes les seves tasques (progrés 100%%)
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Nota: els projectes existents amb totes les tasques amb un progrés del 100%% no es veuran afectats, i els haureu de tancar manualment. Així doncs, aquesta opció només afecta els projectes oberts.
+SelectLinesOfTimeSpentToInvoice=Seleccioneu les línies de temps que no es facturen i, a continuació, feu una acció massiva "Genera factura" per facturar-les
diff --git a/htdocs/langs/ca_ES/receptions.lang b/htdocs/langs/ca_ES/receptions.lang
index ec31d8c4e8e..e9c1df155fe 100644
--- a/htdocs/langs/ca_ES/receptions.lang
+++ b/htdocs/langs/ca_ES/receptions.lang
@@ -15,12 +15,12 @@ StatisticsOfReceptions=Estadístiques de recepcions
 NbOfReceptions=Nombre de recepcions
 NumberOfReceptionsByMonth=Nombre de recepcions per mes
 ReceptionCard=Fitxa de recepció
-NewReception=Nova recepció
+NewReception=Recepció nova
 CreateReception=Crea recepció
 QtyInOtherReceptions=Qt. en altres recepcions
 OtherReceptionsForSameOrder=Altres recepcions d'aquesta comanda
 ReceptionsAndReceivingForSameOrder=Recepcions i rebuts d'aquesta comanda
-ReceptionsToValidate=Recepcions per validar
+ReceptionsToValidate=Recepcions per a validar
 StatusReceptionCanceled=Cancel·lat
 StatusReceptionDraft=Esborrany
 StatusReceptionValidated=Validat (productes a enviar o enviats)
@@ -44,4 +44,4 @@ ValidateOrderFirstBeforeReception=Primer has de validar la comanda abans de pode
 ReceptionsNumberingModules=Mòdul de numeració per a recepcions
 ReceptionsReceiptModel=Plantilles de documents per a recepcions
 NoMorePredefinedProductToDispatch=No hi ha més productes predefinits per ser enviats
-
+ReceptionExist=Hi ha una recepció
diff --git a/htdocs/langs/ca_ES/salaries.lang b/htdocs/langs/ca_ES/salaries.lang
index 50e733b564f..9a3529562d5 100644
--- a/htdocs/langs/ca_ES/salaries.lang
+++ b/htdocs/langs/ca_ES/salaries.lang
@@ -2,7 +2,7 @@
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Compte comptable utilitzat per usuaris tercers
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=El compte comptable dedicat definit a la fitxa d'usuari només s’utilitzarà per a la comptabilitat auxiliar. Aquest s'utilitzarà per al llibre major i com a valor per defecte de la comptabilitat auxiliar si no es defineix un compte comptable d'usuari dedicat.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Compte comptable per defecte per als pagaments salarials
-CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=By default, leave empty the option "Automatically create a total payment" when creating a Salary
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=De manera predeterminada, deixeu buida l'opció "Crear automàticament un pagament total" quan creeu un sou
 Salary=Sou
 Salaries=Sous
 NewSalary=Salari nou
@@ -10,7 +10,7 @@ NewSalaryPayment=Fitxa de salari nova
 AddSalaryPayment=Afegeix pagament de sou
 SalaryPayment=Pagament de sous
 SalariesPayments=Pagaments de sous
-SalariesPaymentsOf=Salaries payments of %s
+SalariesPaymentsOf=Pagaments de sous de %s
 ShowSalaryPayment=Veure pagament de sous
 THM=Tarifa per hora mitjana
 TJM=Tarifa mitjana diària
diff --git a/htdocs/langs/ca_ES/sendings.lang b/htdocs/langs/ca_ES/sendings.lang
index 29da54f2084..d7ccb0a3d06 100644
--- a/htdocs/langs/ca_ES/sendings.lang
+++ b/htdocs/langs/ca_ES/sendings.lang
@@ -43,7 +43,7 @@ ConfirmValidateSending=Estàs segur que vols validar aquest enviament amb refer
 ConfirmCancelSending=Esteu segur que voleu cancel·lar aquest enviament?
 DocumentModelMerou=Model Merou A5
 WarningNoQtyLeftToSend=Alerta, cap producte en espera d'enviament.
-StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
+StatsOnShipmentsOnlyValidated=Les estadístiques només són per a enviaments validats. La data utilitzada és la data de validació de l'enviament (no sempre se sap la data de lliurament prevista)
 DateDeliveryPlanned=Data prevista d'entrega
 RefDeliveryReceipt=Referència del rebut de lliurament
 StatusReceipt=Estat del rebut de lliurament
diff --git a/htdocs/langs/ca_ES/stocks.lang b/htdocs/langs/ca_ES/stocks.lang
index 8dd9b8ec46b..51a77751113 100644
--- a/htdocs/langs/ca_ES/stocks.lang
+++ b/htdocs/langs/ca_ES/stocks.lang
@@ -38,7 +38,7 @@ IncludeEmptyDesiredStock=Inclou també estoc negatives amb estoc desitjat no def
 IncludeAlsoDraftOrders=Inclou també projectes d'ordre
 Location=Lloc
 LocationSummary=Nom curt de la ubicació
-NumberOfDifferentProducts=Number of unique products
+NumberOfDifferentProducts=Nombre de productes únics
 NumberOfProducts=Nombre total de productes
 LastMovement=Últim moviment
 LastMovements=Últims moviments
@@ -56,13 +56,11 @@ UnitPurchaseValue=Preu de compra unitari
 StockTooLow=Estoc insuficient
 StockLowerThanLimit=L'estoc és menor que el límit de l'alerta (%s)
 EnhancedValue=Valor
-PMPValue=Valor (PMP)
-PMPValueShort=PMP
 EnhancedValueOfWarehouses=Valor d'estocs
 UserWarehouseAutoCreate=Crea un usuari de magatzem automàticament quan es crea un usuari
 AllowAddLimitStockByWarehouse=Gestioneu també valors mínims d'estoc desitjat per emparellament (producte-magatzem), a més de valors mínims d'estoc desitjat per producte
 RuleForWarehouse=Regles per als magatzems
-WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+WarehouseAskWarehouseOnThirparty=Configureu un magatzem a tercers
 WarehouseAskWarehouseDuringPropal=Estableix un magatzem en pressupostos
 WarehouseAskWarehouseDuringOrder=Estableix un magatzem per a les comandes de venda
 UserDefaultWarehouse=Estableix un magatzem per Usuaris
@@ -91,14 +89,14 @@ NoPredefinedProductToDispatch=No hi ha productes predefinits en aquest objecte.
 DispatchVerb=Desglossar
 StockLimitShort=Límit per l'alerta
 StockLimit=Estoc límit per les alertes
-StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
+StockLimitDesc=(buit) no significa cap advertiment. <br> 0 es pot utilitzar per activar un advertiment tan aviat com el stock estigui buit.
 PhysicalStock=Estoc físic
 RealStock=Estoc real
 RealStockDesc=L'estoc físic o real és l'estoc que tens actualment als teus magatzems/emplaçaments interns.
 RealStockWillAutomaticallyWhen=L'estoc real es modificarà d'acord amb aquesta regla (tal com es defineix al mòdul d'accions):
 VirtualStock=Estoc virtual
 VirtualStockAtDate=Estoc virtual a la data
-VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen date will be finished
+VirtualStockAtDateDesc=Existències virtuals un cop finalitzades totes les comandes pendents que es preveu processar abans de la data escollida
 VirtualStockDesc=L’estoc virtual és l’estoc disponible calculat un cop tancades (comandes de compra rebudes, comandes de venda enviades, ordres de fabricació produïdes, etc.) totes les accions obertes/pendents (que afecten a les existències)
 AtDate=A la data
 IdWarehouse=Id. magatzem
@@ -107,7 +105,7 @@ LieuWareHouse=Localització magatzem
 WarehousesAndProducts=Magatzems i productes
 WarehousesAndProductsBatchDetail=Magatzems i productes (amb detall per lot/sèrie)
 AverageUnitPricePMPShort=Preu mitjà ponderat
-AverageUnitPricePMPDesc=The input average unit price we had to expense to get 1 unit of product into our stock.
+AverageUnitPricePMPDesc=El preu unitari mitjà d’entrada que vam haver de gastar per aconseguir una unitat de producte al nostre estoc.
 SellPriceMin=Preu de venda unitari
 EstimatedStockValueSellShort=Valor per vendre
 EstimatedStockValueSell=Valor per vendre
@@ -147,7 +145,7 @@ Replenishments=reaprovisionament
 NbOfProductBeforePeriod=Quantitat del producte %s en estoc abans del període seleccionat (< %s)
 NbOfProductAfterPeriod=Quantitat de producte %s en estoc després del període seleccionat (> %s)
 MassMovement=Moviments en massa
-SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
+SelectProductInAndOutWareHouse=Seleccioneu un magatzem d'origen i un magatzem de destinació, un producte i una quantitat i feu clic a "%s". Un cop fet això per a tots els moviments necessaris, feu clic a "%s".
 RecordMovement=Registre de transferència
 ReceivingForSameOrder=Recepcions d'aquesta comanda
 StockMovementRecorded=Moviments d'estoc registrat
@@ -238,20 +236,23 @@ StockIsRequiredToChooseWhichLotToUse=Es requereix estoc per a triar quin lot uti
 ForceTo=Obligar a
 AlwaysShowFullArbo=Mostra l'arbre complet de magatzems a la finestra emergent dels enllaços de magatzem (Advertència: pot disminuir el rendiment de manera espectacular)
 StockAtDatePastDesc=Aquí podeu veure l'estoc (estoc real) en una data determinada del passat
-StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
+StockAtDateFutureDesc=Podeu veure aquí l'estoc (estoc virtual) en una data determinada en el futur
 CurrentStock=Estoc actual
 InventoryRealQtyHelp=Estableix el valor a 0 per a restablir la quantitat<br>Mantén el camp buit o elimina la línia per a mantenir-la sense canvis
-UpdateByScaning=Fill real qty by scaning
+UpdateByScaning=Empleneu la quantitat real escanejant
 UpdateByScaningProductBarcode=Actualització per escaneig (codi de barres de producte)
 UpdateByScaningLot=Actualització per escaneig (codi de barres lot|sèrie)
 DisableStockChangeOfSubProduct=Desactiva el canvi d'estoc de tots els subproductes d'aquest kit durant aquest moviment.
-ImportFromCSV=Import CSV list of movement
+ImportFromCSV=Importa la llista de moviments CSV
 ChooseFileToImport=Pengeu un fitxer i feu clic a la icona %s per seleccionar el fitxer com a fitxer d'importació d'origen ...
-SelectAStockMovementFileToImport=select a stock movement file to import
-InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
+SelectAStockMovementFileToImport=seleccioneu un fitxer de moviment de valors per importar
+InfoTemplateImport=El fitxer carregat ha de tenir aquest format (* són camps obligatoris): <br> Magatzem font * | Magatzem objectiu * | Producte * | Quantitat * | Número de lot / sèrie <br> El separador de caràcters CSV ha de ser "<b> %s </b>"
 LabelOfInventoryMovemement=Inventari %s
 ReOpen=Reobrir
-ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
-ObjectNotFound=%s not found
-MakeMovementsAndClose=Generate movements and close
-AutofillWithExpected=Fill real quantity with expected quantity
+ConfirmFinish=Confirmeu el tancament de l'inventari? Això generarà tots els moviments de les accions per actualitzar les accions a la quantitat real que vau introduir a l'inventari.
+ObjectNotFound=no s'ha trobat %s
+MakeMovementsAndClose=Generar moviments i tancar
+AutofillWithExpected=Ompliu la quantitat real amb la quantitat esperada
+ShowAllBatchByDefault=Per defecte, mostreu els detalls del lot a la pestanya "existències" del producte
+CollapseBatchDetailHelp=Podeu configurar la visualització predeterminada del detall del lot a la configuració del mòdul d'existències
+FieldCannotBeNegative=Field "%s" cannot be negative
diff --git a/htdocs/langs/ca_ES/ticket.lang b/htdocs/langs/ca_ES/ticket.lang
index 341343b9634..5628db3f806 100644
--- a/htdocs/langs/ca_ES/ticket.lang
+++ b/htdocs/langs/ca_ES/ticket.lang
@@ -71,7 +71,7 @@ Deleted=Esborrat
 Type=Tipus
 Severity=Gravetat
 TicketGroupIsPublic=El grup és públic
-TicketGroupIsPublicDesc=If a ticket group is public, it will be visible in the form when creating a ticket from the public interface
+TicketGroupIsPublicDesc=Si un grup de tiquets és públic, serà visible al formulari en crear un tiquet des de la interfície pública
 
 # Email templates
 MailToSendTicketMessage=Per a enviar correus electrònics des del missatge de tiquet
@@ -116,8 +116,8 @@ TicketsShowModuleLogo=Mostra el logotip del mòdul a la interfície pública
 TicketsShowModuleLogoHelp=Activeu aquesta opció per a ocultar el mòdul de logotip a les pàgines de la interfície pública
 TicketsShowCompanyLogo=Mostra el logotip de l'empresa en la interfície pública
 TicketsShowCompanyLogoHelp=Activeu aquesta opció per a ocultar el logotip de l'empresa principal a les pàgines de la interfície pública
-TicketsEmailAlsoSendToMainAddress=Also send a notification to the main email address
-TicketsEmailAlsoSendToMainAddressHelp=Enable this option to also send an email to the address defined into setup "%s" (see tab "%s")
+TicketsEmailAlsoSendToMainAddress=També envieu una notificació a l’adreça de correu electrònic principal
+TicketsEmailAlsoSendToMainAddressHelp=Activeu aquesta opció per enviar també un correu electrònic a l'adreça definida a la configuració "%s" (vegeu la pestanya "%s")
 TicketsLimitViewAssignedOnly=Restringir la visualització als tiquets assignats a l'usuari actual (no és efectiu per als usuaris externs, sempre estarà limitat al tercer de qui depengui)
 TicketsLimitViewAssignedOnlyHelp=Només es veuran les entrades assignades a l'usuari actual. No s'aplica a un usuari amb drets de gestió de tiquets.
 TicketsActivatePublicInterface=Activar la interfície pública
@@ -128,10 +128,10 @@ TicketNumberingModules=Mòdul de numeració de tiquets
 TicketsModelModule=Plantilles de document per a tiquets
 TicketNotifyTiersAtCreation=Notifica la creació de tercers
 TicketsDisableCustomerEmail=Desactiveu sempre els correus electrònics quan es crea un tiquet des de la interfície pública
-TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is added to a ticket
+TicketsPublicNotificationNewMessage=Envieu correu(s) electrònic(s) quan s'afegeixi un missatge / comentari nou a una entrada
 TicketsPublicNotificationNewMessageHelp=Envia correus electrònics quan s'afegeixi un missatge nou des de la interfície pública (a l'usuari assignat o al correu electrònic de notificacions a (actualitzar) i/o al correu electrònic de notificacions)
 TicketPublicNotificationNewMessageDefaultEmail=Notificar correu electrònic cap a (actualitzar)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Send an email to this address for each new message notifications if the ticket doesn't have a user assigned to it or if the user doesn't have any known email.
+TicketPublicNotificationNewMessageDefaultEmailHelp=Envieu un correu electrònic a aquesta adreça per a cada nova notificació de missatges si el bitllet no té assignat cap usuari o si l’usuari no té cap correu electrònic conegut.
 #
 # Index & list page
 #
@@ -304,13 +304,13 @@ BoxLastModifiedTicket=Últims tiquets modificats
 BoxLastModifiedTicketDescription=Últimes entrades modificades %s
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No hi ha tiquets modificats recentment
-BoxTicketType=Number of open tickets by type
-BoxTicketSeverity=Number of open tickets by severity
-BoxNoTicketSeverity=No tickets opened
-BoxTicketLastXDays=Number of new tickets by days the last %s days
-BoxTicketLastXDayswidget = Number of new tickets by days the last X days
-BoxNoTicketLastXDays=No new tickets the last %s days
-BoxNumberOfTicketByDay=Number of new tickets by day
-BoxNewTicketVSClose=Number of today's new tickets versus today's closed tickets
-TicketCreatedToday=Ticket created today
-TicketClosedToday=Ticket closed today
+BoxTicketType=Distribution of open tickets by type
+BoxTicketSeverity=Nombre de bitllets oberts per gravetat
+BoxNoTicketSeverity=No s’ha obert cap entrada
+BoxTicketLastXDays=Nombre de bitllets nous per dies els darrers %s dies
+BoxTicketLastXDayswidget = Nombre de bitllets nous per dies els darrers X dies
+BoxNoTicketLastXDays=No hi ha entrades noves els darrers %s dies
+BoxNumberOfTicketByDay=Nombre de bitllets nous per dia
+BoxNewTicketVSClose=Nombre de bitllets nous d'avui en comparació amb els bitllets tancats d'avui
+TicketCreatedToday=Entrada creada avui
+TicketClosedToday=Entrada tancada avui
diff --git a/htdocs/langs/ca_ES/trips.lang b/htdocs/langs/ca_ES/trips.lang
index f8a508426a3..a4017243620 100644
--- a/htdocs/langs/ca_ES/trips.lang
+++ b/htdocs/langs/ca_ES/trips.lang
@@ -33,7 +33,7 @@ ExpenseReportCanceledMessage=L'informe de despeses %s s'ha cancel·lat. <br> - U
 ExpenseReportPaid=S'ha pagat un informe de despeses
 ExpenseReportPaidMessage=L'informe de despeses %s s'ha pagat. <br> - Usuari: %s <br> - Pagat per: %s <br> Feu clic aquí per a veure l'informe de despeses: %s
 TripId=Id d'informe de despeses
-AnyOtherInThisListCanValidate=Persona a informar per a validar
+AnyOtherInThisListCanValidate=Persona que s’ha d’informar per validar la sol·licitud.
 TripSociete=Informació de l'empresa
 TripNDF=Informacions de l'informe de despeses
 PDFStandardExpenseReports=Plantilla estàndard per a generar un document PDF per a l'informe de despeses
diff --git a/htdocs/langs/ca_ES/users.lang b/htdocs/langs/ca_ES/users.lang
index 5694fe70dbd..a1cd4e26424 100644
--- a/htdocs/langs/ca_ES/users.lang
+++ b/htdocs/langs/ca_ES/users.lang
@@ -12,7 +12,7 @@ PasswordChangedTo=Contrasenya modificada en: %s
 SubjectNewPassword=La teva nova paraula de pas per a %s
 GroupRights=Permisos de grup
 UserRights=Permisos usuari
-Credentials=Credentials
+Credentials=Credencials
 UserGUISetup=Configuració d'entorn d'usuari
 DisableUser=Desactiva
 DisableAUser=Desactiva un usuari
@@ -73,7 +73,7 @@ ExportDataset_user_1=Usuaris i les seves propietats
 DomainUser=Usuari de domini
 Reactivate=Reactivar
 CreateInternalUserDesc=Aquest formulari us permet crear un usuari intern a la vostra empresa/organització. Per a crear un usuari extern (client, proveïdor, etc.), utilitzeu el botó "Crea l'usuari Dolibarr" de la fitxa de contacte d'aquest tercer.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization, or is a partner user outside of your organization that may need to see more data  than data related to his company (the permission system will define what he can or can't see or do).<br>An <b>external</b> user is a customer, vendor or other that must view ONLY data related to himself (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, you must grant permissions on the features that the user need.
+InternalExternalDesc=Un usuari <b> intern </b> és un usuari que forma part de la vostra empresa / organització o bé és un usuari soci que no pertany a la vostra organització i pot ser que hagi de veure més dades que les dades relacionades amb la seva empresa (el sistema de permisos definirà què pot o pot no ho veig ni ho faig). <br> Un usuari <b> extern </b> és un client, proveïdor o un altre que només ha de visualitzar dades relacionades amb ell mateix (la creació d'un usuari extern per a un tercer es pot fer des del registre de contacte del tercer). <br> <br> En ambdós casos, heu de concedir permisos a les funcions que l'usuari necessiti.
 PermissionInheritedFromAGroup=El permís es concedeix ja que ho hereta d'un grup al qual pertany l'usuari.
 Inherited=Heretat
 UserWillBe=L'usuari creat serà
@@ -106,7 +106,7 @@ UseTypeFieldToChange=Modificar el camp Tipus per canviar
 OpenIDURL=URL d'OpenID
 LoginUsingOpenID=Utilitzeu OpenID per a iniciar la sessió
 WeeklyHours=Hores treballades (per setmana)
-ExpectedWorkedHours=Expected hours worked per week
+ExpectedWorkedHours=Hores previstes treballades a la setmana
 ColorUser=Color d'usuari
 DisabledInMonoUserMode=Deshabilitat en mode manteniment
 UserAccountancyCode=Codi comptable de l'usuari
@@ -116,7 +116,7 @@ DateOfEmployment=Data de treball
 DateEmployment=Ocupació
 DateEmploymentstart=Data d'inici de l'ocupació
 DateEmploymentEnd=Data de finalització de l'ocupació
-RangeOfLoginValidity=Access validity date range
+RangeOfLoginValidity=Accés a l'interval de dates de validesa
 CantDisableYourself=No podeu desactivar el vostre propi registre d'usuari
 ForceUserExpenseValidator=Validador de l'informe de despeses obligatori
 ForceUserHolidayValidator=Forçar validador de sol·licitud d'abandonament
diff --git a/htdocs/langs/ca_ES/website.lang b/htdocs/langs/ca_ES/website.lang
index e2a9e6dce71..3a67863d70f 100644
--- a/htdocs/langs/ca_ES/website.lang
+++ b/htdocs/langs/ca_ES/website.lang
@@ -140,8 +140,8 @@ DefineListOfAltLanguagesInWebsiteProperties=Definiu la llista de tots els idiome
 GenerateSitemaps=Genera un fitxer de mapa del lloc del lloc web
 ConfirmGenerateSitemaps=Si ho confirmeu, suprimireu el fitxer de mapa del lloc existent...
 ConfirmSitemapsCreation=Confirmeu la generació del mapa del lloc
-SitemapGenerated=Sitemap file <b>%s</b> generated
+SitemapGenerated=Fitxer del mapa del lloc <b> %s </b> generat
 ImportFavicon=Favicon
-ErrorFaviconType=Favicon must be png
-ErrorFaviconSize=Favicon must be sized 16x16, 32x32 or 64x64
-FaviconTooltip=Upload an image which needs to be a png (16x16, 32x32 or 64x64)
+ErrorFaviconType=Favicon ha de ser png
+ErrorFaviconSize=El favicon ha de tenir una mida de 16x16, 32x32 o 64x64
+FaviconTooltip=Pengeu una imatge que ha de ser PNG (16x16, 32x32 o 64x64)
diff --git a/htdocs/langs/ca_ES/zapier.lang b/htdocs/langs/ca_ES/zapier.lang
index c46dbb0a6d8..731820a7373 100644
--- a/htdocs/langs/ca_ES/zapier.lang
+++ b/htdocs/langs/ca_ES/zapier.lang
@@ -18,4 +18,4 @@ ModuleZapierForDolibarrDesc = Mòdul Zapier per a Dolibarr
 ZapierForDolibarrSetup=Configuració de Zapier per a Dolibarr
 ZapierDescription=Interfície amb Zapier
 ZapierAbout=Quant al mòdul Zapier
-ZapierSetupPage=There is no need for a setup on Dolibarr side to use Zapier. However, you must generate and publish a package on zapier to be able to use Zapier with Dolibarr. See documentation on <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">this wiki page</a>.
+ZapierSetupPage=No cal fer cap configuració al costat de Dolibarr per utilitzar Zapier. Tot i això, heu de generar i publicar un paquet a zapier per poder utilitzar Zapier amb Dolibarr. Consulteu la documentació <a href="https://wiki.dolibarr.org/index.php/Module_Zapier"> aquesta pàgina wiki </a>.
diff --git a/htdocs/langs/cs_CZ/accountancy.lang b/htdocs/langs/cs_CZ/accountancy.lang
index 311edecfc69..bc374006f1c 100644
--- a/htdocs/langs/cs_CZ/accountancy.lang
+++ b/htdocs/langs/cs_CZ/accountancy.lang
@@ -158,7 +158,7 @@ ACCOUNTING_LENGTH_AACCOUNT=Délka účtů účtů subjektů (Pokud zde nastavít
 ACCOUNTING_MANAGE_ZERO=Umožňuje spravovat různé počty nul na konci účetního účtu. Některé země potřebují (například Švýcarsko). Pokud je vypnuto (výchozí), můžete nastavit následující dva parametry a požádat aplikaci o přidání virtuálních nul.
 BANK_DISABLE_DIRECT_INPUT=Zakázat přímé nahrávání transakce v bankovním účtu
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Povolit návrh exportu v žurnálu
-ACCOUNTANCY_COMBO_FOR_AUX=Povolit seznam combo pro pomocný účet (může být pomalý, pokud máte spoustu třetích stran)
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties, break ability to search on a part of value)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
@@ -328,6 +328,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountanc
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
+NotifiedExportDate=Notified export date (modification of the entries will not be possible)
+NotifiedValidationDate=Validation of the entries (modification or deletion of the entries will not be possible)
+ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=Exportovat deník návrhu
 Modelcsv=Model exportu
 Selectmodelcsv=Vyberte způsob exportu
diff --git a/htdocs/langs/cs_CZ/admin.lang b/htdocs/langs/cs_CZ/admin.lang
index c4e666b6ae5..600c2134442 100644
--- a/htdocs/langs/cs_CZ/admin.lang
+++ b/htdocs/langs/cs_CZ/admin.lang
@@ -221,8 +221,8 @@ NotCompatible=Tento modul se nezdá být kompatibilní s Dolibarr %s (Min %s - M
 CompatibleAfterUpdate=Tento modul vyžaduje aktualizaci souboru Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=Podívejte se na trh
 SeeSetupOfModule=Viz nastavení modulu %s
+SetOptionTo=Set option <b>%s</b> to %s
 Updated=Aktualizováno
-Nouveauté=Novinka
 AchatTelechargement=Koupit / stáhnout
 GoModuleSetupArea=Chcete-li nasadit / nainstalovat nový modul, přejděte do oblasti nastavení modulu: <a href="%s"> %s </a>.
 DoliStoreDesc=DoliStore, oficiální trh pro download externích modulů Dolibarr ERP / CRM
@@ -399,6 +399,7 @@ SecurityToken=Klíč k zabezpečené URL
 NoSmsEngine=Není k dispozici správce odesílatelů SMS. Správce odesílatele SMS není nainstalován s výchozím rozdělením, protože závisí na externím dodavateli, ale některé můžete najít na %s
 PDF=PDF
 PDFDesc=Global options for PDF generation
+PDFOtherDesc=PDF Option specific to some modules
 PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Skrýt všechny informace týkající se daně z prodeje / DPH
 PDFRulesForSalesTax=Pravidla pro daň z prodeje / DPH
@@ -561,7 +562,7 @@ Module53Desc=Řízení služeb
 Module54Name=Smlouvy/Objednávky
 Module54Desc=Správa smluv (služby nebo opakované předplatné)
 Module55Name=Čárové kódy
-Module55Desc=Správa čárových kódů
+Module55Desc=Barcode or QR code management
 Module56Name=Platba převodem
 Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
 Module57Name=Payments by Direct Debit
@@ -848,10 +849,10 @@ Permission402=Vytvářejte/upravujte slevy
 Permission403=Ověřte slevy
 Permission404=Smazat slevy
 Permission430=Použijte ladicí panel
-Permission511=Read payments of salaries (yours and subordinates)
-Permission512=Vytvářejte/upravujte platby mezd
-Permission514=Odstranit platby mezd
-Permission517=Read payments of salaries of everybody
+Permission511=Read salaries and payments (yours and subordinates)
+Permission512=Create/modify salaries and payments
+Permission514=Delete salaries and payments
+Permission517=Read salaries and payments everybody
 Permission519=Export mezd
 Permission520=Přečtěte si půjčky
 Permission522=Vytvářejte/upravujte půjčky
@@ -965,6 +966,8 @@ Permission23003=Smazat naplánovanou úlohu
 Permission23004=Provést naplánovanou úlohu
 Permission50101=Use Point of Sale (SimplePOS)
 Permission50151=Use Point of Sale (TakePOS)
+Permission50152=Edit sales lines
+Permission50153=Edit ordered sales lines
 Permission50201=Přečíst transakce
 Permission50202=Import transakcí
 Permission50330=Read objects of Zapier
@@ -1039,11 +1042,12 @@ DictionaryMeasuringUnits=Měřící jednotky
 DictionarySocialNetworks=Sociální sítě
 DictionaryProspectStatus=Prospect status for companies
 DictionaryProspectContactStatus=Prospect status for contacts
-DictionaryHolidayTypes=Druhy dovolené
+DictionaryHolidayTypes=Leave - Types of leave
 DictionaryOpportunityStatus=Stav olova pro projekt / vedoucí
 DictionaryExpenseTaxCat=Zpráva o výdajích - Kategorie dopravy
 DictionaryExpenseTaxRange=Výkaz výdajů - Rozsah podle kategorie dopravy
 DictionaryTransportMode=Intracomm report - Transport mode
+DictionaryBatchStatus=Product lot/serial Quality Control status
 TypeOfUnit=Type of unit
 SetupSaved=Nastavení uloženo
 SetupNotSaved=Nastavení nebylo uloženo
@@ -1187,7 +1191,7 @@ SetupDescription4= <a href="%s"> %s -> %s </a> <br> <br> Tento software je sada
 SetupDescription5=Ostatní položky nabídky nastavení řídí volitelné parametry.
 AuditedSecurityEvents=Security events that are audited
 NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
-Audit=Audit
+Audit=Security events
 InfoDolibarr=o Dolibarr
 InfoBrowser=O prohlížeči
 InfoOS=o OS
@@ -1319,9 +1323,12 @@ ConditionIsCurrently=Podmínkou je v současné době %s
 YouUseBestDriver=Používáte ovladač %s, který je v současné době nejlepší ovladač.
 YouDoNotUseBestDriver=Používáte ovladač %s, ale doporučuje se ovladač %s.
 NbOfObjectIsLowerThanNoPb=V databázi máte pouze %s %s. To nevyžaduje žádnou zvláštní optimalizaci.
+ComboListOptim=Combo list loading optimization
 SearchOptim=Optimalizace pro vyhledávače
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
-YouHaveXObjectAndSearchOptimOn=Máte %s %s v databázi a konstanta %s je nastavena na 1 v Home-Setup-Other.
+YouHaveXObjectUseComboOptim=You have %s %s in the database. You can go into setup of module to enable loading of combo list on key pressed event.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other.
+YouHaveXObjectUseSearchOptimDesc=This limits the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to %s in Home-Setup-Other.
 BrowserIsOK=Používáte webový prohlížeč %s. Tento prohlížeč je v pořádku pro zabezpečení a výkon.
 BrowserIsKO=Používáte webový prohlížeč %s. Tento prohlížeč je znám jako špatná volba pro zabezpečení, výkon a spolehlivost. Doporučujeme používat prohlížeče Firefox, Chrome, Opera nebo Safari.
 PHPModuleLoaded=Je načtena komponenta PHP %s
@@ -1433,6 +1440,7 @@ MemberMainOptions=Hlavní volby
 AdherentLoginRequired= Správa Přihlášení pro každého člena
 AdherentMailRequired=K vytvoření nového člena je třeba e-mail
 MemberSendInformationByMailByDefault=Zaškrtávací políčko poslat mailem potvrzení členům (validace nebo nové předplatné) je ve výchozím nastavení
+MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
 VisitorCanChooseItsPaymentMode=Návštěvník si může vybrat z dostupných způsobů platby
 MEMBER_REMINDER_EMAIL=Povolit automatické připomenutí <b> e-mailem </b> vypršel odběr. Poznámka: Modul <strong> %s </strong> musí být povolen a správně nastaven pro odeslání připomenutí.
 MembersDocModules=Document templates for documents generated from member record
@@ -1763,7 +1771,7 @@ AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting men
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Povolit zvukové upozornění
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
-AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the scheduled job %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Zobrazit propojený objekt do zobrazení agendy
 ##### Clicktodial #####
 ClickToDialSetup=Klepněte na tlačítko Nastavení vytáčení modulu
@@ -1979,6 +1987,8 @@ MAIN_PDF_MARGIN_RIGHT=Pravý okraj v PDF
 MAIN_PDF_MARGIN_TOP=Nejvyšší okraj ve formátu PDF
 MAIN_PDF_MARGIN_BOTTOM=Dolní okraj v PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add picture on proposal line
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add electronic sign in PDF
 NothingToSetup=Pro tento modul není požadováno žádné zvláštní nastavení.
 SetToYesIfGroupIsComputationOfOtherGroups=Pokud je tato skupina výpočtem jiných skupin, nastavte to na ano
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
@@ -2096,7 +2106,6 @@ PDF_SHOW_PROJECT=Show project on document
 ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=Pokud chcete mít ve svém PDF duplikované texty ve 2 různých jazycích ve stejném generovaném PDF, musíte zde nastavit tento druhý jazyk, takže vygenerovaný PDF bude obsahovat 2 různé jazyky na stejné stránce, jeden vybraný při generování PDF a tento ( Podporuje to jen několik šablon PDF). Uchovávejte prázdné po dobu 1 jazyka na PDF.
 FafaIconSocialNetworksDesc=Sem zadejte kód ikony FontAwesome. Pokud nevíte, co je FontAwesome, můžete použít obecnou hodnotu fa-address-book.
-FeatureNotAvailableWithReceptionModule=Funkce není k dispozici, pokud je povolen příjem modulu
 RssNote=Poznámka: Každá definice zdroje RSS obsahuje widget, který musíte povolit, aby byl dostupný na hlavním panelu
 JumpToBoxes=Přejít na nastavení -> Widgety
 MeasuringUnitTypeDesc=Použijte zde hodnotu jako „velikost“, „povrch“, „objem“, „hmotnost“, „čas“
@@ -2120,12 +2129,18 @@ ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by
 MailToSendEventOrganization=Event Organization
 AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
 YouShouldDisablePHPFunctions=You should disable PHP functions
-IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands in custom code, you shoud disable PHP functions
+PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
+NotRecommended=Not recommanded
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
 ModuleUpdateAvailable=An update is available
 NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
+RandomlySelectedIfSeveral=Randomly selected if several pictures are available
+DatabasePasswordObfuscated=Database password is obfuscated in conf file
+DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
diff --git a/htdocs/langs/cs_CZ/agenda.lang b/htdocs/langs/cs_CZ/agenda.lang
index 15134263d8e..fe052feb4c8 100644
--- a/htdocs/langs/cs_CZ/agenda.lang
+++ b/htdocs/langs/cs_CZ/agenda.lang
@@ -4,7 +4,7 @@ Actions=Události
 Agenda=Agenda
 TMenuAgenda=Agenda
 Agendas=Agendy
-LocalAgenda=Interní kalendář
+LocalAgenda=Default calendar
 ActionsOwnedBy=Vlastnictví události
 ActionsOwnedByShort=Majitel
 AffectedTo=Přiřazeno
@@ -14,13 +14,13 @@ EventsNb=Počet událostí
 ListOfActions=Seznam událostí
 EventReports=Přehledy událostí
 Location=Umístění
-ToUserOfGroup=Událost přiřazená každému uživateli ve skupině
+ToUserOfGroup=Event assigned to any user in the group
 EventOnFullDay=Událost pro celý den (y)
 MenuToDoActions=Všechny neúplné události
 MenuDoneActions=Všechny ukončené události
 MenuToDoMyActions=Moje neúplné události
 MenuDoneMyActions=Moje ukončené události
-ListOfEvents=Výpis událostí (interní kalendář)
+ListOfEvents=List of events (default calendar)
 ActionsAskedBy=Nahlášené události
 ActionsToDoBy=Přiřazené události
 ActionsDoneBy=Provedené události
@@ -38,6 +38,7 @@ ActionsEvents=Události, pro které Dolibarr vytvoří akci v programu automatic
 EventRemindersByEmailNotEnabled=Připomenutí událostí e-mailem nebyla povolena do %snastavení modulu .
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Subjekt %s vytvořen
+COMPANY_MODIFYInDolibarr=Third party %s modified
 COMPANY_DELETEInDolibarr=Subjekt %s byl smazán
 ContractValidatedInDolibarr=Kontrakt %s ověřen
 CONTRACT_DELETEInDolibarr=Smlouva %s byla smazána
@@ -87,6 +88,7 @@ OrderDeleted=Příkaz odstraněn
 InvoiceDeleted=faktura smazána
 DraftInvoiceDeleted=Koncept faktury byl smazán
 CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_MODIFYInDolibarr=Contact %s modified
 CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Produkt %s byl vytvořen
 PRODUCT_MODIFYInDolibarr=Produkt %s byl upraven 
@@ -119,6 +121,7 @@ MRP_MO_UNVALIDATEInDolibarr=MO nastaveno do stavu konceptu
 MRP_MO_PRODUCEDInDolibarr=MO vyrobené
 MRP_MO_DELETEInDolibarr=MO smazáno
 MRP_MO_CANCELInDolibarr=MO zrušeno
+PAIDInDolibarr=%s paid
 ##### End agenda events #####
 AgendaModelModule=Šablony dokumentů pro události
 DateActionStart=Datum zahájení
@@ -130,7 +133,7 @@ AgendaUrlOptions4=<b> logint = %s</b> omezit výstup na akce přiřazené uživa
 AgendaUrlOptionsProject=<b> project = __ PROJECT_ID __ </b> pro omezení výstupu na akce spojené s projektem <b> __ PROJECT_ID __ </b>.
 AgendaUrlOptionsNotAutoEvent=<b> notactiontype = systemauto </b> pro vyloučení automatických událostí.
 AgendaUrlOptionsIncludeHolidays= <b> includeholidays = 1 </b> pro zahrnutí událostí svátků.
-AgendaShowBirthdayEvents=Zobrazit narozeniny kontaktů
+AgendaShowBirthdayEvents=Birthdays of contacts
 AgendaHideBirthdayEvents=Skrýt narozeniny kontaktů
 Busy=Zaneprázdněný
 ExportDataset_event1=Seznam agendy událostí
@@ -152,6 +155,7 @@ ActionType=Typ události
 DateActionBegin=Datum zahájení události
 ConfirmCloneEvent=Jste si jisti, že chcete naklonovat událost <b> %s </ b>?
 RepeatEvent=Opakujte akci
+OnceOnly=Once only
 EveryWeek=Každý týden
 EveryMonth=Každý měsíc
 DayOfMonth=Den v měsíci
@@ -165,4 +169,4 @@ TimeType=Duration type
 ReminderType=Callback type
 AddReminder=Create an automatic reminder notification for this event
 ErrorReminderActionCommCreation=Error creating the reminder notification for this event
-BrowserPush=Browser Notification
+BrowserPush=Browser Popup Notification
diff --git a/htdocs/langs/cs_CZ/bills.lang b/htdocs/langs/cs_CZ/bills.lang
index 672bea2161e..41b048f01e0 100644
--- a/htdocs/langs/cs_CZ/bills.lang
+++ b/htdocs/langs/cs_CZ/bills.lang
@@ -259,6 +259,7 @@ DateMaxPayment=Platba splatná dne
 DateInvoice=Fakturační datum
 DatePointOfTax=Bod daně
 NoInvoice=Žádná faktura
+NoOpenInvoice=No open invoice
 ClassifyBill=Klasifikovat fakturu
 SupplierBillsToPay=Neplacené faktury dodavatele
 CustomerBillsUnpaid=Nezaplacené faktury zákazníků
@@ -589,3 +590,4 @@ FacParentLine=Invoice Line Parent
 SituationTotalRayToRest=Remainder to pay without taxe
 PDFSituationTitle=Situation n° %d
 SituationTotalProgress=Total progress %d %%
+SearchUnpaidInvoicesWithDueDate=Search unpaid invoices with a due date = %s
diff --git a/htdocs/langs/cs_CZ/cashdesk.lang b/htdocs/langs/cs_CZ/cashdesk.lang
index fec119b5131..75c5d6e7806 100644
--- a/htdocs/langs/cs_CZ/cashdesk.lang
+++ b/htdocs/langs/cs_CZ/cashdesk.lang
@@ -102,7 +102,7 @@ CashDeskGenericMaskCodes6 =  <br> <b> {TN} </b> se používá k přidání čís
 TakeposGroupSameProduct=Seskupte stejné produktové řady
 StartAParallelSale=Zahajte nový paralelní prodej
 SaleStartedAt=Sale started at %s
-ControlCashOpening=Control cash popup at opening POS
+ControlCashOpening=Open the "Control cash" popup when opening the POS
 CloseCashFence=Close cash desk control
 CashReport=Hotovostní zpráva
 MainPrinterToUse=Hlavní tiskárna k použití
@@ -126,5 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
-ShowPriceHT = Display the price excluding tax column
-ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
+ShowPriceHT = Display the column with the price excluding tax (on screen)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
diff --git a/htdocs/langs/cs_CZ/compta.lang b/htdocs/langs/cs_CZ/compta.lang
index 7f762cef9a5..e96ef61bc7c 100644
--- a/htdocs/langs/cs_CZ/compta.lang
+++ b/htdocs/langs/cs_CZ/compta.lang
@@ -286,3 +286,9 @@ ReportPurchaseTurnover=Fakturovaný obrat z nákupu
 ReportPurchaseTurnoverCollected=Shromážděný obrat z nákupu
 IncludeVarpaysInResults = Zahrnout různé platby do přehledů
 IncludeLoansInResults = Zahrnout půjčky do zpráv
+InvoiceLate30Days = Invoices late > 30 days
+InvoiceLate15Days = Invoices late > 15 days
+InvoiceLateMinus15Days = Invoices late
+InvoiceNotLate = To be collected < 15 days
+InvoiceNotLate15Days = To be collected in 15 days
+InvoiceNotLate30Days = To be collected in 30 days
diff --git a/htdocs/langs/cs_CZ/cron.lang b/htdocs/langs/cs_CZ/cron.lang
index 2301936582d..c80ccf3a33b 100644
--- a/htdocs/langs/cs_CZ/cron.lang
+++ b/htdocs/langs/cs_CZ/cron.lang
@@ -60,7 +60,7 @@ CronErrEndDateStartDt=Datum ukončení nemůže být před datem zahájení
 StatusAtInstall=Stav při instalaci modulu
 CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Zakázat
-CronTaskInactive=Tato úloha je zakázána
+CronTaskInactive=This job is disabled (not scheduled)
 CronId=Id
 CronClassFile=Název souboru s třídou
 CronModuleHelp=Název adresáře modulu Dolibarr (také pracuje s externím modulem Dolibarr). <BR> Chcete-li volat například metodu načítání produktu Dolibarr Product /htdocs/<u>product</u>/class/product.class.php, je hodnota pro modul <br><i> produkt </i>
diff --git a/htdocs/langs/cs_CZ/errors.lang b/htdocs/langs/cs_CZ/errors.lang
index c2f0a89f984..ea6b6c3ebb9 100644
--- a/htdocs/langs/cs_CZ/errors.lang
+++ b/htdocs/langs/cs_CZ/errors.lang
@@ -11,6 +11,7 @@ ErrorBadValueForParamNotAString=Špatná hodnota parametru. Připojí se obecně
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Přihlášení %s již existuje.
 ErrorGroupAlreadyExists=Skupina %s již existuje.
+ErrorEmailAlreadyExists=Email %s already exists.
 ErrorRecordNotFound=Záznam není nalezen.
 ErrorFailToCopyFile=Nepodařilo se zkopírovat soubor '<b> %s</b>' do '<b> %s</b>'.
 ErrorFailToCopyDir=Nepodařilo se zkopírovat adresář „<b> %s </b>“ do „<b> %s </b>“.
@@ -117,7 +118,7 @@ ErrorCantReadFile=Nepodařilo se načíst soubor '%s'
 ErrorCantReadDir=Nepodařilo se načíst adresář '%s'
 ErrorBadLoginPassword=Nesprávná hodnota nebo heslo pro přihlášení. Zkuste to znovu a lépe ...
 ErrorLoginDisabled=Váš účet byl zablokován
-ErrorFailedToRunExternalCommand=Nepodařilo se spustit externí příkaz. Zkontrolujte, zda je k dispozici a spustítelný na serveru PHP. Pokud je zapnutý PHP <b> Bezpečný režim </b>, zkontrolujte, zda je příkaz uvnitř adresáře definovaného parametrem <b> safe_mode_exec_dir </b>.
+ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server user. Check also the command is not protected on shell level by a security layer like apparmor.
 ErrorFailedToChangePassword=Nepodařilo se změnit heslo
 ErrorLoginDoesNotExists=Uživatel s přihlášením <b>%s</b> nebyl nalezen.
 ErrorLoginHasNoEmail=Tento uživatel nemá žádnou e-mailovou adresu. Proces přerušen.
@@ -262,6 +263,7 @@ ErrorDateIsInFuture=Error, the date can't be in the future
 ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
 ErrorAPercentIsRequired=Error, please fill in the percentage correctly
 ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
+ErrorFailedToFindEmailTemplate=Failed to find template with code name %s
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Váš parametr PHP upload_max_filesize (%s) je vyšší než parametr PHP post_max_size (%s). Toto není konzistentní nastavení.
@@ -298,3 +300,4 @@ WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So y
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
+ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
diff --git a/htdocs/langs/cs_CZ/eventorganization.lang b/htdocs/langs/cs_CZ/eventorganization.lang
index 58001532280..e1e7aade295 100644
--- a/htdocs/langs/cs_CZ/eventorganization.lang
+++ b/htdocs/langs/cs_CZ/eventorganization.lang
@@ -1,4 +1,5 @@
 # Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+# Copyright (C) 2021		Dorian Vabre			<dorian.vabre@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
@@ -81,7 +82,10 @@ PriceOfBoothHelp=Subscription price to stand a booth
 EventOrganizationICSLink=Link ICS for events
 ConferenceOrBoothInformation=Conference Or Booth informations
 Attendees = Attendees
+DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
 #
 # Status
 #
@@ -94,8 +98,46 @@ EvntOrgCancelled = Cancelled
 #
 # Public page
 #
+SuggestForm = Suggestion page
+RegisterPage = Page for conferences or booth
+EvntOrgRegistrationHelpMessage = Here, you can vote for an event, or suggest a new conference or booth for the project
+EvntOrgRegistrationConfHelpMessage = Here, you can suggest a new conference for the project
+EvntOrgRegistrationBoothHelpMessage = Here, you can suggest a new booth for the project
+ListOfSuggestedConferences = List of suggested conferences
+ListOfSuggestedBooths = List of suggested booths
+SuggestConference = Suggest a new conference
+SuggestBooth = Suggest a booth
+ViewAndVote = View and vote for suggested events
 PublicAttendeeSubscriptionPage = Public link of registration to a conference
 MissingOrBadSecureKey = The security key is invalid or missing
-EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
-EvntOrgStartDuration = This conference starts on
-EvntOrgEndDuration =  and ends on
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference : '%s'
+EvntOrgDuration = This conference starts on %s and ends on %s.
+ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
+BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
+EventType = Typ události
+
+#
+# Vote page
+#
+EvntOrgRegistrationWelcomeMessage = Welcome on the conference or booth suggestion page.
+EvntOrgRegistrationConfWelcomeMessage = Welcome on the conference suggestion page.
+EvntOrgRegistrationBoothWelcomeMessage = Welcome on the booth suggestion page.
+EvntOrgVoteHelpMessage = Here, you can view and vote for the suggested events for the project
+VoteOk = Your vote has been accepted.
+AlreadyVoted = You have already voted for this event.
+VoteError = An error has occurred during the vote, please try again.
+
+#
+# SubscriptionOk page
+#
+SubscriptionOk = Your subscription to this conference has been validated
+#
+# Subscription validation mail
+#
+ConfAttendeeSubscriptionConfirmation = Confirmation of your subscription to a conference
+#
+# Payment page
+#
+Attendee = Attendee
+PaymentConferenceAttendee = Conference attendee payment
+PaymentBoothLocation = Booth location payment
diff --git a/htdocs/langs/cs_CZ/hrm.lang b/htdocs/langs/cs_CZ/hrm.lang
index d0850c4a89b..ca679bf3a68 100644
--- a/htdocs/langs/cs_CZ/hrm.lang
+++ b/htdocs/langs/cs_CZ/hrm.lang
@@ -9,7 +9,7 @@ ConfirmDeleteEstablishment=Opravdu chcete toto zařízení smazat?
 OpenEtablishment=Otevřít zařízení
 CloseEtablishment=Zavřít zařízení
 # Dictionary
-DictionaryPublicHolidays=HRM - státní svátky
+DictionaryPublicHolidays=Leave - Public holidays
 DictionaryDepartment=HRM - Seznam oddělení
 DictionaryFunction=HRM - Pracovní pozice
 # Module
diff --git a/htdocs/langs/cs_CZ/knowledgemanagement.lang b/htdocs/langs/cs_CZ/knowledgemanagement.lang
index 96771480aff..a2e2cc970fc 100644
--- a/htdocs/langs/cs_CZ/knowledgemanagement.lang
+++ b/htdocs/langs/cs_CZ/knowledgemanagement.lang
@@ -47,7 +47,7 @@ KnowledgeManagementArea = Knowledge Management
 # Menu
 #
 MenuKnowledgeRecord = Knowledge base
-ListOfArticles = List of articles
+ListKnowledgeRecord = List of articles
 NewKnowledgeRecord = New article
 ValidateReply = Validate solution
 KnowledgeRecords = Articles
diff --git a/htdocs/langs/cs_CZ/languages.lang b/htdocs/langs/cs_CZ/languages.lang
index 893180a35d7..8bbeef4a376 100644
--- a/htdocs/langs/cs_CZ/languages.lang
+++ b/htdocs/langs/cs_CZ/languages.lang
@@ -3,6 +3,7 @@ Language_am_ET=Etiopský
 Language_ar_AR=Arabština
 Language_ar_EG=Arabština (Egypt)
 Language_ar_SA=Arabština
+Language_ar_TN=Arabic (Tunisia)
 Language_az_AZ=Ázerbájdžán
 Language_bn_BD=Bengálština
 Language_bn_IN=Bengálština (Indie)
@@ -84,6 +85,7 @@ Language_nl_NL=holandský
 Language_pl_PL=Polsky
 Language_pt_BR=Portugalština (Brazílie)
 Language_pt_PT=Portugalština
+Language_ro_MD=Romanian (Moldavia)
 Language_ro_RO=Rumunština
 Language_ru_RU=Ruština
 Language_ru_UA=Ruština (Ukrajina)
diff --git a/htdocs/langs/cs_CZ/main.lang b/htdocs/langs/cs_CZ/main.lang
index 3b6831ed98e..0a5f48135c4 100644
--- a/htdocs/langs/cs_CZ/main.lang
+++ b/htdocs/langs/cs_CZ/main.lang
@@ -430,6 +430,7 @@ LT1IN=CGST
 LT2IN=SGST
 LT1GC=Doplňkové centy
 VATRate=Daňová sazba
+RateOfTaxN=Rate of tax %s
 VATCode=Daňový kód
 VATNPR=Daňová sazba NPR
 DefaultTaxRate=Výchozí daňová sazba
@@ -729,6 +730,7 @@ MenuMembers=Členové
 MenuAgendaGoogle=Google agenda
 MenuTaxesAndSpecialExpenses=Daně/Zvláštní výdaje
 ThisLimitIsDefinedInSetup=Dolibarr limit (menu Domů-nastavení-zabezpečení): %s Kb, PHP limit: %s Kb
+ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
 NoFileFound=No documents uploaded
 CurrentUserLanguage=Aktuální jazyk
 CurrentTheme=Aktuální téma
@@ -1072,6 +1074,7 @@ ValidFrom=Platnost od
 ValidUntil=v platnosti, dokud
 NoRecordedUsers=Žádní uživatelé
 ToClose=Zavřít
+ToRefuse=To refuse
 ToProcess=Ve zpracování
 ToApprove=Schválit
 GlobalOpenedElemView=Globální pohled
@@ -1126,9 +1129,11 @@ UpdateForAllLines=Update for all lines
 OnHold=Pozdržen
 Civility=Civility
 AffectTag=Affect Tag
+CreateExternalUser=Create external user
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
 ConfirmCancel=Are you sure you want to cancel
+EmailMsgID=Email MsgID
diff --git a/htdocs/langs/cs_CZ/members.lang b/htdocs/langs/cs_CZ/members.lang
index a7ea7850e86..758b06cd59f 100644
--- a/htdocs/langs/cs_CZ/members.lang
+++ b/htdocs/langs/cs_CZ/members.lang
@@ -213,3 +213,5 @@ SendReminderForExpiredSubscription=Odeslání připomenutí e-mailem členům p
 MembershipPaid=Členství zaplaceno za běžné období (do %s)
 YouMayFindYourInvoiceInThisEmail=Vaše faktura můžete připojit k tomuto e-mailu
 XMembersClosed=člen %s uzavřen(i)
+XExternalUserCreated=%s external user(s) created
+ForceMemberNature=Force member nature (Individual or Corporation)
diff --git a/htdocs/langs/cs_CZ/modulebuilder.lang b/htdocs/langs/cs_CZ/modulebuilder.lang
index cf77734a247..2766de27015 100644
--- a/htdocs/langs/cs_CZ/modulebuilder.lang
+++ b/htdocs/langs/cs_CZ/modulebuilder.lang
@@ -143,3 +143,4 @@ AsciiToHtmlConverter=Převodník ASCII na HTML
 AsciiToPdfConverter=Převodník ASCII na PDF
 TableNotEmptyDropCanceled=Tabulka není prázdná. Odstranění tabulky bylo zrušeno.
 ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
+ImportExportProfiles=Import and export profiles
diff --git a/htdocs/langs/cs_CZ/mrp.lang b/htdocs/langs/cs_CZ/mrp.lang
index e86ca5e8c48..948205b3887 100644
--- a/htdocs/langs/cs_CZ/mrp.lang
+++ b/htdocs/langs/cs_CZ/mrp.lang
@@ -8,12 +8,12 @@ MenuBOM=Kusovníky
 LatestBOMModified=Nejnovější %s Upravené kusovníky
 LatestMOModified=Poslední %s upravené výrobní příkazy
 Bom=Účty materiálu
-BillOfMaterials=Materiál
+BillOfMaterials=Bill of Materials
 BOMsSetup=Nastavení kusovníku modulu BOM
 ListOfBOMs=Seznam kusovníků - kusovník
 ListOfManufacturingOrders=Seznam výrobních objednávek
-NewBOM=Nový kusovník
-ProductBOMHelp=Produkt vytvořený pomocí tohoto kusovníku. <br> Poznámka: Produkty s vlastností 'Druh produktu' = 'Surovina' nejsou v tomto seznamu viditelné.
+NewBOM=New bill of materials
+ProductBOMHelp=Product to create (or disassemble) with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
 BOMsNumberingModules=Šablony číslování kusovníku
 BOMsModelModule=Šablony dokumentu kusovníku
 MOsNumberingModules=MO číslovací šablony
@@ -22,7 +22,7 @@ FreeLegalTextOnBOMs=Volný text na dokumentu z kusovníků BOM
 WatermarkOnDraftBOMs=Vodoznak na návrhu kusovníku
 FreeLegalTextOnMOs=Volný text na dokumentu MO
 WatermarkOnDraftMOs=Vodoznak na návrhu MO
-ConfirmCloneBillOfMaterials=Opravdu chcete klonovat kusovník %s?
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials %s ?
 ConfirmCloneMo=Opravdu chcete klonovat výrobní objednávku %s?
 ManufacturingEfficiency=Účinnost výroby
 ConsumptionEfficiency=Účinnost spotřeby
@@ -30,8 +30,8 @@ ValueOfMeansLoss=Hodnota 0,95 znamená průměrně ztrátu během výroby ve vý
 ValueOfMeansLossForProductProduced=Hodnota 0,95 znamená průměrně ztrátu vyrobeného produktu ve výši 5%%
 DeleteBillOfMaterials=Odstranit kusovník
 DeleteMo=Smazat výrobní zakázku
-ConfirmDeleteBillOfMaterials=Opravdu chcete smazat tento kusovník?
-ConfirmDeleteMo=Opravdu chcete smazat tento kusovník?
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Materials?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Materials?
 MenuMRP=Výrobní zakázky
 NewMO=Nová výrobní objednávka
 QtyToProduce=Množství k výrobě
@@ -39,7 +39,7 @@ DateStartPlannedMo=Datum zahájení je naplánováno
 DateEndPlannedMo=Datum ukončení je naplánováno
 KeepEmptyForAsap=Prázdný znamená „co nejdříve“
 EstimatedDuration=Odhadovaná doba trvání
-EstimatedDurationDesc=Předpokládaná doba výroby tohoto produktu pomocí tohoto kusovníku
+EstimatedDurationDesc=Estimated duration to manufacture (or disassemble) this product using this BOM
 ConfirmValidateBom=Opravdu chcete ověřit kusovník pomocí odkazu <strong> %s </strong> (budete jej moci použít k vytváření nových výrobních objednávek)
 ConfirmCloseBom=Opravdu chcete zrušit tento kusovník (už jej nebudete moci použít k vytváření nových výrobních objednávek)?
 ConfirmReopenBom=Opravdu chcete tento kusovník znovu otevřít (budete jej moci použít k vytváření nových výrobních objednávek)
@@ -63,13 +63,14 @@ ConsumeAndProduceAll=Spotřebujte a produkujte vše
 Manufactured=Vyrobeno
 TheProductXIsAlreadyTheProductToProduce=Produkt, který chcete přidat, je již produkt, který chcete vyrobit.
 ForAQuantityOf=Pro množství k výrobě %s
+ForAQuantityToConsumeOf=For a quantity to disassemble of %s
 ConfirmValidateMo=Opravdu chcete ověřit tuto výrobní objednávku?
 ConfirmProductionDesc=Kliknutím na '%s' potvrdíte spotřebu a / nebo výrobu pro nastavená množství. Tím se také aktualizuje pohyb zásob a zaznamenávají se pohyby zásob.
 ProductionForRef=Výroba %s
 AutoCloseMO=Pokud je dosaženo množství, které je třeba spotřebovat a vyrobit, uzavře se automaticky výrobní objednávka
 NoStockChangeOnServices=Žádná změna zásob u služeb
 ProductQtyToConsumeByMO=Množství produktu, které je třeba spotřebovat otevřeným MO
-ProductQtyToProduceByMO=Množství produktu, které je stále třeba vyrábět otevřeným MO
+ProductQtyToProduceByMO=Product quantity still to produce by open MO
 AddNewConsumeLines=Přidejte nový řádek ke spotřebě
 ProductsToConsume=Výrobky ke spotřebě
 ProductsToProduce=Výrobky k výrobě
@@ -83,15 +84,13 @@ Workstations=Workstations
 WorkstationsDescription=Workstations management
 WorkstationSetup = Workstations setup
 WorkstationSetupPage = Workstations setup page
-WorkstationAbout = About Workstation
-WorkstationAboutPage = Workstations about page
 WorkstationList=Workstation list
 WorkstationCreate=Add new workstation
 ConfirmEnableWorkstation=Are you sure you want to enable workstation <b>%s</b> ?
 EnableAWorkstation=Enable a workstation
 ConfirmDisableWorkstation=Are you sure you want to disable workstation <b>%s</b> ?
 DisableAWorkstation=Disable a workstation
-DeleteWorkstation=Supprimer
+DeleteWorkstation=Vymazat
 NbOperatorsRequired=Number of operators required
 THMOperatorEstimated=Estimated operator THM
 THMMachineEstimated=Estimated machine THM
diff --git a/htdocs/langs/cs_CZ/orders.lang b/htdocs/langs/cs_CZ/orders.lang
index 35998344515..e4e173ebc0f 100644
--- a/htdocs/langs/cs_CZ/orders.lang
+++ b/htdocs/langs/cs_CZ/orders.lang
@@ -11,6 +11,7 @@ OrderDate=Datum objednávky
 OrderDateShort=Datum objednávky
 OrderToProcess=Objednávka ve zpracování
 NewOrder=Nová objednávka
+NewSupplierOrderShort=Nová objednávka
 NewOrderSupplier=Nová objednávka
 ToOrder=Udělat objednávku
 MakeOrder=Udělat objednávku
@@ -73,6 +74,7 @@ DeleteOrder=Smazat objednávku
 CancelOrder=Zrušení objednávky
 OrderReopened= Objednávka%s znovu otevřena
 AddOrder=Vytvořit objednávku
+AddSupplierOrderShort=Vytvořit objednávku
 AddPurchaseOrder=Vytvořte objednávku
 AddToDraftOrders=Přidat k návrhu objednávky
 ShowOrder=Zobrazit objednávku
diff --git a/htdocs/langs/cs_CZ/other.lang b/htdocs/langs/cs_CZ/other.lang
index f91dbd2a103..5fdddc15b1f 100644
--- a/htdocs/langs/cs_CZ/other.lang
+++ b/htdocs/langs/cs_CZ/other.lang
@@ -129,6 +129,7 @@ ClosedByLogin=Přihlášený uživatel, který uzavřel
 FileWasRemoved=Soubor %s byl odstraněn
 DirWasRemoved=Adresář %s byl odstraněn
 FeatureNotYetAvailable=Funkce zatím není k dispozici v aktuální verzi
+FeatureNotAvailableOnDevicesWithoutMouse=Feature not available on devices without mouse
 FeaturesSupported=Podporované funkce
 Width=Šířka
 Height=Výška
@@ -263,7 +264,7 @@ ContactCreatedByEmailCollector=Kontakt/adresa vytvořená sběratelem e-mailů z
 ProjectCreatedByEmailCollector=Projekt vytvořený sběratelem e-mailů z e-mailu MSGID %s
 TicketCreatedByEmailCollector=Lístek vytvořený sběratelem e-mailů z e-mailu MSGID %s
 OpeningHoursFormatDesc=Pomocí a - oddělte otevírací a zavírací dobu. <br> Pomocí mezery zadejte různé rozsahy. <br> Příklad: 8-12 14-18
-PrefixSession=Prefix for session ID
+SuffixSessionName=Suffix for session name
 
 ##### Export #####
 ExportsArea=Exportní plocha
diff --git a/htdocs/langs/cs_CZ/partnership.lang b/htdocs/langs/cs_CZ/partnership.lang
index 0ff8af34c49..55dfa1d391a 100644
--- a/htdocs/langs/cs_CZ/partnership.lang
+++ b/htdocs/langs/cs_CZ/partnership.lang
@@ -16,41 +16,72 @@
 #
 # Generic
 #
-ModulePartnershipName = Partnership management
-PartnershipDescription = Module Partnership management
+ModulePartnershipName=Partnership management
+PartnershipDescription=Module Partnership management
 PartnershipDescriptionLong= Module Partnership management
 
+AddPartnership=Add partnership
+CancelPartnershipForExpiredMembers=Partnership: Cancel partnership of members with expired subscriptions
+PartnershipCheckBacklink=Partnership: Check referring backlink
+
 #
 # Menu
 #
-NewPartnership = New Partnership
-ListOfPartnerships = List of partnership
+NewPartnership=New Partnership
+ListOfPartnerships=List of partnership
 
 #
 # Admin page
 #
-PartnershipSetup = Partnership setup
-PartnershipAbout = About Partnership
-PartnershipAboutPage = Partnership about page
-
+PartnershipSetup=Partnership setup
+PartnershipAbout=About Partnership
+PartnershipAboutPage=Partnership about page
+partnershipforthirdpartyormember=Partner status must be set on a 'thirdparty' or a 'member'
+PARTNERSHIP_IS_MANAGED_FOR=Partnership managed for
+PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks to check
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb of days before cancelling status of a partnership when a subscription has expired
+ReferingWebsiteCheck=Check of website referring
+ReferingWebsiteCheckDesc=You can enable a feature to check that your partners has added a backlink to your website domains on their own website.
 
 #
 # Object
 #
+DeletePartnership=Delete a partnership
+PartnershipDedicatedToThisThirdParty=Partnership dedicated to this third party
+PartnershipDedicatedToThisMember=Partnership dedicated to this member
 DatePartnershipStart=Datum zahájení
 DatePartnershipEnd=Datum ukončení
+ReasonDecline=Decline reason
+ReasonDeclineOrCancel=Decline reason
+PartnershipAlreadyExist=Partnership already exist
+ManagePartnership=Manage partnership
+BacklinkNotFoundOnPartnerWebsite=Backlink not found on partner website
+ConfirmClosePartnershipAsk=Are you sure you want to cancel this partnership?
+PartnershipType=Partnership type
 
 #
 # Template Mail
 #
+SendingEmailOnPartnershipWillSoonBeCanceled=Partnership will soon be canceled
+SendingEmailOnPartnershipRefused=Partnership refused
+SendingEmailOnPartnershipAccepted=Partnership accepted
+SendingEmailOnPartnershipCanceled=Partnership canceled
 
+YourPartnershipWillSoonBeCanceledTopic=Partnership will soon be canceled
+YourPartnershipRefusedTopic=Partnership refused
+YourPartnershipAcceptedTopic=Partnership accepted
+YourPartnershipCanceledTopic=Partnership canceled
+
+YourPartnershipWillSoonBeCanceledContent=We inform you that your partnership will soon be canceled (Backlink not found)
+YourPartnershipRefusedContent=We inform you that your partnership request has been refused.
+YourPartnershipAcceptedContent=We inform you that your partnership request has been accepted.
+YourPartnershipCanceledContent=We inform you that your partnership has been canceled.
 
 #
 # Status
 #
-PartnershipDraft = Návrh
-PartnershipAccepted = Přijato
-PartnershipRefused = Odmítnuto
-PartnershipCanceled = Zrušený
-
+PartnershipDraft=Návrh
+PartnershipAccepted=Přijato
+PartnershipRefused=Odmítnuto
+PartnershipCanceled=Zrušený
 PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/cs_CZ/productbatch.lang b/htdocs/langs/cs_CZ/productbatch.lang
index a4586e8af00..4c8a725536a 100644
--- a/htdocs/langs/cs_CZ/productbatch.lang
+++ b/htdocs/langs/cs_CZ/productbatch.lang
@@ -1,4 +1,4 @@
-# ProductBATCH language file - en_US - ProductBATCH
+# ProductBATCH language file - Source file is en_US - ProductBATCH
 ManageLotSerial=Používat šarži/sériové číslo
 ProductStatusOnBatch=Yes (lot required)
 ProductStatusOnSerial=Yes (unique serial number required)
@@ -33,3 +33,13 @@ CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+LifeTime=Life span (in days)
+EndOfLife=End of life
+ManufacturingDate=Manufacturing date
+DestructionDate=Destruction date
+FirstUseDate=First use date
+QCFrequency=Quality control frequency (in days)
+
+#Traceability - qc status
+OutOfOrder=Out of order
+InWorkingOrder=In working order
diff --git a/htdocs/langs/cs_CZ/products.lang b/htdocs/langs/cs_CZ/products.lang
index 839eed4f24b..89184f2e345 100644
--- a/htdocs/langs/cs_CZ/products.lang
+++ b/htdocs/langs/cs_CZ/products.lang
@@ -396,3 +396,5 @@ ActionAvailableOnVariantProductOnly=Akce je k dispozici pouze u varianty výrobk
 ProductsPricePerCustomer=Ceny produktů na zákazníky
 ProductSupplierExtraFields=Další atributy (dodavatelské ceny)
 DeleteLinkedProduct=Odstraňte podřízený produkt spojený s kombinací
+PMPValue=Vážená průměrná cena
+PMPValueShort=WAP
diff --git a/htdocs/langs/cs_CZ/projects.lang b/htdocs/langs/cs_CZ/projects.lang
index 77c780d4c63..3d357dcbcc9 100644
--- a/htdocs/langs/cs_CZ/projects.lang
+++ b/htdocs/langs/cs_CZ/projects.lang
@@ -267,9 +267,11 @@ InvoiceToUse=Návrh faktury k použití
 NewInvoice=Nová faktura
 OneLinePerTask=Jeden řádek na úkol
 OneLinePerPeriod=Jeden řádek za období
+OneLinePerTimeSpentLine=One line for each time spent declaration
 RefTaskParent=Ref. Nadřazený úkol
 ProfitIsCalculatedWith=Zisk se vypočítá pomocí
 AddPersonToTask=Add also to tasks
 UsageOrganizeEvent=Usage: Event Organization
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
+SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
diff --git a/htdocs/langs/cs_CZ/receptions.lang b/htdocs/langs/cs_CZ/receptions.lang
index f5217377215..01f8844a682 100644
--- a/htdocs/langs/cs_CZ/receptions.lang
+++ b/htdocs/langs/cs_CZ/receptions.lang
@@ -44,4 +44,4 @@ ValidateOrderFirstBeforeReception=Nejprve musíte potvrdit objednávku, než bud
 ReceptionsNumberingModules=Modul číslování pro recepce
 ReceptionsReceiptModel=Šablony dokumentů pro recepce
 NoMorePredefinedProductToDispatch=Žádné další předdefinované produkty k odeslání
-
+ReceptionExist=A reception exists
diff --git a/htdocs/langs/cs_CZ/stocks.lang b/htdocs/langs/cs_CZ/stocks.lang
index 22b0bf30b75..5586158d9cd 100644
--- a/htdocs/langs/cs_CZ/stocks.lang
+++ b/htdocs/langs/cs_CZ/stocks.lang
@@ -56,8 +56,6 @@ UnitPurchaseValue=Jednotková kupní cena
 StockTooLow=Stav skladu je nízký
 StockLowerThanLimit=Zásoby nižší než limit upozornění (%s)
 EnhancedValue=Hodnota
-PMPValue=Vážená průměrná cena
-PMPValueShort=WAP
 EnhancedValueOfWarehouses=Hodnota skladů
 UserWarehouseAutoCreate=Vytvoření uživatelského skladu automaticky při vytváření uživatele
 AllowAddLimitStockByWarehouse=Spravujte také hodnotu pro minimální a požadovanou zásobu na párování (produktový sklad) kromě hodnoty pro minimální a požadovanou zásobu na produkt
@@ -251,7 +249,10 @@ SelectAStockMovementFileToImport=select a stock movement file to import
 InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
 LabelOfInventoryMovemement=Inventory %s
 ReOpen=Znovu otevřeno
-ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock to the real qty you entered into the inventory.
 ObjectNotFound=%s not found
 MakeMovementsAndClose=Generate movements and close
 AutofillWithExpected=Fill real quantity with expected quantity
+ShowAllBatchByDefault=By default, show batch details on product "stock" tab
+CollapseBatchDetailHelp=You can set batch detail default display in stocks module configuration
+FieldCannotBeNegative=Field "%s" cannot be negative
diff --git a/htdocs/langs/cs_CZ/ticket.lang b/htdocs/langs/cs_CZ/ticket.lang
index a09633b9355..69f40d1c0ac 100644
--- a/htdocs/langs/cs_CZ/ticket.lang
+++ b/htdocs/langs/cs_CZ/ticket.lang
@@ -304,7 +304,7 @@ BoxLastModifiedTicket=Poslední změněné vstupenky
 BoxLastModifiedTicketDescription=Poslední %s změněné vstupenky
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=Žádné poslední změněné vstupenky
-BoxTicketType=Number of open tickets by type
+BoxTicketType=Distribution of open tickets by type
 BoxTicketSeverity=Number of open tickets by severity
 BoxNoTicketSeverity=No tickets opened
 BoxTicketLastXDays=Number of new tickets by days the last %s days
diff --git a/htdocs/langs/da_DK/accountancy.lang b/htdocs/langs/da_DK/accountancy.lang
index 68b09a3cca3..374c373fffe 100644
--- a/htdocs/langs/da_DK/accountancy.lang
+++ b/htdocs/langs/da_DK/accountancy.lang
@@ -158,7 +158,7 @@ ACCOUNTING_LENGTH_AACCOUNT=Længde på tredjeparts regnskabskonti (Hvis du indst
 ACCOUNTING_MANAGE_ZERO=Tillad at administrere forskellige antal nuller i slutningen af en regnskabskonto. Nødvendigt af nogle lande (som Schweiz). Hvis den er slået til (standard), kan du indstille følgende to parametre til at bede applikationen om at tilføje virtuelle nuller.
 BANK_DISABLE_DIRECT_INPUT=Deaktiver direkte registrering af transaktionen på bankkonto
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Aktivér udkast til eksport på Journal
-ACCOUNTANCY_COMBO_FOR_AUX=Aktivér kombinationsliste for subsidiær konto (kan være langsom, hvis du har en masse tredjeparter)
+ACCOUNTANCY_COMBO_FOR_AUX=Aktivér kombinationsliste for datterselskabskonto (kan være langsom, hvis du har mange tredjeparter, bryder evnen til at søge på en del af værdien)
 ACCOUNTING_DATE_START_BINDING=Definer en dato for start af binding og overførsel i regnskab. Under denne dato overføres transaktionerne ikke til regnskab.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Ved regnskabsoverførsel skal du vælge periode som standard
 
@@ -328,6 +328,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Deaktiver binding og overførsel i regns
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Deaktiver binding og overførsel i regnskab på udgiftsrapporter (udgiftsrapporter tages ikke med i regnskabet)
 
 ## Export
+NotifiedExportDate=Meddelt eksportdato (ændring af posterne er ikke mulig)
+NotifiedValidationDate=Validering af posterne (ændring eller sletning af posterne er ikke mulig)
+ConfirmExportFile=Bekræftelse af genereringen af den regnskabsmæssige eksportfil?
 ExportDraftJournal=Eksporter udkast til kladde
 Modelcsv=Eksportmodel
 Selectmodelcsv=Vælg en eksportmodel
diff --git a/htdocs/langs/da_DK/admin.lang b/htdocs/langs/da_DK/admin.lang
index 26e47e4ad78..060f9b2a504 100644
--- a/htdocs/langs/da_DK/admin.lang
+++ b/htdocs/langs/da_DK/admin.lang
@@ -221,8 +221,8 @@ NotCompatible=Dette modul virker ikke kompatibelt med din Dolibarr %s (Min %s -
 CompatibleAfterUpdate=Dette modul kræver en opdatering til din Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=Se på markedspladsen
 SeeSetupOfModule=Se opsætning af modul%s
+SetOptionTo=Indstil option <b> %s </b> til %s
 Updated=Opdater
-Nouveauté=Nyhed
 AchatTelechargement=Køb / Download
 GoModuleSetupArea=For at implementere / installere et nyt modul skal du gå til modulopsætningsområdet: <a href="%s"> %s </a>.
 DoliStoreDesc=DoliStore den officielle markedsplads for Dolibarr ERP / CRM eksterne moduler
@@ -399,6 +399,7 @@ SecurityToken=Nøglen til sikker URL'er
 NoSmsEngine=Ingen SMS afsender manager tilgængelig. En SMS-afsender manager er ikke installeret med standardfordelingen, fordi de afhænger af en ekstern leverandør, men du kan finde nogle på %s
 PDF=PDF
 PDFDesc=Globale muligheder for PDF generation
+PDFOtherDesc=PDF-option, der er specifik for nogle moduler
 PDFAddressForging=Regler for adresse sektion
 HideAnyVATInformationOnPDF=Skjul alle oplysninger relateret til salgsafgift / moms
 PDFRulesForSalesTax=Regler for salgs moms
@@ -561,7 +562,7 @@ Module53Desc=Forvaltning af tjenester
 Module54Name=Contracts/Subscriptions
 Module54Desc=Forvaltning af kontrakter (tjenester eller tilbagevendende abonnementer)
 Module55Name=Stregkoder
-Module55Desc=Stregkoder administration
+Module55Desc=Stregkode- eller QR-kodeadministration
 Module56Name=Betaling med kreditoverførsel
 Module56Desc=Styring af betaling af leverandører via ordrer med kreditoverførsel. Det inkluderer generering af SEPA-fil til europæiske lande.
 Module57Name=Betalinger med Direct Debit
@@ -848,10 +849,10 @@ Permission402=Opret/rediger rabatter
 Permission403=Bekræft rabatter
 Permission404=Slet rabatter
 Permission430=Brug Debug Bar
-Permission511=Læs lønudbetalinger (dine og underordnede)
-Permission512=Opret / modificer lønudbetalinger
-Permission514=Slet betaling af lønninger
-Permission517=Læs alle lønninger
+Permission511=Læs lønninger og betalinger (dine og underordnede)
+Permission512=Opret / rediger lønninger og betalinger
+Permission514=Slet lønninger og betalinger
+Permission517=Læs lønninger og betalinger Alle sammen 
 Permission519=Eksportlønninger
 Permission520=Læs lån
 Permission522=Opret / modificer lån
@@ -965,6 +966,8 @@ Permission23003=Delete Scheduled job
 Permission23004=Execute Scheduled job
 Permission50101=Brug salgssted (SimplePOS)
 Permission50151=Brug salgssted (TakePOS)
+Permission50152=Rediger salgslinjer
+Permission50153=Rediger bestilte salgslinjer
 Permission50201=Læs transaktioner
 Permission50202=Import transaktioner
 Permission50330=Læs genstande fra Zapier
@@ -1039,11 +1042,12 @@ DictionaryMeasuringUnits=Måleenheder
 DictionarySocialNetworks=Sociale netværk
 DictionaryProspectStatus=Prospektstatus for virksomheder
 DictionaryProspectContactStatus=Prospektstatus for kontakter
-DictionaryHolidayTypes=Typer af orlov
+DictionaryHolidayTypes=Permission - Typer af orlov
 DictionaryOpportunityStatus=Ledestatus for projekt / bly
 DictionaryExpenseTaxCat=Udgiftsrapport - Transportkategorier
 DictionaryExpenseTaxRange=Omkostningsrapport - Område efter transportkategori
 DictionaryTransportMode=Intracomm rapport - Transporttilstand
+DictionaryBatchStatus=Produktparti / seriel kvalitetskontrolstatus
 TypeOfUnit=Type af enhed
 SetupSaved=Opsætning gemt
 SetupNotSaved=Opsætning er ikke gemt
@@ -1187,7 +1191,7 @@ SetupDescription4=<a href="%s">%s->%s</a><br><br> Denne software er en pakke med
 SetupDescription5=Andre opsætningsmenuindgange styrer valgfrie parametre.
 AuditedSecurityEvents=Sikkerhedshændelser, der revideres
 NoSecurityEventsAreAduited=Ingen sikkerhedshændelser revideres. Du kan aktivere dem fra menu %s
-Audit=Audit
+Audit=Sikkerhedsbegivenheder
 InfoDolibarr=Om Dolibarr
 InfoBrowser=Om Browser
 InfoOS=Om OS
@@ -1319,9 +1323,12 @@ ConditionIsCurrently=Tilstanden er i øjeblikket %s
 YouUseBestDriver=Du bruger driver %s, som er den bedste driver, der for øjeblikket er tilgængelig.
 YouDoNotUseBestDriver=Du bruger driveren %s, men driveren %s anbefales.
 NbOfObjectIsLowerThanNoPb=Du har kun %s %s i databasen. Dette kræver ingen særlig optimering.
+ComboListOptim=Optimering af kombinationslisteindlæsning
 SearchOptim=Søg optimering
-YouHaveXObjectUseSearchOptim=Du har %s %s i databasen. Du kan tilføje konstanten %s til 1 i Hjem-Setup-Andre. Begræns søgningen til begyndelsen af strenge, som gør det muligt for databasen at bruge indekser, og du skal få et øjeblikkeligt svar.
-YouHaveXObjectAndSearchOptimOn=Du har %s %s i databasen, og konstant %s er indstillet til 1 i Home-Setup-Other.
+YouHaveXObjectUseComboOptim=Du har %s %s i databasen. Du kan gå ind i opsætningen af modulet for at aktivere indlæsning af kombinationslisten ved en tastetrykket begivenhed.
+YouHaveXObjectUseSearchOptim=Du har %s %s i databasen. Du kan tilføje konstanten %s til 1 i Home-Setup-Other.
+YouHaveXObjectUseSearchOptimDesc=Dette begrænser søgningen til begyndelsen af strenge, hvilket gør det muligt for databasen at bruge indekser, og du skal få et øjeblikkeligt svar.
+YouHaveXObjectAndSearchOptimOn=Du har %s %s i databasen, og konstant %s er indstillet til %s i Home-Setup-Other.
 BrowserIsOK=Du bruger browseren %s. Denne browser er ok for sikkerhed og ydeevne.
 BrowserIsKO=Du bruger browseren %s. Denne browser er kendt for at være et dårligt valg for sikkerhed, ydeevne og pålidelighed. Vi anbefaler at bruge Firefox, Chrome, Opera eller Safari.
 PHPModuleLoaded=PHP-komponent %s indlæses
@@ -1433,6 +1440,7 @@ MemberMainOptions=Standardmuligheder
 AdherentLoginRequired= Administrere et login for hvert medlem
 AdherentMailRequired=Email er påkrævet for at oprette et nyt medlem
 MemberSendInformationByMailByDefault=Checkbox til at sende mail bekræftelse til medlemmerne er slået til som standard
+MemberCreateAnExternalUserForSubscriptionValidated=Opret et eksternt brugerlogin for hvert valideret nyt medlemsabonnement
 VisitorCanChooseItsPaymentMode=Besøgende kan vælge mellem tilgængelige betalingsformer
 MEMBER_REMINDER_EMAIL=Aktivér automatisk påmindelse <b> via e-mail </b> af udløbne abonnementer. Bemærk: Modul <strong> %s </strong> skal være aktiveret og korrekt konfigureret til at sende påmindelser.
 MembersDocModules=Dokumentskabeloner til dokumenter genereret fra medlemsregistrering
@@ -1763,7 +1771,7 @@ AGENDA_DEFAULT_VIEW=Hvilken visning vil du åbne som standard, når du vælger m
 AGENDA_REMINDER_BROWSER=Aktivér påmindelse om begivenhed <b> i brugerens browser </b> (Når påmindelsesdato er nået, vises en popup af browseren. Hver bruger kan deaktivere sådanne underretninger fra sin browseropsætning).
 AGENDA_REMINDER_BROWSER_SOUND=Aktivér lydmeddelelse
 AGENDA_REMINDER_EMAIL=Aktiver påmindelse om begivenhed <b> via e-mails </b> (påmindelsesmulighed / forsinkelse kan defineres for hver begivenhed).
-AGENDA_REMINDER_EMAIL_NOTE=Bemærk: Frekvensen af opgaven %s skal være tilstrækkelig til at være sikker på, at påmindelsen sendes på det rigtige tidspunkt.
+AGENDA_REMINDER_EMAIL_NOTE=Bemærk: Hyppigheden af det planlagte job %s skal være tilstrækkelig til at være sikker på, at påmindelsen sendes på det rigtige tidspunkt.
 AGENDA_SHOW_LINKED_OBJECT=Vis linkede objekter i tidsplanvisning
 ##### Clicktodial #####
 ClickToDialSetup=Opsætning af Klik-for-at-ringe-modulet
@@ -1979,6 +1987,8 @@ MAIN_PDF_MARGIN_RIGHT=Højre margin på PDF
 MAIN_PDF_MARGIN_TOP=Top margin på PDF
 MAIN_PDF_MARGIN_BOTTOM=Bundmargen på PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Højde for logo på PDF
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Tilføj billede på forslagslinjen
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Tilføj elektronisk login i PDF
 NothingToSetup=Der kræves ingen specifik opsætning for dette modul.
 SetToYesIfGroupIsComputationOfOtherGroups=Indstil dette til ja, hvis denne gruppe er en beregning af andre grupper
 EnterCalculationRuleIfPreviousFieldIsYes=Indtast beregningsregel, hvis det forrige felt blev indstillet til Ja. <br> For eksempel: <br> CODEGRP1 + CODEGRP2
@@ -2096,7 +2106,6 @@ PDF_SHOW_PROJECT=Vis projekt på dokument
 ShowProjectLabel=Projektmærke
 PDF_USE_ALSO_LANGUAGE_CODE=Hvis du vil have nogle tekster i din PDF kopieret på 2 forskellige sprog i den samme genererede PDF, skal du indstille her dette andet sprog, så genereret PDF indeholder 2 forskellige sprog på samme side, det, der er valgt, når du genererer PDF og denne ( kun få PDF-skabeloner understøtter dette). Hold tomt i 1 sprog pr. PDF.
 FafaIconSocialNetworksDesc=Indtast her koden for et FontAwesome-ikon. Hvis du ikke ved, hvad der er FontAwesome, kan du bruge den generiske værdi fa-adressebog.
-FeatureNotAvailableWithReceptionModule=Funktion ikke tilgængelig, når modulmodtagelse er aktiveret
 RssNote=Bemærk: Hver RSS-feed-definition indeholder en widget, som du skal aktivere for at have den tilgængelig i instrumentbrættet\n 
 JumpToBoxes=Gå til Opsætning -> Widgets
 MeasuringUnitTypeDesc=Brug her en værdi som "størrelse", "overflade", "volumen", "vægt", "tid"
@@ -2120,12 +2129,18 @@ ConfFileIsReadableOrWritableByAnyUsers=Conf-filen kan læses eller skrives af al
 MailToSendEventOrganization=Begivenhedsorganisation
 AGENDA_EVENT_DEFAULT_STATUS=Standardhændelsesstatus, når du opretter en begivenhed fra formularen
 YouShouldDisablePHPFunctions=Du skal deaktivere PHP-funktioner
-IfCLINotRequiredYouShouldDisablePHPFunctions=Bortset fra hvis du har brug for at køre systemkommandoer (for modulet Planlagt job eller for at køre den eksterne kommandolinje for eksempel Anti-virus), skal du deaktivere PHP-funktioner
+IfCLINotRequiredYouShouldDisablePHPFunctions=Bortset fra hvis du har brug for at køre systemkommandoer i brugerdefineret kode, skal du deaktivere PHP-funktioner
+PHPFunctionsRequiredForCLI=Til shell-formål (som planlagt jobbackup eller kørsel af et anitivurs-program) skal du beholde PHP-funktioner
 NoWritableFilesFoundIntoRootDir=Ingen skrivbare filer eller mapper til de almindelige programmer blev fundet i din rodkatalog (God)
 RecommendedValueIs=Anbefalet: %s
+NotRecommended=Ikke anbefalet
 ARestrictedPath=En begrænset sti
 CheckForModuleUpdate=Se efter opdateringer til eksterne moduler
 CheckForModuleUpdateHelp=Denne handling opretter forbindelse til redaktører for eksterne moduler for at kontrollere, om en ny version er tilgængelig.
 ModuleUpdateAvailable=En opdatering er tilgængelig
 NoExternalModuleWithUpdate=Ingen opdateringer fundet for eksterne moduler
 SwaggerDescriptionFile=Swagger API beskrivelsesfil (f.eks. Til brug med redoc)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=Du aktiverede forældet WS API. Du skal bruge REST API i stedet.
+RandomlySelectedIfSeveral=Valgt tilfældigt, hvis der er flere billeder tilgængelige
+DatabasePasswordObfuscated=Databaseadgangskode er tilsløret i conf-fil
+DatabasePasswordNotObfuscated=Databaseadgangskode er IKKE tilsløret i conf-fil
diff --git a/htdocs/langs/da_DK/agenda.lang b/htdocs/langs/da_DK/agenda.lang
index e9673610b68..0964034b793 100644
--- a/htdocs/langs/da_DK/agenda.lang
+++ b/htdocs/langs/da_DK/agenda.lang
@@ -4,7 +4,7 @@ Actions=Begivenheder
 Agenda=Tidsplan
 TMenuAgenda=Tidsplan
 Agendas=Tidsplaner
-LocalAgenda=Intern kalender
+LocalAgenda=Standardkalender
 ActionsOwnedBy=Begivenhed ejes af
 ActionsOwnedByShort=Ejer
 AffectedTo=Tildelt til
@@ -20,7 +20,7 @@ MenuToDoActions=Alle udestående
 MenuDoneActions=Alle gennemførte
 MenuToDoMyActions=Mine udestående
 MenuDoneMyActions=Mine gennemførte
-ListOfEvents=Oversigt over begivenheder (intern kalender)
+ListOfEvents=Liste over begivenheder (standardkalender)
 ActionsAskedBy=Begivenheder anmodet af
 ActionsToDoBy=Begivenheder tildelt til
 ActionsDoneBy=Begivenheder udført af
@@ -38,6 +38,7 @@ ActionsEvents=Begivenheder, for hvilke Dolibarr vil skabe en indsats på dagsord
 EventRemindersByEmailNotEnabled=Hændelsesindkaldelser via e-mail blev ikke aktiveret til %s modulopsætning.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Tredjepart %s oprettet
+COMPANY_MODIFYInDolibarr=Tredjeparts %s ændret
 COMPANY_DELETEInDolibarr=Tredjepart %s slettet
 ContractValidatedInDolibarr=Kontrakt %s bekræftet
 CONTRACT_DELETEInDolibarr=Kontrakt %s slettet
@@ -86,8 +87,9 @@ ProposalDeleted=Forslag slettet
 OrderDeleted=Ordre slettet
 InvoiceDeleted=Faktura slettet
 DraftInvoiceDeleted=Udkast til faktura slettet
-CONTACT_CREATEInDolibarr=Contact %s created
-CONTACT_DELETEInDolibarr=Contact %s deleted
+CONTACT_CREATEInDolibarr=Kontakt %s oprettet
+CONTACT_MODIFYInDolibarr=Kontakt %s ændret
+CONTACT_DELETEInDolibarr=Kontakt %s slettet
 PRODUCT_CREATEInDolibarr=Vare %s oprettet
 PRODUCT_MODIFYInDolibarr=Vare %s ændret
 PRODUCT_DELETEInDolibarr=Vare %s slettet
@@ -119,6 +121,7 @@ MRP_MO_UNVALIDATEInDolibarr=MO indstillet til statusudkast
 MRP_MO_PRODUCEDInDolibarr=MO produceret
 MRP_MO_DELETEInDolibarr=MO slettet
 MRP_MO_CANCELInDolibarr=MO annulleret
+PAIDInDolibarr=%s betalt
 ##### End agenda events #####
 AgendaModelModule=Skabeloner for dokument til begivenhed
 DateActionStart=Startdato
@@ -130,7 +133,7 @@ AgendaUrlOptions4=<b> logind = %s </b> for at begrænse uddata til handlinger ti
 AgendaUrlOptionsProject=<b>projekt = __ PROJECT_ID __ </b> for at begrænse output til handlinger, der er knyttet til projektet <b> __ PROJECT_ID __ </b>.
 AgendaUrlOptionsNotAutoEvent=<b> notactiontype = systemauto </ b> for at udelukke automatiske begivenheder.
 AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> for at inkludere helligdagsbegivenheder.
-AgendaShowBirthdayEvents=Vis fødselsdage på kontakter
+AgendaShowBirthdayEvents=Fødselsdage for kontakter
 AgendaHideBirthdayEvents=Skjul fødselsdage på kontakter
 Busy=Travl
 ExportDataset_event1=Liste over begivenheder
@@ -152,6 +155,7 @@ ActionType=Begivenhedstype
 DateActionBegin=Startdato for begivenhed
 ConfirmCloneEvent=Er du sikker på, du vil klone begivenheden <b>%s</b>?
 RepeatEvent=Begivenhed med gentagelse
+OnceOnly=kun Én gang
 EveryWeek=Hver uge
 EveryMonth=Hver måned
 DayOfMonth=Dag i måneden
@@ -160,9 +164,9 @@ DateStartPlusOne=Dato start + 1 time
 SetAllEventsToTodo=Indstil alle begivenheder til at gøre
 SetAllEventsToInProgress=Indstil alle begivenheder til at være i gang
 SetAllEventsToFinished=Indstil alle begivenheder til færdige
-ReminderTime=Reminder period before the event
-TimeType=Duration type
-ReminderType=Callback type
-AddReminder=Create an automatic reminder notification for this event
-ErrorReminderActionCommCreation=Error creating the reminder notification for this event
-BrowserPush=Browser Notification
+ReminderTime=Påmindelsesperiode før begivenheden
+TimeType=Varighedstype
+ReminderType=Tilbagekaldelsestype
+AddReminder=Opret en automatisk påmindelsesmeddelelse om denne begivenhed
+ErrorReminderActionCommCreation=Fejl ved oprettelse af påmindelsesmeddelelsen for denne begivenhed
+BrowserPush=Browser pop op meddelelse
diff --git a/htdocs/langs/da_DK/bills.lang b/htdocs/langs/da_DK/bills.lang
index e872d359fb4..2bfafeffe86 100644
--- a/htdocs/langs/da_DK/bills.lang
+++ b/htdocs/langs/da_DK/bills.lang
@@ -259,6 +259,7 @@ DateMaxPayment=Betaling forfalder den
 DateInvoice=Fakturadato
 DatePointOfTax=Momsbetaling
 NoInvoice=Ingen faktura
+NoOpenInvoice=Ingen åben faktura
 ClassifyBill=Klassificere faktura
 SupplierBillsToPay=Ubetalte leverandørfakturaer
 CustomerBillsUnpaid=Ubetalte kundefakturaer
@@ -589,3 +590,4 @@ FacParentLine=Faktura Line Parent
 SituationTotalRayToRest=Resten til at betale uden skat
 PDFSituationTitle=Situation nr. %d
 SituationTotalProgress=Samlet fremskridt %d %%
+SearchUnpaidInvoicesWithDueDate=Søg efter ubetalte fakturaer med en forfaldsdato = %s
diff --git a/htdocs/langs/da_DK/cashdesk.lang b/htdocs/langs/da_DK/cashdesk.lang
index b98662769f3..d8b9c57f74d 100644
--- a/htdocs/langs/da_DK/cashdesk.lang
+++ b/htdocs/langs/da_DK/cashdesk.lang
@@ -102,7 +102,7 @@ CashDeskGenericMaskCodes6 = <br><b>{TN}</b>  tag bruges til at tilføje terminal
 TakeposGroupSameProduct=Grupper sammen produktlinjer
 StartAParallelSale=Start et nyt parallelt salg
 SaleStartedAt=Salget startede den %s
-ControlCashOpening=Kontroller kontant beholdning ved åbning af POS
+ControlCashOpening=Åbn popup-menuen "Kontroller kontanter", når du åbner POS
 CloseCashFence=Luk kontrol af kasseapparatet 
 CashReport=Kontantrapport
 MainPrinterToUse=Fortrukket printer til brug
@@ -126,5 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Modul kvitterings printer skal først være ak
 AllowDelayedPayment=Tillad forsinket betaling
 PrintPaymentMethodOnReceipts=Udskriv betalingsmetode på billetter | kvitteringer
 WeighingScale=Vægt skala 
-ShowPriceHT = Vis prisen ekskl. Moms kolonne
-ShowPriceHTOnReceipt = Vis prisen ekskl. Moms kolonne ved modtagelse
+ShowPriceHT = Vis kolonnen med prisen ekskl. Moms (på skærmen)
+ShowPriceHTOnReceipt = Vis kolonnen med prisen ekskl. Moms (ved modtagelse)
diff --git a/htdocs/langs/da_DK/compta.lang b/htdocs/langs/da_DK/compta.lang
index 7081be57c87..2ee8df8a17f 100644
--- a/htdocs/langs/da_DK/compta.lang
+++ b/htdocs/langs/da_DK/compta.lang
@@ -286,3 +286,9 @@ ReportPurchaseTurnover=Faktureret køb af omsætning
 ReportPurchaseTurnoverCollected=Køb af omsætning samlet
 IncludeVarpaysInResults = Medtag forskellige betalinger i rapporter
 IncludeLoansInResults = Inkluder lån i rapporter
+InvoiceLate30Days = Fakturaer sent> 30 dage
+InvoiceLate15Days = Fakturaer sent> 15 dage
+InvoiceLateMinus15Days = Fakturaer sent
+InvoiceNotLate = Samles <15 dage
+InvoiceNotLate15Days = Samles om 15 dage
+InvoiceNotLate30Days = Samles inden for 30 dage
diff --git a/htdocs/langs/da_DK/cron.lang b/htdocs/langs/da_DK/cron.lang
index ed3fbc88478..2be612cb99e 100644
--- a/htdocs/langs/da_DK/cron.lang
+++ b/htdocs/langs/da_DK/cron.lang
@@ -60,7 +60,7 @@ CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status ved modul installation
 CronStatusActiveBtn=Tidsplan
 CronStatusInactiveBtn=Deaktivere
-CronTaskInactive=This job is disabled
+CronTaskInactive=Dette job er deaktiveret (ikke planlagt)
 CronId=Id
 CronClassFile=Filename with class
 CronModuleHelp=Navn på Dolibarr modul bibliotek (også arbejde med ekstern Dolibarr modul). <BR> For eksempel for at kalde hentningsmetoden for Dolibarr Product-objektet /htdocs/<u>product</u>/class/product.class.php, er værdien for modulet <i> produkt </i>
diff --git a/htdocs/langs/da_DK/errors.lang b/htdocs/langs/da_DK/errors.lang
index f11082e0071..e91ac6ea87f 100644
--- a/htdocs/langs/da_DK/errors.lang
+++ b/htdocs/langs/da_DK/errors.lang
@@ -11,6 +11,7 @@ ErrorBadValueForParamNotAString=Bad value for your parameter. It appends general
 ErrorRefAlreadyExists=Reference <b> %s </b> findes allerede.
 ErrorLoginAlreadyExists=Log ind %s eksisterer allerede.
 ErrorGroupAlreadyExists=Gruppe %s eksisterer allerede.
+ErrorEmailAlreadyExists=E-mail %s findes allerede.
 ErrorRecordNotFound=Optag ikke fundet.
 ErrorFailToCopyFile=Kunne ikke kopiere filen <b>&quot;%s&quot;</b> til <b>&quot;%s&quot;.</b>
 ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
@@ -117,7 +118,7 @@ ErrorCantReadFile=Kunne ikke læse filen ' %s'
 ErrorCantReadDir=Kunne ikke læse directory ' %s'
 ErrorBadLoginPassword=Bad værdi for brugernavn eller password
 ErrorLoginDisabled=Din konto er blevet deaktiveret
-ErrorFailedToRunExternalCommand=Det lykkedes ikke at køre eksterne kommando. Check den er tilgængelig og runnable af din PHP server. Hvis PHP <b>Safe Mode</b> er aktiveret, skal du kontrollere, at kommandoen er inde i en mappe defineret ved parameter <b>safe_mode_exec_dir.</b>
+ErrorFailedToRunExternalCommand=Kunne ikke køre ekstern kommando. Kontroller, at den er tilgængelig og kan køres af din PHP-serverbruger. Kontroller også, at kommandoen ikke er beskyttet på shell-niveau af et sikkerhedslag som apparmor.
 ErrorFailedToChangePassword=Det lykkedes ikke at ændre password
 ErrorLoginDoesNotExists=Bruger med <b>login %s</b> kunne ikke findes.
 ErrorLoginHasNoEmail=Denne bruger har ingen e-mail-adresse. Processen afbrydes.
@@ -262,6 +263,7 @@ ErrorDateIsInFuture=Fejl, datoen kan ikke være i fremtiden
 ErrorAnAmountWithoutTaxIsRequired=Fejl, beløb er obligatorisk
 ErrorAPercentIsRequired=Fejl, udfyld venligst procentdelen korrekt
 ErrorYouMustFirstSetupYourChartOfAccount=Du skal først konfigurere din kontoplan
+ErrorFailedToFindEmailTemplate=Kunne ikke finde skabelon med kodenavn %s
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Din PHP-parameter upload_max_filesize (%s) er højere end PHP-parameter post_max_size (%s). Dette er ikke en ensartet opsætning.
@@ -298,3 +300,4 @@ WarningModuleXDisabledSoYouMayMissEventHere=Modul %s er ikke aktiveret. Så du g
 ErrorActionCommPropertyUserowneridNotDefined=Brugerens ejer kræves
 ErrorActionCommBadType=Den valgte hændelsestype (id: %n, kode: %s) findes ikke i begivenhedstypeordbogen
 CheckVersionFail=Versionskontrol mislykkedes
+ErrorWrongFileName=Filens navn kan ikke indeholde __SOMETHING__
diff --git a/htdocs/langs/da_DK/eventorganization.lang b/htdocs/langs/da_DK/eventorganization.lang
index 6ff7187c82a..c3c40ad2289 100644
--- a/htdocs/langs/da_DK/eventorganization.lang
+++ b/htdocs/langs/da_DK/eventorganization.lang
@@ -1,4 +1,5 @@
 # Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+# Copyright (C) 2021		Dorian Vabre			<dorian.vabre@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
@@ -81,7 +82,10 @@ PriceOfBoothHelp=Abonnementspris for at stå en kabine
 EventOrganizationICSLink=Link ICS til begivenheder
 ConferenceOrBoothInformation=Oplysninger om konference eller stand
 Attendees = Deltagere
+DownloadICSLink = Download ICS-link
 EVENTORGANIZATION_SECUREKEY = Sikker nøgle til linket til offentlig registrering til en konference
+SERVICE_BOOTH_LOCATION = Service, der bruges til fakturarække om en standplacering
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service, der bruges til fakturarække om et deltagerabonnement på en konference
 #
 # Status
 #
@@ -94,8 +98,46 @@ EvntOrgCancelled = Annulleret
 #
 # Public page
 #
+SuggestForm = Forslagsside
+RegisterPage = Side til konferencer eller stand
+EvntOrgRegistrationHelpMessage = Her kan du stemme på et arrangement eller foreslå en ny konference eller stand til projektet
+EvntOrgRegistrationConfHelpMessage = Her kan du foreslå en ny konference til projektet
+EvntOrgRegistrationBoothHelpMessage = Her kan du foreslå en ny stand til projektet
+ListOfSuggestedConferences = Liste over foreslåede konferencer
+ListOfSuggestedBooths = Liste over foreslåede stand
+SuggestConference = Foreslå en ny konference
+SuggestBooth = Foreslå en kabine
+ViewAndVote = Se og stem på foreslåede begivenheder
 PublicAttendeeSubscriptionPage = Offentlig link til registrering til en konference
 MissingOrBadSecureKey = Sikkerhedsnøglen er ugyldig eller mangler
-EvntOrgWelcomeMessage = Denne formular giver dig mulighed for at registrere dig som en ny deltager i konferencen
-EvntOrgStartDuration = Denne konference starter den
-EvntOrgEndDuration =  og slutter på
+EvntOrgWelcomeMessage = Denne formular giver dig mulighed for at registrere dig som en ny deltager til konferencen: '%s'
+EvntOrgDuration = Denne konference starter på %s og slutter på %s.
+ConferenceAttendeeFee = Konferencedeltagergebyr for begivenheden: '%s', der forekommer fra %s til %s.
+BoothLocationFee = Standplacering for begivenheden: '%s' der forekommer fra %s til %s
+EventType = Begivenhedstype
+
+#
+# Vote page
+#
+EvntOrgRegistrationWelcomeMessage = Velkommen til konferencesiden eller messesiden.
+EvntOrgRegistrationConfWelcomeMessage = Velkommen til konferencesiden.
+EvntOrgRegistrationBoothWelcomeMessage = Velkommen til siden med forslag til stand.
+EvntOrgVoteHelpMessage = Her kan du se og stemme på de foreslåede begivenheder for projektet
+VoteOk = Din stemme er blevet accepteret.
+AlreadyVoted = Du har allerede stemt på denne begivenhed.
+VoteError = Der opstod en fejl under afstemningen. Prøv igen.
+
+#
+# SubscriptionOk page
+#
+SubscriptionOk = Dit abonnement på denne konference er valideret
+#
+# Subscription validation mail
+#
+ConfAttendeeSubscriptionConfirmation = Bekræftelse af dit abonnement på en konference
+#
+# Payment page
+#
+Attendee = Deltager
+PaymentConferenceAttendee = Konference deltager betaling
+PaymentBoothLocation = Betaling af standplacering
diff --git a/htdocs/langs/da_DK/hrm.lang b/htdocs/langs/da_DK/hrm.lang
index 123e22908c8..22d7110d8ac 100644
--- a/htdocs/langs/da_DK/hrm.lang
+++ b/htdocs/langs/da_DK/hrm.lang
@@ -9,7 +9,7 @@ ConfirmDeleteEstablishment=Er du sikker på, at du ønsker at slette denne virks
 OpenEtablishment=Åbent oprettelse
 CloseEtablishment=Luk etablissement
 # Dictionary
-DictionaryPublicHolidays=HRM - helligdage
+DictionaryPublicHolidays=Forlad - Offentlig Helligdage
 DictionaryDepartment=HRM - Afdelingsliste
 DictionaryFunction=HRM - Job stillinger
 # Module
diff --git a/htdocs/langs/da_DK/knowledgemanagement.lang b/htdocs/langs/da_DK/knowledgemanagement.lang
index 418c89381ce..fbd9de8b1ee 100644
--- a/htdocs/langs/da_DK/knowledgemanagement.lang
+++ b/htdocs/langs/da_DK/knowledgemanagement.lang
@@ -47,7 +47,7 @@ KnowledgeManagementArea = Videnshåndtering
 # Menu
 #
 MenuKnowledgeRecord = Videnbase
-ListOfArticles = Liste over artikler
+ListKnowledgeRecord = Liste over artikler
 NewKnowledgeRecord = Ny artikel
 ValidateReply = Valider løsning
 KnowledgeRecords = Artikler
diff --git a/htdocs/langs/da_DK/languages.lang b/htdocs/langs/da_DK/languages.lang
index e0b80a8963a..bf7456b4cfd 100644
--- a/htdocs/langs/da_DK/languages.lang
+++ b/htdocs/langs/da_DK/languages.lang
@@ -3,6 +3,7 @@ Language_am_ET=etiopiske
 Language_ar_AR=Arabisk
 Language_ar_EG=Arabisk (Egypten)
 Language_ar_SA=Arabisk
+Language_ar_TN=Arabisk (Tunesien)
 Language_az_AZ=Aserbajdsjansk
 Language_bn_BD=Bengali
 Language_bn_IN=Bengali (Indien)
@@ -84,6 +85,7 @@ Language_nl_NL=Hollandske
 Language_pl_PL=Polsk
 Language_pt_BR=Portugisisk (Brasilien)
 Language_pt_PT=Portugisisk
+Language_ro_MD=Rumænsk (Moldavien)
 Language_ro_RO=Rumænsk
 Language_ru_RU=Russisk
 Language_ru_UA=Russisk (Ukraine)
diff --git a/htdocs/langs/da_DK/main.lang b/htdocs/langs/da_DK/main.lang
index 1413f52e528..59e838a08b0 100644
--- a/htdocs/langs/da_DK/main.lang
+++ b/htdocs/langs/da_DK/main.lang
@@ -430,6 +430,7 @@ LT1IN=CGST
 LT2IN=SGST
 LT1GC=Tillægscent
 VATRate=Momssats
+RateOfTaxN=Skattesats %s
 VATCode=Moms kode
 VATNPR=Moms NPR
 DefaultTaxRate=Standards Moms sats
@@ -729,6 +730,7 @@ MenuMembers=Medlemmer
 MenuAgendaGoogle=Google dagsorden
 MenuTaxesAndSpecialExpenses=Skatter | Særlige udgifter
 ThisLimitIsDefinedInSetup=Dolibarr grænse (Menu hjemme-setup-sikkerhed): %s Kb, PHP grænse: %s Kb
+ThisLimitIsDefinedInSetupAt=Dolibarr-begrænnings (Menu %s): %s Kb, PHP-grænse (Param %s): %s Kb
 NoFileFound=Ingen dokumenter uploadet
 CurrentUserLanguage=Valgt sprog
 CurrentTheme=Nuværende tema
@@ -1072,6 +1074,7 @@ ValidFrom=Gældende fra
 ValidUntil=Gyldig indtil
 NoRecordedUsers=Ingen brugere
 ToClose=At lukke
+ToRefuse=At nægte
 ToProcess=At behandle
 ToApprove=At godkende
 GlobalOpenedElemView=Globalt overblik
@@ -1126,9 +1129,11 @@ UpdateForAllLines=Opdatering til alle linjer
 OnHold=I venteposition
 Civility=Høflighed
 AffectTag=Påvirke tags
+CreateExternalUser=Opret ekstern bruger
 ConfirmAffectTag=Bulk Tags påvirker
 ConfirmAffectTagQuestion=Er du sikker på, at du vil påvirke tags til den %s valgte post (er)?
 CategTypeNotFound=Ingen tag-type fundet for typen af poster
 CopiedToClipboard=Kopieret til udklipsholderen
 InformationOnLinkToContract=Dette beløb er kun summen af alle linjer i kontrakten. Der tages ikke hensyn til tid.
 ConfirmCancel=Er du sikker på at du vil annullere
+EmailMsgID=E-mail MsgID
diff --git a/htdocs/langs/da_DK/members.lang b/htdocs/langs/da_DK/members.lang
index 219ed492d1c..b2b8dbdf751 100644
--- a/htdocs/langs/da_DK/members.lang
+++ b/htdocs/langs/da_DK/members.lang
@@ -213,3 +213,5 @@ SendReminderForExpiredSubscription=Send påmindelse via e-mail til medlemmer, n
 MembershipPaid=Medlemskab betalt for indeværende periode (indtil %s)
 YouMayFindYourInvoiceInThisEmail=Du kan muligvis finde din faktura knyttet til denne e-mail
 XMembersClosed=%s medlem(er) låst
+XExternalUserCreated=%s oprettet ekstern(e) bruger(e)
+ForceMemberNature=Tving medlemmernes natur (enkeltperson eller selskab)
diff --git a/htdocs/langs/da_DK/modulebuilder.lang b/htdocs/langs/da_DK/modulebuilder.lang
index 71377d17d5f..b22de684c63 100644
--- a/htdocs/langs/da_DK/modulebuilder.lang
+++ b/htdocs/langs/da_DK/modulebuilder.lang
@@ -143,3 +143,4 @@ AsciiToHtmlConverter=Ascii til HTML-konverter
 AsciiToPdfConverter=Ascii til PDF konverter
 TableNotEmptyDropCanceled=Tabellen er ikke tom. Drop er annulleret.
 ModuleBuilderNotAllowed=Modulbyggeren er tilgængelig, men ikke tilladt for din bruger.
+ImportExportProfiles=Import og eksport af profiler
diff --git a/htdocs/langs/da_DK/mrp.lang b/htdocs/langs/da_DK/mrp.lang
index 22f0fc4aa08..c2deac5096e 100644
--- a/htdocs/langs/da_DK/mrp.lang
+++ b/htdocs/langs/da_DK/mrp.lang
@@ -8,12 +8,12 @@ MenuBOM=Stofregninger
 LatestBOMModified=Seneste %s Regninger med materialer ændret
 LatestMOModified=Seneste %s Produktionsordrer ændret
 Bom=Stofregninger
-BillOfMaterials=Materiale regning
+BillOfMaterials=regning på Stykliste
 BOMsSetup=Opsætning af modul BOM
 ListOfBOMs=Liste over regninger med materiale - BOM
 ListOfManufacturingOrders=Liste over produktionsordrer
-NewBOM=Ny regning med materiale
-ProductBOMHelp=Produkt, der skal oprettes med denne BOM. <br> Bemærk: Produkter med egenskaben 'Produktets art' = 'Råmateriale' er ikke synlige på denne liste.
+NewBOM=Ny regning på stykliste
+ProductBOMHelp=Produkt, der skal oprettes (eller skilles ad) med denne stykliste. <br> Bemærk: Produkter med egenskaben 'Produktets art' = 'Råmateriale' er ikke synlige på denne liste.
 BOMsNumberingModules=BOM-nummereringsskabeloner
 BOMsModelModule=BOM-dokumentskabeloner
 MOsNumberingModules=MO-nummereringsskabeloner
@@ -22,7 +22,7 @@ FreeLegalTextOnBOMs=Gratis tekst på dokument fra BOM
 WatermarkOnDraftBOMs=Vandmærke ved udkast til BOM
 FreeLegalTextOnMOs=Gratis tekst på MO's dokument
 WatermarkOnDraftMOs=Vandmærke ved udkast til MO
-ConfirmCloneBillOfMaterials=Er du sikker på, at du vil klone regningen med materiale %s?
+ConfirmCloneBillOfMaterials=Er du sikker på, at du vil klone styklisten %s?
 ConfirmCloneMo=Er du sikker på, at du vil klone produktionsordren %s?
 ManufacturingEfficiency=Fremstillingseffektivitet
 ConsumptionEfficiency=Forbrugseffektivitet
@@ -30,8 +30,8 @@ ValueOfMeansLoss=Værdi på 0,95 betyder et gennemsnit på 5%% tab under produkt
 ValueOfMeansLossForProductProduced=Værdi på 0,95 betyder et gennemsnit på 5%% tab af produceret produkt
 DeleteBillOfMaterials=Slet regning af materialer
 DeleteMo=Slet produktionsordre
-ConfirmDeleteBillOfMaterials=Er du sikker på, at du vil slette denne Bill of Material?
-ConfirmDeleteMo=Er du sikker på, at du vil slette denne Bill of Material?
+ConfirmDeleteBillOfMaterials=Er du sikker på, at du vil slette denne stykliste?
+ConfirmDeleteMo=Er du sikker på, at du vil slette denne stykliste?
 MenuMRP=Fremstillingsordrer
 NewMO=Ny fremstillingsordre
 QtyToProduce=Antal at fremstille
@@ -39,7 +39,7 @@ DateStartPlannedMo=Dato start planlagt
 DateEndPlannedMo=Dato slutning planlagt
 KeepEmptyForAsap=Tom betyder 'Så snart som muligt'
 EstimatedDuration=Estimeret varighed
-EstimatedDurationDesc=Anslået varighed til fremstilling af dette produkt ved hjælp af denne BOM
+EstimatedDurationDesc=Anslået varighed for at fremstille (eller adskille) dette produkt ved hjælp af denne stykliste
 ConfirmValidateBom=Er du sikker på, at du vil validere BOM med referencen <strong> %s </strong> (du vil være i stand til at bruge den til at oprette nye produktionsordrer)
 ConfirmCloseBom=Er du sikker på, at du vil annullere denne BOM (du vil ikke være i stand til at bruge den til at oprette nye produktionsordrer mere)?
 ConfirmReopenBom=Er du sikker på, at du vil åbne denne BOM igen (du vil kunne bruge den til at oprette nye produktionsordrer)
@@ -63,13 +63,14 @@ ConsumeAndProduceAll=Forbruge og fremstille alt
 Manufactured=fremstillet
 TheProductXIsAlreadyTheProductToProduce=Produktet, der skal tilføjes, er allerede det produkt, der skal produceres.
 ForAQuantityOf=For en mængde til at fremstille af%s
+ForAQuantityToConsumeOf=For en mængde at adskille af %s
 ConfirmValidateMo=Er du sikker på, at du vil validere denne produktionsordre?
 ConfirmProductionDesc=Ved at klikke på '%s', validerer du forbrug og / eller produktion for de angivne mængder. Dette vil også opdatere lagerbeholdningen og registrere bestandsbevægelser.
 ProductionForRef=Produktion af %s
 AutoCloseMO=Luk automatisk fabrikationsordren, hvis der er nået mængder, der skal forbruges og produceres
 NoStockChangeOnServices=Ingen lagerændring på tjenester
 ProductQtyToConsumeByMO=Produktmængde, der stadig skal forbruges af åben MO
-ProductQtyToProduceByMO=Produktmængde, der stadig skal produceres af åben MO
+ProductQtyToProduceByMO=Produktmængde, der stadig produceres af åben MO
 AddNewConsumeLines=Tilføj ny linje til at forbruge
 ProductsToConsume=Produkter til at forbruge
 ProductsToProduce=Produkter til at producere
@@ -83,15 +84,13 @@ Workstations=Arbejdsstationer
 WorkstationsDescription=Arbejdsstationsadministration
 WorkstationSetup = Opsætning af arbejdsstationer
 WorkstationSetupPage = Opsætningsside for arbejdsstationer
-WorkstationAbout = Om arbejdsstation
-WorkstationAboutPage = Arbejdsstationer om side
 WorkstationList=Arbejdsstationsliste
 WorkstationCreate=Tilføj ny arbejdsstation
 ConfirmEnableWorkstation=Er du sikker på, at du vil aktivere arbejdsstation <b> %s </b>?
 EnableAWorkstation=Aktivér en arbejdsstation
 ConfirmDisableWorkstation=Er du sikker på, at du vil deaktivere arbejdsstationen <b> %s </b>?
 DisableAWorkstation=Deaktiver en arbejdsstation
-DeleteWorkstation=Fjerne
+DeleteWorkstation=Slet
 NbOperatorsRequired=Antal krævede operatører
 THMOperatorEstimated=Anslået operatør THM
 THMMachineEstimated=Anslået maskine THM
diff --git a/htdocs/langs/da_DK/orders.lang b/htdocs/langs/da_DK/orders.lang
index cfef002cb41..6b66b2342a5 100644
--- a/htdocs/langs/da_DK/orders.lang
+++ b/htdocs/langs/da_DK/orders.lang
@@ -11,6 +11,7 @@ OrderDate=Ordredato
 OrderDateShort=Bestil dato
 OrderToProcess=Ordre at behandle
 NewOrder=Ny ordre
+NewSupplierOrderShort=Ny ordre
 NewOrderSupplier=Ny indkøbsordre
 ToOrder=Lav ordre
 MakeOrder=Lav ordre
@@ -73,6 +74,7 @@ DeleteOrder=Slet orden
 CancelOrder=Annuller ordre
 OrderReopened= Bestil %s genåbne
 AddOrder=Opret ordre
+AddSupplierOrderShort=Opret ordre
 AddPurchaseOrder=Opret indkøbsordre
 AddToDraftOrders=Tilføj til udkast til ordre
 ShowOrder=Vis for
diff --git a/htdocs/langs/da_DK/other.lang b/htdocs/langs/da_DK/other.lang
index c13324952c4..557b05e072d 100644
--- a/htdocs/langs/da_DK/other.lang
+++ b/htdocs/langs/da_DK/other.lang
@@ -129,6 +129,7 @@ ClosedByLogin=Bruger login som lukket
 FileWasRemoved=Fil blev slettet
 DirWasRemoved=Directory blev fjernet
 FeatureNotYetAvailable=Funktionen er endnu ikke tilgængelig i den aktuelle version
+FeatureNotAvailableOnDevicesWithoutMouse=Funktionen er ikke tilgængelig på enheder uden mus
 FeaturesSupported=Understøttede funktioner
 Width=Bredde
 Height=Højde
@@ -263,7 +264,7 @@ ContactCreatedByEmailCollector=Kontakt / adresse skabt via e-mail indsamler fra
 ProjectCreatedByEmailCollector=Projekt skabt via e-mail indsamler fra mail MSGID %s
 TicketCreatedByEmailCollector=Billet skabt via e-mail indsamler fra mail MSGID %s
 OpeningHoursFormatDesc=Brug et - til separat åbning og lukning timer. <br> brug en mellemrum"Space" til at indtaste forskellige område. <br> Eksempel: 8-12 14-18
-PrefixSession=Præfiks til session-id
+SuffixSessionName=Suffiks til sessionens navn
 
 ##### Export #####
 ExportsArea=Eksport område
diff --git a/htdocs/langs/da_DK/partnership.lang b/htdocs/langs/da_DK/partnership.lang
index 89c2f36d572..358e2ab28aa 100644
--- a/htdocs/langs/da_DK/partnership.lang
+++ b/htdocs/langs/da_DK/partnership.lang
@@ -16,41 +16,72 @@
 #
 # Generic
 #
-ModulePartnershipName = Partnerskabsledelse
-PartnershipDescription = Ledelse af modulpartnerskab
+ModulePartnershipName=Partnerskabsledelse
+PartnershipDescription=Ledelse af modulpartnerskab
 PartnershipDescriptionLong= Ledelse af modulpartnerskab
 
+AddPartnership=Tilføj partnerskab
+CancelPartnershipForExpiredMembers=Partnerskab: Annuller partnerskab med medlemmer med udløbne abonnementer
+PartnershipCheckBacklink=Partnerskab: Tjek henvisende backlink
+
 #
 # Menu
 #
-NewPartnership = Nyt partnerskab
-ListOfPartnerships = Liste over partnerskab
+NewPartnership=Nyt partnerskab
+ListOfPartnerships=Liste over partnerskab
 
 #
 # Admin page
 #
-PartnershipSetup = Partnerskabsopsætning
-PartnershipAbout = Om partnerskab
-PartnershipAboutPage = Partnerskab om side
-
+PartnershipSetup=Partnerskabsopsætning
+PartnershipAbout=Om partnerskab
+PartnershipAboutPage=Partnerskab om side
+partnershipforthirdpartyormember=Partnerstatus skal indstilles på en 'tredjepart' eller et 'medlem'
+PARTNERSHIP_IS_MANAGED_FOR=Partnerskab administreret for
+PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks til kontrol
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Antal dage før annullering af status for et partnerskab, når et abonnement er udløbet
+ReferingWebsiteCheck=Kontrol af webstedets henvisning
+ReferingWebsiteCheckDesc=Du kan aktivere en funktion til at kontrollere, at dine partnere har tilføjet et backlink til dine webstedsdomæner på deres eget websted.
 
 #
 # Object
 #
+DeletePartnership=Slet et partnerskab
+PartnershipDedicatedToThisThirdParty=Partnerskab dedikeret til denne tredjepart
+PartnershipDedicatedToThisMember=Partnerskab dedikeret til dette medlem
 DatePartnershipStart=Startdato
 DatePartnershipEnd=Slutdato
+ReasonDecline=Afvis grund
+ReasonDeclineOrCancel=Afvis grund
+PartnershipAlreadyExist=Partnerskab eksisterer allerede
+ManagePartnership=Administrer partnerskab
+BacklinkNotFoundOnPartnerWebsite=Backlink ikke fundet på partnerwebstedet
+ConfirmClosePartnershipAsk=Er du sikker på, at du vil annullere dette partnerskab?
+PartnershipType=Partnerskabstype
 
 #
 # Template Mail
 #
+SendingEmailOnPartnershipWillSoonBeCanceled=Partnerskabet vil snart blive annulleret
+SendingEmailOnPartnershipRefused=Partnerskab afvist
+SendingEmailOnPartnershipAccepted=Partnerskab accepteret
+SendingEmailOnPartnershipCanceled=Partnerskab annulleret
 
+YourPartnershipWillSoonBeCanceledTopic=Partnerskabet vil snart blive annulleret
+YourPartnershipRefusedTopic=Partnerskab afvist
+YourPartnershipAcceptedTopic=Partnerskab accepteret
+YourPartnershipCanceledTopic=Partnerskab annulleret
+
+YourPartnershipWillSoonBeCanceledContent=Vi informerer dig om, at dit partnerskab snart vil blive annulleret (Backlink ikke fundet)
+YourPartnershipRefusedContent=Vi informerer dig om, at din partnerskabsanmodning er blevet afvist.
+YourPartnershipAcceptedContent=Vi informerer dig om, at din partnerskabsanmodning er accepteret.
+YourPartnershipCanceledContent=Vi informerer dig om, at dit partnerskab er annulleret.
 
 #
 # Status
 #
-PartnershipDraft = Udkast til
-PartnershipAccepted = Accepteret
-PartnershipRefused = Afvist
-PartnershipCanceled = Aflyst
-
+PartnershipDraft=Udkast til
+PartnershipAccepted=Accepteret
+PartnershipRefused=Afvist
+PartnershipCanceled=Aflyst
 PartnershipManagedFor=Partnere er
diff --git a/htdocs/langs/da_DK/productbatch.lang b/htdocs/langs/da_DK/productbatch.lang
index 70142520648..2e7ce5d269b 100644
--- a/htdocs/langs/da_DK/productbatch.lang
+++ b/htdocs/langs/da_DK/productbatch.lang
@@ -1,4 +1,4 @@
-# ProductBATCH language file - en_US - ProductBATCH
+# ProductBATCH language file - Source file is en_US - ProductBATCH
 ManageLotSerial=Brug parti serie / serienummer
 ProductStatusOnBatch=Ja (krævet parti)
 ProductStatusOnSerial=Ja (unikt serienummer krævet)
@@ -33,3 +33,13 @@ CustomMasks=Tilføjer en mulighed for at definere maske på produktkortet
 LotProductTooltip=Tilføjer en mulighed på produktkortet for at definere en dedikeret batchnummermaske
 SNProductTooltip=Tilføjer en mulighed på produktkortet for at definere en dedikeret serienummermaske
 QtyToAddAfterBarcodeScan=Mængde, der skal tilføjes for hver stregkode / parti / seriel scannet
+LifeTime=Levetid (i dage)
+EndOfLife=udløbet på dato
+ManufacturingDate=produktionsdato
+DestructionDate=Destruktionsdato
+FirstUseDate=Dato for første brug
+QCFrequency=Kvalitetskontrolfrekvens (i dage)
+
+#Traceability - qc status
+OutOfOrder=Virker ikke
+InWorkingOrder=I funktionsdygtig stand
diff --git a/htdocs/langs/da_DK/products.lang b/htdocs/langs/da_DK/products.lang
index 03cbc45a71c..0daacebcd03 100644
--- a/htdocs/langs/da_DK/products.lang
+++ b/htdocs/langs/da_DK/products.lang
@@ -396,3 +396,5 @@ ActionAvailableOnVariantProductOnly=Handling kun tilgængelig på variant af pro
 ProductsPricePerCustomer=Produktpriser pr. Kunde
 ProductSupplierExtraFields=Yderligere attributter (leverandørpriser)
 DeleteLinkedProduct=Slet det underordnede produkt, der er knyttet til kombinationen
+PMPValue=Værdi
+PMPValueShort=WAP
diff --git a/htdocs/langs/da_DK/projects.lang b/htdocs/langs/da_DK/projects.lang
index cb5a36ace9a..f15e5b3477f 100644
--- a/htdocs/langs/da_DK/projects.lang
+++ b/htdocs/langs/da_DK/projects.lang
@@ -267,9 +267,11 @@ InvoiceToUse=Udkast faktura til brug
 NewInvoice=Ny faktura
 OneLinePerTask=En linje pr. Opgave
 OneLinePerPeriod=En linje pr. Periode
+OneLinePerTimeSpentLine=En linje for hver gang brugt erklæring
 RefTaskParent=Ref. Forældre Opgave
 ProfitIsCalculatedWith=Fortjeneste beregnes ved hjælp af
 AddPersonToTask=Føj også til opgaver
 UsageOrganizeEvent=Anvendelse: Begivenhedsorganisation
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Klassificer projektet som lukket, når alle dets opgaver er afsluttet (100%% fremskridt)
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Bemærk: eksisterende projekter med alle opgaver ved 100%%-fremskridt påvirkes ikke: du bliver nødt til at lukke dem manuelt. Denne mulighed påvirker kun åbne projekter.
+SelectLinesOfTimeSpentToInvoice=Vælg tidslinjer, der ikke er faktureret, og masseforanstaltning "Generer faktura" for at fakturere dem
diff --git a/htdocs/langs/da_DK/receptions.lang b/htdocs/langs/da_DK/receptions.lang
index afd06442445..0e6765fdc59 100644
--- a/htdocs/langs/da_DK/receptions.lang
+++ b/htdocs/langs/da_DK/receptions.lang
@@ -44,4 +44,4 @@ ValidateOrderFirstBeforeReception=Du skal først validere ordren, før du kan la
 ReceptionsNumberingModules=Nummerering modul til receptioner
 ReceptionsReceiptModel=Dokumentskabeloner til modtagelser
 NoMorePredefinedProductToDispatch=Ikke flere foruddefinerede produkter, der skal sendes
-
+ReceptionExist=Der findes en reception
diff --git a/htdocs/langs/da_DK/stocks.lang b/htdocs/langs/da_DK/stocks.lang
index a37ee2ad5bd..5cfede398e2 100644
--- a/htdocs/langs/da_DK/stocks.lang
+++ b/htdocs/langs/da_DK/stocks.lang
@@ -56,8 +56,6 @@ UnitPurchaseValue=Enhedskøbspris
 StockTooLow=Lager for lavt
 StockLowerThanLimit=Lager lavere end advarselsgrænse (%s)
 EnhancedValue=Værdi
-PMPValue=Værdi
-PMPValueShort=WAP
 EnhancedValueOfWarehouses=Lager værdi
 UserWarehouseAutoCreate=Opret et brugerlager automatisk, når du opretter en bruger
 AllowAddLimitStockByWarehouse=Administrer også værdi for minimum og ønsket lager pr. Parring (produktlager) ud over værdien for minimum og ønsket lager pr. Produkt
@@ -251,7 +249,10 @@ SelectAStockMovementFileToImport=vælg en aktiebevægelsesfil, der skal importer
 InfoTemplateImport=Uploadet fil skal have dette format (* er obligatoriske felter): <br> Source Warehouse * | Mållager * | Produkt * | Mængde * | Parti / serienummer <br> CSV-tegnseparator skal være "<b> %s </b>"
 LabelOfInventoryMovemement=Beholdning %s
 ReOpen=Genåben 
-ConfirmFinish=Bekræfter du afslutningen af opgørelsen? Dette genererer alle lagerbevægelser for at opdatere din aktie.
+ConfirmFinish=Bekræfter du afslutningen af opgørelsen? Dette genererer alle aktiebevægelser for at opdatere din aktie til det rigtige antal, du har indtastet lageret.
 ObjectNotFound=%s ikke fundet
 MakeMovementsAndClose=Generer bevægelser og luk
 AutofillWithExpected=Fyld den virkelige mængde med den forventede mængde
+ShowAllBatchByDefault=Vis batchoplysninger som standard på produktfanen "lager"
+CollapseBatchDetailHelp=Du kan indstille standardvisning af batchdetaljer i lagermodulkonfiguration
+FieldCannotBeNegative=Feltet "%s" kan ikke være negativt
diff --git a/htdocs/langs/da_DK/ticket.lang b/htdocs/langs/da_DK/ticket.lang
index 5aaa861cde6..d668d4dabb9 100644
--- a/htdocs/langs/da_DK/ticket.lang
+++ b/htdocs/langs/da_DK/ticket.lang
@@ -304,7 +304,7 @@ BoxLastModifiedTicket=Seneste ændrede opgaver
 BoxLastModifiedTicketDescription=Seneste %s ændrede opgaver
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=Ingen nyligt ændrede opgaver
-BoxTicketType=Antal åbne opgaver efter type
+BoxTicketType=Fordeling af åbne billetter efter type
 BoxTicketSeverity=Antal åbne opgaver efter sværhedsgrad
 BoxNoTicketSeverity=Ingen opgaver åbnet
 BoxTicketLastXDays=Antal nye opgaver efter dage de sidste %s dage
diff --git a/htdocs/langs/de_AT/accountancy.lang b/htdocs/langs/de_AT/accountancy.lang
index 14639999065..1a3c7a47694 100644
--- a/htdocs/langs/de_AT/accountancy.lang
+++ b/htdocs/langs/de_AT/accountancy.lang
@@ -1,3 +1,3 @@
 # Dolibarr language file - Source file is en_US - accountancy
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 MenuBankAccounts=Kontonummern
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
diff --git a/htdocs/langs/de_AT/agenda.lang b/htdocs/langs/de_AT/agenda.lang
index 466a6f35d10..5e8fc952dd0 100644
--- a/htdocs/langs/de_AT/agenda.lang
+++ b/htdocs/langs/de_AT/agenda.lang
@@ -1,6 +1,5 @@
 # Dolibarr language file - Source file is en_US - agenda
 Actions=Termine
-LocalAgenda=interner Kalender
 EventsNb=Anzahl der Termine
 ListOfActions=Terminliste
 EventOnFullDay=Terminliste
diff --git a/htdocs/langs/de_AT/cron.lang b/htdocs/langs/de_AT/cron.lang
deleted file mode 100644
index 67ecfc77567..00000000000
--- a/htdocs/langs/de_AT/cron.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - cron
-CronTaskInactive=This job is disabled
diff --git a/htdocs/langs/de_AT/mrp.lang b/htdocs/langs/de_AT/mrp.lang
deleted file mode 100644
index a8ff138755b..00000000000
--- a/htdocs/langs/de_AT/mrp.lang
+++ /dev/null
@@ -1,6 +0,0 @@
-# Dolibarr language file - Source file is en_US - mrp
-BillOfMaterials=Bill of Material
-NewBOM=New bill of material
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
diff --git a/htdocs/langs/de_AT/products.lang b/htdocs/langs/de_AT/products.lang
index 272a2cf3d92..2be4012b705 100644
--- a/htdocs/langs/de_AT/products.lang
+++ b/htdocs/langs/de_AT/products.lang
@@ -30,3 +30,5 @@ ListProductByPopularity=Liste der Produkte/Services nach Beliebtheit
 ListServiceByPopularity=Liste der Services nach Beliebtheit
 Finished=Eigenerzeugung
 NewRefForClone=Artikel Nr. des neuen Produkts/Services
+ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
+PMPValue=Warenwert
diff --git a/htdocs/langs/de_AT/stocks.lang b/htdocs/langs/de_AT/stocks.lang
index 4ca91729c42..e275257795e 100644
--- a/htdocs/langs/de_AT/stocks.lang
+++ b/htdocs/langs/de_AT/stocks.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - stocks
 Location=Ort
-PMPValue=Warenwert
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
 AverageUnitPricePMPShort=Warenwert
+OpenInternal=Open only for internal actions
diff --git a/htdocs/langs/de_AT/ticket.lang b/htdocs/langs/de_AT/ticket.lang
index 05da15d6036..cdbb16efe30 100644
--- a/htdocs/langs/de_AT/ticket.lang
+++ b/htdocs/langs/de_AT/ticket.lang
@@ -1,3 +1,7 @@
 # Dolibarr language file - Source file is en_US - ticket
+TicketTypeShortISSUE=Issue, bug or problem
+OriginEmail=Email source
+NeedMoreInformation=Waiting for information
 Waiting=Wartestellung
 Closed=geschlossen
+TicketCategory=Group
diff --git a/htdocs/langs/de_CH/accountancy.lang b/htdocs/langs/de_CH/accountancy.lang
index dabeea01078..54d62648afc 100644
--- a/htdocs/langs/de_CH/accountancy.lang
+++ b/htdocs/langs/de_CH/accountancy.lang
@@ -34,6 +34,7 @@ CountriesInEEC=EWR - Staaten
 CountriesNotInEEC=Nicht EWR - Staaten
 CountriesInEECExceptMe=Länder im EWR ausser %s
 CountriesExceptMe=Alle Staaten, ausser %s
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 MainAccountForCustomersNotDefined=Es ist kein kein Buchhaltungskonto für Kunden eingerichtet.
 MainAccountForSuppliersNotDefined=Es ist kein kein Buchhaltungskonto für Anbieter eingerichtet.
 MainAccountForUsersNotDefined=Es ist kein kein Buchhaltungskonto für Kontakte eingerichtet.
@@ -113,7 +114,6 @@ ACCOUNTING_LENGTH_AACCOUNT=Anzahl Stellen der Partner - Kontonummern (die Konton
 ACCOUNTING_MANAGE_ZERO=Unterschiedliche Anzahl Stellen für Kontonummern erlauben (bei einigen Ländern nötig, zum Beispiel in der Schweiz). Wenn das aus ist, kann man unten die Stellen für Kontonummern fix vorgeben.
 BANK_DISABLE_DIRECT_INPUT=Direktbuchung der Transaktion auf dem Bankkonto unterbinden
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Entwurfsexport des Journales erlauben
-ACCOUNTANCY_COMBO_FOR_AUX=Aufbereitete Listenansicht für Unterkonten erlauben. Bei vielen Partnern kann das lange dauern...
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Nebenjournal
 ACCOUNTING_SOCIAL_JOURNAL=Personaljournal
 ACCOUNTING_HAS_NEW_JOURNAL=Hat neuen Journaleintrag
diff --git a/htdocs/langs/de_CH/admin.lang b/htdocs/langs/de_CH/admin.lang
index 316e2eccb2f..f044cdfe8ca 100644
--- a/htdocs/langs/de_CH/admin.lang
+++ b/htdocs/langs/de_CH/admin.lang
@@ -347,8 +347,6 @@ Permission311=Leistungen einsehen
 Permission331=Lesezeichen einsehen
 Permission401=Rabatte einsehen
 Permission430=PHP Debug Bar verwenden
-Permission512=Lohnzahlungen erstellen und bearbeiten
-Permission514=Lohnzahlungen löschen
 Permission520=Darlehen einsehen
 Permission525=Darlehens-rechner
 Permission527=Exportiere Darlehen
diff --git a/htdocs/langs/de_CH/agenda.lang b/htdocs/langs/de_CH/agenda.lang
index 69537fa3a04..6100e73fd48 100644
--- a/htdocs/langs/de_CH/agenda.lang
+++ b/htdocs/langs/de_CH/agenda.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - agenda
 IdAgenda=ID Veranstaltung
 Agenda=Terminplanung
+Agendas=Tagesordnungen
 EventReports=Ereignisberichte
 MenuDoneActions=Alle abgeschl. Termine
 MenuDoneMyActions=Meine abgeschl. Termine
@@ -10,6 +11,7 @@ ViewPerUser=Benutzeransicht
 ViewPerType=Ansicht pro Typ
 AgendaAutoActionDesc=Gib hier an, welche Ereignisse automatisch in den Kalender eingetragen werden sollen.\nWenn du nichts anwählst, werden keine Geschäftsvorgänge, wie Freigaben oder Statusänderungen, eingetragen.
 AgendaSetupOtherDesc=Hier gibst Du die Exportoptionen zu externen Kalendern, wie Google Calendar oder Thunderbird an.
+AgendaExtSitesDesc=Diese Seite erlaubt Ihnen externe Kalender zu konfigurieren.
 EventRemindersByEmailNotEnabled=Benachrichtigungen sind in den Moduleinstellungen deaktiviert (%s).
 NewCompanyToDolibarr=Partner %s erzeugt
 COMPANY_DELETEInDolibarr=Partner %s gelöscht.
diff --git a/htdocs/langs/de_CH/cron.lang b/htdocs/langs/de_CH/cron.lang
index 137bb7f08e8..349dd006fdc 100644
--- a/htdocs/langs/de_CH/cron.lang
+++ b/htdocs/langs/de_CH/cron.lang
@@ -1,8 +1,10 @@
 # Dolibarr language file - Source file is en_US - cron
 CronMethodDoesNotExists=Klasse %s hat keine %s Methode
 EnabledAndDisabled=Aktiviert und deaktiviert
+CronDelete=cronjobs löschen
 CronDtStart=Nicht vor
 CronDtEnd=Nicht nach
+CronPriority=Rang
 JobFinished=Job gestarted und beendet
 JobDisabled=Job deaktiviert
 MakeLocalDatabaseDumpShort=Lokale Datenbanksicherung
diff --git a/htdocs/langs/de_CH/mrp.lang b/htdocs/langs/de_CH/mrp.lang
index 0f4ccf47087..31bf4777657 100644
--- a/htdocs/langs/de_CH/mrp.lang
+++ b/htdocs/langs/de_CH/mrp.lang
@@ -1,7 +1,3 @@
 # Dolibarr language file - Source file is en_US - mrp
-BillOfMaterials=Bill of Material
 BOMsSetup=Einstellungen Modul Materiallisten (BOM)
-NewBOM=New bill of material
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
+DeleteWorkstation=Lösche Gruppe
diff --git a/htdocs/langs/de_CH/partnership.lang b/htdocs/langs/de_CH/partnership.lang
index 12da41cb2ac..6ad1f5ebab4 100644
--- a/htdocs/langs/de_CH/partnership.lang
+++ b/htdocs/langs/de_CH/partnership.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - partnership
 DatePartnershipStart=Ferienbeginn
 DatePartnershipEnd=Ferienende
-PartnershipAccepted =Akzeptiert
-PartnershipCanceled =widerrufen
+PartnershipAccepted=Akzeptiert
+PartnershipCanceled=widerrufen
diff --git a/htdocs/langs/de_CH/stocks.lang b/htdocs/langs/de_CH/stocks.lang
index 0e46de215c7..e1cda080461 100644
--- a/htdocs/langs/de_CH/stocks.lang
+++ b/htdocs/langs/de_CH/stocks.lang
@@ -5,6 +5,7 @@ NumberOfProducts=Anzahl der Produkte
 CorrectStock=Lagerbestand anpassen
 TransferStock=Lagerumbuchung
 MassStockTransferShort=Massen Lagerumbuchungen
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
 QtyDispatched=Versandmenge
 DeStockOnShipment=Verringere reale Bestände bei Bestädigung von Lieferungen
 StockOnReception=Lagerbestand anpassen, sobald Lieferung frei gegeben wird.
@@ -25,7 +26,7 @@ StockMovementRecorded=aufgezeichnete Lagerbewegungen
 InventoryCodeShort=Inv. / Mov. Kode
 NoPendingReceptionOnSupplierOrder=Keine ausstehenden Lieferungen auf dieser Lieferantenbestellung
 ThisSerialAlreadyExistWithDifferentDate=Diese Charge- / Seriennummer (<strong>%s</strong>) ist bereits vorhanden, jedoch mit unterschiedlichen Haltbarkeits- oder Verfallsdatum. \n(Gefunden: <strong>%s</strong> Erfasst: <strong>%s</strong>)
-OpenAll=Für alle Aktionen freigeben
+OpenInternal=Open only for internal actions
 UseDispatchStatus=Auslieferungs - Status (frei gegeben / zurückgewiesen) für Lieferantenbestellungen führen.
 inventoryDraft=Läuft
 inventoryOnDate=Inventar
diff --git a/htdocs/langs/de_CH/ticket.lang b/htdocs/langs/de_CH/ticket.lang
index 18ff7a30fab..5cbcf19bea7 100644
--- a/htdocs/langs/de_CH/ticket.lang
+++ b/htdocs/langs/de_CH/ticket.lang
@@ -1,5 +1,8 @@
 # Dolibarr language file - Source file is en_US - ticket
+TicketTypeShortISSUE=Issue, bug or problem
 TypeContact_ticket_external_SUPPORTCLI=Kundenkontakt / Störfallverfolgung
+OriginEmail=Email source
 InProgress=In Bearbeitung
+NeedMoreInformation=Waiting for information
 TicketCloseOn=Schliessungsdatum
 TicketAddIntervention=Einsatz erstellen
diff --git a/htdocs/langs/de_DE/accountancy.lang b/htdocs/langs/de_DE/accountancy.lang
index 8ea9181e11e..7f4bcd3b2b7 100644
--- a/htdocs/langs/de_DE/accountancy.lang
+++ b/htdocs/langs/de_DE/accountancy.lang
@@ -5,7 +5,7 @@ ACCOUNTING_EXPORT_SEPARATORCSV=Spaltentrennzeichen für die Exportdatei
 ACCOUNTING_EXPORT_DATE=Datumsformat der Exportdatei
 ACCOUNTING_EXPORT_PIECE=Stückzahl exportieren
 ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Mit globalem Konto exportieren
-ACCOUNTING_EXPORT_LABEL=Exportiere Bezeichnung
+ACCOUNTING_EXPORT_LABEL=Exportiere Beschriftung
 ACCOUNTING_EXPORT_AMOUNT=Exportiere Betrag
 ACCOUNTING_EXPORT_DEVISE=Exportiere Währung
 Selectformat=Wählen Sie das Format für die Datei
@@ -158,7 +158,7 @@ ACCOUNTING_LENGTH_AACCOUNT=Länge der Geschäftspartner-Konten in der Buchhaltun
 ACCOUNTING_MANAGE_ZERO=Verwalten der Null am Ende eines Buchhaltungskontos. \nIn einigen Ländern notwendig (zB. Schweiz). \nStandardmäßig deaktiviert. \nWenn ausgeschaltet, können die folgenden 2 Parameter konfigurieren werden um virtuelle Nullen anzuhängen
 BANK_DISABLE_DIRECT_INPUT=Deaktivieren der direkte Aufzeichnung von Transaktion auf dem Bankkonto
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Entwurfexport für Journal aktivieren
-ACCOUNTANCY_COMBO_FOR_AUX=Kombinationsliste für Nebenkonto aktivieren \n(kann langsam sein, wenn Sie viele Geschäftspartner haben)
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties, break ability to search on a part of value)
 ACCOUNTING_DATE_START_BINDING=Definieren Sie ein Datum, an dem die Bindung und Übertragung in der Buchhaltung beginnen soll. Transaktionen vor diesem Datum werden nicht in die Buchhaltung übertragen.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Bei der Übertragung der Buchhaltung standardmäßig den Zeitraum anzeigen auswählen anzeigen
 
@@ -328,6 +328,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Deaktivieren Sie die Bindung und Übertr
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Deaktivieren Sie die Bindung und Übertragung in der Buchhaltung für Spesenabrechnungen (Spesenabrechnungen werden bei der Buchhaltung nicht berücksichtigt).
 
 ## Export
+NotifiedExportDate=Notified export date (modification of the entries will not be possible)
+NotifiedValidationDate=Validation of the entries (modification or deletion of the entries will not be possible)
+ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=Entwurfsjournal exportieren
 Modelcsv=Exportmodell
 Selectmodelcsv=Wählen Sie ein Exportmodell
diff --git a/htdocs/langs/de_DE/admin.lang b/htdocs/langs/de_DE/admin.lang
index 168773c75b9..77a3d519e21 100644
--- a/htdocs/langs/de_DE/admin.lang
+++ b/htdocs/langs/de_DE/admin.lang
@@ -221,8 +221,8 @@ NotCompatible=Dieses Modul scheint nicht mit ihrer Dolibarr Version %s kompatibe
 CompatibleAfterUpdate=Dieses Modul benötigt ein Upgrade ihrer Dolibarr Installation %s  (Min %s - Max %s).
 SeeInMarkerPlace=siehe Marktplatz
 SeeSetupOfModule=Finden Sie im Modul-Setup %s
+SetOptionTo=Set option <b>%s</b> to %s
 Updated=Aktualisiert
-Nouveauté=Neuheit
 AchatTelechargement=Kaufen / Herunterladen
 GoModuleSetupArea=Um ein neues Modul zu installieren/verteilen, gehen Sie in den Modul-Setup Bereich <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, der offizielle Marktplatz für dolibarr Module/Erweiterungen
@@ -354,7 +354,7 @@ WithCounter=Zähler verwenden
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first %s. <br><b>{000000@x}</b> same as the previous one but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then the sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
 GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated to the customer. This counter dedicated to customer is reset at same time as the global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=Alle anderen Zeichen in der Maske bleiben erhalten. <br> \nLeerzeichen sind nicht zulässig. <br>
-GenericMaskCodes3EAN=All other characters in the mask will remain intact (except * or ? in 13th position in EAN13).<br>Spaces are not allowed.<br>In EAN13, the last character after the last } in 13th position should be * or ? . It will be replaced by the calculated key.<br>
+GenericMaskCodes3EAN=Alle anderen Zeichen der Maske bleiben unberührt (außer * oder ? an 13. Stelle in EAN13). <br>Leerzeichen sind nicht erlaubt.<br>Für EAN13 sollte das letzte Zeichen nach der letzten } an 13. Stelle ein * oder ? sein. Dies wird durch den berechneten Wert ersetzt.<br>
 GenericMaskCodes4a=<u>Beispiel auf der 99. %s des Drittanbieters DieFirma, mit Datum 2007-01-31:</u> <br> 
 GenericMaskCodes4b=<u>Beispiel für Partner erstellt am 2018-10-27:</u> <br>
 GenericMaskCodes4c=<u>Beispiel für ein Produkt erstellt am 2018-10-27:</u> <br>
@@ -399,6 +399,7 @@ SecurityToken=Schlüssel um die URLs zu entschlüsseln
 NoSmsEngine=Kein SMS-Sendermanager verfügbar. Ein SMS-Sendermanager gehört nicht zum Standardumfang von Dolibarr, da er von einem externen Anbieter abhängig ist. Passende Module können Sie hier finden: %s
 PDF=PDF
 PDFDesc=Globale Einstellungen für die PDF-Erzeugung
+PDFOtherDesc=PDF Option specific to some modules
 PDFAddressForging=Regeln für die Auswahl der Adressen
 HideAnyVATInformationOnPDF=Alle Informationen zu Steuern und MWSt. im generierten PDF ausblenden
 PDFRulesForSalesTax=Regeln für Umsatzsteuer / MwSt.
@@ -450,7 +451,7 @@ ExtrafieldParamHelpselect=Die Liste der Werte muss aus Zeilen mit dem Format Sch
 ExtrafieldParamHelpcheckbox=Die Liste der Werte muss aus Zeilen mit dem Format Schlüssel, Wert bestehen (wobei Schlüssel nicht '0' sein darf) <br><br> zum Beispiel: <br> 1, value1 <br> 2, value2 <br> 3, value3 <br> ...
 ExtrafieldParamHelpradio=Die Liste der Werte muss aus Zeilen mit dem Format Schlüssel, Wert bestehen (wobei Schlüssel nicht '0' sein darf) <br><br> zum Beispiel: <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::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarly a primary int key<br>- filtersql is a SQL condition. It can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<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::filtersql<br>Example: c_typent:libelle:id::filtersql<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
+ExtrafieldParamHelpchkbxlst=Die Liste der Werte stammt aus einer Tabelle <br> Syntax: table_name: label_field: id_field :: filter <br> Beispiel: c_typent: libelle: id :: filter <br><br> Filter kann ein einfacher Vergleich sein (z. B. aktiv = 1), um nur den aktiven Wert anzuzeigen <br> Sie können $ID$ auch in Filtern verwenden, hierbei handelt es sich um die aktuelle ID des aktuellen Objekts <br> Verwenden Sie $SEL$, um ein SELECT im Filter durchzuführen <br> Wenn Sie nach Extrafeldern filtern möchten, verwenden Sie die Syntax extra.fieldcode = ... (wobei fieldcode der Code des Extrafelds ist) <br><br> Damit die Liste von einer anderen ergänzenden Attributliste abhängt: <br> c_typent: libelle: id: options_ <i>parent_list_code</i> | parent_column: filter <br><br> Um die Liste von einer anderen Liste abhängig zu machen: <br> c_typent: libelle: id: <i>parent_list_code</i> | parent_column: filter
 ExtrafieldParamHelplink=Die Parameter müssen ObjectName: Classpath <br> sein. Syntax: ObjectName: Classpath
 ExtrafieldParamHelpSeparator=Für ein einfaches Trennzeichen leer lassen <br> Setzen Sie diesen Wert für ein ausblendendes Trennzeichen auf 1 (standardmäßig für eine neue Sitzung geöffnet, der Status wird für jede Benutzersitzung beibehalten) <br> Setzen Sie diesen Wert für ein ausblendendes Trennzeichen auf 2 (standardmäßig für ausgeblendet) neue Sitzung, dann bleibt der Status für jede Benutzersitzung erhalten)
 LibraryToBuildPDF=Bibliothek zum Erstellen von PDF-Dateien
@@ -561,7 +562,7 @@ Module53Desc=Management von Dienstleistungen
 Module54Name=Verträge / Abonnements
 Module54Desc=Verwaltung von Verträgen (Dienstleistungen oder wiederkehrende Abonnements)
 Module55Name=Barcodes
-Module55Desc=Barcode-Verwaltung
+Module55Desc=Barcode or QR code management
 Module56Name=Zahlung per Überweisung
 Module56Desc=Verwaltung der Zahlung von Lieferanten durch Überweisungsaufträge. Es beinhaltet die Erstellung von SEPA-Dateien für europäische Länder.
 Module57Name=Zahlungen per Lastschrifteinzug
@@ -848,10 +849,10 @@ Permission402=Rabatte erstellen/bearbeiten
 Permission403=Rabatte freigeben
 Permission404=Rabatte löschen
 Permission430=Debug Bar nutzen
-Permission511=Zahlungen von Gehältern (Ihre und Untergebene) lesen
-Permission512=Lohnzahlungen anlegen / ändern
-Permission514=Lohn-/Gehaltszahlungen löschen
-Permission517= Gehaltszahlungen von allen lesen
+Permission511=Read salaries and payments (yours and subordinates)
+Permission512=Create/modify salaries and payments
+Permission514=Delete salaries and payments
+Permission517=Read salaries and payments everybody
 Permission519=Löhne exportieren
 Permission520=Darlehen anzeigen
 Permission522=Darlehen erstellen/bearbeiten
@@ -965,6 +966,8 @@ Permission23003=Geplante Aufgabe(n) löschen
 Permission23004=Geplante Aufgaben ausführen
 Permission50101=Verwenden des Kassenmoduls (SimplePOS)
 Permission50151=Verwenden des Kassenmoduls (TakePOS)
+Permission50152=Edit sales lines
+Permission50153=Edit ordered sales lines
 Permission50201=Transaktionen einsehen
 Permission50202=Transaktionen importieren
 Permission50330=Lesen Sie Objekte von Zapier
@@ -1044,6 +1047,7 @@ DictionaryOpportunityStatus=Verkaufschancen für Projekt/Lead
 DictionaryExpenseTaxCat=Spesenbericht - Mobilität
 DictionaryExpenseTaxRange=Spesenreport - Bereich pro Transportkategorie
 DictionaryTransportMode=Intracomm-Bericht - Transportmodus
+DictionaryBatchStatus=Product lot/serial Quality Control status
 TypeOfUnit=Art der Einheit
 SetupSaved=Einstellungen gespeichert
 SetupNotSaved=Einstellungen nicht gespeichert
@@ -1187,7 +1191,7 @@ SetupDescription4=<a href="%s"> %s -> %s </a> <br> <br> Diese Software ist eine
 SetupDescription5=Andere Setup-Menüs verwalten optionale Parameter.
 AuditedSecurityEvents=Sicherheitsereignisse, die überwacht werden
 NoSecurityEventsAreAduited=Es werden keine Sicherheitsereignisse überwacht. Sie können sie über das Menü %s aktivieren
-Audit=Protokoll
+Audit=Security events
 InfoDolibarr=Über Dolibarr
 InfoBrowser=Über Ihren Webbrowser
 InfoOS=Über Ihr Betriebsystem
@@ -1319,9 +1323,12 @@ ConditionIsCurrently=Einstellung ist aktuell %s
 YouUseBestDriver=Sie verwenden den Treiber %s, dies ist derzeit der best verfügbare.
 YouDoNotUseBestDriver=Sie verwenden Treiber %s, aber es wird der Treiber %s empfohlen.
 NbOfObjectIsLowerThanNoPb=Es existieren nur %s %s in Ihrer Datenbank. Dies erfordert daher keine speziellen Optimierungsmaßnahmen.
+ComboListOptim=Combo list loading optimization
 SearchOptim=Such Optimierung
-YouHaveXObjectUseSearchOptim=Sie haben %s %s in der Datenbank. Sie können die Konstante %s in Home-Setup-Other zu 1 hinzufügen. Beschränken Sie die Suche auf den Anfang von Zeichenfolgen, damit die Datenbank Indizes verwenden kann, und Sie sollten sofort eine Antwort erhalten.
-YouHaveXObjectAndSearchOptimOn=Sie haben %s %s in der Datenbank und die Konstante %s ist in Home-Setup-Other auf 1 gesetzt.
+YouHaveXObjectUseComboOptim=You have %s %s in the database. You can go into setup of module to enable loading of combo list on key pressed event.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other.
+YouHaveXObjectUseSearchOptimDesc=This limits the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to %s in Home-Setup-Other.
 BrowserIsOK=Sie verwenden %s als Webbrowser. Dieser ist hinsichtlich Sicherheit und Leistung ausreichend.
 BrowserIsKO=Sie verwenden %s als Webbrowser. Dieser ist bekanntlich eine schlechte Wahl wenn es um Sicherheit, Leistung und Zuverlässigkeit geht. Wir empfehlen Firefox, Chrome, Opera oder Safari zu benutzen.
 PHPModuleLoaded=PHP Komponente %s ist geladen
@@ -1433,6 +1440,7 @@ MemberMainOptions=Haupteinstellungen
 AdherentLoginRequired= Verwalten Sie eine Anmeldung für jedes Mitglied
 AdherentMailRequired=Für das Anlegen eines neuen Mitglieds ist eine E-Mail-Adresse erforderlich
 MemberSendInformationByMailByDefault=Das Kontrollkästchen für den automatischen Versand einer E-Mail-Bestätigung an Mitglieder (bei Freigabe oder neuem Abonnement) ist standardmäßig aktiviert
+MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
 VisitorCanChooseItsPaymentMode=Der Besucher kann aus verschiedenen Zahlungsmethoden auswählen
 MEMBER_REMINDER_EMAIL=Aktivieren Sie die automatische Erinnerung <b> per E-Mail </b> an abgelaufene Abonnements. Hinweis: Das Modul <strong> %s </strong> muss aktiviert und ordnungsgemäß eingerichtet sein, damit Erinnerungen gesendet werden können.
 MembersDocModules=Dokumentvorlagen für Dokumente, die aus dem Mitgliedsdatensatz generiert wurden
@@ -1763,7 +1771,7 @@ AGENDA_DEFAULT_VIEW=Welche Standardansicht soll geöffnet werden, wenn das Menü
 AGENDA_REMINDER_BROWSER=Aktiviere die Ereigniserinnerung <b> im Browser des Benutzers. </b> (Wenn das Erinnerungsdatum erreicht ist, wird vom Browser ein Popup angezeigt. Jeder Benutzer kann solche Benachrichtigungen in seinem Browser-Benachrichtigungs-Setup deaktivieren.)
 AGENDA_REMINDER_BROWSER_SOUND=Aktiviere Tonbenachrichtigung
 AGENDA_REMINDER_EMAIL=Aktiviere die Ereigniserinnerung <b> per E-Mail </b> (Erinnerungsoption / Verzögerung kann für jedes Ereignis definiert werden).
-AGENDA_REMINDER_EMAIL_NOTE=Hinweis: Die Häufigkeit der Aufgabe %s muss ausreichen, um sicherzustellen, dass die Erinnerung zum richtigen Zeitpunkt gesendet wird.
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the scheduled job %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Verknüpfte Objekte in Agenda anzeigen
 ##### Clicktodial #####
 ClickToDialSetup=Click-to-Dial Moduleinstellungen
@@ -1979,6 +1987,8 @@ MAIN_PDF_MARGIN_RIGHT=Rechter Rand im PDF
 MAIN_PDF_MARGIN_TOP=Oberer Rand im PDF
 MAIN_PDF_MARGIN_BOTTOM=Unterer Rand im PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Höhe des Logos im PDF
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add picture on proposal line
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Füge elektronische Signatur zu PDF hinzu
 NothingToSetup=Dieses Modul benötigt keine speziellen Einstellungen.
 SetToYesIfGroupIsComputationOfOtherGroups=Setzen Sie dieses Fehld auf Ja, wenn diese Gruppe eine Berechnung von anderen Gruppen ist
 EnterCalculationRuleIfPreviousFieldIsYes=Geben Sie die Berechnungsregel ein, wenn das vorherige Feld auf Ja gesetzt wurde. <br> Zum Beispiel: <br> CODEGRP1 + CODEGRP2
@@ -2096,7 +2106,6 @@ PDF_SHOW_PROJECT=Projekt im Dokument anzeigen
 ShowProjectLabel=Projektbezeichnung
 PDF_USE_ALSO_LANGUAGE_CODE=Wenn Sie möchten, dass einige Texte in Ihrem PDF in 2 verschiedenen Sprachen in demselben generierten PDF dupliziert werden, müssen Sie hier diese zweite Sprache festlegen, damit das generierte PDF zwei verschiedene Sprachen auf derselben Seite enthält, die beim Generieren von PDF ausgewählte und diese (dies wird nur von wenigen PDF-Vorlagen unterstützt). Für 1 Sprache pro PDF leer halten.
 FafaIconSocialNetworksDesc=Gib hier den Code für ein FontAwesome icon ein. Wenn du FontAwesome nicht kennst, kannst du den Standard 'fa-address-book' benutzen.
-FeatureNotAvailableWithReceptionModule=Funtion nicht verfügbar, wenn Modul Wareneingang aktiviert ist
 RssNote=Hinweis: Jede RSS-Feed-Definition enthält ein Widget, das Sie aktivieren müssen, damit es im Dashboard verfügbar ist
 JumpToBoxes=Wechseln Sie zu Einstellungen -> Widgets
 MeasuringUnitTypeDesc=Verwenden Sie hier einen Wert wie "Größe", "Oberfläche", "Volumen", "Gewicht", "Zeit".
@@ -2120,12 +2129,18 @@ ConfFileIsReadableOrWritableByAnyUsers=Die conf-Datei kann von jedem Benutzer ge
 MailToSendEventOrganization=Organisation von Ereignissen
 AGENDA_EVENT_DEFAULT_STATUS=Standardereignisstatus beim Erstellen eines Ereignisses aus dem Formular
 YouShouldDisablePHPFunctions=Sie sollten PHP-Funktionen deaktivieren
-IfCLINotRequiredYouShouldDisablePHPFunctions=Außer wenn Sie Systembefehle ausführen müssen (z.B. für das Modul "Geplanter Job" oder zum Ausführen der externen Befehlszeile "Antivirus"), sollten Sie die PHP-Funktionen deaktivieren
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands in custom code, you shoud disable PHP functions
+PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=In Ihrem Stammverzeichnis wurden keine beschreibbaren Dateien oder Verzeichnisse der gängigen Programme gefunden (gut).
 RecommendedValueIs=Empfohlen: %s
+NotRecommended=Nicht empfohlen
 ARestrictedPath=Ein eingeschränkter Pfad
 CheckForModuleUpdate=Suchen Sie nach Updates für externe Module
 CheckForModuleUpdateHelp=Diese Aktion stellt eine Verbindung zu Editoren externer Module her, um zu überprüfen, ob eine neue Version verfügbar ist.
 ModuleUpdateAvailable=Eine Aktualisierung ist verfügbar
 NoExternalModuleWithUpdate=Für externe Module wurden keine Updates gefunden
 SwaggerDescriptionFile=Swagger API-Beschreibungsdatei (zum Beispiel zur Verwendung mit Redoc)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
+RandomlySelectedIfSeveral=Randomly selected if several pictures are available
+DatabasePasswordObfuscated=Database password is obfuscated in conf file
+DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
diff --git a/htdocs/langs/de_DE/agenda.lang b/htdocs/langs/de_DE/agenda.lang
index ed52994e717..f636a41b96e 100644
--- a/htdocs/langs/de_DE/agenda.lang
+++ b/htdocs/langs/de_DE/agenda.lang
@@ -4,7 +4,7 @@ Actions=Ereignisse
 Agenda=Terminplan
 TMenuAgenda=Terminplanung
 Agendas=Terminpläne
-LocalAgenda=interne Kalender
+LocalAgenda=Standardkalender
 ActionsOwnedBy=Ereignis stammt von
 ActionsOwnedByShort=Eigentümer
 AffectedTo=Zugewiesen an
@@ -20,7 +20,7 @@ MenuToDoActions=Alle unvollst. Termine
 MenuDoneActions=Alle abgeschlossenen Termine
 MenuToDoMyActions=Meine unvollst. Termine
 MenuDoneMyActions=Meine abgeschlossenen Termine
-ListOfEvents=Liste Ereignisse (interner Kalender)
+ListOfEvents=Liste der Ereignisse (Standardkalender)
 ActionsAskedBy=Ereignisse eingetragen von
 ActionsToDoBy=Ereignisse zugewiesen an
 ActionsDoneBy=Termine erledigt von
@@ -38,6 +38,7 @@ ActionsEvents=Veranstaltungen zur automatischen Übernahme in die Agenda
 EventRemindersByEmailNotEnabled=Aufgaben-/Terminerinnerungen via E-Mail sind in den Einstellungen des Moduls %s nicht aktiviert.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Partner %s erstellt
+COMPANY_MODIFYInDolibarr=Geschäftspartner %s geändert
 COMPANY_DELETEInDolibarr=Geschäftspartner %s gelöscht
 ContractValidatedInDolibarr=Vertrag %s freigegeben
 CONTRACT_DELETEInDolibarr=Vertrag %s gelöscht
@@ -87,6 +88,7 @@ OrderDeleted=Auftrag gelöscht
 InvoiceDeleted=Rechnung gelöscht
 DraftInvoiceDeleted=Rechnungsentwurf gelöscht
 CONTACT_CREATEInDolibarr=Kontakt %s erstellt
+CONTACT_MODIFYInDolibarr=Kontakt %s geändert
 CONTACT_DELETEInDolibarr=Kontakt %s gelöscht
 PRODUCT_CREATEInDolibarr=Produkt %s erstellt
 PRODUCT_MODIFYInDolibarr=Produkt %s geändert
@@ -119,6 +121,7 @@ MRP_MO_UNVALIDATEInDolibarr=Fertigungsauftrag auf Status 'Entwurf' gesetzt
 MRP_MO_PRODUCEDInDolibarr=Fertigungsauftrag produziert
 MRP_MO_DELETEInDolibarr=Fertigungsauftrag gelöscht
 MRP_MO_CANCELInDolibarr=Fertigungsauftrag storniert
+PAIDInDolibarr=%s bezahlt
 ##### End agenda events #####
 AgendaModelModule=Dokumentvorlagen für Ereignisse
 DateActionStart=Beginnt
@@ -130,7 +133,7 @@ AgendaUrlOptions4=<b>logint=%s</b> begrenzt die Ausgabe auf den Benutzer <b>%s</
 AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> um nur Aktionen zum Projekt <b> __PROJECT_ID__</b> auszugeben.
 AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> um automatische Events auszuschliessen.
 AgendaUrlOptionsIncludeHolidays=<b> includeseholidays = 1 </b>, um Ereignisse von Feiertagen einzuschließen.
-AgendaShowBirthdayEvents=Geburtstage von Kontakten anzeigen
+AgendaShowBirthdayEvents=Geburtstage der Kontakte
 AgendaHideBirthdayEvents=Geburtstage von Kontakten nicht anzeigen
 Busy=Beschäftigt
 ExportDataset_event1=Liste Ereignisse des Kalender
diff --git a/htdocs/langs/de_DE/banks.lang b/htdocs/langs/de_DE/banks.lang
index efad27d2642..a50b175a723 100644
--- a/htdocs/langs/de_DE/banks.lang
+++ b/htdocs/langs/de_DE/banks.lang
@@ -128,7 +128,7 @@ ConfirmDeleteTransaction=Sind Sie sicher, dass Sie diese Transaktion löschen wo
 ThisWillAlsoDeleteBankRecord=Dadurch werden auch erzeugte Kontoauszüge gelöscht
 BankMovements=Bankbewegungen
 PlannedTransactions=Geplante Transaktionen
-Graph=Graphs
+Graph=Diagramme
 ExportDataset_banque_1=Transaktionen und Kontoauszug
 ExportDataset_banque_2=Einzahlungsbeleg
 TransactionOnTheOtherAccount=Transaktion auf dem anderem Konto
diff --git a/htdocs/langs/de_DE/bills.lang b/htdocs/langs/de_DE/bills.lang
index 6e2b4dad58e..a20adc16a2a 100644
--- a/htdocs/langs/de_DE/bills.lang
+++ b/htdocs/langs/de_DE/bills.lang
@@ -259,6 +259,7 @@ DateMaxPayment=Fälligkeitsdatum
 DateInvoice=Rechnungsdatum
 DatePointOfTax=Steuerort
 NoInvoice=Keine Rechnung
+NoOpenInvoice=No open invoice
 ClassifyBill=Rechnung einordnen
 SupplierBillsToPay=Unbezahlte Lieferantenrechnungen
 CustomerBillsUnpaid=Offene Kundenrechnungen
@@ -521,9 +522,9 @@ PDFCrabeDescription=Rechnung PDF-Vorlage Crabe. Eine vollständige Rechnungsvorl
 PDFSpongeDescription=Rechnung PDF-Vorlage Sponge. Eine vollständige Rechnungsvorlage
 PDFCrevetteDescription=PDF Rechnungsvorlage Crevette. Vollständige Rechnungsvolage für normale Rechnungen
 TerreNumRefModelDesc1=Gibt eine Nummer im Format %syymm-nnnn für Standardrechnungen und %syymm-nnnn für Gutschriften zurück, wobei yy das Jahr, mm der Monat und nnnn eine sequenzielle automatisch inkrementierende Nummer ohne Unterbrechung und ohne Zurücksetzen auf 0 ist
-MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Liefere Nummer im Format  %syymm-nnnn für Standardrechnungen %syymm-nnnn für Ersatzrechnung,  %syymm-nnnn für Anzahlungsrechnung und %syymm-nnnn für Gutschriften wobei  yy Jahr, mm Monat und nnnn eine laufende Nummer ohne Unterbrechung und ohne Rückkehr zu 0 ist.
 TerreNumRefModelError=Eine Rechnung, beginnend mit $ syymm existiert bereits und ist nicht kompatibel mit diesem Modell der Reihe. Entfernen oder umbenennen, um dieses Modul.
-CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+CactusNumRefModelDesc1=Rückgabenummer im Format %syymm-nnnn für Standard-Rechnungen, %syymm-nnnn für Gutschriften und %syymm-nnnn für Anzahlungsrechnungen, wobei yy das Jahr ist, mm der Monat und nnnn ein ansteigender, lückenloser Zähler ist
 EarlyClosingReason=Grund für die vorzeitige Schließung
 EarlyClosingComment=Notiz zur vorzeitigen Schließung
 ##### Types de contacts #####
@@ -589,3 +590,4 @@ FacParentLine=Übergeordnete Rechnungszeile
 SituationTotalRayToRest=Restbetrag zu zahlen ohne Steuern
 PDFSituationTitle=Situation Nr. %d
 SituationTotalProgress=Gesamtfortschritt %d %%
+SearchUnpaidInvoicesWithDueDate=Suche unbezahlte Rechnungen mit Fälligkeitsdatum = %s
diff --git a/htdocs/langs/de_DE/cashdesk.lang b/htdocs/langs/de_DE/cashdesk.lang
index 7dce553f330..0a9f317661b 100644
--- a/htdocs/langs/de_DE/cashdesk.lang
+++ b/htdocs/langs/de_DE/cashdesk.lang
@@ -102,7 +102,7 @@ CashDeskGenericMaskCodes6 =  Das Tag <br> <b> {TN} </b> wird zum Hinzufügen de
 TakeposGroupSameProduct=Gruppieren Sie dieselben Produktlinien
 StartAParallelSale=Starten Sie einen neuen Parallelverkauf
 SaleStartedAt=Der Verkauf begann bei %s
-ControlCashOpening=Kontrollieren Sie das Popup-Fenster beim Öffnen des POS
+ControlCashOpening=Open the "Control cash" popup when opening the POS
 CloseCashFence=Schließen Sie die Kassensteuerung
 CashReport=Kassenbericht
 MainPrinterToUse=Quittungsdrucker
@@ -126,5 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Das Modul Belegdrucker muss zuerst aktiviert w
 AllowDelayedPayment=Verzögerte Zahlung zulassen
 PrintPaymentMethodOnReceipts=Zahlungsmethode auf Tickets | Quittungen drucken
 WeighingScale=Waage
-ShowPriceHT = Zeigen Sie den Preis ohne Steuerspalte an
-ShowPriceHTOnReceipt = Zeigen Sie den Preis ohne Steuerspalte auf der Quittung an
+ShowPriceHT = Display the column with the price excluding tax (on screen)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
diff --git a/htdocs/langs/de_DE/compta.lang b/htdocs/langs/de_DE/compta.lang
index eddf7ee9a60..df0d32263fa 100644
--- a/htdocs/langs/de_DE/compta.lang
+++ b/htdocs/langs/de_DE/compta.lang
@@ -286,3 +286,9 @@ ReportPurchaseTurnover=Kaufumsatz in Rechnung gestellt
 ReportPurchaseTurnoverCollected=Kaufumsatz gesammelt
 IncludeVarpaysInResults = Nehmen Sie verschiedene Zahlungen in Berichte auf
 IncludeLoansInResults = Kredite in Berichte aufnehmen
+InvoiceLate30Days = Invoices late > 30 days
+InvoiceLate15Days = Invoices late > 15 days
+InvoiceLateMinus15Days = Überfällige Rechnungen
+InvoiceNotLate = To be collected < 15 days
+InvoiceNotLate15Days = To be collected in 15 days
+InvoiceNotLate30Days = To be collected in 30 days
diff --git a/htdocs/langs/de_DE/cron.lang b/htdocs/langs/de_DE/cron.lang
index 16b0ab2b940..c52d1335f8b 100644
--- a/htdocs/langs/de_DE/cron.lang
+++ b/htdocs/langs/de_DE/cron.lang
@@ -24,8 +24,8 @@ CronLastOutput=Ausgabe der letzten Ausführung
 CronLastResult=Letzter Resultatcode
 CronCommand=Befehl
 CronList=Geplante Aufträge
-CronDelete=cronjobs löschen
-CronConfirmDelete=Sind Sie sicher, dass Sie diese geplante Aufträge  jetzt löschen möchten?
+CronDelete=Geplante Aufgabe(n) löschen
+CronConfirmDelete=Sind Sie sicher, dass Sie diese geplanten Aufträge jetzt löschen möchten?
 CronExecute=Geplanter Auftrag jetzt ausführen 
 CronConfirmExecute=Sind Sie sicher, dass Sie diese geplante Aufträge jetzt ausführen möchten?
 CronInfo=Das Modul "Cron-Jobs" erlaubt es Aufgaben zu bestimmten Zeitpunkten auszuführen. Die Aufgaben können auch manuell gestartet werden.
@@ -41,7 +41,7 @@ CronClass=Klasse
 CronMethod=Methode
 CronModule=Modul
 CronNoJobs=Keine Jobs eingetragen
-CronPriority=Rang
+CronPriority=Priorität
 CronLabel=Bezeichnung
 CronNbRun=Anzahl Starts
 CronMaxRun=Maximale Anzahl von Starts
@@ -60,7 +60,7 @@ CronErrEndDateStartDt=Enddatum kann nicht vor dem Startdatum liegen
 StatusAtInstall=Status bei der Modulinstallation
 CronStatusActiveBtn=Zeitplan
 CronStatusInactiveBtn=Deaktivieren
-CronTaskInactive=Dieser Job ist deaktiviert
+CronTaskInactive=This job is disabled (not scheduled)
 CronId=ID
 CronClassFile=Dateiname mit Klasse
 CronModuleHelp=Name des Dolibarr Modulverzeichnisses (auch für externe Dolibarr Module). <BR> Um zum Beispiel die Abrufmethode eines Dolibarr Produkt-Objektes aufzurufen /htdocs/<u>product</u>/class/product.class.php, ist der Wert für Modul<br><i>product</i>
diff --git a/htdocs/langs/de_DE/errors.lang b/htdocs/langs/de_DE/errors.lang
index d9066c6b552..c3aebb6bf76 100644
--- a/htdocs/langs/de_DE/errors.lang
+++ b/htdocs/langs/de_DE/errors.lang
@@ -11,6 +11,7 @@ ErrorBadValueForParamNotAString=Ungültiger Wert für Ihren Parameter. Normalerw
 ErrorRefAlreadyExists=Die Referenz <b> %s </b> ist bereits vorhanden.
 ErrorLoginAlreadyExists=Benutzername %s existiert bereits.
 ErrorGroupAlreadyExists=Gruppe %s existiert bereits.
+ErrorEmailAlreadyExists=Email %s already exists.
 ErrorRecordNotFound=Eintrag wurde nicht gefunden.
 ErrorFailToCopyFile=Konnte die Datei <b>'%s'</b> nicht nach <b>'%s'</b> kopieren.
 ErrorFailToCopyDir=Konnte Verzeichnis '<b>%s</b>' nicht nach '<b>%s</b>' kopieren.
@@ -117,7 +118,7 @@ ErrorCantReadFile=Fehler beim Lesen der Datei '%s'
 ErrorCantReadDir=Fehler beim Lesen des Verzeichnisses '%s'
 ErrorBadLoginPassword=Benutzername oder Passwort falsch
 ErrorLoginDisabled=Ihr Konto wurde deaktiviert
-ErrorFailedToRunExternalCommand=Fehler beim Ausführen des externen Befehls. Überprüfen Sie dessen Verfügbarkeit und Ausführbarkeit durch den PHP-Server. Sollte der <b>PHP Safe Mode</b> aktiviert sein, stellen Sie sicher dass der Befehl in einem der <b>safe_mode_exec_dir</b>-Verzeichnisse ausgeführt wird.
+ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server user. Check also the command is not protected on shell level by a security layer like apparmor.
 ErrorFailedToChangePassword=Passwortänderung fehlgeschlagen
 ErrorLoginDoesNotExists=Benutzer mit Anmeldung <b>%s</b> konnte nicht gefunden werden.
 ErrorLoginHasNoEmail=Dieser Benutzer hat keine E-Mail-Adresse. Prozess abgebrochen.
@@ -262,6 +263,7 @@ ErrorDateIsInFuture=Fehler, das Datum kann nicht in der Zukunft liegen
 ErrorAnAmountWithoutTaxIsRequired=Fehler, Betrag ist notwendig
 ErrorAPercentIsRequired=Fehler, bitte geben Sie den Prozentsatz korrekt ein
 ErrorYouMustFirstSetupYourChartOfAccount=Sie müssen zuerst Ihren Kontenplan einrichten
+ErrorFailedToFindEmailTemplate=Failed to find template with code name %s
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Ihr PHP Parameter upload_max_filesize (%s) ist größer als Parameter post_max_size (%s). Dies ist eine inkonsistente Einstellung.
@@ -298,3 +300,4 @@ WarningModuleXDisabledSoYouMayMissEventHere=Das Modul %s wurde nicht aktiviert.
 ErrorActionCommPropertyUserowneridNotDefined=Der Besitzer des Benutzers ist erforderlich
 ErrorActionCommBadType=Der ausgewählte Ereignistyp (ID: %n, Code: %s) ist im Wörterbuch für den Ereignistyp nicht vorhanden
 CheckVersionFail=Versionsprüfung fehlgeschlagen
+ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
diff --git a/htdocs/langs/de_DE/eventorganization.lang b/htdocs/langs/de_DE/eventorganization.lang
index 758e9e383d5..f7f265a2e8b 100644
--- a/htdocs/langs/de_DE/eventorganization.lang
+++ b/htdocs/langs/de_DE/eventorganization.lang
@@ -1,4 +1,5 @@
 # Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+# Copyright (C) 2021		Dorian Vabre			<dorian.vabre@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
@@ -81,7 +82,10 @@ PriceOfBoothHelp=Abonnementpreis für einen Stand
 EventOrganizationICSLink=Verknüpfe ICS für Ereignisse
 ConferenceOrBoothInformation=Konferenz- oder Standinformationen
 Attendees = Teilnehmer
+DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Sicherer Schlüssel des öffentlichen Registrierungslinks zu einer Konferenz
+SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
 #
 # Status
 #
@@ -94,8 +98,46 @@ EvntOrgCancelled = Abgesagt
 #
 # Public page
 #
+SuggestForm = Suggestion page
+RegisterPage = Page for conferences or booth
+EvntOrgRegistrationHelpMessage = Here, you can vote for an event, or suggest a new conference or booth for the project
+EvntOrgRegistrationConfHelpMessage = Here, you can suggest a new conference for the project
+EvntOrgRegistrationBoothHelpMessage = Here, you can suggest a new booth for the project
+ListOfSuggestedConferences = List of suggested conferences
+ListOfSuggestedBooths = List of suggested booths
+SuggestConference = Suggest a new conference
+SuggestBooth = Suggest a booth
+ViewAndVote = View and vote for suggested events
 PublicAttendeeSubscriptionPage = Öffentlicher Link zur Registrierung zu einer Konferenz
 MissingOrBadSecureKey = Der Sicherheitsschlüssel ist ungültig oder fehlt
-EvntOrgWelcomeMessage = Mit diesem Formular können Sie sich als neuer Teilnehmer an der Konferenz registrieren
-EvntOrgStartDuration = Diese Konferenz beginnt am
-EvntOrgEndDuration =  und endet am
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference : '%s'
+EvntOrgDuration = This conference starts on %s and ends on %s.
+ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
+BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
+EventType = Ereignistyp
+
+#
+# Vote page
+#
+EvntOrgRegistrationWelcomeMessage = Welcome on the conference or booth suggestion page.
+EvntOrgRegistrationConfWelcomeMessage = Welcome on the conference suggestion page.
+EvntOrgRegistrationBoothWelcomeMessage = Welcome on the booth suggestion page.
+EvntOrgVoteHelpMessage = Here, you can view and vote for the suggested events for the project
+VoteOk = Your vote has been accepted.
+AlreadyVoted = You have already voted for this event.
+VoteError = An error has occurred during the vote, please try again.
+
+#
+# SubscriptionOk page
+#
+SubscriptionOk = Your subscription to this conference has been validated
+#
+# Subscription validation mail
+#
+ConfAttendeeSubscriptionConfirmation = Confirmation of your subscription to a conference
+#
+# Payment page
+#
+Attendee = Attendee
+PaymentConferenceAttendee = Conference attendee payment
+PaymentBoothLocation = Booth location payment
diff --git a/htdocs/langs/de_DE/hrm.lang b/htdocs/langs/de_DE/hrm.lang
index c3bf5170ae6..964ecea1c7f 100644
--- a/htdocs/langs/de_DE/hrm.lang
+++ b/htdocs/langs/de_DE/hrm.lang
@@ -9,7 +9,7 @@ ConfirmDeleteEstablishment=Sind Sie sicher, dass Sie diese Einrichtung löschen
 OpenEtablishment=Einrichtung öffnen
 CloseEtablishment=Einrichtung schliessen
 # Dictionary
-DictionaryPublicHolidays=PV - Öffentliche Feiertage
+DictionaryPublicHolidays=Leave - Public holidays
 DictionaryDepartment=PV - Abteilungsliste
 DictionaryFunction=HRM - Stellenangebote
 # Module
diff --git a/htdocs/langs/de_DE/knowledgemanagement.lang b/htdocs/langs/de_DE/knowledgemanagement.lang
index cee190153a9..0488302e764 100644
--- a/htdocs/langs/de_DE/knowledgemanagement.lang
+++ b/htdocs/langs/de_DE/knowledgemanagement.lang
@@ -47,7 +47,7 @@ KnowledgeManagementArea = Wissensmanagement
 # Menu
 #
 MenuKnowledgeRecord = Wissensbasis
-ListOfArticles = Liste der Artikel
+ListKnowledgeRecord = Liste der Artikel
 NewKnowledgeRecord = Neuer Artikel
 ValidateReply = Lösung bestätigen
 KnowledgeRecords = Artikel
diff --git a/htdocs/langs/de_DE/languages.lang b/htdocs/langs/de_DE/languages.lang
index 9a61df6591a..b4e3aa39c00 100644
--- a/htdocs/langs/de_DE/languages.lang
+++ b/htdocs/langs/de_DE/languages.lang
@@ -3,6 +3,7 @@ Language_am_ET=Ethiopisch
 Language_ar_AR=Arabisch
 Language_ar_EG=Arabisch (Ägypten)
 Language_ar_SA=Arabisch
+Language_ar_TN=Arabic (Tunisia)
 Language_az_AZ=Aserbaidschanisch
 Language_bn_BD=Bengali
 Language_bn_IN=Bengali (Indien)
@@ -84,6 +85,7 @@ Language_nl_NL=Niederländisch
 Language_pl_PL=Polnisch
 Language_pt_BR=Portugiesisch (Brasilien)
 Language_pt_PT=Portugiesisch (Portugal)
+Language_ro_MD=Romanian (Moldavia)
 Language_ro_RO=Rumänisch
 Language_ru_RU=Russisch
 Language_ru_UA=Russisch (Ukraine)
diff --git a/htdocs/langs/de_DE/main.lang b/htdocs/langs/de_DE/main.lang
index c4c49e3421a..ed635ddccd9 100644
--- a/htdocs/langs/de_DE/main.lang
+++ b/htdocs/langs/de_DE/main.lang
@@ -430,6 +430,7 @@ LT1IN=CGST
 LT2IN=SGST
 LT1GC=Zusätzliche Cent
 VATRate=Steuersatz
+RateOfTaxN=Rate of tax %s
 VATCode=Steuersatz
 VATNPR=Steuersatz
 DefaultTaxRate=Standardsteuersatz
@@ -729,6 +730,7 @@ MenuMembers=Mitglieder
 MenuAgendaGoogle=Google-Agenda
 MenuTaxesAndSpecialExpenses=Steuern | Sonderausgaben
 ThisLimitIsDefinedInSetup=Gesetzte Dolibarr-Limits (Menü Start-Einstellungen-Sicherheit): %s Kb, PHP Limit: %s Kb
+ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
 NoFileFound=Keine Dokumente hochgeladen
 CurrentUserLanguage=Aktuelle Benutzersprache
 CurrentTheme=Aktuelles Design
@@ -1072,6 +1074,7 @@ ValidFrom=Gültig ab
 ValidUntil=Gültig bis
 NoRecordedUsers=Keine Benutzer
 ToClose=Zu schließen
+ToRefuse=To refuse
 ToProcess=Zu bearbeiten
 ToApprove=Zu genehmigen
 GlobalOpenedElemView=Globale Ansicht
@@ -1126,9 +1129,11 @@ UpdateForAllLines=Aktualisierung für alle Zeilen
 OnHold=angehalten
 Civility=Anrede/Titel
 AffectTag=Schlagwort beeinflussen
+CreateExternalUser=Externen Benutzer anlegen
 ConfirmAffectTag=Massen-Schlagwort-Affekt
 ConfirmAffectTagQuestion=Sind Sie sicher, dass Sie Tags für die ausgewählten Datensätze von %s beeinflussen möchten?
 CategTypeNotFound=Für den Datensatztyp wurde kein Tag-Typ gefunden
 CopiedToClipboard=In die Zwischenablage kopiert
 InformationOnLinkToContract=Dieser Betrag ist nur die Summe aller Vertragszeilen. Zeitbegriff wird nicht berücksichtigt.
 ConfirmCancel=Bist du sicher, dass du abbrechen möchtest
+EmailMsgID=Email MsgID
diff --git a/htdocs/langs/de_DE/members.lang b/htdocs/langs/de_DE/members.lang
index 57b3887a7aa..a76d0184372 100644
--- a/htdocs/langs/de_DE/members.lang
+++ b/htdocs/langs/de_DE/members.lang
@@ -213,3 +213,5 @@ SendReminderForExpiredSubscription=Erinnerungen per E-Mail an Mitglieder senden,
 MembershipPaid=Die Mitgliedschaft wurde für den aktuellen Zeitraum bezahlt (bis %s)
 YouMayFindYourInvoiceInThisEmail=Sie finden Ihre Rechnung anhängend an dieser E-Mail.
 XMembersClosed=%s Mitglied(er) geschlossen
+XExternalUserCreated=%s external user(s) created
+ForceMemberNature=Force member nature (Individual or Corporation)
diff --git a/htdocs/langs/de_DE/modulebuilder.lang b/htdocs/langs/de_DE/modulebuilder.lang
index 8f91793c5f4..1900a8b8c50 100644
--- a/htdocs/langs/de_DE/modulebuilder.lang
+++ b/htdocs/langs/de_DE/modulebuilder.lang
@@ -25,7 +25,7 @@ EnterNameOfModuleToDeleteDesc=Sie können Ihr Modul löschen. WARNUNG: Alle Code
 EnterNameOfObjectToDeleteDesc=Sie können ein Objekt löschen. WARNUNG: Alle Codedateien (generiert oder manuell erstellt), die sich auf das Objekt beziehen, werden gelöscht!
 DangerZone=Gefahrenzone
 BuildPackage=Paket erstellen
-BuildPackageDesc=Sie können ein Zip-Paket Ihrer Anwendung erstellen, um es auf Dolibarr-Installationen verteilen können. Sie können es auch vertreiben oder auf einem Marktplatz wie <a href="https://www.dolistore.com"> DoliStore.com </a> verkaufen.
+BuildPackageDesc=Sie können ein Zip-Paket Ihrer Anwendung erstellen, um es auf Dolibarr-Installationen verteilen können. Sie können es auch auf einem Marktplatz wie <a href="https://www.dolistore.com"> DoliStore.com </a> verteilen oder verkaufen.
 BuildDocumentation=Dokumentation erstellen
 ModuleIsNotActive=Dieses Modul ist noch nicht aktiviert. Gehe zu %s zum aktivieren oder klicke hier
 ModuleIsLive=Dieses Modul wurde aktiviert. Jede Änderung kann aktuelle Live-Funktionen beeinträchtigen.
@@ -127,7 +127,7 @@ UseSpecificEditorURL = Verwenden Sie eine bestimmte Editor-URL
 UseSpecificFamily = Verwenden Sie eine bestimmte Familie
 UseSpecificAuthor = Verwenden Sie einen bestimmten Autor
 UseSpecificVersion = Verwenden Sie eine bestimmte Anfangsversion
-IncludeRefGeneration=Die Objektreferen muss automatisch generiert werden
+IncludeRefGeneration=Die Objektreferenz soll automatisch generiert werden
 IncludeRefGenerationHelp=Aktivieren Sie diese Option, wenn Sie Code einschließen möchten, um die Generierung der Referenz automatisch zu verwalten
 IncludeDocGeneration=Ich möchte einige Dokumente aus dem Objekt generieren
 IncludeDocGenerationHelp=Wenn Sie dies aktivieren, wird Code generiert, um dem Datensatz ein Feld "Dokument generieren" hinzuzufügen.
@@ -137,9 +137,10 @@ CSSClass=CSS for edit/create form
 CSSViewClass=CSS for read form
 CSSListClass=CSS for list
 NotEditable=Nicht bearbeitbar
-ForeignKey=Unbekannter Schlüssel
+ForeignKey=Fremdschlüssel
 TypeOfFieldsHelp=Feldtypen:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' heißt, wir ergänzen eine + Schaltfläche nach der Kombobox, um den Eintrag zu erstellen, 'filter' kann sein 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' zum Beispiel)
 AsciiToHtmlConverter=Ascii zu HTML Konverter
 AsciiToPdfConverter=Ascii zu PDF Konverter
 TableNotEmptyDropCanceled=Tabelle nicht leer. Löschen wurde abgebrochen.
 ModuleBuilderNotAllowed=Der Modul-Generator ist verfügbar, aber für Ihren Benutzer nicht zulässig.
+ImportExportProfiles=Import and export profiles
diff --git a/htdocs/langs/de_DE/mrp.lang b/htdocs/langs/de_DE/mrp.lang
index 7d3f687b6df..942f6e951b9 100644
--- a/htdocs/langs/de_DE/mrp.lang
+++ b/htdocs/langs/de_DE/mrp.lang
@@ -13,7 +13,7 @@ BOMsSetup=Stücklisten Modul einrichten
 ListOfBOMs=Stücklisten-Übersicht
 ListOfManufacturingOrders=Liste der Fertigungsaufträge
 NewBOM=Neue Stückliste
-ProductBOMHelp=Produkt, das mit dieser Stückliste erstellt werden soll. <br> Hinweis: Produkte mit der Eigenschaft 'Art des Produkts' = 'Rohmaterial' sind in dieser Liste nicht sichtbar.
+ProductBOMHelp=Product to create (or disassemble) with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
 BOMsNumberingModules=Vorlage für die Stücklistennummerierung
 BOMsModelModule=Dokumentvorlagen für Stücklisten
 MOsNumberingModules=Nummerierungsvorlagen für Fertigungsaufträge
@@ -39,7 +39,7 @@ DateStartPlannedMo=Geplantes Startdatum
 DateEndPlannedMo=Geplantes Enddatum
 KeepEmptyForAsap=Leer bedeutet 'So bald wie möglich'
 EstimatedDuration=geschätzte Dauer
-EstimatedDurationDesc=Geschätzte Dauer für die Produktherstellung unter Verwendung dieser Stückliste
+EstimatedDurationDesc=Estimated duration to manufacture (or disassemble) this product using this BOM
 ConfirmValidateBom=Sicher, dass die Stückliste abgeglichen wird mit der Referenz <strong>%s</strong> (kann genutzt werden, um neue Fertigungsaufträge zu erstellen)
 ConfirmCloseBom=Soll diese Stückliste wirlich storniert werden (Sie kann nicht mehr zum Erstellen neuer Fertigungsaufträge verwendet werden)?
 ConfirmReopenBom=Soll diese Stückliste erneut geöffnet werden (Sie können damit neue Fertigungsaufträge erstellen)?
@@ -63,13 +63,14 @@ ConsumeAndProduceAll=Alles verbrauchen und produzieren
 Manufactured=Hergestellt
 TheProductXIsAlreadyTheProductToProduce=Das hinzuzufügende Produkt ist bereits das zu produzierende Produkt.
 ForAQuantityOf=Für eine zu produzierende Menge von %s
+ForAQuantityToConsumeOf=For a quantity to disassemble of %s
 ConfirmValidateMo=Möchten Sie diesen Fertigungsauftrag validieren?
 ConfirmProductionDesc=Durch Klicken auf '%s' validieren Sie den Materialverbrauch und / oder die Produktion für die eingestellten Mengen. Dadurch werden auch Bestände aktualisiert und Bestandsbewegungen aufgezeichnet.
 ProductionForRef=Produktion von %s
 AutoCloseMO=Automatisch den Fertigungsauftrag beenden, wenn die zu verbrauchenden und zu produzierenden Mengen erreicht sind
 NoStockChangeOnServices=Keine Bestandsveränderung bei Dienstleistungen
 ProductQtyToConsumeByMO=zu verbrauchende Produktmenge von offenem Fertigungsauftrag 
-ProductQtyToProduceByMO=herzustellende Produktmenge von offenem Fertigungsauftrag
+ProductQtyToProduceByMO=Product quantity still to produce by open MO
 AddNewConsumeLines=Eine neue Zeile Verbrauch hinzufügen
 ProductsToConsume=Produkte zu verbrauchen
 ProductsToProduce=Produkte zu produzieren
diff --git a/htdocs/langs/de_DE/orders.lang b/htdocs/langs/de_DE/orders.lang
index 221b387169f..89e0f879420 100644
--- a/htdocs/langs/de_DE/orders.lang
+++ b/htdocs/langs/de_DE/orders.lang
@@ -11,6 +11,7 @@ OrderDate=Bestelldatum
 OrderDateShort=Bestelldatum
 OrderToProcess=Auftrag zur Bearbeitung
 NewOrder=Neue Bestellung
+NewSupplierOrderShort=Neue Bestellung
 NewOrderSupplier=Neue Auftragsbestätigung
 ToOrder=Erzeuge Bestellung
 MakeOrder=Erzeuge Bestellung
@@ -73,6 +74,7 @@ DeleteOrder=Bestellung löschen
 CancelOrder=Bestellung stornieren
 OrderReopened= Bestellung %s wieder geöffnet
 AddOrder=Bestellung erstellen
+AddSupplierOrderShort=Bestellung erstellen
 AddPurchaseOrder=Auftragsbestätigung erstellen
 AddToDraftOrders=Zu Bestellentwurf hinzufügen
 ShowOrder=Bestellung anzeigen
diff --git a/htdocs/langs/de_DE/other.lang b/htdocs/langs/de_DE/other.lang
index 1c52689a5fa..3cffc5efc10 100644
--- a/htdocs/langs/de_DE/other.lang
+++ b/htdocs/langs/de_DE/other.lang
@@ -129,6 +129,7 @@ ClosedByLogin=geschlossen von User
 FileWasRemoved=Datei wurde entfernt
 DirWasRemoved=Verzeichnis wurde entfernt
 FeatureNotYetAvailable=Diese Funktion steht in dieser Version noch nicht zur Verfügung
+FeatureNotAvailableOnDevicesWithoutMouse=Feature not available on devices without mouse
 FeaturesSupported=Unterstützte Funktionalität
 Width=Breite
 Height=Höhe
@@ -263,7 +264,7 @@ ContactCreatedByEmailCollector=Kontakt / Adresse durch das Modul E-Mail-Sammler
 ProjectCreatedByEmailCollector=Projekt durch das Modul E-Mail-Sammler aus der E-Mail erstellt. MSGID %s
 TicketCreatedByEmailCollector=Ticket durch das Modul E-Mail-Sammler aus der E-Mail erstellt. MSGID %s
 OpeningHoursFormatDesc=Benutze unterschiedliche von - bis Öffnungs- und Schließzeiten.<br>Leerzeichen trennt unterschiedliche Bereiche.<br>Beispiel: 8-12 14-18
-PrefixSession=Präfix für Sitzungs-ID
+SuffixSessionName=Suffix for session name
 
 ##### Export #####
 ExportsArea=Exportübersicht
diff --git a/htdocs/langs/de_DE/partnership.lang b/htdocs/langs/de_DE/partnership.lang
index 7af57cdfae5..f4bdf8ff992 100644
--- a/htdocs/langs/de_DE/partnership.lang
+++ b/htdocs/langs/de_DE/partnership.lang
@@ -16,41 +16,72 @@
 #
 # Generic
 #
-ModulePartnershipName = Partnership management
-PartnershipDescription = Module Partnership management
-PartnershipDescriptionLong= Module Partnership management
+ModulePartnershipName=Parnterschafts-Verwaltung
+PartnershipDescription=Modul zur Parnterschafts-Verwaltung
+PartnershipDescriptionLong= Modul zur Parnterschafts-Verwaltung
+
+AddPartnership=Add partnership
+CancelPartnershipForExpiredMembers=Partnership: Cancel partnership of members with expired subscriptions
+PartnershipCheckBacklink=Partnership: Check referring backlink
 
 #
 # Menu
 #
-NewPartnership = New Partnership
-ListOfPartnerships = List of partnership
+NewPartnership=Neue Partnerschaft
+ListOfPartnerships=Liste der Partnerschaften
 
 #
 # Admin page
 #
-PartnershipSetup = Partnership setup
-PartnershipAbout = About Partnership
-PartnershipAboutPage = Partnership about page
-
+PartnershipSetup=Partnership setup
+PartnershipAbout=Über die Partschnerschaft
+PartnershipAboutPage=Partnership about page
+partnershipforthirdpartyormember=Partner status must be set on a 'thirdparty' or a 'member'
+PARTNERSHIP_IS_MANAGED_FOR=Partnership managed for
+PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks to check
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb of days before cancelling status of a partnership when a subscription has expired
+ReferingWebsiteCheck=Check of website referring
+ReferingWebsiteCheckDesc=You can enable a feature to check that your partners has added a backlink to your website domains on their own website.
 
 #
 # Object
 #
+DeletePartnership=Delete a partnership
+PartnershipDedicatedToThisThirdParty=Partnership dedicated to this third party
+PartnershipDedicatedToThisMember=Partnership dedicated to this member
 DatePartnershipStart=Startdatum
 DatePartnershipEnd=Ende
+ReasonDecline=Decline reason
+ReasonDeclineOrCancel=Decline reason
+PartnershipAlreadyExist=Partnership already exist
+ManagePartnership=Manage partnership
+BacklinkNotFoundOnPartnerWebsite=Backlink not found on partner website
+ConfirmClosePartnershipAsk=Are you sure you want to cancel this partnership?
+PartnershipType=Partnership type
 
 #
 # Template Mail
 #
+SendingEmailOnPartnershipWillSoonBeCanceled=Partnerschaft wird bald beendet
+SendingEmailOnPartnershipRefused=Partnerschaft abgelehnt
+SendingEmailOnPartnershipAccepted=Partnerschaft akzeptiert
+SendingEmailOnPartnershipCanceled=Partnerschaft beendet
 
+YourPartnershipWillSoonBeCanceledTopic=Partnerschaft wird bald beendet
+YourPartnershipRefusedTopic=Partnerschaft abgelehnt
+YourPartnershipAcceptedTopic=Partnerschaft akzeptiert
+YourPartnershipCanceledTopic=Partnerschaft beendet
+
+YourPartnershipWillSoonBeCanceledContent=We inform you that your partnership will soon be canceled (Backlink not found)
+YourPartnershipRefusedContent=We inform you that your partnership request has been refused.
+YourPartnershipAcceptedContent=We inform you that your partnership request has been accepted.
+YourPartnershipCanceledContent=We inform you that your partnership has been canceled.
 
 #
 # Status
 #
-PartnershipDraft = Entwurf
-PartnershipAccepted = Bestätigt
-PartnershipRefused = Abgelehnt
-PartnershipCanceled = storniert
-
-PartnershipManagedFor=Partners are
+PartnershipDraft=Entwurf
+PartnershipAccepted=Bestätigt
+PartnershipRefused=Abgelehnt
+PartnershipCanceled=storniert
+PartnershipManagedFor=Partner sind
diff --git a/htdocs/langs/de_DE/productbatch.lang b/htdocs/langs/de_DE/productbatch.lang
index 8c94e861397..3e635883447 100644
--- a/htdocs/langs/de_DE/productbatch.lang
+++ b/htdocs/langs/de_DE/productbatch.lang
@@ -1,4 +1,4 @@
-# ProductBATCH language file - en_US - ProductBATCH
+# ProductBATCH language file - Source file is en_US - ProductBATCH
 ManageLotSerial=Chargen-/Serien-Nr. benutzen 
 ProductStatusOnBatch=Ja (Charge erforderlich)
 ProductStatusOnSerial=Ja  (einzigartige Seriennummer erforderlich)
@@ -33,3 +33,13 @@ CustomMasks=Fügt eine Option zum Definieren der Maske in der Produktkarte hinzu
 LotProductTooltip=Fügt der Produktkarte eine Option zum Definieren einer dedizierten Chargennummernmaske hinzu
 SNProductTooltip=Fügt der Produktkarte eine Option zum Definieren einer dedizierten Seriennummernmaske hinzu
 QtyToAddAfterBarcodeScan=Menge, die für jeden gescannten Barcode / jedes Los / jede Serienummer hinzugefügt werden muss
+LifeTime=Life span (in days)
+EndOfLife=End of life
+ManufacturingDate=Manufacturing date
+DestructionDate=Destruction date
+FirstUseDate=First use date
+QCFrequency=Quality control frequency (in days)
+
+#Traceability - qc status
+OutOfOrder=Out of order
+InWorkingOrder=In working order
diff --git a/htdocs/langs/de_DE/products.lang b/htdocs/langs/de_DE/products.lang
index 44c45864ae2..2d21211cc54 100644
--- a/htdocs/langs/de_DE/products.lang
+++ b/htdocs/langs/de_DE/products.lang
@@ -172,7 +172,7 @@ SuppliersPricesOfProductsOrServices=Herstellerpreise (von Produkten oder Dienstl
 CustomCode=Zolltarifnummer
 CountryOrigin=Herkunftsland
 RegionStateOrigin=Herkunftsregion
-StateOrigin=State|Province of origin
+StateOrigin=Ursprungs- Staat | Provinz
 Nature=Art des Produkts (roh / hergestellt)
 NatureOfProductShort=Art des Produkts
 NatureOfProductDesc=Rohmaterial oder hergestelltes Produkt
@@ -396,3 +396,5 @@ ActionAvailableOnVariantProductOnly=Aktion nur für die Produktvariante verfügb
 ProductsPricePerCustomer=Produktpreise pro Kunde
 ProductSupplierExtraFields=Zusätzliche Attribute (Lieferantenpreise)
 DeleteLinkedProduct=Löschen Sie das mit der Kombination verknüpfte untergeordnete Produkt
+PMPValue=Gewichteter Warenwert
+PMPValueShort=DSWP
diff --git a/htdocs/langs/de_DE/projects.lang b/htdocs/langs/de_DE/projects.lang
index f1ffc0c7575..b29ebd1163a 100644
--- a/htdocs/langs/de_DE/projects.lang
+++ b/htdocs/langs/de_DE/projects.lang
@@ -267,9 +267,11 @@ InvoiceToUse=Zu verwendender Rechnungsentwurf
 NewInvoice=Neue Rechnung
 OneLinePerTask=Eine Zeile pro Aufgabe
 OneLinePerPeriod=Eine Zeile pro Zeitraum
+OneLinePerTimeSpentLine=One line for each time spent declaration
 RefTaskParent=Übergeordnete Aufgabe
 ProfitIsCalculatedWith=Der Gewinn wird berechnet mit
 AddPersonToTask=Auch zu Aufgaben hinzufügen
 UsageOrganizeEvent=Verwendung: Ereignisorganisation
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Klassifizieren Sie das Projekt als abgeschlossen, wenn alle seine Aufgaben abgeschlossen sind (100%% Fortschritt).
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Hinweis: Bestehende Projekte mit allen Aufgaben mit dem Fortschritt 100%% sind nicht betroffen: Sie müssen sie manuell schließen. Diese Option betrifft nur offene Projekte.
+SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
diff --git a/htdocs/langs/de_DE/receptions.lang b/htdocs/langs/de_DE/receptions.lang
index 65e73211e22..943d0e0da66 100644
--- a/htdocs/langs/de_DE/receptions.lang
+++ b/htdocs/langs/de_DE/receptions.lang
@@ -44,4 +44,4 @@ ValidateOrderFirstBeforeReception=Sie müssen zunächst die order validate valid
 ReceptionsNumberingModules=Nummerierungsmodul für Empfänge
 ReceptionsReceiptModel=Dokumentvorlagen für Empfänge
 NoMorePredefinedProductToDispatch=Keine vordefinierten Produkte mehr zum Versand
-
+ReceptionExist=A reception exists
diff --git a/htdocs/langs/de_DE/stocks.lang b/htdocs/langs/de_DE/stocks.lang
index 810ce4a351d..11a4ed50c44 100644
--- a/htdocs/langs/de_DE/stocks.lang
+++ b/htdocs/langs/de_DE/stocks.lang
@@ -56,8 +56,6 @@ UnitPurchaseValue=Einkaufspreis pro Stück
 StockTooLow=Mindestbestand unterschritten
 StockLowerThanLimit=Lagerbestand unterhalb der Mindestbestandsmenge ( %s )
 EnhancedValue=Warenwert
-PMPValue=Gewichteter Warenwert
-PMPValueShort=DSWP
 EnhancedValueOfWarehouses=Lagerwert
 UserWarehouseAutoCreate=Automatisch ein Lager erstellen wenn ein neuer Benutzer erstellt wird
 AllowAddLimitStockByWarehouse=Verwalten Sie zusätzlich zum Wert für den Mindest- und den gewünschten Bestand pro Paar (Produktlager) auch den Wert für den Mindest- und den gewünschten Bestand pro Produkt
@@ -251,7 +249,10 @@ SelectAStockMovementFileToImport=Wählen Sie eine zu importierende Bestandsbeweg
 InfoTemplateImport=Hochgeladene Dateien müssen dieses Format haben (* sind Pflichtfelder): <br> Startlager * | Ziellager * | Produkt * | Menge * | Los- / Seriennummer <br> Das CSV-Zeichentrennzeichen muss "<b> %s </b>" sein.
 LabelOfInventoryMovemement=Inventar %s
 ReOpen=wiedereröffnen
-ConfirmFinish=Bestätigen Sie den Abschluss des Inventars? Dadurch werden alle Bestandsbewegungen generiert, um Ihren Bestand zu aktualisieren.
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock to the real qty you entered into the inventory.
 ObjectNotFound=%s nicht gefunden
 MakeMovementsAndClose=Bewegungen erzeugen und schließen
 AutofillWithExpected=Füllen Sie die reale Menge mit der erwarteten Menge
+ShowAllBatchByDefault=By default, show batch details on product "stock" tab
+CollapseBatchDetailHelp=You can set batch detail default display in stocks module configuration
+FieldCannotBeNegative=Field "%s" cannot be negative
diff --git a/htdocs/langs/de_DE/ticket.lang b/htdocs/langs/de_DE/ticket.lang
index d11fe870838..8743885fcf1 100644
--- a/htdocs/langs/de_DE/ticket.lang
+++ b/htdocs/langs/de_DE/ticket.lang
@@ -71,7 +71,7 @@ Deleted=Gelöscht
 Type=Typ
 Severity=Dringlichkeit
 TicketGroupIsPublic=Gruppe ist öffentlich
-TicketGroupIsPublicDesc=If a ticket group is public, it will be visible in the form when creating a ticket from the public interface
+TicketGroupIsPublicDesc=Falls eine Ticket-Gruppe öffentlich ist, wird sie in der öffentlichen Oberfläche zum erstellen eines Tickets sichtbar sein
 
 # Email templates
 MailToSendTicketMessage=Um eine E-Mail mit der Ticketmeldung zu senden
@@ -116,7 +116,7 @@ TicketsShowModuleLogo=Logo des Moduls im öffentlichen Interface anzeigen
 TicketsShowModuleLogoHelp=Aktiviere diese Option um das Logo des Moduls im öffentlichen Interface nicht anzuzeigen
 TicketsShowCompanyLogo=Unternehmenslogo im öffentlichen Interface anzeigen
 TicketsShowCompanyLogoHelp=Aktiviere diese Option um das Firmenlogo nicht im öffentlichen Interface anzuzeigen
-TicketsEmailAlsoSendToMainAddress=Also send a notification to the main email address
+TicketsEmailAlsoSendToMainAddress=Sende Benachrichtungen auch an die Hauptemailadresse
 TicketsEmailAlsoSendToMainAddressHelp=Enable this option to also send an email to the address defined into setup "%s" (see tab "%s")
 TicketsLimitViewAssignedOnly=Zeige nur dem Benutzer zugewiesene Tickets an (nicht gültig für externe Benutzer, diese sehen nur die Tickets des eigenen Partners)
 TicketsLimitViewAssignedOnlyHelp=Nur dem aktuellen Benutzer zugewiesene Tickets werden angezeigt. Trifft nicht auf Benutzer zu, die das Recht haben Tickets zu verwalten.
@@ -128,7 +128,7 @@ TicketNumberingModules=Ticketnummerierungsmodul
 TicketsModelModule=Dokumentvorlagen für Tickets
 TicketNotifyTiersAtCreation=Partner über Ticketerstellung informieren
 TicketsDisableCustomerEmail=E-Mails immer deaktivieren, wenn ein Ticket über die öffentliche Oberfläche erstellt wird
-TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is added to a ticket
+TicketsPublicNotificationNewMessage=Sende E-Mails, wenn neue Nachrichten oder Kommentare zum Ticket hinzugefügt wurden
 TicketsPublicNotificationNewMessageHelp=E-Mail (s) senden, wenn eine neue Nachricht von der öffentlichen Oberfläche hinzugefügt wird (an den zugewiesenen Benutzer oder die Benachrichtigungs-E-Mail an (Update) und / oder die Benachrichtigungs-E-Mail an)
 TicketPublicNotificationNewMessageDefaultEmail=Benachrichtigungen per E-Mail an (Update)
 TicketPublicNotificationNewMessageDefaultEmailHelp=Send an email to this address for each new message notifications if the ticket doesn't have a user assigned to it or if the user doesn't have any known email.
@@ -304,13 +304,13 @@ BoxLastModifiedTicket=Zuletzt bearbeitete TIckets
 BoxLastModifiedTicketDescription=Zuletzt bearbeitete Tickets (maximal %s)
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=Keine zuletzt bearbeiteten Tickets
-BoxTicketType=Number of open tickets by type
-BoxTicketSeverity=Number of open tickets by severity
+BoxTicketType=Distribution of open tickets by type
+BoxTicketSeverity=Anzahl der offenen Tickets nach Schwere
 BoxNoTicketSeverity=Keine Tickets geöffnet
-BoxTicketLastXDays=Number of new tickets by days the last %s days
-BoxTicketLastXDayswidget = Number of new tickets by days the last X days
-BoxNoTicketLastXDays=No new tickets the last %s days
+BoxTicketLastXDays=Anzahl der neuen Tickets nach Tagen innerhalb der letzten %s Tage
+BoxTicketLastXDayswidget = Anzahl der neuen Tickets nach Tagen innerhalb der letzten X Tage
+BoxNoTicketLastXDays=Keine neuen Tickets innerhalb der letzten %s Tage
 BoxNumberOfTicketByDay=Anzahl neuer Tickets pro Tag
-BoxNewTicketVSClose=Number of today's new tickets versus today's closed tickets
+BoxNewTicketVSClose=Zahl der heutigen neuen Tickets zu heute geschlossenen Tickets
 TicketCreatedToday=Ticket heute erstellt
 TicketClosedToday=Ticket heute geschlossen
diff --git a/htdocs/langs/de_DE/users.lang b/htdocs/langs/de_DE/users.lang
index c9f6aae0eb0..09aafd48c95 100644
--- a/htdocs/langs/de_DE/users.lang
+++ b/htdocs/langs/de_DE/users.lang
@@ -12,7 +12,7 @@ PasswordChangedTo=Neues Passwort: %s
 SubjectNewPassword=Ihr neues Passwort für %s
 GroupRights=Gruppenberechtigungen
 UserRights=Benutzerberechtigungen
-Credentials=Credentials
+Credentials=Zugangsdaten
 UserGUISetup=Konfiguration der Benutzeranzeige
 DisableUser=Deaktiviere Benutzer
 DisableAUser=Einen Benutzer deaktivieren
@@ -106,7 +106,7 @@ UseTypeFieldToChange=Nutzen sie das Feld "Typ" zum Ändern
 OpenIDURL=OpenID URL
 LoginUsingOpenID=Verwende OpenID für Anmeldung
 WeeklyHours=Sollarbeitszeit (Stunden pro Woche)
-ExpectedWorkedHours=Expected hours worked per week
+ExpectedWorkedHours=Erwartete Wochenarbeitszeit
 ColorUser=Benutzerfarbe
 DisabledInMonoUserMode=Deaktiviert im Wartungsmodus
 UserAccountancyCode=Buchhaltungscode Benutzer
diff --git a/htdocs/langs/el_CY/accountancy.lang b/htdocs/langs/el_CY/accountancy.lang
deleted file mode 100644
index 4dbdd035d6e..00000000000
--- a/htdocs/langs/el_CY/accountancy.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - accountancy
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
diff --git a/htdocs/langs/el_CY/cron.lang b/htdocs/langs/el_CY/cron.lang
deleted file mode 100644
index 67ecfc77567..00000000000
--- a/htdocs/langs/el_CY/cron.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - cron
-CronTaskInactive=This job is disabled
diff --git a/htdocs/langs/el_CY/exports.lang b/htdocs/langs/el_CY/exports.lang
new file mode 100644
index 00000000000..17dedd46696
--- /dev/null
+++ b/htdocs/langs/el_CY/exports.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - exports
+DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
diff --git a/htdocs/langs/el_CY/mrp.lang b/htdocs/langs/el_CY/mrp.lang
deleted file mode 100644
index a8ff138755b..00000000000
--- a/htdocs/langs/el_CY/mrp.lang
+++ /dev/null
@@ -1,6 +0,0 @@
-# Dolibarr language file - Source file is en_US - mrp
-BillOfMaterials=Bill of Material
-NewBOM=New bill of material
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
diff --git a/htdocs/langs/el_CY/products.lang b/htdocs/langs/el_CY/products.lang
new file mode 100644
index 00000000000..e0628dbec00
--- /dev/null
+++ b/htdocs/langs/el_CY/products.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - products
+ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
diff --git a/htdocs/langs/el_CY/stocks.lang b/htdocs/langs/el_CY/stocks.lang
new file mode 100644
index 00000000000..c6779157e0f
--- /dev/null
+++ b/htdocs/langs/el_CY/stocks.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - stocks
+OpenInternal=Open only for internal actions
diff --git a/htdocs/langs/el_CY/ticket.lang b/htdocs/langs/el_CY/ticket.lang
new file mode 100644
index 00000000000..82e110b1ca4
--- /dev/null
+++ b/htdocs/langs/el_CY/ticket.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - ticket
+TicketTypeShortISSUE=Issue, bug or problem
+OriginEmail=Email source
+NeedMoreInformation=Waiting for information
+TicketCategory=Group
diff --git a/htdocs/langs/el_GR/accountancy.lang b/htdocs/langs/el_GR/accountancy.lang
index 169f7870426..e3a557a9bdd 100644
--- a/htdocs/langs/el_GR/accountancy.lang
+++ b/htdocs/langs/el_GR/accountancy.lang
@@ -158,7 +158,7 @@ ACCOUNTING_LENGTH_AACCOUNT=Μήκος λογαριασμών τρίτου λογ
 ACCOUNTING_MANAGE_ZERO=Να επιτρέπεται η διαχείριση διαφορετικού αριθμού μηδενικών στο τέλος ενός λογαριασμού λογιστικής. Απαιτείται από ορισμένες χώρες (όπως η Ελβετία). Εάν είναι απενεργοποιημένη (προεπιλογή), μπορείτε να ορίσετε τις ακόλουθες δύο παραμέτρους για να ζητήσετε από την εφαρμογή να προσθέσει εικονικά μηδενικά.
 BANK_DISABLE_DIRECT_INPUT=Απενεργοποιήστε την απευθείας εγγραφή συναλλαγής σε τραπεζικό λογαριασμό
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Ενεργοποιήστε το σχέδιο εξαγωγής στο περιοδικό
-ACCOUNTANCY_COMBO_FOR_AUX=Ενεργοποίηση σύνθετης λίστας για επικουρικό λογαριασμό (μπορεί να είναι αργή αν έχετε πολλούς τρίτους)
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties, break ability to search on a part of value)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
@@ -328,6 +328,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountanc
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
+NotifiedExportDate=Notified export date (modification of the entries will not be possible)
+NotifiedValidationDate=Validation of the entries (modification or deletion of the entries will not be possible)
+ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=Εξαγωγή σχεδίου περιοδικού
 Modelcsv=Πρότυπο εξαγωγής
 Selectmodelcsv=Επιλέξτε ένα πρότυπο από την εξαγωγή
diff --git a/htdocs/langs/el_GR/admin.lang b/htdocs/langs/el_GR/admin.lang
index f8d1dab5376..ce655c6f539 100644
--- a/htdocs/langs/el_GR/admin.lang
+++ b/htdocs/langs/el_GR/admin.lang
@@ -221,8 +221,8 @@ NotCompatible=Αυτή η ενότητα δεν φαίνεται συμβατή
 CompatibleAfterUpdate=Αυτή η ενότητα απαιτεί ενημέρωση του Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=Δές στην Αγορά
 SeeSetupOfModule=Δείτε την ρύθμιση του module %s
+SetOptionTo=Set option <b>%s</b> to %s
 Updated=Ενημερωμένο
-Nouveauté=Καινοτομία
 AchatTelechargement=Αγόρασε / Μεταφόρτωσε
 GoModuleSetupArea=Για να ενεργοποιήσετε/εγκαταστήσετε ενα νέο module, πηγαίνετε στην περιοχή εγκατάστασης Modules/Applications: <a href="%s">%s</a>.
 DoliStoreDesc=Το DoliStore, είναι η επίσημη περιοχή για να βρείτε εξωτερικά modules για το Dolibarr ERP/CRM
@@ -399,6 +399,7 @@ SecurityToken=Security Token
 NoSmsEngine=Δεν διατίθεται διαχειριστής αποστολέων SMS. Ένας διαχειριστής αποστολέα SMS δεν είναι εγκατεστημένος με την προεπιλεγμένη διανομή επειδή εξαρτάται από έναν εξωτερικό προμηθευτή, αλλά μπορείτε να βρείτε μερικούς από τους %s
 PDF=PDF
 PDFDesc=Global options for PDF generation
+PDFOtherDesc=PDF Option specific to some modules
 PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Απόκρυψη όλων των πληροφοριών που σχετίζονται με το φόρο επί των πωλήσεων / ΦΠΑ
 PDFRulesForSalesTax=Κανόνες φόρου επί των πωλήσεων / ΦΠΑ
@@ -561,8 +562,8 @@ Module53Desc=Διαχείριση Υπηρεσιών
 Module54Name=Συμβόλαια / Συνδρομές
 Module54Desc=Διαχείριση συμβολαίων (υπηρεσίες ή επαναλαμβανόμενες συνδρομές)
 Module55Name=Barcodes
-Module55Desc=Διαχείριση barcode
-Module56Name=Payment by credit transfer
+Module55Desc=Barcode or QR code management
+Module56Name=πληρωμή μέσω μεταφοράς πιστώσεως
 Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
 Module57Name=Payments by Direct Debit
 Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
@@ -848,10 +849,10 @@ Permission402=Δημιουργία / τροποποίηση εκπτώσεων
 Permission403=Επικύρωση εκπτώσεων
 Permission404=Διαγραφή εκπτώσεων
 Permission430=Χρησιμοποιήστε τη γραμμή εντοπισμού σφαλμάτων
-Permission511=Read payments of salaries (yours and subordinates)
-Permission512=Δημιουργία / τροποποίηση πληρωμών μισθών
-Permission514=Διαγραφή πληρωμών μισθών
-Permission517=Read payments of salaries of everybody
+Permission511=Read salaries and payments (yours and subordinates)
+Permission512=Create/modify salaries and payments
+Permission514=Delete salaries and payments
+Permission517=Read salaries and payments everybody
 Permission519=Εξαγωγή μισθών
 Permission520=Ανάγνωση δανείων
 Permission522=Δημιουργία/μεταβολή δανείων
@@ -965,6 +966,8 @@ Permission23003=Διαγράψτε μια προγραμματισμένη ερ
 Permission23004=Εκτελέστε μια προγραμματισμένη εργασία
 Permission50101=Use Point of Sale (SimplePOS)
 Permission50151=Use Point of Sale (TakePOS)
+Permission50152=Edit sales lines
+Permission50153=Edit ordered sales lines
 Permission50201=Διαβάστε τις συναλλαγές
 Permission50202=Πράξεις εισαγωγής
 Permission50330=Read objects of Zapier
@@ -1039,11 +1042,12 @@ DictionaryMeasuringUnits=Μονάδες μέτρησης
 DictionarySocialNetworks=Κοινωνικά Δίκτυα
 DictionaryProspectStatus=Prospect status for companies
 DictionaryProspectContactStatus=Prospect status for contacts
-DictionaryHolidayTypes=Είδη αδειών
+DictionaryHolidayTypes=Leave - Types of leave
 DictionaryOpportunityStatus=Κατάσταση μολύβδου για έργο / μόλυβδο
 DictionaryExpenseTaxCat=Έκθεση δαπανών - Κατηγορίες μεταφορών
 DictionaryExpenseTaxRange=Έκθεση εξόδων - Εύρος ανά κατηγορία μεταφοράς
 DictionaryTransportMode=Intracomm report - Transport mode
+DictionaryBatchStatus=Product lot/serial Quality Control status
 TypeOfUnit=Type of unit
 SetupSaved=Οι ρυθμίσεις αποθηκεύτηκαν
 SetupNotSaved=Το πρόγραμμα εγκατάστασης δεν αποθηκεύτηκε
@@ -1187,7 +1191,7 @@ SetupDescription4= <a href="%s"> %s -> %s </a> <br> <br> Αυτό το λογι
 SetupDescription5=Άλλες καταχωρίσεις μενού ρυθμίσεων διαχειρίζονται προαιρετικές παραμέτρ
 AuditedSecurityEvents=Security events that are audited
 NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
-Audit=Ιστορικό εισόδου χρηστών
+Audit=Security events
 InfoDolibarr=Πληροφορίες Dolibarr
 InfoBrowser=Πληροφορίες Φυλλομετρητή
 InfoOS=Πληροφορίες OS
@@ -1319,9 +1323,12 @@ ConditionIsCurrently=Η κατάσταση είναι αυτή τη στιγμή
 YouUseBestDriver=Χρησιμοποιείτε τον οδηγό %s ο οποίος είναι ο καλύτερος διαθέσιμος οδηγός.
 YouDoNotUseBestDriver=Χρησιμοποιείτε τον οδηγό %s αλλά συνιστάται ο οδηγός %s.
 NbOfObjectIsLowerThanNoPb=Έχετε μόνο %s %s στη βάση δεδομένων. Αυτό δεν απαιτεί ιδιαίτερη βελτιστοποίηση.
+ComboListOptim=Combo list loading optimization
 SearchOptim=Βελτιστοποίηση αναζήτησης
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
-YouHaveXObjectAndSearchOptimOn=Έχετε %s %s στη βάση δεδομένων και σταθερή %s έχει οριστεί σε 1 στο Home-Setup-Other.
+YouHaveXObjectUseComboOptim=You have %s %s in the database. You can go into setup of module to enable loading of combo list on key pressed event.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other.
+YouHaveXObjectUseSearchOptimDesc=This limits the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to %s in Home-Setup-Other.
 BrowserIsOK=Χρησιμοποιείτε το πρόγραμμα περιήγησης web %s. Αυτό το πρόγραμμα περιήγησης είναι εντάξει για την ασφάλεια και την απόδοση.
 BrowserIsKO=Χρησιμοποιείτε το πρόγραμμα περιήγησης web %s. Αυτό το πρόγραμμα περιήγησης είναι γνωστό ότι αποτελεί κακή επιλογή για ασφάλεια, απόδοση και αξιοπιστία. Σας συνιστούμε να χρησιμοποιήσετε Firefox, Chrome, Opera ή Safari.
 PHPModuleLoaded=Το στοιχείο PHP %s έχει φορτωθεί
@@ -1433,6 +1440,7 @@ MemberMainOptions=Κύριες επιλογές
 AdherentLoginRequired= Διαχείριση μιας Σύνδεση για κάθε μέλος
 AdherentMailRequired=Απαιτείται ηλεκτρονικό ταχυδρομείο για τη δημιουργία νέου μέλους
 MemberSendInformationByMailByDefault=Τσέκαρε το πλαίσιο ελέγχου για την αποστολή επιβεβαίωσης αλληλογραφίας στα μέλη (επικύρωση ή νέα συνδρομή) είναι ενεργοποιημένη από προεπιλογή
+MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
 VisitorCanChooseItsPaymentMode=Ο επισκέπτης μπορεί να επιλέξει μεταξύ των διαθέσιμων τρόπων πληρωμής
 MEMBER_REMINDER_EMAIL=Ενεργοποιήστε την αυτόματη υπενθύμιση <b>μέσω ηλεκτρονικού ταχυδρομείου</b> των συνδρομών που έχουν λήξει. Σημείωση: Η ενότητα <strong>%s</strong> πρέπει να ενεργοποιηθεί και να ρυθμιστεί σωστά για να στείλετε υπενθυμίσεις.
 MembersDocModules=Document templates for documents generated from member record
@@ -1763,7 +1771,7 @@ AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting men
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Ενεργοποίηση ειδοποίησης ήχου
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
-AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the scheduled job %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Εμφάνιση συνδεδεμένου αντικειμένου στην προβολή ατζέντας
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
@@ -1979,6 +1987,8 @@ MAIN_PDF_MARGIN_RIGHT=Δεξί περιθώριο στο PDF
 MAIN_PDF_MARGIN_TOP=Κορυφή περιθώριο σε PDF
 MAIN_PDF_MARGIN_BOTTOM=Κάτω περιθώριο σε PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add picture on proposal line
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add electronic sign in PDF
 NothingToSetup=Δεν απαιτείται συγκεκριμένη ρύθμιση για αυτήν την ενότητα.
 SetToYesIfGroupIsComputationOfOtherGroups=Ορίστε αυτό το ναι αν αυτή η ομάδα είναι ένας υπολογισμός άλλων ομάδων
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
@@ -2096,7 +2106,6 @@ PDF_SHOW_PROJECT=Show project on document
 ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=Εάν θέλετε να αντιγράψετε ορισμένα κείμενα στο PDF σας σε 2 διαφορετικές γλώσσες στο ίδιο δημιουργημένο PDF, πρέπει να ορίσετε εδώ αυτήν τη δεύτερη γλώσσα, ώστε το παραγόμενο PDF να περιέχει 2 διαφορετικές γλώσσες στην ίδια σελίδα, αυτή που επιλέγεται κατά τη δημιουργία PDF και αυτή ( μόνο λίγα πρότυπα PDF το υποστηρίζουν αυτό). Κρατήστε κενό για 1 γλώσσα ανά PDF.
 FafaIconSocialNetworksDesc=Εισαγάγετε εδώ τον κωδικό ενός εικονιδίου FontAwesome. Εάν δεν γνωρίζετε τι είναι το FontAwesome, μπορείτε να χρησιμοποιήσετε τη γενική τιμή fa-address-book.
-FeatureNotAvailableWithReceptionModule=Η λειτουργία δεν είναι διαθέσιμη όταν είναι ενεργοποιημένη η λειτουργία Υποδοχή
 RssNote=Σημείωση: Κάθε ορισμός τροφοδοσίας RSS παρέχει ένα widget που πρέπει να ενεργοποιήσετε για να το έχετε διαθέσιμο στον πίνακα ελέγχου
 JumpToBoxes=Μετάβαση στη ρύθμιση -> Widgets
 MeasuringUnitTypeDesc=Χρησιμοποιήστε εδώ μια τιμή όπως "μέγεθος", "επιφάνεια", "όγκος", "βάρος", "χρόνος"
@@ -2120,12 +2129,18 @@ ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by
 MailToSendEventOrganization=Event Organization
 AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
 YouShouldDisablePHPFunctions=You should disable PHP functions
-IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands in custom code, you shoud disable PHP functions
+PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
+NotRecommended=Not recommanded
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
 ModuleUpdateAvailable=An update is available
 NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
+RandomlySelectedIfSeveral=Randomly selected if several pictures are available
+DatabasePasswordObfuscated=Database password is obfuscated in conf file
+DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
diff --git a/htdocs/langs/el_GR/agenda.lang b/htdocs/langs/el_GR/agenda.lang
index f4220eb7dc8..baa8560d638 100644
--- a/htdocs/langs/el_GR/agenda.lang
+++ b/htdocs/langs/el_GR/agenda.lang
@@ -4,7 +4,7 @@ Actions=Ενέργειες
 Agenda=Ημερολόγιο
 TMenuAgenda=Ημερολόγιο
 Agendas=Ημερολόγια
-LocalAgenda=Εσωτερικό ημερολόγιο
+LocalAgenda=Default calendar
 ActionsOwnedBy=Το γεγονός ανήκει
 ActionsOwnedByShort=Ιδιοκτήτης
 AffectedTo=Ανάθεση σε
@@ -14,13 +14,13 @@ EventsNb=Αριθμός γεγονότων
 ListOfActions=Λίστα γεγονότων
 EventReports=Αναφορές συμβάντων
 Location=Τοποθεσία
-ToUserOfGroup=Event assigned to any user in group
+ToUserOfGroup=Event assigned to any user in the group
 EventOnFullDay=Ολοήμερο Γεγονός
 MenuToDoActions=Όλες οι ημιτελής ενέργειες
 MenuDoneActions=Όλες οι ολοκληρ. ενέργειες
 MenuToDoMyActions=Ημιτελής ενέργειες
 MenuDoneMyActions=Ολοκληρωμένες ενέργειες
-ListOfEvents=Κατάλογος των συμβάντων (εσωτερικό ημερολόγιο)
+ListOfEvents=List of events (default calendar)
 ActionsAskedBy=Ενέργειες που καταχωρήθηκαν από
 ActionsToDoBy=Ενέργειες που ανατέθηκαν σε
 ActionsDoneBy=Ενέργειες που ολοκληρώθηκαν από
@@ -38,6 +38,7 @@ ActionsEvents=Γεγονότα για τα οποία θα δημιουργήσ
 EventRemindersByEmailNotEnabled=Οι υπενθυμίσεις συμβάντων μέσω ηλεκτρονικού ταχυδρομείου δεν ενεργοποιήθηκαν στη ρύθμιση μονάδας %s.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Το τρίτο μέρος %s δημιουργήθηκε
+COMPANY_MODIFYInDolibarr=Third party %s modified
 COMPANY_DELETEInDolibarr=Το τρίτο μέρος %s διαγράφηκε
 ContractValidatedInDolibarr=Συμβόλαιο %s επικυρώθηκε
 CONTRACT_DELETEInDolibarr=Η σύμβαση %s διαγράφηκε
@@ -87,6 +88,7 @@ OrderDeleted=Η παραγγελία διαγράφηκε
 InvoiceDeleted=Το τιμολόγιο διαγράφηκε
 DraftInvoiceDeleted=Το πρόχειρο τιμολόγιο διαγράφηκε
 CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_MODIFYInDolibarr=Contact %s modified
 CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Το προϊόν %s δημιουργήθηκε
 PRODUCT_MODIFYInDolibarr=Το προϊόν %s τροποποιήθηκε
@@ -119,6 +121,7 @@ MRP_MO_UNVALIDATEInDolibarr=MO set to draft status
 MRP_MO_PRODUCEDInDolibarr=Το ΜΟ παράχθηκε
 MRP_MO_DELETEInDolibarr=Το MO διαγράφηκε
 MRP_MO_CANCELInDolibarr=MO canceled
+PAIDInDolibarr=%s paid
 ##### End agenda events #####
 AgendaModelModule=Πρότυπα εγγράφων για συμβάν
 DateActionStart=Ημερομηνία έναρξης
@@ -130,7 +133,7 @@ AgendaUrlOptions4=<b>logint = %s</b> για να περιορίσετε την 
 AgendaUrlOptionsProject=<b>project = __ PROJECT_ID__</b> για να περιορίσετε την έξοδο σε ενέργειες που σχετίζονται με το έργο <b>__PROJECT_ID__</b> .
 AgendaUrlOptionsNotAutoEvent=<b>notactiontype = systemauto</b> για την εξαίρεση αυτόματων συμβάντων.
 AgendaUrlOptionsIncludeHolidays= <b> includeholidays = 1 </b> για να συμπεριλάβετε εκδηλώσεις διακοπών.
-AgendaShowBirthdayEvents=Εμφάνιση γενεθλίων των επαφών
+AgendaShowBirthdayEvents=Birthdays of contacts
 AgendaHideBirthdayEvents=Απόκρυψη γενεθλίων των επαφών
 Busy=Απασχολ.
 ExportDataset_event1=Κατάλογος των εκδηλώσεων
@@ -152,6 +155,7 @@ ActionType=Τύπος συμβάντος
 DateActionBegin=Έναρξη ημερομηνίας του συμβάντος
 ConfirmCloneEvent=Είστε σίγουροι πως θέλετε να κλωνοποιήσετε την εκδήλωση <b>%s</b>;
 RepeatEvent=Επανάληψη συμβάντος
+OnceOnly=Once only
 EveryWeek=Εβδομαδιαίο
 EveryMonth=Μηνιαίο
 DayOfMonth=Ημέρα του Μήνα
@@ -165,4 +169,4 @@ TimeType=Duration type
 ReminderType=Callback type
 AddReminder=Create an automatic reminder notification for this event
 ErrorReminderActionCommCreation=Error creating the reminder notification for this event
-BrowserPush=Browser Notification
+BrowserPush=Browser Popup Notification
diff --git a/htdocs/langs/el_GR/banks.lang b/htdocs/langs/el_GR/banks.lang
index 869392e158b..ba2203efda7 100644
--- a/htdocs/langs/el_GR/banks.lang
+++ b/htdocs/langs/el_GR/banks.lang
@@ -38,8 +38,8 @@ IbanNotValid=Μη έγκυρο IBAN
 StandingOrders=Direct debit orders
 StandingOrder=Παραγγελία άμεσης χρέωσης
 PaymentByDirectDebit=πληρωμή άμεσης χρέωσης
-PaymentByBankTransfers=Payments by credit transfer
-PaymentByBankTransfer=Payment by credit transfer
+PaymentByBankTransfers=πληρωμές μέσω μεταφοράς πιστώσεως
+PaymentByBankTransfer=πληρωμή μέσω μεταφοράς πιστώσεως
 AccountStatement=Κίνηση Λογαριασμού
 AccountStatementShort=Κίνηση
 AccountStatements=Κινήσεις Λογαριασμού
@@ -106,8 +106,8 @@ SupplierInvoicePayment=Πληρωμή προμηθευτή
 SubscriptionPayment=Πληρωμή συνδρομής
 WithdrawalPayment=Debit payment order
 SocialContributionPayment=Σίγουρα θέλετε να μαρκάρετε αυτό το αξιόγραφο σαν απορριφθέν;
-BankTransfer=Credit transfer
-BankTransfers=Credit transfers
+BankTransfer=μεταφορά πιστώσεως
+BankTransfers=μεταφορές πιστώσεως
 MenuBankInternalTransfer=Εσωτερική μεταφορά
 TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
 TransferFrom=Από
@@ -128,7 +128,7 @@ ConfirmDeleteTransaction=Είστε βέβαιοι ότι θέλετε να δι
 ThisWillAlsoDeleteBankRecord=Αυτό θα διαγράψει επίσης την εισερχόμενη είσοδο στην τράπεζα
 BankMovements=Κινήσεις
 PlannedTransactions=Προγραμματισμένες καταχωρήσεις
-Graph=Graphs
+Graph=γραφήματα
 ExportDataset_banque_1=Τραπεζικές εγγραφές και αποδείξεις κατάθεσης
 ExportDataset_banque_2=Απόδειξη κατάθεσης
 TransactionOnTheOtherAccount=Συναλλαγή σε άλλο λογαριασμό
diff --git a/htdocs/langs/el_GR/bills.lang b/htdocs/langs/el_GR/bills.lang
index ae038097718..85e7c88f189 100644
--- a/htdocs/langs/el_GR/bills.lang
+++ b/htdocs/langs/el_GR/bills.lang
@@ -259,6 +259,7 @@ DateMaxPayment=Προθεσμία Πληρωμής
 DateInvoice=Ημερομηνία τιμολογίου
 DatePointOfTax=Point of tax
 NoInvoice=Δεν υπάρχει τιμολόγιο
+NoOpenInvoice=No open invoice
 ClassifyBill=Κατηγοριοποίηση Τιμολογίου
 SupplierBillsToPay=Μη πληρωθέντα τιμολόγια προμηθευτή
 CustomerBillsUnpaid=Ανεξόφλητα τιμολόγια πελάτη
@@ -589,3 +590,4 @@ FacParentLine=Invoice Line Parent
 SituationTotalRayToRest=Remainder to pay without taxe
 PDFSituationTitle=Situation n° %d
 SituationTotalProgress=Total progress %d %%
+SearchUnpaidInvoicesWithDueDate=Search unpaid invoices with a due date = %s
diff --git a/htdocs/langs/el_GR/cashdesk.lang b/htdocs/langs/el_GR/cashdesk.lang
index e5887eb2a47..1e52c279281 100644
--- a/htdocs/langs/el_GR/cashdesk.lang
+++ b/htdocs/langs/el_GR/cashdesk.lang
@@ -102,7 +102,7 @@ CashDeskGenericMaskCodes6 =  <br> <b> {TN} </b> ετικέτα χρησιμοπ
 TakeposGroupSameProduct=Ομαδοποιήστε τις ίδιες σειρές προϊόντων
 StartAParallelSale=Ξεκινήστε μια νέα παράλληλη πώληση
 SaleStartedAt=Sale started at %s
-ControlCashOpening=Control cash popup at opening POS
+ControlCashOpening=Open the "Control cash" popup when opening the POS
 CloseCashFence=Close cash desk control
 CashReport=Έκθεση μετρητών
 MainPrinterToUse=Κύριος εκτυπωτής προς χρήση
@@ -126,5 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
-ShowPriceHT = Display the price excluding tax column
-ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
+ShowPriceHT = Display the column with the price excluding tax (on screen)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
diff --git a/htdocs/langs/el_GR/categories.lang b/htdocs/langs/el_GR/categories.lang
index daa6bbcad43..a7f6c36a2b6 100644
--- a/htdocs/langs/el_GR/categories.lang
+++ b/htdocs/langs/el_GR/categories.lang
@@ -3,19 +3,19 @@ Rubrique=Ετικέτα/Κατηγορία
 Rubriques=Ετικέτες/Κατηγορίες
 RubriquesTransactions=Ετικέτες / Κατηγορίες συναλλαγών
 categories=Ετικέτες/Κατηγορίες
-NoCategoryYet=No tag/category of this type has been created
+NoCategoryYet=Δεν έχει δημιουργηθεί τέτοια ετικέτα/κατηγορία
 In=Μέσα
 AddIn=Προσθήκη σε
 modify=Αλλαγή
 Classify=Ταξινόμηση
 CategoriesArea=Πεδίο Ετικέτες/Κατηγορίες
-ProductsCategoriesArea=Product/Service tags/categories area
+ProductsCategoriesArea=Πεδίο Προϊόντα/Υπηρεσίες Ετικέτες/Κατηγορίες
 SuppliersCategoriesArea=Vendor tags/categories area
 CustomersCategoriesArea=Customer tags/categories area
 MembersCategoriesArea=Member tags/categories area
 ContactsCategoriesArea=Contact tags/categories area
 AccountsCategoriesArea=Bank account tags/categories area
-ProjectsCategoriesArea=Project tags/categories area
+ProjectsCategoriesArea=Πεδίο Ετικετών/Κατηγοριών έργου
 UsersCategoriesArea=User tags/categories area
 SubCats=Υποκατηγορίες
 CatList=Λίστα Ετικετών/Κατηγοριών
diff --git a/htdocs/langs/el_GR/compta.lang b/htdocs/langs/el_GR/compta.lang
index 79ee056c5dc..3027ee20175 100644
--- a/htdocs/langs/el_GR/compta.lang
+++ b/htdocs/langs/el_GR/compta.lang
@@ -286,3 +286,9 @@ ReportPurchaseTurnover=Τιμολόγηση κύκλου εργασιών αγο
 ReportPurchaseTurnoverCollected=Συλλέχθηκε ο κύκλος εργασιών αγοράς
 IncludeVarpaysInResults = Include various payments in reports
 IncludeLoansInResults = Include loans in reports
+InvoiceLate30Days = Invoices late > 30 days
+InvoiceLate15Days = Invoices late > 15 days
+InvoiceLateMinus15Days = Invoices late
+InvoiceNotLate = To be collected < 15 days
+InvoiceNotLate15Days = To be collected in 15 days
+InvoiceNotLate30Days = To be collected in 30 days
diff --git a/htdocs/langs/el_GR/cron.lang b/htdocs/langs/el_GR/cron.lang
index fcf0424f06d..31f919a9f2c 100644
--- a/htdocs/langs/el_GR/cron.lang
+++ b/htdocs/langs/el_GR/cron.lang
@@ -60,7 +60,7 @@ CronErrEndDateStartDt=Η ημερομηνία λήξης δεν μπορεί ν
 StatusAtInstall=Κατάσταση κατά την εγκατάσταση της μονάδας
 CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Απενεργοποίηση
-CronTaskInactive=Αυτή η εργασία είναι απενεργοποιημένη
+CronTaskInactive=This job is disabled (not scheduled)
 CronId=Id
 CronClassFile=Filename with class
 CronModuleHelp=Όνομα του καταλόγου μονάδων Dolibarr (επίσης λειτουργούν με εξωτερική μονάδα Dolibarr). <BR> Για παράδειγμα, για να καλέσουμε τη μέθοδο fetch του προϊόντος Dolibarr Product / htdocs / <u>product</u> / class / product.class.php, η τιμή για την ενότητα είναι <br> <i>προϊόν</i>
diff --git a/htdocs/langs/el_GR/errors.lang b/htdocs/langs/el_GR/errors.lang
index 6375725cdb3..4829ed170db 100644
--- a/htdocs/langs/el_GR/errors.lang
+++ b/htdocs/langs/el_GR/errors.lang
@@ -11,6 +11,7 @@ ErrorBadValueForParamNotAString=Bad value for your parameter. It appends general
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Είσοδος %s υπάρχει ήδη.
 ErrorGroupAlreadyExists=Ομάδα %s υπάρχει ήδη.
+ErrorEmailAlreadyExists=Email %s already exists.
 ErrorRecordNotFound=Εγγραφή δεν βρέθηκε.
 ErrorFailToCopyFile=Απέτυχε η αντιγραφή του αρχείου <b>&quot;%s»</b> σε <b>«%s».</b>
 ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
@@ -117,7 +118,7 @@ ErrorCantReadFile=Αποτυχία ανάγνωσης αρχείου &quot;%s»
 ErrorCantReadDir=Αποτυχία ανάγνωσης »%s» κατάλογο
 ErrorBadLoginPassword=Το Όνομα Χρήστη ή ο Κωδικός Χρήστη είναι λάθος
 ErrorLoginDisabled=Ο λογαριασμός σας έχει απενεργοποιηθεί
-ErrorFailedToRunExternalCommand=Απέτυχε να τρέξει εξωτερική εντολή. Ελέγξτε ότι είναι διαθέσιμο και εκτελέσιμη από PHP server σας. Αν η PHP <b>Safe Mode</b> είναι ενεργοποιημένη, βεβαιωθείτε ότι η εντολή είναι μέσα σε έναν κατάλογο που ορίζεται από <b>safe_mode_exec_dir</b> παράμετρο.
+ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server user. Check also the command is not protected on shell level by a security layer like apparmor.
 ErrorFailedToChangePassword=Αποτυχία να αλλάξετε τον κωδικό πρόσβασης
 ErrorLoginDoesNotExists=Χρήστης με <b>%s</b> login δεν θα μπορούσε να βρεθεί.
 ErrorLoginHasNoEmail=Αυτός ο χρήστης δεν έχει τη διεύθυνση ηλεκτρονικού ταχυδρομείου. Επεξεργασία ματαιώθηκε.
@@ -262,6 +263,7 @@ ErrorDateIsInFuture=Error, the date can't be in the future
 ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
 ErrorAPercentIsRequired=Error, please fill in the percentage correctly
 ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
+ErrorFailedToFindEmailTemplate=Failed to find template with code name %s
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Η παράμετρος PHP upload_max_filesize (%s) είναι υψηλότερη από την παράμετρο PHP post_max_size (%s). Αυτό δεν είναι μια σταθερή ρύθμιση.
@@ -298,3 +300,4 @@ WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So y
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
+ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
diff --git a/htdocs/langs/el_GR/eventorganization.lang b/htdocs/langs/el_GR/eventorganization.lang
index 82e04f0830e..f107314a831 100644
--- a/htdocs/langs/el_GR/eventorganization.lang
+++ b/htdocs/langs/el_GR/eventorganization.lang
@@ -1,4 +1,5 @@
 # Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+# Copyright (C) 2021		Dorian Vabre			<dorian.vabre@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
@@ -81,7 +82,10 @@ PriceOfBoothHelp=Subscription price to stand a booth
 EventOrganizationICSLink=Link ICS for events
 ConferenceOrBoothInformation=Conference Or Booth informations
 Attendees = Attendees
+DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
 #
 # Status
 #
@@ -94,8 +98,46 @@ EvntOrgCancelled = Cancelled
 #
 # Public page
 #
+SuggestForm = Suggestion page
+RegisterPage = Page for conferences or booth
+EvntOrgRegistrationHelpMessage = Here, you can vote for an event, or suggest a new conference or booth for the project
+EvntOrgRegistrationConfHelpMessage = Here, you can suggest a new conference for the project
+EvntOrgRegistrationBoothHelpMessage = Here, you can suggest a new booth for the project
+ListOfSuggestedConferences = List of suggested conferences
+ListOfSuggestedBooths = List of suggested booths
+SuggestConference = Suggest a new conference
+SuggestBooth = Suggest a booth
+ViewAndVote = View and vote for suggested events
 PublicAttendeeSubscriptionPage = Public link of registration to a conference
 MissingOrBadSecureKey = The security key is invalid or missing
-EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
-EvntOrgStartDuration = This conference starts on
-EvntOrgEndDuration =  and ends on
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference : '%s'
+EvntOrgDuration = This conference starts on %s and ends on %s.
+ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
+BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
+EventType = Τύπος συμβάντος
+
+#
+# Vote page
+#
+EvntOrgRegistrationWelcomeMessage = Welcome on the conference or booth suggestion page.
+EvntOrgRegistrationConfWelcomeMessage = Welcome on the conference suggestion page.
+EvntOrgRegistrationBoothWelcomeMessage = Welcome on the booth suggestion page.
+EvntOrgVoteHelpMessage = Here, you can view and vote for the suggested events for the project
+VoteOk = Your vote has been accepted.
+AlreadyVoted = You have already voted for this event.
+VoteError = An error has occurred during the vote, please try again.
+
+#
+# SubscriptionOk page
+#
+SubscriptionOk = Your subscription to this conference has been validated
+#
+# Subscription validation mail
+#
+ConfAttendeeSubscriptionConfirmation = Confirmation of your subscription to a conference
+#
+# Payment page
+#
+Attendee = Attendee
+PaymentConferenceAttendee = Conference attendee payment
+PaymentBoothLocation = Booth location payment
diff --git a/htdocs/langs/el_GR/hrm.lang b/htdocs/langs/el_GR/hrm.lang
index 6800960626f..3cee4ab528a 100644
--- a/htdocs/langs/el_GR/hrm.lang
+++ b/htdocs/langs/el_GR/hrm.lang
@@ -9,7 +9,7 @@ ConfirmDeleteEstablishment= Είστε βέβαιοι ότι θέλετε να 
 OpenEtablishment=Άνοιγμα εγκατάστασης
 CloseEtablishment=Κλείσιμο εγκατάστασης
 # Dictionary
-DictionaryPublicHolidays=HRM-δημόσιες αργίες
+DictionaryPublicHolidays=Leave - Public holidays
 DictionaryDepartment=HRM - Λίστα τμημάτων
 DictionaryFunction=HRM - Job positions
 # Module
diff --git a/htdocs/langs/el_GR/knowledgemanagement.lang b/htdocs/langs/el_GR/knowledgemanagement.lang
index 21723681aa0..440a5617c62 100644
--- a/htdocs/langs/el_GR/knowledgemanagement.lang
+++ b/htdocs/langs/el_GR/knowledgemanagement.lang
@@ -47,7 +47,7 @@ KnowledgeManagementArea = Knowledge Management
 # Menu
 #
 MenuKnowledgeRecord = Knowledge base
-ListOfArticles = List of articles
+ListKnowledgeRecord = List of articles
 NewKnowledgeRecord = New article
 ValidateReply = Validate solution
 KnowledgeRecords = Articles
diff --git a/htdocs/langs/el_GR/languages.lang b/htdocs/langs/el_GR/languages.lang
index 35076749bf2..2cf888b1131 100644
--- a/htdocs/langs/el_GR/languages.lang
+++ b/htdocs/langs/el_GR/languages.lang
@@ -3,6 +3,7 @@ Language_am_ET=Ethiopian
 Language_ar_AR=Αραβικά
 Language_ar_EG=Αραβικά (Αίγυπτος)
 Language_ar_SA=Αραβικά
+Language_ar_TN=Arabic (Tunisia)
 Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengali
 Language_bn_IN=Bengali (India)
@@ -84,6 +85,7 @@ Language_nl_NL=Ολλανδός
 Language_pl_PL=Πολωνικά
 Language_pt_BR=Πορτογαλικά (Βραζιλίας)
 Language_pt_PT=Πορτογαλικά
+Language_ro_MD=Romanian (Moldavia)
 Language_ro_RO=Ρουμανικά
 Language_ru_RU=Ρωσικά
 Language_ru_UA=Ρωσικά (Ουκρανία)
diff --git a/htdocs/langs/el_GR/main.lang b/htdocs/langs/el_GR/main.lang
index 8b2ee02ce42..4af1c73feea 100644
--- a/htdocs/langs/el_GR/main.lang
+++ b/htdocs/langs/el_GR/main.lang
@@ -430,6 +430,7 @@ LT1IN=CGST
 LT2IN=SGST
 LT1GC=Επιπλέον σεντ
 VATRate=Συντελεστής Φ.Π.Α.
+RateOfTaxN=Rate of tax %s
 VATCode=Κωδικός φορολογικού συντελεστή
 VATNPR=Φορολογικός συντελεστής NPR
 DefaultTaxRate=Προκαθορισμένος συντελεστής φορολογίας
@@ -729,6 +730,7 @@ MenuMembers=Μέλη
 MenuAgendaGoogle=Ημερολόγιο Google
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Όριο Dolibarr (Μενού Ρυθμίσεις-Ασφάλεια): %s Kb, Όριο PHP: %s Kb
+ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
 NoFileFound=No documents uploaded
 CurrentUserLanguage=Τρέχουσα Γλώσσα
 CurrentTheme=Τρέχων Θέμα
@@ -1072,6 +1074,7 @@ ValidFrom=Ισχύει από
 ValidUntil=Εγκυρο μέχρι
 NoRecordedUsers=Δεν υπάρχουν χρήστες
 ToClose=Να κλείσω
+ToRefuse=To refuse
 ToProcess=Για την διαδικασία
 ToApprove=Εγκρίνω
 GlobalOpenedElemView=Σφαιρική άποψη
@@ -1126,9 +1129,11 @@ UpdateForAllLines=Update for all lines
 OnHold=Σε Αναμονή
 Civility=Civility
 AffectTag=Affect Tag
+CreateExternalUser=Create external user
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
 ConfirmCancel=Are you sure you want to cancel
+EmailMsgID=Email MsgID
diff --git a/htdocs/langs/el_GR/members.lang b/htdocs/langs/el_GR/members.lang
index aae93b47a00..0d6b25575a1 100644
--- a/htdocs/langs/el_GR/members.lang
+++ b/htdocs/langs/el_GR/members.lang
@@ -213,3 +213,5 @@ SendReminderForExpiredSubscription=Αποστολή υπενθύμισης μέ
 MembershipPaid=Καταβολή συνδρομής για την τρέχουσα περίοδο (μέχρι %s)
 YouMayFindYourInvoiceInThisEmail=Μπορείτε να βρείτε το τιμολόγιο που επισυνάπτεται σε αυτό το μήνυμα ηλεκτρονικού ταχυδρομείου
 XMembersClosed=%s μέλος (τα) έκλεισε
+XExternalUserCreated=%s external user(s) created
+ForceMemberNature=Force member nature (Individual or Corporation)
diff --git a/htdocs/langs/el_GR/modulebuilder.lang b/htdocs/langs/el_GR/modulebuilder.lang
index 38271e678cc..4ad2081a23d 100644
--- a/htdocs/langs/el_GR/modulebuilder.lang
+++ b/htdocs/langs/el_GR/modulebuilder.lang
@@ -143,3 +143,4 @@ AsciiToHtmlConverter=Μεταροπέας από Ascii σε HTML
 AsciiToPdfConverter=Μεταροπέας από Ascii σε PDF
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
 ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
+ImportExportProfiles=Import and export profiles
diff --git a/htdocs/langs/el_GR/mrp.lang b/htdocs/langs/el_GR/mrp.lang
index 898842cfab0..3d622d1de8b 100644
--- a/htdocs/langs/el_GR/mrp.lang
+++ b/htdocs/langs/el_GR/mrp.lang
@@ -8,12 +8,12 @@ MenuBOM=Λογαριασμοί υλικού
 LatestBOMModified=Τελευταία %s Τροποποιημένα λογαριασμοί
 LatestMOModified=Οι τελευταίες %s Παραγγελίες Παραγωγής τροποποιήθηκαν
 Bom=Λογαριασμοί υλικού
-BillOfMaterials=Λογαριασμός υλικού
+BillOfMaterials=Bill of Materials
 BOMsSetup=Ρύθμιση του BOM της μονάδας
 ListOfBOMs=Κατάλογος λογαριασμών υλικού - BOM
 ListOfManufacturingOrders=Κατάλογος παραγγελιών κατασκευής
-NewBOM=Νέα αποστολή υλικού
-ProductBOMHelp=Προϊόν που δημιουργείται με αυτό το BOM. <br> Σημείωση: Τα προϊόντα με την ιδιότητα &#39;Φύση του προϊόντος&#39; = &#39;Πρώτη ύλη&#39; δεν είναι ορατά σε αυτόν τον κατάλογο.
+NewBOM=New bill of materials
+ProductBOMHelp=Product to create (or disassemble) with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
 BOMsNumberingModules=Πρότυπα αρίθμησης BOM
 BOMsModelModule=Πρότυπα εγγράφων BOM
 MOsNumberingModules=Μοντέλα αρίθμησης MO
@@ -22,7 +22,7 @@ FreeLegalTextOnBOMs=Ελεύθερο κείμενο στο έγγραφο του
 WatermarkOnDraftBOMs=Υδατογράφημα σε σχέδιο BOM
 FreeLegalTextOnMOs=Ελεύθερο κείμενο σε έγγραφο της MO
 WatermarkOnDraftMOs=Υδατογράφημα στο σχέδιο ΜΟ
-ConfirmCloneBillOfMaterials=Είστε βέβαιοι ότι θέλετε να κλωνοποιήσετε το λογαριασμό υλικού %s;
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials %s ?
 ConfirmCloneMo=Είστε βέβαιοι ότι θέλετε να κλωνοποιήσετε την Παραγγελία Παραγωγής %s?
 ManufacturingEfficiency=Αποτελεσματικότητα κατασκευής
 ConsumptionEfficiency=Απόδοση κατανάλωσης
@@ -30,8 +30,8 @@ ValueOfMeansLoss=Η τιμή 0,95 σημαίνει έναν μέσο όρο 5%%
 ValueOfMeansLossForProductProduced=Η τιμή 0,95 σημαίνει κατά μέσο όρο απώλεια παραγόμενου προϊόντος 5%%
 DeleteBillOfMaterials=Διαγραφή λογαριασμού υλικών
 DeleteMo=Διαγραφή Παραγγελίας Παραγωγής
-ConfirmDeleteBillOfMaterials=Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτό το νομοσχέδιο;
-ConfirmDeleteMo=Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτό το νομοσχέδιο;
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Materials?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Materials?
 MenuMRP=Παραγγελίες Παραγωγής
 NewMO=Νέα Παραγγελία Παραγωγής
 QtyToProduce=Ποσότητα για παραγωγή
@@ -39,7 +39,7 @@ DateStartPlannedMo=Η έναρξη της προγραμματισμένης η
 DateEndPlannedMo=Η ημερομηνία λήξης προγραμματισμένη
 KeepEmptyForAsap=Άδειο σημαίνει &#39;όσο το δυνατόν συντομότερα&#39;
 EstimatedDuration=Εκτιμώμενη Διάρκεια
-EstimatedDurationDesc=Εκτιμώμενη διάρκεια κατασκευής αυτού του προϊόντος χρησιμοποιώντας αυτό το BOM
+EstimatedDurationDesc=Estimated duration to manufacture (or disassemble) this product using this BOM
 ConfirmValidateBom=Είστε βέβαιοι ότι θέλετε να επικυρώσετε το BOM με την αναφορά <strong>%s</strong> (θα μπορείτε να το χρησιμοποιήσετε για να δημιουργήσετε νέες Παραγγελίες Παραγωγής)
 ConfirmCloseBom=Είστε βέβαιοι ότι θέλετε να ακυρώσετε αυτό το BOM (δεν θα μπορείτε πλέον να το χρησιμοποιήσετε για να δημιουργήσετε νέες Παραγγελίες Παραγωγής);
 ConfirmReopenBom=Είστε βέβαιοι ότι θέλετε να ανοίξετε ξανά αυτό το BOM (θα μπορείτε να το χρησιμοποιήσετε για να δημιουργήσετε νέες Παραγγελίες Παραγωγής)
@@ -63,13 +63,14 @@ ConsumeAndProduceAll=Καταναλώστε και παράξτε όλα
 Manufactured=Κατασκευάστηκε
 TheProductXIsAlreadyTheProductToProduce=Το προϊόν που προστέθηκε είναι ήδη το προϊόν που παράγεται.
 ForAQuantityOf=Για ποσότητα παραγωγής %s
+ForAQuantityToConsumeOf=For a quantity to disassemble of %s
 ConfirmValidateMo=Είστε βέβαιοι ότι θέλετε να επαληθεύσετε αυτή τη παραγγελία κατασκευής;
 ConfirmProductionDesc=Κάνοντας κλικ στο '%s', θα επαληθεύσετε την κατανάλωση ή / και την παραγωγή για τις καθορισμένες ποσότητες. Αυτό θα ενημερώσει επίσης τις μεταβολές αποθεμάτων και θα καταγράψει τις κινήσεις αποθεμάτων.
 ProductionForRef=Παραγωγή του %s
 AutoCloseMO=Αυτόματo κλείσιμο της Παραγγελίας Παραγωγής εάν επιτευχθούν οι ποσότητες για κατανάλωση και παραγωγή
 NoStockChangeOnServices=Καμία αλλαγή αποθέματος στις υπηρεσίες
 ProductQtyToConsumeByMO=Ποσότητα προϊόντος ακόμα για κατανάλωση από ανοικτό MO
-ProductQtyToProduceByMO=Ποσότητα προϊόντος ακόμα να παραχθεί από ανοιχτό MO
+ProductQtyToProduceByMO=Product quantity still to produce by open MO
 AddNewConsumeLines=Προσθέστε νέα γραμμή για κατανάλωση
 ProductsToConsume=Προϊόντα προς κατανάλωση
 ProductsToProduce=Προϊόντα για παραγωγή
@@ -83,15 +84,13 @@ Workstations=Workstations
 WorkstationsDescription=Workstations management
 WorkstationSetup = Workstations setup
 WorkstationSetupPage = Workstations setup page
-WorkstationAbout = About Workstation
-WorkstationAboutPage = Workstations about page
 WorkstationList=Workstation list
 WorkstationCreate=Add new workstation
 ConfirmEnableWorkstation=Are you sure you want to enable workstation <b>%s</b> ?
 EnableAWorkstation=Enable a workstation
 ConfirmDisableWorkstation=Are you sure you want to disable workstation <b>%s</b> ?
 DisableAWorkstation=Disable a workstation
-DeleteWorkstation=Supprimer
+DeleteWorkstation=Διαγραφή
 NbOperatorsRequired=Number of operators required
 THMOperatorEstimated=Estimated operator THM
 THMMachineEstimated=Estimated machine THM
diff --git a/htdocs/langs/el_GR/orders.lang b/htdocs/langs/el_GR/orders.lang
index 2725ba6380b..9c9682ce483 100644
--- a/htdocs/langs/el_GR/orders.lang
+++ b/htdocs/langs/el_GR/orders.lang
@@ -11,6 +11,7 @@ OrderDate=Ημερομηνία παραγγελίας
 OrderDateShort=Ημερομηνία παραγγελίας
 OrderToProcess=Παραγγελία προς επεξεργασία
 NewOrder=Νέα παραγγελία
+NewSupplierOrderShort=Νέα παραγγελία
 NewOrderSupplier=Νέα εντολή αγοράς
 ToOrder=Δημιουργία πραγγελίας
 MakeOrder=Δημιουργία παραγγελίας
@@ -73,6 +74,7 @@ DeleteOrder=Διαγραφή παραγγελίας
 CancelOrder=Ακύρωση παραγγελίας
 OrderReopened= Παραγγελία %s Ανοίγει ξανά
 AddOrder=Δημιουργία παραγγελίας
+AddSupplierOrderShort=Δημιουργία παραγγελίας
 AddPurchaseOrder=Δημιουργία εντολής αγοράς
 AddToDraftOrders=Προσθήκη στο σχέδιο παραγγελιας
 ShowOrder=Εμφάνιση παραγγελίας
diff --git a/htdocs/langs/el_GR/other.lang b/htdocs/langs/el_GR/other.lang
index ba4ae37fdda..e05bbe7babd 100644
--- a/htdocs/langs/el_GR/other.lang
+++ b/htdocs/langs/el_GR/other.lang
@@ -129,6 +129,7 @@ ClosedByLogin=Χρήστης σύνδεσης που έκλεισε
 FileWasRemoved=File %s was removed
 DirWasRemoved=Directory %s was removed
 FeatureNotYetAvailable=Δεν υπάρχει ακόμα διαθέσιμη λειτουργία στην τρέχουσα έκδοση
+FeatureNotAvailableOnDevicesWithoutMouse=Feature not available on devices without mouse
 FeaturesSupported=Υποστηριζόμενα χαρακτηριστικά
 Width=Πλάτος
 Height=Ύψος
@@ -263,7 +264,7 @@ ContactCreatedByEmailCollector=Επαφή / διεύθυνση που δημιο
 ProjectCreatedByEmailCollector=Έργο που δημιουργήθηκε από τον συλλέκτη ηλεκτρονικού ταχυδρομείου από το ηλεκτρονικό ταχυδρομείο MSGID %s
 TicketCreatedByEmailCollector=Εισιτήριο που δημιουργήθηκε από τον συλλέκτη ηλεκτρονικού ταχυδρομείου από το ηλεκτρονικό ταχυδρομείο MSGID %s
 OpeningHoursFormatDesc=Χρησιμοποιήστε το "-" για να διαχωρίσετε τις ώρες ανοίγματος και κλεισίματος. <br> Χρησιμοποιήστε "κενό" για να εισάγετε διαφορετικές περιοχές. <br> Παράδειγμα: 8-12 14-18
-PrefixSession=Prefix for session ID
+SuffixSessionName=Suffix for session name
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/el_GR/partnership.lang b/htdocs/langs/el_GR/partnership.lang
index 053c669c718..2a252f47c96 100644
--- a/htdocs/langs/el_GR/partnership.lang
+++ b/htdocs/langs/el_GR/partnership.lang
@@ -16,41 +16,72 @@
 #
 # Generic
 #
-ModulePartnershipName = Partnership management
-PartnershipDescription = Module Partnership management
+ModulePartnershipName=Partnership management
+PartnershipDescription=Module Partnership management
 PartnershipDescriptionLong= Module Partnership management
 
+AddPartnership=Add partnership
+CancelPartnershipForExpiredMembers=Partnership: Cancel partnership of members with expired subscriptions
+PartnershipCheckBacklink=Partnership: Check referring backlink
+
 #
 # Menu
 #
-NewPartnership = New Partnership
-ListOfPartnerships = List of partnership
+NewPartnership=New Partnership
+ListOfPartnerships=List of partnership
 
 #
 # Admin page
 #
-PartnershipSetup = Partnership setup
-PartnershipAbout = About Partnership
-PartnershipAboutPage = Partnership about page
-
+PartnershipSetup=Partnership setup
+PartnershipAbout=About Partnership
+PartnershipAboutPage=Partnership about page
+partnershipforthirdpartyormember=Partner status must be set on a 'thirdparty' or a 'member'
+PARTNERSHIP_IS_MANAGED_FOR=Partnership managed for
+PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks to check
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb of days before cancelling status of a partnership when a subscription has expired
+ReferingWebsiteCheck=Check of website referring
+ReferingWebsiteCheckDesc=You can enable a feature to check that your partners has added a backlink to your website domains on their own website.
 
 #
 # Object
 #
+DeletePartnership=Delete a partnership
+PartnershipDedicatedToThisThirdParty=Partnership dedicated to this third party
+PartnershipDedicatedToThisMember=Partnership dedicated to this member
 DatePartnershipStart=Ημερομηνία έναρξης
 DatePartnershipEnd=Ημερομηνία λήξης
+ReasonDecline=Decline reason
+ReasonDeclineOrCancel=Decline reason
+PartnershipAlreadyExist=Partnership already exist
+ManagePartnership=Manage partnership
+BacklinkNotFoundOnPartnerWebsite=Backlink not found on partner website
+ConfirmClosePartnershipAsk=Are you sure you want to cancel this partnership?
+PartnershipType=Partnership type
 
 #
 # Template Mail
 #
+SendingEmailOnPartnershipWillSoonBeCanceled=Partnership will soon be canceled
+SendingEmailOnPartnershipRefused=Partnership refused
+SendingEmailOnPartnershipAccepted=Partnership accepted
+SendingEmailOnPartnershipCanceled=Partnership canceled
 
+YourPartnershipWillSoonBeCanceledTopic=Partnership will soon be canceled
+YourPartnershipRefusedTopic=Partnership refused
+YourPartnershipAcceptedTopic=Partnership accepted
+YourPartnershipCanceledTopic=Partnership canceled
+
+YourPartnershipWillSoonBeCanceledContent=We inform you that your partnership will soon be canceled (Backlink not found)
+YourPartnershipRefusedContent=We inform you that your partnership request has been refused.
+YourPartnershipAcceptedContent=We inform you that your partnership request has been accepted.
+YourPartnershipCanceledContent=We inform you that your partnership has been canceled.
 
 #
 # Status
 #
-PartnershipDraft = Πρόχειρο
-PartnershipAccepted = Αποδεκτή
-PartnershipRefused = Απορρίφθηκε
-PartnershipCanceled = Ακυρώθηκε
-
+PartnershipDraft=Πρόχειρο
+PartnershipAccepted=Αποδεκτή
+PartnershipRefused=Απορρίφθηκε
+PartnershipCanceled=Ακυρώθηκε
 PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/el_GR/productbatch.lang b/htdocs/langs/el_GR/productbatch.lang
index 8a21232571c..b48a31dacba 100644
--- a/htdocs/langs/el_GR/productbatch.lang
+++ b/htdocs/langs/el_GR/productbatch.lang
@@ -1,4 +1,4 @@
-# ProductBATCH language file - en_US - ProductBATCH
+# ProductBATCH language file - Source file is en_US - ProductBATCH
 ManageLotSerial=Χρήση παρτίδας/σειριακού αριθμού
 ProductStatusOnBatch=Yes (lot required)
 ProductStatusOnSerial=Yes (unique serial number required)
@@ -33,3 +33,13 @@ CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+LifeTime=Life span (in days)
+EndOfLife=End of life
+ManufacturingDate=Manufacturing date
+DestructionDate=Destruction date
+FirstUseDate=First use date
+QCFrequency=Quality control frequency (in days)
+
+#Traceability - qc status
+OutOfOrder=Out of order
+InWorkingOrder=In working order
diff --git a/htdocs/langs/el_GR/products.lang b/htdocs/langs/el_GR/products.lang
index e6d9bdc533d..9c45dbfb912 100644
--- a/htdocs/langs/el_GR/products.lang
+++ b/htdocs/langs/el_GR/products.lang
@@ -396,3 +396,5 @@ ActionAvailableOnVariantProductOnly=Δράση διαθέσιμη μόνο γι
 ProductsPricePerCustomer=Τιμές προϊόντων ανά πελάτη
 ProductSupplierExtraFields=Πρόσθετα χαρακτηριστικά (τιμές προμηθευτή)
 DeleteLinkedProduct=Διαγράψτε το θυγατρικό προϊόν που συνδέεται με τον συνδυασμό
+PMPValue=Μέση σταθμική τιμή
+PMPValueShort=WAP
diff --git a/htdocs/langs/el_GR/projects.lang b/htdocs/langs/el_GR/projects.lang
index eac3f4fcede..36f534ca2b8 100644
--- a/htdocs/langs/el_GR/projects.lang
+++ b/htdocs/langs/el_GR/projects.lang
@@ -267,9 +267,11 @@ InvoiceToUse=Προσχέδιο τιμολογίου προς χρήση
 NewInvoice=Νέο τιμολόγιο
 OneLinePerTask=Μια γραμμή ανά εργασία
 OneLinePerPeriod=Μία γραμμή ανά περίοδο
+OneLinePerTimeSpentLine=One line for each time spent declaration
 RefTaskParent=Αναφ. Γονική εργασία
 ProfitIsCalculatedWith=Profit is calculated using
 AddPersonToTask=Add also to tasks
 UsageOrganizeEvent=Usage: Event Organization
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
+SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
diff --git a/htdocs/langs/el_GR/receptions.lang b/htdocs/langs/el_GR/receptions.lang
index 5621f6ceba1..f88bf2f5bb0 100644
--- a/htdocs/langs/el_GR/receptions.lang
+++ b/htdocs/langs/el_GR/receptions.lang
@@ -44,4 +44,4 @@ ValidateOrderFirstBeforeReception=Θα πρέπει πρώτα να επικυρ
 ReceptionsNumberingModules=Μονάδα αρίθμησης για δεξιώσεις
 ReceptionsReceiptModel=Πρότυπα εγγράφων για δεξιώσεις
 NoMorePredefinedProductToDispatch=No more predefined products to dispatch
-
+ReceptionExist=A reception exists
diff --git a/htdocs/langs/el_GR/stocks.lang b/htdocs/langs/el_GR/stocks.lang
index b8b4b99272f..5cd59bd0ed5 100644
--- a/htdocs/langs/el_GR/stocks.lang
+++ b/htdocs/langs/el_GR/stocks.lang
@@ -56,8 +56,6 @@ UnitPurchaseValue=Unit purchase price
 StockTooLow=Χρηματιστήριο πολύ χαμηλή
 StockLowerThanLimit=Απόθεμα χαμηλότερο από το όριο συναγερμού (%s)
 EnhancedValue=Αξία
-PMPValue=Μέση σταθμική τιμή
-PMPValueShort=WAP
 EnhancedValueOfWarehouses=Αποθήκες αξία
 UserWarehouseAutoCreate=Δημιουργήστε αυτόματα μια αποθήκη χρήστη κατά τη δημιουργία ενός χρήστη
 AllowAddLimitStockByWarehouse=Διαχειριστείτε επίσης την τιμή για το ελάχιστο και το επιθυμητό απόθεμα ανά ζεύγος (αποθήκη προϊόντων) επιπλέον της τιμής για το ελάχιστο και το επιθυμητό απόθεμα ανά προϊόν
@@ -251,7 +249,10 @@ SelectAStockMovementFileToImport=select a stock movement file to import
 InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
 LabelOfInventoryMovemement=Inventory %s
 ReOpen=Reopen
-ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock to the real qty you entered into the inventory.
 ObjectNotFound=%s not found
 MakeMovementsAndClose=Generate movements and close
 AutofillWithExpected=Fill real quantity with expected quantity
+ShowAllBatchByDefault=By default, show batch details on product "stock" tab
+CollapseBatchDetailHelp=You can set batch detail default display in stocks module configuration
+FieldCannotBeNegative=Field "%s" cannot be negative
diff --git a/htdocs/langs/el_GR/ticket.lang b/htdocs/langs/el_GR/ticket.lang
index 5c5c8eb9975..ee794f77717 100644
--- a/htdocs/langs/el_GR/ticket.lang
+++ b/htdocs/langs/el_GR/ticket.lang
@@ -304,7 +304,7 @@ BoxLastModifiedTicket=Τελευταία τροποποιημένα εισιτή
 BoxLastModifiedTicketDescription=Τα τελευταία τροποποιημένα εισιτήρια %s
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=Δεν υπάρχουν πρόσφατα τροποποιημένα εισιτήρια
-BoxTicketType=Number of open tickets by type
+BoxTicketType=Distribution of open tickets by type
 BoxTicketSeverity=Number of open tickets by severity
 BoxNoTicketSeverity=No tickets opened
 BoxTicketLastXDays=Number of new tickets by days the last %s days
diff --git a/htdocs/langs/en_AU/accountancy.lang b/htdocs/langs/en_AU/accountancy.lang
index 4dbdd035d6e..ef9e69e554a 100644
--- a/htdocs/langs/en_AU/accountancy.lang
+++ b/htdocs/langs/en_AU/accountancy.lang
@@ -1,2 +1,2 @@
 # Dolibarr language file - Source file is en_US - accountancy
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
diff --git a/htdocs/langs/en_AU/cron.lang b/htdocs/langs/en_AU/cron.lang
deleted file mode 100644
index 67ecfc77567..00000000000
--- a/htdocs/langs/en_AU/cron.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - cron
-CronTaskInactive=This job is disabled
diff --git a/htdocs/langs/en_AU/exports.lang b/htdocs/langs/en_AU/exports.lang
new file mode 100644
index 00000000000..17dedd46696
--- /dev/null
+++ b/htdocs/langs/en_AU/exports.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - exports
+DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
diff --git a/htdocs/langs/en_AU/main.lang b/htdocs/langs/en_AU/main.lang
index dac6a875c2d..0f669a0306c 100644
--- a/htdocs/langs/en_AU/main.lang
+++ b/htdocs/langs/en_AU/main.lang
@@ -34,4 +34,5 @@ TotalVAT=Total GST
 TTC=Incl GST
 VAT=GST
 VATRate=GST Rate
+OpenAll=Open for all actions
 Check=Cheque
diff --git a/htdocs/langs/en_AU/mrp.lang b/htdocs/langs/en_AU/mrp.lang
deleted file mode 100644
index a8ff138755b..00000000000
--- a/htdocs/langs/en_AU/mrp.lang
+++ /dev/null
@@ -1,6 +0,0 @@
-# Dolibarr language file - Source file is en_US - mrp
-BillOfMaterials=Bill of Material
-NewBOM=New bill of material
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
diff --git a/htdocs/langs/en_AU/products.lang b/htdocs/langs/en_AU/products.lang
new file mode 100644
index 00000000000..e0628dbec00
--- /dev/null
+++ b/htdocs/langs/en_AU/products.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - products
+ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
diff --git a/htdocs/langs/en_AU/stocks.lang b/htdocs/langs/en_AU/stocks.lang
new file mode 100644
index 00000000000..1cae5cf3f11
--- /dev/null
+++ b/htdocs/langs/en_AU/stocks.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - stocks
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+OpenInternal=Open only for internal actions
diff --git a/htdocs/langs/en_AU/ticket.lang b/htdocs/langs/en_AU/ticket.lang
new file mode 100644
index 00000000000..82e110b1ca4
--- /dev/null
+++ b/htdocs/langs/en_AU/ticket.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - ticket
+TicketTypeShortISSUE=Issue, bug or problem
+OriginEmail=Email source
+NeedMoreInformation=Waiting for information
+TicketCategory=Group
diff --git a/htdocs/langs/en_CA/accountancy.lang b/htdocs/langs/en_CA/accountancy.lang
index 4dbdd035d6e..ef9e69e554a 100644
--- a/htdocs/langs/en_CA/accountancy.lang
+++ b/htdocs/langs/en_CA/accountancy.lang
@@ -1,2 +1,2 @@
 # Dolibarr language file - Source file is en_US - accountancy
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
diff --git a/htdocs/langs/en_CA/cron.lang b/htdocs/langs/en_CA/cron.lang
deleted file mode 100644
index 67ecfc77567..00000000000
--- a/htdocs/langs/en_CA/cron.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - cron
-CronTaskInactive=This job is disabled
diff --git a/htdocs/langs/en_CA/exports.lang b/htdocs/langs/en_CA/exports.lang
new file mode 100644
index 00000000000..17dedd46696
--- /dev/null
+++ b/htdocs/langs/en_CA/exports.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - exports
+DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
diff --git a/htdocs/langs/en_CA/main.lang b/htdocs/langs/en_CA/main.lang
index 6d4ce6e30f2..6af90915e16 100644
--- a/htdocs/langs/en_CA/main.lang
+++ b/htdocs/langs/en_CA/main.lang
@@ -26,3 +26,4 @@ TotalVAT=Total GST
 TotalLT1=Total PST
 VAT=GST
 VATRate=GST rate
+OpenAll=Open for all actions
diff --git a/htdocs/langs/en_CA/mrp.lang b/htdocs/langs/en_CA/mrp.lang
deleted file mode 100644
index a8ff138755b..00000000000
--- a/htdocs/langs/en_CA/mrp.lang
+++ /dev/null
@@ -1,6 +0,0 @@
-# Dolibarr language file - Source file is en_US - mrp
-BillOfMaterials=Bill of Material
-NewBOM=New bill of material
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
diff --git a/htdocs/langs/en_CA/products.lang b/htdocs/langs/en_CA/products.lang
new file mode 100644
index 00000000000..e0628dbec00
--- /dev/null
+++ b/htdocs/langs/en_CA/products.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - products
+ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
diff --git a/htdocs/langs/en_CA/stocks.lang b/htdocs/langs/en_CA/stocks.lang
new file mode 100644
index 00000000000..1cae5cf3f11
--- /dev/null
+++ b/htdocs/langs/en_CA/stocks.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - stocks
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+OpenInternal=Open only for internal actions
diff --git a/htdocs/langs/en_CA/ticket.lang b/htdocs/langs/en_CA/ticket.lang
new file mode 100644
index 00000000000..82e110b1ca4
--- /dev/null
+++ b/htdocs/langs/en_CA/ticket.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - ticket
+TicketTypeShortISSUE=Issue, bug or problem
+OriginEmail=Email source
+NeedMoreInformation=Waiting for information
+TicketCategory=Group
diff --git a/htdocs/langs/en_GB/accountancy.lang b/htdocs/langs/en_GB/accountancy.lang
index a003a87f629..2ebd845ce64 100644
--- a/htdocs/langs/en_GB/accountancy.lang
+++ b/htdocs/langs/en_GB/accountancy.lang
@@ -7,6 +7,7 @@ OverviewOfAmountOfLinesBound=Overview of number of lines already bound to an fin
 DeleteCptCategory=Remove finance account from group
 JournalizationInLedgerStatus=Status of journals
 GroupIsEmptyCheckSetup=Group is empty, check setup of the personalised finance group
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 MainAccountForCustomersNotDefined=Main finance account for customers not defined in setup
 MainAccountForUsersNotDefined=Main finance account for users not defined in setup
 MainAccountForVatPaymentNotDefined=Main finance account for VAT payment not defined in setup
@@ -52,7 +53,6 @@ XLineFailedToBeBinded=%s products/services were not linked to any finance accoun
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin sorting the page "Links to do" by the most recent elements
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin sorting the page "Links done" by the most recent elements
 ACCOUNTING_LENGTH_GACCOUNT=Length of the General Ledger accounts (If you set value to 6 here, the account '706' will appear as '706000' on screen)
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
 ACCOUNTING_SELL_JOURNAL=Sales journal
 ACCOUNTING_MISCELLANEOUS_JOURNAL=General journal
 ACCOUNTING_ACCOUNT_SUSPENSE=Suspense account
diff --git a/htdocs/langs/en_GB/cron.lang b/htdocs/langs/en_GB/cron.lang
deleted file mode 100644
index 67ecfc77567..00000000000
--- a/htdocs/langs/en_GB/cron.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - cron
-CronTaskInactive=This job is disabled
diff --git a/htdocs/langs/en_GB/exports.lang b/htdocs/langs/en_GB/exports.lang
new file mode 100644
index 00000000000..17dedd46696
--- /dev/null
+++ b/htdocs/langs/en_GB/exports.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - exports
+DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
diff --git a/htdocs/langs/en_GB/main.lang b/htdocs/langs/en_GB/main.lang
index 5617fe77778..1a12820493b 100644
--- a/htdocs/langs/en_GB/main.lang
+++ b/htdocs/langs/en_GB/main.lang
@@ -36,6 +36,7 @@ VAT=VAT
 VATRate=VAT Rate
 Favorite=Favourite
 GeneratedOn=Built on %s
+OpenAll=Open for all actions
 Canceled=Cancelled
 Color=Colour
 NoPhotoYet=No picture available yet
diff --git a/htdocs/langs/en_GB/mrp.lang b/htdocs/langs/en_GB/mrp.lang
deleted file mode 100644
index a8ff138755b..00000000000
--- a/htdocs/langs/en_GB/mrp.lang
+++ /dev/null
@@ -1,6 +0,0 @@
-# Dolibarr language file - Source file is en_US - mrp
-BillOfMaterials=Bill of Material
-NewBOM=New bill of material
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
diff --git a/htdocs/langs/en_GB/partnership.lang b/htdocs/langs/en_GB/partnership.lang
index 82279c36553..00199eb0b46 100644
--- a/htdocs/langs/en_GB/partnership.lang
+++ b/htdocs/langs/en_GB/partnership.lang
@@ -1,2 +1,2 @@
 # Dolibarr language file - Source file is en_US - partnership
-PartnershipCanceled =Cancelled
+PartnershipCanceled=Cancelled
diff --git a/htdocs/langs/en_GB/products.lang b/htdocs/langs/en_GB/products.lang
index e707e316257..566871a575a 100644
--- a/htdocs/langs/en_GB/products.lang
+++ b/htdocs/langs/en_GB/products.lang
@@ -1,2 +1,3 @@
 # Dolibarr language file - Source file is en_US - products
 PrintsheetForOneBarCode=Print several labels for one barcode
+ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
diff --git a/htdocs/langs/en_GB/stocks.lang b/htdocs/langs/en_GB/stocks.lang
index ba358dbb241..4d10d134f64 100644
--- a/htdocs/langs/en_GB/stocks.lang
+++ b/htdocs/langs/en_GB/stocks.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - stocks
 StocksArea=Warehouse area
 MassStockTransferShort=Bulk stock transfer
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
 QtyDispatchedShort=Quantity dispatched
 QtyToDispatchShort=Quantity to be dispatched
 OrderStatusNotReadyToDispatch=Order Status does not allow dispatching of products in stock warehouses.
@@ -11,5 +12,6 @@ EstimatedStockValueSellShort=Value of stock at selling price
 RuleForStockReplenishment=Rule for stock replenishment
 IsInPackage=Packaged
 ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different useby or sellby dates (found <strong>%s</strong> but you entered <strong>%s</strong>).
+OpenInternal=Open only for internal actions
 OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a product has several selling price so total of stock by sales value can't be calculated
 AddNewProductStockWarehouse=Set new limit for alert and desired optimal stock level
diff --git a/htdocs/langs/en_GB/ticket.lang b/htdocs/langs/en_GB/ticket.lang
new file mode 100644
index 00000000000..82e110b1ca4
--- /dev/null
+++ b/htdocs/langs/en_GB/ticket.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - ticket
+TicketTypeShortISSUE=Issue, bug or problem
+OriginEmail=Email source
+NeedMoreInformation=Waiting for information
+TicketCategory=Group
diff --git a/htdocs/langs/en_IN/accountancy.lang b/htdocs/langs/en_IN/accountancy.lang
index 4dbdd035d6e..ef9e69e554a 100644
--- a/htdocs/langs/en_IN/accountancy.lang
+++ b/htdocs/langs/en_IN/accountancy.lang
@@ -1,2 +1,2 @@
 # Dolibarr language file - Source file is en_US - accountancy
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
diff --git a/htdocs/langs/en_IN/cron.lang b/htdocs/langs/en_IN/cron.lang
deleted file mode 100644
index 67ecfc77567..00000000000
--- a/htdocs/langs/en_IN/cron.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - cron
-CronTaskInactive=This job is disabled
diff --git a/htdocs/langs/en_IN/exports.lang b/htdocs/langs/en_IN/exports.lang
new file mode 100644
index 00000000000..17dedd46696
--- /dev/null
+++ b/htdocs/langs/en_IN/exports.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - exports
+DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
diff --git a/htdocs/langs/en_IN/main.lang b/htdocs/langs/en_IN/main.lang
index 46aef779403..4ccc246c713 100644
--- a/htdocs/langs/en_IN/main.lang
+++ b/htdocs/langs/en_IN/main.lang
@@ -20,6 +20,7 @@ FormatDateHourSecShort=%d/%m/%Y %I:%M:%S %p
 FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
 CommercialProposalsShort=Quotations
+OpenAll=Open for all actions
 LinkToProposal=Link to quotation
 SearchIntoCustomerProposals=Quotations
 ContactDefault_propal=Quotation
diff --git a/htdocs/langs/en_IN/mrp.lang b/htdocs/langs/en_IN/mrp.lang
deleted file mode 100644
index a8ff138755b..00000000000
--- a/htdocs/langs/en_IN/mrp.lang
+++ /dev/null
@@ -1,6 +0,0 @@
-# Dolibarr language file - Source file is en_US - mrp
-BillOfMaterials=Bill of Material
-NewBOM=New bill of material
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
diff --git a/htdocs/langs/en_IN/products.lang b/htdocs/langs/en_IN/products.lang
new file mode 100644
index 00000000000..e0628dbec00
--- /dev/null
+++ b/htdocs/langs/en_IN/products.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - products
+ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
diff --git a/htdocs/langs/en_IN/stocks.lang b/htdocs/langs/en_IN/stocks.lang
new file mode 100644
index 00000000000..1cae5cf3f11
--- /dev/null
+++ b/htdocs/langs/en_IN/stocks.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - stocks
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+OpenInternal=Open only for internal actions
diff --git a/htdocs/langs/en_IN/ticket.lang b/htdocs/langs/en_IN/ticket.lang
new file mode 100644
index 00000000000..82e110b1ca4
--- /dev/null
+++ b/htdocs/langs/en_IN/ticket.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - ticket
+TicketTypeShortISSUE=Issue, bug or problem
+OriginEmail=Email source
+NeedMoreInformation=Waiting for information
+TicketCategory=Group
diff --git a/htdocs/langs/en_SG/accountancy.lang b/htdocs/langs/en_SG/accountancy.lang
index 4dbdd035d6e..ef9e69e554a 100644
--- a/htdocs/langs/en_SG/accountancy.lang
+++ b/htdocs/langs/en_SG/accountancy.lang
@@ -1,2 +1,2 @@
 # Dolibarr language file - Source file is en_US - accountancy
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
diff --git a/htdocs/langs/en_SG/cron.lang b/htdocs/langs/en_SG/cron.lang
deleted file mode 100644
index 67ecfc77567..00000000000
--- a/htdocs/langs/en_SG/cron.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - cron
-CronTaskInactive=This job is disabled
diff --git a/htdocs/langs/en_SG/exports.lang b/htdocs/langs/en_SG/exports.lang
new file mode 100644
index 00000000000..17dedd46696
--- /dev/null
+++ b/htdocs/langs/en_SG/exports.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - exports
+DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
diff --git a/htdocs/langs/en_SG/main.lang b/htdocs/langs/en_SG/main.lang
index 2e691473326..71ab1503dbe 100644
--- a/htdocs/langs/en_SG/main.lang
+++ b/htdocs/langs/en_SG/main.lang
@@ -19,3 +19,4 @@ FormatDateHourShort=%m/%d/%Y %I:%M %p
 FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
 FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
+OpenAll=Open for all actions
diff --git a/htdocs/langs/en_SG/mrp.lang b/htdocs/langs/en_SG/mrp.lang
deleted file mode 100644
index a8ff138755b..00000000000
--- a/htdocs/langs/en_SG/mrp.lang
+++ /dev/null
@@ -1,6 +0,0 @@
-# Dolibarr language file - Source file is en_US - mrp
-BillOfMaterials=Bill of Material
-NewBOM=New bill of material
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
diff --git a/htdocs/langs/en_SG/products.lang b/htdocs/langs/en_SG/products.lang
new file mode 100644
index 00000000000..e0628dbec00
--- /dev/null
+++ b/htdocs/langs/en_SG/products.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - products
+ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
diff --git a/htdocs/langs/en_SG/stocks.lang b/htdocs/langs/en_SG/stocks.lang
new file mode 100644
index 00000000000..1cae5cf3f11
--- /dev/null
+++ b/htdocs/langs/en_SG/stocks.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - stocks
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+OpenInternal=Open only for internal actions
diff --git a/htdocs/langs/en_SG/ticket.lang b/htdocs/langs/en_SG/ticket.lang
new file mode 100644
index 00000000000..82e110b1ca4
--- /dev/null
+++ b/htdocs/langs/en_SG/ticket.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - ticket
+TicketTypeShortISSUE=Issue, bug or problem
+OriginEmail=Email source
+NeedMoreInformation=Waiting for information
+TicketCategory=Group
diff --git a/htdocs/langs/es_AR/accountancy.lang b/htdocs/langs/es_AR/accountancy.lang
index 1c3e22fbde4..825bf36ff2c 100644
--- a/htdocs/langs/es_AR/accountancy.lang
+++ b/htdocs/langs/es_AR/accountancy.lang
@@ -16,4 +16,4 @@ Journals=Diarios Contables
 JournalFinancial=Diarios Financieros
 AssignDedicatedAccountingAccount=Nueva cuenta para asignar
 InvoiceLabel=Etiqueta de la factura
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
diff --git a/htdocs/langs/es_AR/agenda.lang b/htdocs/langs/es_AR/agenda.lang
index 553ed87208d..d8c00caa96c 100644
--- a/htdocs/langs/es_AR/agenda.lang
+++ b/htdocs/langs/es_AR/agenda.lang
@@ -1,6 +1,32 @@
 # Dolibarr language file - Source file is en_US - agenda
+IdAgenda=ID del evento
+ActionsOwnedBy=Propietario del evento
 Event=Evento
+EventsNb=Cantidad de eventos
+ListOfActions=Lista de eventos
+EventOnFullDay=Evento de todo(s) el(los) día(s)
+MenuToDoActions=Todos los eventos incompletos
+MenuDoneActions=Todos los eventos terminados
+ActionsAskedBy=Eventos informados por
+ActionsDoneBy=Eventos terminados por
+ViewCal=Vista del mes
+ViewDay=Vista del día
+ViewWeek=Vista de la semana
+AutoActions=Completado automático
+PropalClosedSignedInDolibarr=Propuesta %s firmada
+PropalClosedRefusedInDolibarr=Propuesta %s rechazada
+PropalValidatedInDolibarr=Propuesta %s validada
+PropalClassifiedBilledInDolibarr=Propuesta %s clasificada como facturada
+InvoiceValidatedInDolibarrFromPos=Factura %s validada desde POS
+InvoiceBackToDraftInDolibarr=Factura %s vuelve al estado borrador
+InvoicePaidInDolibarr=Factura %s marcada como pagada
+MemberResiliatedInDolibarr=Miembro %s rescindido
+MemberSubscriptionAddedInDolibarr=Suscripción %s añadida para el miembro %s
+MemberSubscriptionModifiedInDolibarr=Suscripción %s modificada para el miembro %s
+MemberSubscriptionDeletedInDolibarr=Se eliminó la suscripción %s para el miembro %s
 ShipmentValidatedInDolibarr=Envío %s validado
+ShipmentClassifyClosedInDolibarr=Envío %s clasificado como facturado
+ShipmentBackToDraftInDolibarr=Envío %s vuelve al estado borrador
 ShippingSentByEMail=Detalle de entrega %s enviado por correo
 ShippingValidated=Envío %s validado
 DateActionEnd=Fecha de fin
diff --git a/htdocs/langs/es_AR/cron.lang b/htdocs/langs/es_AR/cron.lang
index e9709b188f5..97375644095 100644
--- a/htdocs/langs/es_AR/cron.lang
+++ b/htdocs/langs/es_AR/cron.lang
@@ -36,7 +36,6 @@ CronFieldMandatory=Los campos %s son obligatorios
 CronErrEndDateStartDt=La fecha de finalización no puede ser anterior a la fecha de inicio
 StatusAtInstall=Estado de la instalación del módulo
 CronStatusInactiveBtn=Deshabilitar
-CronTaskInactive=Esta tarea está deshabilitada
 CronClassFile=Nombre de archivo y clase
 CronModuleHelp=Nombre del directorio del módulo Dolibarr (también funciona con el módulo externo Dolibarr). <BR> Por ejemplo, para llamar al objeto fetch del objeto Producto Dolibarr /htdocs/<u>product</u>/class/product.class.php, el valor para el módulo es <br><i>product</i>
 CronClassFileHelp=La ruta relativa y el nombre del archivo a cargar (la ruta es relativa al directorio raíz del servidor web). <BR> Por ejemplo para llamar al método de fetch del objeto Producto Dolibarr /htdocs/product/class/ <u> product.class.php</u>, el valor de nombre de archivo de clase es <br><i>product/class/product.class.php</i>
diff --git a/htdocs/langs/es_AR/exports.lang b/htdocs/langs/es_AR/exports.lang
new file mode 100644
index 00000000000..17dedd46696
--- /dev/null
+++ b/htdocs/langs/es_AR/exports.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - exports
+DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
diff --git a/htdocs/langs/es_AR/hrm.lang b/htdocs/langs/es_AR/hrm.lang
index 118782c9edc..cd3446fed36 100644
--- a/htdocs/langs/es_AR/hrm.lang
+++ b/htdocs/langs/es_AR/hrm.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - hrm
 HRM_EMAIL_EXTERNAL_SERVICE=E-mail para evitar el servicio externo de gestión de RRHH
 ConfirmDeleteEstablishment=¿Está seguro que quiere eliminar este establecimiento?
-DictionaryPublicHolidays=Gestión de RRHH - Feriados
 DictionaryDepartment=Gestión de RRHH - Departamentos
diff --git a/htdocs/langs/es_AR/mrp.lang b/htdocs/langs/es_AR/mrp.lang
index 5c5780af355..33ede374dad 100644
--- a/htdocs/langs/es_AR/mrp.lang
+++ b/htdocs/langs/es_AR/mrp.lang
@@ -8,12 +8,7 @@ MenuBOM=Lista de materiales
 LatestBOMModified=Ultimas %s Lista de materiales modificada
 LatestMOModified=Ultimas %s Ordenes de Fabricación modificadas
 Bom=Listas de materiales
-BillOfMaterials=Lista de materiales
 BOMsSetup=Configuración de módulo de BOM
 ListOfBOMs=Lista de Listas de materiales - BOM
 ListOfManufacturingOrders=Lista de Ordenes de Fabricación
-NewBOM=Nueva Lista de materiales
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
 MenuMRP=Ordenes de Fabricación
diff --git a/htdocs/langs/es_AR/orders.lang b/htdocs/langs/es_AR/orders.lang
index dbee6561f56..09e82e7d3d2 100644
--- a/htdocs/langs/es_AR/orders.lang
+++ b/htdocs/langs/es_AR/orders.lang
@@ -5,6 +5,7 @@ Orders=Órdenes
 OrderDateShort=Fecha de la Orden
 OrderToProcess=Orden a procesar
 NewOrder=Nueva Orden
+NewSupplierOrderShort=Nueva Orden
 NewOrderSupplier=Nueva Orden de Compra
 SupplierOrder=Orden de compra
 SuppliersOrders=Ordenes de compra
diff --git a/htdocs/langs/es_AR/partnership.lang b/htdocs/langs/es_AR/partnership.lang
index 3909de28d26..432f8d97316 100644
--- a/htdocs/langs/es_AR/partnership.lang
+++ b/htdocs/langs/es_AR/partnership.lang
@@ -1,2 +1,2 @@
 # Dolibarr language file - Source file is en_US - partnership
-PartnershipCanceled =Cancelada
+PartnershipCanceled=Cancelada
diff --git a/htdocs/langs/es_AR/products.lang b/htdocs/langs/es_AR/products.lang
index c06b4d9f528..a0a6201897f 100644
--- a/htdocs/langs/es_AR/products.lang
+++ b/htdocs/langs/es_AR/products.lang
@@ -72,3 +72,4 @@ PriceQtyMin=Precio para cantidad mín.
 PriceQtyMinCurrency=Precio (moneda) para esta cant. (sin descuento)
 PredefinedProductsToSell=Producto Predefinido
 SuppliersPrices=Precio de Proveedor
+ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
diff --git a/htdocs/langs/es_AR/stocks.lang b/htdocs/langs/es_AR/stocks.lang
index 073b81ff3d1..678594aabe6 100644
--- a/htdocs/langs/es_AR/stocks.lang
+++ b/htdocs/langs/es_AR/stocks.lang
@@ -1,5 +1,7 @@
 # Dolibarr language file - Source file is en_US - stocks
 Location=Ubicaciòn
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+OpenInternal=Open only for internal actions
 inventoryEdit=Editar
 inventoryDraft=Activos
 SelectCategory=Filtro por Categoría
diff --git a/htdocs/langs/es_AR/ticket.lang b/htdocs/langs/es_AR/ticket.lang
index c608fa6569c..09070e70818 100644
--- a/htdocs/langs/es_AR/ticket.lang
+++ b/htdocs/langs/es_AR/ticket.lang
@@ -1,6 +1,9 @@
 # Dolibarr language file - Source file is en_US - ticket
+TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortPROJET=Projecto
+OriginEmail=Email source
 Read=Leído
+NeedMoreInformation=Waiting for information
 Waiting=Esperando
 Type=Tipo
 TicketSettings=Ajustes
diff --git a/htdocs/langs/es_BO/accountancy.lang b/htdocs/langs/es_BO/accountancy.lang
index 4dbdd035d6e..ef9e69e554a 100644
--- a/htdocs/langs/es_BO/accountancy.lang
+++ b/htdocs/langs/es_BO/accountancy.lang
@@ -1,2 +1,2 @@
 # Dolibarr language file - Source file is en_US - accountancy
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
diff --git a/htdocs/langs/es_BO/cron.lang b/htdocs/langs/es_BO/cron.lang
deleted file mode 100644
index 67ecfc77567..00000000000
--- a/htdocs/langs/es_BO/cron.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - cron
-CronTaskInactive=This job is disabled
diff --git a/htdocs/langs/es_BO/exports.lang b/htdocs/langs/es_BO/exports.lang
new file mode 100644
index 00000000000..17dedd46696
--- /dev/null
+++ b/htdocs/langs/es_BO/exports.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - exports
+DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
diff --git a/htdocs/langs/es_BO/mrp.lang b/htdocs/langs/es_BO/mrp.lang
deleted file mode 100644
index a8ff138755b..00000000000
--- a/htdocs/langs/es_BO/mrp.lang
+++ /dev/null
@@ -1,6 +0,0 @@
-# Dolibarr language file - Source file is en_US - mrp
-BillOfMaterials=Bill of Material
-NewBOM=New bill of material
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
diff --git a/htdocs/langs/es_BO/products.lang b/htdocs/langs/es_BO/products.lang
new file mode 100644
index 00000000000..e0628dbec00
--- /dev/null
+++ b/htdocs/langs/es_BO/products.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - products
+ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
diff --git a/htdocs/langs/es_BO/stocks.lang b/htdocs/langs/es_BO/stocks.lang
new file mode 100644
index 00000000000..1cae5cf3f11
--- /dev/null
+++ b/htdocs/langs/es_BO/stocks.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - stocks
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+OpenInternal=Open only for internal actions
diff --git a/htdocs/langs/es_BO/ticket.lang b/htdocs/langs/es_BO/ticket.lang
new file mode 100644
index 00000000000..82e110b1ca4
--- /dev/null
+++ b/htdocs/langs/es_BO/ticket.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - ticket
+TicketTypeShortISSUE=Issue, bug or problem
+OriginEmail=Email source
+NeedMoreInformation=Waiting for information
+TicketCategory=Group
diff --git a/htdocs/langs/es_CL/accountancy.lang b/htdocs/langs/es_CL/accountancy.lang
index 31b6e07ae1a..7d67cdbec60 100644
--- a/htdocs/langs/es_CL/accountancy.lang
+++ b/htdocs/langs/es_CL/accountancy.lang
@@ -29,6 +29,7 @@ GroupIsEmptyCheckSetup=El grupo está vacío, verifique la configuración del gr
 DetailByAccount=Mostrar detalles por cuenta
 AccountWithNonZeroValues=Cuentas con valores distintos de cero.
 CountriesInEECExceptMe=Países en EEC excepto %s
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 MainAccountForCustomersNotDefined=Cuenta de contabilidad principal para los clientes no definidos en la configuración
 MainAccountForSuppliersNotDefined=Cuenta de contabilidad principal para proveedores no definidos en la configuración
 MainAccountForUsersNotDefined=Cuenta de contabilidad principal para los usuarios no definidos en la configuración
@@ -101,7 +102,6 @@ ACCOUNTING_LENGTH_AACCOUNT=Longitud de las cuentas contables de terceros (si est
 ACCOUNTING_MANAGE_ZERO=Permite administrar un número diferente de ceros al final de una cuenta contable. Necesitado por algunos países (como Suiza). Si está desactivado (predeterminado), puede configurar los dos parámetros siguientes para solicitar a la aplicación que agregue ceros virtuales.
 BANK_DISABLE_DIRECT_INPUT=Deshabilitar la grabación directa de transacciones en cuenta bancaria
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Habilitar exportación de borrador en diario
-ACCOUNTANCY_COMBO_FOR_AUX=Habilitar la lista combinada para la cuenta subsidiaria (puede ser lenta si tiene muchos terceros)
 ACCOUNTING_SELL_JOURNAL=Libro de ventas
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Diario misceláneo
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Diario del informe de gastos
diff --git a/htdocs/langs/es_CL/admin.lang b/htdocs/langs/es_CL/admin.lang
index 76c12eb049f..48489440e57 100644
--- a/htdocs/langs/es_CL/admin.lang
+++ b/htdocs/langs/es_CL/admin.lang
@@ -405,7 +405,6 @@ Module51Name=Envíos masivos
 Module51Desc=Gerencia de correo de papel en masa
 Module52Desc=Gestion de Stocks
 Module54Desc=Gestión de contratos (servicios o suscripciones recurrentes).
-Module55Desc=Gestión del código de barras
 Module58Desc=Integración de un sistema ClickToDial (Asterisk, ...)
 Module70Desc=Gestión de intervención
 Module75Name=Notas de gastos y viaje
@@ -604,8 +603,6 @@ Permission402=Crear/modificar descuentos
 Permission403=Validar descuentos
 Permission404=Eliminar descuentos
 Permission430=Utilice la barra de depuración
-Permission512=Crear / modificar pagos de salarios.
-Permission514=Eliminar pagos de salarios.
 Permission520=Leer préstamos
 Permission522=Crear/modificar préstamos
 Permission524=Eliminar préstamos
@@ -715,7 +712,6 @@ DictionaryAccountancyJournal=Libros contables
 DictionaryEMailTemplates=Plantillas de correo electrónico
 DictionaryMeasuringUnits=Unidades de medida
 DictionarySocialNetworks=Redes Sociales
-DictionaryHolidayTypes=Tipos de licencia
 DictionaryOpportunityStatus=Estado de plomo para proyecto / lider
 BackToModuleList=Volver a la lista de módulos
 BackToDictionaryList=Volver a la lista de diccionarios
@@ -900,7 +896,6 @@ ConditionIsCurrently=La condición es actualmente %s
 YouUseBestDriver=Utiliza el controlador %s, que es el mejor controlador disponible en la actualidad.
 YouDoNotUseBestDriver=Utiliza el controlador %s, pero se recomienda el controlador %s.
 SearchOptim=Optimización de búsqueda
-YouHaveXObjectAndSearchOptimOn=Tiene %s %s en la base de datos y la constante %s se establece en 1 en Home-Setup-Other.
 BrowserIsOK=Está utilizando el navegador web %s. Este navegador está bien para la seguridad y el rendimiento.
 BrowserIsKO=Está utilizando el navegador web %s. Se sabe que este navegador es una mala elección para la seguridad, el rendimiento y la confiabilidad. Recomendamos usar Firefox, Chrome, Opera o Safari.
 AddRefInList=Mostrar cliente / vendedor ref. Lista de información (lista de selección o cuadro combinado) y la mayoría de los hipervínculos. <br> Aparecerán terceros con un formato de nombre de &quot;CC12345 - SC45678 - The Big Company corp&quot;. en lugar de &quot;The Big Company corp&quot;.
diff --git a/htdocs/langs/es_CL/agenda.lang b/htdocs/langs/es_CL/agenda.lang
index 07801879db5..fb2478c8f40 100644
--- a/htdocs/langs/es_CL/agenda.lang
+++ b/htdocs/langs/es_CL/agenda.lang
@@ -7,7 +7,6 @@ ListOfActions=Lista de eventos
 EventOnFullDay=Evento todo el día (s)
 MenuToDoActions=Todos los eventos incompletos
 MenuDoneActions=Todos los eventos terminados
-ListOfEvents=Lista de eventos (calendario interno)
 ActionsAskedBy=Eventos reportados por
 ActionsDoneBy=Eventos hechos por
 ViewCal=Vista del mes
@@ -78,7 +77,6 @@ AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> para restringir la salida a acciones
 AgendaUrlOptions4=<b>logint =%s</b> para restringir la salida a acciones asignadas al usuario <b>%s</b> (propietario y otros).
 AgendaUrlOptionsProject=<b> project = __ PROJECT_ID __ </ b> para restringir el resultado a acciones vinculadas al proyecto <b> __ PROJECT_ID __ </ b>.
 AgendaUrlOptionsNotAutoEvent=<b>notactiontype = systemauto</b> para excluir eventos automáticos.
-AgendaShowBirthdayEvents=Mostrar cumpleaños de contactos
 AgendaHideBirthdayEvents=Ocultar cumpleaños de contactos
 ExportDataset_event1=Lista de eventos de la agenda
 DefaultWorkingDays=Rango predeterminado de días laborables en la semana (Ejemplo: 1-5, 1-6)
diff --git a/htdocs/langs/es_CL/cron.lang b/htdocs/langs/es_CL/cron.lang
index cd31d44645c..ef91b6b98d5 100644
--- a/htdocs/langs/es_CL/cron.lang
+++ b/htdocs/langs/es_CL/cron.lang
@@ -39,7 +39,6 @@ CronSaveSucess=Guardado exitosamente
 CronFieldMandatory=Fields %s es obligatorio
 CronErrEndDateStartDt=La fecha de finalización no puede ser anterior a la fecha de inicio
 CronStatusInactiveBtn=Inhabilitar
-CronTaskInactive=Este trabajo está deshabilitado
 CronId=Carné de identidad
 CronModuleHelp=Nombre del directorio del módulo Dolibarr (también funciona con un módulo externo Dolibarr). <BR> Por ejemplo, para llamar al método fetch de Dolibarr Product object / htdocs / <u>product</u> /class/product.class.php, el valor para el módulo es <br> <i>producto</i>
 CronClassFileHelp=La ruta relativa y el nombre del archivo a cargar (la ruta es relativa al directorio raíz del servidor web). <BR> Por ejemplo, para llamar al método fetch del objeto del producto Dolibarr htdocs / product / class / <u>product.class.php</u> , el valor para el nombre del archivo de clase es <br> <i>producto / clase / producto.clase.php</i>
diff --git a/htdocs/langs/es_CL/errors.lang b/htdocs/langs/es_CL/errors.lang
index 1f86aa0569b..a558bcdd773 100644
--- a/htdocs/langs/es_CL/errors.lang
+++ b/htdocs/langs/es_CL/errors.lang
@@ -91,7 +91,6 @@ ErrorCantReadFile=Error al leer el archivo '%s'
 ErrorCantReadDir=Error al leer el directorio '%s'
 ErrorBadLoginPassword=Mal valor para el inicio de sesión o la contraseña
 ErrorLoginDisabled=Su cuenta ha sido deshabilitada
-ErrorFailedToRunExternalCommand=Error al ejecutar el comando externo. Verifique que esté disponible y ejecutable por su servidor PHP. Si PHP <b> Safe Mode </ b> está habilitado, verifique que el comando esté dentro de un directorio definido por el parámetro <b> safe_mode_exec_dir </ b>.
 ErrorFailedToChangePassword=Error al cambiar la contraseña
 ErrorLoginDoesNotExists=Usuario con inicio de sesión <b>%s</b> no se pudo encontrar.
 ErrorLoginHasNoEmail=Este usuario no tiene una dirección de correo electrónico. Proceso abortado
diff --git a/htdocs/langs/es_CL/hrm.lang b/htdocs/langs/es_CL/hrm.lang
index 32f70e14685..9ad29250e7f 100644
--- a/htdocs/langs/es_CL/hrm.lang
+++ b/htdocs/langs/es_CL/hrm.lang
@@ -2,5 +2,4 @@
 HRM_EMAIL_EXTERNAL_SERVICE=Correo electrónico para evitar el servicio externo de RRHH
 ConfirmDeleteEstablishment=¿Estás seguro de que deseas eliminar este establecimiento?
 OpenEtablishment=Establecimiento abierto
-DictionaryPublicHolidays=Gestión de recursos humanos: días festivos
 DictionaryDepartment=RRHH - Lista de departamentos
diff --git a/htdocs/langs/es_CL/mrp.lang b/htdocs/langs/es_CL/mrp.lang
index f43c1d88ba9..8bce2ae683d 100644
--- a/htdocs/langs/es_CL/mrp.lang
+++ b/htdocs/langs/es_CL/mrp.lang
@@ -6,10 +6,8 @@ MenuBOM=Facturas de material
 LatestBOMModified=Últimas %s Cuentas de materiales modificadas
 LatestMOModified=Últimas %s Ordenes de Fabricación modificadas
 Bom=Factura de Materiales
-BillOfMaterials=Lista de materiales
 ListOfBOMs=Lista de listas de materiales - BOM
 ListOfManufacturingOrders=Lista de pedidos de fabricación
-ProductBOMHelp=Producto a crear con este BOM.<br>Nota: Productos con la propiedad 'Naturaleza del producto' = 'Materia Prima' No son visibles en esta lista.
 BOMsNumberingModules=Plantillas de numeración de listas de materiales
 BOMsModelModule=Lista de Materiales-BOM plantillas de documentos
 MOsNumberingModules=Plantilla de numeración MO
@@ -18,17 +16,13 @@ FreeLegalTextOnBOMs=Texto libre en el documento de BOM
 WatermarkOnDraftBOMs=Marca de agua en el borrador de la lista de materiales
 FreeLegalTextOnMOs=Texto Libre en el documento de MO
 WatermarkOnDraftMOs=Marca de agua de borrador MO
-ConfirmCloneBillOfMaterials=¿Estas seguro de que deseas clonar la Factura de materiales %s ?
 ConfirmCloneMo=¿Estas seguro de que deseas clonar la Orden de Fabricación (MO) %s ?
 DeleteBillOfMaterials=Eliminar lista de materiales
 DeleteMo=Borrar Orden de Fabricación-MO
-ConfirmDeleteBillOfMaterials=¿Estás seguro de que deseas eliminar esta lista de materiales?
-ConfirmDeleteMo=¿Está seguro de que desea eliminar esta lista de materiales?
 QtyToProduce=Cantidad para producir
 DateStartPlannedMo=Fecha de inicio prevista
 DateEndPlannedMo=Fecha de finalización prevista
 KeepEmptyForAsap=Vacío significa &#39;Tan pronto como sea posible&#39;
-EstimatedDurationDesc=Duración estimada para fabricar este producto utilizando esta lista de materiales-BOM
 ConfirmValidateBom=¿Está seguro de que desea validar la lista de materiales con la referencia <strong>%s</strong>? (podrá usarlo para crear nuevos pedidos de fabricación)
 ConfirmCloseBom=¿Está seguro de que desea cancelar esta lista de materiales (ya no podrá usarla para crear nuevas órdenes de fabricación)?
 ConfirmReopenBom=¿Está seguro de que desea volver a abrir esta lista de materiales (podrá usarla para crear nuevos pedidos de fabricación)
@@ -37,3 +31,4 @@ QuantityFrozen=Cantidad congelada
 BOMLine=Línea de BOM
 WarehouseForProduction=Almacén de producción
 CreateMO=Crear Orden de Fabricación
+DeleteWorkstation=Borrar
diff --git a/htdocs/langs/es_CL/orders.lang b/htdocs/langs/es_CL/orders.lang
index d51b03fd8f4..855b4c6cd4d 100644
--- a/htdocs/langs/es_CL/orders.lang
+++ b/htdocs/langs/es_CL/orders.lang
@@ -9,6 +9,7 @@ OrderLine=Fila para ordenar
 OrderDateShort=Fecha de orden
 OrderToProcess=Orden para procesar
 NewOrder=Nueva orden
+NewSupplierOrderShort=Nueva orden
 NewOrderSupplier=Nueva Orden de Compra
 ToOrder=Hacer orden
 MakeOrder=Hacer orden
diff --git a/htdocs/langs/es_CL/partnership.lang b/htdocs/langs/es_CL/partnership.lang
index 56902c9ba1c..5a0ee294473 100644
--- a/htdocs/langs/es_CL/partnership.lang
+++ b/htdocs/langs/es_CL/partnership.lang
@@ -1,4 +1,4 @@
 # Dolibarr language file - Source file is en_US - partnership
 DatePartnershipStart=Fecha inicial
 DatePartnershipEnd=Fecha final
-PartnershipCanceled =Cancelado
+PartnershipCanceled=Cancelado
diff --git a/htdocs/langs/es_CL/stocks.lang b/htdocs/langs/es_CL/stocks.lang
index 96a71f2b60e..b364505a16b 100644
--- a/htdocs/langs/es_CL/stocks.lang
+++ b/htdocs/langs/es_CL/stocks.lang
@@ -30,10 +30,10 @@ StockMovements=Movimientos de acciones
 NumberOfUnit=Número de unidades
 StockTooLow=Stock demasiado bajo
 StockLowerThanLimit=Stock inferior al límite de alerta (%s)
-PMPValue=Precio promedio ponderado
 EnhancedValueOfWarehouses=Valor de las bodegas
 UserWarehouseAutoCreate=Crear un almacén de usuario automáticamente al crear un usuario
 AllowAddLimitStockByWarehouse=Administre también el valor del stock mínimo y deseado por emparejamiento (almacén de productos) además del valor del stock mínimo y deseado por producto
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
 IndependantSubProductStock=El stock de producto y el stock de subproducto son independientes.
 QtyDispatched=Cantidad despachada
 QtyDispatchedShort=Cantidad despachada
diff --git a/htdocs/langs/es_CL/ticket.lang b/htdocs/langs/es_CL/ticket.lang
index e3e937e670e..c3b90781239 100644
--- a/htdocs/langs/es_CL/ticket.lang
+++ b/htdocs/langs/es_CL/ticket.lang
@@ -60,6 +60,7 @@ CreateTicket=Crear boleto
 TicketsManagement=Gestión de Tickets
 NewTicket=Nuevo Ticket
 SubjectAnswerToTicket=Respuesta del Ticket
+TicketCategory=Group
 SeeTicket=Ver Ticket
 TicketReadOn=Sigue leyendo
 TicketHistory=Historial de Tickets
diff --git a/htdocs/langs/es_CO/accountancy.lang b/htdocs/langs/es_CO/accountancy.lang
index 48a19b88e51..2cc7715ef67 100644
--- a/htdocs/langs/es_CO/accountancy.lang
+++ b/htdocs/langs/es_CO/accountancy.lang
@@ -108,7 +108,6 @@ ACCOUNTING_LENGTH_AACCOUNT=Longitud de las cuentas de contabilidad de terceros (
 ACCOUNTING_MANAGE_ZERO=Permitir administrar diferentes números de ceros al final de una cuenta contable. Necesitado por algunos países (como Suiza). Si está desactivado (predeterminado), puede configurar los siguientes dos parámetros para pedirle a la aplicación que agregue ceros virtuales.
 BANK_DISABLE_DIRECT_INPUT=Deshabilitar el registro directo de la transacción en la cuenta bancaria
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Habilitar borrador de exportación en la revista
-ACCOUNTANCY_COMBO_FOR_AUX=Habilite la lista combinada para la cuenta subsidiaria (puede ser lento si tiene muchos terceros)
 ACCOUNTING_SELL_JOURNAL=Diario de venta
 ACCOUNTING_PURCHASE_JOURNAL=Diario de compra
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Revista miscelánea
diff --git a/htdocs/langs/es_CO/admin.lang b/htdocs/langs/es_CO/admin.lang
index 2646b12f477..edd6927deae 100644
--- a/htdocs/langs/es_CO/admin.lang
+++ b/htdocs/langs/es_CO/admin.lang
@@ -429,7 +429,6 @@ Module52Name=Cepo
 Module52Desc=Gestión de Stocks
 Module54Name=Contratos / Suscripciones
 Module54Desc=Gestión de contratos (servicios o suscripciones recurrentes).
-Module55Desc=Gestión de códigos de barras
 Module56Desc=Gestión de pago de proveedores mediante Órdenes de Transferencia de Crédito. Incluye generación de archivo SEPA para países europeos.
 Module57Name=Pagos por Débito Automático
 Module57Desc=Gestión de órdenes de débito automático. Incluye generación de archivo SEPA para países europeos.
@@ -654,8 +653,6 @@ Permission402=Crear / modificar descuentos.
 Permission403=Validar descuentos
 Permission404=Eliminar descuentos
 Permission430=Usar la barra de depuración
-Permission512=Crear / modificar pagos de salarios.
-Permission514=Eliminar pagos de salarios.
 Permission519=Salarios de exportación
 Permission520=Leer prestamos
 Permission522=Crear / modificar préstamos.
@@ -800,7 +797,6 @@ DictionaryEMailTemplates=Plantillas de correo electrónico
 DictionaryMeasuringUnits=Unidades de medida
 DictionaryProspectStatus=Estado de prospectos para empresas
 DictionaryProspectContactStatus=Estado de cliente potencial para contactos
-DictionaryHolidayTypes=Tipos de licencia
 DictionaryOpportunityStatus=Principal estado para proyecto / Iniciativa
 DictionaryExpenseTaxRange=Informe de gastos - Gama por categoría de transporte
 DictionaryTransportMode=Informe intracomm - modo de transporte
@@ -1013,8 +1009,6 @@ ConditionIsCurrently=La condición es actualmente %s
 YouUseBestDriver=Utiliza el controlador %s, que es el mejor controlador disponible actualmente.
 YouDoNotUseBestDriver=Utiliza el controlador %s pero se recomienda el controlador %s.
 SearchOptim=Optimización de búsqueda
-YouHaveXObjectUseSearchOptim=Tiene %s %s en la base de datos. Puede agregar la constante %s a 1 en Inicio - Configuración - Otros. Limite la búsqueda al comienzo de las cadenas, lo que hace posible que la base de datos use índices y debería obtener una respuesta inmediata.
-YouHaveXObjectAndSearchOptimOn=Tiene %s %s en la base de datos y la constante %s se establece en 1 en  Inicio - Configuración - Otros.
 BrowserIsOK=Está utilizando el navegador web %s. Este navegador está bien para la seguridad y el rendimiento.
 BrowserIsKO=Está utilizando el navegador web %s. Se sabe que este navegador es una mala elección para la seguridad, el rendimiento y la confiabilidad. Recomendamos el uso de Firefox, Chrome, Opera o Safari.
 PHPModuleLoaded=Se cargó el componente PHP %s
diff --git a/htdocs/langs/es_CO/errors.lang b/htdocs/langs/es_CO/errors.lang
index de15fc3fbda..a12bdd93750 100644
--- a/htdocs/langs/es_CO/errors.lang
+++ b/htdocs/langs/es_CO/errors.lang
@@ -92,7 +92,6 @@ ErrorCantReadFile=Error al leer el archivo '%s'
 ErrorCantReadDir=No se pudo leer el directorio '%s'
 ErrorBadLoginPassword=Valor incorrecto para inicio de sesión o contraseña
 ErrorLoginDisabled=Tu cuenta ha sido inhabilitada
-ErrorFailedToRunExternalCommand=No se pudo ejecutar el comando externo. Compruebe que esté disponible y que su servidor PHP pueda ejecutar. Si PHP <b> Safe Mode </b> está habilitado, verifique que el comando esté dentro de un directorio definido por el parámetro <b> safe_mode_exec_dir </b>.
 ErrorFailedToChangePassword=No se pudo cambiar la contraseña
 ErrorLoginDoesNotExists=No se pudo encontrar el usuario con inicio de sesión <b> %s </b>.
 ErrorLoginHasNoEmail=Este usuario no tiene dirección de correo electrónico. Proceso abortado.
diff --git a/htdocs/langs/es_CO/hrm.lang b/htdocs/langs/es_CO/hrm.lang
index e5230a6f0df..8ff90577604 100644
--- a/htdocs/langs/es_CO/hrm.lang
+++ b/htdocs/langs/es_CO/hrm.lang
@@ -3,7 +3,6 @@ HRM_EMAIL_EXTERNAL_SERVICE=Correo electrónico para evitar el servicio externo d
 ConfirmDeleteEstablishment=¿Estás seguro de que deseas eliminar este establecimiento?
 OpenEtablishment=Establecimiento abierto
 CloseEtablishment=Establecimiento cerrado
-DictionaryPublicHolidays=HRM - Días festivos
 DictionaryDepartment=HRM - Lista de departamentos
 DictionaryFunction=HRM - Puestos de trabajo
 ListOfEmployees=Lista de empleados
diff --git a/htdocs/langs/es_CO/mrp.lang b/htdocs/langs/es_CO/mrp.lang
deleted file mode 100644
index a8ff138755b..00000000000
--- a/htdocs/langs/es_CO/mrp.lang
+++ /dev/null
@@ -1,6 +0,0 @@
-# Dolibarr language file - Source file is en_US - mrp
-BillOfMaterials=Bill of Material
-NewBOM=New bill of material
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
diff --git a/htdocs/langs/es_CO/partnership.lang b/htdocs/langs/es_CO/partnership.lang
index bcb4f9e1365..d9c01e81c25 100644
--- a/htdocs/langs/es_CO/partnership.lang
+++ b/htdocs/langs/es_CO/partnership.lang
@@ -1,12 +1,12 @@
 # Dolibarr language file - Source file is en_US - partnership
-ModulePartnershipName =Gestión de alianzas
-PartnershipDescription =Módulo de gestión de asociaciones
+ModulePartnershipName=Gestión de alianzas
+PartnershipDescription=Módulo de gestión de asociaciones
 PartnershipDescriptionLong=Módulo de gestión de asociaciones
-NewPartnership =Nueva sociedad
-ListOfPartnerships =Lista de asociación
-PartnershipSetup =Configuración de la asociación
-PartnershipAbout =Acerca de la asociación
-PartnershipAboutPage =Página "acerca de" la asociación
+NewPartnership=Nueva sociedad
+ListOfPartnerships=Lista de asociación
+PartnershipSetup=Configuración de la asociación
+PartnershipAbout=Acerca de la asociación
+PartnershipAboutPage=Página "acerca de" la asociación
 DatePartnershipEnd=Fecha final
-PartnershipCanceled =Cancelado
+PartnershipCanceled=Cancelado
 PartnershipManagedFor=Socios son
diff --git a/htdocs/langs/es_CO/products.lang b/htdocs/langs/es_CO/products.lang
index da4a5bc3613..e1656957afe 100644
--- a/htdocs/langs/es_CO/products.lang
+++ b/htdocs/langs/es_CO/products.lang
@@ -179,3 +179,4 @@ ConfirmCloneProductCombinations=¿Desea copiar todas las variantes del producto
 CloneDestinationReference=Referencia del producto destino
 ErrorCopyProductCombinations=Se ha producido un error al copiar las variantes del producto.
 ErrorDestinationProductNotFound=Producto de destino no encontrado
+PMPValue=Precio promedio ponderado
diff --git a/htdocs/langs/es_CO/stocks.lang b/htdocs/langs/es_CO/stocks.lang
index e6aa9ec27df..649afed7baf 100644
--- a/htdocs/langs/es_CO/stocks.lang
+++ b/htdocs/langs/es_CO/stocks.lang
@@ -37,7 +37,6 @@ NumberOfUnit=Número de unidades
 UnitPurchaseValue=Precio unitario de compra
 StockTooLow=Stock demasiado bajo
 StockLowerThanLimit=Stock por debajo del límite de alerta (%s)
-PMPValue=Precio promedio ponderado
 EnhancedValueOfWarehouses=Valor de los almacenes
 UserWarehouseAutoCreate=Cree un almacén de usuarios automáticamente al crear un usuario
 AllowAddLimitStockByWarehouse=Gestionar también el valor del stock mínimo y deseado por emparejamiento (producto-almacén) además del valor del stock mínimo y deseado por producto
@@ -123,7 +122,6 @@ MovementCorrectStock=Corrección de stock para el producto %s
 MovementTransferStock=Traslado de stock del producto %s a otro almacén
 InventoryCodeShort=Inv./Mov. código
 NoPendingReceptionOnSupplierOrder=No hay recepción pendiente debido a una orden de compra abierta
-OpenAll=Abierto a todas las acciones
 OpenInternal=Abierto solo para acciones internas
 UseDispatchStatus=Utilice un estado de envío (aprobar / rechazar) para las líneas de productos en la recepción de la orden de compra
 OptionMULTIPRICESIsOn=La opción "varios precios por segmento" está activada. Significa que un producto tiene varios precios de venta, por lo que el valor de venta no se puede calcular.
diff --git a/htdocs/langs/es_DO/accountancy.lang b/htdocs/langs/es_DO/accountancy.lang
index 4dbdd035d6e..ef9e69e554a 100644
--- a/htdocs/langs/es_DO/accountancy.lang
+++ b/htdocs/langs/es_DO/accountancy.lang
@@ -1,2 +1,2 @@
 # Dolibarr language file - Source file is en_US - accountancy
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
diff --git a/htdocs/langs/es_DO/cron.lang b/htdocs/langs/es_DO/cron.lang
deleted file mode 100644
index 67ecfc77567..00000000000
--- a/htdocs/langs/es_DO/cron.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - cron
-CronTaskInactive=This job is disabled
diff --git a/htdocs/langs/es_DO/exports.lang b/htdocs/langs/es_DO/exports.lang
new file mode 100644
index 00000000000..17dedd46696
--- /dev/null
+++ b/htdocs/langs/es_DO/exports.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - exports
+DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
diff --git a/htdocs/langs/es_DO/mrp.lang b/htdocs/langs/es_DO/mrp.lang
deleted file mode 100644
index a8ff138755b..00000000000
--- a/htdocs/langs/es_DO/mrp.lang
+++ /dev/null
@@ -1,6 +0,0 @@
-# Dolibarr language file - Source file is en_US - mrp
-BillOfMaterials=Bill of Material
-NewBOM=New bill of material
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
diff --git a/htdocs/langs/es_DO/products.lang b/htdocs/langs/es_DO/products.lang
new file mode 100644
index 00000000000..e0628dbec00
--- /dev/null
+++ b/htdocs/langs/es_DO/products.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - products
+ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
diff --git a/htdocs/langs/es_DO/stocks.lang b/htdocs/langs/es_DO/stocks.lang
new file mode 100644
index 00000000000..1cae5cf3f11
--- /dev/null
+++ b/htdocs/langs/es_DO/stocks.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - stocks
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+OpenInternal=Open only for internal actions
diff --git a/htdocs/langs/es_DO/ticket.lang b/htdocs/langs/es_DO/ticket.lang
new file mode 100644
index 00000000000..82e110b1ca4
--- /dev/null
+++ b/htdocs/langs/es_DO/ticket.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - ticket
+TicketTypeShortISSUE=Issue, bug or problem
+OriginEmail=Email source
+NeedMoreInformation=Waiting for information
+TicketCategory=Group
diff --git a/htdocs/langs/es_EC/accountancy.lang b/htdocs/langs/es_EC/accountancy.lang
index 5315299f9bc..5021f5c12b5 100644
--- a/htdocs/langs/es_EC/accountancy.lang
+++ b/htdocs/langs/es_EC/accountancy.lang
@@ -25,6 +25,7 @@ JournalizationInLedgerStatus=Estado de la publicación
 GroupIsEmptyCheckSetup=El grupo está vacío, compruebe la configuración del grupo de contabilidad personalizado
 DetailByAccount=Mostrar detalles por cuenta
 AccountWithNonZeroValues=Cuentas con valores distintos de cero.
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 MainAccountForCustomersNotDefined=Cuenta principal de contabilidad para clientes no definidos en la configuración
 MainAccountForSuppliersNotDefined=Cuenta contable principal para proveedores no definidos en la configuración
 MainAccountForUsersNotDefined=Cuenta principal de contabilidad para usuarios no definidos en la configuración
@@ -99,7 +100,6 @@ ACCOUNTING_LENGTH_AACCOUNT=Longitud de las cuentas contables de terceros (si est
 ACCOUNTING_MANAGE_ZERO=Permitir gestionar diferentes números de ceros al final de una cuenta contable. Necesario por algunos países (como Suiza). Si está desactivado (predeterminado), puede configurar los siguientes dos parámetros para pedirle a la aplicación que agregue ceros virtuales.
 BANK_DISABLE_DIRECT_INPUT=Inhabilitar la grabación directa de la transacción en una cuenta bancaria
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Habilitar la exportación del borrador en el diario
-ACCOUNTANCY_COMBO_FOR_AUX=Habilite la lista combinada para la cuenta subsidiaria (puede ser lenta si tiene muchos terceros)
 ACCOUNTING_SELL_JOURNAL=Vender un diario
 ACCOUNTING_PURCHASE_JOURNAL=Diario de compra
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Diario diverso
diff --git a/htdocs/langs/es_EC/admin.lang b/htdocs/langs/es_EC/admin.lang
index d12b5c4f9ee..f54fc336cb0 100644
--- a/htdocs/langs/es_EC/admin.lang
+++ b/htdocs/langs/es_EC/admin.lang
@@ -408,7 +408,6 @@ Module52Name=Dispuesto
 Module52Desc=Gestion de Stocks
 Module54Name=Contratos / Suscripciones
 Module54Desc=Gestión de contratos (servicios o suscripciones recurrentes).
-Module55Desc=Administración de código de barras
 Module58Desc=Integración de un sistema ClickToDial (Asterisco, ...)
 Module60Name=Adhesivos
 Module60Desc=Manejo de adhesivos
@@ -619,8 +618,6 @@ Permission402=Crear / modificar descuentos
 Permission403=Validar descuentos
 Permission404=Eliminar descuentos
 Permission430=Usar barra de depuración
-Permission512=Crear / modificar pagos de salarios.
-Permission514=Eliminar pagos de salarios.
 Permission520=Leer Préstamos
 Permission522=Crear / modificar préstamos
 Permission524=Eliminar préstamos
@@ -735,7 +732,6 @@ DictionaryAccountancysystem=Modelos para el plan de cuentas
 DictionaryAccountancyJournal=Diarios / libros de contabilidad
 DictionaryEMailTemplates=Plantillas de correo electrónico
 DictionaryMeasuringUnits=Unidades de medida
-DictionaryHolidayTypes=Tipos de licencia
 DictionaryOpportunityStatus=Estado de plomo para proyecto / lider
 SetupSaved=Configuración Guardada
 BackToModuleList=Volver a la lista de módulos
@@ -831,7 +827,6 @@ SetupDescription1=Antes de comenzar a utilizar Dolibarr, se deben definir alguno
 SetupDescription3= <a href="%s"> %s -> %s </a> <br> <br> Parámetros básicos utilizados para personalizar el comportamiento predeterminado de su aplicación (por ejemplo, para los países relacionados con el comportamiento predeterminado).
 SetupDescription4= <a href="%s"> %s -> %s </a> <br> <br> Este software es un conjunto de muchos módulos/aplicaciones. Los módulos relacionados con sus necesidades deben estar habilitados y configurados. Las entradas del menú aparecerán con la activación de estos módulos.
 SetupDescription5=Otras entradas del menú de configuración manejan parámetros opcionales.
-Audit=Auditoria
 InfoBrowser=Acerca del navegador
 InfoOS=Acerca del OS
 BrowserName=nombre del navegador
@@ -931,7 +926,6 @@ ConditionIsCurrently=Condición actual %s
 YouUseBestDriver=Utiliza el controlador %s, que es el mejor controlador actualmente disponible.
 YouDoNotUseBestDriver=Utiliza el controlador %s, pero se recomienda el controlador %s.
 SearchOptim=Optimización de la búsqueda
-YouHaveXObjectAndSearchOptimOn=Tiene %s %s en la base de datos y la constante %s se establece en 1 en Home-Setup-Other.
 BrowserIsOK=Está utilizando el navegador web %s. Este navegador está bien para la seguridad y el rendimiento.
 BrowserIsKO=Está utilizando el navegador web %s. Se sabe que este navegador es una mala elección para la seguridad, el rendimiento y la confiabilidad. Recomendamos utilizar Firefox, Chrome, Opera o Safari.
 AddRefInList=Mostrar cliente / vendedor ref. Lista de información (lista de selección o cuadro combinado) y la mayoría del hipervínculo. <br> Los terceros aparecerán con un formato de nombre de "CC12345 - SC45678 - The Big Company corp". en lugar de "The Big Company corp".
diff --git a/htdocs/langs/es_EC/agenda.lang b/htdocs/langs/es_EC/agenda.lang
index c7beb16acb1..5387a6ba3c1 100644
--- a/htdocs/langs/es_EC/agenda.lang
+++ b/htdocs/langs/es_EC/agenda.lang
@@ -5,7 +5,6 @@ ListOfActions=Lista de eventos
 EventOnFullDay=Evento todo el día(s)
 MenuToDoActions=Todos los eventos incompletos
 MenuDoneActions=Todos los eventos terminados
-ListOfEvents=Lista de eventos (calendario interno)
 ActionsAskedBy=Eventos reportados por
 ViewCal=Vista de mes
 ViewDay=Vista del día
diff --git a/htdocs/langs/es_EC/cron.lang b/htdocs/langs/es_EC/cron.lang
index 7dbff235dc7..f55f46d6d9b 100644
--- a/htdocs/langs/es_EC/cron.lang
+++ b/htdocs/langs/es_EC/cron.lang
@@ -40,7 +40,6 @@ CronSaveSucess=Guardado exitosamente
 CronFieldMandatory=Los campos%s son obligatorios
 CronErrEndDateStartDt=La fecha de finalización no puede ser anterior a la fecha de inicio
 CronStatusInactiveBtn=En rehabilitación
-CronTaskInactive=Este trabajo está deshabilitado
 CronId=Carné de identidad
 CronModuleHelp=Nombre del directorio del módulo Dolibarr (también funciona con un módulo Dolibarr externo). <BR> Por ejemplo, para llamar al método fetch del objeto del producto Dolibarr /htdocs/<u>product</u>/class/product.class.php, el valor para el módulo es <br><i>product</i>
 CronClassFileHelp=La ruta relativa y el nombre del archivo a cargar (la ruta es relativa al directorio raíz del servidor web).  <BR>Por ejemplo, para llamar al método fetch del objeto del producto Dolibarr htdocs/product/class/ <u>product.class.php</u>, el valor para el nombre del archivo de clase es <br><i>product/class/product.class.php</i>
diff --git a/htdocs/langs/es_EC/errors.lang b/htdocs/langs/es_EC/errors.lang
index 07e30cff264..54e344554e0 100644
--- a/htdocs/langs/es_EC/errors.lang
+++ b/htdocs/langs/es_EC/errors.lang
@@ -88,7 +88,6 @@ ErrorCantReadFile=Error al leer el archivo '%s'
 ErrorCantReadDir=Error al leer el directorio '%s'
 ErrorBadLoginPassword=Valor incorrecto para el inicio de sesión o la contraseña
 ErrorLoginDisabled=Su cuenta ha sido deshabilitada
-ErrorFailedToRunExternalCommand=Error al ejecutar el comando externo. Compruebe que está disponible y ejecutado por su servidor PHP. Si está habilitado PHP <b> Modo a prueba de errores </ b>, compruebe que el comando esté dentro de un directorio definido por el parámetro <b> safe_mode_exec_dir </ b>.
 ErrorFailedToChangePassword=Error al cambiar la contraseña
 ErrorLoginDoesNotExists=El usuario con acceso <b>%s</b> no se pudo encontrar.
 ErrorLoginHasNoEmail=Este usuario no tiene dirección de correo electrónico. Proceso abortado.
diff --git a/htdocs/langs/es_EC/hrm.lang b/htdocs/langs/es_EC/hrm.lang
index 42289516832..e98d3dd3801 100644
--- a/htdocs/langs/es_EC/hrm.lang
+++ b/htdocs/langs/es_EC/hrm.lang
@@ -2,5 +2,4 @@
 HRM_EMAIL_EXTERNAL_SERVICE=Correo electrónico para prevenir el servicio externo de RRHH
 ConfirmDeleteEstablishment=¿Estás seguro de que deseas eliminar este establecimiento?
 OpenEtablishment=Establecimiento abierto
-DictionaryPublicHolidays=HRM - Días festivos
 DictionaryDepartment=RRHH - Lista de departamento
diff --git a/htdocs/langs/es_EC/mrp.lang b/htdocs/langs/es_EC/mrp.lang
index c87d64ece84..902fbfe221f 100644
--- a/htdocs/langs/es_EC/mrp.lang
+++ b/htdocs/langs/es_EC/mrp.lang
@@ -4,10 +4,8 @@ MenuBOM=Facturas de material
 LatestBOMModified=Últimas listas de materiales modificados %s
 LatestMOModified=Últimas órdenes de fabricación %s modificadas
 Bom=Facturas de material
-BillOfMaterials=Lista de materiales
 ListOfBOMs=Lista de listas de materiales - BOM
 ListOfManufacturingOrders=Lista de pedidos de fabricación
-ProductBOMHelp=Producto para crear con esta BOM. <br> Nota: Los productos con la propiedad 'Naturaleza del producto' = 'Materia prima' no son visibles en esta lista.
 BOMsNumberingModules=Plantillas de numeración BOM
 BOMsModelModule=Plantillas de documentos BOM
 MOsNumberingModules=Plantillas de numeración MO
@@ -16,13 +14,10 @@ FreeLegalTextOnBOMs=Texto libre en el documento de BOM
 WatermarkOnDraftBOMs=Marca de agua en el borrador de lista de materiales
 FreeLegalTextOnMOs=Texto libre en el documento de MO
 WatermarkOnDraftMOs=Marca de agua en borrador MO
-ConfirmCloneBillOfMaterials=¿Está seguro de que desea clonar la lista de materiales %s?
 ConfirmCloneMo=¿Está seguro de que desea clonar la orden de fabricación %s?
 ValueOfMeansLoss=Valor de 0.95 significa un promedio de 5%% de pérdida durante la producción
 DeleteBillOfMaterials=Eliminar lista de materiales
 DeleteMo=Eliminar orden de fabricación
-ConfirmDeleteBillOfMaterials=¿Está seguro de que desea eliminar esta lista de materiales?
-ConfirmDeleteMo=¿Está seguro de que desea eliminar esta lista de materiales?
 QtyToProduce=Cantidad para producir
 DateStartPlannedMo=Fecha de inicio prevista
 DateEndPlannedMo=Fecha de finalización prevista
@@ -42,4 +37,4 @@ ConsumeOrProduce=Consumir o Producir
 ConfirmValidateMo=¿Está seguro de que desea validar esta orden de fabricación?
 ConfirmProductionDesc=Al hacer clic en '%s', validará el consumo y / o la producción de las cantidades establecidas. Esto también actualizará el stock y registrará movimientos de stock.
 AutoCloseMO=Cierre automáticamente la orden de fabricación si se alcanzan cantidades para consumir y producir
-ProductQtyToProduceByMO=Quentidad de producto aún por producir por MO abierto
+DeleteWorkstation=Borrar
diff --git a/htdocs/langs/es_EC/orders.lang b/htdocs/langs/es_EC/orders.lang
index d8e0030693a..bccf708457d 100644
--- a/htdocs/langs/es_EC/orders.lang
+++ b/htdocs/langs/es_EC/orders.lang
@@ -9,6 +9,7 @@ OrderLine=Fila para ordenar
 OrderDateShort=Fecha de orden
 OrderToProcess=Orden para procesar
 NewOrder=Nueva orden
+NewSupplierOrderShort=Nueva orden
 NewOrderSupplier=Nueva orden de compra
 ToOrder=Hacer orden
 MakeOrder=Hacer orden
diff --git a/htdocs/langs/es_EC/partnership.lang b/htdocs/langs/es_EC/partnership.lang
index 0e3f1df1b9c..45f9d1b2e1b 100644
--- a/htdocs/langs/es_EC/partnership.lang
+++ b/htdocs/langs/es_EC/partnership.lang
@@ -1,3 +1,3 @@
 # Dolibarr language file - Source file is en_US - partnership
 DatePartnershipEnd=Fecha final
-PartnershipCanceled =Cancelado
+PartnershipCanceled=Cancelado
diff --git a/htdocs/langs/es_EC/products.lang b/htdocs/langs/es_EC/products.lang
index e85678b9e7a..89db10fa719 100644
--- a/htdocs/langs/es_EC/products.lang
+++ b/htdocs/langs/es_EC/products.lang
@@ -210,3 +210,4 @@ ErrorProductCombinationNotFound=Variante del producto no encontrada
 ActionAvailableOnVariantProductOnly=Acción solo disponible en la variante de producto
 ProductsPricePerCustomer=Precios de productos por cliente
 ProductSupplierExtraFields=Atributos adicionales (precios de proveedor)
+PMPValue=Precio medio ponderado
diff --git a/htdocs/langs/es_EC/stocks.lang b/htdocs/langs/es_EC/stocks.lang
index 8c4ec56e517..599274eef11 100644
--- a/htdocs/langs/es_EC/stocks.lang
+++ b/htdocs/langs/es_EC/stocks.lang
@@ -33,10 +33,10 @@ StockMovements=Movimiento de inventario
 NumberOfUnit=Número de unidades
 StockTooLow=Inventario demasiado bajo
 StockLowerThanLimit=Inventario más bajo que el límite de alerta (%s)
-PMPValue=Precio medio ponderado
 EnhancedValueOfWarehouses=Valor de almacenes
 UserWarehouseAutoCreate=Crear un almacén de usuario automáticamente al crear un usuario
 AllowAddLimitStockByWarehouse=Administre también el valor del stock mínimo y deseado por emparejamiento (almacén de productos) además del valor del stock mínimo y deseado por producto
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
 MainDefaultWarehouse=Almacén predeterminado
 IndependantSubProductStock=El stock de producto y el stock de subproducto son independientes.
 QtyDispatched=Cantidad despachada
diff --git a/htdocs/langs/es_ES/accountancy.lang b/htdocs/langs/es_ES/accountancy.lang
index 93faa22f85e..67422fcdc78 100644
--- a/htdocs/langs/es_ES/accountancy.lang
+++ b/htdocs/langs/es_ES/accountancy.lang
@@ -158,7 +158,7 @@ ACCOUNTING_LENGTH_AACCOUNT=Longitud de las subcuentas de terceros ( si ajusta el
 ACCOUNTING_MANAGE_ZERO=Gestiona el cero al final de una cuenta contable. Necesario en algunos países (como Suiza). Si se mantiene desactivada (por defecto), puede configurar los 2 parámetros siguientes para pedir que la aplicación agregue el cero virtual
 BANK_DISABLE_DIRECT_INPUT=Desactivar transacciones directas en cuenta bancaria
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Habilitar exportación de borradores al diario
-ACCOUNTANCY_COMBO_FOR_AUX=Habilitar la lista combinada para la cuenta subsidiaria (puede ser lento si tiene muchos terceros)
+ACCOUNTANCY_COMBO_FOR_AUX=Habilite la lista combinada para la cuenta subsidiaria (puede ser lento si tiene muchos terceros, rompa la capacidad de buscar en una parte del valor)
 ACCOUNTING_DATE_START_BINDING=Defina una fecha para comenzar a vincular y transferir en contabilidad. Por debajo de esta fecha, las transacciones no se transferirán a contabilidad.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=En la transferencia de contabilidad, seleccione el período que se muestra de forma predeterminada
 
@@ -328,6 +328,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Deshabilitar la vinculación y transfere
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Desactive la vinculación y transferencia en contabilidad en informes de gastos (los informes de gastos no se tendrán en cuenta en la contabilidad)
 
 ## Export
+NotifiedExportDate=Notified export date (modification of the entries will not be possible)
+NotifiedValidationDate=Validation of the entries (modification or deletion of the entries will not be possible)
+ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=Exportar libro borrador
 Modelcsv=Modelo de exportación
 Selectmodelcsv=Seleccione un modelo de exportación
diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang
index 0c5f9b62812..6071cf40a9c 100644
--- a/htdocs/langs/es_ES/admin.lang
+++ b/htdocs/langs/es_ES/admin.lang
@@ -221,8 +221,8 @@ NotCompatible=Este módulo no parece compatible con su Dolibarr %s (Min %s - Max
 CompatibleAfterUpdate=Este módulo requiere una actualización de su Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=Ver en la tienda
 SeeSetupOfModule=Vea la configuración del módulo %s
+SetOptionTo=Establezca la opción <b> %s </b> en %s
 Updated=Actualizado
-Nouveauté=Novedad
 AchatTelechargement=Comprar/Descargar
 GoModuleSetupArea=Para instalar un nuevo módulo, vaya al área de configuración de módulos en <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, el sitio oficial de módulos complementarios y para Dolibarr ERP/CRM
@@ -399,6 +399,7 @@ SecurityToken=Clave para encriptar urls
 NoSmsEngine=No hay disponible ningún gestor de envío de SMS. Los gestores de envío de SMS no se instalan por defecto ya que dependen de cada proveedor, sin embargo puede encontrarlos en la plataforma %s
 PDF=PDF
 PDFDesc=Opciones globales para la generación de PDF.
+PDFOtherDesc=Opción PDF específica para algunos módulos
 PDFAddressForging=Reglas para las direcciones
 HideAnyVATInformationOnPDF=Ocultar toda la información relacionada con el Impuesto/IVA
 PDFRulesForSalesTax=Reglas de IVA
@@ -561,7 +562,7 @@ Module53Desc=Gestión de servicios
 Module54Name=Contratos/Suscripciones
 Module54Desc=Gestión de contratos (servicios o suscripciones recurrentes)
 Module55Name=Códigos de barras
-Module55Desc=Gestión de los códigos de barras
+Module55Desc=Barcode or QR code management
 Module56Name=Pago por transferencia bancaria
 Module56Desc=Gestión de pagos a proveedores mediante órdenes de transferencia bancaria. Incluye la generación de archivos SEPA para países europeos.
 Module57Name=Pagos por domiciliación bancaria
@@ -848,10 +849,10 @@ Permission402=Crear/modificar haberes
 Permission403=Validar haberes
 Permission404=Eliminar haberes
 Permission430=Usa barra de debug
-Permission511=Leer pagos de salarios (suyos y subordinados)
-Permission512=Crear/modificar pagos de salarios
-Permission514=Eliminar pagos de salarios
-Permission517=Leer pagos de salarios de todos
+Permission511=Read salaries and payments (yours and subordinates)
+Permission512=Create/modify salaries and payments
+Permission514=Delete salaries and payments
+Permission517=Read salaries and payments everybody
 Permission519=Exportar salarios
 Permission520=Consultar Créditos
 Permission522=Crear/modificar Créditos
@@ -965,6 +966,8 @@ Permission23003=Borrar Trabajo Programado
 Permission23004=Ejecutar Trabajo programado
 Permission50101=Usar punto de venta (TPV simple)
 Permission50151=Usar punto de venta (TakePOS)
+Permission50152=Editar líneas de venta
+Permission50153=Editar líneas de venta ordenadas
 Permission50201=Consultar las transacciones
 Permission50202=Importar las transacciones
 Permission50330=Consultar objetos de Zapier
@@ -1039,11 +1042,12 @@ DictionaryMeasuringUnits=Unidades de Medida
 DictionarySocialNetworks=Redes sociales
 DictionaryProspectStatus=Estado prospección para empresas
 DictionaryProspectContactStatus=Estado prospección para contactos
-DictionaryHolidayTypes=Tipos de vacaciones
+DictionaryHolidayTypes=Permisos - Tipos de permisos
 DictionaryOpportunityStatus=Estado de oportunidad para el proyecto/oportunidad
 DictionaryExpenseTaxCat=Informe de gastos - Categorías de transporte
 DictionaryExpenseTaxRange=Informe de gastos - Rango por categoría de transporte
 DictionaryTransportMode=Informe intracomm: modo de transporte
+DictionaryBatchStatus=Estado del control de calidad del lote/serie del producto
 TypeOfUnit=Tipo de unidad
 SetupSaved=Configuración guardada
 SetupNotSaved=Configuración no guardada
@@ -1187,7 +1191,7 @@ SetupDescription4=<a href="%s">%s -> %s</a> <br><br>Este software es una colecci
 SetupDescription5=Las otras entradas de configuración gestionan parámetros opcionales.
 AuditedSecurityEvents=Eventos de seguridad que se auditan
 NoSecurityEventsAreAduited=No se auditan eventos de seguridad. Puede habilitarlos desde el menú %s
-Audit=Auditoría
+Audit=Eventos de seguridad
 InfoDolibarr=Acerca de Dolibarr
 InfoBrowser=Acerca del Navegador
 InfoOS=Acerca del SO
@@ -1319,9 +1323,12 @@ ConditionIsCurrently=Actualmente la condición es %s
 YouUseBestDriver=Está usando el driver %s, actualmente es el mejor driver disponible.
 YouDoNotUseBestDriver=Usa el driver %s aunque se recomienda usar el driver %s.
 NbOfObjectIsLowerThanNoPb=Solo tiene %s %s en la base de datos. Esto no requiere ninguna optimización particular.
+ComboListOptim=Optimización de carga de lista combinada
 SearchOptim=Buscar optimización
-YouHaveXObjectUseSearchOptim=Tiene %s %s en la base de datos. Puede agregar la constante %s a 1 en Inicio-Configuración-Otros. Limite la búsqueda al comienzo de las cadenas, lo que hace posible que la base de datos use índices y debería obtener una respuesta inmediata.
-YouHaveXObjectAndSearchOptimOn=Tiene %s %s en su base de datos y la constante %s configurada como 1 en Inicio-Configuración-Varios
+YouHaveXObjectUseComboOptim=Tiene %s %s en la base de datos. Puede ir a la configuración del módulo para habilitar la carga de la lista combinada en el evento de tecla presionada.
+YouHaveXObjectUseSearchOptim=Tiene %s %s en la base de datos. Puede agregar la constante %s a 1 en Inicio-Configuración-Varios.
+YouHaveXObjectUseSearchOptimDesc=Esto limita la búsqueda al comienzo de las cadenas, lo que hace posible que la base de datos utilice índices y debería obtener una respuesta inmediata.
+YouHaveXObjectAndSearchOptimOn=Tiene %s %s en la base de datos y la constante %s se establece en %s en Inicio-Configuración-Otros.
 BrowserIsOK=Usa el navegador web %s. Este navegador está optimizado para la seguridad y el rendimiento.
 BrowserIsKO=Usa el navegador web %s.  Este navegador es una mala opción para la seguridad, rendimiento y fiabilidad. Aconsejamos utilizar Firefox, Chrome, Opera o Safari.
 PHPModuleLoaded=El componente PHP %s está cargado
@@ -1433,6 +1440,7 @@ MemberMainOptions=Opciones principales
 AdherentLoginRequired= Gestionar un login para cada miembro
 AdherentMailRequired=E-Mail obligatorio para crear un miembro nuevo
 MemberSendInformationByMailByDefault=Casilla de verificación para enviar el correo de confirmación (validación ó nueva cotización) a los miembros es por defecto "sí"
+MemberCreateAnExternalUserForSubscriptionValidated=Cree un inicio de sesión de usuario externo para cada nueva suscripción de miembro validada
 VisitorCanChooseItsPaymentMode=El visitante puede elegir entre los modos de pago disponibles
 MEMBER_REMINDER_EMAIL=Habilitar recordatorio de eventos <b>por e-mail</b> de suscripciones expiradas. Nota: El módulo <strong>%s</strong> debe estar habilitado y configurado correctamente para que el recordatorio se envíe.
 MembersDocModules=Plantillas de documentos para documentos generados a partir de registros de miembros
@@ -1763,7 +1771,7 @@ AGENDA_DEFAULT_VIEW=Establecer la vista por defecto al seleccionar el menú Agen
 AGENDA_REMINDER_BROWSER=Habilitar el recordatorio de eventos <b> en el navegador del usuario </b> (Cuando se alcanza la fecha de recordatorio, el navegador muestra una ventana emergente. Cada usuario puede deshabilitar dichas notificaciones desde la configuración de notificaciones del navegador).
 AGENDA_REMINDER_BROWSER_SOUND=Activar sonido de notificación
 AGENDA_REMINDER_EMAIL=Habilitar el recordatorio de eventos <b> por correo electrónico </b> (la opción de recordatorio/retraso se puede definir en cada evento).
-AGENDA_REMINDER_EMAIL_NOTE=Nota: La frecuencia de la tarea %s debe ser suficiente para asegurarse de que los recordatorios se envíen en el momento correcto.
+AGENDA_REMINDER_EMAIL_NOTE=Nota: La frecuencia del trabajo programado %s debe ser suficiente para asegurarse de que el recordatorio se envíe en el momento correcto.
 AGENDA_SHOW_LINKED_OBJECT=Mostrar el link en la agenda
 ##### Clicktodial #####
 ClickToDialSetup=Configuración del módulo Click To Dial
@@ -1979,6 +1987,8 @@ MAIN_PDF_MARGIN_RIGHT=Margen derecho en PDF
 MAIN_PDF_MARGIN_TOP=Margen superior en PDF
 MAIN_PDF_MARGIN_BOTTOM=Margen inferior en PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Altura del logo en PDF
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Agregar imagen en la línea de propuesta
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Agregar firma electrónica en PDF
 NothingToSetup=No hay ninguna configuración a realizar en este módulo.
 SetToYesIfGroupIsComputationOfOtherGroups=Establezca esto a sí si este grupo es un cálculo de otros grupos
 EnterCalculationRuleIfPreviousFieldIsYes=Ingrese la regla de cálculo si el campo anterior se estableció en Sí. <br> Por ejemplo: <br> CODEGRP1 + CODEGRP2
@@ -2096,7 +2106,6 @@ PDF_SHOW_PROJECT=Mostrar proyecto en documento
 ShowProjectLabel=Etiqueta del proyecto
 PDF_USE_ALSO_LANGUAGE_CODE=Si desea duplicar algunos textos en su PDF en 2 idiomas diferentes en el mismo PDF generado, debe establecer aquí este segundo idioma para que el PDF generado contenga 2 idiomas diferentes en la misma página, el elegido al generar el PDF y este ( solo unas pocas plantillas PDF lo admiten). Mantener vacío para 1 idioma por PDF.
 FafaIconSocialNetworksDesc=Ingrese aquí el código de un ícono FontAwesome. Si no sabe qué es FontAwesome, puede usar el valor genérico fa-address-book.
-FeatureNotAvailableWithReceptionModule=Función no disponible cuando el módulo Recepción está activado
 RssNote=Nota: Cada definición de fuente RSS proporciona un widget que debe habilitar para que esté disponible en el tablero
 JumpToBoxes=Vaya a Configuración -> Módulos
 MeasuringUnitTypeDesc=Utilice aquí un valor como "tamaño", "superficie", "volumen", "peso", "tiempo"
@@ -2120,12 +2129,18 @@ ConfFileIsReadableOrWritableByAnyUsers=Cualquier usuario puede leer o escribir e
 MailToSendEventOrganization=Organización de evento
 AGENDA_EVENT_DEFAULT_STATUS=Estado de evento predeterminado al crear un evento desde el formulario
 YouShouldDisablePHPFunctions=Deberías deshabilitar las funciones de PHP
-IfCLINotRequiredYouShouldDisablePHPFunctions=Excepto si necesita ejecutar comandos del sistema (para el módulo Trabajo programado o para ejecutar el antivirus de línea de comando externo, por ejemplo), debe deshabilitar las funciones de PHP
+IfCLINotRequiredYouShouldDisablePHPFunctions=Excepto si necesita ejecutar comandos del sistema en código personalizado, debe deshabilitar las funciones PHP
+PHPFunctionsRequiredForCLI=Para fines de shell (como una copia de seguridad programada de trabajos o ejecutar un programa anitivurs), debe mantener las funciones de PHP
 NoWritableFilesFoundIntoRootDir=No se encontraron archivos o directorios grabables de los programas comunes en su directorio raíz (Bueno)
 RecommendedValueIs=Recomendado: %s
+NotRecommended=No recomendado
 ARestrictedPath=Una ruta restringida
 CheckForModuleUpdate=Compruebe si hay actualizaciones de módulos externos
 CheckForModuleUpdateHelp=Esta acción se conectará a los editores de módulos externos para comprobar si hay una nueva versión disponible.
 ModuleUpdateAvailable=Hay una actualización disponible
 NoExternalModuleWithUpdate=No se encontraron actualizaciones para módulos externos
 SwaggerDescriptionFile=Archivo de descripción de la API de Swagger (para usar con redoc, por ejemplo)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=Habilitó la API WS obsoleta. En su lugar, debería utilizar la API REST.
+RandomlySelectedIfSeveral=Seleccionado aleatoriamente si hay varias imágenes disponibles
+DatabasePasswordObfuscated=La contraseña de la base de datos está oculta en el archivo conf
+DatabasePasswordNotObfuscated=La contraseña de la base de datos NO está oculta en el archivo conf
diff --git a/htdocs/langs/es_ES/agenda.lang b/htdocs/langs/es_ES/agenda.lang
index ecf81d8bad2..950e08e111e 100644
--- a/htdocs/langs/es_ES/agenda.lang
+++ b/htdocs/langs/es_ES/agenda.lang
@@ -4,7 +4,7 @@ Actions=Eventos
 Agenda=Agenda
 TMenuAgenda=Agenda
 Agendas=Agendas
-LocalAgenda=Calendario interno
+LocalAgenda=Calendario predeterminado
 ActionsOwnedBy=Acontecimiento asignado a
 ActionsOwnedByShort=Propietario
 AffectedTo=Asignada a
@@ -20,7 +20,7 @@ MenuToDoActions=Eventos incompletos
 MenuDoneActions=Eventos terminados
 MenuToDoMyActions=Mis eventos incompletos
 MenuDoneMyActions=Mis eventos terminados
-ListOfEvents=Lista de acontecimientos (calendario interno)
+ListOfEvents=Lista de eventos (calendario predeterminado)
 ActionsAskedBy=Eventos registrados por
 ActionsToDoBy=Eventos asignados a
 ActionsDoneBy=Eventos realizados por
@@ -38,6 +38,7 @@ ActionsEvents=Eventos para que Dolibarr cree un evento en la agenda de forma aut
 EventRemindersByEmailNotEnabled=Los recordatorios de eventos por e-mail no se activaron en la configuración del módulo %s.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Tercero %s creado
+COMPANY_MODIFYInDolibarr=Tercero %s modificado
 COMPANY_DELETEInDolibarr=Tercero %s eliminado
 ContractValidatedInDolibarr=Contrato %s validado
 CONTRACT_DELETEInDolibarr=Contrato %s eliminado
@@ -87,6 +88,7 @@ OrderDeleted=Pedido eliminado
 InvoiceDeleted=Factura eliminada
 DraftInvoiceDeleted=Borrador de factura eliminado
 CONTACT_CREATEInDolibarr=Contacto %s creado
+CONTACT_MODIFYInDolibarr=Contacto %s modificado
 CONTACT_DELETEInDolibarr=Contacto %s eliminado
 PRODUCT_CREATEInDolibarr=Producto %s creado
 PRODUCT_MODIFYInDolibarr=Producto %s modificado
@@ -119,6 +121,7 @@ MRP_MO_UNVALIDATEInDolibarr=OF establecida en estado de borrador
 MRP_MO_PRODUCEDInDolibarr=OF fabricada
 MRP_MO_DELETEInDolibarr=OF eliminada
 MRP_MO_CANCELInDolibarr=OF candelada
+PAIDInDolibarr=%s pagado
 ##### End agenda events #####
 AgendaModelModule=Plantillas de documentos para eventos
 DateActionStart=Fecha de inicio
@@ -130,7 +133,7 @@ AgendaUrlOptions4=<b>logint=%s</b>para restringir notificaciones en acciones asi
 AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> para restringir exportación de acciones asociadas al proyecto <b>__PROJECT_ID__</b>.
 AgendaUrlOptionsNotAutoEvent=<b>notactiontype = systemauto</b> para excluir el evento automático.
 AgendaUrlOptionsIncludeHolidays= <b> includeholidays = 1 </b> para incluir eventos de días libres.
-AgendaShowBirthdayEvents=Mostrar cumpleaños de los contactos
+AgendaShowBirthdayEvents=Cumpleaños de contactos
 AgendaHideBirthdayEvents=Ocultar cumpleaños de los contactos
 Busy=Ocupado
 ExportDataset_event1=Listado de eventos de la agenda
diff --git a/htdocs/langs/es_ES/bills.lang b/htdocs/langs/es_ES/bills.lang
index 3b5e6f584d0..a2b687a3b3a 100644
--- a/htdocs/langs/es_ES/bills.lang
+++ b/htdocs/langs/es_ES/bills.lang
@@ -259,6 +259,7 @@ DateMaxPayment=Fecha límite de pago
 DateInvoice=Fecha facturación
 DatePointOfTax=Impuestos
 NoInvoice=Ninguna factura
+NoOpenInvoice=Sin factura abierta
 ClassifyBill=Clasificar la factura
 SupplierBillsToPay=Facturas de proveedor pendientes de pago
 CustomerBillsUnpaid=Facturas a cliente pendientes de cobro
@@ -589,3 +590,4 @@ FacParentLine=Línea de factura principal
 SituationTotalRayToRest=Resto a pagar sin impuestos
 PDFSituationTitle=Situación n ° %d
 SituationTotalProgress=Progreso total %d %%
+SearchUnpaidInvoicesWithDueDate=Buscar facturas impagas con una fecha de vencimiento = %s
diff --git a/htdocs/langs/es_ES/cashdesk.lang b/htdocs/langs/es_ES/cashdesk.lang
index 4122e27b7a3..25e2599ee74 100644
--- a/htdocs/langs/es_ES/cashdesk.lang
+++ b/htdocs/langs/es_ES/cashdesk.lang
@@ -102,7 +102,7 @@ CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag es usado para añadir el número
 TakeposGroupSameProduct=Agrupar mismas líneas de producto
 StartAParallelSale=Nueva venta simultánea 
 SaleStartedAt=Oferta comenzada en %s
-ControlCashOpening=Controle la ventana emergente de efectivo al abrir POS
+ControlCashOpening=Abra la ventana emergente "Controlar efectivo" al abrir el POS
 CloseCashFence=Control de cierre de caja
 CashReport=Arqueo
 MainPrinterToUse=Impresora principal
@@ -126,5 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Debe activarse primero el módulo de impresora
 AllowDelayedPayment=Permitir pago aplazado
 PrintPaymentMethodOnReceipts=Imprimir método de pago en tickets|recibos
 WeighingScale=Balanza
-ShowPriceHT = Mostrar la columna de precio sin impuestos
-ShowPriceHTOnReceipt = Mostrar la columna de precio sin impuestos al recibirla
+ShowPriceHT = Mostrar la columna con el precio sin impuestos (en pantalla)
+ShowPriceHTOnReceipt = Mostrar la columna con el precio sin impuestos (al recibirlo)
diff --git a/htdocs/langs/es_ES/compta.lang b/htdocs/langs/es_ES/compta.lang
index eb1f7102c6c..94ac4a7b1c0 100644
--- a/htdocs/langs/es_ES/compta.lang
+++ b/htdocs/langs/es_ES/compta.lang
@@ -286,3 +286,9 @@ ReportPurchaseTurnover=Volumen de compras facturado
 ReportPurchaseTurnoverCollected=Volumen de compras pagadas
 IncludeVarpaysInResults = Incluir varios pagos en informes
 IncludeLoansInResults = Incluir préstamos en informes
+InvoiceLate30Days = Facturas atrasadas > 30 días
+InvoiceLate15Days = Facturas atrasadas > 15 días
+InvoiceLateMinus15Days = Facturas atrasadas
+InvoiceNotLate = A recoger < 15 días
+InvoiceNotLate15Days = A recoger en 15 días
+InvoiceNotLate30Days = Recoger en 30 días
diff --git a/htdocs/langs/es_ES/cron.lang b/htdocs/langs/es_ES/cron.lang
index bc2036a769d..06a2e94309b 100644
--- a/htdocs/langs/es_ES/cron.lang
+++ b/htdocs/langs/es_ES/cron.lang
@@ -60,7 +60,7 @@ CronErrEndDateStartDt=La fecha de finalizacion no puede ser anterior a la fecha
 StatusAtInstall=Estado en la instalación del módulo
 CronStatusActiveBtn=Calendario
 CronStatusInactiveBtn=Inactivo
-CronTaskInactive=Esta tarea esta inactiva
+CronTaskInactive=Este trabajo está inhabilitado (no programado)
 CronId=Id
 CronClassFile=Nombre de archivo con clase
 CronModuleHelp=Nombre del directorio del módulo Dolibarr (también funciona con módulos externos). <BR> Por ejemplo, para realizar un fetch del objeto Product /htdocs/<u>product</u>/class/product.class.php, el valor del módulo es <i>product</i>
diff --git a/htdocs/langs/es_ES/errors.lang b/htdocs/langs/es_ES/errors.lang
index 958e6a8096e..3528cd3411d 100644
--- a/htdocs/langs/es_ES/errors.lang
+++ b/htdocs/langs/es_ES/errors.lang
@@ -11,6 +11,7 @@ ErrorBadValueForParamNotAString=Valor incorrecto para su parámetro. Generalment
 ErrorRefAlreadyExists=La referencia <b>%s</b> ya existe.
 ErrorLoginAlreadyExists=El login %s ya existe.
 ErrorGroupAlreadyExists=El grupo %s ya existe.
+ErrorEmailAlreadyExists=Email %s already exists.
 ErrorRecordNotFound=Registro no encontrado
 ErrorFailToCopyFile=Error al copiar el archivo '<b>%s</b>' en '<b>%s</b>'.
 ErrorFailToCopyDir=Error al copiar el directorio  '<b>%s</b>' en '<b>%s</b>'.
@@ -117,7 +118,7 @@ ErrorCantReadFile=Error de lectura del archivo '%s'
 ErrorCantReadDir=Error de lectura del directorio '%s'
 ErrorBadLoginPassword=Identificadores de usuario o contraseña incorrectos
 ErrorLoginDisabled=Su cuenta está desactivada
-ErrorFailedToRunExternalCommand=Error de ejecución del comando externo. Compruebe que está disponible y ejecutable por su servidor PHP. Si el PHP <b>Safe Mode</b> está activo, compruebe que el comando se encuentra en un directorio definido en el parámetro <b>safe_mode_exec_dir</b>.
+ErrorFailedToRunExternalCommand=No se pudo ejecutar el comando externo. Compruebe que esté disponible y que el usuario de su servidor PHP pueda ejecutar. Compruebe también que el comando no está protegido a nivel de shell por una capa de seguridad como apparmor.
 ErrorFailedToChangePassword=Error en la modificación de la contraseña
 ErrorLoginDoesNotExists=La cuenta de usuario de <b>%s</b> no se ha encontrado.
 ErrorLoginHasNoEmail=Este usuario no tiene e-mail. Imposible continuar.
@@ -262,6 +263,7 @@ ErrorDateIsInFuture=Error, la fecha no puede ser futura
 ErrorAnAmountWithoutTaxIsRequired=Error, la cantidad es obligatoria
 ErrorAPercentIsRequired=Error, ingrese el porcentaje correctamente
 ErrorYouMustFirstSetupYourChartOfAccount=Primero debe configurar su plan de cuentas
+ErrorFailedToFindEmailTemplate=No se pudo encontrar la plantilla con el nombre de código %s
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=El parámetro PHP upload_max_filesize (%s) es más alto que el parámetro PHP post_max_size (%s). Esta no es una configuración consistente.
@@ -298,3 +300,4 @@ WarningModuleXDisabledSoYouMayMissEventHere=El módulo %s no se ha habilitado. A
 ErrorActionCommPropertyUserowneridNotDefined=Se requiere el propietario del usuario
 ErrorActionCommBadType=El tipo de evento seleccionado (id: %n, código: %s) no existe en el diccionario de tipo de evento
 CheckVersionFail=Error de verificación de versión
+ErrorWrongFileName=El nombre del archivo no puede contener __SOMETHING__
diff --git a/htdocs/langs/es_ES/eventorganization.lang b/htdocs/langs/es_ES/eventorganization.lang
index 2ceb85f4861..ead090b21f5 100644
--- a/htdocs/langs/es_ES/eventorganization.lang
+++ b/htdocs/langs/es_ES/eventorganization.lang
@@ -1,4 +1,5 @@
 # Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+# Copyright (C) 2021		Dorian Vabre			<dorian.vabre@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
@@ -81,7 +82,10 @@ PriceOfBoothHelp=Precio de suscripción para hacer stand
 EventOrganizationICSLink=Enlace ICS para eventos
 ConferenceOrBoothInformation=Información sobre conferencias o stands
 Attendees = Asistentes
+DownloadICSLink = Descargar enlace ICS
 EVENTORGANIZATION_SECUREKEY = Secure Key del enlace de registro público a una conferencia
+SERVICE_BOOTH_LOCATION = Servicio utilizado para la fila de facturas sobre la ubicación de un stand
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Servicio utilizado para la fila de la factura sobre la suscripción de un asistente a una conferencia
 #
 # Status
 #
@@ -94,8 +98,46 @@ EvntOrgCancelled = Cancelado
 #
 # Public page
 #
+SuggestForm = Página de sugerencias
+RegisterPage = Página para conferencias o stand
+EvntOrgRegistrationHelpMessage = Aquí, puede votar por un evento o sugerir una nueva conferencia o stand para el proyecto.
+EvntOrgRegistrationConfHelpMessage = Aquí, puede sugerir una nueva conferencia para el proyecto.
+EvntOrgRegistrationBoothHelpMessage = Aquí, puedes sugerir un nuevo stand para el proyecto.
+ListOfSuggestedConferences = Lista de conferencias sugeridas
+ListOfSuggestedBooths = Lista de cabinas sugeridas
+SuggestConference = Sugerir una nueva conferencia
+SuggestBooth = Sugerir un stand
+ViewAndVote = Ver y votar eventos sugeridos
 PublicAttendeeSubscriptionPage = Enlace público de inscripción a una conferencia
 MissingOrBadSecureKey = La clave de seguridad no es válida o falta
-EvntOrgWelcomeMessage = Este formulario le permite registrarse como nuevo participante en la conferencia.
-EvntOrgStartDuration = Esta conferencia comienza el
-EvntOrgEndDuration =  y termina en
+EvntOrgWelcomeMessage = Este formulario le permite registrarse como nuevo participante en la conferencia: '%s'
+EvntOrgDuration = Esta conferencia comienza el %s y termina el %s.
+ConferenceAttendeeFee = Cuota de asistente a la conferencia para el evento: '%s' que ocurre desde %s a %s.
+BoothLocationFee = Ubicación del stand para el evento: '%s' que ocurre desde %s a %s
+EventType = Tipo de evento
+
+#
+# Vote page
+#
+EvntOrgRegistrationWelcomeMessage = Bienvenido a la página de sugerencias de la conferencia o stand.
+EvntOrgRegistrationConfWelcomeMessage = Bienvenido a la página de sugerencias de la conferencia.
+EvntOrgRegistrationBoothWelcomeMessage = Bienvenido a la página de sugerencias del stand.
+EvntOrgVoteHelpMessage = Aquí puede ver y votar los eventos sugeridos para el proyecto.
+VoteOk = Tu voto ha sido aceptado.
+AlreadyVoted = Ya has votado por este evento.
+VoteError = Se produjo un error durante la votación, inténtelo de nuevo.
+
+#
+# SubscriptionOk page
+#
+SubscriptionOk = Su suscripción a esta conferencia ha sido validada
+#
+# Subscription validation mail
+#
+ConfAttendeeSubscriptionConfirmation = Confirmación de su suscripción a una conferencia
+#
+# Payment page
+#
+Attendee = Asistente
+PaymentConferenceAttendee = Pago de asistentes a la conferencia
+PaymentBoothLocation = Pago por ubicación de stand
diff --git a/htdocs/langs/es_ES/hrm.lang b/htdocs/langs/es_ES/hrm.lang
index 29509408597..89ce8eec09a 100644
--- a/htdocs/langs/es_ES/hrm.lang
+++ b/htdocs/langs/es_ES/hrm.lang
@@ -9,7 +9,7 @@ ConfirmDeleteEstablishment=¿Está seguro de querer eliminar este establecimient
 OpenEtablishment=Abrir establecimiento
 CloseEtablishment=Cerrar establecimiento
 # Dictionary
-DictionaryPublicHolidays=RRHH: días festivos
+DictionaryPublicHolidays=Permisos - Días festivos
 DictionaryDepartment=R.R.H.H. Listado departamentos
 DictionaryFunction=R.R.H.H. - Puestos de trabajo
 # Module
diff --git a/htdocs/langs/es_ES/knowledgemanagement.lang b/htdocs/langs/es_ES/knowledgemanagement.lang
index 4bf312a715f..3c760eaac50 100644
--- a/htdocs/langs/es_ES/knowledgemanagement.lang
+++ b/htdocs/langs/es_ES/knowledgemanagement.lang
@@ -47,7 +47,7 @@ KnowledgeManagementArea = Gestión del Conocimiento
 # Menu
 #
 MenuKnowledgeRecord = Base de Conocimientos
-ListOfArticles = Lista de articulos
+ListKnowledgeRecord = Lista de articulos
 NewKnowledgeRecord = Articulo nuevo
 ValidateReply = Validar solución
 KnowledgeRecords = Artículos
diff --git a/htdocs/langs/es_ES/languages.lang b/htdocs/langs/es_ES/languages.lang
index 2bfc571a284..1a3480bec23 100644
--- a/htdocs/langs/es_ES/languages.lang
+++ b/htdocs/langs/es_ES/languages.lang
@@ -3,6 +3,7 @@ Language_am_ET=Etíope
 Language_ar_AR=Árabe
 Language_ar_EG=Árabe (Egipto)
 Language_ar_SA=Árabe
+Language_ar_TN=Árabe (Túnez)
 Language_az_AZ=Azerbaiyano
 Language_bn_BD=Bengalí
 Language_bn_IN=Bengalí (India)
@@ -84,6 +85,7 @@ Language_nl_NL=Holandés
 Language_pl_PL=Polaco
 Language_pt_BR=Portugués (Brasil)
 Language_pt_PT=Portugués
+Language_ro_MD=Rumano (Moldavia)
 Language_ro_RO=Rumano
 Language_ru_RU=Ruso
 Language_ru_UA=Ruso (Ucrania)
diff --git a/htdocs/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang
index 722bdcd9d63..151b6de8f7d 100644
--- a/htdocs/langs/es_ES/main.lang
+++ b/htdocs/langs/es_ES/main.lang
@@ -430,6 +430,7 @@ LT1IN=CGST
 LT2IN=SGST
 LT1GC=Céntimos adicionales
 VATRate=Tasa IVA
+RateOfTaxN=Tasa de impuesto %s
 VATCode=Código tasa IVA
 VATNPR=Tasa NPR
 DefaultTaxRate=Tasa de impuesto por defecto
@@ -729,6 +730,7 @@ MenuMembers=Miembros
 MenuAgendaGoogle=Agenda Google
 MenuTaxesAndSpecialExpenses=Impuestos | Gastos especiales
 ThisLimitIsDefinedInSetup=Límite Dolibarr (Menú inicio-configuración-seguridad): %s Kb, PHP limit: %s Kb
+ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
 NoFileFound=No se cargaron documentos
 CurrentUserLanguage=Idioma actual
 CurrentTheme=Tema actual
@@ -1072,6 +1074,7 @@ ValidFrom=Válido desde
 ValidUntil=Válido hasta
 NoRecordedUsers=Sin usuarios
 ToClose=A cerrar
+ToRefuse=A rechazar
 ToProcess=A procesar
 ToApprove=A aprobar
 GlobalOpenedElemView=Vista global
@@ -1126,9 +1129,11 @@ UpdateForAllLines=Actualización para todas las líneas
 OnHold=En espera
 Civility=Civilidad
 AffectTag=Afectar etiqueta
+CreateExternalUser=Crear usuario externo
 ConfirmAffectTag=Afectar etiquetas masivas
 ConfirmAffectTagQuestion=¿Está seguro de que desea asignar las etiquetas a los %s registros seleccionados?
 CategTypeNotFound=No se encontró ningún tipo de etiqueta para el tipo de registros
 CopiedToClipboard=Copiado al portapapeles
 InformationOnLinkToContract=Esta cantidad es solo el total de todas las líneas del contrato. No se toma en consideración ninguna noción de tiempo.
 ConfirmCancel=Estas seguro que quieres cancelar
+EmailMsgID=Email MsgID
diff --git a/htdocs/langs/es_ES/members.lang b/htdocs/langs/es_ES/members.lang
index 5305d1bf4a8..0396b33f686 100644
--- a/htdocs/langs/es_ES/members.lang
+++ b/htdocs/langs/es_ES/members.lang
@@ -213,3 +213,5 @@ SendReminderForExpiredSubscription=Enviar recordatorio por e-mail a los miembros
 MembershipPaid=Membresía pagada por el período actual (hasta %s)
 YouMayFindYourInvoiceInThisEmail=Puede encontrar su factura adjunta a este e-mai
 XMembersClosed=%s miembro(s) cerrado(s)
+XExternalUserCreated=%s usuarios externos creados
+ForceMemberNature=Naturaleza del miembro de la fuerza (individual o corporativo)
diff --git a/htdocs/langs/es_ES/modulebuilder.lang b/htdocs/langs/es_ES/modulebuilder.lang
index 8d69573e1fb..37f1a8e77ad 100644
--- a/htdocs/langs/es_ES/modulebuilder.lang
+++ b/htdocs/langs/es_ES/modulebuilder.lang
@@ -143,3 +143,4 @@ AsciiToHtmlConverter=Conversor de ASCII a HTML
 AsciiToPdfConverter=Conversor de ASCII a PDF
 TableNotEmptyDropCanceled=La tabla no está vacía. La eliminación ha sido cancelada.
 ModuleBuilderNotAllowed=El constructor de módulos está disponible pero no permitido para su usuario.
+ImportExportProfiles=Importar y exportar perfiles
diff --git a/htdocs/langs/es_ES/mrp.lang b/htdocs/langs/es_ES/mrp.lang
index d0eb0a49644..e06cfa47a9d 100644
--- a/htdocs/langs/es_ES/mrp.lang
+++ b/htdocs/langs/es_ES/mrp.lang
@@ -8,12 +8,12 @@ MenuBOM=Lista de material
 LatestBOMModified=Últimas %s listas de materiales modificadas
 LatestMOModified=Últimas %s Órdenes de Producción modificadas 
 Bom=Lista de materiales
-BillOfMaterials=Lista de material
+BillOfMaterials=Lista de materiales
 BOMsSetup=Configuración del módulo BOM
 ListOfBOMs=Lista de facturas de materiales - BOM
 ListOfManufacturingOrders=Listado de Órdenes de Fabricación
 NewBOM=Nueva lista de materiales
-ProductBOMHelp=Producto a crear con estos materiales.<br>Nota: Los productos con la 'Naturaleza del producto' = 'Materia prima' no son visibles en este listado.
+ProductBOMHelp=Producto para crear (o desmontar) con esta lista de materiales. <br> Nota: Los productos con la propiedad 'Naturaleza del producto' = 'Materia prima' no están visibles en esta lista.
 BOMsNumberingModules=Modelos de numeración BOM
 BOMsModelModule=Plantillas de documentos Lista de materiales
 MOsNumberingModules=Modelos de numeración OF
@@ -22,7 +22,7 @@ FreeLegalTextOnBOMs=Texto libre en el documento BOM
 WatermarkOnDraftBOMs=Marca de agua en el proyecto BOM
 FreeLegalTextOnMOs=Texto libre en el documento OF
 WatermarkOnDraftMOs=Marca de agua en el documento OF
-ConfirmCloneBillOfMaterials=¿Está seguro de querer clonar la lista de materiales %s?
+ConfirmCloneBillOfMaterials=¿Está seguro de que desea clonar la lista de materiales %s?
 ConfirmCloneMo=¿Esta seguro de querer clonar la Orden de Fabricación %s?
 ManufacturingEfficiency=Eficiencia de fabricación
 ConsumptionEfficiency=Eficiencia de consumo
@@ -30,8 +30,8 @@ ValueOfMeansLoss=El valor de 0.95 significa un promedio de 5%% de pérdida duran
 ValueOfMeansLossForProductProduced=El valor de 0.95 significa un promedio de 5%% de pérdida del producto producido
 DeleteBillOfMaterials=Eliminar Lista de material
 DeleteMo=Eliminar Orden de Fabricación
-ConfirmDeleteBillOfMaterials=¿Está seguro de querer eliminar esta lista de materiales?
-ConfirmDeleteMo=¿Está seguro de querer eliminar esta lista de materiales?
+ConfirmDeleteBillOfMaterials=¿Está seguro de que desea eliminar esta lista de materiales?
+ConfirmDeleteMo=¿Está seguro de que desea eliminar esta lista de materiales?
 MenuMRP=Órdenes de fabricación
 NewMO=Nueva orden de fabricación
 QtyToProduce=Cant. a fabricar
@@ -39,7 +39,7 @@ DateStartPlannedMo=Fecha de inicio planeada
 DateEndPlannedMo=Fecha de finalización planeada
 KeepEmptyForAsap=Vacío significa 'Tan pronto como sea posible'
 EstimatedDuration=Duración estimada
-EstimatedDurationDesc=Duración estimada para fabricar este producto utilizando esta lista de materiales
+EstimatedDurationDesc=Duración estimada para fabricar (o desmontar) este producto utilizando esta lista de materiales
 ConfirmValidateBom=¿Está seguro de querer validar la lista de materiales con la referencia <strong>%s</strong> (podrá usarla para crear nuevas Órdenes de Fabricación)
 ConfirmCloseBom=¿Está seguro de querer cancelar esta lista de materiales (ya no podrá usarla para crear nuevas Órdenes de Fabricación)?
 ConfirmReopenBom=¿Está seguro de querer volver a abrir esta lista de materiales (podrá usarla para crear nuevas Órdenes de Fabricación)
@@ -63,13 +63,14 @@ ConsumeAndProduceAll=Consumir y producir todo
 Manufactured=Fabricado
 TheProductXIsAlreadyTheProductToProduce=El producto a agregar ya es el producto a producir.
 ForAQuantityOf=Para una cantidad a producir de %s
+ForAQuantityToConsumeOf=Por una cantidad para desmontar de %s
 ConfirmValidateMo=¿Está seguro de querer validar esta orden de fabricación?
 ConfirmProductionDesc=Al hacer clic en '%s', validará el consumo y/o la producción de las cantidades establecidas. También se actualizará el stock y registrará los movimientos de stock.
 ProductionForRef=Producción de %s
 AutoCloseMO=Cierre automáticamente la orden de fabricación si se alcanzan las cantidades para consumir y producir
 NoStockChangeOnServices=Sin cambio de stock en servicios
 ProductQtyToConsumeByMO=Cantidad de producto aún por consumir por MO abierto
-ProductQtyToProduceByMO=Cantidad de producto todavía para producir por MO abierto
+ProductQtyToProduceByMO=Cantidad de producto aún por producir por MO abierto
 AddNewConsumeLines=Agregar nueva línea para consumir
 ProductsToConsume=Productos para consumir
 ProductsToProduce=Productos para producir
@@ -83,15 +84,13 @@ Workstations=Estaciones de trabajo
 WorkstationsDescription=Gestión de estaciones de trabajo
 WorkstationSetup = Configuración de estaciones de trabajo
 WorkstationSetupPage = Página de configuración de estaciones de trabajo
-WorkstationAbout = Acerca de la estación de trabajo
-WorkstationAboutPage = Estaciones de trabajo sobre la página
 WorkstationList=Lista de estaciones de trabajo
 WorkstationCreate=Agregar nueva estación de trabajo
 ConfirmEnableWorkstation=¿Está seguro de que desea habilitar la estación de trabajo <b> %s </b>?
 EnableAWorkstation=Habilitar una estación de trabajo
 ConfirmDisableWorkstation=¿Está seguro de que desea desactivar la estación de trabajo <b> %s </b>?
 DisableAWorkstation=Deshabilitar una estación de trabajo
-DeleteWorkstation=SuprimIr
+DeleteWorkstation=Eliminar
 NbOperatorsRequired=Número de operadores necesarios
 THMOperatorEstimated=THM estimado del operador
 THMMachineEstimated=THM estimado de la máquina
diff --git a/htdocs/langs/es_ES/orders.lang b/htdocs/langs/es_ES/orders.lang
index 4b7a1bf7461..8e1fc613e81 100644
--- a/htdocs/langs/es_ES/orders.lang
+++ b/htdocs/langs/es_ES/orders.lang
@@ -11,6 +11,7 @@ OrderDate=Fecha pedido
 OrderDateShort=Fecha de pedido
 OrderToProcess=Pedido a procesar
 NewOrder=Nuevo pedido
+NewSupplierOrderShort=Nuevo pedido
 NewOrderSupplier=Nuevo pedido a proveedor
 ToOrder=Realizar pedido
 MakeOrder=Realizar pedido
@@ -73,6 +74,7 @@ DeleteOrder=Eliminar el pedido
 CancelOrder=Anular el pedido
 OrderReopened= Pedido %s reabierto
 AddOrder=Crear pedido
+AddSupplierOrderShort=Crear pedido
 AddPurchaseOrder=Crear pedido a proveedor
 AddToDraftOrders=Añadir a pedido borrador
 ShowOrder=Mostrar pedido
diff --git a/htdocs/langs/es_ES/other.lang b/htdocs/langs/es_ES/other.lang
index e3c446ad3a9..21dd0d68338 100644
--- a/htdocs/langs/es_ES/other.lang
+++ b/htdocs/langs/es_ES/other.lang
@@ -129,6 +129,7 @@ ClosedByLogin=Login usuario que ha cerrado
 FileWasRemoved=El archivo %s ha sido eliminado
 DirWasRemoved=El directorio %s ha sido eliminado
 FeatureNotYetAvailable=Funcionalidad aún no disponible en esta versión
+FeatureNotAvailableOnDevicesWithoutMouse=Característica no disponible en dispositivos sin mouse
 FeaturesSupported=Funcionalidades disponibles
 Width=Largo
 Height=Alto
@@ -263,7 +264,7 @@ ContactCreatedByEmailCollector=Contacto/dirección creada por el recolector de e
 ProjectCreatedByEmailCollector=Proyecto creado por el recolector de e-mails del MSGID de e-mail %s
 TicketCreatedByEmailCollector=Ticket creado por el recolector de e-mails del MSGID de e-mail %s
 OpeningHoursFormatDesc=Use un - para separar las horas de apertura y cierre. <br> Use un espacio para ingresar diferentes rangos. <br> Ejemplo: 8-12 14-18
-PrefixSession=Prefijo para ID de sesión
+SuffixSessionName=Sufijo para el nombre de la sesión
 
 ##### Export #####
 ExportsArea=Área de exportaciones
diff --git a/htdocs/langs/es_ES/partnership.lang b/htdocs/langs/es_ES/partnership.lang
index 7237b5b330c..3f28d340235 100644
--- a/htdocs/langs/es_ES/partnership.lang
+++ b/htdocs/langs/es_ES/partnership.lang
@@ -16,41 +16,72 @@
 #
 # Generic
 #
-ModulePartnershipName = Gestión Asociaciones
-PartnershipDescription = Gestión Módulo Asociaciones
+ModulePartnershipName=Gestión Asociaciones
+PartnershipDescription=Gestión Módulo Asociaciones
 PartnershipDescriptionLong= Gestión Módulo Asociaciones
 
+AddPartnership=Agregar asociación
+CancelPartnershipForExpiredMembers=Asociación: cancelar la asociación de miembros con suscripciones caducadas
+PartnershipCheckBacklink=Asociación: compruebe el vínculo de retroceso de referencia
+
 #
 # Menu
 #
-NewPartnership = Nueva Asociación
-ListOfPartnerships = Listado de Asociaciones
+NewPartnership=Nueva Asociación
+ListOfPartnerships=Listado de Asociaciones
 
 #
 # Admin page
 #
-PartnershipSetup = Configuración Asociaciones
-PartnershipAbout = About Partnership
-PartnershipAboutPage = Acerca de la página de Asociaciones
-
+PartnershipSetup=Configuración Asociaciones
+PartnershipAbout=About Partnership
+PartnershipAboutPage=Acerca de la página de Asociaciones
+partnershipforthirdpartyormember=El estado de socio debe establecerse en un 'tercero' o un 'miembro'
+PARTNERSHIP_IS_MANAGED_FOR=Asociación gestionada para
+PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks para comprobar
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Número de días antes de cancelar el estado de una asociación cuando una suscripción ha expirado
+ReferingWebsiteCheck=Comprobación de la referencia al sitio
+ReferingWebsiteCheckDesc=Puede habilitar una función para verificar que sus socios hayan agregado un vínculo de retroceso a los dominios de su sitio web en su propio sitio web.
 
 #
 # Object
 #
+DeletePartnership=Eliminar una asociación
+PartnershipDedicatedToThisThirdParty=Asociación dedicada a este tercero
+PartnershipDedicatedToThisMember=Asociación dedicada a este miembro
 DatePartnershipStart=Fecha de inicio
 DatePartnershipEnd=Fecha de fin
+ReasonDecline=Razón de rechazo
+ReasonDeclineOrCancel=Razón de rechazo
+PartnershipAlreadyExist=La asociación ya existe
+ManagePartnership=Gestionar la asociación
+BacklinkNotFoundOnPartnerWebsite=Vínculo de retroceso no encontrado en el sitio web del socio
+ConfirmClosePartnershipAsk=¿Está seguro de que desea cancelar esta asociación?
+PartnershipType=Tipo de asociación
 
 #
 # Template Mail
 #
+SendingEmailOnPartnershipWillSoonBeCanceled=La asociación pronto se cancelará
+SendingEmailOnPartnershipRefused=Asociación rechazada
+SendingEmailOnPartnershipAccepted=Asociación aceptada
+SendingEmailOnPartnershipCanceled=Asociación cancelada
 
+YourPartnershipWillSoonBeCanceledTopic=La asociación pronto se cancelará
+YourPartnershipRefusedTopic=Asociación rechazada
+YourPartnershipAcceptedTopic=Asociación aceptada
+YourPartnershipCanceledTopic=Asociación cancelada
+
+YourPartnershipWillSoonBeCanceledContent=Le informamos que su asociación se cancelará pronto (no se encontró el vínculo de retroceso)
+YourPartnershipRefusedContent=Le informamos que su solicitud de asociación ha sido rechazada.
+YourPartnershipAcceptedContent=Le informamos que su solicitud de asociación ha sido aceptada.
+YourPartnershipCanceledContent=Le informamos que su asociación ha sido cancelada.
 
 #
 # Status
 #
-PartnershipDraft = Borrador
-PartnershipAccepted = Aceptado
-PartnershipRefused = Rechazado
-PartnershipCanceled = Anulado
-
+PartnershipDraft=Borrador
+PartnershipAccepted=Aceptado
+PartnershipRefused=Rechazado
+PartnershipCanceled=Anulado
 PartnershipManagedFor=Los Partners son
diff --git a/htdocs/langs/es_ES/productbatch.lang b/htdocs/langs/es_ES/productbatch.lang
index d1cad5faddf..0e2eb06ece1 100644
--- a/htdocs/langs/es_ES/productbatch.lang
+++ b/htdocs/langs/es_ES/productbatch.lang
@@ -1,4 +1,4 @@
-# ProductBATCH language file - en_US - ProductBATCH
+# ProductBATCH language file - Source file is en_US - ProductBATCH
 ManageLotSerial=Usar numeración por lotes/series
 ProductStatusOnBatch=Si (lote requerido)
 ProductStatusOnSerial=Sí (se requiere un número de serie único)
@@ -33,3 +33,13 @@ CustomMasks=Agrega una opción para definir la máscara en la ficha del producto
 LotProductTooltip=Agrega una opción en la tarjeta del producto para definir una máscara de número de lote dedicada
 SNProductTooltip=Agrega una opción en la tarjeta del producto para definir una máscara de número de serie dedicada
 QtyToAddAfterBarcodeScan=Cantidad a agregar para cada código de barras / lote / serie escaneado
+LifeTime=Vida útil (en días)
+EndOfLife=Fin de vida
+ManufacturingDate=Fecha de fabricación
+DestructionDate=Fecha de destrucción
+FirstUseDate=Fecha de primer uso
+QCFrequency=Frecuencia de control de calidad (en días)
+
+#Traceability - qc status
+OutOfOrder=Fuera de servicio
+InWorkingOrder=En orden de trabajo
diff --git a/htdocs/langs/es_ES/products.lang b/htdocs/langs/es_ES/products.lang
index a0007951270..521840692ad 100644
--- a/htdocs/langs/es_ES/products.lang
+++ b/htdocs/langs/es_ES/products.lang
@@ -396,3 +396,5 @@ ActionAvailableOnVariantProductOnly=Acción solo disponible en la variante del p
 ProductsPricePerCustomer=Precios de producto por cliente
 ProductSupplierExtraFields=Campos adicionales (precios de proveedor)
 DeleteLinkedProduct=Eliminar el producto hijo vinculado a la combinación
+PMPValue=Valor (PMP)
+PMPValueShort=PMP
diff --git a/htdocs/langs/es_ES/projects.lang b/htdocs/langs/es_ES/projects.lang
index 7674ee768d2..6beabd61c1c 100644
--- a/htdocs/langs/es_ES/projects.lang
+++ b/htdocs/langs/es_ES/projects.lang
@@ -267,9 +267,11 @@ InvoiceToUse=Borrador de factura para usar
 NewInvoice=Nueva factura
 OneLinePerTask=Una línea por tarea
 OneLinePerPeriod=Una línea por período
+OneLinePerTimeSpentLine=Una línea por cada declaración de tiempo invertido
 RefTaskParent=Ref. Tarea principal
 ProfitIsCalculatedWith=El beneficio se calcula usando
 AddPersonToTask=Agregar también a las tareas
 UsageOrganizeEvent=Uso: Organización de eventos
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Clasifique el proyecto como cerrado cuando se completen todas sus tareas (progreso 100%%)
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Nota: los proyectos existentes con todas las tareas en 100%% no se verán afectados: tendrás que cerrarlos manualmente. Esta opción solo afecta a proyectos abiertos.
+SelectLinesOfTimeSpentToInvoice=Seleccione las líneas de tiempo invertido que no se hayan facturado y, a continuación, realice la acción masiva "Generar factura" para facturarlas.
diff --git a/htdocs/langs/es_ES/receptions.lang b/htdocs/langs/es_ES/receptions.lang
index 72efe825bb6..145b1a10be5 100644
--- a/htdocs/langs/es_ES/receptions.lang
+++ b/htdocs/langs/es_ES/receptions.lang
@@ -44,4 +44,4 @@ ValidateOrderFirstBeforeReception=Antes de poder realizar recepciones debe valid
 ReceptionsNumberingModules=Módulo de numeración para recepciones
 ReceptionsReceiptModel=Modelos de documentos para recepciones.
 NoMorePredefinedProductToDispatch=No hay más productos predefinidos para enviar
-
+ReceptionExist=Existe una recepción
diff --git a/htdocs/langs/es_ES/stocks.lang b/htdocs/langs/es_ES/stocks.lang
index 9a7b3c823da..51c70a2409b 100644
--- a/htdocs/langs/es_ES/stocks.lang
+++ b/htdocs/langs/es_ES/stocks.lang
@@ -56,8 +56,6 @@ UnitPurchaseValue=Precio de compra unitario
 StockTooLow=Stock insuficiente
 StockLowerThanLimit=El stock es menor que el límite de la alerta (%s)
 EnhancedValue=Valor
-PMPValue=Valor (PMP)
-PMPValueShort=PMP
 EnhancedValueOfWarehouses=Valor de stocks
 UserWarehouseAutoCreate=Crear automáticamente existencias/almacén propio del usuario en la creación del usuario
 AllowAddLimitStockByWarehouse=Administrar también el valor del stock mínimo y deseado de la cupla (producto-almacén) además del valor del stock mínimo y deseado por producto
@@ -251,7 +249,10 @@ SelectAStockMovementFileToImport=seleccione un archivo de movimiento de stock pa
 InfoTemplateImport=El archivo cargado debe tener este formato (* son campos obligatorios): <br> Almacén de origen * | Almacén de destino * | Producto * | Cantidad * | Lote / número de serie <br> El separador de caracteres CSV debe ser "<b> %s </b>"
 LabelOfInventoryMovemement=Inventario %s
 ReOpen=Reabrir
-ConfirmFinish=¿Confirmas el cierre del inventario? Esto generará todos los movimientos de stock para actualizar su stock.
+ConfirmFinish=¿Confirmas el cierre del inventario? Esto generará todos los movimientos de stock para actualizar su stock a la cantidad real que ingresó en el inventario.
 ObjectNotFound=%s no encontrado
 MakeMovementsAndClose=Generar movimientos y cerrar
 AutofillWithExpected=Llene la cantidad real con la cantidad esperada
+ShowAllBatchByDefault=De forma predeterminada, muestra los detalles del lote en la pestaña "stock" del producto
+CollapseBatchDetailHelp=Puede establecer la visualización predeterminada de los detalles del lote en la configuración del módulo de existencias
+FieldCannotBeNegative=El campo "%s" no puede ser negativo
diff --git a/htdocs/langs/es_ES/ticket.lang b/htdocs/langs/es_ES/ticket.lang
index 2fb5cd1f69d..c022e7d79a9 100644
--- a/htdocs/langs/es_ES/ticket.lang
+++ b/htdocs/langs/es_ES/ticket.lang
@@ -304,7 +304,7 @@ BoxLastModifiedTicket=Últimos tickets modificados
 BoxLastModifiedTicketDescription=Últimos %s tickets modificados
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No hay tickets modificados recientemente
-BoxTicketType=Número de tickets abiertos por tipo
+BoxTicketType=Distribución de tickets abiertos por tipo
 BoxTicketSeverity=Número de tickets abiertos por gravedad
 BoxNoTicketSeverity=No hay tickets abiertos
 BoxTicketLastXDays=Número de tickets nuevos por días los últimos %s días
diff --git a/htdocs/langs/es_GT/accountancy.lang b/htdocs/langs/es_GT/accountancy.lang
index 4dbdd035d6e..ef9e69e554a 100644
--- a/htdocs/langs/es_GT/accountancy.lang
+++ b/htdocs/langs/es_GT/accountancy.lang
@@ -1,2 +1,2 @@
 # Dolibarr language file - Source file is en_US - accountancy
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
diff --git a/htdocs/langs/es_GT/cron.lang b/htdocs/langs/es_GT/cron.lang
deleted file mode 100644
index 67ecfc77567..00000000000
--- a/htdocs/langs/es_GT/cron.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - cron
-CronTaskInactive=This job is disabled
diff --git a/htdocs/langs/es_GT/exports.lang b/htdocs/langs/es_GT/exports.lang
new file mode 100644
index 00000000000..17dedd46696
--- /dev/null
+++ b/htdocs/langs/es_GT/exports.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - exports
+DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
diff --git a/htdocs/langs/es_GT/mrp.lang b/htdocs/langs/es_GT/mrp.lang
deleted file mode 100644
index a8ff138755b..00000000000
--- a/htdocs/langs/es_GT/mrp.lang
+++ /dev/null
@@ -1,6 +0,0 @@
-# Dolibarr language file - Source file is en_US - mrp
-BillOfMaterials=Bill of Material
-NewBOM=New bill of material
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
diff --git a/htdocs/langs/es_GT/products.lang b/htdocs/langs/es_GT/products.lang
new file mode 100644
index 00000000000..e0628dbec00
--- /dev/null
+++ b/htdocs/langs/es_GT/products.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - products
+ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
diff --git a/htdocs/langs/es_GT/stocks.lang b/htdocs/langs/es_GT/stocks.lang
new file mode 100644
index 00000000000..1cae5cf3f11
--- /dev/null
+++ b/htdocs/langs/es_GT/stocks.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - stocks
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+OpenInternal=Open only for internal actions
diff --git a/htdocs/langs/es_GT/ticket.lang b/htdocs/langs/es_GT/ticket.lang
new file mode 100644
index 00000000000..82e110b1ca4
--- /dev/null
+++ b/htdocs/langs/es_GT/ticket.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - ticket
+TicketTypeShortISSUE=Issue, bug or problem
+OriginEmail=Email source
+NeedMoreInformation=Waiting for information
+TicketCategory=Group
diff --git a/htdocs/langs/es_HN/accountancy.lang b/htdocs/langs/es_HN/accountancy.lang
index 4dbdd035d6e..ef9e69e554a 100644
--- a/htdocs/langs/es_HN/accountancy.lang
+++ b/htdocs/langs/es_HN/accountancy.lang
@@ -1,2 +1,2 @@
 # Dolibarr language file - Source file is en_US - accountancy
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
diff --git a/htdocs/langs/es_HN/cron.lang b/htdocs/langs/es_HN/cron.lang
deleted file mode 100644
index 67ecfc77567..00000000000
--- a/htdocs/langs/es_HN/cron.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - cron
-CronTaskInactive=This job is disabled
diff --git a/htdocs/langs/es_HN/exports.lang b/htdocs/langs/es_HN/exports.lang
new file mode 100644
index 00000000000..17dedd46696
--- /dev/null
+++ b/htdocs/langs/es_HN/exports.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - exports
+DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
diff --git a/htdocs/langs/es_HN/mrp.lang b/htdocs/langs/es_HN/mrp.lang
deleted file mode 100644
index a8ff138755b..00000000000
--- a/htdocs/langs/es_HN/mrp.lang
+++ /dev/null
@@ -1,6 +0,0 @@
-# Dolibarr language file - Source file is en_US - mrp
-BillOfMaterials=Bill of Material
-NewBOM=New bill of material
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
diff --git a/htdocs/langs/es_HN/products.lang b/htdocs/langs/es_HN/products.lang
new file mode 100644
index 00000000000..e0628dbec00
--- /dev/null
+++ b/htdocs/langs/es_HN/products.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - products
+ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
diff --git a/htdocs/langs/es_HN/stocks.lang b/htdocs/langs/es_HN/stocks.lang
new file mode 100644
index 00000000000..1cae5cf3f11
--- /dev/null
+++ b/htdocs/langs/es_HN/stocks.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - stocks
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+OpenInternal=Open only for internal actions
diff --git a/htdocs/langs/es_HN/ticket.lang b/htdocs/langs/es_HN/ticket.lang
new file mode 100644
index 00000000000..82e110b1ca4
--- /dev/null
+++ b/htdocs/langs/es_HN/ticket.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - ticket
+TicketTypeShortISSUE=Issue, bug or problem
+OriginEmail=Email source
+NeedMoreInformation=Waiting for information
+TicketCategory=Group
diff --git a/htdocs/langs/es_MX/accountancy.lang b/htdocs/langs/es_MX/accountancy.lang
index ecc278b53f1..62c734d464e 100644
--- a/htdocs/langs/es_MX/accountancy.lang
+++ b/htdocs/langs/es_MX/accountancy.lang
@@ -17,6 +17,7 @@ GroupIsEmptyCheckSetup=El grupo está vacío, verifique la configuración del gr
 DetailByAccount=Mostrar detalles por cuenta
 AccountWithNonZeroValues=Cuentas con valores distintos de cero
 CountriesInEEC=Países de la Comunidad Europea
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 MainAccountForCustomersNotDefined=Cuenta contable principal para clientes no definidos en la configuración
 MainAccountForSuppliersNotDefined=Cuenta contable principal para proveedores no definidos en la configuración
 MainAccountForUsersNotDefined=Cuenta contable principal para usuarios no definidos en la configuración
@@ -82,7 +83,6 @@ XLineFailedToBeBinded=%s productos / servicios no estaban vinculados a ninguna c
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Comience la ordenación de la página "Enlazar para hacer" por los elementos más recientes
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Comience la ordenación de la página "Enlace realizado" por los elementos más recientes
 BANK_DISABLE_DIRECT_INPUT=Deshabilitar el registro directo de la transacción en la cuenta bancaria
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Diario de varios
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Diario de reporte de gastos
 ACCOUNTING_SOCIAL_JOURNAL=Diario Social
@@ -111,10 +111,13 @@ NewAccountingMvt=Nueva transacción
 NumMvts=Número de transacción
 ListeMvts=Lista de movimientos
 ErrorDebitCredit=Débito y Crédito no pueden tener un valor al mismo tiempo
+OpeningBalance=Saldo de apertura
+Reconcilable=Conciliable
 TotalVente=Facturación total antes de impuestos
 TotalMarge=Margen de ventas total
 DescVentilExpenseReport=Consulte aquí la lista de líneas de reporte de gastos vinculadas (o no) a una cuenta de contabilidad de comisiones
 ErrorAccountancyCodeIsAlreadyUse=Error, no es posible eliminar ésta cuenta contable porque está siendo usada
+ShowTutorial=Mostrar Tutorial
 AccountingJournal=Diario de contabilidad
 AccountingJournalType5=Informe de gastos
 AccountingJournalType9=Tiene nuevo
@@ -123,3 +126,4 @@ ExportDraftJournal=Exportar borrador de diario
 SomeMandatoryStepsOfSetupWereNotDone=Algunos pasos obligatorios de la instalación no se realizaron, favor de completar
 ExportNotSupported=El formato de exportación configurado no se admite en esta página
 NoJournalDefined=Ningún diario definido
+InventoryJournal=Diario de inventario
diff --git a/htdocs/langs/es_MX/admin.lang b/htdocs/langs/es_MX/admin.lang
index 82b028ae8c2..ed05a10ee1a 100644
--- a/htdocs/langs/es_MX/admin.lang
+++ b/htdocs/langs/es_MX/admin.lang
@@ -162,6 +162,7 @@ AchatTelechargement=Comprar / Descargar
 GoModuleSetupArea=Para implementar/instalar un nuevo módulo, vaya al área de configuración del Módulo: <a href="%s"> %s </a>.
 DoliStoreDesc=DoliStore, el lugar oficial para módulos externos Dolibarr ERP / CRM
 WebSiteDesc=Sitios web externos para más módulos adicionales (no básicos) ...
+RelativeURL=URL relativa
 BoxesAvailable=Widgets disponibles
 BoxesActivated=Widgets activados
 ActivateOn=Activar
@@ -199,15 +200,19 @@ MAIN_MAIL_EMAIL_TLS=Usar cifrado TLS (SSL)
 MAIN_DISABLE_ALL_SMS=Deshabilitar todo el envío de SMS (para fines de prueba o demostraciones)
 MAIN_SMS_SENDMODE=Método a utilizar para enviar SMS
 MAIN_MAIL_SMS_FROM=Número de teléfono predeterminado del remitente para el envío de SMS
+UserEmail=Correo electrónico del usuario
+CompanyEmail=Correo electrónico de la empresa
 FeatureNotAvailableOnLinux=Característica no disponible en sistemas similares a Unix. Prueba tu programa de envio de correo localmente.
 SubmitTranslation=Si la traducción de este idioma no está completa o encuentra errores, puede corregir esto editando archivos en el directorio <b>langs / %s</b> y envíe su cambio a www.transifex.com/dolibarr-association/dolibarr/
 ModulesSetup=Configuración de Módulos/Aplicación
+MenuAdmin=Editor de menú
 FindPackageFromWebSite=Encuentre un paquete que proporcione las funciones que necesita (por ejemplo, en el sitio web oficial %s).
 DownloadPackageFromWebSite=Descargue el paquete (por ejemplo, del sitio web oficial %s).
 SetupIsReadyForUse=La implementación del módulo ha finalizado. Sin embargo, debe habilitar y configurar el módulo en su aplicación yendo a la página de configuración de módulo: <a href="%s">%s</a> .
 NotExistsDirect=El directorio raíz alternativo no está definido en un directorio existente. <br>
 InfDirAlt=Desde la versión 3, es posible definir un directorio raíz alternativo. Esto le permite almacenar, en un directorio dedicado, complementos y plantillas personalizadas. <br> Simplemente cree un directorio en la raíz de Dolibarr (por ejemplo: personalizado). <br>
 LastActivationIP=IP de activación más reciente
+UpdateServerOffline=Actualizar servidor sin conexión
 GenericMaskCodes4c=<u>Ejemplo de producto creado el 2007-03-01:</u> <br>
 GenericNumRefModelDesc=Devuelve un número personalizable de acuerdo con una máscara definida.
 ServerAvailableOnIPOrPort=El servidor está disponible en la dirección <b>%s</b> en el puerto <b>%s</b>
@@ -220,21 +225,56 @@ UMaskExplanation=Este parámetro le permite definir permisos establecidos por de
 SeeWikiForAllTeam=Eche un vistazo a la página Wiki para obtener una lista de colaboradores y su organización.
 DisableLinkToHelpCenter=Ocultar enlace &quot; <b>Necesita ayuda o soporte</b> &quot; en la página de inicio de sesión
 DisableLinkToHelp=Ocultar enlace a ayuda en línea &quot; <b>%s</b> &quot;
+MinLength=Longitud mínima
+HideDescOnPDF=Ocultar descripción de productos
+String=Cadena
+String1Line=Cadena (1 línea)
+HtmlText=Texto HTML
+Int=Entero
+Float=Flotante
+ExtrafieldMail =Correo electrónico
+ExtrafieldUrl =URL
+ExtrafieldSelect =Seleccionar lista
+ExtrafieldSelectList =Seleccionar de la tabla
+ComputedFormula=Campo calculado
+Computedpersistent=Almacenar campo calculado
+SetAsDefault=Establecer como predeterminado
+ClickToShowDescription=Haga clic para mostrar la descripción
+DependsOn=Este módulo necesita los módulo(s)
 WarningSettingSortOrder=Advertencia, establecer un orden predeterminado puede resultar en un error técnico al pasar a la página de lista si "campo" es un campo desconocido. Si experimenta un error de este tipo, vuelva a esta página para eliminar el orden predeterminado y restaurar el comportamiento predeterminado.
 Module20Name=Propuestas
 Module30Name=Facturas
 Module40Name=Vendedores
+Module610Name=Variantes de producto
 Module3400Name=Redes Sociales
+Module10000Name=Páginas web
 DictionaryAccountancyJournal=Diarios de contabilidad
 DictionarySocialNetworks=Redes Sociales
 Upgrade=Actualizar
+LDAPServerPortExample=Puerto predeterminado: 389
+LDAPServerUseTLS=Usar TLS
 LDAPFieldFirstName=Nombre(s)
+Buy=Comprar
+Sell=Vender
 AGENDA_SHOW_LINKED_OBJECT=Mostrar objeto vinculado en la vista de agenda
+ShowFiscalYear=Mostrar período contable
+AlwaysEditable=Siempre se puede editar
+Format=Formato
 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>
+LinkColor=Color de los enlaces
+Enter0or1=Introduce 0 o 1
+TypeOfTemplate=Tipo de plantilal
 MailToSendProposal=Propuestas de clientes
 MailToSendInvoice=Facturas de clientes
 MailToSendSupplierOrder=Ordenes de compra
 MailToSendSupplierInvoice=Facturas de proveedor
+AllPublishers=Todos los editores
+AddMenus=Añadir menús
+AddPermissions=Añadir permisos
+CodeLastResult=Último código de resultado
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
+ShowProjectLabel=Etiqueta de proyecto
+TemplateAdded=Plantilla agregada
 MailToSendEventOrganization=Organización de Eventos
+ModuleUpdateAvailable=Una actualización está disponible
diff --git a/htdocs/langs/es_MX/agenda.lang b/htdocs/langs/es_MX/agenda.lang
index 2dda1145955..85fd4181c3c 100644
--- a/htdocs/langs/es_MX/agenda.lang
+++ b/htdocs/langs/es_MX/agenda.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - agenda
-LocalAgenda=Calendario predeterminado
 ActionsOwnedBy=Evento propiedad de
 Event=Evento
 ListOfActions=Lista de eventos
@@ -9,7 +8,6 @@ EventOnFullDay=Evento de todo el día(s)
 MenuToDoActions=Todos los eventos incompletos
 MenuDoneActions=Todos los eventos finalizados
 MenuDoneMyActions=Mis eventos finalizados
-ListOfEvents=Lista de eventos (calendario predeterminado)
 ActionsAskedBy=Eventos reportados por
 ActionsDoneBy=Eventos realizado por
 ViewCal=Vista del mes
diff --git a/htdocs/langs/es_MX/cron.lang b/htdocs/langs/es_MX/cron.lang
index bd7c9cb94be..68c3271a3fe 100644
--- a/htdocs/langs/es_MX/cron.lang
+++ b/htdocs/langs/es_MX/cron.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - cron
+CronLastResult=Último código de resultado
 CronNone=Ninguno
 CronMethod=Método
 CronModule=Módulo
diff --git a/htdocs/langs/es_MX/exports.lang b/htdocs/langs/es_MX/exports.lang
new file mode 100644
index 00000000000..a58ce191ba0
--- /dev/null
+++ b/htdocs/langs/es_MX/exports.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - exports
+DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
+ComputedField=Campo calculado
diff --git a/htdocs/langs/es_MX/main.lang b/htdocs/langs/es_MX/main.lang
index 8348317d53f..b9c67e57220 100644
--- a/htdocs/langs/es_MX/main.lang
+++ b/htdocs/langs/es_MX/main.lang
@@ -236,6 +236,7 @@ ViewList=Vista de la lista
 Sincerely=Sinceramente
 DeleteLine=Borrar línea
 ExportOptions=Opciónes de exportación
+WebSites=Páginas web
 ExpenseReports=Reporte de gastos
 Monday=lunes
 Tuesday=martes
diff --git a/htdocs/langs/es_MX/mrp.lang b/htdocs/langs/es_MX/mrp.lang
index afe7a7f1d75..300d0969e7e 100644
--- a/htdocs/langs/es_MX/mrp.lang
+++ b/htdocs/langs/es_MX/mrp.lang
@@ -1,7 +1,2 @@
 # Dolibarr language file - Source file is en_US - mrp
-BillOfMaterials=Bill of Material
 BOMsSetup=configuración del módulo BOM
-NewBOM=New bill of material
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
diff --git a/htdocs/langs/es_MX/partnership.lang b/htdocs/langs/es_MX/partnership.lang
index e5a790d439e..514fd72f0fa 100644
--- a/htdocs/langs/es_MX/partnership.lang
+++ b/htdocs/langs/es_MX/partnership.lang
@@ -1,3 +1,3 @@
 # Dolibarr language file - Source file is en_US - partnership
 DatePartnershipEnd=Fecha de finalización
-PartnershipCanceled =Cancelado
+PartnershipCanceled=Cancelado
diff --git a/htdocs/langs/es_MX/products.lang b/htdocs/langs/es_MX/products.lang
index 8ade985e293..1759470aab4 100644
--- a/htdocs/langs/es_MX/products.lang
+++ b/htdocs/langs/es_MX/products.lang
@@ -11,6 +11,7 @@ DeleteProduct=Eliminar un producto / servicio
 ExportDataset_produit_1=Productos
 ImportDataset_produit_1=productos
 BarCodePrintsheet=Imprimir código de barras
+ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 GlobalVariableUpdaterType0=Datos JSON
 GlobalVariableUpdaterHelp0=Analiza los datos JSON de la URL especificada, VALUE especifica la ubicación del valor relevante,
 GlobalVariableUpdaterHelpFormat0=Formato de la solicitud {"URL": "http://example.com/urlofjson", "VALUE": "array1, array2, targetvalue"}
diff --git a/htdocs/langs/es_MX/stocks.lang b/htdocs/langs/es_MX/stocks.lang
index 6b99216feac..f48d88d1306 100644
--- a/htdocs/langs/es_MX/stocks.lang
+++ b/htdocs/langs/es_MX/stocks.lang
@@ -1,5 +1,7 @@
 # Dolibarr language file - Source file is en_US - stocks
 Location=Ubicación
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+OpenInternal=Open only for internal actions
 inventoryEdit=Editar
 inventoryDeleteLine=Borrar línea
 ListInventory=Lista
diff --git a/htdocs/langs/es_MX/ticket.lang b/htdocs/langs/es_MX/ticket.lang
index 59745fa1759..f49d39d3a5b 100644
--- a/htdocs/langs/es_MX/ticket.lang
+++ b/htdocs/langs/es_MX/ticket.lang
@@ -1,4 +1,7 @@
 # Dolibarr language file - Source file is en_US - ticket
+TicketTypeShortISSUE=Issue, bug or problem
+OriginEmail=Email source
+NeedMoreInformation=Waiting for information
 Closed=Cerrada
 TicketSettings=Configuraciónes
 TicketMessageMailIntroText=Hola, <br> Se envió una nueva respuesta en un ticket con el que se comunicó. Aquí está el mensaje: <br>
diff --git a/htdocs/langs/es_PA/accountancy.lang b/htdocs/langs/es_PA/accountancy.lang
index 4dbdd035d6e..ef9e69e554a 100644
--- a/htdocs/langs/es_PA/accountancy.lang
+++ b/htdocs/langs/es_PA/accountancy.lang
@@ -1,2 +1,2 @@
 # Dolibarr language file - Source file is en_US - accountancy
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
diff --git a/htdocs/langs/es_PA/cron.lang b/htdocs/langs/es_PA/cron.lang
deleted file mode 100644
index 67ecfc77567..00000000000
--- a/htdocs/langs/es_PA/cron.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - cron
-CronTaskInactive=This job is disabled
diff --git a/htdocs/langs/es_PA/exports.lang b/htdocs/langs/es_PA/exports.lang
new file mode 100644
index 00000000000..17dedd46696
--- /dev/null
+++ b/htdocs/langs/es_PA/exports.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - exports
+DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
diff --git a/htdocs/langs/es_PA/mrp.lang b/htdocs/langs/es_PA/mrp.lang
deleted file mode 100644
index a8ff138755b..00000000000
--- a/htdocs/langs/es_PA/mrp.lang
+++ /dev/null
@@ -1,6 +0,0 @@
-# Dolibarr language file - Source file is en_US - mrp
-BillOfMaterials=Bill of Material
-NewBOM=New bill of material
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
diff --git a/htdocs/langs/es_PA/products.lang b/htdocs/langs/es_PA/products.lang
new file mode 100644
index 00000000000..e0628dbec00
--- /dev/null
+++ b/htdocs/langs/es_PA/products.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - products
+ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
diff --git a/htdocs/langs/es_PA/stocks.lang b/htdocs/langs/es_PA/stocks.lang
new file mode 100644
index 00000000000..1cae5cf3f11
--- /dev/null
+++ b/htdocs/langs/es_PA/stocks.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - stocks
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+OpenInternal=Open only for internal actions
diff --git a/htdocs/langs/es_PA/ticket.lang b/htdocs/langs/es_PA/ticket.lang
new file mode 100644
index 00000000000..82e110b1ca4
--- /dev/null
+++ b/htdocs/langs/es_PA/ticket.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - ticket
+TicketTypeShortISSUE=Issue, bug or problem
+OriginEmail=Email source
+NeedMoreInformation=Waiting for information
+TicketCategory=Group
diff --git a/htdocs/langs/es_PE/accountancy.lang b/htdocs/langs/es_PE/accountancy.lang
index f41b76f9342..112c5b1c66f 100644
--- a/htdocs/langs/es_PE/accountancy.lang
+++ b/htdocs/langs/es_PE/accountancy.lang
@@ -12,6 +12,7 @@ DefaultForProduct=Producto por defecto
 Journals=Revistas
 JournalFinancial=Revistas financieras
 BackToChartofaccounts=Retornar gráfico de cuentas
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 Selectchartofaccounts=Seleccione el plan de cuentas activo
 Addanaccount=Agregar una cuenta contable
 Binding=Vinculación a cuentas
@@ -32,7 +33,6 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Comienza la clasificación de la página "
 ACCOUNTING_LENGTH_DESCRIPTION=Truncar la descripción de los productos y servicios en los listados después de los caracteres x (mejor = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncar el formulario de descripción de la cuenta de producto y servicios en los listados después de los caracteres x (mejor = 50)
 ACCOUNTING_LENGTH_GACCOUNT=Longitud de las cuentas de contabilidad general (si establece el valor a 6 aquí, la cuenta '706' aparecerá como '706000' en la pantalla)
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
 ACCOUNTING_SELL_JOURNAL=Diario de Venta
 ACCOUNTING_PURCHASE_JOURNAL=Diario de Compra
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Diario diverso
diff --git a/htdocs/langs/es_PE/exports.lang b/htdocs/langs/es_PE/exports.lang
new file mode 100644
index 00000000000..17dedd46696
--- /dev/null
+++ b/htdocs/langs/es_PE/exports.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - exports
+DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
diff --git a/htdocs/langs/es_PE/mrp.lang b/htdocs/langs/es_PE/mrp.lang
index df2c3df2e0b..3ed4ad645a9 100644
--- a/htdocs/langs/es_PE/mrp.lang
+++ b/htdocs/langs/es_PE/mrp.lang
@@ -8,11 +8,8 @@ MrpSetupPage=Configuración del modulo PRM
 MenuBOM=Lista de materiales
 LatestBOMModified=Últimas%s Lista de materiales modificados
 LatestMOModified=Últimas %s Órdenes de Fabricación modificadas
-BillOfMaterials=Lista de Material
 ListOfBOMs=Listado de Lista De Material - BOM
 ListOfManufacturingOrders=Lista de Órdenes de Fabricación
-NewBOM=Nueva lista de material
-ProductBOMHelp=Producto para crear con este BOM. <br>Nota: Productos con la propiedad 'Naturaleza del producto'= 'Materia prima' no serán visibles en esta lista.
 BOMsNumberingModules=Plantillas de numeración BOM
 BOMsModelModule=Plantillas de documento BOM
 MOsNumberingModules=Numeración de plantillas MO
@@ -21,18 +18,14 @@ FreeLegalTextOnBOMs=Texto libre en documento BOM
 WatermarkOnDraftBOMs=Marca de agua en BOM borrador
 FreeLegalTextOnMOs=Texto libre en documento MO
 WatermarkOnDraftMOs=Marca de agua en borrador MO
-ConfirmCloneBillOfMaterials=Está seguro de clonar esta lista de materiales %s?
 ConfirmCloneMo=Está seguro de clonar la Orden de Fabricación %s?
 ValueOfMeansLoss=Valor de 0.95 significa un promedio de 5%% pérdidas durante la producción
 ValueOfMeansLossForProductProduced=Valor de 0.95 significa un promedio de 5 %% de pérdidas del producto producido
 DeleteBillOfMaterials=Eliminar Lista De Materiales
-ConfirmDeleteBillOfMaterials=Está seguro de borrar esta Lista de Materiales
-ConfirmDeleteMo=Está seguro de borrar esta Lista de Materiales
 NewMO=Nueva Orden de Fabricación
 QtyToProduce=Cantidad a producir
 DateEndPlannedMo=Fecha de fin planeada
 KeepEmptyForAsap=Vacío si es 'Tan pronto como sea posible'
-EstimatedDurationDesc=Duración estimada a fabricar el producto usando este BOM
 ConfirmValidateBom=Está seguro de validar el BOM con la referencia <strong>%s</strong> (Usted podrá usarlo para crear nuevas órdenes de fabricación)
 ConfirmCloseBom=Está seguro de cancelar este BOM (Ya no podrá usarlo para crear nuevas órdenes de fabricación)
 ConfirmReopenBom=Está seguro de re-abrir este BOM (Podrá usarlo para crear nuevas órdenes de fabricación)
@@ -56,8 +49,8 @@ ConfirmProductionDesc=Al hacer click en '%s', validará el consumo y / o producc
 AutoCloseMO=Cerrar automáticamente la Orden de Fabricación si se completa las cantidades para consumir y producir
 NoStockChangeOnServices=Sin cambios de stock en servicios
 ProductQtyToConsumeByMO=Cantidad de producto pendiente para consumir por MO abierto.
-ProductQtyToProduceByMO=Cantidad de producto pendiente para producir por MO abierto.
 AddNewConsumeLines=Agregar nueva linea para consumir
 TotalCost=Costo total
 BOMTotalCost=El costo a producir este BOM es basado sobre el costo de cantidad y producto a consumir (Se usa si el precio de costo está definido, de lo contario usa el precio promedio ponderado, o en todo caso el mejor precio de compra)
 GoOnTabProductionToProduceFirst=Debe primero empezar la producción para cerrar una orden de fabricación (Ver tab '%s'). Pero puede cancelarlo.
+DeleteWorkstation=Borrar
diff --git a/htdocs/langs/es_PE/products.lang b/htdocs/langs/es_PE/products.lang
index e682fe300a6..878b4c23757 100644
--- a/htdocs/langs/es_PE/products.lang
+++ b/htdocs/langs/es_PE/products.lang
@@ -5,3 +5,4 @@ ProductServiceCard=Ficha Productos/Servicios
 ProductOrService=Producto o Servicio
 ListOfStockMovements=Lista de movimientos de stock
 ExportDataset_produit_1=Productos
+ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
diff --git a/htdocs/langs/es_PE/stocks.lang b/htdocs/langs/es_PE/stocks.lang
index 517409f5632..59ade17c9ee 100644
--- a/htdocs/langs/es_PE/stocks.lang
+++ b/htdocs/langs/es_PE/stocks.lang
@@ -2,11 +2,13 @@
 MovementId=ID de Movimiento
 StockMovementForId=ID de Movimiento %d
 ListMouvementStockProject=Lista de movimientos de stock asociados al proyecto
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
 QtyDispatchedShort=Cant. despachada
 MassMovement=Movimiento masivo
 StockMovementRecorded=Movimiento de stock grabado
 MovementLabel=Etiqueta de movimiento
 MovementCorrectStock=Corrección de stock del producto %s
+OpenInternal=Open only for internal actions
 inventoryEdit=Editar
 AddProduct=Agregar
 ListInventory=Lista
diff --git a/htdocs/langs/es_PE/ticket.lang b/htdocs/langs/es_PE/ticket.lang
index 1f39a627933..316ed01752a 100644
--- a/htdocs/langs/es_PE/ticket.lang
+++ b/htdocs/langs/es_PE/ticket.lang
@@ -1,5 +1,9 @@
 # Dolibarr language file - Source file is en_US - ticket
+TicketTypeShortISSUE=Issue, bug or problem
+OriginEmail=Email source
 Read=Leer
+NeedMoreInformation=Waiting for information
 Type=Tipo
 TicketSettings=Configuración
+TicketCategory=Group
 TicketNewEmailBodyInfosTrackUrl=Puedes ver la progresión del ticket haciendo click sobre el seguimiento del ticket.
diff --git a/htdocs/langs/es_PY/accountancy.lang b/htdocs/langs/es_PY/accountancy.lang
index 4dbdd035d6e..ef9e69e554a 100644
--- a/htdocs/langs/es_PY/accountancy.lang
+++ b/htdocs/langs/es_PY/accountancy.lang
@@ -1,2 +1,2 @@
 # Dolibarr language file - Source file is en_US - accountancy
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
diff --git a/htdocs/langs/es_PY/cron.lang b/htdocs/langs/es_PY/cron.lang
deleted file mode 100644
index 67ecfc77567..00000000000
--- a/htdocs/langs/es_PY/cron.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - cron
-CronTaskInactive=This job is disabled
diff --git a/htdocs/langs/es_PY/exports.lang b/htdocs/langs/es_PY/exports.lang
new file mode 100644
index 00000000000..17dedd46696
--- /dev/null
+++ b/htdocs/langs/es_PY/exports.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - exports
+DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
diff --git a/htdocs/langs/es_PY/mrp.lang b/htdocs/langs/es_PY/mrp.lang
deleted file mode 100644
index a8ff138755b..00000000000
--- a/htdocs/langs/es_PY/mrp.lang
+++ /dev/null
@@ -1,6 +0,0 @@
-# Dolibarr language file - Source file is en_US - mrp
-BillOfMaterials=Bill of Material
-NewBOM=New bill of material
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
diff --git a/htdocs/langs/es_PY/products.lang b/htdocs/langs/es_PY/products.lang
new file mode 100644
index 00000000000..e0628dbec00
--- /dev/null
+++ b/htdocs/langs/es_PY/products.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - products
+ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
diff --git a/htdocs/langs/es_PY/stocks.lang b/htdocs/langs/es_PY/stocks.lang
new file mode 100644
index 00000000000..1cae5cf3f11
--- /dev/null
+++ b/htdocs/langs/es_PY/stocks.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - stocks
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+OpenInternal=Open only for internal actions
diff --git a/htdocs/langs/es_PY/ticket.lang b/htdocs/langs/es_PY/ticket.lang
new file mode 100644
index 00000000000..82e110b1ca4
--- /dev/null
+++ b/htdocs/langs/es_PY/ticket.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - ticket
+TicketTypeShortISSUE=Issue, bug or problem
+OriginEmail=Email source
+NeedMoreInformation=Waiting for information
+TicketCategory=Group
diff --git a/htdocs/langs/es_US/accountancy.lang b/htdocs/langs/es_US/accountancy.lang
index 4dbdd035d6e..ef9e69e554a 100644
--- a/htdocs/langs/es_US/accountancy.lang
+++ b/htdocs/langs/es_US/accountancy.lang
@@ -1,2 +1,2 @@
 # Dolibarr language file - Source file is en_US - accountancy
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
diff --git a/htdocs/langs/es_US/cron.lang b/htdocs/langs/es_US/cron.lang
deleted file mode 100644
index 67ecfc77567..00000000000
--- a/htdocs/langs/es_US/cron.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - cron
-CronTaskInactive=This job is disabled
diff --git a/htdocs/langs/es_US/exports.lang b/htdocs/langs/es_US/exports.lang
new file mode 100644
index 00000000000..17dedd46696
--- /dev/null
+++ b/htdocs/langs/es_US/exports.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - exports
+DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
diff --git a/htdocs/langs/es_US/mrp.lang b/htdocs/langs/es_US/mrp.lang
deleted file mode 100644
index a8ff138755b..00000000000
--- a/htdocs/langs/es_US/mrp.lang
+++ /dev/null
@@ -1,6 +0,0 @@
-# Dolibarr language file - Source file is en_US - mrp
-BillOfMaterials=Bill of Material
-NewBOM=New bill of material
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
diff --git a/htdocs/langs/es_US/products.lang b/htdocs/langs/es_US/products.lang
new file mode 100644
index 00000000000..e0628dbec00
--- /dev/null
+++ b/htdocs/langs/es_US/products.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - products
+ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
diff --git a/htdocs/langs/es_US/stocks.lang b/htdocs/langs/es_US/stocks.lang
new file mode 100644
index 00000000000..1cae5cf3f11
--- /dev/null
+++ b/htdocs/langs/es_US/stocks.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - stocks
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+OpenInternal=Open only for internal actions
diff --git a/htdocs/langs/es_US/ticket.lang b/htdocs/langs/es_US/ticket.lang
new file mode 100644
index 00000000000..82e110b1ca4
--- /dev/null
+++ b/htdocs/langs/es_US/ticket.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - ticket
+TicketTypeShortISSUE=Issue, bug or problem
+OriginEmail=Email source
+NeedMoreInformation=Waiting for information
+TicketCategory=Group
diff --git a/htdocs/langs/es_UY/accountancy.lang b/htdocs/langs/es_UY/accountancy.lang
index 4dbdd035d6e..ef9e69e554a 100644
--- a/htdocs/langs/es_UY/accountancy.lang
+++ b/htdocs/langs/es_UY/accountancy.lang
@@ -1,2 +1,2 @@
 # Dolibarr language file - Source file is en_US - accountancy
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
diff --git a/htdocs/langs/es_UY/cron.lang b/htdocs/langs/es_UY/cron.lang
deleted file mode 100644
index 67ecfc77567..00000000000
--- a/htdocs/langs/es_UY/cron.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - cron
-CronTaskInactive=This job is disabled
diff --git a/htdocs/langs/es_UY/exports.lang b/htdocs/langs/es_UY/exports.lang
new file mode 100644
index 00000000000..17dedd46696
--- /dev/null
+++ b/htdocs/langs/es_UY/exports.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - exports
+DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
diff --git a/htdocs/langs/es_UY/mrp.lang b/htdocs/langs/es_UY/mrp.lang
deleted file mode 100644
index a8ff138755b..00000000000
--- a/htdocs/langs/es_UY/mrp.lang
+++ /dev/null
@@ -1,6 +0,0 @@
-# Dolibarr language file - Source file is en_US - mrp
-BillOfMaterials=Bill of Material
-NewBOM=New bill of material
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
diff --git a/htdocs/langs/es_UY/products.lang b/htdocs/langs/es_UY/products.lang
new file mode 100644
index 00000000000..e0628dbec00
--- /dev/null
+++ b/htdocs/langs/es_UY/products.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - products
+ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
diff --git a/htdocs/langs/es_UY/stocks.lang b/htdocs/langs/es_UY/stocks.lang
new file mode 100644
index 00000000000..1cae5cf3f11
--- /dev/null
+++ b/htdocs/langs/es_UY/stocks.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - stocks
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+OpenInternal=Open only for internal actions
diff --git a/htdocs/langs/es_UY/ticket.lang b/htdocs/langs/es_UY/ticket.lang
new file mode 100644
index 00000000000..82e110b1ca4
--- /dev/null
+++ b/htdocs/langs/es_UY/ticket.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - ticket
+TicketTypeShortISSUE=Issue, bug or problem
+OriginEmail=Email source
+NeedMoreInformation=Waiting for information
+TicketCategory=Group
diff --git a/htdocs/langs/es_VE/accountancy.lang b/htdocs/langs/es_VE/accountancy.lang
index 4dbdd035d6e..ef9e69e554a 100644
--- a/htdocs/langs/es_VE/accountancy.lang
+++ b/htdocs/langs/es_VE/accountancy.lang
@@ -1,2 +1,2 @@
 # Dolibarr language file - Source file is en_US - accountancy
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
diff --git a/htdocs/langs/es_VE/agenda.lang b/htdocs/langs/es_VE/agenda.lang
deleted file mode 100644
index 54d000526be..00000000000
--- a/htdocs/langs/es_VE/agenda.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - agenda
-ListOfEvents=lista de acontecimientos (calendario interno)
diff --git a/htdocs/langs/es_VE/exports.lang b/htdocs/langs/es_VE/exports.lang
new file mode 100644
index 00000000000..17dedd46696
--- /dev/null
+++ b/htdocs/langs/es_VE/exports.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - exports
+DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
diff --git a/htdocs/langs/es_VE/mrp.lang b/htdocs/langs/es_VE/mrp.lang
deleted file mode 100644
index a8ff138755b..00000000000
--- a/htdocs/langs/es_VE/mrp.lang
+++ /dev/null
@@ -1,6 +0,0 @@
-# Dolibarr language file - Source file is en_US - mrp
-BillOfMaterials=Bill of Material
-NewBOM=New bill of material
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
diff --git a/htdocs/langs/es_VE/partnership.lang b/htdocs/langs/es_VE/partnership.lang
index c1937e30555..4221d0b0c89 100644
--- a/htdocs/langs/es_VE/partnership.lang
+++ b/htdocs/langs/es_VE/partnership.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - partnership
 DatePartnershipEnd=Fecha finalización
-PartnershipDraft =A validar
-PartnershipAccepted =Aceptada
-PartnershipRefused =Devuelta
+PartnershipDraft=A validar
+PartnershipAccepted=Aceptada
+PartnershipRefused=Devuelta
diff --git a/htdocs/langs/es_VE/stocks.lang b/htdocs/langs/es_VE/stocks.lang
index 62683be674b..797bdb5eae4 100644
--- a/htdocs/langs/es_VE/stocks.lang
+++ b/htdocs/langs/es_VE/stocks.lang
@@ -1,2 +1,4 @@
 # Dolibarr language file - Source file is en_US - stocks
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+OpenInternal=Open only for internal actions
 inventoryValidate=Validada
diff --git a/htdocs/langs/es_VE/ticket.lang b/htdocs/langs/es_VE/ticket.lang
index 29893df37f8..bf1d98261e2 100644
--- a/htdocs/langs/es_VE/ticket.lang
+++ b/htdocs/langs/es_VE/ticket.lang
@@ -1,4 +1,7 @@
 # Dolibarr language file - Source file is en_US - ticket
+TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortOTHER=Otra
+OriginEmail=Email source
+NeedMoreInformation=Waiting for information
 Closed=Cerrada
 Type=Tipo
diff --git a/htdocs/langs/et_EE/accountancy.lang b/htdocs/langs/et_EE/accountancy.lang
index 5d28519c9ab..cf0b7745ddf 100644
--- a/htdocs/langs/et_EE/accountancy.lang
+++ b/htdocs/langs/et_EE/accountancy.lang
@@ -158,7 +158,7 @@ ACCOUNTING_LENGTH_AACCOUNT=Length of the third-party accounting accounts (If you
 ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of an accounting account. Needed by some countries (like Switzerland). If set to off (default), you can set the following two parameters to ask the application to add virtual zeros.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties, break ability to search on a part of value)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
@@ -328,6 +328,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountanc
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
+NotifiedExportDate=Notified export date (modification of the entries will not be possible)
+NotifiedValidationDate=Validation of the entries (modification or deletion of the entries will not be possible)
+ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=Export draft journal
 Modelcsv=Eksportimise mudel
 Selectmodelcsv=Vali eksportimise mudel
diff --git a/htdocs/langs/et_EE/admin.lang b/htdocs/langs/et_EE/admin.lang
index b0a402fe689..7601ac71601 100644
--- a/htdocs/langs/et_EE/admin.lang
+++ b/htdocs/langs/et_EE/admin.lang
@@ -221,8 +221,8 @@ NotCompatible=This module does not seem compatible with your Dolibarr %s (Min %s
 CompatibleAfterUpdate=This module requires an update to your Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=See in Market place
 SeeSetupOfModule=See setup of module %s
+SetOptionTo=Set option <b>%s</b> to %s
 Updated=Uuendatud
-Nouveauté=Novelty
 AchatTelechargement=Osta / Laadi alla
 GoModuleSetupArea=To deploy/install a new module, go to the Module setup area: <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore on ametlik Dolibarr ERP/CRM moodulite müümiseks kasutatav koht
@@ -399,6 +399,7 @@ SecurityToken=URLide kaitsmiseks kasutatav võti
 NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
 PDF=PDF
 PDFDesc=Global options for PDF generation
+PDFOtherDesc=PDF Option specific to some modules
 PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Peida kõik müügimaksu / käibemaksuga seotud andmed
 PDFRulesForSalesTax=Müügimaksu / käibemaksu reeglid
@@ -561,7 +562,7 @@ Module53Desc=Management of Services
 Module54Name=Lepingud/Tellimused
 Module54Desc=Management of contracts (services or recurring subscriptions)
 Module55Name=Vöötkoodid
-Module55Desc=Vöötkoodide haldamine
+Module55Desc=Barcode or QR code management
 Module56Name=Payment by credit transfer
 Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
 Module57Name=Payments by Direct Debit
@@ -848,10 +849,10 @@ Permission402=Allahindluste loomine/muutmine
 Permission403=Allahindluste kinnitamine
 Permission404=Allahindluste kustutamine
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries (yours and subordinates)
-Permission512=Create/modify payments of salaries
-Permission514=Delete payments of salaries
-Permission517=Read payments of salaries of everybody
+Permission511=Read salaries and payments (yours and subordinates)
+Permission512=Create/modify salaries and payments
+Permission514=Delete salaries and payments
+Permission517=Read salaries and payments everybody
 Permission519=Palkade eksportimine
 Permission520=Read Loans
 Permission522=Create/modify loans
@@ -965,6 +966,8 @@ Permission23003=Delete Scheduled job
 Permission23004=Execute Scheduled job
 Permission50101=Use Point of Sale (SimplePOS)
 Permission50151=Use Point of Sale (TakePOS)
+Permission50152=Edit sales lines
+Permission50153=Edit ordered sales lines
 Permission50201=Tehingute vaatamine
 Permission50202=Tehingute impor
 Permission50330=Read objects of Zapier
@@ -1039,11 +1042,12 @@ DictionaryMeasuringUnits=Measuring Units
 DictionarySocialNetworks=Sotsiaalvõrgud
 DictionaryProspectStatus=Prospect status for companies
 DictionaryProspectContactStatus=Prospect status for contacts
-DictionaryHolidayTypes=Types of leave
+DictionaryHolidayTypes=Leave - Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
 DictionaryTransportMode=Intracomm report - Transport mode
+DictionaryBatchStatus=Product lot/serial Quality Control status
 TypeOfUnit=Type of unit
 SetupSaved=Seadistused salvestatud
 SetupNotSaved=Setup not saved
@@ -1187,7 +1191,7 @@ SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of m
 SetupDescription5=Other Setup menu entries manage optional parameters.
 AuditedSecurityEvents=Security events that are audited
 NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
-Audit=Audit
+Audit=Security events
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
 InfoOS=About OS
@@ -1319,9 +1323,12 @@ ConditionIsCurrently=Olek on hetkel %s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
 NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
+ComboListOptim=Combo list loading optimization
 SearchOptim=Otsingu optimeerimine
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
-YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
+YouHaveXObjectUseComboOptim=You have %s %s in the database. You can go into setup of module to enable loading of combo list on key pressed event.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other.
+YouHaveXObjectUseSearchOptimDesc=This limits the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to %s in Home-Setup-Other.
 BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
 BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
 PHPModuleLoaded=PHP component %s is loaded
@@ -1433,6 +1440,7 @@ MemberMainOptions=Põhilised seaded
 AdherentLoginRequired= Halda iga liikme kasutajanime
 AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Liikmetele e-kirja kinnituse saatmise (kinnitamise või uue tellimuse puhul) märkeruut on vaikimisi valitud
+MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
 MembersDocModules=Document templates for documents generated from member record
@@ -1763,7 +1771,7 @@ AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting men
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
-AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the scheduled job %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial mooduli seadistamine
@@ -1979,6 +1987,8 @@ 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_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add picture on proposal line
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add electronic sign in PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
@@ -2096,7 +2106,6 @@ PDF_SHOW_PROJECT=Show project on document
 ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
-FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
@@ -2120,12 +2129,18 @@ ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by
 MailToSendEventOrganization=Event Organization
 AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
 YouShouldDisablePHPFunctions=You should disable PHP functions
-IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands in custom code, you shoud disable PHP functions
+PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
+NotRecommended=Not recommanded
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
 ModuleUpdateAvailable=An update is available
 NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
+RandomlySelectedIfSeveral=Randomly selected if several pictures are available
+DatabasePasswordObfuscated=Database password is obfuscated in conf file
+DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
diff --git a/htdocs/langs/et_EE/agenda.lang b/htdocs/langs/et_EE/agenda.lang
index 98053cf19ef..493e517fbfe 100644
--- a/htdocs/langs/et_EE/agenda.lang
+++ b/htdocs/langs/et_EE/agenda.lang
@@ -4,7 +4,7 @@ Actions=Tegevused
 Agenda=Päevakava
 TMenuAgenda=Päevakava
 Agendas=Päevakavad
-LocalAgenda=Sisemine kalender
+LocalAgenda=Default calendar
 ActionsOwnedBy=Sündmus kuulub
 ActionsOwnedByShort=Omanik
 AffectedTo=Mõjutatud isik
@@ -14,13 +14,13 @@ EventsNb=Tegevuste arv
 ListOfActions=Tegevuste nimekiri
 EventReports=Tegevuste aruanded
 Location=Asukoht
-ToUserOfGroup=Event assigned to any user in group
+ToUserOfGroup=Event assigned to any user in the group
 EventOnFullDay=Tegevus kestab kogu/kõik päeva(d)
 MenuToDoActions=Kõik lõpetamata tegevused
 MenuDoneActions=Kõik lõpetatud tegevused
 MenuToDoMyActions=Minu lõpetamata tegevused
 MenuDoneMyActions=Minu lõpetatud tegevused
-ListOfEvents=Sündmuste loend (sisemine kalender)
+ListOfEvents=List of events (default calendar)
 ActionsAskedBy=Tegevused, mille sisestas
 ActionsToDoBy=Tegevused, mis on seotud
 ActionsDoneBy=Tegevused, mille tegi
@@ -38,6 +38,7 @@ ActionsEvents=Tegevused, mille kohta lisab Dolibarr automaatselt päevakavasse s
 EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Kolmasosapool %s loodud
+COMPANY_MODIFYInDolibarr=Third party %s modified
 COMPANY_DELETEInDolibarr=Kolmasosapool %s kustutatud
 ContractValidatedInDolibarr=Leping %s kinnitatud
 CONTRACT_DELETEInDolibarr=Leping %s kustutatud
@@ -87,6 +88,7 @@ OrderDeleted=Tellimus kustutatud
 InvoiceDeleted=Arve kustutatud
 DraftInvoiceDeleted=Draft invoice deleted
 CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_MODIFYInDolibarr=Contact %s modified
 CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Toode %s loodud
 PRODUCT_MODIFYInDolibarr=Toote %s muudetud
@@ -119,6 +121,7 @@ MRP_MO_UNVALIDATEInDolibarr=MO set to draft status
 MRP_MO_PRODUCEDInDolibarr=MO produced
 MRP_MO_DELETEInDolibarr=MO deleted
 MRP_MO_CANCELInDolibarr=MO canceled
+PAIDInDolibarr=%s paid
 ##### End agenda events #####
 AgendaModelModule=Document templates for event
 DateActionStart=Alguskuupäev
@@ -130,7 +133,7 @@ AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to use
 AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
 AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic events.
 AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> to include events of holidays.
-AgendaShowBirthdayEvents=Näita kontaktide sünnipäevi
+AgendaShowBirthdayEvents=Birthdays of contacts
 AgendaHideBirthdayEvents=Peida kontaktide sünnipäevad
 Busy=Hõivatud
 ExportDataset_event1=Päevakavas olevate tegevuste nimekiri
@@ -152,6 +155,7 @@ ActionType=Sündmuse tüüp
 DateActionBegin=Sündmuse alguse kuupäev
 ConfirmCloneEvent=Kas soovite kindlasti sündmuse kloonida <b>%s</b> ?
 RepeatEvent=Korda sündmust
+OnceOnly=Once only
 EveryWeek=Igal nädalal
 EveryMonth=Igal kuul
 DayOfMonth=Kuu päeval
@@ -165,4 +169,4 @@ TimeType=Duration type
 ReminderType=Callback type
 AddReminder=Create an automatic reminder notification for this event
 ErrorReminderActionCommCreation=Error creating the reminder notification for this event
-BrowserPush=Browser Notification
+BrowserPush=Browser Popup Notification
diff --git a/htdocs/langs/et_EE/bills.lang b/htdocs/langs/et_EE/bills.lang
index 89861b7e743..93251093515 100644
--- a/htdocs/langs/et_EE/bills.lang
+++ b/htdocs/langs/et_EE/bills.lang
@@ -259,6 +259,7 @@ DateMaxPayment=Payment due on
 DateInvoice=Arve kuupäev
 DatePointOfTax=Point of tax
 NoInvoice=Ühtki arvet ei ole
+NoOpenInvoice=No open invoice
 ClassifyBill=Liigita arve
 SupplierBillsToPay=Tasumata tarnija arved
 CustomerBillsUnpaid=Maksmata kliendiarved
@@ -589,3 +590,4 @@ FacParentLine=Invoice Line Parent
 SituationTotalRayToRest=Remainder to pay without taxe
 PDFSituationTitle=Situation n° %d
 SituationTotalProgress=Total progress %d %%
+SearchUnpaidInvoicesWithDueDate=Search unpaid invoices with a due date = %s
diff --git a/htdocs/langs/et_EE/cashdesk.lang b/htdocs/langs/et_EE/cashdesk.lang
index 414b751c9d6..4138051e489 100644
--- a/htdocs/langs/et_EE/cashdesk.lang
+++ b/htdocs/langs/et_EE/cashdesk.lang
@@ -102,7 +102,7 @@ CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal numb
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
 SaleStartedAt=Sale started at %s
-ControlCashOpening=Control cash popup at opening POS
+ControlCashOpening=Open the "Control cash" popup when opening the POS
 CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -126,5 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
-ShowPriceHT = Display the price excluding tax column
-ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
+ShowPriceHT = Display the column with the price excluding tax (on screen)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
diff --git a/htdocs/langs/et_EE/compta.lang b/htdocs/langs/et_EE/compta.lang
index 77d6b6c4d74..363173307f3 100644
--- a/htdocs/langs/et_EE/compta.lang
+++ b/htdocs/langs/et_EE/compta.lang
@@ -286,3 +286,9 @@ ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
 IncludeLoansInResults = Include loans in reports
+InvoiceLate30Days = Invoices late > 30 days
+InvoiceLate15Days = Invoices late > 15 days
+InvoiceLateMinus15Days = Invoices late
+InvoiceNotLate = To be collected < 15 days
+InvoiceNotLate15Days = To be collected in 15 days
+InvoiceNotLate30Days = To be collected in 30 days
diff --git a/htdocs/langs/et_EE/cron.lang b/htdocs/langs/et_EE/cron.lang
index f727eb118fc..bce6fea2e1c 100644
--- a/htdocs/langs/et_EE/cron.lang
+++ b/htdocs/langs/et_EE/cron.lang
@@ -60,7 +60,7 @@ CronErrEndDateStartDt=Lõppkuupäev ei saa olla alguskuupäevast varasem
 StatusAtInstall=Status at module installation
 CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Lülita välja
-CronTaskInactive=See tegevus on välja lülitatud
+CronTaskInactive=This job is disabled (not scheduled)
 CronId=ID
 CronClassFile=Filename with class
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example 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>
diff --git a/htdocs/langs/et_EE/errors.lang b/htdocs/langs/et_EE/errors.lang
index 1a16bdc7807..729c1768fc6 100644
--- a/htdocs/langs/et_EE/errors.lang
+++ b/htdocs/langs/et_EE/errors.lang
@@ -11,6 +11,7 @@ ErrorBadValueForParamNotAString=Bad value for your parameter. It appends general
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Kasutajanimi %s on juba olemas.
 ErrorGroupAlreadyExists=Grupp %s on juba olemas.
+ErrorEmailAlreadyExists=Email %s already exists.
 ErrorRecordNotFound=Kirjet ei leitud.
 ErrorFailToCopyFile=Ei suutnud kopeerida faili '<b>%s</b>' asukohta '<b>%s</b>'.
 ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
@@ -117,7 +118,7 @@ ErrorCantReadFile=Faili '%s' lugemine ebaõnnestus
 ErrorCantReadDir=Kausta '%s' lugemine ebaõnnestus
 ErrorBadLoginPassword=Vale kasutajanimi või paroo
 ErrorLoginDisabled=Sinu konto on blokeeritud
-ErrorFailedToRunExternalCommand=Välise käsu käivitamine ebaõnnestus. Kontrolli, et see on saadaval ja PHP serveri poolt käivitatav. Kui PHP <b>Safe Mode</b> on sisse lülitatud, siis kontrolli, et käsk on parameetri <b>safe_mode_exec_dir</b> poolt lubatud kaustas.
+ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server user. Check also the command is not protected on shell level by a security layer like apparmor.
 ErrorFailedToChangePassword=Parooli muutmine ebaõnnestus
 ErrorLoginDoesNotExists=Kasutajanime <b>%s</b> ei leitud.
 ErrorLoginHasNoEmail=Antud kasutajal ei ole e-posti aadressi. Protsess katkestatud.
@@ -262,6 +263,7 @@ ErrorDateIsInFuture=Error, the date can't be in the future
 ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
 ErrorAPercentIsRequired=Error, please fill in the percentage correctly
 ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
+ErrorFailedToFindEmailTemplate=Failed to find template with code name %s
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -298,3 +300,4 @@ WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So y
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
+ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
diff --git a/htdocs/langs/et_EE/eventorganization.lang b/htdocs/langs/et_EE/eventorganization.lang
index a5d54dbe67c..2aeb7c22d4d 100644
--- a/htdocs/langs/et_EE/eventorganization.lang
+++ b/htdocs/langs/et_EE/eventorganization.lang
@@ -1,4 +1,5 @@
 # Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+# Copyright (C) 2021		Dorian Vabre			<dorian.vabre@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
@@ -81,7 +82,10 @@ PriceOfBoothHelp=Subscription price to stand a booth
 EventOrganizationICSLink=Link ICS for events
 ConferenceOrBoothInformation=Conference Or Booth informations
 Attendees = Attendees
+DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
 #
 # Status
 #
@@ -94,8 +98,46 @@ EvntOrgCancelled = Cancelled
 #
 # Public page
 #
+SuggestForm = Suggestion page
+RegisterPage = Page for conferences or booth
+EvntOrgRegistrationHelpMessage = Here, you can vote for an event, or suggest a new conference or booth for the project
+EvntOrgRegistrationConfHelpMessage = Here, you can suggest a new conference for the project
+EvntOrgRegistrationBoothHelpMessage = Here, you can suggest a new booth for the project
+ListOfSuggestedConferences = List of suggested conferences
+ListOfSuggestedBooths = List of suggested booths
+SuggestConference = Suggest a new conference
+SuggestBooth = Suggest a booth
+ViewAndVote = View and vote for suggested events
 PublicAttendeeSubscriptionPage = Public link of registration to a conference
 MissingOrBadSecureKey = The security key is invalid or missing
-EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
-EvntOrgStartDuration = This conference starts on
-EvntOrgEndDuration =  and ends on
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference : '%s'
+EvntOrgDuration = This conference starts on %s and ends on %s.
+ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
+BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
+EventType = Sündmuse tüüp
+
+#
+# Vote page
+#
+EvntOrgRegistrationWelcomeMessage = Welcome on the conference or booth suggestion page.
+EvntOrgRegistrationConfWelcomeMessage = Welcome on the conference suggestion page.
+EvntOrgRegistrationBoothWelcomeMessage = Welcome on the booth suggestion page.
+EvntOrgVoteHelpMessage = Here, you can view and vote for the suggested events for the project
+VoteOk = Your vote has been accepted.
+AlreadyVoted = You have already voted for this event.
+VoteError = An error has occurred during the vote, please try again.
+
+#
+# SubscriptionOk page
+#
+SubscriptionOk = Your subscription to this conference has been validated
+#
+# Subscription validation mail
+#
+ConfAttendeeSubscriptionConfirmation = Confirmation of your subscription to a conference
+#
+# Payment page
+#
+Attendee = Attendee
+PaymentConferenceAttendee = Conference attendee payment
+PaymentBoothLocation = Booth location payment
diff --git a/htdocs/langs/et_EE/hrm.lang b/htdocs/langs/et_EE/hrm.lang
index ea89f34be48..60645ab49c9 100644
--- a/htdocs/langs/et_EE/hrm.lang
+++ b/htdocs/langs/et_EE/hrm.lang
@@ -9,7 +9,7 @@ ConfirmDeleteEstablishment=Are you sure you wish to delete this establishment?
 OpenEtablishment=Open establishment
 CloseEtablishment=Close establishment
 # Dictionary
-DictionaryPublicHolidays=HRM - Public holidays
+DictionaryPublicHolidays=Leave - Public holidays
 DictionaryDepartment=HRM - Department list
 DictionaryFunction=HRM - Job positions
 # Module
diff --git a/htdocs/langs/et_EE/knowledgemanagement.lang b/htdocs/langs/et_EE/knowledgemanagement.lang
index 2ad488984cd..58dc10f64ca 100644
--- a/htdocs/langs/et_EE/knowledgemanagement.lang
+++ b/htdocs/langs/et_EE/knowledgemanagement.lang
@@ -47,7 +47,7 @@ KnowledgeManagementArea = Knowledge Management
 # Menu
 #
 MenuKnowledgeRecord = Knowledge base
-ListOfArticles = List of articles
+ListKnowledgeRecord = List of articles
 NewKnowledgeRecord = New article
 ValidateReply = Validate solution
 KnowledgeRecords = Articles
diff --git a/htdocs/langs/et_EE/languages.lang b/htdocs/langs/et_EE/languages.lang
index ef1fe82cda5..bd72d698aa0 100644
--- a/htdocs/langs/et_EE/languages.lang
+++ b/htdocs/langs/et_EE/languages.lang
@@ -3,6 +3,7 @@ Language_am_ET=Ethiopian
 Language_ar_AR=Araabia
 Language_ar_EG=Arabic (Egypt)
 Language_ar_SA=Araabia
+Language_ar_TN=Arabic (Tunisia)
 Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengali
 Language_bn_IN=Bengali (India)
@@ -84,6 +85,7 @@ Language_nl_NL=Dutch
 Language_pl_PL=Poola
 Language_pt_BR=Portugali (Brasiilia)
 Language_pt_PT=Portugali
+Language_ro_MD=Romanian (Moldavia)
 Language_ro_RO=Rumeenia
 Language_ru_RU=Vene
 Language_ru_UA=Vene (Ukraina)
diff --git a/htdocs/langs/et_EE/main.lang b/htdocs/langs/et_EE/main.lang
index 2f7fbb0902b..38109dfe094 100644
--- a/htdocs/langs/et_EE/main.lang
+++ b/htdocs/langs/et_EE/main.lang
@@ -430,6 +430,7 @@ LT1IN=CGST
 LT2IN=SGST
 LT1GC=Additionnal cents
 VATRate=Maksumäär
+RateOfTaxN=Rate of tax %s
 VATCode=Tax Rate code
 VATNPR=Tax Rate NPR
 DefaultTaxRate=Default tax rate
@@ -729,6 +730,7 @@ MenuMembers=Liikmed
 MenuAgendaGoogle=Google päevakava
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr piir (menüü Kodu->Seaded->Turvalisus): %s Kb, PHP piir: %s Kb
+ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
 NoFileFound=No documents uploaded
 CurrentUserLanguage=Aktiivne keel
 CurrentTheme=Aktiivne teema
@@ -1072,6 +1074,7 @@ ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
 ToClose=To close
+ToRefuse=To refuse
 ToProcess=Töödelda
 ToApprove=To approve
 GlobalOpenedElemView=Global view
@@ -1126,9 +1129,11 @@ UpdateForAllLines=Update for all lines
 OnHold=On hold
 Civility=Civility
 AffectTag=Affect Tag
+CreateExternalUser=Create external user
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
 ConfirmCancel=Are you sure you want to cancel
+EmailMsgID=Email MsgID
diff --git a/htdocs/langs/et_EE/members.lang b/htdocs/langs/et_EE/members.lang
index 0168761f010..a0d21e24e76 100644
--- a/htdocs/langs/et_EE/members.lang
+++ b/htdocs/langs/et_EE/members.lang
@@ -213,3 +213,5 @@ SendReminderForExpiredSubscription=Send reminder by email to members when subscr
 MembershipPaid=Membership paid for current period (until %s)
 YouMayFindYourInvoiceInThisEmail=You may find your invoice attached to this email
 XMembersClosed=%s member(s) closed
+XExternalUserCreated=%s external user(s) created
+ForceMemberNature=Force member nature (Individual or Corporation)
diff --git a/htdocs/langs/et_EE/modulebuilder.lang b/htdocs/langs/et_EE/modulebuilder.lang
index 9fdaa1a533a..23a098be2e5 100644
--- a/htdocs/langs/et_EE/modulebuilder.lang
+++ b/htdocs/langs/et_EE/modulebuilder.lang
@@ -143,3 +143,4 @@ AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
 ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
+ImportExportProfiles=Import and export profiles
diff --git a/htdocs/langs/et_EE/mrp.lang b/htdocs/langs/et_EE/mrp.lang
index ec999a473a4..c7146c45dfe 100644
--- a/htdocs/langs/et_EE/mrp.lang
+++ b/htdocs/langs/et_EE/mrp.lang
@@ -8,12 +8,12 @@ MenuBOM=Bills of material
 LatestBOMModified=Latest %s Bills of materials modified
 LatestMOModified=Latest %s Manufacturing Orders modified
 Bom=Bills of Material
-BillOfMaterials=Bill of Material
+BillOfMaterials=Bill of Materials
 BOMsSetup=Setup of module BOM
 ListOfBOMs=List of bills of material - BOM
 ListOfManufacturingOrders=List of Manufacturing Orders
-NewBOM=New bill of material
-ProductBOMHelp=Product to create with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
+NewBOM=New bill of materials
+ProductBOMHelp=Product to create (or disassemble) with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
 BOMsNumberingModules=BOM numbering templates
 BOMsModelModule=BOM document templates
 MOsNumberingModules=MO numbering templates
@@ -22,7 +22,7 @@ FreeLegalTextOnBOMs=Free text on document of BOM
 WatermarkOnDraftBOMs=Watermark on draft BOM
 FreeLegalTextOnMOs=Free text on document of MO
 WatermarkOnDraftMOs=Watermark on draft MO
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials %s ?
 ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
 ManufacturingEfficiency=Manufacturing efficiency
 ConsumptionEfficiency=Consumption efficiency
@@ -30,8 +30,8 @@ ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the produc
 ValueOfMeansLossForProductProduced=Value of 0.95 means an average of 5%% of loss of produced product
 DeleteBillOfMaterials=Delete Bill Of Materials
 DeleteMo=Delete Manufacturing Order
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Materials?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Materials?
 MenuMRP=Manufacturing Orders
 NewMO=New Manufacturing Order
 QtyToProduce=Qty to produce
@@ -39,7 +39,7 @@ DateStartPlannedMo=Date start planned
 DateEndPlannedMo=Date end planned
 KeepEmptyForAsap=Empty means 'As Soon As Possible'
 EstimatedDuration=Estimated duration
-EstimatedDurationDesc=Estimated duration to manufacture this product using this BOM
+EstimatedDurationDesc=Estimated duration to manufacture (or disassemble) this product using this BOM
 ConfirmValidateBom=Are you sure you want to validate the BOM with the reference <strong>%s</strong> (you will be able to use it to build new Manufacturing Orders)
 ConfirmCloseBom=Are you sure you want to cancel this BOM (you won't be able to use it to build new Manufacturing Orders anymore) ?
 ConfirmReopenBom=Are you sure you want to re-open this BOM (you will be able to use it to build new Manufacturing Orders)
@@ -63,13 +63,14 @@ ConsumeAndProduceAll=Consume and Produce All
 Manufactured=Manufactured
 TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
 ForAQuantityOf=For a quantity to produce of %s
+ForAQuantityToConsumeOf=For a quantity to disassemble of %s
 ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
 ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
 ProductionForRef=Production of %s
 AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
 NoStockChangeOnServices=No stock change on services
 ProductQtyToConsumeByMO=Product quantity still to consume by open MO
-ProductQtyToProduceByMO=Product quentity still to produce by open MO
+ProductQtyToProduceByMO=Product quantity still to produce by open MO
 AddNewConsumeLines=Add new line to consume
 ProductsToConsume=Products to consume
 ProductsToProduce=Products to produce
@@ -83,15 +84,13 @@ Workstations=Workstations
 WorkstationsDescription=Workstations management
 WorkstationSetup = Workstations setup
 WorkstationSetupPage = Workstations setup page
-WorkstationAbout = About Workstation
-WorkstationAboutPage = Workstations about page
 WorkstationList=Workstation list
 WorkstationCreate=Add new workstation
 ConfirmEnableWorkstation=Are you sure you want to enable workstation <b>%s</b> ?
 EnableAWorkstation=Enable a workstation
 ConfirmDisableWorkstation=Are you sure you want to disable workstation <b>%s</b> ?
 DisableAWorkstation=Disable a workstation
-DeleteWorkstation=Supprimer
+DeleteWorkstation=Kustuta
 NbOperatorsRequired=Number of operators required
 THMOperatorEstimated=Estimated operator THM
 THMMachineEstimated=Estimated machine THM
diff --git a/htdocs/langs/et_EE/orders.lang b/htdocs/langs/et_EE/orders.lang
index 9d6a928579c..fb795e40552 100644
--- a/htdocs/langs/et_EE/orders.lang
+++ b/htdocs/langs/et_EE/orders.lang
@@ -11,6 +11,7 @@ OrderDate=Telllimuse kuupäev
 OrderDateShort=Tellimuse kuupäev
 OrderToProcess=Töödeldav tellimus
 NewOrder=Uus tellimus
+NewSupplierOrderShort=Uus tellimus
 NewOrderSupplier=New Purchase Order
 ToOrder=Telli
 MakeOrder=Telli
@@ -73,6 +74,7 @@ DeleteOrder=Kustuta tellimus
 CancelOrder=Tühista tellimus
 OrderReopened= Order %s re-open
 AddOrder=Create order
+AddSupplierOrderShort=Create order
 AddPurchaseOrder=Create purchase order
 AddToDraftOrders=Lisa tellimuse mustandile
 ShowOrder=Näita tellimust
diff --git a/htdocs/langs/et_EE/other.lang b/htdocs/langs/et_EE/other.lang
index 8fa1b02ba3e..944d8c6a9ec 100644
--- a/htdocs/langs/et_EE/other.lang
+++ b/htdocs/langs/et_EE/other.lang
@@ -129,6 +129,7 @@ ClosedByLogin=User login who closed
 FileWasRemoved=Fail %s oli eemaldatud
 DirWasRemoved=Kaust %s oli eemaldatud
 FeatureNotYetAvailable=Feature not yet available in the current version
+FeatureNotAvailableOnDevicesWithoutMouse=Feature not available on devices without mouse
 FeaturesSupported=Supported features
 Width=Laius
 Height=Kõrgus
@@ -263,7 +264,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
-PrefixSession=Prefix for session ID
+SuffixSessionName=Suffix for session name
 
 ##### Export #####
 ExportsArea=Ekspordi ala
diff --git a/htdocs/langs/et_EE/partnership.lang b/htdocs/langs/et_EE/partnership.lang
index 8e932fb6449..102e95be13a 100644
--- a/htdocs/langs/et_EE/partnership.lang
+++ b/htdocs/langs/et_EE/partnership.lang
@@ -16,41 +16,72 @@
 #
 # Generic
 #
-ModulePartnershipName = Partnership management
-PartnershipDescription = Module Partnership management
+ModulePartnershipName=Partnership management
+PartnershipDescription=Module Partnership management
 PartnershipDescriptionLong= Module Partnership management
 
+AddPartnership=Add partnership
+CancelPartnershipForExpiredMembers=Partnership: Cancel partnership of members with expired subscriptions
+PartnershipCheckBacklink=Partnership: Check referring backlink
+
 #
 # Menu
 #
-NewPartnership = New Partnership
-ListOfPartnerships = List of partnership
+NewPartnership=New Partnership
+ListOfPartnerships=List of partnership
 
 #
 # Admin page
 #
-PartnershipSetup = Partnership setup
-PartnershipAbout = About Partnership
-PartnershipAboutPage = Partnership about page
-
+PartnershipSetup=Partnership setup
+PartnershipAbout=About Partnership
+PartnershipAboutPage=Partnership about page
+partnershipforthirdpartyormember=Partner status must be set on a 'thirdparty' or a 'member'
+PARTNERSHIP_IS_MANAGED_FOR=Partnership managed for
+PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks to check
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb of days before cancelling status of a partnership when a subscription has expired
+ReferingWebsiteCheck=Check of website referring
+ReferingWebsiteCheckDesc=You can enable a feature to check that your partners has added a backlink to your website domains on their own website.
 
 #
 # Object
 #
+DeletePartnership=Delete a partnership
+PartnershipDedicatedToThisThirdParty=Partnership dedicated to this third party
+PartnershipDedicatedToThisMember=Partnership dedicated to this member
 DatePartnershipStart=Alguskuupäev
 DatePartnershipEnd=Lõppkuupäev
+ReasonDecline=Decline reason
+ReasonDeclineOrCancel=Decline reason
+PartnershipAlreadyExist=Partnership already exist
+ManagePartnership=Manage partnership
+BacklinkNotFoundOnPartnerWebsite=Backlink not found on partner website
+ConfirmClosePartnershipAsk=Are you sure you want to cancel this partnership?
+PartnershipType=Partnership type
 
 #
 # Template Mail
 #
+SendingEmailOnPartnershipWillSoonBeCanceled=Partnership will soon be canceled
+SendingEmailOnPartnershipRefused=Partnership refused
+SendingEmailOnPartnershipAccepted=Partnership accepted
+SendingEmailOnPartnershipCanceled=Partnership canceled
 
+YourPartnershipWillSoonBeCanceledTopic=Partnership will soon be canceled
+YourPartnershipRefusedTopic=Partnership refused
+YourPartnershipAcceptedTopic=Partnership accepted
+YourPartnershipCanceledTopic=Partnership canceled
+
+YourPartnershipWillSoonBeCanceledContent=We inform you that your partnership will soon be canceled (Backlink not found)
+YourPartnershipRefusedContent=We inform you that your partnership request has been refused.
+YourPartnershipAcceptedContent=We inform you that your partnership request has been accepted.
+YourPartnershipCanceledContent=We inform you that your partnership has been canceled.
 
 #
 # Status
 #
-PartnershipDraft = Mustand
-PartnershipAccepted = Accepted
-PartnershipRefused = Keeldutud
-PartnershipCanceled = Tühistatud
-
+PartnershipDraft=Mustand
+PartnershipAccepted=Accepted
+PartnershipRefused=Keeldutud
+PartnershipCanceled=Tühistatud
 PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/et_EE/productbatch.lang b/htdocs/langs/et_EE/productbatch.lang
index c6e4fd4eee9..fc918eb815e 100644
--- a/htdocs/langs/et_EE/productbatch.lang
+++ b/htdocs/langs/et_EE/productbatch.lang
@@ -1,4 +1,4 @@
-# ProductBATCH language file - en_US - ProductBATCH
+# ProductBATCH language file - Source file is en_US - ProductBATCH
 ManageLotSerial=Use lot/serial number
 ProductStatusOnBatch=Yes (lot required)
 ProductStatusOnSerial=Yes (unique serial number required)
@@ -33,3 +33,13 @@ CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+LifeTime=Life span (in days)
+EndOfLife=End of life
+ManufacturingDate=Manufacturing date
+DestructionDate=Destruction date
+FirstUseDate=First use date
+QCFrequency=Quality control frequency (in days)
+
+#Traceability - qc status
+OutOfOrder=Out of order
+InWorkingOrder=In working order
diff --git a/htdocs/langs/et_EE/products.lang b/htdocs/langs/et_EE/products.lang
index cb10804e9aa..9e8e3e907ef 100644
--- a/htdocs/langs/et_EE/products.lang
+++ b/htdocs/langs/et_EE/products.lang
@@ -396,3 +396,5 @@ ActionAvailableOnVariantProductOnly=Action only available on the variant of prod
 ProductsPricePerCustomer=Product prices per customers
 ProductSupplierExtraFields=Additional Attributes (Supplier Prices)
 DeleteLinkedProduct=Delete the child product linked to the combination
+PMPValue=Kaalutud keskmine hind
+PMPValueShort=KKH
diff --git a/htdocs/langs/et_EE/projects.lang b/htdocs/langs/et_EE/projects.lang
index 4d222514a55..4557d1c9fe5 100644
--- a/htdocs/langs/et_EE/projects.lang
+++ b/htdocs/langs/et_EE/projects.lang
@@ -267,9 +267,11 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=Uus arve
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+OneLinePerTimeSpentLine=One line for each time spent declaration
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
 AddPersonToTask=Add also to tasks
 UsageOrganizeEvent=Usage: Event Organization
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
+SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
diff --git a/htdocs/langs/et_EE/receptions.lang b/htdocs/langs/et_EE/receptions.lang
index d04f499d1fe..ee11dcf6603 100644
--- a/htdocs/langs/et_EE/receptions.lang
+++ b/htdocs/langs/et_EE/receptions.lang
@@ -44,4 +44,4 @@ ValidateOrderFirstBeforeReception=You must first validate the order before being
 ReceptionsNumberingModules=Numbering module for receptions
 ReceptionsReceiptModel=Document templates for receptions
 NoMorePredefinedProductToDispatch=No more predefined products to dispatch
-
+ReceptionExist=A reception exists
diff --git a/htdocs/langs/et_EE/stocks.lang b/htdocs/langs/et_EE/stocks.lang
index 51a1fe08e26..a0332bcd8f8 100644
--- a/htdocs/langs/et_EE/stocks.lang
+++ b/htdocs/langs/et_EE/stocks.lang
@@ -56,8 +56,6 @@ UnitPurchaseValue=Ühiku ostuhind
 StockTooLow=Laojääk on liiga madal
 StockLowerThanLimit=Stock lower than alert limit (%s)
 EnhancedValue=Väärtus
-PMPValue=Kaalutud keskmine hind
-PMPValueShort=KKH
 EnhancedValueOfWarehouses=Ladude väärtus
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
@@ -251,7 +249,10 @@ SelectAStockMovementFileToImport=select a stock movement file to import
 InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
 LabelOfInventoryMovemement=Inventory %s
 ReOpen=Reopen
-ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock to the real qty you entered into the inventory.
 ObjectNotFound=%s not found
 MakeMovementsAndClose=Generate movements and close
 AutofillWithExpected=Fill real quantity with expected quantity
+ShowAllBatchByDefault=By default, show batch details on product "stock" tab
+CollapseBatchDetailHelp=You can set batch detail default display in stocks module configuration
+FieldCannotBeNegative=Field "%s" cannot be negative
diff --git a/htdocs/langs/et_EE/ticket.lang b/htdocs/langs/et_EE/ticket.lang
index 6d1f9cfe586..d2750a58d9d 100644
--- a/htdocs/langs/et_EE/ticket.lang
+++ b/htdocs/langs/et_EE/ticket.lang
@@ -304,7 +304,7 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
-BoxTicketType=Number of open tickets by type
+BoxTicketType=Distribution of open tickets by type
 BoxTicketSeverity=Number of open tickets by severity
 BoxNoTicketSeverity=No tickets opened
 BoxTicketLastXDays=Number of new tickets by days the last %s days
diff --git a/htdocs/langs/eu_ES/accountancy.lang b/htdocs/langs/eu_ES/accountancy.lang
index 354cddb62c2..27be673dd9c 100644
--- a/htdocs/langs/eu_ES/accountancy.lang
+++ b/htdocs/langs/eu_ES/accountancy.lang
@@ -158,7 +158,7 @@ ACCOUNTING_LENGTH_AACCOUNT=Length of the third-party accounting accounts (If you
 ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of an accounting account. Needed by some countries (like Switzerland). If set to off (default), you can set the following two parameters to ask the application to add virtual zeros.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties, break ability to search on a part of value)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
@@ -328,6 +328,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountanc
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
+NotifiedExportDate=Notified export date (modification of the entries will not be possible)
+NotifiedValidationDate=Validation of the entries (modification or deletion of the entries will not be possible)
+ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=Export draft journal
 Modelcsv=Model of export
 Selectmodelcsv=Select a model of export
diff --git a/htdocs/langs/eu_ES/admin.lang b/htdocs/langs/eu_ES/admin.lang
index 8efd4589d74..997c5d55f17 100644
--- a/htdocs/langs/eu_ES/admin.lang
+++ b/htdocs/langs/eu_ES/admin.lang
@@ -221,8 +221,8 @@ NotCompatible=This module does not seem compatible with your Dolibarr %s (Min %s
 CompatibleAfterUpdate=This module requires an update to your Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=See in Market place
 SeeSetupOfModule=See setup of module %s
+SetOptionTo=Set option <b>%s</b> to %s
 Updated=Updated
-Nouveauté=Novelty
 AchatTelechargement=Buy / Download
 GoModuleSetupArea=To deploy/install a new module, go to the Module setup area: <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
@@ -399,6 +399,7 @@ SecurityToken=Key to secure URLs
 NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
 PDF=PDF
 PDFDesc=Global options for PDF generation
+PDFOtherDesc=PDF Option specific to some modules
 PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
 PDFRulesForSalesTax=Rules for Sales Tax / VAT
@@ -561,7 +562,7 @@ Module53Desc=Management of Services
 Module54Name=Contracts/Subscriptions
 Module54Desc=Management of contracts (services or recurring subscriptions)
 Module55Name=Barra-kodeak
-Module55Desc=Barra-kodeak kudeatzea
+Module55Desc=Barcode or QR code management
 Module56Name=Payment by credit transfer
 Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
 Module57Name=Payments by Direct Debit
@@ -848,10 +849,10 @@ Permission402=Create/modify discounts
 Permission403=Validate discounts
 Permission404=Delete discounts
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries (yours and subordinates)
-Permission512=Create/modify payments of salaries
-Permission514=Delete payments of salaries
-Permission517=Read payments of salaries of everybody
+Permission511=Read salaries and payments (yours and subordinates)
+Permission512=Create/modify salaries and payments
+Permission514=Delete salaries and payments
+Permission517=Read salaries and payments everybody
 Permission519=Export salaries
 Permission520=Read Loans
 Permission522=Create/modify loans
@@ -965,6 +966,8 @@ Permission23003=Delete Scheduled job
 Permission23004=Execute Scheduled job
 Permission50101=Use Point of Sale (SimplePOS)
 Permission50151=Use Point of Sale (TakePOS)
+Permission50152=Edit sales lines
+Permission50153=Edit ordered sales lines
 Permission50201=Read transactions
 Permission50202=Import transactions
 Permission50330=Read objects of Zapier
@@ -1039,11 +1042,12 @@ DictionaryMeasuringUnits=Measuring Units
 DictionarySocialNetworks=Social Networks
 DictionaryProspectStatus=Prospect status for companies
 DictionaryProspectContactStatus=Prospect status for contacts
-DictionaryHolidayTypes=Types of leave
+DictionaryHolidayTypes=Leave - Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
 DictionaryTransportMode=Intracomm report - Transport mode
+DictionaryBatchStatus=Product lot/serial Quality Control status
 TypeOfUnit=Type of unit
 SetupSaved=Setup saved
 SetupNotSaved=Setup not saved
@@ -1187,7 +1191,7 @@ SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of m
 SetupDescription5=Other Setup menu entries manage optional parameters.
 AuditedSecurityEvents=Security events that are audited
 NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
-Audit=Audit
+Audit=Security events
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
 InfoOS=About OS
@@ -1319,9 +1323,12 @@ ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
 NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
+ComboListOptim=Combo list loading optimization
 SearchOptim=Search optimization
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
-YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
+YouHaveXObjectUseComboOptim=You have %s %s in the database. You can go into setup of module to enable loading of combo list on key pressed event.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other.
+YouHaveXObjectUseSearchOptimDesc=This limits the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to %s in Home-Setup-Other.
 BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
 BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
 PHPModuleLoaded=PHP component %s is loaded
@@ -1433,6 +1440,7 @@ MemberMainOptions=Aukera nagusiak
 AdherentLoginRequired= Kide bakoitzarentzat Sarrera bat kudeatu
 AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
+MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
 MembersDocModules=Document templates for documents generated from member record
@@ -1763,7 +1771,7 @@ AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting men
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
-AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the scheduled job %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
@@ -1979,6 +1987,8 @@ 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_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add picture on proposal line
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add electronic sign in PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
@@ -2096,7 +2106,6 @@ PDF_SHOW_PROJECT=Show project on document
 ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
-FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
@@ -2120,12 +2129,18 @@ ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by
 MailToSendEventOrganization=Event Organization
 AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
 YouShouldDisablePHPFunctions=You should disable PHP functions
-IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands in custom code, you shoud disable PHP functions
+PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
+NotRecommended=Not recommanded
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
 ModuleUpdateAvailable=An update is available
 NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
+RandomlySelectedIfSeveral=Randomly selected if several pictures are available
+DatabasePasswordObfuscated=Database password is obfuscated in conf file
+DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
diff --git a/htdocs/langs/eu_ES/agenda.lang b/htdocs/langs/eu_ES/agenda.lang
index 74d5dec55a8..c813b3e8f34 100644
--- a/htdocs/langs/eu_ES/agenda.lang
+++ b/htdocs/langs/eu_ES/agenda.lang
@@ -4,7 +4,7 @@ Actions=Gertaerak
 Agenda=Agenda
 TMenuAgenda=Agenda
 Agendas=Agendak
-LocalAgenda=Internal calendar
+LocalAgenda=Default calendar
 ActionsOwnedBy=Event owned by
 ActionsOwnedByShort=Owner
 AffectedTo=Assigned to
@@ -14,13 +14,13 @@ EventsNb=Gertaera kopurua
 ListOfActions=Gertaeren zerrenda
 EventReports=Event reports
 Location=Kokapena
-ToUserOfGroup=Event assigned to any user in group
+ToUserOfGroup=Event assigned to any user in the group
 EventOnFullDay=Event on all day(s)
 MenuToDoActions=All incomplete events
 MenuDoneActions=All terminated events
 MenuToDoMyActions=My incomplete events
 MenuDoneMyActions=My terminated events
-ListOfEvents=List of events (internal calendar)
+ListOfEvents=List of events (default calendar)
 ActionsAskedBy=Events reported by
 ActionsToDoBy=Events assigned to
 ActionsDoneBy=Events done by
@@ -38,6 +38,7 @@ ActionsEvents=Events for which Dolibarr will create an action in agenda automati
 EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Third party %s created
+COMPANY_MODIFYInDolibarr=Third party %s modified
 COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=Contract %s validated
 CONTRACT_DELETEInDolibarr=Contract %s deleted
@@ -87,6 +88,7 @@ OrderDeleted=Order deleted
 InvoiceDeleted=Invoice deleted
 DraftInvoiceDeleted=Draft invoice deleted
 CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_MODIFYInDolibarr=Contact %s modified
 CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Product %s created
 PRODUCT_MODIFYInDolibarr=Product %s modified
@@ -119,6 +121,7 @@ MRP_MO_UNVALIDATEInDolibarr=MO set to draft status
 MRP_MO_PRODUCEDInDolibarr=MO produced
 MRP_MO_DELETEInDolibarr=MO deleted
 MRP_MO_CANCELInDolibarr=MO canceled
+PAIDInDolibarr=%s paid
 ##### End agenda events #####
 AgendaModelModule=Document templates for event
 DateActionStart=Start date
@@ -130,7 +133,7 @@ AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to use
 AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
 AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic events.
 AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> to include events of holidays.
-AgendaShowBirthdayEvents=Show birthdays of contacts
+AgendaShowBirthdayEvents=Birthdays of contacts
 AgendaHideBirthdayEvents=Hide birthdays of contacts
 Busy=Busy
 ExportDataset_event1=List of agenda events
@@ -152,6 +155,7 @@ ActionType=Event type
 DateActionBegin=Start event date
 ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b>?
 RepeatEvent=Repeat event
+OnceOnly=Once only
 EveryWeek=Every week
 EveryMonth=Every month
 DayOfMonth=Day of month
@@ -165,4 +169,4 @@ TimeType=Duration type
 ReminderType=Callback type
 AddReminder=Create an automatic reminder notification for this event
 ErrorReminderActionCommCreation=Error creating the reminder notification for this event
-BrowserPush=Browser Notification
+BrowserPush=Browser Popup Notification
diff --git a/htdocs/langs/eu_ES/bills.lang b/htdocs/langs/eu_ES/bills.lang
index d82411ce066..bfa74619ec8 100644
--- a/htdocs/langs/eu_ES/bills.lang
+++ b/htdocs/langs/eu_ES/bills.lang
@@ -259,6 +259,7 @@ DateMaxPayment=Payment due on
 DateInvoice=Invoice date
 DatePointOfTax=Point of tax
 NoInvoice=No invoice
+NoOpenInvoice=No open invoice
 ClassifyBill=Classify invoice
 SupplierBillsToPay=Unpaid vendor invoices
 CustomerBillsUnpaid=Unpaid customer invoices
@@ -589,3 +590,4 @@ FacParentLine=Invoice Line Parent
 SituationTotalRayToRest=Remainder to pay without taxe
 PDFSituationTitle=Situation n° %d
 SituationTotalProgress=Total progress %d %%
+SearchUnpaidInvoicesWithDueDate=Search unpaid invoices with a due date = %s
diff --git a/htdocs/langs/eu_ES/cashdesk.lang b/htdocs/langs/eu_ES/cashdesk.lang
index 934753b0f69..d44d0f51a27 100644
--- a/htdocs/langs/eu_ES/cashdesk.lang
+++ b/htdocs/langs/eu_ES/cashdesk.lang
@@ -102,7 +102,7 @@ CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal numb
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
 SaleStartedAt=Sale started at %s
-ControlCashOpening=Control cash popup at opening POS
+ControlCashOpening=Open the "Control cash" popup when opening the POS
 CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -126,5 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
-ShowPriceHT = Display the price excluding tax column
-ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
+ShowPriceHT = Display the column with the price excluding tax (on screen)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
diff --git a/htdocs/langs/eu_ES/compta.lang b/htdocs/langs/eu_ES/compta.lang
index 5e4891d5aea..8a7acb87448 100644
--- a/htdocs/langs/eu_ES/compta.lang
+++ b/htdocs/langs/eu_ES/compta.lang
@@ -286,3 +286,9 @@ ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
 IncludeLoansInResults = Include loans in reports
+InvoiceLate30Days = Invoices late > 30 days
+InvoiceLate15Days = Invoices late > 15 days
+InvoiceLateMinus15Days = Invoices late
+InvoiceNotLate = To be collected < 15 days
+InvoiceNotLate15Days = To be collected in 15 days
+InvoiceNotLate30Days = To be collected in 30 days
diff --git a/htdocs/langs/eu_ES/cron.lang b/htdocs/langs/eu_ES/cron.lang
index 2ebdda1e685..4fd2220dea6 100644
--- a/htdocs/langs/eu_ES/cron.lang
+++ b/htdocs/langs/eu_ES/cron.lang
@@ -60,7 +60,7 @@ CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
 CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Disable
-CronTaskInactive=This job is disabled
+CronTaskInactive=This job is disabled (not scheduled)
 CronId=Id
 CronClassFile=Filename with class
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example 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>
diff --git a/htdocs/langs/eu_ES/errors.lang b/htdocs/langs/eu_ES/errors.lang
index 9b14b5ad1d2..670f8c7a6bc 100644
--- a/htdocs/langs/eu_ES/errors.lang
+++ b/htdocs/langs/eu_ES/errors.lang
@@ -11,6 +11,7 @@ ErrorBadValueForParamNotAString=Bad value for your parameter. It appends general
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s already exists.
 ErrorGroupAlreadyExists=Group %s already exists.
+ErrorEmailAlreadyExists=Email %s already exists.
 ErrorRecordNotFound=Record not found.
 ErrorFailToCopyFile=Failed to copy file '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
@@ -117,7 +118,7 @@ ErrorCantReadFile=Failed to read file '%s'
 ErrorCantReadDir=Failed to read directory '%s'
 ErrorBadLoginPassword=Bad value for login or password
 ErrorLoginDisabled=Your account has been disabled
-ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server. If PHP <b>Safe Mode</b> is enabled, check that command is inside a directory defined by parameter <b>safe_mode_exec_dir</b>.
+ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server user. Check also the command is not protected on shell level by a security layer like apparmor.
 ErrorFailedToChangePassword=Failed to change password
 ErrorLoginDoesNotExists=User with login <b>%s</b> could not be found.
 ErrorLoginHasNoEmail=This user has no email address. Process aborted.
@@ -262,6 +263,7 @@ ErrorDateIsInFuture=Error, the date can't be in the future
 ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
 ErrorAPercentIsRequired=Error, please fill in the percentage correctly
 ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
+ErrorFailedToFindEmailTemplate=Failed to find template with code name %s
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -298,3 +300,4 @@ WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So y
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
+ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
diff --git a/htdocs/langs/eu_ES/eventorganization.lang b/htdocs/langs/eu_ES/eventorganization.lang
index 75b798fbc3a..335c257b224 100644
--- a/htdocs/langs/eu_ES/eventorganization.lang
+++ b/htdocs/langs/eu_ES/eventorganization.lang
@@ -1,4 +1,5 @@
 # Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+# Copyright (C) 2021		Dorian Vabre			<dorian.vabre@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
@@ -81,7 +82,10 @@ PriceOfBoothHelp=Subscription price to stand a booth
 EventOrganizationICSLink=Link ICS for events
 ConferenceOrBoothInformation=Conference Or Booth informations
 Attendees = Attendees
+DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
 #
 # Status
 #
@@ -94,8 +98,46 @@ EvntOrgCancelled = Cancelled
 #
 # Public page
 #
+SuggestForm = Suggestion page
+RegisterPage = Page for conferences or booth
+EvntOrgRegistrationHelpMessage = Here, you can vote for an event, or suggest a new conference or booth for the project
+EvntOrgRegistrationConfHelpMessage = Here, you can suggest a new conference for the project
+EvntOrgRegistrationBoothHelpMessage = Here, you can suggest a new booth for the project
+ListOfSuggestedConferences = List of suggested conferences
+ListOfSuggestedBooths = List of suggested booths
+SuggestConference = Suggest a new conference
+SuggestBooth = Suggest a booth
+ViewAndVote = View and vote for suggested events
 PublicAttendeeSubscriptionPage = Public link of registration to a conference
 MissingOrBadSecureKey = The security key is invalid or missing
-EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
-EvntOrgStartDuration = This conference starts on
-EvntOrgEndDuration =  and ends on
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference : '%s'
+EvntOrgDuration = This conference starts on %s and ends on %s.
+ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
+BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
+EventType = Event type
+
+#
+# Vote page
+#
+EvntOrgRegistrationWelcomeMessage = Welcome on the conference or booth suggestion page.
+EvntOrgRegistrationConfWelcomeMessage = Welcome on the conference suggestion page.
+EvntOrgRegistrationBoothWelcomeMessage = Welcome on the booth suggestion page.
+EvntOrgVoteHelpMessage = Here, you can view and vote for the suggested events for the project
+VoteOk = Your vote has been accepted.
+AlreadyVoted = You have already voted for this event.
+VoteError = An error has occurred during the vote, please try again.
+
+#
+# SubscriptionOk page
+#
+SubscriptionOk = Your subscription to this conference has been validated
+#
+# Subscription validation mail
+#
+ConfAttendeeSubscriptionConfirmation = Confirmation of your subscription to a conference
+#
+# Payment page
+#
+Attendee = Attendee
+PaymentConferenceAttendee = Conference attendee payment
+PaymentBoothLocation = Booth location payment
diff --git a/htdocs/langs/eu_ES/hrm.lang b/htdocs/langs/eu_ES/hrm.lang
index 97a33211e6f..bbd55cb4ee4 100644
--- a/htdocs/langs/eu_ES/hrm.lang
+++ b/htdocs/langs/eu_ES/hrm.lang
@@ -9,7 +9,7 @@ ConfirmDeleteEstablishment=Are you sure you wish to delete this establishment?
 OpenEtablishment=Open establishment
 CloseEtablishment=Close establishment
 # Dictionary
-DictionaryPublicHolidays=HRM - Public holidays
+DictionaryPublicHolidays=Leave - Public holidays
 DictionaryDepartment=HRM - Department list
 DictionaryFunction=HRM - Job positions
 # Module
diff --git a/htdocs/langs/eu_ES/knowledgemanagement.lang b/htdocs/langs/eu_ES/knowledgemanagement.lang
index 269007e60f8..68f5cced76c 100644
--- a/htdocs/langs/eu_ES/knowledgemanagement.lang
+++ b/htdocs/langs/eu_ES/knowledgemanagement.lang
@@ -47,7 +47,7 @@ KnowledgeManagementArea = Knowledge Management
 # Menu
 #
 MenuKnowledgeRecord = Knowledge base
-ListOfArticles = List of articles
+ListKnowledgeRecord = List of articles
 NewKnowledgeRecord = New article
 ValidateReply = Validate solution
 KnowledgeRecords = Articles
diff --git a/htdocs/langs/eu_ES/languages.lang b/htdocs/langs/eu_ES/languages.lang
index 2717b18e96e..a52eb70b1fc 100644
--- a/htdocs/langs/eu_ES/languages.lang
+++ b/htdocs/langs/eu_ES/languages.lang
@@ -3,6 +3,7 @@ Language_am_ET=Ethiopian
 Language_ar_AR=Arabic
 Language_ar_EG=Arabic (Egypt)
 Language_ar_SA=Arabic
+Language_ar_TN=Arabic (Tunisia)
 Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengali
 Language_bn_IN=Bengali (India)
@@ -84,6 +85,7 @@ Language_nl_NL=Dutch
 Language_pl_PL=Polish
 Language_pt_BR=Portuguese (Brazil)
 Language_pt_PT=Portuguese
+Language_ro_MD=Romanian (Moldavia)
 Language_ro_RO=Romanian
 Language_ru_RU=Russian
 Language_ru_UA=Russian (Ukraine)
diff --git a/htdocs/langs/eu_ES/main.lang b/htdocs/langs/eu_ES/main.lang
index cd91c1318f8..166b79e414c 100644
--- a/htdocs/langs/eu_ES/main.lang
+++ b/htdocs/langs/eu_ES/main.lang
@@ -430,6 +430,7 @@ LT1IN=CGST
 LT2IN=SGST
 LT1GC=Additionnal cents
 VATRate=Tax Rate
+RateOfTaxN=Rate of tax %s
 VATCode=Tax Rate code
 VATNPR=Tax Rate NPR
 DefaultTaxRate=Default tax rate
@@ -729,6 +730,7 @@ MenuMembers=Kideak
 MenuAgendaGoogle=Google agenda
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
+ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
 NoFileFound=No documents uploaded
 CurrentUserLanguage=Current language
 CurrentTheme=Current theme
@@ -1072,6 +1074,7 @@ ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
 ToClose=To close
+ToRefuse=To refuse
 ToProcess=To process
 ToApprove=To approve
 GlobalOpenedElemView=Global view
@@ -1126,9 +1129,11 @@ UpdateForAllLines=Update for all lines
 OnHold=On hold
 Civility=Civility
 AffectTag=Affect Tag
+CreateExternalUser=Create external user
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
 ConfirmCancel=Are you sure you want to cancel
+EmailMsgID=Email MsgID
diff --git a/htdocs/langs/eu_ES/members.lang b/htdocs/langs/eu_ES/members.lang
index 823645abd57..270587b6f98 100644
--- a/htdocs/langs/eu_ES/members.lang
+++ b/htdocs/langs/eu_ES/members.lang
@@ -213,3 +213,5 @@ SendReminderForExpiredSubscription=Send reminder by email to members when subscr
 MembershipPaid=Membership paid for current period (until %s)
 YouMayFindYourInvoiceInThisEmail=You may find your invoice attached to this email
 XMembersClosed=%s member(s) closed
+XExternalUserCreated=%s external user(s) created
+ForceMemberNature=Force member nature (Individual or Corporation)
diff --git a/htdocs/langs/eu_ES/modulebuilder.lang b/htdocs/langs/eu_ES/modulebuilder.lang
index 9fdaa1a533a..23a098be2e5 100644
--- a/htdocs/langs/eu_ES/modulebuilder.lang
+++ b/htdocs/langs/eu_ES/modulebuilder.lang
@@ -143,3 +143,4 @@ AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
 ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
+ImportExportProfiles=Import and export profiles
diff --git a/htdocs/langs/eu_ES/mrp.lang b/htdocs/langs/eu_ES/mrp.lang
index ec999a473a4..acf5a23db9b 100644
--- a/htdocs/langs/eu_ES/mrp.lang
+++ b/htdocs/langs/eu_ES/mrp.lang
@@ -8,12 +8,12 @@ MenuBOM=Bills of material
 LatestBOMModified=Latest %s Bills of materials modified
 LatestMOModified=Latest %s Manufacturing Orders modified
 Bom=Bills of Material
-BillOfMaterials=Bill of Material
+BillOfMaterials=Bill of Materials
 BOMsSetup=Setup of module BOM
 ListOfBOMs=List of bills of material - BOM
 ListOfManufacturingOrders=List of Manufacturing Orders
-NewBOM=New bill of material
-ProductBOMHelp=Product to create with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
+NewBOM=New bill of materials
+ProductBOMHelp=Product to create (or disassemble) with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
 BOMsNumberingModules=BOM numbering templates
 BOMsModelModule=BOM document templates
 MOsNumberingModules=MO numbering templates
@@ -22,7 +22,7 @@ FreeLegalTextOnBOMs=Free text on document of BOM
 WatermarkOnDraftBOMs=Watermark on draft BOM
 FreeLegalTextOnMOs=Free text on document of MO
 WatermarkOnDraftMOs=Watermark on draft MO
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials %s ?
 ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
 ManufacturingEfficiency=Manufacturing efficiency
 ConsumptionEfficiency=Consumption efficiency
@@ -30,8 +30,8 @@ ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the produc
 ValueOfMeansLossForProductProduced=Value of 0.95 means an average of 5%% of loss of produced product
 DeleteBillOfMaterials=Delete Bill Of Materials
 DeleteMo=Delete Manufacturing Order
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Materials?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Materials?
 MenuMRP=Manufacturing Orders
 NewMO=New Manufacturing Order
 QtyToProduce=Qty to produce
@@ -39,7 +39,7 @@ DateStartPlannedMo=Date start planned
 DateEndPlannedMo=Date end planned
 KeepEmptyForAsap=Empty means 'As Soon As Possible'
 EstimatedDuration=Estimated duration
-EstimatedDurationDesc=Estimated duration to manufacture this product using this BOM
+EstimatedDurationDesc=Estimated duration to manufacture (or disassemble) this product using this BOM
 ConfirmValidateBom=Are you sure you want to validate the BOM with the reference <strong>%s</strong> (you will be able to use it to build new Manufacturing Orders)
 ConfirmCloseBom=Are you sure you want to cancel this BOM (you won't be able to use it to build new Manufacturing Orders anymore) ?
 ConfirmReopenBom=Are you sure you want to re-open this BOM (you will be able to use it to build new Manufacturing Orders)
@@ -63,13 +63,14 @@ ConsumeAndProduceAll=Consume and Produce All
 Manufactured=Manufactured
 TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
 ForAQuantityOf=For a quantity to produce of %s
+ForAQuantityToConsumeOf=For a quantity to disassemble of %s
 ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
 ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
 ProductionForRef=Production of %s
 AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
 NoStockChangeOnServices=No stock change on services
 ProductQtyToConsumeByMO=Product quantity still to consume by open MO
-ProductQtyToProduceByMO=Product quentity still to produce by open MO
+ProductQtyToProduceByMO=Product quantity still to produce by open MO
 AddNewConsumeLines=Add new line to consume
 ProductsToConsume=Products to consume
 ProductsToProduce=Products to produce
@@ -83,15 +84,13 @@ Workstations=Workstations
 WorkstationsDescription=Workstations management
 WorkstationSetup = Workstations setup
 WorkstationSetupPage = Workstations setup page
-WorkstationAbout = About Workstation
-WorkstationAboutPage = Workstations about page
 WorkstationList=Workstation list
 WorkstationCreate=Add new workstation
 ConfirmEnableWorkstation=Are you sure you want to enable workstation <b>%s</b> ?
 EnableAWorkstation=Enable a workstation
 ConfirmDisableWorkstation=Are you sure you want to disable workstation <b>%s</b> ?
 DisableAWorkstation=Disable a workstation
-DeleteWorkstation=Supprimer
+DeleteWorkstation=Ezabatu
 NbOperatorsRequired=Number of operators required
 THMOperatorEstimated=Estimated operator THM
 THMMachineEstimated=Estimated machine THM
diff --git a/htdocs/langs/eu_ES/orders.lang b/htdocs/langs/eu_ES/orders.lang
index 8ccc334ca9d..cd69c64a454 100644
--- a/htdocs/langs/eu_ES/orders.lang
+++ b/htdocs/langs/eu_ES/orders.lang
@@ -11,6 +11,7 @@ OrderDate=Order date
 OrderDateShort=Order date
 OrderToProcess=Order to process
 NewOrder=New order
+NewSupplierOrderShort=New order
 NewOrderSupplier=New Purchase Order
 ToOrder=Make order
 MakeOrder=Make order
@@ -73,6 +74,7 @@ DeleteOrder=Delete order
 CancelOrder=Cancel order
 OrderReopened= Order %s re-open
 AddOrder=Create order
+AddSupplierOrderShort=Create order
 AddPurchaseOrder=Create purchase order
 AddToDraftOrders=Add to draft order
 ShowOrder=Show order
diff --git a/htdocs/langs/eu_ES/other.lang b/htdocs/langs/eu_ES/other.lang
index eb9d25ffc25..986e04eac8d 100644
--- a/htdocs/langs/eu_ES/other.lang
+++ b/htdocs/langs/eu_ES/other.lang
@@ -129,6 +129,7 @@ ClosedByLogin=User login who closed
 FileWasRemoved=File %s was removed
 DirWasRemoved=Directory %s was removed
 FeatureNotYetAvailable=Feature not yet available in the current version
+FeatureNotAvailableOnDevicesWithoutMouse=Feature not available on devices without mouse
 FeaturesSupported=Supported features
 Width=Width
 Height=Height
@@ -263,7 +264,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
-PrefixSession=Prefix for session ID
+SuffixSessionName=Suffix for session name
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/eu_ES/partnership.lang b/htdocs/langs/eu_ES/partnership.lang
index 09059995a8d..2fb10e8159e 100644
--- a/htdocs/langs/eu_ES/partnership.lang
+++ b/htdocs/langs/eu_ES/partnership.lang
@@ -16,41 +16,72 @@
 #
 # Generic
 #
-ModulePartnershipName = Partnership management
-PartnershipDescription = Module Partnership management
+ModulePartnershipName=Partnership management
+PartnershipDescription=Module Partnership management
 PartnershipDescriptionLong= Module Partnership management
 
+AddPartnership=Add partnership
+CancelPartnershipForExpiredMembers=Partnership: Cancel partnership of members with expired subscriptions
+PartnershipCheckBacklink=Partnership: Check referring backlink
+
 #
 # Menu
 #
-NewPartnership = New Partnership
-ListOfPartnerships = List of partnership
+NewPartnership=New Partnership
+ListOfPartnerships=List of partnership
 
 #
 # Admin page
 #
-PartnershipSetup = Partnership setup
-PartnershipAbout = About Partnership
-PartnershipAboutPage = Partnership about page
-
+PartnershipSetup=Partnership setup
+PartnershipAbout=About Partnership
+PartnershipAboutPage=Partnership about page
+partnershipforthirdpartyormember=Partner status must be set on a 'thirdparty' or a 'member'
+PARTNERSHIP_IS_MANAGED_FOR=Partnership managed for
+PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks to check
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb of days before cancelling status of a partnership when a subscription has expired
+ReferingWebsiteCheck=Check of website referring
+ReferingWebsiteCheckDesc=You can enable a feature to check that your partners has added a backlink to your website domains on their own website.
 
 #
 # Object
 #
+DeletePartnership=Delete a partnership
+PartnershipDedicatedToThisThirdParty=Partnership dedicated to this third party
+PartnershipDedicatedToThisMember=Partnership dedicated to this member
 DatePartnershipStart=Start date
 DatePartnershipEnd=End date
+ReasonDecline=Decline reason
+ReasonDeclineOrCancel=Decline reason
+PartnershipAlreadyExist=Partnership already exist
+ManagePartnership=Manage partnership
+BacklinkNotFoundOnPartnerWebsite=Backlink not found on partner website
+ConfirmClosePartnershipAsk=Are you sure you want to cancel this partnership?
+PartnershipType=Partnership type
 
 #
 # Template Mail
 #
+SendingEmailOnPartnershipWillSoonBeCanceled=Partnership will soon be canceled
+SendingEmailOnPartnershipRefused=Partnership refused
+SendingEmailOnPartnershipAccepted=Partnership accepted
+SendingEmailOnPartnershipCanceled=Partnership canceled
 
+YourPartnershipWillSoonBeCanceledTopic=Partnership will soon be canceled
+YourPartnershipRefusedTopic=Partnership refused
+YourPartnershipAcceptedTopic=Partnership accepted
+YourPartnershipCanceledTopic=Partnership canceled
+
+YourPartnershipWillSoonBeCanceledContent=We inform you that your partnership will soon be canceled (Backlink not found)
+YourPartnershipRefusedContent=We inform you that your partnership request has been refused.
+YourPartnershipAcceptedContent=We inform you that your partnership request has been accepted.
+YourPartnershipCanceledContent=We inform you that your partnership has been canceled.
 
 #
 # Status
 #
-PartnershipDraft = Draft
-PartnershipAccepted = Accepted
-PartnershipRefused = Refused
-PartnershipCanceled = Canceled
-
+PartnershipDraft=Draft
+PartnershipAccepted=Accepted
+PartnershipRefused=Refused
+PartnershipCanceled=Canceled
 PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/eu_ES/productbatch.lang b/htdocs/langs/eu_ES/productbatch.lang
index c474b98db75..1c7a90fb6a0 100644
--- a/htdocs/langs/eu_ES/productbatch.lang
+++ b/htdocs/langs/eu_ES/productbatch.lang
@@ -1,4 +1,4 @@
-# ProductBATCH language file - en_US - ProductBATCH
+# ProductBATCH language file - Source file is en_US - ProductBATCH
 ManageLotSerial=Use lot/serial number
 ProductStatusOnBatch=Yes (lot required)
 ProductStatusOnSerial=Yes (unique serial number required)
@@ -33,3 +33,13 @@ CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+LifeTime=Life span (in days)
+EndOfLife=End of life
+ManufacturingDate=Manufacturing date
+DestructionDate=Destruction date
+FirstUseDate=First use date
+QCFrequency=Quality control frequency (in days)
+
+#Traceability - qc status
+OutOfOrder=Out of order
+InWorkingOrder=In working order
diff --git a/htdocs/langs/eu_ES/products.lang b/htdocs/langs/eu_ES/products.lang
index af5fe0436a5..5b433015be3 100644
--- a/htdocs/langs/eu_ES/products.lang
+++ b/htdocs/langs/eu_ES/products.lang
@@ -396,3 +396,5 @@ ActionAvailableOnVariantProductOnly=Action only available on the variant of prod
 ProductsPricePerCustomer=Product prices per customers
 ProductSupplierExtraFields=Additional Attributes (Supplier Prices)
 DeleteLinkedProduct=Delete the child product linked to the combination
+PMPValue=Weighted average price
+PMPValueShort=WAP
diff --git a/htdocs/langs/eu_ES/projects.lang b/htdocs/langs/eu_ES/projects.lang
index 189df5d6821..613a9c5cc01 100644
--- a/htdocs/langs/eu_ES/projects.lang
+++ b/htdocs/langs/eu_ES/projects.lang
@@ -267,9 +267,11 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=New invoice
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+OneLinePerTimeSpentLine=One line for each time spent declaration
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
 AddPersonToTask=Add also to tasks
 UsageOrganizeEvent=Usage: Event Organization
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
+SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
diff --git a/htdocs/langs/eu_ES/receptions.lang b/htdocs/langs/eu_ES/receptions.lang
index 760ff884fa0..338602e722e 100644
--- a/htdocs/langs/eu_ES/receptions.lang
+++ b/htdocs/langs/eu_ES/receptions.lang
@@ -44,4 +44,4 @@ ValidateOrderFirstBeforeReception=You must first validate the order before being
 ReceptionsNumberingModules=Numbering module for receptions
 ReceptionsReceiptModel=Document templates for receptions
 NoMorePredefinedProductToDispatch=No more predefined products to dispatch
-
+ReceptionExist=A reception exists
diff --git a/htdocs/langs/eu_ES/stocks.lang b/htdocs/langs/eu_ES/stocks.lang
index 412cca892b5..52e654461b6 100644
--- a/htdocs/langs/eu_ES/stocks.lang
+++ b/htdocs/langs/eu_ES/stocks.lang
@@ -56,8 +56,6 @@ UnitPurchaseValue=Unit purchase price
 StockTooLow=Stock too low
 StockLowerThanLimit=Stock lower than alert limit (%s)
 EnhancedValue=Balioa
-PMPValue=Weighted average price
-PMPValueShort=WAP
 EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
@@ -251,7 +249,10 @@ SelectAStockMovementFileToImport=select a stock movement file to import
 InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
 LabelOfInventoryMovemement=Inventory %s
 ReOpen=Reopen
-ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock to the real qty you entered into the inventory.
 ObjectNotFound=%s not found
 MakeMovementsAndClose=Generate movements and close
 AutofillWithExpected=Fill real quantity with expected quantity
+ShowAllBatchByDefault=By default, show batch details on product "stock" tab
+CollapseBatchDetailHelp=You can set batch detail default display in stocks module configuration
+FieldCannotBeNegative=Field "%s" cannot be negative
diff --git a/htdocs/langs/eu_ES/ticket.lang b/htdocs/langs/eu_ES/ticket.lang
index 9ad3a4dc0ae..36e88ee96aa 100644
--- a/htdocs/langs/eu_ES/ticket.lang
+++ b/htdocs/langs/eu_ES/ticket.lang
@@ -304,7 +304,7 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
-BoxTicketType=Number of open tickets by type
+BoxTicketType=Distribution of open tickets by type
 BoxTicketSeverity=Number of open tickets by severity
 BoxNoTicketSeverity=No tickets opened
 BoxTicketLastXDays=Number of new tickets by days the last %s days
diff --git a/htdocs/langs/fa_IR/accountancy.lang b/htdocs/langs/fa_IR/accountancy.lang
index 214dc754086..de2051604c6 100644
--- a/htdocs/langs/fa_IR/accountancy.lang
+++ b/htdocs/langs/fa_IR/accountancy.lang
@@ -158,7 +158,7 @@ ACCOUNTING_LENGTH_AACCOUNT=طول حساب‌های حساب‌داری شخص
 ACCOUNTING_MANAGE_ZERO=امکان تغییر تعداد دیگری از صفر در انتخای حساب حساب‌داری. در برخی کشورها (مثل سوئیس) مورد احتیاج است. در صورتی که خاموش باشد (پیش‌فرض)، شما می‌توانید دو گزینۀ مقابل را تنظیم کنید تا از برنامه بخواهید صفرهای مجازی اضافه کند.
 BANK_DISABLE_DIRECT_INPUT=غیرفعال کردن ثبت مستقیم تراکنش در حساب بانکی
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=فعال کردن خروجی پیش‌نویس از دفتر
-ACCOUNTANCY_COMBO_FOR_AUX=فعال کردن فهرست ترکیبی برای حساب وابسته(ممکن است در صورتی که شخص‌سوم‌های زیادی داشته باشید، کند باشد)
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties, break ability to search on a part of value)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
@@ -328,6 +328,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountanc
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
+NotifiedExportDate=Notified export date (modification of the entries will not be possible)
+NotifiedValidationDate=Validation of the entries (modification or deletion of the entries will not be possible)
+ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=صادرکردن پیش‌نویس دفتر
 Modelcsv=نوع صادرات
 Selectmodelcsv=انتخاب مدل صادرات
diff --git a/htdocs/langs/fa_IR/admin.lang b/htdocs/langs/fa_IR/admin.lang
index a1448d0785c..8d77e7206b5 100644
--- a/htdocs/langs/fa_IR/admin.lang
+++ b/htdocs/langs/fa_IR/admin.lang
@@ -221,8 +221,8 @@ NotCompatible=به نظر نمی‌رسد این واحد با نسخۀ %s Dolib
 CompatibleAfterUpdate=این واحد نیازمند روزآمدسازی Dolibarr نسخۀ %s است (حداقل %s - حداکثر %s)
 SeeInMarkerPlace=نمایش در بازارچه
 SeeSetupOfModule=See setup of module %s
+SetOptionTo=Set option <b>%s</b> to %s
 Updated=روزآمد شده
-Nouveauté=تازگی
 AchatTelechargement=خرید / بارگیری
 GoModuleSetupArea=برای به کاربردن یا نصب یک واحد، به محل برپاسازی واحد‌ها بروید: <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore، بازارچۀ رسمی برای واحد‌های بیرونی Dolibarr ERP / CRM
@@ -399,6 +399,7 @@ SecurityToken=کلیدواژۀ ایمن‌سازی نشانی‌ها
 NoSmsEngine=هیچ مدیر ارسال پیامکی وجود ندارد. مدیر ارسال پیامک به همراه توزیع پیش‌فرض نصب نشده است چون به تامین کنندۀ بیرونی وابسته است، اما شما می‌توانید در %s این نیاز را تامین کنید.
 PDF=PDF
 PDFDesc=Global options for PDF generation
+PDFOtherDesc=PDF Option specific to some modules
 PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=پنهان کردن همۀ اطلاعات مربوط به مالیات بر فروش و مالیات بر ارزش افزوده
 PDFRulesForSalesTax=قواعد مالیات‌برارزش‌افزوده و مالیات‌برفروش
@@ -561,7 +562,7 @@ Module53Desc=مدیریت خدمات
 Module54Name=قرارداد‌ها/اشتراک‌ها
 Module54Desc=مدیریت قراردادها (خدمات یا اشتراک‌های تکرارشونده)
 Module55Name=بارکدها
-Module55Desc=مدیریت بارکد
+Module55Desc=Barcode or QR code management
 Module56Name=Payment by credit transfer
 Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
 Module57Name=Payments by Direct Debit
@@ -848,10 +849,10 @@ Permission402=ساخت/ویرایش تخفیف‌ها
 Permission403=اعتباردهی تخفیف‌ها
 Permission404=حذف تخفیف‌ها
 Permission430=استفاده از نوار اشکال‌یابی
-Permission511=Read payments of salaries (yours and subordinates)
-Permission512=ساخت/ویرایش پرداخت حقوق
-Permission514=حذف پرداخت حقوق
-Permission517=Read payments of salaries of everybody
+Permission511=Read salaries and payments (yours and subordinates)
+Permission512=Create/modify salaries and payments
+Permission514=Delete salaries and payments
+Permission517=Read salaries and payments everybody
 Permission519=صادرکردن حقوق
 Permission520=ملاحظۀ وام‌ها
 Permission522=ساخت/ویرایش وام‌ها
@@ -965,6 +966,8 @@ Permission23003=حذف  وظایف زمان‌بندی‌شده
 Permission23004=اجرای  وظایف زمان‌بندی‌شده
 Permission50101=Use Point of Sale (SimplePOS)
 Permission50151=Use Point of Sale (TakePOS)
+Permission50152=Edit sales lines
+Permission50153=Edit ordered sales lines
 Permission50201=ملاحظۀ تراکنش‌ها
 Permission50202=واردکردن تراکنش‌ها
 Permission50330=Read objects of Zapier
@@ -1039,11 +1042,12 @@ DictionaryMeasuringUnits=واحدهای محاسبه
 DictionarySocialNetworks=شبکه‌های اجتماعی
 DictionaryProspectStatus=Prospect status for companies
 DictionaryProspectContactStatus=Prospect status for contacts
-DictionaryHolidayTypes=انواع مرخصی
+DictionaryHolidayTypes=Leave - Types of leave
 DictionaryOpportunityStatus=وضعیت سرنخ برای طرح/سرنخ
 DictionaryExpenseTaxCat=گزارش هزینه - دسته‌بندی‌های حمل‌ونقل
 DictionaryExpenseTaxRange=گزارش هزینه - محدودۀ دسته‌بندی‌های حمل‌ونقل
 DictionaryTransportMode=Intracomm report - Transport mode
+DictionaryBatchStatus=Product lot/serial Quality Control status
 TypeOfUnit=Type of unit
 SetupSaved=تنظیمات برپاسازی ذخیره شد
 SetupNotSaved=تنظیمات برپاسازی ذخیره نشد
@@ -1187,7 +1191,7 @@ SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of m
 SetupDescription5=سایر عناوین فهرست برپاسازی برای مدیریت مقادیر اختیاری.
 AuditedSecurityEvents=Security events that are audited
 NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
-Audit=بازرسی
+Audit=Security events
 InfoDolibarr=دربارۀ Dolibarr
 InfoBrowser=دربارۀ مرورگر
 InfoOS=دربارۀ سیستم‌عامل
@@ -1319,9 +1323,12 @@ ConditionIsCurrently=در حال حاضر وضعیت %s است
 YouUseBestDriver=شما از راه‌انداز %s استفاده می‌کنید که بهترین راه‌انداز دردسترس نیست.
 YouDoNotUseBestDriver=شما از راه‌انداز %s استفاده می‌کنید اما پیشنهاد ما استفادهاز %s است.
 NbOfObjectIsLowerThanNoPb=شما در پایگاه داده فقط %s%s دارید. این الزاما نیازمند بهینه سازی نیست.
+ComboListOptim=Combo list loading optimization
 SearchOptim=بهینه‌سازی جستجو
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
-YouHaveXObjectAndSearchOptimOn=شما در پایگاه داده %s دارید و مقدار ثابت %s %sدر خانه-برپاسازی-سایر به 1 تنظیم شده است.
+YouHaveXObjectUseComboOptim=You have %s %s in the database. You can go into setup of module to enable loading of combo list on key pressed event.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other.
+YouHaveXObjectUseSearchOptimDesc=This limits the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to %s in Home-Setup-Other.
 BrowserIsOK=شما از مرورگر وب %s استفاده می‌نمائید. این مرورگر برای کارائی و امنیت مناسب است.
 BrowserIsKO=شما از مرورگر وب %s استفاده می‌نمائید. این مرورگر به‌عنوان یک انتخاب بد به نسبت امنیت، کارائی و اعتمادپذیری شناخته شده است. ما به شما پیشنهاد می‌کنیم از Firefox، Chrome، Opera و Safari استفاده نمائید.
 PHPModuleLoaded=بخش %s در PHP بارگذاری شده است
@@ -1433,6 +1440,7 @@ MemberMainOptions=گزینه‌های اصلی
 AdherentLoginRequired= مدیریت ورود برای هر عضو
 AdherentMailRequired=برای ساخت یک عضو یک رایانامه لازم است
 MemberSendInformationByMailByDefault=کادرتائید برای ارسال تصدیق رایانامه برای اعضا (اعتباردهی یا عضویت جدید) به شکل پیش‌فرض فعال است
+MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
 VisitorCanChooseItsPaymentMode=کاربر می‌تواند از انواع روش پرداخت موجود استفاده نماید
 MEMBER_REMINDER_EMAIL=فعال‌کردن یادآور خودکار <b>توسط رایانامه</b> برای عضویت‌های منقضی‌شده. توجه: واحد <strong>%s</strong> برای ارسال صحیح یادآورها نیازمند فعال‌سازی و پیکربندی صحیح است.
 MembersDocModules=Document templates for documents generated from member record
@@ -1763,7 +1771,7 @@ AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting men
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=فعال‌کردن آگاهی‌رسانی صوتی
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
-AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the scheduled job %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=نمایش شیء پیوند شده به نمای جلسه
 ##### Clicktodial #####
 ClickToDialSetup=برپاسازی واحد کلیک برای شماره‌گیری
@@ -1979,6 +1987,8 @@ MAIN_PDF_MARGIN_RIGHT=فاصلۀحاشیۀ راست PDF
 MAIN_PDF_MARGIN_TOP=فاصلۀحاشیۀ بالای PDF
 MAIN_PDF_MARGIN_BOTTOM=فاصلۀحاشیۀ پائین PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add picture on proposal line
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add electronic sign in PDF
 NothingToSetup=تنظیمات خاصی برای این واحدموردنیاز نیست
 SetToYesIfGroupIsComputationOfOtherGroups=در صورتی که این گروه جهت محاسبۀ سایر گروه‌هاست این گزینه را انتخاب کنید
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
@@ -2096,7 +2106,6 @@ PDF_SHOW_PROJECT=Show project on document
 ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
-FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
@@ -2120,12 +2129,18 @@ ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by
 MailToSendEventOrganization=Event Organization
 AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
 YouShouldDisablePHPFunctions=You should disable PHP functions
-IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands in custom code, you shoud disable PHP functions
+PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
+NotRecommended=Not recommanded
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
 ModuleUpdateAvailable=An update is available
 NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
+RandomlySelectedIfSeveral=Randomly selected if several pictures are available
+DatabasePasswordObfuscated=Database password is obfuscated in conf file
+DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
diff --git a/htdocs/langs/fa_IR/agenda.lang b/htdocs/langs/fa_IR/agenda.lang
index 9eaf43ec4df..c55601eee81 100644
--- a/htdocs/langs/fa_IR/agenda.lang
+++ b/htdocs/langs/fa_IR/agenda.lang
@@ -4,7 +4,7 @@ Actions=روی‌دادها
 Agenda=دستور کار
 TMenuAgenda=دستور کار
 Agendas=دستور کار
-LocalAgenda=تقویم داخلی
+LocalAgenda=Default calendar
 ActionsOwnedBy=مالک روی‌داد 
 ActionsOwnedByShort=مالک
 AffectedTo=نسبت‌داده‌شده به
@@ -14,13 +14,13 @@ EventsNb=تعداد روی‌دادها
 ListOfActions=فهرست‌روی‌دادها
 EventReports=گزارش روی‌دادها
 Location=محل
-ToUserOfGroup=Event assigned to any user in group
+ToUserOfGroup=Event assigned to any user in the group
 EventOnFullDay=روی‌داد در تمام روز (ها)
 MenuToDoActions=همه روی‌دادهای ناقص
 MenuDoneActions=همۀ روی‌دادهای لغو شده
 MenuToDoMyActions=روی‌دادهای ناقص من
 MenuDoneMyActions=روی‌دادهای لغوشدۀ من
-ListOfEvents=فهرست روی‌دادها (تقویم داخلی)
+ListOfEvents=List of events (default calendar)
 ActionsAskedBy=روی‌دادهای گزارش‌شده توسط
 ActionsToDoBy=روی‌دادها اختصاص‌یافته به
 ActionsDoneBy=روی‌دادهای انجام شده توسط
@@ -38,6 +38,7 @@ ActionsEvents=روی‌دادهائی که Dolibarr برای آن‌ها در ص
 EventRemindersByEmailNotEnabled=یادآورنده‌های روی‌داد توسط رایانامه در بخش برپاسازی واحد %s فعال نشده اند.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=شخص‌سوم %s ساخته شد
+COMPANY_MODIFYInDolibarr=Third party %s modified
 COMPANY_DELETEInDolibarr=طرف‌سوم %s حذف شد
 ContractValidatedInDolibarr=قرارداد %s تائید شد
 CONTRACT_DELETEInDolibarr=قرارداد %s حذف شد
@@ -87,6 +88,7 @@ OrderDeleted=سفارش حذف شد
 InvoiceDeleted=صورت‌حساب حذف شد
 DraftInvoiceDeleted=Draft invoice deleted
 CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_MODIFYInDolibarr=Contact %s modified
 CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=محصول %s ساخته شد
 PRODUCT_MODIFYInDolibarr=محصول %s ویرایش شد
@@ -119,6 +121,7 @@ MRP_MO_UNVALIDATEInDolibarr=MO set to draft status
 MRP_MO_PRODUCEDInDolibarr=MO produced
 MRP_MO_DELETEInDolibarr=MO deleted
 MRP_MO_CANCELInDolibarr=MO canceled
+PAIDInDolibarr=%s paid
 ##### End agenda events #####
 AgendaModelModule=قالب‌های مستند برای روی‌دادهای
 DateActionStart=تاریخ شروع
@@ -130,7 +133,7 @@ AgendaUrlOptions4=<b>logint=%s</b> برای محدود کردن خروجی به
 AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b>  برای محدود کردن خروجی به کنش‌های مرتبط به یک طرح <b>__PROJECT_ID__</b>.
 AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> برای مستثنی کردن روی‌دادهای خودکار.
 AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> to include events of holidays.
-AgendaShowBirthdayEvents=نمایش تاریخ‌تولد طرف‌های تماس
+AgendaShowBirthdayEvents=Birthdays of contacts
 AgendaHideBirthdayEvents=پنهان کردن تاریخ تولد طرف‌های تماس
 Busy=مشغول
 ExportDataset_event1=فهرست روی‌دادهای دستورکار
@@ -152,6 +155,7 @@ ActionType=نوع روی‌دا
 DateActionBegin=تاریخ شروع روی‌داد
 ConfirmCloneEvent=آیا مطمئنید می‌خواهید از روی‌داد <b>%s</b> نسخه‌برداری کنید؟
 RepeatEvent=تکرار روی‌داد
+OnceOnly=Once only
 EveryWeek=هرهفته
 EveryMonth=هر ماه
 DayOfMonth=روز از ماه
@@ -165,4 +169,4 @@ TimeType=Duration type
 ReminderType=Callback type
 AddReminder=Create an automatic reminder notification for this event
 ErrorReminderActionCommCreation=Error creating the reminder notification for this event
-BrowserPush=Browser Notification
+BrowserPush=Browser Popup Notification
diff --git a/htdocs/langs/fa_IR/bills.lang b/htdocs/langs/fa_IR/bills.lang
index 93c04e5034f..269f1e5e5df 100644
--- a/htdocs/langs/fa_IR/bills.lang
+++ b/htdocs/langs/fa_IR/bills.lang
@@ -259,6 +259,7 @@ DateMaxPayment=موعد پرداخت در
 DateInvoice=تاریخ صورت‌حساب
 DatePointOfTax=نقطۀ مالیات
 NoInvoice=بدون صورت‌حساب
+NoOpenInvoice=No open invoice
 ClassifyBill=طبقه‌بندی صورت‌حساب
 SupplierBillsToPay=صورت‌حساب‌های پرداخت‌نشدۀ فروشنده
 CustomerBillsUnpaid=صورت‌حساب‌های پرداخت‌نشدۀ مشتری
@@ -589,3 +590,4 @@ FacParentLine=Invoice Line Parent
 SituationTotalRayToRest=Remainder to pay without taxe
 PDFSituationTitle=Situation n° %d
 SituationTotalProgress=Total progress %d %%
+SearchUnpaidInvoicesWithDueDate=Search unpaid invoices with a due date = %s
diff --git a/htdocs/langs/fa_IR/cashdesk.lang b/htdocs/langs/fa_IR/cashdesk.lang
index fe17fae84a5..c512095ac7e 100644
--- a/htdocs/langs/fa_IR/cashdesk.lang
+++ b/htdocs/langs/fa_IR/cashdesk.lang
@@ -102,7 +102,7 @@ CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal numb
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
 SaleStartedAt=Sale started at %s
-ControlCashOpening=Control cash popup at opening POS
+ControlCashOpening=Open the "Control cash" popup when opening the POS
 CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -126,5 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
-ShowPriceHT = Display the price excluding tax column
-ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
+ShowPriceHT = Display the column with the price excluding tax (on screen)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
diff --git a/htdocs/langs/fa_IR/compta.lang b/htdocs/langs/fa_IR/compta.lang
index b54f4d2e99c..10fedba808d 100644
--- a/htdocs/langs/fa_IR/compta.lang
+++ b/htdocs/langs/fa_IR/compta.lang
@@ -286,3 +286,9 @@ ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
 IncludeLoansInResults = Include loans in reports
+InvoiceLate30Days = Invoices late > 30 days
+InvoiceLate15Days = Invoices late > 15 days
+InvoiceLateMinus15Days = Invoices late
+InvoiceNotLate = To be collected < 15 days
+InvoiceNotLate15Days = To be collected in 15 days
+InvoiceNotLate30Days = To be collected in 30 days
diff --git a/htdocs/langs/fa_IR/cron.lang b/htdocs/langs/fa_IR/cron.lang
index b88af91c016..65a628f47cb 100644
--- a/htdocs/langs/fa_IR/cron.lang
+++ b/htdocs/langs/fa_IR/cron.lang
@@ -60,7 +60,7 @@ CronErrEndDateStartDt=تاریخ پایان نمی‌تواند قبل از تا
 StatusAtInstall=وضعیت نصب واحد
 CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=غیرفعال‌کردن
-CronTaskInactive=این وظیفه غیرفعال است
+CronTaskInactive=This job is disabled (not scheduled)
 CronId=شناسه
 CronClassFile=نام‌فایل حاوی کلاس
 CronModuleHelp=نام فهرست واحدهای Dolibarr (که همچنین با یک واحد خارجی Dolibarr نیز کار می‌کند). <BR> برای مثال برای فراخوان متد fetch از شیء محصولات Dolibarr از /htdocs/<u>product</u>/class/product.class.php استفاده می‌شود، مقدار واحد برابر است با <br><i>product</i>
diff --git a/htdocs/langs/fa_IR/errors.lang b/htdocs/langs/fa_IR/errors.lang
index fc2504e5758..2267961f825 100644
--- a/htdocs/langs/fa_IR/errors.lang
+++ b/htdocs/langs/fa_IR/errors.lang
@@ -11,6 +11,7 @@ ErrorBadValueForParamNotAString=برای مؤلفۀ موردنظر مقدار خ
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=نام‌کاربری %s قبلا وجود داشته است.
 ErrorGroupAlreadyExists=گروه %s قبلا وجود داشته است.
+ErrorEmailAlreadyExists=Email %s already exists.
 ErrorRecordNotFound=ردیف موجود نیست.
 ErrorFailToCopyFile=نسخه‌برداری از فایل '<b>%s</b>' به '<b>%s</b>' موفق نبود.
 ErrorFailToCopyDir=نسخه‌برداری از پوشۀ '<b>%s</b>' به '<b>%s</b>' موفق نبود.
@@ -117,7 +118,7 @@ ErrorCantReadFile=امکان خواندن فایل '%s' نبود
 ErrorCantReadDir=امکان خواندن پوشۀ '%s' نبود
 ErrorBadLoginPassword=مقدار نادرست نام‌ورود و گذرواژه
 ErrorLoginDisabled=حساب شما غیر فعال شده است
-ErrorFailedToRunExternalCommand=اجرای دستور خارجی موفقیت‌آمیز نبود. مطمئن شوید در سرور PHP فعال و قابل اجراست. در صورتی که حالت <b>Safe Mode</b> در PHP فعال باشد، بررسی کنید دستور در پوشه‌ای است که توسط مؤلفۀ <b>safe_mode_exec_dir</b> قرار گرفته باشد.
+ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server user. Check also the command is not protected on shell level by a security layer like apparmor.
 ErrorFailedToChangePassword=تغییر گذرواژه موفقیت‌آمیز نبود
 ErrorLoginDoesNotExists=کاربری که از نام‌ورود <b>%s</b> استفاده کند، پیدا نشد
 ErrorLoginHasNoEmail=کاربر هیچ نشانی رایانامه‌‌ای ندارد. پردازش متوقف شد.
@@ -262,6 +263,7 @@ ErrorDateIsInFuture=Error, the date can't be in the future
 ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
 ErrorAPercentIsRequired=Error, please fill in the percentage correctly
 ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
+ErrorFailedToFindEmailTemplate=Failed to find template with code name %s
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -298,3 +300,4 @@ WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So y
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
+ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
diff --git a/htdocs/langs/fa_IR/eventorganization.lang b/htdocs/langs/fa_IR/eventorganization.lang
index 1439649134f..56db47c070e 100644
--- a/htdocs/langs/fa_IR/eventorganization.lang
+++ b/htdocs/langs/fa_IR/eventorganization.lang
@@ -1,4 +1,5 @@
 # Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+# Copyright (C) 2021		Dorian Vabre			<dorian.vabre@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
@@ -81,7 +82,10 @@ PriceOfBoothHelp=Subscription price to stand a booth
 EventOrganizationICSLink=Link ICS for events
 ConferenceOrBoothInformation=Conference Or Booth informations
 Attendees = Attendees
+DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
 #
 # Status
 #
@@ -94,8 +98,46 @@ EvntOrgCancelled = Cancelled
 #
 # Public page
 #
+SuggestForm = Suggestion page
+RegisterPage = Page for conferences or booth
+EvntOrgRegistrationHelpMessage = Here, you can vote for an event, or suggest a new conference or booth for the project
+EvntOrgRegistrationConfHelpMessage = Here, you can suggest a new conference for the project
+EvntOrgRegistrationBoothHelpMessage = Here, you can suggest a new booth for the project
+ListOfSuggestedConferences = List of suggested conferences
+ListOfSuggestedBooths = List of suggested booths
+SuggestConference = Suggest a new conference
+SuggestBooth = Suggest a booth
+ViewAndVote = View and vote for suggested events
 PublicAttendeeSubscriptionPage = Public link of registration to a conference
 MissingOrBadSecureKey = The security key is invalid or missing
-EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
-EvntOrgStartDuration = This conference starts on
-EvntOrgEndDuration =  and ends on
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference : '%s'
+EvntOrgDuration = This conference starts on %s and ends on %s.
+ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
+BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
+EventType = نوع روی‌دا
+
+#
+# Vote page
+#
+EvntOrgRegistrationWelcomeMessage = Welcome on the conference or booth suggestion page.
+EvntOrgRegistrationConfWelcomeMessage = Welcome on the conference suggestion page.
+EvntOrgRegistrationBoothWelcomeMessage = Welcome on the booth suggestion page.
+EvntOrgVoteHelpMessage = Here, you can view and vote for the suggested events for the project
+VoteOk = Your vote has been accepted.
+AlreadyVoted = You have already voted for this event.
+VoteError = An error has occurred during the vote, please try again.
+
+#
+# SubscriptionOk page
+#
+SubscriptionOk = Your subscription to this conference has been validated
+#
+# Subscription validation mail
+#
+ConfAttendeeSubscriptionConfirmation = Confirmation of your subscription to a conference
+#
+# Payment page
+#
+Attendee = Attendee
+PaymentConferenceAttendee = Conference attendee payment
+PaymentBoothLocation = Booth location payment
diff --git a/htdocs/langs/fa_IR/hrm.lang b/htdocs/langs/fa_IR/hrm.lang
index 590bc8b6434..b62062d8db6 100644
--- a/htdocs/langs/fa_IR/hrm.lang
+++ b/htdocs/langs/fa_IR/hrm.lang
@@ -9,7 +9,7 @@ ConfirmDeleteEstablishment=آیا شما مطمئن هستید که می‌خو
 OpenEtablishment=باز‌کردن بنگاه
 CloseEtablishment=بستن بنگاه
 # Dictionary
-DictionaryPublicHolidays=HRM - Public holidays
+DictionaryPublicHolidays=Leave - Public holidays
 DictionaryDepartment=مدیریت منابع انسانی - فهرست بخش‌ها
 DictionaryFunction=HRM - Job positions
 # Module
diff --git a/htdocs/langs/fa_IR/knowledgemanagement.lang b/htdocs/langs/fa_IR/knowledgemanagement.lang
index 6e066229e76..226d11ba91a 100644
--- a/htdocs/langs/fa_IR/knowledgemanagement.lang
+++ b/htdocs/langs/fa_IR/knowledgemanagement.lang
@@ -47,7 +47,7 @@ KnowledgeManagementArea = Knowledge Management
 # Menu
 #
 MenuKnowledgeRecord = Knowledge base
-ListOfArticles = List of articles
+ListKnowledgeRecord = List of articles
 NewKnowledgeRecord = New article
 ValidateReply = Validate solution
 KnowledgeRecords = Articles
diff --git a/htdocs/langs/fa_IR/languages.lang b/htdocs/langs/fa_IR/languages.lang
index a94c8c643c1..37719e3183f 100644
--- a/htdocs/langs/fa_IR/languages.lang
+++ b/htdocs/langs/fa_IR/languages.lang
@@ -3,6 +3,7 @@ Language_am_ET=Ethiopian
 Language_ar_AR=عربی
 Language_ar_EG=عربی (مصر)
 Language_ar_SA=عربی
+Language_ar_TN=Arabic (Tunisia)
 Language_az_AZ=Azerbaijani
 Language_bn_BD=بنگالی
 Language_bn_IN=Bengali (India)
@@ -84,6 +85,7 @@ Language_nl_NL=Dutch
 Language_pl_PL=پلندی
 Language_pt_BR=پرتغالی (برزیل)
 Language_pt_PT=پرتغالی
+Language_ro_MD=Romanian (Moldavia)
 Language_ro_RO=رومانیایی
 Language_ru_RU=روسی
 Language_ru_UA=روسیه (اوکراین)
diff --git a/htdocs/langs/fa_IR/main.lang b/htdocs/langs/fa_IR/main.lang
index 1583dced000..1236802539e 100644
--- a/htdocs/langs/fa_IR/main.lang
+++ b/htdocs/langs/fa_IR/main.lang
@@ -430,6 +430,7 @@ LT1IN=CGST
 LT2IN=SGST
 LT1GC=خرده‌های-cent اضافی 
 VATRate=نرخ مالیات
+RateOfTaxN=Rate of tax %s
 VATCode=کد نرخ مالیات
 VATNPR=NPR نرخ مالیات
 DefaultTaxRate=نرخ‌مالیات پیش‌فرض
@@ -729,6 +730,7 @@ MenuMembers=اعضاء
 MenuAgendaGoogle=دستورکار گوگل
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=محدودیت Dolibarr  (فهرست خانه-برپاسازی-امنیت):  %s کیلوبایت، محدودیت PHP برابر با: %s کیلوبایت
+ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
 NoFileFound=No documents uploaded
 CurrentUserLanguage=زبان کنونی
 CurrentTheme=پوستۀ کنونی
@@ -1072,6 +1074,7 @@ ValidFrom=معتبر از
 ValidUntil=معتبر تا
 NoRecordedUsers=کاربری نیست
 ToClose=To close
+ToRefuse=To refuse
 ToProcess=برای پردازش
 ToApprove=To approve
 GlobalOpenedElemView=Global view
@@ -1126,9 +1129,11 @@ UpdateForAllLines=Update for all lines
 OnHold=On hold
 Civility=Civility
 AffectTag=Affect Tag
+CreateExternalUser=Create external user
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
 ConfirmCancel=Are you sure you want to cancel
+EmailMsgID=Email MsgID
diff --git a/htdocs/langs/fa_IR/members.lang b/htdocs/langs/fa_IR/members.lang
index 0d2d87c60c7..7da3f831cdf 100644
--- a/htdocs/langs/fa_IR/members.lang
+++ b/htdocs/langs/fa_IR/members.lang
@@ -213,3 +213,5 @@ SendReminderForExpiredSubscription=Send reminder by email to members when subscr
 MembershipPaid=Membership paid for current period (until %s)
 YouMayFindYourInvoiceInThisEmail=You may find your invoice attached to this email
 XMembersClosed=%s member(s) closed
+XExternalUserCreated=%s external user(s) created
+ForceMemberNature=Force member nature (Individual or Corporation)
diff --git a/htdocs/langs/fa_IR/modulebuilder.lang b/htdocs/langs/fa_IR/modulebuilder.lang
index 9fdaa1a533a..23a098be2e5 100644
--- a/htdocs/langs/fa_IR/modulebuilder.lang
+++ b/htdocs/langs/fa_IR/modulebuilder.lang
@@ -143,3 +143,4 @@ AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
 ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
+ImportExportProfiles=Import and export profiles
diff --git a/htdocs/langs/fa_IR/mrp.lang b/htdocs/langs/fa_IR/mrp.lang
index 33de4aff092..c00afb9dd3a 100644
--- a/htdocs/langs/fa_IR/mrp.lang
+++ b/htdocs/langs/fa_IR/mrp.lang
@@ -8,12 +8,12 @@ MenuBOM=صورت‌حساب‌های مواد
 LatestBOMModified=آخرین %s صورت‌حساب مواد تغییر یافته
 LatestMOModified=Latest %s Manufacturing Orders modified
 Bom=Bills of Material
-BillOfMaterials=صورت‌حساب مواد
+BillOfMaterials=Bill of Materials
 BOMsSetup=برپاسازی واحد صورت‌حساب مواد
 ListOfBOMs=فهرست صورت‌حساب‌های مواد - BOM
 ListOfManufacturingOrders=List of Manufacturing Orders
-NewBOM=یک صورت‌حساب مواد جدید
-ProductBOMHelp=Product to create with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
+NewBOM=New bill of materials
+ProductBOMHelp=Product to create (or disassemble) with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
 BOMsNumberingModules=چگونگی عدددهی صورت‌حساب مواد
 BOMsModelModule=BOM document templates
 MOsNumberingModules=MO numbering templates
@@ -22,7 +22,7 @@ FreeLegalTextOnBOMs=متن آزاد روی سند صورت‌حساب مواد
 WatermarkOnDraftBOMs=نوشتۀ کم‌رنگ روی پیش‌نویس صورت‌حساب موا
 FreeLegalTextOnMOs=Free text on document of MO
 WatermarkOnDraftMOs=Watermark on draft MO
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials %s ?
 ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
 ManufacturingEfficiency=بازده تولید
 ConsumptionEfficiency=Consumption efficiency
@@ -30,8 +30,8 @@ ValueOfMeansLoss=مقدار 0.95 به معنای یک میانگین 5 %% ضرر
 ValueOfMeansLossForProductProduced=Value of 0.95 means an average of 5%% of loss of produced product
 DeleteBillOfMaterials=Delete Bill Of Materials
 DeleteMo=Delete Manufacturing Order
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Materials?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Materials?
 MenuMRP=Manufacturing Orders
 NewMO=New Manufacturing Order
 QtyToProduce=Qty to produce
@@ -39,7 +39,7 @@ DateStartPlannedMo=Date start planned
 DateEndPlannedMo=Date end planned
 KeepEmptyForAsap=Empty means 'As Soon As Possible'
 EstimatedDuration=Estimated duration
-EstimatedDurationDesc=Estimated duration to manufacture this product using this BOM
+EstimatedDurationDesc=Estimated duration to manufacture (or disassemble) this product using this BOM
 ConfirmValidateBom=Are you sure you want to validate the BOM with the reference <strong>%s</strong> (you will be able to use it to build new Manufacturing Orders)
 ConfirmCloseBom=Are you sure you want to cancel this BOM (you won't be able to use it to build new Manufacturing Orders anymore) ?
 ConfirmReopenBom=Are you sure you want to re-open this BOM (you will be able to use it to build new Manufacturing Orders)
@@ -63,13 +63,14 @@ ConsumeAndProduceAll=Consume and Produce All
 Manufactured=Manufactured
 TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
 ForAQuantityOf=For a quantity to produce of %s
+ForAQuantityToConsumeOf=For a quantity to disassemble of %s
 ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
 ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
 ProductionForRef=Production of %s
 AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
 NoStockChangeOnServices=No stock change on services
 ProductQtyToConsumeByMO=Product quantity still to consume by open MO
-ProductQtyToProduceByMO=Product quentity still to produce by open MO
+ProductQtyToProduceByMO=Product quantity still to produce by open MO
 AddNewConsumeLines=Add new line to consume
 ProductsToConsume=Products to consume
 ProductsToProduce=Products to produce
@@ -83,15 +84,13 @@ Workstations=Workstations
 WorkstationsDescription=Workstations management
 WorkstationSetup = Workstations setup
 WorkstationSetupPage = Workstations setup page
-WorkstationAbout = About Workstation
-WorkstationAboutPage = Workstations about page
 WorkstationList=Workstation list
 WorkstationCreate=Add new workstation
 ConfirmEnableWorkstation=Are you sure you want to enable workstation <b>%s</b> ?
 EnableAWorkstation=Enable a workstation
 ConfirmDisableWorkstation=Are you sure you want to disable workstation <b>%s</b> ?
 DisableAWorkstation=Disable a workstation
-DeleteWorkstation=Supprimer
+DeleteWorkstation=حذف‌کردن
 NbOperatorsRequired=Number of operators required
 THMOperatorEstimated=Estimated operator THM
 THMMachineEstimated=Estimated machine THM
diff --git a/htdocs/langs/fa_IR/orders.lang b/htdocs/langs/fa_IR/orders.lang
index 94e00a837b7..5b3f29e1eda 100644
--- a/htdocs/langs/fa_IR/orders.lang
+++ b/htdocs/langs/fa_IR/orders.lang
@@ -11,6 +11,7 @@ OrderDate=تاریخ سفارش
 OrderDateShort=تاریخ سفارش
 OrderToProcess=سفارش قابل پردازش
 NewOrder=سفارش جدید
+NewSupplierOrderShort=سفارش جدید
 NewOrderSupplier=New Purchase Order
 ToOrder=ایجاد سفارش
 MakeOrder=ساخت سفارش
@@ -73,6 +74,7 @@ DeleteOrder=حذف سفارش
 CancelOrder=لغو سفارش
 OrderReopened= Order %s re-open
 AddOrder=ساخت سفارش
+AddSupplierOrderShort=ساخت سفارش
 AddPurchaseOrder=Create purchase order
 AddToDraftOrders=افزودن به سفارش پیش‌نویس
 ShowOrder=نمایش سفارش
diff --git a/htdocs/langs/fa_IR/other.lang b/htdocs/langs/fa_IR/other.lang
index 70fc1ee3134..030d066d73c 100644
--- a/htdocs/langs/fa_IR/other.lang
+++ b/htdocs/langs/fa_IR/other.lang
@@ -129,6 +129,7 @@ ClosedByLogin=User login who closed
 FileWasRemoved=فایل٪ s حذف شد
 DirWasRemoved=شاخه٪ s حذف شد
 FeatureNotYetAvailable=Feature not yet available in the current version
+FeatureNotAvailableOnDevicesWithoutMouse=Feature not available on devices without mouse
 FeaturesSupported=Supported features
 Width=عرض
 Height=ارتفاع
@@ -263,7 +264,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
-PrefixSession=Prefix for session ID
+SuffixSessionName=Suffix for session name
 
 ##### Export #####
 ExportsArea=منطقه صادرات
diff --git a/htdocs/langs/fa_IR/partnership.lang b/htdocs/langs/fa_IR/partnership.lang
index 60baadb7d69..09a65ee14ce 100644
--- a/htdocs/langs/fa_IR/partnership.lang
+++ b/htdocs/langs/fa_IR/partnership.lang
@@ -16,41 +16,72 @@
 #
 # Generic
 #
-ModulePartnershipName = Partnership management
-PartnershipDescription = Module Partnership management
+ModulePartnershipName=Partnership management
+PartnershipDescription=Module Partnership management
 PartnershipDescriptionLong= Module Partnership management
 
+AddPartnership=Add partnership
+CancelPartnershipForExpiredMembers=Partnership: Cancel partnership of members with expired subscriptions
+PartnershipCheckBacklink=Partnership: Check referring backlink
+
 #
 # Menu
 #
-NewPartnership = New Partnership
-ListOfPartnerships = List of partnership
+NewPartnership=New Partnership
+ListOfPartnerships=List of partnership
 
 #
 # Admin page
 #
-PartnershipSetup = Partnership setup
-PartnershipAbout = About Partnership
-PartnershipAboutPage = Partnership about page
-
+PartnershipSetup=Partnership setup
+PartnershipAbout=About Partnership
+PartnershipAboutPage=Partnership about page
+partnershipforthirdpartyormember=Partner status must be set on a 'thirdparty' or a 'member'
+PARTNERSHIP_IS_MANAGED_FOR=Partnership managed for
+PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks to check
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb of days before cancelling status of a partnership when a subscription has expired
+ReferingWebsiteCheck=Check of website referring
+ReferingWebsiteCheckDesc=You can enable a feature to check that your partners has added a backlink to your website domains on their own website.
 
 #
 # Object
 #
+DeletePartnership=Delete a partnership
+PartnershipDedicatedToThisThirdParty=Partnership dedicated to this third party
+PartnershipDedicatedToThisMember=Partnership dedicated to this member
 DatePartnershipStart=تاریخ شروع
 DatePartnershipEnd=تاریخ پایان
+ReasonDecline=Decline reason
+ReasonDeclineOrCancel=Decline reason
+PartnershipAlreadyExist=Partnership already exist
+ManagePartnership=Manage partnership
+BacklinkNotFoundOnPartnerWebsite=Backlink not found on partner website
+ConfirmClosePartnershipAsk=Are you sure you want to cancel this partnership?
+PartnershipType=Partnership type
 
 #
 # Template Mail
 #
+SendingEmailOnPartnershipWillSoonBeCanceled=Partnership will soon be canceled
+SendingEmailOnPartnershipRefused=Partnership refused
+SendingEmailOnPartnershipAccepted=Partnership accepted
+SendingEmailOnPartnershipCanceled=Partnership canceled
 
+YourPartnershipWillSoonBeCanceledTopic=Partnership will soon be canceled
+YourPartnershipRefusedTopic=Partnership refused
+YourPartnershipAcceptedTopic=Partnership accepted
+YourPartnershipCanceledTopic=Partnership canceled
+
+YourPartnershipWillSoonBeCanceledContent=We inform you that your partnership will soon be canceled (Backlink not found)
+YourPartnershipRefusedContent=We inform you that your partnership request has been refused.
+YourPartnershipAcceptedContent=We inform you that your partnership request has been accepted.
+YourPartnershipCanceledContent=We inform you that your partnership has been canceled.
 
 #
 # Status
 #
-PartnershipDraft = پیش‌نویس
-PartnershipAccepted = قبول‌شده
-PartnershipRefused = رد شده
-PartnershipCanceled = لغو ظده
-
+PartnershipDraft=پیش‌نویس
+PartnershipAccepted=قبول‌شده
+PartnershipRefused=رد شده
+PartnershipCanceled=لغو ظده
 PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/fa_IR/productbatch.lang b/htdocs/langs/fa_IR/productbatch.lang
index df9e306b199..8b91d0b6960 100644
--- a/htdocs/langs/fa_IR/productbatch.lang
+++ b/htdocs/langs/fa_IR/productbatch.lang
@@ -1,4 +1,4 @@
-# ProductBATCH language file - en_US - ProductBATCH
+# ProductBATCH language file - Source file is en_US - ProductBATCH
 ManageLotSerial=استفاده از شمارۀ سری‌ساخت/سریال
 ProductStatusOnBatch=Yes (lot required)
 ProductStatusOnSerial=Yes (unique serial number required)
@@ -33,3 +33,13 @@ CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+LifeTime=Life span (in days)
+EndOfLife=End of life
+ManufacturingDate=Manufacturing date
+DestructionDate=Destruction date
+FirstUseDate=First use date
+QCFrequency=Quality control frequency (in days)
+
+#Traceability - qc status
+OutOfOrder=Out of order
+InWorkingOrder=In working order
diff --git a/htdocs/langs/fa_IR/products.lang b/htdocs/langs/fa_IR/products.lang
index c4630f85a19..a199ff418ed 100644
--- a/htdocs/langs/fa_IR/products.lang
+++ b/htdocs/langs/fa_IR/products.lang
@@ -396,3 +396,5 @@ ActionAvailableOnVariantProductOnly=این کنش تنها بر روی یک نو
 ProductsPricePerCustomer=قیمت محصول وابسته به مشتریان
 ProductSupplierExtraFields=Additional Attributes (Supplier Prices)
 DeleteLinkedProduct=Delete the child product linked to the combination
+PMPValue=قیمت میانگین متوازن
+PMPValueShort=قیمت میانگین وزنی
diff --git a/htdocs/langs/fa_IR/projects.lang b/htdocs/langs/fa_IR/projects.lang
index 1e04ba74bf6..0b9bef0bd37 100644
--- a/htdocs/langs/fa_IR/projects.lang
+++ b/htdocs/langs/fa_IR/projects.lang
@@ -267,9 +267,11 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=صورت‌حساب جدید
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+OneLinePerTimeSpentLine=One line for each time spent declaration
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
 AddPersonToTask=Add also to tasks
 UsageOrganizeEvent=Usage: Event Organization
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
+SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
diff --git a/htdocs/langs/fa_IR/receptions.lang b/htdocs/langs/fa_IR/receptions.lang
index e0f93225d34..6332b146ee4 100644
--- a/htdocs/langs/fa_IR/receptions.lang
+++ b/htdocs/langs/fa_IR/receptions.lang
@@ -44,4 +44,4 @@ ValidateOrderFirstBeforeReception=ابتدا باید سفارش را تائید
 ReceptionsNumberingModules=واحد شماره‌گذاری برای دریافت‌ها
 ReceptionsReceiptModel=قالب اسناد دریافت‌کالا
 NoMorePredefinedProductToDispatch=No more predefined products to dispatch
-
+ReceptionExist=A reception exists
diff --git a/htdocs/langs/fa_IR/stocks.lang b/htdocs/langs/fa_IR/stocks.lang
index b812bb6998c..a3109059e8d 100644
--- a/htdocs/langs/fa_IR/stocks.lang
+++ b/htdocs/langs/fa_IR/stocks.lang
@@ -56,8 +56,6 @@ UnitPurchaseValue=قیمت خرید واحد
 StockTooLow=موجودی بسیار کم است
 StockLowerThanLimit=موجودی کم‌تر از حد هشدار است (%s)
 EnhancedValue=مقدار
-PMPValue=قیمت میانگین متوازن
-PMPValueShort=قیمت میانگین وزنی
 EnhancedValueOfWarehouses=ارزش انبار
 UserWarehouseAutoCreate=ساخت خودکار انبار کاربر در هنگام ساخت کاربر
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
@@ -251,7 +249,10 @@ SelectAStockMovementFileToImport=select a stock movement file to import
 InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
 LabelOfInventoryMovemement=Inventory %s
 ReOpen=Reopen
-ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock to the real qty you entered into the inventory.
 ObjectNotFound=%s not found
 MakeMovementsAndClose=Generate movements and close
 AutofillWithExpected=Fill real quantity with expected quantity
+ShowAllBatchByDefault=By default, show batch details on product "stock" tab
+CollapseBatchDetailHelp=You can set batch detail default display in stocks module configuration
+FieldCannotBeNegative=Field "%s" cannot be negative
diff --git a/htdocs/langs/fa_IR/ticket.lang b/htdocs/langs/fa_IR/ticket.lang
index 7a7e7755a33..3fbcff25590 100644
--- a/htdocs/langs/fa_IR/ticket.lang
+++ b/htdocs/langs/fa_IR/ticket.lang
@@ -304,7 +304,7 @@ BoxLastModifiedTicket=آخرین برگه‌های ویرایش شده
 BoxLastModifiedTicketDescription=آخرین %s برگۀ‌پشتیبانی ویرایش شده
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=هیچ برگۀپشتیبانی ویرایش نشده شد
-BoxTicketType=Number of open tickets by type
+BoxTicketType=Distribution of open tickets by type
 BoxTicketSeverity=Number of open tickets by severity
 BoxNoTicketSeverity=No tickets opened
 BoxTicketLastXDays=Number of new tickets by days the last %s days
diff --git a/htdocs/langs/fi_FI/accountancy.lang b/htdocs/langs/fi_FI/accountancy.lang
index baf2006db44..faa535d0d0c 100644
--- a/htdocs/langs/fi_FI/accountancy.lang
+++ b/htdocs/langs/fi_FI/accountancy.lang
@@ -158,7 +158,7 @@ ACCOUNTING_LENGTH_AACCOUNT=Length of the third-party accounting accounts (If you
 ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of an accounting account. Needed by some countries (like Switzerland). If set to off (default), you can set the following two parameters to ask the application to add virtual zeros.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties, break ability to search on a part of value)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
@@ -328,6 +328,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountanc
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
+NotifiedExportDate=Notified export date (modification of the entries will not be possible)
+NotifiedValidationDate=Validation of the entries (modification or deletion of the entries will not be possible)
+ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=Export draft journal
 Modelcsv=Vientimalli
 Selectmodelcsv=Valitse vientimalli
diff --git a/htdocs/langs/fi_FI/admin.lang b/htdocs/langs/fi_FI/admin.lang
index 8d44d22a22d..00058ce7a2c 100644
--- a/htdocs/langs/fi_FI/admin.lang
+++ b/htdocs/langs/fi_FI/admin.lang
@@ -221,8 +221,8 @@ NotCompatible=Moduuli ei ole yhteensopiva Dolibarr - version %s kanssa. (Min %s
 CompatibleAfterUpdate=Moduuli vaatii Dolibarr - version %s päivittämisen. (Min %s - Max %s)
 SeeInMarkerPlace=Katso kauppapaikalla
 SeeSetupOfModule=Katso moduulin %s asetukset
+SetOptionTo=Set option <b>%s</b> to %s
 Updated=Päivitetty
-Nouveauté=Uutuus
 AchatTelechargement=Osta / Lataa
 GoModuleSetupArea=Voit ottaa uuden moduulin käyttöön tai asentaa sen siirtymällä moduulin asennusalueelle: <a href="%s"> %s </a>.
 DoliStoreDesc=DoliStore, virallinen markkinapaikka Dolibarr ERP / CRM lisäosille
@@ -399,6 +399,7 @@ SecurityToken=Avain turvallinen URL
 NoSmsEngine=Ei tekstiviestien lähettäjien hallintaa. Tekstiviestien lähettäjien hallintaa ei ole asennettu oletusjakelun kanssa, koska ne riippuvat ulkoisesta toimittajasta, mutta joitain löydät osoitteesta %s
 PDF=PDF
 PDFDesc=Globaalit vaihtoehdot PDF-tiedostojen luomista varten
+PDFOtherDesc=PDF Option specific to some modules
 PDFAddressForging=Osoiteosuuden säännöt
 HideAnyVATInformationOnPDF=Piilota kaikki myyntiveroihin/ALViin liittyvä tieto
 PDFRulesForSalesTax=Myyntiveron / alv:n säännöt
@@ -561,7 +562,7 @@ Module53Desc=Palvelunhallinta
 Module54Name=Sopimukset/Tilaukset
 Module54Desc=Sopimusten hallinta (palvelut tai toistuvat tilaukset)
 Module55Name=Viivakoodit
-Module55Desc=Viivakoodien hallinta
+Module55Desc=Barcode or QR code management
 Module56Name=Maksu tilisiirrolla
 Module56Desc=Toimittajien maksujen hallinta tilisiirtotilauksilla. Se sisältää SEPA-tiedoston luomisen Euroopan maille.
 Module57Name=Maksut suoraveloituksella
@@ -848,10 +849,10 @@ Permission402=Luoda / muuttaa alennukset
 Permission403=Validate alennukset
 Permission404=Poista alennukset
 Permission430=Käytä virheenkorjauspalkkia
-Permission511=Lue palkkamaksut (omat ja alaisten)
-Permission512=Luo/Muokkaa palkanmaksuja
-Permission514=Poista palkanmaksuja
-Permission517=Lue kaikkien palkkamaksut
+Permission511=Read salaries and payments (yours and subordinates)
+Permission512=Create/modify salaries and payments
+Permission514=Delete salaries and payments
+Permission517=Read salaries and payments everybody
 Permission519=Vie palkat
 Permission520=Lue Lainat
 Permission522=Luo/muokkaa Lainat
@@ -965,6 +966,8 @@ Permission23003=Poista Ajastettu työ
 Permission23004=Suorita Ajastettu työ
 Permission50101=Käytä myyntipistettä (SimplePOS)
 Permission50151=Käytä myyntipistettä (TakePOS)
+Permission50152=Edit sales lines
+Permission50153=Edit ordered sales lines
 Permission50201=Lue liiketoimet
 Permission50202=Tuo liiketoimet
 Permission50330=Lue Zapier-kohteet
@@ -1039,11 +1042,12 @@ DictionaryMeasuringUnits=Mittayksiköt
 DictionarySocialNetworks=Sosiaaliset verkostot
 DictionaryProspectStatus=Prospect status for companies
 DictionaryProspectContactStatus=Prospect status for contacts
-DictionaryHolidayTypes=Vapaan tyyppi
+DictionaryHolidayTypes=Leave - Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Kuluraportti - Kuljetuskategoriat
 DictionaryExpenseTaxRange=Kuluraportti - alue kuljetusluokittain
 DictionaryTransportMode=Intracomm report - Transport mode
+DictionaryBatchStatus=Product lot/serial Quality Control status
 TypeOfUnit=Yksikön tyyppi
 SetupSaved=Asetukset tallennettu
 SetupNotSaved=Asetuksia ei tallennettu
@@ -1187,7 +1191,7 @@ SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of m
 SetupDescription5=Other Setup menu entries manage optional parameters.
 AuditedSecurityEvents=Security events that are audited
 NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
-Audit=Auditointi
+Audit=Security events
 InfoDolibarr=Tietoja Dolibarrista
 InfoBrowser=Tietoja selaimesta
 InfoOS=Tietoja OS
@@ -1319,9 +1323,12 @@ ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
 NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
+ComboListOptim=Combo list loading optimization
 SearchOptim=Hakuoptimointi
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
-YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
+YouHaveXObjectUseComboOptim=You have %s %s in the database. You can go into setup of module to enable loading of combo list on key pressed event.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other.
+YouHaveXObjectUseSearchOptimDesc=This limits the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to %s in Home-Setup-Other.
 BrowserIsOK=Käytät verkkoselainta %s. Tämä selain on turvallisuuden ja suorituskyvyn kannalta ok.
 BrowserIsKO=Käytät verkkoselainta %s. Tämän selaimen tiedetään olevan huono valinta turvallisuden, suorituskyvyn ja luotettavuuden kannalta. Suosittelemme Firefoxin, Chromen, Operan tai Safarin käyttöä.
 PHPModuleLoaded=PHP:n laajennus %sladattu
@@ -1433,6 +1440,7 @@ MemberMainOptions=Päävaihtoehtoa
 AdherentLoginRequired= Hallitse Sisään jokaiselle jäsenelle
 AdherentMailRequired=Uuden jäsenen luomiseen vaaditaan sähköpostiosoite
 MemberSendInformationByMailByDefault=Checkbox lähettää vahvistusviestin jäsenille on oletusarvoisesti
+MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
 VisitorCanChooseItsPaymentMode=Vierailija voi valita käytettävissä olevista maksutavoista
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
 MembersDocModules=Document templates for documents generated from member record
@@ -1763,7 +1771,7 @@ AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting men
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Ota käyttöön ilmoitusäänet
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
-AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the scheduled job %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup='Click To Dial'-moduulin asetukset
@@ -1979,6 +1987,8 @@ MAIN_PDF_MARGIN_RIGHT=PDF:n oikea marginaali
 MAIN_PDF_MARGIN_TOP=PDF:n ylämarginaali
 MAIN_PDF_MARGIN_BOTTOM=PDF:n alamarginaali
 MAIN_DOCUMENTS_LOGO_HEIGHT=Logon korkeus PDF-muodossa
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add picture on proposal line
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add electronic sign in PDF
 NothingToSetup=Tämä moduuli ei vaadi erityisiä määrityksiä.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
@@ -2096,7 +2106,6 @@ PDF_SHOW_PROJECT=Show project on document
 ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
-FeatureNotAvailableWithReceptionModule=Ominaisuus ei käytettävissä kun moduuli Vastaanotto on aktiivinen
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Siirry kohtaan Asetukset -> Widgetit
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
@@ -2120,12 +2129,18 @@ ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by
 MailToSendEventOrganization=Event Organization
 AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
 YouShouldDisablePHPFunctions=You should disable PHP functions
-IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands in custom code, you shoud disable PHP functions
+PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
+NotRecommended=Not recommanded
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
 ModuleUpdateAvailable=An update is available
 NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
+RandomlySelectedIfSeveral=Randomly selected if several pictures are available
+DatabasePasswordObfuscated=Database password is obfuscated in conf file
+DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
diff --git a/htdocs/langs/fi_FI/agenda.lang b/htdocs/langs/fi_FI/agenda.lang
index 979cc048c3c..a86b6493e50 100644
--- a/htdocs/langs/fi_FI/agenda.lang
+++ b/htdocs/langs/fi_FI/agenda.lang
@@ -4,7 +4,7 @@ Actions=Toimet
 Agenda=Agenda
 TMenuAgenda=Agenda
 Agendas=Esityslistat
-LocalAgenda=Internal calendar
+LocalAgenda=Default calendar
 ActionsOwnedBy=Event owned by
 ActionsOwnedByShort=Omistaja
 AffectedTo=Vaikuttaa
@@ -14,13 +14,13 @@ EventsNb=Number of events
 ListOfActions=Luettelo tapahtumista
 EventReports=Event reports
 Location=Sijainti
-ToUserOfGroup=Event assigned to any user in group
+ToUserOfGroup=Event assigned to any user in the group
 EventOnFullDay=Tapahtuma on koko päivä
 MenuToDoActions=Kaikki puutteelliset toimet
 MenuDoneActions=Kaikki irti toimia
 MenuToDoMyActions=Oma puutteellisia toimia
 MenuDoneMyActions=Oma irtisanotaan toimia
-ListOfEvents=List of events (internal calendar)
+ListOfEvents=List of events (default calendar)
 ActionsAskedBy=Toimet kirjattava
 ActionsToDoBy=Toimet vaikuttaa
 ActionsDoneBy=Toimet tehdään
@@ -38,6 +38,7 @@ ActionsEvents=Tapahtumat, joista Dolibarr luo toimia esityslistan automaattisest
 EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Third party %s created
+COMPANY_MODIFYInDolibarr=Third party %s modified
 COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=Contract %s validated
 CONTRACT_DELETEInDolibarr=Contract %s deleted
@@ -87,6 +88,7 @@ OrderDeleted=Order deleted
 InvoiceDeleted=Lasku poistettu
 DraftInvoiceDeleted=Draft invoice deleted
 CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_MODIFYInDolibarr=Contact %s modified
 CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Product %s created
 PRODUCT_MODIFYInDolibarr=Product %s modified
@@ -119,6 +121,7 @@ MRP_MO_UNVALIDATEInDolibarr=MO set to draft status
 MRP_MO_PRODUCEDInDolibarr=MO produced
 MRP_MO_DELETEInDolibarr=MO deleted
 MRP_MO_CANCELInDolibarr=MO canceled
+PAIDInDolibarr=%s paid
 ##### End agenda events #####
 AgendaModelModule=Document templates for event
 DateActionStart=Aloituspäivämäärä
@@ -130,7 +133,7 @@ AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to use
 AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
 AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic events.
 AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> to include events of holidays.
-AgendaShowBirthdayEvents=Show birthdays of contacts
+AgendaShowBirthdayEvents=Birthdays of contacts
 AgendaHideBirthdayEvents=Hide birthdays of contacts
 Busy=Busy
 ExportDataset_event1=List of agenda events
@@ -152,6 +155,7 @@ ActionType=Event type
 DateActionBegin=Start event date
 ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b>?
 RepeatEvent=Repeat event
+OnceOnly=Once only
 EveryWeek=Every week
 EveryMonth=Every month
 DayOfMonth=Day of month
@@ -165,4 +169,4 @@ TimeType=Duration type
 ReminderType=Callback type
 AddReminder=Create an automatic reminder notification for this event
 ErrorReminderActionCommCreation=Error creating the reminder notification for this event
-BrowserPush=Browser Notification
+BrowserPush=Browser Popup Notification
diff --git a/htdocs/langs/fi_FI/bills.lang b/htdocs/langs/fi_FI/bills.lang
index 24f5c55b2d0..14847bfbf82 100644
--- a/htdocs/langs/fi_FI/bills.lang
+++ b/htdocs/langs/fi_FI/bills.lang
@@ -259,6 +259,7 @@ DateMaxPayment=Payment due on
 DateInvoice=Laskun päiväys
 DatePointOfTax=Point of tax
 NoInvoice=N: o lasku
+NoOpenInvoice=No open invoice
 ClassifyBill=Luokittele lasku
 SupplierBillsToPay=Maksamattomat toimittajien laskut
 CustomerBillsUnpaid=Asiakkaiden maksamattomat laskut
@@ -589,3 +590,4 @@ FacParentLine=Invoice Line Parent
 SituationTotalRayToRest=Remainder to pay without taxe
 PDFSituationTitle=Situation n° %d
 SituationTotalProgress=Total progress %d %%
+SearchUnpaidInvoicesWithDueDate=Search unpaid invoices with a due date = %s
diff --git a/htdocs/langs/fi_FI/cashdesk.lang b/htdocs/langs/fi_FI/cashdesk.lang
index e04e7aa113f..1fdcb14821d 100644
--- a/htdocs/langs/fi_FI/cashdesk.lang
+++ b/htdocs/langs/fi_FI/cashdesk.lang
@@ -102,7 +102,7 @@ CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal numb
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
 SaleStartedAt=Sale started at %s
-ControlCashOpening=Control cash popup at opening POS
+ControlCashOpening=Open the "Control cash" popup when opening the POS
 CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -126,5 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
-ShowPriceHT = Display the price excluding tax column
-ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
+ShowPriceHT = Display the column with the price excluding tax (on screen)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
diff --git a/htdocs/langs/fi_FI/compta.lang b/htdocs/langs/fi_FI/compta.lang
index 9ea8491fb18..aec84f66a18 100644
--- a/htdocs/langs/fi_FI/compta.lang
+++ b/htdocs/langs/fi_FI/compta.lang
@@ -286,3 +286,9 @@ ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
 IncludeLoansInResults = Include loans in reports
+InvoiceLate30Days = Invoices late > 30 days
+InvoiceLate15Days = Invoices late > 15 days
+InvoiceLateMinus15Days = Invoices late
+InvoiceNotLate = To be collected < 15 days
+InvoiceNotLate15Days = To be collected in 15 days
+InvoiceNotLate30Days = To be collected in 30 days
diff --git a/htdocs/langs/fi_FI/cron.lang b/htdocs/langs/fi_FI/cron.lang
index 289befd89cd..b4cf6d1e71d 100644
--- a/htdocs/langs/fi_FI/cron.lang
+++ b/htdocs/langs/fi_FI/cron.lang
@@ -21,7 +21,7 @@ CronJobProfiles=List of predefined cron job profiles
 EnabledAndDisabled=Enabled and disabled
 # Page list
 CronLastOutput=Latest run output
-CronLastResult=Latest result code
+CronLastResult=Viimeisin tuloskoodi
 CronCommand=Command
 CronList=Ajastetut työt
 CronDelete=Delete scheduled jobs
@@ -60,7 +60,7 @@ CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
 CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Poistaa käytöstä
-CronTaskInactive=This job is disabled
+CronTaskInactive=This job is disabled (not scheduled)
 CronId=Id
 CronClassFile=Filename with class
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example 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>
diff --git a/htdocs/langs/fi_FI/errors.lang b/htdocs/langs/fi_FI/errors.lang
index 1d8a26f28b0..4766611b848 100644
--- a/htdocs/langs/fi_FI/errors.lang
+++ b/htdocs/langs/fi_FI/errors.lang
@@ -11,6 +11,7 @@ ErrorBadValueForParamNotAString=Bad value for your parameter. It appends general
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Kirjaudu %s on jo olemassa.
 ErrorGroupAlreadyExists=Ryhmän %s on jo olemassa.
+ErrorEmailAlreadyExists=Email %s already exists.
 ErrorRecordNotFound=Levykauppa ei löytynyt.
 ErrorFailToCopyFile=Epäonnistui kopioida tiedoston <b>%s</b> ilmaisuksi <b>%s</b> &quot;.
 ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
@@ -117,7 +118,7 @@ ErrorCantReadFile=Failed to read file ' %s'
 ErrorCantReadDir=Lukeminen epäonnistui directory ' %s'
 ErrorBadLoginPassword=Bad arvo kirjautumistunnus tai salasana
 ErrorLoginDisabled=Tilisi on poistettu käytöstä
-ErrorFailedToRunExternalCommand=Epäonnistui suorittaa ulkoista komentoa. Tarkista se on saatavilla ja runnable teidän PHP palvelimelta. Jos PHP <b>Vikasietotila</b> on käytössä, tarkista, että komento on sisällä hakemiston määritelty parametri <b>safe_mode_exec_dir.</b>
+ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server user. Check also the command is not protected on shell level by a security layer like apparmor.
 ErrorFailedToChangePassword=Ei vaihda salasana
 ErrorLoginDoesNotExists=Käyttäjälle <b>sisäänkirjoittautumissivuksesi %s</b> ei löydy.
 ErrorLoginHasNoEmail=Tämä käyttäjä ei ole sähköpostiosoitetta. Process aborted.
@@ -262,6 +263,7 @@ ErrorDateIsInFuture=Error, the date can't be in the future
 ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
 ErrorAPercentIsRequired=Error, please fill in the percentage correctly
 ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
+ErrorFailedToFindEmailTemplate=Failed to find template with code name %s
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -298,3 +300,4 @@ WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So y
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
+ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
diff --git a/htdocs/langs/fi_FI/eventorganization.lang b/htdocs/langs/fi_FI/eventorganization.lang
index 7d9658f4cd8..5ced2914415 100644
--- a/htdocs/langs/fi_FI/eventorganization.lang
+++ b/htdocs/langs/fi_FI/eventorganization.lang
@@ -1,4 +1,5 @@
 # Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+# Copyright (C) 2021		Dorian Vabre			<dorian.vabre@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
@@ -81,7 +82,10 @@ PriceOfBoothHelp=Subscription price to stand a booth
 EventOrganizationICSLink=Link ICS for events
 ConferenceOrBoothInformation=Conference Or Booth informations
 Attendees = Attendees
+DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
 #
 # Status
 #
@@ -94,8 +98,46 @@ EvntOrgCancelled = Cancelled
 #
 # Public page
 #
+SuggestForm = Suggestion page
+RegisterPage = Page for conferences or booth
+EvntOrgRegistrationHelpMessage = Here, you can vote for an event, or suggest a new conference or booth for the project
+EvntOrgRegistrationConfHelpMessage = Here, you can suggest a new conference for the project
+EvntOrgRegistrationBoothHelpMessage = Here, you can suggest a new booth for the project
+ListOfSuggestedConferences = List of suggested conferences
+ListOfSuggestedBooths = List of suggested booths
+SuggestConference = Suggest a new conference
+SuggestBooth = Suggest a booth
+ViewAndVote = View and vote for suggested events
 PublicAttendeeSubscriptionPage = Public link of registration to a conference
 MissingOrBadSecureKey = The security key is invalid or missing
-EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
-EvntOrgStartDuration = This conference starts on
-EvntOrgEndDuration =  and ends on
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference : '%s'
+EvntOrgDuration = This conference starts on %s and ends on %s.
+ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
+BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
+EventType = Event type
+
+#
+# Vote page
+#
+EvntOrgRegistrationWelcomeMessage = Welcome on the conference or booth suggestion page.
+EvntOrgRegistrationConfWelcomeMessage = Welcome on the conference suggestion page.
+EvntOrgRegistrationBoothWelcomeMessage = Welcome on the booth suggestion page.
+EvntOrgVoteHelpMessage = Here, you can view and vote for the suggested events for the project
+VoteOk = Your vote has been accepted.
+AlreadyVoted = You have already voted for this event.
+VoteError = An error has occurred during the vote, please try again.
+
+#
+# SubscriptionOk page
+#
+SubscriptionOk = Your subscription to this conference has been validated
+#
+# Subscription validation mail
+#
+ConfAttendeeSubscriptionConfirmation = Confirmation of your subscription to a conference
+#
+# Payment page
+#
+Attendee = Attendee
+PaymentConferenceAttendee = Conference attendee payment
+PaymentBoothLocation = Booth location payment
diff --git a/htdocs/langs/fi_FI/hrm.lang b/htdocs/langs/fi_FI/hrm.lang
index 0dd22e38f05..d1fa2f23508 100644
--- a/htdocs/langs/fi_FI/hrm.lang
+++ b/htdocs/langs/fi_FI/hrm.lang
@@ -9,7 +9,7 @@ ConfirmDeleteEstablishment=Are you sure you wish to delete this establishment?
 OpenEtablishment=Avaa laitos
 CloseEtablishment=Sulje laitos
 # Dictionary
-DictionaryPublicHolidays=HRM - Public holidays
+DictionaryPublicHolidays=Leave - Public holidays
 DictionaryDepartment=HRM - Osastolista
 DictionaryFunction=HRM - Job positions
 # Module
diff --git a/htdocs/langs/fi_FI/knowledgemanagement.lang b/htdocs/langs/fi_FI/knowledgemanagement.lang
index 156fe17e65c..f78a4f6baf1 100644
--- a/htdocs/langs/fi_FI/knowledgemanagement.lang
+++ b/htdocs/langs/fi_FI/knowledgemanagement.lang
@@ -47,7 +47,7 @@ KnowledgeManagementArea = Knowledge Management
 # Menu
 #
 MenuKnowledgeRecord = Knowledge base
-ListOfArticles = List of articles
+ListKnowledgeRecord = List of articles
 NewKnowledgeRecord = New article
 ValidateReply = Validate solution
 KnowledgeRecords = Articles
diff --git a/htdocs/langs/fi_FI/languages.lang b/htdocs/langs/fi_FI/languages.lang
index e68bff8db24..a1e5119f1e3 100644
--- a/htdocs/langs/fi_FI/languages.lang
+++ b/htdocs/langs/fi_FI/languages.lang
@@ -3,6 +3,7 @@ Language_am_ET=Ethiopian
 Language_ar_AR=Arabia
 Language_ar_EG=Arabic (Egypt)
 Language_ar_SA=Arabic
+Language_ar_TN=Arabic (Tunisia)
 Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengali
 Language_bn_IN=Bengali (India)
@@ -84,6 +85,7 @@ Language_nl_NL=Dutch
 Language_pl_PL=Puola
 Language_pt_BR=Portugali (Brasilia)
 Language_pt_PT=Portugali
+Language_ro_MD=Romanian (Moldavia)
 Language_ro_RO=Romanialainen
 Language_ru_RU=Venäläinen
 Language_ru_UA=Venäjä (Ukraina)
diff --git a/htdocs/langs/fi_FI/main.lang b/htdocs/langs/fi_FI/main.lang
index 9a6f1f0a878..3b16ca9f11d 100644
--- a/htdocs/langs/fi_FI/main.lang
+++ b/htdocs/langs/fi_FI/main.lang
@@ -430,6 +430,7 @@ LT1IN=CGST
 LT2IN=SGST
 LT1GC=Additionnal cents
 VATRate=Veroaste
+RateOfTaxN=Rate of tax %s
 VATCode=Tax Rate code
 VATNPR=Tax Rate NPR
 DefaultTaxRate=Oletus veroprosentti
@@ -729,6 +730,7 @@ MenuMembers=Jäsenet
 MenuAgendaGoogle=Google agenda
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr raja (Valikko koti-setup-turvallisuus): %s Kb, PHP raja: %s Kb
+ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
 NoFileFound=No documents uploaded
 CurrentUserLanguage=Nykyinen kieli
 CurrentTheme=Nykyinen teema
@@ -1072,6 +1074,7 @@ ValidFrom=Voimassa alkaen
 ValidUntil=Voimassa asti
 NoRecordedUsers=Ei käyttäjiä
 ToClose=Sulkeaksesi
+ToRefuse=To refuse
 ToProcess=Jotta prosessi
 ToApprove=Hyväksyäksesi
 GlobalOpenedElemView=Globaali näkymä
@@ -1126,9 +1129,11 @@ UpdateForAllLines=Päivitys kaikille riveille
 OnHold=On hold
 Civility=Civility
 AffectTag=Affect Tag
+CreateExternalUser=Create external user
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
 ConfirmCancel=Are you sure you want to cancel
+EmailMsgID=Email MsgID
diff --git a/htdocs/langs/fi_FI/members.lang b/htdocs/langs/fi_FI/members.lang
index 1677ab2adab..069b25196b4 100644
--- a/htdocs/langs/fi_FI/members.lang
+++ b/htdocs/langs/fi_FI/members.lang
@@ -213,3 +213,5 @@ SendReminderForExpiredSubscription=Send reminder by email to members when subscr
 MembershipPaid=Membership paid for current period (until %s)
 YouMayFindYourInvoiceInThisEmail=You may find your invoice attached to this email
 XMembersClosed=%s member(s) closed
+XExternalUserCreated=%s external user(s) created
+ForceMemberNature=Force member nature (Individual or Corporation)
diff --git a/htdocs/langs/fi_FI/modulebuilder.lang b/htdocs/langs/fi_FI/modulebuilder.lang
index 13dfee730b5..0e952b9f779 100644
--- a/htdocs/langs/fi_FI/modulebuilder.lang
+++ b/htdocs/langs/fi_FI/modulebuilder.lang
@@ -143,3 +143,4 @@ AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
 ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
+ImportExportProfiles=Import and export profiles
diff --git a/htdocs/langs/fi_FI/mrp.lang b/htdocs/langs/fi_FI/mrp.lang
index c6e8061c790..2eafe6926bb 100644
--- a/htdocs/langs/fi_FI/mrp.lang
+++ b/htdocs/langs/fi_FI/mrp.lang
@@ -8,12 +8,12 @@ MenuBOM=Bills of material
 LatestBOMModified=Latest %s Bills of materials modified
 LatestMOModified=Latest %s Manufacturing Orders modified
 Bom=Bills of Material
-BillOfMaterials=Bill of Material
+BillOfMaterials=Bill of Materials
 BOMsSetup=Setup of module BOM
 ListOfBOMs=List of bills of material - BOM
 ListOfManufacturingOrders=List of Manufacturing Orders
-NewBOM=New bill of material
-ProductBOMHelp=Product to create with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
+NewBOM=New bill of materials
+ProductBOMHelp=Product to create (or disassemble) with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
 BOMsNumberingModules=BOM numbering templates
 BOMsModelModule=BOM document templates
 MOsNumberingModules=MO numbering templates
@@ -22,7 +22,7 @@ FreeLegalTextOnBOMs=Free text on document of BOM
 WatermarkOnDraftBOMs=Watermark on draft BOM
 FreeLegalTextOnMOs=Free text on document of MO
 WatermarkOnDraftMOs=Watermark on draft MO
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials %s ?
 ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
 ManufacturingEfficiency=Manufacturing efficiency
 ConsumptionEfficiency=Consumption efficiency
@@ -30,8 +30,8 @@ ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the produc
 ValueOfMeansLossForProductProduced=Value of 0.95 means an average of 5%% of loss of produced product
 DeleteBillOfMaterials=Delete Bill Of Materials
 DeleteMo=Delete Manufacturing Order
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Materials?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Materials?
 MenuMRP=Valmistustilaukset
 NewMO=New Manufacturing Order
 QtyToProduce=Qty to produce
@@ -39,7 +39,7 @@ DateStartPlannedMo=Date start planned
 DateEndPlannedMo=Date end planned
 KeepEmptyForAsap=Empty means 'As Soon As Possible'
 EstimatedDuration=Estimated duration
-EstimatedDurationDesc=Estimated duration to manufacture this product using this BOM
+EstimatedDurationDesc=Estimated duration to manufacture (or disassemble) this product using this BOM
 ConfirmValidateBom=Are you sure you want to validate the BOM with the reference <strong>%s</strong> (you will be able to use it to build new Manufacturing Orders)
 ConfirmCloseBom=Are you sure you want to cancel this BOM (you won't be able to use it to build new Manufacturing Orders anymore) ?
 ConfirmReopenBom=Are you sure you want to re-open this BOM (you will be able to use it to build new Manufacturing Orders)
@@ -63,13 +63,14 @@ ConsumeAndProduceAll=Consume and Produce All
 Manufactured=Manufactured
 TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
 ForAQuantityOf=For a quantity to produce of %s
+ForAQuantityToConsumeOf=For a quantity to disassemble of %s
 ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
 ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
 ProductionForRef=Production of %s
 AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
 NoStockChangeOnServices=No stock change on services
 ProductQtyToConsumeByMO=Product quantity still to consume by open MO
-ProductQtyToProduceByMO=Product quentity still to produce by open MO
+ProductQtyToProduceByMO=Product quantity still to produce by open MO
 AddNewConsumeLines=Add new line to consume
 ProductsToConsume=Products to consume
 ProductsToProduce=Products to produce
@@ -83,15 +84,13 @@ Workstations=Workstations
 WorkstationsDescription=Workstations management
 WorkstationSetup = Workstations setup
 WorkstationSetupPage = Workstations setup page
-WorkstationAbout = About Workstation
-WorkstationAboutPage = Workstations about page
 WorkstationList=Workstation list
 WorkstationCreate=Add new workstation
 ConfirmEnableWorkstation=Are you sure you want to enable workstation <b>%s</b> ?
 EnableAWorkstation=Enable a workstation
 ConfirmDisableWorkstation=Are you sure you want to disable workstation <b>%s</b> ?
 DisableAWorkstation=Disable a workstation
-DeleteWorkstation=Supprimer
+DeleteWorkstation=Poista
 NbOperatorsRequired=Number of operators required
 THMOperatorEstimated=Estimated operator THM
 THMMachineEstimated=Estimated machine THM
diff --git a/htdocs/langs/fi_FI/orders.lang b/htdocs/langs/fi_FI/orders.lang
index e4c9e7599b3..48a2427a6b4 100644
--- a/htdocs/langs/fi_FI/orders.lang
+++ b/htdocs/langs/fi_FI/orders.lang
@@ -11,6 +11,7 @@ OrderDate=Tilauspäivämäärä
 OrderDateShort=Tilauspäivä
 OrderToProcess=Jotta prosessi
 NewOrder=Uusi tilaus
+NewSupplierOrderShort=Uusi tilaus
 NewOrderSupplier=Uusi Ostotilaus
 ToOrder=Tee tilaus
 MakeOrder=Tee tilaus
@@ -73,6 +74,7 @@ DeleteOrder=Poista tilaus
 CancelOrder=Peruuta tilaus
 OrderReopened= Tilaus %s uudelleenavaus
 AddOrder=Luo tilaus
+AddSupplierOrderShort=Luo tilaus
 AddPurchaseOrder=Muodosta Ostotilaus
 AddToDraftOrders=Lisää kesken olevalle tilaukselle
 ShowOrder=Näytä tilaus
diff --git a/htdocs/langs/fi_FI/other.lang b/htdocs/langs/fi_FI/other.lang
index d5d81d8306a..08bf5d703cf 100644
--- a/htdocs/langs/fi_FI/other.lang
+++ b/htdocs/langs/fi_FI/other.lang
@@ -129,6 +129,7 @@ ClosedByLogin=User login who closed
 FileWasRemoved=Tiedosto on poistettu
 DirWasRemoved=Directory poistettiin
 FeatureNotYetAvailable=Feature not yet available in the current version
+FeatureNotAvailableOnDevicesWithoutMouse=Feature not available on devices without mouse
 FeaturesSupported=Supported features
 Width=Leveys
 Height=Korkeus
@@ -263,7 +264,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
-PrefixSession=Prefix for session ID
+SuffixSessionName=Suffix for session name
 
 ##### Export #####
 ExportsArea=Vienti alueen
diff --git a/htdocs/langs/fi_FI/partnership.lang b/htdocs/langs/fi_FI/partnership.lang
index 1d3a9bab390..19528525beb 100644
--- a/htdocs/langs/fi_FI/partnership.lang
+++ b/htdocs/langs/fi_FI/partnership.lang
@@ -16,41 +16,72 @@
 #
 # Generic
 #
-ModulePartnershipName = Partnership management
-PartnershipDescription = Module Partnership management
+ModulePartnershipName=Partnership management
+PartnershipDescription=Module Partnership management
 PartnershipDescriptionLong= Module Partnership management
 
+AddPartnership=Add partnership
+CancelPartnershipForExpiredMembers=Partnership: Cancel partnership of members with expired subscriptions
+PartnershipCheckBacklink=Partnership: Check referring backlink
+
 #
 # Menu
 #
-NewPartnership = New Partnership
-ListOfPartnerships = List of partnership
+NewPartnership=New Partnership
+ListOfPartnerships=List of partnership
 
 #
 # Admin page
 #
-PartnershipSetup = Partnership setup
-PartnershipAbout = About Partnership
-PartnershipAboutPage = Partnership about page
-
+PartnershipSetup=Partnership setup
+PartnershipAbout=About Partnership
+PartnershipAboutPage=Partnership about page
+partnershipforthirdpartyormember=Partner status must be set on a 'thirdparty' or a 'member'
+PARTNERSHIP_IS_MANAGED_FOR=Partnership managed for
+PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks to check
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb of days before cancelling status of a partnership when a subscription has expired
+ReferingWebsiteCheck=Check of website referring
+ReferingWebsiteCheckDesc=You can enable a feature to check that your partners has added a backlink to your website domains on their own website.
 
 #
 # Object
 #
+DeletePartnership=Delete a partnership
+PartnershipDedicatedToThisThirdParty=Partnership dedicated to this third party
+PartnershipDedicatedToThisMember=Partnership dedicated to this member
 DatePartnershipStart=Aloituspäivämäärä
 DatePartnershipEnd=Lopetuspäivä
+ReasonDecline=Decline reason
+ReasonDeclineOrCancel=Decline reason
+PartnershipAlreadyExist=Partnership already exist
+ManagePartnership=Manage partnership
+BacklinkNotFoundOnPartnerWebsite=Backlink not found on partner website
+ConfirmClosePartnershipAsk=Are you sure you want to cancel this partnership?
+PartnershipType=Partnership type
 
 #
 # Template Mail
 #
+SendingEmailOnPartnershipWillSoonBeCanceled=Partnership will soon be canceled
+SendingEmailOnPartnershipRefused=Partnership refused
+SendingEmailOnPartnershipAccepted=Partnership accepted
+SendingEmailOnPartnershipCanceled=Partnership canceled
 
+YourPartnershipWillSoonBeCanceledTopic=Partnership will soon be canceled
+YourPartnershipRefusedTopic=Partnership refused
+YourPartnershipAcceptedTopic=Partnership accepted
+YourPartnershipCanceledTopic=Partnership canceled
+
+YourPartnershipWillSoonBeCanceledContent=We inform you that your partnership will soon be canceled (Backlink not found)
+YourPartnershipRefusedContent=We inform you that your partnership request has been refused.
+YourPartnershipAcceptedContent=We inform you that your partnership request has been accepted.
+YourPartnershipCanceledContent=We inform you that your partnership has been canceled.
 
 #
 # Status
 #
-PartnershipDraft = Luonnos
-PartnershipAccepted = Accepted
-PartnershipRefused = Hylätty
-PartnershipCanceled = Peruttu
-
+PartnershipDraft=Luonnos
+PartnershipAccepted=Accepted
+PartnershipRefused=Hylätty
+PartnershipCanceled=Peruttu
 PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/fi_FI/productbatch.lang b/htdocs/langs/fi_FI/productbatch.lang
index e256a46afde..bad118ad377 100644
--- a/htdocs/langs/fi_FI/productbatch.lang
+++ b/htdocs/langs/fi_FI/productbatch.lang
@@ -1,4 +1,4 @@
-# ProductBATCH language file - en_US - ProductBATCH
+# ProductBATCH language file - Source file is en_US - ProductBATCH
 ManageLotSerial=Käytä erää / sarjanumeroa
 ProductStatusOnBatch=Yes (lot required)
 ProductStatusOnSerial=Yes (unique serial number required)
@@ -33,3 +33,13 @@ CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+LifeTime=Life span (in days)
+EndOfLife=End of life
+ManufacturingDate=Manufacturing date
+DestructionDate=Destruction date
+FirstUseDate=First use date
+QCFrequency=Quality control frequency (in days)
+
+#Traceability - qc status
+OutOfOrder=Out of order
+InWorkingOrder=In working order
diff --git a/htdocs/langs/fi_FI/products.lang b/htdocs/langs/fi_FI/products.lang
index 78ce167092c..9ba1ec01f7b 100644
--- a/htdocs/langs/fi_FI/products.lang
+++ b/htdocs/langs/fi_FI/products.lang
@@ -396,3 +396,5 @@ ActionAvailableOnVariantProductOnly=Action only available on the variant of prod
 ProductsPricePerCustomer=Product prices per customers
 ProductSupplierExtraFields=Additional Attributes (Supplier Prices)
 DeleteLinkedProduct=Delete the child product linked to the combination
+PMPValue=Value
+PMPValueShort=WAP
diff --git a/htdocs/langs/fi_FI/projects.lang b/htdocs/langs/fi_FI/projects.lang
index 3697cb848f0..5a1f8a7fdb6 100644
--- a/htdocs/langs/fi_FI/projects.lang
+++ b/htdocs/langs/fi_FI/projects.lang
@@ -267,9 +267,11 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=Uusi lasku
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+OneLinePerTimeSpentLine=One line for each time spent declaration
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
 AddPersonToTask=Add also to tasks
 UsageOrganizeEvent=Usage: Event Organization
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
+SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
diff --git a/htdocs/langs/fi_FI/receptions.lang b/htdocs/langs/fi_FI/receptions.lang
index e220580f9e9..34cafcf7e2a 100644
--- a/htdocs/langs/fi_FI/receptions.lang
+++ b/htdocs/langs/fi_FI/receptions.lang
@@ -44,4 +44,4 @@ ValidateOrderFirstBeforeReception=You must first validate the order before being
 ReceptionsNumberingModules=Numbering module for receptions
 ReceptionsReceiptModel=Document templates for receptions
 NoMorePredefinedProductToDispatch=No more predefined products to dispatch
-
+ReceptionExist=A reception exists
diff --git a/htdocs/langs/fi_FI/stocks.lang b/htdocs/langs/fi_FI/stocks.lang
index b50200fab75..28c3c5837cf 100644
--- a/htdocs/langs/fi_FI/stocks.lang
+++ b/htdocs/langs/fi_FI/stocks.lang
@@ -56,8 +56,6 @@ UnitPurchaseValue=Unit purchase price
 StockTooLow=Kanta liian alhainen
 StockLowerThanLimit=Stock lower than alert limit (%s)
 EnhancedValue=Value
-PMPValue=Value
-PMPValueShort=WAP
 EnhancedValueOfWarehouses=Varastot arvo
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
@@ -251,7 +249,10 @@ SelectAStockMovementFileToImport=select a stock movement file to import
 InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
 LabelOfInventoryMovemement=Inventory %s
 ReOpen=Uudelleenavaa
-ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock to the real qty you entered into the inventory.
 ObjectNotFound=%s not found
 MakeMovementsAndClose=Generate movements and close
 AutofillWithExpected=Fill real quantity with expected quantity
+ShowAllBatchByDefault=By default, show batch details on product "stock" tab
+CollapseBatchDetailHelp=You can set batch detail default display in stocks module configuration
+FieldCannotBeNegative=Field "%s" cannot be negative
diff --git a/htdocs/langs/fi_FI/ticket.lang b/htdocs/langs/fi_FI/ticket.lang
index b184456e137..ec492accd64 100644
--- a/htdocs/langs/fi_FI/ticket.lang
+++ b/htdocs/langs/fi_FI/ticket.lang
@@ -304,7 +304,7 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
-BoxTicketType=Number of open tickets by type
+BoxTicketType=Distribution of open tickets by type
 BoxTicketSeverity=Number of open tickets by severity
 BoxNoTicketSeverity=No tickets opened
 BoxTicketLastXDays=Number of new tickets by days the last %s days
diff --git a/htdocs/langs/fr_BE/accountancy.lang b/htdocs/langs/fr_BE/accountancy.lang
index d3858cde9ce..d71271b19c5 100644
--- a/htdocs/langs/fr_BE/accountancy.lang
+++ b/htdocs/langs/fr_BE/accountancy.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - accountancy
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 Processing=Exécution
 Lineofinvoice=Lignes de facture
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
 Doctype=Type de document
 ErrorDebitCredit=Débit et crédit ne peuvent pas être non-nuls en même temps
 TotalMarge=Marge de ventes totale
diff --git a/htdocs/langs/fr_BE/agenda.lang b/htdocs/langs/fr_BE/agenda.lang
index 0e9fcea385a..54f6b109b08 100644
--- a/htdocs/langs/fr_BE/agenda.lang
+++ b/htdocs/langs/fr_BE/agenda.lang
@@ -4,7 +4,6 @@ MenuToDoActions=Tous les événements incomplets
 MenuDoneActions=Tous les événements terminés
 MenuToDoMyActions=Mes événements incomplets
 MenuDoneMyActions=Mes événements terminés
-ListOfEvents=Liste d'événements (calendrier interne)
 ActionsAskedBy=Événements rapportés par
 ActionsToDoBy=Événements assignés à
 ActionsDoneBy=Événements faits par
diff --git a/htdocs/langs/fr_BE/cron.lang b/htdocs/langs/fr_BE/cron.lang
deleted file mode 100644
index 67ecfc77567..00000000000
--- a/htdocs/langs/fr_BE/cron.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - cron
-CronTaskInactive=This job is disabled
diff --git a/htdocs/langs/fr_BE/exports.lang b/htdocs/langs/fr_BE/exports.lang
new file mode 100644
index 00000000000..17dedd46696
--- /dev/null
+++ b/htdocs/langs/fr_BE/exports.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - exports
+DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
diff --git a/htdocs/langs/fr_BE/main.lang b/htdocs/langs/fr_BE/main.lang
index 3042af1642f..5901153764b 100644
--- a/htdocs/langs/fr_BE/main.lang
+++ b/htdocs/langs/fr_BE/main.lang
@@ -23,6 +23,7 @@ Update=Mise à jour
 DateStart=Date de début
 DateEnd=Date de fin
 AmountPayment=Montant de paiement
+OpenAll=Open for all actions
 Discount=Ristourne
 Unknown=Inconnue
 Check=Chèque
diff --git a/htdocs/langs/fr_BE/mrp.lang b/htdocs/langs/fr_BE/mrp.lang
deleted file mode 100644
index a8ff138755b..00000000000
--- a/htdocs/langs/fr_BE/mrp.lang
+++ /dev/null
@@ -1,6 +0,0 @@
-# Dolibarr language file - Source file is en_US - mrp
-BillOfMaterials=Bill of Material
-NewBOM=New bill of material
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
diff --git a/htdocs/langs/fr_BE/products.lang b/htdocs/langs/fr_BE/products.lang
new file mode 100644
index 00000000000..e0628dbec00
--- /dev/null
+++ b/htdocs/langs/fr_BE/products.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - products
+ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
diff --git a/htdocs/langs/fr_BE/stocks.lang b/htdocs/langs/fr_BE/stocks.lang
new file mode 100644
index 00000000000..1cae5cf3f11
--- /dev/null
+++ b/htdocs/langs/fr_BE/stocks.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - stocks
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+OpenInternal=Open only for internal actions
diff --git a/htdocs/langs/fr_BE/ticket.lang b/htdocs/langs/fr_BE/ticket.lang
new file mode 100644
index 00000000000..82e110b1ca4
--- /dev/null
+++ b/htdocs/langs/fr_BE/ticket.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - ticket
+TicketTypeShortISSUE=Issue, bug or problem
+OriginEmail=Email source
+NeedMoreInformation=Waiting for information
+TicketCategory=Group
diff --git a/htdocs/langs/fr_CA/accountancy.lang b/htdocs/langs/fr_CA/accountancy.lang
index c44802ed2f4..4bcb258ec9d 100644
--- a/htdocs/langs/fr_CA/accountancy.lang
+++ b/htdocs/langs/fr_CA/accountancy.lang
@@ -30,6 +30,7 @@ CountriesInEEC=Pays membres du CEE
 CountriesNotInEEC=Pays non membres du CEE
 CountriesInEECExceptMe=Pays membres du CEE sauf %s
 CountriesExceptMe=Tous le pays sauf %s
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 MainAccountForCustomersNotDefined=Compte comptable principal pour les clients non défini dans la configuration
 MainAccountForSuppliersNotDefined=Compte comptable principal pour les vendeurs non défini dans la configuration
 MainAccountForUsersNotDefined=Compte comptable principal pour les utilisateurs non défini dans la configuration
@@ -93,7 +94,6 @@ ACCOUNTING_LENGTH_DESCRIPTION=Tronquer la description des produits et services d
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Tronquer le formulaire de description de compte de produits et services dans les listes après x chars (Best = 50)
 ACCOUNTING_LENGTH_GACCOUNT=Longueur des comptes comptables généraux (Si vous définissez la valeur à 6 ici, le compte '706' apparaîtra comme '706000' à l'écran)
 BANK_DISABLE_DIRECT_INPUT=Désactiver l'enregistrement direct de la transaction dans le compte bancaire
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Note de frais
 DONATION_ACCOUNTINGACCOUNT=Compte comptable pour enregistrer des dons
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Compte comptable par défaut pour les services achetés (utilisé si non défini dans la fiche de service)
diff --git a/htdocs/langs/fr_CA/agenda.lang b/htdocs/langs/fr_CA/agenda.lang
index 94cf4102fab..041faaa22aa 100644
--- a/htdocs/langs/fr_CA/agenda.lang
+++ b/htdocs/langs/fr_CA/agenda.lang
@@ -13,7 +13,6 @@ OrderDeliveredInDolibarr=Commande %s classée Délivrée
 ProposalDeleted=Proposition supprimée
 AgendaModelModule=Modèles de document pour l'événement
 AgendaUrlOptions1=Vous pouvez aussi ajouter les paramètres suivants pour filtrer les réponses :
-AgendaShowBirthdayEvents=Afficher les dates d'anniversaire des contacts
 AgendaHideBirthdayEvents=Cacher les dates d'anniversaire des contacts
 ExportDataset_event1=Liste évênements de l'agenda
 VisibleTimeRange=Plage d'heures visibles
diff --git a/htdocs/langs/fr_CA/compta.lang b/htdocs/langs/fr_CA/compta.lang
index 677933700ee..8d80cf46426 100644
--- a/htdocs/langs/fr_CA/compta.lang
+++ b/htdocs/langs/fr_CA/compta.lang
@@ -30,6 +30,7 @@ LT1PaymentsES=Règlements RE (TVQ)
 VATPayment=Paiement d'impôt sur les ventes
 VATPayments=Paiements d'impôt sur les ventes
 VATRefund=Remboursement de la taxe de vente
+Refund=Rembourser
 SocialContributionsPayments=Règlements charges sociales
 ShowVatPayment=Affiche paiement TPS/TVH
 CustomerAccountancyCodeShort=Cust. Compte. code
diff --git a/htdocs/langs/fr_CA/cron.lang b/htdocs/langs/fr_CA/cron.lang
index c0ac78610c3..df16aeb6225 100644
--- a/htdocs/langs/fr_CA/cron.lang
+++ b/htdocs/langs/fr_CA/cron.lang
@@ -28,7 +28,6 @@ CronObject=Instance / objet à créer
 CronSaveSucess=Sauvegarde réussie
 CronFieldMandatory=Les champs %s sont obligatoires
 CronErrEndDateStartDt=La date de fin ne peut pas être avant la date de début
-CronTaskInactive=Ce travail est désactivé
 CronClassFile=Nom de fichier avec classe
 CronCommandHelp=La ligne de commande du système à exécuter.
 CronCreateJob=Créer un nouvel emploi planifié
diff --git a/htdocs/langs/fr_CA/errors.lang b/htdocs/langs/fr_CA/errors.lang
index 809a2d2f220..86d639a66e5 100644
--- a/htdocs/langs/fr_CA/errors.lang
+++ b/htdocs/langs/fr_CA/errors.lang
@@ -66,7 +66,6 @@ ErrorCantReadFile=Impossible de lire le fichier '%s'
 ErrorCantReadDir=Impossible de lire le répertoire '%s'
 ErrorBadLoginPassword=Mauvaise valeur pour la connexion ou le mot de passe
 ErrorLoginDisabled=Votre compte a été désactivé
-ErrorFailedToRunExternalCommand=Impossible d'exécuter une commande externe. Vérifiez qu'il est disponible et exécutable par votre serveur PHP. Si PHP <b> Mode sans échec </ b> est activé, vérifiez que cette commande se trouve dans un répertoire défini par le paramètre <b> safe_mode_exec_dir </ b>.
 ErrorFailedToChangePassword=Échec de la modification du mot de passe
 ErrorLoginDoesNotExists=L'utilisateur avec la connexion <b>%s</b> n'a pas été trouvé.
 ErrorLoginHasNoEmail=Cet utilisateur n'a pas d'adresse e-mail. Processus interrompu.
diff --git a/htdocs/langs/fr_CA/main.lang b/htdocs/langs/fr_CA/main.lang
index 61ed834131a..615ed4234b3 100644
--- a/htdocs/langs/fr_CA/main.lang
+++ b/htdocs/langs/fr_CA/main.lang
@@ -80,6 +80,7 @@ FromDate=De
 FromLocation=De
 Approved=Approuver
 Opened=Ouverte
+OpenAll=Ouvert pour toutes les actions
 DeletePicture=Supprimer image
 ConfirmDeletePicture=Etes-vous sur de vouloir supprimer cette image ?
 EnterLoginDetail=Entrez les détails de connexion
diff --git a/htdocs/langs/fr_CA/mrp.lang b/htdocs/langs/fr_CA/mrp.lang
deleted file mode 100644
index a8ff138755b..00000000000
--- a/htdocs/langs/fr_CA/mrp.lang
+++ /dev/null
@@ -1,6 +0,0 @@
-# Dolibarr language file - Source file is en_US - mrp
-BillOfMaterials=Bill of Material
-NewBOM=New bill of material
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
diff --git a/htdocs/langs/fr_CA/stocks.lang b/htdocs/langs/fr_CA/stocks.lang
index e485e3a8efd..86e1bc598dd 100644
--- a/htdocs/langs/fr_CA/stocks.lang
+++ b/htdocs/langs/fr_CA/stocks.lang
@@ -19,8 +19,8 @@ UnitPurchaseValue=Prix ​​unitaire d'achat
 StockTooLow=Stock trop bas
 StockLowerThanLimit=Stock inférieure à la limite d'alerte (%s)
 EnhancedValue=Valeur
-PMPValue=Prix ​​moyen pondéré
 EnhancedValueOfWarehouses=Valeur des entrepôts
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
 QtyDispatched=Quantité expédiée
 QtyDispatchedShort=Qté expédiée
 QtyToDispatchShort=Qté à expédier
@@ -68,7 +68,6 @@ IsInPackage=Contenu dans le paquet
 ShowWarehouse=Voir entrepôt
 MovementCorrectStock=Correction de stock pour le produit %s
 ThisSerialAlreadyExistWithDifferentDate=Ce lot / numéro de série (<strong>%s</strong>) existe déjà, mais avec différentes dates eatby ou sellby (trouvé <strong>%s</strong> mais vous entrez <strong>%s</strong>).
-OpenAll=Ouvert pour toutes les actions
 OpenInternal=Ouvrir uniquement pour les actions internes
 OptionMULTIPRICESIsOn=L'option "plusieurs prix par segment" est activée. Cela signifie qu'un produit a plusieurs prix de vente, donc la valeur à vendre ne peut être calculée
 ProductStockWarehouseCreated=Limite de stock pour l'alerte et le stock optimal souhaité correctement créé
diff --git a/htdocs/langs/fr_CA/ticket.lang b/htdocs/langs/fr_CA/ticket.lang
index 5e7204f3438..a5d2eccc9f0 100644
--- a/htdocs/langs/fr_CA/ticket.lang
+++ b/htdocs/langs/fr_CA/ticket.lang
@@ -1,4 +1,7 @@
 # Dolibarr language file - Source file is en_US - ticket
+TicketTypeShortISSUE=Issue, bug or problem
 TypeContact_ticket_internal_CONTRIBUTOR=Donateur
+OriginEmail=Email source
+NeedMoreInformation=Waiting for information
 Closed=Fermée
 TicketMailExchanges=Messages courriels
diff --git a/htdocs/langs/fr_CH/accountancy.lang b/htdocs/langs/fr_CH/accountancy.lang
index 4dbdd035d6e..ef9e69e554a 100644
--- a/htdocs/langs/fr_CH/accountancy.lang
+++ b/htdocs/langs/fr_CH/accountancy.lang
@@ -1,2 +1,2 @@
 # Dolibarr language file - Source file is en_US - accountancy
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
diff --git a/htdocs/langs/fr_CH/cron.lang b/htdocs/langs/fr_CH/cron.lang
deleted file mode 100644
index 67ecfc77567..00000000000
--- a/htdocs/langs/fr_CH/cron.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - cron
-CronTaskInactive=This job is disabled
diff --git a/htdocs/langs/fr_CH/exports.lang b/htdocs/langs/fr_CH/exports.lang
new file mode 100644
index 00000000000..17dedd46696
--- /dev/null
+++ b/htdocs/langs/fr_CH/exports.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - exports
+DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
diff --git a/htdocs/langs/fr_CH/main.lang b/htdocs/langs/fr_CH/main.lang
index 2888af9c5df..f60681507e3 100644
--- a/htdocs/langs/fr_CH/main.lang
+++ b/htdocs/langs/fr_CH/main.lang
@@ -19,3 +19,4 @@ FormatDateHourShort=%d.%m.%Y %H:%M %p
 FormatDateHourSecShort=%d.%m.%Y %H:%M:%S %p
 FormatDateHourTextShort=%d %b %Y, %H:%M %p
 FormatDateHourText=%d %B %Y, %H:%M %p
+OpenAll=Open for all actions
diff --git a/htdocs/langs/fr_CH/mrp.lang b/htdocs/langs/fr_CH/mrp.lang
deleted file mode 100644
index a8ff138755b..00000000000
--- a/htdocs/langs/fr_CH/mrp.lang
+++ /dev/null
@@ -1,6 +0,0 @@
-# Dolibarr language file - Source file is en_US - mrp
-BillOfMaterials=Bill of Material
-NewBOM=New bill of material
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
diff --git a/htdocs/langs/fr_CH/products.lang b/htdocs/langs/fr_CH/products.lang
new file mode 100644
index 00000000000..e0628dbec00
--- /dev/null
+++ b/htdocs/langs/fr_CH/products.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - products
+ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
diff --git a/htdocs/langs/fr_CH/stocks.lang b/htdocs/langs/fr_CH/stocks.lang
new file mode 100644
index 00000000000..1cae5cf3f11
--- /dev/null
+++ b/htdocs/langs/fr_CH/stocks.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - stocks
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+OpenInternal=Open only for internal actions
diff --git a/htdocs/langs/fr_CH/ticket.lang b/htdocs/langs/fr_CH/ticket.lang
new file mode 100644
index 00000000000..82e110b1ca4
--- /dev/null
+++ b/htdocs/langs/fr_CH/ticket.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - ticket
+TicketTypeShortISSUE=Issue, bug or problem
+OriginEmail=Email source
+NeedMoreInformation=Waiting for information
+TicketCategory=Group
diff --git a/htdocs/langs/fr_CI/accountancy.lang b/htdocs/langs/fr_CI/accountancy.lang
index 4dbdd035d6e..ef9e69e554a 100644
--- a/htdocs/langs/fr_CI/accountancy.lang
+++ b/htdocs/langs/fr_CI/accountancy.lang
@@ -1,2 +1,2 @@
 # Dolibarr language file - Source file is en_US - accountancy
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
diff --git a/htdocs/langs/fr_CI/cron.lang b/htdocs/langs/fr_CI/cron.lang
deleted file mode 100644
index 67ecfc77567..00000000000
--- a/htdocs/langs/fr_CI/cron.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - cron
-CronTaskInactive=This job is disabled
diff --git a/htdocs/langs/fr_CI/exports.lang b/htdocs/langs/fr_CI/exports.lang
new file mode 100644
index 00000000000..17dedd46696
--- /dev/null
+++ b/htdocs/langs/fr_CI/exports.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - exports
+DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
diff --git a/htdocs/langs/fr_CI/main.lang b/htdocs/langs/fr_CI/main.lang
index 2e691473326..71ab1503dbe 100644
--- a/htdocs/langs/fr_CI/main.lang
+++ b/htdocs/langs/fr_CI/main.lang
@@ -19,3 +19,4 @@ FormatDateHourShort=%m/%d/%Y %I:%M %p
 FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
 FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
+OpenAll=Open for all actions
diff --git a/htdocs/langs/fr_CI/mrp.lang b/htdocs/langs/fr_CI/mrp.lang
deleted file mode 100644
index a8ff138755b..00000000000
--- a/htdocs/langs/fr_CI/mrp.lang
+++ /dev/null
@@ -1,6 +0,0 @@
-# Dolibarr language file - Source file is en_US - mrp
-BillOfMaterials=Bill of Material
-NewBOM=New bill of material
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
diff --git a/htdocs/langs/fr_CI/products.lang b/htdocs/langs/fr_CI/products.lang
new file mode 100644
index 00000000000..e0628dbec00
--- /dev/null
+++ b/htdocs/langs/fr_CI/products.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - products
+ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
diff --git a/htdocs/langs/fr_CI/stocks.lang b/htdocs/langs/fr_CI/stocks.lang
new file mode 100644
index 00000000000..1cae5cf3f11
--- /dev/null
+++ b/htdocs/langs/fr_CI/stocks.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - stocks
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+OpenInternal=Open only for internal actions
diff --git a/htdocs/langs/fr_CI/ticket.lang b/htdocs/langs/fr_CI/ticket.lang
new file mode 100644
index 00000000000..82e110b1ca4
--- /dev/null
+++ b/htdocs/langs/fr_CI/ticket.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - ticket
+TicketTypeShortISSUE=Issue, bug or problem
+OriginEmail=Email source
+NeedMoreInformation=Waiting for information
+TicketCategory=Group
diff --git a/htdocs/langs/fr_CM/accountancy.lang b/htdocs/langs/fr_CM/accountancy.lang
index 4dbdd035d6e..ef9e69e554a 100644
--- a/htdocs/langs/fr_CM/accountancy.lang
+++ b/htdocs/langs/fr_CM/accountancy.lang
@@ -1,2 +1,2 @@
 # Dolibarr language file - Source file is en_US - accountancy
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
diff --git a/htdocs/langs/fr_CM/cron.lang b/htdocs/langs/fr_CM/cron.lang
deleted file mode 100644
index 67ecfc77567..00000000000
--- a/htdocs/langs/fr_CM/cron.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - cron
-CronTaskInactive=This job is disabled
diff --git a/htdocs/langs/fr_CM/exports.lang b/htdocs/langs/fr_CM/exports.lang
new file mode 100644
index 00000000000..17dedd46696
--- /dev/null
+++ b/htdocs/langs/fr_CM/exports.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - exports
+DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
diff --git a/htdocs/langs/fr_CM/main.lang b/htdocs/langs/fr_CM/main.lang
index 2e691473326..71ab1503dbe 100644
--- a/htdocs/langs/fr_CM/main.lang
+++ b/htdocs/langs/fr_CM/main.lang
@@ -19,3 +19,4 @@ FormatDateHourShort=%m/%d/%Y %I:%M %p
 FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
 FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
+OpenAll=Open for all actions
diff --git a/htdocs/langs/fr_CM/mrp.lang b/htdocs/langs/fr_CM/mrp.lang
deleted file mode 100644
index a8ff138755b..00000000000
--- a/htdocs/langs/fr_CM/mrp.lang
+++ /dev/null
@@ -1,6 +0,0 @@
-# Dolibarr language file - Source file is en_US - mrp
-BillOfMaterials=Bill of Material
-NewBOM=New bill of material
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
diff --git a/htdocs/langs/fr_CM/products.lang b/htdocs/langs/fr_CM/products.lang
new file mode 100644
index 00000000000..e0628dbec00
--- /dev/null
+++ b/htdocs/langs/fr_CM/products.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - products
+ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
diff --git a/htdocs/langs/fr_CM/stocks.lang b/htdocs/langs/fr_CM/stocks.lang
new file mode 100644
index 00000000000..1cae5cf3f11
--- /dev/null
+++ b/htdocs/langs/fr_CM/stocks.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - stocks
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+OpenInternal=Open only for internal actions
diff --git a/htdocs/langs/fr_CM/ticket.lang b/htdocs/langs/fr_CM/ticket.lang
new file mode 100644
index 00000000000..82e110b1ca4
--- /dev/null
+++ b/htdocs/langs/fr_CM/ticket.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - ticket
+TicketTypeShortISSUE=Issue, bug or problem
+OriginEmail=Email source
+NeedMoreInformation=Waiting for information
+TicketCategory=Group
diff --git a/htdocs/langs/fr_FR/accountancy.lang b/htdocs/langs/fr_FR/accountancy.lang
index e01b49a1e37..36210463025 100644
--- a/htdocs/langs/fr_FR/accountancy.lang
+++ b/htdocs/langs/fr_FR/accountancy.lang
@@ -158,7 +158,7 @@ ACCOUNTING_LENGTH_AACCOUNT=Longueur des comptes comptables de Tiers (Si vous dé
 ACCOUNTING_MANAGE_ZERO=Permettre de gérer un nombre différent de zéro à la fin d'un compte comptable. Nécessaire pour certains pays (comme la Suisse). Si conservé à Non (par défaut), vous pouvez définir les 2 paramètres suivants pour demander à l'application d'ajouter des zéros virtuels.
 BANK_DISABLE_DIRECT_INPUT=Désactiver la saisie directe de transactions en banque
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Activer l'export brouillon sur les journaux comptables
-ACCOUNTANCY_COMBO_FOR_AUX=Activer la liste déroulante pour le compte auxiliaire (peut être lent si vous avez beaucoup de tiers)
+ACCOUNTANCY_COMBO_FOR_AUX=Activer la liste déroulante pour les comptes auxiliaires (des lenteurs peuvent être rencontrées si vous avez de nombreux tiers)
 ACCOUNTING_DATE_START_BINDING=Définissez une date pour commencer la liaison et le transfert en comptabilité. En dessous de cette date, les transactions ne seront jamais transférées à la comptabilité.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Choix de la période des factures pour le transfert en comptabilité
 
@@ -202,14 +202,14 @@ Docref=Référence
 LabelAccount=Libellé du compte
 LabelOperation=Libellé opération
 Sens=Sens
-AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you have received<br>For an accounting account of a supplier, use Debit to record a payment you made
+AccountingDirectionHelp=Pour le compte comptable d'un client, utilisez Crédit pour enregistrer un règlement reçu.<br>Pour le compte comptable d'un fournisseur, utilisez Débit pour enregistrer un règlement reçu.
 LetteringCode=Code de lettrage
 Lettering=Lettrage
 Codejournal=Journal
 JournalLabel=Libellé journal
 NumPiece=Numéro de pièce
 TransactionNumShort=Num. transaction
-AccountingCategory=Groupe personnalisé
+AccountingCategory=Groupe comptable personnalisé
 GroupByAccountAccounting=Affichage par compte comptable
 GroupBySubAccountAccounting=Affichage par compte auxiliaire
 AccountingAccountGroupsDesc=Vous pouvez définir ici des groupes de comptes comptable. Il seront utilisés pour les reporting comptables personnalisés
@@ -297,7 +297,7 @@ NoNewRecordSaved=Plus d'enregistrements à journaliser
 ListOfProductsWithoutAccountingAccount=Liste des produits non liés à un compte comptable
 ChangeBinding=Changer les liens
 Accounted=En comptabilité
-NotYetAccounted=Not yet accounted in the ledger
+NotYetAccounted=Pas encore comptabilisé en comptabilité
 ShowTutorial=Afficher le tutoriel
 NotReconciled=Non rapproché
 WarningRecordWithoutSubledgerAreExcluded=Attention : toutes les opérations sans compte auxiliaire défini sont filtrées et exclues de cet écran
@@ -328,6 +328,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Désactiver la liaison et le transfert e
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Désactiver la liaison et le transfert en comptabilité des notes de frais (les notes de frais ne seront pas prises en compte en comptabilité).
 
 ## Export
+NotifiedExportDate=Notified export date (modification of the entries will not be possible)
+NotifiedValidationDate=Validation of the entries (modification or deletion of the entries will not be possible)
+ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=Exporter le journal brouillon
 Modelcsv=Modèle d'export
 Selectmodelcsv=Sélectionner un modèle d'export
@@ -409,15 +412,15 @@ FECFormatEntryNum=Numéro de la pièce (EcritureNum)
 FECFormatEntryDate=Date de la pièce (EcritureDate)
 FECFormatGeneralAccountNumber=Numéro du compte général (CompteNum)
 FECFormatGeneralAccountLabel=Libellé du compte général (CompteLib)
-FECFormatSubledgerAccountNumber=Numéro de compte du grand livre auxiliaire (CompAuxNum)
-FECFormatSubledgerAccountLabel=Libellé de compte du grand livre auxiliaire (CompAuxLib)
+FECFormatSubledgerAccountNumber=Numéro du compte auxiliaire (CompAuxNum)
+FECFormatSubledgerAccountLabel=Libellé du compte auxiliaire (CompAuxLib)
 FECFormatPieceRef=Référence de la pièce (PieceRef)
 FECFormatPieceDate=Date de création de la pièce (PieceDate)
 FECFormatLabelOperation=Libellé de l'opération (EcritureLib)
 FECFormatDebit=Débit (Debit)
 FECFormatCredit=Crédit (Credit)
-FECFormatReconcilableCode=Code de réconciliation (EcritureLet)
-FECFormatReconcilableDate=Date de réconciliation (DateLet)
+FECFormatReconcilableCode=Code lettrage (EcritureLet)
+FECFormatReconcilableDate=Date de lettrage (DateLet)
 FECFormatValidateDate=Date de validation de la pièce (ValidDate)
 FECFormatMulticurrencyAmount=Montant multidevise (Montantdevise)
 FECFormatMulticurrencyCode=Code multidevise (Idevise)
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index ecaa4b6e600..57a50388a4f 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -63,8 +63,8 @@ IfModuleEnabled=Rem: oui est effectif uniquement si le module <b>%s</b> est acti
 RemoveLock=Effacer le fichier <b>%s</b> s'il existe afin d'autoriser l'outil de mise à jour.
 RestoreLock=Replacer un fichier <b>%s</b>, en ne donnant que les droits de lecture sur ce fichier, afin d'interdire à nouveau les mises à jour.
 SecuritySetup=Configuration de la sécurité
-PHPSetup=Configuration PHP
-OSSetup=OS setup
+PHPSetup=Configuration de PHP
+OSSetup=Configuration du système d'exploitation
 SecurityFilesDesc=Définissez ici les options de sécurité des téléchargements de fichiers
 ErrorModuleRequirePHPVersion=Erreur, ce module requiert une version %s ou supérieure de PHP
 ErrorModuleRequireDolibarrVersion=Erreur, ce module requiert une version %s ou supérieure de Dolibarr
@@ -221,8 +221,8 @@ NotCompatible=Ce module n'est pas compatible avec votre version %s de Dolibarr (
 CompatibleAfterUpdate=Ce module nécessite une mise à jour de Dolibarr %s (Version min. %s - Version max. %s).
 SeeInMarkerPlace=Voir dans la boutique
 SeeSetupOfModule=Voir la configuration du module %s
+SetOptionTo=Set option <b>%s</b> to %s
 Updated=Mise à jour effectuée
-Nouveauté=Nouveauté
 AchatTelechargement=Acheter/télécharger
 GoModuleSetupArea=Pour déployer/installer un nouveau module, rendez vous dans la zone de configuration des modules : <a href="%s">%s</a>
 DoliStoreDesc=DoliStore, la place de marché officielle des modules et extensions complémentaires pour Dolibarr ERP/CRM
@@ -399,6 +399,7 @@ SecurityToken=Clé de sécurisation des URLs
 NoSmsEngine=Aucun gestionnaire d'envoi de SMS n'est disponible. Les gestionnaires d'envois SMS ne sont pas installés en standard, car dépendent d'un fournisseur externe, mais vous pourrez en trouver depuis la plateforme %s
 PDF=PDF
 PDFDesc=Options globales sur la génération des PDF
+PDFOtherDesc=Option PDF spécifique à certains modules
 PDFAddressForging=Règles pour le contenu des sections Adresse
 HideAnyVATInformationOnPDF=Masquer toutes les informations relatives à la Taxe de vente / TVA sur les PDF générés
 PDFRulesForSalesTax=Règles pour la taxe de vente / TVA
@@ -561,7 +562,7 @@ Module53Desc=Gestion des services
 Module54Name=Contrats/Abonnements
 Module54Desc=Gestion des contrats (services ou abonnements récurrents)
 Module55Name=Codes-barres
-Module55Desc=Gestion des codes-barres
+Module55Desc=Barcode or QR code management
 Module56Name=Paiement par virement bancaire
 Module56Desc=Gestion des paiements de fournisseurs par virement bancaire. Est incluse la génération des fichiers SEPA pour les pays européens.
 Module57Name=Règlement par Prélèvement
@@ -848,10 +849,10 @@ Permission402=Créer/modifier les avoirs
 Permission403=Valider les avoirs
 Permission404=Supprimer les avoirs
 Permission430=Utilisez la barre de débogage
-Permission511=Lire ses paiements de salaires (le vôtres et ceux de vos subordonnées)
-Permission512=Créer/modifier les règlements de salaires
-Permission514=Supprimer les paiements de salaires
-Permission517=Lire les paiements de salaires de tout le monde
+Permission511=Read salaries and payments (yours and subordinates)
+Permission512=Create/modify salaries and payments
+Permission514=Delete salaries and payments
+Permission517=Read salaries and payments everybody
 Permission519=Exporter les salaires
 Permission520=Consulter les emprunts
 Permission522=Créer/Modifier les emprunts
@@ -965,6 +966,8 @@ Permission23003=Effacer travail planifié
 Permission23004=Exécuter travail planifié
 Permission50101=Utiliser le Point De Vente (SimplePOS)
 Permission50151=Utiliser le Point de Vente (TakePOS)
+Permission50152=Modifier les lignes de vente
+Permission50153=Modifier les lignes de vente commandées
 Permission50201=Consulter les transactions
 Permission50202=Importer les transactions
 Permission50330=Lire les objets de Zapier
@@ -1039,12 +1042,12 @@ DictionaryMeasuringUnits=Unités de mesure
 DictionarySocialNetworks=Réseaux sociaux
 DictionaryProspectStatus=Statut de prospection des sociétés
 DictionaryProspectContactStatus=Statut de prospection des contacts
-DictionaryHolidayTypes=Type de congés
+DictionaryHolidayTypes=Congé - Types de congé
 DictionaryOpportunityStatus=Statut d'opportunités pour les affaires/projets
 DictionaryExpenseTaxCat=Note de frais - catégories de déplacement
 DictionaryExpenseTaxRange=Note de frais - Tri par catégorie de déplacement
 DictionaryTransportMode=Déclaration d'échanges intracommunautaires - Mode de transport
-DictionaryBatchStatus=État de qualité du lot/série (produits)
+DictionaryBatchStatus=État du contrôle qualité du lot/série de produits
 TypeOfUnit=Type d'unité
 SetupSaved=Configuration sauvegardée
 SetupNotSaved=Configuration non enregistrée
@@ -1188,7 +1191,7 @@ SetupDescription4=<a href="%s"> %s -> %s </a><br> <br>Ce logiciel est un ensembl
 SetupDescription5=Les autres entrées de configuration gèrent des paramètres facultatifs.
 AuditedSecurityEvents=Événements de sécurité audités
 NoSecurityEventsAreAduited=Aucun événement de sécurité n'est audité. Vous pouvez les activer à partir du menu %s
-Audit=Audit de sécurité
+Audit=Security events
 InfoDolibarr=Infos Dolibarr
 InfoBrowser=Infos navigateur
 InfoOS=Infos OS
@@ -1256,7 +1259,7 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=Vous devez exécuter la command
 YourPHPDoesNotHaveSSLSupport=Fonctions SSL non présentes dans votre PHP
 DownloadMoreSkins=Plus de thèmes à télécharger
 SimpleNumRefModelDesc=Renvoie le numéro sous la forme %syymm-nnnn où yy est l'année, mm le mois et nnnn un compteur séquentiel sans rupture et sans remise à 0.
-SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
+SimpleNumRefNoDateModelDesc=Renvoie le numéro de référence au format %s-nnnn où nnnn est un nombre séquentiel autoincrémenté sans réinitialisation
 ShowProfIdInAddress=Afficher l'identifiant professionnel dans les adresses sur les documents
 ShowVATIntaInAddress=Cacher le numéro de TVA Intracommunautaire dans les adresses sur les documents.
 TranslationUncomplete=Traduction partielle
@@ -1320,9 +1323,12 @@ ConditionIsCurrently=La condition est actuellement %s
 YouUseBestDriver=Vous utilisez le driver %s qui est le driver recommandé actuellement.
 YouDoNotUseBestDriver=Vous utilisez le pilote %s mais le pilote %s est recommandé.
 NbOfObjectIsLowerThanNoPb=Vous avez seulement %s %s dans la base de données. Cela ne nécessite aucune optimisation particulière.
+ComboListOptim=Combo list loading optimization
 SearchOptim=Optimisation des recherches
-YouHaveXObjectUseSearchOptim=Vous avez %s %s dans la base de données. Vous devez ajouter la constante %s à 1 dans Accueil-Configuration-Autre. Ceci limite la recherche au début des chaînes, ce qui permet à la base de données d'utiliser des index et vous devriez obtenir une réponse immédiate.
-YouHaveXObjectAndSearchOptimOn=Vous avez %s %s dans la base de données et la constante %s est définie sur 1 dans Accueil-Configuration-Autre.
+YouHaveXObjectUseComboOptim=You have %s %s in the database. You can go into setup of module to enable loading of combo list on key pressed event.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other.
+YouHaveXObjectUseSearchOptimDesc=This limits the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to %s in Home-Setup-Other.
 BrowserIsOK=Vous utilisez le navigateur Web %s. Ce navigateur est correct pour la sécurité et la performance.
 BrowserIsKO=Vous utilisez le navigateur %s. Ce navigateur est déconseillé pour des raisons de sécurité, performance et qualité des pages restituées. Nous vous recommandons d'utiliser Firefox, Chrome, Opera ou Safari.
 PHPModuleLoaded=Le composant PHP %s est chargé
@@ -1434,6 +1440,7 @@ MemberMainOptions=Options principales
 AdherentLoginRequired= Gérer un identifiant pour chaque adhérent
 AdherentMailRequired=Email obligatoire pour créer un nouvel adhérent
 MemberSendInformationByMailByDefault=Case à cocher pour envoyer un email de confirmation (validation ou nouvelle cotisation) aux adhérents est à oui par défaut.
+MemberCreateAnExternalUserForSubscriptionValidated=Créer un utilisateur externe pour chaque nouvelle cotisation adhérent validée
 VisitorCanChooseItsPaymentMode=Le visiteur peut choisir parmi les modes de paiement disponibles
 MEMBER_REMINDER_EMAIL=Activer le rappel automatique <b> par e-mail </b> des adhésions expirées. Remarque: le module <strong> %s </strong> doit être activé et configuré correctement pour qu'un rappel soit envoyé.
 MembersDocModules=Modèle de document pour le document généré depuis la fiche d'un adhérent
@@ -1584,7 +1591,7 @@ NotInstalled=Non installé.
 NotSlowedDownByThis=Non ralenti par cela.
 NotRiskOfLeakWithThis=Pas de risque de fuite de données avec cela.
 ApplicativeCache=Cache applicatif
-MemcachedNotAvailable=Aucun cache applicatif trouvé. Vous pouvez accélérer les performances de Dolibarr en installant un serveur de cache Memcached et un module de cache applicatif exploitant ce serveur.<br>Plus d'info ici <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">https://wiki.dolibarr.org/index.php/Module_MemCached</a>.<br>Notez que de nombreux hébergeurs low-cost ne fournissent pas de tels serveurs de cache dans leur infrastructure.
+MemcachedNotAvailable=Aucun cache applicatif trouvé. Vous pouvez accélérer les performances de Dolibarr en installant un serveur de cache Memcached et un module de cache applicatif exploitant ce serveur.<br>Plus d'info ici<a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">https://wiki.dolibarr.org/index.php/Module_MemCached</a>.<br>Notez que de nombreux hébergeurs low-cost ne fournissent pas de tels serveurs de cache dans leur infrastructure.
 MemcachedModuleAvailableButNotSetup=Le module memcached pour le cache applicatif a été trouvé mais la configuration de ce module n'est pas complète.
 MemcachedAvailableAndSetup=Le module memcached dédié à l'utilisation du serveur de cache memcached est activé.
 OPCodeCache=Cache OPCode
@@ -1764,7 +1771,7 @@ AGENDA_DEFAULT_VIEW=Quel onglet voulez-vous voir ouvrir par défaut quand on cho
 AGENDA_REMINDER_BROWSER=Activer le rappel d'événement <b> sur le navigateur de l'utilisateur </b> (lorsque la date de l'événement est atteinte, une popup est affichée sur la navigateur. Chaque utilisateur peut désactiver de telles notification depuis la configuration des notifications de son navigateur)
 AGENDA_REMINDER_BROWSER_SOUND=Activer les notifications sonores.
 AGENDA_REMINDER_EMAIL=Activer le rappel d'événement <b> par e-mail </b> (l'option de rappel / délai peut être défini pour chaque événement).
-AGENDA_REMINDER_EMAIL_NOTE=Note : la fréquence d'exécution de la tâche %s doit être suffisante pour être sûr que le rappel soit envoyé au bon moment..
+AGENDA_REMINDER_EMAIL_NOTE=Note : la fréquence d'exécution de la tâche %s doit être suffisante pour que le rappel soit envoyé au bon moment.
 AGENDA_SHOW_LINKED_OBJECT=Afficher l'objet lié dans la vue agenda
 ##### Clicktodial #####
 ClickToDialSetup=Configuration du module Click To Dial
@@ -1980,6 +1987,8 @@ 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
 MAIN_DOCUMENTS_LOGO_HEIGHT=Hauteur du logo sur les PDFs
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Ajouter une image à la ligne de proposition
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Ajouter une signature électronique au PDF
 NothingToSetup=Aucune configuration particulière n'est requise pour ce module.
 SetToYesIfGroupIsComputationOfOtherGroups=Réglez ceci sur Oui si ce groupe est un calcul d'autres groupes
 EnterCalculationRuleIfPreviousFieldIsYes=Entrez la règle de calcul si le champ précédent a été défini sur Oui.<br>Par exemple:<br>CODEGRP1 + CODEGRP2
@@ -2065,7 +2074,7 @@ UseDebugBar=Utilisez la barre de débogage
 DEBUGBAR_LOGS_LINES_NUMBER=Nombre de dernières lignes de logs à conserver dans la console
 WarningValueHigherSlowsDramaticalyOutput=Attention, les valeurs élevées ralentissent considérablement les affichages
 ModuleActivated=Le module %s est activé et ralentit l'interface
-ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances and security)
+ModuleActivatedWithTooHighLogLevel=Le module %s est activé avec un niveau de journalisation trop élevé (essayez d’utiliser un niveau inférieur pour de meilleures performances et sécurité)
 ModuleSyslogActivatedButLevelNotTooVerbose=Le module %s est activé et le niveau de journalisation (%s) est correct (pas trop verbeux)
 IfYouAreOnAProductionSetThis=Sur un environnement de production, vous devriez régler ce paramètre sur %s.
 AntivirusEnabledOnUpload=Antivirus activé sur le téléversement des fichiers
@@ -2097,7 +2106,6 @@ PDF_SHOW_PROJECT=Afficher le projet sur le document
 ShowProjectLabel=Libellé du projet
 PDF_USE_ALSO_LANGUAGE_CODE=Si vous souhaitez que certains textes de votre PDF soient dupliqués dans 2 langues différentes dans le même PDF généré, vous devez définir ici cette deuxième langue pour que le PDF généré contienne 2 langues différentes dans la même page, celle choisie lors de la génération du PDF et celle-ci (seuls quelques modèles PDF prennent en charge cette fonction). Gardez vide pour 1 langue par PDF.
 FafaIconSocialNetworksDesc=Entrez ici le code d'une icône FontAwesome. Si vous ne savez pas ce qu'est FontAwesome, vous pouvez utiliser la valeur générique fa-address-book.
-FeatureNotAvailableWithReceptionModule=Fonction non disponible lorsque le module Réception est activée
 RssNote=Remarque: Chaque définition de flux RSS fournit un widget que vous devez activer pour qu'il soit disponible dans le tableau de bord
 JumpToBoxes=Aller à la Configuration -> Widgets
 MeasuringUnitTypeDesc=Utilisez ici une valeur comme "size", "surface", "volume", "weight", "time"
@@ -2121,12 +2129,18 @@ ConfFileIsReadableOrWritableByAnyUsers=Le fichier conf est lisible ou inscriptib
 MailToSendEventOrganization=Organisation d'événements
 AGENDA_EVENT_DEFAULT_STATUS=État de l’événement par défaut lors de la création d’un événement à partir du formulaire
 YouShouldDisablePHPFunctions=Vous devriez désactiver les fonctions PHP
-IfCLINotRequiredYouShouldDisablePHPFunctions=Sauf si vous avez besoin d’exécuter des commandes système (pour le module Tâche planifiée, ou pour exécuter l'Anti-virus externe en ligne de commande par exemple), vous devriez désactiver les fonctions PHP
+IfCLINotRequiredYouShouldDisablePHPFunctions=Sauf si vous avez besoin de lancer des commandes système, vous devriez désactiver les fonctions PHP
+PHPFunctionsRequiredForCLI=Pour un interfaçage (comme des tâches de sauvegarde planifiée ou pour lancer un programme antivirus), vous devez garder les fonctions PHP
 NoWritableFilesFoundIntoRootDir=Aucun fichier ou répertoire des programmes courants n’a été trouvé en écriture dans votre répertoire racine (Bon)
 RecommendedValueIs=Recommandé : %s
+NotRecommended=Non recommandé
 ARestrictedPath=Un chemin restreint
 CheckForModuleUpdate=Vérifier les mises à jour des modules externes
 CheckForModuleUpdateHelp=Cette action se connecte aux éditeurs des modules externes pour vérifier si une nouvelle version est disponible.
 ModuleUpdateAvailable=Une mise à jour est disponible
 NoExternalModuleWithUpdate=Aucune mise à jour trouvée pour les modules externes
 SwaggerDescriptionFile=Fichier de description de l’API Swagger (à utiliser avec redoc par exemple)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=Vous avez activé l'API WS qui est désapprouvée. Vous devriez utiliser l'API REST à la place.
+RandomlySelectedIfSeveral=Randomly selected if several pictures are available
+DatabasePasswordObfuscated=Database password is obfuscated in conf file
+DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
diff --git a/htdocs/langs/fr_FR/agenda.lang b/htdocs/langs/fr_FR/agenda.lang
index 0b4afd8e06e..977681356d5 100644
--- a/htdocs/langs/fr_FR/agenda.lang
+++ b/htdocs/langs/fr_FR/agenda.lang
@@ -38,6 +38,7 @@ ActionsEvents=Événements pour lesquels Dolibarr doit insérer un évènement d
 EventRemindersByEmailNotEnabled=Les rappels d'événement par email n'ont pas été activés dans la configuration du module %s.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Tiers %s créé
+COMPANY_MODIFYInDolibarr=Le tiers %s a été modifié
 COMPANY_DELETEInDolibarr=Tiers  %s supprimé
 ContractValidatedInDolibarr=Contrat %s validé
 CONTRACT_DELETEInDolibarr=Contrat %s supprimé
@@ -87,6 +88,7 @@ OrderDeleted=Commande supprimée
 InvoiceDeleted=Facture supprimée
 DraftInvoiceDeleted=Facture brouillon supprimée
 CONTACT_CREATEInDolibarr=Contact/Adresse %s créé
+CONTACT_MODIFYInDolibarr=Le contact %s a été modifié
 CONTACT_DELETEInDolibarr=Contact/Adresse %s supprimé
 PRODUCT_CREATEInDolibarr=Produit %s créé
 PRODUCT_MODIFYInDolibarr=Produit %s modifié
diff --git a/htdocs/langs/fr_FR/banks.lang b/htdocs/langs/fr_FR/banks.lang
index e6085517629..9bb0dc6223e 100644
--- a/htdocs/langs/fr_FR/banks.lang
+++ b/htdocs/langs/fr_FR/banks.lang
@@ -128,7 +128,7 @@ ConfirmDeleteTransaction=Êtes-vous sûr de vouloir supprimer cette écriture ?
 ThisWillAlsoDeleteBankRecord=Ceci supprimera aussi les écritures bancaires générées
 BankMovements=Mouvements
 PlannedTransactions=Écritures prévues
-Graph=Graphs
+Graph=Graphiques
 ExportDataset_banque_1=Écritures bancaires et relevés
 ExportDataset_banque_2=Bordereaux de remises de chèques
 TransactionOnTheOtherAccount=Écriture sur l'autre compte
diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang
index 6fd0827698c..4cbe88c93fb 100644
--- a/htdocs/langs/fr_FR/bills.lang
+++ b/htdocs/langs/fr_FR/bills.lang
@@ -120,7 +120,7 @@ ConvertExcessPaidToReduc=Convertir le trop-payé en crédit disponible
 EnterPaymentReceivedFromCustomer=Saisie d'un règlement reçu du client
 EnterPaymentDueToCustomer=Saisie d'un remboursement d'un avoir client
 DisabledBecauseRemainderToPayIsZero=Désactivé car reste à payer est nul
-PriceBase=Base price
+PriceBase=Base de prix
 BillStatus=État de la facture
 StatusOfGeneratedInvoices=Statut des factures générées
 BillStatusDraft=Brouillon (à valider)
@@ -259,6 +259,7 @@ DateMaxPayment=Date limite règlement
 DateInvoice=Date facturation
 DatePointOfTax=Date elligibilitée taxe
 NoInvoice=Aucune facture
+NoOpenInvoice=No open invoice
 ClassifyBill=Classer la facture
 SupplierBillsToPay=Factures fournisseurs impayées
 CustomerBillsUnpaid=Factures clients impayées
@@ -454,7 +455,7 @@ RegulatedOn=Réglé le
 ChequeNumber=Chèque N°
 ChequeOrTransferNumber=Chèque/Virement N°
 ChequeBordereau=Vérifier
-ChequeMaker=Check/Transfer sender
+ChequeMaker=Émetteur du chèque/virement
 ChequeBank=Banque du chèque
 CheckBank=Chèque
 NetToBePaid=Net à payer
@@ -589,3 +590,4 @@ FacParentLine=Ligne de facture parente
 SituationTotalRayToRest=Reste à payer HT
 PDFSituationTitle=Situation n°%d
 SituationTotalProgress=Avancement total %d %%
+SearchUnpaidInvoicesWithDueDate=Rechercher les factures impayées avec date d'échéance = %s
diff --git a/htdocs/langs/fr_FR/boxes.lang b/htdocs/langs/fr_FR/boxes.lang
index a70ab75ca55..c3f43e4bab1 100644
--- a/htdocs/langs/fr_FR/boxes.lang
+++ b/htdocs/langs/fr_FR/boxes.lang
@@ -46,11 +46,11 @@ BoxMyLastBookmarks=Mes %s derniers marque-pages
 BoxOldestExpiredServices=Plus anciens services expirés
 BoxLastExpiredServices=Les %s plus anciens contrats avec services actifs expirés
 BoxTitleLastActionsToDo=Les %s derniers événements à réaliser
-BoxTitleLastContracts=Latest %s contracts which were modified
-BoxTitleLastModifiedDonations=Latest %s donations which were modified
-BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
-BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
-BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
+BoxTitleLastContracts=Les %s derniers contrats modifiés
+BoxTitleLastModifiedDonations=Les %s derniers dons modifiés
+BoxTitleLastModifiedExpenses=Les %s dernières notes de frais modifiées
+BoxTitleLatestModifiedBoms=Les %s derières BOMS modifiées
+BoxTitleLatestModifiedMos=Les %s derniers ordres de fabrication modifiés
 BoxTitleLastOutstandingBillReached=Clients dont l'en-cours autorisé est dépassé
 BoxGlobalActivity=Activité globale (factures, propositions, commandes)
 BoxGoodCustomers=Bons clients
diff --git a/htdocs/langs/fr_FR/cashdesk.lang b/htdocs/langs/fr_FR/cashdesk.lang
index 93005f5a583..050ae29cd53 100644
--- a/htdocs/langs/fr_FR/cashdesk.lang
+++ b/htdocs/langs/fr_FR/cashdesk.lang
@@ -41,7 +41,7 @@ Floor=Etage
 AddTable=Ajouter une table
 Place=Emplacement
 TakeposConnectorNecesary='Connecteur TakePOS' requis
-OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
+OrderPrinters=Ajoute un bouton qui permet d'envoyer une commande sans paiement sur certaines imprimantes spécifiques (par exemple pour envoyer une commande en cuisine)
 NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser:
 SearchProduct=Rechercher un produit
 Receipt=Reçu
@@ -59,7 +59,7 @@ BillsCoinsPad=Pavé avec montant des Pièces et Billets
 DolistorePosCategory=Modules TakePOS et autres solutions de PDV pour Dolibarr
 TakeposNeedsCategories=TakePOS a besoin d'au moins une catégorie de produits pour fonctionner
 TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS a besoin d'au moins 1 catégorie de produits dans la catégorie <b> %s </b> pour fonctionner
-OrderNotes=Can add some notes to each ordered items
+OrderNotes=Il est possible d'ajouter des notes sur chacun des produits commandés
 CashDeskBankAccountFor=Compte par défaut à utiliser pour les paiements en
 NoPaimementModesDefined=Aucun mode de paiement défini dans la configuration de TakePOS
 TicketVatGrouped=Grouper la TVA par taux sur les tickets / reçus
@@ -102,7 +102,7 @@ CashDeskGenericMaskCodes6 = <br>La balise <b> {TN} </b> est utilisée pour ajout
 TakeposGroupSameProduct=Regrouper les mêmes lignes de produits
 StartAParallelSale=Lancer une nouvelle vente en parallèle
 SaleStartedAt=Ventes démarrées à %s
-ControlCashOpening=Pop-up de contrôle de caisse à l'ouverture du POS
+ControlCashOpening=Open the "Control cash" popup when opening the POS
 CloseCashFence=Clôturer la caisse
 CashReport=Rapport de caisse
 MainPrinterToUse=Imprimante principale à utiliser
@@ -126,5 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Le module Imprimante de reçus doit d'abord av
 AllowDelayedPayment=Autoriser le paiement différé
 PrintPaymentMethodOnReceipts=Imprimer le mode de paiement sur les tickets | reçus
 WeighingScale=échelle de poids
-ShowPriceHT = Afficher la colonne prix hors taxes
-ShowPriceHTOnReceipt = Afficher la colonne prix hors taxes à la réception
+ShowPriceHT = Afficher la colonne du prix HT (à l'écran)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
diff --git a/htdocs/langs/fr_FR/categories.lang b/htdocs/langs/fr_FR/categories.lang
index f428f5a2aa6..4b806e1edbd 100644
--- a/htdocs/langs/fr_FR/categories.lang
+++ b/htdocs/langs/fr_FR/categories.lang
@@ -3,20 +3,20 @@ Rubrique=Tag/Catégorie
 Rubriques=Tags/catégories
 RubriquesTransactions=Tags/catégories des transactions
 categories=tags/catégories
-NoCategoryYet=No tag/category of this type has been created
+NoCategoryYet=Aucun tag/catégorie de ce type n'a été créé
 In=Dans
 AddIn=Ajouter dans
 modify=modifier
 Classify=Classer
 CategoriesArea=Espace tags/catégories
-ProductsCategoriesArea=Product/Service tags/categories area
-SuppliersCategoriesArea=Vendor tags/categories area
-CustomersCategoriesArea=Customer tags/categories area
-MembersCategoriesArea=Member tags/categories area
-ContactsCategoriesArea=Contact tags/categories area
-AccountsCategoriesArea=Bank account tags/categories area
-ProjectsCategoriesArea=Project tags/categories area
-UsersCategoriesArea=User tags/categories area
+ProductsCategoriesArea=Espace tags/catégories de produits/services
+SuppliersCategoriesArea=Espace tags/catégories de fournisseurs
+CustomersCategoriesArea=Espace tags/catégories de clients
+MembersCategoriesArea=Espace tags/catégories adhérents
+ContactsCategoriesArea=Espace tags/catégories de contacts
+AccountsCategoriesArea=Espace des tags/categories de comptes bancaires
+ProjectsCategoriesArea=Espace des tags/catégories des projets
+UsersCategoriesArea=Espace des tags/catégories des utilisateurs
 SubCats=Sous-catégories
 CatList=Liste des tags/catégories
 CatListAll=Liste de toutes les catégories (de tous types)
@@ -96,4 +96,4 @@ ChooseCategory=Choisissez une catégorie
 StocksCategoriesArea=Catégories d’entrepôt
 ActionCommCategoriesArea=Catégories d’événements
 WebsitePagesCategoriesArea=Catégories des pages-conteneurs
-UseOrOperatorForCategories=Use 'OR' operator for categories
+UseOrOperatorForCategories=Utiliser l'opérateur 'ou' pour les catégories
diff --git a/htdocs/langs/fr_FR/companies.lang b/htdocs/langs/fr_FR/companies.lang
index 97b878e59fc..906aa74db43 100644
--- a/htdocs/langs/fr_FR/companies.lang
+++ b/htdocs/langs/fr_FR/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=Le nom de société %s existe déjà. Veuillez en choisir un autre.
 ErrorSetACountryFirst=Définissez d'abord le pays
 SelectThirdParty=Sélectionner un tiers
-ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
+ConfirmDeleteCompany=Êtes-vous sûr de vouloir supprimer cette société et toutes les informations qui en dépendent ?
 DeleteContact=Supprimer un contact
-ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
+ConfirmDeleteContact=Êtes-vous sûr de vouloir supprimer ce contact et toutes les informations qui en dépendent ?
 MenuNewThirdParty=Nouveau tiers
 MenuNewCustomer=Nouveau client
 MenuNewProspect=Nouveau prospect
@@ -69,7 +69,7 @@ PhoneShort=Tél.
 Skype=Skype
 Call=Appeler
 Chat=Tchat
-PhonePro=Bus. phone
+PhonePro=Tél pro.
 PhonePerso=Tél perso.
 PhoneMobile=Tél portable
 No_Email=Refuse les emailings
@@ -331,7 +331,7 @@ CustomerCodeDesc=Code client unique pour chaque client
 SupplierCodeDesc=Code fournisseur unique pour chaque fournisseur
 RequiredIfCustomer=Requis si le tiers est un client ou un prospect
 RequiredIfSupplier=Requis si un tiers est un fournisseur
-ValidityControledByModule=Validity controlled by the module
+ValidityControledByModule=Validité contrôlée par le module
 ThisIsModuleRules=Voici les règles de ce module
 ProspectToContact=Prospect à contacter
 CompanyDeleted=La société "%s" a été supprimée de la base.
@@ -439,12 +439,12 @@ ListSuppliersShort=Liste des fournisseurs
 ListProspectsShort=Liste des prospects
 ListCustomersShort=Liste des clients
 ThirdPartiesArea=Tiers / Contacts
-LastModifiedThirdParties=Latest %s Third Parties which were modified
-UniqueThirdParties=Total number of Third Parties
+LastModifiedThirdParties=Les %s derniers tiers modifiés
+UniqueThirdParties=Nombre total des tiers
 InActivity=Ouvert
 ActivityCeased=Clos
 ThirdPartyIsClosed=Le tiers est clôturé
-ProductsIntoElements=List of products/services mapped to %s
+ProductsIntoElements=Liste des produits/services jusqu'à %s
 CurrentOutstandingBill=Montant encours
 OutstandingBill=Montant encours autorisé
 OutstandingBillReached=Montant encours autorisé dépassé
@@ -454,7 +454,7 @@ LeopardNumRefModelDesc=Code libre sans vérification. Peut être modifié à tou
 ManagingDirectors=Nom du(des) gestionnaire(s) (PDG, directeur, président...)
 MergeOriginThirdparty=Tiers en doublon (le tiers que vous voulez supprimer)
 MergeThirdparties=Fusionner tiers
-ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
+ConfirmMergeThirdparties=Êtes-vous sur de vouloir fusionner ce tiers avec le tiers courant ? Tous ses objets liés (factures, commandes, ...) seront déplacés vers le tiers courant, après que le tiers choisi soit supprimé.
 ThirdpartiesMergeSuccess=Les tiers ont été fusionnés
 SaleRepresentativeLogin=Login du commercial
 SaleRepresentativeFirstname=Prénom du commercial
diff --git a/htdocs/langs/fr_FR/compta.lang b/htdocs/langs/fr_FR/compta.lang
index 6510a520a3a..6ee3e204b0a 100644
--- a/htdocs/langs/fr_FR/compta.lang
+++ b/htdocs/langs/fr_FR/compta.lang
@@ -111,7 +111,7 @@ VATDeclaration=Déclaration de TVA
 VATRefund=Remboursement TVA
 NewVATPayment=Nouveau paiement de TVA
 NewLocalTaxPayment=Nouveau paiement charge %s
-Refund=Rembourser
+Refund=Remboursement
 SocialContributionsPayments=Paiements de charges fiscales/sociales
 ShowVatPayment=Affiche paiement TVA
 TotalToPay=Total à payer
@@ -135,7 +135,7 @@ NewCheckReceipt=Nouvelle remise
 NewCheckDeposit=Nouveau dépôt
 NewCheckDepositOn=Créer bordereau de dépôt sur compte: %s
 NoWaitingChecks=Pas de chèques en attente de remise
-DateChequeReceived=Check receiving date
+DateChequeReceived=Date réception chèque
 NbOfCheques=Nb de chèques
 PaySocialContribution=Payer une charge sociale/fiscale
 PayVAT=Payer une déclaration de TVA
@@ -286,3 +286,9 @@ ReportPurchaseTurnover=Chiffre d'affaires d'achat facturé
 ReportPurchaseTurnoverCollected=Chiffre d'affaires d'achat encaissé
 IncludeVarpaysInResults = Inclure les paiements divers dans les rapports
 IncludeLoansInResults = Inclure les prêts dans les rapports
+InvoiceLate30Days = Factures impayés à échéance dépassé de plus de 30 jours
+InvoiceLate15Days = Factures impayés à échéance dépassé de plus de 15 jours
+InvoiceLateMinus15Days = Factures en retard
+InvoiceNotLate = Règlements à recevoir dans moins de 15 jours
+InvoiceNotLate15Days = Règlements à recevoir dans 15 jours
+InvoiceNotLate30Days = Règlements à recevoir dans les 30 jours
diff --git a/htdocs/langs/fr_FR/cron.lang b/htdocs/langs/fr_FR/cron.lang
index 5d7b0fc7462..92c4d1f7e6e 100644
--- a/htdocs/langs/fr_FR/cron.lang
+++ b/htdocs/langs/fr_FR/cron.lang
@@ -60,7 +60,7 @@ CronErrEndDateStartDt=La date de fin ne peux être avant la date de début
 StatusAtInstall=Statut lors de l'installation du module
 CronStatusActiveBtn=Planifier
 CronStatusInactiveBtn=Désactiver
-CronTaskInactive=Cette tâche est désactivée
+CronTaskInactive=Ce poste est désactivé (non planifié)
 CronId=Id
 CronClassFile=Nom de fichier intégrant la classe
 CronModuleHelp=Nom du répertoire du module Dolibarr (fonctionne également avec le module externe Dolibarr). <BR> Par exemple, pour appeler la méthode fetch de l'objet produit Dolibarr /htdocs/<u>product</u>/class/product.class.php, la valeur du module est <br> <i> produit </i>
diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang
index 598bd091ae3..f437a3d3a41 100644
--- a/htdocs/langs/fr_FR/errors.lang
+++ b/htdocs/langs/fr_FR/errors.lang
@@ -4,13 +4,14 @@
 NoErrorCommitIsDone=Pas d'erreur, on valide
 # Errors
 ErrorButCommitIsDone=Erreurs trouvées mais on valide malgré tout
-ErrorBadEMail=Email %s is incorrect
-ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
-ErrorBadUrl=Url %s is incorrect
+ErrorBadEMail=L'email '%s' est invalide
+ErrorBadMXDomain=L'email %s semble incorrect
+ErrorBadUrl=L'URL '%s' est invalide
 ErrorBadValueForParamNotAString=Mauvaise valeur de paramètre. Ceci arrive lors d'une tentative de traduction d'une clé non renseignée.
 ErrorRefAlreadyExists=Le référence <b>%s</b> existe déjà.
 ErrorLoginAlreadyExists=L'identifiant %s existe déjà.
 ErrorGroupAlreadyExists=Le groupe %s existe déjà.
+ErrorEmailAlreadyExists=Email %s already exists.
 ErrorRecordNotFound=Enregistrement non trouvé.
 ErrorFailToCopyFile=Echec de la copie du fichier '<b>%s</b>' en '<b>%s</b>'.
 ErrorFailToCopyDir=Echec de copie du répertoire '<b>%s</b>' vers '<b>%s</b>'.
@@ -46,8 +47,8 @@ ErrorWrongDate=La date est incorrecte
 ErrorFailedToWriteInDir=Impossible d'écrire dans le répertoire %s
 ErrorFoundBadEmailInFile=Syntaxe d'email incorrecte trouvée pour %s lignes dans le fichier (exemple ligne %s avec email=%s)
 ErrorUserCannotBeDelete=L'utilisateur ne peut pas être supprimé. Peut-être est-il associé à des éléments de Dolibarr.
-ErrorFieldsRequired=Some required fields have been left blank.
-ErrorSubjectIsRequired=The email subject is required
+ErrorFieldsRequired=Des champs obligatoire n'ont pas été remplis.
+ErrorSubjectIsRequired=L'objet de l'e-mail est obligatoire
 ErrorFailedToCreateDir=Echec à la création d'un répertoire. Vérifiez que le user du serveur Web ait bien les droits d'écriture dans les répertoires documents de Dolibarr. Si le paramètre <b>safe_mode</b> a été activé sur ce PHP, vérifiez que les fichiers php dolibarr appartiennent à l'utilisateur du serveur Web.
 ErrorNoMailDefinedForThisUser=Email non défini pour cet utilisateur
 ErrorSetupOfEmailsNotComplete=La configuration de l'envoi des e-mails n'est pas terminée
@@ -117,7 +118,7 @@ ErrorCantReadFile=Échec de lecture du fichier '%s'
 ErrorCantReadDir=Échec de lecture du répertoire '%s'
 ErrorBadLoginPassword=Identifiant ou mot de passe incorrect
 ErrorLoginDisabled=Votre compte est désactivé
-ErrorFailedToRunExternalCommand=Échec de l'exécution de la commande externe. Vérifiez qu'elle est disponible et exécutable par votre serveur PHP. Si le <b>Safe Mode</b> PHP est actif, vérifiez que la commande se trouve dans un répertoire défini dans le paramètre <b>safe_mode_exec_dir</b>.
+ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server user. Check also the command is not protected on shell level by a security layer like apparmor.
 ErrorFailedToChangePassword=Échec de modification du mot de passe
 ErrorLoginDoesNotExists=Le compte utilisateur identifié par <b>%s</b> n'a pu être trouvé.
 ErrorLoginHasNoEmail=Cet utilisateur n'a pas d'email. Impossible de continuer.
@@ -262,6 +263,7 @@ ErrorDateIsInFuture=Erreur, la date ne peut pas être dans le futur.
 ErrorAnAmountWithoutTaxIsRequired=Erreur, le montant est obligatoire
 ErrorAPercentIsRequired=Erreur, le pourcentage doit être indiqué correctement.
 ErrorYouMustFirstSetupYourChartOfAccount=Vous devez d’abord configurer votre plan comptable.
+ErrorFailedToFindEmailTemplate=Aucun gabarit trouvé avec le code %s
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Votre paramètre PHP upload_max_filesize (%s) est supérieur au paramètre PHP post_max_size (%s). Ceci n'est pas une configuration cohérente.
@@ -298,3 +300,4 @@ WarningModuleXDisabledSoYouMayMissEventHere=Le module %s n’a pas été activé
 ErrorActionCommPropertyUserowneridNotDefined=Le propriétaire de l'utilisateur est requis
 ErrorActionCommBadType=Le type d'événement sélectionné (id: %n, code: %s) n'existe pas dans le dictionnaire des types d'événement
 CheckVersionFail=Échec de la vérification de version
+ErrorWrongFileName=Le nom du fichier ne peut pas contenir __SOMETHING__
diff --git a/htdocs/langs/fr_FR/eventorganization.lang b/htdocs/langs/fr_FR/eventorganization.lang
index f311d553874..fe4a556bcde 100644
--- a/htdocs/langs/fr_FR/eventorganization.lang
+++ b/htdocs/langs/fr_FR/eventorganization.lang
@@ -1,4 +1,5 @@
 # Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+# Copyright (C) 2021		Dorian Vabre			<dorian.vabre@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
@@ -81,7 +82,10 @@ PriceOfBoothHelp=Prix d’inscription pour un stand
 EventOrganizationICSLink=Lien ICS des événements
 ConferenceOrBoothInformation=Renseignements sur la conférence ou le stand
 Attendees = Participants
+DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Clé sécurisée pour le lien d’inscription public à une conférence
+SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
 #
 # Status
 #
@@ -94,8 +98,46 @@ EvntOrgCancelled = Annulé
 #
 # Public page
 #
+SuggestForm = Suggestion page
+RegisterPage = Page for conferences or booth
+EvntOrgRegistrationHelpMessage = Here, you can vote for an event, or suggest a new conference or booth for the project
+EvntOrgRegistrationConfHelpMessage = Here, you can suggest a new conference for the project
+EvntOrgRegistrationBoothHelpMessage = Here, you can suggest a new booth for the project
+ListOfSuggestedConferences = List of suggested conferences
+ListOfSuggestedBooths = List of suggested booths
+SuggestConference = Suggest a new conference
+SuggestBooth = Suggest a booth
+ViewAndVote = View and vote for suggested events
 PublicAttendeeSubscriptionPage = Lien d’inscription public à une conférence
 MissingOrBadSecureKey = La clé de sécurité est invalide ou manquante
-EvntOrgWelcomeMessage = Ce formulaire vous permet de vous enregistrer en tant que participant à la conférence
-EvntOrgStartDuration = Cette conférence débute à
-EvntOrgEndDuration =  et se termine à
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference : '%s'
+EvntOrgDuration = This conference starts on %s and ends on %s.
+ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
+BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
+EventType = Type événement
+
+#
+# Vote page
+#
+EvntOrgRegistrationWelcomeMessage = Welcome on the conference or booth suggestion page.
+EvntOrgRegistrationConfWelcomeMessage = Welcome on the conference suggestion page.
+EvntOrgRegistrationBoothWelcomeMessage = Welcome on the booth suggestion page.
+EvntOrgVoteHelpMessage = Here, you can view and vote for the suggested events for the project
+VoteOk = Your vote has been accepted.
+AlreadyVoted = You have already voted for this event.
+VoteError = An error has occurred during the vote, please try again.
+
+#
+# SubscriptionOk page
+#
+SubscriptionOk = Your subscription to this conference has been validated
+#
+# Subscription validation mail
+#
+ConfAttendeeSubscriptionConfirmation = Confirmation de votre inscription à une conférence
+#
+# Payment page
+#
+Attendee = Participant
+PaymentConferenceAttendee = Conference attendee payment
+PaymentBoothLocation = Booth location payment
diff --git a/htdocs/langs/fr_FR/hrm.lang b/htdocs/langs/fr_FR/hrm.lang
index 083d42df0b1..81fee383b56 100644
--- a/htdocs/langs/fr_FR/hrm.lang
+++ b/htdocs/langs/fr_FR/hrm.lang
@@ -9,7 +9,7 @@ ConfirmDeleteEstablishment=Êtes-vous sûr de vouloir supprimer cet établisseme
 OpenEtablishment=Etablissement ouvert
 CloseEtablishment=Etablissement fermé
 # Dictionary
-DictionaryPublicHolidays=GRH - Jours fériés
+DictionaryPublicHolidays=Congés - jours fériés
 DictionaryDepartment=GRH - Liste des départements
 DictionaryFunction=GRH - Liste des fonctions
 # Module
diff --git a/htdocs/langs/fr_FR/knowledgemanagement.lang b/htdocs/langs/fr_FR/knowledgemanagement.lang
index f928e48432e..5caceba1b2f 100644
--- a/htdocs/langs/fr_FR/knowledgemanagement.lang
+++ b/htdocs/langs/fr_FR/knowledgemanagement.lang
@@ -18,7 +18,7 @@
 #
 
 # Module label 'ModuleKnowledgeManagementName'
-ModuleKnowledgeManagementName = Knowledge Management System
+ModuleKnowledgeManagementName = Gestion d'une base de connaissance
 # Module description 'ModuleKnowledgeManagementDesc'
 ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
 
@@ -27,7 +27,7 @@ ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk ba
 #
 KnowledgeManagementSetup = Knowledge Management System setup
 Settings = Paramètres
-KnowledgeManagementSetupPage = Knowledge Management System setup page
+KnowledgeManagementSetupPage = Paramétrages du module de base de connaissance
 
 
 #
@@ -46,10 +46,10 @@ KnowledgeManagementArea = Base de connaissances
 #
 # Menu
 #
-MenuKnowledgeRecord = Knowledge base
-ListOfArticles = List of articles
-NewKnowledgeRecord = New article
-ValidateReply = Validate solution
+MenuKnowledgeRecord = Base de connaissance
+ListKnowledgeRecord = Liste des articles
+NewKnowledgeRecord = Nouvel article
+ValidateReply = Valider la réponse
 KnowledgeRecords = Articles
 KnowledgeRecord = Article
-KnowledgeRecordExtraFields = Extrafields for Article
+KnowledgeRecordExtraFields = Atribut supplémentaires (articles)
diff --git a/htdocs/langs/fr_FR/languages.lang b/htdocs/langs/fr_FR/languages.lang
index 12b99eab661..a9629a2fd96 100644
--- a/htdocs/langs/fr_FR/languages.lang
+++ b/htdocs/langs/fr_FR/languages.lang
@@ -3,6 +3,7 @@ Language_am_ET=Ethiopien
 Language_ar_AR=Arabe
 Language_ar_EG=Arabe (Egypte)
 Language_ar_SA=Arabe
+Language_ar_TN=Arabic (Tunisia)
 Language_az_AZ=Azerbaïdjanais
 Language_bn_BD=Bengalais
 Language_bn_IN=Bengali (Inde)
@@ -84,6 +85,7 @@ Language_nl_NL=Néerlandais
 Language_pl_PL=Polonais
 Language_pt_BR=Portugais (Brésil)
 Language_pt_PT=Portugais
+Language_ro_MD=Roumain (Moldavie)
 Language_ro_RO=Roumain
 Language_ru_RU=Russe
 Language_ru_UA=Russe (Ukraine)
diff --git a/htdocs/langs/fr_FR/mails.lang b/htdocs/langs/fr_FR/mails.lang
index c0f5c00808e..7191946c46c 100644
--- a/htdocs/langs/fr_FR/mails.lang
+++ b/htdocs/langs/fr_FR/mails.lang
@@ -15,7 +15,7 @@ MailToUsers=Aux utilisateurs
 MailCC=Copie à
 MailToCCUsers=Copie aux utilisateurs
 MailCCC=Copie cachée à
-MailTopic=Email subject
+MailTopic=Objet du mail
 MailText=Message
 MailFile=Fichiers joints
 MailMessage=Corps du message
@@ -131,8 +131,8 @@ NoNotificationsWillBeSent=Aucune notification automatique prévue pour ce type d
 ANotificationsWillBeSent=1 notification automatique sera envoyée par e-mail
 SomeNotificationsWillBeSent=%s notification(s) automatique(s) sera(seront) envoyée(s) par e-mail
 AddNewNotification=Souscrire à une nouvelle notification automatique (cible/évènement)
-ListOfActiveNotifications=List of all active subscriptions (targets/events) for automatic email notification
-ListOfNotificationsDone=List of all automatic email notifications sent
+ListOfActiveNotifications=Liste de tous les abonnements (cibles/événements) pour des notifications emails automatiques
+ListOfNotificationsDone=Liste de toutes les notifications automatiques envoyées
 MailSendSetupIs=La configuration d'envoi d'emails a été définir sur '%s'. Ce mode ne peut pas être utilisé pour envoyer des e-mailing en masse.
 MailSendSetupIs2=Vous devez d'abord aller, avec un compte d'administrateur, dans le menu %sAccueil - Configuration - EMails%s pour changer le paramètre <strong>'%s'</strong> pour utiliser le mode '%s'. Avec ce mode, vous pouvez entrer le paramétrage du serveur SMTP fourni par votre fournisseur de services Internet et utiliser la fonction d'envoi d'email en masse.
 MailSendSetupIs3=Si vous avez des questions sur la façon de configurer votre serveur SMTP, vous pouvez demander à %s.
diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index 5bba9b2b897..a7ce6dc769c 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -180,7 +180,7 @@ SaveAndNew=Enregistrer et nouveau
 TestConnection=Tester la connexion
 ToClone=Cloner
 ConfirmCloneAsk=Voulez-vous vraiment cloner l'objet <b> %s </b>?
-ConfirmClone=Choose the data you want to clone:
+ConfirmClone=Choisissez la donnée à copier :
 NoCloneOptionsSpecified=Aucun option de clonage n'a été spécifiée.
 Of=du
 Go=Aller
@@ -246,7 +246,7 @@ DefaultModel=Modèle de document par défaut
 Action=Action
 About=À propos
 Number=Nombre
-NumberByMonth=Total reports by month
+NumberByMonth=Nombre total des signalements par mois
 AmountByMonth=Montant par mois
 Numero=Numéro
 Limit=Limite
@@ -341,7 +341,7 @@ KiloBytes=Kilooctets
 MegaBytes=Mégaoctets
 GigaBytes=Gigaoctets
 TeraBytes=Teraoctets
-UserAuthor=Ceated by
+UserAuthor=Créé par
 UserModif=Réalisée par
 b=o.
 Kb=Ko
@@ -430,6 +430,7 @@ LT1IN=CGST
 LT2IN=SGST
 LT1GC=Centimes supplémentaires
 VATRate=Taux TVA
+RateOfTaxN=Taux d'imposition %s
 VATCode=Code Taux TVA
 VATNPR=TVA NPR
 DefaultTaxRate=Taux de taxe par défaut
@@ -729,6 +730,7 @@ MenuMembers=Adhérents
 MenuAgendaGoogle=Agenda Google
 MenuTaxesAndSpecialExpenses=Charges | Dépenses spéciales
 ThisLimitIsDefinedInSetup=Limite Dolibarr (Menu accueil-configuration-sécurité): %s Ko, Limite PHP: %s Ko
+ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
 NoFileFound=Pas de documents téléversés
 CurrentUserLanguage=Langue utilisateur actuelle
 CurrentTheme=Thème courant
@@ -845,7 +847,7 @@ XMoreLines=%s ligne(s) cachées
 ShowMoreLines=Afficher plus/moins de lignes
 PublicUrl=URL publique
 AddBox=Ajouter boite
-SelectElementAndClick=Select an element and click on %s
+SelectElementAndClick=Sélectionnez un élément et cliquez %s
 PrintFile=Imprimer fichier %s
 ShowTransaction=Afficher l'écriture sur le compte bancaire
 ShowIntervention=Afficher intervention
@@ -856,8 +858,8 @@ Denied=Refusé
 ListOf=Liste de %s
 ListOfTemplates=Liste des modèles
 Gender=Genre
-Genderman=Male
-Genderwoman=Female
+Genderman=Homme
+Genderwoman=Femme
 Genderother=Autre
 ViewList=Vue liste
 ViewGantt=Vue Gantt
@@ -1072,6 +1074,7 @@ ValidFrom=Valide à partir de
 ValidUntil=Valide jusqu'au
 NoRecordedUsers=Aucun utilisateur
 ToClose=A fermer
+ToRefuse=A refuser
 ToProcess=À traiter
 ToApprove=A approuver
 GlobalOpenedElemView=Vue globale
@@ -1126,9 +1129,11 @@ UpdateForAllLines=Mise à jour de toutes les lignes
 OnHold=En attente
 Civility=Civilité
 AffectTag=Affecter un tag/catégorie
+CreateExternalUser=Créer utilisateur externe
 ConfirmAffectTag=Affecter les tags en masse
 ConfirmAffectTagQuestion=Êtes-vous sur de vouloir affecter ces catégories aux %s lignes sélectionnées ?
 CategTypeNotFound=Aucun type de tag trouvé pour ce type d'enregistrements
 CopiedToClipboard=Copié dans le presse-papier
 InformationOnLinkToContract=Ce montant n’est que le total de toutes les lignes du contrat. Aucune notion de temps n’est prise en considération.
-ConfirmCancel=Are you sure you want to cancel
+ConfirmCancel=Êtes-vous sûr de vous annuler
+EmailMsgID=Email MsgID
diff --git a/htdocs/langs/fr_FR/members.lang b/htdocs/langs/fr_FR/members.lang
index 8cd437794d7..88a0aa11246 100644
--- a/htdocs/langs/fr_FR/members.lang
+++ b/htdocs/langs/fr_FR/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Un autre adhérent (nom: <b>%s</b>, i
 ErrorUserPermissionAllowsToLinksToItselfOnly=Pour des raisons de sécurité, il faut posséder les droits de modification de tous les utilisateurs pour pouvoir lier un adhérent à un utilisateur autre que vous même.
 SetLinkToUser=Lier à un utilisateur Dolibarr
 SetLinkToThirdParty=Lier à un tiers Dolibarr
-MembersCards=Business cards for members
+MembersCards=Carte de visite pour les adhérents
 MembersList=Liste des adhérents
 MembersListToValid=Liste des adhérents brouillons (à valider)
 MembersListValid=Liste des adhérents valides
@@ -32,7 +32,7 @@ MembersWithSubscriptionToReceive=Adhérents avec cotisation à recevoir
 MembersWithSubscriptionToReceiveShort=Cotisations à recevoir
 DateSubscription=Date adhésion
 DateEndSubscription=Date fin adhésion
-EndSubscription=Subscription Ends
+EndSubscription=La cotisation arrive à échéance
 SubscriptionId=Id adhésion
 WithoutSubscription=Sans adhésion
 MemberId=Id adhérent
@@ -85,8 +85,8 @@ DeleteType=Supprimer
 VoteAllowed=Vote autorisé
 Physical=Personne physique
 Moral=Personne morale
-MorAndPhy=Personne physique et personne morale
-Reenable=Réactivé
+MorAndPhy=Personnes morales et physiques
+Reenable=Réactiver
 ExcludeMember=Exclure un adhérent
 ConfirmExcludeMember=Êtes-vous sûr de vouloir exclure cet adhérent ?
 ResiliateMember=Résilier un adhérent
@@ -144,7 +144,7 @@ DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Modèle d'email à utiliser pour e
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Modèle d'email électronique à utiliser pour envoyer un courrier électronique à un membre lors de l'enregistrement d'une nouvelle cotisation
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Modèle d'email électronique à utiliser pour envoyer un rappel par courrier électronique lorsque l'adhésion est sur le point d'expirer
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Modèle d'email utilisé pour envoyer un email à un adhérent lors de l'annulation d'adhésion
-DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Modèle de courriel à utiliser pour envoyer un courriel à un adhérent en cas d’exclusion de l'adhérent
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Modèle de courriel à utiliser pour envoyer un courriel à un adhérent lors de son exclusion
 DescADHERENT_MAIL_FROM=Email émetteur pour les mails automatiques
 DescADHERENT_ETIQUETTE_TYPE=Format pages étiquettes
 DescADHERENT_ETIQUETTE_TEXT=Texte imprimé sur les planches d'adresses adhérent
@@ -175,26 +175,26 @@ MembersStatisticsByCountries=Statistiques des membres par pays
 MembersStatisticsByState=Statistiques des membres par département/province/canton
 MembersStatisticsByTown=Statistiques des membres par ville
 MembersStatisticsByRegion=Statistiques des membres par région
-NbOfMembers=Total number of members
-NbOfActiveMembers=Total number of current active members
+NbOfMembers=Nombre total d'adhérents
+NbOfActiveMembers=Nombre total d'adhérents actifs actuellement
 NoValidatedMemberYet=Aucun membre validé trouvé
-MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
-MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
-MembersByTownDesc=This screen show you statistics of members by town.
-MembersByNature=This screen show you statistics of members by nature.
-MembersByRegion=This screen show you statistics of members by region.
+MembersByCountryDesc=Cet écran vous présente une vue statistique du nombre d'adhérents par pays. Le graphique utilise toutefois le service en ligne de graphique de Google et n'est opérationnel uniquement que si une connexion internet est disponible.
+MembersByStateDesc=Cet écran vous présente une vue statistique du nombre d'adhérents par département/province/canton.
+MembersByTownDesc=Cet écran vous présente une vue statistique du nombre d'adhérents par ville.
+MembersByNature=Cet écran vous montre les statistiques sur les adhérents par nature.
+MembersByRegion=Cet écran vous montre les statistiques sur les adhérents par région.
 MembersStatisticsDesc=Choisissez les statistiques que vous désirez consulter...
 MenuMembersStats=Statistiques
-LastMemberDate=Latest membership date
+LastMemberDate=Date dernière adhésion
 LatestSubscriptionDate=Date de dernière adhésion
-MemberNature=Nature of the member
-MembersNature=Nature of the members
-Public=Information is public
+MemberNature=Nature de l'adhérent
+MembersNature=Nature des adhérents
+Public=Informations publiques
 NewMemberbyWeb=Nouvel adhérent ajouté. En attente de validation
 NewMemberForm=Nouvel Adhérent form
-SubscriptionsStatistics=Subscriptions statistics
+SubscriptionsStatistics=Statistiques sur les cotisations
 NbOfSubscriptions=Nombre de cotisations
-AmountOfSubscriptions=Amount collected from subscriptions
+AmountOfSubscriptions=Montant de cotisations
 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
@@ -213,4 +213,5 @@ SendReminderForExpiredSubscription=Envoyer un rappel par e-mail aux membres lors
 MembershipPaid=Adhésion payée pour la période en cours (jusqu'au %s)
 YouMayFindYourInvoiceInThisEmail=Vous pouvez trouver votre facture jointe à cet email
 XMembersClosed=%s adhérent(s) résilié(s)
-ForceMemberNature=Forcer la nature du membre (Personne physique ou personne morale)
+XExternalUserCreated=%s utilisateur(s) externe(s) créé(s)
+ForceMemberNature=Forcer la nature de l'adhérent (personne physique ou morale)
diff --git a/htdocs/langs/fr_FR/modulebuilder.lang b/htdocs/langs/fr_FR/modulebuilder.lang
index 1bd6f76c06f..9b9e93bebe7 100644
--- a/htdocs/langs/fr_FR/modulebuilder.lang
+++ b/htdocs/langs/fr_FR/modulebuilder.lang
@@ -143,3 +143,4 @@ AsciiToHtmlConverter=Convertisseur Ascii en HTML
 AsciiToPdfConverter=Convertisseur Ascii en PDF
 TableNotEmptyDropCanceled=La table n’est pas vide. La suppression a été annulée.
 ModuleBuilderNotAllowed=Le module builder est activé mais son accès n'est pas autorisé pour votre utilisateur
+ImportExportProfiles=Import and export profiles
diff --git a/htdocs/langs/fr_FR/mrp.lang b/htdocs/langs/fr_FR/mrp.lang
index 4cfa8e0035d..00f0fc18b99 100644
--- a/htdocs/langs/fr_FR/mrp.lang
+++ b/htdocs/langs/fr_FR/mrp.lang
@@ -13,7 +13,7 @@ BOMsSetup=Configuration du module BOM
 ListOfBOMs=Liste des BOMs
 ListOfManufacturingOrders=Liste des Ordres de Fabrication
 NewBOM=Nouveau BOM
-ProductBOMHelp=Produit à créer avec cette nomenclature. <br> Remarque: les produits avec la propriété 'Nature of product' = 'Matière première' ne sont pas visibles dans cette liste.
+ProductBOMHelp=Product to create (or disassemble) with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
 BOMsNumberingModules=Modèles de numérotation de BOMs
 BOMsModelModule=Modèles de documents de BOMs
 MOsNumberingModules=Modèles de numérotation d'OF
@@ -39,7 +39,7 @@ DateStartPlannedMo=Date de début prévue
 DateEndPlannedMo=Date de fin prévue
 KeepEmptyForAsap=Vide signifie 'Dès que possible'
 EstimatedDuration=Durée estimée
-EstimatedDurationDesc=Durée estimée de fabrication de ce produit à l'aide de cette nomenclature (BOM)
+EstimatedDurationDesc=Durée de fabrication (ou décomposition) planifiée pour ce produit avec cette BOM 
 ConfirmValidateBom=Voulez-vous vraiment valider la nomenclature (BOM) avec la référence <strong>%s</strong> (vous pourrez l'utiliser pour créer de nouveaux Ordres de Fabrication)
 ConfirmCloseBom=Voulez-vous vraiment annuler cette nomenclature (vous ne pourrez plus l'utiliser pour créer de nouveaux Ordres de Fabrication)?
 ConfirmReopenBom=Êtes-vous sûr de vouloir rouvrir cette nomenclature (vous pourrez l'utiliser pour créer de nouveaux Ordres de Fabrication)
@@ -63,13 +63,14 @@ ConsumeAndProduceAll=Consommer et Produire tout
 Manufactured=Fabriqué
 TheProductXIsAlreadyTheProductToProduce=Le produit à ajouter est déjà le produit à produire.
 ForAQuantityOf=Pour une quantité à produire de %s
+ForAQuantityToConsumeOf=For a quantity to disassemble of %s
 ConfirmValidateMo=Voulez-vous vraiment valider cet ordre de fabrication?
 ConfirmProductionDesc=En cliquant sur '%s', vous validerez la consommation et / ou la production pour les quantités définies. Cela mettra également à jour le stock et enregistrera les mouvements de stock.
 ProductionForRef=Production de %s
 AutoCloseMO=Fermer automatiquement l'Ordre de Fabrication si les quantités à consommer et à produire sont atteintes
 NoStockChangeOnServices=Aucune variation de stock sur les services
 ProductQtyToConsumeByMO=Quantité de produit restant à consommer par OF ouvert
-ProductQtyToProduceByMO=Quantité de produits encore à produire par OF ouverte
+ProductQtyToProduceByMO=Quantités restant à produire avec les OF ouverts
 AddNewConsumeLines=Ajouter une nouvelle ligne à consommer
 ProductsToConsume=Produits à consommer
 ProductsToProduce=Produits à produire
diff --git a/htdocs/langs/fr_FR/other.lang b/htdocs/langs/fr_FR/other.lang
index dff5915fa6b..05af1498cb6 100644
--- a/htdocs/langs/fr_FR/other.lang
+++ b/htdocs/langs/fr_FR/other.lang
@@ -129,6 +129,7 @@ ClosedByLogin=Identifiant utilisateur qui a fermé
 FileWasRemoved=Le fichier %s a été supprimé
 DirWasRemoved=Le répertoire %s a été supprimé
 FeatureNotYetAvailable=Fonctionnalité pas encore disponible dans cette version
+FeatureNotAvailableOnDevicesWithoutMouse=Fonctionnalité indisponible sur les équipements sans souris
 FeaturesSupported=Fonctionnalités prises en charge
 Width=Largeur
 Height=Hauteur
@@ -263,7 +264,7 @@ ContactCreatedByEmailCollector=Contact/adresse créé par le collecteur de courr
 ProjectCreatedByEmailCollector=Projet créé par le collecteur de courrier électronique à partir du courrier électronique MSGID %s
 TicketCreatedByEmailCollector=Ticket créé par le collecteur de courrier électronique à partir du courrier électronique MSGID %s
 OpeningHoursFormatDesc=Utilisez un - pour séparer les heures d'ouverture et de fermeture. <br> Utilisez un espace pour entrer différentes plages. <br> Exemple: 8-12 14-18
-PrefixSession=Préfixe pour l'ID de la session
+SuffixSessionName=Suffix for session name
 
 ##### Export #####
 ExportsArea=Espace exports
@@ -289,4 +290,4 @@ PopuProp=Produits / services par popularité dans les propositions
 PopuCom=Produits/services par popularité dans les commandes
 ProductStatistics=Statistiques sur les produits / services
 NbOfQtyInOrders=Qté en commandes
-SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
+SelectTheTypeOfObjectToAnalyze=Sélectionner un objet pour en voir les statistiques
diff --git a/htdocs/langs/fr_FR/partnership.lang b/htdocs/langs/fr_FR/partnership.lang
index 4200ee5dfc9..cb51eece63a 100644
--- a/htdocs/langs/fr_FR/partnership.lang
+++ b/htdocs/langs/fr_FR/partnership.lang
@@ -16,41 +16,72 @@
 #
 # Generic
 #
-ModulePartnershipName = Gestion des partenariats
-PartnershipDescription = Module de gestion des partenariats
+ModulePartnershipName=Gestion des partenariats
+PartnershipDescription=Module de gestion des partenariats
 PartnershipDescriptionLong= Module de gestion des partenariats
 
+AddPartnership=Add partnership
+CancelPartnershipForExpiredMembers=Partnership: Cancel partnership of members with expired subscriptions
+PartnershipCheckBacklink=Partnership: Check referring backlink
+
 #
 # Menu
 #
-NewPartnership = Nouveau partenariat
-ListOfPartnerships = Listes des partenariats
+NewPartnership=Nouveau partenariat
+ListOfPartnerships=Listes des partenariats
 
 #
 # Admin page
 #
-PartnershipSetup = Page de configuration du module Partenariat
-PartnershipAbout = À propos de Partenariat
-PartnershipAboutPage = Page d'informations du module Partenariat
-
+PartnershipSetup=Page de configuration du module Partenariat
+PartnershipAbout=À propos de Partenariat
+PartnershipAboutPage=Page d'informations du module Partenariat
+partnershipforthirdpartyormember=Partner status must be set on a 'thirdparty' or a 'member'
+PARTNERSHIP_IS_MANAGED_FOR=Partnership managed for
+PARTNERSHIP_BACKLINKS_TO_CHECK=Liens de retour à vérifier
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb of days before cancelling status of a partnership when a subscription has expired
+ReferingWebsiteCheck=Check of website referring
+ReferingWebsiteCheckDesc=You can enable a feature to check that your partners has added a backlink to your website domains on their own website.
 
 #
 # Object
 #
+DeletePartnership=Supprimer un partenariat
+PartnershipDedicatedToThisThirdParty=Partenariat dédié à ce tiers
+PartnershipDedicatedToThisMember=Partenariat dédié à cet adhérent
 DatePartnershipStart=Date de début
 DatePartnershipEnd=Date de fin
+ReasonDecline=Raison du refus
+ReasonDeclineOrCancel=Raison du refus
+PartnershipAlreadyExist=Partenariat déjà existant
+ManagePartnership=Manage partnership
+BacklinkNotFoundOnPartnerWebsite=Lien de retour non trouvé sur le site web partenaire
+ConfirmClosePartnershipAsk=Êtes-vous sûr de vouloir annuler ce partenariat ?
+PartnershipType=Partnership type
 
 #
 # Template Mail
 #
+SendingEmailOnPartnershipWillSoonBeCanceled=Le partenariat sera bientôt annulé
+SendingEmailOnPartnershipRefused=Partenariat refusé
+SendingEmailOnPartnershipAccepted=Partenariat accepté
+SendingEmailOnPartnershipCanceled=Partenariat annulé
 
+YourPartnershipWillSoonBeCanceledTopic=Le partenariat sera bientôt annulé
+YourPartnershipRefusedTopic=Partenariat refusé
+YourPartnershipAcceptedTopic=Partenariat accepté
+YourPartnershipCanceledTopic=Partenariat annulé
+
+YourPartnershipWillSoonBeCanceledContent=Nous vous informons que votre demande de partenariat va bientôt être annulée (lien de retour non trouvé)
+YourPartnershipRefusedContent=Nous vous informons que votre demande de partenariat a été refusée.
+YourPartnershipAcceptedContent=Nous vous informons que votre demande de partenariat a été acceptée.
+YourPartnershipCanceledContent=Nous vous informons que votre demande de partenariat a été annulée.
 
 #
 # Status
 #
-PartnershipDraft = Brouillon
-PartnershipAccepted = Accepté
-PartnershipRefused = Refusé
-PartnershipCanceled = Annulé
-
-PartnershipManagedFor=Partners are
+PartnershipDraft=Brouillon
+PartnershipAccepted=Accepté
+PartnershipRefused=Refusé
+PartnershipCanceled=Annulé
+PartnershipManagedFor=Les partenaires sont
diff --git a/htdocs/langs/fr_FR/productbatch.lang b/htdocs/langs/fr_FR/productbatch.lang
index 337af188fe1..ac0ec602eac 100644
--- a/htdocs/langs/fr_FR/productbatch.lang
+++ b/htdocs/langs/fr_FR/productbatch.lang
@@ -30,14 +30,16 @@ BatchLotNumberingModules=Options pour la génération automatique de produits en
 BatchSerialNumberingModules=Options pour la génération automatique de produits en lots gérés par numéros de série
 ManageLotMask=Masque personnalisé
 CustomMasks=Ajoute une option pour définir le masque dans la fiche produit
-LotProductTooltip=Crée un champ dans la fiche produit pour définir un modèle spécifique de numéro de lot
-SNProductTooltip=Crée un champ dans la fiche produit pour définir un modèle spécifique de numéro de série
+LotProductTooltip=Ajoute une option dans la fiche produit pour définir un masque de numéro de lot dédié
+SNProductTooltip=Ajoute une option dans la fiche produit pour définir un masque de numéro de série dédié
 QtyToAddAfterBarcodeScan=Quantité à ajouter pour chaque code à barres/lot/série scanné
 LifeTime=Durée de vie (en jours)
-EndOfLife=Date de fin de vie
+EndOfLife=Fin d'utilisation
 ManufacturingDate=Date de fabrication
-DestructionDate=Date de mise au rebut
-FirstUseDate=Date de mise en service
-QCFrequency=Periodicité de contrôle (en jours)
+DestructionDate=Date de destruction
+FirstUseDate=Date de première mise en service
+QCFrequency=Fréquence du contrôle qualité (en jours)
+
+#Traceability - qc status
+OutOfOrder=Hors d'usage
 InWorkingOrder=En état de marche
-OutOfOrder=Hors d’usage
diff --git a/htdocs/langs/fr_FR/products.lang b/htdocs/langs/fr_FR/products.lang
index 9501fc6022b..d7390c38ba8 100644
--- a/htdocs/langs/fr_FR/products.lang
+++ b/htdocs/langs/fr_FR/products.lang
@@ -43,7 +43,7 @@ ServicesOnSaleOnly=Services en vente uniquement
 ServicesOnPurchaseOnly=Services en achat uniquement
 ServicesNotOnSell=Services hors vente et hors achat
 ServicesOnSellAndOnBuy=Services en vente et en achat
-LastModifiedProductsAndServices=Latest %s products/services which were modified
+LastModifiedProductsAndServices=Les %s derniers produits/services modifiés
 LastRecordedProducts=Les %s derniers produits enregistrés
 LastRecordedServices=Les %s derniers services enregistrés
 CardProduct0=Produit
@@ -78,7 +78,7 @@ CostPriceUsage=Cette valeur peut être utilisée dans le calcul des marges.
 SoldAmount=Solde
 PurchasedAmount=Montant des achats
 NewPrice=Nouveau prix
-MinPrice=Min. selling price
+MinPrice=Prix de vente min.
 EditSellingPriceLabel=Modifier le libellé du prix de vente
 CantBeLessThanMinPrice=Le prix de vente ne doit pas être inférieur au minimum pour ce produit (%s HT). Ce message peut aussi être provoqué par une remise trop importante.
 ContractStatusClosed=Clôturé
@@ -157,11 +157,11 @@ ListServiceByPopularity=Liste des services par popularité
 Finished=Produit manufacturé
 RowMaterial=Matière première
 ConfirmCloneProduct=Êtes-vous sûr de vouloir cloner le produit ou service <b>%s</b> ?
-CloneContentProduct=Clone all main information of the product/service
+CloneContentProduct=Cloner toutes les informations principales du produits/service
 ClonePricesProduct=Cloner les prix
-CloneCategoriesProduct=Clone linked tags/categories
-CloneCompositionProduct=Clone virtual products/services
-CloneCombinationsProduct=Clone the product variants
+CloneCategoriesProduct=Cloner les tags/catégories
+CloneCompositionProduct=Cloner les produits/services virtuels
+CloneCombinationsProduct=Cloner les variantes du produit
 ProductIsUsed=Ce produit est utilisé
 NewRefForClone=Réf. du nouveau produit/service
 SellingPrices=Prix de vente
@@ -170,12 +170,12 @@ CustomerPrices=Prix clients
 SuppliersPrices=Prix fournisseurs
 SuppliersPricesOfProductsOrServices=Prix fournisseurs (des produits ou services)
 CustomCode=Nomenclature douanière ou Code SH
-CountryOrigin=Country of origin
-RegionStateOrigin=Region of origin
-StateOrigin=State|Province of origin
-Nature=Nature of product (raw/manufactured)
+CountryOrigin=Pays d'origine
+RegionStateOrigin=Région d'origine
+StateOrigin=Etat/province d'origine
+Nature=Nature du produit (matière première/produit fabriqué)
 NatureOfProductShort=Nature de produit
-NatureOfProductDesc=Raw material or manufactured product
+NatureOfProductDesc=Matière première ou produit fabriqué
 ShortLabel=Libellé court
 Unit=Unité
 p=u.
@@ -396,3 +396,5 @@ ActionAvailableOnVariantProductOnly=Action disponible uniquement sur la variante
 ProductsPricePerCustomer=Prix produit par clients
 ProductSupplierExtraFields=Attributs supplémentaires (Prix fournisseur)
 DeleteLinkedProduct=Supprimer le produit enfant lié à la combinaison
+PMPValue=Prix moyen pondéré (PMP)
+PMPValueShort=PMP
diff --git a/htdocs/langs/fr_FR/projects.lang b/htdocs/langs/fr_FR/projects.lang
index d7ab95ff424..6b342e4eb88 100644
--- a/htdocs/langs/fr_FR/projects.lang
+++ b/htdocs/langs/fr_FR/projects.lang
@@ -10,19 +10,19 @@ PrivateProject=Contacts projet
 ProjectsImContactFor=Projets dont je suis un contact explicite
 AllAllowedProjects=Tout projet que je peux lire (les miens + public)
 AllProjects=Tous les projets
-MyProjectsDesc=This view is limited to the projects that you are a contact for
+MyProjectsDesc=Cette vue est limitée aux projets pour lesquels vous êtres un contact affecté
 ProjectsPublicDesc=Cette vue présente tous les projets pour lesquels vous êtes habilité à avoir une visibilité.
 TasksOnProjectsPublicDesc=Cette vue affiche toutes les tâches de projets selon vos permissions utilisateur
 ProjectsPublicTaskDesc=Cette vue présente tous les projets et tâches pour lesquels vous êtes habilité à avoir une visibilité.
 ProjectsDesc=Cette vue présente tous les projets (vos habilitations vous offrant une vue exhaustive).
 TasksOnProjectsDesc=Cette vue présente toutes les tâches sur tous les projets (vos permissions d'utilisateur vous accordent la permission de voir tout).
-MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
+MyTasksDesc=Cette vue est restreinte aux projets ou tâches pour lesquels vous êtes un contact affecté.
 OnlyOpenedProject=Seuls les projets ouverts sont visibles (les projets à l'état brouillon ou fermé ne sont pas visibles).
 ClosedProjectsAreHidden=Les projets fermés ne sont pas visible.
 TasksPublicDesc=Cette vue présente tous les projets et tâches pour lesquels vous êtes habilité à avoir une visibilité.
 TasksDesc=Cette vue présente tous les projets et tâches (vos habilitations vous offrant une vue exhaustive).
 AllTaskVisibleButEditIfYouAreAssigned=Toutes les tâches des projets sont visibles mais il n'est possible de saisir du temps passé que sur celles assignées à l'utilisateur sélectionné.\nAssignez la tâche si elle ne l'est pas déjà pour pouvoir saisir du temps dessus.
-OnlyYourTaskAreVisible=Only tasks assigned to you are visible. If you need to enter time on a task and if the task is not visible here, then you need to assign the task to yourself.
+OnlyYourTaskAreVisible=Seules les tâches qui vous sont assignées sont visibles. Assignez vous une tâche pour la voir et saisir du temps dessus.
 ImportDatasetTasks=Tâches des projets
 ProjectCategories=Catégories/tags de projet
 NewProject=Nouveau projet
@@ -202,7 +202,7 @@ ResourceNotAssignedToTheTask=Non assigné à la tache
 NoUserAssignedToTheProject=Aucun utilisateur assigné à ce projet
 TimeSpentBy=Temps consommé par
 TasksAssignedTo=Tâches assignées à
-AssignTaskToMe=Assign task to myself
+AssignTaskToMe=M'assigner la tâche
 AssignTaskToUser=Assigner tâche à %s
 SelectTaskToAssign=Sélectionnez la tâche à assigner
 AssignTask=Assigner
@@ -267,9 +267,11 @@ InvoiceToUse=Facture brouillon à utiliser
 NewInvoice=Nouvelle facture
 OneLinePerTask=Une ligne par tâche
 OneLinePerPeriod=Une ligne par période
+OneLinePerTimeSpentLine=One line for each time spent declaration
 RefTaskParent=Réf. Tâche parent
 ProfitIsCalculatedWith=Le bénéfice est calculé sur la base de
 AddPersonToTask=Ajouter également aux tâches
 UsageOrganizeEvent=Utilisation: Organisation d'événements
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classer le projet comme étant clos lorsque toutes ses tâches sont terminées (progression 100%%)
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Remarque : les projets existants avec toutes les tâches terminées à 100 %% ne seront pas affectés : vous devrez les fermer manuellement. Cette option n’affecte que les projets ouverts.
+SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
diff --git a/htdocs/langs/fr_FR/receptions.lang b/htdocs/langs/fr_FR/receptions.lang
index 498e02786cc..2becadf52c4 100644
--- a/htdocs/langs/fr_FR/receptions.lang
+++ b/htdocs/langs/fr_FR/receptions.lang
@@ -44,4 +44,4 @@ ValidateOrderFirstBeforeReception=Vous devez d'abord valider la commande avant d
 ReceptionsNumberingModules=Module de numérotation pour les réceptions
 ReceptionsReceiptModel=Modèles de document pour les réceptions
 NoMorePredefinedProductToDispatch=Plus de produits prédéfinis à expédier
-
+ReceptionExist=Une réception existe
diff --git a/htdocs/langs/fr_FR/sendings.lang b/htdocs/langs/fr_FR/sendings.lang
index cd4c3d1d94d..47e144b8d4d 100644
--- a/htdocs/langs/fr_FR/sendings.lang
+++ b/htdocs/langs/fr_FR/sendings.lang
@@ -43,7 +43,7 @@ ConfirmValidateSending=Êtes-vous sûr de vouloir valider cette expédition sous
 ConfirmCancelSending=Êtes-vous sûr de vouloir annuler cette expédition ?
 DocumentModelMerou=Modèle Merou A5
 WarningNoQtyLeftToSend=Alerte, aucun produit en attente d'expédition.
-StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
+StatsOnShipmentsOnlyValidated=Les statistiques ne prennent en compte que les envois validés. La date utilisée est celle qui est la date de validation de l'envoi (la date de réception prévue n'est pas nécessairement connue)
 DateDeliveryPlanned=Date prévue de livraison
 RefDeliveryReceipt=Ref bon de réception
 StatusReceipt=Status du bon de réception
diff --git a/htdocs/langs/fr_FR/ticket.lang b/htdocs/langs/fr_FR/ticket.lang
index 9a62c443c56..11e68479e5c 100644
--- a/htdocs/langs/fr_FR/ticket.lang
+++ b/htdocs/langs/fr_FR/ticket.lang
@@ -61,7 +61,7 @@ Notify_TICKET_SENTBYMAIL=Envoi d'un message du ticket par e-mail
 Read=Lu
 Assigned=Assigné
 InProgress=En cours
-NeedMoreInformation=Attente d'information
+NeedMoreInformation=Attente retour client
 Answered=Répondu
 Waiting=En attente
 Closed=Fermé
@@ -304,7 +304,7 @@ BoxLastModifiedTicket=Derniers tickets modifiés
 BoxLastModifiedTicketDescription=Les %s derniers tickets modifiés
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=Pas de tickets modifiés récemment
-BoxTicketType=Nombre de tickets ouverts par type
+BoxTicketType=Distribution of open tickets by type
 BoxTicketSeverity=Nombre de tickets ouverts par sévérité
 BoxNoTicketSeverity=Aucun ticket ouvert
 BoxTicketLastXDays=Nombre de nouveaux tickets par jour ces %s derniers jours
diff --git a/htdocs/langs/fr_FR/users.lang b/htdocs/langs/fr_FR/users.lang
index d730ca167ed..942a1d9fe87 100644
--- a/htdocs/langs/fr_FR/users.lang
+++ b/htdocs/langs/fr_FR/users.lang
@@ -12,7 +12,7 @@ PasswordChangedTo=Mot de passe modifié en: %s
 SubjectNewPassword=Votre mot de passe pour %s
 GroupRights=Permissions groupe
 UserRights=Permissions utilisateur
-Credentials=Credentials
+Credentials=Qualifications
 UserGUISetup=Interface utilisateur
 DisableUser=Désactiver
 DisableAUser=Désactiver un utilisateur
@@ -106,7 +106,7 @@ UseTypeFieldToChange=Modifier le champ Type pour changer
 OpenIDURL=URL OpenID
 LoginUsingOpenID=Se connecter par OpenID
 WeeklyHours=Heures de travail (par semaine)
-ExpectedWorkedHours=Expected hours worked per week
+ExpectedWorkedHours=Heures de travail prévues par semaine
 ColorUser=Couleur de l'utilisateur
 DisabledInMonoUserMode=Désactivé en mode maintenance
 UserAccountancyCode=Code comptable de l'utilisateur
@@ -116,7 +116,7 @@ DateOfEmployment=Date d'embauche
 DateEmployment=Emploi
 DateEmploymentstart=Date d'embauche
 DateEmploymentEnd=Date de fin d'emploi
-RangeOfLoginValidity=Access validity date range
+RangeOfLoginValidity=Période de validité de l'identifiant
 CantDisableYourself=Vous ne pouvez pas désactiver votre propre compte utilisateur
 ForceUserExpenseValidator=Forcer le valideur des notes de frais
 ForceUserHolidayValidator=Forcer le valideur des congés
diff --git a/htdocs/langs/fr_FR/website.lang b/htdocs/langs/fr_FR/website.lang
index 9704067d76c..6f19dab9109 100644
--- a/htdocs/langs/fr_FR/website.lang
+++ b/htdocs/langs/fr_FR/website.lang
@@ -140,7 +140,7 @@ DefineListOfAltLanguagesInWebsiteProperties=Définir la liste des langues dispon
 GenerateSitemaps=Générer un fichier de plan du site
 ConfirmGenerateSitemaps=Si vous confirmez, vous effacerez le fichier de plan du site existant...
 ConfirmSitemapsCreation=Confirmer la génération du plan du site
-SitemapGenerated=Sitemap file <b>%s</b> generated
+SitemapGenerated=Le plan du site <b>%s</b>a été généré
 ImportFavicon=Favicon
 ErrorFaviconType=Le Favicon doit être en png
 ErrorFaviconSize=Le Favicon doit être de taille 16x16, 32x32 ou 64x64
diff --git a/htdocs/langs/fr_GA/accountancy.lang b/htdocs/langs/fr_GA/accountancy.lang
index 4dbdd035d6e..ef9e69e554a 100644
--- a/htdocs/langs/fr_GA/accountancy.lang
+++ b/htdocs/langs/fr_GA/accountancy.lang
@@ -1,2 +1,2 @@
 # Dolibarr language file - Source file is en_US - accountancy
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
diff --git a/htdocs/langs/fr_GA/cron.lang b/htdocs/langs/fr_GA/cron.lang
deleted file mode 100644
index 67ecfc77567..00000000000
--- a/htdocs/langs/fr_GA/cron.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - cron
-CronTaskInactive=This job is disabled
diff --git a/htdocs/langs/fr_GA/exports.lang b/htdocs/langs/fr_GA/exports.lang
new file mode 100644
index 00000000000..17dedd46696
--- /dev/null
+++ b/htdocs/langs/fr_GA/exports.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - exports
+DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
diff --git a/htdocs/langs/fr_GA/main.lang b/htdocs/langs/fr_GA/main.lang
index 2e691473326..71ab1503dbe 100644
--- a/htdocs/langs/fr_GA/main.lang
+++ b/htdocs/langs/fr_GA/main.lang
@@ -19,3 +19,4 @@ FormatDateHourShort=%m/%d/%Y %I:%M %p
 FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
 FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
+OpenAll=Open for all actions
diff --git a/htdocs/langs/fr_GA/mrp.lang b/htdocs/langs/fr_GA/mrp.lang
deleted file mode 100644
index a8ff138755b..00000000000
--- a/htdocs/langs/fr_GA/mrp.lang
+++ /dev/null
@@ -1,6 +0,0 @@
-# Dolibarr language file - Source file is en_US - mrp
-BillOfMaterials=Bill of Material
-NewBOM=New bill of material
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
diff --git a/htdocs/langs/fr_GA/products.lang b/htdocs/langs/fr_GA/products.lang
new file mode 100644
index 00000000000..e0628dbec00
--- /dev/null
+++ b/htdocs/langs/fr_GA/products.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - products
+ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
diff --git a/htdocs/langs/fr_GA/stocks.lang b/htdocs/langs/fr_GA/stocks.lang
new file mode 100644
index 00000000000..1cae5cf3f11
--- /dev/null
+++ b/htdocs/langs/fr_GA/stocks.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - stocks
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+OpenInternal=Open only for internal actions
diff --git a/htdocs/langs/fr_GA/ticket.lang b/htdocs/langs/fr_GA/ticket.lang
new file mode 100644
index 00000000000..82e110b1ca4
--- /dev/null
+++ b/htdocs/langs/fr_GA/ticket.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - ticket
+TicketTypeShortISSUE=Issue, bug or problem
+OriginEmail=Email source
+NeedMoreInformation=Waiting for information
+TicketCategory=Group
diff --git a/htdocs/langs/gl_ES/accountancy.lang b/htdocs/langs/gl_ES/accountancy.lang
index 474e593baca..5297de3a2c1 100644
--- a/htdocs/langs/gl_ES/accountancy.lang
+++ b/htdocs/langs/gl_ES/accountancy.lang
@@ -158,7 +158,7 @@ ACCOUNTING_LENGTH_AACCOUNT=Lonxitude das contas contables de terceiros (Se defin
 ACCOUNTING_MANAGE_ZERO=Permitir xestionar un número diferente de ceros ao final dunha conta contable. Preciso por algúns países (como Suíza). Se está desactivado (predeterminado), pode configurar os seguintes dous parámetros  para solicitar á aplicación que engada ceros virtuais.
 BANK_DISABLE_DIRECT_INPUT=Desactivar transaccións directas en conta bancaria
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Habilitar exportación de borradores al diario
-ACCOUNTANCY_COMBO_FOR_AUX=Habilita a listaxe combinada para a conta contable subsidiaria (pode ser lento se ten moitos terceiros)
+ACCOUNTANCY_COMBO_FOR_AUX=Activar a listaxe combinada para a conta subsidiaria (pode ser lento se ten moitos terceiros, rompe coa capacidade de buscar unha parte do valor) 
 ACCOUNTING_DATE_START_BINDING=Define unha data para comezar a ligar e transferir na contabilidade. Por debaixo desta data, as transaccións non se transferirán á contabilidade.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Na transferencia de contabilidade, selecciona amosar o período por defecto
 
@@ -328,6 +328,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Desactivar a ligazón e transferencia na
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Desactivar a ligazón e transferencia na contabilidade dos informes de gastos (os informes de gastos non se terán en conta na contabilidade)
 
 ## Export
+NotifiedExportDate=Data de exportación notificada (non será posible modificar as entradas) 
+NotifiedValidationDate=Validación das entradas (non será posible modificar ou eliminar as entradas) 
+ConfirmExportFile=Confirmación da xeración do ficheiro de exportación contable? 
 ExportDraftJournal=Exportar libro borrador
 Modelcsv=Modelo de exportación
 Selectmodelcsv=Seleccione un modelo de exportación
diff --git a/htdocs/langs/gl_ES/admin.lang b/htdocs/langs/gl_ES/admin.lang
index 6e35ac3d197..12fec2a786f 100644
--- a/htdocs/langs/gl_ES/admin.lang
+++ b/htdocs/langs/gl_ES/admin.lang
@@ -55,7 +55,7 @@ InternalUsers=Usuarios internos
 ExternalUsers=Usuarios externos
 GUISetup=Entorno
 SetupArea=Configuración
-UploadNewTemplate=Nova(s) prantilla(s) actualizada(s)
+UploadNewTemplate=Novo(s) padrón(s) actualizado(s)
 FormToTestFileUploadForm=Formulario de proba de subida de ficheiro (según opcións escollidas)
 ModuleMustBeEnabled=O módulo/aplicación <b>%s</b> debe estar activado
 ModuleIsEnabled=O módulo/aplicación <b>%s</b> foi activado
@@ -221,8 +221,8 @@ NotCompatible=Este módulo non parece compatible co seu Dolibarr %s (Min %s - Ma
 CompatibleAfterUpdate=Este módulo require unha actualización do seu Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=Ver na tenda
 SeeSetupOfModule=Ver a configuración do módulo %s
+SetOptionTo=Estableza a opción <b>%s</b> a %s
 Updated=Actualizado
-Nouveauté=Novidade
 AchatTelechargement=Compra/Descarga
 GoModuleSetupArea=Para aplicar/instalar un novo módulo, ir ao área de configuración de módulos <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, o sitio oficial de módulos externos e para Dolibarr ERP/CRM
@@ -340,7 +340,7 @@ UnpackPackageInDolibarrRoot=Descomprimir os ficheiros comprimidos no directorio
 UnpackPackageInModulesRoot=Para instalar un módulo externo, descomprima o ficheiro no directorio do servidor adicado aos módulos externos: <br><b>%s</b>
 SetupIsReadyForUse=A instalación do módulo rematou. Porén, debe habilitar e configurar o módulo na súa aplicación, indo á páxina para configurar os módulos: <a href="%s">%s</a>.
 NotExistsDirect=O directorio raíz alternativo non está configurado nun directorio existente.<br>
-InfDirAlt=Dende a versión 3, é posible definir un directorio raíz alternativo. Isto permítelle almacenar, nun directorio adicado, plug-ins e prantillas persoalizadas.<br>Só en que crear un directorio na raíz de Dolibarr (por exemplo: custom).<br>
+InfDirAlt=Dende a versión 3, é posible definir un directorio raíz alternativo. Isto permítelle almacenar, nun directorio adicado, plug-ins e padróns persoalizados.<br>Só en que crear un directorio na raíz de Dolibarr (por exemplo: custom).<br>
 InfDirExample=<br>Despois indíqueo 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 liñas atópanse comentadas con "#", para habilitalas, chega con descomentar eliminando o carácter "#".
 YouCanSubmitFile=Alternativamente, pode subir o módulo .zip comprimido:
 CurrentVersion=Versión actual de Dolibarr
@@ -379,11 +379,11 @@ MinLength=Lonxitude mínima
 LanguageFilesCachedIntoShmopSharedMemory=ficheiros .lang en memoria compartida
 LanguageFile=Ficheiro de idioma
 ExamplesWithCurrentSetup=Exemplos coa configuración actual
-ListOfDirectories=Listaxe de directorios de prantillas OpenDocument
-ListOfDirectoriesForModelGenODT=Listaxe de directorios que conteñen as prantillas de ficheiros co formato OpenDocument.<br><br> Poña aquí a ruta completa de directorios.<br>Engada un retorno de carro entre cada directorio<br> Para engadir un directorio de módulo GED, engada aquí <b>DOL_DATA_ROOT/ecm/seunomededirectorio.</b><br><br>Os ficheiros deses directorios deben terminar co <b>.odt</b> o <b>.ods</b>.
-NumberOfModelFilesFound=Número de ficheiros de prantillas ODT/ODS atopados nestes directorios
+ListOfDirectories=Listaxe de directorios de padróns OpenDocument
+ListOfDirectoriesForModelGenODT=Listaxe de directorios que conteñen os padróns de ficheiros co formato OpenDocument.<br><br> Poña aquí a ruta completa de directorios.<br>Engada un retorno de carro entre cada directorio<br> Para engadir un directorio de módulo GED, engada aquí <b>DOL_DATA_ROOT/ecm/seunomededirectorio.</b><br><br>Os ficheiros deses directorios deben terminar co <b>.odt</b> o <b>.ods</b>.
+NumberOfModelFilesFound=Número de ficheiros de padróns ODT/ODS atopados nestes directorios
 ExampleOfDirectoriesForModelGen=Exemplos de sintaxe:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
-FollowingSubstitutionKeysCanBeUsed=<br>Colocando as seguintes etiquetas na prantilla, obterá uhna substitución co valor persoalizado ao xerar o documento:
+FollowingSubstitutionKeysCanBeUsed=<br>Colocando as seguintes etiquetas no padrón, obterá uhna substitución co valor persoalizado ao xerar o documento:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Orde visualización nome/apelidos
 DescWeather=Os seguintes gráficos serán amosados no panel se o número de elementos chega a estes valores:
@@ -399,6 +399,7 @@ SecurityToken=Chave para cifrar urls
 NoSmsEngine=Non hai dispoñible ningún xestor de envío de SMS. Os xestores de envío de SMS no son instalados por defecto xa que dependen de cada provedor, porén pode atopalos na plataforma %s
 PDF=PDF
 PDFDesc=Opcións globais para xerar os PDF
+PDFOtherDesc=Opción PDF específica para algúns módulos
 PDFAddressForging=Regras de visualización de enderezos
 HideAnyVATInformationOnPDF=Ocultar toda a información relacionada co IVE ao xerar os PDF
 PDFRulesForSalesTax=Regras de IVE
@@ -480,7 +481,7 @@ NoDetails=Non hai mais detalles no rodapé de páxina
 DisplayCompanyInfo=Amosar enderezo da empresa
 DisplayCompanyManagers=Amosar nomes dos xestores
 DisplayCompanyInfoAndManagers=Amosar enderezo da empresa e nomes dos xestores
-EnableAndSetupModuleCron=Se desexa que ista factura recorrente sexa xerada automáticamente, o módulo *%s* debe estar activado e configurado correctamente. De xeito contrario, o xerar facturas ten que facerse manualmente desde esta prantilla co botón  *Crear*. Teña conta que incluso se habilita xerar automáticamente, aínda pode lanzar a xeneración manual. Non é posible xerar duplicados para o mesmo período.
+EnableAndSetupModuleCron=Se desexa que ista factura recorrente sexa xerada automáticamente, o módulo *%s* debe estar activado e configurado correctamente. De xeito contrario, o xerar facturas ten que facerse manualmente desde este padrón co botón  *Crear*. Teña conta que incluso se habilita xerar automáticamente, aínda pode lanzar a xeneración manual. Non é posible xerar duplicados para o mesmo período.
 ModuleCompanyCodeCustomerAquarium=%s seguido por un código de cliente para código de contabilidade de cliente
 ModuleCompanyCodeSupplierAquarium=%s seguido por un código de provedor  para código de contabilidade de provedor
 ModuleCompanyCodePanicum=Volta un código contable baleiro.
@@ -509,7 +510,7 @@ EnableOverwriteTranslation=Activar o uso de traducións sobreescritas
 GoIntoTranslationMenuToChangeThis=Atopouse unha tradución para a clave con este código. Para cambiar este valor, debe editalo desde Inicio-Configuración-Tradución.
 WarningSettingSortOrder=Aviso, establecer unha orde de clasificación predeterminada pode producir un erro técnico ao entrar na páxina da listaxe se o campo é un campo descoñecido. Se experimentas tal erro, volte a esta páxina para eliminar a orde de clasificación predeterminada e restaurar o comportamento predeterminado.Field=Campo
 Field=Campo
-ProductDocumentTemplates=Prantillas de documentos para xerar documento de produto
+ProductDocumentTemplates=Padróns de documentos para xerar documento de produto
 FreeLegalTextOnExpenseReports=Texto libre legal nos informes de gastos
 WatermarkOnDraftExpenseReports=Marca de auga nos informes de gastos
 AttachMainDocByDefault=Establezca isto en 1 se desexa axuntar o documento principal ao e-mail de forma predeterminada (se corresponde)
@@ -558,10 +559,10 @@ Module52Name=Stocks
 Module52Desc=Xestión de stock
 Module53Name=Servizos
 Module53Desc=Xestión de servizos
-Module54Name=Contratos/Suscricións
+Module54Name=Contratos/Subscricións
 Module54Desc=Xestión de contratos (servizos ou suscripcións recurrentes)
 Module55Name=Códigos de barras
-Module55Desc=Xestión dos códigos de barras
+Module55Desc=Xestión de códigos de barras ou de código QR 
 Module56Name=Pagamento por transferencia bancaria
 Module56Desc=Xestión do pagamento de provedores mediante pedimentos de transferencia. Inclúe a xeración de ficheiros SEPA para países europeos.
 Module57Name=Domiciliacións bancarias
@@ -762,7 +763,7 @@ Permission151=Consultar domiciliacións
 Permission152=Crear/modificar domiciliacións
 Permission153=Enviar/Trasmitir domiciliacións
 Permission154=Rexistrar Abonos/Devolucións de domiciliacións
-Permission161=Consultar contratos/suscricións
+Permission161=Consultar contratos/subscricións
 Permission162=Crear/modificar contratos/suscripcións
 Permission163=Activar un servizo/suscripción dun contrato
 Permission164=Desactivar un servizo/suscripcion dun contrato
@@ -830,7 +831,7 @@ Permission300=Consultar códigos de barras
 Permission301=Crear/modificar códigos de barras
 Permission302=Eliminar código de barras
 Permission311=Consultar servizos
-Permission312=Asignar servizos/suscricións a un contrato
+Permission312=Asignar servizos/subscricións a un contrato
 Permission331=Consultar marcadores
 Permission332=Crear/modificar marcadores
 Permission333=Eliminar marcadores
@@ -848,10 +849,10 @@ Permission402=Crear/modificar haberes
 Permission403=Validar haberes
 Permission404=Eliminar haberes
 Permission430=Usa barra de debug
-Permission511=Consultar pagamentos de salarios (teus e dos subordinados)
-Permission512=Crear/modificar pagamentos de salarios
-Permission514=Eliminar pagamentos de salarios
-Permission517=Ler pagos de salarios de todos
+Permission511=Ler salarios e pagos (os seus e subordinados) 
+Permission512=Crear / modificar salarios e pagos 
+Permission514=Eliminar salarios e pagos 
+Permission517=Ler todos os salarios e pagos 
 Permission519=Exportar salarios
 Permission520=Consultar Créditos
 Permission522=Crear/modificar Créditos
@@ -965,6 +966,8 @@ Permission23003=Borrar. Traballo Programado
 Permission23004=Executar. Traballo programado
 Permission50101=Usar TPV
 Permission50151=Usar TPV (TakeTPV)
+Permission50152=Editar liñas de venda 
+Permission50153=Editar liñas de venda ordenadas
 Permission50201=Consultar as transaccións
 Permission50202=Importar as transaccións
 Permission50330=Ler obxectos de Zapier
@@ -1033,17 +1036,18 @@ DictionarySource=Oríxes de orzamentos/pedimentos
 DictionaryAccountancyCategory=Grupos persoalizados para informes
 DictionaryAccountancysystem=Modelos de pláns contables
 DictionaryAccountancyJournal=Diarios contables
-DictionaryEMailTemplates=Prantillas E-Mails
+DictionaryEMailTemplates=Padróns E-Mails
 DictionaryUnits=Unidades
 DictionaryMeasuringUnits=Unidades de Medida
 DictionarySocialNetworks=Redes sociais
 DictionaryProspectStatus=Estado cliente potencial
 DictionaryProspectContactStatus=Estado da prospección dos contactos
-DictionaryHolidayTypes=Tipos de vacacións
+DictionaryHolidayTypes=Vacacións - Tipos de permisos
 DictionaryOpportunityStatus=Estado de oportunidade para o proxecto/oportunidade
 DictionaryExpenseTaxCat=Informe de gastos - Categorías de transporte
 DictionaryExpenseTaxRange=Informe de gastos - Rango por categoría de transporte
 DictionaryTransportMode=Informe intracom - Modo de transporte
+DictionaryBatchStatus=Lote de produto/serie estado do Control de Calidade
 TypeOfUnit=Tipo de unidade
 SetupSaved=Configuración gardada
 SetupNotSaved=Configuración non gardada
@@ -1187,7 +1191,7 @@ SetupDescription4=<a href="%s">%s -> %s</a> <br><br> Este software é unha colec
 SetupDescription5=Outras entradas do menú de configuración xestionan parámetros opcionais.
 AuditedSecurityEvents=Eventos de seguridade auditados
 NoSecurityEventsAreAduited=Non se auditan eventos de seguridade. Pode activalos no menu %s
-Audit=Auditoría
+Audit=Eventos de seguridade
 InfoDolibarr=Sobre Dolibarr
 InfoBrowser=Sobre o Navegador
 InfoOS=Sobre o SO
@@ -1231,7 +1235,7 @@ MAIN_MAX_DECIMALS_SHOWN=Decimais máximos nos prezos <b>amosados na pantalla</b>
 MAIN_ROUNDING_RULE_TOT=Salto do intervalo de redondeo (para os países onde o redondeo se fai noutra cousa que non sexa a base 10. Por exemplo, pon 0,05 se o redondeo se fai 0,05 pasos)
 UnitPriceOfProduct=Prezo unitario sen IVE dun produto
 TotalPriceAfterRounding=Prezo total (sen IVE/ incluído taxas) despois do redondeo
-ParameterActiveForNextInputOnly=Parámetro efectivo só a partires das próximas sesións
+ParameterActiveForNextInputOnly=Parámetro efectivo só a partir das próximas sesións
 NoEventOrNoAuditSetup=Non foron rexistrados eventos de seguridade aínda. Isto pode ser normal se a auditoría non foi habilitada na páxina "Configuración->Seguridade->Auditoría".
 NoEventFoundWithCriteria=Non atopáronse eventos de seguridade para tales criterios de búsca.
 SeeLocalSendMailSetup=Ver a configuración local de sendmail
@@ -1276,7 +1280,7 @@ MAIN_PROXY_PASS=Contrasinal do servidor proxy
 DefineHereComplementaryAttributes=Defina os atributos adicionais / personalizacións que se deben engadir a: %s
 ExtraFields=Campos adicionais
 ExtraFieldsLines=Campos adicionais (liñas)
-ExtraFieldsLinesRec=Campos adicionais (prantillas de liñas de facturas)
+ExtraFieldsLinesRec=Campos adicionais (padróns de liñas de facturas)
 ExtraFieldsSupplierOrdersLines=Campos adicionais (liñas de pedimento)
 ExtraFieldsSupplierInvoicesLines=Campos adicionais (liñas de factura)
 ExtraFieldsThirdParties=Campos adicionais (terceiros)
@@ -1284,7 +1288,7 @@ ExtraFieldsContacts=Campos adicionais (contactos/enderezos)
 ExtraFieldsMember=Campos adicionais (miembros)
 ExtraFieldsMemberType=Campos adicionais  (tipos de miembros)
 ExtraFieldsCustomerInvoices=Campos adicionais (facturas a clientes)
-ExtraFieldsCustomerInvoicesRec=Campos adicionais (prantillas de facturas)
+ExtraFieldsCustomerInvoicesRec=Campos adicionais (padróns de facturas)
 ExtraFieldsSupplierOrders=Campos adicionais (pedimentos a provedores)
 ExtraFieldsSupplierInvoices=Campos adicionais (facturas)
 ExtraFieldsProject=Campos adicionais (proxectos)
@@ -1319,9 +1323,12 @@ ConditionIsCurrently=Actualmente a condición é %s
 YouUseBestDriver=Está usando o driver %s, actualmente é o mellor driver dispoñible.
 YouDoNotUseBestDriver=Usa o driver %s aínda que é recomendable usar o driver %s.
 NbOfObjectIsLowerThanNoPb=So ten %s %s na base de datos. Isto non require ningunha optimización particular
+ComboListOptim=Optimización da carga da lista combinada
 SearchOptim=Buscar optimización
-YouHaveXObjectUseSearchOptim=Ten %s %s na base de datos. Pode engadir a constante %s a 1 en Configuración de Inicio-Configuración-Outro. Limita a busca ao comezo das cadeas o que fai posible que a base de datos use índices e debería obter unha resposta inmediata.
-YouHaveXObjectAndSearchOptimOn=Ten %s %s na base de datos e a constante %s está configurada en 1 in Inicio-Configuración-Outra Configuración.
+YouHaveXObjectUseComboOptim=Ten %s %s na base de datos. Pode entrar na configuración do múdulo para activar a carga da lista combinada ao premer na tecla do evento.
+YouHaveXObjectUseSearchOptim=Ten %s %s na base de datos. Pode engadir a constante %s a 1 en Inicio-Configuración-Outra Configuración.
+YouHaveXObjectUseSearchOptimDesc=Isto limita a busca ao comezo das cadeas o que fai posible que a base de datos use índices e debería obter unha resposta inmediata. 
+YouHaveXObjectAndSearchOptimOn=Ten %s %s na base de datos e a constante %s está configurada a %s en Inicio-Configuración-Outra Configuración.
 BrowserIsOK=Usa o navegador web %s. Este navegador está optimizado para a seguridade e o rendemento.
 BrowserIsKO=Usa o navegador web %s.  Este navegador é unha mala escolla para a seguridade, rendemento e fiabilidade. Aconsellamos utilizar Firefox, Chrome, Opera ou Safari.
 PHPModuleLoaded=%s de compoñente PHP está cargado
@@ -1359,7 +1366,7 @@ NotificationsDesc=As notificacións por e-mail permitenlle enviar silenciosament
 NotificationsDescUser=* por usuarios, un usuario á vez.
 NotificationsDescContact=* por contactos de terceiros (clientes ou provedores), un contacto á vez.
 NotificationsDescGlobal=* ou configurando destinatarios globlalmente na configuración do módulo.
-ModelModules=Prantillas de documentos
+ModelModules=Padróns de documentos
 DocumentModelOdt=Xeración dos documentos OpenDocument (Ficheiro .ODT / .ODS de LibreOffice, OpenOffice, KOffice, TextEdit...)
 WatermarkOnDraft=Marca de auga nos documentos borrador
 JSOnPaimentBill=Activar función para autocompletar as liñas de pagamento na entrada de pagamentos
@@ -1428,11 +1435,12 @@ TemplatePDFContracts=Modelos de documento de contratos
 FreeLegalTextOnContracts=Texto libre en contratos
 WatermarkOnDraftContractCards=Marca de auga en contratos (o caso de estar baleiro)
 ##### Members #####
-MembersSetup=Configuración do módulo Asociacóns
+MembersSetup=Configuración do módulo Asociacións
 MemberMainOptions=Opcións principais
 AdherentLoginRequired= Xestionar un login para cada membro
 AdherentMailRequired=E-Mail obrigatorio para crear un membro novo
 MemberSendInformationByMailByDefault=Caixa de verificación para enviar o correo de confirmación (validación ou nova cotización) aos membros é por defecto "sí"
+MemberCreateAnExternalUserForSubscriptionValidated=Crea un inicio de sesión de usuario externo para cada nova subscrición de membro validada 
 VisitorCanChooseItsPaymentMode=O visitante pode escoller entre os modos de pagamento dispoñibles
 MEMBER_REMINDER_EMAIL=Habilitar recordatorio de eventos <b>por e-mail</b> de suscripcións expiradas. Nota: O módulo <strong>%s</strong> debe estar habilitado e configurado correctamente para que o recordatorio sexa enviado.
 MembersDocModules=Modelos de documentos para documentos xerados a partir do rexistro de membros
@@ -1763,7 +1771,7 @@ AGENDA_DEFAULT_VIEW=Cal vista desexa abrir de xeito predeterminado ao selecciona
 AGENDA_REMINDER_BROWSER=Activar a lembranza de eventos <b> no navegador do usuario </b> (Cando se alcanza a data de lembranza, o navegador amosa unha ventá emerxente. Cada usuario pode desactivar estas notificacións desde a configuración de notificacións do navegador).
 AGENDA_REMINDER_BROWSER_SOUND=Activar a notificación de son
 AGENDA_REMINDER_EMAIL=Activar a lembranza de eventos <b> por correo electrónico </b> (a opción de lembranza/atraso pódese definir en cada evento).
-AGENDA_REMINDER_EMAIL_NOTE=Nota: A frecuencia da tarefa %s debe ser suficiente para asegurarse de que as lembranzas se envían no momento correcto.
+AGENDA_REMINDER_EMAIL_NOTE=Nota: A frecuencia do traballo programado %s debe ser suficiente para asegurarse de que as lembranzas se envían no momento correcto. 
 AGENDA_SHOW_LINKED_OBJECT=Amosar o obxecto ligado á vista de axenda
 ##### Clicktodial #####
 ClickToDialSetup=Prema para marcar a configuración do módulo
@@ -1905,8 +1913,8 @@ RecuperableOnly=Sí para o IVE "Non percibido pero recuperable" dedicado a algú
 UrlTrackingDesc=Se o provedor ou servizo de transporte ofrece unha páxina ou sitio web para comprobar o estado dos seus envíos, pode introducilo aquí. Podes usar a clave {TRACKID} nos parámetros de URL para que o sistema a substitúa polo número de seguimento que o usuario introduciu na tarxeta de envío.
 OpportunityPercent=Cando cree un cliente potencial, definirá unha cantidade estimada de proxecto/cliente potencial. Segundo o estado do cliente potencial, este importe pode multiplicarse por esta taxa para avaliar unha cantidade total que todos os clientes potenciais poden xerar. O valor é unha porcentaxe (entre 0 e 100).
 TemplateForElement=Este rexistro de modelo está adicado a cal elemento
-TypeOfTemplate=Tipo de prantilla
-TemplateIsVisibleByOwnerOnly=A prantilla é visible só polo propietario
+TypeOfTemplate=Tipo de padrón
+TemplateIsVisibleByOwnerOnly=O padrón é visible só polo propietario
 VisibleEverywhere=Visible en todas partes
 VisibleNowhere=Non visible
 FixTZ=Corrección de zona horaria
@@ -1979,6 +1987,8 @@ MAIN_PDF_MARGIN_RIGHT=Marxe dereito en PDF
 MAIN_PDF_MARGIN_TOP=Marxe superior en PDF
 MAIN_PDF_MARGIN_BOTTOM=Marxe inferior en PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Altura para logotipo en PDF
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Agregar imaxe na liña do orzamento
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Axuntar sinatura electrónica no PDF
 NothingToSetup=Non é precisa ningunha configuración específica para este módulo.
 SetToYesIfGroupIsComputationOfOtherGroups=Configure isto en sí, se este grupo é un cálculo doutros grupos
 EnterCalculationRuleIfPreviousFieldIsYes=Introduza a regra de cálculo se o campo anterior estivo establecido en Si. <br>Por exemplo:<br> CODEGRP1+CODEGRP2
@@ -2096,7 +2106,6 @@ PDF_SHOW_PROJECT=Amosar proxecto no documento
 ShowProjectLabel=Etiqueta do proxecto
 PDF_USE_ALSO_LANGUAGE_CODE=Se desexa ter algúns textos no seu PDF duplicados en 2 idiomas diferentes no mesmo PDF xerado, debe configurar aquí este segundo idioma para que o PDF xerado conteña 2 idiomas diferentes na mesma páxina, o elixido ao xerar PDF e este (só algúns modelos PDF soportan isto). Mantéñase baleiro por un idioma por PDF.
 FafaIconSocialNetworksDesc=Introduza aquí o código dunha icona FontAwesome. Se non sabe o que é FontAwesome, pode usar o valor xenérico fa-address-book.
-FeatureNotAvailableWithReceptionModule=Función non dispoñible cando a recepción do módulo está activada
 RssNote=Nota: Cada definición de fonte RSS proporciona un widget que debes habilitar para que estexa dispoñible no panel
 JumpToBoxes=Ir a Configuración -> Widgets
 MeasuringUnitTypeDesc=Use aquí un valor como "tamaño", "superficie", "volume", "peso", "hora"
@@ -2120,12 +2129,18 @@ ConfFileIsReadableOrWritableByAnyUsers=Calquera usuario pode ler ou escribir o f
 MailToSendEventOrganization=Organización de eventos
 AGENDA_EVENT_DEFAULT_STATUS=Estado predeterminado do evento ao crear un evento desde o formulario
 YouShouldDisablePHPFunctions=Debería desactivar as funcións PHP
-IfCLINotRequiredYouShouldDisablePHPFunctions=Agás se precisa executar comandos do sistema (para o módulo Traballo programado, ou executar o antivirus na liña de comandos externa por exemplo), debería ddescativar as funcións PHP
+IfCLINotRequiredYouShouldDisablePHPFunctions=Agás se precisa executar comandos do sistema nun código personalizado, debería desactivar as funcións PHP 
+PHPFunctionsRequiredForCLI=Para o obxectico do shell (como a copia de seguridade programada do traballo ou a execución dun programa anitivurs), debe manter as funcións PHP 
 NoWritableFilesFoundIntoRootDir=Non se atoparon ficheiros ou directorios con permisos de escritura dos programas comúns no directorio raíz (Bo)
 RecommendedValueIs=Recomendado %s
+NotRecommended=Non recomendado
 ARestrictedPath=Un path restrinxido
 CheckForModuleUpdate=Comprobar actualizacións para os módulos externos
 CheckForModuleUpdateHelp=Esta acción conectara cos editores de módulos externos para comprobar se hai unha nova versión dispoñible. 
 ModuleUpdateAvailable=Unha actualización está dispoñible
 NoExternalModuleWithUpdate=Non foron atopadas actualizacións para módulos externos
 SwaggerDescriptionFile=Ficheiro de descrición da API Swagger (para uso con redoc por exemplo)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=Activada a API WS obsoleta. No seu lugar debería usar a API REST. 
+RandomlySelectedIfSeveral=Selección aleatoria se hai varias imaxes dispoñibles
+DatabasePasswordObfuscated=O contrasinal da base de datos está oculto no ficheiro conf
+DatabasePasswordNotObfuscated=O contrasinal da base de datos NON está oculto no ficheiro conf 
diff --git a/htdocs/langs/gl_ES/agenda.lang b/htdocs/langs/gl_ES/agenda.lang
index 95a0a0be7dc..9d2eb4d315e 100644
--- a/htdocs/langs/gl_ES/agenda.lang
+++ b/htdocs/langs/gl_ES/agenda.lang
@@ -38,6 +38,7 @@ ActionsEvents=Eventos para que Dolibarr cre unha acción na axenda automáticame
 EventRemindersByEmailNotEnabled=Lembranzas de eventos por correo non foron activados na configuración do módulo %s.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Terceiro %s creado
+COMPANY_MODIFYInDolibarr=Terceiro %s modificado
 COMPANY_DELETEInDolibarr=Terceiro %s eliminado
 ContractValidatedInDolibarr=Contrato %s validado
 CONTRACT_DELETEInDolibarr=Contrato %s eliminado
@@ -55,9 +56,9 @@ MemberValidatedInDolibarr=Membro %s validado
 MemberModifiedInDolibarr=Membro %s modificado
 MemberResiliatedInDolibarr=Membro %s rematado
 MemberDeletedInDolibarr=Membro %s eliminado
-MemberSubscriptionAddedInDolibarr=Suscrición %s do membro %s engadida
-MemberSubscriptionModifiedInDolibarr=Suscrición %s do membro %s modificada
-MemberSubscriptionDeletedInDolibarr=Suscrición %s do membro %s eliminada
+MemberSubscriptionAddedInDolibarr=Subscrición %s do membro %s engadida
+MemberSubscriptionModifiedInDolibarr=Subscrición %s do membro %s modificada
+MemberSubscriptionDeletedInDolibarr=Subscrición %s do membro %s eliminada
 ShipmentValidatedInDolibarr=Expedición %s validada
 ShipmentClassifyClosedInDolibarr=Expedición %s clasificada como pagada
 ShipmentUnClassifyCloseddInDolibarr=Expedición %s clasificada como aberta de novo
@@ -87,6 +88,7 @@ OrderDeleted=Pedimento eliminado
 InvoiceDeleted=Factura eliminada
 DraftInvoiceDeleted=Borrador de factura eliminado
 CONTACT_CREATEInDolibarr=Creouse o contacto %s
+CONTACT_MODIFYInDolibarr=Contacto %s modificado
 CONTACT_DELETEInDolibarr=Contacto %s eliminado
 PRODUCT_CREATEInDolibarr=Produto %s creado
 PRODUCT_MODIFYInDolibarr=Produto %s modificado
@@ -121,7 +123,7 @@ MRP_MO_DELETEInDolibarr=OF eliminada
 MRP_MO_CANCELInDolibarr=OF cancelada
 PAIDInDolibarr=%s xa pago
 ##### End agenda events #####
-AgendaModelModule=Prantillas de documentos para eventos
+AgendaModelModule=Padróns de documentos para eventos
 DateActionStart=Data de inicio
 DateActionEnd=Data finalización
 AgendaUrlOptions1=Pode tamén engadir os seguintes parámetros ao filtro de saida:
@@ -167,4 +169,4 @@ TimeType=Tipo de duración
 ReminderType=Tipo de devolución da chamada
 AddReminder=Crear unha notificación de lembranza automática para este evento
 ErrorReminderActionCommCreation=Erro ao crear a notificación de lembranza para este evento
-BrowserPush=Notiticaciñon emerxente no navegador
+BrowserPush=Notificación emerxente no navegador
diff --git a/htdocs/langs/gl_ES/banks.lang b/htdocs/langs/gl_ES/banks.lang
index bd694fdd8a6..f4dfdd68a3b 100644
--- a/htdocs/langs/gl_ES/banks.lang
+++ b/htdocs/langs/gl_ES/banks.lang
@@ -159,8 +159,8 @@ RejectCheckDate=Data de rexeitamento do talón
 CheckRejected=Cheque rexeitado
 CheckRejectedAndInvoicesReopened=Cheque de volta e facturas abertas de novo
 BankAccountModelModule=Modelos de documentos para contas bancarias
-DocumentModelSepaMandate=Prantilla de orde SEPA. Útil só para países membros da UE.
-DocumentModelBan=Prantilla para imprimir unha páxina coa información IBAN.
+DocumentModelSepaMandate=Padrón de orde SEPA. Útil só para países membros da UE.
+DocumentModelBan=Padrón para imprimir unha páxina coa información IBAN.
 NewVariousPayment=Novo pagamento varios
 VariousPayment=Pagamento varios
 VariousPayments=Pagamentos varios
diff --git a/htdocs/langs/gl_ES/bills.lang b/htdocs/langs/gl_ES/bills.lang
index 70df765f795..3df0d7bdedf 100644
--- a/htdocs/langs/gl_ES/bills.lang
+++ b/htdocs/langs/gl_ES/bills.lang
@@ -166,13 +166,13 @@ FoundXQualifiedRecurringInvoiceTemplate=Atopáronse %s factura(s) de modelo reco
 NotARecurringInvoiceTemplate=Non é unha factura de modelo recorrente
 NewBill=Nova factura
 LastBills=Últimas %s facturas
-LatestTemplateInvoices=As últimas %s prantillas de  facturas
-LatestCustomerTemplateInvoices=As últimas %s prantillas de facturas a cliente
-LatestSupplierTemplateInvoices=As últimas %s prantillas de facturas de provedor
+LatestTemplateInvoices=Os últimos %s padróns de  facturas
+LatestCustomerTemplateInvoices=Os últimss %s padróns de facturas a cliente
+LatestSupplierTemplateInvoices=Os últimos %s  padróns de facturas de provedor
 LastCustomersBills=Últimas %s facturas a clientes
 LastSuppliersBills=Últimas %s facturas de provedores
 AllBills=Todas as facturas
-AllCustomerTemplateInvoices=Todas as prantillas de facturas
+AllCustomerTemplateInvoices=Todos os padróns de facturas
 OtherBills=Outras facturas
 DraftBills=Facturas borrador
 CustomersDraftInvoices=Facturas a cliente borrador
@@ -259,6 +259,7 @@ DateMaxPayment=Data límite de pagamento
 DateInvoice=Data facturación
 DatePointOfTax=Impostos
 NoInvoice=Ninguna factura
+NoOpenInvoice=Non hai factura aberta 
 ClassifyBill=Clasificar a factura
 SupplierBillsToPay=Facturas de provedor pendentes de pagamento
 CustomerBillsUnpaid=Facturas a cliente pendentes de cobro
@@ -268,13 +269,13 @@ SetMode=Definir modo de pagamento
 SetRevenuStamp=Establecer selo fiscal
 Billed=Facturado
 RecurringInvoices=Facturas recurrentes
-RepeatableInvoice=Prantilla de factura
-RepeatableInvoices=Prantilla de facturas
-Repeatable=Prantilla
-Repeatables=Prantillas
-ChangeIntoRepeatableInvoice=Convertir en prantilla
-CreateRepeatableInvoice=Crear prantilla de factura
-CreateFromRepeatableInvoice=Crear desde prantilla de factura
+RepeatableInvoice=Padrón de factura
+RepeatableInvoices=Padrón de facturas
+Repeatable=Padrón
+Repeatables=Padróns
+ChangeIntoRepeatableInvoice=Convertir en padrón
+CreateRepeatableInvoice=Crear padrón de factura
+CreateFromRepeatableInvoice=Crear desde padrón de factura
 CustomersInvoicesAndInvoiceLines=Facturas a clientes e líñas de facturas
 CustomersInvoicesAndPayments=Facturas a clientes e pagamentos
 ExportDataset_invoice_1=Facturas a clientes e liñas de facturas
@@ -380,10 +381,10 @@ NbOfGenerationOfRecordDone=Número de xeración de rexistros xa realizadas
 NbOfGenerationDoneShort=Número de xeracións feitas
 MaxGenerationReached=Máximo número de xeracións alcanzado
 InvoiceAutoValidate=Validar facturas automáticamente
-GeneratedFromRecurringInvoice=Xerado dende a prantilla de facturas recorrentes %s
+GeneratedFromRecurringInvoice=Xerado dende a padrón de facturas recorrentes %s
 DateIsNotEnough=Ainda non foi alcanzada a data
-InvoiceGeneratedFromTemplate=Factura %s xerada dende a prantilla de factura recorrente %s
-GeneratedFromTemplate=Xerado dende a prantilla de facturas concorrentes %s
+InvoiceGeneratedFromTemplate=Factura %s xerada dende a padrón de factura recorrente %s
+GeneratedFromTemplate=Xerado dende a padrón de facturas concorrentes %s
 WarningInvoiceDateInFuture=Atención: a data da factura é maior que a data actual
 WarningInvoiceDateTooFarInFuture=Atención: a data da factura é moi lonxana á data actual
 ViewAvailableGlobalDiscounts=Ver os descontos dispoñibles
@@ -589,3 +590,4 @@ FacParentLine=Liña principal de factura
 SituationTotalRayToRest=Lembranza de pagar sen impostos
 PDFSituationTitle=Situación n° %d
 SituationTotalProgress=Progreso total %d %%
+SearchUnpaidInvoicesWithDueDate=Procurar facturas pendentes de pagamento cunha data de vencemento= %s
diff --git a/htdocs/langs/gl_ES/cashdesk.lang b/htdocs/langs/gl_ES/cashdesk.lang
index 22fe23ddffa..d752f71f1e6 100644
--- a/htdocs/langs/gl_ES/cashdesk.lang
+++ b/htdocs/langs/gl_ES/cashdesk.lang
@@ -102,7 +102,7 @@ CashDeskGenericMaskCodes6 = A etiqueta <br><b>(TN)</b> é usada para engadir o n
 TakeposGroupSameProduct=Agrupa as mesmas liñas de produtos
 StartAParallelSale=Comeza unha nova venda en paralelo
 SaleStartedAt=A venda comezou en %s
-ControlCashOpening=Aviso emerxente do efectivo ao abris o TPV
+ControlCashOpening=Abre a ventá emerxente "Control de efectivo" ao abrir o TPV
 CloseCashFence=Controlar peche de caixa
 CashReport=Informe de caixa
 MainPrinterToUse=Impresora principal a usar
@@ -126,5 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=A impresora de recibos do módulo debe estar h
 AllowDelayedPayment=Permitir o pago en débeda
 PrintPaymentMethodOnReceipts=Imprimir método de pago en tickets/recibos
 WeighingScale=Pesaxe
-ShowPriceHT = Amosar o prezo sen a columna de impostos
-ShowPriceHTOnReceipt = Amosar o prezo sen a columna de impostos no recibo
+ShowPriceHT = Amosar a columna co prezo sen impostos (na pantalla)
+ShowPriceHTOnReceipt = Amosar a columna co prezo sen impostos (no recibo)
diff --git a/htdocs/langs/gl_ES/compta.lang b/htdocs/langs/gl_ES/compta.lang
index bd368ec635d..23c05b994a3 100644
--- a/htdocs/langs/gl_ES/compta.lang
+++ b/htdocs/langs/gl_ES/compta.lang
@@ -286,3 +286,9 @@ ReportPurchaseTurnover=Volume compras facturadas
 ReportPurchaseTurnoverCollected=Volume de compras abonadas
 IncludeVarpaysInResults = Inclúe varios pagos en informes
 IncludeLoansInResults = Inclúe prestamos en informes
+InvoiceLate30Days = Facturas atrasadas > 30 días
+InvoiceLate15Days = Facturas atrasadas < 15 días
+InvoiceLateMinus15Days = Facturas atrasadas
+InvoiceNotLate = A recoller < 15 días
+InvoiceNotLate15Days = A recoller en 15 días
+InvoiceNotLate30Days = A recoller en 30 días
diff --git a/htdocs/langs/gl_ES/cron.lang b/htdocs/langs/gl_ES/cron.lang
index b7dafdc697f..25dd993b71c 100644
--- a/htdocs/langs/gl_ES/cron.lang
+++ b/htdocs/langs/gl_ES/cron.lang
@@ -60,7 +60,7 @@ CronErrEndDateStartDt=A data de finalización non pode ser anterior á data de i
 StatusAtInstall=Estado da instalación do módulo
 CronStatusActiveBtn=Horario 
 CronStatusInactiveBtn=Desactivar
-CronTaskInactive=A tarefa está desactivada
+CronTaskInactive=Este traballo está desactivado (non programado)
 CronId=Id 
 CronClassFile=Nome do ficheiro coa clase
 CronModuleHelp=Nome do directorio do módulo Dolibarr (tamén funciona con módulo Dolibarr externo). <BR> Por exemplo, para chamar ao método fetch do obxecto Dolibarr Product /htdocs/<u>product</u>/class/product.class.php, o valor do módulo é <br><i>product</i>
@@ -86,6 +86,6 @@ WarningCronDelayed=Atención, para fins de rendemento, calquera que sexa a próx
 DATAPOLICYJob=Limpar datos e anonimizar
 JobXMustBeEnabled=Tarefa %s debe ser activada
 # Cron Boxes
-LastExecutedScheduledJob=Última tarefa programad executada
+LastExecutedScheduledJob=Última tarefa programada executada
 NextScheduledJobExecute=Próxima tarefa programada para executar
 NumberScheduledJobError=Número de tarefas programadas por erro
diff --git a/htdocs/langs/gl_ES/errors.lang b/htdocs/langs/gl_ES/errors.lang
index 324b3a4bfb3..a3436542779 100644
--- a/htdocs/langs/gl_ES/errors.lang
+++ b/htdocs/langs/gl_ES/errors.lang
@@ -11,6 +11,7 @@ ErrorBadValueForParamNotAString=Valor incorrecto para o seu parámetro. Xeralmen
 ErrorRefAlreadyExists=A referencia <b>%s</b> xa existe
 ErrorLoginAlreadyExists=O login %s xa existe.
 ErrorGroupAlreadyExists=O grupo %s xa existe.
+ErrorEmailAlreadyExists=O correo electrónico %s xa existe
 ErrorRecordNotFound=Rexistro non atopado
 ErrorFailToCopyFile=Erro ao copiar o ficheiro '<b>%s</b>' en '<b>%s</b>'.
 ErrorFailToCopyDir=Erro ao copiar o directorio '<b>%s</b>' en '<b>%s</b>'.
@@ -117,7 +118,7 @@ ErrorCantReadFile=Erro de lectura do ficheiro '%s'
 ErrorCantReadDir=Error de lectura do directorio '%s'
 ErrorBadLoginPassword=Valor incorrecto para o inicio de sesión ou o contrasinals
 ErrorLoginDisabled=A súa conta foi descativada
-ErrorFailedToRunExternalCommand=Non se puido executar o comando externo. Comprobe que está dispoñible e executable polo seu servidor PHP. Se PHP <b> Modo seguro</b>1 está habilitado, comprobe que o comando está dentro dun directorio definido polo parámetro <b>safe_mode_exec_dir</b>.
+ErrorFailedToRunExternalCommand=Fallou ao executar o comando externo. Comprobe que está dispoñible e executable polo usuario do servidor PHP. Comprobe tamén que a orde non está protexida a nivel de shell por unha capa de seguridade como apparmor. 
 ErrorFailedToChangePassword=Erro ao cambiar o contrasinal
 ErrorLoginDoesNotExists=Non foi posible atopar o usuario con inicio de sesión <b>%s</b>.
 ErrorLoginHasNoEmail=Este usuario non ten enderezo de correo electrónico. Proceso abortado.
@@ -262,6 +263,7 @@ ErrorDateIsInFuture=Erro, a data non pode ser no futuro
 ErrorAnAmountWithoutTaxIsRequired=Erro, a cantidade é obrigatoria
 ErrorAPercentIsRequired=Erro, prégase cubra a porcentaxe correctamente
 ErrorYouMustFirstSetupYourChartOfAccount=Primeiro debe configurar o seu plan de contas
+ErrorFailedToFindEmailTemplate=Fallo ao atopar o modelo co nome de código %s 
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=O seu parámetro PHP upload_max_filesize (%s) é superior ao parámetro PHP post_max_size (%s). Esta non é unha configuración consistente.
@@ -298,3 +300,4 @@ WarningModuleXDisabledSoYouMayMissEventHere=Non foi activado o módulo %s . Pode
 ErrorActionCommPropertyUserowneridNotDefined=É preciso o supervisor do usuario
 ErrorActionCommBadType=O tipo de evento seleccionado (id: %n, código: %s) non existe no diccionario Tipo de Evento
 CheckVersionFail=Fallou a comprobación da versión
+ErrorWrongFileName=O nome do ficheiro non pode conte  __SOMETHING__ nel
diff --git a/htdocs/langs/gl_ES/eventorganization.lang b/htdocs/langs/gl_ES/eventorganization.lang
index 9e51029fd03..bd8526c2db6 100644
--- a/htdocs/langs/gl_ES/eventorganization.lang
+++ b/htdocs/langs/gl_ES/eventorganization.lang
@@ -1,4 +1,5 @@
 # Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+# Copyright (C) 2021		Dorian Vabre			<dorian.vabre@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
@@ -81,7 +82,10 @@ PriceOfBoothHelp=Prezo da subscrición para estar nun stand
 EventOrganizationICSLink=Ligazón ICS para eventos 
 ConferenceOrBoothInformation=Información sobre conferencia ou stand
 Attendees = Asistentes 
+DownloadICSLink = Descargar ligazón ICS
 EVENTORGANIZATION_SECUREKEY = Clave segura da ligazón de rexistro público a unha conferencia 
+SERVICE_BOOTH_LOCATION = Servizo empregado para a fila de facturas sobre a situación do stand
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Servizo usado para a fila de facturas sobre unha subscrición de asistente a unha conferencia 
 #
 # Status
 #
@@ -94,8 +98,46 @@ EvntOrgCancelled = Cancelado
 #
 # Public page
 #
+SuggestForm = Páxina de suxestións
+RegisterPage = Páxina para conferencias ou stand 
+EvntOrgRegistrationHelpMessage = Aquí pode votar por un evento ou suxerir unha nova conferencia ou stand para o proxecto 
+EvntOrgRegistrationConfHelpMessage = Aquí pode suxerir unha nova conferencia para o proxecto 
+EvntOrgRegistrationBoothHelpMessage = Aquí pode suxerir un novo stand para o proxecto 
+ListOfSuggestedConferences = Listaxe de conferencias suxeridas 
+ListOfSuggestedBooths = Listaxe de stands suxeridos
+SuggestConference = Suxerir unha nova conferencia 
+SuggestBooth = Suxerir un stand
+ViewAndVote = Ver e votar por eventos suxeridos 
 PublicAttendeeSubscriptionPage = Ligazón pública de rexistro a unha conferencia 
 MissingOrBadSecureKey = A clave de seguridade non é válida ou inexistente
-EvntOrgWelcomeMessage = Este formulario permítelle rexistrarse como novo participante na conferencia 
-EvntOrgStartDuration = Esta conferencia comeza en
-EvntOrgEndDuration =  e remata en
+EvntOrgWelcomeMessage = Este formulario permítelle rexistrarse como novo participante na conferencia: '%s' 
+EvntOrgDuration = Esta conferencia comeza en %s e remata en %s. 
+ConferenceAttendeeFee = Importe de asistente á conferencia para o evento:' %s ' acontece de %s a %s
+BoothLocationFee = Localización do stand para o evento: "%s" que acontece do %s ao %s
+EventType = Tipo de evento
+
+#
+# Vote page
+#
+EvntOrgRegistrationWelcomeMessage = Benvido á páxina de suxestións de conferencias ou stands. 
+EvntOrgRegistrationConfWelcomeMessage = Benvida á páxina de suxestións de conferencia
+EvntOrgRegistrationBoothWelcomeMessage = Benvida á páxina de suxestións de stands
+EvntOrgVoteHelpMessage = Aquí pode ver e votar os eventos suxeridos para o proxecto
+VoteOk = O seu voto foi aceptado
+AlreadyVoted = Xa votou para este evento
+VoteError = Produciuse un erro durante a votación, ténteo de novo. 
+
+#
+# SubscriptionOk page
+#
+SubscriptionOk = A súa subscrición a esta conferencia foi validada 
+#
+# Subscription validation mail
+#
+ConfAttendeeSubscriptionConfirmation = Confirmación da súa subscrición a unha conferencia 
+#
+# Payment page
+#
+Attendee = Asistente
+PaymentConferenceAttendee = Pagamento de asistente á conferencia
+PaymentBoothLocation = Pagamento da localización do stand
diff --git a/htdocs/langs/gl_ES/holiday.lang b/htdocs/langs/gl_ES/holiday.lang
index 60a0e5c8331..f82237a88fe 100644
--- a/htdocs/langs/gl_ES/holiday.lang
+++ b/htdocs/langs/gl_ES/holiday.lang
@@ -3,9 +3,9 @@ HRM=RRHH
 Holidays=Vacacións
 CPTitreMenu=Día libre
 MenuReportMonth=Estado mensual
-MenuAddCP=Nova petición de vacacións
+MenuAddCP=Novo pedimento de vacacións
 NotActiveModCP=Debe activar o módulo Días libres para ver esta páxina
-AddCP=Realizar unha petición de días libres
+AddCP=Realizar un pedimento de días libres
 DateDebCP=Data de inicio
 DateFinCP=Data de fin
 DraftCP=Borrador
@@ -13,7 +13,7 @@ ToReviewCP=Agardando aprobación
 ApprovedCP=Aprobada
 CancelCP=Anulada
 RefuseCP=Rexeitada
-ValidatorCP=Validador
+ValidatorCP=Responsable da aprobación
 ListeCP=Listaxe de días libres
 Leave=Pedimento de días libres
 LeaveId=ID Vacacións
@@ -24,26 +24,26 @@ UserForApprovalFirstname=Nome do usuario de aprobación
 UserForApprovalLastname=Apelido do usuario de aprobación
 UserForApprovalLogin=Inicio de sesión de usuario de aprobación
 DescCP=Descrición
-SendRequestCP=Crear a petición de días libres
-DelayToRequestCP=As peticións de días libres deben realizarse alo menos <b>%s días</b> antes.
+SendRequestCP=Crear o pedimento de días libres
+DelayToRequestCP=Os pedimentos de días libres deben realizarse alo menos <b>%s días</b> antes.
 MenuConfCP=Balance de días libres
 SoldeCPUser=O seu saldo é de <b>%s días</b>.
 ErrorEndDateCP=Debe indicar unha data de fin maior á data de inicio.
 ErrorSQLCreateCP=Aconteceu un erro de SQL durante a creación :
 ErrorIDFicheCP=Aconteceu un erro, esta solicitude non existe.
 ReturnCP=Voltar á páxina anterior
-ErrorUserViewCP=Non está autorizado a ler esta petición de días libres.
+ErrorUserViewCP=Non está autorizado a ler este pedimento de días libres.
 InfosWorkflowCP=Información do workflow
 RequestByCP=Pedido por
 TitreRequestCP=Pedimento de días libres
 TypeOfLeaveId=ID tipo de días libres
 TypeOfLeaveCode=Código tipo de días libres
 TypeOfLeaveLabel=Tipo de etiqueta de días libres
-NbUseDaysCP=Número de días de vacacións consumidas
-NbUseDaysCPHelp=O cálculo toma dentro da conta os días non laborais e as vacacións definidas no diccionario.
-NbUseDaysCPShort=Días consumidos
-NbUseDaysCPShortInMonth=Días consumidos en mes
-DayIsANonWorkingDay=%s é un día non laboral
+NbUseDaysCP=Número de días de vacacións utilizados 
+NbUseDaysCPHelp=O cálculo ten en conta os días non laborais e as vacacións definidas no dicionario. 
+NbUseDaysCPShort=Días de vacacións
+NbUseDaysCPShortInMonth=Días de vacacións no mes 
+DayIsANonWorkingDay=%s non é dia laboral
 DateStartInMonth=Data de inicio en mes
 DateEndInMonth=Data de fin en mes
 EditCP=Editar
@@ -51,24 +51,24 @@ DeleteCP=Eliminar
 ActionRefuseCP=Rexeitar
 ActionCancelCP=Cancelar
 StatutCP=Estado
-TitleDeleteCP=Eliminar a petición de días libres
-ConfirmDeleteCP=¿Está certo de querer eliminar esta petición de días libres?
-ErrorCantDeleteCP=Erro, non ten permisos para eliminar esta petición de días libres.
-CantCreateCP=Non ten permisos para realizar peticións de días libres.
-InvalidValidatorCP=Debe escoller un validador para a súa petición de días libres.
+TitleDeleteCP=Eliminar o pedimento de días libres
+ConfirmDeleteCP=¿Está certo de querer eliminar este pedimento de días libres?
+ErrorCantDeleteCP=Erro, non ten permisos para eliminar este pedimento de días libres.
+CantCreateCP=Non ten permisos para realizar pedimentos de días libres.
+InvalidValidatorCP=Debe escoller o/a responsable da aprobaciónr para a súa solicitude de vacacións. 
 NoDateDebut=Debe indicar unha data de inicio.
 NoDateFin=Debe indicar unha data de fin.
-ErrorDureeCP=A súa petición de días libres non contén ningún día hábil.
-TitleValidCP=Aprobar a petición de días libres
-ConfirmValidCP=¿Está certo de querer validar esta petición de días libres?
+ErrorDureeCP=O seu pedimento de días libres non contén ningún día hábil.
+TitleValidCP=Aprobar o pedimento de días libres
+ConfirmValidCP=¿Está certo de querer validar este pedimento de días libres?
 DateValidCP=Data de aprobación
-TitleToValidCP=Enviar a petición de días libres
-ConfirmToValidCP=¿Está certo de querer enviar a petición de días libres?
-TitleRefuseCP=Rexeitar a petición de días libres
-ConfirmRefuseCP=¿Está certo de querer rexeitar a petición de días libres?
-NoMotifRefuseCP=Debe seleccionar un motivo para rexeitar esta petición.
-TitleCancelCP=Cancelar a petición de días libres
-ConfirmCancelCP=¿Está certo de querer anular a petición de días libres?
+TitleToValidCP=Enviar o pedimento de días libres
+ConfirmToValidCP=¿Está certo de querer enviar o pedimento de días libres?
+TitleRefuseCP=Rexeitar o pedimento de días libres
+ConfirmRefuseCP=¿Está certo de querer rexeitar o pedimentode días libres?
+NoMotifRefuseCP=Debe seleccionar un motivo para rexeitar este pedimento.
+TitleCancelCP=Cancelar o pedimento de días libres
+ConfirmCancelCP=¿Está certo de querer anular o pedimento de días libres?
 DetailRefusCP=Motivo do rexeitamento
 DateRefusCP=Data do rexeitamento
 DateCancelCP=Data da cancelación
@@ -80,14 +80,14 @@ UserCP=Usuario
 ErrorAddEventToUserCP=Aconteceu un erro na asignación do permiso excepcional.
 AddEventToUserOkCP=Engadiuse o permiso excepcional.
 MenuLogCP=Ver rexistro de cambios
-LogCP=Historial de actualizacións de vacacións
-ActionByCP=Realizado por
-UserUpdateCP=Para o usuario
+LogCP=Rexistro de todas as actualizacións feitas a "Balance de vacacións" 
+ActionByCP=Actualizado por 
+UserUpdateCP=Actualizado para 
 PrevSoldeCP=Saldo anterior
 NewSoldeCP=Novo saldo
-alreadyCPexist=Xa foi efectuada unha petición de días libres para este período.
-FirstDayOfHoliday=Primeiro día de vacacións
-LastDayOfHoliday=Último día vacacións
+alreadyCPexist=Xa foi efectuada un pedimento de días libres para este período.
+FirstDayOfHoliday=Día de inicio da solicitude de vacacións 
+LastDayOfHoliday=Día de finalización da solicitude de vacacións
 BoxTitleLastLeaveRequests=Últimas %s solicitudes de días libres modificadas
 HolidaysMonthlyUpdate=Actualización mensual
 ManualUpdate=Actualización manual
@@ -104,8 +104,8 @@ LEAVE_SICK=Baixa por enfermidade
 LEAVE_OTHER=Outro motivo de día libre
 LEAVE_PAID_FR=Vacación
 ## Configuration du Module ##
-LastUpdateCP=Última actualización automática de días libres
-MonthOfLastMonthlyUpdate=Mes da última actualización automática de días libres
+LastUpdateCP=Última actualización automática da asignación de vacacións 
+MonthOfLastMonthlyUpdate=Mes da última actualización automática da asignación de vacacións
 UpdateConfCPOK=Actualización efectuada.
 Module27130Name= Xestión dos días libres
 Module27130Desc= Xestión dos días libres
@@ -123,12 +123,12 @@ HolidaysRefusedBody=A súa solicitude de días libres dende o %s ao %s foi deneg
 HolidaysCanceled=Días libres cancelados
 HolidaysCanceledBody=A súa solicitude de días libres dende o %s ao %s foi cancelada.
 FollowedByACounter=1: Este tipo de día libre precisa ser seguido por un contador. O contador incrementase manualmente ou automáticamente e cando valídase unha solicitude, o contador disminue.<br> 0: Non é seguido por un contador.
-NoLeaveWithCounterDefined=Non hai ningún tipo de peticións de días libres definida que precisen ser seguidas por un contador
+NoLeaveWithCounterDefined=Non hai ningún tipo de pedimento de días libres definida que precisen ser seguidas por un contador
 GoIntoDictionaryHolidayTypes=Vaia a <strong>Inicio - Configuración - Diccionarios - Tipos de días libres </strong> para configurar os diferentes tipos de días libres.
-HolidaySetup=Configuración do módulo Vacacións
-HolidaysNumberingModules=Modelos de numeración de petición de días libres
-TemplatePDFHolidays=Prantilla PDF para petición de días libres
+HolidaySetup=Configuración do módulo  Vacacións
+HolidaysNumberingModules=Modelos de numeración para solicitudes de vacacións
+TemplatePDFHolidays=Padrón PDF para pedimento de días libres
 FreeLegalTextOnHolidays=Texto libre no PDF
-WatermarkOnDraftHolidayCards=Marca de auga no borrador de petición de días libres
+WatermarkOnDraftHolidayCards=Marca de auga no borrador de pedimento de días libres
 HolidaysToApprove=Vacacións para aprobar
 NobodyHasPermissionToValidateHolidays=Ninguén ten permisos para validar vacacións
diff --git a/htdocs/langs/gl_ES/hrm.lang b/htdocs/langs/gl_ES/hrm.lang
index d5a29275c06..4ac633255fb 100644
--- a/htdocs/langs/gl_ES/hrm.lang
+++ b/htdocs/langs/gl_ES/hrm.lang
@@ -9,7 +9,7 @@ ConfirmDeleteEstablishment=Está certo de querer eliminar este establecemento?
 OpenEtablishment=Abrir establecemento
 CloseEtablishment=Pechar establecemento
 # Dictionary
-DictionaryPublicHolidays=RRHH - Festivos
+DictionaryPublicHolidays=Permisos- Días Festivos
 DictionaryDepartment=RRHH - Listaxe Departamentos
 DictionaryFunction=RRHH - Postos de traballo
 # Module
diff --git a/htdocs/langs/gl_ES/knowledgemanagement.lang b/htdocs/langs/gl_ES/knowledgemanagement.lang
index 3bab515906a..fbffa2b8d90 100644
--- a/htdocs/langs/gl_ES/knowledgemanagement.lang
+++ b/htdocs/langs/gl_ES/knowledgemanagement.lang
@@ -47,7 +47,7 @@ KnowledgeManagementArea = Xestión do Coñecemento
 # Menu
 #
 MenuKnowledgeRecord = Base de Coñecemento
-ListOfArticles = Listaxe de artígos
+ListKnowledgeRecord = Listaxe de artígos
 NewKnowledgeRecord = Novo artigo
 ValidateReply = Validar a solución
 KnowledgeRecords = Artigos
diff --git a/htdocs/langs/gl_ES/languages.lang b/htdocs/langs/gl_ES/languages.lang
index a66520eaa71..b7275e9c824 100644
--- a/htdocs/langs/gl_ES/languages.lang
+++ b/htdocs/langs/gl_ES/languages.lang
@@ -3,6 +3,7 @@ Language_am_ET=Etíope
 Language_ar_AR=Árabe
 Language_ar_EG=Árabe (Exipto)
 Language_ar_SA=Árabe
+Language_ar_TN=Arabe (Tunez)
 Language_az_AZ=Azerí
 Language_bn_BD=Bengalí
 Language_bn_IN=Bengali (India)
@@ -84,6 +85,7 @@ Language_nl_NL=Alemán
 Language_pl_PL=Polaco
 Language_pt_BR=Portugués (Brasil)
 Language_pt_PT=Portugués
+Language_ro_MD=Rumano (Moldavia)
 Language_ro_RO=Romanés
 Language_ru_RU=Ruso
 Language_ru_UA=Ruso (Ucraína)
diff --git a/htdocs/langs/gl_ES/mails.lang b/htdocs/langs/gl_ES/mails.lang
index bcf8acd99eb..abd84983289 100644
--- a/htdocs/langs/gl_ES/mails.lang
+++ b/htdocs/langs/gl_ES/mails.lang
@@ -41,9 +41,9 @@ MailingStatusError=Erro
 MailingStatusNotSent=Non enviado
 MailSuccessfulySent=E-Mail aceptado para a entrega (de %s a %s)
 MailingSuccessfullyValidated=Mailing validado correctamente
-MailUnsubcribe=Eliminar suscrición
+MailUnsubcribe=Eliminar subscrición
 MailingStatusNotContact=Non contactar
-MailingStatusReadAndUnsubscribe=Lido e eliminada suscrición
+MailingStatusReadAndUnsubscribe=Lido e eliminada subscrición
 ErrorMailRecipientIsEmpty=O enderezo do destinatario está baleiro
 WarningNoEMailsAdded=Ningún novo Mailing a engadir á listaxe destinatarios.
 ConfirmValidMailing=¿Confirma a validación do Mailing?
@@ -119,7 +119,7 @@ IdRecord=ID rexistro
 DeliveryReceipt=Acuse de recibo.
 YouCanUseCommaSeparatorForSeveralRecipients=Pode usar o carácter de separación <b>coma </b> para especificar múltiples destinatarios.
 TagCheckMail=Seguemento da apertura do email
-TagUnsubscribe=Ligazón de baixa na suscrición
+TagUnsubscribe=Ligazón de baixa na subscrición
 TagSignature=Sinatura do usuario que envía
 EMailRecipient=Mail do destinatario
 TagMailtoEmail=Mail do destinatario (incluindo a ligazón html "mailto:")
diff --git a/htdocs/langs/gl_ES/main.lang b/htdocs/langs/gl_ES/main.lang
index 483c9c19896..6a62ea73588 100644
--- a/htdocs/langs/gl_ES/main.lang
+++ b/htdocs/langs/gl_ES/main.lang
@@ -24,7 +24,7 @@ FormatDateHourSecShort=%d/%m/%Y %H:%M:%S
 FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
 DatabaseConnection=Conexión á base de datos
-NoTemplateDefined=Sen prantilla dispoñible para este tipo de e-mail
+NoTemplateDefined=Sen padrón dispoñible para este tipo de e-mail
 AvailableVariables=Variables de substitución dispoñibles
 NoTranslation=Sen tradución
 Translation=Tradución
@@ -241,8 +241,8 @@ Designation=Descrición
 DescriptionOfLine=Descrición de liña
 DateOfLine=Data da liña
 DurationOfLine=Permanecia da liña
-Model=Prantilla documento
-DefaultModel=Prantilla por defecto do documento
+Model=Padrón de documento
+DefaultModel=Padrón por defecto do documento
 Action=Acción
 About=Acerca de
 Number=Número
@@ -263,7 +263,7 @@ Cards=Fichas
 Card=Ficha
 Now=Agora
 HourStart=Hora de inicio
-Deadline=Deadline
+Deadline=Data de fin
 Date=Data
 DateAndHour=Data e hora
 DateToday=Data de hoxe
@@ -430,6 +430,7 @@ LT1IN=CGST
 LT2IN=SGST
 LT1GC=Céntimos adicionais
 VATRate=Taxa IVE
+RateOfTaxN=Tipo de imposto %s
 VATCode=Código taxa IVE
 VATNPR=Taxa NPR
 DefaultTaxRate=Taxa de imposto por defecto
@@ -729,6 +730,7 @@ MenuMembers=Membros
 MenuAgendaGoogle=Axenda Google
 MenuTaxesAndSpecialExpenses=Taxas | Gastos especiais
 ThisLimitIsDefinedInSetup=Límite Dolibarr (Menú Inicio-configuración-seguridade): %s Kb, PHP limit: %s Kb
+ThisLimitIsDefinedInSetupAt=Límite Dolibarr (Menu %s): %s Kb PHP límite (Param %s): %s Kb
 NoFileFound=Non se cargaron documentos
 CurrentUserLanguage=Idioma actual
 CurrentTheme=Tema actual
@@ -795,7 +797,7 @@ LinkTo=Ligar a
 LinkToProposal=Ligar a orzamento
 LinkToOrder=Ligar a pedimento
 LinkToInvoice=Ligar a factura
-LinkToTemplateInvoice=Ligar a prantilla de factura
+LinkToTemplateInvoice=Ligar o padrón de factura
 LinkToSupplierOrder=Ligar a pedimento a provedor
 LinkToSupplierProposal=Ligar a orzamento de provedor
 LinkToSupplierInvoice=Ligar a factura de provedor
@@ -854,7 +856,7 @@ GoIntoSetupToChangeLogo=Vaia a Inicio->Configuración->Empresa/Organización par
 Deny=Denegar
 Denied=Denegada
 ListOf=Lista de %s
-ListOfTemplates=Listaxe de prantillas
+ListOfTemplates=Listaxe de padróns
 Gender=Sexo
 Genderman=Masculino
 Genderwoman=Feminino
@@ -928,7 +930,7 @@ TitleSetToDraft=De volta ao borrador
 ConfirmSetToDraft=¿Está certo de querer voltar ao estado Borrador?
 ImportId=ID de importación
 Events=Eventos
-EMailTemplates=Prantillas E-mail
+EMailTemplates=Padróns de Correo Electrónico
 FileNotShared=Ficheiro non compartido ao público externo
 Project=Proxecto
 Projects=Proxectos
@@ -1005,7 +1007,7 @@ million=millón
 billion=billón
 trillion=trillón
 quadrillion=quadrillón
-SelectMailModel=Seleccione unha prantilla de correo
+SelectMailModel=Seleccione un padrón de correo
 SetRef=Establecer ref
 Select2ResultFoundUseArrows=Algúns resultados atopados. Use as frechas para seleccionar.
 Select2NotFound=Non atopáronse resultados
@@ -1072,6 +1074,7 @@ ValidFrom=Válido dende
 ValidUntil=Válido ata
 NoRecordedUsers=Sen usuarios
 ToClose=A pechar
+ToRefuse=Negarse
 ToProcess=A procesar
 ToApprove=A aprobar
 GlobalOpenedElemView=Vista global
@@ -1126,9 +1129,11 @@ UpdateForAllLines=Actualizar todas as liñas
 OnHold=Agardando
 Civility=Cortesía
 AffectTag=Poñer etiqueta
+CreateExternalUser=Crear usuario externo
 ConfirmAffectTag=Poñer etiqueta masiva
 ConfirmAffectTagQuestion=Está certo de que quere poñer ás etiquetas dos rexistros seleccionados %s?
 CategTypeNotFound=Non se atopou ningún tipo de etiqueta para o tipo de rexistros
 CopiedToClipboard=Copiado a portapapeis
 InformationOnLinkToContract=Este importe é só o total de todas as liñas do contrato. Non se ten en conta ningunha noción de tempo.
 ConfirmCancel=Está certo de querer cancelar
+EmailMsgID=Correo electónico  MsgID
diff --git a/htdocs/langs/gl_ES/members.lang b/htdocs/langs/gl_ES/members.lang
index b788c8fa48a..49931c61293 100644
--- a/htdocs/langs/gl_ES/members.lang
+++ b/htdocs/langs/gl_ES/members.lang
@@ -163,7 +163,7 @@ MoreActionBankDirect=Crear un rexistro directo na conta bancaria
 MoreActionBankViaInvoice=Crear unha factura e un pagamento na conta bancaria
 MoreActionInvoiceOnly=Creación factura sen pagamento
 LinkToGeneratedPages=Xeración de tarxetas de presentación
-LinkToGeneratedPagesDesc=Esta pantalla permitelle crear prantillas de tarxetas de presentación para os membros o para cada membro en particular.
+LinkToGeneratedPagesDesc=Esta pantalla permitelle crear padróns de tarxetas de presentación para os membros o para cada membro en particular.
 DocForAllMembersCards=Xeración de tarxetas para todos os membros
 DocForOneMemberCards=Xeración de tarxetas para un membro en particular
 DocForLabels=Xeración de etiquetas de enderezos
@@ -202,7 +202,7 @@ MEMBER_NEWFORM_PAYONLINE=Ir á páxina integrada de pagamento en liña
 ByProperties=Por natureza
 MembersStatisticsByProperties=Estatísticas dos membros por natureza
 VATToUseForSubscriptions=Tasa de IVE para as afiliacións
-NoVatOnSubscription=Sen IVE para nas afiliacións
+NoVatOnSubscription=Sen IVE para as afiliacións
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Produto usado para as afiliacións en liña nas facturas: %s
 NameOrCompany=Nome ou empresa
 SubscriptionRecorded=Afiliación gardada
@@ -213,3 +213,5 @@ SendReminderForExpiredSubscription=Enviar lembranza por mail aos membros cando a
 MembershipPaid=Membresía pagada polo período actual (ata %s)
 YouMayFindYourInvoiceInThisEmail=Pode atopar a súa factura axuntada a este mail
 XMembersClosed=%s membro(s) pechado(s)
+XExternalUserCreated=%s usuarios externos creados
+ForceMemberNature=Natureza do membro  (física ou xurídica) 
diff --git a/htdocs/langs/gl_ES/modulebuilder.lang b/htdocs/langs/gl_ES/modulebuilder.lang
index 4ecc68c127b..cfb8fca58ec 100644
--- a/htdocs/langs/gl_ES/modulebuilder.lang
+++ b/htdocs/langs/gl_ES/modulebuilder.lang
@@ -143,3 +143,4 @@ AsciiToHtmlConverter=Conversor de ascii a HTML
 AsciiToPdfConverter=Conversor de ascii a PDF
 TableNotEmptyDropCanceled=A táboa non está baleira. Cancelouse a eliminación.
 ModuleBuilderNotAllowed=O creador de módulos está dispoñible pero non permitido ao seu usuario.
+ImportExportProfiles=Importar e exportar perfís
diff --git a/htdocs/langs/gl_ES/mrp.lang b/htdocs/langs/gl_ES/mrp.lang
index 26bc6d491ef..f54e8a9136b 100644
--- a/htdocs/langs/gl_ES/mrp.lang
+++ b/htdocs/langs/gl_ES/mrp.lang
@@ -1,45 +1,45 @@
 Mrp=Pedimentos de fabricación
 MOs=Pedimentos de fabricación
 ManufacturingOrder=Pedimento de fabricación
-MRPDescription=Módulo para xestionar pedimentos de fabricación (MO).
+MRPDescription=Módulo para xestionar produción e pedimentos de fabricación (PF).
 MRPArea=Área MRP
 MrpSetupPage=Configuración do módulo MRP
-MenuBOM=Listaxe de material
+MenuBOM=Listaxes de materiais
 LatestBOMModified=Últimas %s listaxes de materiais modificadas
 LatestMOModified=Últimos %s pedimentos de material modificados
 Bom=Listaxes de material
-BillOfMaterials=Listaxe de material
+BillOfMaterials=Listaxe de materiais
 BOMsSetup=Configuración do módulo BOM
 ListOfBOMs=Listaxe de facturas de materiais - BOM
 ListOfManufacturingOrders=Listaxe de pedimentos de fabricación
 NewBOM=Nova listaxe de materiais
-ProductBOMHelp=Produto a crear con este BOM.<br>Nota: os produtos coa propiedade 'Natureza do producto'='Materia prima' non están visibles nesta listaxe.
+ProductBOMHelp=Produto para crear (ou desmontar) con esta Lista de Materiais <br> Nota: Os produtos coa propiedade 'Natureza do produto' = 'Materia prima' non están visibles nesta listaxe. 
 BOMsNumberingModules=Modelos de numeración BOM
-BOMsModelModule=Prantillas de documentos BOMS
-MOsNumberingModules=Modelos de numeración MO
-MOsModelModule=Prantillas de documentos MO
+BOMsModelModule=Padróns de documentos BOM
+MOsNumberingModules=Modelos de numeración PF
+MOsModelModule=Padróns de documentos PF
 FreeLegalTextOnBOMs=Texto libre no documento BOM
-WatermarkOnDraftBOMs=Marca de auga no borrador MO
-FreeLegalTextOnMOs=Texto libre no documento MO
-WatermarkOnDraftMOs=Marca de auga no borrador MO
-ConfirmCloneBillOfMaterials=¿Está certo de querer clonar esta listaxe de materiais %s?
+WatermarkOnDraftBOMs=Marca de auga no borrador BOM
+FreeLegalTextOnMOs=Texto libre no documento PF
+WatermarkOnDraftMOs=Marca de auga no borrador PF
+ConfirmCloneBillOfMaterials=Está certo de querer clonar a listaxe de materiais %s?
 ConfirmCloneMo=Está certo de querer clonar este pedimento de facturación %s?
 ManufacturingEfficiency=Eficiencia de fabricación
 ConsumptionEfficiency=Eficienci de consumo
 ValueOfMeansLoss=O valor de 0.95 significa un promedio de 5%% de perda durante a produción
 ValueOfMeansLossForProductProduced=O valor de 0,95 significa unha media do 5 %% da perda do produto producido
-DeleteBillOfMaterials=Eliminar listaxe de material
-DeleteMo=Borra pedimentos de manufacturación
-ConfirmDeleteBillOfMaterials=¿Está certo de querer eliminar esta Listaxe de Material?
-ConfirmDeleteMo=¿Está certo de querer eliminar esta Listaxe de Material?
-MenuMRP=Pedimentos de manufacturación
-NewMO=Novo pedimento de manufacturación
+DeleteBillOfMaterials=Eliminar listaxe de materiais
+DeleteMo=Borra pedimento de manufacturación
+ConfirmDeleteBillOfMaterials=Está certo de querer eliminar esta Listaxe de Materiais?
+ConfirmDeleteMo=Está certo de querer eliminar esta Listaxe de Materiais?
+MenuMRP=Pedimentos de fabricación
+NewMO=Novo pedimento de fabricación
 QtyToProduce=Cant. a producir
 DateStartPlannedMo=Data de inicio prevista
 DateEndPlannedMo=Date de finalización prevista
 KeepEmptyForAsap=Baleiro quere dicir 'Tan pronto como sexa posible'
 EstimatedDuration=Duración estimada
-EstimatedDurationDesc=Duración estimada para manufacturar este produto usando este BOM
+EstimatedDurationDesc=Duración estimada para fabricar (ou desmontar) este produto usando esta Lista de Materiais
 ConfirmValidateBom=Está certo de que desexa validar a listaxe de materias coa referencia <strong>%s</strong> (poderá usala para crear novos pedimentos de fabricación)
 ConfirmCloseBom=¿Está certo de que quere cancelar esta listaxe de materiales (xa non poderá usalo para crear novos pedimentos de fabricación)?
 ConfirmReopenBom=Está certo de que quere voltar a abrir esta listaxe de materiales (poderá usala para construír novos pedimentoss de fabricación)
@@ -52,7 +52,7 @@ DisableStockChangeHelp=Cando se sinala esta marca, non hai cambio de stock neste
 BomAndBomLines=Listaxes de material e liñas
 BOMLine=Liña de BOM
 WarehouseForProduction=Almacén para produción
-CreateMO=Crear MO
+CreateMO=Crear PF
 ToConsume=A consumir
 ToProduce=A poducir
 QtyAlreadyConsumed=Cant. xa consumida
@@ -63,35 +63,34 @@ ConsumeAndProduceAll=Consumir e producir todo
 Manufactured=Fabricado
 TheProductXIsAlreadyTheProductToProduce=O produto a engadir xa é o produto a fabricar.
 ForAQuantityOf=Para producir unha cantidade de %s
+ForAQuantityToConsumeOf=Para desmontar unha cantidade de %s 
 ConfirmValidateMo=Está certo de que desexa validar este pedimento de fabricación?
 ConfirmProductionDesc=Ao facer clic en '%s', validará o consumo e/ou a produción para as cantidades establecidas. Isto tamén actualizará o stock e rexistrará os movementos de stock.
 ProductionForRef=Produción de %s
 AutoCloseMO=Pecha automaticamente o pedimento de fabricación se se alcanzan cantidades a consumir e producir
 NoStockChangeOnServices=Non hai cambio de stock nos servizos
-ProductQtyToConsumeByMO=Cantidade de produto aínda por consumir por MO aberto
-ProductQtyToProduceByMO=Cantidade de produto aínda por producir por MO aberto
+ProductQtyToConsumeByMO=Cantidade de produto aínda por consumir por PF aberto
+ProductQtyToProduceByMO=Cantidade de produto aínda por producir en OF aberta
 AddNewConsumeLines=Engadir nova liña para consumir
 ProductsToConsume=Produtos para consumir
 ProductsToProduce=Produtos para fabricar
 UnitCost=Custo unitario
 TotalCost=Custo total
 BOMTotalCost=O custo para producir este BOM está en función do custo de cada cantidade e produto a consumir (use o prezo de custo se se define, se non o prezo medio ponderado se se define, se non o mellor prezo de compra)
-GoOnTabProductionToProduceFirst=Primeiro debe iniciar a produción para pechar un pedimento de fabricación (ver a pestana '%s'). Pero pode cancelalo.
-ErrorAVirtualProductCantBeUsedIntoABomOrMo=Non se pode usar un produto composto nunha lista de materiales nin nunha MO
+GoOnTabProductionToProduceFirst=Primeiro debe iniciar a produción para pechar un pedimento de fabricación (ver a lapela '%s'). Pero pode cancelalo.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=Non se pode usar un produto composto nunha BOM nin nunha MO
 Workstation=Estación de traballo
 Workstations=Estacións de traballo
 WorkstationsDescription=Xestión de estacións de traballo
 WorkstationSetup = Configuración de estacións de traballo
 WorkstationSetupPage = Páxina de configuración de estacións de traballo
-WorkstationAbout = Acerca das estacións de traballo
-WorkstationAboutPage = Páxina acerca das estacións de traballo
 WorkstationList=Listaxe de estacións de traballo
 WorkstationCreate=Axuntar nova estación de traballo
 ConfirmEnableWorkstation=Está certo de querer activar a estación de traballo <b>%s</b>?
 EnableAWorkstation=Activar a estación de traballo
 ConfirmDisableWorkstation=Está certo de querer desactivar a estación de traballo <b>%s</b>?
 DisableAWorkstation=Desactivar unha estación de traballo
-DeleteWorkstation=Quitar
+DeleteWorkstation=Eliminar
 NbOperatorsRequired=Número de operadores precisos
 THMOperatorEstimated=THM estimada operador
 THMMachineEstimated=THM estimada máquina
diff --git a/htdocs/langs/gl_ES/orders.lang b/htdocs/langs/gl_ES/orders.lang
index 10bc3214df4..c23c0c6829a 100644
--- a/htdocs/langs/gl_ES/orders.lang
+++ b/htdocs/langs/gl_ES/orders.lang
@@ -11,6 +11,7 @@ OrderDate=Data pedimento
 OrderDateShort=Data pedimento
 OrderToProcess=Pedimento a procesar
 NewOrder=Novo pedimento
+NewSupplierOrderShort=Novo pedimento
 NewOrderSupplier=Nova orde de compra
 ToOrder=Realizar pedimento
 MakeOrder=Realizar pedimento
@@ -73,6 +74,7 @@ DeleteOrder=Eliminar o pedimento
 CancelOrder=Anular o pedimento
 OrderReopened= Pedimento %s aberto de novo
 AddOrder=Crear pedimento
+AddSupplierOrderShort=Crear pedimento
 AddPurchaseOrder=Create pedimento de compra
 AddToDraftOrders=Engadir a pedimento borrador
 ShowOrder=Amosar pedimento
diff --git a/htdocs/langs/gl_ES/other.lang b/htdocs/langs/gl_ES/other.lang
index 37ad4e8992b..32fc9132b08 100644
--- a/htdocs/langs/gl_ES/other.lang
+++ b/htdocs/langs/gl_ES/other.lang
@@ -129,6 +129,7 @@ ClosedByLogin=Login usuario que pechou
 FileWasRemoved=O ficheiro %s foi eliminado
 DirWasRemoved=O directorio %s foi eliminado
 FeatureNotYetAvailable=Funcionalidade ainda non dispoñible nesta versión actual
+FeatureNotAvailableOnDevicesWithoutMouse=Función non dispoñible en dispositivos sen rato
 FeaturesSupported=Funcionalidades dispoñibles
 Width=Ancho
 Height=Alto
@@ -263,7 +264,7 @@ ContactCreatedByEmailCollector=Contacto/enderezo creado polo recolector de corre
 ProjectCreatedByEmailCollector=Proxecto creado polo recolector de correos electrónicos do MSGID de correo electrónico %s
 TicketCreatedByEmailCollector=Ticket creado polo recolector de correos electrónicos do MSGID de correo electrónico %s
 OpeningHoursFormatDesc=Use o - para separar horario de apertura e peche.<br>Use o espazo para engadir diferentes rangos.<br>Exemplo: 8-12 14-18
-PrefixSession=Prefixo do Id da sesión
+SuffixSessionName=Sufixo para o nome da sesión
 
 ##### Export #####
 ExportsArea=Área de exportación
diff --git a/htdocs/langs/gl_ES/partnership.lang b/htdocs/langs/gl_ES/partnership.lang
index 7aab0c8c018..cc7ab3961fa 100644
--- a/htdocs/langs/gl_ES/partnership.lang
+++ b/htdocs/langs/gl_ES/partnership.lang
@@ -16,41 +16,72 @@
 #
 # Generic
 #
-ModulePartnershipName = Xestión de Asociacións
-PartnershipDescription = Módulo de xestión de Asociacións
+ModulePartnershipName=Xestión de Asociacións
+PartnershipDescription=Módulo de xestión de Asociacións
 PartnershipDescriptionLong= Módulo de xestión de Asociacións
 
+AddPartnership=Engade asociado
+CancelPartnershipForExpiredMembers=Asociación: cancela a asociación de membros con subscricións caducadas 
+PartnershipCheckBacklink=Asociación: comprobe a ligazón de retroceso referente 
+
 #
 # Menu
 #
-NewPartnership = Nova Asociación
-ListOfPartnerships = Listaxe de Asociacións
+NewPartnership=Nova Asociación
+ListOfPartnerships=Listaxe de Asociacións
 
 #
 # Admin page
 #
-PartnershipSetup = Configuración de Asociación
-PartnershipAbout = Sobre Asociación
-PartnershipAboutPage = Sobre a páxina de Asociación
-
+PartnershipSetup=Configuración de Asociacións
+PartnershipAbout=Sobre Asociacións
+PartnershipAboutPage=Sobre a páxina de Asociacións
+partnershipforthirdpartyormember=O estado de asociado debe establecerse nun "terceiro" ou nun "membro"
+PARTNERSHIP_IS_MANAGED_FOR=Xestionouse a subscrición para 
+PARTNERSHIP_BACKLINKS_TO_CHECK=Ligazóns de atraso para comprobar 
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nº de días antes do estado cancelado dun asociado cando caducou a subscrición
+ReferingWebsiteCheck=Comprobación da referencia do sitio web 
+ReferingWebsiteCheckDesc=Pode habilitar unha función para comprobar que os seus socios engadiron unha ligazón de retroceso aos dominios do seu sitio web no seu propio sitio web. 
 
 #
 # Object
 #
+DeletePartnership=Eliminar unha asociación 
+PartnershipDedicatedToThisThirdParty=Asociación dedicada a este terceiro 
+PartnershipDedicatedToThisMember=Asociación dedicada a este membro 
 DatePartnershipStart=Data inicio
 DatePartnershipEnd=Data finalización
+ReasonDecline=Razón para declinar
+ReasonDeclineOrCancel=Razón para declinar
+PartnershipAlreadyExist=A asociación xa existe 
+ManagePartnership=Xestionar a asociación
+BacklinkNotFoundOnPartnerWebsite=Non se atopou a ligazón de atraso no sitio web do socio 
+ConfirmClosePartnershipAsk=Está certo de querer cancelar esta asociación? 
+PartnershipType=Tipo de asociación
 
 #
 # Template Mail
 #
+SendingEmailOnPartnershipWillSoonBeCanceled=Subscrición será pronto cancelada
+SendingEmailOnPartnershipRefused=Subscrición rexeitada
+SendingEmailOnPartnershipAccepted=Subscrición aceptada
+SendingEmailOnPartnershipCanceled=Subscrición cancelada
 
+YourPartnershipWillSoonBeCanceledTopic=Subscrición será pronto cancelada
+YourPartnershipRefusedTopic=Subscrición rexeitada
+YourPartnershipAcceptedTopic=Subscrición aceptada
+YourPartnershipCanceledTopic=Subscrición cancelada
+
+YourPartnershipWillSoonBeCanceledContent=Informámoslle que a súa asociación pronto se cancelará (non se atopou  a ligazón de atraso)
+YourPartnershipRefusedContent=Informámoslle que a súa solicitude de subscrición foi rexeitada. 
+YourPartnershipAcceptedContent=Informámoslle que a súa solicitude de subscrición foi aceptada. 
+YourPartnershipCanceledContent=Informámoslle que a súa subscrición foi cancelada. 
 
 #
 # Status
 #
-PartnershipDraft = Non validada
-PartnershipAccepted = Aceptado
-PartnershipRefused = Rexeitado
-PartnershipCanceled = Anulado
-
+PartnershipDraft=Non validada
+PartnershipAccepted=Aceptado
+PartnershipRefused=Rexeitado
+PartnershipCanceled=Anulado
 PartnershipManagedFor=Os socios son
diff --git a/htdocs/langs/gl_ES/productbatch.lang b/htdocs/langs/gl_ES/productbatch.lang
index a3a113330c9..d52d0e031e6 100644
--- a/htdocs/langs/gl_ES/productbatch.lang
+++ b/htdocs/langs/gl_ES/productbatch.lang
@@ -1,4 +1,4 @@
-# ProductBATCH language file - en_US - ProductBATCH
+# ProductBATCH language file - Source file is en_US - ProductBATCH
 ManageLotSerial=Usar numeración por lote/serie
 ProductStatusOnBatch=Sí (lote obrigatorio)
 ProductStatusOnSerial=Sí (é preciso un número de serie único)
@@ -33,3 +33,13 @@ CustomMasks=Engada unha opción para definir a máscara na tarxeta do produto
 LotProductTooltip=Engada unha opción na tarxeta do produto para definir unha máscara de número de lote dedicada 
 SNProductTooltip=Engada unha opción na tarxeta do produto para definir unha máscara de número de serie dedicada 
 QtyToAddAfterBarcodeScan=Cant. a engadir por cada código de barras/lote/serie escaneado
+LifeTime=Duración da vida útil (en días) 
+EndOfLife=Fin da vida útil
+ManufacturingDate=Data de fabricación
+DestructionDate=Data de destrución
+FirstUseDate=Data do primeiro uso
+QCFrequency=Frecuencia do control de calidade (en días)
+
+#Traceability - qc status
+OutOfOrder=Fora de servizo
+InWorkingOrder=En funcionamento
diff --git a/htdocs/langs/gl_ES/products.lang b/htdocs/langs/gl_ES/products.lang
index eaad382a5cc..ddd97ea5344 100644
--- a/htdocs/langs/gl_ES/products.lang
+++ b/htdocs/langs/gl_ES/products.lang
@@ -396,3 +396,5 @@ ActionAvailableOnVariantProductOnly=Acción só dispoñible na variante do produ
 ProductsPricePerCustomer=Prezos de produto por cliente
 ProductSupplierExtraFields=Atributos adicionais (Prezos Provedor)
 DeleteLinkedProduct=Eliminar o produto fillo ligado á combinación
+PMPValue=Prezo medio ponderado
+PMPValueShort=PMP
diff --git a/htdocs/langs/gl_ES/projects.lang b/htdocs/langs/gl_ES/projects.lang
index 46f8fe51657..2213e6fbdb1 100644
--- a/htdocs/langs/gl_ES/projects.lang
+++ b/htdocs/langs/gl_ES/projects.lang
@@ -182,9 +182,9 @@ SelectElement=Escolla elemento
 AddElement=Ligar ao elemento
 LinkToElementShort=Ligar a
 # Documents models
-DocumentModelBeluga=Prantilla de documento para a descrición dos obxectos ligados
-DocumentModelBaleine=Prantilla de documendo do proxecto para tarefas
-DocumentModelTimeSpent=Prantilla de informe de proxecto para o tempo empregado
+DocumentModelBeluga=Padrón de documento para a descrición dos obxectos ligados
+DocumentModelBaleine=Padrón de documendo do proxecto para tarefas
+DocumentModelTimeSpent=Padrón de informe de proxecto para o tempo empregado
 PlannedWorkload=Carga de traballo planificada
 PlannedWorkloadShort=Carga de traballo
 ProjectReferers=Items relacionados
@@ -267,9 +267,11 @@ InvoiceToUse=Borrador de factura a usar
 NewInvoice=Nova factura
 OneLinePerTask=Unha liña por tarefa
 OneLinePerPeriod=Unha liña por período
+OneLinePerTimeSpentLine=Unha liña para cada declaración de tempo empregado
 RefTaskParent=Ref. Tarefa Pai
 ProfitIsCalculatedWith=Beneficio está calculado usando
 AddPersonToTask=Engadir tamén ás tarefas
 UsageOrganizeEvent=Uso: organización de eventos 
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Clasificar o proxecto como pechado cando se completen todas as súas tarefas (100 %% progreso)
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Nota: os proxectos existentes con todas as tarefas en progreso do 100 %% non se verán afectados: terá que pechalos manualmente. Esta opción só afecta a proxectos abertos. 
+SelectLinesOfTimeSpentToInvoice=Seleccione a liñas de tempo utilizadas que non se facturan e, de seguido, empregue unha acción masiva de "Xerar factura" para facturalas
diff --git a/htdocs/langs/gl_ES/receptions.lang b/htdocs/langs/gl_ES/receptions.lang
index 6c33af15572..8fae718c89e 100644
--- a/htdocs/langs/gl_ES/receptions.lang
+++ b/htdocs/langs/gl_ES/receptions.lang
@@ -44,4 +44,4 @@ ValidateOrderFirstBeforeReception=Primeiro debe validar o pedimento antes de pod
 ReceptionsNumberingModules=Módulo de numeración para recepcións
 ReceptionsReceiptModel=Modeloss de documentos para recepcións.
 NoMorePredefinedProductToDispatch=Non hai máis produtos predefinidos para enviar
-
+ReceptionExist=Xa hai unha recepción
diff --git a/htdocs/langs/gl_ES/stocks.lang b/htdocs/langs/gl_ES/stocks.lang
index 419b706614f..288ddb3c568 100644
--- a/htdocs/langs/gl_ES/stocks.lang
+++ b/htdocs/langs/gl_ES/stocks.lang
@@ -56,8 +56,6 @@ UnitPurchaseValue=Prezo de compra unitario
 StockTooLow=Stock insuficinte
 StockLowerThanLimit=O stock é menor que o límite da alerta (%s)
 EnhancedValue=Valor
-PMPValue=Prezo medio ponderado
-PMPValueShort=PMP
 EnhancedValueOfWarehouses=Valor de stocks en almacén
 UserWarehouseAutoCreate=Crea automáticamente un almacén de usuarios ao crear un usuario
 AllowAddLimitStockByWarehouse=Xestionar tamén o valor do stock mínimo e desexado por emparellamento (produto-almacén) ademais do valor do stock mínimo e stock desexado por produto
@@ -251,7 +249,10 @@ SelectAStockMovementFileToImport=Seleccionar un ficheiro a importar dos movement
 InfoTemplateImport=O ficheiro cargado precisa ter este formato (* son campos obrigatorios): <br> Almacén orixe* | Almacén destino* | Produto* | Cantidade* | Número de Lote/Serie <br> CSV debe ser " <b>%s</b>"
 LabelOfInventoryMovemement=Inventario %s
 ReOpen=Abrir de novo
-ConfirmFinish=Confirma o peche do inventario? Isto xerará todos os movementos de stock para actualizar o seu stock
+ConfirmFinish=Está certo de querer pechar o inventario? Isto xerará todos os movementos de stock para actualizar o stock á cantidade real que ingresou no inventario. 
 ObjectNotFound=%s non foi atopado
 MakeMovementsAndClose=Xera movementos e pecha
 AutofillWithExpected=Encher a cantidade real coa cantidade agardada
+ShowAllBatchByDefault=De xeito predeterminado, amosa os detalles do lote na lapela "stock" do produto
+CollapseBatchDetailHelp=Pode configurar a visualización predeterminada do detalle do lote na configuración do modulo stocks
+FieldCannotBeNegative=O campo "%s" non pode ser negativo
diff --git a/htdocs/langs/gl_ES/ticket.lang b/htdocs/langs/gl_ES/ticket.lang
index 9d4e31f46f1..2f456f65b86 100644
--- a/htdocs/langs/gl_ES/ticket.lang
+++ b/htdocs/langs/gl_ES/ticket.lang
@@ -304,7 +304,7 @@ BoxLastModifiedTicket=Últimos tickets modificados
 BoxLastModifiedTicketDescription=Últimos %s tickets modificados
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=Non hai tickets modificados recentemente
-BoxTicketType=Número de tickets abertos por tipo
+BoxTicketType=Distribución de ticketss abertos por tipo 
 BoxTicketSeverity=Número de tickets abertos por gravidade
 BoxNoTicketSeverity=Número de tickets abertos
 BoxTicketLastXDays=Número de tickets abertos por días nos últimos %s días
diff --git a/htdocs/langs/gl_ES/trips.lang b/htdocs/langs/gl_ES/trips.lang
index 0cc9aa1f4b9..fa8b8f77c23 100644
--- a/htdocs/langs/gl_ES/trips.lang
+++ b/htdocs/langs/gl_ES/trips.lang
@@ -55,7 +55,7 @@ EX_HOT=Hotel
 EX_PAR=Estacionamento
 EX_TOL=Peaxe
 EX_TAX=Impostos varios
-EX_IND=Suscrición de indemnización por transporte
+EX_IND=Subscrición de indemnización por transporte
 EX_SUM=Mantemento
 EX_SUO=Material de oficina
 EX_CAR=Aluguer de vehículos
diff --git a/htdocs/langs/gl_ES/website.lang b/htdocs/langs/gl_ES/website.lang
index c93e34b7057..e88f134bdd8 100644
--- a/htdocs/langs/gl_ES/website.lang
+++ b/htdocs/langs/gl_ES/website.lang
@@ -73,7 +73,7 @@ CreateByFetchingExternalPage=Crear páxina/contedor recuperando páxina desde un
 OrEnterPageInfoManually=Ou crea a páxina desde cero ou a partir dun modelo de páxina ...
 FetchAndCreate=Obter e crear
 ExportSite=Exportar sitio web
-ImportSite=Importar prantilla de sitio web
+ImportSite=Importar padrón de sitio web
 IDOfPage=Id da páxina
 Banner=Banner
 BlogPost=Entrada no blog
@@ -117,7 +117,7 @@ ReplaceString=Nova cadea
 CSSContentTooltipHelp=Introduza aquí contido CSS. Para evitar calquera conflito co CSS da aplicación, asegúrese de antepoñer toda a declaración coa clase .bodywebsite. Por exemplo: <br> <br> #mycssselector, input.myclass:hover {...} <br> debe ser <br> .bodywebsite #mycssselector,.bodywebsite input.myclass:hover {...} <br> <br> Nota: Se ten un ficheiro grande sen este prefixo, pode usar "lessc" para convertelo para engadir o prefixo .bodywebsite en todas partes.
 LinkAndScriptsHereAreNotLoadedInEditor=Aviso: este contido só se emite cando se accede ao sitio desde un servidor. Non se usa no modo de edición, polo que se precisa cargar ficheiros javascript tamén no modo de edición, só ten que engadir a súa etiqueta 'script src=...' á páxina.
 Dynamiccontent=Mostra dunha páxina con contido dinámico
-ImportSite=Importar prantilla de sitio web
+ImportSite=Importar padrón de sitio web
 EditInLineOnOff=O modo 'Editar en liña' é %s
 ShowSubContainersOnOff=O modo para executar "contido dinámico" é %s
 GlobalCSSorJS=Ficheiro global CSS/JS/Header do sitio web
diff --git a/htdocs/langs/gl_ES/withdrawals.lang b/htdocs/langs/gl_ES/withdrawals.lang
index 595d3694f5b..ad740de4e8f 100644
--- a/htdocs/langs/gl_ES/withdrawals.lang
+++ b/htdocs/langs/gl_ES/withdrawals.lang
@@ -1,17 +1,17 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 CustomersStandingOrdersArea=Área domiciliacións
-SuppliersStandingOrdersArea=Área domiciliacións
+SuppliersStandingOrdersArea=Área transferencias
 StandingOrdersPayment=Domiciliacións
 StandingOrderPayment=Domiciliación
 NewStandingOrder=Nova domiciliación
-NewPaymentByBankTransfer=Novo pagamenyo por transferencia
+NewPaymentByBankTransfer=Novo pagamento por transferencia
 StandingOrderToProcess=A procesar
-PaymentByBankTransferReceipts=Solicitudes de transferencia
+PaymentByBankTransferReceipts=Ordes de transferencia
 PaymentByBankTransferLines=Liñas de ordes de transferencia
 WithdrawalsReceipts=Domiciliacións
 WithdrawalReceipt=Domiciliación
-BankTransferReceipts=Solicitudes de transferencia
-BankTransferReceipt=Ordes de transferencia
+BankTransferReceipts=Ordes de transferencia
+BankTransferReceipt=Orde de transferencia
 LatestBankTransferReceipts=Últimas %s ordes de transferencia
 LastWithdrawalReceipts=Últimos %s ficheiros de ordes de domiciliación
 WithdrawalsLine=Liña de orde de domiciliacións
@@ -20,18 +20,18 @@ WithdrawalsLines=Liñas de ordes de domiciliación
 CreditTransferLines=Liñas de ordes de transferencia
 RequestStandingOrderToTreat=Peticións de domiciliacións a procesar
 RequestStandingOrderTreated=Peticións de domiciliacións procesadas
-RequestPaymentsByBankTransferToTreat=Solicitudes de transferencia a tramitar
-RequestPaymentsByBankTransferTreated=Solicitudes de transferencia a procesar
+RequestPaymentsByBankTransferToTreat=Ordes de transferencia a tramitar
+RequestPaymentsByBankTransferTreated=Ordes de transferencia a procesar
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Aínda non é posible. O estado da domiciliación debe ser 'abonada' antes de poder realizar devolucións as súas líñas
-NbOfInvoiceToWithdraw=Nº de facturas pendentes de domiciliación
+NbOfInvoiceToWithdraw=Nº de facturas de cliente calificadas con domiciliación agardando
 NbOfInvoiceToWithdrawWithInfo=Número de facturas agardando domiciliación para clientes que teñen o seu número de conta definida
-NbOfInvoiceToPayByBankTransfer=Nº de facturas de provedores agardando un pagamento mediante transferencia 
+NbOfInvoiceToPayByBankTransfer=Nº de facturas de provedor agardando un pagamento mediante transferencia 
 SupplierInvoiceWaitingWithdraw=Factura de provedor agardando pagamento mediante transferencia
 InvoiceWaitingWithdraw=Facturas agardando domiciliación
 InvoiceWaitingPaymentByBankTransfer=Factura agardando transferencia
-AmountToWithdraw=Cantidade a domiciliar
+AmountToWithdraw=Cantidade a retirar/domiciliar
 NoInvoiceToWithdraw=Non hai ningunha factura aberta para '%s' agardando. Vaia á lapela '%s' da tarxeta de factura para facer unha solicitude.
-NoSupplierInvoiceToWithdraw=Non hai ningunha factura do provedor con "Solicitudes de crédito" abertas. Vaia á pestana '%s' da tarxeta da factura para facer unha solicitude.
+NoSupplierInvoiceToWithdraw=Non hai ningunha factura do provedor con "Solicitudes de transferencia" agardando. Vaia á lapela '%s' da tarxeta da factura para facer unha solicitude.
 ResponsibleUser=Usuario responsable das domiciliacións
 WithdrawalsSetup=Configuración das domiciliacións
 CreditTransferSetup=Configuración das transferencias
@@ -44,7 +44,8 @@ MakeBankTransferOrder=Realizar unha petición de transferencia
 WithdrawRequestsDone=%s domiciliacións rexistradas
 BankTransferRequestsDone=%s transferencias rexistradas
 ThirdPartyBankCode=Código banco do terceiro
-NoInvoiceCouldBeWithdrawed=Non se facturou ningunha factura correctamente. Comprobe que as facturas son de empresas con IBAN válido e que IBAN ten unha RMU (Referencia de mandato único) co modo <strong>%s</strong>1.
+NoInvoiceCouldBeWithdrawed=Non foi realizada a domiciliación de ningunha factura correctamente. Comprobe que as facturas son de empresas con IBAN válido e que IBAN ten unha RMU (Referencia de mandato único) co modo <strong>%s</strong>1.
+WithdrawalCantBeCreditedTwice=Este recibo de retirada xa está marcado como abonado; isto non pode facerse dúas veces, xa que isto podería crear pagamentos duplicados e entradas bancarias.
 ClassCredited=Clasificar como "Abonada"
 ClassCreditedConfirm=¿Está certo de querer clasificar esta domiciliación como abonada na súa conta bancaria?
 TransData=Data envío
@@ -77,11 +78,11 @@ StatusMotif5=Conta inexistente
 StatusMotif6=Conta sen saldo
 StatusMotif7=Decisión xudicial
 StatusMotif8=Outro motivo
-CreateForSepaFRST=Domiciliar (SEPA FRST)
-CreateForSepaRCUR=Domiciliar (SEPA RCUR)
-CreateAll=Domiciliar (todas)
+CreateForSepaFRST=Crear ficheiro de domiciliación (SEPA FRST)
+CreateForSepaRCUR=Crear ficheiro de  domiciliación (SEPA RCUR)
+CreateAll=Crear ficheiro de domiciliación (todas)
 CreateFileForPaymentByBankTransfer=Crear un ficheiro para a transferencia
-CreateSepaFileForPaymentByBankTransfer=Crear un ficheiro de transferencia (SEPA)
+CreateSepaFileForPaymentByBankTransfer=Crear ficheiro de transferencia (SEPA)
 CreateGuichet=Só oficina
 CreateBanque=Só banco
 OrderWaiting=Agardando proceso
@@ -89,7 +90,7 @@ NotifyTransmision=Envío de domiciliación
 NotifyCredit=Abono de domiciliación
 NumeroNationalEmetter=Número Nacional do Emisor
 WithBankUsingRIB=Para as contas bancarias que utilizan RIB
-WithBankUsingBANBIC=Para as contas bancarias que utilizan o código BAN/BIC/SWIFT
+WithBankUsingBANBIC=Para as contas bancarias que utilizan  IBAN/BIC/SWIFT
 BankToReceiveWithdraw=Conta bancaria para recibir a domiciliación
 BankToPayCreditTransfer=Conta bancaria empregada como fonte de pagamentos
 CreditDate=Abonada o
@@ -106,21 +107,21 @@ StatisticsByLineStatus=Estatísticas por estado das liñas
 RUM=RUM
 DateRUM=Data da sinatura do mandato
 RUMLong=Referencia única do mandato
-RUMWillBeGenerated=Se está baleiro, o número RUM /Referencia Única do Mandato) xérase unha vez gardada a información da conta bancaria
+RUMWillBeGenerated=Se está baleiro, o número RUM (Referencia Única do Mandato) xérase unha vez gardada a información da conta bancaria
 WithdrawMode=Modo domiciliación (FRST o RECUR)
 WithdrawRequestAmount=Importe da domiciliación
-BankTransferAmount=Importe da solicitude
+BankTransferAmount=Importe da orde de transferencia
 WithdrawRequestErrorNilAmount=Non é posible crear unha domiciliación sen importe
-SepaMandate=Mandato SEPA
+SepaMandate=Mandato SEPA de domiciliación
 SepaMandateShort=Mandato SEPA
 PleaseReturnMandate=Envíe de volta este formulario de mandato por correo electrónico a %s ou por correo a
-SEPALegalText=Ao asinar este mandato, autoriza (A) %s a enviar instruccións ao seu banco para cargar na súa conta e (B) ao seu banco para cargar na súa conta en acordo coas instruccións de %s. Como parte dos seus dereitos, ten dereito a unha devolución nos termos e condicións do seu contrato co seu banco. Unha devolución debe reclamarse dentro de 8 semanas a partires da data na que foi realizado o cargo a súa conta. Os seus dereitos con respeito ao mandato anterior explícanse nun comunicado que pode obter do seu banco.
+SEPALegalText=Ao asinar este mandato, autoriza (A) %s a enviar instruccións ao seu banco para cargar na súa conta e (B) ao seu banco para cargar na súa conta en acordo coas instruccións de %s. Como parte dos seus dereitos, ten dereito a unha devolución nos termos e condicións do seu contrato co seu banco. Unha devolución debe reclamarse dentro das 8 semanas a partir da data na que foi realizado o cargo a súa conta. Os seus dereitos con respeito ao mandato anterior explícanse nun comunicado que pode obter do seu banco.
 CreditorIdentifier=Identificador Acredor
 CreditorName=Nome acredor
 SEPAFillForm=(B) Cubra todos os campos marcados con *
 SEPAFormYourName=O seu nome
-SEPAFormYourBAN=IBAN da  súa conta bancaria
-SEPAFormYourBIC=BIC do seu banco
+SEPAFormYourBAN=Número internacional da súa conta bancaria (IBAN) 
+SEPAFormYourBIC=Código identificador do seu banco (BIC)
 SEPAFrstOrRecur=Tipo de pagamento
 ModeRECUR=Pago recorrente
 ModeFRST=Pago único
@@ -132,21 +133,21 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Data de execución
 CreateForSepa=Crear ficheiro de domiciliación bancaria
-ICS=Identificador de acreedor CI
+ICS=Identificador de acreedor CI para domiciliación bancaria
 ICSTransfer=Identificador de acredor CI para transferencia bancaria
 END_TO_END=Etiqueta XML SEPA "EndToEndId" - ID único asignada por transacción
 USTRD=Etiqueta SEPA XML "Unstructured"
 ADDDAYS=Engadir días á data de execución
-NoDefaultIBANFound=Non atopouse o IBAN deste terceiro
+NoDefaultIBANFound=Non atopouse o IBAN por defecto deste terceiro
 ### Notifications
 InfoCreditSubject=Abono de domiciliación %s polo banco
-InfoCreditMessage=A orde de domiciliación %s foi abonada polo banco<br>Data de abono: %s
+InfoCreditMessage=A  domiciliación %s foi abonada polo banco<br>Data de abono: %s
 InfoTransSubject=Envío de domiciliación %s ao banco
-InfoTransMessage=A orde de domiciliación %s foi enviada ao banco por %s %s.<br><br>
+InfoTransMessage=A domiciliación %s foi enviada ao banco por %s %s.<br><br>
 InfoTransData=Importe: %s<br>Método: %s<br>Data: %s
 InfoRejectSubject=Domiciliación devolta
 InfoRejectMessage=Bos días:<br><br>a domiciliación da factura %s por conta da empresa %s, cun importe de %s foi devolta polo banco.<br><br>--<br>%s
 ModeWarning=Non estableceuse a opción de modo real, deteremonos despois desta simulación
 ErrorCompanyHasDuplicateDefaultBAN=A empresa co identificador %s ten máis dunha conta bancaria predeterminada. Non hai xeito de saber cal usar.
-ErrorICSmissing=Falta o ICS na conta bancaria% s
+ErrorICSmissing=Falta o ICS na conta bancaria %s
 TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=A cantidade total da orde de domiciliación é distinta da suma das liñas
diff --git a/htdocs/langs/he_IL/accountancy.lang b/htdocs/langs/he_IL/accountancy.lang
index 354cddb62c2..27be673dd9c 100644
--- a/htdocs/langs/he_IL/accountancy.lang
+++ b/htdocs/langs/he_IL/accountancy.lang
@@ -158,7 +158,7 @@ ACCOUNTING_LENGTH_AACCOUNT=Length of the third-party accounting accounts (If you
 ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of an accounting account. Needed by some countries (like Switzerland). If set to off (default), you can set the following two parameters to ask the application to add virtual zeros.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties, break ability to search on a part of value)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
@@ -328,6 +328,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountanc
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
+NotifiedExportDate=Notified export date (modification of the entries will not be possible)
+NotifiedValidationDate=Validation of the entries (modification or deletion of the entries will not be possible)
+ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=Export draft journal
 Modelcsv=Model of export
 Selectmodelcsv=Select a model of export
diff --git a/htdocs/langs/he_IL/admin.lang b/htdocs/langs/he_IL/admin.lang
index 35a72174d39..c14a7d92f8a 100644
--- a/htdocs/langs/he_IL/admin.lang
+++ b/htdocs/langs/he_IL/admin.lang
@@ -221,8 +221,8 @@ NotCompatible=This module does not seem compatible with your Dolibarr %s (Min %s
 CompatibleAfterUpdate=This module requires an update to your Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=See in Market place
 SeeSetupOfModule=See setup of module %s
+SetOptionTo=Set option <b>%s</b> to %s
 Updated=Updated
-Nouveauté=Novelty
 AchatTelechargement=Buy / Download
 GoModuleSetupArea=To deploy/install a new module, go to the Module setup area: <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, במקום השוק הרשמי של מודולים Dolibarr ERP / CRM חיצוניות
@@ -399,6 +399,7 @@ SecurityToken=המפתח כתובות מאובטח
 NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
 PDF=PDF
 PDFDesc=Global options for PDF generation
+PDFOtherDesc=PDF Option specific to some modules
 PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
 PDFRulesForSalesTax=Rules for Sales Tax / VAT
@@ -561,7 +562,7 @@ Module53Desc=Management of Services
 Module54Name=Contracts/Subscriptions
 Module54Desc=Management of contracts (services or recurring subscriptions)
 Module55Name=ברקודים
-Module55Desc=ברקוד של ההנהלה
+Module55Desc=Barcode or QR code management
 Module56Name=Payment by credit transfer
 Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
 Module57Name=Payments by Direct Debit
@@ -848,10 +849,10 @@ Permission402=יצירה / שינוי הנחות
 Permission403=אמת הנחות
 Permission404=מחק את הנחות
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries (yours and subordinates)
-Permission512=Create/modify payments of salaries
-Permission514=Delete payments of salaries
-Permission517=Read payments of salaries of everybody
+Permission511=Read salaries and payments (yours and subordinates)
+Permission512=Create/modify salaries and payments
+Permission514=Delete salaries and payments
+Permission517=Read salaries and payments everybody
 Permission519=Export salaries
 Permission520=Read Loans
 Permission522=Create/modify loans
@@ -965,6 +966,8 @@ Permission23003=Delete Scheduled job
 Permission23004=Execute Scheduled job
 Permission50101=Use Point of Sale (SimplePOS)
 Permission50151=Use Point of Sale (TakePOS)
+Permission50152=Edit sales lines
+Permission50153=Edit ordered sales lines
 Permission50201=לקרוא עסקאות
 Permission50202=ייבוא ​​עסקאות
 Permission50330=Read objects of Zapier
@@ -1039,11 +1042,12 @@ DictionaryMeasuringUnits=Measuring Units
 DictionarySocialNetworks=Social Networks
 DictionaryProspectStatus=Prospect status for companies
 DictionaryProspectContactStatus=Prospect status for contacts
-DictionaryHolidayTypes=Types of leave
+DictionaryHolidayTypes=Leave - Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
 DictionaryTransportMode=Intracomm report - Transport mode
+DictionaryBatchStatus=Product lot/serial Quality Control status
 TypeOfUnit=Type of unit
 SetupSaved=הגדרת הציל
 SetupNotSaved=Setup not saved
@@ -1187,7 +1191,7 @@ SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of m
 SetupDescription5=Other Setup menu entries manage optional parameters.
 AuditedSecurityEvents=Security events that are audited
 NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
-Audit=ביקורת
+Audit=Security events
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
 InfoOS=About OS
@@ -1319,9 +1323,12 @@ ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
 NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
+ComboListOptim=Combo list loading optimization
 SearchOptim=Search optimization
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
-YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
+YouHaveXObjectUseComboOptim=You have %s %s in the database. You can go into setup of module to enable loading of combo list on key pressed event.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other.
+YouHaveXObjectUseSearchOptimDesc=This limits the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to %s in Home-Setup-Other.
 BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
 BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
 PHPModuleLoaded=PHP component %s is loaded
@@ -1433,6 +1440,7 @@ MemberMainOptions=אפשרויות עיקריות
 AdherentLoginRequired= ניהול התחברות לכל חבר
 AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=תיבת סימון לשלוח אישור בדואר לחברי (אימות או מנוי חדש) מופעלת כברירת מחדל
+MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
 MembersDocModules=Document templates for documents generated from member record
@@ -1763,7 +1771,7 @@ AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting men
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
-AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the scheduled job %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=לחץ כדי לחייג ההתקנה מודול
@@ -1979,6 +1987,8 @@ 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_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add picture on proposal line
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add electronic sign in PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
@@ -2096,7 +2106,6 @@ PDF_SHOW_PROJECT=Show project on document
 ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
-FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
@@ -2120,12 +2129,18 @@ ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by
 MailToSendEventOrganization=Event Organization
 AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
 YouShouldDisablePHPFunctions=You should disable PHP functions
-IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands in custom code, you shoud disable PHP functions
+PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
+NotRecommended=Not recommanded
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
 ModuleUpdateAvailable=An update is available
 NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
+RandomlySelectedIfSeveral=Randomly selected if several pictures are available
+DatabasePasswordObfuscated=Database password is obfuscated in conf file
+DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
diff --git a/htdocs/langs/he_IL/agenda.lang b/htdocs/langs/he_IL/agenda.lang
index 6f55525881b..8adee693c6b 100644
--- a/htdocs/langs/he_IL/agenda.lang
+++ b/htdocs/langs/he_IL/agenda.lang
@@ -4,7 +4,7 @@ Actions=Events
 Agenda=סדר היום
 TMenuAgenda=סדר היום
 Agendas=Agendas
-LocalAgenda=Internal calendar
+LocalAgenda=Default calendar
 ActionsOwnedBy=Event owned by
 ActionsOwnedByShort=Owner
 AffectedTo=Assigned to
@@ -14,13 +14,13 @@ EventsNb=Number of events
 ListOfActions=List of events
 EventReports=Event reports
 Location=Location
-ToUserOfGroup=Event assigned to any user in group
+ToUserOfGroup=Event assigned to any user in the group
 EventOnFullDay=Event on all day(s)
 MenuToDoActions=All incomplete events
 MenuDoneActions=All terminated events
 MenuToDoMyActions=My incomplete events
 MenuDoneMyActions=My terminated events
-ListOfEvents=List of events (internal calendar)
+ListOfEvents=List of events (default calendar)
 ActionsAskedBy=Events reported by
 ActionsToDoBy=Events assigned to
 ActionsDoneBy=Events done by
@@ -38,6 +38,7 @@ ActionsEvents=Events for which Dolibarr will create an action in agenda automati
 EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Third party %s created
+COMPANY_MODIFYInDolibarr=Third party %s modified
 COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=Contract %s validated
 CONTRACT_DELETEInDolibarr=Contract %s deleted
@@ -87,6 +88,7 @@ OrderDeleted=Order deleted
 InvoiceDeleted=Invoice deleted
 DraftInvoiceDeleted=Draft invoice deleted
 CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_MODIFYInDolibarr=Contact %s modified
 CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Product %s created
 PRODUCT_MODIFYInDolibarr=Product %s modified
@@ -119,6 +121,7 @@ MRP_MO_UNVALIDATEInDolibarr=MO set to draft status
 MRP_MO_PRODUCEDInDolibarr=MO produced
 MRP_MO_DELETEInDolibarr=MO deleted
 MRP_MO_CANCELInDolibarr=MO canceled
+PAIDInDolibarr=%s paid
 ##### End agenda events #####
 AgendaModelModule=Document templates for event
 DateActionStart=Start date
@@ -130,7 +133,7 @@ AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to use
 AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
 AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic events.
 AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> to include events of holidays.
-AgendaShowBirthdayEvents=Show birthdays of contacts
+AgendaShowBirthdayEvents=Birthdays of contacts
 AgendaHideBirthdayEvents=Hide birthdays of contacts
 Busy=Busy
 ExportDataset_event1=List of agenda events
@@ -152,6 +155,7 @@ ActionType=Event type
 DateActionBegin=Start event date
 ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b>?
 RepeatEvent=Repeat event
+OnceOnly=Once only
 EveryWeek=Every week
 EveryMonth=Every month
 DayOfMonth=Day of month
@@ -165,4 +169,4 @@ TimeType=Duration type
 ReminderType=Callback type
 AddReminder=Create an automatic reminder notification for this event
 ErrorReminderActionCommCreation=Error creating the reminder notification for this event
-BrowserPush=Browser Notification
+BrowserPush=Browser Popup Notification
diff --git a/htdocs/langs/he_IL/bills.lang b/htdocs/langs/he_IL/bills.lang
index 6eda2980f9d..a77ff0d76a3 100644
--- a/htdocs/langs/he_IL/bills.lang
+++ b/htdocs/langs/he_IL/bills.lang
@@ -259,6 +259,7 @@ DateMaxPayment=Payment due on
 DateInvoice=Invoice date
 DatePointOfTax=Point of tax
 NoInvoice=No invoice
+NoOpenInvoice=No open invoice
 ClassifyBill=Classify invoice
 SupplierBillsToPay=Unpaid vendor invoices
 CustomerBillsUnpaid=Unpaid customer invoices
@@ -589,3 +590,4 @@ FacParentLine=Invoice Line Parent
 SituationTotalRayToRest=Remainder to pay without taxe
 PDFSituationTitle=Situation n° %d
 SituationTotalProgress=Total progress %d %%
+SearchUnpaidInvoicesWithDueDate=Search unpaid invoices with a due date = %s
diff --git a/htdocs/langs/he_IL/cashdesk.lang b/htdocs/langs/he_IL/cashdesk.lang
index cac3bd4a977..72b2d4d5e6a 100644
--- a/htdocs/langs/he_IL/cashdesk.lang
+++ b/htdocs/langs/he_IL/cashdesk.lang
@@ -102,7 +102,7 @@ CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal numb
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
 SaleStartedAt=Sale started at %s
-ControlCashOpening=Control cash popup at opening POS
+ControlCashOpening=Open the "Control cash" popup when opening the POS
 CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -126,5 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
-ShowPriceHT = Display the price excluding tax column
-ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
+ShowPriceHT = Display the column with the price excluding tax (on screen)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
diff --git a/htdocs/langs/he_IL/compta.lang b/htdocs/langs/he_IL/compta.lang
index e139d48ecff..5d1558f3676 100644
--- a/htdocs/langs/he_IL/compta.lang
+++ b/htdocs/langs/he_IL/compta.lang
@@ -286,3 +286,9 @@ ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
 IncludeLoansInResults = Include loans in reports
+InvoiceLate30Days = Invoices late > 30 days
+InvoiceLate15Days = Invoices late > 15 days
+InvoiceLateMinus15Days = Invoices late
+InvoiceNotLate = To be collected < 15 days
+InvoiceNotLate15Days = To be collected in 15 days
+InvoiceNotLate30Days = To be collected in 30 days
diff --git a/htdocs/langs/he_IL/cron.lang b/htdocs/langs/he_IL/cron.lang
index 2ebdda1e685..4fd2220dea6 100644
--- a/htdocs/langs/he_IL/cron.lang
+++ b/htdocs/langs/he_IL/cron.lang
@@ -60,7 +60,7 @@ CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
 CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Disable
-CronTaskInactive=This job is disabled
+CronTaskInactive=This job is disabled (not scheduled)
 CronId=Id
 CronClassFile=Filename with class
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example 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>
diff --git a/htdocs/langs/he_IL/errors.lang b/htdocs/langs/he_IL/errors.lang
index 9b14b5ad1d2..670f8c7a6bc 100644
--- a/htdocs/langs/he_IL/errors.lang
+++ b/htdocs/langs/he_IL/errors.lang
@@ -11,6 +11,7 @@ ErrorBadValueForParamNotAString=Bad value for your parameter. It appends general
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s already exists.
 ErrorGroupAlreadyExists=Group %s already exists.
+ErrorEmailAlreadyExists=Email %s already exists.
 ErrorRecordNotFound=Record not found.
 ErrorFailToCopyFile=Failed to copy file '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
@@ -117,7 +118,7 @@ ErrorCantReadFile=Failed to read file '%s'
 ErrorCantReadDir=Failed to read directory '%s'
 ErrorBadLoginPassword=Bad value for login or password
 ErrorLoginDisabled=Your account has been disabled
-ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server. If PHP <b>Safe Mode</b> is enabled, check that command is inside a directory defined by parameter <b>safe_mode_exec_dir</b>.
+ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server user. Check also the command is not protected on shell level by a security layer like apparmor.
 ErrorFailedToChangePassword=Failed to change password
 ErrorLoginDoesNotExists=User with login <b>%s</b> could not be found.
 ErrorLoginHasNoEmail=This user has no email address. Process aborted.
@@ -262,6 +263,7 @@ ErrorDateIsInFuture=Error, the date can't be in the future
 ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
 ErrorAPercentIsRequired=Error, please fill in the percentage correctly
 ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
+ErrorFailedToFindEmailTemplate=Failed to find template with code name %s
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -298,3 +300,4 @@ WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So y
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
+ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
diff --git a/htdocs/langs/he_IL/eventorganization.lang b/htdocs/langs/he_IL/eventorganization.lang
index 75b798fbc3a..335c257b224 100644
--- a/htdocs/langs/he_IL/eventorganization.lang
+++ b/htdocs/langs/he_IL/eventorganization.lang
@@ -1,4 +1,5 @@
 # Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+# Copyright (C) 2021		Dorian Vabre			<dorian.vabre@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
@@ -81,7 +82,10 @@ PriceOfBoothHelp=Subscription price to stand a booth
 EventOrganizationICSLink=Link ICS for events
 ConferenceOrBoothInformation=Conference Or Booth informations
 Attendees = Attendees
+DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
 #
 # Status
 #
@@ -94,8 +98,46 @@ EvntOrgCancelled = Cancelled
 #
 # Public page
 #
+SuggestForm = Suggestion page
+RegisterPage = Page for conferences or booth
+EvntOrgRegistrationHelpMessage = Here, you can vote for an event, or suggest a new conference or booth for the project
+EvntOrgRegistrationConfHelpMessage = Here, you can suggest a new conference for the project
+EvntOrgRegistrationBoothHelpMessage = Here, you can suggest a new booth for the project
+ListOfSuggestedConferences = List of suggested conferences
+ListOfSuggestedBooths = List of suggested booths
+SuggestConference = Suggest a new conference
+SuggestBooth = Suggest a booth
+ViewAndVote = View and vote for suggested events
 PublicAttendeeSubscriptionPage = Public link of registration to a conference
 MissingOrBadSecureKey = The security key is invalid or missing
-EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
-EvntOrgStartDuration = This conference starts on
-EvntOrgEndDuration =  and ends on
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference : '%s'
+EvntOrgDuration = This conference starts on %s and ends on %s.
+ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
+BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
+EventType = Event type
+
+#
+# Vote page
+#
+EvntOrgRegistrationWelcomeMessage = Welcome on the conference or booth suggestion page.
+EvntOrgRegistrationConfWelcomeMessage = Welcome on the conference suggestion page.
+EvntOrgRegistrationBoothWelcomeMessage = Welcome on the booth suggestion page.
+EvntOrgVoteHelpMessage = Here, you can view and vote for the suggested events for the project
+VoteOk = Your vote has been accepted.
+AlreadyVoted = You have already voted for this event.
+VoteError = An error has occurred during the vote, please try again.
+
+#
+# SubscriptionOk page
+#
+SubscriptionOk = Your subscription to this conference has been validated
+#
+# Subscription validation mail
+#
+ConfAttendeeSubscriptionConfirmation = Confirmation of your subscription to a conference
+#
+# Payment page
+#
+Attendee = Attendee
+PaymentConferenceAttendee = Conference attendee payment
+PaymentBoothLocation = Booth location payment
diff --git a/htdocs/langs/he_IL/hrm.lang b/htdocs/langs/he_IL/hrm.lang
index 3b8f137e103..da098e10bdb 100644
--- a/htdocs/langs/he_IL/hrm.lang
+++ b/htdocs/langs/he_IL/hrm.lang
@@ -9,7 +9,7 @@ ConfirmDeleteEstablishment=Are you sure you wish to delete this establishment?
 OpenEtablishment=Open establishment
 CloseEtablishment=Close establishment
 # Dictionary
-DictionaryPublicHolidays=HRM - Public holidays
+DictionaryPublicHolidays=Leave - Public holidays
 DictionaryDepartment=HRM - Department list
 DictionaryFunction=HRM - Job positions
 # Module
diff --git a/htdocs/langs/he_IL/knowledgemanagement.lang b/htdocs/langs/he_IL/knowledgemanagement.lang
index 269007e60f8..68f5cced76c 100644
--- a/htdocs/langs/he_IL/knowledgemanagement.lang
+++ b/htdocs/langs/he_IL/knowledgemanagement.lang
@@ -47,7 +47,7 @@ KnowledgeManagementArea = Knowledge Management
 # Menu
 #
 MenuKnowledgeRecord = Knowledge base
-ListOfArticles = List of articles
+ListKnowledgeRecord = List of articles
 NewKnowledgeRecord = New article
 ValidateReply = Validate solution
 KnowledgeRecords = Articles
diff --git a/htdocs/langs/he_IL/languages.lang b/htdocs/langs/he_IL/languages.lang
index 4e177f741af..ee261437df0 100644
--- a/htdocs/langs/he_IL/languages.lang
+++ b/htdocs/langs/he_IL/languages.lang
@@ -3,6 +3,7 @@ Language_am_ET=Ethiopian
 Language_ar_AR=ערבית
 Language_ar_EG=Arabic (Egypt)
 Language_ar_SA=ערבית
+Language_ar_TN=Arabic (Tunisia)
 Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengali
 Language_bn_IN=Bengali (India)
@@ -84,6 +85,7 @@ Language_nl_NL=Dutch
 Language_pl_PL=פולני
 Language_pt_BR=פורטוגזית (ברזיל)
 Language_pt_PT=פורטוגזית
+Language_ro_MD=Romanian (Moldavia)
 Language_ro_RO=רומני
 Language_ru_RU=רוסי
 Language_ru_UA=רוסי (אוקראינה)
diff --git a/htdocs/langs/he_IL/main.lang b/htdocs/langs/he_IL/main.lang
index 059b7dff74b..a596b082768 100644
--- a/htdocs/langs/he_IL/main.lang
+++ b/htdocs/langs/he_IL/main.lang
@@ -430,6 +430,7 @@ LT1IN=CGST
 LT2IN=SGST
 LT1GC=Additionnal cents
 VATRate=Tax Rate
+RateOfTaxN=Rate of tax %s
 VATCode=Tax Rate code
 VATNPR=Tax Rate NPR
 DefaultTaxRate=Default tax rate
@@ -729,6 +730,7 @@ MenuMembers=משתמשים
 MenuAgendaGoogle=Google agenda
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
+ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
 NoFileFound=No documents uploaded
 CurrentUserLanguage=Current language
 CurrentTheme=Current theme
@@ -1072,6 +1074,7 @@ ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
 ToClose=To close
+ToRefuse=To refuse
 ToProcess=To process
 ToApprove=To approve
 GlobalOpenedElemView=Global view
@@ -1126,9 +1129,11 @@ UpdateForAllLines=Update for all lines
 OnHold=On hold
 Civility=Civility
 AffectTag=Affect Tag
+CreateExternalUser=Create external user
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
 ConfirmCancel=Are you sure you want to cancel
+EmailMsgID=Email MsgID
diff --git a/htdocs/langs/he_IL/members.lang b/htdocs/langs/he_IL/members.lang
index ee6e7eb56e9..f1c0d9b3426 100644
--- a/htdocs/langs/he_IL/members.lang
+++ b/htdocs/langs/he_IL/members.lang
@@ -213,3 +213,5 @@ SendReminderForExpiredSubscription=Send reminder by email to members when subscr
 MembershipPaid=Membership paid for current period (until %s)
 YouMayFindYourInvoiceInThisEmail=You may find your invoice attached to this email
 XMembersClosed=%s member(s) closed
+XExternalUserCreated=%s external user(s) created
+ForceMemberNature=Force member nature (Individual or Corporation)
diff --git a/htdocs/langs/he_IL/modulebuilder.lang b/htdocs/langs/he_IL/modulebuilder.lang
index 9fdaa1a533a..23a098be2e5 100644
--- a/htdocs/langs/he_IL/modulebuilder.lang
+++ b/htdocs/langs/he_IL/modulebuilder.lang
@@ -143,3 +143,4 @@ AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
 ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
+ImportExportProfiles=Import and export profiles
diff --git a/htdocs/langs/he_IL/mrp.lang b/htdocs/langs/he_IL/mrp.lang
index ec999a473a4..2414a92cefb 100644
--- a/htdocs/langs/he_IL/mrp.lang
+++ b/htdocs/langs/he_IL/mrp.lang
@@ -8,12 +8,12 @@ MenuBOM=Bills of material
 LatestBOMModified=Latest %s Bills of materials modified
 LatestMOModified=Latest %s Manufacturing Orders modified
 Bom=Bills of Material
-BillOfMaterials=Bill of Material
+BillOfMaterials=Bill of Materials
 BOMsSetup=Setup of module BOM
 ListOfBOMs=List of bills of material - BOM
 ListOfManufacturingOrders=List of Manufacturing Orders
-NewBOM=New bill of material
-ProductBOMHelp=Product to create with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
+NewBOM=New bill of materials
+ProductBOMHelp=Product to create (or disassemble) with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
 BOMsNumberingModules=BOM numbering templates
 BOMsModelModule=BOM document templates
 MOsNumberingModules=MO numbering templates
@@ -22,7 +22,7 @@ FreeLegalTextOnBOMs=Free text on document of BOM
 WatermarkOnDraftBOMs=Watermark on draft BOM
 FreeLegalTextOnMOs=Free text on document of MO
 WatermarkOnDraftMOs=Watermark on draft MO
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials %s ?
 ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
 ManufacturingEfficiency=Manufacturing efficiency
 ConsumptionEfficiency=Consumption efficiency
@@ -30,8 +30,8 @@ ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the produc
 ValueOfMeansLossForProductProduced=Value of 0.95 means an average of 5%% of loss of produced product
 DeleteBillOfMaterials=Delete Bill Of Materials
 DeleteMo=Delete Manufacturing Order
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Materials?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Materials?
 MenuMRP=Manufacturing Orders
 NewMO=New Manufacturing Order
 QtyToProduce=Qty to produce
@@ -39,7 +39,7 @@ DateStartPlannedMo=Date start planned
 DateEndPlannedMo=Date end planned
 KeepEmptyForAsap=Empty means 'As Soon As Possible'
 EstimatedDuration=Estimated duration
-EstimatedDurationDesc=Estimated duration to manufacture this product using this BOM
+EstimatedDurationDesc=Estimated duration to manufacture (or disassemble) this product using this BOM
 ConfirmValidateBom=Are you sure you want to validate the BOM with the reference <strong>%s</strong> (you will be able to use it to build new Manufacturing Orders)
 ConfirmCloseBom=Are you sure you want to cancel this BOM (you won't be able to use it to build new Manufacturing Orders anymore) ?
 ConfirmReopenBom=Are you sure you want to re-open this BOM (you will be able to use it to build new Manufacturing Orders)
@@ -63,13 +63,14 @@ ConsumeAndProduceAll=Consume and Produce All
 Manufactured=Manufactured
 TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
 ForAQuantityOf=For a quantity to produce of %s
+ForAQuantityToConsumeOf=For a quantity to disassemble of %s
 ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
 ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
 ProductionForRef=Production of %s
 AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
 NoStockChangeOnServices=No stock change on services
 ProductQtyToConsumeByMO=Product quantity still to consume by open MO
-ProductQtyToProduceByMO=Product quentity still to produce by open MO
+ProductQtyToProduceByMO=Product quantity still to produce by open MO
 AddNewConsumeLines=Add new line to consume
 ProductsToConsume=Products to consume
 ProductsToProduce=Products to produce
@@ -83,15 +84,13 @@ Workstations=Workstations
 WorkstationsDescription=Workstations management
 WorkstationSetup = Workstations setup
 WorkstationSetupPage = Workstations setup page
-WorkstationAbout = About Workstation
-WorkstationAboutPage = Workstations about page
 WorkstationList=Workstation list
 WorkstationCreate=Add new workstation
 ConfirmEnableWorkstation=Are you sure you want to enable workstation <b>%s</b> ?
 EnableAWorkstation=Enable a workstation
 ConfirmDisableWorkstation=Are you sure you want to disable workstation <b>%s</b> ?
 DisableAWorkstation=Disable a workstation
-DeleteWorkstation=Supprimer
+DeleteWorkstation=Delete
 NbOperatorsRequired=Number of operators required
 THMOperatorEstimated=Estimated operator THM
 THMMachineEstimated=Estimated machine THM
diff --git a/htdocs/langs/he_IL/orders.lang b/htdocs/langs/he_IL/orders.lang
index 271fe5e3894..c3800d63d31 100644
--- a/htdocs/langs/he_IL/orders.lang
+++ b/htdocs/langs/he_IL/orders.lang
@@ -11,6 +11,7 @@ OrderDate=Order date
 OrderDateShort=Order date
 OrderToProcess=Order to process
 NewOrder=New order
+NewSupplierOrderShort=New order
 NewOrderSupplier=New Purchase Order
 ToOrder=Make order
 MakeOrder=Make order
@@ -73,6 +74,7 @@ DeleteOrder=Delete order
 CancelOrder=Cancel order
 OrderReopened= Order %s re-open
 AddOrder=Create order
+AddSupplierOrderShort=Create order
 AddPurchaseOrder=Create purchase order
 AddToDraftOrders=Add to draft order
 ShowOrder=Show order
diff --git a/htdocs/langs/he_IL/other.lang b/htdocs/langs/he_IL/other.lang
index 00bb942376f..c1504746b39 100644
--- a/htdocs/langs/he_IL/other.lang
+++ b/htdocs/langs/he_IL/other.lang
@@ -129,6 +129,7 @@ ClosedByLogin=User login who closed
 FileWasRemoved=File %s was removed
 DirWasRemoved=Directory %s was removed
 FeatureNotYetAvailable=Feature not yet available in the current version
+FeatureNotAvailableOnDevicesWithoutMouse=Feature not available on devices without mouse
 FeaturesSupported=Supported features
 Width=Width
 Height=Height
@@ -263,7 +264,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
-PrefixSession=Prefix for session ID
+SuffixSessionName=Suffix for session name
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/he_IL/partnership.lang b/htdocs/langs/he_IL/partnership.lang
index 09059995a8d..2fb10e8159e 100644
--- a/htdocs/langs/he_IL/partnership.lang
+++ b/htdocs/langs/he_IL/partnership.lang
@@ -16,41 +16,72 @@
 #
 # Generic
 #
-ModulePartnershipName = Partnership management
-PartnershipDescription = Module Partnership management
+ModulePartnershipName=Partnership management
+PartnershipDescription=Module Partnership management
 PartnershipDescriptionLong= Module Partnership management
 
+AddPartnership=Add partnership
+CancelPartnershipForExpiredMembers=Partnership: Cancel partnership of members with expired subscriptions
+PartnershipCheckBacklink=Partnership: Check referring backlink
+
 #
 # Menu
 #
-NewPartnership = New Partnership
-ListOfPartnerships = List of partnership
+NewPartnership=New Partnership
+ListOfPartnerships=List of partnership
 
 #
 # Admin page
 #
-PartnershipSetup = Partnership setup
-PartnershipAbout = About Partnership
-PartnershipAboutPage = Partnership about page
-
+PartnershipSetup=Partnership setup
+PartnershipAbout=About Partnership
+PartnershipAboutPage=Partnership about page
+partnershipforthirdpartyormember=Partner status must be set on a 'thirdparty' or a 'member'
+PARTNERSHIP_IS_MANAGED_FOR=Partnership managed for
+PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks to check
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb of days before cancelling status of a partnership when a subscription has expired
+ReferingWebsiteCheck=Check of website referring
+ReferingWebsiteCheckDesc=You can enable a feature to check that your partners has added a backlink to your website domains on their own website.
 
 #
 # Object
 #
+DeletePartnership=Delete a partnership
+PartnershipDedicatedToThisThirdParty=Partnership dedicated to this third party
+PartnershipDedicatedToThisMember=Partnership dedicated to this member
 DatePartnershipStart=Start date
 DatePartnershipEnd=End date
+ReasonDecline=Decline reason
+ReasonDeclineOrCancel=Decline reason
+PartnershipAlreadyExist=Partnership already exist
+ManagePartnership=Manage partnership
+BacklinkNotFoundOnPartnerWebsite=Backlink not found on partner website
+ConfirmClosePartnershipAsk=Are you sure you want to cancel this partnership?
+PartnershipType=Partnership type
 
 #
 # Template Mail
 #
+SendingEmailOnPartnershipWillSoonBeCanceled=Partnership will soon be canceled
+SendingEmailOnPartnershipRefused=Partnership refused
+SendingEmailOnPartnershipAccepted=Partnership accepted
+SendingEmailOnPartnershipCanceled=Partnership canceled
 
+YourPartnershipWillSoonBeCanceledTopic=Partnership will soon be canceled
+YourPartnershipRefusedTopic=Partnership refused
+YourPartnershipAcceptedTopic=Partnership accepted
+YourPartnershipCanceledTopic=Partnership canceled
+
+YourPartnershipWillSoonBeCanceledContent=We inform you that your partnership will soon be canceled (Backlink not found)
+YourPartnershipRefusedContent=We inform you that your partnership request has been refused.
+YourPartnershipAcceptedContent=We inform you that your partnership request has been accepted.
+YourPartnershipCanceledContent=We inform you that your partnership has been canceled.
 
 #
 # Status
 #
-PartnershipDraft = Draft
-PartnershipAccepted = Accepted
-PartnershipRefused = Refused
-PartnershipCanceled = Canceled
-
+PartnershipDraft=Draft
+PartnershipAccepted=Accepted
+PartnershipRefused=Refused
+PartnershipCanceled=Canceled
 PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/he_IL/productbatch.lang b/htdocs/langs/he_IL/productbatch.lang
index dee07e65a9f..d4e69c4df42 100644
--- a/htdocs/langs/he_IL/productbatch.lang
+++ b/htdocs/langs/he_IL/productbatch.lang
@@ -1,4 +1,4 @@
-# ProductBATCH language file - en_US - ProductBATCH
+# ProductBATCH language file - Source file is en_US - ProductBATCH
 ManageLotSerial=Use lot/serial number
 ProductStatusOnBatch=Yes (lot required)
 ProductStatusOnSerial=Yes (unique serial number required)
@@ -33,3 +33,13 @@ CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+LifeTime=Life span (in days)
+EndOfLife=End of life
+ManufacturingDate=Manufacturing date
+DestructionDate=Destruction date
+FirstUseDate=First use date
+QCFrequency=Quality control frequency (in days)
+
+#Traceability - qc status
+OutOfOrder=Out of order
+InWorkingOrder=In working order
diff --git a/htdocs/langs/he_IL/products.lang b/htdocs/langs/he_IL/products.lang
index 943d53a253c..10dcff359e1 100644
--- a/htdocs/langs/he_IL/products.lang
+++ b/htdocs/langs/he_IL/products.lang
@@ -396,3 +396,5 @@ ActionAvailableOnVariantProductOnly=Action only available on the variant of prod
 ProductsPricePerCustomer=Product prices per customers
 ProductSupplierExtraFields=Additional Attributes (Supplier Prices)
 DeleteLinkedProduct=Delete the child product linked to the combination
+PMPValue=Weighted average price
+PMPValueShort=WAP
diff --git a/htdocs/langs/he_IL/projects.lang b/htdocs/langs/he_IL/projects.lang
index d513bf8c6a8..3156a67367e 100644
--- a/htdocs/langs/he_IL/projects.lang
+++ b/htdocs/langs/he_IL/projects.lang
@@ -267,9 +267,11 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=New invoice
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+OneLinePerTimeSpentLine=One line for each time spent declaration
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
 AddPersonToTask=Add also to tasks
 UsageOrganizeEvent=Usage: Event Organization
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
+SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
diff --git a/htdocs/langs/he_IL/receptions.lang b/htdocs/langs/he_IL/receptions.lang
index 760ff884fa0..338602e722e 100644
--- a/htdocs/langs/he_IL/receptions.lang
+++ b/htdocs/langs/he_IL/receptions.lang
@@ -44,4 +44,4 @@ ValidateOrderFirstBeforeReception=You must first validate the order before being
 ReceptionsNumberingModules=Numbering module for receptions
 ReceptionsReceiptModel=Document templates for receptions
 NoMorePredefinedProductToDispatch=No more predefined products to dispatch
-
+ReceptionExist=A reception exists
diff --git a/htdocs/langs/he_IL/stocks.lang b/htdocs/langs/he_IL/stocks.lang
index ff391169159..0d5805b1091 100644
--- a/htdocs/langs/he_IL/stocks.lang
+++ b/htdocs/langs/he_IL/stocks.lang
@@ -56,8 +56,6 @@ UnitPurchaseValue=Unit purchase price
 StockTooLow=Stock too low
 StockLowerThanLimit=Stock lower than alert limit (%s)
 EnhancedValue=Value
-PMPValue=Weighted average price
-PMPValueShort=WAP
 EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
@@ -251,7 +249,10 @@ SelectAStockMovementFileToImport=select a stock movement file to import
 InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
 LabelOfInventoryMovemement=Inventory %s
 ReOpen=Reopen
-ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock to the real qty you entered into the inventory.
 ObjectNotFound=%s not found
 MakeMovementsAndClose=Generate movements and close
 AutofillWithExpected=Fill real quantity with expected quantity
+ShowAllBatchByDefault=By default, show batch details on product "stock" tab
+CollapseBatchDetailHelp=You can set batch detail default display in stocks module configuration
+FieldCannotBeNegative=Field "%s" cannot be negative
diff --git a/htdocs/langs/he_IL/ticket.lang b/htdocs/langs/he_IL/ticket.lang
index e9e3b33d874..e9178cf173e 100644
--- a/htdocs/langs/he_IL/ticket.lang
+++ b/htdocs/langs/he_IL/ticket.lang
@@ -304,7 +304,7 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
-BoxTicketType=Number of open tickets by type
+BoxTicketType=Distribution of open tickets by type
 BoxTicketSeverity=Number of open tickets by severity
 BoxNoTicketSeverity=No tickets opened
 BoxTicketLastXDays=Number of new tickets by days the last %s days
diff --git a/htdocs/langs/hi_IN/accountancy.lang b/htdocs/langs/hi_IN/accountancy.lang
index a1f495e3e97..8dbecd81efe 100644
--- a/htdocs/langs/hi_IN/accountancy.lang
+++ b/htdocs/langs/hi_IN/accountancy.lang
@@ -158,7 +158,7 @@ ACCOUNTING_LENGTH_AACCOUNT=Length of the third-party accounting accounts (If you
 ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of an accounting account. Needed by some countries (like Switzerland). If set to off (default), you can set the following two parameters to ask the application to add virtual zeros.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties, break ability to search on a part of value)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
@@ -328,6 +328,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountanc
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
+NotifiedExportDate=Notified export date (modification of the entries will not be possible)
+NotifiedValidationDate=Validation of the entries (modification or deletion of the entries will not be possible)
+ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=Export draft journal
 Modelcsv=Model of export
 Selectmodelcsv=Select a model of export
diff --git a/htdocs/langs/hi_IN/admin.lang b/htdocs/langs/hi_IN/admin.lang
index 04e6488ded4..6fe157bc675 100644
--- a/htdocs/langs/hi_IN/admin.lang
+++ b/htdocs/langs/hi_IN/admin.lang
@@ -221,8 +221,8 @@ NotCompatible=This module does not seem compatible with your Dolibarr %s (Min %s
 CompatibleAfterUpdate=This module requires an update to your Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=See in Market place
 SeeSetupOfModule=See setup of module %s
+SetOptionTo=Set option <b>%s</b> to %s
 Updated=Updated
-Nouveauté=Novelty
 AchatTelechargement=Buy / Download
 GoModuleSetupArea=To deploy/install a new module, go to the Module setup area: <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
@@ -399,6 +399,7 @@ SecurityToken=Key to secure URLs
 NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
 PDF=PDF
 PDFDesc=Global options for PDF generation
+PDFOtherDesc=PDF Option specific to some modules
 PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
 PDFRulesForSalesTax=Rules for Sales Tax / VAT
@@ -561,7 +562,7 @@ Module53Desc=Management of Services
 Module54Name=Contracts/Subscriptions
 Module54Desc=Management of contracts (services or recurring subscriptions)
 Module55Name=Barcodes
-Module55Desc=Barcode management
+Module55Desc=Barcode or QR code management
 Module56Name=Payment by credit transfer
 Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
 Module57Name=Payments by Direct Debit
@@ -848,10 +849,10 @@ Permission402=Create/modify discounts
 Permission403=Validate discounts
 Permission404=Delete discounts
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries (yours and subordinates)
-Permission512=Create/modify payments of salaries
-Permission514=Delete payments of salaries
-Permission517=Read payments of salaries of everybody
+Permission511=Read salaries and payments (yours and subordinates)
+Permission512=Create/modify salaries and payments
+Permission514=Delete salaries and payments
+Permission517=Read salaries and payments everybody
 Permission519=Export salaries
 Permission520=Read Loans
 Permission522=Create/modify loans
@@ -965,6 +966,8 @@ Permission23003=Delete Scheduled job
 Permission23004=Execute Scheduled job
 Permission50101=Use Point of Sale (SimplePOS)
 Permission50151=Use Point of Sale (TakePOS)
+Permission50152=Edit sales lines
+Permission50153=Edit ordered sales lines
 Permission50201=Read transactions
 Permission50202=Import transactions
 Permission50330=Read objects of Zapier
@@ -1039,11 +1042,12 @@ DictionaryMeasuringUnits=Measuring Units
 DictionarySocialNetworks=Social Networks
 DictionaryProspectStatus=Prospect status for companies
 DictionaryProspectContactStatus=Prospect status for contacts
-DictionaryHolidayTypes=Types of leave
+DictionaryHolidayTypes=Leave - Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
 DictionaryTransportMode=Intracomm report - Transport mode
+DictionaryBatchStatus=Product lot/serial Quality Control status
 TypeOfUnit=Type of unit
 SetupSaved=Setup saved
 SetupNotSaved=Setup not saved
@@ -1187,7 +1191,7 @@ SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of m
 SetupDescription5=Other Setup menu entries manage optional parameters.
 AuditedSecurityEvents=Security events that are audited
 NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
-Audit=Audit
+Audit=Security events
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
 InfoOS=About OS
@@ -1319,9 +1323,12 @@ ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
 NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
+ComboListOptim=Combo list loading optimization
 SearchOptim=Search optimization
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
-YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
+YouHaveXObjectUseComboOptim=You have %s %s in the database. You can go into setup of module to enable loading of combo list on key pressed event.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other.
+YouHaveXObjectUseSearchOptimDesc=This limits the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to %s in Home-Setup-Other.
 BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
 BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
 PHPModuleLoaded=PHP component %s is loaded
@@ -1433,6 +1440,7 @@ MemberMainOptions=Main options
 AdherentLoginRequired= Manage a Login for each member
 AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
+MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
 MembersDocModules=Document templates for documents generated from member record
@@ -1763,7 +1771,7 @@ AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting men
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
-AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the scheduled job %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
@@ -1979,6 +1987,8 @@ 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_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add picture on proposal line
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add electronic sign in PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
@@ -2096,7 +2106,6 @@ PDF_SHOW_PROJECT=Show project on document
 ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
-FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
@@ -2120,12 +2129,18 @@ ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by
 MailToSendEventOrganization=Event Organization
 AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
 YouShouldDisablePHPFunctions=You should disable PHP functions
-IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands in custom code, you shoud disable PHP functions
+PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
+NotRecommended=Not recommanded
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
 ModuleUpdateAvailable=An update is available
 NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
+RandomlySelectedIfSeveral=Randomly selected if several pictures are available
+DatabasePasswordObfuscated=Database password is obfuscated in conf file
+DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
diff --git a/htdocs/langs/hi_IN/agenda.lang b/htdocs/langs/hi_IN/agenda.lang
index 09d82139a49..a1183841b00 100644
--- a/htdocs/langs/hi_IN/agenda.lang
+++ b/htdocs/langs/hi_IN/agenda.lang
@@ -4,7 +4,7 @@ Actions=Events
 Agenda=Agenda
 TMenuAgenda=Agenda
 Agendas=Agendas
-LocalAgenda=Internal calendar
+LocalAgenda=Default calendar
 ActionsOwnedBy=Event owned by
 ActionsOwnedByShort=Owner
 AffectedTo=Assigned to
@@ -14,13 +14,13 @@ EventsNb=Number of events
 ListOfActions=List of events
 EventReports=Event reports
 Location=Location
-ToUserOfGroup=Event assigned to any user in group
+ToUserOfGroup=Event assigned to any user in the group
 EventOnFullDay=Event on all day(s)
 MenuToDoActions=All incomplete events
 MenuDoneActions=All terminated events
 MenuToDoMyActions=My incomplete events
 MenuDoneMyActions=My terminated events
-ListOfEvents=List of events (internal calendar)
+ListOfEvents=List of events (default calendar)
 ActionsAskedBy=Events reported by
 ActionsToDoBy=Events assigned to
 ActionsDoneBy=Events done by
@@ -38,6 +38,7 @@ ActionsEvents=Events for which Dolibarr will create an action in agenda automati
 EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Third party %s created
+COMPANY_MODIFYInDolibarr=Third party %s modified
 COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=Contract %s validated
 CONTRACT_DELETEInDolibarr=Contract %s deleted
@@ -87,6 +88,7 @@ OrderDeleted=Order deleted
 InvoiceDeleted=Invoice deleted
 DraftInvoiceDeleted=Draft invoice deleted
 CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_MODIFYInDolibarr=Contact %s modified
 CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Product %s created
 PRODUCT_MODIFYInDolibarr=Product %s modified
@@ -119,6 +121,7 @@ MRP_MO_UNVALIDATEInDolibarr=MO set to draft status
 MRP_MO_PRODUCEDInDolibarr=MO produced
 MRP_MO_DELETEInDolibarr=MO deleted
 MRP_MO_CANCELInDolibarr=MO canceled
+PAIDInDolibarr=%s paid
 ##### End agenda events #####
 AgendaModelModule=Document templates for event
 DateActionStart=Start date
@@ -130,7 +133,7 @@ AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to use
 AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
 AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic events.
 AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> to include events of holidays.
-AgendaShowBirthdayEvents=Show birthdays of contacts
+AgendaShowBirthdayEvents=Birthdays of contacts
 AgendaHideBirthdayEvents=Hide birthdays of contacts
 Busy=Busy
 ExportDataset_event1=List of agenda events
@@ -152,6 +155,7 @@ ActionType=Event type
 DateActionBegin=Start event date
 ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b>?
 RepeatEvent=Repeat event
+OnceOnly=Once only
 EveryWeek=Every week
 EveryMonth=Every month
 DayOfMonth=Day of month
@@ -165,4 +169,4 @@ TimeType=Duration type
 ReminderType=Callback type
 AddReminder=Create an automatic reminder notification for this event
 ErrorReminderActionCommCreation=Error creating the reminder notification for this event
-BrowserPush=Browser Notification
+BrowserPush=Browser Popup Notification
diff --git a/htdocs/langs/hi_IN/bills.lang b/htdocs/langs/hi_IN/bills.lang
index c55f483873b..7b8c997d2e6 100644
--- a/htdocs/langs/hi_IN/bills.lang
+++ b/htdocs/langs/hi_IN/bills.lang
@@ -259,6 +259,7 @@ DateMaxPayment=Payment due on
 DateInvoice=Invoice date
 DatePointOfTax=Point of tax
 NoInvoice=No invoice
+NoOpenInvoice=No open invoice
 ClassifyBill=Classify invoice
 SupplierBillsToPay=Unpaid vendor invoices
 CustomerBillsUnpaid=Unpaid customer invoices
@@ -589,3 +590,4 @@ FacParentLine=Invoice Line Parent
 SituationTotalRayToRest=Remainder to pay without taxe
 PDFSituationTitle=Situation n° %d
 SituationTotalProgress=Total progress %d %%
+SearchUnpaidInvoicesWithDueDate=Search unpaid invoices with a due date = %s
diff --git a/htdocs/langs/hi_IN/cashdesk.lang b/htdocs/langs/hi_IN/cashdesk.lang
index 240503842f3..aea1f02f834 100644
--- a/htdocs/langs/hi_IN/cashdesk.lang
+++ b/htdocs/langs/hi_IN/cashdesk.lang
@@ -102,7 +102,7 @@ CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal numb
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
 SaleStartedAt=Sale started at %s
-ControlCashOpening=Control cash popup at opening POS
+ControlCashOpening=Open the "Control cash" popup when opening the POS
 CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -126,5 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
-ShowPriceHT = Display the price excluding tax column
-ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
+ShowPriceHT = Display the column with the price excluding tax (on screen)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
diff --git a/htdocs/langs/hi_IN/compta.lang b/htdocs/langs/hi_IN/compta.lang
index 7cae82e6ac7..8329346c163 100644
--- a/htdocs/langs/hi_IN/compta.lang
+++ b/htdocs/langs/hi_IN/compta.lang
@@ -286,3 +286,9 @@ ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
 IncludeLoansInResults = Include loans in reports
+InvoiceLate30Days = Invoices late > 30 days
+InvoiceLate15Days = Invoices late > 15 days
+InvoiceLateMinus15Days = Invoices late
+InvoiceNotLate = To be collected < 15 days
+InvoiceNotLate15Days = To be collected in 15 days
+InvoiceNotLate30Days = To be collected in 30 days
diff --git a/htdocs/langs/hi_IN/cron.lang b/htdocs/langs/hi_IN/cron.lang
index 2ebdda1e685..4fd2220dea6 100644
--- a/htdocs/langs/hi_IN/cron.lang
+++ b/htdocs/langs/hi_IN/cron.lang
@@ -60,7 +60,7 @@ CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
 CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Disable
-CronTaskInactive=This job is disabled
+CronTaskInactive=This job is disabled (not scheduled)
 CronId=Id
 CronClassFile=Filename with class
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example 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>
diff --git a/htdocs/langs/hi_IN/errors.lang b/htdocs/langs/hi_IN/errors.lang
index 9b14b5ad1d2..670f8c7a6bc 100644
--- a/htdocs/langs/hi_IN/errors.lang
+++ b/htdocs/langs/hi_IN/errors.lang
@@ -11,6 +11,7 @@ ErrorBadValueForParamNotAString=Bad value for your parameter. It appends general
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s already exists.
 ErrorGroupAlreadyExists=Group %s already exists.
+ErrorEmailAlreadyExists=Email %s already exists.
 ErrorRecordNotFound=Record not found.
 ErrorFailToCopyFile=Failed to copy file '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
@@ -117,7 +118,7 @@ ErrorCantReadFile=Failed to read file '%s'
 ErrorCantReadDir=Failed to read directory '%s'
 ErrorBadLoginPassword=Bad value for login or password
 ErrorLoginDisabled=Your account has been disabled
-ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server. If PHP <b>Safe Mode</b> is enabled, check that command is inside a directory defined by parameter <b>safe_mode_exec_dir</b>.
+ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server user. Check also the command is not protected on shell level by a security layer like apparmor.
 ErrorFailedToChangePassword=Failed to change password
 ErrorLoginDoesNotExists=User with login <b>%s</b> could not be found.
 ErrorLoginHasNoEmail=This user has no email address. Process aborted.
@@ -262,6 +263,7 @@ ErrorDateIsInFuture=Error, the date can't be in the future
 ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
 ErrorAPercentIsRequired=Error, please fill in the percentage correctly
 ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
+ErrorFailedToFindEmailTemplate=Failed to find template with code name %s
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -298,3 +300,4 @@ WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So y
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
+ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
diff --git a/htdocs/langs/hi_IN/eventorganization.lang b/htdocs/langs/hi_IN/eventorganization.lang
index 75b798fbc3a..335c257b224 100644
--- a/htdocs/langs/hi_IN/eventorganization.lang
+++ b/htdocs/langs/hi_IN/eventorganization.lang
@@ -1,4 +1,5 @@
 # Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+# Copyright (C) 2021		Dorian Vabre			<dorian.vabre@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
@@ -81,7 +82,10 @@ PriceOfBoothHelp=Subscription price to stand a booth
 EventOrganizationICSLink=Link ICS for events
 ConferenceOrBoothInformation=Conference Or Booth informations
 Attendees = Attendees
+DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
 #
 # Status
 #
@@ -94,8 +98,46 @@ EvntOrgCancelled = Cancelled
 #
 # Public page
 #
+SuggestForm = Suggestion page
+RegisterPage = Page for conferences or booth
+EvntOrgRegistrationHelpMessage = Here, you can vote for an event, or suggest a new conference or booth for the project
+EvntOrgRegistrationConfHelpMessage = Here, you can suggest a new conference for the project
+EvntOrgRegistrationBoothHelpMessage = Here, you can suggest a new booth for the project
+ListOfSuggestedConferences = List of suggested conferences
+ListOfSuggestedBooths = List of suggested booths
+SuggestConference = Suggest a new conference
+SuggestBooth = Suggest a booth
+ViewAndVote = View and vote for suggested events
 PublicAttendeeSubscriptionPage = Public link of registration to a conference
 MissingOrBadSecureKey = The security key is invalid or missing
-EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
-EvntOrgStartDuration = This conference starts on
-EvntOrgEndDuration =  and ends on
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference : '%s'
+EvntOrgDuration = This conference starts on %s and ends on %s.
+ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
+BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
+EventType = Event type
+
+#
+# Vote page
+#
+EvntOrgRegistrationWelcomeMessage = Welcome on the conference or booth suggestion page.
+EvntOrgRegistrationConfWelcomeMessage = Welcome on the conference suggestion page.
+EvntOrgRegistrationBoothWelcomeMessage = Welcome on the booth suggestion page.
+EvntOrgVoteHelpMessage = Here, you can view and vote for the suggested events for the project
+VoteOk = Your vote has been accepted.
+AlreadyVoted = You have already voted for this event.
+VoteError = An error has occurred during the vote, please try again.
+
+#
+# SubscriptionOk page
+#
+SubscriptionOk = Your subscription to this conference has been validated
+#
+# Subscription validation mail
+#
+ConfAttendeeSubscriptionConfirmation = Confirmation of your subscription to a conference
+#
+# Payment page
+#
+Attendee = Attendee
+PaymentConferenceAttendee = Conference attendee payment
+PaymentBoothLocation = Booth location payment
diff --git a/htdocs/langs/hi_IN/hrm.lang b/htdocs/langs/hi_IN/hrm.lang
index 3b8f137e103..da098e10bdb 100644
--- a/htdocs/langs/hi_IN/hrm.lang
+++ b/htdocs/langs/hi_IN/hrm.lang
@@ -9,7 +9,7 @@ ConfirmDeleteEstablishment=Are you sure you wish to delete this establishment?
 OpenEtablishment=Open establishment
 CloseEtablishment=Close establishment
 # Dictionary
-DictionaryPublicHolidays=HRM - Public holidays
+DictionaryPublicHolidays=Leave - Public holidays
 DictionaryDepartment=HRM - Department list
 DictionaryFunction=HRM - Job positions
 # Module
diff --git a/htdocs/langs/hi_IN/knowledgemanagement.lang b/htdocs/langs/hi_IN/knowledgemanagement.lang
index 269007e60f8..68f5cced76c 100644
--- a/htdocs/langs/hi_IN/knowledgemanagement.lang
+++ b/htdocs/langs/hi_IN/knowledgemanagement.lang
@@ -47,7 +47,7 @@ KnowledgeManagementArea = Knowledge Management
 # Menu
 #
 MenuKnowledgeRecord = Knowledge base
-ListOfArticles = List of articles
+ListKnowledgeRecord = List of articles
 NewKnowledgeRecord = New article
 ValidateReply = Validate solution
 KnowledgeRecords = Articles
diff --git a/htdocs/langs/hi_IN/languages.lang b/htdocs/langs/hi_IN/languages.lang
index ba187326705..da8ad5376a1 100644
--- a/htdocs/langs/hi_IN/languages.lang
+++ b/htdocs/langs/hi_IN/languages.lang
@@ -3,6 +3,7 @@ Language_am_ET=Ethiopian
 Language_ar_AR=Arabic
 Language_ar_EG=Arabic (Egypt)
 Language_ar_SA=Arabic
+Language_ar_TN=Arabic (Tunisia)
 Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengali
 Language_bn_IN=Bengali (India)
@@ -84,6 +85,7 @@ Language_nl_NL=Dutch
 Language_pl_PL=Polish
 Language_pt_BR=Portuguese (Brazil)
 Language_pt_PT=Portuguese
+Language_ro_MD=Romanian (Moldavia)
 Language_ro_RO=Romanian
 Language_ru_RU=Russian
 Language_ru_UA=Russian (Ukraine)
diff --git a/htdocs/langs/hi_IN/main.lang b/htdocs/langs/hi_IN/main.lang
index e9de548ea2c..4aed89dea0d 100644
--- a/htdocs/langs/hi_IN/main.lang
+++ b/htdocs/langs/hi_IN/main.lang
@@ -430,6 +430,7 @@ LT1IN=CGST
 LT2IN=SGST
 LT1GC=Additionnal cents
 VATRate=Tax Rate
+RateOfTaxN=Rate of tax %s
 VATCode=Tax Rate code
 VATNPR=Tax Rate NPR
 DefaultTaxRate=Default tax rate
@@ -729,6 +730,7 @@ MenuMembers=Members
 MenuAgendaGoogle=Google agenda
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
+ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
 NoFileFound=No documents uploaded
 CurrentUserLanguage=Current language
 CurrentTheme=Current theme
@@ -1072,6 +1074,7 @@ ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
 ToClose=To close
+ToRefuse=To refuse
 ToProcess=To process
 ToApprove=To approve
 GlobalOpenedElemView=Global view
@@ -1126,9 +1129,11 @@ UpdateForAllLines=Update for all lines
 OnHold=On hold
 Civility=Civility
 AffectTag=Affect Tag
+CreateExternalUser=Create external user
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
 ConfirmCancel=Are you sure you want to cancel
+EmailMsgID=Email MsgID
diff --git a/htdocs/langs/hi_IN/members.lang b/htdocs/langs/hi_IN/members.lang
index 042b85598c0..d8b9c2f59f3 100644
--- a/htdocs/langs/hi_IN/members.lang
+++ b/htdocs/langs/hi_IN/members.lang
@@ -213,3 +213,5 @@ SendReminderForExpiredSubscription=Send reminder by email to members when subscr
 MembershipPaid=Membership paid for current period (until %s)
 YouMayFindYourInvoiceInThisEmail=You may find your invoice attached to this email
 XMembersClosed=%s member(s) closed
+XExternalUserCreated=%s external user(s) created
+ForceMemberNature=Force member nature (Individual or Corporation)
diff --git a/htdocs/langs/hi_IN/modulebuilder.lang b/htdocs/langs/hi_IN/modulebuilder.lang
index 9fdaa1a533a..23a098be2e5 100644
--- a/htdocs/langs/hi_IN/modulebuilder.lang
+++ b/htdocs/langs/hi_IN/modulebuilder.lang
@@ -143,3 +143,4 @@ AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
 ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
+ImportExportProfiles=Import and export profiles
diff --git a/htdocs/langs/hi_IN/mrp.lang b/htdocs/langs/hi_IN/mrp.lang
index ec999a473a4..2414a92cefb 100644
--- a/htdocs/langs/hi_IN/mrp.lang
+++ b/htdocs/langs/hi_IN/mrp.lang
@@ -8,12 +8,12 @@ MenuBOM=Bills of material
 LatestBOMModified=Latest %s Bills of materials modified
 LatestMOModified=Latest %s Manufacturing Orders modified
 Bom=Bills of Material
-BillOfMaterials=Bill of Material
+BillOfMaterials=Bill of Materials
 BOMsSetup=Setup of module BOM
 ListOfBOMs=List of bills of material - BOM
 ListOfManufacturingOrders=List of Manufacturing Orders
-NewBOM=New bill of material
-ProductBOMHelp=Product to create with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
+NewBOM=New bill of materials
+ProductBOMHelp=Product to create (or disassemble) with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
 BOMsNumberingModules=BOM numbering templates
 BOMsModelModule=BOM document templates
 MOsNumberingModules=MO numbering templates
@@ -22,7 +22,7 @@ FreeLegalTextOnBOMs=Free text on document of BOM
 WatermarkOnDraftBOMs=Watermark on draft BOM
 FreeLegalTextOnMOs=Free text on document of MO
 WatermarkOnDraftMOs=Watermark on draft MO
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials %s ?
 ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
 ManufacturingEfficiency=Manufacturing efficiency
 ConsumptionEfficiency=Consumption efficiency
@@ -30,8 +30,8 @@ ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the produc
 ValueOfMeansLossForProductProduced=Value of 0.95 means an average of 5%% of loss of produced product
 DeleteBillOfMaterials=Delete Bill Of Materials
 DeleteMo=Delete Manufacturing Order
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Materials?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Materials?
 MenuMRP=Manufacturing Orders
 NewMO=New Manufacturing Order
 QtyToProduce=Qty to produce
@@ -39,7 +39,7 @@ DateStartPlannedMo=Date start planned
 DateEndPlannedMo=Date end planned
 KeepEmptyForAsap=Empty means 'As Soon As Possible'
 EstimatedDuration=Estimated duration
-EstimatedDurationDesc=Estimated duration to manufacture this product using this BOM
+EstimatedDurationDesc=Estimated duration to manufacture (or disassemble) this product using this BOM
 ConfirmValidateBom=Are you sure you want to validate the BOM with the reference <strong>%s</strong> (you will be able to use it to build new Manufacturing Orders)
 ConfirmCloseBom=Are you sure you want to cancel this BOM (you won't be able to use it to build new Manufacturing Orders anymore) ?
 ConfirmReopenBom=Are you sure you want to re-open this BOM (you will be able to use it to build new Manufacturing Orders)
@@ -63,13 +63,14 @@ ConsumeAndProduceAll=Consume and Produce All
 Manufactured=Manufactured
 TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
 ForAQuantityOf=For a quantity to produce of %s
+ForAQuantityToConsumeOf=For a quantity to disassemble of %s
 ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
 ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
 ProductionForRef=Production of %s
 AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
 NoStockChangeOnServices=No stock change on services
 ProductQtyToConsumeByMO=Product quantity still to consume by open MO
-ProductQtyToProduceByMO=Product quentity still to produce by open MO
+ProductQtyToProduceByMO=Product quantity still to produce by open MO
 AddNewConsumeLines=Add new line to consume
 ProductsToConsume=Products to consume
 ProductsToProduce=Products to produce
@@ -83,15 +84,13 @@ Workstations=Workstations
 WorkstationsDescription=Workstations management
 WorkstationSetup = Workstations setup
 WorkstationSetupPage = Workstations setup page
-WorkstationAbout = About Workstation
-WorkstationAboutPage = Workstations about page
 WorkstationList=Workstation list
 WorkstationCreate=Add new workstation
 ConfirmEnableWorkstation=Are you sure you want to enable workstation <b>%s</b> ?
 EnableAWorkstation=Enable a workstation
 ConfirmDisableWorkstation=Are you sure you want to disable workstation <b>%s</b> ?
 DisableAWorkstation=Disable a workstation
-DeleteWorkstation=Supprimer
+DeleteWorkstation=Delete
 NbOperatorsRequired=Number of operators required
 THMOperatorEstimated=Estimated operator THM
 THMMachineEstimated=Estimated machine THM
diff --git a/htdocs/langs/hi_IN/orders.lang b/htdocs/langs/hi_IN/orders.lang
index 87d196eb22f..5dab5b99bf1 100644
--- a/htdocs/langs/hi_IN/orders.lang
+++ b/htdocs/langs/hi_IN/orders.lang
@@ -11,6 +11,7 @@ OrderDate=Order date
 OrderDateShort=Order date
 OrderToProcess=Order to process
 NewOrder=New order
+NewSupplierOrderShort=New order
 NewOrderSupplier=New Purchase Order
 ToOrder=Make order
 MakeOrder=Make order
@@ -73,6 +74,7 @@ DeleteOrder=Delete order
 CancelOrder=Cancel order
 OrderReopened= Order %s re-open
 AddOrder=Create order
+AddSupplierOrderShort=Create order
 AddPurchaseOrder=Create purchase order
 AddToDraftOrders=Add to draft order
 ShowOrder=Show order
diff --git a/htdocs/langs/hi_IN/other.lang b/htdocs/langs/hi_IN/other.lang
index 95297a98859..bb35099ab82 100644
--- a/htdocs/langs/hi_IN/other.lang
+++ b/htdocs/langs/hi_IN/other.lang
@@ -129,6 +129,7 @@ ClosedByLogin=User login who closed
 FileWasRemoved=File %s was removed
 DirWasRemoved=Directory %s was removed
 FeatureNotYetAvailable=Feature not yet available in the current version
+FeatureNotAvailableOnDevicesWithoutMouse=Feature not available on devices without mouse
 FeaturesSupported=Supported features
 Width=Width
 Height=Height
@@ -263,7 +264,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
-PrefixSession=Prefix for session ID
+SuffixSessionName=Suffix for session name
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/hi_IN/partnership.lang b/htdocs/langs/hi_IN/partnership.lang
index 09059995a8d..2fb10e8159e 100644
--- a/htdocs/langs/hi_IN/partnership.lang
+++ b/htdocs/langs/hi_IN/partnership.lang
@@ -16,41 +16,72 @@
 #
 # Generic
 #
-ModulePartnershipName = Partnership management
-PartnershipDescription = Module Partnership management
+ModulePartnershipName=Partnership management
+PartnershipDescription=Module Partnership management
 PartnershipDescriptionLong= Module Partnership management
 
+AddPartnership=Add partnership
+CancelPartnershipForExpiredMembers=Partnership: Cancel partnership of members with expired subscriptions
+PartnershipCheckBacklink=Partnership: Check referring backlink
+
 #
 # Menu
 #
-NewPartnership = New Partnership
-ListOfPartnerships = List of partnership
+NewPartnership=New Partnership
+ListOfPartnerships=List of partnership
 
 #
 # Admin page
 #
-PartnershipSetup = Partnership setup
-PartnershipAbout = About Partnership
-PartnershipAboutPage = Partnership about page
-
+PartnershipSetup=Partnership setup
+PartnershipAbout=About Partnership
+PartnershipAboutPage=Partnership about page
+partnershipforthirdpartyormember=Partner status must be set on a 'thirdparty' or a 'member'
+PARTNERSHIP_IS_MANAGED_FOR=Partnership managed for
+PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks to check
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb of days before cancelling status of a partnership when a subscription has expired
+ReferingWebsiteCheck=Check of website referring
+ReferingWebsiteCheckDesc=You can enable a feature to check that your partners has added a backlink to your website domains on their own website.
 
 #
 # Object
 #
+DeletePartnership=Delete a partnership
+PartnershipDedicatedToThisThirdParty=Partnership dedicated to this third party
+PartnershipDedicatedToThisMember=Partnership dedicated to this member
 DatePartnershipStart=Start date
 DatePartnershipEnd=End date
+ReasonDecline=Decline reason
+ReasonDeclineOrCancel=Decline reason
+PartnershipAlreadyExist=Partnership already exist
+ManagePartnership=Manage partnership
+BacklinkNotFoundOnPartnerWebsite=Backlink not found on partner website
+ConfirmClosePartnershipAsk=Are you sure you want to cancel this partnership?
+PartnershipType=Partnership type
 
 #
 # Template Mail
 #
+SendingEmailOnPartnershipWillSoonBeCanceled=Partnership will soon be canceled
+SendingEmailOnPartnershipRefused=Partnership refused
+SendingEmailOnPartnershipAccepted=Partnership accepted
+SendingEmailOnPartnershipCanceled=Partnership canceled
 
+YourPartnershipWillSoonBeCanceledTopic=Partnership will soon be canceled
+YourPartnershipRefusedTopic=Partnership refused
+YourPartnershipAcceptedTopic=Partnership accepted
+YourPartnershipCanceledTopic=Partnership canceled
+
+YourPartnershipWillSoonBeCanceledContent=We inform you that your partnership will soon be canceled (Backlink not found)
+YourPartnershipRefusedContent=We inform you that your partnership request has been refused.
+YourPartnershipAcceptedContent=We inform you that your partnership request has been accepted.
+YourPartnershipCanceledContent=We inform you that your partnership has been canceled.
 
 #
 # Status
 #
-PartnershipDraft = Draft
-PartnershipAccepted = Accepted
-PartnershipRefused = Refused
-PartnershipCanceled = Canceled
-
+PartnershipDraft=Draft
+PartnershipAccepted=Accepted
+PartnershipRefused=Refused
+PartnershipCanceled=Canceled
 PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/hi_IN/productbatch.lang b/htdocs/langs/hi_IN/productbatch.lang
index ad2db658e2e..450d0285819 100644
--- a/htdocs/langs/hi_IN/productbatch.lang
+++ b/htdocs/langs/hi_IN/productbatch.lang
@@ -1,4 +1,4 @@
-# ProductBATCH language file - en_US - ProductBATCH
+# ProductBATCH language file - Source file is en_US - ProductBATCH
 ManageLotSerial=Use lot/serial number
 ProductStatusOnBatch=Yes (lot required)
 ProductStatusOnSerial=Yes (unique serial number required)
@@ -33,3 +33,13 @@ CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+LifeTime=Life span (in days)
+EndOfLife=End of life
+ManufacturingDate=Manufacturing date
+DestructionDate=Destruction date
+FirstUseDate=First use date
+QCFrequency=Quality control frequency (in days)
+
+#Traceability - qc status
+OutOfOrder=Out of order
+InWorkingOrder=In working order
diff --git a/htdocs/langs/hi_IN/products.lang b/htdocs/langs/hi_IN/products.lang
index 0875be0dc07..9638dfe5a25 100644
--- a/htdocs/langs/hi_IN/products.lang
+++ b/htdocs/langs/hi_IN/products.lang
@@ -396,3 +396,5 @@ ActionAvailableOnVariantProductOnly=Action only available on the variant of prod
 ProductsPricePerCustomer=Product prices per customers
 ProductSupplierExtraFields=Additional Attributes (Supplier Prices)
 DeleteLinkedProduct=Delete the child product linked to the combination
+PMPValue=Weighted average price
+PMPValueShort=WAP
diff --git a/htdocs/langs/hi_IN/projects.lang b/htdocs/langs/hi_IN/projects.lang
index 79c974f6e24..6c96fadb5c1 100644
--- a/htdocs/langs/hi_IN/projects.lang
+++ b/htdocs/langs/hi_IN/projects.lang
@@ -267,9 +267,11 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=New invoice
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+OneLinePerTimeSpentLine=One line for each time spent declaration
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
 AddPersonToTask=Add also to tasks
 UsageOrganizeEvent=Usage: Event Organization
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
+SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
diff --git a/htdocs/langs/hi_IN/receptions.lang b/htdocs/langs/hi_IN/receptions.lang
index 760ff884fa0..338602e722e 100644
--- a/htdocs/langs/hi_IN/receptions.lang
+++ b/htdocs/langs/hi_IN/receptions.lang
@@ -44,4 +44,4 @@ ValidateOrderFirstBeforeReception=You must first validate the order before being
 ReceptionsNumberingModules=Numbering module for receptions
 ReceptionsReceiptModel=Document templates for receptions
 NoMorePredefinedProductToDispatch=No more predefined products to dispatch
-
+ReceptionExist=A reception exists
diff --git a/htdocs/langs/hi_IN/stocks.lang b/htdocs/langs/hi_IN/stocks.lang
index 9ec523427b1..d39791932a3 100644
--- a/htdocs/langs/hi_IN/stocks.lang
+++ b/htdocs/langs/hi_IN/stocks.lang
@@ -56,8 +56,6 @@ UnitPurchaseValue=Unit purchase price
 StockTooLow=Stock too low
 StockLowerThanLimit=Stock lower than alert limit (%s)
 EnhancedValue=Value
-PMPValue=Weighted average price
-PMPValueShort=WAP
 EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
@@ -251,7 +249,10 @@ SelectAStockMovementFileToImport=select a stock movement file to import
 InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
 LabelOfInventoryMovemement=Inventory %s
 ReOpen=Reopen
-ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock to the real qty you entered into the inventory.
 ObjectNotFound=%s not found
 MakeMovementsAndClose=Generate movements and close
 AutofillWithExpected=Fill real quantity with expected quantity
+ShowAllBatchByDefault=By default, show batch details on product "stock" tab
+CollapseBatchDetailHelp=You can set batch detail default display in stocks module configuration
+FieldCannotBeNegative=Field "%s" cannot be negative
diff --git a/htdocs/langs/hi_IN/ticket.lang b/htdocs/langs/hi_IN/ticket.lang
index df73daf4a0d..1da32a5a99e 100644
--- a/htdocs/langs/hi_IN/ticket.lang
+++ b/htdocs/langs/hi_IN/ticket.lang
@@ -304,7 +304,7 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
-BoxTicketType=Number of open tickets by type
+BoxTicketType=Distribution of open tickets by type
 BoxTicketSeverity=Number of open tickets by severity
 BoxNoTicketSeverity=No tickets opened
 BoxTicketLastXDays=Number of new tickets by days the last %s days
diff --git a/htdocs/langs/hr_HR/accountancy.lang b/htdocs/langs/hr_HR/accountancy.lang
index 32e9993478e..939edee6424 100644
--- a/htdocs/langs/hr_HR/accountancy.lang
+++ b/htdocs/langs/hr_HR/accountancy.lang
@@ -158,7 +158,7 @@ ACCOUNTING_LENGTH_AACCOUNT=Length of the third-party accounting accounts (If you
 ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of an accounting account. Needed by some countries (like Switzerland). If set to off (default), you can set the following two parameters to ask the application to add virtual zeros.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties, break ability to search on a part of value)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
@@ -208,7 +208,7 @@ Lettering=Lettering
 Codejournal=Journal
 JournalLabel=Journal label
 NumPiece=Broj komada
-TransactionNumShort=Num. transaction
+TransactionNumShort=Broj prijenosa
 AccountingCategory=Custom group
 GroupByAccountAccounting=Group by general ledger account
 GroupBySubAccountAccounting=Group by subledger account
@@ -328,6 +328,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountanc
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
+NotifiedExportDate=Notified export date (modification of the entries will not be possible)
+NotifiedValidationDate=Validation of the entries (modification or deletion of the entries will not be possible)
+ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=Export draft journal
 Modelcsv=Model of export
 Selectmodelcsv=Select a model of export
diff --git a/htdocs/langs/hr_HR/admin.lang b/htdocs/langs/hr_HR/admin.lang
index 90d6cb47353..c1373c79e36 100644
--- a/htdocs/langs/hr_HR/admin.lang
+++ b/htdocs/langs/hr_HR/admin.lang
@@ -221,8 +221,8 @@ NotCompatible=This module does not seem compatible with your Dolibarr %s (Min %s
 CompatibleAfterUpdate=This module requires an update to your Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=See in Market place
 SeeSetupOfModule=See setup of module %s
+SetOptionTo=Set option <b>%s</b> to %s
 Updated=Updated
-Nouveauté=Novelty
 AchatTelechargement=Buy / Download
 GoModuleSetupArea=To deploy/install a new module, go to the Module setup area: <a href="%s">%s</a>.
 DoliStoreDesc=DoliStorel, ovlaštena trgovina za Dolibarr ERP/CRM dodatne module
@@ -399,6 +399,7 @@ SecurityToken=Key to secure URLs
 NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
 PDF=PDF
 PDFDesc=Global options for PDF generation
+PDFOtherDesc=PDF Option specific to some modules
 PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
 PDFRulesForSalesTax=Rules for Sales Tax / VAT
@@ -561,7 +562,7 @@ Module53Desc=Management of Services
 Module54Name=Ugovori/pretplate
 Module54Desc=Management of contracts (services or recurring subscriptions)
 Module55Name=Barkodovi
-Module55Desc=Upravljanje barkodovima
+Module55Desc=Barcode or QR code management
 Module56Name=Payment by credit transfer
 Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
 Module57Name=Payments by Direct Debit
@@ -848,10 +849,10 @@ Permission402=Izradi/izmjeni popuste
 Permission403=Ovjeri popuste
 Permission404=Obriši popuste
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries (yours and subordinates)
-Permission512=Create/modify payments of salaries
-Permission514=Delete payments of salaries
-Permission517=Read payments of salaries of everybody
+Permission511=Read salaries and payments (yours and subordinates)
+Permission512=Create/modify salaries and payments
+Permission514=Delete salaries and payments
+Permission517=Read salaries and payments everybody
 Permission519=Izvoz plaća
 Permission520=Čitaj kredite
 Permission522=Izradi/izmjeni kredite
@@ -965,6 +966,8 @@ Permission23003=Obriši planirani posao
 Permission23004=Izvrši planirani posao
 Permission50101=Use Point of Sale (SimplePOS)
 Permission50151=Use Point of Sale (TakePOS)
+Permission50152=Edit sales lines
+Permission50153=Edit ordered sales lines
 Permission50201=Čitaj transakcije
 Permission50202=Uvezi transakcije
 Permission50330=Read objects of Zapier
@@ -1039,11 +1042,12 @@ DictionaryMeasuringUnits=Measuring Units
 DictionarySocialNetworks=Social Networks
 DictionaryProspectStatus=Prospect status for companies
 DictionaryProspectContactStatus=Prospect status for contacts
-DictionaryHolidayTypes=Types of leave
+DictionaryHolidayTypes=Leave - Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
 DictionaryTransportMode=Intracomm report - Transport mode
+DictionaryBatchStatus=Product lot/serial Quality Control status
 TypeOfUnit=Type of unit
 SetupSaved=Postavi spremljeno
 SetupNotSaved=Setup not saved
@@ -1187,7 +1191,7 @@ SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of m
 SetupDescription5=Other Setup menu entries manage optional parameters.
 AuditedSecurityEvents=Security events that are audited
 NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
-Audit=Revizija
+Audit=Security events
 InfoDolibarr=O Dolibarr instalaciji
 InfoBrowser=O pregledniku
 InfoOS=O OS-u
@@ -1319,9 +1323,12 @@ ConditionIsCurrently=Stanje je trenutno %s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
 NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
+ComboListOptim=Combo list loading optimization
 SearchOptim=Optimizacija pretrage
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
-YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
+YouHaveXObjectUseComboOptim=You have %s %s in the database. You can go into setup of module to enable loading of combo list on key pressed event.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other.
+YouHaveXObjectUseSearchOptimDesc=This limits the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to %s in Home-Setup-Other.
 BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
 BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
 PHPModuleLoaded=PHP component %s is loaded
@@ -1433,6 +1440,7 @@ MemberMainOptions=Glavne opcije
 AdherentLoginRequired= Upravljanje prijavom svakog korisnika
 AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
+MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
 MembersDocModules=Document templates for documents generated from member record
@@ -1763,7 +1771,7 @@ AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting men
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
-AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the scheduled job %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Podešavanje modula ClickToDial
@@ -1979,6 +1987,8 @@ 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_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add picture on proposal line
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add electronic sign in PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
@@ -2096,7 +2106,6 @@ PDF_SHOW_PROJECT=Show project on document
 ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
-FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
@@ -2120,12 +2129,18 @@ ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by
 MailToSendEventOrganization=Event Organization
 AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
 YouShouldDisablePHPFunctions=You should disable PHP functions
-IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands in custom code, you shoud disable PHP functions
+PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
+NotRecommended=Not recommanded
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
 ModuleUpdateAvailable=An update is available
 NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
+RandomlySelectedIfSeveral=Randomly selected if several pictures are available
+DatabasePasswordObfuscated=Database password is obfuscated in conf file
+DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
diff --git a/htdocs/langs/hr_HR/agenda.lang b/htdocs/langs/hr_HR/agenda.lang
index 493975cae73..be20b16f5a9 100644
--- a/htdocs/langs/hr_HR/agenda.lang
+++ b/htdocs/langs/hr_HR/agenda.lang
@@ -4,7 +4,7 @@ Actions=Događaji
 Agenda=Podsjetnik
 TMenuAgenda=Podsjetnik
 Agendas=Podsjetnici
-LocalAgenda=Interni kalendar
+LocalAgenda=Default calendar
 ActionsOwnedBy=Događaj u vlasništvu
 ActionsOwnedByShort=Vlasnik
 AffectedTo=Dodjeljeno korisniku
@@ -14,13 +14,13 @@ EventsNb=Broj događaja
 ListOfActions=Lista događaja
 EventReports=Event reports
 Location=Lokacija
-ToUserOfGroup=Event assigned to any user in group
+ToUserOfGroup=Event assigned to any user in the group
 EventOnFullDay=Događaji za cijeli dan(e)
 MenuToDoActions=Svi nepotpuni događaji
 MenuDoneActions=Svi prekinuti događaji
 MenuToDoMyActions=Svi nedovršeni događaji
 MenuDoneMyActions=Moji prekinuti događaji
-ListOfEvents=Popis događaja (Interni kalendar)
+ListOfEvents=List of events (default calendar)
 ActionsAskedBy=Događaje izvijestio/la
 ActionsToDoBy=Događaj dodjeljen
 ActionsDoneBy=Događaji završeni od strane korisnika
@@ -38,6 +38,7 @@ ActionsEvents=Događaji za koje Dolibarr će kreirat akcije u podsjetnicima auto
 EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Third party %s created
+COMPANY_MODIFYInDolibarr=Third party %s modified
 COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=Contract %s validated
 CONTRACT_DELETEInDolibarr=Contract %s deleted
@@ -87,6 +88,7 @@ OrderDeleted=Narudžba obrisana
 InvoiceDeleted=Račun obrisan
 DraftInvoiceDeleted=Draft invoice deleted
 CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_MODIFYInDolibarr=Contact %s modified
 CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Product %s created
 PRODUCT_MODIFYInDolibarr=Product %s modified
@@ -119,6 +121,7 @@ MRP_MO_UNVALIDATEInDolibarr=MO set to draft status
 MRP_MO_PRODUCEDInDolibarr=MO produced
 MRP_MO_DELETEInDolibarr=MO deleted
 MRP_MO_CANCELInDolibarr=MO canceled
+PAIDInDolibarr=%s paid
 ##### End agenda events #####
 AgendaModelModule=Document templates for event
 DateActionStart=Datum početka
@@ -130,7 +133,7 @@ AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to use
 AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
 AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic events.
 AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> to include events of holidays.
-AgendaShowBirthdayEvents=Prikaži rođendane kontakata
+AgendaShowBirthdayEvents=Birthdays of contacts
 AgendaHideBirthdayEvents=Sakrij rođendane kontakata
 Busy=Zauzet
 ExportDataset_event1=Lista podsjetnika događaja
@@ -152,6 +155,7 @@ ActionType=Vrsta događaja
 DateActionBegin=Datum početka događaja
 ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b>?
 RepeatEvent=Ponovi događaj
+OnceOnly=Once only
 EveryWeek=Svaki tjedan
 EveryMonth=Svaki mjesec
 DayOfMonth=Dan u mjesecu
@@ -165,4 +169,4 @@ TimeType=Duration type
 ReminderType=Callback type
 AddReminder=Create an automatic reminder notification for this event
 ErrorReminderActionCommCreation=Error creating the reminder notification for this event
-BrowserPush=Browser Notification
+BrowserPush=Browser Popup Notification
diff --git a/htdocs/langs/hr_HR/bills.lang b/htdocs/langs/hr_HR/bills.lang
index d0d3b388678..3dd2dece572 100644
--- a/htdocs/langs/hr_HR/bills.lang
+++ b/htdocs/langs/hr_HR/bills.lang
@@ -259,6 +259,7 @@ DateMaxPayment=Payment due on
 DateInvoice=Datum računa
 DatePointOfTax=Porezna stavka
 NoInvoice=Nema računa
+NoOpenInvoice=No open invoice
 ClassifyBill=Svrstavanje računa
 SupplierBillsToPay=Neplaćeni ulazni računi
 CustomerBillsUnpaid=Neplaćeni izlazni računi
@@ -589,3 +590,4 @@ FacParentLine=Invoice Line Parent
 SituationTotalRayToRest=Remainder to pay without taxe
 PDFSituationTitle=Situation n° %d
 SituationTotalProgress=Total progress %d %%
+SearchUnpaidInvoicesWithDueDate=Search unpaid invoices with a due date = %s
diff --git a/htdocs/langs/hr_HR/cashdesk.lang b/htdocs/langs/hr_HR/cashdesk.lang
index d84d6f6da9b..2fe6518b7f1 100644
--- a/htdocs/langs/hr_HR/cashdesk.lang
+++ b/htdocs/langs/hr_HR/cashdesk.lang
@@ -102,7 +102,7 @@ CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal numb
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
 SaleStartedAt=Sale started at %s
-ControlCashOpening=Control cash popup at opening POS
+ControlCashOpening=Open the "Control cash" popup when opening the POS
 CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -126,5 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
-ShowPriceHT = Display the price excluding tax column
-ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
+ShowPriceHT = Display the column with the price excluding tax (on screen)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
diff --git a/htdocs/langs/hr_HR/compta.lang b/htdocs/langs/hr_HR/compta.lang
index cd27ba82fbc..b0102fd4141 100644
--- a/htdocs/langs/hr_HR/compta.lang
+++ b/htdocs/langs/hr_HR/compta.lang
@@ -286,3 +286,9 @@ ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
 IncludeLoansInResults = Include loans in reports
+InvoiceLate30Days = Invoices late > 30 days
+InvoiceLate15Days = Invoices late > 15 days
+InvoiceLateMinus15Days = Invoices late
+InvoiceNotLate = To be collected < 15 days
+InvoiceNotLate15Days = To be collected in 15 days
+InvoiceNotLate30Days = To be collected in 30 days
diff --git a/htdocs/langs/hr_HR/cron.lang b/htdocs/langs/hr_HR/cron.lang
index 1f2d530e535..10fd9c52b35 100644
--- a/htdocs/langs/hr_HR/cron.lang
+++ b/htdocs/langs/hr_HR/cron.lang
@@ -60,7 +60,7 @@ CronErrEndDateStartDt=Datum kraja ne može biti prije datuma početka
 StatusAtInstall=Status at module installation
 CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Onemogući
-CronTaskInactive=Ovaj posao je onemogućen
+CronTaskInactive=This job is disabled (not scheduled)
 CronId=ID
 CronClassFile=Filename with class
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example 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>
diff --git a/htdocs/langs/hr_HR/errors.lang b/htdocs/langs/hr_HR/errors.lang
index 5c177ae7c46..7694f6884b7 100644
--- a/htdocs/langs/hr_HR/errors.lang
+++ b/htdocs/langs/hr_HR/errors.lang
@@ -11,6 +11,7 @@ ErrorBadValueForParamNotAString=Bad value for your parameter. It appends general
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s already exists.
 ErrorGroupAlreadyExists=Group %s already exists.
+ErrorEmailAlreadyExists=Email %s already exists.
 ErrorRecordNotFound=Record not found.
 ErrorFailToCopyFile=Failed to copy file '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
@@ -117,7 +118,7 @@ ErrorCantReadFile=Failed to read file '%s'
 ErrorCantReadDir=Failed to read directory '%s'
 ErrorBadLoginPassword=Bad value for login or password
 ErrorLoginDisabled=Vaš račun je onemogučen
-ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server. If PHP <b>Safe Mode</b> is enabled, check that command is inside a directory defined by parameter <b>safe_mode_exec_dir</b>.
+ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server user. Check also the command is not protected on shell level by a security layer like apparmor.
 ErrorFailedToChangePassword=Failed to change password
 ErrorLoginDoesNotExists=User with login <b>%s</b> could not be found.
 ErrorLoginHasNoEmail=This user has no email address. Process aborted.
@@ -262,6 +263,7 @@ ErrorDateIsInFuture=Error, the date can't be in the future
 ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
 ErrorAPercentIsRequired=Error, please fill in the percentage correctly
 ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
+ErrorFailedToFindEmailTemplate=Failed to find template with code name %s
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -298,3 +300,4 @@ WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So y
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
+ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
diff --git a/htdocs/langs/hr_HR/eventorganization.lang b/htdocs/langs/hr_HR/eventorganization.lang
index 769b3d35ca1..505fe0faa62 100644
--- a/htdocs/langs/hr_HR/eventorganization.lang
+++ b/htdocs/langs/hr_HR/eventorganization.lang
@@ -1,4 +1,5 @@
 # Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+# Copyright (C) 2021		Dorian Vabre			<dorian.vabre@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
@@ -81,7 +82,10 @@ PriceOfBoothHelp=Subscription price to stand a booth
 EventOrganizationICSLink=Link ICS for events
 ConferenceOrBoothInformation=Conference Or Booth informations
 Attendees = Attendees
+DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
 #
 # Status
 #
@@ -94,8 +98,46 @@ EvntOrgCancelled = Cancelled
 #
 # Public page
 #
+SuggestForm = Suggestion page
+RegisterPage = Page for conferences or booth
+EvntOrgRegistrationHelpMessage = Here, you can vote for an event, or suggest a new conference or booth for the project
+EvntOrgRegistrationConfHelpMessage = Here, you can suggest a new conference for the project
+EvntOrgRegistrationBoothHelpMessage = Here, you can suggest a new booth for the project
+ListOfSuggestedConferences = List of suggested conferences
+ListOfSuggestedBooths = List of suggested booths
+SuggestConference = Suggest a new conference
+SuggestBooth = Suggest a booth
+ViewAndVote = View and vote for suggested events
 PublicAttendeeSubscriptionPage = Public link of registration to a conference
 MissingOrBadSecureKey = The security key is invalid or missing
-EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
-EvntOrgStartDuration = This conference starts on
-EvntOrgEndDuration =  and ends on
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference : '%s'
+EvntOrgDuration = This conference starts on %s and ends on %s.
+ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
+BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
+EventType = Vrsta događaja
+
+#
+# Vote page
+#
+EvntOrgRegistrationWelcomeMessage = Welcome on the conference or booth suggestion page.
+EvntOrgRegistrationConfWelcomeMessage = Welcome on the conference suggestion page.
+EvntOrgRegistrationBoothWelcomeMessage = Welcome on the booth suggestion page.
+EvntOrgVoteHelpMessage = Here, you can view and vote for the suggested events for the project
+VoteOk = Your vote has been accepted.
+AlreadyVoted = You have already voted for this event.
+VoteError = An error has occurred during the vote, please try again.
+
+#
+# SubscriptionOk page
+#
+SubscriptionOk = Your subscription to this conference has been validated
+#
+# Subscription validation mail
+#
+ConfAttendeeSubscriptionConfirmation = Confirmation of your subscription to a conference
+#
+# Payment page
+#
+Attendee = Attendee
+PaymentConferenceAttendee = Conference attendee payment
+PaymentBoothLocation = Booth location payment
diff --git a/htdocs/langs/hr_HR/hrm.lang b/htdocs/langs/hr_HR/hrm.lang
index e5bf98f9c0f..3764345b27e 100644
--- a/htdocs/langs/hr_HR/hrm.lang
+++ b/htdocs/langs/hr_HR/hrm.lang
@@ -9,7 +9,7 @@ ConfirmDeleteEstablishment=Are you sure you wish to delete this establishment?
 OpenEtablishment=Otvori ustanovu
 CloseEtablishment=Zatvori ustanovu
 # Dictionary
-DictionaryPublicHolidays=HRM - Public holidays
+DictionaryPublicHolidays=Leave - Public holidays
 DictionaryDepartment=HRM - popis odjela
 DictionaryFunction=HRM - Job positions
 # Module
diff --git a/htdocs/langs/hr_HR/knowledgemanagement.lang b/htdocs/langs/hr_HR/knowledgemanagement.lang
index 3baf7df3c67..155a7093e77 100644
--- a/htdocs/langs/hr_HR/knowledgemanagement.lang
+++ b/htdocs/langs/hr_HR/knowledgemanagement.lang
@@ -47,7 +47,7 @@ KnowledgeManagementArea = Knowledge Management
 # Menu
 #
 MenuKnowledgeRecord = Knowledge base
-ListOfArticles = List of articles
+ListKnowledgeRecord = List of articles
 NewKnowledgeRecord = New article
 ValidateReply = Validate solution
 KnowledgeRecords = Articles
diff --git a/htdocs/langs/hr_HR/languages.lang b/htdocs/langs/hr_HR/languages.lang
index 91789655f61..0cd5671d61b 100644
--- a/htdocs/langs/hr_HR/languages.lang
+++ b/htdocs/langs/hr_HR/languages.lang
@@ -3,6 +3,7 @@ Language_am_ET=Ethiopian
 Language_ar_AR=Arapski
 Language_ar_EG=Arabic (Egypt)
 Language_ar_SA=Arapski
+Language_ar_TN=Arabic (Tunisia)
 Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengalski
 Language_bn_IN=Bengali (India)
@@ -84,6 +85,7 @@ Language_nl_NL=Dutch
 Language_pl_PL=Politura
 Language_pt_BR=Portugalski (Brazil)
 Language_pt_PT=Portugalski
+Language_ro_MD=Romanian (Moldavia)
 Language_ro_RO=Rumunjski
 Language_ru_RU=Ruski
 Language_ru_UA=Ruski (Ukrajina)
diff --git a/htdocs/langs/hr_HR/main.lang b/htdocs/langs/hr_HR/main.lang
index 73b652c481a..7c2472a0199 100644
--- a/htdocs/langs/hr_HR/main.lang
+++ b/htdocs/langs/hr_HR/main.lang
@@ -430,6 +430,7 @@ LT1IN=CGTS
 LT2IN=SGST
 LT1GC=Additionnal cents
 VATRate=Stopa poreza
+RateOfTaxN=Rate of tax %s
 VATCode=Oznaka stope poreza
 VATNPR=Porezna stopa NPR
 DefaultTaxRate=Osnovna stopa poreza
@@ -729,6 +730,7 @@ MenuMembers=Članovi
 MenuAgendaGoogle=Google agenda
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Granična vrijednost Dolibarra (Mapa početna->postavke->sigurnost): %s Kb, PHP granična vrijednost: %s Kb
+ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
 NoFileFound=No documents uploaded
 CurrentUserLanguage=Trenutni jezik
 CurrentTheme=Trenutna tema
@@ -1072,6 +1074,7 @@ ValidFrom=Vrijedi od
 ValidUntil=Vrijedi do
 NoRecordedUsers=Nema korsinika
 ToClose=Za zatvaranje
+ToRefuse=To refuse
 ToProcess=Za provedbu
 ToApprove=Za odobrenje
 GlobalOpenedElemView=Opći pregled
@@ -1126,9 +1129,11 @@ UpdateForAllLines=Update for all lines
 OnHold=On hold
 Civility=Civility
 AffectTag=Affect Tag
+CreateExternalUser=Create external user
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
 ConfirmCancel=Are you sure you want to cancel
+EmailMsgID=Email MsgID
diff --git a/htdocs/langs/hr_HR/members.lang b/htdocs/langs/hr_HR/members.lang
index 5d9d29bbdc4..0763a0463e5 100644
--- a/htdocs/langs/hr_HR/members.lang
+++ b/htdocs/langs/hr_HR/members.lang
@@ -213,3 +213,5 @@ SendReminderForExpiredSubscription=Send reminder by email to members when subscr
 MembershipPaid=Membership paid for current period (until %s)
 YouMayFindYourInvoiceInThisEmail=You may find your invoice attached to this email
 XMembersClosed=%s member(s) closed
+XExternalUserCreated=%s external user(s) created
+ForceMemberNature=Force member nature (Individual or Corporation)
diff --git a/htdocs/langs/hr_HR/modulebuilder.lang b/htdocs/langs/hr_HR/modulebuilder.lang
index 9fdaa1a533a..23a098be2e5 100644
--- a/htdocs/langs/hr_HR/modulebuilder.lang
+++ b/htdocs/langs/hr_HR/modulebuilder.lang
@@ -143,3 +143,4 @@ AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
 ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
+ImportExportProfiles=Import and export profiles
diff --git a/htdocs/langs/hr_HR/mrp.lang b/htdocs/langs/hr_HR/mrp.lang
index d40d51ab493..dd2c40eda6c 100644
--- a/htdocs/langs/hr_HR/mrp.lang
+++ b/htdocs/langs/hr_HR/mrp.lang
@@ -8,12 +8,12 @@ MenuBOM=Bills of material
 LatestBOMModified=Latest %s Bills of materials modified
 LatestMOModified=Latest %s Manufacturing Orders modified
 Bom=Sastavnice
-BillOfMaterials=Sastavnica
+BillOfMaterials=Bill of Materials
 BOMsSetup=Setup of module BOM
 ListOfBOMs=List of bills of material - BOM
 ListOfManufacturingOrders=Lista proizvodnih naloga
-NewBOM=New bill of material
-ProductBOMHelp=Product to create with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
+NewBOM=New bill of materials
+ProductBOMHelp=Product to create (or disassemble) with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
 BOMsNumberingModules=BOM numbering templates
 BOMsModelModule=BOM document templates
 MOsNumberingModules=MO numbering templates
@@ -22,7 +22,7 @@ FreeLegalTextOnBOMs=Free text on document of BOM
 WatermarkOnDraftBOMs=Watermark on draft BOM
 FreeLegalTextOnMOs=Free text on document of MO
 WatermarkOnDraftMOs=Watermark on draft MO
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials %s ?
 ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
 ManufacturingEfficiency=Manufacturing efficiency
 ConsumptionEfficiency=Consumption efficiency
@@ -30,8 +30,8 @@ ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the produc
 ValueOfMeansLossForProductProduced=Value of 0.95 means an average of 5%% of loss of produced product
 DeleteBillOfMaterials=Delete Bill Of Materials
 DeleteMo=Delete Manufacturing Order
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Materials?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Materials?
 MenuMRP=Proizvodni nalozi
 NewMO=Novi proizvodni nalog
 QtyToProduce=Qty to produce
@@ -39,7 +39,7 @@ DateStartPlannedMo=Datum početka planirani
 DateEndPlannedMo=Datum završetka planirani
 KeepEmptyForAsap=Empty means 'As Soon As Possible'
 EstimatedDuration=Procjena trajanja
-EstimatedDurationDesc=Estimated duration to manufacture this product using this BOM
+EstimatedDurationDesc=Estimated duration to manufacture (or disassemble) this product using this BOM
 ConfirmValidateBom=Are you sure you want to validate the BOM with the reference <strong>%s</strong> (you will be able to use it to build new Manufacturing Orders)
 ConfirmCloseBom=Are you sure you want to cancel this BOM (you won't be able to use it to build new Manufacturing Orders anymore) ?
 ConfirmReopenBom=Are you sure you want to re-open this BOM (you will be able to use it to build new Manufacturing Orders)
@@ -63,13 +63,14 @@ ConsumeAndProduceAll=Consume and Produce All
 Manufactured=Manufactured
 TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
 ForAQuantityOf=For a quantity to produce of %s
+ForAQuantityToConsumeOf=For a quantity to disassemble of %s
 ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
 ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
 ProductionForRef=Production of %s
 AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
 NoStockChangeOnServices=No stock change on services
 ProductQtyToConsumeByMO=Product quantity still to consume by open MO
-ProductQtyToProduceByMO=Product quentity still to produce by open MO
+ProductQtyToProduceByMO=Product quantity still to produce by open MO
 AddNewConsumeLines=Add new line to consume
 ProductsToConsume=Products to consume
 ProductsToProduce=Products to produce
@@ -83,15 +84,13 @@ Workstations=Workstations
 WorkstationsDescription=Workstations management
 WorkstationSetup = Workstations setup
 WorkstationSetupPage = Workstations setup page
-WorkstationAbout = About Workstation
-WorkstationAboutPage = Workstations about page
 WorkstationList=Workstation list
 WorkstationCreate=Add new workstation
 ConfirmEnableWorkstation=Are you sure you want to enable workstation <b>%s</b> ?
 EnableAWorkstation=Enable a workstation
 ConfirmDisableWorkstation=Are you sure you want to disable workstation <b>%s</b> ?
 DisableAWorkstation=Disable a workstation
-DeleteWorkstation=Supprimer
+DeleteWorkstation=Obriši
 NbOperatorsRequired=Number of operators required
 THMOperatorEstimated=Estimated operator THM
 THMMachineEstimated=Estimated machine THM
diff --git a/htdocs/langs/hr_HR/orders.lang b/htdocs/langs/hr_HR/orders.lang
index 348ac6e7afc..d89076b3c36 100644
--- a/htdocs/langs/hr_HR/orders.lang
+++ b/htdocs/langs/hr_HR/orders.lang
@@ -11,6 +11,7 @@ OrderDate=Datum narudžbe
 OrderDateShort=Datum narudžbe
 OrderToProcess=Obrada narudžbe
 NewOrder=Nova narudžba
+NewSupplierOrderShort=Nova narudžba
 NewOrderSupplier=New Purchase Order
 ToOrder=Napravi narudžbu
 MakeOrder=Napravi narudžbu
@@ -73,6 +74,7 @@ DeleteOrder=Obriši narudžbu
 CancelOrder=Poništi narudžbu
 OrderReopened= Order %s re-open
 AddOrder=Izradi narudžbu
+AddSupplierOrderShort=Izradi narudžbu
 AddPurchaseOrder=Create purchase order
 AddToDraftOrders=Dodati u skice narudžbe
 ShowOrder=Prikaži narudžbu
diff --git a/htdocs/langs/hr_HR/other.lang b/htdocs/langs/hr_HR/other.lang
index 1c88c9f43d4..285f5261a0c 100644
--- a/htdocs/langs/hr_HR/other.lang
+++ b/htdocs/langs/hr_HR/other.lang
@@ -129,6 +129,7 @@ ClosedByLogin=User login who closed
 FileWasRemoved=File %s was removed
 DirWasRemoved=Directory %s was removed
 FeatureNotYetAvailable=Feature not yet available in the current version
+FeatureNotAvailableOnDevicesWithoutMouse=Feature not available on devices without mouse
 FeaturesSupported=Supported features
 Width=Širina
 Height=Visina
@@ -263,7 +264,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
-PrefixSession=Prefix for session ID
+SuffixSessionName=Suffix for session name
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/hr_HR/partnership.lang b/htdocs/langs/hr_HR/partnership.lang
index 5c2f7bd82b9..68ac6a5cae3 100644
--- a/htdocs/langs/hr_HR/partnership.lang
+++ b/htdocs/langs/hr_HR/partnership.lang
@@ -16,41 +16,72 @@
 #
 # Generic
 #
-ModulePartnershipName = Partnership management
-PartnershipDescription = Module Partnership management
+ModulePartnershipName=Partnership management
+PartnershipDescription=Module Partnership management
 PartnershipDescriptionLong= Module Partnership management
 
+AddPartnership=Add partnership
+CancelPartnershipForExpiredMembers=Partnership: Cancel partnership of members with expired subscriptions
+PartnershipCheckBacklink=Partnership: Check referring backlink
+
 #
 # Menu
 #
-NewPartnership = New Partnership
-ListOfPartnerships = List of partnership
+NewPartnership=New Partnership
+ListOfPartnerships=List of partnership
 
 #
 # Admin page
 #
-PartnershipSetup = Partnership setup
-PartnershipAbout = About Partnership
-PartnershipAboutPage = Partnership about page
-
+PartnershipSetup=Partnership setup
+PartnershipAbout=About Partnership
+PartnershipAboutPage=Partnership about page
+partnershipforthirdpartyormember=Partner status must be set on a 'thirdparty' or a 'member'
+PARTNERSHIP_IS_MANAGED_FOR=Partnership managed for
+PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks to check
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb of days before cancelling status of a partnership when a subscription has expired
+ReferingWebsiteCheck=Check of website referring
+ReferingWebsiteCheckDesc=You can enable a feature to check that your partners has added a backlink to your website domains on their own website.
 
 #
 # Object
 #
+DeletePartnership=Delete a partnership
+PartnershipDedicatedToThisThirdParty=Partnership dedicated to this third party
+PartnershipDedicatedToThisMember=Partnership dedicated to this member
 DatePartnershipStart=Datum početka
 DatePartnershipEnd=Datum završetka
+ReasonDecline=Decline reason
+ReasonDeclineOrCancel=Decline reason
+PartnershipAlreadyExist=Partnership already exist
+ManagePartnership=Manage partnership
+BacklinkNotFoundOnPartnerWebsite=Backlink not found on partner website
+ConfirmClosePartnershipAsk=Are you sure you want to cancel this partnership?
+PartnershipType=Partnership type
 
 #
 # Template Mail
 #
+SendingEmailOnPartnershipWillSoonBeCanceled=Partnership will soon be canceled
+SendingEmailOnPartnershipRefused=Partnership refused
+SendingEmailOnPartnershipAccepted=Partnership accepted
+SendingEmailOnPartnershipCanceled=Partnership canceled
 
+YourPartnershipWillSoonBeCanceledTopic=Partnership will soon be canceled
+YourPartnershipRefusedTopic=Partnership refused
+YourPartnershipAcceptedTopic=Partnership accepted
+YourPartnershipCanceledTopic=Partnership canceled
+
+YourPartnershipWillSoonBeCanceledContent=We inform you that your partnership will soon be canceled (Backlink not found)
+YourPartnershipRefusedContent=We inform you that your partnership request has been refused.
+YourPartnershipAcceptedContent=We inform you that your partnership request has been accepted.
+YourPartnershipCanceledContent=We inform you that your partnership has been canceled.
 
 #
 # Status
 #
-PartnershipDraft = Skica
-PartnershipAccepted = Prihvaćeno
-PartnershipRefused = Odbijeno
-PartnershipCanceled = Poništeno
-
+PartnershipDraft=Skica
+PartnershipAccepted=Prihvaćeno
+PartnershipRefused=Odbijeno
+PartnershipCanceled=Poništeno
 PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/hr_HR/productbatch.lang b/htdocs/langs/hr_HR/productbatch.lang
index a29844d360d..99758559299 100644
--- a/htdocs/langs/hr_HR/productbatch.lang
+++ b/htdocs/langs/hr_HR/productbatch.lang
@@ -1,4 +1,4 @@
-# ProductBATCH language file - en_US - ProductBATCH
+# ProductBATCH language file - Source file is en_US - ProductBATCH
 ManageLotSerial=Koristi lot/serijski broj
 ProductStatusOnBatch=Yes (lot required)
 ProductStatusOnSerial=Yes (unique serial number required)
@@ -33,3 +33,13 @@ CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+LifeTime=Life span (in days)
+EndOfLife=End of life
+ManufacturingDate=Manufacturing date
+DestructionDate=Destruction date
+FirstUseDate=First use date
+QCFrequency=Quality control frequency (in days)
+
+#Traceability - qc status
+OutOfOrder=Out of order
+InWorkingOrder=In working order
diff --git a/htdocs/langs/hr_HR/products.lang b/htdocs/langs/hr_HR/products.lang
index 5f356fa177f..51a3b6a6888 100644
--- a/htdocs/langs/hr_HR/products.lang
+++ b/htdocs/langs/hr_HR/products.lang
@@ -396,3 +396,5 @@ ActionAvailableOnVariantProductOnly=Action only available on the variant of prod
 ProductsPricePerCustomer=Product prices per customers
 ProductSupplierExtraFields=Additional Attributes (Supplier Prices)
 DeleteLinkedProduct=Delete the child product linked to the combination
+PMPValue=Procjenjena prosječna cijena
+PMPValueShort=PPC
diff --git a/htdocs/langs/hr_HR/projects.lang b/htdocs/langs/hr_HR/projects.lang
index a7555ee89e2..829e322fa5e 100644
--- a/htdocs/langs/hr_HR/projects.lang
+++ b/htdocs/langs/hr_HR/projects.lang
@@ -267,9 +267,11 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=Novi račun
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+OneLinePerTimeSpentLine=One line for each time spent declaration
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
 AddPersonToTask=Add also to tasks
 UsageOrganizeEvent=Usage: Event Organization
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
+SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
diff --git a/htdocs/langs/hr_HR/receptions.lang b/htdocs/langs/hr_HR/receptions.lang
index 9601e374ad9..a6d8d56ffc8 100644
--- a/htdocs/langs/hr_HR/receptions.lang
+++ b/htdocs/langs/hr_HR/receptions.lang
@@ -44,4 +44,4 @@ ValidateOrderFirstBeforeReception=You must first validate the order before being
 ReceptionsNumberingModules=Numbering module for receptions
 ReceptionsReceiptModel=Document templates for receptions
 NoMorePredefinedProductToDispatch=No more predefined products to dispatch
-
+ReceptionExist=A reception exists
diff --git a/htdocs/langs/hr_HR/stocks.lang b/htdocs/langs/hr_HR/stocks.lang
index 7ea3ed77d6b..ed2b70773a7 100644
--- a/htdocs/langs/hr_HR/stocks.lang
+++ b/htdocs/langs/hr_HR/stocks.lang
@@ -56,8 +56,6 @@ UnitPurchaseValue=Jed. nabavna cijena
 StockTooLow=Preniska zaliha
 StockLowerThanLimit=Stock lower than alert limit (%s)
 EnhancedValue=Vrijednost
-PMPValue=Procjenjena prosječna cijena
-PMPValueShort=PPC
 EnhancedValueOfWarehouses=Vrijednost skladišta
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
@@ -251,7 +249,10 @@ SelectAStockMovementFileToImport=select a stock movement file to import
 InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
 LabelOfInventoryMovemement=Inventory %s
 ReOpen=Ponovo otvori
-ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock to the real qty you entered into the inventory.
 ObjectNotFound=%s not found
 MakeMovementsAndClose=Generate movements and close
 AutofillWithExpected=Fill real quantity with expected quantity
+ShowAllBatchByDefault=By default, show batch details on product "stock" tab
+CollapseBatchDetailHelp=You can set batch detail default display in stocks module configuration
+FieldCannotBeNegative=Field "%s" cannot be negative
diff --git a/htdocs/langs/hr_HR/ticket.lang b/htdocs/langs/hr_HR/ticket.lang
index 720848a5c1d..5d4b66f493b 100644
--- a/htdocs/langs/hr_HR/ticket.lang
+++ b/htdocs/langs/hr_HR/ticket.lang
@@ -304,7 +304,7 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
-BoxTicketType=Number of open tickets by type
+BoxTicketType=Distribution of open tickets by type
 BoxTicketSeverity=Number of open tickets by severity
 BoxNoTicketSeverity=No tickets opened
 BoxTicketLastXDays=Number of new tickets by days the last %s days
diff --git a/htdocs/langs/hu_HU/accountancy.lang b/htdocs/langs/hu_HU/accountancy.lang
index acd1a8d2154..e62587fd93e 100644
--- a/htdocs/langs/hu_HU/accountancy.lang
+++ b/htdocs/langs/hu_HU/accountancy.lang
@@ -158,7 +158,7 @@ ACCOUNTING_LENGTH_AACCOUNT=Length of the third-party accounting accounts (If you
 ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of an accounting account. Needed by some countries (like Switzerland). If set to off (default), you can set the following two parameters to ask the application to add virtual zeros.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties, break ability to search on a part of value)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
@@ -328,6 +328,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountanc
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
+NotifiedExportDate=Notified export date (modification of the entries will not be possible)
+NotifiedValidationDate=Validation of the entries (modification or deletion of the entries will not be possible)
+ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=Export draft journal
 Modelcsv=Model of export
 Selectmodelcsv=Select a model of export
diff --git a/htdocs/langs/hu_HU/admin.lang b/htdocs/langs/hu_HU/admin.lang
index 17c7effaee9..59e645d548c 100644
--- a/htdocs/langs/hu_HU/admin.lang
+++ b/htdocs/langs/hu_HU/admin.lang
@@ -221,8 +221,8 @@ NotCompatible=Ez a modul nem tűnik kompatibilisnek a Dolibarr %s verzióval (Mi
 CompatibleAfterUpdate=Ehhez a modulhoz frissíteni kell a Dolibarr %s-t (Min %s - Max %s).
 SeeInMarkerPlace=Lásd a piactéren
 SeeSetupOfModule=Lásd a %s modul beállításait
+SetOptionTo=Set option <b>%s</b> to %s
 Updated=Frissítve
-Nouveauté=Újdonság
 AchatTelechargement=Vásárlás / Letöltés
 GoModuleSetupArea=Új modul telepítéséhez / telepítéséhez ugorjon a Modul beállítása területre: <a href="%s"> %s </a>.
 DoliStoreDesc=DoliStore, a hivatalos Dolibarr ERP / CRM piactér külső modulok számára
@@ -399,6 +399,7 @@ SecurityToken=Kulcs a biztonságos URL-ek
 NoSmsEngine=Nincs elérhető SMS küldő kezelő. Az SMS-küldő kezelőt nem telepíti az alapértelmezett disztribúcióval, mivel azok külső gyártótól függenek, de néhányat találhat az %s-on
 PDF=PDF
 PDFDesc=Globális beállítások PDF létrehozására
+PDFOtherDesc=PDF Option specific to some modules
 PDFAddressForging=A cím szekció szabályai
 HideAnyVATInformationOnPDF=A forgalmi adóval / ÁFA-val kapcsolatos összes információ elrejtése
 PDFRulesForSalesTax=A forgalmi adó / ÁFA szabályai
@@ -561,7 +562,7 @@ Module53Desc=Szolgáltatások kezelése
 Module54Name=Szerződések / Előfizetések
 Module54Desc=Szerződések kezelése (szolgáltatások vagy ismétlődő előfizetések)
 Module55Name=Vonalkódok
-Module55Desc=Vonalkód kezelés
+Module55Desc=Barcode or QR code management
 Module56Name=Fizetés átutalással
 Module56Desc=A beszállítók fizetésének kezelése átutalási megbízásokkal. Ez magában foglalja a SEPA fájl létrehozását az európai országok számára.
 Module57Name=Fizetés csoportos beszedési megbízással
@@ -848,10 +849,10 @@ Permission402=Létrehozza / módosítja kedvezmények
 Permission403=Kedvezmények érvényesítése
 Permission404=Törlés kedvezmények
 Permission430=Használja a Hibakeresősávot
-Permission511=Read payments of salaries (yours and subordinates)
-Permission512=Fizetése létrehozása/módosítása
-Permission514=A fizetések kifizetésének törlése
-Permission517=Read payments of salaries of everybody
+Permission511=Read salaries and payments (yours and subordinates)
+Permission512=Create/modify salaries and payments
+Permission514=Delete salaries and payments
+Permission517=Read salaries and payments everybody
 Permission519=Fizetések exportálása
 Permission520=Hitelek megtekintése
 Permission522=Hitelek létrehozása/módosítása
@@ -965,6 +966,8 @@ Permission23003=Ütemezett feladatok törlése
 Permission23004=Ütemezett feladat végrehajtása
 Permission50101=Use Point of Sale (SimplePOS)
 Permission50151=Use Point of Sale (TakePOS)
+Permission50152=Edit sales lines
+Permission50153=Edit ordered sales lines
 Permission50201=Olvassa tranzakciók
 Permission50202=Import ügyletek
 Permission50330=Read objects of Zapier
@@ -1039,11 +1042,12 @@ DictionaryMeasuringUnits=Mértékegységek
 DictionarySocialNetworks=Közösségi hálózatok
 DictionaryProspectStatus=Prospect status for companies
 DictionaryProspectContactStatus=Prospect status for contacts
-DictionaryHolidayTypes=Types of leave
+DictionaryHolidayTypes=Leave - Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
 DictionaryTransportMode=Intracomm report - Transport mode
+DictionaryBatchStatus=Product lot/serial Quality Control status
 TypeOfUnit=Type of unit
 SetupSaved=Beállítás mentett
 SetupNotSaved=A beállítás nincs elmentve
@@ -1187,7 +1191,7 @@ SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of m
 SetupDescription5=Az "Egyéb beállítás" menü az opcionális paramétereket tartalmazza.
 AuditedSecurityEvents=Security events that are audited
 NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
-Audit=Könyvvizsgálat
+Audit=Security events
 InfoDolibarr=A Dolibarr jellemzői
 InfoBrowser=A böngésző jellemzői
 InfoOS=Az operációs rendszer jellemzői
@@ -1319,9 +1323,12 @@ ConditionIsCurrently=Az állapot jelenleg %s
 YouUseBestDriver=A(z) %s illesztőprogramot használja, amely a jelenleg elérhető legjobb illesztőprogram.
 YouDoNotUseBestDriver=A(z) %s illesztőprogramot használja, de az %s illesztőprogram használata ajánlott.
 NbOfObjectIsLowerThanNoPb=Csak %s %s van az adatbázisban. Ez nem igényel különösebb optimalizálást.
+ComboListOptim=Combo list loading optimization
 SearchOptim=Keresés optimalizálása
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
-YouHaveXObjectAndSearchOptimOn=%s %s van az adatbázisban, és az %s konstans értéke 1-re van állítva a Nyitólap->Beállítások->Egyéb beállítások oldalon.
+YouHaveXObjectUseComboOptim=You have %s %s in the database. You can go into setup of module to enable loading of combo list on key pressed event.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other.
+YouHaveXObjectUseSearchOptimDesc=This limits the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to %s in Home-Setup-Other.
 BrowserIsOK=A(z) %s webböngészőt használja. Ez a böngésző rendben van a biztonság és a teljesítmény szempontjából.
 BrowserIsKO=Az %s webböngészőt használja. Ez a böngésző köztudottan rossz választás a biztonság, a teljesítmény és a megbízhatóság szempontjából. Javasoljuk a Firefox, a Chrome, az Opera vagy a Safari használatát.
 PHPModuleLoaded=Az %s PHP összetevő betöltődött
@@ -1433,6 +1440,7 @@ MemberMainOptions=Fő opciók
 AdherentLoginRequired= Készítsen egy Login minden tagja számára
 AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Checkbox levelet küldeni visszaigazolást a tagok (jóváhagyás vagy új előfizetés) alapértelmezés szerint be van
+MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
 MembersDocModules=Document templates for documents generated from member record
@@ -1763,7 +1771,7 @@ AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting men
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
-AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the scheduled job %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Kattintson a Tárcsázás modul beállítása
@@ -1979,6 +1987,8 @@ 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_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add picture on proposal line
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add electronic sign in PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
@@ -2096,7 +2106,6 @@ PDF_SHOW_PROJECT=Show project on document
 ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
-FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
@@ -2120,12 +2129,18 @@ ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by
 MailToSendEventOrganization=Event Organization
 AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
 YouShouldDisablePHPFunctions=You should disable PHP functions
-IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands in custom code, you shoud disable PHP functions
+PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
+NotRecommended=Not recommanded
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
 ModuleUpdateAvailable=An update is available
 NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
+RandomlySelectedIfSeveral=Randomly selected if several pictures are available
+DatabasePasswordObfuscated=Database password is obfuscated in conf file
+DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
diff --git a/htdocs/langs/hu_HU/agenda.lang b/htdocs/langs/hu_HU/agenda.lang
index 09e7e836d73..ed87875b778 100644
--- a/htdocs/langs/hu_HU/agenda.lang
+++ b/htdocs/langs/hu_HU/agenda.lang
@@ -4,7 +4,7 @@ Actions=Cselekvések
 Agenda=Napirend
 TMenuAgenda=Napirend
 Agendas=Napirendek
-LocalAgenda=Belső naptár
+LocalAgenda=Default calendar
 ActionsOwnedBy=Esemény gazdája
 ActionsOwnedByShort=Tulajdonos
 AffectedTo=Hozzárendelve
@@ -14,13 +14,13 @@ EventsNb=Események száma
 ListOfActions=Események listája
 EventReports=Event reports
 Location=Helyszín
-ToUserOfGroup=Event assigned to any user in group
+ToUserOfGroup=Event assigned to any user in the group
 EventOnFullDay=Egész napos esemény
 MenuToDoActions=Minden nem teljesített cselekvés
 MenuDoneActions=Minden megszüntetett cselekvés
 MenuToDoMyActions=Nem teljesített cselekvéseim
 MenuDoneMyActions=Megszüntetett cselekvéseim
-ListOfEvents=Események listája (belső naptár)
+ListOfEvents=List of events (default calendar)
 ActionsAskedBy=Cselekvéseket rögzítette
 ActionsToDoBy=Események hozzárendelve
 ActionsDoneBy=Végrehajtotta
@@ -38,6 +38,7 @@ ActionsEvents=Events for which Dolibarr will create an action in agenda automati
 EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Third party %s created
+COMPANY_MODIFYInDolibarr=Third party %s modified
 COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=%s szerződés jóváhagyva
 CONTRACT_DELETEInDolibarr=Contract %s deleted
@@ -87,6 +88,7 @@ OrderDeleted=Order deleted
 InvoiceDeleted=Invoice deleted
 DraftInvoiceDeleted=Draft invoice deleted
 CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_MODIFYInDolibarr=Contact %s modified
 CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Product %s created
 PRODUCT_MODIFYInDolibarr=Product %s modified
@@ -119,6 +121,7 @@ MRP_MO_UNVALIDATEInDolibarr=MO set to draft status
 MRP_MO_PRODUCEDInDolibarr=MO produced
 MRP_MO_DELETEInDolibarr=MO deleted
 MRP_MO_CANCELInDolibarr=MO canceled
+PAIDInDolibarr=%s paid
 ##### End agenda events #####
 AgendaModelModule=Document templates for event
 DateActionStart=Indulási dátum
@@ -130,7 +133,7 @@ AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to use
 AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
 AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic events.
 AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> to include events of holidays.
-AgendaShowBirthdayEvents=Mutassa a születésnapokat a névjegyzékben
+AgendaShowBirthdayEvents=Birthdays of contacts
 AgendaHideBirthdayEvents=Rejtse el a születésnapokat a névjegyzékben 
 Busy=Elfoglalt
 ExportDataset_event1=List of agenda events
@@ -152,6 +155,7 @@ ActionType=Event type
 DateActionBegin=Start event date
 ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b>?
 RepeatEvent=Repeat event
+OnceOnly=Once only
 EveryWeek=Every week
 EveryMonth=Every month
 DayOfMonth=Day of month
@@ -165,4 +169,4 @@ TimeType=Duration type
 ReminderType=Callback type
 AddReminder=Create an automatic reminder notification for this event
 ErrorReminderActionCommCreation=Error creating the reminder notification for this event
-BrowserPush=Browser Notification
+BrowserPush=Browser Popup Notification
diff --git a/htdocs/langs/hu_HU/bills.lang b/htdocs/langs/hu_HU/bills.lang
index 60a53dbffb7..7260d54c252 100644
--- a/htdocs/langs/hu_HU/bills.lang
+++ b/htdocs/langs/hu_HU/bills.lang
@@ -259,6 +259,7 @@ DateMaxPayment=Payment due on
 DateInvoice=Számla dátuma
 DatePointOfTax=Point of tax
 NoInvoice=Nincs számla
+NoOpenInvoice=No open invoice
 ClassifyBill=Számla osztályozása
 SupplierBillsToPay=Unpaid vendor invoices
 CustomerBillsUnpaid=Nyiott vevőszámlák
@@ -589,3 +590,4 @@ FacParentLine=Invoice Line Parent
 SituationTotalRayToRest=Remainder to pay without taxe
 PDFSituationTitle=Situation n° %d
 SituationTotalProgress=Total progress %d %%
+SearchUnpaidInvoicesWithDueDate=Search unpaid invoices with a due date = %s
diff --git a/htdocs/langs/hu_HU/cashdesk.lang b/htdocs/langs/hu_HU/cashdesk.lang
index 4dc1b0d8aad..3f593a27d4d 100644
--- a/htdocs/langs/hu_HU/cashdesk.lang
+++ b/htdocs/langs/hu_HU/cashdesk.lang
@@ -102,7 +102,7 @@ CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal numb
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
 SaleStartedAt=Sale started at %s
-ControlCashOpening=Control cash popup at opening POS
+ControlCashOpening=Open the "Control cash" popup when opening the POS
 CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -126,5 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
-ShowPriceHT = Display the price excluding tax column
-ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
+ShowPriceHT = Display the column with the price excluding tax (on screen)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
diff --git a/htdocs/langs/hu_HU/compta.lang b/htdocs/langs/hu_HU/compta.lang
index 3f2846904ee..4e1f395b2a5 100644
--- a/htdocs/langs/hu_HU/compta.lang
+++ b/htdocs/langs/hu_HU/compta.lang
@@ -286,3 +286,9 @@ ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
 IncludeLoansInResults = Include loans in reports
+InvoiceLate30Days = Invoices late > 30 days
+InvoiceLate15Days = Invoices late > 15 days
+InvoiceLateMinus15Days = Invoices late
+InvoiceNotLate = To be collected < 15 days
+InvoiceNotLate15Days = To be collected in 15 days
+InvoiceNotLate30Days = To be collected in 30 days
diff --git a/htdocs/langs/hu_HU/cron.lang b/htdocs/langs/hu_HU/cron.lang
index 88f0a731a8c..1a95e552b72 100644
--- a/htdocs/langs/hu_HU/cron.lang
+++ b/htdocs/langs/hu_HU/cron.lang
@@ -60,7 +60,7 @@ CronErrEndDateStartDt=A befejezés időpontja nem lehet hamarabb mint a kezdet
 StatusAtInstall=Status at module installation
 CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Letiltás
-CronTaskInactive=Ez a feladat ki van kapcsolva
+CronTaskInactive=This job is disabled (not scheduled)
 CronId=Id
 CronClassFile=Filename with class
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example 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>
diff --git a/htdocs/langs/hu_HU/errors.lang b/htdocs/langs/hu_HU/errors.lang
index d0a29f81991..d06fc6e5773 100644
--- a/htdocs/langs/hu_HU/errors.lang
+++ b/htdocs/langs/hu_HU/errors.lang
@@ -11,6 +11,7 @@ ErrorBadValueForParamNotAString=Bad value for your parameter. It appends general
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=A %s felhasználói név már létezik.
 ErrorGroupAlreadyExists=A %s csoport már létezik.
+ErrorEmailAlreadyExists=Email %s already exists.
 ErrorRecordNotFound=A rekord nem található
 ErrorFailToCopyFile=A '<b>%s</b>' fájl másolása sikertelen '<b>%s</b>' -ba.
 ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
@@ -117,7 +118,7 @@ ErrorCantReadFile=Nem sikerült olvasni file "%s"
 ErrorCantReadDir=Nem sikerült olvasni könyvtár "%s"
 ErrorBadLoginPassword=Rossz érték be vagy jelszó
 ErrorLoginDisabled=A fiók le van tiltva
-ErrorFailedToRunExternalCommand=Nem sikerült futtatni külső parancsot. Ellenőrizze, hogy elérhető és futtatható a PHP szerver. Ha a PHP <b>Safe Mode</b> be van kapcsolva, ellenőrizze, hogy a parancs belsejében egy könyvtár által meghatározott paraméter <b>safe_mode_exec_dir.</b>
+ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server user. Check also the command is not protected on shell level by a security layer like apparmor.
 ErrorFailedToChangePassword=Nem sikerült megváltoztatni a jelszót
 ErrorLoginDoesNotExists=Felhasználó bejelentkezési <b>%s</b> nem található.
 ErrorLoginHasNoEmail=Ennek a felhasználónak nincs e-mail címre. Folyamat megszakítva.
@@ -262,6 +263,7 @@ ErrorDateIsInFuture=Error, the date can't be in the future
 ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
 ErrorAPercentIsRequired=Error, please fill in the percentage correctly
 ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
+ErrorFailedToFindEmailTemplate=Failed to find template with code name %s
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -298,3 +300,4 @@ WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So y
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
+ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
diff --git a/htdocs/langs/hu_HU/eventorganization.lang b/htdocs/langs/hu_HU/eventorganization.lang
index ec363794b35..4840d6b0819 100644
--- a/htdocs/langs/hu_HU/eventorganization.lang
+++ b/htdocs/langs/hu_HU/eventorganization.lang
@@ -1,4 +1,5 @@
 # Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+# Copyright (C) 2021		Dorian Vabre			<dorian.vabre@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
@@ -81,7 +82,10 @@ PriceOfBoothHelp=Subscription price to stand a booth
 EventOrganizationICSLink=Link ICS for events
 ConferenceOrBoothInformation=Conference Or Booth informations
 Attendees = Attendees
+DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
 #
 # Status
 #
@@ -94,8 +98,46 @@ EvntOrgCancelled = Cancelled
 #
 # Public page
 #
+SuggestForm = Suggestion page
+RegisterPage = Page for conferences or booth
+EvntOrgRegistrationHelpMessage = Here, you can vote for an event, or suggest a new conference or booth for the project
+EvntOrgRegistrationConfHelpMessage = Here, you can suggest a new conference for the project
+EvntOrgRegistrationBoothHelpMessage = Here, you can suggest a new booth for the project
+ListOfSuggestedConferences = List of suggested conferences
+ListOfSuggestedBooths = List of suggested booths
+SuggestConference = Suggest a new conference
+SuggestBooth = Suggest a booth
+ViewAndVote = View and vote for suggested events
 PublicAttendeeSubscriptionPage = Public link of registration to a conference
 MissingOrBadSecureKey = The security key is invalid or missing
-EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
-EvntOrgStartDuration = This conference starts on
-EvntOrgEndDuration =  and ends on
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference : '%s'
+EvntOrgDuration = This conference starts on %s and ends on %s.
+ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
+BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
+EventType = Event type
+
+#
+# Vote page
+#
+EvntOrgRegistrationWelcomeMessage = Welcome on the conference or booth suggestion page.
+EvntOrgRegistrationConfWelcomeMessage = Welcome on the conference suggestion page.
+EvntOrgRegistrationBoothWelcomeMessage = Welcome on the booth suggestion page.
+EvntOrgVoteHelpMessage = Here, you can view and vote for the suggested events for the project
+VoteOk = Your vote has been accepted.
+AlreadyVoted = You have already voted for this event.
+VoteError = An error has occurred during the vote, please try again.
+
+#
+# SubscriptionOk page
+#
+SubscriptionOk = Your subscription to this conference has been validated
+#
+# Subscription validation mail
+#
+ConfAttendeeSubscriptionConfirmation = Confirmation of your subscription to a conference
+#
+# Payment page
+#
+Attendee = Attendee
+PaymentConferenceAttendee = Conference attendee payment
+PaymentBoothLocation = Booth location payment
diff --git a/htdocs/langs/hu_HU/hrm.lang b/htdocs/langs/hu_HU/hrm.lang
index 38a5e58b39c..3a2b88f92bc 100644
--- a/htdocs/langs/hu_HU/hrm.lang
+++ b/htdocs/langs/hu_HU/hrm.lang
@@ -9,7 +9,7 @@ ConfirmDeleteEstablishment=Biztosan törli ezt a létesítményt?
 OpenEtablishment=Létesítmény megnyitása
 CloseEtablishment=Létesítmény lezárása
 # Dictionary
-DictionaryPublicHolidays=HRM - ünnepnapok
+DictionaryPublicHolidays=Leave - Public holidays
 DictionaryDepartment=HRM - Osztálylista
 DictionaryFunction=HRM - Munkahelyek
 # Module
diff --git a/htdocs/langs/hu_HU/knowledgemanagement.lang b/htdocs/langs/hu_HU/knowledgemanagement.lang
index 983d7605cd6..3865a6cd93b 100644
--- a/htdocs/langs/hu_HU/knowledgemanagement.lang
+++ b/htdocs/langs/hu_HU/knowledgemanagement.lang
@@ -47,7 +47,7 @@ KnowledgeManagementArea = Knowledge Management
 # Menu
 #
 MenuKnowledgeRecord = Knowledge base
-ListOfArticles = List of articles
+ListKnowledgeRecord = List of articles
 NewKnowledgeRecord = New article
 ValidateReply = Validate solution
 KnowledgeRecords = Articles
diff --git a/htdocs/langs/hu_HU/languages.lang b/htdocs/langs/hu_HU/languages.lang
index 1242a9d40dd..df26fa4c81a 100644
--- a/htdocs/langs/hu_HU/languages.lang
+++ b/htdocs/langs/hu_HU/languages.lang
@@ -3,6 +3,7 @@ Language_am_ET=Ethiopian
 Language_ar_AR=Arab
 Language_ar_EG=Arab (Egyiptom)
 Language_ar_SA=Arab
+Language_ar_TN=Arabic (Tunisia)
 Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengáli
 Language_bn_IN=Bengali (India)
@@ -84,6 +85,7 @@ Language_nl_NL=Holland
 Language_pl_PL=Lengyel
 Language_pt_BR=Portugál (Brazilia)
 Language_pt_PT=Portugál
+Language_ro_MD=Romanian (Moldavia)
 Language_ro_RO=Román
 Language_ru_RU=Orosz
 Language_ru_UA=Orosz (Ukrajna)
diff --git a/htdocs/langs/hu_HU/main.lang b/htdocs/langs/hu_HU/main.lang
index 53bac5b2e65..7840b6c4e24 100644
--- a/htdocs/langs/hu_HU/main.lang
+++ b/htdocs/langs/hu_HU/main.lang
@@ -430,6 +430,7 @@ LT1IN=CGST
 LT2IN=SGST
 LT1GC=Kiegészítő összeg
 VATRate=ÁFA érték
+RateOfTaxN=Rate of tax %s
 VATCode=Adószám kód
 VATNPR=NPR adó mértéke 
 DefaultTaxRate=Alapértelmezett adómérték
@@ -729,6 +730,7 @@ MenuMembers=Tagok
 MenuAgendaGoogle=Google naptár
 MenuTaxesAndSpecialExpenses=Adók | Különleges kiadások
 ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
+ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
 NoFileFound=No documents uploaded
 CurrentUserLanguage=Jelenlegi nyelv
 CurrentTheme=Jelenlegi téma
@@ -1072,6 +1074,7 @@ ValidFrom=Érvényes (-tól)
 ValidUntil=Érvényes (-ig)
 NoRecordedUsers=Nincs felhasználó
 ToClose=Bezárni
+ToRefuse=To refuse
 ToProcess=Feldolgozni
 ToApprove=Jóváhagyásra
 GlobalOpenedElemView=Globális nézet
@@ -1126,9 +1129,11 @@ UpdateForAllLines=Update for all lines
 OnHold=On hold
 Civility=Civility
 AffectTag=Affect Tag
+CreateExternalUser=Create external user
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
 ConfirmCancel=Are you sure you want to cancel
+EmailMsgID=Email MsgID
diff --git a/htdocs/langs/hu_HU/members.lang b/htdocs/langs/hu_HU/members.lang
index 3eb2d96dea9..0504ed8b229 100644
--- a/htdocs/langs/hu_HU/members.lang
+++ b/htdocs/langs/hu_HU/members.lang
@@ -213,3 +213,5 @@ SendReminderForExpiredSubscription=Küldj e-mailes emlékeztetőt a tagnak az el
 MembershipPaid=A tagdíj kiegyenlítve az aktuális időszakra ( 1 %s-ig )
 YouMayFindYourInvoiceInThisEmail=A számlát ehhez az e-mailhez csatolva találhatja meg.
 XMembersClosed=1 %s tag(ok) lezárva
+XExternalUserCreated=%s external user(s) created
+ForceMemberNature=Force member nature (Individual or Corporation)
diff --git a/htdocs/langs/hu_HU/modulebuilder.lang b/htdocs/langs/hu_HU/modulebuilder.lang
index ade65249c96..6ae09a415d3 100644
--- a/htdocs/langs/hu_HU/modulebuilder.lang
+++ b/htdocs/langs/hu_HU/modulebuilder.lang
@@ -143,3 +143,4 @@ AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
 ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
+ImportExportProfiles=Import and export profiles
diff --git a/htdocs/langs/hu_HU/mrp.lang b/htdocs/langs/hu_HU/mrp.lang
index 74f340cce90..350817adedb 100644
--- a/htdocs/langs/hu_HU/mrp.lang
+++ b/htdocs/langs/hu_HU/mrp.lang
@@ -8,12 +8,12 @@ MenuBOM=Bills of material
 LatestBOMModified=Latest %s Bills of materials modified
 LatestMOModified=Latest %s Manufacturing Orders modified
 Bom=Bills of Material
-BillOfMaterials=Bill of Material
+BillOfMaterials=Bill of Materials
 BOMsSetup=Setup of module BOM
 ListOfBOMs=List of bills of material - BOM
 ListOfManufacturingOrders=List of Manufacturing Orders
-NewBOM=New bill of material
-ProductBOMHelp=Product to create with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
+NewBOM=New bill of materials
+ProductBOMHelp=Product to create (or disassemble) with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
 BOMsNumberingModules=BOM numbering templates
 BOMsModelModule=BOM document templates
 MOsNumberingModules=MO numbering templates
@@ -22,7 +22,7 @@ FreeLegalTextOnBOMs=Free text on document of BOM
 WatermarkOnDraftBOMs=Watermark on draft BOM
 FreeLegalTextOnMOs=Free text on document of MO
 WatermarkOnDraftMOs=Watermark on draft MO
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials %s ?
 ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
 ManufacturingEfficiency=Manufacturing efficiency
 ConsumptionEfficiency=Consumption efficiency
@@ -30,8 +30,8 @@ ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the produc
 ValueOfMeansLossForProductProduced=Value of 0.95 means an average of 5%% of loss of produced product
 DeleteBillOfMaterials=Delete Bill Of Materials
 DeleteMo=Delete Manufacturing Order
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Materials?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Materials?
 MenuMRP=Gyártási rendelések
 NewMO=New Manufacturing Order
 QtyToProduce=Qty to produce
@@ -39,7 +39,7 @@ DateStartPlannedMo=Date start planned
 DateEndPlannedMo=Date end planned
 KeepEmptyForAsap=Empty means 'As Soon As Possible'
 EstimatedDuration=Estimated duration
-EstimatedDurationDesc=Estimated duration to manufacture this product using this BOM
+EstimatedDurationDesc=Estimated duration to manufacture (or disassemble) this product using this BOM
 ConfirmValidateBom=Are you sure you want to validate the BOM with the reference <strong>%s</strong> (you will be able to use it to build new Manufacturing Orders)
 ConfirmCloseBom=Are you sure you want to cancel this BOM (you won't be able to use it to build new Manufacturing Orders anymore) ?
 ConfirmReopenBom=Are you sure you want to re-open this BOM (you will be able to use it to build new Manufacturing Orders)
@@ -63,13 +63,14 @@ ConsumeAndProduceAll=Consume and Produce All
 Manufactured=Manufactured
 TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
 ForAQuantityOf=For a quantity to produce of %s
+ForAQuantityToConsumeOf=For a quantity to disassemble of %s
 ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
 ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
 ProductionForRef=Production of %s
 AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
 NoStockChangeOnServices=No stock change on services
 ProductQtyToConsumeByMO=Product quantity still to consume by open MO
-ProductQtyToProduceByMO=Product quentity still to produce by open MO
+ProductQtyToProduceByMO=Product quantity still to produce by open MO
 AddNewConsumeLines=Add new line to consume
 ProductsToConsume=Products to consume
 ProductsToProduce=Products to produce
@@ -83,15 +84,13 @@ Workstations=Workstations
 WorkstationsDescription=Workstations management
 WorkstationSetup = Workstations setup
 WorkstationSetupPage = Workstations setup page
-WorkstationAbout = About Workstation
-WorkstationAboutPage = Workstations about page
 WorkstationList=Workstation list
 WorkstationCreate=Add new workstation
 ConfirmEnableWorkstation=Are you sure you want to enable workstation <b>%s</b> ?
 EnableAWorkstation=Enable a workstation
 ConfirmDisableWorkstation=Are you sure you want to disable workstation <b>%s</b> ?
 DisableAWorkstation=Disable a workstation
-DeleteWorkstation=Supprimer
+DeleteWorkstation=Törlés
 NbOperatorsRequired=Number of operators required
 THMOperatorEstimated=Estimated operator THM
 THMMachineEstimated=Estimated machine THM
diff --git a/htdocs/langs/hu_HU/orders.lang b/htdocs/langs/hu_HU/orders.lang
index 02ff5a44729..0711e6f1804 100644
--- a/htdocs/langs/hu_HU/orders.lang
+++ b/htdocs/langs/hu_HU/orders.lang
@@ -11,6 +11,7 @@ OrderDate=Megrendelés dátuma
 OrderDateShort=Megrendelés dátuma
 OrderToProcess=Feldolgozandó megrendelés
 NewOrder=Új megbízás
+NewSupplierOrderShort=Új megbízás
 NewOrderSupplier=Új beszerzési megrendelés
 ToOrder=Rendelés készítése
 MakeOrder=Rendelés készítése
@@ -73,6 +74,7 @@ DeleteOrder=Megrendelés törlése
 CancelOrder=Megrendelés visszavonása
 OrderReopened= %s megrendelés újbóli megnyitása
 AddOrder=Megrendelés készítése
+AddSupplierOrderShort=Megrendelés készítése
 AddPurchaseOrder=Beszerzési megrendelés létrehozása
 AddToDraftOrders=Megrendelés tervekhez ad
 ShowOrder=Megrendelés mutatása
diff --git a/htdocs/langs/hu_HU/other.lang b/htdocs/langs/hu_HU/other.lang
index a390b96dd40..b59cb3d6b82 100644
--- a/htdocs/langs/hu_HU/other.lang
+++ b/htdocs/langs/hu_HU/other.lang
@@ -129,6 +129,7 @@ ClosedByLogin=Lezárta
 FileWasRemoved=Fájl %s eltávolították
 DirWasRemoved=Directory %s eltávolították
 FeatureNotYetAvailable=A funkció a jelenlegi verzióban még nem érhető el
+FeatureNotAvailableOnDevicesWithoutMouse=Feature not available on devices without mouse
 FeaturesSupported=Támogatott szolgáltatások
 Width=Szélesség
 Height=Magasság
@@ -263,7 +264,7 @@ ContactCreatedByEmailCollector=Az elérhetőség/cím létrehozva az e-mail gyű
 ProjectCreatedByEmailCollector=A projektet létrehozva az e-mail gyűjtő által az MSGID %s e-mailből
 TicketCreatedByEmailCollector=A jegy létrehozva az e-mail gyűjtő által az MSGID %s e-mailből
 OpeningHoursFormatDesc=A nyitvatartási időket (-tól-ig) kötőjellel (-) válassza el. <br> Használjon szóközt a különböző idősávok megadásához. <br> Példa: 8-12 14-18
-PrefixSession=Prefix for session ID
+SuffixSessionName=Suffix for session name
 
 ##### Export #####
 ExportsArea=Az export területén
diff --git a/htdocs/langs/hu_HU/partnership.lang b/htdocs/langs/hu_HU/partnership.lang
index e7739eb8af6..25efff303b7 100644
--- a/htdocs/langs/hu_HU/partnership.lang
+++ b/htdocs/langs/hu_HU/partnership.lang
@@ -16,41 +16,72 @@
 #
 # Generic
 #
-ModulePartnershipName = Partnership management
-PartnershipDescription = Module Partnership management
+ModulePartnershipName=Partnership management
+PartnershipDescription=Module Partnership management
 PartnershipDescriptionLong= Module Partnership management
 
+AddPartnership=Add partnership
+CancelPartnershipForExpiredMembers=Partnership: Cancel partnership of members with expired subscriptions
+PartnershipCheckBacklink=Partnership: Check referring backlink
+
 #
 # Menu
 #
-NewPartnership = New Partnership
-ListOfPartnerships = List of partnership
+NewPartnership=New Partnership
+ListOfPartnerships=List of partnership
 
 #
 # Admin page
 #
-PartnershipSetup = Partnership setup
-PartnershipAbout = About Partnership
-PartnershipAboutPage = Partnership about page
-
+PartnershipSetup=Partnership setup
+PartnershipAbout=About Partnership
+PartnershipAboutPage=Partnership about page
+partnershipforthirdpartyormember=Partner status must be set on a 'thirdparty' or a 'member'
+PARTNERSHIP_IS_MANAGED_FOR=Partnership managed for
+PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks to check
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb of days before cancelling status of a partnership when a subscription has expired
+ReferingWebsiteCheck=Check of website referring
+ReferingWebsiteCheckDesc=You can enable a feature to check that your partners has added a backlink to your website domains on their own website.
 
 #
 # Object
 #
+DeletePartnership=Delete a partnership
+PartnershipDedicatedToThisThirdParty=Partnership dedicated to this third party
+PartnershipDedicatedToThisMember=Partnership dedicated to this member
 DatePartnershipStart=Kezdet dátuma
 DatePartnershipEnd=Befejezés dátuma
+ReasonDecline=Decline reason
+ReasonDeclineOrCancel=Decline reason
+PartnershipAlreadyExist=Partnership already exist
+ManagePartnership=Manage partnership
+BacklinkNotFoundOnPartnerWebsite=Backlink not found on partner website
+ConfirmClosePartnershipAsk=Are you sure you want to cancel this partnership?
+PartnershipType=Partnership type
 
 #
 # Template Mail
 #
+SendingEmailOnPartnershipWillSoonBeCanceled=Partnership will soon be canceled
+SendingEmailOnPartnershipRefused=Partnership refused
+SendingEmailOnPartnershipAccepted=Partnership accepted
+SendingEmailOnPartnershipCanceled=Partnership canceled
 
+YourPartnershipWillSoonBeCanceledTopic=Partnership will soon be canceled
+YourPartnershipRefusedTopic=Partnership refused
+YourPartnershipAcceptedTopic=Partnership accepted
+YourPartnershipCanceledTopic=Partnership canceled
+
+YourPartnershipWillSoonBeCanceledContent=We inform you that your partnership will soon be canceled (Backlink not found)
+YourPartnershipRefusedContent=We inform you that your partnership request has been refused.
+YourPartnershipAcceptedContent=We inform you that your partnership request has been accepted.
+YourPartnershipCanceledContent=We inform you that your partnership has been canceled.
 
 #
 # Status
 #
-PartnershipDraft = Piszkozat
-PartnershipAccepted = Accepted
-PartnershipRefused = Visszautasított
-PartnershipCanceled = Visszavonva
-
+PartnershipDraft=Piszkozat
+PartnershipAccepted=Accepted
+PartnershipRefused=Visszautasított
+PartnershipCanceled=Visszavonva
 PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/hu_HU/productbatch.lang b/htdocs/langs/hu_HU/productbatch.lang
index ba6dc689fc1..59f47f89a79 100644
--- a/htdocs/langs/hu_HU/productbatch.lang
+++ b/htdocs/langs/hu_HU/productbatch.lang
@@ -1,4 +1,4 @@
-# ProductBATCH language file - en_US - ProductBATCH
+# ProductBATCH language file - Source file is en_US - ProductBATCH
 ManageLotSerial=Use lot/serial number
 ProductStatusOnBatch=Yes (lot required)
 ProductStatusOnSerial=Yes (unique serial number required)
@@ -33,3 +33,13 @@ CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+LifeTime=Life span (in days)
+EndOfLife=End of life
+ManufacturingDate=Manufacturing date
+DestructionDate=Destruction date
+FirstUseDate=First use date
+QCFrequency=Quality control frequency (in days)
+
+#Traceability - qc status
+OutOfOrder=Out of order
+InWorkingOrder=In working order
diff --git a/htdocs/langs/hu_HU/products.lang b/htdocs/langs/hu_HU/products.lang
index e33c49faa9e..ee12f3ea4a5 100644
--- a/htdocs/langs/hu_HU/products.lang
+++ b/htdocs/langs/hu_HU/products.lang
@@ -396,3 +396,5 @@ ActionAvailableOnVariantProductOnly=A művelet csak a termék változatánál é
 ProductsPricePerCustomer=Termékárak vevőnként
 ProductSupplierExtraFields=További tulajdonságok (szállítói árak)
 DeleteLinkedProduct=Törölje a kombinációhoz kapcsolt gyermekterméket
+PMPValue=Súlyozott átlagár
+PMPValueShort=SÁÉ
diff --git a/htdocs/langs/hu_HU/projects.lang b/htdocs/langs/hu_HU/projects.lang
index d69968ffa21..897ee4f37d1 100644
--- a/htdocs/langs/hu_HU/projects.lang
+++ b/htdocs/langs/hu_HU/projects.lang
@@ -267,9 +267,11 @@ InvoiceToUse=Használandó számlatervezet
 NewInvoice=Új számla
 OneLinePerTask=Feladatonként egy sor
 OneLinePerPeriod=Periódusonként egy sor
+OneLinePerTimeSpentLine=One line for each time spent declaration
 RefTaskParent=Ref. Szülői feladat
 ProfitIsCalculatedWith=A nyereség kiszámítása
 AddPersonToTask=Add also to tasks
 UsageOrganizeEvent=Usage: Event Organization
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
+SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
diff --git a/htdocs/langs/hu_HU/receptions.lang b/htdocs/langs/hu_HU/receptions.lang
index aa70f9d1f0a..2e40ba41a47 100644
--- a/htdocs/langs/hu_HU/receptions.lang
+++ b/htdocs/langs/hu_HU/receptions.lang
@@ -44,4 +44,4 @@ ValidateOrderFirstBeforeReception=You must first validate the order before being
 ReceptionsNumberingModules=Numbering module for receptions
 ReceptionsReceiptModel=Document templates for receptions
 NoMorePredefinedProductToDispatch=No more predefined products to dispatch
-
+ReceptionExist=A reception exists
diff --git a/htdocs/langs/hu_HU/stocks.lang b/htdocs/langs/hu_HU/stocks.lang
index 48d4ddc9f27..eff4308acd7 100644
--- a/htdocs/langs/hu_HU/stocks.lang
+++ b/htdocs/langs/hu_HU/stocks.lang
@@ -56,8 +56,6 @@ UnitPurchaseValue=Vételár
 StockTooLow=Készlet alacsony
 StockLowerThanLimit=A készlet határérték alá (%s) csökkent
 EnhancedValue=Érték
-PMPValue=Súlyozott átlagár
-PMPValueShort=SÁÉ
 EnhancedValueOfWarehouses=Raktárak értéke
 UserWarehouseAutoCreate=Felhasználói raktár automatikus létrehozása felhasználó hozzáadásakor
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
@@ -251,7 +249,10 @@ SelectAStockMovementFileToImport=select a stock movement file to import
 InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
 LabelOfInventoryMovemement=Inventory %s
 ReOpen=Reopen
-ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock to the real qty you entered into the inventory.
 ObjectNotFound=%s not found
 MakeMovementsAndClose=Generate movements and close
 AutofillWithExpected=Fill real quantity with expected quantity
+ShowAllBatchByDefault=By default, show batch details on product "stock" tab
+CollapseBatchDetailHelp=You can set batch detail default display in stocks module configuration
+FieldCannotBeNegative=Field "%s" cannot be negative
diff --git a/htdocs/langs/hu_HU/ticket.lang b/htdocs/langs/hu_HU/ticket.lang
index 59c439326d2..940875e54b8 100644
--- a/htdocs/langs/hu_HU/ticket.lang
+++ b/htdocs/langs/hu_HU/ticket.lang
@@ -304,7 +304,7 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
-BoxTicketType=Number of open tickets by type
+BoxTicketType=Distribution of open tickets by type
 BoxTicketSeverity=Number of open tickets by severity
 BoxNoTicketSeverity=No tickets opened
 BoxTicketLastXDays=Number of new tickets by days the last %s days
diff --git a/htdocs/langs/id_ID/accountancy.lang b/htdocs/langs/id_ID/accountancy.lang
index 5ee50624603..ab6505171c9 100644
--- a/htdocs/langs/id_ID/accountancy.lang
+++ b/htdocs/langs/id_ID/accountancy.lang
@@ -158,7 +158,7 @@ ACCOUNTING_LENGTH_AACCOUNT=Panjang akun akuntansi pihak ketiga (Jika Anda meneta
 ACCOUNTING_MANAGE_ZERO=Izinkan untuk mengelola jumlah nol yang berbeda di akhir akun akuntansi. Dibutuhkan oleh beberapa negara (seperti Swiss). Jika diatur ke mati (standar), Anda dapat mengatur dua parameter berikut untuk meminta aplikasi menambahkan angka nol virtual.
 BANK_DISABLE_DIRECT_INPUT=Nonaktifkan pencatatan langsung transaksi di rekening bank
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Aktifkan konsep ekspor di jurnal
-ACCOUNTANCY_COMBO_FOR_AUX=Aktifkan daftar kombo untuk akun anak perusahaan (mungkin lambat jika Anda memiliki banyak pihak ketiga)
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties, break ability to search on a part of value)
 ACCOUNTING_DATE_START_BINDING=Tentukan tanggal untuk mulai mengikat & mentransfer akuntansi. Di bawah tanggal ini, transaksi tidak akan dialihkan ke akuntansi.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Pada transfer akuntansi, pilih periode yang ditampilkan secara default
 
@@ -328,6 +328,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Nonaktifkan pengikatan & transfer akunta
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Nonaktifkan pengikatan & transfer akuntansi pada laporan pengeluaran (laporan pengeluaran tidak akan diperhitungkan dalam akuntansi)
 
 ## Export
+NotifiedExportDate=Notified export date (modification of the entries will not be possible)
+NotifiedValidationDate=Validation of the entries (modification or deletion of the entries will not be possible)
+ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=Ekspor draft jurnal
 Modelcsv=Model Ekspor
 Selectmodelcsv=Pilih satu model Ekspor
diff --git a/htdocs/langs/id_ID/admin.lang b/htdocs/langs/id_ID/admin.lang
index 299e5a8b016..b653844ce89 100644
--- a/htdocs/langs/id_ID/admin.lang
+++ b/htdocs/langs/id_ID/admin.lang
@@ -221,8 +221,8 @@ NotCompatible=Modul ini tampaknya tidak kompatibel dengan %s Dolibarr Anda (Min
 CompatibleAfterUpdate=Modul ini membutuhkan pembaruan untuk %s Dolibarr Anda (Min %s - Maks %s).
 SeeInMarkerPlace=Lihat di Pasar
 SeeSetupOfModule=Lihat pengaturan modul %s
+SetOptionTo=Set option <b>%s</b> to %s
 Updated=Diperbarui
-Nouveauté=Kebaruan
 AchatTelechargement=Beli / Unduh
 GoModuleSetupArea=Untuk menggunakan / memasang modul baru, buka area pengaturan Modul: <a href="%s"> %s </a>.
 DoliStoreDesc=DoliStore, pasar resmi untuk modul eksternal Dolibarr ERP / CRM
@@ -399,6 +399,7 @@ SecurityToken=Kunci untuk mengamankan URL
 NoSmsEngine=Tidak ada manajer pengirim SMS yang tersedia. Manajer pengirim SMS tidak diinstal dengan distribusi default karena tergantung pada vendor eksternal, tetapi Anda dapat menemukannya di %s
 PDF=PDF
 PDFDesc=Pilihan / opsi global untuk pembuatan PDF
+PDFOtherDesc=PDF Option specific to some modules
 PDFAddressForging=Aturan untuk bagian dari alamat
 HideAnyVATInformationOnPDF=Sembunyikan semua informasi yang terkait dengan Pajak Penjualan / PPN
 PDFRulesForSalesTax=Aturan untuk Pajak Penjualan / PPN
@@ -561,7 +562,7 @@ Module53Desc=Manajemen Layanan
 Module54Name=Kontrak / Langganan
 Module54Desc=Manajemen kontrak (layanan atau langganan berulang)
 Module55Name=Barcode
-Module55Desc=Manajemen barcode
+Module55Desc=Barcode or QR code management
 Module56Name=Pembayaran dengan transfer kredit
 Module56Desc=Manajemen pembayaran pemasok dengan pesanan Transfer Kredit. Ini termasuk pembuatan file SEPA untuk negara-negara Eropa.
 Module57Name=Pembayaran dengan Debit Langsung
@@ -848,10 +849,10 @@ Permission402=Buat / ubah diskon
 Permission403=Validasi diskon
 Permission404=Hapus diskon
 Permission430=Gunakan Debug Bar
-Permission511=Baca pembayaran gaji (milik Anda dan bawahan)
-Permission512=Buat / ubah pembayaran gaji
-Permission514=Hapus pembayaran gaji
-Permission517=Baca pembayaran gaji semua orang
+Permission511=Read salaries and payments (yours and subordinates)
+Permission512=Create/modify salaries and payments
+Permission514=Delete salaries and payments
+Permission517=Read salaries and payments everybody
 Permission519=Gaji ekspor
 Permission520=Baca Pinjaman
 Permission522=Buat / modifikasi pinjaman
@@ -965,6 +966,8 @@ Permission23003=Hapus pekerjaan terjadwal
 Permission23004=Jalankan pekerjaan yang Dijadwalkan
 Permission50101=Gunakan Point of Sale (SimplePOS)
 Permission50151=Gunakan Point of Sale (TakePOS)
+Permission50152=Edit sales lines
+Permission50153=Edit ordered sales lines
 Permission50201=Membaca Data Transaksi
 Permission50202=Transaksi impor
 Permission50330=Membaca objek Zapier
@@ -1039,11 +1042,12 @@ DictionaryMeasuringUnits=Unit Pengukur
 DictionarySocialNetworks=Jaringan sosial
 DictionaryProspectStatus=Status prospek untuk perusahaan
 DictionaryProspectContactStatus=Status prospek untuk kontak
-DictionaryHolidayTypes=Jenis cuti
+DictionaryHolidayTypes=Leave - Types of leave
 DictionaryOpportunityStatus=Status memimpin untuk proyek / prospek
 DictionaryExpenseTaxCat=Laporan biaya - Kategori transportasi
 DictionaryExpenseTaxRange=Laporan biaya - Kisaran berdasarkan kategori transportasi
 DictionaryTransportMode=Laporan Intracomm - Mode transportasi
+DictionaryBatchStatus=Product lot/serial Quality Control status
 TypeOfUnit=Jenis unit
 SetupSaved=Pengaturan disimpan
 SetupNotSaved=Pengaturan tidak disimpan
@@ -1187,7 +1191,7 @@ SetupDescription4= <a href="%s"> %s -> %s </a> <br> <br> Perangkat lunak ini ada
 SetupDescription5=Entri menu Pengaturan lainnya mengatur parameter opsional.
 AuditedSecurityEvents=Security events that are audited
 NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
-Audit=Audit
+Audit=Security events
 InfoDolibarr=Tentang Dolibarr
 InfoBrowser=Tentang Browser
 InfoOS=Tentang OS
@@ -1319,9 +1323,12 @@ ConditionIsCurrently=Kondisi saat ini %s
 YouUseBestDriver=Anda menggunakan driver %s yang merupakan driver terbaik yang saat ini tersedia.
 YouDoNotUseBestDriver=Anda menggunakan driver %s tetapi driver %s disarankan.
 NbOfObjectIsLowerThanNoPb=Anda hanya memiliki %s %s dalam database. Ini tidak memerlukan optimasi tertentu.
+ComboListOptim=Combo list loading optimization
 SearchOptim=Optimasi pencarian
-YouHaveXObjectUseSearchOptim=Anda memiliki %s %s di database. Anda dapat menambahkan konstanta %s ke 1 di Home-Setup-Other. Batasi pencarian hingga awal string yang memungkinkan database menggunakan indeks dan Anda akan mendapatkan respons segera.
-YouHaveXObjectAndSearchOptimOn=Anda memiliki %s %s di database dan konstanta %s diatur ke 1 di Home-Setup-Other.
+YouHaveXObjectUseComboOptim=You have %s %s in the database. You can go into setup of module to enable loading of combo list on key pressed event.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other.
+YouHaveXObjectUseSearchOptimDesc=This limits the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to %s in Home-Setup-Other.
 BrowserIsOK=Anda menggunakan browser web %s. Browser ini ok untuk keamanan dan kinerja.
 BrowserIsKO=Anda menggunakan browser web %s. Browser ini dikenal sebagai pilihan yang buruk untuk keamanan, kinerja, dan keandalan. Kami merekomendasikan menggunakan Firefox, Chrome, Opera atau Safari.
 PHPModuleLoaded=Komponen PHP %s dimuat
@@ -1433,6 +1440,7 @@ MemberMainOptions=Opsi utama
 AdherentLoginRequired= Kelola Login untuk setiap anggota
 AdherentMailRequired=Diperlukan email untuk membuat anggota baru
 MemberSendInformationByMailByDefault=Kotak centang untuk mengirim konfirmasi email kepada anggota (validasi atau berlangganan baru) diaktifkan secara default
+MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
 VisitorCanChooseItsPaymentMode=Pengunjung dapat memilih dari mode pembayaran yang tersedia
 MEMBER_REMINDER_EMAIL=Aktifkan pengingat otomatis<b>melalui email</b>dari langganan yang kedaluwarsa. Catatan: Modul<strong>%s </strong> harus diaktifkan dan diatur dengan benar untuk mengirim pengingat.
 MembersDocModules=Templat dokumen untuk dokumen yang dihasilkan dari catatan anggota
@@ -1763,7 +1771,7 @@ AGENDA_DEFAULT_VIEW=Tampilan mana yang ingin Anda buka secara default saat memil
 AGENDA_REMINDER_BROWSER=Aktifkan pengingat acara <b> pada browser pengguna </b> (Ketika tanggal pengingat tercapai, popup ditampilkan oleh browser. Setiap pengguna dapat menonaktifkan pemberitahuan tersebut dari pengaturan pemberitahuan browser).
 AGENDA_REMINDER_BROWSER_SOUND=Aktifkan pemberitahuan suara
 AGENDA_REMINDER_EMAIL=Aktifkan pengingat acara <b> melalui email </b> (opsi pengingat / penundaan dapat ditentukan pada setiap acara).
-AGENDA_REMINDER_EMAIL_NOTE=Catatan: Frekuensi tugas %s harus cukup untuk memastikan bahwa pengingat dikirim pada saat yang tepat.
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the scheduled job %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Tampilkan objek yang ditautkan ke tampilan agenda
 ##### Clicktodial #####
 ClickToDialSetup=Klik Untuk Memanggil pengaturan modul
@@ -1979,6 +1987,8 @@ MAIN_PDF_MARGIN_RIGHT=Margin kanan pada PDF
 MAIN_PDF_MARGIN_TOP=Margin teratas pada PDF
 MAIN_PDF_MARGIN_BOTTOM=Margin bawah pada PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Tinggi untuk logo di PDF
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add picture on proposal line
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add electronic sign in PDF
 NothingToSetup=Tidak diperlukan pengaturan khusus untuk modul ini.
 SetToYesIfGroupIsComputationOfOtherGroups=Setel ini menjadi ya jika grup ini merupakan perhitungan grup lain
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
@@ -2096,7 +2106,6 @@ PDF_SHOW_PROJECT=Show project on document
 ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=Jika Anda ingin agar beberapa teks dalam PDF Anda digandakan dalam 2 bahasa berbeda dalam PDF yang dihasilkan sama, Anda harus mengatur di sini bahasa kedua ini sehingga PDF yang dihasilkan akan berisi 2 bahasa berbeda di halaman yang sama, yang dipilih saat membuat PDF dan yang ini ( hanya beberapa templat PDF yang mendukung ini). Biarkan kosong untuk 1 bahasa per PDF.
 FafaIconSocialNetworksDesc=Masukkan di sini kode ikon FontAwesome. Jika Anda tidak tahu apa itu FontAwesome, Anda dapat menggunakan fa-address-book nilai umum.
-FeatureNotAvailableWithReceptionModule=Fitur tidak tersedia ketika Penerimaan modul diaktifkan
 RssNote=Catatan: Setiap definisi umpan RSS menyediakan widget yang harus Anda aktifkan agar tersedia di dasbor
 JumpToBoxes=Langsung ke Pengaturan -> Widget
 MeasuringUnitTypeDesc=Gunakan di sini nilai seperti "ukuran", "permukaan", "volume", "berat", "waktu"
@@ -2120,12 +2129,18 @@ ConfFileIsReadableOrWritableByAnyUsers=File conf dapat dibaca atau ditulis oleh
 MailToSendEventOrganization=Organisasi Acara
 AGENDA_EVENT_DEFAULT_STATUS=Status acara default saat membuat acara dari formulir
 YouShouldDisablePHPFunctions=Anda harus menonaktifkan fungsi PHP
-IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands in custom code, you shoud disable PHP functions
+PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
+NotRecommended=Not recommanded
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
 ModuleUpdateAvailable=An update is available
 NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
+RandomlySelectedIfSeveral=Randomly selected if several pictures are available
+DatabasePasswordObfuscated=Database password is obfuscated in conf file
+DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
diff --git a/htdocs/langs/id_ID/agenda.lang b/htdocs/langs/id_ID/agenda.lang
index 069d27df0b4..e19d52a60d2 100644
--- a/htdocs/langs/id_ID/agenda.lang
+++ b/htdocs/langs/id_ID/agenda.lang
@@ -38,6 +38,7 @@ ActionsEvents=Perihal yang Dolibarr akan membuat tindakan dalam agenda otomatis
 EventRemindersByEmailNotEnabled=Pengingat agenda melalui email tidak diaktifkan ke pengaturan modul %s.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Pihak ketiga %s dibuat
+COMPANY_MODIFYInDolibarr=Third party %s modified
 COMPANY_DELETEInDolibarr=Pihak ketiga %s dihapus
 ContractValidatedInDolibarr=Kontrak %s divalidasi
 CONTRACT_DELETEInDolibarr=Kontrak %s dihapus
@@ -87,6 +88,7 @@ OrderDeleted=Pesanan dihapus
 InvoiceDeleted=Faktur dihapus
 DraftInvoiceDeleted=Faktur konsep dihapus
 CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_MODIFYInDolibarr=Contact %s modified
 CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Produk %s dibuat
 PRODUCT_MODIFYInDolibarr=Produk %s dimodifikasi
diff --git a/htdocs/langs/id_ID/bills.lang b/htdocs/langs/id_ID/bills.lang
index 91d13c95fd0..191dd690ee6 100644
--- a/htdocs/langs/id_ID/bills.lang
+++ b/htdocs/langs/id_ID/bills.lang
@@ -259,6 +259,7 @@ DateMaxPayment=Pembayaran jatuh tempo pada
 DateInvoice=Tanggal faktur
 DatePointOfTax=Titik pajak
 NoInvoice=Tidak ada faktur
+NoOpenInvoice=No open invoice
 ClassifyBill=Klasifikasi faktur
 SupplierBillsToPay=Faktur vendor yang belum dibayar
 CustomerBillsUnpaid=Faktur pelanggan yang belum dibayar
@@ -589,3 +590,4 @@ FacParentLine=Invoice Line Parent
 SituationTotalRayToRest=Remainder to pay without taxe
 PDFSituationTitle=Situation n° %d
 SituationTotalProgress=Total progress %d %%
+SearchUnpaidInvoicesWithDueDate=Search unpaid invoices with a due date = %s
diff --git a/htdocs/langs/id_ID/cashdesk.lang b/htdocs/langs/id_ID/cashdesk.lang
index d81264ec43d..02c10810ce5 100644
--- a/htdocs/langs/id_ID/cashdesk.lang
+++ b/htdocs/langs/id_ID/cashdesk.lang
@@ -102,7 +102,7 @@ CashDeskGenericMaskCodes6 =  tag <br><b>{TN}</b>digunakan untuk menambahkan nomo
 TakeposGroupSameProduct=Kelompokkan lini produk yang sama
 StartAParallelSale=Mulai penjualan paralel baru
 SaleStartedAt=Sale started at %s
-ControlCashOpening=Control cash popup at opening POS
+ControlCashOpening=Open the "Control cash" popup when opening the POS
 CloseCashFence=Close cash desk control
 CashReport=Laporan tunai
 MainPrinterToUse=Printer utama untuk digunakan
@@ -126,5 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
-ShowPriceHT = Display the price excluding tax column
-ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
+ShowPriceHT = Display the column with the price excluding tax (on screen)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
diff --git a/htdocs/langs/id_ID/compta.lang b/htdocs/langs/id_ID/compta.lang
index 37c855feba5..176b5449255 100644
--- a/htdocs/langs/id_ID/compta.lang
+++ b/htdocs/langs/id_ID/compta.lang
@@ -286,3 +286,9 @@ ReportPurchaseTurnover=Beli turnover yang ditagih
 ReportPurchaseTurnoverCollected=Turnover pembelian dikumpulkan
 IncludeVarpaysInResults = Sertakan berbagai pembayaran dalam laporan
 IncludeLoansInResults = Sertakan pinjaman dalam laporan
+InvoiceLate30Days = Invoices late > 30 days
+InvoiceLate15Days = Invoices late > 15 days
+InvoiceLateMinus15Days = Invoices late
+InvoiceNotLate = To be collected < 15 days
+InvoiceNotLate15Days = To be collected in 15 days
+InvoiceNotLate30Days = To be collected in 30 days
diff --git a/htdocs/langs/id_ID/cron.lang b/htdocs/langs/id_ID/cron.lang
index 5b2df4ba2b8..68c5f150e15 100644
--- a/htdocs/langs/id_ID/cron.lang
+++ b/htdocs/langs/id_ID/cron.lang
@@ -60,7 +60,7 @@ CronErrEndDateStartDt=Tanggal akhir tidak boleh sebelum tanggal mulai
 StatusAtInstall=Status pada pemasangan modul
 CronStatusActiveBtn=Susunan acara
 CronStatusInactiveBtn=Nonaktifkan
-CronTaskInactive=Pekerjaan ini dinonaktifkan
+CronTaskInactive=This job is disabled (not scheduled)
 CronId=Indo
 CronClassFile=Nama file dengan kelas
 CronModuleHelp=Nama direktori modul Dolibarr (juga berfungsi dengan modul Dolibarr eksternal). <BR> Sebagai contoh untuk memanggil metode pengambilan objek Produk Dolibarr/htdocs/<u> produk </u> /class/product.class.php, nilai untuk modul adalah a0342fccfda19b00c04808
diff --git a/htdocs/langs/id_ID/errors.lang b/htdocs/langs/id_ID/errors.lang
index f65b4dd8a4c..8777126de3c 100644
--- a/htdocs/langs/id_ID/errors.lang
+++ b/htdocs/langs/id_ID/errors.lang
@@ -11,6 +11,7 @@ ErrorBadValueForParamNotAString=Nilai buruk untuk parameter Anda. Biasanya ditam
 ErrorRefAlreadyExists=Referensi <b> %s </b> sudah ada.
 ErrorLoginAlreadyExists=Login %s sudah ada.
 ErrorGroupAlreadyExists=Grup %s sudah ada.
+ErrorEmailAlreadyExists=Email %s already exists.
 ErrorRecordNotFound=Rekaman tidak ditemukan.
 ErrorFailToCopyFile=Gagal menyalin file '<b> %s </b>' ke '<b> %s </b>'.
 ErrorFailToCopyDir=Gagal menyalin direktori '<b> %s </b>' menjadi '<b> %s </b>'.
@@ -117,7 +118,7 @@ ErrorCantReadFile=Gagal membaca file '%s'
 ErrorCantReadDir=Gagal membaca direktori '%s'
 ErrorBadLoginPassword=Nilai buruk untuk login atau kata sandi
 ErrorLoginDisabled=Akun Anda telah dinonaktifkan
-ErrorFailedToRunExternalCommand=Gagal menjalankan perintah eksternal. Periksa apakah tersedia dan dapat dijalankan oleh server PHP Anda. Jika PHP<b>Mode Aman</b>diaktifkan, periksa perintah itu di dalam direktori yang ditentukan oleh parameter<b>safe_mode_exec_dir </b>.
+ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server user. Check also the command is not protected on shell level by a security layer like apparmor.
 ErrorFailedToChangePassword=Gagal mengubah kata sandi
 ErrorLoginDoesNotExists=Pengguna dengan login<b>%s</b>tidak dapat ditemukan.
 ErrorLoginHasNoEmail=Pengguna ini tidak memiliki alamat email. Proses dibatalkan.
@@ -262,6 +263,7 @@ ErrorDateIsInFuture=Error, the date can't be in the future
 ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
 ErrorAPercentIsRequired=Error, please fill in the percentage correctly
 ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
+ErrorFailedToFindEmailTemplate=Failed to find template with code name %s
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Parameter PHP Anda upload_max_filesize (%s) lebih tinggi dari parameter PHP post_max_size (%s). Ini bukan pengaturan yang konsisten.
@@ -298,3 +300,4 @@ WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So y
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
+ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
diff --git a/htdocs/langs/id_ID/eventorganization.lang b/htdocs/langs/id_ID/eventorganization.lang
index 743b1f59013..c335ed8a7ff 100644
--- a/htdocs/langs/id_ID/eventorganization.lang
+++ b/htdocs/langs/id_ID/eventorganization.lang
@@ -1,4 +1,5 @@
 # Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+# Copyright (C) 2021		Dorian Vabre			<dorian.vabre@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
@@ -81,7 +82,10 @@ PriceOfBoothHelp=Subscription price to stand a booth
 EventOrganizationICSLink=Link ICS for events
 ConferenceOrBoothInformation=Conference Or Booth informations
 Attendees = Attendees
+DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
 #
 # Status
 #
@@ -94,8 +98,46 @@ EvntOrgCancelled = Cancelled
 #
 # Public page
 #
+SuggestForm = Suggestion page
+RegisterPage = Page for conferences or booth
+EvntOrgRegistrationHelpMessage = Here, you can vote for an event, or suggest a new conference or booth for the project
+EvntOrgRegistrationConfHelpMessage = Here, you can suggest a new conference for the project
+EvntOrgRegistrationBoothHelpMessage = Here, you can suggest a new booth for the project
+ListOfSuggestedConferences = List of suggested conferences
+ListOfSuggestedBooths = List of suggested booths
+SuggestConference = Suggest a new conference
+SuggestBooth = Suggest a booth
+ViewAndVote = View and vote for suggested events
 PublicAttendeeSubscriptionPage = Public link of registration to a conference
 MissingOrBadSecureKey = The security key is invalid or missing
-EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
-EvntOrgStartDuration = This conference starts on
-EvntOrgEndDuration =  and ends on
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference : '%s'
+EvntOrgDuration = This conference starts on %s and ends on %s.
+ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
+BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
+EventType = Jenis agenda
+
+#
+# Vote page
+#
+EvntOrgRegistrationWelcomeMessage = Welcome on the conference or booth suggestion page.
+EvntOrgRegistrationConfWelcomeMessage = Welcome on the conference suggestion page.
+EvntOrgRegistrationBoothWelcomeMessage = Welcome on the booth suggestion page.
+EvntOrgVoteHelpMessage = Here, you can view and vote for the suggested events for the project
+VoteOk = Your vote has been accepted.
+AlreadyVoted = You have already voted for this event.
+VoteError = An error has occurred during the vote, please try again.
+
+#
+# SubscriptionOk page
+#
+SubscriptionOk = Your subscription to this conference has been validated
+#
+# Subscription validation mail
+#
+ConfAttendeeSubscriptionConfirmation = Confirmation of your subscription to a conference
+#
+# Payment page
+#
+Attendee = Attendee
+PaymentConferenceAttendee = Conference attendee payment
+PaymentBoothLocation = Booth location payment
diff --git a/htdocs/langs/id_ID/hrm.lang b/htdocs/langs/id_ID/hrm.lang
index 829bb3d48e9..07e3db55ce0 100644
--- a/htdocs/langs/id_ID/hrm.lang
+++ b/htdocs/langs/id_ID/hrm.lang
@@ -9,7 +9,7 @@ ConfirmDeleteEstablishment=Anda yakin ingin menghapus pendirian ini?
 OpenEtablishment=Pembentukan terbuka
 CloseEtablishment=Pembentukan tertutup
 # Dictionary
-DictionaryPublicHolidays=HRM - Hari libur nasional
+DictionaryPublicHolidays=Leave - Public holidays
 DictionaryDepartment=HRM - Daftar Departement
 DictionaryFunction=HRM - Posisi pekerjaan
 # Module
diff --git a/htdocs/langs/id_ID/knowledgemanagement.lang b/htdocs/langs/id_ID/knowledgemanagement.lang
index d968e8e9fd4..8d55dc655b8 100644
--- a/htdocs/langs/id_ID/knowledgemanagement.lang
+++ b/htdocs/langs/id_ID/knowledgemanagement.lang
@@ -47,7 +47,7 @@ KnowledgeManagementArea = Knowledge Management
 # Menu
 #
 MenuKnowledgeRecord = Knowledge base
-ListOfArticles = List of articles
+ListKnowledgeRecord = List of articles
 NewKnowledgeRecord = New article
 ValidateReply = Validate solution
 KnowledgeRecords = Articles
diff --git a/htdocs/langs/id_ID/languages.lang b/htdocs/langs/id_ID/languages.lang
index 641ee7a5b60..4a6d87c1e1b 100644
--- a/htdocs/langs/id_ID/languages.lang
+++ b/htdocs/langs/id_ID/languages.lang
@@ -3,6 +3,7 @@ Language_am_ET=Etiopia
 Language_ar_AR=Arab
 Language_ar_EG=Arab (Mesir)
 Language_ar_SA=Arab
+Language_ar_TN=Arabic (Tunisia)
 Language_az_AZ=Azerbaijan
 Language_bn_BD=Bengal
 Language_bn_IN=Bengal (India)
@@ -84,6 +85,7 @@ Language_nl_NL=Belanda
 Language_pl_PL=Polandia
 Language_pt_BR=Portugis (Brasil)
 Language_pt_PT=Portugis
+Language_ro_MD=Romanian (Moldavia)
 Language_ro_RO=Rumania
 Language_ru_RU=Rusia
 Language_ru_UA=Rusia (Ukraina)
diff --git a/htdocs/langs/id_ID/main.lang b/htdocs/langs/id_ID/main.lang
index 00db3c9d24e..bfa67f6dbeb 100644
--- a/htdocs/langs/id_ID/main.lang
+++ b/htdocs/langs/id_ID/main.lang
@@ -430,6 +430,7 @@ LT1IN=CGST
 LT2IN=SGST
 LT1GC=Tambahan sen
 VATRate=Persentase pajak
+RateOfTaxN=Rate of tax %s
 VATCode=Kode Tarif Pajak
 VATNPR=NPR Tarif Pajak
 DefaultTaxRate=Tarif pajak standar
@@ -729,6 +730,7 @@ MenuMembers=Anggota
 MenuAgendaGoogle=Agenda Google
 MenuTaxesAndSpecialExpenses=Pajak | Pengeluaran khusus
 ThisLimitIsDefinedInSetup=Batas Dolibarr (Menu home-setup-security): %s Kb, batas PHP: %s Kb
+ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
 NoFileFound=Tidak ada dokumen yang diunggah
 CurrentUserLanguage=Bahasa saat ini
 CurrentTheme=Tema saat ini
@@ -1072,6 +1074,7 @@ ValidFrom=Berlaku dari
 ValidUntil=Berlaku hingga
 NoRecordedUsers=Tidak ada pengguna
 ToClose=Untuk menutup
+ToRefuse=To refuse
 ToProcess=Proses
 ToApprove=Untuk menyetujui
 GlobalOpenedElemView=Pandangan global
@@ -1126,9 +1129,11 @@ UpdateForAllLines=Perbarui untuk semua lini
 OnHold=Tertahan
 Civility=Kesopanan
 AffectTag=Mempengaruhi Tag
+CreateExternalUser=Create external user
 ConfirmAffectTag=Pengaruh Tag Massal
 ConfirmAffectTagQuestion=Yakin ingin memengaruhi tag ke %s rekaman yang dipilih()?
 CategTypeNotFound=Tidak ada jenis tag yang ditemukan untuk jenis rekaman
 CopiedToClipboard=Disalin ke papan klip
 InformationOnLinkToContract=Jumlah ini hanyalah total dari semua garis kontrak. Tidak ada gagasan tentang waktu yang dipertimbangkan.
 ConfirmCancel=Are you sure you want to cancel
+EmailMsgID=Email MsgID
diff --git a/htdocs/langs/id_ID/members.lang b/htdocs/langs/id_ID/members.lang
index b7c15c1e19d..00c2384fb2c 100644
--- a/htdocs/langs/id_ID/members.lang
+++ b/htdocs/langs/id_ID/members.lang
@@ -213,3 +213,5 @@ SendReminderForExpiredSubscription=Kirim pengingat melalui email kepada anggota
 MembershipPaid=Keanggotaan dibayar untuk periode saat ini (hingga %s)
 YouMayFindYourInvoiceInThisEmail=Anda dapat menemukan faktur Anda terlampir pada email ini
 XMembersClosed=%s anggota ditutup
+XExternalUserCreated=%s external user(s) created
+ForceMemberNature=Force member nature (Individual or Corporation)
diff --git a/htdocs/langs/id_ID/modulebuilder.lang b/htdocs/langs/id_ID/modulebuilder.lang
index 2f41574e85c..a2446daf705 100644
--- a/htdocs/langs/id_ID/modulebuilder.lang
+++ b/htdocs/langs/id_ID/modulebuilder.lang
@@ -143,3 +143,4 @@ AsciiToHtmlConverter=Pengonversi Ascii ke HTML
 AsciiToPdfConverter=Pengonversi ascii ke PDF
 TableNotEmptyDropCanceled=Meja tidak kosong. Drop telah dibatalkan.
 ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
+ImportExportProfiles=Import and export profiles
diff --git a/htdocs/langs/id_ID/mrp.lang b/htdocs/langs/id_ID/mrp.lang
index 53bc718c450..76290ed5ea9 100644
--- a/htdocs/langs/id_ID/mrp.lang
+++ b/htdocs/langs/id_ID/mrp.lang
@@ -8,12 +8,12 @@ MenuBOM=Tagihan material
 LatestBOMModified=%s terbaru. Tagihan bahan dimodifikasi
 LatestMOModified=Pesanan Manufaktur %s terbaru dimodifikasi
 Bom=Bills of Material
-BillOfMaterials=Bill of Material
+BillOfMaterials=Bill of Materials
 BOMsSetup=Pengaturan modul BOM
 ListOfBOMs=Daftar tagihan bahan - BOM
 ListOfManufacturingOrders=Daftar Pesanan Manufaktur
-NewBOM=Bill of material baru
-ProductBOMHelp=Produk yang akan dibuat dengan BOM ini. <br> Catatan: Produk dengan properti 'Sifat produk' = 'Bahan baku' tidak terlihat dalam daftar ini.
+NewBOM=New bill of materials
+ProductBOMHelp=Product to create (or disassemble) with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
 BOMsNumberingModules=Templat penomoran BOM
 BOMsModelModule=Templat dokumen BOM
 MOsNumberingModules=Templat penomoran MO
@@ -22,7 +22,7 @@ FreeLegalTextOnBOMs=Teks bebas pada dokumen BOM
 WatermarkOnDraftBOMs=Tanda air pada draft BOM
 FreeLegalTextOnMOs=Teks gratis pada dokumen MO
 WatermarkOnDraftMOs=Tanda air pada konsep MO
-ConfirmCloneBillOfMaterials=Yakin ingin mengkloning daftar bahan %s?
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials %s ?
 ConfirmCloneMo=Yakin ingin mengkloning Pesanan Manufaktur %s?
 ManufacturingEfficiency=Efisiensi manufaktur
 ConsumptionEfficiency=Efisiensi konsumsi
@@ -30,8 +30,8 @@ ValueOfMeansLoss=Nilai 0,95 berarti rata-rata kerugian 5%% selama produksi
 ValueOfMeansLossForProductProduced=Nilai 0,95 berarti rata-rata 5%% dari kehilangan produk yang dihasilkan
 DeleteBillOfMaterials=Hapus Bill Of Material
 DeleteMo=Hapus Pesanan Pembuatan
-ConfirmDeleteBillOfMaterials=Anda yakin ingin menghapus Bill Of Material ini?
-ConfirmDeleteMo=Anda yakin ingin menghapus Bill Of Material ini?
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Materials?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Materials?
 MenuMRP=Pesanan Manufaktur
 NewMO=Pesanan Manufaktur Baru
 QtyToProduce=Jumlah yang akan diproduksi
@@ -39,7 +39,7 @@ DateStartPlannedMo=Tanggal mulai direncanakan
 DateEndPlannedMo=Tanggal akhir direncanakan
 KeepEmptyForAsap=Kosong berarti 'Secepat Mungkin'
 EstimatedDuration=Perkiraan durasi
-EstimatedDurationDesc=Perkiraan durasi untuk memproduksi produk ini menggunakan BOM ini
+EstimatedDurationDesc=Estimated duration to manufacture (or disassemble) this product using this BOM
 ConfirmValidateBom=Anda yakin ingin memvalidasi BOM dengan referensi<strong>%s </strong> (Anda akan dapat menggunakannya untuk membuat Pesanan Manufaktur baru)
 ConfirmCloseBom=Yakin ingin membatalkan BOM ini (Anda tidak akan dapat menggunakannya lagi untuk membuat Pesanan Manufaktur baru)?
 ConfirmReopenBom=Yakin ingin membuka kembali BOM ini (Anda akan dapat menggunakannya untuk membuat Pesanan Manufaktur baru)
@@ -63,13 +63,14 @@ ConsumeAndProduceAll=Konsumsi dan Hasilkan Semua
 Manufactured=Diproduksi
 TheProductXIsAlreadyTheProductToProduce=Produk yang ditambahkan sudah merupakan produk yang diproduksi.
 ForAQuantityOf=Untuk kuantitas untuk menghasilkan %s
+ForAQuantityToConsumeOf=For a quantity to disassemble of %s
 ConfirmValidateMo=Apakah Anda yakin ingin memvalidasi Pesanan Manufaktur ini?
 ConfirmProductionDesc=Dengan mengklik '%s', Anda akan memvalidasi konsumsi dan / atau produksi untuk jumlah yang ditentukan. Ini juga akan memperbarui stok dan mencatat pergerakan stok.
 ProductionForRef=Produksi %s
 AutoCloseMO=Tutup secara otomatis Order Manufaktur jika jumlah yang dikonsumsi dan diproduksi tercapai
 NoStockChangeOnServices=Tidak ada perubahan stok pada layanan
 ProductQtyToConsumeByMO=Kuantitas produk masih dikonsumsi oleh MO terbuka
-ProductQtyToProduceByMO=Jumlah produk masih diproduksi oleh MO terbuka
+ProductQtyToProduceByMO=Product quantity still to produce by open MO
 AddNewConsumeLines=Tambahkan baris baru untuk dikonsumsi
 ProductsToConsume=Produk untuk dikonsumsi
 ProductsToProduce=Produk yang akan diproduksi
@@ -83,15 +84,13 @@ Workstations=Workstations
 WorkstationsDescription=Workstations management
 WorkstationSetup = Workstations setup
 WorkstationSetupPage = Workstations setup page
-WorkstationAbout = About Workstation
-WorkstationAboutPage = Workstations about page
 WorkstationList=Workstation list
 WorkstationCreate=Add new workstation
 ConfirmEnableWorkstation=Are you sure you want to enable workstation <b>%s</b> ?
 EnableAWorkstation=Enable a workstation
 ConfirmDisableWorkstation=Are you sure you want to disable workstation <b>%s</b> ?
 DisableAWorkstation=Disable a workstation
-DeleteWorkstation=Supprimer
+DeleteWorkstation=Hapus
 NbOperatorsRequired=Number of operators required
 THMOperatorEstimated=Estimated operator THM
 THMMachineEstimated=Estimated machine THM
diff --git a/htdocs/langs/id_ID/orders.lang b/htdocs/langs/id_ID/orders.lang
index 7a89dad6b4e..0377212d179 100644
--- a/htdocs/langs/id_ID/orders.lang
+++ b/htdocs/langs/id_ID/orders.lang
@@ -11,6 +11,7 @@ OrderDate=Tanggal Pemesanan
 OrderDateShort=Tanggal Pemesanan
 OrderToProcess=Memesan untuk diproses
 NewOrder=Pesanan baru
+NewSupplierOrderShort=New order
 NewOrderSupplier=Pesanan Pembelian Baru
 ToOrder=Buat pesanan
 MakeOrder=Buat pesanan
@@ -73,6 +74,7 @@ DeleteOrder=Hapus pesanan
 CancelOrder=Batalkan pesanan
 OrderReopened= Pesan %s buka kembali
 AddOrder=Buat pesanan
+AddSupplierOrderShort=Create order
 AddPurchaseOrder=Buat pesanan pembelian
 AddToDraftOrders=Tambahkan ke pesanan konsep
 ShowOrder=Tampilkan pesanan
diff --git a/htdocs/langs/id_ID/other.lang b/htdocs/langs/id_ID/other.lang
index 7b5bd50c7db..77b46605a7b 100644
--- a/htdocs/langs/id_ID/other.lang
+++ b/htdocs/langs/id_ID/other.lang
@@ -129,6 +129,7 @@ ClosedByLogin=Login pengguna yang ditutup
 FileWasRemoved=File %s dihapus
 DirWasRemoved=Direktori %s telah dihapus
 FeatureNotYetAvailable=Fitur belum tersedia di versi saat ini
+FeatureNotAvailableOnDevicesWithoutMouse=Feature not available on devices without mouse
 FeaturesSupported=Fitur yang didukung
 Width=Lebar
 Height=Tinggi
@@ -263,7 +264,7 @@ ContactCreatedByEmailCollector=Kontak / alamat yang dibuat oleh kolektor email d
 ProjectCreatedByEmailCollector=Proyek dibuat oleh kolektor email dari email MSGID %s
 TicketCreatedByEmailCollector=Tiket dibuat oleh kolektor email dari email MSGID %s
 OpeningHoursFormatDesc=Gunakan a - untuk memisahkan jam buka dan tutup. <br> Gunakan spasi untuk memasukkan rentang yang berbeda. <br> Contoh: 8-12 14-18
-PrefixSession=Prefix for session ID
+SuffixSessionName=Suffix for session name
 
 ##### Export #####
 ExportsArea=Area ekspor
diff --git a/htdocs/langs/id_ID/partnership.lang b/htdocs/langs/id_ID/partnership.lang
index a1e47473966..8b8ffc915d7 100644
--- a/htdocs/langs/id_ID/partnership.lang
+++ b/htdocs/langs/id_ID/partnership.lang
@@ -16,41 +16,72 @@
 #
 # Generic
 #
-ModulePartnershipName = Partnership management
-PartnershipDescription = Module Partnership management
+ModulePartnershipName=Partnership management
+PartnershipDescription=Module Partnership management
 PartnershipDescriptionLong= Module Partnership management
 
+AddPartnership=Add partnership
+CancelPartnershipForExpiredMembers=Partnership: Cancel partnership of members with expired subscriptions
+PartnershipCheckBacklink=Partnership: Check referring backlink
+
 #
 # Menu
 #
-NewPartnership = New Partnership
-ListOfPartnerships = List of partnership
+NewPartnership=New Partnership
+ListOfPartnerships=List of partnership
 
 #
 # Admin page
 #
-PartnershipSetup = Partnership setup
-PartnershipAbout = About Partnership
-PartnershipAboutPage = Partnership about page
-
+PartnershipSetup=Partnership setup
+PartnershipAbout=About Partnership
+PartnershipAboutPage=Partnership about page
+partnershipforthirdpartyormember=Partner status must be set on a 'thirdparty' or a 'member'
+PARTNERSHIP_IS_MANAGED_FOR=Partnership managed for
+PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks to check
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb of days before cancelling status of a partnership when a subscription has expired
+ReferingWebsiteCheck=Check of website referring
+ReferingWebsiteCheckDesc=You can enable a feature to check that your partners has added a backlink to your website domains on their own website.
 
 #
 # Object
 #
+DeletePartnership=Delete a partnership
+PartnershipDedicatedToThisThirdParty=Partnership dedicated to this third party
+PartnershipDedicatedToThisMember=Partnership dedicated to this member
 DatePartnershipStart=Tanggal mulai
 DatePartnershipEnd=Tanggal Akhir
+ReasonDecline=Decline reason
+ReasonDeclineOrCancel=Decline reason
+PartnershipAlreadyExist=Partnership already exist
+ManagePartnership=Manage partnership
+BacklinkNotFoundOnPartnerWebsite=Backlink not found on partner website
+ConfirmClosePartnershipAsk=Are you sure you want to cancel this partnership?
+PartnershipType=Partnership type
 
 #
 # Template Mail
 #
+SendingEmailOnPartnershipWillSoonBeCanceled=Partnership will soon be canceled
+SendingEmailOnPartnershipRefused=Partnership refused
+SendingEmailOnPartnershipAccepted=Partnership accepted
+SendingEmailOnPartnershipCanceled=Partnership canceled
 
+YourPartnershipWillSoonBeCanceledTopic=Partnership will soon be canceled
+YourPartnershipRefusedTopic=Partnership refused
+YourPartnershipAcceptedTopic=Partnership accepted
+YourPartnershipCanceledTopic=Partnership canceled
+
+YourPartnershipWillSoonBeCanceledContent=We inform you that your partnership will soon be canceled (Backlink not found)
+YourPartnershipRefusedContent=We inform you that your partnership request has been refused.
+YourPartnershipAcceptedContent=We inform you that your partnership request has been accepted.
+YourPartnershipCanceledContent=We inform you that your partnership has been canceled.
 
 #
 # Status
 #
-PartnershipDraft = Konsep
-PartnershipAccepted = Accepted
-PartnershipRefused = Ditolak
-PartnershipCanceled = Dibatalkan
-
+PartnershipDraft=Konsep
+PartnershipAccepted=Accepted
+PartnershipRefused=Ditolak
+PartnershipCanceled=Dibatalkan
 PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/id_ID/productbatch.lang b/htdocs/langs/id_ID/productbatch.lang
index 2ee8f9d3c63..a9c155c25ec 100644
--- a/htdocs/langs/id_ID/productbatch.lang
+++ b/htdocs/langs/id_ID/productbatch.lang
@@ -1,4 +1,4 @@
-# ProductBATCH language file - en_US - ProductBATCH
+# ProductBATCH language file - Source file is en_US - ProductBATCH
 ManageLotSerial=Gunakan lot / nomor seri
 ProductStatusOnBatch=Yes (lot required)
 ProductStatusOnSerial=Yes (unique serial number required)
@@ -33,3 +33,13 @@ CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+LifeTime=Life span (in days)
+EndOfLife=End of life
+ManufacturingDate=Manufacturing date
+DestructionDate=Destruction date
+FirstUseDate=First use date
+QCFrequency=Quality control frequency (in days)
+
+#Traceability - qc status
+OutOfOrder=Out of order
+InWorkingOrder=In working order
diff --git a/htdocs/langs/id_ID/products.lang b/htdocs/langs/id_ID/products.lang
index 1c2a44525f5..fd9f3020017 100644
--- a/htdocs/langs/id_ID/products.lang
+++ b/htdocs/langs/id_ID/products.lang
@@ -396,3 +396,5 @@ ActionAvailableOnVariantProductOnly=Tindakan hanya tersedia pada varian produk
 ProductsPricePerCustomer=Harga produk per pelanggan
 ProductSupplierExtraFields=Atribut Tambahan (Harga Pemasok)
 DeleteLinkedProduct=Hapus produk anak yang ditautkan ke kombinasi
+PMPValue=Harga rata-rata yang ditimbang
+PMPValueShort=WAP
diff --git a/htdocs/langs/id_ID/projects.lang b/htdocs/langs/id_ID/projects.lang
index 50729228dab..ecd662e3e07 100644
--- a/htdocs/langs/id_ID/projects.lang
+++ b/htdocs/langs/id_ID/projects.lang
@@ -267,9 +267,11 @@ InvoiceToUse=Draf faktur untuk digunakan
 NewInvoice=Tagihan baru
 OneLinePerTask=Satu baris per tugas
 OneLinePerPeriod=Satu baris per periode
+OneLinePerTimeSpentLine=One line for each time spent declaration
 RefTaskParent=Ref. Tugas Induk
 ProfitIsCalculatedWith=Keuntungan dihitung menggunakan
 AddPersonToTask=Add also to tasks
 UsageOrganizeEvent=Usage: Event Organization
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
+SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
diff --git a/htdocs/langs/id_ID/receptions.lang b/htdocs/langs/id_ID/receptions.lang
index f70636019eb..72f1032b89a 100644
--- a/htdocs/langs/id_ID/receptions.lang
+++ b/htdocs/langs/id_ID/receptions.lang
@@ -44,4 +44,4 @@ ValidateOrderFirstBeforeReception=Anda harus terlebih dahulu memvalidasi pesanan
 ReceptionsNumberingModules=Modul penomoran untuk penerimaan
 ReceptionsReceiptModel=Templat dokumen untuk penerimaan
 NoMorePredefinedProductToDispatch=Tidak ada lagi produk yang telah ditentukan untuk dikirim
-
+ReceptionExist=A reception exists
diff --git a/htdocs/langs/id_ID/stocks.lang b/htdocs/langs/id_ID/stocks.lang
index 3eac8b2c158..d03ab1ff0a1 100644
--- a/htdocs/langs/id_ID/stocks.lang
+++ b/htdocs/langs/id_ID/stocks.lang
@@ -56,8 +56,6 @@ UnitPurchaseValue=Harga pembelian unit
 StockTooLow=Stok terlalu rendah
 StockLowerThanLimit=Stok lebih rendah dari batas waspada (%s)
 EnhancedValue=Nilai
-PMPValue=Harga rata-rata tertimbang
-PMPValueShort=WAP
 EnhancedValueOfWarehouses=Nilai gudang
 UserWarehouseAutoCreate=Buat gudang pengguna secara otomatis saat membuat pengguna
 AllowAddLimitStockByWarehouse=Kelola juga nilai untuk stok minimum dan yang diinginkan per pasangan (gudang produk) selain nilai untuk stok minimum dan yang diinginkan per produk
@@ -251,7 +249,10 @@ SelectAStockMovementFileToImport=select a stock movement file to import
 InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
 LabelOfInventoryMovemement=Inventory %s
 ReOpen=Reopen
-ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock to the real qty you entered into the inventory.
 ObjectNotFound=%s not found
 MakeMovementsAndClose=Generate movements and close
 AutofillWithExpected=Fill real quantity with expected quantity
+ShowAllBatchByDefault=By default, show batch details on product "stock" tab
+CollapseBatchDetailHelp=You can set batch detail default display in stocks module configuration
+FieldCannotBeNegative=Field "%s" cannot be negative
diff --git a/htdocs/langs/id_ID/ticket.lang b/htdocs/langs/id_ID/ticket.lang
index a27bcf47bcd..5418ab6d174 100644
--- a/htdocs/langs/id_ID/ticket.lang
+++ b/htdocs/langs/id_ID/ticket.lang
@@ -304,7 +304,7 @@ BoxLastModifiedTicket=Tiket modifikasi terbaru
 BoxLastModifiedTicketDescription=Tiket termodifikasi %s terbaru
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=Tidak ada tiket yang dimodifikasi baru-baru ini
-BoxTicketType=Number of open tickets by type
+BoxTicketType=Distribution of open tickets by type
 BoxTicketSeverity=Number of open tickets by severity
 BoxNoTicketSeverity=No tickets opened
 BoxTicketLastXDays=Number of new tickets by days the last %s days
diff --git a/htdocs/langs/is_IS/accountancy.lang b/htdocs/langs/is_IS/accountancy.lang
index 2dbde8a4dba..71a88f0a4ee 100644
--- a/htdocs/langs/is_IS/accountancy.lang
+++ b/htdocs/langs/is_IS/accountancy.lang
@@ -158,7 +158,7 @@ ACCOUNTING_LENGTH_AACCOUNT=Length of the third-party accounting accounts (If you
 ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of an accounting account. Needed by some countries (like Switzerland). If set to off (default), you can set the following two parameters to ask the application to add virtual zeros.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties, break ability to search on a part of value)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
@@ -328,6 +328,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountanc
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
+NotifiedExportDate=Notified export date (modification of the entries will not be possible)
+NotifiedValidationDate=Validation of the entries (modification or deletion of the entries will not be possible)
+ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=Export draft journal
 Modelcsv=Model of export
 Selectmodelcsv=Select a model of export
diff --git a/htdocs/langs/is_IS/admin.lang b/htdocs/langs/is_IS/admin.lang
index 57384ba959c..f6a0c3aa85e 100644
--- a/htdocs/langs/is_IS/admin.lang
+++ b/htdocs/langs/is_IS/admin.lang
@@ -221,8 +221,8 @@ NotCompatible=This module does not seem compatible with your Dolibarr %s (Min %s
 CompatibleAfterUpdate=This module requires an update to your Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=See in Market place
 SeeSetupOfModule=See setup of module %s
+SetOptionTo=Set option <b>%s</b> to %s
 Updated=Updated
-Nouveauté=Novelty
 AchatTelechargement=Buy / Download
 GoModuleSetupArea=To deploy/install a new module, go to the Module setup area: <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, opinber markaður staður fyrir Dolibarr ERP / CRM ytri mát
@@ -399,6 +399,7 @@ SecurityToken=Lykill að tryggja vefslóðir
 NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
 PDF=Skoða sem PDF skjal
 PDFDesc=Global options for PDF generation
+PDFOtherDesc=PDF Option specific to some modules
 PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
 PDFRulesForSalesTax=Rules for Sales Tax / VAT
@@ -561,7 +562,7 @@ Module53Desc=Management of Services
 Module54Name=Contracts/Subscriptions
 Module54Desc=Management of contracts (services or recurring subscriptions)
 Module55Name=Barcodes
-Module55Desc=Strikamerki er stjórnun
+Module55Desc=Barcode or QR code management
 Module56Name=Payment by credit transfer
 Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
 Module57Name=Payments by Direct Debit
@@ -848,10 +849,10 @@ Permission402=Búa til / breyta afsláttur
 Permission403=Staðfesta afsláttur
 Permission404=Eyða afsláttur
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries (yours and subordinates)
-Permission512=Create/modify payments of salaries
-Permission514=Delete payments of salaries
-Permission517=Read payments of salaries of everybody
+Permission511=Read salaries and payments (yours and subordinates)
+Permission512=Create/modify salaries and payments
+Permission514=Delete salaries and payments
+Permission517=Read salaries and payments everybody
 Permission519=Export salaries
 Permission520=Read Loans
 Permission522=Create/modify loans
@@ -965,6 +966,8 @@ Permission23003=Delete Scheduled job
 Permission23004=Execute Scheduled job
 Permission50101=Use Point of Sale (SimplePOS)
 Permission50151=Use Point of Sale (TakePOS)
+Permission50152=Edit sales lines
+Permission50153=Edit ordered sales lines
 Permission50201=Lesa viðskipti
 Permission50202=Flytja viðskipti
 Permission50330=Read objects of Zapier
@@ -1039,11 +1042,12 @@ DictionaryMeasuringUnits=Measuring Units
 DictionarySocialNetworks=Social Networks
 DictionaryProspectStatus=Prospect status for companies
 DictionaryProspectContactStatus=Prospect status for contacts
-DictionaryHolidayTypes=Types of leave
+DictionaryHolidayTypes=Leave - Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
 DictionaryTransportMode=Intracomm report - Transport mode
+DictionaryBatchStatus=Product lot/serial Quality Control status
 TypeOfUnit=Type of unit
 SetupSaved=Skipulag vistuð
 SetupNotSaved=Setup not saved
@@ -1187,7 +1191,7 @@ SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of m
 SetupDescription5=Other Setup menu entries manage optional parameters.
 AuditedSecurityEvents=Security events that are audited
 NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
-Audit=Úttekt
+Audit=Security events
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
 InfoOS=About OS
@@ -1319,9 +1323,12 @@ ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
 NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
+ComboListOptim=Combo list loading optimization
 SearchOptim=Search optimization
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
-YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
+YouHaveXObjectUseComboOptim=You have %s %s in the database. You can go into setup of module to enable loading of combo list on key pressed event.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other.
+YouHaveXObjectUseSearchOptimDesc=This limits the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to %s in Home-Setup-Other.
 BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
 BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
 PHPModuleLoaded=PHP component %s is loaded
@@ -1433,6 +1440,7 @@ MemberMainOptions=Helstu möguleikar
 AdherentLoginRequired= Stjórna Innskráning fyrir hvern meðlim
 AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Checkbox að senda póst staðfestingu á meðlimum (löggilding eða nýja áskrift) er sjálfgefið
+MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
 MembersDocModules=Document templates for documents generated from member record
@@ -1763,7 +1771,7 @@ AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting men
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
-AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the scheduled job %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Smelltu til að hringja mát skipulag
@@ -1979,6 +1987,8 @@ 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_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add picture on proposal line
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add electronic sign in PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
@@ -2096,7 +2106,6 @@ PDF_SHOW_PROJECT=Show project on document
 ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
-FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
@@ -2120,12 +2129,18 @@ ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by
 MailToSendEventOrganization=Event Organization
 AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
 YouShouldDisablePHPFunctions=You should disable PHP functions
-IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands in custom code, you shoud disable PHP functions
+PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
+NotRecommended=Not recommanded
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
 ModuleUpdateAvailable=An update is available
 NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
+RandomlySelectedIfSeveral=Randomly selected if several pictures are available
+DatabasePasswordObfuscated=Database password is obfuscated in conf file
+DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
diff --git a/htdocs/langs/is_IS/agenda.lang b/htdocs/langs/is_IS/agenda.lang
index 88b56616ee0..f3534578dfb 100644
--- a/htdocs/langs/is_IS/agenda.lang
+++ b/htdocs/langs/is_IS/agenda.lang
@@ -4,7 +4,7 @@ Actions=Actions
 Agenda=Dagskrá
 TMenuAgenda=Dagskrá
 Agendas=Dagskrá
-LocalAgenda=Internal calendar
+LocalAgenda=Default calendar
 ActionsOwnedBy=Event owned by
 ActionsOwnedByShort=Eigandi
 AffectedTo=Áhrifum á
@@ -14,13 +14,13 @@ EventsNb=Number of events
 ListOfActions=Listi yfir atburði
 EventReports=Event reports
 Location=Staðsetning
-ToUserOfGroup=Event assigned to any user in group
+ToUserOfGroup=Event assigned to any user in the group
 EventOnFullDay=Atburður á fullu dag
 MenuToDoActions=Allar ófullnægjandi aðgerðir
 MenuDoneActions=Allir ljúka aðgerðum
 MenuToDoMyActions=ófullnægjandi aðgerðir mínar
 MenuDoneMyActions=Hætta aðgerðum minn
-ListOfEvents=List of events (internal calendar)
+ListOfEvents=List of events (default calendar)
 ActionsAskedBy=Actions skráð
 ActionsToDoBy=Actions áhrif til
 ActionsDoneBy=Actions gert með því að
@@ -38,6 +38,7 @@ ActionsEvents=Viðburðir sem Dolibarr vilja búa til aðgerða á dagskrá sjá
 EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Third party %s created
+COMPANY_MODIFYInDolibarr=Third party %s modified
 COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=Contract %s validated
 CONTRACT_DELETEInDolibarr=Contract %s deleted
@@ -87,6 +88,7 @@ OrderDeleted=Order deleted
 InvoiceDeleted=Invoice deleted
 DraftInvoiceDeleted=Draft invoice deleted
 CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_MODIFYInDolibarr=Contact %s modified
 CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Product %s created
 PRODUCT_MODIFYInDolibarr=Product %s modified
@@ -119,6 +121,7 @@ MRP_MO_UNVALIDATEInDolibarr=MO set to draft status
 MRP_MO_PRODUCEDInDolibarr=MO produced
 MRP_MO_DELETEInDolibarr=MO deleted
 MRP_MO_CANCELInDolibarr=MO canceled
+PAIDInDolibarr=%s paid
 ##### End agenda events #####
 AgendaModelModule=Document templates for event
 DateActionStart=Upphafsdagur
@@ -130,7 +133,7 @@ AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to use
 AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
 AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic events.
 AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> to include events of holidays.
-AgendaShowBirthdayEvents=Show birthdays of contacts
+AgendaShowBirthdayEvents=Birthdays of contacts
 AgendaHideBirthdayEvents=Hide birthdays of contacts
 Busy=Busy
 ExportDataset_event1=List of agenda events
@@ -152,6 +155,7 @@ ActionType=Event type
 DateActionBegin=Start event date
 ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b>?
 RepeatEvent=Repeat event
+OnceOnly=Once only
 EveryWeek=Every week
 EveryMonth=Every month
 DayOfMonth=Day of month
@@ -165,4 +169,4 @@ TimeType=Duration type
 ReminderType=Callback type
 AddReminder=Create an automatic reminder notification for this event
 ErrorReminderActionCommCreation=Error creating the reminder notification for this event
-BrowserPush=Browser Notification
+BrowserPush=Browser Popup Notification
diff --git a/htdocs/langs/is_IS/bills.lang b/htdocs/langs/is_IS/bills.lang
index 4006e0841ab..a5cf1f6131e 100644
--- a/htdocs/langs/is_IS/bills.lang
+++ b/htdocs/langs/is_IS/bills.lang
@@ -259,6 +259,7 @@ DateMaxPayment=Payment due on
 DateInvoice=Dagsetningu reiknings
 DatePointOfTax=Point of tax
 NoInvoice=Nei Reikningar
+NoOpenInvoice=No open invoice
 ClassifyBill=Flokka Reikningar
 SupplierBillsToPay=Unpaid vendor invoices
 CustomerBillsUnpaid=Unpaid customer invoices
@@ -589,3 +590,4 @@ FacParentLine=Invoice Line Parent
 SituationTotalRayToRest=Remainder to pay without taxe
 PDFSituationTitle=Situation n° %d
 SituationTotalProgress=Total progress %d %%
+SearchUnpaidInvoicesWithDueDate=Search unpaid invoices with a due date = %s
diff --git a/htdocs/langs/is_IS/cashdesk.lang b/htdocs/langs/is_IS/cashdesk.lang
index 08c287a11a2..be94117f8ba 100644
--- a/htdocs/langs/is_IS/cashdesk.lang
+++ b/htdocs/langs/is_IS/cashdesk.lang
@@ -102,7 +102,7 @@ CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal numb
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
 SaleStartedAt=Sale started at %s
-ControlCashOpening=Control cash popup at opening POS
+ControlCashOpening=Open the "Control cash" popup when opening the POS
 CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -126,5 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
-ShowPriceHT = Display the price excluding tax column
-ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
+ShowPriceHT = Display the column with the price excluding tax (on screen)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
diff --git a/htdocs/langs/is_IS/compta.lang b/htdocs/langs/is_IS/compta.lang
index 8acf657f7c8..72c6c89851e 100644
--- a/htdocs/langs/is_IS/compta.lang
+++ b/htdocs/langs/is_IS/compta.lang
@@ -286,3 +286,9 @@ ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
 IncludeLoansInResults = Include loans in reports
+InvoiceLate30Days = Invoices late > 30 days
+InvoiceLate15Days = Invoices late > 15 days
+InvoiceLateMinus15Days = Invoices late
+InvoiceNotLate = To be collected < 15 days
+InvoiceNotLate15Days = To be collected in 15 days
+InvoiceNotLate30Days = To be collected in 30 days
diff --git a/htdocs/langs/is_IS/cron.lang b/htdocs/langs/is_IS/cron.lang
index 52aaabab757..0a8cdd71b64 100644
--- a/htdocs/langs/is_IS/cron.lang
+++ b/htdocs/langs/is_IS/cron.lang
@@ -60,7 +60,7 @@ CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
 CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Slökkva
-CronTaskInactive=This job is disabled
+CronTaskInactive=This job is disabled (not scheduled)
 CronId=Id
 CronClassFile=Filename with class
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example 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>
diff --git a/htdocs/langs/is_IS/errors.lang b/htdocs/langs/is_IS/errors.lang
index f9e154dea41..5884cd5c268 100644
--- a/htdocs/langs/is_IS/errors.lang
+++ b/htdocs/langs/is_IS/errors.lang
@@ -11,6 +11,7 @@ ErrorBadValueForParamNotAString=Bad value for your parameter. It appends general
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Innskráning %s  er þegar til.
 ErrorGroupAlreadyExists=Group %s  er þegar til.
+ErrorEmailAlreadyExists=Email %s already exists.
 ErrorRecordNotFound=Upptaka fannst ekki.
 ErrorFailToCopyFile=Mistókst að afrita skrá <b>'%s'</b> í 'á <b>%s</b> &quot;.
 ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
@@ -117,7 +118,7 @@ ErrorCantReadFile=Gat ekki lesið skrána ' %s '
 ErrorCantReadDir=Ekki tókst að lesa skrá ' %s '
 ErrorBadLoginPassword=Bad gildi fyrir tenging eða lykilorð
 ErrorLoginDisabled=Reikningur þinn hefur verið gerður óvirkur
-ErrorFailedToRunExternalCommand=Tókst ekki að keyra ytri stjórn. Athugaðu það er í boði og runnable með PHP netþjóninn. Ef PHP <b>Safe Mode</b> er virkt, athuga hvort stjórn er inni í möppu skilgreind viðföng <b>safe_mode_exec_dir.</b>
+ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server user. Check also the command is not protected on shell level by a security layer like apparmor.
 ErrorFailedToChangePassword=Ekki tókst að breyta lykilorðinu
 ErrorLoginDoesNotExists=Notandi með <b>notandanafn %s </b> fannst ekki.
 ErrorLoginHasNoEmail=Þessi notandi hefur ekki netfang. Aðferð aflýst.
@@ -262,6 +263,7 @@ ErrorDateIsInFuture=Error, the date can't be in the future
 ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
 ErrorAPercentIsRequired=Error, please fill in the percentage correctly
 ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
+ErrorFailedToFindEmailTemplate=Failed to find template with code name %s
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -298,3 +300,4 @@ WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So y
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
+ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
diff --git a/htdocs/langs/is_IS/eventorganization.lang b/htdocs/langs/is_IS/eventorganization.lang
index 82e905537d8..fc7781e4aff 100644
--- a/htdocs/langs/is_IS/eventorganization.lang
+++ b/htdocs/langs/is_IS/eventorganization.lang
@@ -1,4 +1,5 @@
 # Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+# Copyright (C) 2021		Dorian Vabre			<dorian.vabre@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
@@ -81,7 +82,10 @@ PriceOfBoothHelp=Subscription price to stand a booth
 EventOrganizationICSLink=Link ICS for events
 ConferenceOrBoothInformation=Conference Or Booth informations
 Attendees = Attendees
+DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
 #
 # Status
 #
@@ -94,8 +98,46 @@ EvntOrgCancelled = Cancelled
 #
 # Public page
 #
+SuggestForm = Suggestion page
+RegisterPage = Page for conferences or booth
+EvntOrgRegistrationHelpMessage = Here, you can vote for an event, or suggest a new conference or booth for the project
+EvntOrgRegistrationConfHelpMessage = Here, you can suggest a new conference for the project
+EvntOrgRegistrationBoothHelpMessage = Here, you can suggest a new booth for the project
+ListOfSuggestedConferences = List of suggested conferences
+ListOfSuggestedBooths = List of suggested booths
+SuggestConference = Suggest a new conference
+SuggestBooth = Suggest a booth
+ViewAndVote = View and vote for suggested events
 PublicAttendeeSubscriptionPage = Public link of registration to a conference
 MissingOrBadSecureKey = The security key is invalid or missing
-EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
-EvntOrgStartDuration = This conference starts on
-EvntOrgEndDuration =  and ends on
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference : '%s'
+EvntOrgDuration = This conference starts on %s and ends on %s.
+ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
+BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
+EventType = Event type
+
+#
+# Vote page
+#
+EvntOrgRegistrationWelcomeMessage = Welcome on the conference or booth suggestion page.
+EvntOrgRegistrationConfWelcomeMessage = Welcome on the conference suggestion page.
+EvntOrgRegistrationBoothWelcomeMessage = Welcome on the booth suggestion page.
+EvntOrgVoteHelpMessage = Here, you can view and vote for the suggested events for the project
+VoteOk = Your vote has been accepted.
+AlreadyVoted = You have already voted for this event.
+VoteError = An error has occurred during the vote, please try again.
+
+#
+# SubscriptionOk page
+#
+SubscriptionOk = Your subscription to this conference has been validated
+#
+# Subscription validation mail
+#
+ConfAttendeeSubscriptionConfirmation = Confirmation of your subscription to a conference
+#
+# Payment page
+#
+Attendee = Attendee
+PaymentConferenceAttendee = Conference attendee payment
+PaymentBoothLocation = Booth location payment
diff --git a/htdocs/langs/is_IS/hrm.lang b/htdocs/langs/is_IS/hrm.lang
index 3b8f137e103..da098e10bdb 100644
--- a/htdocs/langs/is_IS/hrm.lang
+++ b/htdocs/langs/is_IS/hrm.lang
@@ -9,7 +9,7 @@ ConfirmDeleteEstablishment=Are you sure you wish to delete this establishment?
 OpenEtablishment=Open establishment
 CloseEtablishment=Close establishment
 # Dictionary
-DictionaryPublicHolidays=HRM - Public holidays
+DictionaryPublicHolidays=Leave - Public holidays
 DictionaryDepartment=HRM - Department list
 DictionaryFunction=HRM - Job positions
 # Module
diff --git a/htdocs/langs/is_IS/knowledgemanagement.lang b/htdocs/langs/is_IS/knowledgemanagement.lang
index 17ec9854a75..a70eb0838d8 100644
--- a/htdocs/langs/is_IS/knowledgemanagement.lang
+++ b/htdocs/langs/is_IS/knowledgemanagement.lang
@@ -47,7 +47,7 @@ KnowledgeManagementArea = Knowledge Management
 # Menu
 #
 MenuKnowledgeRecord = Knowledge base
-ListOfArticles = List of articles
+ListKnowledgeRecord = List of articles
 NewKnowledgeRecord = New article
 ValidateReply = Validate solution
 KnowledgeRecords = Articles
diff --git a/htdocs/langs/is_IS/languages.lang b/htdocs/langs/is_IS/languages.lang
index ad4840a820e..f6b9ff6a276 100644
--- a/htdocs/langs/is_IS/languages.lang
+++ b/htdocs/langs/is_IS/languages.lang
@@ -3,6 +3,7 @@ Language_am_ET=Ethiopian
 Language_ar_AR=Arabic
 Language_ar_EG=Arabic (Egypt)
 Language_ar_SA=Arabíska
+Language_ar_TN=Arabic (Tunisia)
 Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengali
 Language_bn_IN=Bengali (India)
@@ -84,6 +85,7 @@ Language_nl_NL=Dutch
 Language_pl_PL=Pólska
 Language_pt_BR=Portúgalska (Brasilía)
 Language_pt_PT=Portúgalska
+Language_ro_MD=Romanian (Moldavia)
 Language_ro_RO=Rúmenska
 Language_ru_RU=Rússneska
 Language_ru_UA=Rússneska (Úkraína)
diff --git a/htdocs/langs/is_IS/main.lang b/htdocs/langs/is_IS/main.lang
index d9c69fa687c..a6845d80f9c 100644
--- a/htdocs/langs/is_IS/main.lang
+++ b/htdocs/langs/is_IS/main.lang
@@ -430,6 +430,7 @@ LT1IN=CGST
 LT2IN=SGST
 LT1GC=Additionnal cents
 VATRate=VSK-hlutfall
+RateOfTaxN=Rate of tax %s
 VATCode=Tax Rate code
 VATNPR=Tax Rate NPR
 DefaultTaxRate=Default tax rate
@@ -729,6 +730,7 @@ MenuMembers=Members
 MenuAgendaGoogle=Google dagskrá
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr takmörk (Valmynd heim-skipulag-öryggi): %s  KB, PHP takmörk: %s  Kb
+ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
 NoFileFound=No documents uploaded
 CurrentUserLanguage=Valið tungumál
 CurrentTheme=Núverandi þema
@@ -1072,6 +1074,7 @@ ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
 ToClose=To close
+ToRefuse=To refuse
 ToProcess=Til að ganga frá
 ToApprove=To approve
 GlobalOpenedElemView=Global view
@@ -1126,9 +1129,11 @@ UpdateForAllLines=Update for all lines
 OnHold=On hold
 Civility=Civility
 AffectTag=Affect Tag
+CreateExternalUser=Create external user
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
 ConfirmCancel=Are you sure you want to cancel
+EmailMsgID=Email MsgID
diff --git a/htdocs/langs/is_IS/members.lang b/htdocs/langs/is_IS/members.lang
index 0ebb6eab3a1..b17ec0b8686 100644
--- a/htdocs/langs/is_IS/members.lang
+++ b/htdocs/langs/is_IS/members.lang
@@ -213,3 +213,5 @@ SendReminderForExpiredSubscription=Send reminder by email to members when subscr
 MembershipPaid=Membership paid for current period (until %s)
 YouMayFindYourInvoiceInThisEmail=You may find your invoice attached to this email
 XMembersClosed=%s member(s) closed
+XExternalUserCreated=%s external user(s) created
+ForceMemberNature=Force member nature (Individual or Corporation)
diff --git a/htdocs/langs/is_IS/modulebuilder.lang b/htdocs/langs/is_IS/modulebuilder.lang
index 9fdaa1a533a..23a098be2e5 100644
--- a/htdocs/langs/is_IS/modulebuilder.lang
+++ b/htdocs/langs/is_IS/modulebuilder.lang
@@ -143,3 +143,4 @@ AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
 ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
+ImportExportProfiles=Import and export profiles
diff --git a/htdocs/langs/is_IS/mrp.lang b/htdocs/langs/is_IS/mrp.lang
index ec999a473a4..8fe3fd8f4c1 100644
--- a/htdocs/langs/is_IS/mrp.lang
+++ b/htdocs/langs/is_IS/mrp.lang
@@ -8,12 +8,12 @@ MenuBOM=Bills of material
 LatestBOMModified=Latest %s Bills of materials modified
 LatestMOModified=Latest %s Manufacturing Orders modified
 Bom=Bills of Material
-BillOfMaterials=Bill of Material
+BillOfMaterials=Bill of Materials
 BOMsSetup=Setup of module BOM
 ListOfBOMs=List of bills of material - BOM
 ListOfManufacturingOrders=List of Manufacturing Orders
-NewBOM=New bill of material
-ProductBOMHelp=Product to create with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
+NewBOM=New bill of materials
+ProductBOMHelp=Product to create (or disassemble) with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
 BOMsNumberingModules=BOM numbering templates
 BOMsModelModule=BOM document templates
 MOsNumberingModules=MO numbering templates
@@ -22,7 +22,7 @@ FreeLegalTextOnBOMs=Free text on document of BOM
 WatermarkOnDraftBOMs=Watermark on draft BOM
 FreeLegalTextOnMOs=Free text on document of MO
 WatermarkOnDraftMOs=Watermark on draft MO
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials %s ?
 ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
 ManufacturingEfficiency=Manufacturing efficiency
 ConsumptionEfficiency=Consumption efficiency
@@ -30,8 +30,8 @@ ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the produc
 ValueOfMeansLossForProductProduced=Value of 0.95 means an average of 5%% of loss of produced product
 DeleteBillOfMaterials=Delete Bill Of Materials
 DeleteMo=Delete Manufacturing Order
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Materials?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Materials?
 MenuMRP=Manufacturing Orders
 NewMO=New Manufacturing Order
 QtyToProduce=Qty to produce
@@ -39,7 +39,7 @@ DateStartPlannedMo=Date start planned
 DateEndPlannedMo=Date end planned
 KeepEmptyForAsap=Empty means 'As Soon As Possible'
 EstimatedDuration=Estimated duration
-EstimatedDurationDesc=Estimated duration to manufacture this product using this BOM
+EstimatedDurationDesc=Estimated duration to manufacture (or disassemble) this product using this BOM
 ConfirmValidateBom=Are you sure you want to validate the BOM with the reference <strong>%s</strong> (you will be able to use it to build new Manufacturing Orders)
 ConfirmCloseBom=Are you sure you want to cancel this BOM (you won't be able to use it to build new Manufacturing Orders anymore) ?
 ConfirmReopenBom=Are you sure you want to re-open this BOM (you will be able to use it to build new Manufacturing Orders)
@@ -63,13 +63,14 @@ ConsumeAndProduceAll=Consume and Produce All
 Manufactured=Manufactured
 TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
 ForAQuantityOf=For a quantity to produce of %s
+ForAQuantityToConsumeOf=For a quantity to disassemble of %s
 ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
 ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
 ProductionForRef=Production of %s
 AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
 NoStockChangeOnServices=No stock change on services
 ProductQtyToConsumeByMO=Product quantity still to consume by open MO
-ProductQtyToProduceByMO=Product quentity still to produce by open MO
+ProductQtyToProduceByMO=Product quantity still to produce by open MO
 AddNewConsumeLines=Add new line to consume
 ProductsToConsume=Products to consume
 ProductsToProduce=Products to produce
@@ -83,15 +84,13 @@ Workstations=Workstations
 WorkstationsDescription=Workstations management
 WorkstationSetup = Workstations setup
 WorkstationSetupPage = Workstations setup page
-WorkstationAbout = About Workstation
-WorkstationAboutPage = Workstations about page
 WorkstationList=Workstation list
 WorkstationCreate=Add new workstation
 ConfirmEnableWorkstation=Are you sure you want to enable workstation <b>%s</b> ?
 EnableAWorkstation=Enable a workstation
 ConfirmDisableWorkstation=Are you sure you want to disable workstation <b>%s</b> ?
 DisableAWorkstation=Disable a workstation
-DeleteWorkstation=Supprimer
+DeleteWorkstation=Eyða
 NbOperatorsRequired=Number of operators required
 THMOperatorEstimated=Estimated operator THM
 THMMachineEstimated=Estimated machine THM
diff --git a/htdocs/langs/is_IS/orders.lang b/htdocs/langs/is_IS/orders.lang
index 76fbd1f19ee..42767f743eb 100644
--- a/htdocs/langs/is_IS/orders.lang
+++ b/htdocs/langs/is_IS/orders.lang
@@ -11,6 +11,7 @@ OrderDate=Panta dagsetningu
 OrderDateShort=Panta dagsetningu
 OrderToProcess=Til að framkvæma
 NewOrder=New Order
+NewSupplierOrderShort=New Order
 NewOrderSupplier=New Purchase Order
 ToOrder=Gera röð
 MakeOrder=Gera röð
@@ -73,6 +74,7 @@ DeleteOrder=Eyða röð
 CancelOrder=Hætta við röð
 OrderReopened= Order %s re-open
 AddOrder=Create order
+AddSupplierOrderShort=Create order
 AddPurchaseOrder=Create purchase order
 AddToDraftOrders=Add to draft order
 ShowOrder=Sýna röð
diff --git a/htdocs/langs/is_IS/other.lang b/htdocs/langs/is_IS/other.lang
index 6c9955da615..4f943884b56 100644
--- a/htdocs/langs/is_IS/other.lang
+++ b/htdocs/langs/is_IS/other.lang
@@ -129,6 +129,7 @@ ClosedByLogin=User login who closed
 FileWasRemoved=File %s  var eytt
 DirWasRemoved=Listinn %s  hefur verið fjarlægt
 FeatureNotYetAvailable=Feature not yet available in the current version
+FeatureNotAvailableOnDevicesWithoutMouse=Feature not available on devices without mouse
 FeaturesSupported=Supported features
 Width=Breidd
 Height=Hæð
@@ -263,7 +264,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
-PrefixSession=Prefix for session ID
+SuffixSessionName=Suffix for session name
 
 ##### Export #####
 ExportsArea=Útflutningur area
diff --git a/htdocs/langs/is_IS/partnership.lang b/htdocs/langs/is_IS/partnership.lang
index 7601c9eef1b..c1707d73c8f 100644
--- a/htdocs/langs/is_IS/partnership.lang
+++ b/htdocs/langs/is_IS/partnership.lang
@@ -16,41 +16,72 @@
 #
 # Generic
 #
-ModulePartnershipName = Partnership management
-PartnershipDescription = Module Partnership management
+ModulePartnershipName=Partnership management
+PartnershipDescription=Module Partnership management
 PartnershipDescriptionLong= Module Partnership management
 
+AddPartnership=Add partnership
+CancelPartnershipForExpiredMembers=Partnership: Cancel partnership of members with expired subscriptions
+PartnershipCheckBacklink=Partnership: Check referring backlink
+
 #
 # Menu
 #
-NewPartnership = New Partnership
-ListOfPartnerships = List of partnership
+NewPartnership=New Partnership
+ListOfPartnerships=List of partnership
 
 #
 # Admin page
 #
-PartnershipSetup = Partnership setup
-PartnershipAbout = About Partnership
-PartnershipAboutPage = Partnership about page
-
+PartnershipSetup=Partnership setup
+PartnershipAbout=About Partnership
+PartnershipAboutPage=Partnership about page
+partnershipforthirdpartyormember=Partner status must be set on a 'thirdparty' or a 'member'
+PARTNERSHIP_IS_MANAGED_FOR=Partnership managed for
+PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks to check
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb of days before cancelling status of a partnership when a subscription has expired
+ReferingWebsiteCheck=Check of website referring
+ReferingWebsiteCheckDesc=You can enable a feature to check that your partners has added a backlink to your website domains on their own website.
 
 #
 # Object
 #
+DeletePartnership=Delete a partnership
+PartnershipDedicatedToThisThirdParty=Partnership dedicated to this third party
+PartnershipDedicatedToThisMember=Partnership dedicated to this member
 DatePartnershipStart=Upphafsdagur
 DatePartnershipEnd=Lokadagur
+ReasonDecline=Decline reason
+ReasonDeclineOrCancel=Decline reason
+PartnershipAlreadyExist=Partnership already exist
+ManagePartnership=Manage partnership
+BacklinkNotFoundOnPartnerWebsite=Backlink not found on partner website
+ConfirmClosePartnershipAsk=Are you sure you want to cancel this partnership?
+PartnershipType=Partnership type
 
 #
 # Template Mail
 #
+SendingEmailOnPartnershipWillSoonBeCanceled=Partnership will soon be canceled
+SendingEmailOnPartnershipRefused=Partnership refused
+SendingEmailOnPartnershipAccepted=Partnership accepted
+SendingEmailOnPartnershipCanceled=Partnership canceled
 
+YourPartnershipWillSoonBeCanceledTopic=Partnership will soon be canceled
+YourPartnershipRefusedTopic=Partnership refused
+YourPartnershipAcceptedTopic=Partnership accepted
+YourPartnershipCanceledTopic=Partnership canceled
+
+YourPartnershipWillSoonBeCanceledContent=We inform you that your partnership will soon be canceled (Backlink not found)
+YourPartnershipRefusedContent=We inform you that your partnership request has been refused.
+YourPartnershipAcceptedContent=We inform you that your partnership request has been accepted.
+YourPartnershipCanceledContent=We inform you that your partnership has been canceled.
 
 #
 # Status
 #
-PartnershipDraft = Drög
-PartnershipAccepted = Accepted
-PartnershipRefused = Neitaði
-PartnershipCanceled = Hætt við
-
+PartnershipDraft=Drög
+PartnershipAccepted=Accepted
+PartnershipRefused=Neitaði
+PartnershipCanceled=Hætt við
 PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/is_IS/productbatch.lang b/htdocs/langs/is_IS/productbatch.lang
index 76027ce838f..bdb2fbe77c1 100644
--- a/htdocs/langs/is_IS/productbatch.lang
+++ b/htdocs/langs/is_IS/productbatch.lang
@@ -1,4 +1,4 @@
-# ProductBATCH language file - en_US - ProductBATCH
+# ProductBATCH language file - Source file is en_US - ProductBATCH
 ManageLotSerial=Use lot/serial number
 ProductStatusOnBatch=Yes (lot required)
 ProductStatusOnSerial=Yes (unique serial number required)
@@ -33,3 +33,13 @@ CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+LifeTime=Life span (in days)
+EndOfLife=End of life
+ManufacturingDate=Manufacturing date
+DestructionDate=Destruction date
+FirstUseDate=First use date
+QCFrequency=Quality control frequency (in days)
+
+#Traceability - qc status
+OutOfOrder=Out of order
+InWorkingOrder=In working order
diff --git a/htdocs/langs/is_IS/products.lang b/htdocs/langs/is_IS/products.lang
index b827b88b299..92e7d485513 100644
--- a/htdocs/langs/is_IS/products.lang
+++ b/htdocs/langs/is_IS/products.lang
@@ -396,3 +396,5 @@ ActionAvailableOnVariantProductOnly=Action only available on the variant of prod
 ProductsPricePerCustomer=Product prices per customers
 ProductSupplierExtraFields=Additional Attributes (Supplier Prices)
 DeleteLinkedProduct=Delete the child product linked to the combination
+PMPValue=Vegið meðalverð
+PMPValueShort=WAP
diff --git a/htdocs/langs/is_IS/projects.lang b/htdocs/langs/is_IS/projects.lang
index 11e10b08977..c47adacf369 100644
--- a/htdocs/langs/is_IS/projects.lang
+++ b/htdocs/langs/is_IS/projects.lang
@@ -267,9 +267,11 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=Nýr reikningur
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+OneLinePerTimeSpentLine=One line for each time spent declaration
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
 AddPersonToTask=Add also to tasks
 UsageOrganizeEvent=Usage: Event Organization
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
+SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
diff --git a/htdocs/langs/is_IS/receptions.lang b/htdocs/langs/is_IS/receptions.lang
index f2bf1524084..decd06ab939 100644
--- a/htdocs/langs/is_IS/receptions.lang
+++ b/htdocs/langs/is_IS/receptions.lang
@@ -44,4 +44,4 @@ ValidateOrderFirstBeforeReception=You must first validate the order before being
 ReceptionsNumberingModules=Numbering module for receptions
 ReceptionsReceiptModel=Document templates for receptions
 NoMorePredefinedProductToDispatch=No more predefined products to dispatch
-
+ReceptionExist=A reception exists
diff --git a/htdocs/langs/is_IS/stocks.lang b/htdocs/langs/is_IS/stocks.lang
index 101a5559a60..f64854d92d2 100644
--- a/htdocs/langs/is_IS/stocks.lang
+++ b/htdocs/langs/is_IS/stocks.lang
@@ -56,8 +56,6 @@ UnitPurchaseValue=Unit purchase price
 StockTooLow=Stock of lágt
 StockLowerThanLimit=Stock lower than alert limit (%s)
 EnhancedValue=Gildi
-PMPValue=Vegið meðalverð
-PMPValueShort=WAP
 EnhancedValueOfWarehouses=Vöruhús gildi
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
@@ -251,7 +249,10 @@ SelectAStockMovementFileToImport=select a stock movement file to import
 InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
 LabelOfInventoryMovemement=Inventory %s
 ReOpen=Reopen
-ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock to the real qty you entered into the inventory.
 ObjectNotFound=%s not found
 MakeMovementsAndClose=Generate movements and close
 AutofillWithExpected=Fill real quantity with expected quantity
+ShowAllBatchByDefault=By default, show batch details on product "stock" tab
+CollapseBatchDetailHelp=You can set batch detail default display in stocks module configuration
+FieldCannotBeNegative=Field "%s" cannot be negative
diff --git a/htdocs/langs/is_IS/ticket.lang b/htdocs/langs/is_IS/ticket.lang
index 05766c00998..7c7369d1b16 100644
--- a/htdocs/langs/is_IS/ticket.lang
+++ b/htdocs/langs/is_IS/ticket.lang
@@ -304,7 +304,7 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
-BoxTicketType=Number of open tickets by type
+BoxTicketType=Distribution of open tickets by type
 BoxTicketSeverity=Number of open tickets by severity
 BoxNoTicketSeverity=No tickets opened
 BoxTicketLastXDays=Number of new tickets by days the last %s days
diff --git a/htdocs/langs/it_CH/accountancy.lang b/htdocs/langs/it_CH/accountancy.lang
deleted file mode 100644
index 4dbdd035d6e..00000000000
--- a/htdocs/langs/it_CH/accountancy.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - accountancy
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
diff --git a/htdocs/langs/it_CH/cron.lang b/htdocs/langs/it_CH/cron.lang
deleted file mode 100644
index 67ecfc77567..00000000000
--- a/htdocs/langs/it_CH/cron.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - cron
-CronTaskInactive=This job is disabled
diff --git a/htdocs/langs/it_CH/exports.lang b/htdocs/langs/it_CH/exports.lang
new file mode 100644
index 00000000000..17dedd46696
--- /dev/null
+++ b/htdocs/langs/it_CH/exports.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - exports
+DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
diff --git a/htdocs/langs/it_CH/mrp.lang b/htdocs/langs/it_CH/mrp.lang
deleted file mode 100644
index f03d631dfd4..00000000000
--- a/htdocs/langs/it_CH/mrp.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - mrp
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
diff --git a/htdocs/langs/it_CH/products.lang b/htdocs/langs/it_CH/products.lang
new file mode 100644
index 00000000000..e0628dbec00
--- /dev/null
+++ b/htdocs/langs/it_CH/products.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - products
+ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
diff --git a/htdocs/langs/it_CH/stocks.lang b/htdocs/langs/it_CH/stocks.lang
new file mode 100644
index 00000000000..c6779157e0f
--- /dev/null
+++ b/htdocs/langs/it_CH/stocks.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - stocks
+OpenInternal=Open only for internal actions
diff --git a/htdocs/langs/it_CH/ticket.lang b/htdocs/langs/it_CH/ticket.lang
new file mode 100644
index 00000000000..7245956e6bd
--- /dev/null
+++ b/htdocs/langs/it_CH/ticket.lang
@@ -0,0 +1,4 @@
+# Dolibarr language file - Source file is en_US - ticket
+TicketTypeShortISSUE=Issue, bug or problem
+NeedMoreInformation=Waiting for information
+TicketCategory=Group
diff --git a/htdocs/langs/it_IT/accountancy.lang b/htdocs/langs/it_IT/accountancy.lang
index c7140344a32..2237f529390 100644
--- a/htdocs/langs/it_IT/accountancy.lang
+++ b/htdocs/langs/it_IT/accountancy.lang
@@ -158,7 +158,7 @@ ACCOUNTING_LENGTH_AACCOUNT=Lunghezza della contabilità di terze parti (se impos
 ACCOUNTING_MANAGE_ZERO=Consentire di gestire un diverso numero di zeri alla fine di un conto contabile. Necessario in alcuni paesi (come la Svizzera). Se impostato su off (predefinito), è possibile impostare i seguenti due parametri per chiedere all'applicazione di aggiungere zeri virtuali.
 BANK_DISABLE_DIRECT_INPUT=Disabilita la registrazione diretta della transazione nel conto bancario
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Abilita la bozza di esportazione sul giornale
-ACCOUNTANCY_COMBO_FOR_AUX=Abilita l'elenco combinato per il conto secondario (potrebbe essere lento se hai un sacco di terze parti)
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties, break ability to search on a part of value)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
@@ -328,6 +328,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountanc
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
+NotifiedExportDate=Notified export date (modification of the entries will not be possible)
+NotifiedValidationDate=Validation of the entries (modification or deletion of the entries will not be possible)
+ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=Export draft journal
 Modelcsv=Modello di esportazione
 Selectmodelcsv=Seleziona un modello di esportazione
diff --git a/htdocs/langs/it_IT/admin.lang b/htdocs/langs/it_IT/admin.lang
index 6ca4c40f1ca..736eafddfa3 100644
--- a/htdocs/langs/it_IT/admin.lang
+++ b/htdocs/langs/it_IT/admin.lang
@@ -221,8 +221,8 @@ NotCompatible=Questo modulo non sembra essere compatibile con la tua versione di
 CompatibleAfterUpdate=Questo modulo richiede un aggiornamento a Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=See in Market place
 SeeSetupOfModule=Vedi la configurazione del modulo %s
+SetOptionTo=Set option <b>%s</b> to %s
 Updated=Aggiornato
-Nouveauté=Novità
 AchatTelechargement=Aquista / Scarica
 GoModuleSetupArea=To deploy/install a new module, go to the Module setup area: <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, il mercato ufficiale dei moduli esterni per Dolibarr ERP/CRM
@@ -298,7 +298,7 @@ MAIN_MAIL_SMTPS_ID=Username SMTP (se il server richiede l'autenticazione)
 MAIN_MAIL_SMTPS_PW=Password SMTP (se il server richiede l'autenticazione)
 MAIN_MAIL_EMAIL_TLS=Usa la cifratura TLS (SSL)
 MAIN_MAIL_EMAIL_STARTTLS=Use TLS (STARTTLS) encryption
-MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Autorizza i certificati auto-firmati
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Use DKIM to generate email signature
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Email Domain for use with dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Name of dkim selector
@@ -399,6 +399,7 @@ SecurityToken=Token di sicurezza
 NoSmsEngine=Nessun gestore mittente SMS disponibile. Un gestore mittente SMS non è installato con la distribuzione predefinita perché dipendono da un fornitore esterno, ma puoi trovarne alcuni su %s
 PDF=PDF
 PDFDesc=Opzioni globali per la generazione di PDF
+PDFOtherDesc=PDF Option specific to some modules
 PDFAddressForging=Regole per la sezione degli indirizzi
 HideAnyVATInformationOnPDF=Nascondi tutte le informazioni relative all'IVA sui pdf generati.
 PDFRulesForSalesTax=Regole per tasse sulla vendita/IVA
@@ -561,7 +562,7 @@ Module53Desc=Gestione servizi
 Module54Name=Contratti/Abbonamenti
 Module54Desc=Gestione contratti (servizi o abbonamenti)
 Module55Name=Codici a barre
-Module55Desc=Gestione codici a barre
+Module55Desc=Barcode or QR code management
 Module56Name=Pagamento con bonifico bancario
 Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
 Module57Name=Payments by Direct Debit
@@ -848,10 +849,10 @@ Permission402=Creare/modificare sconti
 Permission403=Convalidare sconti
 Permission404=Eliminare sconti
 Permission430=Usa la barra di debug
-Permission511=Read payments of salaries (yours and subordinates)
-Permission512=Create/modify payments of salaries
-Permission514=Delete payments of salaries
-Permission517=Read payments of salaries of everybody
+Permission511=Read salaries and payments (yours and subordinates)
+Permission512=Create/modify salaries and payments
+Permission514=Delete salaries and payments
+Permission517=Read salaries and payments everybody
 Permission519=Esporta stipendi
 Permission520=Read Loans
 Permission522=Crea/modifica prestiti
@@ -965,6 +966,8 @@ Permission23003=Elimina lavoro pianificato
 Permission23004=Esegui lavoro pianificato
 Permission50101=Use Point of Sale (SimplePOS)
 Permission50151=Use Point of Sale (TakePOS)
+Permission50152=Edit sales lines
+Permission50153=Edit ordered sales lines
 Permission50201=Vedere transazioni
 Permission50202=Importare transazioni
 Permission50330=Read objects of Zapier
@@ -1039,11 +1042,12 @@ DictionaryMeasuringUnits=Unità di misura
 DictionarySocialNetworks=Social networks
 DictionaryProspectStatus=Prospect status for companies
 DictionaryProspectContactStatus=Prospect status for contacts
-DictionaryHolidayTypes=Tipi di ferie/permessi
+DictionaryHolidayTypes=Leave - Types of leave
 DictionaryOpportunityStatus=Stato opportunità per progetto/clienti potenziali
 DictionaryExpenseTaxCat=Note spesa - Categorie di trasporto
 DictionaryExpenseTaxRange=Note spesa: intervallo per categoria di trasporto
 DictionaryTransportMode=Intracomm report - Transport mode
+DictionaryBatchStatus=Product lot/serial Quality Control status
 TypeOfUnit=Type of unit
 SetupSaved=Impostazioni salvate
 SetupNotSaved=Impostazioni non salvate
@@ -1187,7 +1191,7 @@ SetupDescription4= <a href="%s"> %s -> %s </a> <br> <br> Questo software è una
 SetupDescription5=Altre voci di menu consentono la gestione di parametri opzionali.
 AuditedSecurityEvents=Security events that are audited
 NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
-Audit=Audit
+Audit=Security events
 InfoDolibarr=Informazioni su Dolibarr
 InfoBrowser=Informazioni browser
 InfoOS=Informazioni OS
@@ -1319,9 +1323,12 @@ ConditionIsCurrently=La condizione corrente è %s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
 NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
+ComboListOptim=Combo list loading optimization
 SearchOptim=Ottimizzazione della ricerca
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
-YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
+YouHaveXObjectUseComboOptim=You have %s %s in the database. You can go into setup of module to enable loading of combo list on key pressed event.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other.
+YouHaveXObjectUseSearchOptimDesc=This limits the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to %s in Home-Setup-Other.
 BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
 BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
 PHPModuleLoaded=PHP component %s is loaded
@@ -1433,6 +1440,7 @@ MemberMainOptions=Opzioni principali
 AdherentLoginRequired= Gestire un account di accesso per ogni membro
 AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Checkbox per inviare una mail di conferma per i membri (è attiva per impostazione predefinita)
+MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
 VisitorCanChooseItsPaymentMode=Il visitatore può scegliere tra le modalità di pagamento disponibili
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
 MembersDocModules=Document templates for documents generated from member record
@@ -1763,7 +1771,7 @@ AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting men
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Attiva i suoni per le notifiche
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
-AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the scheduled job %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Impostazioni modulo ClickToDial (telefonate con un clic)
@@ -1979,6 +1987,8 @@ MAIN_PDF_MARGIN_RIGHT=Margine destro sul PDF
 MAIN_PDF_MARGIN_TOP=Margine superiore sul PDF
 MAIN_PDF_MARGIN_BOTTOM=Margine inferiore su PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Altezza per logo in PDF
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add picture on proposal line
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add electronic sign in PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
@@ -2096,7 +2106,6 @@ PDF_SHOW_PROJECT=Show project on document
 ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=Se vuoi avere alcuni testi nel tuo PDF duplicato in 2 lingue diverse nello stesso PDF generato, devi impostare qui la seconda lingua in modo che il PDF generato contenga 2 lingue diverse nella stessa pagina, quella scelta durante la generazione del PDF e questa ( solo pochi modelli PDF supportano questa opzione). Mantieni vuoto per 1 lingua per PDF.
 FafaIconSocialNetworksDesc=Inserisci qui il codice di un'icona FontAwesome. Se non sai cos'è FontAwesome, puoi utilizzare il valore generico fa-address-book.
-FeatureNotAvailableWithReceptionModule=Funzione non disponibile quando la ricezione del modulo è abilitata
 RssNote=Nota: ogni definizione di feed RSS fornisce un widget che è necessario abilitare per renderlo disponibile nella dashboard
 JumpToBoxes=Vai a Setup -> Widget
 MeasuringUnitTypeDesc=Usa qui un valore come "dimensione", "superficie", "volume", "peso", "tempo"
@@ -2120,12 +2129,18 @@ ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by
 MailToSendEventOrganization=Event Organization
 AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
 YouShouldDisablePHPFunctions=You should disable PHP functions
-IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands in custom code, you shoud disable PHP functions
+PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
+NotRecommended=Not recommanded
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
 ModuleUpdateAvailable=An update is available
 NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
+RandomlySelectedIfSeveral=Randomly selected if several pictures are available
+DatabasePasswordObfuscated=Database password is obfuscated in conf file
+DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
diff --git a/htdocs/langs/it_IT/agenda.lang b/htdocs/langs/it_IT/agenda.lang
index ae83e1cee06..aee8bcf89c7 100644
--- a/htdocs/langs/it_IT/agenda.lang
+++ b/htdocs/langs/it_IT/agenda.lang
@@ -4,7 +4,7 @@ Actions=Eventi
 Agenda=Agenda
 TMenuAgenda=Agenda
 Agendas=Agende
-LocalAgenda=Calendario interno
+LocalAgenda=Default calendar
 ActionsOwnedBy=Evento amministrato da
 ActionsOwnedByShort=Proprietario
 AffectedTo=Azione assegnata a
@@ -20,7 +20,7 @@ MenuToDoActions=Tutte le azioni incomplete
 MenuDoneActions=Tutte le azioni passate
 MenuToDoMyActions=I mie eventi non completati
 MenuDoneMyActions=I miei eventi passati
-ListOfEvents=Lista di eventi (calendario interno)
+ListOfEvents=List of events (default calendar)
 ActionsAskedBy=Azioni richieste da
 ActionsToDoBy=Eventi assegnati a
 ActionsDoneBy=Azioni fatte da
@@ -38,6 +38,7 @@ ActionsEvents=Eventi per i quali creare un'azione
 EventRemindersByEmailNotEnabled=I promemoria degli eventi via e-mail non sono stati abilitati nell'impostazione del modulo %s.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Soggetto terzo %s creato
+COMPANY_MODIFYInDolibarr=Third party %s modified
 COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=Contratto %s convalidato
 CONTRACT_DELETEInDolibarr=Contratto %s cancellato
@@ -86,8 +87,9 @@ ProposalDeleted=Proposta cancellata
 OrderDeleted=Ordine cancellato
 InvoiceDeleted=Fattura cancellata
 DraftInvoiceDeleted=Bozza di fattura eliminata
-CONTACT_CREATEInDolibarr=Contact %s created
-CONTACT_DELETEInDolibarr=Contact %s deleted
+CONTACT_CREATEInDolibarr=Contatto %s creato
+CONTACT_MODIFYInDolibarr=Contact %s modified
+CONTACT_DELETEInDolibarr=Contatto %s eliminato
 PRODUCT_CREATEInDolibarr=Prodotto %s creato
 PRODUCT_MODIFYInDolibarr=Prodotto %s  modificato
 PRODUCT_DELETEInDolibarr=Prodotto %s cancellato
@@ -119,6 +121,7 @@ MRP_MO_UNVALIDATEInDolibarr=MO impostato sullo stato bozza
 MRP_MO_PRODUCEDInDolibarr=MO prodotto
 MRP_MO_DELETEInDolibarr=MO eliminato
 MRP_MO_CANCELInDolibarr=MO annullato
+PAIDInDolibarr=%s paid
 ##### End agenda events #####
 AgendaModelModule=Modelli di documento per eventi
 DateActionStart=Data di inizio
@@ -130,7 +133,7 @@ AgendaUrlOptions4=<b>logint=%s</b> per limitare l'output alle azioni assegnate a
 AgendaUrlOptionsProject=<b>project= __PROJECT_ID__</b> per limitare l'output alle azioni collegate al progetto <b>__PROJECT_ID__ </b>.
 AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> per escludere gli eventi automatici.
 AgendaUrlOptionsIncludeHolidays= <b> includeholidays = 1 </b> per includere eventi delle festività.
-AgendaShowBirthdayEvents=Visualizza i compleanni dei contatti
+AgendaShowBirthdayEvents=Birthdays of contacts
 AgendaHideBirthdayEvents=Nascondi i compleanni dei contatti
 Busy=Occupato
 ExportDataset_event1=Lista degli eventi in agenda
@@ -152,6 +155,7 @@ ActionType=Tipo di evento
 DateActionBegin=Data di inizio evento
 ConfirmCloneEvent=Sei sicuro che vuoi clonare l'evento <b>%s</b>?
 RepeatEvent=Ripeti evento
+OnceOnly=Once only
 EveryWeek=Ogni settimana
 EveryMonth=Ogni mese
 DayOfMonth=Giorno del mese
@@ -165,4 +169,4 @@ TimeType=Duration type
 ReminderType=Callback type
 AddReminder=Create an automatic reminder notification for this event
 ErrorReminderActionCommCreation=Error creating the reminder notification for this event
-BrowserPush=Browser Notification
+BrowserPush=Browser Popup Notification
diff --git a/htdocs/langs/it_IT/bills.lang b/htdocs/langs/it_IT/bills.lang
index 63f6ef3b167..b86e8fb59b4 100644
--- a/htdocs/langs/it_IT/bills.lang
+++ b/htdocs/langs/it_IT/bills.lang
@@ -259,6 +259,7 @@ DateMaxPayment=Pagamento dovuto per
 DateInvoice=Data di fatturazione
 DatePointOfTax=Punto di imposta
 NoInvoice=Nessuna fattura
+NoOpenInvoice=No open invoice
 ClassifyBill=Classificazione fattura
 SupplierBillsToPay=Fatture Fornitore non pagate
 CustomerBillsUnpaid=Fatture attive non pagate
@@ -589,3 +590,4 @@ FacParentLine=Genitore riga fattura
 SituationTotalRayToRest=Resto da pagare senza tasse
 PDFSituationTitle=Situazione n ° %d
 SituationTotalProgress=Avanzamento totale %d %%
+SearchUnpaidInvoicesWithDueDate=Search unpaid invoices with a due date = %s
diff --git a/htdocs/langs/it_IT/cashdesk.lang b/htdocs/langs/it_IT/cashdesk.lang
index fd00a01dd8c..b1b6ea1b553 100644
--- a/htdocs/langs/it_IT/cashdesk.lang
+++ b/htdocs/langs/it_IT/cashdesk.lang
@@ -102,7 +102,7 @@ CashDeskGenericMaskCodes6 =  <br> Il tag <b> {TN} </b> viene utilizzato per aggi
 TakeposGroupSameProduct=Raggruppa le stesse linee di prodotti
 StartAParallelSale=Inizia una nuova vendita parallela
 SaleStartedAt=Sale started at %s
-ControlCashOpening=Control cash popup at opening POS
+ControlCashOpening=Open the "Control cash" popup when opening the POS
 CloseCashFence=Close cash desk control
 CashReport=Rapporto di cassa
 MainPrinterToUse=Stampante principale da utilizzare
@@ -126,5 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
-ShowPriceHT = Display the price excluding tax column
-ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
+ShowPriceHT = Display the column with the price excluding tax (on screen)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
diff --git a/htdocs/langs/it_IT/compta.lang b/htdocs/langs/it_IT/compta.lang
index 83a9dd57b4e..34f0e07c7b7 100644
--- a/htdocs/langs/it_IT/compta.lang
+++ b/htdocs/langs/it_IT/compta.lang
@@ -286,3 +286,9 @@ ReportPurchaseTurnover=Fatturato di acquisto fatturato
 ReportPurchaseTurnoverCollected=Fatturato di acquisto raccolto
 IncludeVarpaysInResults = Includere vari pagamenti nei rapporti
 IncludeLoansInResults = Includere prestiti nei report
+InvoiceLate30Days = Invoices late > 30 days
+InvoiceLate15Days = Invoices late > 15 days
+InvoiceLateMinus15Days = Invoices late
+InvoiceNotLate = To be collected < 15 days
+InvoiceNotLate15Days = To be collected in 15 days
+InvoiceNotLate30Days = To be collected in 30 days
diff --git a/htdocs/langs/it_IT/cron.lang b/htdocs/langs/it_IT/cron.lang
index 988a944ddfd..24a8a7e5516 100644
--- a/htdocs/langs/it_IT/cron.lang
+++ b/htdocs/langs/it_IT/cron.lang
@@ -60,7 +60,7 @@ CronErrEndDateStartDt=La data di fine non può essere precedente a quella di ini
 StatusAtInstall=Stato all'installazione del modulo
 CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Disattiva
-CronTaskInactive=Questo processo è disabilitato
+CronTaskInactive=This job is disabled (not scheduled)
 CronId=Id
 CronClassFile=Nome file con 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>
diff --git a/htdocs/langs/it_IT/errors.lang b/htdocs/langs/it_IT/errors.lang
index af3f97876fa..c4c42e08a23 100644
--- a/htdocs/langs/it_IT/errors.lang
+++ b/htdocs/langs/it_IT/errors.lang
@@ -11,6 +11,7 @@ ErrorBadValueForParamNotAString=Bad value for your parameter. It appends general
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=L'utente %s esiste già.
 ErrorGroupAlreadyExists=Il gruppo %s esiste già
+ErrorEmailAlreadyExists=Email %s already exists.
 ErrorRecordNotFound=Record non trovato
 ErrorFailToCopyFile=Impossibile copiare il file '<b>%s</b>' in '<b>%s</b>'
 ErrorFailToCopyDir=Impossibile copiare la directory ' <b>%s</b> ' in ' <b>%s</b> '.
@@ -117,7 +118,7 @@ ErrorCantReadFile=Impossibile leggere il file <b>%s</b>
 ErrorCantReadDir=Impossibile leggere nella directory <b>%s</b>
 ErrorBadLoginPassword=Errore: Username o password non corretti
 ErrorLoginDisabled=L'account è stato disabilitato
-ErrorFailedToRunExternalCommand=Impossibile eseguire il comando esterno. Controlla che sia disponibile ed eseguibile dal server PHP. Se la modalità <b>safe_mode</ b> è abilitata in PHP, verificare che il comando sia all'interno di una directory ammessa dal parametro <b>safe_mode_exec_dir</ b>.
+ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server user. Check also the command is not protected on shell level by a security layer like apparmor.
 ErrorFailedToChangePassword=Impossibile cambiare la password
 ErrorLoginDoesNotExists=Utente con accesso <b>%s</b> inesistente
 ErrorLoginHasNoEmail=Questo utente non ha alcun indirizzo email. Processo interrotto.
@@ -262,6 +263,7 @@ ErrorDateIsInFuture=Error, the date can't be in the future
 ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
 ErrorAPercentIsRequired=Error, please fill in the percentage correctly
 ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
+ErrorFailedToFindEmailTemplate=Failed to find template with code name %s
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -298,3 +300,4 @@ WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So y
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
+ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
diff --git a/htdocs/langs/it_IT/eventorganization.lang b/htdocs/langs/it_IT/eventorganization.lang
index a7de633650b..d6729e7b123 100644
--- a/htdocs/langs/it_IT/eventorganization.lang
+++ b/htdocs/langs/it_IT/eventorganization.lang
@@ -1,4 +1,5 @@
 # Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+# Copyright (C) 2021		Dorian Vabre			<dorian.vabre@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
@@ -81,7 +82,10 @@ PriceOfBoothHelp=Subscription price to stand a booth
 EventOrganizationICSLink=Link ICS for events
 ConferenceOrBoothInformation=Conference Or Booth informations
 Attendees = Attendees
+DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
 #
 # Status
 #
@@ -94,8 +98,46 @@ EvntOrgCancelled = Cancelled
 #
 # Public page
 #
+SuggestForm = Suggestion page
+RegisterPage = Page for conferences or booth
+EvntOrgRegistrationHelpMessage = Here, you can vote for an event, or suggest a new conference or booth for the project
+EvntOrgRegistrationConfHelpMessage = Here, you can suggest a new conference for the project
+EvntOrgRegistrationBoothHelpMessage = Here, you can suggest a new booth for the project
+ListOfSuggestedConferences = List of suggested conferences
+ListOfSuggestedBooths = List of suggested booths
+SuggestConference = Suggest a new conference
+SuggestBooth = Suggest a booth
+ViewAndVote = View and vote for suggested events
 PublicAttendeeSubscriptionPage = Public link of registration to a conference
 MissingOrBadSecureKey = The security key is invalid or missing
-EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
-EvntOrgStartDuration = This conference starts on
-EvntOrgEndDuration =  and ends on
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference : '%s'
+EvntOrgDuration = This conference starts on %s and ends on %s.
+ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
+BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
+EventType = Tipo di evento
+
+#
+# Vote page
+#
+EvntOrgRegistrationWelcomeMessage = Welcome on the conference or booth suggestion page.
+EvntOrgRegistrationConfWelcomeMessage = Welcome on the conference suggestion page.
+EvntOrgRegistrationBoothWelcomeMessage = Welcome on the booth suggestion page.
+EvntOrgVoteHelpMessage = Here, you can view and vote for the suggested events for the project
+VoteOk = Your vote has been accepted.
+AlreadyVoted = You have already voted for this event.
+VoteError = An error has occurred during the vote, please try again.
+
+#
+# SubscriptionOk page
+#
+SubscriptionOk = Your subscription to this conference has been validated
+#
+# Subscription validation mail
+#
+ConfAttendeeSubscriptionConfirmation = Confirmation of your subscription to a conference
+#
+# Payment page
+#
+Attendee = Attendee
+PaymentConferenceAttendee = Conference attendee payment
+PaymentBoothLocation = Booth location payment
diff --git a/htdocs/langs/it_IT/hrm.lang b/htdocs/langs/it_IT/hrm.lang
index acf3452f8ea..009f3212306 100644
--- a/htdocs/langs/it_IT/hrm.lang
+++ b/htdocs/langs/it_IT/hrm.lang
@@ -9,7 +9,7 @@ ConfirmDeleteEstablishment=Sei sicuro di voler cancellare questa azienda?
 OpenEtablishment=Apri azienda
 CloseEtablishment=Chiudi azienda
 # Dictionary
-DictionaryPublicHolidays=HRM - Giorni festivi
+DictionaryPublicHolidays=Leave - Public holidays
 DictionaryDepartment=HRM - Lista dipartimenti
 DictionaryFunction=HRM - Posizioni di lavoro
 # Module
diff --git a/htdocs/langs/it_IT/knowledgemanagement.lang b/htdocs/langs/it_IT/knowledgemanagement.lang
index 1f9666b329a..b0bec71291a 100644
--- a/htdocs/langs/it_IT/knowledgemanagement.lang
+++ b/htdocs/langs/it_IT/knowledgemanagement.lang
@@ -47,7 +47,7 @@ KnowledgeManagementArea = Knowledge Management
 # Menu
 #
 MenuKnowledgeRecord = Knowledge base
-ListOfArticles = List of articles
+ListKnowledgeRecord = List of articles
 NewKnowledgeRecord = New article
 ValidateReply = Validate solution
 KnowledgeRecords = Articles
diff --git a/htdocs/langs/it_IT/languages.lang b/htdocs/langs/it_IT/languages.lang
index b950698f946..bdbd3ba2256 100644
--- a/htdocs/langs/it_IT/languages.lang
+++ b/htdocs/langs/it_IT/languages.lang
@@ -3,6 +3,7 @@ Language_am_ET=Etiope
 Language_ar_AR=Arabo
 Language_ar_EG=Arabo (Egitto)
 Language_ar_SA=Arabo
+Language_ar_TN=Arabic (Tunisia)
 Language_az_AZ=Azero
 Language_bn_BD=Bengalese
 Language_bn_IN=Bengalese (India)
@@ -84,6 +85,7 @@ Language_nl_NL=Olandese (Paesi Bassi)
 Language_pl_PL=Polacco
 Language_pt_BR=Portoghese (Brasile)
 Language_pt_PT=Portoghese
+Language_ro_MD=Romanian (Moldavia)
 Language_ro_RO=Rumeno
 Language_ru_RU=Russo
 Language_ru_UA=Russo (Ucraina)
diff --git a/htdocs/langs/it_IT/main.lang b/htdocs/langs/it_IT/main.lang
index c81f5fa21a9..1dfd4cb8723 100644
--- a/htdocs/langs/it_IT/main.lang
+++ b/htdocs/langs/it_IT/main.lang
@@ -430,6 +430,7 @@ LT1IN=CGST
 LT2IN=SGST
 LT1GC=Additionnal cents
 VATRate=Aliquota IVA
+RateOfTaxN=Rate of tax %s
 VATCode=Codice aliquota
 VATNPR=Aliquota NPR
 DefaultTaxRate=Valore base tassa
@@ -729,6 +730,7 @@ MenuMembers=Membri
 MenuAgendaGoogle=Agenda Google
 MenuTaxesAndSpecialExpenses=Tasse | Spese speciali
 ThisLimitIsDefinedInSetup=Limite applicazione (Menu home-impostazioni-sicurezza):%s Kb, limite PHP:%s Kb
+ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
 NoFileFound=No documents uploaded
 CurrentUserLanguage=Lingua dell'utente
 CurrentTheme=Tema attuale
@@ -1072,6 +1074,7 @@ ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
 ToClose=Da chiudere
+ToRefuse=To refuse
 ToProcess=Da lavorare
 ToApprove=Da approvare
 GlobalOpenedElemView=Vista globale
@@ -1126,9 +1129,11 @@ UpdateForAllLines=Update for all lines
 OnHold=In attesa
 Civility=Civility
 AffectTag=Affect Tag
+CreateExternalUser=Create external user
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
 ConfirmCancel=Are you sure you want to cancel
+EmailMsgID=Email MsgID
diff --git a/htdocs/langs/it_IT/members.lang b/htdocs/langs/it_IT/members.lang
index 28779a99cf2..0c53256d30d 100644
--- a/htdocs/langs/it_IT/members.lang
+++ b/htdocs/langs/it_IT/members.lang
@@ -213,3 +213,5 @@ SendReminderForExpiredSubscription=Send reminder by email to members when subscr
 MembershipPaid=Membership paid for current period (until %s)
 YouMayFindYourInvoiceInThisEmail=You may find your invoice attached to this email
 XMembersClosed=%s member(s) closed
+XExternalUserCreated=%s external user(s) created
+ForceMemberNature=Force member nature (Individual or Corporation)
diff --git a/htdocs/langs/it_IT/modulebuilder.lang b/htdocs/langs/it_IT/modulebuilder.lang
index e3d7681659e..2427de1f6b9 100644
--- a/htdocs/langs/it_IT/modulebuilder.lang
+++ b/htdocs/langs/it_IT/modulebuilder.lang
@@ -143,3 +143,4 @@ AsciiToHtmlConverter=Convertitore da Ascii a HTML
 AsciiToPdfConverter=Convertitore da Ascii a PDF
 TableNotEmptyDropCanceled=Tabella non vuota. Il rilascio è stato annullato.
 ModuleBuilderNotAllowed=Il generatore di moduli è disponibile ma non è consentito all'utente.
+ImportExportProfiles=Import and export profiles
diff --git a/htdocs/langs/it_IT/mrp.lang b/htdocs/langs/it_IT/mrp.lang
index d169db398be..1e6247f3799 100644
--- a/htdocs/langs/it_IT/mrp.lang
+++ b/htdocs/langs/it_IT/mrp.lang
@@ -8,12 +8,12 @@ MenuBOM=Bills of material
 LatestBOMModified=Latest %s Bills of materials modified
 LatestMOModified=Ultimi %sordini di produzione  modificati
 Bom=Distinta base
-BillOfMaterials=Bill of Material
+BillOfMaterials=Bill of Materials
 BOMsSetup=Setup of module BOM
 ListOfBOMs=List of bills of material - BOM
 ListOfManufacturingOrders=Elenco degli ordini di produzione
-NewBOM=New bill of material
-ProductBOMHelp=Product to create with this BOM
+NewBOM=New bill of materials
+ProductBOMHelp=Product to create (or disassemble) with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
 BOMsNumberingModules=BOM numbering templates
 BOMsModelModule=BOMS document templates
 MOsNumberingModules=Modelli di numerazione degli ordini di produzione (MO)
@@ -22,7 +22,7 @@ FreeLegalTextOnBOMs=Free text on document of BOM
 WatermarkOnDraftBOMs=Watermark on draft BOM
 FreeLegalTextOnMOs=Testo libero sui documenti MO
 WatermarkOnDraftMOs=Filigrana sulla bozza degli ordini di produzione MO (se presente)
-ConfirmCloneBillOfMaterials=Are you sure you want to clone this bill of material ?
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials %s ?
 ConfirmCloneMo=Vuoi davvero clonare l'ordine di produzione %s?
 ManufacturingEfficiency=Manufacturing efficiency
 ConsumptionEfficiency=Efficienza dei consumi
@@ -30,8 +30,8 @@ ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the produc
 ValueOfMeansLossForProductProduced=Il valore di 0,95 indica una media di 5%% di perdita del prodotto prodotto
 DeleteBillOfMaterials=Delete Bill Of Materials
 DeleteMo=Elimina Ordine di Produzione
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Materials?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Materials?
 MenuMRP=Ordini di produzione
 NewMO=Nuovo ordine di produzione
 QtyToProduce=Qtà da produrre
@@ -39,7 +39,7 @@ DateStartPlannedMo=Data di inizio prevista
 DateEndPlannedMo=Fine della data prevista
 KeepEmptyForAsap=Vuoto significa &quot;Il più presto possibile&quot;
 EstimatedDuration=Durata stimata
-EstimatedDurationDesc=Durata prevista per la fabbricazione di questo prodotto utilizzando questa distinta base
+EstimatedDurationDesc=Estimated duration to manufacture (or disassemble) this product using this BOM
 ConfirmValidateBom=Vuoi convalidare la distinta base con il riferimento <strong> %s </strong> (sarai in grado di usarlo per costruire nuovi ordini di produzione)
 ConfirmCloseBom=Vuoi davvero eliminare questa Distinta Base (non sarà più possibile utilizzarla per creare nuovi ordini di produzione)
 ConfirmReopenBom=Sei sicuro di voler riaprire questa BOM (potrai usarla per creare nuovi ordini di produzione)
@@ -63,13 +63,14 @@ ConsumeAndProduceAll=Consuma e produci tutto
 Manufactured=Creato
 TheProductXIsAlreadyTheProductToProduce=Il prodotto da aggiungere è già il prodotto da produrre.
 ForAQuantityOf=Per una quantità da produrre di %s
+ForAQuantityToConsumeOf=For a quantity to disassemble of %s
 ConfirmValidateMo=Sei sicuro di voler convalidare questo ordine di produzione?
 ConfirmProductionDesc=Cliccando su '%s' convaliderai il consumo e / o la produzione per le quantità impostate. Ciò aggiornerà anche le azioni e registrerà i movimenti delle scorte.
 ProductionForRef=Produzione di %s
 AutoCloseMO=Chiude automaticamente l'ordine di produzione se vengono raggiunte le quantità da consumare e da produrre
 NoStockChangeOnServices=Nessuna variazione di stock sui servizi
 ProductQtyToConsumeByMO=Quantità di prodotto ancora da consumare con MO aperto
-ProductQtyToProduceByMO=Quantità di prodotto ancora da produrre con MO aperto
+ProductQtyToProduceByMO=Product quantity still to produce by open MO
 AddNewConsumeLines=Aggiungi una nuova riga da consumare
 ProductsToConsume=Prodotti da consumare
 ProductsToProduce=Prodotti da produrre
@@ -83,15 +84,13 @@ Workstations=Workstations
 WorkstationsDescription=Workstations management
 WorkstationSetup = Workstations setup
 WorkstationSetupPage = Workstations setup page
-WorkstationAbout = About Workstation
-WorkstationAboutPage = Workstations about page
 WorkstationList=Workstation list
 WorkstationCreate=Add new workstation
 ConfirmEnableWorkstation=Are you sure you want to enable workstation <b>%s</b> ?
 EnableAWorkstation=Enable a workstation
 ConfirmDisableWorkstation=Are you sure you want to disable workstation <b>%s</b> ?
 DisableAWorkstation=Disable a workstation
-DeleteWorkstation=Supprimer
+DeleteWorkstation=Elimina
 NbOperatorsRequired=Number of operators required
 THMOperatorEstimated=Estimated operator THM
 THMMachineEstimated=Estimated machine THM
diff --git a/htdocs/langs/it_IT/orders.lang b/htdocs/langs/it_IT/orders.lang
index 2929e323c70..4eaa89bc55c 100644
--- a/htdocs/langs/it_IT/orders.lang
+++ b/htdocs/langs/it_IT/orders.lang
@@ -11,6 +11,7 @@ OrderDate=Data ordine
 OrderDateShort=Data ordine
 OrderToProcess=Ordine da processare
 NewOrder=Nuovo ordine
+NewSupplierOrderShort=Nuovo ordine
 NewOrderSupplier=Nuovo ordine d'acquisto
 ToOrder=Ordinare
 MakeOrder=Fare ordine
@@ -73,6 +74,7 @@ DeleteOrder=Elimina ordine
 CancelOrder=Annulla ordine
 OrderReopened= Ordine %s riaperto
 AddOrder=Crea ordine
+AddSupplierOrderShort=Crea ordine
 AddPurchaseOrder=Crea ordine d'acquisto
 AddToDraftOrders=Aggiungi ad una bozza d'ordine
 ShowOrder=Visualizza ordine
@@ -91,8 +93,8 @@ OrdersStatisticsSuppliers=Stastistiche ordini d'acquisto
 NumberOfOrdersByMonth=Numero di ordini per mese
 AmountOfOrdersByMonthHT=Importo ordini per mese (al netto delle imposte)
 ListOfOrders=Elenco degli ordini
-CloseOrder=Chiudi ordine
-ConfirmCloseOrder=Are you sure you want to set this order to delivered? Once an order is delivered, it can be set to billed.
+CloseOrder=Classifica ordine come Spedito
+ConfirmCloseOrder=Vuoi davvero classificare come "spedito" questo ordine? Una volta che è stato impostato come "spedito" può essere fatturato.
 ConfirmDeleteOrder=Vuoi davvero cancellare questo ordine?
 ConfirmValidateOrder=Vuoi davvero convalidare questo ordine come <b>%s</b>?
 ConfirmUnvalidateOrder=Vuoi davvero riportare l'ordine <b>%s</b> allo stato di bozza?
diff --git a/htdocs/langs/it_IT/other.lang b/htdocs/langs/it_IT/other.lang
index e15078b0543..040f6aeb7f5 100644
--- a/htdocs/langs/it_IT/other.lang
+++ b/htdocs/langs/it_IT/other.lang
@@ -129,6 +129,7 @@ ClosedByLogin=Login utente che ha chiuso
 FileWasRemoved=Il file è stato eliminato
 DirWasRemoved=La directory è stata rimossa
 FeatureNotYetAvailable=Funzionalità non ancora disponibile nella versione corrente
+FeatureNotAvailableOnDevicesWithoutMouse=Feature not available on devices without mouse
 FeaturesSupported=Caratteristiche supportate
 Width=Larghezza
 Height=Altezza
@@ -263,7 +264,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Utilizzare - per separare gli orari di apertura e chiusura. <br> Utilizzare uno spazio per inserire intervalli diversi. <br> Esempio: 8-12 14-18
-PrefixSession=Prefix for session ID
+SuffixSessionName=Suffix for session name
 
 ##### Export #####
 ExportsArea=Area esportazioni
diff --git a/htdocs/langs/it_IT/partnership.lang b/htdocs/langs/it_IT/partnership.lang
index a9a2846284c..992ec83b97c 100644
--- a/htdocs/langs/it_IT/partnership.lang
+++ b/htdocs/langs/it_IT/partnership.lang
@@ -16,41 +16,72 @@
 #
 # Generic
 #
-ModulePartnershipName = Partnership management
-PartnershipDescription = Module Partnership management
+ModulePartnershipName=Partnership management
+PartnershipDescription=Module Partnership management
 PartnershipDescriptionLong= Module Partnership management
 
+AddPartnership=Add partnership
+CancelPartnershipForExpiredMembers=Partnership: Cancel partnership of members with expired subscriptions
+PartnershipCheckBacklink=Partnership: Check referring backlink
+
 #
 # Menu
 #
-NewPartnership = New Partnership
-ListOfPartnerships = List of partnership
+NewPartnership=New Partnership
+ListOfPartnerships=List of partnership
 
 #
 # Admin page
 #
-PartnershipSetup = Partnership setup
-PartnershipAbout = About Partnership
-PartnershipAboutPage = Partnership about page
-
+PartnershipSetup=Partnership setup
+PartnershipAbout=About Partnership
+PartnershipAboutPage=Partnership about page
+partnershipforthirdpartyormember=Partner status must be set on a 'thirdparty' or a 'member'
+PARTNERSHIP_IS_MANAGED_FOR=Partnership managed for
+PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks to check
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb of days before cancelling status of a partnership when a subscription has expired
+ReferingWebsiteCheck=Check of website referring
+ReferingWebsiteCheckDesc=You can enable a feature to check that your partners has added a backlink to your website domains on their own website.
 
 #
 # Object
 #
+DeletePartnership=Delete a partnership
+PartnershipDedicatedToThisThirdParty=Partnership dedicated to this third party
+PartnershipDedicatedToThisMember=Partnership dedicated to this member
 DatePartnershipStart=Data di inizio
 DatePartnershipEnd=Data di fine
+ReasonDecline=Decline reason
+ReasonDeclineOrCancel=Decline reason
+PartnershipAlreadyExist=Partnership already exist
+ManagePartnership=Manage partnership
+BacklinkNotFoundOnPartnerWebsite=Backlink not found on partner website
+ConfirmClosePartnershipAsk=Are you sure you want to cancel this partnership?
+PartnershipType=Partnership type
 
 #
 # Template Mail
 #
+SendingEmailOnPartnershipWillSoonBeCanceled=Partnership will soon be canceled
+SendingEmailOnPartnershipRefused=Partnership refused
+SendingEmailOnPartnershipAccepted=Partnership accepted
+SendingEmailOnPartnershipCanceled=Partnership canceled
 
+YourPartnershipWillSoonBeCanceledTopic=Partnership will soon be canceled
+YourPartnershipRefusedTopic=Partnership refused
+YourPartnershipAcceptedTopic=Partnership accepted
+YourPartnershipCanceledTopic=Partnership canceled
+
+YourPartnershipWillSoonBeCanceledContent=We inform you that your partnership will soon be canceled (Backlink not found)
+YourPartnershipRefusedContent=We inform you that your partnership request has been refused.
+YourPartnershipAcceptedContent=We inform you that your partnership request has been accepted.
+YourPartnershipCanceledContent=We inform you that your partnership has been canceled.
 
 #
 # Status
 #
-PartnershipDraft = Assegno circolare
-PartnershipAccepted = Accettata
-PartnershipRefused = Rifiutato
-PartnershipCanceled = Annullata
-
+PartnershipDraft=Assegno circolare
+PartnershipAccepted=Accettata
+PartnershipRefused=Rifiutato
+PartnershipCanceled=Annullata
 PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/it_IT/productbatch.lang b/htdocs/langs/it_IT/productbatch.lang
index cbb3183e28a..48814147203 100644
--- a/htdocs/langs/it_IT/productbatch.lang
+++ b/htdocs/langs/it_IT/productbatch.lang
@@ -1,4 +1,4 @@
-# ProductBATCH language file - en_US - ProductBATCH
+# ProductBATCH language file - Source file is en_US - ProductBATCH
 ManageLotSerial=Usa lotto/numero di serie
 ProductStatusOnBatch=Yes (lot required)
 ProductStatusOnSerial=Yes (unique serial number required)
@@ -33,3 +33,13 @@ CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+LifeTime=Life span (in days)
+EndOfLife=End of life
+ManufacturingDate=Manufacturing date
+DestructionDate=Destruction date
+FirstUseDate=First use date
+QCFrequency=Quality control frequency (in days)
+
+#Traceability - qc status
+OutOfOrder=Out of order
+InWorkingOrder=In working order
diff --git a/htdocs/langs/it_IT/products.lang b/htdocs/langs/it_IT/products.lang
index b65ba7eccbd..0e535ab901c 100644
--- a/htdocs/langs/it_IT/products.lang
+++ b/htdocs/langs/it_IT/products.lang
@@ -396,3 +396,5 @@ ActionAvailableOnVariantProductOnly=Action only available on the variant of prod
 ProductsPricePerCustomer=Product prices per customers
 ProductSupplierExtraFields=Attributi aggiuntivi (prezzi dei fornitori)
 DeleteLinkedProduct=Elimina il prodotto figlio collegato alla combinazione
+PMPValue=Media ponderata prezzo
+PMPValueShort=MPP
diff --git a/htdocs/langs/it_IT/projects.lang b/htdocs/langs/it_IT/projects.lang
index 1a62a42e4b9..b5883c524fd 100644
--- a/htdocs/langs/it_IT/projects.lang
+++ b/htdocs/langs/it_IT/projects.lang
@@ -267,9 +267,11 @@ InvoiceToUse=Fattura in bozza da usare
 NewInvoice=Nuova fattura
 OneLinePerTask=Una riga per compito
 OneLinePerPeriod=Una riga per periodo
+OneLinePerTimeSpentLine=One line for each time spent declaration
 RefTaskParent=Ref. Attività genitore
 ProfitIsCalculatedWith=Il profitto viene calcolato utilizzando
 AddPersonToTask=Add also to tasks
 UsageOrganizeEvent=Usage: Event Organization
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
+SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
diff --git a/htdocs/langs/it_IT/receptions.lang b/htdocs/langs/it_IT/receptions.lang
index 001cfb9a3e7..e9d5bae3253 100644
--- a/htdocs/langs/it_IT/receptions.lang
+++ b/htdocs/langs/it_IT/receptions.lang
@@ -19,7 +19,7 @@ NewReception=New reception
 CreateReception=Create reception
 QtyInOtherReceptions=Qty in other receptions
 OtherReceptionsForSameOrder=Other receptions for this order
-ReceptionsAndReceivingForSameOrder=Receptions and receipts for this order
+ReceptionsAndReceivingForSameOrder=Ricezioni per questo ordine
 ReceptionsToValidate=Receptions to validate
 StatusReceptionCanceled=Annullata
 StatusReceptionDraft=Bozza
@@ -44,4 +44,4 @@ ValidateOrderFirstBeforeReception=You must first validate the order before being
 ReceptionsNumberingModules=Numbering module for receptions
 ReceptionsReceiptModel=Document templates for receptions
 NoMorePredefinedProductToDispatch=Non ci sono più prodotti predefiniti da spedire
-
+ReceptionExist=A reception exists
diff --git a/htdocs/langs/it_IT/stocks.lang b/htdocs/langs/it_IT/stocks.lang
index 9a7054eef8a..91f9b22a056 100644
--- a/htdocs/langs/it_IT/stocks.lang
+++ b/htdocs/langs/it_IT/stocks.lang
@@ -56,8 +56,6 @@ UnitPurchaseValue=Prezzo unitario
 StockTooLow=Scorte insufficienti
 StockLowerThanLimit=Scorta inferiore al limite di avviso (%s)
 EnhancedValue=Valore
-PMPValue=Media ponderata prezzo
-PMPValueShort=MPP
 EnhancedValueOfWarehouses=Valore magazzini
 UserWarehouseAutoCreate=Crea anche un magazzino alla creazione di un utente
 AllowAddLimitStockByWarehouse=Gestisci anche i valori minimo e desiderato della scorta per abbinamento (prodotto - magazzino) oltre ai valori per prodotto
@@ -251,7 +249,10 @@ SelectAStockMovementFileToImport=select a stock movement file to import
 InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
 LabelOfInventoryMovemement=Inventory %s
 ReOpen=Riapri
-ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock to the real qty you entered into the inventory.
 ObjectNotFound=%s not found
 MakeMovementsAndClose=Generate movements and close
 AutofillWithExpected=Fill real quantity with expected quantity
+ShowAllBatchByDefault=By default, show batch details on product "stock" tab
+CollapseBatchDetailHelp=You can set batch detail default display in stocks module configuration
+FieldCannotBeNegative=Field "%s" cannot be negative
diff --git a/htdocs/langs/it_IT/ticket.lang b/htdocs/langs/it_IT/ticket.lang
index 84791ff6656..04c0c42bdc7 100644
--- a/htdocs/langs/it_IT/ticket.lang
+++ b/htdocs/langs/it_IT/ticket.lang
@@ -304,7 +304,7 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
-BoxTicketType=Number of open tickets by type
+BoxTicketType=Distribution of open tickets by type
 BoxTicketSeverity=Number of open tickets by severity
 BoxNoTicketSeverity=No tickets opened
 BoxTicketLastXDays=Number of new tickets by days the last %s days
diff --git a/htdocs/langs/ja_JP/accountancy.lang b/htdocs/langs/ja_JP/accountancy.lang
index 027dd200717..f398117d37c 100644
--- a/htdocs/langs/ja_JP/accountancy.lang
+++ b/htdocs/langs/ja_JP/accountancy.lang
@@ -158,7 +158,7 @@ ACCOUNTING_LENGTH_AACCOUNT=取引先のアカウンティング科目の長さ(
 ACCOUNTING_MANAGE_ZERO=会計科目の最後に異なる数のゼロを管理できるようにする。一部の国(スイスなど)で必要です。オフ(デフォルト)に設定すると、次の2つのパラメーターを設定して、アプリケーションに仮想ゼロを追加するように要求できる。
 BANK_DISABLE_DIRECT_INPUT=銀行口座での取引の直接記録を無効にする
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=仕訳帳で下書きエクスポートを有効にする
-ACCOUNTANCY_COMBO_FOR_AUX=子会社科目のコンボリストを有効にする(取引先が多数ある場合は遅くなる可能性がある)
+ACCOUNTANCY_COMBO_FOR_AUX=子会社アカウントのコンボリストを有効にする (取引先が多数あると遅くなるだろうし、値の一部検索機能は壊れる)
 ACCOUNTING_DATE_START_BINDING=会計で紐付け力と移転を開始する日付を定義する。この日付を下回ると、トランザクションはアカウンティングに転送されない。
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=会計転送では、デフォルトで期間表示を選択する
 
@@ -202,7 +202,7 @@ Docref=参照
 LabelAccount=ラベル科目
 LabelOperation=ラベル操作
 Sens=方向
-AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you have received<br>For an accounting account of a supplier, use Debit to record a payment you made
+AccountingDirectionHelp=顧客の勘定科目の場合、貸方を使用して受取った支払いを記録する。<br>仕入先の勘定科目の場合、借方を使用して実行した支払いを記録する。
 LetteringCode=レタリングコード
 Lettering=レタリング
 Codejournal=仕訳帳
@@ -297,7 +297,7 @@ NoNewRecordSaved=仕訳帳化するレコードはもうない
 ListOfProductsWithoutAccountingAccount=会計科目にバインドされていない製品のリスト
 ChangeBinding=紐付を変更する
 Accounted=元帳に計上
-NotYetAccounted=Not yet accounted in the ledger
+NotYetAccounted=元帳にはまだ計上されていない
 ShowTutorial=チュートリアルを表示
 NotReconciled=調整されていない
 WarningRecordWithoutSubledgerAreExcluded=警告、補助元帳アカウントが定義されていないすべての操作はフィルタリングされ、このビューから除外される
@@ -317,7 +317,7 @@ AccountingJournalType2=販売
 AccountingJournalType3=購入
 AccountingJournalType4=バンク
 AccountingJournalType5=経費報告書
-AccountingJournalType8=在庫
+AccountingJournalType8=目録
 AccountingJournalType9=持っている-新規
 ErrorAccountingJournalIsAlreadyUse=この仕訳帳はすでに使用されている
 AccountingAccountForSalesTaxAreDefinedInto=注：消費税の会計科目は、メニュー<b> %s </b> --<b> %s</b>に定義されている。
@@ -328,6 +328,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=購入時の会計における紐付け
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=経費報告書の会計における紐付け力と移転を無効にする(経費報告書は会計で考慮されない)
 
 ## Export
+NotifiedExportDate=通知されたエクスポート日（エントリの変更はできない）
+NotifiedValidationDate=エントリの検証（エントリの変更または削除はできない）
+ConfirmExportFile=会計エクスポートファイルの生成を確定するか？
 ExportDraftJournal=下書き仕訳帳のエクスポート
 Modelcsv=エクスポートのモデル
 Selectmodelcsv=エクスポートのモデルを選択
@@ -425,6 +428,6 @@ FECFormatMulticurrencyCode=他通貨 コード (Idevise)
 DateExport=日付のエクスポート
 WarningReportNotReliable=警告、このレポートは元帳に基づいていないため、元帳で手動で変更されたトランザクションは含まれていない。仕訳帳化が最新の場合、簿記ビューはより正確です。
 ExpenseReportJournal=経費報告仕訳帳
-InventoryJournal=在庫仕訳帳
+InventoryJournal=目録日記帳
 
 NAccounts=%sアカウント
diff --git a/htdocs/langs/ja_JP/admin.lang b/htdocs/langs/ja_JP/admin.lang
index d2db717850b..a21a12947f7 100644
--- a/htdocs/langs/ja_JP/admin.lang
+++ b/htdocs/langs/ja_JP/admin.lang
@@ -64,7 +64,7 @@ RemoveLock=ファイル<b>%s </b>が存在する場合、それを削除/改名
 RestoreLock=ファイル<b>%s </b>を読取権限のみで復元すると、これ以上の更新/インストール のツール使用が不可になる。
 SecuritySetup=セキュリティの設定
 PHPSetup=PHPのセットアップ
-OSSetup=OS setup
+OSSetup=OSのセットアップ
 SecurityFilesDesc=ファイルのアップロードに関するセキュリティ関連オプションをここで定義。
 ErrorModuleRequirePHPVersion=エラー、このモジュールは、PHPのバージョン%s以上が必要 
 ErrorModuleRequireDolibarrVersion=エラー、このモジュールはDolibarrバージョン%s以上が必要 
@@ -221,8 +221,8 @@ NotCompatible=このモジュールは、Dolibarr %s ( 最小%s-最大%s ) と
 CompatibleAfterUpdate=このモジュールでは、Dolibarr %s ( 最小%s-最大%s ) を更新する必要がある。
 SeeInMarkerPlace=マーケットプレイスで見る
 SeeSetupOfModule=モジュール%sの設定を参照すること
+SetOptionTo=オプション <b> %s </b> を %s に設定
 Updated=更新した
-Nouveauté=ノベルティ
 AchatTelechargement=購入/ダウンロード
 GoModuleSetupArea=新規モジュールを展開/インストールするには、モジュール設定領域に移動する：<a href="%s"> %s</a>。
 DoliStoreDesc=DoliStore、Dolibarr ERP / CRM外部モジュールのための公式の市場の場所
@@ -399,16 +399,17 @@ SecurityToken=セキュリティで保護されたURLへの鍵
 NoSmsEngine=利用可能なSMS送信者マネージャーはない。 SMS送信者マネージャーは、外部仕入先に依存しているため、デフォルトのディストリビューションではインストールされないが、%sで見つけることができる。
 PDF=PDF
 PDFDesc=PDF生成のグローバルオプション
+PDFOtherDesc=一部のモジュールに固有のPDFオプション
 PDFAddressForging=アドレスセクションのルール
 HideAnyVATInformationOnPDF=消費税/ VATに関連するすべての情報を非表示にする
 PDFRulesForSalesTax=消費税/ VATのルール
 PDFLocaltax=%sのルール
 HideLocalTaxOnPDF=列SaleTax / VATで%sレートを非表示にする
-HideDescOnPDF=製品説明を非表示
-HideRefOnPDF=製品を非表示にするref。
+HideDescOnPDF=製品説明を非表示にする
+HideRefOnPDF=製品のコードを非表示にする
 HideDetailsOnPDF=製品ラインの詳細を非表示
 PlaceCustomerAddressToIsoLocation=顧客の住所の位置には、フランスの標準位置 ( La Poste ) を使用する
-Library=図書館
+Library=ライブラリ
 UrlGenerationParameters=URLを確保するためのパラメータ
 SecurityTokenIsUnique=各URLごとに一意securekeyパラメータを使用して、
 EnterRefToBuildUrl=オブジェクト%sの参照を入力する。
@@ -561,7 +562,7 @@ Module53Desc=サービスの管理
 Module54Name=契約/サブスクリプション
 Module54Desc=契約の管理 ( サービスまたは定期購読 ) 
 Module55Name=バーコード
-Module55Desc=バーコードの管理
+Module55Desc=バーコードまたはQRコードの管理
 Module56Name=クレジット振込によるお支払い
 Module56Desc=クレジット転送注文によるサプライヤーの支払いの管理。これには、ヨーロッパ諸国向けのSEPAファイルの生成が含まれる。
 Module57Name=口座振替による支払い
@@ -587,9 +588,9 @@ Module200Desc=LDAPディレクトリの同期
 Module210Name=PostNuke
 Module210Desc=PostNuke統合
 Module240Name=データをエクスポート
-Module240Desc=Dolibarrデータをエクスポートためのツール ( 支援あり ) 
+Module240Desc=Dolibarrにデータをエクスポートするツール（アシスタントを利用）
 Module250Name=データのインポート
-Module250Desc=Dolibarrにデータをインポートするためのツール ( 支援あり ) 
+Module250Desc=Dolibarrにデータをインポートするツール（アシスタントを利用）
 Module310Name=メンバー
 Module310Desc=財団のメンバーの管理
 Module320Name=RSSフィード
@@ -848,10 +849,10 @@ Permission402=割引を作成/変更
 Permission403=割引を検証する
 Permission404=割引を削除する。
 Permission430=デバッグバーを使用する
-Permission511=給与の支払いを見る(自分と部下)
-Permission512=給与の支払いを作成/変更する
-Permission514=給与の支払いを削除する
-Permission517=全員の給料支払いを見る
+Permission511=給与と支払いを見る（自分と部下）
+Permission512=給与と支払いを作成/変更する
+Permission514=給与と支払いを削除する
+Permission517=全員の給料と支払いを見る
 Permission519=給与をエクスポート
 Permission520=ローンを読む
 Permission522=ローンの作成/変更
@@ -965,6 +966,8 @@ Permission23003=スケジュールされたジョブを削除する
 Permission23004=スケジュールされたジョブを実行する
 Permission50101=POS ( SimplePOS ) を使用する
 Permission50151=POS ( TakePOS ) を使用する
+Permission50152=販売ラインを編集する
+Permission50153=注文済販売行を編集
 Permission50201=トランザクションを読む
 Permission50202=輸入取引
 Permission50330=Zapierのオブジェクトを読む
@@ -1039,11 +1042,12 @@ DictionaryMeasuringUnits=測定単位
 DictionarySocialNetworks=ソーシャルネットワーク
 DictionaryProspectStatus=企業の見通し状況
 DictionaryProspectContactStatus=連絡先の見込み客のステータス
-DictionaryHolidayTypes=休暇の種類
+DictionaryHolidayTypes=休暇-休暇の種類
 DictionaryOpportunityStatus=プロジェクト/引合の引合ステータス
 DictionaryExpenseTaxCat=経費報告書-輸送カテゴリ
 DictionaryExpenseTaxRange=経費報告書-輸送カテゴリ別の範囲
 DictionaryTransportMode=Intracom レポート-トランスポートモード
+DictionaryBatchStatus=製品ロット/シリアル品質管理ステータス
 TypeOfUnit=ユニットの種類
 SetupSaved=設定が保存されました
 SetupNotSaved=設定が保存されていない
@@ -1154,7 +1158,7 @@ CompanyObject=法人の目的
 IDCountry=ID国
 Logo=ロゴ
 LogoDesc=法人のメインロゴ。生成されたドキュメントに使用される ( PDF、... ) 
-LogoSquarred=ロゴ ( 二乗 ) 
+LogoSquarred=ロゴ (正方形) 
 LogoSquarredDesc=角張ったアイコンである必要がある ( 幅=高さ ) 。このロゴは、お気に入りのアイコンまたはトップメニューバーのような他のニーズとして使用される ( ディスプレイ設定で無効にされていない場合 ) 。
 DoNotSuggestPaymentMode=示唆していない
 NoActiveBankAccountDefined=定義された有効な銀行口座なし
@@ -1187,7 +1191,7 @@ SetupDescription4= <a href="%s"> %s-> %s </a> <br> <br>このソフトウェア
 SetupDescription5=その他の設定メニューエントリは、オプションのパラメータを管理する。
 AuditedSecurityEvents=監査されるセキュリティイベント
 NoSecurityEventsAreAduited=セキュリティイベントは監査されない。メニュー%sから有効にできる
-Audit=監査
+Audit=セキュリティ イベント
 InfoDolibarr=Dolibarrについて
 InfoBrowser=ブラウザについて
 InfoOS=OSについて
@@ -1255,7 +1259,7 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=あなたは、ユーザ<b>%s
 YourPHPDoesNotHaveSSLSupport=あなたのPHPでのSSLの機能は使用できない
 DownloadMoreSkins=ダウンロードするには多くのスキン
 SimpleNumRefModelDesc=参照番号を%syymm-nnnnの形式で返す。ここで、yyは年、mmは月、nnnnはリセットなしの順次自動インクリメント番号。
-SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
+SimpleNumRefNoDateModelDesc=参照番号を%s-nnnnの形式で返する。nnnnはリセットなしの順次自動インクリメント番号 。
 ShowProfIdInAddress=住所とともにプロのIDを表示する
 ShowVATIntaInAddress=コミュニティ内のVAT番号を住所で非表示にする
 TranslationUncomplete=部分的な翻訳
@@ -1319,9 +1323,12 @@ ConditionIsCurrently=状態は現在%s
 YouUseBestDriver=現在利用可能な最高のドライバーであるドライバー%sを使用する。
 YouDoNotUseBestDriver=ドライバー%sを使用するが、ドライバー%sをお勧めする。
 NbOfObjectIsLowerThanNoPb=データベースには%s%sしかない。これには、特別な最適化は必要ない。
+ComboListOptim=コンボリストの読み込みの最適化
 SearchOptim=検索最適化
-YouHaveXObjectUseSearchOptim=データベースに%s%sがある。 Home-Setup-Otherで定数%sを1に追加できます。検索を文字列の先頭に制限する。これにより、データベースでインデックスを使用できるようになり、すぐに応答が返される。
-YouHaveXObjectAndSearchOptimOn=データベースに%s%sがあり、Home-Setup-Otherで定数%sが1に設定されている。
+YouHaveXObjectUseComboOptim=データベースに%s%sがある。モジュールのセットアップに入ると、キーが押されたイベントでコンボリストをロードできるようになる。
+YouHaveXObjectUseSearchOptim=データベースに%s%sがある。 Home-Setup-Otherで定数%sを1に追加できる。
+YouHaveXObjectUseSearchOptimDesc=これにより、検索が文字列の先頭に制限され、データベースでインデックスを使用できるようになり、すぐに応答が得られるはず。
+YouHaveXObjectAndSearchOptimOn=データベースに%s%sがあり、Home-Setup-Otherで定数%sが%sに設定されている。
 BrowserIsOK=%sWebブラウザーを使用している。このブラウザは、セキュリティとパフォーマンスに問題はない。
 BrowserIsKO=%sWebブラウザーを使用している。このブラウザは、セキュリティ、パフォーマンス、信頼性の点で悪い選択であることが知られている。 Firefox、Chrome、Opera、またはSafariの使用をお勧めする。
 PHPModuleLoaded=PHPコンポーネント%sがロードされる
@@ -1433,6 +1440,7 @@ MemberMainOptions=主なオプション
 AdherentLoginRequired= 各メンバーのログインを管理する
 AdherentMailRequired=新規メンバーを作成するにはメールが必要 
 MemberSendInformationByMailByDefault=メンバー ( 検証や新規サブスクリプション ) にメールの確認を送信するチェックボックスはデフォルトでオンになっている
+MemberCreateAnExternalUserForSubscriptionValidated=検証された新規メンバーサブスクリプションごとに外部ユーザーログインを作成する
 VisitorCanChooseItsPaymentMode=訪問者は利用可能な支払いモードから選択できる
 MEMBER_REMINDER_EMAIL=期限切れのサブスクリプションの電子メール</b>によって自動リマインダー<b>を有効にする。注：モジュール<strong> %s </strong>を有効にして、リマインダーを送信するように正しく設定する必要がある。
 MembersDocModules=メンバーレコードから生成されたドキュメント用のドキュメントテンプレート
@@ -1763,7 +1771,7 @@ AGENDA_DEFAULT_VIEW=メニューの議題を選択するときに、デフォル
 AGENDA_REMINDER_BROWSER=ユーザーのブラウザ</b>でイベントリマインダー<b>を有効にする(リマインダーの日付に達すると、ブラウザにポップアップが表示される。各ユーザーは、ブラウザの通知設定からそのような通知を無効にできる)。
 AGENDA_REMINDER_BROWSER_SOUND=音声通知を有効にする
 AGENDA_REMINDER_EMAIL=電子メール</b>でイベントリマインダー<b>を有効にする(リマインダーオプション/遅延は各イベントで定義できる)。
-AGENDA_REMINDER_EMAIL_NOTE=注：タスク%sの頻度は、リマインダーが正しいタイミングで送信されることを確認するのに十分でなければならない。
+AGENDA_REMINDER_EMAIL_NOTE=注：スケジュールされたジョブ%sの頻度は、リマインダーが正しいタイミングで送信されることを確認するのに十分であること。
 AGENDA_SHOW_LINKED_OBJECT=リンクされたオブジェクトを議題ビューに表示する
 ##### Clicktodial #####
 ClickToDialSetup=モジュールの設定をダイヤルする】をクリックする
@@ -1979,6 +1987,8 @@ MAIN_PDF_MARGIN_RIGHT=PDFの右マージン
 MAIN_PDF_MARGIN_TOP=PDFの上部マージン
 MAIN_PDF_MARGIN_BOTTOM=PDFの下マージン
 MAIN_DOCUMENTS_LOGO_HEIGHT=PDFのロゴの高さ
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=プロポーズラインに写真を追加
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=PDFで電子サインを追加する
 NothingToSetup=このモジュールに必要な特定の設定はない。
 SetToYesIfGroupIsComputationOfOtherGroups=このグループが他のグループの計算である場合は、これをyesに設定する
 EnterCalculationRuleIfPreviousFieldIsYes=前のフィールドが「はい」に設定されている場合は、計算ルールを入力。 <br>例：<br> CODEGRP1+CODEGRP2
@@ -2064,7 +2074,7 @@ UseDebugBar=デバッグバーを使用する
 DEBUGBAR_LOGS_LINES_NUMBER=コンソールに保持する最後のログ行の数
 WarningValueHigherSlowsDramaticalyOutput=警告、値を大きくすると出力が劇的に遅くなる
 ModuleActivated=モジュール%sがアクティブ化され、インターフェイスの速度が低下する
-ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances and security)
+ModuleActivatedWithTooHighLogLevel=モジュール%sが高すぎるロギングレベルでアクティブ化されている（パフォーマンスとセキュリティを向上させるために、より低いレベルを使用してみること）
 ModuleSyslogActivatedButLevelNotTooVerbose=モジュール%sがアクティブ化され、ログレベル（%s）が正しい（冗長すぎない）
 IfYouAreOnAProductionSetThis=実稼働環境を使用している場合は、このプロパティを%sに設定する必要がある。
 AntivirusEnabledOnUpload=アップロードされたファイルでウイルス対策が有効になっている
@@ -2096,7 +2106,6 @@ PDF_SHOW_PROJECT=ドキュメントにプロジェクトを表示
 ShowProjectLabel=プロジェクトラベル
 PDF_USE_ALSO_LANGUAGE_CODE=PDF内の一部のテキストを同じ生成PDFで2つの異なる言語で複製する場合は、ここでこの2番目の言語を設定して、生成されたPDFに同じページに2つの異なる言語が含まれるようにする必要がある。1つはPDFの生成時に選択され、もう1つは ( これをサポートしているPDFテンプレートはごくわずか  ) 。 PDFごとに1つの言語を空のままにする。
 FafaIconSocialNetworksDesc=FontAwesomeアイコンのコードをここに入力する。 FontAwesomeとは何かわからない場合は、一般的な値fa-address-bookを使用できる。
-FeatureNotAvailableWithReceptionModule=モジュールの受信が有効になっている場合、この機能は使用できない
 RssNote=注：各RSSフィード定義は、ダッシュボードで使用できるようにするために有効にする必要があるウィジェットを提供する
 JumpToBoxes=【設定】-> 【ウィジェット】にジャンプする
 MeasuringUnitTypeDesc=ここでは、「サイズ」、「表面」、「体積」、「重量」、「時間」などの値を使用する
@@ -2120,12 +2129,18 @@ ConfFileIsReadableOrWritableByAnyUsers=confファイルは、どのユーザで
 MailToSendEventOrganization=イベント組織
 AGENDA_EVENT_DEFAULT_STATUS=フォームからイベントを作成するときのデフォルトのイベントステータス
 YouShouldDisablePHPFunctions=PHP関数を無効にする必要がある
-IfCLINotRequiredYouShouldDisablePHPFunctions=システムコマンドを実行する必要がある場合を除いて（たとえば、モジュールのスケジュールされたジョブの場合、または外部コマンドラインアンチウイルスを実行する場合）、PHP関数を無効にする必要がある。
+IfCLINotRequiredYouShouldDisablePHPFunctions=カスタムコードでシステムコマンドを実行する必要がある場合を除いて、PHP関数を無効にする必要がある
+PHPFunctionsRequiredForCLI=シェルの目的（スケジュールされたジョブのバックアップやanitivursプログラムの実行など）では、PHP関数を保持する必要がある
 NoWritableFilesFoundIntoRootDir=共通プログラムの書き込み可能なファイルまたはディレクトリがルートディレクトリに見つからない（良好）
 RecommendedValueIs=推奨：%s
+NotRecommended=推奨されない
 ARestrictedPath=制限されたパス
 CheckForModuleUpdate=外部モジュールの更新を確認する
 CheckForModuleUpdateHelp=このアクションは、外部モジュールのエディターに接続して、新しいバージョンが利用可能かどうかを確認する。
 ModuleUpdateAvailable=アップデートが利用可能
 NoExternalModuleWithUpdate=外部モジュールの更新が見つからない
 SwaggerDescriptionFile=Swagger API記述ファイル（たとえば、redocで使用するため）
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=非推奨のWS APIが有効化された。それよりもREST APIを使用すべきである。
+RandomlySelectedIfSeveral=画像が複数ある場合はランダムに選択
+DatabasePasswordObfuscated=データベースのパスワードは conf ファイルで難読化されている
+DatabasePasswordNotObfuscated=データベースのパスワードは conf ファイルで難読化されていない
diff --git a/htdocs/langs/ja_JP/agenda.lang b/htdocs/langs/ja_JP/agenda.lang
index 28de5134a6f..bef2a7c7234 100644
--- a/htdocs/langs/ja_JP/agenda.lang
+++ b/htdocs/langs/ja_JP/agenda.lang
@@ -38,6 +38,7 @@ ActionsEvents=Dolibarrが自動的に議題でアクションを作成する対
 EventRemindersByEmailNotEnabled=電子メールによるイベントリマインダーは、%sモジュールセットアップで有効になっていなかった。
 ##### Agenda event labels #####
 NewCompanyToDolibarr=取引先%sが作成されました
+COMPANY_MODIFYInDolibarr=取引先%s変更
 COMPANY_DELETEInDolibarr=取引先%sが削除されました
 ContractValidatedInDolibarr=契約%sが承認されました
 CONTRACT_DELETEInDolibarr=契約%sが削除されました
@@ -87,6 +88,7 @@ OrderDeleted=注文は削除済
 InvoiceDeleted=請求書は削除済
 DraftInvoiceDeleted=ドラフト請求書は削除済
 CONTACT_CREATEInDolibarr=作成された連絡先%s
+CONTACT_MODIFYInDolibarr=連絡先%s変更
 CONTACT_DELETEInDolibarr=連絡先%sは削除済
 PRODUCT_CREATEInDolibarr=製品%sは作成済
 PRODUCT_MODIFYInDolibarr=製品%sは変更済
diff --git a/htdocs/langs/ja_JP/banks.lang b/htdocs/langs/ja_JP/banks.lang
index 0030003d981..4595a3b774f 100644
--- a/htdocs/langs/ja_JP/banks.lang
+++ b/htdocs/langs/ja_JP/banks.lang
@@ -109,13 +109,13 @@ SocialContributionPayment=社会/財政税の支払
 BankTransfer=銀行口座振替
 BankTransfers=クレジット転送
 MenuBankInternalTransfer=内部転送
-TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
+TransferDesc=内部転送を使用して、あるアカウントから別のアカウントに転送する。アプリケーションは、ソースアカウントの借方とターゲットアカウントの貸方の2つのレコードを書き込む。この取引には、同じ金額、ラベル、日付が使用される。
 TransferFrom=期初
 TransferTo=期末
 TransferFromToDone=<b>%s %s</b> %sからの<b>%s</b>への転送が記録されている。
 CheckTransmitter=差出人
 ValidateCheckReceipt=この小切手領収書を検証するか？
-ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
+ConfirmValidateCheckReceipt=本当に、この検証用確認領収書を発行したいか？実行後の変更は不可。
 DeleteCheckReceipt=この小切手領収書を削除か？
 ConfirmDeleteCheckReceipt=この小切手領収書を削除してもよいか？
 BankChecks=銀行小切手
@@ -128,7 +128,7 @@ ConfirmDeleteTransaction=この入力を削除してもよいか？
 ThisWillAlsoDeleteBankRecord=これにより、生成された銀行入力も削除される
 BankMovements=動作
 PlannedTransactions=予定入力
-Graph=Graphs
+Graph=グラフ
 ExportDataset_banque_1=銀行入力と口座明細書
 ExportDataset_banque_2=預金伝票
 TransactionOnTheOtherAccount=他の口座でのトランザクション
@@ -142,7 +142,7 @@ AllAccounts=すべての銀行口座と現金口座
 BackToAccount=口座へ戻る
 ShowAllAccounts=すべての口座に表示
 FutureTransaction=先物取引。照合できません。
-SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
+SelectChequeTransactionAndGenerate=小切手預金の領収書に含める小切手を選択/フィルタリングする。次に、「作成」をクリックする。
 InputReceiptNumber=調停に関連する銀行取引明細書を選択する。ソート可能な数値を使用する：YYYYMMまたはYYYYMMDD
 EventualyAddCategory=最終的に、レコードを分類するカテゴリを指定する
 ToConciliate=照合するには？
diff --git a/htdocs/langs/ja_JP/bills.lang b/htdocs/langs/ja_JP/bills.lang
index 10e553423b9..71a12806b6d 100644
--- a/htdocs/langs/ja_JP/bills.lang
+++ b/htdocs/langs/ja_JP/bills.lang
@@ -120,7 +120,7 @@ ConvertExcessPaidToReduc=支払った超過分を利用可能な割引に変換
 EnterPaymentReceivedFromCustomer=顧客から受け取った支払を入力。
 EnterPaymentDueToCustomer=顧客ために支払をする
 DisabledBecauseRemainderToPayIsZero=未払残りがゼロであるため無効
-PriceBase=Base price
+PriceBase=本体価格
 BillStatus=請求書の状況
 StatusOfGeneratedInvoices=生成された請求書のステータス
 BillStatusDraft=下書き(検証する必要がある)
@@ -259,6 +259,7 @@ DateMaxPayment=支払期日
 DateInvoice=請求書の日付
 DatePointOfTax=税のポイント
 NoInvoice=請求書なし
+NoOpenInvoice=未処理の請求書はない
 ClassifyBill=請求書の分類
 SupplierBillsToPay=未払仕入先請求書
 CustomerBillsUnpaid=未払顧客請求書
@@ -281,9 +282,9 @@ ExportDataset_invoice_1=顧客請求書と請求書の詳細
 ExportDataset_invoice_2=顧客請求書と支払
 ProformaBill=プロフォーマビル：
 Reduction=削減
-ReductionShort=ディスク。
+ReductionShort=割引率
 Reductions=削減
-ReductionsShort=ディスク。
+ReductionsShort=割引率
 Discounts=割引
 AddDiscount=割引を作成。
 AddRelativeDiscount=相対的なディスカウントを作成。
@@ -454,7 +455,7 @@ RegulatedOn=に規制
 ChequeNumber=Nを確認して°
 ChequeOrTransferNumber=転送チェック/ N°
 ChequeBordereau=スケジュールを確認する
-ChequeMaker=Check/Transfer sender
+ChequeMaker=送信者の確認/転送
 ChequeBank=チェックの銀行
 CheckBank=チェック
 NetToBePaid=支払われるネット
@@ -589,3 +590,4 @@ FacParentLine=請求書明細の親
 SituationTotalRayToRest=税抜き支払残
 PDFSituationTitle=状況番号%d
 SituationTotalProgress=総進捗状況%d%%
+SearchUnpaidInvoicesWithDueDate=期日が%sの未払請求書を検索する
diff --git a/htdocs/langs/ja_JP/boxes.lang b/htdocs/langs/ja_JP/boxes.lang
index 7d79722f9cf..769ad20c9a9 100644
--- a/htdocs/langs/ja_JP/boxes.lang
+++ b/htdocs/langs/ja_JP/boxes.lang
@@ -30,27 +30,27 @@ BoxTitleLastProducts=製品/サービス：最後に変更された%s
 BoxTitleProductsAlertStock=製品：在庫アラート
 BoxTitleLastSuppliers=最新の%s記録されたサプライヤー
 BoxTitleLastModifiedSuppliers=仕入先：最後に変更された%s
-BoxTitleLastModifiedCustomers=お客様：最後に変更された%s
+BoxTitleLastModifiedCustomers=最近修正された顧客：%s件
 BoxTitleLastCustomersOrProspects=最新の%sの顧客または見込み客
-BoxTitleLastCustomerBills=最新の%s変更された顧客の請求書
+BoxTitleLastCustomerBills=最近修正された請求書：%s件
 BoxTitleLastSupplierBills=最新の%s変更された仕入先の請求書
 BoxTitleLastModifiedProspects=見通し：最後に変更された%s
 BoxTitleLastModifiedMembers=最新の%sメンバー
 BoxTitleLastFicheInter=最新の%s修正された介入
-BoxTitleOldestUnpaidCustomerBills=顧客の請求書：最も古い%s未払い
+BoxTitleOldestUnpaidCustomerBills=未入金の請求書：最古から%s件
 BoxTitleOldestUnpaidSupplierBills=仕入先の請求書：最も古い%s未払い
 BoxTitleCurrentAccounts=開設中口座：残高
 BoxTitleSupplierOrdersAwaitingReception=受付待ちのサプライヤー注文
-BoxTitleLastModifiedContacts=連絡先/アドレス：最後に変更された%s
+BoxTitleLastModifiedContacts=最近修正された連絡先・アドレス：%s件
 BoxMyLastBookmarks=ブックマーク：最新の%s
 BoxOldestExpiredServices=最も古いアクティブな期限切れのサービス
 BoxLastExpiredServices=アクティブな期限切れのサービスを持つ最新の%s最も古い連絡先
 BoxTitleLastActionsToDo=実行する最新の%sアクション
-BoxTitleLastContracts=Latest %s contracts which were modified
-BoxTitleLastModifiedDonations=Latest %s donations which were modified
-BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
-BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
-BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
+BoxTitleLastContracts=変更された最新の%s契約
+BoxTitleLastModifiedDonations=変更された最新の%s寄付
+BoxTitleLastModifiedExpenses=変更された最新の%s経費報告書
+BoxTitleLatestModifiedBoms=変更された最新の%sBOM
+BoxTitleLatestModifiedMos=変更された最新の%s製造オーダー
 BoxTitleLastOutstandingBillReached=最大未払い額を超えた顧客
 BoxGlobalActivity=グローバルアクティビティ(請求書、提案、注文)
 BoxGoodCustomers=良い顧客
@@ -62,18 +62,18 @@ LastRefreshDate=最新の更新日
 NoRecordedBookmarks=ブックマークが定義されていない。
 ClickToAdd=追加するにはここをクリックしてください。
 NoRecordedCustomers=記録された顧客がない
-NoRecordedContacts=全く記録されたコンタクトません
+NoRecordedContacts=コンタクトの記録なし
 NoActionsToDo=そうするアクションはない
 NoRecordedOrders=記録された販売注文はない
-NoRecordedProposals=全く記録された提案はない
-NoRecordedInvoices=顧客の請求書は記録されていない
+NoRecordedProposals=提案の記録なし
+NoRecordedInvoices=顧客の請求書の登録なし
 NoUnpaidCustomerBills=未払いの顧客請求書はない
 NoUnpaidSupplierBills=未払いの仕入先の請求書はない
 NoModifiedSupplierBills=仕入先の請求書は記録されていない
 NoRecordedProducts=記録された商品はない/サービスなし
 NoRecordedProspects=全く記録された見通しなし
-NoContractedProducts=ない製品/サービスは、契約しない
-NoRecordedContracts=全く記録された契約をしない
+NoContractedProducts=製品/サービスの契約なし
+NoRecordedContracts=契約の記録なし
 NoRecordedInterventions=記録された介入はない
 BoxLatestSupplierOrders=最新の注文書
 BoxLatestSupplierOrdersAwaitingReception=最新の注文書(受付待ち)
@@ -83,13 +83,13 @@ BoxSuppliersInvoicesPerMonth=1か月あたりの仕入先の請求書
 BoxCustomersOrdersPerMonth=1か月あたりの販売注文
 BoxSuppliersOrdersPerMonth=1か月あたりの仕入先注文
 BoxProposalsPerMonth=1か月あたりの提案
-NoTooLowStockProducts=在庫の下限を下回っている製品はない
-BoxProductDistribution=製品/サービスの配布
+NoTooLowStockProducts=最低在庫数以下の製品なし
+BoxProductDistribution=製品/サービスの分類
 ForObject=%sで
 BoxTitleLastModifiedSupplierBills=仕入先の請求書：最後に変更された%s
 BoxTitleLatestModifiedSupplierOrders=仕入先の注文：最後に変更された%s
-BoxTitleLastModifiedCustomerBills=顧客の請求書：最後に変更された%s
-BoxTitleLastModifiedCustomerOrders=受注：最後の%s変更
+BoxTitleLastModifiedCustomerBills=最近変更された請求書：%s件
+BoxTitleLastModifiedCustomerOrders=最近変更された受注：%s件
 BoxTitleLastModifiedPropals=最新の%s変更された提案
 BoxTitleLatestModifiedJobPositions=最新の%s変更されたジョブ
 BoxTitleLatestModifiedCandidatures=最新の%s修正候補
@@ -108,12 +108,12 @@ BoxTitleSuspenseAccount=未割り当て回線の数
 NumberOfLinesInSuspenseAccount=仮勘定の行数
 SuspenseAccountNotDefined=一時停止アカウントが定義されていない
 BoxLastCustomerShipments=最後の顧客の出荷
-BoxTitleLastCustomerShipments=最新の%s顧客出荷
+BoxTitleLastCustomerShipments=最近の顧客宛出荷：%s件
 NoRecordedShipments=顧客の出荷は記録されていない
 BoxCustomersOutstandingBillReached=上限に達した顧客
 # Pages
 UsersHome=ユーザとグループ
-MembersHome=メンバシップ
+MembersHome=メンバーシップ
 ThirdpartiesHome=取引先
 TicketsHome=チケット
 AccountancyHome=会計
diff --git a/htdocs/langs/ja_JP/cashdesk.lang b/htdocs/langs/ja_JP/cashdesk.lang
index 51f97f98bab..fcdf89fe787 100644
--- a/htdocs/langs/ja_JP/cashdesk.lang
+++ b/htdocs/langs/ja_JP/cashdesk.lang
@@ -41,8 +41,8 @@ Floor=床
 AddTable=テーブルを追加
 Place=場所
 TakeposConnectorNecesary=「TakePOSコネクタ」が必要
-OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
-NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser:
+OrderPrinters=支払いなしで特定のプリンターに注文を送信するためのボタンを追加する（たとえば、キッチンに注文を送信するため）
+NotAvailableWithBrowserPrinter=受信用のプリンターがブラウザーに設定されている場合は使用できない。
 SearchProduct=製品を検索する
 Receipt=領収書
 Header=ヘッダ
@@ -59,7 +59,7 @@ BillsCoinsPad=硬貨と紙幣パッド
 DolistorePosCategory=Dolibarr用のTakePOSモジュールおよびその他のPOSソリューション
 TakeposNeedsCategories=TakePOSが機能するには、少なくとも1つの製品カテゴリが必要
 TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOSが機能するには、カテゴリ<b> %s</b>の下に少なくとも1つの製品カテゴリが必要。
-OrderNotes=Can add some notes to each ordered items
+OrderNotes=注文した各アイテムにメモを追加できる
 CashDeskBankAccountFor=での支払いに使用するデフォルトのアカウント
 NoPaimementModesDefined=TakePOS構成で定義された支払いモードはあらない
 TicketVatGrouped=チケットのレートでVATをグループ化|領収書
@@ -84,7 +84,7 @@ InvoiceIsAlreadyValidated=請求書はすでに検証されている
 NoLinesToBill=請求する行がない
 CustomReceipt=カスタム領収書
 ReceiptName=領収書名
-ProductSupplements=Manage supplements of products
+ProductSupplements=製品のサプリメントを管理する
 SupplementCategory=サプリメントカテゴリー
 ColorTheme=カラーテーマ
 Colorful=カラフル
@@ -94,7 +94,7 @@ Browser=ブラウザ
 BrowserMethodDescription=シンプルで簡単なレシート印刷。レシートを構成するためのいくつかのパラメーターのみ。ブラウザ経由で印刷。
 TakeposConnectorMethodDescription=追加機能を備えた外部モジュール。クラウドから印刷する可能性。
 PrintMethod=印刷方法
-ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. The server hosting the application can't be in the Cloud (must be able to reach the printers in your network).
+ReceiptPrinterMethodDescription=多くのパラメータを持つ強力な方法。テンプレートで完全にカスタマイズ可能。アプリケーションをホストしているサーバーをクラウドに配置することはできない（ネットワーク内のプリンターにアクセスできる必要がある）。
 ByTerminal=ターミナルで
 TakeposNumpadUsePaymentIcon=テンキーの支払いボタンのテキストの代わりにアイコンを使用する
 CashDeskRefNumberingModules=POS販売用の番号付けモジュール
@@ -102,7 +102,7 @@ CashDeskGenericMaskCodes6 =  <br> <b> {TN} </b>タグは端末番号を追加す
 TakeposGroupSameProduct=同じ製品ラインをグループ化する
 StartAParallelSale=新規並行販売を開始する
 SaleStartedAt=%sから販売開始
-ControlCashOpening=POSを開くときにキャッシュポップアップを制御する
+ControlCashOpening=POSを開くときに「現金の管理」ポップアップを開く
 CloseCashFence=現金出納帳制御を閉じる
 CashReport=現金レポート
 MainPrinterToUse=使用するメインプリンター
@@ -126,5 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=モジュールレシートプリンターを
 AllowDelayedPayment=支払いの遅延を許可する
 PrintPaymentMethodOnReceipts=チケットに支払い方法を印刷する|領収書
 WeighingScale=体重計
-ShowPriceHT = 税抜きの価格を表示する列
-ShowPriceHTOnReceipt = 領収書に税抜きの価格を表示する
+ShowPriceHT = 税抜き価格の列を表示する（画面上）
+ShowPriceHTOnReceipt = 税抜き価格（領収書）の列を表示する
diff --git a/htdocs/langs/ja_JP/categories.lang b/htdocs/langs/ja_JP/categories.lang
index 80b2eb17656..d95c64b30e6 100644
--- a/htdocs/langs/ja_JP/categories.lang
+++ b/htdocs/langs/ja_JP/categories.lang
@@ -3,20 +3,20 @@ Rubrique=タグ/カテゴリ
 Rubriques=タグ/カテゴリ
 RubriquesTransactions=タグ/トランザクションのカテゴリ
 categories=タグ/カテゴリ
-NoCategoryYet=No tag/category of this type has been created
+NoCategoryYet=このタイプのタグ/カテゴリは作成されていない
 In=で
 AddIn=加える
 modify=修正する
 Classify=分類する
 CategoriesArea=タグ/カテゴリエリア
-ProductsCategoriesArea=Product/Service tags/categories area
-SuppliersCategoriesArea=Vendor tags/categories area
-CustomersCategoriesArea=Customer tags/categories area
-MembersCategoriesArea=Member tags/categories area
-ContactsCategoriesArea=Contact tags/categories area
-AccountsCategoriesArea=Bank account tags/categories area
-ProjectsCategoriesArea=Project tags/categories area
-UsersCategoriesArea=User tags/categories area
+ProductsCategoriesArea=製品/サービスタグ/カテゴリ領域
+SuppliersCategoriesArea=仕入先タグ/カテゴリエリア
+CustomersCategoriesArea=顧客タグ/カテゴリ領域
+MembersCategoriesArea=メンバータグ/カテゴリエリア
+ContactsCategoriesArea=連絡先タグ/カテゴリ領域
+AccountsCategoriesArea=銀行口座のタグ/カテゴリ領域
+ProjectsCategoriesArea=プロジェクトタグ/カテゴリ領域
+UsersCategoriesArea=ユーザータグ/カテゴリ領域
 SubCats=サブカテゴリ
 CatList=タグ/カテゴリのリスト
 CatListAll=タグ/カテゴリのリスト(すべての種別)
@@ -96,4 +96,4 @@ ChooseCategory=カテゴリを選択
 StocksCategoriesArea=倉庫カテゴリ
 ActionCommCategoriesArea=イベントカテゴリ
 WebsitePagesCategoriesArea=ページ-コンテナカテゴリ
-UseOrOperatorForCategories=Use 'OR' operator for categories
+UseOrOperatorForCategories=カテゴリには「OR」演算子を使用する
diff --git a/htdocs/langs/ja_JP/commercial.lang b/htdocs/langs/ja_JP/commercial.lang
index 4aca0632553..bfc7516315c 100644
--- a/htdocs/langs/ja_JP/commercial.lang
+++ b/htdocs/langs/ja_JP/commercial.lang
@@ -2,9 +2,9 @@
 Commercial=コマース
 CommercialArea=コマースエリア
 Customer=顧客
-Customers=顧客s
+Customers=顧客
 Prospect=見込
-Prospects=見込s
+Prospects=見込
 DeleteAction=イベントを削除
 NewAction=新規イベント
 AddAction=イベントを作成
@@ -53,7 +53,7 @@ ActionAC_FAX=FAX送信
 ActionAC_PROP=メールで提案を送信
 ActionAC_EMAIL=電子メールを送信
 ActionAC_EMAIL_IN=メールの受信
-ActionAC_RDV=打合せs
+ActionAC_RDV=打ち合わせ
 ActionAC_INT=現場での介入
 ActionAC_FAC=メールでの顧客の請求書を送信
 ActionAC_REL=メール(リマインダー)が顧客の請求書を送付
@@ -64,10 +64,11 @@ ActionAC_SHIP=メールでの発送を送信
 ActionAC_SUP_ORD=メールで注文書を送信
 ActionAC_SUP_INV=ベンダーの請求書をメールで送信
 ActionAC_OTH=その他
-ActionAC_OTH_AUTO=自動的に挿入されるイベント
+ActionAC_OTH_AUTO=その他の自動車
 ActionAC_MANUAL=手動で挿入されたイベント
 ActionAC_AUTO=自動的に挿入されるイベント
-ActionAC_OTH_AUTOShort=自動
+ActionAC_OTH_AUTOShort=その他
+ActionAC_EVENTORGANIZATION=イベント主催イベント
 Stats=販売統計
 StatusProsp=見込の状態
 DraftPropals=売買契約提案書の下書き
diff --git a/htdocs/langs/ja_JP/companies.lang b/htdocs/langs/ja_JP/companies.lang
index 0ae62e2ebc3..44fb3c0a052 100644
--- a/htdocs/langs/ja_JP/companies.lang
+++ b/htdocs/langs/ja_JP/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=法人名 %s は既存です。別のを選択してください。
 ErrorSetACountryFirst=始めに国を設定する
 SelectThirdParty=取引先を選択します
-ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
+ConfirmDeleteCompany=この法人とすべての関連情報を削除してもよいか？
 DeleteContact=連絡先/住所を削除
-ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
+ConfirmDeleteContact=この連絡先とすべての関連情報を削除してもよいか？
 MenuNewThirdParty=新規取引先
 MenuNewCustomer=新規顧客
 MenuNewProspect=新規見込客
@@ -69,7 +69,7 @@ PhoneShort=電話
 Skype=Skype
 Call=電話
 Chat=チャット
-PhonePro=Bus. phone
+PhonePro=バス。電話
 PhonePerso=個人電話
 PhoneMobile=携帯電話
 No_Email=大量メールを拒否
@@ -78,7 +78,7 @@ Zip=郵便番号
 Town=区市町村
 Web=ウェブ
 Poste= 位置
-DefaultLang=Default language
+DefaultLang=既定の言語
 VATIsUsed=消費税項目使用中
 VATIsUsedWhenSelling=この定義は、取引先が顧客に請求を作る時の消費 税込/税抜 を指定するもの
 VATIsNotUsed=消費税項目不使用
@@ -331,7 +331,7 @@ CustomerCodeDesc=顧客コード、全顧客でユニーク
 SupplierCodeDesc=仕入先コード、全仕入先でユニーク
 RequiredIfCustomer=取引先が顧客または見込客である場合は必須
 RequiredIfSupplier=取引先が仕入先である場合は必須
-ValidityControledByModule=Validity controlled by the module
+ValidityControledByModule=モジュールによって制御される有効性
 ThisIsModuleRules=このモジュールのルールs
 ProspectToContact=連絡する見込客
 CompanyDeleted=法人 "%s" はデータベースから削除。
@@ -439,12 +439,12 @@ ListSuppliersShort=仕入先の一覧
 ListProspectsShort=見込客の一覧
 ListCustomersShort=顧客の一覧
 ThirdPartiesArea=取引先s/連絡先s
-LastModifiedThirdParties=Latest %s Third Parties which were modified
-UniqueThirdParties=Total number of Third Parties
+LastModifiedThirdParties=変更された最新の%s取引先
+UniqueThirdParties=取引先の総数
 InActivity=開く
 ActivityCeased=閉じる
 ThirdPartyIsClosed=閉鎖した取引先
-ProductsIntoElements=List of products/services mapped to %s
+ProductsIntoElements=%sにマップされた製品/サービスのリスト
 CurrentOutstandingBill=現在の未払い勘定
 OutstandingBill=未払い勘定での最大値
 OutstandingBillReached=受領済未払い勘定での最大値
@@ -454,7 +454,7 @@ LeopardNumRefModelDesc=顧客/サプライヤーコードは無料です。こ
 ManagingDirectors=管理職(s)名称 (CEO, 部長, 社長...)
 MergeOriginThirdparty=重複する取引先 (削除したい取引先)
 MergeThirdparties=仕入先sを集約
-ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
+ConfirmMergeThirdparties=選択した取引先を現在の取引先とマージしてもよいか？リンクされたすべてのオブジェクト (請求書、注文など) は現在の取引先に移動され、その後、選択された取引先が削除される。
 ThirdpartiesMergeSuccess=仕入先sは集約済
 SaleRepresentativeLogin=販売担当者のログイン
 SaleRepresentativeFirstname=販売担当者の姓名の名
diff --git a/htdocs/langs/ja_JP/compta.lang b/htdocs/langs/ja_JP/compta.lang
index 355fa23d9d0..58216142460 100644
--- a/htdocs/langs/ja_JP/compta.lang
+++ b/htdocs/langs/ja_JP/compta.lang
@@ -135,7 +135,7 @@ NewCheckReceipt=新規割引
 NewCheckDeposit=新規チェック預金
 NewCheckDepositOn=%s：科目上で預金の領収書を作成する
 NoWaitingChecks=入金待ちの小切手はない。
-DateChequeReceived=Check receiving date
+DateChequeReceived=受領日を確認する
 NbOfCheques=小切手の数
 PaySocialContribution=社会税/財政税を支払う
 PayVAT=VAT申告を支払う
@@ -286,3 +286,9 @@ ReportPurchaseTurnover=請求済購入取引高
 ReportPurchaseTurnoverCollected=回収済購入取引高
 IncludeVarpaysInResults = レポートにさまざまな支払を含める
 IncludeLoansInResults = レポートにローンを含める
+InvoiceLate30Days = 30日を超える請求書
+InvoiceLate15Days = 15日以上遅れた請求書
+InvoiceLateMinus15Days = 請求書遅延
+InvoiceNotLate = 15日未満で回収される
+InvoiceNotLate15Days = 15日で回収される
+InvoiceNotLate30Days = 30日で回収される
diff --git a/htdocs/langs/ja_JP/cron.lang b/htdocs/langs/ja_JP/cron.lang
index 0a94274deb6..3b9f9a8d97a 100644
--- a/htdocs/langs/ja_JP/cron.lang
+++ b/htdocs/langs/ja_JP/cron.lang
@@ -14,8 +14,8 @@ FileToLaunchCronJobs=修飾されたcronジョブをチェックして起動す
 CronExplainHowToRunUnix=Unix環境では、次のcrontabエントリを使用して、5分ごとにコマンドラインを実行する必要がある。
 CronExplainHowToRunWin=Microsoft(tm)Windows環境では、スケジュールされたタスクツールを使用して、5分ごとにコマンドラインを実行できる。
 CronMethodDoesNotExists=クラス%sには、メソッド%sが含まれていない。
-CronMethodNotAllowed=クラス%sのメソッド%sは、禁止されているメソッドのブラックリストに含まれています
-CronJobDefDesc=cronジョブプロファイルは、モジュール記述子ファイルに定義されています。モジュールがアクティブ化されると、それらがロードされて使用可能になるため、管理ツールメニュー%sからジョブを管理できる。
+CronMethodNotAllowed=クラス%sのメソッド%sは、禁止されているメソッドのブラックリストに含まれている
+CronJobDefDesc=cronジョブプロファイルは、モジュール記述子ファイルに定義されている。モジュールがアクティブ化されると、それらがロードされて使用可能になるため、管理ツールメニュー%sからジョブを管理できる。
 CronJobProfiles=事前定義されたcronジョブプロファイルのリスト
 # Menu
 EnabledAndDisabled=有効および無効
@@ -60,7 +60,7 @@ CronErrEndDateStartDt=終了日を開始日より前にすることはできな
 StatusAtInstall=モジュールインストール時のステータス
 CronStatusActiveBtn=スケジュール
 CronStatusInactiveBtn=無効にする
-CronTaskInactive=このジョブは無効になっている
+CronTaskInactive=このジョブは無効になっている（スケジュールされていない）
 CronId=Id
 CronClassFile=クラスのあるファイル名
 CronModuleHelp=Dolibarrモジュールディレクトリの名前(外部Dolibarrモジュールでも機能する). <BR> たとえば、Dolibarr製品オブジェクト /htdocs/<u>product</u>/class/product.class.php のfetchメソッドを呼び出す場合、 モジュールの値は<br><i>product</i>
diff --git a/htdocs/langs/ja_JP/ecm.lang b/htdocs/langs/ja_JP/ecm.lang
index b622ef8aee2..82a2e56aec0 100644
--- a/htdocs/langs/ja_JP/ecm.lang
+++ b/htdocs/langs/ja_JP/ecm.lang
@@ -42,6 +42,6 @@ ExtraFieldsEcmFiles=ExtrafieldsEcmファイル
 ExtraFieldsEcmDirectories=ExtrafieldsEcmディレクトリ
 ECMSetup=ECMセットアップ
 GenerateImgWebp=すべての画像を.webp形式の別のバージョンで複製する
-ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
+ConfirmGenerateImgWebp=確認すると、現在このフォルダーにあるすべての画像に対して.webp形式の画像が生成される（サブフォルダーは含まれない）...
 ConfirmImgWebpCreation=すべての画像の重複を確認する
 SucessConvertImgWebp=画像が正常に複製された
diff --git a/htdocs/langs/ja_JP/errors.lang b/htdocs/langs/ja_JP/errors.lang
index 6f682279738..d68c7aeac32 100644
--- a/htdocs/langs/ja_JP/errors.lang
+++ b/htdocs/langs/ja_JP/errors.lang
@@ -4,13 +4,14 @@
 NoErrorCommitIsDone=エラーなし、コミットする
 # Errors
 ErrorButCommitIsDone=エラーが見つかったが、これにもかかわらず検証する
-ErrorBadEMail=Email %s is incorrect
-ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
-ErrorBadUrl=Url %s is incorrect
+ErrorBadEMail=メール%sが正しくない
+ErrorBadMXDomain=メール%sが正しくないよう （ドメインに有効なMXレコードがない）
+ErrorBadUrl=URL%sが正しくない
 ErrorBadValueForParamNotAString=パラメータ の値が正しくない。通常、翻訳が欠落している場合に追加される。
 ErrorRefAlreadyExists=参照<b>%s</b>はすでに存在する。
 ErrorLoginAlreadyExists=ログイン%sはすでに存在している。
 ErrorGroupAlreadyExists=グループ%sはすでに存在している。
+ErrorEmailAlreadyExists=メール%sはすでに存在する。
 ErrorRecordNotFound=レコードが見つからなかった。
 ErrorFailToCopyFile=<b>&quot;%s&quot;</b>にファイル<b>&quot;%s&quot;を</b>コピーに失敗した。
 ErrorFailToCopyDir=ディレクトリ '<b> %s</b>'を '<b> %s</b>'にコピーできなかった。
@@ -46,8 +47,8 @@ ErrorWrongDate=日付が正しくない！
 ErrorFailedToWriteInDir=ディレクトリ%sの書き込みに失敗した
 ErrorFoundBadEmailInFile=ファイル内の%s線の発見誤った電子メールのシンタックス(電子メール= %sを使用したサンプルライン%s)
 ErrorUserCannotBeDelete=ユーザーを削除することはできない。多分それはDolibarrエンティティに関連付けられている。
-ErrorFieldsRequired=Some required fields have been left blank.
-ErrorSubjectIsRequired=The email subject is required
+ErrorFieldsRequired=一部の必須フィールドは空白のままになっている。
+ErrorSubjectIsRequired=メールの件名が必要 
 ErrorFailedToCreateDir=ディレクトリの作成に失敗した。そのWebサーバのユーザがDolibarrのドキュメントディレクトリに書き込む権限を持って確認すること。パラメータ の<b>safe_modeが</b>このPHPが有効になっている場合、Dolibarr PHPファイルは、Webサーバーのユーザー(またはグループ)に所有していることを確認すること。
 ErrorNoMailDefinedForThisUser=このユーザーに定義されたメールはない
 ErrorSetupOfEmailsNotComplete=メールの設定が完了していない
@@ -117,7 +118,7 @@ ErrorCantReadFile=ファイル&quot;%s&quot;を読み取ることができなか
 ErrorCantReadDir=ディレクトリ&quot;%s&quot;を読み取ることができなかった
 ErrorBadLoginPassword=ログインまたはパスワードの値が正しくない
 ErrorLoginDisabled=あなたのアカウントは無効にされている
-ErrorFailedToRunExternalCommand=外部コマンドの実行に失敗した。それはあなたのPHPサーバで利用可能と実行可能になったのを確認すること。 PHP <b>セーフモードが</b>有効<b>になっ</b>ている場合、コマンドは、パラメータ の<b>safe_mode_exec_dirの</b>によって定義されたディレクトリ内にあることを確認すること。
+ErrorFailedToRunExternalCommand=外部コマンドの実行に失敗した。 PHPサーバーユーザーが利用可能で実行可能であることを確認すること。コマンドがapparmorのようなセキュリティレイヤーによってシェルレベルで保護されていないことも確認すること。
 ErrorFailedToChangePassword=パスワードの変更に失敗した
 ErrorLoginDoesNotExists=ログイン<b>%s</b>を持つユーザーを見つけることができなかった。
 ErrorLoginHasNoEmail=このユーザーは電子メールアドレスを持っていない。プロセスが中止された。
@@ -262,6 +263,7 @@ ErrorDateIsInFuture=エラー、日付を未来にすることはできない
 ErrorAnAmountWithoutTaxIsRequired=エラー、数量は必須
 ErrorAPercentIsRequired=エラー、パーセンテージを正しく入力すること
 ErrorYouMustFirstSetupYourChartOfAccount=最初に勘定科目表を設定する必要がある
+ErrorFailedToFindEmailTemplate=コードネーム%sのテンプレートが見つかりませんでした
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=PHPパラメータ upload_max_filesize(%s)は、PHPパラメータ post_max_size(%s)よりも大きくなっている。これは一貫した設定ではない。
@@ -298,3 +300,4 @@ WarningModuleXDisabledSoYouMayMissEventHere=モジュール%sが有効になっ
 ErrorActionCommPropertyUserowneridNotDefined=ユーザの所有者が必要
 ErrorActionCommBadType=選択したイベント種別 (id: %n, code: %s) がイベント種別辞書に存在しない
 CheckVersionFail=バージョンチェックに失敗する
+ErrorWrongFileName=ファイル名に__SOMETHING__を含めることはできない
diff --git a/htdocs/langs/ja_JP/eventorganization.lang b/htdocs/langs/ja_JP/eventorganization.lang
index b37d528374d..1f46c7eac4d 100644
--- a/htdocs/langs/ja_JP/eventorganization.lang
+++ b/htdocs/langs/ja_JP/eventorganization.lang
@@ -1,4 +1,5 @@
 # Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+# Copyright (C) 2021		Dorian Vabre			<dorian.vabre@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
@@ -81,7 +82,10 @@ PriceOfBoothHelp=ブース出展用サブスクリプション価格
 EventOrganizationICSLink=イベントのICSをリンクする
 ConferenceOrBoothInformation=会議またはブース情報
 Attendees = 参加者
+DownloadICSLink = ICS リンクをダウンロード
 EVENTORGANIZATION_SECUREKEY = 会議への公開登録リンクのセキュアキー
+SERVICE_BOOTH_LOCATION = ブースの場所に関する請求書の行に使用されるサービス
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = 会議への参加者のサブスクリプションに関する請求書の行に使用されるサービス
 #
 # Status
 #
@@ -94,8 +98,46 @@ EvntOrgCancelled = キャンセル
 #
 # Public page
 #
+SuggestForm = 提案ページ
+RegisterPage = 会議やブースのページ
+EvntOrgRegistrationHelpMessage = ここでは、イベントに投票したり、プロジェクトの新規会議やブースを提案したりできる。
+EvntOrgRegistrationConfHelpMessage = ここで、プロジェクトの新規会議を提案できる
+EvntOrgRegistrationBoothHelpMessage = ここでは、プロジェクトの新規ブースを提案できる。
+ListOfSuggestedConferences = 提案された会議のリスト
+ListOfSuggestedBooths = 提案ブース一覧
+SuggestConference = 新規会議を提案する
+SuggestBooth = ブースを提案する
+ViewAndVote = 提案されたイベントを表示して投票する
 PublicAttendeeSubscriptionPage = 会議登録への公開リンク
 MissingOrBadSecureKey = セキュリティキーが無効であるか欠落している
-EvntOrgWelcomeMessage = このフォームを使用すると、会議の新規参加者として登録でる
-EvntOrgStartDuration = この会議の開始は
-EvntOrgEndDuration =  で終わる
+EvntOrgWelcomeMessage = このフォームを使用すると、会議： '%s' の新規参加者として登録できる
+EvntOrgDuration = この会議は%sで始まり、%sで終わる。
+ConferenceAttendeeFee = イベント:「 '%s' 開催は%sから%sまで」への会議参加料金。
+BoothLocationFee = イベントのブース位置: '%s' で %s から %s まで
+EventType = イベント種別
+
+#
+# Vote page
+#
+EvntOrgRegistrationWelcomeMessage = 会議またはブースの提案ページへようこそ。
+EvntOrgRegistrationConfWelcomeMessage = カンファレンスの提案ページへようこそ。
+EvntOrgRegistrationBoothWelcomeMessage = ブース提案ページへようこそ。
+EvntOrgVoteHelpMessage = ここで、プロジェクトの提案されたイベントを表示して投票できる
+VoteOk = あなたの投票が承認された。
+AlreadyVoted = あなたはすでにこのイベントに投票している。
+VoteError = 投票中にエラーが発生した。もう一度やり直し願う。
+
+#
+# SubscriptionOk page
+#
+SubscriptionOk = この会議へのサブスクリプションが検証された
+#
+# Subscription validation mail
+#
+ConfAttendeeSubscriptionConfirmation = 会議へのサブスクリプションの確認
+#
+# Payment page
+#
+Attendee = 出席者
+PaymentConferenceAttendee = 会議出席者の支払い
+PaymentBoothLocation = ブースの場所の支払い
diff --git a/htdocs/langs/ja_JP/exports.lang b/htdocs/langs/ja_JP/exports.lang
index 07f956fe22d..326ea5ad052 100644
--- a/htdocs/langs/ja_JP/exports.lang
+++ b/htdocs/langs/ja_JP/exports.lang
@@ -9,7 +9,7 @@ SelectExportDataSet=エクスポートするデータセットを選択...
 SelectImportDataSet=インポートしたいデータを選択...
 SelectExportFields=エクスポートするフィールドを選択するか、事前定義されたエクスポートプロファイルを選択する
 SelectImportFields=アンカー%sを使用して上下に移動することにより、インポートするソースファイルフィールドとデータベース内のそれらのターゲットフィールドを選択するか、事前定義されたインポートプロファイルを選択する。
-NotImportedFields=ソースファイルのフィールドがインポートされない
+NotImportedFields=インポートされていないソースファイルのフィールド
 SaveExportModel=選択内容をエクスポートプロファイル/テンプレートとして保存する(再利用用)。
 SaveImportModel=このインポートプロファイルを(再利用のために)保存する...
 ExportModelName=プロファイル名をエクスポートする
@@ -25,10 +25,10 @@ FieldsTitle=フィールドのタイトル
 FieldTitle=フィールドのタイトル
 NowClickToGenerateToBuildExportFile=次に、コンボボックスでファイル形式を選択し、"生成" をクリックしてエクスポートファイルを作成する...
 AvailableFormats=利用可能なフォーマット
-LibraryShort=図書館
+LibraryShort=ライブラリ
 ExportCsvSeparator=Csv文字セパレータ
 ImportCsvSeparator=Csv文字セパレータ
-Step=手順
+Step=ステップ
 FormatedImport=インポートアシスタント
 FormatedImportDesc1=このモジュールを使用すると、アシスタントを使用して、技術的な知識がなくても、ファイルから既存のデータを更新したり、データベースに新規オブジェクトを追加したりできる。
 FormatedImportDesc2=最初のステップは、インポートするデータの種類を選択し、次にソースファイルの形式を選択し、次にインポートするフィールドを選択すること 。
@@ -38,7 +38,7 @@ FormatedExportDesc2=最初のステップは、事前定義されたデータセ
 FormatedExportDesc3=エクスポートするデータを選択すると、出力ファイルの形式を選択できる。
 Sheet=シート
 NoImportableData=いいえインポート可能なデータがない(データのインポートを可能にするための定義としないモジュール)
-FileSuccessfullyBuilt=生成されたファイル
+FileSuccessfullyBuilt=ファイルが生成されました
 SQLUsedForExport=データの抽出に使用されるSQLリクエスト
 LineId=行のid
 LineLabel=行のラベル
diff --git a/htdocs/langs/ja_JP/hrm.lang b/htdocs/langs/ja_JP/hrm.lang
index a7be093eebe..493cba6a5db 100644
--- a/htdocs/langs/ja_JP/hrm.lang
+++ b/htdocs/langs/ja_JP/hrm.lang
@@ -9,7 +9,7 @@ ConfirmDeleteEstablishment=この事業所を削除したいのね、いいよ
 OpenEtablishment=事業所を開く
 CloseEtablishment=事業所を閉じる
 # Dictionary
-DictionaryPublicHolidays=HRM - 祝祭日
+DictionaryPublicHolidays=休暇-祝日
 DictionaryDepartment=HRM - 部門一覧
 DictionaryFunction=HRM - 職位
 # Module
diff --git a/htdocs/langs/ja_JP/knowledgemanagement.lang b/htdocs/langs/ja_JP/knowledgemanagement.lang
index 888ec8903a0..cb54cb27245 100644
--- a/htdocs/langs/ja_JP/knowledgemanagement.lang
+++ b/htdocs/langs/ja_JP/knowledgemanagement.lang
@@ -18,16 +18,16 @@
 #
 
 # Module label 'ModuleKnowledgeManagementName'
-ModuleKnowledgeManagementName = Knowledge Management System
+ModuleKnowledgeManagementName = 知識管理システム
 # Module description 'ModuleKnowledgeManagementDesc'
-ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+ModuleKnowledgeManagementDesc=ナレッジマネジメント（KM）またはヘルプデスクベースを管理する
 
 #
 # Admin page
 #
-KnowledgeManagementSetup = Knowledge Management System setup
+KnowledgeManagementSetup = ナレッジマネジメントシステムのセットアップ
 Settings = 設定
-KnowledgeManagementSetupPage = Knowledge Management System setup page
+KnowledgeManagementSetupPage = ナレッジマネジメントシステムのセットアップページ
 
 
 #
@@ -46,10 +46,10 @@ KnowledgeManagementArea = 知識管理
 #
 # Menu
 #
-MenuKnowledgeRecord = Knowledge base
-ListOfArticles = List of articles
-NewKnowledgeRecord = New article
-ValidateReply = Validate solution
-KnowledgeRecords = Articles
+MenuKnowledgeRecord = 知識ベース
+ListKnowledgeRecord = 記事一覧
+NewKnowledgeRecord = 新しい記事
+ValidateReply = ソリューションを検証する
+KnowledgeRecords = 記事
 KnowledgeRecord = 記事
-KnowledgeRecordExtraFields = Extrafields for Article
+KnowledgeRecordExtraFields = 記事のエクストラフィールド
diff --git a/htdocs/langs/ja_JP/languages.lang b/htdocs/langs/ja_JP/languages.lang
index a5503951b7a..65ea4f02be5 100644
--- a/htdocs/langs/ja_JP/languages.lang
+++ b/htdocs/langs/ja_JP/languages.lang
@@ -3,6 +3,7 @@ Language_am_ET=エチオピア語
 Language_ar_AR=アラビア語
 Language_ar_EG=アラビア語(エジプト)
 Language_ar_SA=アラビア語
+Language_ar_TN=アラビア語 (チュニジア)
 Language_az_AZ=アゼルバイジャン語
 Language_bn_BD=ベンガル語
 Language_bn_IN=ベンガル語(インド)
@@ -84,6 +85,7 @@ Language_nl_NL=オランダ語
 Language_pl_PL=ポーランド語
 Language_pt_BR=ポルトガル語 (ブラジル)
 Language_pt_PT=ポルトガル語
+Language_ro_MD=ルーマニア語 (モルダビア)
 Language_ro_RO=ルーマニア語
 Language_ru_RU=ロシア語
 Language_ru_UA=ロシア語(ウクライナ)
diff --git a/htdocs/langs/ja_JP/mails.lang b/htdocs/langs/ja_JP/mails.lang
index d3122d4a20e..bf1050fd96a 100644
--- a/htdocs/langs/ja_JP/mails.lang
+++ b/htdocs/langs/ja_JP/mails.lang
@@ -15,7 +15,7 @@ MailToUsers=ユーザ(s)へ
 MailCC=にコピー
 MailToCCUsers=ユーザs(s)にコピーする
 MailCCC=にキャッシュされたコピー
-MailTopic=Email subject
+MailTopic=メールの件名
 MailText=メッセージ
 MailFile=添付ファイル
 MailMessage=電子メールの本文
@@ -131,8 +131,8 @@ NoNotificationsWillBeSent=このイベントタイプと法人では、自動電
 ANotificationsWillBeSent=1つの自動通知が電子メールで送信される
 SomeNotificationsWillBeSent=%s自動通知は電子メールで送信される
 AddNewNotification=新規自動電子メール通知を購読する(ターゲット/イベント)
-ListOfActiveNotifications=List of all active subscriptions (targets/events) for automatic email notification
-ListOfNotificationsDone=List of all automatic email notifications sent
+ListOfActiveNotifications=自動電子メール通知のすべてのアクティブなサブスクリプション（ターゲット/イベント）のリスト
+ListOfNotificationsDone=送信されたすべての自動電子メール通知のリスト
 MailSendSetupIs=電子メール送信の構成は「%s」に設定されている。このモードは、大量の電子メールを送信するために使用することはできない。
 MailSendSetupIs2=モード'%s'を使うには、まず、管理者アカウントを使用して、メニュー%sホーム - 設定 - メール %sに移動し、パラメーター<strong>'%s '</strong>を変更する。このモードでは、インターネットサービスプロバイダーが提供するSMTPサーバーの設定に入り、大量電子メールの機能を使用できる。
 MailSendSetupIs3=SMTPサーバーの設定方法について質問がある場合は、%sに問い合わせることができる。
diff --git a/htdocs/langs/ja_JP/main.lang b/htdocs/langs/ja_JP/main.lang
index 0cb3870bce3..e5fe81fd17a 100644
--- a/htdocs/langs/ja_JP/main.lang
+++ b/htdocs/langs/ja_JP/main.lang
@@ -180,7 +180,7 @@ SaveAndNew=保存して新規
 TestConnection=試験用接続
 ToClone=クローン
 ConfirmCloneAsk=オブジェクト<b>%s </b>のクローンを作成してもよろしいですか？
-ConfirmClone=Choose the data you want to clone:
+ConfirmClone=クローンを作成するデータを選択する。
 NoCloneOptionsSpecified=定義されているクローンを作成するデータがありません。
 Of=の
 Go=行く
@@ -246,7 +246,7 @@ DefaultModel=デフォルトのドキュメントテンプレート
 Action=イベント
 About=約
 Number=数
-NumberByMonth=Total reports by month
+NumberByMonth=月ごとの合計レポート
 AmountByMonth=月別量
 Numero=数
 Limit=制限
@@ -341,7 +341,7 @@ KiloBytes=キロバイト
 MegaBytes=メガバイト
 GigaBytes=ギガバイト
 TeraBytes=テラバイト
-UserAuthor=Ceated by
+UserAuthor=によってCeated
 UserModif=更新済の原因
 b=B。
 Kb=KB
@@ -360,10 +360,10 @@ UnitPrice=単価
 UnitPriceHT=単価(除く)
 UnitPriceHTCurrency=単価(除く)(通貨)
 UnitPriceTTC=単価
-PriceU=UP
+PriceU=単価
 PriceUHT=UP(純額)
 PriceUHTCurrency=U.P (正味) (通貨)
-PriceUTTC=アップ。 (税込)
+PriceUTTC=単価(税込)
 Amount=量
 AmountInvoice=請求額
 AmountInvoiced=請求額
@@ -395,16 +395,16 @@ AmountOrPercent=数量またはパーセント
 Percentage=割合
 Total=合計
 SubTotal=小計
-TotalHTShort=合計(除く)
+TotalHTShort=小計（税抜）
 TotalHT100Short=合計100%%(除く)
 TotalHTShortCurrency=合計(通貨を除く)
 TotalTTCShort=合計(税込)
-TotalHT=合計(税込)
+TotalHT=小計（税抜）
 TotalHTforthispage=このページの合計(税抜き)
 Totalforthispage=このページの合計
 TotalTTC=合計(税込)
 TotalTTCToYourCredit=あなたのクレジットの合計(税込)
-TotalVAT=合計税
+TotalVAT=税額合計
 TotalVATIN=合計IGST
 TotalLT1=総税2
 TotalLT2=総税3
@@ -412,10 +412,10 @@ TotalLT1ES=合計RE
 TotalLT2ES=合計IRPF
 TotalLT1IN=合計CGST
 TotalLT2IN=合計SGST
-HT=除く税金
+HT=税抜
 TTC=税込
 INCVATONLY=Inc. VAT
-INCT=Inc.すべての税金
+INCT=全ての税額を含む
 VAT=売上税
 VATIN=IGST
 VATs=売上税
@@ -430,6 +430,7 @@ LT1IN=CGST
 LT2IN=SGST
 LT1GC=追加のセント
 VATRate=税率
+RateOfTaxN=税率%s
 VATCode=税率コード
 VATNPR=税率NPR
 DefaultTaxRate=デフォルトの税率
@@ -729,6 +730,7 @@ MenuMembers=メンバー
 MenuAgendaGoogle=Googleの議題
 MenuTaxesAndSpecialExpenses=税金|特別経費
 ThisLimitIsDefinedInSetup=Dolibarr制限(メニューホームセットアップ·セキュリティ)：%s KB、PHP制限：%s KB
+ThisLimitIsDefinedInSetupAt=Dolibarr制限（メニュー%s）：%s Kb、PHP制限（Param %s）：%s Kb
 NoFileFound=ドキュメントがアップロードされていない
 CurrentUserLanguage=現在の言語
 CurrentTheme=現在のテーマ
@@ -845,7 +847,7 @@ XMoreLines=%s行が非表示
 ShowMoreLines=より多くの/より少ない行を表示する
 PublicUrl=パブリックURL
 AddBox=ボックスを追加
-SelectElementAndClick=Select an element and click on %s
+SelectElementAndClick=要素を選択し、%sをクリックする
 PrintFile=印刷ファイル%s
 ShowTransaction=銀行口座にエントリを表示する
 ShowIntervention=介入を示す
@@ -856,8 +858,8 @@ Denied=拒否されました
 ListOf=%sのリスト
 ListOfTemplates=テンプレートのリスト
 Gender=性別
-Genderman=Male
-Genderwoman=Female
+Genderman=男性
+Genderwoman=女性
 Genderother=その他
 ViewList=リストビュー
 ViewGantt=ガントビュー
@@ -1060,7 +1062,7 @@ ConfirmMassDraftDeletion=下書き大量削除確
 FileSharedViaALink=パブリックリンクと共有されているファイル
 SelectAThirdPartyFirst=最初にサードパーティを選択してください...
 YouAreCurrentlyInSandboxMode=現在、%s「サンドボックス」モードになっている
-Inventory=在庫
+Inventory=目録
 AnalyticCode=分析コード
 TMenuMRP=MRP
 ShowCompanyInfos=法人情報を表示する
@@ -1072,6 +1074,7 @@ ValidFrom=から有効
 ValidUntil=まで有効
 NoRecordedUsers=ユーザーなし
 ToClose=閉じるには
+ToRefuse=拒む
 ToProcess=処理するには
 ToApprove=承認するために
 GlobalOpenedElemView=グローバルビュー
@@ -1126,9 +1129,11 @@ UpdateForAllLines=すべての行を更新
 OnHold=保留
 Civility=敬称
 AffectTag=タグに影響を与える
+CreateExternalUser=外部ユーザーを作成する
 ConfirmAffectTag=バルクタグの影響
 ConfirmAffectTagQuestion=選択した%sレコード(s)のタグに影響を与えてもよいか？
 CategTypeNotFound=レコードのタイプのタグタイプが見つからない
 CopiedToClipboard=クリップボードにコピー
 InformationOnLinkToContract=この金額は、契約のすべての行の合計にすぎません。時間の概念は考慮されていない。
-ConfirmCancel=Are you sure you want to cancel
+ConfirmCancel=本当にキャンセルしたいか 
+EmailMsgID=メールMsgID
diff --git a/htdocs/langs/ja_JP/members.lang b/htdocs/langs/ja_JP/members.lang
index 3da10a79543..3240c534cb1 100644
--- a/htdocs/langs/ja_JP/members.lang
+++ b/htdocs/langs/ja_JP/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=別のメンバー（名前：<b>%s</
 ErrorUserPermissionAllowsToLinksToItselfOnly=セキュリティ上の理由から、あなたはすべてのユーザーが自分のものでないユーザーにメンバをリンクすることができるように編集する権限を付与する必要がある。
 SetLinkToUser=Dolibarrユーザーへのリンク
 SetLinkToThirdParty=Dolibarrの取引先にリンクする
-MembersCards=Business cards for members
+MembersCards=会員用名刺
 MembersList=メンバーのリスト
 MembersListToValid=下書きのメンバーのリスト（要承認）
 MembersListValid=有効なメンバーのリスト
@@ -32,7 +32,7 @@ MembersWithSubscriptionToReceive=受け取るべきサブスクリプション
 MembersWithSubscriptionToReceiveShort=受け取るべきサブスクリプション
 DateSubscription=サブスクリプションの日付
 DateEndSubscription=サブスクリプションの終了日
-EndSubscription=Subscription Ends
+EndSubscription=サブスクリプションが終了する
 SubscriptionId=サブスクリプションID
 WithoutSubscription=サブスクリプションなし
 MemberId=メンバーID
@@ -83,10 +83,10 @@ WelcomeEMail=ウェルカムメール
 SubscriptionRequired=サブスクリプションが必要
 DeleteType=削除する
 VoteAllowed=許可される投票
-Physical=Individual
-Moral=Corporation
-MorAndPhy=Corporation and Individual
-Reenable=Re-Enable
+Physical=個人
+Moral=株式会社
+MorAndPhy=法人および個人
+Reenable=再度有効にする
 ExcludeMember=メンバーを除外する
 ConfirmExcludeMember=このメンバーを除外してもよろしいですか？
 ResiliateMember=メンバーを解除する
@@ -175,26 +175,26 @@ MembersStatisticsByCountries=国別メンバー統計
 MembersStatisticsByState=州・都道府県別メンバー統計
 MembersStatisticsByTown=市区町村別メンバー統計
 MembersStatisticsByRegion=地域別メンバー統計
-NbOfMembers=Total number of members
-NbOfActiveMembers=Total number of current active members
+NbOfMembers=会員総数
+NbOfActiveMembers=現在アクティブなメンバーの総数
 NoValidatedMemberYet=承認済みのメンバーが見つかりませんでした
-MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
-MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
-MembersByTownDesc=This screen show you statistics of members by town.
-MembersByNature=This screen show you statistics of members by nature.
-MembersByRegion=This screen show you statistics of members by region.
+MembersByCountryDesc=この画面には、国別のメンバーの統計が表示される。グラフとチャートは、Googleオンライングラフサービスの可用性と、機能しているインターネット接続の可用性に依存する。
+MembersByStateDesc=この画面には、州/県/州ごとのメンバーの統計が表示される。
+MembersByTownDesc=この画面には、町ごとのメンバーの統計が表示される。
+MembersByNature=この画面には、メンバーの統計が表示される。
+MembersByRegion=この画面には、地域ごとのメンバーの統計が表示される。
 MembersStatisticsDesc=読みたい統計を選択...
 MenuMembersStats=統計
-LastMemberDate=Latest membership date
+LastMemberDate=最新の会員日
 LatestSubscriptionDate=最後のサブスクリプションの日付
-MemberNature=Nature of the member
-MembersNature=Nature of the members
-Public=Information is public
+MemberNature=メンバーの性質
+MembersNature=メンバーの性質
+Public=情報は公開されている
 NewMemberbyWeb=新規メンバーが追加されました。承認待ちです。
 NewMemberForm=新規メンバーフォーム
-SubscriptionsStatistics=Subscriptions statistics
+SubscriptionsStatistics=サブスクリプション統計
 NbOfSubscriptions=サブスクリプションの数
-AmountOfSubscriptions=Amount collected from subscriptions
+AmountOfSubscriptions=サブスクリプションから収集された金額
 TurnoverOrBudget=売上高(法人の場合)または予算(基礎用)
 DefaultAmount=サブスクリプションのデフォルトの量
 CanEditAmount=訪問者は、そのサブスクリプションの量を選択/編集することができる
@@ -213,3 +213,5 @@ SendReminderForExpiredSubscription=サブスクリプションの期限切れが
 MembershipPaid=現在の期間に支払われたメンバーシップ(%sまで)
 YouMayFindYourInvoiceInThisEmail=このメールに請求書が添付されている場合がある
 XMembersClosed=メンバー%s件がクローズしました
+XExternalUserCreated=%s外部ユーザ(s)が作成された
+ForceMemberNature=強制メンバーの性質（個人または法人）
diff --git a/htdocs/langs/ja_JP/modulebuilder.lang b/htdocs/langs/ja_JP/modulebuilder.lang
index 0f3a688c10d..1437ae91610 100644
--- a/htdocs/langs/ja_JP/modulebuilder.lang
+++ b/htdocs/langs/ja_JP/modulebuilder.lang
@@ -143,3 +143,4 @@ AsciiToHtmlConverter=アスキーからHTMLへのコンバーター
 AsciiToPdfConverter=アスキーからPDFへのコンバーター
 TableNotEmptyDropCanceled=テーブルが空ではない。ドロップはキャンセルされた。
 ModuleBuilderNotAllowed=モジュールビルダーは利用できるが、あなたのユーザには許可されていない。
+ImportExportProfiles=プロファイルのインポートとエクスポート
diff --git a/htdocs/langs/ja_JP/mrp.lang b/htdocs/langs/ja_JP/mrp.lang
index 2e3e4d06df0..4e9af16206b 100644
--- a/htdocs/langs/ja_JP/mrp.lang
+++ b/htdocs/langs/ja_JP/mrp.lang
@@ -13,7 +13,7 @@ BOMsSetup=モジュールBOMのセットアップ
 ListOfBOMs=部品表のリスト - BOM
 ListOfManufacturingOrders=製造注文のリスト
 NewBOM=新規部品表
-ProductBOMHelp=このBOMで作成する製品。 <br>注：プロパティ「製品の性質」=「原材料」を持つ製品はこのリストに非表示。
+ProductBOMHelp=このBOMで作成（または分解）する製品。 <br>注：プロパティ「製品の性質」=「原材料」を持つ製品はこのリストに表示されない。
 BOMsNumberingModules=BOM番号付けテンプレート
 BOMsModelModule=BOMドキュメントテンプレート
 MOsNumberingModules=MOナンバリングテンプレート
@@ -30,8 +30,8 @@ ValueOfMeansLoss=0.95の値は、生産中の平均5%%の損失を意味する
 ValueOfMeansLossForProductProduced=0.95の値は、生産された製品の損失の平均5%%を意味する
 DeleteBillOfMaterials=部品表を削除
 DeleteMo=製造指図を削除
-ConfirmDeleteBillOfMaterials=この部品表を削除してよいか？
-ConfirmDeleteMo=この部品表を削除してよいか？
+ConfirmDeleteBillOfMaterials=この部品表を削除してもよいか？
+ConfirmDeleteMo=この部品表を削除してもよいか？
 MenuMRP=製造指図
 NewMO=新規製造注文
 QtyToProduce=生産する数量
@@ -39,7 +39,7 @@ DateStartPlannedMo=開始予定日
 DateEndPlannedMo=終了予定日
 KeepEmptyForAsap=空は「できるだけ早く」を意味する
 EstimatedDuration=推定所要時間
-EstimatedDurationDesc=このBOMを使用してこの製品を製造するための推定期間
+EstimatedDurationDesc=このBOMを使用してこの製品を製造（または分解）するための推定期間
 ConfirmValidateBom=参照<strong>%s </strong>を使用してBOMを検証してよいか(これを使用して新規製造指図を作成できる)
 ConfirmCloseBom=このBOMをキャンセルしてよいか(これを使用して新規製造指図を作成することはできなくなる)。
 ConfirmReopenBom=このBOMを再度開いてもよいか(これを使用して新規製造指図を作成できる)
@@ -63,13 +63,14 @@ ConsumeAndProduceAll=すべてを消費して生産する
 Manufactured=製造完了
 TheProductXIsAlreadyTheProductToProduce=追加する製品は、すでに生産する製品。
 ForAQuantityOf=%sの生産数量について
+ForAQuantityToConsumeOf=%sを分解する数量に対して
 ConfirmValidateMo=この製造指図を検証してよいか？
 ConfirmProductionDesc='%s'をクリックすると、設定された数量の消費および/または生産を検証する。これにより、在庫が更新され、在庫の動きが記録される。
 ProductionForRef=%sの生産
 AutoCloseMO=消費および生産する数量に達した場合、製造指図を自動的に閉じます
 NoStockChangeOnServices=サービスの在庫変更はない
 ProductQtyToConsumeByMO=オープンMOで今後も消費する製品数量
-ProductQtyToProduceByMO=オープンMOで今後も生産する製品数量
+ProductQtyToProduceByMO=オープンMOでまだ生産されていない製品数量
 AddNewConsumeLines=消費する新規行を追加
 ProductsToConsume=消費する製品
 ProductsToProduce=生産する製品
@@ -83,15 +84,13 @@ Workstations=ワークステーション
 WorkstationsDescription=ワークステーション管理
 WorkstationSetup = ワークステーションのセットアップ
 WorkstationSetupPage = ワークステーションのセットアップページ
-WorkstationAbout = ワークステーションについて
-WorkstationAboutPage = ページについてのワークステーション
 WorkstationList=ワークステーションリスト
 WorkstationCreate=新しいワークステーションを追加する
 ConfirmEnableWorkstation=ワークステーション<b>%s </b>を有効にするか？
 EnableAWorkstation=ワークステーションを有効にする
 ConfirmDisableWorkstation=ワークステーション<b>%s </b>を無効にしてもよいか？
 DisableAWorkstation=ワークステーションを無効にする
-DeleteWorkstation=Supprimer
+DeleteWorkstation=削除
 NbOperatorsRequired=必要なオペレーターの数
 THMOperatorEstimated=推定オペレーターTHM
 THMMachineEstimated=推定マシンTHM
diff --git a/htdocs/langs/ja_JP/orders.lang b/htdocs/langs/ja_JP/orders.lang
index 8a44ed499bb..edc3f5dc731 100644
--- a/htdocs/langs/ja_JP/orders.lang
+++ b/htdocs/langs/ja_JP/orders.lang
@@ -11,6 +11,7 @@ OrderDate=注文日
 OrderDateShort=注文日
 OrderToProcess=プロセスの順序
 NewOrder=新規注文
+NewSupplierOrderShort=新規注文
 NewOrderSupplier=新規注文書
 ToOrder=順序を作る
 MakeOrder=順序を作る
@@ -73,6 +74,7 @@ DeleteOrder=順序を削除する
 CancelOrder=注文を取り消す
 OrderReopened= %sを再度開くように注文する
 AddOrder=注文を作成する
+AddSupplierOrderShort=注文を作成する
 AddPurchaseOrder=注文書を作成する
 AddToDraftOrders=下書き注文に追加
 ShowOrder=順序を示す
diff --git a/htdocs/langs/ja_JP/other.lang b/htdocs/langs/ja_JP/other.lang
index 2ff627924ac..ac60c749703 100644
--- a/htdocs/langs/ja_JP/other.lang
+++ b/htdocs/langs/ja_JP/other.lang
@@ -53,7 +53,7 @@ Notify_COMPANY_SENTBYMAIL=サードパーティのカードから送信された
 Notify_BILL_VALIDATE=顧客への請求書が検証さ
 Notify_BILL_UNVALIDATE=顧客の請求書は未検証
 Notify_BILL_PAYED=顧客の請求書は支払済
-Notify_BILL_CANCEL=顧客への請求書が取り消さ
+Notify_BILL_CANCEL=顧客への請求書が取り消されました
 Notify_BILL_SENTBYMAIL=メールで送信された顧客への請求書
 Notify_BILL_SUPPLIER_VALIDATE=ベンダーの請求書が検証された
 Notify_BILL_SUPPLIER_PAYED=支払われたベンダーの請求書
@@ -69,7 +69,7 @@ Notify_MEMBER_VALIDATE=メンバー検証
 Notify_MEMBER_MODIFY=メンバーが変更された
 Notify_MEMBER_SUBSCRIPTION=メンバー購読
 Notify_MEMBER_RESILIATE=メンバーが終了した
-Notify_MEMBER_DELETE=メンバーが削除さ
+Notify_MEMBER_DELETE=メンバーが削除されました
 Notify_PROJECT_CREATE=プロジェクトの作成
 Notify_TASK_CREATE=作成されたタスク
 Notify_TASK_MODIFY=タスクが変更された
@@ -111,9 +111,9 @@ DemoCompanyShopWithCashDesk=現金デスクでお店を管理する
 DemoCompanyProductAndStocks=POSで製品を販売するショップ
 DemoCompanyManufacturing=製品を製造する法人
 DemoCompanyAll=複数の活動を行う法人(すべてのメインモジュール)
-CreatedBy=%sによって作成された
-ModifiedBy=%sによって変更された
-ValidatedBy=%sによって検証
+CreatedBy=作成者：%s
+ModifiedBy=変更者：%s
+ValidatedBy=確認者：%s
 SignedBy=%sによる署名
 ClosedBy=%sによって閉じ
 CreatedById=作成したユーザーID
@@ -129,18 +129,19 @@ ClosedByLogin=閉じたユーザーログイン
 FileWasRemoved=ファイルの%sは削除された
 DirWasRemoved=ディレクトリの%sは削除された
 FeatureNotYetAvailable=現在のバージョンではまだ利用できない機能
+FeatureNotAvailableOnDevicesWithoutMouse=マウスのないデバイスでは機能を利用できない
 FeaturesSupported=サポートされている機能
 Width=幅
 Height=高さ
 Depth=深さ
-Top=トップ
-Bottom=ボトム
+Top=上
+Bottom=下
 Left=左
 Right=右
-CalculatedWeight=計算された重み
-CalculatedVolume=計算されたボリューム
+CalculatedWeight=算出された重量
+CalculatedVolume=算出された体積
 Weight=重さ
-WeightUnitton=トン
+WeightUnitton=メートルトン
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -151,14 +152,14 @@ LengthUnitm=m
 LengthUnitdm=dm
 LengthUnitcm=cm
 LengthUnitmm=mm
-Surface=エリア
+Surface=表面積
 SurfaceUnitm2=m²
 SurfaceUnitdm2=dm²
 SurfaceUnitcm2=cm²
 SurfaceUnitmm2=mm²
 SurfaceUnitfoot2=ft²
 SurfaceUnitinch2=in²
-Volume=ボリューム
+Volume=体積
 VolumeUnitm3=m³
 VolumeUnitdm3=dm³ (L)
 VolumeUnitcm3=cm³ (ml)
@@ -178,12 +179,12 @@ SizeUnitpoint=ポイント
 BugTracker=バグトラッカー
 SendNewPasswordDesc=このフォームでは、新規パスワードをリクエストできる。それはあなたのメールアドレスに送られる。 <br>メール内の確認リンクをクリックすると、変更が有効になる。 <br>受信トレイを確認すること。
 BackToLoginPage=ログインページに戻る
-AuthenticationDoesNotAllowSendNewPassword=認証モードは<b>%s</b> 。 <br>このモードでは、Dolibarrは知ってもパスワードを変更することはできません。 <br>あなたのパスワードを変更する場合は、システム管理者に問い合わせてください。
+AuthenticationDoesNotAllowSendNewPassword=認証モードは<b>%s</b> です。 <br>このモードではDolibarr上でパスワードの表示も変更もできません。 <br>パスワードを変更したい場合はシステム管理者に連絡して下さい。
 EnableGDLibraryDesc=このオプションを使用するには、PHPインストールでGDライブラリをインストールまたは有効にする。
 ProfIdShortDesc=<b>教授イド%sは、</b>サードパーティの国に応じて情報 。 <br>たとえば、国<b>%s</b>のために、それはコード<b>%s</b> 。
 DolibarrDemo=Dolibarr ERP / CRMデモ
 StatsByNumberOfUnits=製品/サービスの数量の合計の統計
-StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
+StatsByNumberOfEntities=参照エンティティの数の統計（請求書または注文の数...）
 NumberOfProposals=提案数
 NumberOfCustomerOrders=受注数
 NumberOfCustomerInvoices=顧客の請求書の数
@@ -236,11 +237,11 @@ SelectAColor=色を選択すること
 AddFiles=ファイルを追加
 StartUpload=アップロード開始
 CancelUpload=アップロードをキャンセル
-FileIsTooBig=ファイルが大きすぎる
+FileIsTooBig=ファイルが大きすぎます
 PleaseBePatient=しばらくお待ちください...
 NewPassword=新規パスワード
 ResetPassword=パスワードを再設定する
-RequestToResetPasswordReceived=パスワードの変更リクエストを受け取りた。
+RequestToResetPasswordReceived=パスワードの変更申請を受け付けました。
 NewKeyIs=これはログインするための新規キー 
 NewKeyWillBe=ソフトウェアにログインするための新規キーは次のようになる
 ClickHereToGoTo=%sに移動するには、ここをクリックすること
@@ -257,13 +258,13 @@ YourPasswordMustHaveAtLeastXChars=パスワードには、少なくとも<strong
 YourPasswordHasBeenReset=パスワードは正常にリセットされた
 ApplicantIpAddress=申請者のIPアドレス
 SMSSentTo=SMSが%sに送信された
-MissingIds=IDがない
+MissingIds=IDが見つかりません
 ThirdPartyCreatedByEmailCollector=電子メールMSGID%sから電子メールコレクターによって作成されたサードパーティ
 ContactCreatedByEmailCollector=メールMSGID%sからメールコレクターによって作成された連絡先/アドレス
 ProjectCreatedByEmailCollector=メールMSGID%sからメールコレクターによって作成されたプロジェクト
 TicketCreatedByEmailCollector=メールMSGID%sからメールコレクターによって作成されたチケット
 OpeningHoursFormatDesc=-を使用して、営業時間と営業時間を区切る。 <br>スペースを使用してさまざまな範囲を入力する。 <br>例：8-12 14-18
-PrefixSession=セッションIDのプレフィックス
+SuffixSessionName=セッション名のサフィックス
 
 ##### Export #####
 ExportsArea=輸出地域
@@ -289,4 +290,4 @@ PopuProp=提案の人気による製品/サービス
 PopuCom=注文の人気別の製品/サービス
 ProductStatistics=製品/サービス統計
 NbOfQtyInOrders=注文数量
-SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
+SelectTheTypeOfObjectToAnalyze=オブジェクトを選択してその統計を表示する...
diff --git a/htdocs/langs/ja_JP/partnership.lang b/htdocs/langs/ja_JP/partnership.lang
index 7f747dd3139..58beb2093f4 100644
--- a/htdocs/langs/ja_JP/partnership.lang
+++ b/htdocs/langs/ja_JP/partnership.lang
@@ -16,41 +16,72 @@
 #
 # Generic
 #
-ModulePartnershipName = パートナーシップ管理
-PartnershipDescription = モジュールパートナーシップ管理
+ModulePartnershipName=パートナーシップ管理
+PartnershipDescription=モジュールパートナーシップ管理
 PartnershipDescriptionLong= モジュールパートナーシップ管理
 
+AddPartnership=パートナーシップを追加
+CancelPartnershipForExpiredMembers=パートナーシップ: サブスクリプションの有効期限が切れた会員のパートナーシップをキャンセル
+PartnershipCheckBacklink=パートナーシップ: 参照元のバックリンクを確認する
+
 #
 # Menu
 #
-NewPartnership = 新規パートナーシップ
-ListOfPartnerships = パートナーシップのリスト
+NewPartnership=新規パートナーシップ
+ListOfPartnerships=パートナーシップのリスト
 
 #
 # Admin page
 #
-PartnershipSetup = パートナーシップの設定
-PartnershipAbout = パートナーシップについて
-PartnershipAboutPage = ページについてのパートナーシップ
-
+PartnershipSetup=パートナーシップの設定
+PartnershipAbout=パートナーシップについて
+PartnershipAboutPage=ページについてのパートナーシップ
+partnershipforthirdpartyormember=パートナー ステータスは「取引先」または「会員」に設定する必要がある
+PARTNERSHIP_IS_MANAGED_FOR=パートナーシップ管理は
+PARTNERSHIP_BACKLINKS_TO_CHECK=チェックするバックリンク
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=サブスクリプションの有効期限が切れた場合にパートナーシップのステータスをキャンセルするまでの日数
+ReferingWebsiteCheck=参考ウェブサイトの確認
+ReferingWebsiteCheckDesc=パートナーが独自の ウェブサイトに ウェブサイト ドメインへのバックリンクを追加したことを確認する機能を有効にできる。
 
 #
 # Object
 #
+DeletePartnership=パートナーシップを削除する
+PartnershipDedicatedToThisThirdParty=この取引先専用のパートナーシップ
+PartnershipDedicatedToThisMember=このメンバー専用のパートナーシップ
 DatePartnershipStart=開始日
 DatePartnershipEnd=終了日
+ReasonDecline=拒絶理由
+ReasonDeclineOrCancel=断りの理由
+PartnershipAlreadyExist=パートナーシップはすでに存在する
+ManagePartnership=パートナーシップを管理する
+BacklinkNotFoundOnPartnerWebsite=パートナーのウェブサイトにバックリンクが見つからない
+ConfirmClosePartnershipAsk=このパートナーシップをキャンセルしてもよいか？
+PartnershipType=パートナーシップの種類
 
 #
 # Template Mail
 #
+SendingEmailOnPartnershipWillSoonBeCanceled=パートナーシップはまもなくキャンセルされる
+SendingEmailOnPartnershipRefused=パートナーシップは拒否された
+SendingEmailOnPartnershipAccepted=パートナーシップ受諾済
+SendingEmailOnPartnershipCanceled=パートナーシップがキャンセルされた
 
+YourPartnershipWillSoonBeCanceledTopic=パートナーシップはまもなくキャンセルされる
+YourPartnershipRefusedTopic=パートナーシップは拒否された
+YourPartnershipAcceptedTopic=パートナーシップが受け入れられた
+YourPartnershipCanceledTopic=パートナーシップがキャンセルされた
+
+YourPartnershipWillSoonBeCanceledContent=パートナーシップはまもなくキャンセルされる（バックリンクが見つからない）
+YourPartnershipRefusedContent=パートナーシップのリクエストが拒否されたことをお知らせする。
+YourPartnershipAcceptedContent=パートナーシップのリクエストが受理されたことをお知らせする。
+YourPartnershipCanceledContent=パートナーシップがキャンセルされたことをお知らせする。
 
 #
 # Status
 #
-PartnershipDraft = 下書き
-PartnershipAccepted = 承認済
-PartnershipRefused = 拒否
-PartnershipCanceled = キャンセル
-
-PartnershipManagedFor=Partners are
+PartnershipDraft=下書き
+PartnershipAccepted=承認済
+PartnershipRefused=拒否
+PartnershipCanceled=キャンセル
+PartnershipManagedFor=パートナーは
diff --git a/htdocs/langs/ja_JP/productbatch.lang b/htdocs/langs/ja_JP/productbatch.lang
index 8dc3de69bbc..feceac71405 100644
--- a/htdocs/langs/ja_JP/productbatch.lang
+++ b/htdocs/langs/ja_JP/productbatch.lang
@@ -1,11 +1,11 @@
-# ProductBATCH language file - en_US - ProductBATCH
+# ProductBATCH language file - Source file is en_US - ProductBATCH
 ManageLotSerial=ロット/シリアル 番号を使用
 ProductStatusOnBatch=はい（ロットが必要）
 ProductStatusOnSerial=はい（一意のシリアル番号が必要）
-ProductStatusNotOnBatch=いえ (ロット/シリアル 不要)
+ProductStatusNotOnBatch=いいえ (ロット/シリアル 不要)
 ProductStatusOnBatchShort=ロット
 ProductStatusOnSerialShort=シリアル
-ProductStatusNotOnBatchShort=いえ
+ProductStatusNotOnBatchShort=いいえ
 Batch=ロット/シリアル
 atleast1batchfield=賞味期限、消費期限、ロット/シリアル 番号
 batch_number=ロット/シリアル 番号
@@ -33,3 +33,13 @@ CustomMasks=製品カードにマスクを定義するオプションを追加
 LotProductTooltip=製品カードにオプションを追加して、専用のバッチ番号マスクを定義する
 SNProductTooltip=製品カードに専用のシリアル番号マスクを定義するオプションを追加する
 QtyToAddAfterBarcodeScan=スキャンされたバーコード/ロット/シリアルごとに追加する数量
+LifeTime=寿命（日数）
+EndOfLife=製品寿命
+ManufacturingDate=製造日付
+DestructionDate=破壊日
+FirstUseDate=初回使用日
+QCFrequency=品質管理頻度（日数）
+
+#Traceability - qc status
+OutOfOrder=故障中
+InWorkingOrder=正常動作中
diff --git a/htdocs/langs/ja_JP/products.lang b/htdocs/langs/ja_JP/products.lang
index 36b6f07b785..86f4f8816f2 100644
--- a/htdocs/langs/ja_JP/products.lang
+++ b/htdocs/langs/ja_JP/products.lang
@@ -13,10 +13,10 @@ Services=サービス
 Product=製品
 Service=サービス
 ProductId=製品/サービスID
-Create=作る
+Create=作成
 Reference=リファレンス
-NewProduct=新製品
-NewService=新サービス
+NewProduct=製品の新規登録
+NewService=サービスの新規登録
 ProductVatMassChange=グローバルVATアップデート
 ProductVatMassChangeDesc=このツールは、<b> <u> ALL </u></b>製品およびサービスで定義されているVAT率を更新。
 MassBarcodeInit=大量バーコード初期化
@@ -43,7 +43,7 @@ ServicesOnSaleOnly=販売のみのサービス
 ServicesOnPurchaseOnly=購入のみのサービス
 ServicesNotOnSell=非売品および非購入のサービス
 ServicesOnSellAndOnBuy=販売および購入のためのサービス
-LastModifiedProductsAndServices=Latest %s products/services which were modified
+LastModifiedProductsAndServices=変更された最新の%s製品/サービス
 LastRecordedProducts=最新の%s記録された製品
 LastRecordedServices=最新の%s記録されたサービス
 CardProduct0=製品
@@ -62,23 +62,23 @@ ProductStatusNotOnSell=非売品
 ProductStatusOnSellShort=販売用
 ProductStatusNotOnSellShort=非売品
 ProductStatusOnBuy=購入用
-ProductStatusNotOnBuy=非購入品
+ProductStatusNotOnBuy=購入不可
 ProductStatusOnBuyShort=購入用
-ProductStatusNotOnBuyShort=非購入品
+ProductStatusNotOnBuyShort=購入不可
 UpdateVAT=バットを更新する
 UpdateDefaultPrice=デフォルト価格を更新する
 UpdateLevelPrices=各レベルの価格を更新する
 AppliedPricesFrom=から適用
 SellingPrice=販売価格
-SellingPriceHT=販売価格(税込)
+SellingPriceHT=販売価格 (税抜)
 SellingPriceTTC=販売価格(税込)
 SellingMinPriceTTC=最低販売価格(税込)
-CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
+CostPriceDescription=この価格フィールド (税抜き) を使用して、自法人にかかる製品コストの平均金額を補足できる。その値は自分で計算した任意の価格、例えば、平均購入価格に平均の生産・流通コストを加えたものなど、にすることができる。
 CostPriceUsage=この値は、マージンの計算に使用できる。
 SoldAmount=販売額
 PurchasedAmount=購入金額
 NewPrice=新価格
-MinPrice=Min. selling price
+MinPrice=最小販売価格
 EditSellingPriceLabel=販売価格ラベルを編集する
 CantBeLessThanMinPrice=販売価格は、本製品(税抜き%s)に許可される最小値より小さくなることはない。あなたはあまりにも重要な割引を入力した場合にも、このメッセージが表示される。
 ContractStatusClosed=閉じた
@@ -102,7 +102,7 @@ BarCode=バーコード
 BarcodeType=バーコードの種別
 SetDefaultBarcodeType=バーコードの種別を設定。
 BarcodeValue=バーコードの値
-NoteNotVisibleOnBill=注意すること(請求書、提案...上に表示されない)
+NoteNotVisibleOnBill=備考（請求書や提案書などには表示されません）
 ServiceLimitedDuration=製品は、限られた期間を持つサービスの場合：
 FillWithLastServiceDates=最後のサービスラインの日付を入力
 MultiPricesAbility=製品/サービスごとに複数の価格セグメント(各顧客は1つの価格セグメントに含まれる)
@@ -126,13 +126,13 @@ ProductParentList=この製品をコンポーネントとして含むキット
 ErrorAssociationIsFatherOfThis=選択した製品の一つは、現在の製品を持つ親です。
 DeleteProduct=製品/サービスを削除。
 ConfirmDeleteProduct=この製品/サービスを削除してもよいか？
-ProductDeleted=データベースから削除された製品/サービス  " %s " 。
+ProductDeleted=製品/サービス「%s 」がデータベースから削除されました。
 ExportDataset_produit_1=製品
 ExportDataset_service_1=サービス
 ImportDataset_produit_1=製品
 ImportDataset_service_1=サービス
-DeleteProductLine=製品ラインを削除。
-ConfirmDeleteProductLine=この製品ラインを削除してもよいか？
+DeleteProductLine=製品の行を削除
+ConfirmDeleteProductLine=この商品の行を削除してもよろしいですか？
 ProductSpecial=特別な
 QtyMin=最小購入数量
 PriceQtyMin=価格数量最小
@@ -149,7 +149,7 @@ PredefinedProductsToPurchase=購入する事前定義された製品
 PredefinedServicesToPurchase=購入する事前定義されたサービス
 PredefinedProductsAndServicesToPurchase=購入する事前定義された製品/サービス
 NotPredefinedProducts=事前定義されていない製品/サービス
-GenerateThumb=親指を生成。
+GenerateThumb=サムネイルを生成
 ServiceNb=サービス＃%s
 ListProductServiceByPopularity=人気による製品/サービスのリスト
 ListProductByPopularity=人気順製品のリスト
@@ -157,11 +157,11 @@ ListServiceByPopularity=人気によるサービスのリスト
 Finished=工業製品
 RowMaterial=最初の材料
 ConfirmCloneProduct=製品またはサービスの複製を作成してもよいか<b>%s </b>？
-CloneContentProduct=Clone all main information of the product/service
+CloneContentProduct=製品/サービスのすべての主要な情報を複製する
 ClonePricesProduct=価格の複製
-CloneCategoriesProduct=Clone linked tags/categories
-CloneCompositionProduct=Clone virtual products/services
-CloneCombinationsProduct=Clone the product variants
+CloneCategoriesProduct=リンクされたタグ/カテゴリのクローンを作成する
+CloneCompositionProduct=仮想製品/サービスのクローンを作成する
+CloneCombinationsProduct=製品バリアントのクローンを作成する
 ProductIsUsed=本製品が使用される
 NewRefForClone=REF。新製品/サービスの
 SellingPrices=販売価格
@@ -170,23 +170,23 @@ CustomerPrices=顧客価格
 SuppliersPrices=仕入先価格
 SuppliersPricesOfProductsOrServices=(製品またはサービスの)仕入先価格
 CustomCode=税関|商品| HSコード
-CountryOrigin=Country of origin
-RegionStateOrigin=Region of origin
-StateOrigin=State|Province of origin
-Nature=Nature of product (raw/manufactured)
+CountryOrigin=原産国
+RegionStateOrigin=原産地
+StateOrigin=州|原産地
+Nature=製品の性質（生/製造）
 NatureOfProductShort=製品の性質
-NatureOfProductDesc=Raw material or manufactured product
+NatureOfProductDesc=原材料または製造製品
 ShortLabel=短縮ラベル
 Unit=単位
 p=u.
 set=セット
 se=セット
 second=秒
-s=s
+s=秒
 hour=時間
-h=h
+h=時
 day=日
-d=d
+d=日
 kilogram=キログラム
 kg=Kg
 gram=グラム
@@ -357,7 +357,7 @@ ProductAttributeValueDeleteDialog=この属性の「%s」を参照して値「%s
 ProductCombinationDeleteDialog=製品「<strong>%s</strong>」のバリアントを削除してもよいか？
 ProductCombinationAlreadyUsed=バリアントの削除中にエラーが発生した。どのオブジェクトにも使用されていないことを確認すること
 ProductCombinations=バリアント
-PropagateVariant=バリアントの伝播
+PropagateVariant=バリエーションのコピー
 HideProductCombinations=製品セレクタで製品バリアントを非表示にする
 ProductCombination=バリアント
 NewProductCombination=新規バリアント
@@ -396,3 +396,5 @@ ActionAvailableOnVariantProductOnly=製品のバリアントでのみ使用可
 ProductsPricePerCustomer=顧客あたりの製品価格
 ProductSupplierExtraFields=追加属性(サプライヤー価格)
 DeleteLinkedProduct=組み合わせにリンクされている子製品を削除
+PMPValue=加重平均価格
+PMPValueShort=WAP
diff --git a/htdocs/langs/ja_JP/projects.lang b/htdocs/langs/ja_JP/projects.lang
index e9b62cee0ab..eba41892421 100644
--- a/htdocs/langs/ja_JP/projects.lang
+++ b/htdocs/langs/ja_JP/projects.lang
@@ -10,19 +10,19 @@ PrivateProject=プロジェクトの連絡先
 ProjectsImContactFor=私が明示的に連絡を取っているプロジェクト
 AllAllowedProjects=私が読むことができるすべてのプロジェクト(私の+公開)
 AllProjects=すべてのプロジェクト
-MyProjectsDesc=This view is limited to the projects that you are a contact for
+MyProjectsDesc=このビューは、連絡先のプロジェクトに限定されている
 ProjectsPublicDesc=このビューには、読み取りを許可されているすべてのプロジェクトを紹介します。
 TasksOnProjectsPublicDesc=このビューには、読み取りが許可されているプロジェクトのすべてのタスクが表示される。
 ProjectsPublicTaskDesc=このビューには、読み取りを許可されているすべてのプロジェクトやタスクを示します。
 ProjectsDesc=このビューはすべてのプロジェクトを(あなたのユーザー権限はあなたに全てを表示する権限を付与)を提示します。
 TasksOnProjectsDesc=このビューには、すべてのプロジェクトのすべてのタスクが表示される(ユーザー権限により、すべてを表示する権限が付与される)。
-MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
+MyTasksDesc=このビューは、連絡先のプロジェクトまたはタスクに限定されている
 OnlyOpenedProject=開いているプロジェクトのみが表示される(ドラフトまたはクローズステータスのプロジェクトは表示されない)。
 ClosedProjectsAreHidden=閉じたプロジェクトは表示されない。
 TasksPublicDesc=このビューには、読み取りを許可されているすべてのプロジェクトやタスクを示します。
 TasksDesc=このビューは、すべてのプロジェクトとタスク(あなたのユーザー権限はあなたに全てを表示する権限を付与)を提示します。
 AllTaskVisibleButEditIfYouAreAssigned=資格のあるプロジェクトのすべてのタスクが表示されるが、選択したユーザーに割り当てられたタスクの時間のみを入力できる。時間を入力する必要がある場合は、タスクを割り当てる。
-OnlyYourTaskAreVisible=Only tasks assigned to you are visible. If you need to enter time on a task and if the task is not visible here, then you need to assign the task to yourself.
+OnlyYourTaskAreVisible=自分に割り当てられたタスクのみが表示される。タスクの時間を入力する必要があり、タスクがここに表示されていない場合は、タスクを自分に割り当てる必要がある。
 ImportDatasetTasks=プロジェクトのタスク
 ProjectCategories=プロジェクトタグ/カテゴリ
 NewProject=新規プロジェクト
@@ -50,8 +50,8 @@ RefTask=タスク参照符号
 LabelTask=タスクラベル
 TaskTimeSpent=タスクに費やした時間
 TaskTimeUser=ユーザー
-TaskTimeNote=注意
-TaskTimeDate=Date
+TaskTimeNote=備考
+TaskTimeDate=日付
 TasksOnOpenedProject=開いているプロジェクトのタスク
 WorkloadNotDefined=ワークロードが定義されていない
 NewTimeSpent=に費や​​された時間は
@@ -118,7 +118,7 @@ TaskHasChild=タスクには子がある
 NotOwnerOfProject=この民間プロジェクトの所有者でない
 AffectedTo=に割り当てられた
 CantRemoveProject=このプロジェクトは、他のオブジェクト(請求書、注文など)によって参照されているため、削除できません。タブ「%s」を参照すること。
-ValidateProject=挙を検証する
+ValidateProject=プロジェクトを承認する
 ConfirmValidateProject=このプロジェクトを検証してもよいか？
 CloseAProject=プロジェクトを閉じる
 ConfirmCloseAProject=このプロジェクトを終了してもよいか？
@@ -144,7 +144,7 @@ ThisWillAlsoRemoveTasks=このアクションは、プロジェクトのすべ
 IfNeedToUseOtherObjectKeepEmpty=いくつかのオブジェクト(請求書、注文、...)、別の第三者に属するが、作成するプロジェクトにリンクする必要がある場合は、複数の取引先中のプロジェクトを持っているこの空を保持します。
 CloneTasks=クローンタスク
 CloneContacts=連絡先のクローン
-CloneNotes=クローンノート
+CloneNotes=備考を複製する
 CloneProjectFiles=プロジェクトに参加したファイルのクローンを作成する
 CloneTaskFiles=ファイルを結合したタスク(s)をクローンする(タスク(s)がクローンされた場合)
 CloneMoveDate=今からプロジェクト/タスクの日付を更新するか？
@@ -187,7 +187,7 @@ DocumentModelBaleine=タスクのプロジェクトドキュメントテンプ
 DocumentModelTimeSpent=費やした時間のプロジェクトレポートテンプレート
 PlannedWorkload=計画されたワークロード
 PlannedWorkloadShort=ワークロード
-ProjectReferers=関連項目s
+ProjectReferers=関連項目
 ProjectMustBeValidatedFirst=プロジェクトを最初に検証する必要がある
 FirstAddRessourceToAllocateTime=プロジェクトの連絡先としてユーザーリソースを割り当て、時間を割り当てる
 InputPerDay=1日あたりの入力
@@ -202,7 +202,7 @@ ResourceNotAssignedToTheTask=タスクに割り当てられていない
 NoUserAssignedToTheProject=このプロジェクトに割り当てられているユーザーはない
 TimeSpentBy=によって費やされた時間
 TasksAssignedTo=に割り当てられたタスク
-AssignTaskToMe=Assign task to myself
+AssignTaskToMe=自分にタスクを割り当てる
 AssignTaskToUser=タスクを%sに割り当てる
 SelectTaskToAssign=割り当てるタスクを選択すること...
 AssignTask=割当
@@ -267,9 +267,11 @@ InvoiceToUse=使用する請求書のドラフト
 NewInvoice=新規請求書
 OneLinePerTask=タスクごとに1行
 OneLinePerPeriod=期間ごとに1行
+OneLinePerTimeSpentLine=宣言に費やされた時間ごとに1行
 RefTaskParent=参照符号親タスク
 ProfitIsCalculatedWith=利益は以下を使用して計算される
 AddPersonToTask=タスクにも追加
 UsageOrganizeEvent=使用法：イベント組織
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=すべてのタスクが完了したら、プロジェクトをクローズとして分類する（100%%の進行状況）
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=注：100%%の進行状況にあるすべてのタスクを持つ既存のプロジェクトは影響を受けない。手動で閉じる必要があります。このオプションは、開いているプロジェクトにのみ影響する。
+SelectLinesOfTimeSpentToInvoice=請求されていない時間の行を選択し、「請求書の生成」を一括して請求する
diff --git a/htdocs/langs/ja_JP/receptions.lang b/htdocs/langs/ja_JP/receptions.lang
index e4fdf3eb37a..3e38aec2743 100644
--- a/htdocs/langs/ja_JP/receptions.lang
+++ b/htdocs/langs/ja_JP/receptions.lang
@@ -44,4 +44,4 @@ ValidateOrderFirstBeforeReception=受付を行う前に、まず注文を確認
 ReceptionsNumberingModules=受付のナンバリングモジュール
 ReceptionsReceiptModel=受付のドキュメントテンプレート
 NoMorePredefinedProductToDispatch=ディスパッチする事前定義された製品はもうない
-
+ReceptionExist=レセプションがある
diff --git a/htdocs/langs/ja_JP/sendings.lang b/htdocs/langs/ja_JP/sendings.lang
index 310d3eff816..692812cfd6e 100644
--- a/htdocs/langs/ja_JP/sendings.lang
+++ b/htdocs/langs/ja_JP/sendings.lang
@@ -43,7 +43,7 @@ ConfirmValidateSending=この出荷を参照<b>%s </b>で検査してもよい
 ConfirmCancelSending=この出荷をキャンセルしてもよいか？
 DocumentModelMerou=メロウA5モデル
 WarningNoQtyLeftToSend=警告、出荷待ちの製品はない。
-StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
+StatsOnShipmentsOnlyValidated=統計は、検証済みの出荷のみを対象としている。使用日は出荷の検証日（配達予定日は常にわかっているわけではない）
 DateDeliveryPlanned=配達予定日
 RefDeliveryReceipt=参照納品書
 StatusReceipt=ステータス納品書
diff --git a/htdocs/langs/ja_JP/stocks.lang b/htdocs/langs/ja_JP/stocks.lang
index 5c123dda1c0..96bb184fe6f 100644
--- a/htdocs/langs/ja_JP/stocks.lang
+++ b/htdocs/langs/ja_JP/stocks.lang
@@ -56,8 +56,6 @@ UnitPurchaseValue=購入単価
 StockTooLow=低すぎる在庫
 StockLowerThanLimit=在庫がアラート制限を下回っている(%s)
 EnhancedValue=値
-PMPValue=加重平均価格
-PMPValueShort=WAP
 EnhancedValueOfWarehouses=倉庫の値
 UserWarehouseAutoCreate=ユーザーの作成時にユーザー倉庫を自動的に作成する
 AllowAddLimitStockByWarehouse=製品ごとの最小在庫と希望在庫の値に加えて、ペアリングごとの最小在庫と希望在庫の値(製品倉庫)も管理する。
@@ -91,7 +89,7 @@ NoPredefinedProductToDispatch=このオブジェクト用に事前定義され
 DispatchVerb=派遣
 StockLimitShort=アラートの制限
 StockLimit=アラートの在庫制限
-StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
+StockLimitDesc=（空）は警告がないことを意味する。 <br> 0を使用すると、在庫が空になるとすぐに警告をトリガーできる。
 PhysicalStock=現物在庫
 RealStock=実在庫
 RealStockDesc=現物/実在庫は、現在倉庫にある在庫 。
@@ -158,7 +156,7 @@ StockMustBeEnoughForShipment= 在庫レベルは、製品/サービスを出荷
 MovementLabel=動きのラベル
 TypeMovement=移動方向
 DateMovement=移動日
-InventoryCode=移動または在庫コード
+InventoryCode=移動または目録コード
 IsInPackage=パッケージに含まれている
 WarehouseAllowNegativeTransfer=在庫はマイナスになる可能性がある
 qtyToTranferIsNotEnough=ソース倉庫からの十分な在庫がなく、セットアップで負の在庫が許可されていない。
@@ -178,32 +176,32 @@ ProductStockWarehouseUpdated=アラートの在庫制限と希望する最適在
 ProductStockWarehouseDeleted=アラートの在庫制限と希望する最適在庫が正しく削除された
 AddNewProductStockWarehouse=アラートと望ましい最適在庫の新規制限を設定する
 AddStockLocationLine=数量を減らしてから、クリックしてこの製品の別の倉庫を追加する
-InventoryDate=在庫日
-NewInventory=新規在庫
-inventorySetup = 在庫設定
-inventoryCreatePermission=新規在庫を作成する
+InventoryDate=目録日付
+NewInventory=新規目録
+inventorySetup = 目録設定
+inventoryCreatePermission=新規目録を作成する
 inventoryReadPermission=在庫を見る
 inventoryWritePermission=在庫を更新する
-inventoryValidatePermission=在庫を検証する
-inventoryDeletePermission=在庫目録を削除
-inventoryTitle=在庫
+inventoryValidatePermission=目録を検証する
+inventoryDeletePermission=目録を削除
+inventoryTitle=目録
 inventoryListTitle=在庫
-inventoryListEmpty=進行中の在庫はない
-inventoryCreateDelete=インベントリの作成/削除
+inventoryListEmpty=進行中の目録はない
+inventoryCreateDelete=目録の作成/削除
 inventoryCreate=新規作成
 inventoryEdit=編集
 inventoryValidate=検証
 inventoryDraft=ランニング
 inventorySelectWarehouse=倉庫の選択
 inventoryConfirmCreate=作成
-inventoryOfWarehouse=倉庫の在庫：%s
+inventoryOfWarehouse=倉庫の目録：%s
 inventoryErrorQtyAdd=エラー：1つの数量がゼロ未満 
-inventoryMvtStock=在庫別
+inventoryMvtStock=目録別
 inventoryWarningProductAlreadyExists=この製品はすでにリストに含まれている
 SelectCategory=カテゴリフィルタ
 SelectFournisseur=仕入先フィルタ
-inventoryOnDate=在庫
-INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=在庫移動には、(在庫検証の日付ではなく)在庫の日付がある。
+inventoryOnDate=目録
+INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=在庫移動には、(目録検証の日付ではなく) 目録の日付を付ける。
 inventoryChangePMPPermission=製品のPMP値の変更を許可する
 ColumnNewPMP=新規ユニットPMP
 OnlyProdsInStock=在庫のない製品は追加しないこと
@@ -215,12 +213,12 @@ RecordedQty=記録された数量
 RealQty=実数量
 RealValue=真の価値
 RegulatedQty=規制数量
-AddInventoryProduct=製品を在庫に追加する
+AddInventoryProduct=製品を目録に追加する
 AddProduct=加える
 ApplyPMP=PMPを適用する
-FlushInventory=在庫をフラッシュする
+FlushInventory=目録をフラッシュする
 ConfirmFlushInventory=このアクションを確認するか？
-InventoryFlushed=在庫がフラッシュされた
+InventoryFlushed=目録がフラッシュされた
 ExitEditMode=終了版
 inventoryDeleteLine=行を削除する
 RegulateStock=在庫を調整する
@@ -232,8 +230,8 @@ StockIncreaseAfterCorrectTransfer=修正/移転による増加
 StockDecreaseAfterCorrectTransfer=修正/移転による減少
 StockIncrease=在庫増加
 StockDecrease=在庫減少
-InventoryForASpecificWarehouse=特定の倉庫の在庫
-InventoryForASpecificProduct=特定の製品の在庫
+InventoryForASpecificWarehouse=特定の倉庫の目録
+InventoryForASpecificProduct=特定の製品の目録
 StockIsRequiredToChooseWhichLotToUse=使用するロットを選択するには在庫が必要 
 ForceTo=強制する
 AlwaysShowFullArbo=倉庫リンクのポップアップに倉庫の完全なツリーを表示する(警告：これによりパフォーマンスが大幅に低下する可能性がある)
@@ -249,9 +247,12 @@ ImportFromCSV=移動のCSVリストをインポート
 ChooseFileToImport=ファイルをアップロードし、%sアイコンをクリックして、ソースインポートファイルとしてファイルを選択する。
 SelectAStockMovementFileToImport=インポートする在庫品移動ファイルを選択
 InfoTemplateImport=アップロードされたファイルは次の形式が必要 (*は必須フィールド)：<br> 元倉庫* | 先倉庫* | 製品* | 数量* | ロット/シリアル番号<br>CSV文字区切は「<b>%s</b>」であること
-LabelOfInventoryMovemement=在庫目録%s
+LabelOfInventoryMovemement=目録%s
 ReOpen=再開 
-ConfirmFinish=在庫の閉鎖を確認するか？これにより、在庫を更新するためのすべての在庫移動が生成される。
+ConfirmFinish=目録の閉鎖を確定するか？これにより、すべての在庫移動が生成され、目録に入力した実数量で在庫が更新される。
 ObjectNotFound=%sが見つからない
 MakeMovementsAndClose=移動を生成して閉じる
 AutofillWithExpected=実際の数量を予想数量で埋める
+ShowAllBatchByDefault=デフォルトでは、製品の「在庫」タブにバッチの詳細を表示する
+CollapseBatchDetailHelp=在庫モジュール構成でバッチ詳細のデフォルト表示を設定できる
+FieldCannotBeNegative=フィールド "%s" は負の値にはできない
diff --git a/htdocs/langs/ja_JP/ticket.lang b/htdocs/langs/ja_JP/ticket.lang
index 1730e1d0e0e..ac4a6290b3f 100644
--- a/htdocs/langs/ja_JP/ticket.lang
+++ b/htdocs/langs/ja_JP/ticket.lang
@@ -304,7 +304,7 @@ BoxLastModifiedTicket=最新の変更されたチケット
 BoxLastModifiedTicketDescription=最新の%s変更チケット
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=最近変更されたチケットはない
-BoxTicketType=タイプ別のオープンチケットの数
+BoxTicketType=オープンチケットの種類別分布
 BoxTicketSeverity=重大度別のオープンチケットの数
 BoxNoTicketSeverity=開いているチケットなし
 BoxTicketLastXDays=過去%s日ごとの新規チケットの数
diff --git a/htdocs/langs/ja_JP/users.lang b/htdocs/langs/ja_JP/users.lang
index 9df51f63327..a6c0870ebff 100644
--- a/htdocs/langs/ja_JP/users.lang
+++ b/htdocs/langs/ja_JP/users.lang
@@ -12,7 +12,7 @@ PasswordChangedTo=%s：パスワードに変更
 SubjectNewPassword=%sの新規パスワード
 GroupRights=グループのパーミッション
 UserRights=ユーザ権限
-Credentials=Credentials
+Credentials=資格情報
 UserGUISetup=ユーザディスプレイの設定
 DisableUser=無効にする
 DisableAUser=ユーザを無効にする
@@ -106,7 +106,7 @@ UseTypeFieldToChange=フィールドタイプを使用して変更
 OpenIDURL=OpenID URL
 LoginUsingOpenID=OpenIDを使用してログインする
 WeeklyHours=労働時間(週あたり)
-ExpectedWorkedHours=Expected hours worked per week
+ExpectedWorkedHours=週あたりの予想労働時間
 ColorUser=ユーザの色
 DisabledInMonoUserMode=メンテナンスモードでは無効
 UserAccountancyCode=ユーザアカウンティングコード
@@ -116,7 +116,7 @@ DateOfEmployment=雇用日
 DateEmployment=雇用
 DateEmploymentstart=雇用開始日
 DateEmploymentEnd=雇用終了日
-RangeOfLoginValidity=Access validity date range
+RangeOfLoginValidity=アクセス有効期間
 CantDisableYourself=自分のユーザレコードを無効にすることはできません
 ForceUserExpenseValidator=経費報告書検証ツールを強制する
 ForceUserHolidayValidator=強制休暇リクエストバリデーター
diff --git a/htdocs/langs/ja_JP/website.lang b/htdocs/langs/ja_JP/website.lang
index 27a0ef7bef6..046ddf3315c 100644
--- a/htdocs/langs/ja_JP/website.lang
+++ b/htdocs/langs/ja_JP/website.lang
@@ -140,7 +140,7 @@ DefineListOfAltLanguagesInWebsiteProperties=使用可能なすべての言語の
 GenerateSitemaps=ウェブサイトサイトマップファイルを生成する
 ConfirmGenerateSitemaps=確定すると、既存のサイトマップファイルが消去される...
 ConfirmSitemapsCreation=サイトマップの生成を確認する
-SitemapGenerated=Sitemap file <b>%s</b> generated
+SitemapGenerated=サイトマップファイル<b>%s</b>が生成された
 ImportFavicon=ファビコン
 ErrorFaviconType=ファビコンはpngを必要とする
 ErrorFaviconSize=ファビコンのサイズは16x16、32x32、または64x64であること
diff --git a/htdocs/langs/ka_GE/accountancy.lang b/htdocs/langs/ka_GE/accountancy.lang
index 354cddb62c2..27be673dd9c 100644
--- a/htdocs/langs/ka_GE/accountancy.lang
+++ b/htdocs/langs/ka_GE/accountancy.lang
@@ -158,7 +158,7 @@ ACCOUNTING_LENGTH_AACCOUNT=Length of the third-party accounting accounts (If you
 ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of an accounting account. Needed by some countries (like Switzerland). If set to off (default), you can set the following two parameters to ask the application to add virtual zeros.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties, break ability to search on a part of value)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
@@ -328,6 +328,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountanc
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
+NotifiedExportDate=Notified export date (modification of the entries will not be possible)
+NotifiedValidationDate=Validation of the entries (modification or deletion of the entries will not be possible)
+ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=Export draft journal
 Modelcsv=Model of export
 Selectmodelcsv=Select a model of export
diff --git a/htdocs/langs/ka_GE/admin.lang b/htdocs/langs/ka_GE/admin.lang
index fb4513a09b4..be9aca94599 100644
--- a/htdocs/langs/ka_GE/admin.lang
+++ b/htdocs/langs/ka_GE/admin.lang
@@ -221,8 +221,8 @@ NotCompatible=This module does not seem compatible with your Dolibarr %s (Min %s
 CompatibleAfterUpdate=This module requires an update to your Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=See in Market place
 SeeSetupOfModule=See setup of module %s
+SetOptionTo=Set option <b>%s</b> to %s
 Updated=Updated
-Nouveauté=Novelty
 AchatTelechargement=Buy / Download
 GoModuleSetupArea=To deploy/install a new module, go to the Module setup area: <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
@@ -399,6 +399,7 @@ SecurityToken=Key to secure URLs
 NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
 PDF=PDF
 PDFDesc=Global options for PDF generation
+PDFOtherDesc=PDF Option specific to some modules
 PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
 PDFRulesForSalesTax=Rules for Sales Tax / VAT
@@ -561,7 +562,7 @@ Module53Desc=Management of Services
 Module54Name=Contracts/Subscriptions
 Module54Desc=Management of contracts (services or recurring subscriptions)
 Module55Name=Barcodes
-Module55Desc=Barcode management
+Module55Desc=Barcode or QR code management
 Module56Name=Payment by credit transfer
 Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
 Module57Name=Payments by Direct Debit
@@ -848,10 +849,10 @@ Permission402=Create/modify discounts
 Permission403=Validate discounts
 Permission404=Delete discounts
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries (yours and subordinates)
-Permission512=Create/modify payments of salaries
-Permission514=Delete payments of salaries
-Permission517=Read payments of salaries of everybody
+Permission511=Read salaries and payments (yours and subordinates)
+Permission512=Create/modify salaries and payments
+Permission514=Delete salaries and payments
+Permission517=Read salaries and payments everybody
 Permission519=Export salaries
 Permission520=Read Loans
 Permission522=Create/modify loans
@@ -965,6 +966,8 @@ Permission23003=Delete Scheduled job
 Permission23004=Execute Scheduled job
 Permission50101=Use Point of Sale (SimplePOS)
 Permission50151=Use Point of Sale (TakePOS)
+Permission50152=Edit sales lines
+Permission50153=Edit ordered sales lines
 Permission50201=Read transactions
 Permission50202=Import transactions
 Permission50330=Read objects of Zapier
@@ -1039,11 +1042,12 @@ DictionaryMeasuringUnits=Measuring Units
 DictionarySocialNetworks=Social Networks
 DictionaryProspectStatus=Prospect status for companies
 DictionaryProspectContactStatus=Prospect status for contacts
-DictionaryHolidayTypes=Types of leave
+DictionaryHolidayTypes=Leave - Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
 DictionaryTransportMode=Intracomm report - Transport mode
+DictionaryBatchStatus=Product lot/serial Quality Control status
 TypeOfUnit=Type of unit
 SetupSaved=Setup saved
 SetupNotSaved=Setup not saved
@@ -1187,7 +1191,7 @@ SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of m
 SetupDescription5=Other Setup menu entries manage optional parameters.
 AuditedSecurityEvents=Security events that are audited
 NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
-Audit=Audit
+Audit=Security events
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
 InfoOS=About OS
@@ -1319,9 +1323,12 @@ ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
 NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
+ComboListOptim=Combo list loading optimization
 SearchOptim=Search optimization
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
-YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
+YouHaveXObjectUseComboOptim=You have %s %s in the database. You can go into setup of module to enable loading of combo list on key pressed event.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other.
+YouHaveXObjectUseSearchOptimDesc=This limits the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to %s in Home-Setup-Other.
 BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
 BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
 PHPModuleLoaded=PHP component %s is loaded
@@ -1433,6 +1440,7 @@ MemberMainOptions=Main options
 AdherentLoginRequired= Manage a Login for each member
 AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
+MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
 MembersDocModules=Document templates for documents generated from member record
@@ -1763,7 +1771,7 @@ AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting men
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
-AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the scheduled job %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
@@ -1979,6 +1987,8 @@ 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_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add picture on proposal line
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add electronic sign in PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
@@ -2096,7 +2106,6 @@ PDF_SHOW_PROJECT=Show project on document
 ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
-FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
@@ -2120,12 +2129,18 @@ ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by
 MailToSendEventOrganization=Event Organization
 AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
 YouShouldDisablePHPFunctions=You should disable PHP functions
-IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands in custom code, you shoud disable PHP functions
+PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
+NotRecommended=Not recommanded
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
 ModuleUpdateAvailable=An update is available
 NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
+RandomlySelectedIfSeveral=Randomly selected if several pictures are available
+DatabasePasswordObfuscated=Database password is obfuscated in conf file
+DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
diff --git a/htdocs/langs/ka_GE/agenda.lang b/htdocs/langs/ka_GE/agenda.lang
index 09d82139a49..a1183841b00 100644
--- a/htdocs/langs/ka_GE/agenda.lang
+++ b/htdocs/langs/ka_GE/agenda.lang
@@ -4,7 +4,7 @@ Actions=Events
 Agenda=Agenda
 TMenuAgenda=Agenda
 Agendas=Agendas
-LocalAgenda=Internal calendar
+LocalAgenda=Default calendar
 ActionsOwnedBy=Event owned by
 ActionsOwnedByShort=Owner
 AffectedTo=Assigned to
@@ -14,13 +14,13 @@ EventsNb=Number of events
 ListOfActions=List of events
 EventReports=Event reports
 Location=Location
-ToUserOfGroup=Event assigned to any user in group
+ToUserOfGroup=Event assigned to any user in the group
 EventOnFullDay=Event on all day(s)
 MenuToDoActions=All incomplete events
 MenuDoneActions=All terminated events
 MenuToDoMyActions=My incomplete events
 MenuDoneMyActions=My terminated events
-ListOfEvents=List of events (internal calendar)
+ListOfEvents=List of events (default calendar)
 ActionsAskedBy=Events reported by
 ActionsToDoBy=Events assigned to
 ActionsDoneBy=Events done by
@@ -38,6 +38,7 @@ ActionsEvents=Events for which Dolibarr will create an action in agenda automati
 EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Third party %s created
+COMPANY_MODIFYInDolibarr=Third party %s modified
 COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=Contract %s validated
 CONTRACT_DELETEInDolibarr=Contract %s deleted
@@ -87,6 +88,7 @@ OrderDeleted=Order deleted
 InvoiceDeleted=Invoice deleted
 DraftInvoiceDeleted=Draft invoice deleted
 CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_MODIFYInDolibarr=Contact %s modified
 CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Product %s created
 PRODUCT_MODIFYInDolibarr=Product %s modified
@@ -119,6 +121,7 @@ MRP_MO_UNVALIDATEInDolibarr=MO set to draft status
 MRP_MO_PRODUCEDInDolibarr=MO produced
 MRP_MO_DELETEInDolibarr=MO deleted
 MRP_MO_CANCELInDolibarr=MO canceled
+PAIDInDolibarr=%s paid
 ##### End agenda events #####
 AgendaModelModule=Document templates for event
 DateActionStart=Start date
@@ -130,7 +133,7 @@ AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to use
 AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
 AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic events.
 AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> to include events of holidays.
-AgendaShowBirthdayEvents=Show birthdays of contacts
+AgendaShowBirthdayEvents=Birthdays of contacts
 AgendaHideBirthdayEvents=Hide birthdays of contacts
 Busy=Busy
 ExportDataset_event1=List of agenda events
@@ -152,6 +155,7 @@ ActionType=Event type
 DateActionBegin=Start event date
 ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b>?
 RepeatEvent=Repeat event
+OnceOnly=Once only
 EveryWeek=Every week
 EveryMonth=Every month
 DayOfMonth=Day of month
@@ -165,4 +169,4 @@ TimeType=Duration type
 ReminderType=Callback type
 AddReminder=Create an automatic reminder notification for this event
 ErrorReminderActionCommCreation=Error creating the reminder notification for this event
-BrowserPush=Browser Notification
+BrowserPush=Browser Popup Notification
diff --git a/htdocs/langs/ka_GE/bills.lang b/htdocs/langs/ka_GE/bills.lang
index c55f483873b..7b8c997d2e6 100644
--- a/htdocs/langs/ka_GE/bills.lang
+++ b/htdocs/langs/ka_GE/bills.lang
@@ -259,6 +259,7 @@ DateMaxPayment=Payment due on
 DateInvoice=Invoice date
 DatePointOfTax=Point of tax
 NoInvoice=No invoice
+NoOpenInvoice=No open invoice
 ClassifyBill=Classify invoice
 SupplierBillsToPay=Unpaid vendor invoices
 CustomerBillsUnpaid=Unpaid customer invoices
@@ -589,3 +590,4 @@ FacParentLine=Invoice Line Parent
 SituationTotalRayToRest=Remainder to pay without taxe
 PDFSituationTitle=Situation n° %d
 SituationTotalProgress=Total progress %d %%
+SearchUnpaidInvoicesWithDueDate=Search unpaid invoices with a due date = %s
diff --git a/htdocs/langs/ka_GE/cashdesk.lang b/htdocs/langs/ka_GE/cashdesk.lang
index 240503842f3..aea1f02f834 100644
--- a/htdocs/langs/ka_GE/cashdesk.lang
+++ b/htdocs/langs/ka_GE/cashdesk.lang
@@ -102,7 +102,7 @@ CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal numb
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
 SaleStartedAt=Sale started at %s
-ControlCashOpening=Control cash popup at opening POS
+ControlCashOpening=Open the "Control cash" popup when opening the POS
 CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -126,5 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
-ShowPriceHT = Display the price excluding tax column
-ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
+ShowPriceHT = Display the column with the price excluding tax (on screen)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
diff --git a/htdocs/langs/ka_GE/compta.lang b/htdocs/langs/ka_GE/compta.lang
index 7cae82e6ac7..8329346c163 100644
--- a/htdocs/langs/ka_GE/compta.lang
+++ b/htdocs/langs/ka_GE/compta.lang
@@ -286,3 +286,9 @@ ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
 IncludeLoansInResults = Include loans in reports
+InvoiceLate30Days = Invoices late > 30 days
+InvoiceLate15Days = Invoices late > 15 days
+InvoiceLateMinus15Days = Invoices late
+InvoiceNotLate = To be collected < 15 days
+InvoiceNotLate15Days = To be collected in 15 days
+InvoiceNotLate30Days = To be collected in 30 days
diff --git a/htdocs/langs/ka_GE/cron.lang b/htdocs/langs/ka_GE/cron.lang
index 2ebdda1e685..4fd2220dea6 100644
--- a/htdocs/langs/ka_GE/cron.lang
+++ b/htdocs/langs/ka_GE/cron.lang
@@ -60,7 +60,7 @@ CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
 CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Disable
-CronTaskInactive=This job is disabled
+CronTaskInactive=This job is disabled (not scheduled)
 CronId=Id
 CronClassFile=Filename with class
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example 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>
diff --git a/htdocs/langs/ka_GE/errors.lang b/htdocs/langs/ka_GE/errors.lang
index 9b14b5ad1d2..670f8c7a6bc 100644
--- a/htdocs/langs/ka_GE/errors.lang
+++ b/htdocs/langs/ka_GE/errors.lang
@@ -11,6 +11,7 @@ ErrorBadValueForParamNotAString=Bad value for your parameter. It appends general
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s already exists.
 ErrorGroupAlreadyExists=Group %s already exists.
+ErrorEmailAlreadyExists=Email %s already exists.
 ErrorRecordNotFound=Record not found.
 ErrorFailToCopyFile=Failed to copy file '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
@@ -117,7 +118,7 @@ ErrorCantReadFile=Failed to read file '%s'
 ErrorCantReadDir=Failed to read directory '%s'
 ErrorBadLoginPassword=Bad value for login or password
 ErrorLoginDisabled=Your account has been disabled
-ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server. If PHP <b>Safe Mode</b> is enabled, check that command is inside a directory defined by parameter <b>safe_mode_exec_dir</b>.
+ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server user. Check also the command is not protected on shell level by a security layer like apparmor.
 ErrorFailedToChangePassword=Failed to change password
 ErrorLoginDoesNotExists=User with login <b>%s</b> could not be found.
 ErrorLoginHasNoEmail=This user has no email address. Process aborted.
@@ -262,6 +263,7 @@ ErrorDateIsInFuture=Error, the date can't be in the future
 ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
 ErrorAPercentIsRequired=Error, please fill in the percentage correctly
 ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
+ErrorFailedToFindEmailTemplate=Failed to find template with code name %s
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -298,3 +300,4 @@ WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So y
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
+ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
diff --git a/htdocs/langs/ka_GE/eventorganization.lang b/htdocs/langs/ka_GE/eventorganization.lang
index 75b798fbc3a..335c257b224 100644
--- a/htdocs/langs/ka_GE/eventorganization.lang
+++ b/htdocs/langs/ka_GE/eventorganization.lang
@@ -1,4 +1,5 @@
 # Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+# Copyright (C) 2021		Dorian Vabre			<dorian.vabre@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
@@ -81,7 +82,10 @@ PriceOfBoothHelp=Subscription price to stand a booth
 EventOrganizationICSLink=Link ICS for events
 ConferenceOrBoothInformation=Conference Or Booth informations
 Attendees = Attendees
+DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
 #
 # Status
 #
@@ -94,8 +98,46 @@ EvntOrgCancelled = Cancelled
 #
 # Public page
 #
+SuggestForm = Suggestion page
+RegisterPage = Page for conferences or booth
+EvntOrgRegistrationHelpMessage = Here, you can vote for an event, or suggest a new conference or booth for the project
+EvntOrgRegistrationConfHelpMessage = Here, you can suggest a new conference for the project
+EvntOrgRegistrationBoothHelpMessage = Here, you can suggest a new booth for the project
+ListOfSuggestedConferences = List of suggested conferences
+ListOfSuggestedBooths = List of suggested booths
+SuggestConference = Suggest a new conference
+SuggestBooth = Suggest a booth
+ViewAndVote = View and vote for suggested events
 PublicAttendeeSubscriptionPage = Public link of registration to a conference
 MissingOrBadSecureKey = The security key is invalid or missing
-EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
-EvntOrgStartDuration = This conference starts on
-EvntOrgEndDuration =  and ends on
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference : '%s'
+EvntOrgDuration = This conference starts on %s and ends on %s.
+ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
+BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
+EventType = Event type
+
+#
+# Vote page
+#
+EvntOrgRegistrationWelcomeMessage = Welcome on the conference or booth suggestion page.
+EvntOrgRegistrationConfWelcomeMessage = Welcome on the conference suggestion page.
+EvntOrgRegistrationBoothWelcomeMessage = Welcome on the booth suggestion page.
+EvntOrgVoteHelpMessage = Here, you can view and vote for the suggested events for the project
+VoteOk = Your vote has been accepted.
+AlreadyVoted = You have already voted for this event.
+VoteError = An error has occurred during the vote, please try again.
+
+#
+# SubscriptionOk page
+#
+SubscriptionOk = Your subscription to this conference has been validated
+#
+# Subscription validation mail
+#
+ConfAttendeeSubscriptionConfirmation = Confirmation of your subscription to a conference
+#
+# Payment page
+#
+Attendee = Attendee
+PaymentConferenceAttendee = Conference attendee payment
+PaymentBoothLocation = Booth location payment
diff --git a/htdocs/langs/ka_GE/hrm.lang b/htdocs/langs/ka_GE/hrm.lang
index 3b8f137e103..da098e10bdb 100644
--- a/htdocs/langs/ka_GE/hrm.lang
+++ b/htdocs/langs/ka_GE/hrm.lang
@@ -9,7 +9,7 @@ ConfirmDeleteEstablishment=Are you sure you wish to delete this establishment?
 OpenEtablishment=Open establishment
 CloseEtablishment=Close establishment
 # Dictionary
-DictionaryPublicHolidays=HRM - Public holidays
+DictionaryPublicHolidays=Leave - Public holidays
 DictionaryDepartment=HRM - Department list
 DictionaryFunction=HRM - Job positions
 # Module
diff --git a/htdocs/langs/ka_GE/knowledgemanagement.lang b/htdocs/langs/ka_GE/knowledgemanagement.lang
index 269007e60f8..68f5cced76c 100644
--- a/htdocs/langs/ka_GE/knowledgemanagement.lang
+++ b/htdocs/langs/ka_GE/knowledgemanagement.lang
@@ -47,7 +47,7 @@ KnowledgeManagementArea = Knowledge Management
 # Menu
 #
 MenuKnowledgeRecord = Knowledge base
-ListOfArticles = List of articles
+ListKnowledgeRecord = List of articles
 NewKnowledgeRecord = New article
 ValidateReply = Validate solution
 KnowledgeRecords = Articles
diff --git a/htdocs/langs/ka_GE/languages.lang b/htdocs/langs/ka_GE/languages.lang
index ba187326705..da8ad5376a1 100644
--- a/htdocs/langs/ka_GE/languages.lang
+++ b/htdocs/langs/ka_GE/languages.lang
@@ -3,6 +3,7 @@ Language_am_ET=Ethiopian
 Language_ar_AR=Arabic
 Language_ar_EG=Arabic (Egypt)
 Language_ar_SA=Arabic
+Language_ar_TN=Arabic (Tunisia)
 Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengali
 Language_bn_IN=Bengali (India)
@@ -84,6 +85,7 @@ Language_nl_NL=Dutch
 Language_pl_PL=Polish
 Language_pt_BR=Portuguese (Brazil)
 Language_pt_PT=Portuguese
+Language_ro_MD=Romanian (Moldavia)
 Language_ro_RO=Romanian
 Language_ru_RU=Russian
 Language_ru_UA=Russian (Ukraine)
diff --git a/htdocs/langs/ka_GE/main.lang b/htdocs/langs/ka_GE/main.lang
index 13793aad13f..863b94af564 100644
--- a/htdocs/langs/ka_GE/main.lang
+++ b/htdocs/langs/ka_GE/main.lang
@@ -430,6 +430,7 @@ LT1IN=CGST
 LT2IN=SGST
 LT1GC=Additionnal cents
 VATRate=Tax Rate
+RateOfTaxN=Rate of tax %s
 VATCode=Tax Rate code
 VATNPR=Tax Rate NPR
 DefaultTaxRate=Default tax rate
@@ -729,6 +730,7 @@ MenuMembers=Members
 MenuAgendaGoogle=Google agenda
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
+ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
 NoFileFound=No documents uploaded
 CurrentUserLanguage=Current language
 CurrentTheme=Current theme
@@ -1072,6 +1074,7 @@ ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
 ToClose=To close
+ToRefuse=To refuse
 ToProcess=To process
 ToApprove=To approve
 GlobalOpenedElemView=Global view
@@ -1126,9 +1129,11 @@ UpdateForAllLines=Update for all lines
 OnHold=On hold
 Civility=Civility
 AffectTag=Affect Tag
+CreateExternalUser=Create external user
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
 ConfirmCancel=Are you sure you want to cancel
+EmailMsgID=Email MsgID
diff --git a/htdocs/langs/ka_GE/members.lang b/htdocs/langs/ka_GE/members.lang
index 042b85598c0..d8b9c2f59f3 100644
--- a/htdocs/langs/ka_GE/members.lang
+++ b/htdocs/langs/ka_GE/members.lang
@@ -213,3 +213,5 @@ SendReminderForExpiredSubscription=Send reminder by email to members when subscr
 MembershipPaid=Membership paid for current period (until %s)
 YouMayFindYourInvoiceInThisEmail=You may find your invoice attached to this email
 XMembersClosed=%s member(s) closed
+XExternalUserCreated=%s external user(s) created
+ForceMemberNature=Force member nature (Individual or Corporation)
diff --git a/htdocs/langs/ka_GE/modulebuilder.lang b/htdocs/langs/ka_GE/modulebuilder.lang
index 9fdaa1a533a..23a098be2e5 100644
--- a/htdocs/langs/ka_GE/modulebuilder.lang
+++ b/htdocs/langs/ka_GE/modulebuilder.lang
@@ -143,3 +143,4 @@ AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
 ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
+ImportExportProfiles=Import and export profiles
diff --git a/htdocs/langs/ka_GE/mrp.lang b/htdocs/langs/ka_GE/mrp.lang
index ec999a473a4..2414a92cefb 100644
--- a/htdocs/langs/ka_GE/mrp.lang
+++ b/htdocs/langs/ka_GE/mrp.lang
@@ -8,12 +8,12 @@ MenuBOM=Bills of material
 LatestBOMModified=Latest %s Bills of materials modified
 LatestMOModified=Latest %s Manufacturing Orders modified
 Bom=Bills of Material
-BillOfMaterials=Bill of Material
+BillOfMaterials=Bill of Materials
 BOMsSetup=Setup of module BOM
 ListOfBOMs=List of bills of material - BOM
 ListOfManufacturingOrders=List of Manufacturing Orders
-NewBOM=New bill of material
-ProductBOMHelp=Product to create with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
+NewBOM=New bill of materials
+ProductBOMHelp=Product to create (or disassemble) with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
 BOMsNumberingModules=BOM numbering templates
 BOMsModelModule=BOM document templates
 MOsNumberingModules=MO numbering templates
@@ -22,7 +22,7 @@ FreeLegalTextOnBOMs=Free text on document of BOM
 WatermarkOnDraftBOMs=Watermark on draft BOM
 FreeLegalTextOnMOs=Free text on document of MO
 WatermarkOnDraftMOs=Watermark on draft MO
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials %s ?
 ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
 ManufacturingEfficiency=Manufacturing efficiency
 ConsumptionEfficiency=Consumption efficiency
@@ -30,8 +30,8 @@ ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the produc
 ValueOfMeansLossForProductProduced=Value of 0.95 means an average of 5%% of loss of produced product
 DeleteBillOfMaterials=Delete Bill Of Materials
 DeleteMo=Delete Manufacturing Order
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Materials?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Materials?
 MenuMRP=Manufacturing Orders
 NewMO=New Manufacturing Order
 QtyToProduce=Qty to produce
@@ -39,7 +39,7 @@ DateStartPlannedMo=Date start planned
 DateEndPlannedMo=Date end planned
 KeepEmptyForAsap=Empty means 'As Soon As Possible'
 EstimatedDuration=Estimated duration
-EstimatedDurationDesc=Estimated duration to manufacture this product using this BOM
+EstimatedDurationDesc=Estimated duration to manufacture (or disassemble) this product using this BOM
 ConfirmValidateBom=Are you sure you want to validate the BOM with the reference <strong>%s</strong> (you will be able to use it to build new Manufacturing Orders)
 ConfirmCloseBom=Are you sure you want to cancel this BOM (you won't be able to use it to build new Manufacturing Orders anymore) ?
 ConfirmReopenBom=Are you sure you want to re-open this BOM (you will be able to use it to build new Manufacturing Orders)
@@ -63,13 +63,14 @@ ConsumeAndProduceAll=Consume and Produce All
 Manufactured=Manufactured
 TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
 ForAQuantityOf=For a quantity to produce of %s
+ForAQuantityToConsumeOf=For a quantity to disassemble of %s
 ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
 ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
 ProductionForRef=Production of %s
 AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
 NoStockChangeOnServices=No stock change on services
 ProductQtyToConsumeByMO=Product quantity still to consume by open MO
-ProductQtyToProduceByMO=Product quentity still to produce by open MO
+ProductQtyToProduceByMO=Product quantity still to produce by open MO
 AddNewConsumeLines=Add new line to consume
 ProductsToConsume=Products to consume
 ProductsToProduce=Products to produce
@@ -83,15 +84,13 @@ Workstations=Workstations
 WorkstationsDescription=Workstations management
 WorkstationSetup = Workstations setup
 WorkstationSetupPage = Workstations setup page
-WorkstationAbout = About Workstation
-WorkstationAboutPage = Workstations about page
 WorkstationList=Workstation list
 WorkstationCreate=Add new workstation
 ConfirmEnableWorkstation=Are you sure you want to enable workstation <b>%s</b> ?
 EnableAWorkstation=Enable a workstation
 ConfirmDisableWorkstation=Are you sure you want to disable workstation <b>%s</b> ?
 DisableAWorkstation=Disable a workstation
-DeleteWorkstation=Supprimer
+DeleteWorkstation=Delete
 NbOperatorsRequired=Number of operators required
 THMOperatorEstimated=Estimated operator THM
 THMMachineEstimated=Estimated machine THM
diff --git a/htdocs/langs/ka_GE/orders.lang b/htdocs/langs/ka_GE/orders.lang
index 87d196eb22f..5dab5b99bf1 100644
--- a/htdocs/langs/ka_GE/orders.lang
+++ b/htdocs/langs/ka_GE/orders.lang
@@ -11,6 +11,7 @@ OrderDate=Order date
 OrderDateShort=Order date
 OrderToProcess=Order to process
 NewOrder=New order
+NewSupplierOrderShort=New order
 NewOrderSupplier=New Purchase Order
 ToOrder=Make order
 MakeOrder=Make order
@@ -73,6 +74,7 @@ DeleteOrder=Delete order
 CancelOrder=Cancel order
 OrderReopened= Order %s re-open
 AddOrder=Create order
+AddSupplierOrderShort=Create order
 AddPurchaseOrder=Create purchase order
 AddToDraftOrders=Add to draft order
 ShowOrder=Show order
diff --git a/htdocs/langs/ka_GE/other.lang b/htdocs/langs/ka_GE/other.lang
index 95297a98859..bb35099ab82 100644
--- a/htdocs/langs/ka_GE/other.lang
+++ b/htdocs/langs/ka_GE/other.lang
@@ -129,6 +129,7 @@ ClosedByLogin=User login who closed
 FileWasRemoved=File %s was removed
 DirWasRemoved=Directory %s was removed
 FeatureNotYetAvailable=Feature not yet available in the current version
+FeatureNotAvailableOnDevicesWithoutMouse=Feature not available on devices without mouse
 FeaturesSupported=Supported features
 Width=Width
 Height=Height
@@ -263,7 +264,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
-PrefixSession=Prefix for session ID
+SuffixSessionName=Suffix for session name
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/ka_GE/partnership.lang b/htdocs/langs/ka_GE/partnership.lang
index 09059995a8d..2fb10e8159e 100644
--- a/htdocs/langs/ka_GE/partnership.lang
+++ b/htdocs/langs/ka_GE/partnership.lang
@@ -16,41 +16,72 @@
 #
 # Generic
 #
-ModulePartnershipName = Partnership management
-PartnershipDescription = Module Partnership management
+ModulePartnershipName=Partnership management
+PartnershipDescription=Module Partnership management
 PartnershipDescriptionLong= Module Partnership management
 
+AddPartnership=Add partnership
+CancelPartnershipForExpiredMembers=Partnership: Cancel partnership of members with expired subscriptions
+PartnershipCheckBacklink=Partnership: Check referring backlink
+
 #
 # Menu
 #
-NewPartnership = New Partnership
-ListOfPartnerships = List of partnership
+NewPartnership=New Partnership
+ListOfPartnerships=List of partnership
 
 #
 # Admin page
 #
-PartnershipSetup = Partnership setup
-PartnershipAbout = About Partnership
-PartnershipAboutPage = Partnership about page
-
+PartnershipSetup=Partnership setup
+PartnershipAbout=About Partnership
+PartnershipAboutPage=Partnership about page
+partnershipforthirdpartyormember=Partner status must be set on a 'thirdparty' or a 'member'
+PARTNERSHIP_IS_MANAGED_FOR=Partnership managed for
+PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks to check
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb of days before cancelling status of a partnership when a subscription has expired
+ReferingWebsiteCheck=Check of website referring
+ReferingWebsiteCheckDesc=You can enable a feature to check that your partners has added a backlink to your website domains on their own website.
 
 #
 # Object
 #
+DeletePartnership=Delete a partnership
+PartnershipDedicatedToThisThirdParty=Partnership dedicated to this third party
+PartnershipDedicatedToThisMember=Partnership dedicated to this member
 DatePartnershipStart=Start date
 DatePartnershipEnd=End date
+ReasonDecline=Decline reason
+ReasonDeclineOrCancel=Decline reason
+PartnershipAlreadyExist=Partnership already exist
+ManagePartnership=Manage partnership
+BacklinkNotFoundOnPartnerWebsite=Backlink not found on partner website
+ConfirmClosePartnershipAsk=Are you sure you want to cancel this partnership?
+PartnershipType=Partnership type
 
 #
 # Template Mail
 #
+SendingEmailOnPartnershipWillSoonBeCanceled=Partnership will soon be canceled
+SendingEmailOnPartnershipRefused=Partnership refused
+SendingEmailOnPartnershipAccepted=Partnership accepted
+SendingEmailOnPartnershipCanceled=Partnership canceled
 
+YourPartnershipWillSoonBeCanceledTopic=Partnership will soon be canceled
+YourPartnershipRefusedTopic=Partnership refused
+YourPartnershipAcceptedTopic=Partnership accepted
+YourPartnershipCanceledTopic=Partnership canceled
+
+YourPartnershipWillSoonBeCanceledContent=We inform you that your partnership will soon be canceled (Backlink not found)
+YourPartnershipRefusedContent=We inform you that your partnership request has been refused.
+YourPartnershipAcceptedContent=We inform you that your partnership request has been accepted.
+YourPartnershipCanceledContent=We inform you that your partnership has been canceled.
 
 #
 # Status
 #
-PartnershipDraft = Draft
-PartnershipAccepted = Accepted
-PartnershipRefused = Refused
-PartnershipCanceled = Canceled
-
+PartnershipDraft=Draft
+PartnershipAccepted=Accepted
+PartnershipRefused=Refused
+PartnershipCanceled=Canceled
 PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/ka_GE/productbatch.lang b/htdocs/langs/ka_GE/productbatch.lang
index ad2db658e2e..450d0285819 100644
--- a/htdocs/langs/ka_GE/productbatch.lang
+++ b/htdocs/langs/ka_GE/productbatch.lang
@@ -1,4 +1,4 @@
-# ProductBATCH language file - en_US - ProductBATCH
+# ProductBATCH language file - Source file is en_US - ProductBATCH
 ManageLotSerial=Use lot/serial number
 ProductStatusOnBatch=Yes (lot required)
 ProductStatusOnSerial=Yes (unique serial number required)
@@ -33,3 +33,13 @@ CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+LifeTime=Life span (in days)
+EndOfLife=End of life
+ManufacturingDate=Manufacturing date
+DestructionDate=Destruction date
+FirstUseDate=First use date
+QCFrequency=Quality control frequency (in days)
+
+#Traceability - qc status
+OutOfOrder=Out of order
+InWorkingOrder=In working order
diff --git a/htdocs/langs/ka_GE/products.lang b/htdocs/langs/ka_GE/products.lang
index 0875be0dc07..9638dfe5a25 100644
--- a/htdocs/langs/ka_GE/products.lang
+++ b/htdocs/langs/ka_GE/products.lang
@@ -396,3 +396,5 @@ ActionAvailableOnVariantProductOnly=Action only available on the variant of prod
 ProductsPricePerCustomer=Product prices per customers
 ProductSupplierExtraFields=Additional Attributes (Supplier Prices)
 DeleteLinkedProduct=Delete the child product linked to the combination
+PMPValue=Weighted average price
+PMPValueShort=WAP
diff --git a/htdocs/langs/ka_GE/projects.lang b/htdocs/langs/ka_GE/projects.lang
index 79c974f6e24..6c96fadb5c1 100644
--- a/htdocs/langs/ka_GE/projects.lang
+++ b/htdocs/langs/ka_GE/projects.lang
@@ -267,9 +267,11 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=New invoice
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+OneLinePerTimeSpentLine=One line for each time spent declaration
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
 AddPersonToTask=Add also to tasks
 UsageOrganizeEvent=Usage: Event Organization
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
+SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
diff --git a/htdocs/langs/ka_GE/receptions.lang b/htdocs/langs/ka_GE/receptions.lang
index 760ff884fa0..338602e722e 100644
--- a/htdocs/langs/ka_GE/receptions.lang
+++ b/htdocs/langs/ka_GE/receptions.lang
@@ -44,4 +44,4 @@ ValidateOrderFirstBeforeReception=You must first validate the order before being
 ReceptionsNumberingModules=Numbering module for receptions
 ReceptionsReceiptModel=Document templates for receptions
 NoMorePredefinedProductToDispatch=No more predefined products to dispatch
-
+ReceptionExist=A reception exists
diff --git a/htdocs/langs/ka_GE/stocks.lang b/htdocs/langs/ka_GE/stocks.lang
index 9ec523427b1..d39791932a3 100644
--- a/htdocs/langs/ka_GE/stocks.lang
+++ b/htdocs/langs/ka_GE/stocks.lang
@@ -56,8 +56,6 @@ UnitPurchaseValue=Unit purchase price
 StockTooLow=Stock too low
 StockLowerThanLimit=Stock lower than alert limit (%s)
 EnhancedValue=Value
-PMPValue=Weighted average price
-PMPValueShort=WAP
 EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
@@ -251,7 +249,10 @@ SelectAStockMovementFileToImport=select a stock movement file to import
 InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
 LabelOfInventoryMovemement=Inventory %s
 ReOpen=Reopen
-ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock to the real qty you entered into the inventory.
 ObjectNotFound=%s not found
 MakeMovementsAndClose=Generate movements and close
 AutofillWithExpected=Fill real quantity with expected quantity
+ShowAllBatchByDefault=By default, show batch details on product "stock" tab
+CollapseBatchDetailHelp=You can set batch detail default display in stocks module configuration
+FieldCannotBeNegative=Field "%s" cannot be negative
diff --git a/htdocs/langs/ka_GE/ticket.lang b/htdocs/langs/ka_GE/ticket.lang
index df73daf4a0d..1da32a5a99e 100644
--- a/htdocs/langs/ka_GE/ticket.lang
+++ b/htdocs/langs/ka_GE/ticket.lang
@@ -304,7 +304,7 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
-BoxTicketType=Number of open tickets by type
+BoxTicketType=Distribution of open tickets by type
 BoxTicketSeverity=Number of open tickets by severity
 BoxNoTicketSeverity=No tickets opened
 BoxTicketLastXDays=Number of new tickets by days the last %s days
diff --git a/htdocs/langs/km_KH/accountancy.lang b/htdocs/langs/km_KH/accountancy.lang
index 354cddb62c2..27be673dd9c 100644
--- a/htdocs/langs/km_KH/accountancy.lang
+++ b/htdocs/langs/km_KH/accountancy.lang
@@ -158,7 +158,7 @@ ACCOUNTING_LENGTH_AACCOUNT=Length of the third-party accounting accounts (If you
 ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of an accounting account. Needed by some countries (like Switzerland). If set to off (default), you can set the following two parameters to ask the application to add virtual zeros.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties, break ability to search on a part of value)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
@@ -328,6 +328,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountanc
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
+NotifiedExportDate=Notified export date (modification of the entries will not be possible)
+NotifiedValidationDate=Validation of the entries (modification or deletion of the entries will not be possible)
+ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=Export draft journal
 Modelcsv=Model of export
 Selectmodelcsv=Select a model of export
diff --git a/htdocs/langs/km_KH/admin.lang b/htdocs/langs/km_KH/admin.lang
index fb4513a09b4..be9aca94599 100644
--- a/htdocs/langs/km_KH/admin.lang
+++ b/htdocs/langs/km_KH/admin.lang
@@ -221,8 +221,8 @@ NotCompatible=This module does not seem compatible with your Dolibarr %s (Min %s
 CompatibleAfterUpdate=This module requires an update to your Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=See in Market place
 SeeSetupOfModule=See setup of module %s
+SetOptionTo=Set option <b>%s</b> to %s
 Updated=Updated
-Nouveauté=Novelty
 AchatTelechargement=Buy / Download
 GoModuleSetupArea=To deploy/install a new module, go to the Module setup area: <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
@@ -399,6 +399,7 @@ SecurityToken=Key to secure URLs
 NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
 PDF=PDF
 PDFDesc=Global options for PDF generation
+PDFOtherDesc=PDF Option specific to some modules
 PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
 PDFRulesForSalesTax=Rules for Sales Tax / VAT
@@ -561,7 +562,7 @@ Module53Desc=Management of Services
 Module54Name=Contracts/Subscriptions
 Module54Desc=Management of contracts (services or recurring subscriptions)
 Module55Name=Barcodes
-Module55Desc=Barcode management
+Module55Desc=Barcode or QR code management
 Module56Name=Payment by credit transfer
 Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
 Module57Name=Payments by Direct Debit
@@ -848,10 +849,10 @@ Permission402=Create/modify discounts
 Permission403=Validate discounts
 Permission404=Delete discounts
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries (yours and subordinates)
-Permission512=Create/modify payments of salaries
-Permission514=Delete payments of salaries
-Permission517=Read payments of salaries of everybody
+Permission511=Read salaries and payments (yours and subordinates)
+Permission512=Create/modify salaries and payments
+Permission514=Delete salaries and payments
+Permission517=Read salaries and payments everybody
 Permission519=Export salaries
 Permission520=Read Loans
 Permission522=Create/modify loans
@@ -965,6 +966,8 @@ Permission23003=Delete Scheduled job
 Permission23004=Execute Scheduled job
 Permission50101=Use Point of Sale (SimplePOS)
 Permission50151=Use Point of Sale (TakePOS)
+Permission50152=Edit sales lines
+Permission50153=Edit ordered sales lines
 Permission50201=Read transactions
 Permission50202=Import transactions
 Permission50330=Read objects of Zapier
@@ -1039,11 +1042,12 @@ DictionaryMeasuringUnits=Measuring Units
 DictionarySocialNetworks=Social Networks
 DictionaryProspectStatus=Prospect status for companies
 DictionaryProspectContactStatus=Prospect status for contacts
-DictionaryHolidayTypes=Types of leave
+DictionaryHolidayTypes=Leave - Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
 DictionaryTransportMode=Intracomm report - Transport mode
+DictionaryBatchStatus=Product lot/serial Quality Control status
 TypeOfUnit=Type of unit
 SetupSaved=Setup saved
 SetupNotSaved=Setup not saved
@@ -1187,7 +1191,7 @@ SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of m
 SetupDescription5=Other Setup menu entries manage optional parameters.
 AuditedSecurityEvents=Security events that are audited
 NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
-Audit=Audit
+Audit=Security events
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
 InfoOS=About OS
@@ -1319,9 +1323,12 @@ ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
 NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
+ComboListOptim=Combo list loading optimization
 SearchOptim=Search optimization
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
-YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
+YouHaveXObjectUseComboOptim=You have %s %s in the database. You can go into setup of module to enable loading of combo list on key pressed event.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other.
+YouHaveXObjectUseSearchOptimDesc=This limits the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to %s in Home-Setup-Other.
 BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
 BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
 PHPModuleLoaded=PHP component %s is loaded
@@ -1433,6 +1440,7 @@ MemberMainOptions=Main options
 AdherentLoginRequired= Manage a Login for each member
 AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
+MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
 MembersDocModules=Document templates for documents generated from member record
@@ -1763,7 +1771,7 @@ AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting men
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
-AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the scheduled job %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
@@ -1979,6 +1987,8 @@ 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_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add picture on proposal line
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add electronic sign in PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
@@ -2096,7 +2106,6 @@ PDF_SHOW_PROJECT=Show project on document
 ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
-FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
@@ -2120,12 +2129,18 @@ ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by
 MailToSendEventOrganization=Event Organization
 AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
 YouShouldDisablePHPFunctions=You should disable PHP functions
-IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands in custom code, you shoud disable PHP functions
+PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
+NotRecommended=Not recommanded
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
 ModuleUpdateAvailable=An update is available
 NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
+RandomlySelectedIfSeveral=Randomly selected if several pictures are available
+DatabasePasswordObfuscated=Database password is obfuscated in conf file
+DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
diff --git a/htdocs/langs/km_KH/agenda.lang b/htdocs/langs/km_KH/agenda.lang
index 09d82139a49..a1183841b00 100644
--- a/htdocs/langs/km_KH/agenda.lang
+++ b/htdocs/langs/km_KH/agenda.lang
@@ -4,7 +4,7 @@ Actions=Events
 Agenda=Agenda
 TMenuAgenda=Agenda
 Agendas=Agendas
-LocalAgenda=Internal calendar
+LocalAgenda=Default calendar
 ActionsOwnedBy=Event owned by
 ActionsOwnedByShort=Owner
 AffectedTo=Assigned to
@@ -14,13 +14,13 @@ EventsNb=Number of events
 ListOfActions=List of events
 EventReports=Event reports
 Location=Location
-ToUserOfGroup=Event assigned to any user in group
+ToUserOfGroup=Event assigned to any user in the group
 EventOnFullDay=Event on all day(s)
 MenuToDoActions=All incomplete events
 MenuDoneActions=All terminated events
 MenuToDoMyActions=My incomplete events
 MenuDoneMyActions=My terminated events
-ListOfEvents=List of events (internal calendar)
+ListOfEvents=List of events (default calendar)
 ActionsAskedBy=Events reported by
 ActionsToDoBy=Events assigned to
 ActionsDoneBy=Events done by
@@ -38,6 +38,7 @@ ActionsEvents=Events for which Dolibarr will create an action in agenda automati
 EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Third party %s created
+COMPANY_MODIFYInDolibarr=Third party %s modified
 COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=Contract %s validated
 CONTRACT_DELETEInDolibarr=Contract %s deleted
@@ -87,6 +88,7 @@ OrderDeleted=Order deleted
 InvoiceDeleted=Invoice deleted
 DraftInvoiceDeleted=Draft invoice deleted
 CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_MODIFYInDolibarr=Contact %s modified
 CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Product %s created
 PRODUCT_MODIFYInDolibarr=Product %s modified
@@ -119,6 +121,7 @@ MRP_MO_UNVALIDATEInDolibarr=MO set to draft status
 MRP_MO_PRODUCEDInDolibarr=MO produced
 MRP_MO_DELETEInDolibarr=MO deleted
 MRP_MO_CANCELInDolibarr=MO canceled
+PAIDInDolibarr=%s paid
 ##### End agenda events #####
 AgendaModelModule=Document templates for event
 DateActionStart=Start date
@@ -130,7 +133,7 @@ AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to use
 AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
 AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic events.
 AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> to include events of holidays.
-AgendaShowBirthdayEvents=Show birthdays of contacts
+AgendaShowBirthdayEvents=Birthdays of contacts
 AgendaHideBirthdayEvents=Hide birthdays of contacts
 Busy=Busy
 ExportDataset_event1=List of agenda events
@@ -152,6 +155,7 @@ ActionType=Event type
 DateActionBegin=Start event date
 ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b>?
 RepeatEvent=Repeat event
+OnceOnly=Once only
 EveryWeek=Every week
 EveryMonth=Every month
 DayOfMonth=Day of month
@@ -165,4 +169,4 @@ TimeType=Duration type
 ReminderType=Callback type
 AddReminder=Create an automatic reminder notification for this event
 ErrorReminderActionCommCreation=Error creating the reminder notification for this event
-BrowserPush=Browser Notification
+BrowserPush=Browser Popup Notification
diff --git a/htdocs/langs/km_KH/bills.lang b/htdocs/langs/km_KH/bills.lang
index c55f483873b..7b8c997d2e6 100644
--- a/htdocs/langs/km_KH/bills.lang
+++ b/htdocs/langs/km_KH/bills.lang
@@ -259,6 +259,7 @@ DateMaxPayment=Payment due on
 DateInvoice=Invoice date
 DatePointOfTax=Point of tax
 NoInvoice=No invoice
+NoOpenInvoice=No open invoice
 ClassifyBill=Classify invoice
 SupplierBillsToPay=Unpaid vendor invoices
 CustomerBillsUnpaid=Unpaid customer invoices
@@ -589,3 +590,4 @@ FacParentLine=Invoice Line Parent
 SituationTotalRayToRest=Remainder to pay without taxe
 PDFSituationTitle=Situation n° %d
 SituationTotalProgress=Total progress %d %%
+SearchUnpaidInvoicesWithDueDate=Search unpaid invoices with a due date = %s
diff --git a/htdocs/langs/km_KH/cashdesk.lang b/htdocs/langs/km_KH/cashdesk.lang
index 240503842f3..aea1f02f834 100644
--- a/htdocs/langs/km_KH/cashdesk.lang
+++ b/htdocs/langs/km_KH/cashdesk.lang
@@ -102,7 +102,7 @@ CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal numb
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
 SaleStartedAt=Sale started at %s
-ControlCashOpening=Control cash popup at opening POS
+ControlCashOpening=Open the "Control cash" popup when opening the POS
 CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -126,5 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
-ShowPriceHT = Display the price excluding tax column
-ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
+ShowPriceHT = Display the column with the price excluding tax (on screen)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
diff --git a/htdocs/langs/km_KH/compta.lang b/htdocs/langs/km_KH/compta.lang
index 7cae82e6ac7..8329346c163 100644
--- a/htdocs/langs/km_KH/compta.lang
+++ b/htdocs/langs/km_KH/compta.lang
@@ -286,3 +286,9 @@ ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
 IncludeLoansInResults = Include loans in reports
+InvoiceLate30Days = Invoices late > 30 days
+InvoiceLate15Days = Invoices late > 15 days
+InvoiceLateMinus15Days = Invoices late
+InvoiceNotLate = To be collected < 15 days
+InvoiceNotLate15Days = To be collected in 15 days
+InvoiceNotLate30Days = To be collected in 30 days
diff --git a/htdocs/langs/km_KH/cron.lang b/htdocs/langs/km_KH/cron.lang
index 2ebdda1e685..4fd2220dea6 100644
--- a/htdocs/langs/km_KH/cron.lang
+++ b/htdocs/langs/km_KH/cron.lang
@@ -60,7 +60,7 @@ CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
 CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Disable
-CronTaskInactive=This job is disabled
+CronTaskInactive=This job is disabled (not scheduled)
 CronId=Id
 CronClassFile=Filename with class
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example 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>
diff --git a/htdocs/langs/km_KH/errors.lang b/htdocs/langs/km_KH/errors.lang
index 9b14b5ad1d2..670f8c7a6bc 100644
--- a/htdocs/langs/km_KH/errors.lang
+++ b/htdocs/langs/km_KH/errors.lang
@@ -11,6 +11,7 @@ ErrorBadValueForParamNotAString=Bad value for your parameter. It appends general
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s already exists.
 ErrorGroupAlreadyExists=Group %s already exists.
+ErrorEmailAlreadyExists=Email %s already exists.
 ErrorRecordNotFound=Record not found.
 ErrorFailToCopyFile=Failed to copy file '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
@@ -117,7 +118,7 @@ ErrorCantReadFile=Failed to read file '%s'
 ErrorCantReadDir=Failed to read directory '%s'
 ErrorBadLoginPassword=Bad value for login or password
 ErrorLoginDisabled=Your account has been disabled
-ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server. If PHP <b>Safe Mode</b> is enabled, check that command is inside a directory defined by parameter <b>safe_mode_exec_dir</b>.
+ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server user. Check also the command is not protected on shell level by a security layer like apparmor.
 ErrorFailedToChangePassword=Failed to change password
 ErrorLoginDoesNotExists=User with login <b>%s</b> could not be found.
 ErrorLoginHasNoEmail=This user has no email address. Process aborted.
@@ -262,6 +263,7 @@ ErrorDateIsInFuture=Error, the date can't be in the future
 ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
 ErrorAPercentIsRequired=Error, please fill in the percentage correctly
 ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
+ErrorFailedToFindEmailTemplate=Failed to find template with code name %s
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -298,3 +300,4 @@ WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So y
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
+ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
diff --git a/htdocs/langs/km_KH/eventorganization.lang b/htdocs/langs/km_KH/eventorganization.lang
index 75b798fbc3a..335c257b224 100644
--- a/htdocs/langs/km_KH/eventorganization.lang
+++ b/htdocs/langs/km_KH/eventorganization.lang
@@ -1,4 +1,5 @@
 # Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+# Copyright (C) 2021		Dorian Vabre			<dorian.vabre@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
@@ -81,7 +82,10 @@ PriceOfBoothHelp=Subscription price to stand a booth
 EventOrganizationICSLink=Link ICS for events
 ConferenceOrBoothInformation=Conference Or Booth informations
 Attendees = Attendees
+DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
 #
 # Status
 #
@@ -94,8 +98,46 @@ EvntOrgCancelled = Cancelled
 #
 # Public page
 #
+SuggestForm = Suggestion page
+RegisterPage = Page for conferences or booth
+EvntOrgRegistrationHelpMessage = Here, you can vote for an event, or suggest a new conference or booth for the project
+EvntOrgRegistrationConfHelpMessage = Here, you can suggest a new conference for the project
+EvntOrgRegistrationBoothHelpMessage = Here, you can suggest a new booth for the project
+ListOfSuggestedConferences = List of suggested conferences
+ListOfSuggestedBooths = List of suggested booths
+SuggestConference = Suggest a new conference
+SuggestBooth = Suggest a booth
+ViewAndVote = View and vote for suggested events
 PublicAttendeeSubscriptionPage = Public link of registration to a conference
 MissingOrBadSecureKey = The security key is invalid or missing
-EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
-EvntOrgStartDuration = This conference starts on
-EvntOrgEndDuration =  and ends on
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference : '%s'
+EvntOrgDuration = This conference starts on %s and ends on %s.
+ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
+BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
+EventType = Event type
+
+#
+# Vote page
+#
+EvntOrgRegistrationWelcomeMessage = Welcome on the conference or booth suggestion page.
+EvntOrgRegistrationConfWelcomeMessage = Welcome on the conference suggestion page.
+EvntOrgRegistrationBoothWelcomeMessage = Welcome on the booth suggestion page.
+EvntOrgVoteHelpMessage = Here, you can view and vote for the suggested events for the project
+VoteOk = Your vote has been accepted.
+AlreadyVoted = You have already voted for this event.
+VoteError = An error has occurred during the vote, please try again.
+
+#
+# SubscriptionOk page
+#
+SubscriptionOk = Your subscription to this conference has been validated
+#
+# Subscription validation mail
+#
+ConfAttendeeSubscriptionConfirmation = Confirmation of your subscription to a conference
+#
+# Payment page
+#
+Attendee = Attendee
+PaymentConferenceAttendee = Conference attendee payment
+PaymentBoothLocation = Booth location payment
diff --git a/htdocs/langs/km_KH/hrm.lang b/htdocs/langs/km_KH/hrm.lang
index 3b8f137e103..da098e10bdb 100644
--- a/htdocs/langs/km_KH/hrm.lang
+++ b/htdocs/langs/km_KH/hrm.lang
@@ -9,7 +9,7 @@ ConfirmDeleteEstablishment=Are you sure you wish to delete this establishment?
 OpenEtablishment=Open establishment
 CloseEtablishment=Close establishment
 # Dictionary
-DictionaryPublicHolidays=HRM - Public holidays
+DictionaryPublicHolidays=Leave - Public holidays
 DictionaryDepartment=HRM - Department list
 DictionaryFunction=HRM - Job positions
 # Module
diff --git a/htdocs/langs/km_KH/knowledgemanagement.lang b/htdocs/langs/km_KH/knowledgemanagement.lang
index 269007e60f8..68f5cced76c 100644
--- a/htdocs/langs/km_KH/knowledgemanagement.lang
+++ b/htdocs/langs/km_KH/knowledgemanagement.lang
@@ -47,7 +47,7 @@ KnowledgeManagementArea = Knowledge Management
 # Menu
 #
 MenuKnowledgeRecord = Knowledge base
-ListOfArticles = List of articles
+ListKnowledgeRecord = List of articles
 NewKnowledgeRecord = New article
 ValidateReply = Validate solution
 KnowledgeRecords = Articles
diff --git a/htdocs/langs/km_KH/languages.lang b/htdocs/langs/km_KH/languages.lang
index ba187326705..da8ad5376a1 100644
--- a/htdocs/langs/km_KH/languages.lang
+++ b/htdocs/langs/km_KH/languages.lang
@@ -3,6 +3,7 @@ Language_am_ET=Ethiopian
 Language_ar_AR=Arabic
 Language_ar_EG=Arabic (Egypt)
 Language_ar_SA=Arabic
+Language_ar_TN=Arabic (Tunisia)
 Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengali
 Language_bn_IN=Bengali (India)
@@ -84,6 +85,7 @@ Language_nl_NL=Dutch
 Language_pl_PL=Polish
 Language_pt_BR=Portuguese (Brazil)
 Language_pt_PT=Portuguese
+Language_ro_MD=Romanian (Moldavia)
 Language_ro_RO=Romanian
 Language_ru_RU=Russian
 Language_ru_UA=Russian (Ukraine)
diff --git a/htdocs/langs/km_KH/main.lang b/htdocs/langs/km_KH/main.lang
index 8732bfe917c..64d6db25625 100644
--- a/htdocs/langs/km_KH/main.lang
+++ b/htdocs/langs/km_KH/main.lang
@@ -430,6 +430,7 @@ LT1IN=CGST
 LT2IN=SGST
 LT1GC=Additionnal cents
 VATRate=Tax Rate
+RateOfTaxN=Rate of tax %s
 VATCode=Tax Rate code
 VATNPR=Tax Rate NPR
 DefaultTaxRate=Default tax rate
@@ -729,6 +730,7 @@ MenuMembers=Members
 MenuAgendaGoogle=Google agenda
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
+ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
 NoFileFound=No documents uploaded
 CurrentUserLanguage=Current language
 CurrentTheme=Current theme
@@ -1072,6 +1074,7 @@ ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
 ToClose=To close
+ToRefuse=To refuse
 ToProcess=To process
 ToApprove=To approve
 GlobalOpenedElemView=Global view
@@ -1126,9 +1129,11 @@ UpdateForAllLines=Update for all lines
 OnHold=On hold
 Civility=Civility
 AffectTag=Affect Tag
+CreateExternalUser=Create external user
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
 ConfirmCancel=Are you sure you want to cancel
+EmailMsgID=Email MsgID
diff --git a/htdocs/langs/km_KH/members.lang b/htdocs/langs/km_KH/members.lang
index 042b85598c0..d8b9c2f59f3 100644
--- a/htdocs/langs/km_KH/members.lang
+++ b/htdocs/langs/km_KH/members.lang
@@ -213,3 +213,5 @@ SendReminderForExpiredSubscription=Send reminder by email to members when subscr
 MembershipPaid=Membership paid for current period (until %s)
 YouMayFindYourInvoiceInThisEmail=You may find your invoice attached to this email
 XMembersClosed=%s member(s) closed
+XExternalUserCreated=%s external user(s) created
+ForceMemberNature=Force member nature (Individual or Corporation)
diff --git a/htdocs/langs/km_KH/modulebuilder.lang b/htdocs/langs/km_KH/modulebuilder.lang
index 9fdaa1a533a..23a098be2e5 100644
--- a/htdocs/langs/km_KH/modulebuilder.lang
+++ b/htdocs/langs/km_KH/modulebuilder.lang
@@ -143,3 +143,4 @@ AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
 ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
+ImportExportProfiles=Import and export profiles
diff --git a/htdocs/langs/km_KH/mrp.lang b/htdocs/langs/km_KH/mrp.lang
index ec999a473a4..2414a92cefb 100644
--- a/htdocs/langs/km_KH/mrp.lang
+++ b/htdocs/langs/km_KH/mrp.lang
@@ -8,12 +8,12 @@ MenuBOM=Bills of material
 LatestBOMModified=Latest %s Bills of materials modified
 LatestMOModified=Latest %s Manufacturing Orders modified
 Bom=Bills of Material
-BillOfMaterials=Bill of Material
+BillOfMaterials=Bill of Materials
 BOMsSetup=Setup of module BOM
 ListOfBOMs=List of bills of material - BOM
 ListOfManufacturingOrders=List of Manufacturing Orders
-NewBOM=New bill of material
-ProductBOMHelp=Product to create with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
+NewBOM=New bill of materials
+ProductBOMHelp=Product to create (or disassemble) with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
 BOMsNumberingModules=BOM numbering templates
 BOMsModelModule=BOM document templates
 MOsNumberingModules=MO numbering templates
@@ -22,7 +22,7 @@ FreeLegalTextOnBOMs=Free text on document of BOM
 WatermarkOnDraftBOMs=Watermark on draft BOM
 FreeLegalTextOnMOs=Free text on document of MO
 WatermarkOnDraftMOs=Watermark on draft MO
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials %s ?
 ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
 ManufacturingEfficiency=Manufacturing efficiency
 ConsumptionEfficiency=Consumption efficiency
@@ -30,8 +30,8 @@ ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the produc
 ValueOfMeansLossForProductProduced=Value of 0.95 means an average of 5%% of loss of produced product
 DeleteBillOfMaterials=Delete Bill Of Materials
 DeleteMo=Delete Manufacturing Order
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Materials?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Materials?
 MenuMRP=Manufacturing Orders
 NewMO=New Manufacturing Order
 QtyToProduce=Qty to produce
@@ -39,7 +39,7 @@ DateStartPlannedMo=Date start planned
 DateEndPlannedMo=Date end planned
 KeepEmptyForAsap=Empty means 'As Soon As Possible'
 EstimatedDuration=Estimated duration
-EstimatedDurationDesc=Estimated duration to manufacture this product using this BOM
+EstimatedDurationDesc=Estimated duration to manufacture (or disassemble) this product using this BOM
 ConfirmValidateBom=Are you sure you want to validate the BOM with the reference <strong>%s</strong> (you will be able to use it to build new Manufacturing Orders)
 ConfirmCloseBom=Are you sure you want to cancel this BOM (you won't be able to use it to build new Manufacturing Orders anymore) ?
 ConfirmReopenBom=Are you sure you want to re-open this BOM (you will be able to use it to build new Manufacturing Orders)
@@ -63,13 +63,14 @@ ConsumeAndProduceAll=Consume and Produce All
 Manufactured=Manufactured
 TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
 ForAQuantityOf=For a quantity to produce of %s
+ForAQuantityToConsumeOf=For a quantity to disassemble of %s
 ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
 ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
 ProductionForRef=Production of %s
 AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
 NoStockChangeOnServices=No stock change on services
 ProductQtyToConsumeByMO=Product quantity still to consume by open MO
-ProductQtyToProduceByMO=Product quentity still to produce by open MO
+ProductQtyToProduceByMO=Product quantity still to produce by open MO
 AddNewConsumeLines=Add new line to consume
 ProductsToConsume=Products to consume
 ProductsToProduce=Products to produce
@@ -83,15 +84,13 @@ Workstations=Workstations
 WorkstationsDescription=Workstations management
 WorkstationSetup = Workstations setup
 WorkstationSetupPage = Workstations setup page
-WorkstationAbout = About Workstation
-WorkstationAboutPage = Workstations about page
 WorkstationList=Workstation list
 WorkstationCreate=Add new workstation
 ConfirmEnableWorkstation=Are you sure you want to enable workstation <b>%s</b> ?
 EnableAWorkstation=Enable a workstation
 ConfirmDisableWorkstation=Are you sure you want to disable workstation <b>%s</b> ?
 DisableAWorkstation=Disable a workstation
-DeleteWorkstation=Supprimer
+DeleteWorkstation=Delete
 NbOperatorsRequired=Number of operators required
 THMOperatorEstimated=Estimated operator THM
 THMMachineEstimated=Estimated machine THM
diff --git a/htdocs/langs/km_KH/orders.lang b/htdocs/langs/km_KH/orders.lang
index 87d196eb22f..5dab5b99bf1 100644
--- a/htdocs/langs/km_KH/orders.lang
+++ b/htdocs/langs/km_KH/orders.lang
@@ -11,6 +11,7 @@ OrderDate=Order date
 OrderDateShort=Order date
 OrderToProcess=Order to process
 NewOrder=New order
+NewSupplierOrderShort=New order
 NewOrderSupplier=New Purchase Order
 ToOrder=Make order
 MakeOrder=Make order
@@ -73,6 +74,7 @@ DeleteOrder=Delete order
 CancelOrder=Cancel order
 OrderReopened= Order %s re-open
 AddOrder=Create order
+AddSupplierOrderShort=Create order
 AddPurchaseOrder=Create purchase order
 AddToDraftOrders=Add to draft order
 ShowOrder=Show order
diff --git a/htdocs/langs/km_KH/other.lang b/htdocs/langs/km_KH/other.lang
index 95297a98859..bb35099ab82 100644
--- a/htdocs/langs/km_KH/other.lang
+++ b/htdocs/langs/km_KH/other.lang
@@ -129,6 +129,7 @@ ClosedByLogin=User login who closed
 FileWasRemoved=File %s was removed
 DirWasRemoved=Directory %s was removed
 FeatureNotYetAvailable=Feature not yet available in the current version
+FeatureNotAvailableOnDevicesWithoutMouse=Feature not available on devices without mouse
 FeaturesSupported=Supported features
 Width=Width
 Height=Height
@@ -263,7 +264,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
-PrefixSession=Prefix for session ID
+SuffixSessionName=Suffix for session name
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/km_KH/partnership.lang b/htdocs/langs/km_KH/partnership.lang
index 09059995a8d..2fb10e8159e 100644
--- a/htdocs/langs/km_KH/partnership.lang
+++ b/htdocs/langs/km_KH/partnership.lang
@@ -16,41 +16,72 @@
 #
 # Generic
 #
-ModulePartnershipName = Partnership management
-PartnershipDescription = Module Partnership management
+ModulePartnershipName=Partnership management
+PartnershipDescription=Module Partnership management
 PartnershipDescriptionLong= Module Partnership management
 
+AddPartnership=Add partnership
+CancelPartnershipForExpiredMembers=Partnership: Cancel partnership of members with expired subscriptions
+PartnershipCheckBacklink=Partnership: Check referring backlink
+
 #
 # Menu
 #
-NewPartnership = New Partnership
-ListOfPartnerships = List of partnership
+NewPartnership=New Partnership
+ListOfPartnerships=List of partnership
 
 #
 # Admin page
 #
-PartnershipSetup = Partnership setup
-PartnershipAbout = About Partnership
-PartnershipAboutPage = Partnership about page
-
+PartnershipSetup=Partnership setup
+PartnershipAbout=About Partnership
+PartnershipAboutPage=Partnership about page
+partnershipforthirdpartyormember=Partner status must be set on a 'thirdparty' or a 'member'
+PARTNERSHIP_IS_MANAGED_FOR=Partnership managed for
+PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks to check
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb of days before cancelling status of a partnership when a subscription has expired
+ReferingWebsiteCheck=Check of website referring
+ReferingWebsiteCheckDesc=You can enable a feature to check that your partners has added a backlink to your website domains on their own website.
 
 #
 # Object
 #
+DeletePartnership=Delete a partnership
+PartnershipDedicatedToThisThirdParty=Partnership dedicated to this third party
+PartnershipDedicatedToThisMember=Partnership dedicated to this member
 DatePartnershipStart=Start date
 DatePartnershipEnd=End date
+ReasonDecline=Decline reason
+ReasonDeclineOrCancel=Decline reason
+PartnershipAlreadyExist=Partnership already exist
+ManagePartnership=Manage partnership
+BacklinkNotFoundOnPartnerWebsite=Backlink not found on partner website
+ConfirmClosePartnershipAsk=Are you sure you want to cancel this partnership?
+PartnershipType=Partnership type
 
 #
 # Template Mail
 #
+SendingEmailOnPartnershipWillSoonBeCanceled=Partnership will soon be canceled
+SendingEmailOnPartnershipRefused=Partnership refused
+SendingEmailOnPartnershipAccepted=Partnership accepted
+SendingEmailOnPartnershipCanceled=Partnership canceled
 
+YourPartnershipWillSoonBeCanceledTopic=Partnership will soon be canceled
+YourPartnershipRefusedTopic=Partnership refused
+YourPartnershipAcceptedTopic=Partnership accepted
+YourPartnershipCanceledTopic=Partnership canceled
+
+YourPartnershipWillSoonBeCanceledContent=We inform you that your partnership will soon be canceled (Backlink not found)
+YourPartnershipRefusedContent=We inform you that your partnership request has been refused.
+YourPartnershipAcceptedContent=We inform you that your partnership request has been accepted.
+YourPartnershipCanceledContent=We inform you that your partnership has been canceled.
 
 #
 # Status
 #
-PartnershipDraft = Draft
-PartnershipAccepted = Accepted
-PartnershipRefused = Refused
-PartnershipCanceled = Canceled
-
+PartnershipDraft=Draft
+PartnershipAccepted=Accepted
+PartnershipRefused=Refused
+PartnershipCanceled=Canceled
 PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/km_KH/productbatch.lang b/htdocs/langs/km_KH/productbatch.lang
index ad2db658e2e..450d0285819 100644
--- a/htdocs/langs/km_KH/productbatch.lang
+++ b/htdocs/langs/km_KH/productbatch.lang
@@ -1,4 +1,4 @@
-# ProductBATCH language file - en_US - ProductBATCH
+# ProductBATCH language file - Source file is en_US - ProductBATCH
 ManageLotSerial=Use lot/serial number
 ProductStatusOnBatch=Yes (lot required)
 ProductStatusOnSerial=Yes (unique serial number required)
@@ -33,3 +33,13 @@ CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+LifeTime=Life span (in days)
+EndOfLife=End of life
+ManufacturingDate=Manufacturing date
+DestructionDate=Destruction date
+FirstUseDate=First use date
+QCFrequency=Quality control frequency (in days)
+
+#Traceability - qc status
+OutOfOrder=Out of order
+InWorkingOrder=In working order
diff --git a/htdocs/langs/km_KH/products.lang b/htdocs/langs/km_KH/products.lang
index 0875be0dc07..9638dfe5a25 100644
--- a/htdocs/langs/km_KH/products.lang
+++ b/htdocs/langs/km_KH/products.lang
@@ -396,3 +396,5 @@ ActionAvailableOnVariantProductOnly=Action only available on the variant of prod
 ProductsPricePerCustomer=Product prices per customers
 ProductSupplierExtraFields=Additional Attributes (Supplier Prices)
 DeleteLinkedProduct=Delete the child product linked to the combination
+PMPValue=Weighted average price
+PMPValueShort=WAP
diff --git a/htdocs/langs/km_KH/projects.lang b/htdocs/langs/km_KH/projects.lang
index 79c974f6e24..6c96fadb5c1 100644
--- a/htdocs/langs/km_KH/projects.lang
+++ b/htdocs/langs/km_KH/projects.lang
@@ -267,9 +267,11 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=New invoice
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+OneLinePerTimeSpentLine=One line for each time spent declaration
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
 AddPersonToTask=Add also to tasks
 UsageOrganizeEvent=Usage: Event Organization
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
+SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
diff --git a/htdocs/langs/km_KH/receptions.lang b/htdocs/langs/km_KH/receptions.lang
index 760ff884fa0..338602e722e 100644
--- a/htdocs/langs/km_KH/receptions.lang
+++ b/htdocs/langs/km_KH/receptions.lang
@@ -44,4 +44,4 @@ ValidateOrderFirstBeforeReception=You must first validate the order before being
 ReceptionsNumberingModules=Numbering module for receptions
 ReceptionsReceiptModel=Document templates for receptions
 NoMorePredefinedProductToDispatch=No more predefined products to dispatch
-
+ReceptionExist=A reception exists
diff --git a/htdocs/langs/km_KH/stocks.lang b/htdocs/langs/km_KH/stocks.lang
index 9ec523427b1..d39791932a3 100644
--- a/htdocs/langs/km_KH/stocks.lang
+++ b/htdocs/langs/km_KH/stocks.lang
@@ -56,8 +56,6 @@ UnitPurchaseValue=Unit purchase price
 StockTooLow=Stock too low
 StockLowerThanLimit=Stock lower than alert limit (%s)
 EnhancedValue=Value
-PMPValue=Weighted average price
-PMPValueShort=WAP
 EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
@@ -251,7 +249,10 @@ SelectAStockMovementFileToImport=select a stock movement file to import
 InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
 LabelOfInventoryMovemement=Inventory %s
 ReOpen=Reopen
-ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock to the real qty you entered into the inventory.
 ObjectNotFound=%s not found
 MakeMovementsAndClose=Generate movements and close
 AutofillWithExpected=Fill real quantity with expected quantity
+ShowAllBatchByDefault=By default, show batch details on product "stock" tab
+CollapseBatchDetailHelp=You can set batch detail default display in stocks module configuration
+FieldCannotBeNegative=Field "%s" cannot be negative
diff --git a/htdocs/langs/km_KH/ticket.lang b/htdocs/langs/km_KH/ticket.lang
index df73daf4a0d..1da32a5a99e 100644
--- a/htdocs/langs/km_KH/ticket.lang
+++ b/htdocs/langs/km_KH/ticket.lang
@@ -304,7 +304,7 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
-BoxTicketType=Number of open tickets by type
+BoxTicketType=Distribution of open tickets by type
 BoxTicketSeverity=Number of open tickets by severity
 BoxNoTicketSeverity=No tickets opened
 BoxTicketLastXDays=Number of new tickets by days the last %s days
diff --git a/htdocs/langs/kn_IN/accountancy.lang b/htdocs/langs/kn_IN/accountancy.lang
index 354cddb62c2..27be673dd9c 100644
--- a/htdocs/langs/kn_IN/accountancy.lang
+++ b/htdocs/langs/kn_IN/accountancy.lang
@@ -158,7 +158,7 @@ ACCOUNTING_LENGTH_AACCOUNT=Length of the third-party accounting accounts (If you
 ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of an accounting account. Needed by some countries (like Switzerland). If set to off (default), you can set the following two parameters to ask the application to add virtual zeros.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties, break ability to search on a part of value)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
@@ -328,6 +328,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountanc
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
+NotifiedExportDate=Notified export date (modification of the entries will not be possible)
+NotifiedValidationDate=Validation of the entries (modification or deletion of the entries will not be possible)
+ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=Export draft journal
 Modelcsv=Model of export
 Selectmodelcsv=Select a model of export
diff --git a/htdocs/langs/kn_IN/admin.lang b/htdocs/langs/kn_IN/admin.lang
index 0c10c3d755f..69b889487af 100644
--- a/htdocs/langs/kn_IN/admin.lang
+++ b/htdocs/langs/kn_IN/admin.lang
@@ -221,8 +221,8 @@ NotCompatible=This module does not seem compatible with your Dolibarr %s (Min %s
 CompatibleAfterUpdate=This module requires an update to your Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=See in Market place
 SeeSetupOfModule=See setup of module %s
+SetOptionTo=Set option <b>%s</b> to %s
 Updated=Updated
-Nouveauté=Novelty
 AchatTelechargement=Buy / Download
 GoModuleSetupArea=To deploy/install a new module, go to the Module setup area: <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
@@ -399,6 +399,7 @@ SecurityToken=Key to secure URLs
 NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
 PDF=PDF
 PDFDesc=Global options for PDF generation
+PDFOtherDesc=PDF Option specific to some modules
 PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
 PDFRulesForSalesTax=Rules for Sales Tax / VAT
@@ -561,7 +562,7 @@ Module53Desc=Management of Services
 Module54Name=Contracts/Subscriptions
 Module54Desc=Management of contracts (services or recurring subscriptions)
 Module55Name=Barcodes
-Module55Desc=Barcode management
+Module55Desc=Barcode or QR code management
 Module56Name=Payment by credit transfer
 Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
 Module57Name=Payments by Direct Debit
@@ -848,10 +849,10 @@ Permission402=Create/modify discounts
 Permission403=Validate discounts
 Permission404=Delete discounts
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries (yours and subordinates)
-Permission512=Create/modify payments of salaries
-Permission514=Delete payments of salaries
-Permission517=Read payments of salaries of everybody
+Permission511=Read salaries and payments (yours and subordinates)
+Permission512=Create/modify salaries and payments
+Permission514=Delete salaries and payments
+Permission517=Read salaries and payments everybody
 Permission519=Export salaries
 Permission520=Read Loans
 Permission522=Create/modify loans
@@ -965,6 +966,8 @@ Permission23003=Delete Scheduled job
 Permission23004=Execute Scheduled job
 Permission50101=Use Point of Sale (SimplePOS)
 Permission50151=Use Point of Sale (TakePOS)
+Permission50152=Edit sales lines
+Permission50153=Edit ordered sales lines
 Permission50201=Read transactions
 Permission50202=Import transactions
 Permission50330=Read objects of Zapier
@@ -1039,11 +1042,12 @@ DictionaryMeasuringUnits=Measuring Units
 DictionarySocialNetworks=Social Networks
 DictionaryProspectStatus=Prospect status for companies
 DictionaryProspectContactStatus=Prospect status for contacts
-DictionaryHolidayTypes=Types of leave
+DictionaryHolidayTypes=Leave - Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
 DictionaryTransportMode=Intracomm report - Transport mode
+DictionaryBatchStatus=Product lot/serial Quality Control status
 TypeOfUnit=Type of unit
 SetupSaved=Setup saved
 SetupNotSaved=Setup not saved
@@ -1187,7 +1191,7 @@ SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of m
 SetupDescription5=Other Setup menu entries manage optional parameters.
 AuditedSecurityEvents=Security events that are audited
 NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
-Audit=Audit
+Audit=Security events
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
 InfoOS=About OS
@@ -1319,9 +1323,12 @@ ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
 NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
+ComboListOptim=Combo list loading optimization
 SearchOptim=Search optimization
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
-YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
+YouHaveXObjectUseComboOptim=You have %s %s in the database. You can go into setup of module to enable loading of combo list on key pressed event.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other.
+YouHaveXObjectUseSearchOptimDesc=This limits the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to %s in Home-Setup-Other.
 BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
 BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
 PHPModuleLoaded=PHP component %s is loaded
@@ -1433,6 +1440,7 @@ MemberMainOptions=Main options
 AdherentLoginRequired= Manage a Login for each member
 AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
+MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
 MembersDocModules=Document templates for documents generated from member record
@@ -1763,7 +1771,7 @@ AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting men
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
-AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the scheduled job %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
@@ -1979,6 +1987,8 @@ 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_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add picture on proposal line
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add electronic sign in PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
@@ -2096,7 +2106,6 @@ PDF_SHOW_PROJECT=Show project on document
 ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
-FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
@@ -2120,12 +2129,18 @@ ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by
 MailToSendEventOrganization=Event Organization
 AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
 YouShouldDisablePHPFunctions=You should disable PHP functions
-IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands in custom code, you shoud disable PHP functions
+PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
+NotRecommended=Not recommanded
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
 ModuleUpdateAvailable=An update is available
 NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
+RandomlySelectedIfSeveral=Randomly selected if several pictures are available
+DatabasePasswordObfuscated=Database password is obfuscated in conf file
+DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
diff --git a/htdocs/langs/kn_IN/agenda.lang b/htdocs/langs/kn_IN/agenda.lang
index 09d82139a49..a1183841b00 100644
--- a/htdocs/langs/kn_IN/agenda.lang
+++ b/htdocs/langs/kn_IN/agenda.lang
@@ -4,7 +4,7 @@ Actions=Events
 Agenda=Agenda
 TMenuAgenda=Agenda
 Agendas=Agendas
-LocalAgenda=Internal calendar
+LocalAgenda=Default calendar
 ActionsOwnedBy=Event owned by
 ActionsOwnedByShort=Owner
 AffectedTo=Assigned to
@@ -14,13 +14,13 @@ EventsNb=Number of events
 ListOfActions=List of events
 EventReports=Event reports
 Location=Location
-ToUserOfGroup=Event assigned to any user in group
+ToUserOfGroup=Event assigned to any user in the group
 EventOnFullDay=Event on all day(s)
 MenuToDoActions=All incomplete events
 MenuDoneActions=All terminated events
 MenuToDoMyActions=My incomplete events
 MenuDoneMyActions=My terminated events
-ListOfEvents=List of events (internal calendar)
+ListOfEvents=List of events (default calendar)
 ActionsAskedBy=Events reported by
 ActionsToDoBy=Events assigned to
 ActionsDoneBy=Events done by
@@ -38,6 +38,7 @@ ActionsEvents=Events for which Dolibarr will create an action in agenda automati
 EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Third party %s created
+COMPANY_MODIFYInDolibarr=Third party %s modified
 COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=Contract %s validated
 CONTRACT_DELETEInDolibarr=Contract %s deleted
@@ -87,6 +88,7 @@ OrderDeleted=Order deleted
 InvoiceDeleted=Invoice deleted
 DraftInvoiceDeleted=Draft invoice deleted
 CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_MODIFYInDolibarr=Contact %s modified
 CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Product %s created
 PRODUCT_MODIFYInDolibarr=Product %s modified
@@ -119,6 +121,7 @@ MRP_MO_UNVALIDATEInDolibarr=MO set to draft status
 MRP_MO_PRODUCEDInDolibarr=MO produced
 MRP_MO_DELETEInDolibarr=MO deleted
 MRP_MO_CANCELInDolibarr=MO canceled
+PAIDInDolibarr=%s paid
 ##### End agenda events #####
 AgendaModelModule=Document templates for event
 DateActionStart=Start date
@@ -130,7 +133,7 @@ AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to use
 AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
 AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic events.
 AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> to include events of holidays.
-AgendaShowBirthdayEvents=Show birthdays of contacts
+AgendaShowBirthdayEvents=Birthdays of contacts
 AgendaHideBirthdayEvents=Hide birthdays of contacts
 Busy=Busy
 ExportDataset_event1=List of agenda events
@@ -152,6 +155,7 @@ ActionType=Event type
 DateActionBegin=Start event date
 ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b>?
 RepeatEvent=Repeat event
+OnceOnly=Once only
 EveryWeek=Every week
 EveryMonth=Every month
 DayOfMonth=Day of month
@@ -165,4 +169,4 @@ TimeType=Duration type
 ReminderType=Callback type
 AddReminder=Create an automatic reminder notification for this event
 ErrorReminderActionCommCreation=Error creating the reminder notification for this event
-BrowserPush=Browser Notification
+BrowserPush=Browser Popup Notification
diff --git a/htdocs/langs/kn_IN/bills.lang b/htdocs/langs/kn_IN/bills.lang
index 2477701eef5..2eb5d99fb74 100644
--- a/htdocs/langs/kn_IN/bills.lang
+++ b/htdocs/langs/kn_IN/bills.lang
@@ -259,6 +259,7 @@ DateMaxPayment=Payment due on
 DateInvoice=Invoice date
 DatePointOfTax=Point of tax
 NoInvoice=No invoice
+NoOpenInvoice=No open invoice
 ClassifyBill=Classify invoice
 SupplierBillsToPay=Unpaid vendor invoices
 CustomerBillsUnpaid=Unpaid customer invoices
@@ -589,3 +590,4 @@ FacParentLine=Invoice Line Parent
 SituationTotalRayToRest=Remainder to pay without taxe
 PDFSituationTitle=Situation n° %d
 SituationTotalProgress=Total progress %d %%
+SearchUnpaidInvoicesWithDueDate=Search unpaid invoices with a due date = %s
diff --git a/htdocs/langs/kn_IN/cashdesk.lang b/htdocs/langs/kn_IN/cashdesk.lang
index 1553c32c5a6..db38f5c8915 100644
--- a/htdocs/langs/kn_IN/cashdesk.lang
+++ b/htdocs/langs/kn_IN/cashdesk.lang
@@ -102,7 +102,7 @@ CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal numb
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
 SaleStartedAt=Sale started at %s
-ControlCashOpening=Control cash popup at opening POS
+ControlCashOpening=Open the "Control cash" popup when opening the POS
 CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -126,5 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
-ShowPriceHT = Display the price excluding tax column
-ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
+ShowPriceHT = Display the column with the price excluding tax (on screen)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
diff --git a/htdocs/langs/kn_IN/compta.lang b/htdocs/langs/kn_IN/compta.lang
index 7cae82e6ac7..8329346c163 100644
--- a/htdocs/langs/kn_IN/compta.lang
+++ b/htdocs/langs/kn_IN/compta.lang
@@ -286,3 +286,9 @@ ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
 IncludeLoansInResults = Include loans in reports
+InvoiceLate30Days = Invoices late > 30 days
+InvoiceLate15Days = Invoices late > 15 days
+InvoiceLateMinus15Days = Invoices late
+InvoiceNotLate = To be collected < 15 days
+InvoiceNotLate15Days = To be collected in 15 days
+InvoiceNotLate30Days = To be collected in 30 days
diff --git a/htdocs/langs/kn_IN/cron.lang b/htdocs/langs/kn_IN/cron.lang
index 4b73818c3aa..575b325e11d 100644
--- a/htdocs/langs/kn_IN/cron.lang
+++ b/htdocs/langs/kn_IN/cron.lang
@@ -60,7 +60,7 @@ CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
 CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Disable
-CronTaskInactive=This job is disabled
+CronTaskInactive=This job is disabled (not scheduled)
 CronId=Id
 CronClassFile=Filename with class
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example 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>
diff --git a/htdocs/langs/kn_IN/errors.lang b/htdocs/langs/kn_IN/errors.lang
index 9b14b5ad1d2..670f8c7a6bc 100644
--- a/htdocs/langs/kn_IN/errors.lang
+++ b/htdocs/langs/kn_IN/errors.lang
@@ -11,6 +11,7 @@ ErrorBadValueForParamNotAString=Bad value for your parameter. It appends general
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s already exists.
 ErrorGroupAlreadyExists=Group %s already exists.
+ErrorEmailAlreadyExists=Email %s already exists.
 ErrorRecordNotFound=Record not found.
 ErrorFailToCopyFile=Failed to copy file '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
@@ -117,7 +118,7 @@ ErrorCantReadFile=Failed to read file '%s'
 ErrorCantReadDir=Failed to read directory '%s'
 ErrorBadLoginPassword=Bad value for login or password
 ErrorLoginDisabled=Your account has been disabled
-ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server. If PHP <b>Safe Mode</b> is enabled, check that command is inside a directory defined by parameter <b>safe_mode_exec_dir</b>.
+ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server user. Check also the command is not protected on shell level by a security layer like apparmor.
 ErrorFailedToChangePassword=Failed to change password
 ErrorLoginDoesNotExists=User with login <b>%s</b> could not be found.
 ErrorLoginHasNoEmail=This user has no email address. Process aborted.
@@ -262,6 +263,7 @@ ErrorDateIsInFuture=Error, the date can't be in the future
 ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
 ErrorAPercentIsRequired=Error, please fill in the percentage correctly
 ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
+ErrorFailedToFindEmailTemplate=Failed to find template with code name %s
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -298,3 +300,4 @@ WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So y
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
+ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
diff --git a/htdocs/langs/kn_IN/eventorganization.lang b/htdocs/langs/kn_IN/eventorganization.lang
index 75b798fbc3a..335c257b224 100644
--- a/htdocs/langs/kn_IN/eventorganization.lang
+++ b/htdocs/langs/kn_IN/eventorganization.lang
@@ -1,4 +1,5 @@
 # Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+# Copyright (C) 2021		Dorian Vabre			<dorian.vabre@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
@@ -81,7 +82,10 @@ PriceOfBoothHelp=Subscription price to stand a booth
 EventOrganizationICSLink=Link ICS for events
 ConferenceOrBoothInformation=Conference Or Booth informations
 Attendees = Attendees
+DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
 #
 # Status
 #
@@ -94,8 +98,46 @@ EvntOrgCancelled = Cancelled
 #
 # Public page
 #
+SuggestForm = Suggestion page
+RegisterPage = Page for conferences or booth
+EvntOrgRegistrationHelpMessage = Here, you can vote for an event, or suggest a new conference or booth for the project
+EvntOrgRegistrationConfHelpMessage = Here, you can suggest a new conference for the project
+EvntOrgRegistrationBoothHelpMessage = Here, you can suggest a new booth for the project
+ListOfSuggestedConferences = List of suggested conferences
+ListOfSuggestedBooths = List of suggested booths
+SuggestConference = Suggest a new conference
+SuggestBooth = Suggest a booth
+ViewAndVote = View and vote for suggested events
 PublicAttendeeSubscriptionPage = Public link of registration to a conference
 MissingOrBadSecureKey = The security key is invalid or missing
-EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
-EvntOrgStartDuration = This conference starts on
-EvntOrgEndDuration =  and ends on
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference : '%s'
+EvntOrgDuration = This conference starts on %s and ends on %s.
+ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
+BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
+EventType = Event type
+
+#
+# Vote page
+#
+EvntOrgRegistrationWelcomeMessage = Welcome on the conference or booth suggestion page.
+EvntOrgRegistrationConfWelcomeMessage = Welcome on the conference suggestion page.
+EvntOrgRegistrationBoothWelcomeMessage = Welcome on the booth suggestion page.
+EvntOrgVoteHelpMessage = Here, you can view and vote for the suggested events for the project
+VoteOk = Your vote has been accepted.
+AlreadyVoted = You have already voted for this event.
+VoteError = An error has occurred during the vote, please try again.
+
+#
+# SubscriptionOk page
+#
+SubscriptionOk = Your subscription to this conference has been validated
+#
+# Subscription validation mail
+#
+ConfAttendeeSubscriptionConfirmation = Confirmation of your subscription to a conference
+#
+# Payment page
+#
+Attendee = Attendee
+PaymentConferenceAttendee = Conference attendee payment
+PaymentBoothLocation = Booth location payment
diff --git a/htdocs/langs/kn_IN/hrm.lang b/htdocs/langs/kn_IN/hrm.lang
index 3b8f137e103..da098e10bdb 100644
--- a/htdocs/langs/kn_IN/hrm.lang
+++ b/htdocs/langs/kn_IN/hrm.lang
@@ -9,7 +9,7 @@ ConfirmDeleteEstablishment=Are you sure you wish to delete this establishment?
 OpenEtablishment=Open establishment
 CloseEtablishment=Close establishment
 # Dictionary
-DictionaryPublicHolidays=HRM - Public holidays
+DictionaryPublicHolidays=Leave - Public holidays
 DictionaryDepartment=HRM - Department list
 DictionaryFunction=HRM - Job positions
 # Module
diff --git a/htdocs/langs/kn_IN/knowledgemanagement.lang b/htdocs/langs/kn_IN/knowledgemanagement.lang
index 269007e60f8..68f5cced76c 100644
--- a/htdocs/langs/kn_IN/knowledgemanagement.lang
+++ b/htdocs/langs/kn_IN/knowledgemanagement.lang
@@ -47,7 +47,7 @@ KnowledgeManagementArea = Knowledge Management
 # Menu
 #
 MenuKnowledgeRecord = Knowledge base
-ListOfArticles = List of articles
+ListKnowledgeRecord = List of articles
 NewKnowledgeRecord = New article
 ValidateReply = Validate solution
 KnowledgeRecords = Articles
diff --git a/htdocs/langs/kn_IN/languages.lang b/htdocs/langs/kn_IN/languages.lang
index ba187326705..da8ad5376a1 100644
--- a/htdocs/langs/kn_IN/languages.lang
+++ b/htdocs/langs/kn_IN/languages.lang
@@ -3,6 +3,7 @@ Language_am_ET=Ethiopian
 Language_ar_AR=Arabic
 Language_ar_EG=Arabic (Egypt)
 Language_ar_SA=Arabic
+Language_ar_TN=Arabic (Tunisia)
 Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengali
 Language_bn_IN=Bengali (India)
@@ -84,6 +85,7 @@ Language_nl_NL=Dutch
 Language_pl_PL=Polish
 Language_pt_BR=Portuguese (Brazil)
 Language_pt_PT=Portuguese
+Language_ro_MD=Romanian (Moldavia)
 Language_ro_RO=Romanian
 Language_ru_RU=Russian
 Language_ru_UA=Russian (Ukraine)
diff --git a/htdocs/langs/kn_IN/main.lang b/htdocs/langs/kn_IN/main.lang
index bdd823a6664..a2f6ae67d31 100644
--- a/htdocs/langs/kn_IN/main.lang
+++ b/htdocs/langs/kn_IN/main.lang
@@ -430,6 +430,7 @@ LT1IN=CGST
 LT2IN=SGST
 LT1GC=Additionnal cents
 VATRate=Tax Rate
+RateOfTaxN=Rate of tax %s
 VATCode=Tax Rate code
 VATNPR=Tax Rate NPR
 DefaultTaxRate=Default tax rate
@@ -729,6 +730,7 @@ MenuMembers=Members
 MenuAgendaGoogle=Google agenda
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
+ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
 NoFileFound=No documents uploaded
 CurrentUserLanguage=Current language
 CurrentTheme=Current theme
@@ -1072,6 +1074,7 @@ ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
 ToClose=To close
+ToRefuse=To refuse
 ToProcess=To process
 ToApprove=To approve
 GlobalOpenedElemView=Global view
@@ -1126,9 +1129,11 @@ UpdateForAllLines=Update for all lines
 OnHold=On hold
 Civility=Civility
 AffectTag=Affect Tag
+CreateExternalUser=Create external user
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
 ConfirmCancel=Are you sure you want to cancel
+EmailMsgID=Email MsgID
diff --git a/htdocs/langs/kn_IN/members.lang b/htdocs/langs/kn_IN/members.lang
index 042b85598c0..d8b9c2f59f3 100644
--- a/htdocs/langs/kn_IN/members.lang
+++ b/htdocs/langs/kn_IN/members.lang
@@ -213,3 +213,5 @@ SendReminderForExpiredSubscription=Send reminder by email to members when subscr
 MembershipPaid=Membership paid for current period (until %s)
 YouMayFindYourInvoiceInThisEmail=You may find your invoice attached to this email
 XMembersClosed=%s member(s) closed
+XExternalUserCreated=%s external user(s) created
+ForceMemberNature=Force member nature (Individual or Corporation)
diff --git a/htdocs/langs/kn_IN/modulebuilder.lang b/htdocs/langs/kn_IN/modulebuilder.lang
index 9fdaa1a533a..23a098be2e5 100644
--- a/htdocs/langs/kn_IN/modulebuilder.lang
+++ b/htdocs/langs/kn_IN/modulebuilder.lang
@@ -143,3 +143,4 @@ AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
 ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
+ImportExportProfiles=Import and export profiles
diff --git a/htdocs/langs/kn_IN/mrp.lang b/htdocs/langs/kn_IN/mrp.lang
index ec999a473a4..2414a92cefb 100644
--- a/htdocs/langs/kn_IN/mrp.lang
+++ b/htdocs/langs/kn_IN/mrp.lang
@@ -8,12 +8,12 @@ MenuBOM=Bills of material
 LatestBOMModified=Latest %s Bills of materials modified
 LatestMOModified=Latest %s Manufacturing Orders modified
 Bom=Bills of Material
-BillOfMaterials=Bill of Material
+BillOfMaterials=Bill of Materials
 BOMsSetup=Setup of module BOM
 ListOfBOMs=List of bills of material - BOM
 ListOfManufacturingOrders=List of Manufacturing Orders
-NewBOM=New bill of material
-ProductBOMHelp=Product to create with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
+NewBOM=New bill of materials
+ProductBOMHelp=Product to create (or disassemble) with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
 BOMsNumberingModules=BOM numbering templates
 BOMsModelModule=BOM document templates
 MOsNumberingModules=MO numbering templates
@@ -22,7 +22,7 @@ FreeLegalTextOnBOMs=Free text on document of BOM
 WatermarkOnDraftBOMs=Watermark on draft BOM
 FreeLegalTextOnMOs=Free text on document of MO
 WatermarkOnDraftMOs=Watermark on draft MO
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials %s ?
 ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
 ManufacturingEfficiency=Manufacturing efficiency
 ConsumptionEfficiency=Consumption efficiency
@@ -30,8 +30,8 @@ ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the produc
 ValueOfMeansLossForProductProduced=Value of 0.95 means an average of 5%% of loss of produced product
 DeleteBillOfMaterials=Delete Bill Of Materials
 DeleteMo=Delete Manufacturing Order
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Materials?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Materials?
 MenuMRP=Manufacturing Orders
 NewMO=New Manufacturing Order
 QtyToProduce=Qty to produce
@@ -39,7 +39,7 @@ DateStartPlannedMo=Date start planned
 DateEndPlannedMo=Date end planned
 KeepEmptyForAsap=Empty means 'As Soon As Possible'
 EstimatedDuration=Estimated duration
-EstimatedDurationDesc=Estimated duration to manufacture this product using this BOM
+EstimatedDurationDesc=Estimated duration to manufacture (or disassemble) this product using this BOM
 ConfirmValidateBom=Are you sure you want to validate the BOM with the reference <strong>%s</strong> (you will be able to use it to build new Manufacturing Orders)
 ConfirmCloseBom=Are you sure you want to cancel this BOM (you won't be able to use it to build new Manufacturing Orders anymore) ?
 ConfirmReopenBom=Are you sure you want to re-open this BOM (you will be able to use it to build new Manufacturing Orders)
@@ -63,13 +63,14 @@ ConsumeAndProduceAll=Consume and Produce All
 Manufactured=Manufactured
 TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
 ForAQuantityOf=For a quantity to produce of %s
+ForAQuantityToConsumeOf=For a quantity to disassemble of %s
 ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
 ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
 ProductionForRef=Production of %s
 AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
 NoStockChangeOnServices=No stock change on services
 ProductQtyToConsumeByMO=Product quantity still to consume by open MO
-ProductQtyToProduceByMO=Product quentity still to produce by open MO
+ProductQtyToProduceByMO=Product quantity still to produce by open MO
 AddNewConsumeLines=Add new line to consume
 ProductsToConsume=Products to consume
 ProductsToProduce=Products to produce
@@ -83,15 +84,13 @@ Workstations=Workstations
 WorkstationsDescription=Workstations management
 WorkstationSetup = Workstations setup
 WorkstationSetupPage = Workstations setup page
-WorkstationAbout = About Workstation
-WorkstationAboutPage = Workstations about page
 WorkstationList=Workstation list
 WorkstationCreate=Add new workstation
 ConfirmEnableWorkstation=Are you sure you want to enable workstation <b>%s</b> ?
 EnableAWorkstation=Enable a workstation
 ConfirmDisableWorkstation=Are you sure you want to disable workstation <b>%s</b> ?
 DisableAWorkstation=Disable a workstation
-DeleteWorkstation=Supprimer
+DeleteWorkstation=Delete
 NbOperatorsRequired=Number of operators required
 THMOperatorEstimated=Estimated operator THM
 THMMachineEstimated=Estimated machine THM
diff --git a/htdocs/langs/kn_IN/orders.lang b/htdocs/langs/kn_IN/orders.lang
index 8ae27a2c870..a60327dec7d 100644
--- a/htdocs/langs/kn_IN/orders.lang
+++ b/htdocs/langs/kn_IN/orders.lang
@@ -11,6 +11,7 @@ OrderDate=Order date
 OrderDateShort=Order date
 OrderToProcess=Order to process
 NewOrder=New order
+NewSupplierOrderShort=New order
 NewOrderSupplier=New Purchase Order
 ToOrder=Make order
 MakeOrder=Make order
@@ -73,6 +74,7 @@ DeleteOrder=Delete order
 CancelOrder=Cancel order
 OrderReopened= Order %s re-open
 AddOrder=Create order
+AddSupplierOrderShort=Create order
 AddPurchaseOrder=Create purchase order
 AddToDraftOrders=Add to draft order
 ShowOrder=Show order
diff --git a/htdocs/langs/kn_IN/other.lang b/htdocs/langs/kn_IN/other.lang
index a4e928da2d2..ba6833de944 100644
--- a/htdocs/langs/kn_IN/other.lang
+++ b/htdocs/langs/kn_IN/other.lang
@@ -129,6 +129,7 @@ ClosedByLogin=User login who closed
 FileWasRemoved=File %s was removed
 DirWasRemoved=Directory %s was removed
 FeatureNotYetAvailable=Feature not yet available in the current version
+FeatureNotAvailableOnDevicesWithoutMouse=Feature not available on devices without mouse
 FeaturesSupported=Supported features
 Width=Width
 Height=Height
@@ -263,7 +264,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
-PrefixSession=Prefix for session ID
+SuffixSessionName=Suffix for session name
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/kn_IN/partnership.lang b/htdocs/langs/kn_IN/partnership.lang
index 09059995a8d..2fb10e8159e 100644
--- a/htdocs/langs/kn_IN/partnership.lang
+++ b/htdocs/langs/kn_IN/partnership.lang
@@ -16,41 +16,72 @@
 #
 # Generic
 #
-ModulePartnershipName = Partnership management
-PartnershipDescription = Module Partnership management
+ModulePartnershipName=Partnership management
+PartnershipDescription=Module Partnership management
 PartnershipDescriptionLong= Module Partnership management
 
+AddPartnership=Add partnership
+CancelPartnershipForExpiredMembers=Partnership: Cancel partnership of members with expired subscriptions
+PartnershipCheckBacklink=Partnership: Check referring backlink
+
 #
 # Menu
 #
-NewPartnership = New Partnership
-ListOfPartnerships = List of partnership
+NewPartnership=New Partnership
+ListOfPartnerships=List of partnership
 
 #
 # Admin page
 #
-PartnershipSetup = Partnership setup
-PartnershipAbout = About Partnership
-PartnershipAboutPage = Partnership about page
-
+PartnershipSetup=Partnership setup
+PartnershipAbout=About Partnership
+PartnershipAboutPage=Partnership about page
+partnershipforthirdpartyormember=Partner status must be set on a 'thirdparty' or a 'member'
+PARTNERSHIP_IS_MANAGED_FOR=Partnership managed for
+PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks to check
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb of days before cancelling status of a partnership when a subscription has expired
+ReferingWebsiteCheck=Check of website referring
+ReferingWebsiteCheckDesc=You can enable a feature to check that your partners has added a backlink to your website domains on their own website.
 
 #
 # Object
 #
+DeletePartnership=Delete a partnership
+PartnershipDedicatedToThisThirdParty=Partnership dedicated to this third party
+PartnershipDedicatedToThisMember=Partnership dedicated to this member
 DatePartnershipStart=Start date
 DatePartnershipEnd=End date
+ReasonDecline=Decline reason
+ReasonDeclineOrCancel=Decline reason
+PartnershipAlreadyExist=Partnership already exist
+ManagePartnership=Manage partnership
+BacklinkNotFoundOnPartnerWebsite=Backlink not found on partner website
+ConfirmClosePartnershipAsk=Are you sure you want to cancel this partnership?
+PartnershipType=Partnership type
 
 #
 # Template Mail
 #
+SendingEmailOnPartnershipWillSoonBeCanceled=Partnership will soon be canceled
+SendingEmailOnPartnershipRefused=Partnership refused
+SendingEmailOnPartnershipAccepted=Partnership accepted
+SendingEmailOnPartnershipCanceled=Partnership canceled
 
+YourPartnershipWillSoonBeCanceledTopic=Partnership will soon be canceled
+YourPartnershipRefusedTopic=Partnership refused
+YourPartnershipAcceptedTopic=Partnership accepted
+YourPartnershipCanceledTopic=Partnership canceled
+
+YourPartnershipWillSoonBeCanceledContent=We inform you that your partnership will soon be canceled (Backlink not found)
+YourPartnershipRefusedContent=We inform you that your partnership request has been refused.
+YourPartnershipAcceptedContent=We inform you that your partnership request has been accepted.
+YourPartnershipCanceledContent=We inform you that your partnership has been canceled.
 
 #
 # Status
 #
-PartnershipDraft = Draft
-PartnershipAccepted = Accepted
-PartnershipRefused = Refused
-PartnershipCanceled = Canceled
-
+PartnershipDraft=Draft
+PartnershipAccepted=Accepted
+PartnershipRefused=Refused
+PartnershipCanceled=Canceled
 PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/kn_IN/productbatch.lang b/htdocs/langs/kn_IN/productbatch.lang
index ad2db658e2e..450d0285819 100644
--- a/htdocs/langs/kn_IN/productbatch.lang
+++ b/htdocs/langs/kn_IN/productbatch.lang
@@ -1,4 +1,4 @@
-# ProductBATCH language file - en_US - ProductBATCH
+# ProductBATCH language file - Source file is en_US - ProductBATCH
 ManageLotSerial=Use lot/serial number
 ProductStatusOnBatch=Yes (lot required)
 ProductStatusOnSerial=Yes (unique serial number required)
@@ -33,3 +33,13 @@ CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+LifeTime=Life span (in days)
+EndOfLife=End of life
+ManufacturingDate=Manufacturing date
+DestructionDate=Destruction date
+FirstUseDate=First use date
+QCFrequency=Quality control frequency (in days)
+
+#Traceability - qc status
+OutOfOrder=Out of order
+InWorkingOrder=In working order
diff --git a/htdocs/langs/kn_IN/products.lang b/htdocs/langs/kn_IN/products.lang
index a84efa5fa7c..325549987df 100644
--- a/htdocs/langs/kn_IN/products.lang
+++ b/htdocs/langs/kn_IN/products.lang
@@ -396,3 +396,5 @@ ActionAvailableOnVariantProductOnly=Action only available on the variant of prod
 ProductsPricePerCustomer=Product prices per customers
 ProductSupplierExtraFields=Additional Attributes (Supplier Prices)
 DeleteLinkedProduct=Delete the child product linked to the combination
+PMPValue=Weighted average price
+PMPValueShort=WAP
diff --git a/htdocs/langs/kn_IN/projects.lang b/htdocs/langs/kn_IN/projects.lang
index 79c974f6e24..6c96fadb5c1 100644
--- a/htdocs/langs/kn_IN/projects.lang
+++ b/htdocs/langs/kn_IN/projects.lang
@@ -267,9 +267,11 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=New invoice
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+OneLinePerTimeSpentLine=One line for each time spent declaration
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
 AddPersonToTask=Add also to tasks
 UsageOrganizeEvent=Usage: Event Organization
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
+SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
diff --git a/htdocs/langs/kn_IN/receptions.lang b/htdocs/langs/kn_IN/receptions.lang
index 760ff884fa0..338602e722e 100644
--- a/htdocs/langs/kn_IN/receptions.lang
+++ b/htdocs/langs/kn_IN/receptions.lang
@@ -44,4 +44,4 @@ ValidateOrderFirstBeforeReception=You must first validate the order before being
 ReceptionsNumberingModules=Numbering module for receptions
 ReceptionsReceiptModel=Document templates for receptions
 NoMorePredefinedProductToDispatch=No more predefined products to dispatch
-
+ReceptionExist=A reception exists
diff --git a/htdocs/langs/kn_IN/stocks.lang b/htdocs/langs/kn_IN/stocks.lang
index 9ec523427b1..d39791932a3 100644
--- a/htdocs/langs/kn_IN/stocks.lang
+++ b/htdocs/langs/kn_IN/stocks.lang
@@ -56,8 +56,6 @@ UnitPurchaseValue=Unit purchase price
 StockTooLow=Stock too low
 StockLowerThanLimit=Stock lower than alert limit (%s)
 EnhancedValue=Value
-PMPValue=Weighted average price
-PMPValueShort=WAP
 EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
@@ -251,7 +249,10 @@ SelectAStockMovementFileToImport=select a stock movement file to import
 InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
 LabelOfInventoryMovemement=Inventory %s
 ReOpen=Reopen
-ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock to the real qty you entered into the inventory.
 ObjectNotFound=%s not found
 MakeMovementsAndClose=Generate movements and close
 AutofillWithExpected=Fill real quantity with expected quantity
+ShowAllBatchByDefault=By default, show batch details on product "stock" tab
+CollapseBatchDetailHelp=You can set batch detail default display in stocks module configuration
+FieldCannotBeNegative=Field "%s" cannot be negative
diff --git a/htdocs/langs/kn_IN/ticket.lang b/htdocs/langs/kn_IN/ticket.lang
index 852cabefb2b..15d79d284fc 100644
--- a/htdocs/langs/kn_IN/ticket.lang
+++ b/htdocs/langs/kn_IN/ticket.lang
@@ -304,7 +304,7 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
-BoxTicketType=Number of open tickets by type
+BoxTicketType=Distribution of open tickets by type
 BoxTicketSeverity=Number of open tickets by severity
 BoxNoTicketSeverity=No tickets opened
 BoxTicketLastXDays=Number of new tickets by days the last %s days
diff --git a/htdocs/langs/ko_KR/accountancy.lang b/htdocs/langs/ko_KR/accountancy.lang
index 53aeba6a47d..203b9b45180 100644
--- a/htdocs/langs/ko_KR/accountancy.lang
+++ b/htdocs/langs/ko_KR/accountancy.lang
@@ -158,7 +158,7 @@ ACCOUNTING_LENGTH_AACCOUNT=Length of the third-party accounting accounts (If you
 ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of an accounting account. Needed by some countries (like Switzerland). If set to off (default), you can set the following two parameters to ask the application to add virtual zeros.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties, break ability to search on a part of value)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
@@ -328,6 +328,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountanc
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
+NotifiedExportDate=Notified export date (modification of the entries will not be possible)
+NotifiedValidationDate=Validation of the entries (modification or deletion of the entries will not be possible)
+ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=Export draft journal
 Modelcsv=Model of export
 Selectmodelcsv=Select a model of export
diff --git a/htdocs/langs/ko_KR/admin.lang b/htdocs/langs/ko_KR/admin.lang
index 1a54ad1c182..be3e5096bf1 100644
--- a/htdocs/langs/ko_KR/admin.lang
+++ b/htdocs/langs/ko_KR/admin.lang
@@ -221,8 +221,8 @@ NotCompatible=This module does not seem compatible with your Dolibarr %s (Min %s
 CompatibleAfterUpdate=This module requires an update to your Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=See in Market place
 SeeSetupOfModule=See setup of module %s
+SetOptionTo=Set option <b>%s</b> to %s
 Updated=Updated
-Nouveauté=Novelty
 AchatTelechargement=Buy / Download
 GoModuleSetupArea=To deploy/install a new module, go to the Module setup area: <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
@@ -399,6 +399,7 @@ SecurityToken=Key to secure URLs
 NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
 PDF=PDF
 PDFDesc=Global options for PDF generation
+PDFOtherDesc=PDF Option specific to some modules
 PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
 PDFRulesForSalesTax=Rules for Sales Tax / VAT
@@ -561,7 +562,7 @@ Module53Desc=Management of Services
 Module54Name=Contracts/Subscriptions
 Module54Desc=Management of contracts (services or recurring subscriptions)
 Module55Name=Barcodes
-Module55Desc=Barcode management
+Module55Desc=Barcode or QR code management
 Module56Name=Payment by credit transfer
 Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
 Module57Name=Payments by Direct Debit
@@ -848,10 +849,10 @@ Permission402=Create/modify discounts
 Permission403=Validate discounts
 Permission404=Delete discounts
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries (yours and subordinates)
-Permission512=Create/modify payments of salaries
-Permission514=Delete payments of salaries
-Permission517=Read payments of salaries of everybody
+Permission511=Read salaries and payments (yours and subordinates)
+Permission512=Create/modify salaries and payments
+Permission514=Delete salaries and payments
+Permission517=Read salaries and payments everybody
 Permission519=Export salaries
 Permission520=Read Loans
 Permission522=Create/modify loans
@@ -965,6 +966,8 @@ Permission23003=Delete Scheduled job
 Permission23004=Execute Scheduled job
 Permission50101=Use Point of Sale (SimplePOS)
 Permission50151=Use Point of Sale (TakePOS)
+Permission50152=Edit sales lines
+Permission50153=Edit ordered sales lines
 Permission50201=Read transactions
 Permission50202=Import transactions
 Permission50330=Read objects of Zapier
@@ -1039,11 +1042,12 @@ DictionaryMeasuringUnits=Measuring Units
 DictionarySocialNetworks=Social Networks
 DictionaryProspectStatus=Prospect status for companies
 DictionaryProspectContactStatus=Prospect status for contacts
-DictionaryHolidayTypes=Types of leave
+DictionaryHolidayTypes=Leave - Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
 DictionaryTransportMode=Intracomm report - Transport mode
+DictionaryBatchStatus=Product lot/serial Quality Control status
 TypeOfUnit=Type of unit
 SetupSaved=Setup saved
 SetupNotSaved=Setup not saved
@@ -1187,7 +1191,7 @@ SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of m
 SetupDescription5=Other Setup menu entries manage optional parameters.
 AuditedSecurityEvents=Security events that are audited
 NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
-Audit=Audit
+Audit=Security events
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
 InfoOS=About OS
@@ -1319,9 +1323,12 @@ ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
 NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
+ComboListOptim=Combo list loading optimization
 SearchOptim=Search optimization
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
-YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
+YouHaveXObjectUseComboOptim=You have %s %s in the database. You can go into setup of module to enable loading of combo list on key pressed event.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other.
+YouHaveXObjectUseSearchOptimDesc=This limits the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to %s in Home-Setup-Other.
 BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
 BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
 PHPModuleLoaded=PHP component %s is loaded
@@ -1433,6 +1440,7 @@ MemberMainOptions=Main options
 AdherentLoginRequired= Manage a Login for each member
 AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
+MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
 MembersDocModules=Document templates for documents generated from member record
@@ -1763,7 +1771,7 @@ AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting men
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
-AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the scheduled job %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
@@ -1979,6 +1987,8 @@ 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_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add picture on proposal line
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add electronic sign in PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
@@ -2096,7 +2106,6 @@ PDF_SHOW_PROJECT=Show project on document
 ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
-FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
@@ -2120,12 +2129,18 @@ ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by
 MailToSendEventOrganization=Event Organization
 AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
 YouShouldDisablePHPFunctions=You should disable PHP functions
-IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands in custom code, you shoud disable PHP functions
+PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
+NotRecommended=Not recommanded
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
 ModuleUpdateAvailable=An update is available
 NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
+RandomlySelectedIfSeveral=Randomly selected if several pictures are available
+DatabasePasswordObfuscated=Database password is obfuscated in conf file
+DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
diff --git a/htdocs/langs/ko_KR/agenda.lang b/htdocs/langs/ko_KR/agenda.lang
index fbdadd09422..1e4c3dd631b 100644
--- a/htdocs/langs/ko_KR/agenda.lang
+++ b/htdocs/langs/ko_KR/agenda.lang
@@ -4,7 +4,7 @@ Actions=이벤트
 Agenda=Agenda
 TMenuAgenda=Agenda
 Agendas=Agendas
-LocalAgenda=Internal calendar
+LocalAgenda=Default calendar
 ActionsOwnedBy=Event owned by
 ActionsOwnedByShort=소유자
 AffectedTo=Assigned to
@@ -14,13 +14,13 @@ EventsNb=Number of events
 ListOfActions=이벤트 목록
 EventReports=Event reports
 Location=위치
-ToUserOfGroup=Event assigned to any user in group
+ToUserOfGroup=Event assigned to any user in the group
 EventOnFullDay=Event on all day(s)
 MenuToDoActions=All incomplete events
 MenuDoneActions=All terminated events
 MenuToDoMyActions=My incomplete events
 MenuDoneMyActions=My terminated events
-ListOfEvents=List of events (internal calendar)
+ListOfEvents=List of events (default calendar)
 ActionsAskedBy=Events reported by
 ActionsToDoBy=Events assigned to
 ActionsDoneBy=Events done by
@@ -38,6 +38,7 @@ ActionsEvents=Events for which Dolibarr will create an action in agenda automati
 EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Third party %s created
+COMPANY_MODIFYInDolibarr=Third party %s modified
 COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=Contract %s validated
 CONTRACT_DELETEInDolibarr=Contract %s deleted
@@ -87,6 +88,7 @@ OrderDeleted=Order deleted
 InvoiceDeleted=Invoice deleted
 DraftInvoiceDeleted=Draft invoice deleted
 CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_MODIFYInDolibarr=Contact %s modified
 CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Product %s created
 PRODUCT_MODIFYInDolibarr=Product %s modified
@@ -119,6 +121,7 @@ MRP_MO_UNVALIDATEInDolibarr=MO set to draft status
 MRP_MO_PRODUCEDInDolibarr=MO produced
 MRP_MO_DELETEInDolibarr=MO deleted
 MRP_MO_CANCELInDolibarr=MO canceled
+PAIDInDolibarr=%s paid
 ##### End agenda events #####
 AgendaModelModule=Document templates for event
 DateActionStart=시작일
@@ -130,7 +133,7 @@ AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to use
 AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
 AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic events.
 AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> to include events of holidays.
-AgendaShowBirthdayEvents=Show birthdays of contacts
+AgendaShowBirthdayEvents=Birthdays of contacts
 AgendaHideBirthdayEvents=Hide birthdays of contacts
 Busy=Busy
 ExportDataset_event1=List of agenda events
@@ -152,6 +155,7 @@ ActionType=Event type
 DateActionBegin=Start event date
 ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b>?
 RepeatEvent=Repeat event
+OnceOnly=Once only
 EveryWeek=Every week
 EveryMonth=Every month
 DayOfMonth=Day of month
@@ -165,4 +169,4 @@ TimeType=Duration type
 ReminderType=Callback type
 AddReminder=Create an automatic reminder notification for this event
 ErrorReminderActionCommCreation=Error creating the reminder notification for this event
-BrowserPush=Browser Notification
+BrowserPush=Browser Popup Notification
diff --git a/htdocs/langs/ko_KR/bills.lang b/htdocs/langs/ko_KR/bills.lang
index 4eee15767e7..53fa779a594 100644
--- a/htdocs/langs/ko_KR/bills.lang
+++ b/htdocs/langs/ko_KR/bills.lang
@@ -259,6 +259,7 @@ DateMaxPayment=Payment due on
 DateInvoice=Invoice date
 DatePointOfTax=Point of tax
 NoInvoice=No invoice
+NoOpenInvoice=No open invoice
 ClassifyBill=Classify invoice
 SupplierBillsToPay=Unpaid vendor invoices
 CustomerBillsUnpaid=Unpaid customer invoices
@@ -589,3 +590,4 @@ FacParentLine=Invoice Line Parent
 SituationTotalRayToRest=Remainder to pay without taxe
 PDFSituationTitle=Situation n° %d
 SituationTotalProgress=Total progress %d %%
+SearchUnpaidInvoicesWithDueDate=Search unpaid invoices with a due date = %s
diff --git a/htdocs/langs/ko_KR/cashdesk.lang b/htdocs/langs/ko_KR/cashdesk.lang
index ccf4c12504b..4ba4c81a4d8 100644
--- a/htdocs/langs/ko_KR/cashdesk.lang
+++ b/htdocs/langs/ko_KR/cashdesk.lang
@@ -102,7 +102,7 @@ CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal numb
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
 SaleStartedAt=Sale started at %s
-ControlCashOpening=Control cash popup at opening POS
+ControlCashOpening=Open the "Control cash" popup when opening the POS
 CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -126,5 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
-ShowPriceHT = Display the price excluding tax column
-ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
+ShowPriceHT = Display the column with the price excluding tax (on screen)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
diff --git a/htdocs/langs/ko_KR/compta.lang b/htdocs/langs/ko_KR/compta.lang
index 91bceb5e350..8a9f8b8c2b2 100644
--- a/htdocs/langs/ko_KR/compta.lang
+++ b/htdocs/langs/ko_KR/compta.lang
@@ -286,3 +286,9 @@ ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
 IncludeLoansInResults = Include loans in reports
+InvoiceLate30Days = Invoices late > 30 days
+InvoiceLate15Days = Invoices late > 15 days
+InvoiceLateMinus15Days = Invoices late
+InvoiceNotLate = To be collected < 15 days
+InvoiceNotLate15Days = To be collected in 15 days
+InvoiceNotLate30Days = To be collected in 30 days
diff --git a/htdocs/langs/ko_KR/cron.lang b/htdocs/langs/ko_KR/cron.lang
index bbf04428a8c..f34354543bf 100644
--- a/htdocs/langs/ko_KR/cron.lang
+++ b/htdocs/langs/ko_KR/cron.lang
@@ -60,7 +60,7 @@ CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
 CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=사용 안함
-CronTaskInactive=This job is disabled
+CronTaskInactive=This job is disabled (not scheduled)
 CronId=Id
 CronClassFile=Filename with class
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example 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>
diff --git a/htdocs/langs/ko_KR/errors.lang b/htdocs/langs/ko_KR/errors.lang
index 9b14b5ad1d2..670f8c7a6bc 100644
--- a/htdocs/langs/ko_KR/errors.lang
+++ b/htdocs/langs/ko_KR/errors.lang
@@ -11,6 +11,7 @@ ErrorBadValueForParamNotAString=Bad value for your parameter. It appends general
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s already exists.
 ErrorGroupAlreadyExists=Group %s already exists.
+ErrorEmailAlreadyExists=Email %s already exists.
 ErrorRecordNotFound=Record not found.
 ErrorFailToCopyFile=Failed to copy file '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
@@ -117,7 +118,7 @@ ErrorCantReadFile=Failed to read file '%s'
 ErrorCantReadDir=Failed to read directory '%s'
 ErrorBadLoginPassword=Bad value for login or password
 ErrorLoginDisabled=Your account has been disabled
-ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server. If PHP <b>Safe Mode</b> is enabled, check that command is inside a directory defined by parameter <b>safe_mode_exec_dir</b>.
+ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server user. Check also the command is not protected on shell level by a security layer like apparmor.
 ErrorFailedToChangePassword=Failed to change password
 ErrorLoginDoesNotExists=User with login <b>%s</b> could not be found.
 ErrorLoginHasNoEmail=This user has no email address. Process aborted.
@@ -262,6 +263,7 @@ ErrorDateIsInFuture=Error, the date can't be in the future
 ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
 ErrorAPercentIsRequired=Error, please fill in the percentage correctly
 ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
+ErrorFailedToFindEmailTemplate=Failed to find template with code name %s
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -298,3 +300,4 @@ WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So y
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
+ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
diff --git a/htdocs/langs/ko_KR/eventorganization.lang b/htdocs/langs/ko_KR/eventorganization.lang
index 159c452242a..7f96bbd2542 100644
--- a/htdocs/langs/ko_KR/eventorganization.lang
+++ b/htdocs/langs/ko_KR/eventorganization.lang
@@ -1,4 +1,5 @@
 # Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+# Copyright (C) 2021		Dorian Vabre			<dorian.vabre@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
@@ -81,7 +82,10 @@ PriceOfBoothHelp=Subscription price to stand a booth
 EventOrganizationICSLink=Link ICS for events
 ConferenceOrBoothInformation=Conference Or Booth informations
 Attendees = Attendees
+DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
 #
 # Status
 #
@@ -94,8 +98,46 @@ EvntOrgCancelled = Cancelled
 #
 # Public page
 #
+SuggestForm = Suggestion page
+RegisterPage = Page for conferences or booth
+EvntOrgRegistrationHelpMessage = Here, you can vote for an event, or suggest a new conference or booth for the project
+EvntOrgRegistrationConfHelpMessage = Here, you can suggest a new conference for the project
+EvntOrgRegistrationBoothHelpMessage = Here, you can suggest a new booth for the project
+ListOfSuggestedConferences = List of suggested conferences
+ListOfSuggestedBooths = List of suggested booths
+SuggestConference = Suggest a new conference
+SuggestBooth = Suggest a booth
+ViewAndVote = View and vote for suggested events
 PublicAttendeeSubscriptionPage = Public link of registration to a conference
 MissingOrBadSecureKey = The security key is invalid or missing
-EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
-EvntOrgStartDuration = This conference starts on
-EvntOrgEndDuration =  and ends on
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference : '%s'
+EvntOrgDuration = This conference starts on %s and ends on %s.
+ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
+BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
+EventType = Event type
+
+#
+# Vote page
+#
+EvntOrgRegistrationWelcomeMessage = Welcome on the conference or booth suggestion page.
+EvntOrgRegistrationConfWelcomeMessage = Welcome on the conference suggestion page.
+EvntOrgRegistrationBoothWelcomeMessage = Welcome on the booth suggestion page.
+EvntOrgVoteHelpMessage = Here, you can view and vote for the suggested events for the project
+VoteOk = Your vote has been accepted.
+AlreadyVoted = You have already voted for this event.
+VoteError = An error has occurred during the vote, please try again.
+
+#
+# SubscriptionOk page
+#
+SubscriptionOk = Your subscription to this conference has been validated
+#
+# Subscription validation mail
+#
+ConfAttendeeSubscriptionConfirmation = Confirmation of your subscription to a conference
+#
+# Payment page
+#
+Attendee = Attendee
+PaymentConferenceAttendee = Conference attendee payment
+PaymentBoothLocation = Booth location payment
diff --git a/htdocs/langs/ko_KR/hrm.lang b/htdocs/langs/ko_KR/hrm.lang
index 3b8f137e103..da098e10bdb 100644
--- a/htdocs/langs/ko_KR/hrm.lang
+++ b/htdocs/langs/ko_KR/hrm.lang
@@ -9,7 +9,7 @@ ConfirmDeleteEstablishment=Are you sure you wish to delete this establishment?
 OpenEtablishment=Open establishment
 CloseEtablishment=Close establishment
 # Dictionary
-DictionaryPublicHolidays=HRM - Public holidays
+DictionaryPublicHolidays=Leave - Public holidays
 DictionaryDepartment=HRM - Department list
 DictionaryFunction=HRM - Job positions
 # Module
diff --git a/htdocs/langs/ko_KR/knowledgemanagement.lang b/htdocs/langs/ko_KR/knowledgemanagement.lang
index bf81f127258..158cb54aa80 100644
--- a/htdocs/langs/ko_KR/knowledgemanagement.lang
+++ b/htdocs/langs/ko_KR/knowledgemanagement.lang
@@ -47,7 +47,7 @@ KnowledgeManagementArea = Knowledge Management
 # Menu
 #
 MenuKnowledgeRecord = Knowledge base
-ListOfArticles = List of articles
+ListKnowledgeRecord = List of articles
 NewKnowledgeRecord = New article
 ValidateReply = Validate solution
 KnowledgeRecords = Articles
diff --git a/htdocs/langs/ko_KR/languages.lang b/htdocs/langs/ko_KR/languages.lang
index f81f3e8d03d..300d4ada9a8 100644
--- a/htdocs/langs/ko_KR/languages.lang
+++ b/htdocs/langs/ko_KR/languages.lang
@@ -3,6 +3,7 @@ Language_am_ET=Ethiopian
 Language_ar_AR=아랍어
 Language_ar_EG=Arabic (Egypt)
 Language_ar_SA=아랍어
+Language_ar_TN=Arabic (Tunisia)
 Language_az_AZ=Azerbaijani
 Language_bn_BD=벵골어
 Language_bn_IN=Bengali (India)
@@ -84,6 +85,7 @@ Language_nl_NL=Dutch
 Language_pl_PL=폴란드어
 Language_pt_BR=포르투갈어 (브라질)
 Language_pt_PT=포르투갈어
+Language_ro_MD=Romanian (Moldavia)
 Language_ro_RO=루마니아어
 Language_ru_RU=러시아어
 Language_ru_UA=러시아어 (우크라이나)
diff --git a/htdocs/langs/ko_KR/main.lang b/htdocs/langs/ko_KR/main.lang
index 3e4f76343ab..a5dc00fac2f 100644
--- a/htdocs/langs/ko_KR/main.lang
+++ b/htdocs/langs/ko_KR/main.lang
@@ -430,6 +430,7 @@ LT1IN=CGST
 LT2IN=SGST
 LT1GC=Additionnal cents
 VATRate=세율
+RateOfTaxN=Rate of tax %s
 VATCode=Tax Rate code
 VATNPR=Tax Rate NPR
 DefaultTaxRate=Default tax rate
@@ -729,6 +730,7 @@ MenuMembers=회원
 MenuAgendaGoogle=구글 의제
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr한계 (메뉴 홈-설정-보안): %s Kb, PHP 한계: %s Kb
+ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
 NoFileFound=No documents uploaded
 CurrentUserLanguage=현재 언어
 CurrentTheme=현재 테마
@@ -1072,6 +1074,7 @@ ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
 ToClose=To close
+ToRefuse=To refuse
 ToProcess=To process
 ToApprove=To approve
 GlobalOpenedElemView=Global view
@@ -1126,9 +1129,11 @@ UpdateForAllLines=Update for all lines
 OnHold=On hold
 Civility=Civility
 AffectTag=Affect Tag
+CreateExternalUser=Create external user
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
 ConfirmCancel=Are you sure you want to cancel
+EmailMsgID=Email MsgID
diff --git a/htdocs/langs/ko_KR/members.lang b/htdocs/langs/ko_KR/members.lang
index f1eda130c94..b61d253a6a8 100644
--- a/htdocs/langs/ko_KR/members.lang
+++ b/htdocs/langs/ko_KR/members.lang
@@ -213,3 +213,5 @@ SendReminderForExpiredSubscription=Send reminder by email to members when subscr
 MembershipPaid=Membership paid for current period (until %s)
 YouMayFindYourInvoiceInThisEmail=You may find your invoice attached to this email
 XMembersClosed=%s member(s) closed
+XExternalUserCreated=%s external user(s) created
+ForceMemberNature=Force member nature (Individual or Corporation)
diff --git a/htdocs/langs/ko_KR/modulebuilder.lang b/htdocs/langs/ko_KR/modulebuilder.lang
index 9fdaa1a533a..23a098be2e5 100644
--- a/htdocs/langs/ko_KR/modulebuilder.lang
+++ b/htdocs/langs/ko_KR/modulebuilder.lang
@@ -143,3 +143,4 @@ AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
 ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
+ImportExportProfiles=Import and export profiles
diff --git a/htdocs/langs/ko_KR/mrp.lang b/htdocs/langs/ko_KR/mrp.lang
index ec999a473a4..131e1f376ac 100644
--- a/htdocs/langs/ko_KR/mrp.lang
+++ b/htdocs/langs/ko_KR/mrp.lang
@@ -8,12 +8,12 @@ MenuBOM=Bills of material
 LatestBOMModified=Latest %s Bills of materials modified
 LatestMOModified=Latest %s Manufacturing Orders modified
 Bom=Bills of Material
-BillOfMaterials=Bill of Material
+BillOfMaterials=Bill of Materials
 BOMsSetup=Setup of module BOM
 ListOfBOMs=List of bills of material - BOM
 ListOfManufacturingOrders=List of Manufacturing Orders
-NewBOM=New bill of material
-ProductBOMHelp=Product to create with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
+NewBOM=New bill of materials
+ProductBOMHelp=Product to create (or disassemble) with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
 BOMsNumberingModules=BOM numbering templates
 BOMsModelModule=BOM document templates
 MOsNumberingModules=MO numbering templates
@@ -22,7 +22,7 @@ FreeLegalTextOnBOMs=Free text on document of BOM
 WatermarkOnDraftBOMs=Watermark on draft BOM
 FreeLegalTextOnMOs=Free text on document of MO
 WatermarkOnDraftMOs=Watermark on draft MO
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials %s ?
 ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
 ManufacturingEfficiency=Manufacturing efficiency
 ConsumptionEfficiency=Consumption efficiency
@@ -30,8 +30,8 @@ ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the produc
 ValueOfMeansLossForProductProduced=Value of 0.95 means an average of 5%% of loss of produced product
 DeleteBillOfMaterials=Delete Bill Of Materials
 DeleteMo=Delete Manufacturing Order
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Materials?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Materials?
 MenuMRP=Manufacturing Orders
 NewMO=New Manufacturing Order
 QtyToProduce=Qty to produce
@@ -39,7 +39,7 @@ DateStartPlannedMo=Date start planned
 DateEndPlannedMo=Date end planned
 KeepEmptyForAsap=Empty means 'As Soon As Possible'
 EstimatedDuration=Estimated duration
-EstimatedDurationDesc=Estimated duration to manufacture this product using this BOM
+EstimatedDurationDesc=Estimated duration to manufacture (or disassemble) this product using this BOM
 ConfirmValidateBom=Are you sure you want to validate the BOM with the reference <strong>%s</strong> (you will be able to use it to build new Manufacturing Orders)
 ConfirmCloseBom=Are you sure you want to cancel this BOM (you won't be able to use it to build new Manufacturing Orders anymore) ?
 ConfirmReopenBom=Are you sure you want to re-open this BOM (you will be able to use it to build new Manufacturing Orders)
@@ -63,13 +63,14 @@ ConsumeAndProduceAll=Consume and Produce All
 Manufactured=Manufactured
 TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
 ForAQuantityOf=For a quantity to produce of %s
+ForAQuantityToConsumeOf=For a quantity to disassemble of %s
 ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
 ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
 ProductionForRef=Production of %s
 AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
 NoStockChangeOnServices=No stock change on services
 ProductQtyToConsumeByMO=Product quantity still to consume by open MO
-ProductQtyToProduceByMO=Product quentity still to produce by open MO
+ProductQtyToProduceByMO=Product quantity still to produce by open MO
 AddNewConsumeLines=Add new line to consume
 ProductsToConsume=Products to consume
 ProductsToProduce=Products to produce
@@ -83,15 +84,13 @@ Workstations=Workstations
 WorkstationsDescription=Workstations management
 WorkstationSetup = Workstations setup
 WorkstationSetupPage = Workstations setup page
-WorkstationAbout = About Workstation
-WorkstationAboutPage = Workstations about page
 WorkstationList=Workstation list
 WorkstationCreate=Add new workstation
 ConfirmEnableWorkstation=Are you sure you want to enable workstation <b>%s</b> ?
 EnableAWorkstation=Enable a workstation
 ConfirmDisableWorkstation=Are you sure you want to disable workstation <b>%s</b> ?
 DisableAWorkstation=Disable a workstation
-DeleteWorkstation=Supprimer
+DeleteWorkstation=삭제
 NbOperatorsRequired=Number of operators required
 THMOperatorEstimated=Estimated operator THM
 THMMachineEstimated=Estimated machine THM
diff --git a/htdocs/langs/ko_KR/orders.lang b/htdocs/langs/ko_KR/orders.lang
index 15ea1253bc4..c695af8fb73 100644
--- a/htdocs/langs/ko_KR/orders.lang
+++ b/htdocs/langs/ko_KR/orders.lang
@@ -11,6 +11,7 @@ OrderDate=주문일
 OrderDateShort=주문일
 OrderToProcess=Order to process
 NewOrder=New order
+NewSupplierOrderShort=New order
 NewOrderSupplier=New Purchase Order
 ToOrder=Make order
 MakeOrder=Make order
@@ -73,6 +74,7 @@ DeleteOrder=Delete order
 CancelOrder=Cancel order
 OrderReopened= Order %s re-open
 AddOrder=Create order
+AddSupplierOrderShort=Create order
 AddPurchaseOrder=Create purchase order
 AddToDraftOrders=Add to draft order
 ShowOrder=Show order
diff --git a/htdocs/langs/ko_KR/other.lang b/htdocs/langs/ko_KR/other.lang
index 479d5c3915e..e4b6b21113a 100644
--- a/htdocs/langs/ko_KR/other.lang
+++ b/htdocs/langs/ko_KR/other.lang
@@ -129,6 +129,7 @@ ClosedByLogin=User login who closed
 FileWasRemoved=File %s was removed
 DirWasRemoved=Directory %s was removed
 FeatureNotYetAvailable=Feature not yet available in the current version
+FeatureNotAvailableOnDevicesWithoutMouse=Feature not available on devices without mouse
 FeaturesSupported=Supported features
 Width=Width
 Height=Height
@@ -263,7 +264,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
-PrefixSession=Prefix for session ID
+SuffixSessionName=Suffix for session name
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/ko_KR/partnership.lang b/htdocs/langs/ko_KR/partnership.lang
index 76f29213307..162eb08087f 100644
--- a/htdocs/langs/ko_KR/partnership.lang
+++ b/htdocs/langs/ko_KR/partnership.lang
@@ -16,41 +16,72 @@
 #
 # Generic
 #
-ModulePartnershipName = Partnership management
-PartnershipDescription = Module Partnership management
+ModulePartnershipName=Partnership management
+PartnershipDescription=Module Partnership management
 PartnershipDescriptionLong= Module Partnership management
 
+AddPartnership=Add partnership
+CancelPartnershipForExpiredMembers=Partnership: Cancel partnership of members with expired subscriptions
+PartnershipCheckBacklink=Partnership: Check referring backlink
+
 #
 # Menu
 #
-NewPartnership = New Partnership
-ListOfPartnerships = List of partnership
+NewPartnership=New Partnership
+ListOfPartnerships=List of partnership
 
 #
 # Admin page
 #
-PartnershipSetup = Partnership setup
-PartnershipAbout = About Partnership
-PartnershipAboutPage = Partnership about page
-
+PartnershipSetup=Partnership setup
+PartnershipAbout=About Partnership
+PartnershipAboutPage=Partnership about page
+partnershipforthirdpartyormember=Partner status must be set on a 'thirdparty' or a 'member'
+PARTNERSHIP_IS_MANAGED_FOR=Partnership managed for
+PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks to check
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb of days before cancelling status of a partnership when a subscription has expired
+ReferingWebsiteCheck=Check of website referring
+ReferingWebsiteCheckDesc=You can enable a feature to check that your partners has added a backlink to your website domains on their own website.
 
 #
 # Object
 #
+DeletePartnership=Delete a partnership
+PartnershipDedicatedToThisThirdParty=Partnership dedicated to this third party
+PartnershipDedicatedToThisMember=Partnership dedicated to this member
 DatePartnershipStart=시작날짜
 DatePartnershipEnd=종료날짜
+ReasonDecline=Decline reason
+ReasonDeclineOrCancel=Decline reason
+PartnershipAlreadyExist=Partnership already exist
+ManagePartnership=Manage partnership
+BacklinkNotFoundOnPartnerWebsite=Backlink not found on partner website
+ConfirmClosePartnershipAsk=Are you sure you want to cancel this partnership?
+PartnershipType=Partnership type
 
 #
 # Template Mail
 #
+SendingEmailOnPartnershipWillSoonBeCanceled=Partnership will soon be canceled
+SendingEmailOnPartnershipRefused=Partnership refused
+SendingEmailOnPartnershipAccepted=Partnership accepted
+SendingEmailOnPartnershipCanceled=Partnership canceled
 
+YourPartnershipWillSoonBeCanceledTopic=Partnership will soon be canceled
+YourPartnershipRefusedTopic=Partnership refused
+YourPartnershipAcceptedTopic=Partnership accepted
+YourPartnershipCanceledTopic=Partnership canceled
+
+YourPartnershipWillSoonBeCanceledContent=We inform you that your partnership will soon be canceled (Backlink not found)
+YourPartnershipRefusedContent=We inform you that your partnership request has been refused.
+YourPartnershipAcceptedContent=We inform you that your partnership request has been accepted.
+YourPartnershipCanceledContent=We inform you that your partnership has been canceled.
 
 #
 # Status
 #
-PartnershipDraft = 작성
-PartnershipAccepted = Accepted
-PartnershipRefused = 거절됨
-PartnershipCanceled = 취소 됨
-
+PartnershipDraft=작성
+PartnershipAccepted=Accepted
+PartnershipRefused=거절됨
+PartnershipCanceled=취소 됨
 PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/ko_KR/productbatch.lang b/htdocs/langs/ko_KR/productbatch.lang
index 54e34241620..1164079f0b3 100644
--- a/htdocs/langs/ko_KR/productbatch.lang
+++ b/htdocs/langs/ko_KR/productbatch.lang
@@ -1,4 +1,4 @@
-# ProductBATCH language file - en_US - ProductBATCH
+# ProductBATCH language file - Source file is en_US - ProductBATCH
 ManageLotSerial=생산일련번호 사용
 ProductStatusOnBatch=Yes (lot required)
 ProductStatusOnSerial=Yes (unique serial number required)
@@ -33,3 +33,13 @@ CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+LifeTime=Life span (in days)
+EndOfLife=End of life
+ManufacturingDate=Manufacturing date
+DestructionDate=Destruction date
+FirstUseDate=First use date
+QCFrequency=Quality control frequency (in days)
+
+#Traceability - qc status
+OutOfOrder=Out of order
+InWorkingOrder=In working order
diff --git a/htdocs/langs/ko_KR/products.lang b/htdocs/langs/ko_KR/products.lang
index 7d3974c3ce1..cfe0f78e7b9 100644
--- a/htdocs/langs/ko_KR/products.lang
+++ b/htdocs/langs/ko_KR/products.lang
@@ -396,3 +396,5 @@ ActionAvailableOnVariantProductOnly=Action only available on the variant of prod
 ProductsPricePerCustomer=Product prices per customers
 ProductSupplierExtraFields=Additional Attributes (Supplier Prices)
 DeleteLinkedProduct=Delete the child product linked to the combination
+PMPValue=Weighted average price
+PMPValueShort=WAP
diff --git a/htdocs/langs/ko_KR/projects.lang b/htdocs/langs/ko_KR/projects.lang
index f96d108ce0a..47487fd582e 100644
--- a/htdocs/langs/ko_KR/projects.lang
+++ b/htdocs/langs/ko_KR/projects.lang
@@ -267,9 +267,11 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=New invoice
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+OneLinePerTimeSpentLine=One line for each time spent declaration
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
 AddPersonToTask=Add also to tasks
 UsageOrganizeEvent=Usage: Event Organization
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
+SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
diff --git a/htdocs/langs/ko_KR/receptions.lang b/htdocs/langs/ko_KR/receptions.lang
index 7ddcf5a2cf0..e5afa8f5927 100644
--- a/htdocs/langs/ko_KR/receptions.lang
+++ b/htdocs/langs/ko_KR/receptions.lang
@@ -44,4 +44,4 @@ ValidateOrderFirstBeforeReception=You must first validate the order before being
 ReceptionsNumberingModules=Numbering module for receptions
 ReceptionsReceiptModel=Document templates for receptions
 NoMorePredefinedProductToDispatch=No more predefined products to dispatch
-
+ReceptionExist=A reception exists
diff --git a/htdocs/langs/ko_KR/stocks.lang b/htdocs/langs/ko_KR/stocks.lang
index 062257db139..fd8b4e46ae7 100644
--- a/htdocs/langs/ko_KR/stocks.lang
+++ b/htdocs/langs/ko_KR/stocks.lang
@@ -56,8 +56,6 @@ UnitPurchaseValue=Unit purchase price
 StockTooLow=Stock too low
 StockLowerThanLimit=Stock lower than alert limit (%s)
 EnhancedValue=값
-PMPValue=Weighted average price
-PMPValueShort=WAP
 EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
@@ -251,7 +249,10 @@ SelectAStockMovementFileToImport=select a stock movement file to import
 InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
 LabelOfInventoryMovemement=Inventory %s
 ReOpen=Reopen
-ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock to the real qty you entered into the inventory.
 ObjectNotFound=%s not found
 MakeMovementsAndClose=Generate movements and close
 AutofillWithExpected=Fill real quantity with expected quantity
+ShowAllBatchByDefault=By default, show batch details on product "stock" tab
+CollapseBatchDetailHelp=You can set batch detail default display in stocks module configuration
+FieldCannotBeNegative=Field "%s" cannot be negative
diff --git a/htdocs/langs/ko_KR/ticket.lang b/htdocs/langs/ko_KR/ticket.lang
index 211a1bd4526..c528ed9805f 100644
--- a/htdocs/langs/ko_KR/ticket.lang
+++ b/htdocs/langs/ko_KR/ticket.lang
@@ -304,7 +304,7 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
-BoxTicketType=Number of open tickets by type
+BoxTicketType=Distribution of open tickets by type
 BoxTicketSeverity=Number of open tickets by severity
 BoxNoTicketSeverity=No tickets opened
 BoxTicketLastXDays=Number of new tickets by days the last %s days
diff --git a/htdocs/langs/lo_LA/accountancy.lang b/htdocs/langs/lo_LA/accountancy.lang
index 31b3bae5003..ec30b55ae47 100644
--- a/htdocs/langs/lo_LA/accountancy.lang
+++ b/htdocs/langs/lo_LA/accountancy.lang
@@ -158,7 +158,7 @@ ACCOUNTING_LENGTH_AACCOUNT=Length of the third-party accounting accounts (If you
 ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of an accounting account. Needed by some countries (like Switzerland). If set to off (default), you can set the following two parameters to ask the application to add virtual zeros.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties, break ability to search on a part of value)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
@@ -328,6 +328,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountanc
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
+NotifiedExportDate=Notified export date (modification of the entries will not be possible)
+NotifiedValidationDate=Validation of the entries (modification or deletion of the entries will not be possible)
+ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=Export draft journal
 Modelcsv=Model of export
 Selectmodelcsv=Select a model of export
diff --git a/htdocs/langs/lo_LA/admin.lang b/htdocs/langs/lo_LA/admin.lang
index 74c124e3051..2e8805572bd 100644
--- a/htdocs/langs/lo_LA/admin.lang
+++ b/htdocs/langs/lo_LA/admin.lang
@@ -221,8 +221,8 @@ NotCompatible=This module does not seem compatible with your Dolibarr %s (Min %s
 CompatibleAfterUpdate=This module requires an update to your Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=See in Market place
 SeeSetupOfModule=See setup of module %s
+SetOptionTo=Set option <b>%s</b> to %s
 Updated=Updated
-Nouveauté=Novelty
 AchatTelechargement=Buy / Download
 GoModuleSetupArea=To deploy/install a new module, go to the Module setup area: <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
@@ -399,6 +399,7 @@ SecurityToken=Key to secure URLs
 NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
 PDF=PDF
 PDFDesc=Global options for PDF generation
+PDFOtherDesc=PDF Option specific to some modules
 PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
 PDFRulesForSalesTax=Rules for Sales Tax / VAT
@@ -561,7 +562,7 @@ Module53Desc=Management of Services
 Module54Name=Contracts/Subscriptions
 Module54Desc=Management of contracts (services or recurring subscriptions)
 Module55Name=Barcodes
-Module55Desc=Barcode management
+Module55Desc=Barcode or QR code management
 Module56Name=Payment by credit transfer
 Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
 Module57Name=Payments by Direct Debit
@@ -848,10 +849,10 @@ Permission402=Create/modify discounts
 Permission403=Validate discounts
 Permission404=Delete discounts
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries (yours and subordinates)
-Permission512=Create/modify payments of salaries
-Permission514=Delete payments of salaries
-Permission517=Read payments of salaries of everybody
+Permission511=Read salaries and payments (yours and subordinates)
+Permission512=Create/modify salaries and payments
+Permission514=Delete salaries and payments
+Permission517=Read salaries and payments everybody
 Permission519=Export salaries
 Permission520=Read Loans
 Permission522=Create/modify loans
@@ -965,6 +966,8 @@ Permission23003=Delete Scheduled job
 Permission23004=Execute Scheduled job
 Permission50101=Use Point of Sale (SimplePOS)
 Permission50151=Use Point of Sale (TakePOS)
+Permission50152=Edit sales lines
+Permission50153=Edit ordered sales lines
 Permission50201=Read transactions
 Permission50202=Import transactions
 Permission50330=Read objects of Zapier
@@ -1039,11 +1042,12 @@ DictionaryMeasuringUnits=Measuring Units
 DictionarySocialNetworks=Social Networks
 DictionaryProspectStatus=Prospect status for companies
 DictionaryProspectContactStatus=Prospect status for contacts
-DictionaryHolidayTypes=Types of leave
+DictionaryHolidayTypes=Leave - Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
 DictionaryTransportMode=Intracomm report - Transport mode
+DictionaryBatchStatus=Product lot/serial Quality Control status
 TypeOfUnit=Type of unit
 SetupSaved=Setup saved
 SetupNotSaved=Setup not saved
@@ -1187,7 +1191,7 @@ SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of m
 SetupDescription5=Other Setup menu entries manage optional parameters.
 AuditedSecurityEvents=Security events that are audited
 NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
-Audit=Audit
+Audit=Security events
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
 InfoOS=About OS
@@ -1319,9 +1323,12 @@ ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
 NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
+ComboListOptim=Combo list loading optimization
 SearchOptim=Search optimization
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
-YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
+YouHaveXObjectUseComboOptim=You have %s %s in the database. You can go into setup of module to enable loading of combo list on key pressed event.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other.
+YouHaveXObjectUseSearchOptimDesc=This limits the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to %s in Home-Setup-Other.
 BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
 BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
 PHPModuleLoaded=PHP component %s is loaded
@@ -1433,6 +1440,7 @@ MemberMainOptions=Main options
 AdherentLoginRequired= Manage a Login for each member
 AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
+MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
 MembersDocModules=Document templates for documents generated from member record
@@ -1763,7 +1771,7 @@ AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting men
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
-AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the scheduled job %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
@@ -1979,6 +1987,8 @@ 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_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add picture on proposal line
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add electronic sign in PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
@@ -2096,7 +2106,6 @@ PDF_SHOW_PROJECT=Show project on document
 ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
-FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
@@ -2120,12 +2129,18 @@ ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by
 MailToSendEventOrganization=Event Organization
 AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
 YouShouldDisablePHPFunctions=You should disable PHP functions
-IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands in custom code, you shoud disable PHP functions
+PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
+NotRecommended=Not recommanded
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
 ModuleUpdateAvailable=An update is available
 NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
+RandomlySelectedIfSeveral=Randomly selected if several pictures are available
+DatabasePasswordObfuscated=Database password is obfuscated in conf file
+DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
diff --git a/htdocs/langs/lo_LA/agenda.lang b/htdocs/langs/lo_LA/agenda.lang
index 09d82139a49..a1183841b00 100644
--- a/htdocs/langs/lo_LA/agenda.lang
+++ b/htdocs/langs/lo_LA/agenda.lang
@@ -4,7 +4,7 @@ Actions=Events
 Agenda=Agenda
 TMenuAgenda=Agenda
 Agendas=Agendas
-LocalAgenda=Internal calendar
+LocalAgenda=Default calendar
 ActionsOwnedBy=Event owned by
 ActionsOwnedByShort=Owner
 AffectedTo=Assigned to
@@ -14,13 +14,13 @@ EventsNb=Number of events
 ListOfActions=List of events
 EventReports=Event reports
 Location=Location
-ToUserOfGroup=Event assigned to any user in group
+ToUserOfGroup=Event assigned to any user in the group
 EventOnFullDay=Event on all day(s)
 MenuToDoActions=All incomplete events
 MenuDoneActions=All terminated events
 MenuToDoMyActions=My incomplete events
 MenuDoneMyActions=My terminated events
-ListOfEvents=List of events (internal calendar)
+ListOfEvents=List of events (default calendar)
 ActionsAskedBy=Events reported by
 ActionsToDoBy=Events assigned to
 ActionsDoneBy=Events done by
@@ -38,6 +38,7 @@ ActionsEvents=Events for which Dolibarr will create an action in agenda automati
 EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Third party %s created
+COMPANY_MODIFYInDolibarr=Third party %s modified
 COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=Contract %s validated
 CONTRACT_DELETEInDolibarr=Contract %s deleted
@@ -87,6 +88,7 @@ OrderDeleted=Order deleted
 InvoiceDeleted=Invoice deleted
 DraftInvoiceDeleted=Draft invoice deleted
 CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_MODIFYInDolibarr=Contact %s modified
 CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Product %s created
 PRODUCT_MODIFYInDolibarr=Product %s modified
@@ -119,6 +121,7 @@ MRP_MO_UNVALIDATEInDolibarr=MO set to draft status
 MRP_MO_PRODUCEDInDolibarr=MO produced
 MRP_MO_DELETEInDolibarr=MO deleted
 MRP_MO_CANCELInDolibarr=MO canceled
+PAIDInDolibarr=%s paid
 ##### End agenda events #####
 AgendaModelModule=Document templates for event
 DateActionStart=Start date
@@ -130,7 +133,7 @@ AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to use
 AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
 AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic events.
 AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> to include events of holidays.
-AgendaShowBirthdayEvents=Show birthdays of contacts
+AgendaShowBirthdayEvents=Birthdays of contacts
 AgendaHideBirthdayEvents=Hide birthdays of contacts
 Busy=Busy
 ExportDataset_event1=List of agenda events
@@ -152,6 +155,7 @@ ActionType=Event type
 DateActionBegin=Start event date
 ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b>?
 RepeatEvent=Repeat event
+OnceOnly=Once only
 EveryWeek=Every week
 EveryMonth=Every month
 DayOfMonth=Day of month
@@ -165,4 +169,4 @@ TimeType=Duration type
 ReminderType=Callback type
 AddReminder=Create an automatic reminder notification for this event
 ErrorReminderActionCommCreation=Error creating the reminder notification for this event
-BrowserPush=Browser Notification
+BrowserPush=Browser Popup Notification
diff --git a/htdocs/langs/lo_LA/bills.lang b/htdocs/langs/lo_LA/bills.lang
index c55f483873b..7b8c997d2e6 100644
--- a/htdocs/langs/lo_LA/bills.lang
+++ b/htdocs/langs/lo_LA/bills.lang
@@ -259,6 +259,7 @@ DateMaxPayment=Payment due on
 DateInvoice=Invoice date
 DatePointOfTax=Point of tax
 NoInvoice=No invoice
+NoOpenInvoice=No open invoice
 ClassifyBill=Classify invoice
 SupplierBillsToPay=Unpaid vendor invoices
 CustomerBillsUnpaid=Unpaid customer invoices
@@ -589,3 +590,4 @@ FacParentLine=Invoice Line Parent
 SituationTotalRayToRest=Remainder to pay without taxe
 PDFSituationTitle=Situation n° %d
 SituationTotalProgress=Total progress %d %%
+SearchUnpaidInvoicesWithDueDate=Search unpaid invoices with a due date = %s
diff --git a/htdocs/langs/lo_LA/cashdesk.lang b/htdocs/langs/lo_LA/cashdesk.lang
index 240503842f3..aea1f02f834 100644
--- a/htdocs/langs/lo_LA/cashdesk.lang
+++ b/htdocs/langs/lo_LA/cashdesk.lang
@@ -102,7 +102,7 @@ CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal numb
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
 SaleStartedAt=Sale started at %s
-ControlCashOpening=Control cash popup at opening POS
+ControlCashOpening=Open the "Control cash" popup when opening the POS
 CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -126,5 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
-ShowPriceHT = Display the price excluding tax column
-ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
+ShowPriceHT = Display the column with the price excluding tax (on screen)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
diff --git a/htdocs/langs/lo_LA/compta.lang b/htdocs/langs/lo_LA/compta.lang
index 1f9c7124db6..88d80559f16 100644
--- a/htdocs/langs/lo_LA/compta.lang
+++ b/htdocs/langs/lo_LA/compta.lang
@@ -286,3 +286,9 @@ ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
 IncludeLoansInResults = Include loans in reports
+InvoiceLate30Days = Invoices late > 30 days
+InvoiceLate15Days = Invoices late > 15 days
+InvoiceLateMinus15Days = Invoices late
+InvoiceNotLate = To be collected < 15 days
+InvoiceNotLate15Days = To be collected in 15 days
+InvoiceNotLate30Days = To be collected in 30 days
diff --git a/htdocs/langs/lo_LA/cron.lang b/htdocs/langs/lo_LA/cron.lang
index 86ecd876e5a..11cc35ea080 100644
--- a/htdocs/langs/lo_LA/cron.lang
+++ b/htdocs/langs/lo_LA/cron.lang
@@ -60,7 +60,7 @@ CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
 CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=ປິດການນຳໃຊ້
-CronTaskInactive=This job is disabled
+CronTaskInactive=This job is disabled (not scheduled)
 CronId=Id
 CronClassFile=Filename with class
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example 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>
diff --git a/htdocs/langs/lo_LA/errors.lang b/htdocs/langs/lo_LA/errors.lang
index 9b14b5ad1d2..670f8c7a6bc 100644
--- a/htdocs/langs/lo_LA/errors.lang
+++ b/htdocs/langs/lo_LA/errors.lang
@@ -11,6 +11,7 @@ ErrorBadValueForParamNotAString=Bad value for your parameter. It appends general
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s already exists.
 ErrorGroupAlreadyExists=Group %s already exists.
+ErrorEmailAlreadyExists=Email %s already exists.
 ErrorRecordNotFound=Record not found.
 ErrorFailToCopyFile=Failed to copy file '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
@@ -117,7 +118,7 @@ ErrorCantReadFile=Failed to read file '%s'
 ErrorCantReadDir=Failed to read directory '%s'
 ErrorBadLoginPassword=Bad value for login or password
 ErrorLoginDisabled=Your account has been disabled
-ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server. If PHP <b>Safe Mode</b> is enabled, check that command is inside a directory defined by parameter <b>safe_mode_exec_dir</b>.
+ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server user. Check also the command is not protected on shell level by a security layer like apparmor.
 ErrorFailedToChangePassword=Failed to change password
 ErrorLoginDoesNotExists=User with login <b>%s</b> could not be found.
 ErrorLoginHasNoEmail=This user has no email address. Process aborted.
@@ -262,6 +263,7 @@ ErrorDateIsInFuture=Error, the date can't be in the future
 ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
 ErrorAPercentIsRequired=Error, please fill in the percentage correctly
 ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
+ErrorFailedToFindEmailTemplate=Failed to find template with code name %s
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -298,3 +300,4 @@ WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So y
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
+ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
diff --git a/htdocs/langs/lo_LA/eventorganization.lang b/htdocs/langs/lo_LA/eventorganization.lang
index 75b798fbc3a..335c257b224 100644
--- a/htdocs/langs/lo_LA/eventorganization.lang
+++ b/htdocs/langs/lo_LA/eventorganization.lang
@@ -1,4 +1,5 @@
 # Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+# Copyright (C) 2021		Dorian Vabre			<dorian.vabre@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
@@ -81,7 +82,10 @@ PriceOfBoothHelp=Subscription price to stand a booth
 EventOrganizationICSLink=Link ICS for events
 ConferenceOrBoothInformation=Conference Or Booth informations
 Attendees = Attendees
+DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
 #
 # Status
 #
@@ -94,8 +98,46 @@ EvntOrgCancelled = Cancelled
 #
 # Public page
 #
+SuggestForm = Suggestion page
+RegisterPage = Page for conferences or booth
+EvntOrgRegistrationHelpMessage = Here, you can vote for an event, or suggest a new conference or booth for the project
+EvntOrgRegistrationConfHelpMessage = Here, you can suggest a new conference for the project
+EvntOrgRegistrationBoothHelpMessage = Here, you can suggest a new booth for the project
+ListOfSuggestedConferences = List of suggested conferences
+ListOfSuggestedBooths = List of suggested booths
+SuggestConference = Suggest a new conference
+SuggestBooth = Suggest a booth
+ViewAndVote = View and vote for suggested events
 PublicAttendeeSubscriptionPage = Public link of registration to a conference
 MissingOrBadSecureKey = The security key is invalid or missing
-EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
-EvntOrgStartDuration = This conference starts on
-EvntOrgEndDuration =  and ends on
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference : '%s'
+EvntOrgDuration = This conference starts on %s and ends on %s.
+ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
+BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
+EventType = Event type
+
+#
+# Vote page
+#
+EvntOrgRegistrationWelcomeMessage = Welcome on the conference or booth suggestion page.
+EvntOrgRegistrationConfWelcomeMessage = Welcome on the conference suggestion page.
+EvntOrgRegistrationBoothWelcomeMessage = Welcome on the booth suggestion page.
+EvntOrgVoteHelpMessage = Here, you can view and vote for the suggested events for the project
+VoteOk = Your vote has been accepted.
+AlreadyVoted = You have already voted for this event.
+VoteError = An error has occurred during the vote, please try again.
+
+#
+# SubscriptionOk page
+#
+SubscriptionOk = Your subscription to this conference has been validated
+#
+# Subscription validation mail
+#
+ConfAttendeeSubscriptionConfirmation = Confirmation of your subscription to a conference
+#
+# Payment page
+#
+Attendee = Attendee
+PaymentConferenceAttendee = Conference attendee payment
+PaymentBoothLocation = Booth location payment
diff --git a/htdocs/langs/lo_LA/hrm.lang b/htdocs/langs/lo_LA/hrm.lang
index 3b8f137e103..da098e10bdb 100644
--- a/htdocs/langs/lo_LA/hrm.lang
+++ b/htdocs/langs/lo_LA/hrm.lang
@@ -9,7 +9,7 @@ ConfirmDeleteEstablishment=Are you sure you wish to delete this establishment?
 OpenEtablishment=Open establishment
 CloseEtablishment=Close establishment
 # Dictionary
-DictionaryPublicHolidays=HRM - Public holidays
+DictionaryPublicHolidays=Leave - Public holidays
 DictionaryDepartment=HRM - Department list
 DictionaryFunction=HRM - Job positions
 # Module
diff --git a/htdocs/langs/lo_LA/knowledgemanagement.lang b/htdocs/langs/lo_LA/knowledgemanagement.lang
index 269007e60f8..68f5cced76c 100644
--- a/htdocs/langs/lo_LA/knowledgemanagement.lang
+++ b/htdocs/langs/lo_LA/knowledgemanagement.lang
@@ -47,7 +47,7 @@ KnowledgeManagementArea = Knowledge Management
 # Menu
 #
 MenuKnowledgeRecord = Knowledge base
-ListOfArticles = List of articles
+ListKnowledgeRecord = List of articles
 NewKnowledgeRecord = New article
 ValidateReply = Validate solution
 KnowledgeRecords = Articles
diff --git a/htdocs/langs/lo_LA/languages.lang b/htdocs/langs/lo_LA/languages.lang
index ba187326705..da8ad5376a1 100644
--- a/htdocs/langs/lo_LA/languages.lang
+++ b/htdocs/langs/lo_LA/languages.lang
@@ -3,6 +3,7 @@ Language_am_ET=Ethiopian
 Language_ar_AR=Arabic
 Language_ar_EG=Arabic (Egypt)
 Language_ar_SA=Arabic
+Language_ar_TN=Arabic (Tunisia)
 Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengali
 Language_bn_IN=Bengali (India)
@@ -84,6 +85,7 @@ Language_nl_NL=Dutch
 Language_pl_PL=Polish
 Language_pt_BR=Portuguese (Brazil)
 Language_pt_PT=Portuguese
+Language_ro_MD=Romanian (Moldavia)
 Language_ro_RO=Romanian
 Language_ru_RU=Russian
 Language_ru_UA=Russian (Ukraine)
diff --git a/htdocs/langs/lo_LA/main.lang b/htdocs/langs/lo_LA/main.lang
index 85f622e4796..8a166703bbf 100644
--- a/htdocs/langs/lo_LA/main.lang
+++ b/htdocs/langs/lo_LA/main.lang
@@ -430,6 +430,7 @@ LT1IN=CGST
 LT2IN=SGST
 LT1GC=Additionnal cents
 VATRate=Tax Rate
+RateOfTaxN=Rate of tax %s
 VATCode=Tax Rate code
 VATNPR=Tax Rate NPR
 DefaultTaxRate=Default tax rate
@@ -729,6 +730,7 @@ MenuMembers=Members
 MenuAgendaGoogle=Google agenda
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
+ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
 NoFileFound=No documents uploaded
 CurrentUserLanguage=Current language
 CurrentTheme=Current theme
@@ -1072,6 +1074,7 @@ ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
 ToClose=To close
+ToRefuse=To refuse
 ToProcess=To process
 ToApprove=To approve
 GlobalOpenedElemView=Global view
@@ -1126,9 +1129,11 @@ UpdateForAllLines=Update for all lines
 OnHold=On hold
 Civility=Civility
 AffectTag=Affect Tag
+CreateExternalUser=Create external user
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
 ConfirmCancel=Are you sure you want to cancel
+EmailMsgID=Email MsgID
diff --git a/htdocs/langs/lo_LA/members.lang b/htdocs/langs/lo_LA/members.lang
index 304c76e63aa..7f9ef8c2392 100644
--- a/htdocs/langs/lo_LA/members.lang
+++ b/htdocs/langs/lo_LA/members.lang
@@ -213,3 +213,5 @@ SendReminderForExpiredSubscription=Send reminder by email to members when subscr
 MembershipPaid=Membership paid for current period (until %s)
 YouMayFindYourInvoiceInThisEmail=You may find your invoice attached to this email
 XMembersClosed=%s member(s) closed
+XExternalUserCreated=%s external user(s) created
+ForceMemberNature=Force member nature (Individual or Corporation)
diff --git a/htdocs/langs/lo_LA/modulebuilder.lang b/htdocs/langs/lo_LA/modulebuilder.lang
index 9fdaa1a533a..23a098be2e5 100644
--- a/htdocs/langs/lo_LA/modulebuilder.lang
+++ b/htdocs/langs/lo_LA/modulebuilder.lang
@@ -143,3 +143,4 @@ AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
 ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
+ImportExportProfiles=Import and export profiles
diff --git a/htdocs/langs/lo_LA/mrp.lang b/htdocs/langs/lo_LA/mrp.lang
index ec999a473a4..00db7f202ec 100644
--- a/htdocs/langs/lo_LA/mrp.lang
+++ b/htdocs/langs/lo_LA/mrp.lang
@@ -8,12 +8,12 @@ MenuBOM=Bills of material
 LatestBOMModified=Latest %s Bills of materials modified
 LatestMOModified=Latest %s Manufacturing Orders modified
 Bom=Bills of Material
-BillOfMaterials=Bill of Material
+BillOfMaterials=Bill of Materials
 BOMsSetup=Setup of module BOM
 ListOfBOMs=List of bills of material - BOM
 ListOfManufacturingOrders=List of Manufacturing Orders
-NewBOM=New bill of material
-ProductBOMHelp=Product to create with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
+NewBOM=New bill of materials
+ProductBOMHelp=Product to create (or disassemble) with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
 BOMsNumberingModules=BOM numbering templates
 BOMsModelModule=BOM document templates
 MOsNumberingModules=MO numbering templates
@@ -22,7 +22,7 @@ FreeLegalTextOnBOMs=Free text on document of BOM
 WatermarkOnDraftBOMs=Watermark on draft BOM
 FreeLegalTextOnMOs=Free text on document of MO
 WatermarkOnDraftMOs=Watermark on draft MO
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials %s ?
 ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
 ManufacturingEfficiency=Manufacturing efficiency
 ConsumptionEfficiency=Consumption efficiency
@@ -30,8 +30,8 @@ ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the produc
 ValueOfMeansLossForProductProduced=Value of 0.95 means an average of 5%% of loss of produced product
 DeleteBillOfMaterials=Delete Bill Of Materials
 DeleteMo=Delete Manufacturing Order
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Materials?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Materials?
 MenuMRP=Manufacturing Orders
 NewMO=New Manufacturing Order
 QtyToProduce=Qty to produce
@@ -39,7 +39,7 @@ DateStartPlannedMo=Date start planned
 DateEndPlannedMo=Date end planned
 KeepEmptyForAsap=Empty means 'As Soon As Possible'
 EstimatedDuration=Estimated duration
-EstimatedDurationDesc=Estimated duration to manufacture this product using this BOM
+EstimatedDurationDesc=Estimated duration to manufacture (or disassemble) this product using this BOM
 ConfirmValidateBom=Are you sure you want to validate the BOM with the reference <strong>%s</strong> (you will be able to use it to build new Manufacturing Orders)
 ConfirmCloseBom=Are you sure you want to cancel this BOM (you won't be able to use it to build new Manufacturing Orders anymore) ?
 ConfirmReopenBom=Are you sure you want to re-open this BOM (you will be able to use it to build new Manufacturing Orders)
@@ -63,13 +63,14 @@ ConsumeAndProduceAll=Consume and Produce All
 Manufactured=Manufactured
 TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
 ForAQuantityOf=For a quantity to produce of %s
+ForAQuantityToConsumeOf=For a quantity to disassemble of %s
 ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
 ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
 ProductionForRef=Production of %s
 AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
 NoStockChangeOnServices=No stock change on services
 ProductQtyToConsumeByMO=Product quantity still to consume by open MO
-ProductQtyToProduceByMO=Product quentity still to produce by open MO
+ProductQtyToProduceByMO=Product quantity still to produce by open MO
 AddNewConsumeLines=Add new line to consume
 ProductsToConsume=Products to consume
 ProductsToProduce=Products to produce
@@ -83,15 +84,13 @@ Workstations=Workstations
 WorkstationsDescription=Workstations management
 WorkstationSetup = Workstations setup
 WorkstationSetupPage = Workstations setup page
-WorkstationAbout = About Workstation
-WorkstationAboutPage = Workstations about page
 WorkstationList=Workstation list
 WorkstationCreate=Add new workstation
 ConfirmEnableWorkstation=Are you sure you want to enable workstation <b>%s</b> ?
 EnableAWorkstation=Enable a workstation
 ConfirmDisableWorkstation=Are you sure you want to disable workstation <b>%s</b> ?
 DisableAWorkstation=Disable a workstation
-DeleteWorkstation=Supprimer
+DeleteWorkstation=ລຶບ
 NbOperatorsRequired=Number of operators required
 THMOperatorEstimated=Estimated operator THM
 THMMachineEstimated=Estimated machine THM
diff --git a/htdocs/langs/lo_LA/orders.lang b/htdocs/langs/lo_LA/orders.lang
index 87d196eb22f..5dab5b99bf1 100644
--- a/htdocs/langs/lo_LA/orders.lang
+++ b/htdocs/langs/lo_LA/orders.lang
@@ -11,6 +11,7 @@ OrderDate=Order date
 OrderDateShort=Order date
 OrderToProcess=Order to process
 NewOrder=New order
+NewSupplierOrderShort=New order
 NewOrderSupplier=New Purchase Order
 ToOrder=Make order
 MakeOrder=Make order
@@ -73,6 +74,7 @@ DeleteOrder=Delete order
 CancelOrder=Cancel order
 OrderReopened= Order %s re-open
 AddOrder=Create order
+AddSupplierOrderShort=Create order
 AddPurchaseOrder=Create purchase order
 AddToDraftOrders=Add to draft order
 ShowOrder=Show order
diff --git a/htdocs/langs/lo_LA/other.lang b/htdocs/langs/lo_LA/other.lang
index adb85986033..320bf6bc982 100644
--- a/htdocs/langs/lo_LA/other.lang
+++ b/htdocs/langs/lo_LA/other.lang
@@ -129,6 +129,7 @@ ClosedByLogin=User login who closed
 FileWasRemoved=File %s was removed
 DirWasRemoved=Directory %s was removed
 FeatureNotYetAvailable=Feature not yet available in the current version
+FeatureNotAvailableOnDevicesWithoutMouse=Feature not available on devices without mouse
 FeaturesSupported=Supported features
 Width=Width
 Height=Height
@@ -263,7 +264,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
-PrefixSession=Prefix for session ID
+SuffixSessionName=Suffix for session name
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/lo_LA/partnership.lang b/htdocs/langs/lo_LA/partnership.lang
index 09059995a8d..2fb10e8159e 100644
--- a/htdocs/langs/lo_LA/partnership.lang
+++ b/htdocs/langs/lo_LA/partnership.lang
@@ -16,41 +16,72 @@
 #
 # Generic
 #
-ModulePartnershipName = Partnership management
-PartnershipDescription = Module Partnership management
+ModulePartnershipName=Partnership management
+PartnershipDescription=Module Partnership management
 PartnershipDescriptionLong= Module Partnership management
 
+AddPartnership=Add partnership
+CancelPartnershipForExpiredMembers=Partnership: Cancel partnership of members with expired subscriptions
+PartnershipCheckBacklink=Partnership: Check referring backlink
+
 #
 # Menu
 #
-NewPartnership = New Partnership
-ListOfPartnerships = List of partnership
+NewPartnership=New Partnership
+ListOfPartnerships=List of partnership
 
 #
 # Admin page
 #
-PartnershipSetup = Partnership setup
-PartnershipAbout = About Partnership
-PartnershipAboutPage = Partnership about page
-
+PartnershipSetup=Partnership setup
+PartnershipAbout=About Partnership
+PartnershipAboutPage=Partnership about page
+partnershipforthirdpartyormember=Partner status must be set on a 'thirdparty' or a 'member'
+PARTNERSHIP_IS_MANAGED_FOR=Partnership managed for
+PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks to check
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb of days before cancelling status of a partnership when a subscription has expired
+ReferingWebsiteCheck=Check of website referring
+ReferingWebsiteCheckDesc=You can enable a feature to check that your partners has added a backlink to your website domains on their own website.
 
 #
 # Object
 #
+DeletePartnership=Delete a partnership
+PartnershipDedicatedToThisThirdParty=Partnership dedicated to this third party
+PartnershipDedicatedToThisMember=Partnership dedicated to this member
 DatePartnershipStart=Start date
 DatePartnershipEnd=End date
+ReasonDecline=Decline reason
+ReasonDeclineOrCancel=Decline reason
+PartnershipAlreadyExist=Partnership already exist
+ManagePartnership=Manage partnership
+BacklinkNotFoundOnPartnerWebsite=Backlink not found on partner website
+ConfirmClosePartnershipAsk=Are you sure you want to cancel this partnership?
+PartnershipType=Partnership type
 
 #
 # Template Mail
 #
+SendingEmailOnPartnershipWillSoonBeCanceled=Partnership will soon be canceled
+SendingEmailOnPartnershipRefused=Partnership refused
+SendingEmailOnPartnershipAccepted=Partnership accepted
+SendingEmailOnPartnershipCanceled=Partnership canceled
 
+YourPartnershipWillSoonBeCanceledTopic=Partnership will soon be canceled
+YourPartnershipRefusedTopic=Partnership refused
+YourPartnershipAcceptedTopic=Partnership accepted
+YourPartnershipCanceledTopic=Partnership canceled
+
+YourPartnershipWillSoonBeCanceledContent=We inform you that your partnership will soon be canceled (Backlink not found)
+YourPartnershipRefusedContent=We inform you that your partnership request has been refused.
+YourPartnershipAcceptedContent=We inform you that your partnership request has been accepted.
+YourPartnershipCanceledContent=We inform you that your partnership has been canceled.
 
 #
 # Status
 #
-PartnershipDraft = Draft
-PartnershipAccepted = Accepted
-PartnershipRefused = Refused
-PartnershipCanceled = Canceled
-
+PartnershipDraft=Draft
+PartnershipAccepted=Accepted
+PartnershipRefused=Refused
+PartnershipCanceled=Canceled
 PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/lo_LA/productbatch.lang b/htdocs/langs/lo_LA/productbatch.lang
index ad2db658e2e..450d0285819 100644
--- a/htdocs/langs/lo_LA/productbatch.lang
+++ b/htdocs/langs/lo_LA/productbatch.lang
@@ -1,4 +1,4 @@
-# ProductBATCH language file - en_US - ProductBATCH
+# ProductBATCH language file - Source file is en_US - ProductBATCH
 ManageLotSerial=Use lot/serial number
 ProductStatusOnBatch=Yes (lot required)
 ProductStatusOnSerial=Yes (unique serial number required)
@@ -33,3 +33,13 @@ CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+LifeTime=Life span (in days)
+EndOfLife=End of life
+ManufacturingDate=Manufacturing date
+DestructionDate=Destruction date
+FirstUseDate=First use date
+QCFrequency=Quality control frequency (in days)
+
+#Traceability - qc status
+OutOfOrder=Out of order
+InWorkingOrder=In working order
diff --git a/htdocs/langs/lo_LA/products.lang b/htdocs/langs/lo_LA/products.lang
index da4cf4d7302..a0a7ee2e634 100644
--- a/htdocs/langs/lo_LA/products.lang
+++ b/htdocs/langs/lo_LA/products.lang
@@ -396,3 +396,5 @@ ActionAvailableOnVariantProductOnly=Action only available on the variant of prod
 ProductsPricePerCustomer=Product prices per customers
 ProductSupplierExtraFields=Additional Attributes (Supplier Prices)
 DeleteLinkedProduct=Delete the child product linked to the combination
+PMPValue=Weighted average price
+PMPValueShort=WAP
diff --git a/htdocs/langs/lo_LA/projects.lang b/htdocs/langs/lo_LA/projects.lang
index 50e0af1b278..156b0a72da3 100644
--- a/htdocs/langs/lo_LA/projects.lang
+++ b/htdocs/langs/lo_LA/projects.lang
@@ -267,9 +267,11 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=New invoice
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+OneLinePerTimeSpentLine=One line for each time spent declaration
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
 AddPersonToTask=Add also to tasks
 UsageOrganizeEvent=Usage: Event Organization
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
+SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
diff --git a/htdocs/langs/lo_LA/receptions.lang b/htdocs/langs/lo_LA/receptions.lang
index 760ff884fa0..338602e722e 100644
--- a/htdocs/langs/lo_LA/receptions.lang
+++ b/htdocs/langs/lo_LA/receptions.lang
@@ -44,4 +44,4 @@ ValidateOrderFirstBeforeReception=You must first validate the order before being
 ReceptionsNumberingModules=Numbering module for receptions
 ReceptionsReceiptModel=Document templates for receptions
 NoMorePredefinedProductToDispatch=No more predefined products to dispatch
-
+ReceptionExist=A reception exists
diff --git a/htdocs/langs/lo_LA/stocks.lang b/htdocs/langs/lo_LA/stocks.lang
index ebc2fc967da..d54c1aac261 100644
--- a/htdocs/langs/lo_LA/stocks.lang
+++ b/htdocs/langs/lo_LA/stocks.lang
@@ -56,8 +56,6 @@ UnitPurchaseValue=Unit purchase price
 StockTooLow=Stock too low
 StockLowerThanLimit=Stock lower than alert limit (%s)
 EnhancedValue=Value
-PMPValue=Weighted average price
-PMPValueShort=WAP
 EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
@@ -251,7 +249,10 @@ SelectAStockMovementFileToImport=select a stock movement file to import
 InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
 LabelOfInventoryMovemement=Inventory %s
 ReOpen=Reopen
-ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock to the real qty you entered into the inventory.
 ObjectNotFound=%s not found
 MakeMovementsAndClose=Generate movements and close
 AutofillWithExpected=Fill real quantity with expected quantity
+ShowAllBatchByDefault=By default, show batch details on product "stock" tab
+CollapseBatchDetailHelp=You can set batch detail default display in stocks module configuration
+FieldCannotBeNegative=Field "%s" cannot be negative
diff --git a/htdocs/langs/lo_LA/ticket.lang b/htdocs/langs/lo_LA/ticket.lang
index f8eede2eb93..75d3ce1feca 100644
--- a/htdocs/langs/lo_LA/ticket.lang
+++ b/htdocs/langs/lo_LA/ticket.lang
@@ -304,7 +304,7 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
-BoxTicketType=Number of open tickets by type
+BoxTicketType=Distribution of open tickets by type
 BoxTicketSeverity=Number of open tickets by severity
 BoxNoTicketSeverity=No tickets opened
 BoxTicketLastXDays=Number of new tickets by days the last %s days
diff --git a/htdocs/langs/lt_LT/accountancy.lang b/htdocs/langs/lt_LT/accountancy.lang
index 2fc1172e648..0f3fc197e31 100644
--- a/htdocs/langs/lt_LT/accountancy.lang
+++ b/htdocs/langs/lt_LT/accountancy.lang
@@ -158,7 +158,7 @@ ACCOUNTING_LENGTH_AACCOUNT=Length of the third-party accounting accounts (If you
 ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of an accounting account. Needed by some countries (like Switzerland). If set to off (default), you can set the following two parameters to ask the application to add virtual zeros.
 BANK_DISABLE_DIRECT_INPUT=Išjungti tiesioginį sandorio įrašymą banko sąskaitoje
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Įgalinti eksporto projektą žurnale
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties, break ability to search on a part of value)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
@@ -328,6 +328,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountanc
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
+NotifiedExportDate=Notified export date (modification of the entries will not be possible)
+NotifiedValidationDate=Validation of the entries (modification or deletion of the entries will not be possible)
+ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=Eksportuoti žurnalo projektą
 Modelcsv=Eksporto modelis
 Selectmodelcsv=Pasirinkite eksporto modelį
diff --git a/htdocs/langs/lt_LT/admin.lang b/htdocs/langs/lt_LT/admin.lang
index 605cfb3ab80..8c4ded88ed4 100644
--- a/htdocs/langs/lt_LT/admin.lang
+++ b/htdocs/langs/lt_LT/admin.lang
@@ -221,8 +221,8 @@ NotCompatible=This module does not seem compatible with your Dolibarr %s (Min %s
 CompatibleAfterUpdate=This module requires an update to your Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=See in Market place
 SeeSetupOfModule=See setup of module %s
+SetOptionTo=Set option <b>%s</b> to %s
 Updated=Updated
-Nouveauté=Novelty
 AchatTelechargement=Buy / Download
 GoModuleSetupArea=To deploy/install a new module, go to the Module setup area: <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, oficiali Dolibarr ERP / CRM išorinių modulių parduotuvė
@@ -399,6 +399,7 @@ SecurityToken=URL apsaugos raktai
 NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
 PDF=PDF
 PDFDesc=Global options for PDF generation
+PDFOtherDesc=PDF Option specific to some modules
 PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
 PDFRulesForSalesTax=Rules for Sales Tax / VAT
@@ -561,7 +562,7 @@ Module53Desc=Management of Services
 Module54Name=Sutartys / Abonentai
 Module54Desc=Management of contracts (services or recurring subscriptions)
 Module55Name=Brūkšniniai kodai
-Module55Desc=Brūkšninių kodų valdymas
+Module55Desc=Barcode or QR code management
 Module56Name=Payment by credit transfer
 Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
 Module57Name=Payments by Direct Debit
@@ -848,10 +849,10 @@ Permission402=Sukurti/keisti nuolaidas
 Permission403=Patvirtinti nuolaidas
 Permission404=Ištrinti nuolaidas
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries (yours and subordinates)
-Permission512=Create/modify payments of salaries
-Permission514=Delete payments of salaries
-Permission517=Read payments of salaries of everybody
+Permission511=Read salaries and payments (yours and subordinates)
+Permission512=Create/modify salaries and payments
+Permission514=Delete salaries and payments
+Permission517=Read salaries and payments everybody
 Permission519=Eksportuoti atlyginimus
 Permission520=Skaityti Paskolas
 Permission522=Sukurti / redaguoti paskolas
@@ -965,6 +966,8 @@ Permission23003=Panaikinti planinį darbą
 Permission23004=Vykdyti planinį darbą
 Permission50101=Use Point of Sale (SimplePOS)
 Permission50151=Use Point of Sale (TakePOS)
+Permission50152=Edit sales lines
+Permission50153=Edit ordered sales lines
 Permission50201=Skaityti sandorius/transakcijas
 Permission50202=Importuoti sandorius/transakcijas
 Permission50330=Read objects of Zapier
@@ -1039,11 +1042,12 @@ DictionaryMeasuringUnits=Measuring Units
 DictionarySocialNetworks=Social Networks
 DictionaryProspectStatus=Prospect status for companies
 DictionaryProspectContactStatus=Prospect status for contacts
-DictionaryHolidayTypes=Types of leave
+DictionaryHolidayTypes=Leave - Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
 DictionaryTransportMode=Intracomm report - Transport mode
+DictionaryBatchStatus=Product lot/serial Quality Control status
 TypeOfUnit=Type of unit
 SetupSaved=Nustatymai išsaugoti
 SetupNotSaved=Setup not saved
@@ -1187,7 +1191,7 @@ SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of m
 SetupDescription5=Other Setup menu entries manage optional parameters.
 AuditedSecurityEvents=Security events that are audited
 NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
-Audit=Auditas
+Audit=Security events
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
 InfoOS=About OS
@@ -1319,9 +1323,12 @@ ConditionIsCurrently=Dabartinė būklė yra %s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
 NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
+ComboListOptim=Combo list loading optimization
 SearchOptim=Paieškos optimizavimas
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
-YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
+YouHaveXObjectUseComboOptim=You have %s %s in the database. You can go into setup of module to enable loading of combo list on key pressed event.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other.
+YouHaveXObjectUseSearchOptimDesc=This limits the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to %s in Home-Setup-Other.
 BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
 BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
 PHPModuleLoaded=PHP component %s is loaded
@@ -1433,6 +1440,7 @@ MemberMainOptions=Pagrindinės opcijos
 AdherentLoginRequired= Valdyti kiekvieno nario Prisijungimą
 AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Patvirtinimas paukščiuku žymimame langelyje pašto siuntimui nariams (patvirtinimas arba nauja įmoka) yra pagal nutylėjimą
+MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
 MembersDocModules=Document templates for documents generated from member record
@@ -1763,7 +1771,7 @@ AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting men
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
-AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the scheduled job %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial modulio nuostatos
@@ -1979,6 +1987,8 @@ 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_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add picture on proposal line
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add electronic sign in PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
@@ -2096,7 +2106,6 @@ PDF_SHOW_PROJECT=Show project on document
 ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
-FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
@@ -2120,12 +2129,18 @@ ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by
 MailToSendEventOrganization=Event Organization
 AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
 YouShouldDisablePHPFunctions=You should disable PHP functions
-IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands in custom code, you shoud disable PHP functions
+PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
+NotRecommended=Not recommanded
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
 ModuleUpdateAvailable=An update is available
 NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
+RandomlySelectedIfSeveral=Randomly selected if several pictures are available
+DatabasePasswordObfuscated=Database password is obfuscated in conf file
+DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
diff --git a/htdocs/langs/lt_LT/agenda.lang b/htdocs/langs/lt_LT/agenda.lang
index 4190286b778..1bfb8ce9b75 100644
--- a/htdocs/langs/lt_LT/agenda.lang
+++ b/htdocs/langs/lt_LT/agenda.lang
@@ -4,7 +4,7 @@ Actions=Įvykiai
 Agenda=Operacijų sąrašas
 TMenuAgenda=Operacijų sąrašas
 Agendas=Operacijų sąrašai
-LocalAgenda=Vidinis kalendorius
+LocalAgenda=Default calendar
 ActionsOwnedBy=Įvykio savininkas
 ActionsOwnedByShort=Savininkas
 AffectedTo=Priskirtas
@@ -14,13 +14,13 @@ EventsNb=Įvykių skaičius
 ListOfActions=Įvykių sąrašas
 EventReports=Event reports
 Location=Vieta
-ToUserOfGroup=Event assigned to any user in group
+ToUserOfGroup=Event assigned to any user in the group
 EventOnFullDay=Visos (-ų) dienos (-ų) įvykis
 MenuToDoActions=Visi neužbaigti įvykiai
 MenuDoneActions=Visi užbaigti/nutraukti įvykiai
 MenuToDoMyActions=Mano neužbaigti įvykiai
 MenuDoneMyActions=Mano užbaigti/nutraukti įvykiai
-ListOfEvents=Įvykių sąrašas (vidinis kalendorius)
+ListOfEvents=List of events (default calendar)
 ActionsAskedBy=Įvykiai, apie kuriuos pranešė
 ActionsToDoBy=Įvykiai priskirti
 ActionsDoneBy=Įvykiai atlikti
@@ -38,6 +38,7 @@ ActionsEvents=Įvykiai, kuriems Dolibarr sukurs veiksmą operacijų sąraše aut
 EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Third party %s created
+COMPANY_MODIFYInDolibarr=Third party %s modified
 COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=Contract %s validated
 CONTRACT_DELETEInDolibarr=Contract %s deleted
@@ -87,6 +88,7 @@ OrderDeleted=Order deleted
 InvoiceDeleted=Invoice deleted
 DraftInvoiceDeleted=Draft invoice deleted
 CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_MODIFYInDolibarr=Contact %s modified
 CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Product %s created
 PRODUCT_MODIFYInDolibarr=Product %s modified
@@ -119,6 +121,7 @@ MRP_MO_UNVALIDATEInDolibarr=MO set to draft status
 MRP_MO_PRODUCEDInDolibarr=MO produced
 MRP_MO_DELETEInDolibarr=MO deleted
 MRP_MO_CANCELInDolibarr=MO canceled
+PAIDInDolibarr=%s paid
 ##### End agenda events #####
 AgendaModelModule=Document templates for event
 DateActionStart=Pradžios data
@@ -130,7 +133,7 @@ AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to use
 AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
 AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic events.
 AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> to include events of holidays.
-AgendaShowBirthdayEvents=Show birthdays of contacts
+AgendaShowBirthdayEvents=Birthdays of contacts
 AgendaHideBirthdayEvents=Hide birthdays of contacts
 Busy=Užimtas
 ExportDataset_event1=Operacijos įvykių sąrašas
@@ -152,6 +155,7 @@ ActionType=Įvykio tipas
 DateActionBegin=Pradėti įvykio datą
 ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b>?
 RepeatEvent=Repeat event
+OnceOnly=Once only
 EveryWeek=Every week
 EveryMonth=Every month
 DayOfMonth=Day of month
@@ -165,4 +169,4 @@ TimeType=Duration type
 ReminderType=Callback type
 AddReminder=Create an automatic reminder notification for this event
 ErrorReminderActionCommCreation=Error creating the reminder notification for this event
-BrowserPush=Browser Notification
+BrowserPush=Browser Popup Notification
diff --git a/htdocs/langs/lt_LT/bills.lang b/htdocs/langs/lt_LT/bills.lang
index 441d539ec70..6e691b6d95d 100644
--- a/htdocs/langs/lt_LT/bills.lang
+++ b/htdocs/langs/lt_LT/bills.lang
@@ -259,6 +259,7 @@ DateMaxPayment=Numatytas apmokėjimo terminas
 DateInvoice=Sąskaitos-faktūros data
 DatePointOfTax=Point of tax
 NoInvoice=Nėra sąskaitos-faktūros
+NoOpenInvoice=No open invoice
 ClassifyBill=Priskirti sąskaitą-faktūrą
 SupplierBillsToPay=Unpaid vendor invoices
 CustomerBillsUnpaid=Neapmokėtos kliento sąskaitos
@@ -589,3 +590,4 @@ FacParentLine=Invoice Line Parent
 SituationTotalRayToRest=Remainder to pay without taxe
 PDFSituationTitle=Situation n° %d
 SituationTotalProgress=Total progress %d %%
+SearchUnpaidInvoicesWithDueDate=Search unpaid invoices with a due date = %s
diff --git a/htdocs/langs/lt_LT/cashdesk.lang b/htdocs/langs/lt_LT/cashdesk.lang
index e01655aeb97..51a5af0bc8f 100644
--- a/htdocs/langs/lt_LT/cashdesk.lang
+++ b/htdocs/langs/lt_LT/cashdesk.lang
@@ -102,7 +102,7 @@ CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal numb
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
 SaleStartedAt=Sale started at %s
-ControlCashOpening=Control cash popup at opening POS
+ControlCashOpening=Open the "Control cash" popup when opening the POS
 CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -126,5 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
-ShowPriceHT = Display the price excluding tax column
-ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
+ShowPriceHT = Display the column with the price excluding tax (on screen)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
diff --git a/htdocs/langs/lt_LT/compta.lang b/htdocs/langs/lt_LT/compta.lang
index f818e3cec01..8c7a570eaff 100644
--- a/htdocs/langs/lt_LT/compta.lang
+++ b/htdocs/langs/lt_LT/compta.lang
@@ -286,3 +286,9 @@ ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
 IncludeLoansInResults = Include loans in reports
+InvoiceLate30Days = Invoices late > 30 days
+InvoiceLate15Days = Invoices late > 15 days
+InvoiceLateMinus15Days = Invoices late
+InvoiceNotLate = To be collected < 15 days
+InvoiceNotLate15Days = To be collected in 15 days
+InvoiceNotLate30Days = To be collected in 30 days
diff --git a/htdocs/langs/lt_LT/cron.lang b/htdocs/langs/lt_LT/cron.lang
index 2433b64aa50..5f3737e48b4 100644
--- a/htdocs/langs/lt_LT/cron.lang
+++ b/htdocs/langs/lt_LT/cron.lang
@@ -60,7 +60,7 @@ CronErrEndDateStartDt=Pabaigos data negali būti ankstesnė už pradžios datą
 StatusAtInstall=Status at module installation
 CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Išjungti
-CronTaskInactive=Šis darbas yra išjungtas
+CronTaskInactive=This job is disabled (not scheduled)
 CronId=ID
 CronClassFile=Filename with class
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example 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>
diff --git a/htdocs/langs/lt_LT/errors.lang b/htdocs/langs/lt_LT/errors.lang
index 964c82e93f7..be103056350 100644
--- a/htdocs/langs/lt_LT/errors.lang
+++ b/htdocs/langs/lt_LT/errors.lang
@@ -11,6 +11,7 @@ ErrorBadValueForParamNotAString=Bad value for your parameter. It appends general
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Prisijungimas %s jau egzistuoja
 ErrorGroupAlreadyExists=Grupė %s jau egzistuoja
+ErrorEmailAlreadyExists=Email %s already exists.
 ErrorRecordNotFound=Įrašo nerasta
 ErrorFailToCopyFile=Nepavyko nukopijuoti failo '<b>%s</b>' į '<b>%s</b>'.
 ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
@@ -117,7 +118,7 @@ ErrorCantReadFile=Nepavyko perskaityti failo '%s'
 ErrorCantReadDir=Nepavyko perskaityti aplanko '%s'
 ErrorBadLoginPassword=Bloga Prijungimo ar slaptažodžio reikšmė 
 ErrorLoginDisabled=Jūsų sąskaita buvo išjungta
-ErrorFailedToRunExternalCommand=Nepavyko paleisti išorinės komandos. Patikrinkite, ar ji prieinama ir galima Jūsų PHP serveryje. Jei PHP <b>Safe Mode</b> yra įjungta, patikrinkite, ar komanda viduje aplanko yra apibrėžta parametru <b>safe_mode_exec_dir</b>.
+ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server user. Check also the command is not protected on shell level by a security layer like apparmor.
 ErrorFailedToChangePassword=Nepavyko pakeisti slaptažodžio
 ErrorLoginDoesNotExists=Vartotojas su prisijungimu <b>%s</b> nerastas
 ErrorLoginHasNoEmail=Šis vartotojas neturi e-pašto adreso. Procesas nutrauktas.
@@ -262,6 +263,7 @@ ErrorDateIsInFuture=Error, the date can't be in the future
 ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
 ErrorAPercentIsRequired=Error, please fill in the percentage correctly
 ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
+ErrorFailedToFindEmailTemplate=Failed to find template with code name %s
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -298,3 +300,4 @@ WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So y
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
+ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
diff --git a/htdocs/langs/lt_LT/eventorganization.lang b/htdocs/langs/lt_LT/eventorganization.lang
index e6caa842e88..5e4c78c71a0 100644
--- a/htdocs/langs/lt_LT/eventorganization.lang
+++ b/htdocs/langs/lt_LT/eventorganization.lang
@@ -1,4 +1,5 @@
 # Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+# Copyright (C) 2021		Dorian Vabre			<dorian.vabre@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
@@ -81,7 +82,10 @@ PriceOfBoothHelp=Subscription price to stand a booth
 EventOrganizationICSLink=Link ICS for events
 ConferenceOrBoothInformation=Conference Or Booth informations
 Attendees = Attendees
+DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
 #
 # Status
 #
@@ -94,8 +98,46 @@ EvntOrgCancelled = Cancelled
 #
 # Public page
 #
+SuggestForm = Suggestion page
+RegisterPage = Page for conferences or booth
+EvntOrgRegistrationHelpMessage = Here, you can vote for an event, or suggest a new conference or booth for the project
+EvntOrgRegistrationConfHelpMessage = Here, you can suggest a new conference for the project
+EvntOrgRegistrationBoothHelpMessage = Here, you can suggest a new booth for the project
+ListOfSuggestedConferences = List of suggested conferences
+ListOfSuggestedBooths = List of suggested booths
+SuggestConference = Suggest a new conference
+SuggestBooth = Suggest a booth
+ViewAndVote = View and vote for suggested events
 PublicAttendeeSubscriptionPage = Public link of registration to a conference
 MissingOrBadSecureKey = The security key is invalid or missing
-EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
-EvntOrgStartDuration = This conference starts on
-EvntOrgEndDuration =  and ends on
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference : '%s'
+EvntOrgDuration = This conference starts on %s and ends on %s.
+ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
+BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
+EventType = Įvykio tipas
+
+#
+# Vote page
+#
+EvntOrgRegistrationWelcomeMessage = Welcome on the conference or booth suggestion page.
+EvntOrgRegistrationConfWelcomeMessage = Welcome on the conference suggestion page.
+EvntOrgRegistrationBoothWelcomeMessage = Welcome on the booth suggestion page.
+EvntOrgVoteHelpMessage = Here, you can view and vote for the suggested events for the project
+VoteOk = Your vote has been accepted.
+AlreadyVoted = You have already voted for this event.
+VoteError = An error has occurred during the vote, please try again.
+
+#
+# SubscriptionOk page
+#
+SubscriptionOk = Your subscription to this conference has been validated
+#
+# Subscription validation mail
+#
+ConfAttendeeSubscriptionConfirmation = Confirmation of your subscription to a conference
+#
+# Payment page
+#
+Attendee = Attendee
+PaymentConferenceAttendee = Conference attendee payment
+PaymentBoothLocation = Booth location payment
diff --git a/htdocs/langs/lt_LT/hrm.lang b/htdocs/langs/lt_LT/hrm.lang
index 76db8a5dc5a..3900129cf52 100644
--- a/htdocs/langs/lt_LT/hrm.lang
+++ b/htdocs/langs/lt_LT/hrm.lang
@@ -9,7 +9,7 @@ ConfirmDeleteEstablishment=Are you sure you wish to delete this establishment?
 OpenEtablishment=Open establishment
 CloseEtablishment=Close establishment
 # Dictionary
-DictionaryPublicHolidays=HRM - Public holidays
+DictionaryPublicHolidays=Leave - Public holidays
 DictionaryDepartment=HRM - Department list
 DictionaryFunction=HRM - Job positions
 # Module
diff --git a/htdocs/langs/lt_LT/knowledgemanagement.lang b/htdocs/langs/lt_LT/knowledgemanagement.lang
index 6463a204d54..7ccc9683550 100644
--- a/htdocs/langs/lt_LT/knowledgemanagement.lang
+++ b/htdocs/langs/lt_LT/knowledgemanagement.lang
@@ -47,7 +47,7 @@ KnowledgeManagementArea = Knowledge Management
 # Menu
 #
 MenuKnowledgeRecord = Knowledge base
-ListOfArticles = List of articles
+ListKnowledgeRecord = List of articles
 NewKnowledgeRecord = New article
 ValidateReply = Validate solution
 KnowledgeRecords = Articles
diff --git a/htdocs/langs/lt_LT/languages.lang b/htdocs/langs/lt_LT/languages.lang
index 571c2ed6e1b..5a58d0bf695 100644
--- a/htdocs/langs/lt_LT/languages.lang
+++ b/htdocs/langs/lt_LT/languages.lang
@@ -3,6 +3,7 @@ Language_am_ET=Ethiopian
 Language_ar_AR=Arabų
 Language_ar_EG=Arabic (Egypt)
 Language_ar_SA=Arabų
+Language_ar_TN=Arabic (Tunisia)
 Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengali
 Language_bn_IN=Bengali (India)
@@ -84,6 +85,7 @@ Language_nl_NL=Dutch
 Language_pl_PL=Lenkijos
 Language_pt_BR=Portugalų (Brazilija)
 Language_pt_PT=Portugalų
+Language_ro_MD=Romanian (Moldavia)
 Language_ro_RO=Rumunų
 Language_ru_RU=Rusijos
 Language_ru_UA=Rusijos &quot;(Ukraina)
diff --git a/htdocs/langs/lt_LT/main.lang b/htdocs/langs/lt_LT/main.lang
index 45ab0a48f14..e754728ad3a 100644
--- a/htdocs/langs/lt_LT/main.lang
+++ b/htdocs/langs/lt_LT/main.lang
@@ -430,6 +430,7 @@ LT1IN=CGST
 LT2IN=SGST
 LT1GC=Additionnal cents
 VATRate=Mokesčio tarifas
+RateOfTaxN=Rate of tax %s
 VATCode=Tax Rate code
 VATNPR=Tax Rate NPR
 DefaultTaxRate=Default tax rate
@@ -729,6 +730,7 @@ MenuMembers=Nariai
 MenuAgendaGoogle=Google operacijos
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr apribojimas (Meniu Pagrindinis-Nustatymai-Saugumas): %s kb, PHP apribojimas: %s kb
+ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
 NoFileFound=No documents uploaded
 CurrentUserLanguage=Dabartinė vartojama kalba
 CurrentTheme=Dabartinė tema
@@ -1072,6 +1074,7 @@ ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
 ToClose=To close
+ToRefuse=To refuse
 ToProcess=Apdoroti
 ToApprove=To approve
 GlobalOpenedElemView=Global view
@@ -1126,9 +1129,11 @@ UpdateForAllLines=Update for all lines
 OnHold=Laikomas
 Civility=Civility
 AffectTag=Affect Tag
+CreateExternalUser=Create external user
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
 ConfirmCancel=Are you sure you want to cancel
+EmailMsgID=Email MsgID
diff --git a/htdocs/langs/lt_LT/members.lang b/htdocs/langs/lt_LT/members.lang
index 914e30a27e4..9011261b6dc 100644
--- a/htdocs/langs/lt_LT/members.lang
+++ b/htdocs/langs/lt_LT/members.lang
@@ -213,3 +213,5 @@ SendReminderForExpiredSubscription=Send reminder by email to members when subscr
 MembershipPaid=Membership paid for current period (until %s)
 YouMayFindYourInvoiceInThisEmail=You may find your invoice attached to this email
 XMembersClosed=%s member(s) closed
+XExternalUserCreated=%s external user(s) created
+ForceMemberNature=Force member nature (Individual or Corporation)
diff --git a/htdocs/langs/lt_LT/modulebuilder.lang b/htdocs/langs/lt_LT/modulebuilder.lang
index 9fdaa1a533a..23a098be2e5 100644
--- a/htdocs/langs/lt_LT/modulebuilder.lang
+++ b/htdocs/langs/lt_LT/modulebuilder.lang
@@ -143,3 +143,4 @@ AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
 ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
+ImportExportProfiles=Import and export profiles
diff --git a/htdocs/langs/lt_LT/mrp.lang b/htdocs/langs/lt_LT/mrp.lang
index ec999a473a4..9760b1babbe 100644
--- a/htdocs/langs/lt_LT/mrp.lang
+++ b/htdocs/langs/lt_LT/mrp.lang
@@ -8,12 +8,12 @@ MenuBOM=Bills of material
 LatestBOMModified=Latest %s Bills of materials modified
 LatestMOModified=Latest %s Manufacturing Orders modified
 Bom=Bills of Material
-BillOfMaterials=Bill of Material
+BillOfMaterials=Bill of Materials
 BOMsSetup=Setup of module BOM
 ListOfBOMs=List of bills of material - BOM
 ListOfManufacturingOrders=List of Manufacturing Orders
-NewBOM=New bill of material
-ProductBOMHelp=Product to create with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
+NewBOM=New bill of materials
+ProductBOMHelp=Product to create (or disassemble) with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
 BOMsNumberingModules=BOM numbering templates
 BOMsModelModule=BOM document templates
 MOsNumberingModules=MO numbering templates
@@ -22,7 +22,7 @@ FreeLegalTextOnBOMs=Free text on document of BOM
 WatermarkOnDraftBOMs=Watermark on draft BOM
 FreeLegalTextOnMOs=Free text on document of MO
 WatermarkOnDraftMOs=Watermark on draft MO
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials %s ?
 ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
 ManufacturingEfficiency=Manufacturing efficiency
 ConsumptionEfficiency=Consumption efficiency
@@ -30,8 +30,8 @@ ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the produc
 ValueOfMeansLossForProductProduced=Value of 0.95 means an average of 5%% of loss of produced product
 DeleteBillOfMaterials=Delete Bill Of Materials
 DeleteMo=Delete Manufacturing Order
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Materials?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Materials?
 MenuMRP=Manufacturing Orders
 NewMO=New Manufacturing Order
 QtyToProduce=Qty to produce
@@ -39,7 +39,7 @@ DateStartPlannedMo=Date start planned
 DateEndPlannedMo=Date end planned
 KeepEmptyForAsap=Empty means 'As Soon As Possible'
 EstimatedDuration=Estimated duration
-EstimatedDurationDesc=Estimated duration to manufacture this product using this BOM
+EstimatedDurationDesc=Estimated duration to manufacture (or disassemble) this product using this BOM
 ConfirmValidateBom=Are you sure you want to validate the BOM with the reference <strong>%s</strong> (you will be able to use it to build new Manufacturing Orders)
 ConfirmCloseBom=Are you sure you want to cancel this BOM (you won't be able to use it to build new Manufacturing Orders anymore) ?
 ConfirmReopenBom=Are you sure you want to re-open this BOM (you will be able to use it to build new Manufacturing Orders)
@@ -63,13 +63,14 @@ ConsumeAndProduceAll=Consume and Produce All
 Manufactured=Manufactured
 TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
 ForAQuantityOf=For a quantity to produce of %s
+ForAQuantityToConsumeOf=For a quantity to disassemble of %s
 ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
 ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
 ProductionForRef=Production of %s
 AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
 NoStockChangeOnServices=No stock change on services
 ProductQtyToConsumeByMO=Product quantity still to consume by open MO
-ProductQtyToProduceByMO=Product quentity still to produce by open MO
+ProductQtyToProduceByMO=Product quantity still to produce by open MO
 AddNewConsumeLines=Add new line to consume
 ProductsToConsume=Products to consume
 ProductsToProduce=Products to produce
@@ -83,15 +84,13 @@ Workstations=Workstations
 WorkstationsDescription=Workstations management
 WorkstationSetup = Workstations setup
 WorkstationSetupPage = Workstations setup page
-WorkstationAbout = About Workstation
-WorkstationAboutPage = Workstations about page
 WorkstationList=Workstation list
 WorkstationCreate=Add new workstation
 ConfirmEnableWorkstation=Are you sure you want to enable workstation <b>%s</b> ?
 EnableAWorkstation=Enable a workstation
 ConfirmDisableWorkstation=Are you sure you want to disable workstation <b>%s</b> ?
 DisableAWorkstation=Disable a workstation
-DeleteWorkstation=Supprimer
+DeleteWorkstation=Ištrinti
 NbOperatorsRequired=Number of operators required
 THMOperatorEstimated=Estimated operator THM
 THMMachineEstimated=Estimated machine THM
diff --git a/htdocs/langs/lt_LT/orders.lang b/htdocs/langs/lt_LT/orders.lang
index a287e8f6dd8..967d4eeb53b 100644
--- a/htdocs/langs/lt_LT/orders.lang
+++ b/htdocs/langs/lt_LT/orders.lang
@@ -11,6 +11,7 @@ OrderDate=Užsakymo data
 OrderDateShort=Užsakymo data
 OrderToProcess=Užsakymo procesas
 NewOrder=Naujas užsakymas
+NewSupplierOrderShort=Naujas užsakymas
 NewOrderSupplier=New Purchase Order
 ToOrder=Sudaryti užsakymą
 MakeOrder=Sudaryti užsakymą
@@ -73,6 +74,7 @@ DeleteOrder=Ištrinti užsakymą
 CancelOrder=Atšaukti užsakymą
 OrderReopened= Order %s re-open
 AddOrder=Sukurti užsakymą
+AddSupplierOrderShort=Sukurti užsakymą
 AddPurchaseOrder=Create purchase order
 AddToDraftOrders=Pridėti į užsakymo projektą
 ShowOrder=Rodyti užsakymą
diff --git a/htdocs/langs/lt_LT/other.lang b/htdocs/langs/lt_LT/other.lang
index b49798b53f9..84e65d5570b 100644
--- a/htdocs/langs/lt_LT/other.lang
+++ b/htdocs/langs/lt_LT/other.lang
@@ -129,6 +129,7 @@ ClosedByLogin=User login who closed
 FileWasRemoved=Failas %s buvo pašalintas
 DirWasRemoved=Katalogas %s buvo pašalintas
 FeatureNotYetAvailable=Feature not yet available in the current version
+FeatureNotAvailableOnDevicesWithoutMouse=Feature not available on devices without mouse
 FeaturesSupported=Supported features
 Width=Plotis
 Height=Aukštis
@@ -263,7 +264,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
-PrefixSession=Prefix for session ID
+SuffixSessionName=Suffix for session name
 
 ##### Export #####
 ExportsArea=Eksporto sritis
diff --git a/htdocs/langs/lt_LT/partnership.lang b/htdocs/langs/lt_LT/partnership.lang
index 5b782eae4fc..e5f6704d3b2 100644
--- a/htdocs/langs/lt_LT/partnership.lang
+++ b/htdocs/langs/lt_LT/partnership.lang
@@ -16,41 +16,72 @@
 #
 # Generic
 #
-ModulePartnershipName = Partnership management
-PartnershipDescription = Module Partnership management
+ModulePartnershipName=Partnership management
+PartnershipDescription=Module Partnership management
 PartnershipDescriptionLong= Module Partnership management
 
+AddPartnership=Add partnership
+CancelPartnershipForExpiredMembers=Partnership: Cancel partnership of members with expired subscriptions
+PartnershipCheckBacklink=Partnership: Check referring backlink
+
 #
 # Menu
 #
-NewPartnership = New Partnership
-ListOfPartnerships = List of partnership
+NewPartnership=New Partnership
+ListOfPartnerships=List of partnership
 
 #
 # Admin page
 #
-PartnershipSetup = Partnership setup
-PartnershipAbout = About Partnership
-PartnershipAboutPage = Partnership about page
-
+PartnershipSetup=Partnership setup
+PartnershipAbout=About Partnership
+PartnershipAboutPage=Partnership about page
+partnershipforthirdpartyormember=Partner status must be set on a 'thirdparty' or a 'member'
+PARTNERSHIP_IS_MANAGED_FOR=Partnership managed for
+PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks to check
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb of days before cancelling status of a partnership when a subscription has expired
+ReferingWebsiteCheck=Check of website referring
+ReferingWebsiteCheckDesc=You can enable a feature to check that your partners has added a backlink to your website domains on their own website.
 
 #
 # Object
 #
+DeletePartnership=Delete a partnership
+PartnershipDedicatedToThisThirdParty=Partnership dedicated to this third party
+PartnershipDedicatedToThisMember=Partnership dedicated to this member
 DatePartnershipStart=Pradžios data
 DatePartnershipEnd=Pabaigos data
+ReasonDecline=Decline reason
+ReasonDeclineOrCancel=Decline reason
+PartnershipAlreadyExist=Partnership already exist
+ManagePartnership=Manage partnership
+BacklinkNotFoundOnPartnerWebsite=Backlink not found on partner website
+ConfirmClosePartnershipAsk=Are you sure you want to cancel this partnership?
+PartnershipType=Partnership type
 
 #
 # Template Mail
 #
+SendingEmailOnPartnershipWillSoonBeCanceled=Partnership will soon be canceled
+SendingEmailOnPartnershipRefused=Partnership refused
+SendingEmailOnPartnershipAccepted=Partnership accepted
+SendingEmailOnPartnershipCanceled=Partnership canceled
 
+YourPartnershipWillSoonBeCanceledTopic=Partnership will soon be canceled
+YourPartnershipRefusedTopic=Partnership refused
+YourPartnershipAcceptedTopic=Partnership accepted
+YourPartnershipCanceledTopic=Partnership canceled
+
+YourPartnershipWillSoonBeCanceledContent=We inform you that your partnership will soon be canceled (Backlink not found)
+YourPartnershipRefusedContent=We inform you that your partnership request has been refused.
+YourPartnershipAcceptedContent=We inform you that your partnership request has been accepted.
+YourPartnershipCanceledContent=We inform you that your partnership has been canceled.
 
 #
 # Status
 #
-PartnershipDraft = Projektas
-PartnershipAccepted = Accepted
-PartnershipRefused = Atmestas
-PartnershipCanceled = Atšauktas
-
+PartnershipDraft=Projektas
+PartnershipAccepted=Accepted
+PartnershipRefused=Atmestas
+PartnershipCanceled=Atšauktas
 PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/lt_LT/productbatch.lang b/htdocs/langs/lt_LT/productbatch.lang
index 45c0d71128d..52d1433c357 100644
--- a/htdocs/langs/lt_LT/productbatch.lang
+++ b/htdocs/langs/lt_LT/productbatch.lang
@@ -1,4 +1,4 @@
-# ProductBATCH language file - en_US - ProductBATCH
+# ProductBATCH language file - Source file is en_US - ProductBATCH
 ManageLotSerial=Naudoti partiją / serijos numerį
 ProductStatusOnBatch=Yes (lot required)
 ProductStatusOnSerial=Yes (unique serial number required)
@@ -33,3 +33,13 @@ CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+LifeTime=Life span (in days)
+EndOfLife=End of life
+ManufacturingDate=Manufacturing date
+DestructionDate=Destruction date
+FirstUseDate=First use date
+QCFrequency=Quality control frequency (in days)
+
+#Traceability - qc status
+OutOfOrder=Out of order
+InWorkingOrder=In working order
diff --git a/htdocs/langs/lt_LT/products.lang b/htdocs/langs/lt_LT/products.lang
index 8a2fa3cca66..6554c34fc25 100644
--- a/htdocs/langs/lt_LT/products.lang
+++ b/htdocs/langs/lt_LT/products.lang
@@ -396,3 +396,5 @@ ActionAvailableOnVariantProductOnly=Action only available on the variant of prod
 ProductsPricePerCustomer=Product prices per customers
 ProductSupplierExtraFields=Additional Attributes (Supplier Prices)
 DeleteLinkedProduct=Delete the child product linked to the combination
+PMPValue=Vidutinė svertinė kaina
+PMPValueShort=WAP
diff --git a/htdocs/langs/lt_LT/projects.lang b/htdocs/langs/lt_LT/projects.lang
index e6617ff3b88..c0bae5e7294 100644
--- a/htdocs/langs/lt_LT/projects.lang
+++ b/htdocs/langs/lt_LT/projects.lang
@@ -267,9 +267,11 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=Nauja sąskaita-faktūra
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+OneLinePerTimeSpentLine=One line for each time spent declaration
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
 AddPersonToTask=Add also to tasks
 UsageOrganizeEvent=Usage: Event Organization
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
+SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
diff --git a/htdocs/langs/lt_LT/receptions.lang b/htdocs/langs/lt_LT/receptions.lang
index 139d15f89a5..aca302d2550 100644
--- a/htdocs/langs/lt_LT/receptions.lang
+++ b/htdocs/langs/lt_LT/receptions.lang
@@ -44,4 +44,4 @@ ValidateOrderFirstBeforeReception=You must first validate the order before being
 ReceptionsNumberingModules=Numbering module for receptions
 ReceptionsReceiptModel=Document templates for receptions
 NoMorePredefinedProductToDispatch=No more predefined products to dispatch
-
+ReceptionExist=A reception exists
diff --git a/htdocs/langs/lt_LT/stocks.lang b/htdocs/langs/lt_LT/stocks.lang
index 23397cfe047..3ed9b27d69b 100644
--- a/htdocs/langs/lt_LT/stocks.lang
+++ b/htdocs/langs/lt_LT/stocks.lang
@@ -56,8 +56,6 @@ UnitPurchaseValue=Vieneto įsigijimo kaina
 StockTooLow=Atsargų per mažai
 StockLowerThanLimit=Stock lower than alert limit (%s)
 EnhancedValue=Reikšmė
-PMPValue=Vidutinė svertinė kaina
-PMPValueShort=WAP
 EnhancedValueOfWarehouses=Sandėlių vertė
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
@@ -251,7 +249,10 @@ SelectAStockMovementFileToImport=select a stock movement file to import
 InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
 LabelOfInventoryMovemement=Inventory %s
 ReOpen=Atidaryti iš naujo
-ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock to the real qty you entered into the inventory.
 ObjectNotFound=%s not found
 MakeMovementsAndClose=Generate movements and close
 AutofillWithExpected=Fill real quantity with expected quantity
+ShowAllBatchByDefault=By default, show batch details on product "stock" tab
+CollapseBatchDetailHelp=You can set batch detail default display in stocks module configuration
+FieldCannotBeNegative=Field "%s" cannot be negative
diff --git a/htdocs/langs/lt_LT/ticket.lang b/htdocs/langs/lt_LT/ticket.lang
index d6841d70ed6..f1913615bad 100644
--- a/htdocs/langs/lt_LT/ticket.lang
+++ b/htdocs/langs/lt_LT/ticket.lang
@@ -304,7 +304,7 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
-BoxTicketType=Number of open tickets by type
+BoxTicketType=Distribution of open tickets by type
 BoxTicketSeverity=Number of open tickets by severity
 BoxNoTicketSeverity=No tickets opened
 BoxTicketLastXDays=Number of new tickets by days the last %s days
diff --git a/htdocs/langs/lv_LV/accountancy.lang b/htdocs/langs/lv_LV/accountancy.lang
index 3202d3c02c7..e0eeea0b8a2 100644
--- a/htdocs/langs/lv_LV/accountancy.lang
+++ b/htdocs/langs/lv_LV/accountancy.lang
@@ -158,7 +158,7 @@ ACCOUNTING_LENGTH_AACCOUNT=Trešo pušu grāmatvedības kontu garums (ja iestat
 ACCOUNTING_MANAGE_ZERO=Atļaujiet pārvaldīt atšķirīgu skaitu nulles grāmatvedības konta beigās. Nepieciešamas dažas valstis (piemēram, Šveice). Ja iestatījums ir izslēgts (noklusējums), varat iestatīt šādus divus parametrus, lai pieprasītu lietojumprogrammai pievienot virtuālās nulles.
 BANK_DISABLE_DIRECT_INPUT=Atspējot tiešu darījumu reģistrāciju bankas kontā
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Iespējot eksporta projektu žurnālā
-ACCOUNTANCY_COMBO_FOR_AUX=Iespējot kombinēto sarakstu papildu kontam (var būt lēni, ja jums ir daudz trešo personu)
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties, break ability to search on a part of value)
 ACCOUNTING_DATE_START_BINDING=Definējiet datumu, lai sāktu iesiešanu un pārskaitīšanu grāmatvedībā. Zem šī datuma darījumi netiks pārnesti uz grāmatvedību.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Pārsūtot grāmatvedību, pēc noklusējuma atlasiet periodu
 
@@ -328,6 +328,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Atspējot saistīšanu un pārsūtīšan
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Atspējojiet grāmatvedībā iesiešanu un pārskaitīšanu izdevumu pārskatos (grāmatvedībā netiks ņemti vērā izdevumu pārskati)
 
 ## Export
+NotifiedExportDate=Notified export date (modification of the entries will not be possible)
+NotifiedValidationDate=Validation of the entries (modification or deletion of the entries will not be possible)
+ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=Eksporta žurnāla projekts
 Modelcsv=Eksporta modulis
 Selectmodelcsv=Atlasiet eksporta modeli
diff --git a/htdocs/langs/lv_LV/admin.lang b/htdocs/langs/lv_LV/admin.lang
index 33f82b742af..05a605ecedf 100644
--- a/htdocs/langs/lv_LV/admin.lang
+++ b/htdocs/langs/lv_LV/admin.lang
@@ -221,8 +221,8 @@ NotCompatible=Šis modulis, šķiet, nav savietojams ar jūsu Dolibarr %s (Min %
 CompatibleAfterUpdate=Šis modulis prasa atjaunināt Dolibarr %s (Min %s - Maks %s).
 SeeInMarkerPlace=Skatiet Marketplace
 SeeSetupOfModule=See setup of module %s
+SetOptionTo=Set option <b>%s</b> to %s
 Updated=Atjaunots
-Nouveauté=Jaunums
 AchatTelechargement=Pirkt / lejupielādēt
 GoModuleSetupArea=Lai izvietotu / instalētu jaunu moduli, dodieties uz moduļa iestatīšanas apgabalu: <a href="%s"> %s </a>.
 DoliStoreDesc=DoliStore ir oficiālā mājaslapa Dolibarr ERP / CRM papildus moduļiem
@@ -399,6 +399,7 @@ SecurityToken=Atslēga uz drošu saiti
 NoSmsEngine=Nav pieejams neviens SMS sūtītāja pārvaldnieks. SMS sūtītāja pārvaldnieks nav instalēts ar noklusējuma izplatīšanu, jo tie ir atkarīgi no ārēja piegādātāja, bet jūs varat atrast kādu no %s
 PDF=PDF
 PDFDesc=Globālās iespējas PDF ģenerēšanai
+PDFOtherDesc=PDF Option specific to some modules
 PDFAddressForging=Noteikumi par adreses sadaļu
 HideAnyVATInformationOnPDF=Slēpt visu informāciju, kas saistīta ar pārdošanas nodokli / PVN
 PDFRulesForSalesTax=Pārdošanas nodokļa / PVN noteikumi
@@ -561,7 +562,7 @@ Module53Desc=Pakalpojumu pārvaldība
 Module54Name=Līgumi / Abonementi
 Module54Desc=Līgumu (pakalpojumu vai regulāru abonēšanas) vadība
 Module55Name=Svītrkodi
-Module55Desc=Svītrkodu vadība
+Module55Desc=Barcode or QR code management
 Module56Name=Maksājums ar pārskaitījumu
 Module56Desc=Piegādātāju norēķinu vadīšana ar kredīta pārveduma rīkojumiem. Tas ietver SEPA faila ģenerēšanu Eiropas valstīm.
 Module57Name=Maksājumi ar tiešo debetu
@@ -848,10 +849,10 @@ Permission402=Izveidot/mainīt atlaides
 Permission403=Apstiprināt atlaides
 Permission404=Dzēst atlaides
 Permission430=Izmantot Debug Bar
-Permission511=Lasīt algu maksājumus (jūsu un padoto)
-Permission512=Izveidojiet / modificējiet algu maksājumus
-Permission514=Dzēst algu maksājumus
-Permission517=Izlasiet visiem algu maksājumus
+Permission511=Read salaries and payments (yours and subordinates)
+Permission512=Create/modify salaries and payments
+Permission514=Delete salaries and payments
+Permission517=Read salaries and payments everybody
 Permission519=Eksportēt algas
 Permission520=Lasīt aizdevumus
 Permission522=Izveidot / labot aizdevumus
@@ -965,6 +966,8 @@ Permission23003=Dzēst ieplānoto uzdevumu
 Permission23004=Izpildīt ieplānoto uzdevumu
 Permission50101=Izmantot tirdzniecības vietu (SimplePOS)
 Permission50151=Izmantot tirdzniecības vietu (TakePOS)
+Permission50152=Edit sales lines
+Permission50153=Edit ordered sales lines
 Permission50201=Lasīt darījumus
 Permission50202=Importēt darījumus
 Permission50330=Lasīt Zapier objektus
@@ -1039,11 +1042,12 @@ DictionaryMeasuringUnits=Mērvienības
 DictionarySocialNetworks=Sociālie tīkli
 DictionaryProspectStatus=Prospekta statuss uzņēmumiem
 DictionaryProspectContactStatus=Prospekta statuss kontaktiem
-DictionaryHolidayTypes=Atvaļinājumu veidi
+DictionaryHolidayTypes=Leave - Types of leave
 DictionaryOpportunityStatus=Vadošais statuss projektu / vadībai
 DictionaryExpenseTaxCat=Izdevumu pārskats - transporta kategorijas
 DictionaryExpenseTaxRange=Izdevumu pārskats - diapazons pēc transporta kategorijas
 DictionaryTransportMode=Intracomm pārskats - transporta veids
+DictionaryBatchStatus=Product lot/serial Quality Control status
 TypeOfUnit=Vienības veids
 SetupSaved=Iestatījumi saglabāti
 SetupNotSaved=Iestatīšana nav saglabāta
@@ -1187,7 +1191,7 @@ SetupDescription4= <a href="%s"> %s -> %s </a> <br> <br> Šī programmatūra ir
 SetupDescription5=Citi iestatījumu izvēlnes ieraksti pārvalda izvēles parametrus.
 AuditedSecurityEvents=Security events that are audited
 NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
-Audit=Audits
+Audit=Security events
 InfoDolibarr=Par Dolibarr
 InfoBrowser=Pārlūkprogrammas info
 InfoOS=Par OS
@@ -1319,9 +1323,12 @@ ConditionIsCurrently=Stāvoklis šobrīd ir %s
 YouUseBestDriver=Jūs izmantojat draiveri %s, kas ir labākais šobrīd pieejams draiveris.
 YouDoNotUseBestDriver=Jūs izmantojat draiveri %s, bet ieteicams ir %s.
 NbOfObjectIsLowerThanNoPb=Jums datu bāzē ir tikai %s %s. Tam nav nepieciešama īpaša optimizācija.
+ComboListOptim=Combo list loading optimization
 SearchOptim=Meklēšanas optimizācija
-YouHaveXObjectUseSearchOptim=Jums datu bāzē ir %s %s. Pastāvīgo %s var pievienot vienumam 1 sadaļā Mājas iestatīšana - Cits. Ierobežojiet meklēšanu tikai virkņu sākumā, kas ļauj datu bāzei izmantot indeksus, un jums nekavējoties jāsaņem atbilde.
-YouHaveXObjectAndSearchOptimOn=Jums datu bāzē ir %s %s, un konstante %s mapē Mājas iestatīšana ir iestatīta uz 1.
+YouHaveXObjectUseComboOptim=You have %s %s in the database. You can go into setup of module to enable loading of combo list on key pressed event.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other.
+YouHaveXObjectUseSearchOptimDesc=This limits the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to %s in Home-Setup-Other.
 BrowserIsOK=Jūs izmantojat tīmekļa pārlūku %s. Šī pārlūkprogramma ir droša un ātrdarbīgs.
 BrowserIsKO=Jūs izmantojat tīmekļa pārlūku %s. Šī pārlūka informācija ir slikta izvēle drošībai, veiktspējai un uzticamībai. Mēs iesakām izmantot Firefox, Chrome, Opera vai Safari.
 PHPModuleLoaded=Tiek ielādēts PHP komponents %s
@@ -1433,6 +1440,7 @@ MemberMainOptions=Galvenās iespējas
 AdherentLoginRequired= Pārvaldīt Pieteikšanos katram dalībniekam
 AdherentMailRequired=Lai izveidotu jaunu dalībnieku, nepieciešams e-pasts
 MemberSendInformationByMailByDefault=Rūtiņu, lai nosūtītu pasta apstiprinājums locekļiem (validāciju vai jauns abonements) ir ieslēgts pēc noklusējuma
+MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
 VisitorCanChooseItsPaymentMode=Apmeklētājs var izvēlēties no pieejamiem maksājumu veidiem
 MEMBER_REMINDER_EMAIL=Iespējot automātisku atgādinājumu <b> pa e-pastu </b> par beidzies abonementi. Piezīme. Modulim <strong> %s </strong> jābūt iespējotai un pareizi iestatītai, lai nosūtītu atgādinājumus.
 MembersDocModules=Dokumentu veidnes dokumentiem, kas ģenerēti no dalībnieku ieraksta
@@ -1763,7 +1771,7 @@ AGENDA_DEFAULT_VIEW=Kuru skatu vēlaties atvērt pēc noklusējuma, izvēloties
 AGENDA_REMINDER_BROWSER=Iespējojiet notikuma atgādinājumu <b> lietotāja pārlūkprogrammā </b> (Kad ir atgādinājuma datums, pārlūkprogramma parāda uznirstošo logu. Katrs lietotājs var atspējot šādus paziņojumus pārlūka paziņojumu iestatījumos).
 AGENDA_REMINDER_BROWSER_SOUND=Iespējot skaņas paziņojumu
 AGENDA_REMINDER_EMAIL=Iespējojiet notikuma atgādinājumu <b>, nosūtot e-pastus </b> (katram notikumam var noteikt atgādinājuma opciju / aizkavi).
-AGENDA_REMINDER_EMAIL_NOTE=Piezīme. Uzdevuma %s biežumam jābūt pietiekamam, lai pārliecinātos, ka atgādinājums tiek nosūtīts pareizajā brīdī.
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the scheduled job %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Parādīt saistīto objektu darba kārtībā
 ##### Clicktodial #####
 ClickToDialSetup=Klikšķiniet lai  Dial moduļa uzstādīšanas
@@ -1979,6 +1987,8 @@ MAIN_PDF_MARGIN_RIGHT=Labā puse PDF failā
 MAIN_PDF_MARGIN_TOP=Galvene PDF failā
 MAIN_PDF_MARGIN_BOTTOM=Kājene PDF failā
 MAIN_DOCUMENTS_LOGO_HEIGHT=Logotipa augstums PDF formātā
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add picture on proposal line
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add electronic sign in PDF
 NothingToSetup=Šim modulim nav nepieciešama īpaša iestatīšana.
 SetToYesIfGroupIsComputationOfOtherGroups=Iestatiet to uz "jā", ja šī grupa ir citu grupu aprēķins
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
@@ -2096,7 +2106,6 @@ PDF_SHOW_PROJECT=Show project on document
 ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=Ja vēlaties, lai daži PDF faili tiktu dublēti 2 dažādās valodās tajā pašā ģenerētajā PDF failā, jums šeit ir jāiestata šī otrā valoda, lai ģenerētais PDF saturētu vienā un tajā pašā lappusē 2 dažādas valodas, vienu izvēloties, ģenerējot PDF, un šo ( tikai dažas PDF veidnes to atbalsta). Vienā PDF formātā atstājiet tukšumu 1 valodā.
 FafaIconSocialNetworksDesc=Šeit ievadiet FontAwesome ikonas kodu. Ja jūs nezināt, kas ir FontAwesome, varat izmantot vispārīgo vērtību fa-adrešu grāmata.
-FeatureNotAvailableWithReceptionModule=Funkcija nav pieejama, ja ir iespējota moduļa uztveršana
 RssNote=Piezīme. Katra RSS plūsmas definīcija nodrošina logrīku, kas jums jāiespējo, lai tas būtu pieejams informācijas panelī
 JumpToBoxes=Pāriet uz Iestatīšana -> logrīki
 MeasuringUnitTypeDesc=Šeit izmantojiet tādas vērtības kā "lielums", "virsma", "tilpums", "svars", "laiks"
@@ -2120,12 +2129,18 @@ ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by
 MailToSendEventOrganization=Event Organization
 AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
 YouShouldDisablePHPFunctions=You should disable PHP functions
-IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands in custom code, you shoud disable PHP functions
+PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
+NotRecommended=Not recommanded
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
 ModuleUpdateAvailable=An update is available
 NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
+RandomlySelectedIfSeveral=Randomly selected if several pictures are available
+DatabasePasswordObfuscated=Database password is obfuscated in conf file
+DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
diff --git a/htdocs/langs/lv_LV/agenda.lang b/htdocs/langs/lv_LV/agenda.lang
index 43e497ee2d1..f985c7f994e 100644
--- a/htdocs/langs/lv_LV/agenda.lang
+++ b/htdocs/langs/lv_LV/agenda.lang
@@ -4,7 +4,7 @@ Actions=Notikumi
 Agenda=Darba kārtība
 TMenuAgenda=Darba kārtība
 Agendas=Darba kārtības
-LocalAgenda=Iekšējais kalendārs
+LocalAgenda=Default calendar
 ActionsOwnedBy=Notikums pieder
 ActionsOwnedByShort=Īpašnieks
 AffectedTo=Piešķirts
@@ -20,7 +20,7 @@ MenuToDoActions=Visi nepabeigtie pasākumi
 MenuDoneActions=Visi izbeigtie notikumi
 MenuToDoMyActions=Mani nepabeigtie notikumi
 MenuDoneMyActions=Mani izbeigtie notikumi
-ListOfEvents=Notikumi (iekšējais kalendārs)
+ListOfEvents=List of events (default calendar)
 ActionsAskedBy=Notikumu ziņoja
 ActionsToDoBy=Pasākums piešķirts
 ActionsDoneBy=Pasākumi, ko veikuši
@@ -38,6 +38,7 @@ ActionsEvents=Pasākumi, par kuriem Dolibarr radīs prasību kārtībā automāt
 EventRemindersByEmailNotEnabled=Pasākumu atgādinājumi pa e-pastu netika iespējoti %s moduļa iestatījumos.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Trešā puse izveidota %s
+COMPANY_MODIFYInDolibarr=Third party %s modified
 COMPANY_DELETEInDolibarr=Izdzēsta trešā persona %s
 ContractValidatedInDolibarr=Līgumi %s apstiprināti
 CONTRACT_DELETEInDolibarr=Līgums %s svītrots
@@ -87,6 +88,7 @@ OrderDeleted=Pasūtījums dzēsts
 InvoiceDeleted=Rēķins dzēsts
 DraftInvoiceDeleted=Rēķina melnraksts ir izdzēsts
 CONTACT_CREATEInDolibarr=Kontaktpersona %s ir izveidota
+CONTACT_MODIFYInDolibarr=Contact %s modified
 CONTACT_DELETEInDolibarr=Kontaktpersona %s ir izdzēsta
 PRODUCT_CREATEInDolibarr=Produkts %s ir izveidots
 PRODUCT_MODIFYInDolibarr=Produkts %s ir labots
@@ -119,6 +121,7 @@ MRP_MO_UNVALIDATEInDolibarr=MO iestatīts uz melnraksta statusu
 MRP_MO_PRODUCEDInDolibarr=MO ražots
 MRP_MO_DELETEInDolibarr=MO ir izdzēsts
 MRP_MO_CANCELInDolibarr=MO atcelts
+PAIDInDolibarr=%s paid
 ##### End agenda events #####
 AgendaModelModule=Dokumentu veidnes notikumam
 DateActionStart=Sākuma datums
@@ -130,7 +133,7 @@ AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to use
 AgendaUrlOptionsProject=<b> project = __ PROJECT_ID __ </ b>, lai ierobežotu izlaidi darbībām, kas saistītas ar projektu <b> __ PROJECT_ID __ </ b>.
 AgendaUrlOptionsNotAutoEvent=<b> notactiontype = systemauto </b>, lai izslēgtu automātiskus notikumus.
 AgendaUrlOptionsIncludeHolidays= <b> includeholidays = 1 </b>, lai iekļautu svētku pasākumus.
-AgendaShowBirthdayEvents=Rādīt kontaktu dzimšanas dienas
+AgendaShowBirthdayEvents=Birthdays of contacts
 AgendaHideBirthdayEvents=Slēpt kontaktu dzimšanas dienas
 Busy=Aizņemts
 ExportDataset_event1=Notikumu saraksts
@@ -152,6 +155,7 @@ ActionType=Pasākuma veids
 DateActionBegin=Sākuma datums notikumam
 ConfirmCloneEvent=Vai tiešām vēlaties klonēt notikumu <b>%s</b> ?
 RepeatEvent=Atkārtot notikumu
+OnceOnly=Vienreiz
 EveryWeek=Katru nedēļu
 EveryMonth=Katru mēnesi
 DayOfMonth=Mēneša diena
@@ -160,9 +164,9 @@ DateStartPlusOne=S'akuma datums + 1 stunda
 SetAllEventsToTodo=Iestatiet, lai visi notikumi tiek uzlikti
 SetAllEventsToInProgress=Iestatiet visus notiekošos pasākumus
 SetAllEventsToFinished=Iestatiet, lai visi notikumi būtu pabeigti
-ReminderTime=Reminder period before the event
-TimeType=Duration type
-ReminderType=Callback type
-AddReminder=Create an automatic reminder notification for this event
-ErrorReminderActionCommCreation=Error creating the reminder notification for this event
-BrowserPush=Browser Notification
+ReminderTime=Atgādinājuma periods pirms pasākuma
+TimeType=Ilguma tips
+ReminderType=Atzvanīšanas tips
+AddReminder=Izveidojiet automātisku atgādinājumu par šo notikumu
+ErrorReminderActionCommCreation=Izveidojot atgādinājumu par šo notikumu, radās kļūda
+BrowserPush=Paziņojums par pārlūkprogrammas uznirstošo logu
diff --git a/htdocs/langs/lv_LV/bills.lang b/htdocs/langs/lv_LV/bills.lang
index d814b040d56..90ad7a9ad47 100644
--- a/htdocs/langs/lv_LV/bills.lang
+++ b/htdocs/langs/lv_LV/bills.lang
@@ -259,6 +259,7 @@ DateMaxPayment=Jāapmaksā līdz
 DateInvoice=Rēķina datums
 DatePointOfTax=Nodokļu punkts
 NoInvoice=Nav rēķinu
+NoOpenInvoice=No open invoice
 ClassifyBill=Klasificēt rēķinu
 SupplierBillsToPay=Neapmaksāti pārdevēja rēķini
 CustomerBillsUnpaid=Neapmaksātie klienta rēķini
@@ -589,3 +590,4 @@ FacParentLine=Rēķinu rindas vecāks
 SituationTotalRayToRest=Atlikušais maksājums bez nodokļa
 PDFSituationTitle=Situācija Nr. %d
 SituationTotalProgress=Kopējais progress %d %%
+SearchUnpaidInvoicesWithDueDate=Search unpaid invoices with a due date = %s
diff --git a/htdocs/langs/lv_LV/cashdesk.lang b/htdocs/langs/lv_LV/cashdesk.lang
index ea9c84562e2..bedf85060f9 100644
--- a/htdocs/langs/lv_LV/cashdesk.lang
+++ b/htdocs/langs/lv_LV/cashdesk.lang
@@ -102,7 +102,7 @@ CashDeskGenericMaskCodes6 =  <br> <b> {TN} </b> tagu izmanto, lai pievienotu te
 TakeposGroupSameProduct=Grupējiet tās pašas produktu līnijas
 StartAParallelSale=Sāciet jaunu paralēlu izpārdošanu
 SaleStartedAt=Pārdošana sākās vietnē %s
-ControlCashOpening=Kontrolējiet naudas uznirstošo punktu, atverot POS
+ControlCashOpening=Open the "Control cash" popup when opening the POS
 CloseCashFence=Aizveriet kases kontroli
 CashReport=Skaidras naudas pārskats
 MainPrinterToUse=Galvenais izmantojamais printeris
@@ -126,5 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Vispirms jābūt iespējotam moduļa saņemša
 AllowDelayedPayment=Atļaut kavētu maksājumu
 PrintPaymentMethodOnReceipts=Izdrukājiet maksājuma veidu uz biļetēm |
 WeighingScale=Svari
-ShowPriceHT = Display the price excluding tax column
-ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
+ShowPriceHT = Display the column with the price excluding tax (on screen)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
diff --git a/htdocs/langs/lv_LV/compta.lang b/htdocs/langs/lv_LV/compta.lang
index f3413c399d7..9e153347a87 100644
--- a/htdocs/langs/lv_LV/compta.lang
+++ b/htdocs/langs/lv_LV/compta.lang
@@ -286,3 +286,9 @@ ReportPurchaseTurnover=Par pirkuma apgrozījumu izrakstīts rēķins
 ReportPurchaseTurnoverCollected=Apkopots pirkumu apgrozījums
 IncludeVarpaysInResults = Pārskatos iekļaujiet dažādus maksājumus
 IncludeLoansInResults = Iekļaujiet pārskatos aizdevumus
+InvoiceLate30Days = Invoices late > 30 days
+InvoiceLate15Days = Invoices late > 15 days
+InvoiceLateMinus15Days = Invoices late
+InvoiceNotLate = To be collected < 15 days
+InvoiceNotLate15Days = To be collected in 15 days
+InvoiceNotLate30Days = To be collected in 30 days
diff --git a/htdocs/langs/lv_LV/cron.lang b/htdocs/langs/lv_LV/cron.lang
index 864165259f3..12595393d64 100644
--- a/htdocs/langs/lv_LV/cron.lang
+++ b/htdocs/langs/lv_LV/cron.lang
@@ -7,8 +7,8 @@ Permission23103 = Dzēst plānoto darbu
 Permission23104 = Izpildīt plānoto darbu
 # Admin
 CronSetup=Plānoto darbu iestatīšana
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs from a browser
-OrToLaunchASpecificJob=Or to check and launch a specific job from a browser
+URLToLaunchCronJobs=URL, lai pārbaudītu un palaistu kvalificētus cron darbus no pārlūkprogrammas
+OrToLaunchASpecificJob=Vai arī pārbaudīt un palaist konkrētu darbu no pārlūkprogrammas
 KeyForCronAccess=Drošības atslēga URL uzsākt cron darbavietas
 FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
 CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
@@ -60,7 +60,7 @@ CronErrEndDateStartDt=Beigu datums nevar būt pirms sākuma datuma
 StatusAtInstall=Statuss moduļa instalācijā
 CronStatusActiveBtn=Grafiks
 CronStatusInactiveBtn=Izslēgt
-CronTaskInactive=Šis darbs ir izslēgts
+CronTaskInactive=This job is disabled (not scheduled)
 CronId=Id
 CronClassFile=Faila nosaukums ar klasi
 CronModuleHelp=Dolibarr moduļu direktorijas nosaukums (arī darbojas ar ārēju Dolibarr moduli). <BR> Piemēram, lai izsauktu Dolibarr produkta objektu /htdocs/<u>product</u>/class/product.class.php iegūšanas metodi, moduļa vērtība ir <br> <i>produkts</i>
@@ -84,8 +84,8 @@ MakeLocalDatabaseDumpShort=Lokālās datu bāzes dublēšana
 MakeLocalDatabaseDump=Izveidojiet vietējo datubāzes dump. Parametri ir: kompresija ("gz" vai "bz" vai "neviens"), dublēšanas veids ("mysql", "pgsql", "auto"), 1, "auto" vai faila nosaukums,
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
 DATAPOLICYJob=Datu tīrītājs un anonimizators
-JobXMustBeEnabled=Job %s must be enabled
+JobXMustBeEnabled=Darbam %s jābūt iespējotam
 # Cron Boxes
-LastExecutedScheduledJob=Last executed scheduled job
-NextScheduledJobExecute=Next scheduled job to execute
-NumberScheduledJobError=Number of scheduled jobs in error
+LastExecutedScheduledJob=Pēdējais izpildītais plānotais darbs
+NextScheduledJobExecute=Nākamais ieplānotais izpildāmais darbs
+NumberScheduledJobError=Ieplānoto darbu skaits kļūdaini
diff --git a/htdocs/langs/lv_LV/errors.lang b/htdocs/langs/lv_LV/errors.lang
index 08d6f347a7c..5df40e192b9 100644
--- a/htdocs/langs/lv_LV/errors.lang
+++ b/htdocs/langs/lv_LV/errors.lang
@@ -11,6 +11,7 @@ ErrorBadValueForParamNotAString=Jūsu parametra nepareiza vērtība. Tas parasti
 ErrorRefAlreadyExists=Atsauce <b> %s </b> jau pastāv.
 ErrorLoginAlreadyExists=Lietotājs %s jau pastāv.
 ErrorGroupAlreadyExists=Grupa %s jau pastāv.
+ErrorEmailAlreadyExists=Email %s already exists.
 ErrorRecordNotFound=Ierakstīt nav atrasts.
 ErrorFailToCopyFile=Neizdevās nokopēt failu '<b>%s</b>' uz '<b>%s</b>'.
 ErrorFailToCopyDir=Neizdevās kopēt direktoriju '<b>%s</b>' uz ' <b>%s</b>'.
@@ -117,7 +118,7 @@ ErrorCantReadFile=Neizdevās nolasīt failu '%s'
 ErrorCantReadDir=Neizdevās nolasīt katalogu '%s'
 ErrorBadLoginPassword=Nepareiza vērtība lietotājvārdam vai parolei
 ErrorLoginDisabled=Jūsu konts ir bloķēts
-ErrorFailedToRunExternalCommand=Neizdevās palaist ārēju komandu. Pārbaudiet, tas ir pieejams, un skrienams ar savu PHP servera. Ja PHP <b>Safe Mode</b> ir iespējots, pārbaudiet, vai komanda ir iekšā direktorijā noteiktajā parametru <b>safe_mode_exec_dir.</b>
+ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server user. Check also the command is not protected on shell level by a security layer like apparmor.
 ErrorFailedToChangePassword=Neizdevās nomainīt paroli
 ErrorLoginDoesNotExists=Lietotāju ar pieteikšanos <b>%s</b> nevar atrast.
 ErrorLoginHasNoEmail=Šim lietotājam nav e-pasta adrese. Process atcelts.
@@ -262,6 +263,7 @@ ErrorDateIsInFuture=Error, the date can't be in the future
 ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
 ErrorAPercentIsRequired=Error, please fill in the percentage correctly
 ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
+ErrorFailedToFindEmailTemplate=Failed to find template with code name %s
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Jūsu PHP parametrs upload_max_filesize (%s) ir augstāks nekā PHP parametrs post_max_size (%s). Šī nav konsekventa iestatīšana.
@@ -298,3 +300,4 @@ WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So y
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
+ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
diff --git a/htdocs/langs/lv_LV/eventorganization.lang b/htdocs/langs/lv_LV/eventorganization.lang
index b70d65eb304..70a2a0146c2 100644
--- a/htdocs/langs/lv_LV/eventorganization.lang
+++ b/htdocs/langs/lv_LV/eventorganization.lang
@@ -1,4 +1,5 @@
 # Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+# Copyright (C) 2021		Dorian Vabre			<dorian.vabre@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
@@ -81,7 +82,10 @@ PriceOfBoothHelp=Subscription price to stand a booth
 EventOrganizationICSLink=Link ICS for events
 ConferenceOrBoothInformation=Conference Or Booth informations
 Attendees = Attendees
+DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
 #
 # Status
 #
@@ -94,8 +98,46 @@ EvntOrgCancelled = Cancelled
 #
 # Public page
 #
+SuggestForm = Suggestion page
+RegisterPage = Page for conferences or booth
+EvntOrgRegistrationHelpMessage = Here, you can vote for an event, or suggest a new conference or booth for the project
+EvntOrgRegistrationConfHelpMessage = Here, you can suggest a new conference for the project
+EvntOrgRegistrationBoothHelpMessage = Here, you can suggest a new booth for the project
+ListOfSuggestedConferences = List of suggested conferences
+ListOfSuggestedBooths = List of suggested booths
+SuggestConference = Suggest a new conference
+SuggestBooth = Suggest a booth
+ViewAndVote = View and vote for suggested events
 PublicAttendeeSubscriptionPage = Public link of registration to a conference
 MissingOrBadSecureKey = The security key is invalid or missing
-EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
-EvntOrgStartDuration = This conference starts on
-EvntOrgEndDuration =  and ends on
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference : '%s'
+EvntOrgDuration = This conference starts on %s and ends on %s.
+ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
+BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
+EventType = Pasākuma veids
+
+#
+# Vote page
+#
+EvntOrgRegistrationWelcomeMessage = Welcome on the conference or booth suggestion page.
+EvntOrgRegistrationConfWelcomeMessage = Welcome on the conference suggestion page.
+EvntOrgRegistrationBoothWelcomeMessage = Welcome on the booth suggestion page.
+EvntOrgVoteHelpMessage = Here, you can view and vote for the suggested events for the project
+VoteOk = Your vote has been accepted.
+AlreadyVoted = You have already voted for this event.
+VoteError = An error has occurred during the vote, please try again.
+
+#
+# SubscriptionOk page
+#
+SubscriptionOk = Your subscription to this conference has been validated
+#
+# Subscription validation mail
+#
+ConfAttendeeSubscriptionConfirmation = Confirmation of your subscription to a conference
+#
+# Payment page
+#
+Attendee = Attendee
+PaymentConferenceAttendee = Conference attendee payment
+PaymentBoothLocation = Booth location payment
diff --git a/htdocs/langs/lv_LV/hrm.lang b/htdocs/langs/lv_LV/hrm.lang
index 20a92e2c4c7..fb12bb86555 100644
--- a/htdocs/langs/lv_LV/hrm.lang
+++ b/htdocs/langs/lv_LV/hrm.lang
@@ -9,7 +9,7 @@ ConfirmDeleteEstablishment=Vai tiešām vēlaties dzēst šo uzņēmumu?
 OpenEtablishment=Atvērts uzņēmums
 CloseEtablishment=Aizvērt uzņēmumu
 # Dictionary
-DictionaryPublicHolidays=HRM - svētku dienas
+DictionaryPublicHolidays=Leave - Public holidays
 DictionaryDepartment=HRM - Department list
 DictionaryFunction=HRM - darba vietas
 # Module
diff --git a/htdocs/langs/lv_LV/knowledgemanagement.lang b/htdocs/langs/lv_LV/knowledgemanagement.lang
index 28f420cebd5..92b3a320067 100644
--- a/htdocs/langs/lv_LV/knowledgemanagement.lang
+++ b/htdocs/langs/lv_LV/knowledgemanagement.lang
@@ -47,7 +47,7 @@ KnowledgeManagementArea = Knowledge Management
 # Menu
 #
 MenuKnowledgeRecord = Knowledge base
-ListOfArticles = List of articles
+ListKnowledgeRecord = List of articles
 NewKnowledgeRecord = New article
 ValidateReply = Validate solution
 KnowledgeRecords = Articles
diff --git a/htdocs/langs/lv_LV/languages.lang b/htdocs/langs/lv_LV/languages.lang
index 849292e69c4..248390f73a0 100644
--- a/htdocs/langs/lv_LV/languages.lang
+++ b/htdocs/langs/lv_LV/languages.lang
@@ -3,6 +3,7 @@ Language_am_ET=Etiopietis
 Language_ar_AR=Arābu
 Language_ar_EG=Arābu (Ēģipte)
 Language_ar_SA=Arābu
+Language_ar_TN=Arabic (Tunisia)
 Language_az_AZ=Azerbaidžāņi
 Language_bn_BD=Bengali
 Language_bn_IN=Bengāļu (Indija)
@@ -40,7 +41,7 @@ Language_es_PA=Spāņu (Panama)
 Language_es_PY=Spāņu (Paragvaja)
 Language_es_PE=Spāņu (Peru)
 Language_es_PR=Spāņu (Puertoriko)
-Language_es_US=Spanish (USA)
+Language_es_US=Spāņu (ASV)
 Language_es_UY=Spāņu (Urugvaja)
 Language_es_GT=Spāņu (Gvatemala)
 Language_es_VE=Spāņu (Venecuēla)
@@ -84,6 +85,7 @@ Language_nl_NL=Holandiešu
 Language_pl_PL=Poļu
 Language_pt_BR=Portugāļu (Brazīlija)
 Language_pt_PT=Portugāļu
+Language_ro_MD=Romanian (Moldavia)
 Language_ro_RO=Rumāņu
 Language_ru_RU=Krievu
 Language_ru_UA=Krievu (Ukraina)
diff --git a/htdocs/langs/lv_LV/main.lang b/htdocs/langs/lv_LV/main.lang
index 4a9ca45aefb..0b76b3bbb10 100644
--- a/htdocs/langs/lv_LV/main.lang
+++ b/htdocs/langs/lv_LV/main.lang
@@ -430,6 +430,7 @@ LT1IN=CGST
 LT2IN=SGST
 LT1GC=Papildu centi
 VATRate=Nodokļa likme
+RateOfTaxN=Rate of tax %s
 VATCode=Nodokļu likmes kods
 VATNPR=Nodokļa likme NPR
 DefaultTaxRate=Noklusētā nodokļa likme
@@ -729,6 +730,7 @@ MenuMembers=Dalībnieki
 MenuAgendaGoogle=Google darba kārtība
 MenuTaxesAndSpecialExpenses=Nodokļi | Īpašie izdevumi
 ThisLimitIsDefinedInSetup=Dolibarr robeža (Menu mājas uzstādīšana-drošība): %s Kb, PHP robeža: %s Kb
+ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
 NoFileFound=No documents uploaded
 CurrentUserLanguage=Pašreizējā valoda
 CurrentTheme=Pašreizējā tēma
@@ -1072,6 +1074,7 @@ ValidFrom=Derīgs no
 ValidUntil=Derīgs līdz
 NoRecordedUsers=Nav lietotāju
 ToClose=Aizvērt
+ToRefuse=To refuse
 ToProcess=Jāapstrādā
 ToApprove=Apstiprināt
 GlobalOpenedElemView=Globālais izskats
@@ -1126,9 +1129,11 @@ UpdateForAllLines=Atjauninājums visām līnijām
 OnHold=On hold
 Civility=Laipnība
 AffectTag=Ietekmēt tagu
+CreateExternalUser=Create external user
 ConfirmAffectTag=Masveida tagu ietekme
 ConfirmAffectTagQuestion=Vai tiešām vēlaties ietekmēt atlasītā (-o) ieraksta (-u) %s tagus?
 CategTypeNotFound=Ierakstu veidam nav atrasts neviens tagu tips
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
 ConfirmCancel=Are you sure you want to cancel
+EmailMsgID=Email MsgID
diff --git a/htdocs/langs/lv_LV/members.lang b/htdocs/langs/lv_LV/members.lang
index 32f15a94dec..37bfdb2018b 100644
--- a/htdocs/langs/lv_LV/members.lang
+++ b/htdocs/langs/lv_LV/members.lang
@@ -213,3 +213,5 @@ SendReminderForExpiredSubscription=Sūtīt atgādinājumu pa e-pastu dalībnieki
 MembershipPaid=Dalība, kas samaksāta par kārtējo periodu (līdz %s)
 YouMayFindYourInvoiceInThisEmail=Jūsu rēķinu varat atrast šī e-pasta pielikumā
 XMembersClosed=%s dalībnieks (-i) slēgts
+XExternalUserCreated=%s external user(s) created
+ForceMemberNature=Force member nature (Individual or Corporation)
diff --git a/htdocs/langs/lv_LV/modulebuilder.lang b/htdocs/langs/lv_LV/modulebuilder.lang
index 0fae52ce845..d441a4cedd3 100644
--- a/htdocs/langs/lv_LV/modulebuilder.lang
+++ b/htdocs/langs/lv_LV/modulebuilder.lang
@@ -143,3 +143,4 @@ AsciiToHtmlConverter=Ascii uz HTML pārveidotāju
 AsciiToPdfConverter=Ascii uz PDF pārveidotāju
 TableNotEmptyDropCanceled=Tabula nav tukša. Dzēšana tika atcelta.
 ModuleBuilderNotAllowed=Moduļu veidotājs ir pieejams, bet nav atļauts jūsu lietotājam.
+ImportExportProfiles=Import and export profiles
diff --git a/htdocs/langs/lv_LV/mrp.lang b/htdocs/langs/lv_LV/mrp.lang
index e56abf7d542..0ac6b6843af 100644
--- a/htdocs/langs/lv_LV/mrp.lang
+++ b/htdocs/langs/lv_LV/mrp.lang
@@ -12,8 +12,8 @@ BillOfMaterials=Materiālu rēķins
 BOMsSetup=Moduļa BOM iestatīšana
 ListOfBOMs=Materiālu rēķinu saraksts - BOM
 ListOfManufacturingOrders=Ražošanas pasūtījumu saraksts
-NewBOM=Jauns rēķins par materiālu
-ProductBOMHelp=Produkts, ko izveidot ar šo BOM. <br> Piezīme. Šajā sarakstā nav redzami produkti ar īpašību “Produkta veids” = “Izejviela”.
+NewBOM=Jauns materiālu saraksts
+ProductBOMHelp=Product to create (or disassemble) with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
 BOMsNumberingModules=BOM numerācijas veidnes
 BOMsModelModule=BOM dokumentu veidnes
 MOsNumberingModules=MO numerācijas veidnes
@@ -22,7 +22,7 @@ FreeLegalTextOnBOMs=Brīvs teksts BOM dokumentā
 WatermarkOnDraftBOMs=Ūdenszīme BOM projektā
 FreeLegalTextOnMOs=Brīvs teksts uz MO dokumenta
 WatermarkOnDraftMOs=Ūdenszīme uz MO iegrimes
-ConfirmCloneBillOfMaterials=Vai tiešām vēlaties klonēt materiāla rēķinu %s?
+ConfirmCloneBillOfMaterials=Vai tiešām vēlaties klonēt materiālu rēķinu %s?
 ConfirmCloneMo=Vai tiešām vēlaties klonēt ražošanas pasūtījumu %s?
 ManufacturingEfficiency=Ražošanas efektivitāte
 ConsumptionEfficiency=Patēriņa efektivitāte
@@ -30,8 +30,8 @@ ValueOfMeansLoss=0,95 vērtība nozīmē vidējo 5%% zudumu ražošanas laikā
 ValueOfMeansLossForProductProduced=Vērtība 0,95 nozīmē saražotā produkta zaudējumu vidējo vērtību 5%%
 DeleteBillOfMaterials=Dzēst materiālus
 DeleteMo=Dzēst ražošanas pasūtījumu
-ConfirmDeleteBillOfMaterials=Vai tiešām vēlaties dzēst šo materiālu?
-ConfirmDeleteMo=Vai tiešām vēlaties dzēst šo materiālu pavadzīmi?
+ConfirmDeleteBillOfMaterials=Vai tiešām vēlaties dzēst šo materiālu sarakstu?
+ConfirmDeleteMo=Vai tiešām vēlaties dzēst šo materiālu sarakstu?
 MenuMRP=Ražošanas pasūtījumi
 NewMO=Jauns ražošanas pasūtījums
 QtyToProduce=Daudzums kas jāsaražo
@@ -39,7 +39,7 @@ DateStartPlannedMo=Plānots sākuma datums
 DateEndPlannedMo=Plānots datuma beigas
 KeepEmptyForAsap=Tukša nozīmē “cik drīz vien iespējams”
 EstimatedDuration=Paredzamais ilgums
-EstimatedDurationDesc=Paredzamais šī produkta ražošanas ilgums, izmantojot šo BOM
+EstimatedDurationDesc=Estimated duration to manufacture (or disassemble) this product using this BOM
 ConfirmValidateBom=Vai tiešām vēlaties apstiprināt BOM ar atsauci <strong>%s</strong> (jūs to varēsit izmantot, lai izveidotu jaunus ražošanas pasūtījumus)
 ConfirmCloseBom=Vai tiešām vēlaties atcelt šo BOM (jūs to vairs nevarēsit izmantot, lai izveidotu jaunus ražošanas pasūtījumus)?
 ConfirmReopenBom=Vai tiešām vēlaties atkārtoti atvērt šo BOM (jūs to varēsit izmantot, lai izveidotu jaunus ražošanas pasūtījumus)
@@ -63,13 +63,14 @@ ConsumeAndProduceAll=Patērēt un ražot visu
 Manufactured=Izgatavots
 TheProductXIsAlreadyTheProductToProduce=Pievienojamais produkts jau ir produkts, ko ražot.
 ForAQuantityOf=Par saražoto daudzumu %s
+ForAQuantityToConsumeOf=For a quantity to disassemble of %s
 ConfirmValidateMo=Vai tiešām vēlaties apstiprināt šo ražošanas pasūtījumu?
 ConfirmProductionDesc=Noklikšķinot uz “%s”, jūs apstiprināsit noteikto daudzumu patēriņu un / vai ražošanu. Tas arī atjauninās krājumus un reģistrēs krājumu kustību.
 ProductionForRef=%s ražošana
 AutoCloseMO=Automātiski aizveriet ražošanas pasūtījumu, ja ir sasniegti patērējamie un saražotie daudzumi
 NoStockChangeOnServices=Pakalpojumu krājumi nemainās
 ProductQtyToConsumeByMO=Produkta daudzums, ko vēl vajadzētu patērēt atvērtā MO
-ProductQtyToProduceByMO=Izstrādājumu daudzums vēl jāražo, izmantojot atvērto MO
+ProductQtyToProduceByMO=Product quantity still to produce by open MO
 AddNewConsumeLines=Pievienojiet jaunu rindu patērēšanai
 ProductsToConsume=Produkti, kurus patērēt
 ProductsToProduce=Izgatavojamie produkti
@@ -77,28 +78,26 @@ UnitCost=Vienības cena
 TotalCost=Kopējās izmaksas
 BOMTotalCost=Šīs BOM izgatavošanas izmaksas, pamatojoties uz katra patērētā daudzuma un produkta izmaksām (izmantojiet pašizmaksu, ja tā ir noteikta, cita - vidējā svērtā cena, ja ir noteikta, citur - labākā pirkuma cena).
 GoOnTabProductionToProduceFirst=Vispirms jums ir jāsāk ražošana, lai aizvērtu ražošanas pasūtījumu (sk. Cilni '%s'). Bet jūs varat to atcelt.
-ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
-Workstation=Workstation
-Workstations=Workstations
-WorkstationsDescription=Workstations management
-WorkstationSetup = Workstations setup
-WorkstationSetupPage = Workstations setup page
-WorkstationAbout = About Workstation
-WorkstationAboutPage = Workstations about page
-WorkstationList=Workstation list
-WorkstationCreate=Add new workstation
-ConfirmEnableWorkstation=Are you sure you want to enable workstation <b>%s</b> ?
-EnableAWorkstation=Enable a workstation
-ConfirmDisableWorkstation=Are you sure you want to disable workstation <b>%s</b> ?
-DisableAWorkstation=Disable a workstation
-DeleteWorkstation=Supprimer
-NbOperatorsRequired=Number of operators required
-THMOperatorEstimated=Estimated operator THM
-THMMachineEstimated=Estimated machine THM
-WorkstationType=Workstation type
-Human=Human
-Machine=Machine
-HumanMachine=Human / Machine
-WorkstationArea=Workstation area
-Machines=Machines
-THMEstimatedHelp=This rate makes it possible to define a forecast cost of the item
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=Komplektu nevar izmantot BOM vai MO
+Workstation=Darbstacija
+Workstations=Darbstacijas
+WorkstationsDescription=Darbstaciju vadība
+WorkstationSetup = Darbstaciju iestatīšana
+WorkstationSetupPage = Darbstaciju iestatīšanas lapa
+WorkstationList=Darbstaciju saraksts
+WorkstationCreate=Pievienojiet jaunu darbstaciju
+ConfirmEnableWorkstation=Vai tiešām vēlaties iespējot darbstaciju <b> %s </b>?
+EnableAWorkstation=Iespējot darbstaciju
+ConfirmDisableWorkstation=Vai tiešām vēlaties atspējot darbstaciju <b> %s </b>?
+DisableAWorkstation=Atspējojiet darbstaciju
+DeleteWorkstation=Dzēst
+NbOperatorsRequired=Nepieciešamo operatoru skaits
+THMOperatorEstimated=Paredzamais operators THM
+THMMachineEstimated=Paredzētā mašīna THM
+WorkstationType=Darbstacijas tips
+Human=Cilvēks
+Machine=Mašīna
+HumanMachine=Cilvēks / Mašīna
+WorkstationArea=Darbstacijas zona
+Machines=Mašīnas
+THMEstimatedHelp=Šī likme ļauj noteikt objekta prognozētās izmaksas
diff --git a/htdocs/langs/lv_LV/orders.lang b/htdocs/langs/lv_LV/orders.lang
index e7e3c67ade4..1dc27b5f27c 100644
--- a/htdocs/langs/lv_LV/orders.lang
+++ b/htdocs/langs/lv_LV/orders.lang
@@ -11,6 +11,7 @@ OrderDate=Pasūtīt datumu
 OrderDateShort=Pasūtījuma datums
 OrderToProcess=Pasūtījums, kas jāapstrādā
 NewOrder=Jauns pasūtījums
+NewSupplierOrderShort=Jauns pasūtījums
 NewOrderSupplier=Jauns pirkuma pasūtījums
 ToOrder=Veicot pasūtījumu
 MakeOrder=Veicot pasūtījumu
@@ -73,6 +74,7 @@ DeleteOrder=Dzēst pasūtījumu
 CancelOrder=Atcelt pasūtījumu
 OrderReopened= Pasūtīt %s no jauna atvērt
 AddOrder=Jauns pasūtījums
+AddSupplierOrderShort=Jauns pasūtījums
 AddPurchaseOrder=Izveidojiet pirkuma pasūtījumu
 AddToDraftOrders=Pievienot rīkojuma projektu
 ShowOrder=Rādīt pasūtījumu
diff --git a/htdocs/langs/lv_LV/other.lang b/htdocs/langs/lv_LV/other.lang
index 95b3dae7746..04863c42be0 100644
--- a/htdocs/langs/lv_LV/other.lang
+++ b/htdocs/langs/lv_LV/other.lang
@@ -129,6 +129,7 @@ ClosedByLogin=Lietotājs, kurš slēdzis
 FileWasRemoved=Fails %s tika dzēsts
 DirWasRemoved=Katalogs %s tika dzēsts
 FeatureNotYetAvailable=Funkcija pašreizējā versijā vēl nav pieejama
+FeatureNotAvailableOnDevicesWithoutMouse=Feature not available on devices without mouse
 FeaturesSupported=Atbalstītās funkcijas
 Width=Platums
 Height=Augstums
@@ -263,7 +264,7 @@ ContactCreatedByEmailCollector=Kontaktpersona / adrese, ko izveidojis e-pasta ko
 ProjectCreatedByEmailCollector=Projekts, ko izveidojis e-pasta savācējs no e-pasta MSGID %s
 TicketCreatedByEmailCollector=Biļete, ko izveidojis e-pasta kolekcionārs no e-pasta MSGID %s
 OpeningHoursFormatDesc=Izmantojiet taustiņu -, lai nodalītu darba un aizvēršanas stundas. <br> Izmantojiet atstarpi, lai ievadītu dažādus diapazonus. <br> Piemērs: 8.-12
-PrefixSession=Sesijas ID prefikss
+SuffixSessionName=Suffix for session name
 
 ##### Export #####
 ExportsArea=Eksportēšanas sadaļa
diff --git a/htdocs/langs/lv_LV/partnership.lang b/htdocs/langs/lv_LV/partnership.lang
index 69fb543a784..d9de28dd450 100644
--- a/htdocs/langs/lv_LV/partnership.lang
+++ b/htdocs/langs/lv_LV/partnership.lang
@@ -16,41 +16,72 @@
 #
 # Generic
 #
-ModulePartnershipName = Partnership management
-PartnershipDescription = Module Partnership management
+ModulePartnershipName=Partnership management
+PartnershipDescription=Module Partnership management
 PartnershipDescriptionLong= Module Partnership management
 
+AddPartnership=Add partnership
+CancelPartnershipForExpiredMembers=Partnership: Cancel partnership of members with expired subscriptions
+PartnershipCheckBacklink=Partnership: Check referring backlink
+
 #
 # Menu
 #
-NewPartnership = New Partnership
-ListOfPartnerships = List of partnership
+NewPartnership=New Partnership
+ListOfPartnerships=List of partnership
 
 #
 # Admin page
 #
-PartnershipSetup = Partnership setup
-PartnershipAbout = About Partnership
-PartnershipAboutPage = Partnership about page
-
+PartnershipSetup=Partnership setup
+PartnershipAbout=About Partnership
+PartnershipAboutPage=Partnership about page
+partnershipforthirdpartyormember=Partner status must be set on a 'thirdparty' or a 'member'
+PARTNERSHIP_IS_MANAGED_FOR=Partnership managed for
+PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks to check
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb of days before cancelling status of a partnership when a subscription has expired
+ReferingWebsiteCheck=Check of website referring
+ReferingWebsiteCheckDesc=You can enable a feature to check that your partners has added a backlink to your website domains on their own website.
 
 #
 # Object
 #
+DeletePartnership=Delete a partnership
+PartnershipDedicatedToThisThirdParty=Partnership dedicated to this third party
+PartnershipDedicatedToThisMember=Partnership dedicated to this member
 DatePartnershipStart=Sākuma datums
 DatePartnershipEnd=Beigu datums
+ReasonDecline=Decline reason
+ReasonDeclineOrCancel=Decline reason
+PartnershipAlreadyExist=Partnership already exist
+ManagePartnership=Manage partnership
+BacklinkNotFoundOnPartnerWebsite=Backlink not found on partner website
+ConfirmClosePartnershipAsk=Are you sure you want to cancel this partnership?
+PartnershipType=Partnership type
 
 #
 # Template Mail
 #
+SendingEmailOnPartnershipWillSoonBeCanceled=Partnership will soon be canceled
+SendingEmailOnPartnershipRefused=Partnership refused
+SendingEmailOnPartnershipAccepted=Partnership accepted
+SendingEmailOnPartnershipCanceled=Partnership canceled
 
+YourPartnershipWillSoonBeCanceledTopic=Partnership will soon be canceled
+YourPartnershipRefusedTopic=Partnership refused
+YourPartnershipAcceptedTopic=Partnership accepted
+YourPartnershipCanceledTopic=Partnership canceled
+
+YourPartnershipWillSoonBeCanceledContent=We inform you that your partnership will soon be canceled (Backlink not found)
+YourPartnershipRefusedContent=We inform you that your partnership request has been refused.
+YourPartnershipAcceptedContent=We inform you that your partnership request has been accepted.
+YourPartnershipCanceledContent=We inform you that your partnership has been canceled.
 
 #
 # Status
 #
-PartnershipDraft = Melnraksts
-PartnershipAccepted = Pieņemts
-PartnershipRefused = Atteikts
-PartnershipCanceled = Atcelts
-
+PartnershipDraft=Melnraksts
+PartnershipAccepted=Pieņemts
+PartnershipRefused=Atteikts
+PartnershipCanceled=Atcelts
 PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/lv_LV/productbatch.lang b/htdocs/langs/lv_LV/productbatch.lang
index 996bdaa8249..2f03a347eee 100644
--- a/htdocs/langs/lv_LV/productbatch.lang
+++ b/htdocs/langs/lv_LV/productbatch.lang
@@ -1,4 +1,4 @@
-# ProductBATCH language file - en_US - ProductBATCH
+# ProductBATCH language file - Source file is en_US - ProductBATCH
 ManageLotSerial=Izmantot partijas / sērijas numuru
 ProductStatusOnBatch=Yes (lot required)
 ProductStatusOnSerial=Yes (unique serial number required)
@@ -33,3 +33,13 @@ CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+LifeTime=Life span (in days)
+EndOfLife=End of life
+ManufacturingDate=Manufacturing date
+DestructionDate=Destruction date
+FirstUseDate=First use date
+QCFrequency=Quality control frequency (in days)
+
+#Traceability - qc status
+OutOfOrder=Out of order
+InWorkingOrder=In working order
diff --git a/htdocs/langs/lv_LV/products.lang b/htdocs/langs/lv_LV/products.lang
index 2b525b5760b..b3ca5f5434a 100644
--- a/htdocs/langs/lv_LV/products.lang
+++ b/htdocs/langs/lv_LV/products.lang
@@ -396,3 +396,5 @@ ActionAvailableOnVariantProductOnly=Darbība pieejama tikai produkta variantam
 ProductsPricePerCustomer=Produktu cenas uz vienu klientu
 ProductSupplierExtraFields=Papildu atribūti (piegādātāju cenas)
 DeleteLinkedProduct=Izdzēsiet kombinēto produktu, kas saistīts ar to
+PMPValue=Vidējā svērtā cena
+PMPValueShort=VSC
diff --git a/htdocs/langs/lv_LV/projects.lang b/htdocs/langs/lv_LV/projects.lang
index b2be4c78ce4..19f959ab524 100644
--- a/htdocs/langs/lv_LV/projects.lang
+++ b/htdocs/langs/lv_LV/projects.lang
@@ -267,9 +267,11 @@ InvoiceToUse=Izmantojamais rēķina projekts
 NewInvoice=Jauns rēķins
 OneLinePerTask=Viena rinda katram uzdevumam
 OneLinePerPeriod=Viena rindiņa vienam periodam
+OneLinePerTimeSpentLine=One line for each time spent declaration
 RefTaskParent=Ref. Vecāku uzdevums
 ProfitIsCalculatedWith=Peļņa tiek aprēķināta, izmantojot
 AddPersonToTask=Add also to tasks
 UsageOrganizeEvent=Usage: Event Organization
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
+SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
diff --git a/htdocs/langs/lv_LV/receptions.lang b/htdocs/langs/lv_LV/receptions.lang
index 16a25594972..8c62d5199b5 100644
--- a/htdocs/langs/lv_LV/receptions.lang
+++ b/htdocs/langs/lv_LV/receptions.lang
@@ -44,4 +44,4 @@ ValidateOrderFirstBeforeReception=Vispirms jums ir jāapstiprina pasūtījums, l
 ReceptionsNumberingModules=Pieņemšanas numurēšanas modulis
 ReceptionsReceiptModel=Pieņemšanas dokumentu veidnes
 NoMorePredefinedProductToDispatch=Vairs nav iepriekš nosūtītu produktu
-
+ReceptionExist=A reception exists
diff --git a/htdocs/langs/lv_LV/stocks.lang b/htdocs/langs/lv_LV/stocks.lang
index 2b3f5058ec2..f6c3d4166fe 100644
--- a/htdocs/langs/lv_LV/stocks.lang
+++ b/htdocs/langs/lv_LV/stocks.lang
@@ -56,8 +56,6 @@ UnitPurchaseValue=Vienības iepirkuma cena
 StockTooLow=Krājumi pārāk maz
 StockLowerThanLimit=Krājumi mazāki par atļauto apjomu (%s)
 EnhancedValue=Vērtība
-PMPValue=Vidējā svērtā cena
-PMPValueShort=VSC
 EnhancedValueOfWarehouses=Noliktavas vērtība
 UserWarehouseAutoCreate=Lietotāja noliktavas izveide, izveidojot lietotāju
 AllowAddLimitStockByWarehouse=Pārvaldiet arī minimālā un vēlamā krājuma vērtību pārī (produkta noliktava), papildus minimālā un vēlamā krājuma vērtībai vienam produktam
@@ -251,7 +249,10 @@ SelectAStockMovementFileToImport=select a stock movement file to import
 InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
 LabelOfInventoryMovemement=Inventory %s
 ReOpen=Atvērt pa jaunu
-ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock to the real qty you entered into the inventory.
 ObjectNotFound=%s not found
 MakeMovementsAndClose=Generate movements and close
 AutofillWithExpected=Fill real quantity with expected quantity
+ShowAllBatchByDefault=By default, show batch details on product "stock" tab
+CollapseBatchDetailHelp=You can set batch detail default display in stocks module configuration
+FieldCannotBeNegative=Field "%s" cannot be negative
diff --git a/htdocs/langs/lv_LV/ticket.lang b/htdocs/langs/lv_LV/ticket.lang
index 1b104899e32..9d71f3f79b6 100644
--- a/htdocs/langs/lv_LV/ticket.lang
+++ b/htdocs/langs/lv_LV/ticket.lang
@@ -304,7 +304,7 @@ BoxLastModifiedTicket=Jaunākie labotie pieteikumi
 BoxLastModifiedTicketDescription=Jaunākās %s lanbotās biļetes
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=Nav nesen labotu pieteikumu
-BoxTicketType=Number of open tickets by type
+BoxTicketType=Distribution of open tickets by type
 BoxTicketSeverity=Number of open tickets by severity
 BoxNoTicketSeverity=No tickets opened
 BoxTicketLastXDays=Number of new tickets by days the last %s days
diff --git a/htdocs/langs/mk_MK/accountancy.lang b/htdocs/langs/mk_MK/accountancy.lang
index 68a261785cc..37df4ee2433 100644
--- a/htdocs/langs/mk_MK/accountancy.lang
+++ b/htdocs/langs/mk_MK/accountancy.lang
@@ -158,7 +158,7 @@ ACCOUNTING_LENGTH_AACCOUNT=Length of the third-party accounting accounts (If you
 ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of an accounting account. Needed by some countries (like Switzerland). If set to off (default), you can set the following two parameters to ask the application to add virtual zeros.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties, break ability to search on a part of value)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
@@ -328,6 +328,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountanc
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
+NotifiedExportDate=Notified export date (modification of the entries will not be possible)
+NotifiedValidationDate=Validation of the entries (modification or deletion of the entries will not be possible)
+ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=Export draft journal
 Modelcsv=Model of export
 Selectmodelcsv=Select a model of export
diff --git a/htdocs/langs/mk_MK/admin.lang b/htdocs/langs/mk_MK/admin.lang
index 7c03add0eaf..29a97f8c307 100644
--- a/htdocs/langs/mk_MK/admin.lang
+++ b/htdocs/langs/mk_MK/admin.lang
@@ -221,8 +221,8 @@ NotCompatible=This module does not seem compatible with your Dolibarr %s (Min %s
 CompatibleAfterUpdate=This module requires an update to your Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=See in Market place
 SeeSetupOfModule=See setup of module %s
+SetOptionTo=Set option <b>%s</b> to %s
 Updated=Updated
-Nouveauté=Novelty
 AchatTelechargement=Buy / Download
 GoModuleSetupArea=To deploy/install a new module, go to the Module setup area: <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
@@ -399,6 +399,7 @@ SecurityToken=Key to secure URLs
 NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
 PDF=PDF
 PDFDesc=Global options for PDF generation
+PDFOtherDesc=PDF Option specific to some modules
 PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
 PDFRulesForSalesTax=Rules for Sales Tax / VAT
@@ -561,7 +562,7 @@ Module53Desc=Management of Services
 Module54Name=Договори / Претплати
 Module54Desc=Management of contracts (services or recurring subscriptions)
 Module55Name=Barcodes
-Module55Desc=Barcode management
+Module55Desc=Barcode or QR code management
 Module56Name=Payment by credit transfer
 Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
 Module57Name=Payments by Direct Debit
@@ -848,10 +849,10 @@ Permission402=Create/modify discounts
 Permission403=Validate discounts
 Permission404=Delete discounts
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries (yours and subordinates)
-Permission512=Create/modify payments of salaries
-Permission514=Delete payments of salaries
-Permission517=Read payments of salaries of everybody
+Permission511=Read salaries and payments (yours and subordinates)
+Permission512=Create/modify salaries and payments
+Permission514=Delete salaries and payments
+Permission517=Read salaries and payments everybody
 Permission519=Export salaries
 Permission520=Read Loans
 Permission522=Create/modify loans
@@ -965,6 +966,8 @@ Permission23003=Delete Scheduled job
 Permission23004=Execute Scheduled job
 Permission50101=Use Point of Sale (SimplePOS)
 Permission50151=Use Point of Sale (TakePOS)
+Permission50152=Edit sales lines
+Permission50153=Edit ordered sales lines
 Permission50201=Read transactions
 Permission50202=Import transactions
 Permission50330=Read objects of Zapier
@@ -1039,11 +1042,12 @@ DictionaryMeasuringUnits=Measuring Units
 DictionarySocialNetworks=Social Networks
 DictionaryProspectStatus=Prospect status for companies
 DictionaryProspectContactStatus=Prospect status for contacts
-DictionaryHolidayTypes=Types of leave
+DictionaryHolidayTypes=Leave - Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
 DictionaryTransportMode=Intracomm report - Transport mode
+DictionaryBatchStatus=Product lot/serial Quality Control status
 TypeOfUnit=Type of unit
 SetupSaved=Setup saved
 SetupNotSaved=Setup not saved
@@ -1187,7 +1191,7 @@ SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of m
 SetupDescription5=Other Setup menu entries manage optional parameters.
 AuditedSecurityEvents=Security events that are audited
 NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
-Audit=Audit
+Audit=Security events
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
 InfoOS=About OS
@@ -1319,9 +1323,12 @@ ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
 NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
+ComboListOptim=Combo list loading optimization
 SearchOptim=Search optimization
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
-YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
+YouHaveXObjectUseComboOptim=You have %s %s in the database. You can go into setup of module to enable loading of combo list on key pressed event.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other.
+YouHaveXObjectUseSearchOptimDesc=This limits the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to %s in Home-Setup-Other.
 BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
 BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
 PHPModuleLoaded=PHP component %s is loaded
@@ -1433,6 +1440,7 @@ MemberMainOptions=Main options
 AdherentLoginRequired= Manage a Login for each member
 AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
+MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
 MembersDocModules=Document templates for documents generated from member record
@@ -1763,7 +1771,7 @@ AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting men
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
-AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the scheduled job %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
@@ -1979,6 +1987,8 @@ 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_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add picture on proposal line
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add electronic sign in PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
@@ -2096,7 +2106,6 @@ PDF_SHOW_PROJECT=Show project on document
 ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
-FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
@@ -2120,12 +2129,18 @@ ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by
 MailToSendEventOrganization=Event Organization
 AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
 YouShouldDisablePHPFunctions=You should disable PHP functions
-IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands in custom code, you shoud disable PHP functions
+PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
+NotRecommended=Not recommanded
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
 ModuleUpdateAvailable=An update is available
 NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
+RandomlySelectedIfSeveral=Randomly selected if several pictures are available
+DatabasePasswordObfuscated=Database password is obfuscated in conf file
+DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
diff --git a/htdocs/langs/mk_MK/agenda.lang b/htdocs/langs/mk_MK/agenda.lang
index 30c0db6cc9f..b775791182a 100644
--- a/htdocs/langs/mk_MK/agenda.lang
+++ b/htdocs/langs/mk_MK/agenda.lang
@@ -4,7 +4,7 @@ Actions=Настани
 Agenda=Агенда
 TMenuAgenda=Агенда
 Agendas=Агенди
-LocalAgenda=Internal calendar
+LocalAgenda=Default calendar
 ActionsOwnedBy=Настан во сопственост на
 ActionsOwnedByShort=Сопственик
 AffectedTo=Доделен на
@@ -14,13 +14,13 @@ EventsNb=Број на настани
 ListOfActions=Листа на настани
 EventReports=Event reports
 Location=Location
-ToUserOfGroup=Event assigned to any user in group
+ToUserOfGroup=Event assigned to any user in the group
 EventOnFullDay=Event on all day(s)
 MenuToDoActions=All incomplete events
 MenuDoneActions=All terminated events
 MenuToDoMyActions=My incomplete events
 MenuDoneMyActions=My terminated events
-ListOfEvents=List of events (internal calendar)
+ListOfEvents=List of events (default calendar)
 ActionsAskedBy=Events reported by
 ActionsToDoBy=Events assigned to
 ActionsDoneBy=Events done by
@@ -38,6 +38,7 @@ ActionsEvents=Events for which Dolibarr will create an action in agenda automati
 EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Third party %s created
+COMPANY_MODIFYInDolibarr=Third party %s modified
 COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=Contract %s validated
 CONTRACT_DELETEInDolibarr=Contract %s deleted
@@ -87,6 +88,7 @@ OrderDeleted=Order deleted
 InvoiceDeleted=Invoice deleted
 DraftInvoiceDeleted=Draft invoice deleted
 CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_MODIFYInDolibarr=Contact %s modified
 CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Product %s created
 PRODUCT_MODIFYInDolibarr=Product %s modified
@@ -119,6 +121,7 @@ MRP_MO_UNVALIDATEInDolibarr=MO set to draft status
 MRP_MO_PRODUCEDInDolibarr=MO produced
 MRP_MO_DELETEInDolibarr=MO deleted
 MRP_MO_CANCELInDolibarr=MO canceled
+PAIDInDolibarr=%s paid
 ##### End agenda events #####
 AgendaModelModule=Document templates for event
 DateActionStart=Start date
@@ -130,7 +133,7 @@ AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to use
 AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
 AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic events.
 AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> to include events of holidays.
-AgendaShowBirthdayEvents=Show birthdays of contacts
+AgendaShowBirthdayEvents=Birthdays of contacts
 AgendaHideBirthdayEvents=Hide birthdays of contacts
 Busy=Busy
 ExportDataset_event1=List of agenda events
@@ -152,6 +155,7 @@ ActionType=Event type
 DateActionBegin=Start event date
 ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b>?
 RepeatEvent=Repeat event
+OnceOnly=Once only
 EveryWeek=Every week
 EveryMonth=Every month
 DayOfMonth=Day of month
@@ -165,4 +169,4 @@ TimeType=Duration type
 ReminderType=Callback type
 AddReminder=Create an automatic reminder notification for this event
 ErrorReminderActionCommCreation=Error creating the reminder notification for this event
-BrowserPush=Browser Notification
+BrowserPush=Browser Popup Notification
diff --git a/htdocs/langs/mk_MK/bills.lang b/htdocs/langs/mk_MK/bills.lang
index fec7bfce851..31f09ab1ec7 100644
--- a/htdocs/langs/mk_MK/bills.lang
+++ b/htdocs/langs/mk_MK/bills.lang
@@ -259,6 +259,7 @@ DateMaxPayment=Payment due on
 DateInvoice=Invoice date
 DatePointOfTax=Point of tax
 NoInvoice=No invoice
+NoOpenInvoice=No open invoice
 ClassifyBill=Classify invoice
 SupplierBillsToPay=Неплатени фактури на добавувачи
 CustomerBillsUnpaid=Неплатени фактури од клиенти
@@ -589,3 +590,4 @@ FacParentLine=Invoice Line Parent
 SituationTotalRayToRest=Remainder to pay without taxe
 PDFSituationTitle=Situation n° %d
 SituationTotalProgress=Total progress %d %%
+SearchUnpaidInvoicesWithDueDate=Search unpaid invoices with a due date = %s
diff --git a/htdocs/langs/mk_MK/cashdesk.lang b/htdocs/langs/mk_MK/cashdesk.lang
index 240503842f3..aea1f02f834 100644
--- a/htdocs/langs/mk_MK/cashdesk.lang
+++ b/htdocs/langs/mk_MK/cashdesk.lang
@@ -102,7 +102,7 @@ CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal numb
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
 SaleStartedAt=Sale started at %s
-ControlCashOpening=Control cash popup at opening POS
+ControlCashOpening=Open the "Control cash" popup when opening the POS
 CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -126,5 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
-ShowPriceHT = Display the price excluding tax column
-ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
+ShowPriceHT = Display the column with the price excluding tax (on screen)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
diff --git a/htdocs/langs/mk_MK/compta.lang b/htdocs/langs/mk_MK/compta.lang
index 7cae82e6ac7..8329346c163 100644
--- a/htdocs/langs/mk_MK/compta.lang
+++ b/htdocs/langs/mk_MK/compta.lang
@@ -286,3 +286,9 @@ ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
 IncludeLoansInResults = Include loans in reports
+InvoiceLate30Days = Invoices late > 30 days
+InvoiceLate15Days = Invoices late > 15 days
+InvoiceLateMinus15Days = Invoices late
+InvoiceNotLate = To be collected < 15 days
+InvoiceNotLate15Days = To be collected in 15 days
+InvoiceNotLate30Days = To be collected in 30 days
diff --git a/htdocs/langs/mk_MK/cron.lang b/htdocs/langs/mk_MK/cron.lang
index 016dca81e7a..2e379333f80 100644
--- a/htdocs/langs/mk_MK/cron.lang
+++ b/htdocs/langs/mk_MK/cron.lang
@@ -60,7 +60,7 @@ CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
 CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Disable
-CronTaskInactive=This job is disabled
+CronTaskInactive=This job is disabled (not scheduled)
 CronId=Id
 CronClassFile=Filename with class
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example 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>
diff --git a/htdocs/langs/mk_MK/errors.lang b/htdocs/langs/mk_MK/errors.lang
index 9b14b5ad1d2..670f8c7a6bc 100644
--- a/htdocs/langs/mk_MK/errors.lang
+++ b/htdocs/langs/mk_MK/errors.lang
@@ -11,6 +11,7 @@ ErrorBadValueForParamNotAString=Bad value for your parameter. It appends general
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s already exists.
 ErrorGroupAlreadyExists=Group %s already exists.
+ErrorEmailAlreadyExists=Email %s already exists.
 ErrorRecordNotFound=Record not found.
 ErrorFailToCopyFile=Failed to copy file '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
@@ -117,7 +118,7 @@ ErrorCantReadFile=Failed to read file '%s'
 ErrorCantReadDir=Failed to read directory '%s'
 ErrorBadLoginPassword=Bad value for login or password
 ErrorLoginDisabled=Your account has been disabled
-ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server. If PHP <b>Safe Mode</b> is enabled, check that command is inside a directory defined by parameter <b>safe_mode_exec_dir</b>.
+ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server user. Check also the command is not protected on shell level by a security layer like apparmor.
 ErrorFailedToChangePassword=Failed to change password
 ErrorLoginDoesNotExists=User with login <b>%s</b> could not be found.
 ErrorLoginHasNoEmail=This user has no email address. Process aborted.
@@ -262,6 +263,7 @@ ErrorDateIsInFuture=Error, the date can't be in the future
 ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
 ErrorAPercentIsRequired=Error, please fill in the percentage correctly
 ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
+ErrorFailedToFindEmailTemplate=Failed to find template with code name %s
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -298,3 +300,4 @@ WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So y
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
+ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
diff --git a/htdocs/langs/mk_MK/eventorganization.lang b/htdocs/langs/mk_MK/eventorganization.lang
index 1c27dd55a21..d730e862879 100644
--- a/htdocs/langs/mk_MK/eventorganization.lang
+++ b/htdocs/langs/mk_MK/eventorganization.lang
@@ -1,4 +1,5 @@
 # Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+# Copyright (C) 2021		Dorian Vabre			<dorian.vabre@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
@@ -81,7 +82,10 @@ PriceOfBoothHelp=Subscription price to stand a booth
 EventOrganizationICSLink=Link ICS for events
 ConferenceOrBoothInformation=Conference Or Booth informations
 Attendees = Attendees
+DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
 #
 # Status
 #
@@ -94,8 +98,46 @@ EvntOrgCancelled = Cancelled
 #
 # Public page
 #
+SuggestForm = Suggestion page
+RegisterPage = Page for conferences or booth
+EvntOrgRegistrationHelpMessage = Here, you can vote for an event, or suggest a new conference or booth for the project
+EvntOrgRegistrationConfHelpMessage = Here, you can suggest a new conference for the project
+EvntOrgRegistrationBoothHelpMessage = Here, you can suggest a new booth for the project
+ListOfSuggestedConferences = List of suggested conferences
+ListOfSuggestedBooths = List of suggested booths
+SuggestConference = Suggest a new conference
+SuggestBooth = Suggest a booth
+ViewAndVote = View and vote for suggested events
 PublicAttendeeSubscriptionPage = Public link of registration to a conference
 MissingOrBadSecureKey = The security key is invalid or missing
-EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
-EvntOrgStartDuration = This conference starts on
-EvntOrgEndDuration =  and ends on
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference : '%s'
+EvntOrgDuration = This conference starts on %s and ends on %s.
+ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
+BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
+EventType = Event type
+
+#
+# Vote page
+#
+EvntOrgRegistrationWelcomeMessage = Welcome on the conference or booth suggestion page.
+EvntOrgRegistrationConfWelcomeMessage = Welcome on the conference suggestion page.
+EvntOrgRegistrationBoothWelcomeMessage = Welcome on the booth suggestion page.
+EvntOrgVoteHelpMessage = Here, you can view and vote for the suggested events for the project
+VoteOk = Your vote has been accepted.
+AlreadyVoted = You have already voted for this event.
+VoteError = An error has occurred during the vote, please try again.
+
+#
+# SubscriptionOk page
+#
+SubscriptionOk = Your subscription to this conference has been validated
+#
+# Subscription validation mail
+#
+ConfAttendeeSubscriptionConfirmation = Confirmation of your subscription to a conference
+#
+# Payment page
+#
+Attendee = Attendee
+PaymentConferenceAttendee = Conference attendee payment
+PaymentBoothLocation = Booth location payment
diff --git a/htdocs/langs/mk_MK/hrm.lang b/htdocs/langs/mk_MK/hrm.lang
index 9f7475466fa..b9040fddcd2 100644
--- a/htdocs/langs/mk_MK/hrm.lang
+++ b/htdocs/langs/mk_MK/hrm.lang
@@ -9,7 +9,7 @@ ConfirmDeleteEstablishment=Дали сте сигурни дека саката
 OpenEtablishment=Отвори компанија
 CloseEtablishment=Затвори компанија
 # Dictionary
-DictionaryPublicHolidays=HRM - државни празници
+DictionaryPublicHolidays=Leave - Public holidays
 DictionaryDepartment=HRM - Список на оддели
 DictionaryFunction=HRM - Job positions
 # Module
diff --git a/htdocs/langs/mk_MK/knowledgemanagement.lang b/htdocs/langs/mk_MK/knowledgemanagement.lang
index 5267df31200..7080bc1220f 100644
--- a/htdocs/langs/mk_MK/knowledgemanagement.lang
+++ b/htdocs/langs/mk_MK/knowledgemanagement.lang
@@ -47,7 +47,7 @@ KnowledgeManagementArea = Knowledge Management
 # Menu
 #
 MenuKnowledgeRecord = Knowledge base
-ListOfArticles = List of articles
+ListKnowledgeRecord = List of articles
 NewKnowledgeRecord = New article
 ValidateReply = Validate solution
 KnowledgeRecords = Articles
diff --git a/htdocs/langs/mk_MK/languages.lang b/htdocs/langs/mk_MK/languages.lang
index a25efb26d67..e9814de01f2 100644
--- a/htdocs/langs/mk_MK/languages.lang
+++ b/htdocs/langs/mk_MK/languages.lang
@@ -3,6 +3,7 @@ Language_am_ET=Ethiopian
 Language_ar_AR=Арапски
 Language_ar_EG=Arabic (Egypt)
 Language_ar_SA=Арапски
+Language_ar_TN=Arabic (Tunisia)
 Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengali
 Language_bn_IN=Bengali (India)
@@ -84,6 +85,7 @@ Language_nl_NL=Dutch
 Language_pl_PL=Полскиот
 Language_pt_BR=Португалски (во Бразил)
 Language_pt_PT=Португалски
+Language_ro_MD=Romanian (Moldavia)
 Language_ro_RO=Романски
 Language_ru_RU=Рускиот
 Language_ru_UA=Руски (Украина)
diff --git a/htdocs/langs/mk_MK/main.lang b/htdocs/langs/mk_MK/main.lang
index cfa487979f0..759f79ea37f 100644
--- a/htdocs/langs/mk_MK/main.lang
+++ b/htdocs/langs/mk_MK/main.lang
@@ -430,6 +430,7 @@ LT1IN=CGST
 LT2IN=SGST
 LT1GC=Additionnal cents
 VATRate=Tax Rate
+RateOfTaxN=Rate of tax %s
 VATCode=Tax Rate code
 VATNPR=Tax Rate NPR
 DefaultTaxRate=Default tax rate
@@ -729,6 +730,7 @@ MenuMembers=Корисници
 MenuAgendaGoogle=Google agenda
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
+ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
 NoFileFound=No documents uploaded
 CurrentUserLanguage=Current language
 CurrentTheme=Current theme
@@ -1072,6 +1074,7 @@ ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
 ToClose=To close
+ToRefuse=To refuse
 ToProcess=To process
 ToApprove=To approve
 GlobalOpenedElemView=Global view
@@ -1126,9 +1129,11 @@ UpdateForAllLines=Update for all lines
 OnHold=On hold
 Civility=Civility
 AffectTag=Affect Tag
+CreateExternalUser=Create external user
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
 ConfirmCancel=Are you sure you want to cancel
+EmailMsgID=Email MsgID
diff --git a/htdocs/langs/mk_MK/members.lang b/htdocs/langs/mk_MK/members.lang
index 20f18a2cf0d..34c05c99361 100644
--- a/htdocs/langs/mk_MK/members.lang
+++ b/htdocs/langs/mk_MK/members.lang
@@ -213,3 +213,5 @@ SendReminderForExpiredSubscription=Send reminder by email to members when subscr
 MembershipPaid=Membership paid for current period (until %s)
 YouMayFindYourInvoiceInThisEmail=You may find your invoice attached to this email
 XMembersClosed=%s member(s) closed
+XExternalUserCreated=%s external user(s) created
+ForceMemberNature=Force member nature (Individual or Corporation)
diff --git a/htdocs/langs/mk_MK/modulebuilder.lang b/htdocs/langs/mk_MK/modulebuilder.lang
index 9fdaa1a533a..23a098be2e5 100644
--- a/htdocs/langs/mk_MK/modulebuilder.lang
+++ b/htdocs/langs/mk_MK/modulebuilder.lang
@@ -143,3 +143,4 @@ AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
 ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
+ImportExportProfiles=Import and export profiles
diff --git a/htdocs/langs/mk_MK/mrp.lang b/htdocs/langs/mk_MK/mrp.lang
index ec999a473a4..2414a92cefb 100644
--- a/htdocs/langs/mk_MK/mrp.lang
+++ b/htdocs/langs/mk_MK/mrp.lang
@@ -8,12 +8,12 @@ MenuBOM=Bills of material
 LatestBOMModified=Latest %s Bills of materials modified
 LatestMOModified=Latest %s Manufacturing Orders modified
 Bom=Bills of Material
-BillOfMaterials=Bill of Material
+BillOfMaterials=Bill of Materials
 BOMsSetup=Setup of module BOM
 ListOfBOMs=List of bills of material - BOM
 ListOfManufacturingOrders=List of Manufacturing Orders
-NewBOM=New bill of material
-ProductBOMHelp=Product to create with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
+NewBOM=New bill of materials
+ProductBOMHelp=Product to create (or disassemble) with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
 BOMsNumberingModules=BOM numbering templates
 BOMsModelModule=BOM document templates
 MOsNumberingModules=MO numbering templates
@@ -22,7 +22,7 @@ FreeLegalTextOnBOMs=Free text on document of BOM
 WatermarkOnDraftBOMs=Watermark on draft BOM
 FreeLegalTextOnMOs=Free text on document of MO
 WatermarkOnDraftMOs=Watermark on draft MO
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials %s ?
 ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
 ManufacturingEfficiency=Manufacturing efficiency
 ConsumptionEfficiency=Consumption efficiency
@@ -30,8 +30,8 @@ ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the produc
 ValueOfMeansLossForProductProduced=Value of 0.95 means an average of 5%% of loss of produced product
 DeleteBillOfMaterials=Delete Bill Of Materials
 DeleteMo=Delete Manufacturing Order
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Materials?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Materials?
 MenuMRP=Manufacturing Orders
 NewMO=New Manufacturing Order
 QtyToProduce=Qty to produce
@@ -39,7 +39,7 @@ DateStartPlannedMo=Date start planned
 DateEndPlannedMo=Date end planned
 KeepEmptyForAsap=Empty means 'As Soon As Possible'
 EstimatedDuration=Estimated duration
-EstimatedDurationDesc=Estimated duration to manufacture this product using this BOM
+EstimatedDurationDesc=Estimated duration to manufacture (or disassemble) this product using this BOM
 ConfirmValidateBom=Are you sure you want to validate the BOM with the reference <strong>%s</strong> (you will be able to use it to build new Manufacturing Orders)
 ConfirmCloseBom=Are you sure you want to cancel this BOM (you won't be able to use it to build new Manufacturing Orders anymore) ?
 ConfirmReopenBom=Are you sure you want to re-open this BOM (you will be able to use it to build new Manufacturing Orders)
@@ -63,13 +63,14 @@ ConsumeAndProduceAll=Consume and Produce All
 Manufactured=Manufactured
 TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
 ForAQuantityOf=For a quantity to produce of %s
+ForAQuantityToConsumeOf=For a quantity to disassemble of %s
 ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
 ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
 ProductionForRef=Production of %s
 AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
 NoStockChangeOnServices=No stock change on services
 ProductQtyToConsumeByMO=Product quantity still to consume by open MO
-ProductQtyToProduceByMO=Product quentity still to produce by open MO
+ProductQtyToProduceByMO=Product quantity still to produce by open MO
 AddNewConsumeLines=Add new line to consume
 ProductsToConsume=Products to consume
 ProductsToProduce=Products to produce
@@ -83,15 +84,13 @@ Workstations=Workstations
 WorkstationsDescription=Workstations management
 WorkstationSetup = Workstations setup
 WorkstationSetupPage = Workstations setup page
-WorkstationAbout = About Workstation
-WorkstationAboutPage = Workstations about page
 WorkstationList=Workstation list
 WorkstationCreate=Add new workstation
 ConfirmEnableWorkstation=Are you sure you want to enable workstation <b>%s</b> ?
 EnableAWorkstation=Enable a workstation
 ConfirmDisableWorkstation=Are you sure you want to disable workstation <b>%s</b> ?
 DisableAWorkstation=Disable a workstation
-DeleteWorkstation=Supprimer
+DeleteWorkstation=Delete
 NbOperatorsRequired=Number of operators required
 THMOperatorEstimated=Estimated operator THM
 THMMachineEstimated=Estimated machine THM
diff --git a/htdocs/langs/mk_MK/orders.lang b/htdocs/langs/mk_MK/orders.lang
index 6486bfe423d..f772f037d5d 100644
--- a/htdocs/langs/mk_MK/orders.lang
+++ b/htdocs/langs/mk_MK/orders.lang
@@ -11,6 +11,7 @@ OrderDate=Order date
 OrderDateShort=Order date
 OrderToProcess=Order to process
 NewOrder=New order
+NewSupplierOrderShort=New order
 NewOrderSupplier=New Purchase Order
 ToOrder=Make order
 MakeOrder=Make order
@@ -73,6 +74,7 @@ DeleteOrder=Delete order
 CancelOrder=Cancel order
 OrderReopened= Order %s re-open
 AddOrder=Create order
+AddSupplierOrderShort=Create order
 AddPurchaseOrder=Create purchase order
 AddToDraftOrders=Add to draft order
 ShowOrder=Show order
diff --git a/htdocs/langs/mk_MK/other.lang b/htdocs/langs/mk_MK/other.lang
index 95297a98859..bb35099ab82 100644
--- a/htdocs/langs/mk_MK/other.lang
+++ b/htdocs/langs/mk_MK/other.lang
@@ -129,6 +129,7 @@ ClosedByLogin=User login who closed
 FileWasRemoved=File %s was removed
 DirWasRemoved=Directory %s was removed
 FeatureNotYetAvailable=Feature not yet available in the current version
+FeatureNotAvailableOnDevicesWithoutMouse=Feature not available on devices without mouse
 FeaturesSupported=Supported features
 Width=Width
 Height=Height
@@ -263,7 +264,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
-PrefixSession=Prefix for session ID
+SuffixSessionName=Suffix for session name
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/mk_MK/partnership.lang b/htdocs/langs/mk_MK/partnership.lang
index 79ef0961c57..4149b1e488e 100644
--- a/htdocs/langs/mk_MK/partnership.lang
+++ b/htdocs/langs/mk_MK/partnership.lang
@@ -16,41 +16,72 @@
 #
 # Generic
 #
-ModulePartnershipName = Partnership management
-PartnershipDescription = Module Partnership management
+ModulePartnershipName=Partnership management
+PartnershipDescription=Module Partnership management
 PartnershipDescriptionLong= Module Partnership management
 
+AddPartnership=Add partnership
+CancelPartnershipForExpiredMembers=Partnership: Cancel partnership of members with expired subscriptions
+PartnershipCheckBacklink=Partnership: Check referring backlink
+
 #
 # Menu
 #
-NewPartnership = New Partnership
-ListOfPartnerships = List of partnership
+NewPartnership=New Partnership
+ListOfPartnerships=List of partnership
 
 #
 # Admin page
 #
-PartnershipSetup = Partnership setup
-PartnershipAbout = About Partnership
-PartnershipAboutPage = Partnership about page
-
+PartnershipSetup=Partnership setup
+PartnershipAbout=About Partnership
+PartnershipAboutPage=Partnership about page
+partnershipforthirdpartyormember=Partner status must be set on a 'thirdparty' or a 'member'
+PARTNERSHIP_IS_MANAGED_FOR=Partnership managed for
+PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks to check
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb of days before cancelling status of a partnership when a subscription has expired
+ReferingWebsiteCheck=Check of website referring
+ReferingWebsiteCheckDesc=You can enable a feature to check that your partners has added a backlink to your website domains on their own website.
 
 #
 # Object
 #
+DeletePartnership=Delete a partnership
+PartnershipDedicatedToThisThirdParty=Partnership dedicated to this third party
+PartnershipDedicatedToThisMember=Partnership dedicated to this member
 DatePartnershipStart=Почетен датум
 DatePartnershipEnd=Краен датум
+ReasonDecline=Decline reason
+ReasonDeclineOrCancel=Decline reason
+PartnershipAlreadyExist=Partnership already exist
+ManagePartnership=Manage partnership
+BacklinkNotFoundOnPartnerWebsite=Backlink not found on partner website
+ConfirmClosePartnershipAsk=Are you sure you want to cancel this partnership?
+PartnershipType=Partnership type
 
 #
 # Template Mail
 #
+SendingEmailOnPartnershipWillSoonBeCanceled=Partnership will soon be canceled
+SendingEmailOnPartnershipRefused=Partnership refused
+SendingEmailOnPartnershipAccepted=Partnership accepted
+SendingEmailOnPartnershipCanceled=Partnership canceled
 
+YourPartnershipWillSoonBeCanceledTopic=Partnership will soon be canceled
+YourPartnershipRefusedTopic=Partnership refused
+YourPartnershipAcceptedTopic=Partnership accepted
+YourPartnershipCanceledTopic=Partnership canceled
+
+YourPartnershipWillSoonBeCanceledContent=We inform you that your partnership will soon be canceled (Backlink not found)
+YourPartnershipRefusedContent=We inform you that your partnership request has been refused.
+YourPartnershipAcceptedContent=We inform you that your partnership request has been accepted.
+YourPartnershipCanceledContent=We inform you that your partnership has been canceled.
 
 #
 # Status
 #
-PartnershipDraft = Нацрт
-PartnershipAccepted = Accepted
-PartnershipRefused = Refused
-PartnershipCanceled = Canceled
-
+PartnershipDraft=Нацрт
+PartnershipAccepted=Accepted
+PartnershipRefused=Refused
+PartnershipCanceled=Canceled
 PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/mk_MK/productbatch.lang b/htdocs/langs/mk_MK/productbatch.lang
index ad2db658e2e..450d0285819 100644
--- a/htdocs/langs/mk_MK/productbatch.lang
+++ b/htdocs/langs/mk_MK/productbatch.lang
@@ -1,4 +1,4 @@
-# ProductBATCH language file - en_US - ProductBATCH
+# ProductBATCH language file - Source file is en_US - ProductBATCH
 ManageLotSerial=Use lot/serial number
 ProductStatusOnBatch=Yes (lot required)
 ProductStatusOnSerial=Yes (unique serial number required)
@@ -33,3 +33,13 @@ CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+LifeTime=Life span (in days)
+EndOfLife=End of life
+ManufacturingDate=Manufacturing date
+DestructionDate=Destruction date
+FirstUseDate=First use date
+QCFrequency=Quality control frequency (in days)
+
+#Traceability - qc status
+OutOfOrder=Out of order
+InWorkingOrder=In working order
diff --git a/htdocs/langs/mk_MK/products.lang b/htdocs/langs/mk_MK/products.lang
index b8be8edd70b..9836dd67f46 100644
--- a/htdocs/langs/mk_MK/products.lang
+++ b/htdocs/langs/mk_MK/products.lang
@@ -396,3 +396,5 @@ ActionAvailableOnVariantProductOnly=Action only available on the variant of prod
 ProductsPricePerCustomer=Product prices per customers
 ProductSupplierExtraFields=Additional Attributes (Supplier Prices)
 DeleteLinkedProduct=Delete the child product linked to the combination
+PMPValue=Weighted average price
+PMPValueShort=WAP
diff --git a/htdocs/langs/mk_MK/projects.lang b/htdocs/langs/mk_MK/projects.lang
index 79c974f6e24..6c96fadb5c1 100644
--- a/htdocs/langs/mk_MK/projects.lang
+++ b/htdocs/langs/mk_MK/projects.lang
@@ -267,9 +267,11 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=New invoice
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+OneLinePerTimeSpentLine=One line for each time spent declaration
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
 AddPersonToTask=Add also to tasks
 UsageOrganizeEvent=Usage: Event Organization
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
+SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
diff --git a/htdocs/langs/mk_MK/receptions.lang b/htdocs/langs/mk_MK/receptions.lang
index 552f716bf69..4b4ed6b1146 100644
--- a/htdocs/langs/mk_MK/receptions.lang
+++ b/htdocs/langs/mk_MK/receptions.lang
@@ -44,4 +44,4 @@ ValidateOrderFirstBeforeReception=You must first validate the order before being
 ReceptionsNumberingModules=Numbering module for receptions
 ReceptionsReceiptModel=Document templates for receptions
 NoMorePredefinedProductToDispatch=No more predefined products to dispatch
-
+ReceptionExist=A reception exists
diff --git a/htdocs/langs/mk_MK/stocks.lang b/htdocs/langs/mk_MK/stocks.lang
index 00619fd3310..aa45270396e 100644
--- a/htdocs/langs/mk_MK/stocks.lang
+++ b/htdocs/langs/mk_MK/stocks.lang
@@ -56,8 +56,6 @@ UnitPurchaseValue=Unit purchase price
 StockTooLow=Stock too low
 StockLowerThanLimit=Stock lower than alert limit (%s)
 EnhancedValue=Value
-PMPValue=Weighted average price
-PMPValueShort=WAP
 EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
@@ -251,7 +249,10 @@ SelectAStockMovementFileToImport=select a stock movement file to import
 InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
 LabelOfInventoryMovemement=Inventory %s
 ReOpen=Reopen
-ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock to the real qty you entered into the inventory.
 ObjectNotFound=%s not found
 MakeMovementsAndClose=Generate movements and close
 AutofillWithExpected=Fill real quantity with expected quantity
+ShowAllBatchByDefault=By default, show batch details on product "stock" tab
+CollapseBatchDetailHelp=You can set batch detail default display in stocks module configuration
+FieldCannotBeNegative=Field "%s" cannot be negative
diff --git a/htdocs/langs/mk_MK/ticket.lang b/htdocs/langs/mk_MK/ticket.lang
index 5b6dab8eefd..e440e748388 100644
--- a/htdocs/langs/mk_MK/ticket.lang
+++ b/htdocs/langs/mk_MK/ticket.lang
@@ -304,7 +304,7 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
-BoxTicketType=Number of open tickets by type
+BoxTicketType=Distribution of open tickets by type
 BoxTicketSeverity=Number of open tickets by severity
 BoxNoTicketSeverity=No tickets opened
 BoxTicketLastXDays=Number of new tickets by days the last %s days
diff --git a/htdocs/langs/mn_MN/accountancy.lang b/htdocs/langs/mn_MN/accountancy.lang
index 354cddb62c2..27be673dd9c 100644
--- a/htdocs/langs/mn_MN/accountancy.lang
+++ b/htdocs/langs/mn_MN/accountancy.lang
@@ -158,7 +158,7 @@ ACCOUNTING_LENGTH_AACCOUNT=Length of the third-party accounting accounts (If you
 ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of an accounting account. Needed by some countries (like Switzerland). If set to off (default), you can set the following two parameters to ask the application to add virtual zeros.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties, break ability to search on a part of value)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
@@ -328,6 +328,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountanc
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
+NotifiedExportDate=Notified export date (modification of the entries will not be possible)
+NotifiedValidationDate=Validation of the entries (modification or deletion of the entries will not be possible)
+ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=Export draft journal
 Modelcsv=Model of export
 Selectmodelcsv=Select a model of export
diff --git a/htdocs/langs/mn_MN/admin.lang b/htdocs/langs/mn_MN/admin.lang
index fb4513a09b4..be9aca94599 100644
--- a/htdocs/langs/mn_MN/admin.lang
+++ b/htdocs/langs/mn_MN/admin.lang
@@ -221,8 +221,8 @@ NotCompatible=This module does not seem compatible with your Dolibarr %s (Min %s
 CompatibleAfterUpdate=This module requires an update to your Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=See in Market place
 SeeSetupOfModule=See setup of module %s
+SetOptionTo=Set option <b>%s</b> to %s
 Updated=Updated
-Nouveauté=Novelty
 AchatTelechargement=Buy / Download
 GoModuleSetupArea=To deploy/install a new module, go to the Module setup area: <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
@@ -399,6 +399,7 @@ SecurityToken=Key to secure URLs
 NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
 PDF=PDF
 PDFDesc=Global options for PDF generation
+PDFOtherDesc=PDF Option specific to some modules
 PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
 PDFRulesForSalesTax=Rules for Sales Tax / VAT
@@ -561,7 +562,7 @@ Module53Desc=Management of Services
 Module54Name=Contracts/Subscriptions
 Module54Desc=Management of contracts (services or recurring subscriptions)
 Module55Name=Barcodes
-Module55Desc=Barcode management
+Module55Desc=Barcode or QR code management
 Module56Name=Payment by credit transfer
 Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
 Module57Name=Payments by Direct Debit
@@ -848,10 +849,10 @@ Permission402=Create/modify discounts
 Permission403=Validate discounts
 Permission404=Delete discounts
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries (yours and subordinates)
-Permission512=Create/modify payments of salaries
-Permission514=Delete payments of salaries
-Permission517=Read payments of salaries of everybody
+Permission511=Read salaries and payments (yours and subordinates)
+Permission512=Create/modify salaries and payments
+Permission514=Delete salaries and payments
+Permission517=Read salaries and payments everybody
 Permission519=Export salaries
 Permission520=Read Loans
 Permission522=Create/modify loans
@@ -965,6 +966,8 @@ Permission23003=Delete Scheduled job
 Permission23004=Execute Scheduled job
 Permission50101=Use Point of Sale (SimplePOS)
 Permission50151=Use Point of Sale (TakePOS)
+Permission50152=Edit sales lines
+Permission50153=Edit ordered sales lines
 Permission50201=Read transactions
 Permission50202=Import transactions
 Permission50330=Read objects of Zapier
@@ -1039,11 +1042,12 @@ DictionaryMeasuringUnits=Measuring Units
 DictionarySocialNetworks=Social Networks
 DictionaryProspectStatus=Prospect status for companies
 DictionaryProspectContactStatus=Prospect status for contacts
-DictionaryHolidayTypes=Types of leave
+DictionaryHolidayTypes=Leave - Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
 DictionaryTransportMode=Intracomm report - Transport mode
+DictionaryBatchStatus=Product lot/serial Quality Control status
 TypeOfUnit=Type of unit
 SetupSaved=Setup saved
 SetupNotSaved=Setup not saved
@@ -1187,7 +1191,7 @@ SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of m
 SetupDescription5=Other Setup menu entries manage optional parameters.
 AuditedSecurityEvents=Security events that are audited
 NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
-Audit=Audit
+Audit=Security events
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
 InfoOS=About OS
@@ -1319,9 +1323,12 @@ ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
 NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
+ComboListOptim=Combo list loading optimization
 SearchOptim=Search optimization
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
-YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
+YouHaveXObjectUseComboOptim=You have %s %s in the database. You can go into setup of module to enable loading of combo list on key pressed event.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other.
+YouHaveXObjectUseSearchOptimDesc=This limits the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to %s in Home-Setup-Other.
 BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
 BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
 PHPModuleLoaded=PHP component %s is loaded
@@ -1433,6 +1440,7 @@ MemberMainOptions=Main options
 AdherentLoginRequired= Manage a Login for each member
 AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
+MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
 MembersDocModules=Document templates for documents generated from member record
@@ -1763,7 +1771,7 @@ AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting men
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
-AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the scheduled job %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
@@ -1979,6 +1987,8 @@ 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_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add picture on proposal line
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add electronic sign in PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
@@ -2096,7 +2106,6 @@ PDF_SHOW_PROJECT=Show project on document
 ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
-FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
@@ -2120,12 +2129,18 @@ ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by
 MailToSendEventOrganization=Event Organization
 AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
 YouShouldDisablePHPFunctions=You should disable PHP functions
-IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands in custom code, you shoud disable PHP functions
+PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
+NotRecommended=Not recommanded
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
 ModuleUpdateAvailable=An update is available
 NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
+RandomlySelectedIfSeveral=Randomly selected if several pictures are available
+DatabasePasswordObfuscated=Database password is obfuscated in conf file
+DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
diff --git a/htdocs/langs/mn_MN/agenda.lang b/htdocs/langs/mn_MN/agenda.lang
index 09d82139a49..a1183841b00 100644
--- a/htdocs/langs/mn_MN/agenda.lang
+++ b/htdocs/langs/mn_MN/agenda.lang
@@ -4,7 +4,7 @@ Actions=Events
 Agenda=Agenda
 TMenuAgenda=Agenda
 Agendas=Agendas
-LocalAgenda=Internal calendar
+LocalAgenda=Default calendar
 ActionsOwnedBy=Event owned by
 ActionsOwnedByShort=Owner
 AffectedTo=Assigned to
@@ -14,13 +14,13 @@ EventsNb=Number of events
 ListOfActions=List of events
 EventReports=Event reports
 Location=Location
-ToUserOfGroup=Event assigned to any user in group
+ToUserOfGroup=Event assigned to any user in the group
 EventOnFullDay=Event on all day(s)
 MenuToDoActions=All incomplete events
 MenuDoneActions=All terminated events
 MenuToDoMyActions=My incomplete events
 MenuDoneMyActions=My terminated events
-ListOfEvents=List of events (internal calendar)
+ListOfEvents=List of events (default calendar)
 ActionsAskedBy=Events reported by
 ActionsToDoBy=Events assigned to
 ActionsDoneBy=Events done by
@@ -38,6 +38,7 @@ ActionsEvents=Events for which Dolibarr will create an action in agenda automati
 EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Third party %s created
+COMPANY_MODIFYInDolibarr=Third party %s modified
 COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=Contract %s validated
 CONTRACT_DELETEInDolibarr=Contract %s deleted
@@ -87,6 +88,7 @@ OrderDeleted=Order deleted
 InvoiceDeleted=Invoice deleted
 DraftInvoiceDeleted=Draft invoice deleted
 CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_MODIFYInDolibarr=Contact %s modified
 CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Product %s created
 PRODUCT_MODIFYInDolibarr=Product %s modified
@@ -119,6 +121,7 @@ MRP_MO_UNVALIDATEInDolibarr=MO set to draft status
 MRP_MO_PRODUCEDInDolibarr=MO produced
 MRP_MO_DELETEInDolibarr=MO deleted
 MRP_MO_CANCELInDolibarr=MO canceled
+PAIDInDolibarr=%s paid
 ##### End agenda events #####
 AgendaModelModule=Document templates for event
 DateActionStart=Start date
@@ -130,7 +133,7 @@ AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to use
 AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
 AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic events.
 AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> to include events of holidays.
-AgendaShowBirthdayEvents=Show birthdays of contacts
+AgendaShowBirthdayEvents=Birthdays of contacts
 AgendaHideBirthdayEvents=Hide birthdays of contacts
 Busy=Busy
 ExportDataset_event1=List of agenda events
@@ -152,6 +155,7 @@ ActionType=Event type
 DateActionBegin=Start event date
 ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b>?
 RepeatEvent=Repeat event
+OnceOnly=Once only
 EveryWeek=Every week
 EveryMonth=Every month
 DayOfMonth=Day of month
@@ -165,4 +169,4 @@ TimeType=Duration type
 ReminderType=Callback type
 AddReminder=Create an automatic reminder notification for this event
 ErrorReminderActionCommCreation=Error creating the reminder notification for this event
-BrowserPush=Browser Notification
+BrowserPush=Browser Popup Notification
diff --git a/htdocs/langs/mn_MN/bills.lang b/htdocs/langs/mn_MN/bills.lang
index c55f483873b..7b8c997d2e6 100644
--- a/htdocs/langs/mn_MN/bills.lang
+++ b/htdocs/langs/mn_MN/bills.lang
@@ -259,6 +259,7 @@ DateMaxPayment=Payment due on
 DateInvoice=Invoice date
 DatePointOfTax=Point of tax
 NoInvoice=No invoice
+NoOpenInvoice=No open invoice
 ClassifyBill=Classify invoice
 SupplierBillsToPay=Unpaid vendor invoices
 CustomerBillsUnpaid=Unpaid customer invoices
@@ -589,3 +590,4 @@ FacParentLine=Invoice Line Parent
 SituationTotalRayToRest=Remainder to pay without taxe
 PDFSituationTitle=Situation n° %d
 SituationTotalProgress=Total progress %d %%
+SearchUnpaidInvoicesWithDueDate=Search unpaid invoices with a due date = %s
diff --git a/htdocs/langs/mn_MN/cashdesk.lang b/htdocs/langs/mn_MN/cashdesk.lang
index 240503842f3..aea1f02f834 100644
--- a/htdocs/langs/mn_MN/cashdesk.lang
+++ b/htdocs/langs/mn_MN/cashdesk.lang
@@ -102,7 +102,7 @@ CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal numb
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
 SaleStartedAt=Sale started at %s
-ControlCashOpening=Control cash popup at opening POS
+ControlCashOpening=Open the "Control cash" popup when opening the POS
 CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -126,5 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
-ShowPriceHT = Display the price excluding tax column
-ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
+ShowPriceHT = Display the column with the price excluding tax (on screen)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
diff --git a/htdocs/langs/mn_MN/compta.lang b/htdocs/langs/mn_MN/compta.lang
index 7cae82e6ac7..8329346c163 100644
--- a/htdocs/langs/mn_MN/compta.lang
+++ b/htdocs/langs/mn_MN/compta.lang
@@ -286,3 +286,9 @@ ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
 IncludeLoansInResults = Include loans in reports
+InvoiceLate30Days = Invoices late > 30 days
+InvoiceLate15Days = Invoices late > 15 days
+InvoiceLateMinus15Days = Invoices late
+InvoiceNotLate = To be collected < 15 days
+InvoiceNotLate15Days = To be collected in 15 days
+InvoiceNotLate30Days = To be collected in 30 days
diff --git a/htdocs/langs/mn_MN/cron.lang b/htdocs/langs/mn_MN/cron.lang
index 2ebdda1e685..4fd2220dea6 100644
--- a/htdocs/langs/mn_MN/cron.lang
+++ b/htdocs/langs/mn_MN/cron.lang
@@ -60,7 +60,7 @@ CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
 CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Disable
-CronTaskInactive=This job is disabled
+CronTaskInactive=This job is disabled (not scheduled)
 CronId=Id
 CronClassFile=Filename with class
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example 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>
diff --git a/htdocs/langs/mn_MN/errors.lang b/htdocs/langs/mn_MN/errors.lang
index 9b14b5ad1d2..670f8c7a6bc 100644
--- a/htdocs/langs/mn_MN/errors.lang
+++ b/htdocs/langs/mn_MN/errors.lang
@@ -11,6 +11,7 @@ ErrorBadValueForParamNotAString=Bad value for your parameter. It appends general
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s already exists.
 ErrorGroupAlreadyExists=Group %s already exists.
+ErrorEmailAlreadyExists=Email %s already exists.
 ErrorRecordNotFound=Record not found.
 ErrorFailToCopyFile=Failed to copy file '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
@@ -117,7 +118,7 @@ ErrorCantReadFile=Failed to read file '%s'
 ErrorCantReadDir=Failed to read directory '%s'
 ErrorBadLoginPassword=Bad value for login or password
 ErrorLoginDisabled=Your account has been disabled
-ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server. If PHP <b>Safe Mode</b> is enabled, check that command is inside a directory defined by parameter <b>safe_mode_exec_dir</b>.
+ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server user. Check also the command is not protected on shell level by a security layer like apparmor.
 ErrorFailedToChangePassword=Failed to change password
 ErrorLoginDoesNotExists=User with login <b>%s</b> could not be found.
 ErrorLoginHasNoEmail=This user has no email address. Process aborted.
@@ -262,6 +263,7 @@ ErrorDateIsInFuture=Error, the date can't be in the future
 ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
 ErrorAPercentIsRequired=Error, please fill in the percentage correctly
 ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
+ErrorFailedToFindEmailTemplate=Failed to find template with code name %s
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -298,3 +300,4 @@ WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So y
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
+ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
diff --git a/htdocs/langs/mn_MN/eventorganization.lang b/htdocs/langs/mn_MN/eventorganization.lang
index 75b798fbc3a..335c257b224 100644
--- a/htdocs/langs/mn_MN/eventorganization.lang
+++ b/htdocs/langs/mn_MN/eventorganization.lang
@@ -1,4 +1,5 @@
 # Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+# Copyright (C) 2021		Dorian Vabre			<dorian.vabre@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
@@ -81,7 +82,10 @@ PriceOfBoothHelp=Subscription price to stand a booth
 EventOrganizationICSLink=Link ICS for events
 ConferenceOrBoothInformation=Conference Or Booth informations
 Attendees = Attendees
+DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
 #
 # Status
 #
@@ -94,8 +98,46 @@ EvntOrgCancelled = Cancelled
 #
 # Public page
 #
+SuggestForm = Suggestion page
+RegisterPage = Page for conferences or booth
+EvntOrgRegistrationHelpMessage = Here, you can vote for an event, or suggest a new conference or booth for the project
+EvntOrgRegistrationConfHelpMessage = Here, you can suggest a new conference for the project
+EvntOrgRegistrationBoothHelpMessage = Here, you can suggest a new booth for the project
+ListOfSuggestedConferences = List of suggested conferences
+ListOfSuggestedBooths = List of suggested booths
+SuggestConference = Suggest a new conference
+SuggestBooth = Suggest a booth
+ViewAndVote = View and vote for suggested events
 PublicAttendeeSubscriptionPage = Public link of registration to a conference
 MissingOrBadSecureKey = The security key is invalid or missing
-EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
-EvntOrgStartDuration = This conference starts on
-EvntOrgEndDuration =  and ends on
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference : '%s'
+EvntOrgDuration = This conference starts on %s and ends on %s.
+ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
+BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
+EventType = Event type
+
+#
+# Vote page
+#
+EvntOrgRegistrationWelcomeMessage = Welcome on the conference or booth suggestion page.
+EvntOrgRegistrationConfWelcomeMessage = Welcome on the conference suggestion page.
+EvntOrgRegistrationBoothWelcomeMessage = Welcome on the booth suggestion page.
+EvntOrgVoteHelpMessage = Here, you can view and vote for the suggested events for the project
+VoteOk = Your vote has been accepted.
+AlreadyVoted = You have already voted for this event.
+VoteError = An error has occurred during the vote, please try again.
+
+#
+# SubscriptionOk page
+#
+SubscriptionOk = Your subscription to this conference has been validated
+#
+# Subscription validation mail
+#
+ConfAttendeeSubscriptionConfirmation = Confirmation of your subscription to a conference
+#
+# Payment page
+#
+Attendee = Attendee
+PaymentConferenceAttendee = Conference attendee payment
+PaymentBoothLocation = Booth location payment
diff --git a/htdocs/langs/mn_MN/hrm.lang b/htdocs/langs/mn_MN/hrm.lang
index 3b8f137e103..da098e10bdb 100644
--- a/htdocs/langs/mn_MN/hrm.lang
+++ b/htdocs/langs/mn_MN/hrm.lang
@@ -9,7 +9,7 @@ ConfirmDeleteEstablishment=Are you sure you wish to delete this establishment?
 OpenEtablishment=Open establishment
 CloseEtablishment=Close establishment
 # Dictionary
-DictionaryPublicHolidays=HRM - Public holidays
+DictionaryPublicHolidays=Leave - Public holidays
 DictionaryDepartment=HRM - Department list
 DictionaryFunction=HRM - Job positions
 # Module
diff --git a/htdocs/langs/mn_MN/knowledgemanagement.lang b/htdocs/langs/mn_MN/knowledgemanagement.lang
index 269007e60f8..68f5cced76c 100644
--- a/htdocs/langs/mn_MN/knowledgemanagement.lang
+++ b/htdocs/langs/mn_MN/knowledgemanagement.lang
@@ -47,7 +47,7 @@ KnowledgeManagementArea = Knowledge Management
 # Menu
 #
 MenuKnowledgeRecord = Knowledge base
-ListOfArticles = List of articles
+ListKnowledgeRecord = List of articles
 NewKnowledgeRecord = New article
 ValidateReply = Validate solution
 KnowledgeRecords = Articles
diff --git a/htdocs/langs/mn_MN/languages.lang b/htdocs/langs/mn_MN/languages.lang
index ba187326705..da8ad5376a1 100644
--- a/htdocs/langs/mn_MN/languages.lang
+++ b/htdocs/langs/mn_MN/languages.lang
@@ -3,6 +3,7 @@ Language_am_ET=Ethiopian
 Language_ar_AR=Arabic
 Language_ar_EG=Arabic (Egypt)
 Language_ar_SA=Arabic
+Language_ar_TN=Arabic (Tunisia)
 Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengali
 Language_bn_IN=Bengali (India)
@@ -84,6 +85,7 @@ Language_nl_NL=Dutch
 Language_pl_PL=Polish
 Language_pt_BR=Portuguese (Brazil)
 Language_pt_PT=Portuguese
+Language_ro_MD=Romanian (Moldavia)
 Language_ro_RO=Romanian
 Language_ru_RU=Russian
 Language_ru_UA=Russian (Ukraine)
diff --git a/htdocs/langs/mn_MN/main.lang b/htdocs/langs/mn_MN/main.lang
index 02d765a15e5..36a8139b765 100644
--- a/htdocs/langs/mn_MN/main.lang
+++ b/htdocs/langs/mn_MN/main.lang
@@ -430,6 +430,7 @@ LT1IN=CGST
 LT2IN=SGST
 LT1GC=Additionnal cents
 VATRate=Tax Rate
+RateOfTaxN=Rate of tax %s
 VATCode=Tax Rate code
 VATNPR=Tax Rate NPR
 DefaultTaxRate=Default tax rate
@@ -729,6 +730,7 @@ MenuMembers=Members
 MenuAgendaGoogle=Google agenda
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
+ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
 NoFileFound=No documents uploaded
 CurrentUserLanguage=Current language
 CurrentTheme=Current theme
@@ -1072,6 +1074,7 @@ ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
 ToClose=To close
+ToRefuse=To refuse
 ToProcess=To process
 ToApprove=To approve
 GlobalOpenedElemView=Global view
@@ -1126,9 +1129,11 @@ UpdateForAllLines=Update for all lines
 OnHold=On hold
 Civility=Civility
 AffectTag=Affect Tag
+CreateExternalUser=Create external user
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
 ConfirmCancel=Are you sure you want to cancel
+EmailMsgID=Email MsgID
diff --git a/htdocs/langs/mn_MN/members.lang b/htdocs/langs/mn_MN/members.lang
index 042b85598c0..d8b9c2f59f3 100644
--- a/htdocs/langs/mn_MN/members.lang
+++ b/htdocs/langs/mn_MN/members.lang
@@ -213,3 +213,5 @@ SendReminderForExpiredSubscription=Send reminder by email to members when subscr
 MembershipPaid=Membership paid for current period (until %s)
 YouMayFindYourInvoiceInThisEmail=You may find your invoice attached to this email
 XMembersClosed=%s member(s) closed
+XExternalUserCreated=%s external user(s) created
+ForceMemberNature=Force member nature (Individual or Corporation)
diff --git a/htdocs/langs/mn_MN/modulebuilder.lang b/htdocs/langs/mn_MN/modulebuilder.lang
index 9fdaa1a533a..23a098be2e5 100644
--- a/htdocs/langs/mn_MN/modulebuilder.lang
+++ b/htdocs/langs/mn_MN/modulebuilder.lang
@@ -143,3 +143,4 @@ AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
 ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
+ImportExportProfiles=Import and export profiles
diff --git a/htdocs/langs/mn_MN/mrp.lang b/htdocs/langs/mn_MN/mrp.lang
index ec999a473a4..2414a92cefb 100644
--- a/htdocs/langs/mn_MN/mrp.lang
+++ b/htdocs/langs/mn_MN/mrp.lang
@@ -8,12 +8,12 @@ MenuBOM=Bills of material
 LatestBOMModified=Latest %s Bills of materials modified
 LatestMOModified=Latest %s Manufacturing Orders modified
 Bom=Bills of Material
-BillOfMaterials=Bill of Material
+BillOfMaterials=Bill of Materials
 BOMsSetup=Setup of module BOM
 ListOfBOMs=List of bills of material - BOM
 ListOfManufacturingOrders=List of Manufacturing Orders
-NewBOM=New bill of material
-ProductBOMHelp=Product to create with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
+NewBOM=New bill of materials
+ProductBOMHelp=Product to create (or disassemble) with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
 BOMsNumberingModules=BOM numbering templates
 BOMsModelModule=BOM document templates
 MOsNumberingModules=MO numbering templates
@@ -22,7 +22,7 @@ FreeLegalTextOnBOMs=Free text on document of BOM
 WatermarkOnDraftBOMs=Watermark on draft BOM
 FreeLegalTextOnMOs=Free text on document of MO
 WatermarkOnDraftMOs=Watermark on draft MO
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials %s ?
 ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
 ManufacturingEfficiency=Manufacturing efficiency
 ConsumptionEfficiency=Consumption efficiency
@@ -30,8 +30,8 @@ ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the produc
 ValueOfMeansLossForProductProduced=Value of 0.95 means an average of 5%% of loss of produced product
 DeleteBillOfMaterials=Delete Bill Of Materials
 DeleteMo=Delete Manufacturing Order
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Materials?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Materials?
 MenuMRP=Manufacturing Orders
 NewMO=New Manufacturing Order
 QtyToProduce=Qty to produce
@@ -39,7 +39,7 @@ DateStartPlannedMo=Date start planned
 DateEndPlannedMo=Date end planned
 KeepEmptyForAsap=Empty means 'As Soon As Possible'
 EstimatedDuration=Estimated duration
-EstimatedDurationDesc=Estimated duration to manufacture this product using this BOM
+EstimatedDurationDesc=Estimated duration to manufacture (or disassemble) this product using this BOM
 ConfirmValidateBom=Are you sure you want to validate the BOM with the reference <strong>%s</strong> (you will be able to use it to build new Manufacturing Orders)
 ConfirmCloseBom=Are you sure you want to cancel this BOM (you won't be able to use it to build new Manufacturing Orders anymore) ?
 ConfirmReopenBom=Are you sure you want to re-open this BOM (you will be able to use it to build new Manufacturing Orders)
@@ -63,13 +63,14 @@ ConsumeAndProduceAll=Consume and Produce All
 Manufactured=Manufactured
 TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
 ForAQuantityOf=For a quantity to produce of %s
+ForAQuantityToConsumeOf=For a quantity to disassemble of %s
 ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
 ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
 ProductionForRef=Production of %s
 AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
 NoStockChangeOnServices=No stock change on services
 ProductQtyToConsumeByMO=Product quantity still to consume by open MO
-ProductQtyToProduceByMO=Product quentity still to produce by open MO
+ProductQtyToProduceByMO=Product quantity still to produce by open MO
 AddNewConsumeLines=Add new line to consume
 ProductsToConsume=Products to consume
 ProductsToProduce=Products to produce
@@ -83,15 +84,13 @@ Workstations=Workstations
 WorkstationsDescription=Workstations management
 WorkstationSetup = Workstations setup
 WorkstationSetupPage = Workstations setup page
-WorkstationAbout = About Workstation
-WorkstationAboutPage = Workstations about page
 WorkstationList=Workstation list
 WorkstationCreate=Add new workstation
 ConfirmEnableWorkstation=Are you sure you want to enable workstation <b>%s</b> ?
 EnableAWorkstation=Enable a workstation
 ConfirmDisableWorkstation=Are you sure you want to disable workstation <b>%s</b> ?
 DisableAWorkstation=Disable a workstation
-DeleteWorkstation=Supprimer
+DeleteWorkstation=Delete
 NbOperatorsRequired=Number of operators required
 THMOperatorEstimated=Estimated operator THM
 THMMachineEstimated=Estimated machine THM
diff --git a/htdocs/langs/mn_MN/orders.lang b/htdocs/langs/mn_MN/orders.lang
index 87d196eb22f..5dab5b99bf1 100644
--- a/htdocs/langs/mn_MN/orders.lang
+++ b/htdocs/langs/mn_MN/orders.lang
@@ -11,6 +11,7 @@ OrderDate=Order date
 OrderDateShort=Order date
 OrderToProcess=Order to process
 NewOrder=New order
+NewSupplierOrderShort=New order
 NewOrderSupplier=New Purchase Order
 ToOrder=Make order
 MakeOrder=Make order
@@ -73,6 +74,7 @@ DeleteOrder=Delete order
 CancelOrder=Cancel order
 OrderReopened= Order %s re-open
 AddOrder=Create order
+AddSupplierOrderShort=Create order
 AddPurchaseOrder=Create purchase order
 AddToDraftOrders=Add to draft order
 ShowOrder=Show order
diff --git a/htdocs/langs/mn_MN/other.lang b/htdocs/langs/mn_MN/other.lang
index 95297a98859..bb35099ab82 100644
--- a/htdocs/langs/mn_MN/other.lang
+++ b/htdocs/langs/mn_MN/other.lang
@@ -129,6 +129,7 @@ ClosedByLogin=User login who closed
 FileWasRemoved=File %s was removed
 DirWasRemoved=Directory %s was removed
 FeatureNotYetAvailable=Feature not yet available in the current version
+FeatureNotAvailableOnDevicesWithoutMouse=Feature not available on devices without mouse
 FeaturesSupported=Supported features
 Width=Width
 Height=Height
@@ -263,7 +264,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
-PrefixSession=Prefix for session ID
+SuffixSessionName=Suffix for session name
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/mn_MN/partnership.lang b/htdocs/langs/mn_MN/partnership.lang
index 09059995a8d..2fb10e8159e 100644
--- a/htdocs/langs/mn_MN/partnership.lang
+++ b/htdocs/langs/mn_MN/partnership.lang
@@ -16,41 +16,72 @@
 #
 # Generic
 #
-ModulePartnershipName = Partnership management
-PartnershipDescription = Module Partnership management
+ModulePartnershipName=Partnership management
+PartnershipDescription=Module Partnership management
 PartnershipDescriptionLong= Module Partnership management
 
+AddPartnership=Add partnership
+CancelPartnershipForExpiredMembers=Partnership: Cancel partnership of members with expired subscriptions
+PartnershipCheckBacklink=Partnership: Check referring backlink
+
 #
 # Menu
 #
-NewPartnership = New Partnership
-ListOfPartnerships = List of partnership
+NewPartnership=New Partnership
+ListOfPartnerships=List of partnership
 
 #
 # Admin page
 #
-PartnershipSetup = Partnership setup
-PartnershipAbout = About Partnership
-PartnershipAboutPage = Partnership about page
-
+PartnershipSetup=Partnership setup
+PartnershipAbout=About Partnership
+PartnershipAboutPage=Partnership about page
+partnershipforthirdpartyormember=Partner status must be set on a 'thirdparty' or a 'member'
+PARTNERSHIP_IS_MANAGED_FOR=Partnership managed for
+PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks to check
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb of days before cancelling status of a partnership when a subscription has expired
+ReferingWebsiteCheck=Check of website referring
+ReferingWebsiteCheckDesc=You can enable a feature to check that your partners has added a backlink to your website domains on their own website.
 
 #
 # Object
 #
+DeletePartnership=Delete a partnership
+PartnershipDedicatedToThisThirdParty=Partnership dedicated to this third party
+PartnershipDedicatedToThisMember=Partnership dedicated to this member
 DatePartnershipStart=Start date
 DatePartnershipEnd=End date
+ReasonDecline=Decline reason
+ReasonDeclineOrCancel=Decline reason
+PartnershipAlreadyExist=Partnership already exist
+ManagePartnership=Manage partnership
+BacklinkNotFoundOnPartnerWebsite=Backlink not found on partner website
+ConfirmClosePartnershipAsk=Are you sure you want to cancel this partnership?
+PartnershipType=Partnership type
 
 #
 # Template Mail
 #
+SendingEmailOnPartnershipWillSoonBeCanceled=Partnership will soon be canceled
+SendingEmailOnPartnershipRefused=Partnership refused
+SendingEmailOnPartnershipAccepted=Partnership accepted
+SendingEmailOnPartnershipCanceled=Partnership canceled
 
+YourPartnershipWillSoonBeCanceledTopic=Partnership will soon be canceled
+YourPartnershipRefusedTopic=Partnership refused
+YourPartnershipAcceptedTopic=Partnership accepted
+YourPartnershipCanceledTopic=Partnership canceled
+
+YourPartnershipWillSoonBeCanceledContent=We inform you that your partnership will soon be canceled (Backlink not found)
+YourPartnershipRefusedContent=We inform you that your partnership request has been refused.
+YourPartnershipAcceptedContent=We inform you that your partnership request has been accepted.
+YourPartnershipCanceledContent=We inform you that your partnership has been canceled.
 
 #
 # Status
 #
-PartnershipDraft = Draft
-PartnershipAccepted = Accepted
-PartnershipRefused = Refused
-PartnershipCanceled = Canceled
-
+PartnershipDraft=Draft
+PartnershipAccepted=Accepted
+PartnershipRefused=Refused
+PartnershipCanceled=Canceled
 PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/mn_MN/productbatch.lang b/htdocs/langs/mn_MN/productbatch.lang
index ad2db658e2e..450d0285819 100644
--- a/htdocs/langs/mn_MN/productbatch.lang
+++ b/htdocs/langs/mn_MN/productbatch.lang
@@ -1,4 +1,4 @@
-# ProductBATCH language file - en_US - ProductBATCH
+# ProductBATCH language file - Source file is en_US - ProductBATCH
 ManageLotSerial=Use lot/serial number
 ProductStatusOnBatch=Yes (lot required)
 ProductStatusOnSerial=Yes (unique serial number required)
@@ -33,3 +33,13 @@ CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+LifeTime=Life span (in days)
+EndOfLife=End of life
+ManufacturingDate=Manufacturing date
+DestructionDate=Destruction date
+FirstUseDate=First use date
+QCFrequency=Quality control frequency (in days)
+
+#Traceability - qc status
+OutOfOrder=Out of order
+InWorkingOrder=In working order
diff --git a/htdocs/langs/mn_MN/products.lang b/htdocs/langs/mn_MN/products.lang
index 0875be0dc07..9638dfe5a25 100644
--- a/htdocs/langs/mn_MN/products.lang
+++ b/htdocs/langs/mn_MN/products.lang
@@ -396,3 +396,5 @@ ActionAvailableOnVariantProductOnly=Action only available on the variant of prod
 ProductsPricePerCustomer=Product prices per customers
 ProductSupplierExtraFields=Additional Attributes (Supplier Prices)
 DeleteLinkedProduct=Delete the child product linked to the combination
+PMPValue=Weighted average price
+PMPValueShort=WAP
diff --git a/htdocs/langs/mn_MN/projects.lang b/htdocs/langs/mn_MN/projects.lang
index 79c974f6e24..6c96fadb5c1 100644
--- a/htdocs/langs/mn_MN/projects.lang
+++ b/htdocs/langs/mn_MN/projects.lang
@@ -267,9 +267,11 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=New invoice
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+OneLinePerTimeSpentLine=One line for each time spent declaration
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
 AddPersonToTask=Add also to tasks
 UsageOrganizeEvent=Usage: Event Organization
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
+SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
diff --git a/htdocs/langs/mn_MN/receptions.lang b/htdocs/langs/mn_MN/receptions.lang
index 760ff884fa0..338602e722e 100644
--- a/htdocs/langs/mn_MN/receptions.lang
+++ b/htdocs/langs/mn_MN/receptions.lang
@@ -44,4 +44,4 @@ ValidateOrderFirstBeforeReception=You must first validate the order before being
 ReceptionsNumberingModules=Numbering module for receptions
 ReceptionsReceiptModel=Document templates for receptions
 NoMorePredefinedProductToDispatch=No more predefined products to dispatch
-
+ReceptionExist=A reception exists
diff --git a/htdocs/langs/mn_MN/stocks.lang b/htdocs/langs/mn_MN/stocks.lang
index 9ec523427b1..d39791932a3 100644
--- a/htdocs/langs/mn_MN/stocks.lang
+++ b/htdocs/langs/mn_MN/stocks.lang
@@ -56,8 +56,6 @@ UnitPurchaseValue=Unit purchase price
 StockTooLow=Stock too low
 StockLowerThanLimit=Stock lower than alert limit (%s)
 EnhancedValue=Value
-PMPValue=Weighted average price
-PMPValueShort=WAP
 EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
@@ -251,7 +249,10 @@ SelectAStockMovementFileToImport=select a stock movement file to import
 InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
 LabelOfInventoryMovemement=Inventory %s
 ReOpen=Reopen
-ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock to the real qty you entered into the inventory.
 ObjectNotFound=%s not found
 MakeMovementsAndClose=Generate movements and close
 AutofillWithExpected=Fill real quantity with expected quantity
+ShowAllBatchByDefault=By default, show batch details on product "stock" tab
+CollapseBatchDetailHelp=You can set batch detail default display in stocks module configuration
+FieldCannotBeNegative=Field "%s" cannot be negative
diff --git a/htdocs/langs/mn_MN/ticket.lang b/htdocs/langs/mn_MN/ticket.lang
index df73daf4a0d..1da32a5a99e 100644
--- a/htdocs/langs/mn_MN/ticket.lang
+++ b/htdocs/langs/mn_MN/ticket.lang
@@ -304,7 +304,7 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
-BoxTicketType=Number of open tickets by type
+BoxTicketType=Distribution of open tickets by type
 BoxTicketSeverity=Number of open tickets by severity
 BoxNoTicketSeverity=No tickets opened
 BoxTicketLastXDays=Number of new tickets by days the last %s days
diff --git a/htdocs/langs/nb_NO/accountancy.lang b/htdocs/langs/nb_NO/accountancy.lang
index 59889975fdb..5e379472828 100644
--- a/htdocs/langs/nb_NO/accountancy.lang
+++ b/htdocs/langs/nb_NO/accountancy.lang
@@ -158,7 +158,7 @@ ACCOUNTING_LENGTH_AACCOUNT=Lengden på tredjeparts regnskapskontoer (Hvis du ang
 ACCOUNTING_MANAGE_ZERO=Tillat å administrere forskjellig antall nuller på slutten av en regnskapskonto. Nødvendig for enkelte land (som Sveits). Hvis du holder den av (standard), kan du angi de 2 følgende parametrene for å be om å legge til virtuell null.
 BANK_DISABLE_DIRECT_INPUT=Deaktiver direkteregistrering av transaksjoner på bankkonto
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Aktiver eksportutkast i journal
-ACCOUNTANCY_COMBO_FOR_AUX=Aktiver kombinasjonsliste for datterkonto (kan være treg hvis du har mange tredjeparter)
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties, break ability to search on a part of value)
 ACCOUNTING_DATE_START_BINDING=Definer en dato for å starte binding og overføring i regnskap. Etter denne datoen vil ikke transaksjonene bli overført til regnskap.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Velg regnskapsvisning som standard ved overføring av regnskap
 
@@ -209,7 +209,7 @@ Codejournal=Journal
 JournalLabel=Journaletikett
 NumPiece=Del nummer
 TransactionNumShort=Transaksjonsnummer
-AccountingCategory=Custom group
+AccountingCategory=Egendefinert gruppe
 GroupByAccountAccounting=Gruppere etter hovedbokskonto
 GroupBySubAccountAccounting=Gruppere etter sub-hovedbokskonto
 AccountingAccountGroupsDesc=Her kan du definere noen grupper regnskapskonti. De vil bli brukt til personlige regnskapsrapporter.
@@ -297,7 +297,7 @@ NoNewRecordSaved=Ingen flere poster å journalisere
 ListOfProductsWithoutAccountingAccount=Liste over varer som ikke bundet til en regnskapskonto
 ChangeBinding=Endre bindingen
 Accounted=Regnskapsført i hovedbok
-NotYetAccounted=Not yet accounted in the ledger
+NotYetAccounted=Foreløpig ikke regnskapsført i hovedboken
 ShowTutorial=Vis veiledning
 NotReconciled=Ikke sammenslått
 WarningRecordWithoutSubledgerAreExcluded=Advarsel, alle operasjoner uten definert sub-hovedbokskonto er filtrert og ekskludert fra denne visningen
@@ -328,6 +328,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Deaktiver binding og overføring til reg
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Deaktiver binding og overføring til regnskap på utgiftsrapporter (utgiftsrapporter blir ikke tatt med i regnskapet)
 
 ## Export
+NotifiedExportDate=Notified export date (modification of the entries will not be possible)
+NotifiedValidationDate=Validation of the entries (modification or deletion of the entries will not be possible)
+ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=Eksporter utkastjournal
 Modelcsv=Eksportmodell
 Selectmodelcsv=Velg eksportmodell
@@ -405,10 +408,10 @@ ImportAccountingEntries=Regnskapsposter
 ImportAccountingEntriesFECFormat=Regnskapsoppføringer - FEC-format
 FECFormatJournalCode=Kodejournal (JournalCode)
 FECFormatJournalLabel=Etikettjournal (JournalLib)
-FECFormatEntryNum=Piece number (EcritureNum)
-FECFormatEntryDate=Piece date (EcritureDate)
+FECFormatEntryNum=Delenummer (EcritureNum)
+FECFormatEntryDate=Del dato (EcritureDate)
 FECFormatGeneralAccountNumber=Generelt kontonummer (CompteNum)
-FECFormatGeneralAccountLabel=General account label (CompteLib)
+FECFormatGeneralAccountLabel=Generell kontoetikett (CompteLib)
 FECFormatSubledgerAccountNumber=Subledger account number (CompAuxNum)
 FECFormatSubledgerAccountLabel=Subledger account number (CompAuxLib)
 FECFormatPieceRef=Piece ref (PieceRef)
diff --git a/htdocs/langs/nb_NO/admin.lang b/htdocs/langs/nb_NO/admin.lang
index 1e2103f89f8..e8e50b9211d 100644
--- a/htdocs/langs/nb_NO/admin.lang
+++ b/htdocs/langs/nb_NO/admin.lang
@@ -221,8 +221,8 @@ NotCompatible=Denne modulenser ikke ut til å være kompatibel med Dolibarr %s (
 CompatibleAfterUpdate=Denne modulen krever en oppdatering av Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=Se på Markedsplass
 SeeSetupOfModule=Se oppsett av modul %s
+SetOptionTo=Set option <b>%s</b> to %s
 Updated=Oppdatert
-Nouveauté=Nyhet
 AchatTelechargement=Kjøp/Last ned
 GoModuleSetupArea=For å distribuere/installere en ny modul, gå til området for Moduloppsett på <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, den offisielle markedsplassen for eksterne moduler til Dolibarr ERP/CRM 
@@ -399,6 +399,7 @@ SecurityToken=Nøkkel til sikre nettadresser
 NoSmsEngine=Ingen SMS avsender tilgjengelig. SMS-håndterer er ikke installert med standardinstallasjon (fordi de er avhengig av en ekstern leverandør), men du kan finne noen på %s
 PDF=PDF
 PDFDesc=Globale alternativer for generering av PDF
+PDFOtherDesc=PDF Option specific to some modules
 PDFAddressForging=Regler for adresseseksjonen
 HideAnyVATInformationOnPDF=Skjul all informasjon relatert til skatt/MVA på generert PDF
 PDFRulesForSalesTax=Regler for salgsskatt/mva
@@ -561,7 +562,7 @@ Module53Desc=Administrasjon av tjenester
 Module54Name=Kontrakter/abonnement
 Module54Desc=Forvaltning av kontrakter (tjenester eller tilbakevendende abonnementer)
 Module55Name=Strekkoder
-Module55Desc=Behandling av strekkoder
+Module55Desc=Barcode or QR code management
 Module56Name=Betaling med kredittoverføring
 Module56Desc=Håndtering av betaling til leverandører ved Credit Transfer-ordrer. Den inkluderer generering av SEPA-filer for europeiske land.
 Module57Name=Betalinger med dirketedebet
@@ -848,10 +849,10 @@ Permission402=Opprett/endre rabatter
 Permission403=Valider rabatter
 Permission404=Slett rabatter
 Permission430=Bruk Debug Bar
-Permission511=Les lønnsutbetalinger (dine og underordnedes)
-Permission512=Opprett/endre betaling av lønn
-Permission514=Slett utbetalinger av lønn
-Permission517=Les alles lønnsutbetalinger
+Permission511=Read salaries and payments (yours and subordinates)
+Permission512=Create/modify salaries and payments
+Permission514=Delete salaries and payments
+Permission517=Read salaries and payments everybody
 Permission519=Eksporter lønn
 Permission520=Les lån
 Permission522=Opprett/endre lån
@@ -965,6 +966,8 @@ Permission23003=Slett planlagt oppgave
 Permission23004=Utfør planlagt oppgave
 Permission50101=Bruk salgssted (SimplePOS)
 Permission50151=Bruk salgssted (TakePOS)
+Permission50152=Edit sales lines
+Permission50153=Edit ordered sales lines
 Permission50201=Les transaksjoner
 Permission50202=Importer transaksjoner
 Permission50330=Les Zapier-objekter
@@ -1039,11 +1042,12 @@ DictionaryMeasuringUnits=Måleenheter
 DictionarySocialNetworks=Sosiale nettverk
 DictionaryProspectStatus=Prospektstatus for selskaper
 DictionaryProspectContactStatus=Prospektstatus for kontakter
-DictionaryHolidayTypes=Typer permisjon
+DictionaryHolidayTypes=Leave - Types of leave
 DictionaryOpportunityStatus=Lead status for prosjekt/lead
 DictionaryExpenseTaxCat=Utgiftsrapport - Transportkategorier
 DictionaryExpenseTaxRange=Utgiftsrapport - Rangert etter transportkategori
 DictionaryTransportMode=Intracomm rapport - Transportmodus
+DictionaryBatchStatus=Product lot/serial Quality Control status
 TypeOfUnit=Type enhet
 SetupSaved=Innstillinger lagret
 SetupNotSaved=Oppsettet er ikke lagret
@@ -1187,7 +1191,7 @@ SetupDescription4=<a href="%s">%s -> %s</a><br><br> Denne programvaren er en ser
 SetupDescription5=Annet oppsett menyoppføringer styrer valgfrie parametere.
 AuditedSecurityEvents=Sikkerhetshendelser som blir revidert
 NoSecurityEventsAreAduited=Ingen sikkerhetshendelser blir revidert. Du kan aktivere dem fra meny %s
-Audit=Revisjon
+Audit=Security events
 InfoDolibarr=Om Dolibarr
 InfoBrowser=Om nettleser
 InfoOS=Om OS
@@ -1319,9 +1323,12 @@ ConditionIsCurrently=Tilstand er for øyeblikket %s
 YouUseBestDriver=Du bruker driver %s som er den beste driveren som er tilgjengelig for øyeblikket.
 YouDoNotUseBestDriver=Du bruker driveren %s. Driver %s anbefales.
 NbOfObjectIsLowerThanNoPb=Du har bare %s %s i databasen. Dette krever ingen spesiell optimalisering.
+ComboListOptim=Combo list loading optimization
 SearchOptim=Forbedre søket
-YouHaveXObjectUseSearchOptim=Du har %s %s i databasen. Du kan legge til konstanten %s til 1 i Hjem-Oppsett-Annet. Begrens søket til begynnelsen av strenger, slik at det blir lettere for databasen å bruke indekser, og du  får raskere svar.
-YouHaveXObjectAndSearchOptimOn=Du har %s %s i databasen og konstant %s er satt til 1 i Hjem-Oppsett-Annet.
+YouHaveXObjectUseComboOptim=You have %s %s in the database. You can go into setup of module to enable loading of combo list on key pressed event.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other.
+YouHaveXObjectUseSearchOptimDesc=This limits the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to %s in Home-Setup-Other.
 BrowserIsOK=Du bruker nettleseren %s. Denne nettleseren er ok for sikkerhet og ytelse.
 BrowserIsKO=Du bruker nettleseren %s. Denne nettleseren er kjent for å være et dårlig valg for sikkerhet, ytelse og pålitelighet. Vi anbefaler deg å bruke Firefox, Chrome, Opera eller Safari.
 PHPModuleLoaded=PHP-komponent %s lastet
@@ -1433,6 +1440,7 @@ MemberMainOptions=Hovedinnstillinger
 AdherentLoginRequired= Opprett innlogging for hvert medlem
 AdherentMailRequired=E-post kreves for å lage et nytt medlem
 MemberSendInformationByMailByDefault=Valg for å sende e-postbekreftelse til medlemmer (validering eller nytt abonnement) er krysset av som standard
+MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
 VisitorCanChooseItsPaymentMode=Besøkende kan velge blant tilgjengelige betalingsmåter
 MEMBER_REMINDER_EMAIL=Aktiver automatisk påminnelse <b> via e-post </b> av utløpte abonnementer. Merk: Modul <strong> %s </strong> må være aktivert og riktig oppsatt for å sende påminnelser.
 MembersDocModules=Dokumentmaler for dokumenter generert fra medlemsregister
@@ -1763,7 +1771,7 @@ AGENDA_DEFAULT_VIEW=Hvilken visning vil du åpne som standard når du velger men
 AGENDA_REMINDER_BROWSER=Aktiver påminnelse om hendelse <b> i brukerens nettleser </b> (Når påminnelsesdato er nådd, vises en popup i nettleseren. Hver bruker kan deaktivere slike varsler i nettleseren).
 AGENDA_REMINDER_BROWSER_SOUND=Aktiver lydvarsler
 AGENDA_REMINDER_EMAIL=Aktiver påminnelse om hendelse <b> via epost </b> (påminnelsesalternativ/forsinkelse kan defineres for hver hendelse).
-AGENDA_REMINDER_EMAIL_NOTE=Merk: Frekvensen av oppgaven %s må være nok til å være sikker på at påminnelsen sendes i riktig øyeblikk.
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the scheduled job %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Vis koblet objekt i agendavisning
 ##### Clicktodial #####
 ClickToDialSetup='Click To Dial' modul
@@ -1979,6 +1987,8 @@ MAIN_PDF_MARGIN_RIGHT=Høyremarg på PDF
 MAIN_PDF_MARGIN_TOP=Toppmarg på PDF
 MAIN_PDF_MARGIN_BOTTOM=Bunnmarg på PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Høyde for logo på PDF
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add picture on proposal line
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add electronic sign in PDF
 NothingToSetup=Det er ikke noe spesifikt oppsett som kreves for denne modulen.
 SetToYesIfGroupIsComputationOfOtherGroups=Sett til ja hvis denne gruppen er en beregning av andre grupper
 EnterCalculationRuleIfPreviousFieldIsYes=Angi beregningsregelen hvis forrige felt ble satt til Ja. <br> For eksempel: <br> CODEGRP1+CODEGRP2
@@ -2096,7 +2106,6 @@ PDF_SHOW_PROJECT=Show project on document
 ShowProjectLabel=Prosjektetikett
 PDF_USE_ALSO_LANGUAGE_CODE=Hvis du vil at tekst i PDF-en din skal dupliseres på 2 forskjellige språk i samme genererte PDF, må du angi dette andre språket, slik at generert PDF vil inneholde 2 forskjellige språk på samme side, det som er valgt når du genererer PDF og dette ( bare få PDF-maler støtter dette). Hold tom for ett språk per PDF.
 FafaIconSocialNetworksDesc=Skriv inn koden til et FontAwesome-ikon. Hvis du ikke vet hva som er FontAwesome, kan du bruke den generelle verdien fa-adresseboken.
-FeatureNotAvailableWithReceptionModule=Funksjonen er ikke tilgjengelig når modulen Mottak er aktivert
 RssNote=Merk: Hver definisjon av RSS-feed gir en widget som du må aktivere for å ha den tilgjengelig i dashbordet
 JumpToBoxes=Gå til Setup -> Widgets
 MeasuringUnitTypeDesc=Bruk en verdi som "størrelse", "overflate", "volum", "vekt", "tid"
@@ -2120,12 +2129,18 @@ ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by
 MailToSendEventOrganization=Hendelse organisasjon
 AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
 YouShouldDisablePHPFunctions=Du bør deaktivere PHP-funksjoner
-IfCLINotRequiredYouShouldDisablePHPFunctions=Bortsett fra hvis du trenger å kjøre systemkommandoer (for modulen Planlagt jobb, eller for å kjøre den eksterne kommandolinjen Anti-virus for eksempel), må du deaktivere PHP-funksjoner
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands in custom code, you shoud disable PHP functions
+PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=Ingen skrivbare filer eller kataloger for de vanlige programmene ble funnet i rotkatalogen din (Bra)
 RecommendedValueIs=Anbefalt: %s
+NotRecommended=Not recommanded
 ARestrictedPath=En begrenset sti
 CheckForModuleUpdate=Se etter oppdateringer for eksterne moduler
 CheckForModuleUpdateHelp=Denne handlingen kobles til editorer for eksterne moduler for å sjekke om en ny versjon er tilgjengelig.
 ModuleUpdateAvailable=En oppdatering er tilgjengelig
 NoExternalModuleWithUpdate=Ingen oppdateringer funnet for eksterne moduler
 SwaggerDescriptionFile=Swagger API-beskrivelsesfil (for bruk med f.eks redoc)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
+RandomlySelectedIfSeveral=Randomly selected if several pictures are available
+DatabasePasswordObfuscated=Database password is obfuscated in conf file
+DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
diff --git a/htdocs/langs/nb_NO/agenda.lang b/htdocs/langs/nb_NO/agenda.lang
index 6cbce1b00b5..2e14b10d8ae 100644
--- a/htdocs/langs/nb_NO/agenda.lang
+++ b/htdocs/langs/nb_NO/agenda.lang
@@ -4,7 +4,7 @@ Actions=Handlinger
 Agenda=Agenda
 TMenuAgenda=Agenda
 Agendas=Agendaer
-LocalAgenda=Intern kalender
+LocalAgenda=Standard kalender
 ActionsOwnedBy=Hendelse tilhører
 ActionsOwnedByShort=Eier
 AffectedTo=Tildelt
@@ -20,7 +20,7 @@ MenuToDoActions=Alle åpne handlinger
 MenuDoneActions=Alle avsluttede handlinger
 MenuToDoMyActions=Mine åpne handlinger
 MenuDoneMyActions=Mine avsluttede handlinger
-ListOfEvents=Hendelsesliste (intern kalender)
+ListOfEvents=Liste over hendelser (standardkalender)
 ActionsAskedBy=Handlinger registrert av
 ActionsToDoBy=Handlinger tildelt
 ActionsDoneBy=Handlinger utført av
@@ -38,6 +38,7 @@ ActionsEvents=Handlinger som Dolibarr automatisk registrerer i agendaen
 EventRemindersByEmailNotEnabled=Hendelsespåminnelser via e-post ble ikke aktivert i %s moduloppsett.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Tredjepart %s opprettet
+COMPANY_MODIFYInDolibarr=Third party %s modified
 COMPANY_DELETEInDolibarr=Tredjepart %s slettet
 ContractValidatedInDolibarr=Kontrakt %s validert
 CONTRACT_DELETEInDolibarr=Kontrakt %s slettet
@@ -87,6 +88,7 @@ OrderDeleted=Ordre slettet
 InvoiceDeleted=Faktura slettet
 DraftInvoiceDeleted=Fakturautkast slettet
 CONTACT_CREATEInDolibarr=Kontakt %s opprettet
+CONTACT_MODIFYInDolibarr=Contact %s modified
 CONTACT_DELETEInDolibarr=Kontakt %s slettet
 PRODUCT_CREATEInDolibarr=Vare%s opprettet
 PRODUCT_MODIFYInDolibarr=Vare %s endret
@@ -119,6 +121,7 @@ MRP_MO_UNVALIDATEInDolibarr=MO satt til status Utkast
 MRP_MO_PRODUCEDInDolibarr=MO produsert
 MRP_MO_DELETEInDolibarr=MO slettet
 MRP_MO_CANCELInDolibarr=MO kansellert
+PAIDInDolibarr=%s betalt
 ##### End agenda events #####
 AgendaModelModule=Dokumentmaler for hendelse
 DateActionStart=Startdato
@@ -130,7 +133,7 @@ AgendaUrlOptions4=<b>logint=%s</b> for å begrense utdata til handlinger som er
 AgendaUrlOptionsProject=<b>project=__ PROJECT_ID__</b> for å begrense resultat til handlinger knyttet til prosjektet <b>__PROJECT_ID__</b>.
 AgendaUrlOptionsNotAutoEvent=<b> notactiontype=systemauto </b> for å ekskludere automatiske hendelser.
 AgendaUrlOptionsIncludeHolidays= <b> includeholidays=1 </b> for å inkludere hendelser i ferie.
-AgendaShowBirthdayEvents=Vis kontakters fødselsdager
+AgendaShowBirthdayEvents=Kontakters fødselsdag
 AgendaHideBirthdayEvents=Skjul kontakters fødselsdager
 Busy=Opptatt
 ExportDataset_event1=Liste over hendelser i agendaen
diff --git a/htdocs/langs/nb_NO/bills.lang b/htdocs/langs/nb_NO/bills.lang
index 4d412179aa1..96887fb1ac7 100644
--- a/htdocs/langs/nb_NO/bills.lang
+++ b/htdocs/langs/nb_NO/bills.lang
@@ -259,6 +259,7 @@ DateMaxPayment=Betaling forfaller
 DateInvoice=Fakturadato
 DatePointOfTax=Skattepunkt
 NoInvoice=Ingen faktura
+NoOpenInvoice=No open invoice
 ClassifyBill=Klassifiser faktura
 SupplierBillsToPay=Ubetalte leverandørfakturaer
 CustomerBillsUnpaid=Ubetalte kundefakturaer
@@ -589,3 +590,4 @@ FacParentLine=Faktura forelderlinje
 SituationTotalRayToRest=Rest å betale eks. mva
 PDFSituationTitle=Delfaktura nr. %d
 SituationTotalProgress=Total progresjon%d %%
+SearchUnpaidInvoicesWithDueDate=Search unpaid invoices with a due date = %s
diff --git a/htdocs/langs/nb_NO/cashdesk.lang b/htdocs/langs/nb_NO/cashdesk.lang
index ec22d834076..1abc49531f6 100644
--- a/htdocs/langs/nb_NO/cashdesk.lang
+++ b/htdocs/langs/nb_NO/cashdesk.lang
@@ -102,7 +102,7 @@ CashDeskGenericMaskCodes6 = <br><b>{TN}</b>-tag brukes til å legge til terminal
 TakeposGroupSameProduct=Grupper samme produktlinjer
 StartAParallelSale=Start et nytt parallellsalg
 SaleStartedAt=Salget startet %s
-ControlCashOpening=Kassekontroll popup når du åpner POS
+ControlCashOpening=Open the "Control cash" popup when opening the POS
 CloseCashFence=Lukk kassekontroll
 CashReport=Kontantrapport
 MainPrinterToUse=Hovedskriver som skal brukes
@@ -126,5 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Modulen Kvitteringsskriver må ha blitt aktive
 AllowDelayedPayment=Tillat forsinket betaling
 PrintPaymentMethodOnReceipts=Skriv ut betalingsmåte på billetter/kvitteringer
 WeighingScale=Vektskala
-ShowPriceHT = Vis prisen uten avgiftskolonne
-ShowPriceHTOnReceipt = Vis prisen uten avgiftskolonne på kvittering
+ShowPriceHT = Display the column with the price excluding tax (on screen)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
diff --git a/htdocs/langs/nb_NO/commercial.lang b/htdocs/langs/nb_NO/commercial.lang
index 724731d6cca..9914a8c11a4 100644
--- a/htdocs/langs/nb_NO/commercial.lang
+++ b/htdocs/langs/nb_NO/commercial.lang
@@ -64,10 +64,11 @@ ActionAC_SHIP=Send levering i posten
 ActionAC_SUP_ORD=Send bestillingsordre via epost
 ActionAC_SUP_INV=Send leverandørfaktura via epost
 ActionAC_OTH=Andre
-ActionAC_OTH_AUTO=Automatisk satte hendelser
+ActionAC_OTH_AUTO=Annet auto
 ActionAC_MANUAL=Manuelt satte hendelser
 ActionAC_AUTO=Automatisk satte hendelser
-ActionAC_OTH_AUTOShort=Auto
+ActionAC_OTH_AUTOShort=Annet
+ActionAC_EVENTORGANIZATION=Arrangementorganisering
 Stats=Salgsstatistikk
 StatusProsp=Prospect status
 DraftPropals=Utkast kommersielle tilbud
diff --git a/htdocs/langs/nb_NO/compta.lang b/htdocs/langs/nb_NO/compta.lang
index 378bd42cc51..c873f1f4663 100644
--- a/htdocs/langs/nb_NO/compta.lang
+++ b/htdocs/langs/nb_NO/compta.lang
@@ -286,3 +286,9 @@ ReportPurchaseTurnover=Kjøpsomsetning fakturert
 ReportPurchaseTurnoverCollected=Kjøpsomsetning mottatt
 IncludeVarpaysInResults = Inkluder forskjellige betalinger i rapportene
 IncludeLoansInResults = Inkluder lån i rapporter
+InvoiceLate30Days = Invoices late > 30 days
+InvoiceLate15Days = Invoices late > 15 days
+InvoiceLateMinus15Days = Invoices late
+InvoiceNotLate = To be collected < 15 days
+InvoiceNotLate15Days = To be collected in 15 days
+InvoiceNotLate30Days = To be collected in 30 days
diff --git a/htdocs/langs/nb_NO/cron.lang b/htdocs/langs/nb_NO/cron.lang
index 74ea3057151..ed4116f8a74 100644
--- a/htdocs/langs/nb_NO/cron.lang
+++ b/htdocs/langs/nb_NO/cron.lang
@@ -60,7 +60,7 @@ CronErrEndDateStartDt=Sluttdato kan ikke være før startdato
 StatusAtInstall=Status for modulinstallasjon
 CronStatusActiveBtn=Tidsplan
 CronStatusInactiveBtn=Deaktiver
-CronTaskInactive=Denne jobben er deaktivert
+CronTaskInactive=Denne jobben er deaktivert (ikke planlagt)
 CronId=ID
 CronClassFile=Filnavn med klasse
 CronModuleHelp=Navn på Dolibarr-modulkatalog (også arbeid med ekstern Dolibarr-modul). <BR> For eksempel å kalle hentmetoden for Dolibarr Produkt objektet /htdocs/<u>product</u>/class/product.class.php, er verdien for modulen <br><i> produkt </i>
diff --git a/htdocs/langs/nb_NO/donations.lang b/htdocs/langs/nb_NO/donations.lang
index fbab0db6074..1e64e285b35 100644
--- a/htdocs/langs/nb_NO/donations.lang
+++ b/htdocs/langs/nb_NO/donations.lang
@@ -7,7 +7,6 @@ AddDonation=Opprett donasjon
 NewDonation=Ny donasjon
 DeleteADonation=Slett en donasjon
 ConfirmDeleteADonation=Er du sikker på at du vil slette denne donasjonen?
-ShowDonation=Vis Donasjon
 PublicDonation=Offentlig donasjon
 DonationsArea=Donasjonsområde
 DonationStatusPromiseNotValidated=Donasjons-kladd
@@ -33,3 +32,4 @@ DONATION_ART238=Vis artikkel 238 fra CGI hvis du er bekymret
 DONATION_ART885=Vis artikkel 885 fra CGI hvis du er bekymret
 DonationPayment=Donasjonsbetaling
 DonationValidated=Donasjon %s validert
+DonationUseThirdparties=Bruk en eksisterende tredjepart som koordinator for givere
diff --git a/htdocs/langs/nb_NO/errors.lang b/htdocs/langs/nb_NO/errors.lang
index 5127205840e..6e4e212865c 100644
--- a/htdocs/langs/nb_NO/errors.lang
+++ b/htdocs/langs/nb_NO/errors.lang
@@ -11,6 +11,7 @@ ErrorBadValueForParamNotAString=Feil parameterverdi. Dette skjer vanligvis når
 ErrorRefAlreadyExists=Referanse <b> %s </b> eksisterer allerede.
 ErrorLoginAlreadyExists=brukernavnet %s eksisterer allerede.
 ErrorGroupAlreadyExists=Gruppen %s eksisterer allerede.
+ErrorEmailAlreadyExists=Email %s already exists.
 ErrorRecordNotFound=Posten ble ikke funnet.
 ErrorFailToCopyFile=Klarte ikke å kopiere filen '<b>«%s</b>' til '<b>%s</b>'.
 ErrorFailToCopyDir=Klarte ikke å kopiere katalogen '<b>%s</b>' til '<b>%s</b>'.
@@ -117,7 +118,7 @@ ErrorCantReadFile=Kunne ikke lese filen '%s'
 ErrorCantReadDir=Kunne ikke lese mappen '%s'
 ErrorBadLoginPassword=Feil verdi for brukernavn eller passord
 ErrorLoginDisabled=Kontoen din har blitt deaktivert
-ErrorFailedToRunExternalCommand=Kunne ikke kjøre ekstern kommando. Sjekk om det er tilgjengelig og kjørbart av din PHP server. Hvis PHP <b>Safe Mode</b> er aktivert, må du kontrollere at kommandoen er inne i en mappe som er definert av parameter <b>safe_mode_exec_dir</b>.
+ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server user. Check also the command is not protected on shell level by a security layer like apparmor.
 ErrorFailedToChangePassword=Kunne ikke endre passord
 ErrorLoginDoesNotExists=Bruker med loginn <b>%s</b> kunne ikke bli funnet.
 ErrorLoginHasNoEmail=Denne brukeren har ingen e-postadresse. Prosess avbrutt.
@@ -262,6 +263,7 @@ ErrorDateIsInFuture=Feil, datoen kan ikke settes frem i tid
 ErrorAnAmountWithoutTaxIsRequired=Feil, beløp er obligatorisk
 ErrorAPercentIsRequired=Feil, fyll ut prosentandelen riktig
 ErrorYouMustFirstSetupYourChartOfAccount=Du må først konfigurere kontoplanen din
+ErrorFailedToFindEmailTemplate=Failed to find template with code name %s
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=PHP-parameteren upload_max_filesize (%s) er høyere enn PHP-parameteren post_max_size (%s). Dette er ikke et konsistent oppsett.
@@ -298,3 +300,4 @@ WarningModuleXDisabledSoYouMayMissEventHere=Modul %s er ikke aktivert, så du ka
 ErrorActionCommPropertyUserowneridNotDefined=Brukerens eier kreves
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Versjonskontroll mislyktes
+ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
diff --git a/htdocs/langs/nb_NO/eventorganization.lang b/htdocs/langs/nb_NO/eventorganization.lang
index fb6677b6739..dd108fff257 100644
--- a/htdocs/langs/nb_NO/eventorganization.lang
+++ b/htdocs/langs/nb_NO/eventorganization.lang
@@ -1,4 +1,5 @@
 # Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+# Copyright (C) 2021		Dorian Vabre			<dorian.vabre@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
@@ -81,7 +82,10 @@ PriceOfBoothHelp=Subscription price to stand a booth
 EventOrganizationICSLink=Link ICS for events
 ConferenceOrBoothInformation=Conference Or Booth informations
 Attendees = Attendees
+DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
 #
 # Status
 #
@@ -94,8 +98,46 @@ EvntOrgCancelled = Cancelled
 #
 # Public page
 #
+SuggestForm = Suggestion page
+RegisterPage = Page for conferences or booth
+EvntOrgRegistrationHelpMessage = Here, you can vote for an event, or suggest a new conference or booth for the project
+EvntOrgRegistrationConfHelpMessage = Here, you can suggest a new conference for the project
+EvntOrgRegistrationBoothHelpMessage = Here, you can suggest a new booth for the project
+ListOfSuggestedConferences = List of suggested conferences
+ListOfSuggestedBooths = List of suggested booths
+SuggestConference = Suggest a new conference
+SuggestBooth = Suggest a booth
+ViewAndVote = View and vote for suggested events
 PublicAttendeeSubscriptionPage = Public link of registration to a conference
 MissingOrBadSecureKey = The security key is invalid or missing
-EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
-EvntOrgStartDuration = This conference starts on
-EvntOrgEndDuration =  and ends on
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference : '%s'
+EvntOrgDuration = This conference starts on %s and ends on %s.
+ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
+BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
+EventType = Hendelsestype
+
+#
+# Vote page
+#
+EvntOrgRegistrationWelcomeMessage = Welcome on the conference or booth suggestion page.
+EvntOrgRegistrationConfWelcomeMessage = Welcome on the conference suggestion page.
+EvntOrgRegistrationBoothWelcomeMessage = Welcome on the booth suggestion page.
+EvntOrgVoteHelpMessage = Here, you can view and vote for the suggested events for the project
+VoteOk = Your vote has been accepted.
+AlreadyVoted = You have already voted for this event.
+VoteError = An error has occurred during the vote, please try again.
+
+#
+# SubscriptionOk page
+#
+SubscriptionOk = Your subscription to this conference has been validated
+#
+# Subscription validation mail
+#
+ConfAttendeeSubscriptionConfirmation = Confirmation of your subscription to a conference
+#
+# Payment page
+#
+Attendee = Attendee
+PaymentConferenceAttendee = Conference attendee payment
+PaymentBoothLocation = Booth location payment
diff --git a/htdocs/langs/nb_NO/hrm.lang b/htdocs/langs/nb_NO/hrm.lang
index bc2d3906005..e7f7dad110c 100644
--- a/htdocs/langs/nb_NO/hrm.lang
+++ b/htdocs/langs/nb_NO/hrm.lang
@@ -9,7 +9,7 @@ ConfirmDeleteEstablishment=Er du sikker på at du vil slette dette etablissement
 OpenEtablishment=Åpne firma
 CloseEtablishment=Lukk firma
 # Dictionary
-DictionaryPublicHolidays=HRM - Helligdager
+DictionaryPublicHolidays=Permisjon - helligdager
 DictionaryDepartment=HRM - Departementliste
 DictionaryFunction=HRM - Jobbstillinger
 # Module
diff --git a/htdocs/langs/nb_NO/knowledgemanagement.lang b/htdocs/langs/nb_NO/knowledgemanagement.lang
index 5d0f27b32f4..2b5af0abc47 100644
--- a/htdocs/langs/nb_NO/knowledgemanagement.lang
+++ b/htdocs/langs/nb_NO/knowledgemanagement.lang
@@ -47,7 +47,7 @@ KnowledgeManagementArea = Knowledge Management
 # Menu
 #
 MenuKnowledgeRecord = Knowledge base
-ListOfArticles = List of articles
+ListKnowledgeRecord = List of articles
 NewKnowledgeRecord = New article
 ValidateReply = Validate solution
 KnowledgeRecords = Articles
diff --git a/htdocs/langs/nb_NO/languages.lang b/htdocs/langs/nb_NO/languages.lang
index 9abffa71b5b..1ed65419c91 100644
--- a/htdocs/langs/nb_NO/languages.lang
+++ b/htdocs/langs/nb_NO/languages.lang
@@ -3,6 +3,7 @@ Language_am_ET=Etiopisk
 Language_ar_AR=Arabisk
 Language_ar_EG=Arabisk (Egypt)
 Language_ar_SA=Arabisk
+Language_ar_TN=Arabic (Tunisia)
 Language_az_AZ=Aserbajdsjansk
 Language_bn_BD=Bengalsk
 Language_bn_IN=Bengali (India)
@@ -84,6 +85,7 @@ Language_nl_NL=Nederlandsk
 Language_pl_PL=Polsk
 Language_pt_BR=Portugisisk (Brasil)
 Language_pt_PT=Portugisisk
+Language_ro_MD=Romanian (Moldavia)
 Language_ro_RO=Rumensk
 Language_ru_RU=Russisk
 Language_ru_UA=Russisk (Ukraina)
diff --git a/htdocs/langs/nb_NO/main.lang b/htdocs/langs/nb_NO/main.lang
index 840f8895d37..00e74d9c2fa 100644
--- a/htdocs/langs/nb_NO/main.lang
+++ b/htdocs/langs/nb_NO/main.lang
@@ -430,6 +430,7 @@ LT1IN=CGST
 LT2IN=SGST
 LT1GC=Ekstra cents
 VATRate=MVA-sats
+RateOfTaxN=Rate of tax %s
 VATCode=Avgiftsats-kode
 VATNPR=Avgiftsats NPR
 DefaultTaxRate=Standard avgiftssats
@@ -729,6 +730,7 @@ MenuMembers=Medlemmer
 MenuAgendaGoogle=Google agenda
 MenuTaxesAndSpecialExpenses=Avgifter | Spesielle utgifter
 ThisLimitIsDefinedInSetup=Dolibarr grense (Menu home-setup-security): %s Kb, PHP grense: %s Kb
+ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
 NoFileFound=Ingen dokumenter lastet opp
 CurrentUserLanguage=Gjeldende språk
 CurrentTheme=Gjeldende tema
@@ -1072,6 +1074,7 @@ ValidFrom=Gyldig fra
 ValidUntil=Gyldig til
 NoRecordedUsers=Ingen brukere
 ToClose=Å lukke
+ToRefuse=To refuse
 ToProcess=Til behandling
 ToApprove=Å godkjenne
 GlobalOpenedElemView=Global visning
@@ -1126,9 +1129,11 @@ UpdateForAllLines=Oppdatering for alle linjer
 OnHold=Venter
 Civility=Tiltale
 AffectTag=Påvirk merke
+CreateExternalUser=Create external user
 ConfirmAffectTag=Påvirk bulkmerke
 ConfirmAffectTagQuestion=Er du sikker på at du vil påvirke merker til valgte %s post(er)?
 CategTypeNotFound=Ingen merketype funnet for denne post-typen
 CopiedToClipboard=Kopiert til utklippstavlen
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
 ConfirmCancel=Are you sure you want to cancel
+EmailMsgID=Email MsgID
diff --git a/htdocs/langs/nb_NO/members.lang b/htdocs/langs/nb_NO/members.lang
index d204c4ebd56..87f9ba9090c 100644
--- a/htdocs/langs/nb_NO/members.lang
+++ b/htdocs/langs/nb_NO/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Et annet medlem (navn: <b>%s</b>, inn
 ErrorUserPermissionAllowsToLinksToItselfOnly=Av sikkerhetsgrunner må du ha tilgang til å redigere alle brukere for å kunne knytte et medlem til en bruker som ikke er ditt.
 SetLinkToUser=Lenke til en Dolibarr bruker
 SetLinkToThirdParty=Lenke til en Dolibarr tredjepart
-MembersCards=Business cards for members
+MembersCards=Visittkort for medlemmer
 MembersList=Liste over medlemmer
 MembersListToValid=Liste over medlems-utkast (må valideres)
 MembersListValid=Liste over gyldige medlemmer
@@ -32,7 +32,7 @@ MembersWithSubscriptionToReceive=Medlemmer som venter på abonnement
 MembersWithSubscriptionToReceiveShort=Abonnement på å motta
 DateSubscription=Abonnement dato
 DateEndSubscription=Abonnement sluttdato
-EndSubscription=Subscription Ends
+EndSubscription=Abonnementet slutter
 SubscriptionId=Abonnement-ID
 WithoutSubscription=Uten abonnement
 MemberId=Medlems-ID
@@ -83,10 +83,10 @@ WelcomeEMail=Velkomst e-post
 SubscriptionRequired=Abonnement kreves
 DeleteType=Slett
 VoteAllowed=Stemming tillatt
-Physical=Individual
-Moral=Corporation
-MorAndPhy=Corporation and Individual
-Reenable=Re-Enable
+Physical=Individuell
+Moral=Selskap
+MorAndPhy=Selskap og individ
+Reenable=Aktiver på nytt
 ExcludeMember=Ekskluder et medlem
 ConfirmExcludeMember=Er du sikker på at du vil ekskludere dette medlemmet?
 ResiliateMember=Terminer et medlem
@@ -144,7 +144,7 @@ DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=E-postmal til bruk for å sende e-
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=E-postmal til bruk for å sende e-post til et medlem på nytt abonnementsopptak
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=E-postmal som brukes til å sende epostpåminnelse når abonnementet er i ferd med å utløpe
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=E-postmal til bruk for å sende e-post til et medlem ved kansellering av medlemskap
-DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=E-postmal som skal brukes til å sende e-post om ekskludering av medlemmer
 DescADHERENT_MAIL_FROM=Avsenderadresse for automatisk e-post
 DescADHERENT_ETIQUETTE_TYPE=Side for etikettformat
 DescADHERENT_ETIQUETTE_TEXT=Tekst trykt på medlemsadresse ark
@@ -170,31 +170,31 @@ DocForLabels=Generer adresseark
 SubscriptionPayment=Abonnementsbetaling
 LastSubscriptionDate=Dato for siste abonnementsbetaling
 LastSubscriptionAmount=Beløp på siste abonnement
-LastMemberType=Last Member type
+LastMemberType=Siste medlemstype
 MembersStatisticsByCountries=Medlemsstatistikk etter land
 MembersStatisticsByState=Medlemsstatistikk etter delstat/provins
 MembersStatisticsByTown=Medlemsstatistikk etter by
 MembersStatisticsByRegion=Medlem statistikk etter region
-NbOfMembers=Total number of members
-NbOfActiveMembers=Total number of current active members
+NbOfMembers=Totalt antall medlemmer
+NbOfActiveMembers=Totalt antall nåværende aktive medlemmer
 NoValidatedMemberYet=Ingen validerte medlemmer funnet
-MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
-MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
-MembersByTownDesc=This screen show you statistics of members by town.
-MembersByNature=This screen show you statistics of members by nature.
-MembersByRegion=This screen show you statistics of members by region.
+MembersByCountryDesc=Dette skjermbildet viser statistikk over medlemmer etter land. Grafer og diagrammer avhenger av tilgjengeligheten til Googles online graftjeneste, samt av en fungerende internettforbindelse.
+MembersByStateDesc=Dette skjermbildet viser deg statistikk over medlemmer etter stat/provinser/kantoner.
+MembersByTownDesc=Dette skjermbildet viser statistikk over medlemmer etter by.
+MembersByNature=Dette skjermbildet viser statistikk over medlemmene etter natur.
+MembersByRegion=Dette skjermbildet viser deg statistikk over medlemmer etter region.
 MembersStatisticsDesc=Velg statistikk du ønsker å lese ...
 MenuMembersStats=Statistikk
-LastMemberDate=Latest membership date
+LastMemberDate=Siste medlemskapsdato
 LatestSubscriptionDate=Siste abonnementsdato
-MemberNature=Nature of the member
-MembersNature=Nature of the members
-Public=Information is public
+MemberNature=Medlemmets art
+MembersNature=Medlemmenes art
+Public=Informasjonen er offentlig
 NewMemberbyWeb=Nytt medlem lagt til. Venter på godkjenning
 NewMemberForm=Skjema for nytt medlem 
-SubscriptionsStatistics=Subscriptions statistics
+SubscriptionsStatistics=Abonnementsstatistikk
 NbOfSubscriptions=Antall abonnement
-AmountOfSubscriptions=Amount collected from subscriptions
+AmountOfSubscriptions=Beløpet tjent fra abonnementene
 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
@@ -213,3 +213,5 @@ SendReminderForExpiredSubscription=Send påminnelse via e-post til medlemmer nå
 MembershipPaid=Medlemskap betalt for gjeldende periode (til %s)
 YouMayFindYourInvoiceInThisEmail=Du kan finne fakturaen din vedlagt denne e-posten
 XMembersClosed=%s medlem(mer) lukket
+XExternalUserCreated=%s ekstern(e) bruker(e) opprettet
+ForceMemberNature=Tving medlemmets natur (enkeltperson eller selskap)
diff --git a/htdocs/langs/nb_NO/modulebuilder.lang b/htdocs/langs/nb_NO/modulebuilder.lang
index cdad609a939..4e9e7e6ad9e 100644
--- a/htdocs/langs/nb_NO/modulebuilder.lang
+++ b/htdocs/langs/nb_NO/modulebuilder.lang
@@ -143,3 +143,4 @@ AsciiToHtmlConverter=Ascii til HTML konverter
 AsciiToPdfConverter=Ascii til PDF konverter
 TableNotEmptyDropCanceled=Tabellen er ikke tom. Drop har blitt kansellert.
 ModuleBuilderNotAllowed=Modulbyggeren er tilgjengelig, men ikke tillatt for brukeren din.
+ImportExportProfiles=Import and export profiles
diff --git a/htdocs/langs/nb_NO/mrp.lang b/htdocs/langs/nb_NO/mrp.lang
index befe91b18d4..32a557ebd94 100644
--- a/htdocs/langs/nb_NO/mrp.lang
+++ b/htdocs/langs/nb_NO/mrp.lang
@@ -8,12 +8,12 @@ MenuBOM=Materialkostnader
 LatestBOMModified=Siste %s endrede materialkostnader 
 LatestMOModified=Siste %s endrede produksjonsordre
 Bom=Materialkostnader (BOM)
-BillOfMaterials=Materialkostnader
+BillOfMaterials=Materialkostnader (BOM)
 BOMsSetup=Oppsett av BOM-modulen 
 ListOfBOMs=Liste over Materialkostnader - BOM
 ListOfManufacturingOrders=Liste over produksjonsordre
-NewBOM=Ny materialkostnad
-ProductBOMHelp=Produkt som lages med denne BOM. <br> Merk: Varer med egenskapen 'Varens art' = 'Råstoff' er ikke synlige i denne listen.
+NewBOM=Ny BOM
+ProductBOMHelp=Product to create (or disassemble) with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
 BOMsNumberingModules=BOM nummereringsmaler
 BOMsModelModule=BOM-dokumentmaler
 MOsNumberingModules=MO-nummereringsmaler
@@ -22,7 +22,7 @@ FreeLegalTextOnBOMs=Fritekst på BOM-dokumentet
 WatermarkOnDraftBOMs=Vannmerke på BOM-utkast 
 FreeLegalTextOnMOs=Fritekst på dokumentet til MO
 WatermarkOnDraftMOs=Vannmerke på utkast til MO
-ConfirmCloneBillOfMaterials=Er du sikker på at du vil klone BOM %s?
+ConfirmCloneBillOfMaterials=Er du sikker på at du vil klone BOM%s?
 ConfirmCloneMo=Er du sikker på at du vil klone produksjonsordren %s?
 ManufacturingEfficiency=Produksjonseffektivitet
 ConsumptionEfficiency=Forbrukseffektivitet
@@ -30,8 +30,8 @@ ValueOfMeansLoss=Verdien på 0,95 betyr et gjennomsnitt på 5%% tap under produk
 ValueOfMeansLossForProductProduced=Verdi på 0,95 betyr et gjennomsnitt på 5%% tap av produsert produkt
 DeleteBillOfMaterials=Slett BOM
 DeleteMo=Slett produksjonsordre
-ConfirmDeleteBillOfMaterials=Er du sikker på at du vil slette denne BOM?
-ConfirmDeleteMo=Er du sikker på at du vil slette denne BOM?
+ConfirmDeleteBillOfMaterials=Er du sikker på at du vil slette BOM?
+ConfirmDeleteMo=Er du sikker på at du vil slette BOM?
 MenuMRP=Produksjonsordrer
 NewMO=Ny produksjonsordre
 QtyToProduce=Antall å produsere
@@ -39,7 +39,7 @@ DateStartPlannedMo=Planlagt startdato
 DateEndPlannedMo=Planlagt sluttdato
 KeepEmptyForAsap=Tom betyr "Så snart som mulig"
 EstimatedDuration=Antatt varighet
-EstimatedDurationDesc=Estimert varighet for å produsere denne varen ved bruk av denne BOM
+EstimatedDurationDesc=Estimated duration to manufacture (or disassemble) this product using this BOM
 ConfirmValidateBom=Er du sikker på at du vil validere BOM med referansen <strong>%s</strong> (du vil kunne bruke den til å lage nye produksjonsordre)
 ConfirmCloseBom=Er du sikker på at du vil kansellere denne BOM-en (du vil ikke kunne bruke den til å bygge nye produksjonsordrer lenger)?
 ConfirmReopenBom=Er du sikker på at du vil åpne denne BOM-en på nytt (du vil kunne bruke den til å lage nye produksjonsordrer)
@@ -63,13 +63,14 @@ ConsumeAndProduceAll=Forbruk og produser alt
 Manufactured=Produsert
 TheProductXIsAlreadyTheProductToProduce=Varen du vil legge til er allerede varen du vil produsere.
 ForAQuantityOf=For en produksjonsmengde på %s
+ForAQuantityToConsumeOf=For a quantity to disassemble of %s
 ConfirmValidateMo=Er du sikker på at du vil validere denne produksjonsordren?
 ConfirmProductionDesc=Ved å klikke på '%s', vil du validere forbruket og/eller produksjonen for angitte mengder. Dette vil også oppdatere lagermengde og registrere lagerebevegelser.
 ProductionForRef=Produksjon av %s
 AutoCloseMO=Lukk produksjonsordren automatisk hvis mengder som skal konsumeres og produseres oppnås
 NoStockChangeOnServices=Ingen lagerendring på tjenester
 ProductQtyToConsumeByMO=Produktmengde som fremdeles skal forbrukes av åpen MO
-ProductQtyToProduceByMO=Produktmengde som fremdeles skal produseres for åpen MO
+ProductQtyToProduceByMO=Product quantity still to produce by open MO
 AddNewConsumeLines=Legg til en ny linje for  konsum
 ProductsToConsume=Vare å konsumere
 ProductsToProduce=Varer å produsere
@@ -83,8 +84,6 @@ Workstations=Arbeidsstasjoner
 WorkstationsDescription=Håndtering av arbeidsstasjoner
 WorkstationSetup = Oppsett av arbeidsstasjoner
 WorkstationSetupPage = Oppsettside for arbeidsstasjoner
-WorkstationAbout = Om arbeidsstasjon
-WorkstationAboutPage = Side om arbeidsstasjoner 
 WorkstationList=Arbeidsstasjonsliste
 WorkstationCreate=Legg til ny arbeidsstasjon
 ConfirmEnableWorkstation=Er du sikker på at du vil aktivere arbeidsstasjonen <b> %s </b>?
diff --git a/htdocs/langs/nb_NO/orders.lang b/htdocs/langs/nb_NO/orders.lang
index 0731675c368..bd7d4a3dd9b 100644
--- a/htdocs/langs/nb_NO/orders.lang
+++ b/htdocs/langs/nb_NO/orders.lang
@@ -11,13 +11,14 @@ OrderDate=Ordredato
 OrderDateShort=Ordredato
 OrderToProcess=Ordre til behandling
 NewOrder=Ny ordre
+NewSupplierOrderShort=Ny ordre
 NewOrderSupplier=Ny innkjøpsordre
 ToOrder=Lag ordre
 MakeOrder=Opprett ordre
 SupplierOrder=Innkjøpsordre
 SuppliersOrders=Innkjøpsordre
-SaleOrderLines=Sale order lines
-PurchaseOrderLines=Puchase order lines
+SaleOrderLines=Salgsordrelinjer
+PurchaseOrderLines=Innkjøpsordrelinjer
 SuppliersOrdersRunning=Nåværende innkjøpsordre
 CustomerOrder=Salgsordre
 CustomersOrders=Salgsordre
@@ -73,6 +74,7 @@ DeleteOrder=Slett ordre
 CancelOrder=Avbryt ordre
 OrderReopened= Ordre%s gjenåpnet
 AddOrder=Opprett ordre
+AddSupplierOrderShort=Opprett ordre
 AddPurchaseOrder=Opprett innkjøpsordre
 AddToDraftOrders=Legg til ordreutkast
 ShowOrder=Vis ordre
diff --git a/htdocs/langs/nb_NO/other.lang b/htdocs/langs/nb_NO/other.lang
index b18c25e644b..461610c4c4b 100644
--- a/htdocs/langs/nb_NO/other.lang
+++ b/htdocs/langs/nb_NO/other.lang
@@ -129,6 +129,7 @@ ClosedByLogin=Bruker-login som lukket
 FileWasRemoved=Filen ble slettet
 DirWasRemoved=Mappen ble slettet
 FeatureNotYetAvailable=Funksjonen er ikke tilgjengelig i gjeldende versjon
+FeatureNotAvailableOnDevicesWithoutMouse=Feature not available on devices without mouse
 FeaturesSupported=Støttede funksjoner
 Width=Bredde
 Height=Høyde
@@ -263,7 +264,7 @@ ContactCreatedByEmailCollector=Kontakt/adresse opprettet av e-post samler fra e-
 ProjectCreatedByEmailCollector=Prosjekt opprettet av e-post samler fra e-post MSGID %s
 TicketCreatedByEmailCollector=Supportseddel opprettet av e-post samler fra e-post MSGID %s
 OpeningHoursFormatDesc=Bruk en bindestrek for å skille åpning og stengetid. <br> Bruk et mellomrom for å angi forskjellige områder. <br> Eksempel: 8-12 14-18
-PrefixSession=Prefiks for økt-ID
+SuffixSessionName=Suffix for session name
 
 ##### Export #####
 ExportsArea=Eksportområde
diff --git a/htdocs/langs/nb_NO/partnership.lang b/htdocs/langs/nb_NO/partnership.lang
index 06ee242e61a..8a02384aac0 100644
--- a/htdocs/langs/nb_NO/partnership.lang
+++ b/htdocs/langs/nb_NO/partnership.lang
@@ -16,41 +16,72 @@
 #
 # Generic
 #
-ModulePartnershipName = Partnership management
-PartnershipDescription = Module Partnership management
-PartnershipDescriptionLong= Module Partnership management
+ModulePartnershipName=Håndtering av partnerskap
+PartnershipDescription=Modul for Partnerskapshåndtering
+PartnershipDescriptionLong= Modul for Partnerskapshåndtering
+
+AddPartnership=Add partnership
+CancelPartnershipForExpiredMembers=Partnership: Cancel partnership of members with expired subscriptions
+PartnershipCheckBacklink=Partnership: Check referring backlink
 
 #
 # Menu
 #
-NewPartnership = New Partnership
-ListOfPartnerships = List of partnership
+NewPartnership=Nytt partnerskap
+ListOfPartnerships=Liste over partnerskap
 
 #
 # Admin page
 #
-PartnershipSetup = Partnership setup
-PartnershipAbout = About Partnership
-PartnershipAboutPage = Partnership about page
-
+PartnershipSetup=Oppsett av partnerskap
+PartnershipAbout=Om partnerskap
+PartnershipAboutPage=Om Partnerskap-side
+partnershipforthirdpartyormember=Partner status must be set on a 'thirdparty' or a 'member'
+PARTNERSHIP_IS_MANAGED_FOR=Partnerskap administrert for
+PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks å sjekke
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb of days before cancelling status of a partnership when a subscription has expired
+ReferingWebsiteCheck=Check of website referring
+ReferingWebsiteCheckDesc=You can enable a feature to check that your partners has added a backlink to your website domains on their own website.
 
 #
 # Object
 #
+DeletePartnership=Slett et partnerskap
+PartnershipDedicatedToThisThirdParty=Partnerskap dedikert til denne tredjeparten
+PartnershipDedicatedToThisMember=Partnerskap dedikert til dette medlemmet
 DatePartnershipStart=Startdato
 DatePartnershipEnd=Sluttdato
+ReasonDecline=Årsak til avslag
+ReasonDeclineOrCancel=Avvis grunn
+PartnershipAlreadyExist=Partnerskap eksisterer allerede
+ManagePartnership=Manage partnership
+BacklinkNotFoundOnPartnerWebsite=Backlink ble ikke funnet på partnerens nettsted
+ConfirmClosePartnershipAsk=Er du sikker på at du vil avbryte dette partnerskapet?
+PartnershipType=Partnership type
 
 #
 # Template Mail
 #
+SendingEmailOnPartnershipWillSoonBeCanceled=Partnerskap vil snart bli kansellert
+SendingEmailOnPartnershipRefused=Partnerskap nektet
+SendingEmailOnPartnershipAccepted=Partnerskap akseptert
+SendingEmailOnPartnershipCanceled=Partnerskapet kansellert
 
+YourPartnershipWillSoonBeCanceledTopic=Partnerskap vil snart bli kansellert
+YourPartnershipRefusedTopic=Partnerskap nektet
+YourPartnershipAcceptedTopic=Partnerskap akseptert
+YourPartnershipCanceledTopic=Partnerskapet kansellert
+
+YourPartnershipWillSoonBeCanceledContent=Vi informerer deg om at partnerskapet ditt snart vil bli kansellert (tilbakekobling ikke funnet)
+YourPartnershipRefusedContent=Vi informerer deg om at partnerskapsforespørselen din har blitt avslått.
+YourPartnershipAcceptedContent=Vi informerer deg om at din forespørsel om partnerskap er godtatt.
+YourPartnershipCanceledContent=Vi informerer deg om at partnerskapet ditt er kansellert.
 
 #
 # Status
 #
-PartnershipDraft = Kladd
-PartnershipAccepted = Akseptert
-PartnershipRefused = Avvist
-PartnershipCanceled = Kansellert
-
-PartnershipManagedFor=Partners are
+PartnershipDraft=Kladd
+PartnershipAccepted=Akseptert
+PartnershipRefused=Avvist
+PartnershipCanceled=Kansellert
+PartnershipManagedFor=Partnere er
diff --git a/htdocs/langs/nb_NO/productbatch.lang b/htdocs/langs/nb_NO/productbatch.lang
index a2741e7f58e..9647a6779ef 100644
--- a/htdocs/langs/nb_NO/productbatch.lang
+++ b/htdocs/langs/nb_NO/productbatch.lang
@@ -1,4 +1,4 @@
-# ProductBATCH language file - en_US - ProductBATCH
+# ProductBATCH language file - Source file is en_US - ProductBATCH
 ManageLotSerial=Bruk lot/serienummer
 ProductStatusOnBatch=Ja (LOT påkrevd)
 ProductStatusOnSerial=Ja (unikt serienummer kreves)
@@ -33,3 +33,13 @@ CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+LifeTime=Life span (in days)
+EndOfLife=End of life
+ManufacturingDate=Manufacturing date
+DestructionDate=Destruction date
+FirstUseDate=First use date
+QCFrequency=Quality control frequency (in days)
+
+#Traceability - qc status
+OutOfOrder=Out of order
+InWorkingOrder=In working order
diff --git a/htdocs/langs/nb_NO/products.lang b/htdocs/langs/nb_NO/products.lang
index ffcd988e7ce..e024907be49 100644
--- a/htdocs/langs/nb_NO/products.lang
+++ b/htdocs/langs/nb_NO/products.lang
@@ -396,3 +396,5 @@ ActionAvailableOnVariantProductOnly=Handling kun tilgjengelig på varianter av v
 ProductsPricePerCustomer=Varepriser per kunde
 ProductSupplierExtraFields=Ekstra attributter (leverandørpriser)
 DeleteLinkedProduct=Slett sub-produktet som er knyttet til kombinasjonen
+PMPValue=Vektet gjennomsnittspris
+PMPValueShort=WAP
diff --git a/htdocs/langs/nb_NO/projects.lang b/htdocs/langs/nb_NO/projects.lang
index 206488d41bc..909329ef370 100644
--- a/htdocs/langs/nb_NO/projects.lang
+++ b/htdocs/langs/nb_NO/projects.lang
@@ -267,9 +267,11 @@ InvoiceToUse=Fakturamal som skal brukes
 NewInvoice=Ny faktura
 OneLinePerTask=Én linje per oppgave
 OneLinePerPeriod=Én linje per periode
+OneLinePerTimeSpentLine=One line for each time spent declaration
 RefTaskParent=Ref. forelderoppgave
 ProfitIsCalculatedWith=Fortjenesten beregnes ved å bruke
 AddPersonToTask=Legg også til i oppgaver
 UsageOrganizeEvent=Bruk: Hendelse Organisasjon
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Klassifiser prosjektet som lukket når alle oppgavene er fullført (100%% progress)
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Merk: eksisterende prosjekter med alle oppgaver på 100%%-fremdrift blir ikke berørt: du må lukke dem manuelt. Dette alternativet påvirker bare åpne prosjekter.
+SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
diff --git a/htdocs/langs/nb_NO/receptions.lang b/htdocs/langs/nb_NO/receptions.lang
index 12d5426888f..a567f132824 100644
--- a/htdocs/langs/nb_NO/receptions.lang
+++ b/htdocs/langs/nb_NO/receptions.lang
@@ -44,4 +44,4 @@ ValidateOrderFirstBeforeReception=Du må først validere ordren før du kan gjø
 ReceptionsNumberingModules=Nummereringsmodul for mottak
 ReceptionsReceiptModel=Dokumentmaler for mottak
 NoMorePredefinedProductToDispatch=Ingen flere forhåndsdefinerte varer som skal sendes
-
+ReceptionExist=Et mottak finnes
diff --git a/htdocs/langs/nb_NO/salaries.lang b/htdocs/langs/nb_NO/salaries.lang
index 3a41649eaa7..7563b5dfa81 100644
--- a/htdocs/langs/nb_NO/salaries.lang
+++ b/htdocs/langs/nb_NO/salaries.lang
@@ -2,7 +2,7 @@
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Regnskapskonto brukt til tredjepartsbrukere
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=Regnskapskontoen som er definert på brukerkort, vil kun bli brukt til bruk av Subledger regnskap. Denne vil bli brukt til hovedboken og som standardverdi for Subledger-regnskap hvis dedikert bruker-regnskapskonto ikke er definert.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Regnskapskonto som standard for lønnsutbetalinger
-CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=By default, leave empty the option "Automatically create a total payment" when creating a Salary
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=La som standard alternativet "Opprett automatisk en total betaling" være tomt når du oppretter lønn
 Salary=Lønn
 Salaries=Lønn
 NewSalary=Ny lønn
diff --git a/htdocs/langs/nb_NO/sendings.lang b/htdocs/langs/nb_NO/sendings.lang
index 50bc021e293..aaaec3f2732 100644
--- a/htdocs/langs/nb_NO/sendings.lang
+++ b/htdocs/langs/nb_NO/sendings.lang
@@ -43,7 +43,7 @@ ConfirmValidateSending=Er du sikker på at du vil validere denne forsendelsen me
 ConfirmCancelSending=Er du sikker på at du vil kansellere denne forsendelsen?
 DocumentModelMerou=Merou A5 modell
 WarningNoQtyLeftToSend=Advarsel, ingen varer venter på å sendes.
-StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
+StatsOnShipmentsOnlyValidated=Statistikk er bare for validerte forsendelser. Datoen som brukes er datoen for validering av forsendelsen (planlagt leveringsdato er ikke alltid kjent)
 DateDeliveryPlanned=Planlagt leveringsdato
 RefDeliveryReceipt=Ref. leveringskvittering
 StatusReceipt=Status leveringskvittering
diff --git a/htdocs/langs/nb_NO/stocks.lang b/htdocs/langs/nb_NO/stocks.lang
index e9398f1528d..56d53e007f5 100644
--- a/htdocs/langs/nb_NO/stocks.lang
+++ b/htdocs/langs/nb_NO/stocks.lang
@@ -37,7 +37,7 @@ AllWarehouses=Alle lager
 IncludeEmptyDesiredStock=Inkluder også negativ beholdning med udefinert ønsket beholdning
 IncludeAlsoDraftOrders=Inkluder også ordrekladd
 Location=Lokasjon
-LocationSummary=Short name of location
+LocationSummary=Kort navn på lokasjonen
 NumberOfDifferentProducts=Antall unike produkter
 NumberOfProducts=Totalt antall varer
 LastMovement=Siste bevegelse
@@ -56,13 +56,11 @@ UnitPurchaseValue=Enhets innkjøpspris
 StockTooLow=For lav beholdning
 StockLowerThanLimit=Lager lavere enn varslingsgrense (%s)
 EnhancedValue=Verdi
-PMPValue=Vektet gjennomsnittspris
-PMPValueShort=WAP
 EnhancedValueOfWarehouses=Lagerverdi
 UserWarehouseAutoCreate=Opprett et brukerlager automatisk når du oppretter en bruker
 AllowAddLimitStockByWarehouse=Administrer verdi for minimum og ønsket lager per sammenkobling (varelager) i tillegg til verdien for minimum og ønsket lager pr. vare
 RuleForWarehouse=Regel for lagre
-WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+WarehouseAskWarehouseOnThirparty=Sett et lager på tredjepart
 WarehouseAskWarehouseDuringPropal=Sett varehus på tilbud
 WarehouseAskWarehouseDuringOrder=Sett et lager på salgsordrer
 UserDefaultWarehouse=Sett et lager på brukere
@@ -251,7 +249,10 @@ SelectAStockMovementFileToImport=select a stock movement file to import
 InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
 LabelOfInventoryMovemement=Inventory %s
 ReOpen=Gjenåpne
-ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock to the real qty you entered into the inventory.
 ObjectNotFound=%s not found
 MakeMovementsAndClose=Generate movements and close
 AutofillWithExpected=Fill real quantity with expected quantity
+ShowAllBatchByDefault=By default, show batch details on product "stock" tab
+CollapseBatchDetailHelp=You can set batch detail default display in stocks module configuration
+FieldCannotBeNegative=Field "%s" cannot be negative
diff --git a/htdocs/langs/nb_NO/ticket.lang b/htdocs/langs/nb_NO/ticket.lang
index 5a72cb11605..109831e3f93 100644
--- a/htdocs/langs/nb_NO/ticket.lang
+++ b/htdocs/langs/nb_NO/ticket.lang
@@ -304,7 +304,7 @@ BoxLastModifiedTicket=Siste endrede supportsedler
 BoxLastModifiedTicketDescription=Siste %s endrede supportsedler
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=Ingen nylig endrede supportsedler
-BoxTicketType=Number of open tickets by type
+BoxTicketType=Distribution of open tickets by type
 BoxTicketSeverity=Number of open tickets by severity
 BoxNoTicketSeverity=No tickets opened
 BoxTicketLastXDays=Number of new tickets by days the last %s days
diff --git a/htdocs/langs/nb_NO/trips.lang b/htdocs/langs/nb_NO/trips.lang
index aa790649667..34be03d99f7 100644
--- a/htdocs/langs/nb_NO/trips.lang
+++ b/htdocs/langs/nb_NO/trips.lang
@@ -33,7 +33,7 @@ ExpenseReportCanceledMessage=Utgiftsrapporten %s ble kansellert. <br> - Bruker:
 ExpenseReportPaid=En utgiftsrapport ble betalt
 ExpenseReportPaidMessage=Utgiftsrapporten %s er betalt. <br> - Bruker: %s <br> - Betalt av: %s <br> Klikk her for å vise utgiftsrapporten: %s
 TripId=Reiseregnings - ID
-AnyOtherInThisListCanValidate=Person som skal informeres for godkjenning
+AnyOtherInThisListCanValidate=Person som skal informeres for validering av forespørselen.
 TripSociete=Firmainformasjon
 TripNDF=Informasjon om reiseregning
 PDFStandardExpenseReports=Standardmal for å generere PDF av reiseregning
@@ -110,7 +110,7 @@ ExpenseReportPayment=Betaling av utgiftsrapport
 ExpenseReportsToApprove=Utgiftsrapporter for godkjenning
 ExpenseReportsToPay=Utgiftsrapport å betale
 ConfirmCloneExpenseReport=Er du sikker på at du vil klone denne utgiftsrapporten?
-ExpenseReportsIk=Utgiftsrapport kilometerindeks
+ExpenseReportsIk=Konfigurasjon av kjøregodtgjørelser
 ExpenseReportsRules=Utgifts-rapportregler
 ExpenseReportIkDesc=Du kan endre beregningen av kilometerkostnad etter kategori og rekkevidde etter slik de tidligere er definert. <b> d </b> er avstanden i kilometer
 ExpenseReportRulesDesc=Du kan opprette eller oppdatere regler for beregning. Denne delen vil bli brukt når brukeren skal opprette en ny kostnadsrapport
@@ -145,7 +145,7 @@ nolimitbyEX_DAY=etter dag (ingen begrensning)
 nolimitbyEX_MON=etter måned (ingen begrensning)
 nolimitbyEX_YEA=etter år (ingen begrensning)
 nolimitbyEX_EXP=etter linje (ingen begrensning)
-CarCategory=Bilkategori
+CarCategory=Kjøretøyskategori
 ExpenseRangeOffset=Offset-beløp: %s
 RangeIk=Kilometerstand
 AttachTheNewLineToTheDocument=Fest linjen til et opplastet dokument
diff --git a/htdocs/langs/ne_NP/accountancy.lang b/htdocs/langs/ne_NP/accountancy.lang
index 354cddb62c2..27be673dd9c 100644
--- a/htdocs/langs/ne_NP/accountancy.lang
+++ b/htdocs/langs/ne_NP/accountancy.lang
@@ -158,7 +158,7 @@ ACCOUNTING_LENGTH_AACCOUNT=Length of the third-party accounting accounts (If you
 ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of an accounting account. Needed by some countries (like Switzerland). If set to off (default), you can set the following two parameters to ask the application to add virtual zeros.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties, break ability to search on a part of value)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
@@ -328,6 +328,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountanc
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
+NotifiedExportDate=Notified export date (modification of the entries will not be possible)
+NotifiedValidationDate=Validation of the entries (modification or deletion of the entries will not be possible)
+ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=Export draft journal
 Modelcsv=Model of export
 Selectmodelcsv=Select a model of export
diff --git a/htdocs/langs/ne_NP/admin.lang b/htdocs/langs/ne_NP/admin.lang
index fb4513a09b4..be9aca94599 100644
--- a/htdocs/langs/ne_NP/admin.lang
+++ b/htdocs/langs/ne_NP/admin.lang
@@ -221,8 +221,8 @@ NotCompatible=This module does not seem compatible with your Dolibarr %s (Min %s
 CompatibleAfterUpdate=This module requires an update to your Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=See in Market place
 SeeSetupOfModule=See setup of module %s
+SetOptionTo=Set option <b>%s</b> to %s
 Updated=Updated
-Nouveauté=Novelty
 AchatTelechargement=Buy / Download
 GoModuleSetupArea=To deploy/install a new module, go to the Module setup area: <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
@@ -399,6 +399,7 @@ SecurityToken=Key to secure URLs
 NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
 PDF=PDF
 PDFDesc=Global options for PDF generation
+PDFOtherDesc=PDF Option specific to some modules
 PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
 PDFRulesForSalesTax=Rules for Sales Tax / VAT
@@ -561,7 +562,7 @@ Module53Desc=Management of Services
 Module54Name=Contracts/Subscriptions
 Module54Desc=Management of contracts (services or recurring subscriptions)
 Module55Name=Barcodes
-Module55Desc=Barcode management
+Module55Desc=Barcode or QR code management
 Module56Name=Payment by credit transfer
 Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
 Module57Name=Payments by Direct Debit
@@ -848,10 +849,10 @@ Permission402=Create/modify discounts
 Permission403=Validate discounts
 Permission404=Delete discounts
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries (yours and subordinates)
-Permission512=Create/modify payments of salaries
-Permission514=Delete payments of salaries
-Permission517=Read payments of salaries of everybody
+Permission511=Read salaries and payments (yours and subordinates)
+Permission512=Create/modify salaries and payments
+Permission514=Delete salaries and payments
+Permission517=Read salaries and payments everybody
 Permission519=Export salaries
 Permission520=Read Loans
 Permission522=Create/modify loans
@@ -965,6 +966,8 @@ Permission23003=Delete Scheduled job
 Permission23004=Execute Scheduled job
 Permission50101=Use Point of Sale (SimplePOS)
 Permission50151=Use Point of Sale (TakePOS)
+Permission50152=Edit sales lines
+Permission50153=Edit ordered sales lines
 Permission50201=Read transactions
 Permission50202=Import transactions
 Permission50330=Read objects of Zapier
@@ -1039,11 +1042,12 @@ DictionaryMeasuringUnits=Measuring Units
 DictionarySocialNetworks=Social Networks
 DictionaryProspectStatus=Prospect status for companies
 DictionaryProspectContactStatus=Prospect status for contacts
-DictionaryHolidayTypes=Types of leave
+DictionaryHolidayTypes=Leave - Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
 DictionaryTransportMode=Intracomm report - Transport mode
+DictionaryBatchStatus=Product lot/serial Quality Control status
 TypeOfUnit=Type of unit
 SetupSaved=Setup saved
 SetupNotSaved=Setup not saved
@@ -1187,7 +1191,7 @@ SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of m
 SetupDescription5=Other Setup menu entries manage optional parameters.
 AuditedSecurityEvents=Security events that are audited
 NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
-Audit=Audit
+Audit=Security events
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
 InfoOS=About OS
@@ -1319,9 +1323,12 @@ ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
 NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
+ComboListOptim=Combo list loading optimization
 SearchOptim=Search optimization
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
-YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
+YouHaveXObjectUseComboOptim=You have %s %s in the database. You can go into setup of module to enable loading of combo list on key pressed event.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other.
+YouHaveXObjectUseSearchOptimDesc=This limits the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to %s in Home-Setup-Other.
 BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
 BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
 PHPModuleLoaded=PHP component %s is loaded
@@ -1433,6 +1440,7 @@ MemberMainOptions=Main options
 AdherentLoginRequired= Manage a Login for each member
 AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
+MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
 MembersDocModules=Document templates for documents generated from member record
@@ -1763,7 +1771,7 @@ AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting men
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
-AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the scheduled job %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
@@ -1979,6 +1987,8 @@ 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_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add picture on proposal line
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add electronic sign in PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
@@ -2096,7 +2106,6 @@ PDF_SHOW_PROJECT=Show project on document
 ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
-FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
@@ -2120,12 +2129,18 @@ ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by
 MailToSendEventOrganization=Event Organization
 AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
 YouShouldDisablePHPFunctions=You should disable PHP functions
-IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands in custom code, you shoud disable PHP functions
+PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
+NotRecommended=Not recommanded
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
 ModuleUpdateAvailable=An update is available
 NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
+RandomlySelectedIfSeveral=Randomly selected if several pictures are available
+DatabasePasswordObfuscated=Database password is obfuscated in conf file
+DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
diff --git a/htdocs/langs/ne_NP/agenda.lang b/htdocs/langs/ne_NP/agenda.lang
index 09d82139a49..a1183841b00 100644
--- a/htdocs/langs/ne_NP/agenda.lang
+++ b/htdocs/langs/ne_NP/agenda.lang
@@ -4,7 +4,7 @@ Actions=Events
 Agenda=Agenda
 TMenuAgenda=Agenda
 Agendas=Agendas
-LocalAgenda=Internal calendar
+LocalAgenda=Default calendar
 ActionsOwnedBy=Event owned by
 ActionsOwnedByShort=Owner
 AffectedTo=Assigned to
@@ -14,13 +14,13 @@ EventsNb=Number of events
 ListOfActions=List of events
 EventReports=Event reports
 Location=Location
-ToUserOfGroup=Event assigned to any user in group
+ToUserOfGroup=Event assigned to any user in the group
 EventOnFullDay=Event on all day(s)
 MenuToDoActions=All incomplete events
 MenuDoneActions=All terminated events
 MenuToDoMyActions=My incomplete events
 MenuDoneMyActions=My terminated events
-ListOfEvents=List of events (internal calendar)
+ListOfEvents=List of events (default calendar)
 ActionsAskedBy=Events reported by
 ActionsToDoBy=Events assigned to
 ActionsDoneBy=Events done by
@@ -38,6 +38,7 @@ ActionsEvents=Events for which Dolibarr will create an action in agenda automati
 EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Third party %s created
+COMPANY_MODIFYInDolibarr=Third party %s modified
 COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=Contract %s validated
 CONTRACT_DELETEInDolibarr=Contract %s deleted
@@ -87,6 +88,7 @@ OrderDeleted=Order deleted
 InvoiceDeleted=Invoice deleted
 DraftInvoiceDeleted=Draft invoice deleted
 CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_MODIFYInDolibarr=Contact %s modified
 CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Product %s created
 PRODUCT_MODIFYInDolibarr=Product %s modified
@@ -119,6 +121,7 @@ MRP_MO_UNVALIDATEInDolibarr=MO set to draft status
 MRP_MO_PRODUCEDInDolibarr=MO produced
 MRP_MO_DELETEInDolibarr=MO deleted
 MRP_MO_CANCELInDolibarr=MO canceled
+PAIDInDolibarr=%s paid
 ##### End agenda events #####
 AgendaModelModule=Document templates for event
 DateActionStart=Start date
@@ -130,7 +133,7 @@ AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to use
 AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
 AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic events.
 AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> to include events of holidays.
-AgendaShowBirthdayEvents=Show birthdays of contacts
+AgendaShowBirthdayEvents=Birthdays of contacts
 AgendaHideBirthdayEvents=Hide birthdays of contacts
 Busy=Busy
 ExportDataset_event1=List of agenda events
@@ -152,6 +155,7 @@ ActionType=Event type
 DateActionBegin=Start event date
 ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b>?
 RepeatEvent=Repeat event
+OnceOnly=Once only
 EveryWeek=Every week
 EveryMonth=Every month
 DayOfMonth=Day of month
@@ -165,4 +169,4 @@ TimeType=Duration type
 ReminderType=Callback type
 AddReminder=Create an automatic reminder notification for this event
 ErrorReminderActionCommCreation=Error creating the reminder notification for this event
-BrowserPush=Browser Notification
+BrowserPush=Browser Popup Notification
diff --git a/htdocs/langs/ne_NP/bills.lang b/htdocs/langs/ne_NP/bills.lang
index c55f483873b..7b8c997d2e6 100644
--- a/htdocs/langs/ne_NP/bills.lang
+++ b/htdocs/langs/ne_NP/bills.lang
@@ -259,6 +259,7 @@ DateMaxPayment=Payment due on
 DateInvoice=Invoice date
 DatePointOfTax=Point of tax
 NoInvoice=No invoice
+NoOpenInvoice=No open invoice
 ClassifyBill=Classify invoice
 SupplierBillsToPay=Unpaid vendor invoices
 CustomerBillsUnpaid=Unpaid customer invoices
@@ -589,3 +590,4 @@ FacParentLine=Invoice Line Parent
 SituationTotalRayToRest=Remainder to pay without taxe
 PDFSituationTitle=Situation n° %d
 SituationTotalProgress=Total progress %d %%
+SearchUnpaidInvoicesWithDueDate=Search unpaid invoices with a due date = %s
diff --git a/htdocs/langs/ne_NP/cashdesk.lang b/htdocs/langs/ne_NP/cashdesk.lang
index 240503842f3..aea1f02f834 100644
--- a/htdocs/langs/ne_NP/cashdesk.lang
+++ b/htdocs/langs/ne_NP/cashdesk.lang
@@ -102,7 +102,7 @@ CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal numb
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
 SaleStartedAt=Sale started at %s
-ControlCashOpening=Control cash popup at opening POS
+ControlCashOpening=Open the "Control cash" popup when opening the POS
 CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -126,5 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
-ShowPriceHT = Display the price excluding tax column
-ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
+ShowPriceHT = Display the column with the price excluding tax (on screen)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
diff --git a/htdocs/langs/ne_NP/compta.lang b/htdocs/langs/ne_NP/compta.lang
index 7cae82e6ac7..8329346c163 100644
--- a/htdocs/langs/ne_NP/compta.lang
+++ b/htdocs/langs/ne_NP/compta.lang
@@ -286,3 +286,9 @@ ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
 IncludeLoansInResults = Include loans in reports
+InvoiceLate30Days = Invoices late > 30 days
+InvoiceLate15Days = Invoices late > 15 days
+InvoiceLateMinus15Days = Invoices late
+InvoiceNotLate = To be collected < 15 days
+InvoiceNotLate15Days = To be collected in 15 days
+InvoiceNotLate30Days = To be collected in 30 days
diff --git a/htdocs/langs/ne_NP/cron.lang b/htdocs/langs/ne_NP/cron.lang
index 2ebdda1e685..4fd2220dea6 100644
--- a/htdocs/langs/ne_NP/cron.lang
+++ b/htdocs/langs/ne_NP/cron.lang
@@ -60,7 +60,7 @@ CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
 CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Disable
-CronTaskInactive=This job is disabled
+CronTaskInactive=This job is disabled (not scheduled)
 CronId=Id
 CronClassFile=Filename with class
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example 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>
diff --git a/htdocs/langs/ne_NP/errors.lang b/htdocs/langs/ne_NP/errors.lang
index 9b14b5ad1d2..670f8c7a6bc 100644
--- a/htdocs/langs/ne_NP/errors.lang
+++ b/htdocs/langs/ne_NP/errors.lang
@@ -11,6 +11,7 @@ ErrorBadValueForParamNotAString=Bad value for your parameter. It appends general
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s already exists.
 ErrorGroupAlreadyExists=Group %s already exists.
+ErrorEmailAlreadyExists=Email %s already exists.
 ErrorRecordNotFound=Record not found.
 ErrorFailToCopyFile=Failed to copy file '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
@@ -117,7 +118,7 @@ ErrorCantReadFile=Failed to read file '%s'
 ErrorCantReadDir=Failed to read directory '%s'
 ErrorBadLoginPassword=Bad value for login or password
 ErrorLoginDisabled=Your account has been disabled
-ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server. If PHP <b>Safe Mode</b> is enabled, check that command is inside a directory defined by parameter <b>safe_mode_exec_dir</b>.
+ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server user. Check also the command is not protected on shell level by a security layer like apparmor.
 ErrorFailedToChangePassword=Failed to change password
 ErrorLoginDoesNotExists=User with login <b>%s</b> could not be found.
 ErrorLoginHasNoEmail=This user has no email address. Process aborted.
@@ -262,6 +263,7 @@ ErrorDateIsInFuture=Error, the date can't be in the future
 ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
 ErrorAPercentIsRequired=Error, please fill in the percentage correctly
 ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
+ErrorFailedToFindEmailTemplate=Failed to find template with code name %s
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -298,3 +300,4 @@ WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So y
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
+ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
diff --git a/htdocs/langs/ne_NP/eventorganization.lang b/htdocs/langs/ne_NP/eventorganization.lang
index 75b798fbc3a..335c257b224 100644
--- a/htdocs/langs/ne_NP/eventorganization.lang
+++ b/htdocs/langs/ne_NP/eventorganization.lang
@@ -1,4 +1,5 @@
 # Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+# Copyright (C) 2021		Dorian Vabre			<dorian.vabre@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
@@ -81,7 +82,10 @@ PriceOfBoothHelp=Subscription price to stand a booth
 EventOrganizationICSLink=Link ICS for events
 ConferenceOrBoothInformation=Conference Or Booth informations
 Attendees = Attendees
+DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
 #
 # Status
 #
@@ -94,8 +98,46 @@ EvntOrgCancelled = Cancelled
 #
 # Public page
 #
+SuggestForm = Suggestion page
+RegisterPage = Page for conferences or booth
+EvntOrgRegistrationHelpMessage = Here, you can vote for an event, or suggest a new conference or booth for the project
+EvntOrgRegistrationConfHelpMessage = Here, you can suggest a new conference for the project
+EvntOrgRegistrationBoothHelpMessage = Here, you can suggest a new booth for the project
+ListOfSuggestedConferences = List of suggested conferences
+ListOfSuggestedBooths = List of suggested booths
+SuggestConference = Suggest a new conference
+SuggestBooth = Suggest a booth
+ViewAndVote = View and vote for suggested events
 PublicAttendeeSubscriptionPage = Public link of registration to a conference
 MissingOrBadSecureKey = The security key is invalid or missing
-EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
-EvntOrgStartDuration = This conference starts on
-EvntOrgEndDuration =  and ends on
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference : '%s'
+EvntOrgDuration = This conference starts on %s and ends on %s.
+ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
+BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
+EventType = Event type
+
+#
+# Vote page
+#
+EvntOrgRegistrationWelcomeMessage = Welcome on the conference or booth suggestion page.
+EvntOrgRegistrationConfWelcomeMessage = Welcome on the conference suggestion page.
+EvntOrgRegistrationBoothWelcomeMessage = Welcome on the booth suggestion page.
+EvntOrgVoteHelpMessage = Here, you can view and vote for the suggested events for the project
+VoteOk = Your vote has been accepted.
+AlreadyVoted = You have already voted for this event.
+VoteError = An error has occurred during the vote, please try again.
+
+#
+# SubscriptionOk page
+#
+SubscriptionOk = Your subscription to this conference has been validated
+#
+# Subscription validation mail
+#
+ConfAttendeeSubscriptionConfirmation = Confirmation of your subscription to a conference
+#
+# Payment page
+#
+Attendee = Attendee
+PaymentConferenceAttendee = Conference attendee payment
+PaymentBoothLocation = Booth location payment
diff --git a/htdocs/langs/ne_NP/hrm.lang b/htdocs/langs/ne_NP/hrm.lang
index 3b8f137e103..da098e10bdb 100644
--- a/htdocs/langs/ne_NP/hrm.lang
+++ b/htdocs/langs/ne_NP/hrm.lang
@@ -9,7 +9,7 @@ ConfirmDeleteEstablishment=Are you sure you wish to delete this establishment?
 OpenEtablishment=Open establishment
 CloseEtablishment=Close establishment
 # Dictionary
-DictionaryPublicHolidays=HRM - Public holidays
+DictionaryPublicHolidays=Leave - Public holidays
 DictionaryDepartment=HRM - Department list
 DictionaryFunction=HRM - Job positions
 # Module
diff --git a/htdocs/langs/ne_NP/knowledgemanagement.lang b/htdocs/langs/ne_NP/knowledgemanagement.lang
index 269007e60f8..68f5cced76c 100644
--- a/htdocs/langs/ne_NP/knowledgemanagement.lang
+++ b/htdocs/langs/ne_NP/knowledgemanagement.lang
@@ -47,7 +47,7 @@ KnowledgeManagementArea = Knowledge Management
 # Menu
 #
 MenuKnowledgeRecord = Knowledge base
-ListOfArticles = List of articles
+ListKnowledgeRecord = List of articles
 NewKnowledgeRecord = New article
 ValidateReply = Validate solution
 KnowledgeRecords = Articles
diff --git a/htdocs/langs/ne_NP/languages.lang b/htdocs/langs/ne_NP/languages.lang
index ba187326705..da8ad5376a1 100644
--- a/htdocs/langs/ne_NP/languages.lang
+++ b/htdocs/langs/ne_NP/languages.lang
@@ -3,6 +3,7 @@ Language_am_ET=Ethiopian
 Language_ar_AR=Arabic
 Language_ar_EG=Arabic (Egypt)
 Language_ar_SA=Arabic
+Language_ar_TN=Arabic (Tunisia)
 Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengali
 Language_bn_IN=Bengali (India)
@@ -84,6 +85,7 @@ Language_nl_NL=Dutch
 Language_pl_PL=Polish
 Language_pt_BR=Portuguese (Brazil)
 Language_pt_PT=Portuguese
+Language_ro_MD=Romanian (Moldavia)
 Language_ro_RO=Romanian
 Language_ru_RU=Russian
 Language_ru_UA=Russian (Ukraine)
diff --git a/htdocs/langs/ne_NP/main.lang b/htdocs/langs/ne_NP/main.lang
index 13793aad13f..863b94af564 100644
--- a/htdocs/langs/ne_NP/main.lang
+++ b/htdocs/langs/ne_NP/main.lang
@@ -430,6 +430,7 @@ LT1IN=CGST
 LT2IN=SGST
 LT1GC=Additionnal cents
 VATRate=Tax Rate
+RateOfTaxN=Rate of tax %s
 VATCode=Tax Rate code
 VATNPR=Tax Rate NPR
 DefaultTaxRate=Default tax rate
@@ -729,6 +730,7 @@ MenuMembers=Members
 MenuAgendaGoogle=Google agenda
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
+ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
 NoFileFound=No documents uploaded
 CurrentUserLanguage=Current language
 CurrentTheme=Current theme
@@ -1072,6 +1074,7 @@ ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
 ToClose=To close
+ToRefuse=To refuse
 ToProcess=To process
 ToApprove=To approve
 GlobalOpenedElemView=Global view
@@ -1126,9 +1129,11 @@ UpdateForAllLines=Update for all lines
 OnHold=On hold
 Civility=Civility
 AffectTag=Affect Tag
+CreateExternalUser=Create external user
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
 ConfirmCancel=Are you sure you want to cancel
+EmailMsgID=Email MsgID
diff --git a/htdocs/langs/ne_NP/members.lang b/htdocs/langs/ne_NP/members.lang
index 042b85598c0..d8b9c2f59f3 100644
--- a/htdocs/langs/ne_NP/members.lang
+++ b/htdocs/langs/ne_NP/members.lang
@@ -213,3 +213,5 @@ SendReminderForExpiredSubscription=Send reminder by email to members when subscr
 MembershipPaid=Membership paid for current period (until %s)
 YouMayFindYourInvoiceInThisEmail=You may find your invoice attached to this email
 XMembersClosed=%s member(s) closed
+XExternalUserCreated=%s external user(s) created
+ForceMemberNature=Force member nature (Individual or Corporation)
diff --git a/htdocs/langs/ne_NP/modulebuilder.lang b/htdocs/langs/ne_NP/modulebuilder.lang
index 9fdaa1a533a..23a098be2e5 100644
--- a/htdocs/langs/ne_NP/modulebuilder.lang
+++ b/htdocs/langs/ne_NP/modulebuilder.lang
@@ -143,3 +143,4 @@ AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
 ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
+ImportExportProfiles=Import and export profiles
diff --git a/htdocs/langs/ne_NP/mrp.lang b/htdocs/langs/ne_NP/mrp.lang
index ec999a473a4..2414a92cefb 100644
--- a/htdocs/langs/ne_NP/mrp.lang
+++ b/htdocs/langs/ne_NP/mrp.lang
@@ -8,12 +8,12 @@ MenuBOM=Bills of material
 LatestBOMModified=Latest %s Bills of materials modified
 LatestMOModified=Latest %s Manufacturing Orders modified
 Bom=Bills of Material
-BillOfMaterials=Bill of Material
+BillOfMaterials=Bill of Materials
 BOMsSetup=Setup of module BOM
 ListOfBOMs=List of bills of material - BOM
 ListOfManufacturingOrders=List of Manufacturing Orders
-NewBOM=New bill of material
-ProductBOMHelp=Product to create with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
+NewBOM=New bill of materials
+ProductBOMHelp=Product to create (or disassemble) with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
 BOMsNumberingModules=BOM numbering templates
 BOMsModelModule=BOM document templates
 MOsNumberingModules=MO numbering templates
@@ -22,7 +22,7 @@ FreeLegalTextOnBOMs=Free text on document of BOM
 WatermarkOnDraftBOMs=Watermark on draft BOM
 FreeLegalTextOnMOs=Free text on document of MO
 WatermarkOnDraftMOs=Watermark on draft MO
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials %s ?
 ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
 ManufacturingEfficiency=Manufacturing efficiency
 ConsumptionEfficiency=Consumption efficiency
@@ -30,8 +30,8 @@ ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the produc
 ValueOfMeansLossForProductProduced=Value of 0.95 means an average of 5%% of loss of produced product
 DeleteBillOfMaterials=Delete Bill Of Materials
 DeleteMo=Delete Manufacturing Order
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Materials?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Materials?
 MenuMRP=Manufacturing Orders
 NewMO=New Manufacturing Order
 QtyToProduce=Qty to produce
@@ -39,7 +39,7 @@ DateStartPlannedMo=Date start planned
 DateEndPlannedMo=Date end planned
 KeepEmptyForAsap=Empty means 'As Soon As Possible'
 EstimatedDuration=Estimated duration
-EstimatedDurationDesc=Estimated duration to manufacture this product using this BOM
+EstimatedDurationDesc=Estimated duration to manufacture (or disassemble) this product using this BOM
 ConfirmValidateBom=Are you sure you want to validate the BOM with the reference <strong>%s</strong> (you will be able to use it to build new Manufacturing Orders)
 ConfirmCloseBom=Are you sure you want to cancel this BOM (you won't be able to use it to build new Manufacturing Orders anymore) ?
 ConfirmReopenBom=Are you sure you want to re-open this BOM (you will be able to use it to build new Manufacturing Orders)
@@ -63,13 +63,14 @@ ConsumeAndProduceAll=Consume and Produce All
 Manufactured=Manufactured
 TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
 ForAQuantityOf=For a quantity to produce of %s
+ForAQuantityToConsumeOf=For a quantity to disassemble of %s
 ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
 ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
 ProductionForRef=Production of %s
 AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
 NoStockChangeOnServices=No stock change on services
 ProductQtyToConsumeByMO=Product quantity still to consume by open MO
-ProductQtyToProduceByMO=Product quentity still to produce by open MO
+ProductQtyToProduceByMO=Product quantity still to produce by open MO
 AddNewConsumeLines=Add new line to consume
 ProductsToConsume=Products to consume
 ProductsToProduce=Products to produce
@@ -83,15 +84,13 @@ Workstations=Workstations
 WorkstationsDescription=Workstations management
 WorkstationSetup = Workstations setup
 WorkstationSetupPage = Workstations setup page
-WorkstationAbout = About Workstation
-WorkstationAboutPage = Workstations about page
 WorkstationList=Workstation list
 WorkstationCreate=Add new workstation
 ConfirmEnableWorkstation=Are you sure you want to enable workstation <b>%s</b> ?
 EnableAWorkstation=Enable a workstation
 ConfirmDisableWorkstation=Are you sure you want to disable workstation <b>%s</b> ?
 DisableAWorkstation=Disable a workstation
-DeleteWorkstation=Supprimer
+DeleteWorkstation=Delete
 NbOperatorsRequired=Number of operators required
 THMOperatorEstimated=Estimated operator THM
 THMMachineEstimated=Estimated machine THM
diff --git a/htdocs/langs/ne_NP/orders.lang b/htdocs/langs/ne_NP/orders.lang
index 87d196eb22f..5dab5b99bf1 100644
--- a/htdocs/langs/ne_NP/orders.lang
+++ b/htdocs/langs/ne_NP/orders.lang
@@ -11,6 +11,7 @@ OrderDate=Order date
 OrderDateShort=Order date
 OrderToProcess=Order to process
 NewOrder=New order
+NewSupplierOrderShort=New order
 NewOrderSupplier=New Purchase Order
 ToOrder=Make order
 MakeOrder=Make order
@@ -73,6 +74,7 @@ DeleteOrder=Delete order
 CancelOrder=Cancel order
 OrderReopened= Order %s re-open
 AddOrder=Create order
+AddSupplierOrderShort=Create order
 AddPurchaseOrder=Create purchase order
 AddToDraftOrders=Add to draft order
 ShowOrder=Show order
diff --git a/htdocs/langs/ne_NP/other.lang b/htdocs/langs/ne_NP/other.lang
index 95297a98859..bb35099ab82 100644
--- a/htdocs/langs/ne_NP/other.lang
+++ b/htdocs/langs/ne_NP/other.lang
@@ -129,6 +129,7 @@ ClosedByLogin=User login who closed
 FileWasRemoved=File %s was removed
 DirWasRemoved=Directory %s was removed
 FeatureNotYetAvailable=Feature not yet available in the current version
+FeatureNotAvailableOnDevicesWithoutMouse=Feature not available on devices without mouse
 FeaturesSupported=Supported features
 Width=Width
 Height=Height
@@ -263,7 +264,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
-PrefixSession=Prefix for session ID
+SuffixSessionName=Suffix for session name
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/ne_NP/partnership.lang b/htdocs/langs/ne_NP/partnership.lang
index 09059995a8d..2fb10e8159e 100644
--- a/htdocs/langs/ne_NP/partnership.lang
+++ b/htdocs/langs/ne_NP/partnership.lang
@@ -16,41 +16,72 @@
 #
 # Generic
 #
-ModulePartnershipName = Partnership management
-PartnershipDescription = Module Partnership management
+ModulePartnershipName=Partnership management
+PartnershipDescription=Module Partnership management
 PartnershipDescriptionLong= Module Partnership management
 
+AddPartnership=Add partnership
+CancelPartnershipForExpiredMembers=Partnership: Cancel partnership of members with expired subscriptions
+PartnershipCheckBacklink=Partnership: Check referring backlink
+
 #
 # Menu
 #
-NewPartnership = New Partnership
-ListOfPartnerships = List of partnership
+NewPartnership=New Partnership
+ListOfPartnerships=List of partnership
 
 #
 # Admin page
 #
-PartnershipSetup = Partnership setup
-PartnershipAbout = About Partnership
-PartnershipAboutPage = Partnership about page
-
+PartnershipSetup=Partnership setup
+PartnershipAbout=About Partnership
+PartnershipAboutPage=Partnership about page
+partnershipforthirdpartyormember=Partner status must be set on a 'thirdparty' or a 'member'
+PARTNERSHIP_IS_MANAGED_FOR=Partnership managed for
+PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks to check
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb of days before cancelling status of a partnership when a subscription has expired
+ReferingWebsiteCheck=Check of website referring
+ReferingWebsiteCheckDesc=You can enable a feature to check that your partners has added a backlink to your website domains on their own website.
 
 #
 # Object
 #
+DeletePartnership=Delete a partnership
+PartnershipDedicatedToThisThirdParty=Partnership dedicated to this third party
+PartnershipDedicatedToThisMember=Partnership dedicated to this member
 DatePartnershipStart=Start date
 DatePartnershipEnd=End date
+ReasonDecline=Decline reason
+ReasonDeclineOrCancel=Decline reason
+PartnershipAlreadyExist=Partnership already exist
+ManagePartnership=Manage partnership
+BacklinkNotFoundOnPartnerWebsite=Backlink not found on partner website
+ConfirmClosePartnershipAsk=Are you sure you want to cancel this partnership?
+PartnershipType=Partnership type
 
 #
 # Template Mail
 #
+SendingEmailOnPartnershipWillSoonBeCanceled=Partnership will soon be canceled
+SendingEmailOnPartnershipRefused=Partnership refused
+SendingEmailOnPartnershipAccepted=Partnership accepted
+SendingEmailOnPartnershipCanceled=Partnership canceled
 
+YourPartnershipWillSoonBeCanceledTopic=Partnership will soon be canceled
+YourPartnershipRefusedTopic=Partnership refused
+YourPartnershipAcceptedTopic=Partnership accepted
+YourPartnershipCanceledTopic=Partnership canceled
+
+YourPartnershipWillSoonBeCanceledContent=We inform you that your partnership will soon be canceled (Backlink not found)
+YourPartnershipRefusedContent=We inform you that your partnership request has been refused.
+YourPartnershipAcceptedContent=We inform you that your partnership request has been accepted.
+YourPartnershipCanceledContent=We inform you that your partnership has been canceled.
 
 #
 # Status
 #
-PartnershipDraft = Draft
-PartnershipAccepted = Accepted
-PartnershipRefused = Refused
-PartnershipCanceled = Canceled
-
+PartnershipDraft=Draft
+PartnershipAccepted=Accepted
+PartnershipRefused=Refused
+PartnershipCanceled=Canceled
 PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/ne_NP/productbatch.lang b/htdocs/langs/ne_NP/productbatch.lang
index ad2db658e2e..450d0285819 100644
--- a/htdocs/langs/ne_NP/productbatch.lang
+++ b/htdocs/langs/ne_NP/productbatch.lang
@@ -1,4 +1,4 @@
-# ProductBATCH language file - en_US - ProductBATCH
+# ProductBATCH language file - Source file is en_US - ProductBATCH
 ManageLotSerial=Use lot/serial number
 ProductStatusOnBatch=Yes (lot required)
 ProductStatusOnSerial=Yes (unique serial number required)
@@ -33,3 +33,13 @@ CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+LifeTime=Life span (in days)
+EndOfLife=End of life
+ManufacturingDate=Manufacturing date
+DestructionDate=Destruction date
+FirstUseDate=First use date
+QCFrequency=Quality control frequency (in days)
+
+#Traceability - qc status
+OutOfOrder=Out of order
+InWorkingOrder=In working order
diff --git a/htdocs/langs/ne_NP/products.lang b/htdocs/langs/ne_NP/products.lang
index 0875be0dc07..9638dfe5a25 100644
--- a/htdocs/langs/ne_NP/products.lang
+++ b/htdocs/langs/ne_NP/products.lang
@@ -396,3 +396,5 @@ ActionAvailableOnVariantProductOnly=Action only available on the variant of prod
 ProductsPricePerCustomer=Product prices per customers
 ProductSupplierExtraFields=Additional Attributes (Supplier Prices)
 DeleteLinkedProduct=Delete the child product linked to the combination
+PMPValue=Weighted average price
+PMPValueShort=WAP
diff --git a/htdocs/langs/ne_NP/projects.lang b/htdocs/langs/ne_NP/projects.lang
index 79c974f6e24..6c96fadb5c1 100644
--- a/htdocs/langs/ne_NP/projects.lang
+++ b/htdocs/langs/ne_NP/projects.lang
@@ -267,9 +267,11 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=New invoice
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+OneLinePerTimeSpentLine=One line for each time spent declaration
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
 AddPersonToTask=Add also to tasks
 UsageOrganizeEvent=Usage: Event Organization
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
+SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
diff --git a/htdocs/langs/ne_NP/receptions.lang b/htdocs/langs/ne_NP/receptions.lang
index 760ff884fa0..338602e722e 100644
--- a/htdocs/langs/ne_NP/receptions.lang
+++ b/htdocs/langs/ne_NP/receptions.lang
@@ -44,4 +44,4 @@ ValidateOrderFirstBeforeReception=You must first validate the order before being
 ReceptionsNumberingModules=Numbering module for receptions
 ReceptionsReceiptModel=Document templates for receptions
 NoMorePredefinedProductToDispatch=No more predefined products to dispatch
-
+ReceptionExist=A reception exists
diff --git a/htdocs/langs/ne_NP/stocks.lang b/htdocs/langs/ne_NP/stocks.lang
index 9ec523427b1..d39791932a3 100644
--- a/htdocs/langs/ne_NP/stocks.lang
+++ b/htdocs/langs/ne_NP/stocks.lang
@@ -56,8 +56,6 @@ UnitPurchaseValue=Unit purchase price
 StockTooLow=Stock too low
 StockLowerThanLimit=Stock lower than alert limit (%s)
 EnhancedValue=Value
-PMPValue=Weighted average price
-PMPValueShort=WAP
 EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
@@ -251,7 +249,10 @@ SelectAStockMovementFileToImport=select a stock movement file to import
 InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
 LabelOfInventoryMovemement=Inventory %s
 ReOpen=Reopen
-ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock to the real qty you entered into the inventory.
 ObjectNotFound=%s not found
 MakeMovementsAndClose=Generate movements and close
 AutofillWithExpected=Fill real quantity with expected quantity
+ShowAllBatchByDefault=By default, show batch details on product "stock" tab
+CollapseBatchDetailHelp=You can set batch detail default display in stocks module configuration
+FieldCannotBeNegative=Field "%s" cannot be negative
diff --git a/htdocs/langs/ne_NP/ticket.lang b/htdocs/langs/ne_NP/ticket.lang
index df73daf4a0d..1da32a5a99e 100644
--- a/htdocs/langs/ne_NP/ticket.lang
+++ b/htdocs/langs/ne_NP/ticket.lang
@@ -304,7 +304,7 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
-BoxTicketType=Number of open tickets by type
+BoxTicketType=Distribution of open tickets by type
 BoxTicketSeverity=Number of open tickets by severity
 BoxNoTicketSeverity=No tickets opened
 BoxTicketLastXDays=Number of new tickets by days the last %s days
diff --git a/htdocs/langs/nl_BE/accountancy.lang b/htdocs/langs/nl_BE/accountancy.lang
index f3c0725063f..2322337bcfc 100644
--- a/htdocs/langs/nl_BE/accountancy.lang
+++ b/htdocs/langs/nl_BE/accountancy.lang
@@ -10,6 +10,7 @@ ACCOUNTING_EXPORT_PREFIX_SPEC=Geef de prefix voor het bestand
 Journals=Dagboeken
 JournalFinancial=Financiële dagboeken
 BackToChartofaccounts=Geef kaart van accounts terug
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 Selectchartofaccounts=Selecteer actieve grafieken van accounts
 Addanaccount=Voeg een boekhoudkundige rekening toe
 AccountAccounting=Boekhoudkundige rekening
@@ -20,7 +21,6 @@ UpdateMvts=Wijzigen van een transactie
 Processing=Verwerken
 EndProcessing=Verwerking beëindigd
 Lineofinvoice=Factuur lijn
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
 Docdate=Datum
 Docref=Artikelcode
 TotalVente=Totaal omzet voor belastingen
diff --git a/htdocs/langs/nl_BE/agenda.lang b/htdocs/langs/nl_BE/agenda.lang
index 264f28e932a..9dba2d1d3f8 100644
--- a/htdocs/langs/nl_BE/agenda.lang
+++ b/htdocs/langs/nl_BE/agenda.lang
@@ -38,6 +38,5 @@ AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> om de uitvoer van acties te beperken
 AgendaUrlOptions4=<b>logint=%s</b> om de uitvoer van acties te beperken die aan de gebruiker <b>%s</b> is toegewezen. (eigenaar en anderen).
 AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> om de uitvoer te beperken tot acties die zijn gekoppeld aan project <b>__PROJECT_ID__</b>.
 AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> om automatische gebeurtenis uit te sluiten.
-AgendaShowBirthdayEvents=Toon verjaardagen van contacten
 AgendaHideBirthdayEvents=Verberg verjaardagen van contacten
 ConfirmCloneEvent=Weet u zeker als u event <b>%s</b> wilt klonen?
diff --git a/htdocs/langs/nl_BE/cashdesk.lang b/htdocs/langs/nl_BE/cashdesk.lang
index 9019947e4b7..36c3d34f642 100644
--- a/htdocs/langs/nl_BE/cashdesk.lang
+++ b/htdocs/langs/nl_BE/cashdesk.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - cashdesk
+CashDeskBankCash=Bankrekening (cash)
 CashDeskBankCheque=Bankrekening (cheque)
 CashdeskShowServices=Verkoop van diensten
 SellFinished=Verkoop afgerond
diff --git a/htdocs/langs/nl_BE/help.lang b/htdocs/langs/nl_BE/help.lang
new file mode 100644
index 00000000000..6388b30f4d9
--- /dev/null
+++ b/htdocs/langs/nl_BE/help.lang
@@ -0,0 +1,10 @@
+# Dolibarr language file - Source file is en_US - help
+CommunitySupport=Forum en Wiki ondersteuning
+EMailSupport=E-mailondersteuning
+ToSeeListOfAvailableRessources=Om contact op te nemen zie de beschikbare bronnen:
+TypeSupportCommercial=Commercieel (betaald)
+TypeOfHelp=Soort
+Efficiency=Efficiëntie
+TypeHelpOnly=Alleen Hulp
+TypeHelpDev=Hulp & Ontwikkeling
+SeeOfficalSupport=Voor officiële Dolibarr ondersteuning in uw taal: <br><b><a href="%s" target="_blank">%s</a></b>
diff --git a/htdocs/langs/nl_BE/mrp.lang b/htdocs/langs/nl_BE/mrp.lang
deleted file mode 100644
index a8ff138755b..00000000000
--- a/htdocs/langs/nl_BE/mrp.lang
+++ /dev/null
@@ -1,6 +0,0 @@
-# Dolibarr language file - Source file is en_US - mrp
-BillOfMaterials=Bill of Material
-NewBOM=New bill of material
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
diff --git a/htdocs/langs/nl_BE/orders.lang b/htdocs/langs/nl_BE/orders.lang
index 29099451dfa..044a058f178 100644
--- a/htdocs/langs/nl_BE/orders.lang
+++ b/htdocs/langs/nl_BE/orders.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - orders
 OrderToProcess=Te verwerken bestelling
 NewOrder=Nieuwe bestelling
+NewSupplierOrderShort=Nieuwe bestelling
 MakeOrder=Bestelling ingeven
 StatusOrderDraftShort=Ontwerp bestelling
 StatusOrderSentShort=In uitvoering
diff --git a/htdocs/langs/nl_BE/other.lang b/htdocs/langs/nl_BE/other.lang
index 1ffbb0bb385..6c09e24041b 100644
--- a/htdocs/langs/nl_BE/other.lang
+++ b/htdocs/langs/nl_BE/other.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - other
+Tools=Gereedschap
+TMenuTools=Gereedschap
 Notify_COMPANY_CREATE=Third party aangemaakt
 FileIsTooBig=Bestanden zijn te groot
 WebsiteSetup=Setup van de module website
diff --git a/htdocs/langs/nl_BE/paybox.lang b/htdocs/langs/nl_BE/paybox.lang
new file mode 100644
index 00000000000..01c383c1c23
--- /dev/null
+++ b/htdocs/langs/nl_BE/paybox.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - paybox
+YouWillBeRedirectedOnPayBox=U wordt doorverwezen naar een beveiligde Paybox pagina om uw credit card informatie in te voeren
diff --git a/htdocs/langs/nl_BE/stocks.lang b/htdocs/langs/nl_BE/stocks.lang
index b109d7397ce..3ab405c6866 100644
--- a/htdocs/langs/nl_BE/stocks.lang
+++ b/htdocs/langs/nl_BE/stocks.lang
@@ -1,5 +1,7 @@
 # Dolibarr language file - Source file is en_US - stocks
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
 QtyToDispatchShort=Aantal te verzenden
+OpenInternal=Open only for internal actions
 inventoryDraft=Actief
 inventoryConfirmCreate=Aanmaken
 inventoryDeleteLine=Verwijder lijn
diff --git a/htdocs/langs/nl_NL/accountancy.lang b/htdocs/langs/nl_NL/accountancy.lang
index ca264b10109..472f2ddf976 100644
--- a/htdocs/langs/nl_NL/accountancy.lang
+++ b/htdocs/langs/nl_NL/accountancy.lang
@@ -131,7 +131,7 @@ InvoiceLinesDone=Gekoppelde factuurregels
 ExpenseReportLines=Te koppelen kostenboekingen
 ExpenseReportLinesDone=Gekoppelde kostenboekingen
 IntoAccount=Koppel regel aan grootboekrekening
-TotalForAccount=Total accounting account
+TotalForAccount=Totaal grootboekrekening
 
 
 Ventilate=Koppelen
@@ -158,7 +158,7 @@ ACCOUNTING_LENGTH_AACCOUNT=Lengte van de grootboekrekeningen van derden (als u h
 ACCOUNTING_MANAGE_ZERO=Sta toe om een verschillend aantal nullen aan het einde van een account te beheren. Nodig door sommige landen (zoals Zwitserland). Indien uitgeschakeld (standaard), kunt u de volgende twee parameters instellen om de toepassing te vragen virtuele nullen toe te voegen.
 BANK_DISABLE_DIRECT_INPUT=Rechtstreeks boeken van transactie in bankboek uitzetten
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Schakel concept export van het journaal in
-ACCOUNTANCY_COMBO_FOR_AUX=Combo-lijst inschakelen voor dochteronderneming-account (kan traag zijn als u veel externe partijen hebt)
+ACCOUNTANCY_COMBO_FOR_AUX=Schakel combolijst in voor dochteronderneming-account (kan traag zijn als je veel derden hebt, verbreek de mogelijkheid om op een deel van de waarde te zoeken)
 ACCOUNTING_DATE_START_BINDING=Definieer een startdatum voor het koppelen en doorboeken naar de boekhouding. Transacties voor deze datum worden niet doorgeboekt naar de boekhouding.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Selecteer bij boekhoudkundige overdracht standaard periodeweergave
 
@@ -202,14 +202,14 @@ Docref=Reference
 LabelAccount=Label account
 LabelOperation=Werking label
 Sens=Richting
-AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you have received<br>For an accounting account of a supplier, use Debit to record a payment you made
+AccountingDirectionHelp=Voor een boekhoudkundige rekening van een klant gebruikt u Credit om een betaling te registreren die u hebt ontvangen <br> Gebruik voor een boekhoudkundige rekening van een leverancier Debet om een door u gedane betaling te registreren
 LetteringCode=Aflettercode
 Lettering=Afletteren
 Codejournal=Journaal
 JournalLabel=Journaal label
 NumPiece=Boekingstuk
 TransactionNumShort=Transactienummer
-AccountingCategory=Custom group
+AccountingCategory=Aangepaste groep
 GroupByAccountAccounting=Groeperen op grootboekrekening
 GroupBySubAccountAccounting=Groepeer op subgrootboekrekening
 AccountingAccountGroupsDesc=Hier kunt u enkele grootboekrekening-groepen definiëren. Deze worden gebruikt voor gepersonaliseerde boekhoudrapporten.
@@ -297,7 +297,7 @@ NoNewRecordSaved=Geen posten door te boeken
 ListOfProductsWithoutAccountingAccount=Overzicht van producten welke nog niet zijn gekoppeld aan een grootboekrekening
 ChangeBinding=Wijzig koppeling
 Accounted=Geboekt in grootboek
-NotYetAccounted=Not yet accounted in the ledger
+NotYetAccounted=Nog niet doorgeboekt in het grootboek
 ShowTutorial=Handleiding weergeven
 NotReconciled=Niet afgestemd
 WarningRecordWithoutSubledgerAreExcluded=Pas op, alle bewerkingen zonder gedefinieerde subgrootboekrekening worden gefilterd en uitgesloten van deze weergave
@@ -328,6 +328,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Schakel het koppelen en doorboeken naar
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Schakel het koppelen en doorboeken naar de boekhouding van onkostendeclaraties uit (met onkostendeclaraties wordt geen rekening gehouden in de boekhouding)
 
 ## Export
+NotifiedExportDate=Notified export date (modification of the entries will not be possible)
+NotifiedValidationDate=Validation of the entries (modification or deletion of the entries will not be possible)
+ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=Journaal exporteren
 Modelcsv=Export model
 Selectmodelcsv=Selecteer een export model
@@ -402,25 +405,25 @@ UseMenuToSetBindindManualy=Regels die nog niet zijn gebonden, gebruik het menu <
 
 ## Import
 ImportAccountingEntries=Boekingen
-ImportAccountingEntriesFECFormat=Accounting entries - FEC format
-FECFormatJournalCode=Code journal (JournalCode)
-FECFormatJournalLabel=Label journal (JournalLib)
-FECFormatEntryNum=Piece number (EcritureNum)
-FECFormatEntryDate=Piece date (EcritureDate)
-FECFormatGeneralAccountNumber=General account number (CompteNum)
-FECFormatGeneralAccountLabel=General account label (CompteLib)
-FECFormatSubledgerAccountNumber=Subledger account number (CompAuxNum)
-FECFormatSubledgerAccountLabel=Subledger account number (CompAuxLib)
-FECFormatPieceRef=Piece ref (PieceRef)
-FECFormatPieceDate=Piece date creation (PieceDate)
-FECFormatLabelOperation=Label operation (EcritureLib)
-FECFormatDebit=Debit (Debit)
-FECFormatCredit=Credit (Credit)
-FECFormatReconcilableCode=Reconcilable code (EcritureLet)
-FECFormatReconcilableDate=Reconcilable date (DateLet)
-FECFormatValidateDate=Piece date validated (ValidDate)
-FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
-FECFormatMulticurrencyCode=Multicurrency code (Idevise)
+ImportAccountingEntriesFECFormat=Boekhoudkundige gegevens - FEC-formaat
+FECFormatJournalCode=Journaalcode (JournalCode)
+FECFormatJournalLabel=Journaal naam (JournalLib)
+FECFormatEntryNum=Stuknummer (EcritureNum)
+FECFormatEntryDate=Stukdatum (EcritureDate)
+FECFormatGeneralAccountNumber=Algemeen rekeningnummer (CompteNum)
+FECFormatGeneralAccountLabel=Algemeen accountlabel (CompteLib)
+FECFormatSubledgerAccountNumber=Subgrootboek-rekeningnummer (CompAuxNum)
+FECFormatSubledgerAccountLabel=Subgrootboek-rekeningnummer (CompAuxLib)
+FECFormatPieceRef=Stukreferentie (PieceRef)
+FECFormatPieceDate=Aanmaak van stukdatum (PieceDate)
+FECFormatLabelOperation=Labelbewerking (EcritureLib)
+FECFormatDebit=Debet (Debet)
+FECFormatCredit=Krediet (Krediet)
+FECFormatReconcilableCode=Aflettercode (EcritureLet)
+FECFormatReconcilableDate=Afletterdatum (DateLet)
+FECFormatValidateDate=Stukdatum gevalideerd (ValidDate)
+FECFormatMulticurrencyAmount=Bedrag in meerdere valuta (Montantdevise)
+FECFormatMulticurrencyCode=Multivalutacode (Idevise)
 
 DateExport=Exportdatum
 WarningReportNotReliable=Waarschuwing, dit rapport is niet gebaseerd op het grootboek, dus bevat het niet de transactie die handmatig in het grootboek is gewijzigd. Als uw journalisatie up-to-date is, is de weergave van de boekhouding nauwkeuriger.
diff --git a/htdocs/langs/nl_NL/admin.lang b/htdocs/langs/nl_NL/admin.lang
index bce871a5a72..6175d311b9f 100644
--- a/htdocs/langs/nl_NL/admin.lang
+++ b/htdocs/langs/nl_NL/admin.lang
@@ -37,7 +37,7 @@ UnlockNewSessions=Verwijder sessieblokkering
 YourSession=Uw sessie
 Sessions=Gebruikerssessies
 WebUserGroup=Webserver gebruiker / groep
-PermissionsOnFiles=Permissions on files
+PermissionsOnFiles=Machtigingen voor bestanden
 PermissionsOnFilesInWebRoot=Machtigingen voor bestanden in de hoofdmap van het web
 PermissionsOnFile=Rechten op bestand %s
 NoSessionFound=Uw PHP-configuratie lijkt geen lijst van actieve sessies toe te staan. De map die wordt gebruikt om sessies op te slaan ( <b>%s</b> ) kan worden beschermd (bijvoorbeeld door OS machtigingen of door PHP richtlijn open_basedir).
@@ -63,8 +63,8 @@ IfModuleEnabled=Opmerking: Ja, is alleen effectief als module <b>%s</b> is geact
 RemoveLock=Verwijder / hernoem het bestand <b>%s</b> als het bestaat, om het gebruik van de update / installatie-tool toe te staan.
 RestoreLock=Herstel het bestand <b>%s</b> , met alleen leesrechten, om verder gebruik van de update / installatie-tool uit te schakelen.
 SecuritySetup=Beveiligingsinstellingen
-PHPSetup=PHP setup
-OSSetup=OS setup
+PHPSetup=PHP-configuratie
+OSSetup=OS instellen
 SecurityFilesDesc=Definieer hier de opties met betrekking tot beveiliging bij het uploaden van bestanden.
 ErrorModuleRequirePHPVersion=Fout, deze module vereist PHP versie %s of hoger.
 ErrorModuleRequireDolibarrVersion=Fout, deze module vereist Dolibarr versie %s of hoger.
@@ -157,7 +157,7 @@ SystemToolsAreaDesc=Dit gebied biedt beheerfuncties. Gebruik het menu om de gewe
 Purge=Leegmaken
 PurgeAreaDesc=Op deze pagina kunt u alle bestanden verwijderen die zijn gegenereerd of opgeslagen door Dolibarr (tijdelijke bestanden of alle bestanden in de map <b>%s</b> ). Het gebruik van deze functie is normaal gesproken niet nodig. Het wordt aangeboden als een oplossing voor gebruikers van wie Dolibarr wordt gehost door een provider die geen machtigingen biedt voor het verwijderen van bestanden die zijn gegenereerd door de webserver.
 PurgeDeleteLogFile=Verwijder logbestanden <b>%s</b> aangemaakt door de Syslog module (Geen risico op verlies van gegevens)
-PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Parameter can be 'tempfilesold', 'logfiles' or both 'tempfilesold+logfiles'. Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFiles=Verwijder alle logbestanden en tijdelijke bestanden (geen risico op gegevensverlies). Parameter kan 'tempfilesold', 'logfiles' of beide 'tempfilesold+logfiles' zijn. Opmerking: tijdelijke bestanden worden alleen verwijderd als de tijdelijke map meer dan 24 uur geleden is gemaakt.
 PurgeDeleteTemporaryFilesShort=Verwijder logboek en tijdelijke bestanden
 PurgeDeleteAllFilesInDocumentsDir=Verwijder alle bestanden in de map: <b>%s</b> . <br> Hiermee worden alle gegenereerde documenten met betrekking tot elementen (relaties, facturen, enz ...), bestanden die zijn geüpload naar de ECM module, database back-up dumps en tijdelijke bestanden verwijderd.
 PurgeRunNow=Nu opschonen
@@ -221,8 +221,8 @@ NotCompatible=Deze module lijkt niet compatibel met uw Dolibarr %s (Min %s - Max
 CompatibleAfterUpdate=Deze module vereist een update van uw Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=Bekijk in winkel
 SeeSetupOfModule=Zie setup van module%s
+SetOptionTo=Stel optie <b> %s </b> in op %s
 Updated=Bijgewerkt
-Nouveauté=Nieuwigheid
 AchatTelechargement=Kopen / Downloaden
 GoModuleSetupArea=Ga naar het gedeelte Module-instellingen om een nieuwe module te implementeren/installeren: <a href="%s">%s</a> .
 DoliStoreDesc=DoliStore, de officiële markt voor externe Dolibarr ERP / CRM modules.
@@ -235,7 +235,7 @@ BoxesAvailable=Beschikbare widgets
 BoxesActivated=Widgets geactiveerd
 ActivateOn=Activeren op
 ActiveOn=Geactiveerd op
-ActivatableOn=Activatable on
+ActivatableOn=Activeerbaar per
 SourceFile=Bronbestand
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Alleen beschikbaar als JavaScript en AJAX niet zijn uitgeschakeld
 Required=Verplicht
@@ -351,10 +351,10 @@ LastActivationAuthor=Laatste activeringsauteur
 LastActivationIP=Laatste activering IP-adres
 UpdateServerOffline=Updateserver offline
 WithCounter=Beheer een teller
-GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first %s. <br><b>{000000@x}</b> same as the previous one but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then the sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated to the customer. This counter dedicated to customer is reset at same time as the global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
+GenericMaskCodes=U kunt elk nummeringsmasker invoeren. In dit masker kunnen de volgende tags worden gebruikt: <br> <b> {000000} </b> komt overeen met een nummer dat op elke %s wordt verhoogd. Voer zoveel nullen in als de gewenste lengte van de teller. De teller wordt aangevuld met nullen van links om evenveel nullen te hebben als het masker. <br> <b> {000000+000} </b> hetzelfde als de vorige, maar een offset die overeenkomt met het nummer rechts van het + teken wordt toegepast vanaf de eerste %s. <br> <b> {000000@x} </b> hetzelfde als de vorige, maar de teller wordt op nul gezet wanneer maand x is bereikt (x tussen 1 en 12, of 0 om de eerste maanden van het fiscale jaar te gebruiken die in uw configuratie zijn gedefinieerd, of 99 tot elke maand op nul worden gezet). Als deze optie wordt gebruikt en x is 2 of hoger, dan is ook de reeks {yy}{mm} of {yyyy}{mm} vereist. <br> <b> {dd} </b> dag (01 tot 31). <br> <b> {mm} </b> maand (01 tot 12). <br> <b> {yy} </b> , <b> {yyyy} </b> of <b> {y} 217f 4b739f. <br>
+GenericMaskCodes2= <b> {cccc} </b> de klantcode op n tekens <br> <b> {cccc000} </b> de klant wordt gevolgd door een teller. Deze teller voor de klant wordt tegelijk met de globale teller gereset. <br> <b> {tttt} </b> De code van derde partij type op n karakters (zie menu Home - Instellingen - Woordenboek - Soorten derde partijen). Als u deze tag toevoegt, is de teller voor elk type derde partij anders. <br>
 GenericMaskCodes3=Alle andere karakters in het masker zullen intact blijven.<br>Spaties zijn niet toegestaan.<br>
-GenericMaskCodes3EAN=All other characters in the mask will remain intact (except * or ? in 13th position in EAN13).<br>Spaces are not allowed.<br>In EAN13, the last character after the last } in 13th position should be * or ? . It will be replaced by the calculated key.<br>
+GenericMaskCodes3EAN=Alle andere tekens in het masker blijven intact (behalve * of ? op de 13e positie in EAN13). <br> Spaties zijn niet toegestaan. <br> In EAN13 moet het laatste teken na de laatste } op de 13e positie * of ? . Deze wordt vervangen door de berekende sleutel. <br>
 GenericMaskCodes4a=<u>Voorbeeld op de 99e %s van relaties TheCompany, met datum 2007-01-31: </u><br>
 GenericMaskCodes4b=<u>Voorbeeld van een Klant gecreëerd op 2007-03-01:</u><br>
 GenericMaskCodes4c=<u>Voorbeeld op product gemaakt op 2007-03-01:</u><br>
@@ -399,6 +399,7 @@ SecurityToken=Sleutel tot URL beveiligen
 NoSmsEngine=Geen SMS afzender beheerder beschikbaar. Een SMS afzender beheerder is niet geïnstalleerd met de standaarddistributie omdat deze afhankelijk zijn van een externe leverancier, maar u kunt er enkele vinden op %s
 PDF=PDF
 PDFDesc=Algemene opties voor het genereren van PDF's
+PDFOtherDesc=PDF-optie specifiek voor sommige modules
 PDFAddressForging=Regels voor adres sectie
 HideAnyVATInformationOnPDF=Verberg alle informatie met betrekking tot omzetbelasting / Btw
 PDFRulesForSalesTax=Regels voor omzet-belasting/Btw
@@ -449,8 +450,8 @@ ExtrafieldParamHelpPassword=Dit veld leeg laten betekent dat deze waarde zonder
 ExtrafieldParamHelpselect=Lijst met waarden moeten regels zijn met opmaaksleutel, waarde (waar sleutel niet '0' kan zijn) <br><br> bijvoorbeeld: <br> 1, waarde1 <br> 2, value2 <br> code3, waarde3 <br> ... <br><br> Om de lijst afhankelijk van een andere aanvullende attributenlijst te krijgen: <br> 1, waarde1 | options_ <i>parent_list_code</i> : parent_key <br> 2, <i>value2</i> | options_ <i>parent_list_code</i> : parent_key <br><br> Om de lijst afhankelijk van een andere lijst te krijgen: <br> 1, waarde1 | <i>parent_list_code</i> : parent_key <br> 2, waarde2 | <i>parent_list_code</i> : parent_key
 ExtrafieldParamHelpcheckbox=Lijst met waarden moeten regels zijn met opmaaksleutel, waarde (waar sleutel niet '0' kan zijn) <br><br> bijvoorbeeld: <br> 1, waarde1 <br> 2, value2 <br> 3, waarde3 <br> ...
 ExtrafieldParamHelpradio=Lijst met waarden moeten regels zijn met opmaaksleutel, waarde (waar sleutel niet '0' kan zijn) <br><br> bijvoorbeeld: <br> 1, waarde1 <br> 2, value2 <br> 3, waarde3 <br> ...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarly a primary int key<br>- filtersql is a SQL condition. It can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<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::filtersql<br>Example: c_typent:libelle:id::filtersql<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
+ExtrafieldParamHelpsellist=Lijst met waarden komt uit een tabel <br> Syntaxis: table_name:label_field:id_field::filtersql <br> Voorbeeld: c_typent:libelle:id::filtersql <br> <br> - id sarly19 a primary is int neces Het kan een eenvoudige test zijn (bijv. active=1) om alleen de actieve waarde <br> weer te geven. U kunt ook $ID$ gebruiken in het filter, wat de huidige id is van het huidige object <br> Om een SELECT in het filter te gebruiken, gebruikt u het trefwoord $SEL$ om bypass anti-injectie bescherming. <br> als u op extravelden wilt filteren, gebruik dan de syntaxis extra.fieldcode=... (waarbij veldcode de code van extrafield is) <br> <br> Om de lijst te laten afhangen van een andere complementaire attributenlijst: <br> c_typent:libelle_:id:options_ <i> parent_list_code </i> |parent_column:filter <br> <br> Om ervoor te zorgen dat de lijst afhankelijk is van een andere lijst: <br> c_typent:libelle_id: a049271e8364_parent |
+ExtrafieldParamHelpchkbxlst=Lijst met waarden komt uit een tabel <br> Syntaxis: table_name:label_field:id_field::filtersql <br> Voorbeeld: c_typent:libelle:id::filtersql <br> <br> <br> filter kan een eenvoudige actieve waarde zijn kan ook $ID$ in filter gebruiken, wat de huidige id van huidig object is <br> Om een SELECT in filter uit te voeren, gebruik $SEL$ <br> als u op extravelden wilt filteren, gebruik dan de syntaxis extra.fieldcode=... (waarbij veldcode de code of extrafield) <br> <br> Om de lijst te laten afhangen van een andere complementaire attributenlijst: <br> c_typent:libelle:id:options_ <i> parent_list_code </i> | libelle:id: <i> parent_list_code </i> |parent_column:filter
 ExtrafieldParamHelplink=Parameters moeten Objectnaam: Classpath<br> Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Blijf leeg voor een eenvoudig scheidingsteken <br> Stel dit in op 1 voor een samenvouwend scheidingsteken (standaard geopend voor nieuwe sessie, dan wordt de status behouden voor elke gebruikerssessie) <br> Stel dit in op 2 voor een samenvouwend scheidingsteken (standaard samengevouwen voor nieuwe sessie, dan wordt de status behouden voor elke gebruikerssessie)
 LibraryToBuildPDF=Gebruikte library voor generen PDF
@@ -547,7 +548,7 @@ Module40Desc=Leveranciers en inkoopbeheer (inkooporders en facturering van lever
 Module42Name=Debug logs
 Module42Desc=Mogelijkheden voor een log (file,syslog, ...). Deze log-files zijn voor technische/debug ondersteuning.
 Module43Name=Foutopsporingsbalk
-Module43Desc=A tool for developper adding a debug bar in your browser.
+Module43Desc=Een hulpmiddel voor ontwikkelaars die een foutopsporingsbalk in uw browser toevoegen.
 Module49Name=Editors
 Module49Desc=Editorbeheer
 Module50Name=Producten
@@ -561,7 +562,7 @@ Module53Desc=Dienstenbeheer
 Module54Name=Contracten/Abonnementen
 Module54Desc=Beheer van contracten (diensten of terugkerende abonnementen)
 Module55Name=Streepjescodes
-Module55Desc=Streepjescodesbeheer
+Module55Desc=Barcode or QR code management
 Module56Name=Betaling via overschrijving
 Module56Desc=Beheer van de betaling van leveranciers door middel van overboekingsopdrachten. Het omvat het genereren van SEPA-bestanden voor Europese landen.
 Module57Name=Betalingen via automatische incasso
@@ -647,13 +648,13 @@ Module2900Desc=Capaciteitconversie GeoIP Maxmind
 Module3200Name=Niet aanpasbare archieven
 Module3200Desc=Schakel een niet aanpasbaar logboek van zakelijke evenementen in. Evenementen worden in realtime gearchiveerd. Het logboek is een alleen-lezen tabel met gekoppelde gebeurtenissen die kunnen worden geëxporteerd. Deze module kan voor sommige landen verplicht zijn.
 Module3400Name=Sociale netwerken
-Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
+Module3400Desc=Schakel Social Network-velden in voor derden en adressen (skype, twitter, facebook, ...).
 Module4000Name=HRM
 Module4000Desc=Human resources management (afdelingsbeheer, werknemerscontracten en sentiment)
 Module5000Name=Multi-bedrijf
 Module5000Desc=Hiermee kunt meerdere bedrijven beheren in Dolibarr
-Module6000Name=Inter-modules Workflow
-Module6000Desc=Workflow management between different modules (automatic creation of object and/or automatic status change)
+Module6000Name=Workflow tussen modules
+Module6000Desc=Workflowbeheer tussen verschillende modules (automatisch aanmaken van object en/of automatische statuswijziging)
 Module10000Name=Websites
 Module10000Desc=Maak websites (openbaar) met een WYSIWYG-editor. Dit is een webmaster of ontwikkelaar gericht CMS (kennis van HTML- en CSS-taal is gewenst). Stel uw webserver (Apache, Nginx, ...) in zodat deze naar de speciale Dolibarr-directory verwijst om deze online op internet te hebben met uw eigen domeinnaam.
 Module20000Name=Verlof aanvraagbeheer
@@ -814,8 +815,8 @@ PermissionAdvanced253=Creëer / wijzig de rechten van internet / externe gebruik
 Permission254=Verwijderen of uitschakelen van andere gebruikers
 Permission255=Wachtwoord andere gebruikers wijzigen
 Permission256=Andere gebruikers verwijderen of uitschakelen
-Permission262=Extend access to all third parties AND their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
-Permission263=Extend access to all third parties WITHOUT their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission262=Verleng de toegang tot alle derden EN hun objecten (niet alleen derden waarvoor de gebruiker een verkoopvertegenwoordiger is). <br> Niet effectief voor externe gebruikers (altijd beperkt tot zichzelf voor voorstellen, bestellingen, facturen, contracten, enz.). <br> Niet effectief voor projecten (alleen regels voor projectmachtigingen, zichtbaarheid en toewijzingskwesties).
+Permission263=Verleng de toegang tot alle derden ZONDER hun objecten (niet alleen derden waarvoor de gebruiker een verkoopvertegenwoordiger is). <br> Niet effectief voor externe gebruikers (altijd beperkt tot zichzelf voor voorstellen, bestellingen, facturen, contracten, enz.). <br> Niet effectief voor projecten (alleen regels voor projectmachtigingen, zichtbaarheid en toewijzingskwesties).
 Permission271=Lees CA
 Permission272=Facturen inzien
 Permission273=Facturen uitgeven
@@ -848,10 +849,10 @@ Permission402=Creëren / wijzigen kortingen
 Permission403=Kortingen valideren
 Permission404=Kortingen verwijderen
 Permission430=Gebruik foutopsporingsbalk
-Permission511=Inlezen betalingen van salarissen (van jou en ondergeschikten)
-Permission512=Creëer / wijzig betalingen van salarissen
-Permission514=Betalingen van salarissen verwijderen
-Permission517=Inlezen betalingen van salarissen van iedereen
+Permission511=Read salaries and payments (yours and subordinates)
+Permission512=Create/modify salaries and payments
+Permission514=Delete salaries and payments
+Permission517=Read salaries and payments everybody
 Permission519=Export salarissen
 Permission520=Lees Leningen
 Permission522=Creëer/wijzigen leningen
@@ -965,6 +966,8 @@ Permission23003=Verwijder geplande taak
 Permission23004=Voer geplande taak uit
 Permission50101=Gebruik kassaonderdeel (SimplePOS)
 Permission50151=Gebruik verkooppunt (TakePOS)
+Permission50152=Verkoopregels bewerken
+Permission50153=Bestelde verkoopregels bewerken
 Permission50201=Lees transacties
 Permission50202=Importeer transacties
 Permission50330=Lees objecten van Zapier
@@ -1039,11 +1042,12 @@ DictionaryMeasuringUnits=Meeteenheden
 DictionarySocialNetworks=Sociale netwerken
 DictionaryProspectStatus=Prospectstatus van bedrijven
 DictionaryProspectContactStatus=Prospect-status voor contacten
-DictionaryHolidayTypes=Soorten verlof
+DictionaryHolidayTypes=Verlof - Soorten verlof
 DictionaryOpportunityStatus=Leadstatus voor project / lead
 DictionaryExpenseTaxCat=Onkostenoverzicht - Vervoerscategorieën
 DictionaryExpenseTaxRange=Onkostenoverzicht - bereik per transportcategorie
 DictionaryTransportMode=Intracomm rapport - Transportmodus
+DictionaryBatchStatus=Status product partij/serie kwaliteitscontrole
 TypeOfUnit=Type eenheid
 SetupSaved=Instellingen opgeslagen
 SetupNotSaved=Installatie niet opgeslagen
@@ -1160,7 +1164,7 @@ DoNotSuggestPaymentMode=Geen betalingswijze voorstellen
 NoActiveBankAccountDefined=Geen actieve bankrekening ingesteld
 OwnerOfBankAccount=Eigenaar van bankrekening %s
 BankModuleNotActive=Bankrekeningen module niet ingeschakeld
-ShowBugTrackLink=Define the link "<strong>%s</strong>" (empty to not display this link, 'github' for the link to the Dolibarr project or define directly an url 'https://...')
+ShowBugTrackLink=Definieer de link " <strong> %s </strong> " (leeg om deze link niet weer te geven, 'github' voor de link naar het Dolibarr-project of definieer direct een url 'https://...')
 Alerts=Kennisgevingen
 DelaysOfToleranceBeforeWarning=Vertraging voordat een waarschuwing wordt weergegeven voor:
 DelaysOfToleranceDesc=Stel de vertraging in voordat een waarschuwingspictogram %s op het scherm wordt weergegeven voor het late element.
@@ -1185,9 +1189,9 @@ SetupDescription2=De volgende twee secties zijn verplicht (de twee eerste vermel
 SetupDescription3= <a href="%s"> %s -> %s </a> <br> <br> Basisparameters die worden gebruikt om het standaardgedrag van uw toepassing aan te passen (bijvoorbeeld voor landgerelateerde functies).
 SetupDescription4= <a href="%s"> %s -> %s </a> <br> <br> Dit programma is een samenstelling van vele modules / applicaties. De modules die betrekking hebben op uw behoeften moeten worden ingeschakeld en geconfigureerd. Menu-items verschijnen met de activering van deze modules.
 SetupDescription5=Andere items in het Setup-menu beheren optionele parameters.
-AuditedSecurityEvents=Security events that are audited
-NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
-Audit=Audit
+AuditedSecurityEvents=Beveiligingsgebeurtenissen die worden gecontroleerd
+NoSecurityEventsAreAduited=Er worden geen beveiligingsgebeurtenissen gecontroleerd. U kunt ze inschakelen via menu %s
+Audit=Beveiligingsgebeurtenissen
 InfoDolibarr=Over Dolibarr
 InfoBrowser=Over Browser
 InfoOS=Over OS
@@ -1254,8 +1258,8 @@ RunningUpdateProcessMayBeRequired=Het uitvoeren van het upgradeproces lijkt vere
 YouMustRunCommandFromCommandLineAfterLoginToUser=U dient dit commando vanaf de opdrachtregel uit te voeren, na ingelogd te zijn als gebruiker <b>%s</b>. Of u dient het commando uit te breiden door de -W optie mee te geven zodat u het wachtwoord kunt opgeven.
 YourPHPDoesNotHaveSSLSupport=SSL functies niet beschikbaar in uw PHP installatie
 DownloadMoreSkins=Meer uiterlijkthema's om te downloaden
-SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
-SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
+SimpleNumRefModelDesc=Retourneert het referentienummer in de notatie %syymm-nnnn waarbij yy het jaar is, mm de maand en nnnn een opeenvolgend automatisch oplopend getal is zonder reset
+SimpleNumRefNoDateModelDesc=Retourneert het referentienummer in de notatie %s-nnnn waarbij nnnn een opeenvolgend automatisch oplopend getal is zonder reset
 ShowProfIdInAddress=Toon professionele id met adressen
 ShowVATIntaInAddress=Verberg intracommunautair btw-nummer met adressen
 TranslationUncomplete=Onvolledige vertaling
@@ -1273,7 +1277,7 @@ MAIN_PROXY_HOST=Proxyserver: naam/adres
 MAIN_PROXY_PORT=Proxyserver: poort
 MAIN_PROXY_USER=Proxyserver: Inloggen/Gebruiker
 MAIN_PROXY_PASS=Proxy-server: wachtwoord
-DefineHereComplementaryAttributes=Define any additional / custom attributes that must be added to: %s
+DefineHereComplementaryAttributes=Definieer eventuele aanvullende / aangepaste kenmerken die moeten worden toegevoegd aan: %s
 ExtraFields=Aanvullende attributen
 ExtraFieldsLines=Aanvullende kenmerken (lijnen)
 ExtraFieldsLinesRec=Aanvullende attributen (sjablonen factuurregels)
@@ -1319,9 +1323,12 @@ ConditionIsCurrently=Voorwaarde is momenteel %s
 YouUseBestDriver=U gebruikt stuurprogramma %s, het beste stuurprogramma dat momenteel beschikbaar is.
 YouDoNotUseBestDriver=U gebruikt stuurprogramma %s maar stuurprogramma %s wordt aanbevolen.
 NbOfObjectIsLowerThanNoPb=U hebt alleen %s %s in de database. Dit vereist geen specifieke optimalisatie.
+ComboListOptim=Optimalisatie voor laden van combinatielijsten
 SearchOptim=Zoekmachine optimalisatie
-YouHaveXObjectUseSearchOptim=U hebt %s %s in de database. U kunt de constante %s toevoegen aan 1 in Home-Instellingen-Andere instellingen. Beperk de zoekopdracht tot het begin van strings, waardoor de database indexen kan gebruiken en u onmiddellijk antwoord zou moeten krijgen.
-YouHaveXObjectAndSearchOptimOn=U hebt %s %s in de database en constante %s is ingesteld op 1 in Home-Setup-Other.
+YouHaveXObjectUseComboOptim=U heeft %s %s in de database. U kunt naar de configuratie van de module gaan om het laden van de combolijst bij een ingedrukte toets te activeren.
+YouHaveXObjectUseSearchOptim=U heeft %s %s in de database. U kunt de constante %s toevoegen aan 1 in Home-Setup-Other.
+YouHaveXObjectUseSearchOptimDesc=Dit beperkt het zoeken tot het begin van strings, wat het voor de database mogelijk maakt om indexen te gebruiken en u zou onmiddellijk een antwoord moeten krijgen.
+YouHaveXObjectAndSearchOptimOn=Je hebt %s %s in de database en constante %s is ingesteld op %s in Home-Setup-Other.
 BrowserIsOK=U gebruikt de webbrowser %s. Deze browser is geschikt voor beveiliging en prestaties.
 BrowserIsKO=U gebruikt de webbrowser %s. Deze browser staat bekend als een slechte keuze voor beveiliging, prestaties en betrouwbaarheid. We raden aan om Firefox, Chrome, Opera of Safari te gebruiken.
 PHPModuleLoaded=PHP component %s is geladen
@@ -1433,6 +1440,7 @@ MemberMainOptions=Hoofdopties
 AdherentLoginRequired= Beheren van een login voor elk lid
 AdherentMailRequired=E-mail vereist om een nieuw lid te maken
 MemberSendInformationByMailByDefault=Vinkvakje om een bevestigingse-mail te sturen naar leden (validatie van nieuwe abonnementen). Staat standaard aan.
+MemberCreateAnExternalUserForSubscriptionValidated=Maak een externe gebruikerslogin aan voor elk gevalideerd nieuw lidmaatschap
 VisitorCanChooseItsPaymentMode=Bezoeker kan kiezen uit beschikbare betalingsmodi
 MEMBER_REMINDER_EMAIL=Automatische herinnering <b>per e-mail</b> inschakelen voor verlopen abonnementen. Opmerking: Module <strong>%s</strong> moet zijn ingeschakeld en correct zijn ingesteld om herinneringen te verzenden.
 MembersDocModules=Documentsjablonen voor documenten die zijn gegenereerd op basis van een ledenrecord
@@ -1517,7 +1525,7 @@ LDAPFieldLoginUnix=Gebruikersnaam (Unix)
 LDAPFieldLoginExample=Voorbeeld: uid
 LDAPFilterConnection=Zoekfilter
 LDAPFilterConnectionExample=Voorbeeld: &amp; (objectClass = inetOrgPerson)
-LDAPGroupFilterExample=Example: &(objectClass=groupOfUsers)
+LDAPGroupFilterExample=Voorbeeld: &(objectClass=groupOfUsers)
 LDAPFieldLoginSamba=Gebruikersnaam (samba, activedirectory)
 LDAPFieldLoginSambaExample=Voorbeeld: samaccountname
 LDAPFieldFullname=Voornaam Achternaam
@@ -1611,13 +1619,13 @@ ServiceSetup=Services module setup
 ProductServiceSetup=Producten en Diensten modules setup
 NumberOfProductShowInSelect=Maximaal aantal producten om weer te geven in keuzelijsten met combo's (0 = geen limiet)
 ViewProductDescInFormAbility=Productbeschrijvingen weergeven in formulieren (anders weergegeven in een pop-up met knopinfo)
-DoNotAddProductDescAtAddLines=Do not add product description (from product card) on submit add lines on forms
-OnProductSelectAddProductDesc=How to use the description of the products when adding a product as a line of a document
-AutoFillFormFieldBeforeSubmit=Auto fill the description input field with the description of product
-DoNotAutofillButAutoConcat=Do not autofill the input field with description of product. Description of the product will be concatenated to the entered description automatically.
-DoNotUseDescriptionOfProdut=Description of the product will never be included into the description of lines of documents
+DoNotAddProductDescAtAddLines=Voeg geen productbeschrijving (van productkaart) toe bij het indienen van regels voor het toevoegen van formulieren
+OnProductSelectAddProductDesc=Hoe de beschrijving van de producten te gebruiken bij het toevoegen van een product als een regel van een document?
+AutoFillFormFieldBeforeSubmit=Vul het invoerveld voor de beschrijving automatisch in met de beschrijving van het product
+DoNotAutofillButAutoConcat=Vul het invoerveld niet automatisch in met de beschrijving van het product. Beschrijving van het product wordt automatisch aan de ingevoerde beschrijving gekoppeld.
+DoNotUseDescriptionOfProdut=Beschrijving van het product zal nooit worden opgenomen in de beschrijving van regels met documenten
 MergePropalProductCard=Activeer op het tabblad Bijgevoegde bestanden product / dienst een optie om product PDF-document samen te voegen met voorstel PDF azur als product / dienst in het voorstel staat
-ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
+ViewProductDescInThirdpartyLanguageAbility=Productbeschrijvingen weergeven in formulieren in de taal van de derde partij (anders in de taal van de gebruiker)
 UseSearchToSelectProductTooltip=Als u een groot aantal producten (>100.000) hebt, kunt u de snelheid verhogen door constant PRODUCT_DONOTSEARCH_ANYWHERE in te stellen op 1 in Setup-> Other. Het zoeken is dan beperkt tot het begin van de reeks.
 UseSearchToSelectProduct=Wacht tot je op een toets drukt voordat je de inhoud van de productcombo-lijst laadt (dit kan de prestaties verbeteren als je een groot aantal producten hebt, maar het is minder handig)
 SetDefaultBarcodeTypeProducts=Standaard streepjescodetype voor produkten
@@ -1749,11 +1757,11 @@ YourCompanyDoesNotUseVAT=Uw bedrijf is ingesteld als zijnde vrijgesteld van BTW
 AccountancyCode=Grootboekrekening
 AccountancyCodeSell=Boekhoudkundige afnemerscode
 AccountancyCodeBuy=Boekhoudkundige leverancierscode
-CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Keep the checkbox “Automatically create the payment” empty by default when creating a new tax
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Houd de checkbox “Automatisch de betaling aanmaken” standaard leeg bij het aanmaken van een nieuwe belasting
 ##### Agenda #####
 AgendaSetup=Acties- en agendamoduleinstellingen
 PasswordTogetVCalExport=autorisatiecode van de exportlink
-SecurityKey = Security Key
+SecurityKey = Veiligheidssleutel
 PastDelayVCalExport=Exporteer geen gebeurtenissen ouder dan
 AGENDA_USE_EVENT_TYPE=Gebruik gebeurtenistypen (beheerd in menu Setup -&gt; Woordenboeken -&gt; Type agenda-evenementen)
 AGENDA_USE_EVENT_TYPE_DEFAULT=Stel deze standaardwaarde automatisch in voor het type evenement in het formulier voor het maken van een evenement
@@ -1763,7 +1771,7 @@ AGENDA_DEFAULT_VIEW=Welke weergave wil je standaard openen als je menu Agenda se
 AGENDA_REMINDER_BROWSER=Schakel gebeurtenisherinnering <b> in de browser van de gebruiker </b> in (wanneer de herinneringsdatum wordt bereikt, wordt een pop-up weergegeven door de browser. Elke gebruiker kan dergelijke meldingen uitschakelen via de instellingen van de browser).
 AGENDA_REMINDER_BROWSER_SOUND=Schakel geluidsmelding in
 AGENDA_REMINDER_EMAIL=Schakel gebeurtenisherinnering <b> per e-mail in </b> (herinneringsoptie / vertraging kan voor elke gebeurtenis worden gedefinieerd).
-AGENDA_REMINDER_EMAIL_NOTE=Opmerking: De frequentie van de taak %s moet voldoende zijn om er zeker van te zijn dat de herinnering op het juiste moment wordt verzonden.
+AGENDA_REMINDER_EMAIL_NOTE=Opmerking: de frequentie van de geplande taak %s moet voldoende zijn om er zeker van te zijn dat de herinnering op het juiste moment wordt verzonden.
 AGENDA_SHOW_LINKED_OBJECT=Gekoppeld object weergeven in agendaweergave
 ##### Clicktodial #####
 ClickToDialSetup='Click-To-Dial' moduleinstellingen
@@ -1894,7 +1902,7 @@ BackgroundTableLineOddColor=Achtergrondkleur voor oneven tabellijnen
 BackgroundTableLineEvenColor=Achtergrondkleur voor gelijkmatige tabellijnen
 MinimumNoticePeriod=Minimale opzegtermijn (uw verlofaanvraag moet vóór deze vertraging worden gedaan)
 NbAddedAutomatically=Aantal dagen toegevoegd aan tellers van gebruikers (automatisch) elke maand
-EnterAnyCode=This field contains a reference to identify the line. Enter any value of your choice, but without special characters.
+EnterAnyCode=Dit veld bevat een verwijzing om de lijn te identificeren. Voer een waarde naar keuze in, maar zonder speciale tekens.
 Enter0or1=Voer 0 of 1 in
 UnicodeCurrency=Voer hier tussen accolades in, lijst met byte-nummers die het valutasymbool vertegenwoordigen. Bijvoorbeeld: voer voor $ [36] in - voor Brazilië real R $ [82,36] - voer voor € [8364] in
 ColorFormat=De RGB-kleur heeft het HEX-formaat, bijvoorbeeld: FF0000
@@ -1979,9 +1987,11 @@ MAIN_PDF_MARGIN_RIGHT=Rechter marge op PDF
 MAIN_PDF_MARGIN_TOP=Bovenmarge op PDF
 MAIN_PDF_MARGIN_BOTTOM=Onder-marge op PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Hoogte voor logo op PDF
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Voeg afbeelding toe op voorstelregel
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Elektronisch ondertekenen toevoegen aan PDF
 NothingToSetup=Er is geen specifieke installatie vereist voor deze module.
 SetToYesIfGroupIsComputationOfOtherGroups=Stel dit in op Ja als deze groep een berekening van andere groepen is
-EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
+EnterCalculationRuleIfPreviousFieldIsYes=Voer de rekenregel in als het vorige veld was ingesteld op Ja. <br> Bijvoorbeeld: <br> CODEGRP1+CODEGRP2
 SeveralLangugeVariatFound=Verschillende taalvarianten gevonden
 RemoveSpecialChars=Verwijder speciale tekens
 COMPANY_AQUARIUM_CLEAN_REGEX=Regex-filter om waarde te reinigen (COMPANY_AQUARIUM_CLEAN_REGEX)
@@ -1997,7 +2007,7 @@ SocialNetworkSetup=Installatie van module Sociale netwerken
 EnableFeatureFor=Functies inschakelen voor <strong>%s</strong>
 VATIsUsedIsOff=Opmerking: De optie om omzetbelasting of btw te gebruiken is ingesteld op <strong>Uit</strong> in het menu %s - %s, dus gebruikte omzetbelasting of btw is altijd 0 voor verkoop.
 SwapSenderAndRecipientOnPDF=Wissel afzender- en ontvangeradrespositie op PDF-documenten in
-FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields and combo lists only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
+FeatureSupportedOnTextFieldsOnly=Waarschuwing, functie wordt alleen ondersteund op tekstvelden en combolijsten. Er moet ook een URL-parameter action=create of action=edit worden ingesteld OF de paginanaam moet eindigen op 'new.php' om deze functie te activeren.
 EmailCollector=Email verzamelaar
 EmailCollectorDescription=Voeg een geplande taak en een installatiepagina toe om regelmatig e-mailboxen te scannen (met het IMAP-protocol) en ontvangen e-mails op te nemen in uw toepassing, op de juiste plaats en / of maak automatisch enkele records aan (zoals leads).
 NewEmailCollector=Nieuwe e-mailverzamelaar
@@ -2064,11 +2074,11 @@ UseDebugBar=Gebruik de foutopsporingsbalk
 DEBUGBAR_LOGS_LINES_NUMBER=Aantal laatste logboekregels dat in de console moet worden bewaard
 WarningValueHigherSlowsDramaticalyOutput=Waarschuwing, hogere waarden vertragen de uitvoer dramatisch
 ModuleActivated=Module %s is geactiveerd en vertraagt de interface
-ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances and security)
-ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
+ModuleActivatedWithTooHighLogLevel=Module %s is geactiveerd met een te hoog logniveau (probeer een lager niveau te gebruiken voor betere prestaties en veiligheid)
+ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is geactiveerd en logniveau (%s) is correct (niet te uitgebreid)
 IfYouAreOnAProductionSetThis=Als u zich in een productieomgeving bevindt, moet u deze eigenschap instellen op %s.
 AntivirusEnabledOnUpload=Antivirus ingeschakeld op geüploade bestanden
-SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
+SomeFilesOrDirInRootAreWritable=Sommige bestanden of mappen bevinden zich niet in de modus alleen-lezen
 EXPORTS_SHARE_MODELS=Exportmodellen zijn met iedereen te delen
 ExportSetup=Installatie van exportmodule
 ImportSetup=Instellen van module Import
@@ -2092,11 +2102,10 @@ MakeAnonymousPing=Maak een anonieme ping &#39;+1&#39; naar de Dolibarr-fundering
 FeatureNotAvailableWithReceptionModule=Functie niet beschikbaar wanneer module-ontvangst is ingeschakeld
 EmailTemplate=Sjabloon voor e-mail
 EMailsWillHaveMessageID=E-mails hebben een tag 'Verwijzingen' die overeenkomen met deze syntaxis
-PDF_SHOW_PROJECT=Show project on document
-ShowProjectLabel=Project Label
+PDF_SHOW_PROJECT=Toon project op document
+ShowProjectLabel=Projectlabel
 PDF_USE_ALSO_LANGUAGE_CODE=Als u wilt dat sommige teksten in uw PDF worden gedupliceerd in 2 verschillende talen in dezelfde gegenereerde PDF, moet u hier deze tweede taal instellen, zodat de gegenereerde PDF 2 verschillende talen op dezelfde pagina bevat, degene die is gekozen bij het genereren van PDF en deze ( slechts enkele PDF-sjablonen ondersteunen dit). Voor 1 taal per pdf leeg houden.
 FafaIconSocialNetworksDesc=Voer hier de code van een FontAwesome-pictogram in. Als je niet weet wat FontAwesome is, kun je het generieke waarde fa-adresboek gebruiken.
-FeatureNotAvailableWithReceptionModule=Functie niet beschikbaar wanneer module-ontvangst is ingeschakeld
 RssNote=Opmerking: elke RSS-feeddefinitie biedt een widget die u moet inschakelen om deze beschikbaar te hebben in het dashboard
 JumpToBoxes=Ga naar Setup -> Widgets
 MeasuringUnitTypeDesc=Gebruik hier een waarde als "grootte", "oppervlakte", "volume", "gewicht", "tijd"
@@ -2109,23 +2118,29 @@ SwitchThisForABetterSecurity=Het wijzigen van deze waarde naar %s wordt aanbevol
 DictionaryProductNature= Aard van het product
 CountryIfSpecificToOneCountry=Land (indien specifiek voor een bepaald land)
 YouMayFindSecurityAdviceHere=Mogelijk vindt u hier beveiligingsadvies
-ModuleActivatedMayExposeInformation=This PHP extension may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedMayExposeInformation=Deze PHP-extensie kan gevoelige gegevens blootleggen. Als je het niet nodig hebt, schakel het dan uit.
 ModuleActivatedDoNotUseInProduction=Een module ontworpen voor de ontwikkeling is ingeschakeld. Schakel het niet in bij een productieomgeving.
 CombinationsSeparator=Scheidingsteken voor productcombinaties
 SeeLinkToOnlineDocumentation=Zie link naar online documentatie in het bovenste menu voor voorbeelden
 SHOW_SUBPRODUCT_REF_IN_PDF=Als de functie "%s" van module <b>%s</b> wordt gebruikt, toon dan de details van subproducten van een kit op PDF.
 AskThisIDToYourBank=Neem contact op met uw bank om deze ID te krijgen
-AdvancedModeOnly=Permision available in Advanced permission mode only
-ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
-MailToSendEventOrganization=Event Organization
-AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
-YouShouldDisablePHPFunctions=You should disable PHP functions
-IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
-NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
-RecommendedValueIs=Recommended: %s
-ARestrictedPath=A restricted path
-CheckForModuleUpdate=Check for external modules updates
-CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
-ModuleUpdateAvailable=An update is available
-NoExternalModuleWithUpdate=No updates found for external modules
-SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
+AdvancedModeOnly=Toestemming alleen beschikbaar in geavanceerde toestemmingsmodus
+ConfFileIsReadableOrWritableByAnyUsers=Het conf-bestand is leesbaar of beschrijfbaar door alle gebruikers. Geef alleen toestemming aan webservergebruiker en -groep.
+MailToSendEventOrganization=Evenementenorganisatie
+AGENDA_EVENT_DEFAULT_STATUS=Standaard gebeurtenisstatus bij het maken van een gebeurtenis vanuit het formulier
+YouShouldDisablePHPFunctions=U moet PHP-functies uitschakelen
+IfCLINotRequiredYouShouldDisablePHPFunctions=Behalve als u systeemopdrachten in aangepaste code moet uitvoeren, moet u PHP-functies uitschakelen
+PHPFunctionsRequiredForCLI=Voor shell-doeleinden (zoals geplande back-up van taken of het uitvoeren van een anitivurs-programma), moet u PHP-functies behouden
+NoWritableFilesFoundIntoRootDir=Er zijn geen beschrijfbare bestanden of mappen van de gebruikelijke programma's gevonden in uw hoofdmap (Goed)
+RecommendedValueIs=Aanbevolen: %s
+NotRecommended=Niet aanbevolen
+ARestrictedPath=Een beperkt pad
+CheckForModuleUpdate=Controleren op updates van externe modules
+CheckForModuleUpdateHelp=Deze actie maakt verbinding met editors van externe modules om te controleren of er een nieuwe versie beschikbaar is.
+ModuleUpdateAvailable=Een update is beschikbaar
+NoExternalModuleWithUpdate=Geen updates gevonden voor externe modules
+SwaggerDescriptionFile=Swagger API-beschrijvingsbestand (voor gebruik met bijvoorbeeld redoc)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=U hebt de verouderde WS API ingeschakeld. U moet in plaats daarvan REST API gebruiken.
+RandomlySelectedIfSeveral=Willekeurig geselecteerd als er meerdere foto's beschikbaar zijn
+DatabasePasswordObfuscated=Databasewachtwoord is versleuteld in conf-bestand
+DatabasePasswordNotObfuscated=Databasewachtwoord is NIET versleuteld in conf-bestand
diff --git a/htdocs/langs/nl_NL/agenda.lang b/htdocs/langs/nl_NL/agenda.lang
index 4c6bbdab045..f3b14bc00ce 100644
--- a/htdocs/langs/nl_NL/agenda.lang
+++ b/htdocs/langs/nl_NL/agenda.lang
@@ -4,7 +4,7 @@ Actions=Acties
 Agenda=Agenda
 TMenuAgenda=Agenda
 Agendas=Agenda's
-LocalAgenda=Interne kalender
+LocalAgenda=Standaard kalender
 ActionsOwnedBy=Actie gevraagd door
 ActionsOwnedByShort=Eigenaar
 AffectedTo=Geaffecteerden
@@ -20,7 +20,7 @@ MenuToDoActions=Alle openstaande acties
 MenuDoneActions=Alle beëindigde acties
 MenuToDoMyActions=Mijn openstaande acties
 MenuDoneMyActions=Mijn beëindigde acties
-ListOfEvents=Lijst van evenement (interne kalender)
+ListOfEvents=Lijst met evenementen (standaard kalender)
 ActionsAskedBy=Acties geregistreerd door
 ActionsToDoBy=Acties toegewezen aan
 ActionsDoneBy=Acties gedaan door
@@ -38,6 +38,7 @@ ActionsEvents=Gebeurtenissen waarvoor Dolibarr automatisch een item zal maken in
 EventRemindersByEmailNotEnabled=Gebeurtenisherinneringen per e-mail zijn niet ingeschakeld in %s-module setup.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Relatie %s aangemaakt
+COMPANY_MODIFYInDolibarr=Relatie %s gewijzigd
 COMPANY_DELETEInDolibarr=Relatie %s verwijderd
 ContractValidatedInDolibarr=Contract %s gevalideerd
 CONTRACT_DELETEInDolibarr=Contract %s verwijderd
@@ -87,6 +88,7 @@ OrderDeleted=Bestelling verwijderd
 InvoiceDeleted=Factuur verwijderd
 DraftInvoiceDeleted=Conceptfactuur verwijderd
 CONTACT_CREATEInDolibarr=Contact %s gemaakt
+CONTACT_MODIFYInDolibarr=Contactpersoon%s gewijzigd
 CONTACT_DELETEInDolibarr=Contact %s verwijderd
 PRODUCT_CREATEInDolibarr=Product %s aangemaakt
 PRODUCT_MODIFYInDolibarr=Product %s aangepast
@@ -119,6 +121,7 @@ MRP_MO_UNVALIDATEInDolibarr=MO ingesteld op conceptstatus
 MRP_MO_PRODUCEDInDolibarr=MO geproduceerd
 MRP_MO_DELETEInDolibarr=MO verwijderd
 MRP_MO_CANCELInDolibarr=MO geannuleerd
+PAIDInDolibarr=%s betaald
 ##### End agenda events #####
 AgendaModelModule=Document sjablonen voor evenement
 DateActionStart=Startdatum
@@ -130,7 +133,7 @@ AgendaUrlOptions4=<b> logint = %s </b>om de uitvoer te beperken tot acties die z
 AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> om uitvoer van acties gekoppeld aan project<b>PROJECT_ID</b> te beperken.
 AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> om automatische gebeurtenissen uit te sluiten.
 AgendaUrlOptionsIncludeHolidays= <b> includeholidays = 1 </b> om vakanties op te nemen.
-AgendaShowBirthdayEvents=Verjaardagen van contacten weergeven
+AgendaShowBirthdayEvents=Verjaardagen van contacten
 AgendaHideBirthdayEvents=Verjaardagen van contacten verbergen
 Busy=Bezig
 ExportDataset_event1=Lijst van agenda-gebeurtenissen
diff --git a/htdocs/langs/nl_NL/assets.lang b/htdocs/langs/nl_NL/assets.lang
index bef6a3b9594..3ce022bac55 100644
--- a/htdocs/langs/nl_NL/assets.lang
+++ b/htdocs/langs/nl_NL/assets.lang
@@ -61,5 +61,7 @@ MenuListTypeAssets = Lijstoverzicht
 #
 # Module
 #
+Asset=Bezit
 NewAssetType=Nieuw soort bezittingen
 NewAsset=Nieuw bezit
+ConfirmDeleteAsset=Weet u zeker dat u dit item wilt verwijderen?
diff --git a/htdocs/langs/nl_NL/banks.lang b/htdocs/langs/nl_NL/banks.lang
index a3d751c5dab..494554bbf82 100644
--- a/htdocs/langs/nl_NL/banks.lang
+++ b/htdocs/langs/nl_NL/banks.lang
@@ -109,13 +109,13 @@ SocialContributionPayment=Sociale/fiscale belastingbetaling
 BankTransfer=Overschrijving
 BankTransfers=Overschrijvingen
 MenuBankInternalTransfer=Interne overboeking
-TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
+TransferDesc=Gebruik interne overboeking om van de ene rekening naar de andere over te schrijven, de toepassing schrijft twee records: een debet op de bronrekening en een tegoed op de doelrekening. Voor deze transactie wordt hetzelfde bedrag, label en datum gebruikt.
 TransferFrom=Van
 TransferTo=T/m
 TransferFromToDone=Een overboeking van <b>%s</b> naar <b>%s</b> van <b>%s</b> is geregistreerd.
 CheckTransmitter=Verzender
 ValidateCheckReceipt=Betaling met cheque goedkeuren?
-ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
+ConfirmValidateCheckReceipt=Weet u zeker dat u deze cheque ter validatie wilt indienen? Er zijn geen wijzigingen mogelijk, het is klaar.
 DeleteCheckReceipt=Deze cheque ontvangst verwijderen?
 ConfirmDeleteCheckReceipt=Weet u zeker dat u deze betaling via cheque wilt verwijderen?
 BankChecks=Bankcheque
@@ -128,7 +128,7 @@ ConfirmDeleteTransaction=Weet u zeker dat u deze boeking wilt verwijderen?
 ThisWillAlsoDeleteBankRecord=Hiermee wordt ook de boeking in de bank verwijderd
 BankMovements=Mutaties
 PlannedTransactions=Nog te verwerken
-Graph=Graphs
+Graph=grafieken
 ExportDataset_banque_1=Bankboekingen en rekeningafschriften
 ExportDataset_banque_2=Stortingsbewijs
 TransactionOnTheOtherAccount=Overboeking op de andere rekening
@@ -142,7 +142,7 @@ AllAccounts=Alle kas- en bankrekeningen
 BackToAccount=Terug naar rekening
 ShowAllAccounts=Toon alle rekeningen
 FutureTransaction=Toekomstige transactie. Nog niet mogelijk af te stemmen
-SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
+SelectChequeTransactionAndGenerate=Selecteer/filter de cheques die in het chequebewijs moeten worden opgenomen. Klik vervolgens op "Maken".
 InputReceiptNumber=Kies het bankafschrift in verband met de bemiddeling. Gebruik een sorteerbare numerieke waarde: YYYYMM of YYYYMMDD
 EventualyAddCategory=Geef tenslotte een categorie op waarin de gegevens bewaard kunnen worden
 ToConciliate=Afstemmen?
@@ -174,7 +174,7 @@ YourSEPAMandate=Uw SEPA mandaat
 FindYourSEPAMandate=Met deze SEPA machtiging geeft u ons bedrijf toestemming een opdracht ter incasso te sturen naar uw bank. Retourneer het ondertekend (scan van het ondertekende document) of stuur het per e-mail naar
 AutoReportLastAccountStatement=Vul bij het automatisch afstemmen het veld 'aantal bankafschriften' in met het laatste afschrift nummer.
 CashControl=POS kassa controle
-NewCashFence=New cash desk opening or closing
+NewCashFence=Nieuwe kassa openen of sluiten
 BankColorizeMovement=Inkleuren mutaties
 BankColorizeMovementDesc=Als deze functie is ingeschakeld, kunt u een specifieke achtergrondkleur kiezen voor debet- of creditmutaties
 BankColorizeMovementName1=Achtergrondkleur voor debetmutatie
diff --git a/htdocs/langs/nl_NL/bills.lang b/htdocs/langs/nl_NL/bills.lang
index 9c40fd8f317..9f561eb7068 100644
--- a/htdocs/langs/nl_NL/bills.lang
+++ b/htdocs/langs/nl_NL/bills.lang
@@ -55,7 +55,7 @@ CustomerInvoice=Afnemersfactuur
 CustomersInvoices=Klantenfactuur
 SupplierInvoice=Factuur leverancier
 SuppliersInvoices=Inkoopfacturen
-SupplierInvoiceLines=Vendor invoice lines
+SupplierInvoiceLines=Factuurregels leverancier
 SupplierBill=Factuur leverancier
 SupplierBills=Inkoopfacturen
 Payment=Betaling
@@ -82,8 +82,8 @@ PaymentsAlreadyDone=Betalingen gedaan
 PaymentsBackAlreadyDone=Al betaalde restitutie
 PaymentRule=Betalingsvoorwaarde
 PaymentMode=Betaalwijze
-DefaultPaymentMode=Default Payment Type
-DefaultBankAccount=Default Bank Account
+DefaultPaymentMode=Standaard betalingstype
+DefaultBankAccount=Standaard bankrekening
 PaymentTypeDC=Debet / Kredietkaart
 PaymentTypePP=PayPal
 IdPaymentMode=Betaalwijze (id)
@@ -120,7 +120,7 @@ ConvertExcessPaidToReduc=Omzetten teveel betaald in beschikbare korting
 EnterPaymentReceivedFromCustomer=Voer een ontvangen betaling van afnemer in
 EnterPaymentDueToCustomer=Voer een betaling te doen aan afnemer in
 DisabledBecauseRemainderToPayIsZero=Uitgeschakeld omdat restant te betalen gelijk is aan nul
-PriceBase=Base price
+PriceBase=Basisprijs
 BillStatus=Factuurstatus
 StatusOfGeneratedInvoices=Status van gegenereerde facturen
 BillStatusDraft=Concept (moet worden gevalideerd)
@@ -259,6 +259,7 @@ DateMaxPayment=Betaling vóór
 DateInvoice=Factuurdatum
 DatePointOfTax=Belastingpunt
 NoInvoice=Geen factuur
+NoOpenInvoice=Geen openstaande factuur
 ClassifyBill=Classifiseer factuur
 SupplierBillsToPay=Onbetaalde leveranciersfacturen
 CustomerBillsUnpaid=Onbetaalde klant facturen
@@ -376,7 +377,7 @@ DateLastGeneration=Aanmaakdatum laatste factuur
 DateLastGenerationShort=Datum laatste aanmaak
 MaxPeriodNumber=Max. aantal factuurgeneratie
 NbOfGenerationDone=Aantal reeds aangemaakte facturen
-NbOfGenerationOfRecordDone=Number of record generation already done
+NbOfGenerationOfRecordDone=Aantal reeds uitgevoerde recordgeneratie
 NbOfGenerationDoneShort=Aantal malen gegenereerd
 MaxGenerationReached=Maximum aantal aanmaken bereikt
 InvoiceAutoValidate=Valideer facturen automatisch
@@ -417,7 +418,7 @@ PaymentCondition14DENDMONTH=Binnen 14 dagen na het einde van de maand
 FixAmount=Vast bedrag - 1 regel met label '%s'
 VarAmount=Variabel bedrag  (%% tot.)
 VarAmountOneLine=Variabel aantal (%% tot.) - 1 regel met label '%s'
-VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
+VarAmountAllLines=Variabel bedrag (%% tot.) - alle regels van oorsprong
 # PaymentType
 PaymentTypeVIR=Bankoverboeking
 PaymentTypeShortVIR=Bankoverboeking
@@ -454,7 +455,7 @@ RegulatedOn=Geregeld op
 ChequeNumber=Chequenummer
 ChequeOrTransferNumber=Cheque / Transfernummer
 ChequeBordereau=Controleer rooster
-ChequeMaker=Check/Transfer sender
+ChequeMaker=Afzender controleren/overdragen
 ChequeBank=Bank van cheque
 CheckBank=Controleer
 NetToBePaid=Netto te betalen
@@ -498,16 +499,16 @@ Cash=Contant
 Reported=Uitgestelde
 DisabledBecausePayments=Niet beschikbaar omdat er betalingen bestaan
 CantRemovePaymentWithOneInvoicePaid=Verwijder onmogelijk wanneer er minstens een factuur betaald is ingedeeld.
-CantRemovePaymentVATPaid=Can't remove payment since VAT declaration is classified paid
-CantRemovePaymentSalaryPaid=Can't remove payment since salary is classified paid
+CantRemovePaymentVATPaid=Kan betaling niet verwijderen omdat btw-aangifte is geclassificeerd als betaald
+CantRemovePaymentSalaryPaid=Kan betaling niet verwijderen omdat salaris is geclassificeerd als betaald
 ExpectedToPay=Verwachte betaling
 CantRemoveConciliatedPayment=Kan de afgestemde betaling niet verwijderen
 PayedByThisPayment=Betaald door deze betaling
 ClosePaidInvoicesAutomatically=Classificeer automatisch alle standaard, aanbetaling of vervangende facturen als "Betaald" wanneer de betaling volledig is uitgevoerd.
 ClosePaidCreditNotesAutomatically=Classificeer automatisch alle creditnota's als "Betaald" wanneer de terugbetaling volledig is gedaan.
 ClosePaidContributionsAutomatically=Classificeer automatisch alle sociale of fiscale bijdragen als "Betaald" bij volledige betaling.
-ClosePaidVATAutomatically=Classify automatically VAT declaration as "Paid" when payment is done entirely.
-ClosePaidSalaryAutomatically=Classify automatically salary as "Paid" when payment is done entirely.
+ClosePaidVATAutomatically=Classificeer automatisch btw-aangifte als "Betaald" wanneer de betaling volledig is gedaan.
+ClosePaidSalaryAutomatically=Classificeer automatisch salaris als "Betaald" wanneer de betaling volledig is gedaan.
 AllCompletelyPayedInvoiceWillBeClosed=Alle volledig betaalde facturen worden automatisch afgesloten met de status "Betaald".
 ToMakePayment=Betaal
 ToMakePaymentBack=Terugbetalen
@@ -520,10 +521,10 @@ YouMustCreateStandardInvoiceFirstDesc=Maak eerst een standaard factuur en conver
 PDFCrabeDescription=Factuur PDF-sjabloon Crabe. Een volledig factuursjabloon (oude implementatie van Sponge-sjabloon)
 PDFSpongeDescription=Factuur PDF-sjabloon Sponge. Een complete sjabloon voor een factuur
 PDFCrevetteDescription=Factuur PDF-sjabloon 'Crevette'. Een compleet sjabloon voor facturen
-TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
-MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+TerreNumRefModelDesc1=Retournummer in het formaat %syymm-nnnn voor standaardfacturen en %syymm-nnnn voor creditnota's waarbij yy het jaar is, mm de maand en nnnn een automatisch oplopend nummer is zonder onderbreking en zonder terugkeer naar 0
+MarsNumRefModelDesc1=Retournummer in het formaat %syymm-nnnn voor standaardfacturen, %syymm-nnnn voor vervangende facturen, %syymm-nnnn voor vooruitbetalingsfacturen en %syymm-nnny is voor jaarnota's waarbij mm nnnn is voor jaarnota's zonder pauze en geen terugkeer naar 0
 TerreNumRefModelError=Een wetsvoorstel te beginnen met $ syymm bestaat al en is niet compatibel met dit model van de reeks. Verwijderen of hernoemen naar deze module te activeren.
-CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+CactusNumRefModelDesc1=Retournummer in de notatie %syymm-nnnn voor standaardfacturen, %syymm-nnnn voor creditnota's en %syymm-nnnn voor vooruitbetalingsfacturen waarbij yy het jaar is, mm de maand en nnnn een opeenvolgend nummer is zonder automatisch ophogen 0
 EarlyClosingReason=Vroege afsluiting reden
 EarlyClosingComment=Vroege afsluiting opmerking
 ##### Types de contacts #####
@@ -570,8 +571,8 @@ ToCreateARecurringInvoiceGeneAuto=Als u dergelijke facturen automatisch wilt lat
 DeleteRepeatableInvoice=Verwijder tijdelijke factuur
 ConfirmDeleteRepeatableInvoice=Weet u zeker dat u dit sjabloon factuur wilt verwijderen?
 CreateOneBillByThird=Orders samentrekken tot één factuur aan per relatie (anders voor elke bestelling één factuur)
-BillCreated=%s invoice(s) generated
-BillXCreated=Invoice %s generated
+BillCreated=%s factuur(en) gegenereerd
+BillXCreated=Factuur %s gegenereerd
 StatusOfGeneratedDocuments=Status aanmaken document
 DoNotGenerateDoc=Maak documentbestand niet aan
 AutogenerateDoc=Automatisch aanmaken documentbestand
@@ -589,3 +590,4 @@ FacParentLine=Hoofd factuurregel
 SituationTotalRayToRest=Netto restant te betalen
 PDFSituationTitle=Situatie n ° %d
 SituationTotalProgress=Totale voortgang %d %%
+SearchUnpaidInvoicesWithDueDate=Zoek onbetaalde facturen met een vervaldatum = %s
diff --git a/htdocs/langs/nl_NL/blockedlog.lang b/htdocs/langs/nl_NL/blockedlog.lang
index 1507f2b3991..620d908d54c 100644
--- a/htdocs/langs/nl_NL/blockedlog.lang
+++ b/htdocs/langs/nl_NL/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Niet aanpasbare logboeken
 ShowAllFingerPrintsMightBeTooLong=Toon alle gearchiveerde logs (kunnen lang zijn)
 ShowAllFingerPrintsErrorsMightBeTooLong=Toon alle ongeldige archieflogboeken (kunnen lang zijn)
 DownloadBlockChain=Vingerafdrukken downloaden
-KoCheckFingerprintValidity=Gearchiveerde logboekinvoer is niet geldig. Het betekent dat iemand (een hacker?) Sommige gegevens van dit record heeft gewijzigd nadat het is opgenomen of het vorige gearchiveerde record heeft gewist (controleer of die regel met het vorige # bestaat).
+KoCheckFingerprintValidity=Gearchiveerde logboekinvoer is niet geldig. Het betekent dat iemand (een hacker?) enkele gegevens van dit record heeft gewijzigd nadat het was opgenomen, of het vorige gearchiveerde record heeft gewist (controleer of de regel met het vorige # bestaat) of de controlesom van het vorige record heeft gewijzigd.
 OkCheckFingerprintValidity=Gearchiveerde logboekrecord is geldig. De gegevens op deze regel zijn niet gewijzigd en de invoer volgt op de vorige.
 OkCheckFingerprintValidityButChainIsKo=Gearchiveerd log lijkt geldig in vergelijking met de vorige, maar de ketting was eerder beschadigd.
 AddedByAuthority=Opgeslagen in autoriteit op afstand
diff --git a/htdocs/langs/nl_NL/boxes.lang b/htdocs/langs/nl_NL/boxes.lang
index c7e50655b47..47006dfac87 100644
--- a/htdocs/langs/nl_NL/boxes.lang
+++ b/htdocs/langs/nl_NL/boxes.lang
@@ -18,13 +18,13 @@ BoxLastActions=Laatste acties
 BoxLastContracts=Laatste contracten
 BoxLastContacts=Laatste contactpersonen- / adressenlijst
 BoxLastMembers=Laatste leden
-BoxLastModifiedMembers=Latest modified members
-BoxLastMembersSubscriptions=Latest member subscriptions
+BoxLastModifiedMembers=Laatste gewijzigde leden
+BoxLastMembersSubscriptions=Laatste lidmaatschappen
 BoxFicheInter=Laatste interventies
 BoxCurrentAccounts=Saldo van de geopende rekening
 BoxTitleMemberNextBirthdays=Verjaardagen van deze maand (leden)
-BoxTitleMembersByType=Members by type
-BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
+BoxTitleMembersByType=Leden per type
+BoxTitleMembersSubscriptionsByYear=Ledenabonnementen per jaar
 BoxTitleLastRssInfos=Laatste %s nieuws van %s
 BoxTitleLastProducts=Producten / Diensten: laatste %s bewerkt
 BoxTitleProductsAlertStock=Producten: voorraadalarm
@@ -46,11 +46,11 @@ BoxMyLastBookmarks=Bladwijzers: laatste %s
 BoxOldestExpiredServices=Oudste actief verlopen diensten
 BoxLastExpiredServices=Laatste %s oudste contactpersonen met actieve verlopen diensten
 BoxTitleLastActionsToDo=Laatste %s acties om uit te voeren
-BoxTitleLastContracts=Latest %s contracts which were modified
-BoxTitleLastModifiedDonations=Latest %s donations which were modified
-BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
-BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
-BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
+BoxTitleLastContracts=Laatste %s contracten die zijn gewijzigd
+BoxTitleLastModifiedDonations=Laatste %s donaties die zijn gewijzigd
+BoxTitleLastModifiedExpenses=Laatste %s onkostendeclaraties die zijn gewijzigd
+BoxTitleLatestModifiedBoms=Laatste %s stuklijsten die zijn gewijzigd
+BoxTitleLatestModifiedMos=Laatste %s Productieorders die zijn gewijzigd
 BoxTitleLastOutstandingBillReached=Klanten met meer dan maximaal toegestaan krediet
 BoxGlobalActivity=Globale activiteit (facturen, offertes, bestellingen)
 BoxGoodCustomers=Goede klanten
@@ -112,9 +112,9 @@ BoxTitleLastCustomerShipments=Laatste %s klantverzendingen
 NoRecordedShipments=Geen geregistreerde klantverzending
 BoxCustomersOutstandingBillReached=Klanten met bereikt limiet
 # Pages
-UsersHome=Home users and groups
-MembersHome=Home Membership
-ThirdpartiesHome=Home Thirdparties
-TicketsHome=Home Tickets
-AccountancyHome=Home Accountancy
+UsersHome=Thuisgebruikers en groepen
+MembersHome=Thuis lidmaatschap
+ThirdpartiesHome=Home Derden
+TicketsHome=Thuistickets
+AccountancyHome=Home Boekhouding
 ValidatedProjects=Gevalideerde projecten
diff --git a/htdocs/langs/nl_NL/cashdesk.lang b/htdocs/langs/nl_NL/cashdesk.lang
index 614fc1431dc..d7351d8d538 100644
--- a/htdocs/langs/nl_NL/cashdesk.lang
+++ b/htdocs/langs/nl_NL/cashdesk.lang
@@ -1,7 +1,7 @@
 # Language file - Source file is en_US - cashdesk
 CashDeskMenu=Point of sale
 CashDesk=Point of sale
-CashDeskBankCash=Bankrekening (cash)
+CashDeskBankCash=Bankrekening (kas)
 CashDeskBankCB=Bankrekening (kaart)
 CashDeskBankCheque=Bankrekening (check)
 CashDeskWarehouse=Magazijn
@@ -41,8 +41,8 @@ Floor=Vloer
 AddTable=Tafel toevoegen
 Place=Plaats
 TakeposConnectorNecesary='TakePOS Connector' vereist
-OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
-NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser:
+OrderPrinters=Voeg een knop toe om de bestelling zonder betaling naar bepaalde printers te sturen (bijvoorbeeld om een bestelling naar een keuken te sturen)
+NotAvailableWithBrowserPrinter=Niet beschikbaar wanneer printer voor bon is ingesteld op browser:
 SearchProduct=Zoek product
 Receipt=Bon
 Header=Hoofd
@@ -57,9 +57,9 @@ Paymentnumpad=Soort betaling om de betaling in te voeren
 Numberspad=Cijferblok
 BillsCoinsPad=Munten en bankbiljetten blok
 DolistorePosCategory=TakePOS-modules en andere POS-oplossingen voor Dolibarr
-TakeposNeedsCategories=TakePOS needs at least one product categorie to work
-TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS needs at least 1 product category under the category <b>%s</b> to work
-OrderNotes=Can add some notes to each ordered items
+TakeposNeedsCategories=TakePOS heeft ten minste één productcategorie nodig om te werken
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS heeft minimaal 1 productcategorie onder de categorie <b> %s </b> nodig om te werken
+OrderNotes=Kan enkele notities toevoegen aan elk besteld item
 CashDeskBankAccountFor=Standaardrekening voor betalingen
 NoPaimementModesDefined=Geen betaalmethode gedefinieerd in TakePOS-configuratie
 TicketVatGrouped=Groep BTW op tarief in tickets | kwitanties
@@ -84,7 +84,7 @@ InvoiceIsAlreadyValidated=Factuur is al gevalideerd
 NoLinesToBill=Geen regels om te factureren
 CustomReceipt=Aangepaste kwitantie
 ReceiptName=Naam ontvangstbewijs
-ProductSupplements=Manage supplements of products
+ProductSupplements=Beheer supplementen van producten
 SupplementCategory=Toevoeging categorie
 ColorTheme=Kleur thema
 Colorful=Kleurrijk
@@ -94,7 +94,7 @@ Browser=Browser
 BrowserMethodDescription=Eenvoudig en gemakkelijk afdrukken van bonnen. Slechts een paar parameters om de bon te configureren. Afdrukken via browser.
 TakeposConnectorMethodDescription=Externe module met extra functies. Mogelijkheid om vanuit de cloud af te drukken.
 PrintMethod=Afdrukmethode
-ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. The server hosting the application can't be in the Cloud (must be able to reach the printers in your network).
+ReceiptPrinterMethodDescription=Krachtige methode met veel parameters. Volledig aanpasbaar met sjablonen. De server die de applicatie host, mag niet in de cloud staan (moet de printers in uw netwerk kunnen bereiken).
 ByTerminal=Per terminal
 TakeposNumpadUsePaymentIcon=Gebruik pictogram in plaats van tekst op betalingsknoppen van numpad
 CashDeskRefNumberingModules=Nummeringsmodule voor POS-verkoop
@@ -102,7 +102,7 @@ CashDeskGenericMaskCodes6 =  <br><b>{TN}</b> tag wordt gebruikt om het terminal
 TakeposGroupSameProduct=Groepeer dezelfde productlijnen
 StartAParallelSale=Start een nieuwe parallelle verkoop
 SaleStartedAt=Verkoop begon op %s
-ControlCashOpening=Controle contant geld pop-up bij het openen van POS
+ControlCashOpening=Open de pop-up "Kassa beheren" bij het openen van de kassa
 CloseCashFence=Sluit de kassa-bediening
 CashReport=Kassa verslag
 MainPrinterToUse=Hoofdprinter om te gebruiken
@@ -126,5 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Bonprinter moet eerst zijn ingeschakeld
 AllowDelayedPayment=Laat uitgestelde betaling toe
 PrintPaymentMethodOnReceipts=Betaalmethode afdrukken op tickets | bonnen
 WeighingScale=Weegschaal
-ShowPriceHT = Display the price excluding tax column
-ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
+ShowPriceHT = Toon de kolom met de prijs exclusief btw (op het scherm)
+ShowPriceHTOnReceipt = Toon de kolom met de prijs exclusief btw (bij ontvangst)
diff --git a/htdocs/langs/nl_NL/categories.lang b/htdocs/langs/nl_NL/categories.lang
index 31bb7f2c0ed..5873c27d68f 100644
--- a/htdocs/langs/nl_NL/categories.lang
+++ b/htdocs/langs/nl_NL/categories.lang
@@ -3,20 +3,20 @@ Rubrique=Label/Categorie
 Rubriques=Kenmerken / Categorieën
 RubriquesTransactions=Labels/categorieën transacties
 categories=kenmerken / categorieën
-NoCategoryYet=No tag/category of this type has been created
+NoCategoryYet=Er is geen tag/categorie van dit type aangemaakt
 In=In
 AddIn=Invoegen in categorie
 modify=wijzigen
 Classify=Classificeren
 CategoriesArea=Kenmerk / Categorieën omgeving
-ProductsCategoriesArea=Product/Service tags/categories area
-SuppliersCategoriesArea=Vendor tags/categories area
-CustomersCategoriesArea=Customer tags/categories area
-MembersCategoriesArea=Member tags/categories area
-ContactsCategoriesArea=Contact tags/categories area
-AccountsCategoriesArea=Bank account tags/categories area
-ProjectsCategoriesArea=Project tags/categories area
-UsersCategoriesArea=User tags/categories area
+ProductsCategoriesArea=Gebied met product-/servicelabels/categorieën
+SuppliersCategoriesArea=Gebied met leverancierslabels/categorieën
+CustomersCategoriesArea=Gebied met klantlabels/categorieën
+MembersCategoriesArea=Leden labels/categorieën gebiedcategorie
+ContactsCategoriesArea=Contactlabels/categorieën gebied
+AccountsCategoriesArea=Gebied met bankrekeningtags/categorieën
+ProjectsCategoriesArea=Gebied met projectlabels/categorieën
+UsersCategoriesArea=Gebied met gebruikerslabels/categorieën
 SubCats=Sub-categorieën
 CatList=Lijst van kenmerken/categorieën
 CatListAll=Lijst met groepen /categorieën (alle typen)
@@ -93,7 +93,7 @@ AddSupplierIntoCategory=Wijs categorie toe aan leverancier
 ShowCategory=Toon label/categorie
 ByDefaultInList=Standaard in de lijst
 ChooseCategory=Kies categorie
-StocksCategoriesArea=Warehouse Categories
-ActionCommCategoriesArea=Event Categories
+StocksCategoriesArea=Magazijncategorieën
+ActionCommCategoriesArea=Evenementcategorieën
 WebsitePagesCategoriesArea= Categorieën voor Page-Container
-UseOrOperatorForCategories=Use 'OR' operator for categories
+UseOrOperatorForCategories=Gebruik de 'OF'-operator voor categorieën
diff --git a/htdocs/langs/nl_NL/commercial.lang b/htdocs/langs/nl_NL/commercial.lang
index 0f1b0dc9296..634c78c3313 100644
--- a/htdocs/langs/nl_NL/commercial.lang
+++ b/htdocs/langs/nl_NL/commercial.lang
@@ -64,10 +64,11 @@ ActionAC_SHIP=Stuur verzending per post
 ActionAC_SUP_ORD=Verzend bestelling per e-mail
 ActionAC_SUP_INV=Stuur leveranciers-factuur per e-mail
 ActionAC_OTH=Ander
-ActionAC_OTH_AUTO=Automatisch ingevoegde gebeurtenissen
+ActionAC_OTH_AUTO=Overig autom.
 ActionAC_MANUAL=Handmatig ingevoerde gebeurtenissen
 ActionAC_AUTO=Automatisch ingevoegde gebeurtenissen
-ActionAC_OTH_AUTOShort=Automatisch
+ActionAC_OTH_AUTOShort=Overig
+ActionAC_EVENTORGANIZATION=Evenementenorganisatie gebeurtenissen
 Stats=Verkoopstatistieken
 StatusProsp=Prospect-status
 DraftPropals=Ontwerp van commerciële voorstellen
diff --git a/htdocs/langs/nl_NL/companies.lang b/htdocs/langs/nl_NL/companies.lang
index 896e5bf9e83..d993a1d4397 100644
--- a/htdocs/langs/nl_NL/companies.lang
+++ b/htdocs/langs/nl_NL/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=De bedrijfsnaam %s bestaat al. kies een andere.
 ErrorSetACountryFirst=Stel eerst het land in
 SelectThirdParty=Selecteer een derde
-ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
+ConfirmDeleteCompany=Weet u zeker dat u dit bedrijf en alle gerelateerde informatie wilt verwijderen?
 DeleteContact=Contactpersoon verwijderen
-ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
+ConfirmDeleteContact=Weet je zeker dat je dit contact en alle gerelateerde informatie wilt verwijderen?
 MenuNewThirdParty=Nieuwe relatie
 MenuNewCustomer=Nieuwe klant
 MenuNewProspect=Nieuwe prospect
@@ -43,10 +43,10 @@ Individual=Particulier
 ToCreateContactWithSameName=Maakt automatisch een contact / adres met dezelfde informatie als de derde partij onder de derde partij. In de meeste gevallen, zelfs als uw derde partij een fysiek persoon is, is het voldoende om alleen een derde partij te maken.
 ParentCompany=Moedermaatschappij
 Subsidiaries=Dochterondernemingen
-ReportByMonth=Report per month
-ReportByCustomers=Report per customer
-ReportByThirdparties=Report per thirdparty
-ReportByQuarter=Report per rate
+ReportByMonth=Rapport per maand
+ReportByCustomers=Rapport per klant
+ReportByThirdparties=Rapportage per derde partij
+ReportByQuarter=Rapporteren per tarief
 CivilityCode=Aanspreekvorm
 RegisteredOffice=Statutaire zetel
 Lastname=Achternaam
@@ -69,7 +69,7 @@ PhoneShort=Telefoon
 Skype=Skype
 Call=Bel
 Chat=Chat
-PhonePro=Bus. phone
+PhonePro=Zakel. telefoon
 PhonePerso=Telefoonnummer privé
 PhoneMobile=Telefoonnummer mobiel
 No_Email=Weigeren bulk e-mailings
@@ -78,7 +78,7 @@ Zip=Postcode
 Town=Plaats
 Web=Internetadres
 Poste= Functie
-DefaultLang=Default language
+DefaultLang=Standaard taal
 VATIsUsed=Gebruikte BTW
 VATIsUsedWhenSelling=Dit bepaalt of deze derde een verkoopbelasting omvat of niet wanneer hij een factuur aan zijn eigen klanten maakt
 VATIsNotUsed=BTW wordt niet gebruikt
@@ -173,7 +173,7 @@ ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 (Social security number)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate number)
-ProfId5ES=Prof Id 5 (EORI number)
+ProfId5ES=Prof Id 5 (EORI-nummer)
 ProfId6ES=-
 ProfId1FR=Prof. id 1 (SIREN)
 ProfId2FR=Prof. id 2 (SIRET)
@@ -181,7 +181,7 @@ ProfId3FR=Prof. Id 3 (NAF, oude APE)
 ProfId4FR=Prof. id 4 (RCS / RM)
 ProfId5FR=Prof Id 5 (numéro EORI)
 ProfId6FR=-
-ProfId1ShortFR=SIREN
+ProfId1ShortFR=SIRENE
 ProfId2ShortFR=SIRET
 ProfId3ShortFR=NAF
 ProfId4ShortFR=RCS
@@ -239,7 +239,7 @@ ProfId1PT=Prof. id 1 (NIPC)
 ProfId2PT=Prof. id 2 (Social security number)
 ProfId3PT=Prof. Id 3 (Commercial Record aantal)
 ProfId4PT=Prof. id 4 (Conservatorium)
-ProfId5PT=Prof Id 5 (EORI number)
+ProfId5PT=Prof Id 5 (EORI-nummer)
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -263,7 +263,7 @@ ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
 ProfId4RO=Prof Id 5 (EUID)
-ProfId5RO=Prof Id 5 (EORI number)
+ProfId5RO=Prof Id 5 (EORI-nummer)
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -331,7 +331,7 @@ CustomerCodeDesc=Klant code, uniek voor alle klanten
 SupplierCodeDesc=Leverancierscode, uniek voor alle leveranciers
 RequiredIfCustomer=Vereist als relatie een afnemer of prospect is
 RequiredIfSupplier=Vereist als relatie een leverancier is
-ValidityControledByModule=Validity controlled by the module
+ValidityControledByModule=Geldigheid gecontroleerd door de module
 ThisIsModuleRules=Regels voor deze module
 ProspectToContact=Prospect om contact mee op te nemen
 CompanyDeleted=Bedrijf '%s' verwijderd uit de database.
@@ -439,22 +439,22 @@ ListSuppliersShort=Leverancierslijst
 ListProspectsShort=Prospectslijst
 ListCustomersShort=Klantenlijst
 ThirdPartiesArea=Relaties/Contacten
-LastModifiedThirdParties=Latest %s Third Parties which were modified
-UniqueThirdParties=Total number of Third Parties
+LastModifiedThirdParties=Laatste %s Derden die zijn gewijzigd
+UniqueThirdParties=Totaal aantal derden
 InActivity=Open
 ActivityCeased=Gesloten
 ThirdPartyIsClosed=Relatie is gesloten
-ProductsIntoElements=List of products/services mapped to %s
+ProductsIntoElements=Lijst met producten/diensten toegewezen aan %s
 CurrentOutstandingBill=Huidige openstaande rekening
 OutstandingBill=Max. voor openstaande rekening
 OutstandingBillReached=Max. krediet voor openstaande facturen is bereikt
 OrderMinAmount=Minimum orderbedrag
-MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
+MonkeyNumRefModelDesc=Retourneer een getal in de notatie %syymm-nnnn voor de klantcode en %syymm-nnnn voor de leverancierscode waarbij yy het jaar is, mm de maand en nnnn een automatisch oplopend volgnummer is zonder onderbreking en zonder terugkeer naar 0.
 LeopardNumRefModelDesc=Afnemers- / leverancierscode is vrij. Deze code kan te allen tijde worden gewijzigd.
 ManagingDirectors=Manager(s) Naam (CEO, directeur, voorzitter ...)
 MergeOriginThirdparty=Dupliceren third party (third party die u wilt verwijderen)
 MergeThirdparties=Samenvoegen third parties
-ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
+ConfirmMergeThirdparties=Weet u zeker dat u de gekozen derde partij wilt samenvoegen met de huidige? Alle gekoppelde objecten (facturen, bestellingen, ...) worden verplaatst naar de huidige derde partij, waarna de gekozen derde partij wordt verwijderd.
 ThirdpartiesMergeSuccess=Relaties zijn samengevoegd
 SaleRepresentativeLogin=Login vertegenwoordiger
 SaleRepresentativeFirstname=Vertegenwoordiger voornaam
diff --git a/htdocs/langs/nl_NL/compta.lang b/htdocs/langs/nl_NL/compta.lang
index f93194796fe..1f0bbb22212 100644
--- a/htdocs/langs/nl_NL/compta.lang
+++ b/htdocs/langs/nl_NL/compta.lang
@@ -65,7 +65,7 @@ LT2SupplierIN=SGST-aankopen
 VATCollected=Geïnde  BTW
 StatusToPay=Te betalen
 SpecialExpensesArea=Ruimte voor alle bijzondere betalingen
-VATExpensesArea=Area for all TVA payments
+VATExpensesArea=Ruimte voor alle TVA-betalingen
 SocialContribution=Sociale of fiscale heffingen/belasting
 SocialContributions=Sociale of fiscale heffingen/belastingen
 SocialContributionsDeductibles=Aftrekbare sociale/fiscale lasten/belastingen
@@ -86,7 +86,7 @@ PaymentCustomerInvoice=Afnemersfactuur betaling
 PaymentSupplierInvoice=Betaling leverancier
 PaymentSocialContribution=Sociale/fiscale belastingbetaling
 PaymentVat=BTW betaling
-AutomaticCreationPayment=Automatically record the payment
+AutomaticCreationPayment=Automatisch de betaling registreren
 ListPayment=Betalingenlijst
 ListOfCustomerPayments=Afnemersbetalingenlijst
 ListOfSupplierPayments=Lijst met leveranciersbetalingen
@@ -106,8 +106,8 @@ LT2PaymentES=IRPF betaling
 LT2PaymentsES=IRPF Betalingen
 VATPayment=Betaling verkoop-belasting
 VATPayments=Betalingen verkoop-belasting
-VATDeclarations=VAT declarations
-VATDeclaration=VAT declaration
+VATDeclarations=BTW-aangiften
+VATDeclaration=btw-aangifte
 VATRefund=BTW Terugbetaling
 NewVATPayment=Nieuwe betaling BTW
 NewLocalTaxPayment=Nieuwe belasting %s betaling
@@ -135,20 +135,20 @@ NewCheckReceipt=Nieuwe korting
 NewCheckDeposit=Nieuwe chequestorting
 NewCheckDepositOn=Creeer een kwitantie voor de storting op rekening: %s
 NoWaitingChecks=Geen cheques om af te storten.
-DateChequeReceived=Check receiving date
+DateChequeReceived=Controleer ontvangstdatum
 NbOfCheques=Aantal cheques
 PaySocialContribution=Betaal een sociale/fiscale vordering
-PayVAT=Pay a VAT declaration
-PaySalary=Pay a salary card
-ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid ?
-ConfirmPayVAT=Are you sure you want to classify this VAT declaration as paid ?
-ConfirmPaySalary=Are you sure you want to classify this salary card as paid?
+PayVAT=Btw-aangifte betalen
+PaySalary=Betaal een salariskaart
+ConfirmPaySocialContribution=Weet u zeker dat u deze sociale of fiscale belasting als betaald wilt aanmerken?
+ConfirmPayVAT=Weet u zeker dat u deze btw-aangifte als betaald wilt classificeren?
+ConfirmPaySalary=Weet u zeker dat u deze salariskaart als betaald wilt aanmerken?
 DeleteSocialContribution=Verwijder een sociale/fiscale betaling
-DeleteVAT=Delete a VAT declaration
-DeleteSalary=Delete a salary card
-ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment ?
-ConfirmDeleteVAT=Are you sure you want to delete this VAT declaration ?
-ConfirmDeleteSalary=Are you sure you want to delete this salary?
+DeleteVAT=Een btw-aangifte verwijderen
+DeleteSalary=Een salariskaart verwijderen
+ConfirmDeleteSocialContribution=Weet u zeker dat u deze sociale/fiscale belastingbetaling wilt verwijderen?
+ConfirmDeleteVAT=Weet u zeker dat u deze btw-aangifte wilt verwijderen?
+ConfirmDeleteSalary=Weet je zeker dat je dit salaris wilt verwijderen?
 ExportDataset_tax_1=Sociale- en fiscale belastingen en betalingen
 CalcModeVATDebt=Mode <b>%sBTW op verbintenissenboekhouding %s.</b>
 CalcModeVATEngagement=Mode <b>%sBTW op de inkomens-uitgaven %s.</b>
@@ -165,7 +165,7 @@ AnnualSummaryDueDebtMode=Balans van inkomsten en uitgaven, jaarlijks overzicht
 AnnualSummaryInputOutputMode=Balans van inkomsten en uitgaven, jaarlijks overzicht
 AnnualByCompanies=Saldo van baten en lasten, per vooraf gedefinieerde rekeninggroepen
 AnnualByCompaniesDueDebtMode=Evenwicht tussen baten en lasten, gedetailleerd per vooraf gedefinieerde groepen, modus <b>%sClaims-Debts%s</b> zei <b>Commitment accounting</b> .
-AnnualByCompaniesInputOutputMode=Saldo van baten en lasten, detail door vooraf gedefinieerde groepen, mode <b>%sIncomes-Expenses%s</b> zei <b>cash accounting.</b>
+AnnualByCompaniesInputOutputMode=Saldo van baten en lasten, detail door vooraf gedefinieerde groepen, mode <b>%sbaten-lasten%s</b> bij <b>kas boekhouding.</b>
 SeeReportInInputOutputMode=Zie <b>%s analyse van betalingen%s </b>voor een berekening op basis van<b>geregistreerde betalingen</b>gedaan, zelfs als ze nog niet het grootboek zijn opgenomen
 SeeReportInDueDebtMode=Zie <b>%s analyse van geregistreerde documenten%s</b> voor een berekening op basis van bekende<b> geregistreerde documenten </b> zelfs als ze nog niet zijn geboekt
 SeeReportInBookkeepingMode=Zie <b>%s analyse van de boekhoudtabel %s</b> voor een rapport gebaseerd op<b>Boekhoudkundige grootboektabel </b>
@@ -175,7 +175,7 @@ RulesResultInOut=- Het omvat de echte betalingen op facturen, uitgaven, btw en s
 RulesCADue=- Het omvat de verschuldigde facturen van de klant, of ze nu zijn betaald of niet. <br> - Het is gebaseerd op de factureringsdatum van deze facturen. <br>
 RulesCAIn=- Het omvat alle effectieve betalingen van facturen ontvangen van klanten. <br> - Het is gebaseerd op de betaaldatum van deze facturen <br>
 RulesCATotalSaleJournal=Het omvat alle kredietlijnen uit het verkoopdagboek.
-RulesSalesTurnoverOfIncomeAccounts=It includes (credit - debit) of lines for product accounts in group INCOME
+RulesSalesTurnoverOfIncomeAccounts=Het omvat (credit - debet) regels voor productrekeningen in groep INKOMEN
 RulesAmountOnInOutBookkeepingRecord=Het bevat een record in uw grootboek met boekhoudrekeningen met de groep "KOSTEN" of "INKOMSTEN"
 RulesResultBookkeepingPredefined=Het bevat een record in uw grootboek met boekhoudrekeningen met de groep "KOSTEN" of "INKOMSTEN"
 RulesResultBookkeepingPersonalized=Het toont record in uw grootboek met boekhoudrekeningen <b>gegroepeerd op gepersonaliseerde groepen</b>
@@ -196,7 +196,7 @@ VATReportByThirdParties=Verkoopbelastingrapport door relatie
 VATReportByCustomers=BTW-overzicht per klant
 VATReportByCustomersInInputOutputMode=Bevestigd door de klant btw geïnd en betaald
 VATReportByQuartersInInputOutputMode=Rapportage per belasting tarief van belasting geïnd en betaald
-VATReportShowByRateDetails=Show details of this rate
+VATReportShowByRateDetails=Details van dit tarief weergeven
 LT1ReportByQuarters=Rapporteer belasting 2 per tarief
 LT2ReportByQuarters=Belastingaangifte 3 per tarief
 LT1ReportByQuartersES=Rapport per RE-tarief
@@ -231,7 +231,7 @@ Pcg_subtype=Boekhouding ondersoort
 InvoiceLinesToDispatch=Factuurregels te verzenden
 ByProductsAndServices=Op product en service
 RefExt=Externe ref
-ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
+ToCreateAPredefinedInvoice=Om een sjabloonfactuur aan te maken, maakt u een standaardfactuur aan en klikt u vervolgens, zonder deze te valideren, op de knop "%s".
 LinkedOrder=gekoppeld aan bestelling
 Mode1=Methode 1
 Mode2=Methode 2
@@ -249,8 +249,8 @@ ACCOUNTING_ACCOUNT_CUSTOMER_Desc=De speciale account die is gedefinieerd op de k
 ACCOUNTING_ACCOUNT_SUPPLIER=Grootboekrekening crediteuren
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=De speciale boekhoudrekening die op een kaart van een derde is gedefinieerd, wordt alleen voor boekhouding van Subledger gebruikt. Deze wordt gebruikt voor het grootboek en als standaardwaarde voor de boekhouding van de subadministratie als er geen accountadministratie voor leveranciers bij derden is gedefinieerd.
 ConfirmCloneTax=Bevestig de kloon van een sociale / fiscale belasting
-ConfirmCloneVAT=Confirm the clone of a VAT declaration
-ConfirmCloneSalary=Confirm the clone of a salary
+ConfirmCloneVAT=Bevestig de kloon van een btw-aangifte
+ConfirmCloneSalary=Bevestig de kloon van een salaris
 CloneTaxForNextMonth=Kloon het voor volgende maand
 SimpleReport=Eenvoudig rapport
 AddExtraReport=Extra rapportages (voeg een rapport van binnen- en buitenlandse relaties toe)
@@ -269,8 +269,8 @@ AccountingAffectation=Boekhoudopdracht
 LastDayTaxIsRelatedTo=Laatste dag van de periode waarop de belasting betrekking heeft
 VATDue=Verkoopbelasting geclaimd
 ClaimedForThisPeriod=Geclaimd voor de periode
-PaidDuringThisPeriod=Paid for this period
-PaidDuringThisPeriodDesc=This is the sum of all payments linked to VAT declarations which have an end-of-period date in the selected date range
+PaidDuringThisPeriod=Betaald voor deze periode
+PaidDuringThisPeriodDesc=Dit is de som van alle betalingen gekoppeld aan btw-aangiften met een einde-periodedatum in het geselecteerde datumbereik
 ByVatRate=Per verkoop belastingtarief
 TurnoverbyVatrate=Omzet gefactureerd per omzetbelasting-tarief
 TurnoverCollectedbyVatrate=Omzet per BTW tarief
@@ -281,8 +281,14 @@ PurchaseTurnoverCollected=Verzamelde inkoop-omzet
 RulesPurchaseTurnoverDue=- Het bevat de verschuldigde facturen van de leverancier, of ze nu zijn betaald of niet. <br> - Het is gebaseerd op de factuurdatum van deze facturen. <br>
 RulesPurchaseTurnoverIn=- Het omvat alle effectieve betalingen van facturen aan leveranciers. <br> - Het is gebaseerd op de betalingsdatum van deze facturen <br>
 RulesPurchaseTurnoverTotalPurchaseJournal=Het bevat alle debetregels uit het inkoopdagboek.
-RulesPurchaseTurnoverOfExpenseAccounts=It includes (debit - credit) of lines for product accounts in group EXPENSE
+RulesPurchaseTurnoverOfExpenseAccounts=Het omvat (debet - credit) van regels voor productrekeningen in groep UITGAVEN
 ReportPurchaseTurnover=Inkoopbedrag gefactureerd
 ReportPurchaseTurnoverCollected=Verzamelde inkoop-omzet
 IncludeVarpaysInResults = Neem verschillende betalingen op in rapporten
 IncludeLoansInResults = Leningen opnemen in rapporten
+InvoiceLate30Days = Facturen te laat > 30 dagen
+InvoiceLate15Days = Facturen te laat > 15 dagen
+InvoiceLateMinus15Days = Facturen te laat
+InvoiceNotLate = Op te halen < 15 dagen
+InvoiceNotLate15Days = Binnen 15 dagen af te halen
+InvoiceNotLate30Days = Binnen 30 dagen af te halen
diff --git a/htdocs/langs/nl_NL/cron.lang b/htdocs/langs/nl_NL/cron.lang
index a44efab9516..cc37ade9fce 100644
--- a/htdocs/langs/nl_NL/cron.lang
+++ b/htdocs/langs/nl_NL/cron.lang
@@ -60,7 +60,7 @@ CronErrEndDateStartDt=Einddatum kan niet vóór startdatum liggen
 StatusAtInstall=Status bij module-installatie
 CronStatusActiveBtn=Schema
 CronStatusInactiveBtn=Deactiveren
-CronTaskInactive=Deze taak is uitgeschakeld
+CronTaskInactive=Deze taak is uitgeschakeld (niet gepland)
 CronId=Id
 CronClassFile=Bestandsnaam met class
 CronModuleHelp=Naam van Dolibarr-modulemap (werkt ook met externe Dolibarr-module). <BR> Als u bijvoorbeeld de ophaalmethode van Dolibarr Product-object / htdocs / <u>product</u> /class/product.class.php wilt aanroepen, is de waarde voor module <br> <i>Product</i>
diff --git a/htdocs/langs/nl_NL/donations.lang b/htdocs/langs/nl_NL/donations.lang
index e0fe9dcf72e..a2919229bdc 100644
--- a/htdocs/langs/nl_NL/donations.lang
+++ b/htdocs/langs/nl_NL/donations.lang
@@ -7,7 +7,6 @@ AddDonation=Nieuwe donatie
 NewDonation=Nieuwe donatie
 DeleteADonation=Verwijder een donatie
 ConfirmDeleteADonation=Weet u zeker dat u deze donatie wilt verwijderen?
-ShowDonation=Toon donatie
 PublicDonation=Openbare donatie
 DonationsArea=Donatiesoverzicht
 DonationStatusPromiseNotValidated=Voorlopige toezegging
@@ -33,3 +32,4 @@ DONATION_ART238=Toon artikel 238 als u bezorgt bent
 DONATION_ART885=Toon artikel 885 als u bezorgt bent
 DonationPayment=Donatie betaling
 DonationValidated=Donatie %s is gevalideerd
+DonationUseThirdparties=Gebruik een bestaande relatie als coördinaten van donateurs
diff --git a/htdocs/langs/nl_NL/ecm.lang b/htdocs/langs/nl_NL/ecm.lang
index 70f70db9a55..93d216ffff3 100644
--- a/htdocs/langs/nl_NL/ecm.lang
+++ b/htdocs/langs/nl_NL/ecm.lang
@@ -41,7 +41,7 @@ FileNotYetIndexedInDatabase=Bestand nog niet geïndexeerd in database (probeer d
 ExtraFieldsEcmFiles=Extrafields Ecm-bestanden
 ExtraFieldsEcmDirectories=Extrafields Ecm-mappen
 ECMSetup=ECM-instellingen
-GenerateImgWebp=Duplicate all images with another version with .webp format
-ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
-ConfirmImgWebpCreation=Confirm all images duplication
-SucessConvertImgWebp=Images successfully duplicated
+GenerateImgWebp=Dupliceer alle afbeeldingen met een andere versie met .webp-indeling
+ConfirmGenerateImgWebp=Als u bevestigt, genereert u een afbeelding in .webp-indeling voor alle afbeeldingen die zich momenteel in deze map bevinden (submappen zijn niet inbegrepen)...
+ConfirmImgWebpCreation=Bevestig alle afbeeldingen duplicatie
+SucessConvertImgWebp=Afbeeldingen succesvol gedupliceerd
diff --git a/htdocs/langs/nl_NL/errors.lang b/htdocs/langs/nl_NL/errors.lang
index 027c4fed658..9ad71f8483c 100644
--- a/htdocs/langs/nl_NL/errors.lang
+++ b/htdocs/langs/nl_NL/errors.lang
@@ -4,13 +4,14 @@
 NoErrorCommitIsDone=Geen fout, wij bevestigen
 # Errors
 ErrorButCommitIsDone=Fouten gevonden maar we valideren toch
-ErrorBadEMail=Email %s is incorrect
-ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
-ErrorBadUrl=Url %s is incorrect
+ErrorBadEMail=E-mail %s is onjuist
+ErrorBadMXDomain=E-mail %s lijkt onjuist (domein heeft geen geldig MX-record)
+ErrorBadUrl=URL %s is onjuist
 ErrorBadValueForParamNotAString=Slechte parameterwaarde. Wordt over het algemeen gegenereerd als de vertaling ontbreekt.
 ErrorRefAlreadyExists=Referentie <b>%s</b> bestaat al.
 ErrorLoginAlreadyExists=Inlog %s bestaat reeds.
 ErrorGroupAlreadyExists=Groep %s bestaat reeds.
+ErrorEmailAlreadyExists=Email %s already exists.
 ErrorRecordNotFound=Tabelregel niet gevonden.
 ErrorFailToCopyFile=Kan bestand <b>'%s'</b> in <b>'%s'</b> te kopiëren.
 ErrorFailToCopyDir=Kan map '<b>%s</b>' niet kopiëren naar '<b>%s</b>'.
@@ -46,8 +47,8 @@ ErrorWrongDate=Datum is niet correct!
 ErrorFailedToWriteInDir=Schrijven in de map %s mislukt
 ErrorFoundBadEmailInFile=Onjuist e-mail syntax gevonden voor %s regels in het bestand (bijvoorbeeld regel %s met email=%s)
 ErrorUserCannotBeDelete=Gebruiker kan niet worden verwijderd. Misschien is het geassocieerd met Dolibarr-entiteiten.
-ErrorFieldsRequired=Some required fields have been left blank.
-ErrorSubjectIsRequired=The email subject is required
+ErrorFieldsRequired=Sommige verplichte velden zijn leeg gelaten.
+ErrorSubjectIsRequired=Het e-mailonderwerp is verplicht
 ErrorFailedToCreateDir=Creëren van een map mislukt. Controleer of de Webservergebruiker toestemming heeft om te schrijven in Dolibarr documentenmap. Wanneer de parameter <b>safe_mode</b> is ingeschakeld in PHP, controleer dan dat de Dolibarr php bestanden eigendom zijn van de de webserve gebruiker (of groep).
 ErrorNoMailDefinedForThisUser=Geen e-mailadres ingesteld voor deze gebruiker
 ErrorSetupOfEmailsNotComplete=Het instellen van e-mails is niet voltooid
@@ -59,7 +60,7 @@ ErrorDirNotFound=Map <b>%s</b> niet gevonden (Verkeerd pad, te weinig rechten of
 ErrorFunctionNotAvailableInPHP=Functie <b>%s</b> is vereist voor deze functionaliteit, maar is niet beschikbaar in deze versie / installatie van PHP.
 ErrorDirAlreadyExists=Er bestaat al een map met deze naam.
 ErrorFileAlreadyExists=Er bestaat al een bestand met deze naam.
-ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exists.
+ErrorDestinationAlreadyExists=Er bestaat al een ander bestand met de naam <b> %s </b>.
 ErrorPartialFile=Het bestand is niet volledig ontvangen door de server.
 ErrorNoTmpDir=Tijdelijke map %s bestaat niet.
 ErrorUploadBlockedByAddon=Upload geblokkeerd door een PHP- en / of Apache-plugin.
@@ -117,7 +118,7 @@ ErrorCantReadFile=Fout bij lezen bestand '%s'
 ErrorCantReadDir=Fout bij lezen van de map '%s'
 ErrorBadLoginPassword=Onjuiste waarde voor gebruikersnaam of wachtwoord
 ErrorLoginDisabled=Uw gebruikersaccount is uitgeschakeld
-ErrorFailedToRunExternalCommand=Uitvoeren van het externe commando mislukt. Controleer of deze beschikbaar is en uitvoerbaar is op uw server. Als PHP <b>Safe mode</b> is ingeschakeld, controleert u dan of het commando in de map staat die door de instelling <b>safe_mode_exec_dir.</b> wordt aangegeven.
+ErrorFailedToRunExternalCommand=Kan externe opdracht niet uitvoeren. Controleer of het beschikbaar is en kan worden uitgevoerd door uw PHP-servergebruiker. Controleer ook of de opdracht niet op shell-niveau wordt beschermd door een beveiligingslaag zoals apparmor.
 ErrorFailedToChangePassword=Het wijzigen van het wachtwoord is mislukt.
 ErrorLoginDoesNotExists=Gebruiker met gebruikersnaam <b>%s</b> kon niet worden gevonden.
 ErrorLoginHasNoEmail=Deze gebruiker heeft geen e-mail adres. Proces afgebroken.
@@ -226,9 +227,9 @@ ErrorAPageWithThisNameOrAliasAlreadyExists=De pagina / container <strong>%s</str
 ErrorDuringChartLoad=Fout bij het laden van een rekeningschema. Als enkele accounts niet werden geladen, kunt u ze nog steeds handmatig invoeren.
 ErrorBadSyntaxForParamKeyForContent=Onjuiste syntaxis voor param keyforcontent. Moet een waarde hebben die begint met %s of %s
 ErrorVariableKeyForContentMustBeSet=Fout, de constante met de naam %s (met tekstinhoud om te tonen) of %s (met externe URL om te tonen) moet worden ingesteld.
-ErrorURLMustEndWith=URL %s must end %s
+ErrorURLMustEndWith=URL %s moet eindigen op %s
 ErrorURLMustStartWithHttp=URL %s moet beginnen met http: // of https: //
-ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
+ErrorHostMustNotStartWithHttp=Hostnaam %s mag NIET beginnen met http:// of https://
 ErrorNewRefIsAlreadyUsed=Fout, de nieuwe referentie is al gebruikt
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Fout, verwijder betaling gekoppeld aan een gesloten factuur is niet mogelijk.
 ErrorSearchCriteriaTooSmall=Zoekcriteria te klein.
@@ -258,10 +259,11 @@ ErrorPublicInterfaceNotEnabled=Publieke interface was niet ingeschakeld
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=De taal van een nieuwe pagina moet worden gedefinieerd als deze is ingesteld als een vertaling van een andere pagina
 ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=De taal van de nieuwe pagina mag niet de brontaal zijn als deze is ingesteld als vertaling van een andere pagina
 ErrorAParameterIsRequiredForThisOperation=Een parameter is verplicht voor deze bewerking
-ErrorDateIsInFuture=Error, the date can't be in the future
-ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
-ErrorAPercentIsRequired=Error, please fill in the percentage correctly
-ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
+ErrorDateIsInFuture=Fout, de datum kan niet in de toekomst liggen
+ErrorAnAmountWithoutTaxIsRequired=Fout, bedrag is verplicht
+ErrorAPercentIsRequired=Fout, vul het percentage correct in
+ErrorYouMustFirstSetupYourChartOfAccount=U moet eerst uw rekeningschema instellen
+ErrorFailedToFindEmailTemplate=Kan sjabloon met codenaam %s . niet vinden
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Uw PHP-parameter upload_max_filesize (%s) is hoger dan PHP-parameter post_max_size (%s). Dit is geen consistente opstelling.
@@ -294,7 +296,8 @@ WarningFailedToAddFileIntoDatabaseIndex=Pas op, het toevoegen van bestandsinvoer
 WarningTheHiddenOptionIsOn=Pas op, de verborgen optie <b>%s</b> is ingeschakeld.
 WarningCreateSubAccounts=Waarschuwing, u kunt niet rechtstreeks een subaccount aanmaken, u moet een derde partij of een gebruiker aanmaken en hen een boekhoudcode toewijzen om ze in deze lijst te vinden
 WarningAvailableOnlyForHTTPSServers=Alleen beschikbaar als u een beveiligde HTTPS-verbinding gebruikt.
-WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
-ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
-ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
-CheckVersionFail=Version check fail
+WarningModuleXDisabledSoYouMayMissEventHere=Module %s is niet ingeschakeld. Je kunt hier dus veel evenementen missen.
+ErrorActionCommPropertyUserowneridNotDefined=Eigenaar van gebruiker is vereist
+ErrorActionCommBadType=Het geselecteerde gebeurtenistype (id: %n, code: %s) bestaat niet in het woordenboek voor gebeurtenistypes
+CheckVersionFail=Versiecontrole mislukt
+ErrorWrongFileName=De naam van het bestand mag niet __SOMETHING__ bevatten
diff --git a/htdocs/langs/nl_NL/eventorganization.lang b/htdocs/langs/nl_NL/eventorganization.lang
index 7dce772b270..c5879ac5147 100644
--- a/htdocs/langs/nl_NL/eventorganization.lang
+++ b/htdocs/langs/nl_NL/eventorganization.lang
@@ -1,4 +1,5 @@
 # Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+# Copyright (C) 2021		Dorian Vabre			<dorian.vabre@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
@@ -16,86 +17,127 @@
 #
 # Generic
 #
-ModuleEventOrganizationName = Event Organization
-EventOrganizationDescription = Event Organization through Module Project
-EventOrganizationDescriptionLong= Manage Event organization for conference, attendees, speaker, and attendees, with public subcription page
+ModuleEventOrganizationName = Evenementenorganisatie
+EventOrganizationDescription = Evenementenorganisatie via moduleproject
+EventOrganizationDescriptionLong= Beheer evenementorganisatie voor conferentie, aanwezigen, spreker en aanwezigen, met openbare abonnementspagina
 #
 # Menu
 #
-EventOrganizationMenuLeft = Organized events
-EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
+EventOrganizationMenuLeft = Georganiseerde evenementen
+EventOrganizationConferenceOrBoothMenuLeft = Conferentie of stand
 
 #
 # Admin page
 #
-EventOrganizationSetup = Event Organization setup
+EventOrganizationSetup = Evenementorganisatie instellen
 Settings = Instellingen
-EventOrganizationSetupPage = Event Organization setup page
-EVENTORGANIZATION_TASK_LABEL = Label of tasks to create automatically when project is validated
-EVENTORGANIZATION_TASK_LABELTooltip = When you validate an organized event, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conference<br>Send Call for Booth<br>Receive call for conferences<br>Receive call for Booth<br>Open subscriptions to events for attendees<br>Send remind of event to speakers<br>Send remind of event to Booth hoster<br>Send remind of event to attendees
-EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties automatically created when someone suggests a conference
-EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Category to add to third-parties automatically created when they suggests a booth
-EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Template of email to send after receiving a suggestion of a conference.
-EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Template of email to send after receiving a suggestion of a booth.
-EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Template of email to send  after a subscription to a booth has been paid.
-EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Template of email to send after a subscription to an event has been paid.
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Template of email of massaction to attendes
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
-EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+EventOrganizationSetupPage = Instellingenpagina voor evenementorganisatie
+EVENTORGANIZATION_TASK_LABEL = Label van taken om automatisch te maken wanneer het project is gevalideerd
+EVENTORGANIZATION_TASK_LABELTooltip = Wanneer u een georganiseerd evenement valideert, kunnen sommige taken automatisch worden aangemaakt in het project <br> <br> Bijvoorbeeld: <br> Send Call for Conference <br> Send Call for Booth <br> Send call for conferences a0342fcc Receive call for aanwezigen herinner aan evenement naar sprekers <br> Stuur herinnering aan evenement naar standhoster <br> Stuur herinnering aan evenement naar aanwezigen
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Categorie om toe te voegen aan derden, automatisch aangemaakt wanneer iemand een conferentie voorstelt
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Categorie om toe te voegen aan derden, automatisch aangemaakt wanneer ze een stand voorstellen
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Sjabloon van e-mail om te verzenden na ontvangst van een suggestie van een conferentie.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Sjabloon van e-mail om te verzenden na ontvangst van een suggestie van een stand.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Sjabloon van e-mail om te verzenden nadat een abonnement op een stand is betaald.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Sjabloon van e-mail om te verzenden nadat een abonnement op een evenement is betaald.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Sjabloon van e-mail van massage aan aanwezigen
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Sjabloon van e-mail van massage aan sprekers
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter de selectielijst van derden in de kaart/formulier voor het maken van deelnemers met categorie
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter de selectielijst van derden in de kaart/formulier voor het maken van deelnemers met het klanttype
 
 #
 # Object
 #
-EventOrganizationConfOrBooth= Conference Or Booth
-ManageOrganizeEvent = Manage event organisation
-ConferenceOrBooth = Conference Or Booth
-ConferenceOrBoothTab = Conference Or Booth
-AmountOfSubscriptionPaid = Amount of subscription paid
-DateSubscription = Date of subscription
+EventOrganizationConfOrBooth= Conferentie of stand
+ManageOrganizeEvent = Evenementenorganisatie beheren
+ConferenceOrBooth = Conferentie of stand
+ConferenceOrBoothTab = Conferentie of stand
+AmountOfSubscriptionPaid = Bedrag betaald abonnement
+DateSubscription = Datum van inschrijving
 ConferenceOrBoothAttendee = Conference Or Booth Attendee
 
 #
 # Template Mail
 #
-YourOrganizationEventConfRequestWasReceived = Your request for conference was received
-YourOrganizationEventBoothRequestWasReceived = Your request for booth was received
-EventOrganizationEmailAskConf = Request for conference
-EventOrganizationEmailAskBooth = Request for booth
-EventOrganizationEmailSubsBooth = Subscription for booth
-EventOrganizationEmailSubsEvent = Subscription for an event
-EventOrganizationMassEmailAttendees = Communication to attendees
-EventOrganizationMassEmailSpeakers = Communication to speakers
+YourOrganizationEventConfRequestWasReceived = Uw verzoek voor een conferentie is ontvangen
+YourOrganizationEventBoothRequestWasReceived = Uw aanvraag voor een stand is ontvangen
+EventOrganizationEmailAskConf = Verzoek om conferentie
+EventOrganizationEmailAskBooth = Aanvraag voor stand
+EventOrganizationEmailSubsBooth = Abonnement op stand
+EventOrganizationEmailSubsEvent = Abonnement voor een evenement
+EventOrganizationMassEmailAttendees = Communicatie naar deelnemers
+EventOrganizationMassEmailSpeakers = Communicatie naar sprekers
 
 #
 # Event
 #
-AllowUnknownPeopleSuggestConf=Allow unknown people to suggest conferences
-AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest conferences
-AllowUnknownPeopleSuggestBooth=Allow unknown people to suggest booth
-AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to suggest booth
-PriceOfRegistration=Price of registration
-PriceOfRegistrationHelp=Price of registration
-PriceOfBooth=Subscription price to stand a booth
-PriceOfBoothHelp=Subscription price to stand a booth
-EventOrganizationICSLink=Link ICS for events
-ConferenceOrBoothInformation=Conference Or Booth informations
-Attendees = Attendees
-EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+AllowUnknownPeopleSuggestConf=Onbekenden toestaan om conferenties voor te stellen
+AllowUnknownPeopleSuggestConfHelp=Onbekenden toestaan om conferenties voor te stellen
+AllowUnknownPeopleSuggestBooth=Laat onbekenden een stand voorstellen
+AllowUnknownPeopleSuggestBoothHelp=Laat onbekenden een stand voorstellen
+PriceOfRegistration=Prijs van registratie
+PriceOfRegistrationHelp=Prijs van registratie
+PriceOfBooth=Abonnementsprijs om een stand te staan
+PriceOfBoothHelp=Abonnementsprijs om een stand te staan
+EventOrganizationICSLink=Link ICS voor evenementen
+ConferenceOrBoothInformation=Informatie over conferentie of stand Or
+Attendees = deelnemers
+DownloadICSLink = ICS-link downloaden
+EVENTORGANIZATION_SECUREKEY = Beveiligde sleutel van de openbare registratielink naar een conferentie
+SERVICE_BOOTH_LOCATION = Service gebruikt voor de factuurregel over een standlocatie
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service die wordt gebruikt voor de factuurrij over een deelnemersabonnement op een conferentie
 #
 # Status
 #
 EvntOrgDraft = Ontwerp
-EvntOrgSuggested = Suggested
-EvntOrgConfirmed = Confirmed
-EvntOrgNotQualified = Not Qualified
+EvntOrgSuggested = Suggereerde
+EvntOrgConfirmed = bevestigd
+EvntOrgNotQualified = Niet gekwalificeerd
 EvntOrgDone = Uitgevoerd
-EvntOrgCancelled = Cancelled
+EvntOrgCancelled = Geannuleerd
 #
 # Public page
 #
-PublicAttendeeSubscriptionPage = Public link of registration to a conference
-MissingOrBadSecureKey = The security key is invalid or missing
-EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
-EvntOrgStartDuration = This conference starts on
-EvntOrgEndDuration =  and ends on
+SuggestForm = Suggestie pagina
+RegisterPage = Pagina voor conferenties of stand
+EvntOrgRegistrationHelpMessage = Hier kunt u stemmen op een evenement of een nieuwe conferentie of stand voorstellen voor het project
+EvntOrgRegistrationConfHelpMessage = Hier kunt u een nieuwe conferentie voor het project voorstellen
+EvntOrgRegistrationBoothHelpMessage = Hier kunt u een nieuwe stand voor het project voorstellen
+ListOfSuggestedConferences = Lijst met voorgestelde conferenties
+ListOfSuggestedBooths = Lijst met voorgestelde stands
+SuggestConference = Een nieuwe conferentie voorstellen
+SuggestBooth = Stel een stand voor
+ViewAndVote = Bekijk en stem op voorgestelde evenementen
+PublicAttendeeSubscriptionPage = Openbare link van registratie voor een conferentie
+MissingOrBadSecureKey = De beveiligingssleutel is ongeldig of ontbreekt
+EvntOrgWelcomeMessage = Met dit formulier kunt u zich als nieuwe deelnemer aan de conferentie registreren: '%s'
+EvntOrgDuration = Deze conferentie begint op %s en eindigt op %s.
+ConferenceAttendeeFee = Conferentiebezoekerstarief voor het evenement: '%s' variërend van %s tot %s.
+BoothLocationFee = Standplaats voor het evenement : '%s' van %s tot %s
+EventType = Taak type
+
+#
+# Vote page
+#
+EvntOrgRegistrationWelcomeMessage = Welkom op de congres- of standsuggestiepagina.
+EvntOrgRegistrationConfWelcomeMessage = Welkom op de pagina met congressuggesties.
+EvntOrgRegistrationBoothWelcomeMessage = Welkom op de stand suggestie pagina.
+EvntOrgVoteHelpMessage = Hier kunt u de voorgestelde evenementen voor het project bekijken en erop stemmen
+VoteOk = Uw stem is geaccepteerd.
+AlreadyVoted = Je hebt al op dit evenement gestemd.
+VoteError = Er is een fout opgetreden tijdens het stemmen, probeer het opnieuw.
+
+#
+# SubscriptionOk page
+#
+SubscriptionOk = Uw abonnement op deze conferentie is gevalideerd
+#
+# Subscription validation mail
+#
+ConfAttendeeSubscriptionConfirmation = Bevestiging van uw abonnement op een conferentie
+#
+# Payment page
+#
+Attendee = deelnemer
+PaymentConferenceAttendee = Conferentie deelnemer betaling
+PaymentBoothLocation = Standplaats betaling
diff --git a/htdocs/langs/nl_NL/externalsite.lang b/htdocs/langs/nl_NL/externalsite.lang
index 1685de63461..a5de68679db 100644
--- a/htdocs/langs/nl_NL/externalsite.lang
+++ b/htdocs/langs/nl_NL/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
 ExternalSiteSetup=Instellingen voor de link naar een externe website
-ExternalSiteURL=External Site URL of HTML iframe content
+ExternalSiteURL=Externe site-URL van HTML-iframe-inhoud
 ExternalSiteModuleNotComplete=Module Externe Site werd niet correct geconfigureerd.
 ExampleMyMenuEntry=Mijn menu-item
diff --git a/htdocs/langs/nl_NL/help.lang b/htdocs/langs/nl_NL/help.lang
index 386e07c3007..2274f1bd640 100644
--- a/htdocs/langs/nl_NL/help.lang
+++ b/htdocs/langs/nl_NL/help.lang
@@ -1,23 +1,23 @@
 # Dolibarr language file - Source file is en_US - help
-CommunitySupport=Forum en Wiki ondersteuning
-EMailSupport=E-mailondersteuning
-RemoteControlSupport=Online realtime / externe ondersteuning
+CommunitySupport=Forum/Wiki-ondersteuning
+EMailSupport=Ondersteuning voor e-mails
+RemoteControlSupport=Online realtime / ondersteuning op afstand
 OtherSupport=Andere ondersteuning
-ToSeeListOfAvailableRessources=Om contact op te nemen zie de beschikbare bronnen:
+ToSeeListOfAvailableRessources=Om contact op te nemen/beschikbare bronnen te bekijken:
 HelpCenter=Helpcentrum
-DolibarrHelpCenter=Help- en ondersteuningscentrum van Dolibarr
-ToGoBackToDolibarr=Anders <a href="%s">klikt u hier om Dolibarr te blijven gebruiken</a> .
-TypeOfSupport=Soort ondersteuning
+DolibarrHelpCenter=Dolibarr Help- en ondersteuningscentrum
+ToGoBackToDolibarr=Anders <a href="%s"> klik hier om Dolibarr te blijven gebruiken </a> .
+TypeOfSupport=Type ondersteuning
 TypeSupportCommunauty=Gemeenschap (gratis)
-TypeSupportCommercial=Commercieel (betaald)
-TypeOfHelp=Soort
-NeedHelpCenter=Hulp of support nodig?
-Efficiency=Efficiëntie
-TypeHelpOnly=Alleen Hulp
-TypeHelpDev=Hulp & Ontwikkeling
-TypeHelpDevForm=Help + Ontwikkeling + Training
-BackToHelpCenter=<a href="%s">Ga anders terug naar de startpagina van het Helpcentrum</a> .
-LinkToGoldMember=U kunt een van de door Dolibarr geselecteerde trainers voor uw taal (%s) bellen door op hun Widget te klikken (status en maximumprijs worden automatisch bijgewerkt):
+TypeSupportCommercial=Reclame
+TypeOfHelp=Type
+NeedHelpCenter=Hulp of ondersteuning nodig?
+Efficiency=efficiëntie
+TypeHelpOnly=Alleen hulp
+TypeHelpDev=Help+Ontwikkeling
+TypeHelpDevForm=Help+Ontwikkeling+Training
+BackToHelpCenter=Ga anders <a href="%s"> terug naar de startpagina van het Helpcentrum </a> .
+LinkToGoldMember=U kunt een van de door Dolibarr voor uw taal geselecteerde trainers bellen (%s) door op hun Widget te klikken (status en maximumprijs worden automatisch bijgewerkt):
 PossibleLanguages=Ondersteunde talen
-SubscribeToFoundation=Help het Dolibarr-project, abonneer u op de stichting
-SeeOfficalSupport=Voor officiële Dolibarr ondersteuning in uw taal: <br><b><a href="%s" target="_blank">%s</a></b>
+SubscribeToFoundation=Help het Dolibarr-project, abonneer je op de stichting
+SeeOfficalSupport=Voor officiële Dolibarr-ondersteuning in uw taal: <br> <b> <a href="%s" target="_blank"> %s </a> </b>
diff --git a/htdocs/langs/nl_NL/holiday.lang b/htdocs/langs/nl_NL/holiday.lang
index c85ba9f9f1d..07fe2313c26 100644
--- a/htdocs/langs/nl_NL/holiday.lang
+++ b/htdocs/langs/nl_NL/holiday.lang
@@ -13,7 +13,7 @@ ToReviewCP=Wachten op goedkeuring
 ApprovedCP=Goedgekeurd
 CancelCP=Geannuleerd
 RefuseCP=Geweigerd
-ValidatorCP=Gevolmachtigde voor goedkeuring
+ValidatorCP=Goedkeurder
 ListeCP=Lijst van verlof
 Leave=Verlof aanvraag
 LeaveId=Laat ID achter
@@ -39,10 +39,10 @@ TitreRequestCP=Verlof aanvraag
 TypeOfLeaveId=Type verlof-ID
 TypeOfLeaveCode=Type verlofcode
 TypeOfLeaveLabel=Soort verloflabel
-NbUseDaysCP=Aantal verbruikte verlofdagen
-NbUseDaysCPHelp=De berekening houdt rekening met de niet-werkdagen en de feestdagen gedefinieerd in het woordenboek.
-NbUseDaysCPShort=Dagen verbruikt
-NbUseDaysCPShortInMonth=Dagen verbruikt in maand
+NbUseDaysCP=Aantal gebruikte verlofdagen
+NbUseDaysCPHelp=De berekening houdt rekening met de niet-werkdagen en de feestdagen die in het woordenboek zijn gedefinieerd.
+NbUseDaysCPShort=Verlofdagen
+NbUseDaysCPShortInMonth=Verlofdagen in maand
 DayIsANonWorkingDay=%s is een niet-werkdag
 DateStartInMonth=Startdatum in maand
 DateEndInMonth=Einddatum in maand
@@ -55,7 +55,7 @@ TitleDeleteCP=Verwijderen verlofverzoek
 ConfirmDeleteCP=Akkoord met het verwijderen van het verlofverzoek?
 ErrorCantDeleteCP=Fout. U heeft geen rechten dit verzoek te verwijderen.
 CantCreateCP=U heeft geen rechten voor het aanmaken van uw verlofverzoek
-InvalidValidatorCP=U moet een iemand kiezen voor het goedkeuren van het verlofverzoek
+InvalidValidatorCP=U moet een persoon voor goedkeuring kiezen voor uw verlofaanvraag.
 NoDateDebut=U moet een startdatum ingeven.
 NoDateFin=U moet een einddatum ingeven.
 ErrorDureeCP=Uw verzoek betreft geen werkdag.
@@ -80,14 +80,14 @@ UserCP=Gebruiker
 ErrorAddEventToUserCP=Er is een fout ontstaan bij het toekennen van het uitzonderlijk verlof.
 AddEventToUserOkCP=Het uitzonderlijk verlof is toegevoegd.
 MenuLogCP=Raadplegen log van wijzigingen
-LogCP=Overzicht aanpassingen van beschikbare vakantiedagen
-ActionByCP=Gedaan door
-UserUpdateCP=Voor gebruiker
+LogCP=Logboek van alle updates van "Verlofsaldo"
+ActionByCP=Bijgewerkt door
+UserUpdateCP=Bijgewerkt voor
 PrevSoldeCP=Vorig saldo
 NewSoldeCP=Nieuw saldo
 alreadyCPexist=U heeft een verlofverzoek aangemaakt welke reeds bestaat voor deze periode.
-FirstDayOfHoliday=Eerste vakantiedag
-LastDayOfHoliday=Laatste vakantiedag
+FirstDayOfHoliday=Begin dag verlofaanvraag
+LastDayOfHoliday=Einde verlofdag aanvraag
 BoxTitleLastLeaveRequests=Laatste %s aangepaste verlofverzoeken
 HolidaysMonthlyUpdate=Maandelijkse update
 ManualUpdate=Handmatige update
@@ -104,8 +104,8 @@ LEAVE_SICK=Ziekteverlof
 LEAVE_OTHER=Overig verlof
 LEAVE_PAID_FR=Betaalde vakantie
 ## Configuration du Module ##
-LastUpdateCP=Laatste automatische update van verloftoewijzing
-MonthOfLastMonthlyUpdate=Maand van laatste automatische update van verloftoewijzing
+LastUpdateCP=Laatste automatische update verloftoewijzing
+MonthOfLastMonthlyUpdate=Maand van de laatste automatische update van verloftoewijzing
 UpdateConfCPOK=Bijgewerkt.
 Module27130Name= Beheer verlofverzoeken
 Module27130Desc= Beheer verlofverzoeken
@@ -125,8 +125,8 @@ HolidaysCanceledBody=Uw verlofverzoek van%s tot %s is geannuleerd.
 FollowedByACounter=1: Dit soort verlof moet worden vervolgd met een teller. Deze zal handmatig of automatisch worden opgehoogd en wanneer verlofverzoek is goedgekeurd, zal deze automatisch aftellen. <br>0: Niet worden vervolgd met teller
 NoLeaveWithCounterDefined=Er zijn geen soorten verlof waarbij een teller nodig is.
 GoIntoDictionaryHolidayTypes=Ga naar <strong>Home - Instellingen - Woordenboeken - Soort verlof</strong> om de verschillende soorten bladeren in te stellen.
-HolidaySetup=Installatie van module Vakantie
-HolidaysNumberingModules=Verlaat nummeringsmodellen
+HolidaySetup=Opstelling van module Verlof
+HolidaysNumberingModules=Nummeringsmodellen voor verlofaanvragen
 TemplatePDFHolidays=Sjabloon voor verlofaanvragen PDF
 FreeLegalTextOnHolidays=Vrije tekst op PDF
 WatermarkOnDraftHolidayCards=Watermerken op ontwerp verlofaanvragen
diff --git a/htdocs/langs/nl_NL/hrm.lang b/htdocs/langs/nl_NL/hrm.lang
index 479157a79aa..f1c5d57fef4 100644
--- a/htdocs/langs/nl_NL/hrm.lang
+++ b/htdocs/langs/nl_NL/hrm.lang
@@ -9,7 +9,7 @@ ConfirmDeleteEstablishment=Weet u zeker dat u deze vestiging wilt verwijderen?
 OpenEtablishment=Open vestiging
 CloseEtablishment=Sluit vestiging
 # Dictionary
-DictionaryPublicHolidays=HRM - Feestdagen
+DictionaryPublicHolidays=Verlof - Feestdagen
 DictionaryDepartment=HRM - Afdelingslijst
 DictionaryFunction=HRM - Vacatures
 # Module
diff --git a/htdocs/langs/nl_NL/knowledgemanagement.lang b/htdocs/langs/nl_NL/knowledgemanagement.lang
index 21c29de7faf..86d66f3b3de 100644
--- a/htdocs/langs/nl_NL/knowledgemanagement.lang
+++ b/htdocs/langs/nl_NL/knowledgemanagement.lang
@@ -18,16 +18,16 @@
 #
 
 # Module label 'ModuleKnowledgeManagementName'
-ModuleKnowledgeManagementName = Knowledge Management System
+ModuleKnowledgeManagementName = Kennisbeheersysteem
 # Module description 'ModuleKnowledgeManagementDesc'
-ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+ModuleKnowledgeManagementDesc=Beheer een Knowledge Management (KM) of helpdeskbasis
 
 #
 # Admin page
 #
-KnowledgeManagementSetup = Knowledge Management System setup
+KnowledgeManagementSetup = Kennisbeheersysteem instellen
 Settings = Instellingen
-KnowledgeManagementSetupPage = Knowledge Management System setup page
+KnowledgeManagementSetupPage = Kennisbeheersysteem opstartpagina
 
 
 #
@@ -46,10 +46,10 @@ KnowledgeManagementArea = Kennis Management
 #
 # Menu
 #
-MenuKnowledgeRecord = Knowledge base
-ListOfArticles = List of articles
-NewKnowledgeRecord = New article
-ValidateReply = Validate solution
-KnowledgeRecords = Articles
+MenuKnowledgeRecord = Kennis basis
+ListKnowledgeRecord = Lijst met artikelen
+NewKnowledgeRecord = Nieuw artikel
+ValidateReply = Valideer oplossing
+KnowledgeRecords = Lidwoord
 KnowledgeRecord = Artikel
-KnowledgeRecordExtraFields = Extrafields for Article
+KnowledgeRecordExtraFields = Extravelden voor Artikel
diff --git a/htdocs/langs/nl_NL/languages.lang b/htdocs/langs/nl_NL/languages.lang
index 4d1ee5150ff..2bd2bc753f0 100644
--- a/htdocs/langs/nl_NL/languages.lang
+++ b/htdocs/langs/nl_NL/languages.lang
@@ -3,6 +3,7 @@ Language_am_ET=Ethiopisch
 Language_ar_AR=Arabisch
 Language_ar_EG=Arabisch (Egyptisch)
 Language_ar_SA=Arabisch
+Language_ar_TN=Arabisch (Tunesië)
 Language_az_AZ=Azerbeidzjaans
 Language_bn_BD=Bengaals
 Language_bn_IN=Bengaals (India)
@@ -84,6 +85,7 @@ Language_nl_NL=Nederlands
 Language_pl_PL=Pools
 Language_pt_BR=Portugees (Brazilië)
 Language_pt_PT=Portugees
+Language_ro_MD=Roemeens (Moldavië)
 Language_ro_RO=Roemeens
 Language_ru_RU=Russisch
 Language_ru_UA=Russisch (Oekraïne)
diff --git a/htdocs/langs/nl_NL/mails.lang b/htdocs/langs/nl_NL/mails.lang
index 0e423abdd91..58b39229dc0 100644
--- a/htdocs/langs/nl_NL/mails.lang
+++ b/htdocs/langs/nl_NL/mails.lang
@@ -15,7 +15,7 @@ MailToUsers=Aan gebruiker(s)
 MailCC=Kopieën aan (cc)
 MailToCCUsers=Kopiëren naar gebruiker(s)
 MailCCC=Blinde kopie aan (bcc)
-MailTopic=Email subject
+MailTopic=E-mail onderwerp
 MailText=Bericht
 MailFile=Bijgevoegde bestanden
 MailMessage=E-mail inhoud
@@ -131,8 +131,8 @@ NoNotificationsWillBeSent=Er staan geen e-mail kennisgevingen gepland voor dit t
 ANotificationsWillBeSent=1 automatische notificatie zal worden verstuurd per e-mail
 SomeNotificationsWillBeSent=%s automatische notificatie zal per e-mail worden verstuurd
 AddNewNotification=Abonneer u op een nieuwe automatische e-mailmelding (doel/gebeurtenis)
-ListOfActiveNotifications=List of all active subscriptions (targets/events) for automatic email notification
-ListOfNotificationsDone=List of all automatic email notifications sent
+ListOfActiveNotifications=Lijst met alle actieve abonnementen (doelen/evenementen) voor automatische e-mailmelding
+ListOfNotificationsDone=Lijst met alle automatisch verzonden e-mailmeldingen
 MailSendSetupIs=Configuratie van e-mailverzending is ingesteld op '%s'. Deze modus kan niet worden gebruikt om bulk e-mails te verzenden.
 MailSendSetupIs2=Ga eerst met een beheerdersaccount naar menu %s Home - Set-up - E-mails%s om de parameter <strong>'%s'</strong> te wijzigen om de modus '%s' te gebruiken. Met deze modus kunt u de installatie van de SMTP-server van uw internetprovider openen en de functie Bulk e-mails gebruiken.
 MailSendSetupIs3=Indien u vragen heeft inzake de SMTP server, went u zich dan tot %s.
@@ -175,5 +175,5 @@ Answered=Beantwoord
 IsNotAnAnswer=Is geen antwoord (initiële e-mail)
 IsAnAnswer=Is een antwoord van een initiële e-mail
 RecordCreatedByEmailCollector=Record aangemaakt door de E-mail Collector %s van e-mail %s
-DefaultBlacklistMailingStatus=Default contact status for refuse bulk emailing
-DefaultStatusEmptyMandatory=Empty but mandatory
+DefaultBlacklistMailingStatus=Standaard contactstatus voor bulkmailing weigeren
+DefaultStatusEmptyMandatory=Leeg maar verplicht
diff --git a/htdocs/langs/nl_NL/main.lang b/htdocs/langs/nl_NL/main.lang
index 0a42f7f79c5..4a0eb506398 100644
--- a/htdocs/langs/nl_NL/main.lang
+++ b/htdocs/langs/nl_NL/main.lang
@@ -8,28 +8,28 @@ FONTFORPDF=helvetica
 FONTSIZEFORPDF=10
 SeparatorDecimal=,
 SeparatorThousand=Space
-FormatDateShort=%d-%m-%Y
-FormatDateShortInput=%d-%m-%Y
-FormatDateShortJava=dd-MM-yyyy
-FormatDateShortJavaInput=dd-MM-yyyy
-FormatDateShortJQuery=dd-mm-yy
-FormatDateShortJQueryInput=dd-mm-yy
+FormatDateShort=%m/%d/%Y
+FormatDateShortInput=%m/%d/%Y
+FormatDateShortJava=MM/dd/jjjj
+FormatDateShortJavaInput=MM/dd/jjjj
+FormatDateShortJQuery=mm/dd/jj
+FormatDateShortJQueryInput=mm/dd/jj
 FormatHourShortJQuery=HH:MI
-FormatHourShort=%H:%M %p
+FormatHourShort=%I:%M %p
 FormatHourShortDuration=%H:%M
-FormatDateTextShort=%d %b %Y
-FormatDateText=%d %B %Y
-FormatDateHourShort=%d-%m-%Y %H:%M
-FormatDateHourSecShort=%d/%m/%Y %I:%M:%S %p
-FormatDateHourTextShort=%d %b %Y %H:%M
-FormatDateHourText=%d %B %Y %H:%M
+FormatDateTextShort=%b %d, %Y
+FormatDateText=%B %d, %Y
+FormatDateHourShort=%m/%d/%Y %I:%M %p
+FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
+FormatDateHourTextShort=%b %d, %Y, %I:%M %p
+FormatDateHourText=%B %d, %Y, %I:%M %p
 DatabaseConnection=Databaseverbinding
 NoTemplateDefined=Geen sjabloon beschikbaar voor dit e-mailtype
 AvailableVariables=Beschikbare substitutievariabelen
 NoTranslation=Geen vertaling
 Translation=Vertaling
-CurrentTimeZone=Huidige tijdzone (server)
-EmptySearchString=Voer geen lege zoekcriteria in
+CurrentTimeZone=TimeZone PHP (server)
+EmptySearchString=Voer niet-lege zoekcriteria in
 EnterADateCriteria=Voer een datumcriterium in
 NoRecordFound=Geen item gevonden
 NoRecordDeleted=Geen record verwijderd
@@ -180,7 +180,7 @@ SaveAndNew=Opslaan en nieuw
 TestConnection=Test verbinding
 ToClone=Klonen
 ConfirmCloneAsk=Weet u zeker dat u het object <b> %s </b> wilt klonen?
-ConfirmClone=Choose the data you want to clone:
+ConfirmClone=Kies de gegevens die u wilt klonen:
 NoCloneOptionsSpecified=Geen gegevens om te klonen gedefinieerd.
 Of=van
 Go=Ga
@@ -224,7 +224,7 @@ Value=Waarde
 PersonalValue=Persoonlijke waarde
 NewObject=Nieuw %s
 NewValue=Nieuwe waarde
-OldValue=Old value %s
+OldValue=Oude waarde %s
 CurrentValue=Huidige waarde
 Code=Code
 Type=Type
@@ -246,7 +246,7 @@ DefaultModel=Standaard document sjabloon
 Action=Actie
 About=Over
 Number=Aantal
-NumberByMonth=Total reports by month
+NumberByMonth=Totaal aantal rapporten per maand
 AmountByMonth=Bedrag per maand
 Numero=Nummer
 Limit=Limiet
@@ -278,7 +278,7 @@ DateModificationShort=Wijzigingsdatum
 IPModification=Wijziging IP
 DateLastModification=Laatste wijzigingsdatum
 DateValidation=Validatiedatum
-DateSigning=Signing date
+DateSigning=Ondertekeningsdatum
 DateClosing=Sluitingsdatum
 DateDue=Vervaldatum
 DateValue=Valutadatum
@@ -341,8 +341,8 @@ KiloBytes=KiloBytes
 MegaBytes=MegaBytes
 GigaBytes=GigaBytes
 TeraBytes=Terabytes
-UserAuthor=Ceated by
-UserModif=Updated by
+UserAuthor=opgemaakt door
+UserModif=Bijgewerkt door
 b=b
 Kb=Kb
 Mb=Mb
@@ -362,7 +362,7 @@ UnitPriceHTCurrency=Eenheidsprijs (excl.) (Valuta)
 UnitPriceTTC=Eenheidsprijs (bruto)
 PriceU=E.P.
 PriceUHT=EP (netto)
-PriceUHTCurrency=U.P (net) (currency)
+PriceUHTCurrency=U.P (netto) (valuta)
 PriceUTTC=U.P. (inc. belasting)
 Amount=Bedrag
 AmountInvoice=Factuurbedrag
@@ -390,8 +390,8 @@ AmountTotal=Totaal bedrag
 AmountAverage=Gemiddeld bedrag
 PriceQtyMinHT=Prijs hoeveelheid min. (excl. belasting)
 PriceQtyMinHTCurrency=Prijs hoeveelheid min. (excl. belasting) (valuta)
-PercentOfOriginalObject=Percent of original object
-AmountOrPercent=Amount or percent
+PercentOfOriginalObject=Percentage van origineel object
+AmountOrPercent=Bedrag of percentage
 Percentage=Percentage
 Total=Totaal
 SubTotal=Subtotaal
@@ -430,6 +430,7 @@ LT1IN=CGST
 LT2IN=SGST
 LT1GC=Bijkomende centen
 VATRate=BTW-tarief
+RateOfTaxN=Belastingtarief %s
 VATCode=Belastingtariefcode
 VATNPR=NPR belastingtarief
 DefaultTaxRate=BTW tarief
@@ -661,7 +662,7 @@ SupplierPreview=Voorbeeld van leverancier
 ShowCustomerPreview=Toon afnemersvoorbeeldweergave
 ShowSupplierPreview=Laat voorbeeld leverancier zien
 RefCustomer=Referentie afnemer
-InternalRef=Internal ref.
+InternalRef=Interne ref.
 Currency=Valuta
 InfoAdmin=Informatie voor beheerders
 Undo=Ongedaan maken
@@ -729,7 +730,8 @@ MenuMembers=Leden
 MenuAgendaGoogle=Google-agenda
 MenuTaxesAndSpecialExpenses=Belastingen | Bijzondere kosten
 ThisLimitIsDefinedInSetup=Dolibarr limiet (Menu Home-Instellingen-Beveiliging): %s Kb, PHP grens: %s Kb
-NoFileFound=No documents uploaded
+ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
+NoFileFound=Geen documenten geüpload
 CurrentUserLanguage=Huidige taal
 CurrentTheme=Actuele thema
 CurrentMenuManager=Huidige menu manager
@@ -845,7 +847,7 @@ XMoreLines=%s regel(s) verborgen
 ShowMoreLines=Laat meer/minder regels zien
 PublicUrl=Openbare URL
 AddBox=Box toevoegen
-SelectElementAndClick=Select an element and click on %s
+SelectElementAndClick=Selecteer een element en klik op %s
 PrintFile=Bestand afdrukken %s
 ShowTransaction=Toon bankmutatie
 ShowIntervention=Tonen tussenkomst
@@ -856,8 +858,8 @@ Denied=Gewijgerd
 ListOf=Lijst van %s
 ListOfTemplates=Lijst van templates
 Gender=Geslacht
-Genderman=Male
-Genderwoman=Female
+Genderman=Mannetje
+Genderwoman=Vrouw
 Genderother=Overig
 ViewList=Bekijk lijst
 ViewGantt=Gantt-weergave
@@ -904,10 +906,10 @@ ViewAccountList=Grootboek bekijken
 ViewSubAccountList=Bekijk het grootboek van de subrekening
 RemoveString='%s' string verwijderen
 SomeTranslationAreUncomplete=Sommige aangeboden talen zijn mogelijk slechts gedeeltelijk vertaald of kunnen fouten bevatten. Help ons om uw taal te corrigeren door u te registreren op <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> om uw verbeteringen toe te voegen.
-DirectDownloadLink=Public download link
-PublicDownloadLinkDesc=Only the link is required to download the file
-DirectDownloadInternalLink=Private download link
-PrivateDownloadLinkDesc=You need to be logged and you need permissions to view or download the file
+DirectDownloadLink=Openbare downloadlink
+PublicDownloadLinkDesc=Alleen de link is vereist om het bestand te downloaden
+DirectDownloadInternalLink=Privé downloadlink
+PrivateDownloadLinkDesc=Je moet ingelogd zijn en je hebt rechten nodig om het bestand te bekijken of te downloaden
 Download=Downloaden
 DownloadDocument=Download document
 ActualizeCurrency=Bijwerken valutakoers
@@ -1020,7 +1022,7 @@ SearchIntoContacts=Contacten
 SearchIntoMembers=Leden
 SearchIntoUsers=Gebruikers
 SearchIntoProductsOrServices=Diensten of Producten
-SearchIntoBatch=Lots / Serials
+SearchIntoBatch=Loten/series
 SearchIntoProjects=Projecten
 SearchIntoMO=Productieorders
 SearchIntoTasks=Taken
@@ -1057,13 +1059,13 @@ KeyboardShortcut=Sneltoets
 AssignedTo=Geaffecteerden
 Deletedraft=Concept verwijderen
 ConfirmMassDraftDeletion=Bevestiging van de massa-verwijdering
-FileSharedViaALink=File shared with a public link
+FileSharedViaALink=Bestand gedeeld met een openbare link
 SelectAThirdPartyFirst=Selecteer eerst een derde ...
 YouAreCurrentlyInSandboxMode=U bent momenteel in de %s "sandbox" -modus
 Inventory=Inventarisering
 AnalyticCode=Analisten code
 TMenuMRP=MRP
-ShowCompanyInfos=Show company infos
+ShowCompanyInfos=Toon bedrijfsinfo
 ShowMoreInfos=Meer info weergeven
 NoFilesUploadedYet=Upload eerst een document
 SeePrivateNote=Zie privébrief
@@ -1072,6 +1074,7 @@ ValidFrom=Geldig vanaf
 ValidUntil=Geldig tot
 NoRecordedUsers=Geen gebruikers
 ToClose=Sluiten
+ToRefuse=Weigeren
 ToProcess=Te verwerken
 ToApprove=Goed te keuren
 GlobalOpenedElemView=Globale weergave
@@ -1124,11 +1127,13 @@ OutOfDate=Verouderd
 EventReminder=Herinnering voor evenement
 UpdateForAllLines=Update voor alle lijnen
 OnHold=In de wacht
-Civility=Civility
+Civility=Beleefdheid
 AffectTag=Heeft invloed op de tag
+CreateExternalUser=Externe gebruiker aanmaken
 ConfirmAffectTag=invloed op bulk-tag
 ConfirmAffectTagQuestion=Weet u zeker dat u tags wilt beïnvloeden voor de %s geselecteerde record (s)?
 CategTypeNotFound=Geen tag-soort gevonden voor type records
-CopiedToClipboard=Copied to clipboard
-InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
-ConfirmCancel=Are you sure you want to cancel
+CopiedToClipboard=Gekopieerd naar het klembord
+InformationOnLinkToContract=Dit bedrag is alleen het totaal van alle regels van het contract. Er wordt geen rekening gehouden met tijd.
+ConfirmCancel=Weet je zeker dat je dit wilt annuleren
+EmailMsgID=Email MsgID
diff --git a/htdocs/langs/nl_NL/margins.lang b/htdocs/langs/nl_NL/margins.lang
index dae8b70553b..e41996c0acb 100644
--- a/htdocs/langs/nl_NL/margins.lang
+++ b/htdocs/langs/nl_NL/margins.lang
@@ -22,7 +22,7 @@ ProductService=Trainning of Dienst
 AllProducts=Alle Trainingen en Diensten
 ChooseProduct/Service=Kies Training of Dienst
 ForceBuyingPriceIfNull=Forceren inkoop/kostprijs naar verkoopprijs als dit niet is gedefinieerd
-ForceBuyingPriceIfNullDetails=If buying/cost price not provided when we add a new line, and this option is "ON", the margin will be 0 on the new line (buying/cost price = selling price). If this option is "OFF" (recommended), margin will be equal to the value suggested by default (and may be 100% if no default value can be found).
+ForceBuyingPriceIfNullDetails=Als er bij het toevoegen van een nieuwe regel geen koop-/kostprijs wordt opgegeven, en deze optie is "AAN", dan is de marge 0 op de nieuwe regel (koop-/kostprijs = verkoopprijs). Als deze optie "UIT" is (aanbevolen), is de marge gelijk aan de standaard voorgestelde waarde (en kan 100% zijn als er geen standaardwaarde kan worden gevonden).
 MARGIN_METHODE_FOR_DISCOUNT=Marge methode voor globale discounts
 UseDiscountAsProduct=Als een training
 UseDiscountAsService=Als een dienst
diff --git a/htdocs/langs/nl_NL/members.lang b/htdocs/langs/nl_NL/members.lang
index 5260e6da794..75063377dde 100644
--- a/htdocs/langs/nl_NL/members.lang
+++ b/htdocs/langs/nl_NL/members.lang
@@ -15,24 +15,24 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Een ander lid <b>(naam: %s, login: %s
 ErrorUserPermissionAllowsToLinksToItselfOnly=Om veiligheidsredenen, moeten aan u rechten worden verleend voor het bewerken van alle gebruikers om in staat te zijn een lid te koppelen aan een gebruiker die niet van u is.
 SetLinkToUser=Link naar een Dolibarr gebruiker
 SetLinkToThirdParty=Link naar een derde partij in Dolibarr
-MembersCards=Business cards for members
+MembersCards=Visitekaartjes voor leden
 MembersList=Ledenlijst
 MembersListToValid=Lijst van conceptleden (te valideren)
 MembersListValid=Lijst van geldige leden
 MembersListUpToDate=Geldige leden met een up-to-date abonnement
 MembersListNotUpToDate=Geldige leden met een verouderd abonnement
-MembersListExcluded=List of excluded members
+MembersListExcluded=Lijst met uitgesloten leden
 MembersListResiliated=Lijst verwijderde leden
 MembersListQualified=Lijst van gekwalificeerde leden
 MenuMembersToValidate=Conceptleden
 MenuMembersValidated=Gevalideerde leden
-MenuMembersExcluded=Excluded members
+MenuMembersExcluded=uitgesloten leden
 MenuMembersResiliated=Verwijderde leden
 MembersWithSubscriptionToReceive=Leden die abonnement moeten ontvangen
 MembersWithSubscriptionToReceiveShort=Abonnement ontvangen
 DateSubscription=Inschrijvingsdatum
 DateEndSubscription=Einddatum abonnement
-EndSubscription=Subscription Ends
+EndSubscription=Abonnement loopt af
 SubscriptionId=Inschrijvings-ID
 WithoutSubscription=Zonder abonnement
 MemberId=Lid ID
@@ -49,12 +49,12 @@ MemberStatusActiveLate=Abonnement verlopen
 MemberStatusActiveLateShort=Verlopen
 MemberStatusPaid=Abonnement bijgewerkt
 MemberStatusPaidShort=Bijgewerkt
-MemberStatusExcluded=Excluded member
-MemberStatusExcludedShort=Excluded
+MemberStatusExcluded=uitgesloten lid
+MemberStatusExcludedShort=uitgesloten
 MemberStatusResiliated=Verwijderd lid
 MemberStatusResiliatedShort=Verwijderd
 MembersStatusToValid=Conceptleden
-MembersStatusExcluded=Excluded members
+MembersStatusExcluded=uitgesloten leden
 MembersStatusResiliated=Verwijderde leden
 MemberStatusNoSubscription=Gevalideerd (geen abonnement vereist)
 MemberStatusNoSubscriptionShort=Gevalideerd
@@ -83,12 +83,12 @@ WelcomeEMail=Welkomst e-mail
 SubscriptionRequired=Abonnement vereist
 DeleteType=Verwijderen
 VoteAllowed=Stemming toegestaan
-Physical=Individual
-Moral=Corporation
-MorAndPhy=Corporation and Individual
-Reenable=Re-Enable
-ExcludeMember=Exclude a member
-ConfirmExcludeMember=Are you sure you want to exclude this member ?
+Physical=Individueel
+Moral=bedrijf
+MorAndPhy=Bedrijf en individu
+Reenable=Opnieuw inschakelen
+ExcludeMember=Een lid uitsluiten
+ConfirmExcludeMember=Weet u zeker dat u dit lid wilt uitsluiten?
 ResiliateMember=Verwijder een lid
 ConfirmResiliateMember=Weet je zeker dat je dit lidmaatschap wilt beëindigen?
 DeleteMember=Lid verwijderen
@@ -144,7 +144,7 @@ DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=E-mailsjabloon om te gebruiken om
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=E-mailsjabloon om te gebruiken om e-mail naar een lid te sturen bij nieuwe abonnementopname
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=E-mailsjabloon om te gebruiken om e-mailherinnering te verzenden wanneer het abonnement afloopt
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=E-mailsjabloon om te gebruiken om e-mail naar een lid te verzenden bij annulering van een lid
-DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=E-mailsjabloon om te gebruiken om e-mail te sturen naar een lid met uitsluiting van leden
 DescADHERENT_MAIL_FROM=E-mail afzender voor automatische e-mails
 DescADHERENT_ETIQUETTE_TYPE=Etikettenformaat
 DescADHERENT_ETIQUETTE_TEXT=Tekst op leden adres-blad
@@ -170,31 +170,31 @@ DocForLabels=Genereer adresvellen (formaat voor de uitvoer zoals ingesteld: <b>%
 SubscriptionPayment=Betaling van abonnement
 LastSubscriptionDate=Datum van laatste abonnementbetaling
 LastSubscriptionAmount=Bedrag van het laatste abonnement
-LastMemberType=Last Member type
+LastMemberType=Type laatste lid
 MembersStatisticsByCountries=Leden statistieken per land
 MembersStatisticsByState=Leden statistieken per staat / provincie
 MembersStatisticsByTown=Leden van de statistieken per gemeente
 MembersStatisticsByRegion=Leden statistieken per regio
-NbOfMembers=Total number of members
-NbOfActiveMembers=Total number of current active members
+NbOfMembers=Totaal aantal leden
+NbOfActiveMembers=Totaal aantal huidige actieve leden
 NoValidatedMemberYet=Geen gevalideerde leden gevonden
-MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
-MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
-MembersByTownDesc=This screen show you statistics of members by town.
-MembersByNature=This screen show you statistics of members by nature.
-MembersByRegion=This screen show you statistics of members by region.
+MembersByCountryDesc=Dit scherm toont u de statistieken van leden per land. Grafieken en grafieken zijn afhankelijk van de beschikbaarheid van de online grafiekenservice van Google en van de beschikbaarheid van een werkende internetverbinding.
+MembersByStateDesc=Dit scherm toont u statistieken van leden per staat/provincies/kanton.
+MembersByTownDesc=Dit scherm toont u statistieken van leden per stad.
+MembersByNature=Dit scherm toont u statistieken van leden van nature.
+MembersByRegion=Dit scherm toont u statistieken van leden per regio.
 MembersStatisticsDesc=Kies de statistieken die u wilt lezen ...
 MenuMembersStats=Statistiek
-LastMemberDate=Latest membership date
+LastMemberDate=Laatste lidmaatschapsdatum
 LatestSubscriptionDate=Laatste abonnementsdatum
-MemberNature=Nature of the member
-MembersNature=Nature of the members
-Public=Information is public
+MemberNature=Aard van het lid
+MembersNature=Aard van de leden
+Public=Informatie is openbaar
 NewMemberbyWeb=Nieuw lid toegevoegd. In afwachting van goedkeuring
 NewMemberForm=Nieuw lid formulier
-SubscriptionsStatistics=Subscriptions statistics
+SubscriptionsStatistics=Abonnementsstatistieken
 NbOfSubscriptions=Aantal abonnementen
-AmountOfSubscriptions=Amount collected from subscriptions
+AmountOfSubscriptions=Bedrag geïnd via abonnementen
 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
@@ -213,3 +213,5 @@ SendReminderForExpiredSubscription=Stuur een herinnering per e-mail naar leden w
 MembershipPaid=Lidmaatschap betaald voor huidige periode (tot %s)
 YouMayFindYourInvoiceInThisEmail=Mogelijk vindt u uw factuur bij deze e-mail
 XMembersClosed=%s lid (leden) gesloten
+XExternalUserCreated=%s externe gebruiker(s) aangemaakt
+ForceMemberNature=Forceer de aard van het lid (individueel of corporatie)
diff --git a/htdocs/langs/nl_NL/modulebuilder.lang b/htdocs/langs/nl_NL/modulebuilder.lang
index b70329e7b48..e853fc339a6 100644
--- a/htdocs/langs/nl_NL/modulebuilder.lang
+++ b/htdocs/langs/nl_NL/modulebuilder.lang
@@ -85,7 +85,7 @@ ListOfPermissionsDefined=Lijst met gedefinieerde machtigingen
 SeeExamples=Zie hier voorbeelden
 EnabledDesc=Voorwaarde om dit veld actief te hebben (voorbeelden: 1 of $ conf-&gt; global-&gt; MYMODULE_MYOPTION)
 VisibleDesc=Is het veld zichtbaar? (Voorbeelden: 0 = nooit zichtbaar, 1 = zichtbaar op lijst en formulieren maken / bijwerken / bekijken, 2 = alleen zichtbaar op lijst, 3 = alleen zichtbaar op formulier maken / bijwerken / bekijken (geen lijst), 4 = zichtbaar op lijst en update / view form only (not create), 5 = Alleen zichtbaar op lijst eindweergave formulier (niet create, not update). <br> <br> Het gebruik van een negatieve waarde betekent dat het veld niet standaard wordt weergegeven op de lijst, maar kan worden geselecteerd voor weergave). <br> <br> Het kan een uitdrukking zijn, bijvoorbeeld: <br> preg_match ('/ public /', $ _SERVER ['PHP_SELF'])? 0: 1 <br> ($ user-> rechten-> vakantie-> vakantie-> vakantie-> vakantie->)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br><br><strong>For document :</strong><br>0 = not displayed <br>1 = display<br>2 = display only if not empty<br><br><strong>For document lines :</strong><br>0 = not displayed <br>1 = displayed in a column<br>3 = display in line description column after the description<br>4 = display in description column after the description only if not empty
+DisplayOnPdfDesc=Geef dit veld weer op compatibele PDF-documenten, u kunt de positie beheren met het veld "Positie". <br> Momenteel bekende compatibele PDF-modellen zijn: eratosthene (bestelling), espadon (schip), spons (facturen), cyaan (propal/offerte), cornas (bestelling leverancier) <br> <br> <strong>65 Voor document = weergave <br> 2 = weergave alleen indien niet leeg <br> <br> <strong> Voor documentregels: </strong> <br> 0 = niet weergegeven beschrijving <br>ccbeschrijving = in kolom beschrijving alleen indien niet leeg
 DisplayOnPdf=Weergeven in PDF
 IsAMeasureDesc=Kan de waarde van het veld worden gecumuleerd om een totaal in de lijst te krijgen? (Voorbeelden: 1 of 0)
 SearchAllDesc=Wordt het veld gebruikt om een zoekopdracht uit het snelzoekprogramma te doen? (Voorbeelden: 1 of 0)
@@ -133,9 +133,9 @@ IncludeDocGeneration=Ik wil enkele documenten genereren van het object
 IncludeDocGenerationHelp=Als u dit aanvinkt, wordt er een code gegenereerd om een vak "Document genereren" aan de record toe te voegen.
 ShowOnCombobox=Waarde weergeven in combobox
 KeyForTooltip=Sleutel voor knopinfo
-CSSClass=CSS for edit/create form
-CSSViewClass=CSS for read form
-CSSListClass=CSS for list
+CSSClass=CSS voor het bewerken/aanmaken van formulier
+CSSViewClass=CSS voor leesformulier
+CSSListClass=CSS voor lijst
 NotEditable=Niet bewerkbaar
 ForeignKey=Vreemde sleutel
 TypeOfFieldsHelp=Type velden: <br> varchar (99), dubbel (24,8), real, tekst, html, datetime, timestamp, integer, integer: ClassName: relativepath / to / classfile.class.php [: 1 [: filter]] ('1' betekent we voegen een + -knop toe na de combo om het record te maken, 'filter' kan 'status = 1 EN fk_user = __USER_ID EN entiteit IN (bijvoorbeeld __SHARED_ENTITIES__)' zijn)
@@ -143,3 +143,4 @@ AsciiToHtmlConverter=Ascii naar HTML converter
 AsciiToPdfConverter=Ascii naar PDF converter
 TableNotEmptyDropCanceled=Tabel is niet leeg. Drop is geannuleerd.
 ModuleBuilderNotAllowed=De modulebouwer is beschikbaar maar niet toegestaan voor uw gebruiker.
+ImportExportProfiles=Profielen importeren en exporteren
diff --git a/htdocs/langs/nl_NL/mrp.lang b/htdocs/langs/nl_NL/mrp.lang
index ec0e4244c19..d94344175c0 100644
--- a/htdocs/langs/nl_NL/mrp.lang
+++ b/htdocs/langs/nl_NL/mrp.lang
@@ -13,7 +13,7 @@ BOMsSetup=Instellingen Stuklijsten
 ListOfBOMs=Lijst met stuklijsten - stuklijst
 ListOfManufacturingOrders=Lijst met productieorders
 NewBOM=Nieuwe stuklijst
-ProductBOMHelp=Product om te maken met deze stuklijst. <br> Opmerking: producten met de eigenschap 'Aard van product' = 'Grondstof' zijn niet zichtbaar in deze lijst.
+ProductBOMHelp=Product om te maken (of te demonteren) met deze stuklijst. <br> Let op: Producten met de eigenschap 'Aard van product' = 'Grondstof' zijn niet zichtbaar in deze lijst.
 BOMsNumberingModules=BOM nummeringsjablonen
 BOMsModelModule=Stuklijst-documentsjablonen
 MOsNumberingModules=MO-nummeringssjablonen
@@ -30,8 +30,8 @@ ValueOfMeansLoss=Waarde van 0,95 betekent een gemiddelde van 5%% verlies tijdens
 ValueOfMeansLossForProductProduced=Waarde van 0,95 betekent een gemiddelde van 5%% verlies van geproduceerd product
 DeleteBillOfMaterials=Stuklijst verwijderen
 DeleteMo=Productieorder verwijderen
-ConfirmDeleteBillOfMaterials=Weet je zeker dat je deze stuklijst wilt verwijderen?
-ConfirmDeleteMo=Weet je zeker dat je deze stuklijst wilt verwijderen?
+ConfirmDeleteBillOfMaterials=Weet u zeker dat u deze stuklijst wilt verwijderen?
+ConfirmDeleteMo=Weet u zeker dat u deze stuklijst wilt verwijderen?
 MenuMRP=Productieorders
 NewMO=Nieuwe productieorder
 QtyToProduce=Te produceren aantal
@@ -39,7 +39,7 @@ DateStartPlannedMo=Datum start gepland
 DateEndPlannedMo=Einddatum gepland
 KeepEmptyForAsap=Leeg betekent &#39;zo snel mogelijk&#39;
 EstimatedDuration=Geschatte duur
-EstimatedDurationDesc=Geschatte duur om dit product met deze stuklijst te produceren
+EstimatedDurationDesc=Geschatte duur om dit product te vervaardigen (of te demonteren) met behulp van deze stuklijst
 ConfirmValidateBom=Weet u zeker dat u de stuklijst wilt valideren met de referentie <strong>%s</strong> (u kunt deze gebruiken om nieuwe productieorders te maken)
 ConfirmCloseBom=Weet u zeker dat u deze stuklijst wilt annuleren (u kunt deze niet meer gebruiken om nieuwe productieorders te bouwen)?
 ConfirmReopenBom=Weet u zeker dat u deze stuklijst opnieuw wilt openen (u kunt deze gebruiken om nieuwe productieorders te bouwen)
@@ -63,6 +63,7 @@ ConsumeAndProduceAll=Alles consumeren en produceren
 Manufactured=geproduceerd
 TheProductXIsAlreadyTheProductToProduce=Het toe te voegen product is al het te produceren product.
 ForAQuantityOf=Voor een te produceren hoeveelheid van %s
+ForAQuantityToConsumeOf=Voor een te demonteren hoeveelheid %s
 ConfirmValidateMo=Weet u zeker dat u deze productieorder wilt valideren?
 ConfirmProductionDesc=Door op '1%s' te klikken, valideert u het verbruik en / of de productie voor de ingestelde hoeveelheden. Hiermee worden ook de voorraad- en recordbewegingen bijgewerkt.
 ProductionForRef=Productie van %s
@@ -78,27 +79,25 @@ TotalCost=Totale prijs
 BOMTotalCost=De kosten voor het produceren van deze stuklijst op basis van de kosten van elke hoeveelheid en elk te consumeren product (gebruik kostprijs indien gedefinieerd, anders gemiddelde gewogen prijs indien gedefinieerd, anders de beste aankoopprijs)
 GoOnTabProductionToProduceFirst=U moet eerst de productie hebben gestart om een Productieorder te sluiten (zie tabblad '%s'). Maar u kunt het annuleren.
 ErrorAVirtualProductCantBeUsedIntoABomOrMo=Een kit kan niet worden gebruikt in een stuklijst of een MO
-Workstation=Workstation
-Workstations=Workstations
-WorkstationsDescription=Workstations management
-WorkstationSetup = Workstations setup
-WorkstationSetupPage = Workstations setup page
-WorkstationAbout = About Workstation
-WorkstationAboutPage = Workstations about page
-WorkstationList=Workstation list
-WorkstationCreate=Add new workstation
-ConfirmEnableWorkstation=Are you sure you want to enable workstation <b>%s</b> ?
-EnableAWorkstation=Enable a workstation
-ConfirmDisableWorkstation=Are you sure you want to disable workstation <b>%s</b> ?
-DisableAWorkstation=Disable a workstation
-DeleteWorkstation=Supprimer
-NbOperatorsRequired=Number of operators required
-THMOperatorEstimated=Estimated operator THM
-THMMachineEstimated=Estimated machine THM
-WorkstationType=Workstation type
-Human=Human
+Workstation=Werkstation
+Workstations=Werkstations
+WorkstationsDescription=Beheer van werkstations
+WorkstationSetup = Werkstations instellen
+WorkstationSetupPage = Instellingenpagina werkstations
+WorkstationList=Werkstation lijst
+WorkstationCreate=Nieuw werkstation toevoegen
+ConfirmEnableWorkstation=Weet u zeker dat u werkstation <b> %s </b> wilt inschakelen?
+EnableAWorkstation=Een werkstation inschakelen
+ConfirmDisableWorkstation=Weet u zeker dat u werkstation <b> %s </b> wilt uitschakelen?
+DisableAWorkstation=Een werkstation uitschakelen
+DeleteWorkstation=Verwijderen
+NbOperatorsRequired=Aantal benodigde operators
+THMOperatorEstimated=Geschatte operator THM
+THMMachineEstimated=Geschatte machine THM
+WorkstationType=Type werkstation
+Human=Menselijk
 Machine=Machine
-HumanMachine=Human / Machine
-WorkstationArea=Workstation area
+HumanMachine=Mens / Machine
+WorkstationArea=Werkstationgebied
 Machines=Machines
-THMEstimatedHelp=This rate makes it possible to define a forecast cost of the item
+THMEstimatedHelp=Dit tarief maakt het mogelijk om een prognose van de kosten van het artikel te definiëren
diff --git a/htdocs/langs/nl_NL/orders.lang b/htdocs/langs/nl_NL/orders.lang
index ca02737b418..13425ee7708 100644
--- a/htdocs/langs/nl_NL/orders.lang
+++ b/htdocs/langs/nl_NL/orders.lang
@@ -11,13 +11,14 @@ OrderDate=Opdrachtdatum
 OrderDateShort=Besteldatum
 OrderToProcess=Te verwerken opdracht
 NewOrder=Nieuwe opdracht
+NewSupplierOrderShort=Nieuwe opdracht
 NewOrderSupplier=Nieuwe bestelling
 ToOrder=Te bestellen
 MakeOrder=Opdracht indienen
 SupplierOrder=Bestelling
 SuppliersOrders=Inkooporders
-SaleOrderLines=Sale order lines
-PurchaseOrderLines=Puchase order lines
+SaleOrderLines=Verkooporderregels
+PurchaseOrderLines=Inkooporderregels
 SuppliersOrdersRunning=Huidige inkooporders
 CustomerOrder=Klantorder
 CustomersOrders=Verkooporders
@@ -73,6 +74,7 @@ DeleteOrder=Verwijder opdracht
 CancelOrder=Annuleer opdracht
 OrderReopened= Order %s opnieuw openen
 AddOrder=Nieuwe bestelling
+AddSupplierOrderShort=Nieuwe bestelling
 AddPurchaseOrder=Maak inkooporder
 AddToDraftOrders=Voeg toe aan order in aanmaak
 ShowOrder=Toon opdracht
diff --git a/htdocs/langs/nl_NL/other.lang b/htdocs/langs/nl_NL/other.lang
index be3a21b260a..5c1a422fef6 100644
--- a/htdocs/langs/nl_NL/other.lang
+++ b/htdocs/langs/nl_NL/other.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - other
 SecurityCode=Beveiligingscode
-NumberingShort=N °
-Tools=Gereedschap
-TMenuTools=Gereedschap
-ToolsDesc=Alle tools die niet in andere menu-items zijn opgenomen, zijn hier gegroepeerd. <br> Alle tools zijn toegankelijk via het linkermenu.
+NumberingShort=N°
+Tools=Hulpmiddelen
+TMenuTools=Hulpmiddelen
+ToolsDesc=Alle tools die niet zijn opgenomen in andere menu-items zijn hier gegroepeerd. <br> Alle tools zijn toegankelijk via het linkermenu.
 Birthday=Verjaardag
 BirthdayAlertOn=Verjaardagskennisgeving actief
 BirthdayAlertOff=Verjaardagskennisgeving inactief
@@ -78,7 +78,7 @@ Notify_EXPENSE_REPORT_VALIDATE=Onkosten rapport gevalideerd (goedkeuring vereist
 Notify_EXPENSE_REPORT_APPROVE=Onkosten rapport goedgekeurd
 Notify_HOLIDAY_VALIDATE=Verlofaanvraag gevalideerd (goedkeuring vereist)
 Notify_HOLIDAY_APPROVE=Verzoek goedgekeurd laten
-Notify_ACTION_CREATE=Added action to Agenda
+Notify_ACTION_CREATE=Activiteit toegevoegd aan Agenda
 SeeModuleSetup=Zie setup van module %s
 NbOfAttachedFiles=Aantal bijgevoegde bestanden / documenten
 TotalSizeOfAttachedFiles=Totale omvang van de bijgevoegde bestanden / documenten
@@ -114,7 +114,7 @@ DemoCompanyAll=Bedrijf met meerdere activiteiten (alle hoofdmodules)
 CreatedBy=Gecreëerd door %s
 ModifiedBy=Gewijzigd door %s
 ValidatedBy=Gevalideerd door %s
-SignedBy=Signed by %s
+SignedBy=Ondertekend door %s
 ClosedBy=Gesloten door %s
 CreatedById=Aangemaakt door gebruiker ID
 ModifiedById=Gebruikers-ID van diegene die de laatste wijziging heeft aangebracht
@@ -129,6 +129,7 @@ ClosedByLogin=Gebruikerslogin die is gesloten
 FileWasRemoved=Bestand %s is verwijderd
 DirWasRemoved=Map %s is verwijderd
 FeatureNotYetAvailable=Onderdeel nog niet beschikbaar in huidige versie
+FeatureNotAvailableOnDevicesWithoutMouse=Functie niet beschikbaar op apparaten zonder muis
 FeaturesSupported=Ondersteunde functies
 Width=Breedte
 Height=Hoogte
@@ -183,7 +184,7 @@ EnableGDLibraryDesc=Installeer of schakel GD-bibliotheek op uw PHP-installatie i
 ProfIdShortDesc=Prof. id <b>%s</b> is een gegeven afhankelijk van het land.<br>Voor land <b>%s</b>, is de code bijvoorbeeld <b>%s</b>.
 DolibarrDemo=Dolibarr ERP / CRM demonstratie
 StatsByNumberOfUnits=Statistieken voor som van aantal producten / diensten
-StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
+StatsByNumberOfEntities=Statistieken voor het aantal verwijzende entiteiten (aantal facturen of bestellingen...)
 NumberOfProposals=Aantal voorstellen
 NumberOfCustomerOrders=Aantal verkooporders
 NumberOfCustomerInvoices=Aantal klant facturen
@@ -217,7 +218,7 @@ EMailTextExpenseReportValidated=Onkostendeclaratie %s is gevalideerd.
 EMailTextExpenseReportApproved=Onkostendeclaratie %s is goedgekeurd.
 EMailTextHolidayValidated=Verlofaanvraag %s is gevalideerd.
 EMailTextHolidayApproved=Verlofaanvraag %s is goedgekeurd.
-EMailTextActionAdded=The action %s has been added to the Agenda.
+EMailTextActionAdded=Activiteit %s is toegevoegd aan de Agenda.
 ImportedWithSet=Invoer dataset
 DolibarrNotification=Automatische kennisgeving
 ResizeDesc=Voer een nieuwe breedte <b>of</b> nieuwe hoogte in. Verhoudingen zullen intact blijven tijdens het schalen
@@ -245,7 +246,7 @@ NewKeyIs=Dit is uw nieuwe sleutel om in te loggen
 NewKeyWillBe=Uw nieuwe sleutel in te loggen zal zijn
 ClickHereToGoTo=Klik hier om naar %s
 YouMustClickToChange=Je moet echter wel eerst klikken op de volgende link om de wachtwoord wijziging te valideren
-ConfirmPasswordChange=Confirm password change
+ConfirmPasswordChange=Wachtwoord wijzigen bevestigen
 ForgetIfNothing=Als u deze wijziging niet heeft aangevraagd, negeer deze e-mail. Uw referenties blijven veilig bewaard.
 IfAmountHigherThan=Indien bedrag hoger dan <strong>%s</strong>
 SourcesRepository=Repository voor bronnen
@@ -263,7 +264,7 @@ ContactCreatedByEmailCollector=Contact / adres gecreëerd door e-mailverzamelaar
 ProjectCreatedByEmailCollector=Project gemaakt door e-mailverzamelaar uit e-mail MSGID %s
 TicketCreatedByEmailCollector=Ticket gemaakt door e-mailverzamelaar vanuit e-mail MSGID %s
 OpeningHoursFormatDesc=Gebruik a - om de openings- en sluitingsuren te scheiden. <br> Gebruik een spatie om verschillende bereiken in te voeren. <br> Voorbeeld: 8-12 14-18
-PrefixSession=Voorloper sessie-ID
+SuffixSessionName=Achtervoegsel voor sessienaam
 
 ##### Export #####
 ExportsArea=Uitvoeroverzicht
@@ -289,4 +290,4 @@ PopuProp=Producten / diensten op populariteit in voorstellen
 PopuCom=Producten / services op populariteit in Orders
 ProductStatistics=Producten / diensten Statistieken
 NbOfQtyInOrders=Aantal in bestellingen
-SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
+SelectTheTypeOfObjectToAnalyze=Selecteer een object om de statistieken te bekijken...
diff --git a/htdocs/langs/nl_NL/partnership.lang b/htdocs/langs/nl_NL/partnership.lang
index e50519a767c..6ad168a4570 100644
--- a/htdocs/langs/nl_NL/partnership.lang
+++ b/htdocs/langs/nl_NL/partnership.lang
@@ -16,41 +16,72 @@
 #
 # Generic
 #
-ModulePartnershipName = Partnerschap beheer
-PartnershipDescription = Module Partnerschap beheer
+ModulePartnershipName=Partnerschap beheer
+PartnershipDescription=Module Partnerschap beheer
 PartnershipDescriptionLong= Module Partnerschap beheer
 
+AddPartnership=Partnerschap toevoegen
+CancelPartnershipForExpiredMembers=Partnerschap: annuleer partnerschap van leden met verlopen abonnementen
+PartnershipCheckBacklink=Partnerschap: controleer verwijzende backlink
+
 #
 # Menu
 #
-NewPartnership = Nieuw partnerschap
-ListOfPartnerships = Overzicht van partnerschappen
+NewPartnership=Nieuw partnerschap
+ListOfPartnerships=Overzicht van partnerschappen
 
 #
 # Admin page
 #
-PartnershipSetup = Partnerschap instellingen
-PartnershipAbout = Over module partnerschap
-PartnershipAboutPage = Over module Partnerschap page
-
+PartnershipSetup=Partnerschap instellingen
+PartnershipAbout=Over module partnerschap
+PartnershipAboutPage=Over module Partnerschap page
+partnershipforthirdpartyormember=Partnerstatus moet zijn ingesteld op een 'relatie' of een 'lid'
+PARTNERSHIP_IS_MANAGED_FOR=Partnerschap beheerd voor
+PARTNERSHIP_BACKLINKS_TO_CHECK=Te controleren backlinks
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Aantal dagen voordat de status van een partnerschap wordt opgezegd wanneer een abonnement is verlopen
+ReferingWebsiteCheck=Controle van de website die verwijst
+ReferingWebsiteCheckDesc=U kunt een functie inschakelen om te controleren of uw partners een backlink hebben toegevoegd aan uw websitedomeinen op hun eigen website.
 
 #
 # Object
 #
+DeletePartnership=Verwijder een partnerschap
+PartnershipDedicatedToThisThirdParty=Partnerschap gewijd aan deze derde partij
+PartnershipDedicatedToThisMember=Partnerschap opgedragen aan dit lid
 DatePartnershipStart=Begindatum
 DatePartnershipEnd=Einddatum
+ReasonDecline=Reden afwijzing
+ReasonDeclineOrCancel=Reden afwijzing
+PartnershipAlreadyExist=Partnerschap bestaat reeds
+ManagePartnership=Partnerschap beheren
+BacklinkNotFoundOnPartnerWebsite=Backlink niet gevonden op partnerwebsite
+ConfirmClosePartnershipAsk=Weet u zeker dat u deze partnerschap wilt opzeggen?
+PartnershipType=Partnerschapstype
 
 #
 # Template Mail
 #
+SendingEmailOnPartnershipWillSoonBeCanceled=Partnerschap wordt binnenkort opgezegd
+SendingEmailOnPartnershipRefused=Partnerschap geweigerd
+SendingEmailOnPartnershipAccepted=Partnerschap geaccepteerd
+SendingEmailOnPartnershipCanceled=Partnerschap geannuleerd
 
+YourPartnershipWillSoonBeCanceledTopic=Partnerschap wordt binnenkort opgezegd
+YourPartnershipRefusedTopic=Partnerschap geweigerd
+YourPartnershipAcceptedTopic=Partnerschap geaccepteerd
+YourPartnershipCanceledTopic=Partnerschap geannuleerd
+
+YourPartnershipWillSoonBeCanceledContent=Wij informeren u dat uw partnerschap binnenkort wordt geannuleerd (Backlink niet gevonden)
+YourPartnershipRefusedContent=Wij informeren u dat uw partnerschapsverzoek is afgewezen.
+YourPartnershipAcceptedContent=Wij informeren u dat uw partnerschapsverzoek is geaccepteerd.
+YourPartnershipCanceledContent=Wij informeren u dat uw partnerschap is beëindigd.
 
 #
 # Status
 #
-PartnershipDraft = Ontwerp
-PartnershipAccepted = Geaccepteerd
-PartnershipRefused = Geweigerd
-PartnershipCanceled = Geannuleerd
-
-PartnershipManagedFor=Partners are
+PartnershipDraft=Ontwerp
+PartnershipAccepted=Geaccepteerd
+PartnershipRefused=Geweigerd
+PartnershipCanceled=Geannuleerd
+PartnershipManagedFor=Partners zijn
diff --git a/htdocs/langs/nl_NL/paybox.lang b/htdocs/langs/nl_NL/paybox.lang
index ca7cec78f75..e7fa7457f5e 100644
--- a/htdocs/langs/nl_NL/paybox.lang
+++ b/htdocs/langs/nl_NL/paybox.lang
@@ -11,7 +11,7 @@ YourEMail=E-mail om betalingsbevestiging te ontvangen
 Creditor=Crediteur
 PaymentCode=Betalingscode
 PayBoxDoPayment=Betalen met Paybox
-YouWillBeRedirectedOnPayBox=U wordt doorverwezen naar een beveiligde Paybox pagina om uw credit card informatie in te voeren
+YouWillBeRedirectedOnPayBox=U wordt doorverwezen naar een beveiligde Paybox pagina om uw creditcard informatie in te voeren
 Continue=Volgende
 SetupPayBoxToHavePaymentCreatedAutomatically=Stel uw Paybox in met url <b> %s </b> om de betaling automatisch te laten aanmaken na validatie door Paybox.
 YourPaymentHasBeenRecorded=Deze pagina bevestigd dat uw betaling succesvol in geregistreerd. Dank u.
@@ -20,7 +20,6 @@ AccountParameter=Accountwaarden
 UsageParameter=Met gebruik van de waarden
 InformationToFindParameters=Hulp om uw %s accountinformatie te vinden
 PAYBOX_CGI_URL_V2=URL van de Paybox CGI module voor betalingen
-VendorName=Verkopersnaam
 CSSUrlForPaymentForm=URL van het CSS-stijlbestand voor het betalingsformulier
 NewPayboxPaymentReceived=Betaling met Paybox ontvangen
 NewPayboxPaymentFailed=Poging te betalen met Paybox mislukt
diff --git a/htdocs/langs/nl_NL/productbatch.lang b/htdocs/langs/nl_NL/productbatch.lang
index a5f8646b2cc..102ba7bda6a 100644
--- a/htdocs/langs/nl_NL/productbatch.lang
+++ b/htdocs/langs/nl_NL/productbatch.lang
@@ -1,10 +1,10 @@
-# ProductBATCH language file - en_US - ProductBATCH
+# ProductBATCH language file - Source file is en_US - ProductBATCH
 ManageLotSerial=Gebruik lot / serienummer
-ProductStatusOnBatch=Yes (lot required)
-ProductStatusOnSerial=Yes (unique serial number required)
+ProductStatusOnBatch=Ja (lot vereist)
+ProductStatusOnSerial=Ja (uniek serienummer vereist)
 ProductStatusNotOnBatch=Nee (lot / serial niet gebruikt)
 ProductStatusOnBatchShort=Lot
-ProductStatusOnSerialShort=Serial
+ProductStatusOnSerialShort=Serienummer
 ProductStatusNotOnBatchShort=Nee
 Batch=Lot / Serienummer
 atleast1batchfield=Vervaldatum of uiterste verkoopdatum of Lot / Serienummer
@@ -24,12 +24,22 @@ ProductLotSetup=Module instellingen voor lot/serial
 ShowCurrentStockOfLot=Toon huidige voorraad voor product/lot paar
 ShowLogOfMovementIfLot=Toon bewegingslogboek voor product/lot paar
 StockDetailPerBatch=Voorraad details per lot
-SerialNumberAlreadyInUse=Serial number %s is already used for product %s
-TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
-BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
-BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
-ManageLotMask=Custom mask
-CustomMasks=Adds an option to define mask in the product card
-LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
-SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
-QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+SerialNumberAlreadyInUse=Serienummer %s wordt al gebruikt voor product %s
+TooManyQtyForSerialNumber=U kunt slechts één product %s hebben voor serienummer %s
+BatchLotNumberingModules=Opties voor het automatisch genereren van batchproducten beheerd door partijen
+BatchSerialNumberingModules=Opties voor het automatisch genereren van batchproducten beheerd door serienummers
+ManageLotMask=Aangepast masker
+CustomMasks=Voegt een optie toe om masker te definiëren in de productkaart
+LotProductTooltip=Voegt een optie toe aan de productkaart om een speciaal batchnummermasker te definiëren
+SNProductTooltip=Voegt een optie toe aan de productkaart om een speciaal serienummermasker te definiëren
+QtyToAddAfterBarcodeScan=Aantal toe te voegen voor elke gescande barcode/lot/serie
+LifeTime=Levensduur (in dagen)
+EndOfLife=Einde van het leven
+ManufacturingDate=Fabricage datum
+DestructionDate=Vernietigingsdatum:
+FirstUseDate=Datum eerste gebruik
+QCFrequency=Frequentie kwaliteitscontrole (in dagen)
+
+#Traceability - qc status
+OutOfOrder=Buiten gebruik
+InWorkingOrder=In werkende staat
diff --git a/htdocs/langs/nl_NL/products.lang b/htdocs/langs/nl_NL/products.lang
index 339c112b36a..6fa53cf624a 100644
--- a/htdocs/langs/nl_NL/products.lang
+++ b/htdocs/langs/nl_NL/products.lang
@@ -43,7 +43,7 @@ ServicesOnSaleOnly=Diensten alleen voor verkoop
 ServicesOnPurchaseOnly=Diensten alleen voor aankoop
 ServicesNotOnSell=Diensten niet voor aan- en verkoop
 ServicesOnSellAndOnBuy=Diensten voor verkoop en aankoop
-LastModifiedProductsAndServices=Latest %s products/services which were modified
+LastModifiedProductsAndServices=Laatste %s producten/diensten die zijn gewijzigd
 LastRecordedProducts=Laatste %s geregistreerde producten
 LastRecordedServices=Laatste %s geregistreerde diensten
 CardProduct0=Product
@@ -73,12 +73,12 @@ SellingPrice=Verkoopprijs
 SellingPriceHT=Verkoopprijs (excl. BTW)
 SellingPriceTTC=Verkoopprijs (inclusief belastingen)
 SellingMinPriceTTC=Minimale verkoopprijs (incl. BTW)
-CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
+CostPriceDescription=Dit prijsveld (excl. btw) kan worden gebruikt om het gemiddelde bedrag dat dit product voor uw bedrijf kost vast te leggen. Het kan elke prijs zijn die u zelf berekent, bijvoorbeeld uit de gemiddelde inkoopprijs plus de gemiddelde productie- en distributiekosten.
 CostPriceUsage=Deze waarde kan worden gebruik voor marge berekening.
 SoldAmount=Aantal verkocht
 PurchasedAmount=Aantal ingekocht
 NewPrice=Nieuwe prijs
-MinPrice=Min. selling price
+MinPrice=Min. verkoopprijs
 EditSellingPriceLabel=Bewerk het label met de verkoopprijs
 CantBeLessThanMinPrice=De verkoopprijs kan niet lager zijn dan de minimumprijs voor dit product ( %s zonder belasting)
 ContractStatusClosed=Gesloten
@@ -108,7 +108,7 @@ FillWithLastServiceDates=Vul de data van de laatste servicelijn in
 MultiPricesAbility=Meerdere prijssegmenten per product / dienst (elke klant bevindt zich in één prijssegment)
 MultiPricesNumPrices=Aantal prijzen
 DefaultPriceType=Basisprijzen per standaard (met versus zonder belasting) bij het toevoegen van nieuwe verkoopprijzen
-AssociatedProductsAbility=Enable Kits (set of several products)
+AssociatedProductsAbility=Activeer Kits (set van meerdere producten)
 VariantsAbility=Varianten inschakelen (variaties van producten, bijvoorbeeld kleur, maat)
 AssociatedProducts=Kits
 AssociatedProductsNumber=Aantal producten waaruit deze kit bestaat
@@ -141,7 +141,7 @@ VATRateForSupplierProduct=BTW-tarief (voor deze leverancier / dit product)
 DiscountQtyMin=Korting bij dit aantal
 NoPriceDefinedForThisSupplier=Geen prijs / aantal gedefinieerd voor deze leverancier / product
 NoSupplierPriceDefinedForThisProduct=Geen leveranciersprijs / aantal gedefinieerd voor dit product
-PredefinedItem=Predefined item
+PredefinedItem=Vooraf gedefinieerd item
 PredefinedProductsToSell=Voorgedefinieerd product
 PredefinedServicesToSell=Vooraf gedefinieerde service
 PredefinedProductsAndServicesToSell=Voorgedefinieerde producten/diensten voor koop
@@ -157,11 +157,11 @@ ListServiceByPopularity=Lijst met diensten naar populariteit
 Finished=Gereed product
 RowMaterial=Ruw materiaal
 ConfirmCloneProduct=Weet u zeker dat u dit product of deze dienst <b>%s</b> wilt klonen?
-CloneContentProduct=Clone all main information of the product/service
+CloneContentProduct=Kloon alle hoofdinformatie van het product/de dienst
 ClonePricesProduct=Prijzen klonen
-CloneCategoriesProduct=Clone linked tags/categories
-CloneCompositionProduct=Clone virtual products/services
-CloneCombinationsProduct=Clone the product variants
+CloneCategoriesProduct=Gelinkte labels/categorieën klonen
+CloneCompositionProduct=Virtuele producten/diensten klonen
+CloneCombinationsProduct=Kloon de productvarianten
 ProductIsUsed=Dit product wordt gebruikt
 NewRefForClone=Referentie naar nieuw produkt / dienst
 SellingPrices=Verkoop prijzen
@@ -170,12 +170,12 @@ CustomerPrices=Consumenten prijzen
 SuppliersPrices=Prijzen van leveranciers
 SuppliersPricesOfProductsOrServices=Leverancierprijzen (van producten of services)
 CustomCode=Douane | Goederen | HS-code
-CountryOrigin=Country of origin
-RegionStateOrigin=Region of origin
-StateOrigin=State|Province of origin
-Nature=Nature of product (raw/manufactured)
+CountryOrigin=Land van oorsprong
+RegionStateOrigin=Regio van Oorsprong
+StateOrigin=Staat|Provincie van herkomst
+Nature=Aard van het product (ruw/gefabriceerd)
 NatureOfProductShort=Aard van het product
-NatureOfProductDesc=Raw material or manufactured product
+NatureOfProductDesc=Grondstof of vervaardigd product
 ShortLabel=Kort label
 Unit=Eenheid
 p=u.
@@ -314,7 +314,7 @@ LastUpdated=Laatst bijgewerkt
 CorrectlyUpdated=Correct bijgewerkt
 PropalMergePdfProductActualFile=Gebruikte bestanden om toe te voegen aan PDF Azur zijn/is
 PropalMergePdfProductChooseFile=Selecteer PDF bestanden
-IncludingProductWithTag=Include products/services with tag
+IncludingProductWithTag=Producten/diensten opnemen met label
 DefaultPriceRealPriceMayDependOnCustomer=Standaard verkoopprijs, echte verkoopprijs kan bij klant zijn vastgelegd
 WarningSelectOneDocument=Selecteer tenminste één document
 DefaultUnitToShow=Eenheid
@@ -396,3 +396,5 @@ ActionAvailableOnVariantProductOnly=Actie alleen beschikbaar op de variant van h
 ProductsPricePerCustomer=Productprijzen per klant
 ProductSupplierExtraFields=Aanvullende attributen (leveranciersprijzen)
 DeleteLinkedProduct=Verwijder het onderliggende product dat aan de combinatie is gekoppeld
+PMPValue=Waardering (PMP)
+PMPValueShort=Waarde
diff --git a/htdocs/langs/nl_NL/projects.lang b/htdocs/langs/nl_NL/projects.lang
index e6dc26a72c0..98279c378fd 100644
--- a/htdocs/langs/nl_NL/projects.lang
+++ b/htdocs/langs/nl_NL/projects.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - projects
-RefProject=Ref. project
+RefProject=Project ref.
 ProjectRef=Project ref.
 ProjectId=Project Id
 ProjectLabel=Projectlabel
@@ -10,19 +10,19 @@ PrivateProject=Projectcontacten
 ProjectsImContactFor=Projecten waarvoor ik expliciet contactpersoon ben
 AllAllowedProjects=Alle projecten die ik kan lezen (mine + public)
 AllProjects=Alle projecten
-MyProjectsDesc=This view is limited to the projects that you are a contact for
+MyProjectsDesc=Deze weergave is beperkt tot de projecten waarvoor u contactpersoon bent
 ProjectsPublicDesc=Deze weergave toont alle projecten waarvoor u gerechtigd bent deze in te zien.
 TasksOnProjectsPublicDesc=Dit overzicht laat alle taken zien van projecten waarvoor u gemachtigd bent.
 ProjectsPublicTaskDesc=Deze weergave toont alle projecten en taken die je mag lezen.
 ProjectsDesc=Deze weergave toont alle projecten (Uw gebruikersrechten staan het u toe alles in te zien).
 TasksOnProjectsDesc=Dit overzicht laat alle projecten en alle taken zien (uw gebruikers-rechten geven u hiervoor toestemming).
-MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
+MyTasksDesc=Deze weergave is beperkt tot de projecten of taken waarvoor u een contactpersoon bent
 OnlyOpenedProject=Alleen projecten in bewerking zijn zichtbaar (projecten in concept of gesloten status zijn niet zichtbaar).
 ClosedProjectsAreHidden=Gesloten projecten zijn niet zichtbaar.
 TasksPublicDesc=Deze weergave toont alle projecten en taken die u mag inzien.
 TasksDesc=Deze weergave toont alle projecten en taken (Uw gebruikersrechten staan het u toe alles in te zien).
 AllTaskVisibleButEditIfYouAreAssigned=Alle taken voor gekwalificeerde projecten zijn zichtbaar, maar u kunt alleen tijd invoeren voor de taak die aan de geselecteerde gebruiker is toegewezen. Wijs een taak toe als u er tijd op wilt invoeren.
-OnlyYourTaskAreVisible=Only tasks assigned to you are visible. If you need to enter time on a task and if the task is not visible here, then you need to assign the task to yourself.
+OnlyYourTaskAreVisible=Alleen taken die aan u zijn toegewezen, zijn zichtbaar. Als je tijd moet invoeren voor een taak en als de taak hier niet zichtbaar is, dan moet je de taak aan jezelf toewijzen.
 ImportDatasetTasks=Taken bij projecten
 ProjectCategories=Labels/categorieën projecten
 NewProject=Nieuw project
@@ -85,11 +85,11 @@ ProgressCalculated=Vooruitgang in consumptie
 WhichIamLinkedTo=waaraan ik gekoppeld ben
 WhichIamLinkedToProject=die ik ben gekoppeld aan het project
 Time=Tijd
-TimeConsumed=Consumed
+TimeConsumed=verbruikt
 ListOfTasks=Lijst met taken
 GoToListOfTimeConsumed=Ga naar de lijst met tijd die is verbruikt
 GanttView=Gantt-weergave
-ListWarehouseAssociatedProject=List of warehouses associated to the project
+ListWarehouseAssociatedProject=Magazijnen welke aan het project zijn gekoppeld
 ListProposalsAssociatedProject=Lijst van de commerciële voorstellen met betrekking tot het project
 ListOrdersAssociatedProject=Lijst met verkooporders gerelateerd aan het project
 ListInvoicesAssociatedProject=Lijst met klantfacturen gerelateerd aan het project
@@ -202,7 +202,7 @@ ResourceNotAssignedToTheTask=Niet toegewezen aan de taak
 NoUserAssignedToTheProject=Geen gebruikers toegewezen aan dit project
 TimeSpentBy=Tijd doorgebracht door
 TasksAssignedTo=Taken toegekend aan
-AssignTaskToMe=Assign task to myself
+AssignTaskToMe=Taak aan mezelf toewijzen
 AssignTaskToUser=Ken taak toe aan %s
 SelectTaskToAssign=Selecteer taak om toe te wijzen ...
 AssignTask=Toewijzen
@@ -267,9 +267,11 @@ InvoiceToUse=Te gebruiken factuur
 NewInvoice=Nieuwe factuur
 OneLinePerTask=Eén regel per taak
 OneLinePerPeriod=Eén regel per periode
+OneLinePerTimeSpentLine=Eén regel voor elke tijdsbestedingsdeclaratie
 RefTaskParent=Ref. Bovenliggende taak
 ProfitIsCalculatedWith=Winst wordt berekend met
-AddPersonToTask=Add also to tasks
-UsageOrganizeEvent=Usage: Event Organization
-PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
-PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
+AddPersonToTask=Voeg ook toe aan taken
+UsageOrganizeEvent=Gebruik: Evenementenorganisatie
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classificeer project als gesloten wanneer alle taken zijn voltooid (100%% voortgang)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Opmerking: de voortgang van bestaande projecten met alle taken op 100%% wordt niet beïnvloed: u zult ze handmatig moeten sluiten. Deze optie is alleen van invloed op open projecten.
+SelectLinesOfTimeSpentToInvoice=Selecteer tijdsregels die niet zijn gefactureerd en vervolgens de bulkactie "Factuur genereren" om ze te factureren
diff --git a/htdocs/langs/nl_NL/propal.lang b/htdocs/langs/nl_NL/propal.lang
index cecfecdff60..2c323d364d1 100644
--- a/htdocs/langs/nl_NL/propal.lang
+++ b/htdocs/langs/nl_NL/propal.lang
@@ -59,7 +59,7 @@ ConfirmClonePropal=Weet u zeker dat u offerte <b>%s</b>  wilt kopiëren?
 ConfirmReOpenProp=Weet u zeker dat u offerte <b>%s</b> opnieuw wilt openen?
 ProposalsAndProposalsLines=Offertes en offerteregels
 ProposalLine=Offerteregel
-ProposalLines=Proposal lines
+ProposalLines=Voorstelregels
 AvailabilityPeriod=Leveringstermijn
 SetAvailability=Bepaal leveringstermijn
 AfterOrder=na bestelling
diff --git a/htdocs/langs/nl_NL/receptions.lang b/htdocs/langs/nl_NL/receptions.lang
index 427d9a84bf5..8938ac8ac49 100644
--- a/htdocs/langs/nl_NL/receptions.lang
+++ b/htdocs/langs/nl_NL/receptions.lang
@@ -44,4 +44,4 @@ ValidateOrderFirstBeforeReception=Je moet eerst de bestelling valideren voordat
 ReceptionsNumberingModules=Nummeringsmodule voor ontvangsten
 ReceptionsReceiptModel=Documentsjablonen voor ontvangsten
 NoMorePredefinedProductToDispatch=Geen voorgedefinieerde producten meer om te verzenden
-
+ReceptionExist=Ontvangst bestaat reeds
diff --git a/htdocs/langs/nl_NL/salaries.lang b/htdocs/langs/nl_NL/salaries.lang
index 5f91fe4db8b..830cbac4c19 100644
--- a/htdocs/langs/nl_NL/salaries.lang
+++ b/htdocs/langs/nl_NL/salaries.lang
@@ -2,12 +2,15 @@
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Grootboekrekening voor medewerker derde partij
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=De boekhoudrekening die in het gebruikersbestand is gedefinieerd, wordt alleen gebruikt voor aanvullende boekhouding. Deze wordt gebruikt voor het grootboek en als standaardwaarde voor aanvullende boekhouding als de speciale rekening van de gebruiker niet is gedefinieerd.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Standaard grootboekrekening voor salaris betalingen
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=Laat standaard de optie "Automatisch een totale betaling aanmaken" leeg bij het aanmaken van een Salaris
 Salary=Salaris
 Salaries=Salarissen
-NewSalaryPayment=Nieuwe salarisbetaling
+NewSalary=Nieuw salaris
+NewSalaryPayment=Nieuwe salariskaart
 AddSalaryPayment=Salarisbetaling toevoegen
 SalaryPayment=Salarisbetaling
 SalariesPayments=Salarisbetalingen
+SalariesPaymentsOf=Salarisbetalingen van %s
 ShowSalaryPayment=Toon salarisbetaling
 THM=Gemiddeld uurtarief
 TJM=Gemiddeld dagtarief
diff --git a/htdocs/langs/nl_NL/sendings.lang b/htdocs/langs/nl_NL/sendings.lang
index ec3734cae7b..280b0ca839e 100644
--- a/htdocs/langs/nl_NL/sendings.lang
+++ b/htdocs/langs/nl_NL/sendings.lang
@@ -43,7 +43,7 @@ ConfirmValidateSending=Weet u zeker dat u deze zending wilt valideren met als re
 ConfirmCancelSending=Weet u zeker dat u deze verzending wilt annuleren?
 DocumentModelMerou=Merou A5 model
 WarningNoQtyLeftToSend=Waarschuwing, geen producten die op verzending wachten.
-StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
+StatsOnShipmentsOnlyValidated=Statistieken zijn alleen voor gevalideerde zendingen. Gebruikte datum is de datum van validatie van verzending (geplande leverdatum is niet altijd bekend)
 DateDeliveryPlanned=Verwachte leverdatum
 RefDeliveryReceipt=Ref-ontvangstbewijs
 StatusReceipt=Status ontvangstbevestiging
diff --git a/htdocs/langs/nl_NL/stocks.lang b/htdocs/langs/nl_NL/stocks.lang
index 5ff151d9fd7..d482fcccb26 100644
--- a/htdocs/langs/nl_NL/stocks.lang
+++ b/htdocs/langs/nl_NL/stocks.lang
@@ -19,8 +19,8 @@ Stock=Voorraad
 Stocks=Voorraden
 MissingStocks=Ontbrekende voorraad
 StockAtDate=Voorraden op datum
-StockAtDateInPast=Date in the past
-StockAtDateInFuture=Date in the future
+StockAtDateInPast=Datum in het verleden
+StockAtDateInFuture=Datum in de toekomst
 StocksByLotSerial=Voorraad volgorde op lot/serienummer
 LotSerial=Partij/Serienummer
 LotSerialList=Overzicht van partij/serienummers
@@ -37,8 +37,8 @@ AllWarehouses=Alle magazijnen
 IncludeEmptyDesiredStock=Voeg ook een negatieve voorraad toe met een ongedefinieerde gewenste voorraad
 IncludeAlsoDraftOrders=Neem ook conceptorders op
 Location=Locatie
-LocationSummary=Short name of location
-NumberOfDifferentProducts=Number of unique products
+LocationSummary=Korte naam van de locatie
+NumberOfDifferentProducts=Aantal unieke producten
 NumberOfProducts=Totaal aantal producten
 LastMovement=Laatste verplaatsing
 LastMovements=Laatste mutaties
@@ -56,14 +56,12 @@ UnitPurchaseValue=Eenheidsprijs
 StockTooLow=Voorraad te laag
 StockLowerThanLimit=Voorraad lager dan alarmlimiet (%s)
 EnhancedValue=Waardering
-PMPValue=Waardering (PMP)
-PMPValueShort=Waarde
 EnhancedValueOfWarehouses=Voorraadwaardering
 UserWarehouseAutoCreate=Creëer automatisch een gebruikersmagazijn wanneer u een gebruiker aanmaakt
 AllowAddLimitStockByWarehouse=Beheer ook de waarde voor minimale en gewenste voorraad per paar (productmagazijn) naast de waarde voor minimale en gewenste voorraad per product
 RuleForWarehouse=Voorwaarden magazijnen
-WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
-WarehouseAskWarehouseDuringPropal=Set a warehouse on Commercial proposals
+WarehouseAskWarehouseOnThirparty=Stel een magazijn in op relatie
+WarehouseAskWarehouseDuringPropal=Stel een magazijn in op offertes
 WarehouseAskWarehouseDuringOrder=Stel een magazijn in op Verkooporders
 UserDefaultWarehouse=Stel een magazijn in op gebruikers
 MainDefaultWarehouse=Standaardmagazijn
@@ -91,23 +89,23 @@ NoPredefinedProductToDispatch=Geen vooraf ingestelde producten voor dit object.
 DispatchVerb=Verzending
 StockLimitShort=Alarm limiet
 StockLimit=Alarm voorraadlimiet
-StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
+StockLimitDesc=(leeg) betekent geen waarschuwing. <br> 0 kan worden gebruikt om een waarschuwing te activeren zodra de voorraad op is.
 PhysicalStock=Fysieke voorraad
 RealStock=Werkelijke voorraad
 RealStockDesc=Fysieke/echte voorraad is de voorraad die momenteel in de magazijnen aanwezig is.
 RealStockWillAutomaticallyWhen=De werkelijke voorraad wordt aangepast volgens deze regel (zoals gedefinieerd in de module Voorraad):
 VirtualStock=Virtuele voorraad
 VirtualStockAtDate=Virtuele voorraad op datum
-VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen date will be finished
+VirtualStockAtDateDesc=Virtuele voorraad zodra alle lopende bestellingen die gepland zijn om vóór de gekozen datum te worden verwerkt, zijn voltooid
 VirtualStockDesc=Virtuele voorraad is de berekende voorraad die beschikbaar is zodra alle openstaande / lopende acties (die van invloed zijn op voorraden) zijn gesloten (inkooporders ontvangen, verkooporders verzonden, productieorders geproduceerd, enz.)
-AtDate=At date
+AtDate=op datum
 IdWarehouse=Magazijn-ID
 DescWareHouse=Beschrijving magazijn
 LieuWareHouse=Localisatie magazijn
 WarehousesAndProducts=Magazijn en producten
 WarehousesAndProductsBatchDetail=Magazijnen en producten (met detail per lot/serieenummer)
 AverageUnitPricePMPShort=Waardering (PMP)
-AverageUnitPricePMPDesc=The input average unit price we had to expense to get 1 unit of product into our stock.
+AverageUnitPricePMPDesc=De gemiddelde invoerprijs per eenheid die we moesten maken om 1 eenheid product in onze voorraad te krijgen.
 SellPriceMin=Verkopen Prijs per Eenheid
 EstimatedStockValueSellShort=Verkoopwaarde
 EstimatedStockValueSell=Verkoopwaarde
@@ -147,7 +145,7 @@ Replenishments=Bevoorradingen
 NbOfProductBeforePeriod=Aantal op voorraad van product %s voor de gekozen periode (<%s)
 NbOfProductAfterPeriod=Aantal op voorraad van product %s na de gekozen periode (<%s)
 MassMovement=Volledige verplaatsing
-SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
+SelectProductInAndOutWareHouse=Selecteer een bronmagazijn en een doelmagazijn, een product en een hoeveelheid en klik vervolgens op "%s". Zodra dit voor alle vereiste bewegingen is gedaan, klikt u op "%s".
 RecordMovement=Vastleggen verplaatsing
 ReceivingForSameOrder=Ontvangsten voor deze bestelling
 StockMovementRecorded=Geregistreerde voorraadbewegingen
@@ -156,7 +154,7 @@ StockMustBeEnoughForInvoice=Het voorraadniveau moet voldoende zijn om het produc
 StockMustBeEnoughForOrder=Het voorraadniveau moet voldoende zijn om product / dienst aan de bestelling toe te voegen (controle wordt uitgevoerd op de huidige reële voorraad wanneer een regel wordt toegevoegd, ongeacht de regel voor automatische voorraadwijziging)
 StockMustBeEnoughForShipment= Voorraadniveau moet voldoende zijn om product / dienst aan verzending toe te voegen (controle wordt uitgevoerd op huidige reële voorraad bij het toevoegen van een regel aan verzending, ongeacht de regel voor automatische voorraadwijziging)
 MovementLabel=Label van de verplaatsing
-TypeMovement=Direction of movement
+TypeMovement=Richting van beweging
 DateMovement=Datum van verplaatsing
 InventoryCode=Verplaatsing of inventaris code
 IsInPackage=Vervat in pakket
@@ -185,7 +183,7 @@ inventoryCreatePermission=Aanmaken nieuwe inventarisatie
 inventoryReadPermission=Bekijk inventarisaties
 inventoryWritePermission=Bijwerken inventarisaties
 inventoryValidatePermission=Inventarisatie goedkeuren
-inventoryDeletePermission=Delete inventory
+inventoryDeletePermission=Voorraad verwijderen
 inventoryTitle=Inventarisering
 inventoryListTitle=Inventariseringen
 inventoryListEmpty=Geen inventarisering in opbouw
@@ -238,20 +236,23 @@ StockIsRequiredToChooseWhichLotToUse=Voorraad is vereist om te kiezen welk lot t
 ForceTo=Toevoegen aan
 AlwaysShowFullArbo=Volledige boomstructuur van magazijn weergeven op pop-up van magazijnkoppelingen (Waarschuwing: dit kan de prestaties drastisch verminderen)
 StockAtDatePastDesc=U kunt hier de echte voorraad op een bepaalde datum in het verleden bekijken
-StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
+StockAtDateFutureDesc=U kunt hier de voorraad (virtuele voorraad) op een bepaalde datum in de toekomst bekijken
 CurrentStock=Huidige voorraad
 InventoryRealQtyHelp=Stel de waarde in op 0 om het aantal te resetten<br>Veld leeg laten of regel verwijderen om ongewijzigd te houden
-UpdateByScaning=Fill real qty by scaning
+UpdateByScaning=Vul het werkelijke aantal door te scannen
 UpdateByScaningProductBarcode=Update door scan (product barcode)
 UpdateByScaningLot=Update door scan (partij/serie barcode)
 DisableStockChangeOfSubProduct=De-activeer tijdens deze bewerking de voorraad voor alle subproducten van deze kit.
-ImportFromCSV=Import CSV list of movement
-ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
-SelectAStockMovementFileToImport=select a stock movement file to import
-InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
-LabelOfInventoryMovemement=Inventory %s
+ImportFromCSV=Importeer CSV-lijst met verplaatsingen
+ChooseFileToImport=Upload bestand en klik vervolgens op het %s-pictogram om het bestand als bronimportbestand te selecteren...
+SelectAStockMovementFileToImport=selecteer een voorraadbewegingsbestand om te importeren
+InfoTemplateImport=Het geüploade bestand moet deze indeling hebben (* zijn verplichte velden): <br> Bron Warehouse* | Doelmagazijn* | Artikel* | Aantal* | Lot-/serienummer <br> CSV-tekenscheidingsteken moet " <b> %s </b> " zijn
+LabelOfInventoryMovemement=Voorraad %s
 ReOpen=Heropenen
-ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
-ObjectNotFound=%s not found
-MakeMovementsAndClose=Generate movements and close
-AutofillWithExpected=Fill real quantity with expected quantity
+ConfirmFinish=Bevestigt u de sluiting van de inventarisatie? Hiermee worden alle voorraadbewegingen gegenereerd om uw voorraad bij te werken naar de werkelijke hoeveelheid die u in de inventarisatie hebt ingevoerd.
+ObjectNotFound=%s niet gevonden
+MakeMovementsAndClose=Bewegingen genereren en sluiten
+AutofillWithExpected=Vul de werkelijke hoeveelheid in met de verwachte hoeveelheid
+ShowAllBatchByDefault=Toon standaard batchgegevens op het tabblad "voorraad" van het product
+CollapseBatchDetailHelp=U kunt de standaardweergave van batchdetails instellen in de configuratie van de voorraadmodule
+FieldCannotBeNegative=Veld "%s" mag niet negatief zijn
diff --git a/htdocs/langs/nl_NL/supplier_proposal.lang b/htdocs/langs/nl_NL/supplier_proposal.lang
index 20d7bfd5e78..6d255fdb3cf 100644
--- a/htdocs/langs/nl_NL/supplier_proposal.lang
+++ b/htdocs/langs/nl_NL/supplier_proposal.lang
@@ -13,6 +13,7 @@ SupplierProposalArea=Omgeving leveranciersvoorstellen
 SupplierProposalShort=Leveranciersvoorstel
 SupplierProposals=Leveranciersvoorstellen
 SupplierProposalsShort=Leveranciersvoorstellen
+AskPrice=Prijs aanvraag
 NewAskPrice=Opvragen prijs
 ShowSupplierProposal=Toon prijsaanvraag
 AddSupplierProposal=Maak een prijsaanvraag
@@ -52,3 +53,6 @@ SupplierProposalsToClose=Leveranciersvoorstellen om te sluiten
 SupplierProposalsToProcess=Leveranciersvoorstellen om te verwerken
 LastSupplierProposals=Laatste %s prijsaanvragen
 AllPriceRequests=Alle verzoeken
+TypeContact_supplier_proposal_external_SHIPPING=Contactpersoon leverancier voor levering
+TypeContact_supplier_proposal_external_BILLING=Contactpersoon leverancier voor facturering
+TypeContact_supplier_proposal_external_SERVICE=Vertegenwoordiger die de follow-up van de offerte doet
diff --git a/htdocs/langs/nl_NL/ticket.lang b/htdocs/langs/nl_NL/ticket.lang
index bcfe4a2f113..255921e1700 100644
--- a/htdocs/langs/nl_NL/ticket.lang
+++ b/htdocs/langs/nl_NL/ticket.lang
@@ -70,8 +70,8 @@ Deleted=Verwijderd
 # Dict
 Type=Type
 Severity=Prioriteit
-TicketGroupIsPublic=Group is public
-TicketGroupIsPublicDesc=If a ticket group is public, it will be visible in the form when creating a ticket from the public interface
+TicketGroupIsPublic=Groep is openbaar
+TicketGroupIsPublicDesc=Als een ticketgroep openbaar is, is deze zichtbaar in het formulier bij het maken van een ticket vanuit de openbare interface
 
 # Email templates
 MailToSendTicketMessage=Om e-mail van ticket bericht te verzenden
@@ -116,8 +116,8 @@ TicketsShowModuleLogo=Toon het logo van de module in de openbare interface
 TicketsShowModuleLogoHelp=Schakel deze optie in om het logo op de pagina's van de openbare interface te verbergen
 TicketsShowCompanyLogo=Toon het logo van het bedrijf in de openbare interface
 TicketsShowCompanyLogoHelp=Schakel deze optie in om het logo van het bedrijf op de pagina's van de openbare interface te verbergen
-TicketsEmailAlsoSendToMainAddress=Also send a notification to the main email address
-TicketsEmailAlsoSendToMainAddressHelp=Enable this option to also send an email to the address defined into setup "%s" (see tab "%s")
+TicketsEmailAlsoSendToMainAddress=Stuur ook een melding naar het hoofd-e-mailadres
+TicketsEmailAlsoSendToMainAddressHelp=Schakel deze optie in om ook een e-mail te sturen naar het adres gedefinieerd in setup "%s" (zie tabblad "%s")
 TicketsLimitViewAssignedOnly=Beperk de weergave tot tickets die zijn toegewezen aan de huidige gebruiker (niet effectief voor externe gebruikers, altijd beperkt tot de derde partij waarvan ze afhankelijk zijn)
 TicketsLimitViewAssignedOnlyHelp=Alleen tickets die zijn toegewezen aan de huidige gebruiker zijn zichtbaar. Is niet van toepassing op een gebruiker met toegangsrechten voor tickets.
 TicketsActivatePublicInterface=Publieke interface activeren
@@ -128,10 +128,10 @@ TicketNumberingModules=Nummering module voor tickets
 TicketsModelModule=Documentsjablonen voor tickets
 TicketNotifyTiersAtCreation=Breng relatie op de hoogte bij het aanmaken
 TicketsDisableCustomerEmail=Schakel e-mails altijd uit wanneer een ticket wordt gemaakt vanuit de openbare interface
-TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is added to a ticket
+TicketsPublicNotificationNewMessage=Stuur e-mail(s) wanneer een nieuw bericht/opmerking wordt toegevoegd aan een ticket
 TicketsPublicNotificationNewMessageHelp=Stuur e-mail (s) wanneer een nieuw bericht is toegevoegd vanuit de openbare interface (naar de toegewezen gebruiker of de e-mail met meldingen naar (update) en / of de e-mail met meldingen naar)
 TicketPublicNotificationNewMessageDefaultEmail=E-mailmeldingen voor (update)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Send an email to this address for each new message notifications if the ticket doesn't have a user assigned to it or if the user doesn't have any known email.
+TicketPublicNotificationNewMessageDefaultEmailHelp=Stuur een e-mail naar dit adres voor elk nieuw berichtmelding als er geen gebruiker aan het ticket is toegewezen of als de gebruiker geen bekend e-mailadres heeft.
 #
 # Index & list page
 #
@@ -304,13 +304,13 @@ BoxLastModifiedTicket=Laatst gewijzigde tickets
 BoxLastModifiedTicketDescription=Laatste %s gewijzigde tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=Geen recent gewijzigde tickets
-BoxTicketType=Number of open tickets by type
-BoxTicketSeverity=Number of open tickets by severity
-BoxNoTicketSeverity=No tickets opened
-BoxTicketLastXDays=Number of new tickets by days the last %s days
-BoxTicketLastXDayswidget = Number of new tickets by days the last X days
-BoxNoTicketLastXDays=No new tickets the last %s days
-BoxNumberOfTicketByDay=Number of new tickets by day
-BoxNewTicketVSClose=Number of today's new tickets versus today's closed tickets
-TicketCreatedToday=Ticket created today
-TicketClosedToday=Ticket closed today
+BoxTicketType=Verdeling van openstaande tickets per type
+BoxTicketSeverity=Aantal openstaande tickets op volgorde belangrijkheid
+BoxNoTicketSeverity=Geen tickets geopend
+BoxTicketLastXDays=Aantal nieuwe tickets per dagen de laatste %s dagen
+BoxTicketLastXDayswidget = Aantal nieuwe tickets per dag van de afgelopen X dagen
+BoxNoTicketLastXDays=Geen nieuwe tickets de laatste %s dagen
+BoxNumberOfTicketByDay=Aantal nieuwe tickets per dag
+BoxNewTicketVSClose=Aantal nieuwe tickets van vandaag versus gesloten tickets van vandaag
+TicketCreatedToday=Ticket vandaag aangemaakt
+TicketClosedToday=Ticket vandaag gesloten
diff --git a/htdocs/langs/nl_NL/trips.lang b/htdocs/langs/nl_NL/trips.lang
index 8d07d7709ad..7dd8c718e01 100644
--- a/htdocs/langs/nl_NL/trips.lang
+++ b/htdocs/langs/nl_NL/trips.lang
@@ -33,7 +33,7 @@ ExpenseReportCanceledMessage=Het onkostenrapport %s is geannuleerd. <br> - Gebru
 ExpenseReportPaid=Een onkostendeclaratie is betaald
 ExpenseReportPaidMessage=Het onkostenverslag %s is betaald. <br> - Gebruiker: %s <br> - Betaald door: %s <br> Klik hier om het onkostenoverzicht weer te geven: %s
 TripId=Id onkostenoverzicht
-AnyOtherInThisListCanValidate=Persoon die ter validatie moet informeren.
+AnyOtherInThisListCanValidate=Persoon die moet worden geïnformeerd voor het valideren van het verzoek.
 TripSociete=Informatie bedrijf
 TripNDF=Informatie onkostennota
 PDFStandardExpenseReports=Standaardsjabloon om een PDF-document te genereren voor onkostennota
diff --git a/htdocs/langs/nl_NL/users.lang b/htdocs/langs/nl_NL/users.lang
index 4dbce720f65..9329e0735fb 100644
--- a/htdocs/langs/nl_NL/users.lang
+++ b/htdocs/langs/nl_NL/users.lang
@@ -12,7 +12,7 @@ PasswordChangedTo=Wachtwoord gewijzigd in: %s
 SubjectNewPassword=Uw nieuw wachtwoord voor %s
 GroupRights=Groepsrechten
 UserRights=Gebruikersrechten
-Credentials=Credentials
+Credentials=Inloggegevens
 UserGUISetup=Gebruikersweergave instellen
 DisableUser=Uitschakelen
 DisableAUser=Schakel de gebruikertoegang uit
@@ -73,7 +73,7 @@ ExportDataset_user_1=Gebruikers en hun eigenschappen
 DomainUser=Domeingebruikersaccount %s
 Reactivate=Reactiveren
 CreateInternalUserDesc=Met dit formulier kunt u een interne gebruiker in uw bedrijf / organisatie maken. Om een externe gebruiker (klant, leverancier etc. ..) aan te maken, gebruikt u de knop "Aanmaken Dolibarr gebruiker" van de contactkaart van die relatie.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization, or is a partner user outside of your organization that may need to see more data  than data related to his company (the permission system will define what he can or can't see or do).<br>An <b>external</b> user is a customer, vendor or other that must view ONLY data related to himself (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, you must grant permissions on the features that the user need.
+InternalExternalDesc=Een <b> interne </b> gebruiker is een gebruiker die deel uitmaakt van uw bedrijf/organisatie, of een partnergebruiker buiten uw organisatie is die mogelijk meer gegevens moet zien dan gegevens met betrekking tot zijn bedrijf (het toestemmingssysteem bepaalt wat hij kan of kan niet zien of doen). <br> Een <b> externe gebruiker </b> is een klant, leverancier of ander die ALLEEN gegevens met betrekking tot hemzelf moet bekijken (Het aanmaken van een externe gebruiker voor een derde kan vanuit het contactrecord van de derde partij). <br> <br> In beide gevallen moet u machtigingen verlenen voor de functies die de gebruiker nodig heeft.
 PermissionInheritedFromAGroup=Toestemming verleend, omdat geërfd van een bepaalde gebruikersgroep.
 Inherited=Overgeërfd
 UserWillBe=De aangemaakte gebruiker zal zijn
@@ -106,7 +106,7 @@ UseTypeFieldToChange=Gebruik het veld Type om te veranderen
 OpenIDURL=OpenID URL
 LoginUsingOpenID=Gebruik OpenID om in te loggen
 WeeklyHours=Gewerkte uren (per week)
-ExpectedWorkedHours=Expected hours worked per week
+ExpectedWorkedHours=Verwachte gewerkte uren per week
 ColorUser=Kleur van de gebruiker
 DisabledInMonoUserMode=Uitgeschakeld in onderhoudsmodus
 UserAccountancyCode=Gebruiker accounting code
@@ -116,7 +116,7 @@ DateOfEmployment=Datum indiensttreding
 DateEmployment=Werkgelegenheid
 DateEmploymentstart=Startdatum dienstverband
 DateEmploymentEnd=Einddatum dienstverband
-RangeOfLoginValidity=Access validity date range
+RangeOfLoginValidity=Toegang geldigheidsdatumbereik
 CantDisableYourself=U kunt uw eigen gebruikersrecord niet uitschakelen
 ForceUserExpenseValidator=Validatierapport valideren
 ForceUserHolidayValidator=Forceer verlofaanvraag validator
diff --git a/htdocs/langs/nl_NL/website.lang b/htdocs/langs/nl_NL/website.lang
index f75e622fc9b..226ccb1818b 100644
--- a/htdocs/langs/nl_NL/website.lang
+++ b/htdocs/langs/nl_NL/website.lang
@@ -46,12 +46,12 @@ SetHereVirtualHost=<u> Gebruik met Apache / NGinx / ... </u> <br> Creëer op uw
 ExampleToUseInApacheVirtualHostConfig=Voorbeeld om te gebruiken in Apache virtual host setup:
 YouCanAlsoTestWithPHPS=<u>Gebruik met PHP embedded server</u> <br> In een ontwikkelomgeving kunt u de site het liefst testen met de ingebouwde PHP-webserver (PHP 5.5 vereist) <br> <strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Beheer uw website met een andere Dolibarr Hosting-provider</u> <br> Als u geen webserver zoals Apache of NGinx beschikbaar heeft op internet, kunt u uw website exporteren en importeren in een ander Dolibarr-exemplaar van een andere Dolibarr-hostingprovider die volledige integratie met de websitemodule biedt. U kunt een lijst met sommige Dolibarr-hostingproviders vinden op <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
-CheckVirtualHostPerms=Check also that the virtual host user (for example www-data) has <strong>%s</strong> permissions on files into<br><strong>%s</strong>
+CheckVirtualHostPerms=Controleer ook of de virtuele hostgebruiker (bijvoorbeeld www-data) <strong>%s</strong> permissies heeft voor bestanden in <br><strong>%s</strong>
 ReadPerm=Lezen
 WritePerm=Schrijven
 TestDeployOnWeb=Testen / implementeren op internet
 PreviewSiteServedByWebServer=<u>Voorbeeld %s op een nieuw tabblad.</u> <br><br> De %s wordt bediend door een externe webserver (zoals Apache, Nginx, IIS). U moet deze server installeren en instellen voordat u naar de map verwijst: <br> <strong>%s</strong> <br> URL aangeboden door externe server: <br> <strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
+PreviewSiteServedByDolibarr= <u> Bekijk een voorbeeld van %s op een nieuw tabblad. </u> <br> <br> De %s wordt bediend door de Dolibarr-server, dus er is geen extra webserver (zoals Apache, Nginx, IIS) nodig om te worden geïnstalleerd. <br> Het vervelende is dat de URL's van pagina's niet gebruiksvriendelijk zijn en beginnen met het pad van uw Dolibarr. <br> URL geserveerd door Dolibarr: <br> <strong> %s </strong> <br> <br> Om uw eigen externe webserver gebruiken om deze website te dienen, maakt u een virtuele host op uw webserver die punten op directory <br> <strong> %s </strong> <br> voer vervolgens de naam van deze virtuele server in de eigenschappen van deze website en klik op de link "Test/Deploy on the web".
 VirtualHostUrlNotDefined=URL van de virtuele host bediend door externe webserver niet gedefinieerd
 NoPageYet=Nog geen pagina's
 YouCanCreatePageOrImportTemplate=U kunt een nieuwe pagina maken of een volledige websitesjabloon importeren
@@ -137,11 +137,11 @@ PagesRegenerated=%s pagina ('s) / container (s) her-aangemaakt
 RegenerateWebsiteContent=Genereer cachebestanden van websites opnieuw
 AllowedInFrames=Toegestaan in frames
 DefineListOfAltLanguagesInWebsiteProperties=Definieer een lijst van alle beschikbare talen in website-eigenschappen.
-GenerateSitemaps=Generate website sitemap file
-ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
-ConfirmSitemapsCreation=Confirm sitemap generation
-SitemapGenerated=Sitemap file <b>%s</b> generated
+GenerateSitemaps=Website-site mapbestand genereren map
+ConfirmGenerateSitemaps=Als u bevestigt, wist u het bestaande site mapbestand...
+ConfirmSitemapsCreation=Generatie van sitemap bevestigen
+SitemapGenerated=Sitemap bestand <b>%s</b> gegenereerd
 ImportFavicon=Favicon
-ErrorFaviconType=Favicon must be png
-ErrorFaviconSize=Favicon must be sized 16x16, 32x32 or 64x64
-FaviconTooltip=Upload an image which needs to be a png (16x16, 32x32 or 64x64)
+ErrorFaviconType=Favicon moet png zijn
+ErrorFaviconSize=Favicon moet de afmetingen 16x16, 32x32 of 64x64 . hebben
+FaviconTooltip=Upload een afbeelding die een png moet zijn (16x16, 32x32 of 64x64)
diff --git a/htdocs/langs/nl_NL/withdrawals.lang b/htdocs/langs/nl_NL/withdrawals.lang
index d2aabfb1334..5d1c264f730 100644
--- a/htdocs/langs/nl_NL/withdrawals.lang
+++ b/htdocs/langs/nl_NL/withdrawals.lang
@@ -45,6 +45,7 @@ WithdrawRequestsDone=%s Betalingsverzoeken voor automatische incasso geregistree
 BankTransferRequestsDone=%s overboekingsverzoeken geregistreerd
 ThirdPartyBankCode=Bankcode van derden
 NoInvoiceCouldBeWithdrawed=Geen factuur afgeschreven. Controleer of de facturen betrekking hebben op bedrijven met een geldige IBAN en dat IBAN een UMR (Unique Mandate Reference) met modus <strong>%s heeft</strong> .
+WithdrawalCantBeCreditedTwice=Dit opnamebewijs is al gemarkeerd als gecrediteerd; dit kan niet twee keer worden gedaan, omdat dit mogelijk dubbele betalingen en bankboekingen zou veroorzaken.
 ClassCredited=Classificeer creditering
 ClassCreditedConfirm=Weet u zeker dat u deze intrekkingsontvangst als bijgeschreven op uw bankrekening wilt classificeren?
 TransData=Datum transmissie
@@ -149,4 +150,4 @@ InfoRejectMessage=M,<br><br>de incasso van factuur %s voor bedrijf %s, met een b
 ModeWarning=Optie voor echte modus was niet ingesteld, we stoppen na deze simulatie
 ErrorCompanyHasDuplicateDefaultBAN=Bedrijf met id %s heeft meer dan één standaard bankrekening. Er is geen manier aanwezig om te weten welke u moet gebruiken.
 ErrorICSmissing=ICS ontbreekt op bankrekening %s
-TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Total amount of direct debit order differs from sum of lines
+TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Totaal bedrag incasso-opdracht verschilt van som van regels
diff --git a/htdocs/langs/pl_PL/accountancy.lang b/htdocs/langs/pl_PL/accountancy.lang
index be7022e275e..3e69399d034 100644
--- a/htdocs/langs/pl_PL/accountancy.lang
+++ b/htdocs/langs/pl_PL/accountancy.lang
@@ -158,7 +158,7 @@ ACCOUNTING_LENGTH_AACCOUNT=Długość kont księgowych innych firm (jeśli ustaw
 ACCOUNTING_MANAGE_ZERO=Pozwól zarządzać różną liczbą zer na końcu konta księgowego. Potrzebne w niektórych krajach (np. W Szwajcarii). Jeśli opcja jest wyłączona (domyślnie), możesz ustawić następujące dwa parametry, aby poprosić aplikację o dodanie wirtualnych zer.
 BANK_DISABLE_DIRECT_INPUT=Wyłącz bezpośrednią rejestrację transakcji na koncie bankowym
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Włącz eksport wersji roboczej w dzienniku
-ACCOUNTANCY_COMBO_FOR_AUX=Włącz listę kombi dla konta pomocniczego (może działać wolno, jeśli masz wiele stron trzecich)
+ACCOUNTANCY_COMBO_FOR_AUX=Włącz listę kombi dla konta pomocniczego (może działać wolno, jeśli masz dużo stron trzecich, przerywa możliwość wyszukiwania części wartości)
 ACCOUNTING_DATE_START_BINDING=Określ datę rozpoczęcia wiązania i przeniesienia w księgowości. Poniżej tej daty transakcje nie zostaną przeniesione do księgowości.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=W przypadku przelewu księgowego wybierz domyślnie pokazany okres
 
@@ -202,14 +202,14 @@ Docref=Odniesienie
 LabelAccount=Etykieta konta
 LabelOperation=Operacja na etykiecie
 Sens=Kierunek
-AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you have received<br>For an accounting account of a supplier, use Debit to record a payment you made
+AccountingDirectionHelp=W przypadku konta księgowego klienta użyj opcji Kredyt, aby zarejestrować otrzymaną płatność<br>W przypadku konta księgowego dostawcy użyj polecenia Debet, aby zarejestrować dokonaną płatność
 LetteringCode=Kod literowy
 Lettering=Literowanie
 Codejournal=Dziennik
 JournalLabel=Etykieta czasopisma
 NumPiece=ilość sztuk
 TransactionNumShort=Numer transakcji
-AccountingCategory=Custom group
+AccountingCategory=Grupa niestandardowa
 GroupByAccountAccounting=Grupuj według konta księgi głównej
 GroupBySubAccountAccounting=Grupuj według konta księgi podrzędnej
 AccountingAccountGroupsDesc=Możesz tutaj zdefiniować kilka grup rachunków księgowych. Będą wykorzystywane do tworzenia spersonalizowanych raportów księgowych.
@@ -297,7 +297,7 @@ NoNewRecordSaved=Koniec z zapisem do dziennika
 ListOfProductsWithoutAccountingAccount=Lista produktów nie dowiązanych do żadnego konta księgowego
 ChangeBinding=Zmień dowiązanie
 Accounted=Rozliczone w księdze
-NotYetAccounted=Not yet accounted in the ledger
+NotYetAccounted=Jeszcze nie uwzględnione w księdze
 ShowTutorial=Pokaż Poradnik
 NotReconciled=Nie pogodzono się
 WarningRecordWithoutSubledgerAreExcluded=Ostrzeżenie, wszystkie operacje bez zdefiniowanego konta księgi podrzędnej są filtrowane i wykluczane z tego widoku
@@ -328,6 +328,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Wyłącz powiązanie i przeniesienie w k
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Wyłącz powiązanie i przeniesienie w księgowości na zestawieniach wydatków (zestawienia wydatków nie będą brane pod uwagę w księgowości)
 
 ## Export
+NotifiedExportDate=Notified export date (modification of the entries will not be possible)
+NotifiedValidationDate=Validation of the entries (modification or deletion of the entries will not be possible)
+ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=Export dziennika projektu
 Modelcsv=Model eksportu
 Selectmodelcsv=Wybierz model eksportu
@@ -427,4 +430,4 @@ WarningReportNotReliable=Ostrzeżenie, ten raport nie jest oparty na księdze, w
 ExpenseReportJournal=Dziennik wydatków
 InventoryJournal=Dziennik zapasów
 
-NAccounts=%s accounts
+NAccounts=%s kont
diff --git a/htdocs/langs/pl_PL/admin.lang b/htdocs/langs/pl_PL/admin.lang
index 3a5510ec118..21261a39914 100644
--- a/htdocs/langs/pl_PL/admin.lang
+++ b/htdocs/langs/pl_PL/admin.lang
@@ -64,7 +64,7 @@ RemoveLock=Usuń/zmień nazwę pliku <b>%s</b> o ile istnieje, aby umożliwić k
 RestoreLock=Przywróć plik <b>%s</b> o uprawnieniach tylko do odczytu, aby wyłączyć dalsze korzystanie z narzędzia Aktualizuj/Instaluj.
 SecuritySetup=Ustawienia bezpieczeństwa
 PHPSetup=Ustawienia PHP
-OSSetup=OS setup
+OSSetup=Konfiguracja systemu operacyjnego
 SecurityFilesDesc=Zdefiniuj tutaj opcje związane z bezpieczeństwem przesyłania plików.
 ErrorModuleRequirePHPVersion=Błąd ten moduł wymaga PHP w wersji %s lub większej
 ErrorModuleRequireDolibarrVersion=Błąd ten moduł wymaga Dolibarr wersji %s lub większej
@@ -221,8 +221,8 @@ NotCompatible=ten moduł nie jest kompatybilny z twoją wersją Dolibarr %s (Min
 CompatibleAfterUpdate=Ten moduł wymaga aktualizacji Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=Zobacz w miejscu zakupów
 SeeSetupOfModule=Zobacz konfigurację modułu %s
+SetOptionTo=Set option <b>%s</b> to %s
 Updated=Zaktualizowane
-Nouveauté=Nowość
 AchatTelechargement=Kup / Pobierz
 GoModuleSetupArea=Aby wdrożyć/zainstalować nowy moduł, przejdź do obszaru konfiguracji modułów: <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, oficjalny kanał dystrybucji zewnętrznych modułów Dolibarr ERP / CRM
@@ -399,6 +399,7 @@ SecurityToken=Klucz do bezpiecznego URL
 NoSmsEngine=Brak dostępnego menedżera nadawców SMS-ów. Menedżer nadawców SMS nie jest instalowany z domyślną dystrybucją, ponieważ zależy od zewnętrznego dostawcy, ale można go znaleźć na %s
 PDF=PDF
 PDFDesc=Globalne opcje generowania plików PDF
+PDFOtherDesc=Opcja PDF specyficzna dla niektórych modułów
 PDFAddressForging=Zasady dotyczące sekcji adresowej
 HideAnyVATInformationOnPDF=Ukryj wszystkie informacje związane z podatkiem od sprzedaży/VAT
 PDFRulesForSalesTax=Zasady dotyczące podatku od sprzedaży/VAT
@@ -561,7 +562,7 @@ Module53Desc=Zarządzanie usługami
 Module54Name=Kontrakty/Subskrypcje
 Module54Desc=Zarządzanie umowami (usługi lub cykliczne subskrypcje)
 Module55Name=Kody kreskowe
-Module55Desc=Kody kreskowe zarządzania
+Module55Desc=Barcode or QR code management
 Module56Name=Płatność przelewem
 Module56Desc=Zarządzanie płatnościami dostawców za pomocą poleceń przelewu. Obejmuje generowanie pliku SEPA dla krajów europejskich.
 Module57Name=Płatności poleceniem zapłaty
@@ -848,10 +849,10 @@ Permission402=Tworzenie / modyfikacja zniżek
 Permission403=Walidacja zniżek
 Permission404=Usuwanie zniżek
 Permission430=Użyj paska debugowania
-Permission511=Czytaj wypłaty wynagrodzeń (twoich i podwładnych)
-Permission512=Twórz/modyfikuj wypłaty wynagrodzeń
-Permission514=Usuń wypłaty wynagrodzeń
-Permission517=Przeczytaj wypłaty wynagrodzeń wszystkich
+Permission511=Read salaries and payments (yours and subordinates)
+Permission512=Create/modify salaries and payments
+Permission514=Delete salaries and payments
+Permission517=Read salaries and payments everybody
 Permission519=Wynagrodzenia eksport
 Permission520=Czytaj Kredyty
 Permission522=Tworzenie / modyfikacja kredytów
@@ -965,6 +966,8 @@ Permission23003=Usuwanie Zaplanowanego zadania
 Permission23004=Wykonanie Zaplanowanego zadania
 Permission50101=Użyj punktu sprzedaży (SimplePOS)
 Permission50151=Użyj punktu sprzedaży (TakePOS)
+Permission50152=Edytuj wiersze sprzedaży
+Permission50153=Edytuj zamówione linie sprzedaży
 Permission50201=Czytaj transakcje
 Permission50202=Import transakcji
 Permission50330=Przeczytaj obiekty Zapier
@@ -1039,11 +1042,12 @@ DictionaryMeasuringUnits=Jednostki pomiarowe
 DictionarySocialNetworks=Sieci społecznościowe
 DictionaryProspectStatus=Status perspektywiczny dla firm
 DictionaryProspectContactStatus=Status potencjalnych kontaktów
-DictionaryHolidayTypes=Rodzaje urlopów
+DictionaryHolidayTypes=Urlop - Rodzaje urlopu
 DictionaryOpportunityStatus=Status potencjalnego klienta dla projektu/potencjalnego klienta
 DictionaryExpenseTaxCat=Raport wydatków - Kategorie transportu
 DictionaryExpenseTaxRange=Raport z wydatków - zakres według kategorii transportu
 DictionaryTransportMode=Raport Intracomm - tryb transportowy
+DictionaryBatchStatus=Status kontroli jakości partii/serii produktu
 TypeOfUnit=Rodzaj jednostki
 SetupSaved=Konfiguracja zapisana
 SetupNotSaved=Ustawienia nie zapisane
@@ -1160,7 +1164,7 @@ DoNotSuggestPaymentMode=Nie proponuj
 NoActiveBankAccountDefined=Brak zdefiniowanego aktywnego konta bankowego
 OwnerOfBankAccount=Właściciel konta bankowego %s
 BankModuleNotActive=Moduł Rachunków bankowych jest nie aktywny
-ShowBugTrackLink=Define the link "<strong>%s</strong>" (empty to not display this link, 'github' for the link to the Dolibarr project or define directly an url 'https://...')
+ShowBugTrackLink=Zdefiniuj odsyłacz "<strong>%s</strong>" (brak definicji wskazuje, by go nie wyświetlać, 'github' wskazuje na projekt Dolibarr, 'https://...' wskazuje na podany adres URL)
 Alerts=Alarmy
 DelaysOfToleranceBeforeWarning=Opóźnienie przed wyświetleniem ostrzeżenia dotyczącego:
 DelaysOfToleranceDesc=Ustaw opóźnienie, zanim ikona alertu %s zostanie wyświetlona na ekranie dla późnego elementu.
@@ -1185,9 +1189,9 @@ SetupDescription2=Poniższe dwie sekcje są obowiązkowe (dwie pierwsze pozycje
 SetupDescription3= <a href="%s"> %s -> %s </a> <br> <br> Podstawowe parametry używane do dostosowania domyślnego zachowania aplikacji (np. funkcji związanych z krajem).
 SetupDescription4= <a href="%s"> %s -> %s </a> <br> <br> To oprogramowanie jest zestawem wielu modułów/aplikacji. Moduły związane z Twoimi potrzebami muszą być włączone i skonfigurowane. Pozycje menu pojawią się po aktywacji tych modułów.
 SetupDescription5=Pozycje w menu Inne Ustawienia zarządzają parametrami opcjonalnymi.
-AuditedSecurityEvents=Security events that are audited
-NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
-Audit=Audyt
+AuditedSecurityEvents=Zdarzenia dotyczące bezpieczeństwa poddawane inspekcji
+NoSecurityEventsAreAduited=Żadne zdarzenia dotyczące bezpieczeństwa nie są poddawane inspekcji. Możesz je włączyć z menu %s
+Audit=Security events
 InfoDolibarr=O Dolibarr
 InfoBrowser=O przeglądarce
 InfoOS=O systemie
@@ -1255,7 +1259,7 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=Należy uruchomić to polecenie
 YourPHPDoesNotHaveSSLSupport=funkcji SSL nie są dostępne w PHP
 DownloadMoreSkins=Więcej skórek do pobrania
 SimpleNumRefModelDesc=Zwraca numer referencyjny w formacie %syymm-nnnn, gdzie rr to rok, mm to miesiąc, a nnnn to sekwencyjna liczba automatycznie zwiększająca się bez resetowania
-SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
+SimpleNumRefNoDateModelDesc=Zwraca numer referencyjny w formacie %s-nnnn, gdzie nnnn jest sekwencyjną liczbą, automatycznie zwiększającą się bez resetowania
 ShowProfIdInAddress=Pokaż identyfikator zawodowy z adresami
 ShowVATIntaInAddress=Ukryj wewnątrzwspólnotowy numer VAT wraz z adresami
 TranslationUncomplete=Częściowe tłumaczenie
@@ -1319,9 +1323,12 @@ ConditionIsCurrently=Stan jest obecnie% s
 YouUseBestDriver=Używasz sterownika %s, który jest obecnie najlepszym dostępnym sterownikiem.
 YouDoNotUseBestDriver=Używasz sterownika %s, ale zalecany jest sterownik %s.
 NbOfObjectIsLowerThanNoPb=W bazie danych masz tylko %s %s. Nie wymaga to żadnej szczególnej optymalizacji.
+ComboListOptim=Optymalizacja ładowania listy combo
 SearchOptim=Pozycjonowanie
-YouHaveXObjectUseSearchOptim=Masz w bazie danych %s %s. Możesz dodać stałą %s do 1 w Strona Główna-Ustawienia-Inne. Ogranicz wyszukiwanie do początku ciągów, dzięki czemu baza danych będzie mogła używać indeksów i powinieneś otrzymać natychmiastową odpowiedź.
-YouHaveXObjectAndSearchOptimOn=Masz %s %s w bazie danych, a stała %s jest ustawiona na 1 w Strona Główna-Ustawienia-Inne.
+YouHaveXObjectUseComboOptim=Masz %s %s w bazie danych. Możesz przejść do ustawień modułu, aby umożliwić wczytanie listy combo przy zdarzeniu naciśnięcia klawisza.
+YouHaveXObjectUseSearchOptim=Masz %s %s w bazie danych. Możesz dodać stałą %s do 1 w Home-Setup-Other.
+YouHaveXObjectUseSearchOptimDesc=Ogranicza to wyszukiwanie do początku napisów, dzięki czemu baza danych może korzystać z indeksów i powinieneś otrzymać natychmiastową odpowiedź.
+YouHaveXObjectAndSearchOptimOn=Masz %s %s w bazie danych, a stała %s jest ustawiona na %s w Home-Setup-Other.
 BrowserIsOK=Używasz przeglądarki internetowej %s. Ta przeglądarka jest dobra pod względem bezpieczeństwa i wydajności.
 BrowserIsKO=Używasz przeglądarki internetowej %s. Wiadomo, że ta przeglądarka jest złym wyborem pod względem bezpieczeństwa, wydajności i niezawodności. Zalecamy używanie przeglądarki Firefox, Chrome, Opera lub Safari.
 PHPModuleLoaded=Ładowany jest komponent PHP %s
@@ -1433,6 +1440,7 @@ MemberMainOptions=Główne opcje
 AdherentLoginRequired= Zarządzanie logowania dla każdego członka
 AdherentMailRequired=Adres e-mail wymagany do utworzenia nowego członka
 MemberSendInformationByMailByDefault=Checkbox wysłać mail z potwierdzeniem do członków jest domyślnie
+MemberCreateAnExternalUserForSubscriptionValidated=Utwórz zewnętrzny login użytkownika dla każdej zweryfikowanej subskrypcji nowego członka
 VisitorCanChooseItsPaymentMode=Odwiedzający może wybierać spośród dostępnych sposobów płatności
 MEMBER_REMINDER_EMAIL=Włącz automatyczne przypominanie <b> przez e-mail </b> o wygasłych subskrypcjach. Uwaga: Moduł <strong> %s </strong> musi być włączony i poprawnie skonfigurowany, aby wysyłać przypomnienia.
 MembersDocModules=Szablony dokumentów dla dokumentów wygenerowanych na podstawie rekordu członka
@@ -1753,7 +1761,7 @@ CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Podczas tworzenia nowego podatku pozostaw do
 ##### Agenda #####
 AgendaSetup=Działania i porządku konfiguracji modułu
 PasswordTogetVCalExport=Klucz do wywozu zezwolić na link
-SecurityKey = Security Key
+SecurityKey = Klucz bezpieczeństwa
 PastDelayVCalExport=Nie starsze niż eksport przypadku
 AGENDA_USE_EVENT_TYPE=Użyj typów wydarzeń (zarządzanych w menu Ustawienia -> Słowniki -> Typ wydarzeń w programie)
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatycznie ustaw tę domyślną wartość dla typu zdarzenia w formularzu tworzenia wydarzenia
@@ -1763,7 +1771,7 @@ AGENDA_DEFAULT_VIEW=Który widok chcesz otworzyć domyślnie po wybraniu menu Pl
 AGENDA_REMINDER_BROWSER=Włącz przypomnienie o zdarzeniu <b> w przeglądarce użytkownika </b> (Kiedy nadejdzie data przypomnienia, przeglądarka wyświetli wyskakujące okienko. Każdy użytkownik może wyłączyć takie powiadomienia w ustawieniach powiadomień przeglądarki).
 AGENDA_REMINDER_BROWSER_SOUND=Włącz powiadomienia dźwiękowe
 AGENDA_REMINDER_EMAIL=Włącz przypomnienie o wydarzeniu <b> przez e-mail </b> (opcję przypomnienia / opóźnienie można zdefiniować dla każdego zdarzenia).
-AGENDA_REMINDER_EMAIL_NOTE=Uwaga: częstotliwość zadania %s musi być wystarczająca, aby mieć pewność, że przypomnienie zostanie wysłane w odpowiednim momencie.
+AGENDA_REMINDER_EMAIL_NOTE=Uwaga: Częstotliwość zaplanowanego zadania %s musi być wystarczająca, aby przypomnienie zostało wysłane we właściwym momencie.
 AGENDA_SHOW_LINKED_OBJECT=Pokaż połączony obiekt w widoku planu zajęć
 ##### Clicktodial #####
 ClickToDialSetup=Kliknij, aby Dial konfiguracji modułu
@@ -1979,9 +1987,11 @@ MAIN_PDF_MARGIN_RIGHT=Prawy margines w pliku PDF
 MAIN_PDF_MARGIN_TOP=Górny margines w pliku PDF
 MAIN_PDF_MARGIN_BOTTOM=Dolny margines w pliku PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Wysokość logo na dokumencie PDF
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Dodaj zdjęcie w wierszu propozycji
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Dodaj podpis elektroniczny w PDF
 NothingToSetup=Dla tego modułu nie jest wymagana żadna konkretna konfiguracja.
 SetToYesIfGroupIsComputationOfOtherGroups=Ustaw na Tak, jeśli grupa ta pochodzi z przetworzenia innych grup
-EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
+EnterCalculationRuleIfPreviousFieldIsYes=Wprowadź regułę obliczeniową, jeśli poprzednie pole ustawiono na Tak. <br>Na przykład: <br>CODEGRP1+CODEGRP2
 SeveralLangugeVariatFound=Znaleziono kilka wariantów językowych
 RemoveSpecialChars=Usuń znaki specjalne
 COMPANY_AQUARIUM_CLEAN_REGEX=Filtr Regex do czyszczenia wartości (COMPANY_AQUARIUM_CLEAN_REGEX)
@@ -2064,11 +2074,11 @@ UseDebugBar=Użyj paska debugowania
 DEBUGBAR_LOGS_LINES_NUMBER=Liczba ostatnich wierszy dziennika do zachowania w konsoli
 WarningValueHigherSlowsDramaticalyOutput=Ostrzeżenie, wyższe wartości dramatycznie spowalniają produkcję
 ModuleActivated=Moduł %s jest aktywowany i spowalnia interfejs
-ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances and security)
-ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
+ModuleActivatedWithTooHighLogLevel=Moduł %s jest aktywowany ze zbyt wysokim poziomem logowania (spróbuj użyć niższego poziomu, aby uzyskać lepszą wydajność i bezpieczeństwo)
+ModuleSyslogActivatedButLevelNotTooVerbose=Moduł %s został aktywowany, a poziom dziennika (%s) jest poprawny (niezbyt szczegółowy)
 IfYouAreOnAProductionSetThis=W środowisku produkcyjnym należy ustawić tę właściwość na %s.
 AntivirusEnabledOnUpload=Antywirus włączony na przesyłanych plikach
-SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
+SomeFilesOrDirInRootAreWritable=Niektóre pliki lub katalogi nie są w trybie tylko do odczytu
 EXPORTS_SHARE_MODELS=Modele eksportowe są udostępniane wszystkim
 ExportSetup=Konfiguracja eksportu modułu
 ImportSetup=Konfiguracja importu modułu
@@ -2096,7 +2106,6 @@ PDF_SHOW_PROJECT=Pokaż projekt w dokumencie
 ShowProjectLabel=Etykieta projektu
 PDF_USE_ALSO_LANGUAGE_CODE=Jeśli chcesz, aby niektóre teksty w pliku PDF zostały skopiowane w 2 różnych językach w tym samym wygenerowanym pliku PDF, musisz ustawić tutaj ten drugi język, aby wygenerowany plik PDF zawierał 2 różne języki na tej samej stronie, ten wybrany podczas generowania pliku PDF i ten ( tylko kilka szablonów PDF to obsługuje). Pozostaw puste dla 1 języka na plik PDF.
 FafaIconSocialNetworksDesc=Wpisz tutaj kod ikony FontAwesome. Jeśli nie wiesz, co to jest FontAwesome, możesz użyć ogólnej wartości fa-address-book.
-FeatureNotAvailableWithReceptionModule=Funkcja niedostępna, gdy włączony jest moduł Odbiór
 RssNote=Uwaga: każda definicja źródła danych RSS zawiera widżet, który należy włączyć, aby był dostępny na pulpicie nawigacyjnym
 JumpToBoxes=Przejdź do Ustawienia -> Widżety
 MeasuringUnitTypeDesc=Użyj tu wartości takich jak „rozmiar”, „powierzchnia”, „objętość”, „waga”, „czas”
@@ -2120,12 +2129,18 @@ ConfFileIsReadableOrWritableByAnyUsers=Plik conf jest czytelny lub zapisywalny d
 MailToSendEventOrganization=Organizacja imprez
 AGENDA_EVENT_DEFAULT_STATUS=Domyślny status zdarzenia podczas tworzenia zdarzenia z formularza
 YouShouldDisablePHPFunctions=Powinieneś wyłączyć funkcje PHP
-IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
-NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
-RecommendedValueIs=Recommended: %s
-ARestrictedPath=A restricted path
-CheckForModuleUpdate=Check for external modules updates
-CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
-ModuleUpdateAvailable=An update is available
-NoExternalModuleWithUpdate=No updates found for external modules
-SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
+IfCLINotRequiredYouShouldDisablePHPFunctions=Z wyjątkiem sytuacji, gdy musisz uruchamiać polecenia systemowe w niestandardowym kodzie, powinieneś wyłączyć funkcje PHP
+PHPFunctionsRequiredForCLI=Do celów powłoki (takich jak zaplanowane tworzenie kopii zapasowych zadań lub uruchamianie programu anitivurs), musisz zachować funkcje PHP
+NoWritableFilesFoundIntoRootDir=W katalogu głównym nie znaleziono zapisywalnych plików ani katalogów dla powszechnych programów (Dobrze)
+RecommendedValueIs=Zalecane: %s
+NotRecommended=Niezalecane
+ARestrictedPath=Ograniczona ścieżka
+CheckForModuleUpdate=Sprawdź aktualizacje modułów zewnętrznych
+CheckForModuleUpdateHelp=Ta akcja połączy się z edytorami zewnętrznych modułów, by sprawdzić dostępność ich nowych wersji.
+ModuleUpdateAvailable=Aktualizacja jest dostępna
+NoExternalModuleWithUpdate=Nie znaleziono aktualizacji dla modułów zewnętrznych
+SwaggerDescriptionFile=Plik opisu Swagger API (na przykład, do użytku z redoc)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=Włączono przestarzały interfejs API WS. Zamiast tego powinieneś użyć REST API.
+RandomlySelectedIfSeveral=Wybierane losowo, jeśli dostępnych jest kilka zdjęć
+DatabasePasswordObfuscated=Database password is obfuscated in conf file
+DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
diff --git a/htdocs/langs/pl_PL/agenda.lang b/htdocs/langs/pl_PL/agenda.lang
index 308e26c0b51..7b05a736cbe 100644
--- a/htdocs/langs/pl_PL/agenda.lang
+++ b/htdocs/langs/pl_PL/agenda.lang
@@ -4,7 +4,7 @@ Actions=Wydarzenia
 Agenda=Agenda
 TMenuAgenda=Agenda
 Agendas=Agendy
-LocalAgenda=Kalendarz wewnętrzny
+LocalAgenda=Kalendarz domyślny
 ActionsOwnedBy=Wydarzenie własnością
 ActionsOwnedByShort=Właściciel
 AffectedTo=Przypisany do
@@ -14,13 +14,13 @@ EventsNb=Ilość zdarzeń
 ListOfActions=Lista zdarzeń
 EventReports=Raport zdarzeń
 Location=Lokalizacja
-ToUserOfGroup=Event assigned to any user in group
+ToUserOfGroup=Wydarzenie przypisane do dowolnego użytkownika w grupie
 EventOnFullDay=Wydarzenia całodniowe
 MenuToDoActions=Wszystkie zdarzenia niekompletne
 MenuDoneActions=Wszystkie zdarzenia zakończone
 MenuToDoMyActions=Moje działania niekompletne
 MenuDoneMyActions=Moje zdarzenia zakończone
-ListOfEvents=Lista zdarzeń (wewnętrzny kalendarz)
+ListOfEvents=Lista wydarzeń (domyślny kalendarz)
 ActionsAskedBy=Wydarzenia zarejestrowane przez
 ActionsToDoBy=Zdarzenia przypisane do
 ActionsDoneBy=Zdarzenia wykonane przez
@@ -31,14 +31,15 @@ ViewWeek=Pokaż tydzień
 ViewPerUser=Za wglądem użytkownika
 ViewPerType=Wyświetl po typie
 AutoActions= Automatyczne wypełnianie
-AgendaAutoActionDesc= Here you may define events which you want Dolibarr to create automatically  in Agenda. If nothing is checked, only manual actions will be included in logs and displayed in Agenda. Automatic tracking of business actions done on objects (validation, status change) will not be saved.
-AgendaSetupOtherDesc= This page provides options to allow the export of your Dolibarr events into an external calendar (Thunderbird, Google Calendar etc...)
+AgendaAutoActionDesc= Tutaj możesz zdefiniować wydarzenia, które Dolibarr ma automatycznie tworzyć w Agendzie. Jeśli nic nie jest zaznaczone, tylko ręczne działania zostaną uwzględnione w dziennikach i wyświetlone w Agendzie. Automatyczne śledzenie działań biznesowych wykonywanych na obiektach (walidacja, zmiana statusu) nie zostanie zapisane.
+AgendaSetupOtherDesc= Ta strona zawiera opcje umożliwiające eksport wydarzeń Dolibarr do zewnętrznego kalendarza (Thunderbird, Google Calendar itp.)
 AgendaExtSitesDesc=Ta strona pozwala zdefiniować zewnętrzne źródła kalendarzy, aby zobaczyć uwzględnić zapisane tam zdarzenia w agendzie Dolibarr'a.
 ActionsEvents=Zdarzenia, dla których Dolibarr stworzy automatycznie zadania w agendzie
-EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
+EventRemindersByEmailNotEnabled=Przypomnienia o wydarzeniach przez e-mail nie zostały włączone w konfiguracji modułu %s.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Kontrahent %s utworzony
-COMPANY_DELETEInDolibarr=Third party %s deleted
+COMPANY_MODIFYInDolibarr=Zmodyfikowano %s innej firmy
+COMPANY_DELETEInDolibarr=Usunięto stronę trzecią %s
 ContractValidatedInDolibarr=Umowa  %s potwierdzona
 CONTRACT_DELETEInDolibarr=Kontrakt %s usunięty
 PropalClosedSignedInDolibarr=Propozycja %s podpisana
@@ -60,10 +61,10 @@ MemberSubscriptionModifiedInDolibarr=Subskrypcja %s dla członka %s zmodyfikowan
 MemberSubscriptionDeletedInDolibarr=Subskrypcja %s dla członka %s usunięta
 ShipmentValidatedInDolibarr=Przesyłka %s potwierdzona
 ShipmentClassifyClosedInDolibarr=Wysyłka %s sklasyfikowana jako rozliczona
-ShipmentUnClassifyCloseddInDolibarr=Shipment %s classified re-open
-ShipmentBackToDraftInDolibarr=Shipment %s go back to draft status
+ShipmentUnClassifyCloseddInDolibarr=Przesyłka %s sklasyfikowana ponownie otwarta
+ShipmentBackToDraftInDolibarr=Przesyłka %s wróć do statusu wersji roboczej
 ShipmentDeletedInDolibarr=Przesyłka %s usunięta
-ReceptionValidatedInDolibarr=Reception %s validated
+ReceptionValidatedInDolibarr=Odbiór %s został zweryfikowany
 OrderCreatedInDolibarr=Zamówienie %s utworzone
 OrderValidatedInDolibarr=Zatwierdzenie zamówienia %s
 OrderDeliveredInDolibarr=Zamówienie %s sklasyfikowanych dostarczonych.
@@ -72,30 +73,31 @@ OrderBilledInDolibarr=Zamówienie %s sklasyfikowanego obciążonego
 OrderApprovedInDolibarr=Akceptacja zamówienia %s
 OrderRefusedInDolibarr=Zamówienie %s odmówione
 OrderBackToDraftInDolibarr=Zmiana statusu zamówienia %s na draft
-ProposalSentByEMail=Commercial proposal %s sent by email
-ContractSentByEMail=Contract %s sent by email
-OrderSentByEMail=Sales order %s sent by email
-InvoiceSentByEMail=Customer invoice %s sent by email
-SupplierOrderSentByEMail=Purchase order %s sent by email
-ORDER_SUPPLIER_DELETEInDolibarr=Purchase order %s deleted
-SupplierInvoiceSentByEMail=Vendor invoice %s sent by email
-ShippingSentByEMail=Shipment %s sent by email
+ProposalSentByEMail=Oferta handlowa %s wysłana pocztą elektroniczną
+ContractSentByEMail=Umowa %s wysłana pocztą elektroniczną
+OrderSentByEMail=Zamówienie sprzedaży %s wysłane pocztą elektroniczną
+InvoiceSentByEMail=Faktura dla klienta %s wysłana pocztą elektroniczną
+SupplierOrderSentByEMail=Zamówienie %s wysłane pocztą elektroniczną
+ORDER_SUPPLIER_DELETEInDolibarr=Zamówienie zakupu %s zostało usunięte
+SupplierInvoiceSentByEMail=Faktura dostawcy %s wysłana pocztą elektroniczną
+ShippingSentByEMail=Przesyłka %s wysłana pocztą elektroniczną
 ShippingValidated= Przesyłka %s potwierdzona
-InterventionSentByEMail=Intervention %s sent by email
+InterventionSentByEMail=Interwencja %s wysłana pocztą elektroniczną
 ProposalDeleted=Oferta usunięta
 OrderDeleted=Zamówienie usunięte
 InvoiceDeleted=Faktura usunięta
-DraftInvoiceDeleted=Draft invoice deleted
-CONTACT_CREATEInDolibarr=Contact %s created
-CONTACT_DELETEInDolibarr=Contact %s deleted
+DraftInvoiceDeleted=Wersja robocza faktury została usunięta
+CONTACT_CREATEInDolibarr=Kontakt %s został utworzony
+CONTACT_MODIFYInDolibarr=Skontaktuj się z %s zmodyfikowany
+CONTACT_DELETEInDolibarr=Kontakt %s został usunięty
 PRODUCT_CREATEInDolibarr=Produkt %s utworzony
 PRODUCT_MODIFYInDolibarr=Produkt %s zmodyfikowany
 PRODUCT_DELETEInDolibarr=Produkt %s usunięty
-HOLIDAY_CREATEInDolibarr=Request for leave %s created
-HOLIDAY_MODIFYInDolibarr=Request for leave %s modified
-HOLIDAY_APPROVEInDolibarr=Request for leave %s approved
-HOLIDAY_VALIDATEInDolibarr=Request for leave %s validated
-HOLIDAY_DELETEInDolibarr=Request for leave %s deleted
+HOLIDAY_CREATEInDolibarr=Utworzono wniosek o urlop %s
+HOLIDAY_MODIFYInDolibarr=Wniosek o urlop %s zmodyfikowany
+HOLIDAY_APPROVEInDolibarr=Wniosek o urlop %s został zatwierdzony
+HOLIDAY_VALIDATEInDolibarr=Wniosek o urlop %s został zatwierdzony
+HOLIDAY_DELETEInDolibarr=Wniosek o urlop %s został usunięty
 EXPENSE_REPORT_CREATEInDolibarr=Raport kosztów %s utworzony
 EXPENSE_REPORT_VALIDATEInDolibarr=Raport kosztów %s zatwierdzony
 EXPENSE_REPORT_APPROVEInDolibarr=Raport kosztów %s zaakceptowany
@@ -104,33 +106,34 @@ EXPENSE_REPORT_REFUSEDInDolibarr=Raport kosztów %s odrzucony
 PROJECT_CREATEInDolibarr=Projekt %s utworzony
 PROJECT_MODIFYInDolibarr=Projekt %s zmodyfikowany
 PROJECT_DELETEInDolibarr=Projekt %s usunięty
-TICKET_CREATEInDolibarr=Ticket %s created
-TICKET_MODIFYInDolibarr=Ticket %s modified
-TICKET_ASSIGNEDInDolibarr=Ticket %s assigned
-TICKET_CLOSEInDolibarr=Ticket %s closed
-TICKET_DELETEInDolibarr=Ticket %s deleted
-BOM_VALIDATEInDolibarr=BOM validated
-BOM_UNVALIDATEInDolibarr=BOM unvalidated
-BOM_CLOSEInDolibarr=BOM disabled
-BOM_REOPENInDolibarr=BOM reopen
-BOM_DELETEInDolibarr=BOM deleted
-MRP_MO_VALIDATEInDolibarr=MO validated
-MRP_MO_UNVALIDATEInDolibarr=MO set to draft status
-MRP_MO_PRODUCEDInDolibarr=MO produced
-MRP_MO_DELETEInDolibarr=MO deleted
-MRP_MO_CANCELInDolibarr=MO canceled
+TICKET_CREATEInDolibarr=Bilet %s został utworzony
+TICKET_MODIFYInDolibarr=Bilet %s zmodyfikowany
+TICKET_ASSIGNEDInDolibarr=Bilet %s został przypisany
+TICKET_CLOSEInDolibarr=Bilet %s zamknięty
+TICKET_DELETEInDolibarr=Bilet %s został usunięty
+BOM_VALIDATEInDolibarr=Zatwierdzone BOM
+BOM_UNVALIDATEInDolibarr=Niezwalidowany zestawienie komponentów
+BOM_CLOSEInDolibarr=Zestawienie komponentów wyłączone
+BOM_REOPENInDolibarr=Ponownie otwórz zestawienie komponentów
+BOM_DELETEInDolibarr=Usunięto zestawienie komponentów
+MRP_MO_VALIDATEInDolibarr=Zatwierdzone przez MO
+MRP_MO_UNVALIDATEInDolibarr=MO ustawiony na status wersji roboczej
+MRP_MO_PRODUCEDInDolibarr=MO produkowane
+MRP_MO_DELETEInDolibarr=MO zostało usunięte
+MRP_MO_CANCELInDolibarr=MO anulowane
+PAIDInDolibarr=%s zapłacono
 ##### End agenda events #####
 AgendaModelModule=Szablon dokumentu dla zdarzenia
 DateActionStart=Data rozpoczęcia
 DateActionEnd=Data zakończenia
 AgendaUrlOptions1=Możesz także dodać następujące parametry do filtr wyjściowy:
 AgendaUrlOptions3=<b>logina =%s</b>, aby ograniczyć wyjścia do działań będących własnością użytkownika <b>%s</b>.
-AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> to restrict output to actions not owned by user <b>%s</b>.
-AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b> (owner and others).
-AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
-AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic events.
-AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> to include events of holidays.
-AgendaShowBirthdayEvents=Wyświetlaj urodziny kontaktów
+AgendaUrlOptionsNotAdmin= <b> logina =! %s </b>, aby ograniczyć dane wyjściowe do działań nienależących do użytkownika <b> %s </b>.
+AgendaUrlOptions4= <b> logint = %s </b>, aby ograniczyć wyjście do działań przypisanych do użytkownika <b> %s </b> (właściciel i inni).
+AgendaUrlOptionsProject= <b> project = __ PROJECT_ID__ </b>, aby ograniczyć dane wyjściowe do działań powiązanych z projektem <b> __PROJECT_ID__ </b>.
+AgendaUrlOptionsNotAutoEvent= <b> notactiontype = systemauto </b>, aby wykluczyć zdarzenia automatyczne.
+AgendaUrlOptionsIncludeHolidays= <b> includeeholidays = 1 </b>, aby uwzględnić wydarzenia związane z wakacjami.
+AgendaShowBirthdayEvents=Urodziny kontaktów
 AgendaHideBirthdayEvents=Ukryj urodziny kontaktów
 Busy=Zajęty
 ExportDataset_event1=Lista zdarzeń w agendzie
@@ -139,7 +142,7 @@ DefaultWorkingHours=Domyślnie zakres godzin pracy w dniu (przykład: 9-18)
 # External Sites ical
 ExportCal=Eksport kalendarza
 ExtSites=Import zewnętrznych kalendarzy
-ExtSitesEnableThisTool=Show external calendars (defined in global setup) in Agenda. Does not affect external calendars defined by users.
+ExtSitesEnableThisTool=Pokaż kalendarze zewnętrzne (zdefiniowane w ustawieniach globalnych) w Agendzie. Nie wpływa na kalendarze zewnętrzne zdefiniowane przez użytkowników.
 ExtSitesNbOfAgenda=Ilość kalendarzy
 AgendaExtNb=Kalendarz nr %s
 ExtSiteUrlAgenda=URL dostępu do pliku .ical
@@ -152,17 +155,18 @@ ActionType=Typ wydarzenia
 DateActionBegin=Data startu wydarzenia
 ConfirmCloneEvent=Czy jesteś pewien, że chcesz powielić zdarzenie <b>%s</b>?
 RepeatEvent=Powtórz wydarzenie
+OnceOnly=Tylko raz
 EveryWeek=Każdego tygodnia
 EveryMonth=Każdego miesiąca
 DayOfMonth=Dzień miesiąca
 DayOfWeek=Dzień tygodnia
 DateStartPlusOne=Data rozpoczęcia + 1 godzina
-SetAllEventsToTodo=Set all events to todo
-SetAllEventsToInProgress=Set all events to in progress
-SetAllEventsToFinished=Set all events to finished
-ReminderTime=Reminder period before the event
-TimeType=Duration type
-ReminderType=Callback type
-AddReminder=Create an automatic reminder notification for this event
-ErrorReminderActionCommCreation=Error creating the reminder notification for this event
-BrowserPush=Browser Notification
+SetAllEventsToTodo=Ustaw wszystkie wydarzenia do wykonania
+SetAllEventsToInProgress=Ustaw wszystkie wydarzenia na w toku
+SetAllEventsToFinished=Ustaw wszystkie wydarzenia na zakończone
+ReminderTime=Okres przypomnienia przed wydarzeniem
+TimeType=Typ czasu trwania
+ReminderType=Typ oddzwaniania
+AddReminder=Utwórz automatyczne przypomnienie o tym wydarzeniu
+ErrorReminderActionCommCreation=Błąd podczas tworzenia przypomnienia o tym wydarzeniu
+BrowserPush=Powiadomienie o wyskakującym okienku przeglądarki
diff --git a/htdocs/langs/pl_PL/banks.lang b/htdocs/langs/pl_PL/banks.lang
index 033e4f2f9e5..ce486c13d06 100644
--- a/htdocs/langs/pl_PL/banks.lang
+++ b/htdocs/langs/pl_PL/banks.lang
@@ -109,13 +109,13 @@ SocialContributionPayment=Płatność za ZUS/podatek
 BankTransfer=Transfer kredytowy
 BankTransfers=Polecenia przelewu
 MenuBankInternalTransfer=Przelew wewnętrzny
-TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
+TransferDesc=Użyj przelewu wewnętrznego by przelać z jednego konta na inne, aplikacja zapisze dwa rekordy: obciążenie na rachunku źródłowym i uznanie na rachunku docelowym. Ta sama kwota, tytuł i data zostaną użyte do tej transakcji.
 TransferFrom=Od
 TransferTo=Do
 TransferFromToDone=Transfer z <b>%s</b> do <b>%s</b> <b>%s</b> %s został zapisany.
 CheckTransmitter=Nadawca
 ValidateCheckReceipt=Potwierdzić potwierdzenie tego czeku?
-ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
+ConfirmValidateCheckReceipt=Czy na pewno chcesz przesłać to pokwitowanie czeku do weryfikacji? Jeśli to zrobisz, żadne zmiany nie będą możliwe.
 DeleteCheckReceipt=Usunąć to pokwitowanie czeku?
 ConfirmDeleteCheckReceipt=Czy na pewno chcesz usunąć to pokwitowanie czeku?
 BankChecks=Czeki bankowe
@@ -128,7 +128,7 @@ ConfirmDeleteTransaction=Czy jesteś pewien, że chcesz usunąć te wpis?
 ThisWillAlsoDeleteBankRecord=To usunie wygenerowany wpis bankowy
 BankMovements=Ruchy
 PlannedTransactions=Zaplanowane wpisy
-Graph=Graphs
+Graph=Wykresy
 ExportDataset_banque_1=Wpisy bankowe i stan konta
 ExportDataset_banque_2=Odcinek wpłaty
 TransactionOnTheOtherAccount=Transakcja na inne konta
@@ -142,7 +142,7 @@ AllAccounts=Wszystkie rachunki bankowe i gotówkowe
 BackToAccount=Powrót do konta
 ShowAllAccounts=Pokaż wszystkie konta
 FutureTransaction=Przyszła transakcja. Nie można się pogodzić.
-SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
+SelectChequeTransactionAndGenerate=Wybierz/przefiltruj czeki, które mają znaleźć się na potwierdzeniu wpłaty czeku. Następnie kliknij „Utwórz”.
 InputReceiptNumber=Wybierz wyciąg bankowy związany z postępowania pojednawczego. Użyj schematu: RRRRMM lub RRRRMMDD
 EventualyAddCategory=Ostatecznie, określić kategorię, w której sklasyfikować rekordy
 ToConciliate=Do zaksięgowania?
diff --git a/htdocs/langs/pl_PL/bills.lang b/htdocs/langs/pl_PL/bills.lang
index 8929f1a8b29..e3def345984 100644
--- a/htdocs/langs/pl_PL/bills.lang
+++ b/htdocs/langs/pl_PL/bills.lang
@@ -120,7 +120,7 @@ ConvertExcessPaidToReduc=Zamień zapłaconą nadwyżkę na dostępny rabat
 EnterPaymentReceivedFromCustomer=Wprowadź płatność otrzymaną od klienta
 EnterPaymentDueToCustomer=Dokonaj płatności dla klienta
 DisabledBecauseRemainderToPayIsZero=Nieaktywne, ponieważ upływająca nieopłacona kwota wynosi zero
-PriceBase=Base price
+PriceBase=Cena podstawowa
 BillStatus=Status faktury
 StatusOfGeneratedInvoices=Status generowanych faktur
 BillStatusDraft=Projekt (musi zostać zatwierdzone)
@@ -259,6 +259,7 @@ DateMaxPayment=Termin płatności:
 DateInvoice=Daty wystawienia faktury
 DatePointOfTax=Punkt podatkowy
 NoInvoice=Nr faktury
+NoOpenInvoice=No open invoice
 ClassifyBill=Klasyfikacja faktury
 SupplierBillsToPay=Niezapłacone faktury od dostawcy
 CustomerBillsUnpaid=Niezapłacone faktury klienta
@@ -454,7 +455,7 @@ RegulatedOn=Regulowane
 ChequeNumber=Czek N
 ChequeOrTransferNumber=Cheque / Transferu N
 ChequeBordereau=Sprawdź harmonogram
-ChequeMaker=Check/Transfer sender
+ChequeMaker=Nadawca czeku/przelewu
 ChequeBank=Bank czek
 CheckBank=Sprawdź
 NetToBePaid=Netto do wypłaty
@@ -520,10 +521,10 @@ YouMustCreateStandardInvoiceFirstDesc=Najpierw musisz utworzyć standardową fak
 PDFCrabeDescription=Szablon faktury PDF Crabe. Kompletny szablon faktury (stara implementacja szablonu Sponge)
 PDFSpongeDescription=Szablon faktury PDF Gąbka. Kompletny szablon faktury
 PDFCrevetteDescription=Szablon faktury PDF Crevette. Kompletny szablon faktury dla faktur sytuacyjnych
-TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
-MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+TerreNumRefModelDesc1=Zwróć numer w formacie %srrmm-nnnn dla faktur standardowych i %srrmm-nnnn dla not kredytowych, gdzie rr to rok, mm to miesiąc, a nnnn to sekwencyjna liczba zwiększana automatycznie, bez przerw i bez powrotu do 0
+MarsNumRefModelDesc1=Zwróć numer w formacie %srrmm-nnnn dla faktur standardowych, %srrmm-nnnn dla faktur korygujących, %srrmm-nnnn dla faktur zaliczkowych i %srrmm-nnnn dla not kredytowych, gdzie rr to rok, mm to miesiąc a nnnn to sekwencyjna liczba zwiększana automatycznie, bez przerw i bez powrotu do 0
 TerreNumRefModelError=Rachunek zaczynające się od $ syymm już istnieje i nie jest kompatybilne z tym modelem sekwencji. Usuń go lub zmienić jego nazwę, aby włączyć ten moduł.
-CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+CactusNumRefModelDesc1=Zwróć numer w formacie %srrmm-nnnn dla faktur standardowych, %srrmm-nnnn dla not kredytowych i %srrmm-nnnn dla faktur zaliczkowych, gdzie rr to rok, mm to miesiąc, a nnnn to sekwencyjna liczba zwiększana automatycznie, bez przerw i bez powrotu do 0
 EarlyClosingReason=Powód wcześniejszego zamknięcia
 EarlyClosingComment=Uwaga dotycząca wczesnego zamknięcia
 ##### Types de contacts #####
@@ -589,3 +590,4 @@ FacParentLine=Element nadrzędny linii faktury
 SituationTotalRayToRest=Pozostała kwota do zapłaty bez podatku
 PDFSituationTitle=Sytuacja nr %d
 SituationTotalProgress=Całkowity postęp %d %%
+SearchUnpaidInvoicesWithDueDate=Wyszukaj niezapłacone faktury z terminem płatności = %s
diff --git a/htdocs/langs/pl_PL/boxes.lang b/htdocs/langs/pl_PL/boxes.lang
index 890e5e1e4b3..c262324e417 100644
--- a/htdocs/langs/pl_PL/boxes.lang
+++ b/htdocs/langs/pl_PL/boxes.lang
@@ -46,11 +46,11 @@ BoxMyLastBookmarks=Zakładki: najnowsze %s
 BoxOldestExpiredServices=Najstarsze aktywne przeterminowane usługi
 BoxLastExpiredServices=Ostanich %s najstarszych kontaktów z aktywnymi upływającymi usługami
 BoxTitleLastActionsToDo=Ostatnich %s zadań do zrobienia
-BoxTitleLastContracts=Latest %s contracts which were modified
-BoxTitleLastModifiedDonations=Latest %s donations which were modified
-BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
-BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
-BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
+BoxTitleLastContracts=Najnowsze %s kontrakty, które zostały zmodyfikowane
+BoxTitleLastModifiedDonations=Najnowsze %s darowizny, które zostały zmodyfikowane
+BoxTitleLastModifiedExpenses=Najnowsze %s rozliczenia wydatków, które zostały zmodyfikowane
+BoxTitleLatestModifiedBoms=Najnowsze %s zestawienia materiałów, które zostały zmodyfikowane
+BoxTitleLatestModifiedMos=Najnowsze %s Zamówienia produkcyjne, które zostały zmodyfikowane
 BoxTitleLastOutstandingBillReached=Klienci z maksymalną zaległością przekroczeni
 BoxGlobalActivity=Globalna aktywność (faktury, wnioski, zamówienia)
 BoxGoodCustomers=Dobrzy klienci
diff --git a/htdocs/langs/pl_PL/cashdesk.lang b/htdocs/langs/pl_PL/cashdesk.lang
index 6cbc7926e15..b5b04e9fb5b 100644
--- a/htdocs/langs/pl_PL/cashdesk.lang
+++ b/htdocs/langs/pl_PL/cashdesk.lang
@@ -41,8 +41,8 @@ Floor=Podłoga
 AddTable=Dodaj tabelę
 Place=Miejsce
 TakeposConnectorNecesary=Wymagane jest „złącze TakePOS”
-OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
-NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser:
+OrderPrinters=Dodaj przycisk, aby wysłać zamówienie do wybranych drukarek, z pominięciem drukarki opłat (np. aby wysłać zamówienie do kuchni)
+NotAvailableWithBrowserPrinter=Niedostępne, gdy drukarka do pokwitowań jest przestawiona w tryb przeglądarki:
 SearchProduct=Wyszukaj produkt
 Receipt=Odbiór
 Header=nagłówek
@@ -59,7 +59,7 @@ BillsCoinsPad=Monety i banknoty Pad
 DolistorePosCategory=Moduły TakePOS i inne rozwiązania POS dla Dolibarr
 TakeposNeedsCategories=TakePOS potrzebuje co najmniej jednej kategorii produktów do działania
 TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS potrzebuje co najmniej 1 kategorii produktów z kategorii <b> %s </b> do działania
-OrderNotes=Can add some notes to each ordered items
+OrderNotes=Można dodawać notatki do każdej zamówionej pozycji
 CashDeskBankAccountFor=Domyślne konto używane do płatności w
 NoPaimementModesDefined=W konfiguracji TakePOS nie zdefiniowano trybu płatności
 TicketVatGrouped=Grupowy podatek VAT według stawki w biletach | paragonach
@@ -84,7 +84,7 @@ InvoiceIsAlreadyValidated=Faktura jest już zweryfikowana
 NoLinesToBill=Brak linii do rozliczenia
 CustomReceipt=Odbiór niestandardowy
 ReceiptName=Nazwa paragonu
-ProductSupplements=Manage supplements of products
+ProductSupplements=Zarządzaj zamiennikami produktów
 SupplementCategory=Kategoria suplementu
 ColorTheme=Motyw kolorystyczny
 Colorful=Kolorowy
@@ -94,7 +94,7 @@ Browser=Przeglądarka
 BrowserMethodDescription=Proste i łatwe drukowanie paragonów. Tylko kilka parametrów do skonfigurowania paragonu. Drukuj przez przeglądarkę.
 TakeposConnectorMethodDescription=Moduł zewnętrzny z dodatkowymi funkcjami. Możliwość drukowania z chmury.
 PrintMethod=Metoda drukowania
-ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. The server hosting the application can't be in the Cloud (must be able to reach the printers in your network).
+ReceiptPrinterMethodDescription=Wydajna metoda z wieloma parametrami. W pełni konfigurowalna za pomocą szablonów. Serwer obsługujący aplikację nie może znajdować się w chmurze (musi mieć dostęp do drukarek w Twojej lokalnej sieci).
 ByTerminal=Terminalem
 TakeposNumpadUsePaymentIcon=Użyj ikony zamiast tekstu na przyciskach płatności na klawiaturze numerycznej
 CashDeskRefNumberingModules=Moduł numeracji dla sprzedaży POS
@@ -102,7 +102,7 @@ CashDeskGenericMaskCodes6 =  <br> <b> {TN} </b> służy do dodania numeru termin
 TakeposGroupSameProduct=Grupuj te same linie produktów
 StartAParallelSale=Rozpocznij nową sprzedaż równoległą
 SaleStartedAt=Sprzedaż rozpoczęła się od %s
-ControlCashOpening=Kontroluj wyskakujące okienko gotówki przy otwieraniu punktu sprzedaży
+ControlCashOpening=Otwórz wyskakujące okienko „Kontroluj gotówkę” podczas otwierania POS
 CloseCashFence=Zamknij kontrolę kasową
 CashReport=Raport kasowy
 MainPrinterToUse=Główna drukarka do użycia
@@ -126,5 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Najpierw musi być włączona drukarka pokwito
 AllowDelayedPayment=Zezwalaj na opóźnioną płatność
 PrintPaymentMethodOnReceipts=Wydrukuj metodę płatności na biletach | paragonach
 WeighingScale=Skalę ważenia
-ShowPriceHT = Wyświetl cenę bez podatku
-ShowPriceHTOnReceipt = Wyświetl cenę bez podatku na paragonie
+ShowPriceHT = Wyświetl kolumnę z ceną bez podatku (na ekranie)
+ShowPriceHTOnReceipt = Wyświetl kolumnę z ceną bez podatku (na paragonie)
diff --git a/htdocs/langs/pl_PL/categories.lang b/htdocs/langs/pl_PL/categories.lang
index c81bbd8dd60..91b5ab3dca9 100644
--- a/htdocs/langs/pl_PL/categories.lang
+++ b/htdocs/langs/pl_PL/categories.lang
@@ -3,20 +3,20 @@ Rubrique=Tag / Kategoria
 Rubriques=Tagi / Kategorie
 RubriquesTransactions=Tagi / kategorie transakcji
 categories=tagi/kategorie
-NoCategoryYet=No tag/category of this type has been created
+NoCategoryYet=Nie utworzono żadnego znacznika/kategorii tego typu
 In=W
 AddIn=Dodaj w
 modify=modyfikować
 Classify=Klasyfikacja
 CategoriesArea=Tagi / obszar Kategorie
-ProductsCategoriesArea=Product/Service tags/categories area
-SuppliersCategoriesArea=Vendor tags/categories area
-CustomersCategoriesArea=Customer tags/categories area
-MembersCategoriesArea=Member tags/categories area
-ContactsCategoriesArea=Contact tags/categories area
-AccountsCategoriesArea=Bank account tags/categories area
-ProjectsCategoriesArea=Project tags/categories area
-UsersCategoriesArea=User tags/categories area
+ProductsCategoriesArea=Obszar tagów/kategorii dla produktów/usług
+SuppliersCategoriesArea=Obszar tagów/kategorii dostawców
+CustomersCategoriesArea=Obszar tagów/kategorii klientów
+MembersCategoriesArea=Obszar znaczników/kategorii członków
+ContactsCategoriesArea=Obszar tagów/kategorii kontaktów
+AccountsCategoriesArea=Obszar tagów/kategorii kont bankowych
+ProjectsCategoriesArea=Obszar tagów/kategorii projektów
+UsersCategoriesArea=Obszar tagów/kategorii użytkowników
 SubCats=Podkategorie
 CatList=Lista tagów / kategorii
 CatListAll=Lista tagów / kategorii (wszystkie typy)
@@ -93,7 +93,7 @@ AddSupplierIntoCategory=Przypisz kategorię do dostawcy
 ShowCategory=Pokaż tag / kategoria
 ByDefaultInList=Domyśłnie na liście
 ChooseCategory=Wybrane kategorie
-StocksCategoriesArea=Warehouse Categories
-ActionCommCategoriesArea=Event Categories
+StocksCategoriesArea=Kategorie magazynów
+ActionCommCategoriesArea=Kategorie zdarzeń
 WebsitePagesCategoriesArea=Kategorie kontenerów stron
-UseOrOperatorForCategories=Use 'OR' operator for categories
+UseOrOperatorForCategories=Użyj operatora „OR” dla kategorii
diff --git a/htdocs/langs/pl_PL/commercial.lang b/htdocs/langs/pl_PL/commercial.lang
index 2fc11d17cff..f77528ca035 100644
--- a/htdocs/langs/pl_PL/commercial.lang
+++ b/htdocs/langs/pl_PL/commercial.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - commercial
-Commercial=Commerce
-CommercialArea=Commerce area
+Commercial=Handel
+CommercialArea=Strefa handlu
 Customer=Klient
 Customers=Klienci
 Prospect=Widok
@@ -52,29 +52,30 @@ ActionAC_TEL=Telefon
 ActionAC_FAX=Wyślij faks
 ActionAC_PROP=Wyślij propozycję pocztą
 ActionAC_EMAIL=Wyślij e-mail
-ActionAC_EMAIL_IN=Reception of Email
+ActionAC_EMAIL_IN=Odbiór wiadomości e-mail
 ActionAC_RDV=Spotkania
 ActionAC_INT=Interwencja na stronie
 ActionAC_FAC=Wyślij fakturę/rozliczenie pocztą
 ActionAC_REL=Wyślij fakturę/rozliczenie pocztą (ponaglenie)
 ActionAC_CLO=Blisko
 ActionAC_EMAILING=Wyślij mass maila
-ActionAC_COM=Send sales order by mail
+ActionAC_COM=Wyślij zamówienie pocztą
 ActionAC_SHIP=Wyślij wysyłki za pośrednictwem poczty
-ActionAC_SUP_ORD=Send purchase order by mail
-ActionAC_SUP_INV=Send vendor invoice by mail
+ActionAC_SUP_ORD=Wyślij zamówienie pocztą
+ActionAC_SUP_INV=Wyślij fakturę dostawcy pocztą
 ActionAC_OTH=Inny
-ActionAC_OTH_AUTO=Automatycznie wstawione wydarzenia
+ActionAC_OTH_AUTO=Inne auto
 ActionAC_MANUAL=Ręcznie wstawione wydarzenia
 ActionAC_AUTO=Automatycznie wstawione wydarzenia
-ActionAC_OTH_AUTOShort=Auto
+ActionAC_OTH_AUTOShort=Inne
+ActionAC_EVENTORGANIZATION=Wydarzenia związane z organizacją imprez
 Stats=Statystyka sprzedaży
 StatusProsp=Stan oferty
 DraftPropals=Szkic oferty handlowej
 NoLimit=Bez limitu
 ToOfferALinkForOnlineSignature=Link dla podpisu online
-WelcomeOnOnlineSignaturePage=Welcome to the page to accept commercial 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/commercial proposal %s
+WelcomeOnOnlineSignaturePage=Witamy na stronie do przyjmowania ofert handlowych od %s
+ThisScreenAllowsYouToSignDocFrom=Ten ekran umożliwia zaakceptowanie i podpisanie lub odrzucenie oferty / oferty handlowej
+ThisIsInformationOnDocumentToSign=To jest informacja na dokumencie do zaakceptowania lub odrzucenia
+SignatureProposalRef=Podpis oferty / oferty handlowej %s
 FeatureOnlineSignDisabled=Funkcjonalność podpisu online wyłączona lub dokument wygenerowano przed włączeniem tej funkcji
diff --git a/htdocs/langs/pl_PL/companies.lang b/htdocs/langs/pl_PL/companies.lang
index 230a3becdd6..aa5a283db23 100644
--- a/htdocs/langs/pl_PL/companies.lang
+++ b/htdocs/langs/pl_PL/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=Nazwa firmy %s już istnieje. Wybierz inną.
 ErrorSetACountryFirst=Najpierw wybierz kraj
 SelectThirdParty=Wybierz kontrahenta
-ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
+ConfirmDeleteCompany=Czy na pewno chcesz usunąć tę firmę i wszystkie powiązane z nią informacje?
 DeleteContact=Usuń kontakt/adres
-ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
+ConfirmDeleteContact=Czy na pewno chcesz usunąć ten kontakt i wszystkie powiązane z nim informacje?
 MenuNewThirdParty=Nowy kontrahent
 MenuNewCustomer=Nowy klient
 MenuNewProspect=New Prospect
@@ -69,7 +69,7 @@ PhoneShort=Telefon
 Skype=Skype
 Call=Zadzwoń
 Chat=Czat
-PhonePro=Bus. phone
+PhonePro=Autobus. telefon
 PhonePerso=Telefon prywatny
 PhoneMobile=Telefon komórkowy
 No_Email=Odrzuć masowe wysyłanie e-maili
@@ -331,7 +331,7 @@ CustomerCodeDesc=Kod klienta, unikalny dla wszystkich klientów
 SupplierCodeDesc=Kod dostawcy, unikalny dla wszystkich dostawców
 RequiredIfCustomer=Wymagane, jeżeli Kontrahent jest klientem lub potencjalnym klientem
 RequiredIfSupplier=Wymagane jeżeli kontrahent jest dostawcą
-ValidityControledByModule=Validity controlled by the module
+ValidityControledByModule=Ważność kontrolowana przez moduł
 ThisIsModuleRules=Zasady dla tego modułu
 ProspectToContact=Potencjalny Klient do kontaktu
 CompanyDeleted=Firma " %s" usunięta z bazy danych.
@@ -439,22 +439,22 @@ ListSuppliersShort=Lista sprzedawców
 ListProspectsShort=Lista perspektyw
 ListCustomersShort=Lista klientów
 ThirdPartiesArea=Osoby trzecie / kontakty
-LastModifiedThirdParties=Latest %s Third Parties which were modified
-UniqueThirdParties=Total number of Third Parties
+LastModifiedThirdParties=Najnowsi %s kontrahenci, którzy zostali zmodyfikowani
+UniqueThirdParties=Łączna liczba kontrahentów
 InActivity=Otwarte
 ActivityCeased=Zamknięte
 ThirdPartyIsClosed=Kontrahent jest zamknięty
-ProductsIntoElements=List of products/services mapped to %s
+ProductsIntoElements=Lista produktów/usług zmapowanych na %s
 CurrentOutstandingBill=Biężący, niezapłacony rachunek
 OutstandingBill=Maksymalna kwota niezapłaconego rachunku
 OutstandingBillReached=Maksymalna kwota dla niespłaconych rachunków osiągnięta
 OrderMinAmount=Minimalna kwota dla zamówienia
-MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
+MonkeyNumRefModelDesc=Zwróć liczbę w formacie %srrmm-nnnn dla kodu klienta i %srrmm-nnnn dla kodu dostawcy, gdzie rr to rok, mm to miesiąc, a nnnn to sekwencyjna liczba, zwiększana automatycznie, bez przerwy i bez powrotu do 0.
 LeopardNumRefModelDesc=Dowolny kod Klienta / Dostawcy. Ten kod może być modyfikowany w dowolnym momencie.
 ManagingDirectors=Funkcja(e) managera (prezes, dyrektor generalny...)
 MergeOriginThirdparty=Duplikuj kontrahenta (kontrahenta, którego chcesz usunąć)
 MergeThirdparties=Scal kontrahentów
-ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
+ConfirmMergeThirdparties=Czy na pewno chcesz scalić wybranego kontrahenta z kontrahentem bieżącym? Wszystkie obiekty (faktury, zamówienia, ...) wybranego kontrahenta zostaną przeniesione do kontrahenta bieżącego, po czym wybrany kontrahent zostanie usunięty.
 ThirdpartiesMergeSuccess=Strony trzecie zostały połączone
 SaleRepresentativeLogin=Login przedstawiciela handlowego
 SaleRepresentativeFirstname=Imię przedstawiciela handlowego
diff --git a/htdocs/langs/pl_PL/compta.lang b/htdocs/langs/pl_PL/compta.lang
index bd6d36178ed..d98c13ebbb4 100644
--- a/htdocs/langs/pl_PL/compta.lang
+++ b/htdocs/langs/pl_PL/compta.lang
@@ -135,7 +135,7 @@ NewCheckReceipt=Nowe zniżki
 NewCheckDeposit=Nowe sprawdzić depozytu
 NewCheckDepositOn=Nowe sprawdzić depozytu na konto: %s
 NoWaitingChecks=Brak czeków oczekujących na wpłatę.
-DateChequeReceived=Check receiving date
+DateChequeReceived=Sprawdź datę odbioru
 NbOfCheques=Liczba czeków
 PaySocialContribution=Zapłać ZUS/podatek
 PayVAT=Zapłać deklarację VAT
@@ -231,7 +231,7 @@ Pcg_subtype=PCG podtyp
 InvoiceLinesToDispatch=Linie do wysyłki faktury
 ByProductsAndServices=Według produktów i usług
 RefExt=Ref Zewnętrzne
-ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
+ToCreateAPredefinedInvoice=Aby utworzyć szablon faktury, utwórz fakturę standardową, a następnie, bez jej walidacji, kliknij przycisk "%s”.
 LinkedOrder=Link do zamówienia
 Mode1=Metoda 1
 Mode2=Metoda 2
@@ -286,3 +286,9 @@ ReportPurchaseTurnover=Zafakturowany obrót zakupowy
 ReportPurchaseTurnoverCollected=Zebrany obrót zakupowy
 IncludeVarpaysInResults = Uwzględnij różne płatności w raportach
 IncludeLoansInResults = Uwzględnij pożyczki w raportach
+InvoiceLate30Days = Faktury opóźnione > 30 dni
+InvoiceLate15Days = Faktury opóźnione > 15 dni
+InvoiceLateMinus15Days = Faktury spóźnione
+InvoiceNotLate = Do odbioru < 15 dni
+InvoiceNotLate15Days = Do odbioru za 15 dni
+InvoiceNotLate30Days = Do odbioru za 30 dni
diff --git a/htdocs/langs/pl_PL/cron.lang b/htdocs/langs/pl_PL/cron.lang
index 68a5f84d9e3..bf21fca7c08 100644
--- a/htdocs/langs/pl_PL/cron.lang
+++ b/htdocs/langs/pl_PL/cron.lang
@@ -7,28 +7,28 @@ Permission23103 = Usuń zaplanowane zadanie
 Permission23104 = Wykonaj zaplanowane zadanie
 # Admin
 CronSetup=Konfiguracja zarządzania zaplanowanymi zadaniami
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs from a browser
-OrToLaunchASpecificJob=Or to check and launch a specific job from a browser
+URLToLaunchCronJobs=Adres URL do sprawdzania i uruchamiania kwalifikowanych zadań cron z przeglądarki
+OrToLaunchASpecificJob=Lub sprawdzić i uruchomić określone zadanie z przeglądarki
 KeyForCronAccess=Klucz zabezpieczeń dla URL, aby uruchomić cron
-FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
+FileToLaunchCronJobs=Wiersz poleceń do sprawdzania i uruchamiania kwalifikowanych zadań cron
 CronExplainHowToRunUnix=W środowisku Unix należy użyć następującego wpisu crontab, aby uruchomić wiersz poleceń co 5 minut
-CronExplainHowToRunWin=On Microsoft(tm) Windows environment you can use Scheduled Task tools to run the command line each 5 minutes
+CronExplainHowToRunWin=W środowisku Microsoft (tm) Windows można używać narzędzi do zaplanowanych zadań, aby uruchamiać wiersz poleceń co 5 minut
 CronMethodDoesNotExists=Klasa %s nie zawiera żadnej metody %s
-CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
-CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
-CronJobProfiles=List of predefined cron job profiles
+CronMethodNotAllowed=Metoda %s klasy %s znajduje się na czarnej liście zabronionych metod
+CronJobDefDesc=Profile zadań Cron są zdefiniowane w pliku deskryptora modułu. Gdy moduł jest aktywowany, są one ładowane i dostępne, dzięki czemu można administrować zadaniami z menu narzędzi administracyjnych %s.
+CronJobProfiles=Lista predefiniowanych profili zawodowych Cron
 # Menu
 EnabledAndDisabled=Włączone i wyłączone
 # Page list
-CronLastOutput=Latest run output
-CronLastResult=Latest result code
+CronLastOutput=Wynik ostatniego uruchomienia
+CronLastResult=Kod najnowszego wyniku
 CronCommand=Komenda
 CronList=Zaplanowane zadania
 CronDelete=Usuwanie zaplanowanych zadań
 CronConfirmDelete=Czy jesteś pewien, że chcesz usunąć te zaplanowane zadania?
 CronExecute=Uruchom zaplanowane zadania
 CronConfirmExecute=Jesteś pewien, że chcesz wykonać te zaplanowane zadania teraz?
-CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
+CronInfo=Moduł zaplanowanych zadań umożliwia planowanie zadań w celu ich automatycznego wykonania. Zadania można również uruchamiać ręcznie.
 CronTask=Zadanie
 CronNone=Żaden
 CronDtStart=Nie przed
@@ -43,11 +43,11 @@ CronModule=Moduł
 CronNoJobs=Brak zarejestrowanych zadań
 CronPriority=Priorytet
 CronLabel=Etykieta
-CronNbRun=Number of launches
-CronMaxRun=Maximum number of launches
+CronNbRun=Liczba uruchomień
+CronMaxRun=Maksymalna liczba uruchomień
 CronEach=Każdy
 JobFinished=Zadania uruchomione i zakończone
-Scheduled=Scheduled
+Scheduled=Planowy
 #Page card
 CronAdd= Dodaj zadanie
 CronEvery=Wykonaj każde zadanie
@@ -57,35 +57,35 @@ CronSaveSucess=Zapisano pomyślnie
 CronNote=Komentarz
 CronFieldMandatory=Pole %s jest obowiązkowe
 CronErrEndDateStartDt=Data zakończenia nie może być wcześniejsza niż data rozpoczęcia
-StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Schedule
+StatusAtInstall=Stan w momencie instalacji modułu
+CronStatusActiveBtn=Harmonogram
 CronStatusInactiveBtn=Wyłączone
-CronTaskInactive=To zadanie jest wyłączone
+CronTaskInactive=To zadanie jest wyłączone (nie zaplanowano)
 CronId=ID
-CronClassFile=Filename with class
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example 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>
-CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For example 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 example 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 example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
-CronArgsHelp=The method arguments. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
+CronClassFile=Nazwa pliku z klasą
+CronModuleHelp=Nazwa katalogu modułu Dolibarr (działa również z zewnętrznym modułem Dolibarr). <BR> Na przykład, aby wywołać metodę pobierania obiektu Dolibarr Product / htdocs / <u> </u> /class/product.class.php, wartość modułu to <br> a049271e8bz0 a049271e8bz0
+CronClassFileHelp=Względna ścieżka i nazwa pliku do załadowania (ścieżka jest względna w stosunku do katalogu głównego serwera WWW). <BR> Na przykład, aby wywołać metodę pobierania obiektu Dolibarr Product htdocs / product / class / <u> product.class.php </u>, wartość dla nazwy pliku klasy to <br> a049271e818cz0 klasa / produkt.
+CronObjectHelp=Nazwa obiektu do załadowania. <BR> Na przykład, aby wywołać metodę pobierania obiektu Dolibarr Product /htdocs/product/class/product.class.php, wartość nazwy pliku klasy to <br> <i> Produkt </i>
+CronMethodHelp=Metoda obiektu do uruchomienia. <BR> Na przykład, aby wywołać metodę pobierania obiektu Dolibarr Product /htdocs/product/class/product.class.php, wartość metody to <br> <i> fetch </i>
+CronArgsHelp=Argumenty metody. <BR> Na przykład, aby wywołać metodę pobierania obiektu Dolibarr Product /htdocs/product/class/product.class.php, parametr może mieć wartość <br> <i> 0, ProductRef </i>
 CronCommandHelp=System linii poleceń do wykonania.
 CronCreateJob=Utwórz nowe zaplanowane zadanie
 CronFrom=Z
 # Info
 # Common
 CronType=Typ zadania
-CronType_method=Call method of a PHP Class
+CronType_method=Metoda wywołania klasy PHP
 CronType_command=Polecenie powłoki
-CronCannotLoadClass=Cannot load class file %s (to use class %s)
-CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
-UseMenuModuleToolsToAddCronJobs=Go into menu "<a href="%s">Home - Admin tools - Scheduled jobs</a>" to see and edit scheduled jobs.
+CronCannotLoadClass=Nie można załadować pliku klasy %s (aby użyć klasy %s)
+CronCannotLoadObject=Załadowano plik klasy %s, ale nie znaleziono w nim obiektu %s
+UseMenuModuleToolsToAddCronJobs=Przejdź do menu "<a href="%s"> Strona główna - Narzędzia administracyjne - Zaplanowane zadania </a>", aby wyświetlić i edytować zaplanowane zadania.
 JobDisabled=Zadanie wyłączone
 MakeLocalDatabaseDumpShort=Backup lokalnej bazy danych
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql', 'pgsql', 'auto'), 1, 'auto' or filename to build, number of backup files to keep
-WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
-DATAPOLICYJob=Data cleaner and anonymizer
-JobXMustBeEnabled=Job %s must be enabled
+MakeLocalDatabaseDump=Utwórz zrzut lokalnej bazy danych. Parametry to: kompresja („gz” lub „bz” lub „none”), typ kopii zapasowej („mysql”, „pgsql”, „auto”), 1, „auto” lub nazwa pliku do zbudowania, liczba plików kopii zapasowych do zachowania
+WarningCronDelayed=Uwaga, ze względu na wydajność, niezależnie od następnej daty wykonania włączonych zadań, Twoje zadania mogą zostać opóźnione maksymalnie o %s godzin, zanim zostaną uruchomione.
+DATAPOLICYJob=Narzędzie do czyszczenia danych i anonimizator
+JobXMustBeEnabled=Zadanie %s musi być włączone
 # Cron Boxes
-LastExecutedScheduledJob=Last executed scheduled job
-NextScheduledJobExecute=Next scheduled job to execute
-NumberScheduledJobError=Number of scheduled jobs in error
+LastExecutedScheduledJob=Ostatnio wykonane zaplanowane zadanie
+NextScheduledJobExecute=Następne zaplanowane zadanie do wykonania
+NumberScheduledJobError=Liczba błędnie zaplanowanych zadań
diff --git a/htdocs/langs/pl_PL/ecm.lang b/htdocs/langs/pl_PL/ecm.lang
index d82c3efa109..b68d5d9b952 100644
--- a/htdocs/langs/pl_PL/ecm.lang
+++ b/htdocs/langs/pl_PL/ecm.lang
@@ -41,7 +41,7 @@ FileNotYetIndexedInDatabase=Plik nie został jeszcze zindeksowany w bazie danych
 ExtraFieldsEcmFiles=Pliki Extrafields Ecm
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=Konfiguracja ECM
-GenerateImgWebp=Duplicate all images with another version with .webp format
-ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
-ConfirmImgWebpCreation=Confirm all images duplication
-SucessConvertImgWebp=Images successfully duplicated
+GenerateImgWebp=Wszystkie obrazy o innej wersji powiel w formacie .webp
+ConfirmGenerateImgWebp=Jeśli potwierdzisz, wygenerujesz obraz w formacie .webp dla wszystkich obrazów obecnie znajdujących się w tym folderze (podfoldery nie zostaną uwzględniane)...
+ConfirmImgWebpCreation=Potwierdź powielenie wszystkich obrazów
+SucessConvertImgWebp=Obrazy zostały pomyślnie zduplikowane
diff --git a/htdocs/langs/pl_PL/errors.lang b/htdocs/langs/pl_PL/errors.lang
index 5f372102c73..c6ff3448b97 100644
--- a/htdocs/langs/pl_PL/errors.lang
+++ b/htdocs/langs/pl_PL/errors.lang
@@ -4,13 +4,14 @@
 NoErrorCommitIsDone=Nie ma błędu, zobowiązujemy
 # Errors
 ErrorButCommitIsDone=Znalezione błędy, ale mimo to możemy potwierdzić
-ErrorBadEMail=Email %s is incorrect
-ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
-ErrorBadUrl=Url %s is incorrect
+ErrorBadEMail=E-mail %s jest nieprawidłowy
+ErrorBadMXDomain=E-mail %s wydaje się nieprawidłowy (nie odnaleziono prawidłowego rekordu MX dla domeny)
+ErrorBadUrl=Adres URL %s jest nieprawidłowy
 ErrorBadValueForParamNotAString=Zła wartość parametru. Zazwyczaj dołącza się, gdy brakuje tłumaczenia.
 ErrorRefAlreadyExists=Odniesienie <b> %s </b> już istnieje.
 ErrorLoginAlreadyExists=Zaloguj %s już istnieje.
 ErrorGroupAlreadyExists=Grupa %s już istnieje.
+ErrorEmailAlreadyExists=Email %s already exists.
 ErrorRecordNotFound=Rekord nie został znaleziony.
 ErrorFailToCopyFile=Nie udało się skopiować pliku '<b>%s</b>' do '<b>%s</b>'.
 ErrorFailToCopyDir=Nie udało się skopiować katalogu „<b> %s </b>” do „<b> %s </b>”.
@@ -46,8 +47,8 @@ ErrorWrongDate=Data nie jest poprawna!
 ErrorFailedToWriteInDir=Nie można zapisać w katalogu %s
 ErrorFoundBadEmailInFile=Znaleziono nieprawidłową składnię adresu email dla %s linii w pliku (przykładowo linia %s z adresem email %s)
 ErrorUserCannotBeDelete=Nie można usunąć użytkownika. Może jest to związane z podmiotami Dolibarr.
-ErrorFieldsRequired=Some required fields have been left blank.
-ErrorSubjectIsRequired=The email subject is required
+ErrorFieldsRequired=Niektóre wymagane pola zostały puste.
+ErrorSubjectIsRequired=Temat wiadomości e-mail jest wymagany
 ErrorFailedToCreateDir=Nie można utworzyć katalogu. Sprawdź, czy serwer WWW użytkownik ma uprawnienia do zapisu do katalogu dokumentów Dolibarr. Jeśli parametr <b>safe_mode</b> jest włączona w tym PHP, czy posiada Dolibarr php pliki do serwera internetowego użytkownika (lub grupy).
 ErrorNoMailDefinedForThisUser=Nie określono adresu email dla tego użytkownika
 ErrorSetupOfEmailsNotComplete=Konfiguracja e-maili nie została zakończona
@@ -117,7 +118,7 @@ ErrorCantReadFile=Nie można odczytać pliku '%s'
 ErrorCantReadDir=Nie można odczytać katalogu '%s'
 ErrorBadLoginPassword=Błędne hasło lub login
 ErrorLoginDisabled=Twoje konto zostało wyłączone
-ErrorFailedToRunExternalCommand=Nie można uruchomić polecenia zewnętrznych. Zameldowanie jest ona dostępna i runnable przez serwer PHP. Jeśli PHP <b>safe mode</b> jest włączony, czy polecenie wewnątrz katalogu określonym przez parametr <b>safe_mode_exec_dir.</b>
+ErrorFailedToRunExternalCommand=Nie udało się uruchomić polecenia zewnętrznego. Sprawdź, czy jest dostępny i uruchamiany przez użytkownika serwera PHP. Sprawdź również, że polecenie nie jest chronione na poziomie powłoki przez warstwę bezpieczeństwa, taką jak apparmor.
 ErrorFailedToChangePassword=Nie można zmienić hasła
 ErrorLoginDoesNotExists=Użytkownik <b>%s</b> nie został znaleziony.
 ErrorLoginHasNoEmail=Ten użytkownik nie ma adresu e-mail. Proces przerwany.
@@ -226,7 +227,7 @@ ErrorAPageWithThisNameOrAliasAlreadyExists=Strona/kontener <strong> %s </strong>
 ErrorDuringChartLoad=Błąd podczas ładowania planu kont. Jeśli kilka kont nie zostało załadowanych, nadal możesz wprowadzić je ręcznie.
 ErrorBadSyntaxForParamKeyForContent=Zła składnia parametru keyforcontent. Musi mieć wartość zaczynającą się od %s lub %s
 ErrorVariableKeyForContentMustBeSet=Błąd, należy ustawić stałą o nazwie %s (z treścią tekstową do wyświetlenia) lub %s (z zewnętrznym adresem URL do wyświetlenia).
-ErrorURLMustEndWith=URL %s must end %s
+ErrorURLMustEndWith=Adres URL %s musi kończyć się %s
 ErrorURLMustStartWithHttp=URL %s musi zaczynać się od http: // lub https: //
 ErrorHostMustNotStartWithHttp=Nazwa hosta %s NIE może zaczynać się od http: // lub https: //
 ErrorNewRefIsAlreadyUsed=Błąd, nowe odniesienie jest już używane
@@ -262,6 +263,7 @@ ErrorDateIsInFuture=Błąd, data nie może przypadać w przyszłości
 ErrorAnAmountWithoutTaxIsRequired=Błąd, kwota jest obowiązkowa
 ErrorAPercentIsRequired=Błąd, proszę poprawnie wpisać wartość procentową
 ErrorYouMustFirstSetupYourChartOfAccount=Najpierw musisz ustawić swój plan kont
+ErrorFailedToFindEmailTemplate=Nie udało się znaleźć szablonu o nazwie kodowej %s
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Twój parametr PHP upload_max_filesize (%s) jest wyższy niż parametr PHP post_max_size (%s). To nie jest spójna konfiguracja.
@@ -297,4 +299,5 @@ WarningAvailableOnlyForHTTPSServers=Dostępne tylko w przypadku korzystania z be
 WarningModuleXDisabledSoYouMayMissEventHere=Moduł %s nie został włączony. Możesz więc przegapić wiele wydarzeń tutaj.
 ErrorActionCommPropertyUserowneridNotDefined=Właściciel użytkownika jest wymagany
 ErrorActionCommBadType=Wybrany typ zdarzenia (id: %n, kod: %s) nie istnieje w słowniku typów zdarzeń
-CheckVersionFail=Version check fail
+CheckVersionFail=Sprawdzanie wersji nie powiodło się
+ErrorWrongFileName=Nazwa pliku nie może zawierać __COŚ__
diff --git a/htdocs/langs/pl_PL/eventorganization.lang b/htdocs/langs/pl_PL/eventorganization.lang
index 0f40e7ef18c..ec130e69dfa 100644
--- a/htdocs/langs/pl_PL/eventorganization.lang
+++ b/htdocs/langs/pl_PL/eventorganization.lang
@@ -1,4 +1,5 @@
 # Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+# Copyright (C) 2021		Dorian Vabre			<dorian.vabre@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
@@ -16,86 +17,127 @@
 #
 # Generic
 #
-ModuleEventOrganizationName = Event Organization
-EventOrganizationDescription = Event Organization through Module Project
-EventOrganizationDescriptionLong= Manage Event organization for conference, attendees, speaker, and attendees, with public subcription page
+ModuleEventOrganizationName = Impreza organizacyjna
+EventOrganizationDescription = Impreza organizacyjna za pomocą modułu Projekty
+EventOrganizationDescriptionLong= Zarządzaj imprezą organizacyjną dla konferencji, prelegentów, uczestników za pomocą publicznej strony subskrypcji
 #
 # Menu
 #
-EventOrganizationMenuLeft = Organized events
-EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
+EventOrganizationMenuLeft = Imprezy zorganizowane
+EventOrganizationConferenceOrBoothMenuLeft = Konferencja lub stoisko
 
 #
 # Admin page
 #
-EventOrganizationSetup = Event Organization setup
+EventOrganizationSetup = Konfiguracja imprezy organizacyjnej
 Settings = Ustawienia
-EventOrganizationSetupPage = Event Organization setup page
-EVENTORGANIZATION_TASK_LABEL = Label of tasks to create automatically when project is validated
-EVENTORGANIZATION_TASK_LABELTooltip = When you validate an organized event, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conference<br>Send Call for Booth<br>Receive call for conferences<br>Receive call for Booth<br>Open subscriptions to events for attendees<br>Send remind of event to speakers<br>Send remind of event to Booth hoster<br>Send remind of event to attendees
-EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties automatically created when someone suggests a conference
-EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Category to add to third-parties automatically created when they suggests a booth
-EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Template of email to send after receiving a suggestion of a conference.
-EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Template of email to send after receiving a suggestion of a booth.
-EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Template of email to send  after a subscription to a booth has been paid.
-EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Template of email to send after a subscription to an event has been paid.
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Template of email of massaction to attendes
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
-EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+EventOrganizationSetupPage = Strona konfiguracji imprezy organizacyjnej
+EVENTORGANIZATION_TASK_LABEL = Etykiety zadań automatycznie tworzonych po zatwierdzeniu projektu
+EVENTORGANIZATION_TASK_LABELTooltip = Podczas walidacji zorganizowanego wydarzenia niektóre zadania mogą być tworzone automatycznie w projekcie<br><br>Na przykład: <br>Wyślij wezwanie na konferencję<br>Wyślij wezwanie do stoiska<br>Odbierz wezwanie na konferencję<br>Odbierz wezwanie na konferencję<br>Odbierz wezwanie do stoiska<br>Wyślij prelegentom przypomnienie o imprezie<br>Wyślij gospodarzom stoiska przypomnienie o imprezie<br>Wyślij uczestnikom przypomnienie o imprezie
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Kategoria dodawana do kontrahentów, tworzona automatycznie po otrzymaniu sugestii zorganizowania konferencji.
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Kategoria dodawana do kontrahentów, tworzona automatycznie po otrzymaniu sugestii zorganizowania stoiska.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Szablon wiadomości e-mail wysyłany po otrzymaniu sugestii zorganizowania konferencji.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Szablon wiadomości e-mail wysyłany po otrzymaniu sugestii zorganizowania stoiska.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Szablon e-mail wysyłany po opłaceniu stoiska.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Szablon wiadomości e-mail wysyłany po opłaceniu imprezy.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Szablon wiadomości e-mail do wszystkich uczestników
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Szablon wiadomości e-mail do wszystkich prelegentów
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Zastosuj kategorię do filtrowania listy wyboru kontrahenta na karcie/formularzu tworzenia uczestników
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Zastosuj typ klienta do filtrowania listy wyboru kontrahenta na karcie/formularzu tworzenia uczestników
 
 #
 # Object
 #
-EventOrganizationConfOrBooth= Conference Or Booth
-ManageOrganizeEvent = Manage event organisation
-ConferenceOrBooth = Conference Or Booth
-ConferenceOrBoothTab = Conference Or Booth
-AmountOfSubscriptionPaid = Amount of subscription paid
-DateSubscription = Date of subscription
-ConferenceOrBoothAttendee = Conference Or Booth Attendee
+EventOrganizationConfOrBooth= Konferencja lub stoisko
+ManageOrganizeEvent = Zarządzaj imprezą organizacyjną
+ConferenceOrBooth = Konferencja lub stoisko
+ConferenceOrBoothTab = Konferencja lub stoisko
+AmountOfSubscriptionPaid = Kwota opłaconej subskrypcji
+DateSubscription = Data subskrypcji
+ConferenceOrBoothAttendee = Uczestnik konferencji lub stoiska
 
 #
 # Template Mail
 #
-YourOrganizationEventConfRequestWasReceived = Your request for conference was received
-YourOrganizationEventBoothRequestWasReceived = Your request for booth was received
-EventOrganizationEmailAskConf = Request for conference
-EventOrganizationEmailAskBooth = Request for booth
-EventOrganizationEmailSubsBooth = Subscription for booth
-EventOrganizationEmailSubsEvent = Subscription for an event
-EventOrganizationMassEmailAttendees = Communication to attendees
-EventOrganizationMassEmailSpeakers = Communication to speakers
+YourOrganizationEventConfRequestWasReceived = Twoje żądanie o konferencję zostało odebrane
+YourOrganizationEventBoothRequestWasReceived = Twoje żądanie o stoisko zostało odebrane
+EventOrganizationEmailAskConf = Żądanie o konferencję
+EventOrganizationEmailAskBooth = Żądanie o stoisko
+EventOrganizationEmailSubsBooth = Abonament za stoisko
+EventOrganizationEmailSubsEvent = Abonament za imprezę
+EventOrganizationMassEmailAttendees = Komunikacja z uczestnikami
+EventOrganizationMassEmailSpeakers = Komunikacja z prelegentami
 
 #
 # Event
 #
-AllowUnknownPeopleSuggestConf=Allow unknown people to suggest conferences
-AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest conferences
-AllowUnknownPeopleSuggestBooth=Allow unknown people to suggest booth
-AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to suggest booth
-PriceOfRegistration=Price of registration
-PriceOfRegistrationHelp=Price of registration
-PriceOfBooth=Subscription price to stand a booth
-PriceOfBoothHelp=Subscription price to stand a booth
-EventOrganizationICSLink=Link ICS for events
-ConferenceOrBoothInformation=Conference Or Booth informations
-Attendees = Attendees
-EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+AllowUnknownPeopleSuggestConf=Pozwól nieznanym osobom sugerować konferencje
+AllowUnknownPeopleSuggestConfHelp=Pozwól nieznanym osobom sugerować konferencje
+AllowUnknownPeopleSuggestBooth=Pozwól nieznanym osobom sugerować stoisko
+AllowUnknownPeopleSuggestBoothHelp=Pozwól nieznanym osobom sugerować stoisko
+PriceOfRegistration=Cena rejestracji
+PriceOfRegistrationHelp=Cena rejestracji
+PriceOfBooth=Cena abonamentu za stoisko
+PriceOfBoothHelp=Cena abonamentu za stoisko
+EventOrganizationICSLink=Łącze ICS dla zdarzeń
+ConferenceOrBoothInformation=Informacje o konferencji lub stoisku
+Attendees = Uczestnicy
+DownloadICSLink = Pobierz link do ICS
+EVENTORGANIZATION_SECUREKEY = Klucz bezpieczeństwa dla publicznego łącza do rejestracji na konferencję
+SERVICE_BOOTH_LOCATION = Usługa używana do wiersza faktury o lokalizacji stoiska
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Usługa używana w wierszu faktury za subskrypcję uczestnika na konferencję
 #
 # Status
 #
 EvntOrgDraft = Szkic
-EvntOrgSuggested = Suggested
-EvntOrgConfirmed = Confirmed
-EvntOrgNotQualified = Not Qualified
+EvntOrgSuggested = Zasugerowane
+EvntOrgConfirmed = Potwierdzone
+EvntOrgNotQualified = Brak kwalifikacji
 EvntOrgDone = Zrobione
-EvntOrgCancelled = Cancelled
+EvntOrgCancelled = Anulowane
 #
 # Public page
 #
-PublicAttendeeSubscriptionPage = Public link of registration to a conference
-MissingOrBadSecureKey = The security key is invalid or missing
-EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
-EvntOrgStartDuration = This conference starts on
-EvntOrgEndDuration =  and ends on
+SuggestForm = Strona sugestii
+RegisterPage = Strona na konferencje lub stoisko
+EvntOrgRegistrationHelpMessage = Tutaj możesz zagłosować na wydarzenie lub zaproponować nową konferencję lub stoisko dla projektu
+EvntOrgRegistrationConfHelpMessage = Tutaj możesz zaproponować nową konferencję do projektu
+EvntOrgRegistrationBoothHelpMessage = Tutaj możesz zaproponować nowe stoisko do projektu
+ListOfSuggestedConferences = Lista proponowanych konferencji
+ListOfSuggestedBooths = Lista sugerowanych stoisk
+SuggestConference = Zaproponuj nową konferencję
+SuggestBooth = Zaproponuj stoisko
+ViewAndVote = Zobacz i zagłosuj na sugerowane wydarzenia
+PublicAttendeeSubscriptionPage = Publiczne łącze do rejestracji na konferencję
+MissingOrBadSecureKey = Klucz bezpieczeństwa jest nieprawidłowy lub go brakuje
+EvntOrgWelcomeMessage = Ten formularz umożliwia zarejestrowanie się jako nowy uczestnik konferencji: '%s'
+EvntOrgDuration = Ta konferencja zaczyna się %s i kończy się %s.
+ConferenceAttendeeFee = Opłata uczestnika konferencji za wydarzenie: '%s' występujące od %s do %s.
+BoothLocationFee = Lokalizacja stoiska dla wydarzenia: „%s” występujące od %s do %s
+EventType = Typ wydarzenia
+
+#
+# Vote page
+#
+EvntOrgRegistrationWelcomeMessage = Witamy na stronie z propozycjami konferencji lub stoisk.
+EvntOrgRegistrationConfWelcomeMessage = Witamy na stronie propozycji konferencji.
+EvntOrgRegistrationBoothWelcomeMessage = Witamy na stronie propozycji stoisk.
+EvntOrgVoteHelpMessage = Tutaj możesz przeglądać i głosować na sugerowane wydarzenia dla projektu
+VoteOk = Twój głos został zaakceptowany.
+AlreadyVoted = Już zagłosowałeś na to wydarzenie.
+VoteError = Podczas głosowania wystąpił błąd, spróbuj ponownie.
+
+#
+# SubscriptionOk page
+#
+SubscriptionOk = Twoja subskrypcja na tę konferencję została potwierdzona
+#
+# Subscription validation mail
+#
+ConfAttendeeSubscriptionConfirmation = Potwierdzenie subskrypcji na konferencję
+#
+# Payment page
+#
+Attendee = Uczestnik
+PaymentConferenceAttendee = Opłata za uczestnika konferencji
+PaymentBoothLocation = Płatność za miejsce na stoisku
diff --git a/htdocs/langs/pl_PL/hrm.lang b/htdocs/langs/pl_PL/hrm.lang
index d6f087e0817..e10a89b2e2b 100644
--- a/htdocs/langs/pl_PL/hrm.lang
+++ b/htdocs/langs/pl_PL/hrm.lang
@@ -9,9 +9,9 @@ ConfirmDeleteEstablishment=Jesteś pewien, że chcesz usunąć to przedsiębiors
 OpenEtablishment=Otwórz kierownictwo
 CloseEtablishment=Zakończ kierownictwo
 # Dictionary
-DictionaryPublicHolidays=HRM - Public holidays
+DictionaryPublicHolidays=Urlop - święta państwowe
 DictionaryDepartment=HR - Lisa departamentów
-DictionaryFunction=HRM - Job positions
+DictionaryFunction=Zarządzanie personelem - stanowiska pracy
 # Module
 Employees=Zatrudnionych
 Employee=Pracownik
diff --git a/htdocs/langs/pl_PL/knowledgemanagement.lang b/htdocs/langs/pl_PL/knowledgemanagement.lang
index 00220dab02a..0809ae52139 100644
--- a/htdocs/langs/pl_PL/knowledgemanagement.lang
+++ b/htdocs/langs/pl_PL/knowledgemanagement.lang
@@ -18,38 +18,38 @@
 #
 
 # Module label 'ModuleKnowledgeManagementName'
-ModuleKnowledgeManagementName = Knowledge Management System
+ModuleKnowledgeManagementName = System Zarządzania wiedzą
 # Module description 'ModuleKnowledgeManagementDesc'
-ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+ModuleKnowledgeManagementDesc=Zarządzaj Zarządzaniem wiedzą lub Obsługą klienta
 
 #
 # Admin page
 #
-KnowledgeManagementSetup = Knowledge Management System setup
+KnowledgeManagementSetup = Konfiguracja systemu Zarządzania wiedzą
 Settings = Ustawienia
-KnowledgeManagementSetupPage = Knowledge Management System setup page
+KnowledgeManagementSetupPage = Strona konfiguracji systemu Zarządzania wiedzą
 
 
 #
 # About page
 #
 About = O
-KnowledgeManagementAbout = About Knowledge Management
-KnowledgeManagementAboutPage = Knowledge Management about page
+KnowledgeManagementAbout = O Zarządzaniu wiedzą
+KnowledgeManagementAboutPage = Strona informacyjna Zarządzania wiedzą
 
 #
 # Sample page
 #
-KnowledgeManagementArea = Knowledge Management
+KnowledgeManagementArea = Zarządzanie wiedzą
 
 
 #
 # Menu
 #
-MenuKnowledgeRecord = Knowledge base
-ListOfArticles = List of articles
-NewKnowledgeRecord = New article
-ValidateReply = Validate solution
-KnowledgeRecords = Articles
+MenuKnowledgeRecord = Baza wiedzy
+ListKnowledgeRecord = Lista artykułów
+NewKnowledgeRecord = Nowy artykuł
+ValidateReply = Sprawdź poprawność rozwiązania
+KnowledgeRecords = Artykuły
 KnowledgeRecord = Artykuł
-KnowledgeRecordExtraFields = Extrafields for Article
+KnowledgeRecordExtraFields = Extrapola dla artykułu
diff --git a/htdocs/langs/pl_PL/languages.lang b/htdocs/langs/pl_PL/languages.lang
index 946fc017a49..9ec8f75f555 100644
--- a/htdocs/langs/pl_PL/languages.lang
+++ b/htdocs/langs/pl_PL/languages.lang
@@ -1,11 +1,12 @@
 # Dolibarr language file - Source file is en_US - languages
-Language_am_ET=Ethiopian
+Language_am_ET=Etiopski
 Language_ar_AR=Arabski
 Language_ar_EG=Arabski (Egipt)
 Language_ar_SA=Arabski
-Language_az_AZ=Azerbaijani
+Language_ar_TN=Arabic (Tunisia)
+Language_az_AZ=Azerbejdżański
 Language_bn_BD=Bengalski
-Language_bn_IN=Bengali (India)
+Language_bn_IN=Bengalski (Indie)
 Language_bg_BG=Bułgarski
 Language_bs_BA=Bośniacki
 Language_ca_ES=Kataloński
@@ -23,7 +24,7 @@ Language_en_GB=Angielski (Zjednoczone Królestwo)
 Language_en_IN=Angielski (Indie)
 Language_en_NZ=Angielski (Nowa Zelandia)
 Language_en_SA=Angielski (Arabia Saudyjska)
-Language_en_SG=English (Singapore)
+Language_en_SG=Angielski (Singapur)
 Language_en_US=Angielski (Stany Zjednoczone)
 Language_en_ZA=Angielski (Republika Południowej Afryki)
 Language_es_ES=Hiszpański
@@ -33,16 +34,16 @@ Language_es_CL=Hiszpański (Chile)
 Language_es_CO=Hiszpański (Kolumbia)
 Language_es_DO=Hiszpański (Dominikana)
 Language_es_EC=Hiszpański (Ewkador)
-Language_es_GT=Spanish (Guatemala)
+Language_es_GT=Hiszpański (Gwatemala)
 Language_es_HN=Hiszpański (Honduras)
 Language_es_MX=Hiszpański (Meksyk)
 Language_es_PA=Hiszpański (Panama)
 Language_es_PY=Hiszpański (Paragwaj)
 Language_es_PE=Hiszpański (Peru)
 Language_es_PR=Hiszpański (Portoryko)
-Language_es_US=Spanish (USA)
+Language_es_US=Hiszpański (USA)
 Language_es_UY=Hiszpański (Urugwaj)
-Language_es_GT=Spanish (Guatemala)
+Language_es_GT=Hiszpański (Gwatemala)
 Language_es_VE=Hiszpański (Wenezuela)
 Language_et_EE=Estoński
 Language_eu_ES=Baskijski
@@ -51,22 +52,22 @@ Language_fi_FI=Fiński
 Language_fr_BE=Francuski (Belgia)
 Language_fr_CA=Francuski (Kanada)
 Language_fr_CH=Francuski (Szwajcaria)
-Language_fr_CI=French (Cost Ivory)
-Language_fr_CM=French (Cameroun)
+Language_fr_CI=Francuski (koszt Ivory)
+Language_fr_CM=Francuski (Cameroun)
 Language_fr_FR=Francuski
-Language_fr_GA=French (Gabon)
+Language_fr_GA=Francuski (Gabon)
 Language_fr_NC=Francuski (Nowa Kaledonia)
-Language_fr_SN=French (Senegal)
+Language_fr_SN=Francuski (Senegal)
 Language_fy_NL=Fryzyjski
-Language_gl_ES=Galician
+Language_gl_ES=Galicyjski
 Language_he_IL=Hebrajski
-Language_hi_IN=Hindi (India)
+Language_hi_IN=Hindi (Indie)
 Language_hr_HR=Chorwacki
 Language_hu_HU=Węgierski
 Language_id_ID=Indonezyjski
 Language_is_IS=Islandzki
 Language_it_IT=Włoski
-Language_it_CH=Italian (Switzerland)
+Language_it_CH=Włoski (Szwajcaria)
 Language_ja_JP=Japoński
 Language_ka_GE=Gruziński
 Language_km_KH=Khmerski
@@ -78,12 +79,13 @@ Language_lv_LV=Łotewski
 Language_mk_MK=Macedoński
 Language_mn_MN=Mongolski
 Language_nb_NO=Norweski (Bokmål)
-Language_ne_NP=Nepali
+Language_ne_NP=Nepalski
 Language_nl_BE=Holenderski (Belgia)
-Language_nl_NL=Dutch
+Language_nl_NL=Holenderski
 Language_pl_PL=Polski
 Language_pt_BR=Portugalski (Brazylia)
 Language_pt_PT=Portugalski
+Language_ro_MD=rumuński (Mołdawia)
 Language_ro_RO=Rumuński
 Language_ru_RU=Rosyjski
 Language_ru_UA=Rosyjski (Ukraina)
@@ -101,5 +103,5 @@ Language_uz_UZ=Uzbek
 Language_vi_VN=Wietnamski
 Language_zh_CN=Chiński
 Language_zh_TW=Chiński (tradycyjny)
-Language_zh_HK=Chinese (Hong Kong)
+Language_zh_HK=Chiński (Hongkong)
 Language_bh_MY=Malajski
diff --git a/htdocs/langs/pl_PL/mails.lang b/htdocs/langs/pl_PL/mails.lang
index 2185ec0745c..576b313a5fd 100644
--- a/htdocs/langs/pl_PL/mails.lang
+++ b/htdocs/langs/pl_PL/mails.lang
@@ -15,7 +15,7 @@ MailToUsers=Do użytkownika (ów)
 MailCC=Kopiuj do
 MailToCCUsers=Kopiuj dla użytkowników
 MailCCC=Kopi w pamięci do
-MailTopic=Email subject
+MailTopic=Temat wiadomości e-mail
 MailText=Wiadomość
 MailFile=Dołączone pliki
 MailMessage=Zawartość emaila 
@@ -131,8 +131,8 @@ NoNotificationsWillBeSent=Dla tego typu wydarzeń i firmy nie są planowane żad
 ANotificationsWillBeSent=1 automatyczne powiadomienie zostanie wysłane e-mailem
 SomeNotificationsWillBeSent=%s automatyczne powiadomienia będą wysyłane pocztą elektroniczną
 AddNewNotification=Zasubskrybuj nowe automatyczne powiadomienie e-mail (cel / wydarzenie)
-ListOfActiveNotifications=List of all active subscriptions (targets/events) for automatic email notification
-ListOfNotificationsDone=List of all automatic email notifications sent
+ListOfActiveNotifications=Lista wszystkich aktywnych subskrypcji (celów/wydarzeń) do automatycznego powiadamiania za pomocą e-mail
+ListOfNotificationsDone=Lista wszystkich wysłanych automatycznych powiadomień e-mail
 MailSendSetupIs=Konfiguracja poczty e-mail wysyłającego musi być połączone z '% s'. Tryb ten może być wykorzystywany do wysyłania masowego wysyłania.
 MailSendSetupIs2=Najpierw trzeba przejść, z konta administratora, w menu% sHome - Ustawienia - e-maile% s, aby zmienić parametr <strong>'% s'</strong> na tryb '% s' używać. W tym trybie można wprowadzić ustawienia serwera SMTP dostarczonych przez usługodawcę internetowego i używać funkcji e-maila Mszę św.
 MailSendSetupIs3=Jeśli masz jakieś pytania na temat konfiguracji serwera SMTP, możesz zapytać %s.
diff --git a/htdocs/langs/pl_PL/main.lang b/htdocs/langs/pl_PL/main.lang
index 703c144addc..9c20cd523b8 100644
--- a/htdocs/langs/pl_PL/main.lang
+++ b/htdocs/langs/pl_PL/main.lang
@@ -180,7 +180,7 @@ SaveAndNew=Zapisz i nowe
 TestConnection=Test połączenia
 ToClone=Duplikuj
 ConfirmCloneAsk=Czy jesteś pewny, chcesz sklonować objekt<b>%s</b>?
-ConfirmClone=Choose the data you want to clone:
+ConfirmClone=Wybierz dane, które chcesz powielić:
 NoCloneOptionsSpecified=Brak zdefiniowanych danych do zduplikowania.
 Of=z
 Go=Idź
@@ -246,7 +246,7 @@ DefaultModel=Domyślny szablon dokumentu
 Action=Działanie
 About=O
 Number=Liczba
-NumberByMonth=Total reports by month
+NumberByMonth=Łączna liczba raportów według miesiąca
 AmountByMonth=Kwota na miesiąc
 Numero=Numer
 Limit=Limit
@@ -341,8 +341,8 @@ KiloBytes=Kilobajtów
 MegaBytes=MB
 GigaBytes=GB
 TeraBytes=Terabajtów
-UserAuthor=Ceated by
-UserModif=Updated by
+UserAuthor=Utworzony przez
+UserModif=Poprawiony przez
 b=b.
 Kb=Kb
 Mb=Mb
@@ -430,6 +430,7 @@ LT1IN=Centralny podatek od towarów i usług
 LT2IN=Stanowy podatek od towarów i usług
 LT1GC=Dodatkowe centy
 VATRate=Stawka VAT
+RateOfTaxN=Stawka podatku %s
 VATCode=Kod stawki podatkowej
 VATNPR=Stawka podatku NPR
 DefaultTaxRate=Domyślna stawka podatku
@@ -729,6 +730,7 @@ MenuMembers=Członkowie
 MenuAgendaGoogle=Google agenda
 MenuTaxesAndSpecialExpenses=Podatki | Wydatki specjalne
 ThisLimitIsDefinedInSetup=Limit Dollibara (Menu główne-setup-bezpieczeństwo): %s KB, PHP, limit: %s KB
+ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
 NoFileFound=Brak wgranych dokumentów
 CurrentUserLanguage=Język bieżący
 CurrentTheme=Aktualny temat
@@ -845,7 +847,7 @@ XMoreLines=%s lini(e) ukryte
 ShowMoreLines=Pokaż więcej / mniej linii
 PublicUrl=Publiczny URL
 AddBox=Dodaj skrzynke
-SelectElementAndClick=Select an element and click on %s
+SelectElementAndClick=Wybierz element i kliknij %s
 PrintFile=Wydrukuj plik %s
 ShowTransaction=Pokaż wpisy na koncie bankowym
 ShowIntervention=Pokaż interwencję
@@ -856,8 +858,8 @@ Denied=Zabroniony
 ListOf=Lista %s
 ListOfTemplates=Lista szablonów
 Gender=Płeć
-Genderman=Male
-Genderwoman=Female
+Genderman=Męski
+Genderwoman=Żeński
 Genderother=Inne
 ViewList=Widok listy
 ViewGantt=Widok Gantta
@@ -1072,6 +1074,7 @@ ValidFrom=Ważne od
 ValidUntil=Ważne do
 NoRecordedUsers=Brak użytkowników
 ToClose=Do zamknięcia
+ToRefuse=Odmówić
 ToProcess=Do przetworzenia
 ToApprove=Do zatwierdzenia
 GlobalOpenedElemView=Widok globalny
@@ -1126,9 +1129,11 @@ UpdateForAllLines=Aktualizacja dla wszystkich linii
 OnHold=Wstrzymany
 Civility=Grzeczność
 AffectTag=Wpływ na Tag
+CreateExternalUser=Utwórz użytkownika zewnętrznego
 ConfirmAffectTag=Wpływ tagu zbiorczego
 ConfirmAffectTagQuestion=Czy na pewno chcesz wpłynąć na tagi %s wybranych rekordów?
 CategTypeNotFound=Nie znaleziono typu tagu dla typu rekordów
 CopiedToClipboard=Skopiowane do schowka
 InformationOnLinkToContract=Kwota ta to tylko suma wszystkich pozycji zamówienia. Nie bierze się pod uwagę żadnego pojęcia czasu.
-ConfirmCancel=Are you sure you want to cancel
+ConfirmCancel=Czy na pewno chcesz zrezygnować
+EmailMsgID=Email MsgID
diff --git a/htdocs/langs/pl_PL/members.lang b/htdocs/langs/pl_PL/members.lang
index 017167beee0..6bbcc0c2448 100644
--- a/htdocs/langs/pl_PL/members.lang
+++ b/htdocs/langs/pl_PL/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Inny członek <b>(nazwa: %s,</b> zalo
 ErrorUserPermissionAllowsToLinksToItselfOnly=Ze względów bezpieczeństwa, musisz być przyznane uprawnienia do edycji wszystkich użytkowników, aby można było powiązać członka do użytkownika, który nie jest twoje.
 SetLinkToUser=Link do użytkownika Dolibarr
 SetLinkToThirdParty=Link do Dolibarr trzeciej
-MembersCards=Business cards for members
+MembersCards=Wizytówki dla członków
 MembersList=Lista członków
 MembersListToValid=Lista szkiców członków (do zatwierdzenia)
 MembersListValid=Wykaz ważnych członków
@@ -32,7 +32,7 @@ MembersWithSubscriptionToReceive=Użytkownicy z subskrypcji otrzymują
 MembersWithSubscriptionToReceiveShort=Subskrypcja do odbioru
 DateSubscription=Data subskrypcji
 DateEndSubscription=Data końca subskrypcji
-EndSubscription=Subscription Ends
+EndSubscription=Subskrypcja kończy się
 SubscriptionId=ID subskrypcji
 WithoutSubscription=Bez abonamentu
 MemberId=ID członka
@@ -83,10 +83,10 @@ WelcomeEMail=Powitalny e-mail
 SubscriptionRequired=Subskrypcja wymagana
 DeleteType=Usuń
 VoteAllowed=Głosowanie dozwolone
-Physical=Individual
-Moral=Corporation
-MorAndPhy=Corporation and Individual
-Reenable=Re-Enable
+Physical=Osoba fizyczna
+Moral=Korporacja
+MorAndPhy=Korporacja i osoba fizyczna
+Reenable=Włącz ponownie
 ExcludeMember=Wyklucz członka
 ConfirmExcludeMember=Czy na pewno chcesz wykluczyć tego członka?
 ResiliateMember=Zakończ członka
@@ -144,7 +144,7 @@ DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Szablon wiadomości e-mail używan
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Szablon wiadomości e-mail używany do wysyłania wiadomości e-mail do członka w sprawie nowego nagrania subskrypcji
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Szablon wiadomości e-mail służący do wysyłania przypomnień e-mail o zbliżającym się wygaśnięciu subskrypcji
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Szablon wiadomości e-mail używany do wysyłania wiadomości e-mail do członka w przypadku anulowania członka
-DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Szablon wiadomości e-mail wysyłanej do członka w przypadku jego wykluczenia
 DescADHERENT_MAIL_FROM=Adres e-mail nadawcy dla automatycznych e-maili
 DescADHERENT_ETIQUETTE_TYPE=Etykiety formacie
 DescADHERENT_ETIQUETTE_TEXT=Tekst drukowany na arkuszach adresowych członkiem
@@ -170,31 +170,31 @@ DocForLabels=Generowanie arkuszy adres (Format wyjściowy rzeczywiście setup: <
 SubscriptionPayment=Zaplanowana płatność
 LastSubscriptionDate=Data ostatniej płatności abonamentowej
 LastSubscriptionAmount=Ilość ostatniej subskrypcji
-LastMemberType=Last Member type
+LastMemberType=Typ ostatniego członka
 MembersStatisticsByCountries=Użytkownicy statystyki według kraju
 MembersStatisticsByState=Użytkownicy statystyki na State / Province
 MembersStatisticsByTown=Użytkownicy statystyki na miasto
 MembersStatisticsByRegion=Użytkownicy statystyki regionu
-NbOfMembers=Total number of members
-NbOfActiveMembers=Total number of current active members
+NbOfMembers=Całkowita liczba członków
+NbOfActiveMembers=Całkowita liczba obecnych aktywnych członków
 NoValidatedMemberYet=Żadna potwierdzona znaleziono użytkowników
-MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
-MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
-MembersByTownDesc=This screen show you statistics of members by town.
-MembersByNature=This screen show you statistics of members by nature.
-MembersByRegion=This screen show you statistics of members by region.
+MembersByCountryDesc=Statystyki członków według krajów. Wykresy zależą od dostępności usługi wykresów online Google, a także od dostępności działającego połączenia internetowego.
+MembersByStateDesc=Statystyki członków według podziału terytorialnego.
+MembersByTownDesc=Statystyki członków według miast.
+MembersByNature=Statystyki członków według charakteru.
+MembersByRegion=Statystyki członków według regionów.
 MembersStatisticsDesc=Wybierz statystyki chcesz czytać ...
 MenuMembersStats=Statystyka
-LastMemberDate=Latest membership date
+LastMemberDate=Ostatnia data członkostwa
 LatestSubscriptionDate=Data ostatniej subskrypcji
-MemberNature=Nature of the member
-MembersNature=Nature of the members
-Public=Information is public
+MemberNature=Charakter członka
+MembersNature=Charakter członków
+Public=Informacje są jawne
 NewMemberbyWeb=Nowy członek dodaje. Oczekuje na zatwierdzenie
 NewMemberForm=Nowa forma członkiem
-SubscriptionsStatistics=Subscriptions statistics
+SubscriptionsStatistics=Statystyki subskrypcji
 NbOfSubscriptions=Liczba abonamentów
-AmountOfSubscriptions=Amount collected from subscriptions
+AmountOfSubscriptions=Kwota pobrana z subskrypcji
 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
@@ -213,3 +213,5 @@ SendReminderForExpiredSubscription=Wyślij przypomnienie e-mailem do członków,
 MembershipPaid=Członkostwo opłacone za bieżący okres (do %s)
 YouMayFindYourInvoiceInThisEmail=Możesz znaleźć fakturę w załączniku do tej wiadomości e-mail
 XMembersClosed=%s członków zamkniętych
+XExternalUserCreated=%s utworzono użytkowników zewnętrznych
+ForceMemberNature=Charakter członka siły (osoba fizyczna lub korporacja)
diff --git a/htdocs/langs/pl_PL/modulebuilder.lang b/htdocs/langs/pl_PL/modulebuilder.lang
index 70b1bea9bee..157929d44fe 100644
--- a/htdocs/langs/pl_PL/modulebuilder.lang
+++ b/htdocs/langs/pl_PL/modulebuilder.lang
@@ -85,7 +85,7 @@ ListOfPermissionsDefined=Lista zdefiniowanych uprawnień
 SeeExamples=Zobacz przykłady tutaj
 EnabledDesc=Warunek, aby to pole było aktywne (Przykłady: 1 lub $conf->global->MYMODULE_MYOPTION)
 VisibleDesc=Czy pole jest widoczne? (Przykłady: 0 = niewidoczne, 1 = widoczne na liście i utwórz / zaktualizuj / wyświetl formularze, 2 = widoczne tylko na liście, 3 = widoczne tylko w formularzu tworzenia / aktualizacji / przeglądania (nie na liście), 4 = widoczne na liście i tylko aktualizuj / wyświetl formularz (nie twórz), 5 = widoczne tylko w formularzu widoku końca listy (nie tworzy, nie aktualizuje). <br> <br> Użycie wartości ujemnej oznacza, że pole nie jest domyślnie wyświetlane na liście, ale można je wybrać do przeglądania). <br> <br> Może to być wyrażenie, na przykład: <br> preg_match ('/ public /', $ _SERVER ['PHP_SELF'])? 0: 1 <br> ($ user- 1 holiday?
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br><br><strong>For document :</strong><br>0 = not displayed <br>1 = display<br>2 = display only if not empty<br><br><strong>For document lines :</strong><br>0 = not displayed <br>1 = displayed in a column<br>3 = display in line description column after the description<br>4 = display in description column after the description only if not empty
+DisplayOnPdfDesc=Wyświetlając to pole w kompatybilnych dokumentach PDF możesz zarządzać jego pozycją za pomocą pola "Pozycja".<br>Obecnie znane kompatybilne modele PDF to: eratosthene (zamówienie), espadon (dostawa), sponge (faktury), cyan (propozycja/oferta), cornas (zamówienie dostawcy)<br><br><strong>Dla dokumentu:</strong><br>0 = nie wyświetlaj <br>1 = wyświetlaj<br>2 = wyświetlaj tylko, gdy nie puste<br><br><strong>Dla linii dokumentu:</strong><br>0 = nie wyświetlaj <br>1 = wyświetlaj w kolumnie<br>3 = wyświetlaj w linii kolumny opisowej po opisie<br>4 = wyświetlaj w kolumnie opisowej po opisie, tylko gdy nie pusty
 DisplayOnPdf=Wyświetl na dokumencie PDF
 IsAMeasureDesc=Czy wartość pola można skumulować, aby uzyskać sumę na liście? (Przykłady: 1 lub 0)
 SearchAllDesc=Czy to pole jest używane do wyszukiwania za pomocą narzędzia szybkiego wyszukiwania? (Przykłady: 1 lub 0)
@@ -133,9 +133,9 @@ IncludeDocGeneration=Chcę wygenerować dokumenty z obiektu
 IncludeDocGenerationHelp=Jeśli to zaznaczysz, zostanie wygenerowany kod w celu dodania pola „Generuj dokument” do rekordu.
 ShowOnCombobox=Pokaż wartość w combobox
 KeyForTooltip=Klucz do podpowiedzi
-CSSClass=CSS for edit/create form
-CSSViewClass=CSS for read form
-CSSListClass=CSS for list
+CSSClass=CSS do formularza edycji/tworzenia
+CSSViewClass=CSS do formularza odczytu
+CSSListClass=CSS dla listy
 NotEditable=Nie można edytować
 ForeignKey=Klucz obcy
 TypeOfFieldsHelp=Typ pól: <br> varchar (99), double (24,8), real, text, html, datetime, timestamp, integer, integer: ClassName: względna ścieżka / do / classfile.class.php [: 1 [: filter]] („1” oznacza, że dodajemy przycisk + po kombinacji w celu utworzenia rekordu, „filter” może mieć wartość „status = 1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)” na przykład)
@@ -143,3 +143,4 @@ AsciiToHtmlConverter=Konwerter Ascii na HTML
 AsciiToPdfConverter=Konwerter ASCII na PDF
 TableNotEmptyDropCanceled=Tabela nie jest pusta. Upuszczenie zostało anulowane.
 ModuleBuilderNotAllowed=Kreator modułów jest dostępny, ale nie jest dozwolony dla użytkownika.
+ImportExportProfiles=Importuj i eksportuj profile
diff --git a/htdocs/langs/pl_PL/mrp.lang b/htdocs/langs/pl_PL/mrp.lang
index ec999a473a4..2cea0e79db8 100644
--- a/htdocs/langs/pl_PL/mrp.lang
+++ b/htdocs/langs/pl_PL/mrp.lang
@@ -1,104 +1,103 @@
-Mrp=Manufacturing Orders
-MOs=Manufacturing orders
-ManufacturingOrder=Manufacturing Order
-MRPDescription=Module to manage production and Manufacturing Orders (MO).
-MRPArea=MRP Area
-MrpSetupPage=Setup of module MRP
-MenuBOM=Bills of material
-LatestBOMModified=Latest %s Bills of materials modified
-LatestMOModified=Latest %s Manufacturing Orders modified
-Bom=Bills of Material
-BillOfMaterials=Bill of Material
-BOMsSetup=Setup of module BOM
-ListOfBOMs=List of bills of material - BOM
-ListOfManufacturingOrders=List of Manufacturing Orders
-NewBOM=New bill of material
-ProductBOMHelp=Product to create with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
-BOMsNumberingModules=BOM numbering templates
-BOMsModelModule=BOM document templates
-MOsNumberingModules=MO numbering templates
-MOsModelModule=MO document templates
-FreeLegalTextOnBOMs=Free text on document of BOM
-WatermarkOnDraftBOMs=Watermark on draft BOM
-FreeLegalTextOnMOs=Free text on document of MO
-WatermarkOnDraftMOs=Watermark on draft MO
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
-ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
-ManufacturingEfficiency=Manufacturing efficiency
-ConsumptionEfficiency=Consumption efficiency
-ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the production
-ValueOfMeansLossForProductProduced=Value of 0.95 means an average of 5%% of loss of produced product
-DeleteBillOfMaterials=Delete Bill Of Materials
-DeleteMo=Delete Manufacturing Order
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
-MenuMRP=Manufacturing Orders
-NewMO=New Manufacturing Order
-QtyToProduce=Qty to produce
-DateStartPlannedMo=Date start planned
-DateEndPlannedMo=Date end planned
-KeepEmptyForAsap=Empty means 'As Soon As Possible'
-EstimatedDuration=Estimated duration
-EstimatedDurationDesc=Estimated duration to manufacture this product using this BOM
-ConfirmValidateBom=Are you sure you want to validate the BOM with the reference <strong>%s</strong> (you will be able to use it to build new Manufacturing Orders)
-ConfirmCloseBom=Are you sure you want to cancel this BOM (you won't be able to use it to build new Manufacturing Orders anymore) ?
-ConfirmReopenBom=Are you sure you want to re-open this BOM (you will be able to use it to build new Manufacturing Orders)
-StatusMOProduced=Produced
+Mrp=Zamówienia produkcyjne
+MOs=Zlecenia produkcyjne
+ManufacturingOrder=Zamówienie produkcyjne
+MRPDescription=Moduł do zarządzania produkcją i zleceniami produkcyjnymi (MO).
+MRPArea=Strefa MRP
+MrpSetupPage=Konfiguracja modułu MRP
+MenuBOM=Zestawienia materiałów
+LatestBOMModified=Najnowsze %s Zmodyfikowane listy materiałów
+LatestMOModified=Ostatnie %s Zmodyfikowano zamówienia produkcyjne
+Bom=Zestawienia materiałów
+BillOfMaterials=Zestawienie materiałów
+BOMsSetup=Konfiguracja BOM modułu
+ListOfBOMs=Lista zestawień materiałowych - BOM
+ListOfManufacturingOrders=Lista zleceń produkcyjnych
+NewBOM=Nowa lista materiałów
+ProductBOMHelp=Produkt do utworzenia (lub demontażu) za pomocą tego BOM. <br> Uwaga: Produkty z właściwością „Rodzaj produktu” = „Surowiec” nie są widoczne na tej liście.
+BOMsNumberingModules=Szablony numeracji BOM
+BOMsModelModule=Szablony dokumentów BOM
+MOsNumberingModules=Szablony numeracji MO
+MOsModelModule=Szablony dokumentów MO
+FreeLegalTextOnBOMs=Dowolny tekst na dokumencie BOM
+WatermarkOnDraftBOMs=Znak wodny na wersji roboczej zestawienia komponentów
+FreeLegalTextOnMOs=Dowolny tekst na dokumencie MO
+WatermarkOnDraftMOs=Znak wodny na wersji roboczej MO
+ConfirmCloneBillOfMaterials=Czy na pewno chcesz sklonować zestawienie komponentów %s?
+ConfirmCloneMo=Czy na pewno chcesz sklonować zamówienie produkcyjne %s?
+ManufacturingEfficiency=Wydajność produkcji
+ConsumptionEfficiency=Efektywność zużycia
+ValueOfMeansLoss=Wartość 0,95 oznacza średnio 5%% straty podczas produkcji
+ValueOfMeansLossForProductProduced=Wartość 0,95 oznacza średnio 5%% straty wytworzonego produktu
+DeleteBillOfMaterials=Usuń listę materiałów
+DeleteMo=Usuń zlecenie produkcyjne
+ConfirmDeleteBillOfMaterials=Czy na pewno chcesz usunąć ten wykaz materiałów?
+ConfirmDeleteMo=Czy na pewno chcesz usunąć ten wykaz materiałów?
+MenuMRP=Zamówienia produkcyjne
+NewMO=Nowe zamówienie produkcyjne
+QtyToProduce=Ilość do wyprodukowania
+DateStartPlannedMo=Planowana data rozpoczęcia
+DateEndPlannedMo=Planowany termin zakończenia
+KeepEmptyForAsap=Puste oznacza „tak szybko, jak to możliwe”
+EstimatedDuration=Przewidywany czas
+EstimatedDurationDesc=Szacowany czas produkcji (lub demontażu) tego produktu przy użyciu tego BOM
+ConfirmValidateBom=Czy na pewno chcesz zweryfikować BOM z odniesieniem <strong> %s </strong> (będziesz mógł go użyć do tworzenia nowych zamówień produkcyjnych)
+ConfirmCloseBom=Czy na pewno chcesz anulować ten BOM (nie będziesz już mógł go używać do tworzenia nowych zamówień produkcyjnych)?
+ConfirmReopenBom=Czy na pewno chcesz ponownie otworzyć ten BOM (będziesz mógł go użyć do tworzenia nowych zamówień produkcyjnych)
+StatusMOProduced=Wytworzony
 QtyFrozen=Frozen Qty
-QuantityFrozen=Frozen Quantity
-QuantityConsumedInvariable=When this flag is set, the quantity consumed is always the value defined and is not relative to the quantity produced.
-DisableStockChange=Stock change disabled
-DisableStockChangeHelp=When this flag is set, there is no stock change on this product, whatever is the quantity consumed
-BomAndBomLines=Bills Of Material and lines
-BOMLine=Line of BOM
-WarehouseForProduction=Warehouse for production
-CreateMO=Create MO
-ToConsume=To consume
-ToProduce=To produce
-QtyAlreadyConsumed=Qty already consumed
-QtyAlreadyProduced=Qty already produced
-QtyRequiredIfNoLoss=Qty required if there is no loss (Manufacturing efficiency is 100%%)
-ConsumeOrProduce=Consume or Produce
-ConsumeAndProduceAll=Consume and Produce All
-Manufactured=Manufactured
-TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
-ForAQuantityOf=For a quantity to produce of %s
-ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
-ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
-ProductionForRef=Production of %s
-AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
-NoStockChangeOnServices=No stock change on services
-ProductQtyToConsumeByMO=Product quantity still to consume by open MO
-ProductQtyToProduceByMO=Product quentity still to produce by open MO
-AddNewConsumeLines=Add new line to consume
-ProductsToConsume=Products to consume
-ProductsToProduce=Products to produce
-UnitCost=Unit cost
-TotalCost=Total cost
-BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
-GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.
-ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
-Workstation=Workstation
-Workstations=Workstations
-WorkstationsDescription=Workstations management
-WorkstationSetup = Workstations setup
-WorkstationSetupPage = Workstations setup page
-WorkstationAbout = About Workstation
-WorkstationAboutPage = Workstations about page
-WorkstationList=Workstation list
-WorkstationCreate=Add new workstation
-ConfirmEnableWorkstation=Are you sure you want to enable workstation <b>%s</b> ?
-EnableAWorkstation=Enable a workstation
-ConfirmDisableWorkstation=Are you sure you want to disable workstation <b>%s</b> ?
-DisableAWorkstation=Disable a workstation
-DeleteWorkstation=Supprimer
-NbOperatorsRequired=Number of operators required
-THMOperatorEstimated=Estimated operator THM
-THMMachineEstimated=Estimated machine THM
-WorkstationType=Workstation type
-Human=Human
-Machine=Machine
-HumanMachine=Human / Machine
-WorkstationArea=Workstation area
-Machines=Machines
-THMEstimatedHelp=This rate makes it possible to define a forecast cost of the item
+QuantityFrozen=Ilość mrożona
+QuantityConsumedInvariable=Gdy ta flaga jest ustawiona, zużyta ilość jest zawsze wartością zdefiniowaną i nie jest zależna od wyprodukowanej ilości.
+DisableStockChange=Zmiana zapasów wyłączona
+DisableStockChangeHelp=Gdy ta flaga jest ustawiona, nie ma zmiany stanu zapasów tego produktu, niezależnie od zużytej ilości
+BomAndBomLines=Listy materiałów i wiersze
+BOMLine=Linia BOM
+WarehouseForProduction=Magazyn do produkcji
+CreateMO=Utwórz MO
+ToConsume=Konsumować
+ToProduce=Produkować
+QtyAlreadyConsumed=Ilość już zużyta
+QtyAlreadyProduced=Ilość już wyprodukowana
+QtyRequiredIfNoLoss=Ilość wymagana, jeśli nie ma strat (wydajność produkcji to 100%%)
+ConsumeOrProduce=Zużyj lub wyprodukuj
+ConsumeAndProduceAll=Konsumuj i produkuj wszystko
+Manufactured=Zrobiony fabrycznie
+TheProductXIsAlreadyTheProductToProduce=Produkt do dodania jest już produktem do wyprodukowania.
+ForAQuantityOf=Dla ilości do wyprodukowania %s
+ForAQuantityToConsumeOf=Dla ilości do demontażu %s
+ConfirmValidateMo=Czy na pewno chcesz zweryfikować to zamówienie produkcyjne?
+ConfirmProductionDesc=Klikając „%s”, potwierdzisz zużycie i / lub produkcję dla ustalonych ilości. Spowoduje to również zaktualizowanie zapasów i rejestrowanie ruchów zapasów.
+ProductionForRef=Produkcja %s
+AutoCloseMO=Zamykaj automatycznie zlecenie produkcyjne, jeśli osiągnięte zostaną ilości do spożycia i produkcji
+NoStockChangeOnServices=Brak zmian w magazynie usług
+ProductQtyToConsumeByMO=Ilość produktu do spożycia w ramach otwartego zamówienia
+ProductQtyToProduceByMO=Ilość produktu jeszcze do wyprodukowania przez otwarte MO
+AddNewConsumeLines=Dodaj nową linię do konsumpcji
+ProductsToConsume=Produkty do spożycia
+ProductsToProduce=Produkty do produkcji
+UnitCost=Cena jednostkowa
+TotalCost=Całkowity koszt
+BOMTotalCost=Koszt wytworzenia tego BOM na podstawie kosztu każdej ilości i produktu do konsumpcji (użyj ceny kosztu, jeśli została zdefiniowana, w innym przypadku średniej ceny ważonej, jeśli została zdefiniowana, w przeciwnym razie najlepszej ceny zakupu)
+GoOnTabProductionToProduceFirst=Aby zamknąć zlecenie produkcyjne, musisz najpierw rozpocząć produkcję (patrz zakładka „%s”). Ale możesz to anulować.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=Zestaw nie może być użyty w BOM lub MO
+Workstation=Stacja robocza
+Workstations=Stacje robocze
+WorkstationsDescription=Zarządzanie stacjami roboczymi
+WorkstationSetup = Konfiguracja stacji roboczych
+WorkstationSetupPage = Strona konfiguracji stacji roboczych
+WorkstationList=Lista stacji roboczych
+WorkstationCreate=Dodaj nową stację roboczą
+ConfirmEnableWorkstation=Czy na pewno chcesz włączyć stację roboczą <b> %s </b>?
+EnableAWorkstation=Włącz stację roboczą
+ConfirmDisableWorkstation=Czy na pewno chcesz wyłączyć stację roboczą <b> %s </b>?
+DisableAWorkstation=Wyłącz stację roboczą
+DeleteWorkstation=Usuń
+NbOperatorsRequired=Wymagana liczba operatorów
+THMOperatorEstimated=Szacowany operator THM
+THMMachineEstimated=Szacunkowa maszyna THM
+WorkstationType=Typ stacji roboczej
+Human=Człowiek
+Machine=Maszyna
+HumanMachine=Człowiek / Maszyna
+WorkstationArea=Obszar stacji roboczej
+Machines=Maszyny
+THMEstimatedHelp=Stawka ta umożliwia zdefiniowanie prognozowanego kosztu towaru
diff --git a/htdocs/langs/pl_PL/orders.lang b/htdocs/langs/pl_PL/orders.lang
index b67799df5fb..ef5fea6a55e 100644
--- a/htdocs/langs/pl_PL/orders.lang
+++ b/htdocs/langs/pl_PL/orders.lang
@@ -11,6 +11,7 @@ OrderDate=Data zamówienia
 OrderDateShort=Data zamówienia
 OrderToProcess=Zamówienia do przetworzenia
 NewOrder=Nowe zamówienie
+NewSupplierOrderShort=Nowe zamówienie
 NewOrderSupplier=Nowe zamówienie
 ToOrder=Stwórz zamówienie
 MakeOrder=Stwórz zamówienie
@@ -73,6 +74,7 @@ DeleteOrder=Usuń zamówienie
 CancelOrder=Anuluj zamówienie
 OrderReopened= Zamów ponownie %s
 AddOrder=Stwórz zamówienie
+AddSupplierOrderShort=Stwórz zamówienie
 AddPurchaseOrder=Utwórz zamówienie zakupu
 AddToDraftOrders=Dodaj do szkicu zamówienia
 ShowOrder=Pokaż zamówienie
diff --git a/htdocs/langs/pl_PL/other.lang b/htdocs/langs/pl_PL/other.lang
index bb578a28841..23624577adf 100644
--- a/htdocs/langs/pl_PL/other.lang
+++ b/htdocs/langs/pl_PL/other.lang
@@ -129,6 +129,7 @@ ClosedByLogin=Nazwa użytkownika który zamknął
 FileWasRemoved=Plik %s został usunięty
 DirWasRemoved=Katalog %s został usunięty
 FeatureNotYetAvailable=Funkcjonalność jeszcze niedostępna w aktualnej wersji
+FeatureNotAvailableOnDevicesWithoutMouse=Funkcja niedostępna na urządzeniach bez myszy
 FeaturesSupported=Wspierane funkcjonalności
 Width=Szerokość
 Height=Wysokość
@@ -183,7 +184,7 @@ EnableGDLibraryDesc=Zainstaluj lub włącz bibliotekę GD w instalacji PHP, aby
 ProfIdShortDesc=<b>Prof ID %s</b> jest informacji w zależności od trzeciej kraju. <br> Na przykład, dla <b>kraju, %s,</b> jest to <b>kod %s.</b>
 DolibarrDemo=Demo Dolibarr ERP/CRM
 StatsByNumberOfUnits=Statystyki dla sum ilości produktów / usług
-StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
+StatsByNumberOfEntities=Statystyki wybranego obiektu (np. liczba faktur, liczba zamówień, ...)
 NumberOfProposals=Liczba propozycji
 NumberOfCustomerOrders=Liczba zamówień sprzedaży
 NumberOfCustomerInvoices=Ilość faktur klientów
@@ -245,7 +246,7 @@ NewKeyIs=To są twoje nowe klucze do logowania
 NewKeyWillBe=Twój nowy klucz, aby zalogować się do programu będzie
 ClickHereToGoTo=Kliknij tutaj, aby przejść do %s
 YouMustClickToChange=Trzeba jednak najpierw kliknąć na poniższy link, aby potwierdzić tę zmianę hasła
-ConfirmPasswordChange=Confirm password change
+ConfirmPasswordChange=Potwierdź zmianę hasła
 ForgetIfNothing=Jeśli nie zwrócić tę zmianę, po prostu zapomnieć ten e-mail. Twoje dane są przechowywane w sposób bezpieczny.
 IfAmountHigherThan=Jeśli kwota wyższa niż <strong>%s</strong>
 SourcesRepository=Źródła dla repozytorium
@@ -263,7 +264,7 @@ ContactCreatedByEmailCollector=Kontakt / adres utworzony przez kolektora poczty
 ProjectCreatedByEmailCollector=Projekt utworzony przez kolektor poczty e-mail z wiadomości e-mail MSGID %s
 TicketCreatedByEmailCollector=Bilet utworzony przez zbierającego wiadomości e-mail z wiadomości e-mail MSGID %s
 OpeningHoursFormatDesc=Użyj - aby oddzielić godziny otwarcia i zamknięcia. <br> Użyj spacji, aby wprowadzić różne zakresy. <br> Przykład: 8-12 14-18
-PrefixSession=Prefiks identyfikatora sesji
+SuffixSessionName=Sufiks nazwy sesji
 
 ##### Export #####
 ExportsArea=Wywóz obszarze
@@ -289,4 +290,4 @@ PopuProp=Produkty / usługi według popularności w propozycjach
 PopuCom=Produkty / usługi według popularności w Zamówieniach
 ProductStatistics=Statystyki produktów / usług
 NbOfQtyInOrders=Ilość w zamówieniach
-SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
+SelectTheTypeOfObjectToAnalyze=Wybierz obiekt, aby wyświetlić jego statystyki...
diff --git a/htdocs/langs/pl_PL/partnership.lang b/htdocs/langs/pl_PL/partnership.lang
index 6b35205dbda..7bcca8845b5 100644
--- a/htdocs/langs/pl_PL/partnership.lang
+++ b/htdocs/langs/pl_PL/partnership.lang
@@ -16,41 +16,72 @@
 #
 # Generic
 #
-ModulePartnershipName = Partnership management
-PartnershipDescription = Module Partnership management
-PartnershipDescriptionLong= Module Partnership management
+ModulePartnershipName=Zarządzanie partnerstwem
+PartnershipDescription=Moduł Zarządzania partnerstwem
+PartnershipDescriptionLong= Moduł Zarządzania partnerstwem
+
+AddPartnership=Add partnership
+CancelPartnershipForExpiredMembers=Partnership: Cancel partnership of members with expired subscriptions
+PartnershipCheckBacklink=Partnership: Check referring backlink
 
 #
 # Menu
 #
-NewPartnership = New Partnership
-ListOfPartnerships = List of partnership
+NewPartnership=Nowe partnerstwo
+ListOfPartnerships=Lista partnerstw
 
 #
 # Admin page
 #
-PartnershipSetup = Partnership setup
-PartnershipAbout = About Partnership
-PartnershipAboutPage = Partnership about page
-
+PartnershipSetup=Konfiguracja partnerstwa
+PartnershipAbout=O partnerstwie
+PartnershipAboutPage=Strona informacyjna o partnerstwie
+partnershipforthirdpartyormember=Status partnera musi być ustawiony na „osobę trzecią” lub „członek”
+PARTNERSHIP_IS_MANAGED_FOR=Partnerstwo zarządzane przez
+PARTNERSHIP_BACKLINKS_TO_CHECK=Linki wsteczne do sprawdzenia
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Liczba dni przed anulowaniem statusu partnerstwa po wygaśnięciu subskrypcji
+ReferingWebsiteCheck=Sprawdzenie odsyłającej strony internetowej
+ReferingWebsiteCheckDesc=Możesz włączyć funkcję, aby sprawdzić, czy Twoi partnerzy dodali link zwrotny do domen Twojej witryny we własnej witrynie.
 
 #
 # Object
 #
+DeletePartnership=Usuń partnerstwo
+PartnershipDedicatedToThisThirdParty=Partnerstwo dedykowane tej stronie trzeciej
+PartnershipDedicatedToThisMember=Partnerstwo dedykowane temu członkowi
 DatePartnershipStart=Data rozpoczęcia
 DatePartnershipEnd=Data zakończenia
+ReasonDecline=Odrzuć powód
+ReasonDeclineOrCancel=Odrzuć powód
+PartnershipAlreadyExist=Partnerstwo już istnieje
+ManagePartnership=Zarządzaj partnerstwem
+BacklinkNotFoundOnPartnerWebsite=Nie znaleziono linku zwrotnego w witrynie partnera
+ConfirmClosePartnershipAsk=Czy na pewno chcesz anulować to partnerstwo?
+PartnershipType=Partnership type
 
 #
 # Template Mail
 #
+SendingEmailOnPartnershipWillSoonBeCanceled=Partnerstwo zostanie wkrótce anulowane
+SendingEmailOnPartnershipRefused=Partnerstwo odrzucone
+SendingEmailOnPartnershipAccepted=Partnerstwo zaakceptowane
+SendingEmailOnPartnershipCanceled=Partnerstwo anulowane
 
+YourPartnershipWillSoonBeCanceledTopic=Partnerstwo zostanie wkrótce anulowane
+YourPartnershipRefusedTopic=Partnerstwo odrzucone
+YourPartnershipAcceptedTopic=Partnerstwo zaakceptowane
+YourPartnershipCanceledTopic=Partnerstwo anulowane
+
+YourPartnershipWillSoonBeCanceledContent=Informujemy, że Twoje partnerstwo zostanie wkrótce anulowane (nie znaleziono linku zwrotnego)
+YourPartnershipRefusedContent=Informujemy, że Twoja prośba o partnerstwo została odrzucona.
+YourPartnershipAcceptedContent=Informujemy, że Twoja prośba o partnerstwo została zaakceptowana.
+YourPartnershipCanceledContent=Informujemy, że Twoje partnerstwo zostało anulowane.
 
 #
 # Status
 #
-PartnershipDraft = Szkic
-PartnershipAccepted = Zaakceptowane
-PartnershipRefused = Odrzucony
-PartnershipCanceled = Anulowany
-
-PartnershipManagedFor=Partners are
+PartnershipDraft=Szkic
+PartnershipAccepted=Zaakceptowane
+PartnershipRefused=Odrzucony
+PartnershipCanceled=Anulowany
+PartnershipManagedFor=Partnerami są
diff --git a/htdocs/langs/pl_PL/productbatch.lang b/htdocs/langs/pl_PL/productbatch.lang
index 710b09cf60b..f48ad28814f 100644
--- a/htdocs/langs/pl_PL/productbatch.lang
+++ b/htdocs/langs/pl_PL/productbatch.lang
@@ -1,4 +1,4 @@
-# ProductBATCH language file - en_US - ProductBATCH
+# ProductBATCH language file - Source file is en_US - ProductBATCH
 ManageLotSerial=Użyj lot / numer seryjny
 ProductStatusOnBatch=Tak (wymagana partia)
 ProductStatusOnSerial=Tak (wymagany unikalny numer seryjny)
@@ -25,11 +25,21 @@ ShowCurrentStockOfLot=Pokaż aktualny zapas dla pasy produkt/lot
 ShowLogOfMovementIfLot=Pokaż historię przesunięć dla pary produkt/lot
 StockDetailPerBatch=Szczegóły zapasu po locie
 SerialNumberAlreadyInUse=Numer seryjny %s jest już używany dla produktu %s
-TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
+TooManyQtyForSerialNumber=Możesz mieć tylko jeden produkt %s dla numeru seryjnego %s
 BatchLotNumberingModules=Opcje automatycznego generowania produktów wsadowych zarządzanych partiami
 BatchSerialNumberingModules=Opcje automatycznego generowania produktów wsadowych zarządzanych według numerów seryjnych
-ManageLotMask=Custom mask
-CustomMasks=Adds an option to define mask in the product card
-LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
-SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
-QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+ManageLotMask=Maska niestandardowa
+CustomMasks=Dodaje opcję definiowania maski na karcie produktu
+LotProductTooltip=Dodaje opcję na karcie produktu, aby zdefiniować dedykowaną maskę numeru partii
+SNProductTooltip=Dodaje opcję na karcie produktu, aby zdefiniować dedykowaną maskę numeru seryjnego
+QtyToAddAfterBarcodeScan=Ilość do dodania dla każdego zeskanowanego kodu kreskowego/partii/numeru seryjnego
+LifeTime=Żywotność (w dniach)
+EndOfLife=Koniec życia
+ManufacturingDate=Data produkcji
+DestructionDate=Data zniszczenia
+FirstUseDate=Data pierwszego użycia
+QCFrequency=Częstotliwość kontroli jakości (w dniach)
+
+#Traceability - qc status
+OutOfOrder=Niesprawny
+InWorkingOrder=Sprawny
diff --git a/htdocs/langs/pl_PL/products.lang b/htdocs/langs/pl_PL/products.lang
index b6a183b57f2..a21dc1817f3 100644
--- a/htdocs/langs/pl_PL/products.lang
+++ b/htdocs/langs/pl_PL/products.lang
@@ -43,7 +43,7 @@ ServicesOnSaleOnly=Usługi tylko na sprzedaż
 ServicesOnPurchaseOnly=Usługi tylko do zakupu
 ServicesNotOnSell=Usługi nie na sprzedaż i nie do zakupu
 ServicesOnSellAndOnBuy=Usługi na sprzedaż i do zakupu
-LastModifiedProductsAndServices=Latest %s products/services which were modified
+LastModifiedProductsAndServices=Najnowsze %sprodukty/usługi, które zostały zmodyfikowane
 LastRecordedProducts=Ostatnie %s zarejestrowanych produktów
 LastRecordedServices=Ostatnie %s zarejestrowanych usług
 CardProduct0=Produkt
@@ -73,12 +73,12 @@ SellingPrice=Cena sprzedaży
 SellingPriceHT=Cena sprzedaży (Bez VAT)
 SellingPriceTTC=Cena sprzedaży (z podatkiem)
 SellingMinPriceTTC=Minimalna cena sprzedaży (z podatkiem)
-CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
+CostPriceDescription=To pole ceny (bez podatku) może służyć do przechwytywania średniej kwoty, jaką ten produkt kosztuje dla Twojej firmy. Może to być każda cena, którą sam obliczysz, na przykład ze średniej ceny zakupu plus średni koszt produkcji i dystrybucji.
 CostPriceUsage=Wartość tę można wykorzystać do obliczenia depozytu zabezpieczającego.
 SoldAmount=Sprzedana ilość
 PurchasedAmount=Zakupiona ilość
 NewPrice=Nowa cena
-MinPrice=Min. selling price
+MinPrice=Min. cena sprzedaży
 EditSellingPriceLabel=Edytuj etykietę ceny sprzedaży
 CantBeLessThanMinPrice=Cena sprzedaży nie może być niższa niż minimalna dopuszczalna dla tego produktu (%s bez podatku). Ten komunikat może się również pojawić po wpisaniu zbyt wysokiego rabatu.
 ContractStatusClosed=Zamknięte
@@ -157,11 +157,11 @@ ListServiceByPopularity=Wykaz usług ze względu na popularność
 Finished=Produkty wytwarzane
 RowMaterial=Surowiec
 ConfirmCloneProduct=Czy na pewno chcesz powielić produkt lub usługę <b>%s</b>?
-CloneContentProduct=Clone all main information of the product/service
+CloneContentProduct=Powiel wszystkie główne informacje o produkcie/usłudze
 ClonePricesProduct=Powiel ceny
-CloneCategoriesProduct=Clone linked tags/categories
-CloneCompositionProduct=Clone virtual products/services
-CloneCombinationsProduct=Clone the product variants
+CloneCategoriesProduct=Powiel połączone tagi/kategorie
+CloneCompositionProduct=Powiel wirtualne produkty/usługi
+CloneCombinationsProduct=Powiel warianty produktu
 ProductIsUsed=Ten produkt jest używany
 NewRefForClone=Referencja nowego produktu/usługi
 SellingPrices=Cena sprzedaży
@@ -170,12 +170,12 @@ CustomerPrices=Ceny klienta
 SuppliersPrices=Ceny dostawców
 SuppliersPricesOfProductsOrServices=Ceny dostawców (produktów lub usług)
 CustomCode=Cła | Towar | Kod HS
-CountryOrigin=Country of origin
-RegionStateOrigin=Region of origin
-StateOrigin=State|Province of origin
-Nature=Nature of product (raw/manufactured)
+CountryOrigin=Kraj pochodzenia
+RegionStateOrigin=Region pochodzenia
+StateOrigin=Stan/prowincja pochodzenia
+Nature=Typ produktu (surowy/wyprodukowany)
 NatureOfProductShort=Charakter produktu
-NatureOfProductDesc=Raw material or manufactured product
+NatureOfProductDesc=Surowiec lub wytworzony produkt
 ShortLabel=Krótka etykieta
 Unit=Jednostka
 p=jedn.
@@ -314,7 +314,7 @@ LastUpdated=Ostatnia aktualizacja
 CorrectlyUpdated=Poprawnie zaktualizowane
 PropalMergePdfProductActualFile=Pliki użyć, aby dodać do PDF Azur są / jest
 PropalMergePdfProductChooseFile=Wybież plik PDF
-IncludingProductWithTag=Include products/services with tag
+IncludingProductWithTag=Uwzględnij produkty/usługi z tagiem
 DefaultPriceRealPriceMayDependOnCustomer=Domyślna cena, realna cena może zależeć od klienta
 WarningSelectOneDocument=Proszę zaznaczyć co najmniej jeden dokument
 DefaultUnitToShow=Jednostka
@@ -396,3 +396,5 @@ ActionAvailableOnVariantProductOnly=Akcja dostępna tylko w wariancie produktu
 ProductsPricePerCustomer=Ceny produktów na klientów
 ProductSupplierExtraFields=Dodatkowe atrybuty (ceny dostawców)
 DeleteLinkedProduct=Usuń produkt podrzędny powiązany z kombinacją
+PMPValue=Średnia ważona ceny
+PMPValueShort=WAP
diff --git a/htdocs/langs/pl_PL/projects.lang b/htdocs/langs/pl_PL/projects.lang
index 35a50d977a1..0ddae48e90d 100644
--- a/htdocs/langs/pl_PL/projects.lang
+++ b/htdocs/langs/pl_PL/projects.lang
@@ -10,19 +10,19 @@ PrivateProject=Kontakty projektu
 ProjectsImContactFor=Projekty, dla których jestem jawnym kontaktem
 AllAllowedProjects=Cały projekt, który mogę przeczytać (mój + publiczny)
 AllProjects=Wszystkie projekty
-MyProjectsDesc=This view is limited to the projects that you are a contact for
+MyProjectsDesc=Ten widok jest ograniczony do projektów, dla których jesteś osobą kontaktową
 ProjectsPublicDesc=Ten widok przedstawia wszystkie projekty, które możesz przeczytać.
 TasksOnProjectsPublicDesc=Ten widok przedstawia wszystkie zadania w projektach, które możesz czytać.
 ProjectsPublicTaskDesc=Ten widok przedstawia wszystkie projekty i zadania, które są dozwolone do czytania.
 ProjectsDesc=Ten widok przedstawia wszystkie projekty (twoje uprawnienia użytkownika pozwalają wyświetlać wszystko).
 TasksOnProjectsDesc=Ten widok przedstawia wszystkie zadania we wszystkich projektach (Twoje uprawnienia użytkownika dają Ci uprawnienia do przeglądania wszystkiego).
-MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
+MyTasksDesc=Ten widok jest ograniczony do projektów lub zadań dla których jesteś osobą kontaktową
 OnlyOpenedProject=Tylko otwarte projekty są widoczne (szkice projektów lub zamknięte projekty są niewidoczne)
 ClosedProjectsAreHidden=Zamknięte projekty nie są widoczne.
 TasksPublicDesc=Ten widok przedstawia wszystkie projekty i zadania, które możesz przeczytać.
 TasksDesc=Ten widok przedstawia wszystkie projekty i zadania (twoje uprawnienia mają dostępu do wglądu we wszystko).
 AllTaskVisibleButEditIfYouAreAssigned=Wszystkie zadania dla zakwalifikowanych projektów są widoczne, ale możesz wprowadzić czas tylko dla zadania przypisanego do wybranego użytkownika. Przypisz zadanie, jeśli chcesz wprowadzić na nim czas.
-OnlyYourTaskAreVisible=Only tasks assigned to you are visible. If you need to enter time on a task and if the task is not visible here, then you need to assign the task to yourself.
+OnlyYourTaskAreVisible=Widoczne są tylko zadania przypisane do Ciebie. Jeśli potrzebujesz wprowadzić czas w zadaniu a ono nie jest tutaj widoczne, to musisz przypisać to zadanie sobie.
 ImportDatasetTasks=Zadania projektów
 ProjectCategories=Tagi / kategorie projektów
 NewProject=Nowy projekt
@@ -89,7 +89,7 @@ TimeConsumed=Strawiony
 ListOfTasks=Lista zadań
 GoToListOfTimeConsumed=Przejdź do listy czasochłonnych
 GanttView=Widok Gantta
-ListWarehouseAssociatedProject=List of warehouses associated to the project
+ListWarehouseAssociatedProject=Lista magazynów powiązanych z projektem
 ListProposalsAssociatedProject=Lista ofert handlowych związanych z projektem
 ListOrdersAssociatedProject=Lista zamówień sprzedaży związanych z projektem
 ListInvoicesAssociatedProject=Lista faktur klientów związanych z projektem
@@ -202,7 +202,7 @@ ResourceNotAssignedToTheTask=Nie dopisane do zadania
 NoUserAssignedToTheProject=Brak użytkowników przypisanych do tego projektu
 TimeSpentBy=Czas spędzony przez
 TasksAssignedTo=Zadania przypisane do
-AssignTaskToMe=Assign task to myself
+AssignTaskToMe=Przypisz sobie to zadanie
 AssignTaskToUser=Przypisz zadanie do %s
 SelectTaskToAssign=Wybierz zadanie do przypisania ...
 AssignTask=Przydzielać
@@ -267,9 +267,11 @@ InvoiceToUse=Projekt faktury do wykorzystania
 NewInvoice=Nowa faktura
 OneLinePerTask=Jedna linia na zadanie
 OneLinePerPeriod=Jedna linia na okres
+OneLinePerTimeSpentLine=Jedna linijka za każdą spędzoną deklarację
 RefTaskParent=Nr ref. Zadanie rodzica
 ProfitIsCalculatedWith=Zysk jest obliczany za pomocą
 AddPersonToTask=Dodaj także do zadań
 UsageOrganizeEvent=Użycie: Organizacja wydarzeń
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Zaklasyfikuj projekt jako zamknięty po wykonaniu wszystkich jego zadań (postęp 100%%)
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Uwaga: nie będzie to miało wpływu na istniejące projekty ze wszystkimi zadaniami o postępie 100%%: będziesz musiał je zamknąć ręcznie. Ta opcja dotyczy tylko otwartych projektów.
+SelectLinesOfTimeSpentToInvoice=Wybierz wiersze spędzonego czasu, które nie zostały rozliczone, a następnie wykonaj zbiorcze działanie „Wygeneruj fakturę”, aby je rozliczyć
diff --git a/htdocs/langs/pl_PL/receptions.lang b/htdocs/langs/pl_PL/receptions.lang
index 653fd411d63..69db63abc94 100644
--- a/htdocs/langs/pl_PL/receptions.lang
+++ b/htdocs/langs/pl_PL/receptions.lang
@@ -1,26 +1,26 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=Product Reception setup
-RefReception=Ref. reception
+ReceptionsSetup=Konfiguracja odbioru produktu
+RefReception=Nr ref. Przyjęcie
 Reception=Na proces
-Receptions=Receptions
-AllReceptions=All Receptions
+Receptions=Przyjęcia
+AllReceptions=Wszystkie przyjęcia
 Reception=Na proces
-Receptions=Receptions
-ShowReception=Show Receptions
-ReceptionsArea=Receptions area
-ListOfReceptions=List of receptions
-ReceptionMethod=Reception method
-LastReceptions=Latest %s receptions
-StatisticsOfReceptions=Statistics for receptions
-NbOfReceptions=Number of receptions
-NumberOfReceptionsByMonth=Number of receptions by month
-ReceptionCard=Reception card
-NewReception=New reception
-CreateReception=Create reception
-QtyInOtherReceptions=Qty in other receptions
-OtherReceptionsForSameOrder=Other receptions for this order
-ReceptionsAndReceivingForSameOrder=Receptions and receipts for this order
-ReceptionsToValidate=Receptions to validate
+Receptions=Przyjęcia
+ShowReception=Pokaż przyjęcia
+ReceptionsArea=Strefa przyjęć
+ListOfReceptions=Lista przyjęć
+ReceptionMethod=Sposób odbioru
+LastReceptions=Najnowsze przyjęcia %s
+StatisticsOfReceptions=Statystyki przyjęć
+NbOfReceptions=Liczba przyjęć
+NumberOfReceptionsByMonth=Liczba przyjęć według miesiąca
+ReceptionCard=Karta odbioru
+NewReception=Nowa recepcja
+CreateReception=Utwórz recepcję
+QtyInOtherReceptions=Ilość w innych przyjęciach
+OtherReceptionsForSameOrder=Inne przyjęcia na to zamówienie
+ReceptionsAndReceivingForSameOrder=Przyjęcia i pokwitowania za to zamówienie
+ReceptionsToValidate=Przyjęcia do weryfikacji
 StatusReceptionCanceled=Anulowany
 StatusReceptionDraft=Szkic
 StatusReceptionValidated=Zatwierdzone (produkty do wysyłki lub już wysłane)
@@ -28,20 +28,20 @@ StatusReceptionProcessed=Przetwarzany
 StatusReceptionDraftShort=Szkic
 StatusReceptionValidatedShort=Zatwierdzony
 StatusReceptionProcessedShort=Przetwarzany
-ReceptionSheet=Reception sheet
-ConfirmDeleteReception=Are you sure you want to delete this reception?
-ConfirmValidateReception=Are you sure you want to validate this reception with reference <b>%s</b>?
-ConfirmCancelReception=Are you sure you want to cancel this reception?
-StatsOnReceptionsOnlyValidated=Statistics conducted on receptions only validated. Date used is date of validation of reception (planed delivery date is not always known).
-SendReceptionByEMail=Send reception by email
-SendReceptionRef=Submission of reception %s
-ActionsOnReception=Events on reception
-ReceptionCreationIsDoneFromOrder=For the moment, creation of a new reception is done from the order card.
-ReceptionLine=Reception line
-ProductQtyInReceptionAlreadySent=Product quantity from open sales order already sent
-ProductQtyInSuppliersReceptionAlreadyRecevied=Product quantity from open supplier order already received
-ValidateOrderFirstBeforeReception=You must first validate the order before being able to make receptions.
-ReceptionsNumberingModules=Numbering module for receptions
-ReceptionsReceiptModel=Document templates for receptions
-NoMorePredefinedProductToDispatch=No more predefined products to dispatch
-
+ReceptionSheet=Arkusz odbioru
+ConfirmDeleteReception=Czy na pewno chcesz usunąć ten odbiór?
+ConfirmValidateReception=Czy na pewno chcesz zweryfikować ten odbiór za pomocą numeru referencyjnego <b> %s </b>?
+ConfirmCancelReception=Czy na pewno chcesz anulować to przyjęcie?
+StatsOnReceptionsOnlyValidated=Statystyki przeprowadzone tylko na przyjęciach zostały potwierdzone. Użyta data to data potwierdzenia odbioru (nie zawsze znana jest planowana data dostawy).
+SendReceptionByEMail=Wyślij odbiór e-mailem
+SendReceptionRef=Przesłanie odbioru %s
+ActionsOnReception=Wydarzenia w recepcji
+ReceptionCreationIsDoneFromOrder=Na razie tworzenie nowego odbioru odbywa się z karty zamówienia.
+ReceptionLine=Linia odbioru
+ProductQtyInReceptionAlreadySent=Ilość produktu z otwartego zamówienia sprzedaży już wysłanego
+ProductQtyInSuppliersReceptionAlreadyRecevied=Ilość produktu z otwartego zamówienia dostawcy już otrzymana
+ValidateOrderFirstBeforeReception=Musisz najpierw potwierdzić zamówienie, zanim będziesz mógł robić przyjęcia.
+ReceptionsNumberingModules=Moduł numeracji przyjęć
+ReceptionsReceiptModel=Wzory dokumentów do przyjęć
+NoMorePredefinedProductToDispatch=Nigdy więcej gotowych produktów do wysyłki
+ReceptionExist=Recepcja istnieje
diff --git a/htdocs/langs/pl_PL/recruitment.lang b/htdocs/langs/pl_PL/recruitment.lang
index 3dedf38eb1d..1c25f2f2a98 100644
--- a/htdocs/langs/pl_PL/recruitment.lang
+++ b/htdocs/langs/pl_PL/recruitment.lang
@@ -72,5 +72,5 @@ YourCandidatureAnswerMessage=Dziękuję za zgłoszenie. <br> ...
 JobClosedTextCandidateFound=Stanowisko jest zamknięte. Stanowisko zostało obsadzone.
 JobClosedTextCanceled=Stanowisko jest zamknięte.
 ExtrafieldsJobPosition=Atrybuty uzupełniające (stanowiska pracy)
-ExtrafieldsApplication=Complementary attributes (job applications)
+ExtrafieldsApplication=Atrybuty uzupełniające (np. podania o pracę)
 MakeOffer=Złożyć ofertę
diff --git a/htdocs/langs/pl_PL/sendings.lang b/htdocs/langs/pl_PL/sendings.lang
index 0b019a76f32..c0bcde0f398 100644
--- a/htdocs/langs/pl_PL/sendings.lang
+++ b/htdocs/langs/pl_PL/sendings.lang
@@ -43,7 +43,7 @@ ConfirmValidateSending=Czy potwierdzić tą wysyłkę z numerem referencyjnym <b
 ConfirmCancelSending=Czy anulować tą wysyłkę?
 DocumentModelMerou=Model Merou A5
 WarningNoQtyLeftToSend=Ostrzeżenie nie produktów oczekujących na wysłanie.
-StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
+StatsOnShipmentsOnlyValidated=Statystyki dotyczą tylko zweryfikowanych przesyłek. Użyta data to data walidacjiprzesyłki (planowana data dostawy nie zawsze jest znana)
 DateDeliveryPlanned=Planowana data dostawy
 RefDeliveryReceipt=Zwróć potwierdzenie dostawy
 StatusReceipt=Potwierdzenie statusu dostawy
diff --git a/htdocs/langs/pl_PL/stocks.lang b/htdocs/langs/pl_PL/stocks.lang
index 6ad6f2f915e..421f5c72709 100644
--- a/htdocs/langs/pl_PL/stocks.lang
+++ b/htdocs/langs/pl_PL/stocks.lang
@@ -19,8 +19,8 @@ Stock=Stan
 Stocks=Stany
 MissingStocks=Brakujące zapasy
 StockAtDate=Stan na dzień
-StockAtDateInPast=Date in the past
-StockAtDateInFuture=Date in the future
+StockAtDateInPast=Data w przeszłości
+StockAtDateInFuture=Data w przyszłości
 StocksByLotSerial=Zapasy według lotu/nr seryjnego
 LotSerial=Partie/Serie
 LotSerialList=Lista partii/serii
@@ -37,8 +37,8 @@ AllWarehouses=Wszystkie magazyny
 IncludeEmptyDesiredStock=Uwzględnij również stan ujemny z nieokreślonym żądanym stanem
 IncludeAlsoDraftOrders=Uwzględnij również projekty zamówień
 Location=Lokacja
-LocationSummary=Short name of location
-NumberOfDifferentProducts=Number of unique products
+LocationSummary=Krótka nazwa lokalizacji
+NumberOfDifferentProducts=Liczba unikalnych produktów
 NumberOfProducts=Łączna liczba produktów
 LastMovement=Ostatni ruch
 LastMovements=Ostatnie ruchy
@@ -56,13 +56,11 @@ UnitPurchaseValue=Jednostkowa cena nabycia
 StockTooLow=Zbyt niski zapas
 StockLowerThanLimit=Zapas niższy niż limit dla alarmu (%s)
 EnhancedValue=Wartość
-PMPValue=Średnia ważona ceny
-PMPValueShort=WAP
 EnhancedValueOfWarehouses=Magazyny wartości
 UserWarehouseAutoCreate=Utwórz użytkownika dla magazynu kiedy tworzysz użytkownika
 AllowAddLimitStockByWarehouse=Zarządzaj również wartością minimalnego i pożądanego zapasu na parę (magazyn produktów) oprócz wartości minimalnego i pożądanego zapasu na produkt
 RuleForWarehouse=Reguła dla magazynów
-WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+WarehouseAskWarehouseOnThirparty=Ustaw magazyn na kontrahenta
 WarehouseAskWarehouseDuringPropal=Ustaw magazyn na ofertach handlowych
 WarehouseAskWarehouseDuringOrder=Ustaw magazyn dla zamówień sprzedaży
 UserDefaultWarehouse=Ustaw magazyn dla użytkowników
@@ -91,14 +89,14 @@ NoPredefinedProductToDispatch=Nie gotowych produktów dla tego obiektu. Więc ni
 DispatchVerb=Wysyłka
 StockLimitShort=Limit zapasu przy którym wystąpi alarm
 StockLimit=Limit zapasu przy którym wystąpi alarm
-StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
+StockLimitDesc=(pusty) oznacza brak ostrzeżenia. <br> 0 można użyć do wywołania ostrzeżenia tylko, gdy zapasy są puste.
 PhysicalStock=Zapas fizyczny
 RealStock=Realny magazyn
 RealStockDesc=Fizyczne / rzeczywiste zapasy to stany znajdujące się obecnie w magazynach.
 RealStockWillAutomaticallyWhen=Rzeczywisty stan magazynowy zostanie zmodyfikowany zgodnie z tą zasadą (zdefiniowaną w module Magazyn):
 VirtualStock=Wirtualny zapas
 VirtualStockAtDate=Wirtualne zapasy na dzień
-VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen date will be finished
+VirtualStockAtDateDesc=Wirtualne zapasy dla sytuacji, gdy wszystkie oczekujące zamówienia, które mają zostać zrealizowane przed wybraną datą, zostaną zakończone
 VirtualStockDesc=Zapasy wirtualne to obliczone zapasy dostępne po zamknięciu wszystkich otwartych / oczekujących akcji (mających wpływ na zapasy) (otrzymane zamówienia zakupu, wysłane zamówienia sprzedaży, wyprodukowane zlecenia produkcyjne itp.)
 AtDate=W dniu
 IdWarehouse=Identyfikator magazynu
@@ -147,7 +145,7 @@ Replenishments=Uzupełnienie
 NbOfProductBeforePeriod=Ilość produktów w magazynie% s przed wybrany okres (<% s)
 NbOfProductAfterPeriod=Ilość produktów w magazynie% s po wybraniu okres (>% s)
 MassMovement=Masowe przesunięcie
-SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
+SelectProductInAndOutWareHouse=Wybierz magazyny źródłowy i docelowy, produkt i ilość, a następnie kliknij "%s". Po wykonaniu wszystkiego co wymagane kliknij ”%s”.
 RecordMovement=Transfer rekordu
 ReceivingForSameOrder=Wpływy do tego celu
 StockMovementRecorded=Przesunięcia zapasu zarejestrowane
@@ -238,10 +236,10 @@ StockIsRequiredToChooseWhichLotToUse=Zapas jest wymagany, aby wybrać partię do
 ForceTo=Zmusić do
 AlwaysShowFullArbo=Wyświetlaj pełne drzewo magazynu w wyskakującym okienku linków do magazynu (Ostrzeżenie: może to znacznie zmniejszyć wydajność)
 StockAtDatePastDesc=Możesz tutaj zobaczyć stan zapasów (stan rzeczywisty) w danym dniu w przeszłości
-StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
+StockAtDateFutureDesc=Tutaj możesz zobaczyć stan (wirtualnych) zapasów na dany dzień w przyszłości
 CurrentStock=Aktualny stan
 InventoryRealQtyHelp=Ustaw wartość na 0, aby zresetować ilość <br> Pozostaw pole puste lub usuń wiersz, aby zachować niezmienione
-UpdateByScaning=Fill real qty by scaning
+UpdateByScaning=Wypełnij prawdziwą ilość skanując
 UpdateByScaningProductBarcode=Zaktualizuj przez skanowanie (kod kreskowy produktu)
 UpdateByScaningLot=Aktualizacja przez skanowanie (lot | seryjny kod kreskowy)
 DisableStockChangeOfSubProduct=Dezaktywuj zmianę zapasów dla wszystkich podproduktów tego zestawu podczas tego ruchu.
@@ -251,7 +249,10 @@ SelectAStockMovementFileToImport=wybierz plik ruchu zapasów do zaimportowania
 InfoTemplateImport=Przesłany plik musi mieć ten format (* pola obowiązkowe): <br> Magazyn źródłowy * | Magazyn docelowy * | Produkt * | Ilość * | Numer partii / seryjny <br> Separator znaków CSV musi mieć postać „<b> %s </b>”
 LabelOfInventoryMovemement=Zapasy %s
 ReOpen=Otworzyć na nowo
-ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
-ObjectNotFound=%s not found
-MakeMovementsAndClose=Generate movements and close
-AutofillWithExpected=Fill real quantity with expected quantity
+ConfirmFinish=Czy potwierdzasz zamknięcie inwentaryzacji? Spowoduje to wygenerowanie wszystkich ruchów zapasów, aby zaktualizować stan zapasów do rzeczywistej ilości wprowadzonej do zapasów.
+ObjectNotFound=Nie znaleziono %s
+MakeMovementsAndClose=Zainicjuj przemieszczenia zapasów i zamknij
+AutofillWithExpected=Wypełnij rzeczywistą ilość ilością oczekiwaną
+ShowAllBatchByDefault=Domyślnie wyświetlaj szczegóły partii na karcie „magazyn” produktu
+CollapseBatchDetailHelp=Możesz ustawić domyślne wyświetlanie szczegółów partii w konfiguracji modułu zapasów
+FieldCannotBeNegative=Pole „%s” nie może być ujemne
diff --git a/htdocs/langs/pl_PL/ticket.lang b/htdocs/langs/pl_PL/ticket.lang
index 7d704f01740..e8f995f6274 100644
--- a/htdocs/langs/pl_PL/ticket.lang
+++ b/htdocs/langs/pl_PL/ticket.lang
@@ -40,9 +40,9 @@ TicketTypeShortPROJET=Projekt
 TicketTypeShortOTHER=Inne
 
 TicketSeverityShortLOW=Niski
-TicketSeverityShortNORMAL=Normalna
+TicketSeverityShortNORMAL=Normalny
 TicketSeverityShortHIGH=Wysoki
-TicketSeverityShortBLOCKING=Krytyczne, blokujące
+TicketSeverityShortBLOCKING=Krytyczny, blokujący
 
 ErrorBadEmailAddress=Pole „%s” jest nieprawidłowe
 MenuTicketMyAssign=Moje bilety
@@ -69,7 +69,7 @@ Deleted=Usunięto
 
 # Dict
 Type=Typ
-Severity=Surowość
+Severity=Priorytet
 TicketGroupIsPublic=Grupa jest publiczna
 TicketGroupIsPublicDesc=Jeśli grupa biletów jest publiczna, będzie widoczna w formularzu podczas tworzenia biletu z poziomu interfejsu publicznego
 
@@ -180,7 +180,7 @@ TicketMessagesList=Lista wiadomości
 NoMsgForThisTicket=Brak wiadomości dla tego biletu
 Properties=Klasyfikacja
 LatestNewTickets=Najnowsze %s Najnowsze bilety (nieprzeczytane)
-TicketSeverity=Surowość
+TicketSeverity=Priorytet
 ShowTicket=Zobacz bilet
 RelatedTickets=Powiązane bilety
 TicketAddIntervention=Tworzenie interwencji
@@ -304,7 +304,7 @@ BoxLastModifiedTicket=Najnowsze zmodyfikowane bilety
 BoxLastModifiedTicketDescription=Najnowsze zmodyfikowane bilety %s
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=Brak ostatnio zmodyfikowanych biletów
-BoxTicketType=Liczba otwartych biletów według rodzaju
+BoxTicketType=Distribution of open tickets by type
 BoxTicketSeverity=Liczba otwartych zgłoszeń według ważności
 BoxNoTicketSeverity=Nie otwarto żadnych biletów
 BoxTicketLastXDays=Liczba nowych biletów według dni w ostatnich dniach %s
diff --git a/htdocs/langs/pl_PL/users.lang b/htdocs/langs/pl_PL/users.lang
index 680bd38b03e..5b90f788d94 100644
--- a/htdocs/langs/pl_PL/users.lang
+++ b/htdocs/langs/pl_PL/users.lang
@@ -12,7 +12,7 @@ PasswordChangedTo=Hasło zmieniono na: %s
 SubjectNewPassword=Twoje nowe hasło dla %s
 GroupRights=Uprawnienia grupy
 UserRights=Uprawnienia użytkownika
-Credentials=Credentials
+Credentials=Poświadczenia
 UserGUISetup=Ustawienia Wyświetlacza Użytkownika
 DisableUser=Wyłączone
 DisableAUser=Wyłącz użytkownika
@@ -106,7 +106,7 @@ UseTypeFieldToChange=Użyj pola do zmiany Rodzaj
 OpenIDURL=Adres URL OpenID
 LoginUsingOpenID=Użyj do logowania OpenID
 WeeklyHours=Przepracowane godziny (w tygodniu)
-ExpectedWorkedHours=Expected hours worked per week
+ExpectedWorkedHours=Oczekiwana liczba godzin pracy w tygodniu
 ColorUser=Kolor użytkownika
 DisabledInMonoUserMode=Wyłączone w trybie konserwacji
 UserAccountancyCode=Kod księgowy użytkownika
@@ -116,7 +116,7 @@ DateOfEmployment=Data zatrudnienia
 DateEmployment=Zatrudnienie
 DateEmploymentstart=Data rozpoczęcia zatrudnienia
 DateEmploymentEnd=Data zakończenia zatrudnienia
-RangeOfLoginValidity=Access validity date range
+RangeOfLoginValidity=Dostęp do zakresu dat ważności
 CantDisableYourself=Nie możesz wyłączyć własnego rekordu użytkownika
 ForceUserExpenseValidator=Wymuś walidator raportu z wydatków
 ForceUserHolidayValidator=Wymuś walidator prośby o opuszczenie
diff --git a/htdocs/langs/pl_PL/website.lang b/htdocs/langs/pl_PL/website.lang
index 7548613224f..8d0cceb3e47 100644
--- a/htdocs/langs/pl_PL/website.lang
+++ b/htdocs/langs/pl_PL/website.lang
@@ -140,8 +140,8 @@ DefineListOfAltLanguagesInWebsiteProperties=Zdefiniuj listę wszystkich dostępn
 GenerateSitemaps=Wygeneruj plik mapy witryny internetowej
 ConfirmGenerateSitemaps=Jeśli potwierdzisz, usuniesz istniejący plik mapy witryny ...
 ConfirmSitemapsCreation=Potwierdź wygenerowanie mapy witryny
-SitemapGenerated=Sitemap file <b>%s</b> generated
+SitemapGenerated=Wygenerowano plik mapy witryny <b>%s</b>
 ImportFavicon=Favicon
-ErrorFaviconType=Favicon must be png
-ErrorFaviconSize=Favicon must be sized 16x16, 32x32 or 64x64
-FaviconTooltip=Upload an image which needs to be a png (16x16, 32x32 or 64x64)
+ErrorFaviconType=Favicon musi być w formacie PNG
+ErrorFaviconSize=Favicon musi mieć rozmiar 16x16, 32x32 lub 64x64
+FaviconTooltip=Prześlij obraz, który musi być w formacie PNG (16x16, 32x32 lub 64x64)
diff --git a/htdocs/langs/pt_AO/cron.lang b/htdocs/langs/pt_AO/cron.lang
deleted file mode 100644
index 67ecfc77567..00000000000
--- a/htdocs/langs/pt_AO/cron.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - cron
-CronTaskInactive=This job is disabled
diff --git a/htdocs/langs/pt_AO/exports.lang b/htdocs/langs/pt_AO/exports.lang
new file mode 100644
index 00000000000..17dedd46696
--- /dev/null
+++ b/htdocs/langs/pt_AO/exports.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - exports
+DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
diff --git a/htdocs/langs/pt_AO/mrp.lang b/htdocs/langs/pt_AO/mrp.lang
deleted file mode 100644
index e65383ffd8f..00000000000
--- a/htdocs/langs/pt_AO/mrp.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - mrp
-BillOfMaterials=Bill of Material
-NewBOM=New bill of material
diff --git a/htdocs/langs/pt_AO/products.lang b/htdocs/langs/pt_AO/products.lang
new file mode 100644
index 00000000000..e0628dbec00
--- /dev/null
+++ b/htdocs/langs/pt_AO/products.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - products
+ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
diff --git a/htdocs/langs/pt_AO/stocks.lang b/htdocs/langs/pt_AO/stocks.lang
new file mode 100644
index 00000000000..c6779157e0f
--- /dev/null
+++ b/htdocs/langs/pt_AO/stocks.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - stocks
+OpenInternal=Open only for internal actions
diff --git a/htdocs/langs/pt_AO/ticket.lang b/htdocs/langs/pt_AO/ticket.lang
new file mode 100644
index 00000000000..92d813e1638
--- /dev/null
+++ b/htdocs/langs/pt_AO/ticket.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - ticket
+OriginEmail=Email source
+TicketCategory=Group
diff --git a/htdocs/langs/pt_BR/accountancy.lang b/htdocs/langs/pt_BR/accountancy.lang
index 27f15f2e164..0601e4b6f6d 100644
--- a/htdocs/langs/pt_BR/accountancy.lang
+++ b/htdocs/langs/pt_BR/accountancy.lang
@@ -100,7 +100,6 @@ ACCOUNTING_LENGTH_GACCOUNT=Comprimento das contas de contabilidade geral (se o v
 ACCOUNTING_LENGTH_AACCOUNT=Comprimento das contas de contabilidade de terceiros (se você definir o valor para 6 aqui, a conta "401" aparecerá como '401000' na tela)
 ACCOUNTING_MANAGE_ZERO=Permitir gerenciar diferentes números de zeros no final de uma conta contábil. Necessário para alguns países (como a Suíça). Se definido como desativado (padrão), você pode definir os dois parâmetros a seguir para solicitar que o aplicativo adicione zeros virtuais.
 BANK_DISABLE_DIRECT_INPUT=Desabilitar o registro direto da transação na conta bancária
-ACCOUNTANCY_COMBO_FOR_AUX=Ativar lista de combinação para conta subsidiária (pode ser lenta se você tiver muitos terceiros)
 ACCOUNTING_SELL_JOURNAL=Diário de Vendas
 ACCOUNTING_PURCHASE_JOURNAL=Diário de Compras
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Diário diversos
diff --git a/htdocs/langs/pt_BR/admin.lang b/htdocs/langs/pt_BR/admin.lang
index 90187accd2c..27285bad626 100644
--- a/htdocs/langs/pt_BR/admin.lang
+++ b/htdocs/langs/pt_BR/admin.lang
@@ -70,7 +70,6 @@ DisableJavascriptNote=Obs.: Para propósitos de teste ou depuração. Para otimi
 UseSearchToSelectCompanyTooltip=Além disso, se você tem um grande número de terceiros (> 100 000), você pode aumentar a velocidade, definindo COMPANY_DONOTSEARCH_ANYWHERE constante a 1 em Setup-> Outro. Busca, então, ser limitada até o início da string.
 UseSearchToSelectContactTooltip=Além disso, se você tem um grande número de terceiros (> 100 000), você pode aumentar a velocidade, definindo CONTACT_DONOTSEARCH_ANYWHERE constante a 1 em Setup-> Outro. Busca, então, ser limitada até o início da string.
 DelaiedFullListToSelectContact=Aguarde até que uma tecla seja pressionada antes de carregar o conteúdo da lista de combinação de contatos. <br> Isso pode aumentar o desempenho se você tiver um grande número de contatos, mas é menos conveniente.
-NumberOfBytes=Número de Bytes
 SearchString=Seqüência de pesquisa
 NotAvailableWhenAjaxDisabled=Indisponível quando o Ajax esta desativado
 AllowToSelectProjectFromOtherCompany=No documento de um terceiro, pode-se escolher um projeto conectado a outro terceiro
@@ -412,7 +411,6 @@ Module52Name=Estoques
 Module52Desc=Gestão de estoque
 Module54Name=Contratos/Assinaturas
 Module55Name=Códigos de Barra
-Module55Desc=Gestor de Códigos de Barra
 Module56Desc=Gestão do pagamento de fornecedores por ordens de Transferência a Crédito. Inclui a geração de arquivo SEPA para países europeus.
 Module58Name=CliqueParaDiscarl
 Module58Desc=Integração do Sistema CliqueParaDiscar (Asterisk, etc.)
@@ -640,8 +638,6 @@ Permission402=Criar/Modificar Descontos
 Permission403=Validar Descontos
 Permission404=Excluir Descontos
 Permission430=Use a barra de depuração
-Permission511=Ler pagamentos de salários (seus e subordinados)
-Permission517=Ler pagamentos de salários de todos
 Permission519=Salários de exportação
 Permission520=Leia Empréstimos
 Permission522=Criar / modificar empréstimos
@@ -907,7 +903,6 @@ SetupDescription2=As duas seções a seguir são obrigatórias (as duas primeira
 SetupDescription5=Outras entradas do menu de configuração gerenciam parâmetros opcionais.
 AuditedSecurityEvents=Eventos de segurança que são auditados
 NoSecurityEventsAreAduited=Nenhum evento de segurança é auditado. Você pode habilitá-los no menu %s
-Audit=Auditoría
 InfoOS=Sobre o SO
 InfoDatabase=Sobre o banco de dados
 InfoPerf=Sobre Desempenhos
@@ -1002,8 +997,6 @@ ConditionIsCurrently=Condição é atualmente %s
 YouUseBestDriver=Você usa o driver %s, que é o melhor driver atualmente disponível.
 NbOfObjectIsLowerThanNoPb=Você tem apenas %s %s no banco de dados. Isso não requer nenhuma otimização específica.
 SearchOptim=Procurar Otimização
-YouHaveXObjectUseSearchOptim=Você tem %s %s no banco de dados. Você pode adicionar a constante %s a 1 em Home-Setup-Other. Limite a pesquisa ao início de strings, o que possibilita que o banco de dados use índices, e você deve obter uma resposta imediata.
-YouHaveXObjectAndSearchOptimOn=Você tem %s %s no banco de dados e a constante %s é definida como 1 em Home - Setup - Other
 PHPModuleLoaded=O componente PHP 1 %s está carregado
 PreloadOPCode=O OPCode pré-carregado está em uso
 AddRefInList=Mostrar ref. Cliente / fornecedor lista de informações (lista de seleção ou caixa de combinação) e a maior parte do hiperlink. <br> Terceiros aparecerão com um formato de nome "CC12345 - SC45678 - Empresa X." em vez de "Empresa X.".
@@ -1307,7 +1300,6 @@ AGENDA_DEFAULT_VIEW=Qual visualização você deseja abrir por padrão ao seleci
 AGENDA_REMINDER_BROWSER=Habilitar o lembrete de evento no <b>navegador do usuário</b> (quando a data do lembrete é atingida, um pop-up é mostrado pelo navegador. Cada usuário pode desabilitar tais notificações na configuração de notificação do navegador).
 AGENDA_REMINDER_BROWSER_SOUND=Habilitar a notificação sonora
 AGENDA_REMINDER_EMAIL=Habilitar lembrete de evento <b>por e-mail </b> (opção de lembrete / atraso pode ser definido em cada evento)
-AGENDA_REMINDER_EMAIL_NOTE=Nota: A frequência da tarefa %s deve ser suficiente para garantir que o lembrete seja enviado no momento correto.
 AGENDA_SHOW_LINKED_OBJECT=Exibir objeto conectado na visualização da agenda
 ClickToDialSetup=Configurações do módulo clique para discar
 ClickToDialUrlDesc=URL chamada quando clica-se no ícone do telefone.  Na URL, você pode usar as tags<br><b>__PHONETO__</b> que será substituída pelo número do telefone da pessoa a chamar<br><b>__PHONEFROM__</b> que será substituída pelo telefone da pessoa que está chamando (o seu)<br><b>__LOGIN__</b> que será substituída pelo login clicktodial (definido no cartão do usuário)<br><b>__PASS__</b> que será substituída pela senha clicktodial (definida no cartão do usuário).
@@ -1580,7 +1572,6 @@ ConfFileIsReadableOrWritableByAnyUsers=O arquivo conf pode ser lido ou gravado p
 MailToSendEventOrganization=Organização do Evento
 AGENDA_EVENT_DEFAULT_STATUS=Status de evento padrão ao criar um evento a partir do formulário
 YouShouldDisablePHPFunctions=Você deve desabilitar funções PHP
-IfCLINotRequiredYouShouldDisablePHPFunctions=Exceto se você precisar executar comandos do sistema (para o módulo Trabalho agendado ou para executar o antivírus da linha de comando externa, por exemplo), você deve desabilitar as funções do PHP
 NoWritableFilesFoundIntoRootDir=Nenhum arquivo gravável ou diretório de programas comuns foi encontrado em seu diretório raiz (bom)
 RecommendedValueIs=Recomendado: %s
 ARestrictedPath=Caminho restrito
diff --git a/htdocs/langs/pt_BR/agenda.lang b/htdocs/langs/pt_BR/agenda.lang
index 2aec949c9ab..2ea49d184a0 100644
--- a/htdocs/langs/pt_BR/agenda.lang
+++ b/htdocs/langs/pt_BR/agenda.lang
@@ -1,14 +1,14 @@
 # Dolibarr language file - Source file is en_US - agenda
 IdAgenda=ID do evento
-LocalAgenda=Calendário local
+LocalAgenda=Calendário padrão
 ActionsOwnedBy=Evento de propriedade do
 ListOfActions=Lista de eventos
 EventReports=Relatório de eventos
-ToUserOfGroup=Evento atribuído a qualquer usuário no grupo
+ToUserOfGroup=Evento atribuído a qualquer usuário do grupo
 EventOnFullDay=Evento no(s) dia(s) todo
 MenuToDoMyActions=Meus eventos incompletos
 MenuDoneMyActions=Meus eventos terminados
-ListOfEvents=Lista de eventos Dolibarr
+ListOfEvents=Lista de eventos (calendário padrão)
 ActionsAskedBy=Eventos relatados pelo
 ActionsDoneBy=Eventos feito por
 ViewCal=Ver Mês
@@ -65,6 +65,8 @@ ProposalDeleted=Proposta excluída
 OrderDeleted=Pedido excluído
 InvoiceDeleted=Fatura excluída
 DraftInvoiceDeleted=Rascunho da fatura excluído
+CONTACT_CREATEInDolibarr=Contato %s criado
+CONTACT_DELETEInDolibarr=Contato %s excluído
 PRODUCT_CREATEInDolibarr=Produto %s criado
 PRODUCT_MODIFYInDolibarr=Produto %s modificado
 PRODUCT_DELETEInDolibarr=Produto%s exluído
@@ -95,6 +97,7 @@ MRP_MO_UNVALIDATEInDolibarr=MO definido para o status de rascunho
 MRP_MO_PRODUCEDInDolibarr=MO produzido
 MRP_MO_DELETEInDolibarr=MO excluído
 MRP_MO_CANCELInDolibarr=MO cancelado
+PAIDInDolibarr=%s pago
 AgendaModelModule=Modelos de documentos para o evento
 DateActionEnd=Data de término
 AgendaUrlOptions1=Você também pode adicionar os seguintes parâmetros nos filtros de saída:
@@ -103,7 +106,7 @@ AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> para restringir a saída das ações
 AgendaUrlOptions4=<b>logint=%s</b> para restringir a saída às ações atribuídas ao usuário <b>%s</b> (proprietário e outros).
 AgendaUrlOptionsProject=<b>projeto=__PROJECT_ID__</b> para restringir a saída para ações ligadas ao  <b>__PROJECT_ID__</b>.
 AgendaUrlOptionsIncludeHolidays=includeholidays = 1 para incluir eventos de licenças.
-AgendaShowBirthdayEvents=Mostrar datas de nascimento dos contatos
+AgendaShowBirthdayEvents=Aniversários de contatos
 AgendaHideBirthdayEvents=Ocultar datas de nascimento dos contatos
 ExportDataset_event1=Lista dos eventos da agenda
 DefaultWorkingDays=Padrão dias úteis por semana (Exemplo: 1-5, 1-6)
@@ -116,9 +119,16 @@ MyAvailability=Minha disponibilidade
 DateActionBegin=Iniciar a data do evento
 ConfirmCloneEvent=Tem certeza que deseja clonar o evento <b>%s</b>?
 RepeatEvent=Repita evento
+OnceOnly=Apenas uma vez
 EveryWeek=Toda semana
 EveryMonth=Todo mês
 DateStartPlusOne=Data de início + 1 hora
 SetAllEventsToTodo=Defina todos os eventos para todo
 SetAllEventsToInProgress=Defina todos os eventos como em andamento
 SetAllEventsToFinished=Definir todos os eventos como concluídos
+ReminderTime=Período de lembrete antes do evento
+TimeType=Tipo de duração
+ReminderType=Tipo de retorno de chamada
+AddReminder=Criar uma notificação de lembrete automática para este evento
+ErrorReminderActionCommCreation=Erro ao criar a notificação de lembrete para este evento
+BrowserPush=Notificação de pop-up do navegador
diff --git a/htdocs/langs/pt_BR/cashdesk.lang b/htdocs/langs/pt_BR/cashdesk.lang
index 7acdecd580a..d50ab31d7ab 100644
--- a/htdocs/langs/pt_BR/cashdesk.lang
+++ b/htdocs/langs/pt_BR/cashdesk.lang
@@ -71,7 +71,6 @@ CashDeskGenericMaskCodes6 =<br>A tag {TN} é usada para adicionar o número do t
 TakeposGroupSameProduct=Agrupe as mesmas linhas de produtos
 StartAParallelSale=Iniciar uma nova venda paralela
 SaleStartedAt=Venda iniciada às %s
-ControlCashOpening=Controle da caixa pop-up na abertura do PDV
 CloseCashFence=Fechar controle de caixa
 CashReport=Relatório de caixa
 MainPrinterToUse=Impressora principal a ser usada
@@ -94,5 +93,3 @@ ModuleReceiptPrinterMustBeEnabled=A impressora de recibos do módulo deve ter si
 AllowDelayedPayment=Permitir pagamento atrasado
 PrintPaymentMethodOnReceipts=Imprimir forma de pagamento em tickets | recibos
 WeighingScale=Balança
-ShowPriceHT =Exibir coluna de preço sem impostos
-ShowPriceHTOnReceipt =Exibir coluna de preço sem impostos no recibo
diff --git a/htdocs/langs/pt_BR/cron.lang b/htdocs/langs/pt_BR/cron.lang
index eed6598232e..e62f94c3a2b 100644
--- a/htdocs/langs/pt_BR/cron.lang
+++ b/htdocs/langs/pt_BR/cron.lang
@@ -32,7 +32,6 @@ CronSaveSucess=Salvo com sucesso
 CronFieldMandatory=O campo %s é obrigatório
 CronErrEndDateStartDt=A data final não pode ser anterior a data de início
 StatusAtInstall=Status na instalação do módulo
-CronTaskInactive=Está tarefa está desativada
 CronClassFile=Nome de arquivo com classe
 CronModuleHelp=Nome do diretório do módulo Dolibarr (também trabalhe com o módulo Dolibarr externo). <BR> Por exemplo, para chamar o método fetch do objeto do produto Dolibarr /htdocs/<u>product</u>/class/product.class.php, o valor para module é o <i> product </ i>
 CronClassFileHelp=O caminho relativo e o nome do arquivo a ser carregado (o caminho é relativo ao diretório-raiz do servidor da web). <BR> Por exemplo, para chamar o método fetch do objeto Product do Dolibarr htdocs / product / class / <u> product.class.php </ u>, o valor para o nome do arquivo de classe é <i> product / class / product.class.php </ i>
diff --git a/htdocs/langs/pt_BR/errors.lang b/htdocs/langs/pt_BR/errors.lang
index 83748da8ee5..ba505ad8dc0 100644
--- a/htdocs/langs/pt_BR/errors.lang
+++ b/htdocs/langs/pt_BR/errors.lang
@@ -86,7 +86,6 @@ ErrorCantReadFile=Houve uma falha ao ler o arquivo '%s'
 ErrorCantReadDir=Houve uma falha ao ler o diretório '%s'
 ErrorBadLoginPassword=Identificadores de usuário o senha incorretos
 ErrorLoginDisabled=A sua conta foi desativada
-ErrorFailedToRunExternalCommand=Error ao tentar o comando externo. verifique que está disponível e ejecutable por a sua servidor PHP. sim o PHP <b>Safe Mode</b> está ativo, verifique que o comando encontra-se em uma pasta definida ao parâmetro <b>safe_mode_exec_dir</b>.
 ErrorFailedToChangePassword=Error na modificação da senha
 ErrorLoginDoesNotExists=Não existe um usuário com login <b>%s</b>.
 ErrorLoginHasNoEmail=Este usuário não tem endereço de e-mail. Processo abortado.
diff --git a/htdocs/langs/pt_BR/hrm.lang b/htdocs/langs/pt_BR/hrm.lang
index e86f7afe095..c7e24c6b4ea 100644
--- a/htdocs/langs/pt_BR/hrm.lang
+++ b/htdocs/langs/pt_BR/hrm.lang
@@ -3,6 +3,5 @@ HRM_EMAIL_EXTERNAL_SERVICE=E-mail para evitar HRM serviço externo
 Establishments=Estabelecimentos
 DeleteEstablishment=Excluir estabelecimento
 ConfirmDeleteEstablishment=Tem certeza de que deseja excluir este estabelecimento?
-DictionaryPublicHolidays=RH - Licenças
 DictionaryDepartment=RH - Lista de departamentos
 DictionaryFunction=RH - Cargos
diff --git a/htdocs/langs/pt_BR/mrp.lang b/htdocs/langs/pt_BR/mrp.lang
index b35d3cbd228..cad0abff710 100644
--- a/htdocs/langs/pt_BR/mrp.lang
+++ b/htdocs/langs/pt_BR/mrp.lang
@@ -7,12 +7,9 @@ MenuBOM=Lista de materiais
 LatestBOMModified=Última BOM modificada %s
 LatestMOModified=%s pedidos de manufatura mais recentes modificados
 Bom=Contas de material
-BillOfMaterials=Lista de materiais
 BOMsSetup=Configuração do módulo BOM
 ListOfBOMs=Lista de BOMs
 ListOfManufacturingOrders=Lista de ordens de fabricação
-NewBOM=Nova Lista de Materiais
-ProductBOMHelp=Produto a ser criado com esta lista técnica. Nota: Os produtos com propriedade \n'Natureza do produto' = 'Matéria-prima' não estão visíveis nesta lista.
 BOMsNumberingModules=Modelos de numeração para BOM
 BOMsModelModule=Modelos de documentos lista técnica
 MOsNumberingModules=Modelos de numeração MO
@@ -21,22 +18,18 @@ FreeLegalTextOnBOMs=Texto livre para documentação da BOM
 WatermarkOnDraftBOMs=Marca d'agua no rascunho da BOM
 FreeLegalTextOnMOs=Texto livre no documento do MO
 WatermarkOnDraftMOs=Marca d'água no rascunho MO
-ConfirmCloneBillOfMaterials=Tem certeza de que deseja clonar a lista de materiais %s?
 ConfirmCloneMo=Tem certeza de que deseja clonar a ordem de fabricação %s?
 ManufacturingEfficiency=Eficiência de fabricação
 ValueOfMeansLoss=Valor de 0,95 significa uma média de 5 %% de perda durante a produção
 ValueOfMeansLossForProductProduced=Valor de 0,95 significa uma média de 5 %% de perda na produção do produto
 DeleteBillOfMaterials=Excluir lista de materiais
 DeleteMo=Excluir ordem de fabricação
-ConfirmDeleteBillOfMaterials=Tem certeza de que deseja excluir esta lista de materiais?
-ConfirmDeleteMo=Tem certeza de que deseja excluir esta lista de materiais?
 MenuMRP=Ordens de fabricação
 NewMO=Nova ordem de fabricação
 QtyToProduce=Qtd. para produzir
 DateStartPlannedMo=Data início planejada
 DateEndPlannedMo=Data final planejada
 KeepEmptyForAsap=Vazio significa "o mais breve possível"
-EstimatedDurationDesc=Duração estimada para fabricar este produto usando esta lista técnica
 ConfirmValidateBom=Tem certeza que deseja validar a lista técnica com a referência <strong>%s</strong> (você poderá usá-la para criar novas ordens de fabricação)
 ConfirmCloseBom=Tem certeza de que deseja cancelar esta lista técnica (você não poderá mais usá-la para criar novas ordens de fabricação)?
 ConfirmReopenBom=Tem certeza de que deseja reabrir esta lista técnica (você poderá usá-la para criar novas ordens de fabricação)
@@ -64,7 +57,7 @@ ProductionForRef=Produção de %s
 AutoCloseMO=Fechar automaticamente a ordem de fabricação se forem atingidas quantidades para consumir e produzir
 NoStockChangeOnServices=Nenhuma alteração de estoque em serviços
 ProductQtyToConsumeByMO=Quantidade do produto a ser consumida por MO aberto
-ProductQtyToProduceByMO=Quantidade do produto ser produzida por MO aberto
 AddNewConsumeLines=Adicione nova linha para consumir
 ProductsToConsume=Produtos para consumir
 BOMTotalCost=O custo para produzir essa lista técnica com base no custo de cada quantidade e produto a consumir (use o preço de custo, se definido, ou o preço médio ponderado, se definido, ou o melhor preço de compra)
+DeleteWorkstation=Excluir
diff --git a/htdocs/langs/pt_BR/orders.lang b/htdocs/langs/pt_BR/orders.lang
index fcfe59e46b1..6c2b2ed90f3 100644
--- a/htdocs/langs/pt_BR/orders.lang
+++ b/htdocs/langs/pt_BR/orders.lang
@@ -10,6 +10,7 @@ OrderLine=Linha de Comando
 OrderDateShort=Data do pedido
 OrderToProcess=Pedido a processar
 NewOrder=Novo Pedido
+NewSupplierOrderShort=Novo Pedido
 NewOrderSupplier=Novo Pedido de Compra
 ToOrder=Realizar Pedido
 MakeOrder=Realizar Pedido
@@ -55,6 +56,7 @@ DeleteOrder=Eliminar o pedido
 CancelOrder=Anular o Pedido
 OrderReopened=Pedido %s reaberto
 AddOrder=Criar ordem
+AddSupplierOrderShort=Criar ordem
 AddPurchaseOrder=Criar pedido
 AddToDraftOrders=Adicionar a projeto de pedido
 ShowOrder=Mostrar Pedido
diff --git a/htdocs/langs/pt_BR/partnership.lang b/htdocs/langs/pt_BR/partnership.lang
index f7f9aa53929..b31b80f8919 100644
--- a/htdocs/langs/pt_BR/partnership.lang
+++ b/htdocs/langs/pt_BR/partnership.lang
@@ -1,14 +1,11 @@
 # Dolibarr language file - Source file is en_US - partnership
-ModulePartnershipName =Configuracoes de Parcerias
-PartnershipDescription =Módulo gerenciamento de parcerias
+ModulePartnershipName=Configuracoes de Parcerias
+PartnershipDescription=Módulo gerenciamento de parcerias
 PartnershipDescriptionLong=Módulo gerenciamento de parcerias
-NewPartnership =Nova parceria
-ListOfPartnerships =Lista de parcerias
-PartnershipSetup =Configuracao de parcerias
-PartnershipAbout =Sobre parcerias
-PartnershipAboutPage =Pagina sobre parcerias
-DatePartnershipStart=Data de início
+NewPartnership=Nova parceria
+PartnershipSetup=Configuracao de parcerias
+PartnershipAbout=Sobre parcerias
+PartnershipAboutPage=Pagina sobre parcerias
 DatePartnershipEnd=Data de término
-PartnershipDraft =Rascunho
-PartnershipAccepted =Aceita
-PartnershipCanceled =Cancelada
+PartnershipDraft=Rascunho
+PartnershipAccepted=Aceita
diff --git a/htdocs/langs/pt_BR/receptions.lang b/htdocs/langs/pt_BR/receptions.lang
index 1b8395d5bf5..488b6ca213b 100644
--- a/htdocs/langs/pt_BR/receptions.lang
+++ b/htdocs/langs/pt_BR/receptions.lang
@@ -32,3 +32,4 @@ ProductQtyInSuppliersReceptionAlreadyRecevied=Quantidade de produtos do pedido d
 ValidateOrderFirstBeforeReception=Você deve primeiro validar o pedido antes de poder fazer recepções.
 ReceptionsNumberingModules=Módulo de numeração para recepções
 ReceptionsReceiptModel=Modelos de documentos para recepções
+NoMorePredefinedProductToDispatch=Não há mais produtos predefinidos para enviar
diff --git a/htdocs/langs/pt_BR/stocks.lang b/htdocs/langs/pt_BR/stocks.lang
index 3848837d4e1..8c690b5cff7 100644
--- a/htdocs/langs/pt_BR/stocks.lang
+++ b/htdocs/langs/pt_BR/stocks.lang
@@ -55,7 +55,7 @@ ReStockOnBill=Aumentar os estoques reais na validação da fatura/nota de crédi
 ReStockOnDispatchOrder=Aumentar os estoques reais no despacho manual para o depósito, após o recebimento do pedido de compra de mercadorias
 StockOnReception=Aumentar estoques reais na validação da recepção
 StockOnReceptionOnClosing=Aumentar estoques reais quando a recepção estiver definida como fechada
-OrderStatusNotReadyToDispatch=Não tem ordem  ainda não ou nato tem um status que permite envio de produtos em para armazenamento.
+OrderStatusNotReadyToDispatch=O pedido ainda não possui ou não possui mais um status que permita o envio de produtos nos armazéns.
 NoPredefinedProductToDispatch=Não há produtos pré-definidos para este objeto. Portanto, não envio em estoque é necessária.
 DispatchVerb=Despachar
 PhysicalStock=Estoque físico
diff --git a/htdocs/langs/pt_PT/accountancy.lang b/htdocs/langs/pt_PT/accountancy.lang
index ee7e7a6310f..f33171d9ad8 100644
--- a/htdocs/langs/pt_PT/accountancy.lang
+++ b/htdocs/langs/pt_PT/accountancy.lang
@@ -158,7 +158,7 @@ ACCOUNTING_LENGTH_AACCOUNT=Length of the third-party accounting accounts (If you
 ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of an accounting account. Needed by some countries (like Switzerland). If set to off (default), you can set the following two parameters to ask the application to add virtual zeros.
 BANK_DISABLE_DIRECT_INPUT=Desactivar a gravação direta de transação na conta bancária
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Ativar exportação de rascunho em diário
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties, break ability to search on a part of value)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
@@ -328,6 +328,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountanc
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
+NotifiedExportDate=Notified export date (modification of the entries will not be possible)
+NotifiedValidationDate=Validation of the entries (modification or deletion of the entries will not be possible)
+ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=Exportar o diário rascunho
 Modelcsv=Modelo de exportação
 Selectmodelcsv=Selecione um modelo de exportação
diff --git a/htdocs/langs/pt_PT/admin.lang b/htdocs/langs/pt_PT/admin.lang
index 42b4c51e694..bf2343c7c7c 100644
--- a/htdocs/langs/pt_PT/admin.lang
+++ b/htdocs/langs/pt_PT/admin.lang
@@ -57,14 +57,14 @@ GUISetup=Aparência
 SetupArea=Configuração
 UploadNewTemplate=Carregar novo(s) modelo(s)
 FormToTestFileUploadForm=Formulário para testar o envio de ficheiro (de acordo com a configuração)
-ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
-ModuleIsEnabled=The module/application <b>%s</b> has been enabled
+ModuleMustBeEnabled=O módulo/aplicação <b>%s</b> deve estar ativado
+ModuleIsEnabled=O módulo/aplicação <b>%s</b> foi ativado
 IfModuleEnabled=Nota: sim, só é eficaz se o <b>módulo %s</b> estiver ativado
 RemoveLock=Remova / renomeie o arquivo <b> %s </b> se existir, para permitir o uso da ferramenta Atualizar / Instalar.
 RestoreLock=Restaure o arquivo <b> %s </b>, apenas com permissão de leitura, para desativar qualquer uso posterior da ferramenta Atualizar / Instalar.
 SecuritySetup=Configuração de segurança
-PHPSetup=PHP setup
-OSSetup=OS setup
+PHPSetup=Configurar PHP
+OSSetup=Configurar SO
 SecurityFilesDesc=Defina aqui opções relacionadas com a segurança de ficheiros carregados.
 ErrorModuleRequirePHPVersion=Erro, este módulo requer a versão %s ou superior do PHP
 ErrorModuleRequireDolibarrVersion=Erro, este módulo requer a versão %s ou superior do Dolibarr
@@ -80,14 +80,14 @@ UseSearchToSelectContactTooltip=Se você tiver grande número de contactos (> 10
 DelaiedFullListToSelectCompany=Aguarde até que uma tecla seja pressionada antes de carregar o conteúdo da lista de combinação de terceiros. <br> Isso pode aumentar o desempenho se você tiver um grande número de terceiros, mas é menos conveniente.
 DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
 NumberOfKeyToSearch=Número de caracteres para acionar a pesquisa: %s
-NumberOfBytes=Number of Bytes
+NumberOfBytes=Número de Bytes
 SearchString=Search string
 NotAvailableWhenAjaxDisabled=Não está disponível quando o Ajax está desativado
 AllowToSelectProjectFromOtherCompany=No documento de um terceiro, pode escolher um projeto associado a outro terceiro
 JavascriptDisabled=JavaScript desativado
 UsePreviewTabs=Utilizar separadores de pré-visualização
 ShowPreview=Mostrar pré-visualização
-ShowHideDetails=Show-Hide details
+ShowHideDetails=Mostrar-Ocultar detalhes
 PreviewNotAvailable=Pré-visualização não disponível
 ThemeCurrentlyActive=Tema atualmente ativo
 MySQLTimeZone=Fuso Horário MySQL (base de dados)
@@ -149,7 +149,7 @@ MenusDesc=Os gestores de menu definem o conteúdo das duas barras de menu (horiz
 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
-Language_en_US_es_MX_etc=Language (en_US, es_MX, ...)
+Language_en_US_es_MX_etc=Idioma (en_US, es_MX, pt-PT...)
 System=Sistema
 SystemInfo=Informação do Sistema
 SystemToolsArea=Área de ferramentas do sistema
@@ -158,7 +158,7 @@ Purge=Limpar
 PurgeAreaDesc=Esta página permite excluir todos os arquivos gerados ou armazenados pelo Dolibarr (arquivos temporários ou todos os arquivos no diretório <b> %s </b>). Usar esse recurso normalmente não é necessário. Ele é fornecido como uma solução alternativa para usuários cujo Dolibarr é hospedado por um provedor que não oferece permissões para excluir arquivos gerados pelo servidor da web.
 PurgeDeleteLogFile=Eliminar os ficheiros de registo, incluindo <b>%s</b> definido para o módulo Syslog (não existe risco de perda de dados)
 PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Parameter can be 'tempfilesold', 'logfiles' or both 'tempfilesold+logfiles'. Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete log and temporary files
+PurgeDeleteTemporaryFilesShort=Eliminar registo e ficheiros temporários
 PurgeDeleteAllFilesInDocumentsDir=Exclua todos os arquivos do diretório: <b> %s </b>. <br> Isso excluirá todos os documentos gerados relacionados aos elementos (terceiros, faturas etc ...), arquivos carregados no módulo ECM, despejos de backup de banco de dados e arquivos temporários.
 PurgeRunNow=Limpar agora
 PurgeNothingToDelete=Nenhuma diretoria ou ficheiros para eliminar.
@@ -186,7 +186,7 @@ Compression=Compressão
 CommandsToDisableForeignKeysForImport=Comando para desactivar a chave exclusiva para a importação
 CommandsToDisableForeignKeysForImportWarning=Obrigatório, se pretender restaurar mais tarde o ficheiro dump de SQL
 ExportCompatibility=Compatibilidade do ficheiro de exportação gerado
-ExportUseMySQLQuickParameter=Use the --quick parameter
+ExportUseMySQLQuickParameter=Utilize o parâmetro --quick
 ExportUseMySQLQuickParameterHelp=The '--quick' parameter helps limit RAM consumption for large tables.
 MySqlExportParameters=Parâmetros da exportação MySQL
 PostgreSqlExportParameters= Parâmetros de exportação PostgreSQL
@@ -221,8 +221,8 @@ NotCompatible=Este módulo não parece compatível com o seu Dolibarr %s (Min%s
 CompatibleAfterUpdate=Este módulo requer uma atualização para o seu Dolibarr %s(Min%s-Max%s).
 SeeInMarkerPlace=Veja no mercado de modulos
 SeeSetupOfModule=Veja a configuração do módulo %s
+SetOptionTo=Set option <b>%s</b> to %s
 Updated=Atualizado
-Nouveauté=Novidade
 AchatTelechargement=Comprar / Download
 GoModuleSetupArea=To deploy/install a new module, go to the Module setup area: <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, o mercado oficial para módulos externos Dolibarr ERP/CRM
@@ -259,9 +259,9 @@ OfficialMarketPlace=Mercado externo oficial para os módulos/addons
 OfficialWebHostingService=Serviços de hospedagem na Web referenciados (hospedagem na Nuvem)
 ReferencedPreferredPartners=Parceiros preferidos
 OtherResources=Outros recursos
-ExternalResources=External Resources
+ExternalResources=Recursos Externos
 SocialNetworks=Redes sociais
-SocialNetworkId=Social Network ID
+SocialNetworkId=Id. da Rede Social
 ForDocumentationSeeWiki=Para a documentação de utilizador, programador ou Perguntas Frequentes (FAQ), consulte o wiki do Dolibarr<br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=Para outras questões, como efectuar as consultas, pode utilizar o forum do Dolibarr:<br><b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=Aqui estão alguns recursos para obter ajuda e suporte com o Dolibarr.
@@ -308,7 +308,7 @@ MAIN_SMS_SENDMODE=Método a usar para enviar SMS
 MAIN_MAIL_SMS_FROM=Número de telefone do remetente padrão para envio de SMS
 MAIN_MAIL_DEFAULT_FROMTYPE=E-mail do remetente padrão para envio manual (e-mail do usuário ou e-mail da empresa)
 UserEmail=Email do utilizador
-CompanyEmail=Company Email
+CompanyEmail=E-mail da Empresa
 FeatureNotAvailableOnLinux=Funcionalidade não disponivel em sistemas  Unix. Teste parâmetros sendmail localmente.
 FixOnTransifex=Fix the translation on the online translation platform of project
 SubmitTranslation=Se a tradução para este idioma não estiver completa ou você encontrar erros, pode corrigir isso editando os arquivos no diretório <b> langs / %s </b> e enviar sua alteração para www.transifex.com/dolibarr-association/dolibarr/
@@ -399,6 +399,7 @@ SecurityToken=A chave para URLs seguras
 NoSmsEngine=Nenhum gerenciador de remetente de SMS disponível. Um gerenciador de remetente de SMS não é instalado com a distribuição padrão porque eles dependem de um fornecedor externo, mas você pode encontrar alguns em %s
 PDF=PDF
 PDFDesc=Opções globais para geração de PDF
+PDFOtherDesc=PDF Option specific to some modules
 PDFAddressForging=Regras para seção de endereço
 HideAnyVATInformationOnPDF=Oculte todas as informações relacionadas ao imposto sobre vendas / IVA
 PDFRulesForSalesTax=Regras para Imposto sobre Vendas / IVA
@@ -561,7 +562,7 @@ Module53Desc=Gestão de Serviços
 Module54Name=Contractos/Subscrições
 Module54Desc=Gestão de contratos (serviços ou assinaturas recorrentes)
 Module55Name=Códigos de barras
-Module55Desc=Gestão dos códigos de barras
+Module55Desc=Barcode or QR code management
 Module56Name=Pagamento por transferência de crédito
 Module56Desc=Gestão de pagamentos de fornecedores por ordens de Transferência a Crédito. Inclui a geração de arquivo SEPA para países europeus.
 Module57Name=Pagamentos por Débito Direto
@@ -848,10 +849,10 @@ Permission402=Criar/modificar descontos
 Permission403=Validar descontos
 Permission404=Eliminar descontos
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries (yours and subordinates)
-Permission512=Criar / modificar pagamentos de salários
-Permission514=Excluir pagamentos de salários
-Permission517=Read payments of salaries of everybody
+Permission511=Read salaries and payments (yours and subordinates)
+Permission512=Create/modify salaries and payments
+Permission514=Delete salaries and payments
+Permission517=Read salaries and payments everybody
 Permission519=Exportar salários
 Permission520=Consultar empréstimos
 Permission522=Criar/modificar empréstimos
@@ -965,6 +966,8 @@ Permission23003=Eliminar trabalho agendado
 Permission23004=Executar trabalho agendado
 Permission50101=Use Point of Sale (SimplePOS)
 Permission50151=Use Point of Sale (TakePOS)
+Permission50152=Edit sales lines
+Permission50153=Edit ordered sales lines
 Permission50201=Consultar transações
 Permission50202=Importar transações
 Permission50330=Read objects of Zapier
@@ -1039,11 +1042,12 @@ DictionaryMeasuringUnits=Measuring Units
 DictionarySocialNetworks=Redes sociais
 DictionaryProspectStatus=Prospect status for companies
 DictionaryProspectContactStatus=Prospect status for contacts
-DictionaryHolidayTypes=Tipos de licença
+DictionaryHolidayTypes=Leave - Types of leave
 DictionaryOpportunityStatus=Status de lead para projeto / lead
 DictionaryExpenseTaxCat=Relatório de despesas - categorias de transporte
 DictionaryExpenseTaxRange=Relatório de despesas - Escala por categoria de transporte
 DictionaryTransportMode=Intracomm report - Transport mode
+DictionaryBatchStatus=Product lot/serial Quality Control status
 TypeOfUnit=Type of unit
 SetupSaved=Configuração guardada
 SetupNotSaved=A configuração não foi guardada
@@ -1187,7 +1191,7 @@ SetupDescription4= <a href="%s"> %s -> %s </a> <br> <br> Este software é um con
 SetupDescription5=Outras entradas do menu Setup gerenciam parâmetros opcionais.
 AuditedSecurityEvents=Security events that are audited
 NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
-Audit=Auditoria
+Audit=Security events
 InfoDolibarr=Sobre o Dolibarr
 InfoBrowser=Sobre o navegador
 InfoOS=Sobre o sistema operativo
@@ -1319,9 +1323,12 @@ ConditionIsCurrently=A condição está atualmente %s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=Você usa o driver %s, mas o driver %s é recomendado.
 NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
+ComboListOptim=Combo list loading optimization
 SearchOptim=Optimização da pesquisa
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
-YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
+YouHaveXObjectUseComboOptim=You have %s %s in the database. You can go into setup of module to enable loading of combo list on key pressed event.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other.
+YouHaveXObjectUseSearchOptimDesc=This limits the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to %s in Home-Setup-Other.
 BrowserIsOK=Você está usando o navegador da web %s. Este navegador está ok para segurança e desempenho.
 BrowserIsKO=Você está usando o navegador da web %s. Este navegador é conhecido por ser uma má escolha para segurança, desempenho e confiabilidade. Recomendamos o uso do Firefox, Chrome, Opera ou Safari.
 PHPModuleLoaded=PHP component %s is loaded
@@ -1433,6 +1440,7 @@ MemberMainOptions=Opções principais
 AdherentLoginRequired= Gerir um login para cada membro
 AdherentMailRequired=Email necessá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
+MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
 MembersDocModules=Document templates for documents generated from member record
@@ -1763,7 +1771,7 @@ AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting men
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Ativar notificação sonora
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
-AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the scheduled job %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Mostrar o objeto associado na vista de agenda
 ##### Clicktodial #####
 ClickToDialSetup=Configuração do módulo "Click To Dial"
@@ -1979,6 +1987,8 @@ MAIN_PDF_MARGIN_RIGHT=Margem direita do PDF
 MAIN_PDF_MARGIN_TOP=Margem superior do PDF
 MAIN_PDF_MARGIN_BOTTOM=Margem inferior do PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add picture on proposal line
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add electronic sign in PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Defina isto como "sim" se este grupo for uma computação de outros grupos
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
@@ -2096,7 +2106,6 @@ PDF_SHOW_PROJECT=Show project on document
 ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
-FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
@@ -2120,12 +2129,18 @@ ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by
 MailToSendEventOrganization=Event Organization
 AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
 YouShouldDisablePHPFunctions=You should disable PHP functions
-IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands in custom code, you shoud disable PHP functions
+PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
+NotRecommended=Not recommanded
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
 ModuleUpdateAvailable=An update is available
 NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
+RandomlySelectedIfSeveral=Randomly selected if several pictures are available
+DatabasePasswordObfuscated=Database password is obfuscated in conf file
+DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
diff --git a/htdocs/langs/pt_PT/agenda.lang b/htdocs/langs/pt_PT/agenda.lang
index 0a545f07030..9fa9179074f 100644
--- a/htdocs/langs/pt_PT/agenda.lang
+++ b/htdocs/langs/pt_PT/agenda.lang
@@ -38,6 +38,7 @@ ActionsEvents=Eventos em que o Dolibarr criará uma acção em agenda automátic
 EventRemindersByEmailNotEnabled=Os lembretes de eventos por email não foram ativados na configuração do módulo %s.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Terceiro %s, criado
+COMPANY_MODIFYInDolibarr=Third party %s modified
 COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=Contrato %s, validado
 CONTRACT_DELETEInDolibarr=Contrato %s excluído
@@ -87,6 +88,7 @@ OrderDeleted=Encomenda eliminada
 InvoiceDeleted=Fatura eliminada
 DraftInvoiceDeleted=Factura rascunho apagada
 CONTACT_CREATEInDolibarr=Contacto %s criado
+CONTACT_MODIFYInDolibarr=Contact %s modified
 CONTACT_DELETEInDolibarr=Contacto %s apagado
 PRODUCT_CREATEInDolibarr=O produto %s foi criado
 PRODUCT_MODIFYInDolibarr=O produto %s foi modificado
diff --git a/htdocs/langs/pt_PT/bills.lang b/htdocs/langs/pt_PT/bills.lang
index a439d38632e..2f37a50298a 100644
--- a/htdocs/langs/pt_PT/bills.lang
+++ b/htdocs/langs/pt_PT/bills.lang
@@ -259,6 +259,7 @@ DateMaxPayment=Pagamento devido em
 DateInvoice=Data da fatura
 DatePointOfTax=Ponto de imposto
 NoInvoice=Nenhuma fatura
+NoOpenInvoice=No open invoice
 ClassifyBill=Classificar a fatura
 SupplierBillsToPay=Faturas de fornecedores não pagas
 CustomerBillsUnpaid=Faturas a receber de clientes
@@ -589,3 +590,4 @@ FacParentLine=Invoice Line Parent
 SituationTotalRayToRest=Remainder to pay without taxe
 PDFSituationTitle=Situation n° %d
 SituationTotalProgress=Total progress %d %%
+SearchUnpaidInvoicesWithDueDate=Search unpaid invoices with a due date = %s
diff --git a/htdocs/langs/pt_PT/cashdesk.lang b/htdocs/langs/pt_PT/cashdesk.lang
index cf648b5eb8a..a059b6468ae 100644
--- a/htdocs/langs/pt_PT/cashdesk.lang
+++ b/htdocs/langs/pt_PT/cashdesk.lang
@@ -102,7 +102,7 @@ CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal numb
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
 SaleStartedAt=Sale started at %s
-ControlCashOpening=Control cash popup at opening POS
+ControlCashOpening=Open the "Control cash" popup when opening the POS
 CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -126,5 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
-ShowPriceHT = Display the price excluding tax column
-ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
+ShowPriceHT = Display the column with the price excluding tax (on screen)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
diff --git a/htdocs/langs/pt_PT/compta.lang b/htdocs/langs/pt_PT/compta.lang
index 089e1acc3fc..c82bbd456fb 100644
--- a/htdocs/langs/pt_PT/compta.lang
+++ b/htdocs/langs/pt_PT/compta.lang
@@ -286,3 +286,9 @@ ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
 IncludeLoansInResults = Include loans in reports
+InvoiceLate30Days = Invoices late > 30 days
+InvoiceLate15Days = Invoices late > 15 days
+InvoiceLateMinus15Days = Invoices late
+InvoiceNotLate = To be collected < 15 days
+InvoiceNotLate15Days = To be collected in 15 days
+InvoiceNotLate30Days = To be collected in 30 days
diff --git a/htdocs/langs/pt_PT/cron.lang b/htdocs/langs/pt_PT/cron.lang
index d6f7062e193..6b0bc412afc 100644
--- a/htdocs/langs/pt_PT/cron.lang
+++ b/htdocs/langs/pt_PT/cron.lang
@@ -60,7 +60,7 @@ CronErrEndDateStartDt=A data de fim não pode ser anterior à data de início
 StatusAtInstall=Estado da instalação do módulo
 CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Desativar
-CronTaskInactive=Esta tarefa está desativada
+CronTaskInactive=This job is disabled (not scheduled)
 CronId=Id
 CronClassFile=Filename with class
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example 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>
diff --git a/htdocs/langs/pt_PT/errors.lang b/htdocs/langs/pt_PT/errors.lang
index f483a6abc58..7d316d41ca5 100644
--- a/htdocs/langs/pt_PT/errors.lang
+++ b/htdocs/langs/pt_PT/errors.lang
@@ -11,6 +11,7 @@ ErrorBadValueForParamNotAString=Valor ruim para o seu parâmetro. Acrescenta ger
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=O login %s já existe.
 ErrorGroupAlreadyExists=O grupo %s já existe.
+ErrorEmailAlreadyExists=Email %s already exists.
 ErrorRecordNotFound=Registo não foi encontrado.
 ErrorFailToCopyFile=Ocorreu um erro ao copiar o ficheiro '<b>%s</b>' para '<b>%s</b>'.
 ErrorFailToCopyDir=A cópia da diretoria '<b>%s</b>' para '<b>%s</b>' falhou.
@@ -117,7 +118,7 @@ ErrorCantReadFile=Erro na leitura do ficheiro '&s'
 ErrorCantReadDir=Erro na leitura da pasta '%s'
 ErrorBadLoginPassword=Utilizador ou palavra-passe incorretos
 ErrorLoginDisabled=A sua conta está desactivada
-ErrorFailedToRunExternalCommand=Erro ao tentar o comando externo. verifique que está disponivel e executavel pelo seu servidor PHP. sim o PHP <b>Safe Mode</b> está activo, verifique que o comando encontra-se numa pasta definida ao parâmetro <b>safe_mode_exec_dir</b>.
+ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server user. Check also the command is not protected on shell level by a security layer like apparmor.
 ErrorFailedToChangePassword=Erro na modificação da palavra-passe
 ErrorLoginDoesNotExists=a conta de utilizador de <b>%s</b> não foi encontrado.
 ErrorLoginHasNoEmail=Este utilizador não tem e-mail. impossivel continuar.
@@ -262,6 +263,7 @@ ErrorDateIsInFuture=Error, the date can't be in the future
 ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
 ErrorAPercentIsRequired=Error, please fill in the percentage correctly
 ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
+ErrorFailedToFindEmailTemplate=Failed to find template with code name %s
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -298,3 +300,4 @@ WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So y
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
+ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
diff --git a/htdocs/langs/pt_PT/eventorganization.lang b/htdocs/langs/pt_PT/eventorganization.lang
index b15ebc7ff3f..eb73e2c1707 100644
--- a/htdocs/langs/pt_PT/eventorganization.lang
+++ b/htdocs/langs/pt_PT/eventorganization.lang
@@ -1,4 +1,5 @@
 # Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+# Copyright (C) 2021		Dorian Vabre			<dorian.vabre@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
@@ -81,7 +82,10 @@ PriceOfBoothHelp=Subscription price to stand a booth
 EventOrganizationICSLink=Link ICS for events
 ConferenceOrBoothInformation=Conference Or Booth informations
 Attendees = Attendees
+DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
 #
 # Status
 #
@@ -94,8 +98,46 @@ EvntOrgCancelled = Cancelled
 #
 # Public page
 #
+SuggestForm = Suggestion page
+RegisterPage = Page for conferences or booth
+EvntOrgRegistrationHelpMessage = Here, you can vote for an event, or suggest a new conference or booth for the project
+EvntOrgRegistrationConfHelpMessage = Here, you can suggest a new conference for the project
+EvntOrgRegistrationBoothHelpMessage = Here, you can suggest a new booth for the project
+ListOfSuggestedConferences = List of suggested conferences
+ListOfSuggestedBooths = List of suggested booths
+SuggestConference = Suggest a new conference
+SuggestBooth = Suggest a booth
+ViewAndVote = View and vote for suggested events
 PublicAttendeeSubscriptionPage = Public link of registration to a conference
 MissingOrBadSecureKey = The security key is invalid or missing
-EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
-EvntOrgStartDuration = This conference starts on
-EvntOrgEndDuration =  and ends on
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference : '%s'
+EvntOrgDuration = This conference starts on %s and ends on %s.
+ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
+BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
+EventType = Tipo de evento
+
+#
+# Vote page
+#
+EvntOrgRegistrationWelcomeMessage = Welcome on the conference or booth suggestion page.
+EvntOrgRegistrationConfWelcomeMessage = Welcome on the conference suggestion page.
+EvntOrgRegistrationBoothWelcomeMessage = Welcome on the booth suggestion page.
+EvntOrgVoteHelpMessage = Here, you can view and vote for the suggested events for the project
+VoteOk = Your vote has been accepted.
+AlreadyVoted = You have already voted for this event.
+VoteError = An error has occurred during the vote, please try again.
+
+#
+# SubscriptionOk page
+#
+SubscriptionOk = Your subscription to this conference has been validated
+#
+# Subscription validation mail
+#
+ConfAttendeeSubscriptionConfirmation = Confirmation of your subscription to a conference
+#
+# Payment page
+#
+Attendee = Attendee
+PaymentConferenceAttendee = Conference attendee payment
+PaymentBoothLocation = Booth location payment
diff --git a/htdocs/langs/pt_PT/hrm.lang b/htdocs/langs/pt_PT/hrm.lang
index dd249f092a0..8ad03679dba 100644
--- a/htdocs/langs/pt_PT/hrm.lang
+++ b/htdocs/langs/pt_PT/hrm.lang
@@ -9,7 +9,7 @@ ConfirmDeleteEstablishment=Are you sure you wish to delete this establishment?
 OpenEtablishment=Abrir estabelecimento
 CloseEtablishment=Fechar estabelecimento
 # Dictionary
-DictionaryPublicHolidays=HRM - Public holidays
+DictionaryPublicHolidays=Leave - Public holidays
 DictionaryDepartment=GRH - Lista departamentos
 DictionaryFunction=HRM - Job positions
 # Module
diff --git a/htdocs/langs/pt_PT/knowledgemanagement.lang b/htdocs/langs/pt_PT/knowledgemanagement.lang
index d73f86f5340..e595eeb8648 100644
--- a/htdocs/langs/pt_PT/knowledgemanagement.lang
+++ b/htdocs/langs/pt_PT/knowledgemanagement.lang
@@ -18,38 +18,38 @@
 #
 
 # Module label 'ModuleKnowledgeManagementName'
-ModuleKnowledgeManagementName = Knowledge Management System
+ModuleKnowledgeManagementName = Sistema de Gestão de Conhecimento
 # Module description 'ModuleKnowledgeManagementDesc'
-ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+ModuleKnowledgeManagementDesc=Gerir uma «Gestão de Conhecimento» (KM) ou base do «Centro de Ajuda»
 
 #
 # Admin page
 #
-KnowledgeManagementSetup = Knowledge Management System setup
+KnowledgeManagementSetup = Configurar Sistema de Gestão de Conhecimento
 Settings = Definições
-KnowledgeManagementSetupPage = Knowledge Management System setup page
+KnowledgeManagementSetupPage = Página de configuração do Sistema de Gestão de Conhecimento
 
 
 #
 # About page
 #
 About = Sobre
-KnowledgeManagementAbout = About Knowledge Management
-KnowledgeManagementAboutPage = Knowledge Management about page
+KnowledgeManagementAbout = Sobre Gestão de Conhecimento
+KnowledgeManagementAboutPage = Página de sobre a Gestão de Conhecimento
 
 #
 # Sample page
 #
-KnowledgeManagementArea = Knowledge Management
+KnowledgeManagementArea = Gestão de Conhecimento
 
 
 #
 # Menu
 #
-MenuKnowledgeRecord = Knowledge base
-ListOfArticles = List of articles
-NewKnowledgeRecord = New article
-ValidateReply = Validate solution
-KnowledgeRecords = Articles
+MenuKnowledgeRecord = Base conhecimento
+ListKnowledgeRecord = Lista de artigos
+NewKnowledgeRecord = Novo artigo
+ValidateReply = Validar solução
+KnowledgeRecords = Artigos
 KnowledgeRecord = Artigo
-KnowledgeRecordExtraFields = Extrafields for Article
+KnowledgeRecordExtraFields = Campos extra para o Artigo
diff --git a/htdocs/langs/pt_PT/languages.lang b/htdocs/langs/pt_PT/languages.lang
index b84561e4f84..17d7621727c 100644
--- a/htdocs/langs/pt_PT/languages.lang
+++ b/htdocs/langs/pt_PT/languages.lang
@@ -3,6 +3,7 @@ Language_am_ET=Amárico (Etiópia)
 Language_ar_AR=Árabe
 Language_ar_EG=Árabe (Egito)
 Language_ar_SA=Árabe
+Language_ar_TN=Arabic (Tunisia)
 Language_az_AZ=Azerbaijão
 Language_bn_BD=Bengali
 Language_bn_IN=Bengali (Índia)
@@ -84,6 +85,7 @@ Language_nl_NL=Holandês
 Language_pl_PL=Polaco
 Language_pt_BR=Português (Brasil)
 Language_pt_PT=Português
+Language_ro_MD=Romanian (Moldavia)
 Language_ro_RO=Romeno
 Language_ru_RU=Russo
 Language_ru_UA=Russo (Ucrânia)
diff --git a/htdocs/langs/pt_PT/main.lang b/htdocs/langs/pt_PT/main.lang
index 64814d5926e..95ae942396c 100644
--- a/htdocs/langs/pt_PT/main.lang
+++ b/htdocs/langs/pt_PT/main.lang
@@ -430,6 +430,7 @@ LT1IN=ICBS
 LT2IN=IBSE
 LT1GC=Centavos adicionais
 VATRate=Taxa IVA
+RateOfTaxN=Rate of tax %s
 VATCode=Código da taxa de imposto
 VATNPR=Taxa de imposto NPR
 DefaultTaxRate=Taxa de imposto predefinida
@@ -729,6 +730,7 @@ MenuMembers=Membros
 MenuAgendaGoogle=Agenda Google
 MenuTaxesAndSpecialExpenses=Taxas | Despesas Especiais
 ThisLimitIsDefinedInSetup=Límite Dolibarr (Menu inicio->configuração->segurança): %s Kb, PHP limit: %s Kb
+ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
 NoFileFound=No documents uploaded
 CurrentUserLanguage=Idioma atual
 CurrentTheme=Tema Actual
@@ -1072,6 +1074,7 @@ ValidFrom=Válido desde
 ValidUntil=Válido até
 NoRecordedUsers=Sem utilizadores
 ToClose=Para fechar
+ToRefuse=To refuse
 ToProcess=Por processar
 ToApprove=Para aprovar
 GlobalOpenedElemView=Vista global
@@ -1126,9 +1129,11 @@ UpdateForAllLines=Update for all lines
 OnHold=On hold
 Civility=Civility
 AffectTag=Affect Tag
+CreateExternalUser=Create external user
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
 ConfirmCancel=Are you sure you want to cancel
+EmailMsgID=Email MsgID
diff --git a/htdocs/langs/pt_PT/members.lang b/htdocs/langs/pt_PT/members.lang
index 6bbaed3730c..ef70c09980b 100644
--- a/htdocs/langs/pt_PT/members.lang
+++ b/htdocs/langs/pt_PT/members.lang
@@ -213,3 +213,5 @@ SendReminderForExpiredSubscription=Enviar lembrete por e-mail aos membros quando
 MembershipPaid=Membership paid for current period (until %s)
 YouMayFindYourInvoiceInThisEmail=You may find your invoice attached to this email
 XMembersClosed=%s member(s) closed
+XExternalUserCreated=%s external user(s) created
+ForceMemberNature=Force member nature (Individual or Corporation)
diff --git a/htdocs/langs/pt_PT/modulebuilder.lang b/htdocs/langs/pt_PT/modulebuilder.lang
index 9d3997269fb..1dabb8aef31 100644
--- a/htdocs/langs/pt_PT/modulebuilder.lang
+++ b/htdocs/langs/pt_PT/modulebuilder.lang
@@ -143,3 +143,4 @@ AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
 ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
+ImportExportProfiles=Import and export profiles
diff --git a/htdocs/langs/pt_PT/mrp.lang b/htdocs/langs/pt_PT/mrp.lang
index 9e4293a072e..025f164f94e 100644
--- a/htdocs/langs/pt_PT/mrp.lang
+++ b/htdocs/langs/pt_PT/mrp.lang
@@ -8,12 +8,12 @@ MenuBOM=Faturas do material
 LatestBOMModified=Últimas %s Faturas do material modificadas
 LatestMOModified=Últimas %s Encomendas de Manufatura modificadas
 Bom=Faturas do Material
-BillOfMaterials=Fatura do Material
+BillOfMaterials=Bill of Materials
 BOMsSetup=Configuração do módulo de FM
 ListOfBOMs=Lista das faturas do material - FM
 ListOfManufacturingOrders=Lista das Encomendas de Manufaturação
-NewBOM=Nova fatura de material
-ProductBOMHelp=Product to create with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
+NewBOM=New bill of materials
+ProductBOMHelp=Product to create (or disassemble) with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
 BOMsNumberingModules=Modelos de numeração de FM
 BOMsModelModule=Modelos de documento de FM
 MOsNumberingModules=Modelos de numeração de EM
@@ -22,7 +22,7 @@ FreeLegalTextOnBOMs=Texto livre no documento de FM
 WatermarkOnDraftBOMs=Marca de água no rascunho de FM
 FreeLegalTextOnMOs=Texto livre no documento de EM
 WatermarkOnDraftMOs=Marca de água no rascunho de EM
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials %s ?
 ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
 ManufacturingEfficiency=Eficiência de manufaturação
 ConsumptionEfficiency=Eficiência de consumo
@@ -30,8 +30,8 @@ ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the produc
 ValueOfMeansLossForProductProduced=Value of 0.95 means an average of 5%% of loss of produced product
 DeleteBillOfMaterials=Eliminar Faturas de Materiais
 DeleteMo=Eliminar Encomenda de Manufaturação
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Materials?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Materials?
 MenuMRP=Encomendas de Manufatura
 NewMO=Nova Encomenda de Manufatura
 QtyToProduce=Qt. a produzir
@@ -39,7 +39,7 @@ DateStartPlannedMo=Date start planned
 DateEndPlannedMo=Date end planned
 KeepEmptyForAsap=Empty means 'As Soon As Possible'
 EstimatedDuration=Duração estimada
-EstimatedDurationDesc=Estimated duration to manufacture this product using this BOM
+EstimatedDurationDesc=Estimated duration to manufacture (or disassemble) this product using this BOM
 ConfirmValidateBom=Are you sure you want to validate the BOM with the reference <strong>%s</strong> (you will be able to use it to build new Manufacturing Orders)
 ConfirmCloseBom=Are you sure you want to cancel this BOM (you won't be able to use it to build new Manufacturing Orders anymore) ?
 ConfirmReopenBom=Are you sure you want to re-open this BOM (you will be able to use it to build new Manufacturing Orders)
@@ -63,13 +63,14 @@ ConsumeAndProduceAll=Consumir e Produzir Tudo
 Manufactured=Manufaturado
 TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
 ForAQuantityOf=For a quantity to produce of %s
+ForAQuantityToConsumeOf=For a quantity to disassemble of %s
 ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
 ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
 ProductionForRef=Production of %s
 AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
 NoStockChangeOnServices=Nenhuma alteração de ''stock'' nos serviços
 ProductQtyToConsumeByMO=Product quantity still to consume by open MO
-ProductQtyToProduceByMO=Product quentity still to produce by open MO
+ProductQtyToProduceByMO=Product quantity still to produce by open MO
 AddNewConsumeLines=Adicionar nova linha para consumir
 ProductsToConsume=Produtos para produzir
 ProductsToProduce=Produtos para produzir
@@ -83,15 +84,13 @@ Workstations=Workstations
 WorkstationsDescription=Workstations management
 WorkstationSetup = Workstations setup
 WorkstationSetupPage = Workstations setup page
-WorkstationAbout = About Workstation
-WorkstationAboutPage = Workstations about page
 WorkstationList=Workstation list
 WorkstationCreate=Add new workstation
 ConfirmEnableWorkstation=Are you sure you want to enable workstation <b>%s</b> ?
 EnableAWorkstation=Enable a workstation
 ConfirmDisableWorkstation=Are you sure you want to disable workstation <b>%s</b> ?
 DisableAWorkstation=Disable a workstation
-DeleteWorkstation=Supprimer
+DeleteWorkstation=Eliminar
 NbOperatorsRequired=Number of operators required
 THMOperatorEstimated=Estimated operator THM
 THMMachineEstimated=Estimated machine THM
diff --git a/htdocs/langs/pt_PT/orders.lang b/htdocs/langs/pt_PT/orders.lang
index 923d1cfc45a..671b06f6a75 100644
--- a/htdocs/langs/pt_PT/orders.lang
+++ b/htdocs/langs/pt_PT/orders.lang
@@ -11,6 +11,7 @@ OrderDate=Data da encomenda
 OrderDateShort=Data de encomenda
 OrderToProcess=Encomenda a processar
 NewOrder=Nova encomenda
+NewSupplierOrderShort=Nova encomenda
 NewOrderSupplier=New Purchase Order
 ToOrder=Efetuar encomenda
 MakeOrder=Efetuar encomenda
@@ -73,6 +74,7 @@ DeleteOrder=Eliminar encomenda
 CancelOrder=Cancelar encomenda
 OrderReopened= Order %s re-open
 AddOrder=Criar encomenda
+AddSupplierOrderShort=Criar encomenda
 AddPurchaseOrder=Create purchase order
 AddToDraftOrders=Adicionar à encomenda rascunho
 ShowOrder=Mostrar encomenda
diff --git a/htdocs/langs/pt_PT/other.lang b/htdocs/langs/pt_PT/other.lang
index 19ea1b73c8c..87cd3df9fe8 100644
--- a/htdocs/langs/pt_PT/other.lang
+++ b/htdocs/langs/pt_PT/other.lang
@@ -129,6 +129,7 @@ ClosedByLogin=Utilizador que fechou
 FileWasRemoved=o Ficheiro foi eliminado
 DirWasRemoved=A pasta foi eliminada
 FeatureNotYetAvailable=O funcionalidade ainda não se encontra disponível na versão atual
+FeatureNotAvailableOnDevicesWithoutMouse=Feature not available on devices without mouse
 FeaturesSupported=Funcionalidades suportadas
 Width=Largura
 Height=Altura
@@ -263,7 +264,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
-PrefixSession=Prefix for session ID
+SuffixSessionName=Suffix for session name
 
 ##### Export #####
 ExportsArea=Área de Exportações
diff --git a/htdocs/langs/pt_PT/partnership.lang b/htdocs/langs/pt_PT/partnership.lang
index b2bfd88cccb..61434b9dab6 100644
--- a/htdocs/langs/pt_PT/partnership.lang
+++ b/htdocs/langs/pt_PT/partnership.lang
@@ -16,41 +16,72 @@
 #
 # Generic
 #
-ModulePartnershipName = Partnership management
-PartnershipDescription = Module Partnership management
-PartnershipDescriptionLong= Module Partnership management
+ModulePartnershipName=Gestão de parceria
+PartnershipDescription=Módulo de gestão de parceria
+PartnershipDescriptionLong= Módulo de gestão de parceria
+
+AddPartnership=Add partnership
+CancelPartnershipForExpiredMembers=Partnership: Cancel partnership of members with expired subscriptions
+PartnershipCheckBacklink=Partnership: Check referring backlink
 
 #
 # Menu
 #
-NewPartnership = New Partnership
-ListOfPartnerships = List of partnership
+NewPartnership=Nova Parceria
+ListOfPartnerships=Lista de parcerias
 
 #
 # Admin page
 #
-PartnershipSetup = Partnership setup
-PartnershipAbout = About Partnership
-PartnershipAboutPage = Partnership about page
-
+PartnershipSetup=Configurar parceria
+PartnershipAbout=Sobre Parceria
+PartnershipAboutPage=Página de sobre Parcerias
+partnershipforthirdpartyormember=Partner status must be set on a 'thirdparty' or a 'member'
+PARTNERSHIP_IS_MANAGED_FOR=Partnership managed for
+PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks to check
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb of days before cancelling status of a partnership when a subscription has expired
+ReferingWebsiteCheck=Check of website referring
+ReferingWebsiteCheckDesc=You can enable a feature to check that your partners has added a backlink to your website domains on their own website.
 
 #
 # Object
 #
-DatePartnershipStart=Data de inicio
+DeletePartnership=Delete a partnership
+PartnershipDedicatedToThisThirdParty=Partnership dedicated to this third party
+PartnershipDedicatedToThisMember=Partnership dedicated to this member
+DatePartnershipStart=Data de início
 DatePartnershipEnd=Data de finalização
+ReasonDecline=Decline reason
+ReasonDeclineOrCancel=Decline reason
+PartnershipAlreadyExist=Partnership already exist
+ManagePartnership=Manage partnership
+BacklinkNotFoundOnPartnerWebsite=Backlink not found on partner website
+ConfirmClosePartnershipAsk=Are you sure you want to cancel this partnership?
+PartnershipType=Partnership type
 
 #
 # Template Mail
 #
+SendingEmailOnPartnershipWillSoonBeCanceled=Partnership will soon be canceled
+SendingEmailOnPartnershipRefused=Partnership refused
+SendingEmailOnPartnershipAccepted=Partnership accepted
+SendingEmailOnPartnershipCanceled=Partnership canceled
 
+YourPartnershipWillSoonBeCanceledTopic=Partnership will soon be canceled
+YourPartnershipRefusedTopic=Partnership refused
+YourPartnershipAcceptedTopic=Partnership accepted
+YourPartnershipCanceledTopic=Partnership canceled
+
+YourPartnershipWillSoonBeCanceledContent=We inform you that your partnership will soon be canceled (Backlink not found)
+YourPartnershipRefusedContent=We inform you that your partnership request has been refused.
+YourPartnershipAcceptedContent=We inform you that your partnership request has been accepted.
+YourPartnershipCanceledContent=We inform you that your partnership has been canceled.
 
 #
 # Status
 #
-PartnershipDraft = Esboço, projeto
-PartnershipAccepted = Aceite
-PartnershipRefused = Recusada
-PartnershipCanceled = Cancelado
-
-PartnershipManagedFor=Partners are
+PartnershipDraft=Minuta
+PartnershipAccepted=Aceite
+PartnershipRefused=Recusada
+PartnershipCanceled=Cancelada
+PartnershipManagedFor=Os parceiros são
diff --git a/htdocs/langs/pt_PT/productbatch.lang b/htdocs/langs/pt_PT/productbatch.lang
index 93a0b6c782d..508a22b0668 100644
--- a/htdocs/langs/pt_PT/productbatch.lang
+++ b/htdocs/langs/pt_PT/productbatch.lang
@@ -1,4 +1,4 @@
-# ProductBATCH language file - en_US - ProductBATCH
+# ProductBATCH language file - Source file is en_US - ProductBATCH
 ManageLotSerial=Utilizar lote/número de série
 ProductStatusOnBatch=Yes (lot required)
 ProductStatusOnSerial=Yes (unique serial number required)
@@ -33,3 +33,13 @@ CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+LifeTime=Life span (in days)
+EndOfLife=End of life
+ManufacturingDate=Manufacturing date
+DestructionDate=Destruction date
+FirstUseDate=First use date
+QCFrequency=Quality control frequency (in days)
+
+#Traceability - qc status
+OutOfOrder=Out of order
+InWorkingOrder=In working order
diff --git a/htdocs/langs/pt_PT/products.lang b/htdocs/langs/pt_PT/products.lang
index 90df059d129..0d6f2756144 100644
--- a/htdocs/langs/pt_PT/products.lang
+++ b/htdocs/langs/pt_PT/products.lang
@@ -396,3 +396,5 @@ ActionAvailableOnVariantProductOnly=Action only available on the variant of prod
 ProductsPricePerCustomer=Product prices per customers
 ProductSupplierExtraFields=Additional Attributes (Supplier Prices)
 DeleteLinkedProduct=Delete the child product linked to the combination
+PMPValue=Valor (PMP)
+PMPValueShort=PMP
diff --git a/htdocs/langs/pt_PT/projects.lang b/htdocs/langs/pt_PT/projects.lang
index b94c97c4627..7b4ce25824f 100644
--- a/htdocs/langs/pt_PT/projects.lang
+++ b/htdocs/langs/pt_PT/projects.lang
@@ -267,9 +267,11 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=Nova fatura
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+OneLinePerTimeSpentLine=One line for each time spent declaration
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
 AddPersonToTask=Add also to tasks
 UsageOrganizeEvent=Usage: Event Organization
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
+SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
diff --git a/htdocs/langs/pt_PT/receptions.lang b/htdocs/langs/pt_PT/receptions.lang
index f6a08b9543d..095d1bd940f 100644
--- a/htdocs/langs/pt_PT/receptions.lang
+++ b/htdocs/langs/pt_PT/receptions.lang
@@ -44,4 +44,4 @@ ValidateOrderFirstBeforeReception=Você deve primeiro validar a encomenda antes
 ReceptionsNumberingModules=Numbering module for receptions
 ReceptionsReceiptModel=Document templates for receptions
 NoMorePredefinedProductToDispatch=No more predefined products to dispatch
-
+ReceptionExist=A reception exists
diff --git a/htdocs/langs/pt_PT/stocks.lang b/htdocs/langs/pt_PT/stocks.lang
index 3d43ddfc367..1ce7e70b543 100644
--- a/htdocs/langs/pt_PT/stocks.lang
+++ b/htdocs/langs/pt_PT/stocks.lang
@@ -56,8 +56,6 @@ UnitPurchaseValue=Preço de compra Unitário
 StockTooLow=Stock insuficiente
 StockLowerThanLimit=Estoque inferior ao limite de alerta (%s)
 EnhancedValue=Valor
-PMPValue=Valor (PMP)
-PMPValueShort=PMP
 EnhancedValueOfWarehouses=Valor de stocks
 UserWarehouseAutoCreate=Crie um armazém de usuários automaticamente ao criar um usuário
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
@@ -251,7 +249,10 @@ SelectAStockMovementFileToImport=select a stock movement file to import
 InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
 LabelOfInventoryMovemement=Inventory %s
 ReOpen=Reabrir
-ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock to the real qty you entered into the inventory.
 ObjectNotFound=%s not found
 MakeMovementsAndClose=Generate movements and close
 AutofillWithExpected=Fill real quantity with expected quantity
+ShowAllBatchByDefault=By default, show batch details on product "stock" tab
+CollapseBatchDetailHelp=You can set batch detail default display in stocks module configuration
+FieldCannotBeNegative=Field "%s" cannot be negative
diff --git a/htdocs/langs/pt_PT/ticket.lang b/htdocs/langs/pt_PT/ticket.lang
index 73f6964c767..841f949a4e8 100644
--- a/htdocs/langs/pt_PT/ticket.lang
+++ b/htdocs/langs/pt_PT/ticket.lang
@@ -304,7 +304,7 @@ BoxLastModifiedTicket=Últimos tickets modificados
 BoxLastModifiedTicketDescription=Últimos %s tickets modificados 
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=Nenhum ticket modificado recentemente
-BoxTicketType=Number of open tickets by type
+BoxTicketType=Distribution of open tickets by type
 BoxTicketSeverity=Number of open tickets by severity
 BoxNoTicketSeverity=No tickets opened
 BoxTicketLastXDays=Number of new tickets by days the last %s days
diff --git a/htdocs/langs/ro_RO/accountancy.lang b/htdocs/langs/ro_RO/accountancy.lang
index cd32c4486e2..65d75b112aa 100644
--- a/htdocs/langs/ro_RO/accountancy.lang
+++ b/htdocs/langs/ro_RO/accountancy.lang
@@ -158,7 +158,7 @@ ACCOUNTING_LENGTH_AACCOUNT=Lungimea contului contabil pentru terţ (Dacă setaț
 ACCOUNTING_MANAGE_ZERO=Permite gestionarea unui număr diferit de zerouri la sfârșitul unui cont contabil. Cerut de unele țări (precum Elveția). Dacă este setat la oprit (implicit), puteți seta următorii doi parametri pentru a cere aplicației să adauge zerouri virtuale.
 BANK_DISABLE_DIRECT_INPUT=Dezactivează înregistrarea directă a tranzacției în contul bancar
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Activați schița de export în jurnal
-ACCOUNTANCY_COMBO_FOR_AUX=Activați lista combo pentru cont auxiliar (poate fi lentă dacă aveți o mulțime de terți)
+ACCOUNTANCY_COMBO_FOR_AUX=Activare listă combinată pentru contul subsidiar (poate fi lent dacă aveți o mulțime de terți, întrerupe capacitatea de a căuta după o valoare parţială)
 ACCOUNTING_DATE_START_BINDING=Definiți o dată pentru a începe legarea și transferul în contabilitate. Înainte de această dată, tranzacțiile nu vor fi transferate în contabilitate.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=La transferul contabil, selectați perioada în mod implicit 
 
@@ -328,6 +328,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Dezactivați legarea și transferul în
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Dezactivați legarea și transferul în contabilitate pentru rapoartele de cheltuieli (rapoartele de cheltuieli nu vor fi luate în considerare în contabilitate)
 
 ## Export
+NotifiedExportDate=Dată notificare export (modificarea înregistrărilor nu va fi posibilă)
+NotifiedValidationDate=Validare intrări (modificarea sau ștergerea intrărilor nu va fi posibilă)
+ConfirmExportFile=Confirmare generare fișier de export contabil?
 ExportDraftJournal=Export jurnal schiţă
 Modelcsv=Model export
 Selectmodelcsv=Selectează un model de export
diff --git a/htdocs/langs/ro_RO/admin.lang b/htdocs/langs/ro_RO/admin.lang
index 18f013674a6..a04fad974ea 100644
--- a/htdocs/langs/ro_RO/admin.lang
+++ b/htdocs/langs/ro_RO/admin.lang
@@ -119,7 +119,7 @@ DetailMenuIdParent=ID-ul meniului părinte (0 pentru meniu top)
 DetailPosition=Număr de ordine pentru a defini poziţia în meniu
 AllMenus=Toate
 NotConfigured=Modulul/aplicația nu a fost configurată
-Active=Activ
+Active=Active
 SetupShort=Setări
 OtherOptions=Alte opţiuni
 OtherSetup=Alte setări
@@ -221,8 +221,8 @@ NotCompatible=Acest modul nu pare compatibil cu Dolibarr %s (Min %s - Max %s).
 CompatibleAfterUpdate=Acest modul necesită o actualizare la Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=Consultați pe Market place
 SeeSetupOfModule=Vezi setările modului %s
+SetOptionTo=Setează opţiunea <b>%s</b> la %s
 Updated=Updatat
-Nouveauté=Noutate
 AchatTelechargement=Cumpărați / Descărcați
 GoModuleSetupArea=Pentru a implementa/instala un nou modul, accesați zona de configurare a modulelor: <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, marketplace oficial pentru module externe Dolibarr ERP/CRM
@@ -399,6 +399,7 @@ SecurityToken=Cheia pentru URL-uri securizate
 NoSmsEngine=Nu este disponibil niciun manager de expediere SMS-uri. Un manager de expediere SMS-uri nu este instalat cu distribuția implicită deoarece acesta depinde de un furnizor extern, dar puteți găsi unul pe %s
 PDF=PDF
 PDFDesc=Opţiuni globale pentru generarea PDF
+PDFOtherDesc=Opţiune PDF specifică anumitor module
 PDFAddressForging=Reguli pentru secţiunea adresă
 HideAnyVATInformationOnPDF=Ascundeți toate informațiile referitoare la taxa pe vânzări / TVA
 PDFRulesForSalesTax=Reguli pentru taxa pe vânzări / TVA
@@ -561,8 +562,8 @@ Module53Desc=Gestiunea serviciilor
 Module54Name=Contracte/Abonamente
 Module54Desc=Gestionarea contractelor (servicii sau abonamente periodice)
 Module55Name=Coduri de bare
-Module55Desc=Managementul codurilor de bare
-Module56Name=Plată prin transfer credit
+Module55Desc=Management coduri de bare şi coduri QR
+Module56Name=Plăţi transfer credit
 Module56Desc=Gestionarea plății furnizorilor efectuate prin ordine de transfer de credit. Acesta include generarea de fișiere SEPA pentru țările europene. 
 Module57Name=Plăţi prin direct debit
 Module57Desc=Gestionarea ordinelor de direct debit. Acesta include generarea de fișiere SEPA pentru țările europene. 
@@ -848,10 +849,10 @@ Permission402=Creare/modificare discount-uri
 Permission403=Validare discount-uri
 Permission404=Şterge discount-uri
 Permission430=Utilizare bară de depanare
-Permission511=Vizualizare plăți salarii (ale tale și ale subordonaților)
-Permission512=Creare/modificare plăţi salarii
-Permission514=Şterge plăţi salarii 
-Permission517=Vizualizare plăţilor salariilor tuturor 
+Permission511=Citeşte salarii și plăți (ale sale și ale subordonaților)
+Permission512=Crează/modifică salarii şi plăţi
+Permission514=Şterge salarii şi plăţi
+Permission517=Citeşte toate salariile și plățile
 Permission519=Export salarii
 Permission520=Citeşte credite împrumuturi
 Permission522=Creare/modificare credite împrumuturi
@@ -965,6 +966,8 @@ Permission23003=Şterge Joburi programate
 Permission23004=Execută Joburi programate
 Permission50101=Utilizează Punct de vânzare POS (SimplePOS)
 Permission50151=Utilizează Punct de vânzare POS (TakePOS)
+Permission50152=Editează linii de vânzare
+Permission50153=Editează linii comenzi de vânzare
 Permission50201=Citeşte tranzacţii
 Permission50202=Import tranzacţii
 Permission50330=Citeşte obiecte Zapier
@@ -1039,11 +1042,12 @@ DictionaryMeasuringUnits=Unități de măsură
 DictionarySocialNetworks=Reţele sociale
 DictionaryProspectStatus=Status prospect pentru companii
 DictionaryProspectContactStatus=Status prospect pentru contacte
-DictionaryHolidayTypes=Tipuri de concediu
+DictionaryHolidayTypes=Concediu - Tipuri de concediu
 DictionaryOpportunityStatus=Stare lead-uri pentru proiect/oportunitate
 DictionaryExpenseTaxCat=Raport de cheltuieli - Categorii de transport
 DictionaryExpenseTaxRange=Raport de cheltuieli - Gama de categorii de transport
 DictionaryTransportMode=Raportare intracomunitară - Mod transport
+DictionaryBatchStatus=Status control calitate lot/serie produs
 TypeOfUnit=Tip de unitate
 SetupSaved=Setări salvate
 SetupNotSaved=Setarea nu a fost salvată
@@ -1187,7 +1191,7 @@ SetupDescription4=<a href="%s">%s->%s</a><br><br>Acest software este o suită de
 SetupDescription5=Meniul Alte setări gestionează parametrii opționali.
 AuditedSecurityEvents=Evenimentele de securitate care sunt auditate
 NoSecurityEventsAreAduited=Niciun eveniment de securitate nu este auditat. Le poţi activa din meniul %s
-Audit=Audit
+Audit=Evenimente securitate
 InfoDolibarr=Despre sistem
 InfoBrowser=Despre browser
 InfoOS=Despre sistemul de operare
@@ -1319,9 +1323,12 @@ ConditionIsCurrently=Condiția este momentan %s
 YouUseBestDriver=Utilizați driverul %s, care este cel mai bun driver disponibil în prezent.
 YouDoNotUseBestDriver=Utilizați driverul %s dar  driverul %s este recomandat.
 NbOfObjectIsLowerThanNoPb=Aveţi doar %s%s în baza de date. Aceasta nu necesită nicio optimizare specială.
+ComboListOptim=Optimizarea încărcării listei combinate
 SearchOptim=Optimizare căutare
-YouHaveXObjectUseSearchOptim=Aveți %s %s în baza de date. Puteți adăuga constanta %s la 1 în Acasă-Configurare-Altele. Limitați căutarea la începutul șirurilor, ceea ce face posibilă utilizarea indecşilor în baza de date și ar trebui să primiți un răspuns mai rapid.
-YouHaveXObjectAndSearchOptimOn=Aveţi %s%s în baza de date şi constanta %s este setată la valoarea 1 în Acasă-Setup-Altele.
+YouHaveXObjectUseComboOptim=Ai %s %s în baza de date. Poți intra în configurarea modulului pentru a activa încărcarea listei combinate la evenimentul apăsare tastă. 
+YouHaveXObjectUseSearchOptim=Ai %s %s în baza de date. Poți adăuga constanta %s cu valoarea 1 în Acasă-Setări-Alte setări.
+YouHaveXObjectUseSearchOptimDesc=Acest lucru limitează căutarea la începutul șirurilor, ceea ce face posibilă utilizarea idecşilor bazei de date și ar trebui să obții un răspuns imediat.
+YouHaveXObjectAndSearchOptimOn=Ai %s %s în baza de date și constanta %s este setată la %s în Acasă-Setări-Alte setări.
 BrowserIsOK=Utilizați browserul web %s. Acest browser este ok pentru securitate și performanţă.
 BrowserIsKO=Utilizați browserul web %s. Acest browser este cunoscut ca fiind o alegere proastă pentru securitate, fiabilitate și performanță. Vă recomandăm să utilizați Firefox, Chrome, Opera sau Safari.
 PHPModuleLoaded=Componenta PHP %seste încărcată
@@ -1433,6 +1440,7 @@ MemberMainOptions=Opţiuni principale
 AdherentLoginRequired= Gestionează autentificarea pentru fiecare membru
 AdherentMailRequired=Emailul este necesar pentru a crea un nou membru
 MemberSendInformationByMailByDefault=Opţiunea de a trimite email de confirmare a membrilor(validare sau confirmare adeziune) este activă în mod implicit
+MemberCreateAnExternalUserForSubscriptionValidated=Creare cont de utilizator extern pentru fiecare adeziune de membru nou validat
 VisitorCanChooseItsPaymentMode=Vizitatorul poate alege din modurile disponibile de plată
 MEMBER_REMINDER_EMAIL=Activați reminder automat <b>prin email</b> pentru adeziunile expirate. Notă: Modul <strong>%s</strong> trebuie să fie activat and setat corect pentru a trimite remindere.
 MembersDocModules=Șabloane documente pentru documentele generate din înregistrarea membrilor
@@ -1763,7 +1771,7 @@ AGENDA_DEFAULT_VIEW=Ce vizualizare doriți să deschideți implicit atunci când
 AGENDA_REMINDER_BROWSER=Activați memento-uri evenimente în <b>browserul utilizatorului</b> (Când este atinsă data de reamintire, browserul afișează un popup. Fiecare utilizator poate dezactiva astfel de notificări din configurarea sa de notificări browser).
 AGENDA_REMINDER_BROWSER_SOUND=Activați notificarea sonoră
 AGENDA_REMINDER_EMAIL=Activați memento evenimente <b>prin email</b> (opțiunea de reamintire/întârziere poate fi definită pentru fiecare eveniment).
-AGENDA_REMINDER_EMAIL_NOTE= Notă: Frecvența task-ului %s trebuie să fie suficientă pentru a vă asigura că reamintirea este trimisă la momentul corect.
+AGENDA_REMINDER_EMAIL_NOTE=Notă: Frecvența jobului programat %s trebuie să fie suficientă pentru a vă asigura că reminder-ul este trimis la momentul corect.
 AGENDA_SHOW_LINKED_OBJECT=Afișați un obiect asociat în vizualizarea agendei
 ##### Clicktodial #####
 ClickToDialSetup=Configurare modul Click To Dial
@@ -1979,6 +1987,8 @@ MAIN_PDF_MARGIN_RIGHT=Marginea dreaptă a PDF-ului
 MAIN_PDF_MARGIN_TOP=Marginea superioară a PDF-ului 
 MAIN_PDF_MARGIN_BOTTOM=Marginea inferioară a PDF-ului 
 MAIN_DOCUMENTS_LOGO_HEIGHT=Înălţime logo în PDF
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Adăugare poză pe linia de ofertă
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Adăugare semnare electronică în PDF
 NothingToSetup=Nu există o configurație specifică necesară pentru acest modul.
 SetToYesIfGroupIsComputationOfOtherGroups=Setați la da dacă acest grup este calculat din alte grupuri
 EnterCalculationRuleIfPreviousFieldIsYes=Introdu regula de calcul dacă câmpul anterior a fost setat la Da. <br> De exemplu:<br> CODEGRP1 + CODEGRP2
@@ -2096,7 +2106,6 @@ PDF_SHOW_PROJECT=Afişează proiectul în document
 ShowProjectLabel=Etichetă proiect
 PDF_USE_ALSO_LANGUAGE_CODE=Dacă doriți să aveți unele texte duplicate în PDF-ul în 2 limbi diferite în același PDF generat, trebuie să setați aici această a doua limbă, astfel încât PDF-ul generat va conține 2 limbi diferite în aceeași pagină, cea aleasă la generarea PDF-ului și aceasta ( doar câteva șabloane PDF acceptă acest lucru). Păstrați gol pentru 1 limbă pentru fiecare PDF.
 FafaIconSocialNetworksDesc=Introduceți aici codul unei pictograme FontAwesome. Dacă nu știți ce este FontAwesome, puteți utiliza valoarea generică fa-address-book.
-FeatureNotAvailableWithReceptionModule=Funcţionalitatea nu este disponibilă când modulul Recepţie este activat
 RssNote=Notă: Fiecare definiție de flux RSS oferă un widget pe care trebuie să îl activați pentru a-l avea disponibil în tabloul de bord
 JumpToBoxes=Mergi la Setări -> Widget-uri
 MeasuringUnitTypeDesc=Foloseşte aici valori ca "mărime", "suprafaţă", "volum", "greutate", "durată"
@@ -2120,12 +2129,18 @@ ConfFileIsReadableOrWritableByAnyUsers=Fișierul conf poate fi citit sau scris d
 MailToSendEventOrganization=Organizarea evenimentelor
 AGENDA_EVENT_DEFAULT_STATUS=Starea implicită a evenimentului când creaţi un eveniment din formular
 YouShouldDisablePHPFunctions=Ar trebui să dezactivezi funcțiile PHP
-IfCLINotRequiredYouShouldDisablePHPFunctions=Cu excepția cazului în care trebuie să rulezi comenzi de sistem (pentru modulul Joburi programate sau pentru a rula linia de comandă externă Antivirus, de exemplu), trebuie să dezactivezi funcțiile PHP
+IfCLINotRequiredYouShouldDisablePHPFunctions=Cu excepția cazului în care trebuie să rulați comenzi de sistem în cod personalizat, trebuie să dezactivați funcțiile PHP
+PHPFunctionsRequiredForCLI=Pentru shell (cum ar fi jobul programat de backup sau rularea unui program antivirus), trebuie să păstrați funcțiile PHP 
 NoWritableFilesFoundIntoRootDir=Nu au fost găsite în directorul rădăcină fișiere sau directoare scriptibile ale programelor comune (OK) 
 RecommendedValueIs=Recomandat: %s
+NotRecommended=Nerecomandat
 ARestrictedPath=O cale restricţionată
 CheckForModuleUpdate=Verificare actualizări module externe
 CheckForModuleUpdateHelp=Această acțiune se va conecta la editori de module externe pentru a verifica dacă este disponibilă o nouă versiune.
 ModuleUpdateAvailable=O actualizare este disponibilă
 NoExternalModuleWithUpdate=Nu au fost găsite actualizări pentru modulele externe
 SwaggerDescriptionFile=Fişier descriptor Swagger API (pentru utilizare redoc de exemplu)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=Ai activat WS API care este învechit. Ar trebui să foloseşti REST API. 
+RandomlySelectedIfSeveral=Selectat aleatoriu dacă sunt disponibile mai multe imagini
+DatabasePasswordObfuscated=Parola bazei de date este eclipsată în fişierul conf
+DatabasePasswordNotObfuscated=Parola bazei de date NU este eclipsată în fişierul conf
diff --git a/htdocs/langs/ro_RO/agenda.lang b/htdocs/langs/ro_RO/agenda.lang
index 98ea4c798e3..b3b9190d787 100644
--- a/htdocs/langs/ro_RO/agenda.lang
+++ b/htdocs/langs/ro_RO/agenda.lang
@@ -1,26 +1,26 @@
 # Dolibarr language file - Source file is en_US - agenda
 IdAgenda=ID eveniment
 Actions=Evenimente
-Agenda=Agenda
-TMenuAgenda=Agenda
+Agenda=Agendă
+TMenuAgenda=Agendă
 Agendas=Agende
-LocalAgenda=Calendar intern
+LocalAgenda=Calendar implicit
 ActionsOwnedBy=Evenimentul lui
 ActionsOwnedByShort=Proprietar
 AffectedTo=Atribuit lui
 Event=Eveniment
 Events=Evenimente
 EventsNb=Număr evenimente
-ListOfActions=Lista  evenimente
+ListOfActions=Listă evenimente
 EventReports=Rapoarte Eveniment
 Location=Locație
-ToUserOfGroup=Eveniment atribuit unui utilizator din grup
+ToUserOfGroup=Eveniment atribuit oricărui utilizator din grup
 EventOnFullDay=Eveniment pe toat(ă)e zilele
 MenuToDoActions=Toate ev. neterminate
 MenuDoneActions=Toate ev. terminate
 MenuToDoMyActions=Ev. mele neterminate
 MenuDoneMyActions=Ev. mele terminate
-ListOfEvents=Listă evenimente (calendar intern)
+ListOfEvents=Listă evenimente (calendar implicit)
 ActionsAskedBy=Ev. înregistrate de
 ActionsToDoBy=Ev. atribuite lui
 ActionsDoneBy=Ev. efectuate de
@@ -35,79 +35,81 @@ AgendaAutoActionDesc= Aici puteți defini evenimentele pe care doriți ca Doliba
 AgendaSetupOtherDesc= Această pagină oferă opțiuni pentru a permite exportul evenimentelor Dolibarr într-un calendar extern (Thunderbird, Google Calendar etc.)
 AgendaExtSitesDesc=Această pagină vă permite să declaraţi sursele externe de calendare pentru a vedea evenimentele lor în agenda Dolibarr.
 ActionsEvents=Evenimente pentru care Dolibarr va crea o acţiune în agendă în mod automat
-EventRemindersByEmailNotEnabled=Evenimentul pentru mementouri prin e-mail nu a fost activat în configurarea modulului %s.
+EventRemindersByEmailNotEnabled=Evenimentul pentru reminder-e pe email nu a fost activat în configurarea modulului %s.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Terțul %s a fost creat
-COMPANY_DELETEInDolibarr=Terţ %s şters
-ContractValidatedInDolibarr=Contract %s validat
+COMPANY_MODIFYInDolibarr=Terţul %s a fost modificat
+COMPANY_DELETEInDolibarr=Terţul %s a fost şters
+ContractValidatedInDolibarr=Contractul %s a fost validat
 CONTRACT_DELETEInDolibarr=Contractul %s a fost șters
-PropalClosedSignedInDolibarr=Oferta  %s semnată
-PropalClosedRefusedInDolibarr=Oferta  %s refuzată
-PropalValidatedInDolibarr=Oferta %s validată
-PropalClassifiedBilledInDolibarr=Oferta %s clasificată facturată
-InvoiceValidatedInDolibarr=Factura %s validată
-InvoiceValidatedInDolibarrFromPos=Factura %s validată din POS
-InvoiceBackToDraftInDolibarr=Factura %s revenită de statutul schiţă
-InvoiceDeleteDolibarr=Factura %s ştearsă
-InvoicePaidInDolibarr=Factura %s schimbată la plată
-InvoiceCanceledInDolibarr=Factura %s anulată
-MemberValidatedInDolibarr=Membru %s validat
-MemberModifiedInDolibarr=Membrul %s modificat
-MemberResiliatedInDolibarr=Membru %s terminat
-MemberDeletedInDolibarr=Membru %s şters
-MemberSubscriptionAddedInDolibarr=Abonament %s pentru membru %s a fost adăugat
-MemberSubscriptionModifiedInDolibarr=Abonamentul %s pentru membrul %s a fost modificat
-MemberSubscriptionDeletedInDolibarr=Abonamentul %s pentru membrul %s a fost eliminat
-ShipmentValidatedInDolibarr=Livrarea %s validată
-ShipmentClassifyClosedInDolibarr=Expediere %s clasificată ca facturată
-ShipmentUnClassifyCloseddInDolibarr=Livrarea%s clasificată ca re-deschisă
-ShipmentBackToDraftInDolibarr=Expedierea %s revine la starea de proiect
-ShipmentDeletedInDolibarr=Livrare %s ştearsă
-ReceptionValidatedInDolibarr=Recepţie %s validată
+PropalClosedSignedInDolibarr=Oferta comercială %s a fost semnată
+PropalClosedRefusedInDolibarr=Oferta comercială %s a fost refuzată
+PropalValidatedInDolibarr=Oferta comercială %s a fost validată
+PropalClassifiedBilledInDolibarr=Oferta comercială %s a fost clasificată ca facturată
+InvoiceValidatedInDolibarr=Factura %s a fost validată
+InvoiceValidatedInDolibarrFromPos=Factura %s a fost validată din POS
+InvoiceBackToDraftInDolibarr=Factura %s a fost readusă la stadiul de schiţă
+InvoiceDeleteDolibarr=Factura %s a fost ştearsă
+InvoicePaidInDolibarr=Factura %s a fost clasificată ca plătită
+InvoiceCanceledInDolibarr=Factura %s a fost anulată
+MemberValidatedInDolibarr=Membrul %s a fost validat
+MemberModifiedInDolibarr=Membrul %s a fost modificat
+MemberResiliatedInDolibarr=Membrul %s a fost reziliat
+MemberDeletedInDolibarr=Membrul %s a fost şters
+MemberSubscriptionAddedInDolibarr=Cotizaţia %s pentru membrul %s a fost adăugată
+MemberSubscriptionModifiedInDolibarr=Cotizaţia %s pentru membrul %s a fost modificată
+MemberSubscriptionDeletedInDolibarr=Cotizaţia %s pentru membrul %s a fost ştearsă
+ShipmentValidatedInDolibarr=Livrarea %s a fost validată
+ShipmentClassifyClosedInDolibarr=Livrarea %s a fost clasificată ca facturată
+ShipmentUnClassifyCloseddInDolibarr=Livrarea%s a fost clasificată ca re-deschisă
+ShipmentBackToDraftInDolibarr=Livrarea %s revine la starea de schiţă
+ShipmentDeletedInDolibarr=Livrarea %s a fost ştearsă
+ReceptionValidatedInDolibarr=Recepţia %s a fost validată
 OrderCreatedInDolibarr=Comanda %s a fost creată
-OrderValidatedInDolibarr=Comanda %s validată
-OrderDeliveredInDolibarr=Comanda livrată %s  clasificată
-OrderCanceledInDolibarr=Comanda  %s anulată
-OrderBilledInDolibarr=Comanda livrată %s  facturată
-OrderApprovedInDolibarr=Comanda %s aprobată
-OrderRefusedInDolibarr=Comanda %s refuzată
-OrderBackToDraftInDolibarr=Comanda %s revenită la starea de schiţă
-ProposalSentByEMail=Propunerea comercială %s a fost trimisă prin e-mail
-ContractSentByEMail=Contractul %s a fost trimis prin e-mail
-OrderSentByEMail=Comanda vânzări %s a fost trimisă prin e-mail
-InvoiceSentByEMail=Factura clientului %s a fost trimisă prin e-mail
-SupplierOrderSentByEMail=Comanda de aprovizionare %s a fost trimisă prin e-mail
-ORDER_SUPPLIER_DELETEInDolibarr=Comanda de achiziţie%s ştearsă
-SupplierInvoiceSentByEMail=Factura furnizorului%s a fost trimisă prin e-mail
-ShippingSentByEMail=Expedierea %s trimisă prin e-mail
-ShippingValidated= Livrarea %s validată
-InterventionSentByEMail=Intervenția %s trimisă prin e-mail
+OrderValidatedInDolibarr=Comanda %s a fost validată
+OrderDeliveredInDolibarr=Comanda %s a fost clasificată ca livrată
+OrderCanceledInDolibarr=Comanda %s a fost anulată
+OrderBilledInDolibarr=Comanda %s a fost clasificată ca facturată
+OrderApprovedInDolibarr=Comanda %s a fost aprobată
+OrderRefusedInDolibarr=Comanda %s a fost refuzată
+OrderBackToDraftInDolibarr=Comanda %s a fost readusă la starea de schiţă
+ProposalSentByEMail=Oferta comercială %s a fost trimisă pe email
+ContractSentByEMail=Contractul %s a fost trimis pe email
+OrderSentByEMail=Comanda de vânzare %s a fost trimisă pe email
+InvoiceSentByEMail=Factura client %s a fost trimisă pe email
+SupplierOrderSentByEMail=Comanda de achiziţie %s a fost trimisă pe email
+ORDER_SUPPLIER_DELETEInDolibarr=Comanda de achiziţie %s a fost ştearsă
+SupplierInvoiceSentByEMail=Factura furnizor %s a fost trimisă pe email
+ShippingSentByEMail=Livrarea %s a fost trimisă pe email
+ShippingValidated= Livrarea %s a fost validată
+InterventionSentByEMail=Intervenția %s a fost trimisă pe email
 ProposalDeleted=Ofertă ştearsă
 OrderDeleted=Comandă ştearsă
 InvoiceDeleted=Factură ştearsă
 DraftInvoiceDeleted=Factura schiţă a fost ştearsă
 CONTACT_CREATEInDolibarr=Contactul %s a fost creat
+CONTACT_MODIFYInDolibarr=Contactul %s a fost modificat
 CONTACT_DELETEInDolibarr=Contactul %s a fost şters
-PRODUCT_CREATEInDolibarr=Produs%s creat
-PRODUCT_MODIFYInDolibarr=Produs %s modificat
-PRODUCT_DELETEInDolibarr=Produs %s şters
-HOLIDAY_CREATEInDolibarr=Cererea de concediu %screată
-HOLIDAY_MODIFYInDolibarr=Cererea de concediu %smodificată
-HOLIDAY_APPROVEInDolibarr=Cererea de concediu %saprobată
-HOLIDAY_VALIDATEInDolibarr=Cererea de concediu %s validată
-HOLIDAY_DELETEInDolibarr=Cererea de concediu %sştearsă
-EXPENSE_REPORT_CREATEInDolibarr=Raport cheltuieli %s creat
-EXPENSE_REPORT_VALIDATEInDolibarr=Raport cheltuieli  %s validat
-EXPENSE_REPORT_APPROVEInDolibarr=Raport cheltuieli %s aprobat
-EXPENSE_REPORT_DELETEInDolibarr=Raport cheltuieli %s şters
-EXPENSE_REPORT_REFUSEDInDolibarr=Raport cheltuieli %s refuzat
-PROJECT_CREATEInDolibarr=Proiect %s creat
-PROJECT_MODIFYInDolibarr=Proiect %s modificat
-PROJECT_DELETEInDolibarr=Proiect %s şters
+PRODUCT_CREATEInDolibarr=Produsul %s a fost creat
+PRODUCT_MODIFYInDolibarr=Produsul %s a fost modificat
+PRODUCT_DELETEInDolibarr=Produsul %s a fost şters
+HOLIDAY_CREATEInDolibarr=Cererea de concediu %s a fost creată
+HOLIDAY_MODIFYInDolibarr=Cererea de concediu %s a fost modificată
+HOLIDAY_APPROVEInDolibarr=Cererea de concediu %s a fost aprobată
+HOLIDAY_VALIDATEInDolibarr=Cererea de concediu %s a fost validată
+HOLIDAY_DELETEInDolibarr=Cererea de concediu %s a fost ştearsă
+EXPENSE_REPORT_CREATEInDolibarr=Raportul de cheltuieli %s  a fost creat
+EXPENSE_REPORT_VALIDATEInDolibarr=Raportul de cheltuieli  %s a fost validat
+EXPENSE_REPORT_APPROVEInDolibarr=Raportul de cheltuieli %s a fost aprobat
+EXPENSE_REPORT_DELETEInDolibarr=Raportul de cheltuieli %s a fost şters
+EXPENSE_REPORT_REFUSEDInDolibarr=Raportul de cheltuieli %s  a fost repins
+PROJECT_CREATEInDolibarr=Proiectul %s a fost creat
+PROJECT_MODIFYInDolibarr=Proiectul %s a fost modificat
+PROJECT_DELETEInDolibarr=Proiectul %s a fost şters
 TICKET_CREATEInDolibarr=Tichetul %s a fost creat
 TICKET_MODIFYInDolibarr=Tichetul %s a fost modificat
 TICKET_ASSIGNEDInDolibarr=Tichetul %s a fost atribuit
-TICKET_CLOSEInDolibarr=Tichetul%s a fost închis
+TICKET_CLOSEInDolibarr=Tichetul %s a fost închis
 TICKET_DELETEInDolibarr=Tichetul %s a fost șters
 BOM_VALIDATEInDolibarr=Bon de consum validat
 BOM_UNVALIDATEInDolibarr=Bon de consum invalidat
@@ -119,30 +121,31 @@ MRP_MO_UNVALIDATEInDolibarr=Comanda de fabricaţie setată la schiţă
 MRP_MO_PRODUCEDInDolibarr=Comanda de fabricaţie executată
 MRP_MO_DELETEInDolibarr=Comanda de fabricaţie ştearsă
 MRP_MO_CANCELInDolibarr=Comanda de fabricaţie anulată 
+PAIDInDolibarr=%s plătit
 ##### End agenda events #####
 AgendaModelModule=Șabloane de documente pentru eveniment
 DateActionStart=Data începerii
 DateActionEnd=Data terminării
 AgendaUrlOptions1=Puteţi, de asemenea, să adăugaţi următorii parametri pentru  filtrarea rezultatelor:
-AgendaUrlOptions3=<b>logind=%s</b> ​​pentru a limita exportul de acțiuni deţinute de utilizatorul <b>%s</b>
-AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> ​​pentru a limita exportul de acțiuni deţinute de utilizatorul  <b>%s</b>.
-AgendaUrlOptions4=<b>logint=%s</b> ​​pentru a limita exportul de acțiuni atribuite utilizatorului <b>%s</b>( proprietari sau altii).
-AgendaUrlOptionsProject=<b> project = __ PROJECT_ID __ </b> pentru a restricționa ieșirea la acțiunile legate de proiectul <b> __ PROJECT_ID __ </b>.
-AgendaUrlOptionsNotAutoEvent=<b> notactiontype = systemauto </b> pentru a exclude evenimentele automate.
+AgendaUrlOptions3=<b>logina=%s</b> ​​pentru a limita afişarea de acțiuni efectuate de utilizatorul <b>%s</b>
+AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> ​​pentru a limita afişarea de acțiuni neefectuate de utilizatorul  <b>%s</b>.
+AgendaUrlOptions4=<b>logint=%s</b> ​​pentru a limita exportul de acțiuni atribuite utilizatorului <b>%s</b>( proprietari sau alţii).
+AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> pentru a restricționa afişarea la acțiunile legate de proiectul <b>__PROJECT_ID__</b>.
+AgendaUrlOptionsNotAutoEvent=<b>notactiontype = systemauto</b> pentru a exclude evenimentele automate.
 AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> pentru a include evenimentele din zilele libere.
-AgendaShowBirthdayEvents=Afişează ziua de naştere a contactelor
+AgendaShowBirthdayEvents=Zilele de naştere ale contactelor
 AgendaHideBirthdayEvents=Ascunde ziua de naştere a contactelor
 Busy=Ocupat
-ExportDataset_event1=Lista ev. din agendă
-DefaultWorkingDays=Rangul zilelor lucrătoare predefinite in săptămână  (Exemplu:1-5, 1-6)
-DefaultWorkingHours=Orele lucrătoare predefinite ale zilei (Examplu: 9-18)
+ExportDataset_event1=Lista evenimentelor din agendă
+DefaultWorkingDays=Intervalul zilelor lucrătoare predefinite în săptămână  (Exemplu:1-5, 1-6)
+DefaultWorkingHours=Orele lucrătoare implicite ale zilei (Exemplu: 9-18)
 # External Sites ical
 ExportCal=Export calendar
 ExtSites=Import calendare externe
 ExtSitesEnableThisTool=Afișați calendarele externe (definite în configurația globală) din Agendă. Nu afectează calendarele externe definite de utilizatori.
 ExtSitesNbOfAgenda=Număr calendare
 AgendaExtNb=Calendar nr. %s
-ExtSiteUrlAgenda=URL-ul pentru a accesa fişierul . ical
+ExtSiteUrlAgenda=URL acces fişier .ical
 ExtSiteNoLabel=Nicio descriere
 VisibleTimeRange=Interval de timp vizibil
 VisibleDaysRange=Interval zile vizibil
@@ -150,8 +153,9 @@ AddEvent=Creare eveniment
 MyAvailability=Disponibilitatea mea
 ActionType=Tip eveniment
 DateActionBegin=Dată începere eveniment
-ConfirmCloneEvent=Sigur doriți să clonați evenimentul <b> %s</b>?
+ConfirmCloneEvent=Sigur doriți să clonați evenimentul <b>%s</b>?
 RepeatEvent=Repeta eveniment
+OnceOnly=Doar o dată
 EveryWeek=Fiecare săptămână
 EveryMonth=Fiecare lună
 DayOfMonth=Zi a lunii
@@ -160,9 +164,9 @@ DateStartPlusOne=Dată început + 1 ora
 SetAllEventsToTodo=Setează toate evenimentele la De făcut
 SetAllEventsToInProgress=Setează toate evenimentele la În desfăşurare
 SetAllEventsToFinished=Setează toate evenimentele la Finalizat
-ReminderTime=Reminder period before the event
-TimeType=Duration type
-ReminderType=Callback type
-AddReminder=Create an automatic reminder notification for this event
-ErrorReminderActionCommCreation=Error creating the reminder notification for this event
-BrowserPush=Browser Notification
+ReminderTime=Perioada de reamintire înainte de eveniment
+TimeType=Tip durată
+ReminderType=Tip callback
+AddReminder=Creați o notificare automată de reminder pentru acest eveniment
+ErrorReminderActionCommCreation=Eroare la crearea notificării de reminder pentru acest eveniment
+BrowserPush=Notificări popup browser
diff --git a/htdocs/langs/ro_RO/assets.lang b/htdocs/langs/ro_RO/assets.lang
index ba06524ae10..c65786f8371 100644
--- a/htdocs/langs/ro_RO/assets.lang
+++ b/htdocs/langs/ro_RO/assets.lang
@@ -29,7 +29,7 @@ AssetsLines=Active
 DeleteType=Şterge
 DeleteAnAssetType=Ștergeți un tip de activ
 ConfirmDeleteAssetType=Sigur doriți să ștergeți acest tip de activ?
-ShowTypeCard=Arată tipul ' %s'
+ShowTypeCard=Arată tipul '%s'
 
 # Module label 'ModuleAssetsName'
 ModuleAssetsName = Active
@@ -42,24 +42,26 @@ ModuleAssetsDesc = Descrierea activelor
 AssetsSetup = Configurarea activelor
 Settings = Configurări
 AssetsSetupPage = Pagină de configurare a activelor
-ExtraFieldsAssetsType = Atribute complementare (tipul de activ)
+ExtraFieldsAssetsType = Atribute complementare (tip de activ)
 AssetsType=Tipul activului
-AssetsTypeId=ID de tip activ
-AssetsTypeLabel=Eticheta de tip activ
+AssetsTypeId=ID tip de activ
+AssetsTypeLabel=Etichetă tip de activ
 AssetsTypes=Tipuri de active
 
 #
 # Menu
 #
-MenuAssets = Bunuri
+MenuAssets = Active
 MenuNewAsset = Activ nou
-MenuTypeAssets = Tip activ
-MenuListAssets = Lista
+MenuTypeAssets = Tip active
+MenuListAssets = Listă
 MenuNewTypeAssets = Nou
-MenuListTypeAssets = Lista
+MenuListTypeAssets = Listă
 
 #
 # Module
 #
+Asset=Activ
 NewAssetType=Tip de activ nou
 NewAsset=Activ nou
+ConfirmDeleteAsset=Sigur doriți să ștergeți acest activ?
diff --git a/htdocs/langs/ro_RO/banks.lang b/htdocs/langs/ro_RO/banks.lang
index ff671586d88..c2c4abffe0c 100644
--- a/htdocs/langs/ro_RO/banks.lang
+++ b/htdocs/langs/ro_RO/banks.lang
@@ -37,9 +37,9 @@ IbanValid=IBAN valid
 IbanNotValid=IBAN invalid
 StandingOrders=Ordine de debit direct
 StandingOrder=Ordin de plată debit direct
-PaymentByDirectDebit=Plată prin direct debit
+PaymentByDirectDebit=Plăţi direct debit
 PaymentByBankTransfers=Plăţi prin transfer de credit
-PaymentByBankTransfer=Plată prin transfer credit
+PaymentByBankTransfer=Plăţi transfer credit
 AccountStatement=Extras cont
 AccountStatementShort=Extras
 AccountStatements=Extrase Cont
diff --git a/htdocs/langs/ro_RO/bills.lang b/htdocs/langs/ro_RO/bills.lang
index f8bc43cf61c..1890efcba24 100644
--- a/htdocs/langs/ro_RO/bills.lang
+++ b/htdocs/langs/ro_RO/bills.lang
@@ -259,6 +259,7 @@ DateMaxPayment=Dată scadenţă la
 DateInvoice=Data facturării
 DatePointOfTax=Impozitare taxare
 NoInvoice=Nicio  factură
+NoOpenInvoice=Nicio factură deschisă
 ClassifyBill=Clasează factura
 SupplierBillsToPay=Facturi furnizor neplătite
 CustomerBillsUnpaid=Facturi clienţi neîncasate
@@ -589,3 +590,4 @@ FacParentLine=Linie de facturare părinte
 SituationTotalRayToRest=Rest de plată fără taxe
 PDFSituationTitle=Situaţia nr. %d
 SituationTotalProgress=Progres total %d %%
+SearchUnpaidInvoicesWithDueDate=Căutare facturi neplătite cu o dată scadentă = %s
diff --git a/htdocs/langs/ro_RO/cashdesk.lang b/htdocs/langs/ro_RO/cashdesk.lang
index ca9d3d6a26f..917fa1d9320 100644
--- a/htdocs/langs/ro_RO/cashdesk.lang
+++ b/htdocs/langs/ro_RO/cashdesk.lang
@@ -102,7 +102,7 @@ CashDeskGenericMaskCodes6 = Tag-ul <br><b>{TN}</b> este utilizat pentru adăugar
 TakeposGroupSameProduct=Grupează liniile cu produse identice
 StartAParallelSale=Iniţiază o vânzare paralelă
 SaleStartedAt=Vânzarea a început la %s
-ControlCashOpening=Controlați sertarul de numerar la deschiderea POS
+ControlCashOpening=Deschide popup-ul "Control numerar" când se deschide POS-ul
 CloseCashFence= Închideți controlul casieriei
 CashReport=Raport numerar
 MainPrinterToUse=Imprimantă principală de utilizat
@@ -126,5 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Modulul Imprimanta bonuri trebuie să fi fost
 AllowDelayedPayment= Permite plata cu întârziere
 PrintPaymentMethodOnReceipts=Tipăriți metoda de plată pe bonuri|chitanțe 
 WeighingScale=Cântar
-ShowPriceHT = Afișați coloana de preț fără taxe
-ShowPriceHTOnReceipt = Afișați coloana de preţ fără taxe pe bon/chitanţă
+ShowPriceHT = Afișare coloană preț fără taxe (pe ecran)
+ShowPriceHTOnReceipt = Afișare coloană preț fără taxe (pe bon)
diff --git a/htdocs/langs/ro_RO/companies.lang b/htdocs/langs/ro_RO/companies.lang
index 6a2b8632bec..33a076ecc0d 100644
--- a/htdocs/langs/ro_RO/companies.lang
+++ b/htdocs/langs/ro_RO/companies.lang
@@ -30,7 +30,7 @@ CountryIsInEEC=Țara se află în interiorul Comunității Economice Europene
 PriceFormatInCurrentLanguage=Afişează formatul preţului în limba şi moneda curentă
 ThirdPartyName=Nume terț
 ThirdPartyEmail=Email terț
-ThirdParty=Terț
+ThirdParty=Terți
 ThirdParties=Terți
 ThirdPartyProspects=Prospecţi
 ThirdPartyProspectsStats=Prospecţi
@@ -338,7 +338,7 @@ CompanyDeleted=Societatea "%s" a fost ştearsă din baza de date.
 ListOfContacts=Listă contacte/adrese
 ListOfContactsAddresses=Listă contacte/adrese
 ListOfThirdParties=Listă terți
-ShowCompany=Terţ
+ShowCompany=Terţi
 ShowContact=Contact-Adresă
 ContactsAllShort=Toate (fără filtru)
 ContactType=Tip contact
diff --git a/htdocs/langs/ro_RO/compta.lang b/htdocs/langs/ro_RO/compta.lang
index 774cbbf85d4..10e806c71fc 100644
--- a/htdocs/langs/ro_RO/compta.lang
+++ b/htdocs/langs/ro_RO/compta.lang
@@ -286,3 +286,9 @@ ReportPurchaseTurnover=Cifra de afaceri pe achiziţii facturate
 ReportPurchaseTurnoverCollected=Cifra de afaceri colectată din achiziţii
 IncludeVarpaysInResults = Include plăţile diverse în rapoarte
 IncludeLoansInResults =  Includeți creditele - împrumuturile în rapoarte
+InvoiceLate30Days = Facturi întârziate > 30 zile
+InvoiceLate15Days = Facturi întârziate > 15 zile
+InvoiceLateMinus15Days = Facturi întârziate
+InvoiceNotLate = De încasat < 15 zile
+InvoiceNotLate15Days = De încasat în 15 zile
+InvoiceNotLate30Days = De încasat în 30 zile
diff --git a/htdocs/langs/ro_RO/cron.lang b/htdocs/langs/ro_RO/cron.lang
index fbfafaf8424..6e4f16734f7 100644
--- a/htdocs/langs/ro_RO/cron.lang
+++ b/htdocs/langs/ro_RO/cron.lang
@@ -1,22 +1,22 @@
 # Dolibarr language file - Source file is en_US - cron
 # About page
 # Right
-Permission23101 = Citeste Job programat
-Permission23102 = Creare/Modificare job programat
-Permission23103 = Şterge Job programat
-Permission23104 = Execută Job programat
+Permission23101 = Citeşte Job programat
+Permission23102 = Creare/modificare job programat
+Permission23103 = Şterge job programat
+Permission23104 = Execută job programat
 # Admin
-CronSetup=Setare Managementul joburilor programate
-URLToLaunchCronJobs=Adresă URL pentru a verifica și lansa joburi cron calificate din browser
-OrToLaunchASpecificJob=Sau pentru a verifica și lansa un anumit task dintr-un browser
-KeyForCronAccess=Cheie de securitate pentru URL de lansare a joburilor cron
-FileToLaunchCronJobs=Linie de comanda pentru a verifica și a lansa sarcini cron calificate
-CronExplainHowToRunUnix=Pe mediul Unix veţi  utiliza instrumentul crontab pentru a  rula urmatoarea  linia de comanda la fiecare 5 minute
-CronExplainHowToRunWin=În mediul Microsoft (tm) Windows, puteți utiliza instrumentele programate pentru a executa linia de comandă la fiecare 5 minute
+CronSetup=Configurare Joburi programate
+URLToLaunchCronJobs=Adresă URL pentru verificare și lansare joburi cron calificate din browser
+OrToLaunchASpecificJob=Sau pentru verificarea și lansarea unui anumit task din browser
+KeyForCronAccess=Cheie de securitate pentru URL-ul de lansare a joburilor cron
+FileToLaunchCronJobs=Linie de comanda pentru a verifica și a lansa joburi cron calificate
+CronExplainHowToRunUnix=Pe mediul Unix veţi  utiliza instrumentul crontab pentru a  rula urmatoarea linia de comanda la fiecare 5 minute
+CronExplainHowToRunWin=În mediul Microsoft (tm) Windows, puteți utiliza instrumentele Scheduled Task pentru a executa linia de comandă la fiecare 5 minute
 CronMethodDoesNotExists= Clasa %s nu conține metoda %s
 CronMethodNotAllowed=Metoda %s clasei %seste în lista neagră a metodelor interzise
-CronJobDefDesc=Profilele sarcinilor Cron sunt definite în fișierul descriptor de module. Când modulul este activat, acestea sunt încărcate și disponibile, astfel încât să puteți administra lucrările din meniul instrumentelor de administrare%s.
-CronJobProfiles=Lista profilurilor sarcinilor cron predefinite
+CronJobDefDesc=Profilele joburilor cron sunt definite în fișierul descriptor al modulului. Când modulul este activat, acestea sunt încărcate și sunt disponibile, astfel încât să puteți administra joburile din meniul Instrumente de administrare%s.
+CronJobProfiles=Lista profilurilor de job cron predefinite
 # Menu
 EnabledAndDisabled=Activat și dezactivat
 # Page list
@@ -24,51 +24,51 @@ CronLastOutput=Ultimul rezultat
 CronLastResult=Ultimul cod rezultat
 CronCommand=Comandă
 CronList=Joburi programate
-CronDelete=Şterge Joburi programate
-CronConfirmDelete=Sigur doriți să ștergeți aceste lucrări programate?
-CronExecute=Lansați lucrările programate? 
-CronConfirmExecute=Sunteți sigur că doriți să executați aceste lucrări programate acum?
-CronInfo=Modulul de lucrări programate permite programarea lucrărilor pentru a le executa automat. Lucrările pot fi pornite și manual.
+CronDelete=Şterge joburi programate
+CronConfirmDelete=Sigur doriți să ștergeți aceste joburi programate?
+CronExecute=Lansați joburile programate? 
+CronConfirmExecute=Sunteți sigur că doriți să executați aceste joburi programate acum?
+CronInfo=Modulul Joburi programate permite programarea lucrărilor de sistem pentru execuţia automată. Joburile pot fi pornite și manual.
 CronTask=Job
 CronNone=Niciunul
 CronDtStart=Dată începere
 CronDtEnd=Data de final
-CronDtNextLaunch=Urmatoarea execuţie
+CronDtNextLaunch=Următoarea execuţie
 CronDtLastLaunch=Ultima rulare
 CronDtLastResult=Data ultimei  rulări
 CronFrequency=Frecvenţă
-CronClass=Clasa
-CronMethod=Metoda
-CronModule=Modulul
+CronClass=Clasă
+CronMethod=Metodă
+CronModule=Modul
 CronNoJobs=Niciun job înregistrat
 CronPriority=Prioritate
 CronLabel=Etichetă
 CronNbRun=Numărul de lansări 
 CronMaxRun=Număr maxim de lansări
 CronEach=Fiecare
-JobFinished=Job lansat şi terminat
+JobFinished=Job lansat şi finalizat
 Scheduled=Programat
 #Page card
 CronAdd= Adaugă joburi
-CronEvery=Executa fiecare job
+CronEvery=Execută fiecare job
 CronObject=Instanţă/Obiect de creat
 CronArgs=Parametri
 CronSaveSucess=Salvare cu succes
-CronNote=Comenteaza
+CronNote=Comentariu
 CronFieldMandatory=Câmpurile %s sunt obligatorii
 CronErrEndDateStartDt=Data de sfârşit nu poate fi înaintea datei de început
 StatusAtInstall=Stare la instalarea modulului
 CronStatusActiveBtn=Programare
 CronStatusInactiveBtn=Dezactivare
-CronTaskInactive=Acest post este dezactivat
+CronTaskInactive=Acest job este dezactivat (ne-programat)
 CronId=Id
 CronClassFile=Nume fișier cu clasă
-CronModuleHelp=Numele directorului modulului Dolibarr (lucrați și cu modul Dolibarr extern). <BR> De exemplu, pentru a apela metoda de fetch Dolibarr Produs obiect/htdocs / <u> produs </u> /class/product.class.php, valoarea pentru modul este <br> <i> produs </i>
-CronClassFileHelp=Calea relativă și numele fișierului de încărcat (calea este relativă la directorul rădăcină web). <BR> De exemplu, pentru a apela metoda fetch a obiectului produsului Dolibarr htdocs / produs / clasa / <u> product.class.php </u>, valoarea pentru numele fişierului clasei este <br> <i> produs/ clasa / product.class.php </i>
-CronObjectHelp=Numele obiectului de încărcat . <BR> De exemplu, pentru a apela metoda fetch a produsului Dolibarr obiect/htdocs / produs / clasa / product.class.php, valoarea pentru numele fişierului clasei este<br> <i> Produs </i>
-CronMethodHelp=Metoda obiect pentru lansare.<BR> De exemplu, pentru a apela metoda fetch a produsului Dolibarr obiect/htdocs/product/class/product.class.php, valoarea metodei este <br> <i> preluare </i>
+CronModuleHelp=Numele directorului modulului Dolibarr (lucrați și cu modul Dolibarr extern). <BR> De exemplu, pentru a apela metoda de fetch a obiectului Produs Dolibarr /htdocs/<u> product</u>/class/product.class.php, valoarea pentru modul este <br><i>product</i>
+CronClassFileHelp=Calea relativă și numele fișierului de încărcat (calea este relativă la directorul rădăcină web). <BR> De exemplu, pentru a apela metoda fetch a obiectului produs Dolibarr htdocs/product/class/<u>product.class.php</u>, valoarea pentru numele fişierului clasei este <br> <i> product/class/product.class.php </i>
+CronObjectHelp=Numele obiectului de încărcat . <BR> De exemplu, pentru a apela metoda fetch a produsului Dolibarr obiect/htdocs/product/class/product.class.php, valoarea pentru numele fişierului clasei este<br> <i> Product</i>
+CronMethodHelp=Metoda obiectului pentru lansare.<BR> De exemplu, pentru a apela metoda fetch a produsului Dolibarr obiect/htdocs/product/class/product.class.php, valoarea metodei este <br> <i> fetch </i>
 CronArgsHelp=Argumentele metodei. <BR> De exemplu, pentru a apela metoda de preluare a produsului Dolibarr  object /htdocs/product/class/product.class.php, valoarea parametrilor poate fi <br> <i> 0, ProductRef </i>
-CronCommandHelp=Linia de comandă de sistem pentru a executa.
+CronCommandHelp=Linia de comandă de sistem pentru execuţie.
 CronCreateJob=Creare job programat
 CronFrom=De la
 # Info
@@ -77,15 +77,15 @@ CronType=Tip job
 CronType_method=Metoda de apel a unei clase PHP
 CronType_command=Comandă shell
 CronCannotLoadClass=Nu se poate încărca fișierul de clasă %s (pentru a folosi clasa %s)
-CronCannotLoadObject=Fișier de clasă %s a fost încărcat, dar obiectul %s nu a fost găsit în el
-UseMenuModuleToolsToAddCronJobs=Mergi în meniu "<a href="%s">Acasă - Instrumente administrare - Joburi programate</a>" pentru a vedea şi edita joburile programate.
+CronCannotLoadObject=Fișierul de clasă %s a fost încărcat, dar obiectul %s nu a fost găsit în el
+UseMenuModuleToolsToAddCronJobs=Mergi în meniul "<a href="%s">Acasă - Instrumente administrare - Joburi programate</a>" pentru a vedea şi a edita joburile programate.
 JobDisabled=Job dezactivat
 MakeLocalDatabaseDumpShort=Backup local baza de date
-MakeLocalDatabaseDump=Creați o bază de date locală. Parametrii sunt: ​​compresie ("gz" sau "bz" sau "none"), tipul de backup (mysql, pgsql, auto) 1, "auto" sau nume de fișier de construit, număr de fișiere de rezervă de păstrat
-WarningCronDelayed=Atenție, în scopul performanței, indiferent de data următoare a executării activităţilor activate, este posibil ca activităţile dvs. să fie întârziate la maximum %s ore înainte de a rula
+MakeLocalDatabaseDump=Creați un dump de bază de date locală. Parametrii sunt: ​​compresie ("gz" sau "bz" sau "none"), tipul de backup (mysql, pgsql, auto) 1, "auto" sau nume de fișier construit, număr de fișiere de rezervă care vor fi păstrate
+WarningCronDelayed=Atenție, din motive de performanță, indiferent de data următoare a executării joburilor activate, este posibil ca activităţile tale să fie întârziate la maximum %s ore înainte de a rula
 DATAPOLICYJob=Curățător de date și anonimizator
 JobXMustBeEnabled=Jobul %s trebuie să fie activat
 # Cron Boxes
-LastExecutedScheduledJob=Ultima execuţie a jobului programat 
+LastExecutedScheduledJob=Ultima execuţie a jobului programat
 NextScheduledJobExecute=Următoarea execuţie a jobului programat
 NumberScheduledJobError=Numărul de joburi programate cu eroare
diff --git a/htdocs/langs/ro_RO/errors.lang b/htdocs/langs/ro_RO/errors.lang
index 19900e6c931..ad6f11fd140 100644
--- a/htdocs/langs/ro_RO/errors.lang
+++ b/htdocs/langs/ro_RO/errors.lang
@@ -11,6 +11,7 @@ ErrorBadValueForParamNotAString=Valoare greșită pentru parametru. Se adaugă,
 ErrorRefAlreadyExists=Referinţa <b>%s</b> există deja.
 ErrorLoginAlreadyExists=Login-ul %s există deja.
 ErrorGroupAlreadyExists=Grupul %s există deja.
+ErrorEmailAlreadyExists=Email-ul %s există deja.
 ErrorRecordNotFound=Înregistrarea nu a fost găsită.
 ErrorFailToCopyFile=Eşec la copierea fişierului <b>%s</b> în <b>%s</b>.
 ErrorFailToCopyDir=Eşec la copierea directorului '<b>%s</b>' în '<b>%s</b>'.
@@ -117,7 +118,7 @@ ErrorCantReadFile=Eşec la citirea fişierului '%s'
 ErrorCantReadDir=Eşec la citirea directorului ' %s'
 ErrorBadLoginPassword=Autentificare sau parolă eronată
 ErrorLoginDisabled=Contul tău a fost dezactivat
-ErrorFailedToRunExternalCommand=Eşec la rularea comenzii externe. Verifică aceasta este disponibilă şi rulabilă în PHP pe server. Dacă PHP <b>Safe Mode</b> este activat, verifică dacă comanda este în interiorul unui director definit de parametrul <b>safe_mode_exec_dir</b>.
+ErrorFailedToRunExternalCommand=Nu s-a executat comanda externă. Verificați dacă este disponibilă și rulabilă de către utilizatorul serverului PHP. Verificați, de asemenea, dacă comanda nu este protejată la nivel de shell de un strat de securitate, cum ar fi apparmor.
 ErrorFailedToChangePassword=Eşec la schimbarea parolei
 ErrorLoginDoesNotExists=Contul de utilizator <b>%s</b> nu a putut fi găsit.
 ErrorLoginHasNoEmail=Acest utilizator nu are nici o adresa de email. Procesul a fost  anulat.
@@ -262,6 +263,7 @@ ErrorDateIsInFuture=Eroare, data nu poate fi în viitor
 ErrorAnAmountWithoutTaxIsRequired=Eroare, suma este obligatorie
 ErrorAPercentIsRequired=Eroare, completați procentajul corect
 ErrorYouMustFirstSetupYourChartOfAccount=Trebuie să setezi mai întâi planul de conturi
+ErrorFailedToFindEmailTemplate=Nu s-a găsit șablonul cu numele de cod %s
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Parametrul tău PHP upload_max_filesize (%s) este mai mare decât paramentrul PHP post_max_size (%s). Aceasta nu este o configuraţie consistentă.
@@ -298,3 +300,4 @@ WarningModuleXDisabledSoYouMayMissEventHere=Modulul %s nu a fost activat. Este p
 ErrorActionCommPropertyUserowneridNotDefined=Utilizatorul deţinător este obligatoriu
 ErrorActionCommBadType=Tipul evenimentului selectat (id: %n, cod: %s) nu există în dicţionarul Tipuri evenimente
 CheckVersionFail=Verificarea versiunii a eşuat
+ErrorWrongFileName=Numele fișierului nu poate să conțină _SOMETHING_ în el
diff --git a/htdocs/langs/ro_RO/eventorganization.lang b/htdocs/langs/ro_RO/eventorganization.lang
index f1306c2da54..d8703b49e48 100644
--- a/htdocs/langs/ro_RO/eventorganization.lang
+++ b/htdocs/langs/ro_RO/eventorganization.lang
@@ -1,4 +1,5 @@
 # Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+# Copyright (C) 2021		Dorian Vabre			<dorian.vabre@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
@@ -22,8 +23,8 @@ EventOrganizationDescriptionLong= Gestionare organizare de evenimente conferinț
 #
 # Menu
 #
-EventOrganizationMenuLeft = Evenimente organizate
-EventOrganizationConferenceOrBoothMenuLeft = Conferinţă sau Stand
+EventOrganizationMenuLeft = Organizare evenimente
+EventOrganizationConferenceOrBoothMenuLeft = Conferinţe sau Stand-uri
 
 #
 # Admin page
@@ -47,10 +48,10 @@ EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filtrează lista de selecție a terțil
 #
 # Object
 #
-EventOrganizationConfOrBooth= Conferinţă sau Stand
+EventOrganizationConfOrBooth= Conferinţe sau Stand-uri
 ManageOrganizeEvent = Management organizare evenimente
-ConferenceOrBooth = Conferinţă sau Stand
-ConferenceOrBoothTab = Conferinţă sau Stand
+ConferenceOrBooth = Conferinţe sau Stand-uri
+ConferenceOrBoothTab = Conferinţe sau Stand-uri
 AmountOfSubscriptionPaid = Valoare abonament plătită
 DateSubscription = Dată înscriere
 ConferenceOrBoothAttendee = Participant la Conferinţă sau Stand
@@ -81,7 +82,10 @@ PriceOfBoothHelp=Preț înscriere pentru stand
 EventOrganizationICSLink=Asociere calendar ICS pentru evenimente
 ConferenceOrBoothInformation=Informaţii Conferinţă sau Stand
 Attendees = Participanți
+DownloadICSLink = Link descărcare ICS
 EVENTORGANIZATION_SECUREKEY = Cheie securizată link public de înregistrare la o conferință
+SERVICE_BOOTH_LOCATION = Serviciu utilizat pentru linia de facturare privind locaţia standului
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Serviciu utilizat pentru linia de facturare pentru o taxă de participare la o conferință
 #
 # Status
 #
@@ -94,8 +98,46 @@ EvntOrgCancelled = Anulat
 #
 # Public page
 #
+SuggestForm = Pagină de propuneri
+RegisterPage = Pagină pentru conferinţă sau stand
+EvntOrgRegistrationHelpMessage = Aici, puteți vota pentru un eveniment sau puteți propune o nouă conferință sau stand pentru proiect
+EvntOrgRegistrationConfHelpMessage = Aici puteți propune o nouă conferință pentru proiect
+EvntOrgRegistrationBoothHelpMessage = Aici puteți propune un nou stand pentru proiect
+ListOfSuggestedConferences = Listă conferinţe propuse
+ListOfSuggestedBooths = Listă stand-uri propuse
+SuggestConference = Propune o nouă conferinţă
+SuggestBooth = Propune un stand
+ViewAndVote = Vizualizează și votează pentru evenimentele propuse
 PublicAttendeeSubscriptionPage = Link public de înscriere la conferinţă
 MissingOrBadSecureKey = Cheia de securitate lipseşte sau este invalidă
-EvntOrgWelcomeMessage = Acest formular îţi permite să te înregistrezi ca nou participant la conferință 
-EvntOrgStartDuration = Această conferinţă începe la 
-EvntOrgEndDuration =  şi se termină la
+EvntOrgWelcomeMessage = Acest formular vă permite să vă înregistrați ca nou participant la conferința: '%s'
+EvntOrgDuration = Această conferinţă începe pe %s şi se termină pe %s.
+ConferenceAttendeeFee = Taxă de participare la conferință pentru evenimentul: '%s' care are loc de pe %s până la %s.
+BoothLocationFee = Locaţie stand pentru evenimentul: '%s' care se desfăşoară între %s şi %s
+EventType = Tip eveniment
+
+#
+# Vote page
+#
+EvntOrgRegistrationWelcomeMessage = Bine ați venit pe pagina de propuneri conferință sau stand.
+EvntOrgRegistrationConfWelcomeMessage = Bine ai venit pe pagina de propuneri a conferinței.
+EvntOrgRegistrationBoothWelcomeMessage = Bine ai venit pe pagina de propuneri stand.
+EvntOrgVoteHelpMessage = Aici poți vizualiza și vota evenimentele propuse pentru proiect
+VoteOk = Votul tău a fost acceptat.
+AlreadyVoted = Ai votat deja pentru acest eveniment.
+VoteError = A apărut o eroare în timpul votului, vă rugăm să încercați din nou.
+
+#
+# SubscriptionOk page
+#
+SubscriptionOk = Abonamentul tău la această conferință a fost validat 
+#
+# Subscription validation mail
+#
+ConfAttendeeSubscriptionConfirmation = Confirmarea participării la o conferință
+#
+# Payment page
+#
+Attendee = Participant
+PaymentConferenceAttendee = Plată participant conferinţă
+PaymentBoothLocation = Plată locaţie stand
diff --git a/htdocs/langs/ro_RO/holiday.lang b/htdocs/langs/ro_RO/holiday.lang
index cbbb43ab7c1..f8f82cfb310 100644
--- a/htdocs/langs/ro_RO/holiday.lang
+++ b/htdocs/langs/ro_RO/holiday.lang
@@ -1,48 +1,48 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Concediu
-CPTitreMenu=Concediu
+Holidays=Concedii
+CPTitreMenu=Concedii
 MenuReportMonth=Situaţia lunară
-MenuAddCP=Cerere de concediu noua
-NotActiveModCP=Trebuie să activați modulul Concediu pentru a vedea această pagină.
+MenuAddCP=Cerere de concediu nouă
+NotActiveModCP=Trebuie să activați modulul Concedii pentru a vedea această pagină.
 AddCP=Crează o cerere de concediu
 DateDebCP=Dată început
 DateFinCP=Dată sfărşit
-DraftCP=Ciornă
+DraftCP=Schiţă
 ToReviewCP=În aşteptarea aprobării
 ApprovedCP=Aprobat
 CancelCP=Şters
 RefuseCP=Refuzat
-ValidatorCP=Aprobator
+ValidatorCP=Responsabil aprobare
 ListeCP=Lista concediilor
-Leave=Cereri de concedii
-LeaveId=Lăsați ID-ul
+Leave=Cerere de concediu
+LeaveId=ID concediu
 ReviewedByCP=Va fi aprobat de către
 UserID=ID utilizator
-UserForApprovalID=Utilizator pentru ID de aprobare
-UserForApprovalFirstname=Prenumele utilizatorului de aprobare
-UserForApprovalLastname=Numele utilizatorului de aprobare
-UserForApprovalLogin=Conectarea utilizatorului de aprobare
+UserForApprovalID=ID utilizator aprobare
+UserForApprovalFirstname=Prenumele utilizatorului care aprobă
+UserForApprovalLastname=Numele utilizatorului care aprobă
+UserForApprovalLogin=Nume de autentificare utilizator care aprobă
 DescCP=Descriere
 SendRequestCP=Crează o cerere de concediu
 DelayToRequestCP=Cererile pentru concediu trebuiesc făcute cu cel puţin <b>%s zi(le)</b> înainte.
 MenuConfCP=Restul concediului
-SoldeCPUser=Restul concediului este de <b> %s </b> zile.
+SoldeCPUser=Restul concediului este de <b>%s</b> zile.
 ErrorEndDateCP=Trebuie să selectaţi data de sfârşit mai mare decât data de început.
-ErrorSQLCreateCP=O eroare SQL întâlnită în timpul creării:
-ErrorIDFicheCP=O eroare a intervenit, cererea de concediu nu exista
+ErrorSQLCreateCP=A apărut o eroare SQL în timpul creării:
+ErrorIDFicheCP=A apărut o eroare, cererea de concediu nu există.
 ReturnCP=Înapoi la pagina precedentă
-ErrorUserViewCP=Dvs nu aveti dreptul de a citi aceata cerere de concediu.
-InfosWorkflowCP=Flux de lucru Informatii
+ErrorUserViewCP=Nu ai dreptul de a citi această cerere de concediu.
+InfosWorkflowCP=Info flux de lucru
 RequestByCP=Solicitat de
-TitreRequestCP=Cereri de concedii
-TypeOfLeaveId=Tipul de ID de concediu
-TypeOfLeaveCode=Tipul codului de concediu
-TypeOfLeaveLabel=Tipul tabelului de concediu
-NbUseDaysCP=Numărul de zile de concediu consumate
-NbUseDaysCPHelp= Calculul ține cont de zilele nelucrătoare și de sărbătorile definite în dicționar.
-NbUseDaysCPShort=Zile consumate
-NbUseDaysCPShortInMonth=Zilele consumate în lună
+TitreRequestCP=Cereri de concediu
+TypeOfLeaveId=ID tip concediu
+TypeOfLeaveCode=Cod tip concediu
+TypeOfLeaveLabel=Etichetă tip concediu
+NbUseDaysCP=Număr de zile de concediu utilizate
+NbUseDaysCPHelp=Calculaţia ia în considerare zilele nelucrătoare și sărbătorile legale definite în dicționar.
+NbUseDaysCPShort=Zile de concediu
+NbUseDaysCPShortInMonth=Zile de concediu pe lună
 DayIsANonWorkingDay=%s este o zi nelucrătoare
 DateStartInMonth=Data de începere în lună
 DateEndInMonth=Data de încheiere în lună
@@ -53,14 +53,14 @@ ActionCancelCP=Anulare
 StatutCP=Status
 TitleDeleteCP=Şterge cerere de concediu
 ConfirmDeleteCP=Confirmaţi ştergerea acestei cereri de concediu?
-ErrorCantDeleteCP=Eroare, dvs nu aveti drepturi de stergere acestei cereri de concediu.
-CantCreateCP=Nu aveţi drepturile de a face cereri de concediu
-InvalidValidatorCP=Dvs trebuie sa alegeti un aprobator pentru cererea dvs de concediu.
-NoDateDebut=Trebuie să selectaţi data de debut.
+ErrorCantDeleteCP=Eroare, nu ai dreptul de a şterge această cerere de concediu.
+CantCreateCP=Nu ai dreptul de a face cereri de concediu.
+InvalidValidatorCP=Trebuie să alegi responsabilul cu abrobarea pentru cererea ta de concediu.
+NoDateDebut=Trebuie să selectaţi data de început.
 NoDateFin=Trebuie să selectaţi data de sfârşit.
-ErrorDureeCP=Cererea dvs pentru concediu nu conţine zile lucrătoare.
+ErrorDureeCP=Cererea ta de concediu nu conţine zile lucrătoare.
 TitleValidCP=Aprobă cererea de concediu
-ConfirmValidCP=Sunteţi sigur că doriţi să aprobaţi  această cerere de concediu ?
+ConfirmValidCP=Sunteţi sigur că doriţi să aprobaţi această cerere de concediu ?
 DateValidCP=Data aprobării
 TitleToValidCP=Trimite cererea de concediu
 ConfirmToValidCP=Sunteţi sigur că doriţi să trimiteţi această cerere de concediu?
@@ -74,21 +74,21 @@ DateRefusCP=Data refuzului
 DateCancelCP=Data anulării
 DefineEventUserCP=Atribuie un concediu excepţional pentru un utilizator
 addEventToUserCP=Atribuie concediu
-NotTheAssignedApprover=Nu sunteți persoana desemnată pentru aprobare
+NotTheAssignedApprover=Nu eşti persoana responsabilă cu aprobarea
 MotifCP=Motiv
 UserCP=Utilizator
-ErrorAddEventToUserCP=O eroare a survenit in timpul adaugarii de concediu exceptional.
-AddEventToUserOkCP=Adaugarea de concediu exceptional a fost efectuat
-MenuLogCP=Vezi modificari cereri
-LogCP=Loguri al actualizărilor zilelor de concediu
-ActionByCP=Realizat de
-UserUpdateCP=Pentru utilizatorul
-PrevSoldeCP=Soldul precedent
-NewSoldeCP=Soldul nou
+ErrorAddEventToUserCP=O eroare a survenit in timpul adăugării de concediu excepţional.
+AddEventToUserOkCP=Adăugarea de concediu excepţional a fost efectuată
+MenuLogCP=Vezi modificări cereri
+LogCP=Jurnalul tuturor actualizărilor făcute la "Calculul zilelor de concediu"
+ActionByCP=Actualizat de
+UserUpdateCP=Actualizat pentru
+PrevSoldeCP=Sold precedent
+NewSoldeCP=Sold nou
 alreadyCPexist=O cerere de concediu a fost deja făcută pe această perioadă.
-FirstDayOfHoliday=Prima zi a concediului
-LastDayOfHoliday=Ultima zi a concediului
-BoxTitleLastLeaveRequests=Ultimele %s cereri de modificare a concediului 
+FirstDayOfHoliday=Prima zi de pe cererea de concediu
+LastDayOfHoliday=Ultima zi de pe cererea de concediu
+BoxTitleLastLeaveRequests=Ultimele %s cereri de concediu modificate 
 HolidaysMonthlyUpdate=Actualizare lunară
 ManualUpdate=Actualizare manuală
 HolidaysCancelation=Anulare cerere concediu
@@ -98,37 +98,37 @@ TypeWasDisabledOrRemoved=Tipul de concediu (id %s) a fost dezactivat sau elimina
 LastHolidays=Ultimele %s cereri de concediu
 AllHolidays=Toate cererile de concediu
 HalfDay=Jumătate de zi
-NotTheAssignedApprover=Nu sunteți persoana desemnată pentru aprobare
-LEAVE_PAID=Vacanţă platită
+NotTheAssignedApprover=Nu eşti persoana responsabilă cu aprobarea
+LEAVE_PAID=Concediu plătit
 LEAVE_SICK=Concediu medical
 LEAVE_OTHER=Alte concedii
-LEAVE_PAID_FR=Vacanţă plătită
+LEAVE_PAID_FR=Concediu plătit
 ## Configuration du Module ##
 LastUpdateCP=Ultima actualizare automată a alocării concediilor
 MonthOfLastMonthlyUpdate=Luna ultimei actualizări automate a alocării concediilor
 UpdateConfCPOK=Actualizare realizată.
-Module27130Name= Managementul cererilor de concedii
-Module27130Desc= Managementul cererilor de concedii
-ErrorMailNotSend=O eroare a intervenit la trimiterea mailului :
-NoticePeriod=Perioadă notita
+Module27130Name= Concedii
+Module27130Desc= Concedii
+ErrorMailNotSend=O eroare a intervenit la trimiterea emailului :
+NoticePeriod=Perioadă de notificare
 #Messages
-HolidaysToValidate=Validează cereri concedii
+HolidaysToValidate=Validează cereri de concedii
 HolidaysToValidateBody=Mai jos este o cerere de concediu de validat
-HolidaysToValidateDelay=Această cerere de concediuva avea loc intr-o  perioadă de mai puţin de %s zile.
+HolidaysToValidateDelay=Această cerere de concediu va avea loc într-o perioadă de mai puţin de %s zile.
 HolidaysToValidateAlertSolde=Utilizatorul care a făcut această solicitare de concediu nu are suficiente zile disponibile.
 HolidaysValidated=Cereri de concedii validate
-HolidaysValidatedBody=Cererea dvs pentru concediu  pentru %s la %s a fost validată.
+HolidaysValidatedBody=Cererea ta de concediu de la %s pînă %s a fost validată.
 HolidaysRefused=Cerere respinsă
-HolidaysRefusedBody=Solicitarea dvs. de concediu pentru %s la %s a fost respinsă din următorul motiv:
-HolidaysCanceled=Cereri Concedii anulate
-HolidaysCanceledBody=Cererea dvs pentru concediu  pentru %s la %s a fost anulată.
-FollowedByACounter=1: Acest tip de concediu trebuie urmat de un contor. Counter-ul este incrementat manual sau automat și atunci când o solicitare de concediu este validată, contorul este diminuat. <br> 0: Nu este urmat de un contor.
+HolidaysRefusedBody=Cererea ta de concediu de la %s până la %s a fost respinsă din următorul motiv:
+HolidaysCanceled=Cereri de concedii anulate
+HolidaysCanceledBody=Cererea ta de concediu de la %s până la %s a fost anulată.
+FollowedByACounter=1: Acest tip de concediu trebuie urmat de un contor. Contorul este incrementat manual sau automat și atunci când o cerere de concediu este validată, contorul este diminuat. <br> 0: Nu este urmat de un contor.
 NoLeaveWithCounterDefined=Nu sunt definite tipuri de concediu care trebuie urmate de un contor
-GoIntoDictionaryHolidayTypes=Mergi la <strong> Acasă - Configurare - Dicționare - Tip de concediu </strong> pentru a configura diferitele tipuri de concedii.
-HolidaySetup=Configurarea modulului Vacanță
-HolidaysNumberingModules=Modelele de numerotare a cererilor de concediu
+GoIntoDictionaryHolidayTypes=Mergi la <strong>Acasă - Setări - Dicționare - Tip de concediu</strong> pentru a configura diferite tipuri de concedii.
+HolidaySetup=Configurare modul Concedii
+HolidaysNumberingModules=Modele de numerotare pentru cererile de concediu
 TemplatePDFHolidays=Șablon pentru cererile de concediu PDF
-FreeLegalTextOnHolidays=Text gratuit pe PDF
-WatermarkOnDraftHolidayCards=Bază de fundal privind cererile de permis de concediu
+FreeLegalTextOnHolidays=Text liber pe PDF
+WatermarkOnDraftHolidayCards=Watermark-uri pe cererile de concediu schiţă
 HolidaysToApprove=Concedii de aprobat
 NobodyHasPermissionToValidateHolidays=Nimeni nu are permisiunea de a valida concedii
diff --git a/htdocs/langs/ro_RO/hrm.lang b/htdocs/langs/ro_RO/hrm.lang
index 3a232f187ab..f320d957266 100644
--- a/htdocs/langs/ro_RO/hrm.lang
+++ b/htdocs/langs/ro_RO/hrm.lang
@@ -1,19 +1,19 @@
 # Dolibarr language file - en_US - hrm
 # Admin
-HRM_EMAIL_EXTERNAL_SERVICE=E-mail pentru a preveni serviciu extern HRM
+HRM_EMAIL_EXTERNAL_SERVICE=Adresă email HRM serviciu externalizat
 Establishments=Sedii
 Establishment=Sediu
 NewEstablishment=Sediu nou
-DeleteEstablishment=Sterge Sediu
-ConfirmDeleteEstablishment=Sigur doriți să ștergeți această unitate?
-OpenEtablishment=Deschide Sediu
-CloseEtablishment=Inchide Sediu
+DeleteEstablishment=Şterge sediu
+ConfirmDeleteEstablishment=Sigur doriți să ștergeți acest sediu?
+OpenEtablishment=Deschide sediu
+CloseEtablishment=Închide sediu
 # Dictionary
-DictionaryPublicHolidays=Managementul resurselor umane - Sarbatori oficiale
-DictionaryDepartment=HRM - Lista Departamente
+DictionaryPublicHolidays=Concediu - Sărbători legale
+DictionaryDepartment=HRM - Listă departamente
 DictionaryFunction=HRM - Joburi disponibile
 # Module
-Employees=Angajati
+Employees=Angajaţi
 Employee=Angajat
 NewEmployee=Angajat nou
-ListOfEmployees=Lista angajati
+ListOfEmployees=Lista angajaţilor
diff --git a/htdocs/langs/ro_RO/knowledgemanagement.lang b/htdocs/langs/ro_RO/knowledgemanagement.lang
index d5329400c6c..ae1d27a64c1 100644
--- a/htdocs/langs/ro_RO/knowledgemanagement.lang
+++ b/htdocs/langs/ro_RO/knowledgemanagement.lang
@@ -18,7 +18,7 @@
 #
 
 # Module label 'ModuleKnowledgeManagementName'
-ModuleKnowledgeManagementName = Sistem de management al bazei de cunoştinţe
+ModuleKnowledgeManagementName = Bază de cunoştinţe
 # Module description 'ModuleKnowledgeManagementDesc'
 ModuleKnowledgeManagementDesc=Gestiunea unei Baze de cunoştinţe(KB) sau a unei baze de suport Help-Desk
 
@@ -40,14 +40,14 @@ KnowledgeManagementAboutPage = Pagină despre Managementul bazei de cunoştinţe
 #
 # Sample page
 #
-KnowledgeManagementArea = Managementul bazei de cunoştinţe
+KnowledgeManagementArea = Bază de cunoştinţe
 
 
 #
 # Menu
 #
 MenuKnowledgeRecord = Bază de cunoştinţe
-ListOfArticles = Listă articole
+ListKnowledgeRecord = Listă articole
 NewKnowledgeRecord = Articol nou
 ValidateReply = Validare soluţie
 KnowledgeRecords = Articole
diff --git a/htdocs/langs/ro_RO/languages.lang b/htdocs/langs/ro_RO/languages.lang
index d591539297b..07f01e03c20 100644
--- a/htdocs/langs/ro_RO/languages.lang
+++ b/htdocs/langs/ro_RO/languages.lang
@@ -3,11 +3,12 @@ Language_am_ET=Etiopiană
 Language_ar_AR=Arabă
 Language_ar_EG=Arabă (Egipt)
 Language_ar_SA=Arabă (Arabia Saudită)
+Language_ar_TN=Arabă (Tunisia)
 Language_az_AZ=Azerbaijană
-Language_bn_BD=Bengaleza
+Language_bn_BD=Bengaleză
 Language_bn_IN=Bengală (India)
 Language_bg_BG=Bulgară
-Language_bs_BA=Bosniac
+Language_bs_BA=Bosniacă
 Language_ca_ES=Catalană
 Language_cs_CZ=Cehă
 Language_da_DA=Daneză
@@ -45,7 +46,7 @@ Language_es_UY=Spaniolă (Uruguay)
 Language_es_GT=Spaniolă (Guatemala)
 Language_es_VE=Spaniolă (Venezuela)
 Language_et_EE=Estoniană
-Language_eu_ES=Basc
+Language_eu_ES=Bască
 Language_fa_IR=Persană
 Language_fi_FI=Finlandeză
 Language_fr_BE=Franceză (Belgia)
@@ -57,26 +58,26 @@ Language_fr_FR=Franceză
 Language_fr_GA=Franceză (Gabon)
 Language_fr_NC=Franceză (Noua Caledonie)
 Language_fr_SN=Franceză (Senegal)
-Language_fy_NL=Finlandeza
+Language_fy_NL=Frisiană
 Language_gl_ES=Galeză
 Language_he_IL=Ebraică
 Language_hi_IN=Hindi (India)
-Language_hr_HR=Croat
+Language_hr_HR=Croată
 Language_hu_HU=Maghiară
 Language_id_ID=Indoneziană
 Language_is_IS=Islandeză
 Language_it_IT=Italiană
 Language_it_CH=Italiană (Elveţia)
 Language_ja_JP=Japoneză
-Language_ka_GE=Georgiana
-Language_km_KH=khmeră
+Language_ka_GE=Georgiană
+Language_km_KH=Khmeră
 Language_kn_IN=Kannada
 Language_ko_KR=Coreeană
 Language_lo_LA=Laoţiană
-Language_lt_LT=Lituanian
+Language_lt_LT=Lituaniană
 Language_lv_LV=Letonă
-Language_mk_MK=Macedonean
-Language_mn_MN=mongoleză
+Language_mk_MK=Macedoneană
+Language_mn_MN=Mongolă
 Language_nb_NO=Norvegiană (Bokmål)
 Language_ne_NP=Nepaleză
 Language_nl_BE=Olandeză (Belgia)
@@ -84,6 +85,7 @@ Language_nl_NL=Olandeză
 Language_pl_PL=Poloneză
 Language_pt_BR=Portugheză (Brazilia)
 Language_pt_PT=Portugheză
+Language_ro_MD=Română (Moldova)
 Language_ro_RO=Română
 Language_ru_RU=Rusă
 Language_ru_UA=Rusă (Ucraina)
@@ -93,10 +95,10 @@ Language_sv_SV=Suedeză
 Language_sv_SE=Suedeză
 Language_sq_AL=Albaneză
 Language_sk_SK=Slovacă
-Language_sr_RS=Sarba
+Language_sr_RS=Sârbă
 Language_sw_SW=Swahili
-Language_th_TH=Tailandez
-Language_uk_UA=Ucrainean
+Language_th_TH=Tailandeză
+Language_uk_UA=Ucraineană
 Language_uz_UZ=Uzbecă
 Language_vi_VN=Vietnameză
 Language_zh_CN=Chineză
diff --git a/htdocs/langs/ro_RO/main.lang b/htdocs/langs/ro_RO/main.lang
index 30cb1f67a0c..0a51fc69176 100644
--- a/htdocs/langs/ro_RO/main.lang
+++ b/htdocs/langs/ro_RO/main.lang
@@ -430,6 +430,7 @@ LT1IN=CGST
 LT2IN=SGST
 LT1GC=Procente adiţionale
 VATRate=Cota TVA
+RateOfTaxN=Cota taxei %s
 VATCode=Cod cotă TVA
 VATNPR=Cotă taxă NPR
 DefaultTaxRate=Cotă taxă implicită
@@ -729,6 +730,7 @@ MenuMembers=Membri
 MenuAgendaGoogle=Agendă Google
 MenuTaxesAndSpecialExpenses=Taxe | Cheltuieli speciale
 ThisLimitIsDefinedInSetup=Limită Dolibarr (Menu Home-setup-securitate): %s Kb, PHP limita: %s Kb
+ThisLimitIsDefinedInSetupAt=Limită Dolibarr (Meniu %s): %s Kb, limită PHP (Parametru %s): %s Kb
 NoFileFound=Niciun document încărcat
 CurrentUserLanguage=Limba curentă
 CurrentTheme=Tema curentă
@@ -1072,6 +1074,7 @@ ValidFrom=Valid de la
 ValidUntil=Valid până la
 NoRecordedUsers=Nici un utilizator
 ToClose=De închis
+ToRefuse=De refuzat
 ToProcess=De procesat
 ToApprove=De aprobat
 GlobalOpenedElemView=Vedere globală
@@ -1126,9 +1129,11 @@ UpdateForAllLines=Actualizare pentru toate liniile
 OnHold=În aşteptare
 Civility=Formulă de adresare
 AffectTag=Afectează eticheta
+CreateExternalUser=Creare utilizator extern
 ConfirmAffectTag=Afectare multiplă etichete
 ConfirmAffectTagQuestion=Sigur doriți să afectați etichetele înregistrărilor %s selectat(e)?
 CategTypeNotFound=Nu s-a găsit niciun tip de etichetă pentru tipul de înregistrări
 CopiedToClipboard=Copiat în clipboard
 InformationOnLinkToContract=Această sumă este doar totalul tuturor liniilor contractului. Nici o noțiune de timp nu este luată în considerare.
 ConfirmCancel=Eşti sigur că vrei să anulezi
+EmailMsgID=MsgID email
diff --git a/htdocs/langs/ro_RO/members.lang b/htdocs/langs/ro_RO/members.lang
index 74a686f0539..fbc0417a6d4 100644
--- a/htdocs/langs/ro_RO/members.lang
+++ b/htdocs/langs/ro_RO/members.lang
@@ -213,3 +213,5 @@ SendReminderForExpiredSubscription=Trimite un remainder pe email membrilor când
 MembershipPaid=Adeziune plătită pentru perioada curentă (până la %s)
 YouMayFindYourInvoiceInThisEmail=Găseşti factura ta atașată acestui email
 XMembersClosed=%s membru(i) închis
+XExternalUserCreated=%s utilizator(i) externi creaţi
+ForceMemberNature=Impune natura membrului (Persoană fizică sau Presoană juridică)
diff --git a/htdocs/langs/ro_RO/modulebuilder.lang b/htdocs/langs/ro_RO/modulebuilder.lang
index a9a43243114..cbcfd1e97f0 100644
--- a/htdocs/langs/ro_RO/modulebuilder.lang
+++ b/htdocs/langs/ro_RO/modulebuilder.lang
@@ -143,3 +143,4 @@ AsciiToHtmlConverter=Convertor ASCII la HTML
 AsciiToPdfConverter=Convertor ASCII la PDF
 TableNotEmptyDropCanceled=Tabelul nu este gol. Operaţiunea de drop a fost anulată. 
 ModuleBuilderNotAllowed=Generatorul de module este disponibil, dar nu-ţi este permis să-l utilizezi.
+ImportExportProfiles=Profile import şi export
diff --git a/htdocs/langs/ro_RO/mrp.lang b/htdocs/langs/ro_RO/mrp.lang
index 7e8c774e52d..07382ca99c9 100644
--- a/htdocs/langs/ro_RO/mrp.lang
+++ b/htdocs/langs/ro_RO/mrp.lang
@@ -6,32 +6,32 @@ MRPArea=Producţie
 MrpSetupPage=Configurare modul MRP
 MenuBOM=Bonuri de consum
 LatestBOMModified=Ultimele %s bonuri de consum modificate
-LatestMOModified=Ultimele %s Comenzi de producţie modificate
+LatestMOModified=Ultimele %s comenzi de producţie modificate
 Bom=Bonuri de consum
 BillOfMaterials=Bon de consum
 BOMsSetup=Configurarea modulului BOM 
 ListOfBOMs=Listă bonuri de consum - BOM
 ListOfManufacturingOrders=Listă comenzi de producţie
 NewBOM=Bon de consum nou
-ProductBOMHelp=Produs de fabricat cu acest bon de consum.<br>Notă: Produsele cu proprietatea 'Natură produs' = 'Materie primă' nu sunt vizibile în această listă.
+ProductBOMHelp=Produs de creat (sau dezasamblat) cu această listă de materiale.<br> Notă: Produsele cu proprietatea 'Natură produs' = 'Materie primă' nu sunt vizibile în această listă.
 BOMsNumberingModules=Şabloane numerotare BOM
 BOMsModelModule=Şabloane documente BOM
 MOsNumberingModules=Şabloane numerotare Comenzi de producţie
 MOsModelModule=Şabloane document Comandă de producţie
 FreeLegalTextOnBOMs=Text liber pe documentul Bon de consum
-WatermarkOnDraftBOMs=Marcare schiţă Bon de consum BOM
+WatermarkOnDraftBOMs=Watermark pe schiţă Bon de consum BOM
 FreeLegalTextOnMOs=Text liber pe documentul Comandă de producţie
-WatermarkOnDraftMOs=Macaj pe schiţă Comandă de producţie
-ConfirmCloneBillOfMaterials=Eşti sigur că vrei să clonezi bonul de consum %s ?
+WatermarkOnDraftMOs=Watermark pe schiţă Comandă de producţie
+ConfirmCloneBillOfMaterials=Eşti sigur că vrei să clonezi bonul de consum %s?
 ConfirmCloneMo=Eşti sigur că vrei să clonezi Comanda de producţie %s ?
 ManufacturingEfficiency=Eficienţa producţiei
 ConsumptionEfficiency=Eficienţa consumului
 ValueOfMeansLoss=Valoarea de 0,95 înseamnă o medie de 5 %% pierderi în timpul producției 
 ValueOfMeansLossForProductProduced= Valoarea de 0,95 înseamnă o medie de 5 %% pierdere din produsul fabricat
-DeleteBillOfMaterials=Şterge Bonuri de consum
-DeleteMo=Şterge comanda de producţie
-ConfirmDeleteBillOfMaterials=Eşti sigur că vrei să ştergi acest Bon de consum?
-ConfirmDeleteMo=Eşti sigur că vrei să ştergi acest Bon de consum?
+DeleteBillOfMaterials=Şterge bonuri de consum
+DeleteMo=Şterge comandă de producţie
+ConfirmDeleteBillOfMaterials=Eşti sigur că vrei să ştergi acest bon de consum?
+ConfirmDeleteMo=Eşti sigur că vrei să ştergi acest bon de consum?
 MenuMRP=Comenzi de producţie
 NewMO=Comandă de producţie nouă
 QtyToProduce=Cantitate de fabricat
@@ -39,7 +39,7 @@ DateStartPlannedMo=Data de începere planificată
 DateEndPlannedMo=Dată de finalizare planificată
 KeepEmptyForAsap=Necompletat înseamnă 'Cât mai repede posibil' 
 EstimatedDuration=Durată estimată
-EstimatedDurationDesc=Durata estimată de fabricație a acestui produs pe baza acestui Bon de consum 
+EstimatedDurationDesc=Durata estimată pentru fabricarea (sau dezasamblarea) acestui produs utilizând acest bon de consum
 ConfirmValidateBom=Sunteți sigur că doriți să validați Bonul de consum cu referința <strong>%s</strong> (îl veți putea folosi pentru a genera noi Comenzi de fabricație)
 ConfirmCloseBom=Sunteți sigur că doriți să anulați acest Bon de consum (nu îl veți mai putea folosi pentru a genera noi Comenzi de fabricație) ? 
 ConfirmReopenBom=Sunteți sigur că doriți să redeschideți acest Bon de consum (îl veți putea folosi pentru a genera noi Comenzi de fabricație)
@@ -63,13 +63,14 @@ ConsumeAndProduceAll=Consumă sau Produce tot
 Manufactured=Fabricat
 TheProductXIsAlreadyTheProductToProduce= Produsul de adăugat este deja produsul de fabricat.
 ForAQuantityOf=Pentru o cantitate de fabricat din %s
+ForAQuantityToConsumeOf=Pentru o cantitate de dezasamblat din %s
 ConfirmValidateMo=Eşti sigur că vrei să validezi această Comandă de producţie?
 ConfirmProductionDesc=Făcând clic pe '%s', veți valida consumul și/sau producția pentru cantitățile stabilite. Acest lucru va actualiza, de asemenea, stocurile și vor înregistra mișcările de stoc. 
 ProductionForRef=Producţia a %s
 AutoCloseMO=Închidere automată Comandă de fabricație dacă se ating cantitățile de consumat și de fabricat
 NoStockChangeOnServices=Fără modificări de stoc pentru servicii
 ProductQtyToConsumeByMO=Cantitatea de produs rămasă de consumat pe Comanda de fabricaţie deschisă
-ProductQtyToProduceByMO=cantitatea de produs rămasă de fabricat pe Comanda de fabricaţie
+ProductQtyToProduceByMO=Cantitatea de produs de fabricat din comenzile de producţie deschise
 AddNewConsumeLines=Adaugă o linie de consum
 ProductsToConsume=Produse de consumat
 ProductsToProduce=Produse de fabricat
@@ -83,22 +84,20 @@ Workstations=Staţii de lucru
 WorkstationsDescription=Management staţii de lucru
 WorkstationSetup = Configurare staţii de lucru
 WorkstationSetupPage = Pagină setup Staţii de lucru
-WorkstationAbout = Despre Staţie de lucru
-WorkstationAboutPage = Pagină Despre Staţii de lucru
 WorkstationList=Listă staţii de lucru
 WorkstationCreate=Adăugare staţie de lucru nouă
 ConfirmEnableWorkstation=Eşti sigur că vrei să activezi staţia de lucru <b>%s</b> ?
 EnableAWorkstation=Activare staţie de lucru
 ConfirmDisableWorkstation=Eşti sigur că vrei să dezactivezi staţia de lucru <b>%s</b> ?
 DisableAWorkstation=Dezactivare staţie de lucru
-DeleteWorkstation=Ştergere
+DeleteWorkstation=Şterge
 NbOperatorsRequired=Nr. de operatori necesar
 THMOperatorEstimated=Total ore minute estimat per operator
 THMMachineEstimated=Total ore minute estimat per maşină
 WorkstationType=Tip staţie de lucru
-Human=Uman
+Human=Personal uman
 Machine=Maşină
-HumanMachine=Uman / Maşină
+HumanMachine=Personal / Maşină
 WorkstationArea=Staţii de lucru
 Machines=Maşini
 THMEstimatedHelp=Această rată face posibilă definirea unui cost prognozat al articolului
diff --git a/htdocs/langs/ro_RO/opensurvey.lang b/htdocs/langs/ro_RO/opensurvey.lang
index 25a9479092e..135ac15f7ff 100644
--- a/htdocs/langs/ro_RO/opensurvey.lang
+++ b/htdocs/langs/ro_RO/opensurvey.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - opensurvey
-Survey=Sondaj
+Survey=Sondaje
 Surveys=Sondaje
-OrganizeYourMeetingEasily=Organizați-vă ușor întâlnirile și chestionarele. Mai întâi selectați tipul de sondaj...
+OrganizeYourMeetingEasily=Organizați-vă mai ușor întâlnirile și dezbaterile prin sondaje. Mai întâi selectați tipul de sondaj...
 NewSurvey=Sondaj nou
 OpenSurveyArea=Sondaje
 AddACommentForPoll=Puteţi adăuga un comentariu în sondaj...
@@ -11,51 +11,51 @@ PollTitle=Titlu sondaj
 ToReceiveEMailForEachVote=Primeşte unui email pentru fiecare vot
 TypeDate=Tip dată
 TypeClassic=Tip standard
-OpenSurveyStep2=Selectați datele dvs. printre zilele libere (gri). Zilele selectate sunt verzi. Puteți să deselectați o zi selectată anterior făcând clic din nou pe ea
+OpenSurveyStep2=Selectați datele printre zilele libere (gri). Zilele selectate sunt verzi. Puteți să deselectați o zi selectată anterior făcând un nou clic pe ea
 RemoveAllDays=Elimină toate zilele
-CopyHoursOfFirstDay=Copiază orelele ale primei zile
+CopyHoursOfFirstDay=Copiază orelele primei zile
 RemoveAllHours=Elimină toate orele
 SelectedDays=Zile selectate
-TheBestChoice=CEa mai bună alegere curentă este
-TheBestChoices=Cea mai bună alegere curentă are
+TheBestChoice=Cea mai bună alegere până acum este
+TheBestChoices=Cea mai bună alegere până acum are
 with=cu
-OpenSurveyHowTo=Dacă sunteți de acord să votaţi în acest sondaj, va trebui să vă dați numele, să alegeți valorile ce se potrivesc cel mai bine pentru dvs și să validați cu butonul plus, de la capătul liniei.
-CommentsOfVoters=Comentariul voturilor
-ConfirmRemovalOfPoll=Sunteţi sigur că doriţi să înlăturaţi acest sondaj ( şi toate voturile)
+OpenSurveyHowTo=Dacă sunteți de acord să votaţi în acest sondaj, va trebui să vă dați numele, să alegeți valorile ce se potrivesc cel mai bine și să validați cu butonul plus, de la capătul liniei.
+CommentsOfVoters=Comentariile votanţilor
+ConfirmRemovalOfPoll=Sunteţi sigur că doriţi să înlăturaţi acest sondaj (şi toate voturile)
 RemovePoll=Înlătură sondajul
-UrlForSurvey=URL-ul pentru comunicare să obțină acces direct la sondaj
-PollOnChoice=Dvs. creaţi un sondaj pentru a face un sondaj multi-alegere . Introduceți mai întâi toate opțiunile posibile pentru sondajul dvs:
-CreateSurveyDate=Creare sondaj  date 
+UrlForSurvey=URL-ul care trebuie comunicat pentru accesul direct la sondaj
+PollOnChoice=Creezi un sondaj multi-opţiune. Introdu mai întâi toate opțiunile posibile pentru sondajul tău:
+CreateSurveyDate=Creare sondaj date 
 CreateSurveyStandard=Creare sondaj standard
-CheckBox=Simplu checkbox
+CheckBox=Checkbox simplu
 YesNoList=Listă (goală/da/nu)
 PourContreList=Listă (goală/pentru/impotrivă)
 AddNewColumn=Adaugă coloană nouă
-TitleChoice=Etichetă Alegere
-ExportSpreadsheet=Exportă rezultatul în foaie de calcul
+TitleChoice=Etichetă opţiune
+ExportSpreadsheet=Exportă rezultatul într-o foaie de calcul
 ExpireDate=Data limită
-NbOfSurveys=Numărul sondajelor
-NbOfVoters=Numărul de alegători
+NbOfSurveys=Număr sondaje
+NbOfVoters=Numărul de votanţi
 SurveyResults=Rezultate
-PollAdminDesc=Vi se permite să schimbaţi toate liniile de vot ale acestui sondaj cu butonul "Editează". Puteți, de asemenea, elimina o coloană sau o linie cu %s. Puteți adăuga, de asemenea, o nouă coloană cu %s.
-5MoreChoices=Mai mult de 5 alegeri
+PollAdminDesc=Vi se permite să schimbaţi toate voturile ale acestui sondaj cu butonul "Editează". Puteți, de asemenea, elimina o coloană sau o linie cu %s. Puteți adăuga, de asemenea, o nouă coloană cu %s.
+5MoreChoices=Mai mult de 5 opţiuni
 Against=Împotrivă
-YouAreInivitedToVote=Sunteţi invitaţi să votaţi acest sondaj
-VoteNameAlreadyExists=Acest nume a fost deasemenea folosit pentru acest sondaj
+YouAreInivitedToVote=Eşti invitat să votezi acest sondaj
+VoteNameAlreadyExists=Acest nume a fost de asemenea folosit pentru acest sondaj
 AddADate=Adaugă o dată
 AddStartHour=Adaugă o oră de start
 AddEndHour=Adaugă o oră de final
-votes=vot( uri)
-NoCommentYet=Niciun comentariu nu a fost postat încă pentru acest sondaj
+votes=vot(uri)
+NoCommentYet=Niciun comentariu nu a fost postat încă pe acest sondaj
 CanComment=Votanţii pot comenta in sondaj
 CanSeeOthersVote=Votanţii pot vedea votul celorlarţi
-SelectDayDesc=Pentru fiecare zi selectată puteți alege sau nu orele de întâlnire în următorul format: <br> - gol, <br> - "8h", "8H" sau "8:00" pentru a da ora de începere a întâlnirii, <br> - "8-11", "8h-11h", "8H-11H"  sau "8:00-11:00", pentru a da o īncepere și o oră de īntālnire, <br> - "8h15-11h15", "8H15-11H15" or "8:15-11:15" pentru același lucru, dar cu minute.
+SelectDayDesc=Pentru fiecare zi selectată puteți alege sau nu, orele de întâlnire în următorul format: <br> - gol, <br> - "8h", "8H" sau "8:00" pentru a da ora de începere a întâlnirii, <br> - "8-11", "8h-11h", "8H-11H"  sau "8:00-11:00", pentru a da o īncepere și o oră de īntālnire, <br> - "8h15-11h15", "8H15-11H15" sau "8:15-11:15" pentru același lucru, dar cu minute.
 BackToCurrentMonth=Înapoi la luna curentă
-ErrorOpenSurveyFillFirstSection=Nu ati completat prima secțiune a creării sondaj
-ErrorOpenSurveyOneChoice=Introduceţi cel puţin o alegere
-ErrorInsertingComment=Era o eroare când se insera comentariul dvs.
+ErrorOpenSurveyFillFirstSection=Nu aţi completat prima secțiune de creare a sondajului
+ErrorOpenSurveyOneChoice=Introdu cel puţin o opţiune
+ErrorInsertingComment=A apărut o eroare la salvarea comentariului tău.
 MoreChoices=Introdu mai multe opţiuni pentru votanţi
-SurveyExpiredInfo=Sondaj de opinie închis sau termen pentru vot expirat.
-EmailSomeoneVoted=%sa completat o linie.\nPuteţi găsi sondajul dvs. la linkul: \n%s
+SurveyExpiredInfo=Sondaj de opinie închis sau termen pentru votare expirat.
+EmailSomeoneVoted=%s a votat.\nPoţi accesa sondajul tău la linkul: \n%s
 ShowSurvey=Afișați sondajul
-UserMustBeSameThanUserUsedToVote=Trebuie să fi votat și să utilizați același nume de utilizator ca cel folosit pentru votare, pentru a posta un comentariu
+UserMustBeSameThanUserUsedToVote=Trebuie să fi votat și să foloseşti același nume de utilizator ca cel folosit pentru votare, pentru a posta un comentariu
diff --git a/htdocs/langs/ro_RO/orders.lang b/htdocs/langs/ro_RO/orders.lang
index 70f60db5b53..bc344e4bc56 100644
--- a/htdocs/langs/ro_RO/orders.lang
+++ b/htdocs/langs/ro_RO/orders.lang
@@ -11,6 +11,7 @@ OrderDate=Dată comandă
 OrderDateShort=Data comandă
 OrderToProcess=Comandă de procesat
 NewOrder=Comandă nouă
+NewSupplierOrderShort=Comandă nouă
 NewOrderSupplier=Comandă de achiziţie nouă
 ToOrder=Plasează comanda
 MakeOrder=Plasează comanda
@@ -73,6 +74,7 @@ DeleteOrder=Ştergere comadă
 CancelOrder=Anulare comandă
 OrderReopened= Comanda %s a fost redeschisă
 AddOrder=Creare comandă
+AddSupplierOrderShort=Creare comandă
 AddPurchaseOrder=Creare comandă de achiziţie
 AddToDraftOrders=Adaugă la comanda schiţă
 ShowOrder=Afişare comandă
diff --git a/htdocs/langs/ro_RO/other.lang b/htdocs/langs/ro_RO/other.lang
index 0db2335cdb0..4bf62e88792 100644
--- a/htdocs/langs/ro_RO/other.lang
+++ b/htdocs/langs/ro_RO/other.lang
@@ -129,6 +129,7 @@ ClosedByLogin=Utilizatorul care a închis
 FileWasRemoved=Fişier %s a fost şters
 DirWasRemoved=Directorul %s a fost şters
 FeatureNotYetAvailable=Caracteristică care nu este încă disponibilă în versiunea curentă
+FeatureNotAvailableOnDevicesWithoutMouse=Caracteristică indisponibilă pe dispozitivele fără mouse
 FeaturesSupported=Caracteristici disponibile
 Width=Lăţime
 Height=Înălţime
@@ -263,7 +264,7 @@ ContactCreatedByEmailCollector=Contact/adresă creată de colectorul de email-ur
 ProjectCreatedByEmailCollector=Proiect creat de colectorul de email-uri din email-ul cu MSGID %s
 TicketCreatedByEmailCollector=Tichet creat de colectorul de email-uri din email-ul cu MSGID %s
 OpeningHoursFormatDesc=Foloseşte un - pentru a separa orele de lucru.<br>Foloseşte un spaţiu pentru a introduce intervale oarare diferite.<br>Exemplu: 8-12 14-18
-PrefixSession=Prefix pentru ID-ul sesiunii
+SuffixSessionName=Sufix pentru numele sesiunii
 
 ##### Export #####
 ExportsArea=Export date
diff --git a/htdocs/langs/ro_RO/partnership.lang b/htdocs/langs/ro_RO/partnership.lang
index 8431c0344e3..fe6bb54fe3c 100644
--- a/htdocs/langs/ro_RO/partnership.lang
+++ b/htdocs/langs/ro_RO/partnership.lang
@@ -16,41 +16,72 @@
 #
 # Generic
 #
-ModulePartnershipName = Managementul parteneriatelor
-PartnershipDescription = Modul Management parteneriate
+ModulePartnershipName=Parteneriate
+PartnershipDescription=Modul Management parteneriate
 PartnershipDescriptionLong= Modul Management parteneriate
 
+AddPartnership=Adăugare parteneriat
+CancelPartnershipForExpiredMembers=Parteneriat: Anulează parteneriatul membrilor cu adeziuni expirate
+PartnershipCheckBacklink=Parteneriat: Verificare backlink de referinţă
+
 #
 # Menu
 #
-NewPartnership = Parteneriat nou
-ListOfPartnerships = Listă parteneriate
+NewPartnership=Parteneriat nou
+ListOfPartnerships=Listă parteneriate
 
 #
 # Admin page
 #
-PartnershipSetup = Setare parteneriat
-PartnershipAbout = Despre modulul Parteneriate
-PartnershipAboutPage = Pagină despre modulul Parteneriate
-
+PartnershipSetup=Setare parteneriat
+PartnershipAbout=Despre modulul Parteneriate
+PartnershipAboutPage=Pagină despre modulul Parteneriate
+partnershipforthirdpartyormember=Status-ul de partener trebuie setat pe un 'terţ' sau un 'membru'
+PARTNERSHIP_IS_MANAGED_FOR=Parteneriat gestionat pentru
+PARTNERSHIP_BACKLINKS_TO_CHECK=Backlink-uri de verificat
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nr de zile înainte de anularea unui parteneriat când un abonament a expirat 
+ReferingWebsiteCheck=Verificare referinţă website
+ReferingWebsiteCheckDesc=Poți activa o funcție pentru a verifica dacă partenerii tăi au adăugat un backlink către site-ul tău pe website-urile lor.\n 
 
 #
 # Object
 #
+DeletePartnership=Şterge parteneriat
+PartnershipDedicatedToThisThirdParty=Parteneriat alocat acestui terț
+PartnershipDedicatedToThisMember=Parteneriat alocat acestui membru
 DatePartnershipStart=Dată începere
 DatePartnershipEnd=Dată încetare
+ReasonDecline=Motiv respingere
+ReasonDeclineOrCancel=Motiv respingere
+PartnershipAlreadyExist=Parteneriatul există deja
+ManagePartnership=Administrare parteneriat
+BacklinkNotFoundOnPartnerWebsite=Backlink-ul nu a fost găsit pe site-ul partenerului
+ConfirmClosePartnershipAsk=Sigur vrei să anulezi acest parteneriat?
+PartnershipType=Tip parteneriat
 
 #
 # Template Mail
 #
+SendingEmailOnPartnershipWillSoonBeCanceled=Parteneriatul va fi anulat în curând
+SendingEmailOnPartnershipRefused=Parteneriat refuzat
+SendingEmailOnPartnershipAccepted=Parteneriat acceptat
+SendingEmailOnPartnershipCanceled=Parteneriat anulat
 
+YourPartnershipWillSoonBeCanceledTopic=Parteneriatul va fi anulat în curând
+YourPartnershipRefusedTopic=Parteneriat refuzat
+YourPartnershipAcceptedTopic=Parteneriat acceptat
+YourPartnershipCanceledTopic=Parteneriat anulat
+
+YourPartnershipWillSoonBeCanceledContent=Vă informăm că parteneriatul dvs. va fi anulat în curând (Backlink-ul nu a fost găsit)
+YourPartnershipRefusedContent=Vă informăm că solicitarea dvs. de parteneriat a fost respinsă.
+YourPartnershipAcceptedContent=Vă informăm că parteneriatul a fost acceptat.
+YourPartnershipCanceledContent=Vă informăm că parteneriatul dvs. a fost anulat. 
 
 #
 # Status
 #
-PartnershipDraft = Schiţă
-PartnershipAccepted = Acceptat
-PartnershipRefused = Refuzat
-PartnershipCanceled = Anulat
-
+PartnershipDraft=Schiţă
+PartnershipAccepted=Acceptat
+PartnershipRefused=Refuzat
+PartnershipCanceled=Anulat
 PartnershipManagedFor=Partenerii sunt
diff --git a/htdocs/langs/ro_RO/productbatch.lang b/htdocs/langs/ro_RO/productbatch.lang
index 9492b27ef33..ae2c31ba05d 100644
--- a/htdocs/langs/ro_RO/productbatch.lang
+++ b/htdocs/langs/ro_RO/productbatch.lang
@@ -1,4 +1,4 @@
-# ProductBATCH language file - en_US - ProductBATCH
+# ProductBATCH language file - Source file is en_US - ProductBATCH
 ManageLotSerial=Foloseşte lot / număr de serie
 ProductStatusOnBatch=Da (lot necesar)
 ProductStatusOnSerial=Da (este necesar un număr de serie unic)
@@ -33,3 +33,13 @@ CustomMasks=Adaugă o opţiune pentru definire mască în fişa produsului
 LotProductTooltip=Adaugă o opțiune în fişa de produs pentru a defini o mască dedicată numărului de lot
 SNProductTooltip=Adaugă o opțiune în fişa de produs pentru a defini o mască dedicată numărului de serie
 QtyToAddAfterBarcodeScan=Cantitate de adăugat pentru fiecare cod de bare/lot/serie scanată
+LifeTime=Durata de viață (în zile)
+EndOfLife=Sfârşitul duratei de viaţă
+ManufacturingDate=Data de producţie
+DestructionDate=Data distrugerii
+FirstUseDate=Data primei utilizări
+QCFrequency=Frecvenţa controlului de calitate (în zile)
+
+#Traceability - qc status
+OutOfOrder=Indisponibil
+InWorkingOrder=În stare de funcționare
diff --git a/htdocs/langs/ro_RO/products.lang b/htdocs/langs/ro_RO/products.lang
index 7623c896304..cf419fa65f5 100644
--- a/htdocs/langs/ro_RO/products.lang
+++ b/htdocs/langs/ro_RO/products.lang
@@ -396,3 +396,5 @@ ActionAvailableOnVariantProductOnly=Acțiune disponibilă numai pentru varianta
 ProductsPricePerCustomer=Preţuri produs per clienţi
 ProductSupplierExtraFields=Atribute suplimentare (Preţuri furnizor)
 DeleteLinkedProduct=Ștergeți produsul copil asociat la combinație
+PMPValue=PMP
+PMPValueShort=PMP
diff --git a/htdocs/langs/ro_RO/projects.lang b/htdocs/langs/ro_RO/projects.lang
index b0e5d46b2c6..8aadd424331 100644
--- a/htdocs/langs/ro_RO/projects.lang
+++ b/htdocs/langs/ro_RO/projects.lang
@@ -267,9 +267,11 @@ InvoiceToUse=Şablon factură de utilizat
 NewInvoice=Factură nouă
 OneLinePerTask=O linie per task
 OneLinePerPeriod=O linie per perioadă
+OneLinePerTimeSpentLine=O linie pentru fiecare timp consumat
 RefTaskParent=Ref. Task Părinte
 ProfitIsCalculatedWith=Profitul este calculat utilizând
 AddPersonToTask=Adaugă și la task-uri
 UsageOrganizeEvent=Utilizare: Organizare eveniment
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Clasificați proiectul ca închis când toate task-urile sale sunt finalizate (100%% progres)
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Notă: proiectele existente cu toate task-urile la 100 %% progres nu vor fi afectate: va trebui să le închideți manual. Această opțiune afectează doar proiectele deschise.
+SelectLinesOfTimeSpentToInvoice=Selectează linii de timp consumat care nu sunt facturate, apoi iniţiază acțiunea în bloc "Generare factură" pentru a le factura
diff --git a/htdocs/langs/ro_RO/receptions.lang b/htdocs/langs/ro_RO/receptions.lang
index 0f3ec29be18..53140cc9beb 100644
--- a/htdocs/langs/ro_RO/receptions.lang
+++ b/htdocs/langs/ro_RO/receptions.lang
@@ -2,46 +2,46 @@
 ReceptionsSetup=Setare Recepţie produse
 RefReception=Ref. recepţie
 Reception=Recepţie
-Receptions=Receptii
+Receptions=Recepţii
 AllReceptions=Toate recepțiile
 Reception=Recepţie
-Receptions=Receptii
-ShowReception=Afișați recepțiile
+Receptions=Recepţii
+ShowReception=Afișare recepții
 ReceptionsArea=Zona de recepție
-ListOfReceptions=Lista de recepții
-ReceptionMethod=Metoda recepției
-LastReceptions=Ultimele %srecepții 
+ListOfReceptions=Listă de recepții
+ReceptionMethod=Metoda de recepție
+LastReceptions=Ultimele %s recepții 
 StatisticsOfReceptions=Statistici pentru recepții
-NbOfReceptions=Numărul de recepții
-NumberOfReceptionsByMonth=Numărul de recepții pe lună
-ReceptionCard=Carte de recepție
+NbOfReceptions=Număr de recepții
+NumberOfReceptionsByMonth=Număr de recepții pe lună
+ReceptionCard=Fişă recepție
 NewReception=Recepție nouă
-CreateReception=Creați recepția
+CreateReception=Creare recepție
 QtyInOtherReceptions=Cantitate în alte recepții
 OtherReceptionsForSameOrder=Alte recepții pentru această comandă
-ReceptionsAndReceivingForSameOrder=Recepții și chitanțe pentru această comandă
-ReceptionsToValidate=Recepții pentru validare
-StatusReceptionCanceled=Anulata
-StatusReceptionDraft=Draft
-StatusReceptionValidated=Validată (produse  de livrat sau deja livrate)
+ReceptionsAndReceivingForSameOrder=Recepții și avize pentru această comandă
+ReceptionsToValidate=Recepții de validat
+StatusReceptionCanceled=Anulată
+StatusReceptionDraft=Schiţă
+StatusReceptionValidated=Validată (produse de livrat sau deja livrate)
 StatusReceptionProcessed=Procesate
-StatusReceptionDraftShort=Draft
+StatusReceptionDraftShort=Schiţă
 StatusReceptionValidatedShort=Validată
 StatusReceptionProcessedShort=Procesate
-ReceptionSheet=Foaie de recepție
+ReceptionSheet=Notă de recepție
 ConfirmDeleteReception=Sigur doriți să ștergeți această recepție?
-ConfirmValidateReception=Sigur doriți să validați această recepție cu referința <b> %s </b>?
+ConfirmValidateReception=Sigur doriți să validați această recepție cu referința <b> %s</b>?
 ConfirmCancelReception=Sigur doriți să anulați această recepție?
-StatsOnReceptionsOnlyValidated=Statisticile efectuate pe recepții doar validate. Data folosită este data validării recepției (data livrării planificată nu este întotdeauna cunoscută).
+StatsOnReceptionsOnlyValidated=Statisticile sunt efectuate doar pe recepțiile validate. Data folosită este data validării recepției (data planificată de livrare  nu este întotdeauna cunoscută).
 SendReceptionByEMail=Trimiteți recepția prin email
 SendReceptionRef=Predarea recepției %s
 ActionsOnReception=Evenimente la recepție
-ReceptionCreationIsDoneFromOrder=Pentru moment, crearea unei noi recepții se face din cardul de comandă.
-ReceptionLine=Linia de recepție
-ProductQtyInReceptionAlreadySent=Cantitatea de produse din comanda deschisă deja trimisă
-ProductQtyInSuppliersReceptionAlreadyRecevied=Cantitatea de produse din comanda furnizor deschisă deja primită
-ValidateOrderFirstBeforeReception=Mai întâi trebuie să validezi comanda înainte de a putea face recepții.
+ReceptionCreationIsDoneFromOrder=Pentru moment, crearea unei noi recepții se face din fişa de comandă.
+ReceptionLine=Linie de recepție
+ProductQtyInReceptionAlreadySent=Cantitatea de produse din comanda deschisă este deja trimisă
+ProductQtyInSuppliersReceptionAlreadyRecevied=Cantitatea de produse din comanda de achiziţie deschisă a fost deja primită
+ValidateOrderFirstBeforeReception=Mai întâi trebuie să validezi comanda de achiziţie înainte de a putea face recepții.
 ReceptionsNumberingModules=Mod de numerotare pentru recepţii 
 ReceptionsReceiptModel=Şabloane documente pentru recepţii
 NoMorePredefinedProductToDispatch=Nu mai sunt produse predefinite pentru expediere
-
+ReceptionExist=O recepţie există
diff --git a/htdocs/langs/ro_RO/stocks.lang b/htdocs/langs/ro_RO/stocks.lang
index 66edf3c4761..d56ac17626c 100644
--- a/htdocs/langs/ro_RO/stocks.lang
+++ b/htdocs/langs/ro_RO/stocks.lang
@@ -56,8 +56,6 @@ UnitPurchaseValue=Preţ de achiziţie unitar
 StockTooLow=Stoc insuficient
 StockLowerThanLimit=Stoc mai mic decât limita de alertă (%s)
 EnhancedValue=Valoare
-PMPValue=PMP
-PMPValueShort=WAP
 EnhancedValueOfWarehouses=Stoc valoric
 UserWarehouseAutoCreate=Creați automat un depozit utilizator atunci când creați un utilizator
 AllowAddLimitStockByWarehouse=Gestionează, de asemenea, valoarea pentru stocul minim și cel dorit pe perechi (produs-depozit), pe lângă valoarea pentru stocul minim și stoc dorit pe produs
@@ -251,7 +249,10 @@ SelectAStockMovementFileToImport=selectează un fişier cu mişcări de stoc pen
 InfoTemplateImport=Fișierul încărcat trebuie să aibă acest format (* sunt câmpuri obligatorii):<br> Depozit sursă* | Depozit țintă* | Produs* | Cantitate* | Număr lot/serie <br>Separatorul de caractere CSV trebuie să fie "<b>%s</b>"
 LabelOfInventoryMovemement=Inventar %s
 ReOpen=Redeschide
-ConfirmFinish=Confirmi închiderea inventarului? Aceasta va genera toate mișcările stocului pentru actualizare.
+ConfirmFinish=Confirmați închiderea inventarului? Aceasta va genera toate mișcările stocului pentru a vă actualiza stocul la cantitatea reală pe care ați introdus-o în inventar.
 ObjectNotFound=%s nu a fost găsit
 MakeMovementsAndClose=Generează mişcări şi închide
 AutofillWithExpected=Completează cantitatea reală cu cantitatea așteptată
+ShowAllBatchByDefault=În mod prestabilit, afișează detaliile lotului în fila "stoc" a produsului
+CollapseBatchDetailHelp=Poţi seta afișarea implicită a detaliilor lotului în configurația modulului stocuri
+FieldCannotBeNegative=Câmpul  "%s" nu poate fi negativ
diff --git a/htdocs/langs/ro_RO/ticket.lang b/htdocs/langs/ro_RO/ticket.lang
index ba08e876e88..09ac2c0152c 100644
--- a/htdocs/langs/ro_RO/ticket.lang
+++ b/htdocs/langs/ro_RO/ticket.lang
@@ -151,7 +151,7 @@ MessageListViewType=Afişare listă ca tabel
 #
 # Ticket card
 #
-Ticket=Tichet
+Ticket=Tichete
 TicketCard=Fişă tichet
 CreateTicket=Creare tichet
 EditTicket=Editare tichet
@@ -304,7 +304,7 @@ BoxLastModifiedTicket=Ultimele tichete modificate
 BoxLastModifiedTicketDescription=Ultimele %s tichet modificate 
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=Nu există tichete modificate recent
-BoxTicketType=Număr tichete deschise după tip
+BoxTicketType=Distribuţia tichetelor deschise după tip
 BoxTicketSeverity=Număr tichete deschise după severitate
 BoxNoTicketSeverity=Nr. tichete deschise
 BoxTicketLastXDays=Numărul de tichete noi după zile din ultimele %s zile
diff --git a/htdocs/langs/ru_RU/accountancy.lang b/htdocs/langs/ru_RU/accountancy.lang
index bd4f1b960cd..01820557ec7 100644
--- a/htdocs/langs/ru_RU/accountancy.lang
+++ b/htdocs/langs/ru_RU/accountancy.lang
@@ -10,421 +10,424 @@ ACCOUNTING_EXPORT_AMOUNT=Объем экспорта
 ACCOUNTING_EXPORT_DEVISE=Валюта экспорта
 Selectformat=Выберите формат для файла
 ACCOUNTING_EXPORT_FORMAT=Select the format for the file
-ACCOUNTING_EXPORT_ENDLINE=Select the carriage return type
+ACCOUNTING_EXPORT_ENDLINE=Выберите тип возврата каретки
 ACCOUNTING_EXPORT_PREFIX_SPEC=Укажите префикс для имени файла
 ThisService=Эта услуга
 ThisProduct=Этот продукт
 DefaultForService=По умолчанию для услуги
 DefaultForProduct=По умолчанию для товара
-ProductForThisThirdparty=Product for this thirdparty
-ServiceForThisThirdparty=Service for this thirdparty
-CantSuggest=Can't suggest
+ProductForThisThirdparty=Продукт для этой третьей стороны
+ServiceForThisThirdparty=Сервис для этой третьей стороны
+CantSuggest=Не могу предложить
 AccountancySetupDoneFromAccountancyMenu=Больше настроек бухгалтерии выполняется из меню %s
-ConfigAccountingExpert=Configuration of the module accounting (double entry)
+ConfigAccountingExpert=Настройка модуля учета (двойная запись)
 Journalization=Журналирование
 Journals=Журналы
 JournalFinancial=Финансовые журналы
 BackToChartofaccounts=Получаемый график счетов
 Chartofaccounts=Схема учётных записей
-ChartOfSubaccounts=Chart of individual accounts
-ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
-CurrentDedicatedAccountingAccount=Current dedicated account
-AssignDedicatedAccountingAccount=New account to assign
-InvoiceLabel=Invoice label
+ChartOfSubaccounts=План индивидуальных счетов
+ChartOfIndividualAccountsOfSubsidiaryLedger=План индивидуальных счетов вспомогательной книги
+CurrentDedicatedAccountingAccount=Текущий выделенный аккаунт
+AssignDedicatedAccountingAccount=Новая учетная запись для назначения
+InvoiceLabel=Наклейка счета
 OverviewOfAmountOfLinesNotBound=Обзор количества строк, не привязанных к учётному счёту
 OverviewOfAmountOfLinesBound=Обзор количества строк, привязанных к учётному счёту
 OtherInfo=Дополнительная информация
 DeleteCptCategory=Удалить учётный счёт из группы
 ConfirmDeleteCptCategory=Вы действительно хотите удалить этот учетный счет из группы бухгалтерских счетов?
-JournalizationInLedgerStatus=Status of journalization
-AlreadyInGeneralLedger=Already transferred in accounting journals and ledger
-NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger
-GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group
+JournalizationInLedgerStatus=Статус журнализации
+AlreadyInGeneralLedger=Уже перенесено в бухгалтерские журналы и книгу
+NotYetInGeneralLedger=Еще не перенесено в бухгалтерские журналы и бухгалтерскую книгу
+GroupIsEmptyCheckSetup=Группа пуста, проверьте настройку персонализированной учетной группы
 DetailByAccount=Показать детали счета
 AccountWithNonZeroValues=Счета с ненулевыми значениями
 ListOfAccounts=Список счетов
-CountriesInEEC=Countries in EEC
-CountriesNotInEEC=Countries not in EEC
-CountriesInEECExceptMe=Countries in EEC except %s
-CountriesExceptMe=All countries except %s
-AccountantFiles=Export source documents
-ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
-VueByAccountAccounting=View by accounting account
-VueBySubAccountAccounting=View by accounting subaccount
+CountriesInEEC=Страны ЕЭС
+CountriesNotInEEC=Страны, не входящие в ЕЭС
+CountriesInEECExceptMe=Страны ЕЭС, кроме %s
+CountriesExceptMe=Все страны кроме %s
+AccountantFiles=Экспорт исходных документов
+ExportAccountingSourceDocHelp=С помощью этого инструмента вы можете экспортировать исходные события (список и PDF-файлы), которые использовались для создания вашей бухгалтерской отчетности. Чтобы экспортировать журналы, используйте пункт меню %s - %s.
+VueByAccountAccounting=Просмотр по учетной записи
+VueBySubAccountAccounting=Просмотр по субсчету бухгалтерского учета
 
-MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
-MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
-MainAccountForUsersNotDefined=Main accounting account for users not defined in setup
-MainAccountForVatPaymentNotDefined=Main accounting account for VAT payment not defined in setup
-MainAccountForSubscriptionPaymentNotDefined=Main accounting account for subscription payment not defined in setup
+MainAccountForCustomersNotDefined=Главный бухгалтерский счет для клиентов, не определенных в настройке
+MainAccountForSuppliersNotDefined=Главный бухгалтерский счет для поставщиков, не определенных в настройке
+MainAccountForUsersNotDefined=Основная учетная запись для пользователей, не определенных в настройке
+MainAccountForVatPaymentNotDefined=Главный бухгалтерский счет для уплаты НДС не определен в настройке
+MainAccountForSubscriptionPaymentNotDefined=Основной бухгалтерский счет для оплаты подписки не определен в настройке
 
-AccountancyArea=Accounting area
-AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
-AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
-AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+AccountancyArea=Область бухгалтерского учета
+AccountancyAreaDescIntro=Использование модуля бухгалтерского учета осуществляется в несколько этапов:
+AccountancyAreaDescActionOnce=Следующие действия обычно выполняются один раз или один раз в год ...
+AccountancyAreaDescActionOnceBis=Следующие шаги должны быть выполнены, чтобы сэкономить ваше время в будущем, предлагая вам правильную учетную запись по умолчанию при ведении журнала (запись записи в журналах и главной книге)
+AccountancyAreaDescActionFreq=Следующие действия обычно выполняются каждый месяц, неделю или день для очень крупных компаний ...
 
-AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
-AccountancyAreaDescChartModel=STEP %s: Check that a model of chart of account exists or create one from menu %s
-AccountancyAreaDescChart=STEP %s: Select and|or complete your chart of account from menu %s
+AccountancyAreaDescJournalSetup=ШАГ %s: Создайте или проверьте содержимое вашего списка журналов из меню %s
+AccountancyAreaDescChartModel=ШАГ %s: Убедитесь, что модель плана счетов существует, или создайте ее из меню %s
+AccountancyAreaDescChart=ШАГ %s: Выберите и | или заполните свой план счетов в меню %s
 
-AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
-AccountancyAreaDescDefault=STEP %s: Define default accounting accounts. For this, use the menu entry %s.
-AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
-AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
-AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expenses (miscellaneous taxes). For this, use the menu entry %s.
-AccountancyAreaDescDonation=STEP %s: Define default accounting accounts for donation. For this, use the menu entry %s.
-AccountancyAreaDescSubscription=STEP %s: Define default accounting accounts for member subscription. For this, use the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Define mandatory default account and default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
-AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
-AccountancyAreaDescBank=STEP %s: Define accounting accounts and journal code for each bank and financial accounts. For this, use the menu entry %s.
-AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+AccountancyAreaDescVat=ШАГ %s: Определите бухгалтерские счета для каждой ставки НДС. Для этого используйте пункт меню %s.
+AccountancyAreaDescDefault=ШАГ %s: Определите учетные записи по умолчанию. Для этого используйте пункт меню %s.
+AccountancyAreaDescExpenseReport=ШАГ %s: Определите учетные записи по умолчанию для каждого типа отчета о расходах. Для этого используйте пункт меню %s.
+AccountancyAreaDescSal=ШАГ %s: Определите учетные записи по умолчанию для выплаты заработной платы. Для этого используйте пункт меню %s.
+AccountancyAreaDescContrib=ШАГ %s: Определите счета учета по умолчанию для особых расходов (разных налогов). Для этого используйте пункт меню %s.
+AccountancyAreaDescDonation=ШАГ %s: Определите учетные записи по умолчанию для пожертвований. Для этого используйте пункт меню %s.
+AccountancyAreaDescSubscription=ШАГ %s: Определите учетные записи по умолчанию для подписки участников. Для этого используйте пункт меню %s.
+AccountancyAreaDescMisc=ШАГ %s: Определите обязательную учетную запись по умолчанию и учетные записи по умолчанию для разных транзакций. Для этого используйте пункт меню %s.
+AccountancyAreaDescLoan=ШАГ %s: Определите счета учета по умолчанию для ссуд. Для этого используйте пункт меню %s.
+AccountancyAreaDescBank=ШАГ %s: Определите учетные счета и код журнала для каждого банковского и финансового счетов. Для этого используйте пункт меню %s.
+AccountancyAreaDescProd=ШАГ %s: Определите учетные записи для своих продуктов / услуг. Для этого используйте пункт меню %s.
 
-AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
-AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
-AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
+AccountancyAreaDescBind=ШАГ %s: проверьте, что привязка между существующими строками %s и учетной записью выполнена, поэтому приложение сможет регистрировать транзакции в Ledger одним щелчком мыши. Полностью отсутствующие привязки. Для этого используйте пункт меню %s.
+AccountancyAreaDescWriteRecords=ШАГ %s: Записывайте транзакции в регистр. Для этого войдите в меню <strong> %s </strong> и нажмите кнопку <strong> %s </strong>.
+AccountancyAreaDescAnalyze=ШАГ %s: Добавьте или отредактируйте существующие транзакции и создайте отчеты и экспорт.
 
-AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
+AccountancyAreaDescClosePeriod=ШАГ %s: Закройте период, чтобы мы не могли вносить изменения в будущем.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=Не завершен обязательный шаг в настройке (журнал кодов учета не определен для всех банковских счетов)
 Selectchartofaccounts=Выберите активный график счетов
-ChangeAndLoad=Change and load
+ChangeAndLoad=Изменить и загрузить
 Addanaccount=Добавить бухгалтерский счёт
 AccountAccounting=Бухгалтерский счёт
 AccountAccountingShort=Бухгалтерский счёт
 SubledgerAccount=Вспомогательный счёт
-SubledgerAccountLabel=Subledger account label
-ShowAccountingAccount=Show accounting account
-ShowAccountingJournal=Show accounting journal
-ShowAccountingAccountInLedger=Show accounting account in ledger
-ShowAccountingAccountInJournals=Show accounting account in journals
+SubledgerAccountLabel=Ярлык вспомогательной книги
+ShowAccountingAccount=Показать учетную запись
+ShowAccountingJournal=Показать бухгалтерский журнал
+ShowAccountingAccountInLedger=Показать счет в бухгалтерской книге
+ShowAccountingAccountInJournals=Показать учетную запись в журналах
 AccountAccountingSuggest=Учетный счет
-MenuDefaultAccounts=Default accounts
+MenuDefaultAccounts=Учетные записи по умолчанию
 MenuBankAccounts=Банковские счета
-MenuVatAccounts=Vat accounts
-MenuTaxAccounts=Tax accounts
-MenuExpenseReportAccounts=Expense report accounts
-MenuLoanAccounts=Loan accounts
-MenuProductsAccounts=Product accounts
-MenuClosureAccounts=Closure accounts
-MenuAccountancyClosure=Closure
-MenuAccountancyValidationMovements=Validate movements
-ProductsBinding=Products accounts
-TransferInAccounting=Transfer in accounting
-RegistrationInAccounting=Registration in accounting
+MenuVatAccounts=Счета НДС
+MenuTaxAccounts=Налоговые счета
+MenuExpenseReportAccounts=Счета отчета о расходах
+MenuLoanAccounts=Ссудные счета
+MenuProductsAccounts=Аккаунты продуктов
+MenuClosureAccounts=Закрытие счетов
+MenuAccountancyClosure=Закрытие
+MenuAccountancyValidationMovements=Подтвердить движения
+ProductsBinding=Аккаунты продуктов
+TransferInAccounting=Перенос в бухгалтерию
+RegistrationInAccounting=Регистрация в бухгалтерии
 Binding=Привязка к счетам
 CustomersVentilation=Привязка счета клиента
-SuppliersVentilation=Vendor invoice binding
-ExpenseReportsVentilation=Expense report binding
-CreateMvts=Создать новую транзакцию
-UpdateMvts=Изменить транзакцию
-ValidTransaction=Validate transaction
-WriteBookKeeping=Register transactions in accounting
-Bookkeeping=Ledger
-BookkeepingSubAccount=Subledger
-AccountBalance=Account balance
-ObjectsRef=Source object ref
-CAHTF=Total purchase vendor before tax
-TotalExpenseReport=Total expense report
-InvoiceLines=Lines of invoices to bind
-InvoiceLinesDone=Bound lines of invoices
-ExpenseReportLines=Lines of expense reports to bind
-ExpenseReportLinesDone=Bound lines of expense reports
-IntoAccount=Bind line with the accounting account
-TotalForAccount=Total accounting account
+SuppliersVentilation=Привязка накладной поставщика
+ExpenseReportsVentilation=Привязка отчета о расходах
+CreateMvts=Создать новую проводку
+UpdateMvts=Изменить проводку
+ValidTransaction=Подтвердить проводку
+WriteBookKeeping=Регистрировать транзакции в бухгалтерии
+Bookkeeping=Бухгалтерская книга
+BookkeepingSubAccount=Вспомогательная книга
+AccountBalance=Баланс
+ObjectsRef=Ссылка на исходный объект
+CAHTF=Итого закупка продавца до налогообложения
+TotalExpenseReport=Отчет об общих расходах
+InvoiceLines=Строки счетов-фактур для привязки
+InvoiceLinesDone=Связанные строки счетов-фактур
+ExpenseReportLines=Строки отчетов о расходах для привязки
+ExpenseReportLinesDone=Связанные строки отчетов о расходах
+IntoAccount=Привязать строку к бухгалтерии
+TotalForAccount=Итого бухгалтерский счет
 
 
 Ventilate=Привязка
-LineId=Id line
+LineId=Идентификационная строка
 Processing=Обрабатывается
 EndProcessing=Процесс прерван.
 SelectedLines=Выделенные строки
 Lineofinvoice=Строка счёта
-LineOfExpenseReport=Line of expense report
-NoAccountSelected=No accounting account selected
-VentilatedinAccount=Binded successfully to the accounting account
-NotVentilatedinAccount=Not bound to the accounting account
-XLineSuccessfullyBinded=%s products/services successfully bound to an accounting account
-XLineFailedToBeBinded=%s products/services were not bound to any accounting account
+LineOfExpenseReport=Строка отчета о расходах
+NoAccountSelected=Учетная запись не выбрана
+VentilatedinAccount=Успешно привязан к учетной записи
+NotVentilatedinAccount=Не привязан к учетной записи
+XLineSuccessfullyBinded=%s продукты / услуги, успешно привязанные к учетной записи
+XLineFailedToBeBinded=продукты / услуги %s не были привязаны к какой-либо учетной записи
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Максимальное количество строк на странице списка и привязки (рекомендуется: 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Начать сортировку страницы «Привязка к делу» по самым последним элементам.
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Начать сортировку страницы «Привязка выполнена» по самым последним элементам.
 
-ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts (If you set value to 6 here, the account '706' will appear like '706000' on screen)
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third-party accounting accounts (If you set value to 6 here, the account '401' will appear like '401000' on screen)
-ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of an accounting account. Needed by some countries (like Switzerland). If set to off (default), you can set the following two parameters to ask the application to add virtual zeros.
-BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
-ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
-ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
-ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
+ACCOUNTING_LENGTH_DESCRIPTION=Обрезать описание продуктов и услуг в списках после x символов (наилучшее = 50)
+ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Обрезать форму описания аккаунта продуктов и услуг в списках после x символов (наилучшее = 50)
+ACCOUNTING_LENGTH_GACCOUNT=Длина общих учетных записей (если вы установите здесь значение 6, счет «706» будет отображаться на экране как «706000»)
+ACCOUNTING_LENGTH_AACCOUNT=Длина сторонних учетных записей (если вы установите здесь значение 6, учетная запись «401» будет отображаться на экране как «401000»)
+ACCOUNTING_MANAGE_ZERO=Позволяет управлять разным количеством нулей в конце учетной записи. Нужен в некоторых странах (например, в Швейцарии). Если выключено (по умолчанию), вы можете установить следующие два параметра, чтобы попросить приложение добавить виртуальные нули.
+BANK_DISABLE_DIRECT_INPUT=Отключить прямую запись транзакции на банковский счет
+ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Включить экспорт черновиков в журнале
+ACCOUNTANCY_COMBO_FOR_AUX=Включить комбинированный список для вспомогательной учетной записи (может быть медленным, если у вас много третьих лиц, нарушить возможность поиска по части значения)
+ACCOUNTING_DATE_START_BINDING=Определите дату начала привязки и передачи в бухгалтерском учете. Ниже этой даты операции не переносятся в бухгалтерский учет.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=При переносе бухгалтерии выберите период отображения по умолчанию
 
 ACCOUNTING_SELL_JOURNAL=Журнал продаж
 ACCOUNTING_PURCHASE_JOURNAL=Журнал платежей
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Журнал "Разное"
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Социальный журнал
-ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
+ACCOUNTING_HAS_NEW_JOURNAL=Есть новый журнал
 
-ACCOUNTING_RESULT_PROFIT=Result accounting account (Profit)
-ACCOUNTING_RESULT_LOSS=Result accounting account (Loss)
-ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Journal of closure
+ACCOUNTING_RESULT_PROFIT=Результат бухгалтерского учета (Прибыль)
+ACCOUNTING_RESULT_LOSS=Результат бухгалтерского учета (убыток)
+ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Журнал закрытия
 
-ACCOUNTING_ACCOUNT_TRANSFER_CASH=Accounting account of transitional bank transfer
-TransitionalAccount=Transitional bank transfer account
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=Бухгалтерский счет переходного банковского перевода
+TransitionalAccount=Счет переходного банковского перевода
 
-ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
-DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
-ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
+ACCOUNTING_ACCOUNT_SUSPENSE=Бухгалтерский учет ожидания
+DONATION_ACCOUNTINGACCOUNT=Бухгалтерский счет для регистрации пожертвований
+ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Учетная запись для регистрации подписок
 
-ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Бухгалтерский счет по умолчанию для регистрации депозита клиента
 
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Accounting account by default for the products sold in EEC (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Accounting account by default for the products sold and exported out of EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Бухгалтерский счет по умолчанию для купленных продуктов (используется, если не определено в описании продукта)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Бухгалтерский счет по умолчанию для купленных продуктов в EEC (используется, если не определено в описании продукта)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Бухгалтерский счет по умолчанию для купленных продуктов и импортированных из ЕЭС (используется, если не определено в описании продукта)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Бухгалтерский счет по умолчанию для проданных товаров (используется, если не указано в описании товара)
+ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Бухгалтерский счет по умолчанию для продуктов, продаваемых в EEC (используется, если не указано в описании продукта)
+ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Бухгалтерский счет по умолчанию для продуктов, проданных и экспортированных из ЕЭС (используется, если не указано в описании продукта)
 
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Accounting account by default for the bought services in EEC (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought services and imported out of EEC (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Accounting account by default for the services sold in EEC (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Accounting account by default for the services sold and exported out of EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Бухгалтерский счет по умолчанию для купленных услуг (используется, если не определено в сервисном листе)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Бухгалтерский счет по умолчанию для купленных услуг в ЕЭК (используется, если не указано в сервисном листе)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Бухгалтерский счет по умолчанию для купленных услуг и импортированных из EEC (используется, если не определено в сервисном листе)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Бухгалтерский счет по умолчанию для проданных услуг (используется, если не определено в листе услуг)
+ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Бухгалтерский счет по умолчанию для услуг, продаваемых в ЕЭС (используется, если не определено в сервисном листе)
+ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Учетный счет по умолчанию для услуг, проданных и экспортированных из ЕЭК (используется, если не определено в сервисном листе)
 
 Doctype=Тип документа
 Docdate=Дата
 Docref=Ссылка
 LabelAccount=Метка бухгалтерского счёта
-LabelOperation=Label operation
-Sens=Direction
-AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you have received<br>For an accounting account of a supplier, use Debit to record a payment you made
-LetteringCode=Lettering code
-Lettering=Lettering
+LabelOperation=Этикетка операция
+Sens=Направление
+AccountingDirectionHelp=Для бухгалтерского счета клиента используйте Кредит для записи полученного платежа <br> Для бухгалтерского счета поставщика используйте Дебет, чтобы записать платеж, который вы сделали.
+LetteringCode=Буквенный код
+Lettering=Надписи
 Codejournal=Журнал
-JournalLabel=Journal label
-NumPiece=Piece number
-TransactionNumShort=Num. transaction
-AccountingCategory=Custom group
-GroupByAccountAccounting=Group by general ledger account
-GroupBySubAccountAccounting=Group by subledger account
-AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
-ByAccounts=By accounts
-ByPredefinedAccountGroups=By predefined groups
-ByPersonalizedAccountGroups=By personalized groups
+JournalLabel=Этикетка журнала
+NumPiece=Количество штук
+TransactionNumShort=№ проводки
+AccountingCategory=Пользовательская группа
+GroupByAccountAccounting=Группировать по счету главной книги
+GroupBySubAccountAccounting=Группировка по счету вспомогательной книги
+AccountingAccountGroupsDesc=Здесь вы можете определить несколько групп бухгалтерского учета. Они будут использоваться для персонализированной бухгалтерской отчетности.
+ByAccounts=По счетам
+ByPredefinedAccountGroups=По предопределенным группам
+ByPersonalizedAccountGroups=По индивидуальным группам
 ByYear=По годам
-NotMatch=Not Set
-DeleteMvt=Delete some operation lines from accounting
-DelMonth=Month to delete
-DelYear=Year to delete
-DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger.
-ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted)
+NotMatch=Не задано
+DeleteMvt=Удалить из бухгалтерии некоторые строки операций
+DelMonth=Месяц для удаления
+DelYear=Год для удаления
+DelJournal=Журнал для удаления
+ConfirmDeleteMvt=При этом будут удалены все операционные строки бухгалтерского учета за год / месяц и / или для определенного журнала (требуется хотя бы один критерий). Вам придется повторно использовать функцию «%s», чтобы удаленная запись вернулась в бухгалтерскую книгу.
+ConfirmDeleteMvtPartial=При этом проводка будет удалена из бухгалтерского учета (будут удалены все строки операций, относящиеся к одной проводке).
 FinanceJournal=Finance journal
-ExpenseReportsJournal=Expense reports journal
+ExpenseReportsJournal=Журнал отчетов о расходах
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
-VATAccountNotDefined=Account for VAT not defined
-ThirdpartyAccountNotDefined=Account for third party not defined
-ProductAccountNotDefined=Account for product not defined
-FeeAccountNotDefined=Account for fee not defined
-BankAccountNotDefined=Account for bank not defined
+DescJournalOnlyBindedVisible=Это представление записи, которая привязана к учетной записи и может быть записана в журналы и бухгалтерскую книгу.
+VATAccountNotDefined=Счет по НДС не определен
+ThirdpartyAccountNotDefined=Учетная запись третьей стороны не определена
+ProductAccountNotDefined=Аккаунт для продукта не определен
+FeeAccountNotDefined=Счет комиссии не определен
+BankAccountNotDefined=Счет в банке не определен
 CustomerInvoicePayment=Платёж счёта клиента
-ThirdPartyAccount=Third-party account
-NewAccountingMvt=New transaction
-NumMvts=Numero of transaction
-ListeMvts=List of movements
+ThirdPartyAccount=Сторонний аккаунт
+NewAccountingMvt=Новая проводки
+NumMvts=Номер проводки
+ListeMvts=Список движений
 ErrorDebitCredit=Дебит и кредит не могут иметь значения одновременно
-AddCompteFromBK=Add accounting accounts to the group
-ReportThirdParty=List third-party account
-DescThirdPartyReport=Consult here the list of third-party customers and vendors and their accounting accounts
+AddCompteFromBK=Добавить учетные записи в группу
+ReportThirdParty=Список сторонних аккаунтов
+DescThirdPartyReport=Здесь можно найти список сторонних клиентов и поставщиков и их учетные записи.
 ListAccounts=Список бухгалтерских счетов
-UnknownAccountForThirdparty=Unknown third-party account. We will use %s
-UnknownAccountForThirdpartyBlocking=Unknown third-party account. Blocking error
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. We will use %s
-ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Third-party unknown and subledger not defined on the payment. We will keep the subledger account value empty.
-ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
-UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
-PaymentsNotLinkedToProduct=Payment not linked to any product / service
-OpeningBalance=Opening balance
-ShowOpeningBalance=Show opening balance
-HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by level
+UnknownAccountForThirdparty=Неизвестный сторонний аккаунт. Мы будем использовать %s
+UnknownAccountForThirdpartyBlocking=Неизвестный сторонний аккаунт. Ошибка блокировки
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Сторонняя учетная запись не определена или третья сторона неизвестна. Мы будем использовать %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Сторонние данные неизвестны и вспомогательная книга не указана на платеже. Мы оставим значение учетной записи вспомогательной книги пустым.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Сторонняя учетная запись не определена или третья сторона неизвестна. Ошибка блокировки.
+UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Неизвестная сторонняя учетная запись и ожидающая учетная запись не определены. Ошибка блокировки
+PaymentsNotLinkedToProduct=Платеж не привязан к какому-либо продукту / услуге
+OpeningBalance=Начальное сальдо
+ShowOpeningBalance=Показать начальный баланс
+HideOpeningBalance=Скрыть начальный баланс
+ShowSubtotalByGroup=Показать промежуточный итог по уровням
 
-Pcgtype=Group of account
-PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
+Pcgtype=Группа счетов
+PcgtypeDesc=Группа счетов используется в качестве предопределенных критериев «фильтра» и «группировки» для некоторых бухгалтерских отчетов. Например, «ДОХОД» или «РАСХОДЫ» используются в качестве групп для бухгалтерских счетов продуктов для построения отчета о расходах / доходах.
 
-Reconcilable=Reconcilable
+Reconcilable=Примиримый
 
 TotalVente=Total turnover before tax
 TotalMarge=Итоговая наценка на продажи
 
-DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
-DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still have some lines not bound to an account, you will have to make a manual binding from the menu "<strong>%s</strong>".
-DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
-DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
-ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
+DescVentilCustomer=См. Здесь список строк счетов-фактур клиентов, привязанных (или нет) к учетной записи учета продукта.
+DescVentilMore=В большинстве случаев, если вы используете предопределенные продукты или услуги и устанавливаете номер счета в карточке продукта / услуги, приложение сможет выполнить всю привязку между строками вашего счета и учетной записью вашего плана счетов всего за один день. в один клик кнопкой <strong> "%s" </strong>. Если учетная запись не была настроена на карточках товаров / услуг или у вас все еще есть строки, не привязанные к учетной записи, вам придется вручную выполнить привязку из меню «<strong> %s </strong>».
+DescVentilDoneCustomer=См. Здесь список строк клиентов, выставляющих счета, и их учетные записи продуктов.
+DescVentilTodoCustomer=Привязка строк счета-фактуры, еще не связанных с учетной записью продукта
+ChangeAccount=Измените учетную запись учета продуктов / услуг для выбранных строк со следующей учетной записью:
 Vide=-
-DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account (only record not already transfered in accountancy are visible)
-DescVentilDoneSupplier=Consult here the list of the lines of vendor invoices and their accounting account
-DescVentilTodoExpenseReport=Bind expense report lines not already bound with a fee accounting account
-DescVentilExpenseReport=Consult here the list of expense report lines bound (or not) to a fee accounting account
-DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
-DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
+DescVentilSupplier=См. Здесь список строк счетов-фактур, связанных или еще не связанных с учетной записью продукта (видны только записи, еще не переданные в бухгалтерский учет)
+DescVentilDoneSupplier=См. Здесь список строк счетов-фактур поставщиков и их учетную запись.
+DescVentilTodoExpenseReport=Привязка строк отчета о расходах, еще не связанных со счетом учета сборов
+DescVentilExpenseReport=См. Здесь список строк отчета о расходах, привязанных (или нет) к счету учета комиссий.
+DescVentilExpenseReportMore=Если вы настроили учетную запись для типа строк отчета о расходах, приложение сможет выполнить всю привязку между строками отчета о расходах и учетной записью вашего плана счетов, всего одним щелчком мыши с помощью кнопки <strong> "%s" </strong>. Если учетная запись не была настроена в словаре сборов или у вас все еще есть строки, не привязанные к какой-либо учетной записи, вам придется выполнить привязку вручную из меню «<strong> %s </strong>».
+DescVentilDoneExpenseReport=Ознакомьтесь здесь со списком строк отчетов о расходах и счетом учета их комиссий.
 
-Closure=Annual closure
-DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
-OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
-AllMovementsWereRecordedAsValidated=All movements were recorded as validated
-NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
-ValidateMovements=Validate movements
-DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
+Closure=Ежегодное закрытие
+DescClosure=Проконсультируйтесь здесь о количестве движений по месяцам, которые не подтверждены, и уже открытых финансовых лет.
+OverviewOfMovementsNotValidated=Шаг 1 / Обзор перемещений не подтвержден. (Необходимо для закрытия финансового года)
+AllMovementsWereRecordedAsValidated=Все движения были зарегистрированы как подтвержденные.
+NotAllMovementsCouldBeRecordedAsValidated=Не все движения могут быть зарегистрированы как подтвержденные
+ValidateMovements=Подтвердить движения
+DescValidateMovements=Любое изменение или удаление надписей, надписей и удалений будет запрещено. Все записи для упражнения должны быть подтверждены, иначе закрытие будет невозможно.
 
-ValidateHistory=Bind Automatically
-AutomaticBindingDone=Automatic binding done
+ValidateHistory=Связывать автоматически
+AutomaticBindingDone=Автоматическая привязка выполнена
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
-MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
-Balancing=Balancing
-FicheVentilation=Binding card
-GeneralLedgerIsWritten=Transactions are written in the Ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
-NoNewRecordSaved=No more record to journalize
-ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
-ChangeBinding=Change the binding
-Accounted=Accounted in ledger
-NotYetAccounted=Not yet accounted in the ledger
-ShowTutorial=Show Tutorial
+MvtNotCorrectlyBalanced=Движение неправильно сбалансировано. Дебет = %s | Кредит = %s
+Balancing=Балансировка
+FicheVentilation=Обязательная карта
+GeneralLedgerIsWritten=Проводки записываются в бухгалтерскую книгу
+GeneralLedgerSomeRecordWasNotRecorded=Некоторые проводки не удалось зарегистрировать. Если других сообщений об ошибках нет, вероятно, они уже были занесены в журнал.
+NoNewRecordSaved=Больше нет записей для журналирования
+ListOfProductsWithoutAccountingAccount=Список продуктов, не привязанных к какой-либо учетной записи
+ChangeBinding=Сменить привязку
+Accounted=Учтено в бухгалтерской книге
+NotYetAccounted=Еще не учтено в бухгалтерской книге
+ShowTutorial=Показать учебник
 NotReconciled=Не согласовано
-WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
+WarningRecordWithoutSubledgerAreExcluded=Внимание! Все операции без определенной учетной записи вспомогательной книги фильтруются и исключаются из этого представления.
 
 ## Admin
-BindingOptions=Binding options
-ApplyMassCategories=Apply mass categories
-AddAccountFromBookKeepingWithNoCategories=Available account not yet in the personalized group
-CategoryDeleted=Category for the accounting account has been removed
+BindingOptions=Варианты переплета
+ApplyMassCategories=Применить массовые категории
+AddAccountFromBookKeepingWithNoCategories=Доступная учетная запись еще не в персонализированной группе
+CategoryDeleted=Категория учетной записи удалена
 AccountingJournals=Бухгалтерские журналы
-AccountingJournal=Accounting journal
-NewAccountingJournal=New accounting journal
-ShowAccountingJournal=Show accounting journal
-NatureOfJournal=Nature of Journal
-AccountingJournalType1=Miscellaneous operations
+AccountingJournal=Бухгалтерский журнал
+NewAccountingJournal=Новый бухгалтерский журнал
+ShowAccountingJournal=Показать бухгалтерский журнал
+NatureOfJournal=Природа журнала
+AccountingJournalType1=Разные операции
 AccountingJournalType2=Продажи
 AccountingJournalType3=Покупки
 AccountingJournalType4=Банк
-AccountingJournalType5=Expenses report
+AccountingJournalType5=Отчет о расходах
 AccountingJournalType8=Инвентарная ведомость
-AccountingJournalType9=Has-new
-ErrorAccountingJournalIsAlreadyUse=This journal is already use
-AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
-NumberOfAccountancyEntries=Number of entries
-NumberOfAccountancyMovements=Number of movements
-ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting)
-ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting)
-ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
+AccountingJournalType9=Имеет новый
+ErrorAccountingJournalIsAlreadyUse=Этот журнал уже используется
+AccountingAccountForSalesTaxAreDefinedInto=Примечание. Бухгалтерский счет для налога с продаж определяется в меню <b> %s </b> - <b> %s </b>
+NumberOfAccountancyEntries=Количество входов
+NumberOfAccountancyMovements=Количество движений
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Отключить привязку и перенос в бухгалтерии по продажам (счета клиентов не будут учитываться в бухгалтерии)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Отключить привязку и перенос в бухгалтерии по закупкам (счета поставщика не будут учитываться в бухгалтерии)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Отключить привязку и перенос в бухгалтерском учете в отчетах о расходах (отчеты о расходах не будут учитываться в бухгалтерском учете)
 
 ## Export
-ExportDraftJournal=Export draft journal
+NotifiedExportDate=Notified export date (modification of the entries will not be possible)
+NotifiedValidationDate=Validation of the entries (modification or deletion of the entries will not be possible)
+ConfirmExportFile=Confirmation of the generation of the accounting export file ?
+ExportDraftJournal=Экспорт черновика журнала
 Modelcsv=Модель экспорта
 Selectmodelcsv=Выбрать модель экспорта
 Modelcsv_normal=Классический экспорт
-Modelcsv_CEGID=Export for CEGID Expert Comptabilité
-Modelcsv_COALA=Export for Sage Coala
-Modelcsv_bob50=Export for Sage BOB 50
-Modelcsv_ciel=Export for Sage Ciel Compta or Compta Evolution
-Modelcsv_quadratus=Export for Quadratus QuadraCompta
-Modelcsv_ebp=Export for EBP
-Modelcsv_cogilog=Export for Cogilog
-Modelcsv_agiris=Export for Agiris
-Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
-Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
-Modelcsv_openconcerto=Export for OpenConcerto (Test)
-Modelcsv_configurable=Export CSV Configurable
-Modelcsv_FEC=Export FEC
-Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
-Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
-Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
-Modelcsv_Gestinumv3=Export for Gestinum (v3)
-Modelcsv_Gestinumv5Export for Gestinum (v5)
-ChartofaccountsId=Chart of accounts Id
+Modelcsv_CEGID=Экспорт для CEGID Expert Comptabilité
+Modelcsv_COALA=Экспорт для Sage Coala
+Modelcsv_bob50=Экспорт для Sage BOB 50
+Modelcsv_ciel=Экспорт для Sage Ciel Compta или Compta Evolution
+Modelcsv_quadratus=Экспорт для Quadratus QuadraCompta
+Modelcsv_ebp=Экспорт для EBP
+Modelcsv_cogilog=Экспорт для Cogilog
+Modelcsv_agiris=Экспорт для Agiris
+Modelcsv_LDCompta=Экспорт для LD Compta (v9) (Тест)
+Modelcsv_LDCompta10=Экспорт для LD Compta (v10 и выше)
+Modelcsv_openconcerto=Экспорт для OpenConcerto (Тест)
+Modelcsv_configurable=Настраиваемый экспорт CSV
+Modelcsv_FEC=Экспорт FEC
+Modelcsv_FEC2=Экспорт FEC (с записью генерации дат / обратным документом)
+Modelcsv_Sage50_Swiss=Экспорт для Sage 50 Switzerland
+Modelcsv_winfic=Экспорт Winfic - eWinfic - WinSis Compta
+Modelcsv_Gestinumv3=Экспорт для Gestinum (v3)
+Modelcsv_Gestinumv5Export для Gestinum (v5)
+ChartofaccountsId=План счетов Id
 
 ## Tools - Init accounting account on product / service
-InitAccountancy=Init accountancy
-InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accounting account defined for sales and purchases.
-DefaultBindingDesc=This page can be used to set a default account to use to link transactions record about payment salaries, donation, taxes and vat when no specific accounting account were already set.
-DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
-Options=Options
-OptionModeProductSell=Mode sales
-OptionModeProductSellIntra=Mode sales exported in EEC
-OptionModeProductSellExport=Mode sales exported in other countries
-OptionModeProductBuy=Mode purchases
-OptionModeProductBuyIntra=Mode purchases imported in EEC
-OptionModeProductBuyExport=Mode purchased imported from other countries
-OptionModeProductSellDesc=Show all products with accounting account for sales.
-OptionModeProductSellIntraDesc=Show all products with accounting account for sales in EEC.
-OptionModeProductSellExportDesc=Show all products with accounting account for other foreign sales.
-OptionModeProductBuyDesc=Show all products with accounting account for purchases.
-OptionModeProductBuyIntraDesc=Show all products with accounting account for purchases in EEC.
-OptionModeProductBuyExportDesc=Show all products with accounting account for other foreign purchases.
-CleanFixHistory=Remove accounting code from lines that not exists into charts of account
-CleanHistory=Reset all bindings for selected year
-PredefinedGroups=Predefined groups
-WithoutValidAccount=Without valid dedicated account
-WithValidAccount=With valid dedicated account
-ValueNotIntoChartOfAccount=This value of accounting account does not exist into chart of account
-AccountRemovedFromGroup=Account removed from group
-SaleLocal=Local sale
-SaleExport=Export sale
-SaleEEC=Sale in EEC
-SaleEECWithVAT=Sale in EEC with a VAT not null, so we suppose this is NOT an intracommunautary sale and the suggested account is the standard product account.
-SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fallback on the product account for standard sales. You can fix the VAT ID of thirdparty or the product account if needed.
+InitAccountancy=Бухгалтерский учет
+InitAccountancyDesc=Эту страницу можно использовать для инициализации учетной записи для продуктов и услуг, для которой не задана учетная запись для продаж и покупок.
+DefaultBindingDesc=Эту страницу можно использовать для установки учетной записи по умолчанию, которая будет использоваться для связывания проводки о выплатах заработной платы, пожертвованиях, налогах и НДС, если конкретная учетная запись еще не была настроена.
+DefaultClosureDesc=Эта страница может использоваться для установки параметров, используемых для учета закрытия.
+Options=Параметры
+OptionModeProductSell=Режим продаж
+OptionModeProductSellIntra=Экспорт режима продаж в ЕЭС
+OptionModeProductSellExport=Режим продаж экспортируется в другие страны
+OptionModeProductBuy=Режим покупок
+OptionModeProductBuyIntra=Закупки режима импортированы в ЕЭС
+OptionModeProductBuyExport=Куплен режим, импортированный из других стран
+OptionModeProductSellDesc=Показать все товары с учетом продаж.
+OptionModeProductSellIntraDesc=Показать все товары с учетом продаж в ЕЭС.
+OptionModeProductSellExportDesc=Показать все продукты с учетом других зарубежных продаж.
+OptionModeProductBuyDesc=Показать все товары с учетом покупок.
+OptionModeProductBuyIntraDesc=Показать все товары с учетом покупок в ЕЭС.
+OptionModeProductBuyExportDesc=Показать все товары с учетом других зарубежных покупок.
+CleanFixHistory=Удалите бухгалтерский код из строк, которых нет в планах счетов.
+CleanHistory=Сбросить все привязки для выбранного года
+PredefinedGroups=Предопределенные группы
+WithoutValidAccount=Без действующей выделенной учетной записи
+WithValidAccount=С действующей выделенной учетной записью
+ValueNotIntoChartOfAccount=Это значение бухгалтерского счета отсутствует в плане счетов.
+AccountRemovedFromGroup=Аккаунт удален из группы
+SaleLocal=Местная продажа
+SaleExport=Продажа на экспорт
+SaleEEC=Продажа в ЕЭС
+SaleEECWithVAT=Продажа в ЕЭС с ненулевым НДС, поэтому мы предполагаем, что это НЕ внутриобщинная продажа, а предлагаемая учетная запись является стандартной учетной записью продукта.
+SaleEECWithoutVATNumber=Продажа в ЕЭС без НДС, но идентификатор плательщика НДС третьей стороны не определен. Мы возвращаемся к учетной записи продукта для стандартных продаж. При необходимости вы можете исправить идентификатор плательщика НДС третьей стороны или учетную запись продукта.
 
 ## Dictionary
-Range=Range of accounting account
-Calculated=Calculated
-Formula=Formula
+Range=Диапазон учетной записи
+Calculated=Рассчитано
+Formula=Формула
 
 ## Error
-SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
-ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
-ErrorInvoiceContainsLinesNotYetBounded=You try to journalize some lines of the invoice <strong>%s</strong>, but some other lines are not yet bounded to accounting account. Journalization of all invoice lines for this invoice are refused.
-ErrorInvoiceContainsLinesNotYetBoundedShort=Some lines on invoice are not bound to accounting account.
-ExportNotSupported=The export format setuped is not supported into this page
-BookeppingLineAlreayExists=Lines already existing into bookkeeping
-NoJournalDefined=No journal defined
-Binded=Lines bound
-ToBind=Lines to bind
-UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to make the binding manually
+SomeMandatoryStepsOfSetupWereNotDone=Некоторые обязательные шаги настройки не были выполнены, выполните их.
+ErrorNoAccountingCategoryForThisCountry=Группа учетных записей недоступна для страны %s (см. Домашняя страница - Настройка - Словари)
+ErrorInvoiceContainsLinesNotYetBounded=Вы пытаетесь вести журнал некоторых строк счета-фактуры <strong> %s </strong>, но некоторые другие строки еще не привязаны к учетному счету. Журналирование всех строк счета-фактуры для этого счета-фактуры отклоняется.
+ErrorInvoiceContainsLinesNotYetBoundedShort=Некоторые строки в счете-фактуре не привязаны к бухгалтерскому счету.
+ExportNotSupported=Установленный формат экспорта не поддерживается на этой странице
+BookeppingLineAlreayExists=Уже существующие строки в бухгалтерском учете
+NoJournalDefined=Журнал не определен
+Binded=Линии связаны
+ToBind=Линии для привязки
+UseMenuToSetBindindManualy=Строки еще не связаны, используйте меню <a href="%s"> %s </a>, чтобы выполнить привязку вручную
 
 ## Import
 ImportAccountingEntries=Бухгалтерские записи
-ImportAccountingEntriesFECFormat=Accounting entries - FEC format
-FECFormatJournalCode=Code journal (JournalCode)
-FECFormatJournalLabel=Label journal (JournalLib)
-FECFormatEntryNum=Piece number (EcritureNum)
-FECFormatEntryDate=Piece date (EcritureDate)
-FECFormatGeneralAccountNumber=General account number (CompteNum)
-FECFormatGeneralAccountLabel=General account label (CompteLib)
-FECFormatSubledgerAccountNumber=Subledger account number (CompAuxNum)
-FECFormatSubledgerAccountLabel=Subledger account number (CompAuxLib)
-FECFormatPieceRef=Piece ref (PieceRef)
-FECFormatPieceDate=Piece date creation (PieceDate)
-FECFormatLabelOperation=Label operation (EcritureLib)
-FECFormatDebit=Debit (Debit)
-FECFormatCredit=Credit (Credit)
-FECFormatReconcilableCode=Reconcilable code (EcritureLet)
-FECFormatReconcilableDate=Reconcilable date (DateLet)
-FECFormatValidateDate=Piece date validated (ValidDate)
-FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
-FECFormatMulticurrencyCode=Multicurrency code (Idevise)
+ImportAccountingEntriesFECFormat=Бухгалтерские записи - формат FEC
+FECFormatJournalCode=Журнал кодов (JournalCode)
+FECFormatJournalLabel=Этикетка журнала (JournalLib)
+FECFormatEntryNum=Количество штук (EcritureNum)
+FECFormatEntryDate=Дата выпуска (EcritureDate)
+FECFormatGeneralAccountNumber=Общий номер счета (CompteNum)
+FECFormatGeneralAccountLabel=Ярлык общего аккаунта (CompteLib)
+FECFormatSubledgerAccountNumber=Номер счета вспомогательной книги (CompAuxNum)
+FECFormatSubledgerAccountLabel=Номер счета вспомогательной книги (CompAuxLib)
+FECFormatPieceRef=Ссылка на штуку (PieceRef)
+FECFormatPieceDate=Создание штучной даты (PieceDate)
+FECFormatLabelOperation=Метка операции (EcritureLib)
+FECFormatDebit=Дебет (дебет)
+FECFormatCredit=Кредит (Credit)
+FECFormatReconcilableCode=Согласованный код (EcritureLet)
+FECFormatReconcilableDate=Дата согласования (DateLet)
+FECFormatValidateDate=Дата отправления подтверждена (ValidDate)
+FECFormatMulticurrencyAmount=Мультивалютная сумма (Montantdevise)
+FECFormatMulticurrencyCode=Мультивалютный код (Idevise)
 
 DateExport=Дата экспорта
-WarningReportNotReliable=Внимание, этот отчет не основан на Гроссбухе, поэтому не содержит транзакции, измененные вручную в Гроссбухе. Если журналирование актуально, бухгалтерский учет будет более точным.
+WarningReportNotReliable=Предупреждение, этот отчет не основан на главной книге, поэтому не содержит проводки, измененных вручную в главной книге. Если ваша журнализация актуальна, бухгалтерский учет будет более точным.
 ExpenseReportJournal=Журнал отчетов о затратах
 InventoryJournal=Журнал инвентарного учета
 
-NAccounts=%s accounts
+NAccounts=аккаунты %s
diff --git a/htdocs/langs/ru_RU/admin.lang b/htdocs/langs/ru_RU/admin.lang
index 527924590a8..f4f00215f51 100644
--- a/htdocs/langs/ru_RU/admin.lang
+++ b/htdocs/langs/ru_RU/admin.lang
@@ -3,8 +3,8 @@ Foundation=Фонд
 Version=Версия
 Publisher=Издатель
 VersionProgram=Версия программы
-VersionLastInstall=Начальная версия установки
-VersionLastUpgrade=Обновление до последней версии
+VersionLastInstall=Первоначальная версия установки
+VersionLastUpgrade=Обновление последней версии
 VersionExperimental=Экспериментальная
 VersionDevelopment=Разработка
 VersionUnknown=Неизвестно
@@ -64,7 +64,7 @@ RemoveLock=Удалите/переименуйте файл <b>%s</b>, если
 RestoreLock=Восстановите файл <b>%s</b> с разрешением только для чтение, чтобы отключить дальнейшее использование инструмента обновления/установки.
 SecuritySetup=Настройка безопасности
 PHPSetup=Настройка PHP
-OSSetup=OS setup
+OSSetup=Настройка ОС
 SecurityFilesDesc=Определите здесь параметры, связанные с безопасностью загрузки файлов.
 ErrorModuleRequirePHPVersion=Ошибка, этот модуль требует PHP версии %s или выше
 ErrorModuleRequireDolibarrVersion=Ошибка, этот модуль требует Dolibarr версии %s или выше
@@ -78,7 +78,7 @@ DisableJavascriptNote=Примечание. Для тестирования ил
 UseSearchToSelectCompanyTooltip=Кроме того, если у вас есть большое количество контрагентов (> 100 000), вы можете увеличить скорость, установив постоянную COMPANY_DONOTSEARCH_ANYWHERE на 1 в Настройка-Доп.настройки. Затем поиск будет ограничен началом строки.
 UseSearchToSelectContactTooltip=Кроме того, если у вас есть большое количество контрагентов (> 100 000), вы можете увеличить скорость, установив постоянную COMPANY_DONOTSEARCH_ANYWHERE на 1 в Настройка-Доп.настройки. Затем поиск будет ограничен началом строки.
 DelaiedFullListToSelectCompany=Ожидание нажатия клавиши, прежде чем загружать содержимое списка Контрагентов. <br> Это может повысить производительность, если у вас много контрагентов, но это менее удобно.
-DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
+DelaiedFullListToSelectContact=Дождитесь нажатия клавиши перед загрузкой содержимого комбинированного списка контактов. <br> Это может повысить производительность, если у вас много контактов, но это менее удобно.
 NumberOfKeyToSearch=Количество символов для запуска поиска: %s
 NumberOfBytes=Количество байт
 SearchString=Строка поиска
@@ -107,9 +107,9 @@ NoMaxSizeByPHPLimit=Примечание: в вашей конфигурации
 MaxSizeForUploadedFiles=Максимальный размер загружаемых файлов (0 для запрещения каких-либо загрузок)
 UseCaptchaCode=Использовать графический код (CAPTCHA) на странице входа
 AntiVirusCommand=Полный путь к антивирусной команде
-AntiVirusCommandExample=Example for ClamAv Daemon (require clamav-daemon): /usr/bin/clamdscan<br>Example for ClamWin (very very slow): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
+AntiVirusCommandExample=Пример для ClamAv Daemon (требуется clamav-daemon): / usr / bin / clamdscan <br> Пример для ClamWin (очень-очень медленный): c: \\ Progra ~ 1 \\ ClamWin \\ bin \\ clamscan.exe
 AntiVirusParam= Дополнительные параметры командной строки
-AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+AntiVirusParamExample=Пример для демона ClamAv: --fdpass <br> Пример для ClamWin: --database = "C: \\ Program Files (x86) \\ ClamWin \\ lib"
 ComptaSetup=Настройка модуля бухгалтерского учета
 UserSetup=Настройка управления пользователями
 MultiCurrencySetup=Многовалютная настройка
@@ -157,7 +157,7 @@ SystemToolsAreaDesc=Эта область обеспечивает функци
 Purge=Очистить
 PurgeAreaDesc=Эта страница позволяет вам удалить все файлы, созданные или сохраненные Dolibarr (временные файлы или все файлы в каталоге <b> %s</b> ). Использование этой функции обычно не требуется. Он предоставляется в качестве обходного пути для пользователей, чей Dolibarr размещен поставщиком, который не предлагает разрешения на удаление файлов, созданных веб-сервером.
 PurgeDeleteLogFile=Удаление файлов журналов, включая <b>%s</b> определенный для модуля Syslog (без риска потери данных)
-PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Parameter can be 'tempfilesold', 'logfiles' or both 'tempfilesold+logfiles'. Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFiles=Удалите все файлы журналов и временные файлы (без риска потери данных). Параметр может быть «tempfilesold», «logfiles» или оба «tempfilesold + logfiles». Примечание. Удаление временных файлов выполняется только в том случае, если временный каталог был создан более 24 часов назад.
 PurgeDeleteTemporaryFilesShort=Удалите журнал и временные файлы
 PurgeDeleteAllFilesInDocumentsDir=Удалить все файлы в каталоге: <b>%s</b> . <br> Это удалит все сгенерированные документы, связанные с элементами (контрагенты, счета и т.д.), файлы, загруженные в модуль ECM, резервные копии базы данных и временные файлы.
 PurgeRunNow=Очистить сейчас
@@ -207,7 +207,7 @@ FeatureDisabledInDemo=Функция отключена в демо -
 FeatureAvailableOnlyOnStable=Функция доступна только в официальных стабильных версиях
 BoxesDesc=Виджеты - это компоненты, показывающие некоторую информацию, которую можно добавить для персонализации некоторых страниц. Вы можете выбрать отображать или нет виджет, выбрав целевую страницу и нажав «Активировать», или щелкнув корзину, чтобы отключить ее.
 OnlyActiveElementsAreShown=Показаны только элементы из <a href="%s">включенных модулей</a>
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button <span class="small valignmiddle">%s</span> of each module to enable or disable a module/application.
+ModulesDesc=Модули / приложения определяют, какие функции доступны в программном обеспечении. Некоторые модули требуют предоставления пользователям разрешений после активации модуля. Нажмите кнопку включения / выключения <span class="small valignmiddle"> %s </span> каждого модуля, чтобы включить или отключить модуль / приложение.
 ModulesMarketPlaceDesc=В интернете вы можете найти больше модулей для загрузки...
 ModulesDeployDesc=Если разрешения вашей файловой системе позволяют, вы можете использовать этот инструмент для развертывания внешнего модуля. Модуль будет виден на вкладке <strong>%s</strong> .
 ModulesMarketPlaces=Поиск внешних приложений/модулей
@@ -221,12 +221,12 @@ NotCompatible=Этот модуль не совместим с вашим Doliba
 CompatibleAfterUpdate=Этот модуль требует обновления вашего Dolibarr%s (Min%s - Max%s).
 SeeInMarkerPlace=См. На рынке
 SeeSetupOfModule=Посмотреть настройку модуля  %s
+SetOptionTo=Set option <b>%s</b> to %s
 Updated=Обновлено
-Nouveauté=Новое
 AchatTelechargement=Купить/Скачать
 GoModuleSetupArea=Чтобы развернуть/установить новый модуль, перейдите в область настройки модуля: <a href="%s">%s</a> .
 DoliStoreDesc=DoliStore, официальный магазин внешних модулей Dolibarr ERP / CRM
-DoliPartnersDesc=List of companies providing custom-developed modules or features.<br>Note: since Dolibarr is an open source application, <i>anyone</i> experienced in PHP programming should be able to develop a module.
+DoliPartnersDesc=Список компаний, предоставляющих индивидуально разработанные модули или функции. <br> Примечание: поскольку Dolibarr является приложением с открытым исходным кодом, <i> любой </i>, имеющий опыт программирования на PHP, должен иметь возможность разработать модуль.
 WebSiteDesc=Внешние веб-сайты для дополнительных модулей (неосновных) ...
 DevelopYourModuleDesc=Некоторые решения для разработки собственного модуля ...
 URL=URL
@@ -280,7 +280,7 @@ NoticePeriod=Период уведомления
 NewByMonth=Новые по месяцам
 Emails=Электронная почта
 EMailsSetup=Настройка электронной почты
-EMailsDesc=This page allows you to set parameters or options for email sending.
+EMailsDesc=Эта страница позволяет вам установить параметры или опции для отправки электронной почты.
 EmailSenderProfiles=Профили отправителей электронной почты
 EMailsSenderProfileDesc=Вы можете оставить этот раздел пустым. Если вы введете здесь несколько писем, они будут добавлены в список возможных отправителей в поле со списком, когда вы напишите новое письмо.
 MAIN_MAIL_SMTP_PORT=Порт SMTP/SMTPS (значение по умолчанию в php.ini: <b>%s</b> )
@@ -288,17 +288,17 @@ MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (значение по умолчанию
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=Порт SMTP / SMTPS (не определен в PHP в Unix-подобных системах)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP / SMTPS Host (не определен в PHP в Unix-подобных системах)
 MAIN_MAIL_EMAIL_FROM=Адрес электронной почты отправителя для автоматической отправки электронных писем (значение по умолчанию в php.ini: <b>%s</b> )
-MAIN_MAIL_ERRORS_TO=Email used for error returns emails (fields 'Errors-To' in emails sent)
+MAIN_MAIL_ERRORS_TO=Электронная почта, использованная для сообщения об ошибке, возвращает сообщения электронной почты (поля "Кому на ошибки" в отправленных сообщениях электронной почты)
 MAIN_MAIL_AUTOCOPY_TO= Копировать (СК) все отправленные письма в
 MAIN_DISABLE_ALL_MAILS=Отключить всю отправку электронной почты (для тестирования или демонстрации)
 MAIN_MAIL_FORCE_SENDTO=Отправляйте все электронные письма (вместо реальных получателей, для целей тестирования)
-MAIN_MAIL_ENABLED_USER_DEST_SELECT=Suggest emails of employees (if defined) into the list of predefined recipient when writing a new email
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Предлагать электронные письма сотрудников (если они определены) в список предопределенных получателей при написании нового электронного письма
 MAIN_MAIL_SENDMODE=Способ отправки электронной почты
 MAIN_MAIL_SMTPS_ID=SMTP ID (если отправляющий сервер требует аутентификации)
 MAIN_MAIL_SMTPS_PW=Пароль SMTP (если отправляющий сервер требует аутентификации)
 MAIN_MAIL_EMAIL_TLS=Использовать шифрование TLS (SSL)
 MAIN_MAIL_EMAIL_STARTTLS=Использовать шифрование TLS (STARTTLS)
-MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Авторизовать les Certificats auto-signés
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Используйте DKIM для создания подписи электронной почты
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Домен электронной почты для использования с DKIM
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Имя селектора DKIM
@@ -310,9 +310,9 @@ MAIN_MAIL_DEFAULT_FROMTYPE=Электронная почта отправите
 UserEmail=Электронная почта пользователя
 CompanyEmail=Электронная почта компании
 FeatureNotAvailableOnLinux=Функция недоступна на Unix подобных систем. Проверьте вашу программу для отправки почты локально.
-FixOnTransifex=Fix the translation on the online translation platform of project
+FixOnTransifex=Исправить перевод на платформе онлайн-перевода проекта
 SubmitTranslation=Если перевод для этого языка не завершен или вы обнаружили ошибки, вы можете исправить это, отредактировав файлы в каталоге <b>langs / %s</b> и отправив свое изменение по адресу www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
+SubmitTranslationENUS=Если перевод для этого языка не завершен или вы обнаружите ошибки, вы можете исправить это, отредактировав файлы в каталоге <b> langs / %s </b> и отправив измененные файлы на dolibarr.org/forum или, если вы разработчик, с PR на github. .com / Dolibarr / dolibarr
 ModuleSetup=Настройка модуля
 ModulesSetup=Настройка Модулей/Приложений
 ModuleFamilyBase=Система
@@ -342,7 +342,7 @@ SetupIsReadyForUse=Развертывание модуля завершено. 
 NotExistsDirect=Альтернативная корневая директория не задана.<br>
 InfDirAlt=Начиная с 3-ей версии, можно определить альтернативный корневой каталог. Это позволяет вам хранить в специальном каталоге, плагины и настраиваемые шаблоны. <br> Просто создайте каталог в корне Dolibarr (например: custom). <br>
 InfDirExample=<br>Затем объявите его в файле <strong>conf.php</strong><br> $dolibarr_main_url_root_alt = '/custom'<br> $dolibarr_main_document_root_alt ='/path/of/dolibarr/htdocs/custom'<br>Если эти строки комментируются с помощью ''#", чтобы включить их, просто раскомментируйте, удалив символ "#''.
-YouCanSubmitFile=You can upload the .zip file of module package from here:
+YouCanSubmitFile=Вы можете загрузить ZIP-файл пакета модуля отсюда:
 CurrentVersion=Текущая версия Dolibarr
 CallUpdatePage=Перейдите на страницу, которая обновляет структуру базы данных и данные: %s.
 LastStableVersion=Последняя стабильная версия
@@ -351,10 +351,10 @@ LastActivationAuthor=Последний активированный автор
 LastActivationIP=Последний активированный IP-адрес
 UpdateServerOffline=Сервер обновления недоступен
 WithCounter=Управление счетчиком
-GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first %s. <br><b>{000000@x}</b> same as the previous one but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then the sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated to the customer. This counter dedicated to customer is reset at same time as the global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
+GenericMaskCodes=Вы можете ввести любую маску нумерации. В этой маске можно использовать следующие теги: <br> <b> {000000} </b> соответствует числу, которое будет увеличиваться на каждом %s. Введите столько нулей, сколько желаемая длина счетчика. Счетчик будет дополнен нулями слева, чтобы было столько же нулей, сколько в маске. <br> <b> {000000 + 000} </b> То же, что и предыдущий, но смещение, соответствующее числу справа от знака +, применяется, начиная с первого %s. <br> <b> {000000 @ x} </b> То же, что и предыдущий, но счетчик сбрасывается на ноль при достижении месяца x (x от 1 до 12, или 0 для использования первых месяцев финансового года, определенных в вашей конфигурации, или от 99 до сбрасывать на ноль каждый месяц). Если используется этот параметр и x равно 2 или больше, то также требуется последовательность {yy} {mm} или {yyyy} {mm}. <br> <b> {dd} </b> день (с 01 по 31). <br> <b> {mm} </b> месяц (с 01 по 12). <br> <b> {yy} </b>, <b> {yyyy} </b> или <b> {yb} 1398 или более 2-х годов, 1398 или 2 года, более 217a4. <br>
+GenericMaskCodes2= <b> {cccc} </b> код клиента, состоящий из n символов <br> <b> {cccc000} a09a4b739f, после кода клиента следует код клиента. Этот счетчик, предназначенный для клиента, сбрасывается одновременно с глобальным счетчиком. <br> <b> {tttt} </b> Код стороннего типа, состоящий из n символов (см. меню Главная - Настройка - Словарь - Типы третьих лиц). Если вы добавите этот тег, счетчик будет отличаться для каждого типа третьей стороны. <br>
 GenericMaskCodes3=Все остальные символы в маске останутся нетронутыми. <br>Пробелы не допускается. <br>
-GenericMaskCodes3EAN=All other characters in the mask will remain intact (except * or ? in 13th position in EAN13).<br>Spaces are not allowed.<br>In EAN13, the last character after the last } in 13th position should be * or ? . It will be replaced by the calculated key.<br>
+GenericMaskCodes3EAN=Все остальные символы в маске останутся неизменными (кроме * или? В 13-й позиции в EAN13). <br> Пробелы не допускаются. <br> В EAN13 последний символ после последнего} в 13-й позиции должен быть * или? . Он будет заменен рассчитанным ключом. <br>
 GenericMaskCodes4a=<U> Пример для 99-го %s контрагента Компании с датой 2007-01-31: </u> <br>
 GenericMaskCodes4b=<u>Пример контрагента созданного 2007-03-01:</u> <br>
 GenericMaskCodes4c=<u>Пример товара созданного 2007-03-01:</u><br>
@@ -382,7 +382,7 @@ ExamplesWithCurrentSetup=Примеры с текущей конфигураци
 ListOfDirectories=Список каталогов с шаблонами OpenDocument
 ListOfDirectoriesForModelGenODT=Список каталогов, содержащих файлы шаблонов в формате OpenDocument. <br><br> Укажите здесь полный путь к каталогу. <br> Каждый каталог с новой строки. <br> Чтобы добавить каталог GED-модуля, добавьте здесь <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b> . <br><br> Файлы в этих каталогах должны заканчиваться на <b>.odt</b> или <b>.ods</b> .
 NumberOfModelFilesFound=Количество файлов шаблонов ODT/ODS, найденных в этих каталогах
-ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
+ExampleOfDirectoriesForModelGen=Примеры синтаксиса: <br> c: \\ myapp \\ mydocumentdir \\ mysubdir <br> / home / myapp / mydocumentdir / mysubdir <br> DOL_DATA_ROOT / ecm / ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br> Прежде чем сохранить шаблоны в этих каталогах прочитайте документацию на Wiki чтобы узнать, как создать свой шаблоны ODT документов:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Расположение Имени / Фамилиии
@@ -398,12 +398,13 @@ ModuleMustBeEnabledFirst=Для использования этой функци
 SecurityToken=Ключ для шифрования URL-адресов
 NoSmsEngine=Менеджер отправления SMS недоступен. Диспетчер отправления SMS не устанавливается вместе с дистрибутивом по умолчанию, поскольку он зависит от внешнего поставщика, но некоторые из них можно найти на %s.
 PDF=PDF
-PDFDesc=Global options for PDF generation
-PDFAddressForging=Rules for address section
+PDFDesc=Глобальные параметры для создания PDF
+PDFOtherDesc=Вариант PDF, специфичный для некоторых модулей
+PDFAddressForging=Правила для адресного раздела
 HideAnyVATInformationOnPDF=Скрыть всю информацию, связанную с налогом с продаж / НДС
 PDFRulesForSalesTax=Правила для налога с продаж/НДС
 PDFLocaltax=Правила для %s
-HideLocalTaxOnPDF=Hide %s rate in column Sale Tax / VAT
+HideLocalTaxOnPDF=Скрыть ставку %s в столбце Налог с продаж / НДС
 HideDescOnPDF=Скрыть описание товара
 HideRefOnPDF=Скрыть ссылки на продукты.
 HideDetailsOnPDF=Скрыть детали о линейки продуктов
@@ -413,16 +414,16 @@ UrlGenerationParameters=Параметры безопасных URL`ов
 SecurityTokenIsUnique=Использовать уникальный параметр securekey для каждого URL
 EnterRefToBuildUrl=Введите ссылку на объект %s
 GetSecuredUrl=Получить рассчитанный URL
-ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
+ButtonHideUnauthorized=Скрыть кнопки неавторизованных действий также для внутренних пользователей (в противном случае они будут выделены серым цветом)
 OldVATRates=Предыдущее значение НДС
 NewVATRates=Новое значение НДС
 PriceBaseTypeToChange=Изменять базовые цены на определенную величину
 MassConvert=Запустить пакетное преобразование
-PriceFormatInCurrentLanguage=Price Format In Current Language
+PriceFormatInCurrentLanguage=Формат цены на текущем языке
 String=Строка
-String1Line=String (1 line)
+String1Line=Строка (1 строка)
 TextLong=Длинный текст
-TextLongNLines=Long text (n lines)
+TextLongNLines=Длинный текст (n строк)
 HtmlText=Html текст
 Int=Целое
 Float=С плавающей запятой
@@ -442,17 +443,17 @@ ExtrafieldCheckBox=Флажок
 ExtrafieldCheckBoxFromList=Флажки из таблицы
 ExtrafieldLink=Ссылка на объект
 ComputedFormula=Вычисленное поле
-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->fetchNoCompute($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->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
+ComputedFormulaDesc=Вы можете ввести здесь формулу, используя другие свойства объекта или любую кодировку PHP, чтобы получить динамическое вычисленное значение. Вы можете использовать любые PHP-совместимые формулы, включая знак "?" оператор условия и следующий глобальный объект: <strong> $ db, $ conf, $ langs, $ mysoc, $ user, $ object </strong>. <br> <strong> ПРЕДУПРЕЖДЕНИЕ </strong>: могут быть доступны только некоторые свойства объекта $. Если вам нужны не загруженные свойства, просто выберите объект в формулу, как во втором примере. <br> Использование вычисляемого поля означает, что вы не можете ввести себе какое-либо значение из интерфейса. Кроме того, в случае синтаксической ошибки формула может ничего не вернуть. <br> <br> Пример формулы: <br> $ object-> id < 10 ? round($object-> id / 2, 2): ($ object-> id + 2 * $ user-> id) * (int) substr ($ mysoc-> zip, 1 ) <br> <br> Пример перезагрузки объекта <br> (($ reloadedobj = new Societe ($ db)) && ($ reloadedobj-> fetchNoCompute ($ obj-> id? $ obj-> id-> $ obj > rowid: $ object-> id))> 0))? $ reloadedobj-> array_options ['options_extrafieldkey'] * $ reloadedobj-> capital / 5: '-1' <br> <br> Другой пример формулы для принудительной загрузки объекта и его родительского объекта: <br> (($ reloadedobjb = new )) && ($ reloadedobj-> fetchNoCompute ($ object-> id)> 0) && ($ secondloadedobj = новый проект ($ db)) && ($ secondloadedobj-> fetchNoCompute ($ reloadedobj-> fk_project)> 0))? $ secondloadedobj-> ref: 'Родительский проект не найден'
 Computedpersistent=Сохранить вычисленное поле
 ComputedpersistentDesc=Вычисленные дополнительные поля будут сохранены в базе данных, однако значение будет пересчитано только при изменении объекта этого поля. Если вычисляемое поле зависит от других объектов или глобальных данных, это значение может быть неправильным!!
 ExtrafieldParamHelpPassword=Оставьте это поле пустым, чтобы значение хранилось без шифрования (поле должно быть скрыто только звездочкой на экране). <br> Установите 'auto', чтобы использовать правило шифрования по умолчанию для сохранения пароля в базе данных (тогда считываемое значение будет только хешем, никакой возможности восстановить исходное значение)
 ExtrafieldParamHelpselect=Список значений должен быть строками формата: ключ, значение (где ключ не может быть равен 0) <br><br> например: <br> 1, значение1 <br> 2, значение2 <br> code3, значение3 <br> ... <br><br> Чтобы иметь список в зависимости от другого списка дополнительных атрибутов: <br> 1, значение1|options_ <i>parent_list_code</i> : parent_key <br> 2, значение2|options_ <i>parent_list_code</i> : parent_key <br><br> Чтобы иметь список в зависимости от другого списка: <br> 1, значение1 | <i>parent_list_code</i> : parent_key <br> 2, значение2 | <i>parent_list_code</i> : parent_key
 ExtrafieldParamHelpcheckbox=Список значений должен быть строками с форматом: ключ, значение (где ключ не может быть равен 0) <br><br> например: <br> 1, значение1 <br> 2, значение2 <br> 3, значение3 <br> ...
 ExtrafieldParamHelpradio=Список значений должен быть строками с форматом: ключ, значение (где ключ не может быть равен 0) <br><br> например: <br> 1, значение1 <br> 2, значение2 <br> 3, значение3 <br> ...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarly a primary int key<br>- filtersql is a SQL condition. It can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<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::filtersql<br>Example: c_typent:libelle:id::filtersql<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=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
-ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
+ExtrafieldParamHelpsellist=Список значений берется из таблицы <br> Синтаксис: имя_таблицы: label_field: id_field :: Filtersql <br> Пример: c_typent: libelle: id :: filtersql <br> a0342fccfda19bccfz0 a0342fccfda19bccfz0 - условие ключевого слова a0342fccfda19bccfz0 - id_field является основным параметром SQL. Это может быть простой тест (например, active = 1) для отображения только активного значения <br> Вы также можете использовать $ ID $ в фильтре, который является текущим идентификатором текущего объекта <br> Чтобы использовать SELECT в фильтре, используйте ключевое слово $ SEL $ для обход защиты от инъекций. <br>, если вы хотите выполнить фильтрацию по дополнительным полям, используйте синтаксис extra.fieldcode = ... (где код поля - это код дополнительного поля) <br> <br> Чтобы список зависел от другого дополнительного списка атрибутов: <br> c_tyle :pent <i> parent_list_code </i> | parent_column: filter <br> <br> Чтобы список зависел от другого списка, выполните следующие действия:
+ExtrafieldParamHelpchkbxlst=Список значений взят из таблицы <br> Синтаксис: имя_таблицы: label_field: id_field :: Filtersql <br> Пример: c_typent: libelle: id :: filtersql <br> <br> filter может быть активным только значение 1 test = Active также можно использовать $ ID $ в фильтре, ведь это текущий идентификатор текущего объекта. код extrafield) <br> <br> для того, чтобы иметь список в зависимости от другого списка дополнительного атрибута: <br> c_typent: Libelle: ID: options_ <i> parent_list_code </i> | parent_column: фильтр <br> <br> для того, чтобы иметь список в зависимости от другого списка: <br> c_typent: libelle: id: <i> parent_list_code </i> | parent_column: фильтр
+ExtrafieldParamHelplink=Параметры должны быть ObjectName: Classpath <br> Синтаксис: ObjectName: Classpath
+ExtrafieldParamHelpSeparator=Оставить пустым для простого разделителя <br> Установите для этого разделителя значение 1 (по умолчанию открыто для нового сеанса, затем статус сохраняется для каждого сеанса пользователя) <br> Установите значение 2 для сжимающегося разделителя (по умолчанию свернуто для нового сеанса, затем статус сохраняется для каждой пользовательской сессии)
 LibraryToBuildPDF=Библиотека используемая для создания PDF-файлов
 LocalTaxDesc=Некоторые страны могут применять два или три налога на каждую позицию счета. Если это так, выберите тип второго и третьего налога и его ставку. Возможные типы: <br> 1: местный налог применяется к продуктам и услугам без НДС (местный налог рассчитывается на сумму без налога) <br> 2: местный налог применяется к продуктам и услугам, включая НДС (местный налог рассчитывается на сумму + основной налог) <br> 3: местный налог применяется к продуктам без НДС (местный налог рассчитывается на сумму без налога) <br> 4: местный налог применяется к продуктам, включая НДС (местный налог рассчитывается на сумму + основной НДС) <br> 5: местный налог применяется к услугам без НДС (местный налог рассчитывается на сумму без налога) <br> 6: местный налог применяется к услугам, включая НДС (местный налог рассчитывается на сумму + налог)
 SMS=SMS
@@ -460,12 +461,12 @@ LinkToTestClickToDial=Введите номер телефона для отоб
 RefreshPhoneLink=Обновить ссылку
 LinkToTest=Ссылка создана для пользователя <strong>%s</strong> (нажмите на телефонный номер, чтобы протестировать)
 KeepEmptyToUseDefault=Оставьте пустым для использования значения по умолчанию
-KeepThisEmptyInMostCases=In most cases, you can keep this field empy.
+KeepThisEmptyInMostCases=В большинстве случаев вы можете оставить это поле пустым.
 DefaultLink=Ссылка по умолчанию
 SetAsDefault=Установить по умолчанию
 ValueOverwrittenByUserSetup=Предупреждение: это значение может быть перезаписано в настройках пользователя (каждый пользователь может задать свои настройки ссылки ClickToDial)
-ExternalModule=External module
-InstalledInto=Installed into directory %s
+ExternalModule=Внешний модуль
+InstalledInto=Установлен в каталог %s
 BarcodeInitForThirdparties=Массовая инициализация штрих-кода для контрагентов
 BarcodeInitForProductsOrServices=Массовое создание или удаление штрих-кода для Товаров или Услуг
 CurrentlyNWithoutBarCode=В настоящее время у вас есть <strong>%s</strong>запись на <strong>%s</strong>%s без определенного штрих-кода.
@@ -484,18 +485,18 @@ EnableAndSetupModuleCron=Если вы хотите, чтобы этот пов
 ModuleCompanyCodeCustomerAquarium=%s, за которым следует код клиента для кода учетной записи клиента
 ModuleCompanyCodeSupplierAquarium=%s, за которым следует код поставщика для кода учетной записи поставщика
 ModuleCompanyCodePanicum=Верните пустой учетный код.
-ModuleCompanyCodeDigitaria=Returns a compound accounting code according to the name of the third party. The code consists of a prefix that can be defined in the first position followed by the number of characters defined in the third party code.
-ModuleCompanyCodeCustomerDigitaria=%s followed by the truncated customer name by the number of characters: %s for the customer accounting code.
-ModuleCompanyCodeSupplierDigitaria=%s followed by the truncated supplier name by the number of characters: %s for the supplier accounting code.
+ModuleCompanyCodeDigitaria=Возвращает составной бухгалтерский код в соответствии с именем третьей стороны. Код состоит из префикса, который может быть определен в первой позиции, за которым следует количество символов, определенных в стороннем коде.
+ModuleCompanyCodeCustomerDigitaria=%s, за которым следует усеченное имя клиента с указанием количества символов: %s для кода учета клиента.
+ModuleCompanyCodeSupplierDigitaria=%s, за которым следует усеченное имя поставщика с указанием количества символов: %s для бухгалтерского кода поставщика.
 Use3StepsApproval=По умолчанию заказы на поставку должны быть созданы и одобрены двумя разными пользователями (один шаг/пользователь для создания и один шаг/пользователь для одобрения. Обратите внимание, что если у пользователя есть как разрешение на создание и утверждение, достаточно одного шага/пользователя) , Вы можете задать эту опцию, чтобы ввести утверждение третьего шага/пользователя, если сумма превышает выделенное значение (так что потребуется 3 шага: 1 = валидация, 2 = первое утверждение и 3 = второе одобрение, если суммы достаточно). <br>Установите это для пустого, если достаточно одного утверждения (2 шага), установите его на очень низкое значение (0,1), если требуется второе утверждение (3 шага).
 UseDoubleApproval=Используйте одобрение на 3 шага, когда сумма (без налога) выше ...
-WarningPHPMail=WARNING: The setup to send emails from the application is using the default generic setup. It is often better to setup outgoing emails to use the email server of your Email Service Provider instead of the default setup for several reasons:
-WarningPHPMailA=- Using the server of the Email Service Provider increases the trustability of your email, so it increases the deliverablity without being flagged as SPAM
-WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota).
-WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
-WarningPHPMailD=If the method 'PHP Mail' is really the method you would like to use, you can remove this warning by adding the constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP to 1 in Home - Setup - Other.
+WarningPHPMail=ВНИМАНИЕ! Для отправки электронных писем из приложения используется стандартная общая настройка. Часто лучше настроить исходящие электронные письма для использования почтового сервера вашего поставщика услуг электронной почты вместо настройки по умолчанию по нескольким причинам:
+WarningPHPMailA=- Использование сервера поставщика услуг электронной почты повышает надежность вашей электронной почты, поэтому она увеличивает доставку без пометки как спам
+WarningPHPMailB=- Некоторые поставщики услуг электронной почты (например, Yahoo) не позволяют отправлять электронную почту с другого сервера, кроме их собственного. Ваша текущая настройка использует сервер приложения для отправки электронной почты, а не сервер вашего провайдера электронной почты, поэтому некоторые получатели (тот, который совместим с ограничительным протоколом DMARC) будут спрашивать вашего провайдера электронной почты, могут ли они принять вашу электронную почту, и некоторые поставщики электронной почты. (например, Yahoo) могут ответить «нет», потому что сервер им не принадлежит, поэтому некоторые из отправленных вами электронных писем могут быть не приняты для доставки (будьте осторожны также с квотой отправки вашего почтового провайдера).
+WarningPHPMailC=- Использование SMTP-сервера вашего собственного поставщика услуг электронной почты для отправки электронных писем также интересно, поэтому все электронные письма, отправленные из приложения, также будут сохранены в вашем каталоге «Отправленные» вашего почтового ящика.
+WarningPHPMailD=Если метод «PHP Mail» действительно является тем методом, который вы хотели бы использовать, вы можете удалить это предупреждение, добавив константу MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP к 1 в Home - Setup - Other.
 WarningPHPMail2=Если вашему SMTP-провайдеру электронной почты необходимо ограничить почтовый клиент некоторыми IP-адресами (это очень редко), это IP-адрес почтового пользователя (MUA) для вашего приложения ERP CRM: <strong>%s</strong>.
-WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+WarningPHPMailSPF=Если доменное имя в вашем адресе электронной почты отправителя защищено записью SPF (спросите у регистратора доменного имени), вы должны добавить следующие IP-адреса в запись SPF DNS вашего домена: <strong> %s </strong>.
 ClickToShowDescription=Нажмите, чтобы посмотреть описание
 DependsOn=Этот модуль нуждается в модуле (модулях)
 RequiredBy=Этот модуль требуется для модуля (модулей)
@@ -543,11 +544,11 @@ Module25Desc=Управление заказами на продажу
 Module30Name=Счета-фактуры
 Module30Desc=Управление счетами и кредитными авизо для клиентов. Управление счетами и кредитными авизо для поставщиков
 Module40Name=Поставщики
-Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
+Module40Desc=Продавцы и управление закупками (заказы на поставку и выставление счетов поставщикам)
 Module42Name=Отчет об ошибках
 Module42Desc=Средства регистрации (file, syslog, ...). Такие журналы предназначены для технических/отладочных целей.
-Module43Name=Debug Bar
-Module43Desc=A tool for developper adding a debug bar in your browser.
+Module43Name=Панель отладки
+Module43Desc=Инструмент для разработчика, добавляющий панель отладки в ваш браузер.
 Module49Name=Редакторы
 Module49Desc=Управления редактором
 Module50Name=Продукция
@@ -555,21 +556,21 @@ Module50Desc=Управление продуктами
 Module51Name=Массовые рассылки
 Module51Desc=Управление массовыми бумажными отправлениями
 Module52Name=Акции
-Module52Desc=Stock management
+Module52Desc=Управление запасами
 Module53Name=Услуги
 Module53Desc=Управление Услугами
 Module54Name=Контакты/Подписки
 Module54Desc=Управление контрактами (услуги или периодические подписки)
 Module55Name=Штрих-коды
-Module55Desc=Управление штрих-кодами
-Module56Name=Payment by credit transfer
-Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
-Module57Name=Payments by Direct Debit
-Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
+Module55Desc=Barcode or QR code management
+Module56Name=Оплата кредитным переводом
+Module56Desc=Управление оплатой поставщиков по кредитным переводам. Он включает создание файла SEPA для европейских стран.
+Module57Name=Платежи прямым дебетом
+Module57Desc=Управление распоряжениями прямого дебетования. Он включает создание файла SEPA для европейских стран.
 Module58Name=ClickToDial
 Module58Desc=Интеграция с системами НажатьДляЗвонка (Asterisk, ...)
-Module60Name=Stickers
-Module60Desc=Management of stickers
+Module60Name=Наклейки
+Module60Desc=Управление стикерами
 Module70Name=Проектные работы
 Module70Desc=Управление мероприятиями
 Module75Name=Транспортные расходы
@@ -587,9 +588,9 @@ Module200Desc=Синхронизация каталогов LDAP
 Module210Name=PostNuke
 Module210Desc=Интергация с PostNuke
 Module240Name=Экспорт данных
-Module240Desc=Tool to export Dolibarr data (with assistance)
+Module240Desc=Инструмент для экспорта данных Dolibarr (с помощью)
 Module250Name=Импорт данных
-Module250Desc=Tool to import data into Dolibarr (with assistance)
+Module250Desc=Инструмент для импорта данных в Dolibarr (с помощью)
 Module310Name=Участники
 Module310Desc=Управление участниками фонда
 Module320Name=RSS-канал
@@ -606,7 +607,7 @@ Module510Name=Зарплаты
 Module510Desc=Записывать и отслеживать выплаты сотрудникам
 Module520Name=Ссуды
 Module520Desc=Управление ссудами
-Module600Name=Notifications on business event
+Module600Name=Уведомления о деловом мероприятии
 Module600Desc=Отправка уведомлений по электронной почте, инициированных бизнес-событием: для каждого пользователя (настройка, определенная для каждого пользователя), для сторонних контактов (настройка, определенная для каждого контрагента) или для определенных электронных писем
 Module600Long=Обратите внимание, что этот модуль отправляет электронные письма в режиме реального времени, когда происходит определенное деловое событие. Если вы ищете функцию для отправки напоминаний по электронной почте для событий в повестке дня, перейдите к настройке модуля Agenda.
 Module610Name=Варианты продукта
@@ -647,15 +648,15 @@ Module2900Desc=Подключение к службе GeoIP MaxMind для пр
 Module3200Name=Неограниченные архивы
 Module3200Desc=Включите неизменяемый журнал деловых событий. События архивируются в режиме реального времени. Журнал представляет собой доступную только для чтения таблицу связанных событий, которые можно экспортировать. Этот модуль может быть обязательным для некоторых стран.
 Module3400Name=Социальные сети
-Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
+Module3400Desc=Включите поля социальных сетей в третьи стороны и адреса (скайп, твиттер, фейсбук, ...).
 Module4000Name=Управление персоналом
 Module4000Desc=Управление персоналом (управление отделом, контракты и чувства сотрудников)
 Module5000Name=Группы компаний
 Module5000Desc=Управление группами компаний
-Module6000Name=Inter-modules Workflow
-Module6000Desc=Workflow management between different modules (automatic creation of object and/or automatic status change)
+Module6000Name=Межмодульный рабочий процесс
+Module6000Desc=Управление рабочим процессом между различными модулями (автоматическое создание объекта и / или автоматическое изменение статуса)
 Module10000Name=Веб-сайты
-Module10000Desc=Create websites (public) with a WYSIWYG editor. This is a webmaster or developer oriented CMS (it is better to know HTML and CSS language). 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.
+Module10000Desc=Создавайте веб-сайты (общедоступные) с помощью редактора WYSIWYG. Это CMS, ориентированная на веб-мастеров или разработчиков (лучше знать язык HTML и CSS). Просто настройте свой веб-сервер (Apache, Nginx, ...) так, чтобы он указывал на выделенный каталог Dolibarr, чтобы он был в сети в Интернете с вашим собственным доменным именем.
 Module20000Name=Управление запросами на отпуск
 Module20000Desc=Определить и отслеживать запросы сотрудников на отпуск
 Module39000Name=Товарные партии
@@ -667,19 +668,19 @@ Module50000Desc=Предложите покупателям страницу о
 Module50100Name=POS SimplePOS
 Module50100Desc=Модуль торговой точки SimplePOS (простой POS).
 Module50150Name=POS TakePOS
-Module50150Desc=Point of Sale module TakePOS (touchscreen POS, for shops, bars or restaurants).
+Module50150Desc=Модуль торговой точки TakePOS (кассовый терминал с сенсорным экраном, для магазинов, баров или ресторанов).
 Module50200Name=Paypal
 Module50200Desc=Предложите клиентам страницу онлайн-платежей PayPal (учетная запись PayPal или кредитные / дебетовые карты). Это может быть использовано, чтобы позволить вашим клиентам осуществлять специальные платежи или платежи, связанные с конкретным объектом Dolibarr (счет, заказ и т. д.)
-Module50300Name=Stripe
+Module50300Name=Полоса
 Module50300Desc=Предложите клиентам страницу онлайн-оплаты Stripe (кредитные / дебетовые карты). Это может быть использовано, чтобы позволить вашим клиентам осуществлять специальные платежи или платежи, связанные с конкретным объектом Dolibarr (счет, заказ и т. д.)
 Module50400Name=Бухгалтерский учет (двойная запись)
-Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
+Module50400Desc=Ведение бухгалтерского учета (двойные записи, поддержка Главной и вспомогательной бухгалтерских книг). Экспортируйте бухгалтерскую книгу в несколько других форматов бухгалтерского программного обеспечения.
 Module54000Name=Модуль PrintIPP
 Module54000Desc=Прямая печать (без открытия документов) с использованием интерфейса Cups IPP (принтер должен быть виден с сервера, а CUPS должен быть установлен на сервере).
 Module55000Name=Голосование, обзор или голосование
 Module55000Desc=Создавайте онлайн-опросы, обзоры или голосования (например, Doodle, Studs, RDVz и т. Д.)
 Module59000Name=Наценки
-Module59000Desc=Module to follow margins
+Module59000Desc=Модуль для отслеживания полей
 Module60000Name=Комиссии
 Module60000Desc=Модуль управления комиссиями
 Module62000Name=Обязанности по доставке товаров
@@ -688,7 +689,7 @@ Module63000Name=Ресурсы
 Module63000Desc=Управление ресурсами (принтеры, машины, комнаты, ...) для распределения на события
 Permission11=Просмотр счетов-фактур клиентов
 Permission12=Создание/Изменение счета-фактуры
-Permission13=Invalidate customer invoices
+Permission13=Аннулирование счетов-фактур клиентов
 Permission14=Проверка счета-фактуры
 Permission15=Отправить по почте счета-фактуры
 Permission16=Создать платежи счетов-фактур
@@ -705,7 +706,7 @@ Permission32=Создание / изменение продукции / услу
 Permission34=Удаленные продукция / услуги
 Permission36=Просмотр / управление скрытой продукцией / услугами
 Permission38=Экспорт продукции
-Permission39=Ignore minimum price
+Permission39=Игнорировать минимальную цену
 Permission41=Просмотрите проекты и задачи (общий проект и мои проекты). Можно также ввести время, затраченное на вас или ваших подчиненных, на назначенные задачи (расписание)
 Permission42=Создание/изменение проектов (общий и мои проекты). Может также создавать задачи и назначать пользователей для проекта и задач
 Permission44=Удалить проекты (общие и мои проекты)
@@ -714,9 +715,9 @@ Permission61=Смотреть мероприятия
 Permission62=Создание / измение мероприятий
 Permission64=Удаление мероприятий
 Permission67=Экспорт мероприятий
-Permission68=Send interventions by email
-Permission69=Validate interventions
-Permission70=Invalidate interventions
+Permission68=Отправляйте сообщения по электронной почте
+Permission69=Подтвердите вмешательства
+Permission70=Недействительные вмешательства
 Permission71=Смотреть участников
 Permission72=Создать / изменить участников
 Permission74=Удалить участников
@@ -739,7 +740,7 @@ Permission95=Смотреть отчеты
 Permission101=Смотреть отправки
 Permission102=Создать / изменить отправки
 Permission104=Проверка отправок
-Permission105=Send sendings by email
+Permission105=Отправлять рассылки по электронной почте
 Permission106=Экспортировать отправки
 Permission109=Удалить отправки
 Permission111=Читать финансовую отчетность
@@ -784,7 +785,7 @@ Permission187=Закрыть заказы на покупку
 Permission188=Отменить заказы на покупку
 Permission192=Создать строки
 Permission193=Отмена строк
-Permission194=Read the bandwidth lines
+Permission194=Прочтите строки пропускной способности
 Permission202=Создать ADSL соединения
 Permission203=Заказ соединения заказов
 Permission204=Заказ подключений
@@ -814,8 +815,8 @@ PermissionAdvanced253=Создать / изменить внутренних / 
 Permission254=Создать / изменить только внешних пользователей
 Permission255=Изменить пароли других пользователей
 Permission256=Удалить или отключить других пользователей
-Permission262=Extend access to all third parties AND their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
-Permission263=Extend access to all third parties WITHOUT their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission262=Расширить доступ ко всем третьим лицам И их объектам (не только третьим лицам, для которых пользователь является торговым представителем). <br> Не действует для внешних пользователей (всегда ограничивается только ими самими для предложений, заказов, счетов-фактур, контрактов и т. д.). <br> Не действует для проектов (имеют значение только правила, касающиеся разрешений, видимости и назначения проектов).
+Permission263=Расширить доступ для всех третьих лиц БЕЗ их объектов (не только третьим лицам, для которых пользователь является торговым представителем). <br> Не действует для внешних пользователей (всегда ограничивается только ими самими для предложений, заказов, счетов-фактур, контрактов и т. д.). <br> Не действует для проектов (имеют значение только правила, касающиеся разрешений, видимости и назначения проектов).
 Permission271=Читать CA
 Permission272=Читать счета
 Permission273=Выпуск счетов
@@ -848,10 +849,10 @@ Permission402=Создать / изменить скидки
 Permission403=Проверить скидки
 Permission404=Удалить скидки
 Permission430=Использовать панель отладки
-Permission511=Read payments of salaries (yours and subordinates)
-Permission512=Создание/изменение выплат зарплат
-Permission514=Удалить выплаты зарплаты
-Permission517=Read payments of salaries of everybody
+Permission511=Read salaries and payments (yours and subordinates)
+Permission512=Create/modify salaries and payments
+Permission514=Delete salaries and payments
+Permission517=Read salaries and payments everybody
 Permission519=Экспорт зарплат
 Permission520=Открыть ссуды
 Permission522=Создать/изменить ссуды
@@ -863,19 +864,19 @@ Permission532=Создать / изменить услуги
 Permission534=Удаление услуг
 Permission536=Смотреть / Управлять скрытыми услугами
 Permission538=Экспорт услуг
-Permission561=Read payment orders by credit transfer
-Permission562=Create/modify payment order by credit transfer
-Permission563=Send/Transmit payment order by credit transfer
-Permission564=Record Debits/Rejections of credit transfer
-Permission601=Read stickers
-Permission602=Create/modify stickers
-Permission609=Delete stickers
+Permission561=Чтение платежных поручений по кредитному переводу
+Permission562=Создание / изменение платежного поручения с помощью кредитного перевода
+Permission563=Отправка / передача платежного поручения с помощью кредитного перевода
+Permission564=Записывать дебет / отказ в переводе кредита
+Permission601=Читать стикеры
+Permission602=Создавать / изменять стикеры
+Permission609=Удалить стикеры
 Permission650=Просмотр ведомости материалов
 Permission651=Создание/обновление ведомостей материалов
 Permission652=Удалить списки материалов
-Permission660=Read Manufacturing Order (MO)
-Permission661=Create/Update Manufacturing Order (MO)
-Permission662=Delete Manufacturing Order (MO)
+Permission660=Прочитать производственный заказ (MO)
+Permission661=Создание / обновление производственного заказа (MO)
+Permission662=Удалить производственный заказ (MO)
 Permission701=Просмотр пожертвований
 Permission702=Создание / изменение пожертвований
 Permission703=Удаление пожертвований
@@ -885,18 +886,18 @@ Permission773=Удаление отчётов о затратах
 Permission774=Просмотр всех отчётов о затратах (даже для неподчинённых пользователей)
 Permission775=Утвердить отчёты о расходах
 Permission776=Оплата отчётов о затратах
-Permission777=Read expense reports of everybody
-Permission778=Create/modify expense reports of everybody
+Permission777=Читайте отчеты о расходах всех
+Permission778=Создавать / изменять отчеты о расходах для всех
 Permission779=Экспорт отчётов о затратах
 Permission1001=Просмотр запасов
 Permission1002=Создать/изменить склады
 Permission1003=Удалить склады
 Permission1004=Просмотр перемещений по складу
 Permission1005=Создание / изменение перемещений на складе
-Permission1101=Read delivery receipts
-Permission1102=Create/modify delivery receipts
-Permission1104=Validate delivery receipts
-Permission1109=Delete delivery receipts
+Permission1101=Прочитать квитанции о доставке
+Permission1102=Создание / изменение квитанций о доставке
+Permission1104=Подтвердите квитанции о доставке
+Permission1109=Удалить квитанции о доставке
 Permission1121=Просмотр предложения поставщиков
 Permission1122=Создание/изменение предложений поставщиков
 Permission1123=Проверить предложения поставщика
@@ -911,9 +912,9 @@ Permission1185=Утвердить заказы на покупку
 Permission1186=Заказать заказы на покупку
 Permission1187=Подтвердить получение заказов на покупку
 Permission1188=Удалить заказы на покупку
-Permission1189=Check/Uncheck a purchase order reception
+Permission1189=Установите / снимите отметку с получения заказа на покупку
 Permission1190=Утвердить (второе утверждение) заказы на покупку
-Permission1191=Export supplier orders and their attributes
+Permission1191=Экспорт заказов поставщиков и их атрибутов
 Permission1201=Получите результат экспорта
 Permission1202=Создание / Изменение экспорта
 Permission1231=Просмотреть счета поставщиков
@@ -927,11 +928,11 @@ Permission1251=Запуск массового импорта внешних д
 Permission1321=Экспорт клиентом счета-фактуры, качества и платежей
 Permission1322=Повторно открыть оплаченный счет
 Permission1421=Экспорт заказов на продажу и атрибутов
-Permission1521=Read documents
-Permission1522=Delete documents
-Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
-Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
-Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
+Permission1521=Читать документы
+Permission1522=Удалить документы
+Permission2401=Читать действия (события или задачи), связанные с его учетной записью пользователя (если он является владельцем события или только что назначен)
+Permission2402=Создавать / изменять действия (события или задачи), связанные с его учетной записью пользователя (если владелец события)
+Permission2403=Удалить действия (события или задачи), связанные с его учетной записью пользователя (если владелец события)
 Permission2411=Просмотреть действия (события или задачи), других
 Permission2412=Создать / изменить действия (события или задачи), других
 Permission2413=Удалить действия (события или задачи), других
@@ -943,7 +944,7 @@ Permission2515=Настройка директорий документов
 Permission2801=Использовать FTP  клиент в режиме только чтения (только просмотр и загрузка файлов)
 Permission2802=Использовать FTP клиент в режиме записи (удаление или выгрузка файлов)
 Permission3200=Просмотреть архивированные события
-Permission3301=Generate new modules
+Permission3301=Создавать новые модули
 Permission4001=Смотреть сотрудников
 Permission4002=Создать сотрудников
 Permission4003=Удалить сотрудников
@@ -958,18 +959,20 @@ Permission20003=Удалить заявления на отпуск
 Permission20004=Читайте все запросы на отпуск (даже пользователь не подчиняется)
 Permission20005=Создавать/изменять запросы на отпуск для всех (даже для пользователей, не подчиненных)
 Permission20006=Запросы на отпуск для партнеров (настройка и обновление баланса)
-Permission20007=Approve leave requests
+Permission20007=Утвердить запросы на отпуск
 Permission23001=Просмотр Запланированных задач
 Permission23002=Создать/обновить Запланированную задачу
 Permission23003=Удалить Запланированную задачу
 Permission23004=Выполнить запланированную задачу
-Permission50101=Use Point of Sale (SimplePOS)
-Permission50151=Use Point of Sale (TakePOS)
+Permission50101=Используйте точку продажи (SimplePOS)
+Permission50151=Использовать точку продажи (TakePOS)
+Permission50152=Редактировать строки продаж
+Permission50153=Редактировать заказанные строки продаж
 Permission50201=Просмотр транзакций
 Permission50202=Импорт транзакций
-Permission50330=Read objects of Zapier
-Permission50331=Create/Update objects of Zapier
-Permission50332=Delete objects of Zapier
+Permission50330=Читать объекты Zapier
+Permission50331=Создание / обновление объектов Zapier
+Permission50332=Удалить объекты Zapier
 Permission50401=Связать продукты и счета с учетными записями
 Permission50411=Просмотр операций в бухгалтерской книге
 Permission50412=Операции записи/редактирования в бухгалтерской книге
@@ -977,7 +980,7 @@ Permission50414=Удалить операции в бухгалтерской к
 Permission50415=Удалить все операции по году и журналу в бухгалтерской книге
 Permission50418=Экспортные операций бухгалтерской книги
 Permission50420=Отчеты и отчеты об экспорте (оборот, баланс, журналы, бухгалтерская книга)
-Permission50430=Define fiscal periods. Validate transactions and close fiscal periods.
+Permission50430=Определите финансовые периоды. Проверяйте транзакции и закрывайте финансовые периоды.
 Permission50440=Управление структурой счетов, настройка бухгалтерского учета
 Permission51001=Просмотр активов
 Permission51002=Создать/обновить активы
@@ -993,26 +996,26 @@ Permission63001=Чтение ресурсов
 Permission63002=Создание/изменение ресурсов
 Permission63003=Удалить ресурсы
 Permission63004=Свяжите ресурсы с повесткой дня
-Permission64001=Allow direct printing
-Permission67000=Allow printing of receipts
-Permission68001=Read intracomm report
-Permission68002=Create/modify intracomm report
-Permission68004=Delete intracomm report
-Permission941601=Read receipts
-Permission941602=Create and modify receipts
-Permission941603=Validate receipts
-Permission941604=Send receipts by email
-Permission941605=Export receipts
-Permission941606=Delete receipts
+Permission64001=Разрешить прямую печать
+Permission67000=Разрешить печать чеков
+Permission68001=Прочитать отчет по внутренней связи
+Permission68002=Создание / изменение внутреннего отчета
+Permission68004=Удалить отчет о внутренней связи
+Permission941601=Уведомления о прочтении
+Permission941602=Создавать и изменять квитанции
+Permission941603=Подтвердить квитанции
+Permission941604=Отправлять квитанции по электронной почте
+Permission941605=Экспортные поступления
+Permission941606=Удалить чеки
 DictionaryCompanyType=Типы контрагента
 DictionaryCompanyJuridicalType=Правовая форма контрагента
-DictionaryProspectLevel=Prospect potential level for companies
-DictionaryProspectContactLevel=Prospect potential level for contacts
+DictionaryProspectLevel=Уровень перспективного потенциала компаний
+DictionaryProspectContactLevel=Уровень перспективного потенциала для контактов
 DictionaryCanton=Штат/Провинция
 DictionaryRegion=Регионы
 DictionaryCountry=Страны
 DictionaryCurrency=Валюты
-DictionaryCivility=Honorific titles
+DictionaryCivility=Почетные титулы
 DictionaryActions=Тип мероприятия
 DictionarySocialContributions=Типы социальных или налоговых сборов
 DictionaryVAT=Значения НДС или налога с продаж
@@ -1037,13 +1040,14 @@ DictionaryEMailTemplates=Шаблоны электронной почты
 DictionaryUnits=Единицы
 DictionaryMeasuringUnits=Единицы измерения
 DictionarySocialNetworks=Социальные сети
-DictionaryProspectStatus=Prospect status for companies
-DictionaryProspectContactStatus=Prospect status for contacts
-DictionaryHolidayTypes=Типы отпуска
+DictionaryProspectStatus=Статус проспекта для компаний
+DictionaryProspectContactStatus=Статус проспекта для контактов
+DictionaryHolidayTypes=Leave - Виды отпуска
 DictionaryOpportunityStatus=Правовой статус  проекта/сделки
 DictionaryExpenseTaxCat=Отчет о расходах - Категории транспорта
 DictionaryExpenseTaxRange=Отчет о расходах - Диапазон по транспортной категории
-DictionaryTransportMode=Intracomm report - Transport mode
+DictionaryTransportMode=Отчет Intracomm - Транспортный режим
+DictionaryBatchStatus=Статус контроля качества партии / серии продукта
 TypeOfUnit=Тип единицы
 SetupSaved=Настройки сохранены
 SetupNotSaved=Установки не сохранены
@@ -1056,7 +1060,7 @@ VATIsNotUsedDesc=По умолчанию предлагаемый налог с
 VATIsUsedExampleFR=Во Франции это означает компании или организации, имеющие реальную фискальную систему (упрощенная реальная или обычная реальная). Система, в которой декларируется НДС.
 VATIsNotUsedExampleFR=Во Франции это означает ассоциации, которые не декларируют НДС, или компании, организации или либеральные профессии, которые выбрали фискальную систему микропредприятий (НДС во франшизе) и уплатили налог на франшизу  без какой-либо декларации НДС. При выборе этого варианта в счетах будет отображаться ссылка "Non applicable Sales tax - art-293B of CGI" («НДС не применяется - art-293B CGI»).
 ##### Local Taxes #####
-TypeOfSaleTaxes=Type of sales tax
+TypeOfSaleTaxes=Тип налога с продаж
 LTRate=Ставка
 LocalTax1IsNotUsed=Не использовать второй налог
 LocalTax1IsUsedDesc=Используйте второй тип налога (кроме первого)
@@ -1080,9 +1084,9 @@ LocalTax2IsUsedDescES=Ставка IRPF (подоходный налог для
 LocalTax2IsNotUsedDescES=По умолчанию предлагается IRPF 0. Конец правления.
 LocalTax2IsUsedExampleES=В Испании работают фрилансеры и независимые профессионалы, предлагающие услуги, и компании, которые выбрали налоговую систему модулей.
 LocalTax2IsNotUsedExampleES=В Испании это предприятия, не подпадающие под налоговую систему модулей.
-RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
-UseRevenueStamp=Use a tax stamp
-UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
+RevenueStampDesc=«Налоговая марка» или «налоговая марка» - это фиксированный налог, взимаемый с каждого счета-фактуры (не зависит от суммы счета-фактуры). Это также может быть процентный налог, но использование второго или третьего типа налога лучше для процентного налога, поскольку налоговые марки не предоставляют никакой отчетности. Лишь немногие страны используют этот вид налога.
+UseRevenueStamp=Используйте налоговую отметку
+UseRevenueStampExample=Значение налоговой отметки по умолчанию определяется в настройках словарей (%s - %s - %s)
 CalcLocaltax=Отчеты о местных налогах
 CalcLocaltax1=Продажи-Покупки
 CalcLocaltax1Desc=Отчёты о местных налогах  - это разница между  местными налогами с продаж и покупок
@@ -1090,12 +1094,12 @@ CalcLocaltax2=Покупки
 CalcLocaltax2Desc=Отчёты о местных налогах  - это итог местных налогов с покупок
 CalcLocaltax3=Продажи
 CalcLocaltax3Desc=Отчёты о местных налогах  - это итог местных налогов с продаж
-NoLocalTaxXForThisCountry=According to the setup of taxes (See %s - %s - %s), your country does not need to use such type of tax
+NoLocalTaxXForThisCountry=Согласно настройке налогов (см. %s - %s - %s), в вашей стране нет необходимости использовать такой тип налога.
 LabelUsedByDefault=Метки, используемые по умолчанию, если нет перевода можно найти код
 LabelOnDocuments=Этикетка на документах
 LabelOrTranslationKey=Метка или ключ перевода
-ValueOfConstantKey=Value of a configuration constant
-ConstantIsOn=Option %s is on
+ValueOfConstantKey=Значение константы конфигурации
+ConstantIsOn=Вариант %s включен
 NbOfDays=Кол-во дней
 AtEndOfMonth=На конец месяца
 CurrentNext=Текущая/Следующая
@@ -1140,10 +1144,10 @@ LoginPage=Страница авторизации
 BackgroundImageLogin=Фоновое изображение
 PermanentLeftSearchForm=Постоянный поиск формы на левом меню
 DefaultLanguage=Язык по умолчанию
-EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
-EnableShowLogo=Show the company logo in the menu
+EnableMultilangInterface=Включите многоязычную поддержку для взаимоотношений с клиентами или поставщиками
+EnableShowLogo=Показывать логотип компании в меню
 CompanyInfo=Компания/Организация
-CompanyIds=Company/Organization identities
+CompanyIds=Идентификационные данные компании / организации
 CompanyName=Имя
 CompanyAddress=Адрес
 CompanyZip=Индекс
@@ -1151,16 +1155,16 @@ CompanyTown=Город
 CompanyCountry=Страна
 CompanyCurrency=Основная валюта
 CompanyObject=Объект компании
-IDCountry=ID country
+IDCountry=ID страны
 Logo=Логотип
-LogoDesc=Main logo of company. Will be used into generated documents (PDF, ...)
-LogoSquarred=Logo (squarred)
-LogoSquarredDesc=Must be a squarred icon (width = height). This logo will be used as the favorite icon or other need like for the top menu bar (if not disabled into display setup).
+LogoDesc=Основной логотип компании. Будет использоваться в сгенерированных документах (PDF, ...)
+LogoSquarred=Логотип (в квадрате)
+LogoSquarredDesc=Должен быть значок в виде квадрата (ширина = высота). Этот логотип будет использоваться в качестве избранного значка или для другой необходимости, например, для верхней панели меню (если он не отключен в настройке дисплея).
 DoNotSuggestPaymentMode=Не рекомендуем
 NoActiveBankAccountDefined=Не определен активный банковский счет
 OwnerOfBankAccount=Владелец банковского счета %s
 BankModuleNotActive=Модуль Банковских счетов не активирован
-ShowBugTrackLink=Define the link "<strong>%s</strong>" (empty to not display this link, 'github' for the link to the Dolibarr project or define directly an url 'https://...')
+ShowBugTrackLink=Определите ссылку «<strong> %s </strong>» (пусто, чтобы не отображать эту ссылку, «github» для ссылки на проект Dolibarr или определите напрямую URL-адрес https: // ... ')
 Alerts=Предупреждения
 DelaysOfToleranceBeforeWarning=Задержка перед отображением предупреждения о:
 DelaysOfToleranceDesc=Установите задержку до того, как значок предупреждения %s будет отображаться на экране для последнего элемента.
@@ -1171,7 +1175,7 @@ Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Заказ не обработан
 Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Заказ на покупку не обработан
 Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Предложение не закрыто
 Delays_MAIN_DELAY_PROPALS_TO_BILL=Предложение не выставлено
-Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Service to activate
+Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Сервис для активации
 Delays_MAIN_DELAY_RUNNING_SERVICES=Просроченная услуга
 Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Неоплаченный счет поставщика
 Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Неоплаченный счет клиента
@@ -1179,15 +1183,15 @@ Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=В ожидании банковс
 Delays_MAIN_DELAY_MEMBERS=Задержка членского взноса
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Чековый депозит не сделан
 Delays_MAIN_DELAY_EXPENSEREPORTS=Отчет о расходах для утверждения
-Delays_MAIN_DELAY_HOLIDAYS=Leave requests to approve
+Delays_MAIN_DELAY_HOLIDAYS=Оставьте запросы на одобрение
 SetupDescription1=Перед началом использования Dolibarr необходимо определить  параметры и включить/настроить модули.
 SetupDescription2=Следующие два раздела являются обязательными (две первые записи в меню настройки):
-SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
-SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
+SetupDescription3= <a href="%s"> %s -> %s </a> <br> <br> Основные параметры, используемые для настройки поведения по умолчанию функций вашего приложения (например, для страны).
+SetupDescription4= <a href="%s"> %s -> %s </a> <br> <br> Это программное обеспечение представляет собой набор из множества модулей / приложений. Модули, связанные с вашими потребностями, должны быть включены и настроены. Записи меню появятся при активации этих модулей.
 SetupDescription5=Другие пункты меню настройки управляют дополнительными параметрами.
-AuditedSecurityEvents=Security events that are audited
-NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
-Audit=Аудит
+AuditedSecurityEvents=События безопасности, которые подвергаются аудиту
+NoSecurityEventsAreAduited=События безопасности не проверяются. Вы можете включить их из меню %s
+Audit=События безопасности
 InfoDolibarr=О Dolibarr
 InfoBrowser=О браузере
 InfoOS=Об ОС
@@ -1195,7 +1199,7 @@ InfoWebServer=О веб-сервере
 InfoDatabase=О базе данных
 InfoPHP=О PHP
 InfoPerf=О производительности
-InfoSecurity=About Security
+InfoSecurity=О безопасности
 BrowserName=Имя браузера
 BrowserOS=Операционная система браузера
 ListOfSecurityEvents=Список Dolibarr безопасность события
@@ -1204,7 +1208,7 @@ LogEventDesc=Включите ведение журнала для опреде
 AreaForAdminOnly=Параметры настройки могут быть установлены только <b> пользователем администратора </b>.
 SystemInfoDesc=Система информации разного техническую информацию Вы получите в режиме только для чтения и видимые только для администраторов.
 SystemAreaForAdminOnly=Эта область доступна только для администраторов. Пользовательские разрешения Dolibarr не могут изменить это ограничение.
-CompanyFundationDesc=Edit the information of your company/organization. Click on "%s" button at the bottom of the page when done.
+CompanyFundationDesc=Отредактируйте информацию о вашей компании / организации. Когда закончите, нажмите кнопку «%s» внизу страницы.
 AccountantDesc=Если у вас есть внешний бухгалтер/бухгалтер, вы можете отредактировать здесь эту информацию.
 AccountantFileNumber=Код бухгалтера
 DisplayDesc=Параметры, влияющие на внешний вид и поведение Dolibarr, могут быть изменены здесь.
@@ -1212,7 +1216,7 @@ AvailableModules=Доступное приложение/модули
 ToActivateModule=Чтобы активировать модуль, перейдите в место настройки (Главная-Настройки-Модули/Приложения).
 SessionTimeOut=Тайм-аут для сессии
 SessionExplanation=Это число гарантирует, что сеанс никогда не истечет до этой задержки, если очиститель сеанса выполняется внутренним чистильщиком сессии PHP (и ничем иным). Внутренний чистильщик сессии PHP не гарантирует, что сессия истечет после этой задержки. Он истечет после этой задержки и при запуске чистильщика сессии, поэтому каждый <b>доступ %s / %s</b> , но только во время доступа, сделанного другими сеансами (если значение равно 0, это означает, что очистка сеанса выполняется только внешним процессом) , <br> Примечание: на некоторых серверах с внешним механизмом очистки сеансов (cron под debian, ubuntu ...) сеансы могут быть уничтожены после периода, определенного внешней установкой, независимо от того, какое значение здесь введено.
-SessionsPurgedByExternalSystem=Sessions on this server seems to be cleaned by an external mechanism (cron under debian, ubuntu ...), probably every <b>%s</b> seconds (= value of parameter <b>session.gc_maxlifetime</b>), so changing the value here has no effect. You must ask the server administrator to change session delay.
+SessionsPurgedByExternalSystem=Кажется, что сеансы на этом сервере очищаются внешним механизмом (cron в debian, ubuntu ...), вероятно, каждые <b> %s </b> секунд (= значение параметра <b> session.gc_max4life имеет эффект. Вы должны попросить администратора сервера изменить задержку сеанса.
 TriggersAvailable=Доступные триггеры
 TriggersDesc=Триггеры - это файлы, которые изменят поведение рабочего процесса Dolibarr после копирования в каталог <b>htdocs/core/triggers</b> . Они реализуют новые действия, активированные в событиях Dolibarr (создание новой компании, проверка счетов, ...).
 TriggerDisabledByName=Триггеры этого файла отключено <b>NORUN-суффикс</b> в названии.
@@ -1221,7 +1225,7 @@ TriggerAlwaysActive=Триггеры в этом файле, всегда акт
 TriggerActiveAsModuleActive=Триггеры в этом файле активны, так как модуль <b>%s</b> включен.
 GeneratedPasswordDesc=Выберите метод, который будет использоваться для автоматически сгенерированных паролей.
 DictionaryDesc=Вставьте все справочные данные. Вы можете добавить свои значения по умолчанию.
-ConstDesc=This page allows you to edit (override) parameters not available in other pages. These are mostly reserved parameters for developers/advanced troubleshooting only.
+ConstDesc=Эта страница позволяет вам редактировать (переопределять) параметры, недоступные на других страницах. В основном это зарезервированные параметры только для разработчиков / расширенного поиска и устранения неисправностей.
 MiscellaneousDesc=Все остальные параметры, связанные с безопасностью, определены здесь.
 LimitsSetup=Пределы / Точная настройка
 LimitsDesc=Вы можете определить пределы, точности и оптимизации, используемые Dolibarr здесь
@@ -1236,7 +1240,7 @@ NoEventOrNoAuditSetup=Событие безопасности не было за
 NoEventFoundWithCriteria=Для этого критерия поиска событие безопасности не найдено.
 SeeLocalSendMailSetup=См. вашей локальной настройки Sendmail
 BackupDesc=<b>Полное</b> резервное копирование установки Dolibarr требует двух шагов.
-BackupDesc2=Backup the contents of the "documents" directory (<b>%s</b>) containing all uploaded and generated files. This will also include all the dump files generated in Step 1. This operation may last several minutes.
+BackupDesc2=Сделайте резервную копию содержимого каталога «документы» (<b> %s </b>), содержащего все загруженные и сгенерированные файлы. Это также будет включать все файлы дампа, созданные на шаге 1. Эта операция может длиться несколько минут.
 BackupDesc3=Резервное копирование структуры и содержимого вашей базы данных (<b>%s</b> ) в файл дампа. Для этого вы можете использовать следующий помощник.
 BackupDescX=Архивный каталог должен храниться в безопасном месте.
 BackupDescY=Генерируемый файла дампа следует хранить в надежном месте.
@@ -1246,16 +1250,16 @@ RestoreDesc2=Восстановить файл резервной копии (н
 RestoreDesc3=Восстановить структуру базы данных и данные из файла резервной копии в базу данных новой установки Dolibarr или в базу данных текущей установки ( <b>%s</b> ). Предупреждение: после завершения восстановления вы должны использовать логин / пароль, который существовал во время резервного копирования / установки, чтобы снова подключиться. <br> Чтобы восстановить резервную копию базы данных в этой текущей установке, вы можете следовать этому помощнику.
 RestoreMySQL=Иvпорт MySQL
 ForcedToByAModule=Это правило принудительно активируется модулем <b>%s.</b>
-ValueIsForcedBySystem=This value is forced by the system. You can't change it.
+ValueIsForcedBySystem=Это значение принудительно установлено системой. Вы не можете это изменить.
 PreviousDumpFiles=Существующие файлы резервных копий
-PreviousArchiveFiles=Existing archive files
+PreviousArchiveFiles=Существующие архивные файлы
 WeekStartOnDay=Первый день недели
 RunningUpdateProcessMayBeRequired=Похоже требуется запуск процесса обновления  (версия программы %s отличается от версии базы данных %s)
 YouMustRunCommandFromCommandLineAfterLoginToUser=Вы должны запустить эту команду из командной строки после Войти в оболочку с пользователем <b>%s.</b>
 YourPHPDoesNotHaveSSLSupport=SSL функций, не доступных в PHP
 DownloadMoreSkins=Дополнительные шкуры для загрузки
-SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
-SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
+SimpleNumRefModelDesc=Возвращает ссылочный номер в формате %syymm-nnnn, где yy - год, mm - месяц, а nnnn - последовательное автоматически увеличивающееся число без сброса.
+SimpleNumRefNoDateModelDesc=Возвращает ссылочный номер в формате %s-nnnn, где nnnn - это последовательный номер с автоинкрементом без сброса.
 ShowProfIdInAddress=Показать профессиональный идентификатор с адресами
 ShowVATIntaInAddress=Скрыть номер НДС внутри Сообщества с адресами
 TranslationUncomplete=Частичный перевод
@@ -1273,7 +1277,7 @@ MAIN_PROXY_HOST=Прокси-сервер: имя / адрес
 MAIN_PROXY_PORT=Прокси-сервер: Порт
 MAIN_PROXY_USER=Прокси-сервер: Логин
 MAIN_PROXY_PASS=Прокси-сервер: пароль
-DefineHereComplementaryAttributes=Define any additional / custom attributes that must be added to: %s
+DefineHereComplementaryAttributes=Определите любые дополнительные / настраиваемые атрибуты, которые необходимо добавить к: %s
 ExtraFields=Дополнительные атрибуты
 ExtraFieldsLines=Дополнительные атрибуты (строки)
 ExtraFieldsLinesRec=Дополнительные атрибуты (шаблоны счетов-фактур)
@@ -1289,7 +1293,7 @@ ExtraFieldsSupplierOrders=Дополнительные атрибуты (Зак
 ExtraFieldsSupplierInvoices=Дополнительные атрибуты (Счета-фактуры)
 ExtraFieldsProject=Дополнительные атрибуты (Проекты)
 ExtraFieldsProjectTask=Дополнительные атрибуты (Задачи)
-ExtraFieldsSalaries=Complementary attributes (salaries)
+ExtraFieldsSalaries=Дополнительные атрибуты (зарплаты)
 ExtraFieldHasWrongValue=Атрибут %s  имеет неправильное значение.
 AlphaNumOnlyLowerCharsAndNoSpace=только латинские строчные буквы и цифры без пробелов
 SendmailOptionNotComplete=Предупреждение, на некоторых системах Linux, для отправки электронной почты из электронной почты, Sendmail выполнения установки должны conatins опцию-ба (параметр mail.force_extra_parameters в файле php.ini). Если некоторые получатели не получают электронные письма, попытке изменить этот параметр с PHP mail.force_extra_parameters =-ба).
@@ -1307,36 +1311,39 @@ CurrentTranslationString=Текущая строка перевода
 WarningAtLeastKeyOrTranslationRequired=Критерии поиска требуются, по крайней мере, для строки ключа или перевода
 NewTranslationStringToShow=Новая строка перевода для показа
 OriginalValueWas=Исходный перевод перезаписан. Исходное значение: <br><br>%s
-TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exist in any language files
-TitleNumberOfActivatedModules=Activated modules
-TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
+TransKeyWithoutOriginalValue=Вы принудительно сделали новый перевод для ключа перевода '<strong> %s </strong>', которого нет ни в одном языковом файле
+TitleNumberOfActivatedModules=Активированные модули
+TotalNumberOfActivatedModules=Активированные модули: <b> %s </b> / <b> %s </b>
 YouMustEnableOneModule=Вы должны включить минимум 1 модуль
-ClassNotFoundIntoPathWarning=Class %s not found in PHP path
+ClassNotFoundIntoPathWarning=Класс %s не найден в пути PHP
 YesInSummer=Да летом
 OnlyFollowingModulesAreOpenedToExternalUsers=Обратите внимание, что только следующие модули доступны для внешних пользователей (независимо от разрешений этих пользователей) и только при наличии разрешений: <br>
 SuhosinSessionEncrypt=Хранилище сессий шифровано системой SUHOSIN
 ConditionIsCurrently=Текущее состояние %s
 YouUseBestDriver=Вы используете драйвер %s, который является лучшим драйвером, доступным в настоящее время.
 YouDoNotUseBestDriver=Вы используете драйвер %s, но рекомендуется драйвер %s.
-NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
+NbOfObjectIsLowerThanNoPb=У вас есть только %s %s в базе данных. Особой оптимизации это не требует.
+ComboListOptim=Оптимизация загрузки комбо-списков
 SearchOptim=Поисковая оптимизация
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
-YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
+YouHaveXObjectUseComboOptim=У вас есть %s %s в базе данных. Вы можете перейти в настройку модуля, чтобы включить загрузку комбинированного списка при нажатии клавиши.
+YouHaveXObjectUseSearchOptim=У вас есть %s %s в базе данных. Вы можете добавить константу %s к 1 в Главная-настройка-Другие.
+YouHaveXObjectUseSearchOptimDesc=Это ограничивает поиск началом строк, что позволяет базе данных использовать индексы, и вы должны получить немедленный ответ.
+YouHaveXObjectAndSearchOptimOn=У вас есть %s %s в базе данных, а для константы %s установлено значение %s в Главная-Натройка-Другие.
 BrowserIsOK=Вы используете веб-браузер %s. Этот браузер подходит в отношении безопасности и производительности.
 BrowserIsKO=Вы используете веб-браузер %s. Этот браузер, как известно, является плохим выбором по безопасности, производительности и надежности. Мы рекомендуем использовать Firefox, Chrome, Opera или Safari.
-PHPModuleLoaded=PHP component %s is loaded
-PreloadOPCode=Preloaded OPCode is used
-AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
-AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
-AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
+PHPModuleLoaded=Компонент PHP %s загружен
+PreloadOPCode=Используется предварительно загруженный OPCode
+AddRefInList=Показать номер клиента / поставщика. информационный список (выберите список или поле со списком) и большую часть гиперссылок. <br> Третьи стороны будут отображаться с форматом имени "CC12345 - SC45678 - The Big Company corp." вместо "Корпорация Большая Компания".
+AddAdressInList=Отображение списка адресов покупателя / поставщика (список выбора или поле со списком) <br> Третьи стороны будут отображаться с форматом имени «The Big Company corp. - 21 jump street 123456 Big Town - USA» вместо «The Big Company corp».
+AddEmailPhoneTownInContactList=Отображение Контактный адрес электронной почты (или телефоны, если они не определены) и список информации о городе (выберите список или поле со списком) <br> Контакты появятся с форматом имени «Dupond Durand - dupond.durand@email.com - Paris» или «Dupond Durand - 06 07». 59 65 66 - Париж »вместо« Дюпон Дюран ».
 AskForPreferredShippingMethod=Запросить предпочтительный способ доставки для контрагентов.
 FieldEdition=Редакция поля %s
 FillThisOnlyIfRequired=Например, +2 (заполняйте это поле только тогда, когда ваш часовой пояс отличается от того, который используется на сервере)
 GetBarCode=Получить штрих-код
-NumberingModules=Numbering models
-DocumentModules=Document models
+NumberingModules=Нумерация моделей
+DocumentModules=Модели документов
 ##### Module password generation
-PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
+PasswordGenerationStandard=Вернуть пароль, созданный в соответствии с внутренним алгоритмом Dolibarr: символы %s, содержащие общие числа и символы в нижнем регистре.
 PasswordGenerationNone=Не предлагать сгенерированный пароль. Пароль должен быть введен вручную.
 PasswordGenerationPerso=Верните пароль в соответствии с вашей личной конфигурацией.
 SetupPerso=Согласно вашей конфигурации
@@ -1346,9 +1353,9 @@ RuleForGeneratedPasswords=Правила генерации и проверки
 DisableForgetPasswordLinkOnLogonPage=Не показывать ссылку «Забыли пароль» на странице входа
 UsersSetup=Настройка модуля пользователя
 UserMailRequired=Требуется электронная почта для создания нового пользователя
-UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
-UsersDocModules=Document templates for documents generated from user record
-GroupsDocModules=Document templates for documents generated from a group record
+UserHideInactive=Скрыть неактивных пользователей из всех комбинированных списков пользователей (не рекомендуется: это может означать, что вы не сможете фильтровать или искать старых пользователей на некоторых страницах)
+UsersDocModules=Шаблоны документов для документов, созданных на основе пользовательской записи
+GroupsDocModules=Шаблоны документов для документов, созданных из групповой записи
 ##### HRM setup #####
 HRMSetup=Настройка модуля HRM (Отдела кадров)
 ##### Company setup #####
@@ -1380,7 +1387,7 @@ BillsPDFModules=Модели счетов-фактур
 BillsPDFModulesAccordindToInvoiceType=Модели документов счета в соответствии с типом счета
 PaymentsPDFModules=Модели платежных документов
 ForceInvoiceDate=Принудительно приравнять дату выставления счета к дате проверки
-SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined on the invoice
+SuggestedPaymentModesIfNotDefinedInInvoice=Предлагаемый режим оплаты в счете-фактуре по умолчанию, если он не определен в счете-фактуре
 SuggestPaymentByRIBOnAccount=Предложить оплату выводом средств на счет
 SuggestPaymentByChequeToAddress=Предложить оплату чеком на
 FreeLegalTextOnInvoices=Свободный текст на счетах-фактурах
@@ -1392,7 +1399,7 @@ SupplierPaymentSetup=Настройка платежей поставщику
 PropalSetup=Настройка модуля Коммерческих предложений
 ProposalsNumberingModules=Модели нумерации Коммерческих предложений
 ProposalsPDFModules=Модели документов Коммерческого предложения
-SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined on the proposal
+SuggestedPaymentModesIfNotDefinedInProposal=Предлагаемый режим платежей по предложению по умолчанию, если он не определен в предложении
 FreeLegalTextOnProposal=Свободный текст на Коммерческих предложениях
 WatermarkOnDraftProposal=Водяные знаки на черновиках Коммерческих предложений ("Нет" если пусто)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Запрос банковского счёта для предложения
@@ -1407,7 +1414,7 @@ WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Попросите источник скл
 ##### Suppliers Orders #####
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Запросить адрес банковского счета для заказа на поставку
 ##### Orders #####
-SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sale order by default if not defined on the order
+SuggestedPaymentModesIfNotDefinedInOrder=Предлагаемый режим оплаты в заказе на продажу по умолчанию, если он не указан в заказе
 OrdersSetup=Настройка управления заказами на продажу
 OrdersNumberingModules=Модели нумерации заказов
 OrdersModelModule=Заказ документов моделей
@@ -1433,9 +1440,10 @@ MemberMainOptions=Основные настройки
 AdherentLoginRequired= Управление логином для каждого пользователя
 AdherentMailRequired=Требуется электронная почта для создания нового участника
 MemberSendInformationByMailByDefault=Чекбокс отправить по почте подтверждение членов по умолчанию
+MemberCreateAnExternalUserForSubscriptionValidated=Создайте внешний пользовательский логин для каждой подтвержденной подписки нового участника
 VisitorCanChooseItsPaymentMode=Посетитель может выбрать один из доступных способов оплаты
 MEMBER_REMINDER_EMAIL=Включить автоматическое напоминание <b>по электронной почте</b> о просроченных подписках. Примечание. Модуль <strong>%s</strong> должен быть включен и правильно настроен для отправки напоминаний.
-MembersDocModules=Document templates for documents generated from member record
+MembersDocModules=Шаблоны документов для документов, созданных из записи участника
 ##### LDAP setup #####
 LDAPSetup=Установка LDAP
 LDAPGlobalParameters=Глобальные параметры
@@ -1517,7 +1525,7 @@ LDAPFieldLoginUnix=Логин (Unix)
 LDAPFieldLoginExample=Пример: UID
 LDAPFilterConnection=Фильтр поиска
 LDAPFilterConnectionExample=Пример: &(objectClass=inetOrgPerson)
-LDAPGroupFilterExample=Example: &(objectClass=groupOfUsers)
+LDAPGroupFilterExample=Пример: & (objectClass = groupOfUsers)
 LDAPFieldLoginSamba=Логин (самба, activedirectory)
 LDAPFieldLoginSambaExample=Пример: samaccountname
 LDAPFieldFullname=Фамилия Имя
@@ -1561,13 +1569,13 @@ LDAPFieldSidExample=Пример: objectsid
 LDAPFieldEndLastSubscription=Дата окончания подписки
 LDAPFieldTitle=Должность
 LDAPFieldTitleExample=Например, заголовок
-LDAPFieldGroupid=Group id
-LDAPFieldGroupidExample=Exemple : gidnumber
+LDAPFieldGroupid=ID группы
+LDAPFieldGroupidExample=Пример: gidnumber
 LDAPFieldUserid=ID пользователя
 LDAPFieldUseridExample=Например: uidномер
 LDAPFieldHomedirectory=Домашняя директория
 LDAPFieldHomedirectoryExample=Например: домашняядериктория
-LDAPFieldHomedirectoryprefix=Home directory prefix
+LDAPFieldHomedirectoryprefix=Префикс домашнего каталога
 LDAPSetupNotComplete=Установка не завершена (переход на другие вкладки)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Нет администратора или пароль предусмотрено. LDAP доступ будет анонимным и в режиме только для чтения.
 LDAPDescContact=Эта страница позволяет определить название атрибутов LDAP в LDAP дерева для каждого данных по Dolibarr контакты.
@@ -1579,9 +1587,9 @@ LDAPDescValues=Пример значения для <b>OpenLDAP</b> с загр
 ForANonAnonymousAccess=Для аутентифицированных доступа (для записи, например)
 PerfDolibarr=Настройки производительности/отчёты о оптимизации
 YouMayFindPerfAdviceHere=Эта страница содержит некоторые проверки или советы, связанные с производительностью.
-NotInstalled=Not installed.
-NotSlowedDownByThis=Not slowed down by this.
-NotRiskOfLeakWithThis=Not risk of leak with this.
+NotInstalled=Не установлено.
+NotSlowedDownByThis=Не сбавляла скорость от этого.
+NotRiskOfLeakWithThis=Нет риска утечки с этим.
 ApplicativeCache=Прикладной кеш
 MemcachedNotAvailable=Аппликативный кеш не найден. Вы можете повысить производительность, установив кеш-сервер Memcached и модуль, способный использовать этот кеш-сервер. <br> Более подробная информация здесь <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a> . <br> Обратите внимание, что многие веб-хостинг-провайдеры не предоставляют такой кеш-сервер.
 MemcachedModuleAvailableButNotSetup=Модуль memcached для прикладного кэша найден, но настройка модуля не завершена.
@@ -1611,15 +1619,15 @@ ServiceSetup=Настройка модуля Услуг
 ProductServiceSetup=Настройка модулей Продуктов и Услуг
 NumberOfProductShowInSelect=Максимальное количество товаров для отображения в комбинированных списках выбора (0 = без ограничений)
 ViewProductDescInFormAbility=Отображать описания продуктов в формах (в противном случае отображается во всплывающей подсказке)
-DoNotAddProductDescAtAddLines=Do not add product description (from product card) on submit add lines on forms
-OnProductSelectAddProductDesc=How to use the description of the products when adding a product as a line of a document
-AutoFillFormFieldBeforeSubmit=Auto fill the description input field with the description of product
-DoNotAutofillButAutoConcat=Do not autofill the input field with description of product. Description of the product will be concatenated to the entered description automatically.
-DoNotUseDescriptionOfProdut=Description of the product will never be included into the description of lines of documents
+DoNotAddProductDescAtAddLines=Не добавляйте описание продукта (из карточки продукта) при отправке строк добавления в формы
+OnProductSelectAddProductDesc=Как использовать описание товаров при добавлении товара в виде строки документа
+AutoFillFormFieldBeforeSubmit=Автоматическое заполнение поля ввода описания описанием товара
+DoNotAutofillButAutoConcat=Не заполняйте поле ввода автоматически описанием товара. Описание товара будет автоматически добавлено к введенному описанию.
+DoNotUseDescriptionOfProdut=Описание товара никогда не попадет в описание строк документов.
 MergePropalProductCard=Активировать в продукте/услуге Вложенные файлы вставить опцию объединить PDF-документ продукта в предложение PDF azur, если продукт/услуга находится в предложении
-ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
+ViewProductDescInThirdpartyLanguageAbility=Отображать описания продуктов в формах на языке третьей стороны (в противном случае на языке пользователя)
 UseSearchToSelectProductTooltip=Также, если у вас есть большое количество продуктов (> 100 000), вы можете увеличить скорость, установив постоянное значение PRODUCT_DONOTSEARCH_ANYWHERE равное 1 в меню «Настройка» - «Другие настройки». Поиск будет ограничен началом строки.
-UseSearchToSelectProduct=Wait until you press a key before loading content of product combo list (This may increase performance if you have a large number of products, but it is less convenient)
+UseSearchToSelectProduct=Подождите, пока вы нажмете клавишу, прежде чем загружать содержимое комбинированного списка продуктов (это может повысить производительность, если у вас большое количество продуктов, но это менее удобно)
 SetDefaultBarcodeTypeProducts=Стандартный вид штрих-кода, используемого для продуктов
 SetDefaultBarcodeTypeThirdParties=Стандартный вид штрих-кода, используемого для третьих сторон
 UseUnits=Определите единицу измерения для количества во время заказа, предложения или строки счетов-фактур
@@ -1634,9 +1642,9 @@ SyslogLevel=Уровень
 SyslogFilename=Имя файла и путь
 YouCanUseDOL_DATA_ROOT=Вы можете использовать DOL_DATA_ROOT / dolibarr.log в лог-файл в Dolibarr "документы" каталог. Вы можете установить различные пути для хранения этого файла.
 ErrorUnknownSyslogConstant=Постоянная %s не известны журнала постоянная
-OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
+OnlyWindowsLOG_USER=В Windows будет поддерживаться только функция LOG_USER.
 CompressSyslogs=Сжатие и резервное копирование файлов журнала отладки (сгенерированных модулем Log для отладки)
-SyslogFileNumberOfSaves=Number of backup logs to keep
+SyslogFileNumberOfSaves=Количество журналов резервного копирования, которые нужно сохранить
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Настроить очистку запланированного задания для установки частоты резервного копирования журнала
 ##### Donations #####
 DonationsSetup=Настройка модуля Пожертвования
@@ -1669,7 +1677,7 @@ RSSUrlExample=Интересные RSS-ленты
 ##### Mailing #####
 MailingSetup=Настройка почтового модуля
 MailingEMailFrom=Модуль  Адресанта (от кого) для отправки писем по электронной почте
-MailingEMailError=Return Email (Errors-to) for emails with errors
+MailingEMailError=Возврат электронной почты (Errors-to) для писем с ошибками
 MailingDelay=Время ожидания в секундах перед отправкой следующего сообщения
 ##### Notification #####
 NotificationSetup=Настройка модуля Уведомления по электронной почте
@@ -1680,7 +1688,7 @@ SendingsSetup=Настройка модуля доставки
 SendingsReceiptModel=Модель отправки квитанции
 SendingsNumberingModules=Модули нумерации отправлений
 SendingsAbility=Поддержка накладных для доставки клиенту
-NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that are received and signed by customer. Hence the product deliveries receipt is a duplicated feature and is rarely activated.
+NoNeedForDeliveryReceipts=В большинстве случаев отгрузочные листы используются как в качестве листов для доставки клиенту (список продуктов для отправки), так и в качестве листов, которые принимаются и подписываются клиентом. Следовательно, квитанция о доставке товара - это дублированная функция, которая редко активируется.
 FreeLegalTextOnShippings=Дополнительный текст для поставок
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Модуль нумерации чеков поставки продукции
@@ -1692,24 +1700,24 @@ AdvancedEditor=Расширенный редактор
 ActivateFCKeditor=Включить FCKeditor для:
 FCKeditorForCompany=WYSIWIG создание / издание компаний описание и сведения
 FCKeditorForProduct=WYSIWIG создания / выпуска продукции / услуг описание и сведения
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
+FCKeditorForProductDetails=WYSIWIG создание / редактирование строк сведений о продуктах для всех сущностей (предложения, заказы, счета и т. Д.). <span class="warning"> Предупреждение. Использование этой опции в этом случае серьезно не рекомендуется, так как это может создать проблемы со специальными символами и форматированием страниц при построении файлов PDF. </span>
 FCKeditorForMailing= WYSIWIG создание / издание рассылок
 FCKeditorForUserSignature=Редактор WYSIWIG  для создания/изменения подписи пользователя
 FCKeditorForMail=WYSIWIG создание/издание для всей почты (кроме Tools-> eMailing)
-FCKeditorForTicket=WYSIWIG creation/edition for tickets
+FCKeditorForTicket=Создание / редакция WYSIWIG для билетов
 ##### Stock #####
 StockSetup=Настройка модуля запаса
 IfYouUsePointOfSaleCheckModule=Если вы используете модуль торговой точки (POS), предоставленный по умолчанию, или внешний модуль, эта установка может быть проигнорирована вашим модулем POS. Большинство POS-модулей по умолчанию предназначены для немедленного создания счета-фактуры и уменьшения складских запасов независимо от имеющихся здесь опций. Поэтому, если вам нужно или не нужно уменьшать запас при регистрации продажи в вашем POS, проверьте также настройку вашего POS-модуля.
 ##### Menu #####
 MenuDeleted=Удаленное Меню 
-Menu=Menu
+Menu=Меню
 Menus=Меню
 TreeMenuPersonalized=Персонализированная меню
 NotTopTreeMenuPersonalized=Персонализированные меню, не связанные с пунктом верхнего меню
 NewMenu=Новое меню
 MenuHandler=Меню обработчик
 MenuModule=Исходный модуль
-HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
+HideUnauthorizedMenu=Скрыть неавторизованные меню также для внутренних пользователей (в противном случае они будут выделены серым цветом)
 DetailId=Идентификатор меню
 DetailMenuHandler=Обработчик меню, где показывать новое меню
 DetailMenuModule=Имя модуля, если пункт меню взят из модуля
@@ -1721,7 +1729,7 @@ DetailRight=Условие для отображения несанкциони
 DetailLangs=Имя файла Lang для перевода кода метки
 DetailUser=Стажер / Внештатный / Все
 Target=Цель
-DetailTarget=Target for links (_blank top opens a new window)
+DetailTarget=Цель для ссылок (_blank top открывает новое окно)
 DetailLevel=Уровень (-1: верхнее меню, 0: заголовок меню&gt; 0 меню и подменю)
 ModifMenu=Меню изменения
 DeleteMenu=Удалить меню
@@ -1732,11 +1740,11 @@ TaxSetup=Настройка модуля НДС, социальные или н
 OptionVatMode=НДС к оплате
 OptionVATDefault=Стандартная основа
 OptionVATDebitOption=Принцип начисления
-OptionVatDefaultDesc=VAT is due:<br>- on delivery of goods (based on invoice date)<br>- on payments for services
-OptionVatDebitOptionDesc=VAT is due:<br>- on delivery of goods (based on invoice date)<br>- on invoice (debit) for services
+OptionVatDefaultDesc=НДС подлежит уплате: <br> - при доставке товаров (на основании даты выставления счета) <br> - при оплате услуг
+OptionVatDebitOptionDesc=НДС подлежит уплате: <br> - при доставке товаров (на основании даты выставления счета) <br> - по счету-фактуре (дебет) за услуги
 OptionPaymentForProductAndServices=Кассовая система для продуктов и услуг
 OptionPaymentForProductAndServicesDesc=НДС должен быть: <br> - на оплату товаров<br> - на оплату услуг
-SummaryOfVatExigibilityUsedByDefault=Time of VAT eligibility by default according to chosen option:
+SummaryOfVatExigibilityUsedByDefault=Время права на НДС по умолчанию в соответствии с выбранным вариантом:
 OnDelivery=О доставке
 OnPayment=Об оплате
 OnInvoice=В счете-фактуре
@@ -1749,44 +1757,44 @@ YourCompanyDoesNotUseVAT=В вашей компании определено, ч
 AccountancyCode=Бухгалтерский код
 AccountancyCodeSell=Бух. код продаж
 AccountancyCodeBuy=Бух. код покупок
-CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Keep the checkbox “Automatically create the payment” empty by default when creating a new tax
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Оставьте флажок «Автоматически создавать платеж» пустым по умолчанию при создании нового налога.
 ##### Agenda #####
 AgendaSetup=Настройка модуля событий и повестки дня
 PasswordTogetVCalExport=Ключевые разрешить экспорт ссылке
-SecurityKey = Security Key
+SecurityKey = Электронный ключ
 PastDelayVCalExport=Не экспортировать события старше
-AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries -> Type of agenda events)
-AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
-AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
-AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
-AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
-AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
+AGENDA_USE_EVENT_TYPE=Использовать типы событий (управляется в меню Настройка -> Словари -> Тип событий повестки дня)
+AGENDA_USE_EVENT_TYPE_DEFAULT=Автоматически устанавливать это значение по умолчанию для типа события в форме создания события
+AGENDA_DEFAULT_FILTER_TYPE=Автоматически устанавливать этот тип события в поисковом фильтре просмотра повестки дня
+AGENDA_DEFAULT_FILTER_STATUS=Автоматически устанавливать этот статус для событий в поисковом фильтре представления повестки дня
+AGENDA_DEFAULT_VIEW=Какой вид вы хотите открыть по умолчанию при выборе меню «Повестка дня»
+AGENDA_REMINDER_BROWSER=Включить напоминание о событии <b> в браузере пользователя </b> (при достижении даты напоминания в браузере отображается всплывающее окно. Каждый пользователь может отключить такие уведомления в настройках уведомлений браузера).
 AGENDA_REMINDER_BROWSER_SOUND=Включить звуковое оповещение
-AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
-AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
+AGENDA_REMINDER_EMAIL=Включить напоминание о событии <b> по электронной почте </b> (опция напоминания / задержка может быть определена для каждого события).
+AGENDA_REMINDER_EMAIL_NOTE=Примечание. Частота выполнения запланированного задания %s должна быть достаточной, чтобы напоминание было отправлено в нужный момент.
 AGENDA_SHOW_LINKED_OBJECT=Показывать связанный объект в представлении повестки дня
 ##### Clicktodial #####
 ClickToDialSetup=Настройка модуля Click To Dial
 ClickToDialUrlDesc=Url звонившего, когда клик по пиктограмме телефона сделан. В URL-адресе вы можете использовать теги<br><b>__PHONETO__</b>, которые будут заменены на номер телефона человека для вызова<br><b>__PHONEFROM__</b>, который будет заменен номером телефона вызывающего абонента (вашего) <br><b>__LOGIN__</b>, который будет заменен на clicktodial login (определенном на карточке пользователя) <br><b>__PASS__</b>, который будет заменен кликтодиальным паролем (определяется на карточке пользователя).
-ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
+ClickToDialDesc=Этот модуль преобразует телефонные номера при использовании настольного компьютера в интерактивные ссылки. Щелчок вызовет номер. Его можно использовать для начала телефонного звонка при использовании программного телефона на рабочем столе или, например, при использовании системы CTI, основанной на протоколе SIP. Примечание. При использовании смартфона телефонные номера всегда доступны для нажатия.
 ClickToDialUseTelLink=Используйте только ссылку «tel:» на номера телефонов
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
+ClickToDialUseTelLinkDesc=Используйте этот метод, если у ваших пользователей программный телефон или программный интерфейс установлен на том же компьютере, что и браузер, и вызывается при нажатии на ссылку в браузере, которая начинается с «tel:». Если вам нужно полноценное серверное решение (нет необходимости в локальной установке программного обеспечения), вы должны установить для него значение «Нет» и заполнить следующее поле.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Торговая точка
 CashDeskSetup=Настройка модуля «Точка продаж»
-CashDeskThirdPartyForSell=Default generic third party to use for sales
+CashDeskThirdPartyForSell=Базовая третья сторона по умолчанию для использования в продажах
 CashDeskBankAccountForSell=Денежные счета, используемого для продает
-CashDeskBankAccountForCheque=Default account to use to receive payments by check
+CashDeskBankAccountForCheque=Аккаунт по умолчанию для приема платежей по чеку
 CashDeskBankAccountForCB=Учетной записи для использования на получение денежных выплат по кредитным картам
-CashDeskBankAccountForSumup=Default bank account to use to receive payments by SumUp
+CashDeskBankAccountForSumup=Банковский счет по умолчанию для приема платежей SumUp
 CashDeskDoNotDecreaseStock=Отключить уменьшение запаса, когда продажа осуществляется из торговой точки (если «нет», уменьшение запаса производится для каждой продажи, совершаемой из POS, независимо от опции, установленной в модуле Запас).
 CashDeskIdWareHouse=Ускорить и ограничить склад для уменьшения запасов
-StockDecreaseForPointOfSaleDisabled=Stock decrease from Point of Sale disabled
+StockDecreaseForPointOfSaleDisabled=Уменьшение запасов в торговой точке отключено
 StockDecreaseForPointOfSaleDisabledbyBatch=Уменьшение запаса в POS не совместимо с модулем Управление сериями/партиями  (в настоящее время активно), поэтому уменьшение запаса отключено
-CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sale from Point of Sale. Hence a warehouse is required.
-CashDeskForceDecreaseStockLabel=Stock decrease for batch products was forced.
-CashDeskForceDecreaseStockDesc=Decrease first by the oldest eatby and sellby dates.
-CashDeskReaderKeyCodeForEnter=Key code for "Enter" defined in barcode reader (Example: 13)
+CashDeskYouDidNotDisableStockDecease=Вы не отключили уменьшение запасов при продаже через точку продаж. Следовательно, требуется склад.
+CashDeskForceDecreaseStockLabel=Вынужденное сокращение запасов серийной продукции.
+CashDeskForceDecreaseStockDesc=Уменьшите сначала на самые старые даты приема и продажи.
+CashDeskReaderKeyCodeForEnter=Код клавиши для "Enter", определенный в считывателе штрих-кода (Пример: 13)
 ##### Bookmark #####
 BookmarkSetup=Настройка модуля Закладки
 BookmarkDesc=Этот модуль позволяет вам управлять закладками. Вы также можете добавить ярлыки на любые страницы Dolibarr или внешние веб-сайты в левом меню.
@@ -1806,7 +1814,7 @@ ApiKey=Ключ для API
 WarningAPIExplorerDisabled=Проводник API отключен. Обозреватель API не обязан предоставлять службы API. Это инструмент для разработчика, чтобы найти / протестировать REST API. Если вам нужен этот инструмент, зайдите в настройку модуля API REST, чтобы активировать его.
 ##### Bank #####
 BankSetupModule=Настройка Банковского модуля
-FreeLegalTextOnChequeReceipts=Free text on check receipts
+FreeLegalTextOnChequeReceipts=Произвольный текст на чеках
 BankOrderShow=Порядок отображения банковских счетов для стран, использующих «подробный номер банка»
 BankOrderGlobal=Общий
 BankOrderGlobalDesc=Генеральный порядок отображения
@@ -1817,14 +1825,14 @@ ChequeReceiptsNumberingModule=Модуль Проверки чеков
 MultiCompanySetup=Настройка модуля Корпорация
 ##### Suppliers #####
 SuppliersSetup=Настройка модуля Поставщика
-SuppliersCommandModel=Complete template of Purchase Order
-SuppliersCommandModelMuscadet=Complete template of Purchase Order (old implementation of cornas template)
-SuppliersInvoiceModel=Complete template of Vendor Invoice
-SuppliersInvoiceNumberingModel=Vendor invoices numbering models
-IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
+SuppliersCommandModel=Полный шаблон Заказа на поставку
+SuppliersCommandModelMuscadet=Полный шаблон Заказа на поставку (старая реализация шаблона Cornas)
+SuppliersInvoiceModel=Полный шаблон счета-фактуры поставщика
+SuppliersInvoiceNumberingModel=Модели нумерации накладных поставщиков
+IfSetToYesDontForgetPermission=Если установлено ненулевое значение, не забудьте предоставить разрешения для групп или пользователей, которым разрешено второе утверждение.
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=Настройка модуля GeoIP Maxmind
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
+PathToGeoIPMaxmindCountryDataFile=Путь к файлу, содержащему Maxmind ip для перевода страны. <br> Примеры: <br> /usr/local/share/GeoIP/GeoIP.dat <br> /usr/share/GeoIP/GeoIP.dat <br>/bCecry/subscribe/
 NoteOnPathLocation=Обратите внимание, что Ваш IP, чтобы страны файл данных должен быть в директории вашего PHP может читать (Проверьте ваши установки PHP open_basedir и файловой системы разрешений).
 YouCanDownloadFreeDatFileTo=Вы можете <b>скачать</b> бесплатную <b>демонстрационную версию</b> страны GeoIP MaxMind файл на %s.
 YouCanDownloadAdvancedDatFileTo=Вы также можете скачать более <b>полную версию, с обновлениями,</b> в стране GeoIP MaxMind файл на %s.
@@ -1835,7 +1843,7 @@ ProjectsSetup=Настройка модуля проекта
 ProjectsModelModule=Модель отчета по проекту
 TasksNumberingModules=Модуль нумерации Задач
 TaskModelModule=Документы с отчетами о задачах
-UseSearchToSelectProject=Wait until a key is pressed before loading content of Project combo list.<br>This may improve performance if you have a large number of projects, but it is less convenient.
+UseSearchToSelectProject=Дождитесь нажатия клавиши перед загрузкой содержимого комбинированного списка Project. <br> Это может улучшить производительность, если у вас большое количество проектов, но это менее удобно.
 ##### ECM (GED) #####
 ##### Fiscal Year #####
 AccountingPeriods=Учетные периоды
@@ -1856,7 +1864,7 @@ NoAmbiCaracAutoGeneration=Не используйте похожие симво
 SalariesSetup=Настройка модуля Зарплаты
 SortOrder=Порядок сортировки
 Format=Формат
-TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and suppliers payment type
+TypePaymentDesc=0: Тип платежа клиента, 1: Тип платежа поставщика, 2: Тип платежа как клиента, так и поставщика
 IncludePath=Путь к заголовочным файлам (задан в переменной %s)
 ExpenseReportsSetup=Настройка модуля Отчёты о затратах
 TemplatePDFExpenseReports=Шаблон документа для создания отчёта о затратах
@@ -1864,21 +1872,21 @@ ExpenseReportsRulesSetup=Настройка модуля Отчеты о рас
 ExpenseReportNumberingModules=Модуль нумерации отчетов о расходах
 NoModueToManageStockIncrease=Был активирован модуль, способный управлять автоматическим увеличением запасов. Увеличение запасов будет производиться только вручную.
 YouMayFindNotificationsFeaturesIntoModuleNotification=Вы можете найти опции для уведомлений по электронной почте, включив и настроив модуль «Уведомления».
-ListOfNotificationsPerUser=List of automatic notifications per user*
-ListOfNotificationsPerUserOrContact=List of possible automatic notifications (on business event) available per user* or per contact**
-ListOfFixedNotifications=List of automatic fixed notifications
-GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go to the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
+ListOfNotificationsPerUser=Список автоматических уведомлений для каждого пользователя *
+ListOfNotificationsPerUserOrContact=Список возможных автоматических уведомлений (о бизнес-мероприятии), доступных для каждого пользователя * или контакта **
+ListOfFixedNotifications=Список автоматических фиксированных уведомлений
+GoOntoUserCardToAddMore=Перейдите на вкладку «Уведомления» пользователя, чтобы добавить или удалить уведомления для пользователей.
+GoOntoContactCardToAddMore=Перейдите на вкладку «Уведомления» третьей стороны, чтобы добавить или удалить уведомления для контактов / адресов.
 Threshold=Порог
-BackupDumpWizard=Wizard to build the database dump file
-BackupZipWizard=Wizard to build the archive of documents directory
+BackupDumpWizard=Мастер создания файла дампа базы данных
+BackupZipWizard=Мастер создания архива каталога документов
 SomethingMakeInstallFromWebNotPossible=Установка внешних модулей через веб-интерфейс не возможна по следующей причине:
-SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is a manual process only a privileged user may perform.
+SomethingMakeInstallFromWebNotPossible2=По этой причине описанный здесь процесс обновления является ручным процессом, который может выполнить только привилегированный пользователь.
 InstallModuleFromWebHasBeenDisabledByFile=Установка внешних модулей из приложения отключена вашим администратором. Вы должны попросить его удалить файл <strong>%s</strong>, чтобы использовать эту функцию.
 ConfFileMustContainCustom=Для установки или создания внешнего модуля из приложения необходимо сохранить файлы модулей в каталог <strong>%s</strong>. Чтобы этот каталог обрабатывался Dolibarr, вы должны настроить <strong>conf/conf.php</strong>, чтобы добавить 2 директивные строки: <br><strong> $dolibarr_main_url_root_alt = '/custom'; </strong><br><strong> $dolibarr_main_document_root_alt = '%s/custom'; </strong>
 HighlightLinesOnMouseHover=Выделите строки таблицы при перемещении мыши
-HighlightLinesColor=Highlight color of the line when the mouse passes over (use 'ffffff' for no highlight)
-HighlightLinesChecked=Highlight color of the line when it is checked (use 'ffffff' for no highlight)
+HighlightLinesColor=Цвет выделения линии при наведении курсора мыши (используйте «ffffff», чтобы не выделять)
+HighlightLinesChecked=Выделите цвет линии, когда она отмечена (используйте 'ffffff', чтобы не выделять)
 TextTitleColor=Цвет текста заголовка страницы
 LinkColor=Цвет ссылок
 PressF5AfterChangingThis=Нажмите CTRL + F5 на клавиатуре или очистите кеш браузера после изменения этого значения, чтобы оно было эффективным
@@ -1889,32 +1897,32 @@ TopMenuDisableImages=Скрыть изображения в верхнем ме
 LeftMenuBackgroundColor=Цвет фона для меню слева
 BackgroundTableTitleColor=Цвет фона для заголовка таблицы
 BackgroundTableTitleTextColor=Цвет текста для заголовка таблицы
-BackgroundTableTitleTextlinkColor=Text color for Table title link line
+BackgroundTableTitleTextlinkColor=Цвет текста строки ссылки заголовка таблицы
 BackgroundTableLineOddColor=Цвет фона для нечетных строк таблицы
 BackgroundTableLineEvenColor=Цвет фона для четных строк таблицы
 MinimumNoticePeriod=Минимальный период уведомления (ваш запрос на отпуск должен быть выполнен до этой задержки)
 NbAddedAutomatically=Количество дней, добавленных в счетчики пользователей (автоматически) каждый месяц
-EnterAnyCode=This field contains a reference to identify the line. Enter any value of your choice, but without special characters.
-Enter0or1=Enter 0 or 1
-UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
+EnterAnyCode=Это поле содержит ссылку для идентификации линии. Введите любое значение по вашему выбору, но без специальных символов.
+Enter0or1=Введите 0 или 1
+UnicodeCurrency=Введите здесь в фигурных скобках список номеров байтов, представляющих символ валюты. Например: для $ введите [36] - для бразильских реалов [82,36] - для € введите [8364].
 ColorFormat=Цвет RGB находится в формате HEX, например: FF0000
-PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
+PictoHelp=Имя значка в формате dolibarr ('image.png', если в текущем каталоге темы, 'image.png@nom_du_module', если в каталоге / img / модуля)
 PositionIntoComboList=Позиция строки в комбинированных списках
 SellTaxRate=Ставка налога на продажу
 RecuperableOnly=Да для НДС «Не воспринимается, а восстанавливается», предназначенный для некоторых государств во Франции. Сохраняйте значение «Нет» во всех других случаях.
-UrlTrackingDesc=If the provider or transport service offers a page or web site to check the status of your shipments, you may enter it here. You can use the key {TRACKID} in the URL parameters so the system will replace it with the tracking number the user entered into the shipment card.
-OpportunityPercent=When you create a lead, you will define an estimated amount of project/lead. According to status of the lead, this amount may be multiplied by this rate to evaluate a total amount all your leads may generate. Value is a percentage (between 0 and 100).
+UrlTrackingDesc=Если поставщик или транспортная служба предлагает страницу или веб-сайт для проверки статуса ваших отправлений, вы можете указать это здесь. Вы можете использовать ключ {TRACKID} в параметрах URL, чтобы система заменила его номером отслеживания, который пользователь ввел в карточку отгрузки.
+OpportunityPercent=Когда вы создаете интерес, вы определяете предполагаемую сумму проекта / лида. В зависимости от статуса лида, эта сумма может быть умножена на этот коэффициент, чтобы оценить общую сумму, которую могут генерировать все ваши лиды. Значение - это процент (от 0 до 100).
 TemplateForElement=Эта запись шаблона посвящена тому, какой элемент
 TypeOfTemplate=Тип шаблона
-TemplateIsVisibleByOwnerOnly=Template is visible to owner only
+TemplateIsVisibleByOwnerOnly=Шаблон виден только владельцу
 VisibleEverywhere=Видимый везде
 VisibleNowhere=Невидимый нигде
 FixTZ=Исправление часового пояса
 FillFixTZOnlyIfRequired=Пример: +2 (заполнить, только если возникла проблема)
 ExpectedChecksum=Ожидаемая контрольная сумма
 CurrentChecksum=Текущая контрольная сумма
-ExpectedSize=Expected size
-CurrentSize=Current size
+ExpectedSize=Ожидаемый размер
+CurrentSize=Текущий размер
 ForcedConstants=Требуемые постоянные значения
 MailToSendProposal=Предложения клиенту
 MailToSendOrder=Заказы на продажу
@@ -1925,7 +1933,7 @@ MailToSendSupplierRequestForQuotation=Запрос коммерческого п
 MailToSendSupplierOrder=Заказы
 MailToSendSupplierInvoice=Счета-фактуры поставщика
 MailToSendContract=Договоры
-MailToSendReception=Receptions
+MailToSendReception=Приемы
 MailToThirdparty=Контрагенты
 MailToMember=Участники
 MailToUser=Пользователи
@@ -1936,11 +1944,11 @@ YouUseLastStableVersion=Вы используете последнюю стаб
 TitleExampleForMajorRelease=Пример сообщения, которое вы можете использовать для анонса этого основного выпуска (не стесняйтесь использовать его на своих веб-сайтах)
 TitleExampleForMaintenanceRelease=Пример сообщения, которое вы можете использовать для объявления этой версии обслуживания (не стесняйтесь использовать ее на своих веб-сайтах)
 ExampleOfNewsMessageForMajorRelease=Доступен Dolibarr ERP & CRM %s. Версия %s - это крупный выпуск с множеством новых функций для пользователей и разработчиков. Вы можете загрузить его из области загрузки портала https://www.dolibarr.org (подкаталог «Стабильные версии»). Вы можете прочитать <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog"> ChangeLog </a> полный список изменений.
-ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so contains only bug fixes. We recommend all users to upgrade to this version. A maintenance release does not introduce new features or changes to the database. You may download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read the <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
-MultiPriceRuleDesc=When option "Several levels of prices per product/service" is enabled, you can define different prices (one per price level) for each product. To save you time, here you may enter a rule to autocalculate a price for each level based on the price of the first level, so you will have to only enter a price for the first level for each product. This page is designed to save you time but is useful only if your prices for each level are relative to first level. You can ignore this page in most cases.
+ExampleOfNewsMessageForMaintenanceRelease=Доступен Dolibarr ERP & CRM %s. Версия %s является обслуживаемой, поэтому содержит только исправления ошибок. Мы рекомендуем всем пользователям перейти на эту версию. Отладочный выпуск не вводит новых функций или изменений в базу данных. Вы можете скачать его из раздела загрузок портала https://www.dolibarr.org (подкаталог Стабильные версии). Вы можете прочитать <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog"> ChangeLog </a> для полного списка изменений.
+MultiPriceRuleDesc=Когда опция «Несколько уровней цен на продукт / услугу» включена, вы можете определить разные цены (по одной на уровень цен) для каждого продукта. Чтобы сэкономить время, здесь вы можете ввести правило для автоматического расчета цены для каждого уровня на основе цены первого уровня, поэтому вам нужно будет вводить цену только для первого уровня для каждого продукта. Эта страница предназначена для экономии вашего времени, но полезна только в том случае, если ваши цены для каждого уровня относительно первого уровня. В большинстве случаев вы можете игнорировать эту страницу.
 ModelModulesProduct=Шаблоны для документов продуктов
-WarehouseModelModules=Templates for documents of warehouses
-ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate codes automatically, you must first define a manager to auto-define the barcode number.
+WarehouseModelModules=Шаблоны документов складов
+ToGenerateCodeDefineAutomaticRuleFirst=Чтобы иметь возможность автоматически генерировать коды, вы должны сначала определить менеджера для автоматического определения номера штрих-кода.
 SeeSubstitutionVars=См. * Примечание для списка возможных переменных замещения
 SeeChangeLog=См. Файл ChangeLog (только на английском языке)
 AllPublishers=Все издатели
@@ -1961,15 +1969,15 @@ AddOtherPagesOrServices=Добавить другие страницы или у
 AddModels=Добавление шаблонов документов или нумерации
 AddSubstitutions=Добавить замены клавиш
 DetectionNotPossible=Обнаружение невозможно
-UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received it is saved in database user table and must be provided on each API call)
+UrlToGetKeyToUseAPIs=URL-адрес для получения токена для использования API (после получения токена он сохраняется в таблице пользователей базы данных и должен предоставляться при каждом вызове API)
 ListOfAvailableAPIs=Список доступных API
 activateModuleDependNotSatisfied=Модуль "%s" зависит от модуля "%s", который отсутствует, поэтому модуль "%1$s" может работать неправильно. Пожалуйста, установите модуль "%2$s" или отключите модуль "%1$s", если вы хотите быть в безопасности от неожиданностей
-CommandIsNotInsideAllowedCommands=The command you are trying to run is not in the list of allowed commands defined in parameter <strong>$dolibarr_main_restrict_os_commands</strong> in the <strong>conf.php</strong> file.
+CommandIsNotInsideAllowedCommands=Команда, которую вы пытаетесь запустить, отсутствует в списке разрешенных команд, определенных в параметре <strong> $ dolibarr_main_restrict_os_commands </strong> в файле <strong> conf.php </strong>.
 LandingPage=Целевая страница
 SamePriceAlsoForSharedCompanies=Если вы используете модуль мультикомпания с выбором «Единая цена», цена также будет одинаковой для всех компаний, если продукты распределены между окружениями.
 ModuleEnabledAdminMustCheckRights=Модуль активирован. Разрешения для активированного модуля (модулей) были предоставлены только администраторам. Возможно, вам потребуется предоставить разрешения другим пользователям или группам вручную, если это необходимо.
-UserHasNoPermissions=This user has no permissions defined
-TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "%s")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "%s" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month after delta (delta is field "%s", N is stored into field "%s")
+UserHasNoPermissions=У этого пользователя нет определенных разрешений
+TypeCdr=Используйте "Примечания" если  дата условий оплаты is date of invoice plus a delta in days (delta is field "%s")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "%s" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month after delta (delta is field "%s", N is stored into field "%s")
 BaseCurrency=Справочная валюта компании (перейдите в настройку компании, чтобы изменить это)
 WarningNoteModuleInvoiceForFrenchLaw=Этот модуль %s соответствует французским законам (Loi Finance 2016).
 WarningNoteModulePOSForFrenchLaw=Этот модуль %s соответствует французским законам (Loi Finance 2016), поскольку модуль необратимых журналов активируется автоматически.
@@ -1978,154 +1986,161 @@ MAIN_PDF_MARGIN_LEFT=Левый отступ в PDF
 MAIN_PDF_MARGIN_RIGHT=Правый отступ PDF
 MAIN_PDF_MARGIN_TOP=Верхний отступ PDF
 MAIN_PDF_MARGIN_BOTTOM=Нижний отступ PDF
-MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
+MAIN_DOCUMENTS_LOGO_HEIGHT=Высота для логотипа в PDF
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Добавить изображение в строку предложения
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Добавить электронный вход в PDF
 NothingToSetup=Для этого модуля не требуется никаких специальных настроек.
 SetToYesIfGroupIsComputationOfOtherGroups=Установите для этого значение yes, если эта группа является вычислением других групп
-EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
+EnterCalculationRuleIfPreviousFieldIsYes=Введите правило расчета, если в предыдущем поле было установлено значение Да. <br> Например: <br> CODEGRP1 + CODEGRP2
 SeveralLangugeVariatFound=Было найдено несколько вариантов языка
 RemoveSpecialChars=Удаление специальных символов
 COMPANY_AQUARIUM_CLEAN_REGEX=Фильтр регулярных выражений для очистки значения (COMPANY_AQUARIUM_CLEAN_REGEX)
-COMPANY_DIGITARIA_CLEAN_REGEX=Regex filter to clean value (COMPANY_DIGITARIA_CLEAN_REGEX)
-COMPANY_DIGITARIA_UNIQUE_CODE=Duplicate not allowed
-GDPRContact=Data Protection Officer (DPO, Data Privacy or GDPR contact)
-GDPRContactDesc=If you store data about European companies/citizens, you can name the contact who is responsible for the General Data Protection Regulation here
-HelpOnTooltip=Help text to show on tooltip
-HelpOnTooltipDesc=Put text or a translation key here for the text to show in a tooltip when this field appears in a form
-YouCanDeleteFileOnServerWith=You can delete this file on the server with Command Line:<br>%s
-ChartLoaded=Chart of account loaded
+COMPANY_DIGITARIA_CLEAN_REGEX=Фильтр регулярных выражений для очистки значения (COMPANY_DIGITARIA_CLEAN_REGEX)
+COMPANY_DIGITARIA_UNIQUE_CODE=Дубликат не допускается
+GDPRContact=Сотрудник по защите данных (контактное лицо DPO, Data Privacy или GDPR)
+GDPRContactDesc=Если вы храните данные о европейских компаниях / гражданах, здесь вы можете указать контактное лицо, отвечающее за общие правила защиты данных.
+HelpOnTooltip=Текст справки для отображения во всплывающей подсказке
+HelpOnTooltipDesc=Поместите здесь текст или ключ перевода, чтобы текст отображался во всплывающей подсказке, когда это поле появляется в форме
+YouCanDeleteFileOnServerWith=Вы можете удалить этот файл на сервере с помощью командной строки: <br> %s
+ChartLoaded=График счета загружен
 SocialNetworkSetup=Настройка модуля Социальные сети
-EnableFeatureFor=Enable features for <strong>%s</strong>
+EnableFeatureFor=Включить функции для <strong> %s </strong>
 VATIsUsedIsOff=Примечание: В меню %s - %s для параметра «Использовать налог с продаж или НДС» было установлено значение  <strong>Выкл.</strong> , поэтому для продаж всегда используется 0 налога с продаж или НДС.
-SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
-FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields and combo lists only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
-EmailCollector=Email collector
-EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
-NewEmailCollector=New Email Collector
-EMailHost=Host of email IMAP server
-MailboxSourceDirectory=Mailbox source directory
-MailboxTargetDirectory=Mailbox target directory
-EmailcollectorOperations=Operations to do by collector
-EmailcollectorOperationsDesc=Operations are executed from top to bottom order
-MaxEmailCollectPerCollect=Max number of emails collected per collect
-CollectNow=Collect now
-ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
-DateLastCollectResult=Date of latest collect try
-DateLastcollectResultOk=Date of latest collect success
-LastResult=Latest result
-EmailCollectorConfirmCollectTitle=Email collect confirmation
-EmailCollectorConfirmCollect=Do you want to run the collection for this collector now ?
-NoNewEmailToProcess=No new email (matching filters) to process
-NothingProcessed=Nothing done
-XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
-RecordEvent=Record email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
-CodeLastResult=Latest result code
-NbOfEmailsInInbox=Number of emails in source directory
-LoadThirdPartyFromName=Load third party searching on %s (load only)
-LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
-WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
-WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
-WithDolTrackingIDInMsgId=Message sent from Dolibarr
-WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create job application
+SwapSenderAndRecipientOnPDF=Поменять местами адреса отправителя и получателя в PDF-документах
+FeatureSupportedOnTextFieldsOnly=Предупреждение, функция поддерживается только для текстовых полей и комбинированных списков. Также должен быть установлен параметр URL action = create или action = edit ИЛИ имя страницы должно заканчиваться на 'new.php', чтобы активировать эту функцию.
+EmailCollector=Сборщик писем
+EmailCollectorDescription=Добавьте запланированное задание и страницу настройки, чтобы регулярно сканировать ящики электронной почты (с использованием протокола IMAP) и записывать электронные письма, полученные в ваше приложение, в нужное место и / или создавать некоторые записи автоматически (например, потенциальных клиентов).
+NewEmailCollector=Новый сборщик электронной почты
+EMailHost=Хост почтового сервера IMAP
+MailboxSourceDirectory=Исходный каталог почтового ящика
+MailboxTargetDirectory=Целевой каталог почтового ящика
+EmailcollectorOperations=Операции, выполняемые сборщиком
+EmailcollectorOperationsDesc=Операции выполняются сверху вниз.
+MaxEmailCollectPerCollect=Максимальное количество писем, собранных за один сбор
+CollectNow=Собери сейчас
+ConfirmCloneEmailCollector=Вы уверены, что хотите клонировать сборщик электронной почты %s?
+DateLastCollectResult=Дата последней попытки сбора
+DateLastcollectResultOk=Дата последнего успешного сбора
+LastResult=Последний результат
+EmailCollectorConfirmCollectTitle=Подтверждение сбора по электронной почте
+EmailCollectorConfirmCollect=Вы хотите запустить коллекцию для этого сборщика сейчас?
+NoNewEmailToProcess=Нет новых писем (соответствующие фильтры) для обработки
+NothingProcessed=Ничего не сделано
+XEmailsDoneYActionsDone=Письма %s квалифицированы, электронные письма %s успешно обработаны (для записи %s / выполненных действий)
+RecordEvent=Записать событие электронной почты
+CreateLeadAndThirdParty=Создайте лида (и стороннюю организацию, если необходимо)
+CreateTicketAndThirdParty=Создать тикет (и ссылку на третье лицо, если он был загружен предыдущей операцией)
+CodeLastResult=Последний код результата
+NbOfEmailsInInbox=Количество писем в исходном каталоге
+LoadThirdPartyFromName=Загрузить сторонний поиск на %s (только загрузка)
+LoadThirdPartyFromNameOrCreate=Загрузите сторонний поиск на %s (создайте, если не найден)
+WithDolTrackingID=Сообщение из беседы, инициированной первым письмом, отправленным от Dolibarr
+WithoutDolTrackingID=Сообщение из беседы, инициированной первым электронным письмом, НЕ отправленным от Dolibarr
+WithDolTrackingIDInMsgId=Сообщение отправлено из Долибарра
+WithoutDolTrackingIDInMsgId=Сообщение НЕ отправлено из Dolibarr
+CreateCandidature=Создать заявление о приеме на работу
 FormatZip=Индекс
-MainMenuCode=Menu entry code (mainmenu)
-ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
-OpeningHours=Opening hours
-OpeningHoursDesc=Enter here the regular opening hours of your company.
+MainMenuCode=Код входа в меню (главное меню)
+ECMAutoTree=Показать автоматическое дерево ECM
+OperationParamDesc=Определите значения, которые будут использоваться для объекта действия, или способы извлечения значений. Например: <br> objproperty1 = SET: значение, которое нужно установить <br> objproperty2 = SET: значение с заменой __objproperty1__ <br> objproperty3 = SETIFEMPTY: значение, используемое, если objproperty2: objproperty19: значение, используемое, если objproperty2 уже определено, если objproperty2: * - значение objproperty2: * objproperty4 ([^ \\ s] *) <br> options_myextrafield1 = EXTRACT: SUBJECT: ([^ & # 92; n] *) <br> object.objproperty5 = EXTRACT: BODY: Название моей компании - \\ s ([^ \\ s] *) a019bda <br> Используйте a; char в качестве разделителя для извлечения или установки нескольких свойств.
+OpeningHours=Часы работы
+OpeningHoursDesc=Введите здесь обычные часы работы вашей компании.
 ResourceSetup=Конфигурация  модуля Ресурсов
 UseSearchToSelectResource=Используйте форму поиска, чтобы выбрать ресурс (а не раскрывающийся список).
 DisabledResourceLinkUser=Отключить функцию привязки ресурса к пользователям
 DisabledResourceLinkContact=Отключить функцию привязки ресурса к контактам
-EnableResourceUsedInEventCheck=Enable feature to check if a resource is in use in an event
+EnableResourceUsedInEventCheck=Включите функцию, чтобы проверить, используется ли ресурс в событии
 ConfirmUnactivation=Подтвердите сброс модуля
-OnMobileOnly=On small screen (smartphone) only
-DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
-MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
-MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or Links.
-MAIN_OPTIMIZEFORCOLORBLIND=Change  interface's color for color blind person
-MAIN_OPTIMIZEFORCOLORBLINDDesc=Enable this option if you are a color blind person, in some case interface will change color setup to increase contrast.
-Protanopia=Protanopia
-Deuteranopes=Deuteranopes
-Tritanopes=Tritanopes
-ThisValueCanOverwrittenOnUserLevel=This value can be overwritten by each user from its user page - tab '%s'
-DefaultCustomerType=Default thirdparty type for "New customer" creation form
+OnMobileOnly=Только на маленьком экране (смартфон)
+DisableProspectCustomerType=Отключите тип третьей стороны «Проспект + клиент» (таким образом, третья сторона должна быть «Проспект» или «Клиент», но не может быть одновременно)
+MAIN_OPTIMIZEFORTEXTBROWSER=Упростите интерфейс для слепых
+MAIN_OPTIMIZEFORTEXTBROWSERDesc=Включите эту опцию, если вы слепой или используете приложение из текстового браузера, такого как Lynx или Links.
+MAIN_OPTIMIZEFORCOLORBLIND=Изменить цвет интерфейса для дальтоника
+MAIN_OPTIMIZEFORCOLORBLINDDesc=Включите эту опцию, если вы дальтоник, в некоторых случаях интерфейс изменит настройку цвета, чтобы увеличить контраст.
+Protanopia=Протанопия
+Deuteranopes=Дейтеранопы
+Tritanopes=Тританопы
+ThisValueCanOverwrittenOnUserLevel=Это значение может быть перезаписано каждым пользователем со своей пользовательской страницы - вкладка '%s'
+DefaultCustomerType=Тип стороннего лица по умолчанию для формы создания «Нового клиента»
 ABankAccountMustBeDefinedOnPaymentModeSetup=Примечание. Банковский счет должен быть указан в модуле каждого способа оплаты (Paypal, Stripe, ...), чтобы эта функция работала.
-RootCategoryForProductsToSell=Root category of products to sell
-RootCategoryForProductsToSellDesc=If defined, only products inside this category or childs of this category will be available in the Point Of Sale
-DebugBar=Debug Bar
-DebugBarDesc=Toolbar that comes with a plenty of tools to simplify debugging
-DebugBarSetup=DebugBar Setup
-GeneralOptions=General Options
-LogsLinesNumber=Number of lines to show on logs tab
-UseDebugBar=Use the debug bar
-DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
-WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
-ModuleActivated=Module %s is activated and slows the interface
-ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances and security)
-ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
-IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
-AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
-SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
-EXPORTS_SHARE_MODELS=Export models are share with everybody
-ExportSetup=Setup of module Export
-ImportSetup=Setup of module Import
-InstanceUniqueID=Unique ID of the instance
-SmallerThan=Smaller than
-LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
-WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
-EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
-EndPointFor=End point for %s : %s
-DeleteEmailCollector=Delete email collector
-ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
-RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
-AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
-RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
+RootCategoryForProductsToSell=Корневая категория продуктов для продажи
+RootCategoryForProductsToSellDesc=Если он определен, в торговой точке будут доступны только продукты из этой категории или дочерние продукты этой категории.
+DebugBar=Панель отладки
+DebugBarDesc=Панель инструментов с множеством инструментов для упрощения отладки
+DebugBarSetup=Настройка DebugBar
+GeneralOptions=Общие настройки
+LogsLinesNumber=Количество строк, отображаемых на вкладке журналов
+UseDebugBar=Используйте панель отладки
+DEBUGBAR_LOGS_LINES_NUMBER=Количество последних строк журнала для сохранения в консоли
+WarningValueHigherSlowsDramaticalyOutput=Предупреждение, более высокие значения резко замедляют вывод
+ModuleActivated=Модуль %s активирован и замедляет работу интерфейса
+ModuleActivatedWithTooHighLogLevel=Модуль %s активирован со слишком высоким уровнем ведения журнала (попробуйте использовать более низкий уровень для повышения производительности и безопасности)
+ModuleSyslogActivatedButLevelNotTooVerbose=Модуль %s активирован, и уровень журнала (%s) правильный (не слишком подробный)
+IfYouAreOnAProductionSetThis=Если вы работаете в производственной среде, вам следует установить для этого свойства значение %s.
+AntivirusEnabledOnUpload=Антивирус включен для загруженных файлов
+SomeFilesOrDirInRootAreWritable=Некоторые файлы или каталоги не доступны только для чтения
+EXPORTS_SHARE_MODELS=Экспортные модели делятся со всеми
+ExportSetup=Настройка модуля Экспорт
+ImportSetup=Настройка модуля Импорт
+InstanceUniqueID=Уникальный идентификатор экземпляра
+SmallerThan=Меньше чем
+LargerThan=Больше, чем
+IfTrackingIDFoundEventWillBeLinked=Обратите внимание, что если идентификатор отслеживания объекта найден в электронном письме или если электронное письмо является ответом на электронную почту, которую собирают и связывают с объектом, созданное событие будет автоматически связано с известным связанным объектом.
+WithGMailYouCanCreateADedicatedPassword=В учетной записи GMail, если вы включили двухэтапную проверку, рекомендуется создать специальный второй пароль для приложения вместо использования пароля своей учетной записи с https://myaccount.google.com/.
+EmailCollectorTargetDir=Может оказаться желательным переместить электронное письмо в другой тег / каталог, когда оно было успешно обработано. Просто укажите здесь имя каталога, чтобы использовать эту функцию (НЕ используйте в имени специальные символы). Обратите внимание, что вы также должны использовать учетную запись для входа в систему для чтения / записи.
+EmailCollectorLoadThirdPartyHelp=Вы можете использовать это действие, чтобы использовать содержимое электронной почты для поиска и загрузки существующей третьей стороны в вашу базу данных. Найденное (или созданное) третье лицо будет использовано для следующих действий, которые в нем нуждаются. В поле параметра вы можете использовать, например, «EXTRACT: BODY: Name: \\ s ([^ \\ s] *)», если вы хотите извлечь имя третьей стороны из строки «Имя: имя для поиска», найденной в тело.
+EndPointFor=Конечная точка для %s: %s
+DeleteEmailCollector=Удалить сборщик электронной почты
+ConfirmDeleteEmailCollector=Вы уверены, что хотите удалить этот сборщик электронной почты?
+RecipientEmailsWillBeReplacedWithThisValue=Электронная почта получателя всегда будет заменена этим значением
+AtLeastOneDefaultBankAccountMandatory=Должен быть определен хотя бы 1 банковский счет по умолчанию.
+RESTRICT_ON_IP=Разрешить доступ только к IP-адресу некоторого хоста (подстановочные знаки не разрешены, используйте пробел между значениями). Пусто означает, что доступ есть у всех хостов.
 IPListExample=127.0.0.1 192.168.0.2 [::1]
-BaseOnSabeDavVersion=Based on the library SabreDAV version
-NotAPublicIp=Not a public IP
-MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
-FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
-EmailTemplate=Template for email
-EMailsWillHaveMessageID=Emails will have a tag 'References' matching this syntax
-PDF_SHOW_PROJECT=Show project on document
-ShowProjectLabel=Project Label
-PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
-FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
-FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
-RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
-JumpToBoxes=Jump to Setup -> Widgets
-MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
-MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
-TemplateAdded=Template added
-TemplateUpdated=Template updated
-TemplateDeleted=Template deleted
-MailToSendEventPush=Event reminder email
-SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
-DictionaryProductNature= Nature of product
-CountryIfSpecificToOneCountry=Country (if specific to a given country)
-YouMayFindSecurityAdviceHere=You may find security advisory here
-ModuleActivatedMayExposeInformation=This PHP extension may expose sensitive data. If you don't need it, disable it.
-ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
-CombinationsSeparator=Separator character for product combinations
-SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
-SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
-AskThisIDToYourBank=Contact your bank to get this ID
-AdvancedModeOnly=Permision available in Advanced permission mode only
-ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
-MailToSendEventOrganization=Event Organization
-AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
-YouShouldDisablePHPFunctions=You should disable PHP functions
-IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
-NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
-RecommendedValueIs=Recommended: %s
-ARestrictedPath=A restricted path
-CheckForModuleUpdate=Check for external modules updates
-CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
-ModuleUpdateAvailable=An update is available
-NoExternalModuleWithUpdate=No updates found for external modules
-SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
+BaseOnSabeDavVersion=На основе версии библиотеки SabreDAV
+NotAPublicIp=Не публичный IP
+MakeAnonymousPing=Сделайте анонимный эхо-запрос «+1» к серверу фонда Dolibarr (выполняется 1 раз только после установки), чтобы позволить фонду подсчитать количество установок Dolibarr.
+FeatureNotAvailableWithReceptionModule=Функция недоступна, если включен модуль Прием
+EmailTemplate=Шаблон для электронной почты
+EMailsWillHaveMessageID=Письма будут иметь тег "Ссылки", соответствующий этому синтаксису.
+PDF_SHOW_PROJECT=Показать проект в документе
+ShowProjectLabel=Этикетка проекта
+PDF_USE_ALSO_LANGUAGE_CODE=Если вы хотите, чтобы некоторые тексты в вашем PDF-файле были продублированы на 2 разных языках в одном сгенерированном PDF-файле, вы должны установить здесь этот второй язык, чтобы сгенерированный PDF-файл содержал 2 разных языка на одной странице: один, выбранный при создании PDF, и этот ( только несколько шаблонов PDF поддерживают это). Оставьте пустым для 1 языка в PDF-файле.
+FafaIconSocialNetworksDesc=Введите здесь код значка FontAwesome. Если вы не знаете, что такое FontAwesome, вы можете использовать общее значение fa-address-book.
+RssNote=Примечание. Каждое определение RSS-канала предоставляет виджет, который необходимо включить, чтобы он был доступен на панели управления.
+JumpToBoxes=Перейти к настройке -> Виджеты
+MeasuringUnitTypeDesc=Используйте здесь такие значения, как «размер», «поверхность», «объем», «вес», «время».
+MeasuringScaleDesc=Масштаб - это количество мест, на которое вы должны переместить десятичную часть, чтобы она соответствовала единице измерения по умолчанию. Для единиц измерения «время» это количество секунд. Значения от 80 до 99 - это зарезервированные значения.
+TemplateAdded=Шаблон добавлен
+TemplateUpdated=Шаблон обновлен
+TemplateDeleted=Шаблон удален
+MailToSendEventPush=Электронное письмо с напоминанием о мероприятии
+SwitchThisForABetterSecurity=Для большей безопасности рекомендуется переключить это значение на %s.
+DictionaryProductNature= Природа продукта
+CountryIfSpecificToOneCountry=Страна (если она специфична для данной страны)
+YouMayFindSecurityAdviceHere=Здесь вы можете найти советы по безопасности
+ModuleActivatedMayExposeInformation=Это расширение PHP может раскрывать конфиденциальные данные. Если он вам не нужен, отключите его.
+ModuleActivatedDoNotUseInProduction=Включен модуль, предназначенный для разработки. Не включайте его в производственной среде.
+CombinationsSeparator=Символ-разделитель для комбинаций продуктов
+SeeLinkToOnlineDocumentation=См. Ссылку на онлайн-документацию в верхнем меню для примеров.
+SHOW_SUBPRODUCT_REF_IN_PDF=Если используется функция «%s» модуля <b> %s </b>, покажите детали субпродуктов комплекта в PDF.
+AskThisIDToYourBank=Свяжитесь с вашим банком, чтобы получить этот идентификатор
+AdvancedModeOnly=Разрешение доступно только в расширенном режиме разрешений
+ConfFileIsReadableOrWritableByAnyUsers=Файл conf доступен для чтения или для записи любым пользователям. Дайте разрешение только пользователю и группе веб-сервера.
+MailToSendEventOrganization=Организация мероприятий
+AGENDA_EVENT_DEFAULT_STATUS=Статус события по умолчанию при создании события из формы
+YouShouldDisablePHPFunctions=Вы должны отключить функции PHP
+IfCLINotRequiredYouShouldDisablePHPFunctions=За исключением случаев, когда вам нужно запускать системные команды в пользовательском коде, вы должны отключить функции PHP.
+PHPFunctionsRequiredForCLI=Для целей оболочки (например, резервного копирования заданий по расписанию или запуска антивирусной программы) вы должны сохранить функции PHP
+NoWritableFilesFoundIntoRootDir=В корневом каталоге не обнаружены доступные для записи файлы или каталоги распространенных программ (Хорошо)
+RecommendedValueIs=Рекомендуется: %s
+NotRecommended=Не рекомендуется
+ARestrictedPath=Ограниченный путь
+CheckForModuleUpdate=Проверить обновления внешних модулей
+CheckForModuleUpdateHelp=Это действие подключится к редакторам внешних модулей, чтобы проверить, доступна ли новая версия.
+ModuleUpdateAvailable=Доступно обновление
+NoExternalModuleWithUpdate=Обновлений для внешних модулей не найдено
+SwaggerDescriptionFile=Файл описания Swagger API (например, для использования с redoc)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=Вы включили устаревший WS API. Вместо этого вам следует использовать REST API.
+RandomlySelectedIfSeveral=Выбирается случайным образом, если доступно несколько изображений
+DatabasePasswordObfuscated=Database password is obfuscated in conf file
+DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
diff --git a/htdocs/langs/ru_RU/agenda.lang b/htdocs/langs/ru_RU/agenda.lang
index f63694850d1..18def072e3a 100644
--- a/htdocs/langs/ru_RU/agenda.lang
+++ b/htdocs/langs/ru_RU/agenda.lang
@@ -4,7 +4,7 @@ Actions=События
 Agenda=Повестка дня
 TMenuAgenda=Повестка дня
 Agendas=Повестка дня
-LocalAgenda=Внутренний календарь
+LocalAgenda=Календарь по умолчанию
 ActionsOwnedBy=Событие принадлежит 
 ActionsOwnedByShort=Владелец
 AffectedTo=Ответств.
@@ -14,13 +14,13 @@ EventsNb=Количество событий
 ListOfActions=Список событий
 EventReports=События
 Location=Местонахождение
-ToUserOfGroup=Event assigned to any user in group
+ToUserOfGroup=Событие, назначенное любому пользователю в группе
 EventOnFullDay=Событие на весь день (все дни)
 MenuToDoActions=Все незавершенные события
 MenuDoneActions=Все прекращенные события
 MenuToDoMyActions=Мои незавершенные события
 MenuDoneMyActions=Мои прекращенные события
-ListOfEvents=Список событий из внутреннего календаря
+ListOfEvents=Список событий (календарь по умолчанию)
 ActionsAskedBy=События созданы
 ActionsToDoBy=события назначены
 ActionsDoneBy=Действия, проделанную
@@ -31,16 +31,17 @@ ViewWeek=Обзор недели
 ViewPerUser=Просмотр по пользователям
 ViewPerType=Просмотр по типу
 AutoActions= Автоматическое заполнение дня
-AgendaAutoActionDesc= Here you may define events which you want Dolibarr to create automatically  in Agenda. If nothing is checked, only manual actions will be included in logs and displayed in Agenda. Automatic tracking of business actions done on objects (validation, status change) will not be saved.
-AgendaSetupOtherDesc= This page provides options to allow the export of your Dolibarr events into an external calendar (Thunderbird, Google Calendar etc...)
+AgendaAutoActionDesc= Здесь вы можете определить события, которые вы хотите, чтобы Dolibarr автоматически создавал в Agenda. Если ничего не отмечено, только ручные действия будут включены в журналы и отображаться в повестке дня. Автоматическое отслеживание бизнес-действий, выполняемых над объектами (проверка, изменение статуса), не сохраняется.
+AgendaSetupOtherDesc= На этой странице представлены параметры, позволяющие экспортировать ваши события Dolibarr во внешний календарь (Thunderbird, Google Calendar и т. Д.).
 AgendaExtSitesDesc=Эта страница позволяет настроить внешний календарей.
 ActionsEvents=События, за которые Dolibarr создадут действий в повестку дня автоматически
-EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
+EventRemindersByEmailNotEnabled=Напоминания о событиях по электронной почте не были включены в настройку модуля %s.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Третья сторона %s создана
-COMPANY_DELETEInDolibarr=Third party %s deleted
+COMPANY_MODIFYInDolibarr=Третье лицо %s изменено
+COMPANY_DELETEInDolibarr=Третье лицо%s удалено
 ContractValidatedInDolibarr=Контакт %s подтверждён
-CONTRACT_DELETEInDolibarr=Contract %s deleted
+CONTRACT_DELETEInDolibarr=Контракт %s удален
 PropalClosedSignedInDolibarr=Ком. предложение  %s подписано
 PropalClosedRefusedInDolibarr=Ком. предложение %s отклонено
 PropalValidatedInDolibarr=Предложение проверены
@@ -60,10 +61,10 @@ MemberSubscriptionModifiedInDolibarr=Подписка %s для члена %s и
 MemberSubscriptionDeletedInDolibarr=Подписка %s для участника %s удалена
 ShipmentValidatedInDolibarr=Отправка %s  подтверждена
 ShipmentClassifyClosedInDolibarr=Отправка %sотмечена "оплачено"
-ShipmentUnClassifyCloseddInDolibarr=Shipment %s classified re-open
-ShipmentBackToDraftInDolibarr=Shipment %s go back to draft status
+ShipmentUnClassifyCloseddInDolibarr=Отгрузка %s засекречена повторно
+ShipmentBackToDraftInDolibarr=Отгрузка %s вернуться в статус черновика
 ShipmentDeletedInDolibarr=Отправка %s удалена
-ReceptionValidatedInDolibarr=Reception %s validated
+ReceptionValidatedInDolibarr=Прием %s подтвержден
 OrderCreatedInDolibarr=Заказ %s создан
 OrderValidatedInDolibarr=Заказ %s проверен
 OrderDeliveredInDolibarr=Заказ %s  доставлен
@@ -72,30 +73,31 @@ OrderBilledInDolibarr=Заказ %s готов к выставлению счё
 OrderApprovedInDolibarr=Заказ %s утвержден
 OrderRefusedInDolibarr=Заказ %s  отклонён
 OrderBackToDraftInDolibarr=Заказ %s возращен в статус черновик
-ProposalSentByEMail=Commercial proposal %s sent by email
-ContractSentByEMail=Contract %s sent by email
-OrderSentByEMail=Sales order %s sent by email
-InvoiceSentByEMail=Customer invoice %s sent by email
-SupplierOrderSentByEMail=Purchase order %s sent by email
-ORDER_SUPPLIER_DELETEInDolibarr=Purchase order %s deleted
-SupplierInvoiceSentByEMail=Vendor invoice %s sent by email
-ShippingSentByEMail=Shipment %s sent by email
+ProposalSentByEMail=Коммерческое предложение %s отправлено по электронной почте
+ContractSentByEMail=Контракт %s отправлен по электронной почте
+OrderSentByEMail=Заказ на продажу %s отправлен по электронной почте
+InvoiceSentByEMail=Счет клиента %s отправлен по электронной почте
+SupplierOrderSentByEMail=Заказ на покупку %s отправлен по электронной почте
+ORDER_SUPPLIER_DELETEInDolibarr=Заказ на покупку %s удален
+SupplierInvoiceSentByEMail=Счет поставщика %s отправлен по электронной почте
+ShippingSentByEMail=Отгрузка %s отправлена по электронной почте
 ShippingValidated= Отправка %s  подтверждена
-InterventionSentByEMail=Intervention %s sent by email
+InterventionSentByEMail=Вмешательство %s отправлено по электронной почте
 ProposalDeleted=Предложение удалено
 OrderDeleted=Заказ удалён
 InvoiceDeleted=Счёт удалён
-DraftInvoiceDeleted=Draft invoice deleted
-CONTACT_CREATEInDolibarr=Contact %s created
-CONTACT_DELETEInDolibarr=Contact %s deleted
+DraftInvoiceDeleted=Черновик счета удален
+CONTACT_CREATEInDolibarr=Контакт %s создан
+CONTACT_MODIFYInDolibarr=Связаться с %s изменено
+CONTACT_DELETEInDolibarr=Контакт %s удален
 PRODUCT_CREATEInDolibarr=Товар %sсоздан
 PRODUCT_MODIFYInDolibarr=Товар %sизменён
 PRODUCT_DELETEInDolibarr=Товар %sудалён
-HOLIDAY_CREATEInDolibarr=Request for leave %s created
-HOLIDAY_MODIFYInDolibarr=Request for leave %s modified
-HOLIDAY_APPROVEInDolibarr=Request for leave %s approved
-HOLIDAY_VALIDATEInDolibarr=Request for leave %s validated
-HOLIDAY_DELETEInDolibarr=Request for leave %s deleted
+HOLIDAY_CREATEInDolibarr=Запрос на выезд %s создан
+HOLIDAY_MODIFYInDolibarr=Запрос на отпуск %s изменен
+HOLIDAY_APPROVEInDolibarr=Запрос на отпуск %s одобрен
+HOLIDAY_VALIDATEInDolibarr=Запрос на отпуск %s подтвержден
+HOLIDAY_DELETEInDolibarr=Запрос на отпуск %s удален
 EXPENSE_REPORT_CREATEInDolibarr=Отчет о расходах %s создан
 EXPENSE_REPORT_VALIDATEInDolibarr=Отчет о расходах %s утвержден
 EXPENSE_REPORT_APPROVEInDolibarr=Отчет о расходах %s одобрен
@@ -104,21 +106,22 @@ EXPENSE_REPORT_REFUSEDInDolibarr=Отчет о расходах %s отказа
 PROJECT_CREATEInDolibarr=Проект %s создан
 PROJECT_MODIFYInDolibarr=Проект %s изменен
 PROJECT_DELETEInDolibarr=Проект %s удален
-TICKET_CREATEInDolibarr=Ticket %s created
-TICKET_MODIFYInDolibarr=Ticket %s modified
-TICKET_ASSIGNEDInDolibarr=Ticket %s assigned
-TICKET_CLOSEInDolibarr=Ticket %s closed
-TICKET_DELETEInDolibarr=Ticket %s deleted
-BOM_VALIDATEInDolibarr=BOM validated
-BOM_UNVALIDATEInDolibarr=BOM unvalidated
-BOM_CLOSEInDolibarr=BOM disabled
-BOM_REOPENInDolibarr=BOM reopen
-BOM_DELETEInDolibarr=BOM deleted
-MRP_MO_VALIDATEInDolibarr=MO validated
-MRP_MO_UNVALIDATEInDolibarr=MO set to draft status
-MRP_MO_PRODUCEDInDolibarr=MO produced
-MRP_MO_DELETEInDolibarr=MO deleted
-MRP_MO_CANCELInDolibarr=MO canceled
+TICKET_CREATEInDolibarr=Билет %s создан
+TICKET_MODIFYInDolibarr=Билет %s изменен
+TICKET_ASSIGNEDInDolibarr=Билет %s назначен
+TICKET_CLOSEInDolibarr=Билет %s закрыт
+TICKET_DELETEInDolibarr=Билет %s удален
+BOM_VALIDATEInDolibarr=Спецификация подтверждена
+BOM_UNVALIDATEInDolibarr=Спецификация не подтверждена
+BOM_CLOSEInDolibarr=Спецификация отключена
+BOM_REOPENInDolibarr=BOM повторно открыть
+BOM_DELETEInDolibarr=Спецификация удалена
+MRP_MO_VALIDATEInDolibarr=МО подтверждено
+MRP_MO_UNVALIDATEInDolibarr=MO установлен в статус черновика
+MRP_MO_PRODUCEDInDolibarr=МО произведено
+MRP_MO_DELETEInDolibarr=МО удалено
+MRP_MO_CANCELInDolibarr=МО отменено
+PAIDInDolibarr=%s платный
 ##### End agenda events #####
 AgendaModelModule=Шаблоны документов для события
 DateActionStart=Начальная дата
@@ -128,9 +131,9 @@ AgendaUrlOptions3=<b> logina = %s </b>, чтобы ограничить выво
 AgendaUrlOptionsNotAdmin=<b>logina =! %s </b> для ограничения вывода на действий, не принадлежащих пользователю <b>%s</b>.
 AgendaUrlOptions4=<b>logint = %s</b> для ограничения вывода на действия, назначенные пользователю <b>%s</b> (владелец и другие).
 AgendaUrlOptionsProject=<b>project = __ PROJECT_ID __</b>, чтобы ограничить вывод действий, связанных с проектом <b>__ PROJECT_ID __ </b>.
-AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic events.
-AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> to include events of holidays.
-AgendaShowBirthdayEvents=Показывать дни рождения контактов 
+AgendaUrlOptionsNotAutoEvent= <b> notactiontype = systemauto </b>, чтобы исключить автоматические события.
+AgendaUrlOptionsIncludeHolidays= <b> includeholidays = 1 </b> для включения событий праздников.
+AgendaShowBirthdayEvents=Дни рождения контактов
 AgendaHideBirthdayEvents=Скрыть дни рождения контактов
 Busy=Занят
 ExportDataset_event1=Список запланированных мероприятий
@@ -139,7 +142,7 @@ DefaultWorkingHours=Диапазон рабочих часов в день (На
 # External Sites ical
 ExportCal=Экспорт календаря
 ExtSites=Импортировать календари
-ExtSitesEnableThisTool=Show external calendars (defined in global setup) in Agenda. Does not affect external calendars defined by users.
+ExtSitesEnableThisTool=Показывать внешние календари (определенные в глобальной настройке) в повестке дня. Не влияет на внешние календари, определенные пользователями.
 ExtSitesNbOfAgenda=Количество календарей
 AgendaExtNb=Календарь №. %s
 ExtSiteUrlAgenda=URL для файла календаря .ical
@@ -152,17 +155,18 @@ ActionType=Тип события
 DateActionBegin=Дата начала события
 ConfirmCloneEvent=Вы действительно хотите клонировать событие <b>%s</b>?
 RepeatEvent=Повторять событие
+OnceOnly=Только однажды
 EveryWeek=Каждую неделю
 EveryMonth=Каждый месяц
 DayOfMonth=День месяца
 DayOfWeek=День недели
 DateStartPlusOne=Дата начала + 1 час
-SetAllEventsToTodo=Set all events to todo
-SetAllEventsToInProgress=Set all events to in progress
-SetAllEventsToFinished=Set all events to finished
-ReminderTime=Reminder period before the event
-TimeType=Duration type
-ReminderType=Callback type
-AddReminder=Create an automatic reminder notification for this event
-ErrorReminderActionCommCreation=Error creating the reminder notification for this event
-BrowserPush=Browser Notification
+SetAllEventsToTodo=Установить все события в список дел
+SetAllEventsToInProgress=Установить все события как выполняющиеся
+SetAllEventsToFinished=Установить все события как завершенные
+ReminderTime=Период напоминания перед мероприятием
+TimeType=Тип продолжительности
+ReminderType=Тип обратного звонка
+AddReminder=Создать автоматическое напоминание для этого события
+ErrorReminderActionCommCreation=Не удалось создать напоминание об этом мероприятии.
+BrowserPush=Уведомление о всплывающем окне браузера
diff --git a/htdocs/langs/ru_RU/assets.lang b/htdocs/langs/ru_RU/assets.lang
index 3856fe6c865..df5081a02ee 100644
--- a/htdocs/langs/ru_RU/assets.lang
+++ b/htdocs/langs/ru_RU/assets.lang
@@ -22,13 +22,13 @@ AccountancyCodeAsset = Учетный код (актив)
 AccountancyCodeDepreciationAsset = Учетный код (счет актива амортизации)
 AccountancyCodeDepreciationExpense = Учетный код (счет амортизационных расходов)
 NewAssetType=Тип нового актива
-AssetsTypeSetup=Asset type setup
-AssetTypeModified=Asset type modified
+AssetsTypeSetup=Настройка типа актива
+AssetTypeModified=Тип актива изменен
 AssetType=Тип актива
 AssetsLines=Активы
 DeleteType=Удалить
-DeleteAnAssetType=Delete an asset type
-ConfirmDeleteAssetType=Are you sure you want to delete this asset type?
+DeleteAnAssetType=Удалить тип актива
+ConfirmDeleteAssetType=Вы действительно хотите удалить этот тип актива?
 ShowTypeCard=Показать типу ' %s'
 
 # Module label 'ModuleAssetsName'
@@ -42,7 +42,7 @@ ModuleAssetsDesc = Описание активов
 AssetsSetup = Настройка активов
 Settings = Настройки
 AssetsSetupPage = Страница настройки активов
-ExtraFieldsAssetsType = Complementary attributes (Asset type)
+ExtraFieldsAssetsType = Дополнительные атрибуты (тип актива)
 AssetsType=Тип актива
 AssetsTypeId=Идентификатор типа актива
 AssetsTypeLabel=Метка типа актива
@@ -61,5 +61,7 @@ MenuListTypeAssets = Список
 #
 # Module
 #
+Asset=Актив
 NewAssetType=Тип нового актива
 NewAsset=Новый актив
+ConfirmDeleteAsset=Вы уверены, что хотите удалить этот актив?
diff --git a/htdocs/langs/ru_RU/banks.lang b/htdocs/langs/ru_RU/banks.lang
index e7f809a0376..26af71315c2 100644
--- a/htdocs/langs/ru_RU/banks.lang
+++ b/htdocs/langs/ru_RU/banks.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - banks
 Bank=Банк
-MenuBankCash=Banks | Cash
+MenuBankCash=Банки | Денежные средства
 MenuVariousPayment=Смешанные платежи
 MenuNewVariousPayment=Новый смешанный платеж
 BankName=Название банка
@@ -30,26 +30,26 @@ AllTime=Сначала
 Reconciliation=Примирение
 RIB=Bank Account Number
 IBAN=IBAN номера
-BIC=BIC/SWIFT code
+BIC=BIC / SWIFT код
 SwiftValid=BIC/SWIFT действителен
 SwiftVNotalid=BIC / SWIFT недействителен
 IbanValid=BAN действителен
 IbanNotValid=BAN недействителен
-StandingOrders=Direct debit orders
+StandingOrders=Распоряжения прямого дебетования
 StandingOrder=Прямой дебетовый заказ
-PaymentByDirectDebit=Payment by direct debit
-PaymentByBankTransfers=Payments by credit transfer
-PaymentByBankTransfer=Payment by credit transfer
+PaymentByDirectDebit=Оплата прямым дебетом
+PaymentByBankTransfers=Платежи кредитным переводом
+PaymentByBankTransfer=Оплата кредитным переводом
 AccountStatement=Выписка со счета
 AccountStatementShort=Утверждение
 AccountStatements=Выписки со счета
 LastAccountStatements=Последнее счета
 IOMonthlyReporting=Ежемесячная отчетность
-BankAccountDomiciliation=Bank address
+BankAccountDomiciliation=Адрес банка
 BankAccountCountry=Счет страны
 BankAccountOwner=Имя владельца счета
 BankAccountOwnerAddress=Адрес владельца счета
-RIBControlError=Integrity check of values failed. This means the information for this account number is not complete or is incorrect (check country, numbers and IBAN).
+RIBControlError=Не удалось проверить целостность ценностей. Это означает, что информация для этого номера счета неполна или неверна (проверьте страну, номера и IBAN).
 CreateAccount=Создать аккаунт
 NewBankAccount=Новый счет
 NewFinancialAccount=Новые финансовые счета
@@ -76,11 +76,11 @@ BankTransaction=Банковская запись
 ListTransactions=Список записей
 ListTransactionsByCategory=Список записей/категория
 TransactionsToConciliate=Записи для согласования
-TransactionsToConciliateShort=To reconcile
+TransactionsToConciliateShort=Примирить
 Conciliable=Conciliable
 Conciliate=Согласительной
 Conciliation=Согласительная
-SaveStatementOnly=Save statement only
+SaveStatementOnly=Только сохранить выписку
 ReconciliationLate=Согласование с запозданием
 IncludeClosedAccount=Включите закрытые счета
 OnlyOpenedAccount=Только открытые аккаунты
@@ -98,37 +98,37 @@ AddBankRecordLong=Добавить запись вручную
 Conciliated=Согласование
 ConciliatedBy=Conciliated путем
 DateConciliating=Согласительную дата
-BankLineConciliated=Entry reconciled with bank receipt
+BankLineConciliated=Запись сверяется с банковской квитанцией
 Reconciled=Согласовано
 NotReconciled=Не согласовано
 CustomerInvoicePayment=Заказчиком оплаты
-SupplierInvoicePayment=Vendor payment
+SupplierInvoicePayment=Оплата продавцу
 SubscriptionPayment=Абонентская плата
-WithdrawalPayment=Debit payment order
+WithdrawalPayment=Дебетовое платежное поручение
 SocialContributionPayment=Социальный/налоговый сбор
-BankTransfer=Credit transfer
-BankTransfers=Credit transfers
+BankTransfer=Кредитный перевод
+BankTransfers=Кредитные переводы
 MenuBankInternalTransfer=Внутренний трансфер
-TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
+TransferDesc=Используйте внутренний перевод для перевода с одной учетной записи на другую, приложение запишет две записи: дебет в исходной учетной записи и кредит в целевой учетной записи. Та же сумма, этикетка и дата будут использоваться для этой транзакции.
 TransferFrom=От
 TransferTo=К
 TransferFromToDone=<b>Передача%</b> от <b>S в% х %s%</b> S был записан.
 CheckTransmitter=Отправитель
 ValidateCheckReceipt=Подтвердить получение чека?
-ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
+ConfirmValidateCheckReceipt=Вы уверены, что хотите отправить этот чек на проверку? Никаких изменений не может быть сделано.
 DeleteCheckReceipt=Удалить эту квитанцию?
 ConfirmDeleteCheckReceipt=Вы действительно хотите удалить эту квитанцию?
 BankChecks=Банковские чеки
 BankChecksToReceipt=Проверки, ожидающие внесения депозита
 BankChecksToReceiptShort=Проверки, ожидающие внесения депозита
 ShowCheckReceipt=Показать проверить депозита получения
-NumberOfCheques=No. of check
+NumberOfCheques=№ чека
 DeleteTransaction=Удалить запись
 ConfirmDeleteTransaction=Вы действительно хотите удалить эту запись?
 ThisWillAlsoDeleteBankRecord=Это также приведет к удалению сгенерированной записи банка
 BankMovements=Перевозкой
 PlannedTransactions=Запланированные записи
-Graph=Graphs
+Graph=Графики
 ExportDataset_banque_1=Банковские записи и выписка по счету
 ExportDataset_banque_2=Бланк депозита
 TransactionOnTheOtherAccount=Сделка с другой учетной записи
@@ -141,8 +141,8 @@ BankTransactionLine=Банковская запись
 AllAccounts=Все банковские и кассовые счета
 BackToAccount=Перейти к ответу
 ShowAllAccounts=Шоу для всех учетных записей
-FutureTransaction=Future transaction. Unable to reconcile.
-SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
+FutureTransaction=Будущая сделка. Невозможно примириться.
+SelectChequeTransactionAndGenerate=Выберите / отфильтруйте чеки, которые должны быть включены в квитанцию о внесении чека. Затем нажмите «Создать».
 InputReceiptNumber=Выберите банковскую выписку, связанную с согласительной процедурой. Используйте сортируемое числовое значение: ГГГГММ или ГГГГММДД
 EventualyAddCategory=Укажите категорию для классификации записей
 ToConciliate=Согласовать?
@@ -157,28 +157,28 @@ RejectCheck=Проверка возвращена
 ConfirmRejectCheck=Вы уверены, что хотите отметить эту проверку как отклоненную?
 RejectCheckDate=Дата проверки была возвращена
 CheckRejected=Проверка возобновлена
-CheckRejectedAndInvoicesReopened=Check returned and invoices re-open
+CheckRejectedAndInvoicesReopened=Чек возвращен, и счета открываются повторно
 BankAccountModelModule=Шаблоны документов для банковских счетов
-DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
+DocumentModelSepaMandate=Шаблон мандата SEPA. Используется только для европейских стран в ЕЭС.
 DocumentModelBan=Шаблон для печати страницы с информацией о BAN.
-NewVariousPayment=New miscellaneous payment
-VariousPayment=Miscellaneous payment
+NewVariousPayment=Новый прочий платеж
+VariousPayment=Разные платежи
 VariousPayments=Смешанные платежи
-ShowVariousPayment=Show miscellaneous payment
-AddVariousPayment=Add miscellaneous payment
-VariousPaymentId=Miscellaneous payment ID
-VariousPaymentLabel=Miscellaneous payment label
-ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment
+ShowVariousPayment=Показать разные платежи
+AddVariousPayment=Добавить разные платежи
+VariousPaymentId=Другой идентификатор платежа
+VariousPaymentLabel=Другой платежный ярлык
+ConfirmCloneVariousPayment=Подтвердите клон другого платежа
 SEPAMandate=Мандат SEPA
 YourSEPAMandate=Ваш мандат SEPA
-FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
-AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
-CashControl=POS cash desk control
-NewCashFence=New cash desk opening or closing
-BankColorizeMovement=Colorize movements
-BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
-BankColorizeMovementName1=Background color for debit movement
-BankColorizeMovementName2=Background color for credit movement
-IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
-NoBankAccountDefined=No bank account defined
-NoRecordFoundIBankcAccount=No record found in bank account. Commonly, this occurs when a record has been deleted manually from the list of transaction in the bank account (for example during a reconciliation of the bank account). Another reason is that the payment was recorded when the module "%s" was disabled.
+FindYourSEPAMandate=Это ваш мандат SEPA, чтобы разрешить нашей компании делать распоряжение о прямом дебете в ваш банк. Верните его с подписью (скан подписанного документа) или отправьте по почте на адрес
+AutoReportLastAccountStatement=Автоматически заполнять поле «номер банковской выписки» номером последней выписки при сверке.
+CashControl=Контроль кассы POS
+NewCashFence=Открытие или закрытие новой кассы
+BankColorizeMovement=Раскрашиваем движения
+BankColorizeMovementDesc=Если эта функция включена, вы можете выбрать определенный цвет фона для движения дебета или кредита.
+BankColorizeMovementName1=Цвет фона для движения дебета
+BankColorizeMovementName2=Цвет фона для движения кредита
+IfYouDontReconcileDisableProperty=Если вы не проводите выверку банковских счетов для некоторых банковских счетов, отключите для них свойство «%s», чтобы удалить это предупреждение.
+NoBankAccountDefined=Банковский счет не указан
+NoRecordFoundIBankcAccount=Никаких записей на банковском счете не найдено. Обычно это происходит, когда запись была вручную удалена из списка транзакций на банковском счете (например, во время выверки банковского счета). Другая причина в том, что платеж был записан при отключении модуля «%s».
diff --git a/htdocs/langs/ru_RU/bills.lang b/htdocs/langs/ru_RU/bills.lang
index 06d2f006bcd..e183dd196e2 100644
--- a/htdocs/langs/ru_RU/bills.lang
+++ b/htdocs/langs/ru_RU/bills.lang
@@ -5,30 +5,30 @@ BillsCustomers=Счета клиента
 BillsCustomer=Счёт клиента
 BillsSuppliers=Счета-фактуры поставщика
 BillsCustomersUnpaid=Неоплаченные счета клиента
-BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
-BillsSuppliersUnpaid=Unpaid vendor invoices
-BillsSuppliersUnpaidForCompany=Unpaid vendors invoices for %s
+BillsCustomersUnpaidForCompany=Неоплаченные счета клиентов за %s
+BillsSuppliersUnpaid=Неоплаченные счета поставщика
+BillsSuppliersUnpaidForCompany=Неоплаченные счета поставщиков за %s
 BillsLate=Просроченные платежи
 BillsStatistics=Статистика счетов клиентов
-BillsStatisticsSuppliers=Vendors invoices statistics
-DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping
-DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter.
-DisabledBecauseNotErasable=Disabled because cannot be erased
+BillsStatisticsSuppliers=Статистика счетов поставщиков
+DisabledBecauseDispatchedInBookkeeping=Отключено, так как счет был отправлен в бухгалтерию
+DisabledBecauseNotLastInvoice=Отключено, потому что счет нельзя стереть. Некоторые счета были записаны после этого, и это приведет к образованию дыр в прилавке.
+DisabledBecauseNotErasable=Отключено, так как не может быть удалено
 InvoiceStandard=Стандартный счёт
 InvoiceStandardAsk=Стандартный счёт
 InvoiceStandardDesc=Такой вид счёта является общим.
-InvoiceDeposit=Down payment invoice
-InvoiceDepositAsk=Down payment invoice
-InvoiceDepositDesc=This kind of invoice is done when a down payment has been received.
+InvoiceDeposit=Счет на предоплату
+InvoiceDepositAsk=Счет на предоплату
+InvoiceDepositDesc=Этот вид счета выставляется после получения авансового платежа.
 InvoiceProForma=Предварительный счет
 InvoiceProFormaAsk=Формальный счёт
 InvoiceProFormaDesc=<b>Формальный счёт</b> является образом оригинального счёта, но не имеет бухгалтерской учетной записи.
 InvoiceReplacement=Замена счета-фактуры
 InvoiceReplacementAsk=Замена счета-фактуры на другой
-InvoiceReplacementDesc=<b>Replacement invoice</b> is used to completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
+InvoiceReplacementDesc= <b> Счет-фактура замены </b> используется для полной замены счета-фактуры без получения оплаты. <br> <br> Примечание. Заменять можно только счета без оплаты. Если заменяемый вами счет еще не закрыт, он будет автоматически закрыт как «оставленный».
 InvoiceAvoir=Кредитовое авизо
 InvoiceAvoirAsk=Кредитовое авизо для исправления счета-фактуры
-InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice shows an amount that differs from the amount actually paid (eg the customer paid too much by mistake, or will not pay the complete amount since some products were returned).
+InvoiceAvoirDesc=Кредит-нота <b> </b> - это отрицательный счет-фактура, используемый для исправления того факта, что в счете-фактуре указана сумма, которая отличается от фактически уплаченной суммы (например, клиент заплатил слишком много по ошибке или не будет платить полную сумму, поскольку некоторые продукты были возвращены) .
 invoiceAvoirWithLines=Создать кредитное авизо со строками из оригинального счёта
 invoiceAvoirWithPaymentRestAmount=Кредитное авизо с неоплаченным остатком оригинального счёта
 invoiceAvoirLineWithPaymentRestAmount=Кредитное авизо на остаток для оплаты
@@ -41,9 +41,9 @@ CorrectionInvoice=Корректирующий счёт
 UsedByInvoice=Использован для оплаты счета-фактуры %s
 ConsumedBy=Использован
 NotConsumed=Не использован
-NoReplacableInvoice=No replaceable invoices
+NoReplacableInvoice=Нет заменяемых счетов-фактур
 NoInvoiceToCorrect=Нет счетов-фактур для корректировки
-InvoiceHasAvoir=Was source of one or several credit notes
+InvoiceHasAvoir=Был источником одной или нескольких кредитных нот
 CardBill=Карточка счета-фактуры
 PredefinedInvoices=Предопределенные Счета-фактуры
 Invoice=Счёт
@@ -53,193 +53,193 @@ InvoiceLine=Строка счета-фактуры
 InvoiceCustomer=Счёт клиента
 CustomerInvoice=Счёт клиента
 CustomersInvoices=Счета клиента
-SupplierInvoice=Vendor invoice
+SupplierInvoice=Счет поставщика
 SuppliersInvoices=Счета-фактуры поставщика
-SupplierInvoiceLines=Vendor invoice lines
-SupplierBill=Vendor invoice
+SupplierInvoiceLines=Строки накладной поставщика
+SupplierBill=Счет поставщика
 SupplierBills=Счета-фактуры поставщика
 Payment=Платеж
-PaymentBack=Refund
-CustomerInvoicePaymentBack=Refund
+PaymentBack=Возврат
+CustomerInvoicePaymentBack=Возврат
 Payments=Платежи
-PaymentsBack=Refunds
-paymentInInvoiceCurrency=in invoices currency
+PaymentsBack=Возврат
+paymentInInvoiceCurrency=в валюте счета
 PaidBack=Возврат платежа
 DeletePayment=Удалить платеж
-ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this %s into an available credit?
-ConfirmConvertToReduc2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an available credit?
-ConfirmConvertToReducSupplier2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
+ConfirmDeletePayment=Вы уверены, что хотите удалить этот платеж?
+ConfirmConvertToReduc=Вы хотите преобразовать этот %s в доступный кредит?
+ConfirmConvertToReduc2=Сумма будет сохранена среди всех скидок и может быть использована в качестве скидки для текущего или будущего счета для этого клиента.
+ConfirmConvertToReducSupplier=Вы хотите преобразовать этот %s в доступный кредит?
+ConfirmConvertToReducSupplier2=Сумма будет сохранена среди всех скидок и может быть использована в качестве скидки для текущего или будущего счета для этого поставщика.
 SupplierPayments=Платежи поставщику
 ReceivedPayments=Полученные платежи
 ReceivedCustomersPayments=Платежи, полученные от покупателей
-PayedSuppliersPayments=Payments paid to vendors
+PayedSuppliersPayments=Платежи поставщикам
 ReceivedCustomersPaymentsToValid=Полученные платежи покупателей для подтверждения
 PaymentsReportsForYear=Отчеты о платежах за %s
 PaymentsReports=Отчеты о платежах
 PaymentsAlreadyDone=Платежи уже сделаны
-PaymentsBackAlreadyDone=Refunds already done
+PaymentsBackAlreadyDone=Возврат уже произведен
 PaymentRule=Правила оплаты
-PaymentMode=Payment Type
-DefaultPaymentMode=Default Payment Type
-DefaultBankAccount=Default Bank Account
-PaymentTypeDC=Debit/Credit Card
+PaymentMode=Способ оплаты
+DefaultPaymentMode=Тип платежа по умолчанию
+DefaultBankAccount=Банковский счет по умолчанию
+PaymentTypeDC=Дебетовая / кредитная карта
 PaymentTypePP=PayPal
-IdPaymentMode=Payment Type (id)
-CodePaymentMode=Payment Type (code)
-LabelPaymentMode=Payment Type (label)
-PaymentModeShort=Payment Type
-PaymentTerm=Payment Term
+IdPaymentMode=Тип платежа (id)
+CodePaymentMode=Тип платежа (код)
+LabelPaymentMode=Тип оплаты (этикетка)
+PaymentModeShort=Способ оплаты
+PaymentTerm=Условия оплаты
 PaymentConditions=Условия оплаты
 PaymentConditionsShort=Условия оплаты
 PaymentAmount=Сумма платежа
 PaymentHigherThanReminderToPay=Платеж больше, чем в напоминании об оплате
-HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
+HelpPaymentHigherThanReminderToPay=Внимание, сумма платежа по одному или нескольким счетам превышает сумму непогашенной оплаты. <br> Измените свою запись, в противном случае подтвердите и рассмотрите возможность создания кредитной ноты на сумму превышения, полученную по каждому переплаченному счету.
+HelpPaymentHigherThanReminderToPaySupplier=Внимание, сумма платежа по одному или нескольким счетам превышает сумму непогашенной оплаты. <br> Измените свою запись, в противном случае подтвердите и рассмотрите возможность создания кредитной ноты на сумму превышения, уплаченную по каждому переплаченному счету.
 ClassifyPaid=Классифицировать как 'Оплачен'
-ClassifyUnPaid=Classify 'Unpaid'
+ClassifyUnPaid=Классифицируйте "неоплаченные"
 ClassifyPaidPartially=Классифицировать как 'Оплачен частично'
 ClassifyCanceled=Классифицировать как 'Аннулирован'
 ClassifyClosed=Классифицировать как 'Закрыт'
-ClassifyUnBilled=Classify 'Unbilled'
+ClassifyUnBilled=Классифицировать как "не выставленные"
 CreateBill=Создать счет-фактуру
 CreateCreditNote=Создать кредитовое авизо
 AddBill=Создать счёт или кредитное авизо
 AddToDraftInvoices=Добавить проект счёта
 DeleteBill=Удалить счет-фактуру
 SearchACustomerInvoice=Поиск счета-фактуры Покупателю
-SearchASupplierInvoice=Search for a vendor invoice
+SearchASupplierInvoice=Поиск счета-фактуры поставщика
 CancelBill=Отменить счет-фактуру
 SendRemindByMail=Отправить напоминание по email
-DoPayment=Enter payment
-DoPaymentBack=Enter refund
-ConvertToReduc=Mark as credit available
-ConvertExcessReceivedToReduc=Convert excess received into available credit
-ConvertExcessPaidToReduc=Convert excess paid into available discount
+DoPayment=Введите платеж
+DoPaymentBack=Введите возврат
+ConvertToReduc=Отметить как доступный кредит
+ConvertExcessReceivedToReduc=Преобразовать полученную излишек в доступный кредит
+ConvertExcessPaidToReduc=Превратите уплаченную сумму в доступную скидку
 EnterPaymentReceivedFromCustomer=Ввести платеж, полученный от покупателя
 EnterPaymentDueToCustomer=Произвести платеж за счет Покупателя
 DisabledBecauseRemainderToPayIsZero=Отключено, потому что оставшаяся оплата нулевая
-PriceBase=Base price
+PriceBase=Базисная цена
 BillStatus=Статус счета-фактуры
-StatusOfGeneratedInvoices=Status of generated invoices
+StatusOfGeneratedInvoices=Статус выставленных счетов
 BillStatusDraft=Проект (должен быть подтвержден)
 BillStatusPaid=Оплачен
-BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
-BillStatusConverted=Paid (ready for consumption in final invoice)
+BillStatusPaidBackOrConverted=Возврат кредитной ноты или пометка доступна как кредит
+BillStatusConverted=Оплачено (готово к употреблению в окончательном счете)
 BillStatusCanceled=Аннулирован
 BillStatusValidated=Подтвержден (необходимо оплатить)
 BillStatusStarted=Начат
 BillStatusNotPaid=Неоплачен
-BillStatusNotRefunded=Not refunded
+BillStatusNotRefunded=Не возвращается
 BillStatusClosedUnpaid=Закрыт (неоплачен)
 BillStatusClosedPaidPartially=Оплачен (частично)
 BillShortStatusDraft=Проект
 BillShortStatusPaid=Оплачен
-BillShortStatusPaidBackOrConverted=Refunded or converted
-Refunded=Refunded
+BillShortStatusPaidBackOrConverted=Возвращено или конвертировано
+Refunded=Возвращено
 BillShortStatusConverted=Оплачено
 BillShortStatusCanceled=Аннулирован
 BillShortStatusValidated=Подтвержден
 BillShortStatusStarted=Начат
 BillShortStatusNotPaid=Неоплачен
-BillShortStatusNotRefunded=Not refunded
+BillShortStatusNotRefunded=Не возвращается
 BillShortStatusClosedUnpaid=Закрыт
 BillShortStatusClosedPaidPartially=Оплачен (частично)
 PaymentStatusToValidShort=На подтверждении
-ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
-ErrorNoPaiementModeConfigured=No default payment type defined. Go to Invoice module setup to fix this.
-ErrorCreateBankAccount=Create a bank account, then go to Setup panel of Invoice module to define payment types
+ErrorVATIntraNotConfigured=Номер плательщика НДС внутри Сообщества еще не определен
+ErrorNoPaiementModeConfigured=Тип оплаты по умолчанию не определен. Чтобы исправить это, перейдите к настройке модуля «Счет-фактура».
+ErrorCreateBankAccount=Создайте банковский счет, затем перейдите на панель настройки модуля «Счет-фактура», чтобы определить типы платежей.
 ErrorBillNotFound=Счёт %s не существует
-ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
+ErrorInvoiceAlreadyReplaced=Ошибка, вы пытались проверить счет для замены счета %s. Но этот уже заменен на инвойс %s.
 ErrorDiscountAlreadyUsed=Ошибка, скидка уже используется
 ErrorInvoiceAvoirMustBeNegative=Ошибка, корректирующий счет-фактура должен иметь отрицательную сумму
-ErrorInvoiceOfThisTypeMustBePositive=Error, this type of invoice must have an amount excluding tax positive (or null)
+ErrorInvoiceOfThisTypeMustBePositive=Ошибка, этот тип счета-фактуры должен иметь положительную (или нулевую) сумму без учета налогов.
 ErrorCantCancelIfReplacementInvoiceNotValidated=Ошибка, невозможно отменить счет-фактуру, который был заменен на другой счет-фактуру, находящийся в статусе Проекта
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=Эта или другая часть уже используется, поэтому серию скидок удалить нельзя.
 BillFrom=Продавец
 BillTo=Покупатель
 ActionsOnBill=Действия со счетом-фактурой
-RecurringInvoiceTemplate=Template / Recurring invoice
-NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
-FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
-NotARecurringInvoiceTemplate=Not a recurring template invoice
+RecurringInvoiceTemplate=Шаблон / повторяющийся счет
+NoQualifiedRecurringInvoiceTemplateFound=Нет подходящих повторяющихся счетов-фактур для создания шаблонов.
+FoundXQualifiedRecurringInvoiceTemplate=Обнаружен повторяющийся шаблон счетов-фактур %s, подходящий для создания.
+NotARecurringInvoiceTemplate=Не повторяющийся шаблон счета-фактуры
 NewBill=Новый счёт
-LastBills=Latest %s invoices
-LatestTemplateInvoices=Latest %s template invoices
-LatestCustomerTemplateInvoices=Latest %s customer template invoices
-LatestSupplierTemplateInvoices=Latest %s vendor template invoices
-LastCustomersBills=Latest %s customer invoices
-LastSuppliersBills=Latest %s vendor invoices
+LastBills=Последние счета %s
+LatestTemplateInvoices=Последние счета-фактуры шаблона %s
+LatestCustomerTemplateInvoices=Последние счета-фактуры клиента по шаблону %s
+LatestSupplierTemplateInvoices=Последние накладные по шаблону поставщика %s
+LastCustomersBills=Последние счета клиентов %s
+LastSuppliersBills=Последние счета-фактуры поставщика %s
 AllBills=Все счета-фактуры
-AllCustomerTemplateInvoices=All template invoices
+AllCustomerTemplateInvoices=Все шаблоны счетов-фактур
 OtherBills=Другие счета-фактуры
 DraftBills=Проекты счетов-фактур
-CustomersDraftInvoices=Customer draft invoices
-SuppliersDraftInvoices=Vendor draft invoices
+CustomersDraftInvoices=Черновики счетов-фактур клиента
+SuppliersDraftInvoices=Черновики счетов-фактур поставщика
 Unpaid=Неоплачен
-ErrorNoPaymentDefined=Error No payment defined
-ConfirmDeleteBill=Are you sure you want to delete this invoice?
-ConfirmValidateBill=Are you sure you want to validate this invoice with reference <b>%s</b>?
-ConfirmUnvalidateBill=Are you sure you want to change invoice <b>%s</b> to draft status?
-ConfirmClassifyPaidBill=Are you sure you want to change invoice <b>%s</b> to status paid?
-ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b>?
-ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'?
-ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid?
-ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What is the reason for closing this invoice?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularize the VAT with a credit note.
-ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
+ErrorNoPaymentDefined=Ошибка Платеж не определен
+ConfirmDeleteBill=Вы уверены, что хотите удалить этот счет?
+ConfirmValidateBill=Вы действительно хотите подтвердить этот счет со ссылкой <b> %s </b>?
+ConfirmUnvalidateBill=Вы действительно хотите изменить статус счета <b> %s </b> на черновик?
+ConfirmClassifyPaidBill=Вы действительно хотите изменить статус счета <b> %s </b> на оплаченный?
+ConfirmCancelBill=Вы действительно хотите отменить счет <b> %s </b>?
+ConfirmCancelBillQuestion=Почему вы хотите классифицировать этот счет как «брошенный»?
+ConfirmClassifyPaidPartially=Вы действительно хотите изменить статус счета <b> %s </b> на оплаченный?
+ConfirmClassifyPaidPartiallyQuestion=Этот счет не оплачен полностью. По какой причине закрывается этот счет?
+ConfirmClassifyPaidPartiallyReasonAvoir=Оставшаяся неоплаченная <b> (%s %s) </b> - это скидка, предоставленная, потому что оплата была произведена досрочно. Я урегулирую НДС с помощью кредитной ноты.
+ConfirmClassifyPaidPartiallyReasonDiscount=Оставшаяся неоплаченная <b> (%s %s) </b> - это скидка, предоставленная, потому что оплата была произведена досрочно.
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Оставить неоплаченной <b>(%s %s)</b> предоставленную скидку, потому что платёж был сделан перед соглашением. Я подтверждаю потерю НДС на этой скидке.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Оставить неоплаченной <b>(%s %s)</b> предоставленную скидку, потому что платёж был сделан перед соглашением. Я восстановлю НДС на этой скидке без кредитного авизо.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Плохой Покупатель
 ConfirmClassifyPaidPartiallyReasonProductReturned=Продукция частично возвращена
 ConfirmClassifyPaidPartiallyReasonOther=Сумма, аннулированная по другим причинам
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Такой выбор возможен, если ваш счет снабжен соответствующими комментариями. (Пример «Только налог, соответствующий фактически уплаченной цене, дает право на вычет»)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=В некоторых странах этот выбор возможен только в том случае, если ваш счет содержит правильные примечания.
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Используйте этот выбор, если все остальные не подходят
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=Плохой клиент <b> </b> - это клиент, который отказывается выплатить свой долг.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Этот выбор используется при неполной оплате, когда некоторая продукция была возвращена
-ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Используйте этот выбор, если все остальные не подходят, например в следующей ситуации: <br> - оплата не завершена, потому что некоторые продукты были отправлены обратно <br> - заявленная сумма слишком важна, потому что скидка была забыта <br> Во всех случаях завышенная сумма должна быть исправлена в системе бухгалтерского учета, создав кредит-ноту.
 ConfirmClassifyAbandonReasonOther=Другой
 ConfirmClassifyAbandonReasonOtherDesc=Этот выбор будет использоваться во всех других случаях. Например, потому, что вы планируете создать заменяющий счет-фактуру.
-ConfirmCustomerPayment=Do you confirm this payment input for <b>%s</b> %s?
-ConfirmSupplierPayment=Do you confirm this payment input for <b>%s</b> %s?
-ConfirmValidatePayment=Are you sure you want to validate this payment? No change can be made once payment is validated.
+ConfirmCustomerPayment=Подтверждаете ли вы этот платежный ввод для <b> %s </b> %s?
+ConfirmSupplierPayment=Подтверждаете ли вы этот платежный ввод для <b> %s </b> %s?
+ConfirmValidatePayment=Вы уверены, что хотите подтвердить этот платеж? После подтверждения платежа никакие изменения не могут быть внесены.
 ValidateBill=Подтвердить счет-фактуру
 UnvalidateBill=Unvalidate счет
-NumberOfBills=No. of invoices
-NumberOfBillsByMonth=No. of invoices per month
+NumberOfBills=Кол-во счетов-фактур
+NumberOfBillsByMonth=Кол-во счетов в месяц
 AmountOfBills=Сумма счетов-фактур
-AmountOfBillsHT=Amount of invoices (net of tax)
+AmountOfBillsHT=Сумма счетов (без налога)
 AmountOfBillsByMonthHT=Сумма счетов-фактур за месяц (за вычетом налога)
-UseSituationInvoices=Allow situation invoice
-UseSituationInvoicesCreditNote=Allow situation invoice credit note
-Retainedwarranty=Retained warranty
-AllowedInvoiceForRetainedWarranty=Retained warranty usable on the following types of invoices
-RetainedwarrantyDefaultPercent=Retained warranty default percent
-RetainedwarrantyOnlyForSituation=Make "retained warranty" available only for situation invoices
-RetainedwarrantyOnlyForSituationFinal=On situation invoices the global "retained warranty" deduction is applied only on the final situation
-ToPayOn=To pay on %s
-toPayOn=to pay on %s
-RetainedWarranty=Retained Warranty
-PaymentConditionsShortRetainedWarranty=Retained warranty payment terms
-DefaultPaymentConditionsRetainedWarranty=Default retained warranty payment terms
-setPaymentConditionsShortRetainedWarranty=Set retained warranty payment terms
-setretainedwarranty=Set retained warranty
-setretainedwarrantyDateLimit=Set retained warranty date limit
-RetainedWarrantyDateLimit=Retained warranty date limit
-RetainedWarrantyNeed100Percent=The situation invoice need to be at 100%% progress to be displayed on PDF
+UseSituationInvoices=Разрешить счет-фактуру
+UseSituationInvoicesCreditNote=Разрешить кредитовое авизо для счета-фактуры
+Retainedwarranty=Сохраненная гарантия
+AllowedInvoiceForRetainedWarranty=Сохраненная гарантия применима к следующим типам счетов-фактур
+RetainedwarrantyDefaultPercent=Процент сохраненной гарантии по умолчанию
+RetainedwarrantyOnlyForSituation=Сделать "сохраненную гарантию" доступной только для ситуационных счетов-фактур
+RetainedwarrantyOnlyForSituationFinal=В счетах-фактурах глобальный вычет «оставшейся гарантии» применяется только к окончательной ситуации.
+ToPayOn=Платить на %s
+toPayOn=платить на %s
+RetainedWarranty=Сохраненная гарантия
+PaymentConditionsShortRetainedWarranty=Условия оплаты сохраненной гарантии
+DefaultPaymentConditionsRetainedWarranty=Условия оплаты сохраненной гарантии по умолчанию
+setPaymentConditionsShortRetainedWarranty=Установить условия оплаты сохраненной гарантии
+setretainedwarranty=Установить сохраненную гарантию
+setretainedwarrantyDateLimit=Установить ограничение срока действия гарантии
+RetainedWarrantyDateLimit=Срок действия гарантии
+RetainedWarrantyNeed100Percent=Счет-фактура ситуации должна быть на 100%% прогресс, чтобы отображаться в PDF.
 AlreadyPaid=Уже оплачен
-AlreadyPaidBack=Already paid back
-AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and down payments)
+AlreadyPaidBack=Уже выплачено
+AlreadyPaidNoCreditNotesNoDeposits=Уже оплачено (без кредитовых авизо и авансовых платежей)
 Abandoned=Брошен
 RemainderToPay=Оставить неоплаченным
-RemainderToTake=Remaining amount to take
-RemainderToPayBack=Remaining amount to refund
+RemainderToTake=Оставшаяся сумма
+RemainderToPayBack=Оставшаяся сумма к возврату
 Rest=В ожидании
 AmountExpected=Заявленная сумма
 ExcessReceived=Полученный излишек
-ExcessPaid=Excess paid
+ExcessPaid=Оплачено превышение
 EscompteOffered=Предоставлена скидка (за досрочный платеж)
 EscompteOfferedShort=Скидка
 SendBillRef=Представление счёта %s
@@ -253,21 +253,22 @@ RemainderToBill=Остаток к выставлению
 SendBillByMail=Отправить счет-фактуру по email
 SendReminderBillByMail=Отправить напоминание по email
 RelatedCommercialProposals=Связанные коммерческие предложения
-RelatedRecurringCustomerInvoices=Related recurring customer invoices
+RelatedRecurringCustomerInvoices=Связанные повторяющиеся счета-фактуры клиентов
 MenuToValid=Для проверки
-DateMaxPayment=Payment due on
+DateMaxPayment=Платеж должен быть произведен
 DateInvoice=Дата счета-фактуры
-DatePointOfTax=Point of tax
+DatePointOfTax=Пункт налогообложения
 NoInvoice=Нет счетов-фактур
+NoOpenInvoice=No open invoice
 ClassifyBill=Классифицировать счет-фактуру
-SupplierBillsToPay=Unpaid vendor invoices
+SupplierBillsToPay=Неоплаченные счета поставщика
 CustomerBillsUnpaid=Неоплаченные счета клиента
 NonPercuRecuperable=Не подлежащий взысканию
-SetConditions=Set Payment Terms
-SetMode=Set Payment Type
-SetRevenuStamp=Set revenue stamp
+SetConditions=Установить условия оплаты
+SetMode=Установить тип оплаты
+SetRevenuStamp=Установить отметку о доходах
 Billed=Выставлен
-RecurringInvoices=Recurring invoices
+RecurringInvoices=Периодические счета-фактуры
 RepeatableInvoice=Шаблоны счёта
 RepeatableInvoices=Шаблоны счетов
 Repeatable=Шаблон
@@ -275,15 +276,15 @@ Repeatables=Шаблоны
 ChangeIntoRepeatableInvoice=Конвертировать в шаблон счёта
 CreateRepeatableInvoice=Создать шаблон счёта
 CreateFromRepeatableInvoice=Создать из шаблона счёта
-CustomersInvoicesAndInvoiceLines=Customer invoices and invoice details
+CustomersInvoicesAndInvoiceLines=Счета-фактуры клиентов и детали счетов-фактур
 CustomersInvoicesAndPayments=Счета-фактуры Покупателям и платежи
-ExportDataset_invoice_1=Customer invoices and invoice details
+ExportDataset_invoice_1=Счета-фактуры клиентов и детали счетов-фактур
 ExportDataset_invoice_2=Счета-фактуры Покупателям и платежи
 ProformaBill=Встречный вексель:
 Reduction=Сокращение
-ReductionShort=Disc.
+ReductionShort=Диск.
 Reductions=Сокращения
-ReductionsShort=Disc.
+ReductionsShort=Диск.
 Discounts=Скидки
 AddDiscount=Создать абсолютную скидку
 AddRelativeDiscount=Создать относительная скидка
@@ -292,169 +293,169 @@ AddGlobalDiscount=Добавить скидку
 EditGlobalDiscounts=Редактировать абсолютной скидки
 AddCreditNote=Создать кредитовое авизо
 ShowDiscount=Показать скидку
-ShowReduc=Show the discount
-ShowSourceInvoice=Show the source invoice
+ShowReduc=Показать скидку
+ShowSourceInvoice=Показать исходный счет
 RelativeDiscount=Относительная скидка
 GlobalDiscount=Глобальная скидка
 CreditNote=Кредитовое авизо
 CreditNotes=Кредитовое авизо
-CreditNotesOrExcessReceived=Credit notes or excess received
-Deposit=Down payment
-Deposits=Down payments
+CreditNotesOrExcessReceived=Полученные кредитовые авизо или излишки
+Deposit=Первоначальный взнос
+Deposits=Авансовые платежи
 DiscountFromCreditNote=Скидка из кредитового авизо %s
-DiscountFromDeposit=Down payments from invoice %s
-DiscountFromExcessReceived=Payments in excess of invoice %s
-DiscountFromExcessPaid=Payments in excess of invoice %s
+DiscountFromDeposit=Авансовые платежи по счету %s
+DiscountFromExcessReceived=Платежи сверх суммы счета %s
+DiscountFromExcessPaid=Платежи сверх суммы счета %s
 AbsoluteDiscountUse=Такой тип кредита может быть использован по счету-фактуре до его подтверждения
-CreditNoteDepositUse=Invoice must be validated to use this kind of credits
+CreditNoteDepositUse=Чтобы использовать этот вид кредитов, необходимо подтвердить счет.
 NewGlobalDiscount=Новая фиксированная скидка
 NewRelativeDiscount=Новая относительная скидку
-DiscountType=Discount type
+DiscountType=Тип скидки
 NoteReason=Примечание / Основание
 ReasonDiscount=Основание
 DiscountOfferedBy=Предоставлена
-DiscountStillRemaining=Discounts or credits available
-DiscountAlreadyCounted=Discounts or credits already consumed
-CustomerDiscounts=Customer discounts
-SupplierDiscounts=Vendors discounts
+DiscountStillRemaining=Доступны скидки или кредиты
+DiscountAlreadyCounted=Скидки или кредиты уже израсходованы
+CustomerDiscounts=Скидки для клиентов
+SupplierDiscounts=Скидки продавцов
 BillAddress=Адрес выставления
-HelpEscompte=This discount is a discount granted to customer because payment was made before term.
-HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loss.
-HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example)
-IdSocialContribution=Social/fiscal tax payment id
+HelpEscompte=Эта скидка предоставляется покупателю, потому что оплата была произведена досрочно.
+HelpAbandonBadCustomer=От этой суммы отказались (покупатель считается плохим покупателем) и она считается исключительной потерей.
+HelpAbandonOther=Эта сумма была отклонена из-за ошибки (например, неправильный клиент или счет заменен другим)
+IdSocialContribution=Идентификатор платежа по социальному / налоговому налогу
 PaymentId=Код платежа
-PaymentRef=Payment ref.
+PaymentRef=Платеж исх.
 InvoiceId=Код счета-фактуры
 InvoiceRef=Ref. счета-фактуры
 InvoiceDateCreation=Дата создания счета-фактуры
 InvoiceStatus=Статус Счета-фактуры
 InvoiceNote=Примечание к счету-фактуре
 InvoicePaid=Счет-фактура оплачен
-InvoicePaidCompletely=Paid completely
-InvoicePaidCompletelyHelp=Invoice that are paid completely. This excludes invoices that are paid partially. To get list of all 'Closed' or non 'Closed' invoices, prefer to use a filter on the invoice status.
-OrderBilled=Order billed
-DonationPaid=Donation paid
+InvoicePaidCompletely=Оплачено полностью
+InvoicePaidCompletelyHelp=Счет-фактура полностью оплачена. Это исключает частично оплаченные счета. Чтобы получить список всех «Закрытых» или не «Закрытых» счетов-фактур, предпочтительнее использовать фильтр по статусу счета-фактуры.
+OrderBilled=Счет за заказ выставлен
+DonationPaid=Пожертвование выплачено
 PaymentNumber=Номера платежа
 RemoveDiscount=Удалить скидку
 WatermarkOnDraftBill=Водяной знак на проекте счета (ничего, если пусто)
 InvoiceNotChecked=Счет-фактура не выбран
-ConfirmCloneInvoice=Are you sure you want to clone this invoice <b>%s</b>?
+ConfirmCloneInvoice=Вы действительно хотите клонировать этот счет <b> %s </b>?
 DisabledBecauseReplacedInvoice=Действия отключены поскольку счет-фактура был заменен
-DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only records with payments during the fixed year are included here.
-NbOfPayments=No. of payments
+DescTaxAndDividendsArea=В этой области представлена сводная информация обо всех платежах по специальным расходам. Сюда включаются только записи с платежами в течение установленного года.
+NbOfPayments=Кол-во платежей
 SplitDiscount=Разделить скидку на две
-ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into two smaller discounts?
-TypeAmountOfEachNewDiscount=Input amount for each of two parts:
-TotalOfTwoDiscountMustEqualsOriginal=The total of the two new discounts must be equal to the original discount amount.
-ConfirmRemoveDiscount=Are you sure you want to remove this discount?
+ConfirmSplitDiscount=Вы уверены, что хотите разделить эту скидку <b> %s </b> %s на две меньшие скидки?
+TypeAmountOfEachNewDiscount=Сумма ввода для каждой из двух частей:
+TotalOfTwoDiscountMustEqualsOriginal=Сумма двух новых скидок должна быть равна первоначальной сумме скидки.
+ConfirmRemoveDiscount=Вы уверены, что хотите удалить эту скидку?
 RelatedBill=Связанный счёт
 RelatedBills=Связанные счета-фактуры
 RelatedCustomerInvoices=Связанные счета клиента
-RelatedSupplierInvoices=Related vendor invoices
+RelatedSupplierInvoices=Связанные счета-фактуры поставщика
 LatestRelatedBill=Последний связанный счёт
-WarningBillExist=Warning, one or more invoices already exist
-MergingPDFTool=Merging PDF tool
-AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
-PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company
-PaymentNote=Payment note
-ListOfPreviousSituationInvoices=List of previous situation invoices
-ListOfNextSituationInvoices=List of next situation invoices
-ListOfSituationInvoices=List of situation invoices
-CurrentSituationTotal=Total current situation
-DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
-RemoveSituationFromCycle=Remove this invoice from cycle
-ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
-ConfirmOuting=Confirm outing
-FrequencyPer_d=Every %s days
-FrequencyPer_m=Every %s months
-FrequencyPer_y=Every %s years
-FrequencyUnit=Frequency unit
-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 for next invoice generation
-NextDateToExecutionShort=Date next gen.
-DateLastGeneration=Date of latest generation
-DateLastGenerationShort=Date latest gen.
-MaxPeriodNumber=Max. number of invoice generation
-NbOfGenerationDone=Number of invoice generation already done
-NbOfGenerationOfRecordDone=Number of record generation already done
-NbOfGenerationDoneShort=Number of generation done
-MaxGenerationReached=Maximum number of generations reached
-InvoiceAutoValidate=Validate invoices automatically
-GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
-DateIsNotEnough=Date not reached yet
-InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
-GeneratedFromTemplate=Generated from template invoice %s
-WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
-WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
-ViewAvailableGlobalDiscounts=View available discounts
-GroupPaymentsByModOnReports=Group payments by mode on reports
+WarningBillExist=Предупреждение, один или несколько счетов уже существуют
+MergingPDFTool=Инструмент слияния PDF
+AmountPaymentDistributedOnInvoice=Сумма платежа, указанная в счете-фактуре
+PaymentOnDifferentThirdBills=Разрешить платежи по счетам разных третьих лиц, но одной и той же материнской компании
+PaymentNote=Платежное примечание
+ListOfPreviousSituationInvoices=Список счетов-фактур за предыдущие ситуации
+ListOfNextSituationInvoices=Список счетов-фактур следующей ситуации
+ListOfSituationInvoices=Список ситуационных накладных
+CurrentSituationTotal=Общая текущая ситуация
+DisabledBecauseNotEnouthCreditNote=Чтобы удалить ситуационный счет из цикла, сумма кредитового авизо по этому счету должна покрывать эту сумму по счету.
+RemoveSituationFromCycle=Удалить этот счет из цикла
+ConfirmRemoveSituationFromCycle=Удалить этот счет %s из цикла?
+ConfirmOuting=Подтвердить выезд
+FrequencyPer_d=Каждые %s дней
+FrequencyPer_m=Каждые %s месяцев
+FrequencyPer_y=Каждые %s лет
+FrequencyUnit=Единица частоты
+toolTipFrequency=Примеры: <br> <b> Набор 7, День </b>: выставлять новый счет каждые 7 дней <br> <b> Набор 3, Месяц a09a4b739f17f8zo: давать invice каждый месяц
+NextDateToExecution=Дата создания следующего счета
+NextDateToExecutionShort=Дата следующего поколения.
+DateLastGeneration=Дата последнего поколения
+DateLastGenerationShort=Дата последнего поколения
+MaxPeriodNumber=Максимум. количество выставленных счетов
+NbOfGenerationDone=Количество уже созданных счетов
+NbOfGenerationOfRecordDone=Количество уже созданных записей
+NbOfGenerationDoneShort=Количество сделанных поколений
+MaxGenerationReached=Достигнуто максимальное количество поколений
+InvoiceAutoValidate=Автоматически подтверждать счета
+GeneratedFromRecurringInvoice=Создан на основе шаблона повторяющегося счета-фактуры %s
+DateIsNotEnough=Дата еще не наступила
+InvoiceGeneratedFromTemplate=Счет-фактура %s, созданная на основе повторяющегося шаблона счета-фактуры %s
+GeneratedFromTemplate=Сгенерировано из шаблона счета-фактуры %s
+WarningInvoiceDateInFuture=Внимание, дата выставления счета больше текущей даты
+WarningInvoiceDateTooFarInFuture=Внимание! Дата выставления счета слишком далека от текущей.
+ViewAvailableGlobalDiscounts=Посмотреть доступные скидки
+GroupPaymentsByModOnReports=Групповые платежи по режимам в отчетах
 # PaymentConditions
 Statut=Статус
-PaymentConditionShortRECEP=Due Upon Receipt
-PaymentConditionRECEP=Due Upon Receipt
+PaymentConditionShortRECEP=Срок при получении
+PaymentConditionRECEP=Срок при получении
 PaymentConditionShort30D=30 дней
 PaymentCondition30D=30 дней
-PaymentConditionShort30DENDMONTH=30 days of month-end
-PaymentCondition30DENDMONTH=Within 30 days following the end of the month
+PaymentConditionShort30DENDMONTH=30 дней в конце месяца
+PaymentCondition30DENDMONTH=В течение 30 дней после окончания месяца
 PaymentConditionShort60D=60 дней
 PaymentCondition60D=60 дней
-PaymentConditionShort60DENDMONTH=60 days of month-end
-PaymentCondition60DENDMONTH=Within 60 days following the end of the month
+PaymentConditionShort60DENDMONTH=60 дней в конце месяца
+PaymentCondition60DENDMONTH=В течение 60 дней после окончания месяца
 PaymentConditionShortPT_DELIVERY=Доставка
 PaymentConditionPT_DELIVERY=О доставке
 PaymentConditionShortPT_ORDER=Заказ
 PaymentConditionPT_ORDER=В заказе
 PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50%% аванс, 50%% после доставки
-PaymentConditionShort10D=10 days
-PaymentCondition10D=10 days
-PaymentConditionShort10DENDMONTH=10 days of month-end
-PaymentCondition10DENDMONTH=Within 10 days following the end of the month
-PaymentConditionShort14D=14 days
-PaymentCondition14D=14 days
-PaymentConditionShort14DENDMONTH=14 days of month-end
-PaymentCondition14DENDMONTH=Within 14 days following the end of the month
-FixAmount=Fixed amount - 1 line with label '%s'
+PaymentConditionShort10D=10 дней
+PaymentCondition10D=10 дней
+PaymentConditionShort10DENDMONTH=10 дней конца месяца
+PaymentCondition10DENDMONTH=В течение 10 дней после окончания месяца
+PaymentConditionShort14D=14 дней
+PaymentCondition14D=14 дней
+PaymentConditionShort14DENDMONTH=14 дней в конце месяца
+PaymentCondition14DENDMONTH=В течение 14 дней после окончания месяца
+FixAmount=Фиксированная сумма - 1 строка с надписью '%s'
 VarAmount=Произвольное значение (%% от суммы)
-VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
-VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
+VarAmountOneLine=Переменная сумма (%% tot.) - 1 строка с меткой '%s'
+VarAmountAllLines=Переменная сумма (%% tot.) - все строки из исходной точки
 # PaymentType
 PaymentTypeVIR=Банковский перевод
 PaymentTypeShortVIR=Банковский перевод
-PaymentTypePRE=Direct debit payment order
-PaymentTypeShortPRE=Debit payment order
+PaymentTypePRE=Платежное поручение прямого дебета
+PaymentTypeShortPRE=Дебетовое платежное поручение
 PaymentTypeLIQ=Наличные
 PaymentTypeShortLIQ=Наличные
 PaymentTypeCB=Кредитная карта
 PaymentTypeShortCB=Кред. карта
 PaymentTypeCHQ=Чек
 PaymentTypeShortCHQ=Чек
-PaymentTypeTIP=TIP (Documents against Payment)
-PaymentTypeShortTIP=TIP Payment
-PaymentTypeVAD=Online payment
-PaymentTypeShortVAD=Online payment
-PaymentTypeTRA=Bank draft
+PaymentTypeTIP=СОВЕТ (Документы против платежа)
+PaymentTypeShortTIP=СОВЕТ Оплата
+PaymentTypeVAD=Онлайн платеж
+PaymentTypeShortVAD=Онлайн платеж
+PaymentTypeTRA=Банковский тратт
 PaymentTypeShortTRA=Проект
-PaymentTypeFAC=Factor
-PaymentTypeShortFAC=Factor
+PaymentTypeFAC=Фактор
+PaymentTypeShortFAC=Фактор
 BankDetails=Банковские реквизиты
 BankCode=Код банка
-DeskCode=Branch code
+DeskCode=Номер отдела
 BankAccountNumber=Номер счета
-BankAccountNumberKey=Checksum
+BankAccountNumberKey=Контрольная сумма
 Residence=Адрес
-IBANNumber=IBAN account number
+IBANNumber=Номер счета IBAN
 IBAN=IBAN
-CustomerIBAN=IBAN of customer
-SupplierIBAN=IBAN of vendor
+CustomerIBAN=IBAN клиента
+SupplierIBAN=IBAN продавца
 BIC=BIC/SWIFT
-BICNumber=BIC/SWIFT code
+BICNumber=BIC / SWIFT код
 ExtraInfos=Доп.инфо
 RegulatedOn=Регулируемый по
 ChequeNumber=Чек N
 ChequeOrTransferNumber=Чек/Перевод N
-ChequeBordereau=Check schedule
-ChequeMaker=Check/Transfer sender
+ChequeBordereau=Проверить расписание
+ChequeMaker=Чек / перевод отправителя
 ChequeBank=Банк чека
 CheckBank=Проверить
 NetToBePaid=Чистыми к оплате
@@ -462,130 +463,131 @@ PhoneNumber=Тел.
 FullPhoneNumber=Телефон
 TeleFax=Факс
 PrettyLittleSentence=Согласен с суммой причитающихся платежей по чекам выписанным на мое имя, как член ассоциации бухгалтерского учета, утвержденный Финансовой администрацией.
-IntracommunityVATNumber=Intra-Community VAT ID
-PaymentByChequeOrderedTo=Check payments (including tax) are payable to %s, send to
-PaymentByChequeOrderedToShort=Check payments (incl. tax) are payable to
+IntracommunityVATNumber=Идентификатор плательщика НДС внутри сообщества
+PaymentByChequeOrderedTo=Платежи по чекам (включая налоги) подлежат оплате на %s, отправьте на
+PaymentByChequeOrderedToShort=Платежи по чекам (включая налог) подлежат оплате
 SendTo=отправлено
-PaymentByTransferOnThisBankAccount=Payment by transfer to the following bank account
+PaymentByTransferOnThisBankAccount=Оплата переводом на следующий банковский счет
 VATIsNotUsedForInvoice=* Неприменяемых НДС арт-293B из CGI
 LawApplicationPart1=По применению закона 80.335 от 12/05/80
 LawApplicationPart2=товары остаются в собственности
-LawApplicationPart3=the seller until full payment of
+LawApplicationPart3=продавец до полной оплаты
 LawApplicationPart4=их стоимости.
 LimitedLiabilityCompanyCapital=SARL с капиталом
 UseLine=Применить
 UseDiscount=Использовать скидку
 UseCredit=Использовать кредит
 UseCreditNoteInInvoicePayment=Уменьшить сумму к оплате по этому кредиту
-MenuChequeDeposits=Check Deposits
+MenuChequeDeposits=Проверить депозиты
 MenuCheques=Чеки
-MenuChequesReceipts=Check receipts
+MenuChequesReceipts=Проверить квитанции
 NewChequeDeposit=Новое поступление
-ChequesReceipts=Check receipts
-ChequesArea=Check deposits area
-ChequeDeposits=Check deposits
+ChequesReceipts=Проверить квитанции
+ChequesArea=Зона чековых депозитов
+ChequeDeposits=Проверить депозиты
 Cheques=Чеки
-DepositId=Id deposit
-NbCheque=Number of checks
+DepositId=Идентификационный депозит
+NbCheque=Количество проверок
 CreditNoteConvertedIntoDiscount=Этот %s должен быть преобразован в %s
-UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third-party address as recipient for invoices
+UsBillingContactAsIncoiveRecipientIfExist=Используйте контакт / адрес с типом "платежный контакт" вместо стороннего адреса в качестве получателя для счетов.
 ShowUnpaidAll=Показать все неоплаченные счета-фактуры
 ShowUnpaidLateOnly=Показать только просроченные неоплаченные счета-фактуры
 PaymentInvoiceRef=Оплата счета-фактуры %s
 ValidateInvoice=Подтвердить счет-фактуру
-ValidateInvoices=Validate invoices
+ValidateInvoices=Подтвердить счета
 Cash=Наличные
 Reported=Задержан
 DisabledBecausePayments=Невозможно, поскольку есть некоторые платежи
 CantRemovePaymentWithOneInvoicePaid=Не удается удалить оплаты поскольку есть по крайней мере один счет-фактура классифицированный как 'оплачен'
-CantRemovePaymentVATPaid=Can't remove payment since VAT declaration is classified paid
-CantRemovePaymentSalaryPaid=Can't remove payment since salary is classified paid
+CantRemovePaymentVATPaid=Невозможно удалить платеж, поскольку декларация по НДС классифицируется как оплаченная
+CantRemovePaymentSalaryPaid=Невозможно удалить платеж, так как зарплата классифицируется как выплаченная
 ExpectedToPay=Ожидаемые платежи
-CantRemoveConciliatedPayment=Can't remove reconciled payment
+CantRemoveConciliatedPayment=Невозможно удалить сверенный платеж
 PayedByThisPayment=Оплачен этим платежом
-ClosePaidInvoicesAutomatically=Classify automatically all standard, down payment or replacement invoices as "Paid" when payment is done entirely.
-ClosePaidCreditNotesAutomatically=Classify automatically all credit notes as "Paid" when refund is done entirely.
-ClosePaidContributionsAutomatically=Classify automatically all social or fiscal contributions as "Paid" when payment is done entirely.
-ClosePaidVATAutomatically=Classify automatically VAT declaration as "Paid" when payment is done entirely.
-ClosePaidSalaryAutomatically=Classify automatically salary as "Paid" when payment is done entirely.
-AllCompletelyPayedInvoiceWillBeClosed=All invoices with no remainder to pay will be automatically closed with status "Paid".
+ClosePaidInvoicesAutomatically=Автоматически классифицируйте все стандартные, первоначальные или заменяющие счета-фактуры как «Оплаченные», когда оплата произведена полностью.
+ClosePaidCreditNotesAutomatically=Автоматически классифицируйте все кредитовые ноты как «Оплаченные», когда возврат произведен полностью.
+ClosePaidContributionsAutomatically=Автоматически классифицируйте все социальные или налоговые отчисления как «Выплаченные», когда оплата произведена полностью.
+ClosePaidVATAutomatically=Автоматически классифицируйте декларацию НДС как «Оплаченную», когда оплата произведена полностью.
+ClosePaidSalaryAutomatically=Автоматически классифицируйте зарплату как «Выплаченную», когда выплата производится полностью.
+AllCompletelyPayedInvoiceWillBeClosed=Все счета, не подлежащие оплате, автоматически закрываются со статусом «Оплачен».
 ToMakePayment=Платить
 ToMakePaymentBack=Возврат платежа
 ListOfYourUnpaidInvoices=Список неоплаченных счетов
 NoteListOfYourUnpaidInvoices=Примечание: Этот список содержит счета только тех контрагентов, которые связаны с нами, как представители по сбыту.
-RevenueStamp=Tax stamp
-YouMustCreateInvoiceFromThird=This option is only available when creating an invoice from tab "Customer" of third party
-YouMustCreateInvoiceFromSupplierThird=This option is only available when creating an invoice from tab "Vendor" of third party
-YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
-PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
-PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
-TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
-MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+RevenueStamp=Налоговая марка
+YouMustCreateInvoiceFromThird=Эта опция доступна только при создании счета на вкладке «Клиент» третьей стороны.
+YouMustCreateInvoiceFromSupplierThird=Эта опция доступна только при создании счета на вкладке «Поставщик» третьей стороны.
+YouMustCreateStandardInvoiceFirstDesc=Вы должны сначала создать стандартный счет-фактуру и преобразовать его в «шаблон», чтобы создать новый шаблон-счет-фактуру.
+PDFCrabeDescription=Счет-фактура PDF-шаблон Crabe. Полный шаблон счета-фактуры (старая реализация шаблона Sponge)
+PDFSpongeDescription=Счет-фактура PDF-шаблон Sponge. Полный шаблон счета-фактуры
+PDFCrevetteDescription=Счет-фактура в формате PDF Crevette. Полный шаблон накладной для ситуационных накладных
+TerreNumRefModelDesc1=Номер возврата в формате %syymm-nnnn для стандартных счетов-фактур и %syymm-nnnn для кредитовых авизо, где yy - год, mm - месяц и nnnn - последовательный номер с автоматическим увеличением без перерыва и без возврата к 0
+MarsNumRefModelDesc1=Номер возврата в формате yymm-nnnn для стандартных счетов-фактур, yymm-nnnn для счетов-фактур за замену, %syymm-nnnn для счетов-фактур авансового платежа и %s для счетов-фактур с авансовым платежом, а %s - порядковый номер месяца nnny-mm, где nnncial - порядковый номер месяца-ммгн, где nnny-yc- порядковый номер месяца, а %s без перерыва и без возврата к 0
 TerreNumRefModelError=Документ, начинающийся с $syymm, уже существует и не совместим с этой моделью последовательности. Удалите или переименуйте его, чтобы активировать этот модуль.
-CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
-EarlyClosingReason=Early closing reason
-EarlyClosingComment=Early closing note
+CactusNumRefModelDesc1=Номер возврата в формате %syymm-nnnn для стандартных счетов-фактур, %syymm-nnnn для кредитовых авизо и %syymm-nnnn для счетов-фактур на предоплату, где yy - это год, а mm - номер без разбивки по месяцам, а nnn - это автоматически номер месяца и nnn. 0
+EarlyClosingReason=Причина досрочного закрытия
+EarlyClosingComment=Заметка о досрочном закрытии
 ##### Types de contacts #####
 TypeContact_facture_internal_SALESREPFOLL=Четко отследить счет-фактуру Покупателю
 TypeContact_facture_external_BILLING=обратитесь в отдел счетов-фактур Покупателям
 TypeContact_facture_external_SHIPPING=обратитесь в службу доставки
 TypeContact_facture_external_SERVICE=обратитесь в клиентскую службу
-TypeContact_invoice_supplier_internal_SALESREPFOLL=Representative following-up vendor invoice
-TypeContact_invoice_supplier_external_BILLING=Vendor invoice contact
-TypeContact_invoice_supplier_external_SHIPPING=Vendor shipping contact
-TypeContact_invoice_supplier_external_SERVICE=Vendor service contact
+TypeContact_invoice_supplier_internal_SALESREPFOLL=Счет-фактура от поставщика для последующей проверки представителя
+TypeContact_invoice_supplier_external_BILLING=Контактная информация поставщика по счету-фактуре
+TypeContact_invoice_supplier_external_SHIPPING=Контактная информация поставщика для доставки
+TypeContact_invoice_supplier_external_SERVICE=Контактная информация поставщика услуг
 # Situation invoices
-InvoiceFirstSituationAsk=First situation invoice
-InvoiceFirstSituationDesc=The <b>situation invoices</b> are tied to situations related to a progression, for example the progression of a construction. Each situation is tied to an invoice.
-InvoiceSituation=Situation invoice
-PDFInvoiceSituation=Situation invoice
-InvoiceSituationAsk=Invoice following the situation
-InvoiceSituationDesc=Create a new situation following an already existing one
-SituationAmount=Situation invoice amount(net)
-SituationDeduction=Situation subtraction
+InvoiceFirstSituationAsk=Счет-фактура первой ситуации
+InvoiceFirstSituationDesc=Счета-фактуры <b> </b> привязаны к ситуациям, связанным с развитием, например, с развитием строительства. Каждая ситуация привязана к счету.
+InvoiceSituation=Счет-фактура
+PDFInvoiceSituation=Счет-фактура
+InvoiceSituationAsk=Счет-фактура по ситуации
+InvoiceSituationDesc=Создайте новую ситуацию после уже существующей
+SituationAmount=Сумма ситуационного счета (нетто)
+SituationDeduction=Вычитание ситуации
 ModifyAllLines=Изменить все строки
-CreateNextSituationInvoice=Create next situation
-ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
-ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
-ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
-NotLastInCycle=This invoice is not the latest in cycle and must not be modified.
-DisabledBecauseNotLastInCycle=The next situation already exists.
-DisabledBecauseFinal=This situation is final.
-situationInvoiceShortcode_AS=AS
+CreateNextSituationInvoice=Создать следующую ситуацию
+ErrorFindNextSituationInvoice=Ошибка: невозможно найти следующую ситуацию. Цикл исх.
+ErrorOutingSituationInvoiceOnUpdate=Невозможно выставить счет-фактуру в этой ситуации.
+ErrorOutingSituationInvoiceCreditNote=Невозможно получить связанную кредитную ноту.
+NotLastInCycle=Этот счет не является последним в цикле и не может быть изменен.
+DisabledBecauseNotLastInCycle=Следующая ситуация уже существует.
+DisabledBecauseFinal=Эта ситуация окончательная.
+situationInvoiceShortcode_AS=В ВИДЕ
 situationInvoiceShortcode_S=Вс
-CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
-NoSituations=No open situations
+CantBeLessThanMinPercent=Прогресс не может быть меньше его значения в предыдущей ситуации.
+NoSituations=Нет открытых ситуаций
 InvoiceSituationLast=Финальный и основной счёт
-PDFCrevetteSituationNumber=Situation N°%s
-PDFCrevetteSituationInvoiceLineDecompte=Situation invoice - COUNT
-PDFCrevetteSituationInvoiceTitle=Situation invoice
-PDFCrevetteSituationInvoiceLine=Situation N°%s: Inv. N°%s on %s
-TotalSituationInvoice=Total situation
-invoiceLineProgressError=Invoice line progress can't be greater than or equal to the next invoice line
-updatePriceNextInvoiceErrorUpdateline=Error: update price on invoice line: %s
-ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
-ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
-ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both methods (manual and automatic) can be used together with no risk of duplication.
-DeleteRepeatableInvoice=Delete template invoice
-ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
-CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
-BillCreated=%s invoice(s) generated
-BillXCreated=Invoice %s generated
-StatusOfGeneratedDocuments=Status of document generation
-DoNotGenerateDoc=Do not generate document file
-AutogenerateDoc=Auto generate document file
-AutoFillDateFrom=Set start date for service line with invoice date
-AutoFillDateFromShort=Set start date
-AutoFillDateTo=Set end date for service line with next invoice date
-AutoFillDateToShort=Set end date
-MaxNumberOfGenerationReached=Max number of gen. reached
+PDFCrevetteSituationNumber=Ситуация № %s
+PDFCrevetteSituationInvoiceLineDecompte=Счет-фактура - COUNT
+PDFCrevetteSituationInvoiceTitle=Счет-фактура
+PDFCrevetteSituationInvoiceLine=Ситуация № %s: инв. № %s на %s
+TotalSituationInvoice=Общая ситуация
+invoiceLineProgressError=Ход строки счета-фактуры не может быть больше или равен следующей строке счета-фактуры
+updatePriceNextInvoiceErrorUpdateline=Ошибка: обновить цену в строке счета-фактуры: %s
+ToCreateARecurringInvoice=Чтобы создать повторяющийся счет для этого контракта, сначала создайте этот черновик счета, затем преобразуйте его в шаблон счета и определите периодичность создания будущих счетов.
+ToCreateARecurringInvoiceGene=Чтобы создавать будущие счета регулярно и вручную, просто перейдите в меню <strong> %s - %s - %s </strong>.
+ToCreateARecurringInvoiceGeneAuto=Если вам нужно, чтобы такие счета создавались автоматически, попросите администратора включить и настроить модуль <strong> %s </strong>. Обратите внимание, что оба метода (ручной и автоматический) можно использовать вместе без риска дублирования.
+DeleteRepeatableInvoice=Удалить шаблон счета-фактуры
+ConfirmDeleteRepeatableInvoice=Вы уверены, что хотите удалить шаблон счета-фактуры?
+CreateOneBillByThird=Создайте один счет для каждой третьей стороны (в противном случае - один счет для каждого заказа)
+BillCreated=%s счет (-а) сгенерирован
+BillXCreated=Счет-фактура %s сформирована
+StatusOfGeneratedDocuments=Статус создания документа
+DoNotGenerateDoc=Не создавать файл документа
+AutogenerateDoc=Автоматическое создание файла документа
+AutoFillDateFrom=Установите дату начала для строки обслуживания с датой счета-фактуры
+AutoFillDateFromShort=Установить дату начала
+AutoFillDateTo=Установить дату окончания для строки обслуживания с датой следующего счета-фактуры
+AutoFillDateToShort=Установить дату окончания
+MaxNumberOfGenerationReached=Максимальное количество генераторов. достиг
 BILL_DELETEInDolibarr=Счёт удалён
-BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
-UnitPriceXQtyLessDiscount=Unit price x Qty - Discount
-CustomersInvoicesArea=Customer billing area
-SupplierInvoicesArea=Supplier billing area
-FacParentLine=Invoice Line Parent
-SituationTotalRayToRest=Remainder to pay without taxe
-PDFSituationTitle=Situation n° %d
-SituationTotalProgress=Total progress %d %%
+BILL_SUPPLIER_DELETEInDolibarr=Счет поставщика удален
+UnitPriceXQtyLessDiscount=Цена за единицу x Кол-во - Скидка
+CustomersInvoicesArea=Зона выставления счетов клиента
+SupplierInvoicesArea=Платежная зона поставщика
+FacParentLine=Родительская строка счета-фактуры
+SituationTotalRayToRest=Осталось заплатить без налога
+PDFSituationTitle=Ситуация № %d
+SituationTotalProgress=Общий прогресс %d %%
+SearchUnpaidInvoicesWithDueDate=Поиск неоплаченных счетов со сроком оплаты = %s
diff --git a/htdocs/langs/ru_RU/blockedlog.lang b/htdocs/langs/ru_RU/blockedlog.lang
index 74164531cae..c339dfed5d4 100644
--- a/htdocs/langs/ru_RU/blockedlog.lang
+++ b/htdocs/langs/ru_RU/blockedlog.lang
@@ -1,54 +1,54 @@
 BlockedLog=Неизменяемые логи
 Field=Поле
-BlockedLogDesc=This module tracks some events into an unalterable log (that you can't modify once recorded) into a block chain, in real time. This module provides compatibility with requirements of laws of some countries (like France with the law Finance 2016 - Norme NF525).
-Fingerprints=Archived events and fingerprints
-FingerprintsDesc=This is the tool to browse or extract the unalterable logs. Unalterable logs are generated and archived locally into a dedicated table, in real time when you record a business event. You can use this tool to export this archive and save it into an external support (some countries, like France, ask that you do it every year). Note that, there is no feature to purge this log and every change tried to be done directly into this log (by a hacker for example) will be reported with a non-valid fingerprint. If you really need to purge this table because you used your application for a demo/test purpose and want to clean your data to start your production, you can ask your reseller or integrator to reset your database (all your data will be removed).
-CompanyInitialKey=Company initial key (hash of genesis block)
-BrowseBlockedLog=Unalterable logs
+BlockedLogDesc=Этот модуль отслеживает некоторые события в неизменяемом журнале (который вы не можете изменить после записи) в цепочку блоков в реальном времени. Этот модуль обеспечивает совместимость с требованиями законодательства некоторых стран (например, Франции с законом Финансы 2016 - Norme NF525).
+Fingerprints=Архивные события и отпечатки пальцев
+FingerprintsDesc=Это инструмент для просмотра или извлечения неизменяемых журналов. Неизменяемые журналы создаются и архивируются локально в специальную таблицу в режиме реального времени, когда вы записываете бизнес-событие. Вы можете использовать этот инструмент для экспорта этого архива и сохранения его во внешней службе поддержки (некоторые страны, например Франция, просят вас делать это каждый год). Обратите внимание, что нет функции очистки этого журнала, и о каждом изменении, которое пытались внести непосредственно в этот журнал (например, хакером), будет сообщаться с недействительным отпечатком пальца. Если вам действительно нужно очистить эту таблицу, потому что вы использовали свое приложение для демонстрации / тестирования и хотите очистить свои данные, чтобы начать производство, вы можете попросить своего торгового посредника или интегратора сбросить вашу базу данных (все ваши данные будут удалены).
+CompanyInitialKey=Начальный ключ компании (хеш генезисного блока)
+BrowseBlockedLog=Неизменяемые журналы
 ShowAllFingerPrintsMightBeTooLong=Показать все архивные логи (может быть долго)
 ShowAllFingerPrintsErrorsMightBeTooLong=Показать все недействительные архивные логи (может быть долго)
-DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+DownloadBlockChain=Скачать отпечатки пальцев
+KoCheckFingerprintValidity=Запись в архиве журнала недействительна. Это означает, что кто-то (хакер?) Изменил некоторые данные этой записи после того, как она была записана, или удалил предыдущую архивную запись (проверьте, существует ли строка с предыдущим #) или изменил контрольную сумму предыдущей записи.
 OkCheckFingerprintValidity=Архивная запись в журнале действительна. Данные в этой строке не были изменены, и запись следует за предыдущей.
-OkCheckFingerprintValidityButChainIsKo=Archived log seems valid compared to previous one but the chain was corrupted previously.
-AddedByAuthority=Stored into remote authority
-NotAddedByAuthorityYet=Not yet stored into remote authority
+OkCheckFingerprintValidityButChainIsKo=Архивный журнал кажется действительным по сравнению с предыдущим, но цепочка ранее была повреждена.
+AddedByAuthority=Сохранено в удаленном центре
+NotAddedByAuthorityYet=Еще не сохранено в удаленном центре
 ShowDetails=Показать сохраненные данные
-logPAYMENT_VARIOUS_CREATE=Payment (not assigned to an invoice) created
-logPAYMENT_VARIOUS_MODIFY=Payment (not assigned to an invoice) modified
-logPAYMENT_VARIOUS_DELETE=Payment (not assigned to an invoice) logical deletion
-logPAYMENT_ADD_TO_BANK=Payment added to bank
+logPAYMENT_VARIOUS_CREATE=Платеж (не привязанный к счету) создан
+logPAYMENT_VARIOUS_MODIFY=Платеж (не привязанный к счету) изменен
+logPAYMENT_VARIOUS_DELETE=Логическое удаление платежа (не привязанного к счету)
+logPAYMENT_ADD_TO_BANK=Платеж добавлен в банк
 logPAYMENT_CUSTOMER_CREATE=Платеж клиента создан
-logPAYMENT_CUSTOMER_DELETE=Customer payment logical deletion
+logPAYMENT_CUSTOMER_DELETE=Логическое удаление платежа клиента
 logDONATION_PAYMENT_CREATE=Платеж пожертвования создан
-logDONATION_PAYMENT_DELETE=Donation payment logical deletion
+logDONATION_PAYMENT_DELETE=Логическое удаление пожертвований
 logBILL_PAYED=Счет клиента оплачен
 logBILL_UNPAYED=Неоплаченный счет клиента
 logBILL_VALIDATE=Проверка векселя
-logBILL_SENTBYMAIL=Customer invoice send by mail
-logBILL_DELETE=Customer invoice logically deleted
-logMODULE_RESET=Module BlockedLog was disabled
-logMODULE_SET=Module BlockedLog was enabled
+logBILL_SENTBYMAIL=Счет клиента отправляется по почте
+logBILL_DELETE=Счет клиента удален логически
+logMODULE_RESET=Модуль BlockedLog был отключен
+logMODULE_SET=Модуль BlockedLog был включен
 logDON_VALIDATE=Пожертвование подтверждено
 logDON_MODIFY=Пожертвование изменено
-logDON_DELETE=Donation logical deletion
-logMEMBER_SUBSCRIPTION_CREATE=Member subscription created
-logMEMBER_SUBSCRIPTION_MODIFY=Member subscription modified
-logMEMBER_SUBSCRIPTION_DELETE=Member subscription logical deletion
-logCASHCONTROL_VALIDATE=Cash desk closing recording
-BlockedLogBillDownload=Customer invoice download
-BlockedLogBillPreview=Customer invoice preview
-BlockedlogInfoDialog=Log Details
-ListOfTrackedEvents=List of tracked events
-Fingerprint=Fingerprint
-DownloadLogCSV=Export archived logs (CSV)
-logDOC_PREVIEW=Preview of a validated document in order to print or download
-logDOC_DOWNLOAD=Download of a validated document in order to print or send
-DataOfArchivedEvent=Full datas of archived event
-ImpossibleToReloadObject=Original object (type %s, id %s) not linked (see 'Full datas' column to get unalterable saved data)
-BlockedLogAreRequiredByYourCountryLegislation=Unalterable Logs module may be required by the legislation of your country. Disabling this module may render any future transactions invalid with respect to the law and the use of legal software as they can not be validated by a tax audit.
-BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Unalterable Logs module was activated because of the legislation of your country. Disabling this module may render any future transactions invalid with respect to the law and the use of legal software as they cannot be validated by a tax audit.
-BlockedLogDisableNotAllowedForCountry=List of countries where usage of this module is mandatory (just to prevent to disable the module by error, if your country is in this list, disable of module is not possible without editing this list first. Note also that enabling/disabling this module will keep a track into the unalterable log).
-OnlyNonValid=Non-valid
-TooManyRecordToScanRestrictFilters=Too many records to scan/analyze. Please restrict list with more restrictive filters.
-RestrictYearToExport=Restrict month / year to export
+logDON_DELETE=Логическое удаление пожертвования
+logMEMBER_SUBSCRIPTION_CREATE=Подписка для участников создана
+logMEMBER_SUBSCRIPTION_MODIFY=Подписка участника изменена
+logMEMBER_SUBSCRIPTION_DELETE=Логическое удаление членской подписки
+logCASHCONTROL_VALIDATE=Запись закрытия кассы
+BlockedLogBillDownload=Загрузка счета-фактуры клиента
+BlockedLogBillPreview=Предварительный просмотр счета клиента
+BlockedlogInfoDialog=Детали журнала
+ListOfTrackedEvents=Список отслеживаемых событий
+Fingerprint=Отпечаток пальца
+DownloadLogCSV=Экспорт архивных журналов (CSV)
+logDOC_PREVIEW=Предварительный просмотр проверенного документа для печати или загрузки
+logDOC_DOWNLOAD=Скачивание подтвержденного документа для печати или отправки
+DataOfArchivedEvent=Полные данные заархивированного события
+ImpossibleToReloadObject=Исходный объект (тип %s, id %s) не связан (см. Столбец «Полные данные», чтобы получить неизменяемые сохраненные данные)
+BlockedLogAreRequiredByYourCountryLegislation=Модуль «Неизменяемые журналы» может потребоваться законодательством вашей страны. Отключение этого модуля может сделать любые будущие транзакции недействительными с точки зрения закона и использования юридического программного обеспечения, поскольку они не могут быть подтверждены налоговой проверкой.
+BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Модуль «Неизменяемые журналы» был активирован в соответствии с законодательством вашей страны. Отключение этого модуля может сделать любые будущие транзакции недействительными с точки зрения закона и использования юридического программного обеспечения, поскольку они не могут быть подтверждены налоговой проверкой.
+BlockedLogDisableNotAllowedForCountry=Список стран, в которых использование этого модуля является обязательным (просто для предотвращения отключения модуля по ошибке, если ваша страна находится в этом списке, отключение модуля невозможно без предварительного редактирования этого списка. Также обратите внимание, что включение / отключение этого модуля приведет к вести запись в неизменяемый журнал).
+OnlyNonValid=Недействительный
+TooManyRecordToScanRestrictFilters=Слишком много записей для сканирования / анализа. Пожалуйста, ограничьте список более строгими фильтрами.
+RestrictYearToExport=Ограничить экспорт по месяцам / годам
diff --git a/htdocs/langs/ru_RU/boxes.lang b/htdocs/langs/ru_RU/boxes.lang
index 6b028a8b64f..263aad5ae29 100644
--- a/htdocs/langs/ru_RU/boxes.lang
+++ b/htdocs/langs/ru_RU/boxes.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - boxes
-BoxDolibarrStateBoard=Statistics on main business objects in database
+BoxDolibarrStateBoard=Статистика по основным бизнес-объектам в базе данных
 BoxLoginInformation=Информация для входа
 BoxLastRssInfos=RSS информация
 BoxLastProducts=Последние  %s Продукты/ Услуги
@@ -18,46 +18,46 @@ BoxLastActions=Последние действия
 BoxLastContracts=Последние контракты
 BoxLastContacts=Последние контакты/адреса
 BoxLastMembers=Последние участники
-BoxLastModifiedMembers=Latest modified members
-BoxLastMembersSubscriptions=Latest member subscriptions
+BoxLastModifiedMembers=Последние измененные участники
+BoxLastMembersSubscriptions=Последние подписки участников
 BoxFicheInter=Последние вмешательства
-BoxCurrentAccounts=Open accounts balance
-BoxTitleMemberNextBirthdays=Birthdays of this month (members)
-BoxTitleMembersByType=Members by type
-BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
+BoxCurrentAccounts=Остаток на открытых счетах
+BoxTitleMemberNextBirthdays=Дни рождения в этом месяце (участники)
+BoxTitleMembersByType=Участники по типу
+BoxTitleMembersSubscriptionsByYear=Подписки участников по годам
 BoxTitleLastRssInfos=Последние  %s новостей от %s
 BoxTitleLastProducts=Продукты/Услуги: последних %s изменений 
 BoxTitleProductsAlertStock=Продукты: имеющиеся оповещения
 BoxTitleLastSuppliers=Последние %s зарегистрированные поставщики
 BoxTitleLastModifiedSuppliers=Продавцы: последнее %s изменений
-BoxTitleLastModifiedCustomers=Customers: last %s modified
-BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s modified Customer invoices
-BoxTitleLastSupplierBills=Latest %s modified Vendor invoices
-BoxTitleLastModifiedProspects=Prospects: last %s modified
-BoxTitleLastModifiedMembers=Latest %s members
-BoxTitleLastFicheInter=Latest %s modified interventions
-BoxTitleOldestUnpaidCustomerBills=Customer Invoices: oldest %s unpaid
-BoxTitleOldestUnpaidSupplierBills=Vendor Invoices: oldest %s unpaid
-BoxTitleCurrentAccounts=Open Accounts: balances
-BoxTitleSupplierOrdersAwaitingReception=Supplier orders awaiting reception
-BoxTitleLastModifiedContacts=Contacts/Addresses: last %s modified
+BoxTitleLastModifiedCustomers=Заказчики: последнее изменение %s
+BoxTitleLastCustomersOrProspects=Последние клиенты или потенциальные клиенты %s
+BoxTitleLastCustomerBills=Последние измененные счета клиентов %s
+BoxTitleLastSupplierBills=Последние измененные счета-фактуры поставщика %s
+BoxTitleLastModifiedProspects=Перспективы: последние изменения %s
+BoxTitleLastModifiedMembers=Последние участники  %s
+BoxTitleLastFicheInter=Последние модифицированные вмешательства %s
+BoxTitleOldestUnpaidCustomerBills=Счета клиентов: самые старые неоплаченные %s
+BoxTitleOldestUnpaidSupplierBills=Счета поставщика: самые старые неоплаченные %s
+BoxTitleCurrentAccounts=Открытые счета: остатки
+BoxTitleSupplierOrdersAwaitingReception=Заказы поставщика ожидают приема
+BoxTitleLastModifiedContacts=Контакты / Адреса: последнее изменение %s
 BoxMyLastBookmarks=Закладки: последние %s
 BoxOldestExpiredServices=Старейшие активных истек услуги
-BoxLastExpiredServices=Latest %s oldest contacts with active expired services
-BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s contracts which were modified
-BoxTitleLastModifiedDonations=Latest %s donations which were modified
-BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
-BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
-BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
-BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
+BoxLastExpiredServices=Последние %s самые старые контакты с активными просроченными услугами
+BoxTitleLastActionsToDo=Последние действия %s, которые нужно сделать
+BoxTitleLastContracts=Последние контракты %s, которые были изменены
+BoxTitleLastModifiedDonations=Последние пожертвования %s, которые были изменены
+BoxTitleLastModifiedExpenses=Последние отчеты о расходах %s, которые были изменены
+BoxTitleLatestModifiedBoms=Последние измененные спецификации %s
+BoxTitleLatestModifiedMos=Последние измененные производственные заказы %s
+BoxTitleLastOutstandingBillReached=Превышено максимальное количество непогашенных клиентов
 BoxGlobalActivity=Глобальная активность (фактуры, предложения, заказы)
 BoxGoodCustomers=Хорошие клиенты
-BoxTitleGoodCustomers=%s Good customers
+BoxTitleGoodCustomers=%s Хорошие клиенты
 BoxScheduledJobs=Запланированные задания
-BoxTitleFunnelOfProspection=Lead funnel
-FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
+BoxTitleFunnelOfProspection=Ведущая лидов
+FailedToRefreshDataInfoNotUpToDate=Не удалось обновить поток RSS. Дата последнего успешного обновления: %s
 LastRefreshDate=Дата последнего обновления
 NoRecordedBookmarks=Закладки не созданы.
 ClickToAdd=Нажмите здесь, чтобы добавить.
@@ -76,45 +76,45 @@ NoContractedProducts=Нет законтрактованных товаров /
 NoRecordedContracts=Нет введенных договоров
 NoRecordedInterventions=Нет записанных мероприятий
 BoxLatestSupplierOrders=Последние заказы на покупку
-BoxLatestSupplierOrdersAwaitingReception=Latest Purchase Orders (with a pending reception)
+BoxLatestSupplierOrdersAwaitingReception=Последние заказы на закупку (ожидающие получения)
 NoSupplierOrder=Нет зарегистрированного заказа на покупку
 BoxCustomersInvoicesPerMonth=Счета клиентов в месяц
-BoxSuppliersInvoicesPerMonth=Vendor Invoices per month
+BoxSuppliersInvoicesPerMonth=Счета поставщика в месяц
 BoxCustomersOrdersPerMonth=Заказы на продажу в месяц
-BoxSuppliersOrdersPerMonth=Vendor Orders per month
+BoxSuppliersOrdersPerMonth=Заказы поставщика в месяц
 BoxProposalsPerMonth=Предложений в месяц
 NoTooLowStockProducts=Нет товаров на складе с  запасом ниже установленного
 BoxProductDistribution=Дистрибуция  Продуктов/Услуг 
-ForObject=On %s
+ForObject=На %s
 BoxTitleLastModifiedSupplierBills=Счета поставщиков: последнее %s изменений
 BoxTitleLatestModifiedSupplierOrders=Заказы поставщиков: последнее %s изменений
 BoxTitleLastModifiedCustomerBills=Счета клиентов: последнее %s изменений
-BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
-BoxTitleLastModifiedPropals=Latest %s modified proposals
-BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
-BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
+BoxTitleLastModifiedCustomerOrders=Заказы на продажу: последнее изменение %s
+BoxTitleLastModifiedPropals=Последние измененные предложения %s
+BoxTitleLatestModifiedJobPositions=Последние измененные вакансии %s
+BoxTitleLatestModifiedCandidatures=Последние измененные кандидатуры %s
 ForCustomersInvoices=Счета-фактуры Покупателей
 ForCustomersOrders=Заказы клиентов
 ForProposals=Предложения
-LastXMonthRolling=The latest %s month rolling
+LastXMonthRolling=Последний месяц прокатки %s
 ChooseBoxToAdd=Добавить виджет на вашу панель
 BoxAdded=Виджет был добавлен на вашу панель
-BoxTitleUserBirthdaysOfMonth=Birthdays of this month (users)
-BoxLastManualEntries=Latest record in accountancy entered manually or without source document
-BoxTitleLastManualEntries=%s latest record entered manually or without source document
-NoRecordedManualEntries=No manual entries record in accountancy
-BoxSuspenseAccount=Count accountancy operation with suspense account
-BoxTitleSuspenseAccount=Number of unallocated lines
-NumberOfLinesInSuspenseAccount=Number of line in suspense account
-SuspenseAccountNotDefined=Suspense account isn't defined
-BoxLastCustomerShipments=Last customer shipments
-BoxTitleLastCustomerShipments=Latest %s customer shipments
-NoRecordedShipments=No recorded customer shipment
-BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
+BoxTitleUserBirthdaysOfMonth=Дни рождения в этом месяце (пользователи)
+BoxLastManualEntries=Последняя запись в бухгалтерском учете, введенная вручную или без исходного документа
+BoxTitleLastManualEntries=%s последняя запись, введенная вручную или без исходного документа
+NoRecordedManualEntries=В бухгалтерском учете нет записей о ручных записях
+BoxSuspenseAccount=Подсчет бухгалтерских операций с промежуточным счетом
+BoxTitleSuspenseAccount=Количество нераспределенных линий
+NumberOfLinesInSuspenseAccount=Номер строки в предварительном счете
+SuspenseAccountNotDefined=Приостановленный аккаунт не определен
+BoxLastCustomerShipments=Последние поставки клиентам
+BoxTitleLastCustomerShipments=Последние поставки от клиентов %s
+NoRecordedShipments=Отгрузка от клиента не зафиксирована
+BoxCustomersOutstandingBillReached=Достигнуты клиенты с невыполненным лимитом
 # Pages
-UsersHome=Home users and groups
-MembersHome=Home Membership
-ThirdpartiesHome=Home Thirdparties
-TicketsHome=Home Tickets
-AccountancyHome=Home Accountancy
-ValidatedProjects=Validated projects
+UsersHome=Домашние пользователи и группы
+MembersHome=Домашнее членство
+ThirdpartiesHome=Домашние третьи стороны
+TicketsHome=Билеты на дом
+AccountancyHome=Бухгалтерия на дому
+ValidatedProjects=Проверенные проекты
diff --git a/htdocs/langs/ru_RU/cashdesk.lang b/htdocs/langs/ru_RU/cashdesk.lang
index c5d713f5b34..13bfeac8a00 100644
--- a/htdocs/langs/ru_RU/cashdesk.lang
+++ b/htdocs/langs/ru_RU/cashdesk.lang
@@ -32,7 +32,7 @@ ShowStock=Показать склад
 DeleteArticle=Нажмите, чтобы удалить эту статью
 FilterRefOrLabelOrBC=Поиск (ссылке/метке)
 UserNeedPermissionToEditStockToUsePos=Вы просите уменьшить запас при создании счета-фактуры, поэтому пользователю, который использует POS, необходимо разрешение на редактирование запасов. 
-DolibarrReceiptPrinter=Dolibarr Receipt Printer
+DolibarrReceiptPrinter=Чековый принтер Dolibarr
 PointOfSale=Торговая точка
 PointOfSaleShort=POS
 CloseBill=Закрыть счет
@@ -41,8 +41,8 @@ Floor=Этаж
 AddTable=Добавить таблицу
 Place=Место
 TakeposConnectorNecesary=Требуется 'Принять POS-коннектор'
-OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
-NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser:
+OrderPrinters=Добавить кнопку для отправки заказа на некоторые заданные принтеры без оплаты (например, для отправки заказа на кухню)
+NotAvailableWithBrowserPrinter=Недоступно, если принтер для получения чеков настроен на браузер:
 SearchProduct=Поиск товара
 Receipt=Квитанция
 Header=Заголовок
@@ -51,80 +51,80 @@ AmountAtEndOfPeriod=Сумма на конец периода (день, мес
 TheoricalAmount=Теоретическая сумма
 RealAmount=Действительная сумма
 CashFence=Закрытие кассы
-CashFenceDone=Cash desk closing done for the period
+CashFenceDone=Закрытие кассы за период
 NbOfInvoices=Кол-во счетов-фактур
-Paymentnumpad=Type of Pad to enter payment
-Numberspad=Numbers Pad
-BillsCoinsPad=Coins and banknotes Pad
-DolistorePosCategory=TakePOS modules and other POS solutions for Dolibarr
-TakeposNeedsCategories=TakePOS needs at least one product categorie to work
-TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS needs at least 1 product category under the category <b>%s</b> to work
-OrderNotes=Can add some notes to each ordered items
-CashDeskBankAccountFor=Default account to use for payments in
-NoPaimementModesDefined=No paiment mode defined in TakePOS configuration
-TicketVatGrouped=Group VAT by rate in tickets|receipts
-AutoPrintTickets=Automatically print tickets|receipts
-PrintCustomerOnReceipts=Print customer on tickets|receipts
-EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
+Paymentnumpad=Тип панели для ввода платежа
+Numberspad=Цифровая клавиатура
+BillsCoinsPad=Блокнот для монет и банкнот
+DolistorePosCategory=Модули TakePOS и другие POS-решения для Dolibarr
+TakeposNeedsCategories=TakePOS нужна как минимум одна категория продуктов для работы
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=Для работы TakePOS требуется как минимум 1 категория продуктов в категории <b> %s </b>.
+OrderNotes=Можно добавить заметки к каждому заказанному элементу
+CashDeskBankAccountFor=Аккаунт по умолчанию для платежей в
+NoPaimementModesDefined=В конфигурации TakePOS не определен режим оплаты.
+TicketVatGrouped=Групповой НДС по ставке в билетах | квитанциях
+AutoPrintTickets=Автоматическая печать билетов | квитанций
+PrintCustomerOnReceipts=Печать покупателя на билетах | квитанциях
+EnableBarOrRestaurantFeatures=Включить функции для бара или ресторана
 ConfirmDeletionOfThisPOSSale=Подтверждаете ли вы удаление этой  продажи?
-ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ?
+ConfirmDiscardOfThisPOSSale=Вы хотите отменить текущую распродажу?
 History=История
 ValidateAndClose=Подтвердить и закрыть
 Terminal=Терминал
 NumberOfTerminals=Количество терминалов
 TerminalSelect=Выберите терминал, который хотите использовать:
-POSTicket=POS Ticket
-POSTerminal=POS Terminal
-POSModule=POS Module
-BasicPhoneLayout=Use basic layout for phones
-SetupOfTerminalNotComplete=Setup of terminal %s is not complete
-DirectPayment=Direct payment
-DirectPaymentButton=Add a "Direct cash payment" button
-InvoiceIsAlreadyValidated=Invoice is already validated
-NoLinesToBill=No lines to bill
-CustomReceipt=Custom Receipt
-ReceiptName=Receipt Name
-ProductSupplements=Manage supplements of products
-SupplementCategory=Supplement category
-ColorTheme=Color theme
-Colorful=Colorful
+POSTicket=POS-билет
+POSTerminal=POS Терминал
+POSModule=Модуль POS
+BasicPhoneLayout=Использовать базовую раскладку для телефонов
+SetupOfTerminalNotComplete=Настройка терминала %s не завершена
+DirectPayment=Прямая оплата
+DirectPaymentButton=Добавить кнопку "Прямой платеж наличными"
+InvoiceIsAlreadyValidated=Счет уже подтвержден
+NoLinesToBill=Нет очередей для выставления счета
+CustomReceipt=Пользовательская квитанция
+ReceiptName=Имя квитанции
+ProductSupplements=Управляйте дополнениями продуктов
+SupplementCategory=Категория дополнения
+ColorTheme=Цветовая тема
+Colorful=Красочный
 HeadBar=Head Bar
-SortProductField=Field for sorting products
+SortProductField=Поле для сортировки товаров
 Browser=Браузер
-BrowserMethodDescription=Simple and easy receipt printing. Only a few parameters to configure the receipt. Print via browser.
-TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud.
-PrintMethod=Print method
-ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. The server hosting the application can't be in the Cloud (must be able to reach the printers in your network).
-ByTerminal=By terminal
-TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
-CashDeskRefNumberingModules=Numbering module for POS sales
-CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
-TakeposGroupSameProduct=Group same products lines
-StartAParallelSale=Start a new parallel sale
-SaleStartedAt=Sale started at %s
-ControlCashOpening=Control cash popup at opening POS
-CloseCashFence=Close cash desk control
-CashReport=Cash report
-MainPrinterToUse=Main printer to use
-OrderPrinterToUse=Order printer to use
-MainTemplateToUse=Main template to use
-OrderTemplateToUse=Order template to use
-BarRestaurant=Bar Restaurant
-AutoOrder=Order by the customer himself
-RestaurantMenu=Menu
-CustomerMenu=Customer menu
-ScanToMenu=Scan QR code to see the menu
-ScanToOrder=Scan QR code to order
-Appearance=Appearance
-HideCategoryImages=Hide Category Images
-HideProductImages=Hide Product Images
-NumberOfLinesToShow=Number of lines of images to show
-DefineTablePlan=Define tables plan
-GiftReceiptButton=Add a "Gift receipt" button
-GiftReceipt=Gift receipt
-ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
-AllowDelayedPayment=Allow delayed payment
-PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
-WeighingScale=Weighing scale
-ShowPriceHT = Display the price excluding tax column
-ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
+BrowserMethodDescription=Простая и удобная печать чеков. Всего несколько параметров для настройки чека. Распечатать через браузер.
+TakeposConnectorMethodDescription=Внешний модуль с дополнительными функциями. Возможность печати из облака.
+PrintMethod=Метод печати
+ReceiptPrinterMethodDescription=Мощный метод с множеством параметров. Полная настройка с помощью шаблонов. Сервер, на котором размещено приложение, не может находиться в облаке (должен иметь доступ к принтерам в вашей сети).
+ByTerminal=По терминалу
+TakeposNumpadUsePaymentIcon=Используйте значок вместо текста на кнопках оплаты цифровой клавиатуры
+CashDeskRefNumberingModules=Модуль нумерации для продаж POS
+CashDeskGenericMaskCodes6 =  Тег <br> <b> {TN} </b> используется для добавления номера терминала
+TakeposGroupSameProduct=Группируйте одинаковые продуктовые линейки
+StartAParallelSale=Начать новую параллельную продажу
+SaleStartedAt=Продажа началась на %s
+ControlCashOpening=Откройте всплывающее окно «Контролировать наличные» при открытии POS-терминала.
+CloseCashFence=Кассовый контроль
+CashReport=Кассовый отчет
+MainPrinterToUse=Основной принтер для использования
+OrderPrinterToUse=Заказать принтер для использования
+MainTemplateToUse=Основной шаблон для использования
+OrderTemplateToUse=Шаблон заказа для использования
+BarRestaurant=Бар Ресторан
+AutoOrder=Заказ самим покупателем
+RestaurantMenu=Меню
+CustomerMenu=Меню клиента
+ScanToMenu=Отсканируйте QR-код, чтобы увидеть меню
+ScanToOrder=Отсканируйте QR-код для заказа
+Appearance=Появление
+HideCategoryImages=Скрыть изображения категорий
+HideProductImages=Скрыть изображения продуктов
+NumberOfLinesToShow=Количество строк изображения для показа
+DefineTablePlan=Определить план таблиц
+GiftReceiptButton=Добавьте кнопку "Подарочная квитанция"
+GiftReceipt=Квитанция о подарке
+ModuleReceiptPrinterMustBeEnabled=Модуль Чековый принтер должен быть включен первым
+AllowDelayedPayment=Разрешить отсроченный платеж
+PrintPaymentMethodOnReceipts=Распечатать способ оплаты на билетах | квитанциях
+WeighingScale=Весы
+ShowPriceHT = Отобразить столбец с ценой без налога (на экране)
+ShowPriceHTOnReceipt = Вывести столбец с ценой без налога (при получении)
diff --git a/htdocs/langs/ru_RU/categories.lang b/htdocs/langs/ru_RU/categories.lang
index b5155d8684e..75fca55493d 100644
--- a/htdocs/langs/ru_RU/categories.lang
+++ b/htdocs/langs/ru_RU/categories.lang
@@ -3,20 +3,20 @@ Rubrique=Тег/Категория
 Rubriques=Теги/Категории
 RubriquesTransactions=Теги/Категории транзакций
 categories=теги/категории
-NoCategoryYet=No tag/category of this type has been created
+NoCategoryYet=Тег / категория этого типа не созданы
 In=В
 AddIn=Добавить в
 modify=изменить
 Classify=Классифицировать
 CategoriesArea=Раздел тегов/категорий 
-ProductsCategoriesArea=Product/Service tags/categories area
-SuppliersCategoriesArea=Vendor tags/categories area
-CustomersCategoriesArea=Customer tags/categories area
-MembersCategoriesArea=Member tags/categories area
-ContactsCategoriesArea=Contact tags/categories area
-AccountsCategoriesArea=Bank account tags/categories area
-ProjectsCategoriesArea=Project tags/categories area
-UsersCategoriesArea=User tags/categories area
+ProductsCategoriesArea=Область тегов товаров / услуг / категорий
+SuppliersCategoriesArea=Область тегов / категорий поставщиков
+CustomersCategoriesArea=Область клиентских тегов / категорий
+MembersCategoriesArea=Область тегов / категорий участников
+ContactsCategoriesArea=Область контактных тегов / категорий
+AccountsCategoriesArea=Область тегов / категорий банковских счетов
+ProjectsCategoriesArea=Область тегов / категорий проекта
+UsersCategoriesArea=Область пользовательских тегов / категорий
 SubCats=Подкатегории
 CatList=Список тегов/категорий
 CatListAll=Список тегов/категорий (все типы)
@@ -96,4 +96,4 @@ ChooseCategory=Выберите категорию
 StocksCategoriesArea=Складские категории
 ActionCommCategoriesArea=Категории событий
 WebsitePagesCategoriesArea=Категории страниц-контейнеров
-UseOrOperatorForCategories=Use 'OR' operator for categories
+UseOrOperatorForCategories=Используйте оператор "ИЛИ" для категорий
diff --git a/htdocs/langs/ru_RU/commercial.lang b/htdocs/langs/ru_RU/commercial.lang
index e539e92a5d6..8b09bddcda6 100644
--- a/htdocs/langs/ru_RU/commercial.lang
+++ b/htdocs/langs/ru_RU/commercial.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - commercial
-Commercial=Commerce
-CommercialArea=Commerce area
+Commercial=Коммерция
+CommercialArea=Торговая зона
 Customer=Клиент
 Customers=Клиенты
 Prospect=Потенциальный клиент
@@ -18,8 +18,8 @@ TaskRDVWith=Встреча с %s
 ShowTask=Показать задачу
 ShowAction=Показать действий
 ActionsReport=Действия доклад
-ThirdPartiesOfSaleRepresentative=Third parties with sales representative
-SaleRepresentativesOfThirdParty=Sales representatives of third party
+ThirdPartiesOfSaleRepresentative=Третьи лица с торговым представителем
+SaleRepresentativesOfThirdParty=Торговые представители третьих лиц
 SalesRepresentative=Торговый представитель
 SalesRepresentatives=Торговые представители
 SalesRepresentativeFollowUp=Представитель по продажам (последующих)
@@ -29,8 +29,8 @@ ShowCustomer=Показать заказчика
 ShowProspect=Показать проспект
 ListOfProspects=Список потенциальных клиентов
 ListOfCustomers=Список клиентов
-LastDoneTasks=Latest %s completed actions
-LastActionsToDo=Oldest %s not completed actions
+LastDoneTasks=Последние завершенные действия %s
+LastActionsToDo=Самые старые не завершенные действия %s
 DoneAndToDoActions=Составлено и делать задач
 DoneActions=Совершено действия
 ToDoActions=Неполные действия
@@ -64,17 +64,18 @@ ActionAC_SHIP=Отправить доставку по почте
 ActionAC_SUP_ORD=Отправить заказ на покупку по почте
 ActionAC_SUP_INV=Отправить счет поставщика по почте
 ActionAC_OTH=Другой
-ActionAC_OTH_AUTO=Мероприятия созданные автоматически
+ActionAC_OTH_AUTO=Другое авто
 ActionAC_MANUAL=Мероприятия, созданные вручную
 ActionAC_AUTO=Мероприятия созданные автоматически
-ActionAC_OTH_AUTOShort=Auto
+ActionAC_OTH_AUTOShort=Другое
+ActionAC_EVENTORGANIZATION=Организация мероприятий мероприятия
 Stats=Статистика продаж
 StatusProsp=Проспект статус
 DraftPropals=Проект коммерческих предложений
 NoLimit=Нет ограничений
-ToOfferALinkForOnlineSignature=Link for online signature
-WelcomeOnOnlineSignaturePage=Welcome to the page to accept commercial proposals from %s
+ToOfferALinkForOnlineSignature=Ссылка для онлайн-подписи
+WelcomeOnOnlineSignaturePage=Добро пожаловать на страницу приема коммерческих предложений от %s
 ThisScreenAllowsYouToSignDocFrom=Этот экран позволяет вам принять и подписать или отклонить предложение или коммерческое предложение
-ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
-SignatureProposalRef=Signature of quote/commercial proposal %s
-FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
+ThisIsInformationOnDocumentToSign=Это информация о документе, который нужно принять или отклонить.
+SignatureProposalRef=Подпись цитаты / коммерческого предложения %s
+FeatureOnlineSignDisabled=Функция онлайн-подписи отключена или документ был создан до ее включения
diff --git a/htdocs/langs/ru_RU/companies.lang b/htdocs/langs/ru_RU/companies.lang
index d2c7a153875..ad0acb81ece 100644
--- a/htdocs/langs/ru_RU/companies.lang
+++ b/htdocs/langs/ru_RU/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=Название компании %s уже существует. Выберите другое.
 ErrorSetACountryFirst=Сначала установите страну
 SelectThirdParty=Выберите контрагента
-ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
+ConfirmDeleteCompany=Вы уверены, что хотите удалить эту компанию и всю связанную с ней информацию?
 DeleteContact=Удалить контакт
-ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
+ConfirmDeleteContact=Вы действительно хотите удалить этот контакт и всю связанную с ним информацию?
 MenuNewThirdParty=Новый контрагент
 MenuNewCustomer=Новый Клиент
 MenuNewProspect=Новый Потенциальный клиент
@@ -43,10 +43,10 @@ Individual=Физическое лицо
 ToCreateContactWithSameName=Будет автоматически создан контакт/адрес с той информацией которая связывает контрагента с контрагентом. В большинстве случаев, даже если контрагент является физическим лицом, достаточно создать одного контрагента.
 ParentCompany=Материнская компания
 Subsidiaries=Филиалы
-ReportByMonth=Report per month
-ReportByCustomers=Report per customer
-ReportByThirdparties=Report per thirdparty
-ReportByQuarter=Report per rate
+ReportByMonth=Отчет в месяц
+ReportByCustomers=Отчет по клиенту
+ReportByThirdparties=Отчет по сторонним организациям
+ReportByQuarter=Отчет по ставке
 CivilityCode=Код корректности
 RegisteredOffice=Зарегистрированный офис
 Lastname=Фамилия
@@ -54,10 +54,10 @@ Firstname=Имя
 PostOrFunction=Должность
 UserTitle=Название
 NatureOfThirdParty=Свойство контрагента
-NatureOfContact=Nature of Contact
+NatureOfContact=Характер контакта
 Address=Адрес
 State=Штат/Провинция
-StateCode=State/Province code
+StateCode=Код штата / провинции
 StateShort=Штат
 Region=Регион
 Region-State=Регион - Область
@@ -69,7 +69,7 @@ PhoneShort=Телефон
 Skype=Скайп
 Call=Звонок
 Chat=Чат
-PhonePro=Bus. phone
+PhonePro=Автобус. Телефон
 PhonePerso=Личн. телефон
 PhoneMobile=Мобильный
 No_Email=Отказаться от массовых рассылок
@@ -125,7 +125,7 @@ ProfId1AT=Проф ID 1 (USt.-IdNr)
 ProfId2AT=Проф Id 2 (USt.-NR)
 ProfId3AT=Проф ID 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=EORI number
+ProfId5AT=Номер EORI
 ProfId6AT=-
 ProfId1AU=Проф Id 1 (ABN)
 ProfId2AU=-
@@ -137,7 +137,7 @@ ProfId1BE=Проф Id 1 (Проф номер)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=EORI number
+ProfId5BE=Номер EORI
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=Номер IE (Для Бразилии, государственной регистрации юридических лиц) 
@@ -145,11 +145,11 @@ ProfId3BR=Номер IM (для Бразилии)
 ProfId4BR=Номер CPF (Для Бразилии)
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=UID-Nummer
+ProfId1CH=UID-номер
 ProfId2CH=-
 ProfId3CH=Проф ID 1 (федеральный номер)
 ProfId4CH=Проф Id 2 (коммерческий Запись номер)
-ProfId5CH=EORI number
+ProfId5CH=Номер EORI
 ProfId6CH=-
 ProfId1CL=Проф Id 1 (БУТ)
 ProfId2CL=-
@@ -167,19 +167,19 @@ ProfId1DE=Проф ID 1 (USt.-IdNr)
 ProfId2DE=Проф Id 2 (USt.-NR)
 ProfId3DE=Проф ID 3 (Handelsregister-Nr.)
 ProfId4DE=-
-ProfId5DE=EORI number
+ProfId5DE=Номер EORI
 ProfId6DE=-
 ProfId1ES=Проф Id 1 (CIF / NIF)
 ProfId2ES=Проф Id 2 (номер социального страхования)
 ProfId3ES=Проф Id 3 (CNAE)
 ProfId4ES=Проф Id 4 (Энциклопедический номер)
-ProfId5ES=Prof Id 5 (EORI number)
+ProfId5ES=Prof Id 5 (номер EORI)
 ProfId6ES=-
 ProfId1FR=Проф Id 1 (SIREN)
 ProfId2FR=Проф Id 2 (SIRET)
 ProfId3FR=Проф Id 3 (NAF, старые APE)
 ProfId4FR=Проф Id 4 (RCS / РМ)
-ProfId5FR=Prof Id 5 (numéro EORI)
+ProfId5FR=Идентификатор профессора 5 (номер EORI)
 ProfId6FR=-
 ProfId1ShortFR=SIREN
 ProfId2ShortFR=SIRET
@@ -209,19 +209,19 @@ ProfId1IT=-
 ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
-ProfId5IT=EORI number
+ProfId5IT=Номер EORI
 ProfId6IT=-
 ProfId1LU=Я бы. проф. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Разрешенный бизнес)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=EORI number
+ProfId5LU=Номер EORI
 ProfId6LU=-
 ProfId1MA=Id проф. 1 (RC)
 ProfId2MA=Id проф. 2 (Patente)
 ProfId3MA=Id проф. 3 (IF)
 ProfId4MA=Id проф. 4 (НКСО)
-ProfId5MA=Id prof. 5 (I.C.E.)
+ProfId5MA=ID проф. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=Проф Id 1 (RFC).
 ProfId2MX=Проф Id 2 (R.. P. ИМСС)
@@ -233,13 +233,13 @@ ProfId1NL=KVK Nummer
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=-
-ProfId5NL=EORI number
+ProfId5NL=Номер EORI
 ProfId6NL=-
 ProfId1PT=Проф ID 1 (NIPC)
 ProfId2PT=Проф Id 2 (номера социального страхования)
 ProfId3PT=Проф Id 3 (коммерческий Запись номер)
 ProfId4PT=Проф Id 4 (Консерватория)
-ProfId5PT=Prof Id 5 (EORI number)
+ProfId5PT=Prof Id 5 (номер EORI)
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -259,11 +259,11 @@ ProfId3US=-
 ProfId4US=-
 ProfId5US=-
 ProfId6US=-
-ProfId1RO=Prof Id 1 (CUI)
-ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
-ProfId3RO=Prof Id 3 (CAEN)
-ProfId4RO=Prof Id 5 (EUID)
-ProfId5RO=Prof Id 5 (EORI number)
+ProfId1RO=Идентификатор профессора 1 (CUI)
+ProfId2RO=ID профессора 2 (Nr. Înmatriculare)
+ProfId3RO=ID профессора 3 (CAEN)
+ProfId4RO=Идентификатор профессора 5 (EUID)
+ProfId5RO=Prof Id 5 (номер EORI)
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (ОГРН)
 ProfId2RU=Prof Id 2 (ИНН)
@@ -310,7 +310,7 @@ AddContact=Создать контакт
 AddContactAddress=Создать контакт/адрес
 EditContact=Изменить контакт / адреса
 EditContactAddress=Редактировать контакт/адрес
-Contact=Contact/Address
+Contact=Контактный адрес
 Contacts=Контакты
 ContactId=Идентификатор контакта
 ContactsAddresses=Контакты/Адреса
@@ -318,7 +318,7 @@ FromContactName=Имя:
 NoContactDefinedForThirdParty=Не задан контакт для этого контрагента
 NoContactDefined=У этого контрагента не указаны контакты
 DefaultContact=Контакт по умолчанию
-ContactByDefaultFor=Default contact/address for
+ContactByDefaultFor=Контакт / адрес по умолчанию для
 AddThirdParty=Создать контрагента
 DeleteACompany=Удалить компанию
 PersonalInformations=Личные данные
@@ -331,15 +331,15 @@ CustomerCodeDesc=Код Клиента, уникальный для каждог
 SupplierCodeDesc=Код Поставщика, уникальный для каждого поставщика
 RequiredIfCustomer=Требуется, если контрагент является покупателем или потенциальным клиентом
 RequiredIfSupplier=Требуется, если контрагент является поставщиком
-ValidityControledByModule=Validity controlled by the module
+ValidityControledByModule=Срок действия контролируется модулем
 ThisIsModuleRules=Правила для этого модуля
 ProspectToContact=Потенциальный клиент для связи
 CompanyDeleted=Компания " %s" удалена из базы данных.
 ListOfContacts=Список контактов/адресов
 ListOfContactsAddresses=Список контактов/адресов
 ListOfThirdParties=Список контрагентов
-ShowCompany=Third Party
-ShowContact=Contact-Address
+ShowCompany=Сторонний
+ShowContact=Контактный адрес
 ContactsAllShort=Все (без фильтра)
 ContactType=Вид контакт
 ContactForOrders=Контакт заказа
@@ -358,7 +358,7 @@ MyContacts=Мои контакты
 Capital=Капитал
 CapitalOf=Столица %s
 EditCompany=Изменить компанию
-ThisUserIsNot=This user is not a prospect, customer or vendor
+ThisUserIsNot=Этот пользователь не является потенциальным клиентом, покупателем или продавцом
 VATIntraCheck=Проверить
 VATIntraCheckDesc=Идентификатор НДС должен включать префикс страны. Ссылка <b>%s</b> использует европейскую службу проверки НДС (VIES), для которой требуется доступ в Интернет с сервера Dolibarr.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
@@ -366,8 +366,8 @@ VATIntraCheckableOnEUSite=Проверьте идентификатора НДС
 VATIntraManualCheck=Вы также можете проверить его вручную на сайте Европейской Комиссии <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Проверка невозможна. Сервис проверки не предоставляется государством-членом ЕС (%s).
 NorProspectNorCustomer=Не потенциальный клиент, не клиент
-JuridicalStatus=Business entity type
-Workforce=Workforce
+JuridicalStatus=Тип хозяйствующего субъекта
+Workforce=Штат
 Staff=Сотрудники
 ProspectLevelShort=Потенциальный
 ProspectLevel=Потенциальный клиент
@@ -426,12 +426,12 @@ AllocateCommercial=Назначить торгового представите
 Organization=Организация
 FiscalYearInformation=Финансовый год
 FiscalMonthStart=Первый месяц финансового года
-SocialNetworksInformation=Social networks
-SocialNetworksFacebookURL=Facebook URL
-SocialNetworksTwitterURL=Twitter URL
+SocialNetworksInformation=Социальные сети
+SocialNetworksFacebookURL=URL-адрес Facebook
+SocialNetworksTwitterURL=URL-адрес Twitter
 SocialNetworksLinkedinURL=Linkedin URL
-SocialNetworksInstagramURL=Instagram URL
-SocialNetworksYoutubeURL=Youtube URL
+SocialNetworksInstagramURL=URL в Instagram
+SocialNetworksYoutubeURL=URL Youtube
 SocialNetworksGithubURL=Github URL
 YouMustAssignUserMailFirst=Вы должны создать адрес электронной почты для этого пользователя, прежде чем сможете добавить уведомление по электронной почте.
 YouMustCreateContactFirst=Для добавления электронных уведомлений вы должны сначала указать действующий email контрагента 
@@ -439,39 +439,39 @@ ListSuppliersShort=Список Поставщиков
 ListProspectsShort=Список Потенциальных клиентов
 ListCustomersShort=Список Клиентов
 ThirdPartiesArea=Контрагенты/Контакты
-LastModifiedThirdParties=Latest %s Third Parties which were modified
-UniqueThirdParties=Total number of Third Parties
+LastModifiedThirdParties=Последние %s Третьи стороны, которые были изменены
+UniqueThirdParties=Общее количество третьих лиц
 InActivity=Открытые
 ActivityCeased=Закрыто
 ThirdPartyIsClosed=Закрывшиеся контрагенты
-ProductsIntoElements=List of products/services mapped to %s
+ProductsIntoElements=Список продуктов / услуг, сопоставленных с %s
 CurrentOutstandingBill=Валюта неуплаченного счёта
 OutstandingBill=Максимальный неуплаченный счёт
 OutstandingBillReached=Достигнут максимум не оплаченных счетов
 OrderMinAmount=Минимальная сумма заказа
-MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
+MonkeyNumRefModelDesc=Возвращает число в формате %syymm-nnnn для кода клиента и %syymm-nnnn для кода поставщика, где yy - год, mm - месяц, а nnnn - последовательное автоматически увеличивающееся число без перерыва и без возврата к 0.
 LeopardNumRefModelDesc=Код покупателю/поставщику не присваивается. Он может быть изменен в любое время.
 ManagingDirectors=Имя управляющего или управляющих (Коммерческого директора, директора, президента...)
 MergeOriginThirdparty=Копия контрагента (контрагент которого вы хотите удалить)
 MergeThirdparties=Объединить контрагентов
-ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
+ConfirmMergeThirdparties=Вы уверены, что хотите объединить выбранное третье лицо с текущим? Все связанные объекты (счета, заказы и т. Д.) Будут перемещены текущей третьей стороне, после чего выбранное третье лицо будет удалено.
 ThirdpartiesMergeSuccess=Третьи стороны были объединены
 SaleRepresentativeLogin=Логин торгового представителя
 SaleRepresentativeFirstname=Имя торгового представителя
 SaleRepresentativeLastname=Фамилия торгового представителя
 ErrorThirdpartiesMerge=При удалении третьих сторон произошла ошибка. Проверьте журнал. Изменения были отменены.
 NewCustomerSupplierCodeProposed=Код Клиента или Поставщика уже используется, предлагается новый код
-KeepEmptyIfGenericAddress=Keep this field empty if this address is a generic address
+KeepEmptyIfGenericAddress=Оставьте это поле пустым, если это общий адрес.
 #Imports
 PaymentTypeCustomer=Тип оплаты - Клиент
 PaymentTermsCustomer=Условия оплаты - Клиент
 PaymentTypeSupplier=Тип оплаты - Поставщик
 PaymentTermsSupplier=Условия оплаты - Поставщик
-PaymentTypeBoth=Payment Type - Customer and Vendor
+PaymentTypeBoth=Тип платежа - клиент и продавец
 MulticurrencyUsed=Использовать Мультивалютность
 MulticurrencyCurrency=Валюта
-InEEC=Europe (EEC)
-RestOfEurope=Rest of Europe (EEC)
-OutOfEurope=Out of Europe (EEC)
-CurrentOutstandingBillLate=Current outstanding bill late
-BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
+InEEC=Европа (ЕЭС)
+RestOfEurope=Остальная Европа (ЕЭС)
+OutOfEurope=За пределами Европы (ЕЭС)
+CurrentOutstandingBillLate=Текущий неоплаченный счет поздно
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Будьте осторожны, в зависимости от настроек цены вашего продукта вам следует изменить стороннюю организацию, прежде чем добавлять продукт в POS.
diff --git a/htdocs/langs/ru_RU/compta.lang b/htdocs/langs/ru_RU/compta.lang
index c10dc6bd112..088bb747161 100644
--- a/htdocs/langs/ru_RU/compta.lang
+++ b/htdocs/langs/ru_RU/compta.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - compta
-MenuFinancial=Billing | Payment
+MenuFinancial=Биллинг | Оплата
 TaxModuleSetupToModifyRules=Используйте <a href="%s">Настройку модуля Налоги</a> для изменения правил расчёта
-TaxModuleSetupToModifyRulesLT=Go to <a href="%s">Company setup</a> to modify rules for calculation
+TaxModuleSetupToModifyRulesLT=Перейдите к <a href="%s"> Настройка компании </a>, чтобы изменить правила расчета
 OptionMode=Вариант для бухгалтеров
 OptionModeTrue=Вариант "затраты-выпуск"
 OptionModeVirtual=Вариант Кредиты-Вычеты
@@ -9,152 +9,152 @@ OptionModeTrueDesc=В этом контексте, оборот исчисляе
 OptionModeVirtualDesc=В этом контексте, оборот исчисляется более счетов (дата проверки). Когда эти счета-фактуры должны ли они были выплачены или нет, они перечислены в оборот продукции.
 FeatureIsSupportedInInOutModeOnly=Функция доступна только в виде кредитов-ДОЛГОВ бухгалтерия (см. Бухгалтерия конфигурации модуля)
 VATReportBuildWithOptionDefinedInModule=Суммы, показанные здесь, рассчитанного с использованием установленных правил налоговыми модуля установки.
-LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Company setup.
+LTReportBuildWithOptionDefinedInModule=Суммы, показанные здесь, рассчитываются с использованием правил, определенных настройками компании.
 Param=Настройка
-RemainingAmountPayment=Amount payment remaining:
+RemainingAmountPayment=Оставшаяся сумма платежа:
 Account=Учетная запись
-Accountparent=Parent account
-Accountsparent=Parent accounts
+Accountparent=Родительский счет
+Accountsparent=Родительские счета
 Income=Поступления
 Outcome=Итог
 MenuReportInOut=Поступления / Результат
-ReportInOut=Balance of income and expenses
-ReportTurnover=Turnover invoiced
-ReportTurnoverCollected=Turnover collected
+ReportInOut=Баланс доходов и расходов
+ReportTurnover=Счет за оборот
+ReportTurnoverCollected=Собранный оборот
 PaymentsNotLinkedToInvoice=Платежи, не связанные с какой-либо счет, это не связано с какой-либо третьей стороны
 PaymentsNotLinkedToUser=Платежи, не связанные с какой-либо пользователь
 Profit=Прибыль
-AccountingResult=Accounting result
+AccountingResult=Результат бухгалтерского учета
 BalanceBefore=Баланс (до)
 Balance=Баланс
 Debit=Дебет
 Credit=Кредит
-Piece=Accounting Doc.
+Piece=Бухгалтерский док.
 AmountHTVATRealReceived=HT собрали
 AmountHTVATRealPaid=HT оплачивается
-VATToPay=Tax sales
-VATReceived=Tax received
-VATToCollect=Tax purchases
-VATSummary=Tax monthly
-VATBalance=Tax Balance
-VATPaid=Tax paid
-LT1Summary=Tax 2 summary
-LT2Summary=Tax 3 summary
-LT1SummaryES=RE Balance
+VATToPay=Налоговые продажи
+VATReceived=Полученный налог
+VATToCollect=Налоговые покупки
+VATSummary=Налог ежемесячно
+VATBalance=Налоговый баланс
+VATPaid=Уплаченный налог
+LT1Summary=Сводка по налогу 2
+LT2Summary=Сводка по налогу 3
+LT1SummaryES=RE Баланс
 LT2SummaryES=IRPF баланс
-LT1SummaryIN=CGST Balance
-LT2SummaryIN=SGST Balance
-LT1Paid=Tax 2 paid
-LT2Paid=Tax 3 paid
-LT1PaidES=RE Paid
+LT1SummaryIN=CGST Баланс
+LT2SummaryIN=Баланс SGST
+LT1Paid=Налог 2 оплачен
+LT2Paid=Налог 3 уплачен
+LT1PaidES=RE оплачено
 LT2PaidES=Платные IRPF
-LT1PaidIN=CGST Paid
-LT2PaidIN=SGST Paid
-LT1Customer=Tax 2 sales
-LT1Supplier=Tax 2 purchases
+LT1PaidIN=Платный CGST
+LT2PaidIN=SGST оплачено
+LT1Customer=Налог 2 с продаж
+LT1Supplier=Налог 2 покупки
 LT1CustomerES=Продажи ранее проданного товара/услуги
 LT1SupplierES=Покупки ранее проданного товара/услуги
-LT1CustomerIN=CGST sales
-LT1SupplierIN=CGST purchases
-LT2Customer=Tax 3 sales
-LT2Supplier=Tax 3 purchases
+LT1CustomerIN=CGST продажи
+LT1SupplierIN=CGST покупки
+LT2Customer=Налог 3 с продаж
+LT2Supplier=Налог 3 покупки
 LT2CustomerES=IRPF продаж
 LT2SupplierES=IRPF покупки
-LT2CustomerIN=SGST sales
-LT2SupplierIN=SGST purchases
+LT2CustomerIN=SGST продажи
+LT2SupplierIN=SGST покупает
 VATCollected=НДС собрали
 StatusToPay=Для оплаты
 SpecialExpensesArea=Раздел для всех специальных платежей
-VATExpensesArea=Area for all TVA payments
-SocialContribution=Social or fiscal tax
-SocialContributions=Social or fiscal taxes
-SocialContributionsDeductibles=Deductible social or fiscal taxes
-SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
-DateOfSocialContribution=Date of social or fiscal tax
-LabelContrib=Label contribution
-TypeContrib=Type contribution
+VATExpensesArea=Зона для всех платежей TVA
+SocialContribution=Социальный или фискальный налог
+SocialContributions=Социальные или фискальные налоги
+SocialContributionsDeductibles=Вычитаемые социальные или фискальные налоги
+SocialContributionsNondeductibles=Невычисляемые социальные или налоговые налоги
+DateOfSocialContribution=Дата уплаты социального или налогового налога
+LabelContrib=Отметить вклад
+TypeContrib=Тип вклада
 MenuSpecialExpenses=Специальные расходы
 MenuTaxAndDividends=Налоги и дивиденды
-MenuSocialContributions=Social/fiscal taxes
-MenuNewSocialContribution=New social/fiscal tax
-NewSocialContribution=New social/fiscal tax
-AddSocialContribution=Add social/fiscal tax
-ContributionsToPay=Social/fiscal taxes to pay
-AccountancyTreasuryArea=Billing and payment area
+MenuSocialContributions=Социальные / налоговые налоги
+MenuNewSocialContribution=Новый социальный / фискальный налог
+NewSocialContribution=Новый социальный / фискальный налог
+AddSocialContribution=Добавить социальный / фискальный налог
+ContributionsToPay=Социальные / фискальные налоги для уплаты
+AccountancyTreasuryArea=Зона биллинга и оплаты
 NewPayment=Новые оплаты
 PaymentCustomerInvoice=Заказчиком оплаты счетов-фактур
-PaymentSupplierInvoice=vendor invoice payment
+PaymentSupplierInvoice=оплата по счету поставщика
 PaymentSocialContribution=Социальный/налоговый сбор
 PaymentVat=НДС платеж
-AutomaticCreationPayment=Automatically record the payment
+AutomaticCreationPayment=Автоматически записывать платеж
 ListPayment=Список платежей
 ListOfCustomerPayments=Список клиентов платежи
-ListOfSupplierPayments=List of vendor payments
+ListOfSupplierPayments=Список платежей поставщикам
 DateStartPeriod=Дата начала периода
 DateEndPeriod=Дата окончания периода
-newLT1Payment=New tax 2 payment
-newLT2Payment=New tax 3 payment
-LT1Payment=Tax 2 payment
-LT1Payments=Tax 2 payments
-LT2Payment=Tax 3 payment
-LT2Payments=Tax 3 payments
+newLT1Payment=Новый платеж по налогу 2
+newLT2Payment=Новый платеж по налогу 3
+LT1Payment=Уплата налога 2
+LT1Payments=Налог 2 платежа
+LT2Payment=Оплата налога 3
+LT2Payments=Платежи по налогу 3
 newLT1PaymentES=Новое полашение
 newLT2PaymentES=Новые IRPF оплаты
 LT1PaymentES=Погашение
 LT1PaymentsES=Погашения
 LT2PaymentES=IRPF оплаты
 LT2PaymentsES=IRPF платежей
-VATPayment=Sales tax payment
-VATPayments=Sales tax payments
-VATDeclarations=VAT declarations
-VATDeclaration=VAT declaration
-VATRefund=Sales tax refund
-NewVATPayment=New sales tax payment
-NewLocalTaxPayment=New tax %s payment
-Refund=Refund
-SocialContributionsPayments=Social/fiscal taxes payments
+VATPayment=Уплата налога с продаж
+VATPayments=Платежи по налогу с продаж
+VATDeclarations=Декларации по НДС
+VATDeclaration=Декларация по НДС
+VATRefund=Возврат налога с продаж
+NewVATPayment=Новый платеж по налогу с продаж
+NewLocalTaxPayment=Новый налоговый платеж %s
+Refund=Возврат
+SocialContributionsPayments=Платежи по социальным / фискальным налогам
 ShowVatPayment=Показать оплате НДС
 TotalToPay=Всего к оплате
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted on %s and filtered on 1 bank account (with no other filters)
-CustomerAccountancyCode=Customer accounting code
-SupplierAccountancyCode=Vendor accounting code
-CustomerAccountancyCodeShort=Cust. account. code
-SupplierAccountancyCodeShort=Sup. account. code
+BalanceVisibilityDependsOnSortAndFilters=Баланс отображается в этом списке только в том случае, если таблица отсортирована по %s и отфильтрована по 1 банковскому счету (без других фильтров)
+CustomerAccountancyCode=Код бухгалтерского учета клиента
+SupplierAccountancyCode=Код учета поставщика
+CustomerAccountancyCodeShort=Cust. учетная запись. код
+SupplierAccountancyCodeShort=Как дела. учетная запись. код
 AccountNumber=Номер счета
 NewAccountingAccount=Новый счет
-Turnover=Turnover invoiced
-TurnoverCollected=Turnover collected
-SalesTurnoverMinimum=Minimum turnover
-ByExpenseIncome=By expenses & incomes
+Turnover=Счет за оборот
+TurnoverCollected=Собранный оборот
+SalesTurnoverMinimum=Минимальный оборот
+ByExpenseIncome=По расходам и доходам
 ByThirdParties=Бу-третьих сторон
 ByUserAuthorOfInvoice=По счету автора
 CheckReceipt=Проверьте депозит
 CheckReceiptShort=Проверьте депозит
-LastCheckReceiptShort=Latest %s check receipts
+LastCheckReceiptShort=Последние чеки %s
 NewCheckReceipt=Новые скидки
 NewCheckDeposit=Новая проверка депозит
 NewCheckDepositOn=Новый депозит проверить на счету: %s
-NoWaitingChecks=No checks awaiting deposit.
-DateChequeReceived=Check receiving date
-NbOfCheques=No. of checks
-PaySocialContribution=Pay a social/fiscal tax
-PayVAT=Pay a VAT declaration
-PaySalary=Pay a salary card
-ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid ?
-ConfirmPayVAT=Are you sure you want to classify this VAT declaration as paid ?
-ConfirmPaySalary=Are you sure you want to classify this salary card as paid?
-DeleteSocialContribution=Delete a social or fiscal tax payment
-DeleteVAT=Delete a VAT declaration
-DeleteSalary=Delete a salary card
-ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment ?
-ConfirmDeleteVAT=Are you sure you want to delete this VAT declaration ?
-ConfirmDeleteSalary=Are you sure you want to delete this salary?
-ExportDataset_tax_1=Social and fiscal taxes and payments
-CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
-CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
-CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
-CalcModeEngagement=Analysis of known recorded payments, even if they are not yet accounted in Ledger.
-CalcModeBookkeeping=Analysis of data journalized in Bookkeeping Ledger table.
+NoWaitingChecks=Нет чеков, ожидающих депозита.
+DateChequeReceived=Проверить дату получения
+NbOfCheques=Кол-во чеков
+PaySocialContribution=Платить социальный / фискальный налог
+PayVAT=Оплатить декларацию по НДС
+PaySalary=Оплатить зарплатную карту
+ConfirmPaySocialContribution=Вы уверены, что хотите отнести этот социальный или фискальный налог к уплаченным?
+ConfirmPayVAT=Вы уверены, что хотите классифицировать эту декларацию по НДС как оплаченную?
+ConfirmPaySalary=Вы уверены, что хотите отнести эту зарплатную карту к платной?
+DeleteSocialContribution=Удалить социальный или налоговый платеж
+DeleteVAT=Удалить декларацию НДС
+DeleteSalary=Удалить зарплатную карту
+ConfirmDeleteSocialContribution=Вы действительно хотите удалить этот социальный / налоговый платеж?
+ConfirmDeleteVAT=Вы уверены, что хотите удалить эту декларацию по НДС?
+ConfirmDeleteSalary=Вы уверены, что хотите удалить эту зарплату?
+ExportDataset_tax_1=Социальные и налоговые налоги и платежи
+CalcModeVATDebt=Режим <b> %s НДС при учете обязательств%s </b>.
+CalcModeVATEngagement=Режим <b> %s НДС на доходы-расходы%s </b>.
+CalcModeDebt=Анализ известных записанных документов, даже если они еще не учтены в бухгалтерской книге.
+CalcModeEngagement=Анализ известных зарегистрированных платежей, даже если они еще не учтены в бухгалтерской книге.
+CalcModeBookkeeping=Анализ данных, занесенных в таблицу бухгалтерской книги.
 CalcModeLT1= Режим <b>%sRE на счетах клиентов - счетах поставщиков%s</b>
 CalcModeLT1Debt=Режим <b>%sRE на счетах клиентов%s</b>
 CalcModeLT1Rec= Режим <b>%sRE на счетах поставщиков%s</b>
@@ -163,52 +163,52 @@ CalcModeLT2Debt=Режим <b>%sIRPF  на счетах клиентов%s</b>
 CalcModeLT2Rec= Режим <b>%sIRPF на счетах поставщиков%s</b>
 AnnualSummaryDueDebtMode=Баланс доходов и расходов, годовые итоги
 AnnualSummaryInputOutputMode=Баланс доходов и расходов, годовые итоги
-AnnualByCompanies=Balance of income and expenses, by predefined groups of account
+AnnualByCompanies=Баланс доходов и расходов по заранее определенным группам счетов
 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>.
 SeeReportInInputOutputMode=See <b>%sanalysis of payments%s</b> for a calculation based on <b>recorded payments</b> made even if they are not yet accounted in Ledger
 SeeReportInDueDebtMode=See <b>%sanalysis of recorded documents%s</b> for a calculation based on known <b>recorded documents</b> even if they are not yet accounted in Ledger
 SeeReportInBookkeepingMode=See <b>%sanalysis of bookeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded= - Суммы даны с учётом всех налогов
-RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
-RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
-RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the billing date of these invoices.<br>
-RulesCAIn=- It includes all the effective payments of invoices received from customers.<br>- It is based on the payment date of these invoices<br>
-RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
-RulesSalesTurnoverOfIncomeAccounts=It includes (credit - debit) of lines for product accounts in group INCOME
-RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
-RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
-RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
-SeePageForSetup=See menu <a href="%s">%s</a> for setup
-DepositsAreNotIncluded=- Down payment invoices are not included
-DepositsAreIncluded=- Down payment invoices are included
-LT1ReportByMonth=Tax 2 report by month
-LT2ReportByMonth=Tax 3 report by month
-LT1ReportByCustomers=Report tax 2 by third party
-LT2ReportByCustomers=Report tax 3 by third party
-LT1ReportByCustomersES=Report by third party RE
+RulesResultDue=- Сюда входят неоплаченные счета, расходы, НДС, пожертвования вне зависимости от того, оплачены они или нет. Также сюда входит выплачиваемая заработная плата. <br> - он основан на дате выставления счетов-фактур и на сроке оплаты расходов или налоговых платежей. Для заработной платы, определенной с помощью модуля Salary, используется дата валютирования платежа.
+RulesResultInOut=- Сюда входят реальные платежи по счетам, расходы, НДС и заработная плата. <br> - Он основан на датах оплаты счетов-фактур, расходах, НДС и заработной плате. Дата пожертвования для пожертвования.
+RulesCADue=- Он включает в себя подлежащие оплате счета клиента независимо от того, оплачены они или нет. <br> - зависит от даты выставления счетов для этих счетов. <br>
+RulesCAIn=- Он включает в себя все действующие платежи по счетам, полученным от клиентов. <br> - он основан на дате оплаты этих счетов-фактур <br>
+RulesCATotalSaleJournal=Он включает все кредитные линии из журнала продаж.
+RulesSalesTurnoverOfIncomeAccounts=Включает (кредитовые - дебетовые) строки для продуктовых счетов в группе ДОХОД.
+RulesAmountOnInOutBookkeepingRecord=Он включает в себя запись в вашей бухгалтерской книге с учетными записями, имеющими группу «РАСХОДЫ» или «ДОХОД».
+RulesResultBookkeepingPredefined=Он включает в себя запись в вашей бухгалтерской книге с учетными записями, имеющими группу «РАСХОДЫ» или «ДОХОД».
+RulesResultBookkeepingPersonalized=Он показывает запись в вашей книге с учетными записями <b>, сгруппированными по персонализированным группам </b>
+SeePageForSetup=См. Меню <a href="%s"> %s </a> для настройки
+DepositsAreNotIncluded=- Счета на предоплату не включены
+DepositsAreIncluded=- Счета на предоплату включены
+LT1ReportByMonth=Отчет по налогу 2 по месяцам
+LT2ReportByMonth=Отчет по налогу 3 по месяцам
+LT1ReportByCustomers=Отчет о налоге 2 третьей стороной
+LT2ReportByCustomers=Отчет о налоге 3 третьей стороной
+LT1ReportByCustomersES=Отчет третьей стороны RE
 LT2ReportByCustomersES=Доклад третьей стороной IRPF
-VATReport=Sale tax report
-VATReportByPeriods=Sale tax report by period
-VATReportByMonth=Sale tax report by month
-VATReportByRates=Sale tax report by rates
-VATReportByThirdParties=Sale tax report by third parties
-VATReportByCustomers=Sale tax report by customer
+VATReport=Отчет о налоге с продаж
+VATReportByPeriods=Отчет по налогу с продаж по периодам
+VATReportByMonth=Отчет о налоге с продаж по месяцам
+VATReportByRates=Отчет о налоге с продаж по ставкам
+VATReportByThirdParties=Отчет о налоге с продаж от третьих лиц
+VATReportByCustomers=Отчет клиента о налоге с продаж
 VATReportByCustomersInInputOutputMode=Отчёт по собранному и оплаченному НДС клиента
-VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
-VATReportShowByRateDetails=Show details of this rate
-LT1ReportByQuarters=Report tax 2 by rate
-LT2ReportByQuarters=Report tax 3 by rate
+VATReportByQuartersInInputOutputMode=Отчет по ставке налога с продаж собранных и уплаченных налогов
+VATReportShowByRateDetails=Показать подробную информацию об этой ставке
+LT1ReportByQuarters=Отчет о налоге 2 по ставке
+LT2ReportByQuarters=Отчет о налоге 3 по ставке
 LT1ReportByQuartersES=Отчёт по ставке RE
 LT2ReportByQuartersES=Отчёт по ставке IRPF
 SeeVATReportInInputOutputMode=См. LE <b>отношения %sTVA encaissement %s</b> для режима де CALCUL стандарт
 SeeVATReportInDueDebtMode=См. LE <b>отношения %sTVA сюр dbit %s</b> для режима де CALCUL AVEC вариант SUR LES dbits
-RulesVATInServices=- For services, the report includes the VAT regulations actually received or issued on the basis of the date of payment.
-RulesVATInProducts=- For material assets, the report includes the VAT received or issued on the basis of the date of payment.
+RulesVATInServices=- Что касается услуг, в отчет включены правила НДС, фактически полученные или выданные на дату оплаты.
+RulesVATInProducts=- По материальным ценностям отчет включает НДС, полученный или выплаченный на дату платежа.
 RulesVATDueServices=- Для услуг, отчет включает в себя счета-фактуры за счет, оплачиваемый или нет, исходя из даты выставления счета.
-RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
+RulesVATDueProducts=- Для материальных ценностей отчет включает счета-фактуры по НДС на основании даты выставления счета.
 OptionVatInfoModuleComptabilite=Примечание: Для материальных ценностей, она должна использовать даты доставки будет более справедливым.
-ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
+ThisIsAnEstimatedValue=Это предварительный просмотр, основанный на бизнес-событиях, а не на окончательной таблице бухгалтерской книги, поэтому окончательные результаты могут отличаться от значений этого предварительного просмотра.
 PercentOfInvoice=%%/счёт
 NotUsedForGoods=Не используется на товары
 ProposalStats=Статистика по предложениям
@@ -223,66 +223,72 @@ PurchasesJournal=Покупки Журнал
 DescSellsJournal=Продажи журнала
 DescPurchasesJournal=Покупки Журнал
 CodeNotDef=Не определено
-WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
-DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
-Pcg_version=Chart of accounts models
-Pcg_type=Pcg type
-Pcg_subtype=Pcg subtype
+WarningDepositsNotIncluded=Счета на предоплату не включены в эту версию с этим модулем бухгалтерского учета.
+DatePaymentTermCantBeLowerThanObjectDate=Срок оплаты не может быть ниже даты объекта.
+Pcg_version=Модели планов счетов
+Pcg_type=Тип ПК
+Pcg_subtype=Подтип ПК
 InvoiceLinesToDispatch=Строки счёта для отправки
-ByProductsAndServices=By product and service
+ByProductsAndServices=По продуктам и услугам
 RefExt=Внешняя ссылка
-ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
+ToCreateAPredefinedInvoice=Чтобы создать шаблон счета-фактуры, создайте стандартный счет-фактуру, затем, не проверяя его, нажмите кнопку «%s».
 LinkedOrder=Ссылка для заказа
 Mode1=Метод 1
 Mode2=Метод 2
-CalculationRuleDesc=To calculate total VAT, there is two methods:<br>Method 1 is rounding vat on each line, then summing them.<br>Method 2 is summing all vat on each line, then rounding result.<br>Final result may differs from few cents. Default mode is mode <b>%s</b>.
-CalculationRuleDescSupplier=According to vendor, choose appropriate method to apply same calculation rule and get same result expected by your vendor.
-TurnoverPerProductInCommitmentAccountingNotRelevant=The report of Turnover collected per product is not available. This report is only available for turnover invoiced.
-TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=The report of Turnover collected per sale tax rate is not available. This report is only available for turnover invoiced.
+CalculationRuleDesc=Для расчета общей суммы НДС существует два метода: <br> Метод 1 - округление НДС в каждой строке, а затем их суммирование. <br> Метод 2 суммирует все НДС в каждой строке, а затем округляет результат. <br> Конечный результат может отличаться от нескольких центов. Режим по умолчанию - режим <b> %s </b>.
+CalculationRuleDescSupplier=По словам поставщика, выберите подходящий метод, чтобы применить то же правило расчета и получить тот же результат, который ожидал ваш поставщик.
+TurnoverPerProductInCommitmentAccountingNotRelevant=Отчет об обороте по продуктам недоступен. Этот отчет доступен только для счета-фактуры оборота.
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=Отчет об обороте, собранном по ставке налога с продаж, недоступен. Этот отчет доступен только для счета-фактуры оборота.
 CalculationMode=Режим вычислений
-AccountancyJournal=Accounting code journal
-ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
-ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accounting account on third party is not defined.
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
-ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated vendor accounting account on third party is not defined.
-ConfirmCloneTax=Confirm the clone of a social/fiscal tax
-ConfirmCloneVAT=Confirm the clone of a VAT declaration
-ConfirmCloneSalary=Confirm the clone of a salary
+AccountancyJournal=Журнал кодов бухгалтерского учета
+ACCOUNTING_VAT_SOLD_ACCOUNT=Бухгалтерский счет по умолчанию для НДС с продаж (используется, если не определен при настройке словаря НДС)
+ACCOUNTING_VAT_BUY_ACCOUNT=Бухгалтерский счет по умолчанию для НДС с покупок (используется, если не определен при настройке словаря НДС)
+ACCOUNTING_VAT_PAY_ACCOUNT=Бухгалтерский счет по умолчанию для уплаты НДС
+ACCOUNTING_ACCOUNT_CUSTOMER=Бухгалтерский счет, используемый для третьих лиц клиента
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Выделенная учетная запись, указанная на карте третьей стороны, будет использоваться только для учета во вспомогательной книге. Он будет использоваться для Главной книги и в качестве значения по умолчанию для учета во вспомогательной книге, если выделенная учетная запись клиента на третьей стороне не определена.
+ACCOUNTING_ACCOUNT_SUPPLIER=Бухгалтерский счет, используемый для третьих сторон поставщика
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Выделенная учетная запись, указанная на карте третьей стороны, будет использоваться только для учета во вспомогательной книге. Он будет использоваться для Главной книги и в качестве значения по умолчанию для учета во вспомогательной книге, если не определена специальная учетная запись поставщика для третьей стороны.
+ConfirmCloneTax=Подтвердите клон социального / налогового налога
+ConfirmCloneVAT=Подтвердите копию декларации по НДС
+ConfirmCloneSalary=Подтвердите клон зарплаты
 CloneTaxForNextMonth=Клонировать для следующего месяца
 SimpleReport=Простой отчет
-AddExtraReport=Extra reports (add foreign and national customer report)
-OtherCountriesCustomersReport=Foreign customers report
-BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Based on the two first letters of the VAT number being different from your own company's country code
-SameCountryCustomersWithVAT=National customers report
-BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Based on the two first letters of the VAT number being the same as your own company's country code
-LinkedFichinter=Link to an intervention
-ImportDataset_tax_contrib=Social/fiscal taxes
-ImportDataset_tax_vat=Vat payments
-ErrorBankAccountNotFound=Error: Bank account not found
+AddExtraReport=Дополнительные отчеты (добавить отчет о зарубежных и национальных клиентах)
+OtherCountriesCustomersReport=Отчет иностранных клиентов
+BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=На основании того, что две первые буквы номера плательщика НДС отличаются от кода страны вашей компании.
+SameCountryCustomersWithVAT=Отчет о национальных клиентах
+BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=На основании того, что две первые буквы номера плательщика НДС совпадают с кодом страны вашей компании.
+LinkedFichinter=Ссылка на вмешательство
+ImportDataset_tax_contrib=Социальные / налоговые налоги
+ImportDataset_tax_vat=Платежи по НДС
+ErrorBankAccountNotFound=Ошибка: банковский счет не найден
 FiscalPeriod=Период учета
-ListSocialContributionAssociatedProject=List of social contributions associated with the project
-DeleteFromCat=Remove from accounting group
-AccountingAffectation=Accounting assignment
-LastDayTaxIsRelatedTo=Last day of period the tax is related to
-VATDue=Sale tax claimed
-ClaimedForThisPeriod=Claimed for the period
-PaidDuringThisPeriod=Paid for this period
-PaidDuringThisPeriodDesc=This is the sum of all payments linked to VAT declarations which have an end-of-period date in the selected date range
-ByVatRate=By sale tax rate
-TurnoverbyVatrate=Turnover invoiced by sale tax rate
-TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
-PurchasebyVatrate=Purchase by sale tax rate
+ListSocialContributionAssociatedProject=Список социальных отчислений, связанных с проектом
+DeleteFromCat=Удалить из учетной группы
+AccountingAffectation=Бухгалтерское задание
+LastDayTaxIsRelatedTo=Последний день периода, к которому относится налог
+VATDue=Заявленный налог с продаж
+ClaimedForThisPeriod=Заявлено за период
+PaidDuringThisPeriod=Оплачено за этот период
+PaidDuringThisPeriodDesc=Это сумма всех платежей, связанных с декларациями по НДС, у которых дата окончания периода находится в выбранном диапазоне дат.
+ByVatRate=По ставке налога с продаж
+TurnoverbyVatrate=Оборот по ставке налога с продаж
+TurnoverCollectedbyVatrate=Оборот по ставке налога с продаж
+PurchasebyVatrate=Покупка по ставке налога с продажи
 LabelToShow=Короткая метка
-PurchaseTurnover=Purchase turnover
-PurchaseTurnoverCollected=Purchase turnover collected
-RulesPurchaseTurnoverDue=- It includes the supplier's due invoices whether they are paid or not. <br>- It is based on the invoice date of these invoices.<br>
-RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices done to suppliers.<br>- It is based on the payment date of these invoices<br>
-RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
-RulesPurchaseTurnoverOfExpenseAccounts=It includes (debit - credit) of lines for product accounts in group EXPENSE
-ReportPurchaseTurnover=Purchase turnover invoiced
-ReportPurchaseTurnoverCollected=Purchase turnover collected
-IncludeVarpaysInResults = Include various payments in reports
-IncludeLoansInResults = Include loans in reports
+PurchaseTurnover=Оборот покупок
+PurchaseTurnoverCollected=Накопленный оборот покупок
+RulesPurchaseTurnoverDue=- Он включает в себя счета-фактуры поставщика, независимо от того, оплачены они или нет. <br> - он основан на дате выставления этих счетов-фактур. <br>
+RulesPurchaseTurnoverIn=- Он включает в себя все фактические платежи по счетам поставщикам. <br> - он основан на дате оплаты этих счетов-фактур <br>
+RulesPurchaseTurnoverTotalPurchaseJournal=Он включает все дебетовые строки из журнала покупок.
+RulesPurchaseTurnoverOfExpenseAccounts=Включает (дебет - кредит) строк для продуктовых счетов в группе РАСХОДЫ.
+ReportPurchaseTurnover=Счет-фактура оборота закупок
+ReportPurchaseTurnoverCollected=Накопленный оборот покупок
+IncludeVarpaysInResults = Включать различные платежи в отчеты
+IncludeLoansInResults = Включать ссуды в отчеты
+InvoiceLate30Days = Счета-фактуры с просрочкой > 30 дней
+InvoiceLate15Days = Счета-фактуры с просрочкой > 15 дней
+InvoiceLateMinus15Days = Счета опаздывают
+InvoiceNotLate = Необходимо собрать < 15 дней
+InvoiceNotLate15Days = Будет собрано в течение 15 дней
+InvoiceNotLate30Days = Будет собрано в течение 30 дней
diff --git a/htdocs/langs/ru_RU/cron.lang b/htdocs/langs/ru_RU/cron.lang
index d65f1c21c33..c391cb5e874 100644
--- a/htdocs/langs/ru_RU/cron.lang
+++ b/htdocs/langs/ru_RU/cron.lang
@@ -7,85 +7,85 @@ Permission23103 = Удалить Запланированную задачу
 Permission23104 = Выполнить запланированную задачу
 # Admin
 CronSetup=Настройки запланированных заданий
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs from a browser
-OrToLaunchASpecificJob=Or to check and launch a specific job from a browser
+URLToLaunchCronJobs=URL-адрес для проверки и запуска подходящих заданий cron из браузера
+OrToLaunchASpecificJob=Или проверить и запустить конкретное задание из браузера
 KeyForCronAccess=Ключ безопасности для запуска запланированных заданий
-FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
+FileToLaunchCronJobs=Командная строка для проверки и запуска квалифицированных заданий cron
 CronExplainHowToRunUnix=В системах Unix-like вы должны задать crontab для выполнения команды каждые 5 минут.
-CronExplainHowToRunWin=On Microsoft(tm) Windows environment you can use Scheduled Task tools to run the command line each 5 minutes
-CronMethodDoesNotExists=Class %s does not contains any method %s
-CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
-CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
-CronJobProfiles=List of predefined cron job profiles
+CronExplainHowToRunWin=В среде Microsoft (tm) Windows вы можете использовать инструменты запланированного задания для запуска командной строки каждые 5 минут.
+CronMethodDoesNotExists=Класс %s не содержит метода %s
+CronMethodNotAllowed=Метод %s класса %s находится в черном списке запрещенных методов
+CronJobDefDesc=Профили заданий Cron определены в файле дескриптора модуля. Когда модуль активирован, они загружаются и становятся доступными, поэтому вы можете управлять заданиями из меню инструментов администратора %s.
+CronJobProfiles=Список предопределенных профилей вакансий cron
 # Menu
 EnabledAndDisabled=Включено и отключено
 # Page list
-CronLastOutput=Latest run output
-CronLastResult=Latest result code
+CronLastOutput=Результат последнего запуска
+CronLastResult=Последний код результата
 CronCommand=Команда
 CronList=Запланированные задания
 CronDelete=Удалить запланированные задания
 CronConfirmDelete=Вы уверены, что хотите удалить эти запланированные задания?
 CronExecute=Запустить запланированное задание
-CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
-CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
+CronConfirmExecute=Вы уверены, что хотите выполнить эти запланированные задания сейчас?
+CronInfo=Модуль запланированных заданий позволяет планировать задания для их автоматического выполнения. Задания также можно запускать вручную.
 CronTask=Задание
 CronNone=Никакой
-CronDtStart=Not before
-CronDtEnd=Not after
+CronDtStart=Не раньше, чем
+CronDtEnd=Не после
 CronDtNextLaunch=Следующий запуск
-CronDtLastLaunch=Start date of latest execution
-CronDtLastResult=End date of latest execution
+CronDtLastLaunch=Дата начала последнего исполнения
+CronDtLastResult=Дата окончания последнего исполнения
 CronFrequency=Частота
-CronClass=Class
+CronClass=Класс
 CronMethod=Метод
 CronModule=Модуль
 CronNoJobs=Нет зарегистрированных заданий
 CronPriority=Приоритет
 CronLabel=Наименование
-CronNbRun=Number of launches
-CronMaxRun=Maximum number of launches
+CronNbRun=Количество запусков
+CronMaxRun=Максимальное количество запусков
 CronEach=Каждый
 JobFinished=Задание запущено и завершено
-Scheduled=Scheduled
+Scheduled=Запланированное
 #Page card
 CronAdd= Добавить задание
-CronEvery=Execute job each
+CronEvery=Выполнять задание каждый
 CronObject=Экземпляр / объект для создания
 CronArgs=Параметры
-CronSaveSucess=Save successfully
+CronSaveSucess=Сохраните успешно
 CronNote=Комментарий
 CronFieldMandatory=Поле %s является обязательным
 CronErrEndDateStartDt=Дата окончания не может быть раньше даты начала
-StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Schedule
+StatusAtInstall=Статус при установке модуля
+CronStatusActiveBtn=Расписание
 CronStatusInactiveBtn=Выключать
-CronTaskInactive=Задание отключено
+CronTaskInactive=Это задание отключено (не запланировано)
 CronId=ID
-CronClassFile=Filename with class
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example 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>
-CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For example 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 example 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 example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
-CronArgsHelp=The method arguments. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
+CronClassFile=Имя файла с классом
+CronModuleHelp=Имя каталога модуля Dolibarr (также работает с внешним модулем Dolibarr). <BR> Например, чтобы вызвать метод выборки объекта продукта Dolibarr / htdocs / <u> product </u> /class/product.class.php, значение для модуля - <br>8 a33027
+CronClassFileHelp=Относительный путь и имя файла для загрузки (путь относительно корневого каталога веб-сервера). <BR> Например, чтобы вызвать метод выборки объекта продукта Dolibarr htdocs / product / class / <u> product.class.php </u>, значение для имени файла класса - a0342fccaefda19bz0 a18175c0 / productclass.
+CronObjectHelp=Имя загружаемого объекта. <BR> Например, чтобы вызвать метод выборки объекта продукта Dolibarr /htdocs/product/class/product.class.php, значение имени файла класса будет <br> <i> Product </i>
+CronMethodHelp=Метод объекта для запуска. <BR> Например, чтобы вызвать метод выборки объекта продукта Dolibarr /htdocs/product/class/product.class.php, значение метода будет <br> <i> fetch </i>
+CronArgsHelp=Аргументы метода. <BR> Например, чтобы вызвать метод выборки объекта Dolibarr Product /htdocs/product/class/product.class.php, значение параметров может быть <br> a049271e8181fcz330 0, ProductRef a0ae0758bac
 CronCommandHelp=Команда для выполнения
 CronCreateJob=Создать новое запланированное задание
 CronFrom=От
 # Info
 # Common
-CronType=Job type
-CronType_method=Call method of a PHP Class
+CronType=Тип задания
+CronType_method=Вызов метода класса PHP
 CronType_command=Команда командной строки
-CronCannotLoadClass=Cannot load class file %s (to use class %s)
-CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
-UseMenuModuleToolsToAddCronJobs=Go into menu "<a href="%s">Home - Admin tools - Scheduled jobs</a>" to see and edit scheduled jobs.
-JobDisabled=Job disabled
-MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql', 'pgsql', 'auto'), 1, 'auto' or filename to build, number of backup files to keep
-WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
-DATAPOLICYJob=Data cleaner and anonymizer
-JobXMustBeEnabled=Job %s must be enabled
+CronCannotLoadClass=Невозможно загрузить файл класса %s (для использования класса %s)
+CronCannotLoadObject=Файл класса %s был загружен, но объект %s в нем не обнаружен
+UseMenuModuleToolsToAddCronJobs=Войдите в меню «<a href="%s"> Home - Admin tools - Scheduled jobs </a>», чтобы просмотреть и отредактировать запланированные задания.
+JobDisabled=Работа отключена
+MakeLocalDatabaseDumpShort=Резервное копирование локальной базы данных
+MakeLocalDatabaseDump=Создайте дамп локальной базы данных. Параметры: сжатие ('gz' или 'bz' или 'none'), тип резервной копии ('mysql', 'pgsql', 'auto'), 1, 'auto' или имя файла для создания, количество файлов резервных копий для хранения
+WarningCronDelayed=Внимание, для повышения производительности, какой бы ни была следующая дата выполнения включенных заданий, ваши задания могут быть отложены максимум на %s часов перед запуском.
+DATAPOLICYJob=Очиститель и анонимайзер данных
+JobXMustBeEnabled=Должно быть включено задание %s
 # Cron Boxes
-LastExecutedScheduledJob=Last executed scheduled job
-NextScheduledJobExecute=Next scheduled job to execute
-NumberScheduledJobError=Number of scheduled jobs in error
+LastExecutedScheduledJob=Последнее выполненное запланированное задание
+NextScheduledJobExecute=Следующее запланированное задание для выполнения
+NumberScheduledJobError=Количество запланированных заданий с ошибкой
diff --git a/htdocs/langs/ru_RU/deliveries.lang b/htdocs/langs/ru_RU/deliveries.lang
index 7dccefadf49..11f941a0f22 100644
--- a/htdocs/langs/ru_RU/deliveries.lang
+++ b/htdocs/langs/ru_RU/deliveries.lang
@@ -1,16 +1,16 @@
 # Dolibarr language file - Source file is en_US - deliveries
 Delivery=Доставка
-DeliveryRef=Ref Delivery
-DeliveryCard=Receipt card
-DeliveryOrder=Delivery receipt
+DeliveryRef=Ref Доставка
+DeliveryCard=Квитанция
+DeliveryOrder=Квитанция о доставке
 DeliveryDate=Дата доставки
-CreateDeliveryOrder=Generate delivery receipt
-DeliveryStateSaved=Delivery state saved
+CreateDeliveryOrder=Создать квитанцию о доставке
+DeliveryStateSaved=Состояние доставки сохранено
 SetDeliveryDate=Установить дату отправки
 ValidateDeliveryReceipt=Подтверждение получения доставки
-ValidateDeliveryReceiptConfirm=Are you sure you want to validate this delivery receipt?
+ValidateDeliveryReceiptConfirm=Вы уверены, что хотите подтвердить эту квитанцию о доставке?
 DeleteDeliveryReceipt=Удалить подтверждение доставки
-DeleteDeliveryReceiptConfirm=Are you sure you want to delete delivery receipt <b>%s</b>?
+DeleteDeliveryReceiptConfirm=Вы действительно хотите удалить квитанцию о доставке <b> %s </b>?
 DeliveryMethod=Способ доставки
 TrackingNumber=Номер отправления
 DeliveryNotValidated=Доставка не подтверждена
@@ -18,14 +18,15 @@ StatusDeliveryCanceled=Отменена
 StatusDeliveryDraft=Проект
 StatusDeliveryValidated=Получено
 # merou PDF model
-NameAndSignature=Name and Signature:
+NameAndSignature=Имя и подпись:
 ToAndDate=Получатель ___________________________________ доставлено ____ / _____ / __________
 GoodStatusDeclaration=Указанные выше товары получены в надлежащем состоянии,
-Deliverer=Deliverer:
+Deliverer=Поставщик:
 Sender=Отправитель
 Recipient=Получатель
 ErrorStockIsNotEnough=Нет достаточного запаса на складе
 Shippable=Возможно к отправке
 NonShippable=Не возможно к отправке
-ShowReceiving=Show delivery receipt
-NonExistentOrder=Nonexistent order
+ShowShippableStatus=Показать статус доставки
+ShowReceiving=Показать квитанцию о доставке
+NonExistentOrder=Несуществующий заказ
diff --git a/htdocs/langs/ru_RU/dict.lang b/htdocs/langs/ru_RU/dict.lang
index 867b14f2fde..92e70b26066 100644
--- a/htdocs/langs/ru_RU/dict.lang
+++ b/htdocs/langs/ru_RU/dict.lang
@@ -21,7 +21,7 @@ CountryNL=Нидерланды
 CountryHU=Венгрия
 CountryRU=Россия
 CountrySE=Швеция
-CountryCI=Ivoiry побережье
+CountryCI=Кот-д'Ивуар
 CountrySN=Сенегал
 CountryAR=Аргентина
 CountryCM=Камерун
@@ -160,7 +160,7 @@ CountryMD=Молдова
 CountryMN=Монголия
 CountryMS=Монтсеррат
 CountryMZ=Мозамбик
-CountryMM=Myanmar (Burma)
+CountryMM=Мьянма (Бирма)
 CountryNA=Намибия
 CountryNR=Науру
 CountryNP=Непал
@@ -223,7 +223,7 @@ CountryTO=Тонга
 CountryTT=Тринидад и Тобаго
 CountryTR=Турция
 CountryTM=Туркменистан
-CountryTC=Turks and Caicos Islands
+CountryTC=Острова Теркс и Кайкос
 CountryTV=Тувалу
 CountryUG=Уганда
 CountryUA=Украина
@@ -277,7 +277,7 @@ CurrencySingMGA=Ariary
 CurrencyMUR=Маврикий рупий
 CurrencySingMUR=Маврикий рупия
 CurrencyNOK=Норвежских крон
-CurrencySingNOK=Norwegian kronas
+CurrencySingNOK=Норвежская крона
 CurrencyTND=TND
 CurrencySingTND=Тунисский динар
 CurrencyUSD=Доллары США
@@ -330,30 +330,30 @@ PaperFormatCAP5=Формат P5 Канада
 PaperFormatCAP6=Формат P6  Канада
 #### Expense report categories ####
 ExpAutoCat=Машина
-ExpCycloCat=Moped
-ExpMotoCat=Motorbike
-ExpAuto3CV=3 CV
-ExpAuto4CV=4 CV
-ExpAuto5CV=5 CV
-ExpAuto6CV=6 CV
-ExpAuto7CV=7 CV
-ExpAuto8CV=8 CV
-ExpAuto9CV=9 CV
-ExpAuto10CV=10 CV
-ExpAuto11CV=11 CV
-ExpAuto12CV=12 CV
-ExpAuto3PCV=3 CV and more
-ExpAuto4PCV=4 CV and more
-ExpAuto5PCV=5 CV and more
-ExpAuto6PCV=6 CV and more
-ExpAuto7PCV=7 CV and more
-ExpAuto8PCV=8 CV and more
-ExpAuto9PCV=9 CV and more
-ExpAuto10PCV=10 CV and more
-ExpAuto11PCV=11 CV and more
-ExpAuto12PCV=12 CV and more
-ExpAuto13PCV=13 CV and more
-ExpCyclo=Capacity lower to 50cm3
-ExpMoto12CV=Motorbike 1 or 2 CV
-ExpMoto345CV=Motorbike 3, 4 or 5 CV
-ExpMoto5PCV=Motorbike 5 CV and more
+ExpCycloCat=Мопед
+ExpMotoCat=Мотоцикл
+ExpAuto3CV=3 резюме
+ExpAuto4CV=4 резюме
+ExpAuto5CV=5 резюме
+ExpAuto6CV=6 резюме
+ExpAuto7CV=7 резюме
+ExpAuto8CV=8 резюме
+ExpAuto9CV=9 резюме
+ExpAuto10CV=10 резюме
+ExpAuto11CV=11 резюме
+ExpAuto12CV=12 резюме
+ExpAuto3PCV=3 резюме и более
+ExpAuto4PCV=4 CV и более
+ExpAuto5PCV=5 CV и больше
+ExpAuto6PCV=6 CV и более
+ExpAuto7PCV=7 CV и более
+ExpAuto8PCV=8 CV и более
+ExpAuto9PCV=9 CV и более
+ExpAuto10PCV=10 CV и более
+ExpAuto11PCV=11 CV и более
+ExpAuto12PCV=12 CV и более
+ExpAuto13PCV=13 резюме и более
+ExpCyclo=Объем ниже 50 см3
+ExpMoto12CV=Мотоцикл 1 или 2 CV
+ExpMoto345CV=Мотоцикл 3, 4 или 5 CV
+ExpMoto5PCV=Мотоцикл 5 CV и более
diff --git a/htdocs/langs/ru_RU/donations.lang b/htdocs/langs/ru_RU/donations.lang
index 5e28ad37810..d98626e4cda 100644
--- a/htdocs/langs/ru_RU/donations.lang
+++ b/htdocs/langs/ru_RU/donations.lang
@@ -16,7 +16,7 @@ DonationStatusPromiseNotValidatedShort=Проект
 DonationStatusPromiseValidatedShort=Подтверждено
 DonationStatusPaidShort=Получено
 DonationTitle=Получатель пожертования
-DonationDate=Donation date
+DonationDate=Дата пожертвования
 DonationDatePayment=Дата платежа
 ValidPromess=Подтвердить обещание
 DonationReceipt=Получатель пожертования
@@ -32,3 +32,4 @@ DONATION_ART238=Если вы обеспокоены, показывать вы
 DONATION_ART885=Если вы обеспокоены, показывать выдержку статьи 885 из CGI
 DonationPayment=Платёж пожертвования
 DonationValidated= Пожертвование %s подтверждено
+DonationUseThirdparties=Использовать существующую стороннюю организацию в качестве координат жертвователей
diff --git a/htdocs/langs/ru_RU/ecm.lang b/htdocs/langs/ru_RU/ecm.lang
index 1ab6f4d4688..0e249a6ce2d 100644
--- a/htdocs/langs/ru_RU/ecm.lang
+++ b/htdocs/langs/ru_RU/ecm.lang
@@ -6,7 +6,7 @@ ECMSectionAuto=Директория в автоматическом режиме
 ECMSectionsManual=Ручное дерево директории
 ECMSectionsAuto=Автоматическое дерево директории
 ECMSections=Директории
-ECMRoot=ECM Root
+ECMRoot=Корень ECM
 ECMNewSection=Новая директория
 ECMAddSection=Добавить директорию
 ECMCreationDate=Дата создания
@@ -14,34 +14,34 @@ ECMNbOfFilesInDir=Количество файлов в каталоге
 ECMNbOfSubDir=Количество поддиректорий
 ECMNbOfFilesInSubDir=Количество файлов в поддиректориях
 ECMCreationUser=Создатель
-ECMArea=DMS/ECM area
-ECMAreaDesc=The DMS/ECM (Document Management System / Electronic Content Management) area allows you to save, share and search quickly all kind of documents in Dolibarr.
+ECMArea=Область DMS / ECM
+ECMAreaDesc=Область DMS / ECM (Система управления документами / Управление электронным контентом) позволяет сохранять, обмениваться и быстро искать все виды документов в Dolibarr.
 ECMAreaDesc2=* Автоматическая справочники заполняются автоматически при добавлении документов с карточкой элемента. <br> * Руководство каталогов можно использовать для сохранения документов, не связанных с конкретным элементом.
 ECMSectionWasRemoved=<b>Каталог %s</b> удален.
-ECMSectionWasCreated=Directory <b>%s</b> has been created.
+ECMSectionWasCreated=Каталог <b> %s </b> создан.
 ECMSearchByKeywords=Поиск по ключевым словам
 ECMSearchByEntity=Поиск по объекту
 ECMSectionOfDocuments=Директории документов
 ECMTypeAuto=Автоматический
-ECMDocsBy=Documents linked to %s
+ECMDocsBy=Документы, связанные с %s
 ECMNoDirectoryYet=Директория не создана
 ShowECMSection=Показать директорию
 DeleteSection=Удаление директории
-ConfirmDeleteSection=Can you confirm you want to delete the directory <b>%s</b>?
+ConfirmDeleteSection=Вы можете подтвердить, что хотите удалить каталог <b> %s </b>?
 ECMDirectoryForFiles=Относительная директория для файлов
-CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
-CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
+CannotRemoveDirectoryContainsFilesOrDirs=Удаление невозможно, так как он содержит файлы или подкаталоги.
+CannotRemoveDirectoryContainsFiles=Удаление невозможно, так как он содержит некоторые файлы
 ECMFileManager=Файловый менеджер
-ECMSelectASection=Select a directory in the tree...
-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
-NoDirectoriesFound=No directories found
-FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
-ExtraFieldsEcmFiles=Extrafields Ecm Files
-ExtraFieldsEcmDirectories=Extrafields Ecm Directories
-ECMSetup=ECM Setup
-GenerateImgWebp=Duplicate all images with another version with .webp format
-ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
-ConfirmImgWebpCreation=Confirm all images duplication
-SucessConvertImgWebp=Images successfully duplicated
+ECMSelectASection=Выберите каталог в дереве ...
+DirNotSynchronizedSyncFirst=Кажется, что этот каталог создан или изменен вне модуля ECM. Вы должны сначала нажать кнопку «Resync», чтобы синхронизировать диск и базу данных, чтобы получить содержимое этого каталога.
+ReSyncListOfDir=Повторная синхронизация списка каталогов
+HashOfFileContent=Хеш содержимого файла
+NoDirectoriesFound=Каталоги не найдены
+FileNotYetIndexedInDatabase=Файл еще не проиндексирован в базе данных (попробуйте повторно загрузить его)
+ExtraFieldsEcmFiles=Файлы Extrafields Ecm
+ExtraFieldsEcmDirectories=Каталоги Extrafields Ecm
+ECMSetup=Настройка ECM
+GenerateImgWebp=Дублируйте все изображения с другой версией в формате .webp
+ConfirmGenerateImgWebp=Если вы подтвердите, вы сгенерируете изображение в формате .webp для всех изображений, находящихся в настоящее время в этой папке (подпапки не включены) ...
+ConfirmImgWebpCreation=Подтвердите дублирование всех изображений
+SucessConvertImgWebp=Изображения успешно скопированы
diff --git a/htdocs/langs/ru_RU/errors.lang b/htdocs/langs/ru_RU/errors.lang
index 07a0be72000..5d9c38a42ba 100644
--- a/htdocs/langs/ru_RU/errors.lang
+++ b/htdocs/langs/ru_RU/errors.lang
@@ -4,53 +4,54 @@
 NoErrorCommitIsDone=Нет ошибок, мы принимаем
 # Errors
 ErrorButCommitIsDone=Обнаружены ошибки, но мы подтвердиле несмотря на это
-ErrorBadEMail=Email %s is incorrect
-ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
-ErrorBadUrl=Url %s is incorrect
-ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
-ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
+ErrorBadEMail=Электронная почта %s неверна
+ErrorBadMXDomain=Электронная почта %s кажется неверной (домен не имеет действительной записи MX)
+ErrorBadUrl=URL-адрес %s неверен
+ErrorBadValueForParamNotAString=Плохое значение для вашего параметра. Обычно он добавляется, когда перевод отсутствует.
+ErrorRefAlreadyExists=Ссылка <b> %s </b> уже существует.
 ErrorLoginAlreadyExists=Логин %s уже существует.
 ErrorGroupAlreadyExists=Группа %s уже существует.
+ErrorEmailAlreadyExists=Email %s already exists.
 ErrorRecordNotFound=Запись не найдена.
 ErrorFailToCopyFile=Не удалось скопировать файл '<b>%s</b>' в '<b>%s</b>'.
-ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
+ErrorFailToCopyDir=Не удалось скопировать каталог <b> %s </b> в <b> %s </b>.
 ErrorFailToRenameFile=Не удалось переименовать файл '<b>%s</b>' в '<b>%s</b>'.
 ErrorFailToDeleteFile=Не удается удалить файл '<b>%s</b>'.
 ErrorFailToCreateFile=Не удалось создать файл '<b>%s</b>'
 ErrorFailToRenameDir=Не удалось переименовать директорию '<b>%s</b>' в '<b>%s</b>'
 ErrorFailToCreateDir=Не удалось создать директорию '<b>%s</b>'
 ErrorFailToDeleteDir=Не удалось удалить директорию '<b>%s</b>'
-ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
-ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
+ErrorFailToMakeReplacementInto=Не удалось произвести замену в файле '<b> %s </b>'.
+ErrorFailToGenerateFile=Не удалось создать файл <b> %s </b>.
 ErrorThisContactIsAlreadyDefinedAsThisType=Этот контакт уже определено в качестве контакта данного типа.
 ErrorCashAccountAcceptsOnlyCashMoney=Этот банковский счет определен как счет для наличных, так что он принимает только наличные платежи.
 ErrorFromToAccountsMustDiffers=Источник и цели банковского счета должны быть разными.
-ErrorBadThirdPartyName=Bad value for third-party name
+ErrorBadThirdPartyName=Неверное значение для стороннего имени
 ErrorProdIdIsMandatory=%s является обязательным
 ErrorBadCustomerCodeSyntax=Плохо синтаксис для заказчика код
-ErrorBadBarCodeSyntax=Bad syntax for barcode. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
+ErrorBadBarCodeSyntax=Неверный синтаксис штрих-кода. Возможно, вы установили неверный тип штрих-кода или определили маску штрих-кода для нумерации, которая не соответствует отсканированному значению.
 ErrorCustomerCodeRequired=Требуется код клиента
-ErrorBarCodeRequired=Barcode required
+ErrorBarCodeRequired=Требуется штрих-код
 ErrorCustomerCodeAlreadyUsed=Код клиента уже используется
-ErrorBarCodeAlreadyUsed=Barcode already used
+ErrorBarCodeAlreadyUsed=Штрих-код уже использован
 ErrorPrefixRequired=Префикс обязателен
-ErrorBadSupplierCodeSyntax=Bad syntax for vendor code
-ErrorSupplierCodeRequired=Vendor code required
-ErrorSupplierCodeAlreadyUsed=Vendor code already used
+ErrorBadSupplierCodeSyntax=Неверный синтаксис кода поставщика
+ErrorSupplierCodeRequired=Требуется код поставщика
+ErrorSupplierCodeAlreadyUsed=Код поставщика уже использован
 ErrorBadParameters=Неверные параметры
-ErrorWrongParameters=Wrong or missing parameters
-ErrorBadValueForParameter=Wrong value '%s' for parameter '%s'
-ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
+ErrorWrongParameters=Неправильные или отсутствующие параметры
+ErrorBadValueForParameter=Неверное значение '%s' для параметра '%s'
+ErrorBadImageFormat=Файл изображения не имеет поддерживаемого формата (Ваш PHP не поддерживает функции для преобразования изображений этого формата)
 ErrorBadDateFormat= Значение '%s' имеет неверный формат даты
 ErrorWrongDate=Дата некорректна!
 ErrorFailedToWriteInDir=Не удалось записать в директорию %s
 ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=Найдено неверный электронный синтаксис% с линии в файл (например, строка %s с электронной почтой= %s)
-ErrorUserCannotBeDelete=User cannot be deleted. Maybe it is associated to Dolibarr entities.
-ErrorFieldsRequired=Some required fields have been left blank.
-ErrorSubjectIsRequired=The email subject is required
+ErrorUserCannotBeDelete=Пользователь не может быть удален. Возможно, это связано с сущностями Долибарра.
+ErrorFieldsRequired=Некоторые обязательные поля остались пустыми.
+ErrorSubjectIsRequired=Укажите тему электронного письма.
 ErrorFailedToCreateDir=Не удалось создать каталог. Убедитесь, что веб-сервер пользователь имеет разрешения на запись в каталог Dolibarr документы. Если параметр <b>safe_mode</b> включен по этому PHP, проверьте, что Dolibarr PHP файлы принадлежат к веб-серверу пользователей (или группы).
 ErrorNoMailDefinedForThisUser=Нет определена почта для этого пользователя
-ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
+ErrorSetupOfEmailsNotComplete=Настройка писем не завершена
 ErrorFeatureNeedJavascript=Эта функция JavaScript должны быть активированы на работу. Изменить это в настройки - дисплей.
 ErrorTopMenuMustHaveAParentWithId0=Меню типа 'Top' не может быть родителем меню. Положить 0 родителей в меню или выбрать меню типа 'левых'.
 ErrorLeftMenuMustHaveAParentId=Меню типа 'левых' должен иметь родителя ID.
@@ -59,98 +60,98 @@ ErrorDirNotFound=Directory <b>%s</b> не найден (Неверный пут
 ErrorFunctionNotAvailableInPHP=<b>Функция %s</b> необходим для этой функции, но не доступен в этой версии / настройки PHP.
 ErrorDirAlreadyExists=Директория с таким именем уже существует.
 ErrorFileAlreadyExists=Файл с этим именем уже существует.
-ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exists.
+ErrorDestinationAlreadyExists=Другой файл с именем <b> %s </b> уже существует.
 ErrorPartialFile=Файл не получил полностью на сервер.
 ErrorNoTmpDir=Временная директория %s не существует.
 ErrorUploadBlockedByAddon=Добавить заблокирован PHP / Apache плагин.
 ErrorFileSizeTooLarge=Размер файла слишком велик.
-ErrorFieldTooLong=Field %s is too long.
+ErrorFieldTooLong=Поле %s слишком длинное.
 ErrorSizeTooLongForIntType=Размер слишком долго для целого типа (%s цифр максимум)
 ErrorSizeTooLongForVarcharType=Размер слишком долго для струнного типа (%s символов максимум)
 ErrorNoValueForSelectType=Пожалуйста, заполните значение для выпадающего списка
 ErrorNoValueForCheckBoxType=Пожалуйста, заполните значение для списка флажков
 ErrorNoValueForRadioType=Пожалуйста, заполните  значени для списка переключателей
-ErrorBadFormatValueList=The list value cannot have more than one comma: <u>%s</u>, but need at least one: key,value
-ErrorFieldCanNotContainSpecialCharacters=The field <b>%s</b> must not contains special characters.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=The field <b>%s</b> must not contain special characters, nor upper case characters and cannot contain only numbers.
-ErrorFieldMustHaveXChar=The field <b>%s</b> must have at least %s characters.
+ErrorBadFormatValueList=Значение списка не может содержать более одной запятой: <u> %s </u>, но необходим хотя бы один: ключ, значение
+ErrorFieldCanNotContainSpecialCharacters=Поле <b> %s </b> не должно содержать специальных символов.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=Поле <b> %s </b> не должно содержать специальных символов или символов верхнего регистра и не может содержать только цифры.
+ErrorFieldMustHaveXChar=Поле <b> %s </b> должно содержать не менее %s символов.
 ErrorNoAccountancyModuleLoaded=Нет бухгалтерского модуля активируется
 ErrorExportDuplicateProfil=Имя этого профиля уже сущесвует для этого набора для экспорта.
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP соответствия не является полной.
 ErrorLDAPMakeManualTest=. LDIF файл был создан в директории %s. Попробуйте загрузить его вручную из командной строки, чтобы иметь больше информации об ошибках.
-ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
-ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
-ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
-ErrorRecordHasChildren=Failed to delete record since it has some child records.
-ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
-ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into another object.
+ErrorCantSaveADoneUserWithZeroPercentage=Невозможно сохранить действие со статусом «не запущено», если также заполнено поле «выполнено».
+ErrorRefAlreadyExists=Ссылка <b> %s </b> уже существует.
+ErrorPleaseTypeBankTransactionReportName=Введите название банковской выписки, в которой необходимо указать запись (в формате ГГГГММ или ГГГГММДД)
+ErrorRecordHasChildren=Не удалось удалить запись, так как у нее есть дочерние записи.
+ErrorRecordHasAtLeastOneChildOfType=У объекта есть хотя бы один дочерний элемент типа %s
+ErrorRecordIsUsedCantDelete=Не могу удалить запись. Он уже используется или включен в другой объект.
 ErrorModuleRequireJavascript=Javascript не должна быть отключена, чтобы эта функция работает. Чтобы включить / отключить Javascript, перейдите в меню Главная-> Настройка-> Экран.
 ErrorPasswordsMustMatch=Оба введенных пароля должны совпадать друг с другом
-ErrorContactEMail=A technical error occured. Please, contact administrator to following email <b>%s</b> and provide the error code <b>%s</b> in your message, or add a screen copy of this page.
-ErrorWrongValueForField=Field <b>%s</b>: '<b>%s</b>' does not match regex rule <b>%s</b>
-ErrorFieldValueNotIn=Field <b>%s</b>: '<b>%s</b>' is not a value found in field <b>%s</b> of <b>%s</b>
-ErrorFieldRefNotIn=Field <b>%s</b>: '<b>%s</b>' is not a <b>%s</b> existing ref
-ErrorsOnXLines=%s errors found
+ErrorContactEMail=Произошла техническая ошибка. Пожалуйста, свяжитесь с администратором по следующему адресу электронной почты <b> %s </b> и укажите код ошибки <b> %s </b> или добавьте его в копию сообщения на экране, или добавьте его в копию сообщения на экране.
+ErrorWrongValueForField=Поле <b> %s </b>: '<b> %s </b>' не совпадает с регулярным выражением <b>%s</b>
+ErrorFieldValueNotIn=Поле <b> %s </b>: '<b> %s </b>' не является найденным значением в поле <b> %s </b> из <b> %s </b>
+ErrorFieldRefNotIn=Поле <b> %s </b>: '<b> %s </b>' не является <b>%s</b> существующей ссылкой
+ErrorsOnXLines=%s обнаружены ошибки
 ErrorFileIsInfectedWithAVirus=Антивирусная программа не смогла проверить файл (файл может быть заражен вирусом)
 ErrorSpecialCharNotAllowedForField=Специальные символы не допускаются для поля &quot;%s&quot;
 ErrorNumRefModel=Ссылка есть в базе данных (%s) и не совместимы с данным правилом нумерации. Удаление записей или переименован ссылкой для активации этого модуля.
-ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this vendor
-ErrorOrdersNotCreatedQtyTooLow=Some orders haven't been created because of too-low quantities
-ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
+ErrorQtyTooLowForThisSupplier=Слишком низкое количество для этого поставщика или цена на этот продукт для этого поставщика не определена.
+ErrorOrdersNotCreatedQtyTooLow=Некоторые заказы не были созданы из-за слишком малого количества
+ErrorModuleSetupNotComplete=Настройка модуля %s выглядит незавершенной. Зайдите в Home - Setup - Modules для завершения.
 ErrorBadMask=Ошибка на маску
 ErrorBadMaskFailedToLocatePosOfSequence=Ошибка, маска без порядкового номера
 ErrorBadMaskBadRazMonth=Ошибка, плохое значение сброса
-ErrorMaxNumberReachForThisMask=Maximum number reached for this mask
+ErrorMaxNumberReachForThisMask=Достигнуто максимальное количество для этой маски
 ErrorCounterMustHaveMoreThan3Digits=Счётчик должен иметь более 3 цифр
-ErrorSelectAtLeastOne=Error, select at least one entry.
-ErrorDeleteNotPossibleLineIsConsolidated=Delete not possible because record is linked to a bank transaction that is conciliated
+ErrorSelectAtLeastOne=Ошибка, выберите хотя бы одну запись.
+ErrorDeleteNotPossibleLineIsConsolidated=Удалить невозможно, поскольку запись связана с согласованной банковской транзакцией
 ErrorProdIdAlreadyExist=%s назначается еще одна треть
 ErrorFailedToSendPassword=Не удалось отправить пароль
 ErrorFailedToLoadRSSFile=Не в состоянии получить RSS-канал. Попробуйте добавить постоянные MAIN_SIMPLEXMLLOAD_DEBUG если сообщения об ошибках не предоставляет достаточно информации.
-ErrorForbidden=Access denied.<br>You try to access to a page, area or feature of a disabled module or without being in an authenticated session or that is not allowed to your user.
+ErrorForbidden=Доступ запрещен. <br> Вы пытаетесь получить доступ к странице, области или функции отключенного модуля, не находясь в аутентифицированном сеансе или это не разрешено вашему пользователю.
 ErrorForbidden2=Разрешение на этот логин может быть определено администратором вашей Dolibarr из меню %s-> %s.
 ErrorForbidden3=Кажется, что Dolibarr не используется через аутентифицированных сессии. Взгляните на Dolibarr Настройка документации знать, как управлять подлинности (htaccess, mod_auth или другие ...).
 ErrorNoImagickReadimage=Функция imagick_readimage не найдена в этой PHP. Нет предварительного просмотра могут быть доступны. Администраторы могут отключить эту закладку из меню Настройка - Экран.
 ErrorRecordAlreadyExists=Запись уже существует
-ErrorLabelAlreadyExists=This label already exists
+ErrorLabelAlreadyExists=Этот ярлык уже существует
 ErrorCantReadFile=Не удалось прочитать файл ' %s'
 ErrorCantReadDir=Не удалось прочитать каталог ' %s'
 ErrorBadLoginPassword=Плохо стоимости логин или пароль
 ErrorLoginDisabled=Ваша учетная запись была отключена
-ErrorFailedToRunExternalCommand=Не удалось запустить внешнюю команду. Проверить это можно и работоспособной PHP на вашем сервере. Если PHP <b>установлен безопасный режим,</b> проверьте, что команда находится внутри каталога определяется параметром <b>safe_mode_exec_dir.</b>
+ErrorFailedToRunExternalCommand=Не удалось запустить внешнюю команду. Убедитесь, что он доступен и запускается пользователем вашего PHP-сервера. Также проверьте, что команда не защищена на уровне оболочки таким уровнем безопасности, как apparmor.
 ErrorFailedToChangePassword=Не удается изменить пароль
 ErrorLoginDoesNotExists=Пользователь с <b>логином %s</b> не может быть найдено.
 ErrorLoginHasNoEmail=Этот пользователь не имеет адреса электронной почты. Процесс прерван.
 ErrorBadValueForCode=Плохо значения типов кода. Попробуйте еще раз с новой стоимости ...
 ErrorBothFieldCantBeNegative=Поля %s и %s не может быть и отрицательным
-ErrorFieldCantBeNegativeOnInvoice=Field <strong>%s</strong> cannot be negative on this type of invoice. If you need to add a discount line, just create the discount first (from field '%s' in thirdparty card) and apply it to the invoice.
-ErrorLinesCantBeNegativeForOneVATRate=Total of lines (net of tax) can't be negative for a given not null VAT rate (Found a negative total for VAT rate <b>%s</b>%%).
-ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a deposit. You will face problems when you will need to consume the deposit in final invoice if you do so.
+ErrorFieldCantBeNegativeOnInvoice=Поле <strong> %s </strong> не может быть отрицательным в этом типе счета. Если вам нужно добавить строку скидки, просто сначала создайте скидку (из поля «%s» в карте третьей стороны) и примените ее к счету.
+ErrorLinesCantBeNegativeForOneVATRate=Сумма строк (за вычетом налога) не может быть отрицательной для данной ненулевой ставки НДС (Найдена отрицательная сумма для ставки НДС <b> %s </b> %%).
+ErrorLinesCantBeNegativeOnDeposits=Строки не могут быть отрицательными в депозите. Вы столкнетесь с проблемами, когда вам нужно будет израсходовать залог в окончательном счете-фактуре, если вы это сделаете.
 ErrorQtyForCustomerInvoiceCantBeNegative=Количество строк в счетах клиента не может быть отрицательным
 ErrorWebServerUserHasNotPermission=Учетная запись пользователя <b>%s</b> используется для выполнения веб-сервер не имеет разрешения для этого
 ErrorNoActivatedBarcode=Нет штрих-кодов типа активированного
 ErrUnzipFails=Невозможно распаковать %s с помощью  ZipArchive
-ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
+ErrNoZipEngine=В этом PHP нет движка для архивирования / распаковки файла %s
 ErrorFileMustBeADolibarrPackage=Файл %s  должен быть архивом zip системы Dolibarr 
-ErrorModuleFileRequired=You must select a Dolibarr module package file
+ErrorModuleFileRequired=Вы должны выбрать файл пакета модуля Dolibarr
 ErrorPhpCurlNotInstalled=Модуль CURL для PHP  не установлен, он необходим для работы с PayPal
 ErrorFailedToAddToMailmanList=Невозможно добавить запись %s в список %s  системы Mailman или в базу  SPIP
 ErrorFailedToRemoveToMailmanList=Невозможно удалить  запись %s из  списка %s  системы Mailman или  базы  SPIP
 ErrorNewValueCantMatchOldValue=Новое значение не может быть равно старому
 ErrorFailedToValidatePasswordReset=Невозможно обновить пароль. Может быть, обновление пароля уже выполнено (так как вы использовали одноразовую ссылку). Если это не так, попробуйте обновить пароль ещё раз. 
-ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
+ErrorToConnectToMysqlCheckInstance=Не удается подключиться к базе данных. Убедитесь, что сервер базы данных запущен (например, с mysql / mariadb, вы можете запустить его из командной строки с помощью sudo service mysql start).
 ErrorFailedToAddContact=Ошибка при добавлении контакта
-ErrorDateMustBeBeforeToday=The date must be lower than today
-ErrorDateMustBeInFuture=The date must be greater than today
-ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setup of module Invoice was not completed to define information to show for this payment mode.
+ErrorDateMustBeBeforeToday=Дата должна быть ниже сегодняшней
+ErrorDateMustBeInFuture=Дата должна быть больше сегодняшней
+ErrorPaymentModeDefinedToWithoutSetup=Режим оплаты был установлен на тип %s, но настройка модуля «Счет-фактура» не была завершена для определения информации, отображаемой для этого режима оплаты.
 ErrorPHPNeedModule=Ошибка. Ваш PHP  должен иметь модуль <b>%s</b> для использования этой функции. 
-ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
+ErrorOpenIDSetupNotComplete=Вы настраиваете файл конфигурации Dolibarr, чтобы разрешить аутентификацию OpenID, но URL-адрес службы OpenID не определен как константа %s
 ErrorWarehouseMustDiffers=Исходящий и входящий склад должны отличаться
 ErrorBadFormat=Неправильный формат!
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any third party. Link member to an existing third party or create a new third party before creating subscription with invoice.
-ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
-ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank entry that was reconciled
-ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Paid
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Ошибка, этот участник еще не связан с какой-либо третьей стороной. Свяжите участника с существующей третьей стороной или создайте новую третью сторону перед созданием подписки с выставлением счета.
+ErrorThereIsSomeDeliveries=Ошибка, с этим отправлением связано несколько доставок. В удалении отказано.
+ErrorCantDeletePaymentReconciliated=Невозможно удалить платеж, по которому была произведена выверенная банковская запись.
+ErrorCantDeletePaymentSharedWithPayedInvoice=Невозможно удалить платеж, связанный хотя бы с одним счетом со статусом Оплачен.
 ErrorPriceExpression1=Невозможно назначить константой '%s'
 ErrorPriceExpression2=Невозможно задать заново встроенную функцию  '%s'
 ErrorPriceExpression3=Необъявленная переменная  '%s' в задании функции
@@ -159,142 +160,144 @@ ErrorPriceExpression5=Непредвиденный '%s'
 ErrorPriceExpression6=Неверное количество аргументов  (%s задано, %s ожидалось)
 ErrorPriceExpression8=Непредвиденные оператор '%s'
 ErrorPriceExpression9=Произошла неожиданная ошибка
-ErrorPriceExpression10=Operator '%s' lacks operand
-ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression10=У оператора %s отсутствует операнд
+ErrorPriceExpression11=Ожидается '%s'
 ErrorPriceExpression14=Деление на ноль
 ErrorPriceExpression17=Необъявленная переменная  '%s'
 ErrorPriceExpression19=Выражение не найдено
 ErrorPriceExpression20=Пустое выражение
 ErrorPriceExpression21=Пустой результат  '%s'
 ErrorPriceExpression22=Отрицательный результат  '%s'
-ErrorPriceExpression23=Unknown or non set variable '%s' in %s
-ErrorPriceExpression24=Variable '%s' exists but has no value
+ErrorPriceExpression23=Неизвестная или неустановленная переменная '%s' в %s
+ErrorPriceExpression24=Переменная %s существует, но не имеет значения
 ErrorPriceExpressionInternal=Внутренняя ошибка '%s'
 ErrorPriceExpressionUnknown=Неизвестная ошибка '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Исходящий и входящий склад должны отличаться
-ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on product '%s' requiring lot/serial information
-ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified (approved or denied) before being allowed to do this action
-ErrorCantSetReceptionToTotalDoneWithReceptionDenied=All recorded receptions must first be verified (approved) before being allowed to do this action
+ErrorTryToMakeMoveOnProductRequiringBatchData=Ошибка при попытке перемещения запаса без информации о партии / серийном номере для продукта «%s», требующего информации о партии / серийном номере.
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=Все записанные приемы должны быть сначала проверены (одобрены или отклонены), прежде чем им будет разрешено выполнить это действие.
+ErrorCantSetReceptionToTotalDoneWithReceptionDenied=Все записанные приемы должны быть сначала проверены (одобрены), прежде чем им будет разрешено выполнить это действие.
 ErrorGlobalVariableUpdater0=HTTP-запрос не удался, ошибка  '%s'
 ErrorGlobalVariableUpdater1=Неправильный формат JSON '%s'
 ErrorGlobalVariableUpdater2=Пропущен параметр '%s'
 ErrorGlobalVariableUpdater3=Запрашиваемые данные не найдены в результате
 ErrorGlobalVariableUpdater4=Ошибка SOAP-клиента '%s'
 ErrorGlobalVariableUpdater5=Не выбрана глобальная переменная
-ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
-ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
-ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter it's status.
-ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
-ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
-ErrorSavingChanges=An error has occurred when saving the changes
-ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
-ErrorFileMustHaveFormat=File must have format %s
-ErrorFilenameCantStartWithDot=Filename can't start with a '.'
-ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first.
-ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
-ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enough for product %s to add it into a new order.
-ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enough for product %s to add it into a new invoice.
-ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s to add it into a new shipment.
-ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
-ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
-ErrorModuleNotFound=File of module was not found.
-ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
-ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
-ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
-ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
-ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
-ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
-ErrorTaskAlreadyAssigned=Task already assigned to user
-ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
-ErrorModuleFileSeemsToHaveAWrongFormat2=At least one mandatory directory must exists into zip of module: <strong>%s</strong> or <strong>%s</strong>
-ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
-ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
-ErrorNoWarehouseDefined=Error, no warehouses defined.
-ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
-ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
-ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=Mass validation is not possible when option to increase/decrease stock is set on this action (you must validate one by one so you can define the warehouse to increase/decrease)
-ErrorObjectMustHaveStatusDraftToBeValidated=Object %s must have status 'Draft' to be validated.
-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.
-ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
-ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
-ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
-ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
-ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
-ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
-ErrorURLMustEndWith=URL %s must end %s
-ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
-ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
-ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
-ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
-ErrorSearchCriteriaTooSmall=Search criteria too small.
-ErrorObjectMustHaveStatusActiveToBeDisabled=Objects must have status 'Active' to be disabled
-ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Objects must have status 'Draft' or 'Disabled' to be enabled
-ErrorNoFieldWithAttributeShowoncombobox=No fields has property 'showoncombobox' into definition of object '%s'. No way to show the combolist.
-ErrorFieldRequiredForProduct=Field '%s' is required for product %s
-ProblemIsInSetupOfTerminal=Problem is in setup of terminal %s.
-ErrorAddAtLeastOneLineFirst=Add at least one line first
-ErrorRecordAlreadyInAccountingDeletionNotPossible=Error, record is already transferred in accounting, deletion is not possible.
-ErrorLanguageMandatoryIfPageSetAsTranslationOfAnother=Error, language is mandatory if you set the page as a translation of another one.
-ErrorLanguageOfTranslatedPageIsSameThanThisPage=Error, language of translated page is same than this one.
-ErrorBatchNoFoundForProductInWarehouse=No lot/serial found for product "%s" in warehouse "%s".
-ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=No enough quantity for this lot/serial for product "%s" in warehouse "%s".
-ErrorOnlyOneFieldForGroupByIsPossible=Only 1 field for the 'Group by' is possible (others are discarded)
-ErrorTooManyDifferentValueForSelectedGroupBy=Found too many different value (more than <b>%s</b>) for the field '<b>%s</b>', so we can't use it as a 'Group by' for graphics. The field 'Group By' has been removed. May be you wanted to use it as an X-Axis ?
-ErrorReplaceStringEmpty=Error, the string to replace into is empty
-ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
-ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
-ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
-ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<b> to allow use of Command Line Interface by the internal job scheduler
-ErrorLoginDateValidity=Error, this login is outside the validity date range
-ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
-ErrorReservedKeyword=The word '<b>%s</b>' is a reserved keyword
-ErrorNotAvailableWithThisDistribution=Not available with this distribution
-ErrorPublicInterfaceNotEnabled=Public interface was not enabled
-ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
-ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
-ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
-ErrorDateIsInFuture=Error, the date can't be in the future
-ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
-ErrorAPercentIsRequired=Error, please fill in the percentage correctly
-ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
+ErrorFieldMustBeANumeric=Поле <b> %s </b> должно быть числовым значением.
+ErrorMandatoryParametersNotProvided=Обязательные параметры не указаны
+ErrorOppStatusRequiredIfAmount=Вы устанавливаете приблизительную сумму для этого интереса. Таким образом, вы также должны ввести его статус.
+ErrorFailedToLoadModuleDescriptorForXXX=Не удалось загрузить класс дескриптора модуля для %s
+ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Плохое определение массива меню в дескрипторе модуля (неверное значение для ключа fk_menu)
+ErrorSavingChanges=Произошла ошибка при сохранении изменений
+ErrorWarehouseRequiredIntoShipmentLine=Требуется склад на линии для отправки
+ErrorFileMustHaveFormat=Файл должен иметь формат %s
+ErrorFilenameCantStartWithDot=Имя файла не может начинаться с символа "."
+ErrorSupplierCountryIsNotDefined=Страна для этого продавца не определена. Сначала исправьте это.
+ErrorsThirdpartyMerge=Не удалось объединить две записи. Запрос отменен.
+ErrorStockIsNotEnoughToAddProductOnOrder=Товара %s на складе недостаточно, чтобы добавить его в новый заказ.
+ErrorStockIsNotEnoughToAddProductOnInvoice=Товара %s недостаточно, чтобы добавить его в новый счет.
+ErrorStockIsNotEnoughToAddProductOnShipment=Товара %s на складе недостаточно, чтобы добавить его в новую партию.
+ErrorStockIsNotEnoughToAddProductOnProposal=Товара %s недостаточно, чтобы добавить его в новое предложение.
+ErrorFailedToLoadLoginFileForMode=Не удалось получить ключ входа для режима %s.
+ErrorModuleNotFound=Файл модуля не найден.
+ErrorFieldAccountNotDefinedForBankLine=Значение учетной записи учета не определено для идентификатора исходной строки %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Значение учетной записи учета не определено для идентификатора накладной %s (%s)
+ErrorFieldAccountNotDefinedForLine=Значение бухгалтерского счета не определено для строки (%s)
+ErrorBankStatementNameMustFollowRegex=Ошибка, имя банковской выписки должно соответствовать следующему правилу синтаксиса %s
+ErrorPhpMailDelivery=Убедитесь, что вы не используете слишком большое количество получателей и что ваше электронное письмо не похоже на спам. Также попросите администратора проверить файлы журналов брандмауэра и сервера для получения более полной информации.
+ErrorUserNotAssignedToTask=Пользователь должен быть назначен задаче, чтобы иметь возможность вводить затраченное время.
+ErrorTaskAlreadyAssigned=Задача уже назначена пользователю
+ErrorModuleFileSeemsToHaveAWrongFormat=Пакет модуля имеет неправильный формат.
+ErrorModuleFileSeemsToHaveAWrongFormat2=В zip-архиве модуля должен быть хотя бы один обязательный каталог: <strong> %s </strong> или <strong> %s </strong>
+ErrorFilenameDosNotMatchDolibarrPackageRules=Имя пакета модуля (<strong> %s </strong>) не соответствует ожидаемому синтаксису имени: <strong> %s a0a65dz071f6fc9c9
+ErrorDuplicateTrigger=Ошибка, повторяющееся имя триггера %s. Уже загружен с %s.
+ErrorNoWarehouseDefined=Ошибка, склады не определены.
+ErrorBadLinkSourceSetButBadValueForRef=Ссылка, которую вы используете, недействительна. «Источник» платежа определен, но значение «ref» недействительно.
+ErrorTooManyErrorsProcessStopped=Слишком много ошибок. Процесс остановлен.
+ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=Массовая проверка невозможна, если для этого действия задана опция увеличения / уменьшения запаса (вы должны подтверждать одну за другой, чтобы вы могли определить склад для увеличения / уменьшения)
+ErrorObjectMustHaveStatusDraftToBeValidated=Для проверки объект %s должен иметь статус «Черновик».
+ErrorObjectMustHaveLinesToBeValidated=У объекта %s должны быть строки для проверки.
+ErrorOnlyInvoiceValidatedCanBeSentInMassAction=С помощью массового действия «Отправить по электронной почте» можно отправлять только подтвержденные счета.
+ErrorChooseBetweenFreeEntryOrPredefinedProduct=Вы должны выбрать, является ли товар предопределенным продуктом или нет.
+ErrorDiscountLargerThanRemainToPaySplitItBefore=Скидка, которую вы пытаетесь применить, превышает сумму, которую вы должны заплатить. Перед этим разделите скидку на 2 меньшие скидки.
+ErrorFileNotFoundWithSharedLink=Файл не найден. Возможно, общий ключ был изменен или файл был недавно удален.
+ErrorProductBarCodeAlreadyExists=Штрих-код продукта %s уже существует на другой ссылке на продукт.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Также обратите внимание, что использование комплектов для автоматического увеличения / уменьшения количества субпродуктов невозможно, если хотя бы один субпродукт (или субпродукт субпродуктов) нуждается в серийном номере / номере партии.
+ErrorDescRequiredForFreeProductLines=Описание обязательно для строк с бесплатным продуктом
+ErrorAPageWithThisNameOrAliasAlreadyExists=Страница / контейнер <strong> %s </strong> имеет то же имя или альтернативный псевдоним, который вы пытаетесь использовать.
+ErrorDuringChartLoad=Ошибка при загрузке плана счетов. Если несколько учетных записей не были загружены, вы все равно можете ввести их вручную.
+ErrorBadSyntaxForParamKeyForContent=Неверный синтаксис параметра keyforcontent. Значение должно начинаться с %s или %s.
+ErrorVariableKeyForContentMustBeSet=Ошибка, необходимо установить константу с именем %s (с отображаемым текстовым содержимым) или %s (с отображаемым внешним URL-адресом).
+ErrorURLMustEndWith=URL-адрес %s должен заканчиваться как %s
+ErrorURLMustStartWithHttp=URL-адрес %s должен начинаться с http: // или https: //.
+ErrorHostMustNotStartWithHttp=Имя хоста %s НЕ должно начинаться с http: // или https: //.
+ErrorNewRefIsAlreadyUsed=Ошибка, новая ссылка уже используется
+ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Ошибка, удалить платеж, связанный с закрытым счетом-фактурой, невозможно.
+ErrorSearchCriteriaTooSmall=Критерии поиска слишком малы.
+ErrorObjectMustHaveStatusActiveToBeDisabled=Для отключения объекты должны иметь статус "Активный".
+ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Для включения объекты должны иметь статус "Черновик" или "Отключено".
+ErrorNoFieldWithAttributeShowoncombobox=Никакие поля не имеют свойства showoncombobox в определении объекта %s. Нет возможности показать комболиста.
+ErrorFieldRequiredForProduct=Поле '%s' необходимо для продукта %s
+ProblemIsInSetupOfTerminal=Проблема в настройке терминала %s.
+ErrorAddAtLeastOneLineFirst=Сначала добавьте хотя бы одну строку
+ErrorRecordAlreadyInAccountingDeletionNotPossible=Ошибка, запись уже перенесена в бухгалтерию, удаление невозможно.
+ErrorLanguageMandatoryIfPageSetAsTranslationOfAnother=Ошибка, язык является обязательным, если вы устанавливаете страницу как перевод другой.
+ErrorLanguageOfTranslatedPageIsSameThanThisPage=Ошибка, язык переведенной страницы такой же, как этот.
+ErrorBatchNoFoundForProductInWarehouse=На складе «%s» не найдено ни одной партии / серийного номера товара «%s».
+ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=Недостаточно количества для данной партии / серии для товара "%s" на складе "%s".
+ErrorOnlyOneFieldForGroupByIsPossible=Возможно только одно поле для "Группировать по" (остальные отбрасываются)
+ErrorTooManyDifferentValueForSelectedGroupBy=Обнаружено слишком много разных значений (более чем <b> %s </b>) для поля '<b> %s </b>', поэтому мы не можем использовать его в качестве графики 'a'. Поле «Группировать по» было удалено. Может быть, вы хотели использовать его как ось X?
+ErrorReplaceStringEmpty=Ошибка, строка для замены пуста
+ErrorProductNeedBatchNumber=Ошибка, продукту '<b> %s </b>' требуется партия / серийный номер
+ErrorProductDoesNotNeedBatchNumber=Ошибка, продукт '<b> %s </b>' не принимает лот / серийный номер
+ErrorFailedToReadObject=Ошибка, не удалось прочитать объект типа <b> %s </b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Ошибка, параметр <b> %s </b> должен быть включен в <b> conf / conf.php <b>, чтобы разрешить использование интерфейса командной строки внутренним планировщиком заданий
+ErrorLoginDateValidity=Ошибка, этот логин выходит за пределы диапазона дат срока действия.
+ErrorValueLength=Длина поля '<b> %s </b>' должна быть больше, чем '<b> %s </b>'
+ErrorReservedKeyword=Слово <b> %s </b> является зарезервированным ключевым словом.
+ErrorNotAvailableWithThisDistribution=Недоступно в этом дистрибутиве
+ErrorPublicInterfaceNotEnabled=Открытый интерфейс не был включен
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=Язык новой страницы должен быть определен, если он установлен как перевод другой страницы.
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=Язык новой страницы не должен быть языком источника, если он установлен как перевод другой страницы.
+ErrorAParameterIsRequiredForThisOperation=Параметр обязателен для этой операции
+ErrorDateIsInFuture=Ошибка, дата не может быть в будущем
+ErrorAnAmountWithoutTaxIsRequired=Ошибка, сумма обязательна
+ErrorAPercentIsRequired=Ошибка, введите процентное значение правильно
+ErrorYouMustFirstSetupYourChartOfAccount=Вы должны сначала настроить свой план счета
+ErrorFailedToFindEmailTemplate=Не удалось найти шаблон с кодовым названием %s
 
 # Warnings
-WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
-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=Click here to setup mandatory parameters
-WarningEnableYourModulesApplications=Click here to enable your modules and applications
+WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Ваш параметр PHP upload_max_filesize (%s) выше, чем параметр PHP post_max_size (%s). Это непоследовательная установка.
+WarningPasswordSetWithNoAccount=Для этого участника был установлен пароль. Однако учетная запись пользователя не была создана. Таким образом, этот пароль сохраняется, но не может использоваться для входа в Dolibarr. Он может использоваться внешним модулем / интерфейсом, но если вам не нужно определять логин или пароль для члена, вы можете отключить опцию «Управлять логином для каждого члена» в настройках модуля «Член». Если вам нужно управлять логином, но пароль не нужен, вы можете оставить это поле пустым, чтобы избежать появления этого предупреждения. Примечание. Электронная почта также может использоваться в качестве логина, если член связан с пользователем.
+WarningMandatorySetupNotComplete=Нажмите здесь, чтобы настроить обязательные параметры
+WarningEnableYourModulesApplications=Щелкните здесь, чтобы включить свои модули и приложения
 WarningSafeModeOnCheckExecDir=Предупреждение, PHP <b>safe_mode</b> вариант находится на так команда должна храниться в каталог заявил на PHP <b>safe_mode_exec_dir</b> параметра.
 WarningBookmarkAlreadyExists=Закладка этого титула или этой цели (URL), уже существует.
 WarningPassIsEmpty=Внимание, базы данных пароль пуст. Это дыра в безопасности. Вы должны добавить пароль к вашей базе данных и изменить свой conf.php файл, чтобы отразить это.
 WarningConfFileMustBeReadOnly=Внимание, ваш конфигурационный файл <b>(htdocs / CONF / conf.php)</b> может быть переписан на веб-сервере. Это серьезная дыра в безопасности. Изменение разрешений на файл находится в режиме только для чтения для операционной системы пользователя используется веб-сервер. Если вы используете Windows FAT и формат для Вашего диска, вы должны знать, что эта файловая система не позволяет добавить разрешения на файл, поэтому не может быть полностью безопасным.
 WarningsOnXLines=Предупреждения об источнике <b>%s</b> линий
-WarningNoDocumentModelActivated=No model, for document generation, has been activated. A model will be chosen by default until you check your module setup.
-WarningLockFileDoesNotExists=Warning, once setup is finished, you must disable the installation/migration tools by adding a file <b>install.lock</b> into directory <b>%s</b>. Omitting the creation of this file is a grave security risk.
-WarningUntilDirRemoved=All security warnings (visible by admin users only) will remain active as long as the vulnerability is present (or that constant MAIN_REMOVE_INSTALL_WARNING is added in Setup->Other Setup).
-WarningCloseAlways=Warning, closing is done even if amount differs between source and target elements. Enable this feature with caution.
-WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all pages showing the box.
-WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card).
+WarningNoDocumentModelActivated=Никакая модель для создания документа не была активирована. Модель будет выбрана по умолчанию, пока вы не проверите настройки своего модуля.
+WarningLockFileDoesNotExists=Внимание! После завершения установки необходимо отключить инструменты установки / миграции, добавив файл <b> install.lock </b> в каталог <b> %s </b>. Отсутствие создания этого файла представляет серьезную угрозу безопасности.
+WarningUntilDirRemoved=Все предупреждения системы безопасности (видимые только администраторами) будут оставаться активными, пока присутствует уязвимость (или эта константа MAIN_REMOVE_INSTALL_WARNING добавлена в Setup-> Other Setup).
+WarningCloseAlways=Предупреждение, закрытие выполняется, даже если количество различается между исходными и целевыми элементами. С осторожностью включайте эту функцию.
+WarningUsingThisBoxSlowDown=Предупреждение, использование этого окна серьезно замедлит все страницы, на которых отображается это окно.
+WarningClickToDialUserSetupNotComplete=Настройка информации ClickToDial для вашего пользователя не завершена (см. Вкладку ClickToDial на карточке пользователя).
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Функция отключена, когда отображение оадптировано для слабовидящих или текстовых браузеров. 
 WarningPaymentDateLowerThanInvoiceDate=Дата платежа (%s)  раньше, чем дата  (%s)  счёта  %s.
-WarningTooManyDataPleaseUseMoreFilters=Too many data (more than %s lines). Please use more filters or set the constant %s to a higher limit.
-WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while their hourly rate was not defined. A value of 0 %s per hour was used but this may result in wrong valuation of time spent.
-WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
-WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
-WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the mass actions on lists
-WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
-WarningProjectDraft=Project is still in draft mode. Don't forget to validate it if you plan to use tasks.
-WarningProjectClosed=Project is closed. You must re-open it first.
-WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were removed after that the receipt including them were generated. So nb of cheques and total of receipt may differ from number and total in list.
-WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into ECM database index table
-WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
-WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
-WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
-WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
-ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
-ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
-CheckVersionFail=Version check fail
+WarningTooManyDataPleaseUseMoreFilters=Слишком много данных (больше строк %s). Используйте больше фильтров или установите для константы %s более высокий предел.
+WarningSomeLinesWithNullHourlyRate=Несколько раз были записаны некоторыми пользователями, когда их почасовая ставка не была определена. Было использовано значение 0 %s в час, но это может привести к неправильной оценке затраченного времени.
+WarningYourLoginWasModifiedPleaseLogin=Ваш логин был изменен. В целях безопасности вам нужно будет войти в систему с новым логином перед следующим действием.
+WarningAnEntryAlreadyExistForTransKey=Запись для ключа перевода для этого языка уже существует.
+WarningNumberOfRecipientIsRestrictedInMassAction=Внимание, количество разных получателей ограничено <b> %s </b> при использовании массовых действий в списках
+WarningDateOfLineMustBeInExpenseReportRange=Внимание, дата строки не входит в диапазон отчета о расходах.
+WarningProjectDraft=Проект все еще находится в черновом режиме. Не забудьте проверить его, если планируете использовать задачи.
+WarningProjectClosed=Проект закрыт. Вы должны сначала открыть его заново.
+WarningSomeBankTransactionByChequeWereRemovedAfter=Некоторые банковские транзакции были удалены, после чего были сгенерированы квитанции, в которых они были. Таким образом, количество чеков и сумма чека могут отличаться от количества и суммы в списке.
+WarningFailedToAddFileIntoDatabaseIndex=Предупреждение, не удалось добавить запись файла в таблицу индекса базы данных ECM
+WarningTheHiddenOptionIsOn=Внимание, скрытый параметр <b> %s </b> включен.
+WarningCreateSubAccounts=Предупреждение, вы не можете напрямую создать дополнительную учетную запись, вы должны создать третье лицо или пользователя и назначить им учетный код, чтобы найти их в этом списке.
+WarningAvailableOnlyForHTTPSServers=Доступно только при использовании защищенного соединения HTTPS.
+WarningModuleXDisabledSoYouMayMissEventHere=Модуль %s не включен. Так что вы можете пропустить здесь много мероприятий.
+ErrorActionCommPropertyUserowneridNotDefined=Требуется владелец пользователя
+ErrorActionCommBadType=Выбранный тип события (идентификатор: %n, код: %s) не существует в словаре типов событий
+CheckVersionFail=Ошибка проверки версии
+ErrorWrongFileName=Имя файла не может содержать __SOMETHING__
diff --git a/htdocs/langs/ru_RU/eventorganization.lang b/htdocs/langs/ru_RU/eventorganization.lang
index 4d15915a606..9c56b96eedc 100644
--- a/htdocs/langs/ru_RU/eventorganization.lang
+++ b/htdocs/langs/ru_RU/eventorganization.lang
@@ -1,4 +1,5 @@
 # Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+# Copyright (C) 2021		Dorian Vabre			<dorian.vabre@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
@@ -16,86 +17,127 @@
 #
 # Generic
 #
-ModuleEventOrganizationName = Event Organization
-EventOrganizationDescription = Event Organization through Module Project
-EventOrganizationDescriptionLong= Manage Event organization for conference, attendees, speaker, and attendees, with public subcription page
+ModuleEventOrganizationName = Организация мероприятий
+EventOrganizationDescription = Организация мероприятий через модульный проект
+EventOrganizationDescriptionLong= Управляйте организацией мероприятий для конференции, участников, докладчика и посетителей с помощью общедоступной страницы подписки
 #
 # Menu
 #
-EventOrganizationMenuLeft = Organized events
-EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
+EventOrganizationMenuLeft = Организованные мероприятия
+EventOrganizationConferenceOrBoothMenuLeft = Конференция или стенд
 
 #
 # Admin page
 #
-EventOrganizationSetup = Event Organization setup
+EventOrganizationSetup = Настройка организации мероприятий
 Settings = Настройки
-EventOrganizationSetupPage = Event Organization setup page
-EVENTORGANIZATION_TASK_LABEL = Label of tasks to create automatically when project is validated
-EVENTORGANIZATION_TASK_LABELTooltip = When you validate an organized event, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conference<br>Send Call for Booth<br>Receive call for conferences<br>Receive call for Booth<br>Open subscriptions to events for attendees<br>Send remind of event to speakers<br>Send remind of event to Booth hoster<br>Send remind of event to attendees
-EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties automatically created when someone suggests a conference
-EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Category to add to third-parties automatically created when they suggests a booth
-EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Template of email to send after receiving a suggestion of a conference.
-EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Template of email to send after receiving a suggestion of a booth.
-EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Template of email to send  after a subscription to a booth has been paid.
-EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Template of email to send after a subscription to an event has been paid.
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Template of email of massaction to attendes
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
-EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+EventOrganizationSetupPage = Страница настройки организации мероприятий
+EVENTORGANIZATION_TASK_LABEL = Ярлык задач, которые создаются автоматически при утверждении проекта.
+EVENTORGANIZATION_TASK_LABELTooltip = Когда вы проверяете организованное мероприятие, некоторые задачи могут быть автоматически созданы в проекте <br> <br> Например: <br> Отправить вызов на конференцию <br> Отправить вызов на конференцию <br> Отправить вызов на конференцию a0342fccfda19bzcc0342fccfda19bzccOpen0343 напоминание о мероприятии докладчикам <br> Отправить напоминание о мероприятии организатору стенда <br> Отправить напоминание о мероприятии участникам
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Категория для добавления к третьим сторонам автоматически создается, когда кто-то предлагает конференцию
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Категория для добавления к сторонним лицам автоматически создается, когда они предлагают стенд
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Шаблон электронного письма для отправки после получения предложения о конференции.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Шаблон электронного письма для отправки после получения предложения о кабине.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Шаблон электронного письма для отправки после оплаты подписки на киоск.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Шаблон электронного письма для отправки после оплаты подписки на мероприятие.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Шаблон письма с массовым обращением к участникам
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Шаблон письма с массовым письмом спикерам
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Фильтрация списка выбора третьей стороны в карточке / форме создания участников с категорией
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Фильтрация списка выбора третьей стороны в карточке / форме создания участников с указанием типа клиента
 
 #
 # Object
 #
-EventOrganizationConfOrBooth= Conference Or Booth
-ManageOrganizeEvent = Manage event organisation
-ConferenceOrBooth = Conference Or Booth
-ConferenceOrBoothTab = Conference Or Booth
-AmountOfSubscriptionPaid = Amount of subscription paid
-DateSubscription = Date of subscription
-ConferenceOrBoothAttendee = Conference Or Booth Attendee
+EventOrganizationConfOrBooth= Конференция или стенд
+ManageOrganizeEvent = Управляйте организацией мероприятий
+ConferenceOrBooth = Конференция или стенд
+ConferenceOrBoothTab = Конференция или стенд
+AmountOfSubscriptionPaid = Сумма оплаченной подписки
+DateSubscription = Дата подписки
+ConferenceOrBoothAttendee = Участник конференции или стенда
 
 #
 # Template Mail
 #
-YourOrganizationEventConfRequestWasReceived = Your request for conference was received
-YourOrganizationEventBoothRequestWasReceived = Your request for booth was received
-EventOrganizationEmailAskConf = Request for conference
-EventOrganizationEmailAskBooth = Request for booth
-EventOrganizationEmailSubsBooth = Subscription for booth
-EventOrganizationEmailSubsEvent = Subscription for an event
-EventOrganizationMassEmailAttendees = Communication to attendees
-EventOrganizationMassEmailSpeakers = Communication to speakers
+YourOrganizationEventConfRequestWasReceived = Ваш запрос на конференцию получен
+YourOrganizationEventBoothRequestWasReceived = Ваш запрос на стенд был получен
+EventOrganizationEmailAskConf = Запрос на конференцию
+EventOrganizationEmailAskBooth = Запрос на стенд
+EventOrganizationEmailSubsBooth = Подписка на стенд
+EventOrganizationEmailSubsEvent = Подписка на мероприятие
+EventOrganizationMassEmailAttendees = Общение с участниками
+EventOrganizationMassEmailSpeakers = Общение со спикерами
 
 #
 # Event
 #
-AllowUnknownPeopleSuggestConf=Allow unknown people to suggest conferences
-AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest conferences
-AllowUnknownPeopleSuggestBooth=Allow unknown people to suggest booth
-AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to suggest booth
-PriceOfRegistration=Price of registration
-PriceOfRegistrationHelp=Price of registration
-PriceOfBooth=Subscription price to stand a booth
-PriceOfBoothHelp=Subscription price to stand a booth
-EventOrganizationICSLink=Link ICS for events
-ConferenceOrBoothInformation=Conference Or Booth informations
-Attendees = Attendees
-EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+AllowUnknownPeopleSuggestConf=Разрешить неизвестным людям предлагать конференции
+AllowUnknownPeopleSuggestConfHelp=Разрешить неизвестным людям предлагать конференции
+AllowUnknownPeopleSuggestBooth=Разрешить неизвестным людям предлагать будку
+AllowUnknownPeopleSuggestBoothHelp=Разрешить неизвестным людям предлагать будку
+PriceOfRegistration=Стоимость регистрации
+PriceOfRegistrationHelp=Стоимость регистрации
+PriceOfBooth=Стоимость подписки на стенд
+PriceOfBoothHelp=Стоимость подписки на стенд
+EventOrganizationICSLink=Свяжите ICS для событий
+ConferenceOrBoothInformation=Информация о конференции или стенде
+Attendees = Участники
+DownloadICSLink = Ссылка для скачивания ICS
+EVENTORGANIZATION_SECUREKEY = Защищенный ключ общедоступной регистрационной ссылки на конференцию
+SERVICE_BOOTH_LOCATION = Услуга, используемая для строки счета-фактуры о местонахождении стенда
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Служба, используемая для строки счета-фактуры о подписке участника на конференцию
 #
 # Status
 #
 EvntOrgDraft = Проект
-EvntOrgSuggested = Suggested
-EvntOrgConfirmed = Confirmed
-EvntOrgNotQualified = Not Qualified
+EvntOrgSuggested = Предложенный
+EvntOrgConfirmed = Подтвержденный
+EvntOrgNotQualified = Неквалифицированный
 EvntOrgDone = Завершены
-EvntOrgCancelled = Cancelled
+EvntOrgCancelled = Отменено
 #
 # Public page
 #
-PublicAttendeeSubscriptionPage = Public link of registration to a conference
-MissingOrBadSecureKey = The security key is invalid or missing
-EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
-EvntOrgStartDuration = This conference starts on
-EvntOrgEndDuration =  and ends on
+SuggestForm = Страница предложений
+RegisterPage = Страница для конференций или стенда
+EvntOrgRegistrationHelpMessage = Здесь вы можете проголосовать за то или иное мероприятие, предложить новую конференцию или стенд для проекта
+EvntOrgRegistrationConfHelpMessage = Здесь вы можете предложить новую конференцию для проекта
+EvntOrgRegistrationBoothHelpMessage = Здесь вы можете предложить новый стенд для проекта
+ListOfSuggestedConferences = Список предлагаемых конференций
+ListOfSuggestedBooths = Список предлагаемых стендов
+SuggestConference = Предложить новую конференцию
+SuggestBooth = Предложить стенд
+ViewAndVote = Просмотр и голосование за предложенные мероприятия
+PublicAttendeeSubscriptionPage = Публичная ссылка для регистрации на конференцию
+MissingOrBadSecureKey = Электронный ключ недействителен или отсутствует
+EvntOrgWelcomeMessage = Эта форма позволяет вам зарегистрироваться в качестве нового участника конференции: '%s'
+EvntOrgDuration = Конференция начинается %s и заканчивается %s.
+ConferenceAttendeeFee = Плата за участие в конференции: «%s», происходящая от %s до %s.
+BoothLocationFee = Место расположения стенда для события : '%s' происходящего с %s до %s
+EventType = Тип события
+
+#
+# Vote page
+#
+EvntOrgRegistrationWelcomeMessage = Добро пожаловать на страницу предложений конференции или стенда.
+EvntOrgRegistrationConfWelcomeMessage = Добро пожаловать на страницу предложений по проведению конференции.
+EvntOrgRegistrationBoothWelcomeMessage = Добро пожаловать на страницу стенда предложений.
+EvntOrgVoteHelpMessage = Здесь вы можете просмотреть и проголосовать за предлагаемые мероприятия для проекта.
+VoteOk = Ваш голос был принят.
+AlreadyVoted = Вы уже проголосовали за это событие.
+VoteError = Произошла ошибка во время голосования, попробуйте еще раз.
+
+#
+# SubscriptionOk page
+#
+SubscriptionOk = Ваша подписка на эту конференцию подтверждена
+#
+# Subscription validation mail
+#
+ConfAttendeeSubscriptionConfirmation = Подтверждение подписки на конференцию
+#
+# Payment page
+#
+Attendee = Участник
+PaymentConferenceAttendee = Оплата участникам конференции
+PaymentBoothLocation = Оплата места стенда
diff --git a/htdocs/langs/ru_RU/exports.lang b/htdocs/langs/ru_RU/exports.lang
index 5fbbcfd4665..144e97bd0bc 100644
--- a/htdocs/langs/ru_RU/exports.lang
+++ b/htdocs/langs/ru_RU/exports.lang
@@ -1,61 +1,61 @@
 # Dolibarr language file - Source file is en_US - exports
 ExportsArea=Экспорт
-ImportArea=Import
-NewExport=New Export
-NewImport=New Import
+ImportArea=Импортировать
+NewExport=Новый экспорт
+NewImport=Новый импорт
 ExportableDatas=Экспортировать данные
 ImportableDatas=ИМПОРТИРОВАННАЯ данных
 SelectExportDataSet=Выберите набор данных вы хотите экспортировать ...
 SelectImportDataSet=Выбор данных, вы хотите импортировать ...
-SelectExportFields=Choose the fields you want to export, or select a predefined export profile
-SelectImportFields=Choose the source file fields you want to import and their target field in database by moving them up and down with anchor %s, or select a predefined import profile:
+SelectExportFields=Выберите поля, которые вы хотите экспортировать, или выберите предварительно определенный профиль экспорта.
+SelectImportFields=Выберите поля исходного файла, которые вы хотите импортировать, и их целевое поле в базе данных, перемещая их вверх и вниз с помощью привязки %s, или выберите предопределенный профиль импорта:
 NotImportedFields=Области исходный файл не импортируется
-SaveExportModel=Save your selections as an export profile/template (for reuse).
-SaveImportModel=Save this import profile (for reuse) ...
+SaveExportModel=Сохраните свой выбор как профиль / шаблон экспорта (для повторного использования).
+SaveImportModel=Сохраните этот профиль импорта (для повторного использования) ...
 ExportModelName=Экспорт имя профиля
-ExportModelSaved=Export profile saved as <b>%s</b>.
+ExportModelSaved=Профиль экспорта сохранен как <b> %s </b>.
 ExportableFields=Экспортируемых полей
 ExportedFields=Экспортируемые поля
 ImportModelName=Импорт имя профиля
-ImportModelSaved=Import profile saved as <b>%s</b>.
+ImportModelSaved=Профиль импорта сохранен как <b> %s </b>.
 DatasetToExport=Dataset экспорта
 DatasetToImport=Набор данных для импорта
 ChooseFieldsOrdersAndTitle=Выбрать поля порядке ...
 FieldsTitle=Поля заголовка
 FieldTitle=Поле название
-NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
-AvailableFormats=Available Formats
+NowClickToGenerateToBuildExportFile=Теперь выберите формат файла в поле со списком и нажмите «Создать», чтобы создать файл экспорта ...
+AvailableFormats=Доступные форматы
 LibraryShort=Библиотека
-ExportCsvSeparator=Csv caracter separator
-ImportCsvSeparator=Csv caracter separator
+ExportCsvSeparator=Сепаратор csv caracter
+ImportCsvSeparator=Сепаратор csv caracter
 Step=Шаг
-FormatedImport=Import Assistant
-FormatedImportDesc1=This module allows you to update existing data or add new objects into the database from a file without technical knowledge, using an assistant.
-FormatedImportDesc2=First step is to choose the kind of data you want to import, then the format of the source file, then the fields you want to import.
-FormatedExport=Export Assistant
-FormatedExportDesc1=These tools allow the export of personalized data using an assistant, to help you in the process without requiring technical knowledge.
-FormatedExportDesc2=First step is to choose a predefined dataset, then which fields you want to export, and in which order.
-FormatedExportDesc3=When data to export are selected, you can choose the format of the output file.
+FormatedImport=Помощник по импорту
+FormatedImportDesc1=Этот модуль позволяет обновлять существующие данные или добавлять новые объекты в базу данных из файла без технических знаний с помощью помощника.
+FormatedImportDesc2=Первый шаг - выбрать тип данных, которые вы хотите импортировать, затем формат исходного файла, а затем поля, которые вы хотите импортировать.
+FormatedExport=Помощник по экспорту
+FormatedExportDesc1=Эти инструменты позволяют экспортировать персонализированные данные с помощью помощника, который поможет вам в этом процессе, не требуя технических знаний.
+FormatedExportDesc2=Первый шаг - выбрать предопределенный набор данных, а затем, какие поля вы хотите экспортировать и в каком порядке.
+FormatedExportDesc3=Когда данные для экспорта выбраны, вы можете выбрать формат выходного файла.
 Sheet=Лист
 NoImportableData=Нет данных ввозимый (без модуля с определениями разрешить импорт данных)
-FileSuccessfullyBuilt=File generated
-SQLUsedForExport=SQL Request used to extract data
+FileSuccessfullyBuilt=Файл создан
+SQLUsedForExport=SQL-запрос, используемый для извлечения данных
 LineId=Идентификатор строки
-LineLabel=Label of line
+LineLabel=Этикетка линии
 LineDescription=Описание строки
 LineUnitPrice=Цена за единицу линии
 LineVATRate=Ставка НДС в строке
 LineQty=Кол-во в строке
-LineTotalHT=Amount excl. tax for line
+LineTotalHT=Сумма искл. налог на линию
 LineTotalTTC=Сумма налога с на линию
 LineTotalVAT=Сумма налога на добавленную стоимость по строке
 TypeOfLineServiceOrProduct=Тип линии (0= продукт, услуга 1=)
 FileWithDataToImport=Файл с данными для импорта
 FileToImport=Исходный файл для импорта
-FileMustHaveOneOfFollowingFormat=File to import must have one of following formats
-DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
-ChooseFormatOfFileToImport=Choose the file format to use as import file format by clicking on the %s icon to select it...
-ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
+FileMustHaveOneOfFollowingFormat=Файл для импорта должен иметь один из следующих форматов
+DownloadEmptyExample=Скачать файл шаблона с информацией о содержимом поля (* обязательные поля)
+ChooseFormatOfFileToImport=Выберите формат файла для использования в качестве формата файла импорта, щелкнув значок %s, чтобы выбрать его ...
+ChooseFileToImport=Загрузите файл, затем щелкните значок %s, чтобы выбрать файл в качестве исходного файла импорта ...
 SourceFileFormat=Формат исходного файла
 FieldsInSourceFile=Поля в исходном файле
 FieldsInTargetDatabase=Целевые поля в БД системы Dolibarr  (жирным - обязательные)
@@ -70,67 +70,67 @@ FieldsTarget=Целевые поля
 FieldTarget=Целевые области
 FieldSource=Источник области
 NbOfSourceLines=Количество строк в исходном файле
-NowClickToTestTheImport=Check that the file format (field and string delimiters) of your file matches the options shown and that you have omitted the header line, or these will be flagged as errors in the following simulation.<br>Click on the "<b>%s</b>" button to run a check of the file structure/contents and simulate the import process.<br><b>No data will be changed in your database</b>.
-RunSimulateImportFile=Run Import Simulation
-FieldNeedSource=This field requires data from the source file
+NowClickToTestTheImport=Убедитесь, что формат файла (разделители полей и строк) вашего файла соответствует показанным параметрам и что вы пропустили строку заголовка, или они будут отмечены как ошибки в следующем моделировании. <br> Нажмите кнопку «<b> %s </b>», чтобы запустить проверку структуры / содержимого файла и смоделировать процесс импорта. <br> <b> Никакие данные не будут изменены в вашей базе данных </b>.
+RunSimulateImportFile=Запустить моделирование импорта
+FieldNeedSource=Это поле требует данных из исходного файла
 SomeMandatoryFieldHaveNoSource=Некоторые обязательные поля не имеют источника из файла данных
 InformationOnSourceFile=Информация об исходном файле
 InformationOnTargetTables=Информация о целевых полей
 SelectAtLeastOneField=Switch по крайней мере один источник поля в колонке полей для экспорта
 SelectFormat=Выберите этот формат файла для импорта
-RunImportFile=Import Data
-NowClickToRunTheImport=Check the results of the import simulation. Correct any errors and re-test.<br>When the simulation reports no errors you may proceed to import the data into the database.
-DataLoadedWithId=The imported data will have an additional field in each database table with this import id: <b>%s</b>, to allow it to be searchable in the case of investigating a problem related to this import.
-ErrorMissingMandatoryValue=Mandatory data is empty in the source file for field <b>%s</b>.
-TooMuchErrors=There are still <b>%s</b> other source lines with errors but output has been limited.
-TooMuchWarnings=There are still <b>%s</b> other source lines with warnings but output has been limited.
+RunImportFile=Импортировать данные
+NowClickToRunTheImport=Проверьте результаты моделирования импорта. Исправьте все ошибки и повторите тест. <br> Когда моделирование не сообщает об ошибках, вы можете приступить к импорту данных в базу данных.
+DataLoadedWithId=Импортированные данные будут иметь дополнительное поле в каждой таблице базы данных с этим идентификатором импорта: <b> %s </b>, чтобы их можно было найти в случае исследования проблемы, связанной с этим импортом.
+ErrorMissingMandatoryValue=Обязательные данные для поля <b> %s </b> в исходном файле пусты.
+TooMuchErrors=Есть еще <b> %s </b> другие исходные строки с ошибками, но вывод был ограничен.
+TooMuchWarnings=Есть еще <b> %s </b> другие исходные строки с предупреждениями, но вывод был ограничен.
 EmptyLine=Пустые строки (будет использоваться)
-CorrectErrorBeforeRunningImport=You <b>must</b> correct all errors <b>before</b> running the definitive import.
+CorrectErrorBeforeRunningImport=Вы <b> должны </b> исправить все ошибки <b> до того, как </b> запустит окончательный импорт.
 FileWasImported=Файл был импортирован с номером <b>%s.</b>
-YouCanUseImportIdToFindRecord=You can find all the imported records in your database by filtering on field <b>import_key='%s'</b>.
+YouCanUseImportIdToFindRecord=Вы можете найти все импортированные записи в своей базе данных, отфильтровав поле <b> import_key = '%s' </b>.
 NbOfLinesOK=Количество строк, без ошибок и предупреждений нет: <b>%s.</b>
 NbOfLinesImported=Количество линий успешно импортированы: <b>%s.</b>
 DataComeFromNoWhere=Соотношение вставить приходит из ниоткуда в исходном файле.
 DataComeFromFileFieldNb=Соотношение вставить происходит от области число <b>%s</b> в исходном файле.
-DataComeFromIdFoundFromRef=Value that comes from field number <b>%s</b> of source file will be used to find the id of the parent object to use (so the object <b>%s</b> that has the ref. from source file must exist in the database).
-DataComeFromIdFoundFromCodeId=Code that comes from field number <b>%s</b> of source file will be used to find the id of the parent object to use (so the code from source file must exist in the dictionary <b>%s</b>). Note that if you know the id, you can also use it in the source file instead of the code. Import should work in both cases.
+DataComeFromIdFoundFromRef=Значение, полученное из поля с номером <b> %s </b> исходного файла, будет использоваться для поиска идентификатора родительского объекта, который будет использоваться (так что объект <b> %s a09a должен существовать в базе данных из файла. Ref.
+DataComeFromIdFoundFromCodeId=Код, полученный из поля номер <b>%s</b> исходного файла, будет использован для поиска id родительского объекта (поэтому код из исходного файла должен существовать в словаре <b>%s</b>). Обратите внимание, что если вы знаете id, вы также можете использовать его в исходном файле вместо кода. Импорт должен работать в обоих случаях.
 DataIsInsertedInto=Данные поступившие от исходного файла будет вставлено в следующее поле:
-DataIDSourceIsInsertedInto=The id of parent object was found using the data in the source file, will be inserted into the following field:
+DataIDSourceIsInsertedInto=Идентификатор родительского объекта, найденный с использованием данных в исходном файле, будет вставлен в следующее поле:
 DataCodeIDSourceIsInsertedInto=Идентификатор материнской линии обнаружил в коде, будут включены в следующее поле:
 SourceRequired=Данные значения является обязательным
 SourceExample=Пример возможных значений данных
 ExampleAnyRefFoundIntoElement=Любая ссылка на элемент найден <b>%s</b>
 ExampleAnyCodeOrIdFoundIntoDictionary=Код (или ID) найден в словаре в словаре <b>%s</b>
-CSVFormatDesc=<b>Comma Separated Value</b> file format (.csv).<br>This is a text file format where fields are separated by a separator [ %s ]. If separator is found inside a field content, field is rounded by round character [ %s ]. Escape character to escape round character is [ %s ].
-Excel95FormatDesc=<b>Excel</b> file format (.xls)<br>This is the native Excel 95 format (BIFF5).
-Excel2007FormatDesc=<b>Excel</b> file format (.xlsx)<br>This is the native Excel 2007 format (SpreadsheetML).
-TsvFormatDesc=<b>Tab Separated Value</b> file format (.tsv)<br>This is a text file format where fields are separated by a tabulator [tab].
-ExportFieldAutomaticallyAdded=Field <b>%s</b> was automatically added. It will avoid you to have similar lines to be treated as duplicate record (with this field added, all lines will own their own id and will differ).
-CsvOptions=CSV format options
-Separator=Field Separator
-Enclosure=String Delimiter
-SpecialCode=Special code
-ExportStringFilter=%% allows replacing one or more characters in the text
-ExportDateFilter=YYYY, YYYYMM, YYYYMMDD: filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD: filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD: filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD: filters on all previous years/months/days
-ExportNumericFilter=NNNNN filters by one value<br>NNNNN+NNNNN filters over a range of values<br>< NNNNN filters by lower values<br>> NNNNN filters by higher values
-ImportFromLine=Import starting from line number
-EndAtLineNb=End at line number
-ImportFromToLine=Limit range (From - To). Eg. to omit header line(s).
-SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines.<br>If the header lines are NOT omitted, this will result in multiple errors in the Import Simulation.
-KeepEmptyToGoToEndOfFile=Keep this field empty to process all lines to the end of the file.
-SelectPrimaryColumnsForUpdateAttempt=Select column(s) to use as primary key for an UPDATE import
-UpdateNotYetSupportedForThisImport=Update is not supported for this type of import (only insert)
-NoUpdateAttempt=No update attempt was performed, only insert
-ImportDataset_user_1=Users (employees or not) and properties
+CSVFormatDesc= <b> Значение, разделенное запятыми. Формат файла </b> (.csv). <br> Это формат текстового файла, в котором поля разделены разделителем [%s]. Если разделитель находится внутри содержимого поля, поле округляется до символа округления [%s]. Экранирующий символ для экранирования круглого символа - [%s].
+Excel95FormatDesc= <b> Формат файла Excel </b> (.xls) <br> Это собственный формат Excel 95 (BIFF5).
+Excel2007FormatDesc= <b> Формат файла Excel </b> (.xlsx) <br> Это собственный формат Excel 2007 (SpreadsheetML).
+TsvFormatDesc= <b> Значение, разделенное табуляцией </b> Формат файла (.tsv) <br> Это формат текстового файла, в котором поля разделены табулятором [табуляция].
+ExportFieldAutomaticallyAdded=Поле <b> %s </b> было добавлено автоматически. Это позволит избежать того, чтобы похожие строки обрабатывались как повторяющаяся запись (с добавлением этого поля все строки будут иметь свой собственный идентификатор и будут отличаться).
+CsvOptions=Параметры формата CSV
+Separator=Разделитель полей
+Enclosure=Разделитель строк
+SpecialCode=Специальный код
+ExportStringFilter=%% позволяет заменять один или несколько символов в тексте
+ExportDateFilter=YYYY, ГГГГММЫ, YYYYMMDD: фильтры на один год / месяц / день <br> YYYY + YYYY, ГГГГММЫ + ГГГГММЫ ГГГГММДД + YYYYMMDD: фильтры в течение целого ряда лет / месяцев / дней <br>> YYYY,> ГГГГММЫ,> YYyyMmDd: фильтры на все следующие годы / месяцы / дни <br> <ГГГГ, <ГГГГММ, <ГГГГММДД: фильтрует все предыдущие годы / месяцы / дни
+ExportNumericFilter=NNNNN фильтрует по одному значению <br> NNNNN + NNNNN фильтрует по диапазону значений <br> <NNNNN фильтрует по более низким значениям <br>> NNNNN фильтрует по более высоким значениям
+ImportFromLine=Импорт, начиная с номера строки
+EndAtLineNb=Конец на номере строки
+ImportFromToLine=Диапазон пределов (От - До). Например. чтобы опустить строку (и) заголовка.
+SetThisValueTo2ToExcludeFirstLine=Например, установите это значение на 3, чтобы исключить 2 первые строки. <br> Если строки заголовка НЕ опущены, это приведет к множественным ошибкам в моделировании импорта.
+KeepEmptyToGoToEndOfFile=Оставьте это поле пустым, чтобы обработать все строки до конца файла.
+SelectPrimaryColumnsForUpdateAttempt=Выберите столбцы для использования в качестве первичного ключа для импорта UPDATE
+UpdateNotYetSupportedForThisImport=Обновление не поддерживается для этого типа импорта (только вставка)
+NoUpdateAttempt=Попытки обновления не выполнялись, только вставка
+ImportDataset_user_1=Пользователи (сотрудники или нет) и свойства
 ComputedField=Вычисленное поле
 ## filters
-SelectFilterFields=If you want to filter on some values, just input values here.
-FilteredFields=Filtered fields
+SelectFilterFields=Если вы хотите отфильтровать некоторые значения, просто введите значения здесь.
+FilteredFields=Отфильтрованные поля
 FilteredFieldsValues=Значение для фильтрации
-FormatControlRule=Format control rule
+FormatControlRule=Правило контроля формата
 ## imports updates
-KeysToUseForUpdates=Key (column) to use for <b>updating</b> existing data
-NbInsert=Number of inserted lines: %s
-NbUpdate=Number of updated lines: %s
-MultipleRecordFoundWithTheseFilters=Multiple records have been found with these filters: %s
-StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
+KeysToUseForUpdates=Ключ (столбец), используемый для <b> обновления существующих данных </b>
+NbInsert=Количество вставленных строк: %s
+NbUpdate=Количество обновленных строк: %s
+MultipleRecordFoundWithTheseFilters=С этими фильтрами было найдено несколько записей: %s
+StocksWithBatch=Запасы и местонахождение (склад) продукции с указанием партии / серийного номера
diff --git a/htdocs/langs/ru_RU/externalsite.lang b/htdocs/langs/ru_RU/externalsite.lang
index f4987dd02cb..ed73de12a39 100644
--- a/htdocs/langs/ru_RU/externalsite.lang
+++ b/htdocs/langs/ru_RU/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
 ExternalSiteSetup=Установка ссылки на внешний веб-сайт
-ExternalSiteURL=External Site URL of HTML iframe content
+ExternalSiteURL=URL-адрес внешнего сайта HTML-содержимого iframe
 ExternalSiteModuleNotComplete=Модуль ВнешнийСайт не был надлежащим образом настроен.
 ExampleMyMenuEntry=Пункт "Моё меню"
diff --git a/htdocs/langs/ru_RU/ftp.lang b/htdocs/langs/ru_RU/ftp.lang
index 799634cebbf..2a97c1e94cc 100644
--- a/htdocs/langs/ru_RU/ftp.lang
+++ b/htdocs/langs/ru_RU/ftp.lang
@@ -2,13 +2,13 @@
 FTPClientSetup=Настройка модуля FTP или SFTP-клиента
 NewFTPClient=Настройка нового соединения FTP / FTPS
 FTPArea=Область FTP/FTPS 
-FTPAreaDesc=This screen shows a view of an FTP et SFTP server.
-SetupOfFTPClientModuleNotComplete=The setup of the FTP or SFTP client module seems to be incomplete
-FTPFeatureNotSupportedByYourPHP=Your PHP does not support FTP or SFTP functions
-FailedToConnectToFTPServer=Failed to connect to server (server %s, port %s)
-FailedToConnectToFTPServerWithCredentials=Failed to login to server with defined login/password
+FTPAreaDesc=На этом экране показан вид сервера FTP и SFTP.
+SetupOfFTPClientModuleNotComplete=Настройка клиентского модуля FTP или SFTP кажется незавершенной.
+FTPFeatureNotSupportedByYourPHP=Ваш PHP не поддерживает функции FTP или SFTP
+FailedToConnectToFTPServer=Не удалось подключиться к серверу (сервер %s, порт %s)
+FailedToConnectToFTPServerWithCredentials=Не удалось войти на сервер с определенным логином / паролем
 FTPFailedToRemoveFile=Не удалось удалить файл <b>%s</b>.
-FTPFailedToRemoveDir=Failed to remove directory <b>%s</b>: check permissions and that the directory is empty.
+FTPFailedToRemoveDir=Не удалось удалить каталог <b> %s </b>: проверьте разрешения и убедитесь, что каталог пуст.
 FTPPassiveMode=Пассивный режим
-ChooseAFTPEntryIntoMenu=Choose a FTP/SFTP site from the menu...
+ChooseAFTPEntryIntoMenu=Выберите сайт FTP / SFTP в меню ...
 FailedToGetFile=Не удалось получить файлы %s
diff --git a/htdocs/langs/ru_RU/help.lang b/htdocs/langs/ru_RU/help.lang
index 6e0f564a311..d6a4f71a7e6 100644
--- a/htdocs/langs/ru_RU/help.lang
+++ b/htdocs/langs/ru_RU/help.lang
@@ -1,23 +1,23 @@
 # Dolibarr language file - Source file is en_US - help
 CommunitySupport=Поддержка через Форум/Wiki
 EMailSupport=Поддержка по email
-RemoteControlSupport=Online real-time / remote support
+RemoteControlSupport=Онлайн-поддержка в реальном времени / удаленная поддержка
 OtherSupport=Другие виды поддержки
 ToSeeListOfAvailableRessources=Связаться/Смотреть имеющиеся ресурсы:
 HelpCenter=Справочный центр
-DolibarrHelpCenter=Dolibarr Help and Support Center
-ToGoBackToDolibarr=Otherwise, <a href="%s">click here to continue to use Dolibarr</a>.
-TypeOfSupport=Type of support
+DolibarrHelpCenter=Центр справки и поддержки Dolibarr
+ToGoBackToDolibarr=В противном случае <a href="%s"> щелкните здесь, чтобы продолжить использование Dolibarr </a>.
+TypeOfSupport=Тип поддержки
 TypeSupportCommunauty=Сообщество (бесплатно)
 TypeSupportCommercial=Коммерческая
 TypeOfHelp=Тип
-NeedHelpCenter=Need help or support?
+NeedHelpCenter=Нужна помощь или поддержка?
 Efficiency=Эффективность
 TypeHelpOnly=Только справка
 TypeHelpDev=Справка + Разработка
-TypeHelpDevForm=Help+Development+Training
-BackToHelpCenter=Otherwise, <a href="%s">go back to Help center home page</a>.
-LinkToGoldMember=You can call one of the trainers preselected by Dolibarr for your language (%s) by clicking their Widget (status and maximum price are automatically updated):
+TypeHelpDevForm=Помощь + Развитие + Обучение
+BackToHelpCenter=В противном случае <a href="%s"> вернитесь на домашнюю страницу справочного центра </a>.
+LinkToGoldMember=Вы можете позвонить одному из тренеров, предварительно выбранных Dolibarr для вашего языка (%s), щелкнув его виджет (статус и максимальная цена обновляются автоматически):
 PossibleLanguages=Поддерживаемые языки
-SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
-SeeOfficalSupport=For official Dolibarr support in your language: <br><b><a href="%s" target="_blank">%s</a></b>
+SubscribeToFoundation=Помогите проекту Долибарр, подпишитесь на фонд
+SeeOfficalSupport=Для официальной поддержки Dolibarr на вашем языке: <br> <b> <a href="%s" target="_blank"> %s </a> </b>
diff --git a/htdocs/langs/ru_RU/holiday.lang b/htdocs/langs/ru_RU/holiday.lang
index 18ce6f6f97d..03a4c4c4ff3 100644
--- a/htdocs/langs/ru_RU/holiday.lang
+++ b/htdocs/langs/ru_RU/holiday.lang
@@ -3,8 +3,8 @@ HRM=Отдел кадров
 Holidays=Отпуск
 CPTitreMenu=Отпуск
 MenuReportMonth=Ежемесячная выписка
-MenuAddCP=New leave request
-NotActiveModCP=You must enable the module Leave to view this page.
+MenuAddCP=Новый запрос на отпуск
+NotActiveModCP=Для просмотра этой страницы необходимо включить модуль «Оставить».
 AddCP=Подать заявление на отпуск
 DateDebCP=Начальная дата
 DateFinCP=Конечная дата
@@ -13,21 +13,21 @@ ToReviewCP=Ожидают утверждения
 ApprovedCP=Утверждено
 CancelCP=Отменено
 RefuseCP=Отказано
-ValidatorCP=Утвердивший
-ListeCP=List of leave
+ValidatorCP=Утверждающий
+ListeCP=Список отпусков
 Leave=Оставить запрос
-LeaveId=Leave ID
-ReviewedByCP=Will be approved by
-UserID=User ID
-UserForApprovalID=User for approval ID
-UserForApprovalFirstname=First name of approval user
-UserForApprovalLastname=Last name of approval user
-UserForApprovalLogin=Login of approval user
+LeaveId=Оставить ID
+ReviewedByCP=Будет одобрен
+UserID=ID пользователя
+UserForApprovalID=Пользователь для идентификатора утверждения
+UserForApprovalFirstname=Имя утверждающего пользователя
+UserForApprovalLastname=Фамилия утверждающего пользователя
+UserForApprovalLogin=Логин одобренного пользователя
 DescCP=Описание
 SendRequestCP=Создать заявление на отпуск
 DelayToRequestCP=Заявления об отпуске могут создаваться не ранее чем через <b>%s</b> (дней)
-MenuConfCP=Balance of leave
-SoldeCPUser=Leave balance is <b>%s</b> days.
+MenuConfCP=Остаток отпуска
+SoldeCPUser=Остаток отпуска составляет <b> %s </b> дней.
 ErrorEndDateCP=Выберите конечную дату позже чем начальную.
 ErrorSQLCreateCP=Ошибка SQL возникла во время создания:
 ErrorIDFicheCP=Возникла ошибка, заявление на отпуск отсутствует.
@@ -36,16 +36,16 @@ ErrorUserViewCP=У вас нет прав доступа для просмотр
 InfosWorkflowCP=Информация о рабочем процессе
 RequestByCP=Запрошен 
 TitreRequestCP=Оставить запрос
-TypeOfLeaveId=Type of leave ID
-TypeOfLeaveCode=Type of leave code
-TypeOfLeaveLabel=Type of leave label
-NbUseDaysCP=Количество истраченных дней отпуска
-NbUseDaysCPHelp=The calculation takes into account the non working days and the holidays defined in the dictionary.
-NbUseDaysCPShort=Days consumed
-NbUseDaysCPShortInMonth=Days consumed in month
-DayIsANonWorkingDay=%s is a non working day
-DateStartInMonth=Start date in month
-DateEndInMonth=End date in month
+TypeOfLeaveId=Тип отпуска ID
+TypeOfLeaveCode=Тип кода отпуска
+TypeOfLeaveLabel=Тип ярлыка отпуска
+NbUseDaysCP=Количество использованных дней отпуска
+NbUseDaysCPHelp=При расчете учитываются нерабочие и праздничные дни, определенные в словаре.
+NbUseDaysCPShort=Дни отпуска
+NbUseDaysCPShortInMonth=Дни отпуска в месяц
+DayIsANonWorkingDay=%s - выходной день
+DateStartInMonth=Дата начала в месяце
+DateEndInMonth=Дата окончания в месяце
 EditCP=Редактировать
 DeleteCP=Удалить
 ActionRefuseCP=Отказать
@@ -55,7 +55,7 @@ TitleDeleteCP=Удалить заявление на отпуск
 ConfirmDeleteCP=Подтверждаете удаление этого заявления на отпуск?
 ErrorCantDeleteCP=У вас нет прав доступа для удаления этого заявления на отпуск.
 CantCreateCP=У вас нет прав доступа для создания заявлений на отпуск.
-InvalidValidatorCP=Вы должны выбрать того, кто будет утверждать ваше заявление на отпуск.
+InvalidValidatorCP=Вы должны выбрать утверждающего для вашего запроса на отпуск.
 NoDateDebut=Вы должны выбрать начальную дату.
 NoDateFin=Вы должны выбрать конечную дату.
 ErrorDureeCP=Ваше заявление на отпуск не включает в себя рабочие дни. 
@@ -74,38 +74,38 @@ DateRefusCP=Дата отказа
 DateCancelCP=Дата отмены
 DefineEventUserCP=Задать исключительный отпуск для пользователя
 addEventToUserCP=Задать отпуск
-NotTheAssignedApprover=You are not the assigned approver
+NotTheAssignedApprover=Вы не назначенный утверждающий
 MotifCP=Причина
 UserCP=Пользователь
 ErrorAddEventToUserCP=Возникла ошибка при добавлении исключительного отпуска.
 AddEventToUserOkCP=Добавление исключительного отпуска успешно завершено. 
-MenuLogCP=View change logs
-LogCP=Журнал обновлений доступных выходных дней
-ActionByCP=Выполнено 
-UserUpdateCP=Для пользователя
+MenuLogCP=Просмотр журналов изменений
+LogCP=Журнал всех обновлений, внесенных в «Отпускной баланс»
+ActionByCP=Обновлено
+UserUpdateCP=Обновлено для
 PrevSoldeCP=Предыдущий баланс
 NewSoldeCP=Новый баланс
 alreadyCPexist=Заявление на отпуск в этот период уже существует.
-FirstDayOfHoliday=Первый день отпуска
-LastDayOfHoliday=Последний день отпуска
-BoxTitleLastLeaveRequests=Latest %s modified leave requests
+FirstDayOfHoliday=Начальный день подачи заявки на отпуск
+LastDayOfHoliday=Конечный день запроса на отпуск
+BoxTitleLastLeaveRequests=Последние измененные запросы на отпуск %s
 HolidaysMonthlyUpdate=Ежемесячное обновление
 ManualUpdate=Ручное обновление
 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
-HalfDay=Half day
-NotTheAssignedApprover=You are not the assigned approver
-LEAVE_PAID=Paid vacation
-LEAVE_SICK=Sick leave
-LEAVE_OTHER=Other leave
-LEAVE_PAID_FR=Paid vacation
+EmployeeLastname=Фамилия сотрудника
+EmployeeFirstname=Имя сотрудника
+TypeWasDisabledOrRemoved=Тип отпуска (идентификатор %s) был отключен или удален
+LastHolidays=Последние запросы на выход из %s
+AllHolidays=Все запросы на отпуск
+HalfDay=Полдня
+NotTheAssignedApprover=Вы не назначенный утверждающий
+LEAVE_PAID=Оплачиваемый отпуск
+LEAVE_SICK=Отпуск по болезни
+LEAVE_OTHER=Другой отпуск
+LEAVE_PAID_FR=Оплачиваемый отпуск
 ## Configuration du Module ##
-LastUpdateCP=Latest automatic update of leave allocation
-MonthOfLastMonthlyUpdate=Month of latest automatic update of leave allocation
+LastUpdateCP=Последнее автоматическое обновление распределения отпусков
+MonthOfLastMonthlyUpdate=Месяц последнего автоматического обновления распределения отпусков
 UpdateConfCPOK=Обновлено успешно
 Module27130Name= Управление заявлениями на отпуск
 Module27130Desc= Управление заявлениями на отпуск
@@ -115,20 +115,20 @@ NoticePeriod=Период уведомления
 HolidaysToValidate=Подтверждение заявления на отпуск
 HolidaysToValidateBody=Ниже список заявлений на отпуск, которые требуют подтверждения
 HolidaysToValidateDelay=Это заявление на отпуск будет рассмотрено в период менее, чем %s дней.
-HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
+HolidaysToValidateAlertSolde=У пользователя, отправившего этот запрос на отпуск, недостаточно свободных дней.
 HolidaysValidated=Подтверждённые заявления на отпуск
 HolidaysValidatedBody=Ваше заявление на отпуск с  %s по %s  подтверждено.
 HolidaysRefused=Заявление отклонено.
-HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason:
+HolidaysRefusedBody=Ваш запрос на отпуск от %s до %s был отклонен по следующей причине:
 HolidaysCanceled=Отменённые заявления на отпуск
 HolidaysCanceledBody=Ваше заявление на отпуск с  %s по %s отменено. 
-FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
-NoLeaveWithCounterDefined=There is no leave types defined that need to be followed by a counter
-GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
-HolidaySetup=Setup of module Holiday
-HolidaysNumberingModules=Leave requests numbering models
-TemplatePDFHolidays=Template for leave requests PDF
-FreeLegalTextOnHolidays=Free text on PDF
-WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
-HolidaysToApprove=Holidays to approve
-NobodyHasPermissionToValidateHolidays=Nobody has permission to validate holidays
+FollowedByACounter=1: Этот вид отпуска должен сопровождаться счетчиком. Счетчик увеличивается вручную или автоматически, а когда запрос на выход подтверждается, счетчик уменьшается. <br> 0: без счетчика.
+NoLeaveWithCounterDefined=Не определены типы отпусков, за которыми должен следовать счетчик.
+GoIntoDictionaryHolidayTypes=Войдите в <strong> Home - Setup - Dictionaries - Type of leave </strong>, чтобы настроить различные типы листьев.
+HolidaySetup=Настройка модуля Оставить
+HolidaysNumberingModules=Модели нумерации для запросов на отпуск
+TemplatePDFHolidays=Шаблон для запросов на отпуск PDF
+FreeLegalTextOnHolidays=Свободный текст в PDF
+WatermarkOnDraftHolidayCards=Водяные знаки на запросах на отпуск
+HolidaysToApprove=Праздники утвердить
+NobodyHasPermissionToValidateHolidays=Ни у кого нет разрешения подтверждать праздники
diff --git a/htdocs/langs/ru_RU/hrm.lang b/htdocs/langs/ru_RU/hrm.lang
index 6cc287f2927..f88ca9b03a8 100644
--- a/htdocs/langs/ru_RU/hrm.lang
+++ b/htdocs/langs/ru_RU/hrm.lang
@@ -1,19 +1,19 @@
 # Dolibarr language file - en_US - hrm
 # Admin
-HRM_EMAIL_EXTERNAL_SERVICE=Email to prevent HRM external service
-Establishments=Establishments
-Establishment=Establishment
-NewEstablishment=New establishment
-DeleteEstablishment=Delete establishment
-ConfirmDeleteEstablishment=Are you sure you wish to delete this establishment?
-OpenEtablishment=Open establishment
-CloseEtablishment=Close establishment
+HRM_EMAIL_EXTERNAL_SERVICE=Электронная почта для предотвращения внешней службы HRM
+Establishments=Учреждения
+Establishment=Учреждение
+NewEstablishment=Новое заведение
+DeleteEstablishment=Удалить заведение
+ConfirmDeleteEstablishment=Вы уверены, что хотите удалить это заведение?
+OpenEtablishment=Открытое заведение
+CloseEtablishment=Закрыть заведение
 # Dictionary
-DictionaryPublicHolidays=HRM - Public holidays
-DictionaryDepartment=HRM - Department list
-DictionaryFunction=HRM - Job positions
+DictionaryPublicHolidays=Отпуск - праздничные дни
+DictionaryDepartment=HRM - Список отделов
+DictionaryFunction=HRM - Вакансии
 # Module
 Employees=Сотрудники
 Employee=Сотрудник
-NewEmployee=New employee
-ListOfEmployees=List of employees
+NewEmployee=Новый сотрудник
+ListOfEmployees=Список сотрудников
diff --git a/htdocs/langs/ru_RU/install.lang b/htdocs/langs/ru_RU/install.lang
index 8ae87ba99ef..03474ea62f0 100644
--- a/htdocs/langs/ru_RU/install.lang
+++ b/htdocs/langs/ru_RU/install.lang
@@ -1,40 +1,40 @@
 # Dolibarr language file - Source file is en_US - install
 InstallEasy=Мы постарались сделать установку Dolibarr настолько простой, насколько это возможно. Просто следуйте инструкциям по установке, шаг за шагом.
 MiscellaneousChecks=Проверка системных требований
-ConfFileExists=Файл <b>конфигурации %s</b> существует.
-ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created!
+ConfFileExists=Файл конфигурации <b> %s</b> существует.
+ConfFileDoesNotExistsAndCouldNotBeCreated=Файл конфигурации <b>%s</b> не существует и не может быть создан!
 ConfFileCouldBeCreated=Файл <b>конфигурации %s</b> может быть создан.
-ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
+ConfFileIsNotWritable=Файл конфигурации <b> %s </b> недоступен для записи. Проверить разрешения. Для первой установки ваш веб-сервер должен иметь возможность выполнять запись в этот файл во время процесса настройки (например, «chmod 666» в ОС Unix).
 ConfFileIsWritable=Файл <b>конфигурации %s</b> доступен для записи.
 ConfFileMustBeAFileNotADir=Файл конфигурации <b>%s</b> должен быть файлом, а не каталогом.
-ConfFileReload=Reloading parameters from configuration file.
+ConfFileReload=Перезагрузка параметров из файла конфигурации.
 PHPSupportPOSTGETOk=Эта версия PHP поддерживает переменные POST и GET.
-PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
+PHPSupportPOSTGETKo=Возможно, ваша установка PHP не поддерживает переменные POST и / или GET. Проверьте параметр <b> variables_order </b> в php.ini.
 PHPSupportSessions=Эта версия PHP поддерживает сессии.
-PHPSupport=This PHP supports %s functions.
+PHPSupport=Этот PHP поддерживает функции %s.
 PHPMemoryOK= Максимально допустимый размер памяти для сессии установлен <b>в %s.</b> Это должно быть достаточно.
-PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
-Recheck=Click here for a more detailed test
-ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to allow Dolibarr to work. Check your PHP setup and permissions of the sessions directory.
-ErrorPHPDoesNotSupportGD=Your PHP installation does not support GD graphical functions. No graphs will be available.
+PHPMemoryTooLow=Максимальный объем памяти сеанса PHP установлен на <b> %s </b> байт. Это слишком мало. Измените <b> php.ini </b>, чтобы установить параметр <b> memory_limit </b> как минимум на <b>%s</b> байт.
+Recheck=Щелкните здесь, чтобы получить более подробный тест
+ErrorPHPDoesNotSupportSessions=Ваша установка PHP не поддерживает сеансы. Эта функция необходима для работы Dolibarr. Проверьте настройки PHP и права доступа к каталогу сессий.
+ErrorPHPDoesNotSupportGD=Ваша установка PHP не поддерживает графические функции GD. Графики будут недоступны.
 ErrorPHPDoesNotSupportCurl=Ваша установка PHP не поддерживает Curl.
-ErrorPHPDoesNotSupportCalendar=Your PHP installation does not support php calendar extensions.
-ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
-ErrorPHPDoesNotSupportIntl=Your PHP installation does not support Intl functions.
-ErrorPHPDoesNotSupportxDebug=Your PHP installation does not support extend debug functions.
-ErrorPHPDoesNotSupport=Your PHP installation does not support %s functions.
+ErrorPHPDoesNotSupportCalendar=Ваша установка PHP не поддерживает расширения календаря php.
+ErrorPHPDoesNotSupportUTF8=Ваша установка PHP не поддерживает функции UTF8. Долибарр не может работать правильно. Устраните это перед установкой Dolibarr.
+ErrorPHPDoesNotSupportIntl=Ваша установка PHP не поддерживает функции Intl.
+ErrorPHPDoesNotSupportxDebug=Ваша установка PHP не поддерживает расширенные функции отладки.
+ErrorPHPDoesNotSupport=Ваша установка PHP не поддерживает функции %s.
 ErrorDirDoesNotExists=Каталог %s не существует.
-ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
+ErrorGoBackAndCorrectParameters=Вернитесь и проверьте/исправьте параметры.
 ErrorWrongValueForParameter=Вы ввели неправильное значение для параметра ' %s'.
 ErrorFailedToCreateDatabase=Не удается создать базу данных ' %s'.
 ErrorFailedToConnectToDatabase=Не удалось подключиться к базе данных ' %s'.
 ErrorDatabaseVersionTooLow=Версия базы данных (%s) слишком старая. Требуется версия %s или выше
 ErrorPHPVersionTooLow=Версия PHP слишком стара. Версия %s обязательна.
-ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
+ErrorConnectedButDatabaseNotFound=Подключение к серверу выполнено успешно, но база данных «%s» не найдена.
 ErrorDatabaseAlreadyExists=База данных ' %s' уже существует.
-IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
+IfDatabaseNotExistsGoBackAndUncheckCreate=Если база данных не существует, вернитесь и отметьте опцию «Создать базу данных».
 IfDatabaseExistsGoBackAndCheckCreate=Если база данных уже существует, вернитесь назад и снимите флажок "Создать базу данных" вариант.
-WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
+WarningBrowserTooOld=Версия браузера слишком старая. Настоятельно рекомендуется обновить браузер до последней версии Firefox, Chrome или Opera.
 PHPVersion=Версия PHP
 License=Использование лицензии
 ConfigurationFile=Файл конфигурации
@@ -47,23 +47,23 @@ DolibarrDatabase=Dolibarr База данных
 DatabaseType=Тип Базы данных
 DriverType=Тип драйвера
 Server=Сервер
-ServerAddressDescription=Name or ip address for the database server. Usually 'localhost' when the database server is hosted on the same server as the web server.
+ServerAddressDescription=Имя или IP-адрес сервера базы данных. Обычно «localhost», когда сервер базы данных размещен на том же сервере, что и веб-сервер.
 ServerPortDescription=База данных сервера порт. Держите пустым, если неизвестно.
 DatabaseServer=Сервер базы данных
 DatabaseName=Название базы данных
-DatabasePrefix=Database table prefix
-DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
-AdminLogin=User account for the Dolibarr database owner.
-PasswordAgain=Retype password confirmation
+DatabasePrefix=Префикс таблицы базы данных
+DatabasePrefixDescription=Префикс таблицы базы данных. Если пусто, по умолчанию будет llx_.
+AdminLogin=Учетная запись владельца базы данных Dolibarr.
+PasswordAgain=Подтвердите пароль еще раз
 AdminPassword=Пароль Dolibarr для администратора базы данных. Держите пустым, если вы подключаетесь в анонимном
 CreateDatabase=Создание базы данных
-CreateUser=Create user account or grant user account permission on the Dolibarr database
+CreateUser=Создайте учетную запись пользователя или предоставьте разрешение учетной записи пользователя в базе данных Dolibarr
 DatabaseSuperUserAccess=База данных - Superuser доступа
-CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.<br>In this case, you must also fill in the user name and password for the superuser account at the bottom of this page.
-CheckToCreateUser=Check the box if:<br>the database user account does not yet exist and so must be created, or<br>if the user account exists but the database does not exist and permissions must be granted.<br>In this case, you must enter the user account and password and <b>also</b> the superuser account name and password at the bottom of this page. If this box is unchecked, database owner and password must already exist.
-DatabaseRootLoginDescription=Superuser account name (to create new databases or new users), mandatory if the database or its owner does not already exist.
-KeepEmptyIfNoPassword=Leave empty if superuser has no password (NOT recommended)
-SaveConfigurationFile=Saving parameters to
+CheckToCreateDatabase=Установите флажок, если база данных еще не существует и ее необходимо создать. <br> В этом случае вы также должны указать имя пользователя и пароль для учетной записи суперпользователя внизу этой страницы.
+CheckToCreateUser=Установите флажок, если: <br> учетная запись пользователя базы данных еще не существует и поэтому должна быть создана, или <br>, если учетная запись пользователя существует, но база данных не существует и разрешения должны быть предоставлены. <br> В этом случае вы должны ввести учетную запись пользователя и пароль, а <b> также </b> имя учетной записи суперпользователя и пароль внизу этой страницы. Если этот флажок не установлен, владелец базы данных и пароль уже должны существовать.
+DatabaseRootLoginDescription=Имя учетной записи суперпользователя (для создания новых баз данных или новых пользователей), обязательно, если база данных или ее владелец еще не существует.
+KeepEmptyIfNoPassword=Оставьте пустым, если у суперпользователя нет пароля (НЕ рекомендуется)
+SaveConfigurationFile=Сохранение параметров в
 ServerConnection=Сервер связи
 DatabaseCreation=Создание базы данных
 CreateDatabaseObjects=Создание объектов базы данных
@@ -74,9 +74,9 @@ CreateOtherKeysForTable=Создать внешние ключи и индекс
 OtherKeysCreation=Создание внешних ключей и индексов
 FunctionsCreation=Функции создания
 AdminAccountCreation=Создание логина Администратора
-PleaseTypePassword=Please type a password, empty passwords are not allowed!
-PleaseTypeALogin=Please type a login!
-PasswordsMismatch=Passwords differs, please try again!
+PleaseTypePassword=Пожалуйста, введите пароль, пустые пароли не допускаются!
+PleaseTypeALogin=Пожалуйста, введите логин!
+PasswordsMismatch=Пароли отличаются, пожалуйста, попробуйте еще раз!
 SetupEnd=Окончание установки
 SystemIsInstalled=Эта установка завершена.
 SystemIsUpgraded=Dolibarr был обновлен успешно.
@@ -84,65 +84,65 @@ YouNeedToPersonalizeSetup=Вам нужно настроить Dolibarr, что
 AdminLoginCreatedSuccessfuly=Администратор входа в систему Dolibarr '<b>%s</b>' создан успешно.
 GoToDolibarr=Перейти к Dolibarr
 GoToSetupArea=Перейти к Dolibarr (настройка область)
-MigrationNotFinished=The database version is not completely up to date: run the upgrade process again.
+MigrationNotFinished=Версия базы данных не полностью обновлена: запустите процесс обновления еще раз.
 GoToUpgradePage=Перейти на страницу снова обновить
 WithNoSlashAtTheEnd=Без слеша "/" в конце
-DirectoryRecommendation=<span class="warning">IMPORTANT</span>: You must use a directory that is outside of the web pages (so do not use a subdirectory of previous parameter).
+DirectoryRecommendation= <span class="warning"> ВАЖНО </span>: вы должны использовать каталог, который находится за пределами веб-страниц (поэтому не используйте подкаталог предыдущего параметра).
 LoginAlreadyExists=Уже существует
 DolibarrAdminLogin=Dolibarr администратора
-AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
+AdminLoginAlreadyExists=Учетная запись администратора Dolibarr «<b> %s </b>» уже существует. Вернитесь назад, если хотите создать еще один.
 FailedToCreateAdminLogin=Не удалось создать учетную запись администратора Dolibarr.
-WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, you should add a file called <b>install.lock</b> into the Dolibarr document directory in order to prevent the accidental/malicious use of the install tools again.
-FunctionNotAvailableInThisPHP=Not available in this PHP
+WarningRemoveInstallDir=Предупреждение: по соображениям безопасности после завершения установки или обновления вы должны добавить файл с именем <b> install.lock </b> в каталог документов Dolibarr, чтобы предотвратить повторное случайное / злонамеренное использование инструментов установки.
+FunctionNotAvailableInThisPHP=Недоступно в этом PHP
 ChoosedMigrateScript=Выбранная перенести скрипт
 DataMigration=Перенос данных (данные)
 DatabaseMigration=Перенос базы данных (структура + некоторые данные)
 ProcessMigrateScript=Сценарий обработки
 ChooseYourSetupMode=Выберите режим настройки и нажмите кнопку "Пуск" ...
 FreshInstall=Свежие установить
-FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode.
+FreshInstallDesc=Используйте этот режим, если это ваша первая установка. В противном случае этот режим может восстановить неполную предыдущую установку. Если вы хотите обновить свою версию, выберите режим «Обновить».
 Upgrade=Обновление
 UpgradeDesc=Используйте этот режим, если вы заменили старый Dolibarr файлы с файлами из новой версии. Это позволит обновить базу данных и данных.
 Start=Главная
 InstallNotAllowed=Установка не разрешено <b>conf.php</b> разрешений
 YouMustCreateWithPermission=Вы должны создать файл %s и установить запись по этому вопросу для веб-сервера во время установки.
-CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload the page.
+CorrectProblemAndReloadPage=Устраните проблему и нажмите F5, чтобы перезагрузить страницу.
 AlreadyDone=Уже мигрировали
 DatabaseVersion=Версия Базы данных
 ServerVersion=Версия сервера базы данных
 YouMustCreateItAndAllowServerToWrite=Вы должны создать этот каталог и позволит веб-серверу, чтобы написать на ней.
 DBSortingCollation=Характер сортировки
-YouAskDatabaseCreationSoDolibarrNeedToConnect=You selected create database <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
-YouAskLoginCreationSoDolibarrNeedToConnect=You selected create database user <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
-BecauseConnectionFailedParametersMayBeWrong=The database connection failed: the host or super user parameters must be wrong.
+YouAskDatabaseCreationSoDolibarrNeedToConnect=Вы выбрали создание базы данных <b> %s </b>, но для этого Dolibarr необходимо подключиться к серверу <b> %s</b> с разрешениями пользователя <b>%s</b> 
+YouAskLoginCreationSoDolibarrNeedToConnect=Вы выбрали создать пользователя базы данных <b> %s </b>, но для этого Dolibarr необходимо подключиться к серверу <b> %s</b> c правами пользователя <b>%s</b>  
+BecauseConnectionFailedParametersMayBeWrong=Ошибка подключения к базе данных: параметры хоста или суперпользователя должны быть неправильными.
 OrphelinsPaymentsDetectedByMethod=Orphelins оплаты обнаружена методом %s
 RemoveItManuallyAndPressF5ToContinue=Удалите ее вручную и нажмите F5, чтобы продолжить.
 FieldRenamed=Поле переименовано
-IfLoginDoesNotExistsCheckCreateUser=If the user does not exist yet, you must check option "Create user"
-ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or the PHP client version may be too old compared to the database version.
+IfLoginDoesNotExistsCheckCreateUser=Если пользователь еще не существует, необходимо отметить опцию «Создать пользователя».
+ErrorConnection=Сервер «<b> %s </b>», имя базы данных «<b> %s </b>», Логин «<b> %s </b>», или пароль базы данных могут быть неправильными или версия PHP клиент может быть слишком стара по сравнению с версией базы данных.
 InstallChoiceRecommanded=Anbefalt valget å installere versjon <b>%s</b> fra din nåværende versjonen <b>%s</b>
 InstallChoiceSuggested=<b>Установить выбор предложенной установки.</b>
-MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions. The install wizard will come back to suggest a further migration once this one is complete.
-CheckThatDatabasenameIsCorrect=Check that the database name "<b>%s</b>" is correct.
+MigrateIsDoneStepByStep=Целевая версия (%s) имеет пробел в несколько версий. Мастер установки вернется, чтобы предложить дальнейшую миграцию после ее завершения.
+CheckThatDatabasenameIsCorrect=Проверьте правильность имени базы данных «<b> %s </b>».
 IfAlreadyExistsCheckOption=Hvis dette navnet er riktig, og at databasen ikke eksisterer ennå, du må sjekke alternativet "Opprett database".
 OpenBaseDir=PHP openbasedir parameter
-YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
-YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form).
-NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing.
-MigrationCustomerOrderShipping=Migrate shipping for sales orders storage
+YouAskToCreateDatabaseSoRootRequired=Вы поставили галочку напротив пункта «Создать базу данных». Для этого вам необходимо указать логин / пароль суперпользователя (внизу формы).
+YouAskToCreateDatabaseUserSoRootRequired=Вы установили флажок «Создать владельца базы данных». Для этого вам необходимо указать логин / пароль суперпользователя (внизу формы).
+NextStepMightLastALongTime=Текущий шаг может занять несколько минут. Прежде чем продолжить, дождитесь полного отображения следующего экрана.
+MigrationCustomerOrderShipping=Перенести доставку для хранилища заказов на продажу
 MigrationShippingDelivery=Oppgrader lagring av shipping
 MigrationShippingDelivery2=Oppgrader lagring av shipping 2
 MigrationFinished=Миграция завершена
-LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the master account to administer all other/additional user accounts.</b>
+LastStepDesc= <strong> Последний шаг </strong>: Определите здесь логин и пароль, которые вы хотите использовать для подключения к Dolibarr. <b> Не теряйте его, так как это основная учетная запись для администрирования всех других / дополнительных учетных записей пользователей. </b>
 ActivateModule=Активировать модуль %s
 ShowEditTechnicalParameters=Показать расширенные параметры (для опытных пользователей)
-WarningUpgrade=Warning:\nDid you run a database backup first?\nThis is highly recommended. Loss of data (due to for example bugs in mysql version 5.5.40/41/42/43) may be possible during this process, so it is essential to take a complete dump of your database before starting any migration.\n\nClick OK to start migration process...
-ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug, making data loss possible if you make structural changes in your database, such as is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a layer (patched) version (list of known buggy versions: %s)
-KeepDefaultValuesWamp=You used the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you are doing.
-KeepDefaultValuesDeb=You used the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so the values proposed here are already optimized. Only the password of the database owner to create must be entered. Change other parameters only if you know what you are doing.
-KeepDefaultValuesMamp=You used the Dolibarr setup wizard from DoliMamp, so the values proposed here are already optimized. Change them only if you know what you are doing.
-KeepDefaultValuesProxmox=You used the Dolibarr setup wizard from a Proxmox virtual appliance, so the values proposed here are already optimized. Change them only if you know what you are doing.
-UpgradeExternalModule=Run dedicated upgrade process of external module
+WarningUpgrade=Предупреждение:\nВы сначала запускали резервную копию базы данных?\nЭто настоятельно рекомендуется. Потеря данных (например, из-за ошибок в mysql версии 5.5.40 / 41/42/43) может быть возможна во время этого процесса, поэтому важно сделать полный дамп вашей базы данных перед началом любой миграции.\n\nНажмите ОК, чтобы начать процесс миграции ...
+ErrorDatabaseVersionForbiddenForMigration=Версия вашей базы данных - %s. В нем есть критическая ошибка, из-за которой возможна потеря данных, если вы вносите структурные изменения в свою базу данных, например, как того требует процесс миграции. По его причине миграция не будет разрешена до тех пор, пока вы не обновите свою базу данных до многоуровневой (исправленной) версии (список известных версий с ошибками: %s)
+KeepDefaultValuesWamp=Вы использовали мастер настройки Dolibarr от DoliWamp, поэтому предлагаемые здесь значения уже оптимизированы. Меняйте их, только если вы знаете, что делаете.
+KeepDefaultValuesDeb=Вы использовали мастер установки Dolibarr из пакета Linux (Ubuntu, Debian, Fedora ...), поэтому предлагаемые здесь значения уже оптимизированы. Необходимо ввести только пароль владельца создаваемой базы данных. Изменяйте другие параметры, только если знаете, что делаете.
+KeepDefaultValuesMamp=Вы использовали мастер настройки Dolibarr от DoliMamp, поэтому предлагаемые здесь значения уже оптимизированы. Меняйте их, только если вы знаете, что делаете.
+KeepDefaultValuesProxmox=Вы использовали мастер установки Dolibarr с виртуального устройства Proxmox, поэтому предлагаемые здесь значения уже оптимизированы. Меняйте их, только если вы знаете, что делаете.
+UpgradeExternalModule=Запустите специальный процесс обновления внешнего модуля
 SetAtLeastOneOptionAsUrlParameter=Задайте по крайней мере один параметр в качестве параметра в URL-адресе. Например:  '...repair.php?standard=confirmed'
 NothingToDelete=Ничего не нужно очищать/удалять
 NothingToDo=Нечего делать
@@ -166,9 +166,9 @@ MigrationContractsUpdate=Контракт коррекция данных
 MigrationContractsNumberToUpdate=%s договора (ов) для обновления
 MigrationContractsLineCreation=Создание линии по контракту контракт исх %s
 MigrationContractsNothingToUpdate=Нет более вещи делать
-MigrationContractsFieldDontExist=Field fk_facture does not exist anymore. Nothing to do.
+MigrationContractsFieldDontExist=Поле fk_facture больше не существует. Нечего делать.
 MigrationContractsEmptyDatesUpdate=Контракт пустую дату коррекции
-MigrationContractsEmptyDatesUpdateSuccess=Contract empty date correction done successfully
+MigrationContractsEmptyDatesUpdateSuccess=Исправление пустой даты контракта успешно выполнено
 MigrationContractsEmptyDatesNothingToUpdate=Ни один контракт не пустой даты исправить
 MigrationContractsEmptyCreationDatesNothingToUpdate=Нет контракта дата создания исправить
 MigrationContractsInvalidDatesUpdate=Плохо стоимости контракта дата коррекции
@@ -190,28 +190,28 @@ MigrationDeliveryDetail=Поставка обновлений
 MigrationStockDetail=Обновление запасов стоимость товаров
 MigrationMenusDetail=Обновление динамического меню таблицы
 MigrationDeliveryAddress=Обновить адрес для доставки грузов в
-MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
+MigrationProjectTaskActors=Перенос данных для таблицы llx_projet_task_actors
 MigrationProjectUserResp=Data migrering feltet fk_user_resp av llx_projet å llx_element_contact
 MigrationProjectTaskTime=Oppdater tid i sekunder
 MigrationActioncommElement=Обновление данных о действиях
-MigrationPaymentMode=Data migration for payment type
+MigrationPaymentMode=Перенос данных для типа оплаты
 MigrationCategorieAssociation=Миграция категорий
-MigrationEvents=Migration of events to add event owner into assignment table
-MigrationEventsContact=Migration of events to add event contact into assignment table
+MigrationEvents=Перенос событий для добавления владельца события в таблицу назначений
+MigrationEventsContact=Перенос событий для добавления контакта события в таблицу назначений
 MigrationRemiseEntity=Обновить значение поля объекта llx_societe_remise
 MigrationRemiseExceptEntity=Обновить значение поля объекта llx_societe_remise_except
 MigrationUserRightsEntity=Обновить значение поля объекта llx_user_rights
 MigrationUserGroupRightsEntity=Обновить значение поля объекта llx_usergroup_rights
-MigrationUserPhotoPath=Migration of photo paths for users
-MigrationFieldsSocialNetworks=Migration of users fields social networks (%s)
+MigrationUserPhotoPath=Перенос фото-путей для пользователей
+MigrationFieldsSocialNetworks=Миграция пользовательских полей социальных сетей (%s)
 MigrationReloadModule=Перегрузите модуль %s
 MigrationResetBlockedLog=Сбросить модуль BlockedLog для алгоритма v7
-ShowNotAvailableOptions=Show unavailable options
-HideNotAvailableOptions=Hide unavailable options
-ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
-YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (directory renamed with .lock suffix).<br>
-YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
+ShowNotAvailableOptions=Показать недоступные параметры
+HideNotAvailableOptions=Скрыть недоступные параметры
+ErrorFoundDuringMigration=В процессе миграции были зарегистрированы ошибки, поэтому следующий шаг недоступен. Чтобы игнорировать ошибки, вы можете <a href="%s"> щелкнуть здесь </a>, но приложение или некоторые функции могут работать некорректно, пока ошибки не будут устранены.
+YouTryInstallDisabledByDirLock=Приложение попыталось выполнить самообновление, но страницы установки / обновления были отключены в целях безопасности (каталог переименован с суффиксом .lock). <br>
+YouTryInstallDisabledByFileLock=Приложение попыталось выполнить самообновление, но страницы установки / обновления были отключены в целях безопасности (из-за наличия файла блокировки <strong> install.lock </strong> в каталоге документов dolibarr). <br>
 ClickHereToGoToApp=Нажмите здесь, чтобы перейти к вашей заявке
-ClickOnLinkOrRemoveManualy=If an upgrade is in progress, please wait. If not, click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
-Loaded=Loaded
-FunctionTest=Function test
+ClickOnLinkOrRemoveManualy=Если обновление в процессе, подождите. В противном случае щелкните следующую ссылку. Если вы всегда видите одну и ту же страницу, вы должны удалить / переименовать файл install.lock в каталоге документов.
+Loaded=Загружено
+FunctionTest=Тест функции
diff --git a/htdocs/langs/ru_RU/interventions.lang b/htdocs/langs/ru_RU/interventions.lang
index 9cd51055196..5ac4dfb63f2 100644
--- a/htdocs/langs/ru_RU/interventions.lang
+++ b/htdocs/langs/ru_RU/interventions.lang
@@ -4,10 +4,10 @@ Interventions=Мероприятия
 InterventionCard=Карточка посредничества
 NewIntervention=Новое посредничество
 AddIntervention=СОздать посредничество
-ChangeIntoRepeatableIntervention=Change to repeatable intervention
+ChangeIntoRepeatableIntervention=Перейти к повторяемому вмешательству
 ListOfInterventions=Перечень мероприятий
 ActionsOnFicheInter=Действия над посредничеством
-LastInterventions=Latest %s interventions
+LastInterventions=Последние вмешательства %s
 AllInterventions=Все мероприятия
 CreateDraftIntervention=Создание проекта
 InterventionContact=Контакт посредничества
@@ -15,52 +15,54 @@ DeleteIntervention=Удалить посредничество
 ValidateIntervention=Подтверждение посредничества
 ModifyIntervention=Изменение посредничества
 DeleteInterventionLine=Удалить строку посредничества
-ConfirmDeleteIntervention=Are you sure you want to delete this intervention?
-ConfirmValidateIntervention=Are you sure you want to validate this intervention under name <b>%s</b>?
-ConfirmModifyIntervention=Are you sure you want to modify this intervention?
-ConfirmDeleteInterventionLine=Are you sure you want to delete this intervention line?
-ConfirmCloneIntervention=Are you sure you want to clone this intervention?
-NameAndSignatureOfInternalContact=Name and signature of intervening:
-NameAndSignatureOfExternalContact=Name and signature of customer:
+ConfirmDeleteIntervention=Вы уверены, что хотите удалить это вмешательство?
+ConfirmValidateIntervention=Вы уверены, что хотите подтвердить это вмешательство под именем <b> %s </b>?
+ConfirmModifyIntervention=Вы уверены, что хотите изменить это вмешательство?
+ConfirmDeleteInterventionLine=Вы уверены, что хотите удалить эту строку вмешательства?
+ConfirmCloneIntervention=Вы уверены, что хотите клонировать это вмешательство?
+NameAndSignatureOfInternalContact=Имя и подпись вмешивающегося:
+NameAndSignatureOfExternalContact=Имя и подпись заказчика:
 DocumentModelStandard=Стандартная модель документа для выступлений
-InterventionCardsAndInterventionLines=Interventions and lines of interventions
+InterventionCardsAndInterventionLines=Вмешательства и направления вмешательства
 InterventionClassifyBilled=Классифицировать &quot;Объявленный&quot;
-InterventionClassifyUnBilled=Classify "Unbilled"
-InterventionClassifyDone=Classify "Done"
+InterventionClassifyUnBilled=Классифицируйте "Не выставленные счета"
+InterventionClassifyDone=Классифицируйте "Готово"
 StatusInterInvoiced=Объявленный
-SendInterventionRef=Submission of intervention %s
-SendInterventionByMail=Send intervention by email
+SendInterventionRef=Представление вмешательства %s
+SendInterventionByMail=Отправить сообщение по электронной почте
 InterventionCreatedInDolibarr=Посредничество %s создано
 InterventionValidatedInDolibarr=Посредничество %s проверено
 InterventionModifiedInDolibarr=Посредничество %s изменено
 InterventionClassifiedBilledInDolibarr=Посредничество %s готово к созданию счёта.
 InterventionClassifiedUnbilledInDolibarr=Посредничество %s не готово к созданию счёта.
-InterventionSentByEMail=Intervention %s sent by email
+InterventionSentByEMail=Вмешательство %s отправлено по электронной почте
 InterventionDeletedInDolibarr=Посредничество %s  удалено
-InterventionsArea=Interventions area
-DraftFichinter=Draft interventions
-LastModifiedInterventions=Latest %s modified interventions
-FichinterToProcess=Interventions to process
+InterventionsArea=Область вмешательства
+DraftFichinter=Проект выступлений
+LastModifiedInterventions=Последние модифицированные вмешательства %s
+FichinterToProcess=Вмешательства в процесс
 TypeContact_fichinter_external_CUSTOMER=После деятельность заказчика контакт
-PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
-PrintProductsOnFichinterDetails=interventions generated from orders
-UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
-UseDurationOnFichinter=Hides the duration field for intervention records
-UseDateWithoutHourOnFichinter=Hides hours and minutes off the date field for intervention records
-InterventionStatistics=Statistics of interventions
-NbOfinterventions=No. of intervention cards
-NumberOfInterventionsByMonth=No. of intervention cards by month (date of validation)
-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.
-InterId=Intervention id
-InterRef=Intervention ref.
-InterDateCreation=Date creation intervention
-InterDuration=Duration intervention
-InterStatus=Status intervention
-InterNote=Note intervention
-InterLine=Line of intervention
-InterLineId=Line id intervention
-InterLineDate=Line date intervention
-InterLineDuration=Line duration intervention
-InterLineDesc=Line description intervention
-RepeatableIntervention=Template of intervention
-ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
+PrintProductsOnFichinter=Также распечатайте строки типа «продукт» (не только услуги) на карте вмешательства.
+PrintProductsOnFichinterDetails=вмешательства, произведенные из заказов
+UseServicesDurationOnFichinter=Используйте продолжительность услуг для интервенций, созданных из заказов
+UseDurationOnFichinter=Скрывает поле продолжительности для записей о вмешательстве
+UseDateWithoutHourOnFichinter=Скрывает часы и минуты из поля даты для записей о вмешательстве
+InterventionStatistics=Статистика вмешательств
+NbOfinterventions=Кол-во карт вмешательства
+NumberOfInterventionsByMonth=Количество карт вмешательства по месяцам (дата проверки)
+AmountOfInteventionNotIncludedByDefault=Сумма вмешательства по умолчанию не включается в прибыль (в большинстве случаев для подсчета затраченного времени используются табели учета рабочего времени). Добавьте параметр PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT в 1 в home-setup-other, чтобы включить их.
+InterId=Идентификатор вмешательства
+InterRef=Вмешательство исх.
+InterDateCreation=Дата создания вмешательства
+InterDuration=Продолжительность вмешательства
+InterStatus=Статусное вмешательство
+InterNote=Обратите внимание на вмешательство
+InterLine=Линия вмешательства
+InterLineId=Вмешательство по идентификатору линии
+InterLineDate=Вмешательство даты линии
+InterLineDuration=Вмешательство продолжительности линии
+InterLineDesc=Вмешательство описания линии
+RepeatableIntervention=Шаблон вмешательства
+ToCreateAPredefinedIntervention=Чтобы создать предопределенное или повторяющееся вмешательство, создайте общее вмешательство и преобразуйте его в шаблон вмешательства.
+Reopen=Открыть заново
+ConfirmReopenIntervention=Вы уверены, что хотите снова открыть интервенцию <b> %s </b>?
diff --git a/htdocs/langs/ru_RU/intracommreport.lang b/htdocs/langs/ru_RU/intracommreport.lang
index ba6256116e2..df3f7dcd92f 100644
--- a/htdocs/langs/ru_RU/intracommreport.lang
+++ b/htdocs/langs/ru_RU/intracommreport.lang
@@ -1,40 +1,40 @@
-Module68000Name = Intracomm report
-Module68000Desc = Intracomm report management (Support for French DEB/DES format)
-IntracommReportSetup = Intracommreport module setup
-IntracommReportAbout = About intracommreport
+Module68000Name = Внутренний отчет
+Module68000Desc = Управление отчетами Intracomm (поддержка французского формата DEB / DES)
+IntracommReportSetup = Настройка модуля Intracommreport
+IntracommReportAbout = О intracommreport
 
 # Setup
 INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
-INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
+INTRACOMMREPORT_TYPE_ACTEUR=Тип актера
 INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
-INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les Introduction
 INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
-INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Категория услуг типа "Frais de port"
 
 INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
 
 # Menu
-MenuIntracommReport=Intracomm report
-MenuIntracommReportNew=New declaration
+MenuIntracommReport=Внутренний отчет
+MenuIntracommReportNew=Новое заявление
 MenuIntracommReportList=Список
 
 # View
-NewDeclaration=New declaration
-Declaration=Declaration
-AnalysisPeriod=Analysis period
-TypeOfDeclaration=Type of declaration
-DEB=Goods exchange declaration (DEB)
-DES=Services exchange declaration (DES)
+NewDeclaration=Новое заявление
+Declaration=Декларация
+AnalysisPeriod=Период анализа
+TypeOfDeclaration=Тип декларации
+DEB=Декларация обмена товаров (DEB)
+DES=Декларация об обмене услугами (DES)
 
 # Export page
-IntracommReportTitle=Preparation of an XML file in ProDouane format
+IntracommReportTitle=Подготовка файла XML в формате ProDouane
 
 # List
-IntracommReportList=List of generated declarations
-IntracommReportNumber=Numero of declaration
-IntracommReportPeriod=Period of nalysis
-IntracommReportTypeDeclaration=Type of declaration
-IntracommReportDownload=download XML file
+IntracommReportList=Список сгенерированных объявлений
+IntracommReportNumber=Номер декларации
+IntracommReportPeriod=Период анализа
+IntracommReportTypeDeclaration=Тип декларации
+IntracommReportDownload=скачать файл XML
 
 # Invoice
-IntracommReportTransportMode=Transport mode
+IntracommReportTransportMode=Транспортный режим
diff --git a/htdocs/langs/ru_RU/knowledgemanagement.lang b/htdocs/langs/ru_RU/knowledgemanagement.lang
index b9eba6c3a10..24207d372c8 100644
--- a/htdocs/langs/ru_RU/knowledgemanagement.lang
+++ b/htdocs/langs/ru_RU/knowledgemanagement.lang
@@ -18,38 +18,38 @@
 #
 
 # Module label 'ModuleKnowledgeManagementName'
-ModuleKnowledgeManagementName = Knowledge Management System
+ModuleKnowledgeManagementName = Система управления знаниями
 # Module description 'ModuleKnowledgeManagementDesc'
-ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+ModuleKnowledgeManagementDesc=Управление системой управления знаний или справочной службы
 
 #
 # Admin page
 #
-KnowledgeManagementSetup = Knowledge Management System setup
+KnowledgeManagementSetup = Настройка системы управления знаниями
 Settings = Настройки
-KnowledgeManagementSetupPage = Knowledge Management System setup page
+KnowledgeManagementSetupPage = Страница настройки системы управления знаниями
 
 
 #
 # About page
 #
 About = О
-KnowledgeManagementAbout = About Knowledge Management
-KnowledgeManagementAboutPage = Knowledge Management about page
+KnowledgeManagementAbout = Об управлении знаниями
+KnowledgeManagementAboutPage = Управление знаниями о странице
 
 #
 # Sample page
 #
-KnowledgeManagementArea = Knowledge Management
+KnowledgeManagementArea = Управление знаниями
 
 
 #
 # Menu
 #
-MenuKnowledgeRecord = Knowledge base
-ListOfArticles = List of articles
-NewKnowledgeRecord = New article
-ValidateReply = Validate solution
-KnowledgeRecords = Articles
+MenuKnowledgeRecord = База знаний
+ListKnowledgeRecord = Список статей
+NewKnowledgeRecord = Новая статья
+ValidateReply = Проверить решение
+KnowledgeRecords = Статьи
 KnowledgeRecord = Статья
-KnowledgeRecordExtraFields = Extrafields for Article
+KnowledgeRecordExtraFields = Дополнительные поля для статьи
diff --git a/htdocs/langs/ru_RU/languages.lang b/htdocs/langs/ru_RU/languages.lang
index 124dfd0d308..d66a0ce2e5f 100644
--- a/htdocs/langs/ru_RU/languages.lang
+++ b/htdocs/langs/ru_RU/languages.lang
@@ -1,11 +1,12 @@
 # Dolibarr language file - Source file is en_US - languages
-Language_am_ET=Ethiopian
+Language_am_ET=Эфиопский
 Language_ar_AR=Арабский
-Language_ar_EG=Arabic (Egypt)
+Language_ar_EG=Арабский (Египет)
 Language_ar_SA=Арабский
-Language_az_AZ=Azerbaijani
-Language_bn_BD=Bengali
-Language_bn_IN=Bengali (India)
+Language_ar_TN=Arabic (Tunisia)
+Language_az_AZ=Азербайджанский
+Language_bn_BD=Бенгальский
+Language_bn_IN=Бенгальский (Индия)
 Language_bg_BG=Болгарский
 Language_bs_BA=Боснийский
 Language_ca_ES=Каталанский
@@ -16,74 +17,75 @@ Language_de_DE=Немецкий
 Language_de_AT=Немецкий (Австрия)
 Language_de_CH=Немецкий (Швейцария)
 Language_el_GR=Греческий
-Language_el_CY=Greek (Cyprus)
+Language_el_CY=Греческий (Кипр)
 Language_en_AU=Английский (Австралия)
 Language_en_CA=Английский (Канада)
 Language_en_GB=Английский (Великобритания)
 Language_en_IN=Английский (Индия)
 Language_en_NZ=Английский (Новая Зеландия)
 Language_en_SA=Английский (Саудовская Аравия)
-Language_en_SG=English (Singapore)
+Language_en_SG=Английский (Сингапур)
 Language_en_US=Английский (США)
 Language_en_ZA=Английский (Южная Африка)
 Language_es_ES=Испанский
 Language_es_AR=Испанский (Аргентина)
-Language_es_BO=Spanish (Bolivia)
+Language_es_BO=Испанский (Боливия)
 Language_es_CL=Испанский (Чили)
-Language_es_CO=Spanish (Colombia)
+Language_es_CO=Испанский (Колумбия)
 Language_es_DO=Испанский (Доминиканская Республика)
-Language_es_EC=Spanish (Ecuador)
-Language_es_GT=Spanish (Guatemala)
+Language_es_EC=Испанский (Эквадор)
+Language_es_GT=Испанский (Гватемала)
 Language_es_HN=Испанский (Гондурас)
 Language_es_MX=Испанский (Мексика)
-Language_es_PA=Spanish (Panama)
+Language_es_PA=Испанский (Панама)
 Language_es_PY=Испанский (Парагвай)
 Language_es_PE=Испанский (Перу)
 Language_es_PR=Испанский (Пуэрто-Рико)
-Language_es_US=Spanish (USA)
-Language_es_UY=Spanish (Uruguay)
-Language_es_GT=Spanish (Guatemala)
-Language_es_VE=Spanish (Venezuela)
+Language_es_US=Испанский (США)
+Language_es_UY=Испанский (Уругвай)
+Language_es_GT=Испанский (Гватемала)
+Language_es_VE=Испанский (Венесуэла)
 Language_et_EE=Эстонский
 Language_eu_ES=Баскский
 Language_fa_IR=Персидский
-Language_fi_FI=Finnish
+Language_fi_FI=Финский
 Language_fr_BE=Французский (Бельгия)
 Language_fr_CA=Французский (Канада)
 Language_fr_CH=Французский (Швейцария)
-Language_fr_CI=French (Cost Ivory)
-Language_fr_CM=French (Cameroun)
+Language_fr_CI=Французский (Стоимость слоновой кости)
+Language_fr_CM=Французский (Камерун)
 Language_fr_FR=Французский
-Language_fr_GA=French (Gabon)
+Language_fr_GA=Французский (Габон)
 Language_fr_NC=Французский (Новая Каледония)
-Language_fr_SN=French (Senegal)
-Language_fy_NL=Frisian
-Language_gl_ES=Galician
+Language_fr_SN=Французский (Сенегал)
+Language_fy_NL=фризский
+Language_gl_ES=Галицкий
 Language_he_IL=Иврит
-Language_hi_IN=Hindi (India)
+Language_hi_IN=Хинди (Индия)
 Language_hr_HR=Хорватский
 Language_hu_HU=Венгерский
 Language_id_ID=Индонезийский
 Language_is_IS=Исландский
 Language_it_IT=Итальянский
-Language_it_CH=Italian (Switzerland)
+Language_it_CH=Итальянский (Швейцария)
 Language_ja_JP=Японский
-Language_ka_GE=Georgian
-Language_km_KH=Khmer
-Language_kn_IN=Kannada
+Language_ka_GE=Грузинский
+Language_km_KH=Кхмерский
+Language_kn_IN=Каннада
 Language_ko_KR=Корейский
 Language_lo_LA=Лаосский
 Language_lt_LT=Литовский
 Language_lv_LV=Латышский
 Language_mk_MK=Македонский
-Language_mn_MN=Mongolian
+Language_mn_MN=Монгольский
 Language_nb_NO=Норвежский (Букмол)
-Language_ne_NP=Nepali
+Language_ne_NP=Непальский
 Language_nl_BE=Голландский (Бельгия)
-Language_nl_NL=Dutch
+Language_nl_NL=нидерландский язык
 Language_pl_PL=Польский
 Language_pt_BR=Португальский (Бразилия)
 Language_pt_PT=Португальский
+Language_ro_MD=Румынский (Молдавия)
 Language_ro_RO=Румынский
 Language_ru_RU=Русский
 Language_ru_UA=Русский (Украина)
@@ -93,13 +95,13 @@ Language_sv_SV=Шведский
 Language_sv_SE=Шведский
 Language_sq_AL=Албанский
 Language_sk_SK=Словацкий
-Language_sr_RS=Serbian
-Language_sw_SW=Kiswahili
+Language_sr_RS=сербский
+Language_sw_SW=Кисуахили
 Language_th_TH=Тайский
 Language_uk_UA=Украинский
 Language_uz_UZ=Узбекский
 Language_vi_VN=Вьетнамский
 Language_zh_CN=Китайский
 Language_zh_TW=Китайский (традиционный)
-Language_zh_HK=Chinese (Hong Kong)
-Language_bh_MY=Malay
+Language_zh_HK=Китайский (Гонконг)
+Language_bh_MY=малайский
diff --git a/htdocs/langs/ru_RU/ldap.lang b/htdocs/langs/ru_RU/ldap.lang
index 19b3615ccf0..83813ef1867 100644
--- a/htdocs/langs/ru_RU/ldap.lang
+++ b/htdocs/langs/ru_RU/ldap.lang
@@ -5,7 +5,7 @@ LDAPInformationsForThisContact=Информация в базе данных LDA
 LDAPInformationsForThisUser=Информация в базе данных LDAP для этого пользователя
 LDAPInformationsForThisGroup=Информация в базе данных LDAP для этой группы
 LDAPInformationsForThisMember=Информация в базе данных LDAP для этого участника
-LDAPInformationsForThisMemberType=Information in LDAP database for this member type
+LDAPInformationsForThisMemberType=Информация в базе данных LDAP для этого типа члена
 LDAPAttributes=Атрибуты LDAP
 LDAPCard=Карточка LDAP
 LDAPRecordNotFound=Запись в базе данных LDAP не найдена
@@ -13,15 +13,15 @@ LDAPUsers=Пользователи в базе данных LDAP
 LDAPFieldStatus=Статус
 LDAPFieldFirstSubscriptionDate=Дата первой подписки
 LDAPFieldFirstSubscriptionAmount=Размер первой подписки
-LDAPFieldLastSubscriptionDate=Latest subscription date
-LDAPFieldLastSubscriptionAmount=Latest subscription amount
-LDAPFieldSkype=Skype id
-LDAPFieldSkypeExample=Example : skypeName
+LDAPFieldLastSubscriptionDate=Последняя дата подписки
+LDAPFieldLastSubscriptionAmount=Последняя сумма подписки
+LDAPFieldSkype=Skype ID
+LDAPFieldSkypeExample=Пример: skypeName
 UserSynchronized=Пользователь синхронизирован
 GroupSynchronized=Группа синхронизирована
 MemberSynchronized=Участник синхронизирован
-MemberTypeSynchronized=Member type synchronized
+MemberTypeSynchronized=Тип элемента синхронизирован
 ContactSynchronized=Контакт синхронизирован
 ForceSynchronize=Принудительная синхронизация Dolibarr -> LDAP
 ErrorFailedToReadLDAP=Не удалось прочитать базу данных LDAP. Проверьте настройку модуля LDAP  и доступность базы данных.
-PasswordOfUserInLDAP=Password of user in LDAP
+PasswordOfUserInLDAP=Пароль пользователя в LDAP
diff --git a/htdocs/langs/ru_RU/link.lang b/htdocs/langs/ru_RU/link.lang
index 6ec241979e2..edfddc8994b 100644
--- a/htdocs/langs/ru_RU/link.lang
+++ b/htdocs/langs/ru_RU/link.lang
@@ -7,5 +7,5 @@ ErrorFileNotLinked=Не возможно создать ссылку на фай
 LinkRemoved=Ссылка на файл %s удалена
 ErrorFailedToDeleteLink= При удалении ссылки на файл '<b>%s</b>' возникла ошибка
 ErrorFailedToUpdateLink= При обновлении ссылки на файл '<b>%s</b>' возникла ошибка
-URLToLink=URL to link
-OverwriteIfExists=Overwrite file if exists
+URLToLink=URL для ссылки
+OverwriteIfExists=Перезаписать файл, если он существует
diff --git a/htdocs/langs/ru_RU/loan.lang b/htdocs/langs/ru_RU/loan.lang
index da2b0e78468..f3ad2a23786 100644
--- a/htdocs/langs/ru_RU/loan.lang
+++ b/htdocs/langs/ru_RU/loan.lang
@@ -10,25 +10,25 @@ LoanCapital=Капитал
 Insurance=Страховка
 Interest=Доля капитала
 Nbterms=Количество условий
-Term=Term
-LoanAccountancyCapitalCode=Accounting account capital
-LoanAccountancyInsuranceCode=Accounting account insurance
-LoanAccountancyInterestCode=Accounting account interest
+Term=Срок
+LoanAccountancyCapitalCode=Бухгалтерский учет капитала
+LoanAccountancyInsuranceCode=Страхование бухгалтерского счета
+LoanAccountancyInterestCode=Бухгалтерский счет процентов
 ConfirmDeleteLoan=Подтвердите удаление этой ссуды
 LoanDeleted=Ссуда успешно удалена
 ConfirmPayLoan=Подтвердите, что эта ссуда оплачена
 LoanPaid=Ссуда оплачена
-ListLoanAssociatedProject=List of loan associated with the project
-AddLoan=Create loan
-FinancialCommitment=Financial commitment
+ListLoanAssociatedProject=Список ссуд, связанных с проектом
+AddLoan=Создать ссуду
+FinancialCommitment=Финансовые обязательства
 InterestAmount=Доля капитала
-CapitalRemain=Capital remain
-TermPaidAllreadyPaid = This term is allready paid
-CantUseScheduleWithLoanStartedToPaid = Can't use scheduler for a loan with payment started
-CantModifyInterestIfScheduleIsUsed = You can't modify interest if you use schedule
+CapitalRemain=Остается капитал
+TermPaidAllreadyPaid = Этот срок уже оплачен
+CantUseScheduleWithLoanStartedToPaid = Невозможно использовать планировщик для ссуды с начатым платежом
+CantModifyInterestIfScheduleIsUsed = Вы не можете изменить интерес, если используете расписание
 # Admin
 ConfigLoan=Настройка модуля Ссуды
-LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
-LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
-LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-CreateCalcSchedule=Edit financial commitment
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Бухгалтерский учет капитала по умолчанию
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Учет процентов по счету по умолчанию
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Страхование бухгалтерского счета по умолчанию
+CreateCalcSchedule=Изменить финансовое обязательство
diff --git a/htdocs/langs/ru_RU/mailmanspip.lang b/htdocs/langs/ru_RU/mailmanspip.lang
index f2e5ba49228..1ebc24d12fa 100644
--- a/htdocs/langs/ru_RU/mailmanspip.lang
+++ b/htdocs/langs/ru_RU/mailmanspip.lang
@@ -3,8 +3,8 @@ MailmanSpipSetup=Настройка модуля систем Mailman и SPIP
 MailmanTitle=Система управления электронными рассылками Mailman
 TestSubscribe=Для проверки подписки  на лист рассылки системы Mailman 
 TestUnSubscribe=Для проверки отказа от подписки  на лист рассылки системы Mailman 
-MailmanCreationSuccess=Subscription test was executed successfully
-MailmanDeletionSuccess=Unsubscription test was executed successfully
+MailmanCreationSuccess=Проверка подписки прошла успешно
+MailmanDeletionSuccess=Тест отказа от подписки был успешно выполнен
 SynchroMailManEnabled=Будет выполнено обновление системы Mailman 
 SynchroSpipEnabled=Будет выполнено обновление системы SPIP
 DescADHERENT_MAILMAN_ADMINPW=Пароль администратора системы Mailman 
@@ -23,5 +23,5 @@ DeleteIntoSpip=Удалить из системы SPIP
 DeleteIntoSpipConfirmation=Вы точно хотите удалить этого участника из системы SPIP?
 DeleteIntoSpipError=Не удалось удалить участника из системы SPIP
 SPIPConnectionFailed=Не удалось установить соединение с системой SPIP 
-SuccessToAddToMailmanList=%s successfully added to mailman list %s or SPIP database
-SuccessToRemoveToMailmanList=%s successfully removed from mailman list %s or SPIP database
+SuccessToAddToMailmanList=%s успешно добавлен в список рассылки %s или базу данных SPIP
+SuccessToRemoveToMailmanList=%s успешно удален из списка рассылки %s или базы данных SPIP
diff --git a/htdocs/langs/ru_RU/mails.lang b/htdocs/langs/ru_RU/mails.lang
index b7aaf5a94cb..42c839625da 100644
--- a/htdocs/langs/ru_RU/mails.lang
+++ b/htdocs/langs/ru_RU/mails.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - mails
 Mailing=Отправка
 EMailing=Отправка
-EMailings=EMailings
-AllEMailings=Все eMailings
+EMailings=Отправка
+AllEMailings=Все отправить
 MailCard=Отправка карточки
 MailRecipients=Получатели
 MailRecipient=Получатель
@@ -11,16 +11,16 @@ MailFrom=Отправитель
 MailErrorsTo=Ошибки в
 MailReply=Ответить
 MailTo=Получатель (и)
-MailToUsers=To user(s)
+MailToUsers=Пользователю (ам)
 MailCC=Копия
-MailToCCUsers=Copy to users(s)
+MailToCCUsers=Копировать пользователям
 MailCCC=Сохраненная копия
-MailTopic=Email subject
+MailTopic=Тема письма
 MailText=Сообщение
 MailFile=Присоединенные файлы
-MailMessage=Текст Email
-SubjectNotIn=Not in Subject
-BodyNotIn=Not in Body
+MailMessage=Текст письма
+SubjectNotIn=Не в теме
+BodyNotIn=Не в теле
 ShowEMailing=Показать адреса
 ListOfEMailings=Список emailings
 NewMailing=Новый адрес
@@ -43,137 +43,137 @@ MailSuccessfulySent=Письмо (от %s к %s) успешно принято 
 MailingSuccessfullyValidated=Электронная почта успешно подтверждена 
 MailUnsubcribe=Отказаться от рассылки
 MailingStatusNotContact=Не писать
-MailingStatusReadAndUnsubscribe=Read and unsubscribe
+MailingStatusReadAndUnsubscribe=Прочитать и отписаться 
 ErrorMailRecipientIsEmpty=Email получателя пуста
 WarningNoEMailsAdded=Нет новых сообщений, чтобы добавить в список получателей.
-ConfirmValidMailing=Are you sure you want to validate this emailing?
-ConfirmResetMailing=Warning, by re-initializing emailing <b>%s</b>, you will allow the re-sending this email in a bulk mailing. Are you sure you want to do this?
-ConfirmDeleteMailing=Are you sure you want to delete this emailing?
-NbOfUniqueEMails=No. of unique emails
-NbOfEMails=No. of EMails
+ConfirmValidMailing=Вы уверены, что хотите подтвердить это электронное письмо?
+ConfirmResetMailing=Внимание! Повторно инициализировав электронную почту <b> %s </b>, вы разрешите повторную отправку этого электронного письма в массовой рассылке. Вы уверены, что хотите это сделать?
+ConfirmDeleteMailing=Вы уверены, что хотите удалить это электронное письмо?
+NbOfUniqueEMails=Кол-во уникальных писем
+NbOfEMails=Кол-во писем
 TotalNbOfDistinctRecipients=Число различных адресатов
 NoTargetYet=Не определено еще получателей (Перейдите на вкладку 'Получатели')
-NoRecipientEmail=No recipient email for %s
+NoRecipientEmail=Нет адреса электронной почты получателя для %s
 RemoveRecipient=Удалить получателем
 YouCanAddYourOwnPredefindedListHere=Чтобы создать свой электронный селектор модуля, см. htdocs / входит / модули / рассылки / README.
 EMailTestSubstitutionReplacedByGenericValues=При тестовом режиме, замен переменных заменяются на общих ценностях
 MailingAddFile=Приложите этот файл
 NoAttachedFiles=Нет прикрепленных файлов
-BadEMail=Bad value for Email
-ConfirmCloneEMailing=Are you sure you want to clone this emailing?
+BadEMail=Плохое значение для электронной почты
+ConfirmCloneEMailing=Вы уверены, что хотите клонировать это электронное письмо?
 CloneContent=Клон сообщение
 CloneReceivers=Cloner получателей
-DateLastSend=Date of latest sending
+DateLastSend=Дата последней отправки
 DateSending=Дата отправки
 SentTo=Направлено в <b>%s</b>
 MailingStatusRead=Читать
-YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubscribe from mailing list
-ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubscribe" feature
-EMailSentToNRecipients=Email sent to %s recipients.
-EMailSentForNElements=Email sent for %s elements.
+YourMailUnsubcribeOK=Электронная почта <b> %s </b> правильно отписана от списка рассылки
+ActivateCheckReadKey=Ключ, используемый для шифрования URL-адреса, используемого для функций «Уведомление о прочтении» и «Отказ от подписки».
+EMailSentToNRecipients=Электронное письмо отправлено получателям %s.
+EMailSentForNElements=Электронное письмо отправлено для элементов %s.
 XTargetsAdded=<b>%s</b> добавлено в список получателей
-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 attachments in mass sending in this version).
-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.
-ResultOfMailSending=Result of mass Email sending
-NbSelected=Number selected
-NbIgnored=Number ignored
-NbSent=Number sent
-SentXXXmessages=%s message(s) sent.
-ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
-MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
-MailingModuleDescContactsByCompanyCategory=Contacts by third-party category
-MailingModuleDescContactsByCategory=Contacts by categories
-MailingModuleDescContactsByFunction=Contacts by position
-MailingModuleDescEmailsFromFile=Emails from file
-MailingModuleDescEmailsFromUser=Emails input by user
-MailingModuleDescDolibarrUsers=Users with Emails
-MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
-SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
-EmailCollectorFilterDesc=All filters must match to have an email being collected
+OnlyPDFattachmentSupported=Если PDF-документы уже были созданы для объектов для отправки, они будут прикреплены к электронному письму. В противном случае электронное письмо не будет отправлено (также обратите внимание, что в этой версии в качестве вложений при массовой рассылке поддерживаются только PDF-документы).
+AllRecipientSelected=Выбраны получатели записи %s (если известен их адрес электронной почты).
+GroupEmails=Групповые электронные письма
+OneEmailPerRecipient=Одно электронное письмо на каждого получателя (по умолчанию, одно электронное письмо на каждую выбранную запись)
+WarningIfYouCheckOneRecipientPerEmail=Предупреждение: если вы установите этот флажок, это означает, что для нескольких выбранных записей будет отправлено только одно электронное письмо, поэтому, если ваше сообщение содержит переменные подстановки, которые относятся к данным записи, их невозможно заменить.
+ResultOfMailSending=Результат массовой рассылки писем
+NbSelected=Номер выбран
+NbIgnored=Номер проигнорирован
+NbSent=Номер отправлен
+SentXXXmessages=Сообщение (я) %s отправлено.
+ConfirmUnvalidateEmailing=Вы действительно хотите изменить адрес электронной почты <b> %s </b> на статус черновика?
+MailingModuleDescContactsWithThirdpartyFilter=Связаться с клиентскими фильтрами
+MailingModuleDescContactsByCompanyCategory=Контакты по сторонним категориям
+MailingModuleDescContactsByCategory=Контакты по категориям
+MailingModuleDescContactsByFunction=Контакты по должности
+MailingModuleDescEmailsFromFile=Электронные письма из файла
+MailingModuleDescEmailsFromUser=Электронные письма, введенные пользователем
+MailingModuleDescDolibarrUsers=Пользователи с электронной почтой
+MailingModuleDescThirdPartiesByCategories=Третьи стороны (по категориям)
+SendingFromWebInterfaceIsNotAllowed=Отправка из веб-интерфейса не разрешена.
+EmailCollectorFilterDesc=Все фильтры должны совпадать, чтобы электронная почта была собрана
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Линия %s в файл
 RecipientSelectionModules=Определяется запросы для получателей выбор
 MailSelectedRecipients=Отобранные получатели
 MailingArea=EMailings области
-LastMailings=Latest %s emailings
+LastMailings=Последние электронные письма от %s
 TargetsStatistics=Цели статистика
 NbOfCompaniesContacts=Уникальный контактов компаний
 MailNoChangePossible=Получатели для подтверждена электронной почте не может быть изменен
 SearchAMailing=Поиск рассылку
 SendMailing=Отправить по электронной почте
 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:
+MailingNeedCommand=Отправку электронного письма можно выполнить из командной строки. Попросите администратора сервера запустить следующую команду, чтобы отправить электронное письмо всем получателям:
 MailingNeedCommand2=Однако вы можете отправить их в Интернете, добавив параметр MAILING_LIMIT_SENDBYWEB с величиной максимальное количество писем вы хотите отправить на сессии.
-ConfirmSendingEmailing=If you want to send emailing directly from this screen, please confirm you are sure you want to send emailing now from your browser ?
-LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
+ConfirmSendingEmailing=Если вы хотите отправить электронное письмо прямо с этого экрана, подтвердите, что вы действительно хотите отправить электронное письмо прямо сейчас из своего браузера?
+LimitSendingEmailing=Примечание. Отправка электронных писем из веб-интерфейса выполняется несколько раз по соображениям безопасности и тайм-аута, получатели <b> %s </b> одновременно для каждого сеанса отправки.
 TargetsReset=Очистить список
 ToClearAllRecipientsClickHere=Чтобы очистить получателей список для этого адреса, нажмите кнопку
 ToAddRecipientsChooseHere=Чтобы добавить адресатов, выберите в этих списках
 NbOfEMailingsReceived=Массовые emailings получил
 NbOfEMailingsSend=Массовая Email-рассылка
 IdRecord=Код записи
-DeliveryReceipt=Delivery Ack.
+DeliveryReceipt=Подтверждение доставки.
 YouCanUseCommaSeparatorForSeveralRecipients=Вы можете использовать сепаратор для <b>запятую</b> указать несколько получателей.
 TagCheckMail=Отслеживать открытие писем
 TagUnsubscribe=Ссылка для отказа от подписки
-TagSignature=Signature of sending user
-EMailRecipient=Recipient Email
-TagMailtoEmail=Recipient Email (including html "mailto:" link)
-NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
+TagSignature=Подпись отправляющего пользователя
+EMailRecipient=Электронная почта получателя
+TagMailtoEmail=Электронная почта получателя (включая HTML-ссылку "mailto:")
+NoEmailSentBadSenderOrRecipientEmail=Электронное письмо не отправлено. Неправильный адрес электронной почты отправителя или получателя. Проверить профиль пользователя.
 # Module Notifications
 Notifications=Уведомления
-NotificationsAuto=Notifications Auto.
-NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
-ANotificationsWillBeSent=1 automatic notification will be sent by email
-SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
-AddNewNotification=Subscribe to a new automatic email notification (target/event)
-ListOfActiveNotifications=List of all active subscriptions (targets/events) for automatic email notification
-ListOfNotificationsDone=List of all automatic email notifications sent
-MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
-MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
-MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
-YouCanAlsoUseSupervisorKeyword=You can also add the keyword <strong>__SUPERVISOREMAIL__</strong> to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
-NbOfTargetedContacts=Current number of targeted contact emails
-UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;firstname;other</strong>
-UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
-MailAdvTargetRecipients=Recipients (advanced selection)
-AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
-AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
-AdvTgtSearchIntHelp=Use interval to select int or float value
-AdvTgtMinVal=Minimum value
-AdvTgtMaxVal=Maximum value
-AdvTgtSearchDtHelp=Use interval to select date value
-AdvTgtStartDt=Start dt.
-AdvTgtEndDt=End dt.
-AdvTgtTypeOfIncudeHelp=Target Email of third party and email of contact of the third party, or just third-party email or just contact email
-AdvTgtTypeOfIncude=Type of targeted email
-AdvTgtContactHelp=Use only if you target contact into "Type of targeted email"
-AddAll=Add all
-RemoveAll=Remove all
-ItemsCount=Item(s)
-AdvTgtNameTemplate=Filter name
-AdvTgtAddContact=Add emails according to criteria
-AdvTgtLoadFilter=Load filter
-AdvTgtDeleteFilter=Delete filter
-AdvTgtSaveFilter=Save filter
-AdvTgtCreateFilter=Create filter
-AdvTgtOrCreateNewFilter=Name of new filter
-NoContactWithCategoryFound=No contact/address with a category found
-NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing emails
-InGoingEmailSetup=Incoming emails
-OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
-DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
+NotificationsAuto=Уведомления Авто.
+NoNotificationsWillBeSent=Для этого типа мероприятия и компании автоматические уведомления по электронной почте не запланированы.
+ANotificationsWillBeSent=1 автоматическое уведомление будет отправлено по электронной почте
+SomeNotificationsWillBeSent=%s автоматические уведомления будут отправляться по электронной почте
+AddNewNotification=Подпишитесь на новое автоматическое уведомление по электронной почте (цель / событие)
+ListOfActiveNotifications=Список всех активных подписок (целей / событий) для автоматического уведомления по электронной почте
+ListOfNotificationsDone=Список всех отправленных автоматических уведомлений по электронной почте
+MailSendSetupIs=Конфигурация отправки электронной почты была настроена на «%s». Этот режим нельзя использовать для массовой рассылки электронных писем.
+MailSendSetupIs2=Сначала необходимо зайти с учетной записью администратора в меню %sГлавная - Настройки - EMails %s и изменить параметр<strong>'%s'</strong> в режим использования '%s'. В этом режиме вы можете войти в настройку SMTP-сервера, предоставленного вашим интернет-провайдером, и использовать функцию массовой рассылки электронной почты.
+MailSendSetupIs3=Если у вас есть какие-либо вопросы о том, как настроить SMTP-сервер, вы можете задать их по адресу %s.
+YouCanAlsoUseSupervisorKeyword=Вы также можете добавить ключевое слово <strong> __SUPERVISOREMAIL__ </strong>, чтобы электронная почта отправлялась супервизору пользователя (работает, только если электронная почта определена для этого супервизора)
+NbOfTargetedContacts=Текущее количество целевых контактных писем
+UseFormatFileEmailToTarget=Импортированный файл должен иметь формат <strong> email; name; firstname; other </strong>
+UseFormatInputEmailToTarget=Введите строку в формате <strong> адрес электронной почты; имя; имя; другое </strong>
+MailAdvTargetRecipients=Получатели (расширенный выбор)
+AdvTgtTitle=Заполните поля ввода, чтобы предварительно выбрать третьих лиц или контакты / адреса для таргетинга
+AdvTgtSearchTextHelp=Используйте %% в качестве подстановочных знаков. Например, чтобы найти все элементы типа <b> jean, joe, jim </b>, вы можете ввести <b> j%% </b>, вы также можете использовать; в качестве разделителя значения и используйте! за исключением этого значения. Например, <b> jean; joe; jim%%;! Jimo;! Jima%% </b> будет нацеливаться на всех jean, joe, начинать с jim, но не на jimo, и не на все, что начинается с jima
+AdvTgtSearchIntHelp=Используйте интервал для выбора значения типа int или float
+AdvTgtMinVal=Минимальное значение
+AdvTgtMaxVal=Максимальное значение
+AdvTgtSearchDtHelp=Используйте интервал для выбора значения даты
+AdvTgtStartDt=Начать dt.
+AdvTgtEndDt=Конец дт.
+AdvTgtTypeOfIncudeHelp=Целевой адрес электронной почты третьего лица и адрес электронной почты контакта третьего лица, или просто сторонний адрес электронной почты, или просто контактный адрес электронной почты
+AdvTgtTypeOfIncude=Тип целевой электронной почты
+AdvTgtContactHelp=Используйте только в том случае, если вы нацеливаете контакт на «Тип целевого адреса электронной почты».
+AddAll=Добавить все
+RemoveAll=Убрать все
+ItemsCount=Предметы)
+AdvTgtNameTemplate=Имя фильтра
+AdvTgtAddContact=Добавляйте электронные письма в соответствии с критериями
+AdvTgtLoadFilter=Загрузить фильтр
+AdvTgtDeleteFilter=Удалить фильтр
+AdvTgtSaveFilter=Сохранить фильтр
+AdvTgtCreateFilter=Создать фильтр
+AdvTgtOrCreateNewFilter=Название нового фильтра
+NoContactWithCategoryFound=Контакт / адрес с категорией не найдены
+NoContactLinkedToThirdpartieWithCategoryFound=Контакт / адрес с категорией не найдены
+OutGoingEmailSetup=Исходящие письма
+InGoingEmailSetup=Входящие письма
+OutGoingEmailSetupForEmailing=Исходящие письма (для модуля %s)
+DefaultOutgoingEmailSetup=Та же конфигурация, что и глобальная настройка исходящей электронной почты
 Information=Информация
-ContactsWithThirdpartyFilter=Contacts with third-party filter
-Unanswered=Unanswered
-Answered=Answered
-IsNotAnAnswer=Is not answer (initial email)
-IsAnAnswer=Is an answer of an initial email
-RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
-DefaultBlacklistMailingStatus=Default contact status for refuse bulk emailing
-DefaultStatusEmptyMandatory=Empty but mandatory
+ContactsWithThirdpartyFilter=Контакты со сторонним фильтром
+Unanswered=Без ответа
+Answered=Ответил
+IsNotAnAnswer=Нет ответа (исходное письмо)
+IsAnAnswer=Это ответ на исходное электронное письмо
+RecordCreatedByEmailCollector=Запись, созданная сборщиком электронной почты %s из электронной почты %s
+DefaultBlacklistMailingStatus=Статус контакта по умолчанию для отказа от массовой рассылки писем
+DefaultStatusEmptyMandatory=Пусто, но обязательно
diff --git a/htdocs/langs/ru_RU/main.lang b/htdocs/langs/ru_RU/main.lang
index 87b13c7d185..dbb85c167f4 100644
--- a/htdocs/langs/ru_RU/main.lang
+++ b/htdocs/langs/ru_RU/main.lang
@@ -29,8 +29,8 @@ AvailableVariables=Доступны переменные для замены
 NoTranslation=Нет перевода
 Translation=Перевод
 CurrentTimeZone=Текущий часовой пояс в настройках PHP
-EmptySearchString=Enter non empty search criterias
-EnterADateCriteria=Enter a date criteria
+EmptySearchString=Введите непустые критерии поиска
+EnterADateCriteria=Введите критерии даты
 NoRecordFound=Запись не найдена
 NoRecordDeleted=Нет удаленных записей
 NotEnoughDataYet=Недостаточно данных
@@ -87,8 +87,8 @@ FileWasNotUploaded=Файл выбран как вложение, но пока
 NbOfEntries=Кол-во записей
 GoToWikiHelpPage=Читать интернет-справку (необходим доступ к Интернету)
 GoToHelpPage=Читать помощь
-DedicatedPageAvailable=There is a dedicated help page related to your current screen
-HomePage=Home Page
+DedicatedPageAvailable=Существует специальная страница справки, относящаяся к вашему текущему экрану
+HomePage=Домашняя страница
 RecordSaved=Запись сохранена
 RecordDeleted=Запись удалена
 RecordGenerated=Запись сгенерирована
@@ -118,7 +118,7 @@ InformationToHelpDiagnose=Эта информация может быть пол
 MoreInformation=Подробнее
 TechnicalInformation=Техническая информация
 TechnicalID=Технический идентификатор
-LineID=Line ID
+LineID=ID линии
 NotePublic=Примечание (публичное)
 NotePrivate=Примечание (личное)
 PrecisionUnitIsLimitedToXDecimals=Dolibarr был настроен на ограничение точности цены единицы до <b>%s</b> десятых.
@@ -159,7 +159,7 @@ RemoveLink=Удалить ссылку
 AddToDraft=Добавить к черновику
 Update=Обновить
 Close=Закрыть
-CloseAs=Set status to
+CloseAs=Установить статус на
 CloseBox=Удалить виджет с Информ-панели
 Confirm=Подтвердить
 ConfirmSendCardByMail=Отправить содержимое этой карты по почте на <b>%s</b> ?
@@ -175,12 +175,12 @@ ToValidate=На проверке
 NotValidated=Не подтвержден
 Save=Сохранить
 SaveAs=Сохранить как
-SaveAndStay=Save and stay
-SaveAndNew=Save and new
+SaveAndStay=Сохранить и остаться
+SaveAndNew=Сохранить и новый
 TestConnection=Проверка подключения
 ToClone=Дублировать
-ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
-ConfirmClone=Choose the data you want to clone:
+ConfirmCloneAsk=Вы действительно хотите клонировать объект <b> %s </b>?
+ConfirmClone=Выберите данные, которые хотите клонировать:
 NoCloneOptionsSpecified=Данные для дублирования не определены.
 Of=из
 Go=Выполнить
@@ -191,8 +191,8 @@ Hide=Скрытый
 ShowCardHere=Показать карточку
 Search=Поиск
 SearchOf=Поиск
-SearchMenuShortCut=Ctrl + shift + f
-QuickAdd=Quick add
+SearchMenuShortCut=Ctrl + Shift + F
+QuickAdd=Быстрое добавление
 QuickAddMenuShortCut=Ctrl + shift + l
 Valid=Действительный
 Approve=Утвердить
@@ -201,7 +201,7 @@ ReOpen=Переоткрыть
 Upload=Загрузить
 ToLink=Ссылка
 Select=Выбор
-SelectAll=Select all
+SelectAll=Выбрать все
 Choose=Выберите
 Resize=Изменение размера
 ResizeOrCrop=Изменение размера или обрезка
@@ -224,7 +224,7 @@ Value=Значение
 PersonalValue=Личное значение
 NewObject=Новый %s
 NewValue=Новое значение
-OldValue=Old value %s
+OldValue=Старое значение %s
 CurrentValue=Текущее значение
 Code=Код
 Type=Тип
@@ -246,7 +246,7 @@ DefaultModel=Шаблон документа по-умолчанию
 Action=Действие
 About=О
 Number=Номер
-NumberByMonth=Total reports by month
+NumberByMonth=Всего отчетов по месяцам
 AmountByMonth=Сумма за месяц
 Numero=Номер
 Limit=Лимит
@@ -263,7 +263,7 @@ Cards=Карточки
 Card=Карточка
 Now=Сейчас
 HourStart=Час начала
-Deadline=Deadline
+Deadline=Срок
 Date=Дата
 DateAndHour=Дата и час
 DateToday=Сегодняшняя дата
@@ -272,13 +272,13 @@ DateStart=Дата начала
 DateEnd=Дата окончания
 DateCreation=Дата создания
 DateCreationShort=Дата создания
-IPCreation=Creation IP
+IPCreation=Создание IP
 DateModification=Дата изменения
 DateModificationShort=Дата изм.
-IPModification=Modification IP
+IPModification=Модификация IP
 DateLastModification=Дата последнего изменения
 DateValidation=Дата проверки
-DateSigning=Signing date
+DateSigning=Дата подписания
 DateClosing=Дата закрытия
 DateDue=Срок выполнения
 DateValue=Дата зачисления
@@ -330,7 +330,7 @@ Morning=Утро
 Afternoon=После полудня
 Quadri=Квартал
 MonthOfDay=Месяц дня
-DaysOfWeek=Days of week
+DaysOfWeek=Дни недели
 HourShort=ч
 MinuteShort=мин.
 Rate=Курс
@@ -341,8 +341,8 @@ KiloBytes=Килобайт
 MegaBytes=Мегабайт
 GigaBytes=Гигабайт
 TeraBytes=Терабайт
-UserAuthor=Ceated by
-UserModif=Updated by
+UserAuthor=Создано
+UserModif=Обновлено
 b=б.
 Kb=Кб
 Mb=Мб
@@ -362,13 +362,13 @@ UnitPriceHTCurrency=Цена за единицу (без налога) (валю
 UnitPriceTTC=Цена за единицу
 PriceU=Цена ед.
 PriceUHT=Цена ед. (нетто)
-PriceUHTCurrency=U.P (net) (currency)
+PriceUHTCurrency=U.P (нетто) (валюта)
 PriceUTTC=Цена ед. (с налогом)
 Amount=Сумма
 AmountInvoice=Сумма счета-фактуры
 AmountInvoiced=Сумма выставленного счета
-AmountInvoicedHT=Amount invoiced (excl. tax)
-AmountInvoicedTTC=Amount invoiced (inc. tax)
+AmountInvoicedHT=Сумма счета (без налогов)
+AmountInvoicedTTC=Сумма счета (включая налог)
 AmountPayment=Сумма платежа
 AmountHTShort=Сумма (без налога)
 AmountTTCShort=Сумма (вкл-я налог)
@@ -381,7 +381,7 @@ MulticurrencyPaymentAmount=Сумма платежа, в оригинально
 MulticurrencyAmountHT=Сумма (без налога), исходная валюта
 MulticurrencyAmountTTC=Сумма (с налогом), в исходной валюте
 MulticurrencyAmountVAT=Сумма налога, в исходной валюте
-MulticurrencySubPrice=Amount sub price multi currency
+MulticurrencySubPrice=Сумма субцена мультивалютная
 AmountLT1=Сумма налога 2
 AmountLT2=Сумма налога 3
 AmountLT1ES=Сумма RE
@@ -390,8 +390,8 @@ AmountTotal=Общая сумма
 AmountAverage=Средняя сумма
 PriceQtyMinHT=Цена за мин. количество (без налога)
 PriceQtyMinHTCurrency=Цена за мин. количество (без налога) (валюта)
-PercentOfOriginalObject=Percent of original object
-AmountOrPercent=Amount or percent
+PercentOfOriginalObject=Процент оригинального объекта
+AmountOrPercent=Сумма или процент
 Percentage=Процент
 Total=Всего
 SubTotal=Подитог
@@ -430,6 +430,7 @@ LT1IN=CGST
 LT2IN=SGST
 LT1GC=Дополнительные центы
 VATRate=Ставка НДС
+RateOfTaxN=Ставка налога %s
 VATCode=Код ставки налога
 VATNPR=Налоговая ставка NPR
 DefaultTaxRate=Ставка налога по умолчанию
@@ -441,10 +442,10 @@ RemainToPay=Осталось заплатить
 Module=Модуль/Приложение
 Modules=Модули/Приложения
 Option=Опция
-Filters=Filters
+Filters=Фильтры
 List=Список
 FullList=Полный список
-FullConversation=Full conversation
+FullConversation=Полный разговор
 Statistics=Статистика
 OtherStatistics=Другие статистические данные
 Status=Статус
@@ -473,7 +474,7 @@ ContactsAddressesForCompany=Контакты/Адреса для этого ко
 AddressesForCompany=Адреса для этого контарагента
 ActionsOnCompany=События для этого контрагента
 ActionsOnContact=Событие для этого контакта/адреса
-ActionsOnContract=Events for this contract
+ActionsOnContract=События для этого контракта
 ActionsOnMember=События этого участника
 ActionsOnProduct=События об этом продукте
 NActionsLate=% с опозданием
@@ -493,7 +494,7 @@ TotalDuration=Общая продолжительность
 Summary=Общее
 DolibarrStateBoard=Статистика базы данных
 DolibarrWorkBoard=Открытые позиции
-NoOpenedElementToProcess=No open element to process
+NoOpenedElementToProcess=Нет открытого элемента для обработки
 Available=Доступно
 NotYetAvailable=Пока не доступно
 NotAvailable=Не доступно
@@ -507,7 +508,7 @@ to=к
 To=к
 ToDate=к
 ToLocation=к
-at=at
+at=в
 and=и
 or=или
 Other=Другой
@@ -528,7 +529,7 @@ Draft=Черновик
 Drafts=Черновики
 StatusInterInvoiced=Выставлен счет
 Validated=Подтверждено
-ValidatedToProduce=Validated (To produce)
+ValidatedToProduce=Подтверждено (для производства)
 Opened=Открытые
 OpenAll=Открыто (Все)
 ClosedAll=Закрыто (все)
@@ -661,7 +662,7 @@ SupplierPreview=Предварительный просмотр поставщи
 ShowCustomerPreview=Показать обзор клиента
 ShowSupplierPreview=Показать предварительный просмотр поставщика
 RefCustomer=Ref. клиента
-InternalRef=Internal ref.
+InternalRef=Внутренний исх.
 Currency=Валюта
 InfoAdmin=Информация для администраторов
 Undo=Отмена
@@ -683,13 +684,13 @@ SendMail=Отправить письмо
 Email=Адрес электронной почты
 NoEMail=Нет Email
 AlreadyRead=Прочитано
-NotRead=Unread
+NotRead=Непрочитанный
 NoMobilePhone=Нет мобильного телефона
 Owner=Владелец
 FollowingConstantsWillBeSubstituted=Следующие константы будут подменять соответствующие значения.
 Refresh=Обновить
 BackToList=Вернуться к списку
-BackToTree=Back to tree
+BackToTree=Вернуться к дереву
 GoBack=Назад
 CanBeModifiedIfOk=Может быть изменено, если корректно
 CanBeModifiedIfKo=Может быть изменено, если ненекорректно
@@ -710,7 +711,7 @@ Method=Метод
 Receive=Получить
 CompleteOrNoMoreReceptionExpected=Завершено или ничего больше не ожидается
 ExpectedValue=Ожидаемое значение
-ExpectedQty=Expected Qty
+ExpectedQty=Ожидаемое количество
 PartialWoman=Частичное
 TotalWoman=Всего
 NeverReceived=Не было получено
@@ -727,9 +728,10 @@ MenuECM=Документы
 MenuAWStats=AWStats
 MenuMembers=Участники
 MenuAgendaGoogle=Google agenda
-MenuTaxesAndSpecialExpenses=Taxes | Special expenses
+MenuTaxesAndSpecialExpenses=Налоги | Особые расходы
 ThisLimitIsDefinedInSetup=Лимит Dolibarr (Меню Главная-Настройки-Безопасность): %s Кб, лимит PHP: %s Кб
-NoFileFound=No documents uploaded
+ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
+NoFileFound=Документы не загружены
 CurrentUserLanguage=Текущий язык
 CurrentTheme=Текущая тема
 CurrentMenuManager=Менеджер текущего меню
@@ -744,13 +746,13 @@ DateOfSignature=Дата подписи
 HidePassword=Показать команду со скрытым паролем
 UnHidePassword=Показать реальную команду с открытым паролем
 Root=Корень
-RootOfMedias=Root of public medias (/medias)
+RootOfMedias=Корень публичных медиа (/ medias)
 Informations=Информация
 Page=Страница
 Notes=Примечания
 AddNewLine=Добавить новую строку
 AddFile=Добавить файл
-FreeZone=Free-text product
+FreeZone=Произвольный текст
 FreeLineOfType=Элемент произвольного текста, набрать:
 CloneMainAttributes=Клонирование объекта с его основными атрибутами
 ReGeneratePDF=Повторно сгенерировать PDF
@@ -773,7 +775,7 @@ NotSupported=Не поддерживается
 RequiredField=Обязательное поле
 Result=Результат
 ToTest=Тест
-ValidateBefore=Item must be validated before using this feature
+ValidateBefore=Товар должен быть подтвержден перед использованием этой функции
 Visibility=Видимость
 Totalizable=Суммирование
 TotalizableDesc=Это поле суммируемо в списке
@@ -801,7 +803,7 @@ LinkToSupplierProposal=Ссылка на предложение поставщи
 LinkToSupplierInvoice=Ссылка на счет поставщика
 LinkToContract=Ссылка на контакт
 LinkToIntervention=Ссылка на мероприятие
-LinkToTicket=Link to ticket
+LinkToTicket=Ссылка на билет
 CreateDraft=Создать черновик
 SetToDraft=Назад к черновику
 ClickToEdit=Нажмите, чтобы изменить
@@ -845,7 +847,7 @@ XMoreLines=%s строк(и) скрыто
 ShowMoreLines=Показать больше/меньше строк
 PublicUrl=Публичная ссылка
 AddBox=Добавить бокс
-SelectElementAndClick=Select an element and click on %s
+SelectElementAndClick=Выберите элемент и щелкните %s
 PrintFile=Печать файл %s
 ShowTransaction=Показать транзакцию на банковском счете
 ShowIntervention=Показать посредничества
@@ -856,20 +858,20 @@ Denied=Запрещено
 ListOf=Список %s
 ListOfTemplates=Список шаблонов
 Gender=Пол
-Genderman=Male
-Genderwoman=Female
+Genderman=Мужчина
+Genderwoman=Женщина
 Genderother=Другое
 ViewList=Посмотреть список
-ViewGantt=Gantt view
-ViewKanban=Kanban view
+ViewGantt=Представление Ганта
+ViewKanban=Канбан вид
 Mandatory=Обязательно
 Hello=Здравствуйте
 GoodBye=До свидания
 Sincerely=С уважением,
-ConfirmDeleteObject=Are you sure you want to delete this object?
+ConfirmDeleteObject=Вы уверены, что хотите удалить этот объект?
 DeleteLine=Удалить строку
 ConfirmDeleteLine=Вы точно хотите удалить эту строку?
-ErrorPDFTkOutputFileNotFound=Error: the file was not generated. Please check that the 'pdftk' command is installed in a directory included in the $PATH environment variable (linux/unix only) or contact your system administrator.
+ErrorPDFTkOutputFileNotFound=Ошибка: файл не был создан. Убедитесь, что команда pdftk установлена в каталоге, включенном в переменную среды $ PATH (только для linux / unix), или обратитесь к системному администратору.
 NoPDFAvailableForDocGenAmongChecked=PDF не доступен для документов созданных из выбранных записей
 TooManyRecordForMassAction=Слишком много записей выбрано для пакетного действия. Действие ограничено списком из %s записей.
 NoRecordSelected=Нет выделенных записей
@@ -884,7 +886,7 @@ Progress=Прогресс
 ProgressShort=Прогресс
 FrontOffice=Дирекция
 BackOffice=Бэк-офис
-Submit=Submit
+Submit=Представлять на рассмотрение
 View=Вид
 Export=Экспорт
 Exports=Экспорт
@@ -900,14 +902,14 @@ Miscellaneous=Разное
 Calendar=Календарь
 GroupBy=Группировка по...
 ViewFlatList=Вид плоским списком
-ViewAccountList=View ledger
-ViewSubAccountList=View subaccount ledger
+ViewAccountList=Посмотреть бухгалтерскую книгу
+ViewSubAccountList=Просмотр книги вспомогательного счета
 RemoveString=Удалить строку '%s'
 SomeTranslationAreUncomplete=Некоторые из предлагаемых языков пакетов могут быть переведены только частично или могут содержать ошибки. Пожалуйста, помогите исправить ваш язык, зарегистрировавшись по адресу <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/,</a> чтобы добавить свои улучшения.
-DirectDownloadLink=Public download link
-PublicDownloadLinkDesc=Only the link is required to download the file
-DirectDownloadInternalLink=Private download link
-PrivateDownloadLinkDesc=You need to be logged and you need permissions to view or download the file
+DirectDownloadLink=Публичная ссылка для скачивания
+PublicDownloadLinkDesc=Для скачивания файла требуется только ссылка
+DirectDownloadInternalLink=Частная ссылка для скачивания
+PrivateDownloadLinkDesc=Вам необходимо войти в систему и получить разрешения на просмотр или загрузку файла.
 Download=Загрузка
 DownloadDocument=Скачать документ
 ActualizeCurrency=Обновить текущий курс
@@ -972,39 +974,39 @@ ShortThursday=Чт
 ShortFriday=Пт
 ShortSaturday=Сб
 ShortSunday=Вс
-one=one
-two=two
-three=three
-four=four
-five=five
-six=six
-seven=seven
-eight=eight
-nine=nine
-ten=ten
-eleven=eleven
-twelve=twelve
-thirteen=thirdteen
-fourteen=fourteen
-fifteen=fifteen
-sixteen=sixteen
-seventeen=seventeen
-eighteen=eighteen
-nineteen=nineteen
-twenty=twenty
-thirty=thirty
-forty=forty
-fifty=fifty
-sixty=sixty
-seventy=seventy
-eighty=eighty
-ninety=ninety
-hundred=hundred
-thousand=thousand
-million=million
-billion=billion
-trillion=trillion
-quadrillion=quadrillion
+one=один
+two=два
+three=три
+four=четыре
+five=пять
+six=шесть
+seven=Семь
+eight=восемь
+nine=девять
+ten=десять
+eleven=одиннадцать
+twelve=двенадцать
+thirteen=третийнадцать
+fourteen=четырнадцать
+fifteen=пятнадцать
+sixteen=шестнадцать
+seventeen=семнадцать
+eighteen=18
+nineteen=19
+twenty=двадцать
+thirty=30
+forty=сорок
+fifty=пятьдесят
+sixty=шестьдесят
+seventy=семьдесят
+eighty=восемьдесят
+ninety=девяносто
+hundred=сотня
+thousand=тысяча
+million=миллион
+billion=миллиард
+trillion=триллион
+quadrillion=квадриллион
 SelectMailModel=Выберите шаблон электронной почты
 SetRef=Настроить источник
 Select2ResultFoundUseArrows=Найдено несколько результатов. Используйте стрелки для выбора.
@@ -1020,9 +1022,9 @@ SearchIntoContacts=Контакты
 SearchIntoMembers=Участники
 SearchIntoUsers=Пользователи
 SearchIntoProductsOrServices=Продукты или услуги
-SearchIntoBatch=Lots / Serials
+SearchIntoBatch=Лоты / Сериалы
 SearchIntoProjects=Проекты
-SearchIntoMO=Manufacturing Orders
+SearchIntoMO=Заказы на производство
 SearchIntoTasks=Задание
 SearchIntoCustomerInvoices=Счета клиента
 SearchIntoSupplierInvoices=Счета-фактуры поставщика
@@ -1036,7 +1038,7 @@ SearchIntoCustomerShipments=Отгрузки клиентам
 SearchIntoExpenseReports=Отчёты о затратах
 SearchIntoLeaves=Отпуск
 SearchIntoTickets=Заявки
-SearchIntoCustomerPayments=Customer payments
+SearchIntoCustomerPayments=Платежи клиентов
 SearchIntoVendorPayments=Платежи поставщику
 SearchIntoMiscPayments=Смешанные платежи
 CommentLink=Комментарии
@@ -1057,13 +1059,13 @@ KeyboardShortcut=Сочетание клавиш
 AssignedTo=Ответств.
 Deletedraft=Удалить черновик
 ConfirmMassDraftDeletion=Подтверждение пакетного удаления Черновиков
-FileSharedViaALink=File shared with a public link
+FileSharedViaALink=К файлу предоставлен доступ по публичной ссылке
 SelectAThirdPartyFirst=Сначала выберите контрагента ...
 YouAreCurrentlyInSandboxMode=В настоящее время вы в  %s режиме "песочницы"
 Inventory=Инвентаризация
 AnalyticCode=Аналитический код
 TMenuMRP=ППМ
-ShowCompanyInfos=Show company infos
+ShowCompanyInfos=Показать информацию о компании
 ShowMoreInfos=Показать больше информации
 NoFilesUploadedYet=Пожалуйста, загрузите сначала документ
 SeePrivateNote=Смотреть личную заметку
@@ -1071,64 +1073,67 @@ PaymentInformation=Платежная информация
 ValidFrom=Действительно с
 ValidUntil=Действительно до
 NoRecordedUsers=Нет пользователей
-ToClose=To close
+ToClose=Слишком близко
+ToRefuse=Отказать
 ToProcess=Для обработки
-ToApprove=To approve
-GlobalOpenedElemView=Global view
-NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
-NoArticlesFoundForTheCategory=No article found for the category
-ToAcceptRefuse=To accept | refuse
+ToApprove=Утверждать
+GlobalOpenedElemView=Глобальный взгляд
+NoArticlesFoundForTheKeyword=Не найдено статьи по ключевому слову "<strong> %s </strong>"
+NoArticlesFoundForTheCategory=В категории не найдено статей
+ToAcceptRefuse=Принять | мусор
 ContactDefault_agenda=Событие
 ContactDefault_commande=Заказ
 ContactDefault_contrat=Договор
 ContactDefault_facture=Счёт
 ContactDefault_fichinter=Посредничество
-ContactDefault_invoice_supplier=Supplier Invoice
-ContactDefault_order_supplier=Purchase Order
+ContactDefault_invoice_supplier=Счет поставщика
+ContactDefault_order_supplier=Заказ на покупку
 ContactDefault_project=Проект
 ContactDefault_project_task=Задача
 ContactDefault_propal=Предложение
-ContactDefault_supplier_proposal=Supplier Proposal
-ContactDefault_ticket=Ticket
-ContactAddedAutomatically=Contact added from contact thirdparty roles
-More=More
-ShowDetails=Show details
-CustomReports=Custom reports
-StatisticsOn=Statistics on
-SelectYourGraphOptionsFirst=Select your graph options to build a graph
-Measures=Measures
-XAxis=X-Axis
-YAxis=Y-Axis
-StatusOfRefMustBe=Status of %s must be %s
-DeleteFileHeader=Confirm file delete
-DeleteFileText=Do you really want delete this file?
-ShowOtherLanguages=Show other languages
-SwitchInEditModeToAddTranslation=Switch in edit mode to add translations for this language
-NotUsedForThisCustomer=Not used for this customer
-AmountMustBePositive=Amount must be positive
-ByStatus=By status
+ContactDefault_supplier_proposal=Предложение поставщика
+ContactDefault_ticket=Проездной билет
+ContactAddedAutomatically=Контакт добавлен из сторонних контактов контакта
+More=Более
+ShowDetails=Показать детали
+CustomReports=Пользовательские отчеты
+StatisticsOn=Статистика по
+SelectYourGraphOptionsFirst=Выберите параметры графика, чтобы построить график
+Measures=Меры
+XAxis=Ось X
+YAxis=Ось Y
+StatusOfRefMustBe=Статус %s должен быть %s
+DeleteFileHeader=Подтвердите удаление файла
+DeleteFileText=Вы действительно хотите удалить этот файл?
+ShowOtherLanguages=Показать другие языки
+SwitchInEditModeToAddTranslation=Переключитесь в режим редактирования, чтобы добавить переводы для этого языка
+NotUsedForThisCustomer=Не используется для этого клиента
+AmountMustBePositive=Сумма должна быть положительной
+ByStatus=По статусу
 InformationMessage=Информация
-Used=Used
-ASAP=As Soon As Possible
-CREATEInDolibarr=Record %s created
-MODIFYInDolibarr=Record %s modified
-DELETEInDolibarr=Record %s deleted
-VALIDATEInDolibarr=Record %s validated
-APPROVEDInDolibarr=Record %s approved
-DefaultMailModel=Default Mail Model
-PublicVendorName=Public name of vendor
+Used=Использовал
+ASAP=Как можно скорее
+CREATEInDolibarr=Запись %s создана
+MODIFYInDolibarr=Запись %s изменена
+DELETEInDolibarr=Запись %s удалена
+VALIDATEInDolibarr=Запись %s подтверждена
+APPROVEDInDolibarr=Запись %s утверждена
+DefaultMailModel=Модель почты по умолчанию
+PublicVendorName=Публичное название продавца
 DateOfBirth=Дата рождения
-SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again.
-UpToDate=Up-to-date
-OutOfDate=Out-of-date
-EventReminder=Event Reminder
-UpdateForAllLines=Update for all lines
-OnHold=On hold
-Civility=Civility
-AffectTag=Affect Tag
-ConfirmAffectTag=Bulk Tag Affect
-ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
-CategTypeNotFound=No tag type found for type of records
-CopiedToClipboard=Copied to clipboard
-InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
-ConfirmCancel=Are you sure you want to cancel
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Срок действия токена безопасности истек, действие отменено. Пожалуйста, попробуйте еще раз.
+UpToDate=До настоящего времени
+OutOfDate=Устаревший
+EventReminder=Напоминание о мероприятии
+UpdateForAllLines=Обновление для всех линий
+OnHold=На удерживании
+Civility=Вежливость
+AffectTag=Влияет на тег
+CreateExternalUser=Создать внешнего пользователя
+ConfirmAffectTag=Влияние массового тега
+ConfirmAffectTagQuestion=Вы действительно хотите изменить теги для выбранных записей %s?
+CategTypeNotFound=Тип тега для типа записей не найден
+CopiedToClipboard=Скопировано в буфер обмена
+InformationOnLinkToContract=Эта сумма представляет собой только сумму всех строк контракта. Время не принимается во внимание.
+ConfirmCancel=Вы уверены, что хотите отменить
+EmailMsgID=Email MsgID
diff --git a/htdocs/langs/ru_RU/margins.lang b/htdocs/langs/ru_RU/margins.lang
index a205fac2481..f42fa2b215c 100644
--- a/htdocs/langs/ru_RU/margins.lang
+++ b/htdocs/langs/ru_RU/margins.lang
@@ -15,31 +15,31 @@ margesSetup=Настройка управления доходомом с нац
 MarginDetails=Детали наценки
 ProductMargins=Товарные наценки
 CustomerMargins=Наценки клиентов
-SalesRepresentativeMargins=Sales representative margins
-ContactOfInvoice=Contact of invoice
+SalesRepresentativeMargins=Маржа торгового представителя
+ContactOfInvoice=Контакт счета-фактуры
 UserMargins=Пользовательские наценки
 ProductService=Продукт или Услуга
 AllProducts=Все продукты и услуги
 ChooseProduct/Service=Выберите продукт или услугу
-ForceBuyingPriceIfNull=Force buying/cost price to selling price if not defined
-ForceBuyingPriceIfNullDetails=If buying/cost price not provided when we add a new line, and this option is "ON", the margin will be 0 on the new line (buying/cost price = selling price). If this option is "OFF" (recommended), margin will be equal to the value suggested by default (and may be 100% if no default value can be found).
-MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
+ForceBuyingPriceIfNull=Если не указано иное, привязать цену покупки / себестоимости к цене продажи
+ForceBuyingPriceIfNullDetails=Если цена покупки / себестоимости не указана, когда мы добавляем новую строку, и эта опция включена, маржа будет равна 0 на новой строке (цена покупки / себестоимости = цена продажи). Если эта опция выключена (рекомендуется), маржа будет равна значению, предлагаемому по умолчанию (и может составлять 100%, если значение по умолчанию не может быть найдено).
+MARGIN_METHODE_FOR_DISCOUNT=Метод маржи для глобальных скидок
 UseDiscountAsProduct=Как товар
 UseDiscountAsService=Как услуга
 UseDiscountOnTotal=Включить подитог
-MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
-MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
-MargeType1=Margin on Best vendor price
-MargeType2=Margin on Weighted Average Price (WAP)
-MargeType3=Margin on Cost Price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best vendor price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best vendor price if WAP not yet defined
+MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Определяет, рассматривается ли глобальная скидка как продукт, услуга или только как промежуточный итог для расчета маржи.
+MARGIN_TYPE=Цена покупки / себестоимости, предлагаемая по умолчанию для расчета маржи
+MargeType1=Маржа по лучшей цене продавца
+MargeType2=Маржа по средневзвешенной цене (WAP)
+MargeType3=Маржа на себестоимость
+MarginTypeDesc=* Маржа по лучшей закупочной цене = Цена продажи - Лучшая цена поставщика, определенная в карточке продукта <br> * Маржа по средневзвешенной цене (WAP) = Цена продажи - Средневзвешенная цена продукта (WAP) или лучшая цена поставщика, если WAP еще не определена <br> * Маржа на Себестоимость = Цена продажи - Себестоимость, определенная в карточке продукта или WAP, если себестоимость не определена, или лучшая цена поставщика, если WAP еще не определен
 CostPrice=Себестоимость
-UnitCharges=Unit charges
-Charges=Charges
-AgentContactType=Commercial agent contact type
-AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per contact/address. Note that reading statistics on a contact is not reliable since in most cases the contact may not be defined explicitely on the invoices.
+UnitCharges=Стоимость единицы
+Charges=Сборы
+AgentContactType=Тип контакта коммерческого агента
+AgentContactTypeDetails=Определите, какой тип контакта (связанный в счетах-фактурах) будет использоваться для отчета о марже для каждого контакта / адреса. Обратите внимание, что чтение статистики по контакту ненадежно, поскольку в большинстве случаев контакт не может быть явно определен в счетах.
 rateMustBeNumeric=Ставка должна быть числом
-markRateShouldBeLesserThan100=Mark rate should be lower than 100
+markRateShouldBeLesserThan100=Оценка должна быть ниже 100
 ShowMarginInfos=Показать инф-цию о наценке
-CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any dedicated sale representative and some third parties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+CheckMargins=Детали полей
+MarginPerSaleRepresentativeWarning=В отчете о марже на пользователя используется связь между третьими сторонами и торговыми представителями для расчета маржи каждого торгового представителя. Поскольку некоторые третьи стороны могут не иметь специального торгового представителя, а некоторые третьи стороны могут быть связаны с несколькими, некоторые суммы могут не быть включены в этот отчет (если нет торгового представителя), а некоторые могут отображаться в разных строках (для каждого торгового представителя) .
diff --git a/htdocs/langs/ru_RU/members.lang b/htdocs/langs/ru_RU/members.lang
index 1dd21a7fcb0..8aaf6ec419c 100644
--- a/htdocs/langs/ru_RU/members.lang
+++ b/htdocs/langs/ru_RU/members.lang
@@ -6,7 +6,7 @@ Member=Участник
 Members=Участники
 ShowMember=Показать карточку участника
 UserNotLinkedToMember=Пользователь не связан с участником
-ThirdpartyNotLinkedToMember=Third party not linked to a member
+ThirdpartyNotLinkedToMember=Третья сторона не связана с участником
 MembersTickets=Члены Билеты
 FundationMembers=Члены фонда
 ListOfValidatedPublicMembers=Список проверенных общественности
@@ -15,26 +15,26 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Еще один член (имя и <
 ErrorUserPermissionAllowsToLinksToItselfOnly=По соображениям безопасности, вы должны получить разрешение, чтобы изменить все пользователи должны иметь доступ к ссылке члена к пользователю, что это не твое.
 SetLinkToUser=Ссылка на Dolibarr пользователя
 SetLinkToThirdParty=Ссылка на Dolibarr третья сторона
-MembersCards=Business cards for members
+MembersCards=Визитные карточки для участников
 MembersList=Список участников
 MembersListToValid=Список кандидатов в участники (на утверждении)
 MembersListValid=Список действительных участников
-MembersListUpToDate=List of valid members with up-to-date subscription
-MembersListNotUpToDate=List of valid members with out-of-date subscription
-MembersListExcluded=List of excluded members
-MembersListResiliated=List of terminated members
+MembersListUpToDate=Список действующих участников с актуальной подпиской
+MembersListNotUpToDate=Список действующих участников с устаревшей подпиской
+MembersListExcluded=Список исключенных участников
+MembersListResiliated=Список прекращенных участников
 MembersListQualified=Список квалифицированных участников
 MenuMembersToValidate=Проект участники
 MenuMembersValidated=Подтвержденные участники
-MenuMembersExcluded=Excluded members
-MenuMembersResiliated=Terminated members
+MenuMembersExcluded=Исключенные участники
+MenuMembersResiliated=Прекращенные члены
 MembersWithSubscriptionToReceive=Члены с подпиской на получение
-MembersWithSubscriptionToReceiveShort=Subscription to receive
+MembersWithSubscriptionToReceiveShort=Подписка на получение
 DateSubscription=Дата подписки
 DateEndSubscription=Дата окончания подписки
-EndSubscription=Subscription Ends
+EndSubscription=Подписка заканчивается
 SubscriptionId=ID подписки
-WithoutSubscription=Without subscription
+WithoutSubscription=Без подписки
 MemberId=ID участника
 NewMember=Новый участник
 MemberType=Тип участника
@@ -45,29 +45,29 @@ MemberStatusDraft=Проект (должно быть подтверждено)
 MemberStatusDraftShort=Проект
 MemberStatusActive=Удостоверенная (ожидания по подписке)
 MemberStatusActiveShort=Утверждена
-MemberStatusActiveLate=Subscription expired
+MemberStatusActiveLate=Срок действия подписки истек
 MemberStatusActiveLateShort=Истек
 MemberStatusPaid=Подписка до даты
 MemberStatusPaidShort=До даты
-MemberStatusExcluded=Excluded member
-MemberStatusExcludedShort=Excluded
-MemberStatusResiliated=Terminated member
-MemberStatusResiliatedShort=Terminated
+MemberStatusExcluded=Исключенный член
+MemberStatusExcludedShort=Исключенный
+MemberStatusResiliated=Прекращенный член
+MemberStatusResiliatedShort=Прекращено
 MembersStatusToValid=Проект участники
-MembersStatusExcluded=Excluded members
-MembersStatusResiliated=Terminated members
-MemberStatusNoSubscription=Validated (no subscription needed)
+MembersStatusExcluded=Исключенные участники
+MembersStatusResiliated=Прекращенные члены
+MemberStatusNoSubscription=Подтверждено (подписка не требуется)
 MemberStatusNoSubscriptionShort=Утверждена
-SubscriptionNotNeeded=No subscription needed
+SubscriptionNotNeeded=Подписка не требуется
 NewCotisation=Новый вклад
 PaymentSubscription=Новый вклад оплаты
 SubscriptionEndDate=Подписка на конец даты
 MembersTypeSetup=Члены тип установки
-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=Тип участника изменен
+DeleteAMemberType=Удалить тип участника
+ConfirmDeleteMemberType=Вы уверены, что хотите удалить этот тип участника?
+MemberTypeDeleted=Тип участника удален
+MemberTypeCanNotBeDeleted=Тип участника не может быть удален
 NewSubscription=Новая подписка
 NewSubscriptionDesc=Эта форма позволяет вам записывать вашу подписку в качестве нового члена Фонда. Если вы хотите продлить подписку (если уже зарегистрированы), пожалуйста, свяжитесь совета Фонда, а не по электронной почте, %s.
 Subscription=Подписка
@@ -75,77 +75,77 @@ Subscriptions=Подписки
 SubscriptionLate=Поздно
 SubscriptionNotReceived=Подписка никогда не получал
 ListOfSubscriptions=Список подписчиков
-SendCardByMail=Send card by email
+SendCardByMail=Отправить карту по электронной почте
 AddMember=Создать участника
 NoTypeDefinedGoToSetup=Ни один из членов определенных типов. Переход к установке - членов типов
 NewMemberType=Новый тип участника
-WelcomeEMail=Welcome email
+WelcomeEMail=Приветственное письмо
 SubscriptionRequired=Подписка требуется
 DeleteType=Удалить
 VoteAllowed=Голосовать разрешается
-Physical=Individual
-Moral=Corporation
-MorAndPhy=Corporation and Individual
-Reenable=Re-Enable
-ExcludeMember=Exclude a member
-ConfirmExcludeMember=Are you sure you want to exclude this member ?
-ResiliateMember=Terminate a member
-ConfirmResiliateMember=Are you sure you want to terminate this member?
+Physical=Физическое лицо
+Moral=Корпорация
+MorAndPhy=Корпорация и частное лицо
+Reenable=Повторно включить
+ExcludeMember=Исключить участника
+ConfirmExcludeMember=Вы уверены, что хотите исключить этого участника?
+ResiliateMember=Прекратить член
+ConfirmResiliateMember=Вы уверены, что хотите удалить этого участника?
 DeleteMember=Удаление члена
-ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions)?
+ConfirmDeleteMember=Вы действительно хотите удалить этого участника (удаление участника приведет к удалению всех его подписок)?
 DeleteSubscription=Удалить подписку
-ConfirmDeleteSubscription=Are you sure you want to delete this subscription?
+ConfirmDeleteSubscription=Вы уверены, что хотите удалить эту подписку?
 Filehtpasswd=htpasswd файл
 ValidateMember=Проверка членов
-ConfirmValidateMember=Are you sure you want to validate this member?
-FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formatted pages, provided as example to show how to list members database.
+ConfirmValidateMember=Вы уверены, что хотите подтвердить этого участника?
+FollowingLinksArePublic=Следующие ссылки являются открытыми страницами, не защищенными никакими разрешениями Dolibarr. Это не отформатированные страницы, которые приведены в качестве примера, чтобы показать, как составить список членов базы данных.
 PublicMemberList=Общественная член списка
-BlankSubscriptionForm=Public self-subscription form
-BlankSubscriptionFormDesc=Dolibarr can provide you a public URL/website to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form may also be automatically provided.
-EnablePublicSubscriptionForm=Enable the public website with self-subscription form
-ForceMemberType=Force the member type
+BlankSubscriptionForm=Публичная форма самостоятельной подписки
+BlankSubscriptionFormDesc=Dolibarr может предоставить вам общедоступный URL-адрес / веб-сайт, чтобы внешние посетители могли попросить подписаться на фонд. Если включен модуль онлайн-платежей, форма оплаты также может быть предоставлена автоматически.
+EnablePublicSubscriptionForm=Включите общедоступный веб-сайт с помощью формы самостоятельной подписки
+ForceMemberType=Заставить тип элемента
 ExportDataset_member_1=Члены и подписки
 ImportDataset_member_1=Участники
-LastMembersModified=Latest %s modified members
-LastSubscriptionsModified=Latest %s modified subscriptions
+LastMembersModified=Последние измененные члены %s
+LastSubscriptionsModified=Последние измененные подписки %s
 String=Строка
 Text=Текст
 Int=Межд
 DateAndTime=Дата и время
 PublicMemberCard=Член общественного карту
-SubscriptionNotRecorded=Subscription not recorded
+SubscriptionNotRecorded=Подписка не записана
 AddSubscription=Создать подписку
 ShowSubscription=Показать подписки
 # Label of email templates
-SendingAnEMailToMember=Sending information email to member
-SendingEmailOnAutoSubscription=Sending email on auto registration
-SendingEmailOnMemberValidation=Sending email on new member validation
-SendingEmailOnNewSubscription=Sending email on new subscription
-SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
-SendingEmailOnCancelation=Sending email on cancelation
-SendingReminderActionComm=Sending reminder for agenda event
+SendingAnEMailToMember=Отправка информационного письма участнику
+SendingEmailOnAutoSubscription=Отправка электронной почты при автоматической регистрации
+SendingEmailOnMemberValidation=Отправка электронного письма о подтверждении нового участника
+SendingEmailOnNewSubscription=Отправка электронной почты по новой подписке
+SendingReminderForExpiredSubscription=Отправка напоминания об истекших подписках
+SendingEmailOnCancelation=Отправка электронного письма при отмене
+SendingReminderActionComm=Отправка напоминания о повестке дня
 # Topic of email templates
-YourMembershipRequestWasReceived=Your membership was received.
-YourMembershipWasValidated=Your membership was validated
-YourSubscriptionWasRecorded=Your new subscription was recorded
-SubscriptionReminderEmail=Subscription reminder
-YourMembershipWasCanceled=Your membership was canceled
+YourMembershipRequestWasReceived=Ваше членство было получено.
+YourMembershipWasValidated=Ваше членство было подтверждено
+YourSubscriptionWasRecorded=Ваша новая подписка была записана
+SubscriptionReminderEmail=Напоминание о подписке
+YourMembershipWasCanceled=Ваше членство было отменено
 CardContent=Содержание Вашей карточки участника
 # Text of email templates
-ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
-ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
-ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
-ThisIsContentOfSubscriptionReminderEmail=We want to let you know that your subscription is about to expire or has already expired (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). We hope you will renew it.<br><br>
-ThisIsContentOfYourCard=This is a summary of the information we have about you. Please contact us if anything is incorrect.<br><br>
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the notification email received in case of auto-inscription of a guest
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Content of the notification email received in case of auto-inscription of a guest
-DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Email template to use to send email to a member on member autosubscription
-DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send email to a member on member validation
-DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
-DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
-DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
-DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
-DescADHERENT_MAIL_FROM=Sender Email for automatic emails
+ThisIsContentOfYourMembershipRequestWasReceived=Мы хотим сообщить вам, что ваш запрос на членство был получен. <br> <br>
+ThisIsContentOfYourMembershipWasValidated=Мы хотим сообщить вам, что ваше членство было подтверждено следующей информацией: <br> <br>
+ThisIsContentOfYourSubscriptionWasRecorded=Мы хотим сообщить вам, что ваша новая подписка была зарегистрирована. <br> <br>
+ThisIsContentOfSubscriptionReminderEmail=Мы хотим сообщить вам, что ваша подписка истекает или уже истекла (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). Надеемся, вы его обновите. <br> <br>
+ThisIsContentOfYourCard=Это краткое изложение имеющейся у нас информации о вас. Пожалуйста, свяжитесь с нами, если что-то не так. <br> <br>
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Тема электронного письма с уведомлением, полученного в случае автоматического добавления гостя
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Содержание электронного письма с уведомлением, полученного в случае автоматического добавления гостя
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Шаблон электронной почты для отправки электронной почты участнику по автоподписке участника
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Шаблон электронной почты для отправки электронной почты участнику при проверке участника
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Шаблон электронной почты для отправки электронной почты участнику при записи новой подписки
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Шаблон электронной почты для отправки напоминания по электронной почте, когда истекает срок подписки
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Шаблон электронной почты для отправки электронной почты участнику при аннулировании членства
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Шаблон электронной почты для отправки электронной почты участнику при исключении участника
+DescADHERENT_MAIL_FROM=Электронная почта отправителя для автоматических писем
 DescADHERENT_ETIQUETTE_TYPE=Этикетки формате
 DescADHERENT_ETIQUETTE_TEXT=Текст, который будет напечетан на адресном листе пользователя
 DescADHERENT_CARD_TYPE=Формат карт страницы
@@ -159,8 +159,8 @@ NoThirdPartyAssociatedToMember=Никакая третья сторона, св
 MembersAndSubscriptions= Участники и Подписки
 MoreActions=Дополнительные меры по записи
 MoreActionsOnSubscription=Дополнительные действия, предложенные по умолчанию, которые будут производтся при новой подписке
-MoreActionBankDirect=Create a direct entry on bank account
-MoreActionBankViaInvoice=Create an invoice, and a payment on bank account
+MoreActionBankDirect=Создайте прямую запись на банковский счет
+MoreActionBankViaInvoice=Создайте счет-фактуру и оплату на банковский счет
 MoreActionInvoiceOnly=Создание счета без каких-либо оплаты
 LinkToGeneratedPages=Создание визитки
 LinkToGeneratedPagesDesc=Этот экран позволяет вам создавать PDF файлы с визитных карточек для всех членов вашей или иной член.
@@ -168,48 +168,50 @@ DocForAllMembersCards=Создание визитной карточки для
 DocForOneMemberCards=Создание визитной карточки для конкретного члена (формат для вывода на самом деле установки: <b>%s)</b>
 DocForLabels=Создание листов адрес (формат для вывода на самом деле установки: <b>%s)</b>
 SubscriptionPayment=Абонентская плата
-LastSubscriptionDate=Date of latest subscription payment
-LastSubscriptionAmount=Amount of latest subscription
-LastMemberType=Last Member type
+LastSubscriptionDate=Дата последней оплаты подписки
+LastSubscriptionAmount=Сумма последней подписки
+LastMemberType=Тип последнего члена
 MembersStatisticsByCountries=Члены статистику по странам
 MembersStatisticsByState=Члены статистики штата / провинции
 MembersStatisticsByTown=Члены статистики города
 MembersStatisticsByRegion=Статистика участников по регионам
-NbOfMembers=Total number of members
-NbOfActiveMembers=Total number of current active members
+NbOfMembers=Общее количество участников
+NbOfActiveMembers=Общее количество текущих активных участников
 NoValidatedMemberYet=Нет проверки члены найдены
-MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
-MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
-MembersByTownDesc=This screen show you statistics of members by town.
-MembersByNature=This screen show you statistics of members by nature.
-MembersByRegion=This screen show you statistics of members by region.
+MembersByCountryDesc=На этом экране отображается статистика участников по странам. Графики и диаграммы зависят от доступности службы онлайн-графиков Google, а также от наличия рабочего подключения к Интернету.
+MembersByStateDesc=На этом экране отображается статистика членов по штатам / провинциям / кантонам.
+MembersByTownDesc=На этом экране отображается статистика участников по городам.
+MembersByNature=Этот экран показывает статистику участников по природе.
+MembersByRegion=На этом экране отображается статистика участников по регионам.
 MembersStatisticsDesc=Выберите статистику вы хотите прочитать ...
 MenuMembersStats=Статистика
-LastMemberDate=Latest membership date
-LatestSubscriptionDate=Latest subscription date
-MemberNature=Nature of the member
-MembersNature=Nature of the members
-Public=Information is public
+LastMemberDate=Дата последнего членства
+LatestSubscriptionDate=Последняя дата подписки
+MemberNature=Природа члена
+MembersNature=Природа участников
+Public=Информация является общедоступной
 NewMemberbyWeb=Новый участник добавил. В ожидании утверждения
 NewMemberForm=Новая форма члена
-SubscriptionsStatistics=Subscriptions statistics
+SubscriptionsStatistics=Статистика подписок
 NbOfSubscriptions=Количество подписок
-AmountOfSubscriptions=Amount collected from subscriptions
+AmountOfSubscriptions=Сумма, полученная от подписок
 TurnoverOrBudget=Оборот (за компанию) или бюджета (за основу)
 DefaultAmount=По умолчанию количество подписки
 CanEditAmount=Посетитель может выбрать / изменить размер его подписке
 MEMBER_NEWFORM_PAYONLINE=Перейти по комплексному интернет страницу оплаты
-ByProperties=By nature
-MembersStatisticsByProperties=Members statistics by nature
+ByProperties=По природе
+MembersStatisticsByProperties=Статистика участников по характеру
 VATToUseForSubscriptions=Значение НДС, для ипользования в подписках
-NoVatOnSubscription=No VAT for subscriptions
+NoVatOnSubscription=Без НДС для подписок
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Товар, который будет использован, чтобы включить подписку в счёт: %s
-NameOrCompany=Name or company
-SubscriptionRecorded=Subscription recorded
-NoEmailSentToMember=No email sent to member
-EmailSentToMember=Email sent to member at %s
-SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
-SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind. It can be a list of days separated by a semicolon, for example '10;5;0;-5')
-MembershipPaid=Membership paid for current period (until %s)
-YouMayFindYourInvoiceInThisEmail=You may find your invoice attached to this email
-XMembersClosed=%s member(s) closed
+NameOrCompany=Имя или Название компании
+SubscriptionRecorded=Подписка записана
+NoEmailSentToMember=Электронное письмо не отправлено участнику
+EmailSentToMember=Электронное письмо отправлено участнику на %s
+SendReminderForExpiredSubscriptionTitle=Отправить напоминание по электронной почте для истекшей подписки
+SendReminderForExpiredSubscription=Отправлять напоминание участникам по электронной почте, когда истекает срок подписки (параметр - количество дней до окончания подписки для отправки напоминания. Это может быть список дней, разделенных точкой с запятой, например '10; 5; 0; -5 ')
+MembershipPaid=Членство оплачивается за текущий период (до %s)
+YouMayFindYourInvoiceInThisEmail=К этому письму может быть прикреплен счет.
+XMembersClosed=член (ы) %s закрыт
+XExternalUserCreated=Созданы внешние пользователи %s
+ForceMemberNature=Характер участника силы (физическое лицо или корпорация)
diff --git a/htdocs/langs/ru_RU/modulebuilder.lang b/htdocs/langs/ru_RU/modulebuilder.lang
index b8dc90822dc..b7270bede83 100644
--- a/htdocs/langs/ru_RU/modulebuilder.lang
+++ b/htdocs/langs/ru_RU/modulebuilder.lang
@@ -1,145 +1,146 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
-EnterNameOfModuleDesc=Enter name of the module/application to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
-EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...). The CRUD class file, but also API file, pages to list/add/edit/delete object and SQL files will be generated.
-ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %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
+ModuleBuilderDesc=Этот инструмент должен использоваться только опытными пользователями или разработчиками. Он предоставляет утилиты для создания или редактирования вашего собственного модуля. Документация по ручной разработке альтернативы <a href="%s" target="_blank"> находится здесь </a>.
+EnterNameOfModuleDesc=Введите имя модуля / приложения, которое нужно создать, без пробелов. Используйте прописные буквы для разделения слов (например: MyModule, EcommerceForShop, SyncWithMySystem ...)
+EnterNameOfObjectDesc=Введите имя создаваемого объекта без пробелов. Используйте прописные буквы для разделения слов (например: MyObject, Student, Teacher ...). Будет сгенерирован файл класса CRUD, а также файл API, страницы для списка / добавления / редактирования / удаления объекта и файлы SQL.
+ModuleBuilderDesc2=Путь, по которому модули создаются / редактируются (первый каталог для внешних модулей, определенных в %s): <strong> %s </strong>
+ModuleBuilderDesc3=Найдены сгенерированные / редактируемые модули: <strong> %s </strong>
+ModuleBuilderDesc4=Модуль определяется как "редактируемый", если файл <strong> %s </strong> существует в корне каталога модуля.
 NewModule=Новый модуль
-NewObjectInModulebuilder=New object
-ModuleKey=Module key
-ObjectKey=Object key
-ModuleInitialized=Module initialized
-FilesForObjectInitialized=Files for new object '%s' initialized
-FilesForObjectUpdated=Files for object '%s' updated (.sql files and .class.php file)
-ModuleBuilderDescdescription=Enter here all general information that describe your module.
-ModuleBuilderDescspecifications=You can enter here a detailed description of the specifications of your module that is not already structured into other tabs. So you have within easy reach all the rules to develop. Also this text content will be included into the generated documentation (see last tab). You can use Markdown format, but it is recommended to use Asciidoc format (comparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown).
-ModuleBuilderDescobjects=Define here the objects you want to manage with your module. A CRUD DAO class, SQL files, page to list record of objects, to create/edit/view a record and an API will be generated.
-ModuleBuilderDescmenus=This tab is dedicated to define menu entries provided by your module.
-ModuleBuilderDescpermissions=This tab is dedicated to define the new permissions you want to provide with your module.
-ModuleBuilderDesctriggers=This is the view of triggers provided by your module. To include code executed when a triggered business event is launched, just edit this file.
-ModuleBuilderDeschooks=This tab is dedicated to hooks.
-ModuleBuilderDescwidgets=This tab is dedicated to manage/build widgets.
-ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module and a "ready to distribute" documentation file. Just click on button to build the package or documentation file.
-EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: All coding files of module (generated or created manually) AND structured data and documentation will be deleted!
-EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to object will be deleted!
-DangerZone=Danger zone
-BuildPackage=Build package
-BuildPackageDesc=You can generate a zip package of your application so your are ready to distribute it on any Dolibarr. You can also distribute it or sell it on marketplace like <a href="https://www.dolistore.com">DoliStore.com</a>.
-BuildDocumentation=Build documentation
-ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here
-ModuleIsLive=This module has been activated. Any change may break a current live feature.
-DescriptionLong=Long description
-EditorName=Name of editor
-EditorUrl=URL of editor
-DescriptorFile=Descriptor file of module
-ClassFile=File for PHP DAO CRUD class
-ApiClassFile=File for PHP API class
-PageForList=PHP page for list of record
-PageForCreateEditView=PHP page to create/edit/view a record
-PageForAgendaTab=PHP page for event tab
-PageForDocumentTab=PHP page for document tab
-PageForNoteTab=PHP page for note tab
-PageForContactTab=PHP page for contact tab
-PathToModulePackage=Path to zip of module/application package
-PathToModuleDocumentation=Path to file of module/application documentation (%s)
-SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
-FileNotYetGenerated=File not yet generated
-RegenerateClassAndSql=Force update of .class and .sql files
-RegenerateMissingFiles=Generate missing files
-SpecificationFile=File of documentation
-LanguageFile=File for language
-ObjectProperties=Object Properties
-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
-TriggersFile=File for triggers code
-HooksFile=File for hooks code
-ArrayOfKeyValues=Array of key-val
-ArrayOfKeyValuesDesc=Array of keys and values if field is a combo list with fixed values
-WidgetFile=Widget file
-CSSFile=CSS file
-JSFile=Javascript file
-ReadmeFile=Readme file
-ChangeLog=ChangeLog file
-TestClassFile=File for PHP Unit Test class
-SqlFile=Sql file
-PageForLib=File for the common PHP library
-PageForObjLib=File for the PHP library dedicated to object
-SqlFileExtraFields=Sql file for complementary attributes
-SqlFileKey=Sql file for keys
-SqlFileKeyExtraFields=Sql file for keys of complementary attributes
-AnObjectAlreadyExistWithThisNameAndDiffCase=An object already exists with this name and a different case
-UseAsciiDocFormat=You can use Markdown format, but it is recommended to use Asciidoc format (omparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
-IsAMeasure=Is a measure
-DirScanned=Directory scanned
-NoTrigger=No trigger
-NoWidget=No widget
-GoToApiExplorer=API explorer
-ListOfMenusEntries=List of menu entries
-ListOfDictionariesEntries=List of dictionaries entries
-ListOfPermissionsDefined=List of defined permissions
-SeeExamples=See examples here
-EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br><br><strong>For document :</strong><br>0 = not displayed <br>1 = display<br>2 = display only if not empty<br><br><strong>For document lines :</strong><br>0 = not displayed <br>1 = displayed in a column<br>3 = display in line description column after the description<br>4 = display in description column after the description only if not empty
-DisplayOnPdf=Display on PDF
-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
-DictionariesDefDesc=Define here the dictionaries provided by your module
-PermissionsDefDesc=Define here the new permissions provided by your module
-MenusDefDescTooltip=The menus provided by your module/application are defined into the array <strong>$this->menus</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), menus are also visible into the menu editor available to administrator users on %s.
-DictionariesDefDescTooltip=The dictionaries provided by your module/application are defined into the array <strong>$this->dictionaries</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), dictionaries are also visible into the setup area to administrator users on %s.
-PermissionsDefDescTooltip=The permissions provided by your module/application are defined into the array <strong>$this->rights</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), permissions 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
-TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the native module builder wizard.<br>Enable the module <strong>%s</strong> and use the wizard by clicking the <span class="fa fa-bug"></span> on the top right menu.<br>Warning: This is an advanced developer feature, do <b>not</b> experiment on your production site!
-SeeTopRightMenu=See <span class="fa fa-bug"></span> on the top right menu
-AddLanguageFile=Add language file
-YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages")
-DropTableIfEmpty=(Destroy table if empty)
-TableDoesNotExists=The table %s does not exists
-TableDropped=Table %s deleted
-InitStructureFromExistingTable=Build the structure array string of an existing table
-UseAboutPage=Disable the about page
-UseDocFolder=Disable the documentation folder
-UseSpecificReadme=Use a specific ReadMe
-ContentOfREADMECustomized=Note: The content of the README.md file has been replaced with the specific value defined into setup of ModuleBuilder.
-RealPathOfModule=Real path of module
-ContentCantBeEmpty=Content of file can't be empty
-WidgetDesc=You can generate and edit here the widgets that will be embedded with your module.
-CSSDesc=You can generate and edit here a file with personalized CSS embedded with your module.
-JSDesc=You can generate and edit here a file with personalized Javascript embedded with your module.
-CLIDesc=You can generate here some command line scripts you want to provide with your module.
-CLIFile=CLI File
-NoCLIFile=No CLI files
-UseSpecificEditorName = Use a specific editor name
-UseSpecificEditorURL = Use a specific editor URL
-UseSpecificFamily = Use a specific family
-UseSpecificAuthor = Use a specific author
-UseSpecificVersion = Use a specific initial version
-IncludeRefGeneration=The reference of object must be generated automatically
-IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
-IncludeDocGeneration=I want to generate some documents from the object
-IncludeDocGenerationHelp=If you check this, some code will be generated to add a "Generate document" box on the record.
-ShowOnCombobox=Show value into combobox
-KeyForTooltip=Key for tooltip
-CSSClass=CSS for edit/create form
-CSSViewClass=CSS for read form
-CSSListClass=CSS for list
-NotEditable=Not editable
-ForeignKey=Foreign key
-TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
-AsciiToHtmlConverter=Ascii to HTML converter
-AsciiToPdfConverter=Ascii to PDF converter
-TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
-ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
+NewObjectInModulebuilder=Новый объект
+ModuleKey=Ключ модуля
+ObjectKey=Ключ объекта
+ModuleInitialized=Модуль инициализирован
+FilesForObjectInitialized=Инициализированы файлы для нового объекта '%s'
+FilesForObjectUpdated=Обновлены файлы для объекта '%s' (файлы .sql и файл .class.php)
+ModuleBuilderDescdescription=Введите здесь всю общую информацию, описывающую ваш модуль.
+ModuleBuilderDescspecifications=Вы можете ввести здесь подробное описание спецификаций вашего модуля, которое еще не разбито на другие вкладки. Таким образом, у вас есть доступ ко всем правилам для разработки. Также этот текстовый контент будет включен в сгенерированную документацию (см. Последнюю вкладку). Вы можете использовать формат Markdown, но рекомендуется использовать формат Asciidoc (сравнение между .md и .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown).
+ModuleBuilderDescobjects=Определите здесь объекты, которыми вы хотите управлять с помощью вашего модуля. Будет сгенерирован класс CRUD DAO, файлы SQL, страница для перечисления записей объектов, для создания / редактирования / просмотра записи и API.
+ModuleBuilderDescmenus=Эта вкладка предназначена для определения пунктов меню, предоставляемых вашим модулем.
+ModuleBuilderDescpermissions=Эта вкладка предназначена для определения новых разрешений, которые вы хотите предоставить вашему модулю.
+ModuleBuilderDesctriggers=Это вид триггеров, предоставляемых вашим модулем. Чтобы включить код, выполняемый при запуске инициированного бизнес-события, просто отредактируйте этот файл.
+ModuleBuilderDeschooks=Эта вкладка посвящена хукам.
+ModuleBuilderDescwidgets=Эта вкладка предназначена для управления / создания виджетов.
+ModuleBuilderDescbuildpackage=Здесь вы можете сгенерировать пакетный файл «готовый к распространению» (нормализованный файл .zip) вашего модуля и файл документации «готовый к распространению». Просто нажмите кнопку, чтобы создать файл пакета или документации.
+EnterNameOfModuleToDeleteDesc=Вы можете удалить свой модуль. ВНИМАНИЕ: Все файлы кодирования модуля (сгенерированные или созданные вручную), а также структурированные данные и документация будут удалены!
+EnterNameOfObjectToDeleteDesc=Вы можете удалить объект. ВНИМАНИЕ: Все файлы кодирования (сгенерированные или созданные вручную), относящиеся к объекту, будут удалены!
+DangerZone=Зона опасности
+BuildPackage=Сборка пакета
+BuildPackageDesc=Вы можете сгенерировать zip-пакет своего приложения, чтобы его можно было распространять на любом Dolibarr. Вы также можете распространять или продавать его на торговой площадке, например, <a href="https://www.dolistore.com"> DoliStore.com </a>.
+BuildDocumentation=Документация по сборке
+ModuleIsNotActive=Этот модуль еще не активирован. Перейдите на %s, чтобы запустить его, или нажмите здесь
+ModuleIsLive=Этот модуль был активирован. Любое изменение может привести к поломке текущей функции.
+DescriptionLong=Длинное описание
+EditorName=Имя редактора
+EditorUrl=URL редактора
+DescriptorFile=Файл дескриптора модуля
+ClassFile=Файл для класса PHP DAO CRUD
+ApiClassFile=Файл для класса PHP API
+PageForList=Страница PHP для списка записей
+PageForCreateEditView=Страница PHP для создания / редактирования / просмотра записи
+PageForAgendaTab=Страница PHP для вкладки событий
+PageForDocumentTab=Страница PHP для вкладки документа
+PageForNoteTab=Страница PHP для вкладки заметок
+PageForContactTab=Страница PHP для вкладки контактов
+PathToModulePackage=Путь к zip-архиву модуля / пакета приложения
+PathToModuleDocumentation=Путь к файлу документации модуля / приложения (%s)
+SpaceOrSpecialCharAreNotAllowed=Пробелы и специальные символы не допускаются.
+FileNotYetGenerated=Файл еще не создан
+RegenerateClassAndSql=Принудительное обновление файлов .class и .sql
+RegenerateMissingFiles=Создать недостающие файлы
+SpecificationFile=Файл документации
+LanguageFile=Файл для языка
+ObjectProperties=Свойства объекта
+ConfirmDeleteProperty=Вы действительно хотите удалить свойство <strong> %s </strong>? Это изменит код в классе PHP, но также удалит столбец из определения объекта в таблице.
+NotNull=Ненулевой
+NotNullDesc=1 = Установить для базы данных значение НЕ NULL. -1 = разрешить нулевые значения и принудительно установить значение NULL, если пусто ('' или 0).
+SearchAll=Используется для поиска по всем
+DatabaseIndex=Индекс базы данных
+FileAlreadyExists=Файл %s уже существует
+TriggersFile=Файл с кодом триггеров
+HooksFile=Файл для кода хуков
+ArrayOfKeyValues=Массив key-val
+ArrayOfKeyValuesDesc=Массив ключей и значений, если поле представляет собой комбинированный список с фиксированными значениями
+WidgetFile=Файл виджета
+CSSFile=CSS файл
+JSFile=Файл Javascript
+ReadmeFile=Файл Readme
+ChangeLog=Файл журнала изменений
+TestClassFile=Файл для класса PHP Unit Test
+SqlFile=Sql файл
+PageForLib=Файл для общей библиотеки PHP
+PageForObjLib=Файл для библиотеки PHP, посвященной объекту
+SqlFileExtraFields=Файл sql для дополнительных атрибутов
+SqlFileKey=Sql-файл для ключей
+SqlFileKeyExtraFields=Sql-файл для ключей дополнительных атрибутов
+AnObjectAlreadyExistWithThisNameAndDiffCase=Объект с таким именем и другим регистром уже существует.
+UseAsciiDocFormat=Вы можете использовать формат Markdown, но рекомендуется использовать формат Asciidoc (сравнение между .md и .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
+IsAMeasure=Это мера
+DirScanned=Каталог просканирован
+NoTrigger=Нет триггера
+NoWidget=Нет виджета
+GoToApiExplorer=Обозреватель API
+ListOfMenusEntries=Список пунктов меню
+ListOfDictionariesEntries=Список словарных статей
+ListOfPermissionsDefined=Список определенных разрешений
+SeeExamples=См. Примеры здесь
+EnabledDesc=Условие для того, чтобы это поле было активным (Примеры: 1 или $ conf-> global-> MYMODULE_MYOPTION)
+VisibleDesc=Поле видно? (Примеры: 0 = никогда не отображается, 1 = виден в списке и формах создания / обновления / просмотра, 2 = виден только в списке, 3 = виден только в форме создания / обновления / просмотра (не в списке), 4 = виден в списке и только форма обновления / просмотра (не создание), 5 = Видна только в форме просмотра конца списка (не создание, не обновление). <br> <br> Использование отрицательного значения означает, что поле не отображается по умолчанию в списке, но может быть выбрано для просмотра). <br> <br> Это может быть выражение, например: <br> preg_match ('/ public /', $ _SERVER ['PHP_SELF'])? 0: 1 <br> ($ holiday user-> define rights->
+DisplayOnPdfDesc=Отобразите это поле в совместимых PDF-документах, вы можете управлять положением с помощью поля «Position». <br> В настоящее время известны совместимые модели PDF: эратостен (заказ), эспадон (доставка), губка (счета), голубой (пропал / предложение), кукуруза (заказ поставщика). = дисплей <br> 2 = отображать только если не пустой <br> <br> <strong> Для строк документа: </strong> <br> 0 = не отображается <br> 1 = отображается в столбце <br> 3 = дисплея в описании линии колонки после описания <br> 4 = дисплея в описании столбца после того, описание только если не пусто
+DisplayOnPdf=Показать в PDF
+IsAMeasureDesc=Можно ли суммировать значение поля, чтобы получить итог в списке? (Примеры: 1 или 0)
+SearchAllDesc=Используется ли это поле для поиска из инструмента быстрого поиска? (Примеры: 1 или 0)
+SpecDefDesc=Введите сюда всю документацию, которую вы хотите предоставить с вашим модулем, которая еще не определена на других вкладках. Вы можете использовать .md или лучше, богатый синтаксис .asciidoc.
+LanguageDefDesc=Введите в эти файлы все ключи и перевод для каждого языкового файла.
+MenusDefDesc=Определите здесь меню, предоставляемые вашим модулем
+DictionariesDefDesc=Определите здесь словари, предоставленные вашим модулем
+PermissionsDefDesc=Определите здесь новые разрешения, предоставляемые вашим модулем
+MenusDefDescTooltip=Меню, предоставляемые вашим модулем / приложением, определены в массиве <strong> $ this-> menus </strong> в файле дескриптора модуля. Вы можете редактировать этот файл вручную или использовать встроенный редактор. <br> <br> Примечание. После определения (и повторной активации модуля) меню также отображаются в редакторе меню, доступном для пользователей-администраторов на %s.
+DictionariesDefDescTooltip=Словари, предоставляемые вашим модулем / приложением, определены в массиве <strong> $ this-> dictionaries </strong> в файле дескриптора модуля. Вы можете редактировать этот файл вручную или использовать встроенный редактор. <br> <br> Примечание. После определения (и повторной активации модуля) словари также отображаются в области настройки для пользователей-администраторов на %s.
+PermissionsDefDescTooltip=Разрешения, предоставляемые вашим модулем / приложением, определены в массиве <strong> $ this-> rights </strong> в файле дескриптора модуля. Вы можете редактировать этот файл вручную или использовать встроенный редактор. <br> <br> Примечание. После определения (и повторной активации модуля) разрешения отображаются в настройках разрешений по умолчанию %s.
+HooksDefDesc=Определите в свойстве <b> module_parts ['hooks'] </b> в дескрипторе модуля контекст хуков, которыми вы хотите управлять (список контекстов можно найти, выполнив поиск в '<b> initHooks' файл перехвата для добавления кода ваших перехваченных функций (подключаемые функции можно найти, выполнив поиск по '<b> executeHooks </b>' в основном коде).
+TriggerDefDesc=Определите в файле триггера код, который вы хотите выполнять для каждого выполняемого бизнес-события.
+SeeIDsInUse=См. Идентификаторы, используемые в вашей установке
+SeeReservedIDsRangeHere=См. Диапазон зарезервированных идентификаторов
+ToolkitForDevelopers=Инструментарий для разработчиков Dolibarr
+TryToUseTheModuleBuilder=Если у вас есть знания SQL и PHP, вы можете использовать мастер создания собственных модулей. <br> Включите модуль <strong> %s </strong> и используйте мастер, щелкнув <span class="fa fa-bug"> </span> в правом верхнем меню. <br> Предупреждение: это расширенная функция для разработчиков, проводите <b>, а не </b>, экспериментируйте на своем рабочем сайте!
+SeeTopRightMenu=См. <span class="fa fa-bug"> </span> в правом верхнем меню.
+AddLanguageFile=Добавить языковой файл
+YouCanUseTranslationKey=Вы можете использовать здесь ключ, который является ключом перевода, найденным в языковом файле (см. Вкладку «Языки»).
+DropTableIfEmpty=(Уничтожить таблицу, если она пуста)
+TableDoesNotExists=Таблица %s не существует
+TableDropped=Таблица %s удалена
+InitStructureFromExistingTable=Построить строку массива структуры существующей таблицы
+UseAboutPage=Отключить страницу с информацией
+UseDocFolder=Отключить папку документации
+UseSpecificReadme=Используйте специальный файл ReadMe
+ContentOfREADMECustomized=Примечание. Содержимое файла README.md было заменено конкретным значением, определенным в настройке ModuleBuilder.
+RealPathOfModule=Реальный путь модуля
+ContentCantBeEmpty=Содержимое файла не может быть пустым
+WidgetDesc=Здесь вы можете создавать и редактировать виджеты, которые будут встроены в ваш модуль.
+CSSDesc=Вы можете создать и отредактировать здесь файл с персонализированным CSS, встроенным в ваш модуль.
+JSDesc=Вы можете создать и отредактировать здесь файл с персонализированным Javascript, встроенным в ваш модуль.
+CLIDesc=Вы можете сгенерировать здесь несколько сценариев командной строки, которые хотите предоставить вместе со своим модулем.
+CLIFile=Файл CLI
+NoCLIFile=Нет файлов CLI
+UseSpecificEditorName = Используйте конкретное имя редактора
+UseSpecificEditorURL = Используйте конкретный URL-адрес редактора
+UseSpecificFamily = Используйте конкретную семью
+UseSpecificAuthor = Использовать конкретного автора
+UseSpecificVersion = Используйте конкретную начальную версию
+IncludeRefGeneration=Ссылка на объект должна генерироваться автоматически
+IncludeRefGenerationHelp=Установите этот флажок, если хотите включить код для автоматического управления генерацией ссылки.
+IncludeDocGeneration=Я хочу сгенерировать некоторые документы из объекта
+IncludeDocGenerationHelp=Если вы установите этот флажок, будет сгенерирован некоторый код для добавления поля «Создать документ» в запись.
+ShowOnCombobox=Показать значение в поле со списком
+KeyForTooltip=Ключ для подсказки
+CSSClass=CSS для редактирования / создания формы
+CSSViewClass=CSS для формы чтения
+CSSListClass=CSS для списка
+NotEditable=Не редактируется
+ForeignKey=Иностранный ключ
+TypeOfFieldsHelp=Тип полей: <br> varchar (99), double (24,8), real, text, html, datetime, timestamp, integer, integer: ClassName: relativepath / to / classfile.class.php [: 1 [: filter]] («1» означает, что мы добавляем кнопку + после комбо для создания записи, «фильтр» может быть, например, «status = 1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)»)
+AsciiToHtmlConverter=Конвертер ascii в HTML
+AsciiToPdfConverter=Конвертер ascii в PDF
+TableNotEmptyDropCanceled=Таблица не пустая. Дроп отменен.
+ModuleBuilderNotAllowed=Конструктор модулей доступен, но не разрешен для вашего пользователя.
+ImportExportProfiles=Импорт и экспорт профилей
diff --git a/htdocs/langs/ru_RU/mrp.lang b/htdocs/langs/ru_RU/mrp.lang
index 5a772a7147d..8853b3d4708 100644
--- a/htdocs/langs/ru_RU/mrp.lang
+++ b/htdocs/langs/ru_RU/mrp.lang
@@ -1,104 +1,103 @@
-Mrp=Manufacturing Orders
-MOs=Manufacturing orders
-ManufacturingOrder=Manufacturing Order
-MRPDescription=Module to manage production and Manufacturing Orders (MO).
-MRPArea=MRP Area
-MrpSetupPage=Setup of module MRP
-MenuBOM=Bills of material
-LatestBOMModified=Latest %s Bills of materials modified
-LatestMOModified=Latest %s Manufacturing Orders modified
-Bom=Bills of Material
-BillOfMaterials=Перечень элементов
-BOMsSetup=Setup of module BOM
-ListOfBOMs=List of bills of material - BOM
-ListOfManufacturingOrders=List of Manufacturing Orders
-NewBOM=New bill of material
-ProductBOMHelp=Product to create with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
-BOMsNumberingModules=BOM numbering templates
-BOMsModelModule=BOM document templates
-MOsNumberingModules=MO numbering templates
-MOsModelModule=MO document templates
-FreeLegalTextOnBOMs=Free text on document of BOM
-WatermarkOnDraftBOMs=Watermark on draft BOM
-FreeLegalTextOnMOs=Free text on document of MO
-WatermarkOnDraftMOs=Watermark on draft MO
-ConfirmCloneBillOfMaterials=Уверены, что хотите клонировать перечень элементов %s ?
-ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
-ManufacturingEfficiency=Manufacturing efficiency
-ConsumptionEfficiency=Consumption efficiency
-ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the production
-ValueOfMeansLossForProductProduced=Value of 0.95 means an average of 5%% of loss of produced product
+Mrp=Заказы на производство
+MOs=Заказы на изготовление
+ManufacturingOrder=Заказ на изготовление
+MRPDescription=Модуль для управления производством и производственными заказами (МО).
+MRPArea=Площадь MRP
+MrpSetupPage=Настройка модуля MRP
+MenuBOM=Спецификации материалов
+LatestBOMModified=Последние %s Изменены спецификации материалов
+LatestMOModified=Последние измененные производственные заказы %s
+Bom=Спецификации материалов
+BillOfMaterials=Ведомость материалов
+BOMsSetup=Настройка спецификации модуля
+ListOfBOMs=Список ведомостей материалов - BOM
+ListOfManufacturingOrders=Список производственных заказов
+NewBOM=Новая ведомость материалов
+ProductBOMHelp=Продукт для создания (или разборки) с этой спецификацией. <br> Примечание. Продукты со свойством «Природа продукта» = «Сырье» не отображаются в этом списке.
+BOMsNumberingModules=Шаблоны нумерации спецификаций
+BOMsModelModule=Шаблоны документов спецификаций
+MOsNumberingModules=Шаблоны нумерации МО
+MOsModelModule=Шаблоны документов МО
+FreeLegalTextOnBOMs=Произвольный текст в документе спецификации
+WatermarkOnDraftBOMs=Водяной знак на черновике спецификации
+FreeLegalTextOnMOs=Произвольный текст на документе МО
+WatermarkOnDraftMOs=Водяной знак на черновике МО
+ConfirmCloneBillOfMaterials=Вы уверены, что хотите клонировать спецификацию %s?
+ConfirmCloneMo=Вы действительно хотите клонировать производственный заказ %s?
+ManufacturingEfficiency=Эффективность производства
+ConsumptionEfficiency=Эффективность потребления
+ValueOfMeansLoss=Значение 0,95 означает в среднем 5%% потерь во время производства.
+ValueOfMeansLossForProductProduced=Значение 0,95 означает в среднем 5%% потерь произведенного продукта.
 DeleteBillOfMaterials=Удалить перечень элементов
-DeleteMo=Delete Manufacturing Order
-ConfirmDeleteBillOfMaterials=Уверены, что хотите удалить перечень элементов ?
-ConfirmDeleteMo=Уверены, что хотите удалить перечень элементов ?
-MenuMRP=Manufacturing Orders
-NewMO=New Manufacturing Order
-QtyToProduce=Qty to produce
-DateStartPlannedMo=Date start planned
-DateEndPlannedMo=Date end planned
-KeepEmptyForAsap=Empty means 'As Soon As Possible'
-EstimatedDuration=Estimated duration
-EstimatedDurationDesc=Estimated duration to manufacture this product using this BOM
-ConfirmValidateBom=Are you sure you want to validate the BOM with the reference <strong>%s</strong> (you will be able to use it to build new Manufacturing Orders)
-ConfirmCloseBom=Are you sure you want to cancel this BOM (you won't be able to use it to build new Manufacturing Orders anymore) ?
-ConfirmReopenBom=Are you sure you want to re-open this BOM (you will be able to use it to build new Manufacturing Orders)
-StatusMOProduced=Produced
-QtyFrozen=Frozen Qty
-QuantityFrozen=Frozen Quantity
-QuantityConsumedInvariable=When this flag is set, the quantity consumed is always the value defined and is not relative to the quantity produced.
-DisableStockChange=Stock change disabled
-DisableStockChangeHelp=When this flag is set, there is no stock change on this product, whatever is the quantity consumed
-BomAndBomLines=Bills Of Material and lines
-BOMLine=Line of BOM
-WarehouseForProduction=Warehouse for production
-CreateMO=Create MO
-ToConsume=To consume
-ToProduce=To produce
-QtyAlreadyConsumed=Qty already consumed
-QtyAlreadyProduced=Qty already produced
-QtyRequiredIfNoLoss=Qty required if there is no loss (Manufacturing efficiency is 100%%)
-ConsumeOrProduce=Consume or Produce
-ConsumeAndProduceAll=Consume and Produce All
-Manufactured=Manufactured
-TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
-ForAQuantityOf=For a quantity to produce of %s
-ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
-ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
-ProductionForRef=Production of %s
-AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
-NoStockChangeOnServices=No stock change on services
-ProductQtyToConsumeByMO=Product quantity still to consume by open MO
-ProductQtyToProduceByMO=Product quentity still to produce by open MO
-AddNewConsumeLines=Add new line to consume
-ProductsToConsume=Products to consume
-ProductsToProduce=Products to produce
-UnitCost=Unit cost
-TotalCost=Total cost
-BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
-GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.
-ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
-Workstation=Workstation
-Workstations=Workstations
-WorkstationsDescription=Workstations management
-WorkstationSetup = Workstations setup
-WorkstationSetupPage = Workstations setup page
-WorkstationAbout = About Workstation
-WorkstationAboutPage = Workstations about page
-WorkstationList=Workstation list
-WorkstationCreate=Add new workstation
-ConfirmEnableWorkstation=Are you sure you want to enable workstation <b>%s</b> ?
-EnableAWorkstation=Enable a workstation
-ConfirmDisableWorkstation=Are you sure you want to disable workstation <b>%s</b> ?
-DisableAWorkstation=Disable a workstation
-DeleteWorkstation=Supprimer
-NbOperatorsRequired=Number of operators required
-THMOperatorEstimated=Estimated operator THM
-THMMachineEstimated=Estimated machine THM
-WorkstationType=Workstation type
-Human=Human
-Machine=Machine
-HumanMachine=Human / Machine
-WorkstationArea=Workstation area
-Machines=Machines
-THMEstimatedHelp=This rate makes it possible to define a forecast cost of the item
+DeleteMo=Удалить производственный заказ
+ConfirmDeleteBillOfMaterials=Вы уверены, что хотите удалить этот список материалов?
+ConfirmDeleteMo=Вы уверены, что хотите удалить этот список материалов?
+MenuMRP=Заказы на производство
+NewMO=Новый производственный заказ
+QtyToProduce=Кол-во для производства
+DateStartPlannedMo=Дата начала запланирована
+DateEndPlannedMo=Дата окончания запланирована
+KeepEmptyForAsap=Пусто означает «как можно скорее»
+EstimatedDuration=Предполагаемый Срок
+EstimatedDurationDesc=Предполагаемая продолжительность изготовления (или разборки) этого продукта с использованием данной спецификации
+ConfirmValidateBom=Вы уверены, что хотите проверить спецификацию со ссылкой <strong> %s </strong> (вы сможете использовать ее для создания новых производственных заказов)
+ConfirmCloseBom=Вы уверены, что хотите отменить эту спецификацию (вы больше не сможете использовать ее для создания новых производственных заказов)?
+ConfirmReopenBom=Вы уверены, что хотите повторно открыть эту спецификацию (вы сможете использовать ее для создания новых производственных заказов)
+StatusMOProduced=Произведено
+QtyFrozen=Замороженное кол-во
+QuantityFrozen=Замороженное количество
+QuantityConsumedInvariable=Когда этот флаг установлен, потребляемое количество всегда является определенным значением и не относится к произведенному количеству.
+DisableStockChange=Смена запаса отключена
+DisableStockChangeHelp=Когда этот флаг установлен, нет никаких изменений в запасах этого продукта, независимо от количества потребленного.
+BomAndBomLines=Спецификации материалов и линий
+BOMLine=Строка спецификации
+WarehouseForProduction=Склад для производства
+CreateMO=Создать МО
+ToConsume=Потреблять
+ToProduce=Производить
+QtyAlreadyConsumed=Кол-во уже израсходовано
+QtyAlreadyProduced=Кол-во уже произведено
+QtyRequiredIfNoLoss=Количество, необходимое при отсутствии потерь (Производственная эффективность 100%%)
+ConsumeOrProduce=Потребляйте или производите
+ConsumeAndProduceAll=Потребляйте и производите все
+Manufactured=Изготовлено
+TheProductXIsAlreadyTheProductToProduce=Добавляемый продукт уже является продуктом, который нужно произвести.
+ForAQuantityOf=За количество произведенных %s
+ForAQuantityToConsumeOf=За количество разобрать %s
+ConfirmValidateMo=Вы уверены, что хотите подтвердить этот производственный заказ?
+ConfirmProductionDesc=Нажав на «%s», вы подтвердите потребление и / или производство для установленных количеств. Это также обновит запасы и запишет движение запасов.
+ProductionForRef=Производство %s
+AutoCloseMO=Закрывайте производственный заказ автоматически, если достигнуты объемы потребления и производства.
+NoStockChangeOnServices=Нет изменений в наличии на сервисах
+ProductQtyToConsumeByMO=Количество продукта, которое еще предстоит потребить открытым МО
+ProductQtyToProduceByMO=Количество продукции, которое еще предстоит произвести открытым МО
+AddNewConsumeLines=Добавить новую строку для потребления
+ProductsToConsume=Продукты для потребления
+ProductsToProduce=Продукты для производства
+UnitCost=Себестоимость единицы продукции
+TotalCost=Общая стоимость
+BOMTotalCost=Стоимость производства этой спецификации на основе стоимости каждого количества и потребляемого продукта (используйте Себестоимость, если она определена, в противном случае - Средневзвешенную цену, если она определена, в противном случае - Лучшую закупочную цену).
+GoOnTabProductionToProduceFirst=Вы должны сначала запустить производство, чтобы закрыть производственный заказ (см. Вкладку «%s»). Но вы можете отменить это.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=Комплект не может быть использован в спецификации или MO
+Workstation=Рабочая станция
+Workstations=Рабочие станции
+WorkstationsDescription=Управление рабочими станциями
+WorkstationSetup = Настройка рабочих станций
+WorkstationSetupPage = Страница настройки рабочих станций
+WorkstationList=Список рабочих станций
+WorkstationCreate=Добавить новую рабочую станцию
+ConfirmEnableWorkstation=Вы действительно хотите включить рабочую станцию <b> %s </b>?
+EnableAWorkstation=Включить рабочую станцию
+ConfirmDisableWorkstation=Вы действительно хотите отключить рабочую станцию <b> %s </b>?
+DisableAWorkstation=Отключить рабочую станцию
+DeleteWorkstation=Удалить
+NbOperatorsRequired=Требуемое количество операторов
+THMOperatorEstimated=Предполагаемый оператор THM
+THMMachineEstimated=Ориентировочная машина THM
+WorkstationType=Тип рабочего места
+Human=Человек
+Machine=Машина
+HumanMachine=Человек / Машина
+WorkstationArea=Площадь рабочего места
+Machines=Машины
+THMEstimatedHelp=Эта ставка позволяет определить прогнозную стоимость товара.
diff --git a/htdocs/langs/ru_RU/multicurrency.lang b/htdocs/langs/ru_RU/multicurrency.lang
index f44c1793569..fdb17b2c4f5 100644
--- a/htdocs/langs/ru_RU/multicurrency.lang
+++ b/htdocs/langs/ru_RU/multicurrency.lang
@@ -1,20 +1,38 @@
 # Dolibarr language file - Source file is en_US - multicurrency
-MultiCurrency=Multi currency
-ErrorAddRateFail=Error in added rate
-ErrorAddCurrencyFail=Error in added currency
-ErrorDeleteCurrencyFail=Error delete fail
-multicurrency_syncronize_error=Synchronisation error: %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=Мульти валюта
+ErrorAddRateFail=Ошибка в добавленной ставке
+ErrorAddCurrencyFail=Ошибка в добавленной валюте
+ErrorDeleteCurrencyFail=Ошибка удалить не удалось
+multicurrency_syncronize_error=Ошибка синхронизации: %s
+MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Используйте дату документа, чтобы найти курс валюты, вместо того, чтобы использовать последний известный курс
+multicurrency_useOriginTx=Когда объект создается из другого, сохраните исходную скорость из исходного объекта (в противном случае используйте последнюю известную скорость)
 CurrencyLayerAccount=CurrencyLayer API
-CurrencyLayerAccount_help_to_synchronize=Вы должны создать аккаунт на их сайте для того, чтобы использовать этот функционал<br>Получите<b>API-ключ</b><br>Если вы используете бесплатный аккаунт, вы не можете изменить<b>источник валюты</b>(USD по умолчанию)<br>Но если ваша основная валюта не USD, то вы можете использовать <b>альтернативный источник валюты</b>для того, чтобы принудительно использовать основную валюту<br><br>Вы сможете производить не более 1000 синхронизаций в месяц
-multicurrency_appId=API key
-multicurrency_appCurrencySource=Currency source
-multicurrency_alternateCurrencySource=Alternate currency source
-CurrenciesUsed=Currencies used
-CurrenciesUsed_help_to_add=Add the differents currencies and rates you need to use on you <b>proposals</b>, <b>orders</b>, etc.
-rate=rate
-MulticurrencyReceived=Received, original currency
-MulticurrencyRemainderToTake=Remaining amout, original currency
+CurrencyLayerAccount_help_to_synchronize=Вы должны создать учетную запись на веб-сайте %s, чтобы использовать эту функцию. <br> Получите ключ API <b> </b>. <br> Если вы используете бесплатную учетную запись, вы не можете изменить исходную валюту <b> </b> (по умолчанию - доллары США). <br> Если ваша основная валюта - не доллары США, приложение автоматически пересчитает ее. <br> <br> Вы ограничены до 1000 синхронизаций в месяц.
+multicurrency_appId=Ключ API
+multicurrency_appCurrencySource=Исходная валюта
+multicurrency_alternateCurrencySource=Альтернативная исходная валюта
+CurrenciesUsed=Используемая валюта
+CurrenciesUsed_help_to_add=Добавьте различные валюты и курсы, которые необходимо использовать для ваших предложений <b>, </b>, <b> заказов, </b> и т. Д.
+rate=показатель
+MulticurrencyReceived=Получено, исходная валюта
+MulticurrencyRemainderToTake=Оставшаяся сумма в исходной валюте
 MulticurrencyPaymentAmount=Сумма платежа, в оригинальной валюте
-AmountToOthercurrency=Amount To (in currency of receiving account)
+AmountToOthercurrency=Сумма до (в валюте счета-получателя)
+CurrencyRateSyncSucceed=Синхронизация курса валют выполнена успешно
+MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Используйте валюту документа для онлайн-платежей
+TabTitleMulticurrencyRate=Список оценок
+ListCurrencyRate=Список курсов обмена на валюту
+CreateRate=Создать ставку
+FormCreateRate=Создание рейтинга
+FormUpdateRate=Модификация оценки
+successRateCreate=Курс валюты %s добавлен в базу
+ConfirmDeleteLineRate=Вы действительно хотите удалить курс %s для валюты %s на дату %s?
+DeleteLineRate=Очистить ставку
+successRateDelete=Оценка удалена
+errorRateDelete=Ошибка при удалении ставки
+successUpdateRate=Модификация сделана
+ErrorUpdateRate=Ошибка при изменении скорости
+Codemulticurrency=код валюты
+UpdateRate=изменить курс
+CancelUpdate=отменить
+NoEmptyRate=Поле ставки не должно быть пустым.
diff --git a/htdocs/langs/ru_RU/oauth.lang b/htdocs/langs/ru_RU/oauth.lang
index 075ff49a895..55c150f6373 100644
--- a/htdocs/langs/ru_RU/oauth.lang
+++ b/htdocs/langs/ru_RU/oauth.lang
@@ -1,32 +1,32 @@
 # Dolibarr language file - Source file is en_US - oauth
-ConfigOAuth=OAuth Configuration
-OAuthServices=OAuth Services
-ManualTokenGeneration=Manual token generation
-TokenManager=Token Manager
-IsTokenGenerated=Is token generated ?
-NoAccessToken=No access token saved into local database
-HasAccessToken=A token was generated and saved into local database
-NewTokenStored=Token received and saved
-ToCheckDeleteTokenOnProvider=Click here to check/delete authorization saved by %s OAuth provider
-TokenDeleted=Token deleted
-RequestAccess=Click here to request/renew access and receive a new token to save
-DeleteAccess=Click here to delete token
-UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when creating your credentials with your OAuth provider:
-ListOfSupportedOauthProviders=Enter the credentials provided by your OAuth2 provider. Only supported OAuth2 providers are listedd here. These services may be used by other modules that need OAuth2 authentication.
-OAuthSetupForLogin=Page to generate an OAuth token
-SeePreviousTab=See previous tab
-OAuthIDSecret=OAuth ID and Secret
-TOKEN_REFRESH=Token Refresh Present
-TOKEN_EXPIRED=Token expired
-TOKEN_EXPIRE_AT=Token expire at
-TOKEN_DELETE=Delete saved token
-OAUTH_GOOGLE_NAME=OAuth Google service
+ConfigOAuth=Конфигурация OAuth
+OAuthServices=Службы OAuth
+ManualTokenGeneration=Ручная генерация токенов
+TokenManager=Токен-менеджер
+IsTokenGenerated=Токен сгенерирован?
+NoAccessToken=Токен доступа не сохранен в локальной базе данных
+HasAccessToken=Токен был сгенерирован и сохранен в локальной базе данных
+NewTokenStored=Токен получен и сохранен
+ToCheckDeleteTokenOnProvider=Щелкните здесь, чтобы проверить / удалить авторизацию, сохраненную поставщиком OAuth %s
+TokenDeleted=Токен удален
+RequestAccess=Нажмите здесь, чтобы запросить / продлить доступ и получить новый токен для сохранения
+DeleteAccess=Нажмите здесь, чтобы удалить токен
+UseTheFollowingUrlAsRedirectURI=Используйте следующий URL-адрес в качестве URI перенаправления при создании учетных данных с помощью поставщика OAuth:
+ListOfSupportedOauthProviders=Введите учетные данные, предоставленные вашим поставщиком OAuth2. Здесь перечислены только поддерживаемые провайдеры OAuth2. Эти службы могут использоваться другими модулями, которым требуется аутентификация OAuth2.
+OAuthSetupForLogin=Страница для создания токена OAuth
+SeePreviousTab=См. Предыдущую вкладку
+OAuthIDSecret=Идентификатор и секрет OAuth
+TOKEN_REFRESH=Присутствует обновление токена
+TOKEN_EXPIRED=Срок действия токена истек
+TOKEN_EXPIRE_AT=Срок действия токена истекает в
+TOKEN_DELETE=Удалить сохраненный токен
+OAUTH_GOOGLE_NAME=OAuth сервис Google
 OAUTH_GOOGLE_ID=OAuth Google Id
 OAUTH_GOOGLE_SECRET=OAuth Google Secret
-OAUTH_GOOGLE_DESC=Go to <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">this page</a> then "Credentials" to create OAuth credentials
-OAUTH_GITHUB_NAME=OAuth GitHub service
-OAUTH_GITHUB_ID=OAuth GitHub Id
+OAUTH_GOOGLE_DESC=Перейдите на <a class="notasortlink" href="https://console.developers.google.com/" target="_blank"> на эту страницу </a> затем "Учетные данные" для создания учетных данных OAuth.
+OAUTH_GITHUB_NAME=Сервис OAuth GitHub
+OAUTH_GITHUB_ID=Идентификатор OAuth GitHub
 OAUTH_GITHUB_SECRET=OAuth GitHub Secret
-OAUTH_GITHUB_DESC=Go to <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">this page</a> then "Register a new application" to create OAuth credentials
-OAUTH_STRIPE_TEST_NAME=OAuth Stripe Test
+OAUTH_GITHUB_DESC=Перейдите на <a class="notasortlink" href="https://github.com/settings/developers" target="_blank"> на эту страницу </a>, затем «Зарегистрируйте новое приложение», чтобы создать учетные данные OAuth.
+OAUTH_STRIPE_TEST_NAME=Тест OAuth Stripe
 OAUTH_STRIPE_LIVE_NAME=OAuth Stripe Live
diff --git a/htdocs/langs/ru_RU/opensurvey.lang b/htdocs/langs/ru_RU/opensurvey.lang
index 3b8562d501b..ceea3e5b316 100644
--- a/htdocs/langs/ru_RU/opensurvey.lang
+++ b/htdocs/langs/ru_RU/opensurvey.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - opensurvey
 Survey=Опрос
 Surveys=Опросы
-OrganizeYourMeetingEasily=Organize your meetings and polls easily. First select the type of poll...
+OrganizeYourMeetingEasily=Легко организовывайте встречи и опросы. Сначала выберите тип опроса ...
 NewSurvey=Новый опрос
 OpenSurveyArea=Раздел опросов
 AddACommentForPoll=Вы можете добавить комментарий в опрос
@@ -11,7 +11,7 @@ PollTitle=Название опроса
 ToReceiveEMailForEachVote=Получать email при каждом голосе
 TypeDate=Тип даты
 TypeClassic=Стандартный тип
-OpenSurveyStep2=Select your dates among the free days (grey). The selected days are green. You can unselect a day previously selected by clicking again on it
+OpenSurveyStep2=Выберите даты среди свободных дней (серый цвет). Выбранные дни отмечены зеленым цветом. Вы можете отменить выбор ранее выбранного дня, щелкнув по нему еще раз.
 RemoveAllDays=Удалить все дни
 CopyHoursOfFirstDay=Копировать часы первого дня
 RemoveAllHours=Удалить все часы
@@ -35,7 +35,7 @@ TitleChoice=Надпись на выпадающем списке
 ExportSpreadsheet=Экспортировать таблицу результатов
 ExpireDate=Ограничить дату
 NbOfSurveys=Количество опросов
-NbOfVoters=No. of voters
+NbOfVoters=Кол-во избирателей
 SurveyResults=Результаты
 PollAdminDesc=Вы можете изменить все пункты с помощью кнопки "Править". Вы можете также удалить столбец или строку с %s. Вы также можете добавить столбец с %s.
 5MoreChoices=Еще 5 выборов
@@ -49,7 +49,7 @@ votes=голос (ов)
 NoCommentYet=Для данного опроса еще не было комментариев
 CanComment=Голосующие могут комментировать опрос
 CanSeeOthersVote=Голосующие могут видеть как проголосовали другие
-SelectDayDesc=For each selected day, you can choose, or not, meeting hours in the following format:<br>- empty,<br>- "8h", "8H" or "8:00" to give a meeting's start hour,<br>- "8-11", "8h-11h", "8H-11H" or "8:00-11:00" to give a meeting's start and end hour,<br>- "8h15-11h15", "8H15-11H15" or "8:15-11:15" for the same thing but with minutes.
+SelectDayDesc=Для каждого выбранного дня вы можете выбрать или нет часы встречи в следующем формате: <br> - пусто, <br> - «8h», «8H» или «8:00», чтобы указать час начала встречи, <br> - «8- 11 »,« 8h-11h »,« 8H-11H »или« 8: 00-11: 00 », чтобы указать время начала и окончания собрания, <br> -« 8h15-11h15 »,« 8H15-11H15 »или« 8: 15-11: 15 "то же самое, но с минутами.
 BackToCurrentMonth=Вернуться к текущему месяцу
 ErrorOpenSurveyFillFirstSection=Вы не заполнили первую секцию формы создания опроса
 ErrorOpenSurveyOneChoice=Введите как минимум один вариант для выбора
@@ -57,5 +57,5 @@ ErrorInsertingComment=При добавлении вашего коммента
 MoreChoices=Введите больше вариантов выбора для голосующих
 SurveyExpiredInfo=Опрос закрыт или период голосования истёк.
 EmailSomeoneVoted=%s заполнил строку. \nВы можете найти Ваш опрос по следующей ссылке: \n%s
-ShowSurvey=Show survey
-UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
+ShowSurvey=Показать опрос
+UserMustBeSameThanUserUsedToVote=Вы должны проголосовать и использовать то же имя пользователя, которое использовалось при голосовании, для публикации комментария.
diff --git a/htdocs/langs/ru_RU/orders.lang b/htdocs/langs/ru_RU/orders.lang
index 6910f244aa4..b153efb65aa 100644
--- a/htdocs/langs/ru_RU/orders.lang
+++ b/htdocs/langs/ru_RU/orders.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - orders
 OrdersArea=Раздел заказов клиентов
-SuppliersOrdersArea=Purchase orders area
+SuppliersOrdersArea=Область заказов на закупку
 OrderCard=Карточка заказа
 OrderId=Идентификатор заказа
 Order=Заказ
@@ -11,25 +11,26 @@ OrderDate=Дата заказа
 OrderDateShort=Дата заказа
 OrderToProcess=Для обработки
 NewOrder=  Новый заказ
-NewOrderSupplier=New Purchase Order
+NewSupplierOrderShort=  Новый заказ
+NewOrderSupplier=Новый заказ на покупку
 ToOrder=Сделать заказ
 MakeOrder=Сделать заказ
-SupplierOrder=Purchase order
+SupplierOrder=Заказ на покупку
 SuppliersOrders=Заказы
-SaleOrderLines=Sale order lines
-PurchaseOrderLines=Puchase order lines
-SuppliersOrdersRunning=Current purchase orders
-CustomerOrder=Sales Order
+SaleOrderLines=Строки заказов на продажу
+PurchaseOrderLines=Строки заказа на закупку
+SuppliersOrdersRunning=Текущие заказы на закупку
+CustomerOrder=Заказ клиента
 CustomersOrders=Заказы на продажу
-CustomersOrdersRunning=Current sales orders
-CustomersOrdersAndOrdersLines=Sales orders and order details
-OrdersDeliveredToBill=Sales orders delivered to bill
-OrdersToBill=Sales orders delivered
-OrdersInProcess=Sales orders in process
-OrdersToProcess=Sales orders to process
-SuppliersOrdersToProcess=Purchase orders to process
-SuppliersOrdersAwaitingReception=Purchase orders awaiting reception
-AwaitingReception=Awaiting reception
+CustomersOrdersRunning=Текущие заказы на продажу
+CustomersOrdersAndOrdersLines=Заказы на продажу и детали заказа
+OrdersDeliveredToBill=Заказы на продажу доставлены в счет
+OrdersToBill=Заказы на продажу доставлены
+OrdersInProcess=Заказы на продажу в обработке
+OrdersToProcess=Заказы на продажу для обработки
+SuppliersOrdersToProcess=Заказы на покупку для обработки
+SuppliersOrdersAwaitingReception=Заказы на покупку ожидают приема
+AwaitingReception=В ожидании приема
 StatusOrderCanceledShort=Отменен
 StatusOrderDraftShort=Черновик
 StatusOrderValidatedShort=Подтвержденные
@@ -44,7 +45,7 @@ StatusOrderApprovedShort=Утверждено
 StatusOrderRefusedShort=Отказался
 StatusOrderToProcessShort=Для обработки
 StatusOrderReceivedPartiallyShort=Частично получил
-StatusOrderReceivedAllShort=Products received
+StatusOrderReceivedAllShort=Полученные продукты
 StatusOrderCanceled=Отменен
 StatusOrderDraft=Проект (должно быть подтверждено)
 StatusOrderValidated=Подтвержденные
@@ -55,7 +56,7 @@ StatusOrderToBill=В законопроекте
 StatusOrderApproved=Утверждено
 StatusOrderRefused=Отказался
 StatusOrderReceivedPartially=Частично получил
-StatusOrderReceivedAll=All products received
+StatusOrderReceivedAll=Все полученные товары
 ShippingExist=Отгрузки существует
 QtyOrdered=Количество заказанных
 ProductQtyInDraft=Количество товаров в проектах заказов
@@ -65,48 +66,49 @@ MenuOrdersToBill2=Оплачиваемые заказы
 ShipProduct=Судно продукта
 CreateOrder=Создать заказ
 RefuseOrder=Отписаться порядка
-ApproveOrder=Approve order
+ApproveOrder=Утвердить заказ
 Approve2Order=Утвердить заказ (второй уровень)
 ValidateOrder=Проверка порядка
 UnvalidateOrder=Unvalidate порядке
 DeleteOrder=Удалить тему
 CancelOrder=Отмена порядка
-OrderReopened= Order %s re-open
+OrderReopened= Заказать повторное открытие %s
 AddOrder=Создать заказ
-AddPurchaseOrder=Create purchase order
+AddSupplierOrderShort=Создать заказ
+AddPurchaseOrder=Создать заказ на поставку
 AddToDraftOrders=Добавить проект заказа
 ShowOrder=Показать порядок
-OrdersOpened=Orders to process
+OrdersOpened=Заказы на обработку
 NoDraftOrders=Нет проектов заказов
-NoOrder=No order
-NoSupplierOrder=No purchase order
-LastOrders=Latest %s sales orders
-LastCustomerOrders=Latest %s sales orders
-LastSupplierOrders=Latest %s purchase orders
-LastModifiedOrders=Latest %s modified orders
+NoOrder=Нет заказа
+NoSupplierOrder=Нет заказа на покупку
+LastOrders=Последние заказы на продажу %s
+LastCustomerOrders=Последние заказы на продажу %s
+LastSupplierOrders=Последние заказы на покупку %s
+LastModifiedOrders=Последние измененные заказы %s
 AllOrders=Все заказы
 NbOfOrders=Количество заказов
 OrdersStatistics=Приказы Статистика
-OrdersStatisticsSuppliers=Purchase order statistics
+OrdersStatisticsSuppliers=Статистика заказов на закупку
 NumberOfOrdersByMonth=Количество заказов в месяц
-AmountOfOrdersByMonthHT=Amount of orders by month (excl. tax)
+AmountOfOrdersByMonthHT=Сумма заказов по месяцам (без налога)
 ListOfOrders=Список заказов
 CloseOrder=Закрыть тему
-ConfirmCloseOrder=Are you sure you want to set this order to delivered? Once an order is delivered, it can be set to billed.
-ConfirmDeleteOrder=Are you sure you want to delete this order?
-ConfirmValidateOrder=Are you sure you want to validate this order under name <b>%s</b>?
-ConfirmUnvalidateOrder=Are you sure you want to restore order <b>%s</b> to draft status?
-ConfirmCancelOrder=Are you sure you want to cancel this order?
-ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</b>?
+ConfirmCloseOrder=Вы уверены, что хотите, чтобы этот заказ был доставлен? Как только заказ будет доставлен, его можно выставить на выставление счета.
+ConfirmDeleteOrder=Вы уверены, что хотите удалить этот заказ?
+ConfirmValidateOrder=Вы уверены, что хотите подтвердить этот заказ под именем <b> %s </b>?
+ConfirmUnvalidateOrder=Вы действительно хотите восстановить порядок <b> %s </b> до статуса черновика?
+ConfirmCancelOrder=Вы уверены, что хотите отменить этот заказ?
+ConfirmMakeOrder=Вы действительно хотите подтвердить, что сделали этот заказ на <b> %s </b>?
 GenerateBill=Создать счет-фактуру
 ClassifyShipped=Отметить доставленным
 DraftOrders=Проект распоряжения
-DraftSuppliersOrders=Draft purchase orders
+DraftSuppliersOrders=Проекты заказов на закупку
 OnProcessOrders=В процессе заказов
 RefOrder=Ref. заказ
-RefCustomerOrder=Ref. order for customer
-RefOrderSupplier=Ref. order for vendor
-RefOrderSupplierShort=Ref. order vendor
+RefCustomerOrder=Ref. заказ для клиента
+RefOrderSupplier=Ref. заказ для продавца
+RefOrderSupplierShort=Ref. поставщик заказа
 SendOrderByMail=Отправить заказ по почте
 ActionsOnOrder=Меры по заказу
 NoArticleOfTypeProduct=Нет статьи типа "продукт", поэтому не shippable статью для этого заказа
@@ -114,25 +116,25 @@ OrderMode=Заказать метод
 AuthorRequest=Просьба автора
 UserWithApproveOrderGrant=Useres предоставляется с "утвердить приказы" разрешения.
 PaymentOrderRef=Оплата заказа %s
-ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b>?
-DispatchSupplierOrder=Receiving purchase order %s
+ConfirmCloneOrder=Вы уверены, что хотите клонировать этот заказ <b> %s </b>?
+DispatchSupplierOrder=Получение заказа на поставку %s
 FirstApprovalAlreadyDone=Первое утверждение уже сделано
-SecondApprovalAlreadyDone=Second approval already done
-SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
-SupplierOrderSubmitedInDolibarr=Purchase Order %s submitted
-SupplierOrderClassifiedBilled=Purchase Order %s set billed
+SecondApprovalAlreadyDone=Второе утверждение уже выполнено
+SupplierOrderReceivedInDolibarr=Заказ на покупку %s получен %s
+SupplierOrderSubmitedInDolibarr=Заказ на поставку %s отправлен
+SupplierOrderClassifiedBilled=Счет за комплект заказа на закупку %s выставлен
 OtherOrders=Другие заказы
 ##### Types de contacts #####
-TypeContact_commande_internal_SALESREPFOLL=Representative following-up sales order
+TypeContact_commande_internal_SALESREPFOLL=Представительский последующий заказ на продажу
 TypeContact_commande_internal_SHIPPING=Представитель следующие меры судоходства
 TypeContact_commande_external_BILLING=свяжитесь со счета
 TypeContact_commande_external_SHIPPING=обратитесь в службу доставки
 TypeContact_commande_external_CUSTOMER=Абонентский отдел следующие меры для
-TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up purchase order
+TypeContact_order_supplier_internal_SALESREPFOLL=Представительский последующий заказ на закупку
 TypeContact_order_supplier_internal_SHIPPING=Представитель следующие меры судоходства
-TypeContact_order_supplier_external_BILLING=Vendor invoice contact
-TypeContact_order_supplier_external_SHIPPING=Vendor shipping contact
-TypeContact_order_supplier_external_CUSTOMER=Vendor contact following-up order
+TypeContact_order_supplier_external_BILLING=Контактная информация поставщика по счету-фактуре
+TypeContact_order_supplier_external_SHIPPING=Контактная информация поставщика для доставки
+TypeContact_order_supplier_external_CUSTOMER=Контакт с поставщиком для последующего заказа
 Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Постоянная COMMANDE_SUPPLIER_ADDON не определена
 Error_COMMANDE_ADDON_NotDefined=Постоянная COMMANDE_ADDON не определена
 Error_OrderNotChecked=Не выбраны заказы для выставления счёта
@@ -143,10 +145,10 @@ OrderByEMail=Адрес электронной почты
 OrderByWWW=Интернет
 OrderByPhone=Телефон
 # Documents models
-PDFEinsteinDescription=A complete order model (old implementation of Eratosthene template)
-PDFEratostheneDescription=A complete order model
+PDFEinsteinDescription=Полная модель заказа (старая реализация шаблона Eratosthene)
+PDFEratostheneDescription=Полная модель заказа
 PDFEdisonDescription=Простая модель для
-PDFProformaDescription=A complete Proforma invoice template
+PDFProformaDescription=Полный шаблон счета-проформы
 CreateInvoiceForThisCustomer=Оплатить заказы
 CreateInvoiceForThisSupplier=Оплатить заказы
 NoOrdersToInvoice=Нет заказов для оплаты
@@ -157,11 +159,11 @@ OrderCreated=Ваши заказы созданы
 OrderFail=Возникла ошибка при создании заказов
 CreateOrders=Создать заказы
 ToBillSeveralOrderSelectCustomer=Для создания счёта на несколько заказов, сначала нажмите на клиента, затем выберете  "%s".
-OptionToSetOrderBilledNotEnabled=Option from module Workflow, to set order to 'Billed' automatically when invoice is validated, is not enabled, so you will have to set the status of orders to 'Billed' manually after the invoice has been generated.
-IfValidateInvoiceIsNoOrderStayUnbilled=If invoice validation is 'No', the order will remain to status 'Unbilled' until the invoice is validated.
-CloseReceivedSupplierOrdersAutomatically=Close order to status "%s" automatically if all products are received.
-SetShippingMode=Set shipping mode
-WithReceptionFinished=With reception finished
+OptionToSetOrderBilledNotEnabled=Параметр из модуля Рабочий процесс, чтобы автоматически установить для заказа значение «Счета», когда счет-фактура подтвержден, не включен, поэтому вам придется вручную установить статус заказов «Счет-фактура» после того, как счет-фактура будет сгенерирован.
+IfValidateInvoiceIsNoOrderStayUnbilled=Если проверка счета - «Нет», заказ будет иметь статус «Не выставлен счет» до тех пор, пока счет не будет подтвержден.
+CloseReceivedSupplierOrdersAutomatically=Закрывайте заказ до статуса «%s» автоматически, если все товары получены.
+SetShippingMode=Установить режим доставки
+WithReceptionFinished=Прием закончился
 #### supplier orders status
 StatusSupplierOrderCanceledShort=Отменена
 StatusSupplierOrderDraftShort=Проект
@@ -177,7 +179,7 @@ StatusSupplierOrderApprovedShort=Утверждено
 StatusSupplierOrderRefusedShort=Отклонено
 StatusSupplierOrderToProcessShort=Для обработки
 StatusSupplierOrderReceivedPartiallyShort=Частично получил
-StatusSupplierOrderReceivedAllShort=Products received
+StatusSupplierOrderReceivedAllShort=Полученные продукты
 StatusSupplierOrderCanceled=Отменена
 StatusSupplierOrderDraft=Проект (должно быть подтверждено)
 StatusSupplierOrderValidated=Утверждена
@@ -188,4 +190,4 @@ StatusSupplierOrderToBill=В законопроекте
 StatusSupplierOrderApproved=Утверждено
 StatusSupplierOrderRefused=Отклонено
 StatusSupplierOrderReceivedPartially=Частично получил
-StatusSupplierOrderReceivedAll=All products received
+StatusSupplierOrderReceivedAll=Все полученные товары
diff --git a/htdocs/langs/ru_RU/other.lang b/htdocs/langs/ru_RU/other.lang
index 948470dcd3b..8ab36a62ed2 100644
--- a/htdocs/langs/ru_RU/other.lang
+++ b/htdocs/langs/ru_RU/other.lang
@@ -1,135 +1,136 @@
 # Dolibarr language file - Source file is en_US - other
 SecurityCode=Защитный код
-NumberingShort=N°
+NumberingShort=№
 Tools=Инструменты
 TMenuTools=Инструменты
-ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
+ToolsDesc=Здесь сгруппированы все инструменты, не включенные в другие пункты меню. <br> Все инструменты доступны через левое меню.
 Birthday=День рождения
 BirthdayAlertOn=рождения активного оповещения
 BirthdayAlertOff=рождения оповещения неактивные
-TransKey=Translation of the key TransKey
-MonthOfInvoice=Month (number 1-12) 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
-TextNextMonthOfInvoice=Following month (text) of invoice date
-PreviousMonth=Previous month
-CurrentMonth=Current month
-ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
-DocFileGeneratedInto=Doc file generated into <b>%s</b>.
-JumpToLogin=Disconnected. Go to login page...
-MessageForm=Message on online payment form
-MessageOK=Message on the return page for a validated payment
-MessageKO=Message on the return page for a canceled payment
-ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
-DeleteAlsoContentRecursively=Check to delete all content recursively
-PoweredBy=Powered by
-YearOfInvoice=Year of invoice date
-PreviousYearOfInvoice=Previous year of invoice date
-NextYearOfInvoice=Following year of invoice date
-DateNextInvoiceBeforeGen=Date of next invoice (before generation)
-DateNextInvoiceAfterGen=Date of next invoice (after generation)
-GraphInBarsAreLimitedToNMeasures=Grapics are limited to %s measures in 'Bars' mode. The mode 'Lines' was automatically selected instead.
-OnlyOneFieldForXAxisIsPossible=Only 1 field is currently possible as X-Axis. Only the first selected field has been selected.
-AtLeastOneMeasureIsRequired=At least 1 field for measure is required
-AtLeastOneXAxisIsRequired=At least 1 field for X-Axis is required
-LatestBlogPosts=Latest Blog Posts
-Notify_ORDER_VALIDATE=Sales order validated
-Notify_ORDER_SENTBYMAIL=Sales order sent by mail
-Notify_ORDER_SUPPLIER_SENTBYMAIL=Purchase order sent by email
-Notify_ORDER_SUPPLIER_VALIDATE=Purchase order recorded
-Notify_ORDER_SUPPLIER_APPROVE=Purchase order approved
-Notify_ORDER_SUPPLIER_REFUSE=Purchase order refused
+TransKey=Перевод ключа TransKey
+MonthOfInvoice=Месяц (число 1-12) даты выставления счета
+TextMonthOfInvoice=Месяц (текст) даты выставления счета
+PreviousMonthOfInvoice=Предыдущий месяц (число 1-12) даты выставления счета
+TextPreviousMonthOfInvoice=Предыдущий месяц (текст) даты выставления счета
+NextMonthOfInvoice=Следующий месяц (число 1-12) даты выставления счета
+TextNextMonthOfInvoice=Следующий месяц (текст) даты выставления счета
+PreviousMonth=Прошлый месяц
+CurrentMonth=Текущий месяц
+ZipFileGeneratedInto=Zip-файл, созданный в <b> %s </b>.
+DocFileGeneratedInto=Doc-файл, созданный в формате <b> %s </b>.
+JumpToLogin=Отключено. Перейти на страницу входа ...
+MessageForm=Сообщение в форме онлайн-оплаты
+MessageOK=Сообщение на странице возврата для подтвержденного платежа
+MessageKO=Сообщение на странице возврата об отмене платежа
+ContentOfDirectoryIsNotEmpty=Содержимое этого каталога не пусто.
+DeleteAlsoContentRecursively=Установите флажок для рекурсивного удаления всего содержимого
+PoweredBy=Питаться от
+YearOfInvoice=Год даты выставления счета
+PreviousYearOfInvoice=Предыдущий год даты выставления счета
+NextYearOfInvoice=Следующий год на дату выставления счета
+DateNextInvoiceBeforeGen=Дата следующего счета (до генерации)
+DateNextInvoiceAfterGen=Дата следующего счета (после генерации)
+GraphInBarsAreLimitedToNMeasures=Графика ограничена измерениями %s в режиме «Полосы». Вместо этого автоматически был выбран режим «Линии».
+OnlyOneFieldForXAxisIsPossible=Только 1 поле в настоящее время возможно как ось X. Было выбрано только первое выбранное поле.
+AtLeastOneMeasureIsRequired=Требуется хотя бы одно поле для измерения
+AtLeastOneXAxisIsRequired=Требуется хотя бы 1 поле для оси X
+LatestBlogPosts=Последние сообщения в блоге
+Notify_ORDER_VALIDATE=Заказ на продажу подтвержден
+Notify_ORDER_SENTBYMAIL=Заказ на продажу отправлен по почте
+Notify_ORDER_SUPPLIER_SENTBYMAIL=Заказ на покупку отправлен по электронной почте
+Notify_ORDER_SUPPLIER_VALIDATE=Заказ на покупку зарегистрирован
+Notify_ORDER_SUPPLIER_APPROVE=Заказ на покупку утвержден
+Notify_ORDER_SUPPLIER_REFUSE=Заказ на покупку отклонен
 Notify_PROPAL_VALIDATE=Kunden forslaget validert
-Notify_PROPAL_CLOSE_SIGNED=Customer proposal closed signed
-Notify_PROPAL_CLOSE_REFUSED=Customer proposal closed refused
+Notify_PROPAL_CLOSE_SIGNED=Предложение клиента закрыто подписано
+Notify_PROPAL_CLOSE_REFUSED=Предложение клиента закрыто, отказано
 Notify_PROPAL_SENTBYMAIL=Коммерческое предложение по почте
 Notify_WITHDRAW_TRANSMIT=Передача вывода
 Notify_WITHDRAW_CREDIT=Кредитный выход
 Notify_WITHDRAW_EMIT=Isue вывода
 Notify_COMPANY_CREATE=Третья партия, созданная
-Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
+Notify_COMPANY_SENTBYMAIL=Письма, отправленные со сторонней карты
 Notify_BILL_VALIDATE=Проверка векселя
 Notify_BILL_UNVALIDATE=Счёт клиента не подтверждён
 Notify_BILL_PAYED=Счет клиента оплачен
 Notify_BILL_CANCEL=Счёт клиента отменён
 Notify_BILL_SENTBYMAIL=Клиенту счет-фактура высылается по почте
-Notify_BILL_SUPPLIER_VALIDATE=Vendor invoice validated
-Notify_BILL_SUPPLIER_PAYED=Vendor invoice paid
-Notify_BILL_SUPPLIER_SENTBYMAIL=Vendor invoice sent by mail
-Notify_BILL_SUPPLIER_CANCELED=Vendor invoice cancelled
+Notify_BILL_SUPPLIER_VALIDATE=Счет поставщика подтвержден
+Notify_BILL_SUPPLIER_PAYED=Счет поставщика оплачен
+Notify_BILL_SUPPLIER_SENTBYMAIL=Счет поставщика отправлен по почте
+Notify_BILL_SUPPLIER_CANCELED=Счет поставщика отменен
 Notify_CONTRACT_VALIDATE=Договор проверку
 Notify_FICHINTER_VALIDATE=Посредничество проверено.
-Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
-Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
+Notify_FICHINTER_ADD_CONTACT=Добавлен контакт в Intervention
+Notify_FICHINTER_SENTBYMAIL=Сообщение отправлено по почте
 Notify_SHIPPING_VALIDATE=Доставка проверку
 Notify_SHIPPING_SENTBYMAIL=Доставка по почте
 Notify_MEMBER_VALIDATE=Член проверки
 Notify_MEMBER_MODIFY=Участник изменён
 Notify_MEMBER_SUBSCRIPTION=Член подписки
-Notify_MEMBER_RESILIATE=Member terminated
+Notify_MEMBER_RESILIATE=Участник исключен
 Notify_MEMBER_DELETE=Член удален
 Notify_PROJECT_CREATE=Создание проекта
 Notify_TASK_CREATE=Задача создана
 Notify_TASK_MODIFY=Задача изменена
 Notify_TASK_DELETE=Задача удалена
-Notify_EXPENSE_REPORT_VALIDATE=Expense report validated (approval required)
-Notify_EXPENSE_REPORT_APPROVE=Expense report approved
-Notify_HOLIDAY_VALIDATE=Leave request validated (approval required)
-Notify_HOLIDAY_APPROVE=Leave request approved
-Notify_ACTION_CREATE=Added action to Agenda
+Notify_EXPENSE_REPORT_VALIDATE=Отчет о расходах утвержден (требуется одобрение)
+Notify_EXPENSE_REPORT_APPROVE=Отчет о расходах утвержден
+Notify_HOLIDAY_VALIDATE=Оставьте запрос подтвержденным (требуется одобрение)
+Notify_HOLIDAY_APPROVE=Оставить заявку одобрено
+Notify_ACTION_CREATE=Добавлено действие в повестку дня
 SeeModuleSetup=Посмотреть настройку модуля  %s
 NbOfAttachedFiles=Количество прикрепленных файлов / документов
 TotalSizeOfAttachedFiles=Общий размер присоединенных файлов / документы
 MaxSize=Максимальный размер
 AttachANewFile=Присоединить новый файл / документ
 LinkedObject=Связанные объект
-NbOfActiveNotifications=Number of notifications (no. of recipient emails)
-PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe lines are separated by a carriage return.\n\n__USER_SIGNATURE__
-PredefinedMailTestHtml=__(Hello)__<br>This is a <b>test</b> mail sent to __EMAIL__ (the word test must be in bold).<br>The lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
-PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached \n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to remind you that the invoice  __REF__ seems to have not been paid. A copy of the invoice is attached as a reminder.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendProposal=__(Hello)__\n\nPlease find commercial proposal __REF__ attached \n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nPlease find price request __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendOrder=__(Hello)__\n\nPlease find order __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nPlease find our order __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
-PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendActionComm=Event reminder "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>This is an automatic message, please do not reply.
-DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
-ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
-ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
+NbOfActiveNotifications=Количество уведомлений (количество писем получателя)
+PredefinedMailTest=__(Привет)__\nЭто тестовое письмо отправлено на адрес __EMAIL__.\nСтроки разделяются символом возврата каретки.\n\n__USER_SIGNATURE__
+PredefinedMailTestHtml=__ (Привет) __ <br> Это письмо <b>, отправленное на адрес __EMAIL__, </b> (слово test должно быть выделено жирным шрифтом). <br> Строки разделяются символом возврата каретки. <br> <br> __USER_SIGNATURE__
+PredefinedMailContentContract=__(Привет)__\n\n\n__(Искренне)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Привет)__\n\nСчет-фактура __REF__ прилагается.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Искренне)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Привет)__\n\nНапоминаем, что счет __REF__ не был оплачен. Копия счета прилагается в качестве напоминания.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Искренне)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Привет)__\n\nВ приложении коммерческое предложение __REF__.\n\n\n__(Искренне)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__(Привет)__\n\nЗапрос цены __REF__ прилагается.\n\n\n__(Искренне)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendOrder=__(Привет)__\n\nПожалуйста, найдите заказ __REF__ в приложении.\n\n\n__(Искренне)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierOrder=__(Привет)__\n\nНаш заказ __REF__ прилагается.\n\n\n__(Искренне)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierInvoice=__(Привет)__\n\nСчет-фактура __REF__ прилагается.\n\n\n__(Искренне)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendShipping=__(Привет)__\n\nПожалуйста, найдите доставку __REF__ в приложении.\n\n\n__(Искренне)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendFichInter=__(Привет)__\n\nПожалуйста, найдите вмешательство __REF__ в приложении\n\n\n__(Искренне)__\n\n__USER_SIGNATURE__
+PredefinedMailContentLink=Вы можете нажать на ссылку ниже, чтобы произвести платеж, если это еще не сделано.\n\n%s\n\n
+PredefinedMailContentGeneric=__(Привет)__\n\n\n__(Искренне)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Напоминание о событии «__EVENT_LABEL__» __EVENT_DATE__ в __EVENT_TIME__ <br> <br> Это автоматическое сообщение, не отвечайте.
+DemoDesc=Dolibarr - это компактная ERP / CRM, поддерживающая несколько бизнес-модулей. Демо, демонстрирующее все модули, не имеет смысла, поскольку этот сценарий никогда не происходит (доступно несколько сотен). Итак, доступно несколько демо-профилей.
+ChooseYourDemoProfil=Выберите демо-профиль, который наилучшим образом соответствует вашим потребностям ...
+ChooseYourDemoProfilMore=... или создайте свой собственный профиль <br> (ручной выбор модуля)
 DemoFundation=Управление членов Фонда
 DemoFundation2=Управление членами и банковские счета Фонда
-DemoCompanyServiceOnly=Company or freelance selling service only
+DemoCompanyServiceOnly=Только услуги компании или внештатного продавца
 DemoCompanyShopWithCashDesk=Работа магазина в кассу
-DemoCompanyProductAndStocks=Shop selling products with Point Of Sales
-DemoCompanyManufacturing=Company manufacturing products
-DemoCompanyAll=Company with multiple activities (all main modules)
+DemoCompanyProductAndStocks=Магазин, продающий товары с помощью Point Of Sales
+DemoCompanyManufacturing=Компания по производству продукции
+DemoCompanyAll=Компания с несколькими видами деятельности (все основные модули)
 CreatedBy=Создан %s
 ModifiedBy=Модифицированное% по S
 ValidatedBy=Подтверждено %s
-SignedBy=Signed by %s
+SignedBy=Подписано %s
 ClosedBy=Закрытые% по S
 CreatedById=ID пользователя, который создал
-ModifiedById=User id who made latest change
+ModifiedById=Идентификатор пользователя, который внес последнее изменение
 ValidatedById=ID пользователя, который подтвердил
 CanceledById=ID пользователя, который отменил
 ClosedById=ID пользователя, который закрыл
 CreatedByLogin=Логин пользователя, который создал
-ModifiedByLogin=User login who made latest change
+ModifiedByLogin=Логин пользователя, который внес последнее изменение
 ValidatedByLogin=Логин пользователя, который подтвердил
 CanceledByLogin=Логин пользователя, который отменил
 ClosedByLogin=Логин пользователя, который закрыл
 FileWasRemoved=Файл был удален
 DirWasRemoved=Каталог был удален
-FeatureNotYetAvailable=Feature not yet available in the current version
-FeaturesSupported=Supported features
+FeatureNotYetAvailable=Функция еще не доступна в текущей версии
+FeatureNotAvailableOnDevicesWithoutMouse=Функция недоступна на устройствах без мыши
+FeaturesSupported=Поддерживаемые функции
 Width=Ширина
 Height=Высота
 Depth=Глубина
@@ -140,7 +141,7 @@ Right=Право
 CalculatedWeight=расчетный вес
 CalculatedVolume=Beregnet volum
 Weight=Вес
-WeightUnitton=ton
+WeightUnitton=тонна
 WeightUnitkg=кг
 WeightUnitg=G
 WeightUnitmg=мг
@@ -153,18 +154,18 @@ LengthUnitcm=cm
 LengthUnitmm=mm
 Surface=Område
 SurfaceUnitm2=м²
-SurfaceUnitdm2=dm²
-SurfaceUnitcm2=cm²
-SurfaceUnitmm2=mm²
-SurfaceUnitfoot2=ft²
-SurfaceUnitinch2=in²
+SurfaceUnitdm2=дм²
+SurfaceUnitcm2=см²
+SurfaceUnitmm2=мм²
+SurfaceUnitfoot2=фут²
+SurfaceUnitinch2=дюйм²
 Volume=Объем
 VolumeUnitm3=м³
-VolumeUnitdm3=dm³ (L)
-VolumeUnitcm3=cm³ (ml)
-VolumeUnitmm3=mm³ (µl)
-VolumeUnitfoot3=ft³
-VolumeUnitinch3=in³
+VolumeUnitdm3=дм³ (л)
+VolumeUnitcm3=см³ (мл)
+VolumeUnitmm3=мм³ (мкл)
+VolumeUnitfoot3=фут³
+VolumeUnitinch3=дюйм³
 VolumeUnitounce=унция
 VolumeUnitlitre=литр
 VolumeUnitgallon=галлон
@@ -174,50 +175,50 @@ SizeUnitcm=см
 SizeUnitmm=мм
 SizeUnitinch=дюйм
 SizeUnitfoot=фут
-SizeUnitpoint=point
+SizeUnitpoint=точка
 BugTracker=Ошибка Tracker
-SendNewPasswordDesc=This form allows you to request a new password. It will be sent to your email address.<br>Change will become effective once you click on the confirmation link in the email.<br>Check your inbox.
+SendNewPasswordDesc=Эта форма позволяет вам запросить новый пароль. Он будет отправлен на ваш электронный адрес. <br> Изменение вступит в силу после того, как вы нажмете на ссылку подтверждения в электронном письме. <br> Проверьте свой почтовый ящик.
 BackToLoginPage=Перейти на страницу входа
 AuthenticationDoesNotAllowSendNewPassword=Аутентификация <b>режим %s.</b> <br> В этом режиме Dolibarr можете не знать, ни изменить свой пароль. <br> Обратитесь к системному администратору, если вы хотите изменить свой пароль.
-EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
+EnableGDLibraryDesc=Установите или включите библиотеку GD в вашей установке PHP, чтобы использовать эту опцию.
 ProfIdShortDesc=<b>Проф Id %s</b> является информация в зависимости от сторонних страны. <br> Например, для страны <b>с%,</b> то <b>с кодом%.</b>
 DolibarrDemo=Dolibarr ERP / CRM демо
-StatsByNumberOfUnits=Statistics for sum of qty of products/services
-StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
-NumberOfProposals=Number of proposals
-NumberOfCustomerOrders=Number of sales orders
-NumberOfCustomerInvoices=Number of customer invoices
-NumberOfSupplierProposals=Number of vendor proposals
-NumberOfSupplierOrders=Number of purchase orders
-NumberOfSupplierInvoices=Number of vendor invoices
-NumberOfContracts=Number of contracts
-NumberOfMos=Number of manufacturing orders
-NumberOfUnitsProposals=Number of units on proposals
-NumberOfUnitsCustomerOrders=Number of units on sales orders
-NumberOfUnitsCustomerInvoices=Number of units on customer invoices
-NumberOfUnitsSupplierProposals=Number of units on vendor proposals
-NumberOfUnitsSupplierOrders=Number of units on purchase orders
-NumberOfUnitsSupplierInvoices=Number of units on vendor invoices
-NumberOfUnitsContracts=Number of units on contracts
-NumberOfUnitsMos=Number of units to produce in manufacturing orders
-EMailTextInterventionAddedContact=A new intervention %s has been assigned to you.
+StatsByNumberOfUnits=Статистика по количеству товаров / услуг
+StatsByNumberOfEntities=Статистика количества ссылающихся организаций (количество счетов-фактур или заказов ...)
+NumberOfProposals=Количество предложений
+NumberOfCustomerOrders=Количество заказов на продажу
+NumberOfCustomerInvoices=Количество счетов клиентов
+NumberOfSupplierProposals=Количество предложений поставщиков
+NumberOfSupplierOrders=Количество заказов на поставку
+NumberOfSupplierInvoices=Количество счетов-фактур поставщика
+NumberOfContracts=Количество контрактов
+NumberOfMos=Количество заказов на изготовление
+NumberOfUnitsProposals=Количество единиц в предложениях
+NumberOfUnitsCustomerOrders=Количество единиц в заказах на продажу
+NumberOfUnitsCustomerInvoices=Количество единиц в счетах-фактурах клиентов
+NumberOfUnitsSupplierProposals=Количество единиц в предложениях поставщиков
+NumberOfUnitsSupplierOrders=Количество единиц в заказах на поставку
+NumberOfUnitsSupplierInvoices=Количество единиц в накладных поставщика
+NumberOfUnitsContracts=Количество единиц по контрактам
+NumberOfUnitsMos=Количество единиц для производства в производственных заказах
+EMailTextInterventionAddedContact=Вам назначено новое вмешательство %s.
 EMailTextInterventionValidated=Посредничество %s проверено.
-EMailTextInvoiceValidated=Invoice %s has been validated.
-EMailTextInvoicePayed=Invoice %s has been paid.
-EMailTextProposalValidated=Proposal %s has been validated.
-EMailTextProposalClosedSigned=Proposal %s has been closed signed.
-EMailTextOrderValidated=Order %s has been validated.
-EMailTextOrderApproved=Order %s has been approved.
-EMailTextOrderValidatedBy=Order %s has been recorded by %s.
-EMailTextOrderApprovedBy=Order %s has been approved by %s.
-EMailTextOrderRefused=Order %s has been refused.
-EMailTextOrderRefusedBy=Order %s has been refused by %s.
-EMailTextExpeditionValidated=Shipping %s has been validated.
-EMailTextExpenseReportValidated=Expense report %s has been validated.
-EMailTextExpenseReportApproved=Expense report %s has been approved.
-EMailTextHolidayValidated=Leave request %s has been validated.
-EMailTextHolidayApproved=Leave request %s has been approved.
-EMailTextActionAdded=The action %s has been added to the Agenda.
+EMailTextInvoiceValidated=Счет-фактура %s подтверждена.
+EMailTextInvoicePayed=Счет %s оплачен.
+EMailTextProposalValidated=Предложение %s было подтверждено.
+EMailTextProposalClosedSigned=Предложение %s закрыто подписью.
+EMailTextOrderValidated=Заказ %s подтвержден.
+EMailTextOrderApproved=Заказ %s утвержден.
+EMailTextOrderValidatedBy=Заказ %s был зарегистрирован пользователем %s.
+EMailTextOrderApprovedBy=Заказ %s был одобрен %s.
+EMailTextOrderRefused=Заказ %s был отклонен.
+EMailTextOrderRefusedBy=Заказ %s был отклонен %s.
+EMailTextExpeditionValidated=Доставка %s подтверждена.
+EMailTextExpenseReportValidated=Отчет о расходах %s утвержден.
+EMailTextExpenseReportApproved=Отчет о расходах %s утвержден.
+EMailTextHolidayValidated=Запрос на выход %s был проверен.
+EMailTextHolidayApproved=Запрос на выезд %s был одобрен.
+EMailTextActionAdded=Действие %s добавлено в повестку дня.
 ImportedWithSet=Импорт данных
 DolibarrNotification=Автоматические уведомления
 ResizeDesc=Skriv inn ny <b>bredde</b> eller ny høyde. Forhold vil bli holdt under resizing ...
@@ -225,7 +226,7 @@ NewLength=Ny bredde
 NewHeight=Ny høyde
 NewSizeAfterCropping=Ny størrelse etter beskjæring
 DefineNewAreaToPick=Definer nytt område på bildet for å plukke (venstre klikk på bildet og dra til du kommer til motsatt hjørne)
-CurrentInformationOnImage=This tool was designed to help you to resize or crop an image. This is the information on the current edited image
+CurrentInformationOnImage=Этот инструмент был разработан, чтобы помочь вам изменить размер или обрезать изображение. Это информация о текущем редактируемом изображении.
 ImageEditor=Редактор изображений
 YouReceiveMailBecauseOfNotification=Du mottar denne meldingen fordi din e-post har blitt lagt til listen over mål for å bli informert om spesielle hendelser i %s programvare av %s.
 YouReceiveMailBecauseOfNotification2=Denne hendelsen er følgende:
@@ -238,55 +239,55 @@ StartUpload=Начать загрузку
 CancelUpload=Отмена загрузки
 FileIsTooBig=Файлы слишком велик
 PleaseBePatient=Пожалуйста, будьте терпеливы ...
-NewPassword=New password
-ResetPassword=Reset password
-RequestToResetPasswordReceived=A request to change your password has been received.
+NewPassword=Новый пароль
+ResetPassword=Сброс пароля
+RequestToResetPasswordReceived=Получен запрос на смену пароля.
 NewKeyIs=Ваши новые ключи для доступа
 NewKeyWillBe=Ваш новый ключ для доступа к ПО будет
 ClickHereToGoTo=Нажмите сюда, чтобы перейти к %s
 YouMustClickToChange=Однако, вы должны сначала нажать на ссылку для подтверждения изменения пароля
-ConfirmPasswordChange=Confirm password change
+ConfirmPasswordChange=Подтвердите смену пароля
 ForgetIfNothing=Если вы не запрашивали эти изменения, забудьте про это электронное письмо.  Ваши данные в безопасности.
 IfAmountHigherThan=Если количество более чем <strong>%s</strong>
-SourcesRepository=Repository for sources
-Chart=Chart
-PassEncoding=Password encoding
-PermissionsAdd=Permissions added
-PermissionsDelete=Permissions removed
-YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
-YourPasswordHasBeenReset=Your password has been reset successfully
-ApplicantIpAddress=IP address of applicant
-SMSSentTo=SMS sent to %s
-MissingIds=Missing ids
-ThirdPartyCreatedByEmailCollector=Third party created by email collector from email MSGID %s
-ContactCreatedByEmailCollector=Contact/address created by email collector from email MSGID %s
-ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
-TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
-OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
-PrefixSession=Prefix for session ID
+SourcesRepository=Репозиторий исходников
+Chart=Диаграмма
+PassEncoding=Кодировка пароля
+PermissionsAdd=Разрешения добавлены
+PermissionsDelete=Разрешения удалены
+YourPasswordMustHaveAtLeastXChars=Ваш пароль должен содержать не менее <strong> %s </strong> символов.
+YourPasswordHasBeenReset=Ваш пароль был успешно сброшен
+ApplicantIpAddress=IP-адрес заявителя
+SMSSentTo=SMS отправлено на %s
+MissingIds=Отсутствующие идентификаторы
+ThirdPartyCreatedByEmailCollector=Третья сторона создана сборщиком электронной почты из электронной почты MSGID %s
+ContactCreatedByEmailCollector=Контакт / адрес, созданный сборщиком электронной почты из электронной почты MSGID %s
+ProjectCreatedByEmailCollector=Проект создан сборщиком писем из электронной почты MSGID %s
+TicketCreatedByEmailCollector=Билет создан сборщиком электронной почты из электронного адреса MSGID %s
+OpeningHoursFormatDesc=Используйте - для разделения часов открытия и закрытия. <br> Используйте пробел для ввода различных диапазонов. <br> Пример: 8-12 14-18
+SuffixSessionName=Суффикс имени сеанса
 
 ##### Export #####
 ExportsArea=Экспорт области
 AvailableFormats=Доступные форматы
 LibraryUsed=Librairie
-LibraryVersion=Library version
+LibraryVersion=Версия библиотеки
 ExportableDatas=Экспортировать данные
 NoExportableData=Нет экспортировать данные (не модули для экспорта данных, загруженных или недостающие разрешения)
 ##### External sites #####
-WebsiteSetup=Setup of module website
-WEBSITE_PAGEURL=URL of page
+WebsiteSetup=Настройка сайта модуля
+WEBSITE_PAGEURL=URL страницы
 WEBSITE_TITLE=Название
 WEBSITE_DESCRIPTION=Описание
-WEBSITE_IMAGE=Image
-WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a thumbnail in a list of blog posts). Use __WEBSITE_KEY__ in the path if path depends on website name (for example: image/__WEBSITE_KEY__/stories/myimage.png).
-WEBSITE_KEYWORDS=Keywords
-LinesToImport=Lines to import
+WEBSITE_IMAGE=Изображение
+WEBSITE_IMAGEDesc=Относительный путь носителя изображения. Вы можете оставить это поле пустым, так как оно используется редко (его можно использовать в динамическом контенте для отображения эскиза в списке сообщений блога). Используйте __WEBSITE_KEY__ в пути, если путь зависит от имени веб-сайта (например: image / __ WEBSITE_KEY __ / stories / myimage.png).
+WEBSITE_KEYWORDS=Ключевые слова
+LinesToImport=Строки для импорта
 
-MemoryUsage=Memory usage
-RequestDuration=Duration of request
-ProductsPerPopularity=Products/Services by popularity
-PopuProp=Products/Services by popularity in Proposals
-PopuCom=Products/Services by popularity in Orders
-ProductStatistics=Products/Services Statistics
-NbOfQtyInOrders=Qty in orders
-SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
+MemoryUsage=Использование памяти
+RequestDuration=Продолжительность запроса
+ProductsPerPopularity=Товары / Услуги по популярности
+PopuProp=Товары / Услуги по популярности в предложениях
+PopuCom=Товары / Услуги по популярности в Заказах
+ProductStatistics=Статистика продуктов / услуг
+NbOfQtyInOrders=Кол-во в заказах
+SelectTheTypeOfObjectToAnalyze=Выберите объект, чтобы просмотреть его статистику ...
diff --git a/htdocs/langs/ru_RU/partnership.lang b/htdocs/langs/ru_RU/partnership.lang
index 4192ed27776..6b70af53766 100644
--- a/htdocs/langs/ru_RU/partnership.lang
+++ b/htdocs/langs/ru_RU/partnership.lang
@@ -16,41 +16,72 @@
 #
 # Generic
 #
-ModulePartnershipName = Partnership management
-PartnershipDescription = Module Partnership management
-PartnershipDescriptionLong= Module Partnership management
+ModulePartnershipName=Управление партнерством
+PartnershipDescription=Модуль Управление партнерством
+PartnershipDescriptionLong= Модуль Управление партнерством
+
+AddPartnership=Add partnership
+CancelPartnershipForExpiredMembers=Partnership: Cancel partnership of members with expired subscriptions
+PartnershipCheckBacklink=Partnership: Check referring backlink
 
 #
 # Menu
 #
-NewPartnership = Новое партнерство
-ListOfPartnerships = Список партнеров
+NewPartnership=Новое партнерство
+ListOfPartnerships=Список партнерских отношений
 
 #
 # Admin page
 #
-PartnershipSetup = Partnership setup
-PartnershipAbout = About Partnership
-PartnershipAboutPage = Partnership about page
-
+PartnershipSetup=Настройка партнерства
+PartnershipAbout=О партнерстве
+PartnershipAboutPage=Партнерство о странице
+partnershipforthirdpartyormember=Статус партнера должен быть установлен на "третье лицо" или "участник".
+PARTNERSHIP_IS_MANAGED_FOR=Партнерство удалось
+PARTNERSHIP_BACKLINKS_TO_CHECK=Обратные ссылки для проверки
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Кол-во дней до отмены статуса партнерства по истечении срока подписки 
+ReferingWebsiteCheck=Проверка ссылки на сайт
+ReferingWebsiteCheckDesc=Вы можете включить функцию проверки того, что ваши партнеры добавили обратную ссылку на домены вашего веб-сайта на своем собственном веб-сайте.
 
 #
 # Object
 #
+DeletePartnership=Удалить партнерство
+PartnershipDedicatedToThisThirdParty=Партнерство, посвященное этой третьей стороне
+PartnershipDedicatedToThisMember=Партнерство, посвященное этому участнику
 DatePartnershipStart=Дата начала
 DatePartnershipEnd=Дата окончания
+ReasonDecline=Причина отклонения
+ReasonDeclineOrCancel=Причина отклонения
+PartnershipAlreadyExist=Партнерство уже существует
+ManagePartnership=Управление партнерством
+BacklinkNotFoundOnPartnerWebsite=Обратная ссылка не найдена на партнерском сайте
+ConfirmClosePartnershipAsk=Вы уверены, что хотите отменить это партнерство?
+PartnershipType=Partnership type
 
 #
 # Template Mail
 #
+SendingEmailOnPartnershipWillSoonBeCanceled=Партнерство скоро будет отменено
+SendingEmailOnPartnershipRefused=От партнерства отказано
+SendingEmailOnPartnershipAccepted=Партнерство принято
+SendingEmailOnPartnershipCanceled=Партнерство отменено
 
+YourPartnershipWillSoonBeCanceledTopic=Партнерство скоро будет отменено
+YourPartnershipRefusedTopic=От партнерства отказано
+YourPartnershipAcceptedTopic=Партнерство принято
+YourPartnershipCanceledTopic=Партнерство отменено
+
+YourPartnershipWillSoonBeCanceledContent=Сообщаем вам, что ваше партнерство скоро будет отменено (обратная ссылка не найдена)
+YourPartnershipRefusedContent=Сообщаем вам, что ваш запрос на партнерство был отклонен.
+YourPartnershipAcceptedContent=Сообщаем вам, что ваш запрос на партнерство принят.
+YourPartnershipCanceledContent=Сообщаем вам, что ваше партнерство было расторгнуто.
 
 #
 # Status
 #
-PartnershipDraft = Проект
-PartnershipAccepted = Принято
-PartnershipRefused = Отклонено
-PartnershipCanceled = Отменена
-
-PartnershipManagedFor=Partners are
+PartnershipDraft=Проект
+PartnershipAccepted=Принято
+PartnershipRefused=Отклонено
+PartnershipCanceled=Отменена
+PartnershipManagedFor=Партнеры
diff --git a/htdocs/langs/ru_RU/paybox.lang b/htdocs/langs/ru_RU/paybox.lang
index cd68c2f4809..997c71014bd 100644
--- a/htdocs/langs/ru_RU/paybox.lang
+++ b/htdocs/langs/ru_RU/paybox.lang
@@ -3,29 +3,28 @@ PayBoxSetup=Настройка модуля PayBox
 PayBoxDesc=Этот модуль предложить страниц, чтобы платеж по <a href="http://www.paybox.com" target="_blank">Paybox</a> клиентами. Это может быть использовано для свободного платежа или за плату по тому или иному объекту Dolibarr (счетов-фактур, порядка, ...)
 FollowingUrlAreAvailableToMakePayments=После URL, можно предложить страницу к клиенту сделать платеж по Dolibarr объектов
 PaymentForm=Форма оплаты
-WelcomeOnPaymentPage=Welcome to our online payment service
+WelcomeOnPaymentPage=Добро пожаловать в нашу службу онлайн-платежей
 ThisScreenAllowsYouToPay=На этом экране можно сделать онлайн-платежей для %s.
 ThisIsInformationOnPayment=Это данные по оплате делать
 ToComplete=Для завершения
 YourEMail=Электронная почта для подтверждения оплаты
 Creditor=Кредитор
 PaymentCode=Код платежа
-PayBoxDoPayment=Pay with Paybox
+PayBoxDoPayment=Оплатить через Paybox
 YouWillBeRedirectedOnPayBox=Вы будете перенаправлены по обеспеченным Paybox страницу для ввода данных кредитной карточки
 Continue=Далее
-SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
+SetupPayBoxToHavePaymentCreatedAutomatically=Настройте свою Paybox с URL-адресом <b> %s </b>, чтобы платеж создавался автоматически при подтверждении Paybox.
 YourPaymentHasBeenRecorded=Эта страница подтверждает, что ваш платеж был записан. Спасибо.
-YourPaymentHasNotBeenRecorded=Your payment has NOT been recorded and the transaction has been canceled. Thank you.
+YourPaymentHasNotBeenRecorded=Ваш платеж НЕ был зарегистрирован, и транзакция была отменена. Спасибо.
 AccountParameter=Счет параметры
 UsageParameter=Использование параметров
 InformationToFindParameters=Помогите найти %s информацию об учетной записи
 PAYBOX_CGI_URL_V2=Url модуля Paybox CGI для оплаты
-VendorName=Имя поставщика
 CSSUrlForPaymentForm=CSS-стилей URL для оплаты форме
 NewPayboxPaymentReceived=Новый платёж Paybox поулчен.
 NewPayboxPaymentFailed=Попытка нового платежа Paybox не удалась
-PAYBOX_PAYONLINE_SENDEMAIL=Email notification after payment attempt (success or fail)
+PAYBOX_PAYONLINE_SENDEMAIL=Уведомление по электронной почте после попытки платежа (успешной или неудачной)
 PAYBOX_PBX_SITE=Значение PBX SITE
 PAYBOX_PBX_RANG=Значение PBX Rang
 PAYBOX_PBX_IDENTIFIANT=Значение PBX ID
-PAYBOX_HMAC_KEY=HMAC key
+PAYBOX_HMAC_KEY=Ключ HMAC
diff --git a/htdocs/langs/ru_RU/paypal.lang b/htdocs/langs/ru_RU/paypal.lang
index 6aab1d37bc5..f8392f1a3f5 100644
--- a/htdocs/langs/ru_RU/paypal.lang
+++ b/htdocs/langs/ru_RU/paypal.lang
@@ -1,36 +1,36 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=Настройка модуля PayPal 
-PaypalDesc=This module allows payment by customers via <a href="http://www.paypal.com" target="_blank">PayPal</a>. This can be used for a ad-hoc payment or for a payment related to a Dolibarr object (invoice, order, ...)
-PaypalOrCBDoPayment=Pay with PayPal (Card or PayPal)
-PaypalDoPayment=Pay with PayPal
+PaypalDesc=Этот модуль позволяет клиентам производить оплату через <a href="http://www.paypal.com" target="_blank"> PayPal </a>. Его можно использовать для специального платежа или для платежа, связанного с объектом Dolibarr (счет, заказ, ...)
+PaypalOrCBDoPayment=Оплата через PayPal (карта или PayPal)
+PaypalDoPayment=Оплата с PayPal
 PAYPAL_API_SANDBOX=Режим тестирования / песочницы
 PAYPAL_API_USER=API имя пользователя
 PAYPAL_API_PASSWORD=API пароль
 PAYPAL_API_SIGNATURE=API подпись
-PAYPAL_SSLVERSION=Curl SSL Version
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer "integral" payment (Credit card+PayPal) or "PayPal" only
+PAYPAL_SSLVERSION=Версия Curl SSL
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Предлагать «интегральный» платеж (кредитная карта + PayPal) или только «PayPal»
 PaypalModeIntegral=Интегральный
 PaypalModeOnlyPaypal=только PayPal
-ONLINE_PAYMENT_CSS_URL=Optional URL of CSS stylesheet on online payment page
+ONLINE_PAYMENT_CSS_URL=Необязательный URL-адрес таблицы стилей CSS на странице онлайн-платежей
 ThisIsTransactionId=Это идентификатор транзакции: <b>%s</b>
-PAYPAL_ADD_PAYMENT_URL=Include the PayPal payment url when you send a document by email
-NewOnlinePaymentReceived=New online payment received
-NewOnlinePaymentFailed=New online payment tried but failed
-ONLINE_PAYMENT_SENDEMAIL=Email address for notifications after each payment attempt (for success and fail)
+PAYPAL_ADD_PAYMENT_URL=Включите URL-адрес платежа PayPal при отправке документа по электронной почте
+NewOnlinePaymentReceived=Получен новый онлайн-платеж
+NewOnlinePaymentFailed=Попытка нового онлайн-платежа не удалась
+ONLINE_PAYMENT_SENDEMAIL=Адрес электронной почты для уведомлений после каждой попытки платежа (для успешной и неудачной)
 ReturnURLAfterPayment=Ссылка, куда будет возвращаться пользователь после оплаты
-ValidationOfOnlinePaymentFailed=Validation of online payment failed
-PaymentSystemConfirmPaymentPageWasCalledButFailed=Payment confirmation page was called by payment system returned an error
-SetExpressCheckoutAPICallFailed=SetExpressCheckout API call failed.
-DoExpressCheckoutPaymentAPICallFailed=DoExpressCheckoutPayment API call failed.
-DetailedErrorMessage=Detailed Error Message
-ShortErrorMessage=Short Error Message
-ErrorCode=Error Code
-ErrorSeverityCode=Error Severity Code
-OnlinePaymentSystem=Online payment system
-PaypalLiveEnabled=PayPal "live" mode enabled (otherwise test/sandbox mode)
-PaypalImportPayment=Import PayPal payments
-PostActionAfterPayment=Post actions after payments
-ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
-ValidationOfPaymentFailed=Validation of payment has failed
-CardOwner=Card holder
-PayPalBalance=Paypal credit
+ValidationOfOnlinePaymentFailed=Проверка онлайн-платежа не удалась
+PaymentSystemConfirmPaymentPageWasCalledButFailed=Страница подтверждения платежа была вызвана платежной системой и вернула ошибку
+SetExpressCheckoutAPICallFailed=Ошибка вызова API SetExpressCheckout.
+DoExpressCheckoutPaymentAPICallFailed=Ошибка вызова API DoExpressCheckoutPayment.
+DetailedErrorMessage=Подробное сообщение об ошибке
+ShortErrorMessage=Короткое сообщение об ошибке
+ErrorCode=Код ошибки
+ErrorSeverityCode=Код серьезности ошибки
+OnlinePaymentSystem=Система онлайн-платежей
+PaypalLiveEnabled=Включен "живой" режим PayPal (в противном случае тестовый / песочница)
+PaypalImportPayment=Импорт платежей PayPal
+PostActionAfterPayment=Публикация действий после платежей
+ARollbackWasPerformedOnPostActions=Откат был выполнен для всех действий с публикацией. Вы должны выполнить действия публикации вручную, если они необходимы.
+ValidationOfPaymentFailed=Проверка платежа не удалась
+CardOwner=Держатель карты
+PayPalBalance=Paypal кредит
diff --git a/htdocs/langs/ru_RU/printing.lang b/htdocs/langs/ru_RU/printing.lang
index 958e0056419..5a260eb24da 100644
--- a/htdocs/langs/ru_RU/printing.lang
+++ b/htdocs/langs/ru_RU/printing.lang
@@ -2,51 +2,53 @@
 Module64000Name=Прямая печать
 Module64000Desc=Включить систему прямой печати
 PrintingSetup=Настройки системы прямой печати
-PrintingDesc=Этот модуль добавляет кнопку Печать для отправки документа напрямую на принтер (без открытия документа в приложении)
-MenuDirectPrinting=Direct Printing jobs
-DirectPrint=Direct print
+PrintingDesc=Этот модуль добавляет кнопку «Печать» к различным модулям, чтобы можно было печатать документы непосредственно на принтере без необходимости открывать документ в другом приложении.
+MenuDirectPrinting=Прямая печать заданий
+DirectPrint=Прямая печать
 PrintingDriverDesc=Настройки драйвера принтера
 ListDrivers=Список драйверов
 PrintTestDesc=Список принтеров
 FileWasSentToPrinter=Файл %s отправлен на принтер
-ViaModule=via the module
-NoActivePrintingModuleFound=No active driver to print document. Check setup of module %s.
+ViaModule=через модуль
+NoActivePrintingModuleFound=Нет активного драйвера для печати документа. Проверьте настройку модуля %s.
 PleaseSelectaDriverfromList=Пожалуйста, выберите драйвер из списка
-PleaseConfigureDriverfromList=Please configure the selected driver from list.
+PleaseConfigureDriverfromList=Пожалуйста, настройте выбранный драйвер из списка.
 SetupDriver=Настройка драйвера
 TargetedPrinter=Целевой принтер
 UserConf=Настройка для пользователя
-PRINTGCP_INFO=Google OAuth API setup
-PRINTGCP_AUTHLINK=Authentication
-PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token
-PrintGCPDesc=Этот драйвер позволяет отправлять документы на принтер с использованием сервиса Google Cloud Print
+PRINTGCP_INFO=Настройка Google OAuth API
+PRINTGCP_AUTHLINK=Аутентификация
+PRINTGCP_TOKEN_ACCESS=Токен OAuth для Виртуального принтера Google
+PrintGCPDesc=Этот драйвер позволяет отправлять документы прямо на принтер с помощью Google Cloud Print.
 GCP_Name=Имя
 GCP_displayName=Отображаемое имя
 GCP_Id=ID принтера
 GCP_OwnerName=Имя владельца
 GCP_State=Состояние принтера
-GCP_connectionStatus=Статус
+GCP_connectionStatus=Состояние онлайн
 GCP_Type=Тип принтера
-PrintIPPDesc=This driver allow to send documents directly to a printer. It requires a Linux system with CUPS installed.
-PRINTIPP_HOST=Принт-сервер
+PrintIPPDesc=Этот драйвер позволяет отправлять документы прямо на принтер. Для этого требуется система Linux с установленным CUPS.
+PRINTIPP_HOST=Сервер печати
 PRINTIPP_PORT=Порт
-PRINTIPP_USER=Логин
+PRINTIPP_USER=Авторизоваться
 PRINTIPP_PASSWORD=Пароль
-NoDefaultPrinterDefined=Не указан принтер по умолчанию
+NoDefaultPrinterDefined=Принтер по умолчанию не определен
 DefaultPrinter=Принтер по умолчанию
 Printer=Принтер
-IPP_Uri=Ссылка на принтер
+IPP_Uri=Принтер Uri
 IPP_Name=Имя принтера
 IPP_State=Состояние принтера
-IPP_State_reason=State reason
-IPP_State_reason1=State reason1
+IPP_State_reason=Государственная причина
+IPP_State_reason1=Государственная причина1
 IPP_BW=BW
 IPP_Color=Цвет
 IPP_Device=Устройство
-IPP_Media=Носитель
-IPP_Supported=Тип носителя
-DirectPrintingJobsDesc=This page lists printing jobs found for available printers.
-GoogleAuthNotConfigured=Google OAuth setup not done. Enable module OAuth and set a Google ID/Secret.
-GoogleAuthConfigured=Google OAuth credentials were found into setup of module OAuth.
+IPP_Media=СМИ для принтера
+IPP_Supported=Тип СМИ
+DirectPrintingJobsDesc=На этой странице перечислены задания печати, найденные для доступных принтеров.
+GoogleAuthNotConfigured=Google OAuth не настроен. Включите модуль OAuth и установите Google ID / Secret.
+GoogleAuthConfigured=Учетные данные Google OAuth были найдены при настройке модуля OAuth.
 PrintingDriverDescprintgcp=Настройки для драйвера сервиса Google Cloud Print
+PrintingDriverDescprintipp=Переменные конфигурации для драйвера печати Cups.
 PrintTestDescprintgcp=Список принтеров для сервиса Google Cloud Print
+PrintTestDescprintipp=Список принтеров для чашек.
diff --git a/htdocs/langs/ru_RU/productbatch.lang b/htdocs/langs/ru_RU/productbatch.lang
index 45500b8f86d..c805563062d 100644
--- a/htdocs/langs/ru_RU/productbatch.lang
+++ b/htdocs/langs/ru_RU/productbatch.lang
@@ -1,4 +1,4 @@
-# ProductBATCH language file - en_US - ProductBATCH
+# ProductBATCH language file - Source file is en_US - ProductBATCH
 ManageLotSerial=Использовать номер партии/серийный номер
 ProductStatusOnBatch=Да (требуется лот) 
 ProductStatusOnSerial=Да (требуется уникальный серийный номер)
@@ -30,6 +30,16 @@ BatchLotNumberingModules=Опции для автоматического соз
 BatchSerialNumberingModules=Опции для автоматического создания серийной продукции по серийным номерам 
 ManageLotMask=Пользовательская маска
 CustomMasks=Добавляет возможность определения маски в карточке товара
-LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
-SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+LotProductTooltip=Добавляет параметр в карточку продукта для определения специальной маски номера партии
+SNProductTooltip=Добавляет параметр в карточку продукта для определения специальной маски серийного номера
 QtyToAddAfterBarcodeScan=Кол-во для добавления для каждого отсканированного штрих-кода / партии / серийного номера 
+LifeTime=Продолжительность жизни (в днях)
+EndOfLife=Конец жизни
+ManufacturingDate=Дата производства
+DestructionDate=Дата разрушения
+FirstUseDate=Дата первого использования
+QCFrequency=Периодичность контроля качества (в днях)
+
+#Traceability - qc status
+OutOfOrder=Не работает
+InWorkingOrder=В рабочем порядке
diff --git a/htdocs/langs/ru_RU/products.lang b/htdocs/langs/ru_RU/products.lang
index 25425e698b6..cc494727689 100644
--- a/htdocs/langs/ru_RU/products.lang
+++ b/htdocs/langs/ru_RU/products.lang
@@ -2,7 +2,7 @@
 ProductRef=Продукт исх.
 ProductLabel=Этикетка товара
 ProductLabelTranslated=Переведенная этикетка продукта
-ProductDescription=Product description
+ProductDescription=Описание продукта
 ProductDescriptionTranslated=Переведенное описание продукта
 ProductNoteTranslated=Переведенная заметка о продукте
 ProductServiceCard=Карточка Товаров/Услуг
@@ -17,40 +17,40 @@ Create=Создать
 Reference=Справка
 NewProduct=Новый товар
 NewService=Новая услуга
-ProductVatMassChange=Global VAT Update
-ProductVatMassChangeDesc=This tool updates the VAT rate defined on <b><u>ALL</u></b> products and services!
+ProductVatMassChange=Глобальное обновление НДС
+ProductVatMassChangeDesc=Этот инструмент обновляет ставку НДС, определенную для <b> <u> ВСЕХ продуктов и услуг </u> </b>!
 MassBarcodeInit=Массовое создание штрих-кода
 MassBarcodeInitDesc=Эта страница может быть использована для создания штрих-кодов для объектов, у которых нет штрих-кода. Проверьте перед выполнением настройки модуля штрих-кодов.
 ProductAccountancyBuyCode=Учетный код (покупка)
-ProductAccountancyBuyIntraCode=Accounting code (purchase intra-community)
-ProductAccountancyBuyExportCode=Accounting code (purchase import)
+ProductAccountancyBuyIntraCode=Бухгалтерский код (покупка внутри сообщества)
+ProductAccountancyBuyExportCode=Бухгалтерский код (импорт покупки)
 ProductAccountancySellCode=Учетный код (продажа)
-ProductAccountancySellIntraCode=Accounting code (sale intra-Community)
+ProductAccountancySellIntraCode=Код бухгалтерского учета (продажа внутри Сообщества)
 ProductAccountancySellExportCode=Учетный код (экспорт)
 ProductOrService=Товар или Услуга
 ProductsAndServices=Товары и Услуги
 ProductsOrServices=Товары  или Услуги
 ProductsPipeServices=Продукты | Сервисы
-ProductsOnSale=Products for sale
-ProductsOnPurchase=Products for purchase
+ProductsOnSale=Товары для продажи
+ProductsOnPurchase=Товары для покупки
 ProductsOnSaleOnly=Товар только для продажи, не для покупки
 ProductsOnPurchaseOnly=Товар только для покупки, не для продажи
 ProductsNotOnSell=Товар не для продажи и не для покупки
 ProductsOnSellAndOnBuy=Товар для продажи и покупки
-ServicesOnSale=Services for sale
-ServicesOnPurchase=Services for purchase
+ServicesOnSale=Продажа услуг
+ServicesOnPurchase=Услуги для покупки
 ServicesOnSaleOnly=Услуги только для продажи
 ServicesOnPurchaseOnly=Услуги только для покупки
 ServicesNotOnSell=Услуги не для продажи, а не для покупки
 ServicesOnSellAndOnBuy=Услуга для продажи и покупки
-LastModifiedProductsAndServices=Latest %s products/services which were modified
+LastModifiedProductsAndServices=Последние продукты / услуги %s, которые были изменены
 LastRecordedProducts=Последние %sзарегистрированные продукты
 LastRecordedServices=Последние  %sзарегистрированные услуги
 CardProduct0=Товар
 CardProduct1=Услуга
 Stock=Склад
 MenuStocks=Склады
-Stocks=Stocks and location (warehouse) of products
+Stocks=Запасы и местонахождение (склад) продукции
 Movements=Движения
 Sell=Продавать
 Buy=Покупка
@@ -68,17 +68,17 @@ ProductStatusNotOnBuyShort=Не для покупки
 UpdateVAT=Обновить НДС
 UpdateDefaultPrice=Обновить стоимость по умолчанию
 UpdateLevelPrices=Обновление цен на каждый уровень
-AppliedPricesFrom=Applied from
+AppliedPricesFrom=Применяется с
 SellingPrice=Продажная цена
-SellingPriceHT=Selling price (excl. tax)
+SellingPriceHT=Цена продажи (без налогов)
 SellingPriceTTC=Продажная цена (вкл. налоги)
-SellingMinPriceTTC=Minimum Selling price (inc. tax)
-CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
+SellingMinPriceTTC=Минимальная цена продажи (включая налог)
+CostPriceDescription=Это поле цены (без налогов) можно использовать для определения средней суммы затрат на этот продукт для вашей компании. Это может быть любая цена, которую вы рассчитываете самостоятельно, например, исходя из средней закупочной цены плюс средние издержки производства и распространения.
 CostPriceUsage=Это значение может использоваться для расчета маржи.
 SoldAmount=Сумма продажи
 PurchasedAmount=Сумма покупки
 NewPrice=Новая цена
-MinPrice=Min. selling price
+MinPrice=Мин. цена продажи
 EditSellingPriceLabel=Изменить ярлык цены продажи
 CantBeLessThanMinPrice=Продажная цена не может быть ниже минимальной для этого товара (%s без налогов). Это сообщение также возникает, если вы задаёте слишком большую скидку.
 ContractStatusClosed=Закрытые
@@ -87,7 +87,7 @@ ErrorProductBadRefOrLabel=Неправильное значение для сп
 ErrorProductClone=Возникла проблема при попытке дублирования продукта или услуги
 ErrorPriceCantBeLowerThanMinPrice=Ошибка, цена не может быть ниже минимальной цены.
 Suppliers=Поставщики
-SupplierRef=Vendor SKU
+SupplierRef=Артикул поставщика
 ShowProduct=Показать товар
 ShowService=Показать услугу
 ProductsAndServicesArea=Раздел товаров и услуг
@@ -96,7 +96,7 @@ ServicesArea=Раздел услуг
 ListOfStockMovements=Список акций движения
 BuyingPrice=Покупка цене
 PriceForEachProduct=Продукты со специфическими ценами
-SupplierCard=Vendor card
+SupplierCard=Карточка продавца
 PriceRemoved=Цена удалена
 BarCode=Штрих-код
 BarcodeType=Штрих-код типа
@@ -104,25 +104,25 @@ SetDefaultBarcodeType=Установить тип штрих-кода
 BarcodeValue=Значение штрих-кода
 NoteNotVisibleOnBill=Примечание (не видимые на счетах-фактурах, предложениях ...)
 ServiceLimitedDuration=Если продукт является услугой с ограниченной длительности:
-FillWithLastServiceDates=Fill with last service line dates
-MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
+FillWithLastServiceDates=Укажите даты последней строки обслуживания
+MultiPricesAbility=Несколько ценовых сегментов на товар / услугу (каждый покупатель находится в одном ценовом сегменте)
 MultiPricesNumPrices=Кол-во цен
-DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Enable Kits (set of several products)
-VariantsAbility=Enable Variants (variations of products, for example color, size)
-AssociatedProducts=Kits
-AssociatedProductsNumber=Number of products composing this kit
+DefaultPriceType=База цен по умолчанию (с учетом и без налога) при добавлении новых продажных цен
+AssociatedProductsAbility=Enable Kits (набор из нескольких товаров)
+VariantsAbility=Включить варианты (варианты товаров, например цвет, размер)
+AssociatedProducts=Наборы
+AssociatedProductsNumber=Количество продуктов, входящих в этот набор
 ParentProductsNumber=Количество родительских упаковочных продуктов
 ParentProducts=Родительские продукты
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
+IfZeroItIsNotAVirtualProduct=Если 0, этот товар не является комплектом.
+IfZeroItIsNotUsedByVirtualProduct=Если 0, этот продукт не используется ни в одном комплекте
 KeywordFilter=Фильтр ключевых слов
 CategoryFilter=Категория фильтр
 ProductToAddSearch=Поиск продукта для добавления
 NoMatchFound=Не найдено соответствия
 ListOfProductsServices=Список продуктов/услуг
-ProductAssociationList=List of products/services that are component(s) of this kit
-ProductParentList=List of kits with this product as a component
+ProductAssociationList=Список продуктов / услуг, которые являются компонентами этого набора
+ProductParentList=Список комплектов с данным продуктом в качестве компонента
 ErrorAssociationIsFatherOfThis=Один из выбранного продукта родителей с действующим продукта
 DeleteProduct=Удалить товар / услугу
 ConfirmDeleteProduct=Вы уверены, что хотите удалить этот продукт / услугу?
@@ -134,20 +134,20 @@ ImportDataset_service_1=Услуги
 DeleteProductLine=Удалить строку товара
 ConfirmDeleteProductLine=Вы уверены, что хотите удалить эту строку с товаром?
 ProductSpecial=Специальные
-QtyMin=Min. purchase quantity
-PriceQtyMin=Price quantity min.
-PriceQtyMinCurrency=Price (currency) for this qty. (no discount)
-VATRateForSupplierProduct=VAT Rate (for this vendor/product)
-DiscountQtyMin=Discount for this qty.
-NoPriceDefinedForThisSupplier=No price/qty defined for this vendor/product
-NoSupplierPriceDefinedForThisProduct=No vendor price/qty defined for this product
-PredefinedItem=Predefined item
-PredefinedProductsToSell=Predefined Product
-PredefinedServicesToSell=Predefined Service
+QtyMin=Мин. количество покупок
+PriceQtyMin=Цена количество мин.
+PriceQtyMinCurrency=Цена (валюта) за это количество. (нет скидки)
+VATRateForSupplierProduct=Ставка НДС (для этого поставщика / продукта)
+DiscountQtyMin=Скидка на это кол-во.
+NoPriceDefinedForThisSupplier=Цена / количество не определены для этого поставщика / продукта
+NoSupplierPriceDefinedForThisProduct=Цена / количество поставщика для этого продукта не определены
+PredefinedItem=Предопределенный элемент
+PredefinedProductsToSell=Предопределенный продукт
+PredefinedServicesToSell=Предопределенная услуга
 PredefinedProductsAndServicesToSell=Предустановленные товары/услуги для продажи
 PredefinedProductsToPurchase=Определённый заранее товар для  покупки
 PredefinedServicesToPurchase=Определённая заранее услуга для покупки
-PredefinedProductsAndServicesToPurchase=Predefined products/services to purchase
+PredefinedProductsAndServicesToPurchase=Предопределенные продукты / услуги для покупки
 NotPredefinedProducts=Не предопределенные продукты/услуги
 GenerateThumb=Генерируйте пальца
 ServiceNb=Служба # %s
@@ -157,25 +157,25 @@ ListServiceByPopularity=Перечень услуг по популярност
 Finished=Произведено продукции
 RowMaterial=Первый материал
 ConfirmCloneProduct=Вы действительно хотите клонировать продукт или услугу <b> %s </b>?
-CloneContentProduct=Clone all main information of the product/service
+CloneContentProduct=Клонировать всю основную информацию о продукте / услуге
 ClonePricesProduct=Клонирование цен
-CloneCategoriesProduct=Clone linked tags/categories
-CloneCompositionProduct=Clone virtual products/services
-CloneCombinationsProduct=Clone the product variants
+CloneCategoriesProduct=Клонировать связанные теги / категории
+CloneCompositionProduct=Клонировать виртуальные продукты / услуги
+CloneCombinationsProduct=Клонировать варианты продукта
 ProductIsUsed=Этот продукт используется
 NewRefForClone=Ссылка нового продукта / услуги
 SellingPrices=Цены на продажу
 BuyingPrices=Цены на покупку
 CustomerPrices=Цены клиентов
-SuppliersPrices=Vendor prices
-SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs|Commodity|HS code
-CountryOrigin=Country of origin
-RegionStateOrigin=Region of origin
-StateOrigin=State|Province of origin
-Nature=Nature of product (raw/manufactured)
-NatureOfProductShort=Nature of product
-NatureOfProductDesc=Raw material or manufactured product
+SuppliersPrices=Цены от поставщиков
+SuppliersPricesOfProductsOrServices=Цены поставщиков (товаров или услуг)
+CustomCode=Таможня | Товар | Код ТН ВЭД
+CountryOrigin=Страна происхождения
+RegionStateOrigin=Регион происхождения
+StateOrigin=Штат | Провинция происхождения
+Nature=Тип продукта (сырой / произведенный)
+NatureOfProductShort=Природа продукта
+NatureOfProductDesc=Сырье или произведенный продукт
 ShortLabel=Короткая метка
 Unit=Единица
 p=u.
@@ -209,7 +209,7 @@ unitLM=Линейный метр
 unitM2=Квадратный метр
 unitM3=Кубический метр
 unitL=Литр
-unitT=ton
+unitT=тонна
 unitKG=кг
 unitG=Грамм
 unitMG=мг
@@ -219,20 +219,20 @@ unitM=Метр
 unitDM=dm
 unitCM=cm
 unitMM=mm
-unitFT=ft
-unitIN=in
+unitFT=футов
+unitIN=дюйм
 unitM2=Квадратный метр
-unitDM2=dm²
-unitCM2=cm²
-unitMM2=mm²
-unitFT2=ft²
-unitIN2=in²
+unitDM2=дм²
+unitCM2=см²
+unitMM2=мм²
+unitFT2=фут²
+unitIN2=дюйм²
 unitM3=Кубический метр
-unitDM3=dm³
-unitCM3=cm³
-unitMM3=mm³
-unitFT3=ft³
-unitIN3=in³
+unitDM3=дм³
+unitCM3=см³
+unitMM3=мм³
+unitFT3=фут³
+unitIN3=дюйм³
 unitOZ3=унция
 unitgallon=галлон
 ProductCodeModel=Ссылка на шаблон товара
@@ -243,13 +243,13 @@ AlwaysUseFixedPrice=Использовать фиксированную цену
 PriceByQuantity=Разные цены по количеству
 DisablePriceByQty=Отключить цены по количеству
 PriceByQuantityRange=Диапазон количества
-MultipriceRules=Automatic prices for segment
-UseMultipriceRules=Use price segment rules (defined into product module setup) to auto calculate prices of all other segments according to first segment
+MultipriceRules=Автоматические цены по сегменту
+UseMultipriceRules=Используйте правила ценовых сегментов (определенные в настройках модуля продукта) для автоматического расчета цен всех других сегментов в соответствии с первым сегментом.
 PercentVariationOver=%% вариация над %s
 PercentDiscountOver=%% скидка на %s
 KeepEmptyForAutoCalculation=Оставьте пустым, чтобы оно было рассчитано автоматически из массы или объема продуктов
-VariantRefExample=Examples: COL, SIZE
-VariantLabelExample=Examples: Color, Size
+VariantRefExample=Примеры: COL, SIZE.
+VariantLabelExample=Примеры: цвет, размер.
 ### composition fabrication
 Build=Произведено
 ProductsMultiPrice=Продукты и цены для каждого ценового сегмента
@@ -260,49 +260,49 @@ Quarter1=I квартал
 Quarter2=II квартал
 Quarter3=III квартал
 Quarter4=IV квартал
-BarCodePrintsheet=Print barcode
-PageToGenerateBarCodeSheets=With this tool, you can print sheets of barcode stickers. Choose format of your sticker page, type of barcode and value of barcode, then click on button <b>%s</b>.
+BarCodePrintsheet=Распечатать штрих-код
+PageToGenerateBarCodeSheets=С помощью этого инструмента вы можете распечатать листы наклеек со штрих-кодом. Выберите формат страницы с наклейками, тип штрих-кода и значение штрих-кода, затем нажмите кнопку <b> %s </b>.
 NumberOfStickers=Количество стикеров для печати на странице
 PrintsheetForOneBarCode=Печатать несколько стикеров для одного штрих-кода
 BuildPageToPrint=Создать страницу для печати
 FillBarCodeTypeAndValueManually=Заполнить тип и значение штрих-кода вручную.
 FillBarCodeTypeAndValueFromProduct=Заполнить тип и значение из штрих-кода товара.
 FillBarCodeTypeAndValueFromThirdParty=Заполните тип и значение штрих-кода третьей стороны.
-DefinitionOfBarCodeForProductNotComplete=Definition of type or value of barcode not complete for product %s.
-DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of barcode non complete for third party %s.
-BarCodeDataForProduct=Barcode information of product %s:
-BarCodeDataForThirdparty=Barcode information of third party %s:
+DefinitionOfBarCodeForProductNotComplete=Определение типа или значения штрих-кода не завершено для продукта %s.
+DefinitionOfBarCodeForThirdpartyNotComplete=Определение типа или значения штрих-кода неполное для третьей стороны %s.
+BarCodeDataForProduct=Информация о штрих-коде продукта %s:
+BarCodeDataForThirdparty=Информация о штрих-коде стороннего производителя %s:
 ResetBarcodeForAllRecords=Определите значение штрих-кода для всех записей (это также приведет к сбросу значения штрих-кода, уже определенного новыми значениями)
 PriceByCustomer=Различные цены для каждого клиента
 PriceCatalogue=Одна продажная цена за продукт/услугу
-PricingRule=Rules for selling prices
+PricingRule=Правила отпускных цен
 AddCustomerPrice=Добавить цену по клиенту
 ForceUpdateChildPriceSoc=Установить такую же цену для дочерних клиентов
 PriceByCustomerLog=Журнал предыдущих цен клиента
 MinimumPriceLimit=Минимальная цена не может быть ниже %s
-MinimumRecommendedPrice=Minimum recommended price is: %s
+MinimumRecommendedPrice=Минимальная рекомендованная цена: %s
 PriceExpressionEditor=Редактор ценовых выражений
 PriceExpressionSelected=Выбранное выражение цены
 PriceExpressionEditorHelp1="price = 2+2" или "2 + 2"  для задания цены. Используйте ; в качестве разделителя выражений.
 PriceExpressionEditorHelp2=Вы можете получить доступ к ExtraFields с такими переменными, как <b> #extrafield_myextrafieldkey# </b>и глобальными переменными с помощью <b> #global_mycode# </b>
-PriceExpressionEditorHelp3=In both product/service and vendor prices there are these variables available:<br><b>#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#</b>
-PriceExpressionEditorHelp4=In product/service price only: <b>#supplier_min_price#</b><br>In vendor prices only: <b>#supplier_quantity# and #supplier_tva_tx#</b>
+PriceExpressionEditorHelp3=Как в ценах продукта / услуги, так и в ценах поставщиков доступны следующие переменные: <br> <b> # tva_tx # # localtax1_tx # # localtax2_tx # # weight # # length # # surface # # price_min # </b>
+PriceExpressionEditorHelp4=Только в цене продукта / услуги: <b> # supplier_min_price # </b> <br> Только в ценах поставщика: <b> # supplier_quantity # and # supplier_tva_tx # a0917a8z039
 PriceExpressionEditorHelp5=Доступные глобальные значения:
 PriceMode=Режим ценообразования
 PriceNumeric=Номер
 DefaultPrice=Цена по умолчанию
-DefaultPriceLog=Log of previous default prices
+DefaultPriceLog=Журнал предыдущих цен по умолчанию
 ComposedProductIncDecStock=Увеличение / уменьшение запаса на складе при изменении источника
-ComposedProduct=Child products
+ComposedProduct=Детские товары
 MinSupplierPrice=Минимальная закупочная цена
-MinCustomerPrice=Minimum selling price
+MinCustomerPrice=Минимальная цена продажи
 DynamicPriceConfiguration=Настройка динамического ценообразования
-DynamicPriceDesc=You may define mathematical formulae to calculate Customer or Vendor prices. Such formulas can use all mathematical operators, some constants and variables. You can define here the variables you wish to use. If the variable needs an automatic update, you may define the external URL to allow Dolibarr to update the value automatically.
+DynamicPriceDesc=Вы можете определить математические формулы для расчета цен Клиента или Продавца. В таких формулах могут использоваться все математические операторы, некоторые константы и переменные. Вы можете определить здесь переменные, которые хотите использовать. Если переменная нуждается в автоматическом обновлении, вы можете определить внешний URL-адрес, чтобы позволить Dolibarr автоматически обновлять значение.
 AddVariable=Добавить переменную
 AddUpdater=Добавить обновление
 GlobalVariables=Глобальные переменные
 VariableToUpdate=Переменная для обновления
-GlobalVariableUpdaters=External updaters for variables
+GlobalVariableUpdaters=Внешние средства обновления для переменных
 GlobalVariableUpdaterType0=Данные JSON
 GlobalVariableUpdaterHelp0=Анализирует данные JSON из указанной ссылки,  VALUE определяет местоположение соответствующего значения,
 GlobalVariableUpdaterHelpFormat0=Формат для запроса {«URL»: «http://example.com/urlofjson», «VALUE»: «array1, array2, targetvalue»}
@@ -314,13 +314,13 @@ LastUpdated=Последнее обновление
 CorrectlyUpdated=Правильно обновлено
 PropalMergePdfProductActualFile=Файлы, используемые для добавления в PDF Azur, являются
 PropalMergePdfProductChooseFile=Выберите PDF-файлы
-IncludingProductWithTag=Include products/services with tag
+IncludingProductWithTag=Включите товары / услуги с тегом
 DefaultPriceRealPriceMayDependOnCustomer=Цена по умолчанию, реальная цена может зависеть от клиента
 WarningSelectOneDocument=Выберите хотя бы один документ
 DefaultUnitToShow=Единица
 NbOfQtyInProposals=Кол-во предложений
 ClinkOnALinkOfColumn=Нажмите на ссылку колонки %s, чтобы получить подробный обзор ...
-ProductsOrServicesTranslations=Products/Services translations
+ProductsOrServicesTranslations=Перевод продукции / услуг
 TranslatedLabel=Переведенная этикетка
 TranslatedDescription=Переведенное описание
 TranslatedNote=Переведенные примечания
@@ -328,10 +328,10 @@ ProductWeight=Вес для 1 продукта
 ProductVolume=Объем для 1 продукта
 WeightUnits=Весовая единица
 VolumeUnits=Единица объема
-WidthUnits=Width unit
-LengthUnits=Length unit
-HeightUnits=Height unit
-SurfaceUnits=Surface unit
+WidthUnits=Единица ширины
+LengthUnits=Единица длины
+HeightUnits=Единица высоты
+SurfaceUnits=Поверхностная единица
 SizeUnits=Единица измерения размера
 DeleteProductBuyPrice=Удалить цену покупки
 ConfirmDeleteProductBuyPrice=Вы действительно хотите удалить эту покупочную цену?
@@ -340,12 +340,12 @@ ProductSheet=Лист продукта
 ServiceSheet=Сервисный лист
 PossibleValues=Возможные значения
 GoOnMenuToCreateVairants=Перейдите в меню %s - %s, чтобы подготовить варианты атрибутов (например, цвета, размер, ...)
-UseProductFournDesc=Add a feature to define the descriptions of products defined by the vendors in addition to descriptions for customers
-ProductSupplierDescription=Vendor description for the product
-UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
-PackagingForThisProduct=Packaging
-PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
-QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
+UseProductFournDesc=Добавьте функцию для определения описаний продуктов, определенных поставщиками, в дополнение к описаниям для клиентов.
+ProductSupplierDescription=Описание продавца продукта
+UseProductSupplierPackaging=Использовать упаковку по ценам поставщика (пересчитать количества в соответствии с упаковкой, указанной в цене поставщика, при добавлении / обновлении строки в документах поставщика)
+PackagingForThisProduct=Упаковка
+PackagingForThisProductDesc=По заказу поставщика вы автоматически закажете это количество (или кратное этому количеству). Не может быть меньше минимального закупочного количества
+QtyRecalculatedWithPackaging=Количество линии пересчитано в соответствии с упаковкой поставщика.
 
 #Attributes
 VariantAttributes=Вариант атрибутов
@@ -368,9 +368,9 @@ SelectCombination=Выберите комбинацию
 ProductCombinationGenerator=Генератор вариантов
 Features=Особенности
 PriceImpact=Влияние цены
-ImpactOnPriceLevel=Impact on price level %s
-ApplyToAllPriceImpactLevel= Apply to all levels
-ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
+ImpactOnPriceLevel=Влияние на уровень цен %s
+ApplyToAllPriceImpactLevel= Применить ко всем уровням
+ApplyToAllPriceImpactLevelHelp=Нажимая здесь, вы устанавливаете одинаковое влияние на цену на всех уровнях.
 WeightImpact=Влияние веса
 NewProductAttribute=Новый атрибут
 NewProductAttributeValue=Новое значение атрибута
@@ -381,18 +381,20 @@ DoNotRemovePreviousCombinations=Не удалять предыдущие вар
 UsePercentageVariations=Использовать процентные вариации
 PercentageVariation=Изменение процентов
 ErrorDeletingGeneratedProducts=При попытке удалить существующие варианты продукта произошла ошибка
-NbOfDifferentValues=No. of different values
-NbProducts=Number of products
+NbOfDifferentValues=Кол-во разных значений
+NbProducts=Количество продуктов
 ParentProduct=Родительский продукт
 HideChildProducts=Скрыть варианты продуктов
-ShowChildProducts=Show variant products
-NoEditVariants=Go to Parent product card and edit variants price impact in the variants tab
+ShowChildProducts=Показать варианты продуктов
+NoEditVariants=Перейдите в карточку родительского продукта и отредактируйте влияние вариантов на цену на вкладке вариантов.
 ConfirmCloneProductCombinations=Вы хотите скопировать все варианты продукта в другой родительский продукт с указанной ссылкой?
 CloneDestinationReference=Ссылка на целевое изделие
 ErrorCopyProductCombinations=При копировании вариантов продукта произошла ошибка
 ErrorDestinationProductNotFound=Продукт назначения не найден
 ErrorProductCombinationNotFound=Вариант продукта не найден
-ActionAvailableOnVariantProductOnly=Action only available on the variant of product
-ProductsPricePerCustomer=Product prices per customers
-ProductSupplierExtraFields=Additional Attributes (Supplier Prices)
-DeleteLinkedProduct=Delete the child product linked to the combination
+ActionAvailableOnVariantProductOnly=Действие доступно только для варианта продукта
+ProductsPricePerCustomer=Цены на продукцию для каждого покупателя
+ProductSupplierExtraFields=Дополнительные атрибуты (цены поставщиков)
+DeleteLinkedProduct=Удалить дочерний продукт, связанный с комбинацией
+PMPValue=Значение
+PMPValueShort=WAP
diff --git a/htdocs/langs/ru_RU/projects.lang b/htdocs/langs/ru_RU/projects.lang
index 1c0ea89c8c7..a1b447791a0 100644
--- a/htdocs/langs/ru_RU/projects.lang
+++ b/htdocs/langs/ru_RU/projects.lang
@@ -1,65 +1,65 @@
 # Dolibarr language file - Source file is en_US - projects
 RefProject=Ref. проект
-ProjectRef=Project ref.
+ProjectRef=Ссылка на проект.
 ProjectId=ID Проекта
-ProjectLabel=Project label
-ProjectsArea=Projects Area
+ProjectLabel=Этикетка проекта
+ProjectsArea=Область проектов
 ProjectStatus=Статус проекта
 SharedProject=Общий проект
 PrivateProject=Проект контакты
-ProjectsImContactFor=Projects for which I am explicitly a contact
-AllAllowedProjects=All project I can read (mine + public)
+ProjectsImContactFor=Проекты, с которыми я напрямую контактирую
+AllAllowedProjects=Все проекты, которые я могу прочитать (мой + общедоступный)
 AllProjects=Все проекты
-MyProjectsDesc=This view is limited to the projects that you are a contact for
+MyProjectsDesc=Это представление ограничено проектами, для которых вы являетесь контактным лицом.
 ProjectsPublicDesc=Эта точка зрения представлены все проекты, которые Вы позволили читать.
-TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
+TasksOnProjectsPublicDesc=В этом представлении представлены все задачи по проектам, которые вам разрешено читать.
 ProjectsPublicTaskDesc=Это представление всех проектов и задач, к которым у вас есть доступ.
 ProjectsDesc=Эта точка зрения представляет все проекты (разрешений пользователей предоставить вам разрешение для просмотра всего).
-TasksOnProjectsDesc=This view presents all tasks on all projects (your user permissions grant you permission to view everything).
-MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
-OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
-ClosedProjectsAreHidden=Closed projects are not visible.
+TasksOnProjectsDesc=В этом представлении представлены все задачи для всех проектов (ваши разрешения пользователя дают вам право просматривать все).
+MyTasksDesc=Это представление ограничено проектами или задачами, для которых вы являетесь контактным лицом.
+OnlyOpenedProject=Видны только открытые проекты (проекты в черновом или закрытом состоянии не видны).
+ClosedProjectsAreHidden=Закрытых проектов не видно.
 TasksPublicDesc=Эта точка зрения представляет всех проектов и задач, которые могут читать.
 TasksDesc=Эта точка зрения представляет всех проектов и задач (разрешений пользователей предоставить вам разрешение для просмотра всего).
-AllTaskVisibleButEditIfYouAreAssigned=All tasks for qualified projects are visible, but you can enter time only for task assigned to selected user. Assign task if you need to enter time on it.
-OnlyYourTaskAreVisible=Only tasks assigned to you are visible. If you need to enter time on a task and if the task is not visible here, then you need to assign the task to yourself.
-ImportDatasetTasks=Tasks of projects
-ProjectCategories=Project tags/categories
+AllTaskVisibleButEditIfYouAreAssigned=Все задачи для квалифицированных проектов видны, но вы можете ввести время только для задачи, назначенной выбранному пользователю. Назначьте задачу, если вам нужно ввести на нее время.
+OnlyYourTaskAreVisible=Видны только назначенные вам задачи. Если вам нужно ввести время для задачи, и если задача не отображается здесь, то вам необходимо назначить задачу себе.
+ImportDatasetTasks=Задачи проектов
+ProjectCategories=Теги / категории проекта
 NewProject=Новый проект
 AddProject=Создать проект
 DeleteAProject=Удаление проекта
 DeleteATask=Удалить задание
-ConfirmDeleteAProject=Are you sure you want to delete this project?
-ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Open projects
-OpenedTasks=Open tasks
-OpportunitiesStatusForOpenedProjects=Leads amount of open projects by status
-OpportunitiesStatusForProjects=Leads amount of projects by status
+ConfirmDeleteAProject=Вы уверены, что хотите удалить этот проект?
+ConfirmDeleteATask=Вы уверены, что хотите удалить эту задачу?
+OpenedProjects=Открытые проекты
+OpenedTasks=Открытые задачи
+OpportunitiesStatusForOpenedProjects=Ведет количество открытых проектов по статусу
+OpportunitiesStatusForProjects=Ведет количество проектов по статусу
 ShowProject=Показать проекта
 ShowTask=Показать задачу
 SetProject=Комплекс проектов
 NoProject=Нет проекта определена
-NbOfProjects=Number of projects
-NbOfTasks=Number of tasks
+NbOfProjects=Количество проектов
+NbOfTasks=Кол-во задач
 TimeSpent=Время, затраченное
 TimeSpentByYou=Затраченное мной время
 TimeSpentByUser=Затраченное пользователем время
 TimesSpent=Время, проведенное
-TaskId=Task ID
-RefTask=Task ref.
-LabelTask=Task label
+TaskId=ID задачи
+RefTask=Задание исх.
+LabelTask=Ярлык задачи
 TaskTimeSpent=Время, потраченное на задачи
 TaskTimeUser=Пользователь
 TaskTimeNote=Заметка
 TaskTimeDate=Дата
-TasksOnOpenedProject=Tasks on open projects
+TasksOnOpenedProject=Задачи по открытым проектам
 WorkloadNotDefined=Рабочая нагрузка не задана
 NewTimeSpent=Время, проведенное
 MyTimeSpent=Мое время
-BillTime=Bill the time spent
-BillTimeShort=Bill time
-TimeToBill=Time not billed
-TimeBilled=Time billed
+BillTime=Счет за потраченное время
+BillTimeShort=Время счета
+TimeToBill=Время не выставлено
+TimeBilled=Время выставлено
 Tasks=Задание
 Task=Задача
 TaskDateStart=Дата начала задачи
@@ -67,78 +67,78 @@ TaskDateEnd=Дата завершения задачи
 TaskDescription=Описание задачи
 NewTask=Новые задачи
 AddTask=Создать задачу
-AddTimeSpent=Create time spent
-AddHereTimeSpentForDay=Add here time spent for this day/task
-AddHereTimeSpentForWeek=Add here time spent for this week/task
+AddTimeSpent=Создать потраченное время
+AddHereTimeSpentForDay=Добавьте сюда время, потраченное на этот день / задачу
+AddHereTimeSpentForWeek=Затраченное время на эту неделю / задачу
 Activity=Мероприятие
 Activities=Задачи / мероприятия
 MyActivities=Мои задачи / мероприятия
 MyProjects=Мои проекты
-MyProjectsArea=My projects Area
+MyProjectsArea=Мои проекты Площадь
 DurationEffective=Эффективная длительность
-ProgressDeclared=Declared real progress
-TaskProgressSummary=Task progress
-CurentlyOpenedTasks=Curently open tasks
-TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared real progress is less %s than the progress on consumption
-TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared real progress is more %s than the progress on consumption
-ProgressCalculated=Progress on consumption
-WhichIamLinkedTo=which I'm linked to
-WhichIamLinkedToProject=which I'm linked to project
+ProgressDeclared=Заявленный реальный прогресс
+TaskProgressSummary=Прогресс задачи
+CurentlyOpenedTasks=Текущие открытые задачи
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=Заявленный реальный прогресс меньше %s, чем прогресс по потреблению
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=Заявленный реальный прогресс больше %s, чем прогресс по потреблению
+ProgressCalculated=Прогресс по потреблению
+WhichIamLinkedTo=с которым я связан
+WhichIamLinkedToProject=с которым я связан с проектом
 Time=Время
-TimeConsumed=Consumed
-ListOfTasks=List of tasks
-GoToListOfTimeConsumed=Go to list of time consumed
-GanttView=Gantt View
-ListWarehouseAssociatedProject=List of warehouses associated to the project
-ListProposalsAssociatedProject=List of the commercial proposals related to the project
-ListOrdersAssociatedProject=List of sales orders related to the project
-ListInvoicesAssociatedProject=List of customer invoices related to the project
-ListPredefinedInvoicesAssociatedProject=List of customer template invoices related to the project
-ListSupplierOrdersAssociatedProject=List of purchase orders related to the project
-ListSupplierInvoicesAssociatedProject=List of vendor invoices related to the project
-ListContractAssociatedProject=List of contracts related to the project
-ListShippingAssociatedProject=List of shippings related to the project
-ListFichinterAssociatedProject=List of interventions related to the project
-ListExpenseReportsAssociatedProject=List of expense reports related to the project
-ListDonationsAssociatedProject=List of donations related to the project
-ListVariousPaymentsAssociatedProject=List of miscellaneous payments related to the project
-ListSalariesAssociatedProject=List of payments of salaries related to the project
-ListActionsAssociatedProject=List of events related to the project
-ListMOAssociatedProject=List of manufacturing orders related to the project
-ListTaskTimeUserProject=List of time consumed on tasks of project
-ListTaskTimeForTask=List of time consumed on task
-ActivityOnProjectToday=Activity on project today
-ActivityOnProjectYesterday=Activity on project yesterday
+TimeConsumed=Потребляется
+ListOfTasks=Список задач
+GoToListOfTimeConsumed=Перейти к списку затраченного времени
+GanttView=Просмотр диаграммы Ганта
+ListWarehouseAssociatedProject=Список складов, связанных с проектом
+ListProposalsAssociatedProject=Список коммерческих предложений по проекту
+ListOrdersAssociatedProject=Список заказов на продажу, связанных с проектом
+ListInvoicesAssociatedProject=Список счетов клиентов, связанных с проектом
+ListPredefinedInvoicesAssociatedProject=Список клиентских шаблонов счетов-фактур, связанных с проектом
+ListSupplierOrdersAssociatedProject=Список заказов на поставку по проекту
+ListSupplierInvoicesAssociatedProject=Список счетов-фактур поставщиков, связанных с проектом
+ListContractAssociatedProject=Список договоров, связанных с проектом
+ListShippingAssociatedProject=Список отгрузок по проекту
+ListFichinterAssociatedProject=Список вмешательств, связанных с проектом
+ListExpenseReportsAssociatedProject=Список отчетов о расходах по проекту
+ListDonationsAssociatedProject=Список пожертвований, связанных с проектом
+ListVariousPaymentsAssociatedProject=Список разных платежей, связанных с проектом
+ListSalariesAssociatedProject=Перечень выплат заработной платы по проекту
+ListActionsAssociatedProject=Список событий, связанных с проектом
+ListMOAssociatedProject=Список заказов на изготовление, связанных с проектом
+ListTaskTimeUserProject=Список времени, затраченного на задачи проекта
+ListTaskTimeForTask=Список времени, затраченного на задачу
+ActivityOnProjectToday=Активность по проекту сегодня
+ActivityOnProjectYesterday=Активность по проекту вчера
 ActivityOnProjectThisWeek=Деятельность по проекту на этой неделе
 ActivityOnProjectThisMonth=Деятельность по проектам в этом месяце
 ActivityOnProjectThisYear=Деятельность по проектам в этом году
 ChildOfProjectTask=Детский проекта / задачи
-ChildOfTask=Child of task
-TaskHasChild=Task has child
+ChildOfTask=Дочерняя задача
+TaskHasChild=У задачи есть дочерний элемент
 NotOwnerOfProject=Не владелец этого частного проекта
 AffectedTo=Затронутые в
-CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See tab '%s'.
+CantRemoveProject=Этот проект нельзя удалить, так как на него ссылаются некоторые другие объекты (счет-фактура, заказы или другие). См. Вкладку «%s».
 ValidateProject=Проверка Projet
-ConfirmValidateProject=Are you sure you want to validate this project?
+ConfirmValidateProject=Вы уверены, что хотите проверить этот проект?
 CloseAProject=Закрыть проект
-ConfirmCloseAProject=Are you sure you want to close this project?
-AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
+ConfirmCloseAProject=Вы уверены, что хотите закрыть этот проект?
+AlsoCloseAProject=Также закройте проект (оставьте его открытым, если вам все еще нужно выполнять производственные задачи по нему)
 ReOpenAProject=Открытый проект
-ConfirmReOpenAProject=Are you sure you want to re-open this project?
+ConfirmReOpenAProject=Вы уверены, что хотите снова открыть этот проект?
 ProjectContact=Контакты проекта
-TaskContact=Task contacts
+TaskContact=Контакты задачи
 ActionsOnProject=Действия по проекту
 YouAreNotContactOfProject=Вы не контакт этого частного проекта
-UserIsNotContactOfProject=User is not a contact of this private project
+UserIsNotContactOfProject=Пользователь не является контактом этого частного проекта
 DeleteATimeSpent=Удалить времени
-ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
+ConfirmDeleteATimeSpent=Вы уверены, что хотите удалить это потраченное время?
 DoNotShowMyTasksOnly=Также видеть  задачи, не назначенные мне
 ShowMyTasksOnly=Видеть только задачи, назначенные мне
-TaskRessourceLinks=Contacts of task
+TaskRessourceLinks=Контакты задачи
 ProjectsDedicatedToThisThirdParty=Проектов, посвященных этой третьей стороне
 NoTasks=Нет задач, для этого проекта
 LinkedToAnotherCompany=Связь с другими третий участник
-TaskIsNotAssignedToUser=Task not assigned to user. Use button '<strong>%s</strong>' to assign task now.
+TaskIsNotAssignedToUser=Задача не назначена пользователю. Используйте кнопку '<strong> %s </strong>', чтобы назначить задачу сейчас.
 ErrorTimeSpentIsEmpty=Время, проведенное пуста
 ThisWillAlsoRemoveTasks=Это действие приведет к удалению всех задач проекта <b>(%s</b> задач на данный момент), и все входы затраченного времени.
 IfNeedToUseOtherObjectKeepEmpty=Если некоторые объекты (счет-фактура, заказ, ...), принадлежащей другому третьему лицу, должна быть увязана с проектом по созданию, держать этот пустой иметь проект, несколько третьих лиц.
@@ -147,28 +147,28 @@ CloneContacts=Дублировать контакты
 CloneNotes=Дублировать заметки
 CloneProjectFiles=Дублировать файлы, связанные с проектом
 CloneTaskFiles=Клонировать задачу (задачи), объединять файлы (если задача клонирована)
-CloneMoveDate=Update project/tasks dates from now?
-ConfirmCloneProject=Are you sure to clone this project?
-ProjectReportDate=Change task dates according to new project start date
+CloneMoveDate=Обновить даты проекта / задач с этого момента?
+ConfirmCloneProject=Вы уверены, что скопируете этот проект?
+ProjectReportDate=Изменить даты задач в соответствии с датой начала нового проекта
 ErrorShiftTaskDate=Невозможно сдвинуть дату задачи по причине новой даты начала проекта
 ProjectsAndTasksLines=Проекты и задачи
 ProjectCreatedInDolibarr=Проект %s создан
-ProjectValidatedInDolibarr=Project %s validated
+ProjectValidatedInDolibarr=Проект %s валидирован
 ProjectModifiedInDolibarr=Проект %s изменен
 TaskCreatedInDolibarr=Задача %s создана
 TaskModifiedInDolibarr=Задача %s изменена
 TaskDeletedInDolibarr=Задача %s удалена
-OpportunityStatus=Lead status
-OpportunityStatusShort=Lead status
-OpportunityProbability=Lead probability
-OpportunityProbabilityShort=Lead probab.
-OpportunityAmount=Lead amount
-OpportunityAmountShort=Lead amount
-OpportunityWeightedAmount=Opportunity weighted amount
-OpportunityWeightedAmountShort=Opp. weighted amount
-OpportunityAmountAverageShort=Average lead amount
-OpportunityAmountWeigthedShort=Weighted lead amount
-WonLostExcluded=Won/Lost excluded
+OpportunityStatus=Статус лида
+OpportunityStatusShort=Статус лида
+OpportunityProbability=Вероятность опережения
+OpportunityProbabilityShort=Ведите пробаб.
+OpportunityAmount=Сумма лида
+OpportunityAmountShort=Сумма лида
+OpportunityWeightedAmount=Взвешенная сумма возможности
+OpportunityWeightedAmountShort=Опп. взвешенная сумма
+OpportunityAmountAverageShort=Средняя сумма лида
+OpportunityAmountWeigthedShort=Взвешенная сумма лида
+WonLostExcluded=Выигрыш / проигрыш исключен
 ##### Types de contacts #####
 TypeContact_project_internal_PROJECTLEADER=Руководитель проекта
 TypeContact_project_external_PROJECTLEADER=Руководитель проекта
@@ -182,94 +182,96 @@ SelectElement=Выберите элемент
 AddElement=Ссылка на элемент
 LinkToElementShort=Ссылка к
 # Documents models
-DocumentModelBeluga=Project document template for linked objects overview
-DocumentModelBaleine=Project document template for tasks
-DocumentModelTimeSpent=Project report template for time spent
+DocumentModelBeluga=Обзор шаблона документа проекта для связанных объектов
+DocumentModelBaleine=Шаблон документа проекта для задач
+DocumentModelTimeSpent=Шаблон отчета по проекту по затраченному времени
 PlannedWorkload=Запланированная нагрузка
 PlannedWorkloadShort=Рабочая нагрузка
 ProjectReferers=Связанные элементы
 ProjectMustBeValidatedFirst=Проект должен быть сначала подтверждён
-FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
+FirstAddRessourceToAllocateTime=Назначьте пользовательский ресурс в качестве контактного лица проекта для распределения времени
 InputPerDay=Ввод по дням
 InputPerWeek=Ввод по неделе
-InputPerMonth=Input per month
-InputDetail=Input detail
-TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
-ProjectsWithThisUserAsContact=Projects with this user as contact
-TasksWithThisUserAsContact=Tasks assigned to this user
-ResourceNotAssignedToProject=Not assigned to project
-ResourceNotAssignedToTheTask=Not assigned to the task
-NoUserAssignedToTheProject=No users assigned to this project
-TimeSpentBy=Time spent by
-TasksAssignedTo=Tasks assigned to
-AssignTaskToMe=Assign task to myself
-AssignTaskToUser=Assign task to %s
-SelectTaskToAssign=Select task to assign...
-AssignTask=Assign
-ProjectOverview=Overview
-ManageTasks=Use projects to follow tasks and/or report time spent (timesheets)
-ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
-ProjectNbProjectByMonth=No. of created projects by month
-ProjectNbTaskByMonth=No. of created tasks by month
-ProjectOppAmountOfProjectsByMonth=Amount of leads by month
-ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of leads by month
-ProjectOpenedProjectByOppStatus=Open project|lead by lead status
-ProjectsStatistics=Statistics on projects or leads
-TasksStatistics=Statistics on tasks of projects or leads
-TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
-IdTaskTime=Id task time
-YouCanCompleteRef=If you want to complete the ref with some suffix, it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-MYSUFFIX
-OpenedProjectsByThirdparties=Open projects by third parties
-OnlyOpportunitiesShort=Only leads
-OpenedOpportunitiesShort=Open leads
-NotOpenedOpportunitiesShort=Not an open lead
-NotAnOpportunityShort=Not a lead
-OpportunityTotalAmount=Total amount of leads
-OpportunityPonderatedAmount=Weighted amount of leads
-OpportunityPonderatedAmountDesc=Leads amount weighted with probability
-OppStatusPROSP=Prospection
-OppStatusQUAL=Qualification
+InputPerMonth=Ввод в месяц
+InputDetail=Детализация ввода
+TimeAlreadyRecorded=Это время, уже зарегистрированное для этой задачи / день, и пользователь %s
+ProjectsWithThisUserAsContact=Проекты с этим пользователем в качестве контакта
+TasksWithThisUserAsContact=Задачи, возложенные на этого пользователя
+ResourceNotAssignedToProject=Не привязан к проекту
+ResourceNotAssignedToTheTask=Не назначен на задачу
+NoUserAssignedToTheProject=Нет пользователей, назначенных для этого проекта
+TimeSpentBy=Время, проведенное
+TasksAssignedTo=Задачи, возложенные на
+AssignTaskToMe=Поручить себе задачу
+AssignTaskToUser=Назначьте задачу %s
+SelectTaskToAssign=Выберите задачу для назначения ...
+AssignTask=Назначать
+ProjectOverview=Обзор
+ManageTasks=Используйте проекты, чтобы следить за задачами и / или сообщать о затраченном времени (табели учета рабочего времени)
+ManageOpportunitiesStatus=Используйте проекты, чтобы следить за потенциальными новостями / возможностями
+ProjectNbProjectByMonth=Кол-во созданных проектов по месяцам
+ProjectNbTaskByMonth=Кол-во созданных задач по месяцам
+ProjectOppAmountOfProjectsByMonth=Количество лидов по месяцам
+ProjectWeightedOppAmountOfProjectsByMonth=Взвешенное количество лидов по месяцам
+ProjectOpenedProjectByOppStatus=Открытый проект | ведение по статусу лида
+ProjectsStatistics=Статистика по проектам или лидам
+TasksStatistics=Статистика по задачам проектов или лидов
+TaskAssignedToEnterTime=Задача поставлена. Учет времени на эту задачу должен быть возможен.
+IdTaskTime=Id время задачи
+YouCanCompleteRef=Если вы хотите дополнить ссылку каким-либо суффиксом, рекомендуется добавить символ -, чтобы отделить его, чтобы автоматическая нумерация по-прежнему работала правильно для следующих проектов. Например %s-MYSUFFIX
+OpenedProjectsByThirdparties=Открытые проекты третьих лиц
+OnlyOpportunitiesShort=Только приводит
+OpenedOpportunitiesShort=Открытые лиды
+NotOpenedOpportunitiesShort=Не открытая зацепка
+NotAnOpportunityShort=Не ведущий
+OpportunityTotalAmount=Общее количество лидов
+OpportunityPonderatedAmount=Взвешенное количество лидов
+OpportunityPonderatedAmountDesc=Количество потенциальных клиентов, взвешенное с вероятностью
+OppStatusPROSP=Разведка
+OppStatusQUAL=Квалификация
 OppStatusPROPO=Предложение
-OppStatusNEGO=Negociation
+OppStatusNEGO=Переговоры
 OppStatusPENDING=В ожидании
-OppStatusWON=Won
-OppStatusLOST=Lost
-Budget=Budget
-AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>Supported values:</u><br>- Keep empty: Can link any project of the company (default)<br>- "all": Can link any projects, even projects of other companies<br>- A list of third-party ids separated by commas: can link all projects of these third partys (Example: 123,4795,53)<br>
-LatestProjects=Latest %s projects
-LatestModifiedProjects=Latest %s modified projects
-OtherFilteredTasks=Other filtered tasks
-NoAssignedTasks=No assigned tasks found (assign project/tasks to the current user from the top select box to enter time on it)
-ThirdPartyRequiredToGenerateInvoice=A third party must be defined on project to be able to invoice it.
-ChooseANotYetAssignedTask=Choose a task not yet assigned to you
+OppStatusWON=Победил
+OppStatusLOST=Потерянный
+Budget=Бюджет
+AllowToLinkFromOtherCompany=Разрешить связывать проект от другой компании <br> <br> <u> Поддерживаемые значения: </u> <br> - Оставить пустым: можно связать любой проект компании (по умолчанию) a0342fz проекты "все проекты", accfda342 - любой другой проект "accfda" - все проекты "даже" accfda190 сторонние идентификаторы, разделенные запятыми: можно связать все проекты этих сторонних разработчиков (пример: 123,4795,53) <br>
+LatestProjects=Последние проекты %s
+LatestModifiedProjects=Последние измененные проекты %s
+OtherFilteredTasks=Другие отфильтрованные задачи
+NoAssignedTasks=Назначенных задач не найдено (назначьте проект / задачи текущему пользователю из верхнего поля выбора, чтобы ввести время на нем)
+ThirdPartyRequiredToGenerateInvoice=Третья сторона должна быть определена в проекте, чтобы иметь возможность выставить счет.
+ChooseANotYetAssignedTask=Выберите задачу, которая вам еще не возложена
 # Comments trans
-AllowCommentOnTask=Allow user comments on tasks
-AllowCommentOnProject=Allow user comments on projects
-DontHavePermissionForCloseProject=You do not have permissions to close the project %s
-DontHaveTheValidateStatus=The project %s must be open to be closed
-RecordsClosed=%s project(s) closed
-SendProjectRef=Information project %s
-ModuleSalaryToDefineHourlyRateMustBeEnabled=Module 'Salaries' must be enabled to define employee hourly rate to have time spent valorized
-NewTaskRefSuggested=Task ref already used, a new task ref is required
-TimeSpentInvoiced=Time spent billed
+AllowCommentOnTask=Разрешить пользователям комментировать задачи
+AllowCommentOnProject=Разрешить пользователям комментировать проекты
+DontHavePermissionForCloseProject=У вас нет прав на закрытие проекта %s
+DontHaveTheValidateStatus=Чтобы закрыть проект %s, он должен быть открыт.
+RecordsClosed=%s проект (ы) закрыт
+SendProjectRef=Информационный проект %s
+ModuleSalaryToDefineHourlyRateMustBeEnabled=Модуль «Заработная плата» должен быть включен, чтобы определять почасовую ставку сотрудника, чтобы время, потраченное на него, было оценено.
+NewTaskRefSuggested=Ссылка на задачу уже используется, требуется новая ссылка на задачу
+TimeSpentInvoiced=Время, затраченное на оплату
 TimeSpentForInvoice=Время, проведенное
-OneLinePerUser=One line per user
-ServiceToUseOnLines=Service to use on lines
-InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
-ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
-ProjectFollowOpportunity=Follow opportunity
-ProjectFollowTasks=Follow tasks or time spent
-Usage=Usage
-UsageOpportunity=Usage: Opportunity
-UsageTasks=Usage: Tasks
-UsageBillTimeShort=Usage: Bill time
-InvoiceToUse=Draft invoice to use
+OneLinePerUser=Одна строка на пользователя
+ServiceToUseOnLines=Сервис для использования на линиях
+InvoiceGeneratedFromTimeSpent=Счет-фактура %s была создана на основе времени, потраченного на проект
+ProjectBillTimeDescription=Проверьте, вводите ли вы расписание для задач проекта И планируете ли вы генерировать счет (-а) из расписания, чтобы выставить счет клиенту проекта (не проверяйте, планируете ли вы создавать счет, который не основан на введенных расписаниях). Примечание. Чтобы создать счет, перейдите на вкладку «Затраченное время» проекта и выберите строки для включения.
+ProjectFollowOpportunity=Следуй за возможностью
+ProjectFollowTasks=Следите за задачами или потраченным временем
+Usage=Применение
+UsageOpportunity=Использование: возможность
+UsageTasks=Использование: Задачи
+UsageBillTimeShort=Использование: время счета
+InvoiceToUse=Черновик счета для использования
 NewInvoice=Новый счёт
-OneLinePerTask=One line per task
-OneLinePerPeriod=One line per period
-RefTaskParent=Ref. Parent Task
-ProfitIsCalculatedWith=Profit is calculated using
-AddPersonToTask=Add also to tasks
-UsageOrganizeEvent=Usage: Event Organization
-PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
-PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
+OneLinePerTask=Одна строка на задачу
+OneLinePerPeriod=Одна строка за период
+OneLinePerTimeSpentLine=Одна строка для каждого затраченного времени
+RefTaskParent=Ref. Родительская задача
+ProfitIsCalculatedWith=Прибыль рассчитывается с использованием
+AddPersonToTask=Добавляйте также в задачи
+UsageOrganizeEvent=Использование: Организация мероприятий
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Классифицируйте проект как закрытый, когда все его задачи будут выполнены (прогресс 100%%)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Примечание: существующие проекты со всеми задачами на 100%% не будут затронуты: вам придется закрыть их вручную. Этот параметр влияет только на открытые проекты.
+SelectLinesOfTimeSpentToInvoice=Выберите строки затраченного времени, за которые не выставлены счета, затем выполните массовое действие "Сгенерировать счет-фактуру", чтобы выставить их.
diff --git a/htdocs/langs/ru_RU/propal.lang b/htdocs/langs/ru_RU/propal.lang
index 4575b0dc66e..f19861c10d0 100644
--- a/htdocs/langs/ru_RU/propal.lang
+++ b/htdocs/langs/ru_RU/propal.lang
@@ -13,16 +13,16 @@ Prospect=Проспект
 DeleteProp=Удалить коммерческого предложения
 ValidateProp=Проверка коммерческого предложения
 AddProp=Создать предложение
-ConfirmDeleteProp=Are you sure you want to delete this commercial proposal?
-ConfirmValidateProp=Are you sure you want to validate this commercial proposal under name <b>%s</b>?
-LastPropals=Latest %s proposals
-LastModifiedProposals=Latest %s modified proposals
+ConfirmDeleteProp=Вы уверены, что хотите удалить это коммерческое предложение?
+ConfirmValidateProp=Вы уверены, что хотите подтвердить это коммерческое предложение под именем <b> %s </b>?
+LastPropals=Последние предложения %s
+LastModifiedProposals=Последние измененные предложения %s
 AllPropals=Все предложения
 SearchAProposal=Поиск предложений
-NoProposal=No proposal
+NoProposal=Нет предложений
 ProposalsStatistics=Статистика коммерческих предложений 
 NumberOfProposalsByMonth=Количество в месяц
-AmountOfProposalsByMonthHT=Amount by month (excl. tax)
+AmountOfProposalsByMonthHT=Сумма по месяцам (без налогов)
 NbOfProposals=Количество коммерческих предложений
 ShowPropal=Показать предложение
 PropalsDraft=Черновики
@@ -33,7 +33,7 @@ PropalStatusSigned=Подпись (в законопроекте)
 PropalStatusNotSigned=Не подписал (закрытые)
 PropalStatusBilled=Billed
 PropalStatusDraftShort=Черновик
-PropalStatusValidatedShort=Validated (open)
+PropalStatusValidatedShort=Подтверждено (открыто)
 PropalStatusClosedShort=Закрытые
 PropalStatusSignedShort=Подпись
 PropalStatusNotSignedShort=Не подписано
@@ -47,19 +47,19 @@ SendPropalByMail=Отправить коммерческое предложен
 DatePropal=Дата предложения
 DateEndPropal=Дата окончания действия
 ValidityDuration=Срок действия
-SetAcceptedRefused=Set accepted/refused
+SetAcceptedRefused=Набор принят / отклонен
 ErrorPropalNotFound=Пропал% не найдены
 AddToDraftProposals=Добавить проект коммерческого предложения
 NoDraftProposals=Нет проектов коммерческих дредложений
 CopyPropalFrom=Создание коммерческого предложения, копируя существующие предложения
-CreateEmptyPropal=Create empty commercial proposal or from list of products/services
+CreateEmptyPropal=Создать пустое коммерческое предложение или из списка товаров / услуг
 DefaultProposalDurationValidity=По умолчанию коммерческого предложения действительности продолжительность (в днях)
-UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
-ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b>?
-ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
+UseCustomerContactAsPropalRecipientIfExist=В качестве адреса получателя предложения используйте контакт / адрес с типом "Контактное последующее предложение", если он определен, вместо стороннего адреса.
+ConfirmClonePropal=Вы уверены, что хотите клонировать коммерческое предложение <b> %s </b>?
+ConfirmReOpenProp=Вы уверены, что хотите снова открыть коммерческое предложение <b> %s </b>?
 ProposalsAndProposalsLines=Коммерческое предложение и линий
 ProposalLine=Предложение линия
-ProposalLines=Proposal lines
+ProposalLines=Строки предложения
 AvailabilityPeriod=Наличие задержки
 SetAvailability=Задержка устанавливается доступность
 AfterOrder=после заказа
@@ -74,19 +74,19 @@ AvailabilityTypeAV_1M=1 месяц
 TypeContact_propal_internal_SALESREPFOLL=Представитель следующие меры предложение
 TypeContact_propal_external_BILLING=свяжитесь со счета
 TypeContact_propal_external_CUSTOMER=Абонентский отдел следующие меры предложение
-TypeContact_propal_external_SHIPPING=Customer contact for delivery
+TypeContact_propal_external_SHIPPING=Контактное лицо для доставки
 # Document models
-DocModelAzurDescription=A complete proposal model (old implementation of Cyan template)
-DocModelCyanDescription=A complete proposal model
+DocModelAzurDescription=Полная модель предложения (старая реализация шаблона Cyan)
+DocModelCyanDescription=Полная модель предложения
 DefaultModelPropalCreate=Создание модели по умолчанию
 DefaultModelPropalToBill=Шаблон по умолчанию, когда закрывается коммерческое предложение (для создания счёта)
 DefaultModelPropalClosed=Шаблон по умолчанию, когда закрывается коммерческое предложение (не оплаченное)
 ProposalCustomerSignature=Письменное подтверждение, печать компании, дата и подпись
-ProposalsStatisticsSuppliers=Vendor proposals statistics
-CaseFollowedBy=Case followed by
-SignedOnly=Signed only
-IdProposal=Proposal ID
-IdProduct=Product ID
-PrParentLine=Proposal Parent Line
-LineBuyPriceHT=Buy Price Amount net of tax for line
+ProposalsStatisticsSuppliers=Статистика предложений поставщиков
+CaseFollowedBy=Дело, за которым следует
+SignedOnly=Только подписано
+IdProposal=ID предложения
+IdProduct=идантификационный номер продукта
+PrParentLine=Родительская линия предложения
+LineBuyPriceHT=Цена покупки Сумма без налога для строки
 
diff --git a/htdocs/langs/ru_RU/receiptprinter.lang b/htdocs/langs/ru_RU/receiptprinter.lang
index 53e99b9ccb5..8a7372218eb 100644
--- a/htdocs/langs/ru_RU/receiptprinter.lang
+++ b/htdocs/langs/ru_RU/receiptprinter.lang
@@ -1,82 +1,82 @@
 # Dolibarr language file - Source file is en_US - receiptprinter
-ReceiptPrinterSetup=Setup of module ReceiptPrinter
-PrinterAdded=Printer %s added
-PrinterUpdated=Printer %s updated
-PrinterDeleted=Printer %s deleted
-TestSentToPrinter=Test Sent To Printer %s
-ReceiptPrinter=Receipt printers
-ReceiptPrinterDesc=Setup of receipt printers
-ReceiptPrinterTemplateDesc=Setup of Templates
-ReceiptPrinterTypeDesc=Description of Receipt Printer's type
-ReceiptPrinterProfileDesc=Description of Receipt Printer's Profile
-ListPrinters=List of Printers
-SetupReceiptTemplate=Template Setup
-CONNECTOR_DUMMY=Dummy Printer
-CONNECTOR_NETWORK_PRINT=Network Printer
-CONNECTOR_FILE_PRINT=Local Printer
-CONNECTOR_WINDOWS_PRINT=Local Windows Printer
-CONNECTOR_CUPS_PRINT=Cups Printer
-CONNECTOR_DUMMY_HELP=Fake Printer for test, does nothing
-CONNECTOR_NETWORK_PRINT_HELP=10.x.x.x:9100
-CONNECTOR_FILE_PRINT_HELP=/dev/usb/lp0, /dev/usb/lp1
-CONNECTOR_WINDOWS_PRINT_HELP=LPT1, COM1, smb://FooUser:secret@computername/workgroup/Receipt Printer
-CONNECTOR_CUPS_PRINT_HELP=CUPS printer name, example: HPRT_TP805L
-PROFILE_DEFAULT=Default Profile
-PROFILE_SIMPLE=Simple Profile
-PROFILE_EPOSTEP=Epos Tep Profile
-PROFILE_P822D=P822D Profile
-PROFILE_STAR=Star Profile
-PROFILE_DEFAULT_HELP=Default Profile suitable for Epson printers
-PROFILE_SIMPLE_HELP=Simple Profile No Graphics
-PROFILE_EPOSTEP_HELP=Epos Tep Profile
-PROFILE_P822D_HELP=P822D Profile No Graphics
-PROFILE_STAR_HELP=Star Profile
-DOL_LINE_FEED=Skip line
-DOL_ALIGN_LEFT=Left align text
-DOL_ALIGN_CENTER=Center text
-DOL_ALIGN_RIGHT=Right align text
-DOL_USE_FONT_A=Use font A of printer
-DOL_USE_FONT_B=Use font B of printer
-DOL_USE_FONT_C=Use font C of printer
-DOL_PRINT_BARCODE=Print barcode
-DOL_PRINT_BARCODE_CUSTOMER_ID=Print barcode customer id
-DOL_CUT_PAPER_FULL=Cut ticket completely
-DOL_CUT_PAPER_PARTIAL=Cut ticket partially
-DOL_OPEN_DRAWER=Open cash drawer
-DOL_ACTIVATE_BUZZER=Activate buzzer
-DOL_PRINT_QRCODE=Print QR Code
-DOL_PRINT_LOGO=Print logo of my company
-DOL_PRINT_LOGO_OLD=Print logo of my company (old printers)
-DOL_BOLD=Bold
-DOL_BOLD_DISABLED=Disable bold
-DOL_DOUBLE_HEIGHT=Double height size
-DOL_DOUBLE_WIDTH=Double width size
-DOL_DEFAULT_HEIGHT_WIDTH=Default height and width size
-DOL_UNDERLINE=Enable underline
-DOL_UNDERLINE_DISABLED=Disable underline
-DOL_BEEP=Beed sound
-DOL_PRINT_TEXT=Print text
-DateInvoiceWithTime=Invoice date and time
-YearInvoice=Invoice year
-DOL_VALUE_MONTH_LETTERS=Invoice month in letters
-DOL_VALUE_MONTH=Invoice month
-DOL_VALUE_DAY=Invoice day
-DOL_VALUE_DAY_LETTERS=Inovice day in letters
-DOL_LINE_FEED_REVERSE=Line feed reverse
-InvoiceID=Invoice ID
+ReceiptPrinterSetup=Настройка модуля ReceiptPrinter
+PrinterAdded=Добавлен принтер %s
+PrinterUpdated=Принтер %s обновлен
+PrinterDeleted=Принтер %s удален
+TestSentToPrinter=Тест отправлен на принтер %s
+ReceiptPrinter=Чековые принтеры
+ReceiptPrinterDesc=Настройка принтеров чеков
+ReceiptPrinterTemplateDesc=Настройка шаблонов
+ReceiptPrinterTypeDesc=Описание типа чекового принтера
+ReceiptPrinterProfileDesc=Описание профиля чекового принтера
+ListPrinters=Список принтеров
+SetupReceiptTemplate=Настройка шаблона
+CONNECTOR_DUMMY=Фиктивный принтер
+CONNECTOR_NETWORK_PRINT=Сетевой принтер
+CONNECTOR_FILE_PRINT=Локальный принтер
+CONNECTOR_WINDOWS_PRINT=Локальный принтер Windows
+CONNECTOR_CUPS_PRINT=Чашки Принтер
+CONNECTOR_DUMMY_HELP=Поддельный принтер для тестирования, ничего не делает
+CONNECTOR_NETWORK_PRINT_HELP=10.x.x.x: 9100
+CONNECTOR_FILE_PRINT_HELP=/ Дев / USB / LP0, / Дев / USB / LP1
+CONNECTOR_WINDOWS_PRINT_HELP=LPT1, COM1, smb: // FooUser: secret @ computername / workgroup / Receipt Printer
+CONNECTOR_CUPS_PRINT_HELP=Имя принтера CUPS, пример: HPRT_TP805L
+PROFILE_DEFAULT=Профиль по умолчанию
+PROFILE_SIMPLE=Простой профиль
+PROFILE_EPOSTEP=Epos Tep Профиль
+PROFILE_P822D=P822D Профиль
+PROFILE_STAR=Звездный Профиль
+PROFILE_DEFAULT_HELP=Профиль по умолчанию, подходящий для принтеров Epson
+PROFILE_SIMPLE_HELP=Простой профиль без графики
+PROFILE_EPOSTEP_HELP=Epos Tep Профиль
+PROFILE_P822D_HELP=Профиль P822D без графики
+PROFILE_STAR_HELP=Звездный Профиль
+DOL_LINE_FEED=Пропустить линию
+DOL_ALIGN_LEFT=Выровнять текст по левому краю
+DOL_ALIGN_CENTER=Текст по центру
+DOL_ALIGN_RIGHT=Выровнять текст по правому краю
+DOL_USE_FONT_A=Используйте шрифт A принтера
+DOL_USE_FONT_B=Используйте шрифт B принтера
+DOL_USE_FONT_C=Используйте шрифт C принтера
+DOL_PRINT_BARCODE=Распечатать штрих-код
+DOL_PRINT_BARCODE_CUSTOMER_ID=Распечатать штрих-код идентификатора клиента
+DOL_CUT_PAPER_FULL=Полностью отрезать билет
+DOL_CUT_PAPER_PARTIAL=Частично сократить билет
+DOL_OPEN_DRAWER=Открытый денежный ящик
+DOL_ACTIVATE_BUZZER=Активировать зуммер
+DOL_PRINT_QRCODE=Распечатать QR-код
+DOL_PRINT_LOGO=Печать логотипа моей компании
+DOL_PRINT_LOGO_OLD=Распечатать логотип моей компании (старые принтеры)
+DOL_BOLD=Полужирный
+DOL_BOLD_DISABLED=Отключить жирный шрифт
+DOL_DOUBLE_HEIGHT=Размер двойной высоты
+DOL_DOUBLE_WIDTH=Размер двойной ширины
+DOL_DEFAULT_HEIGHT_WIDTH=Высота и ширина по умолчанию
+DOL_UNDERLINE=Включить подчеркивание
+DOL_UNDERLINE_DISABLED=Отключить подчеркивание
+DOL_BEEP=Звуковой сигнал
+DOL_PRINT_TEXT=Печатать текст
+DateInvoiceWithTime=Дата и время выставления счета
+YearInvoice=Год выставления счета
+DOL_VALUE_MONTH_LETTERS=Месяц счета-фактуры буквами
+DOL_VALUE_MONTH=Счет-фактура месяц
+DOL_VALUE_DAY=День выставления счета
+DOL_VALUE_DAY_LETTERS=День иновице в письмах
+DOL_LINE_FEED_REVERSE=Перенос строки в обратном направлении
+InvoiceID=Идентификатор счета
 InvoiceRef=Референс Счета-фактуры
-DOL_PRINT_OBJECT_LINES=Invoice lines
-DOL_VALUE_CUSTOMER_FIRSTNAME=Customer first name
-DOL_VALUE_CUSTOMER_LASTNAME=Customer last name
-DOL_VALUE_CUSTOMER_MAIL=Customer mail
-DOL_VALUE_CUSTOMER_PHONE=Customer phone
-DOL_VALUE_CUSTOMER_MOBILE=Customer mobile
-DOL_VALUE_CUSTOMER_SKYPE=Customer Skype
-DOL_VALUE_CUSTOMER_TAX_NUMBER=Customer tax number
-DOL_VALUE_CUSTOMER_ACCOUNT_BALANCE=Customer account balance
-DOL_VALUE_MYSOC_NAME=Your company name
-VendorLastname=Vendor last name
-VendorFirstname=Vendor first name
-VendorEmail=Vendor email
-DOL_VALUE_CUSTOMER_POINTS=Customer points
-DOL_VALUE_OBJECT_POINTS=Object points
+DOL_PRINT_OBJECT_LINES=Строки счета-фактуры
+DOL_VALUE_CUSTOMER_FIRSTNAME=Имя клиента
+DOL_VALUE_CUSTOMER_LASTNAME=Фамилия клиента
+DOL_VALUE_CUSTOMER_MAIL=Почта клиента
+DOL_VALUE_CUSTOMER_PHONE=Телефон клиента
+DOL_VALUE_CUSTOMER_MOBILE=Мобильный клиент
+DOL_VALUE_CUSTOMER_SKYPE=Клиент Skype
+DOL_VALUE_CUSTOMER_TAX_NUMBER=Налоговый номер клиента
+DOL_VALUE_CUSTOMER_ACCOUNT_BALANCE=Баланс клиентского счета
+DOL_VALUE_MYSOC_NAME=Название вашей компании
+VendorLastname=Фамилия продавца
+VendorFirstname=Имя продавца
+VendorEmail=Электронная почта поставщика
+DOL_VALUE_CUSTOMER_POINTS=Клиентские баллы
+DOL_VALUE_OBJECT_POINTS=Очки объекта
diff --git a/htdocs/langs/ru_RU/receptions.lang b/htdocs/langs/ru_RU/receptions.lang
index 62a309402db..00bb6048dd4 100644
--- a/htdocs/langs/ru_RU/receptions.lang
+++ b/htdocs/langs/ru_RU/receptions.lang
@@ -1,26 +1,26 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=Product Reception setup
-RefReception=Ref. reception
+ReceptionsSetup=Настройка приема продукции
+RefReception=Ref. прием
 Reception=В процессе
-Receptions=Receptions
-AllReceptions=All Receptions
+Receptions=Приемы
+AllReceptions=Все приемы
 Reception=В процессе
-Receptions=Receptions
-ShowReception=Show Receptions
-ReceptionsArea=Receptions area
-ListOfReceptions=List of receptions
-ReceptionMethod=Reception method
-LastReceptions=Latest %s receptions
-StatisticsOfReceptions=Statistics for receptions
-NbOfReceptions=Number of receptions
-NumberOfReceptionsByMonth=Number of receptions by month
-ReceptionCard=Reception card
-NewReception=New reception
-CreateReception=Create reception
-QtyInOtherReceptions=Qty in other receptions
-OtherReceptionsForSameOrder=Other receptions for this order
-ReceptionsAndReceivingForSameOrder=Receptions and receipts for this order
-ReceptionsToValidate=Receptions to validate
+Receptions=Приемы
+ShowReception=Показать приемы
+ReceptionsArea=Приемная
+ListOfReceptions=Список приемов
+ReceptionMethod=Метод приема
+LastReceptions=Последние поступления %s
+StatisticsOfReceptions=Статистика по приемам
+NbOfReceptions=Количество приемов
+NumberOfReceptionsByMonth=Количество приемов по месяцам
+ReceptionCard=Приемная карта
+NewReception=Новый прием
+CreateReception=Создать прием
+QtyInOtherReceptions=Кол-во в других приемах
+OtherReceptionsForSameOrder=Другие приемы по этому заказу
+ReceptionsAndReceivingForSameOrder=Квитанции и чеки по этому заказу
+ReceptionsToValidate=Приемы для проверки
 StatusReceptionCanceled=Отменена
 StatusReceptionDraft=Проект
 StatusReceptionValidated=Утверждена (товары для отправки или уже отправлены)
@@ -28,20 +28,20 @@ StatusReceptionProcessed=Обработано
 StatusReceptionDraftShort=Проект
 StatusReceptionValidatedShort=Утверждена
 StatusReceptionProcessedShort=Обработано
-ReceptionSheet=Reception sheet
-ConfirmDeleteReception=Are you sure you want to delete this reception?
-ConfirmValidateReception=Are you sure you want to validate this reception with reference <b>%s</b>?
-ConfirmCancelReception=Are you sure you want to cancel this reception?
-StatsOnReceptionsOnlyValidated=Statistics conducted on receptions only validated. Date used is date of validation of reception (planed delivery date is not always known).
-SendReceptionByEMail=Send reception by email
-SendReceptionRef=Submission of reception %s
-ActionsOnReception=Events on reception
-ReceptionCreationIsDoneFromOrder=For the moment, creation of a new reception is done from the order card.
-ReceptionLine=Reception line
-ProductQtyInReceptionAlreadySent=Product quantity from open sales order already sent
-ProductQtyInSuppliersReceptionAlreadyRecevied=Product quantity from open supplier order already received
-ValidateOrderFirstBeforeReception=You must first validate the order before being able to make receptions.
-ReceptionsNumberingModules=Numbering module for receptions
-ReceptionsReceiptModel=Document templates for receptions
-NoMorePredefinedProductToDispatch=No more predefined products to dispatch
-
+ReceptionSheet=Лист приема
+ConfirmDeleteReception=Вы уверены, что хотите удалить этот прием?
+ConfirmValidateReception=Вы уверены, что хотите подтвердить этот прием со ссылкой <b> %s </b>?
+ConfirmCancelReception=Вы уверены, что хотите отменить этот прием?
+StatsOnReceptionsOnlyValidated=Статистика по приемам только проверенная. Используемая дата - это дата подтверждения приема (планируемая дата доставки не всегда известна).
+SendReceptionByEMail=Отправить получение по электронной почте
+SendReceptionRef=Подача приема %s
+ActionsOnReception=События на приеме
+ReceptionCreationIsDoneFromOrder=На данный момент создание новой рецепции происходит из карточки заказа.
+ReceptionLine=Линия приема
+ProductQtyInReceptionAlreadySent=Количество товара из уже отправленного открытого заказа на продажу
+ProductQtyInSuppliersReceptionAlreadyRecevied=Количество продукта из открытого заказа поставщика уже получено
+ValidateOrderFirstBeforeReception=Вы должны сначала подтвердить заказ, прежде чем сможете проводить приемы.
+ReceptionsNumberingModules=Модуль нумерации приемных
+ReceptionsReceiptModel=Шаблоны документов для приемов
+NoMorePredefinedProductToDispatch=Больше нет готовых продуктов для отправки
+ReceptionExist=Прием существует
diff --git a/htdocs/langs/ru_RU/recruitment.lang b/htdocs/langs/ru_RU/recruitment.lang
index 29b7874b6ee..e6ec4e88b0e 100644
--- a/htdocs/langs/ru_RU/recruitment.lang
+++ b/htdocs/langs/ru_RU/recruitment.lang
@@ -18,59 +18,59 @@
 #
 
 # Module label 'ModuleRecruitmentName'
-ModuleRecruitmentName = Recruitment
+ModuleRecruitmentName = Рекрутинг
 # Module description 'ModuleRecruitmentDesc'
-ModuleRecruitmentDesc = Manage and follow recruitment campaigns for new job positions
+ModuleRecruitmentDesc = Управляйте кампаниями по найму на новые рабочие места и следите за ними
 
 #
 # Admin page
 #
-RecruitmentSetup = Recruitment setup
+RecruitmentSetup = Настройка набора
 Settings = Настройки
-RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
-RecruitmentArea=Recruitement area
-PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
-EnablePublicRecruitmentPages=Enable public pages of open jobs
+RecruitmentSetupPage = Введите здесь настройки основных опций модуля найма
+RecruitmentArea=Рекрутинговая зона
+PublicInterfaceRecruitmentDesc=Публичные страницы вакансий - это общедоступные URL-адреса для отображения открытых вакансий и ответа на них. Для каждой открытой вакансии есть одна отдельная ссылка, которая находится в каждой записи о вакансии.
+EnablePublicRecruitmentPages=Включить публичные страницы открытых вакансий
 
 #
 # About page
 #
 About = О
-RecruitmentAbout = About Recruitment
-RecruitmentAboutPage = Recruitment about page
-NbOfEmployeesExpected=Expected nb of employees
-JobLabel=Label of job position
-WorkPlace=Work place
-DateExpected=Expected date
-FutureManager=Future manager
-ResponsibleOfRecruitement=Responsible of recruitment
-IfJobIsLocatedAtAPartner=If job is located at a partner place
+RecruitmentAbout = О найме
+RecruitmentAboutPage = Рекрутинг о странице
+NbOfEmployeesExpected=Ожидаемое количество сотрудников
+JobLabel=Ярлык должности
+WorkPlace=Рабочее место
+DateExpected=Ожидаемая дата
+FutureManager=Будущий менеджер
+ResponsibleOfRecruitement=Ответственный за набор
+IfJobIsLocatedAtAPartner=Если работа находится у партнера
 PositionToBeFilled=Должность
-PositionsToBeFilled=Job positions
-ListOfPositionsToBeFilled=List of job positions
-NewPositionToBeFilled=New job positions
+PositionsToBeFilled=Вакансии
+ListOfPositionsToBeFilled=Список вакансий
+NewPositionToBeFilled=Новые рабочие места
 
-JobOfferToBeFilled=Job position to be filled
-ThisIsInformationOnJobPosition=Information of the job position to be filled
-ContactForRecruitment=Contact for recruitment
-EmailRecruiter=Email recruiter
-ToUseAGenericEmail=To use a generic email. If not defined, the email of the responsible of recruitment will be used
-NewCandidature=New application
-ListOfCandidatures=List of applications
-RequestedRemuneration=Requested remuneration
-ProposedRemuneration=Proposed remuneration
-ContractProposed=Contract proposed
-ContractSigned=Contract signed
-ContractRefused=Contract refused
-RecruitmentCandidature=Application
-JobPositions=Job positions
-RecruitmentCandidatures=Applications
-InterviewToDo=Interview to do
-AnswerCandidature=Application answer
-YourCandidature=Your application
-YourCandidatureAnswerMessage=Thanks you for your application.<br>...
-JobClosedTextCandidateFound=The job position is closed. The position has been filled.
-JobClosedTextCanceled=The job position is closed.
-ExtrafieldsJobPosition=Complementary attributes (job positions)
-ExtrafieldsApplication=Complementary attributes (job applications)
-MakeOffer=Make an offer
+JobOfferToBeFilled=Должность быть заполнена
+ThisIsInformationOnJobPosition=Информация о вакансии, которую необходимо заполнить
+ContactForRecruitment=Контакт для набора
+EmailRecruiter=Написать рекрутеру
+ToUseAGenericEmail=Чтобы использовать общий адрес электронной почты. Если не определено, будет использоваться адрес электронной почты ответственного за набор персонала.
+NewCandidature=Новое приложение
+ListOfCandidatures=Список приложений
+RequestedRemuneration=Запрошенное вознаграждение
+ProposedRemuneration=Предлагаемое вознаграждение
+ContractProposed=Предлагаемый контракт
+ContractSigned=Контракт подписан
+ContractRefused=Контракт отклонен
+RecruitmentCandidature=Заявление
+JobPositions=Вакансии
+RecruitmentCandidatures=Приложения
+InterviewToDo=Интервью делать
+AnswerCandidature=Ответ приложения
+YourCandidature=Ваше приложение
+YourCandidatureAnswerMessage=Спасибо за заявку. <br> ...
+JobClosedTextCandidateFound=Вакансия закрыта. Вакансия заполнена.
+JobClosedTextCanceled=Вакансия закрыта.
+ExtrafieldsJobPosition=Дополнительные атрибуты (должности)
+ExtrafieldsApplication=Дополнительные атрибуты (заявления о приеме на работу)
+MakeOffer=Сделай предложение
diff --git a/htdocs/langs/ru_RU/resource.lang b/htdocs/langs/ru_RU/resource.lang
index 11ab6d3ba69..48c7ae8fd50 100644
--- a/htdocs/langs/ru_RU/resource.lang
+++ b/htdocs/langs/ru_RU/resource.lang
@@ -34,3 +34,6 @@ IdResource=Ресурс Id
 AssetNumber=Серийный номер
 ResourceTypeCode=Код типа ресурса
 ImportDataset_resource_1=Ресурсы
+
+ErrorResourcesAlreadyInUse=Некоторые ресурсы уже используются
+ErrorResourceUseInEvent=%s используется в событии %s
diff --git a/htdocs/langs/ru_RU/salaries.lang b/htdocs/langs/ru_RU/salaries.lang
index a9ed4d4a6f7..742e9a385d1 100644
--- a/htdocs/langs/ru_RU/salaries.lang
+++ b/htdocs/langs/ru_RU/salaries.lang
@@ -2,12 +2,15 @@
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Учет используется для пользователей контрагентов
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=Выделенный бухгалтерский счет, указанный в карточке пользователя, будет использоваться только для учета во вспомогательной книги. Этот будет использоваться для Главной книги и в качестве значения по умолчанию для учета вспомогательной книги, если выделенная пользовательский бухгалтерский счет для пользователя не определен.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Бухгалтерский счет по умолчанию для выплат заработной платы
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=По умолчанию оставьте пустым параметр «Автоматически создавать общий платеж» при создании зарплаты.
 Salary=Зарплата
 Salaries=Зарплаты
-NewSalaryPayment=Новая выплата зарплаты
+NewSalary=Новая зарплата
+NewSalaryPayment=Новая зарплатная карта
 AddSalaryPayment=Добавить выплату зарплаты
 SalaryPayment=Выплата зарплаты
 SalariesPayments=Выплата зарплат
+SalariesPaymentsOf=Выплата заработной платы %s
 ShowSalaryPayment=Показать выплату зарплаты
 THM=Средняя почасовая ставка
 TJM=Среднесуточная ставка
diff --git a/htdocs/langs/ru_RU/sendings.lang b/htdocs/langs/ru_RU/sendings.lang
index 568dcf4572f..9849a894a5c 100644
--- a/htdocs/langs/ru_RU/sendings.lang
+++ b/htdocs/langs/ru_RU/sendings.lang
@@ -5,12 +5,12 @@ Sendings=Поставки
 AllSendings=Все поставки
 Shipment=Поставка
 Shipments=Поставки
-ShowSending=Show Shipments
-Receivings=Delivery Receipts
+ShowSending=Показать поставки
+Receivings=Квитанции о доставке
 SendingsArea=Раздел поставок
 ListOfSendings=Список поставок
 SendingMethod=Метод отправки
-LastSendings=Latest %s shipments
+LastSendings=Последние поставки %s
 StatisticsOfSendings=Статистика поставок
 NbOfSendings=Число поставок
 NumberOfShipmentsByMonth=Количество поставок по месяцам
@@ -18,16 +18,16 @@ SendingCard=Карточка поставки
 NewSending=Новая поставка
 CreateShipment=Создать поставку
 QtyShipped=Количество отгруженных
-QtyShippedShort=Qty ship.
-QtyPreparedOrShipped=Qty prepared or shipped
+QtyShippedShort=Кол-во кораблей.
+QtyPreparedOrShipped=Кол-во подготовленных или отправленных
 QtyToShip=Количество для отправки
-QtyToReceive=Qty to receive
+QtyToReceive=Кол-во для получения
 QtyReceived=Количество получено
-QtyInOtherShipments=Qty in other shipments
+QtyInOtherShipments=Кол-во в других поставках
 KeepToShip=Осталось отправить
-KeepToShipShort=Remain
+KeepToShipShort=Оставаться
 OtherSendingsForSameOrder=Другие поставки для этого заказа
-SendingsAndReceivingForSameOrder=Shipments and receipts for this order
+SendingsAndReceivingForSameOrder=Отгрузки и квитанции по этому заказу
 SendingsToValidate=Поставки для проверки
 StatusSendingCanceled=Отменена
 StatusSendingCanceledShort=Отменена
@@ -38,39 +38,39 @@ StatusSendingDraftShort=Черновик
 StatusSendingValidatedShort=Утверждена
 StatusSendingProcessedShort=Обработано
 SendingSheet=Лист поставки
-ConfirmDeleteSending=Are you sure you want to delete this shipment?
-ConfirmValidateSending=Are you sure you want to validate this shipment with reference <b>%s</b>?
-ConfirmCancelSending=Are you sure you want to cancel this shipment?
+ConfirmDeleteSending=Вы уверены, что хотите удалить этот груз?
+ConfirmValidateSending=Вы уверены, что хотите подтвердить эту отправку со ссылкой <b> %s </b>?
+ConfirmCancelSending=Вы уверены, что хотите отменить эту доставку?
 DocumentModelMerou=Модель A5
 WarningNoQtyLeftToSend=Внимание, нет товаров ожидающих отправки.
-StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
+StatsOnShipmentsOnlyValidated=Статистика предназначена только для подтвержденных отправлений. Используемая дата - это дата подтверждения отгрузки (плановая дата доставки не всегда известна)
 DateDeliveryPlanned=Планируемая дата доставки
-RefDeliveryReceipt=Ref delivery receipt
-StatusReceipt=Status delivery receipt
+RefDeliveryReceipt=Квитанция о доставке реф.
+StatusReceipt=Квитанция о доставке статуса
 DateReceived=Дата доставки получена
-ClassifyReception=Classify reception
-SendShippingByEMail=Send shipment by email
+ClassifyReception=Классифицируйте прием
+SendShippingByEMail=Отправить посылку по электронной почте
 SendShippingRef=Представление поставки %s
 ActionsOnShipping=События поставки
 LinkToTrackYourPackage=Ссылка на номер для отслеживания посылки
 ShipmentCreationIsDoneFromOrder=На данный момент, создание новой поставки закончено из карточки заказа.
 ShipmentLine=Линия поставки
-ProductQtyInCustomersOrdersRunning=Product quantity from open sales orders
-ProductQtyInSuppliersOrdersRunning=Product quantity from open purchase orders
-ProductQtyInShipmentAlreadySent=Product quantity from open sales order already sent
-ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from open purchase orders already received
-NoProductToShipFoundIntoStock=No product to ship found in warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
-WeightVolShort=Weight/Vol.
-ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
+ProductQtyInCustomersOrdersRunning=Количество продукта из открытых заказов на продажу
+ProductQtyInSuppliersOrdersRunning=Количество товара из открытых заказов на поставку
+ProductQtyInShipmentAlreadySent=Количество товара из уже отправленного открытого заказа на продажу
+ProductQtyInSuppliersShipmentAlreadyRecevied=Количество товаров из открытых заказов на поставку уже получено
+NoProductToShipFoundIntoStock=Товаров для отправки не обнаружено на складе <b> %s </b>. Исправьте запас или вернитесь, чтобы выбрать другой склад.
+WeightVolShort=Вес / об.
+ValidateOrderFirstBeforeShipment=Вы должны сначала подтвердить заказ перед отправкой.
 
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=Более полная модель документа для доставки квитанций (logo. ..)
-DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
+DocumentModelStorm=Более полная модель документа для квитанций о доставке и совместимость дополнительных полей (логотип ...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Постоянное EXPEDITION_ADDON_NUMBER не определена
 SumOfProductVolumes=Сумма сторон товара
 SumOfProductWeights=Вес товара в сумме
 
 # warehouse details
 DetailWarehouseNumber= Детали склада
-DetailWarehouseFormat= W:%s (Qty: %d)
+DetailWarehouseFormat= W: %s (Кол-во: %d)
diff --git a/htdocs/langs/ru_RU/sms.lang b/htdocs/langs/ru_RU/sms.lang
index 207028fa0e7..d5b0935c2ff 100644
--- a/htdocs/langs/ru_RU/sms.lang
+++ b/htdocs/langs/ru_RU/sms.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - sms
 Sms=Sms
-SmsSetup=Настройка Sms
-SmsDesc=Эта страница позволяет задать глобальные параметры SMS функций
+SmsSetup=Настройка SMS
+SmsDesc=На этой странице можно определить глобальные параметры функций SMS.
 SmsCard=Карточка SMS
-AllSms=Все SMS-кампании
+AllSms=Все СМС кампании
 SmsTargets=Получатели
 SmsRecipients=Получатели
 SmsRecipient=Получатель
@@ -13,20 +13,20 @@ SmsTo=Получатель
 SmsTopic=Тема SMS
 SmsText=Сообщение
 SmsMessage=SMS-сообщение
-ShowSms=Показать SMS
+ShowSms=Показать СМС
 ListOfSms=Список SMS-кампаний
-NewSms=Новая SMS-кампания
-EditSms=Изменить SMS
+NewSms=Новая СМС кампания
+EditSms=Редактировать SMS
 ResetSms=Новая рассылка
-DeleteSms=Удалить SMS-кампанию.
+DeleteSms=Удалить СМС кампанию
 DeleteASms=Удалить SMS-кампанию
-PreviewSms=Предварительный просмотр SMS
-PrepareSms=Подготовка SMS
-CreateSms=Создать SMS
-SmsResult=Результат отправки SMS
-TestSms=Тест SMS
-ValidSms=Проверить SMS
-ApproveSms=Утвердить Sms
+PreviewSms=Предыдущее SMS
+PrepareSms=Подготовить СМС
+CreateSms=Создать СМС
+SmsResult=Результат отправки СМС
+TestSms=Тестовое СМС
+ValidSms=Подтвердить SMS
+ApproveSms=Подтвердить SMS
 SmsStatusDraft=Проект
 SmsStatusValidated=Проверено
 SmsStatusApproved=Утверждено
@@ -35,17 +35,17 @@ SmsStatusSentPartialy=Отправленные частично
 SmsStatusSentCompletely=Отправленные полностью
 SmsStatusError=Ошибка
 SmsStatusNotSent=Не отправлено
-SmsSuccessfulySent=SMS отправлено корректно (от %s к %s)
+SmsSuccessfulySent=SMS отправлено правильно (с %s на %s)
 ErrorSmsRecipientIsEmpty=Список получателей пуст.
 WarningNoSmsAdded=Нет новых номеров телефонов, чтобы добавить в целевой список
-ConfirmValidSms=Do you confirm validation of this campain?
+ConfirmValidSms=Вы подтверждаете валидацию этой кампании?
 NbOfUniqueSms=Кол-во уникальных телефонных номеров
-NbOfSms=Кол-во телефонных номеров
+NbOfSms=№ телефонных номеров
 ThisIsATestMessage=Это тестовое сообщение
 SendSms=Отправить SMS
 SmsInfoCharRemain=Кол-во оставшихся символов
-SmsInfoNumero= (В международном формате, т.е.: +71234567890)
+SmsInfoNumero= (международный формат, например: +33899701761)
 DelayBeforeSending=Задержка перед отправкой (в минутах)
-SmsNoPossibleSenderFound=No sender available. Check setup of your SMS provider.
+SmsNoPossibleSenderFound=Отправитель недоступен. Проверьте настройки вашего SMS-провайдера.
 SmsNoPossibleRecipientFound=Нет доступных получателей. Проверьте настройки вашего провайдера SMS.
-DisableStopIfSupported=Disable STOP message (if supported)
+DisableStopIfSupported=Отключить сообщение STOP (если поддерживается)
diff --git a/htdocs/langs/ru_RU/stocks.lang b/htdocs/langs/ru_RU/stocks.lang
index b117c151467..8336111fb6a 100644
--- a/htdocs/langs/ru_RU/stocks.lang
+++ b/htdocs/langs/ru_RU/stocks.lang
@@ -2,256 +2,257 @@
 WarehouseCard=Карточка склада
 Warehouse=Склад
 Warehouses=Склады
-ParentWarehouse=Parent warehouse
-NewWarehouse=New warehouse / Stock Location
+ParentWarehouse=Материнский склад
+NewWarehouse=Новый склад / Расположение склада
 WarehouseEdit=Редактировать склад
 MenuNewWarehouse=Новый склад
 WarehouseSource=Источник склад
 WarehouseSourceNotDefined=Склад не определен,
-AddWarehouse=Create warehouse
+AddWarehouse=Создать склад
 AddOne=Добавить
-DefaultWarehouse=Default warehouse
+DefaultWarehouse=Склад по умолчанию
 WarehouseTarget=Целевой показатель на складе
 ValidateSending=Удалить отправку
 CancelSending=Отменить отправку
 DeleteSending=Удалить отправку
 Stock=Фондовый
 Stocks=Акции
-MissingStocks=Missing stocks
-StockAtDate=Stocks at date
-StockAtDateInPast=Date in the past
-StockAtDateInFuture=Date in the future
-StocksByLotSerial=Stocks by lot/serial
-LotSerial=Lots/Serials
-LotSerialList=List of lot/serials
+MissingStocks=Недостающие запасы
+StockAtDate=Запасы на дату
+StockAtDateInPast=Дата в прошлом
+StockAtDateInFuture=Дата в будущем
+StocksByLotSerial=Запасы по лотам / сериям
+LotSerial=Лоты / Сериалы
+LotSerialList=Список лотов / сериалов
 Movements=Перевозкой
 ErrorWarehouseRefRequired=Склад ссылкой зовут требуется
 ListOfWarehouses=Список складов
 ListOfStockMovements=Список акций движения
-ListOfInventories=List of inventories
-MovementId=Movement ID
-StockMovementForId=Movement ID %d
-ListMouvementStockProject=List of stock movements associated to project
+ListOfInventories=Список инвентаря
+MovementId=ID движения
+StockMovementForId=Идентификатор движения %d
+ListMouvementStockProject=Список движения запасов, связанных с проектом
 StocksArea=Раздел "Склад"
-AllWarehouses=All warehouses
-IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
-IncludeAlsoDraftOrders=Include also draft orders
+AllWarehouses=Все склады
+IncludeEmptyDesiredStock=Включите также отрицательный запас с неопределенным желаемым запасом
+IncludeAlsoDraftOrders=Включите также проекты заказов
 Location=Вместо
-LocationSummary=Short name of location
-NumberOfDifferentProducts=Number of unique products
+LocationSummary=Краткое название локации
+NumberOfDifferentProducts=Количество уникальных товаров
 NumberOfProducts=Общее количество продукции
-LastMovement=Latest movement
-LastMovements=Latest movements
+LastMovement=Последнее движение
+LastMovements=Последние движения
 Units=Единицы
 Unit=Единица
-StockCorrection=Stock correction
+StockCorrection=Коррекция запаса
 CorrectStock=Исправить склад
 StockTransfer=Перевод остатков
-TransferStock=Transfer stock
-MassStockTransferShort=Mass stock transfer
-StockMovement=Stock movement
-StockMovements=Stock movements
+TransferStock=Перенести запас
+MassStockTransferShort=Массовый перенос запаса
+StockMovement=Движение запасов
+StockMovements=Движение запасов
 NumberOfUnit=Количество единиц
 UnitPurchaseValue=Себестоимость единицы
 StockTooLow=Фондовый слишком низкими
-StockLowerThanLimit=Stock lower than alert limit (%s)
+StockLowerThanLimit=Запас ниже предела оповещения (%s)
 EnhancedValue=Значение
-PMPValue=Значение
-PMPValueShort=WAP
 EnhancedValueOfWarehouses=Склады стоимости
-UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
-AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
-RuleForWarehouse=Rule for warehouses
-WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
-WarehouseAskWarehouseDuringPropal=Set a warehouse on Commercial proposals
-WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
-UserDefaultWarehouse=Set a warehouse on Users
-MainDefaultWarehouse=Default warehouse
-MainDefaultWarehouseUser=Use a default warehouse for each user
-MainDefaultWarehouseUserDesc=By activating this option, during creation of a product, the warehouse assigned to the product will be defined on this one. If no warehouse is defined on the user, the default warehouse is defined.
-IndependantSubProductStock=Product stock and subproduct stock are independent
+UserWarehouseAutoCreate=Автоматическое создание хранилища пользователей при создании пользователя
+AllowAddLimitStockByWarehouse=Управляйте также стоимостью минимального и желаемого запаса для каждой пары (продукт-склад) в дополнение к стоимости минимального и желаемого запаса для каждого продукта.
+RuleForWarehouse=Правило для складов
+WarehouseAskWarehouseOnThirparty=Установить склад на сторонний
+WarehouseAskWarehouseDuringPropal=Установить склад по коммерческим предложениям
+WarehouseAskWarehouseDuringOrder=Настроить склад на Распродажу заказов
+UserDefaultWarehouse=Настроить склад для пользователей
+MainDefaultWarehouse=Склад по умолчанию
+MainDefaultWarehouseUser=Использовать хранилище по умолчанию для каждого пользователя
+MainDefaultWarehouseUserDesc=При активации этой опции при создании продукта на нем будет определен склад, присвоенный продукту. Если для пользователя не определен склад, определяется склад по умолчанию.
+IndependantSubProductStock=Товарный запас и запас вторичного продукта независимы друг от друга.
 QtyDispatched=Количество направил
 QtyDispatchedShort=Кол-во отправлено
 QtyToDispatchShort=Кол-во на отправку
-OrderDispatch=Item receipts
-RuleForStockManagementDecrease=Choose Rule for automatic stock decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
-RuleForStockManagementIncrease=Choose Rule for automatic stock increase (manual increase is always possible, even if an automatic increase rule is activated)
-DeStockOnBill=Decrease real stocks on validation of customer invoice/credit note
-DeStockOnValidateOrder=Decrease real stocks on validation of sales order
-DeStockOnShipment=Decrease real stocks on shipping validation
-DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
-ReStockOnBill=Increase real stocks on validation of vendor invoice/credit note
-ReStockOnValidateOrder=Increase real stocks on purchase order approval
-ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouse, after purchase order receipt of goods
-StockOnReception=Increase real stocks on validation of reception
-StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
+OrderDispatch=Получение товара
+RuleForStockManagementDecrease=Выберите Правило для автоматического уменьшения запаса (ручное уменьшение всегда возможно, даже если активировано правило автоматического уменьшения)
+RuleForStockManagementIncrease=Выберите Правило для автоматического увеличения запаса (ручное увеличение всегда возможно, даже если активировано правило автоматического увеличения)
+DeStockOnBill=Уменьшение реальных запасов при проверке счета-фактуры / кредитового авизо клиента
+DeStockOnValidateOrder=Уменьшение реальных запасов при подтверждении заказа на продажу
+DeStockOnShipment=Уменьшите реальные запасы при проверке доставки
+DeStockOnShipmentOnClosing=Уменьшите реальные запасы, когда отгрузка закрыта
+ReStockOnBill=Увеличение реальных запасов при проверке счета-фактуры / кредитового авизо поставщика
+ReStockOnValidateOrder=Увеличение реальных запасов при утверждении заказа на поставку
+ReStockOnDispatchOrder=Увеличение реальных запасов при ручной отгрузке на склад, после поступления товара на заказ.
+StockOnReception=Увеличение реальных запасов при подтверждении приема
+StockOnReceptionOnClosing=Увеличивайте реальные запасы, когда прием закрыт
 OrderStatusNotReadyToDispatch=Заказ еще не или не более статуса, который позволяет отправку товаров на складе склады.
-StockDiffPhysicTeoric=Explanation for difference between physical and virtual stock
+StockDiffPhysicTeoric=Объяснение разницы между физическим и виртуальным складом
 NoPredefinedProductToDispatch=Нет предопределенного продуктов для данного объекта. Так что не диспетчеризации в акции не требуется.
 DispatchVerb=Отправка
 StockLimitShort=Граница предупреждения
 StockLimit=Граница предупреждения о запасе на складе
-StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
-PhysicalStock=Physical Stock
+StockLimitDesc=(пусто) означает отсутствие предупреждения. <br> 0 может использоваться для запуска предупреждения, как только запас заканчивается.
+PhysicalStock=Физический запас
 RealStock=Real фондовая
-RealStockDesc=Physical/real stock is the stock currently in the warehouses.
-RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
+RealStockDesc=Физические / реальные запасы - это запасы, находящиеся в настоящее время на складах.
+RealStockWillAutomaticallyWhen=Реальный запас будет изменен в соответствии с этим правилом (как определено в модуле Stock):
 VirtualStock=Виртуальный запас
-VirtualStockAtDate=Virtual stock at date
-VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen date will be finished
-VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
-AtDate=At date
+VirtualStockAtDate=Виртуальный запас на дату
+VirtualStockAtDateDesc=Виртуальный запас, когда все отложенные заказы, которые планируется обработать до выбранной даты, будут завершены
+VirtualStockDesc=Виртуальный запас - это рассчитанный запас, доступный после того, как все открытые / ожидающие действия (которые влияют на запасы) закрыты (полученные заказы на покупку, отправленные заказы на продажу, созданные заказы на производство и т. Д.)
+AtDate=На дату
 IdWarehouse=Идентификатор склад
 DescWareHouse=Описание склада
 LieuWareHouse=Локализация склад
 WarehousesAndProducts=Склады и продукты
-WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
+WarehousesAndProductsBatchDetail=Склады и продукция (с детализацией по партии / серии)
 AverageUnitPricePMPShort=Значение
-AverageUnitPricePMPDesc=The input average unit price we had to expense to get 1 unit of product into our stock.
+AverageUnitPricePMPDesc=Входная средняя цена за единицу, которую мы должны были потратить, чтобы получить 1 единицу продукта на нашем складе.
 SellPriceMin=Продажа Цена за штуку
-EstimatedStockValueSellShort=Value for sell
-EstimatedStockValueSell=Value for sell
+EstimatedStockValueSellShort=Цена на продажу
+EstimatedStockValueSell=Цена на продажу
 EstimatedStockValueShort=Ориентировочная стоимость товарно-материальных запасов
 EstimatedStockValue=Ориентировочная стоимость товарно-материальных запасов
 DeleteAWarehouse=Удалить склад
-ConfirmDeleteWarehouse=Are you sure you want to delete the warehouse <b>%s</b>?
+ConfirmDeleteWarehouse=Вы действительно хотите удалить склад <b> %s </b>?
 PersonalStock=Личный %s складе
 ThisWarehouseIsPersonalStock=Этот склад представляет собой персональный запас %s %s
 SelectWarehouseForStockDecrease=Выберите хранилище, чтобы использовать для снижения акции
 SelectWarehouseForStockIncrease=Выберите склад для использования в запас увеличения
-NoStockAction=No stock action
-DesiredStock=Desired Stock
-DesiredStockDesc=This stock amount will be the value used to fill the stock by replenishment feature.
+NoStockAction=Нет акции
+DesiredStock=Желаемый запас
+DesiredStockDesc=Эта сумма запаса будет значением, используемым для пополнения запаса с помощью функции пополнения.
 StockToBuy=На заказ
 Replenishment=Пополнение
 ReplenishmentOrders=Заказ на пополнение
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
-UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
-ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
+VirtualDiffersFromPhysical=В зависимости от опций увеличения / уменьшения запаса физические запасы и виртуальные запасы (физические запасы + открытые заказы) могут отличаться.
+UseRealStockByDefault=Используйте реальный запас вместо виртуального для функции пополнения
+ReplenishmentCalculation=Сумма заказа будет (желаемое количество - реальный запас) вместо (желаемое количество - виртуальный запас)
 UseVirtualStock=Использовать виртуальный склад
 UsePhysicalStock=Использовать физические запасы
-CurentSelectionMode=Current selection mode
+CurentSelectionMode=Текущий режим выбора
 CurentlyUsingVirtualStock=Виртуальный запас
 CurentlyUsingPhysicalStock=Физический запас
 RuleForStockReplenishment=Правило для пополнения запасов
-SelectProductWithNotNullQty=Select at least one product with a qty not null and a vendor
+SelectProductWithNotNullQty=Выберите хотя бы один продукт с кол-во, не равным нулю, и поставщика
 AlertOnly= Только предупреждения
-IncludeProductWithUndefinedAlerts = Include also negative stock for products with no desired quantity defined, to restore them to 0
+IncludeProductWithUndefinedAlerts = Включите также отрицательный запас для продуктов, количество которых не определено, чтобы восстановить их до 0.
 WarehouseForStockDecrease=Склад <b>%s</b> будет использован для уменьшения остатка
 WarehouseForStockIncrease=Склад <b>%s</b> будет использован для увеличения остатка
 ForThisWarehouse=Для этого склада
-ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create purchase orders to fill the difference.
-ReplenishmentStatusDescPerWarehouse=If you want a replenishment based on desired quantity defined per warehouse, you must add a filter on the warehouse.
-ReplenishmentOrdersDesc=This is a list of all open purchase orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
+ReplenishmentStatusDesc=Это список всех продуктов, запас которых ниже желаемого (или ниже значения предупреждения, если установлен флажок «Только предупреждение»). Используя флажок, вы можете создавать заказы на покупку, чтобы компенсировать разницу.
+ReplenishmentStatusDescPerWarehouse=Если вы хотите пополнить запасы на основе желаемого количества, определенного для каждого склада, вы должны добавить фильтр на склад.
+ReplenishmentOrdersDesc=Это список всех открытых заказов на покупку, включая предварительно определенные продукты. Здесь отображаются только открытые заказы на предопределенные продукты, поэтому заказы, которые могут повлиять на запасы, видны здесь.
 Replenishments=Пополнения
 NbOfProductBeforePeriod=Количество продукта %s в остатке на начало выбранного периода (< %s)
 NbOfProductAfterPeriod=Количество продукта %s в остатке на конец выбранного периода (< %s)
 MassMovement=Массовое перемещение
-SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
-RecordMovement=Record transfer
+SelectProductInAndOutWareHouse=Выберите исходный склад и целевой склад, продукт и количество, затем щелкните «%s». Как только это будет сделано для всех необходимых перемещений, нажмите «%s».
+RecordMovement=Запись передачи
 ReceivingForSameOrder=Получатели заказа
 StockMovementRecorded=Перемещения остатков записаны
 RuleForStockAvailability=Правила и требования к запасу на складе
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever the rule for automatic stock change)
-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 the 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 the rule for automatic stock change)
-MovementLabel=Label of movement
-TypeMovement=Direction of movement
-DateMovement=Date of movement
-InventoryCode=Movement or inventory code
-IsInPackage=Contained into package
-WarehouseAllowNegativeTransfer=Stock can be negative
-qtyToTranferIsNotEnough=You don't have enough stock from your source warehouse and your setup does not allow negative stocks.
-qtyToTranferLotIsNotEnough=You don't have enough stock, for this lot number, from your source warehouse and your setup does not allow negative stocks (Qty for product '%s' with lot '%s' is %s in warehouse '%s').
+StockMustBeEnoughForInvoice=Уровень запасов должен быть достаточным, чтобы добавить продукт / услугу в счет-фактуру (проверка выполняется на текущих реальных запасах при добавлении строки в счет-фактуру, независимо от правила автоматического изменения запасов)
+StockMustBeEnoughForOrder=Уровень запасов должен быть достаточным для добавления продукта / услуги в заказ (проверка выполняется на текущих реальных запасах при добавлении строки в заказ, независимо от правила автоматического изменения запасов)
+StockMustBeEnoughForShipment= Уровень запаса должен быть достаточным для добавления продукта / услуги к отгрузке (проверка выполняется на текущем реальном запасе при добавлении строки в отгрузку, независимо от правила автоматического изменения запаса)
+MovementLabel=Ярлык движения
+TypeMovement=Направление движения
+DateMovement=Дата движения
+InventoryCode=Код движения или инвентарный код
+IsInPackage=Содержится в упаковке
+WarehouseAllowNegativeTransfer=Наличие может быть отрицательным
+qtyToTranferIsNotEnough=У вас недостаточно запасов на исходном складе, и ваша установка не допускает отрицательных запасов.
+qtyToTranferLotIsNotEnough=У вас недостаточно запасов для этого номера партии на исходном складе, и ваша установка не допускает отрицательных запасов (количество для продукта «%s» с лотом «%s» равно %s на складе «%s»).
 ShowWarehouse=Просмотр склада
-MovementCorrectStock=Stock correction for product %s
+MovementCorrectStock=Поправка на запас для продукта %s
 MovementTransferStock=Перевозка товара %s на другой склад
-InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to open purchase order
+InventoryCodeShort=Инв. / Мов. код
+NoPendingReceptionOnSupplierOrder=Нет ожидающих приема из-за открытого заказа на поставку
 ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
-OpenAll=Open for all actions
-OpenInternal=Open only for internal actions
-UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on purchase order reception
-OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a product has several selling price so value for sell can't be calculated
-ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock correctly created
-ProductStockWarehouseUpdated=Stock limit for alert and desired optimal stock correctly updated
-ProductStockWarehouseDeleted=Stock limit for alert and desired optimal stock correctly deleted
-AddNewProductStockWarehouse=Set new limit for alert and desired optimal stock
-AddStockLocationLine=Decrease quantity then click to add another warehouse for this product
-InventoryDate=Inventory date
-NewInventory=New inventory
-inventorySetup = Inventory Setup
-inventoryCreatePermission=Create new inventory
-inventoryReadPermission=View inventories
-inventoryWritePermission=Update inventories
-inventoryValidatePermission=Validate inventory
-inventoryDeletePermission=Delete inventory
+OpenAll=Открыт для всех действий
+OpenInternal=Открыт только для внутренних действий
+UseDispatchStatus=Используйте статус отправки (одобрение / отказ) для линейки продуктов при приеме заказа на поставку.
+OptionMULTIPRICESIsOn=Включена опция «несколько цен на сегмент». Это означает, что товар имеет несколько продажных цен, поэтому стоимость продажи не может быть рассчитана.
+ProductStockWarehouseCreated=Правильно установлен лимит запаса для предупреждения и желаемый оптимальный запас
+ProductStockWarehouseUpdated=Правильно обновлен лимит запаса для оповещения и желаемый оптимальный запас
+ProductStockWarehouseDeleted=Правильно удален лимит запасов для предупреждения и желаемый оптимальный запас
+AddNewProductStockWarehouse=Установите новый лимит для предупреждений и желаемый оптимальный запас
+AddStockLocationLine=Уменьшите количество, затем нажмите, чтобы добавить еще один склад для этого продукта
+InventoryDate=Дата инвентаризации
+NewInventory=Новый инвентарь
+inventorySetup = Настройка инвентаря
+inventoryCreatePermission=Создать новый инвентарь
+inventoryReadPermission=Просмотр инвентаря
+inventoryWritePermission=Обновить инвентарь
+inventoryValidatePermission=Проверить инвентарь
+inventoryDeletePermission=Удалить инвентарь
 inventoryTitle=Инвентарная ведомость
-inventoryListTitle=Inventories
-inventoryListEmpty=No inventory in progress
-inventoryCreateDelete=Create/Delete inventory
-inventoryCreate=Create new
+inventoryListTitle=Запасы
+inventoryListEmpty=Инвентаризация не ведется
+inventoryCreateDelete=Создать / удалить инвентарь
+inventoryCreate=Создать новое
 inventoryEdit=Редактировать
 inventoryValidate=Утверждена
 inventoryDraft=В работе
-inventorySelectWarehouse=Warehouse choice
+inventorySelectWarehouse=Выбор склада
 inventoryConfirmCreate=Создать
-inventoryOfWarehouse=Inventory for warehouse: %s
-inventoryErrorQtyAdd=Error: one quantity is less than zero
-inventoryMvtStock=By inventory
-inventoryWarningProductAlreadyExists=This product is already into list
+inventoryOfWarehouse=Инвентарь на складе: %s
+inventoryErrorQtyAdd=Ошибка: одно количество меньше нуля
+inventoryMvtStock=По инвентарю
+inventoryWarningProductAlreadyExists=Этот товар уже в списке
 SelectCategory=Категория фильтр
-SelectFournisseur=Vendor filter
+SelectFournisseur=Фильтр поставщиков
 inventoryOnDate=Инвентарная ведомость
-INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date of inventory (instead of the date of inventory validation)
-inventoryChangePMPPermission=Allow to change PMP value for a product
-ColumnNewPMP=New unit PMP
-OnlyProdsInStock=Do not add product without stock
-TheoricalQty=Theorique qty
-TheoricalValue=Theorique qty
-LastPA=Last BP
-CurrentPA=Curent BP
-RecordedQty=Recorded Qty
-RealQty=Real Qty
-RealValue=Real Value
-RegulatedQty=Regulated Qty
-AddInventoryProduct=Add product to inventory
+INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Движение запасов будет иметь дату инвентаризации (вместо даты проверки запасов)
+inventoryChangePMPPermission=Разрешить изменять значение PMP для продукта
+ColumnNewPMP=Новый агрегат ПМП
+OnlyProdsInStock=Не добавляйте товар без наличия на складе
+TheoricalQty=Теория кол-во
+TheoricalValue=Теория кол-во
+LastPA=Последний БП
+CurrentPA=Текущий БП
+RecordedQty=Записанное количество
+RealQty=Реальное количество
+RealValue=Реальная стоимость
+RegulatedQty=Регулируемое количество
+AddInventoryProduct=Добавить товар в инвентарь
 AddProduct=Добавить
-ApplyPMP=Apply PMP
-FlushInventory=Flush inventory
-ConfirmFlushInventory=Do you confirm this action?
-InventoryFlushed=Inventory flushed
-ExitEditMode=Exit edition
+ApplyPMP=Применить PMP
+FlushInventory=Очистить инвентарь
+ConfirmFlushInventory=Вы подтверждаете это действие?
+InventoryFlushed=Инвентарь сброшен
+ExitEditMode=Выйти из редакции
 inventoryDeleteLine=Удалить строки
-RegulateStock=Regulate Stock
+RegulateStock=Регулировать запас
 ListInventory=Список
-StockSupportServices=Stock management supports Services
-StockSupportServicesDesc=By default, you can stock only products of type "product". You may also stock a product of type "service" if both module Services and this option are enabled.
-ReceiveProducts=Receive items
-StockIncreaseAfterCorrectTransfer=Increase by correction/transfer
-StockDecreaseAfterCorrectTransfer=Decrease by correction/transfer
-StockIncrease=Stock increase
-StockDecrease=Stock decrease
-InventoryForASpecificWarehouse=Inventory for a specific warehouse
-InventoryForASpecificProduct=Inventory for a specific product
-StockIsRequiredToChooseWhichLotToUse=Stock is required to choose which lot to use
-ForceTo=Force to
-AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (Warning: This may decrease dramatically performances)
-StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
-StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
-CurrentStock=Current stock
-InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Fill real qty by scaning
-UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|serial barcode)
-DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
-ImportFromCSV=Import CSV list of movement
-ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
-SelectAStockMovementFileToImport=select a stock movement file to import
-InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
-LabelOfInventoryMovemement=Inventory %s
+StockSupportServices=Управление запасами поддерживает услуги
+StockSupportServicesDesc=По умолчанию вы можете хранить только продукты типа «продукт». Вы также можете хранить продукт типа «услуга», если включены и модуль «Услуги», и эта опция.
+ReceiveProducts=Получать предметы
+StockIncreaseAfterCorrectTransfer=Увеличение путем коррекции / переноса
+StockDecreaseAfterCorrectTransfer=Уменьшение путем коррекции / переноса
+StockIncrease=Увеличение запасов
+StockDecrease=Уменьшение запасов
+InventoryForASpecificWarehouse=Инвентарь для конкретного склада
+InventoryForASpecificProduct=Инвентарь для конкретного продукта
+StockIsRequiredToChooseWhichLotToUse=Требуется запас, чтобы выбрать, какую партию использовать
+ForceTo=Заставить
+AlwaysShowFullArbo=Отображать полное дерево склада во всплывающем окне со ссылками на склад (Предупреждение: это может значительно снизить производительность)
+StockAtDatePastDesc=Здесь вы можете просмотреть запасы (реальные запасы) на заданную дату в прошлом
+StockAtDateFutureDesc=Здесь вы можете просмотреть акции (виртуальные акции) на определенную дату в будущем.
+CurrentStock=Текущий запас
+InventoryRealQtyHelp=Установите значение 0 для сброса количества <br> Оставьте поле пустым или удалите строку, чтобы оставить без изменений
+UpdateByScaning=Заполните реальное количество сканированием
+UpdateByScaningProductBarcode=Обновление путем сканирования (штрих-код продукта)
+UpdateByScaningLot=Обновление сканированием (партия | серийный штрих-код)
+DisableStockChangeOfSubProduct=Деактивируйте замену запаса для всех вспомогательных продуктов этого набора во время этого движения.
+ImportFromCSV=Импортировать CSV-список движения
+ChooseFileToImport=Загрузите файл, затем щелкните значок %s, чтобы выбрать файл в качестве исходного файла импорта ...
+SelectAStockMovementFileToImport=выберите файл движения запаса для импорта
+InfoTemplateImport=Загружаемый файл должен иметь следующий формат (* обязательные поля): <br> Source Warehouse * | Целевой склад * | Продукт * | Количество * | Номер лота / серийный номер <br> Разделитель символов CSV должен иметь вид «<b> %s </b>».
+LabelOfInventoryMovemement=Инвентарь %s
 ReOpen=Открыть заново
-ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
-ObjectNotFound=%s not found
-MakeMovementsAndClose=Generate movements and close
-AutofillWithExpected=Fill real quantity with expected quantity
+ConfirmFinish=Вы подтверждаете закрытие инвентаря? Это будет генерировать все движения запаса, чтобы обновить ваш запас до реального количества, которое вы ввели в инвентарь.
+ObjectNotFound=%s не найден
+MakeMovementsAndClose=Создайте движения и закройте
+AutofillWithExpected=Заполните реальное количество ожидаемым количеством
+ShowAllBatchByDefault=По умолчанию, детали партии продукта отображаются на вкладке "склад"
+CollapseBatchDetailHelp=Вы можете установить отображение деталей партии по умолчанию в конфигурации модуля запасы
+FieldCannotBeNegative=Поле "%s" не может быть отрицательным
diff --git a/htdocs/langs/ru_RU/stripe.lang b/htdocs/langs/ru_RU/stripe.lang
index 7f3d995c77b..de4d426c594 100644
--- a/htdocs/langs/ru_RU/stripe.lang
+++ b/htdocs/langs/ru_RU/stripe.lang
@@ -1,72 +1,71 @@
 # Dolibarr language file - Source file is en_US - stripe
-StripeSetup=Stripe module setup
-StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make ad-hoc payments or for payments related to a particular Dolibarr object (invoice, order, ...)
-StripeOrCBDoPayment=Pay with credit card or Stripe
+StripeSetup=Настройка модуля Stripe
+StripeDesc=Предложите клиентам страницу онлайн-платежей Stripe для платежей с помощью кредитных / cebit карт через <a href="http://www.stripe.com" target="_blank"> Stripe </a>. Это может быть использовано, чтобы позволить вашим клиентам совершать специальные платежи или для платежей, связанных с конкретным объектом Dolibarr (счет-фактура, заказ, ...)
+StripeOrCBDoPayment=Оплата кредитной картой или Stripe
 FollowingUrlAreAvailableToMakePayments=После URL, можно предложить страницу к клиенту сделать платеж по Dolibarr объектов
 PaymentForm=Форма оплаты
-WelcomeOnPaymentPage=Welcome to our online payment service
+WelcomeOnPaymentPage=Добро пожаловать в нашу службу онлайн-платежей
 ThisScreenAllowsYouToPay=На этом экране можно сделать онлайн-платежей для %s.
 ThisIsInformationOnPayment=Это данные по оплате делать
 ToComplete=Для завершения
 YourEMail=Электронная почта для подтверждения оплаты
-STRIPE_PAYONLINE_SENDEMAIL=Email notification after a payment attempt (success or fail)
+STRIPE_PAYONLINE_SENDEMAIL=Уведомление по электронной почте после попытки платежа (успешной или неудачной)
 Creditor=Кредитор
 PaymentCode=Код платежа
-StripeDoPayment=Pay with Stripe
-YouWillBeRedirectedOnStripe=You will be redirected on secured Stripe page to input you credit card information
+StripeDoPayment=Плати с полосой
+YouWillBeRedirectedOnStripe=Вы будете перенаправлены на защищенную страницу Stripe для ввода информации о вашей кредитной карте.
 Continue=Дальше
 ToOfferALinkForOnlinePayment=URL-адрес для оплаты %s
-ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment page for a sales order
-ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment page for a customer invoice
-ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment page for a contract line
-ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment page of any amount with no existing object
-ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment page for a member subscription
-ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment page for payment of a donation
-YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (mandatory only for payment not linked to an object) to add your own payment comment tag.<br>For the URL of payments with no existing object, you may also add the parameter <strong>&noidempotency=1</strong> so the same link with same tag can be used several times (some payment mode may limit the payment to 1 for each different link without this parameter)
-SetupStripeToHavePaymentCreatedAutomatically=Setup your Stripe with url <b>%s</b> to have payment created automatically when validated by Stripe.
+ToOfferALinkForOnlinePaymentOnOrder=URL-адрес страницы онлайн-оплаты %s для заказа на продажу
+ToOfferALinkForOnlinePaymentOnInvoice=URL-адрес для предложения страницы онлайн-оплаты %s для счета-фактуры клиента
+ToOfferALinkForOnlinePaymentOnContractLine=URL для предложения страницы онлайн-оплаты %s для строки контракта
+ToOfferALinkForOnlinePaymentOnFreeAmount=URL для предложения страницы онлайн-платежей %s на любую сумму без существующего объекта
+ToOfferALinkForOnlinePaymentOnMemberSubscription=URL-адрес страницы онлайн-оплаты %s для подписки на членство
+ToOfferALinkForOnlinePaymentOnDonation=URL-адрес страницы онлайн-платежа %s для оплаты пожертвования
+YouCanAddTagOnUrl=Вы также можете добавить параметр URL <b> & tag = <i>, значение </i> </b> к любому из этих URL (обязательно только для платежа, не связанного с объектом), чтобы добавить свой собственный тег комментария к платежу. <br> Для URL-адреса платежей без существующего объекта вы также можете добавить параметр <strong> & noidempotency = 1 </strong>, чтобы одну и ту же ссылку с одним и тем же тегом можно было использовать несколько раз (в некоторых режимах оплаты может быть ограничен платеж до 1 для каждой ссылки без этого параметр)
+SetupStripeToHavePaymentCreatedAutomatically=Настройте Stripe с URL-адресом <b> %s </b>, чтобы платеж создавался автоматически при подтверждении Stripe.
 AccountParameter=Счет параметры
 UsageParameter=Использование параметров
 InformationToFindParameters=Помогите найти %s информацию об учетной записи
-STRIPE_CGI_URL_V2=Url of Stripe CGI module for payment
-VendorName=Имя поставщика
+STRIPE_CGI_URL_V2=URL модуля Stripe CGI для оплаты
 CSSUrlForPaymentForm=CSS-стилей URL для оплаты форме
-NewStripePaymentReceived=New Stripe payment received
-NewStripePaymentFailed=New Stripe payment tried but failed
-FailedToChargeCard=Failed to charge card
-STRIPE_TEST_SECRET_KEY=Secret test key
-STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
-STRIPE_TEST_WEBHOOK_KEY=Webhook test key
-STRIPE_LIVE_SECRET_KEY=Secret live key
-STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
-STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
-ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
-StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
-StripeImportPayment=Import Stripe payments
-ExampleOfTestCreditCard=Example of credit card for test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
-StripeGateways=Stripe gateways
-OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
-OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
-BankAccountForBankTransfer=Bank account for fund payouts
-StripeAccount=Stripe account
-StripeChargeList=List of Stripe charges
-StripeTransactionList=List of Stripe transactions
-StripeCustomerId=Stripe customer id
-StripePaymentModes=Stripe payment modes
-LocalID=Local ID
-StripeID=Stripe ID
-NameOnCard=Name on card
-CardNumber=Card Number
-ExpiryDate=Expiry Date
+NewStripePaymentReceived=Получен платеж New Stripe
+NewStripePaymentFailed=Платеж New Stripe попытался, но не удалось
+FailedToChargeCard=Не удалось снять деньги с карты
+STRIPE_TEST_SECRET_KEY=Секретный тестовый ключ
+STRIPE_TEST_PUBLISHABLE_KEY=Публикуемый тестовый ключ
+STRIPE_TEST_WEBHOOK_KEY=Тестовый ключ Webhook
+STRIPE_LIVE_SECRET_KEY=Секретный живой ключ
+STRIPE_LIVE_PUBLISHABLE_KEY=Публикуемый живой ключ
+STRIPE_LIVE_WEBHOOK_KEY=Живой ключ Webhook
+ONLINE_PAYMENT_WAREHOUSE=Запасы, используемые для уменьшения запасов при онлайн-оплате <br> (TODO Когда опция уменьшения запасов выполняется для действия со счетом-фактурой, и онлайн-платеж генерирует счет-фактуру самостоятельно?)
+StripeLiveEnabled=Полоса в реальном времени включена (в противном случае тестовый режим / режим песочницы)
+StripeImportPayment=Платежи Import Stripe
+ExampleOfTestCreditCard=Пример кредитной карты для тестирования: %s => действителен, %s => ошибка CVC, %s => истек срок действия, %s => заряд не производится
+StripeGateways=Stripe-шлюзы
+OAUTH_STRIPE_TEST_ID=Идентификатор клиента Stripe Connect (ca _...)
+OAUTH_STRIPE_LIVE_ID=Идентификатор клиента Stripe Connect (ca _...)
+BankAccountForBankTransfer=Банковский счет для выплаты средств
+StripeAccount=Stripe аккаунт
+StripeChargeList=Список начислений Stripe
+StripeTransactionList=Список транзакций Stripe
+StripeCustomerId=Идентификатор клиента Stripe
+StripePaymentModes=Режимы оплаты Stripe
+LocalID=Локальный идентификатор
+StripeID=Идентификатор полосы
+NameOnCard=Имя на карте
+CardNumber=Номер карты
+ExpiryDate=Дата истечения срока
 CVN=CVN
-DeleteACard=Delete Card
-ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
-CreateCustomerOnStripe=Create customer on Stripe
-CreateCardOnStripe=Create card on Stripe
-ShowInStripe=Show in Stripe
-StripeUserAccountForActions=User account to use for email notification of some Stripe events (Stripe payouts)
-StripePayoutList=List of Stripe payouts
-ToOfferALinkForTestWebhook=Link to setup Stripe WebHook to call the IPN (test mode)
-ToOfferALinkForLiveWebhook=Link to setup Stripe WebHook to call the IPN (live mode)
-PaymentWillBeRecordedForNextPeriod=Payment will be recorded for the next period.
-ClickHereToTryAgain=<a href="%s">Click here to try again...</a>
-CreationOfPaymentModeMustBeDoneFromStripeInterface=Due to Strong Customer Authentication rules, creation of a card must be done from Stripe backoffice. You can click here to switch on Stripe customer record: %s
+DeleteACard=Удалить карту
+ConfirmDeleteCard=Вы действительно хотите удалить эту кредитную или дебетовую карту?
+CreateCustomerOnStripe=Создать клиента на Stripe
+CreateCardOnStripe=Создать карту на Stripe
+ShowInStripe=Показать в полосе
+StripeUserAccountForActions=Учетная запись пользователя, используемая для уведомления по электронной почте о некоторых событиях Stripe (выплаты Stripe)
+StripePayoutList=Список выплат Stripe
+ToOfferALinkForTestWebhook=Ссылка на настройку Stripe WebHook для вызова IPN (тестовый режим)
+ToOfferALinkForLiveWebhook=Ссылка на настройку Stripe WebHook для вызова IPN (режим реального времени)
+PaymentWillBeRecordedForNextPeriod=Выплата будет записана за следующий период.
+ClickHereToTryAgain= <a href="%s"> Нажмите здесь, чтобы попробовать еще раз ... </a>
+CreationOfPaymentModeMustBeDoneFromStripeInterface=Из-за правил строгой аутентификации клиентов создание карты должно производиться из бэк-офиса Stripe. Вы можете щелкнуть здесь, чтобы включить запись клиента Stripe: %s
diff --git a/htdocs/langs/ru_RU/supplier_proposal.lang b/htdocs/langs/ru_RU/supplier_proposal.lang
index 84cacfa5c08..14974596343 100644
--- a/htdocs/langs/ru_RU/supplier_proposal.lang
+++ b/htdocs/langs/ru_RU/supplier_proposal.lang
@@ -1,30 +1,30 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=Vendor commercial proposals
-supplier_proposalDESC=Manage price requests to suppliers
+SupplierProposal=Коммерческие предложения от вендора
+supplier_proposalDESC=Управляйте ценовыми запросами поставщиков
 SupplierProposalNew= Новый запрос цены
-CommRequest=Price request
+CommRequest=Запрос цены
 CommRequests=Запросы цены
-SearchRequest=Find a request
-DraftRequests=Draft requests
-SupplierProposalsDraft=Draft vendor proposals
-LastModifiedRequests=Latest %s modified price requests
-RequestsOpened=Open price requests
-SupplierProposalArea=Vendor proposals area
-SupplierProposalShort=Vendor proposal
+SearchRequest=Найти заявку
+DraftRequests=Черновики запросов
+SupplierProposalsDraft=Проект предложений поставщика
+LastModifiedRequests=Последние измененные ценовые запросы %s
+RequestsOpened=Открытые ценовые запросы
+SupplierProposalArea=Область предложений поставщиков
+SupplierProposalShort=Предложение продавца
 SupplierProposals=Предложения поставщиков
 SupplierProposalsShort=Предложения поставщиков
-AskPrice=Price request
+AskPrice=Запрос цены
 NewAskPrice= Новый запрос цены
-ShowSupplierProposal=Show price request
-AddSupplierProposal=Create a price request
-SupplierProposalRefFourn=Vendor ref
+ShowSupplierProposal=Показать ценовой запрос
+AddSupplierProposal=Создать ценовой запрос
+SupplierProposalRefFourn=Ссылка поставщика
 SupplierProposalDate=Дата доставки
-SupplierProposalRefFournNotice=Before closing to "Accepted", think to grasp suppliers references.
-ConfirmValidateAsk=Are you sure you want to validate this price request under name <b>%s</b>?
-DeleteAsk=Delete request
-ValidateAsk=Validate request
+SupplierProposalRefFournNotice=Прежде чем перейти к «Принято», подумайте о том, чтобы изучить отзывы поставщиков.
+ConfirmValidateAsk=Вы действительно хотите подтвердить этот ценовой запрос от имени <b> %s </b>?
+DeleteAsk=Удалить запрос
+ValidateAsk=Подтвердить запрос
 SupplierProposalStatusDraft=Проект (должно быть подтверждено)
-SupplierProposalStatusValidated=Validated (request is open)
+SupplierProposalStatusValidated=Подтверждено (запрос открыт)
 SupplierProposalStatusClosed=Закрыты
 SupplierProposalStatusSigned=Принято
 SupplierProposalStatusNotSigned=Отклонено
@@ -33,26 +33,26 @@ SupplierProposalStatusValidatedShort=Утверждена
 SupplierProposalStatusClosedShort=Закрыты
 SupplierProposalStatusSignedShort=Принято
 SupplierProposalStatusNotSignedShort=Отклонено
-CopyAskFrom=Create a price request by copying an existing request
-CreateEmptyAsk=Create blank request
-ConfirmCloneAsk=Are you sure you want to clone the price request <b>%s</b>?
-ConfirmReOpenAsk=Are you sure you want to open back the price request <b>%s</b>?
-SendAskByMail=Send price request by mail
-SendAskRef=Sending the price request %s
-SupplierProposalCard=Request card
-ConfirmDeleteAsk=Are you sure you want to delete this price request <b>%s</b>?
-ActionsOnSupplierProposal=Events on price request
-DocModelAuroreDescription=A complete request model (logo...)
-CommercialAsk=Price request
+CopyAskFrom=Создайте ценовой запрос, скопировав существующий запрос
+CreateEmptyAsk=Создать пустой запрос
+ConfirmCloneAsk=Вы действительно хотите клонировать запрос цены <b> %s </b>?
+ConfirmReOpenAsk=Вы действительно хотите открыть ценовой запрос <b> %s </b>?
+SendAskByMail=Отправить запрос цены по почте
+SendAskRef=Отправка ценового запроса %s
+SupplierProposalCard=Запросить карту
+ConfirmDeleteAsk=Вы действительно хотите удалить этот ценовой запрос <b> %s </b>?
+ActionsOnSupplierProposal=События по запросу цены
+DocModelAuroreDescription=Полная модель запроса (логотип ...)
+CommercialAsk=Запрос цены
 DefaultModelSupplierProposalCreate=Создание модели по умолчанию
-DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
-DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
-ListOfSupplierProposals=List of vendor proposal requests
-ListSupplierProposalsAssociatedProject=List of vendor proposals associated with project
-SupplierProposalsToClose=Vendor proposals to close
-SupplierProposalsToProcess=Vendor proposals to process
-LastSupplierProposals=Latest %s price requests
-AllPriceRequests=All requests
-TypeContact_supplier_proposal_external_SHIPPING=Vendor contact for delivery
-TypeContact_supplier_proposal_external_BILLING=Vendor contact for billing
+DefaultModelSupplierProposalToBill=Шаблон по умолчанию при закрытии запроса цены (принято)
+DefaultModelSupplierProposalClosed=Шаблон по умолчанию при закрытии запроса цены (отказано)
+ListOfSupplierProposals=Список запросов предложений поставщиков
+ListSupplierProposalsAssociatedProject=Список предложений поставщиков, связанных с проектом
+SupplierProposalsToClose=Предложения продавца закрыть
+SupplierProposalsToProcess=Предложения поставщика для обработки
+LastSupplierProposals=Последние запросы цен на %s
+AllPriceRequests=Все запросы
+TypeContact_supplier_proposal_external_SHIPPING=Контакт с продавцом для доставки
+TypeContact_supplier_proposal_external_BILLING=Контактное лицо поставщика для выставления счетов
 TypeContact_supplier_proposal_external_SERVICE=Представитель следующие меры предложение
diff --git a/htdocs/langs/ru_RU/suppliers.lang b/htdocs/langs/ru_RU/suppliers.lang
index bbfecb4779f..ce663a11842 100644
--- a/htdocs/langs/ru_RU/suppliers.lang
+++ b/htdocs/langs/ru_RU/suppliers.lang
@@ -1,49 +1,49 @@
 # Dolibarr language file - Source file is en_US - vendors
 Suppliers=Поставщики
-SuppliersInvoice=Vendor invoice
+SuppliersInvoice=Счет поставщика
 SupplierInvoices=Счета-фактуры поставщика
-ShowSupplierInvoice=Show Vendor Invoice
+ShowSupplierInvoice=Показать счет поставщика
 NewSupplier=Новый поставщик
 History=История
 ListOfSuppliers=Список поставщиков
-ShowSupplier=Show vendor
+ShowSupplier=Показать продавца
 OrderDate=Дата заказа
-BuyingPriceMin=Best buying price
-BuyingPriceMinShort=Best buying price
+BuyingPriceMin=Лучшая цена покупки
+BuyingPriceMinShort=Лучшая цена покупки
 TotalBuyingPriceMinShort=Итог закупочных цен подтоваров
-TotalSellingPriceMinShort=Total of subproducts selling prices
+TotalSellingPriceMinShort=Итого отпускных цен на субпродукты
 SomeSubProductHaveNoPrices=Для некоторых подтоваров не указана цена
-AddSupplierPrice=Add buying price
-ChangeSupplierPrice=Change buying price
-SupplierPrices=Vendor prices
-ReferenceSupplierIsAlreadyAssociatedWithAProduct=This vendor reference is already associated with a product: %s
-NoRecordedSuppliers=No vendor recorded
-SupplierPayment=Vendor payment
-SuppliersArea=Vendor area
+AddSupplierPrice=Добавить закупочную цену
+ChangeSupplierPrice=Изменить цену покупки
+SupplierPrices=Цены от поставщиков
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=Эта ссылка на поставщика уже связана с продуктом: %s
+NoRecordedSuppliers=Поставщик не зарегистрирован
+SupplierPayment=Оплата продавцу
+SuppliersArea=Торговая площадка
 RefSupplierShort=Ref. поставщик
 Availability=Доступность
-ExportDataset_fournisseur_1=Vendor invoices and invoice details
-ExportDataset_fournisseur_2=Vendor invoices and payments
-ExportDataset_fournisseur_3=Purchase orders and order details
+ExportDataset_fournisseur_1=Счета-фактуры поставщика и подробные сведения о нем
+ExportDataset_fournisseur_2=Счета и платежи поставщика
+ExportDataset_fournisseur_3=Заказы на покупку и детали заказа
 ApproveThisOrder=Утвердить этот заказ
-ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
+ConfirmApproveThisOrder=Вы действительно хотите одобрить заказ <b> %s </b>?
 DenyingThisOrder=Отменить этот заказ
-ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
-ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
-AddSupplierOrder=Create Purchase Order
-AddSupplierInvoice=Create vendor invoice
-ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
-SentToSuppliers=Sent to vendors
-ListOfSupplierOrders=List of purchase orders
-MenuOrdersSupplierToBill=Purchase orders to invoice
-NbDaysToDelivery=Delivery delay (days)
-DescNbDaysToDelivery=The longest delivery delay of the products from this order
-SupplierReputation=Vendor reputation
-ReferenceReputation=Reference reputation
-DoNotOrderThisProductToThisSupplier=Do not order
-NotTheGoodQualitySupplier=Low quality
-ReputationForThisProduct=Reputation
-BuyerName=Buyer name
-AllProductServicePrices=All product / service prices
-AllProductReferencesOfSupplier=All references of vendor
-BuyingPriceNumShort=Vendor prices
+ConfirmDenyingThisOrder=Вы действительно хотите отклонить этот заказ <b> %s </b>?
+ConfirmCancelThisOrder=Вы действительно хотите отменить этот заказ <b> %s </b>?
+AddSupplierOrder=Создать заказ на поставку
+AddSupplierInvoice=Создать накладную поставщика
+ListOfSupplierProductForSupplier=Список товаров и цены для продавца <b> %s </b>
+SentToSuppliers=Отправлено поставщикам
+ListOfSupplierOrders=Список заказов на поставку
+MenuOrdersSupplierToBill=Заказы на покупку в счет-фактуру
+NbDaysToDelivery=Задержка доставки (дни)
+DescNbDaysToDelivery=Самая длительная задержка доставки товаров из этого заказа
+SupplierReputation=Репутация продавца
+ReferenceReputation=Эталонная репутация
+DoNotOrderThisProductToThisSupplier=Не заказывать
+NotTheGoodQualitySupplier=Низкое качество
+ReputationForThisProduct=Репутация
+BuyerName=Имя покупателя
+AllProductServicePrices=Все цены на товары / услуги
+AllProductReferencesOfSupplier=Все ссылки производителя
+BuyingPriceNumShort=Цены от поставщиков
diff --git a/htdocs/langs/ru_RU/ticket.lang b/htdocs/langs/ru_RU/ticket.lang
index 4c4bf7788a3..17febc2ff1f 100644
--- a/htdocs/langs/ru_RU/ticket.lang
+++ b/htdocs/langs/ru_RU/ticket.lang
@@ -19,298 +19,298 @@
 #
 
 Module56000Name=Заявки
-Module56000Desc=Ticket system for issue or request management
+Module56000Desc=Билетная система для управления выдачей или запросом
 
-Permission56001=See tickets
-Permission56002=Modify tickets
-Permission56003=Delete tickets
-Permission56004=Manage tickets
-Permission56005=See tickets of all third parties (not effective for external users, always be limited to the third party they depend on)
+Permission56001=Смотреть тикеты
+Permission56002=Изменить тикеты
+Permission56003=Удалить тикеты
+Permission56004=Управлять тикетами
+Permission56005=Просмотр заявок всех третьих лиц (не действует для внешних пользователей, всегда ограничивается третьей стороной, от которой они зависят)
 
-TicketDictType=Ticket - Types
-TicketDictCategory=Ticket - Groupes
-TicketDictSeverity=Ticket - Severities
-TicketDictResolution=Ticket - Resolution
+TicketDictType=Тикет - Типы
+TicketDictCategory=Тикет - Группы
+TicketDictSeverity=Тикет - Степени серьезности
+TicketDictResolution=Тикет - Разрешение
 
-TicketTypeShortCOM=Commercial question
-TicketTypeShortHELP=Request for functionnal help
-TicketTypeShortISSUE=Issue, bug or problem
-TicketTypeShortREQUEST=Change or enhancement request
+TicketTypeShortCOM=Коммерческий вопрос
+TicketTypeShortHELP=Запрос на функциональную помощь
+TicketTypeShortISSUE=Проблема, ошибка или проблема
+TicketTypeShortREQUEST=Запрос на изменение или расширение
 TicketTypeShortPROJET=Проект
 TicketTypeShortOTHER=Другое
 
 TicketSeverityShortLOW=Низкий
-TicketSeverityShortNORMAL=Normal
+TicketSeverityShortNORMAL=Обычный
 TicketSeverityShortHIGH=Высокий
-TicketSeverityShortBLOCKING=Critical, Blocking
+TicketSeverityShortBLOCKING=Критический, Блокирующий
 
-ErrorBadEmailAddress=Field '%s' incorrect
-MenuTicketMyAssign=My tickets
-MenuTicketMyAssignNonClosed=My open tickets
-MenuListNonClosed=Open tickets
+ErrorBadEmailAddress=Поле '%s' неверно
+MenuTicketMyAssign=Мои тикеты
+MenuTicketMyAssignNonClosed=Мои открытые тикеты
+MenuListNonClosed=Открытые тикеты
 
 TypeContact_ticket_internal_CONTRIBUTOR=Содействующий
-TypeContact_ticket_internal_SUPPORTTEC=Assigned user
-TypeContact_ticket_external_SUPPORTCLI=Customer contact / incident tracking
-TypeContact_ticket_external_CONTRIBUTOR=External contributor
+TypeContact_ticket_internal_SUPPORTTEC=Назначенный пользователь
+TypeContact_ticket_external_SUPPORTCLI=Контакты с клиентами / отслеживание инцидентов
+TypeContact_ticket_external_CONTRIBUTOR=Внешний участник
 
-OriginEmail=Email source
-Notify_TICKET_SENTBYMAIL=Send ticket message by email
+OriginEmail=Источник электронной почты
+Notify_TICKET_SENTBYMAIL=Отправить билетное сообщение по электронной почте
 
 # Status
 Read=Читать
-Assigned=Assigned
+Assigned=Назначенный
 InProgress=Выполняется
-NeedMoreInformation=Waiting for information
-Answered=Answered
+NeedMoreInformation=Жду информации
+Answered=Ответил
 Waiting=Ожидание
 Closed=Закрыты
-Deleted=Deleted
+Deleted=Удалено
 
 # Dict
 Type=Тип
-Severity=Severity
-TicketGroupIsPublic=Group is public
-TicketGroupIsPublicDesc=If a ticket group is public, it will be visible in the form when creating a ticket from the public interface
+Severity=Строгость
+TicketGroupIsPublic=Группа публичная
+TicketGroupIsPublicDesc=Если группа заявок является общедоступной, она будет видна в форме при создании заявки из общедоступного интерфейса.
 
 # Email templates
-MailToSendTicketMessage=To send email from ticket message
+MailToSendTicketMessage=Чтобы отправить электронное письмо из тикетного сообщения
 
 #
 # Admin page
 #
-TicketSetup=Ticket module setup
+TicketSetup=Настройка модуля тикетов
 TicketSettings=Настройки
 TicketSetupPage=
-TicketPublicAccess=A public interface requiring no identification is available at the following url
-TicketSetupDictionaries=The type of ticket, severity and analytic codes are configurable from dictionaries
-TicketParamModule=Module variable setup
-TicketParamMail=Email setup
-TicketEmailNotificationFrom=Notification email from
-TicketEmailNotificationFromHelp=Used into ticket message answer by example
-TicketEmailNotificationTo=Notifications email to
-TicketEmailNotificationToHelp=Send email notifications to this address.
-TicketNewEmailBodyLabel=Text message sent after creating a ticket
-TicketNewEmailBodyHelp=The text specified here will be inserted into the email confirming the creation of a new ticket from the public interface. Information on the consultation of the ticket are automatically added.
-TicketParamPublicInterface=Public interface setup
-TicketsEmailMustExist=Require an existing email address to create a ticket
-TicketsEmailMustExistHelp=In the public interface, the email address should already be filled in the database to create a new ticket.
-PublicInterface=Public interface
-TicketUrlPublicInterfaceLabelAdmin=Alternative URL for public interface
-TicketUrlPublicInterfaceHelpAdmin=It is possible to define an alias to the web server and thus make available the public interface with another URL (the server must act as a proxy on this new URL)
-TicketPublicInterfaceTextHomeLabelAdmin=Welcome text of the public interface
-TicketPublicInterfaceTextHome=You can create a support ticket or view existing from its identifier tracking ticket.
-TicketPublicInterfaceTextHomeHelpAdmin=The text defined here will appear on the home page of the public interface.
-TicketPublicInterfaceTopicLabelAdmin=Interface title
-TicketPublicInterfaceTopicHelp=This text will appear as the title of the public interface.
-TicketPublicInterfaceTextHelpMessageLabelAdmin=Help text to the message entry
-TicketPublicInterfaceTextHelpMessageHelpAdmin=This text will appear above the message input area of the user.
-ExtraFieldsTicket=Extra attributes
-TicketCkEditorEmailNotActivated=HTML editor is not activated. Please put FCKEDITOR_ENABLE_MAIL content to 1 to get it.
-TicketsDisableEmail=Do not send emails for ticket creation or message recording
-TicketsDisableEmailHelp=By default, emails are sent when new tickets or messages created. Enable this option to disable *all* email notifications
-TicketsLogEnableEmail=Enable log by email
-TicketsLogEnableEmailHelp=At each change, an email will be sent **to each contact** associated with the ticket.
+TicketPublicAccess=Открытый интерфейс, не требующий идентификации, доступен по следующему URL-адресу
+TicketSetupDictionaries=Тип заявки, серьезность и аналитические коды настраиваются из словарей.
+TicketParamModule=Настройка переменных модуля
+TicketParamMail=Настройка электронной почты
+TicketEmailNotificationFrom=Уведомление по электронной почте от
+TicketEmailNotificationFromHelp=Используется в ответе на тикет-сообщение на примере
+TicketEmailNotificationTo=Уведомления по электронной почте на адрес
+TicketEmailNotificationToHelp=Отправлять уведомления по электронной почте на этот адрес.
+TicketNewEmailBodyLabel=Текстовое сообщение, отправленное после создания заявки
+TicketNewEmailBodyHelp=Указанный здесь текст будет вставлен в электронное письмо, подтверждающее создание нового билета из общедоступного интерфейса. Информация о просмотре билета добавляется автоматически.
+TicketParamPublicInterface=Настройка публичного интерфейса
+TicketsEmailMustExist=Требовать существующий адрес электронной почты для создания тикета
+TicketsEmailMustExistHelp=В общедоступном интерфейсе адрес электронной почты уже должен быть заполнен в базе данных для создания нового билета.
+PublicInterface=Публичный интерфейс
+TicketUrlPublicInterfaceLabelAdmin=Альтернативный URL для публичного интерфейса
+TicketUrlPublicInterfaceHelpAdmin=Можно определить псевдоним для веб-сервера и, таким образом, сделать доступным общедоступный интерфейс с другим URL-адресом (сервер должен действовать как прокси для этого нового URL-адреса)
+TicketPublicInterfaceTextHomeLabelAdmin=Приветственный текст публичного интерфейса
+TicketPublicInterfaceTextHome=Вы можете создать заявку в службу поддержки или просмотреть существующие из ее заявки на отслеживание идентификатора.
+TicketPublicInterfaceTextHomeHelpAdmin=Определенный здесь текст появится на домашней странице общедоступного интерфейса.
+TicketPublicInterfaceTopicLabelAdmin=Название интерфейса
+TicketPublicInterfaceTopicHelp=Этот текст появится как заголовок общедоступного интерфейса.
+TicketPublicInterfaceTextHelpMessageLabelAdmin=Текст справки к записи сообщения
+TicketPublicInterfaceTextHelpMessageHelpAdmin=Этот текст появится над областью ввода сообщения пользователя.
+ExtraFieldsTicket=Дополнительные атрибуты
+TicketCkEditorEmailNotActivated=Редактор HTML не активирован. Чтобы получить его, установите для содержимого FCKEDITOR_ENABLE_MAIL значение 1.
+TicketsDisableEmail=Не отправляйте электронные письма для создания заявки или записи сообщения
+TicketsDisableEmailHelp=По умолчанию электронные письма отправляются при создании новых заявок или сообщений. Включите эту опцию, чтобы отключить * все * уведомления по электронной почте
+TicketsLogEnableEmail=Включить журнал по электронной почте
+TicketsLogEnableEmailHelp=При каждом изменении ** каждому контакту **, связанному с билетом, будет отправляться электронное письмо.
 TicketParams=Params
-TicketsShowModuleLogo=Display the logo of the module in the public interface
-TicketsShowModuleLogoHelp=Enable this option to hide the logo module in the pages of the public interface
-TicketsShowCompanyLogo=Display the logo of the company in the public interface
-TicketsShowCompanyLogoHelp=Enable this option to hide the logo of the main company in the pages of the public interface
-TicketsEmailAlsoSendToMainAddress=Also send a notification to the main email address
-TicketsEmailAlsoSendToMainAddressHelp=Enable this option to also send an email to the address defined into setup "%s" (see tab "%s")
-TicketsLimitViewAssignedOnly=Restrict the display to tickets assigned to the current user (not effective for external users, always be limited to the third party they depend on)
-TicketsLimitViewAssignedOnlyHelp=Only tickets assigned to the current user will be visible. Does not apply to a user with tickets management rights.
-TicketsActivatePublicInterface=Activate public interface
-TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create tickets.
-TicketsAutoAssignTicket=Automatically assign the user who created the ticket
-TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
-TicketNumberingModules=Tickets numbering module
-TicketsModelModule=Document templates for tickets
-TicketNotifyTiersAtCreation=Notify third party at creation
-TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
-TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is added to a ticket
-TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
-TicketPublicNotificationNewMessageDefaultEmail=Notifications email to (update)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Send an email to this address for each new message notifications if the ticket doesn't have a user assigned to it or if the user doesn't have any known email.
+TicketsShowModuleLogo=Отображение логотипа модуля в публичном интерфейсе
+TicketsShowModuleLogoHelp=Включите эту опцию, чтобы скрыть модуль логотипа на страницах публичного интерфейса.
+TicketsShowCompanyLogo=Отображение логотипа компании в публичном интерфейсе
+TicketsShowCompanyLogoHelp=Включите эту опцию, чтобы скрыть логотип основной компании на страницах публичного интерфейса.
+TicketsEmailAlsoSendToMainAddress=Также отправьте уведомление на основной адрес электронной почты
+TicketsEmailAlsoSendToMainAddressHelp=Включите эту опцию, чтобы также отправлять электронную почту на адрес, указанный в настройке «%s» (см. Вкладку «%s»)
+TicketsLimitViewAssignedOnly=Ограничить отображение заявками, назначенными текущему пользователю (не действует для внешних пользователей, всегда ограничивается третьей стороной, от которой они зависят)
+TicketsLimitViewAssignedOnlyHelp=Будут видны только тикеты, назначенные текущему пользователю. Не распространяется на пользователя с правами управления тикетами.
+TicketsActivatePublicInterface=Активировать публичный интерфейс
+TicketsActivatePublicInterfaceHelp=Открытый интерфейс позволяет любому посетителю создавать тикеты.
+TicketsAutoAssignTicket=Автоматически назначить пользователя, создавшего заявку
+TicketsAutoAssignTicketHelp=При создании заявки пользователь может быть автоматически закреплен за заявкой.
+TicketNumberingModules=Модуль нумерации тикетов
+TicketsModelModule=Шаблоны документов для тикетов
+TicketNotifyTiersAtCreation=Уведомить третью сторону при создании
+TicketsDisableCustomerEmail=Всегда отключайте электронную почту, когда тикет создается из общедоступного интерфейса
+TicketsPublicNotificationNewMessage=Отправлять электронное письмо (-а), когда в заявку добавляется новое сообщение / комментарий
+TicketsPublicNotificationNewMessageHelp=Отправлять электронное письмо (-а), когда новое сообщение добавляется из общедоступного интерфейса (назначенному пользователю или электронное письмо с уведомлениями для (обновить) и / или электронное письмо с уведомлениями для)
+TicketPublicNotificationNewMessageDefaultEmail=Уведомления по электронной почте на (обновить)
+TicketPublicNotificationNewMessageDefaultEmailHelp=Отправляйте электронное письмо на этот адрес для каждого уведомления о новом сообщении, если для билета не назначен пользователь или если у пользователя нет известного адреса электронной почты.
 #
 # Index & list page
 #
-TicketsIndex=Tickets area
-TicketList=List of tickets
-TicketAssignedToMeInfos=This page display ticket list created by or assigned to current user
-NoTicketsFound=No ticket found
-NoUnreadTicketsFound=No unread ticket found
-TicketViewAllTickets=View all tickets
-TicketViewNonClosedOnly=View only open tickets
-TicketStatByStatus=Tickets by status
-OrderByDateAsc=Sort by ascending date
-OrderByDateDesc=Sort by descending date
-ShowAsConversation=Show as conversation list
-MessageListViewType=Show as table list
+TicketsIndex=Тикеты
+TicketList=Список тикетов
+TicketAssignedToMeInfos=На этой странице отображается список заявок, созданный или назначенный текущему пользователю.
+NoTicketsFound=Тикетов не найдено
+NoUnreadTicketsFound=Непрочитанных тикетов не найдено
+TicketViewAllTickets=Посмотреть все тикеты
+TicketViewNonClosedOnly=Просмотреть только открытые тикеты
+TicketStatByStatus=Тикеты по статусу
+OrderByDateAsc=Сортировать по дате по возрастанию
+OrderByDateDesc=Сортировать по дате по убыванию
+ShowAsConversation=Показать как список бесед
+MessageListViewType=Показать как список таблиц
 
 #
 # Ticket card
 #
-Ticket=Ticket
-TicketCard=Ticket card
-CreateTicket=Create ticket
-EditTicket=Edit ticket
-TicketsManagement=Tickets Management
-CreatedBy=Created by
-NewTicket=New Ticket
-SubjectAnswerToTicket=Ticket answer
-TicketTypeRequest=Request type
+Ticket=Проездной тикет
+TicketCard=Билетная карточка
+CreateTicket=Создать тикет
+EditTicket=Изменить тикет
+TicketsManagement=Управление тикетами
+CreatedBy=Создано
+NewTicket=Новый тикет
+SubjectAnswerToTicket=Тикет ответ
+TicketTypeRequest=Тип запроса
 TicketCategory=Группа
-SeeTicket=See ticket
-TicketMarkedAsRead=Ticket has been marked as read
-TicketReadOn=Read on
+SeeTicket=Посмотреть тикет
+TicketMarkedAsRead=Тикет отмечен как прочитанный
+TicketReadOn=Читать дальше
 TicketCloseOn=Дата закрытия
-MarkAsRead=Mark ticket as read
-TicketHistory=Ticket history
-AssignUser=Assign to user
-TicketAssigned=Ticket is now assigned
-TicketChangeType=Change type
-TicketChangeCategory=Change analytic code
-TicketChangeSeverity=Change severity
-TicketAddMessage=Add a message
-AddMessage=Add a message
-MessageSuccessfullyAdded=Ticket added
-TicketMessageSuccessfullyAdded=Message successfully added
-TicketMessagesList=Message list
-NoMsgForThisTicket=No message for this ticket
-Properties=Classification
-LatestNewTickets=Latest %s newest tickets (not read)
-TicketSeverity=Severity
-ShowTicket=See ticket
-RelatedTickets=Related tickets
+MarkAsRead=Отметить тикет как прочитанный
+TicketHistory=История тикетов
+AssignUser=Назначить пользователю
+TicketAssigned=Тикет назначен
+TicketChangeType=Изменить тип
+TicketChangeCategory=Изменить аналитический код
+TicketChangeSeverity=Изменить серьезность
+TicketAddMessage=Добавить сообщение
+AddMessage=Добавить сообщение
+MessageSuccessfullyAdded=Тикет добавлен
+TicketMessageSuccessfullyAdded=Сообщение успешно добавлено
+TicketMessagesList=Список сообщений
+NoMsgForThisTicket=Нет сообщения для этого билета
+Properties=Классификация
+LatestNewTickets=Последние тикеты %s новейшие (не прочитаны)
+TicketSeverity=Строгость
+ShowTicket=Посмотреть тикет
+RelatedTickets=Связанные тикеты
 TicketAddIntervention=СОздать посредничество
-CloseTicket=Close ticket
-CloseATicket=Close a ticket
-ConfirmCloseAticket=Confirm ticket closing
-ConfirmDeleteTicket=Please confirm ticket deleting
-TicketDeletedSuccess=Ticket deleted with success
-TicketMarkedAsClosed=Ticket marked as closed
-TicketDurationAuto=Calculated duration
-TicketDurationAutoInfos=Duration calculated automatically from intervention related
-TicketUpdated=Ticket updated
-SendMessageByEmail=Send message by email
-TicketNewMessage=New message
-ErrorMailRecipientIsEmptyForSendTicketMessage=Recipient is empty. No email send
-TicketGoIntoContactTab=Please go into "Contacts" tab to select them
-TicketMessageMailIntro=Introduction
-TicketMessageMailIntroHelp=This text is added only at the beginning of the email and will not be saved.
-TicketMessageMailIntroLabelAdmin=Introduction to the message when sending email
-TicketMessageMailIntroText=Hello,<br>A new response was sent on a ticket that you contact. Here is the message:<br>
-TicketMessageMailIntroHelpAdmin=This text will be inserted before the text of the response to a ticket.
+CloseTicket=Закрыть тикет
+CloseATicket=Закрыть тикет
+ConfirmCloseAticket=Подтвердить закрытие тикета
+ConfirmDeleteTicket=Подтвердите удаление тикета
+TicketDeletedSuccess=Тикет успешно удален
+TicketMarkedAsClosed=Тикет отмечен как закрытый
+TicketDurationAuto=Расчетная продолжительность
+TicketDurationAutoInfos=Продолжительность рассчитывается автоматически на основе вмешательства, связанного с
+TicketUpdated=Тикет обновлен
+SendMessageByEmail=Отправить сообщение по электронной почте
+TicketNewMessage=Новое сообщение
+ErrorMailRecipientIsEmptyForSendTicketMessage=Получатель пуст. Электронная почта не отправляется
+TicketGoIntoContactTab=Пожалуйста, перейдите на вкладку «Контакты», чтобы выбрать их.
+TicketMessageMailIntro=Вступление
+TicketMessageMailIntroHelp=Этот текст добавляется только в начале письма и не сохраняется.
+TicketMessageMailIntroLabelAdmin=Введение в сообщение при отправке электронной почты
+TicketMessageMailIntroText=Привет, <br> На тикет, с которым вы связываетесь, был отправлен новый ответ. Вот сообщение: <br>
+TicketMessageMailIntroHelpAdmin=Этот текст будет вставлен перед текстом ответа на тикет.
 TicketMessageMailSignature=Подпись
-TicketMessageMailSignatureHelp=This text is added only at the end of the email and will not be saved.
-TicketMessageMailSignatureText=<p>Sincerely,</p><p>--</p>
-TicketMessageMailSignatureLabelAdmin=Signature of response email
-TicketMessageMailSignatureHelpAdmin=This text will be inserted after the response message.
-TicketMessageHelp=Only this text will be saved in the message list on ticket card.
-TicketMessageSubstitutionReplacedByGenericValues=Substitutions variables are replaced by generic values.
-TimeElapsedSince=Time elapsed since
-TicketTimeToRead=Time elapsed before read
-TicketContacts=Contacts ticket
-TicketDocumentsLinked=Documents linked to ticket
-ConfirmReOpenTicket=Confirm reopen this ticket ?
-TicketMessageMailIntroAutoNewPublicMessage=A new message was posted on the ticket with the subject %s:
-TicketAssignedToYou=Ticket assigned
-TicketAssignedEmailBody=You have been assigned the ticket #%s by %s
-MarkMessageAsPrivate=Mark message as private
-TicketMessagePrivateHelp=This message will not display to external users
-TicketEmailOriginIssuer=Issuer at origin of the tickets
-InitialMessage=Initial Message
-LinkToAContract=Link to a contract
-TicketPleaseSelectAContract=Select a contract
-UnableToCreateInterIfNoSocid=Can not create an intervention when no third party is defined
-TicketMailExchanges=Mail exchanges
-TicketInitialMessageModified=Initial message modified
-TicketMessageSuccesfullyUpdated=Message successfully updated
-TicketChangeStatus=Change status
-TicketConfirmChangeStatus=Confirm the status change: %s ?
-TicketLogStatusChanged=Status changed: %s to %s
-TicketNotNotifyTiersAtCreate=Not notify company at create
-Unread=Unread
-TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
-ErrorTicketRefRequired=Ticket reference name is required
+TicketMessageMailSignatureHelp=Этот текст добавляется только в конце письма и не сохраняется.
+TicketMessageMailSignatureText= <p> С уважением, </p> <p> - </p>
+TicketMessageMailSignatureLabelAdmin=Подпись ответного электронного письма
+TicketMessageMailSignatureHelpAdmin=Этот текст будет вставлен после ответного сообщения.
+TicketMessageHelp=Только этот текст будет сохранен в списке сообщений на карточке билета.
+TicketMessageSubstitutionReplacedByGenericValues=Подстановки переменных заменяются общими значениями.
+TimeElapsedSince=Прошло время с
+TicketTimeToRead=Время, прошедшее до прочтения
+TicketContacts=Контакты тикет
+TicketDocumentsLinked=Документы, привязанные к билету
+ConfirmReOpenTicket=Подтвердить повторное открытие этого билета?
+TicketMessageMailIntroAutoNewPublicMessage=В тикете появилось новое сообщение с темой %s:
+TicketAssignedToYou=Тикет назначен
+TicketAssignedEmailBody=Вам был присвоен тикет # %s пользователем %s
+MarkMessageAsPrivate=Отметить сообщение как личное
+TicketMessagePrivateHelp=Это сообщение не будет отображаться для внешних пользователей
+TicketEmailOriginIssuer=Эмитент при оформлении тикетов
+InitialMessage=Начальное сообщение
+LinkToAContract=Ссылка на договор
+TicketPleaseSelectAContract=Выберите договор
+UnableToCreateInterIfNoSocid=Невозможно создать вмешательство, если третья сторона не определена
+TicketMailExchanges=Почтовый обмен
+TicketInitialMessageModified=Первоначальное сообщение изменено
+TicketMessageSuccesfullyUpdated=Сообщение успешно обновлено
+TicketChangeStatus=Изменить статус
+TicketConfirmChangeStatus=Подтвердите изменение статуса: %s?
+TicketLogStatusChanged=Статус изменен: с %s на %s
+TicketNotNotifyTiersAtCreate=Не уведомлять компанию при создании
+Unread=Непрочитанный
+TicketNotCreatedFromPublicInterface=Недоступен. Тикет не был создан из общедоступного интерфейса.
+ErrorTicketRefRequired=Требуется ссылочное название билета
 
 #
 # Logs
 #
-TicketLogMesgReadBy=Ticket %s read by %s
-NoLogForThisTicket=No log for this ticket yet
-TicketLogAssignedTo=Ticket %s assigned to %s
-TicketLogPropertyChanged=Ticket %s modified: classification from %s to %s
-TicketLogClosedBy=Ticket %s closed by %s
-TicketLogReopen=Ticket %s re-open
+TicketLogMesgReadBy=Тикет %s, прочитанный пользователем %s
+NoLogForThisTicket=Для этого билета еще нет журнала
+TicketLogAssignedTo=Тикет %s назначен на %s
+TicketLogPropertyChanged=Тикет %s изменен: классификация с %s на %s
+TicketLogClosedBy=Тикет %s закрыт пользователем %s
+TicketLogReopen=Тикет %s открывается повторно
 
 #
 # Public pages
 #
-TicketSystem=Ticket system
-ShowListTicketWithTrackId=Display ticket list from track ID
-ShowTicketWithTrackId=Display ticket from track ID
-TicketPublicDesc=You can create a support ticket or check from an existing ID.
-YourTicketSuccessfullySaved=Ticket has been successfully saved!
-MesgInfosPublicTicketCreatedWithTrackId=A new ticket has been created with ID %s and Ref %s.
-PleaseRememberThisId=Please keep the tracking number that we might ask you later.
-TicketNewEmailSubject=Ticket creation confirmation - Ref %s (public ticket ID %s)
-TicketNewEmailSubjectCustomer=New support ticket
-TicketNewEmailBody=This is an automatic email to confirm you have registered a new ticket.
-TicketNewEmailBodyCustomer=This is an automatic email to confirm a new ticket has just been created into your account.
-TicketNewEmailBodyInfosTicket=Information for monitoring the ticket
-TicketNewEmailBodyInfosTrackId=Ticket tracking number: %s
-TicketNewEmailBodyInfosTrackUrl=You can view the progress of the ticket by clicking the link above.
-TicketNewEmailBodyInfosTrackUrlCustomer=You can view the progress of the ticket in the specific interface by clicking the following link
-TicketEmailPleaseDoNotReplyToThisEmail=Please do not reply directly to this email! Use the link to reply into the interface.
-TicketPublicInfoCreateTicket=This form allows you to record a support ticket in our management system.
-TicketPublicPleaseBeAccuratelyDescribe=Please accurately describe the problem. Provide the most information possible to allow us to correctly identify your request.
-TicketPublicMsgViewLogIn=Please enter ticket tracking ID
-TicketTrackId=Public Tracking ID
-OneOfTicketTrackId=One of your tracking ID
-ErrorTicketNotFound=Ticket with tracking ID %s not found!
+TicketSystem=Билетная система
+ShowListTicketWithTrackId=Показать список тикетов из идентификатора трека
+ShowTicketWithTrackId=Показать тикет с идентификатора трека
+TicketPublicDesc=Вы можете создать заявку в службу поддержки или проверить имеющийся идентификатор.
+YourTicketSuccessfullySaved=Тикет успешно сохранен!
+MesgInfosPublicTicketCreatedWithTrackId=Был создан новый тикет с идентификаторами %s и Ref %s.
+PleaseRememberThisId=Сохраните номер для отслеживания, который мы можем спросить у вас позже.
+TicketNewEmailSubject=Подтверждение создания билета - Ref %s (общедоступный идентификатор билета %s)
+TicketNewEmailSubjectCustomer=Новый тикет в службу поддержки
+TicketNewEmailBody=Это автоматическое электронное письмо, подтверждающее, что вы зарегистрировали новый тикет.
+TicketNewEmailBodyCustomer=Это автоматическое электронное письмо, подтверждающее, что в вашу учетную запись только что был добавлен новый тикет.
+TicketNewEmailBodyInfosTicket=Информация для наблюдения за билетом
+TicketNewEmailBodyInfosTrackId=Номер отслеживания тикетов: %s
+TicketNewEmailBodyInfosTrackUrl=Вы можете просмотреть ход выполнения заявки, щелкнув ссылку выше.
+TicketNewEmailBodyInfosTrackUrlCustomer=Вы можете просмотреть ход выполнения заявки в определенном интерфейсе, щелкнув следующую ссылку
+TicketEmailPleaseDoNotReplyToThisEmail=Пожалуйста, не отвечайте на это письмо напрямую! Используйте ссылку, чтобы ответить в интерфейсе.
+TicketPublicInfoCreateTicket=Эта форма позволяет вам записать заявку в службу поддержки в нашей системе управления.
+TicketPublicPleaseBeAccuratelyDescribe=Пожалуйста, подробно опишите проблему. Предоставьте как можно больше информации, чтобы мы могли правильно идентифицировать ваш запрос.
+TicketPublicMsgViewLogIn=Пожалуйста, введите идентификатор отслеживания тикетов
+TicketTrackId=Общедоступный идентификатор отслеживания
+OneOfTicketTrackId=Один из ваших идентификаторов отслеживания
+ErrorTicketNotFound=Тикет с идентификатором отслеживания %s не найден!
 Subject=Тема
-ViewTicket=View ticket
-ViewMyTicketList=View my ticket list
-ErrorEmailMustExistToCreateTicket=Error: email address not found in our database
-TicketNewEmailSubjectAdmin=New ticket created - Ref %s (public ticket ID %s)
-TicketNewEmailBodyAdmin=<p>Ticket has just been created with ID #%s, see information:</p>
-SeeThisTicketIntomanagementInterface=See ticket in management interface
-TicketPublicInterfaceForbidden=The public interface for the tickets was not enabled
-ErrorEmailOrTrackingInvalid=Bad value for tracking ID or email
-OldUser=Old user
+ViewTicket=Посмотреть тикет
+ViewMyTicketList=Посмотреть мой список тикетов
+ErrorEmailMustExistToCreateTicket=Ошибка: адрес электронной почты не найден в нашей базе данных
+TicketNewEmailSubjectAdmin=Создан новый тикет - Ref %s (общедоступный идентификатор билета %s)
+TicketNewEmailBodyAdmin= <p> Тикет только что был создан с ID # %s, см. информацию: </p>
+SeeThisTicketIntomanagementInterface=См. Тикет в интерфейсе управления
+TicketPublicInterfaceForbidden=Публичный интерфейс для тикетов не был включен
+ErrorEmailOrTrackingInvalid=Неверное значение идентификатора отслеживания или электронной почты
+OldUser=Старый пользователь
 NewUser=Новый пользователь
-NumberOfTicketsByMonth=Number of tickets per month
-NbOfTickets=Number of tickets
+NumberOfTicketsByMonth=Количество тикетов в месяц
+NbOfTickets=Количество тикетов
 # notifications
-TicketNotificationEmailSubject=Ticket %s updated
-TicketNotificationEmailBody=This is an automatic message to notify you that ticket %s has just been updated
-TicketNotificationRecipient=Notification recipient
-TicketNotificationLogMessage=Log message
-TicketNotificationEmailBodyInfosTrackUrlinternal=View ticket into interface
-TicketNotificationNumberEmailSent=Notification email sent: %s
+TicketNotificationEmailSubject=Тикет %s обновлен
+TicketNotificationEmailBody=Это автоматическое сообщение, уведомляющее вас о том, что тикет %s только что был обновлен.
+TicketNotificationRecipient=Получатель уведомления
+TicketNotificationLogMessage=Сообщение журнала
+TicketNotificationEmailBodyInfosTrackUrlinternal=Просмотр заявки в интерфейсе
+TicketNotificationNumberEmailSent=Уведомление отправлено по электронной почте: %s
 
-ActionsOnTicket=Events on ticket
+ActionsOnTicket=События в тикете
 
 #
 # Boxes
 #
-BoxLastTicket=Latest created tickets
-BoxLastTicketDescription=Latest %s created tickets
+BoxLastTicket=Последние созданные тикеты
+BoxLastTicketDescription=Последние созданные тикеты %s
 BoxLastTicketContent=
-BoxLastTicketNoRecordedTickets=No recent unread tickets
-BoxLastModifiedTicket=Latest modified tickets
-BoxLastModifiedTicketDescription=Latest %s modified tickets
+BoxLastTicketNoRecordedTickets=Нет недавних непрочитанных тикетов
+BoxLastModifiedTicket=Последние измененные тикеты
+BoxLastModifiedTicketDescription=Последние измененные тикеты %s
 BoxLastModifiedTicketContent=
-BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
-BoxTicketType=Number of open tickets by type
-BoxTicketSeverity=Number of open tickets by severity
-BoxNoTicketSeverity=No tickets opened
-BoxTicketLastXDays=Number of new tickets by days the last %s days
-BoxTicketLastXDayswidget = Number of new tickets by days the last X days
-BoxNoTicketLastXDays=No new tickets the last %s days
-BoxNumberOfTicketByDay=Number of new tickets by day
-BoxNewTicketVSClose=Number of today's new tickets versus today's closed tickets
-TicketCreatedToday=Ticket created today
-TicketClosedToday=Ticket closed today
+BoxLastModifiedTicketNoRecordedTickets=Нет недавно измененных тикетов
+BoxTicketType=Distribution of open tickets by type
+BoxTicketSeverity=Количество открытых заявок по серьезности
+BoxNoTicketSeverity=Тикеты не открыты
+BoxTicketLastXDays=Количество новых тикетов по дням последние %s дней
+BoxTicketLastXDayswidget = Количество новых тикетов по дням за последние X дней
+BoxNoTicketLastXDays=Нет новых тикетов за последние %s дн.
+BoxNumberOfTicketByDay=Количество новых тикетов по дням
+BoxNewTicketVSClose=Количество сегодняшних новых тикетов по сравнению с сегодняшними закрытыми тикетами
+TicketCreatedToday=Тикет создан сегодня
+TicketClosedToday=Тикет закрыт сегодня
diff --git a/htdocs/langs/ru_RU/trips.lang b/htdocs/langs/ru_RU/trips.lang
index ebac036c46c..c0538dccf94 100644
--- a/htdocs/langs/ru_RU/trips.lang
+++ b/htdocs/langs/ru_RU/trips.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - trips
-ShowExpenseReport=Show expense report
+ShowExpenseReport=Показать отчет о расходах
 Trips=Отчёты о затратах
 TripsAndExpenses=Отчёты о затратах
 TripsAndExpensesStatistics=Статистика отчётов о затратах
@@ -7,33 +7,33 @@ TripCard=Карточка отчётов о затратах
 AddTrip=Создать отчёт о затратах
 ListOfTrips=Список отчётов о затратах
 ListOfFees=Список сборов
-TypeFees=Types of fees
-ShowTrip=Show expense report
+TypeFees=Типы сборов
+ShowTrip=Показать отчет о расходах
 NewTrip=Новый отчёт о затртатах
-LastExpenseReports=Latest %s expense reports
-AllExpenseReports=All expense reports
-CompanyVisited=Company/organization visited
+LastExpenseReports=Последние отчеты о расходах %s
+AllExpenseReports=Все отчеты о расходах
+CompanyVisited=Компания / организация посетили
 FeesKilometersOrAmout=Сумма или километры
 DeleteTrip=Удалить отчёт о затратах
-ConfirmDeleteTrip=Are you sure you want to delete this expense report?
+ConfirmDeleteTrip=Вы действительно хотите удалить этот отчет о расходах?
 ListTripsAndExpenses=Список отчётов о затратах
 ListToApprove=Ждёт утверждения
 ExpensesArea=Поле отчётов о затратах
-ClassifyRefunded=Classify 'Refunded'
+ClassifyRefunded=Классифицируйте "Возврат"
 ExpenseReportWaitingForApproval=Новый отчёт о затратах направлен на утверждение
-ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
-ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
-ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.<br>The %s, you refused to approve the expense report for this reason: %s.<br>A new version has been proposed and waiting for your approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
-ExpenseReportApproved=An expense report was approved
-ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
-ExpenseReportRefused=An expense report was refused
-ExpenseReportRefusedMessage=The expense report %s was refused.<br> - User: %s<br> - Refused by: %s<br> - Motive for refusal: %s<br>Click here to show the expense report: %s
-ExpenseReportCanceled=An expense report was canceled
-ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<br> - Canceled by: %s<br> - Motive for cancellation: %s<br>Click here to show the expense report: %s
-ExpenseReportPaid=An expense report was paid
-ExpenseReportPaidMessage=The expense report %s was paid.<br> - User: %s<br> - Paid by: %s<br>Click here to show the expense report: %s
+ExpenseReportWaitingForApprovalMessage=Новый отчет о расходах отправлен и ожидает утверждения. <br> - Пользователь: %s <br> - Период: %s <br> Нажмите здесь, чтобы проверить: %s
+ExpenseReportWaitingForReApproval=Отчет о расходах отправлен на повторное утверждение
+ExpenseReportWaitingForReApprovalMessage=Отчет о расходах отправлен и ожидает повторного утверждения. <br> %s, вы отказались утвердить отчет о расходах по этой причине: %s. <br> Предложена новая версия, ожидающая вашего одобрения. <br> - Пользователь: %s <br> - Период: %s <br> Нажмите здесь, чтобы проверить: %s
+ExpenseReportApproved=Отчет о расходах утвержден
+ExpenseReportApprovedMessage=Отчет о расходах %s утвержден. <br> - Пользователь: %s <br> - Утверждено: %s <br> Нажмите здесь, чтобы просмотреть отчет о расходах: %s
+ExpenseReportRefused=Отчет о расходах был отклонен
+ExpenseReportRefusedMessage=Отчет о расходах %s был отклонен. <br> - Пользователь: %s <br> - Отказано: %s <br> - Мотив отказа: %s<br> Нажмите чтобы показать отчёт о затратах: %s
+ExpenseReportCanceled=Отчет о расходах был отменен
+ExpenseReportCanceledMessage=Отчет о расходах %s был отменен. <br> - Пользователь: %s <br> - Отменено: %s <br> - Мотив для отмены: %s<br> Нажмите, чтобы показать отчёт о затратах:%s
+ExpenseReportPaid=Отчет о расходах был оплачен
+ExpenseReportPaidMessage=Отчет о расходах %s был оплачен. <br> - Пользователь: %s <br> - Оплачивается: %s <br> Нажмите здесь, чтобы просмотреть отчет о расходах: %s
 TripId=ID отчёта о затратах
-AnyOtherInThisListCanValidate=Кого уведомлять для подтверждения.
+AnyOtherInThisListCanValidate=Лицо, которое должно быть проинформировано для подтверждения запроса.
 TripSociete=Информация о компании
 TripNDF=Информация о отчёте о затратах
 PDFStandardExpenseReports=Шаблон отчёта о затратах для создания документа в формате PDF
@@ -47,43 +47,43 @@ TF_BUS=Автобус
 TF_CAR=Машина
 TF_PEAGE=Троллейбус
 TF_ESSENCE=Топливо
-TF_HOTEL=Hotel
+TF_HOTEL=Отель
 TF_TAXI=Такси
-EX_KME=Mileage costs
-EX_FUE=Fuel CV
-EX_HOT=Hotel
-EX_PAR=Parking CV
-EX_TOL=Toll CV
-EX_TAX=Various Taxes
-EX_IND=Indemnity transportation subscription
-EX_SUM=Maintenance supply
-EX_SUO=Office supplies
-EX_CAR=Car rental
-EX_DOC=Documentation
-EX_CUR=Customers receiving
-EX_OTR=Other receiving
-EX_POS=Postage
-EX_CAM=CV maintenance and repair
-EX_EMM=Employees meal
-EX_GUM=Guests meal
-EX_BRE=Breakfast
-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
-UploadANewFileNow=Upload a new document now
-Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
+EX_KME=Стоимость пробега
+EX_FUE=Топливо CV
+EX_HOT=Отель
+EX_PAR=Парковка CV
+EX_TOL=Платное резюме
+EX_TAX=Различные налоги
+EX_IND=Страховая транспортная подписка
+EX_SUM=Поставка технического обслуживания
+EX_SUO=Офисные принадлежности
+EX_CAR=Прокат автомобилей
+EX_DOC=Документация
+EX_CUR=Получение клиентов
+EX_OTR=Другое получение
+EX_POS=Почтовые расходы
+EX_CAM=Техническое обслуживание и ремонт резюме
+EX_EMM=Питание сотрудников
+EX_GUM=Еда для гостей
+EX_BRE=Завтрак
+EX_FUE_VP=Топливо PV
+EX_TOL_VP=Платная PV
+EX_PAR_VP=Парковка PV
+EX_CAM_VP=Обслуживание и ремонт фотоэлектрических систем
+DefaultCategoryCar=Режим транспортировки по умолчанию
+DefaultRangeNumber=Номер диапазона по умолчанию
+UploadANewFileNow=Загрузите новый документ прямо сейчас
+Error_EXPENSEREPORT_ADDON_NotDefined=Ошибка, правило нумерации отчета о расходах ref не было определено в настройке модуля «Отчет о расходах».
 ErrorDoubleDeclaration=Вы должны задекларировать другой отчёт о затратах в этом временном диапазоне. 
 AucuneLigne=Нет задекларированных отчётов о затратах
 ModePaiement=Режим оплаты
-VALIDATOR=User responsible for approval
+VALIDATOR=Пользователь, ответственный за утверждение
 VALIDOR=Утверждено
 AUTHOR=Записано
 AUTHORPAIEMENT=Оплачивается
 REFUSEUR=Отклонено
-CANCEL_USER=Deleted by
+CANCEL_USER=Удалено
 MOTIF_REFUS=Причина
 MOTIF_CANCEL=Причина
 DATE_REFUS=Дата отклонения
@@ -91,61 +91,61 @@ DATE_SAVE=Дата проверки
 DATE_CANCEL=Дата отмены
 DATE_PAIEMENT=Дата платежа
 BROUILLONNER=Открыть заново
-ExpenseReportRef=Ref. expense report
+ExpenseReportRef=Ref. отчет о затратах
 ValidateAndSubmit=Проверить и отправить запрос на утверждение
-ValidatedWaitingApproval=Validated (waiting for approval)
+ValidatedWaitingApproval=Подтверждено (ожидает утверждения)
 NOT_AUTHOR=Вы не автор этого отчёта о затратах. Операция отменена.
-ConfirmRefuseTrip=Are you sure you want to deny this expense report?
+ConfirmRefuseTrip=Вы уверены, что хотите отклонить этот отчет о расходах?
 ValideTrip=Одобрить отчёт о затратах
-ConfirmValideTrip=Are you sure you want to approve this expense report?
+ConfirmValideTrip=Вы уверены, что хотите утвердить этот отчет о расходах?
 PaidTrip=Оплатить отчёт о затратах
-ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid"?
-ConfirmCancelTrip=Are you sure you want to cancel this expense report?
-BrouillonnerTrip=Move back expense report to status "Draft"
-ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft"?
+ConfirmPaidTrip=Вы действительно хотите изменить статус этого отчета о расходах на «Оплачен»?
+ConfirmCancelTrip=Вы уверены, что хотите отменить этот отчет о расходах?
+BrouillonnerTrip=Вернуть отчет о расходах в статус «Черновик»
+ConfirmBrouillonnerTrip=Вы действительно хотите переместить этот отчет о расходах в статус «Черновик»?
 SaveTrip=Проверить отчёт о завтратах
-ConfirmSaveTrip=Are you sure you want to validate this expense report?
+ConfirmSaveTrip=Вы уверены, что хотите проверить этот отчет о расходах?
 NoTripsToExportCSV=Нет отчёта о затратах за этот период.
-ExpenseReportPayment=Expense report payment
-ExpenseReportsToApprove=Expense reports to approve
-ExpenseReportsToPay=Expense reports to pay
-ConfirmCloneExpenseReport=Are you sure you want to clone this expense report ?
-ExpenseReportsIk=Expense report milles index
-ExpenseReportsRules=Expense report rules
-ExpenseReportIkDesc=You can modify the calculation of kilometers expense by category and range who they are previously defined. <b>d</b> is the distance in kilometers
-ExpenseReportRulesDesc=You can create or update any rules of calculation. This part will be used when user will create a new expense report
+ExpenseReportPayment=Оплата отчета о расходах
+ExpenseReportsToApprove=Отчеты о расходах на утверждение
+ExpenseReportsToPay=Отчеты о расходах к оплате
+ConfirmCloneExpenseReport=Вы уверены, что хотите клонировать этот отчет о расходах?
+ExpenseReportsIk=Конфигурация начислений за пробег
+ExpenseReportsRules=Правила отчета о расходах
+ExpenseReportIkDesc=Вы можете изменить расчет расхода в километрах по категориям и диапазонам, которые они определены ранее. <b> d </b> - расстояние в километрах
+ExpenseReportRulesDesc=Вы можете создавать или обновлять любые правила расчета. Эта часть будет использоваться, когда пользователь создаст новый отчет о расходах.
 expenseReportOffset=Сдвиг
-expenseReportCoef=Coefficient
-expenseReportTotalForFive=Example with <u>d</u> = 5
-expenseReportRangeFromTo=from %d to %d
-expenseReportRangeMoreThan=more than %d
-expenseReportCoefUndefined=(value not defined)
-expenseReportCatDisabled=Category disabled - see the c_exp_tax_cat dictionary
-expenseReportRangeDisabled=Range disabled - see the c_exp_tax_range dictionay
-expenseReportPrintExample=offset + (d x coef) = %s
-ExpenseReportApplyTo=Apply to
-ExpenseReportDomain=Domain to apply
-ExpenseReportLimitOn=Limit on
+expenseReportCoef=Коэффициент
+expenseReportTotalForFive=Пример с <u> d </u> = 5
+expenseReportRangeFromTo=с %d на %d
+expenseReportRangeMoreThan=более чем %d
+expenseReportCoefUndefined=(значение не определено)
+expenseReportCatDisabled=Категория отключена - см. Словарь c_exp_tax_cat
+expenseReportRangeDisabled=Диапазон отключен - см. Словарь c_exp_tax_range
+expenseReportPrintExample=смещение + (d x coef) = %s
+ExpenseReportApplyTo=Применить к
+ExpenseReportDomain=Домен для подачи заявки
+ExpenseReportLimitOn=Ограничить
 ExpenseReportDateStart=Дата начала
 ExpenseReportDateEnd=Дата окончания
-ExpenseReportLimitAmount=Limite amount
-ExpenseReportRestrictive=Restrictive
-AllExpenseReport=All type of expense report
-OnExpense=Expense line
-ExpenseReportRuleSave=Expense report rule saved
-ExpenseReportRuleErrorOnSave=Error: %s
-RangeNum=Range %d
-ExpenseReportConstraintViolationError=Constraint violation id [%s]: %s  is superior to %s %s
-byEX_DAY=by day (limitation to %s)
-byEX_MON=by month (limitation to %s)
-byEX_YEA=by year (limitation to %s)
-byEX_EXP=by line (limitation to %s)
-ExpenseReportConstraintViolationWarning=Constraint violation id [%s]: %s  is superior to %s %s
-nolimitbyEX_DAY=by day (no limitation)
-nolimitbyEX_MON=by month (no limitation)
-nolimitbyEX_YEA=by year (no limitation)
-nolimitbyEX_EXP=by line (no limitation)
-CarCategory=Category of car
-ExpenseRangeOffset=Offset amount: %s
-RangeIk=Mileage range
-AttachTheNewLineToTheDocument=Attach the line to an uploaded document
+ExpenseReportLimitAmount=Лимитная сумма
+ExpenseReportRestrictive=Ограничительный
+AllExpenseReport=Все типы отчетов о расходах
+OnExpense=Строка расходов
+ExpenseReportRuleSave=Правило отчета о расходах сохранено
+ExpenseReportRuleErrorOnSave=Ошибка: %s
+RangeNum=Диапазон %d
+ExpenseReportConstraintViolationError=Идентификатор нарушения ограничения [%s]: %s превосходит %s %s
+byEX_DAY=днем (ограничение до %s)
+byEX_MON=по месяцам (ограничение до %s)
+byEX_YEA=по годам (ограничение до %s)
+byEX_EXP=по строке (ограничение на %s)
+ExpenseReportConstraintViolationWarning=Идентификатор нарушения ограничения [%s]: %s превосходит %s %s
+nolimitbyEX_DAY=днем (без ограничений)
+nolimitbyEX_MON=по месяцам (без ограничений)
+nolimitbyEX_YEA=по годам (без ограничений)
+nolimitbyEX_EXP=по строкам (без ограничений)
+CarCategory=Категория транспортного средства
+ExpenseRangeOffset=Сумма зачета: %s
+RangeIk=Диапазон пробега
+AttachTheNewLineToTheDocument=Прикрепите строку к загруженному документу
diff --git a/htdocs/langs/ru_RU/users.lang b/htdocs/langs/ru_RU/users.lang
index b638815e56a..5f9ca80336c 100644
--- a/htdocs/langs/ru_RU/users.lang
+++ b/htdocs/langs/ru_RU/users.lang
@@ -12,7 +12,7 @@ PasswordChangedTo=Пароль изменен на: %s
 SubjectNewPassword=Ваш новый пароль для %s
 GroupRights=Права доступа группы
 UserRights=Права доступа пользователя
-Credentials=Credentials
+Credentials=Реквизиты для входа
 UserGUISetup=Внешний вид (для пользователя)
 DisableUser=Выключать
 DisableAUser=Отключить пользователя
@@ -47,8 +47,8 @@ RemoveFromGroup=Удалить из группы
 PasswordChangedAndSentTo=Пароль изменен и направил <b>в %s.</b>
 PasswordChangeRequest=Запрос на изменение пароля для <b>%s</b>
 PasswordChangeRequestSent=Запрос на изменение пароля <b>для %s направлено %s.</b>
-IfLoginExistPasswordRequestSent=If this login is a valid account, an email to reset password has been sent.
-IfEmailExistPasswordRequestSent=If this email is a valid account, an email to reset password has been sent.
+IfLoginExistPasswordRequestSent=Если этот логин является действующей учетной записью, было отправлено электронное письмо для сброса пароля.
+IfEmailExistPasswordRequestSent=Если это адрес электронной почты действующей учетной записи, было отправлено электронное письмо для сброса пароля.
 ConfirmPasswordReset=Подтвердите сброс пароля
 MenuUsersAndGroups=Пользователи и Группы
 LastGroupsCreated=Последние %s созданные группы 
@@ -73,16 +73,16 @@ ExportDataset_user_1=Пользователи и их свойства
 DomainUser=Домен пользователя %s
 Reactivate=Возобновить
 CreateInternalUserDesc=Эта форма позволяет вам создать внутреннего пользователя в вашей компании. Чтобы создать внешнего пользователя (клиента, поставщика и т.д.), используйте кнопку «Создать пользователя Dolibarr» из карточки контакта этого контрагента.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization, or is a partner user outside of your organization that may need to see more data  than data related to his company (the permission system will define what he can or can't see or do).<br>An <b>external</b> user is a customer, vendor or other that must view ONLY data related to himself (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, you must grant permissions on the features that the user need.
+InternalExternalDesc=Внутренний пользователь <b> </b> - это пользователь, который является частью вашей компании / организации или партнером за пределами вашей организации, которому может потребоваться больше данных, чем данных, связанных с его компанией (система разрешений будет определять, что он может или может не вижу и не делаю). <br> Внешний пользователь <b> </b> - это покупатель, поставщик или другое лицо, которое должно просматривать ТОЛЬКО данные, относящиеся к самому себе (создание внешнего пользователя для третьей стороны может быть выполнено из контактной записи третьей стороны). <br> <br> В обоих случаях необходимо предоставить разрешения на функции, которые нужны пользователю.
 PermissionInheritedFromAGroup=Разрешение предоставляется, поскольку унаследовал от одного из пользователей в группы.
 Inherited=Унаследованный
-UserWillBe=Created user will be
+UserWillBe=Созданный пользователь будет
 UserWillBeInternalUser=Созданный пользователь будет внутреннего пользователя (потому что не связаны с определенным третьим лицам)
 UserWillBeExternalUser=Созданный пользователь будет внешний пользователь (из-за связанных с определенной третьей стороны)
 IdPhoneCaller=Идентификатор телефона абонента
 NewUserCreated=Пользователь %s создан
 NewUserPassword=Смена пароля для %s
-NewPasswordValidated=Your new password have been validated and must be used now to login.
+NewPasswordValidated=Ваш новый пароль был подтвержден и должен использоваться сейчас для входа в систему.
 EventUserModified=Пользователь %s изменен
 UserDisabled=Пользователь %s отключен
 UserEnabled=Пользователь %s активирован
@@ -106,21 +106,21 @@ UseTypeFieldToChange=Использьзуйте поле Тип для изме
 OpenIDURL=OpenID URL
 LoginUsingOpenID=Использовать OpenID для входа
 WeeklyHours=Отработанные часы (в неделю)
-ExpectedWorkedHours=Expected hours worked per week
+ExpectedWorkedHours=Ожидаемое количество отработанных часов в неделю
 ColorUser=Цвет пользователя
 DisabledInMonoUserMode=Отключено в режиме обслуживания
 UserAccountancyCode=Код учета пользователя
 UserLogoff=Выход пользователя
 UserLogged=Пользователь вошел
-DateOfEmployment=Employment date
-DateEmployment=Employment
+DateOfEmployment=Дата трудоустройства
+DateEmployment=Работа
 DateEmploymentstart=Дата начала трудоустройства
 DateEmploymentEnd=Дата окончания занятости
-RangeOfLoginValidity=Access validity date range
+RangeOfLoginValidity=Диапазон дат действия доступа
 CantDisableYourself=Вы не можете отключить свою собственную запись пользователя
-ForceUserExpenseValidator=Force expense report validator
-ForceUserHolidayValidator=Force leave request validator
-ValidatorIsSupervisorByDefault=By default, the validator is the supervisor of the user. Keep empty to keep this behaviour.
-UserPersonalEmail=Personal email
-UserPersonalMobile=Personal mobile phone
-WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
+ForceUserExpenseValidator=Принудительный валидатор отчетов о расходах
+ForceUserHolidayValidator=Принудительный валидатор запроса на отпуск
+ValidatorIsSupervisorByDefault=По умолчанию валидатор является супервизором пользователя. Оставьте пустым, чтобы сохранить такое поведение.
+UserPersonalEmail=Личное электронное письмо
+UserPersonalMobile=Персональный мобильный телефон
+WarningNotLangOfInterface=Предупреждение, это основной язык, на котором говорит пользователь, а не язык интерфейса, который он выбрал для просмотра. Чтобы изменить язык интерфейса, видимый этим пользователем, перейдите на вкладку %s
diff --git a/htdocs/langs/ru_RU/website.lang b/htdocs/langs/ru_RU/website.lang
index 4e0840138f3..f0b4f5cc7c0 100644
--- a/htdocs/langs/ru_RU/website.lang
+++ b/htdocs/langs/ru_RU/website.lang
@@ -1,147 +1,147 @@
 # Dolibarr language file - Source file is en_US - website
 Shortname=Код
-WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
+WebsiteSetupDesc=Создайте здесь веб-сайты, которые вы хотите использовать. Затем перейдите в меню «Сайты», чтобы отредактировать их.
 DeleteWebsite=Удалить сайт
-ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain.
-WEBSITE_TYPE_CONTAINER=Type of page/container
-WEBSITE_PAGE_EXAMPLE=Web page to use as example
-WEBSITE_PAGENAME=Page name/alias
-WEBSITE_ALIASALT=Alternative page names/aliases
-WEBSITE_ALIASALTDesc=Use here list of other name/aliases so the page can also be accessed using this other names/aliases (for example the old name after renaming the alias to keep backlink on old link/name working). Syntax is:<br>alternativename1, alternativename2, ...
-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)
-WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
-WEBSITE_ROBOT=Robot file (robots.txt)
-WEBSITE_HTACCESS=Website .htaccess file
-WEBSITE_MANIFEST_JSON=Website manifest.json file
-WEBSITE_README=README.md file
-WEBSITE_KEYWORDSDesc=Use a comma to separate values
-EnterHereLicenseInformation=Enter here meta data or license information to fille a README.md file. if you distribute your website as a template, the file will be included into the temptate package.
-HtmlHeaderPage=HTML header (specific to this page only)
-PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
-EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
-MediaFiles=Media library
-EditCss=Edit website properties
-EditMenu=Edit menu
-EditMedias=Edit medias
-EditPageMeta=Edit page/container properties
-EditInLine=Edit inline
-AddWebsite=Add website
-Webpage=Web page/container
-AddPage=Add page/container
+ConfirmDeleteWebsite=Вы уверены, что хотите удалить этот веб-сайт? Все его страницы и контент также будут удалены. Загруженные файлы (например, в каталог medias, модуль ECM, ...) останутся.
+WEBSITE_TYPE_CONTAINER=Тип страницы / контейнера
+WEBSITE_PAGE_EXAMPLE=Веб-страница для использования в качестве примера
+WEBSITE_PAGENAME=Имя / псевдоним страницы
+WEBSITE_ALIASALT=Альтернативные имена / псевдонимы страниц
+WEBSITE_ALIASALTDesc=Используйте здесь список других имен / псевдонимов, чтобы к странице можно было получить доступ, используя эти другие имена / псевдонимы (например, старое имя после переименования псевдонима, чтобы обратная ссылка на старую ссылку / имя работала). Синтаксис: <br> альтернативное имя1, альтернативное имя2, ...
+WEBSITE_CSS_URL=URL внешнего файла CSS
+WEBSITE_CSS_INLINE=Содержимое файла CSS (общее для всех страниц)
+WEBSITE_JS_INLINE=Содержимое файла Javascript (общее для всех страниц)
+WEBSITE_HTML_HEADER=Добавление внизу заголовка HTML (общее для всех страниц)
+WEBSITE_ROBOT=Файл робота (robots.txt)
+WEBSITE_HTACCESS=Файл .htaccess веб-сайта
+WEBSITE_MANIFEST_JSON=Файл manifest.json веб-сайта
+WEBSITE_README=README.md файл
+WEBSITE_KEYWORDSDesc=Используйте запятую для разделения значений
+EnterHereLicenseInformation=Введите здесь метаданные или информацию о лицензии, чтобы заполнить файл README.md. если вы распространяете свой сайт в виде шаблона, файл будет включен в пакет temptate.
+HtmlHeaderPage=Заголовок HTML (только для этой страницы)
+PageNameAliasHelp=Имя или псевдоним страницы. <br> Этот псевдоним также используется для подделки URL-адреса SEO, когда веб-сайт запускается с виртуального хоста веб-сервера (например, Apacke, Nginx, ...). Используйте кнопку «<strong> %s </strong>», чтобы изменить этот псевдоним.
+EditTheWebSiteForACommonHeader=Примечание. Если вы хотите определить персонализированный заголовок для всех страниц, отредактируйте заголовок на уровне сайта, а не на странице / контейнере.
+MediaFiles=Медиа библиотека
+EditCss=Изменить свойства веб-сайта
+EditMenu=Меню редактирования
+EditMedias=Редактировать медиа
+EditPageMeta=Изменить свойства страницы / контейнера
+EditInLine=Редактировать в строке
+AddWebsite=Добавить сайт
+Webpage=Веб-страница / контейнер
+AddPage=Добавить страницу / контейнер
 PageContainer=Страница
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
-RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
-SiteDeleted=Web site '%s' deleted
-PageContent=Page/Contenair
-PageDeleted=Page/Contenair '%s' of website %s deleted
-PageAdded=Page/Contenair '%s' added
-ViewSiteInNewTab=View site in new tab
-ViewPageInNewTab=View page in new tab
-SetAsHomePage=Set as Home page
-RealURL=Real URL
-ViewWebsiteInProduction=View web site using home URLs
+PreviewOfSiteNotYetAvailable=Предварительный просмотр вашего сайта <strong> %s </strong> пока недоступен. Сначала необходимо «<strong> Импортировать полный шаблон веб-сайта </strong>» или просто «<strong> Добавить страницу / контейнер </strong>».
+RequestedPageHasNoContentYet=Запрошенная страница с идентификатором %s еще не имеет содержимого, либо файл кеша .tpl.php был удален. Отредактируйте содержимое страницы, чтобы решить эту проблему.
+SiteDeleted=Веб-сайт "%s" удален.
+PageContent=Страница / Contenair
+PageDeleted=Страница / Contenair '%s' веб-сайта %s удалена.
+PageAdded=Добавлена страница / Contenair '%s'
+ViewSiteInNewTab=Просмотреть сайт в новой вкладке
+ViewPageInNewTab=Просмотреть страницу в новой вкладке
+SetAsHomePage=Установить в качестве домашней страницы
+RealURL=Реальный URL
+ViewWebsiteInProduction=Просмотр веб-сайта с использованием домашних URL-адресов
 SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server (Apache, Nginx, ...) a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong>
-ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
+ExampleToUseInApacheVirtualHostConfig=Пример использования в настройке виртуального хоста Apache:
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
-YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
+YouCanAlsoDeployToAnotherWHP= <u> Запустите свой веб-сайт с другим провайдером хостинга Dolibarr </u> <br> Если у вас нет веб-сервера, такого как Apache или NGinx, доступного в Интернете, вы можете экспортировать и импортировать свой веб-сайт на другой экземпляр Dolibarr, предоставленный другим провайдером хостинга Dolibarr, который предоставляет полную интеграция с модулем Веб-сайт. Вы можете найти список некоторых хостинг-провайдеров Dolibarr на <a href="https://saas.dolibarr.org" target="_blank"> https://saas.dolibarr.org </a>
 CheckVirtualHostPerms=Check also that the virtual host user (for example www-data) has <strong>%s</strong> permissions on files into<br><strong>%s</strong>
 ReadPerm=Читать
-WritePerm=Write
-TestDeployOnWeb=Test/deploy on web
+WritePerm=Писать
+TestDeployOnWeb=Тестирование / развертывание в Интернете
 PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
-VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
-NoPageYet=No pages yet
-YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
-SyntaxHelp=Help on specific syntax tips
-YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-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, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<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 includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&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 a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&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/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+PreviewSiteServedByDolibarr= <u> Предварительный просмотр %s в новой вкладке. </u> <br> <br> %s будет обслуживаться сервером Dolibarr, поэтому для него не требуется установка какого-либо дополнительного веб-сервера (например, Apache, Nginx, IIS). <br> Неудобство в том, что URL-адреса страниц не удобны для пользователя и начинаются с пути вашего Dolibarr. <br> URL обслуживается Dolibarr: <br> <strong> %s </strong> <br> <br> Чтобы использовать собственный внешний веб-сервер для обслуживания данного веб-сайта, создать виртуальный хост на вашем веб-сервере, который указывает на каталог <br> <strong> %s </strong> <br> введите имя этого виртуального сервера в свойствах этого веб-сайта и щелкните ссылку «Проверить / Развернуть в Интернете».
+VirtualHostUrlNotDefined=URL-адрес виртуального хоста, обслуживаемого внешним веб-сервером, не определен
+NoPageYet=Страниц пока нет
+YouCanCreatePageOrImportTemplate=Вы можете создать новую страницу или импортировать полный шаблон сайта.
+SyntaxHelp=Справка по конкретным советам по синтаксису
+YouCanEditHtmlSourceckeditor=Вы можете редактировать исходный код HTML с помощью кнопки «Источник» в редакторе.
+YouCanEditHtmlSource= <br> <span class="fa fa-bug"> </span> Вы можете включить PHP-код в этот источник, используя теги <strong> &lt;? php? &gt; a0ac65d071f. Доступны следующие глобальные переменные: $ conf, $ db, $ mysoc, $ user, $ website, $ websitepage, $ weblangs, $ pagelangs. <br> <br> <span class="fa fa-bug"> </span> Вы также можете включить содержимое другой страницы / контейнера со следующим синтаксисом: <br> <strong> a03900df; ? &gt; </strong> <br> <br> <span class="fa fa-bug"> </span> Вы можете сделать редирект на другую страницу / контейнер со следующим синтаксисом (Примечание: не выводите контента перед перенаправлением): <br> <strong> &lt; PHP redirectToContainer ( «alias_of_container_to_redirect_to»); ? &gt; </strong> <br> <br> <span class="fa fa-link"> </span> Чтобы добавить ссылку на другую страницу, используйте следующий синтаксис: <br> <strong> &lt;a HREF = "alias_of_page_to_link_to.php" &gt;mylink&lt;a&gt; </strong> <br> <br> <span class="fa fa-download"> </span> Чтобы включить ссылку <strong> для загрузки </strong> файла, хранящегося в <strong> документов </strong> каталога, используйте <strong> document.php </strong> обертку: <br> Пример для файла в документы / ЕСС (необходимо быть зарегистрированным), синтаксис: <br> <strong> &lt;a HREF = "/ document.php modulepart = ЕСМ и файл = [relative_dir / ] filename.ext "&gt; </strong> <br> Для файла в документах / носителях (открытый каталог для общего доступа) синтаксис следующий: <br> <strong> a039cz =df7d31 "/document.php?modulepart=medias&file=[relative_dir/ visiblefilename.ext"&gt; </strong> <br> Для файла, к которому предоставлен общий доступ по ссылке общего доступа (открытый доступ с использованием ключа хэша общего доступа для файла afrex07e03d03e03e03e03e03e03e03e03e03e03e03e03e03e03e03e03e03e03e03e03e03e03e03e03e03e03e03e9e03e03e03e3e03e9e0ecfcfc07e19e03 /document.php?hashp=publicsharekeyoffile"&gt; </strong> <br> <br> <span class="fa fa-picture-o"> </span> Чтобы включить </strong> <strong> изображения, хранящейся в <strong> документов </strong> каталога, используйте <strong> viewimage.php </strong> обертку: <br> Например, для изображения в документы / медиа (открытый каталог для общего доступа), синтаксис: <br> <strong> &lt;img src = "/ viewimage.php? modulepart = medias&amp;file = [relative_dir / ]cfz0cd0file = [relative_dir / ]cfz0d06ext" a00a
 #YouCanEditHtmlSource2=<br><span class="fa fa-picture-o"></span> To include a <strong>image</strong> shared publicaly, use the <strong>viewimage.php</strong> wrapper:<br>Example with a shared key 123456789, syntax is:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
-YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
-YouCanEditHtmlSourceMore=<br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
-ClonePage=Clone page/container
-CloneSite=Clone site
-SiteAdded=Website 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.
-ParentPageId=Parent page ID
-WebsiteId=Website ID
-CreateByFetchingExternalPage=Create page/container by fetching page from external URL...
-OrEnterPageInfoManually=Or create page from scratch or from a page template...
-FetchAndCreate=Fetch and Create
-ExportSite=Export website
-ImportSite=Import website template
-IDOfPage=Id of page
-Banner=Banner
-BlogPost=Blog post
-WebsiteAccount=Website account
+YouCanEditHtmlSource2=Для изображения, к которому предоставлен общий доступ по ссылке общего доступа (открытый доступ с использованием хеш-ключа общего доступа к файлу), синтаксис следующий: <br> <strong> &lt;img src = "/ viewimage.php? Hashp = 12345679012 ..." a0012c7z0cd
+YouCanEditHtmlSourceMore= <br> Дополнительные примеры HTML или динамического кода доступны на <a href="%s" target="_blank"> в вики-документации </a> <br>.
+ClonePage=Клонировать страницу / контейнер
+CloneSite=Клонировать сайт
+SiteAdded=Сайт добавлен
+ConfirmClonePage=Пожалуйста, введите код / псевдоним новой страницы, и если это перевод клонированной страницы.
+PageIsANewTranslation=Новая страница - это перевод текущей страницы?
+LanguageMustNotBeSameThanClonedPage=Вы клонируете страницу как перевод. Язык новой страницы должен отличаться от языка исходной страницы.
+ParentPageId=Идентификатор родительской страницы
+WebsiteId=Идентификатор веб-сайта
+CreateByFetchingExternalPage=Создайте страницу / контейнер, загрузив страницу с внешнего URL ...
+OrEnterPageInfoManually=Или создать страницу с нуля или из шаблона страницы ...
+FetchAndCreate=Получить и создать
+ExportSite=Сайт экспорта
+ImportSite=Импортировать шаблон сайта
+IDOfPage=Идентификатор страницы
+Banner=Баннер
+BlogPost=Сообщение блога
+WebsiteAccount=Аккаунт на сайте
 WebsiteAccounts=Аккаунты сайта
-AddWebsiteAccount=Create web site account
-BackToListForThirdParty=Back to list for the third-party
-DisableSiteFirst=Disable website first
-MyContainerTitle=My web site title
-AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
-SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
-WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party
-YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting javascript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor may not works correclty when used on a grabbed external page.
-OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
-GrabImagesInto=Grab also images found into css and page.
-ImagesShouldBeSavedInto=Images should be saved into directory
-WebsiteRootOfImages=Root directory for website images
-SubdirOfPage=Sub-directory dedicated to page
-AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
-CorporateHomePage=Corporate Home page
-EmptyPage=Empty page
-ExternalURLMustStartWithHttp=External URL must start with http:// or https://
-ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
-ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
-ShowSubcontainers=Show dynamic content
-InternalURLOfPage=Internal URL of page
-ThisPageIsTranslationOf=This page/container is a translation of
-ThisPageHasTranslationPages=This page/container has translation
-NoWebSiteCreateOneFirst=No website has been created yet. Create one first.
-GoTo=Go to
-DynamicPHPCodeContainsAForbiddenInstruction=You add dynamic PHP code that contains the PHP instruction '<strong>%s</strong>' that is forbidden by default as dynamic content (see hidden options WEBSITE_PHP_ALLOW_xxx to increase list of allowed commands).
-NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynamic content in websites. Ask permission or just keep code into php tags unmodified.
-ReplaceWebsiteContent=Search or Replace website content
-DeleteAlsoJs=Delete also all javascript files specific to this website?
-DeleteAlsoMedias=Delete also all medias files specific to this website?
-MyWebsitePages=My website pages
-SearchReplaceInto=Search | Replace into
-ReplaceString=New string
-CSSContentTooltipHelp=Enter here CSS content. To avoid any conflict with the CSS of the application, be sure to prepend all declaration with the .bodywebsite class. For example:<br><br>#mycssselector, input.myclass:hover { ... }<br>must be<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>Note: If you have a large file without this prefix, you can use 'lessc' to convert it to append the .bodywebsite prefix everywhere.
-LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page.
-Dynamiccontent=Sample of a page with dynamic content
-ImportSite=Import website template
-EditInLineOnOff=Mode 'Edit inline' is %s
-ShowSubContainersOnOff=Mode to execute 'dynamic content' is %s
-GlobalCSSorJS=Global CSS/JS/Header file of web site
-BackToHomePage=Back to home page...
-TranslationLinks=Translation links
-YouTryToAccessToAFileThatIsNotAWebsitePage=You try to access to a page that is not available.<br>(ref=%s, type=%s, status=%s)
-UseTextBetween5And70Chars=For good SEO practices, use a text between 5 and 70 characters
-MainLanguage=Main language
-OtherLanguages=Other languages
-UseManifest=Provide a manifest.json file
-PublicAuthorAlias=Public author alias
-AvailableLanguagesAreDefinedIntoWebsiteProperties=Available languages are defined into website properties
-ReplacementDoneInXPages=Replacement done in %s pages or containers
+AddWebsiteAccount=Создать учетную запись веб-сайта
+BackToListForThirdParty=Вернуться к списку для сторонних разработчиков
+DisableSiteFirst=Сначала отключите веб-сайт
+MyContainerTitle=Заголовок моего веб-сайта
+AnotherContainer=Вот как включить содержимое другой страницы / контейнера (здесь может возникнуть ошибка, если вы включите динамический код, потому что встроенный подконтейнер может не существовать)
+SorryWebsiteIsCurrentlyOffLine=Извините, этот веб-сайт в настоящее время отключен. Пожалуйста, вернитесь позже ...
+WEBSITE_USE_WEBSITE_ACCOUNTS=Включить таблицу учетной записи веб-сайта
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Включите таблицу для хранения учетных записей веб-сайтов (логин / пароль) для каждого веб-сайта / третьей стороны
+YouMustDefineTheHomePage=Вы должны сначала определить домашнюю страницу по умолчанию
+OnlyEditionOfSourceForGrabbedContentFuture=Предупреждение: создание веб-страницы путем импорта внешней веб-страницы зарезервировано для опытных пользователей. В зависимости от сложности исходной страницы результат импорта может отличаться от оригинала. Кроме того, если исходная страница использует общие стили CSS или конфликтующий JavaScript, это может нарушить внешний вид или функции редактора веб-сайта при работе с этой страницей. Этот метод является более быстрым способом создания страницы, но рекомендуется создавать новую страницу с нуля или из предложенного шаблона страницы. <br> Обратите внимание, что встроенный редактор может работать некорректно при использовании на захваченной внешней странице.
+OnlyEditionOfSourceForGrabbedContent=Только редактирование исходного кода HTML возможно, если контент был получен с внешнего сайта.
+GrabImagesInto=Также возьмите изображения, найденные в css и page.
+ImagesShouldBeSavedInto=Изображения должны быть сохранены в каталог
+WebsiteRootOfImages=Корневой каталог для изображений веб-сайтов
+SubdirOfPage=Подкаталог, посвященный странице
+AliasPageAlreadyExists=Страница псевдонима <strong> %s </strong> уже существует
+CorporateHomePage=Корпоративная домашняя страница
+EmptyPage=Пустая страница
+ExternalURLMustStartWithHttp=Внешний URL-адрес должен начинаться с http: // или https: //.
+ZipOfWebsitePackageToImport=Загрузите Zip-файл пакета шаблона веб-сайта
+ZipOfWebsitePackageToLoad=или Выберите доступный пакет встроенного шаблона веб-сайта
+ShowSubcontainers=Показать динамический контент
+InternalURLOfPage=Внутренний URL страницы
+ThisPageIsTranslationOf=Эта страница / контейнер является переводом
+ThisPageHasTranslationPages=Эта страница / контейнер имеет перевод
+NoWebSiteCreateOneFirst=Веб-сайт еще не создан. Сначала создайте его.
+GoTo=Перейти к
+DynamicPHPCodeContainsAForbiddenInstruction=Вы добавляете динамический код PHP, который содержит инструкцию PHP '<strong> %s </strong>', которая по умолчанию запрещена как динамическое содержимое (см. Скрытые параметры WEBSITE_PHP_ALLOW_xxx для увеличения списка разрешенных команд).
+NotAllowedToAddDynamicContent=У вас нет разрешения на добавление или редактирование динамического содержимого PHP на веб-сайтах. Спросите разрешения или просто сохраните код в тегах php без изменений.
+ReplaceWebsiteContent=Поиск или замена содержимого веб-сайта
+DeleteAlsoJs=Удалить также все файлы javascript, относящиеся к этому веб-сайту?
+DeleteAlsoMedias=Удалить также все файлы мультимедиа, относящиеся к этому веб-сайту?
+MyWebsitePages=Страницы моего сайта
+SearchReplaceInto=Поиск | Заменить на
+ReplaceString=Новая строка
+CSSContentTooltipHelp=Введите сюда содержимое CSS. Чтобы избежать конфликта с CSS приложения, обязательно добавляйте все объявления к классу .bodywebsite. Например: <br> <br> #mycssselector, input.myclass: hover {...} <br> должен иметь значение <br> .bodywebsite #mycssselector, .bodywebsite input.zfda19bz0file без файла abda2fcfdddbxfdddbxfdddbxfcfdbxf6ebfcfcfdbfddfdbfdbfcf6eb09 этот префикс, вы можете использовать 'lessc', чтобы преобразовать его, чтобы везде добавлять префикс .bodywebsite.
+LinkAndScriptsHereAreNotLoadedInEditor=Предупреждение: этот контент выводится только при доступе к сайту с сервера. Он не используется в режиме редактирования, поэтому, если вам нужно загрузить файлы javascript также в режиме редактирования, просто добавьте свой тег script src = ... на страницу.
+Dynamiccontent=Образец страницы с динамическим контентом
+ImportSite=Импортировать шаблон сайта
+EditInLineOnOff=Режим 'Edit inline': %s
+ShowSubContainersOnOff=Режим для выполнения «динамического содержимого»: %s
+GlobalCSSorJS=Глобальный CSS / JS / заголовочный файл веб-сайта
+BackToHomePage=Вернуться на главную ...
+TranslationLinks=Ссылки на перевод
+YouTryToAccessToAFileThatIsNotAWebsitePage=Вы пытаетесь получить доступ к странице, которая недоступна. <br> (ref = %s, type = %s, status = %s)
+UseTextBetween5And70Chars=Для правильного SEO используйте текст от 5 до 70 символов.
+MainLanguage=Главный язык
+OtherLanguages=Другие языки
+UseManifest=Предоставьте файл manifest.json
+PublicAuthorAlias=Псевдоним публичного автора
+AvailableLanguagesAreDefinedIntoWebsiteProperties=Доступные языки определены в свойствах веб-сайта.
+ReplacementDoneInXPages=Замена выполняется в страницах или контейнерах %s
 RSSFeed=RSS-канал
-RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL
-PagesRegenerated=%s page(s)/container(s) regenerated
-RegenerateWebsiteContent=Regenerate web site cache files
-AllowedInFrames=Allowed in Frames
-DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
-GenerateSitemaps=Generate website sitemap file
-ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
-ConfirmSitemapsCreation=Confirm sitemap generation
-SitemapGenerated=Sitemap file <b>%s</b> generated
-ImportFavicon=Favicon
-ErrorFaviconType=Favicon must be png
-ErrorFaviconSize=Favicon must be sized 16x16, 32x32 or 64x64
-FaviconTooltip=Upload an image which needs to be a png (16x16, 32x32 or 64x64)
+RSSFeedDesc=Вы можете получить RSS-канал последних статей с типом "блог-пост", используя этот URL-адрес.
+PagesRegenerated=%s страниц / контейнер (ы) восстановлено
+RegenerateWebsiteContent=Восстановить файлы кеша веб-сайта
+AllowedInFrames=Разрешено в кадрах
+DefineListOfAltLanguagesInWebsiteProperties=Определите список всех доступных языков в свойствах веб-сайта.
+GenerateSitemaps=Создать файл карты сайта
+ConfirmGenerateSitemaps=Если вы подтвердите, вы удалите существующий файл карты сайта ...
+ConfirmSitemapsCreation=Подтвердите создание карты сайта
+SitemapGenerated=Создан файл Sitemap <b> %s </b>
+ImportFavicon=Фавикон
+ErrorFaviconType=Фавикон должен быть в формате png.
+ErrorFaviconSize=Размер Favicon должен быть 16x16, 32x32 или 64x64.
+FaviconTooltip=Загрузите изображение в формате png (16x16, 32x32 или 64x64).
diff --git a/htdocs/langs/ru_RU/withdrawals.lang b/htdocs/langs/ru_RU/withdrawals.lang
index 2b878111e01..13ddc9846bb 100644
--- a/htdocs/langs/ru_RU/withdrawals.lang
+++ b/htdocs/langs/ru_RU/withdrawals.lang
@@ -1,50 +1,51 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=Payments by Direct debit orders
-SuppliersStandingOrdersArea=Payments by Credit transfer
-StandingOrdersPayment=Direct debit payment orders
-StandingOrderPayment=Direct debit payment order
-NewStandingOrder=New direct debit order
-NewPaymentByBankTransfer=New payment by credit transfer
+CustomersStandingOrdersArea=Платежи по поручению прямого дебета
+SuppliersStandingOrdersArea=Платежи кредитным переводом
+StandingOrdersPayment=Платежные поручения с прямым дебетом
+StandingOrderPayment=Платежное поручение прямого дебета
+NewStandingOrder=Новое распоряжение о прямом дебете
+NewPaymentByBankTransfer=Новый платеж кредитным переводом
 StandingOrderToProcess=Для обработки
-PaymentByBankTransferReceipts=Credit transfer orders
-PaymentByBankTransferLines=Credit transfer order lines
-WithdrawalsReceipts=Direct debit orders
+PaymentByBankTransferReceipts=Распоряжения о переводе кредита
+PaymentByBankTransferLines=Строки поручения на перевод кредита
+WithdrawalsReceipts=Распоряжения прямого дебетования
 WithdrawalReceipt=Прямой дебетовый заказ
-BankTransferReceipts=Credit transfer orders
-BankTransferReceipt=Credit transfer order
-LatestBankTransferReceipts=Latest %s credit transfer orders
-LastWithdrawalReceipts=Latest %s direct debit files
-WithdrawalsLine=Direct debit order line
-CreditTransferLine=Credit transfer line
-WithdrawalsLines=Direct debit order lines
-CreditTransferLines=Credit transfer lines
-RequestStandingOrderToTreat=Requests for direct debit payment order to process
-RequestStandingOrderTreated=Requests for direct debit payment order processed
-RequestPaymentsByBankTransferToTreat=Requests for credit transfer to process
-RequestPaymentsByBankTransferTreated=Requests for credit transfer processed
-NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
-NbOfInvoiceToWithdraw=No. of qualified customer invoices with waiting direct debit order
-NbOfInvoiceToWithdrawWithInfo=No. of customer invoice with direct debit payment orders having defined bank account information
-NbOfInvoiceToPayByBankTransfer=No. of qualified supplier invoices waiting for a payment by credit transfer
-SupplierInvoiceWaitingWithdraw=Vendor invoice waiting for payment by credit transfer
-InvoiceWaitingWithdraw=Invoice waiting for direct debit
-InvoiceWaitingPaymentByBankTransfer=Invoice waiting for credit transfer
+BankTransferReceipts=Распоряжения о переводе кредита
+BankTransferReceipt=Распоряжение о переводе кредита
+LatestBankTransferReceipts=Последние заказы на кредитный перевод %s
+LastWithdrawalReceipts=Последние файлы прямого дебета %s
+WithdrawalsLine=Строка ордера на прямой дебет
+CreditTransferLine=Кредитная переводная линия
+WithdrawalsLines=Строки распоряжения о прямом дебетовании
+CreditTransferLines=Кредитные переводные линии
+RequestStandingOrderToTreat=Запросы на обработку платежного поручения прямым дебетом
+RequestStandingOrderTreated=Запросы на платежное поручение прямого дебета обработаны
+RequestPaymentsByBankTransferToTreat=Запросы на перевод кредита для обработки
+RequestPaymentsByBankTransferTreated=Запросы на перевод кредита обработаны
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Пока не возможно. Статус вывода должен быть установлен на «кредит» до объявления отказа в определенных строках.
+NbOfInvoiceToWithdraw=Количество квалифицированных счетов-фактур клиентов с ожидающим поручением на прямой дебет
+NbOfInvoiceToWithdrawWithInfo=Номер счета-фактуры клиента с платежными поручениями прямого дебета, в которых указана информация о банковском счете.
+NbOfInvoiceToPayByBankTransfer=Количество счетов-фактур квалифицированных поставщиков, ожидающих оплаты кредитовым переводом
+SupplierInvoiceWaitingWithdraw=Счет поставщика ожидает оплаты кредитным переводом
+InvoiceWaitingWithdraw=Счет-фактура ожидает прямого дебетования
+InvoiceWaitingPaymentByBankTransfer=Счет-фактура ожидает кредитового перевода
 AmountToWithdraw=Сумма снятия
-NoInvoiceToWithdraw=No invoice open for '%s' is waiting. Go on tab '%s' on invoice card to make a request.
-NoSupplierInvoiceToWithdraw=No supplier invoice with open 'Direct credit requests' is waiting. Go on tab '%s' on invoice card to make a request.
-ResponsibleUser=User Responsible
-WithdrawalsSetup=Direct debit payment setup
-CreditTransferSetup=Credit transfer setup
-WithdrawStatistics=Direct debit payment statistics
-CreditTransferStatistics=Credit transfer statistics
+NoInvoiceToWithdraw=Открытых счетов на «%s» нет. Перейдите на вкладку «%s» в карточке счета, чтобы сделать запрос.
+NoSupplierInvoiceToWithdraw=Счет-фактура поставщика с открытыми «прямыми запросами на кредит» не ожидает. Перейдите на вкладку «%s» в карточке счета, чтобы сделать запрос.
+ResponsibleUser=Ответственный пользователь
+WithdrawalsSetup=Настройка оплаты прямым дебетом
+CreditTransferSetup=Настройка кредитного перевода
+WithdrawStatistics=Статистика платежей прямым дебетом
+CreditTransferStatistics=Статистика кредитных переводов
 Rejects=Отказы
-LastWithdrawalReceipt=Latest %s direct debit receipts
-MakeWithdrawRequest=Make a direct debit payment request
-MakeBankTransferOrder=Make a credit transfer request
-WithdrawRequestsDone=%s direct debit payment requests recorded
-BankTransferRequestsDone=%s credit transfer requests recorded
-ThirdPartyBankCode=Third-party bank code
-NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
+LastWithdrawalReceipt=Последние квитанции прямого дебета %s
+MakeWithdrawRequest=Сделайте запрос на прямой дебетовый платеж
+MakeBankTransferOrder=Сделайте запрос на перевод кредита
+WithdrawRequestsDone=%s записанные запросы на платеж прямым дебетом
+BankTransferRequestsDone=Запросы на перевод кредита %s записаны
+ThirdPartyBankCode=Код стороннего банка
+NoInvoiceCouldBeWithdrawed=Счет-фактура не списана успешно. Убедитесь, что счета выставлены на компании с действующим IBAN и что IBAN имеет UMR (уникальный мандат) с режимом <strong> %s </strong>.
+WithdrawalCantBeCreditedTwice=Эта квитанция о снятии средств уже помечена как зачисленная; это нельзя сделать дважды, так как это потенциально может привести к дублированию платежей и банковских операций.
 ClassCredited=Классифицировать зачисленных
 ClassCreditedConfirm=Вы уверены, что хотите классифицировать это изъятие   как кредит на вашем счету в банке?
 TransData=Дата передачи
@@ -52,101 +53,101 @@ TransMetod=Метод передачи
 Send=Отправить
 Lines=Строки
 StandingOrderReject=Выпуск отклонить
-WithdrawsRefused=Direct debit refused
+WithdrawsRefused=Отказ в прямом дебетовании
 WithdrawalRefused=Выплаты Refuseds
-CreditTransfersRefused=Credit transfers refused
+CreditTransfersRefused=В переводе кредита отказано
 WithdrawalRefusedConfirm=Вы уверены, что вы хотите ввести снятия отказа общества
 RefusedData=Дата отказа
 RefusedReason=Причина для отказа
 RefusedInvoicing=Счета отказ
 NoInvoiceRefused=Не заряжайте отказ
 InvoiceRefused=Счёт отклонён (отказ платежа клиентом)
-StatusDebitCredit=Status debit/credit
+StatusDebitCredit=Статус дебет / кредит
 StatusWaiting=Ожидание
 StatusTrans=Передающиеся
-StatusDebited=Debited
+StatusDebited=Списанный
 StatusCredited=Кредитоваться
 StatusPaid=Оплачено
 StatusRefused=Отказавшийся
 StatusMotif0=Не указано
 StatusMotif1=Предоставление insuffisante
 StatusMotif2=Тираж conteste
-StatusMotif3=No direct debit payment order
-StatusMotif4=Sales Order
+StatusMotif3=Нет платежного поручения прямого дебета
+StatusMotif4=Заказ клиента
 StatusMotif5=RIB inexploitable
 StatusMotif6=Счет без остатка
 StatusMotif7=Судебное решение
 StatusMotif8=Другая причина
-CreateForSepaFRST=Create direct debit file (SEPA FRST)
-CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
-CreateAll=Create direct debit file (all)
-CreateFileForPaymentByBankTransfer=Create file for credit transfer
-CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
+CreateForSepaFRST=Создать файл прямого дебета (SEPA FRST)
+CreateForSepaRCUR=Создать файл прямого дебета (SEPA RCUR)
+CreateAll=Создать файл прямого дебета (все)
+CreateFileForPaymentByBankTransfer=Создать файл для кредитного перевода
+CreateSepaFileForPaymentByBankTransfer=Создать файл кредитного перевода (SEPA)
 CreateGuichet=Только служба
 CreateBanque=Только банк
 OrderWaiting=Ожидание для лечения
-NotifyTransmision=Record file transmission of order
-NotifyCredit=Record credit of order
+NotifyTransmision=Запись файла передачи заказа
+NotifyCredit=Рекордный кредит заказа
 NumeroNationalEmetter=Национальный передатчик Количество
 WithBankUsingRIB=Для банковских счетов с использованием RIB
 WithBankUsingBANBIC=Для банковских счетов с использованием IBAN / BIC / SWIFT
-BankToReceiveWithdraw=Receiving Bank Account
-BankToPayCreditTransfer=Bank Account used as source of payments
+BankToReceiveWithdraw=Получение банковского счета
+BankToPayCreditTransfer=Банковский счет, используемый в качестве источника платежей
 CreditDate=Кредит на
-WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
-ShowWithdraw=Show Direct Debit Order
-IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Payment by direct debit to generate and manage the direct debit order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Payment by credit transfer to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-WithdrawalFile=Debit order file
-CreditTransferFile=Credit transfer file
+WithdrawalFileNotCapable=Невозможно создать файл квитанции о снятии средств для вашей страны %s (ваша страна не поддерживается)
+ShowWithdraw=Показать распоряжение о прямом дебете
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Однако, если в счете есть хотя бы одно платежное поручение по прямому дебету, которое еще не обработано, оно не будет установлено как оплаченное, чтобы обеспечить возможность предварительного управления снятием средств.
+DoStandingOrdersBeforePayments=Эта вкладка позволяет вам запросить платежное поручение прямого дебета. После этого перейдите в меню Банк-> Оплата прямым дебетом, чтобы сгенерировать и управлять прямым дебетовым поручением. При закрытии поручения на прямой дебет оплата по счетам будет автоматически записана, а счета-фактуры закрываются, если остаток к оплате равен нулю.
+DoCreditTransferBeforePayments=Эта вкладка позволяет вам запросить кредитный перевод. После этого перейдите в меню Банк-> Оплата кредитным переводом, чтобы создать поручение на кредитный перевод и управлять им. При закрытии поручения на перевод кредита оплата по счетам будет автоматически записана, а счета-фактуры закрываются, если остаток к оплате равен нулю.
+WithdrawalFile=Файл дебетового поручения
+CreditTransferFile=Файл кредитного перевода
 SetToStatusSent=Установить статус "Файл отправлен"
-ThisWillAlsoAddPaymentOnInvoice=This will also record payments on invoices and will classify them as "Paid" if remain to pay is null
+ThisWillAlsoAddPaymentOnInvoice=При этом также будут регистрироваться платежи в счетах и они будут классифицированы как "Оплаченные", если оставшаяся сумма не будет равна
 StatisticsByLineStatus=Статистика статуса по строкам
 RUM=UMR
-DateRUM=Mandate signature date
-RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
-WithdrawMode=Direct debit mode (FRST or RECUR)
-WithdrawRequestAmount=Amount of Direct debit request:
-BankTransferAmount=Amount of Credit Transfer request:
-WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
-SepaMandate=SEPA Direct Debit Mandate
-SepaMandateShort=SEPA Mandate
-PleaseReturnMandate=Please return this mandate form by email to %s or by mail to
-SEPALegalText=By signing this mandate form, you authorize (A) %s to send instructions to your bank to debit your account and (B) your bank to debit your account in accordance with the instructions from %s. As part of your rights, you are entitled to a refund from your bank under the terms and conditions of your agreement with your bank. A refund must be claimed within 8 weeks starting from the date on which your account was debited. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
-CreditorIdentifier=Creditor Identifier
-CreditorName=Creditor Name
-SEPAFillForm=(B) Please complete all the fields marked *
-SEPAFormYourName=Your name
-SEPAFormYourBAN=Your Bank Account Name (IBAN)
-SEPAFormYourBIC=Your Bank Identifier Code (BIC)
-SEPAFrstOrRecur=Type of payment
-ModeRECUR=Recurring payment
-ModeFRST=One-off payment
-PleaseCheckOne=Please check one only
-CreditTransferOrderCreated=Credit transfer order %s created
-DirectDebitOrderCreated=Direct debit order %s created
-AmountRequested=Amount requested
+DateRUM=Дата подписания мандата
+RUMLong=Уникальная ссылка на мандат
+RUMWillBeGenerated=Если пусто, после сохранения информации о банковском счете будет сгенерирован UMR (уникальный мандат).
+WithdrawMode=Режим прямого дебета (FRST или RECUR)
+WithdrawRequestAmount=Сумма прямого дебетового запроса:
+BankTransferAmount=Сумма запроса на перевод кредита:
+WithdrawRequestErrorNilAmount=Невозможно создать запрос на прямой дебет для пустой суммы.
+SepaMandate=Мандат прямого дебета SEPA
+SepaMandateShort=Мандат SEPA
+PleaseReturnMandate=Отправьте эту форму поручения по электронной почте на адрес %s или по почте на адрес
+SEPALegalText=Подписывая эту форму поручения, вы разрешаете (A) %s отправлять инструкции в ваш банк для дебетования вашего счета и (B) ваш банк дебетовать ваш счет в соответствии с инструкциями от %s. В рамках ваших прав вы имеете право на возмещение от вашего банка в соответствии с условиями вашего соглашения с вашим банком. Возврат средств необходимо запросить в течение 8 недель с даты списания средств с вашего счета. Ваши права в отношении вышеуказанного мандата разъясняются в заявлении, которое вы можете получить в своем банке.
+CreditorIdentifier=Идентификатор кредитора
+CreditorName=Имя кредитора
+SEPAFillForm=(B) Пожалуйста, заполните все поля, отмеченные *
+SEPAFormYourName=Твое имя
+SEPAFormYourBAN=Имя вашего банковского счета (IBAN)
+SEPAFormYourBIC=Ваш банковский идентификационный код (BIC)
+SEPAFrstOrRecur=Тип платежа
+ModeRECUR=Периодический платеж
+ModeFRST=Единовременный платеж
+PleaseCheckOne=Пожалуйста, отметьте только один
+CreditTransferOrderCreated=Создано поручение на перевод кредита %s
+DirectDebitOrderCreated=Создано поручение на прямое дебетование %s
+AmountRequested=Запрошенная сумма
 SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
-ExecutionDate=Execution date
-CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI for direct debit
-ICSTransfer=Creditor Identifier CI for bank transfer
-END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
-USTRD="Unstructured" SEPA XML tag
-ADDDAYS=Add days to Execution Date
-NoDefaultIBANFound=No default IBAN found for this third party
+ExecutionDate=Дата исполнения
+CreateForSepa=Создать файл прямого дебета
+ICS=Идентификатор кредитора CI для прямого дебетования
+ICSTransfer=Идентификатор кредитора CI для банковского перевода
+END_TO_END=XML-тег SEPA "EndToEndId" - уникальный идентификатор, назначаемый каждой транзакции.
+USTRD=«Неструктурированный» тег SEPA XML
+ADDDAYS=Добавить дни к дате исполнения
+NoDefaultIBANFound=Для этой третьей стороны не найден IBAN по умолчанию
 ### Notifications
-InfoCreditSubject=Payment of direct debit payment order %s by the bank
-InfoCreditMessage=The direct debit payment order %s has been paid by the bank<br>Data of payment: %s
-InfoTransSubject=Transmission of direct debit payment order %s to bank
-InfoTransMessage=The direct debit payment order %s has been sent to bank by %s %s.<br><br>
+InfoCreditSubject=Оплата банком прямого дебетового платежного поручения %s
+InfoCreditMessage=Платежное поручение прямого дебета %s было оплачено банком <br> Данные платежа: %s
+InfoTransSubject=Передача платежного поручения прямого дебета %s в банк
+InfoTransMessage=Платежное поручение прямого дебета %s было отправлено в банк от имени %s %s. <br> <br>
 InfoTransData=Сумма: %s <br> Metode: %s <br> Дата: %s
-InfoRejectSubject=Direct debit payment order refused
-InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
+InfoRejectSubject=Платежное поручение на прямой дебет отклонено
+InfoRejectMessage=Здравствуйте, <br> <br>, платежное поручение прямого дебета по счету %s, относящемуся к компании %s, на сумму %s было отклонено банком. <br> <br> - <br> %s
 ModeWarning=Вариант для реального режима не был установлен, мы останавливаемся после этого моделирования
-ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
-ErrorICSmissing=Missing ICS in Bank account %s
-TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Total amount of direct debit order differs from sum of lines
+ErrorCompanyHasDuplicateDefaultBAN=Компания с идентификатором %s имеет более одного банковского счета по умолчанию. Невозможно узнать, какой из них использовать.
+ErrorICSmissing=Отсутствует ICS на банковском счете %s
+TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Общая сумма прямого дебетового поручения отличается от суммы строк
diff --git a/htdocs/langs/ru_RU/workflow.lang b/htdocs/langs/ru_RU/workflow.lang
index 2d1edff056b..d1ad6fd7864 100644
--- a/htdocs/langs/ru_RU/workflow.lang
+++ b/htdocs/langs/ru_RU/workflow.lang
@@ -3,23 +3,23 @@ WorkflowSetup=Установка модуля Рабочих процессов
 WorkflowDesc=Этот модуль предусматривает автоматические действия. По умолчанию рабочий процесс открыт (вы можете делать все в нужном вам порядке), но здесь вы можете включить какие-либо автоматические действия.
 ThereIsNoWorkflowToModify=Для активированных модулей нет доступных изменений рабочего процесса.
 # Autocreate
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a sales order after a commercial proposal is signed (the new order will have same amount as the proposal)
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (the new invoice will have same amount as the proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Автоматически создавать заказ на продажу после подписания коммерческого предложения (новый заказ будет иметь ту же сумму, что и предложение)
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Автоматически создавать счет-фактуру клиента после подписания коммерческого предложения (новый счет-фактура будет иметь ту же сумму, что и предложение)
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Автоматически создавать счет клиента после проверки договора
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a sales order is closed (the new invoice will have same amount as the order)
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Автоматически создавать счет клиента после закрытия заказа на продажу (новый счет будет иметь ту же сумму, что и заказ)
 # Autoclassify customer proposal or order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposal)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposal)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked order)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales order as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Классифицируйте связанное исходное предложение как выставленное, если для заказа на продажу выставлен счет (и если сумма заказа совпадает с общей суммой подписанного связанного предложения)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Классифицировать предложение из связанного источника как выставленное по счету при проверке счета клиента (и если сумма счета совпадает с общей суммой подписанного связанного предложения)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Классифицируйте связанный исходный заказ на продажу как выставленный по счету при проверке счета клиента (и если сумма счета совпадает с общей суммой связанного заказа)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Классифицируйте связанный исходный заказ на продажу как выставленный, если для счета-фактуры клиента задано значение оплаченного (и если сумма счета-фактуры совпадает с общей суммой связанного заказа)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Классифицируйте связанный исходный заказ на продажу как отгруженный, когда отгрузка проверена (и если количество отгружено по всем отгрузкам такое же, как в заказе на обновление)
 # Autoclassify purchase order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked proposal)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
-descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Классифицируйте предложение поставщика связанного источника как выставленное как выставленное при проверке счета поставщика (и если сумма счета совпадает с общей суммой связанного предложения)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Классифицируйте связанный исходный заказ на покупку как выставленный как выставленный, когда счет-фактура поставщика проверяется (и если сумма счета-фактуры совпадает с общей суммой связанного заказа)
+descWORKFLOW_BILL_ON_RECEPTION=Классифицируйте приемы как "выставленные" при подтверждении связанного заказа поставщика.
 # Autoclose intervention
-descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Закройте все вмешательства, связанные с заявкой, когда заявка закрыта
 AutomaticCreation=Автоматическое создание
 AutomaticClassification=Автоматическая классификация
 # Autoclassify shipment
-descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when customer invoice is validated
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Классифицировать отгрузку из связанного источника как закрытую после подтверждения счета клиента
diff --git a/htdocs/langs/ru_RU/zapier.lang b/htdocs/langs/ru_RU/zapier.lang
index b4cc4ccba4a..58423008350 100644
--- a/htdocs/langs/ru_RU/zapier.lang
+++ b/htdocs/langs/ru_RU/zapier.lang
@@ -13,9 +13,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-ModuleZapierForDolibarrName = Zapier for Dolibarr
-ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
-ZapierForDolibarrSetup=Setup of Zapier for Dolibarr
-ZapierDescription=Interface with Zapier
-ZapierAbout=About the module Zapier
-ZapierSetupPage=There is no need for a setup on Dolibarr side to use Zapier. However, you must generate and publish a package on zapier to be able to use Zapier with Dolibarr. See documentation on <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">this wiki page</a>.
+ModuleZapierForDolibarrName = Zapier для Dolibarr
+ModuleZapierForDolibarrDesc = Zapier для модуля Dolibarr
+ZapierForDolibarrSetup=Настройка Zapier для Dolibarr
+ZapierDescription=Интерфейс с Zapier
+ZapierAbout=О модуле Zapier
+ZapierSetupPage=Для использования Zapier на стороне Dolibarr нет необходимости. Однако вы должны сгенерировать и опубликовать пакет на zapier, чтобы иметь возможность использовать Zapier с Dolibarr. См. Документацию на <a href="https://wiki.dolibarr.org/index.php/Module_Zapier"> на этой вики-странице </a>.
diff --git a/htdocs/langs/ru_UA/accountancy.lang b/htdocs/langs/ru_UA/accountancy.lang
new file mode 100644
index 00000000000..ef9e69e554a
--- /dev/null
+++ b/htdocs/langs/ru_UA/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
diff --git a/htdocs/langs/ru_UA/admin.lang b/htdocs/langs/ru_UA/admin.lang
new file mode 100644
index 00000000000..c1d306ec390
--- /dev/null
+++ b/htdocs/langs/ru_UA/admin.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - admin
+OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/ru_UA/cron.lang b/htdocs/langs/ru_UA/cron.lang
deleted file mode 100644
index 67ecfc77567..00000000000
--- a/htdocs/langs/ru_UA/cron.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - cron
-CronTaskInactive=This job is disabled
diff --git a/htdocs/langs/ru_UA/exports.lang b/htdocs/langs/ru_UA/exports.lang
new file mode 100644
index 00000000000..17dedd46696
--- /dev/null
+++ b/htdocs/langs/ru_UA/exports.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - exports
+DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
diff --git a/htdocs/langs/ru_UA/mrp.lang b/htdocs/langs/ru_UA/mrp.lang
deleted file mode 100644
index 4d8f6b98309..00000000000
--- a/htdocs/langs/ru_UA/mrp.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - mrp
-BillOfMaterials=Bill of Material
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
diff --git a/htdocs/langs/ru_UA/products.lang b/htdocs/langs/ru_UA/products.lang
new file mode 100644
index 00000000000..e0628dbec00
--- /dev/null
+++ b/htdocs/langs/ru_UA/products.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - products
+ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
diff --git a/htdocs/langs/ru_UA/stocks.lang b/htdocs/langs/ru_UA/stocks.lang
new file mode 100644
index 00000000000..1cae5cf3f11
--- /dev/null
+++ b/htdocs/langs/ru_UA/stocks.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - stocks
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+OpenInternal=Open only for internal actions
diff --git a/htdocs/langs/ru_UA/ticket.lang b/htdocs/langs/ru_UA/ticket.lang
new file mode 100644
index 00000000000..82e110b1ca4
--- /dev/null
+++ b/htdocs/langs/ru_UA/ticket.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - ticket
+TicketTypeShortISSUE=Issue, bug or problem
+OriginEmail=Email source
+NeedMoreInformation=Waiting for information
+TicketCategory=Group
diff --git a/htdocs/langs/sk_SK/accountancy.lang b/htdocs/langs/sk_SK/accountancy.lang
index 49176f22261..18372d8d149 100644
--- a/htdocs/langs/sk_SK/accountancy.lang
+++ b/htdocs/langs/sk_SK/accountancy.lang
@@ -158,7 +158,7 @@ ACCOUNTING_LENGTH_AACCOUNT=Length of the third-party accounting accounts (If you
 ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of an accounting account. Needed by some countries (like Switzerland). If set to off (default), you can set the following two parameters to ask the application to add virtual zeros.
 BANK_DISABLE_DIRECT_INPUT=Zakázať priame zaznamenávanie transakcie na bankový účet
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties, break ability to search on a part of value)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
@@ -328,6 +328,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountanc
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
+NotifiedExportDate=Notified export date (modification of the entries will not be possible)
+NotifiedValidationDate=Validation of the entries (modification or deletion of the entries will not be possible)
+ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=Export draft journal
 Modelcsv=Vzor exportu
 Selectmodelcsv=Vyberte model exportu
diff --git a/htdocs/langs/sk_SK/admin.lang b/htdocs/langs/sk_SK/admin.lang
index 238bebf040b..365778f4fe8 100644
--- a/htdocs/langs/sk_SK/admin.lang
+++ b/htdocs/langs/sk_SK/admin.lang
@@ -221,8 +221,8 @@ NotCompatible=This module does not seem compatible with your Dolibarr %s (Min %s
 CompatibleAfterUpdate=This module requires an update to your Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=See in Market place
 SeeSetupOfModule=See setup of module %s
+SetOptionTo=Set option <b>%s</b> to %s
 Updated=Updated
-Nouveauté=Novelty
 AchatTelechargement=Buy / Download
 GoModuleSetupArea=To deploy/install a new module, go to the Module setup area: <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, oficiálny trh pre Dolibarr ERP / CRM externých modulov
@@ -399,6 +399,7 @@ SecurityToken=Kľúč k zabezpečenej URL
 NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
 PDF=PDF
 PDFDesc=Global options for PDF generation
+PDFOtherDesc=PDF Option specific to some modules
 PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
 PDFRulesForSalesTax=Rules for Sales Tax / VAT
@@ -561,7 +562,7 @@ Module53Desc=Management of Services
 Module54Name=Zmluvy / Predplatné
 Module54Desc=Management of contracts (services or recurring subscriptions)
 Module55Name=Čiarové kódy
-Module55Desc=Barcode riadenie
+Module55Desc=Barcode or QR code management
 Module56Name=Payment by credit transfer
 Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
 Module57Name=Payments by Direct Debit
@@ -848,10 +849,10 @@ Permission402=Vytvoriť / upraviť zľavy
 Permission403=Overiť zľavy
 Permission404=Odstrániť zľavy
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries (yours and subordinates)
-Permission512=Create/modify payments of salaries
-Permission514=Delete payments of salaries
-Permission517=Read payments of salaries of everybody
+Permission511=Read salaries and payments (yours and subordinates)
+Permission512=Create/modify salaries and payments
+Permission514=Delete salaries and payments
+Permission517=Read salaries and payments everybody
 Permission519=Exportovať platy
 Permission520=Čítať pôžičky
 Permission522=Vytvoriť/Upraviť pôžičky
@@ -965,6 +966,8 @@ Permission23003=Odstrániť naplánovanú úlohu
 Permission23004=Spustiť naplánovanú úlohu
 Permission50101=Use Point of Sale (SimplePOS)
 Permission50151=Use Point of Sale (TakePOS)
+Permission50152=Edit sales lines
+Permission50153=Edit ordered sales lines
 Permission50201=Prečítajte transakcie
 Permission50202=Importné operácie
 Permission50330=Read objects of Zapier
@@ -1039,11 +1042,12 @@ DictionaryMeasuringUnits=Measuring Units
 DictionarySocialNetworks=Social Networks
 DictionaryProspectStatus=Prospect status for companies
 DictionaryProspectContactStatus=Prospect status for contacts
-DictionaryHolidayTypes=Types of leave
+DictionaryHolidayTypes=Leave - Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
 DictionaryTransportMode=Intracomm report - Transport mode
+DictionaryBatchStatus=Product lot/serial Quality Control status
 TypeOfUnit=Type of unit
 SetupSaved=Nastavenie uložené
 SetupNotSaved=Setup not saved
@@ -1187,7 +1191,7 @@ SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of m
 SetupDescription5=Other Setup menu entries manage optional parameters.
 AuditedSecurityEvents=Security events that are audited
 NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
-Audit=Audit
+Audit=Security events
 InfoDolibarr=O Dolibarre
 InfoBrowser=O prehliadači
 InfoOS=O OS
@@ -1319,9 +1323,12 @@ ConditionIsCurrently=Podmienkou je v súčasnej dobe %s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
 NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
+ComboListOptim=Combo list loading optimization
 SearchOptim=Optimalizácia pre vyhľadávače
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
-YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
+YouHaveXObjectUseComboOptim=You have %s %s in the database. You can go into setup of module to enable loading of combo list on key pressed event.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other.
+YouHaveXObjectUseSearchOptimDesc=This limits the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to %s in Home-Setup-Other.
 BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
 BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
 PHPModuleLoaded=PHP component %s is loaded
@@ -1433,6 +1440,7 @@ MemberMainOptions=Hlavné voľby
 AdherentLoginRequired= Spravovanie Prihlásenie pre každého člena
 AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Zaškrtávacie políčko poslať mailom potvrdenie členom (validácia alebo nové predplatné) je v predvolenom nastavení
+MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
 MembersDocModules=Document templates for documents generated from member record
@@ -1763,7 +1771,7 @@ AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting men
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
-AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the scheduled job %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Kliknite pre Dial Nastavenie modulu
@@ -1979,6 +1987,8 @@ 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_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add picture on proposal line
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add electronic sign in PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
@@ -2096,7 +2106,6 @@ PDF_SHOW_PROJECT=Show project on document
 ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
-FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
@@ -2120,12 +2129,18 @@ ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by
 MailToSendEventOrganization=Event Organization
 AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
 YouShouldDisablePHPFunctions=You should disable PHP functions
-IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands in custom code, you shoud disable PHP functions
+PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
+NotRecommended=Not recommanded
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
 ModuleUpdateAvailable=An update is available
 NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
+RandomlySelectedIfSeveral=Randomly selected if several pictures are available
+DatabasePasswordObfuscated=Database password is obfuscated in conf file
+DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
diff --git a/htdocs/langs/sk_SK/agenda.lang b/htdocs/langs/sk_SK/agenda.lang
index b326ed7fc23..5f49d9323eb 100644
--- a/htdocs/langs/sk_SK/agenda.lang
+++ b/htdocs/langs/sk_SK/agenda.lang
@@ -4,7 +4,7 @@ Actions=Udalosti
 Agenda=Program rokovania
 TMenuAgenda=Program rokovania
 Agendas=Program
-LocalAgenda=Interný kalendár
+LocalAgenda=Default calendar
 ActionsOwnedBy=Udalosť vytvorená: 
 ActionsOwnedByShort=Majiteľ
 AffectedTo=Priradené
@@ -14,13 +14,13 @@ EventsNb=Počet udalostí
 ListOfActions=Zoznam udalostí
 EventReports=Event reports
 Location=Umiestnenie
-ToUserOfGroup=Event assigned to any user in group
+ToUserOfGroup=Event assigned to any user in the group
 EventOnFullDay=Akcie po celý deň (y)
 MenuToDoActions=Všetky neúplné udalosti
 MenuDoneActions=Všetky ukončené akcie
 MenuToDoMyActions=Moje neúplné udalosti
 MenuDoneMyActions=Moje ukončených akcií
-ListOfEvents=Zoznam udalostí (interný kalendár)
+ListOfEvents=List of events (default calendar)
 ActionsAskedBy=Akcia hlásené
 ActionsToDoBy=Akcia priradené
 ActionsDoneBy=Akcie vykonané
@@ -38,6 +38,7 @@ ActionsEvents=Udalosti, pre ktoré Dolibarr vytvorí akciu v programe automatick
 EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Tretia strana %s vytvorená
+COMPANY_MODIFYInDolibarr=Third party %s modified
 COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=Zmluva %s overená
 CONTRACT_DELETEInDolibarr=Contract %s deleted
@@ -87,6 +88,7 @@ OrderDeleted=Objednávka zmazaná
 InvoiceDeleted=Faktúra zmazaná
 DraftInvoiceDeleted=Draft invoice deleted
 CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_MODIFYInDolibarr=Contact %s modified
 CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Product %s created
 PRODUCT_MODIFYInDolibarr=Product %s modified
@@ -119,6 +121,7 @@ MRP_MO_UNVALIDATEInDolibarr=MO set to draft status
 MRP_MO_PRODUCEDInDolibarr=MO produced
 MRP_MO_DELETEInDolibarr=MO deleted
 MRP_MO_CANCELInDolibarr=MO canceled
+PAIDInDolibarr=%s paid
 ##### End agenda events #####
 AgendaModelModule=Document templates for event
 DateActionStart=Dátum začatia
@@ -130,7 +133,7 @@ AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to use
 AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
 AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic events.
 AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> to include events of holidays.
-AgendaShowBirthdayEvents=Zobraziť narodeniny kontaktov
+AgendaShowBirthdayEvents=Birthdays of contacts
 AgendaHideBirthdayEvents=Skryť naroodeniny kontaktov
 Busy=Zaneprázdnený
 ExportDataset_event1=Zoznam agendy udalostí
@@ -152,6 +155,7 @@ ActionType=Typ udalosti
 DateActionBegin=Začiatok udalosti
 ConfirmCloneEvent=Určite chcete duplikovať udalosť <b>%s</b>?
 RepeatEvent=Opakovať udalosť
+OnceOnly=Once only
 EveryWeek=Každý týždeň
 EveryMonth=Každý mesiac
 DayOfMonth=Deň v mesiaci
@@ -165,4 +169,4 @@ TimeType=Duration type
 ReminderType=Callback type
 AddReminder=Create an automatic reminder notification for this event
 ErrorReminderActionCommCreation=Error creating the reminder notification for this event
-BrowserPush=Browser Notification
+BrowserPush=Browser Popup Notification
diff --git a/htdocs/langs/sk_SK/bills.lang b/htdocs/langs/sk_SK/bills.lang
index 15c80cbb0ce..f4c793469e8 100644
--- a/htdocs/langs/sk_SK/bills.lang
+++ b/htdocs/langs/sk_SK/bills.lang
@@ -259,6 +259,7 @@ DateMaxPayment=Payment due on
 DateInvoice=Faktúra Dátum
 DatePointOfTax=Point of tax
 NoInvoice=No faktúra
+NoOpenInvoice=No open invoice
 ClassifyBill=Klasifikovať faktúru
 SupplierBillsToPay=Unpaid vendor invoices
 CustomerBillsUnpaid=Nezaplatené zákaznické faktúry
@@ -589,3 +590,4 @@ FacParentLine=Invoice Line Parent
 SituationTotalRayToRest=Remainder to pay without taxe
 PDFSituationTitle=Situation n° %d
 SituationTotalProgress=Total progress %d %%
+SearchUnpaidInvoicesWithDueDate=Search unpaid invoices with a due date = %s
diff --git a/htdocs/langs/sk_SK/cashdesk.lang b/htdocs/langs/sk_SK/cashdesk.lang
index 3f6316410ff..2743926c0b0 100644
--- a/htdocs/langs/sk_SK/cashdesk.lang
+++ b/htdocs/langs/sk_SK/cashdesk.lang
@@ -102,7 +102,7 @@ CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal numb
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
 SaleStartedAt=Sale started at %s
-ControlCashOpening=Control cash popup at opening POS
+ControlCashOpening=Open the "Control cash" popup when opening the POS
 CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -126,5 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
-ShowPriceHT = Display the price excluding tax column
-ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
+ShowPriceHT = Display the column with the price excluding tax (on screen)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
diff --git a/htdocs/langs/sk_SK/compta.lang b/htdocs/langs/sk_SK/compta.lang
index c8df634a8d6..35dd17cdf4f 100644
--- a/htdocs/langs/sk_SK/compta.lang
+++ b/htdocs/langs/sk_SK/compta.lang
@@ -286,3 +286,9 @@ ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
 IncludeLoansInResults = Include loans in reports
+InvoiceLate30Days = Invoices late > 30 days
+InvoiceLate15Days = Invoices late > 15 days
+InvoiceLateMinus15Days = Invoices late
+InvoiceNotLate = To be collected < 15 days
+InvoiceNotLate15Days = To be collected in 15 days
+InvoiceNotLate30Days = To be collected in 30 days
diff --git a/htdocs/langs/sk_SK/cron.lang b/htdocs/langs/sk_SK/cron.lang
index 1631b6c9038..c102bb01334 100644
--- a/htdocs/langs/sk_SK/cron.lang
+++ b/htdocs/langs/sk_SK/cron.lang
@@ -60,7 +60,7 @@ CronErrEndDateStartDt=Dátum ukončenia nemôže byť pred dátumom začatia
 StatusAtInstall=Status at module installation
 CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Zakázať
-CronTaskInactive=Táto úloha je zakázaný
+CronTaskInactive=This job is disabled (not scheduled)
 CronId=Id
 CronClassFile=Filename with class
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example 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>
diff --git a/htdocs/langs/sk_SK/errors.lang b/htdocs/langs/sk_SK/errors.lang
index ca0536031e6..8dca2fd1384 100644
--- a/htdocs/langs/sk_SK/errors.lang
+++ b/htdocs/langs/sk_SK/errors.lang
@@ -11,6 +11,7 @@ ErrorBadValueForParamNotAString=Bad value for your parameter. It appends general
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Prihlásenie %s už existuje.
 ErrorGroupAlreadyExists=Skupina %s už existuje.
+ErrorEmailAlreadyExists=Email %s already exists.
 ErrorRecordNotFound=Záznam nie je nájdený.
 ErrorFailToCopyFile=Nepodarilo sa skopírovať súbor <b>&quot;%s&quot;</b> na <b>&quot;%s&quot;.</b>
 ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
@@ -117,7 +118,7 @@ ErrorCantReadFile=Chyba pri čítaní súboru &quot;%s&quot;
 ErrorCantReadDir=Chyba pri čítaní adresára &quot;%s&quot;
 ErrorBadLoginPassword=Nesprávna hodnota pre prihlásenie alebo heslo
 ErrorLoginDisabled=Váš účet bol zakázaný
-ErrorFailedToRunExternalCommand=Nepodarilo sa spustiť externý príkaz. Skontrolujte, že je k dispozícii, a spustiteľný váš PHP servera. Ak PHP <b>Safe Mode</b> je aktívny, skontrolujte, či je príkaz vnútri adresára definovaného parametrom <b>safe_mode_exec_dir.</b>
+ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server user. Check also the command is not protected on shell level by a security layer like apparmor.
 ErrorFailedToChangePassword=Nepodarilo sa zmeniť heslo
 ErrorLoginDoesNotExists=Užívateľ s prihlásením <b>%s</b> nebol nájdený.
 ErrorLoginHasNoEmail=Tento užívateľ nemá žiadnu e-mailovú adresu. Proces prerušená.
@@ -262,6 +263,7 @@ ErrorDateIsInFuture=Error, the date can't be in the future
 ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
 ErrorAPercentIsRequired=Error, please fill in the percentage correctly
 ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
+ErrorFailedToFindEmailTemplate=Failed to find template with code name %s
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -298,3 +300,4 @@ WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So y
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
+ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
diff --git a/htdocs/langs/sk_SK/eventorganization.lang b/htdocs/langs/sk_SK/eventorganization.lang
index 0a54214ab36..08cb79e8b00 100644
--- a/htdocs/langs/sk_SK/eventorganization.lang
+++ b/htdocs/langs/sk_SK/eventorganization.lang
@@ -1,4 +1,5 @@
 # Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+# Copyright (C) 2021		Dorian Vabre			<dorian.vabre@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
@@ -81,7 +82,10 @@ PriceOfBoothHelp=Subscription price to stand a booth
 EventOrganizationICSLink=Link ICS for events
 ConferenceOrBoothInformation=Conference Or Booth informations
 Attendees = Attendees
+DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
 #
 # Status
 #
@@ -94,8 +98,46 @@ EvntOrgCancelled = Cancelled
 #
 # Public page
 #
+SuggestForm = Suggestion page
+RegisterPage = Page for conferences or booth
+EvntOrgRegistrationHelpMessage = Here, you can vote for an event, or suggest a new conference or booth for the project
+EvntOrgRegistrationConfHelpMessage = Here, you can suggest a new conference for the project
+EvntOrgRegistrationBoothHelpMessage = Here, you can suggest a new booth for the project
+ListOfSuggestedConferences = List of suggested conferences
+ListOfSuggestedBooths = List of suggested booths
+SuggestConference = Suggest a new conference
+SuggestBooth = Suggest a booth
+ViewAndVote = View and vote for suggested events
 PublicAttendeeSubscriptionPage = Public link of registration to a conference
 MissingOrBadSecureKey = The security key is invalid or missing
-EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
-EvntOrgStartDuration = This conference starts on
-EvntOrgEndDuration =  and ends on
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference : '%s'
+EvntOrgDuration = This conference starts on %s and ends on %s.
+ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
+BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
+EventType = Typ udalosti
+
+#
+# Vote page
+#
+EvntOrgRegistrationWelcomeMessage = Welcome on the conference or booth suggestion page.
+EvntOrgRegistrationConfWelcomeMessage = Welcome on the conference suggestion page.
+EvntOrgRegistrationBoothWelcomeMessage = Welcome on the booth suggestion page.
+EvntOrgVoteHelpMessage = Here, you can view and vote for the suggested events for the project
+VoteOk = Your vote has been accepted.
+AlreadyVoted = You have already voted for this event.
+VoteError = An error has occurred during the vote, please try again.
+
+#
+# SubscriptionOk page
+#
+SubscriptionOk = Your subscription to this conference has been validated
+#
+# Subscription validation mail
+#
+ConfAttendeeSubscriptionConfirmation = Confirmation of your subscription to a conference
+#
+# Payment page
+#
+Attendee = Attendee
+PaymentConferenceAttendee = Conference attendee payment
+PaymentBoothLocation = Booth location payment
diff --git a/htdocs/langs/sk_SK/hrm.lang b/htdocs/langs/sk_SK/hrm.lang
index 0ffa8afa438..573b9871407 100644
--- a/htdocs/langs/sk_SK/hrm.lang
+++ b/htdocs/langs/sk_SK/hrm.lang
@@ -9,7 +9,7 @@ ConfirmDeleteEstablishment=Are you sure you wish to delete this establishment?
 OpenEtablishment=Open establishment
 CloseEtablishment=Close establishment
 # Dictionary
-DictionaryPublicHolidays=HRM - Public holidays
+DictionaryPublicHolidays=Leave - Public holidays
 DictionaryDepartment=HRM - Department list
 DictionaryFunction=HRM - Job positions
 # Module
diff --git a/htdocs/langs/sk_SK/knowledgemanagement.lang b/htdocs/langs/sk_SK/knowledgemanagement.lang
index 78652570279..b82547af78c 100644
--- a/htdocs/langs/sk_SK/knowledgemanagement.lang
+++ b/htdocs/langs/sk_SK/knowledgemanagement.lang
@@ -47,7 +47,7 @@ KnowledgeManagementArea = Knowledge Management
 # Menu
 #
 MenuKnowledgeRecord = Knowledge base
-ListOfArticles = List of articles
+ListKnowledgeRecord = List of articles
 NewKnowledgeRecord = New article
 ValidateReply = Validate solution
 KnowledgeRecords = Articles
diff --git a/htdocs/langs/sk_SK/languages.lang b/htdocs/langs/sk_SK/languages.lang
index dd48ea71d86..935d1966b7b 100644
--- a/htdocs/langs/sk_SK/languages.lang
+++ b/htdocs/langs/sk_SK/languages.lang
@@ -3,6 +3,7 @@ Language_am_ET=Ethiopian
 Language_ar_AR=Arabčina
 Language_ar_EG=Arabic (Egypt)
 Language_ar_SA=Arabčina
+Language_ar_TN=Arabic (Tunisia)
 Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengálština
 Language_bn_IN=Bengali (India)
@@ -84,6 +85,7 @@ Language_nl_NL=Dutch
 Language_pl_PL=Poľština
 Language_pt_BR=Portugalčina (Brazília)
 Language_pt_PT=Portugalčina
+Language_ro_MD=Romanian (Moldavia)
 Language_ro_RO=Rumunčina
 Language_ru_RU=Ruština
 Language_ru_UA=Ruština (Ukrajina)
diff --git a/htdocs/langs/sk_SK/main.lang b/htdocs/langs/sk_SK/main.lang
index f56b3a0104c..1d9eaadc95c 100644
--- a/htdocs/langs/sk_SK/main.lang
+++ b/htdocs/langs/sk_SK/main.lang
@@ -430,6 +430,7 @@ LT1IN=CGST
 LT2IN=SGST
 LT1GC=Additionnal cents
 VATRate=Daňová sadzba
+RateOfTaxN=Rate of tax %s
 VATCode=Tax Rate code
 VATNPR=Tax Rate NPR
 DefaultTaxRate=Default tax rate
@@ -729,6 +730,7 @@ MenuMembers=Členovia
 MenuAgendaGoogle=Google agenda
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr limit (Menu domáce bezpečnostné nastavenia): %s Kb, PHP limit: %s Kb
+ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
 NoFileFound=No documents uploaded
 CurrentUserLanguage=Aktuálny jazyk
 CurrentTheme=Aktuálna téma
@@ -1072,6 +1074,7 @@ ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
 ToClose=To close
+ToRefuse=To refuse
 ToProcess=Ak chcete spracovať
 ToApprove=To approve
 GlobalOpenedElemView=Global view
@@ -1126,9 +1129,11 @@ UpdateForAllLines=Update for all lines
 OnHold=On hold
 Civility=Civility
 AffectTag=Affect Tag
+CreateExternalUser=Create external user
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
 ConfirmCancel=Are you sure you want to cancel
+EmailMsgID=Email MsgID
diff --git a/htdocs/langs/sk_SK/members.lang b/htdocs/langs/sk_SK/members.lang
index c427849d17d..473b3b21912 100644
--- a/htdocs/langs/sk_SK/members.lang
+++ b/htdocs/langs/sk_SK/members.lang
@@ -213,3 +213,5 @@ SendReminderForExpiredSubscription=Send reminder by email to members when subscr
 MembershipPaid=Membership paid for current period (until %s)
 YouMayFindYourInvoiceInThisEmail=You may find your invoice attached to this email
 XMembersClosed=%s member(s) closed
+XExternalUserCreated=%s external user(s) created
+ForceMemberNature=Force member nature (Individual or Corporation)
diff --git a/htdocs/langs/sk_SK/modulebuilder.lang b/htdocs/langs/sk_SK/modulebuilder.lang
index 9fdaa1a533a..23a098be2e5 100644
--- a/htdocs/langs/sk_SK/modulebuilder.lang
+++ b/htdocs/langs/sk_SK/modulebuilder.lang
@@ -143,3 +143,4 @@ AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
 ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
+ImportExportProfiles=Import and export profiles
diff --git a/htdocs/langs/sk_SK/mrp.lang b/htdocs/langs/sk_SK/mrp.lang
index ec999a473a4..d620b7e31e3 100644
--- a/htdocs/langs/sk_SK/mrp.lang
+++ b/htdocs/langs/sk_SK/mrp.lang
@@ -8,12 +8,12 @@ MenuBOM=Bills of material
 LatestBOMModified=Latest %s Bills of materials modified
 LatestMOModified=Latest %s Manufacturing Orders modified
 Bom=Bills of Material
-BillOfMaterials=Bill of Material
+BillOfMaterials=Bill of Materials
 BOMsSetup=Setup of module BOM
 ListOfBOMs=List of bills of material - BOM
 ListOfManufacturingOrders=List of Manufacturing Orders
-NewBOM=New bill of material
-ProductBOMHelp=Product to create with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
+NewBOM=New bill of materials
+ProductBOMHelp=Product to create (or disassemble) with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
 BOMsNumberingModules=BOM numbering templates
 BOMsModelModule=BOM document templates
 MOsNumberingModules=MO numbering templates
@@ -22,7 +22,7 @@ FreeLegalTextOnBOMs=Free text on document of BOM
 WatermarkOnDraftBOMs=Watermark on draft BOM
 FreeLegalTextOnMOs=Free text on document of MO
 WatermarkOnDraftMOs=Watermark on draft MO
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials %s ?
 ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
 ManufacturingEfficiency=Manufacturing efficiency
 ConsumptionEfficiency=Consumption efficiency
@@ -30,8 +30,8 @@ ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the produc
 ValueOfMeansLossForProductProduced=Value of 0.95 means an average of 5%% of loss of produced product
 DeleteBillOfMaterials=Delete Bill Of Materials
 DeleteMo=Delete Manufacturing Order
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Materials?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Materials?
 MenuMRP=Manufacturing Orders
 NewMO=New Manufacturing Order
 QtyToProduce=Qty to produce
@@ -39,7 +39,7 @@ DateStartPlannedMo=Date start planned
 DateEndPlannedMo=Date end planned
 KeepEmptyForAsap=Empty means 'As Soon As Possible'
 EstimatedDuration=Estimated duration
-EstimatedDurationDesc=Estimated duration to manufacture this product using this BOM
+EstimatedDurationDesc=Estimated duration to manufacture (or disassemble) this product using this BOM
 ConfirmValidateBom=Are you sure you want to validate the BOM with the reference <strong>%s</strong> (you will be able to use it to build new Manufacturing Orders)
 ConfirmCloseBom=Are you sure you want to cancel this BOM (you won't be able to use it to build new Manufacturing Orders anymore) ?
 ConfirmReopenBom=Are you sure you want to re-open this BOM (you will be able to use it to build new Manufacturing Orders)
@@ -63,13 +63,14 @@ ConsumeAndProduceAll=Consume and Produce All
 Manufactured=Manufactured
 TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
 ForAQuantityOf=For a quantity to produce of %s
+ForAQuantityToConsumeOf=For a quantity to disassemble of %s
 ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
 ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
 ProductionForRef=Production of %s
 AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
 NoStockChangeOnServices=No stock change on services
 ProductQtyToConsumeByMO=Product quantity still to consume by open MO
-ProductQtyToProduceByMO=Product quentity still to produce by open MO
+ProductQtyToProduceByMO=Product quantity still to produce by open MO
 AddNewConsumeLines=Add new line to consume
 ProductsToConsume=Products to consume
 ProductsToProduce=Products to produce
@@ -83,15 +84,13 @@ Workstations=Workstations
 WorkstationsDescription=Workstations management
 WorkstationSetup = Workstations setup
 WorkstationSetupPage = Workstations setup page
-WorkstationAbout = About Workstation
-WorkstationAboutPage = Workstations about page
 WorkstationList=Workstation list
 WorkstationCreate=Add new workstation
 ConfirmEnableWorkstation=Are you sure you want to enable workstation <b>%s</b> ?
 EnableAWorkstation=Enable a workstation
 ConfirmDisableWorkstation=Are you sure you want to disable workstation <b>%s</b> ?
 DisableAWorkstation=Disable a workstation
-DeleteWorkstation=Supprimer
+DeleteWorkstation=Odstrániť
 NbOperatorsRequired=Number of operators required
 THMOperatorEstimated=Estimated operator THM
 THMMachineEstimated=Estimated machine THM
diff --git a/htdocs/langs/sk_SK/orders.lang b/htdocs/langs/sk_SK/orders.lang
index 25ae9d5d360..4b8f0a6a6d1 100644
--- a/htdocs/langs/sk_SK/orders.lang
+++ b/htdocs/langs/sk_SK/orders.lang
@@ -11,6 +11,7 @@ OrderDate=Dátum objednávky
 OrderDateShort=Dátum objednávky
 OrderToProcess=Objednávka na spracovanie
 NewOrder=Nová objednávka
+NewSupplierOrderShort=Nová objednávka
 NewOrderSupplier=New Purchase Order
 ToOrder=Objednať
 MakeOrder=Objednať
@@ -73,6 +74,7 @@ DeleteOrder=Zmazať objednávku
 CancelOrder=Zrušenie objednávky
 OrderReopened= Order %s re-open
 AddOrder=Create order
+AddSupplierOrderShort=Create order
 AddPurchaseOrder=Create purchase order
 AddToDraftOrders=Pridať k predlohe
 ShowOrder=Zobraziť objednávku
diff --git a/htdocs/langs/sk_SK/other.lang b/htdocs/langs/sk_SK/other.lang
index 03ba1f168c7..e65d03bfa68 100644
--- a/htdocs/langs/sk_SK/other.lang
+++ b/htdocs/langs/sk_SK/other.lang
@@ -129,6 +129,7 @@ ClosedByLogin=User login who closed
 FileWasRemoved=Súbor %s bol odstránený
 DirWasRemoved=Adresár %s bol odstránený
 FeatureNotYetAvailable=Feature not yet available in the current version
+FeatureNotAvailableOnDevicesWithoutMouse=Feature not available on devices without mouse
 FeaturesSupported=Supported features
 Width=Šírka
 Height=Výška
@@ -263,7 +264,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
-PrefixSession=Prefix for session ID
+SuffixSessionName=Suffix for session name
 
 ##### Export #####
 ExportsArea=Vývoz plocha
diff --git a/htdocs/langs/sk_SK/partnership.lang b/htdocs/langs/sk_SK/partnership.lang
index 46da9502212..5227295d098 100644
--- a/htdocs/langs/sk_SK/partnership.lang
+++ b/htdocs/langs/sk_SK/partnership.lang
@@ -16,41 +16,72 @@
 #
 # Generic
 #
-ModulePartnershipName = Partnership management
-PartnershipDescription = Module Partnership management
+ModulePartnershipName=Partnership management
+PartnershipDescription=Module Partnership management
 PartnershipDescriptionLong= Module Partnership management
 
+AddPartnership=Add partnership
+CancelPartnershipForExpiredMembers=Partnership: Cancel partnership of members with expired subscriptions
+PartnershipCheckBacklink=Partnership: Check referring backlink
+
 #
 # Menu
 #
-NewPartnership = New Partnership
-ListOfPartnerships = List of partnership
+NewPartnership=New Partnership
+ListOfPartnerships=List of partnership
 
 #
 # Admin page
 #
-PartnershipSetup = Partnership setup
-PartnershipAbout = About Partnership
-PartnershipAboutPage = Partnership about page
-
+PartnershipSetup=Partnership setup
+PartnershipAbout=About Partnership
+PartnershipAboutPage=Partnership about page
+partnershipforthirdpartyormember=Partner status must be set on a 'thirdparty' or a 'member'
+PARTNERSHIP_IS_MANAGED_FOR=Partnership managed for
+PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks to check
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb of days before cancelling status of a partnership when a subscription has expired
+ReferingWebsiteCheck=Check of website referring
+ReferingWebsiteCheckDesc=You can enable a feature to check that your partners has added a backlink to your website domains on their own website.
 
 #
 # Object
 #
+DeletePartnership=Delete a partnership
+PartnershipDedicatedToThisThirdParty=Partnership dedicated to this third party
+PartnershipDedicatedToThisMember=Partnership dedicated to this member
 DatePartnershipStart=Dátum začatia
 DatePartnershipEnd=Dátum ukončenia
+ReasonDecline=Decline reason
+ReasonDeclineOrCancel=Decline reason
+PartnershipAlreadyExist=Partnership already exist
+ManagePartnership=Manage partnership
+BacklinkNotFoundOnPartnerWebsite=Backlink not found on partner website
+ConfirmClosePartnershipAsk=Are you sure you want to cancel this partnership?
+PartnershipType=Partnership type
 
 #
 # Template Mail
 #
+SendingEmailOnPartnershipWillSoonBeCanceled=Partnership will soon be canceled
+SendingEmailOnPartnershipRefused=Partnership refused
+SendingEmailOnPartnershipAccepted=Partnership accepted
+SendingEmailOnPartnershipCanceled=Partnership canceled
 
+YourPartnershipWillSoonBeCanceledTopic=Partnership will soon be canceled
+YourPartnershipRefusedTopic=Partnership refused
+YourPartnershipAcceptedTopic=Partnership accepted
+YourPartnershipCanceledTopic=Partnership canceled
+
+YourPartnershipWillSoonBeCanceledContent=We inform you that your partnership will soon be canceled (Backlink not found)
+YourPartnershipRefusedContent=We inform you that your partnership request has been refused.
+YourPartnershipAcceptedContent=We inform you that your partnership request has been accepted.
+YourPartnershipCanceledContent=We inform you that your partnership has been canceled.
 
 #
 # Status
 #
-PartnershipDraft = Návrh
-PartnershipAccepted = Akceptované
-PartnershipRefused = Odmietol
-PartnershipCanceled = Zrušený
-
+PartnershipDraft=Návrh
+PartnershipAccepted=Akceptované
+PartnershipRefused=Odmietol
+PartnershipCanceled=Zrušený
 PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/sk_SK/productbatch.lang b/htdocs/langs/sk_SK/productbatch.lang
index adf023644b1..52833dc2011 100644
--- a/htdocs/langs/sk_SK/productbatch.lang
+++ b/htdocs/langs/sk_SK/productbatch.lang
@@ -1,4 +1,4 @@
-# ProductBATCH language file - en_US - ProductBATCH
+# ProductBATCH language file - Source file is en_US - ProductBATCH
 ManageLotSerial=Use lot/serial number
 ProductStatusOnBatch=Yes (lot required)
 ProductStatusOnSerial=Yes (unique serial number required)
@@ -33,3 +33,13 @@ CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+LifeTime=Life span (in days)
+EndOfLife=End of life
+ManufacturingDate=Manufacturing date
+DestructionDate=Destruction date
+FirstUseDate=First use date
+QCFrequency=Quality control frequency (in days)
+
+#Traceability - qc status
+OutOfOrder=Out of order
+InWorkingOrder=In working order
diff --git a/htdocs/langs/sk_SK/products.lang b/htdocs/langs/sk_SK/products.lang
index 0e8c49a9b28..dc7d5754a66 100644
--- a/htdocs/langs/sk_SK/products.lang
+++ b/htdocs/langs/sk_SK/products.lang
@@ -396,3 +396,5 @@ ActionAvailableOnVariantProductOnly=Action only available on the variant of prod
 ProductsPricePerCustomer=Product prices per customers
 ProductSupplierExtraFields=Additional Attributes (Supplier Prices)
 DeleteLinkedProduct=Delete the child product linked to the combination
+PMPValue=Vážená priemerná cena
+PMPValueShort=WAP
diff --git a/htdocs/langs/sk_SK/projects.lang b/htdocs/langs/sk_SK/projects.lang
index b37e00ee7eb..cc3ce220007 100644
--- a/htdocs/langs/sk_SK/projects.lang
+++ b/htdocs/langs/sk_SK/projects.lang
@@ -267,9 +267,11 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=Nová faktúra
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+OneLinePerTimeSpentLine=One line for each time spent declaration
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
 AddPersonToTask=Add also to tasks
 UsageOrganizeEvent=Usage: Event Organization
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
+SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
diff --git a/htdocs/langs/sk_SK/receptions.lang b/htdocs/langs/sk_SK/receptions.lang
index a23e548ed43..b1c3bf4cef0 100644
--- a/htdocs/langs/sk_SK/receptions.lang
+++ b/htdocs/langs/sk_SK/receptions.lang
@@ -44,4 +44,4 @@ ValidateOrderFirstBeforeReception=You must first validate the order before being
 ReceptionsNumberingModules=Numbering module for receptions
 ReceptionsReceiptModel=Document templates for receptions
 NoMorePredefinedProductToDispatch=No more predefined products to dispatch
-
+ReceptionExist=A reception exists
diff --git a/htdocs/langs/sk_SK/stocks.lang b/htdocs/langs/sk_SK/stocks.lang
index ecf0fa38063..90b7a5d8361 100644
--- a/htdocs/langs/sk_SK/stocks.lang
+++ b/htdocs/langs/sk_SK/stocks.lang
@@ -56,8 +56,6 @@ UnitPurchaseValue=Jednotková kúpna cena
 StockTooLow=Stock príliš nízka
 StockLowerThanLimit=Stock lower than alert limit (%s)
 EnhancedValue=Hodnota
-PMPValue=Vážená priemerná cena
-PMPValueShort=WAP
 EnhancedValueOfWarehouses=Sklady hodnota
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
@@ -251,7 +249,10 @@ SelectAStockMovementFileToImport=select a stock movement file to import
 InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
 LabelOfInventoryMovemement=Inventory %s
 ReOpen=Reopen
-ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock to the real qty you entered into the inventory.
 ObjectNotFound=%s not found
 MakeMovementsAndClose=Generate movements and close
 AutofillWithExpected=Fill real quantity with expected quantity
+ShowAllBatchByDefault=By default, show batch details on product "stock" tab
+CollapseBatchDetailHelp=You can set batch detail default display in stocks module configuration
+FieldCannotBeNegative=Field "%s" cannot be negative
diff --git a/htdocs/langs/sk_SK/ticket.lang b/htdocs/langs/sk_SK/ticket.lang
index 54eae76b82c..486a593108c 100644
--- a/htdocs/langs/sk_SK/ticket.lang
+++ b/htdocs/langs/sk_SK/ticket.lang
@@ -304,7 +304,7 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
-BoxTicketType=Number of open tickets by type
+BoxTicketType=Distribution of open tickets by type
 BoxTicketSeverity=Number of open tickets by severity
 BoxNoTicketSeverity=No tickets opened
 BoxTicketLastXDays=Number of new tickets by days the last %s days
diff --git a/htdocs/langs/sl_SI/accountancy.lang b/htdocs/langs/sl_SI/accountancy.lang
index 5d8ff3b552b..236ce587d9a 100644
--- a/htdocs/langs/sl_SI/accountancy.lang
+++ b/htdocs/langs/sl_SI/accountancy.lang
@@ -158,7 +158,7 @@ ACCOUNTING_LENGTH_AACCOUNT=Length of the third-party accounting accounts (If you
 ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of an accounting account. Needed by some countries (like Switzerland). If set to off (default), you can set the following two parameters to ask the application to add virtual zeros.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties, break ability to search on a part of value)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
@@ -328,6 +328,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountanc
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
+NotifiedExportDate=Notified export date (modification of the entries will not be possible)
+NotifiedValidationDate=Validation of the entries (modification or deletion of the entries will not be possible)
+ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=Export draft journal
 Modelcsv=Model izvoza
 Selectmodelcsv=Izberite model izvoza
diff --git a/htdocs/langs/sl_SI/admin.lang b/htdocs/langs/sl_SI/admin.lang
index c131906e958..23aed3e8644 100644
--- a/htdocs/langs/sl_SI/admin.lang
+++ b/htdocs/langs/sl_SI/admin.lang
@@ -221,8 +221,8 @@ NotCompatible=This module does not seem compatible with your Dolibarr %s (Min %s
 CompatibleAfterUpdate=This module requires an update to your Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=See in Market place
 SeeSetupOfModule=Glejte nastavitev modula %s
+SetOptionTo=Set option <b>%s</b> to %s
 Updated=Updated
-Nouveauté=Novelty
 AchatTelechargement=Buy / Download
 GoModuleSetupArea=To deploy/install a new module, go to the Module setup area: <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, uradna tržnica za Dolibarr ERP/CRM zunanje module
@@ -399,6 +399,7 @@ SecurityToken=Ključ za šifriranje url
 NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
 PDF=PDF
 PDFDesc=Global options for PDF generation
+PDFOtherDesc=PDF Option specific to some modules
 PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
 PDFRulesForSalesTax=Rules for Sales Tax / VAT
@@ -561,7 +562,7 @@ Module53Desc=Management of Services
 Module54Name=Pogodbe/naročnine
 Module54Desc=Management of contracts (services or recurring subscriptions)
 Module55Name=Črtne kode
-Module55Desc=Upravljanje črtnih kod
+Module55Desc=Barcode or QR code management
 Module56Name=Payment by credit transfer
 Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
 Module57Name=Payments by Direct Debit
@@ -848,10 +849,10 @@ Permission402=Kreiranje/spreminjanje popustov
 Permission403=Potrjevanje popustov
 Permission404=Brisanje popustov
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries (yours and subordinates)
-Permission512=Create/modify payments of salaries
-Permission514=Delete payments of salaries
-Permission517=Read payments of salaries of everybody
+Permission511=Read salaries and payments (yours and subordinates)
+Permission512=Create/modify salaries and payments
+Permission514=Delete salaries and payments
+Permission517=Read salaries and payments everybody
 Permission519=Izvoz plač
 Permission520=Branje posojil
 Permission522=Kreiranje/spreminjanje posojil
@@ -965,6 +966,8 @@ Permission23003=Izbriši načrtovano delo
 Permission23004=Izvedi načrtovano delo
 Permission50101=Use Point of Sale (SimplePOS)
 Permission50151=Use Point of Sale (TakePOS)
+Permission50152=Edit sales lines
+Permission50153=Edit ordered sales lines
 Permission50201=Branje prenosov
 Permission50202=Uvoz prenosov
 Permission50330=Read objects of Zapier
@@ -1039,11 +1042,12 @@ DictionaryMeasuringUnits=Measuring Units
 DictionarySocialNetworks=Social Networks
 DictionaryProspectStatus=Prospect status for companies
 DictionaryProspectContactStatus=Prospect status for contacts
-DictionaryHolidayTypes=Types of leave
+DictionaryHolidayTypes=Leave - Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
 DictionaryTransportMode=Intracomm report - Transport mode
+DictionaryBatchStatus=Product lot/serial Quality Control status
 TypeOfUnit=Type of unit
 SetupSaved=Nastavitve shranjene
 SetupNotSaved=Setup not saved
@@ -1187,7 +1191,7 @@ SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of m
 SetupDescription5=Other Setup menu entries manage optional parameters.
 AuditedSecurityEvents=Security events that are audited
 NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
-Audit=Nadzor
+Audit=Security events
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
 InfoOS=About OS
@@ -1319,9 +1323,12 @@ ConditionIsCurrently=Trenutni pogoj je %s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
 NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
+ComboListOptim=Combo list loading optimization
 SearchOptim=Iskanje optimizacijo
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
-YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
+YouHaveXObjectUseComboOptim=You have %s %s in the database. You can go into setup of module to enable loading of combo list on key pressed event.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other.
+YouHaveXObjectUseSearchOptimDesc=This limits the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to %s in Home-Setup-Other.
 BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
 BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
 PHPModuleLoaded=PHP component %s is loaded
@@ -1433,6 +1440,7 @@ MemberMainOptions=Glavne opcije
 AdherentLoginRequired= Urejanje uporabniških imen za vse člane
 AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Kontrolno polje za pošiljanje potrdil članom po pošti (potrditev ali nova naročnina) je privzeto označeno
+MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
 MembersDocModules=Document templates for documents generated from member record
@@ -1763,7 +1771,7 @@ AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting men
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
-AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the scheduled job %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Nastavitve modula za klicanje s klikom
@@ -1979,6 +1987,8 @@ 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_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add picture on proposal line
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add electronic sign in PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
@@ -2096,7 +2106,6 @@ PDF_SHOW_PROJECT=Show project on document
 ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
-FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
@@ -2120,12 +2129,18 @@ ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by
 MailToSendEventOrganization=Event Organization
 AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
 YouShouldDisablePHPFunctions=You should disable PHP functions
-IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands in custom code, you shoud disable PHP functions
+PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
+NotRecommended=Not recommanded
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
 ModuleUpdateAvailable=An update is available
 NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
+RandomlySelectedIfSeveral=Randomly selected if several pictures are available
+DatabasePasswordObfuscated=Database password is obfuscated in conf file
+DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
diff --git a/htdocs/langs/sl_SI/agenda.lang b/htdocs/langs/sl_SI/agenda.lang
index 85d7db4f84a..767f450d0da 100644
--- a/htdocs/langs/sl_SI/agenda.lang
+++ b/htdocs/langs/sl_SI/agenda.lang
@@ -4,7 +4,7 @@ Actions=Dogodki
 Agenda=Urnik
 TMenuAgenda=Urnik
 Agendas=Urniki
-LocalAgenda=Notranji koledar
+LocalAgenda=Default calendar
 ActionsOwnedBy=Zasebni dogodek od
 ActionsOwnedByShort=Lastnik
 AffectedTo=Se nanaša na
@@ -14,13 +14,13 @@ EventsNb=Število dogodkov
 ListOfActions=Seznam dogodkov
 EventReports=Event reports
 Location=Lokacija
-ToUserOfGroup=Event assigned to any user in group
+ToUserOfGroup=Event assigned to any user in the group
 EventOnFullDay=Dogodek na celoten dan(ni)
 MenuToDoActions=Vsi nedokončani dogodki
 MenuDoneActions=Vsi prekinjeni dogodki
 MenuToDoMyActions=Moji nedokončani dogodki
 MenuDoneMyActions=Moji prekinjeni dogodki
-ListOfEvents=Seznam dogodkov(notranji koledar)
+ListOfEvents=List of events (default calendar)
 ActionsAskedBy=Dogodek vnesel
 ActionsToDoBy=Dogoki, ki se nanašajo na
 ActionsDoneBy=Dogodke izvedel
@@ -38,6 +38,7 @@ ActionsEvents=Dogodki, za katere bo Dolibarr avtomatsko kreiral aktivnost v urni
 EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Third party %s created
+COMPANY_MODIFYInDolibarr=Third party %s modified
 COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=Pogodba %s potrjena
 CONTRACT_DELETEInDolibarr=Contract %s deleted
@@ -87,6 +88,7 @@ OrderDeleted=Order deleted
 InvoiceDeleted=Invoice deleted
 DraftInvoiceDeleted=Draft invoice deleted
 CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_MODIFYInDolibarr=Contact %s modified
 CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Product %s created
 PRODUCT_MODIFYInDolibarr=Product %s modified
@@ -119,6 +121,7 @@ MRP_MO_UNVALIDATEInDolibarr=MO set to draft status
 MRP_MO_PRODUCEDInDolibarr=MO produced
 MRP_MO_DELETEInDolibarr=MO deleted
 MRP_MO_CANCELInDolibarr=MO canceled
+PAIDInDolibarr=%s paid
 ##### End agenda events #####
 AgendaModelModule=Document templates for event
 DateActionStart=Začetni datum
@@ -130,7 +133,7 @@ AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to use
 AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
 AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic events.
 AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> to include events of holidays.
-AgendaShowBirthdayEvents=Show birthdays of contacts
+AgendaShowBirthdayEvents=Birthdays of contacts
 AgendaHideBirthdayEvents=Hide birthdays of contacts
 Busy=Zaseden
 ExportDataset_event1=Seznam aktivnosti
@@ -152,6 +155,7 @@ ActionType=Tip dogodka
 DateActionBegin=Datum začetka dogodka
 ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b>?
 RepeatEvent=Ponovi dogodek
+OnceOnly=Once only
 EveryWeek=Vsak teden
 EveryMonth=Vsak mesec
 DayOfMonth=Dan v mesecu
@@ -165,4 +169,4 @@ TimeType=Duration type
 ReminderType=Callback type
 AddReminder=Create an automatic reminder notification for this event
 ErrorReminderActionCommCreation=Error creating the reminder notification for this event
-BrowserPush=Browser Notification
+BrowserPush=Browser Popup Notification
diff --git a/htdocs/langs/sl_SI/bills.lang b/htdocs/langs/sl_SI/bills.lang
index 72715833296..f3038d484c2 100644
--- a/htdocs/langs/sl_SI/bills.lang
+++ b/htdocs/langs/sl_SI/bills.lang
@@ -259,6 +259,7 @@ DateMaxPayment=Payment due on
 DateInvoice=Datum izdaje
 DatePointOfTax=Point of tax
 NoInvoice=Ni računa
+NoOpenInvoice=No open invoice
 ClassifyBill=Klacificiraj račun
 SupplierBillsToPay=Neplačane fakture dobaviteljem
 CustomerBillsUnpaid=Neplačani računi stranke
@@ -589,3 +590,4 @@ FacParentLine=Invoice Line Parent
 SituationTotalRayToRest=Remainder to pay without taxe
 PDFSituationTitle=Situation n° %d
 SituationTotalProgress=Total progress %d %%
+SearchUnpaidInvoicesWithDueDate=Search unpaid invoices with a due date = %s
diff --git a/htdocs/langs/sl_SI/cashdesk.lang b/htdocs/langs/sl_SI/cashdesk.lang
index f298b47be4d..3f773ece1c7 100644
--- a/htdocs/langs/sl_SI/cashdesk.lang
+++ b/htdocs/langs/sl_SI/cashdesk.lang
@@ -102,7 +102,7 @@ CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal numb
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
 SaleStartedAt=Sale started at %s
-ControlCashOpening=Control cash popup at opening POS
+ControlCashOpening=Open the "Control cash" popup when opening the POS
 CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -126,5 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
-ShowPriceHT = Display the price excluding tax column
-ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
+ShowPriceHT = Display the column with the price excluding tax (on screen)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
diff --git a/htdocs/langs/sl_SI/compta.lang b/htdocs/langs/sl_SI/compta.lang
index 2e0fc02ef29..f045c0c9744 100644
--- a/htdocs/langs/sl_SI/compta.lang
+++ b/htdocs/langs/sl_SI/compta.lang
@@ -286,3 +286,9 @@ ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
 IncludeLoansInResults = Include loans in reports
+InvoiceLate30Days = Invoices late > 30 days
+InvoiceLate15Days = Invoices late > 15 days
+InvoiceLateMinus15Days = Invoices late
+InvoiceNotLate = To be collected < 15 days
+InvoiceNotLate15Days = To be collected in 15 days
+InvoiceNotLate30Days = To be collected in 30 days
diff --git a/htdocs/langs/sl_SI/cron.lang b/htdocs/langs/sl_SI/cron.lang
index 5f3c8ecd5fa..e4c3b02ef35 100644
--- a/htdocs/langs/sl_SI/cron.lang
+++ b/htdocs/langs/sl_SI/cron.lang
@@ -60,7 +60,7 @@ CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
 CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Onemogoči
-CronTaskInactive=This job is disabled
+CronTaskInactive=This job is disabled (not scheduled)
 CronId=Id
 CronClassFile=Filename with class
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example 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>
diff --git a/htdocs/langs/sl_SI/errors.lang b/htdocs/langs/sl_SI/errors.lang
index 5e8037ba1ed..53beda3ad60 100644
--- a/htdocs/langs/sl_SI/errors.lang
+++ b/htdocs/langs/sl_SI/errors.lang
@@ -11,6 +11,7 @@ ErrorBadValueForParamNotAString=Bad value for your parameter. It appends general
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Uporabniško ime %s že obstaja.
 ErrorGroupAlreadyExists=Skupina %s že obstaja.
+ErrorEmailAlreadyExists=Email %s already exists.
 ErrorRecordNotFound=Ne najdem zapisa.
 ErrorFailToCopyFile=Ni kopirati Datoteka <b>'%s</b> &quot;nadomesti z&quot; <b>%s</b> &quot;.
 ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
@@ -117,7 +118,7 @@ ErrorCantReadFile=Ni mogoče prebrati Datoteka '%s želiš
 ErrorCantReadDir=Ni mogoče prebrati imenik '%s &quot;
 ErrorBadLoginPassword=Slaba vrednost za prijavo ali geslo
 ErrorLoginDisabled=Vaš račun je bil onemogočen
-ErrorFailedToRunExternalCommand=Ni delujejo zunanji ukaz. Preverite, da je na voljo in loven vaš PHP strežnik. Če je omogočena PHP <b>Safe Mode,</b> preverite, ali je ukaz znotraj imenika opredeljeno <b>safe_mode_exec_dir</b> parametrov.
+ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server user. Check also the command is not protected on shell level by a security layer like apparmor.
 ErrorFailedToChangePassword=Ni, da spremenite geslo
 ErrorLoginDoesNotExists=Uporabnik s prijavo <b>%s</b> ni bilo mogoče najti.
 ErrorLoginHasNoEmail=Ta uporabnik nima e-poštni naslov. Obdelati prekinjena.
@@ -262,6 +263,7 @@ ErrorDateIsInFuture=Error, the date can't be in the future
 ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
 ErrorAPercentIsRequired=Error, please fill in the percentage correctly
 ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
+ErrorFailedToFindEmailTemplate=Failed to find template with code name %s
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -298,3 +300,4 @@ WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So y
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
+ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
diff --git a/htdocs/langs/sl_SI/eventorganization.lang b/htdocs/langs/sl_SI/eventorganization.lang
index cb865b8c92e..56623bf07f6 100644
--- a/htdocs/langs/sl_SI/eventorganization.lang
+++ b/htdocs/langs/sl_SI/eventorganization.lang
@@ -1,4 +1,5 @@
 # Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+# Copyright (C) 2021		Dorian Vabre			<dorian.vabre@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
@@ -81,7 +82,10 @@ PriceOfBoothHelp=Subscription price to stand a booth
 EventOrganizationICSLink=Link ICS for events
 ConferenceOrBoothInformation=Conference Or Booth informations
 Attendees = Attendees
+DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
 #
 # Status
 #
@@ -94,8 +98,46 @@ EvntOrgCancelled = Cancelled
 #
 # Public page
 #
+SuggestForm = Suggestion page
+RegisterPage = Page for conferences or booth
+EvntOrgRegistrationHelpMessage = Here, you can vote for an event, or suggest a new conference or booth for the project
+EvntOrgRegistrationConfHelpMessage = Here, you can suggest a new conference for the project
+EvntOrgRegistrationBoothHelpMessage = Here, you can suggest a new booth for the project
+ListOfSuggestedConferences = List of suggested conferences
+ListOfSuggestedBooths = List of suggested booths
+SuggestConference = Suggest a new conference
+SuggestBooth = Suggest a booth
+ViewAndVote = View and vote for suggested events
 PublicAttendeeSubscriptionPage = Public link of registration to a conference
 MissingOrBadSecureKey = The security key is invalid or missing
-EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
-EvntOrgStartDuration = This conference starts on
-EvntOrgEndDuration =  and ends on
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference : '%s'
+EvntOrgDuration = This conference starts on %s and ends on %s.
+ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
+BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
+EventType = Tip dogodka
+
+#
+# Vote page
+#
+EvntOrgRegistrationWelcomeMessage = Welcome on the conference or booth suggestion page.
+EvntOrgRegistrationConfWelcomeMessage = Welcome on the conference suggestion page.
+EvntOrgRegistrationBoothWelcomeMessage = Welcome on the booth suggestion page.
+EvntOrgVoteHelpMessage = Here, you can view and vote for the suggested events for the project
+VoteOk = Your vote has been accepted.
+AlreadyVoted = You have already voted for this event.
+VoteError = An error has occurred during the vote, please try again.
+
+#
+# SubscriptionOk page
+#
+SubscriptionOk = Your subscription to this conference has been validated
+#
+# Subscription validation mail
+#
+ConfAttendeeSubscriptionConfirmation = Confirmation of your subscription to a conference
+#
+# Payment page
+#
+Attendee = Attendee
+PaymentConferenceAttendee = Conference attendee payment
+PaymentBoothLocation = Booth location payment
diff --git a/htdocs/langs/sl_SI/hrm.lang b/htdocs/langs/sl_SI/hrm.lang
index c5af09f3811..e47129f6b26 100644
--- a/htdocs/langs/sl_SI/hrm.lang
+++ b/htdocs/langs/sl_SI/hrm.lang
@@ -9,7 +9,7 @@ ConfirmDeleteEstablishment=Are you sure you wish to delete this establishment?
 OpenEtablishment=Open establishment
 CloseEtablishment=Close establishment
 # Dictionary
-DictionaryPublicHolidays=HRM - Public holidays
+DictionaryPublicHolidays=Leave - Public holidays
 DictionaryDepartment=HRM - Department list
 DictionaryFunction=HRM - Job positions
 # Module
diff --git a/htdocs/langs/sl_SI/knowledgemanagement.lang b/htdocs/langs/sl_SI/knowledgemanagement.lang
index 3d95eaacf2c..04d67fcd3cc 100644
--- a/htdocs/langs/sl_SI/knowledgemanagement.lang
+++ b/htdocs/langs/sl_SI/knowledgemanagement.lang
@@ -47,7 +47,7 @@ KnowledgeManagementArea = Knowledge Management
 # Menu
 #
 MenuKnowledgeRecord = Knowledge base
-ListOfArticles = List of articles
+ListKnowledgeRecord = List of articles
 NewKnowledgeRecord = New article
 ValidateReply = Validate solution
 KnowledgeRecords = Articles
diff --git a/htdocs/langs/sl_SI/languages.lang b/htdocs/langs/sl_SI/languages.lang
index f625688f706..317139b9fde 100644
--- a/htdocs/langs/sl_SI/languages.lang
+++ b/htdocs/langs/sl_SI/languages.lang
@@ -3,6 +3,7 @@ Language_am_ET=Ethiopian
 Language_ar_AR=Arabščina
 Language_ar_EG=Arabic (Egypt)
 Language_ar_SA=Arabščina
+Language_ar_TN=Arabic (Tunisia)
 Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengalščina
 Language_bn_IN=Bengali (India)
@@ -84,6 +85,7 @@ Language_nl_NL=Dutch
 Language_pl_PL=Poljščina
 Language_pt_BR=Portugalščina (Brazilija)
 Language_pt_PT=Portugalščina
+Language_ro_MD=Romanian (Moldavia)
 Language_ro_RO=Romunščina
 Language_ru_RU=Ruščina
 Language_ru_UA=Ruski (Ukrajina)
diff --git a/htdocs/langs/sl_SI/main.lang b/htdocs/langs/sl_SI/main.lang
index 93dfbe3cf76..bdbec683c93 100644
--- a/htdocs/langs/sl_SI/main.lang
+++ b/htdocs/langs/sl_SI/main.lang
@@ -430,6 +430,7 @@ LT1IN=CGST
 LT2IN=SGST
 LT1GC=Additionnal cents
 VATRate=Stopnja DDV
+RateOfTaxN=Rate of tax %s
 VATCode=Tax Rate code
 VATNPR=Tax Rate NPR
 DefaultTaxRate=Default tax rate
@@ -729,6 +730,7 @@ MenuMembers=Člani
 MenuAgendaGoogle=Google dnevni red
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr omejitve (Meni domov-nastavitve-varnost): %s Kb, PHP omejitev: %s Kb
+ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
 NoFileFound=No documents uploaded
 CurrentUserLanguage=Trenutni jezik
 CurrentTheme=Trenutna tema
@@ -1072,6 +1074,7 @@ ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
 ToClose=To close
+ToRefuse=To refuse
 ToProcess=Za obdelavo
 ToApprove=To approve
 GlobalOpenedElemView=Global view
@@ -1126,9 +1129,11 @@ UpdateForAllLines=Update for all lines
 OnHold=Ustavljeno
 Civility=Civility
 AffectTag=Affect Tag
+CreateExternalUser=Create external user
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
 ConfirmCancel=Are you sure you want to cancel
+EmailMsgID=Email MsgID
diff --git a/htdocs/langs/sl_SI/members.lang b/htdocs/langs/sl_SI/members.lang
index 7e9544e82f1..983dead5655 100644
--- a/htdocs/langs/sl_SI/members.lang
+++ b/htdocs/langs/sl_SI/members.lang
@@ -213,3 +213,5 @@ SendReminderForExpiredSubscription=Send reminder by email to members when subscr
 MembershipPaid=Membership paid for current period (until %s)
 YouMayFindYourInvoiceInThisEmail=You may find your invoice attached to this email
 XMembersClosed=%s member(s) closed
+XExternalUserCreated=%s external user(s) created
+ForceMemberNature=Force member nature (Individual or Corporation)
diff --git a/htdocs/langs/sl_SI/modulebuilder.lang b/htdocs/langs/sl_SI/modulebuilder.lang
index 9fdaa1a533a..23a098be2e5 100644
--- a/htdocs/langs/sl_SI/modulebuilder.lang
+++ b/htdocs/langs/sl_SI/modulebuilder.lang
@@ -143,3 +143,4 @@ AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
 ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
+ImportExportProfiles=Import and export profiles
diff --git a/htdocs/langs/sl_SI/mrp.lang b/htdocs/langs/sl_SI/mrp.lang
index ec999a473a4..30bf0ca0238 100644
--- a/htdocs/langs/sl_SI/mrp.lang
+++ b/htdocs/langs/sl_SI/mrp.lang
@@ -8,12 +8,12 @@ MenuBOM=Bills of material
 LatestBOMModified=Latest %s Bills of materials modified
 LatestMOModified=Latest %s Manufacturing Orders modified
 Bom=Bills of Material
-BillOfMaterials=Bill of Material
+BillOfMaterials=Bill of Materials
 BOMsSetup=Setup of module BOM
 ListOfBOMs=List of bills of material - BOM
 ListOfManufacturingOrders=List of Manufacturing Orders
-NewBOM=New bill of material
-ProductBOMHelp=Product to create with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
+NewBOM=New bill of materials
+ProductBOMHelp=Product to create (or disassemble) with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
 BOMsNumberingModules=BOM numbering templates
 BOMsModelModule=BOM document templates
 MOsNumberingModules=MO numbering templates
@@ -22,7 +22,7 @@ FreeLegalTextOnBOMs=Free text on document of BOM
 WatermarkOnDraftBOMs=Watermark on draft BOM
 FreeLegalTextOnMOs=Free text on document of MO
 WatermarkOnDraftMOs=Watermark on draft MO
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials %s ?
 ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
 ManufacturingEfficiency=Manufacturing efficiency
 ConsumptionEfficiency=Consumption efficiency
@@ -30,8 +30,8 @@ ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the produc
 ValueOfMeansLossForProductProduced=Value of 0.95 means an average of 5%% of loss of produced product
 DeleteBillOfMaterials=Delete Bill Of Materials
 DeleteMo=Delete Manufacturing Order
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Materials?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Materials?
 MenuMRP=Manufacturing Orders
 NewMO=New Manufacturing Order
 QtyToProduce=Qty to produce
@@ -39,7 +39,7 @@ DateStartPlannedMo=Date start planned
 DateEndPlannedMo=Date end planned
 KeepEmptyForAsap=Empty means 'As Soon As Possible'
 EstimatedDuration=Estimated duration
-EstimatedDurationDesc=Estimated duration to manufacture this product using this BOM
+EstimatedDurationDesc=Estimated duration to manufacture (or disassemble) this product using this BOM
 ConfirmValidateBom=Are you sure you want to validate the BOM with the reference <strong>%s</strong> (you will be able to use it to build new Manufacturing Orders)
 ConfirmCloseBom=Are you sure you want to cancel this BOM (you won't be able to use it to build new Manufacturing Orders anymore) ?
 ConfirmReopenBom=Are you sure you want to re-open this BOM (you will be able to use it to build new Manufacturing Orders)
@@ -63,13 +63,14 @@ ConsumeAndProduceAll=Consume and Produce All
 Manufactured=Manufactured
 TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
 ForAQuantityOf=For a quantity to produce of %s
+ForAQuantityToConsumeOf=For a quantity to disassemble of %s
 ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
 ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
 ProductionForRef=Production of %s
 AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
 NoStockChangeOnServices=No stock change on services
 ProductQtyToConsumeByMO=Product quantity still to consume by open MO
-ProductQtyToProduceByMO=Product quentity still to produce by open MO
+ProductQtyToProduceByMO=Product quantity still to produce by open MO
 AddNewConsumeLines=Add new line to consume
 ProductsToConsume=Products to consume
 ProductsToProduce=Products to produce
@@ -83,15 +84,13 @@ Workstations=Workstations
 WorkstationsDescription=Workstations management
 WorkstationSetup = Workstations setup
 WorkstationSetupPage = Workstations setup page
-WorkstationAbout = About Workstation
-WorkstationAboutPage = Workstations about page
 WorkstationList=Workstation list
 WorkstationCreate=Add new workstation
 ConfirmEnableWorkstation=Are you sure you want to enable workstation <b>%s</b> ?
 EnableAWorkstation=Enable a workstation
 ConfirmDisableWorkstation=Are you sure you want to disable workstation <b>%s</b> ?
 DisableAWorkstation=Disable a workstation
-DeleteWorkstation=Supprimer
+DeleteWorkstation=Izbriši
 NbOperatorsRequired=Number of operators required
 THMOperatorEstimated=Estimated operator THM
 THMMachineEstimated=Estimated machine THM
diff --git a/htdocs/langs/sl_SI/orders.lang b/htdocs/langs/sl_SI/orders.lang
index 67146107a56..cbc451e20ef 100644
--- a/htdocs/langs/sl_SI/orders.lang
+++ b/htdocs/langs/sl_SI/orders.lang
@@ -11,6 +11,7 @@ OrderDate=Datum naročila
 OrderDateShort=Datum naročila
 OrderToProcess=Naročilo za obdelavo
 NewOrder=Novo naročilo
+NewSupplierOrderShort=Novo naročilo
 NewOrderSupplier=Nov nabavni nalog
 ToOrder=Potrebno naročiti
 MakeOrder=Izdelaj naročilo
@@ -73,6 +74,7 @@ DeleteOrder=Briši naročilo
 CancelOrder=Prekliči naročilo
 OrderReopened= Ponovno odpri naročilo %s
 AddOrder=Ustvari naročilo
+AddSupplierOrderShort=Ustvari naročilo
 AddPurchaseOrder=Ustvari nov nabavni nalog
 AddToDraftOrders=Dodaj osnutku naročila
 ShowOrder=Prikaži naročilo
diff --git a/htdocs/langs/sl_SI/other.lang b/htdocs/langs/sl_SI/other.lang
index cb3cc1b03b3..07214c93ef4 100644
--- a/htdocs/langs/sl_SI/other.lang
+++ b/htdocs/langs/sl_SI/other.lang
@@ -129,6 +129,7 @@ ClosedByLogin=Ime uporabnika, ki je zaključil
 FileWasRemoved=Datoteka je bila izbrisana
 DirWasRemoved=Mapa je bila odstranjena
 FeatureNotYetAvailable=Feature not yet available in the current version
+FeatureNotAvailableOnDevicesWithoutMouse=Feature not available on devices without mouse
 FeaturesSupported=Supported features
 Width=Širina
 Height=Višina
@@ -263,7 +264,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
-PrefixSession=Prefix for session ID
+SuffixSessionName=Suffix for session name
 
 ##### Export #####
 ExportsArea=Področje izvoza
diff --git a/htdocs/langs/sl_SI/partnership.lang b/htdocs/langs/sl_SI/partnership.lang
index 48ce3b3b779..1420fdc428d 100644
--- a/htdocs/langs/sl_SI/partnership.lang
+++ b/htdocs/langs/sl_SI/partnership.lang
@@ -16,41 +16,72 @@
 #
 # Generic
 #
-ModulePartnershipName = Partnership management
-PartnershipDescription = Module Partnership management
+ModulePartnershipName=Partnership management
+PartnershipDescription=Module Partnership management
 PartnershipDescriptionLong= Module Partnership management
 
+AddPartnership=Add partnership
+CancelPartnershipForExpiredMembers=Partnership: Cancel partnership of members with expired subscriptions
+PartnershipCheckBacklink=Partnership: Check referring backlink
+
 #
 # Menu
 #
-NewPartnership = New Partnership
-ListOfPartnerships = List of partnership
+NewPartnership=New Partnership
+ListOfPartnerships=List of partnership
 
 #
 # Admin page
 #
-PartnershipSetup = Partnership setup
-PartnershipAbout = About Partnership
-PartnershipAboutPage = Partnership about page
-
+PartnershipSetup=Partnership setup
+PartnershipAbout=About Partnership
+PartnershipAboutPage=Partnership about page
+partnershipforthirdpartyormember=Partner status must be set on a 'thirdparty' or a 'member'
+PARTNERSHIP_IS_MANAGED_FOR=Partnership managed for
+PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks to check
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb of days before cancelling status of a partnership when a subscription has expired
+ReferingWebsiteCheck=Check of website referring
+ReferingWebsiteCheckDesc=You can enable a feature to check that your partners has added a backlink to your website domains on their own website.
 
 #
 # Object
 #
+DeletePartnership=Delete a partnership
+PartnershipDedicatedToThisThirdParty=Partnership dedicated to this third party
+PartnershipDedicatedToThisMember=Partnership dedicated to this member
 DatePartnershipStart=Začetni datum
 DatePartnershipEnd=Končni datum
+ReasonDecline=Decline reason
+ReasonDeclineOrCancel=Decline reason
+PartnershipAlreadyExist=Partnership already exist
+ManagePartnership=Manage partnership
+BacklinkNotFoundOnPartnerWebsite=Backlink not found on partner website
+ConfirmClosePartnershipAsk=Are you sure you want to cancel this partnership?
+PartnershipType=Partnership type
 
 #
 # Template Mail
 #
+SendingEmailOnPartnershipWillSoonBeCanceled=Partnership will soon be canceled
+SendingEmailOnPartnershipRefused=Partnership refused
+SendingEmailOnPartnershipAccepted=Partnership accepted
+SendingEmailOnPartnershipCanceled=Partnership canceled
 
+YourPartnershipWillSoonBeCanceledTopic=Partnership will soon be canceled
+YourPartnershipRefusedTopic=Partnership refused
+YourPartnershipAcceptedTopic=Partnership accepted
+YourPartnershipCanceledTopic=Partnership canceled
+
+YourPartnershipWillSoonBeCanceledContent=We inform you that your partnership will soon be canceled (Backlink not found)
+YourPartnershipRefusedContent=We inform you that your partnership request has been refused.
+YourPartnershipAcceptedContent=We inform you that your partnership request has been accepted.
+YourPartnershipCanceledContent=We inform you that your partnership has been canceled.
 
 #
 # Status
 #
-PartnershipDraft = Osnutek
-PartnershipAccepted = Accepted
-PartnershipRefused = Zavrnjeno
-PartnershipCanceled = Preklicano
-
+PartnershipDraft=Osnutek
+PartnershipAccepted=Accepted
+PartnershipRefused=Zavrnjeno
+PartnershipCanceled=Preklicano
 PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/sl_SI/productbatch.lang b/htdocs/langs/sl_SI/productbatch.lang
index 051f10a5a9f..8a60dfb1f62 100644
--- a/htdocs/langs/sl_SI/productbatch.lang
+++ b/htdocs/langs/sl_SI/productbatch.lang
@@ -1,4 +1,4 @@
-# ProductBATCH language file - en_US - ProductBATCH
+# ProductBATCH language file - Source file is en_US - ProductBATCH
 ManageLotSerial=Use lot/serial number
 ProductStatusOnBatch=Yes (lot required)
 ProductStatusOnSerial=Yes (unique serial number required)
@@ -33,3 +33,13 @@ CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+LifeTime=Life span (in days)
+EndOfLife=End of life
+ManufacturingDate=Manufacturing date
+DestructionDate=Destruction date
+FirstUseDate=First use date
+QCFrequency=Quality control frequency (in days)
+
+#Traceability - qc status
+OutOfOrder=Out of order
+InWorkingOrder=In working order
diff --git a/htdocs/langs/sl_SI/products.lang b/htdocs/langs/sl_SI/products.lang
index 0aecf1c0922..d126bc23073 100644
--- a/htdocs/langs/sl_SI/products.lang
+++ b/htdocs/langs/sl_SI/products.lang
@@ -396,3 +396,5 @@ ActionAvailableOnVariantProductOnly=Action only available on the variant of prod
 ProductsPricePerCustomer=Product prices per customers
 ProductSupplierExtraFields=Additional Attributes (Supplier Prices)
 DeleteLinkedProduct=Delete the child product linked to the combination
+PMPValue=Uravnotežena povprečna cena
+PMPValueShort=UPC
diff --git a/htdocs/langs/sl_SI/projects.lang b/htdocs/langs/sl_SI/projects.lang
index 42d248f93e8..9bb288fefba 100644
--- a/htdocs/langs/sl_SI/projects.lang
+++ b/htdocs/langs/sl_SI/projects.lang
@@ -267,9 +267,11 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=Nov račun
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+OneLinePerTimeSpentLine=One line for each time spent declaration
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
 AddPersonToTask=Add also to tasks
 UsageOrganizeEvent=Usage: Event Organization
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
+SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
diff --git a/htdocs/langs/sl_SI/receptions.lang b/htdocs/langs/sl_SI/receptions.lang
index e9126a81e94..2c49cabf799 100644
--- a/htdocs/langs/sl_SI/receptions.lang
+++ b/htdocs/langs/sl_SI/receptions.lang
@@ -44,4 +44,4 @@ ValidateOrderFirstBeforeReception=You must first validate the order before being
 ReceptionsNumberingModules=Numbering module for receptions
 ReceptionsReceiptModel=Document templates for receptions
 NoMorePredefinedProductToDispatch=No more predefined products to dispatch
-
+ReceptionExist=A reception exists
diff --git a/htdocs/langs/sl_SI/stocks.lang b/htdocs/langs/sl_SI/stocks.lang
index b8357c5ed52..dc1eac5ca7d 100644
--- a/htdocs/langs/sl_SI/stocks.lang
+++ b/htdocs/langs/sl_SI/stocks.lang
@@ -56,8 +56,6 @@ UnitPurchaseValue=Nabavna cena enote
 StockTooLow=Zaloga je prenizka
 StockLowerThanLimit=Stock lower than alert limit (%s)
 EnhancedValue=Vrednost
-PMPValue=Uravnotežena povprečna cena
-PMPValueShort=UPC
 EnhancedValueOfWarehouses=Vrednost skladišč
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
@@ -251,7 +249,10 @@ SelectAStockMovementFileToImport=select a stock movement file to import
 InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
 LabelOfInventoryMovemement=Inventory %s
 ReOpen=Reopen
-ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock to the real qty you entered into the inventory.
 ObjectNotFound=%s not found
 MakeMovementsAndClose=Generate movements and close
 AutofillWithExpected=Fill real quantity with expected quantity
+ShowAllBatchByDefault=By default, show batch details on product "stock" tab
+CollapseBatchDetailHelp=You can set batch detail default display in stocks module configuration
+FieldCannotBeNegative=Field "%s" cannot be negative
diff --git a/htdocs/langs/sl_SI/ticket.lang b/htdocs/langs/sl_SI/ticket.lang
index 91ff26bb370..8666613d0f0 100644
--- a/htdocs/langs/sl_SI/ticket.lang
+++ b/htdocs/langs/sl_SI/ticket.lang
@@ -304,7 +304,7 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
-BoxTicketType=Number of open tickets by type
+BoxTicketType=Distribution of open tickets by type
 BoxTicketSeverity=Number of open tickets by severity
 BoxNoTicketSeverity=No tickets opened
 BoxTicketLastXDays=Number of new tickets by days the last %s days
diff --git a/htdocs/langs/sq_AL/accountancy.lang b/htdocs/langs/sq_AL/accountancy.lang
index 5a1fba1c58e..f233580e651 100644
--- a/htdocs/langs/sq_AL/accountancy.lang
+++ b/htdocs/langs/sq_AL/accountancy.lang
@@ -158,7 +158,7 @@ ACCOUNTING_LENGTH_AACCOUNT=Length of the third-party accounting accounts (If you
 ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of an accounting account. Needed by some countries (like Switzerland). If set to off (default), you can set the following two parameters to ask the application to add virtual zeros.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties, break ability to search on a part of value)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
@@ -328,6 +328,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountanc
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
+NotifiedExportDate=Notified export date (modification of the entries will not be possible)
+NotifiedValidationDate=Validation of the entries (modification or deletion of the entries will not be possible)
+ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=Export draft journal
 Modelcsv=Model of export
 Selectmodelcsv=Select a model of export
diff --git a/htdocs/langs/sq_AL/admin.lang b/htdocs/langs/sq_AL/admin.lang
index a2945323299..a6643921c94 100644
--- a/htdocs/langs/sq_AL/admin.lang
+++ b/htdocs/langs/sq_AL/admin.lang
@@ -221,8 +221,8 @@ NotCompatible=This module does not seem compatible with your Dolibarr %s (Min %s
 CompatibleAfterUpdate=This module requires an update to your Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=See in Market place
 SeeSetupOfModule=See setup of module %s
+SetOptionTo=Set option <b>%s</b> to %s
 Updated=Updated
-Nouveauté=Novelty
 AchatTelechargement=Bli / Shkarko
 GoModuleSetupArea=To deploy/install a new module, go to the Module setup area: <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
@@ -399,6 +399,7 @@ SecurityToken=Key to secure URLs
 NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
 PDF=PDF
 PDFDesc=Global options for PDF generation
+PDFOtherDesc=PDF Option specific to some modules
 PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
 PDFRulesForSalesTax=Rules for Sales Tax / VAT
@@ -561,7 +562,7 @@ Module53Desc=Management of Services
 Module54Name=Contracts/Subscriptions
 Module54Desc=Management of contracts (services or recurring subscriptions)
 Module55Name=Barkod
-Module55Desc=Barcode management
+Module55Desc=Barcode or QR code management
 Module56Name=Payment by credit transfer
 Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
 Module57Name=Payments by Direct Debit
@@ -848,10 +849,10 @@ Permission402=Create/modify discounts
 Permission403=Validate discounts
 Permission404=Delete discounts
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries (yours and subordinates)
-Permission512=Create/modify payments of salaries
-Permission514=Delete payments of salaries
-Permission517=Read payments of salaries of everybody
+Permission511=Read salaries and payments (yours and subordinates)
+Permission512=Create/modify salaries and payments
+Permission514=Delete salaries and payments
+Permission517=Read salaries and payments everybody
 Permission519=Export salaries
 Permission520=Read Loans
 Permission522=Create/modify loans
@@ -965,6 +966,8 @@ Permission23003=Delete Scheduled job
 Permission23004=Execute Scheduled job
 Permission50101=Use Point of Sale (SimplePOS)
 Permission50151=Use Point of Sale (TakePOS)
+Permission50152=Edit sales lines
+Permission50153=Edit ordered sales lines
 Permission50201=Read transactions
 Permission50202=Import transactions
 Permission50330=Read objects of Zapier
@@ -1039,11 +1042,12 @@ DictionaryMeasuringUnits=Measuring Units
 DictionarySocialNetworks=Social Networks
 DictionaryProspectStatus=Prospect status for companies
 DictionaryProspectContactStatus=Prospect status for contacts
-DictionaryHolidayTypes=Types of leave
+DictionaryHolidayTypes=Leave - Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
 DictionaryTransportMode=Intracomm report - Transport mode
+DictionaryBatchStatus=Product lot/serial Quality Control status
 TypeOfUnit=Type of unit
 SetupSaved=Setup saved
 SetupNotSaved=Setup not saved
@@ -1187,7 +1191,7 @@ SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of m
 SetupDescription5=Other Setup menu entries manage optional parameters.
 AuditedSecurityEvents=Security events that are audited
 NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
-Audit=Audit
+Audit=Security events
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
 InfoOS=About OS
@@ -1319,9 +1323,12 @@ ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
 NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
+ComboListOptim=Combo list loading optimization
 SearchOptim=Search optimization
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
-YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
+YouHaveXObjectUseComboOptim=You have %s %s in the database. You can go into setup of module to enable loading of combo list on key pressed event.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other.
+YouHaveXObjectUseSearchOptimDesc=This limits the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to %s in Home-Setup-Other.
 BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
 BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
 PHPModuleLoaded=PHP component %s is loaded
@@ -1433,6 +1440,7 @@ MemberMainOptions=Main options
 AdherentLoginRequired= Manage a Login for each member
 AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
+MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
 MembersDocModules=Document templates for documents generated from member record
@@ -1763,7 +1771,7 @@ AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting men
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
-AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the scheduled job %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
@@ -1979,6 +1987,8 @@ 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_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add picture on proposal line
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add electronic sign in PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
@@ -2096,7 +2106,6 @@ PDF_SHOW_PROJECT=Show project on document
 ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
-FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
@@ -2120,12 +2129,18 @@ ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by
 MailToSendEventOrganization=Event Organization
 AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
 YouShouldDisablePHPFunctions=You should disable PHP functions
-IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands in custom code, you shoud disable PHP functions
+PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
+NotRecommended=Not recommanded
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
 ModuleUpdateAvailable=An update is available
 NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
+RandomlySelectedIfSeveral=Randomly selected if several pictures are available
+DatabasePasswordObfuscated=Database password is obfuscated in conf file
+DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
diff --git a/htdocs/langs/sq_AL/agenda.lang b/htdocs/langs/sq_AL/agenda.lang
index 8fa8da028f0..2e919feca89 100644
--- a/htdocs/langs/sq_AL/agenda.lang
+++ b/htdocs/langs/sq_AL/agenda.lang
@@ -4,7 +4,7 @@ Actions=Events
 Agenda=Agenda
 TMenuAgenda=Agenda
 Agendas=Agendas
-LocalAgenda=Internal calendar
+LocalAgenda=Default calendar
 ActionsOwnedBy=Event owned by
 ActionsOwnedByShort=Owner
 AffectedTo=Assigned to
@@ -14,13 +14,13 @@ EventsNb=Number of events
 ListOfActions=List of events
 EventReports=Event reports
 Location=Vendndodhja
-ToUserOfGroup=Event assigned to any user in group
+ToUserOfGroup=Event assigned to any user in the group
 EventOnFullDay=Event on all day(s)
 MenuToDoActions=All incomplete events
 MenuDoneActions=All terminated events
 MenuToDoMyActions=My incomplete events
 MenuDoneMyActions=My terminated events
-ListOfEvents=List of events (internal calendar)
+ListOfEvents=List of events (default calendar)
 ActionsAskedBy=Events reported by
 ActionsToDoBy=Events assigned to
 ActionsDoneBy=Events done by
@@ -38,6 +38,7 @@ ActionsEvents=Events for which Dolibarr will create an action in agenda automati
 EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Third party %s created
+COMPANY_MODIFYInDolibarr=Third party %s modified
 COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=Contract %s validated
 CONTRACT_DELETEInDolibarr=Contract %s deleted
@@ -87,6 +88,7 @@ OrderDeleted=Order deleted
 InvoiceDeleted=Invoice deleted
 DraftInvoiceDeleted=Draft invoice deleted
 CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_MODIFYInDolibarr=Contact %s modified
 CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Product %s created
 PRODUCT_MODIFYInDolibarr=Product %s modified
@@ -119,6 +121,7 @@ MRP_MO_UNVALIDATEInDolibarr=MO set to draft status
 MRP_MO_PRODUCEDInDolibarr=MO produced
 MRP_MO_DELETEInDolibarr=MO deleted
 MRP_MO_CANCELInDolibarr=MO canceled
+PAIDInDolibarr=%s paid
 ##### End agenda events #####
 AgendaModelModule=Document templates for event
 DateActionStart=Start date
@@ -130,7 +133,7 @@ AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to use
 AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
 AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic events.
 AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> to include events of holidays.
-AgendaShowBirthdayEvents=Show birthdays of contacts
+AgendaShowBirthdayEvents=Birthdays of contacts
 AgendaHideBirthdayEvents=Hide birthdays of contacts
 Busy=Busy
 ExportDataset_event1=List of agenda events
@@ -152,6 +155,7 @@ ActionType=Event type
 DateActionBegin=Start event date
 ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b>?
 RepeatEvent=Repeat event
+OnceOnly=Once only
 EveryWeek=Every week
 EveryMonth=Every month
 DayOfMonth=Day of month
@@ -165,4 +169,4 @@ TimeType=Duration type
 ReminderType=Callback type
 AddReminder=Create an automatic reminder notification for this event
 ErrorReminderActionCommCreation=Error creating the reminder notification for this event
-BrowserPush=Browser Notification
+BrowserPush=Browser Popup Notification
diff --git a/htdocs/langs/sq_AL/bills.lang b/htdocs/langs/sq_AL/bills.lang
index 35e97554290..ae913c0a769 100644
--- a/htdocs/langs/sq_AL/bills.lang
+++ b/htdocs/langs/sq_AL/bills.lang
@@ -259,6 +259,7 @@ DateMaxPayment=Payment due on
 DateInvoice=Invoice date
 DatePointOfTax=Point of tax
 NoInvoice=No invoice
+NoOpenInvoice=No open invoice
 ClassifyBill=Classify invoice
 SupplierBillsToPay=Unpaid vendor invoices
 CustomerBillsUnpaid=Unpaid customer invoices
@@ -589,3 +590,4 @@ FacParentLine=Invoice Line Parent
 SituationTotalRayToRest=Remainder to pay without taxe
 PDFSituationTitle=Situation n° %d
 SituationTotalProgress=Total progress %d %%
+SearchUnpaidInvoicesWithDueDate=Search unpaid invoices with a due date = %s
diff --git a/htdocs/langs/sq_AL/cashdesk.lang b/htdocs/langs/sq_AL/cashdesk.lang
index 1cdcbe50666..c9b3c0bf188 100644
--- a/htdocs/langs/sq_AL/cashdesk.lang
+++ b/htdocs/langs/sq_AL/cashdesk.lang
@@ -102,7 +102,7 @@ CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal numb
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
 SaleStartedAt=Sale started at %s
-ControlCashOpening=Control cash popup at opening POS
+ControlCashOpening=Open the "Control cash" popup when opening the POS
 CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -126,5 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
-ShowPriceHT = Display the price excluding tax column
-ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
+ShowPriceHT = Display the column with the price excluding tax (on screen)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
diff --git a/htdocs/langs/sq_AL/compta.lang b/htdocs/langs/sq_AL/compta.lang
index 85982e65958..d25a840077c 100644
--- a/htdocs/langs/sq_AL/compta.lang
+++ b/htdocs/langs/sq_AL/compta.lang
@@ -286,3 +286,9 @@ ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
 IncludeLoansInResults = Include loans in reports
+InvoiceLate30Days = Invoices late > 30 days
+InvoiceLate15Days = Invoices late > 15 days
+InvoiceLateMinus15Days = Invoices late
+InvoiceNotLate = To be collected < 15 days
+InvoiceNotLate15Days = To be collected in 15 days
+InvoiceNotLate30Days = To be collected in 30 days
diff --git a/htdocs/langs/sq_AL/cron.lang b/htdocs/langs/sq_AL/cron.lang
index 485accd2a17..bc12288670f 100644
--- a/htdocs/langs/sq_AL/cron.lang
+++ b/htdocs/langs/sq_AL/cron.lang
@@ -60,7 +60,7 @@ CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
 CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Çaktivizo
-CronTaskInactive=This job is disabled
+CronTaskInactive=This job is disabled (not scheduled)
 CronId=Id
 CronClassFile=Filename with class
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example 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>
diff --git a/htdocs/langs/sq_AL/errors.lang b/htdocs/langs/sq_AL/errors.lang
index 9b14b5ad1d2..670f8c7a6bc 100644
--- a/htdocs/langs/sq_AL/errors.lang
+++ b/htdocs/langs/sq_AL/errors.lang
@@ -11,6 +11,7 @@ ErrorBadValueForParamNotAString=Bad value for your parameter. It appends general
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s already exists.
 ErrorGroupAlreadyExists=Group %s already exists.
+ErrorEmailAlreadyExists=Email %s already exists.
 ErrorRecordNotFound=Record not found.
 ErrorFailToCopyFile=Failed to copy file '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
@@ -117,7 +118,7 @@ ErrorCantReadFile=Failed to read file '%s'
 ErrorCantReadDir=Failed to read directory '%s'
 ErrorBadLoginPassword=Bad value for login or password
 ErrorLoginDisabled=Your account has been disabled
-ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server. If PHP <b>Safe Mode</b> is enabled, check that command is inside a directory defined by parameter <b>safe_mode_exec_dir</b>.
+ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server user. Check also the command is not protected on shell level by a security layer like apparmor.
 ErrorFailedToChangePassword=Failed to change password
 ErrorLoginDoesNotExists=User with login <b>%s</b> could not be found.
 ErrorLoginHasNoEmail=This user has no email address. Process aborted.
@@ -262,6 +263,7 @@ ErrorDateIsInFuture=Error, the date can't be in the future
 ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
 ErrorAPercentIsRequired=Error, please fill in the percentage correctly
 ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
+ErrorFailedToFindEmailTemplate=Failed to find template with code name %s
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -298,3 +300,4 @@ WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So y
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
+ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
diff --git a/htdocs/langs/sq_AL/eventorganization.lang b/htdocs/langs/sq_AL/eventorganization.lang
index 75b798fbc3a..335c257b224 100644
--- a/htdocs/langs/sq_AL/eventorganization.lang
+++ b/htdocs/langs/sq_AL/eventorganization.lang
@@ -1,4 +1,5 @@
 # Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+# Copyright (C) 2021		Dorian Vabre			<dorian.vabre@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
@@ -81,7 +82,10 @@ PriceOfBoothHelp=Subscription price to stand a booth
 EventOrganizationICSLink=Link ICS for events
 ConferenceOrBoothInformation=Conference Or Booth informations
 Attendees = Attendees
+DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
 #
 # Status
 #
@@ -94,8 +98,46 @@ EvntOrgCancelled = Cancelled
 #
 # Public page
 #
+SuggestForm = Suggestion page
+RegisterPage = Page for conferences or booth
+EvntOrgRegistrationHelpMessage = Here, you can vote for an event, or suggest a new conference or booth for the project
+EvntOrgRegistrationConfHelpMessage = Here, you can suggest a new conference for the project
+EvntOrgRegistrationBoothHelpMessage = Here, you can suggest a new booth for the project
+ListOfSuggestedConferences = List of suggested conferences
+ListOfSuggestedBooths = List of suggested booths
+SuggestConference = Suggest a new conference
+SuggestBooth = Suggest a booth
+ViewAndVote = View and vote for suggested events
 PublicAttendeeSubscriptionPage = Public link of registration to a conference
 MissingOrBadSecureKey = The security key is invalid or missing
-EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
-EvntOrgStartDuration = This conference starts on
-EvntOrgEndDuration =  and ends on
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference : '%s'
+EvntOrgDuration = This conference starts on %s and ends on %s.
+ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
+BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
+EventType = Event type
+
+#
+# Vote page
+#
+EvntOrgRegistrationWelcomeMessage = Welcome on the conference or booth suggestion page.
+EvntOrgRegistrationConfWelcomeMessage = Welcome on the conference suggestion page.
+EvntOrgRegistrationBoothWelcomeMessage = Welcome on the booth suggestion page.
+EvntOrgVoteHelpMessage = Here, you can view and vote for the suggested events for the project
+VoteOk = Your vote has been accepted.
+AlreadyVoted = You have already voted for this event.
+VoteError = An error has occurred during the vote, please try again.
+
+#
+# SubscriptionOk page
+#
+SubscriptionOk = Your subscription to this conference has been validated
+#
+# Subscription validation mail
+#
+ConfAttendeeSubscriptionConfirmation = Confirmation of your subscription to a conference
+#
+# Payment page
+#
+Attendee = Attendee
+PaymentConferenceAttendee = Conference attendee payment
+PaymentBoothLocation = Booth location payment
diff --git a/htdocs/langs/sq_AL/hrm.lang b/htdocs/langs/sq_AL/hrm.lang
index 4ef88ad657a..9e40eafd4c1 100644
--- a/htdocs/langs/sq_AL/hrm.lang
+++ b/htdocs/langs/sq_AL/hrm.lang
@@ -9,7 +9,7 @@ ConfirmDeleteEstablishment=Are you sure you wish to delete this establishment?
 OpenEtablishment=Open establishment
 CloseEtablishment=Close establishment
 # Dictionary
-DictionaryPublicHolidays=HRM - Public holidays
+DictionaryPublicHolidays=Leave - Public holidays
 DictionaryDepartment=HRM - Department list
 DictionaryFunction=HRM - Job positions
 # Module
diff --git a/htdocs/langs/sq_AL/knowledgemanagement.lang b/htdocs/langs/sq_AL/knowledgemanagement.lang
index 0d309f02677..7ae54398368 100644
--- a/htdocs/langs/sq_AL/knowledgemanagement.lang
+++ b/htdocs/langs/sq_AL/knowledgemanagement.lang
@@ -47,7 +47,7 @@ KnowledgeManagementArea = Knowledge Management
 # Menu
 #
 MenuKnowledgeRecord = Knowledge base
-ListOfArticles = List of articles
+ListKnowledgeRecord = List of articles
 NewKnowledgeRecord = New article
 ValidateReply = Validate solution
 KnowledgeRecords = Articles
diff --git a/htdocs/langs/sq_AL/languages.lang b/htdocs/langs/sq_AL/languages.lang
index 98d74a37c1a..7a2e34731df 100644
--- a/htdocs/langs/sq_AL/languages.lang
+++ b/htdocs/langs/sq_AL/languages.lang
@@ -3,6 +3,7 @@ Language_am_ET=Ethiopian
 Language_ar_AR=Arabic
 Language_ar_EG=Arabic (Egypt)
 Language_ar_SA=Arabic
+Language_ar_TN=Arabic (Tunisia)
 Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengali
 Language_bn_IN=Bengali (India)
@@ -84,6 +85,7 @@ Language_nl_NL=Dutch
 Language_pl_PL=Polish
 Language_pt_BR=Portuguese (Brazil)
 Language_pt_PT=Portuguese
+Language_ro_MD=Romanian (Moldavia)
 Language_ro_RO=Romanian
 Language_ru_RU=Russian
 Language_ru_UA=Russian (Ukraine)
diff --git a/htdocs/langs/sq_AL/main.lang b/htdocs/langs/sq_AL/main.lang
index c8c0a25e494..650d5aded39 100644
--- a/htdocs/langs/sq_AL/main.lang
+++ b/htdocs/langs/sq_AL/main.lang
@@ -430,6 +430,7 @@ LT1IN=CGST
 LT2IN=SGST
 LT1GC=Additionnal cents
 VATRate=Tax Rate
+RateOfTaxN=Rate of tax %s
 VATCode=Tax Rate code
 VATNPR=Tax Rate NPR
 DefaultTaxRate=Default tax rate
@@ -729,6 +730,7 @@ MenuMembers=Members
 MenuAgendaGoogle=Google agenda
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
+ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
 NoFileFound=No documents uploaded
 CurrentUserLanguage=Current language
 CurrentTheme=Current theme
@@ -1072,6 +1074,7 @@ ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
 ToClose=To close
+ToRefuse=To refuse
 ToProcess=To process
 ToApprove=To approve
 GlobalOpenedElemView=Global view
@@ -1126,9 +1129,11 @@ UpdateForAllLines=Update for all lines
 OnHold=On hold
 Civility=Civility
 AffectTag=Affect Tag
+CreateExternalUser=Create external user
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
 ConfirmCancel=Are you sure you want to cancel
+EmailMsgID=Email MsgID
diff --git a/htdocs/langs/sq_AL/members.lang b/htdocs/langs/sq_AL/members.lang
index e10f9fa14c4..85ca7c1f433 100644
--- a/htdocs/langs/sq_AL/members.lang
+++ b/htdocs/langs/sq_AL/members.lang
@@ -213,3 +213,5 @@ SendReminderForExpiredSubscription=Send reminder by email to members when subscr
 MembershipPaid=Membership paid for current period (until %s)
 YouMayFindYourInvoiceInThisEmail=You may find your invoice attached to this email
 XMembersClosed=%s member(s) closed
+XExternalUserCreated=%s external user(s) created
+ForceMemberNature=Force member nature (Individual or Corporation)
diff --git a/htdocs/langs/sq_AL/modulebuilder.lang b/htdocs/langs/sq_AL/modulebuilder.lang
index 9fdaa1a533a..23a098be2e5 100644
--- a/htdocs/langs/sq_AL/modulebuilder.lang
+++ b/htdocs/langs/sq_AL/modulebuilder.lang
@@ -143,3 +143,4 @@ AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
 ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
+ImportExportProfiles=Import and export profiles
diff --git a/htdocs/langs/sq_AL/mrp.lang b/htdocs/langs/sq_AL/mrp.lang
index ec999a473a4..29554c164a3 100644
--- a/htdocs/langs/sq_AL/mrp.lang
+++ b/htdocs/langs/sq_AL/mrp.lang
@@ -8,12 +8,12 @@ MenuBOM=Bills of material
 LatestBOMModified=Latest %s Bills of materials modified
 LatestMOModified=Latest %s Manufacturing Orders modified
 Bom=Bills of Material
-BillOfMaterials=Bill of Material
+BillOfMaterials=Bill of Materials
 BOMsSetup=Setup of module BOM
 ListOfBOMs=List of bills of material - BOM
 ListOfManufacturingOrders=List of Manufacturing Orders
-NewBOM=New bill of material
-ProductBOMHelp=Product to create with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
+NewBOM=New bill of materials
+ProductBOMHelp=Product to create (or disassemble) with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
 BOMsNumberingModules=BOM numbering templates
 BOMsModelModule=BOM document templates
 MOsNumberingModules=MO numbering templates
@@ -22,7 +22,7 @@ FreeLegalTextOnBOMs=Free text on document of BOM
 WatermarkOnDraftBOMs=Watermark on draft BOM
 FreeLegalTextOnMOs=Free text on document of MO
 WatermarkOnDraftMOs=Watermark on draft MO
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials %s ?
 ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
 ManufacturingEfficiency=Manufacturing efficiency
 ConsumptionEfficiency=Consumption efficiency
@@ -30,8 +30,8 @@ ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the produc
 ValueOfMeansLossForProductProduced=Value of 0.95 means an average of 5%% of loss of produced product
 DeleteBillOfMaterials=Delete Bill Of Materials
 DeleteMo=Delete Manufacturing Order
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Materials?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Materials?
 MenuMRP=Manufacturing Orders
 NewMO=New Manufacturing Order
 QtyToProduce=Qty to produce
@@ -39,7 +39,7 @@ DateStartPlannedMo=Date start planned
 DateEndPlannedMo=Date end planned
 KeepEmptyForAsap=Empty means 'As Soon As Possible'
 EstimatedDuration=Estimated duration
-EstimatedDurationDesc=Estimated duration to manufacture this product using this BOM
+EstimatedDurationDesc=Estimated duration to manufacture (or disassemble) this product using this BOM
 ConfirmValidateBom=Are you sure you want to validate the BOM with the reference <strong>%s</strong> (you will be able to use it to build new Manufacturing Orders)
 ConfirmCloseBom=Are you sure you want to cancel this BOM (you won't be able to use it to build new Manufacturing Orders anymore) ?
 ConfirmReopenBom=Are you sure you want to re-open this BOM (you will be able to use it to build new Manufacturing Orders)
@@ -63,13 +63,14 @@ ConsumeAndProduceAll=Consume and Produce All
 Manufactured=Manufactured
 TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
 ForAQuantityOf=For a quantity to produce of %s
+ForAQuantityToConsumeOf=For a quantity to disassemble of %s
 ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
 ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
 ProductionForRef=Production of %s
 AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
 NoStockChangeOnServices=No stock change on services
 ProductQtyToConsumeByMO=Product quantity still to consume by open MO
-ProductQtyToProduceByMO=Product quentity still to produce by open MO
+ProductQtyToProduceByMO=Product quantity still to produce by open MO
 AddNewConsumeLines=Add new line to consume
 ProductsToConsume=Products to consume
 ProductsToProduce=Products to produce
@@ -83,15 +84,13 @@ Workstations=Workstations
 WorkstationsDescription=Workstations management
 WorkstationSetup = Workstations setup
 WorkstationSetupPage = Workstations setup page
-WorkstationAbout = About Workstation
-WorkstationAboutPage = Workstations about page
 WorkstationList=Workstation list
 WorkstationCreate=Add new workstation
 ConfirmEnableWorkstation=Are you sure you want to enable workstation <b>%s</b> ?
 EnableAWorkstation=Enable a workstation
 ConfirmDisableWorkstation=Are you sure you want to disable workstation <b>%s</b> ?
 DisableAWorkstation=Disable a workstation
-DeleteWorkstation=Supprimer
+DeleteWorkstation=Fshi
 NbOperatorsRequired=Number of operators required
 THMOperatorEstimated=Estimated operator THM
 THMMachineEstimated=Estimated machine THM
diff --git a/htdocs/langs/sq_AL/orders.lang b/htdocs/langs/sq_AL/orders.lang
index 2ed1b8af62e..a58d0708e9f 100644
--- a/htdocs/langs/sq_AL/orders.lang
+++ b/htdocs/langs/sq_AL/orders.lang
@@ -11,6 +11,7 @@ OrderDate=Order date
 OrderDateShort=Order date
 OrderToProcess=Order to process
 NewOrder=New order
+NewSupplierOrderShort=New order
 NewOrderSupplier=New Purchase Order
 ToOrder=Make order
 MakeOrder=Make order
@@ -73,6 +74,7 @@ DeleteOrder=Delete order
 CancelOrder=Cancel order
 OrderReopened= Order %s re-open
 AddOrder=Create order
+AddSupplierOrderShort=Create order
 AddPurchaseOrder=Create purchase order
 AddToDraftOrders=Add to draft order
 ShowOrder=Show order
diff --git a/htdocs/langs/sq_AL/other.lang b/htdocs/langs/sq_AL/other.lang
index 1975223f19c..319ea275789 100644
--- a/htdocs/langs/sq_AL/other.lang
+++ b/htdocs/langs/sq_AL/other.lang
@@ -129,6 +129,7 @@ ClosedByLogin=User login who closed
 FileWasRemoved=File %s was removed
 DirWasRemoved=Directory %s was removed
 FeatureNotYetAvailable=Feature not yet available in the current version
+FeatureNotAvailableOnDevicesWithoutMouse=Feature not available on devices without mouse
 FeaturesSupported=Supported features
 Width=Width
 Height=Height
@@ -263,7 +264,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
-PrefixSession=Prefix for session ID
+SuffixSessionName=Suffix for session name
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/sq_AL/partnership.lang b/htdocs/langs/sq_AL/partnership.lang
index 89c29157803..551c54ad614 100644
--- a/htdocs/langs/sq_AL/partnership.lang
+++ b/htdocs/langs/sq_AL/partnership.lang
@@ -16,41 +16,72 @@
 #
 # Generic
 #
-ModulePartnershipName = Partnership management
-PartnershipDescription = Module Partnership management
+ModulePartnershipName=Partnership management
+PartnershipDescription=Module Partnership management
 PartnershipDescriptionLong= Module Partnership management
 
+AddPartnership=Add partnership
+CancelPartnershipForExpiredMembers=Partnership: Cancel partnership of members with expired subscriptions
+PartnershipCheckBacklink=Partnership: Check referring backlink
+
 #
 # Menu
 #
-NewPartnership = New Partnership
-ListOfPartnerships = List of partnership
+NewPartnership=New Partnership
+ListOfPartnerships=List of partnership
 
 #
 # Admin page
 #
-PartnershipSetup = Partnership setup
-PartnershipAbout = About Partnership
-PartnershipAboutPage = Partnership about page
-
+PartnershipSetup=Partnership setup
+PartnershipAbout=About Partnership
+PartnershipAboutPage=Partnership about page
+partnershipforthirdpartyormember=Partner status must be set on a 'thirdparty' or a 'member'
+PARTNERSHIP_IS_MANAGED_FOR=Partnership managed for
+PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks to check
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb of days before cancelling status of a partnership when a subscription has expired
+ReferingWebsiteCheck=Check of website referring
+ReferingWebsiteCheckDesc=You can enable a feature to check that your partners has added a backlink to your website domains on their own website.
 
 #
 # Object
 #
+DeletePartnership=Delete a partnership
+PartnershipDedicatedToThisThirdParty=Partnership dedicated to this third party
+PartnershipDedicatedToThisMember=Partnership dedicated to this member
 DatePartnershipStart=Start date
 DatePartnershipEnd=End date
+ReasonDecline=Decline reason
+ReasonDeclineOrCancel=Decline reason
+PartnershipAlreadyExist=Partnership already exist
+ManagePartnership=Manage partnership
+BacklinkNotFoundOnPartnerWebsite=Backlink not found on partner website
+ConfirmClosePartnershipAsk=Are you sure you want to cancel this partnership?
+PartnershipType=Partnership type
 
 #
 # Template Mail
 #
+SendingEmailOnPartnershipWillSoonBeCanceled=Partnership will soon be canceled
+SendingEmailOnPartnershipRefused=Partnership refused
+SendingEmailOnPartnershipAccepted=Partnership accepted
+SendingEmailOnPartnershipCanceled=Partnership canceled
 
+YourPartnershipWillSoonBeCanceledTopic=Partnership will soon be canceled
+YourPartnershipRefusedTopic=Partnership refused
+YourPartnershipAcceptedTopic=Partnership accepted
+YourPartnershipCanceledTopic=Partnership canceled
+
+YourPartnershipWillSoonBeCanceledContent=We inform you that your partnership will soon be canceled (Backlink not found)
+YourPartnershipRefusedContent=We inform you that your partnership request has been refused.
+YourPartnershipAcceptedContent=We inform you that your partnership request has been accepted.
+YourPartnershipCanceledContent=We inform you that your partnership has been canceled.
 
 #
 # Status
 #
-PartnershipDraft = Draft
-PartnershipAccepted = Accepted
-PartnershipRefused = Refuzuar
-PartnershipCanceled = Anulluar
-
+PartnershipDraft=Draft
+PartnershipAccepted=Accepted
+PartnershipRefused=Refuzuar
+PartnershipCanceled=Anulluar
 PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/sq_AL/productbatch.lang b/htdocs/langs/sq_AL/productbatch.lang
index ad2db658e2e..450d0285819 100644
--- a/htdocs/langs/sq_AL/productbatch.lang
+++ b/htdocs/langs/sq_AL/productbatch.lang
@@ -1,4 +1,4 @@
-# ProductBATCH language file - en_US - ProductBATCH
+# ProductBATCH language file - Source file is en_US - ProductBATCH
 ManageLotSerial=Use lot/serial number
 ProductStatusOnBatch=Yes (lot required)
 ProductStatusOnSerial=Yes (unique serial number required)
@@ -33,3 +33,13 @@ CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+LifeTime=Life span (in days)
+EndOfLife=End of life
+ManufacturingDate=Manufacturing date
+DestructionDate=Destruction date
+FirstUseDate=First use date
+QCFrequency=Quality control frequency (in days)
+
+#Traceability - qc status
+OutOfOrder=Out of order
+InWorkingOrder=In working order
diff --git a/htdocs/langs/sq_AL/products.lang b/htdocs/langs/sq_AL/products.lang
index ff733168095..3ef089f359a 100644
--- a/htdocs/langs/sq_AL/products.lang
+++ b/htdocs/langs/sq_AL/products.lang
@@ -396,3 +396,5 @@ ActionAvailableOnVariantProductOnly=Action only available on the variant of prod
 ProductsPricePerCustomer=Product prices per customers
 ProductSupplierExtraFields=Additional Attributes (Supplier Prices)
 DeleteLinkedProduct=Delete the child product linked to the combination
+PMPValue=Weighted average price
+PMPValueShort=WAP
diff --git a/htdocs/langs/sq_AL/projects.lang b/htdocs/langs/sq_AL/projects.lang
index 495ef8c0330..08c384659c0 100644
--- a/htdocs/langs/sq_AL/projects.lang
+++ b/htdocs/langs/sq_AL/projects.lang
@@ -267,9 +267,11 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=New invoice
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+OneLinePerTimeSpentLine=One line for each time spent declaration
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
 AddPersonToTask=Add also to tasks
 UsageOrganizeEvent=Usage: Event Organization
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
+SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
diff --git a/htdocs/langs/sq_AL/receptions.lang b/htdocs/langs/sq_AL/receptions.lang
index 643f77a9f72..5665f2b6503 100644
--- a/htdocs/langs/sq_AL/receptions.lang
+++ b/htdocs/langs/sq_AL/receptions.lang
@@ -44,4 +44,4 @@ ValidateOrderFirstBeforeReception=You must first validate the order before being
 ReceptionsNumberingModules=Numbering module for receptions
 ReceptionsReceiptModel=Document templates for receptions
 NoMorePredefinedProductToDispatch=No more predefined products to dispatch
-
+ReceptionExist=A reception exists
diff --git a/htdocs/langs/sq_AL/stocks.lang b/htdocs/langs/sq_AL/stocks.lang
index 64b66cea86f..791c2265525 100644
--- a/htdocs/langs/sq_AL/stocks.lang
+++ b/htdocs/langs/sq_AL/stocks.lang
@@ -56,8 +56,6 @@ UnitPurchaseValue=Unit purchase price
 StockTooLow=Stock too low
 StockLowerThanLimit=Stock lower than alert limit (%s)
 EnhancedValue=Value
-PMPValue=Weighted average price
-PMPValueShort=WAP
 EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
@@ -251,7 +249,10 @@ SelectAStockMovementFileToImport=select a stock movement file to import
 InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
 LabelOfInventoryMovemement=Inventory %s
 ReOpen=Reopen
-ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock to the real qty you entered into the inventory.
 ObjectNotFound=%s not found
 MakeMovementsAndClose=Generate movements and close
 AutofillWithExpected=Fill real quantity with expected quantity
+ShowAllBatchByDefault=By default, show batch details on product "stock" tab
+CollapseBatchDetailHelp=You can set batch detail default display in stocks module configuration
+FieldCannotBeNegative=Field "%s" cannot be negative
diff --git a/htdocs/langs/sq_AL/ticket.lang b/htdocs/langs/sq_AL/ticket.lang
index 8e7d22fb4e0..624d7985dbd 100644
--- a/htdocs/langs/sq_AL/ticket.lang
+++ b/htdocs/langs/sq_AL/ticket.lang
@@ -304,7 +304,7 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
-BoxTicketType=Number of open tickets by type
+BoxTicketType=Distribution of open tickets by type
 BoxTicketSeverity=Number of open tickets by severity
 BoxNoTicketSeverity=No tickets opened
 BoxTicketLastXDays=Number of new tickets by days the last %s days
diff --git a/htdocs/langs/sr_RS/accountancy.lang b/htdocs/langs/sr_RS/accountancy.lang
index a80c056d536..c141e406e10 100644
--- a/htdocs/langs/sr_RS/accountancy.lang
+++ b/htdocs/langs/sr_RS/accountancy.lang
@@ -158,7 +158,7 @@ ACCOUNTING_LENGTH_AACCOUNT=Length of the third-party accounting accounts (If you
 ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of an accounting account. Needed by some countries (like Switzerland). If set to off (default), you can set the following two parameters to ask the application to add virtual zeros.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties, break ability to search on a part of value)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
@@ -328,6 +328,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountanc
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
+NotifiedExportDate=Notified export date (modification of the entries will not be possible)
+NotifiedValidationDate=Validation of the entries (modification or deletion of the entries will not be possible)
+ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=Export draft journal
 Modelcsv=Model izvoza
 Selectmodelcsv=Izaberite model izvoza
diff --git a/htdocs/langs/sr_RS/admin.lang b/htdocs/langs/sr_RS/admin.lang
index 47438a037f4..7c246b5d190 100644
--- a/htdocs/langs/sr_RS/admin.lang
+++ b/htdocs/langs/sr_RS/admin.lang
@@ -221,8 +221,8 @@ NotCompatible=This module does not seem compatible with your Dolibarr %s (Min %s
 CompatibleAfterUpdate=This module requires an update to your Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=See in Market place
 SeeSetupOfModule=Vidi podešavanja modula %s
+SetOptionTo=Set option <b>%s</b> to %s
 Updated=Updated
-Nouveauté=Novelty
 AchatTelechargement=Buy / Download
 GoModuleSetupArea=To deploy/install a new module, go to the Module setup area: <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
@@ -399,6 +399,7 @@ SecurityToken=Key to secure URLs
 NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
 PDF=PDF
 PDFDesc=Global options for PDF generation
+PDFOtherDesc=PDF Option specific to some modules
 PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
 PDFRulesForSalesTax=Rules for Sales Tax / VAT
@@ -561,7 +562,7 @@ Module53Desc=Management of Services
 Module54Name=Contracts/Subscriptions
 Module54Desc=Management of contracts (services or recurring subscriptions)
 Module55Name=Barcodes
-Module55Desc=Barcode management
+Module55Desc=Barcode or QR code management
 Module56Name=Payment by credit transfer
 Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
 Module57Name=Payments by Direct Debit
@@ -848,10 +849,10 @@ Permission402=Create/modify discounts
 Permission403=Validate discounts
 Permission404=Delete discounts
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries (yours and subordinates)
-Permission512=Create/modify payments of salaries
-Permission514=Delete payments of salaries
-Permission517=Read payments of salaries of everybody
+Permission511=Read salaries and payments (yours and subordinates)
+Permission512=Create/modify salaries and payments
+Permission514=Delete salaries and payments
+Permission517=Read salaries and payments everybody
 Permission519=Export salaries
 Permission520=Read Loans
 Permission522=Create/modify loans
@@ -965,6 +966,8 @@ Permission23003=Delete Scheduled job
 Permission23004=Execute Scheduled job
 Permission50101=Use Point of Sale (SimplePOS)
 Permission50151=Use Point of Sale (TakePOS)
+Permission50152=Edit sales lines
+Permission50153=Edit ordered sales lines
 Permission50201=Read transactions
 Permission50202=Import transactions
 Permission50330=Read objects of Zapier
@@ -1039,11 +1042,12 @@ DictionaryMeasuringUnits=Measuring Units
 DictionarySocialNetworks=Social Networks
 DictionaryProspectStatus=Prospect status for companies
 DictionaryProspectContactStatus=Prospect status for contacts
-DictionaryHolidayTypes=Types of leave
+DictionaryHolidayTypes=Leave - Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
 DictionaryTransportMode=Intracomm report - Transport mode
+DictionaryBatchStatus=Product lot/serial Quality Control status
 TypeOfUnit=Type of unit
 SetupSaved=Setup saved
 SetupNotSaved=Setup not saved
@@ -1187,7 +1191,7 @@ SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of m
 SetupDescription5=Other Setup menu entries manage optional parameters.
 AuditedSecurityEvents=Security events that are audited
 NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
-Audit=Audit
+Audit=Security events
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
 InfoOS=About OS
@@ -1319,9 +1323,12 @@ ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
 NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
+ComboListOptim=Combo list loading optimization
 SearchOptim=Search optimization
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
-YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
+YouHaveXObjectUseComboOptim=You have %s %s in the database. You can go into setup of module to enable loading of combo list on key pressed event.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other.
+YouHaveXObjectUseSearchOptimDesc=This limits the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to %s in Home-Setup-Other.
 BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
 BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
 PHPModuleLoaded=PHP component %s is loaded
@@ -1433,6 +1440,7 @@ MemberMainOptions=Main options
 AdherentLoginRequired= Manage a Login for each member
 AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
+MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
 MembersDocModules=Document templates for documents generated from member record
@@ -1763,7 +1771,7 @@ AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting men
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
-AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the scheduled job %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
@@ -1979,6 +1987,8 @@ 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_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add picture on proposal line
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add electronic sign in PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
@@ -2096,7 +2106,6 @@ PDF_SHOW_PROJECT=Show project on document
 ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
-FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
@@ -2120,12 +2129,18 @@ ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by
 MailToSendEventOrganization=Event Organization
 AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
 YouShouldDisablePHPFunctions=You should disable PHP functions
-IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands in custom code, you shoud disable PHP functions
+PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
+NotRecommended=Not recommanded
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
 ModuleUpdateAvailable=An update is available
 NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
+RandomlySelectedIfSeveral=Randomly selected if several pictures are available
+DatabasePasswordObfuscated=Database password is obfuscated in conf file
+DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
diff --git a/htdocs/langs/sr_RS/agenda.lang b/htdocs/langs/sr_RS/agenda.lang
index 8e034566601..53452115e66 100644
--- a/htdocs/langs/sr_RS/agenda.lang
+++ b/htdocs/langs/sr_RS/agenda.lang
@@ -4,7 +4,7 @@ Actions=Događaji
 Agenda=Agenda
 TMenuAgenda=Agenda
 Agendas=Agende
-LocalAgenda=Interni kalendar
+LocalAgenda=Default calendar
 ActionsOwnedBy=Događaj u vlasništvu
 ActionsOwnedByShort=Vlasnik
 AffectedTo=Dodeljeno
@@ -14,13 +14,13 @@ EventsNb=Broj događaja
 ListOfActions=Lista događaja
 EventReports=Event reports
 Location=Lokacija
-ToUserOfGroup=Event assigned to any user in group
+ToUserOfGroup=Event assigned to any user in the group
 EventOnFullDay=Dogadaj svim danima
 MenuToDoActions=Svi nezavršeni događaji
 MenuDoneActions=Svi završeni događaji
 MenuToDoMyActions=Moji nezavršeni događaji
 MenuDoneMyActions=Moji završeni događaji
-ListOfEvents=Lista događaja (interni kalendar)
+ListOfEvents=List of events (default calendar)
 ActionsAskedBy=Događaje prijavio
 ActionsToDoBy=Događaji dodeljeni
 ActionsDoneBy=Događaje završio
@@ -38,6 +38,7 @@ ActionsEvents=Događaji za koje će Dolibarr da kreira akciju u agendi automatsk
 EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Third party %s created
+COMPANY_MODIFYInDolibarr=Third party %s modified
 COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=Ugovor %s je potvrđen
 CONTRACT_DELETEInDolibarr=Contract %s deleted
@@ -87,6 +88,7 @@ OrderDeleted=Order deleted
 InvoiceDeleted=Invoice deleted
 DraftInvoiceDeleted=Draft invoice deleted
 CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_MODIFYInDolibarr=Contact %s modified
 CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Product %s created
 PRODUCT_MODIFYInDolibarr=Product %s modified
@@ -119,6 +121,7 @@ MRP_MO_UNVALIDATEInDolibarr=MO set to draft status
 MRP_MO_PRODUCEDInDolibarr=MO produced
 MRP_MO_DELETEInDolibarr=MO deleted
 MRP_MO_CANCELInDolibarr=MO canceled
+PAIDInDolibarr=%s paid
 ##### End agenda events #####
 AgendaModelModule=Document templates for event
 DateActionStart=Početak
@@ -130,7 +133,7 @@ AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to use
 AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
 AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic events.
 AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> to include events of holidays.
-AgendaShowBirthdayEvents=Show birthdays of contacts
+AgendaShowBirthdayEvents=Birthdays of contacts
 AgendaHideBirthdayEvents=Hide birthdays of contacts
 Busy=Zauzet
 ExportDataset_event1=Spisak događaja iz agende
@@ -152,6 +155,7 @@ ActionType=Tip događaja
 DateActionBegin=Početak događaja
 ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b>?
 RepeatEvent=Ponovi događaj
+OnceOnly=Once only
 EveryWeek=Svake nedelje
 EveryMonth=Svakog meseca
 DayOfMonth=Dan u mesecu
@@ -165,4 +169,4 @@ TimeType=Duration type
 ReminderType=Callback type
 AddReminder=Create an automatic reminder notification for this event
 ErrorReminderActionCommCreation=Error creating the reminder notification for this event
-BrowserPush=Browser Notification
+BrowserPush=Browser Popup Notification
diff --git a/htdocs/langs/sr_RS/bills.lang b/htdocs/langs/sr_RS/bills.lang
index df00b3c8612..b8e0f5f03c7 100644
--- a/htdocs/langs/sr_RS/bills.lang
+++ b/htdocs/langs/sr_RS/bills.lang
@@ -259,6 +259,7 @@ DateMaxPayment=Payment due on
 DateInvoice=Invoice date
 DatePointOfTax=Point of tax
 NoInvoice=No invoice
+NoOpenInvoice=No open invoice
 ClassifyBill=Classify invoice
 SupplierBillsToPay=Unpaid vendor invoices
 CustomerBillsUnpaid=Neplaćene fakture klijenata
@@ -589,3 +590,4 @@ FacParentLine=Invoice Line Parent
 SituationTotalRayToRest=Remainder to pay without taxe
 PDFSituationTitle=Situation n° %d
 SituationTotalProgress=Total progress %d %%
+SearchUnpaidInvoicesWithDueDate=Search unpaid invoices with a due date = %s
diff --git a/htdocs/langs/sr_RS/cashdesk.lang b/htdocs/langs/sr_RS/cashdesk.lang
index 31e585226cf..76a74df3a33 100644
--- a/htdocs/langs/sr_RS/cashdesk.lang
+++ b/htdocs/langs/sr_RS/cashdesk.lang
@@ -102,7 +102,7 @@ CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal numb
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
 SaleStartedAt=Sale started at %s
-ControlCashOpening=Control cash popup at opening POS
+ControlCashOpening=Open the "Control cash" popup when opening the POS
 CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -126,5 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
-ShowPriceHT = Display the price excluding tax column
-ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
+ShowPriceHT = Display the column with the price excluding tax (on screen)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
diff --git a/htdocs/langs/sr_RS/compta.lang b/htdocs/langs/sr_RS/compta.lang
index 7af3218a6ab..667d1780dac 100644
--- a/htdocs/langs/sr_RS/compta.lang
+++ b/htdocs/langs/sr_RS/compta.lang
@@ -286,3 +286,9 @@ ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
 IncludeLoansInResults = Include loans in reports
+InvoiceLate30Days = Invoices late > 30 days
+InvoiceLate15Days = Invoices late > 15 days
+InvoiceLateMinus15Days = Invoices late
+InvoiceNotLate = To be collected < 15 days
+InvoiceNotLate15Days = To be collected in 15 days
+InvoiceNotLate30Days = To be collected in 30 days
diff --git a/htdocs/langs/sr_RS/cron.lang b/htdocs/langs/sr_RS/cron.lang
index 5a246d49be9..b62e4234f90 100644
--- a/htdocs/langs/sr_RS/cron.lang
+++ b/htdocs/langs/sr_RS/cron.lang
@@ -60,7 +60,7 @@ CronErrEndDateStartDt=Kraj ne može biti pre početka
 StatusAtInstall=Status at module installation
 CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Deaktiviraj
-CronTaskInactive=Operacije je deaktivirana
+CronTaskInactive=This job is disabled (not scheduled)
 CronId=Id
 CronClassFile=Filename with class
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example 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>
diff --git a/htdocs/langs/sr_RS/errors.lang b/htdocs/langs/sr_RS/errors.lang
index b8cac5689b3..cfcb3ff5f9f 100644
--- a/htdocs/langs/sr_RS/errors.lang
+++ b/htdocs/langs/sr_RS/errors.lang
@@ -11,6 +11,7 @@ ErrorBadValueForParamNotAString=Bad value for your parameter. It appends general
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s već postoji
 ErrorGroupAlreadyExists=Grupa %s već postoji
+ErrorEmailAlreadyExists=Email %s already exists.
 ErrorRecordNotFound=Linija nije pronađena.
 ErrorFailToCopyFile=Greška prilikom kopiranja fajla '<b>%s</b>' u '<b>%s</b>'.
 ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
@@ -117,7 +118,7 @@ ErrorCantReadFile=Greška u čitanju fajla "%s"
 ErrorCantReadDir=Greška u čitanju foldera "%s"
 ErrorBadLoginPassword=Pogrešna vrednost za login ili lozinku
 ErrorLoginDisabled=Vaš nalog je deaktiviran
-ErrorFailedToRunExternalCommand=Greška prilikom pokretanja eksterne komande. Proverite da li je ova funkcionalnost moguća na PHP serveru. Ukoliko je aktivan PHP <b>Safe Mode</b>, proverite da je komanda u filderu definisanom u <b>safe_mode_exec_dir</b>.
+ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server user. Check also the command is not protected on shell level by a security layer like apparmor.
 ErrorFailedToChangePassword=Greška prilikom promene lozinke
 ErrorLoginDoesNotExists=Korisnik <b>%s</b> nije pronađen.
 ErrorLoginHasNoEmail=Korisnik nema mail adresu. Operacija otkazana.
@@ -262,6 +263,7 @@ ErrorDateIsInFuture=Error, the date can't be in the future
 ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
 ErrorAPercentIsRequired=Error, please fill in the percentage correctly
 ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
+ErrorFailedToFindEmailTemplate=Failed to find template with code name %s
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -298,3 +300,4 @@ WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So y
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
+ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
diff --git a/htdocs/langs/sr_RS/eventorganization.lang b/htdocs/langs/sr_RS/eventorganization.lang
index 3be4026e6d2..f2e1ea2d7e3 100644
--- a/htdocs/langs/sr_RS/eventorganization.lang
+++ b/htdocs/langs/sr_RS/eventorganization.lang
@@ -1,4 +1,5 @@
 # Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+# Copyright (C) 2021		Dorian Vabre			<dorian.vabre@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
@@ -81,7 +82,10 @@ PriceOfBoothHelp=Subscription price to stand a booth
 EventOrganizationICSLink=Link ICS for events
 ConferenceOrBoothInformation=Conference Or Booth informations
 Attendees = Attendees
+DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
 #
 # Status
 #
@@ -94,8 +98,46 @@ EvntOrgCancelled = Cancelled
 #
 # Public page
 #
+SuggestForm = Suggestion page
+RegisterPage = Page for conferences or booth
+EvntOrgRegistrationHelpMessage = Here, you can vote for an event, or suggest a new conference or booth for the project
+EvntOrgRegistrationConfHelpMessage = Here, you can suggest a new conference for the project
+EvntOrgRegistrationBoothHelpMessage = Here, you can suggest a new booth for the project
+ListOfSuggestedConferences = List of suggested conferences
+ListOfSuggestedBooths = List of suggested booths
+SuggestConference = Suggest a new conference
+SuggestBooth = Suggest a booth
+ViewAndVote = View and vote for suggested events
 PublicAttendeeSubscriptionPage = Public link of registration to a conference
 MissingOrBadSecureKey = The security key is invalid or missing
-EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
-EvntOrgStartDuration = This conference starts on
-EvntOrgEndDuration =  and ends on
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference : '%s'
+EvntOrgDuration = This conference starts on %s and ends on %s.
+ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
+BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
+EventType = Tip događaja
+
+#
+# Vote page
+#
+EvntOrgRegistrationWelcomeMessage = Welcome on the conference or booth suggestion page.
+EvntOrgRegistrationConfWelcomeMessage = Welcome on the conference suggestion page.
+EvntOrgRegistrationBoothWelcomeMessage = Welcome on the booth suggestion page.
+EvntOrgVoteHelpMessage = Here, you can view and vote for the suggested events for the project
+VoteOk = Your vote has been accepted.
+AlreadyVoted = You have already voted for this event.
+VoteError = An error has occurred during the vote, please try again.
+
+#
+# SubscriptionOk page
+#
+SubscriptionOk = Your subscription to this conference has been validated
+#
+# Subscription validation mail
+#
+ConfAttendeeSubscriptionConfirmation = Confirmation of your subscription to a conference
+#
+# Payment page
+#
+Attendee = Attendee
+PaymentConferenceAttendee = Conference attendee payment
+PaymentBoothLocation = Booth location payment
diff --git a/htdocs/langs/sr_RS/hrm.lang b/htdocs/langs/sr_RS/hrm.lang
index a16626d66d1..dbc2bbe45da 100644
--- a/htdocs/langs/sr_RS/hrm.lang
+++ b/htdocs/langs/sr_RS/hrm.lang
@@ -9,7 +9,7 @@ ConfirmDeleteEstablishment=Are you sure you wish to delete this establishment?
 OpenEtablishment=Otvori ogranak
 CloseEtablishment=Zatvori ogranak
 # Dictionary
-DictionaryPublicHolidays=HRM - Public holidays
+DictionaryPublicHolidays=Leave - Public holidays
 DictionaryDepartment=HR - Lista odeljenja
 DictionaryFunction=HRM - Job positions
 # Module
diff --git a/htdocs/langs/sr_RS/knowledgemanagement.lang b/htdocs/langs/sr_RS/knowledgemanagement.lang
index d24fee49c0a..dd90c371743 100644
--- a/htdocs/langs/sr_RS/knowledgemanagement.lang
+++ b/htdocs/langs/sr_RS/knowledgemanagement.lang
@@ -47,7 +47,7 @@ KnowledgeManagementArea = Knowledge Management
 # Menu
 #
 MenuKnowledgeRecord = Knowledge base
-ListOfArticles = List of articles
+ListKnowledgeRecord = List of articles
 NewKnowledgeRecord = New article
 ValidateReply = Validate solution
 KnowledgeRecords = Articles
diff --git a/htdocs/langs/sr_RS/languages.lang b/htdocs/langs/sr_RS/languages.lang
index 8f0e9d14af7..2945fa712f4 100644
--- a/htdocs/langs/sr_RS/languages.lang
+++ b/htdocs/langs/sr_RS/languages.lang
@@ -3,6 +3,7 @@ Language_am_ET=Ethiopian
 Language_ar_AR=Arapski
 Language_ar_EG=Arabic (Egypt)
 Language_ar_SA=Arapski
+Language_ar_TN=Arabic (Tunisia)
 Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengali
 Language_bn_IN=Bengali (India)
@@ -84,6 +85,7 @@ Language_nl_NL=Dutch
 Language_pl_PL=Poljski
 Language_pt_BR=Portugalski (Brazil)
 Language_pt_PT=Portugalski
+Language_ro_MD=Romanian (Moldavia)
 Language_ro_RO=Rumunski
 Language_ru_RU=Ruski
 Language_ru_UA=Ruski (Ukrajina)
diff --git a/htdocs/langs/sr_RS/main.lang b/htdocs/langs/sr_RS/main.lang
index 1ae893b7059..1310321d03e 100644
--- a/htdocs/langs/sr_RS/main.lang
+++ b/htdocs/langs/sr_RS/main.lang
@@ -430,6 +430,7 @@ LT1IN=CGST
 LT2IN=SGST
 LT1GC=Additionnal cents
 VATRate=Stopa poreza
+RateOfTaxN=Rate of tax %s
 VATCode=Tax Rate code
 VATNPR=Tax Rate NPR
 DefaultTaxRate=Default tax rate
@@ -729,6 +730,7 @@ MenuMembers=Članovi
 MenuAgendaGoogle=Google agenda
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr limit (Meni home-podešavanja-bezbednost): %s Kb, PHP limit: %s Kb
+ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
 NoFileFound=No documents uploaded
 CurrentUserLanguage=Aktivni jezik
 CurrentTheme=Aktivna tema
@@ -1072,6 +1074,7 @@ ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
 ToClose=To close
+ToRefuse=To refuse
 ToProcess=Za procesuiranje
 ToApprove=To approve
 GlobalOpenedElemView=Global view
@@ -1126,9 +1129,11 @@ UpdateForAllLines=Update for all lines
 OnHold=Na čekanju
 Civility=Civility
 AffectTag=Affect Tag
+CreateExternalUser=Create external user
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
 ConfirmCancel=Are you sure you want to cancel
+EmailMsgID=Email MsgID
diff --git a/htdocs/langs/sr_RS/members.lang b/htdocs/langs/sr_RS/members.lang
index 9e2876f3fa8..d85d11ab6bd 100644
--- a/htdocs/langs/sr_RS/members.lang
+++ b/htdocs/langs/sr_RS/members.lang
@@ -213,3 +213,5 @@ SendReminderForExpiredSubscription=Send reminder by email to members when subscr
 MembershipPaid=Membership paid for current period (until %s)
 YouMayFindYourInvoiceInThisEmail=You may find your invoice attached to this email
 XMembersClosed=%s member(s) closed
+XExternalUserCreated=%s external user(s) created
+ForceMemberNature=Force member nature (Individual or Corporation)
diff --git a/htdocs/langs/sr_RS/modulebuilder.lang b/htdocs/langs/sr_RS/modulebuilder.lang
index 9fdaa1a533a..23a098be2e5 100644
--- a/htdocs/langs/sr_RS/modulebuilder.lang
+++ b/htdocs/langs/sr_RS/modulebuilder.lang
@@ -143,3 +143,4 @@ AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
 ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
+ImportExportProfiles=Import and export profiles
diff --git a/htdocs/langs/sr_RS/mrp.lang b/htdocs/langs/sr_RS/mrp.lang
index ec999a473a4..16ab0c8ac49 100644
--- a/htdocs/langs/sr_RS/mrp.lang
+++ b/htdocs/langs/sr_RS/mrp.lang
@@ -8,12 +8,12 @@ MenuBOM=Bills of material
 LatestBOMModified=Latest %s Bills of materials modified
 LatestMOModified=Latest %s Manufacturing Orders modified
 Bom=Bills of Material
-BillOfMaterials=Bill of Material
+BillOfMaterials=Bill of Materials
 BOMsSetup=Setup of module BOM
 ListOfBOMs=List of bills of material - BOM
 ListOfManufacturingOrders=List of Manufacturing Orders
-NewBOM=New bill of material
-ProductBOMHelp=Product to create with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
+NewBOM=New bill of materials
+ProductBOMHelp=Product to create (or disassemble) with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
 BOMsNumberingModules=BOM numbering templates
 BOMsModelModule=BOM document templates
 MOsNumberingModules=MO numbering templates
@@ -22,7 +22,7 @@ FreeLegalTextOnBOMs=Free text on document of BOM
 WatermarkOnDraftBOMs=Watermark on draft BOM
 FreeLegalTextOnMOs=Free text on document of MO
 WatermarkOnDraftMOs=Watermark on draft MO
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials %s ?
 ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
 ManufacturingEfficiency=Manufacturing efficiency
 ConsumptionEfficiency=Consumption efficiency
@@ -30,8 +30,8 @@ ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the produc
 ValueOfMeansLossForProductProduced=Value of 0.95 means an average of 5%% of loss of produced product
 DeleteBillOfMaterials=Delete Bill Of Materials
 DeleteMo=Delete Manufacturing Order
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Materials?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Materials?
 MenuMRP=Manufacturing Orders
 NewMO=New Manufacturing Order
 QtyToProduce=Qty to produce
@@ -39,7 +39,7 @@ DateStartPlannedMo=Date start planned
 DateEndPlannedMo=Date end planned
 KeepEmptyForAsap=Empty means 'As Soon As Possible'
 EstimatedDuration=Estimated duration
-EstimatedDurationDesc=Estimated duration to manufacture this product using this BOM
+EstimatedDurationDesc=Estimated duration to manufacture (or disassemble) this product using this BOM
 ConfirmValidateBom=Are you sure you want to validate the BOM with the reference <strong>%s</strong> (you will be able to use it to build new Manufacturing Orders)
 ConfirmCloseBom=Are you sure you want to cancel this BOM (you won't be able to use it to build new Manufacturing Orders anymore) ?
 ConfirmReopenBom=Are you sure you want to re-open this BOM (you will be able to use it to build new Manufacturing Orders)
@@ -63,13 +63,14 @@ ConsumeAndProduceAll=Consume and Produce All
 Manufactured=Manufactured
 TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
 ForAQuantityOf=For a quantity to produce of %s
+ForAQuantityToConsumeOf=For a quantity to disassemble of %s
 ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
 ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
 ProductionForRef=Production of %s
 AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
 NoStockChangeOnServices=No stock change on services
 ProductQtyToConsumeByMO=Product quantity still to consume by open MO
-ProductQtyToProduceByMO=Product quentity still to produce by open MO
+ProductQtyToProduceByMO=Product quantity still to produce by open MO
 AddNewConsumeLines=Add new line to consume
 ProductsToConsume=Products to consume
 ProductsToProduce=Products to produce
@@ -83,15 +84,13 @@ Workstations=Workstations
 WorkstationsDescription=Workstations management
 WorkstationSetup = Workstations setup
 WorkstationSetupPage = Workstations setup page
-WorkstationAbout = About Workstation
-WorkstationAboutPage = Workstations about page
 WorkstationList=Workstation list
 WorkstationCreate=Add new workstation
 ConfirmEnableWorkstation=Are you sure you want to enable workstation <b>%s</b> ?
 EnableAWorkstation=Enable a workstation
 ConfirmDisableWorkstation=Are you sure you want to disable workstation <b>%s</b> ?
 DisableAWorkstation=Disable a workstation
-DeleteWorkstation=Supprimer
+DeleteWorkstation=Obriši
 NbOperatorsRequired=Number of operators required
 THMOperatorEstimated=Estimated operator THM
 THMMachineEstimated=Estimated machine THM
diff --git a/htdocs/langs/sr_RS/orders.lang b/htdocs/langs/sr_RS/orders.lang
index 4c3705086e5..22c69b1dcd7 100644
--- a/htdocs/langs/sr_RS/orders.lang
+++ b/htdocs/langs/sr_RS/orders.lang
@@ -11,6 +11,7 @@ OrderDate=Datum narudžbine
 OrderDateShort=Datum porudžbine
 OrderToProcess=Narudžbina za obradu
 NewOrder=Nova narudžbina
+NewSupplierOrderShort=Nova narudžbina
 NewOrderSupplier=New Purchase Order
 ToOrder=Kreiraj narudžbinu
 MakeOrder=Kreiraj narudžbinu
@@ -73,6 +74,7 @@ DeleteOrder=Obriši narudžbinu
 CancelOrder=Otkaži narudžbinu
 OrderReopened= Order %s re-open
 AddOrder=Kreiraj narudžbinu
+AddSupplierOrderShort=Kreiraj narudžbinu
 AddPurchaseOrder=Create purchase order
 AddToDraftOrders=Dodaj draft narudžbini
 ShowOrder=Pokaži narudžbinu
diff --git a/htdocs/langs/sr_RS/other.lang b/htdocs/langs/sr_RS/other.lang
index a2023128b0b..f6a5af3e58d 100644
--- a/htdocs/langs/sr_RS/other.lang
+++ b/htdocs/langs/sr_RS/other.lang
@@ -129,6 +129,7 @@ ClosedByLogin=Login korisnika koji je zatvorio
 FileWasRemoved=Fajl %s j uklonjen
 DirWasRemoved=Folder %s je uklonjen
 FeatureNotYetAvailable=Feature not yet available in the current version
+FeatureNotAvailableOnDevicesWithoutMouse=Feature not available on devices without mouse
 FeaturesSupported=Supported features
 Width=Širina
 Height=Visina
@@ -263,7 +264,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
-PrefixSession=Prefix for session ID
+SuffixSessionName=Suffix for session name
 
 ##### Export #####
 ExportsArea=Oblast exporta
diff --git a/htdocs/langs/sr_RS/partnership.lang b/htdocs/langs/sr_RS/partnership.lang
index 82c90ae3244..f889639e4d8 100644
--- a/htdocs/langs/sr_RS/partnership.lang
+++ b/htdocs/langs/sr_RS/partnership.lang
@@ -16,41 +16,72 @@
 #
 # Generic
 #
-ModulePartnershipName = Partnership management
-PartnershipDescription = Module Partnership management
+ModulePartnershipName=Partnership management
+PartnershipDescription=Module Partnership management
 PartnershipDescriptionLong= Module Partnership management
 
+AddPartnership=Add partnership
+CancelPartnershipForExpiredMembers=Partnership: Cancel partnership of members with expired subscriptions
+PartnershipCheckBacklink=Partnership: Check referring backlink
+
 #
 # Menu
 #
-NewPartnership = New Partnership
-ListOfPartnerships = List of partnership
+NewPartnership=New Partnership
+ListOfPartnerships=List of partnership
 
 #
 # Admin page
 #
-PartnershipSetup = Partnership setup
-PartnershipAbout = About Partnership
-PartnershipAboutPage = Partnership about page
-
+PartnershipSetup=Partnership setup
+PartnershipAbout=About Partnership
+PartnershipAboutPage=Partnership about page
+partnershipforthirdpartyormember=Partner status must be set on a 'thirdparty' or a 'member'
+PARTNERSHIP_IS_MANAGED_FOR=Partnership managed for
+PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks to check
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb of days before cancelling status of a partnership when a subscription has expired
+ReferingWebsiteCheck=Check of website referring
+ReferingWebsiteCheckDesc=You can enable a feature to check that your partners has added a backlink to your website domains on their own website.
 
 #
 # Object
 #
+DeletePartnership=Delete a partnership
+PartnershipDedicatedToThisThirdParty=Partnership dedicated to this third party
+PartnershipDedicatedToThisMember=Partnership dedicated to this member
 DatePartnershipStart=Datum početka
 DatePartnershipEnd=Datum završetka
+ReasonDecline=Decline reason
+ReasonDeclineOrCancel=Decline reason
+PartnershipAlreadyExist=Partnership already exist
+ManagePartnership=Manage partnership
+BacklinkNotFoundOnPartnerWebsite=Backlink not found on partner website
+ConfirmClosePartnershipAsk=Are you sure you want to cancel this partnership?
+PartnershipType=Partnership type
 
 #
 # Template Mail
 #
+SendingEmailOnPartnershipWillSoonBeCanceled=Partnership will soon be canceled
+SendingEmailOnPartnershipRefused=Partnership refused
+SendingEmailOnPartnershipAccepted=Partnership accepted
+SendingEmailOnPartnershipCanceled=Partnership canceled
 
+YourPartnershipWillSoonBeCanceledTopic=Partnership will soon be canceled
+YourPartnershipRefusedTopic=Partnership refused
+YourPartnershipAcceptedTopic=Partnership accepted
+YourPartnershipCanceledTopic=Partnership canceled
+
+YourPartnershipWillSoonBeCanceledContent=We inform you that your partnership will soon be canceled (Backlink not found)
+YourPartnershipRefusedContent=We inform you that your partnership request has been refused.
+YourPartnershipAcceptedContent=We inform you that your partnership request has been accepted.
+YourPartnershipCanceledContent=We inform you that your partnership has been canceled.
 
 #
 # Status
 #
-PartnershipDraft = Nacrt
-PartnershipAccepted = Prihvaćen
-PartnershipRefused = Odbijen
-PartnershipCanceled = Poništeno
-
+PartnershipDraft=Nacrt
+PartnershipAccepted=Prihvaćen
+PartnershipRefused=Odbijen
+PartnershipCanceled=Poništeno
 PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/sr_RS/productbatch.lang b/htdocs/langs/sr_RS/productbatch.lang
index 7aa007fe4c4..1df8b47c1c2 100644
--- a/htdocs/langs/sr_RS/productbatch.lang
+++ b/htdocs/langs/sr_RS/productbatch.lang
@@ -1,4 +1,4 @@
-# ProductBATCH language file - en_US - ProductBATCH
+# ProductBATCH language file - Source file is en_US - ProductBATCH
 ManageLotSerial=Koristi serijski broj
 ProductStatusOnBatch=Yes (lot required)
 ProductStatusOnSerial=Yes (unique serial number required)
@@ -33,3 +33,13 @@ CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+LifeTime=Life span (in days)
+EndOfLife=End of life
+ManufacturingDate=Manufacturing date
+DestructionDate=Destruction date
+FirstUseDate=First use date
+QCFrequency=Quality control frequency (in days)
+
+#Traceability - qc status
+OutOfOrder=Out of order
+InWorkingOrder=In working order
diff --git a/htdocs/langs/sr_RS/products.lang b/htdocs/langs/sr_RS/products.lang
index 5b59d29e0c4..15e51a7abfe 100644
--- a/htdocs/langs/sr_RS/products.lang
+++ b/htdocs/langs/sr_RS/products.lang
@@ -396,3 +396,5 @@ ActionAvailableOnVariantProductOnly=Action only available on the variant of prod
 ProductsPricePerCustomer=Product prices per customers
 ProductSupplierExtraFields=Additional Attributes (Supplier Prices)
 DeleteLinkedProduct=Delete the child product linked to the combination
+PMPValue=Prosecna cena
+PMPValueShort=PC
diff --git a/htdocs/langs/sr_RS/projects.lang b/htdocs/langs/sr_RS/projects.lang
index f29a10b6685..f7f2bc7a7ab 100644
--- a/htdocs/langs/sr_RS/projects.lang
+++ b/htdocs/langs/sr_RS/projects.lang
@@ -267,9 +267,11 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=Novi račun
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+OneLinePerTimeSpentLine=One line for each time spent declaration
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
 AddPersonToTask=Add also to tasks
 UsageOrganizeEvent=Usage: Event Organization
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
+SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
diff --git a/htdocs/langs/sr_RS/receptions.lang b/htdocs/langs/sr_RS/receptions.lang
index 914006db1e4..6967906d601 100644
--- a/htdocs/langs/sr_RS/receptions.lang
+++ b/htdocs/langs/sr_RS/receptions.lang
@@ -44,4 +44,4 @@ ValidateOrderFirstBeforeReception=You must first validate the order before being
 ReceptionsNumberingModules=Numbering module for receptions
 ReceptionsReceiptModel=Document templates for receptions
 NoMorePredefinedProductToDispatch=No more predefined products to dispatch
-
+ReceptionExist=A reception exists
diff --git a/htdocs/langs/sr_RS/stocks.lang b/htdocs/langs/sr_RS/stocks.lang
index 0a9085093f9..10dd66d8103 100644
--- a/htdocs/langs/sr_RS/stocks.lang
+++ b/htdocs/langs/sr_RS/stocks.lang
@@ -56,8 +56,6 @@ UnitPurchaseValue=Kupovna cena jedinice
 StockTooLow=Zalihe su premale
 StockLowerThanLimit=Stock lower than alert limit (%s)
 EnhancedValue=Vrednost
-PMPValue=Prosecna cena
-PMPValueShort=PC
 EnhancedValueOfWarehouses=Vrednost magacina
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
@@ -251,7 +249,10 @@ SelectAStockMovementFileToImport=select a stock movement file to import
 InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
 LabelOfInventoryMovemement=Inventory %s
 ReOpen=Ponovo Otvoreno
-ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock to the real qty you entered into the inventory.
 ObjectNotFound=%s not found
 MakeMovementsAndClose=Generate movements and close
 AutofillWithExpected=Fill real quantity with expected quantity
+ShowAllBatchByDefault=By default, show batch details on product "stock" tab
+CollapseBatchDetailHelp=You can set batch detail default display in stocks module configuration
+FieldCannotBeNegative=Field "%s" cannot be negative
diff --git a/htdocs/langs/sr_RS/ticket.lang b/htdocs/langs/sr_RS/ticket.lang
index b465760e3c8..9bd7de5b1d3 100644
--- a/htdocs/langs/sr_RS/ticket.lang
+++ b/htdocs/langs/sr_RS/ticket.lang
@@ -304,7 +304,7 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
-BoxTicketType=Number of open tickets by type
+BoxTicketType=Distribution of open tickets by type
 BoxTicketSeverity=Number of open tickets by severity
 BoxNoTicketSeverity=No tickets opened
 BoxTicketLastXDays=Number of new tickets by days the last %s days
diff --git a/htdocs/langs/sv_SE/accountancy.lang b/htdocs/langs/sv_SE/accountancy.lang
index 5fbb22248bf..ae73d14f744 100644
--- a/htdocs/langs/sv_SE/accountancy.lang
+++ b/htdocs/langs/sv_SE/accountancy.lang
@@ -16,18 +16,18 @@ ThisService=Tjänsten
 ThisProduct=Den här produkten
 DefaultForService=Standard för service
 DefaultForProduct=Standard för produkter
-ProductForThisThirdparty=Product for this thirdparty
-ServiceForThisThirdparty=Service for this thirdparty
+ProductForThisThirdparty=Produkt för denna tredje part
+ServiceForThisThirdparty=Service för denna tredje part
 CantSuggest=Kan inte föreslå
 AccountancySetupDoneFromAccountancyMenu=De flesta inställningarna för bokföringen görs från menyn %s
-ConfigAccountingExpert=Configuration of the module accounting (double entry)
+ConfigAccountingExpert=Konfiguration av modulredovisningen (dubbel inmatning)
 Journalization=Bokföring
 Journals=Loggböcker
 JournalFinancial=Finansiella loggböcker
 BackToChartofaccounts=Avkastning kontoplan
 Chartofaccounts=Kontoplan
-ChartOfSubaccounts=Chart of individual accounts
-ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
+ChartOfSubaccounts=Diagram över enskilda konton
+ChartOfIndividualAccountsOfSubsidiaryLedger=Diagram över enskilda konton för dotterbolaget
 CurrentDedicatedAccountingAccount=Nuvarande dedikerat konto
 AssignDedicatedAccountingAccount=Nytt konto att tilldela
 InvoiceLabel=Faktura etikett
@@ -37,8 +37,8 @@ OtherInfo=Övrig information
 DeleteCptCategory=Ta bort redovisningskontot från gruppen
 ConfirmDeleteCptCategory=Är du säker på att du vill ta bort det här kontot konto från kontokoncernen?
 JournalizationInLedgerStatus=Status för bokföring
-AlreadyInGeneralLedger=Already transferred in accounting journals and ledger
-NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger
+AlreadyInGeneralLedger=Redan överförd i redovisningstidskrifter och huvudbok
+NotYetInGeneralLedger=Ännu inte överfört i tidskrifter och storbok
 GroupIsEmptyCheckSetup=Gruppen är tom, kontrollera inställningen av den personliga redovisningsgruppen
 DetailByAccount=Visa detaljer efter konto
 AccountWithNonZeroValues=Konton med icke-nollvärden
@@ -47,10 +47,10 @@ CountriesInEEC=Länder i EEG
 CountriesNotInEEC=Länder inte i EEG
 CountriesInEECExceptMe=Länder i EEG förutom %s
 CountriesExceptMe=Alla länder utom %s
-AccountantFiles=Export source documents
-ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
+AccountantFiles=Exportera källdokument
+ExportAccountingSourceDocHelp=Med det här verktyget kan du exportera de källhändelser (lista och PDF-filer) som användes för att generera din bokföring. För att exportera dina tidskrifter, använd menyposten %s - %s.
 VueByAccountAccounting=Visa baserat på redovisningskonto
-VueBySubAccountAccounting=View by accounting subaccount
+VueBySubAccountAccounting=Visa efter redovisning av underkonto
 
 MainAccountForCustomersNotDefined=Huvudsakliga bokföringskonto för kunder som inte definierats i installationen
 MainAccountForSuppliersNotDefined=Huvudkonton för leverantörer som inte definierats i installationen
@@ -65,8 +65,8 @@ AccountancyAreaDescActionOnceBis=Nästa steg bör göras för att spara dig tid
 AccountancyAreaDescActionFreq=Följande åtgärder utförs vanligtvis varje månad, vecka eller dag för mycket stora företag ...
 
 AccountancyAreaDescJournalSetup=STEG %s: Skapa eller kolla innehållet i din loggboklista från menyn %s
-AccountancyAreaDescChartModel=STEP %s: Check that a model of chart of account exists or create one from menu %s
-AccountancyAreaDescChart=STEP %s: Select and|or complete your chart of account from menu %s
+AccountancyAreaDescChartModel=STEG %s: Kontrollera att det finns en kontodiagrammodell eller skapa en från menyn %s
+AccountancyAreaDescChart=STEG %s: Välj och | eller slutför ditt kontoplan från meny %s
 
 AccountancyAreaDescVat=STEG %s: Definiera redovisningskonton för varje moms. För detta, använd menyinmatningen %s.
 AccountancyAreaDescDefault=STEG %s: Definiera standardbokföringskonton. För detta, använd menyinmatningen %s.
@@ -86,18 +86,18 @@ AccountancyAreaDescAnalyze=STEG %s: Lägg till eller redigera befintliga transak
 
 AccountancyAreaDescClosePeriod=STEG %s: Stäng period så vi kan inte göra ändringar i framtiden.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=Ett obligatoriskt steg i installationen har inte slutförts (bokföringskodjournal definieras inte för alla bankkonton)
 Selectchartofaccounts=Välj aktivt diagram över konton
 ChangeAndLoad=Ändra och ladda
 Addanaccount=Lägg till ett redovisningskonto
 AccountAccounting=Redovisningskonto
 AccountAccountingShort=Konto
 SubledgerAccount=Subledger account
-SubledgerAccountLabel=Subledger account label
+SubledgerAccountLabel=Etikett för underleverantörskonto
 ShowAccountingAccount=Visa bokföringskonto
 ShowAccountingJournal=Visa loggböcker
-ShowAccountingAccountInLedger=Show accounting account in ledger
-ShowAccountingAccountInJournals=Show accounting account in journals
+ShowAccountingAccountInLedger=Visa redovisningskonto i huvudbok
+ShowAccountingAccountInJournals=Visa redovisningskonto i tidskrifter
 AccountAccountingSuggest=Redovisningskonto föreslås
 MenuDefaultAccounts=Standardkonton
 MenuBankAccounts=Bankkonton
@@ -107,8 +107,8 @@ MenuExpenseReportAccounts=Utläggsrapport konton
 MenuLoanAccounts=Lån konton
 MenuProductsAccounts=Produktkonton
 MenuClosureAccounts=Avslutande konton
-MenuAccountancyClosure=Closure
-MenuAccountancyValidationMovements=Validate movements
+MenuAccountancyClosure=Stängning
+MenuAccountancyValidationMovements=Validera rörelser
 ProductsBinding=Produkter konton
 TransferInAccounting=Överföring i bokföring
 RegistrationInAccounting=Registrering i bokföring
@@ -119,7 +119,7 @@ ExpenseReportsVentilation=Utläggsrapport förbindande
 CreateMvts=Skapa ny transaktion
 UpdateMvts=Ändring av en transaktion
 ValidTransaction=Bekräfta transaktionen
-WriteBookKeeping=Register transactions in accounting
+WriteBookKeeping=Registrera transaktioner i bokföring
 Bookkeeping=Huvudbok
 BookkeepingSubAccount=Subledger
 AccountBalance=Kontobalans
@@ -131,7 +131,7 @@ InvoiceLinesDone=Bundet linjer med fakturor
 ExpenseReportLines=Kostnadsberäkningar rapporterar att förbinda
 ExpenseReportLinesDone=Förbundna utgiftsrapporter
 IntoAccount=Bind rad med bokföringskonto
-TotalForAccount=Total accounting account
+TotalForAccount=Totalt redovisningskonto
 
 
 Ventilate=Binda
@@ -147,7 +147,7 @@ NotVentilatedinAccount=Ej bunden till bokföringskonto
 XLineSuccessfullyBinded=%s produkter / tjänster har framgångsrikt bundet till ett bokföringskonto
 XLineFailedToBeBinded=%s produkter / tjänster var inte bundna till något kontokonto
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximalt antal rader på listan och bindningssidan (rekommenderas: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Börja sorteringen av sidan "Bindning att göra" av de senaste elementen
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Börja sorteringen av sidan "Bindning gjort" av de senaste elementen
 
@@ -158,9 +158,9 @@ ACCOUNTING_LENGTH_AACCOUNT=Längden på kontot för tredje partens konto (Om du
 ACCOUNTING_MANAGE_ZERO=Tillåt att hantera olika antal nollor i slutet av ett bokföringskonto. Behövs av vissa länder (som Schweiz). Om den är avstängd (standard) kan du ställa in följande två parametrar för att be programmet att lägga till virtuella nollor.
 BANK_DISABLE_DIRECT_INPUT=Inaktivera direktinspelning av transaktion i bankkonto
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Aktivera utkastexport på loggbok
-ACCOUNTANCY_COMBO_FOR_AUX=Aktivera kombinationslista för dotterkonto (kan vara långsamt om du har många tredje parter)
-ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
-ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
+ACCOUNTANCY_COMBO_FOR_AUX=Aktivera kombinationslista för dotterbolagskonto (kan vara långsam om du har många tredje parter, bryter förmågan att söka efter en del av värdet)
+ACCOUNTING_DATE_START_BINDING=Definiera ett datum för att börja binda och överföra i bokföring. Under detta datum överförs inte transaktionerna till bokföring.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Vid bokföringsöverföring, välj periodvisning som standard
 
 ACCOUNTING_SELL_JOURNAL=Försäljningsloggbok
 ACCOUNTING_PURCHASE_JOURNAL=Inköpsloggbok
@@ -174,60 +174,60 @@ ACCOUNTING_RESULT_LOSS=Resultaträkningskonto (förlust)
 ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Loggbok för stängning
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Redovisningskonto övergångsöverföring
-TransitionalAccount=Transitional bank transfer account
+TransitionalAccount=Övergångsbanköverföringskonto
 
 ACCOUNTING_ACCOUNT_SUSPENSE=Redovisningskonto för väntan
 DONATION_ACCOUNTINGACCOUNT=Redovisningskonto för att registrera donationer
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Redovisningskonto för att registrera prenumerationer
 
-ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Redovisningskonto som standard för att registrera kundinsättning
 
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Redovisningskonto som standard för de köpta produkterna (används om det inte definieras i produktbladet)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Redovisningskonto som standard för de köpta produkterna i EEG (används om det inte definieras i produktbladet)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Redovisningskonto som standard för de köpta produkterna och importeras från EEG (används om det inte definieras i produktbladet)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Bokföringskonto som standard för de sålda produkterna (används om de inte anges i produktbladet)
-ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Accounting account by default for the products sold in EEC (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Accounting account by default for the products sold and exported out of EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Redovisningskonto som standard för produkter som säljs i EEG (används om de inte definieras i produktbladet)
+ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Redovisningskonto som standard för de produkter som säljs och exporteras från EEG (används om det inte definieras i produktbladet)
 
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Bokföringskonto som standard för de köpta tjänsterna (används om det inte anges i servicebladet)
-ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Accounting account by default for the bought services in EEC (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought services and imported out of EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Redovisningskonto som standard för de köpta tjänsterna i EEG (används om det inte definieras i tjänstebladet)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Redovisningskonto som standard för de köpta tjänsterna och importeras från EEG (används om det inte definieras i tjänstebladet)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Redovisningskonto som standard för de sålda tjänsterna (används om de inte anges i servicebladet)
-ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Accounting account by default for the services sold in EEC (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Accounting account by default for the services sold and exported out of EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Redovisningskonto som standard för tjänster som säljs i EEG (används om de inte definieras i tjänstebladet)
+ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Redovisningskonto som standard för de tjänster som säljs och exporteras från EEG (används om de inte definieras i tjänstebladet)
 
 Doctype=Typ av dokument
 Docdate=Datum
 Docref=Referens
 LabelAccount=Etikett konto
 LabelOperation=Etikettoperation
-Sens=Direction
-AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you have received<br>For an accounting account of a supplier, use Debit to record a payment you made
+Sens=Riktning
+AccountingDirectionHelp=För en kunds redovisningskonto, använd kredit för att registrera en betalning som du har fått <br>. För ett leverantörs redovisningskonto, använd Debit för att registrera en betalning du gjort
 LetteringCode=Brevkod
-Lettering=Lettering
+Lettering=Text
 Codejournal=Loggbok
 JournalLabel=Loggboksetikett
 NumPiece=Stycke nummer
 TransactionNumShort=Num. transaktion
-AccountingCategory=Custom group
-GroupByAccountAccounting=Group by general ledger account
-GroupBySubAccountAccounting=Group by subledger account
+AccountingCategory=Anpassad grupp
+GroupByAccountAccounting=Gruppera efter huvudbokskonto
+GroupBySubAccountAccounting=Gruppera efter underkontokonto
 AccountingAccountGroupsDesc=Här kan du definiera vissa grupper av bokföringskonto. De kommer att användas för personliga redovisningsrapporter.
 ByAccounts=Enligt konton
 ByPredefinedAccountGroups=Av fördefinierade grupper
 ByPersonalizedAccountGroups=Av personliga grupper
 ByYear=Per år
 NotMatch=Inte inställd
-DeleteMvt=Delete some operation lines from accounting
-DelMonth=Month to delete
+DeleteMvt=Ta bort några operationer från redovisningen
+DelMonth=Månad att ta bort
 DelYear=År att radera
 DelJournal=Loggbok att radera
-ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger.
-ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted)
+ConfirmDeleteMvt=Detta raderar alla operationer i bokföringen för året / månaden och / eller för en viss journal (minst ett kriterium krävs). Du måste återanvända funktionen '%s' för att ha den raderade posten tillbaka i huvudboken.
+ConfirmDeleteMvtPartial=Detta raderar transaktionen från bokföringen (alla transaktionsrader relaterade till samma transaktion raderas)
 FinanceJournal=Finansloggbok
 ExpenseReportsJournal=Utläggsrapporter loggbok
 DescFinanceJournal=Finansbokföring inklusive alla typer av betalningar via bankkonto
-DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
+DescJournalOnlyBindedVisible=Detta är en vy över posten som är bunden till ett redovisningskonto och kan registreras i tidskrifterna och storboken.
 VATAccountNotDefined=Konto för moms inte definierad
 ThirdpartyAccountNotDefined=Konto för tredje part har inte definierats
 ProductAccountNotDefined=Konto för produkt som inte definierats
@@ -245,20 +245,20 @@ DescThirdPartyReport=Här kan du se listan över tredje partskunder och säljare
 ListAccounts=Förteckning över redovisningskonton
 UnknownAccountForThirdparty=Okänt tredje part konto. Vi använder %s
 UnknownAccountForThirdpartyBlocking=Okänt tredje part konto. Blockeringsfel
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. We will use %s
-ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Third-party unknown and subledger not defined on the payment. We will keep the subledger account value empty.
-ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Tredjepartskonto ej definierat eller tredje part okänt. Vi kommer att använda %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Tredjeparts okänd och underleverantör definieras inte på betalningen. Vi kommer att hålla underskottets kontovärde tomt.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Tredjepartskonto ej definierat eller tredje part okänt. Blockeringsfel.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Okänt tredje part konto och väntande konto inte definierat. Blockeringsfel
 PaymentsNotLinkedToProduct=Betalning som inte är kopplad till någon produkt / tjänst
-OpeningBalance=Opening balance
-ShowOpeningBalance=Show opening balance
-HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by level
+OpeningBalance=Öppningsbalans
+ShowOpeningBalance=Visa öppningsbalans
+HideOpeningBalance=Dölj öppningsbalansen
+ShowSubtotalByGroup=Visa delsumma efter nivå
 
 Pcgtype=Grupp av konto
-PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
+PcgtypeDesc=Kontogrupp används som fördefinierade kriterier för 'filter' och 'gruppering' för vissa redovisningsrapporter. Till exempel används 'INKOMST' eller 'KOSTNAD' som grupper för redovisning av produkter för att skapa en kostnads- / inkomstrapport.
 
-Reconcilable=Reconcilable
+Reconcilable=Förenlig
 
 TotalVente=Total turnover before tax
 TotalMarge=Total försäljning marginal
@@ -269,20 +269,20 @@ DescVentilDoneCustomer=Konsultera här listan över raderna av fakturakunder och
 DescVentilTodoCustomer=Binda fakturulinjer som inte redan är bundna med ett konto för produktkonton
 ChangeAccount=Ändra produkt- / serviceredovisningskonto för utvalda linjer med följande bokföringskonto:
 Vide=-
-DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account (only record not already transfered in accountancy are visible)
+DescVentilSupplier=Se här listan över leverantörsfakturorader bundna eller ännu inte bundna till ett produktredovisningskonto (endast post som inte redan överförts i bokföring syns)
 DescVentilDoneSupplier=Här kan du se listan över leverantörsfakturor och deras bokföringskonto
 DescVentilTodoExpenseReport=Förbinda utläggsrapportsrader som inte redan är bundna med ett konto i bokföringen
 DescVentilExpenseReport=Här kan du se listan över kostnadsrapporter som är bundna (eller inte) till ett avgiftsredovisningskonto
 DescVentilExpenseReportMore=Om du ställer in bokföringskonto på typ av kostnadsrapportrader kommer applikationen att kunna göra alla bindningar mellan dina kostnadsrapporter och konton för ditt kontoplan, bara med ett klick med knappen <strong> "%s" </strong>. Om kontot inte var inställt på avgifterna eller om du fortfarande har några rader som inte är kopplade till något konto måste du göra en manuell bindning från menyn "<strong> %s </strong>".
 DescVentilDoneExpenseReport=Här kan du se listan över raderna för kostnadsrapporter och deras bokföringskonto
 
-Closure=Annual closure
-DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
-OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
-AllMovementsWereRecordedAsValidated=All movements were recorded as validated
-NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
-ValidateMovements=Validate movements
-DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
+Closure=Årlig nedläggning
+DescClosure=Se här antalet rörelser per månad som inte har validerats och räkenskapsår som redan är öppna
+OverviewOfMovementsNotValidated=Steg 1 / Översikt över rörelser har inte validerats. (Nödvändigt för att avsluta ett räkenskapsår)
+AllMovementsWereRecordedAsValidated=Alla rörelser registrerades som validerade
+NotAllMovementsCouldBeRecordedAsValidated=Inte alla rörelser kunde spelas in som validerade
+ValidateMovements=Validera rörelser
+DescValidateMovements=Alla ändringar eller raderingar av skrift, bokstäver och raderingar är förbjudna. Alla bidrag till en övning måste valideras, annars är det inte möjligt att stänga
 
 ValidateHistory=Förbind automatiskt
 AutomaticBindingDone=Automatisk bindning gjord
@@ -297,13 +297,13 @@ NoNewRecordSaved=Inga flera linjer att bokföra
 ListOfProductsWithoutAccountingAccount=Förteckning över produkter som inte är kopplade till något kontokonto
 ChangeBinding=Ändra bindningen
 Accounted=Redovisas i huvudbok
-NotYetAccounted=Not yet accounted in the ledger
-ShowTutorial=Show Tutorial
+NotYetAccounted=Ännu inte redovisat i huvudboken
+ShowTutorial=Visa handledning
 NotReconciled=Inte avstämd
-WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
+WarningRecordWithoutSubledgerAreExcluded=Varning, alla åtgärder utan underskrivningskonto definieras filtreras och utesluts från den här vyn
 
 ## Admin
-BindingOptions=Binding options
+BindingOptions=Bindande alternativ
 ApplyMassCategories=Applicera masskategorier
 AddAccountFromBookKeepingWithNoCategories=Tillgängligt konto ännu inte i den personifierade gruppen
 CategoryDeleted=Kategori för bokföringskonto har tagits bort
@@ -311,7 +311,7 @@ AccountingJournals=Bokföringsloggbok
 AccountingJournal=Bokföringsloggbok
 NewAccountingJournal=Ny bokföringsloggbok
 ShowAccountingJournal=Visa loggböcker
-NatureOfJournal=Nature of Journal
+NatureOfJournal=Journalens natur
 AccountingJournalType1=Övrig verksamhet
 AccountingJournalType2=Försäljning
 AccountingJournalType3=Inköp
@@ -323,11 +323,14 @@ ErrorAccountingJournalIsAlreadyUse=Denna loggboken används redan
 AccountingAccountForSalesTaxAreDefinedInto=Obs! Bokföringskonto för försäljningsskatt definieras i menyn <b> %s </b> - <b> %s </b>
 NumberOfAccountancyEntries=Antal poster
 NumberOfAccountancyMovements=Antal rörelser
-ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting)
-ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting)
-ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Inaktivera bindning och överföring av bokföring vid försäljning (kundfakturor kommer inte att beaktas vid redovisning)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Inaktivera bindning och överföring av bokföring vid köp (leverantörsfakturor kommer inte att beaktas vid redovisning)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Inaktivera bindning och överföring i bokföring på kostnadsrapporter (kostnadsrapporter kommer inte att beaktas vid redovisning)
 
 ## Export
+NotifiedExportDate=Notified export date (modification of the entries will not be possible)
+NotifiedValidationDate=Validation of the entries (modification or deletion of the entries will not be possible)
+ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=Exportera utkast till loggbok
 Modelcsv=Modell av export
 Selectmodelcsv=Välj en modell av export
@@ -340,36 +343,36 @@ Modelcsv_quadratus=Exportera till Quadratus QuadraCompta
 Modelcsv_ebp=Exportera till EBP
 Modelcsv_cogilog=Exportera till Cogilog
 Modelcsv_agiris=Exportera till Agiris
-Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
-Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
-Modelcsv_openconcerto=Export for OpenConcerto (Test)
+Modelcsv_LDCompta=Exportera för LD Compta (v9) (Test)
+Modelcsv_LDCompta10=Exportera för LD Compta (v10 och högre)
+Modelcsv_openconcerto=Exportera för OpenConcerto (Test)
 Modelcsv_configurable=Exportera CSV konfigurerbar
-Modelcsv_FEC=Export FEC
-Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
-Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
-Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
-Modelcsv_Gestinumv3=Export for Gestinum (v3)
-Modelcsv_Gestinumv5Export for Gestinum (v5)
+Modelcsv_FEC=Exportera FEC
+Modelcsv_FEC2=Exportera FEC (med datumgenerering / omvänd dokument)
+Modelcsv_Sage50_Swiss=Export för Sage 50 Schweiz
+Modelcsv_winfic=Exportera Winfic - eWinfic - WinSis Compta
+Modelcsv_Gestinumv3=Exportera för Gestinum (v3)
+Modelcsv_Gestinumv5Export för Gestinum (v5)
 ChartofaccountsId=Diagram över konton Id
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Initära bokföring
 InitAccountancyDesc=Den här sidan kan användas för att initiera ett konto på produkter och tjänster som inte har ett kontokonto definierat för försäljning och inköp.
 DefaultBindingDesc=Den här sidan kan användas för att ställa in ett standardkonto som ska användas för att koppla transaktionsrekord om betalningslön, donation, skatter och moms när inget specifikt kontokonto redan var inställt.
-DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
+DefaultClosureDesc=Denna sida kan användas för att ställa in parametrar som används för bokslut.
 Options=alternativ
 OptionModeProductSell=Mode försäljning
-OptionModeProductSellIntra=Mode sales exported in EEC
-OptionModeProductSellExport=Mode sales exported in other countries
+OptionModeProductSellIntra=Modeförsäljning exporterad i EEG
+OptionModeProductSellExport=Lägesförsäljning exporteras till andra länder
 OptionModeProductBuy=Mode inköp
-OptionModeProductBuyIntra=Mode purchases imported in EEC
-OptionModeProductBuyExport=Mode purchased imported from other countries
+OptionModeProductBuyIntra=Modeinköp importerade i EEG
+OptionModeProductBuyExport=Läget köpt importerat från andra länder
 OptionModeProductSellDesc=Visa alla produkter med bokföringskonto för försäljning.
-OptionModeProductSellIntraDesc=Show all products with accounting account for sales in EEC.
-OptionModeProductSellExportDesc=Show all products with accounting account for other foreign sales.
+OptionModeProductSellIntraDesc=Visa alla produkter med redovisningskonto för försäljning i EEG.
+OptionModeProductSellExportDesc=Visa alla produkter med redovisningskonto för andra utländska försäljningar.
 OptionModeProductBuyDesc=Visa alla produkter med bokföringskonto för inköp.
-OptionModeProductBuyIntraDesc=Show all products with accounting account for purchases in EEC.
-OptionModeProductBuyExportDesc=Show all products with accounting account for other foreign purchases.
+OptionModeProductBuyIntraDesc=Visa alla produkter med redovisningskonto för inköp i EEG.
+OptionModeProductBuyExportDesc=Visa alla produkter med redovisningskonto för andra utländska inköp.
 CleanFixHistory=Ta bort bokföringskoden från rader som inte finns i kontoplaner
 CleanHistory=Återställ alla bindningar för valt år
 PredefinedGroups=Fördefinierade grupper
@@ -377,11 +380,11 @@ WithoutValidAccount=Utan giltigt dedikerat konto
 WithValidAccount=Med giltigt dedikerat konto
 ValueNotIntoChartOfAccount=Detta värde på bokföringskonto finns inte i kontoplan
 AccountRemovedFromGroup=Konto borttaget från grupp
-SaleLocal=Local sale
-SaleExport=Export sale
-SaleEEC=Sale in EEC
-SaleEECWithVAT=Sale in EEC with a VAT not null, so we suppose this is NOT an intracommunautary sale and the suggested account is the standard product account.
-SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fallback on the product account for standard sales. You can fix the VAT ID of thirdparty or the product account if needed.
+SaleLocal=Lokal försäljning
+SaleExport=Exportförsäljning
+SaleEEC=Försäljning i EEG
+SaleEECWithVAT=Försäljning i EEG med moms som inte är null, så vi antar att detta INTE är en försäljning inom gemenskapen och det föreslagna kontot är standardproduktkontot.
+SaleEECWithoutVATNumber=Försäljning i EEG utan moms men tredjeparts moms-ID definieras inte. Vi återgår till produktkontot för standardförsäljning. Du kan fastställa tredjeparts moms-ID eller produktkonto om det behövs.
 
 ## Dictionary
 Range=Räckvidd av bokföringskonto
@@ -402,29 +405,29 @@ UseMenuToSetBindindManualy=Linjer som ännu inte är bundna, använd menyn <a hr
 
 ## Import
 ImportAccountingEntries=Redovisningsposter
-ImportAccountingEntriesFECFormat=Accounting entries - FEC format
-FECFormatJournalCode=Code journal (JournalCode)
-FECFormatJournalLabel=Label journal (JournalLib)
-FECFormatEntryNum=Piece number (EcritureNum)
-FECFormatEntryDate=Piece date (EcritureDate)
-FECFormatGeneralAccountNumber=General account number (CompteNum)
-FECFormatGeneralAccountLabel=General account label (CompteLib)
-FECFormatSubledgerAccountNumber=Subledger account number (CompAuxNum)
-FECFormatSubledgerAccountLabel=Subledger account number (CompAuxLib)
+ImportAccountingEntriesFECFormat=Bokföringsposter - FEC-format
+FECFormatJournalCode=Kodjournal (JournalCode)
+FECFormatJournalLabel=Etikettjournal (JournalLib)
+FECFormatEntryNum=Artikelnummer (EcritureNum)
+FECFormatEntryDate=Deldatum (EcritureDate)
+FECFormatGeneralAccountNumber=Allmänt kontonummer (CompteNum)
+FECFormatGeneralAccountLabel=Allmänt kontoetikett (CompteLib)
+FECFormatSubledgerAccountNumber=Subledger-kontonummer (CompAuxNum)
+FECFormatSubledgerAccountLabel=Subledger-kontonummer (CompAuxLib)
 FECFormatPieceRef=Piece ref (PieceRef)
 FECFormatPieceDate=Piece date creation (PieceDate)
-FECFormatLabelOperation=Label operation (EcritureLib)
+FECFormatLabelOperation=Etikettdrift (EcritureLib)
 FECFormatDebit=Debit (Debit)
-FECFormatCredit=Credit (Credit)
-FECFormatReconcilableCode=Reconcilable code (EcritureLet)
-FECFormatReconcilableDate=Reconcilable date (DateLet)
-FECFormatValidateDate=Piece date validated (ValidDate)
-FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
-FECFormatMulticurrencyCode=Multicurrency code (Idevise)
+FECFormatCredit=Kredit (kredit)
+FECFormatReconcilableCode=Förenlig kod (EcritureLet)
+FECFormatReconcilableDate=Avstämningsdatum (DateLet)
+FECFormatValidateDate=Deldatum validerat (ValidDate)
+FECFormatMulticurrencyAmount=Multivaluta belopp (Montantdevise)
+FECFormatMulticurrencyCode=Flervalskod (Idevise)
 
-DateExport=Date export
+DateExport=Datum export
 WarningReportNotReliable=Varning, den här rapporten är inte baserad på huvudboken-modulen, så den innehåller inte transaktioner modifierad manuellt i huvudboken. Om din bokföring är uppdaterad är bokföringsvisningen mer exakt.
 ExpenseReportJournal=Kostnadsrapportsloggbok
 InventoryJournal=Inventarieloggbok
 
-NAccounts=%s accounts
+NAccounts=%s-konton
diff --git a/htdocs/langs/sv_SE/admin.lang b/htdocs/langs/sv_SE/admin.lang
index 358b96c76ad..438eda62f9f 100644
--- a/htdocs/langs/sv_SE/admin.lang
+++ b/htdocs/langs/sv_SE/admin.lang
@@ -37,13 +37,13 @@ UnlockNewSessions=Ta bort lås för anslutning
 YourSession=Din session
 Sessions=Användarsessioner
 WebUserGroup=Webbserver användare / grupp
-PermissionsOnFiles=Permissions on files
-PermissionsOnFilesInWebRoot=Permissions on files in web root directory
+PermissionsOnFiles=Behörigheter för filer
+PermissionsOnFilesInWebRoot=Behörigheter för filer i webbrotkatalogen
 PermissionsOnFile=Behörigheter på fil %s
 NoSessionFound=Din PHP-konfiguration verkar inte tillåta att du registrerar aktiva sessioner. Den katalog som används för att spara sessioner (<b> %s </b>) kan skyddas (till exempel av operatörsbehörigheter eller genom PHP-direktivet open_basedir).
 DBStoringCharset=Databas charset för att lagra data
 DBSortingCharset=Databas charset att sortera data
-HostCharset=Host charset
+HostCharset=Teckenuppsättning för värd
 ClientCharset=Klientcharset
 ClientSortingCharset=Klientsamling
 WarningModuleNotActive=Modul <b>%s</b> måste vara aktiverat
@@ -57,14 +57,14 @@ GUISetup=Visa
 SetupArea=Inställning
 UploadNewTemplate=Ladda upp ny mall (er)
 FormToTestFileUploadForm=Formulär för att testa filuppladdning (enligt inställningar)
-ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
-ModuleIsEnabled=The module/application <b>%s</b> has been enabled
+ModuleMustBeEnabled=Modulen / applikationen <b> %s </b> måste vara aktiverad
+ModuleIsEnabled=Modulen / applikationen <b> %s </b> har aktiverats
 IfModuleEnabled=Anm: ja effektivt endast om modul <b>%s</b> är aktiverat
 RemoveLock=Ta bort / byt namn på filen <b> %s </b> om den existerar, för att tillåta användning av Update / Install-verktyget.
 RestoreLock=Återställ fil <b> %s </b>, endast med läsbehörighet, för att inaktivera ytterligare användning av Update / Install-verktyget.
 SecuritySetup=Säkerhets inställning
-PHPSetup=PHP setup
-OSSetup=OS setup
+PHPSetup=PHP-inställning
+OSSetup=Inställning av operativsystem
 SecurityFilesDesc=Definiera här alternativ relaterade till säkerhet om uppladdning av filer.
 ErrorModuleRequirePHPVersion=Fel, kräver denna modul PHP version %s eller högre
 ErrorModuleRequireDolibarrVersion=Fel, kräver denna modul Dolibarr version %s eller högre
@@ -78,16 +78,16 @@ DisableJavascriptNote=Obs! För test eller debug-syfte. För optimering för bli
 UseSearchToSelectCompanyTooltip=Även om du har ett stort antal tredje parter (> 100 000), kan du öka hastigheten genom att sätta konstant COMPANY_DONOTSEARCH_ANYWHERE till 1 i Setup-> Övrigt. Sökningen kommer då att begränsas till start av strängen.
 UseSearchToSelectContactTooltip=Även om du har ett stort antal tredje parter (> 100 000), kan du öka hastigheten genom att sätta konstant CONTACT_DONOTSEARCH_ANYWHERE till 1 i Setup-> Övrigt. Sökningen kommer då att begränsas till start av strängen.
 DelaiedFullListToSelectCompany=Vänta tills en tangent trycks innan du laddar innehållet i kombinationslistan från tredje part. <br> Detta kan öka prestanda om du har ett stort antal tredje parter, men det är mindre bekvämt.
-DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
-NumberOfKeyToSearch=Number of characters to trigger search: %s
-NumberOfBytes=Number of Bytes
-SearchString=Search string
+DelaiedFullListToSelectContact=Vänta tills en tangent trycks ned innan du laddar innehållet i kontaktlistan. <br> Detta kan öka prestandan om du har ett stort antal kontakter, men det är mindre bekvämt.
+NumberOfKeyToSearch=Antal tecken som ska utlösa sökning: %s
+NumberOfBytes=Antal byte
+SearchString=Söksträng
 NotAvailableWhenAjaxDisabled=Inte tillgänglig när Ajax funktionshindrade
 AllowToSelectProjectFromOtherCompany=På tredje parts dokument kan du välja ett projekt kopplat till en annan tredje part
 JavascriptDisabled=JavaScript funktionshindrade
 UsePreviewTabs=Använd förhandsgranska flikar
 ShowPreview=Visa förhandsgranskning
-ShowHideDetails=Show-Hide details
+ShowHideDetails=Visa-dölj detaljer
 PreviewNotAvailable=Förhandsgranska inte tillgänglig
 ThemeCurrentlyActive=Tema för tillfället
 MySQLTimeZone=Timezone MySql (databas)
@@ -102,14 +102,14 @@ NextValueForInvoices=Nästa värde (fakturor)
 NextValueForCreditNotes=Nästa värde (kreditnotor)
 NextValueForDeposit=Nästa värde (förskottsbetalning)
 NextValueForReplacements=Nästa värde (ersättare)
-MustBeLowerThanPHPLimit=Note: your PHP configuration currently limits the maximum filesize for upload to <b>%s</b> %s, irrespective of the value of this parameter
+MustBeLowerThanPHPLimit=Obs: din PHP-konfiguration begränsar för närvarande den maximala filstorleken för uppladdning till <b> %s </b> %s, oavsett värdet på denna parameter
 NoMaxSizeByPHPLimit=Obs: Ingen gräns som anges i din PHP konfiguration
 MaxSizeForUploadedFiles=Maximala storleken för uppladdade filer (0 att förkasta varje uppladdning)
 UseCaptchaCode=Använd grafisk kod (CAPTCHA) på inloggningssidan
 AntiVirusCommand=Fullständiga sökvägen till antivirus kommandot
-AntiVirusCommandExample=Example for ClamAv Daemon (require clamav-daemon): /usr/bin/clamdscan<br>Example for ClamWin (very very slow): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
+AntiVirusCommandExample=Exempel för ClamAv Daemon (kräver clamav-daemon): / usr / bin / clamdscan <br> Exempel på ClamWin (väldigt långsamt): c: \\ Progra ~ 1 \\ ClamWin \\ bin \\ clamscan.exe
 AntiVirusParam= Fler parametrar på kommandoraden
-AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+AntiVirusParamExample=Exempel för ClamAv Daemon: --fdpass <br> Exempel för ClamWin: --database = "C: \\ Program Files (x86) \\ ClamWin \\ lib"
 ComptaSetup=Redovisning modul inställning
 UserSetup=Användarens hantering inställning
 MultiCurrencySetup=Multi-valuta inställning
@@ -157,8 +157,8 @@ SystemToolsAreaDesc=Detta område ger administrationsfunktioner. Använd menyn f
 Purge=Rensa
 PurgeAreaDesc=På den här sidan kan du radera alla filer som genereras eller lagras av Dolibarr (temporära filer eller alla filer i <b> %s </b> katalog). Att använda den här funktionen är normalt inte nödvändig. Den tillhandahålls som en lösning för användare vars Dolibarr är värd av en leverantör som inte erbjuder behörigheter för att radera filer som genereras av webbservern.
 PurgeDeleteLogFile=Ta bort loggfiler, inklusive <b> %s </b> definierad för Syslog-modulen (ingen risk att förlora data)
-PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Parameter can be 'tempfilesold', 'logfiles' or both 'tempfilesold+logfiles'. Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete log and temporary files
+PurgeDeleteTemporaryFiles=Ta bort alla loggfiler och tillfälliga filer (ingen risk att förlora data). Parametern kan vara 'tempfilesold', 'logfiles' eller båda 'tempfilesold + logfiles'. Obs! Radering av tillfälliga filer görs endast om temp-katalogen skapades för mer än 24 timmar sedan.
+PurgeDeleteTemporaryFilesShort=Ta bort logg och tillfälliga filer
 PurgeDeleteAllFilesInDocumentsDir=Ta bort alla filer i katalogen: <b> %s </b>. <br> Detta tar bort alla genererade dokument relaterade till elementer (tredje part, fakturor etc ...), filer som laddas upp i ECM-modulen, databassäkerhetskopior och tillfälliga filer.
 PurgeRunNow=Rensa nu
 PurgeNothingToDelete=Ingen katalog eller filer att radera.
@@ -186,8 +186,8 @@ Compression=Komprimering
 CommandsToDisableForeignKeysForImport=Kommando för att stänga av främmande nycklar vid import
 CommandsToDisableForeignKeysForImportWarning=Obligatoriskt om du vill kunna återställa din sql-dump vid ett senare tillfälle
 ExportCompatibility=Förenlighet genererade exportfil
-ExportUseMySQLQuickParameter=Use the --quick parameter
-ExportUseMySQLQuickParameterHelp=The '--quick' parameter helps limit RAM consumption for large tables.
+ExportUseMySQLQuickParameter=Använd parametern --quick
+ExportUseMySQLQuickParameterHelp=Parametern '--quick' hjälper till att begränsa RAM-förbrukningen för stora tabeller.
 MySqlExportParameters=MySQL export parametrar
 PostgreSqlExportParameters= PostgreSQL exportparametrar
 UseTransactionnalMode=Använd affärsbeslut läge
@@ -207,35 +207,35 @@ FeatureDisabledInDemo=Funktion avstängd i demo
 FeatureAvailableOnlyOnStable=Funktionen är endast tillgänglig på officiella stabila versioner
 BoxesDesc=Widgets är komponenter som visar lite information som du kan lägga till för att anpassa vissa sidor. Du kan välja mellan att visa widgeten eller inte, genom att välja målsida och klicka på "Aktivera", eller genom att klicka på papperskorgen för att inaktivera den.
 OnlyActiveElementsAreShown=Endast delar av <a href="%s">aktiverade moduler</a> visas.
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button <span class="small valignmiddle">%s</span> of each module to enable or disable a module/application.
+ModulesDesc=Modulerna / applikationerna avgör vilka funktioner som finns i programvaran. Vissa moduler kräver behörighet för användare efter att ha aktiverat modulen. Klicka på på / av-knappen <span class="small valignmiddle"> %s </span> för varje modul för att aktivera eller inaktivera en modul / applikation.
 ModulesMarketPlaceDesc=Du kan hitta fler moduler att ladda ner på externa webbplatser på Internet ...
 ModulesDeployDesc=Om behörigheter i ditt filsystem tillåter det kan du använda det här verktyget för att distribuera en extern modul. Modulen kommer då att visas på fliken <strong> %s </strong>.
 ModulesMarketPlaces=Hitta externa app / moduler
 ModulesDevelopYourModule=Utveckla din egen app / moduler
 ModulesDevelopDesc=Du kan också utveckla din egen modul eller hitta en partner för att utveckla en för dig.
 DOLISTOREdescriptionLong=I stället för att starta <a href="https://www.dolistore.com"> www.dolistore.com </a> webbplats för att hitta en extern modul, kan du använda det här inbäddade verktyget som ska utföra sökningen på den externa marknaden för dig (kan vara långsam, behöver en internetåtkomst) ...
-NewModule=New module
+NewModule=Ny modul
 FreeModule=Gratis
 CompatibleUpTo=Kompatibel med version %s
 NotCompatible=Den här modulen verkar inte vara kompatibel med din Dolibarr %s (Min %s - Max %s).
 CompatibleAfterUpdate=Den här modulen kräver en uppdatering av din Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=Se på marknaden
-SeeSetupOfModule=See setup of module %s
+SeeSetupOfModule=Se installation av modul %s
+SetOptionTo=Set option <b>%s</b> to %s
 Updated=Uppdaterad
-Nouveauté=Nyhet
 AchatTelechargement=Köp / Hämta
 GoModuleSetupArea=För att distribuera / installera en ny modul, gå till modulens inställningsområde: <a href="%s"> %s </a>.
 DoliStoreDesc=DoliStore, den officiella marknadsplatsen för Dolibarr ERP / CRM externa moduler
-DoliPartnersDesc=List of companies providing custom-developed modules or features.<br>Note: since Dolibarr is an open source application, <i>anyone</i> experienced in PHP programming should be able to develop a module.
+DoliPartnersDesc=Lista över företag som tillhandahåller specialutvecklade moduler eller funktioner. <br> Obs! Eftersom Dolibarr är ett program med öppen källkod bör <i> någon </i> med erfarenhet av PHP-programmering kunna utveckla en modul.
 WebSiteDesc=Externa webbplatser för fler moduler utan tillägg...
 DevelopYourModuleDesc=Några lösningar för att utveckla din egen modul ...
 URL=URL
-RelativeURL=Relative URL
+RelativeURL=Relativ webbadress
 BoxesAvailable=Widgets tillgängliga
 BoxesActivated=Widgets aktiverade
 ActivateOn=Aktivera på
 ActiveOn=Aktiverad på
-ActivatableOn=Activatable on
+ActivatableOn=Aktiverbar på
 SourceFile=Källfil
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Endast tillgängligt om JavaScript är inte oduglig
 Required=Obligatorisk
@@ -261,7 +261,7 @@ ReferencedPreferredPartners=Preferred Partners
 OtherResources=Andra resurser
 ExternalResources=Externa resurser
 SocialNetworks=Sociala nätverk
-SocialNetworkId=Social Network ID
+SocialNetworkId=Socialt nätverks-ID
 ForDocumentationSeeWiki=För användarens eller utvecklarens dokumentation (Doc, FAQs ...), <br> ta en titt på Dolibarr Wiki: <br> <a href="%s" target="_blank"><b>%s</b></a>
 ForAnswersSeeForum=För alla andra frågor / hjälp, kan du använda Dolibarr forumet: <br> <a href="%s" target="_blank"><b>%s</b></a>
 HelpCenterDesc1=Här finns några resurser för att få hjälp och support med Dolibarr.
@@ -280,9 +280,9 @@ NoticePeriod=Uppsägningstid
 NewByMonth=Ny i månaden
 Emails=E-post
 EMailsSetup=E-postinställningar
-EMailsDesc=This page allows you to set parameters or options for email sending.
+EMailsDesc=På den här sidan kan du ställa in parametrar eller alternativ för att skicka e-post.
 EmailSenderProfiles=E-postmeddelanden skickar profiler
-EMailsSenderProfileDesc=You can keep this section empty. If you enter some emails here, they will be added to the list of possible senders into the combobox when your write a new email.
+EMailsSenderProfileDesc=Du kan hålla det här avsnittet tomt. Om du anger några e-postmeddelanden här kommer de att läggas till i listan över möjliga avsändare i kombinationsrutan när du skriver ett nytt e-postmeddelande.
 MAIN_MAIL_SMTP_PORT=SMTP / SMTPS-porten (standardvärde i php.ini: <b> %s </b>)
 MAIN_MAIL_SMTP_SERVER=SMTP / SMTPS-värd (standardvärde i php.ini: <b> %s </b>)
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP / SMTPS-port (Ej definierad i PHP på Unix-liknande system)
@@ -292,13 +292,13 @@ MAIN_MAIL_ERRORS_TO=E-post används för att returnera e-postmeddelanden (fält
 MAIN_MAIL_AUTOCOPY_TO= Kopiera (Bcc) alla skickade e-postmeddelanden till
 MAIN_DISABLE_ALL_MAILS=Inaktivera all e-postsändning (för teständamål eller demo)
 MAIN_MAIL_FORCE_SENDTO=Skicka alla e-postmeddelanden till (i stället för riktiga mottagare, för teständamål)
-MAIN_MAIL_ENABLED_USER_DEST_SELECT=Suggest emails of employees (if defined) into the list of predefined recipient when writing a new email
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Föreslå e-postmeddelanden från anställda (om de är definierade) i listan över fördefinierade mottagare när du skriver ett nytt e-postmeddelande
 MAIN_MAIL_SENDMODE=E-postsändningsmetod
 MAIN_MAIL_SMTPS_ID=SMTP-ID (om sändning av server kräver autentisering)
 MAIN_MAIL_SMTPS_PW=SMTP-lösenord (om sändning av server kräver autentisering)
 MAIN_MAIL_EMAIL_TLS=Använd kryptering av TLS (SSL)
 MAIN_MAIL_EMAIL_STARTTLS=Använd TLS (STARTTLS) kryptering
-MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Auktorisera automatiska signaturer
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Använd DKIM för att skapa e-signatur
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=E-post domän för användning med dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Namn på dkim-väljaren
@@ -310,9 +310,9 @@ MAIN_MAIL_DEFAULT_FROMTYPE=Standard avsändarmail för manuell sändning (använ
 UserEmail=Användar-e-post
 CompanyEmail=Företagets Email
 FeatureNotAvailableOnLinux=Funktionen inte finns på Unix-liknande system. Testa din sendmail program lokalt.
-FixOnTransifex=Fix the translation on the online translation platform of project
+FixOnTransifex=Fixa översättningen på online-översättningsplattformen för projektet
 SubmitTranslation=Om översättningen för detta språk inte är fullständigt eller du hittar fel kan du korrigera detta genom att redigera filer i katalogen <b> langs / %s </b> och skicka in din ändring till www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
+SubmitTranslationENUS=Om översättningen för detta språk inte är komplett eller om du hittar fel kan du korrigera detta genom att redigera filer i katalogen <b> langs / %s </b> och skicka ändrade filer på dolibarr.org/forum eller, om du är utvecklare, med en PR på github .com / Dolibarr / dolibarr
 ModuleSetup=Modul inställning
 ModulesSetup=Moduler / Programinställningar
 ModuleFamilyBase=System
@@ -342,7 +342,7 @@ SetupIsReadyForUse=Modulutbyggnad är klar. Du måste dock aktivera och konfigur
 NotExistsDirect=Den alternativa rotkatalogen är inte definierad till en befintlig katalog. <br>
 InfDirAlt=Sedan version 3 är det möjligt att definiera en alternativ rotkatalog. Detta gör att du kan lagra, till en dedikerad katalog, plugin-moduler och anpassade mallar. <br> Skapa bara en katalog i roten till Dolibarr (t ex: anpassad). <br>
 InfDirExample= <br> Angiv sedan det i filen <strong> conf.php </strong> <br> $ dolibarr_main_url_root_alt = '/ anpassad' <br> $ dolibarr_main_document_root_alt = '/ path / of / dolibarr / htdocs / anpassad' <br> Om dessa rader kommenteras med "#" , bara uncomment genom att ta bort "#" tecknet.
-YouCanSubmitFile=You can upload the .zip file of module package from here:
+YouCanSubmitFile=Du kan ladda upp .zip-filen för modulpaketet härifrån:
 CurrentVersion=Dolibarr nuvarande version
 CallUpdatePage=Bläddra till den sida som uppdaterar databasstrukturen och data: %s.
 LastStableVersion=Senaste stabila versionen
@@ -352,9 +352,9 @@ LastActivationIP=Senaste aktivering IP
 UpdateServerOffline=Uppdatera server offline
 WithCounter=Hantera en räknare
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first %s. <br><b>{000000@x}</b> same as the previous one but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then the sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated to the customer. This counter dedicated to customer is reset at same time as the global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
+GenericMaskCodes2= <b> {cccc} </b> klientkoden på n tecken <br> <b> {cccc000} </b> kunden är kundens kund. Denna räknare dedikerad till kunden återställs samtidigt som den globala räknaren. <br> <b> {tttt} </b> Koden för tredje parts typ på n tecken (se menyn Hem - Inställningar - Ordbok - Typer av tredje part). Om du lägger till den här taggen kommer räknaren att vara annorlunda för varje typ av tredje part. <br>
 GenericMaskCodes3=Alla andra tecken i masken förblir intakt. <br> Blanksteg är inte tillåtna. <br>
-GenericMaskCodes3EAN=All other characters in the mask will remain intact (except * or ? in 13th position in EAN13).<br>Spaces are not allowed.<br>In EAN13, the last character after the last } in 13th position should be * or ? . It will be replaced by the calculated key.<br>
+GenericMaskCodes3EAN=Alla andra tecken i masken förblir intakta (utom * eller? I 13: e position i EAN13). <br> Utrymmen är inte tillåtna. <br> I EAN13 ska det sista tecknet efter det sista} i 13: e position vara * eller? . Den kommer att ersättas av den beräknade nyckeln. <br>
 GenericMaskCodes4a= <u> Exempel på 99: e %s från tredje part TheCompany, med datum 2007-01-31: </u> <br>
 GenericMaskCodes4b=<u>Exempel på tredje part som har skapats på 2007/03/01:</u> <br>
 GenericMaskCodes4c=<u>Exempel på artikel skapad 2007-03-01:</u><br>
@@ -382,7 +382,7 @@ ExamplesWithCurrentSetup=Exempel med nuvarande konfiguration
 ListOfDirectories=Förteckning över OpenDocument mallar kataloger
 ListOfDirectoriesForModelGenODT=Lista över kataloger som innehåller mallfiler med OpenDocument-format. <br> <br> Sätt här hela sökvägen till kataloger. <br> Lägg till en vagnretur mellan eah-katalogen. <br> För att lägga till en katalog över GED-modulen, lägg till här <b> DOL_DATA_ROOT / ecm / ditt katalognamn </b>. <br> <br> Filer i katalogerna måste sluta med <b> .odt </b> eller <b> .ods </b>.
 NumberOfModelFilesFound=Antal ODT / ODS-mallfiler som finns i dessa kataloger
-ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
+ExampleOfDirectoriesForModelGen=Exempel på syntax: <br> c: \\ myapp \\ mydocumentdir \\ mysubdir <br> / home / myapp / mydocumentdir / mysubdir <br> DOL_DATA_ROOT / ecm / ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br> Att veta hur du skapar dina odT dokumentmallar, innan du förvarar dem i dessa kataloger, läs wiki dokumentation:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Ståndpunkt av förnamn / namn
@@ -398,12 +398,13 @@ ModuleMustBeEnabledFirst=Modul <b> %s </b> måste aktiveras först om du behöve
 SecurityToken=Nyckeln till säkra webbadresser
 NoSmsEngine=Ingen SMS-avsändare finns tillgänglig. En SMS-avsändarhanterare är inte installerad med standarddistributionen eftersom de är beroende av en extern leverantör, men du kan hitta några på %s
 PDF=PDF
-PDFDesc=Global options for PDF generation
-PDFAddressForging=Rules for address section
+PDFDesc=Globala alternativ för PDF-generation
+PDFOtherDesc=PDF-alternativ som är specifikt för vissa moduler
+PDFAddressForging=Regler för adressavsnitt
 HideAnyVATInformationOnPDF=Dölj all information om försäljningsskatt / moms
 PDFRulesForSalesTax=Regler för försäljningsskatt / moms
 PDFLocaltax=Regler för %s
-HideLocalTaxOnPDF=Hide %s rate in column Sale Tax / VAT
+HideLocalTaxOnPDF=Dölj %s i kolumn Försäljningsskatt / moms
 HideDescOnPDF=Dölj produktbeskrivning
 HideRefOnPDF=Dölj produkter ref.
 HideDetailsOnPDF=Dölj produktlinjer detaljer
@@ -413,16 +414,16 @@ UrlGenerationParameters=Parametrar för att säkra webbadresser
 SecurityTokenIsUnique=Använd en unik securekey parameter för varje webbadress
 EnterRefToBuildUrl=Ange referens för objekt %s
 GetSecuredUrl=Få beräknat URL
-ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
+ButtonHideUnauthorized=Dölj obehöriga åtgärdsknappar också för interna användare (bara gråtonad annars)
 OldVATRates=Gammal momssats
 NewVATRates=Ny momssats
 PriceBaseTypeToChange=Ändra om priser med bas referensvärde som definieras på
 MassConvert=Starta masskonvertering
-PriceFormatInCurrentLanguage=Price Format In Current Language
+PriceFormatInCurrentLanguage=Prisformat på nuvarande språk
 String=String
-String1Line=String (1 line)
+String1Line=Sträng (1 rad)
 TextLong=Lång text
-TextLongNLines=Long text (n lines)
+TextLongNLines=Lång text (n rader)
 HtmlText=Html-text
 Int=Heltal
 Float=Flyttal
@@ -442,17 +443,17 @@ ExtrafieldCheckBox=Kryssrutor
 ExtrafieldCheckBoxFromList=Kryssrutor från bordet
 ExtrafieldLink=Länk till ett objekt
 ComputedFormula=Beräknat fält
-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->fetchNoCompute($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->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
-Computedpersistent=Store computed field
-ComputedpersistentDesc=Computed extra fields will be stored in the database, however, the value will only be recalculated when the object of this field is changed. If the computed field depends on other objects or global data this value might be wrong!!
+ComputedFormulaDesc=Du kan ange här en formel som använder andra objektegenskaper eller någon PHP-kodning för att få ett dynamiskt beräknat värde. Du kan använda alla PHP-kompatibla formler inklusive "?" tillståndsoperatör och följande globala objekt: <strong> $ db, $ conf, $ langs, $ mysoc, $ user, $ object </strong>. <br> <strong> VARNING </strong>: Endast vissa egenskaper för $ objekt kan vara tillgängliga. Om du behöver egenskaper som inte har laddats, hämtar du bara objektet till din formel som i det andra exemplet. <br> Att använda ett beräknat fält betyder att du inte kan ange något värde från gränssnittet. Om det finns ett syntaxfel kan formeln kanske inte returnera något. <br> <br> Exempel på formel: <br> $ object-> id < 10 ? round($object-> id / 2, 2): ($ object-> id + 2 * $ user-> id) * (int) substr ($ mysoc-> zip, 1, 2 ) <br> <br> Exempel på att ladda om objekt <br> (($ reloadedobj = new Societe ($ db)) && ($ reloadedobj-> fetchNoCompute ($ obj-> id? $ obj-> id: ($ obj-> rad) > rowid: $ object-> id))> 0))? $ reloadedobj-> array_options ['options_extrafieldkey'] * $ reloadedobj-> capital / 5: '-1' <br> <br> Annat exempel på formel för att tvinga objektets belastning och dess överordnade objekt: <br> (($ reloadedob = )) && ($ reloadedobj-> fetchNoCompute ($ object-> id)> 0) && ($ secondloadedobj = new Project ($ db)) && ($ secondloadedobj-> fetchNoCompute ($ reloadedobj-> fk_project)> 0))? $ secondloadedobj-> ref: 'Föräldraprojekt hittades inte'
+Computedpersistent=Lagra beräknat fält
+ComputedpersistentDesc=Beräknade extra fält kommer att lagras i databasen, men värdet beräknas bara om objektet för detta fält ändras. Om det beräknade fältet beror på andra objekt eller globala data kan detta värde vara fel !!
 ExtrafieldParamHelpPassword=Om du lämnar fältet tomt betyder det att detta värde kommer att sparas utan kryptering (fältet måste bara döljas med stjärnan på skärmen). <br> Ange 'auto' för att använda standardkrypteringsregeln för att spara lösenord i databasen (då är läsningsvärde endast ett hash, inget sätt att hämta originalvärdet)
 ExtrafieldParamHelpselect=Förteckning över värden måste vara linjer med formatnyckel, värde (där nyckel inte kan vara '0') <br> <br> till exempel: <br> 1, värde1 <br> 2, värde2 <br> code3, värde3 <br> ... <br> <br> För att få lista beroende på en annan komplementär attributlista: <br> 1, värde1 | options_ <i> parent_list_code </i>: parent_key <br> 2, value2 | options_ <i> parent_list_code </i>: parent_key <br> <br> För att få listan beroende på en annan lista: <br> 1, värde1 | <i> parent_list_code </i>: parent_key <br> 2, värde2 | <i> parent_list_code </i>: parent_key
 ExtrafieldParamHelpcheckbox=Lista över värden måste vara rader med formatnyckel, värde (där nyckel inte kan vara '0') <br> <br> till exempel: <br> 1, värde1 <br> 2, värde2 <br> 3, värde3 <br> ...
 ExtrafieldParamHelpradio=Lista över värden måste vara rader med formatnyckel, värde (där nyckel inte kan vara '0') <br> <br> till exempel: <br> 1, värde1 <br> 2, värde2 <br> 3, värde3 <br> ...
 ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarly a primary int key<br>- filtersql is a SQL condition. It can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<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::filtersql<br>Example: c_typent:libelle:id::filtersql<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=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
-ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
+ExtrafieldParamHelpchkbxlst=Värdelista kommer från en tabell <br> Syntax: tabellnamn: label_field: id_field :: filtersql <br> Exempel: c_typent: libelle: id :: filtersql <br> <br> filter kan bara vara ett aktivt test2 (t.ex. kan också använda $ ID $ i filterhäxan är det aktuella idet för det aktuella objektet <br> Om du vill göra en SELECT i filter använder du $ SEL $ <br> om du vill filtrera på extrafält använder syntax extra.fieldcode = ... (där fältkoden är uppförande extrafield) <br> <br> för att få listan beroende på en annan kompletterande attributlista: <br> c_typent: libelle: id: options_ <i> parent_list_code </i> | parent_column: filter <br> <br> för att få listan beroende på en annan lista: <br> c_typent: libelle: id: <i> parent_list_code </i> | parent_column: filter
+ExtrafieldParamHelplink=Parametrar måste vara ObjectName: Classpath <br> Syntax: ObjectName: Classpath
+ExtrafieldParamHelpSeparator=Håll tomt för en enkel separator <br> Ställ in detta på 1 för en kollapsande separator (öppna som standard för en ny session, sedan behålls status för varje användarsession) <br> Ställ detta till 2 för en kollapsande separator (kollapsad som standard för ny session, sedan status hålls före varje användarsession)
 LibraryToBuildPDF=Bibliotek som används för PDF-generering
 LocalTaxDesc=Vissa länder kan ansöka om två eller tre skatter på varje faktura. Om så är fallet, välj typ för andra och tredje skatt och dess skattesats. Möjlig typ är: <br> 1: Lokal skatt gäller för produkter och tjänster utan moms (localtax beräknas på belopp utan skatt) <br> 2: Lokal skatt gäller för produkter och tjänster inklusive moms (lokal skatt beräknas på belopp + huvudskatt) <br> 3: lokal skatt tillämpas på varor utan moms (lokal skatt beräknas på belopp utan skatt) <br> 4: Lokal skatt gäller för produkter inklusive moms (lokal skatt beräknas på belopp + huvudskatt) <br> 5: Lokal skatt gäller för tjänster utan moms (lokal skatt beräknas på belopp utan skatt) <br> 6: Lokal skatt gäller för tjänster inklusive moms (lokal skatt beräknas på belopp + skatt)
 SMS=SMS
@@ -460,13 +461,13 @@ LinkToTestClickToDial=Skriv in ett telefonnummer att ringa upp för att visa en
 RefreshPhoneLink=Uppdatera länk
 LinkToTest=Väljbar länk genererad för användare <strong>%s</strong> (klicka på tfn-nummer för att prova)
 KeepEmptyToUseDefault=Lämna tom för standardvärde
-KeepThisEmptyInMostCases=In most cases, you can keep this field empy.
+KeepThisEmptyInMostCases=I de flesta fall kan du behålla detta fält.
 DefaultLink=Standardlänk
 SetAsDefault=Ange som standard
 ValueOverwrittenByUserSetup=Varning, kan detta värde skrivas över av användarspecifik installation (varje användare kan ställa in sin egen clicktodial url)
-ExternalModule=External module
-InstalledInto=Installed into directory %s
-BarcodeInitForThirdparties=Mass barcode init for third-parties
+ExternalModule=Extern modul
+InstalledInto=Installerad i katalogen %s
+BarcodeInitForThirdparties=Mass streckkod init för tredje part
 BarcodeInitForProductsOrServices=Mass streckkod init eller återställning efter produkter eller tjänster
 CurrentlyNWithoutBarCode=För närvarande har du  <strong>%s</strong> rader på <strong>%s</strong> %s utan steckkod angett.
 InitEmptyBarCode=Init värde för nästa% s tomma poster
@@ -484,18 +485,18 @@ EnableAndSetupModuleCron=Om du vill generera denna återkommande faktura automat
 ModuleCompanyCodeCustomerAquarium=%s följt av kundkod för kundkodskod
 ModuleCompanyCodeSupplierAquarium=%s följt av leverantörskod för en leverantörs bokföringskod
 ModuleCompanyCodePanicum=Återvänd en tom bokföringskod.
-ModuleCompanyCodeDigitaria=Returns a compound accounting code according to the name of the third party. The code consists of a prefix that can be defined in the first position followed by the number of characters defined in the third party code.
-ModuleCompanyCodeCustomerDigitaria=%s followed by the truncated customer name by the number of characters: %s for the customer accounting code.
-ModuleCompanyCodeSupplierDigitaria=%s followed by the truncated supplier name by the number of characters: %s for the supplier accounting code.
+ModuleCompanyCodeDigitaria=Returnerar en sammansatt redovisningskod enligt namnet på tredje part. Koden består av ett prefix som kan definieras i den första positionen följt av antalet tecken som definierats i tredjepartskoden.
+ModuleCompanyCodeCustomerDigitaria=%s följt av det trunkerade kundnamnet med antalet tecken: %s för kundredovisningskoden.
+ModuleCompanyCodeSupplierDigitaria=%s följt av det trunkerade leverantörsnamnet med antalet tecken: %s för leverantörens bokföringskod.
 Use3StepsApproval=Som standard måste inköpsorder skapas och godkännas av 2 olika användare (ett steg / användare att skapa och ett steg / användare att godkänna. Observera att om användaren har båda tillstånd att skapa och godkänna, är ett steg / användaren tillräckligt) . Du kan fråga med det här alternativet att införa ett tredje steg / användargodkännande, om beloppet är högre än ett dedikerat värde (så 3 steg kommer att behövas: 1 = godkännande, 2 = första godkännande och 3 = andra godkännande om beloppet är tillräckligt). <br> Ställ in det här för att tömma om ett godkännande (2 steg) räcker, ställ det till ett mycket lågt värde (0.1) om ett andra godkännande (3 steg) alltid krävs.
 UseDoubleApproval=Använd ett 3 steg godkännande när beloppet (utan skatt) är högre än ...
-WarningPHPMail=WARNING: The setup to send emails from the application is using the default generic setup. It is often better to setup outgoing emails to use the email server of your Email Service Provider instead of the default setup for several reasons:
-WarningPHPMailA=- Using the server of the Email Service Provider increases the trustability of your email, so it increases the deliverablity without being flagged as SPAM
-WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota).
-WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
-WarningPHPMailD=If the method 'PHP Mail' is really the method you would like to use, you can remove this warning by adding the constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP to 1 in Home - Setup - Other.
+WarningPHPMail=VARNING: Inställningen för att skicka e-postmeddelanden från applikationen använder den allmänna standardinställningen. Det är ofta bättre att ställa in utgående e-post för att använda e-postleverantörens e-postserver istället för standardinställningen av flera skäl:
+WarningPHPMailA=- Användning av e-postleverantörens server ökar tillförlitligheten för din e-post, så det ökar leveranssäkerheten utan att flaggas som SPAM
+WarningPHPMailB=- Vissa e-postleverantörer (som Yahoo) tillåter inte att du skickar ett e-postmeddelande från en annan server än sin egen server. Din nuvarande inställning använder programmets server för att skicka e-post och inte din e-postleverantörs server, så vissa mottagare (den som är kompatibel med det begränsande DMARC-protokollet) frågar din e-postleverantör om de kan acceptera din e-post och vissa e-postleverantörer (som Yahoo) kan svara "nej" eftersom servern inte tillhör dem, så få av dina skickade e-postmeddelanden kanske inte accepteras för leverans (var också försiktig med din e-postleverantörs sändningskvot).
+WarningPHPMailC=- Att använda din egen e-postleverantörs SMTP-server för att skicka e-post är också intressant, så alla e-postmeddelanden som skickas från applikationen kommer också att sparas i din "Skickade" katalog i din brevlåda.
+WarningPHPMailD=Om metoden "PHP Mail" verkligen är den metod du vill använda kan du ta bort den här varningen genom att lägga till konstanten MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP till 1 i Hem - Installation - Övrigt.
 WarningPHPMail2=Om din e-post SMTP-leverantör behöver begränsa e-postklienten till vissa IP-adresser (mycket sällsynt), är detta e-postadressen för e-postanvändaragenten (MUA) för din ERP CRM-ansökan: <strong> %s </strong>.
-WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+WarningPHPMailSPF=Om domännamnet i avsändarens e-postadress är skyddad av en SPF-post (fråga domänregistret) måste du lägga till följande IP-adresser i SPF-posten för DNS för din domän: <strong> %s </strong>.
 ClickToShowDescription=Klicka för att visa beskrivning
 DependsOn=Denna modul behöver modulen / modulerna
 RequiredBy=Denna modul krävs enligt modul (er)
@@ -503,7 +504,7 @@ TheKeyIsTheNameOfHtmlField=Detta är namnet på HTML-fältet. Teknisk kunskap kr
 PageUrlForDefaultValues=Du måste ange den relativa sökvägen för sidadressen. Om du anger parametrar i URL, kommer standardvärdena att vara effektiva om alla parametrar är inställda på samma värde.
 PageUrlForDefaultValuesCreate= <br> Exempel: <br> För formuläret för att skapa en ny tredje part är det <strong> %s </strong>. <br> För URL för externa moduler installerade i anpassad katalog, inkludera inte "custom /", så använd sökvägen som <strong> mymodule / mypage.php </strong> och inte anpassad / mymodule / mypage.php. <br> Om du bara vill ha standardvärde om url har någon parameter kan du använda <strong> %s </strong>
 PageUrlForDefaultValuesList= <br> Exempel: <br> För sidan som listar tredje part är den <strong> %s </strong>. <br> För URL för externa moduler installerade i anpassad katalog, inkludera inte "custom /" så använd en sökväg som <strong> mymodule / mypagelist.php </strong> och inte anpassad / mymodule / mypagelist.php. <br> Om du bara vill ha standardvärde om url har någon parameter kan du använda <strong> %s </strong>
-AlsoDefaultValuesAreEffectiveForActionCreate=Also note that overwritting default values for form creation works only for pages that were correctly designed (so with parameter action=create or presend...)
+AlsoDefaultValuesAreEffectiveForActionCreate=Observera också att överskrivning av standardvärden för formulärskapande endast fungerar för sidor som var korrekt utformade (så med parameteråtgärd = skapa eller presend ...)
 EnableDefaultValues=Aktivera anpassning av standardvärden
 EnableOverwriteTranslation=Aktivera användning av överskriven översättning
 GoIntoTranslationMenuToChangeThis=En översättning har hittats för nyckeln med den här koden. För att ändra detta värde måste du redigera det från Home-Setup-translation.
@@ -543,11 +544,11 @@ Module25Desc=Försäljningsorderhantering
 Module30Name=Fakturor
 Module30Desc=Förvaltning av fakturor och kreditanteckningar för kunder. Förvaltning av fakturor och kreditanteckningar för leverantörer
 Module40Name=Säljare
-Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
+Module40Desc=Leverantörer och inköpshantering (inköpsorder och fakturering av leverantörsfakturor)
 Module42Name=Felsökningsloggar
 Module42Desc=Loggningsfunktioner (fil, syslog, ...). Sådana loggar är för tekniska / debug-ändamål.
-Module43Name=Debug Bar
-Module43Desc=A tool for developper adding a debug bar in your browser.
+Module43Name=Felsökningsfält
+Module43Desc=Ett verktyg för att utveckla ett felsökningsfält i din webbläsare.
 Module49Name=Redaktion
 Module49Desc=Redaktör ledning
 Module50Name=Produkter
@@ -555,21 +556,21 @@ Module50Desc=Förvaltning av produkter
 Module51Name=Massutskick
 Module51Desc=Massa papper utskick ledning
 Module52Name=Lager
-Module52Desc=Stock management
+Module52Desc=Lagerhantering
 Module53Name=Tjänster
 Module53Desc=Förvaltning av tjänster
 Module54Name=Avtal / Prenumerationer
 Module54Desc=Förvaltning av kontrakt (tjänster eller återkommande abonnemang)
 Module55Name=Streckkoder
-Module55Desc=Barcode ledning
-Module56Name=Payment by credit transfer
-Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
-Module57Name=Payments by Direct Debit
-Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
+Module55Desc=Barcode or QR code management
+Module56Name=Betalning med kreditöverföring
+Module56Desc=Hantering av betalning av leverantörer med kreditöverföringsorder. Den inkluderar generering av SEPA-filer för europeiska länder.
+Module57Name=Betalningar med autogiro
+Module57Desc=Hantering av direktdebiteringsorder. Den inkluderar generering av SEPA-filer för europeiska länder.
 Module58Name=ClickToDial
 Module58Desc=Integrering av ett ClickToDial system (Asterisk, ...)
-Module60Name=Stickers
-Module60Desc=Management of stickers
+Module60Name=Klistermärken
+Module60Desc=Hantering av klistermärken
 Module70Name=Insatser
 Module70Desc=Intervention ledning
 Module75Name=Kostnader och resor anteckningar
@@ -587,9 +588,9 @@ Module200Desc=LDAP-katalogsynkronisering
 Module210Name=PostNuke
 Module210Desc=PostNuke integration
 Module240Name=Data export
-Module240Desc=Tool to export Dolibarr data (with assistance)
+Module240Desc=Verktyg för att exportera Dolibarr-data (med hjälp)
 Module250Name=Data import
-Module250Desc=Tool to import data into Dolibarr (with assistance)
+Module250Desc=Verktyg för att importera data till Dolibarr (med hjälp)
 Module310Name=Medlemmar
 Module310Desc=Foundation i ledningen
 Module320Name=RSS-flöde
@@ -606,7 +607,7 @@ Module510Name=Löner
 Module510Desc=Spela in och spåra anställda betalningar
 Module520Name=Lån
 Module520Desc=Förvaltning av lån
-Module600Name=Notifications on business event
+Module600Name=Meddelanden om affärshändelse
 Module600Desc=Skicka e-postmeddelanden som utlöses av en företagshändelse: per användare (inställning definierad på varje användare), per tredjepartskontakter (inställning definierad på var tredje part) eller genom specifika e-postmeddelanden
 Module600Long=Observera att den här modulen skickar e-postmeddelanden i realtid när en viss företagshändelse inträffar. Om du letar efter en funktion för att skicka e-postpåminnelser för agendahändelser, gå till inställningen av modulens Agenda.
 Module610Name=Produktvarianter
@@ -646,16 +647,16 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind omvandlingar kapacitet
 Module3200Name=Oföränderliga arkiv
 Module3200Desc=Aktivera en oföränderlig logg över affärshändelser. Händelser arkiveras i realtid. Loggen är en skrivskyddad tabell med kedjda händelser som kan exporteras. Denna modul kan vara obligatorisk för vissa länder.
-Module3400Name=Social Networks
-Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
+Module3400Name=Sociala nätverk
+Module3400Desc=Aktivera sociala nätverksfält till tredje part och adresser (skype, twitter, facebook, ...).
 Module4000Name=HRM
 Module4000Desc=Personalhantering (förvaltningen av avdelningen, anställningskontrakt och känslor)
 Module5000Name=Multi-bolag
 Module5000Desc=Gör att du kan hantera flera företag
-Module6000Name=Inter-modules Workflow
-Module6000Desc=Workflow management between different modules (automatic creation of object and/or automatic status change)
+Module6000Name=Intermoduler Arbetsflöde
+Module6000Desc=Arbetsflödeshantering mellan olika moduler (automatisk skapande av objekt och / eller automatisk statusändring)
 Module10000Name=webbplatser
-Module10000Desc=Create websites (public) with a WYSIWYG editor. This is a webmaster or developer oriented CMS (it is better to know HTML and CSS language). 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.
+Module10000Desc=Skapa webbplatser (offentliga) med en WYSIWYG-redigerare. Detta är en webbansvarig eller utvecklarorienterad CMS (det är bättre att känna till HTML- och CSS-språk). Ställ bara in din webbserver (Apache, Nginx, ...) för att peka på den dedikerade Dolibarr-katalogen för att ha den online på internet med ditt eget domännamn.
 Module20000Name=Lämna begäranhantering
 Module20000Desc=Definiera och spåra begäran om ansvarsfriskrivning
 Module39000Name=Produktpartier
@@ -667,19 +668,19 @@ Module50000Desc=Erbjud kunderna en PayBox online betalningssida (kredit- / betal
 Module50100Name=POS SimplePOS
 Module50100Desc=Point of Sale-modulen SimplePOS (enkel POS).
 Module50150Name=POS TakePOS
-Module50150Desc=Point of Sale module TakePOS (touchscreen POS, for shops, bars or restaurants).
+Module50150Desc=Point of Sale-modul TakePOS (POS för pekskärm, för butiker, barer eller restauranger).
 Module50200Name=Paypal
 Module50200Desc=Erbjud kunderna en PayPal-betalningssida för PayPal (PayPal-konto eller kredit- / betalkort). Detta kan användas för att dina kunder ska kunna göra ad hoc-betalningar eller betalningar relaterade till ett specifikt Dolibarr-objekt (faktura, order etc ...)
 Module50300Name=Rand
 Module50300Desc=Erbjud kunderna en Stripe online betalningssida (kredit- / betalkort). Detta kan användas för att dina kunder ska kunna göra ad hoc-betalningar eller betalningar relaterade till ett specifikt Dolibarr-objekt (faktura, order etc ...)
 Module50400Name=Redovisning (dubbel inmatning)
-Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
+Module50400Desc=Redovisningshantering (dubbla poster, stöd General och dotterbolag Ledgers). Exportera huvudboken i flera andra bokföringsprogramformat.
 Module54000Name=PrintIPP
 Module54000Desc=Direktutskrift (utan att öppna dokumenten) med koppar IPP-gränssnitt (skrivaren måste vara synlig från servern och CUPS måste installeras på servern).
 Module55000Name=Omröstning, undersökning eller omröstning
 Module55000Desc=Skapa online-omröstningar, undersökningar eller röster (som Doodle, Studs, RDVz etc ...)
 Module59000Name=Marginaler
-Module59000Desc=Module to follow margins
+Module59000Desc=Modul för att följa marginaler
 Module60000Name=Provision
 Module60000Desc=Modul för att hantera uppdrag
 Module62000Name=Incoterms
@@ -688,7 +689,7 @@ Module63000Name=Resurser
 Module63000Desc=Hantera resurser (skrivare, bilar, rum, ...) för att tilldela händelser
 Permission11=Läs fakturor
 Permission12=Skapa / ändra fakturor
-Permission13=Invalidate customer invoices
+Permission13=Ogiltiga kundfakturor
 Permission14=Bekräfta fakturor
 Permission15=Skicka fakturor via e-post
 Permission16=Skapa betalningar för fakturor
@@ -705,7 +706,7 @@ Permission32=Skapa / modifiera produkter
 Permission34=Ta bort produkter
 Permission36=Se / hantera dold produkter
 Permission38=EXPORTVARA
-Permission39=Ignore minimum price
+Permission39=Ignorera minimipriset
 Permission41=Läs projekt och uppgifter (delat projekt och projekt jag är kontakt för). Kan också ange tidskrävad, för mig eller min hierarki, på tilldelade uppgifter (tidtabell)
 Permission42=Skapa / ändra projekt (delat projekt och projekt jag är kontakt för). Kan också skapa uppgifter och tilldela användare projekt och uppgifter
 Permission44=Ta bort projekt (delat projekt och projekt jag är kontakt för)
@@ -714,9 +715,9 @@ Permission61=Läs insatser
 Permission62=Skapa / ändra inlägg
 Permission64=Ta bort inlägg
 Permission67=Export insatser
-Permission68=Send interventions by email
-Permission69=Validate interventions
-Permission70=Invalidate interventions
+Permission68=Skicka insatser via e-post
+Permission69=Validera ingripanden
+Permission70=Ogiltiga åtgärder
 Permission71=Läs medlemmar
 Permission72=Skapa / modifiera medlemmar
 Permission74=Ta bort medlemmar
@@ -739,7 +740,7 @@ Permission95=Läs rapporter
 Permission101=Läs sendings
 Permission102=Skapa / ändra sendings
 Permission104=Bekräfta leveranser
-Permission105=Send sendings by email
+Permission105=Skicka sändningar via e-post
 Permission106=Exportsend
 Permission109=Ta bort sendings
 Permission111=Läs finansiella räkenskaper
@@ -814,8 +815,8 @@ PermissionAdvanced253=Skapa / ändra interna / externa användare och behörighe
 Permission254=Ta bort eller inaktivera andra användare
 Permission255=Skapa / ändra sin egen användarinformation
 Permission256=Ändra sina egna lösenord
-Permission262=Extend access to all third parties AND their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
-Permission263=Extend access to all third parties WITHOUT their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission262=Utöka åtkomst till alla tredje parter OCH deras objekt (inte bara tredje parter för vilka användaren är en försäljningsrepresentant). <br> Inte effektivt för externa användare (alltid begränsade till sig själva för förslag, beställningar, fakturor, kontrakt etc.). <br> Inte effektivt för projekt (endast regler om projektbehörigheter, synlighet och uppdragsfrågor).
+Permission263=Utöka åtkomst till alla tredje parter UTAN deras objekt (inte bara tredje parter för vilka användaren är en försäljningsrepresentant). <br> Inte effektivt för externa användare (alltid begränsade till sig själva för förslag, beställningar, fakturor, kontrakt etc.). <br> Inte effektivt för projekt (endast regler om projektbehörigheter, synlighet och uppdragsfrågor).
 Permission271=Läs CA
 Permission272=Läs fakturor
 Permission273=Utfärda fakturor
@@ -847,11 +848,11 @@ Permission401=Läs rabatter
 Permission402=Skapa / ändra rabatter
 Permission403=Bekräfta rabatter
 Permission404=Ta bort rabatter
-Permission430=Use Debug Bar
-Permission511=Read payments of salaries (yours and subordinates)
-Permission512=Skapa / ändra lönesättning
-Permission514=Radera löner
-Permission517=Read payments of salaries of everybody
+Permission430=Använd felsökningsfältet
+Permission511=Read salaries and payments (yours and subordinates)
+Permission512=Create/modify salaries and payments
+Permission514=Delete salaries and payments
+Permission517=Read salaries and payments everybody
 Permission519=Export löner
 Permission520=Läs Lån
 Permission522=Skapa / ändra lån
@@ -863,19 +864,19 @@ Permission532=Skapa / modifiera tjänster
 Permission534=Ta bort tjänster
 Permission536=Se / Hantera dolda tjänster
 Permission538=Exportera tjänster
-Permission561=Read payment orders by credit transfer
-Permission562=Create/modify payment order by credit transfer
-Permission563=Send/Transmit payment order by credit transfer
-Permission564=Record Debits/Rejections of credit transfer
-Permission601=Read stickers
-Permission602=Create/modify stickers
-Permission609=Delete stickers
-Permission650=Read Bills of Materials
-Permission651=Create/Update Bills of Materials
-Permission652=Delete Bills of Materials
-Permission660=Read Manufacturing Order (MO)
-Permission661=Create/Update Manufacturing Order (MO)
-Permission662=Delete Manufacturing Order (MO)
+Permission561=Läs betalningsuppdrag via kreditöverföring
+Permission562=Skapa / ändra betalningsorder genom kreditöverföring
+Permission563=Skicka / överför betalningsorder med kreditöverföring
+Permission564=Spela in debiteringar / avslag på kreditöverföring
+Permission601=Läs klistermärken
+Permission602=Skapa / ändra klistermärken
+Permission609=Ta bort klistermärken
+Permission650=Läs Bills of Materials
+Permission651=Skapa / uppdatera materialräkningar
+Permission652=Ta bort materialräkningar
+Permission660=Läs tillverkningsorder (MO)
+Permission661=Skapa / uppdatera tillverkningsorder (MO)
+Permission662=Ta bort tillverkningsorder (MO)
 Permission701=Läs donationer
 Permission702=Skapa / ändra donationer
 Permission703=Ta bort donationer
@@ -885,24 +886,24 @@ Permission773=Radera räkningar
 Permission774=Läs alla utgiftsrapporter (även för användare som inte underordnade)
 Permission775=Godkänn räkningar
 Permission776=Betala räkningar
-Permission777=Read expense reports of everybody
-Permission778=Create/modify expense reports of everybody
+Permission777=Läs alla utgiftsrapporter
+Permission778=Skapa / modifiera utgiftsrapporter för alla
 Permission779=Export räkningar
 Permission1001=Läs lager
 Permission1002=Skapa / ändra lager
 Permission1003=Radera lager
 Permission1004=Läs lager rörelser
 Permission1005=Skapa / ändra lager rörelser
-Permission1101=Read delivery receipts
-Permission1102=Create/modify delivery receipts
-Permission1104=Validate delivery receipts
-Permission1109=Delete delivery receipts
-Permission1121=Read supplier proposals
-Permission1122=Create/modify supplier proposals
-Permission1123=Validate supplier proposals
-Permission1124=Send supplier proposals
-Permission1125=Delete supplier proposals
-Permission1126=Close supplier price requests
+Permission1101=Läs leveranskvitton
+Permission1102=Skapa / modifiera leveranskvitton
+Permission1104=Validera leveranskvitton
+Permission1109=Ta bort leveranskvitton
+Permission1121=Läs leverantörsförslag
+Permission1122=Skapa / modifiera leverantörsförslag
+Permission1123=Validera leverantörsförslag
+Permission1124=Skicka leverantörsförslag
+Permission1125=Ta bort leverantörsförslag
+Permission1126=Stäng förfrågningar om leverantörspris
 Permission1181=Läs leverantörer
 Permission1182=Läs köporder
 Permission1183=Skapa / ändra inköpsorder
@@ -911,9 +912,9 @@ Permission1185=Godkänn köporder
 Permission1186=Beställ beställningsorder
 Permission1187=Bekräfta mottagande av inköpsorder
 Permission1188=Ta bort inköpsorder
-Permission1189=Check/Uncheck a purchase order reception
+Permission1189=Markera / avmarkera en inköpsordermottagning
 Permission1190=Godkänn (andra godkännande) inköpsorder
-Permission1191=Export supplier orders and their attributes
+Permission1191=Exportera leverantörsorder och deras attribut
 Permission1201=Få resultat av en export
 Permission1202=Skapa / ändra en export
 Permission1231=Läs leverantörsfakturor
@@ -927,11 +928,11 @@ Permission1251=Kör massiv import av externa data till databasen (data last)
 Permission1321=Export kundfakturor, attribut och betalningar
 Permission1322=Öppna en betald faktura igen
 Permission1421=Exportera försäljningsorder och attribut
-Permission1521=Read documents
-Permission1522=Delete documents
-Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
-Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
-Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
+Permission1521=Läs dokument
+Permission1522=Ta bort dokument
+Permission2401=Läs åtgärder (händelser eller uppgifter) som är länkade till hans användarkonto (om ägare till händelsen eller just tilldelats till)
+Permission2402=Skapa / modifiera åtgärder (händelser eller uppgifter) länkade till sitt användarkonto (om ägare till händelse)
+Permission2403=Ta bort åtgärder (händelser eller uppgifter) som är länkade till hans användarkonto (om ägaren till händelsen)
 Permission2411=Läs åtgärder (händelser eller uppgifter) andras
 Permission2412=Skapa / ändra åtgärder (händelser eller uppgifter) andras
 Permission2413=Radera åtgärder (händelser eller uppgifter) andras
@@ -942,47 +943,49 @@ Permission2503=Lämna eller ta bort dokument
 Permission2515=Setup dokument kataloger
 Permission2801=Använd FTP-klient i läsläge (bläddra och ladda endast)
 Permission2802=Använd FTP-klient i skrivläge (radera eller ladda upp filer)
-Permission3200=Read archived events and fingerprints
-Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission10001=Read website content
-Permission10002=Create/modify website content (html and javascript content)
-Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
-Permission10005=Delete website content
+Permission3200=Läs arkiverade händelser och fingeravtryck
+Permission3301=Skapa nya moduler
+Permission4001=Se anställda
+Permission4002=Skapa anställda
+Permission4003=Ta bort anställda
+Permission4004=Exportera anställda
+Permission10001=Läs webbplatsens innehåll
+Permission10002=Skapa / ändra webbplatsinnehåll (html- och javaskriptinnehåll)
+Permission10003=Skapa / modifiera webbplatsinnehåll (dynamisk php-kod). Farligt, måste reserveras för begränsade utvecklare.
+Permission10005=Ta bort webbplatsinnehåll
 Permission20001=Läs ledighetsförfrågningar (din ledighet och dina underordnade)
 Permission20002=Skapa / ändra dina förfrågningar (din ledighet och dina underordnade)
 Permission20003=Radera ledighets förfrågningar
 Permission20004=Läs alla lämnar förfrågningar (även om användare inte är underordnade)
 Permission20005=Skapa / ändra ledighetsbegäran för alla (även av användare som inte är underordnade)
 Permission20006=Admins ledighetsansökan (upprätta och uppdatera balanser)
-Permission20007=Approve leave requests
+Permission20007=Godkänn ledighetsförfrågningar
 Permission23001=Läs Planerad jobb
 Permission23002=Skapa / uppdatera Schemalagt jobb
 Permission23003=Radera schemalagt jobb
 Permission23004=Utför schemalagt jobb
-Permission50101=Use Point of Sale (SimplePOS)
-Permission50151=Use Point of Sale (TakePOS)
+Permission50101=Använd försäljningsstället (SimplePOS)
+Permission50151=Använd försäljningsställe (TakePOS)
+Permission50152=Redigera försäljningslinjer
+Permission50153=Redigera beställda försäljningsrader
 Permission50201=Läs transaktioner
 Permission50202=Importera transaktioner
-Permission50330=Read objects of Zapier
-Permission50331=Create/Update objects of Zapier
-Permission50332=Delete objects of Zapier
-Permission50401=Bind products and invoices with accounting accounts
-Permission50411=Read operations in ledger
-Permission50412=Write/Edit operations in ledger
-Permission50414=Delete operations in ledger
-Permission50415=Delete all operations by year and journal in ledger
-Permission50418=Export operations of the ledger
-Permission50420=Report and export reports (turnover, balance, journals, ledger)
-Permission50430=Define fiscal periods. Validate transactions and close fiscal periods.
-Permission50440=Manage chart of accounts, setup of accountancy
-Permission51001=Read assets
-Permission51002=Create/Update assets
-Permission51003=Delete assets
-Permission51005=Setup types of asset
+Permission50330=Läs objekt från Zapier
+Permission50331=Skapa / uppdatera objekt från Zapier
+Permission50332=Ta bort objekt från Zapier
+Permission50401=Binda produkter och fakturor med redovisningskonton
+Permission50411=Läs operationer i storbok
+Permission50412=Skriv / redigera operationer i storbok
+Permission50414=Ta bort operationer i storbok
+Permission50415=Ta bort alla operationer efter år och journal i huvudbok
+Permission50418=Exportbokföringen
+Permission50420=Rapporter och exportrapporter (omsättning, balans, tidskrifter, huvudbok)
+Permission50430=Definiera budgetperioder. Validera transaktioner och stäng räkenskapsperioder.
+Permission50440=Hantera kontoplan, konfiguration av bokföring
+Permission51001=Läs tillgångar
+Permission51002=Skapa / uppdatera tillgångar
+Permission51003=Ta bort tillgångar
+Permission51005=Konfiguration av tillgångstillgångar
 Permission54001=Print
 Permission55001=Läs omröstningar
 Permission55002=Skapa / ändra omröstningar
@@ -993,26 +996,26 @@ Permission63001=Läs resurser
 Permission63002=Skapa / modifiera resurser
 Permission63003=Ta bort resurser
 Permission63004=Länka resurser till agendahändelser
-Permission64001=Allow direct printing
-Permission67000=Allow printing of receipts
-Permission68001=Read intracomm report
-Permission68002=Create/modify intracomm report
-Permission68004=Delete intracomm report
-Permission941601=Read receipts
-Permission941602=Create and modify receipts
-Permission941603=Validate receipts
-Permission941604=Send receipts by email
-Permission941605=Export receipts
-Permission941606=Delete receipts
+Permission64001=Tillåt direktutskrift
+Permission67000=Tillåt utskrift av kvitton
+Permission68001=Läs intracomm-rapporten
+Permission68002=Skapa / ändra intracomm-rapport
+Permission68004=Ta bort intracomm-rapporten
+Permission941601=Läsa kvitton
+Permission941602=Skapa och ändra kvitton
+Permission941603=Validera kvitton
+Permission941604=Skicka kvitton via e-post
+Permission941605=Exportera kvitton
+Permission941606=Ta bort kvitton
 DictionaryCompanyType=Tredjepartstyper
 DictionaryCompanyJuridicalType=Tredjeparts juridiska personer
-DictionaryProspectLevel=Prospect potential level for companies
-DictionaryProspectContactLevel=Prospect potential level for contacts
+DictionaryProspectLevel=Prospekt potentialnivå för företag
+DictionaryProspectContactLevel=Prospekt potentialnivå för kontakter
 DictionaryCanton=Stater / Provinser
 DictionaryRegion=Regioner
 DictionaryCountry=Länder
 DictionaryCurrency=Valutor
-DictionaryCivility=Honorific titles
+DictionaryCivility=Honorific titlar
 DictionaryActions=Typer av agendahändelser
 DictionarySocialContributions=Typer av sociala eller skattemässiga skatter
 DictionaryVAT=Moms Priser och Sales Tax Rates
@@ -1036,15 +1039,16 @@ DictionaryAccountancyJournal=Bokföringsloggbok
 DictionaryEMailTemplates=E-postmallar
 DictionaryUnits=Enheter
 DictionaryMeasuringUnits=Mätningsenheter
-DictionarySocialNetworks=Social Networks
-DictionaryProspectStatus=Prospect status for companies
-DictionaryProspectContactStatus=Prospect status for contacts
-DictionaryHolidayTypes=Typer av ledighet
+DictionarySocialNetworks=Sociala nätverk
+DictionaryProspectStatus=Prospektstatus för företag
+DictionaryProspectContactStatus=Prospektstatus för kontakter
+DictionaryHolidayTypes=Ledighet - Typer av ledighet
 DictionaryOpportunityStatus=Ledningsstatus för projekt / ledning
 DictionaryExpenseTaxCat=Kostnadsrapport - Transportkategorier
 DictionaryExpenseTaxRange=Kostnadsrapport - Räckvidd per transportkategori
-DictionaryTransportMode=Intracomm report - Transport mode
-TypeOfUnit=Type of unit
+DictionaryTransportMode=Intracomm-rapport - Transportläge
+DictionaryBatchStatus=Produktparti / seriell kvalitetskontrollstatus
+TypeOfUnit=Typ av enhet
 SetupSaved=Inställningarna sparas
 SetupNotSaved=Inställningen är inte sparad
 BackToModuleList=Tillbaka till modullista
@@ -1056,7 +1060,7 @@ VATIsNotUsedDesc=Den föreslagna försäljningsskatten är som standard 0 som ka
 VATIsUsedExampleFR=I Frankrike betyder det att företag eller organisationer har ett riktigt finanssystem (förenklad verklig eller normal verklig). Ett system där momsen deklareras.
 VATIsNotUsedExampleFR=I Frankrike betyder det föreningar som inte är Försäljningsskatt deklarerade eller företag, organisationer eller liberala yrken som har valt mikroföretagets skattesystem (Försäljningsskatt i franchise) och betalat en franchise Försäkringsskatt utan någon momsdeklaration. Detta val kommer att visa referensen "Ej tillämplig Försäljningsskatt - art-293B av CGI" på fakturor.
 ##### Local Taxes #####
-TypeOfSaleTaxes=Type of sales tax
+TypeOfSaleTaxes=Typ av moms
 LTRate=Betyg
 LocalTax1IsNotUsed=Använd inte andra skatte
 LocalTax1IsUsedDesc=Använd en andra typ av skatt (annan än den första)
@@ -1080,9 +1084,9 @@ LocalTax2IsUsedDescES=IRPF-räntan som standard när du skapar prospekt, fakturo
 LocalTax2IsNotUsedDescES=Som standard föreslås IRPF är 0. Slut på regeln.
 LocalTax2IsUsedExampleES=I Spanien, frilansare och oberoende yrkesutövare som tillhandahåller tjänster och företag som har valt skattesystemet i moduler.
 LocalTax2IsNotUsedExampleES=I Spanien är de företag som inte omfattas av skattesystem för moduler.
-RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
-UseRevenueStamp=Use a tax stamp
-UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
+RevenueStampDesc="Skattstämpel" eller "inkomststämpel" är en fast skatt du per faktura (Det beror inte på fakturabeloppet). Det kan också vara en procentskatt men att använda den andra eller tredje typen av skatt är bättre för procentskatt eftersom skattefrimärken inte ger någon rapportering. Endast få länder använder denna typ av skatt.
+UseRevenueStamp=Använd en skattestämpel
+UseRevenueStampExample=Skattstämpelns värde definieras som standard i inställningen av ordböcker (%s - %s - %s)
 CalcLocaltax=Rapporter om lokala skatter
 CalcLocaltax1=Försäljning - Inköp
 CalcLocaltax1Desc=Lokala skatter rapporter beräknas med skillnaden mellan localtaxes försäljning och localtaxes inköp
@@ -1090,12 +1094,12 @@ CalcLocaltax2=Inköp
 CalcLocaltax2Desc=Lokala skatter rapporter är summan av localtaxes inköp
 CalcLocaltax3=Försäljning
 CalcLocaltax3Desc=Lokala skatter rapporter är summan av localtaxes försäljning
-NoLocalTaxXForThisCountry=According to the setup of taxes (See %s - %s - %s), your country does not need to use such type of tax
+NoLocalTaxXForThisCountry=Enligt skatteupplägget (se %s - %s - %s) behöver ditt land inte använda en sådan typ av skatt
 LabelUsedByDefault=Etikett som används som standard om ingen översättning kan hittas för kod
 LabelOnDocuments=Etikett på dokument
 LabelOrTranslationKey=Etikett eller översättningstangent
-ValueOfConstantKey=Value of a configuration constant
-ConstantIsOn=Option %s is on
+ValueOfConstantKey=Värdet på en konfigurationskonstant
+ConstantIsOn=Alternativ %s är på
 NbOfDays=Antal dagar
 AtEndOfMonth=I slutet av månaden
 CurrentNext=Current / Next
@@ -1140,8 +1144,8 @@ LoginPage=Login sida
 BackgroundImageLogin=Bakgrundsbild
 PermanentLeftSearchForm=Permanent sökformuläret på menyn till vänster
 DefaultLanguage=Standardspråk
-EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
-EnableShowLogo=Show the company logo in the menu
+EnableMultilangInterface=Aktivera flerspråkig support för kund- eller leverantörsrelationer
+EnableShowLogo=Visa företagslogotypen i menyn
 CompanyInfo=Företag / Organisation
 CompanyIds=Företag / Organisationsidentiteter
 CompanyName=Namn
@@ -1151,16 +1155,16 @@ CompanyTown=Staden
 CompanyCountry=Land
 CompanyCurrency=Viktigaste valuta
 CompanyObject=Föremålet för bolagets verksamhet
-IDCountry=ID country
+IDCountry=ID-land
 Logo=Logo
-LogoDesc=Main logo of company. Will be used into generated documents (PDF, ...)
-LogoSquarred=Logo (squarred)
-LogoSquarredDesc=Must be a squarred icon (width = height). This logo will be used as the favorite icon or other need like for the top menu bar (if not disabled into display setup).
+LogoDesc=Huvudlogotyp för företaget. Kommer att användas i genererade dokument (PDF, ...)
+LogoSquarred=Logotyp (kvadrat)
+LogoSquarredDesc=Måste vara en fyrkantig ikon (bredd = höjd). Den här logotypen kommer att användas som favoritikon eller annat behov som för den övre menyraden (om den inte är inaktiverad i skärmkonfigurationen).
 DoNotSuggestPaymentMode=Pekar inte
 NoActiveBankAccountDefined=Inga aktiva bankkonto definierade
 OwnerOfBankAccount=Ägare till %s bankkonto
 BankModuleNotActive=Bankkonton modulen inte aktiverad
-ShowBugTrackLink=Define the link "<strong>%s</strong>" (empty to not display this link, 'github' for the link to the Dolibarr project or define directly an url 'https://...')
+ShowBugTrackLink=Definiera länken "<strong> %s </strong>" (tom för att inte visa den här länken, 'github' för länken till Dolibarr-projektet eller definiera direkt en webbadress 'https: // ...')
 Alerts=Varningar
 DelaysOfToleranceBeforeWarning=Fördröjning innan du visar en varningsvarsel för:
 DelaysOfToleranceDesc=Ställ in fördröjningen innan en varningsikon %s visas på skärmen för det sena elementet.
@@ -1179,15 +1183,15 @@ Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Väntar på bankavstämning
 Delays_MAIN_DELAY_MEMBERS=Försenad medlemsavgift
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Kontrollera insättning inte gjort
 Delays_MAIN_DELAY_EXPENSEREPORTS=Utläggsrapport att godkänna
-Delays_MAIN_DELAY_HOLIDAYS=Leave requests to approve
+Delays_MAIN_DELAY_HOLIDAYS=Lämna begäranden att godkänna
 SetupDescription1=Innan du börjar använda Dolibarr måste vissa initialparametrar definieras och moduler aktiveras / konfigureras.
 SetupDescription2=Följande två avsnitt är obligatoriska (de två första inmatningarna i inställningsmenyn):
-SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
-SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
+SetupDescription3= <a href="%s"> %s -> %s </a> <br> <br> Grundläggande parametrar som används för att anpassa standardbeteendet för din applikation (t.ex. för landsrelaterade funktioner).
+SetupDescription4= <a href="%s"> %s -> %s </a> <br> <br> Denna programvara är en serie med många moduler / applikationer. Modulerna relaterade till dina behov måste vara aktiverade och konfigurerade. Menyposter visas med aktiveringen av dessa moduler.
 SetupDescription5=Andra inställningsmenyposter hanterar valfria parametrar.
-AuditedSecurityEvents=Security events that are audited
-NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
-Audit=Revision
+AuditedSecurityEvents=Säkerhetshändelser som granskas
+NoSecurityEventsAreAduited=Inga säkerhetshändelser granskas. Du kan aktivera dem från meny %s
+Audit=Security events
 InfoDolibarr=Om Dolibarr
 InfoBrowser=Om Browser
 InfoOS=Om OS
@@ -1195,7 +1199,7 @@ InfoWebServer=Om webbserver
 InfoDatabase=Om databasen
 InfoPHP=Om PHP
 InfoPerf=Om föreställningar
-InfoSecurity=About Security
+InfoSecurity=Om säkerhet
 BrowserName=Browser namn
 BrowserOS=Browser OS
 ListOfSecurityEvents=Förteckning över Dolibarr säkerhetshändelser
@@ -1204,9 +1208,9 @@ LogEventDesc=Aktivera loggning för specifika säkerhetshändelser. Administrat
 AreaForAdminOnly=Inställningsparametrar kan ställas in av <b> endast administratörs användare </b>.
 SystemInfoDesc=System information diverse teknisk information får du i skrivskyddad läge och synlig för administratörer bara.
 SystemAreaForAdminOnly=Det här området är endast tillgängligt för administratörsanvändare. Dolibarr användarbehörigheter kan inte ändra denna begränsning.
-CompanyFundationDesc=Edit the information of your company/organization. Click on "%s" button at the bottom of the page when done.
-AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
-AccountantFileNumber=Accountant code
+CompanyFundationDesc=Redigera informationen för ditt företag / din organisation. Klicka på knappen "%s" längst ner på sidan när du är klar.
+AccountantDesc=Om du har en extern revisor / bokförare kan du redigera informationen här.
+AccountantFileNumber=Bokföringskod
 DisplayDesc=Parametrar som påverkar utseende och beteende hos Dolibarr kan ändras här.
 AvailableModules=Tillgängliga app / moduler
 ToActivateModule=För att aktivera moduler, gå på Setup-menyn (Hem-> Inställningar-> Modules).
@@ -1221,7 +1225,7 @@ TriggerAlwaysActive=Triggers i denna fil är alltid aktiva, oavsett är det akti
 TriggerActiveAsModuleActive=Triggers i denna fil är verksamma som modul <b>%s</b> är aktiverat.
 GeneratedPasswordDesc=Välj den metod som ska användas för automatiskt genererade lösenord.
 DictionaryDesc=Sätt in alla referensdata. Du kan lägga till dina värden till standardvärdet.
-ConstDesc=This page allows you to edit (override) parameters not available in other pages. These are mostly reserved parameters for developers/advanced troubleshooting only.
+ConstDesc=Denna sida låter dig redigera (åsidosätta) parametrar som inte är tillgängliga på andra sidor. Dessa är oftast reserverade parametrar för utvecklare / avancerad felsökning.
 MiscellaneousDesc=Alla andra säkerhetsrelaterade parametrar definieras här.
 LimitsSetup=Gränser / Precision inställning
 LimitsDesc=Du kan definiera gränser, precisioner och optimeringar som används av Dolibarr här
@@ -1236,7 +1240,7 @@ NoEventOrNoAuditSetup=Ingen säkerhetshändelse har loggats. Detta är normalt o
 NoEventFoundWithCriteria=Inga säkerhetshändelser har hittats för dessa sökkriterier.
 SeeLocalSendMailSetup=Se din lokala sendmail inställning
 BackupDesc=En <b> komplett </b> backup av en Dolibarr-installation kräver två steg.
-BackupDesc2=Backup the contents of the "documents" directory (<b>%s</b>) containing all uploaded and generated files. This will also include all the dump files generated in Step 1. This operation may last several minutes.
+BackupDesc2=Säkerhetskopiera innehållet i katalogen "dokument" (<b> %s </b>) som innehåller alla uppladdade och genererade filer. Detta inkluderar också alla dumpfiler som genererades i steg 1. Den här åtgärden kan ta flera minuter.
 BackupDesc3=Säkerhetskopiera strukturen och innehållet i din databas (<b> %s </b>) till en dumpfil. För detta kan du använda följande assistent.
 BackupDescX=Den arkiverade katalogen ska lagras på ett säkert ställe.
 BackupDescY=Den genererade dumpfilen bör förvaras på ett säkert ställe.
@@ -1246,16 +1250,16 @@ RestoreDesc2=Återställ säkerhetskopieringsfilen (t.ex. zip-filen) i katalogen
 RestoreDesc3=Återställ databasstrukturen och data från en säkerhetskopieringsdumpfil till databasen för den nya Dolibarr-installationen eller i databasen för den aktuella installationen (<b> %s </b>). Varning, när återställningen är klar måste du använda ett inloggnings / lösenord som existerade från backuptid / installation för att ansluta igen. <br> För att återställa en backup-databas till den här nuvarande installationen kan du följa den här assistenten.
 RestoreMySQL=MySQL import
 ForcedToByAModule=Denna regel tvingas <b>%s</b> av en aktiverad modul
-ValueIsForcedBySystem=This value is forced by the system. You can't change it.
+ValueIsForcedBySystem=Detta värde tvingas av systemet. Du kan inte ändra det.
 PreviousDumpFiles=Befintliga säkerhetskopieringsfiler
-PreviousArchiveFiles=Existing archive files
+PreviousArchiveFiles=Befintliga arkivfiler
 WeekStartOnDay=Första dagen i veckan
 RunningUpdateProcessMayBeRequired=Att köra uppgraderingsprocessen verkar vara nödvändigt (Programversion %s skiljer sig från databasversionen %s)
 YouMustRunCommandFromCommandLineAfterLoginToUser=Du måste köra det här kommandot från kommandoraden efter login till ett skal med användare <b>%s.</b>
 YourPHPDoesNotHaveSSLSupport=SSL-funktioner inte är tillgängliga i din PHP
 DownloadMoreSkins=Mer skinn att ladda ner
-SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
-SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
+SimpleNumRefModelDesc=Returnerar referensnumret i formatet %syymm-nnnn där yy är året, mm är månaden och nnnn är ett sekventiellt automatiskt ökande nummer utan återställning
+SimpleNumRefNoDateModelDesc=Returnerar referensnumret i formatet %s-nnnn där nnnn är ett sekventiellt automatiskt inkrementeringsnummer utan återställning
 ShowProfIdInAddress=Visa professionellt id med adresser
 ShowVATIntaInAddress=Dölj momsnumret inom gemenskapen med adresser
 TranslationUncomplete=Partiell översättning
@@ -1273,7 +1277,7 @@ MAIN_PROXY_HOST=Proxyserver: Namn / Adress
 MAIN_PROXY_PORT=Proxyserver: Port
 MAIN_PROXY_USER=Proxyserver: Logga in / Användare
 MAIN_PROXY_PASS=Proxyserver: Lösenord
-DefineHereComplementaryAttributes=Define any additional / custom attributes that must be added to: %s
+DefineHereComplementaryAttributes=Definiera ytterligare / anpassade attribut som måste läggas till: %s
 ExtraFields=Komplementära egenskaper
 ExtraFieldsLines=Kompletterande attribut (rader)
 ExtraFieldsLinesRec=Kompletterande attribut (mallar fakturor linjer)
@@ -1289,7 +1293,7 @@ ExtraFieldsSupplierOrders=Kompletterande attribut (beslut)
 ExtraFieldsSupplierInvoices=Kompletterande attribut (fakturor)
 ExtraFieldsProject=Kompletterande attribut (projekt)
 ExtraFieldsProjectTask=Kompletterande attribut (arbetsuppgifter)
-ExtraFieldsSalaries=Complementary attributes (salaries)
+ExtraFieldsSalaries=Kompletterande attribut (löner)
 ExtraFieldHasWrongValue=Attribut% s har ett felaktigt värde.
 AlphaNumOnlyLowerCharsAndNoSpace=endast gemena alfanumeriska tecken utan mellanslag
 SendmailOptionNotComplete=Varning, på vissa Linux-system, för att skicka e-post från e-post, sendmail utförande inställning måste conatins Alternativ-ba (parameter mail.force_extra_parameters i din php.ini-fil). Om vissa mottagare inte emot e-post, försök att redigera den här PHP parameter med mail.force_extra_parameters =-BA).
@@ -1308,8 +1312,8 @@ WarningAtLeastKeyOrTranslationRequired=En sökkriterium krävs åtminstone för
 NewTranslationStringToShow=Ny översättningssträng att visa
 OriginalValueWas=Den ursprungliga översättningen överskridits. Ursprungligt värde var: <br> <br> %s
 TransKeyWithoutOriginalValue=Du tvingade en ny översättning till översättningsnyckeln '<strong> %s </strong>' som inte finns i några språkfiler
-TitleNumberOfActivatedModules=Activated modules
-TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
+TitleNumberOfActivatedModules=Aktiverade moduler
+TotalNumberOfActivatedModules=Aktiverade moduler: <b> %s </b> / <b> %s </b>
 YouMustEnableOneModule=Minst 1 modul måste aktiveras
 ClassNotFoundIntoPathWarning=Klass %s hittades inte i PHP-sökvägen
 YesInSummer=Ja, under sommaren
@@ -1318,25 +1322,28 @@ SuhosinSessionEncrypt=Session lagring krypteras av Suhosin
 ConditionIsCurrently=Condition är för närvarande% s
 YouUseBestDriver=Du använder drivrutinen %s vilket är den bästa drivrutinen som för närvarande finns tillgänglig.
 YouDoNotUseBestDriver=Du använder drivrutinen %s men drivrutinen %s rekommenderas.
-NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
+NbOfObjectIsLowerThanNoPb=Du har bara %s %s i databasen. Detta kräver ingen speciell optimering.
+ComboListOptim=Combo list loading optimization
 SearchOptim=Sökoptimering
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
-YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
+YouHaveXObjectUseComboOptim=You have %s %s in the database. You can go into setup of module to enable loading of combo list on key pressed event.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other.
+YouHaveXObjectUseSearchOptimDesc=This limits the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to %s in Home-Setup-Other.
 BrowserIsOK=Du använder %s webbläsaren. Den här webbläsaren är ok för säkerhet och prestanda.
 BrowserIsKO=Du använder %s webbläsaren. Den här webbläsaren är känd för att vara ett dåligt val för säkerhet, prestanda och tillförlitlighet. Vi rekommenderar att du använder Firefox, Chrome, Opera eller Safari.
-PHPModuleLoaded=PHP component %s is loaded
-PreloadOPCode=Preloaded OPCode is used
+PHPModuleLoaded=PHP-komponenten %s är laddad
+PreloadOPCode=Förinstallerad OPCode används
 AddRefInList=Visa kund / leverantör ref. info lista (välj lista eller combobox) och de flesta av hyperlänken. <br> Tredje part kommer att visas med ett namnformat av "CC12345 - SC45678 - The Big Company corp." istället för "The Big Company Corp".
 AddAdressInList=Visa adresslista för kund / leverantörs adress (välj lista eller combobox) <br> Tredje parten kommer att visas med ett namnformat för "The Big Company Corp." - 21 Jump Street 123456 Big Town - USA "istället för" The Big Company Corp ".
-AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
+AddEmailPhoneTownInContactList=Visa kontakt-e-post (eller telefoner om det inte är definierat) och stadsinfo-lista (välj lista eller kombinationsruta) <br> Kontakter visas med namnformatet "Dupond Durand - dupond.durand@email.com - Paris" eller "Dupond Durand - 06 07 59 65 66 - Paris "istället för" Dupond Durand ".
 AskForPreferredShippingMethod=Be om föredragen leveransmetod för tredje parter.
 FieldEdition=Edition av fält %s
 FillThisOnlyIfRequired=Exempel: +2 (fyll endast om tidszon offset problem är erfarna)
 GetBarCode=Få streckkod
-NumberingModules=Numbering models
-DocumentModules=Document models
+NumberingModules=Numreringsmodeller
+DocumentModules=Dokumentmodeller
 ##### Module password generation
-PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
+PasswordGenerationStandard=Returnera ett lösenord som genererats enligt intern Dolibarr-algoritm: %s tecken som innehåller delade nummer och tecken i gemener.
 PasswordGenerationNone=Föreslå inte ett genererat lösenord. Lösenordet måste skrivas in manuellt.
 PasswordGenerationPerso=Returnera ett lösenord enligt din personligt definierade konfiguration.
 SetupPerso=Enligt din konfiguration
@@ -1346,9 +1353,9 @@ RuleForGeneratedPasswords=Regler för att generera och bekräfta lösenord
 DisableForgetPasswordLinkOnLogonPage=Visa inte länken "Glömt lösenord" på sidan Inloggning
 UsersSetup=Användare modul inställning
 UserMailRequired=E-post krävs för att skapa en ny användare
-UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
-UsersDocModules=Document templates for documents generated from user record
-GroupsDocModules=Document templates for documents generated from a group record
+UserHideInactive=Dölj inaktiva användare från alla kombinationslistor över användare (rekommenderas inte: detta kan innebära att du inte kan filtrera eller söka efter gamla användare på vissa sidor)
+UsersDocModules=Dokumentmallar för dokument som genereras från användarposten
+GroupsDocModules=Dokumentmallar för dokument som genereras från en grupppost
 ##### HRM setup #####
 HRMSetup=Inställning av HRM-modulen
 ##### Company setup #####
@@ -1380,7 +1387,7 @@ BillsPDFModules=Faktura dokument modeller
 BillsPDFModulesAccordindToInvoiceType=Faktura dokumentmodeller enligt fakturatyp
 PaymentsPDFModules=Betalningsdokumentmodeller
 ForceInvoiceDate=Force fakturadatum till giltighetsdatum
-SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined on the invoice
+SuggestedPaymentModesIfNotDefinedInInvoice=Föreslaget betalningsläge på faktura som standard om det inte definieras på fakturan
 SuggestPaymentByRIBOnAccount=Föreslå betalning genom uttag på konto
 SuggestPaymentByChequeToAddress=Föreslå betalning med check till
 FreeLegalTextOnInvoices=Fri text på fakturor
@@ -1392,7 +1399,7 @@ SupplierPaymentSetup=Inställningar för leverantörsbetalningar
 PropalSetup=Kommersiella förslag modul inställning
 ProposalsNumberingModules=Kommersiella förslag numrering moduler
 ProposalsPDFModules=Kommersiella förslag dokument modeller
-SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined on the proposal
+SuggestedPaymentModesIfNotDefinedInProposal=Föreslaget betalningsläge på förslag som standard om det inte definieras i förslaget
 FreeLegalTextOnProposal=Fri text på affärsförslag
 WatermarkOnDraftProposal=Vattenstämpel på utkast till affärsförslag (ingen om tom)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Be om bankkonto destination förslag
@@ -1407,7 +1414,7 @@ WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Be om lagerkälla för order
 ##### Suppliers Orders #####
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Be om kontokortdestination för inköpsorder
 ##### Orders #####
-SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sale order by default if not defined on the order
+SuggestedPaymentModesIfNotDefinedInOrder=Föreslaget betalningsläge på försäljningsorder som standard om det inte definieras i ordern
 OrdersSetup=Försäljningsorderhanteringsinställningar
 OrdersNumberingModules=Beställningar numrering moduler
 OrdersModelModule=Beställ dokument modeller
@@ -1433,9 +1440,10 @@ MemberMainOptions=Huvudalternativ
 AdherentLoginRequired= Hantera en inloggning för varje medlem
 AdherentMailRequired=E-post krävs för att skapa en ny medlem
 MemberSendInformationByMailByDefault=Kryssruta för att skicka e-post bekräftelse till medlemmar (bekräftande eller nya abonnemang) är aktiverat som standard
+MemberCreateAnExternalUserForSubscriptionValidated=Skapa en extern användarinloggning för varje validerad ny medlemsprenumeration
 VisitorCanChooseItsPaymentMode=Besökare kan välja mellan tillgängliga betalningssätt
 MEMBER_REMINDER_EMAIL=Aktivera automatisk påminnelse <b> via e-post </b> av utgått prenumerationer. Obs! Modul <strong> %s </strong> måste vara aktiverad och korrekt inställd för att skicka påminnelser.
-MembersDocModules=Document templates for documents generated from member record
+MembersDocModules=Dokumentmallar för dokument som genereras från medlemsposten
 ##### LDAP setup #####
 LDAPSetup=LDAP-inställningar
 LDAPGlobalParameters=Globala parametrar
@@ -1517,7 +1525,7 @@ LDAPFieldLoginUnix=Logga in (unix)
 LDAPFieldLoginExample=Exempel: uid
 LDAPFilterConnection=Sökfilter
 LDAPFilterConnectionExample=Exempel: & (objectClass = inetOrgPerson)
-LDAPGroupFilterExample=Example: &(objectClass=groupOfUsers)
+LDAPGroupFilterExample=Exempel: & (objectClass = groupOfUsers)
 LDAPFieldLoginSamba=Logga in (samba, ActiveDirectory)
 LDAPFieldLoginSambaExample=Exempel: Samaccountname
 LDAPFieldFullname=Förnamn Namn
@@ -1561,13 +1569,13 @@ LDAPFieldSidExample=Exempel: objektsidan
 LDAPFieldEndLastSubscription=Datum för teckning slut
 LDAPFieldTitle=Befattning
 LDAPFieldTitleExample=Exempel: titel
-LDAPFieldGroupid=Group id
-LDAPFieldGroupidExample=Exemple : gidnumber
-LDAPFieldUserid=User id
-LDAPFieldUseridExample=Exemple : uidnumber
-LDAPFieldHomedirectory=Home directory
-LDAPFieldHomedirectoryExample=Exemple : homedirectory
-LDAPFieldHomedirectoryprefix=Home directory prefix
+LDAPFieldGroupid=Grupp-id
+LDAPFieldGroupidExample=Exempel: gidnummer
+LDAPFieldUserid=Användar ID
+LDAPFieldUseridExample=Exempel: uidnummer
+LDAPFieldHomedirectory=Hemkatalog
+LDAPFieldHomedirectoryExample=Exempel: hemkatalog
+LDAPFieldHomedirectoryprefix=Hemkatalogprefix
 LDAPSetupNotComplete=LDAP inställning komplett inte (gå på andra flikar)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Ingen administratör eller lösenord anges. LDAP tillgång kommer att bli anonym och i skrivskyddat läge.
 LDAPDescContact=På denna sida kan du ange LDAP-attribut namn i LDAP träd för varje data finns på Dolibarr kontakter.
@@ -1579,9 +1587,9 @@ LDAPDescValues=Exempel på värden är avsedda för <b>OpenLDAP</b> med följand
 ForANonAnonymousAccess=För en bestyrkt tillbehör (för en skrivåtkomst till exempel)
 PerfDolibarr=Prestanda inställningar / optimering rapport
 YouMayFindPerfAdviceHere=Denna sida ger några kontroller eller råd relaterade till prestanda.
-NotInstalled=Not installed.
-NotSlowedDownByThis=Not slowed down by this.
-NotRiskOfLeakWithThis=Not risk of leak with this.
+NotInstalled=Inte installerad.
+NotSlowedDownByThis=Saktar inte ner av detta.
+NotRiskOfLeakWithThis=Ingen risk för läckage med detta.
 ApplicativeCache=Applikativ cache
 MemcachedNotAvailable=Ingen applikativ cache hittades. Du kan förbättra prestanda genom att installera en cache-server Memcached och en modul kunna använda denna cache-server. <br> Mer information här <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a> . <br> Observera att en hel del webbhotell leverantör inte lämnar sådana cache-server.
 MemcachedModuleAvailableButNotSetup=Modul memcached för applikativ cache hittades men installationen av modulen är inte fullständig.
@@ -1611,13 +1619,13 @@ ServiceSetup=Tjänster modul konfiguration
 ProductServiceSetup=Produkter och tjänster moduler inställning
 NumberOfProductShowInSelect=Maximalt antal produkter som ska visas i kombinationsvallista (0 = ingen gräns)
 ViewProductDescInFormAbility=Visa produktbeskrivningar i formulär (visas annars i en verktygstips)
-DoNotAddProductDescAtAddLines=Do not add product description (from product card) on submit add lines on forms
-OnProductSelectAddProductDesc=How to use the description of the products when adding a product as a line of a document
-AutoFillFormFieldBeforeSubmit=Auto fill the description input field with the description of product
-DoNotAutofillButAutoConcat=Do not autofill the input field with description of product. Description of the product will be concatenated to the entered description automatically.
-DoNotUseDescriptionOfProdut=Description of the product will never be included into the description of lines of documents
+DoNotAddProductDescAtAddLines=Lägg inte till produktbeskrivning (från produktkortet) på skicka tilläggsrader på formulär
+OnProductSelectAddProductDesc=Hur man använder beskrivningen av produkterna när man lägger till en produkt som en rad i ett dokument
+AutoFillFormFieldBeforeSubmit=Fyll automatiskt inmatningsfältet med beskrivningen av produkten
+DoNotAutofillButAutoConcat=Fyll inte in inmatningsfältet med produktbeskrivning. Produktbeskrivningen sammanfogas automatiskt till den angivna beskrivningen.
+DoNotUseDescriptionOfProdut=Produktbeskrivning kommer aldrig att ingå i beskrivningen av dokumentrader
 MergePropalProductCard=Aktivera i produkt / tjänst Bifogade fliken Filer en möjlighet att slå samman produkt PDF-dokument till förslag PDF azur om produkten / tjänsten är på förslaget
-ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
+ViewProductDescInThirdpartyLanguageAbility=Visa produktbeskrivningar i formulär på tredje parts språk (annars på användarens språk)
 UseSearchToSelectProductTooltip=Även om du har ett stort antal produkter (> 100 000) kan du öka hastigheten genom att ställa in konstant PRODUCT_DONOTSEARCH_ANYWHERE till 1 i Setup-> Other. Sökningen begränsas sedan till början av strängen.
 UseSearchToSelectProduct=Vänta tills du trycker på en knapp innan du laddar innehållet i produktkombinationslistan (Detta kan öka prestanda om du har ett stort antal produkter, men det är mindre bekvämt)
 SetDefaultBarcodeTypeProducts=Standard streckkod som ska användas för produkter
@@ -1634,9 +1642,9 @@ SyslogLevel=Nivå
 SyslogFilename=Filnamn och sökväg
 YouCanUseDOL_DATA_ROOT=Du kan använda DOL_DATA_ROOT / dolibarr.log för en loggfil i Dolibarr &quot;dokument&quot; katalogen. Du kan ställa in en annan väg för att lagra den här filen.
 ErrorUnknownSyslogConstant=Konstant %s är inte en känd syslog konstant
-OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
+OnlyWindowsLOG_USER=På Windows stöds endast LOG_USER-anläggningen
 CompressSyslogs=Komprimering och säkerhetskopiering av felsökningsloggfiler (genererad av modulen Logga för felsökning)
-SyslogFileNumberOfSaves=Number of backup logs to keep
+SyslogFileNumberOfSaves=Antal reservloggar som ska sparas
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Konfigurera rengöring schemalagt jobb för att ställa in log backupfrekvens
 ##### Donations #####
 DonationsSetup=Donation modul inställning
@@ -1692,24 +1700,24 @@ AdvancedEditor=Avancerad redaktör
 ActivateFCKeditor=Aktivera FCKeditor för:
 FCKeditorForCompany=WYSIWYG skapande / upplaga av Companie beskrivning och notera
 FCKeditorForProduct=WYSIWYG skapande / upplaga av produkter / tjänster: s beskrivning och anteckning
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
+FCKeditorForProductDetails=WYSIWIG skapande / utgåva av produktdetaljer för alla enheter (förslag, order, fakturor, etc ...). <span class="warning"> Varning: Att använda det här alternativet i det här fallet rekommenderas på allvar inte eftersom det kan skapa problem med specialtecken och sidformatering när du bygger PDF-filer. </span>
 FCKeditorForMailing= WYSIWYG skapande / utgåva av försändelser
 FCKeditorForUserSignature=WYSIWYG skapande / upplaga av signatur
 FCKeditorForMail=WYSIWIG skapande / utgåva för all mail (utom Verktygs-> eMailing)
-FCKeditorForTicket=WYSIWIG creation/edition for tickets
+FCKeditorForTicket=WYSIWIG skapande / upplaga för biljetter
 ##### Stock #####
 StockSetup=Inställning av lagermodul
 IfYouUsePointOfSaleCheckModule=Om du använder modulen Point of Sale (POS) som standard eller en extern modul, kan denna inställning ignoreras av din POS-modul. De flesta POS-moduler är utformade som standard för att skapa en faktura omedelbart och minska lageret oberoende av alternativen här. Så om du behöver eller inte har en lagerminskning när du registrerar en försäljning från din POS, kolla även din POS-moduluppsättning.
 ##### Menu #####
 MenuDeleted=Meny utgår
-Menu=Menu
+Menu=Meny
 Menus=Menyer
 TreeMenuPersonalized=Personliga menyer
 NotTopTreeMenuPersonalized=Personliga menyer som inte är kopplade till en toppmenyinmatning
 NewMenu=Ny meny
 MenuHandler=Meny handler
 MenuModule=Källa modul
-HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
+HideUnauthorizedMenu=Dölj obehöriga menyer även för interna användare (bara gråtonad annars)
 DetailId=Id-menyn
 DetailMenuHandler=Meny hanterare där för att visa nya menyn
 DetailMenuModule=Modulnamn om menyalternativet kommer från en modul
@@ -1749,26 +1757,26 @@ YourCompanyDoesNotUseVAT=Ditt företag har definierats för att inte använda mo
 AccountancyCode=Redovisningskod
 AccountancyCodeSell=Försäljning konto. kod
 AccountancyCodeBuy=Köpa konto. kod
-CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Keep the checkbox “Automatically create the payment” empty by default when creating a new tax
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Håll kryssrutan "Skapa automatiskt betalningen" tom som standard när du skapar en ny skatt
 ##### Agenda #####
 AgendaSetup=Åtgärder och dagordning modul inställning
 PasswordTogetVCalExport=Viktiga att tillåta export länk
-SecurityKey = Security Key
+SecurityKey = Säkerhetsnyckel
 PastDelayVCalExport=Inte exporterar fall äldre än
 AGENDA_USE_EVENT_TYPE=Använd händelsetyper (hanteras i menyn Inställningar -> Ordböcker -> Typ av kalenderhändelser)
 AGENDA_USE_EVENT_TYPE_DEFAULT=Ställ in det här standardvärdet för typ av händelse automatiskt i händelse skapa formulär
 AGENDA_DEFAULT_FILTER_TYPE=Ställ in denna typ av händelse automatiskt i sökfiltret i kalendervy
 AGENDA_DEFAULT_FILTER_STATUS=Ställ in denna status automatiskt för händelser i sökfilter i dagordning
-AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
-AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
+AGENDA_DEFAULT_VIEW=Vilken vy vill du öppna som standard när du väljer menyn Agenda
+AGENDA_REMINDER_BROWSER=Aktivera händelsepåminnelse <b> i användarens webbläsare </b> (När påminnelsedatum har uppnåtts visas en popup i webbläsaren. Varje användare kan inaktivera sådana aviseringar från sin webbläsarinställning).
 AGENDA_REMINDER_BROWSER_SOUND=Aktivera ljudanmälan
-AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
-AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
+AGENDA_REMINDER_EMAIL=Aktivera händelsepåminnelse <b> via e-post </b> (påminnelsealternativ / fördröjning kan definieras för varje händelse).
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the scheduled job %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Visa länkat objekt i agendan
 ##### Clicktodial #####
 ClickToDialSetup=Klicka för att Dial modul inställning
 ClickToDialUrlDesc=Url ringde när ett klick på telefon picto är gjort. I URL kan du använda taggar <br> <b> __PHONETO__ </b> som kommer att ersättas med telefonnumret person att ringa <br> <b> __PHONEFROM__ </b> som kommer att ersättas med telefonnummer att ringa person (er) <br> <b> __LOGIN__ </b> som kommer att ersättas med clicktodial inloggning (definierad på användarkort) <br> <b> __PASS__ </b> som kommer att ersättas med clicktodial lösenord (definierat på användarkort).
-ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
+ClickToDialDesc=Denna modul ändrar telefonnummer när du använder en stationär dator till klickbara länkar. Ett klick ringer upp numret. Detta kan användas för att starta telefonsamtalet när du använder en mjuk telefon på skrivbordet eller när du t.ex. använder ett CTI-system baserat på SIP-protokoll. Obs! När du använder en smartphone är telefonnummer alltid klickbara.
 ClickToDialUseTelLink=Använd bara en länk "tel:" på telefonnummer
 ClickToDialUseTelLinkDesc=Använd den här metoden om användarna har en mjukvara eller ett programgränssnitt installerat på samma dator som webbläsaren och ringde när du klickar på en länk i din webbläsare som börjar med "tel:". Om du behöver en fullständig serverlösning (inget behov av lokal programinstallation) måste du ange detta till "Nej" och fylla i nästa fält.
 ##### Point Of Sale (CashDesk) #####
@@ -1778,15 +1786,15 @@ CashDeskThirdPartyForSell=Standard generisk tredje part att använda för förs
 CashDeskBankAccountForSell=Konto som ska användas för att ta emot kontant betalning
 CashDeskBankAccountForCheque=Standardkonto som ska användas för att få betalningar med check
 CashDeskBankAccountForCB=Konto som ska användas för att ta emot kontant betalning med kreditkort
-CashDeskBankAccountForSumup=Default bank account to use to receive payments by SumUp
+CashDeskBankAccountForSumup=Standardbankkonto som används för att ta emot betalningar med SumUp
 CashDeskDoNotDecreaseStock=Inaktivera lagerminskning när en försäljning görs från försäljningsstället (om "nej", lagerminskning görs för varje försäljning som görs från POS, oberoende av alternativet i modulen Lager).
 CashDeskIdWareHouse=Tvinga och begränsa lager att använda för lagerpostminskning
 StockDecreaseForPointOfSaleDisabled=Lagerminskning från försäljningsstället inaktiverat
 StockDecreaseForPointOfSaleDisabledbyBatch=Lagerminskning i POS är inte kompatibel med modul Serial / Lot-hantering (för närvarande aktiv) så lagerminskning är inaktiverad.
 CashDeskYouDidNotDisableStockDecease=Du inaktiverade inte lagerminskning när du gör en försäljning från försäljningsstället. Därför krävs ett lager.
-CashDeskForceDecreaseStockLabel=Stock decrease for batch products was forced.
-CashDeskForceDecreaseStockDesc=Decrease first by the oldest eatby and sellby dates.
-CashDeskReaderKeyCodeForEnter=Key code for "Enter" defined in barcode reader (Example: 13)
+CashDeskForceDecreaseStockLabel=Lagerminskning för batchprodukter tvingades.
+CashDeskForceDecreaseStockDesc=Minska först med de äldsta datumen för att äta och sälja.
+CashDeskReaderKeyCodeForEnter=Nyckelkod för "Enter" definierad i streckkodsläsare (Exempel: 13)
 ##### Bookmark #####
 BookmarkSetup=Bokmärk modul inställning
 BookmarkDesc=Den här modulen låter dig hantera bokmärken. Du kan också lägga till genvägar till alla Dolibarr-sidor eller externa webbplatser på din vänstra meny.
@@ -1817,14 +1825,14 @@ ChequeReceiptsNumberingModule=Kontrollera mottagningsnummereringsmodul
 MultiCompanySetup=Multi-bolag modul inställning
 ##### Suppliers #####
 SuppliersSetup=Inställning av leverantörsmodul
-SuppliersCommandModel=Complete template of Purchase Order
-SuppliersCommandModelMuscadet=Complete template of Purchase Order (old implementation of cornas template)
-SuppliersInvoiceModel=Complete template of Vendor Invoice
+SuppliersCommandModel=Komplett mall för inköpsorder
+SuppliersCommandModelMuscadet=Komplett mall för inköpsorder (gammal implementering av cornas-mall)
+SuppliersInvoiceModel=Komplett mall för leverantörsfaktura
 SuppliersInvoiceNumberingModel=Leverantörsfakturor nummereringsmodeller
-IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
+IfSetToYesDontForgetPermission=Om det är inställt på ett värde som inte är null, glöm inte att ge behörigheter till grupper eller användare som är godkända för det andra godkännandet
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind modul inställning
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
+PathToGeoIPMaxmindCountryDataFile=Sökväg till fil som innehåller Maxmind ip till landsöversättning. <br> Exempel: <br> /usr/local/share/GeoIP/GeoIP.dat <br> /usr/share/GeoIP/GeoIP.dat <br> /usrIPshare / Gare / G
 NoteOnPathLocation=Observera att ditt ip till land datafil måste vara inne i en katalog din PHP kan läsa (Kolla din PHP open_basedir inställningar och behörigheter filsystem).
 YouCanDownloadFreeDatFileTo=Du kan ladda ner en <b>gratis demoversion</b> av Maxmind GeoIP landet filen på %s.
 YouCanDownloadAdvancedDatFileTo=Du kan också ladda ner en mer <b>komplett version, med uppdateringar av</b> de Maxmind GeoIP landet filen på %s.
@@ -1864,14 +1872,14 @@ ExpenseReportsRulesSetup=Inställning av modul Utläggsrapportsregler
 ExpenseReportNumberingModules=Modul för utläggsrapporteringsnummer
 NoModueToManageStockIncrease=Ingen modul kunna hantera automatiska lagerökningen har aktiverats. Stock ökning kommer att ske på bara manuell inmatning.
 YouMayFindNotificationsFeaturesIntoModuleNotification=Du kan hitta alternativ för e-postmeddelanden genom att aktivera och konfigurera modulen "Meddelande".
-ListOfNotificationsPerUser=List of automatic notifications per user*
-ListOfNotificationsPerUserOrContact=List of possible automatic notifications (on business event) available per user* or per contact**
-ListOfFixedNotifications=List of automatic fixed notifications
+ListOfNotificationsPerUser=Lista över automatiska aviseringar per användare *
+ListOfNotificationsPerUserOrContact=Lista över möjliga automatiska aviseringar (på affärshändelse) tillgängliga per användare * eller per kontakt **
+ListOfFixedNotifications=Lista över automatiska fasta aviseringar
 GoOntoUserCardToAddMore=Gå till fliken "Notifieringar" för en användare för att lägga till eller ta bort meddelanden för användare
-GoOntoContactCardToAddMore=Go to the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
+GoOntoContactCardToAddMore=Gå till fliken "Meddelanden" från en tredje part för att lägga till eller ta bort meddelanden för kontakter / adresser
 Threshold=Tröskelvärde
-BackupDumpWizard=Wizard to build the database dump file
-BackupZipWizard=Wizard to build the archive of documents directory
+BackupDumpWizard=Guiden för att skapa databasdumpfilen
+BackupZipWizard=Guiden för att bygga arkivet med dokumentkatalogen
 SomethingMakeInstallFromWebNotPossible=Installation av extern modul är inte möjligt från webbgränssnittet av följande skäl:
 SomethingMakeInstallFromWebNotPossible2=Av den anledningen är processen att uppgradera som beskrivs här en manuell process endast en privilegierad användare kan utföra.
 InstallModuleFromWebHasBeenDisabledByFile=Installation av extern modul från ansökan har inaktiverats av administratören. Du måste be honom att ta bort <strong>filen% s</strong> för att tillåta denna funktion.
@@ -1889,16 +1897,16 @@ TopMenuDisableImages=Dölj bilder i toppmenyn
 LeftMenuBackgroundColor=Bakgrundsfärg för vänstermenyn
 BackgroundTableTitleColor=Bakgrundsfärg för tabellens titellinje
 BackgroundTableTitleTextColor=Textfärg för tabellens titellinje
-BackgroundTableTitleTextlinkColor=Text color for Table title link line
+BackgroundTableTitleTextlinkColor=Textfärg för länkrad för tabellrubrik
 BackgroundTableLineOddColor=Bakgrundsfärg för udda bords linjer
 BackgroundTableLineEvenColor=Bakgrundsfärg för ännu bords linjer
 MinimumNoticePeriod=Minsta varseltid (Din ledighet begäran måste göras innan denna försening)
 NbAddedAutomatically=Antal dagar som läggs till räknare av användare (automatiskt) varje månad
-EnterAnyCode=This field contains a reference to identify the line. Enter any value of your choice, but without special characters.
-Enter0or1=Enter 0 or 1
+EnterAnyCode=Det här fältet innehåller en referens för att identifiera raden. Ange valfritt värde, men utan specialtecken.
+Enter0or1=Ange 0 eller 1
 UnicodeCurrency=Ange här mellan hållare, lista med byte nummer som representerar valutasymbolen. Till exempel: för $, skriv [36] - för brazil real R $ [82,36] - för €, skriv [8364]
 ColorFormat=RGB-färgen är i HEX-format, t.ex.: FF0000
-PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
+PictoHelp=Ikonnamn i dolibarr-format ('image.png' om i den aktuella temakatalogen, 'image.png@nom_du_module' om i katalogen / img / av en modul)
 PositionIntoComboList=Position of line i kombinationslistor
 SellTaxRate=Försäljning skattesats
 RecuperableOnly=Ja för moms "Ej uppfattad men återställbar" tillägnad vissa stater i Frankrike. Håll värdet till "Nej" i alla andra fall.
@@ -1913,8 +1921,8 @@ FixTZ=Timezone fix
 FillFixTZOnlyIfRequired=Exempel: +2 (fyll endast om problem upplevs)
 ExpectedChecksum=Förväntat kontrollsumma
 CurrentChecksum=Nuvarande kontrollsumma
-ExpectedSize=Expected size
-CurrentSize=Current size
+ExpectedSize=Förväntad storlek
+CurrentSize=Aktuell storlek
 ForcedConstants=Erforderliga konstanta värden
 MailToSendProposal=Kundförslag
 MailToSendOrder=Försäljningsorder
@@ -1925,12 +1933,12 @@ MailToSendSupplierRequestForQuotation=Offertförfrågan
 MailToSendSupplierOrder=Beställning
 MailToSendSupplierInvoice=Leverantörsfakturor
 MailToSendContract=Kontrakt
-MailToSendReception=Receptions
+MailToSendReception=Mottagningar
 MailToThirdparty=Tredje part
 MailToMember=Medlemmar
 MailToUser=Användare
 MailToProject=Projekt
-MailToTicket=Tickets
+MailToTicket=Biljetter
 ByDefaultInList=Visa som standard i listvy
 YouUseLastStableVersion=Du använder den senaste stabila versionen
 TitleExampleForMajorRelease=Exempel på meddelande du kan använda för att meddela den här stora versionen (gärna använda den på dina webbplatser)
@@ -1939,7 +1947,7 @@ ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s är tillgänglig. Vers
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s är tillgänglig. Version %s är en underhållsversion, så innehåller bara buggfixar. Vi rekommenderar alla användare att uppgradera till den här versionen. En underhållsutgivning introducerar inte nya funktioner eller ändringar i databasen. Du kan hämta det från hämtningsområdet på https://www.dolibarr.org portal (underkatalog Stabila versioner). Du kan läsa <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog"> ChangeLog </a> för fullständig lista över ändringar.
 MultiPriceRuleDesc=När alternativet "Flera prisnivåer per produkt / tjänst" är aktiverat kan du definiera olika priser (en per prisnivå) för varje produkt. För att spara tid kan du här ange en regel för att autokaluta ett pris för varje nivå baserat på priset på första nivån, så du måste bara ange ett pris för första nivån för varje produkt. Den här sidan är utformad för att spara tid, men är endast användbar om dina priser för varje nivå är i förhållande till första nivån. Du kan ignorera den här sidan i de flesta fall.
 ModelModulesProduct=Mallar för produktdokument
-WarehouseModelModules=Templates for documents of warehouses
+WarehouseModelModules=Mallar för dokument från lager
 ToGenerateCodeDefineAutomaticRuleFirst=För att kunna generera koder automatiskt måste du först definiera en chef för att automatiskt definiera streckkodsnumret.
 SeeSubstitutionVars=Se * anteckning för lista över möjliga substitutionsvariabler
 SeeChangeLog=Se ChangeLog-fil (endast på engelska)
@@ -1978,15 +1986,17 @@ MAIN_PDF_MARGIN_LEFT=Vänster marginal på PDF
 MAIN_PDF_MARGIN_RIGHT=Höger marginal på PDF
 MAIN_PDF_MARGIN_TOP=Toppmarginal på PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottenmarginal på PDF
-MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
+MAIN_DOCUMENTS_LOGO_HEIGHT=Höjd för logotyp på PDF
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add picture on proposal line
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Lägg till elektronisk inloggning PDF
 NothingToSetup=Det finns ingen specifik inställning som krävs för den här modulen.
 SetToYesIfGroupIsComputationOfOtherGroups=Ställ det här på ja om den här gruppen är en beräkning av andra grupper
-EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
+EnterCalculationRuleIfPreviousFieldIsYes=Ange beräkningsregel om föregående fält var satt till Ja. <br> Till exempel: <br> CODEGRP1 + CODEGRP2
 SeveralLangugeVariatFound=Flera språkvarianter hittades
-RemoveSpecialChars=Remove special characters
+RemoveSpecialChars=Ta bort specialtecken
 COMPANY_AQUARIUM_CLEAN_REGEX=Regex-filter till rent värde (COMPANY_AQUARIUM_CLEAN_REGEX)
-COMPANY_DIGITARIA_CLEAN_REGEX=Regex filter to clean value (COMPANY_DIGITARIA_CLEAN_REGEX)
-COMPANY_DIGITARIA_UNIQUE_CODE=Duplicate not allowed
+COMPANY_DIGITARIA_CLEAN_REGEX=Regex-filter för att rengöra värdet (COMPANY_DIGITARIA_CLEAN_REGEX)
+COMPANY_DIGITARIA_UNIQUE_CODE=Duplicering är inte tillåtet
 GDPRContact=Dataskyddsansvarig (DPO, Data Privacy eller GDPR-kontakt)
 GDPRContactDesc=Om du lagrar data om europeiska företag / medborgare kan du namnge den kontaktperson som ansvarar för Allmänna databeskyddsförordningen här
 HelpOnTooltip=Hjälptext för att visa på verktygstips
@@ -1996,8 +2006,8 @@ ChartLoaded=Kontoplan laddad
 SocialNetworkSetup=Uppställning av modulen Sociala nätverk
 EnableFeatureFor=Aktivera funktioner för <strong> %s </strong>
 VATIsUsedIsOff=Obs! Alternativet att använda moms eller moms har ställts till <strong> Av </strong> i menyn %s - %s, så Försäljningsskatt eller moms används alltid 0 för försäljning.
-SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
-FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields and combo lists only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
+SwapSenderAndRecipientOnPDF=Byt avsändar- och mottagaradressposition på PDF-dokument
+FeatureSupportedOnTextFieldsOnly=Varning, funktionen stöds endast i textfält och kombinationslistor. En URL-parameteråtgärd = skapa eller åtgärd = redigera måste också ställas in ELLER måste sidnamnet sluta med 'new.php' för att utlösa den här funktionen.
 EmailCollector=E-post samlare
 EmailCollectorDescription=Lägg till ett schemalagt jobb och en installationssida för att skanna regelbundet e-postrutor (med IMAP-protokoll) och spela in e-postmeddelanden som tas emot i din ansökan, på rätt plats och / eller skapa några poster automatiskt (som ledningar).
 NewEmailCollector=Ny e-postsamlare
@@ -2005,12 +2015,12 @@ EMailHost=Värd för e-post IMAP-server
 MailboxSourceDirectory=Postkälla källkatalog
 MailboxTargetDirectory=Målkatalogen för brevlådan
 EmailcollectorOperations=Verksamhet att göra av samlare
-EmailcollectorOperationsDesc=Operations are executed from top to bottom order
-MaxEmailCollectPerCollect=Max number of emails collected per collect
+EmailcollectorOperationsDesc=Operationer utförs från topp till nedre ordning
+MaxEmailCollectPerCollect=Max antal e-postmeddelanden som samlats in per insamling
 CollectNow=Samla nu
-ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
-DateLastCollectResult=Date of latest collect try
-DateLastcollectResultOk=Date of latest collect success
+ConfirmCloneEmailCollector=Är du säker på att du vill klona e-postsamlaren %s?
+DateLastCollectResult=Datum för senaste insamlingsförsök
+DateLastcollectResultOk=Datum för senaste insamlingsframgång
 LastResult=Senaste resultatet
 EmailCollectorConfirmCollectTitle=E-post samla bekräftelse
 EmailCollectorConfirmCollect=Vill du springa samlingen för den här samlaren nu?
@@ -2019,16 +2029,16 @@ NothingProcessed=Inget gjort
 XEmailsDoneYActionsDone=%s e-postadresser kvalificerade, %s e-postmeddelanden som bearbetats framgångsrikt (för %s-post / åtgärder gjorda)
 RecordEvent=Spela in e-post händelse
 CreateLeadAndThirdParty=Skapa ledning (och tredje part om det behövs)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+CreateTicketAndThirdParty=Skapa biljett (och länka till tredje part om den laddades av en tidigare operation)
 CodeLastResult=Senaste resultatkoden
 NbOfEmailsInInbox=Antal e-postmeddelanden i källkatalogen
 LoadThirdPartyFromName=Ladda tredjepartsökning på %s (endast belastning)
 LoadThirdPartyFromNameOrCreate=Ladda tredjepartsökning på %s (skapa om ej hittad)
-WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
-WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
-WithDolTrackingIDInMsgId=Message sent from Dolibarr
-WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create job application
+WithDolTrackingID=Meddelande från en konversation initierad av ett första e-postmeddelande skickat från Dolibarr
+WithoutDolTrackingID=Meddelande från en konversation initierad av ett första e-postmeddelande som INTE skickades från Dolibarr
+WithDolTrackingIDInMsgId=Meddelande skickat från Dolibarr
+WithoutDolTrackingIDInMsgId=Meddelande skickades INTE från Dolibarr
+CreateCandidature=Skapa jobbansökan
 FormatZip=Zip
 MainMenuCode=Menyinmatningskod (huvudmeny)
 ECMAutoTree=Visa automatiskt ECM-träd
@@ -2039,17 +2049,17 @@ ResourceSetup=Konfiguration av resursmodulen
 UseSearchToSelectResource=Använd en sökformulär för att välja en resurs (snarare än en rullgardinslista).
 DisabledResourceLinkUser=Inaktivera funktionen för att länka en resurs till användarna
 DisabledResourceLinkContact=Inaktivera funktionen för att länka en resurs till kontakter
-EnableResourceUsedInEventCheck=Enable feature to check if a resource is in use in an event
+EnableResourceUsedInEventCheck=Aktivera funktionen för att kontrollera om en resurs används i en händelse
 ConfirmUnactivation=Bekräfta modulåterställning
 OnMobileOnly=På en liten skärm (smartphone) bara
-DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
+DisableProspectCustomerType=Inaktivera typen "Prospect + Customer" från tredje part (så tredje part måste vara "Prospect" eller "Customer", men kan inte vara båda)
 MAIN_OPTIMIZEFORTEXTBROWSER=Förenkla gränssnittet för blinda personer
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Aktivera det här alternativet om du är blind person, eller om du använder programmet från en textbläsare som Lynx eller Links.
-MAIN_OPTIMIZEFORCOLORBLIND=Change  interface's color for color blind person
-MAIN_OPTIMIZEFORCOLORBLINDDesc=Enable this option if you are a color blind person, in some case interface will change color setup to increase contrast.
+MAIN_OPTIMIZEFORCOLORBLIND=Ändra gränssnittets färg för färgblind person
+MAIN_OPTIMIZEFORCOLORBLINDDesc=Aktivera det här alternativet om du är en färgblind person, i vissa fall ändrar gränssnittet färginställningarna för att öka kontrasten.
 Protanopia=Protanopia
-Deuteranopes=Deuteranopes
-Tritanopes=Tritanopes
+Deuteranopes=Deuteranoper
+Tritanopes=Tritanoper
 ThisValueCanOverwrittenOnUserLevel=Detta värde kan skrivas över av varje användare från användarens sida - fliken '%s'
 DefaultCustomerType=Standard tredjepartstyp för skapande av "Ny kund"
 ABankAccountMustBeDefinedOnPaymentModeSetup=Obs! Bankkontot måste definieras i modulen för varje betalningsläge (Paypal, Stripe, ...) för att den här funktionen ska fungera.
@@ -2063,69 +2073,74 @@ LogsLinesNumber=Antal rader som ska visas på loggfliken
 UseDebugBar=Använd felsökningsfältet
 DEBUGBAR_LOGS_LINES_NUMBER=Antal sista logglinjer för att hålla i konsolen
 WarningValueHigherSlowsDramaticalyOutput=Varning, högre värden sänker dramaticaly-utgången
-ModuleActivated=Module %s is activated and slows the interface
-ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances and security)
-ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
-IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
-AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
-SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
+ModuleActivated=Modul %s är aktiverad och saktar ner gränssnittet
+ModuleActivatedWithTooHighLogLevel=Modul %s aktiveras med för hög loggningsnivå (försök att använda en lägre nivå för bättre prestanda och säkerhet)
+ModuleSyslogActivatedButLevelNotTooVerbose=Modul %s är aktiverad och loggnivå (%s) är korrekt (inte alltför detaljerad)
+IfYouAreOnAProductionSetThis=Om du är i en produktionsmiljö bör du ställa in den här egenskapen till %s.
+AntivirusEnabledOnUpload=Antivirus aktiverat på uppladdade filer
+SomeFilesOrDirInRootAreWritable=Vissa filer eller kataloger är inte i skrivskyddat läge
 EXPORTS_SHARE_MODELS=Exportmodeller delas med alla
 ExportSetup=Inställning av modul Export
-ImportSetup=Setup of module Import
+ImportSetup=Installation av modulimport
 InstanceUniqueID=Unikt ID för förekomsten
 SmallerThan=Mindre än
 LargerThan=Större än
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
+IfTrackingIDFoundEventWillBeLinked=Observera att om ett spårnings-ID för ett objekt hittas i e-post, eller om e-postmeddelandet är ett svar på ett e-postområde som samlas in och länkas till ett objekt, kommer den skapade händelsen automatiskt att länkas till det kända relaterade objektet.
 WithGMailYouCanCreateADedicatedPassword=Med ett GMail-konto, om du aktiverade valet av 2 steg, rekommenderas att du skapar ett dedikerat andra lösenord för programmet istället för att använda ditt eget lösenordsord från https://myaccount.google.com/.
-EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
-EndPointFor=End point for %s : %s
-DeleteEmailCollector=Delete email collector
-ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
-RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
-AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
-RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
+EmailCollectorTargetDir=Det kan vara ett önskat beteende att flytta e-postmeddelandet till en annan tagg / katalog när den bearbetades framgångsrikt. Ange bara namnet på katalogen här för att använda den här funktionen (Använd INTE specialtecken i namnet). Observera att du också måste använda ett inloggningskonto för läs / skriv.
+EmailCollectorLoadThirdPartyHelp=Du kan använda den här åtgärden för att använda e-postinnehållet för att hitta och ladda en befintlig tredje part i din databas. Den hittade (eller skapade) tredje parten kommer att användas för följande åtgärder som behöver det. I parameterfältet kan du till exempel använda 'EXTRAKT: BODY: Namn: \\ s ([^ \\ s] *)' om du vill extrahera namnet på tredje part från strängen 'Namn: namn att hitta' hittat i kropp.
+EndPointFor=Slutpunkt för %s: %s
+DeleteEmailCollector=Ta bort e-postsamlare
+ConfirmDeleteEmailCollector=Är du säker på att du vill ta bort denna e-postsamlare?
+RecipientEmailsWillBeReplacedWithThisValue=Mottagarens e-postmeddelanden kommer alltid att ersättas med detta värde
+AtLeastOneDefaultBankAccountMandatory=Minst 1 standardbankkonto måste definieras
+RESTRICT_ON_IP=Tillåt endast åtkomst till någon värd-IP (jokertecken är inte tillåtet, använd utrymme mellan värdena). Tom betyder att alla värdar kan komma åt.
 IPListExample=127.0.0.1 192.168.0.2 [::1]
-BaseOnSabeDavVersion=Based on the library SabreDAV version
-NotAPublicIp=Not a public IP
-MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
-FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
-EmailTemplate=Template for email
-EMailsWillHaveMessageID=Emails will have a tag 'References' matching this syntax
-PDF_SHOW_PROJECT=Show project on document
-ShowProjectLabel=Project Label
-PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
-FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
-FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
-RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
-JumpToBoxes=Jump to Setup -> Widgets
-MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
-MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
-TemplateAdded=Template added
-TemplateUpdated=Template updated
-TemplateDeleted=Template deleted
-MailToSendEventPush=Event reminder email
-SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
-DictionaryProductNature= Nature of product
-CountryIfSpecificToOneCountry=Country (if specific to a given country)
-YouMayFindSecurityAdviceHere=You may find security advisory here
-ModuleActivatedMayExposeInformation=This PHP extension may expose sensitive data. If you don't need it, disable it.
-ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
-CombinationsSeparator=Separator character for product combinations
-SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
-SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
-AskThisIDToYourBank=Contact your bank to get this ID
-AdvancedModeOnly=Permision available in Advanced permission mode only
-ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
-MailToSendEventOrganization=Event Organization
-AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
-YouShouldDisablePHPFunctions=You should disable PHP functions
-IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
-NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
-RecommendedValueIs=Recommended: %s
-ARestrictedPath=A restricted path
-CheckForModuleUpdate=Check for external modules updates
-CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
-ModuleUpdateAvailable=An update is available
-NoExternalModuleWithUpdate=No updates found for external modules
-SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
+BaseOnSabeDavVersion=Baserat på biblioteksversionen av SabreDAV
+NotAPublicIp=Inte en offentlig IP
+MakeAnonymousPing=Skapa en anonym Ping '+1' till Dolibarr foundation-servern (görs en gång efter installationen) så att stiftelsen räknar antalet Dolibarr-installationer.
+FeatureNotAvailableWithReceptionModule=Funktionen är inte tillgänglig när mottagning av modulen är aktiverad
+EmailTemplate=Mall för e-post
+EMailsWillHaveMessageID=E-postmeddelanden kommer att ha taggen "Referenser" som matchar denna syntax
+PDF_SHOW_PROJECT=Visa projekt på dokument
+ShowProjectLabel=Projektetikett
+PDF_USE_ALSO_LANGUAGE_CODE=Om du vill att några texter i din PDF ska dupliceras på två olika språk i samma genererade PDF, måste du ställa in det här andra språket så att genererad PDF kommer att innehålla 2 olika språk på samma sida, det som du valt när du skapar PDF och det här ( endast få PDF-mallar stöder detta). Håll tomt för 1 språk per PDF.
+FafaIconSocialNetworksDesc=Ange här koden för en FontAwesome-ikon. Om du inte vet vad som är FontAwesome kan du använda det allmänna värdet fa-adressbok.
+RssNote=Obs! Varje RSS-feeddefinition ger en widget som du måste aktivera för att ha den tillgänglig i instrumentpanelen
+JumpToBoxes=Hoppa till Setup -> Widgets
+MeasuringUnitTypeDesc=Använd här ett värde som "storlek", "yta", "volym", "vikt", "tid"
+MeasuringScaleDesc=Skalan är antalet platser du måste flytta decimaldelen för att matcha standardreferensenheten. För "tid" -enhetstyp är det antalet sekunder. Värden mellan 80 och 99 är reserverade värden.
+TemplateAdded=Mall har lagts till
+TemplateUpdated=Mall uppdaterad
+TemplateDeleted=Mall borttagen
+MailToSendEventPush=E-post för påminnelse om händelse
+SwitchThisForABetterSecurity=Att byta detta värde till %s rekommenderas för mer säkerhet
+DictionaryProductNature= Produktens art
+CountryIfSpecificToOneCountry=Land (om specifikt för ett visst land)
+YouMayFindSecurityAdviceHere=Du kan hitta säkerhetsrådgivning här
+ModuleActivatedMayExposeInformation=Det här PHP-tillägget kan avslöja känsliga data. Om du inte behöver det, inaktivera det.
+ModuleActivatedDoNotUseInProduction=En modul utformad för utvecklingen har aktiverats. Aktivera det inte i en produktionsmiljö.
+CombinationsSeparator=Separatortecken för produktkombinationer
+SeeLinkToOnlineDocumentation=Se länk till online-dokumentation på toppmenyn för exempel
+SHOW_SUBPRODUCT_REF_IN_PDF=Om funktionen "%s" i modulen <b> %s </b> används, visa detaljer om delprodukter av ett kit på PDF.
+AskThisIDToYourBank=Kontakta din bank för att få detta ID
+AdvancedModeOnly=Tillstånd endast tillgängligt i avancerat tillståndsläge
+ConfFileIsReadableOrWritableByAnyUsers=Conf-filen är läsbar eller skrivbar av alla användare. Ge endast webbserveranvändare och gruppbehörighet.
+MailToSendEventOrganization=Event Organisation
+AGENDA_EVENT_DEFAULT_STATUS=Standardhändelsestatus när du skapar en händelse från formuläret
+YouShouldDisablePHPFunctions=Du bör inaktivera PHP-funktioner
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands in custom code, you shoud disable PHP functions
+PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
+NoWritableFilesFoundIntoRootDir=Inga skrivbara filer eller kataloger för de vanliga programmen hittades i din rotkatalog (Bra)
+RecommendedValueIs=Rekommenderas: %s
+NotRecommended=Rekommenderas inte
+ARestrictedPath=En begränsad väg
+CheckForModuleUpdate=Sök efter uppdateringar av externa moduler
+CheckForModuleUpdateHelp=Denna åtgärd kommer att ansluta till redaktörer för externa moduler för att kontrollera om en ny version är tillgänglig.
+ModuleUpdateAvailable=En uppdatering är tillgänglig
+NoExternalModuleWithUpdate=Inga uppdateringar hittades för externa moduler
+SwaggerDescriptionFile=Swagger API beskrivningsfil (för exempelvis användning med redoc)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
+RandomlySelectedIfSeveral=Randomly selected if several pictures are available
+DatabasePasswordObfuscated=Database password is obfuscated in conf file
+DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
diff --git a/htdocs/langs/sv_SE/agenda.lang b/htdocs/langs/sv_SE/agenda.lang
index d533547fea8..0bb80bd3e67 100644
--- a/htdocs/langs/sv_SE/agenda.lang
+++ b/htdocs/langs/sv_SE/agenda.lang
@@ -4,7 +4,7 @@ Actions=Åtgärder
 Agenda=Agenda
 TMenuAgenda=Agenda
 Agendas=Dagordningar
-LocalAgenda=Intern kalender
+LocalAgenda=Default calendar
 ActionsOwnedBy=Händelse som ägs av
 ActionsOwnedByShort=Ägare
 AffectedTo=Påverkas i
@@ -14,13 +14,13 @@ EventsNb=Antal händelser
 ListOfActions=Lista över evenemang
 EventReports=Händelsesrapporter
 Location=Läge
-ToUserOfGroup=Event assigned to any user in group
+ToUserOfGroup=Event assigned to any user in the group
 EventOnFullDay=Händelse heldag
 MenuToDoActions=Alla ofullständiga handlingar
 MenuDoneActions=Alla avslutade åtgärder
 MenuToDoMyActions=Min ofullständiga handlingar
 MenuDoneMyActions=Min avslutas åtgärder
-ListOfEvents=Förteckning över händelser (intern kalender)
+ListOfEvents=List of events (default calendar)
 ActionsAskedBy=Åtgärder som registrerats av
 ActionsToDoBy=Åtgärder påverkas
 ActionsDoneBy=Åtgärder som utförs av
@@ -38,6 +38,7 @@ ActionsEvents=Händelser som Dolibarr kommer att skapa en talan i agenda automat
 EventRemindersByEmailNotEnabled=Händelsepåminnelser av email var inte aktiverat i %s module inställning.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Tredje part %s skapad
+COMPANY_MODIFYInDolibarr=Third party %s modified
 COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=Kontrakt %s bekräftades
 CONTRACT_DELETEInDolibarr=Kontrakt %s raderad
@@ -87,6 +88,7 @@ OrderDeleted=Order raderad
 InvoiceDeleted=Faktura raderad
 DraftInvoiceDeleted=Draft invoice deleted
 CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_MODIFYInDolibarr=Contact %s modified
 CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Produkt %s skapad
 PRODUCT_MODIFYInDolibarr=Produkt %s modified
@@ -119,6 +121,7 @@ MRP_MO_UNVALIDATEInDolibarr=MO set to draft status
 MRP_MO_PRODUCEDInDolibarr=MO produced
 MRP_MO_DELETEInDolibarr=MO deleted
 MRP_MO_CANCELInDolibarr=MO canceled
+PAIDInDolibarr=%s paid
 ##### End agenda events #####
 AgendaModelModule=Dokumentmallar för event
 DateActionStart=Startdatum
@@ -130,7 +133,7 @@ AgendaUrlOptions4= <b> logint = %s </b> för att begränsa utdata till åtgärd
 AgendaUrlOptionsProject= <b> project = __ PROJECT_ID__ </b> för att begränsa utsignalen till åtgärder linked till project <b> __PROJECT_ID__ </b>.
 AgendaUrlOptionsNotAutoEvent= <b> notactiontype = systemauto </b> för att utesluta automatisk events.
 AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> to include events of holidays.
-AgendaShowBirthdayEvents=Show födelsedagar av contacts
+AgendaShowBirthdayEvents=Birthdays of contacts
 AgendaHideBirthdayEvents=Dölj födelsedagar av contacts
 Busy=Upptagen
 ExportDataset_event1=Lista över dagordningen händelser
@@ -152,6 +155,7 @@ ActionType=Typ av händelse
 DateActionBegin=Startdatum för händelse
 ConfirmCloneEvent=Är du säker på att du vill klona event <b> %s </b>?
 RepeatEvent=Repetera händelsen
+OnceOnly=Once only
 EveryWeek=Varje vecka
 EveryMonth=Varje månad
 DayOfMonth=Dag i månaden
@@ -165,4 +169,4 @@ TimeType=Duration type
 ReminderType=Callback type
 AddReminder=Create an automatic reminder notification for this event
 ErrorReminderActionCommCreation=Error creating the reminder notification for this event
-BrowserPush=Browser Notification
+BrowserPush=Browser Popup Notification
diff --git a/htdocs/langs/sv_SE/bills.lang b/htdocs/langs/sv_SE/bills.lang
index e6936e23379..d1e4e404564 100644
--- a/htdocs/langs/sv_SE/bills.lang
+++ b/htdocs/langs/sv_SE/bills.lang
@@ -25,7 +25,7 @@ InvoiceProFormaAsk=Proforma faktura
 InvoiceProFormaDesc=<b>Proforma faktura</b> är en bild av en sann faktura men har ingen bokföring värde.
 InvoiceReplacement=Ersättnings faktura
 InvoiceReplacementAsk=Ersättnings faktura för faktura
-InvoiceReplacementDesc=<b>Replacement invoice</b> is used to completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
+InvoiceReplacementDesc= <b> Ersättningsfaktura </b> används för att helt ersätta en faktura utan redan mottagen betalning. <br> <br> Obs! Endast fakturor utan betalning kan ersättas. Om fakturan du byter ut ännu inte stängs stängs den automatiskt för 'övergiven'.
 InvoiceAvoir=Kreditnota
 InvoiceAvoirAsk=Kreditnota att korrigera fakturan
 InvoiceAvoirDesc=<b> kreditnota </b> är en negativ faktura som används för att korrigera det faktum att en faktura visar ett belopp som skiljer sig från det belopp som faktiskt betalats (t.ex. kunden betalade för mycket av misstag eller betalar inte hela beloppet eftersom vissa produkter returnerades) .
@@ -55,22 +55,22 @@ CustomerInvoice=Kundfaktura
 CustomersInvoices=Kundfakturor
 SupplierInvoice=Leverantörsfaktura
 SuppliersInvoices=Leverantörsfakturor
-SupplierInvoiceLines=Vendor invoice lines
+SupplierInvoiceLines=Leverantörsfakturarader
 SupplierBill=Leverantörsfaktura
 SupplierBills=Leverantörsfakturor
 Payment=Betalning
-PaymentBack=Refund
-CustomerInvoicePaymentBack=Refund
+PaymentBack=Återbetalning
+CustomerInvoicePaymentBack=Återbetalning
 Payments=Betalningar
-PaymentsBack=Refunds
+PaymentsBack=Återbetalningar
 paymentInInvoiceCurrency=i faktura valuta
 PaidBack=Återbetald
 DeletePayment=Radera betalning
 ConfirmDeletePayment=Är du säker på att du vill radera denna betalning?
-ConfirmConvertToReduc=Do you want to convert this %s into an available credit?
-ConfirmConvertToReduc2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an available credit?
-ConfirmConvertToReducSupplier2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
+ConfirmConvertToReduc=Vill du konvertera den här %s till en tillgänglig kredit?
+ConfirmConvertToReduc2=Beloppet sparas bland alla rabatter och kan användas som rabatt för en aktuell eller framtida faktura för denna kund.
+ConfirmConvertToReducSupplier=Vill du konvertera den här %s till en tillgänglig kredit?
+ConfirmConvertToReducSupplier2=Beloppet sparas bland alla rabatter och kan användas som rabatt för en aktuell eller framtida faktura för denna leverantör.
 SupplierPayments=Leverantörsbetalningar
 ReceivedPayments=Mottagna betalningar
 ReceivedCustomersPayments=Inbetalningar från kunder
@@ -79,11 +79,11 @@ ReceivedCustomersPaymentsToValid=Mottagna kunder betalningar för att bekräfta
 PaymentsReportsForYear=Betalningar rapporter för %s
 PaymentsReports=Betalningar rapporter
 PaymentsAlreadyDone=Betalningar redan gjort
-PaymentsBackAlreadyDone=Refunds already done
+PaymentsBackAlreadyDone=Återbetalningar redan gjorda
 PaymentRule=Betalningsregel
 PaymentMode=Betalnings typ
-DefaultPaymentMode=Default Payment Type
-DefaultBankAccount=Default Bank Account
+DefaultPaymentMode=Standardbetalningstyp
+DefaultBankAccount=Standard bankkonto
 PaymentTypeDC=Debet / Kreditkort
 PaymentTypePP=PayPal
 IdPaymentMode=Betalningstyp (id)
@@ -98,7 +98,7 @@ PaymentHigherThanReminderToPay=Betalning högre än påminnelse att betala
 HelpPaymentHigherThanReminderToPay=Observera är betalningsbeloppet för en eller flera räkningar högre än det utestående beloppet att betala. <br> Ändra din post, annars bekräfta och överväga att skapa en kreditnotering för det överskott som tas emot för varje överbetald faktura.
 HelpPaymentHigherThanReminderToPaySupplier=Observera är betalningsbeloppet för en eller flera räkningar högre än det utestående beloppet att betala. <br> Ändra din post, annars bekräfta och överväga att skapa en kreditnotering för det överskjutande beloppet för varje överbetald faktura.
 ClassifyPaid=Märk "betald"
-ClassifyUnPaid=Classify 'Unpaid'
+ClassifyUnPaid=Klassificera 'obetald'
 ClassifyPaidPartially=Märk "betalda delvis"
 ClassifyCanceled=Märk "övergivna"
 ClassifyClosed=Märk "avsluten"
@@ -120,7 +120,7 @@ ConvertExcessPaidToReduc=Konvertera överskott betalt till ledig rabatt
 EnterPaymentReceivedFromCustomer=Skriv in avgifter från kunderna
 EnterPaymentDueToCustomer=Gör betalning till kunden
 DisabledBecauseRemainderToPayIsZero=Inaktiverad pga återstående obetalt är noll
-PriceBase=Base price
+PriceBase=Grundpris
 BillStatus=Faktura status
 StatusOfGeneratedInvoices=Status för genererade fakturor
 BillStatusDraft=Utkast (måste bekräftas)
@@ -154,7 +154,7 @@ ErrorBillNotFound=Faktura %s finns inte
 ErrorInvoiceAlreadyReplaced=Fel, du försökte bekräfta en faktura för att ersätta faktura %s. Men den här har redan ersatts av faktura %s.
 ErrorDiscountAlreadyUsed=Fel, rabatt som redan används
 ErrorInvoiceAvoirMustBeNegative=Fel, måste korrigera fakturan ett negativt belopp
-ErrorInvoiceOfThisTypeMustBePositive=Error, this type of invoice must have an amount excluding tax positive (or null)
+ErrorInvoiceOfThisTypeMustBePositive=Fel, denna typ av faktura måste ha ett belopp exklusive skattepositivt (eller null)
 ErrorCantCancelIfReplacementInvoiceNotValidated=Fel, kan inte avbryta en faktura som har ersatts av en annan faktura som fortfarande i utkast status
 ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=Den här delen eller en annan används redan så att rabattserier inte kan tas bort.
 BillFrom=Från
@@ -178,7 +178,7 @@ DraftBills=Förslag fakturor
 CustomersDraftInvoices=Kundutkast fakturor
 SuppliersDraftInvoices=Leverantörsförslag fakturor
 Unpaid=Obetalda
-ErrorNoPaymentDefined=Error No payment defined
+ErrorNoPaymentDefined=Fel Ingen betalning definierad
 ConfirmDeleteBill=Är du säker på att du vill ta bort denna faktura?
 ConfirmValidateBill=Är du säker på att du vill bekräfta denna faktura med referens <b> %s </b>?
 ConfirmUnvalidateBill=Är du säker på att du vill ändra faktura <b> %s </b> till utkastsstatus?
@@ -212,23 +212,23 @@ NumberOfBillsByMonth=Antal fakturor per månad
 AmountOfBills=Belopp för fakturor
 AmountOfBillsHT=Mängden fakturor (utan skatt)
 AmountOfBillsByMonthHT=Mängd av fakturor per månad (netto efter skatt)
-UseSituationInvoices=Allow situation invoice
-UseSituationInvoicesCreditNote=Allow situation invoice credit note
-Retainedwarranty=Retained warranty
-AllowedInvoiceForRetainedWarranty=Retained warranty usable on the following types of invoices
-RetainedwarrantyDefaultPercent=Retained warranty default percent
-RetainedwarrantyOnlyForSituation=Make "retained warranty" available only for situation invoices
-RetainedwarrantyOnlyForSituationFinal=On situation invoices the global "retained warranty" deduction is applied only on the final situation
-ToPayOn=To pay on %s
-toPayOn=to pay on %s
-RetainedWarranty=Retained Warranty
-PaymentConditionsShortRetainedWarranty=Retained warranty payment terms
-DefaultPaymentConditionsRetainedWarranty=Default retained warranty payment terms
-setPaymentConditionsShortRetainedWarranty=Set retained warranty payment terms
-setretainedwarranty=Set retained warranty
-setretainedwarrantyDateLimit=Set retained warranty date limit
-RetainedWarrantyDateLimit=Retained warranty date limit
-RetainedWarrantyNeed100Percent=The situation invoice need to be at 100%% progress to be displayed on PDF
+UseSituationInvoices=Tillåt faktura för situationen
+UseSituationInvoicesCreditNote=Tillåt fakturakreditnota
+Retainedwarranty=Bibehållen garanti
+AllowedInvoiceForRetainedWarranty=Bibehållen garanti användbar på följande typer av fakturor
+RetainedwarrantyDefaultPercent=Bibehållen garanti standardprocent
+RetainedwarrantyOnlyForSituation=Gör "kvarhållen garanti" endast tillgänglig för fakturor
+RetainedwarrantyOnlyForSituationFinal=På lägesfakturor tillämpas det globala avdraget för "kvarhållen garanti" endast på den slutliga situationen
+ToPayOn=Att betala på %s
+toPayOn=att betala på %s
+RetainedWarranty=Bibehållen garanti
+PaymentConditionsShortRetainedWarranty=Behållna garantibetalsvillkor
+DefaultPaymentConditionsRetainedWarranty=Standardbehållna garantibetalsvillkor
+setPaymentConditionsShortRetainedWarranty=Ställ in garantibetalsvillkor
+setretainedwarranty=Ställ in bibehållen garanti
+setretainedwarrantyDateLimit=Ställ in begränsad garantiperiod
+RetainedWarrantyDateLimit=Gräns för bibehållen garantidatum
+RetainedWarrantyNeed100Percent=Situationsfakturan måste vara på 100%%-framsteg för att kunna visas på PDF
 AlreadyPaid=Redan betalats ut
 AlreadyPaidBack=Redan återbetald
 AlreadyPaidNoCreditNotesNoDeposits=Redan betalad (utan kreditnoteringar och nedbetalningar)
@@ -259,6 +259,7 @@ DateMaxPayment=Betalning på grund av
 DateInvoice=Fakturadatum
 DatePointOfTax=Skattpunkt
 NoInvoice=Ingen faktura
+NoOpenInvoice=No open invoice
 ClassifyBill=Märk faktura
 SupplierBillsToPay=Obetalda leverantörsfakturor
 CustomerBillsUnpaid=Obetalda kundfakturor
@@ -292,8 +293,8 @@ AddGlobalDiscount=Lägg rabatt
 EditGlobalDiscounts=Redigera absoluta rabatter
 AddCreditNote=Skapa kreditnota
 ShowDiscount=Visa rabatt
-ShowReduc=Show the discount
-ShowSourceInvoice=Show the source invoice
+ShowReduc=Visa rabatten
+ShowSourceInvoice=Visa källfakturan
 RelativeDiscount=Relativ rabatt
 GlobalDiscount=Global rabatt
 CreditNote=Kreditnota
@@ -330,8 +331,8 @@ InvoiceDateCreation=Faktura datum för skapande
 InvoiceStatus=Faktura status
 InvoiceNote=Faktura not
 InvoicePaid=Faktura betalas
-InvoicePaidCompletely=Paid completely
-InvoicePaidCompletelyHelp=Invoice that are paid completely. This excludes invoices that are paid partially. To get list of all 'Closed' or non 'Closed' invoices, prefer to use a filter on the invoice status.
+InvoicePaidCompletely=Betald helt
+InvoicePaidCompletelyHelp=Faktura som betalas helt. Detta exkluderar fakturor som betalas delvis. För att få en lista över alla "Stängda" eller icke "Stängda" fakturor, använd helst ett filter på fakturastatus.
 OrderBilled=Order fakturerad
 DonationPaid=Donation betald
 PaymentNumber=Betalning nummer
@@ -376,18 +377,18 @@ DateLastGeneration=Datum för senaste generationen
 DateLastGenerationShort=Datum senaste gen.
 MaxPeriodNumber=Max. Antal fakturahantering
 NbOfGenerationDone=Antal fakturahantering redan gjort
-NbOfGenerationOfRecordDone=Number of record generation already done
+NbOfGenerationOfRecordDone=Antal rekordgenerering redan gjort
 NbOfGenerationDoneShort=Antal generationer gjort
 MaxGenerationReached=Maximalt antal generationer som uppnåtts
 InvoiceAutoValidate=Bekräfta fakturor automatiskt
 GeneratedFromRecurringInvoice=Genererad från mall återkommande faktura %s
 DateIsNotEnough=Datum uppnått ännu inte
 InvoiceGeneratedFromTemplate=Faktura %s genererad från återkommande mallfaktura %s
-GeneratedFromTemplate=Generated from template invoice %s
+GeneratedFromTemplate=Genereras från mallfaktura %s
 WarningInvoiceDateInFuture=Varning, fakturadatumet är högre än aktuellt datum
 WarningInvoiceDateTooFarInFuture=Varning, fakturadatumet är för långt från det aktuella datumet
 ViewAvailableGlobalDiscounts=Visa lediga rabatter
-GroupPaymentsByModOnReports=Group payments by mode on reports
+GroupPaymentsByModOnReports=Gruppera betalningar efter läge på rapporter
 # PaymentConditions
 Statut=Status
 PaymentConditionShortRECEP=Förfaller vid kvitto
@@ -414,10 +415,10 @@ PaymentConditionShort14D=14 dagar
 PaymentCondition14D=14 dagar
 PaymentConditionShort14DENDMONTH=14 dagar i månadsskiftet
 PaymentCondition14DENDMONTH=Inom 14 dagar efter slutet av månaden
-FixAmount=Fixed amount - 1 line with label '%s'
+FixAmount=Fast belopp - 1 rad med etiketten '%s'
 VarAmount=Variabelt belopp (%% summa)
 VarAmountOneLine=Variabel mängd (%% tot.) - 1 rad med etikett '%s'
-VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
+VarAmountAllLines=Variabelt belopp (%% tot.) - alla rader från ursprung
 # PaymentType
 PaymentTypeVIR=Banköverföring
 PaymentTypeShortVIR=Banköverföring
@@ -445,8 +446,8 @@ BankAccountNumberKey=kontrollsumma
 Residence=Adress
 IBANNumber=IBAN kontonummer
 IBAN=IBAN
-CustomerIBAN=IBAN of customer
-SupplierIBAN=IBAN of vendor
+CustomerIBAN=IBAN av kunden
+SupplierIBAN=IBAN från leverantören
 BIC=BIC / SWIFT
 BICNumber=BIC / SWIFT-kod
 ExtraInfos=Extra infos
@@ -454,7 +455,7 @@ RegulatedOn=Regleras
 ChequeNumber=Kontrollera nr
 ChequeOrTransferNumber=Kontrollera / Transfer nr
 ChequeBordereau=Kontrollera schema
-ChequeMaker=Check/Transfer sender
+ChequeMaker=Kontrollera / överför avsändaren
 ChequeBank=Bank av Check
 CheckBank=Check
 NetToBePaid=Netto som skall betalas
@@ -498,34 +499,34 @@ Cash=Kontanter
 Reported=Försenad
 DisabledBecausePayments=Inte möjlig eftersom det inte finns några betalningar
 CantRemovePaymentWithOneInvoicePaid=Kan inte ta bort betalning eftersom det finns minst en faktura märkt som betalt
-CantRemovePaymentVATPaid=Can't remove payment since VAT declaration is classified paid
-CantRemovePaymentSalaryPaid=Can't remove payment since salary is classified paid
+CantRemovePaymentVATPaid=Det går inte att ta bort betalningen eftersom momsdeklarationen klassificeras som betald
+CantRemovePaymentSalaryPaid=Det går inte att ta bort betalningen eftersom lönen klassificeras som betald
 ExpectedToPay=Förväntad utbetalning
 CantRemoveConciliatedPayment=Det går inte att ta bort avstämd betalning
 PayedByThisPayment=Betalas av denna betalning
-ClosePaidInvoicesAutomatically=Classify automatically all standard, down payment or replacement invoices as "Paid" when payment is done entirely.
-ClosePaidCreditNotesAutomatically=Classify automatically all credit notes as "Paid" when refund is done entirely.
-ClosePaidContributionsAutomatically=Classify automatically all social or fiscal contributions as "Paid" when payment is done entirely.
-ClosePaidVATAutomatically=Classify automatically VAT declaration as "Paid" when payment is done entirely.
-ClosePaidSalaryAutomatically=Classify automatically salary as "Paid" when payment is done entirely.
+ClosePaidInvoicesAutomatically=Klassificera automatiskt alla standard-, utbetalnings- eller ersättningsfakturor som "Betalda" när betalningen sker helt.
+ClosePaidCreditNotesAutomatically=Klassificera automatiskt alla kreditnota som "Betald" när återbetalningen sker helt.
+ClosePaidContributionsAutomatically=Klassificera automatiskt alla sociala eller skattemässiga avgifter som "Betalda" när betalningen sker helt.
+ClosePaidVATAutomatically=Klassificera automatiskt momsdeklaration som "Betald" när betalningen sker helt.
+ClosePaidSalaryAutomatically=Klassificera automatiskt lön som "Betald" när betalningen sker helt.
 AllCompletelyPayedInvoiceWillBeClosed=Alla fakturor utan återbetalning kommer automatiskt att stängas med status "Betald".
 ToMakePayment=Betala
 ToMakePaymentBack=Återbetala
 ListOfYourUnpaidInvoices=Lista över obetalda fakturor
 NoteListOfYourUnpaidInvoices=OBS: Denna lista innehåller bara fakturor för tredje parti som du är kopplade till som en försäljning representant.
-RevenueStamp=Tax stamp
+RevenueStamp=Skatt stämpel
 YouMustCreateInvoiceFromThird=Det här alternativet är endast tillgängligt när du skapar en faktura från fliken "Kund" från tredje part
 YouMustCreateInvoiceFromSupplierThird=Det här alternativet är endast tillgängligt när du skapar en faktura från fliken "Leverantör" till tredje part
 YouMustCreateStandardInvoiceFirstDesc=Du måste först skapa en standardfaktura och konvertera den till "mall" för att skapa en ny mallfaktura
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
+PDFCrabeDescription=Faktura PDF-mall Crabe. En komplett fakturamall (gammal implementering av Sponge-mall)
 PDFSpongeDescription=Faktura PDF mall Svamp. En komplett fakturamall
 PDFCrevetteDescription=Faktura PDF-mall Crevette. En komplett faktura mall för lägesfakturor
-TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
-MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+TerreNumRefModelDesc1=Returnummer i formatet %syymm-nnnn för standardfakturor och %syymm-nnnn för kreditnoter där yy är år, mm är månad och nnnn är ett sekventiellt automatiskt inkrementeringsnummer utan paus och ingen retur till 0
+MarsNumRefModelDesc1=Returnummer i formatet %syymm-nnnn för standardfakturor, %syymm-nnnn för utbytesfakturor, %syymm-nnnn för utbetalningsfakturor och %syymm-nnnn är utan paus och ingen återgång till 0
 TerreNumRefModelError=Ett lagförslag som börjar med $ syymm finns redan och är inte förenligt med denna modell för sekvens. Ta bort den eller byta namn på den för att aktivera denna modul.
-CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
-EarlyClosingReason=Early closing reason
-EarlyClosingComment=Early closing note
+CactusNumRefModelDesc1=Returnummer i formatet %syymm-nnnn för standardfakturor, %syymm-nnnn för kreditnoter och %syymm-nnnn för utbetalningsfakturor där yy är år, mm är månad och nnnn är ett sekventiellt returneringsnummer utan ink 0
+EarlyClosingReason=Tidigt stängningsskäl
+EarlyClosingComment=Tidig avslutningsnot
 ##### Types de contacts #####
 TypeContact_facture_internal_SALESREPFOLL=Representanten uppföljning kundfaktura
 TypeContact_facture_external_BILLING=Kundfaktura kontakt
@@ -570,8 +571,8 @@ ToCreateARecurringInvoiceGeneAuto=Om du behöver generera sådana fakturor autom
 DeleteRepeatableInvoice=Ta bort mallfaktura
 ConfirmDeleteRepeatableInvoice=Är du säker på att du vill ta bort mallfakturan?
 CreateOneBillByThird=Skapa en faktura per tredje part (annars, en faktura per order)
-BillCreated=%s invoice(s) generated
-BillXCreated=Invoice %s generated
+BillCreated=%s genererade fakturor
+BillXCreated=Faktura %s genererad
 StatusOfGeneratedDocuments=Status för dokumentgenerering
 DoNotGenerateDoc=Generera inte dokumentfil
 AutogenerateDoc=Auto generera dokumentfil
@@ -581,11 +582,12 @@ AutoFillDateTo=Ange slutdatum för servicelinje med nästa fakturadatum
 AutoFillDateToShort=Ange slutdatum
 MaxNumberOfGenerationReached=Max antal gen. nådde
 BILL_DELETEInDolibarr=Faktura deleted
-BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
-UnitPriceXQtyLessDiscount=Unit price x Qty - Discount
-CustomersInvoicesArea=Customer billing area
-SupplierInvoicesArea=Supplier billing area
-FacParentLine=Invoice Line Parent
-SituationTotalRayToRest=Remainder to pay without taxe
-PDFSituationTitle=Situation n° %d
-SituationTotalProgress=Total progress %d %%
+BILL_SUPPLIER_DELETEInDolibarr=Leverantörsfaktura borttagen
+UnitPriceXQtyLessDiscount=Enhetspris x Antal - Rabatt
+CustomersInvoicesArea=Kundfaktureringsområde
+SupplierInvoicesArea=Leverantörsfaktureringsområde
+FacParentLine=Fakturarad förälder
+SituationTotalRayToRest=Resten att betala utan skatt
+PDFSituationTitle=Läge nr %d
+SituationTotalProgress=Total framsteg %d %%
+SearchUnpaidInvoicesWithDueDate=Sök efter obetalda fakturor med förfallodatum = %s
diff --git a/htdocs/langs/sv_SE/cashdesk.lang b/htdocs/langs/sv_SE/cashdesk.lang
index 30700e123e5..0b2be869956 100644
--- a/htdocs/langs/sv_SE/cashdesk.lang
+++ b/htdocs/langs/sv_SE/cashdesk.lang
@@ -16,7 +16,7 @@ AddThisArticle=Lägg till den här artikeln
 RestartSelling=Gå tillbaka på sälj
 SellFinished=Försäljning avslutad
 PrintTicket=Skriv ut biljetten
-SendTicket=Send ticket
+SendTicket=Skicka biljett
 NoProductFound=Ingen artikel hittades
 ProductFound=Produkt hittad
 NoArticle=Ingen artikel
@@ -41,8 +41,8 @@ Floor=Golv
 AddTable=Lägg till tabell
 Place=Plats
 TakeposConnectorNecesary='TakePOS Connector' krävs
-OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
-NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser:
+OrderPrinters=Lägg till en knapp för att skicka beställningen till vissa skrivare utan betalning (till exempel för att skicka en beställning till ett kök)
+NotAvailableWithBrowserPrinter=Ej tillgängligt när skrivaren för mottagning är inställd på webbläsaren:
 SearchProduct=Sök produkt
 Receipt=Kvitto
 Header=Rubrik
@@ -50,81 +50,81 @@ Footer=sidfot
 AmountAtEndOfPeriod=Belopp vid periodens utgång (dag, månad eller år)
 TheoricalAmount=Teoretisk mängd
 RealAmount=Verklig mängd
-CashFence=Cash desk closing
-CashFenceDone=Cash desk closing done for the period
+CashFence=Kassastängning
+CashFenceDone=Kassastängning gjord för perioden
 NbOfInvoices=Antal av fakturor
 Paymentnumpad=Typ av kudde för att komma in i betalningen
 Numberspad=Numbers Pad
 BillsCoinsPad=Mynt och sedlar Pad
 DolistorePosCategory=TakePOS-moduler och andra POS-lösningar för Dolibarr
-TakeposNeedsCategories=TakePOS needs at least one product categorie to work
-TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS needs at least 1 product category under the category <b>%s</b> to work
-OrderNotes=Can add some notes to each ordered items
+TakeposNeedsCategories=TakePOS behöver minst en produktkategori för att fungera
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS behöver minst 1 produktkategori under kategorin <b> %s </b> för att arbeta
+OrderNotes=Kan lägga till några anteckningar till varje beställd artikel
 CashDeskBankAccountFor=Standardkonto som ska användas för betalningar i
 NoPaimementModesDefined=Inget paimentläge definierat i TakePOS-konfiguration
-TicketVatGrouped=Group VAT by rate in tickets|receipts
-AutoPrintTickets=Automatically print tickets|receipts
-PrintCustomerOnReceipts=Print customer on tickets|receipts
+TicketVatGrouped=Gruppmoms efter skattesats i biljetter | kvitton
+AutoPrintTickets=Skriv automatiskt ut biljetter | kvitton
+PrintCustomerOnReceipts=Skriv ut kund på biljetter | kvitton
 EnableBarOrRestaurantFeatures=Aktivera funktioner för bar eller restaurang
 ConfirmDeletionOfThisPOSSale=Bekräftar du att du har raderat den aktuella försäljningen?
-ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ?
+ConfirmDiscardOfThisPOSSale=Vill du kasta den här aktuella försäljningen?
 History=Historia
-ValidateAndClose=Validate and close
+ValidateAndClose=Validera och stäng
 Terminal=Terminal
-NumberOfTerminals=Number of Terminals
-TerminalSelect=Select terminal you want to use:
-POSTicket=POS Ticket
-POSTerminal=POS Terminal
-POSModule=POS Module
-BasicPhoneLayout=Use basic layout for phones
-SetupOfTerminalNotComplete=Setup of terminal %s is not complete
-DirectPayment=Direct payment
-DirectPaymentButton=Add a "Direct cash payment" button
-InvoiceIsAlreadyValidated=Invoice is already validated
-NoLinesToBill=No lines to bill
-CustomReceipt=Custom Receipt
-ReceiptName=Receipt Name
-ProductSupplements=Manage supplements of products
-SupplementCategory=Supplement category
-ColorTheme=Color theme
-Colorful=Colorful
+NumberOfTerminals=Antal terminaler
+TerminalSelect=Välj terminal du vill använda:
+POSTicket=POS-biljett
+POSTerminal=POS-terminal
+POSModule=POS-modul
+BasicPhoneLayout=Använd grundläggande layout för telefoner
+SetupOfTerminalNotComplete=Installationen av terminal %s är inte klar
+DirectPayment=Direktbetalning
+DirectPaymentButton=Lägg till knappen "Direkt kontant betalning"
+InvoiceIsAlreadyValidated=Fakturan är redan validerad
+NoLinesToBill=Inga rader att fakturera
+CustomReceipt=Anpassat kvitto
+ReceiptName=Kvittans namn
+ProductSupplements=Hantera kosttillskott av produkter
+SupplementCategory=Tilläggskategori
+ColorTheme=Färgtema
+Colorful=Färgrik
 HeadBar=Head Bar
-SortProductField=Field for sorting products
+SortProductField=Fält för sortering av produkter
 Browser=Webbläsare
-BrowserMethodDescription=Simple and easy receipt printing. Only a few parameters to configure the receipt. Print via browser.
-TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud.
-PrintMethod=Print method
-ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. The server hosting the application can't be in the Cloud (must be able to reach the printers in your network).
-ByTerminal=By terminal
-TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
-CashDeskRefNumberingModules=Numbering module for POS sales
-CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
-TakeposGroupSameProduct=Group same products lines
-StartAParallelSale=Start a new parallel sale
-SaleStartedAt=Sale started at %s
-ControlCashOpening=Control cash popup at opening POS
-CloseCashFence=Close cash desk control
-CashReport=Cash report
-MainPrinterToUse=Main printer to use
-OrderPrinterToUse=Order printer to use
-MainTemplateToUse=Main template to use
-OrderTemplateToUse=Order template to use
-BarRestaurant=Bar Restaurant
-AutoOrder=Order by the customer himself
-RestaurantMenu=Menu
-CustomerMenu=Customer menu
-ScanToMenu=Scan QR code to see the menu
-ScanToOrder=Scan QR code to order
-Appearance=Appearance
-HideCategoryImages=Hide Category Images
-HideProductImages=Hide Product Images
-NumberOfLinesToShow=Number of lines of images to show
-DefineTablePlan=Define tables plan
-GiftReceiptButton=Add a "Gift receipt" button
-GiftReceipt=Gift receipt
-ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
-AllowDelayedPayment=Allow delayed payment
-PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
-WeighingScale=Weighing scale
-ShowPriceHT = Display the price excluding tax column
-ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
+BrowserMethodDescription=Enkel och enkel kvittoutskrift. Bara några få parametrar för att konfigurera kvittot. Skriv ut via webbläsaren.
+TakeposConnectorMethodDescription=Extern modul med extra funktioner. Möjlighet att skriva ut från molnet.
+PrintMethod=Utskriftsmetod
+ReceiptPrinterMethodDescription=Kraftfull metod med många parametrar. Fullt anpassningsbara med mallar. Servern som är värd för applikationen kan inte finnas i molnet (måste kunna nå skrivarna i ditt nätverk).
+ByTerminal=Med terminal
+TakeposNumpadUsePaymentIcon=Använd ikonen istället för text på betalningsknapparna på numpad
+CashDeskRefNumberingModules=Numreringsmodul för POS-försäljning
+CashDeskGenericMaskCodes6 =  <br> <b> {TN} </b>-tagg används för att lägga till terminalnumret
+TakeposGroupSameProduct=Gruppera samma produktlinjer
+StartAParallelSale=Starta en ny parallellförsäljning
+SaleStartedAt=Försäljningen startade på %s
+ControlCashOpening=Öppna popup-kontrollen "Kontrollera kontanter" när du öppnar kassan
+CloseCashFence=Stäng kassakontrollen
+CashReport=Kassarapport
+MainPrinterToUse=Huvudskrivare att använda
+OrderPrinterToUse=Beställ skrivaren att använda
+MainTemplateToUse=Huvudmallen som ska användas
+OrderTemplateToUse=Beställ mall som ska användas
+BarRestaurant=Barrestaurang
+AutoOrder=Beställ av kunden själv
+RestaurantMenu=Meny
+CustomerMenu=Kundmeny
+ScanToMenu=Skanna QR-kod för att se menyn
+ScanToOrder=Skanna QR-kod för att beställa
+Appearance=Utseende
+HideCategoryImages=Dölj kategoribilder
+HideProductImages=Dölj produktbilder
+NumberOfLinesToShow=Antal bilder som ska visas
+DefineTablePlan=Definiera tabellplan
+GiftReceiptButton=Lägg till knappen "Presentkvitto"
+GiftReceipt=Presentkvitto
+ModuleReceiptPrinterMustBeEnabled=Modulkvittenskrivaren måste ha aktiverats först
+AllowDelayedPayment=Tillåt försenad betalning
+PrintPaymentMethodOnReceipts=Skriv ut betalningsmetod på biljetter | kvitton
+WeighingScale=Våg
+ShowPriceHT = Visa kolumnen med priset exklusive moms (på skärmen)
+ShowPriceHTOnReceipt = Visa kolumnen med pris exklusive moms (vid mottagande)
diff --git a/htdocs/langs/sv_SE/commercial.lang b/htdocs/langs/sv_SE/commercial.lang
index 839967ec383..c9cf4eed54f 100644
--- a/htdocs/langs/sv_SE/commercial.lang
+++ b/htdocs/langs/sv_SE/commercial.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - commercial
-Commercial=Commerce
-CommercialArea=Commerce area
+Commercial=Handel
+CommercialArea=Handelsområde
 Customer=Kunden
 Customers=Kunder
 Prospect=Prospect
@@ -64,10 +64,11 @@ ActionAC_SHIP=Skicka Leverans med e-post
 ActionAC_SUP_ORD=Skicka inköpsorder via post
 ActionAC_SUP_INV=Skicka försäljningsfaktura via post
 ActionAC_OTH=Andra
-ActionAC_OTH_AUTO=Automatiskt införda händelser
+ActionAC_OTH_AUTO=Other auto
 ActionAC_MANUAL=Manuellt införda händelser
 ActionAC_AUTO=Automatiskt införda händelser
-ActionAC_OTH_AUTOShort=Automatiskt
+ActionAC_OTH_AUTOShort=Andra
+ActionAC_EVENTORGANIZATION=Event organisation evenemang
 Stats=Försäljningsstatistik
 StatusProsp=Prospect status
 DraftPropals=Utforma kommersiella förslag
diff --git a/htdocs/langs/sv_SE/companies.lang b/htdocs/langs/sv_SE/companies.lang
index 7e32ab3ac3c..01a4b7750f8 100644
--- a/htdocs/langs/sv_SE/companies.lang
+++ b/htdocs/langs/sv_SE/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=Företagets namn %s finns redan. Välj en annan en.
 ErrorSetACountryFirst=Välj land först
 SelectThirdParty=Välj en tredje part
-ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
+ConfirmDeleteCompany=Är du säker på att du vill ta bort företaget och all relaterad information?
 DeleteContact=Radera en kontakt
-ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
+ConfirmDeleteContact=Är du säker på att du vill ta bort den här kontakten och all relaterad information?
 MenuNewThirdParty=Ny tredjepart
 MenuNewCustomer=Ny kund
 MenuNewProspect=Nytt perspektiv
@@ -27,7 +27,7 @@ AliasNames=Alias namn (kommersiellt, varumärke, ...)
 AliasNameShort=Alias namn
 Companies=Företag
 CountryIsInEEC=Landet ligger inom Europeiska ekonomiska gemenskapen
-PriceFormatInCurrentLanguage=Price display format in the current language and currency
+PriceFormatInCurrentLanguage=Prisvisningsformat på aktuellt språk och valuta
 ThirdPartyName=Namn på tredjepart
 ThirdPartyEmail=Tredjeparts e-post
 ThirdParty=Tredjepart
@@ -43,10 +43,10 @@ Individual=Privatperson
 ToCreateContactWithSameName=Skapar automatiskt en kontakt / adress med samma information som tredjepart under tredjepart. I de flesta fall, även om din tredjepart är en fysisk person, är det bara att skapa en tredjepart.
 ParentCompany=Moderbolaget
 Subsidiaries=Dotterbolag
-ReportByMonth=Report per month
-ReportByCustomers=Report per customer
-ReportByThirdparties=Report per thirdparty
-ReportByQuarter=Report per rate
+ReportByMonth=Rapportera per månad
+ReportByCustomers=Rapportera per kund
+ReportByThirdparties=Rapport per tredje part
+ReportByQuarter=Rapportera per kurs
 CivilityCode=Hövlighet kod
 RegisteredOffice=Säte
 Lastname=Efternamn
@@ -54,10 +54,10 @@ Firstname=Förnamn
 PostOrFunction=Befattning
 UserTitle=Titel
 NatureOfThirdParty=Tredjepartens art
-NatureOfContact=Nature of Contact
+NatureOfContact=Kontaktens art
 Address=Adress
 State=Delstat / provins
-StateCode=State/Province code
+StateCode=Stat / provins kod
 StateShort=stat
 Region=Region
 Region-State=Region - Stat
@@ -69,7 +69,7 @@ PhoneShort=Telefonen
 Skype=Skype
 Call=Ring upp
 Chat=Chat
-PhonePro=Bus. phone
+PhonePro=Företagstelefon
 PhonePerso=Pers. telefon
 PhoneMobile=Mobil
 No_Email=Avvisa bulk emailings
@@ -78,7 +78,7 @@ Zip=Postnummer
 Town=Stad
 Web=Webb
 Poste= Position
-DefaultLang=Default language
+DefaultLang=Standardspråk
 VATIsUsed=Försäljningsskatt används
 VATIsUsedWhenSelling=Detta definierar om den här tredjeparten inkluderar en försäljningsskatt eller inte när den fakturerar sina egna kunder
 VATIsNotUsed=Försäljningsskatt används inte
@@ -125,7 +125,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr)
 ProfId2AT=Prof Id 2 (USt.-Nr)
 ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=EORI number
+ProfId5AT=EORI-nummer
 ProfId6AT=-
 ProfId1AU=Prof Id 1 (ABN)
 ProfId2AU=-
@@ -137,7 +137,7 @@ ProfId1BE=Prof Id 1 (Professional antal)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=EORI number
+ProfId5BE=EORI-nummer
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inscricao Estadual)
@@ -149,7 +149,7 @@ ProfId1CH=UID-Nummer
 ProfId2CH=-
 ProfId3CH=Prof Id 1 (Federal antal)
 ProfId4CH=Prof Id 2 (Commercial Rekordmånga)
-ProfId5CH=EORI number
+ProfId5CH=EORI-nummer
 ProfId6CH=-
 ProfId1CL=Prof Id 1 (RUT)
 ProfId2CL=-
@@ -167,19 +167,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr)
 ProfId2DE=Prof Id 2 (USt.-Nr)
 ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
 ProfId4DE=-
-ProfId5DE=EORI number
+ProfId5DE=EORI-nummer
 ProfId6DE=-
 ProfId1ES=Prof Id 1 (CIF / NIF)
 ProfId2ES=Prof Id 2 (Social Security Number)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate nummer)
-ProfId5ES=Prof Id 5 (EORI number)
+ProfId5ES=Prof Id 5 (EORI-nummer)
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (Siret)
 ProfId3FR=Prof Id 3 (NAF, gamla APE)
 ProfId4FR=Prof Id 4 (RCS / RM)
-ProfId5FR=Prof Id 5 (numéro EORI)
+ProfId5FR=Prof Id 5 (EORI-nummer)
 ProfId6FR=-
 ProfId1ShortFR=SIREN
 ProfId2ShortFR=SIRET
@@ -209,13 +209,13 @@ ProfId1IT=-
 ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
-ProfId5IT=EORI number
+ProfId5IT=EORI-nummer
 ProfId6IT=-
 ProfId1LU=Id. prof. 1 (R.C.S. Luxemburg)
 ProfId2LU=Id. prof. 2 (affärstillstånd)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=EORI number
+ProfId5LU=EORI-nummer
 ProfId6LU=-
 ProfId1MA=Id prof. 1 (RC)
 ProfId2MA=Id prof. 2 (Patent)
@@ -233,13 +233,13 @@ ProfId1NL=KvK Nummer
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=-
-ProfId5NL=EORI number
+ProfId5NL=EORI-nummer
 ProfId6NL=-
 ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (personnummer)
 ProfId3PT=Prof Id 3 (organisationsnummer)
 ProfId4PT=Prof Id 4 (konservatoriet)
-ProfId5PT=Prof Id 5 (EORI number)
+ProfId5PT=Prof Id 5 (EORI-nummer)
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=Ninea
@@ -263,7 +263,7 @@ ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
 ProfId4RO=Prof Id 5 (EUID)
-ProfId5RO=Prof Id 5 (EORI number)
+ProfId5RO=Prof Id 5 (EORI-nummer)
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -305,12 +305,12 @@ SupplierAbsoluteDiscountAllUsers=Absoluta leverantörsrabatter (angivna av alla
 SupplierAbsoluteDiscountMy=Absoluta leverantörsrabatter (angivna av dig själv)
 DiscountNone=Ingen
 Vendor=Säljare
-Supplier=Vendor
+Supplier=Leverantör
 AddContact=Skapa kontakt
 AddContactAddress=Skapa kontakt / adress
 EditContact=Redigera kontakt / adress
 EditContactAddress=Redigera kontakt / adress
-Contact=Contact/Address
+Contact=Kontakt Adress
 Contacts=Kontakter/adresser
 ContactId=Kontakt id
 ContactsAddresses=Kontakt / Adresser
@@ -318,7 +318,7 @@ FromContactName=Namn:
 NoContactDefinedForThirdParty=Ingen kontakt inlagd för denna tredje part
 NoContactDefined=Ingen kontakt inlagd
 DefaultContact=Standard kontakt / adress
-ContactByDefaultFor=Default contact/address for
+ContactByDefaultFor=Standardkontakt / adress för
 AddThirdParty=Skapa tredje part
 DeleteACompany=Ta bort ett företag
 PersonalInformations=Personuppgifter
@@ -331,15 +331,15 @@ CustomerCodeDesc=Kundkod, unik för alla kunder
 SupplierCodeDesc=Leverantörskod, unik för alla leverantörer
 RequiredIfCustomer=Krävs om tredje part är en kund eller möjlig kund
 RequiredIfSupplier=Krävs om tredjepart är en leverantör
-ValidityControledByModule=Validity controlled by the module
+ValidityControledByModule=Giltighet kontrollerad av modulen
 ThisIsModuleRules=Regler för denna modul
 ProspectToContact=Möjlig kund att kontakta
 CompanyDeleted=Företaget "%s" raderad från databasen.
 ListOfContacts=Lista med kontakter / adresser
 ListOfContactsAddresses=Lista med kontakter / adresser
 ListOfThirdParties=Förteckning över tredjeparter
-ShowCompany=Third Party
-ShowContact=Contact-Address
+ShowCompany=Tredje part
+ShowContact=Kontaktadress
 ContactsAllShort=Alla (inget filter)
 ContactType=Kontakttyp
 ContactForOrders=Beställningens kontaktinformation
@@ -358,7 +358,7 @@ MyContacts=Mina kontakter
 Capital=Kapital
 CapitalOf=Kapital %s
 EditCompany=Redigera företag
-ThisUserIsNot=This user is not a prospect, customer or vendor
+ThisUserIsNot=Denna användare är inte en prospekt, kund eller leverantör
 VATIntraCheck=Kontrollera
 VATIntraCheckDesc=Moms-ID måste innehålla land prefix. Länken <b> %s </b> använder den europeiska mervärdesskattjänsten (VIES) som kräver internetåtkomst från Dolibarr-servern.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
@@ -366,8 +366,8 @@ VATIntraCheckableOnEUSite=Kontrollera momsnumret inom gemenskapen på Europeiska
 VATIntraManualCheck=Du kan också kontrollera manuellt på Europeiska kommissionens webbplats <a href="%s" target="_blank"> %s </a>
 ErrorVATCheckMS_UNAVAILABLE=Kontroll inte möjlig. Kontrollera om tjänsten tillhandahålls av medlemsstaten (%s).
 NorProspectNorCustomer=Inte utsikter, eller kund
-JuridicalStatus=Business entity type
-Workforce=Workforce
+JuridicalStatus=Typ av affärsenhet
+Workforce=Arbetskraft
 Staff=anställda
 ProspectLevelShort=Potentiella
 ProspectLevel=Prospect potential
@@ -426,11 +426,11 @@ AllocateCommercial=Tilldelad försäljningsrepresentant
 Organization=Organisation
 FiscalYearInformation=Räkenskapsår
 FiscalMonthStart=Första månad av verksamhetsåret
-SocialNetworksInformation=Social networks
-SocialNetworksFacebookURL=Facebook URL
-SocialNetworksTwitterURL=Twitter URL
+SocialNetworksInformation=Sociala nätverk
+SocialNetworksFacebookURL=Facebook-URL
+SocialNetworksTwitterURL=Twitter-URL
 SocialNetworksLinkedinURL=Linkedin URL
-SocialNetworksInstagramURL=Instagram URL
+SocialNetworksInstagramURL=Instagram-URL
 SocialNetworksYoutubeURL=Youtube URL
 SocialNetworksGithubURL=Github URL
 YouMustAssignUserMailFirst=Du måste skapa ett mail för den här användaren innan du kan lägga till ett e-postmeddelande.
@@ -439,39 +439,39 @@ ListSuppliersShort=Förteckning över leverantörer
 ListProspectsShort=Förteckning över utsikter
 ListCustomersShort=Förteckning över kunder
 ThirdPartiesArea=Tredjeparter / Kontakter
-LastModifiedThirdParties=Latest %s Third Parties which were modified
-UniqueThirdParties=Total number of Third Parties
+LastModifiedThirdParties=Senaste %s tredjeparter som modifierades
+UniqueThirdParties=Totalt antal tredjeparter
 InActivity=Öppen
 ActivityCeased=Stängt
 ThirdPartyIsClosed=Tredjepart är stängd
-ProductsIntoElements=List of products/services mapped to %s
+ProductsIntoElements=Lista över produkter / tjänster mappade till %s
 CurrentOutstandingBill=Obetalda fakturor
 OutstandingBill=Max för obetald faktura
 OutstandingBillReached=Max. för enastående räkning uppnådd
 OrderMinAmount=Minsta belopp för beställning
-MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
+MonkeyNumRefModelDesc=Returnera ett nummer i formatet %syymm-nnnn för kundkoden och %syymm-nnnn för leverantörskoden där yy är år, mm är månad och nnnn är ett sekventiellt automatiskt inkrementeringsnummer utan paus och ingen retur till 0.
 LeopardNumRefModelDesc=Kund / leverantör-nummer är ledig. Denna kod kan ändras när som helst.
 ManagingDirectors=Företagledares namn (vd, direktör, ordförande ...)
 MergeOriginThirdparty=Duplicera tredjepart (tredjepart du vill ta bort)
 MergeThirdparties=Sammanfoga tredjepart
-ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
+ConfirmMergeThirdparties=Är du säker på att du vill slå samman den valda tredjeparten med den nuvarande? Alla länkade objekt (fakturor, beställningar, ...) flyttas till den aktuella tredjeparten, varefter den valda tredjeparten raderas.
 ThirdpartiesMergeSuccess=Tredjepart har blivit fusionerad
 SaleRepresentativeLogin=Inloggning av försäljare
 SaleRepresentativeFirstname=Förnamn på försäljningsrepresentant
 SaleRepresentativeLastname=Efternamn för försäljare
 ErrorThirdpartiesMerge=Ett fel uppstod vid borttagning av tredjepart. Kontrollera loggen. Ändringar har återställts.
 NewCustomerSupplierCodeProposed=Kunder eller leverantörskod som redan används, föreslås en ny kod
-KeepEmptyIfGenericAddress=Keep this field empty if this address is a generic address
+KeepEmptyIfGenericAddress=Håll det här fältet tomt om den här adressen är en generisk adress
 #Imports
 PaymentTypeCustomer=Betalningstyp - Kund
 PaymentTermsCustomer=Betalningsvillkor - Kund
 PaymentTypeSupplier=Betalningstyp - Leverantör
 PaymentTermsSupplier=Betalningstid - Leverantör
-PaymentTypeBoth=Payment Type - Customer and Vendor
+PaymentTypeBoth=Betalningstyp - Kund och leverantör
 MulticurrencyUsed=Använd multicurrency
 MulticurrencyCurrency=Valuta
-InEEC=Europe (EEC)
-RestOfEurope=Rest of Europe (EEC)
-OutOfEurope=Out of Europe (EEC)
-CurrentOutstandingBillLate=Current outstanding bill late
-BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
+InEEC=Europa (EEG)
+RestOfEurope=Övriga Europa (EEG)
+OutOfEurope=Ut ur Europa (EEG)
+CurrentOutstandingBillLate=Nuvarande utestående räkning sent
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Var försiktig, beroende på dina produktprisinställningar, bör du ändra tredje part innan du lägger till produkten i kassan.
diff --git a/htdocs/langs/sv_SE/compta.lang b/htdocs/langs/sv_SE/compta.lang
index b7fc9b2eb22..a8130ac889a 100644
--- a/htdocs/langs/sv_SE/compta.lang
+++ b/htdocs/langs/sv_SE/compta.lang
@@ -286,3 +286,9 @@ ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
 IncludeLoansInResults = Include loans in reports
+InvoiceLate30Days = Invoices late > 30 days
+InvoiceLate15Days = Invoices late > 15 days
+InvoiceLateMinus15Days = Invoices late
+InvoiceNotLate = To be collected < 15 days
+InvoiceNotLate15Days = To be collected in 15 days
+InvoiceNotLate30Days = To be collected in 30 days
diff --git a/htdocs/langs/sv_SE/cron.lang b/htdocs/langs/sv_SE/cron.lang
index 05f3017600e..0ed0dfbe866 100644
--- a/htdocs/langs/sv_SE/cron.lang
+++ b/htdocs/langs/sv_SE/cron.lang
@@ -60,7 +60,7 @@ CronErrEndDateStartDt=Slutdatum kan inte vara före startdatum
 StatusAtInstall=Status vid modulinstallation
 CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Inaktivera
-CronTaskInactive=Det här jobbet är avaktiverat
+CronTaskInactive=This job is disabled (not scheduled)
 CronId=Id
 CronClassFile=Filnamn med klass
 CronModuleHelp=Namn på Dolibarr-modulkatalogen (fungerar även med extern Dolibarr-modul). <BR> Till exempel att ringa hämtningsmetoden för Dolibarr Produktobjekt / htdocs / <u> produkt </u> /class/product.class.php, värdet för modulen är <br> <i> produkt </i>
diff --git a/htdocs/langs/sv_SE/deliveries.lang b/htdocs/langs/sv_SE/deliveries.lang
index 1f08745558f..d765beb7c66 100644
--- a/htdocs/langs/sv_SE/deliveries.lang
+++ b/htdocs/langs/sv_SE/deliveries.lang
@@ -2,7 +2,7 @@
 Delivery=Leverans
 DeliveryRef=Er referens
 DeliveryCard=Kvittokort
-DeliveryOrder=Delivery receipt
+DeliveryOrder=Leveranskvitto
 DeliveryDate=Leveransdatum
 CreateDeliveryOrder=Skapa orderbekräftelse
 DeliveryStateSaved=Leveransstatus sparad
@@ -27,5 +27,6 @@ Recipient=Mottagare
 ErrorStockIsNotEnough=Det finns inte tillräckligt i lager
 Shippable=Sändbara
 NonShippable=Inte sändbara
+ShowShippableStatus=Visa leveransstatus
 ShowReceiving=Visa orderbekräftelse
 NonExistentOrder=Icke-existerande ordning
diff --git a/htdocs/langs/sv_SE/donations.lang b/htdocs/langs/sv_SE/donations.lang
index 902ed742443..d8c64be326e 100644
--- a/htdocs/langs/sv_SE/donations.lang
+++ b/htdocs/langs/sv_SE/donations.lang
@@ -16,7 +16,7 @@ DonationStatusPromiseNotValidatedShort=Förslag
 DonationStatusPromiseValidatedShort=Bekräftat
 DonationStatusPaidShort=Mottagna
 DonationTitle=Donation kvitto
-DonationDate=Donation date
+DonationDate=Donationsdatum
 DonationDatePayment=Betalningsdag
 ValidPromess=Bekräfta löfte
 DonationReceipt=Donation kvitto
@@ -32,3 +32,4 @@ DONATION_ART238=Visar artikel 238 från CGI om du är orolig
 DONATION_ART885=Visar artikel 885 från CGI om du är orolig
 DonationPayment=Donation
 DonationValidated=Gåva %s bekräftad
+DonationUseThirdparties=Använd en befintlig tredjepart som givarkoordinator
diff --git a/htdocs/langs/sv_SE/errors.lang b/htdocs/langs/sv_SE/errors.lang
index 15b18a8e5ba..94a0422b8d0 100644
--- a/htdocs/langs/sv_SE/errors.lang
+++ b/htdocs/langs/sv_SE/errors.lang
@@ -4,13 +4,14 @@
 NoErrorCommitIsDone=Inget fel
 # Errors
 ErrorButCommitIsDone=Fel hittades men vi bekräfta trots detta
-ErrorBadEMail=Email %s is incorrect
-ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
-ErrorBadUrl=Url %s is incorrect
+ErrorBadEMail=E-post %s är felaktigt
+ErrorBadMXDomain=E-post %s verkar felaktig (domänen har ingen giltig MX-post)
+ErrorBadUrl=Url %s är felaktig
 ErrorBadValueForParamNotAString=Dåligt värde för din parameter. Det lägger till i allmänhet när översättning saknas.
-ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
+ErrorRefAlreadyExists=Referens <b> %s </b> finns redan.
 ErrorLoginAlreadyExists=Logga %s finns redan.
 ErrorGroupAlreadyExists=Grupp %s finns redan.
+ErrorEmailAlreadyExists=Email %s already exists.
 ErrorRecordNotFound=Spela in hittades inte.
 ErrorFailToCopyFile=Det gick inte att kopiera filen <b>&quot;%s&quot;</b> till <b>&quot;%s&quot;.</b>
 ErrorFailToCopyDir=Misslyckades att kopiera katalogen '<b> %s </b>' i '<b> %s </b>'.
@@ -38,7 +39,7 @@ ErrorBadSupplierCodeSyntax=Dålig syntax för leverantörskod
 ErrorSupplierCodeRequired=Leverantörskod krävs
 ErrorSupplierCodeAlreadyUsed=Leverantörskod som redan används
 ErrorBadParameters=Dåliga parametrar
-ErrorWrongParameters=Wrong or missing parameters
+ErrorWrongParameters=Fel eller saknade parametrar
 ErrorBadValueForParameter=Felvärde '%s' för parameter '%s'
 ErrorBadImageFormat=Bildfilen har inte ett format som stöds (Din PHP stöder inte funktioner för att konvertera bilder av det här formatet)
 ErrorBadDateFormat=Värde &quot;%s&quot; har fel datumformat
@@ -46,11 +47,11 @@ ErrorWrongDate=Datum är inte korrekt!
 ErrorFailedToWriteInDir=Misslyckades med att skriva i katalogen %s
 ErrorFoundBadEmailInFile=Hittade felaktig e-syntax för %s rader i filen (t.ex. linje %s med email = %s)
 ErrorUserCannotBeDelete=Användaren kan inte raderas. Kanske är det associerat med Dolibarr-enheter.
-ErrorFieldsRequired=Some required fields have been left blank.
-ErrorSubjectIsRequired=The email subject is required
+ErrorFieldsRequired=Vissa obligatoriska fält har lämnats tomma.
+ErrorSubjectIsRequired=E-postämnet krävs
 ErrorFailedToCreateDir=Misslyckades med att skapa en katalog. Kontrollera att webbservern användaren har rättigheter att skriva till Dolibarr dokument katalogen. Om parametern <b>safe_mode</b> är aktiv på PHP, kontrollera att Dolibarr php-filer äger till webbserver användare (eller grupp).
 ErrorNoMailDefinedForThisUser=Ingen post definierats för denna användare
-ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
+ErrorSetupOfEmailsNotComplete=Installationen av e-postmeddelanden är inte klar
 ErrorFeatureNeedJavascript=Denna funktion måste ha Javascript vara aktiverat för att arbeta. Ändra detta i inställning - displayen.
 ErrorTopMenuMustHaveAParentWithId0=En meny av typen &quot;Top&quot; kan inte ha en förälder meny. Sätt 0 i överordnade menyn eller välja en meny av typen &quot;Vänster&quot;.
 ErrorLeftMenuMustHaveAParentId=En meny av typen &quot;Vänster&quot; måste ha en förälder id.
@@ -59,12 +60,12 @@ ErrorDirNotFound=Nummer <b>%s</b> inte hittat (Bad väg, fel behörighet eller 
 ErrorFunctionNotAvailableInPHP=Funktion <b>%s</b> krävs för denna funktion, men finns inte i denna version och konfigureringen av PHP.
 ErrorDirAlreadyExists=En katalog med detta namn finns redan.
 ErrorFileAlreadyExists=En fil med detta namn finns redan.
-ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exists.
+ErrorDestinationAlreadyExists=En annan fil med namnet <b> %s </b> finns redan.
 ErrorPartialFile=Handlingar den mottagit inte helt av server.
 ErrorNoTmpDir=Tillfälliga directy %s inte existerar.
 ErrorUploadBlockedByAddon=Ladda upp blockeras av en PHP / Apache plugin.
 ErrorFileSizeTooLarge=Filen är för stor.
-ErrorFieldTooLong=Field %s is too long.
+ErrorFieldTooLong=Fältet %s är för långt.
 ErrorSizeTooLongForIntType=Storlek för lång för int typ (%s siffror max)
 ErrorSizeTooLongForVarcharType=Storlek för lång för sträng typ (%s tecken max)
 ErrorNoValueForSelectType=Vänligen fyll i värde för utvald lista
@@ -79,7 +80,7 @@ ErrorExportDuplicateProfil=Detta profilnamn finns redan för denna export.
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP matchning inte är fullständig.
 ErrorLDAPMakeManualTest=A. LDIF filen har genererats i katalogen %s. Försök att läsa in den manuellt från kommandoraden för att få mer information om fel.
 ErrorCantSaveADoneUserWithZeroPercentage=Kan inte spara en åtgärd med "status inte startad" om fältet "gjort av" också är fyllt.
-ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
+ErrorRefAlreadyExists=Referens <b> %s </b> finns redan.
 ErrorPleaseTypeBankTransactionReportName=Var god ange kontoutdragsnamnet där posten ska rapporteras
 ErrorRecordHasChildren=Misslyckades med att radera rekord eftersom det har några barnrekord.
 ErrorRecordHasAtLeastOneChildOfType=Objektet har minst ett barn av typ %s
@@ -96,13 +97,13 @@ ErrorSpecialCharNotAllowedForField=Speciella tecken är inte tillåtna för anv
 ErrorNumRefModel=En hänvisning finns i databasen (%s) och är inte förenligt med denna numrering regel. Ta bort post eller bytt namn hänvisning till aktivera den här modulen.
 ErrorQtyTooLowForThisSupplier=Mängden är för låg för den här försäljaren eller inget pris som definieras på denna produkt för den här försäljaren
 ErrorOrdersNotCreatedQtyTooLow=Vissa beställningar har inte skapats på grund av för låga kvantiteter
-ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
+ErrorModuleSetupNotComplete=Installationen av modulen %s verkar vara ofullständig. Gå hem - Installation - Moduler för att slutföra.
 ErrorBadMask=Fel på masken
 ErrorBadMaskFailedToLocatePosOfSequence=Fel, mask utan löpnummer
 ErrorBadMaskBadRazMonth=Fel, dåligt återställningsvärde
 ErrorMaxNumberReachForThisMask=Maximalt antal uppnådda för denna mask
 ErrorCounterMustHaveMoreThan3Digits=Räknaren måste ha mer än 3 siffror
-ErrorSelectAtLeastOne=Error, select at least one entry.
+ErrorSelectAtLeastOne=Fel, välj minst en post.
 ErrorDeleteNotPossibleLineIsConsolidated=Radera inte möjligt eftersom posten är kopplad till en banktransaktion som försonas
 ErrorProdIdAlreadyExist=%s tilldelas ett annat tredje
 ErrorFailedToSendPassword=Misslyckades med att skicka lösenord
@@ -117,15 +118,15 @@ ErrorCantReadFile=Misslyckades med att läsa filen &quot;%s&quot;
 ErrorCantReadDir=Misslyckades att läsa katalogen &quot;%s&quot;
 ErrorBadLoginPassword=Felaktigt värde för inloggning eller lösenord
 ErrorLoginDisabled=Ditt konto har inaktiverats
-ErrorFailedToRunExternalCommand=Misslyckades med att köra externa kommandot. Kontrollera den är tillgänglig och körbar av din PHP-server. Om PHP <b>Safe Mode</b> är aktiverat, kontrollera att kommandot är inne i en katalog definieras av parameter <b>safe_mode_exec_dir.</b>
+ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server user. Check also the command is not protected on shell level by a security layer like apparmor.
 ErrorFailedToChangePassword=Det gick inte att ändra lösenord
 ErrorLoginDoesNotExists=Användaren med inloggning <b>%s</b> kunde inte hittas.
 ErrorLoginHasNoEmail=Denna användare har inga e-postadress. Process avbruten.
 ErrorBadValueForCode=Dåligt värde typer för kod. Försök igen med ett nytt värde ...
 ErrorBothFieldCantBeNegative=Fält %s och %s kan inte vara både negativt
-ErrorFieldCantBeNegativeOnInvoice=Field <strong>%s</strong> cannot be negative on this type of invoice. If you need to add a discount line, just create the discount first (from field '%s' in thirdparty card) and apply it to the invoice.
-ErrorLinesCantBeNegativeForOneVATRate=Total of lines (net of tax) can't be negative for a given not null VAT rate (Found a negative total for VAT rate <b>%s</b>%%).
-ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a deposit. You will face problems when you will need to consume the deposit in final invoice if you do so.
+ErrorFieldCantBeNegativeOnInvoice=Fält <strong> %s </strong> kan inte vara negativt på denna typ av faktura. Om du behöver lägga till en rabattrad, skapar du bara rabatten först (från fältet '%s' på tredjepartskort) och tillämpar den på fakturan.
+ErrorLinesCantBeNegativeForOneVATRate=Totalt antal rader (netto efter skatt) kan inte vara negativt för en given icke-null mervärdesskattesats (Hittade en negativ summa för mervärdesskattesats <b> %s </b> %%).
+ErrorLinesCantBeNegativeOnDeposits=Linjer kan inte vara negativa vid insättning. Du kommer att stöta på problem när du behöver konsumera depositionen i slutfakturan om du gör det.
 ErrorQtyForCustomerInvoiceCantBeNegative=Kvantitet för linje i kundfakturor kan inte vara negativt
 ErrorWebServerUserHasNotPermission=Användarkonto <b>%s</b> användas för att exekvera webbserver har ingen behörighet för den
 ErrorNoActivatedBarcode=Ingen streckkod typ aktiveras
@@ -140,8 +141,8 @@ ErrorNewValueCantMatchOldValue=Nytt värde kan inte vara lika med gamla
 ErrorFailedToValidatePasswordReset=Det gick inte att REINIT lösenord. Kan vara reinit var redan gjort (den här länken kan bara användas en gång). Om inte, försök att starta om reinit processen.
 ErrorToConnectToMysqlCheckInstance=Anslut till databasen misslyckas. Kontrollera databaseserveren körs (till exempel med mysql / mariadb kan du starta det från kommandoraden med "sudo service mysql start").
 ErrorFailedToAddContact=Det gick inte att lägga till kontakt
-ErrorDateMustBeBeforeToday=The date must be lower than today
-ErrorDateMustBeInFuture=The date must be greater than today
+ErrorDateMustBeBeforeToday=Datumet måste vara lägre än idag
+ErrorDateMustBeInFuture=Datumet måste vara större än idag
 ErrorPaymentModeDefinedToWithoutSetup=Ett betalningsläge var inställt för att skriva %s, men installationen av modulens faktura fördes inte att definiera informationen som ska visas för den här betalningsläget.
 ErrorPHPNeedModule=Fel, din PHP måste ha modul <b>%s</b> installerad för att använda den här funktionen.
 ErrorOpenIDSetupNotComplete=Du inställning för Dolibarr konfigurationsfil möjliggör OpenID autentisering, men webbadressen OpenID tjänsten definieras inte i ständig %s
@@ -189,7 +190,7 @@ ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Dålig definition av menyfältet
 ErrorSavingChanges=Ett fel har uppstått när ändringarna sparas
 ErrorWarehouseRequiredIntoShipmentLine=Lager krävs på linjen att skicka
 ErrorFileMustHaveFormat=Filen måste ha format %s
-ErrorFilenameCantStartWithDot=Filename can't start with a '.'
+ErrorFilenameCantStartWithDot=Filnamn kan inte börja med ett '.'
 ErrorSupplierCountryIsNotDefined=Land för den här försäljaren är inte definierad. Korrigera detta först.
 ErrorsThirdpartyMerge=Misslyckades att slå samman de två dokumenten. Förfrågan avbruten.
 ErrorStockIsNotEnoughToAddProductOnOrder=Lager är inte tillräckligt för produkt %s för att lägga till det i en ny order.
@@ -206,7 +207,7 @@ ErrorPhpMailDelivery=Kontrollera att du inte använder ett för stort antal mott
 ErrorUserNotAssignedToTask=Användaren måste tilldelas uppgiften för att kunna ange tidskrävande.
 ErrorTaskAlreadyAssigned=Uppgift som redan tilldelats användaren
 ErrorModuleFileSeemsToHaveAWrongFormat=Modulpaketet verkar ha fel format.
-ErrorModuleFileSeemsToHaveAWrongFormat2=At least one mandatory directory must exists into zip of module: <strong>%s</strong> or <strong>%s</strong>
+ErrorModuleFileSeemsToHaveAWrongFormat2=Minst en obligatorisk katalog måste finnas i modulens zip: <strong> %s </strong> eller <strong> %s </strong>
 ErrorFilenameDosNotMatchDolibarrPackageRules=Namnet på modulpaketet (<strong> %s </strong>) matchar inte förväntat namnsyntax: <strong> %s </strong>
 ErrorDuplicateTrigger=Fel, duplicera utlösarens namn %s. Redan laddad från %s.
 ErrorNoWarehouseDefined=Fel, inga lager definierade.
@@ -220,51 +221,52 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=Du måste välja om artikeln är
 ErrorDiscountLargerThanRemainToPaySplitItBefore=Den rabatt du försöker att tillämpa är större än förblir att betala. Dela rabatten i 2 mindre rabatter före.
 ErrorFileNotFoundWithSharedLink=Filen hittades inte. Det kan hända att dela nyckeln ändrades eller filen togs bort nyligen.
 ErrorProductBarCodeAlreadyExists=Produktens streckkod %s finns redan på en annan produktreferens.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Observera också att det inte är möjligt att använda kit för att automatiskt öka / minska subprodukterna när minst en delprodukt (eller delprodukt av delprodukter) behöver ett serienummer.
 ErrorDescRequiredForFreeProductLines=Beskrivning är obligatorisk för linjer med fri produkt
 ErrorAPageWithThisNameOrAliasAlreadyExists=Sidan / behållaren <strong> %s </strong> har samma namn eller alternativ alias som den du försöker använda
 ErrorDuringChartLoad=Fel vid inmatning av kontoplan. Om några konton inte laddades, kan du fortfarande skriva in dem manuellt.
 ErrorBadSyntaxForParamKeyForContent=Dålig syntax för param keyforcontent. Måste ha ett värde som börjar med %s eller %s
 ErrorVariableKeyForContentMustBeSet=Fel, konstanten med namnet %s (med textinnehåll som ska visas) eller %s (med extern webbadress för att visa) måste ställas in.
-ErrorURLMustEndWith=URL %s must end %s
+ErrorURLMustEndWith=URL %s måste sluta %s
 ErrorURLMustStartWithHttp=URL %s måste börja med http: // eller https: //
-ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
+ErrorHostMustNotStartWithHttp=Värdnamn %s får INTE börja med http: // eller https: //
 ErrorNewRefIsAlreadyUsed=Fel, den nya referensen används redan
-ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
-ErrorSearchCriteriaTooSmall=Search criteria too small.
-ErrorObjectMustHaveStatusActiveToBeDisabled=Objects must have status 'Active' to be disabled
-ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Objects must have status 'Draft' or 'Disabled' to be enabled
-ErrorNoFieldWithAttributeShowoncombobox=No fields has property 'showoncombobox' into definition of object '%s'. No way to show the combolist.
-ErrorFieldRequiredForProduct=Field '%s' is required for product %s
-ProblemIsInSetupOfTerminal=Problem is in setup of terminal %s.
-ErrorAddAtLeastOneLineFirst=Add at least one line first
-ErrorRecordAlreadyInAccountingDeletionNotPossible=Error, record is already transferred in accounting, deletion is not possible.
-ErrorLanguageMandatoryIfPageSetAsTranslationOfAnother=Error, language is mandatory if you set the page as a translation of another one.
-ErrorLanguageOfTranslatedPageIsSameThanThisPage=Error, language of translated page is same than this one.
-ErrorBatchNoFoundForProductInWarehouse=No lot/serial found for product "%s" in warehouse "%s".
-ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=No enough quantity for this lot/serial for product "%s" in warehouse "%s".
-ErrorOnlyOneFieldForGroupByIsPossible=Only 1 field for the 'Group by' is possible (others are discarded)
-ErrorTooManyDifferentValueForSelectedGroupBy=Found too many different value (more than <b>%s</b>) for the field '<b>%s</b>', so we can't use it as a 'Group by' for graphics. The field 'Group By' has been removed. May be you wanted to use it as an X-Axis ?
-ErrorReplaceStringEmpty=Error, the string to replace into is empty
-ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
-ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
-ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
-ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<b> to allow use of Command Line Interface by the internal job scheduler
-ErrorLoginDateValidity=Error, this login is outside the validity date range
-ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
-ErrorReservedKeyword=The word '<b>%s</b>' is a reserved keyword
-ErrorNotAvailableWithThisDistribution=Not available with this distribution
-ErrorPublicInterfaceNotEnabled=Public interface was not enabled
-ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
-ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
-ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
-ErrorDateIsInFuture=Error, the date can't be in the future
-ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
-ErrorAPercentIsRequired=Error, please fill in the percentage correctly
-ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
+ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Fel, ta bort betalning kopplad till en stängd faktura är inte möjlig.
+ErrorSearchCriteriaTooSmall=För kort sökkriterie.
+ErrorObjectMustHaveStatusActiveToBeDisabled=Objekt måste ha status 'Aktiv' för att kunna inaktiveras
+ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Objekt måste ha statusen 'Utkast' eller 'Inaktiverad' för att aktiveras
+ErrorNoFieldWithAttributeShowoncombobox=Inga fält har egenskapen 'showoncombobox' till definition av objektet '%s'. Inget sätt att visa kombineraren.
+ErrorFieldRequiredForProduct=Fältet '%s' krävs för produkten %s
+ProblemIsInSetupOfTerminal=Problemet är vid installation av terminal %s.
+ErrorAddAtLeastOneLineFirst=Lägg till minst en rad först
+ErrorRecordAlreadyInAccountingDeletionNotPossible=Fel, posten har redan överförts i bokföringen, raderingen är inte möjlig.
+ErrorLanguageMandatoryIfPageSetAsTranslationOfAnother=Fel, språk är obligatoriskt om du ställer in sidan som översättning till en annan.
+ErrorLanguageOfTranslatedPageIsSameThanThisPage=Fel, översatt sidas språk är detsamma som det här.
+ErrorBatchNoFoundForProductInWarehouse=Inget parti / serie hittades för produkten "%s" i lager "%s".
+ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=Det finns inte tillräckligt med kvantitet för det här partiet / serien för produkten "%s" i lager "%s".
+ErrorOnlyOneFieldForGroupByIsPossible=Endast ett fält för "Gruppera efter" är möjligt (andra kasseras)
+ErrorTooManyDifferentValueForSelectedGroupBy=Hittade för många olika värden (mer än <b> %s </b>) för fältet '<b> %s </b>', så vi kan inte använda den som en grupp. Fältet "Gruppera efter" har tagits bort. Kanske du ville använda den som en X-Axis?
+ErrorReplaceStringEmpty=Fel, strängen som ska ersättas med är tom
+ErrorProductNeedBatchNumber=Fel, produkt '<b> %s </b>' behöver mycket / serienummer
+ErrorProductDoesNotNeedBatchNumber=Fel, produkt '<b> %s </b>' accepterar inte mycket / serienummer
+ErrorFailedToReadObject=Fel, det gick inte att läsa objekt av typen <b> %s </b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Fel, parameter <b> %s </b> måste aktiveras i <b> conf / conf.php <b> för att tillåta användning av kommandoradsgränssnittet med den interna jobbplaneringen
+ErrorLoginDateValidity=Fel, den här inloggningen ligger utanför giltighetsdatumintervallet
+ErrorValueLength=Fältets längd '<b> %s </b>' måste vara högre än '<b> %s </b>'
+ErrorReservedKeyword=Ordet '<b> %s </b>' är ett reserverat nyckelord
+ErrorNotAvailableWithThisDistribution=Ej tillgängligt med denna distribution
+ErrorPublicInterfaceNotEnabled=Det offentliga gränssnittet var inte aktiverat
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=Språket på den nya sidan måste definieras om det är inställt som en översättning av en annan sida
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=Språket på den nya sidan får inte vara källspråket om det är inställt som en översättning av en annan sida
+ErrorAParameterIsRequiredForThisOperation=En parameter är obligatorisk för denna åtgärd
+ErrorDateIsInFuture=Fel, datumet kan inte vara i framtiden
+ErrorAnAmountWithoutTaxIsRequired=Fel, belopp är obligatoriskt
+ErrorAPercentIsRequired=Fel, fyll i procent korrekt
+ErrorYouMustFirstSetupYourChartOfAccount=Du måste först ställa in ditt kontoplan
+ErrorFailedToFindEmailTemplate=Det gick inte att hitta mall med kodnamn %s
 
 # Warnings
-WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
+WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Din PHP-parameter upload_max_filesize (%s) är högre än PHP-parameter post_max_size (%s). Detta är inte en konsekvent installation.
 WarningPasswordSetWithNoAccount=Ett lösenord har ställts för den här medlemmen. Men inget användarkonto skapades. Så det här lösenordet är lagrat men kan inte användas för att logga in till Dolibarr. Den kan användas av en extern modul / gränssnitt men om du inte behöver definiera någon inloggning eller ett lösenord för en medlem kan du inaktivera alternativet "Hantera en inloggning för varje medlem" från inställningen av medlemsmodulen. Om du behöver hantera en inloggning men inte behöver något lösenord, kan du hålla fältet tomt för att undvika denna varning. Obs! Email kan också användas som inloggning om medlemmen är länkad till en användare.
 WarningMandatorySetupNotComplete=Klicka här för att ställa in obligatoriska parametrar
 WarningEnableYourModulesApplications=Klicka här för att aktivera dina moduler och applikationer
@@ -287,14 +289,15 @@ WarningYourLoginWasModifiedPleaseLogin=Din inloggning har ändrats. För säkerh
 WarningAnEntryAlreadyExistForTransKey=Det finns redan en post för översättningsnyckeln för det här språket
 WarningNumberOfRecipientIsRestrictedInMassAction=Varning, antalet olika mottagare är begränsat till <b> %s </b> vid användning av massåtgärder på listor
 WarningDateOfLineMustBeInExpenseReportRange=Varning, datumet för raden ligger inte inom kostnadsberäkningsområdet
-WarningProjectDraft=Project is still in draft mode. Don't forget to validate it if you plan to use tasks.
+WarningProjectDraft=Projektet är fortfarande i utkastsläge. Glöm inte att validera det om du planerar att använda uppgifter.
 WarningProjectClosed=Projektet är stängt. Du måste öppna den först igen.
-WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were removed after that the receipt including them were generated. So nb of cheques and total of receipt may differ from number and total in list.
-WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into ECM database index table
-WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
-WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
-WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
-WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
-ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
-ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
-CheckVersionFail=Version check fail
+WarningSomeBankTransactionByChequeWereRemovedAfter=En del banktransaktioner togs bort efter det att kvittot inklusive dem genererades. Så antal kontroller och totala kvitton kan skilja sig från antal och totala i listan.
+WarningFailedToAddFileIntoDatabaseIndex=Varning, det gick inte att lägga till filinmatning i ECM-databasindextabellen
+WarningTheHiddenOptionIsOn=Varning, det dolda alternativet <b> %s </b> är på.
+WarningCreateSubAccounts=Varning, du kan inte skapa ett underkonto direkt, du måste skapa en tredje part eller en användare och tilldela dem en redovisningskod för att hitta dem i den här listan
+WarningAvailableOnlyForHTTPSServers=Endast tillgängligt om du använder HTTPS-säker anslutning.
+WarningModuleXDisabledSoYouMayMissEventHere=Modulen %s har inte aktiverats. Så du kanske missar en hel del evenemang här.
+ErrorActionCommPropertyUserowneridNotDefined=Användarens ägare krävs
+ErrorActionCommBadType=Vald händelsetyp (id: %n, kod: %s) finns inte i ordlistan för händelsetyp
+CheckVersionFail=Versionskontroll misslyckades
+ErrorWrongFileName=Filens namn kan inte innehålla __SOMETHING__
diff --git a/htdocs/langs/sv_SE/eventorganization.lang b/htdocs/langs/sv_SE/eventorganization.lang
index 2ae2187c61a..d1aa3ba4a16 100644
--- a/htdocs/langs/sv_SE/eventorganization.lang
+++ b/htdocs/langs/sv_SE/eventorganization.lang
@@ -1,4 +1,5 @@
 # Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+# Copyright (C) 2021		Dorian Vabre			<dorian.vabre@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
@@ -16,86 +17,127 @@
 #
 # Generic
 #
-ModuleEventOrganizationName = Event Organization
-EventOrganizationDescription = Event Organization through Module Project
-EventOrganizationDescriptionLong= Manage Event organization for conference, attendees, speaker, and attendees, with public subcription page
+ModuleEventOrganizationName = Event Organisation
+EventOrganizationDescription = Eventorganisation genom modulprojekt
+EventOrganizationDescriptionLong= Hantera evenemangsorganisation för konferens, deltagare, talare och deltagare, med en offentlig prenumerationssida
 #
 # Menu
 #
-EventOrganizationMenuLeft = Organized events
-EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
+EventOrganizationMenuLeft = Organiserade evenemang
+EventOrganizationConferenceOrBoothMenuLeft = Konferens eller monter
 
 #
 # Admin page
 #
-EventOrganizationSetup = Event Organization setup
+EventOrganizationSetup = Konfiguration av händelseorganisation
 Settings = inställningar
-EventOrganizationSetupPage = Event Organization setup page
-EVENTORGANIZATION_TASK_LABEL = Label of tasks to create automatically when project is validated
+EventOrganizationSetupPage = Inställningssida för händelseorganisation
+EVENTORGANIZATION_TASK_LABEL = Etikett för uppgifter som ska skapas automatiskt när projektet valideras
 EVENTORGANIZATION_TASK_LABELTooltip = When you validate an organized event, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conference<br>Send Call for Booth<br>Receive call for conferences<br>Receive call for Booth<br>Open subscriptions to events for attendees<br>Send remind of event to speakers<br>Send remind of event to Booth hoster<br>Send remind of event to attendees
-EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties automatically created when someone suggests a conference
-EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Category to add to third-parties automatically created when they suggests a booth
-EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Template of email to send after receiving a suggestion of a conference.
-EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Template of email to send after receiving a suggestion of a booth.
-EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Template of email to send  after a subscription to a booth has been paid.
-EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Template of email to send after a subscription to an event has been paid.
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Template of email of massaction to attendes
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
-EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Kategori som automatiskt kan läggas till tredje part när någon föreslår en konferens
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Kategori som ska läggas till tredje part automatiskt skapas när de föreslår en monter
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Mall för e-post att skicka efter att ha fått ett förslag på en konferens.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Mall för e-post att skicka efter att ha fått ett förslag på en monter.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Mall för e-post att skicka efter att ett abonnemang på en monter har betalats.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Mall för e-post att skicka efter att ett abonnemang på ett evenemang har betalats.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Mall för e-post för massaktion till attendes
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Mall för e-post för massaktion till högtalare
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Filtrera tredje parts vallista i deltagarnas skapande kort / formulär med kategori
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filtrera tredje parts vallista i deltagarnas skapande kort / formulär med kundtyp
 
 #
 # Object
 #
-EventOrganizationConfOrBooth= Conference Or Booth
-ManageOrganizeEvent = Manage event organisation
-ConferenceOrBooth = Conference Or Booth
-ConferenceOrBoothTab = Conference Or Booth
-AmountOfSubscriptionPaid = Amount of subscription paid
-DateSubscription = Date of subscription
-ConferenceOrBoothAttendee = Conference Or Booth Attendee
+EventOrganizationConfOrBooth= Konferens eller monter
+ManageOrganizeEvent = Hantera evenemangsorganisation
+ConferenceOrBooth = Konferens eller monter
+ConferenceOrBoothTab = Konferens eller monter
+AmountOfSubscriptionPaid = Betalt abonnemangsbelopp
+DateSubscription = Datum för prenumeration
+ConferenceOrBoothAttendee = Konferens eller monterdeltagare
 
 #
 # Template Mail
 #
-YourOrganizationEventConfRequestWasReceived = Your request for conference was received
-YourOrganizationEventBoothRequestWasReceived = Your request for booth was received
-EventOrganizationEmailAskConf = Request for conference
-EventOrganizationEmailAskBooth = Request for booth
-EventOrganizationEmailSubsBooth = Subscription for booth
-EventOrganizationEmailSubsEvent = Subscription for an event
-EventOrganizationMassEmailAttendees = Communication to attendees
-EventOrganizationMassEmailSpeakers = Communication to speakers
+YourOrganizationEventConfRequestWasReceived = Din begäran om konferens mottogs
+YourOrganizationEventBoothRequestWasReceived = Din begäran om monter togs emot
+EventOrganizationEmailAskConf = Begäran om konferens
+EventOrganizationEmailAskBooth = Begäran om monter
+EventOrganizationEmailSubsBooth = Prenumeration på monter
+EventOrganizationEmailSubsEvent = Prenumeration på ett evenemang
+EventOrganizationMassEmailAttendees = Kommunikation till deltagarna
+EventOrganizationMassEmailSpeakers = Kommunikation till högtalarna
 
 #
 # Event
 #
-AllowUnknownPeopleSuggestConf=Allow unknown people to suggest conferences
-AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest conferences
-AllowUnknownPeopleSuggestBooth=Allow unknown people to suggest booth
-AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to suggest booth
-PriceOfRegistration=Price of registration
-PriceOfRegistrationHelp=Price of registration
-PriceOfBooth=Subscription price to stand a booth
-PriceOfBoothHelp=Subscription price to stand a booth
-EventOrganizationICSLink=Link ICS for events
-ConferenceOrBoothInformation=Conference Or Booth informations
-Attendees = Attendees
-EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+AllowUnknownPeopleSuggestConf=Tillåt okända personer att föreslå konferenser
+AllowUnknownPeopleSuggestConfHelp=Tillåt okända personer att föreslå konferenser
+AllowUnknownPeopleSuggestBooth=Låt okända personer föreslå monter
+AllowUnknownPeopleSuggestBoothHelp=Låt okända personer föreslå monter
+PriceOfRegistration=Pris för registrering
+PriceOfRegistrationHelp=Pris för registrering
+PriceOfBooth=Prenumerationspris för att stå en monter
+PriceOfBoothHelp=Prenumerationspris för att stå en monter
+EventOrganizationICSLink=Länka ICS för evenemang
+ConferenceOrBoothInformation=Information om konferens eller monter
+Attendees = Deltagare
+DownloadICSLink = Download ICS link
+EVENTORGANIZATION_SECUREKEY = Säker nyckel till länken till offentlig registrering till en konferens
+SERVICE_BOOTH_LOCATION = Tjänst som används för fakturaraden om en monterplats
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Tjänst som används för fakturaraden om en deltagarprenumeration på en konferens
 #
 # Status
 #
 EvntOrgDraft = Utkast
-EvntOrgSuggested = Suggested
-EvntOrgConfirmed = Confirmed
-EvntOrgNotQualified = Not Qualified
+EvntOrgSuggested = Föreslagen
+EvntOrgConfirmed = Bekräftad
+EvntOrgNotQualified = Inte kvalificerad
 EvntOrgDone = Klar
-EvntOrgCancelled = Cancelled
+EvntOrgCancelled = Inställt
 #
 # Public page
 #
-PublicAttendeeSubscriptionPage = Public link of registration to a conference
-MissingOrBadSecureKey = The security key is invalid or missing
-EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
-EvntOrgStartDuration = This conference starts on
-EvntOrgEndDuration =  and ends on
+SuggestForm = Suggestion page
+RegisterPage = Sida för konferenser eller monter
+EvntOrgRegistrationHelpMessage = Here, you can vote for an event, or suggest a new conference or booth for the project
+EvntOrgRegistrationConfHelpMessage = Here, you can suggest a new conference for the project
+EvntOrgRegistrationBoothHelpMessage = Here, you can suggest a new booth for the project
+ListOfSuggestedConferences = List of suggested conferences
+ListOfSuggestedBooths = List of suggested booths
+SuggestConference = Föreslå en ny konferens
+SuggestBooth = Föreslå en monter
+ViewAndVote = Visa och rösta på föreslagna händelser
+PublicAttendeeSubscriptionPage = Offentlig länk för registrering till en konferens
+MissingOrBadSecureKey = Säkerhetsnyckeln är ogiltig eller saknas
+EvntOrgWelcomeMessage = Med det här formuläret kan du registrera dig som en ny deltagare till konferensen: '%s'
+EvntOrgDuration = Denna konferens börjar på %s och slutar på %s.
+ConferenceAttendeeFee = Konferensdeltagaravgift för evenemanget: '%s' som inträffar från %s till %s.
+BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
+EventType = Typ av händelse
+
+#
+# Vote page
+#
+EvntOrgRegistrationWelcomeMessage = Välkommen till konferens- eller monteringssidan.
+EvntOrgRegistrationConfWelcomeMessage = Welcome on the conference suggestion page.
+EvntOrgRegistrationBoothWelcomeMessage = Welcome on the booth suggestion page.
+EvntOrgVoteHelpMessage = Here, you can view and vote for the suggested events for the project
+VoteOk = Your vote has been accepted.
+AlreadyVoted = You have already voted for this event.
+VoteError = An error has occurred during the vote, please try again.
+
+#
+# SubscriptionOk page
+#
+SubscriptionOk = Din prenumeration på den här konferensen har validerats
+#
+# Subscription validation mail
+#
+ConfAttendeeSubscriptionConfirmation = Bekräftelse på din prenumeration på en konferens
+#
+# Payment page
+#
+Attendee = Attendee
+PaymentConferenceAttendee = Conference attendee payment
+PaymentBoothLocation = Booth location payment
diff --git a/htdocs/langs/sv_SE/exports.lang b/htdocs/langs/sv_SE/exports.lang
index 445763abcf0..23d65892815 100644
--- a/htdocs/langs/sv_SE/exports.lang
+++ b/htdocs/langs/sv_SE/exports.lang
@@ -1,33 +1,33 @@
 # Dolibarr language file - Source file is en_US - exports
 ExportsArea=Export
-ImportArea=Import
+ImportArea=Importera
 NewExport=Ny export
 NewImport=Ny import
-ExportableDatas=Exporteras dataset
-ImportableDatas=Importeras dataset
-SelectExportDataSet=Välj uppsättning data du vill exportera ...
-SelectImportDataSet=Välj uppsättning data du vill importera ...
-SelectExportFields=Välj de fält du vill exportera, eller välj en fördefinierad exportprofil
-SelectImportFields=Välj de källfält som du vill importera och deras målfält i databasen genom att flytta dem upp och ner med ankar %s, eller välj en fördefinierad importprofil:
-NotImportedFields=Fält av källfil importeras inte
-SaveExportModel=Spara dina val som exportprofil / mall (för återanvändning).
+ExportableDatas=Exporterbar dataset
+ImportableDatas=Importabel dataset
+SelectExportDataSet=Välj dataset du vill exportera ...
+SelectImportDataSet=Välj dataset du vill importera ...
+SelectExportFields=Välj de fält du vill exportera eller välj en fördefinierad exportprofil
+SelectImportFields=Välj källfilens fält som du vill importera och deras målfält i databasen genom att flytta dem upp och ner med ankare %s, eller välj en fördefinierad importprofil:
+NotImportedFields=Fält för källfilen har inte importerats
+SaveExportModel=Spara dina val som en exportprofil / mall (för återanvändning).
 SaveImportModel=Spara den här importprofilen (för återanvändning) ...
-ExportModelName=Export profilnamn
+ExportModelName=Exportera profilnamn
 ExportModelSaved=Exportprofil sparad som <b> %s </b>.
-ExportableFields=Exporteras fält
-ExportedFields=Exporterad fält
+ExportableFields=Exporterbara fält
+ExportedFields=Exporterade fält
 ImportModelName=Importera profilnamn
-ImportModelSaved=Importera profil sparad som <b> %s </b>.
+ImportModelSaved=Importprofilen sparad som <b> %s </b>.
 DatasetToExport=Dataset att exportera
-DatasetToImport=Importera filen i datasetet
-ChooseFieldsOrdersAndTitle=Välj fält för att ...
-FieldsTitle=Fält titel
-FieldTitle=Fält titel
-NowClickToGenerateToBuildExportFile=Välj nu filformatet i kombinationsrutan och klicka på "Generera" för att bygga exportfilen ...
+DatasetToImport=Importera fil till dataset
+ChooseFieldsOrdersAndTitle=Välj fältordning ...
+FieldsTitle=Fältets titel
+FieldTitle=Fältets titel
+NowClickToGenerateToBuildExportFile=Välj nu filformatet i kombinationsrutan och klicka på "Skapa" för att bygga exportfilen ...
 AvailableFormats=Tillgängliga format
 LibraryShort=Bibliotek
-ExportCsvSeparator=Csv caracter separator
-ImportCsvSeparator=Csv caracter separator
+ExportCsvSeparator=Csv-karaktärsavgränsare
+ImportCsvSeparator=Csv-karaktärsavgränsare
 Step=Steg
 FormatedImport=Importassistent
 FormatedImportDesc1=Den här modulen låter dig uppdatera befintliga data eller lägga till nya objekt i databasen från en fil utan teknisk kunskap, med hjälp av en assistent.
@@ -39,7 +39,7 @@ FormatedExportDesc3=När data som exporteras väljs kan du välja formatet för
 Sheet=Sheet
 NoImportableData=Inga importeras data (ingen modul med definitioner för att möjliggöra data import)
 FileSuccessfullyBuilt=Fil skapad
-SQLUsedForExport=SQL Request used to extract data
+SQLUsedForExport=SQL-begäran används för att extrahera data
 LineId=Id av rad
 LineLabel=Radetikett
 LineDescription=Beskrivning av linjen
@@ -115,7 +115,7 @@ ExportDateFilter=ÅÅÅÅÅÅÅÅÅÅÅÅÅÅÅÅÅÅÅÅÅÅÅÅÅÅÅÅÅÅÅ
 ExportNumericFilter=NNNNN-filter med ett värde <br> NNNNN + NNNNN-filter över en rad värden <br> <NNNNN-filter med lägre värden <br>> NNNNN-filter med högre värden
 ImportFromLine=Importera från linjenummer
 EndAtLineNb=Avsluta vid radnummer
-ImportFromToLine=Limit range (From - To). Eg. to omit header line(s).
+ImportFromToLine=Gränsområde (Från - Till). T.ex. att utelämna rubrik (er).
 SetThisValueTo2ToExcludeFirstLine=Ange till exempel detta värde till 3 för att utesluta de 2 första raderna. <br> Om rubriklinjerna INTE utelämnas kommer detta att resultera i flera fel i Impulsimuleringen.
 KeepEmptyToGoToEndOfFile=Håll det här fältet tomt för att bearbeta alla rader till slutet av filen.
 SelectPrimaryColumnsForUpdateAttempt=Välj kolumn (er) som ska användas som primär nyckel för en UPDATE-import
@@ -133,4 +133,4 @@ KeysToUseForUpdates=Nyckel (kolumn) som ska användas för <b> uppdatering av </
 NbInsert=Antal infogade rader: %s
 NbUpdate=Antal uppdaterade rader: %s
 MultipleRecordFoundWithTheseFilters=Flera poster har hittats med dessa filter: %s
-StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
+StocksWithBatch=Lager och plats (lager) för produkter med batch / serienummer
diff --git a/htdocs/langs/sv_SE/hrm.lang b/htdocs/langs/sv_SE/hrm.lang
index 8cf4dd076d8..c82e3568849 100644
--- a/htdocs/langs/sv_SE/hrm.lang
+++ b/htdocs/langs/sv_SE/hrm.lang
@@ -9,11 +9,11 @@ ConfirmDeleteEstablishment=Är du säker på att du vill radera den här anlägg
 OpenEtablishment=Öppen anläggning
 CloseEtablishment=Stäng anläggningen
 # Dictionary
-DictionaryPublicHolidays=HRM - Public holidays
+DictionaryPublicHolidays=Ledighet - Helgdagar
 DictionaryDepartment=HRM - Avdelningslista
-DictionaryFunction=HRM - Job positions
+DictionaryFunction=HRM - Jobbpositioner
 # Module
 Employees=anställda
 Employee=Anställd
 NewEmployee=Ny anställd
-ListOfEmployees=List of employees
+ListOfEmployees=Lista över anställda
diff --git a/htdocs/langs/sv_SE/install.lang b/htdocs/langs/sv_SE/install.lang
index c24385de975..a69b7c328d0 100644
--- a/htdocs/langs/sv_SE/install.lang
+++ b/htdocs/langs/sv_SE/install.lang
@@ -11,18 +11,18 @@ ConfFileReload=Uppdatera parametrar från konfigurationsfilen.
 PHPSupportPOSTGETOk=Detta stöder PHP variabler POST och GET.
 PHPSupportPOSTGETKo=Det är möjligt att din PHP-inställning inte stöder variabler POST och / eller GET. Kontrollera parametern <b> variables_order </b> i php.ini.
 PHPSupportSessions=Detta stöder PHP sessioner.
-PHPSupport=This PHP supports %s functions.
+PHPSupport=Denna PHP stöder %s-funktioner.
 PHPMemoryOK=Din PHP max session minne är inställt på <b>%s.</b> Detta bör vara nog.
 PHPMemoryTooLow=Ditt PHP max-sessionminne är inställt på <b> %s </b> bytes. Detta är för lågt. Ändra din <b> php.ini </b> för att ställa in <b> memory_limit </b> parameter till minst <b> %s </b> bytes.
 Recheck=Klicka här för ett mer detaljerat test
 ErrorPHPDoesNotSupportSessions=Din PHP-installation stöder inte sessioner. Den här funktionen är nödvändig för att Dolibarr ska fungera. Kontrollera din PHP-inställning och behörighet i sessionskatalogen.
 ErrorPHPDoesNotSupportGD=Din PHP-installation stöder inte GD grafiska funktioner. Inga diagram kommer att finnas tillgängliga.
 ErrorPHPDoesNotSupportCurl=Din PHP-installation stöder inte Curl.
-ErrorPHPDoesNotSupportCalendar=Your PHP installation does not support php calendar extensions.
+ErrorPHPDoesNotSupportCalendar=Din PHP-installation stöder inte php-kalendertillägg.
 ErrorPHPDoesNotSupportUTF8=Din PHP-installation stöder inte UTF8-funktioner. Dolibarr kan inte fungera korrekt. Lös det här innan du installerar Dolibarr.
 ErrorPHPDoesNotSupportIntl=Din PHP-installation stöder inte Intl-funktioner.
-ErrorPHPDoesNotSupportxDebug=Your PHP installation does not support extend debug functions.
-ErrorPHPDoesNotSupport=Your PHP installation does not support %s functions.
+ErrorPHPDoesNotSupportxDebug=Din PHP-installation stöder inte utökade felsökningsfunktioner.
+ErrorPHPDoesNotSupport=Din PHP-installation stöder inte %s-funktioner.
 ErrorDirDoesNotExists=Nummer %s finns inte.
 ErrorGoBackAndCorrectParameters=Gå tillbaka och kontrollera / korrigera parametrarna.
 ErrorWrongValueForParameter=Du kan ha skrivit fel värde för parametern &quot;%s&quot;.
@@ -87,7 +87,7 @@ GoToSetupArea=Gå till Dolibarr (inställning-området)
 MigrationNotFinished=Databasversionen är inte helt uppdaterad: kör uppgraderingsprocessen igen.
 GoToUpgradePage=Gå till uppgradering sida igen
 WithNoSlashAtTheEnd=Utan ett snedstreck &quot;/&quot; i slutet
-DirectoryRecommendation=<span class="warning">IMPORTANT</span>: You must use a directory that is outside of the web pages (so do not use a subdirectory of previous parameter).
+DirectoryRecommendation= <span class="warning"> VIKTIGT </span>: Du måste använda en katalog som ligger utanför webbsidorna (så använd inte en underkatalog till föregående parameter).
 LoginAlreadyExists=Redan finns
 DolibarrAdminLogin=Dolibarr admin logik
 AdminLoginAlreadyExists=Dolibarr administratörskonto '<b> %s </b>' existerar redan. Gå tillbaka om du vill skapa en annan.
@@ -203,7 +203,7 @@ MigrationRemiseExceptEntity=Uppdatera enhetens fältvärde av llx_societe_remise
 MigrationUserRightsEntity=Uppdatera enhetens fältvärde av llx_user_rights
 MigrationUserGroupRightsEntity=Uppdatera enhetens fältvärde av llx_usergroup_rights
 MigrationUserPhotoPath=Migrering av bildvägar för användare
-MigrationFieldsSocialNetworks=Migration of users fields social networks (%s)
+MigrationFieldsSocialNetworks=Migrering av användarnas fält sociala nätverk (%s)
 MigrationReloadModule=Ladda om modulen %s
 MigrationResetBlockedLog=Återställningsmodul BlockedLog för v7-algoritmen
 ShowNotAvailableOptions=Visa otillgängliga alternativ
@@ -212,6 +212,6 @@ ErrorFoundDuringMigration=Fel (er) rapporterades under migreringsprocessen så n
 YouTryInstallDisabledByDirLock=Applikationen försökte självuppgradera, men installations- / uppgraderingssidorna har inaktiverats för säkerhet (katalog omdämd med .lock-suffix). <br>
 YouTryInstallDisabledByFileLock=Applikationen försökte självuppgradera, men installations- / uppgraderingssidorna har inaktiverats för säkerhet (genom att det finns en låsfil <strong> install.lock </strong> i katalogen dolibarr documents). <br>
 ClickHereToGoToApp=Klicka här för att gå till din ansökan
-ClickOnLinkOrRemoveManualy=If an upgrade is in progress, please wait. If not, click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
-Loaded=Loaded
-FunctionTest=Function test
+ClickOnLinkOrRemoveManualy=Vänta, om en uppgradering pågår. Om inte, klicka på följande länk. Om du alltid ser samma sida måste du ta bort / byta namn på filen install.lock i dokumentkatalogen.
+Loaded=Lastad
+FunctionTest=Funktionstest
diff --git a/htdocs/langs/sv_SE/knowledgemanagement.lang b/htdocs/langs/sv_SE/knowledgemanagement.lang
index 89be844c39f..1722fe7d0b1 100644
--- a/htdocs/langs/sv_SE/knowledgemanagement.lang
+++ b/htdocs/langs/sv_SE/knowledgemanagement.lang
@@ -47,7 +47,7 @@ KnowledgeManagementArea = Knowledge Management
 # Menu
 #
 MenuKnowledgeRecord = Knowledge base
-ListOfArticles = List of articles
+ListKnowledgeRecord = List of articles
 NewKnowledgeRecord = New article
 ValidateReply = Validate solution
 KnowledgeRecords = Articles
diff --git a/htdocs/langs/sv_SE/languages.lang b/htdocs/langs/sv_SE/languages.lang
index 3e1b532ef97..49a547e5e3b 100644
--- a/htdocs/langs/sv_SE/languages.lang
+++ b/htdocs/langs/sv_SE/languages.lang
@@ -1,11 +1,12 @@
 # Dolibarr language file - Source file is en_US - languages
-Language_am_ET=Ethiopian
+Language_am_ET=Etiopisk
 Language_ar_AR=Arabiska
 Language_ar_EG=Arabiska (egypten)
 Language_ar_SA=Arabiskt
-Language_az_AZ=Azerbaijani
+Language_ar_TN=Arabic (Tunisia)
+Language_az_AZ=Azerbajdzjanska
 Language_bn_BD=Bengaliska
-Language_bn_IN=Bengali (India)
+Language_bn_IN=Bengali (Indien)
 Language_bg_BG=Bulgariska
 Language_bs_BA=Bosniska
 Language_ca_ES=Katalanska
@@ -23,7 +24,7 @@ Language_en_GB=Engelska (Storbritannien)
 Language_en_IN=Engelska (Indien)
 Language_en_NZ=Engelska (Nya Zeeland)
 Language_en_SA=Engelska (Saudiarabien)
-Language_en_SG=English (Singapore)
+Language_en_SG=Engelska (Singapore)
 Language_en_US=Engelska (USA)
 Language_en_ZA=Engelska (Sydafrika)
 Language_es_ES=Spanska
@@ -33,16 +34,16 @@ Language_es_CL=Spanska (Chile)
 Language_es_CO=Spanska (Colombia)
 Language_es_DO=Spanska (Dominikanska republiken)
 Language_es_EC=Spanska (ecuador)
-Language_es_GT=Spanish (Guatemala)
+Language_es_GT=Spanska (Guatemala)
 Language_es_HN=Spanska (Honduras)
 Language_es_MX=Spanska (Mexiko)
 Language_es_PA=Spanska (panama)
 Language_es_PY=Spanska (Paraguay)
 Language_es_PE=Spanska (Peru)
 Language_es_PR=Spanska (Puerto Rico)
-Language_es_US=Spanish (USA)
+Language_es_US=Spanska (USA)
 Language_es_UY=Spanska (uruguay)
-Language_es_GT=Spanish (Guatemala)
+Language_es_GT=Spanska (Guatemala)
 Language_es_VE=Spanska (Venezuela)
 Language_et_EE=Estniska
 Language_eu_ES=Baskiska
@@ -51,22 +52,22 @@ Language_fi_FI=finsk
 Language_fr_BE=Franska (Belgien)
 Language_fr_CA=Franska (Kanada)
 Language_fr_CH=Franska (Schweiz)
-Language_fr_CI=French (Cost Ivory)
-Language_fr_CM=French (Cameroun)
+Language_fr_CI=Franska (kostnad elfenben)
+Language_fr_CM=Franska (Cameroun)
 Language_fr_FR=Franska
-Language_fr_GA=French (Gabon)
+Language_fr_GA=Franska (Gabon)
 Language_fr_NC=Franska (Nya Kaledonien)
-Language_fr_SN=French (Senegal)
+Language_fr_SN=Franska (Senegal)
 Language_fy_NL=Frisiska
-Language_gl_ES=Galician
+Language_gl_ES=Galiciska
 Language_he_IL=Hebreiska
-Language_hi_IN=Hindi (India)
+Language_hi_IN=Hindi (Indien)
 Language_hr_HR=Kroatiska
 Language_hu_HU=Ungerska
 Language_id_ID=Indonesiska
 Language_is_IS=Isländska
 Language_it_IT=Italienska
-Language_it_CH=Italian (Switzerland)
+Language_it_CH=Italienska (Schweiz)
 Language_ja_JP=Japanska
 Language_ka_GE=Gregorianska
 Language_km_KH=Khmer
@@ -78,12 +79,13 @@ Language_lv_LV=Lettländska
 Language_mk_MK=Makedonska
 Language_mn_MN=mongoliska
 Language_nb_NO=Norska (bokmål)
-Language_ne_NP=Nepali
+Language_ne_NP=Nepalesiska
 Language_nl_BE=Holländska (Belgien)
-Language_nl_NL=Dutch
+Language_nl_NL=Nederländska
 Language_pl_PL=Polska
 Language_pt_BR=Portugisiska (Brasilien)
 Language_pt_PT=Portugisiska
+Language_ro_MD=Romanian (Moldavia)
 Language_ro_RO=Rumänska
 Language_ru_RU=Ryska
 Language_ru_UA=Ryska (Ukraina)
@@ -101,5 +103,5 @@ Language_uz_UZ=Uzbekiska
 Language_vi_VN=Vietnamesiska
 Language_zh_CN=Kinesiska
 Language_zh_TW=Kinesiska (traditionell)
-Language_zh_HK=Chinese (Hong Kong)
+Language_zh_HK=Kinesiska (Hong Kong)
 Language_bh_MY=Malay
diff --git a/htdocs/langs/sv_SE/mails.lang b/htdocs/langs/sv_SE/mails.lang
index 0dd05d68d23..75b1b3a4c45 100644
--- a/htdocs/langs/sv_SE/mails.lang
+++ b/htdocs/langs/sv_SE/mails.lang
@@ -15,12 +15,12 @@ MailToUsers=Till användare
 MailCC=Kopiera till
 MailToCCUsers=Kopiera till användare (er)
 MailCCC=Cachad kopia till
-MailTopic=Email subject
+MailTopic=E-postämne
 MailText=Meddelande
 MailFile=Bifogade filer
 MailMessage=E-organ
-SubjectNotIn=Not in Subject
-BodyNotIn=Not in Body
+SubjectNotIn=Inte i ämne
+BodyNotIn=Inte i kroppen
 ShowEMailing=Visa e-post
 ListOfEMailings=Lista över emailings
 NewMailing=Ny e-post
@@ -78,9 +78,9 @@ GroupEmails=Grupp e-postmeddelanden
 OneEmailPerRecipient=Ett e-postmeddelande per mottagare (som standard, en e-post per post vald)
 WarningIfYouCheckOneRecipientPerEmail=Varning! Om du markerar den här rutan betyder det att endast ett e-postmeddelande skickas för flera olika poster, så om ditt meddelande innehåller substitutionsvariabler som refererar till data i en post, blir det inte möjligt att ersätta dem.
 ResultOfMailSending=Resultat av massleverans av e-post
-NbSelected=Number selected
-NbIgnored=Number ignored
-NbSent=Number sent
+NbSelected=Nummer valt
+NbIgnored=Antalet ignoreras
+NbSent=Nummer skickat
 SentXXXmessages=%s meddelande (s) skickade.
 ConfirmUnvalidateEmailing=Är du säker på att du vill ändra e-post <b> %s </b> till utkastsstatus?
 MailingModuleDescContactsWithThirdpartyFilter=Kontakt med kundfilter
@@ -92,7 +92,7 @@ MailingModuleDescEmailsFromUser=E-postmeddelanden inskrivna av användaren
 MailingModuleDescDolibarrUsers=Användare med e-post
 MailingModuleDescThirdPartiesByCategories=Tredje part (enligt kategorier)
 SendingFromWebInterfaceIsNotAllowed=Skicka från webbgränssnitt är inte tillåtet.
-EmailCollectorFilterDesc=All filters must match to have an email being collected
+EmailCollectorFilterDesc=Alla filter måste matcha för att ett e-postmeddelande ska samlas in
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Line %s i filen
@@ -126,13 +126,13 @@ TagMailtoEmail=Mottagar Email (inklusive html "mailto:" länk)
 NoEmailSentBadSenderOrRecipientEmail=Ingen email skickad. Dålig avsändare eller mottagarens e-postadress. Verifiera användarprofil.
 # Module Notifications
 Notifications=Anmälningar
-NotificationsAuto=Notifications Auto.
-NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
-ANotificationsWillBeSent=1 automatic notification will be sent by email
-SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
-AddNewNotification=Subscribe to a new automatic email notification (target/event)
-ListOfActiveNotifications=List of all active subscriptions (targets/events) for automatic email notification
-ListOfNotificationsDone=List of all automatic email notifications sent
+NotificationsAuto=Meddelanden Auto.
+NoNotificationsWillBeSent=Inga automatiska e-postmeddelanden planeras för den här händelsetypen och företaget
+ANotificationsWillBeSent=En automatisk avisering skickas via e-post
+SomeNotificationsWillBeSent=%s automatiska meddelanden skickas via e-post
+AddNewNotification=Prenumerera på ett nytt automatiskt e-postmeddelande (mål / händelse)
+ListOfActiveNotifications=Lista över alla aktiva prenumerationer (mål / händelser) för automatisk e-postavisering
+ListOfNotificationsDone=Lista över alla automatiska e-postmeddelanden som skickats
 MailSendSetupIs=Konfiguration av e-post att skicka har ställts in till "% s". Detta läge kan inte användas för att skicka massutskick.
 MailSendSetupIs2=Du måste först gå, med ett administratörskonto, i meny% Shome - Setup - e-post% s för att ändra parameter <strong>'% s'</strong> för att använda läget "% s". Med det här läget kan du ange inställningar för SMTP-servern från din internetleverantör och använda Mass mejla funktionen.
 MailSendSetupIs3=Om du har några frågor om hur man ställer in din SMTP-server, kan du be att% s.
@@ -142,7 +142,7 @@ UseFormatFileEmailToTarget=Importerad fil måste ha format <strong> email, namn,
 UseFormatInputEmailToTarget=Ange en sträng med format <strong> email, namn, förnamn, annat </strong>
 MailAdvTargetRecipients=Mottagare (avancerat urval)
 AdvTgtTitle=Fyll i inmatningsfält för att välja tredjepart eller kontakter / adresser som ska riktas in
-AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
+AdvTgtSearchTextHelp=Använd %% som jokertecken. Till exempel för att hitta alla objekt som <b> jean, joe, jim </b>, kan du mata in <b> j%% </b>, du kan också använda; som separator för värde, och använd! för utom detta värde. Till exempel <b> jean; joe; jim%%;! Jimo;! Jima%% </b> kommer att rikta alla jean, joe, börja med jim men inte jimo och inte allt som börjar med jima
 AdvTgtSearchIntHelp=Använd intervall för att välja int eller float värde
 AdvTgtMinVal=Minsta värde
 AdvTgtMaxVal=Maximalt värde
@@ -164,16 +164,16 @@ AdvTgtCreateFilter=Skapa filter
 AdvTgtOrCreateNewFilter=Namn på nytt filter
 NoContactWithCategoryFound=Ingen kontakt / adress med en kategori hittad
 NoContactLinkedToThirdpartieWithCategoryFound=Ingen kontakt / adress med en kategori hittad
-OutGoingEmailSetup=Outgoing emails
-InGoingEmailSetup=Incoming emails
-OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
-DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
+OutGoingEmailSetup=Utgående e-post
+InGoingEmailSetup=Inkommande e-postmeddelanden
+OutGoingEmailSetupForEmailing=Utgående e-post (för modul %s)
+DefaultOutgoingEmailSetup=Samma konfiguration än den globala inställningen för utgående e-post
 Information=Information
 ContactsWithThirdpartyFilter=Kontakter med filter från tredje part
-Unanswered=Unanswered
+Unanswered=Obesvarad
 Answered=Besvarade
-IsNotAnAnswer=Is not answer (initial email)
-IsAnAnswer=Is an answer of an initial email
-RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
-DefaultBlacklistMailingStatus=Default contact status for refuse bulk emailing
-DefaultStatusEmptyMandatory=Empty but mandatory
+IsNotAnAnswer=Är inte svaret (första e-postmeddelandet)
+IsAnAnswer=Är ett svar på ett första e-postmeddelande
+RecordCreatedByEmailCollector=Post skapad av e-postsamlare %s från e-post %s
+DefaultBlacklistMailingStatus=Standardkontaktstatus för att avvisa mass-e-post
+DefaultStatusEmptyMandatory=Tom men obligatorisk
diff --git a/htdocs/langs/sv_SE/main.lang b/htdocs/langs/sv_SE/main.lang
index 5f21b6ef52b..14575a4a7cd 100644
--- a/htdocs/langs/sv_SE/main.lang
+++ b/htdocs/langs/sv_SE/main.lang
@@ -29,8 +29,8 @@ AvailableVariables=Tillgängliga substitutionsvariabler
 NoTranslation=Ingen översättning
 Translation=Översättning
 CurrentTimeZone=PHP server tidszon
-EmptySearchString=Enter non empty search criterias
-EnterADateCriteria=Enter a date criteria
+EmptySearchString=Ange icke tomma sökkriterier
+EnterADateCriteria=Ange ett datumkriterium
 NoRecordFound=Ingen post funnen
 NoRecordDeleted=Ingen post borttagen
 NotEnoughDataYet=Inte tillräckligt med data
@@ -87,7 +87,7 @@ FileWasNotUploaded=En fil är vald att bifogas, men har ännu inte laddats upp.
 NbOfEntries=Antal poster
 GoToWikiHelpPage=Läs onlinehjälp (Internet behövs)
 GoToHelpPage=Läs hjälpen
-DedicatedPageAvailable=There is a dedicated help page related to your current screen
+DedicatedPageAvailable=Det finns en särskild hjälpsida relaterad till din nuvarande skärm
 HomePage=Webbsida
 RecordSaved=Post sparades
 RecordDeleted=Post raderad
@@ -118,7 +118,7 @@ InformationToHelpDiagnose=Denna information kan vara användbar för diagnostisk
 MoreInformation=Mer information
 TechnicalInformation=Teknisk information
 TechnicalID=Tekniskt ID
-LineID=Line ID
+LineID=Linje-ID
 NotePublic=Anteckning (offentlig)
 NotePrivate=Anteckning (privat)
 PrecisionUnitIsLimitedToXDecimals=Dolibarr har ställts in för att ange enhetspriser med <b>%s</b> decimaler.
@@ -159,7 +159,7 @@ RemoveLink=Ta bort länk
 AddToDraft=Lägg till i utkast
 Update=Uppdatera
 Close=Stäng
-CloseAs=Set status to
+CloseAs=Ställ in status på
 CloseBox=Ta bort widget från din instrumentpanel
 Confirm=Bekräfta
 ConfirmSendCardByMail=Vill du verkligen skicka innehållet på detta kort via mail till <b> %s </b>?
@@ -175,12 +175,12 @@ ToValidate=Att bekräfta
 NotValidated=Ej bekräftat
 Save=Spara
 SaveAs=Spara som
-SaveAndStay=Save and stay
-SaveAndNew=Save and new
+SaveAndStay=Spara och stanna
+SaveAndNew=Spara och nytt
 TestConnection=Testa anslutning
 ToClone=Klon
-ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
-ConfirmClone=Choose the data you want to clone:
+ConfirmCloneAsk=Är du säker på att du vill klona objektet <b> %s </b>?
+ConfirmClone=Välj de data du vill klona:
 NoCloneOptionsSpecified=Inga uppgifter att klona definierade.
 Of=av
 Go=Gå
@@ -191,8 +191,8 @@ Hide=Dölj
 ShowCardHere=Visa kort
 Search=Sök
 SearchOf=Sök
-SearchMenuShortCut=Ctrl + shift + f
-QuickAdd=Quick add
+SearchMenuShortCut=Ctrl + skift + f
+QuickAdd=Snabb tillägg
 QuickAddMenuShortCut=Ctrl + shift + l
 Valid=Giltig
 Approve=Godkänn
@@ -201,7 +201,7 @@ ReOpen=Öppnar igen
 Upload=Ladda upp
 ToLink=Länk
 Select=Välj
-SelectAll=Select all
+SelectAll=Välj alla
 Choose=Välj
 Resize=Ändra storlek
 ResizeOrCrop=Ändra storlek eller beskära
@@ -224,7 +224,7 @@ Value=Värde
 PersonalValue=Personlig värde
 NewObject=Ny %s
 NewValue=Nytt värde
-OldValue=Old value %s
+OldValue=Gammalt värde %s
 CurrentValue=Aktuellt värde
 Code=Kod
 Type=Typ
@@ -246,7 +246,7 @@ DefaultModel=Standard doksmall
 Action=Händelse
 About=Om
 Number=Antal
-NumberByMonth=Total reports by month
+NumberByMonth=Totalt antal rapporter per månad
 AmountByMonth=Belopp per månad
 Numero=Antal
 Limit=Gräns
@@ -272,13 +272,13 @@ DateStart=Startdatum
 DateEnd=Slutdatum
 DateCreation=Datum för skapande
 DateCreationShort=Creat. datum
-IPCreation=Creation IP
+IPCreation=Skapande IP
 DateModification=Ändringsdatum
 DateModificationShort=Ändr. datum
-IPModification=Modification IP
+IPModification=Ändring IP
 DateLastModification=Senaste ändringsdatum
 DateValidation=Bekräftelsesdatum
-DateSigning=Signing date
+DateSigning=Underteckningsdatum
 DateClosing=Sista dag
 DateDue=Förfallodag
 DateValue=Valuteringsdag
@@ -330,7 +330,7 @@ Morning=Morgon
 Afternoon=Eftermiddag
 Quadri=Quadri
 MonthOfDay=Dagens månad
-DaysOfWeek=Days of week
+DaysOfWeek=Veckodagar
 HourShort=H
 MinuteShort=mn
 Rate=Sats
@@ -341,8 +341,8 @@ KiloBytes=Kilobyte
 MegaBytes=Megabyte
 GigaBytes=Gigabyte
 TeraBytes=Terabyte
-UserAuthor=Ceated by
-UserModif=Updated by
+UserAuthor=Ceated av
+UserModif=Uppdaterad av
 b=b.
 Kb=Kb
 Mb=Mb
@@ -362,13 +362,13 @@ UnitPriceHTCurrency=Enhetspris (exkl.) (Valuta)
 UnitPriceTTC=Pris per enhet
 PriceU=Styckpris
 PriceUHT=St.pris(net)
-PriceUHTCurrency=U.P (net) (currency)
+PriceUHTCurrency=U.P (netto) (valuta)
 PriceUTTC=UPP. (inkl. skatt)
 Amount=Belopp
 AmountInvoice=Fakturabelopp
 AmountInvoiced=Belopp fakturerat
-AmountInvoicedHT=Amount invoiced (excl. tax)
-AmountInvoicedTTC=Amount invoiced (inc. tax)
+AmountInvoicedHT=Fakturerat belopp (exkl. Moms)
+AmountInvoicedTTC=Fakturerat belopp (inkl. Moms)
 AmountPayment=Betalningsbelopp
 AmountHTShort=Belopp (exkl.)
 AmountTTCShort=Belopp (inkl. moms)
@@ -381,7 +381,7 @@ MulticurrencyPaymentAmount=Betalningsbelopp, ursprunglig valuta
 MulticurrencyAmountHT=Belopp (exkl. Skatt), ursprunglig valuta
 MulticurrencyAmountTTC=Belopp (inkl. Skatt), ursprunglig valuta
 MulticurrencyAmountVAT=Belopp skatt, ursprunglig valuta
-MulticurrencySubPrice=Amount sub price multi currency
+MulticurrencySubPrice=Belopp delpris flera valutor
 AmountLT1=Belopp skatt 2
 AmountLT2=Belopp skatt 3
 AmountLT1ES=Belopp RE
@@ -390,13 +390,13 @@ AmountTotal=Summa
 AmountAverage=Genomsnittligt belopp
 PriceQtyMinHT=Pris kvantitet min. (exkl. skatt)
 PriceQtyMinHTCurrency=Pris kvantitet min. (exkl. skatt) (valuta)
-PercentOfOriginalObject=Percent of original object
-AmountOrPercent=Amount or percent
+PercentOfOriginalObject=Procent av originalobjektet
+AmountOrPercent=Belopp eller procent
 Percentage=Procent
 Total=Summa
 SubTotal=Delsumma
 TotalHTShort=Totalt (exkl.)
-TotalHT100Short=Total 100%% (excl.)
+TotalHT100Short=Totalt 100%% (exkl.)
 TotalHTShortCurrency=Totalt (exkl. I valuta)
 TotalTTCShort=Summa (inkl. moms)
 TotalHT=Totalt (exkl. Skatt)
@@ -430,6 +430,7 @@ LT1IN=CGST
 LT2IN=SGST
 LT1GC=Extra cent
 VATRate=Mervärdesskattesats
+RateOfTaxN=Rate of tax %s
 VATCode=Skattesatsskod
 VATNPR=Skattesats NPR
 DefaultTaxRate=Standard skattesats
@@ -441,10 +442,10 @@ RemainToPay=Fortsätt att betala
 Module=Modul / applikation
 Modules=Moduler / Applications
 Option=Alternativ
-Filters=Filters
+Filters=Filter
 List=Lista
 FullList=Fullständig lista
-FullConversation=Full conversation
+FullConversation=Fullständig konversation
 Statistics=Statistik
 OtherStatistics=Övrig statistik
 Status=Status
@@ -473,7 +474,7 @@ ContactsAddressesForCompany=Kontakter / adresser för denna tredje part
 AddressesForCompany=Adresser för denna tredje part
 ActionsOnCompany=Evenemang för denna tredje part
 ActionsOnContact=Händelser för denna kontakt / adress
-ActionsOnContract=Events for this contract
+ActionsOnContract=Händelser för detta kontrakt
 ActionsOnMember=Händelser om denna medlem
 ActionsOnProduct=Händelser om denna produkt
 NActionsLate=%s sent
@@ -493,7 +494,7 @@ TotalDuration=Total längd
 Summary=Sammanfattning
 DolibarrStateBoard=Databasstatistik
 DolibarrWorkBoard=Öppna föremål
-NoOpenedElementToProcess=No open element to process
+NoOpenedElementToProcess=Inget öppet element att bearbeta
 Available=Tillgängliga
 NotYetAvailable=Ännu inte tillgängligt
 NotAvailable=Inte tillgänglig
@@ -507,7 +508,7 @@ to=till
 To=till
 ToDate=till
 ToLocation=till
-at=at
+at=på
 and=och
 or=eller
 Other=Andra
@@ -528,7 +529,7 @@ Draft=Utkast
 Drafts=Utkast
 StatusInterInvoiced=faktureras
 Validated=Bekräftat
-ValidatedToProduce=Validated (To produce)
+ValidatedToProduce=Validerad (att producera)
 Opened=Öppen
 OpenAll=Öppna alla)
 ClosedAll=Stängt (Alla)
@@ -661,7 +662,7 @@ SupplierPreview=Leverantörsförhandsgranskning
 ShowCustomerPreview=Visa kunden förhandsgranskning
 ShowSupplierPreview=Visa leverantörsförhandsvisning
 RefCustomer=Ref. kund
-InternalRef=Internal ref.
+InternalRef=Intern referens
 Currency=Valuta
 InfoAdmin=Information för administratörer
 Undo=Ångra
@@ -683,13 +684,13 @@ SendMail=Skicka e-post
 Email=epost
 NoEMail=Ingen e-post
 AlreadyRead=Redan läst
-NotRead=Unread
+NotRead=Oläst
 NoMobilePhone=Ingen mobiltelefon
 Owner=Ägare
 FollowingConstantsWillBeSubstituted=Följande konstanter kommer att ersätta med motsvarande värde.
 Refresh=Uppdatera
 BackToList=Tillbaka till listan
-BackToTree=Back to tree
+BackToTree=Tillbaka till trädet
 GoBack=Gå tillbaka
 CanBeModifiedIfOk=Kan ändras om det är giltigt
 CanBeModifiedIfKo=Kan ändras om inte giltigt
@@ -710,7 +711,7 @@ Method=Metod
 Receive=Ta emot
 CompleteOrNoMoreReceptionExpected=Komplet eller inget mer förväntat
 ExpectedValue=Förväntat värde
-ExpectedQty=Expected Qty
+ExpectedQty=Förväntat antal
 PartialWoman=Partiell
 TotalWoman=Totalt
 NeverReceived=Aldrig fick
@@ -727,9 +728,10 @@ MenuECM=Dokument
 MenuAWStats=AWStats
 MenuMembers=Medlemmar
 MenuAgendaGoogle=Google dagordning
-MenuTaxesAndSpecialExpenses=Taxes | Special expenses
+MenuTaxesAndSpecialExpenses=Skatter | Särskilda utgifter
 ThisLimitIsDefinedInSetup=Dolibarr gräns (meny hem-inställning-säkerhet): %s Kb, PHP gräns: %s Kb
-NoFileFound=No documents uploaded
+ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
+NoFileFound=Inga dokument laddade upp
 CurrentUserLanguage=Nuvarande språk
 CurrentTheme=Nuvarande tema
 CurrentMenuManager=Nuvarande menyhanterare
@@ -744,13 +746,13 @@ DateOfSignature=Datum för underskrift
 HidePassword=Visa kommando med dolt lösenord
 UnHidePassword=Visa riktiga kommandot med lösenord i klartext
 Root=Root
-RootOfMedias=Root of public medias (/medias)
+RootOfMedias=Rot av offentliga medier (/medias)
 Informations=Information
 Page=Sida
 Notes=Anteckningar
 AddNewLine=Lägg till ny rad
 AddFile=Lägg till fil
-FreeZone=Free-text product
+FreeZone=Fritextprodukt
 FreeLineOfType=Fri text text, typ:
 CloneMainAttributes=Klona objekt med dess viktigaste attribut
 ReGeneratePDF=Återskapa PDF
@@ -773,7 +775,7 @@ NotSupported=Stöds inte
 RequiredField=Obligatoriskt fält
 Result=Resultat
 ToTest=Test
-ValidateBefore=Item must be validated before using this feature
+ValidateBefore=Objektet måste valideras innan du använder den här funktionen
 Visibility=Synlighet
 Totalizable=Totalizable
 TotalizableDesc=Det här fältet kan totaliseras i listan
@@ -801,7 +803,7 @@ LinkToSupplierProposal=Länk till leverantörsförslag
 LinkToSupplierInvoice=Länk till leverantörsfaktura
 LinkToContract=Länk till kontrakt
 LinkToIntervention=Länk till intervention
-LinkToTicket=Link to ticket
+LinkToTicket=Länk till biljett
 CreateDraft=Skapa utkast
 SetToDraft=Tillbaka till utkast
 ClickToEdit=Klicka för att redigera
@@ -845,7 +847,7 @@ XMoreLines=%s rader osynliga
 ShowMoreLines=Visa fler / mindre rader
 PublicUrl=Offentlig webbadress
 AddBox=Lägg till låda
-SelectElementAndClick=Select an element and click on %s
+SelectElementAndClick=Välj ett element och klicka på %s
 PrintFile=Skriv ut fil %s
 ShowTransaction=Visa post på bankkonto
 ShowIntervention=Visar ingripande
@@ -856,20 +858,20 @@ Denied=Nekad
 ListOf=Lista över %s
 ListOfTemplates=Lista över mallar
 Gender=Kön
-Genderman=Male
-Genderwoman=Female
+Genderman=Manlig
+Genderwoman=Kvinna
 Genderother=Andra
 ViewList=Visa lista
-ViewGantt=Gantt view
-ViewKanban=Kanban view
+ViewGantt=Gantt-vy
+ViewKanban=Kanban-vy
 Mandatory=Obligatorisk
 Hello=Hallå
 GoodBye=Adjö
 Sincerely=vänliga hälsningar
-ConfirmDeleteObject=Are you sure you want to delete this object?
+ConfirmDeleteObject=Är du säker på att du vill ta bort det här objektet?
 DeleteLine=Radera rad
 ConfirmDeleteLine=Är du säker på att du vill radera den här raden?
-ErrorPDFTkOutputFileNotFound=Error: the file was not generated. Please check that the 'pdftk' command is installed in a directory included in the $PATH environment variable (linux/unix only) or contact your system administrator.
+ErrorPDFTkOutputFileNotFound=Fel: filen genererades inte. Kontrollera att kommandot 'pdftk' är installerat i en katalog som ingår i miljövariabeln $ PATH (endast Linux / unix) eller kontakta systemadministratören.
 NoPDFAvailableForDocGenAmongChecked=Ingen PDF var tillgänglig för dokumentgenerering bland kontrollerad post
 TooManyRecordForMassAction=För många poster valda för massåtgärder. Åtgärden är begränsad till en lista över %s poster.
 NoRecordSelected=Ingen post vald
@@ -884,35 +886,35 @@ Progress=Framsteg
 ProgressShort=Progr.
 FrontOffice=Front office
 BackOffice=Back office
-Submit=Submit
+Submit=Skicka in
 View=Se
 Export=Export
 Exports=Export
 ExportFilteredList=Exportera filtrerad lista
 ExportList=Exportera listan
 ExportOptions=Export Options
-IncludeDocsAlreadyExported=Include docs already exported
-ExportOfPiecesAlreadyExportedIsEnable=Export of pieces already exported is enable
-ExportOfPiecesAlreadyExportedIsDisable=Export of pieces already exported is disable
-AllExportedMovementsWereRecordedAsExported=All exported movements were recorded as exported
-NotAllExportedMovementsCouldBeRecordedAsExported=Not all exported movements could be recorded as exported
+IncludeDocsAlreadyExported=Inkludera dokument som redan har exporterats
+ExportOfPiecesAlreadyExportedIsEnable=Export av redan exporterade bitar är aktiverad
+ExportOfPiecesAlreadyExportedIsDisable=Export av redan exporterade bitar är inaktiverad
+AllExportedMovementsWereRecordedAsExported=Alla exporterade rörelser registrerades som exporterade
+NotAllExportedMovementsCouldBeRecordedAsExported=Inte alla exporterade rörelser kunde registreras som exporterade
 Miscellaneous=Diverse
 Calendar=Kalender
 GroupBy=Grupp av...
 ViewFlatList=Visa plattlista
-ViewAccountList=View ledger
-ViewSubAccountList=View subaccount ledger
+ViewAccountList=Visa huvudbok
+ViewSubAccountList=Visa underkontokonto
 RemoveString=Ta bort strängen '%s'
 SomeTranslationAreUncomplete=Några av de språk som erbjuds kan bara översättas delvis eller kan innehålla fel. Snälla hjälp att korrigera ditt språk genom att registrera dig på <a href="https://transifex.com/projects/p/dolibarr/" target="_blank"> https://transifex.com/projects/p/dolibarr/ </a> för att lägga till dina förbättringar.
-DirectDownloadLink=Public download link
-PublicDownloadLinkDesc=Only the link is required to download the file
-DirectDownloadInternalLink=Private download link
-PrivateDownloadLinkDesc=You need to be logged and you need permissions to view or download the file
+DirectDownloadLink=Offentlig nedladdningslänk
+PublicDownloadLinkDesc=Endast länken krävs för att ladda ner filen
+DirectDownloadInternalLink=Privat nedladdningslänk
+PrivateDownloadLinkDesc=Du måste vara loggad och du behöver behörighet för att se eller ladda ner filen
 Download=Ladda ner
 DownloadDocument=Hämta dokument
 ActualizeCurrency=Uppdatera valutakurs
 Fiscalyear=Räkenskapsåret
-ModuleBuilder=Module and Application Builder
+ModuleBuilder=Modul- och applikationsbyggare
 SetMultiCurrencyCode=Ange valuta
 BulkActions=Massåtgärder
 ClickToShowHelp=Klicka för att visa verktygstipshjälp
@@ -972,39 +974,39 @@ ShortThursday=T
 ShortFriday=F
 ShortSaturday=S
 ShortSunday=S
-one=one
-two=two
-three=three
-four=four
-five=five
-six=six
-seven=seven
-eight=eight
-nine=nine
-ten=ten
-eleven=eleven
-twelve=twelve
-thirteen=thirdteen
-fourteen=fourteen
-fifteen=fifteen
-sixteen=sixteen
-seventeen=seventeen
-eighteen=eighteen
-nineteen=nineteen
-twenty=twenty
-thirty=thirty
-forty=forty
-fifty=fifty
-sixty=sixty
-seventy=seventy
-eighty=eighty
-ninety=ninety
-hundred=hundred
-thousand=thousand
-million=million
-billion=billion
-trillion=trillion
-quadrillion=quadrillion
+one=ett
+two=två
+three=tre
+four=fyra
+five=fem
+six=sex
+seven=sju
+eight=åtta
+nine=nio
+ten=tio
+eleven=elva
+twelve=tolv
+thirteen=tretton
+fourteen=fjorton
+fifteen=femton
+sixteen=sexton
+seventeen=sjutton
+eighteen=arton
+nineteen=nitton
+twenty=tjugo
+thirty=trettio
+forty=fyrtio
+fifty=femtio
+sixty=sextio
+seventy=sjuttio
+eighty=åttio
+ninety=nittio
+hundred=hundra
+thousand=tusen
+million=miljon
+billion=miljard
+trillion=biljon
+quadrillion=biljard
 SelectMailModel=Välj en e-postmall
 SetRef=Set ref
 Select2ResultFoundUseArrows=Några resultat hittades. Använd pilarna för att välja.
@@ -1020,9 +1022,9 @@ SearchIntoContacts=Kontakter
 SearchIntoMembers=Medlemmar
 SearchIntoUsers=Användare
 SearchIntoProductsOrServices=Produkter eller tjänster
-SearchIntoBatch=Lots / Serials
+SearchIntoBatch=Massor / Serier
 SearchIntoProjects=Projekt
-SearchIntoMO=Manufacturing Orders
+SearchIntoMO=Tillverkningsorder
 SearchIntoTasks=Uppgifter
 SearchIntoCustomerInvoices=Kundfakturor
 SearchIntoSupplierInvoices=Leverantörsfakturor
@@ -1036,7 +1038,7 @@ SearchIntoCustomerShipments=Kundförsändelser
 SearchIntoExpenseReports=Räkningar
 SearchIntoLeaves=Lämna
 SearchIntoTickets=biljetter
-SearchIntoCustomerPayments=Customer payments
+SearchIntoCustomerPayments=Kundbetalningar
 SearchIntoVendorPayments=Leverantörsbetalningar
 SearchIntoMiscPayments=Diverse betalningar
 CommentLink=Kommentarer
@@ -1057,78 +1059,81 @@ KeyboardShortcut=Tangentbordsgenväg
 AssignedTo=Påverkas i
 Deletedraft=Ta bort utkast
 ConfirmMassDraftDeletion=Utkast till massberegningsbekräftelse
-FileSharedViaALink=File shared with a public link
+FileSharedViaALink=Fil delas med en offentlig länk
 SelectAThirdPartyFirst=Välj en tredje part först ...
 YouAreCurrentlyInSandboxMode=Du befinner dig för närvarande i %s "sandbox" -läget
 Inventory=Lager
 AnalyticCode=Analytisk kod
 TMenuMRP=MRP
-ShowCompanyInfos=Show company infos
+ShowCompanyInfos=Visa företagsinfo
 ShowMoreInfos=Visa mer info
 NoFilesUploadedYet=Var god ladda upp ett dokument först
 SeePrivateNote=Se privat notering
-PaymentInformation=Payment information
-ValidFrom=Valid from
-ValidUntil=Valid until
-NoRecordedUsers=No users
-ToClose=To close
+PaymentInformation=Betalningsinformation
+ValidFrom=Giltig från
+ValidUntil=Giltig till
+NoRecordedUsers=Inga användare
+ToClose=För nära
+ToRefuse=Att vägra
 ToProcess=För att kunna behandla
-ToApprove=To approve
-GlobalOpenedElemView=Global view
-NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
-NoArticlesFoundForTheCategory=No article found for the category
-ToAcceptRefuse=To accept | refuse
+ToApprove=Att godkänna
+GlobalOpenedElemView=Global vy
+NoArticlesFoundForTheKeyword=Ingen artikel hittades för nyckelordet '<strong> %s </strong>'
+NoArticlesFoundForTheCategory=Ingen artikel hittades för kategorin
+ToAcceptRefuse=Att acceptera | vägra
 ContactDefault_agenda=Händelse
 ContactDefault_commande=Beställ
 ContactDefault_contrat=Kontrakt
 ContactDefault_facture=Faktura
 ContactDefault_fichinter=Insats
-ContactDefault_invoice_supplier=Supplier Invoice
-ContactDefault_order_supplier=Purchase Order
+ContactDefault_invoice_supplier=Leverantörsfaktura
+ContactDefault_order_supplier=Inköpsorder
 ContactDefault_project=Projekt
 ContactDefault_project_task=Uppgift
 ContactDefault_propal=Förslag
-ContactDefault_supplier_proposal=Supplier Proposal
-ContactDefault_ticket=Ticket
-ContactAddedAutomatically=Contact added from contact thirdparty roles
-More=More
-ShowDetails=Show details
-CustomReports=Custom reports
-StatisticsOn=Statistics on
-SelectYourGraphOptionsFirst=Select your graph options to build a graph
-Measures=Measures
+ContactDefault_supplier_proposal=Leverantörsförslag
+ContactDefault_ticket=Biljett
+ContactAddedAutomatically=Kontakt tillagd från roller från tredje part
+More=Mer
+ShowDetails=Visa detaljer
+CustomReports=Anpassade rapporter
+StatisticsOn=Statistik över
+SelectYourGraphOptionsFirst=Välj dina grafalternativ för att skapa ett diagram
+Measures=Åtgärder
 XAxis=X-Axis
-YAxis=Y-Axis
-StatusOfRefMustBe=Status of %s must be %s
-DeleteFileHeader=Confirm file delete
-DeleteFileText=Do you really want delete this file?
-ShowOtherLanguages=Show other languages
-SwitchInEditModeToAddTranslation=Switch in edit mode to add translations for this language
-NotUsedForThisCustomer=Not used for this customer
-AmountMustBePositive=Amount must be positive
-ByStatus=By status
+YAxis=Y-axel
+StatusOfRefMustBe=Status för %s måste vara %s
+DeleteFileHeader=Bekräfta filradering
+DeleteFileText=Vill du verkligen radera den här filen?
+ShowOtherLanguages=Visa andra språk
+SwitchInEditModeToAddTranslation=Växla i redigeringsläge för att lägga till översättningar för detta språk
+NotUsedForThisCustomer=Används inte för den här kunden
+AmountMustBePositive=Beloppet måste vara positivt
+ByStatus=Efter status
 InformationMessage=Information
-Used=Used
-ASAP=As Soon As Possible
-CREATEInDolibarr=Record %s created
-MODIFYInDolibarr=Record %s modified
-DELETEInDolibarr=Record %s deleted
-VALIDATEInDolibarr=Record %s validated
-APPROVEDInDolibarr=Record %s approved
-DefaultMailModel=Default Mail Model
-PublicVendorName=Public name of vendor
+Used=Begagnade
+ASAP=Så snart som möjligt
+CREATEInDolibarr=Spela in %s skapad
+MODIFYInDolibarr=Spela in %s modifierad
+DELETEInDolibarr=Spela in %s borttagen
+VALIDATEInDolibarr=Spela in %s validerat
+APPROVEDInDolibarr=Spela in %s godkänd
+DefaultMailModel=Standard e-postmodell
+PublicVendorName=Säljarens offentliga namn
 DateOfBirth=Födelsedatum
-SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again.
-UpToDate=Up-to-date
-OutOfDate=Out-of-date
-EventReminder=Event Reminder
-UpdateForAllLines=Update for all lines
-OnHold=On hold
-Civility=Civility
-AffectTag=Affect Tag
-ConfirmAffectTag=Bulk Tag Affect
-ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
-CategTypeNotFound=No tag type found for type of records
-CopiedToClipboard=Copied to clipboard
-InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
-ConfirmCancel=Are you sure you want to cancel
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Säkerhetstoken har upphört, så åtgärden har avbrutits. Var god försök igen.
+UpToDate=Aktuell
+OutOfDate=Föråldrad
+EventReminder=Händelsepåminnelse
+UpdateForAllLines=Uppdatering för alla rader
+OnHold=Placerad i kö
+Civility=Hövlighet
+AffectTag=Påverka taggen
+CreateExternalUser=Skapa extern användare
+ConfirmAffectTag=Bulk Tag påverkar
+ConfirmAffectTagQuestion=Är du säker på att du vill påverka taggar till den %s valda post (er)?
+CategTypeNotFound=Ingen taggtyp hittades för typ av poster
+CopiedToClipboard=Kopieras till Urklipp
+InformationOnLinkToContract=Detta belopp är endast summan av alla rader i kontraktet. Ingen tidsbegrepp tas med i beräkningen.
+ConfirmCancel=Är du säker på att du vill avbryta
+EmailMsgID=Email MsgID
diff --git a/htdocs/langs/sv_SE/margins.lang b/htdocs/langs/sv_SE/margins.lang
index 2e319949792..fc1d814461b 100644
--- a/htdocs/langs/sv_SE/margins.lang
+++ b/htdocs/langs/sv_SE/margins.lang
@@ -16,13 +16,13 @@ MarginDetails=Marginaldetaljer
 ProductMargins=Produktmarginaler
 CustomerMargins=Kundmarginaler
 SalesRepresentativeMargins=Återförsäljares marginaler
-ContactOfInvoice=Contact of invoice
+ContactOfInvoice=Kontakt av faktura
 UserMargins=Användarmarginaler
 ProductService=Produkt eller tjänst
 AllProducts=Alla produkter och tjänster
 ChooseProduct/Service=Välj produkt eller tjänst
 ForceBuyingPriceIfNull=Tvinga köp / kostpris till försäljningspris om det inte är definierat
-ForceBuyingPriceIfNullDetails=If buying/cost price not provided when we add a new line, and this option is "ON", the margin will be 0 on the new line (buying/cost price = selling price). If this option is "OFF" (recommended), margin will be equal to the value suggested by default (and may be 100% if no default value can be found).
+ForceBuyingPriceIfNullDetails=Om köp- / kostpris inte anges när vi lägger till en ny rad, och detta alternativ är "PÅ", kommer marginalen att vara 0 på den nya raden (köp- / kostpris = försäljningspris). Om detta alternativ är "AV" (rekommenderas) kommer marginalen att vara lika med det föreslagna värdet som standard (och kan vara 100% om inget standardvärde kan hittas).
 MARGIN_METHODE_FOR_DISCOUNT=Marginalmetod för globala rabatter
 UseDiscountAsProduct=Som produkt
 UseDiscountAsService=Som tjänst
@@ -37,7 +37,7 @@ CostPrice=Kostnadspris
 UnitCharges=Enhetspris
 Charges=Avgifter
 AgentContactType=Handelsagentens kontakttyp
-AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per contact/address. Note that reading statistics on a contact is not reliable since in most cases the contact may not be defined explicitely on the invoices.
+AgentContactTypeDetails=Definiera vilken kontakttyp (länkad på fakturor) som ska användas för marginalrapport per kontakt / adress. Observera att läsning av statistik för en kontakt inte är tillförlitlig eftersom kontakten i de flesta fall kanske inte definieras uttryckligen på fakturorna.
 rateMustBeNumeric=Betyg måste vara ett numeriskt värde
 markRateShouldBeLesserThan100=Mark takt bör vara lägre än 100
 ShowMarginInfos=Visa marginal information
diff --git a/htdocs/langs/sv_SE/members.lang b/htdocs/langs/sv_SE/members.lang
index 07cf2cf7249..a1b633f99ce 100644
--- a/htdocs/langs/sv_SE/members.lang
+++ b/htdocs/langs/sv_SE/members.lang
@@ -15,24 +15,24 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=En annan ledamot (namn: <b>%s,</b> lo
 ErrorUserPermissionAllowsToLinksToItselfOnly=Av säkerhetsskäl måste du beviljas behörighet att redigera alla användare att kunna koppla en medlem till en användare som inte är din.
 SetLinkToUser=Koppla till en Dolibarr användare
 SetLinkToThirdParty=Koppla till en Dolibarr tredje part
-MembersCards=Business cards for members
+MembersCards=Visitkort för medlemmar
 MembersList=Förteckning över medlemmar
 MembersListToValid=Förteckning över förslag till medlemmar (att bekräftas)
 MembersListValid=Förteckning över giltiga medlemmar
-MembersListUpToDate=List of valid members with up-to-date subscription
-MembersListNotUpToDate=List of valid members with out-of-date subscription
-MembersListExcluded=List of excluded members
+MembersListUpToDate=Lista över giltiga medlemmar med uppdaterad prenumeration
+MembersListNotUpToDate=Lista över giltiga medlemmar med inaktuell prenumeration
+MembersListExcluded=Lista över uteslutna medlemmar
 MembersListResiliated=Förteckning över avslutade medlemmar
 MembersListQualified=Förteckning över kvalificerade ledamöter
 MenuMembersToValidate=Förslag medlemmar
 MenuMembersValidated=Bekräftat medlemmar
-MenuMembersExcluded=Excluded members
+MenuMembersExcluded=Uteslutna medlemmar
 MenuMembersResiliated=Avslutade medlemmar
 MembersWithSubscriptionToReceive=Medlemmar med abonnemang för att ta emot
-MembersWithSubscriptionToReceiveShort=Subscription to receive
+MembersWithSubscriptionToReceiveShort=Prenumeration att ta emot
 DateSubscription=Teckningsdag
 DateEndSubscription=Prenumeration slutdatum
-EndSubscription=Subscription Ends
+EndSubscription=Prenumerationen slutar
 SubscriptionId=Prenumeration id
 WithoutSubscription=Utan prenumeration
 MemberId=Medlem id
@@ -49,16 +49,16 @@ MemberStatusActiveLate=Prenumerationen löpte ut
 MemberStatusActiveLateShort=Utgångna
 MemberStatusPaid=Prenumeration aktuell
 MemberStatusPaidShort=Aktuell
-MemberStatusExcluded=Excluded member
-MemberStatusExcludedShort=Excluded
+MemberStatusExcluded=Exkluderad medlem
+MemberStatusExcludedShort=Utesluten
 MemberStatusResiliated=Avslutad medlem
 MemberStatusResiliatedShort=Avslutad
 MembersStatusToValid=Förslag medlemmar
-MembersStatusExcluded=Excluded members
+MembersStatusExcluded=Uteslutna medlemmar
 MembersStatusResiliated=Avslutade medlemmar
-MemberStatusNoSubscription=Validated (no subscription needed)
+MemberStatusNoSubscription=Validerad (ingen prenumeration behövs)
 MemberStatusNoSubscriptionShort=Bekräftade
-SubscriptionNotNeeded=No subscription needed
+SubscriptionNotNeeded=Ingen prenumeration behövs
 NewCotisation=Nya bidrag
 PaymentSubscription=Nya bidrag betalning
 SubscriptionEndDate=Prenumeration slutdatum
@@ -83,12 +83,12 @@ WelcomeEMail=Välkommen e-post
 SubscriptionRequired=Prenumeration krävs
 DeleteType=Ta bort
 VoteAllowed=Röstning tillåten
-Physical=Individual
-Moral=Corporation
-MorAndPhy=Corporation and Individual
-Reenable=Re-Enable
-ExcludeMember=Exclude a member
-ConfirmExcludeMember=Are you sure you want to exclude this member ?
+Physical=Enskild
+Moral=Företag
+MorAndPhy=Corporation och individ
+Reenable=Återaktivera
+ExcludeMember=Uteslut en medlem
+ConfirmExcludeMember=Är du säker på att du vill utesluta den här medlemmen?
 ResiliateMember=Avsluta en medlem
 ConfirmResiliateMember=Är du säker på att du vill säga upp den här medlemmen?
 DeleteMember=Ta bort en medlem
@@ -123,7 +123,7 @@ SendingEmailOnMemberValidation=Skickar e-post vid bekräftande av nya medlemmar
 SendingEmailOnNewSubscription=Skickar e-post på ny prenumeration
 SendingReminderForExpiredSubscription=Skickar påminnelse för utgående abonnemang
 SendingEmailOnCancelation=Skickar e-post vid avbokning
-SendingReminderActionComm=Sending reminder for agenda event
+SendingReminderActionComm=Skickar påminnelse för agendahändelse
 # Topic of email templates
 YourMembershipRequestWasReceived=Ditt medlemskap har tagits emot.
 YourMembershipWasValidated=Ditt medlemskap bekräftades
@@ -144,7 +144,7 @@ DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=E-postmall för att använda för
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=E-postmall för att skicka e-post till en medlem om ny abonnemangsinspelning
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=E-postmall för att skicka e-postpåminnelse när prenumerationen är på väg att gå ut
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=E-postmall för att använda för att skicka e-post till en medlem om medlemsavbeställning
-DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=E-postmall som du kan använda för att skicka e-post till en medlem om uteslutning av medlemmar
 DescADHERENT_MAIL_FROM=Avsändare E-post för automatiska e-postmeddelanden
 DescADHERENT_ETIQUETTE_TYPE=Utformning av etikettsida
 DescADHERENT_ETIQUETTE_TEXT=Text på medlems adressflik
@@ -170,31 +170,31 @@ DocForLabels=Generera adress ark (Format för utgång faktiskt inställning: <b>
 SubscriptionPayment=Teckning betalning
 LastSubscriptionDate=Datum för senaste prenumerationsbetalning
 LastSubscriptionAmount=Antal senaste prenumeration
-LastMemberType=Last Member type
+LastMemberType=Senaste medlemstyp
 MembersStatisticsByCountries=Medlemmar statistik per land
 MembersStatisticsByState=Medlemmar statistik från stat / provins
 MembersStatisticsByTown=Medlemmar statistik per kommun
 MembersStatisticsByRegion=Medlemsstatistik på region
-NbOfMembers=Total number of members
-NbOfActiveMembers=Total number of current active members
+NbOfMembers=Totalt antal medlemmar
+NbOfActiveMembers=Totalt antal nuvarande aktiva medlemmar
 NoValidatedMemberYet=Inga bekräftada medlemmar hittades
-MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
-MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
-MembersByTownDesc=This screen show you statistics of members by town.
-MembersByNature=This screen show you statistics of members by nature.
-MembersByRegion=This screen show you statistics of members by region.
+MembersByCountryDesc=Den här skärmen visar statistik över medlemmar efter länder. Diagram och diagram beror på tillgången på Googles onlinetabelltjänst samt på tillgängligheten av en fungerande internetanslutning.
+MembersByStateDesc=Den här skärmen visar statistik över medlemmar efter stat / provinser / kanton.
+MembersByTownDesc=Den här skärmen visar statistik över medlemmar efter stad.
+MembersByNature=Den här skärmen visar statistik över medlemmar av naturen.
+MembersByRegion=Den här skärmen visar statistik över medlemmar efter region.
 MembersStatisticsDesc=Välj statistik du vill läsa ...
 MenuMembersStats=Statistik
-LastMemberDate=Latest membership date
+LastMemberDate=Senaste datum för medlemskap
 LatestSubscriptionDate=Senaste prenumerationsdatum
-MemberNature=Nature of the member
-MembersNature=Nature of the members
-Public=Information is public
+MemberNature=Medlemmens natur
+MembersNature=Medlemmarnas natur
+Public=Informationen är offentlig
 NewMemberbyWeb=Ny ledamot till. Väntar på godkännande
 NewMemberForm=Ny medlem formen
-SubscriptionsStatistics=Subscriptions statistics
+SubscriptionsStatistics=Prenumerationsstatistik
 NbOfSubscriptions=Antal prenumerationer
-AmountOfSubscriptions=Amount collected from subscriptions
+AmountOfSubscriptions=Belopp som samlats in från prenumerationer
 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
@@ -212,4 +212,6 @@ SendReminderForExpiredSubscriptionTitle=Skicka påminnelse via e-post för utgå
 SendReminderForExpiredSubscription=Skicka påminnelse via e-post till medlemmar när prenumerationen är på väg att gå ut (parametern är antal dagar före abonnemangets slutändning. Det kan vara en lista över dagar separerade av ett semikolon, till exempel '10; 5; 0; -5 ')
 MembershipPaid=Medlemskap som betalats för nuvarande period (till %s)
 YouMayFindYourInvoiceInThisEmail=Du kan hitta din faktura bifogad till det här e-postmeddelandet
-XMembersClosed=%s member(s) closed
+XMembersClosed=%s medlem(ar) stängda
+XExternalUserCreated=%s externa användare har skapats
+ForceMemberNature=Force member nature (Individual or Corporation)
diff --git a/htdocs/langs/sv_SE/modulebuilder.lang b/htdocs/langs/sv_SE/modulebuilder.lang
index 4c303356c41..934645863e6 100644
--- a/htdocs/langs/sv_SE/modulebuilder.lang
+++ b/htdocs/langs/sv_SE/modulebuilder.lang
@@ -143,3 +143,4 @@ AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
 ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
+ImportExportProfiles=Import and export profiles
diff --git a/htdocs/langs/sv_SE/mrp.lang b/htdocs/langs/sv_SE/mrp.lang
index ae1796e24e4..f26aaefc027 100644
--- a/htdocs/langs/sv_SE/mrp.lang
+++ b/htdocs/langs/sv_SE/mrp.lang
@@ -1,104 +1,103 @@
-Mrp=Manufacturing Orders
-MOs=Manufacturing orders
-ManufacturingOrder=Manufacturing Order
-MRPDescription=Module to manage production and Manufacturing Orders (MO).
+Mrp=Tillverkningsorder
+MOs=Tillverkningsorder
+ManufacturingOrder=Tillverkningsorder
+MRPDescription=Modul för att hantera produktions- och tillverkningsorder (MO).
 MRPArea=MRP-område
-MrpSetupPage=Setup of module MRP
+MrpSetupPage=Installation av modul MRP
 MenuBOM=Räkningar av material
 LatestBOMModified=Senaste %s Modifierade räkningar
-LatestMOModified=Latest %s Manufacturing Orders modified
-Bom=Bills of Material
-BillOfMaterials=Materiel
+LatestMOModified=Senaste %s Tillverkningsorder har ändrats
+Bom=Räkningar av material
+BillOfMaterials=Bill of Materials
 BOMsSetup=Inställning av modul BOM
 ListOfBOMs=Förteckning över materialräkningar - BOM
-ListOfManufacturingOrders=List of Manufacturing Orders
-NewBOM=Ny räkning av material
-ProductBOMHelp=Product to create with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
+ListOfManufacturingOrders=Lista över tillverkningsorder
+NewBOM=Ny materialförteckning
+ProductBOMHelp=Produkt som ska skapas (eller tas isär) med denna BOM. <br> Obs! Produkter med egenskapen 'Produktens natur' = 'Råvara' syns inte i listan.
 BOMsNumberingModules=BOM nummereringsmallar
-BOMsModelModule=BOM document templates
-MOsNumberingModules=MO numbering templates
-MOsModelModule=MO document templates
+BOMsModelModule=BOM-dokumentmallar
+MOsNumberingModules=MO-nummermallar
+MOsModelModule=MO-dokumentmallar
 FreeLegalTextOnBOMs=Gratis text på BOM-dokument
 WatermarkOnDraftBOMs=Vattenstämpel på utkast BOM
-FreeLegalTextOnMOs=Free text on document of MO
-WatermarkOnDraftMOs=Watermark on draft MO
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
-ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
-ManufacturingEfficiency=Manufacturing efficiency
-ConsumptionEfficiency=Consumption efficiency
-ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the production
-ValueOfMeansLossForProductProduced=Value of 0.95 means an average of 5%% of loss of produced product
-DeleteBillOfMaterials=Delete Bill Of Materials
-DeleteMo=Delete Manufacturing Order
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
-MenuMRP=Manufacturing Orders
-NewMO=New Manufacturing Order
-QtyToProduce=Qty to produce
-DateStartPlannedMo=Date start planned
-DateEndPlannedMo=Date end planned
-KeepEmptyForAsap=Empty means 'As Soon As Possible'
-EstimatedDuration=Estimated duration
-EstimatedDurationDesc=Estimated duration to manufacture this product using this BOM
-ConfirmValidateBom=Are you sure you want to validate the BOM with the reference <strong>%s</strong> (you will be able to use it to build new Manufacturing Orders)
-ConfirmCloseBom=Are you sure you want to cancel this BOM (you won't be able to use it to build new Manufacturing Orders anymore) ?
-ConfirmReopenBom=Are you sure you want to re-open this BOM (you will be able to use it to build new Manufacturing Orders)
-StatusMOProduced=Produced
-QtyFrozen=Frozen Qty
-QuantityFrozen=Frozen Quantity
-QuantityConsumedInvariable=When this flag is set, the quantity consumed is always the value defined and is not relative to the quantity produced.
+FreeLegalTextOnMOs=Fritext på MO-dokument
+WatermarkOnDraftMOs=Vattenstämpel på MO-utkast
+ConfirmCloneBillOfMaterials=Är du säker på att du vill klona materialräkningen %s?
+ConfirmCloneMo=Är du säker på att du vill klona tillverkningsordern %s?
+ManufacturingEfficiency=Tillverkningseffektivitet
+ConsumptionEfficiency=Förbrukningseffektivitet
+ValueOfMeansLoss=Värdet 0,95 betyder i genomsnitt 5%% förlust under produktionen
+ValueOfMeansLossForProductProduced=Värdet 0,95 betyder i genomsnitt 5%% förlust av producerad produkt
+DeleteBillOfMaterials=Ta bort materiallista
+DeleteMo=Ta bort tillverkningsorder
+ConfirmDeleteBillOfMaterials=Är du säker på att du vill ta bort detta material?
+ConfirmDeleteMo=Är du säker på att du vill ta bort detta material?
+MenuMRP=Tillverkningsorder
+NewMO=Ny tillverkningsorder
+QtyToProduce=Antal att producera
+DateStartPlannedMo=Planerad startdatum
+DateEndPlannedMo=Planerat slutdatum
+KeepEmptyForAsap=Tom betyder 'Så snart som möjligt'
+EstimatedDuration=Beräknad varaktighet
+EstimatedDurationDesc=Beräknad varaktighet för att tillverka (eller demontera) denna produkt med hjälp av denna BOM
+ConfirmValidateBom=Är du säker på att du vill validera BOM med referensen <strong> %s </strong> (du kommer att kunna använda den för att bygga nya tillverkningsorder)
+ConfirmCloseBom=Är du säker på att du vill avbryta den här stycklistan (du kan inte använda den för att bygga nya tillverkningsorder längre)?
+ConfirmReopenBom=Är du säker på att du vill öppna denna BOM igen (du kommer att kunna använda den för att bygga nya tillverkningsorder)
+StatusMOProduced=Producerad
+QtyFrozen=Fryst antal
+QuantityFrozen=Fryst kvantitet
+QuantityConsumedInvariable=När denna flagga är inställd är den konsumerade kvantiteten alltid det definierade värdet och är inte relativt den producerade kvantiteten.
 DisableStockChange=Stock change disabled
-DisableStockChangeHelp=When this flag is set, there is no stock change on this product, whatever is the quantity consumed
-BomAndBomLines=Bills Of Material and lines
-BOMLine=Line of BOM
-WarehouseForProduction=Warehouse for production
-CreateMO=Create MO
-ToConsume=To consume
-ToProduce=To produce
-QtyAlreadyConsumed=Qty already consumed
-QtyAlreadyProduced=Qty already produced
-QtyRequiredIfNoLoss=Qty required if there is no loss (Manufacturing efficiency is 100%%)
-ConsumeOrProduce=Consume or Produce
-ConsumeAndProduceAll=Consume and Produce All
-Manufactured=Manufactured
-TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
-ForAQuantityOf=For a quantity to produce of %s
-ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
-ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
-ProductionForRef=Production of %s
-AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
-NoStockChangeOnServices=No stock change on services
-ProductQtyToConsumeByMO=Product quantity still to consume by open MO
-ProductQtyToProduceByMO=Product quentity still to produce by open MO
-AddNewConsumeLines=Add new line to consume
-ProductsToConsume=Products to consume
-ProductsToProduce=Products to produce
-UnitCost=Unit cost
-TotalCost=Total cost
-BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
-GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.
-ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
-Workstation=Workstation
-Workstations=Workstations
-WorkstationsDescription=Workstations management
-WorkstationSetup = Workstations setup
-WorkstationSetupPage = Workstations setup page
-WorkstationAbout = About Workstation
-WorkstationAboutPage = Workstations about page
-WorkstationList=Workstation list
-WorkstationCreate=Add new workstation
-ConfirmEnableWorkstation=Are you sure you want to enable workstation <b>%s</b> ?
-EnableAWorkstation=Enable a workstation
-ConfirmDisableWorkstation=Are you sure you want to disable workstation <b>%s</b> ?
-DisableAWorkstation=Disable a workstation
-DeleteWorkstation=Supprimer
-NbOperatorsRequired=Number of operators required
-THMOperatorEstimated=Estimated operator THM
-THMMachineEstimated=Estimated machine THM
-WorkstationType=Workstation type
-Human=Human
-Machine=Machine
-HumanMachine=Human / Machine
-WorkstationArea=Workstation area
-Machines=Machines
-THMEstimatedHelp=This rate makes it possible to define a forecast cost of the item
+DisableStockChangeHelp=När den här flaggan är inställd finns det ingen lagerförändring på denna produkt, oavsett vilken mängd som konsumeras
+BomAndBomLines=Räkningar av material och linjer
+BOMLine=Linje med BOM
+WarehouseForProduction=Lager för produktion
+CreateMO=Skapa MO
+ToConsume=Att konsumera
+ToProduce=Att producera
+QtyAlreadyConsumed=Antal redan förbrukat
+QtyAlreadyProduced=Antal redan producerat
+QtyRequiredIfNoLoss=Antal krävs om det inte finns någon förlust (Tillverkningseffektiviteten är 100%%)
+ConsumeOrProduce=Konsumera eller producera
+ConsumeAndProduceAll=Konsumera och producera allt
+Manufactured=Tillverkad
+TheProductXIsAlreadyTheProductToProduce=Produkten som ska läggas till är redan produkten att producera.
+ForAQuantityOf=För att producera en kvantitet av %s
+ForAQuantityToConsumeOf=För en kvantitet att ta isär %s
+ConfirmValidateMo=Är du säker på att du vill validera denna tillverkningsorder?
+ConfirmProductionDesc=Genom att klicka på '%s' validerar du förbrukningen och / eller produktionen för de angivna kvantiteterna. Detta kommer också att uppdatera lager och registrera lagerrörelser.
+ProductionForRef=Produktion av %s
+AutoCloseMO=Stäng automatiskt tillverkningsordern om kvantiteter att konsumera och producera uppnås
+NoStockChangeOnServices=Ingen lagerförändring på tjänsterna
+ProductQtyToConsumeByMO=Produktkvantitet som fortfarande ska konsumeras av öppen MO
+ProductQtyToProduceByMO=Product quantity still to produce by open MO
+AddNewConsumeLines=Lägg till en ny rad att konsumera
+ProductsToConsume=Produkter att konsumera
+ProductsToProduce=Produkter att producera
+UnitCost=Enhetskostnad
+TotalCost=Total kostnad
+BOMTotalCost=Kostnaden för att producera den här stycklistan baserat på kostnaden för varje kvantitet och produkt som ska konsumeras (använd kostpris om det är definierat, annars medelviktat pris om det är definierat, annars det bästa inköpspriset)
+GoOnTabProductionToProduceFirst=Du måste först ha startat produktionen för att stänga en tillverkningsorder (se fliken '%s'). Men du kan avbryta det.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=Ett kit kan inte användas i en BOM eller en MO
+Workstation=Arbetsstation
+Workstations=Arbetsstationer
+WorkstationsDescription=Arbetsstationshantering
+WorkstationSetup = Installation av arbetsstationer
+WorkstationSetupPage = Inställningssida för arbetsstationer
+WorkstationList=Arbetsstationslista
+WorkstationCreate=Lägg till ny arbetsstation
+ConfirmEnableWorkstation=Är du säker på att du vill aktivera arbetsstationen <b> %s </b>?
+EnableAWorkstation=Aktivera en arbetsstation
+ConfirmDisableWorkstation=Är du säker på att du vill inaktivera arbetsstationen <b> %s </b>?
+DisableAWorkstation=Inaktivera en arbetsstation
+DeleteWorkstation=Radera
+NbOperatorsRequired=Antal operatörer som krävs
+THMOperatorEstimated=Uppskattad operatör THM
+THMMachineEstimated=Beräknad maskin THM
+WorkstationType=Arbetsstationstyp
+Human=Mänsklig
+Machine=Maskin
+HumanMachine=Människa / maskin
+WorkstationArea=Arbetsstationsområde
+Machines=Maskiner
+THMEstimatedHelp=Denna hastighet gör det möjligt att definiera en prognoskostnad för artikeln
diff --git a/htdocs/langs/sv_SE/orders.lang b/htdocs/langs/sv_SE/orders.lang
index 5ab7146c133..d0c400199d4 100644
--- a/htdocs/langs/sv_SE/orders.lang
+++ b/htdocs/langs/sv_SE/orders.lang
@@ -11,6 +11,7 @@ OrderDate=Beställ datum
 OrderDateShort=Beställ datum
 OrderToProcess=Att kunna bearbeta
 NewOrder=Ny order
+NewSupplierOrderShort=Ny order
 NewOrderSupplier=New Purchase Order
 ToOrder=Gör så
 MakeOrder=Gör så
@@ -73,6 +74,7 @@ DeleteOrder=Radera order
 CancelOrder=Avbryt för
 OrderReopened= Order %s re-open
 AddOrder=Skapa order
+AddSupplierOrderShort=Skapa order
 AddPurchaseOrder=Create purchase order
 AddToDraftOrders=Lägg till förlags order
 ShowOrder=Visa att
diff --git a/htdocs/langs/sv_SE/other.lang b/htdocs/langs/sv_SE/other.lang
index 0b01a9faaee..df7242b07ec 100644
--- a/htdocs/langs/sv_SE/other.lang
+++ b/htdocs/langs/sv_SE/other.lang
@@ -129,6 +129,7 @@ ClosedByLogin=Användarinloggning som stängde
 FileWasRemoved=Arkiv %s togs bort
 DirWasRemoved=Nummer %s togs bort
 FeatureNotYetAvailable=Funktionen är ännu inte tillgänglig i den nuvarande versionen
+FeatureNotAvailableOnDevicesWithoutMouse=Feature not available on devices without mouse
 FeaturesSupported=Stödda funktioner
 Width=Bredd
 Height=Höjd
@@ -263,7 +264,7 @@ ContactCreatedByEmailCollector=Kontakt / adress skapad via e-post samlare från
 ProjectCreatedByEmailCollector=Projekt skapat av e-post samlare från email MSGID %s
 TicketCreatedByEmailCollector=Biljett skapad av e-post samlare från email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
-PrefixSession=Prefix for session ID
+SuffixSessionName=Suffix for session name
 
 ##### Export #####
 ExportsArea=Export område
diff --git a/htdocs/langs/sv_SE/partnership.lang b/htdocs/langs/sv_SE/partnership.lang
index 250df79034a..59c885f7832 100644
--- a/htdocs/langs/sv_SE/partnership.lang
+++ b/htdocs/langs/sv_SE/partnership.lang
@@ -16,41 +16,72 @@
 #
 # Generic
 #
-ModulePartnershipName = Partnership management
-PartnershipDescription = Module Partnership management
+ModulePartnershipName=Partnership management
+PartnershipDescription=Module Partnership management
 PartnershipDescriptionLong= Module Partnership management
 
+AddPartnership=Add partnership
+CancelPartnershipForExpiredMembers=Partnership: Cancel partnership of members with expired subscriptions
+PartnershipCheckBacklink=Partnership: Check referring backlink
+
 #
 # Menu
 #
-NewPartnership = New Partnership
-ListOfPartnerships = List of partnership
+NewPartnership=New Partnership
+ListOfPartnerships=List of partnership
 
 #
 # Admin page
 #
-PartnershipSetup = Partnership setup
-PartnershipAbout = About Partnership
-PartnershipAboutPage = Partnership about page
-
+PartnershipSetup=Partnership setup
+PartnershipAbout=About Partnership
+PartnershipAboutPage=Partnership about page
+partnershipforthirdpartyormember=Partner status must be set on a 'thirdparty' or a 'member'
+PARTNERSHIP_IS_MANAGED_FOR=Partnership managed for
+PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks to check
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb of days before cancelling status of a partnership when a subscription has expired
+ReferingWebsiteCheck=Check of website referring
+ReferingWebsiteCheckDesc=You can enable a feature to check that your partners has added a backlink to your website domains on their own website.
 
 #
 # Object
 #
+DeletePartnership=Delete a partnership
+PartnershipDedicatedToThisThirdParty=Partnership dedicated to this third party
+PartnershipDedicatedToThisMember=Partnership dedicated to this member
 DatePartnershipStart=Startdatum
 DatePartnershipEnd=Slutdatum
+ReasonDecline=Decline reason
+ReasonDeclineOrCancel=Decline reason
+PartnershipAlreadyExist=Partnership already exist
+ManagePartnership=Manage partnership
+BacklinkNotFoundOnPartnerWebsite=Backlink not found on partner website
+ConfirmClosePartnershipAsk=Are you sure you want to cancel this partnership?
+PartnershipType=Partnership type
 
 #
 # Template Mail
 #
+SendingEmailOnPartnershipWillSoonBeCanceled=Partnership will soon be canceled
+SendingEmailOnPartnershipRefused=Partnership refused
+SendingEmailOnPartnershipAccepted=Partnership accepted
+SendingEmailOnPartnershipCanceled=Partnership canceled
 
+YourPartnershipWillSoonBeCanceledTopic=Partnership will soon be canceled
+YourPartnershipRefusedTopic=Partnership refused
+YourPartnershipAcceptedTopic=Partnership accepted
+YourPartnershipCanceledTopic=Partnership canceled
+
+YourPartnershipWillSoonBeCanceledContent=We inform you that your partnership will soon be canceled (Backlink not found)
+YourPartnershipRefusedContent=We inform you that your partnership request has been refused.
+YourPartnershipAcceptedContent=We inform you that your partnership request has been accepted.
+YourPartnershipCanceledContent=We inform you that your partnership has been canceled.
 
 #
 # Status
 #
-PartnershipDraft = Utkast
-PartnershipAccepted = Accepted
-PartnershipRefused = Refused
-PartnershipCanceled = Annullerad
-
+PartnershipDraft=Utkast
+PartnershipAccepted=Accepted
+PartnershipRefused=Refused
+PartnershipCanceled=Annullerad
 PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/sv_SE/productbatch.lang b/htdocs/langs/sv_SE/productbatch.lang
index 926e1126664..f429a077474 100644
--- a/htdocs/langs/sv_SE/productbatch.lang
+++ b/htdocs/langs/sv_SE/productbatch.lang
@@ -1,4 +1,4 @@
-# ProductBATCH language file - en_US - ProductBATCH
+# ProductBATCH language file - Source file is en_US - ProductBATCH
 ManageLotSerial=Använd batch/serie-nummer
 ProductStatusOnBatch=Yes (lot required)
 ProductStatusOnSerial=Yes (unique serial number required)
@@ -33,3 +33,13 @@ CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+LifeTime=Life span (in days)
+EndOfLife=End of life
+ManufacturingDate=Manufacturing date
+DestructionDate=Destruction date
+FirstUseDate=First use date
+QCFrequency=Quality control frequency (in days)
+
+#Traceability - qc status
+OutOfOrder=Out of order
+InWorkingOrder=In working order
diff --git a/htdocs/langs/sv_SE/products.lang b/htdocs/langs/sv_SE/products.lang
index c495fd0ed3f..4aaa22c4b42 100644
--- a/htdocs/langs/sv_SE/products.lang
+++ b/htdocs/langs/sv_SE/products.lang
@@ -2,7 +2,7 @@
 ProductRef=Produkt ref.
 ProductLabel=Produktmärkning
 ProductLabelTranslated=Översatt produktetikett
-ProductDescription=Product description
+ProductDescription=Produktbeskrivning
 ProductDescriptionTranslated=Översatt produktbeskrivning
 ProductNoteTranslated=Översatt produktnotat
 ProductServiceCard=Produkter / tjänster
@@ -22,8 +22,8 @@ ProductVatMassChangeDesc=Detta verktyg uppdaterar mervärdesskattesatsen som def
 MassBarcodeInit=Massvis streckkodinitiering
 MassBarcodeInitDesc=Denna sida kan användas för att initialisera en streckkod på objekt som inte har någon streckkod definierad. Kontrollera först att streckkodsmodulen har fullständiga inställningar.
 ProductAccountancyBuyCode=Redovisningskod (köp)
-ProductAccountancyBuyIntraCode=Accounting code (purchase intra-community)
-ProductAccountancyBuyExportCode=Accounting code (purchase import)
+ProductAccountancyBuyIntraCode=Redovisningskod (köp inom gemenskapen)
+ProductAccountancyBuyExportCode=Redovisningskod (import)
 ProductAccountancySellCode=Redovisningskod (försäljning)
 ProductAccountancySellIntraCode=Redovisningskod (försäljning inom gemenskapen)
 ProductAccountancySellExportCode=Redovisningskod (försäljningsexport)
@@ -31,19 +31,19 @@ ProductOrService=Produkt eller tjänst
 ProductsAndServices=Produkter och tjänster
 ProductsOrServices=Produkter eller tjänster
 ProductsPipeServices=Produkter | tjänster
-ProductsOnSale=Products for sale
-ProductsOnPurchase=Products for purchase
+ProductsOnSale=Produkter till salu
+ProductsOnPurchase=Produkter för köp
 ProductsOnSaleOnly=Endast produkter till försäljning
 ProductsOnPurchaseOnly=Endast produkter för inköp
 ProductsNotOnSell=Produkter som inte är till salu och inte för köp
 ProductsOnSellAndOnBuy=Produkter till försäljning och inköp
-ServicesOnSale=Services for sale
-ServicesOnPurchase=Services for purchase
+ServicesOnSale=Tjänster till salu
+ServicesOnPurchase=Tjänster för köp
 ServicesOnSaleOnly=Endast tjänster till salu 
 ServicesOnPurchaseOnly=Endast tjänster för inköp
 ServicesNotOnSell=Tjänster som inte är till salu och inte för köp
 ServicesOnSellAndOnBuy=Tjänster till försäljning och inköp
-LastModifiedProductsAndServices=Latest %s products/services which were modified
+LastModifiedProductsAndServices=Senaste %s produkter / tjänster som modifierades
 LastRecordedProducts=Senaste %s inspelade produkterna
 LastRecordedServices=Senaste %s inspelade tjänsterna
 CardProduct0=Produkt
@@ -73,12 +73,12 @@ SellingPrice=Försäljningspris
 SellingPriceHT=Försäljningspris (exkl. Moms)
 SellingPriceTTC=Försäljningspris (inkl. moms)
 SellingMinPriceTTC=Minsta försäljningspris (inkl. Skatt)
-CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
+CostPriceDescription=Detta prisfält (exkl. Moms) kan användas för att fånga det genomsnittliga belopp som denna produkt kostar för ditt företag. Det kan vara vilket pris du själv beräknar, till exempel från det genomsnittliga inköpspriset plus genomsnittlig produktions- och distributionskostnad.
 CostPriceUsage=Detta värde kan användas för marginalberäkning.
 SoldAmount=Sålt belopp
 PurchasedAmount=Inköpt antal
 NewPrice=Nytt pris
-MinPrice=Min. selling price
+MinPrice=Min. försäljningspris
 EditSellingPriceLabel=Redigera försäljningsprisetikett
 CantBeLessThanMinPrice=Försäljningspriset kan inte vara lägre än lägsta tillåtna för denna bok (%s utan skatt)
 ContractStatusClosed=Stängt
@@ -104,25 +104,25 @@ SetDefaultBarcodeType=Ställ streckkodstypblock
 BarcodeValue=Barcode värde
 NoteNotVisibleOnBill=Obs (ej synlig på fakturor, förslag ...)
 ServiceLimitedDuration=Om produkten är en tjänst med begränsad varaktighet:
-FillWithLastServiceDates=Fill with last service line dates
+FillWithLastServiceDates=Fyll i de senaste servicelinjen
 MultiPricesAbility=Flera prissegment per produkt / tjänst (varje kund är i ett prissegment)
 MultiPricesNumPrices=Antal pris
-DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Enable Kits (set of several products)
-VariantsAbility=Enable Variants (variations of products, for example color, size)
+DefaultPriceType=Prisbas per standard (med kontra utan skatt) när nya försäljningspriser läggs till
+AssociatedProductsAbility=Aktivera kit (uppsättning med flera produkter)
+VariantsAbility=Aktivera varianter (variationer av produkter, till exempel färg, storlek)
 AssociatedProducts=Kits
-AssociatedProductsNumber=Number of products composing this kit
+AssociatedProductsNumber=Antal produkter som består av detta kit
 ParentProductsNumber=Antal förälder förpackningsartikel
 ParentProducts=Föräldraprodukter
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
+IfZeroItIsNotAVirtualProduct=Om 0 är denna produkt inte ett kit
+IfZeroItIsNotUsedByVirtualProduct=Om 0 används den här produkten inte i något kit
 KeywordFilter=Nyckelord filter
 CategoryFilter=Kategori filter
 ProductToAddSearch=Sök produkt att lägga till
 NoMatchFound=Ingen matchning hittades
 ListOfProductsServices=Lista över produkter / tjänster
-ProductAssociationList=List of products/services that are component(s) of this kit
-ProductParentList=List of kits with this product as a component
+ProductAssociationList=Lista över produkter / tjänster som ingår i detta kit
+ProductParentList=Lista över kit med denna produkt som komponent
 ErrorAssociationIsFatherOfThis=Ett av valda produkten är förälder med nuvarande produkt
 DeleteProduct=Ta bort en produkt / tjänst
 ConfirmDeleteProduct=Är du säker på att du vill ta bort denna produkt / tjänst?
@@ -141,7 +141,7 @@ VATRateForSupplierProduct=Momsavgift (för denna leverantör / produkt)
 DiscountQtyMin=Rabatt för denna mängd.
 NoPriceDefinedForThisSupplier=Inget pris / antal definierat för denna leverantör / produkt
 NoSupplierPriceDefinedForThisProduct=Ingen säljare pris / antal definierad för denna produkt
-PredefinedItem=Predefined item
+PredefinedItem=Fördefinierad artikel
 PredefinedProductsToSell=Fördefinierad produkt
 PredefinedServicesToSell=Fördefinierad tjänst
 PredefinedProductsAndServicesToSell=Fördefinierade produkter eller tjänster att sälja
@@ -157,11 +157,11 @@ ListServiceByPopularity=Lista över tjänster efter popularitet
 Finished=Tillverkade produkten
 RowMaterial=Första material
 ConfirmCloneProduct=Är du säker på att du vill klona produkten eller tjänsten <b> %s </b>?
-CloneContentProduct=Clone all main information of the product/service
+CloneContentProduct=Klona all viktig information om produkten / tjänsten
 ClonePricesProduct=Klonpriser
-CloneCategoriesProduct=Clone linked tags/categories
-CloneCompositionProduct=Clone virtual products/services
-CloneCombinationsProduct=Clone the product variants
+CloneCategoriesProduct=Klonlänkade taggar / kategorier
+CloneCompositionProduct=Klona virtuella produkter / tjänster
+CloneCombinationsProduct=Klona produktvarianterna
 ProductIsUsed=Denna produkt används
 NewRefForClone=Ref. av ny produkt / tjänst
 SellingPrices=Försäljningspriser
@@ -169,13 +169,13 @@ BuyingPrices=Köpa priser
 CustomerPrices=Kundpriser
 SuppliersPrices=Leverantörspriser
 SuppliersPricesOfProductsOrServices=Leverantörspriser (av produkter eller tjänster)
-CustomCode=Customs|Commodity|HS code
-CountryOrigin=Country of origin
-RegionStateOrigin=Region of origin
-StateOrigin=State|Province of origin
-Nature=Nature of product (raw/manufactured)
-NatureOfProductShort=Nature of product
-NatureOfProductDesc=Raw material or manufactured product
+CustomCode=Tull | Råvara | HS-kod
+CountryOrigin=Ursprungsland
+RegionStateOrigin=Ursprungsregion
+StateOrigin=Stat | Ursprungsprovins
+Nature=Produktens art (rå / tillverkad)
+NatureOfProductShort=Produktens art
+NatureOfProductDesc=Råmaterial eller tillverkad produkt
 ShortLabel=Kort etikett
 Unit=Enhet
 p=u.
@@ -219,8 +219,8 @@ unitM=Meter
 unitDM=dm
 unitCM=cm
 unitMM=mm
-unitFT=ft
-unitIN=in
+unitFT=med
+unitIN=inch
 unitM2=Kvadratmeter
 unitDM2=dm²
 unitCM2=cm²
@@ -232,7 +232,7 @@ unitDM3=dm³
 unitCM3=cm³
 unitMM3=mm³
 unitFT3=ft³
-unitIN3=in³
+unitIN3=inch³
 unitOZ3=uns
 unitgallon=gallon
 ProductCodeModel=Produktmall, ref.
@@ -243,13 +243,13 @@ AlwaysUseFixedPrice=Använd fast pris
 PriceByQuantity=Olika priser m.a.p. mängd
 DisablePriceByQty=Inaktivera priserna efter antal
 PriceByQuantityRange=Pris för mängdgaffel
-MultipriceRules=Automatic prices for segment
+MultipriceRules=Automatiska priser för segment
 UseMultipriceRules=Använd prissegmentregler (definierad i produktmoduluppsättning) för att automatiskt beräkna priser för alla andra segment enligt första segmentet
 PercentVariationOver=%% variation över %s
 PercentDiscountOver=%% rabatt över %s
 KeepEmptyForAutoCalculation=Håll tomt för att få detta beräknat automatiskt från vikt eller volym av produkter
-VariantRefExample=Examples: COL, SIZE
-VariantLabelExample=Examples: Color, Size
+VariantRefExample=Exempel: COL, SIZE
+VariantLabelExample=Exempel: Färg, Storlek
 ### composition fabrication
 Build=Tillverka
 ProductsMultiPrice=Produkter och priser för varje prissegment
@@ -291,7 +291,7 @@ PriceExpressionEditorHelp5=Tillgängliga globala värden:
 PriceMode=Prisläge
 PriceNumeric=Nummer
 DefaultPrice=Standardpris
-DefaultPriceLog=Log of previous default prices
+DefaultPriceLog=Logg över tidigare standardpriser
 ComposedProductIncDecStock=Öka / minska lagerposten vid föräldraändring
 ComposedProduct=Barnprodukter
 MinSupplierPrice=Lägsta köpkurs
@@ -302,7 +302,7 @@ AddVariable=Lägg till variabel
 AddUpdater=Lägg till Updater
 GlobalVariables=Globala variabler
 VariableToUpdate=Variabel för uppdatering
-GlobalVariableUpdaters=External updaters for variables
+GlobalVariableUpdaters=Externa uppdaterare för variabler
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Parsar JSON-data från den angivna webbadressen, VALUE specificerar platsen för relevant värde,
 GlobalVariableUpdaterHelpFormat0=Formatera för begäran {"URL": "http://example.com/urlofjson", "VALUE": "array1, array2, targetvalue"}
@@ -314,7 +314,7 @@ LastUpdated=Senaste uppdatering
 CorrectlyUpdated=Korrekt uppdaterad
 PropalMergePdfProductActualFile=Filer använder för att lägga till i PDF Azur är / är
 PropalMergePdfProductChooseFile=Välj PDF-filer
-IncludingProductWithTag=Include products/services with tag
+IncludingProductWithTag=Inkludera produkter / tjänster med etikett
 DefaultPriceRealPriceMayDependOnCustomer=Standardpris, realt pris kan bero på kund
 WarningSelectOneDocument=Var god välj minst ett dokument
 DefaultUnitToShow=Enhet
@@ -328,10 +328,10 @@ ProductWeight=Vikt för 1 produkt
 ProductVolume=Volym för 1 produkt
 WeightUnits=Viktenhet
 VolumeUnits=Volymenhet
-WidthUnits=Width unit
-LengthUnits=Length unit
-HeightUnits=Height unit
-SurfaceUnits=Surface unit
+WidthUnits=Bredd
+LengthUnits=Längd enhet
+HeightUnits=Höjd enhet
+SurfaceUnits=Ytenhet
 SizeUnits=Storleksenhet
 DeleteProductBuyPrice=Radera köpeskillingen
 ConfirmDeleteProductBuyPrice=Är du säker på att du vill ta bort det här köpeskillingen?
@@ -340,12 +340,12 @@ ProductSheet=Produktblad
 ServiceSheet=Serviceblad
 PossibleValues=Möjliga värden
 GoOnMenuToCreateVairants=Gå på menyn %s - %s för att förbereda attributvarianter (som färger, storlek, ...)
-UseProductFournDesc=Add a feature to define the descriptions of products defined by the vendors in addition to descriptions for customers
+UseProductFournDesc=Lägg till en funktion för att definiera beskrivningar av produkter som definieras av leverantörerna utöver beskrivningar för kunder
 ProductSupplierDescription=Leverantörsbeskrivning för produkten
-UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
-PackagingForThisProduct=Packaging
-PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
-QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
+UseProductSupplierPackaging=Använd förpackning till leverantörspriser (beräkna kvantiteter enligt förpackning som anges på leverantörspris när du lägger till / uppdaterar rad i leverantörsdokument)
+PackagingForThisProduct=Förpackning
+PackagingForThisProductDesc=Vid leverantörsbeställning kommer du automatiskt att beställa denna kvantitet (eller en multipel av denna kvantitet). Får inte vara mindre än minsta köpkvantitet
+QtyRecalculatedWithPackaging=Mängden av linjen beräknades om enligt leverantörens förpackning
 
 #Attributes
 VariantAttributes=Variant attribut
@@ -368,9 +368,9 @@ SelectCombination=Välj kombination
 ProductCombinationGenerator=Varianter generator
 Features=Funktioner
 PriceImpact=Prispåverkan
-ImpactOnPriceLevel=Impact on price level %s
-ApplyToAllPriceImpactLevel= Apply to all levels
-ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
+ImpactOnPriceLevel=Påverkan på prisnivån %s
+ApplyToAllPriceImpactLevel= Ansök på alla nivåer
+ApplyToAllPriceImpactLevelHelp=Genom att klicka här ställer du in samma prispåverkan på alla nivåer
 WeightImpact=Viktpåverkan
 NewProductAttribute=Nya attribut
 NewProductAttributeValue=Nytt attributvärde
@@ -382,7 +382,7 @@ UsePercentageVariations=Använd procentuella variationer
 PercentageVariation=Procentuell variation
 ErrorDeletingGeneratedProducts=Ett fel uppstod när du försökte radera befintliga varianter av produkter
 NbOfDifferentValues=Antal olika värden
-NbProducts=Number of products
+NbProducts=Antal produkter
 ParentProduct=Föräldraprodukt
 HideChildProducts=Dölj variantprodukter
 ShowChildProducts=Visa variantprodukter
@@ -393,6 +393,8 @@ ErrorCopyProductCombinations=Ett fel uppstod när du kopierade varianterna
 ErrorDestinationProductNotFound=Destination produkt hittades inte
 ErrorProductCombinationNotFound=Produktvariant inte hittat
 ActionAvailableOnVariantProductOnly=Åtgärd endast tillgänglig på varianter av produkt
-ProductsPricePerCustomer=Product prices per customers
-ProductSupplierExtraFields=Additional Attributes (Supplier Prices)
-DeleteLinkedProduct=Delete the child product linked to the combination
+ProductsPricePerCustomer=Produktpriser per kund
+ProductSupplierExtraFields=Ytterligare attribut (leverantörspriser)
+DeleteLinkedProduct=Ta bort den underordnade produkten som är länkad till kombinationen
+PMPValue=Vägda genomsnittliga priset
+PMPValueShort=WAP
diff --git a/htdocs/langs/sv_SE/projects.lang b/htdocs/langs/sv_SE/projects.lang
index 0ffdf7a0821..b77f6547887 100644
--- a/htdocs/langs/sv_SE/projects.lang
+++ b/htdocs/langs/sv_SE/projects.lang
@@ -267,9 +267,11 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=Ny faktura
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+OneLinePerTimeSpentLine=One line for each time spent declaration
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
 AddPersonToTask=Add also to tasks
 UsageOrganizeEvent=Usage: Event Organization
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
+SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
diff --git a/htdocs/langs/sv_SE/receptions.lang b/htdocs/langs/sv_SE/receptions.lang
index 9229221efe1..f83363d5f90 100644
--- a/htdocs/langs/sv_SE/receptions.lang
+++ b/htdocs/langs/sv_SE/receptions.lang
@@ -44,4 +44,4 @@ ValidateOrderFirstBeforeReception=Du måste först validera ordern innan du kan
 ReceptionsNumberingModules=Numbering module for receptions
 ReceptionsReceiptModel=Document templates for receptions
 NoMorePredefinedProductToDispatch=No more predefined products to dispatch
-
+ReceptionExist=A reception exists
diff --git a/htdocs/langs/sv_SE/stocks.lang b/htdocs/langs/sv_SE/stocks.lang
index f35ce300791..9aaeaab10c5 100644
--- a/htdocs/langs/sv_SE/stocks.lang
+++ b/htdocs/langs/sv_SE/stocks.lang
@@ -56,8 +56,6 @@ UnitPurchaseValue=Inköpspris per enhet
 StockTooLow=Lager för lågt
 StockLowerThanLimit=Lager lägre än varningsgräns (%s)
 EnhancedValue=Värde
-PMPValue=Vägda genomsnittliga priset
-PMPValueShort=WAP
 EnhancedValueOfWarehouses=Lagervärde
 UserWarehouseAutoCreate=Skapa ett användarlager automatiskt när du skapar en användare
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
@@ -251,7 +249,10 @@ SelectAStockMovementFileToImport=select a stock movement file to import
 InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
 LabelOfInventoryMovemement=Inventory %s
 ReOpen=Reopen
-ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock to the real qty you entered into the inventory.
 ObjectNotFound=%s not found
 MakeMovementsAndClose=Generate movements and close
 AutofillWithExpected=Fill real quantity with expected quantity
+ShowAllBatchByDefault=By default, show batch details on product "stock" tab
+CollapseBatchDetailHelp=You can set batch detail default display in stocks module configuration
+FieldCannotBeNegative=Field "%s" cannot be negative
diff --git a/htdocs/langs/sv_SE/ticket.lang b/htdocs/langs/sv_SE/ticket.lang
index 42a21c94cc3..baa6c0eb49f 100644
--- a/htdocs/langs/sv_SE/ticket.lang
+++ b/htdocs/langs/sv_SE/ticket.lang
@@ -33,16 +33,16 @@ TicketDictSeverity=Ticket - Severiteter
 TicketDictResolution=Ticket - Resolution
 
 TicketTypeShortCOM=Kommersiell fråga
-TicketTypeShortHELP=Request for functionnal help
-TicketTypeShortISSUE=Issue, bug or problem
-TicketTypeShortREQUEST=Change or enhancement request
+TicketTypeShortHELP=Begäran om funktionell hjälp
+TicketTypeShortISSUE=Problem, fel eller problem
+TicketTypeShortREQUEST=Ändrings- eller förbättringsbegäran
 TicketTypeShortPROJET=Projekt
 TicketTypeShortOTHER=Andra
 
 TicketSeverityShortLOW=Låg
 TicketSeverityShortNORMAL=Vanligt
 TicketSeverityShortHIGH=Hög
-TicketSeverityShortBLOCKING=Critical, Blocking
+TicketSeverityShortBLOCKING=Kritisk, blockerande
 
 ErrorBadEmailAddress=Fältet '%s' felaktigt
 MenuTicketMyAssign=Mina biljetter
@@ -61,7 +61,7 @@ Notify_TICKET_SENTBYMAIL=Skicka biljettmeddelande via e-post
 Read=Läsa
 Assigned=Tilldelad
 InProgress=Pågående
-NeedMoreInformation=Waiting for information
+NeedMoreInformation=Väntar på information
 Answered=Besvarade
 Waiting=Väntar
 Closed=Stängt
@@ -70,8 +70,8 @@ Deleted=Raderade
 # Dict
 Type=Typ
 Severity=Allvarlighet
-TicketGroupIsPublic=Group is public
-TicketGroupIsPublicDesc=If a ticket group is public, it will be visible in the form when creating a ticket from the public interface
+TicketGroupIsPublic=Gruppen är offentlig
+TicketGroupIsPublicDesc=Om en biljettgrupp är offentlig visas den i formuläret när du skapar en biljett från det offentliga gränssnittet
 
 # Email templates
 MailToSendTicketMessage=Att skicka e-post från biljettmeddelande
@@ -116,8 +116,8 @@ TicketsShowModuleLogo=Visa modulens logotyp i det offentliga gränssnittet
 TicketsShowModuleLogoHelp=Aktivera det här alternativet för att dölja logotypmodulen på sidorna i det offentliga gränssnittet
 TicketsShowCompanyLogo=Visa företagets logotyp i det offentliga gränssnittet
 TicketsShowCompanyLogoHelp=Aktivera det här alternativet för att dölja huvudbolags logotyp på sidorna i det offentliga gränssnittet
-TicketsEmailAlsoSendToMainAddress=Also send a notification to the main email address
-TicketsEmailAlsoSendToMainAddressHelp=Enable this option to also send an email to the address defined into setup "%s" (see tab "%s")
+TicketsEmailAlsoSendToMainAddress=Skicka också ett meddelande till huvud-e-postadressen
+TicketsEmailAlsoSendToMainAddressHelp=Aktivera det här alternativet för att också skicka ett e-postmeddelande till den adress som definierats i inställningen "%s" (se fliken "%s")
 TicketsLimitViewAssignedOnly=Begränsa visningen till biljetter som tilldelats den nuvarande användaren (inte effektiv för externa användare, alltid begränsad till den tredje parten som de är beroende av)
 TicketsLimitViewAssignedOnlyHelp=Endast biljetter som tilldelats den nuvarande användaren kommer att vara synliga. Gäller inte för en användare med biljettförvaltningsrättigheter.
 TicketsActivatePublicInterface=Aktivera det offentliga gränssnittet
@@ -125,28 +125,28 @@ TicketsActivatePublicInterfaceHelp=Offentligt gränssnitt tillåter alla besöka
 TicketsAutoAssignTicket=Tilldela automatiskt användaren som skapade biljetten
 TicketsAutoAssignTicketHelp=När du skapar en biljett kan användaren automatiskt tilldelas biljetten.
 TicketNumberingModules=Biljettnummermodul
-TicketsModelModule=Document templates for tickets
+TicketsModelModule=Dokumentmallar för biljetter
 TicketNotifyTiersAtCreation=Meddela tredje part vid skapandet
 TicketsDisableCustomerEmail=Avaktivera alltid e-postmeddelanden när en biljett skapas från det offentliga gränssnittet
-TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is added to a ticket
-TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
-TicketPublicNotificationNewMessageDefaultEmail=Notifications email to (update)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Send an email to this address for each new message notifications if the ticket doesn't have a user assigned to it or if the user doesn't have any known email.
+TicketsPublicNotificationNewMessage=Skicka e-post när ett nytt meddelande / en kommentar läggs till i en biljett
+TicketsPublicNotificationNewMessageHelp=Skicka e-post (ar) när ett nytt meddelande läggs till från det offentliga gränssnittet (tilldelad användare eller e-postmeddelanden till (uppdatering) och / eller e-postmeddelanden till)
+TicketPublicNotificationNewMessageDefaultEmail=Meddelanden via e-post till (uppdatering)
+TicketPublicNotificationNewMessageDefaultEmailHelp=Skicka ett e-postmeddelande till den här adressen för varje meddelande om nytt meddelande om biljetten inte har tilldelats någon användare eller om användaren inte har någon känd e-post.
 #
 # Index & list page
 #
-TicketsIndex=Tickets area
+TicketsIndex=Biljettområde
 TicketList=Lista över biljetter
 TicketAssignedToMeInfos=Denna sidvisningsbiljettlista skapad av eller tilldelad den nuvarande användaren
 NoTicketsFound=Ingen biljett finns
-NoUnreadTicketsFound=No unread ticket found
+NoUnreadTicketsFound=Ingen oläst biljett hittades
 TicketViewAllTickets=Visa alla biljetter
 TicketViewNonClosedOnly=Visa bara öppna biljetter
 TicketStatByStatus=Biljetter efter status
-OrderByDateAsc=Sort by ascending date
-OrderByDateDesc=Sort by descending date
-ShowAsConversation=Show as conversation list
-MessageListViewType=Show as table list
+OrderByDateAsc=Sortera efter stigande datum
+OrderByDateDesc=Sortera efter fallande datum
+ShowAsConversation=Visa som konversationslista
+MessageListViewType=Visa som tabellista
 
 #
 # Ticket card
@@ -232,8 +232,8 @@ TicketConfirmChangeStatus=Bekräfta statusändringen: %s?
 TicketLogStatusChanged=Status ändrad: %s till %s
 TicketNotNotifyTiersAtCreate=Meddela inte företaget på create
 Unread=Oläst
-TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
-ErrorTicketRefRequired=Ticket reference name is required
+TicketNotCreatedFromPublicInterface=Inte tillgänglig. Biljetten skapades inte från det offentliga gränssnittet.
+ErrorTicketRefRequired=Biljettreferensnamn krävs
 
 #
 # Logs
@@ -243,7 +243,7 @@ NoLogForThisTicket=Ingen logg på denna biljett ännu
 TicketLogAssignedTo=Biljett %s tilldelad %s
 TicketLogPropertyChanged=Biljett %s modifierad: märkt från %s till %s
 TicketLogClosedBy=Biljett %s stängt av %s
-TicketLogReopen=Ticket %s re-open
+TicketLogReopen=Biljett %s öppnas igen
 
 #
 # Public pages
@@ -253,9 +253,9 @@ ShowListTicketWithTrackId=Visa biljellista från spår-ID
 ShowTicketWithTrackId=Visa biljett från spår ID
 TicketPublicDesc=Du kan skapa en supportbiljett eller kolla från ett befintligt ID.
 YourTicketSuccessfullySaved=Biljett har sparats!
-MesgInfosPublicTicketCreatedWithTrackId=A new ticket has been created with ID %s and Ref %s.
+MesgInfosPublicTicketCreatedWithTrackId=En ny biljett har skapats med ID %s och Ref %s.
 PleaseRememberThisId=Var vänlig och håll spårningsnumret som vi kanske frågar dig senare.
-TicketNewEmailSubject=Ticket creation confirmation - Ref %s (public ticket ID %s)
+TicketNewEmailSubject=Bekräftelse på skapande av biljett - Ref %s (offentligt biljett-ID %s)
 TicketNewEmailSubjectCustomer=Ny supportbiljett
 TicketNewEmailBody=Det här är ett automatiskt e-postmeddelande som bekräftar att du har registrerat en ny biljett.
 TicketNewEmailBodyCustomer=Det här är ett automatiskt e-postmeddelande för att bekräfta en ny biljett har just skapats i ditt konto.
@@ -274,15 +274,15 @@ Subject=Ämne
 ViewTicket=Visa biljett
 ViewMyTicketList=Visa min biljettlista
 ErrorEmailMustExistToCreateTicket=Fel: E-postadress hittades inte i vår databas
-TicketNewEmailSubjectAdmin=New ticket created - Ref %s (public ticket ID %s)
+TicketNewEmailSubjectAdmin=Ny biljett skapad - Ref %s (offentlig biljett-ID %s)
 TicketNewEmailBodyAdmin=<p> Biljetten har just skapats med ID # %s, se information: </p>
 SeeThisTicketIntomanagementInterface=Se biljett i hanteringsgränssnittet
 TicketPublicInterfaceForbidden=Det offentliga gränssnittet för biljetterna var inte aktiverat
 ErrorEmailOrTrackingInvalid=Dåligt värde för spårnings-ID eller e-post
-OldUser=Old user
+OldUser=Gammal användare
 NewUser=Ny användare
-NumberOfTicketsByMonth=Number of tickets per month
-NbOfTickets=Number of tickets
+NumberOfTicketsByMonth=Antal biljetter per månad
+NbOfTickets=Antal biljetter
 # notifications
 TicketNotificationEmailSubject=Biljett %s uppdaterad
 TicketNotificationEmailBody=Detta är ett automatiskt meddelande för att meddela dig att biljetten %s just har uppdaterats
@@ -304,13 +304,13 @@ BoxLastModifiedTicket=Senast ändrade biljetter
 BoxLastModifiedTicketDescription=Senaste %s modifierade biljetter
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=Inga nyligen ändrade biljetter
-BoxTicketType=Number of open tickets by type
-BoxTicketSeverity=Number of open tickets by severity
-BoxNoTicketSeverity=No tickets opened
-BoxTicketLastXDays=Number of new tickets by days the last %s days
-BoxTicketLastXDayswidget = Number of new tickets by days the last X days
-BoxNoTicketLastXDays=No new tickets the last %s days
-BoxNumberOfTicketByDay=Number of new tickets by day
-BoxNewTicketVSClose=Number of today's new tickets versus today's closed tickets
-TicketCreatedToday=Ticket created today
-TicketClosedToday=Ticket closed today
+BoxTicketType=Distribution of open tickets by type
+BoxTicketSeverity=Antal öppna biljetter efter svårighetsgrad
+BoxNoTicketSeverity=Inga biljetter öppnade
+BoxTicketLastXDays=Antal nya biljetter per dagar de senaste %s dagarna
+BoxTicketLastXDayswidget = Antal nya biljetter efter dagar de senaste X dagarna
+BoxNoTicketLastXDays=Inga nya biljetter de senaste %s dagarna
+BoxNumberOfTicketByDay=Antal nya biljetter per dag
+BoxNewTicketVSClose=Antal dagens nya biljetter kontra dagens stängda biljetter
+TicketCreatedToday=Biljett skapad idag
+TicketClosedToday=Biljetten stängd idag
diff --git a/htdocs/langs/sv_SE/trips.lang b/htdocs/langs/sv_SE/trips.lang
index e77d18bbbae..90cedfe9044 100644
--- a/htdocs/langs/sv_SE/trips.lang
+++ b/htdocs/langs/sv_SE/trips.lang
@@ -19,11 +19,11 @@ ConfirmDeleteTrip=Är du säker på att du vill ta bort denna kostnadsrapport?
 ListTripsAndExpenses=Förteckning över kostnadsrapporter
 ListToApprove=Väntar på godkännande
 ExpensesArea=Kostnadsrapporteringsområde
-ClassifyRefunded=Klassificerad 'Återbetalas'
+ClassifyRefunded=Märk 'Återbetalas'
 ExpenseReportWaitingForApproval=En ny kostnadsrapport har skickats in för godkännande
-ExpenseReportWaitingForApprovalMessage=En ny kostnadsrapport har skickats in och väntar på godkännande. <br> - Användare: %s <br> - Period: %s <br> Klicka här för att validera: %s
+ExpenseReportWaitingForApprovalMessage=En ny kostnadsrapport har skickats in och väntar på godkännande. <br> - Användare: %s <br> - Period: %s <br> Klicka här för att bekräfta: %s
 ExpenseReportWaitingForReApproval=En kostnadsrapport har lämnats in för omprövning
-ExpenseReportWaitingForReApprovalMessage=En kostnadsrapport har skickats in och väntar på omprövning. <br> %s, du vägrade att godkänna kostnadsrapporten av den anledningen: %s. <br> En ny version har föreslagits och väntar på ditt godkännande. <br> - Användare: %s <br> - Period: %s <br> Klicka här för att validera: %s
+ExpenseReportWaitingForReApprovalMessage=En kostnadsrapport har skickats in och väntar på omprövning. <br> %s, du vägrade att godkänna kostnadsrapporten av den anledningen: %s. <br> En ny version har föreslagits och väntar på ditt godkännande. <br> - Användare: %s <br> - Period: %s <br> Klicka här för att godkänna: %s
 ExpenseReportApproved=En kostnadsrapport godkändes
 ExpenseReportApprovedMessage=Kostnadsrapporten %s godkändes. <br> - Användare: %s <br> - Godkänd av: %s <br> Klicka här för att visa kostnadsrapporten: %s
 ExpenseReportRefused=En kostnadsrapport nekades
@@ -33,7 +33,7 @@ ExpenseReportCanceledMessage=Kostnadsrapporten %s avbröts. <br> - Användare: %
 ExpenseReportPaid=En kostnadsrapport utbetalades
 ExpenseReportPaidMessage=Kostnadsrapporten %s betalades. <br> - Användare: %s <br> - Betald av: %s <br> Klicka här för att visa kostnadsrapporten: %s
 TripId=ID utgiftsrapport
-AnyOtherInThisListCanValidate=Person att informera om validering.
+AnyOtherInThisListCanValidate=Person som ska informeras för att validera begäran.
 TripSociete=Informationsföretag
 TripNDF=Informationsutgiftsrapport
 PDFStandardExpenseReports=Standardmall för att skapa ett PDF-dokument för kostnadsrapport
@@ -55,7 +55,7 @@ EX_HOT=Hotell
 EX_PAR=Parkering CV
 EX_TOL=Toll CV
 EX_TAX=Olika skatter
-EX_IND=Indemnity transportation subscription
+EX_IND=Skydd för ersättning för ersättning
 EX_SUM=Underhållstillförsel
 EX_SUO=Kontorsmaterial
 EX_CAR=Biluthyrning
@@ -73,8 +73,8 @@ EX_PAR_VP=Parkering PV
 EX_CAM_VP=PV underhåll och reparation
 DefaultCategoryCar=Standard transportläge
 DefaultRangeNumber=Standardintervallnummer
-UploadANewFileNow=Upload a new document now
-Error_EXPENSEREPORT_ADDON_NotDefined=Fel, regeln för kostnadsrapport nummerering ref definierades inte i inställningen av modulen "Expense Report"
+UploadANewFileNow=Ladda upp ett nytt dokument nu
+Error_EXPENSEREPORT_ADDON_NotDefined=Fel, regeln för utläggsrapportsnummereringsref definierades inte i inställningen av modulen "Utläggsrapport"
 ErrorDoubleDeclaration=Du har lämnat en annan kostnadsrapport inom samma datumintervall.
 AucuneLigne=Det finns ingen kostnadsrapport som deklarerats än
 ModePaiement=Betalningssätt
@@ -87,13 +87,13 @@ CANCEL_USER=Släckt av
 MOTIF_REFUS=Orsak
 MOTIF_CANCEL=Orsak
 DATE_REFUS=Neka datum
-DATE_SAVE=Attestdatum
+DATE_SAVE=Bekräftelsesdatum
 DATE_CANCEL=Avbokningsdatum
 DATE_PAIEMENT=Betalningsdag
 BROUILLONNER=öppna
 ExpenseReportRef=Ref. kostnads rapport
 ValidateAndSubmit=Bekräfta och lämna in för godkännande
-ValidatedWaitingApproval=Validerad (väntar på godkännande)
+ValidatedWaitingApproval=Bekräftat (väntar på godkännande)
 NOT_AUTHOR=Du är inte författaren till denna kostnadsrapport. Drift avbruten.
 ConfirmRefuseTrip=Är du säker på att du vill neka denna kostnadsrapport?
 ValideTrip=Godkänn kostnadsrapport
@@ -103,14 +103,14 @@ ConfirmPaidTrip=Är du säker på att du vill ändra status för denna kostnadsr
 ConfirmCancelTrip=Är du säker på att du vill avbryta denna kostnadsrapport?
 BrouillonnerTrip=Flytta tillbaka kostnadsrapport till status "Draft"
 ConfirmBrouillonnerTrip=Är du säker på att du vill flytta denna kostnadsrapport till status "Draft"?
-SaveTrip=Godkänn kostnadsrapport
-ConfirmSaveTrip=Är du säker på att du vill validera denna kostnadsrapport?
+SaveTrip=Bekräft kostnadsrapport
+ConfirmSaveTrip=Är du säker på att du vill bekräfta denna kostnadsrapport?
 NoTripsToExportCSV=Ingen kostnadsrapport att exportera för denna period.
 ExpenseReportPayment=Kostnadsrapportsbetalning
 ExpenseReportsToApprove=Rapporter att godkänna
 ExpenseReportsToPay=Kostnad rapporterar att betala
 ConfirmCloneExpenseReport=Är du säker på att du vill klona denna kostnadsrapport?
-ExpenseReportsIk=Antal mil i kostnadsrapporten
+ExpenseReportsIk=Konfiguration av körsträcka
 ExpenseReportsRules=Kostnadsrapporteringsregler
 ExpenseReportIkDesc=Du kan ändra beräkningen av kilometerkostnaden efter kategori och intervall som de tidigare definierats. <b> d </b> är avståndet i kilometer
 ExpenseReportRulesDesc=Du kan skapa eller uppdatera några regler för beräkning. Den här delen kommer att användas när användaren kommer att skapa en ny kostnadsrapport
@@ -131,7 +131,7 @@ ExpenseReportDateEnd=Slutdatum
 ExpenseReportLimitAmount=Limitbelopp
 ExpenseReportRestrictive=Restriktiv
 AllExpenseReport=All typ av kostnadsrapport
-OnExpense=Expense line
+OnExpense=Utläggsrad
 ExpenseReportRuleSave=Kostnadsrapportregeln sparades
 ExpenseReportRuleErrorOnSave=Fel: %s
 RangeNum=Område %d
@@ -145,7 +145,7 @@ nolimitbyEX_DAY=om dagen (ingen begränsning)
 nolimitbyEX_MON=per månad (ingen begränsning)
 nolimitbyEX_YEA=per år (ingen begränsning)
 nolimitbyEX_EXP=efter rad (ingen begränsning)
-CarCategory=Kategori av bil
+CarCategory=Fordonskategori
 ExpenseRangeOffset=Förskjutningsbelopp: %s
 RangeIk=Mileage range
-AttachTheNewLineToTheDocument=Attach the new line to an existing document
+AttachTheNewLineToTheDocument=Bifoga raden till ett uppladdat dokument
diff --git a/htdocs/langs/sv_SE/users.lang b/htdocs/langs/sv_SE/users.lang
index f15100a9f65..7cc52b333bf 100644
--- a/htdocs/langs/sv_SE/users.lang
+++ b/htdocs/langs/sv_SE/users.lang
@@ -47,8 +47,8 @@ RemoveFromGroup=Ta bort från grupp
 PasswordChangedAndSentTo=Lösenord ändras och skickas till <b>%s.</b>
 PasswordChangeRequest=Begär om ändring av lösenord för <b> %s </b>
 PasswordChangeRequestSent=Begäran om att ändra lösenord för <b>%s</b> skickas till <b>%s.</b>
-IfLoginExistPasswordRequestSent=If this login is a valid account, an email to reset password has been sent.
-IfEmailExistPasswordRequestSent=If this email is a valid account, an email to reset password has been sent.
+IfLoginExistPasswordRequestSent=Om denna inloggning är ett giltigt konto har ett e-postmeddelande skickats för att återställa lösenordet.
+IfEmailExistPasswordRequestSent=Om det här e-postmeddelandet är ett giltigt konto har ett e-postmeddelande skickats för att återställa lösenordet.
 ConfirmPasswordReset=Bekräfta återställning av lösenord
 MenuUsersAndGroups=Användare & grupper
 LastGroupsCreated=Senaste %s grupper skapade
@@ -73,16 +73,16 @@ ExportDataset_user_1=Användare och deras egenskaper
 DomainUser=Domän användare %s
 Reactivate=Återaktivera
 CreateInternalUserDesc=I det här formuläret kan du skapa en intern användare i ditt företag / organisation. För att skapa en extern användare (kund, leverantör etc.), använd knappen "Create Dolibarr User" från den tredje partens kontaktkort.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization, or is a partner user outside of your organization that may need to see more data  than data related to his company (the permission system will define what he can or can't see or do).<br>An <b>external</b> user is a customer, vendor or other that must view ONLY data related to himself (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, you must grant permissions on the features that the user need.
+InternalExternalDesc=En <b> intern </b>-användare är en användare som ingår i ditt företag / organisation, eller är en partneranvändare utanför din organisation som kan behöva se mer data än data relaterade till sitt företag (tillståndssystemet definierar vad han kan eller kan inte se eller göra). <br> En <b> extern </b> användare är en kund, leverantör eller annan som måste se ENDAST data relaterade till sig själv (Skapa en extern användare för en tredje part kan göras från tredjeparts kontaktposter). <br> <br> I båda fallen måste du bevilja behörighet för de funktioner som användaren behöver.
 PermissionInheritedFromAGroup=Tillstånd beviljas, eftersom ärvt från en av en användares grupp.
 Inherited=Ärvda
-UserWillBe=Created user will be
+UserWillBe=Skapad användare kommer att vara
 UserWillBeInternalUser=Skapad användare kommer att vara en intern användare (eftersom inte kopplade till en viss tredje part)
 UserWillBeExternalUser=Skapad användare kommer att vara en extern användare (eftersom kopplat till en viss tredje part)
 IdPhoneCaller=Id telefonen ringer
 NewUserCreated=Användare %s skapade
 NewUserPassword=Ändring av lösenord för %s
-NewPasswordValidated=Your new password have been validated and must be used now to login.
+NewPasswordValidated=Ditt nya lösenord har validerats och måste användas nu för att logga in.
 EventUserModified=Användare %s modifierade
 UserDisabled=Användare %s funktionshindrade
 UserEnabled=Användare %s aktiverad
@@ -106,21 +106,21 @@ UseTypeFieldToChange=Använd fält Typ för att ändra
 OpenIDURL=OpenID URL
 LoginUsingOpenID=Logga in med OpenID
 WeeklyHours=Timmar arbetade (per vecka)
-ExpectedWorkedHours=Expected hours worked per week
+ExpectedWorkedHours=Förväntade arbetade timmar per vecka
 ColorUser=Färg på användaren
 DisabledInMonoUserMode=Inaktiverad i underhållsläge
 UserAccountancyCode=Användarkonto
 UserLogoff=Användarutloggning
 UserLogged=Användare loggad
-DateOfEmployment=Employment date
-DateEmployment=Employment
-DateEmploymentstart=Employment Start Date
+DateOfEmployment=Anställningsdatum
+DateEmployment=Sysselsättning
+DateEmploymentstart=Startdatum för anställning
 DateEmploymentEnd=Anställningens slutdatum
-RangeOfLoginValidity=Access validity date range
+RangeOfLoginValidity=Åtkomst giltighetsdatumintervall
 CantDisableYourself=Du kan inte inaktivera din egen användarrekord
-ForceUserExpenseValidator=Force expense report validator
-ForceUserHolidayValidator=Force leave request validator
-ValidatorIsSupervisorByDefault=By default, the validator is the supervisor of the user. Keep empty to keep this behaviour.
-UserPersonalEmail=Personal email
-UserPersonalMobile=Personal mobile phone
+ForceUserExpenseValidator=Tvinga valideringsrapport för utgiftsrapport
+ForceUserHolidayValidator=Tvinga lämningsbegäran
+ValidatorIsSupervisorByDefault=Som standard är valideraren användarens övervakare. Håll dig tom för att behålla detta beteende.
+UserPersonalEmail=Personlig email
+UserPersonalMobile=Personlig mobiltelefon
 WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
diff --git a/htdocs/langs/sv_SE/website.lang b/htdocs/langs/sv_SE/website.lang
index 713f5c37332..1b7afa6e64e 100644
--- a/htdocs/langs/sv_SE/website.lang
+++ b/htdocs/langs/sv_SE/website.lang
@@ -2,7 +2,7 @@
 Shortname=Kod
 WebsiteSetupDesc=Skapa här de webbplatser du vill använda. Gå sedan till menyn webbplatser för att redigera dem.
 DeleteWebsite=Ta bort webbplats
-ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain.
+ConfirmDeleteWebsite=Är du säker på att du vill ta bort den här webbplatsen? Alla sidor och innehåll tas också bort. Filerna som laddas upp (som till mediekatalogen, ECM-modulen, ...) kommer att finnas kvar.
 WEBSITE_TYPE_CONTAINER=Typ av sida / container
 WEBSITE_PAGE_EXAMPLE=Webbplats som ska användas som exempel
 WEBSITE_PAGENAME=Sidnamn / alias
@@ -14,10 +14,10 @@ WEBSITE_JS_INLINE=Javascript-filinnehåll (vanligt för alla sidor)
 WEBSITE_HTML_HEADER=Tillägg längst ner i HTML-rubrik (vanligt för alla sidor)
 WEBSITE_ROBOT=Robotfil (robots.txt)
 WEBSITE_HTACCESS=Webbsida. Htaccess-fil
-WEBSITE_MANIFEST_JSON=Website manifest.json file
-WEBSITE_README=README.md file
-WEBSITE_KEYWORDSDesc=Use a comma to separate values
-EnterHereLicenseInformation=Enter here meta data or license information to fille a README.md file. if you distribute your website as a template, the file will be included into the temptate package.
+WEBSITE_MANIFEST_JSON=Webbplats manifest.json-fil
+WEBSITE_README=README.md-fil
+WEBSITE_KEYWORDSDesc=Använd ett komma för att separera värden
+EnterHereLicenseInformation=Ange här metadata eller licensinformation för att arkivera en README.md-fil. om du distribuerar din webbplats som en mall inkluderas filen i det frestande paketet.
 HtmlHeaderPage=HTML-rubrik (endast för den här sidan)
 PageNameAliasHelp=Namn eller alias på sidan. <br> Detta alias används också för att skapa en SEO-URL när webbplatsen springer från en virtuell värd på en webbserver (som Apacke, Nginx, ...). Använd knappen "<strong> %s </strong>" för att redigera detta alias.
 EditTheWebSiteForACommonHeader=Obs! Om du vill definiera en personlig rubrik för alla sidor, redigera rubriken på sidnivån istället för på sidan / behållaren.
@@ -43,24 +43,24 @@ SetAsHomePage=Sätt som hemsida
 RealURL=Verklig URL
 ViewWebsiteInProduction=Visa webbplats med hjälp av hemadresser
 SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server (Apache, Nginx, ...) a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong>
-ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
+ExampleToUseInApacheVirtualHostConfig=Exempel att använda i Apache virtuell värdinställning:
 YouCanAlsoTestWithPHPS= <u> Använd med PHP-inbäddad server </u> <br> På utvecklingsmiljö kan du föredra att testa webbplatsen med PHP-inbäddad webbserver (PHP 5.5 krävs) genom att köra <br> <strong> php -S 0.0.0.0:8080 -t %s </strong>
-YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
+YouCanAlsoDeployToAnotherWHP= <u> Kör din webbplats med en annan Dolibarr Hosting-leverantör </u> <br> Om du inte har en webbserver som Apache eller NGinx tillgänglig på internet kan du exportera och importera din webbplats till en annan Dolibarr-instans som tillhandahålls av en annan Dolibarr-värdleverantör integration med webbplatsmodulen. Du hittar en lista med några Dolibarr-värdleverantörer på <a href="https://saas.dolibarr.org" target="_blank"> https://saas.dolibarr.org </a>
 CheckVirtualHostPerms=Check also that the virtual host user (for example www-data) has <strong>%s</strong> permissions on files into<br><strong>%s</strong>
 ReadPerm=Läsa
 WritePerm=Skriva
 TestDeployOnWeb=Test / distribuera på webben
 PreviewSiteServedByWebServer=<u> Förhandsgranska %s i en ny flik. </u> <br> <br> %s kommer att serveras av en extern webbserver (som Apache, Nginx, IIS). Du måste installera och konfigurera den här servern innan du pekar på katalogen: <br> <strong> %s </strong> <br> URL betjänad av extern server: <br> <strong> %s </strong>
-PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
+PreviewSiteServedByDolibarr= <u> Förhandsgranska %s i en ny flik. </u> <br> <br> %s kommer att serveras av Dolibarr-servern så det behöver inte installeras någon extra webbserver (som Apache, Nginx, IIS). <br> Det obekväma är att sidornas webbadresser inte är användarvänliga och börjar med sökvägen till din Dolibarr. <br> URL betjänas av Dolibarr: <br> <strong> %s </strong> <br> <br> Om du vill använda din egen extern webbserver för att tjäna denna webbplats, skapa en virtuell värd på din webbserver som pekar på katalogen <br> <strong> %s </strong> <br> sedan ange namnet på denna virtuella server i egenskaperna för denna webbplats och klicka på länken "Test / Distribuera på webben".
 VirtualHostUrlNotDefined=URL för den virtuella värd som serveras av extern webbserver som inte definierats
 NoPageYet=Inga sidor ännu
 YouCanCreatePageOrImportTemplate=Du kan skapa en ny sida eller importera en fullständig webbplatsmall
 SyntaxHelp=Hjälp med specifika syntaxtips
 YouCanEditHtmlSourceckeditor=Du kan redigera HTML-källkod med knappen "Källa" i redigeraren.
-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, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<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 includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&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 a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&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/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource= <br> <span class="fa fa-bug"> </span> Du kan inkludera PHP-kod i den här källan med taggar <strong> &lt;? php? &gt; a0a65d071f6fcf Följande globala variabler är tillgängliga: $ conf, $ db, $ mysoc, $ user, $ website, $ websitepage, $ weblangs, $ pagelangs. <br> <br> <span class="fa fa-bug"> </span> Du kan också inkludera innehållet i en annan sida / behållare med följande syntax: <br> <strong> a313907? ? &gt; </strong> <br> <br> <span class="fa fa-bug"> </span> Du kan göra en omdirigering till en annan sida / Container med följande syntax (OBS! Inte ut innehållet innan en omdirigering): <br> <strong> &lt; php redirectToContainer (alias_of_container_to_redirect_to '); ? &gt; </strong> <br> <br> <span class="fa fa-link"> </span> att lägga till en länk till en annan sida använder syntax: <br> <strong> &lt;a href = "alias_of_page_to_link_to.php" &gt;mylink&lt;a&gt; </strong> <br> <br> <span class="fa fa-download"> </span> att inkludera en <strong> länk för att hämta </strong> en fil som lagras i <strong> dokument </strong>-katalog, använd <strong> document.php </strong> wrapper: <br> Exempel, för en fil till dokument / ecm (måste loggas), syntax är: a0342fccfda19b4 ] filename.ext "&gt; </strong> <br> För en fil till dokument / media (öppen katalog för allmän åtkomst) är syntax: <br> <strong> a03900df7d "/document.php?modulepart=medias&file= [relative_dir/] filnamn.ext"&gt; </strong> <br> För en fil som delas med en delningslänk (öppen åtkomst med den delande hash-nyckeln för fil) är syntax20 /document.php?hashp=publicsharekeyoffile"&gt; </strong> <br> <br> <span class="fa fa-picture-o"> </span> för att inkludera en <strong> bild </strong> lagras in i de <strong> dokument </strong> katalog använder <strong> viewimage.php </strong> wrapper: <br> Exempel, för en bild i dokument / medier (öppna katalog för allmän åtkomst), syntax är: <br> <strong> &lt;img src = "/ viewimage.php? modulepart = medias&amp;file = [relativ_dir /] filnamn.ext" a012c07
 #YouCanEditHtmlSource2=<br><span class="fa fa-picture-o"></span> To include a <strong>image</strong> shared publicaly, use the <strong>viewimage.php</strong> wrapper:<br>Example with a shared key 123456789, syntax is:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
-YouCanEditHtmlSourceMore=<br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
+YouCanEditHtmlSourceMore= <br> Fler exempel på HTML eller dynamisk kod finns på <a href="%s" target="_blank"> wiki-dokumentationen </a> <br>.
 ClonePage=Klona sida / behållare
 CloneSite=Klona webbplatsen
 SiteAdded=Webbplats tillagd
@@ -80,15 +80,15 @@ BlogPost=Blogginlägg
 WebsiteAccount=Webbsida konto
 WebsiteAccounts=Webbsida konton
 AddWebsiteAccount=Skapa webbplatskonto
-BackToListForThirdParty=Back to list for the third-party
+BackToListForThirdParty=Tillbaka till listan för tredje part
 DisableSiteFirst=Inaktivera webbplats först
 MyContainerTitle=Min webbplatstitel
-AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
-SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
+AnotherContainer=Så här inkluderar du innehåll från en annan sida / behållare (du kan ha ett fel här om du aktiverar dynamisk kod eftersom den inbäddade underbehållaren kanske inte finns)
+SorryWebsiteIsCurrentlyOffLine=Tyvärr, den här webbplatsen är för närvarande offline. Kom tillbaka senare ...
 WEBSITE_USE_WEBSITE_ACCOUNTS=Aktivera webbsidokontotabellen
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Aktivera tabellen för att lagra webbplatskonton (inloggning / överföring) för varje webbplats / tredje part
 YouMustDefineTheHomePage=Du måste först definiera standard startsida
-OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting javascript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor may not works correclty when used on a grabbed external page.
+OnlyEditionOfSourceForGrabbedContentFuture=Varning: Skapa en webbsida genom att importera en extern webbsida är reserverad för erfarna användare. Beroende på källsidans komplexitet kan resultatet av importen skilja sig från originalet. Även om källsidan använder vanliga CSS-stilar eller motstridiga javaskript kan det bryta utseendet eller funktionerna hos webbplatsredigeraren när du arbetar på den här sidan. Den här metoden är ett snabbare sätt att skapa en sida men det rekommenderas att du skapar din nya sida från grunden eller från en föreslagen sidmall. <br> Observera också att inline-redigeraren kanske inte fungerar korrekt när den används på en gripen extern sida.
 OnlyEditionOfSourceForGrabbedContent=Endast upplagan av HTML-källan är möjlig när innehållet greppades från en extern webbplats
 GrabImagesInto=Ta även bilder som finns i css och sidan.
 ImagesShouldBeSavedInto=Bilder ska sparas i katalogen
@@ -98,50 +98,50 @@ AliasPageAlreadyExists=Alias sida <strong> %s </strong> existerar redan
 CorporateHomePage=Företagets hemsida
 EmptyPage=Tom sida
 ExternalURLMustStartWithHttp=Extern webbadress måste börja med http: // eller https: //
-ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
-ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
-ShowSubcontainers=Show dynamic content
+ZipOfWebsitePackageToImport=Ladda upp zip-filen för webbplatsmallpaketet
+ZipOfWebsitePackageToLoad=eller välj ett tillgängligt inbäddat webbplatsmallpaket
+ShowSubcontainers=Visa dynamiskt innehåll
 InternalURLOfPage=Intern webbadress
 ThisPageIsTranslationOf=Den här sidan / behållaren är en översättning av
 ThisPageHasTranslationPages=Den här sidan / behållaren har översättning
 NoWebSiteCreateOneFirst=Ingen hemsida har skapats än. Skapa en första.
 GoTo=Gå till
 DynamicPHPCodeContainsAForbiddenInstruction=You add dynamic PHP code that contains the PHP instruction '<strong>%s</strong>' that is forbidden by default as dynamic content (see hidden options WEBSITE_PHP_ALLOW_xxx to increase list of allowed commands).
-NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynamic content in websites. Ask permission or just keep code into php tags unmodified.
-ReplaceWebsiteContent=Search or Replace website content
-DeleteAlsoJs=Delete also all javascript files specific to this website?
-DeleteAlsoMedias=Delete also all medias files specific to this website?
-MyWebsitePages=My website pages
-SearchReplaceInto=Search | Replace into
-ReplaceString=New string
-CSSContentTooltipHelp=Enter here CSS content. To avoid any conflict with the CSS of the application, be sure to prepend all declaration with the .bodywebsite class. For example:<br><br>#mycssselector, input.myclass:hover { ... }<br>must be<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>Note: If you have a large file without this prefix, you can use 'lessc' to convert it to append the .bodywebsite prefix everywhere.
-LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page.
-Dynamiccontent=Sample of a page with dynamic content
+NotAllowedToAddDynamicContent=Du har inte behörighet att lägga till eller redigera dynamiskt PHP-innehåll på webbplatser. Be tillåtelse eller behåll bara koden i php-taggar omodifierade.
+ReplaceWebsiteContent=Sök eller ersätt webbplatsinnehåll
+DeleteAlsoJs=Vill du ta bort alla JavaScript-filer som är specifika för den här webbplatsen?
+DeleteAlsoMedias=Ta bort alla mediefiler som är specifika för den här webbplatsen?
+MyWebsitePages=Mina webbplatser
+SearchReplaceInto=Sök | Byt ut i
+ReplaceString=Ny sträng
+CSSContentTooltipHelp=Ange här CSS-innehåll. För att undvika konflikter med applikationens CSS, var noga med att förbereda alla deklarationer med .bodywebsite-klassen. Till exempel: <br> <br> #mycssselector, input.myclass: hover {...} <br> måste vara <br> .bodywebsite #mycssselector, .bodywebsite input.myccc2: hover2 ... detta prefix kan du använda 'lessc' för att konvertera det för att lägga till .bodywebsite-prefixet överallt.
+LinkAndScriptsHereAreNotLoadedInEditor=Varning: Det här innehållet matas bara ut när webbplatsen nås från en server. Det används inte i redigeringsläge, så om du behöver ladda javascriptfiler också i redigeringsläge, lägg bara till din tagg 'script src = ...' på sidan.
+Dynamiccontent=Exempel på en sida med dynamiskt innehåll
 ImportSite=Importera webbsidans mall
-EditInLineOnOff=Mode 'Edit inline' is %s
-ShowSubContainersOnOff=Mode to execute 'dynamic content' is %s
-GlobalCSSorJS=Global CSS/JS/Header file of web site
-BackToHomePage=Back to home page...
-TranslationLinks=Translation links
-YouTryToAccessToAFileThatIsNotAWebsitePage=You try to access to a page that is not available.<br>(ref=%s, type=%s, status=%s)
-UseTextBetween5And70Chars=For good SEO practices, use a text between 5 and 70 characters
-MainLanguage=Main language
-OtherLanguages=Other languages
-UseManifest=Provide a manifest.json file
-PublicAuthorAlias=Public author alias
-AvailableLanguagesAreDefinedIntoWebsiteProperties=Available languages are defined into website properties
-ReplacementDoneInXPages=Replacement done in %s pages or containers
+EditInLineOnOff=Läget 'Redigera inline' är %s
+ShowSubContainersOnOff=Läge för att utföra "dynamiskt innehåll" är %s
+GlobalCSSorJS=Global CSS / JS / rubrikfil på webbplatsen
+BackToHomePage=Tillbaka till startsidan...
+TranslationLinks=Översättningslänkar
+YouTryToAccessToAFileThatIsNotAWebsitePage=Du försöker komma åt en sida som inte är tillgänglig. <br> (ref = %s, typ = %s, status = %s)
+UseTextBetween5And70Chars=För en bra SEO-praxis, använd en text mellan 5 och 70 tecken
+MainLanguage=Modersmål
+OtherLanguages=Andra språk
+UseManifest=Ange en manifest.json-fil
+PublicAuthorAlias=Offentligt alias författare
+AvailableLanguagesAreDefinedIntoWebsiteProperties=Tillgängliga språk definieras i webbplatsegenskaper
+ReplacementDoneInXPages=Byte sker på %s sidor eller behållare
 RSSFeed=RSS-flöde
-RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL
-PagesRegenerated=%s page(s)/container(s) regenerated
-RegenerateWebsiteContent=Regenerate web site cache files
-AllowedInFrames=Allowed in Frames
-DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
-GenerateSitemaps=Generate website sitemap file
-ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
-ConfirmSitemapsCreation=Confirm sitemap generation
-SitemapGenerated=Sitemap file <b>%s</b> generated
+RSSFeedDesc=Du kan få ett RSS-flöde av de senaste artiklarna med typen 'blogpost' med hjälp av denna URL
+PagesRegenerated=%s sida (er) / behållare / regenererade
+RegenerateWebsiteContent=Återskapa cachefiler på webbplatsen
+AllowedInFrames=Tillåtet i ramar
+DefineListOfAltLanguagesInWebsiteProperties=Definiera lista över alla tillgängliga språk i webbplatsegenskaper.
+GenerateSitemaps=Skapa webbplatskarta för webbplats
+ConfirmGenerateSitemaps=Om du bekräftar raderar du den befintliga webbplatskartfilen ...
+ConfirmSitemapsCreation=Bekräfta generering av webbplatskarta
+SitemapGenerated=Sitemap-fil <b> %s </b> genererad
 ImportFavicon=Favicon
-ErrorFaviconType=Favicon must be png
-ErrorFaviconSize=Favicon must be sized 16x16, 32x32 or 64x64
-FaviconTooltip=Upload an image which needs to be a png (16x16, 32x32 or 64x64)
+ErrorFaviconType=Favicon måste vara png
+ErrorFaviconSize=Favicon måste vara 16x16, 32x32 eller 64x64
+FaviconTooltip=Ladda upp en bild som måste vara en png (16x16, 32x32 eller 64x64)
diff --git a/htdocs/langs/sv_SE/withdrawals.lang b/htdocs/langs/sv_SE/withdrawals.lang
index e1aa6c99928..d4689c1eed7 100644
--- a/htdocs/langs/sv_SE/withdrawals.lang
+++ b/htdocs/langs/sv_SE/withdrawals.lang
@@ -1,50 +1,51 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=Payments by Direct debit orders
-SuppliersStandingOrdersArea=Payments by Credit transfer
+CustomersStandingOrdersArea=Betalningar med direct debit
+SuppliersStandingOrdersArea=Betalningar med kreditöverföring
 StandingOrdersPayment=Direktbetalningsorder
 StandingOrderPayment=Direktbetalningsorder
 NewStandingOrder=Ny direktdebitering
-NewPaymentByBankTransfer=New payment by credit transfer
+NewPaymentByBankTransfer=Ny betalning med kreditöverföring
 StandingOrderToProcess=För att kunna behandla
-PaymentByBankTransferReceipts=Credit transfer orders
-PaymentByBankTransferLines=Credit transfer order lines
+PaymentByBankTransferReceipts=Kreditöverföringsorder
+PaymentByBankTransferLines=Kreditöverföringsorderrader
 WithdrawalsReceipts=Direkt debiteringsorder
 WithdrawalReceipt=Direkt debitering
-BankTransferReceipts=Credit transfer orders
-BankTransferReceipt=Credit transfer order
-LatestBankTransferReceipts=Latest %s credit transfer orders
+BankTransferReceipts=Kreditöverföringsorder
+BankTransferReceipt=Kreditöverföringsorder
+LatestBankTransferReceipts=Senaste %s kreditöverföringsorder
 LastWithdrawalReceipts=Senaste %s direkt debit-filer
-WithdrawalsLine=Direct debit order line
-CreditTransferLine=Credit transfer line
+WithdrawalsLine=Direkt debiteringsorder
+CreditTransferLine=Kreditöverföringslinje
 WithdrawalsLines=Direktbetalningsorder
-CreditTransferLines=Credit transfer lines
-RequestStandingOrderToTreat=Requests for direct debit payment order to process
-RequestStandingOrderTreated=Requests for direct debit payment order processed
-RequestPaymentsByBankTransferToTreat=Requests for credit transfer to process
-RequestPaymentsByBankTransferTreated=Requests for credit transfer processed
+CreditTransferLines=Kreditöverföringslinjer
+RequestStandingOrderToTreat=Begäran om att betalningsorder för autogiro ska bearbetas
+RequestStandingOrderTreated=Förfrågningar om betalningsorder för direktdebitering har bearbetats
+RequestPaymentsByBankTransferToTreat=Begäran om kreditöverföring för behandling
+RequestPaymentsByBankTransferTreated=Förfrågningar om kreditöverföring behandlas
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Ännu inte möjligt. Uttag status måste vara inställd på "kredit" innan den förklarar förkastar på specifika linjer.
-NbOfInvoiceToWithdraw=No. of qualified customer invoices with waiting direct debit order
+NbOfInvoiceToWithdraw=Antal kvalificerade kundfakturor med väntande direktdebiteringsorder
 NbOfInvoiceToWithdrawWithInfo=Antal kundfaktura med order för direktbetalning med definierad bankkontoinformation
-NbOfInvoiceToPayByBankTransfer=No. of qualified supplier invoices waiting for a payment by credit transfer
-SupplierInvoiceWaitingWithdraw=Vendor invoice waiting for payment by credit transfer
+NbOfInvoiceToPayByBankTransfer=Antal kvalificerade leverantörsfakturor som väntar på en betalning via kreditöverföring
+SupplierInvoiceWaitingWithdraw=Leverantörsfaktura som väntar på betalning med kreditöverföring
 InvoiceWaitingWithdraw=Faktura som väntar på direktdebitering
-InvoiceWaitingPaymentByBankTransfer=Invoice waiting for credit transfer
+InvoiceWaitingPaymentByBankTransfer=Fakturan väntar på kreditöverföring
 AmountToWithdraw=Belopp att dra tillbaka
-NoInvoiceToWithdraw=No invoice open for '%s' is waiting. Go on tab '%s' on invoice card to make a request.
-NoSupplierInvoiceToWithdraw=No supplier invoice with open 'Direct credit requests' is waiting. Go on tab '%s' on invoice card to make a request.
+NoInvoiceToWithdraw=Ingen faktura öppen för '%s' väntar. Gå till fliken '%s' på fakturakortet för att göra en begäran.
+NoSupplierInvoiceToWithdraw=Ingen leverantörsfaktura med öppna 'Direkt kreditförfrågningar' väntar. Gå till fliken '%s' på fakturakortet för att göra en begäran.
 ResponsibleUser=Användaransvarig
 WithdrawalsSetup=Inställning för direktbetalning
-CreditTransferSetup=Credit transfer setup
+CreditTransferSetup=Inställning av kreditöverföring
 WithdrawStatistics=Direktbetalningsstatistik
-CreditTransferStatistics=Credit transfer statistics
+CreditTransferStatistics=Statistik för kreditöverföring
 Rejects=Rejects
 LastWithdrawalReceipt=Senaste %s direktavköpsintäkterna
 MakeWithdrawRequest=Gör en förskottsbetalningsförfrågan
-MakeBankTransferOrder=Make a credit transfer request
+MakeBankTransferOrder=Gör en kreditöverföringsbegäran
 WithdrawRequestsDone=%s begärda betalningsförfrågningar
-BankTransferRequestsDone=%s credit transfer requests recorded
+BankTransferRequestsDone=%s kreditöverföringsförfrågningar registrerade
 ThirdPartyBankCode=Tredjeparts bankkod
 NoInvoiceCouldBeWithdrawed=Ingen faktura debiteras framgångsrikt. Kontrollera att fakturor är på företag med en giltig IBAN och att IBAN har en UMR (Unique Mandate Reference) med läget <strong> %s </strong>.
+WithdrawalCantBeCreditedTwice=Detta uttagskvitto är redan markerat som krediterat. detta kan inte göras två gånger, eftersom detta potentiellt skulle kunna skapa dubbla betalningar och bankposter.
 ClassCredited=Märk krediterad
 ClassCreditedConfirm=Är du säker på att du vill märka detta tillbakadragande mottagande som krediteras på ditt bankkonto?
 TransData=Datum Transmission
@@ -54,7 +55,7 @@ Lines=Linjer
 StandingOrderReject=Utfärda ett förkasta
 WithdrawsRefused=Direkt debitering vägrade
 WithdrawalRefused=Uttag Refuseds
-CreditTransfersRefused=Credit transfers refused
+CreditTransfersRefused=Kreditöverföringar nekades
 WithdrawalRefusedConfirm=Är du säker på att du vill ange ett tillbakadragande avslag för samhället
 RefusedData=Datum för avslag
 RefusedReason=Orsak till avslag
@@ -64,7 +65,7 @@ InvoiceRefused=Faktura vägrade (Ladda avslag till kunden)
 StatusDebitCredit=Statusavgift / kredit
 StatusWaiting=Väntar
 StatusTrans=Överförs
-StatusDebited=Debited
+StatusDebited=Debiterad
 StatusCredited=Krediteras
 StatusPaid=Betald
 StatusRefused=Refused
@@ -80,36 +81,36 @@ StatusMotif8=Annan orsak
 CreateForSepaFRST=Skapa direkt debitfil (SEPA FRST)
 CreateForSepaRCUR=Skapa direkt debitfil (SEPA RCUR)
 CreateAll=Skapa direkt debitfil (alla)
-CreateFileForPaymentByBankTransfer=Create file for credit transfer
-CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
+CreateFileForPaymentByBankTransfer=Skapa fil för kreditöverföring
+CreateSepaFileForPaymentByBankTransfer=Skapa kreditöverföringsfil (SEPA)
 CreateGuichet=Endast kontor
 CreateBanque=Endast bank
 OrderWaiting=Plats för en ny behandling
-NotifyTransmision=Record file transmission of order
-NotifyCredit=Record credit of order
+NotifyTransmision=Spela in filöverföring av order
+NotifyCredit=Registrera beställningskredit
 NumeroNationalEmetter=Nationella sändare Antal
 WithBankUsingRIB=För bankkonton med hjälp av RIB
 WithBankUsingBANBIC=För bankkonton som använder IBAN / BIC / SWIFT
 BankToReceiveWithdraw=Mottagande bankkonto
-BankToPayCreditTransfer=Bank Account used as source of payments
+BankToPayCreditTransfer=Bankkonto som används som betalningskälla
 CreditDate=Krediter på
 WithdrawalFileNotCapable=Det går inte att skapa uttags kvitto fil för ditt land %s (ditt land stöds inte)
-ShowWithdraw=Show Direct Debit Order
-IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Payment by direct debit to generate and manage the direct debit order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Payment by credit transfer to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-WithdrawalFile=Debit order file
-CreditTransferFile=Credit transfer file
+ShowWithdraw=Visa beställning av direktdebitering
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Om fakturan har minst en betalningsorder för direktdebitering som ännu inte har behandlats kommer den inte att ställas in som betald för att möjliggöra tidigare uttagshantering.
+DoStandingOrdersBeforePayments=På den här fliken kan du begära en betalningsorder för direktdebitering. När du är klar går du in i menyn Bank-> Betalning med autogiro för att generera och hantera autogiro. När direktdebiteringen stängs registreras fakturering automatiskt och fakturor stängs om återstående betalning är noll.
+DoCreditTransferBeforePayments=På den här fliken kan du begära en kreditöverföringsorder. När du är klar går du till menyn Bank-> Betalning med kreditöverföring för att generera och hantera kreditöverföringsordern. När kreditöverföringsordern stängs registreras betalning på fakturor automatiskt och fakturor stängs om återstående betalning är noll.
+WithdrawalFile=Debiteringsfil
+CreditTransferFile=Kreditöverföringsfil
 SetToStatusSent=Ställ in på status "File Skickat"
-ThisWillAlsoAddPaymentOnInvoice=This will also record payments on invoices and will classify them as "Paid" if remain to pay is null
+ThisWillAlsoAddPaymentOnInvoice=Detta registrerar också betalningar på fakturor och klassificerar dem som "Betalda" om återstående betalning är noll
 StatisticsByLineStatus=Statistik efter status linjer
 RUM=UMR
-DateRUM=Mandate signature date
+DateRUM=Mandat underskrift datum
 RUMLong=Unik Mandatreferens
 RUMWillBeGenerated=Om tomt kommer en UMR (Unique Mandate Reference) att genereras när bankkontoinformationen är sparad.
 WithdrawMode=Direkt debiteringsläge (FRST eller RECUR)
 WithdrawRequestAmount=Belopp för direkt debitering:
-BankTransferAmount=Amount of Credit Transfer request:
+BankTransferAmount=Belopp på kreditöverföringsbegäran:
 WithdrawRequestErrorNilAmount=Det gick inte att skapa en direkt debitering för tom belopp.
 SepaMandate=SEPA-direkt debiteringsmandat
 SepaMandateShort=SEPA-mandat
@@ -125,19 +126,19 @@ SEPAFrstOrRecur=Typ av betalning
 ModeRECUR=Återkommande betalning
 ModeFRST=Engångsbetalning
 PleaseCheckOne=Vänligen kolla en enda
-CreditTransferOrderCreated=Credit transfer order %s created
+CreditTransferOrderCreated=Kreditöverföringsorder %s skapades
 DirectDebitOrderCreated=Direkt debitering %s skapad
 AmountRequested=Belopp som begärs
 SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Exekveringsdatum
 CreateForSepa=Skapa direkt debitfil
-ICS=Creditor Identifier CI for direct debit
-ICSTransfer=Creditor Identifier CI for bank transfer
+ICS=Creditor Identifier CI för direktdebitering
+ICSTransfer=Creditor Identifier CI för banköverföring
 END_TO_END="EndToEndId" SEPA XML-tagg - Unikt ID tilldelat per transaktion
 USTRD="Ostrukturerad" SEPA XML-tagg
 ADDDAYS=Lägg till dagar till Exekveringsdatum
-NoDefaultIBANFound=No default IBAN found for this third party
+NoDefaultIBANFound=Ingen standard-IBAN hittades för denna tredje part
 ### Notifications
 InfoCreditSubject=Betalning av direktbetalningsorder %s av banken
 InfoCreditMessage=Betalningsordern %s har betalats av banken <br> Betalningsuppgifter: %s
@@ -147,6 +148,6 @@ InfoTransData=Belopp: %s <br> Metode: %s <br> Datum: %s
 InfoRejectSubject=Betalningsordern vägrade
 InfoRejectMessage=Hej, <br> <br> Betalningsordern för fakturan %s relaterad till företaget %s, med ett belopp på %s, har vägrats av banken. <br> <br> - <br> %s
 ModeWarning=Alternativ på riktigt läget inte var satt, sluta vi efter denna simulering
-ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
-ErrorICSmissing=Missing ICS in Bank account %s
+ErrorCompanyHasDuplicateDefaultBAN=Företag med id %s har mer än ett standardbankkonto. Inget sätt att veta vilken man ska använda.
+ErrorICSmissing=Saknar ICS på bankkonto %s
 TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Total amount of direct debit order differs from sum of lines
diff --git a/htdocs/langs/sv_SE/workflow.lang b/htdocs/langs/sv_SE/workflow.lang
index 55f87b7d0d3..579f062cccb 100644
--- a/htdocs/langs/sv_SE/workflow.lang
+++ b/htdocs/langs/sv_SE/workflow.lang
@@ -16,10 +16,10 @@ descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Märk länkad källsäljningsorder
 # Autoclassify purchase order
 descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Märk länkad källleverantörsförslag som fakturerat när leverantörsfaktura är bekräftat (och om fakturans storlek är densamma som det totala beloppet för det länkade förslaget)
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Märk kopplad inköpsorder som fakturerad när leverantörsfaktura är bekräftat (och om fakturans storlek är densamma som totalbeloppet för den länkade ordern)
-descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+descWORKFLOW_BILL_ON_RECEPTION=Klassificera mottagningar till "fakturerade" när en länkad leverantörsorder är validerad
 # Autoclose intervention
-descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Stäng alla ingripanden kopplade till biljetten när en biljett är stängd
 AutomaticCreation=Automatisk skapande
 AutomaticClassification=Automatisk uppmärkning
 # Autoclassify shipment
-descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when customer invoice is validated
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Klassificera länkad källtransport som stängd när kundfakturan valideras
diff --git a/htdocs/langs/sv_SE/zapier.lang b/htdocs/langs/sv_SE/zapier.lang
index b4cc4ccba4a..b85cdb8bd32 100644
--- a/htdocs/langs/sv_SE/zapier.lang
+++ b/htdocs/langs/sv_SE/zapier.lang
@@ -13,9 +13,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-ModuleZapierForDolibarrName = Zapier for Dolibarr
-ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
-ZapierForDolibarrSetup=Setup of Zapier for Dolibarr
-ZapierDescription=Interface with Zapier
-ZapierAbout=About the module Zapier
-ZapierSetupPage=There is no need for a setup on Dolibarr side to use Zapier. However, you must generate and publish a package on zapier to be able to use Zapier with Dolibarr. See documentation on <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">this wiki page</a>.
+ModuleZapierForDolibarrName = Zapier för Dolibarr
+ModuleZapierForDolibarrDesc = Zapier för Dolibarr-modul
+ZapierForDolibarrSetup=Installation av Zapier för Dolibarr
+ZapierDescription=Gränssnitt med Zapier
+ZapierAbout=Om modulen Zapier
+ZapierSetupPage=Det finns inget behov av en installation på Dolibarr-sidan för att använda Zapier. Du måste dock skapa och publicera ett paket på zapier för att kunna använda Zapier med Dolibarr. Se dokumentation på <a href="https://wiki.dolibarr.org/index.php/Module_Zapier"> denna wiki-sida </a>.
diff --git a/htdocs/langs/sw_SW/accountancy.lang b/htdocs/langs/sw_SW/accountancy.lang
index 354cddb62c2..27be673dd9c 100644
--- a/htdocs/langs/sw_SW/accountancy.lang
+++ b/htdocs/langs/sw_SW/accountancy.lang
@@ -158,7 +158,7 @@ ACCOUNTING_LENGTH_AACCOUNT=Length of the third-party accounting accounts (If you
 ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of an accounting account. Needed by some countries (like Switzerland). If set to off (default), you can set the following two parameters to ask the application to add virtual zeros.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties, break ability to search on a part of value)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
@@ -328,6 +328,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountanc
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
+NotifiedExportDate=Notified export date (modification of the entries will not be possible)
+NotifiedValidationDate=Validation of the entries (modification or deletion of the entries will not be possible)
+ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=Export draft journal
 Modelcsv=Model of export
 Selectmodelcsv=Select a model of export
diff --git a/htdocs/langs/sw_SW/admin.lang b/htdocs/langs/sw_SW/admin.lang
index fb4513a09b4..be9aca94599 100644
--- a/htdocs/langs/sw_SW/admin.lang
+++ b/htdocs/langs/sw_SW/admin.lang
@@ -221,8 +221,8 @@ NotCompatible=This module does not seem compatible with your Dolibarr %s (Min %s
 CompatibleAfterUpdate=This module requires an update to your Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=See in Market place
 SeeSetupOfModule=See setup of module %s
+SetOptionTo=Set option <b>%s</b> to %s
 Updated=Updated
-Nouveauté=Novelty
 AchatTelechargement=Buy / Download
 GoModuleSetupArea=To deploy/install a new module, go to the Module setup area: <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
@@ -399,6 +399,7 @@ SecurityToken=Key to secure URLs
 NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
 PDF=PDF
 PDFDesc=Global options for PDF generation
+PDFOtherDesc=PDF Option specific to some modules
 PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
 PDFRulesForSalesTax=Rules for Sales Tax / VAT
@@ -561,7 +562,7 @@ Module53Desc=Management of Services
 Module54Name=Contracts/Subscriptions
 Module54Desc=Management of contracts (services or recurring subscriptions)
 Module55Name=Barcodes
-Module55Desc=Barcode management
+Module55Desc=Barcode or QR code management
 Module56Name=Payment by credit transfer
 Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
 Module57Name=Payments by Direct Debit
@@ -848,10 +849,10 @@ Permission402=Create/modify discounts
 Permission403=Validate discounts
 Permission404=Delete discounts
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries (yours and subordinates)
-Permission512=Create/modify payments of salaries
-Permission514=Delete payments of salaries
-Permission517=Read payments of salaries of everybody
+Permission511=Read salaries and payments (yours and subordinates)
+Permission512=Create/modify salaries and payments
+Permission514=Delete salaries and payments
+Permission517=Read salaries and payments everybody
 Permission519=Export salaries
 Permission520=Read Loans
 Permission522=Create/modify loans
@@ -965,6 +966,8 @@ Permission23003=Delete Scheduled job
 Permission23004=Execute Scheduled job
 Permission50101=Use Point of Sale (SimplePOS)
 Permission50151=Use Point of Sale (TakePOS)
+Permission50152=Edit sales lines
+Permission50153=Edit ordered sales lines
 Permission50201=Read transactions
 Permission50202=Import transactions
 Permission50330=Read objects of Zapier
@@ -1039,11 +1042,12 @@ DictionaryMeasuringUnits=Measuring Units
 DictionarySocialNetworks=Social Networks
 DictionaryProspectStatus=Prospect status for companies
 DictionaryProspectContactStatus=Prospect status for contacts
-DictionaryHolidayTypes=Types of leave
+DictionaryHolidayTypes=Leave - Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
 DictionaryTransportMode=Intracomm report - Transport mode
+DictionaryBatchStatus=Product lot/serial Quality Control status
 TypeOfUnit=Type of unit
 SetupSaved=Setup saved
 SetupNotSaved=Setup not saved
@@ -1187,7 +1191,7 @@ SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of m
 SetupDescription5=Other Setup menu entries manage optional parameters.
 AuditedSecurityEvents=Security events that are audited
 NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
-Audit=Audit
+Audit=Security events
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
 InfoOS=About OS
@@ -1319,9 +1323,12 @@ ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
 NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
+ComboListOptim=Combo list loading optimization
 SearchOptim=Search optimization
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
-YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
+YouHaveXObjectUseComboOptim=You have %s %s in the database. You can go into setup of module to enable loading of combo list on key pressed event.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other.
+YouHaveXObjectUseSearchOptimDesc=This limits the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to %s in Home-Setup-Other.
 BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
 BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
 PHPModuleLoaded=PHP component %s is loaded
@@ -1433,6 +1440,7 @@ MemberMainOptions=Main options
 AdherentLoginRequired= Manage a Login for each member
 AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
+MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
 MembersDocModules=Document templates for documents generated from member record
@@ -1763,7 +1771,7 @@ AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting men
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
-AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the scheduled job %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
@@ -1979,6 +1987,8 @@ 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_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add picture on proposal line
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add electronic sign in PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
@@ -2096,7 +2106,6 @@ PDF_SHOW_PROJECT=Show project on document
 ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
-FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
@@ -2120,12 +2129,18 @@ ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by
 MailToSendEventOrganization=Event Organization
 AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
 YouShouldDisablePHPFunctions=You should disable PHP functions
-IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands in custom code, you shoud disable PHP functions
+PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
+NotRecommended=Not recommanded
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
 ModuleUpdateAvailable=An update is available
 NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
+RandomlySelectedIfSeveral=Randomly selected if several pictures are available
+DatabasePasswordObfuscated=Database password is obfuscated in conf file
+DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
diff --git a/htdocs/langs/sw_SW/agenda.lang b/htdocs/langs/sw_SW/agenda.lang
index 09d82139a49..a1183841b00 100644
--- a/htdocs/langs/sw_SW/agenda.lang
+++ b/htdocs/langs/sw_SW/agenda.lang
@@ -4,7 +4,7 @@ Actions=Events
 Agenda=Agenda
 TMenuAgenda=Agenda
 Agendas=Agendas
-LocalAgenda=Internal calendar
+LocalAgenda=Default calendar
 ActionsOwnedBy=Event owned by
 ActionsOwnedByShort=Owner
 AffectedTo=Assigned to
@@ -14,13 +14,13 @@ EventsNb=Number of events
 ListOfActions=List of events
 EventReports=Event reports
 Location=Location
-ToUserOfGroup=Event assigned to any user in group
+ToUserOfGroup=Event assigned to any user in the group
 EventOnFullDay=Event on all day(s)
 MenuToDoActions=All incomplete events
 MenuDoneActions=All terminated events
 MenuToDoMyActions=My incomplete events
 MenuDoneMyActions=My terminated events
-ListOfEvents=List of events (internal calendar)
+ListOfEvents=List of events (default calendar)
 ActionsAskedBy=Events reported by
 ActionsToDoBy=Events assigned to
 ActionsDoneBy=Events done by
@@ -38,6 +38,7 @@ ActionsEvents=Events for which Dolibarr will create an action in agenda automati
 EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Third party %s created
+COMPANY_MODIFYInDolibarr=Third party %s modified
 COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=Contract %s validated
 CONTRACT_DELETEInDolibarr=Contract %s deleted
@@ -87,6 +88,7 @@ OrderDeleted=Order deleted
 InvoiceDeleted=Invoice deleted
 DraftInvoiceDeleted=Draft invoice deleted
 CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_MODIFYInDolibarr=Contact %s modified
 CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Product %s created
 PRODUCT_MODIFYInDolibarr=Product %s modified
@@ -119,6 +121,7 @@ MRP_MO_UNVALIDATEInDolibarr=MO set to draft status
 MRP_MO_PRODUCEDInDolibarr=MO produced
 MRP_MO_DELETEInDolibarr=MO deleted
 MRP_MO_CANCELInDolibarr=MO canceled
+PAIDInDolibarr=%s paid
 ##### End agenda events #####
 AgendaModelModule=Document templates for event
 DateActionStart=Start date
@@ -130,7 +133,7 @@ AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to use
 AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
 AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic events.
 AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> to include events of holidays.
-AgendaShowBirthdayEvents=Show birthdays of contacts
+AgendaShowBirthdayEvents=Birthdays of contacts
 AgendaHideBirthdayEvents=Hide birthdays of contacts
 Busy=Busy
 ExportDataset_event1=List of agenda events
@@ -152,6 +155,7 @@ ActionType=Event type
 DateActionBegin=Start event date
 ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b>?
 RepeatEvent=Repeat event
+OnceOnly=Once only
 EveryWeek=Every week
 EveryMonth=Every month
 DayOfMonth=Day of month
@@ -165,4 +169,4 @@ TimeType=Duration type
 ReminderType=Callback type
 AddReminder=Create an automatic reminder notification for this event
 ErrorReminderActionCommCreation=Error creating the reminder notification for this event
-BrowserPush=Browser Notification
+BrowserPush=Browser Popup Notification
diff --git a/htdocs/langs/sw_SW/bills.lang b/htdocs/langs/sw_SW/bills.lang
index c55f483873b..7b8c997d2e6 100644
--- a/htdocs/langs/sw_SW/bills.lang
+++ b/htdocs/langs/sw_SW/bills.lang
@@ -259,6 +259,7 @@ DateMaxPayment=Payment due on
 DateInvoice=Invoice date
 DatePointOfTax=Point of tax
 NoInvoice=No invoice
+NoOpenInvoice=No open invoice
 ClassifyBill=Classify invoice
 SupplierBillsToPay=Unpaid vendor invoices
 CustomerBillsUnpaid=Unpaid customer invoices
@@ -589,3 +590,4 @@ FacParentLine=Invoice Line Parent
 SituationTotalRayToRest=Remainder to pay without taxe
 PDFSituationTitle=Situation n° %d
 SituationTotalProgress=Total progress %d %%
+SearchUnpaidInvoicesWithDueDate=Search unpaid invoices with a due date = %s
diff --git a/htdocs/langs/sw_SW/cashdesk.lang b/htdocs/langs/sw_SW/cashdesk.lang
index 240503842f3..aea1f02f834 100644
--- a/htdocs/langs/sw_SW/cashdesk.lang
+++ b/htdocs/langs/sw_SW/cashdesk.lang
@@ -102,7 +102,7 @@ CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal numb
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
 SaleStartedAt=Sale started at %s
-ControlCashOpening=Control cash popup at opening POS
+ControlCashOpening=Open the "Control cash" popup when opening the POS
 CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -126,5 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
-ShowPriceHT = Display the price excluding tax column
-ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
+ShowPriceHT = Display the column with the price excluding tax (on screen)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
diff --git a/htdocs/langs/sw_SW/compta.lang b/htdocs/langs/sw_SW/compta.lang
index 7cae82e6ac7..8329346c163 100644
--- a/htdocs/langs/sw_SW/compta.lang
+++ b/htdocs/langs/sw_SW/compta.lang
@@ -286,3 +286,9 @@ ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
 IncludeLoansInResults = Include loans in reports
+InvoiceLate30Days = Invoices late > 30 days
+InvoiceLate15Days = Invoices late > 15 days
+InvoiceLateMinus15Days = Invoices late
+InvoiceNotLate = To be collected < 15 days
+InvoiceNotLate15Days = To be collected in 15 days
+InvoiceNotLate30Days = To be collected in 30 days
diff --git a/htdocs/langs/sw_SW/cron.lang b/htdocs/langs/sw_SW/cron.lang
index 2ebdda1e685..4fd2220dea6 100644
--- a/htdocs/langs/sw_SW/cron.lang
+++ b/htdocs/langs/sw_SW/cron.lang
@@ -60,7 +60,7 @@ CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
 CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Disable
-CronTaskInactive=This job is disabled
+CronTaskInactive=This job is disabled (not scheduled)
 CronId=Id
 CronClassFile=Filename with class
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example 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>
diff --git a/htdocs/langs/sw_SW/errors.lang b/htdocs/langs/sw_SW/errors.lang
index 9b14b5ad1d2..670f8c7a6bc 100644
--- a/htdocs/langs/sw_SW/errors.lang
+++ b/htdocs/langs/sw_SW/errors.lang
@@ -11,6 +11,7 @@ ErrorBadValueForParamNotAString=Bad value for your parameter. It appends general
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s already exists.
 ErrorGroupAlreadyExists=Group %s already exists.
+ErrorEmailAlreadyExists=Email %s already exists.
 ErrorRecordNotFound=Record not found.
 ErrorFailToCopyFile=Failed to copy file '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
@@ -117,7 +118,7 @@ ErrorCantReadFile=Failed to read file '%s'
 ErrorCantReadDir=Failed to read directory '%s'
 ErrorBadLoginPassword=Bad value for login or password
 ErrorLoginDisabled=Your account has been disabled
-ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server. If PHP <b>Safe Mode</b> is enabled, check that command is inside a directory defined by parameter <b>safe_mode_exec_dir</b>.
+ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server user. Check also the command is not protected on shell level by a security layer like apparmor.
 ErrorFailedToChangePassword=Failed to change password
 ErrorLoginDoesNotExists=User with login <b>%s</b> could not be found.
 ErrorLoginHasNoEmail=This user has no email address. Process aborted.
@@ -262,6 +263,7 @@ ErrorDateIsInFuture=Error, the date can't be in the future
 ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
 ErrorAPercentIsRequired=Error, please fill in the percentage correctly
 ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
+ErrorFailedToFindEmailTemplate=Failed to find template with code name %s
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -298,3 +300,4 @@ WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So y
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
+ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
diff --git a/htdocs/langs/sw_SW/eventorganization.lang b/htdocs/langs/sw_SW/eventorganization.lang
index 75b798fbc3a..335c257b224 100644
--- a/htdocs/langs/sw_SW/eventorganization.lang
+++ b/htdocs/langs/sw_SW/eventorganization.lang
@@ -1,4 +1,5 @@
 # Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+# Copyright (C) 2021		Dorian Vabre			<dorian.vabre@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
@@ -81,7 +82,10 @@ PriceOfBoothHelp=Subscription price to stand a booth
 EventOrganizationICSLink=Link ICS for events
 ConferenceOrBoothInformation=Conference Or Booth informations
 Attendees = Attendees
+DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
 #
 # Status
 #
@@ -94,8 +98,46 @@ EvntOrgCancelled = Cancelled
 #
 # Public page
 #
+SuggestForm = Suggestion page
+RegisterPage = Page for conferences or booth
+EvntOrgRegistrationHelpMessage = Here, you can vote for an event, or suggest a new conference or booth for the project
+EvntOrgRegistrationConfHelpMessage = Here, you can suggest a new conference for the project
+EvntOrgRegistrationBoothHelpMessage = Here, you can suggest a new booth for the project
+ListOfSuggestedConferences = List of suggested conferences
+ListOfSuggestedBooths = List of suggested booths
+SuggestConference = Suggest a new conference
+SuggestBooth = Suggest a booth
+ViewAndVote = View and vote for suggested events
 PublicAttendeeSubscriptionPage = Public link of registration to a conference
 MissingOrBadSecureKey = The security key is invalid or missing
-EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
-EvntOrgStartDuration = This conference starts on
-EvntOrgEndDuration =  and ends on
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference : '%s'
+EvntOrgDuration = This conference starts on %s and ends on %s.
+ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
+BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
+EventType = Event type
+
+#
+# Vote page
+#
+EvntOrgRegistrationWelcomeMessage = Welcome on the conference or booth suggestion page.
+EvntOrgRegistrationConfWelcomeMessage = Welcome on the conference suggestion page.
+EvntOrgRegistrationBoothWelcomeMessage = Welcome on the booth suggestion page.
+EvntOrgVoteHelpMessage = Here, you can view and vote for the suggested events for the project
+VoteOk = Your vote has been accepted.
+AlreadyVoted = You have already voted for this event.
+VoteError = An error has occurred during the vote, please try again.
+
+#
+# SubscriptionOk page
+#
+SubscriptionOk = Your subscription to this conference has been validated
+#
+# Subscription validation mail
+#
+ConfAttendeeSubscriptionConfirmation = Confirmation of your subscription to a conference
+#
+# Payment page
+#
+Attendee = Attendee
+PaymentConferenceAttendee = Conference attendee payment
+PaymentBoothLocation = Booth location payment
diff --git a/htdocs/langs/sw_SW/hrm.lang b/htdocs/langs/sw_SW/hrm.lang
index 3b8f137e103..da098e10bdb 100644
--- a/htdocs/langs/sw_SW/hrm.lang
+++ b/htdocs/langs/sw_SW/hrm.lang
@@ -9,7 +9,7 @@ ConfirmDeleteEstablishment=Are you sure you wish to delete this establishment?
 OpenEtablishment=Open establishment
 CloseEtablishment=Close establishment
 # Dictionary
-DictionaryPublicHolidays=HRM - Public holidays
+DictionaryPublicHolidays=Leave - Public holidays
 DictionaryDepartment=HRM - Department list
 DictionaryFunction=HRM - Job positions
 # Module
diff --git a/htdocs/langs/sw_SW/knowledgemanagement.lang b/htdocs/langs/sw_SW/knowledgemanagement.lang
index 269007e60f8..68f5cced76c 100644
--- a/htdocs/langs/sw_SW/knowledgemanagement.lang
+++ b/htdocs/langs/sw_SW/knowledgemanagement.lang
@@ -47,7 +47,7 @@ KnowledgeManagementArea = Knowledge Management
 # Menu
 #
 MenuKnowledgeRecord = Knowledge base
-ListOfArticles = List of articles
+ListKnowledgeRecord = List of articles
 NewKnowledgeRecord = New article
 ValidateReply = Validate solution
 KnowledgeRecords = Articles
diff --git a/htdocs/langs/sw_SW/languages.lang b/htdocs/langs/sw_SW/languages.lang
index dbecd23ad26..c1fef95bafb 100644
--- a/htdocs/langs/sw_SW/languages.lang
+++ b/htdocs/langs/sw_SW/languages.lang
@@ -3,6 +3,7 @@ Language_am_ET=Ethiopian
 Language_ar_AR=Kiarabu
 Language_ar_EG=Arabic (Egypt)
 Language_ar_SA=Kiarabu
+Language_ar_TN=Arabic (Tunisia)
 Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengali
 Language_bn_IN=Bengali (India)
@@ -84,6 +85,7 @@ Language_nl_NL=Dutch
 Language_pl_PL=Polish
 Language_pt_BR=Kireno (Brazil)
 Language_pt_PT=Kireno
+Language_ro_MD=Romanian (Moldavia)
 Language_ro_RO=Romanian
 Language_ru_RU=Urusi
 Language_ru_UA=Urusi (Ukraine)
diff --git a/htdocs/langs/sw_SW/main.lang b/htdocs/langs/sw_SW/main.lang
index 13793aad13f..863b94af564 100644
--- a/htdocs/langs/sw_SW/main.lang
+++ b/htdocs/langs/sw_SW/main.lang
@@ -430,6 +430,7 @@ LT1IN=CGST
 LT2IN=SGST
 LT1GC=Additionnal cents
 VATRate=Tax Rate
+RateOfTaxN=Rate of tax %s
 VATCode=Tax Rate code
 VATNPR=Tax Rate NPR
 DefaultTaxRate=Default tax rate
@@ -729,6 +730,7 @@ MenuMembers=Members
 MenuAgendaGoogle=Google agenda
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
+ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
 NoFileFound=No documents uploaded
 CurrentUserLanguage=Current language
 CurrentTheme=Current theme
@@ -1072,6 +1074,7 @@ ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
 ToClose=To close
+ToRefuse=To refuse
 ToProcess=To process
 ToApprove=To approve
 GlobalOpenedElemView=Global view
@@ -1126,9 +1129,11 @@ UpdateForAllLines=Update for all lines
 OnHold=On hold
 Civility=Civility
 AffectTag=Affect Tag
+CreateExternalUser=Create external user
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
 ConfirmCancel=Are you sure you want to cancel
+EmailMsgID=Email MsgID
diff --git a/htdocs/langs/sw_SW/members.lang b/htdocs/langs/sw_SW/members.lang
index 042b85598c0..d8b9c2f59f3 100644
--- a/htdocs/langs/sw_SW/members.lang
+++ b/htdocs/langs/sw_SW/members.lang
@@ -213,3 +213,5 @@ SendReminderForExpiredSubscription=Send reminder by email to members when subscr
 MembershipPaid=Membership paid for current period (until %s)
 YouMayFindYourInvoiceInThisEmail=You may find your invoice attached to this email
 XMembersClosed=%s member(s) closed
+XExternalUserCreated=%s external user(s) created
+ForceMemberNature=Force member nature (Individual or Corporation)
diff --git a/htdocs/langs/sw_SW/modulebuilder.lang b/htdocs/langs/sw_SW/modulebuilder.lang
index 9fdaa1a533a..23a098be2e5 100644
--- a/htdocs/langs/sw_SW/modulebuilder.lang
+++ b/htdocs/langs/sw_SW/modulebuilder.lang
@@ -143,3 +143,4 @@ AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
 ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
+ImportExportProfiles=Import and export profiles
diff --git a/htdocs/langs/sw_SW/mrp.lang b/htdocs/langs/sw_SW/mrp.lang
index ec999a473a4..2414a92cefb 100644
--- a/htdocs/langs/sw_SW/mrp.lang
+++ b/htdocs/langs/sw_SW/mrp.lang
@@ -8,12 +8,12 @@ MenuBOM=Bills of material
 LatestBOMModified=Latest %s Bills of materials modified
 LatestMOModified=Latest %s Manufacturing Orders modified
 Bom=Bills of Material
-BillOfMaterials=Bill of Material
+BillOfMaterials=Bill of Materials
 BOMsSetup=Setup of module BOM
 ListOfBOMs=List of bills of material - BOM
 ListOfManufacturingOrders=List of Manufacturing Orders
-NewBOM=New bill of material
-ProductBOMHelp=Product to create with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
+NewBOM=New bill of materials
+ProductBOMHelp=Product to create (or disassemble) with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
 BOMsNumberingModules=BOM numbering templates
 BOMsModelModule=BOM document templates
 MOsNumberingModules=MO numbering templates
@@ -22,7 +22,7 @@ FreeLegalTextOnBOMs=Free text on document of BOM
 WatermarkOnDraftBOMs=Watermark on draft BOM
 FreeLegalTextOnMOs=Free text on document of MO
 WatermarkOnDraftMOs=Watermark on draft MO
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials %s ?
 ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
 ManufacturingEfficiency=Manufacturing efficiency
 ConsumptionEfficiency=Consumption efficiency
@@ -30,8 +30,8 @@ ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the produc
 ValueOfMeansLossForProductProduced=Value of 0.95 means an average of 5%% of loss of produced product
 DeleteBillOfMaterials=Delete Bill Of Materials
 DeleteMo=Delete Manufacturing Order
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Materials?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Materials?
 MenuMRP=Manufacturing Orders
 NewMO=New Manufacturing Order
 QtyToProduce=Qty to produce
@@ -39,7 +39,7 @@ DateStartPlannedMo=Date start planned
 DateEndPlannedMo=Date end planned
 KeepEmptyForAsap=Empty means 'As Soon As Possible'
 EstimatedDuration=Estimated duration
-EstimatedDurationDesc=Estimated duration to manufacture this product using this BOM
+EstimatedDurationDesc=Estimated duration to manufacture (or disassemble) this product using this BOM
 ConfirmValidateBom=Are you sure you want to validate the BOM with the reference <strong>%s</strong> (you will be able to use it to build new Manufacturing Orders)
 ConfirmCloseBom=Are you sure you want to cancel this BOM (you won't be able to use it to build new Manufacturing Orders anymore) ?
 ConfirmReopenBom=Are you sure you want to re-open this BOM (you will be able to use it to build new Manufacturing Orders)
@@ -63,13 +63,14 @@ ConsumeAndProduceAll=Consume and Produce All
 Manufactured=Manufactured
 TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
 ForAQuantityOf=For a quantity to produce of %s
+ForAQuantityToConsumeOf=For a quantity to disassemble of %s
 ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
 ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
 ProductionForRef=Production of %s
 AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
 NoStockChangeOnServices=No stock change on services
 ProductQtyToConsumeByMO=Product quantity still to consume by open MO
-ProductQtyToProduceByMO=Product quentity still to produce by open MO
+ProductQtyToProduceByMO=Product quantity still to produce by open MO
 AddNewConsumeLines=Add new line to consume
 ProductsToConsume=Products to consume
 ProductsToProduce=Products to produce
@@ -83,15 +84,13 @@ Workstations=Workstations
 WorkstationsDescription=Workstations management
 WorkstationSetup = Workstations setup
 WorkstationSetupPage = Workstations setup page
-WorkstationAbout = About Workstation
-WorkstationAboutPage = Workstations about page
 WorkstationList=Workstation list
 WorkstationCreate=Add new workstation
 ConfirmEnableWorkstation=Are you sure you want to enable workstation <b>%s</b> ?
 EnableAWorkstation=Enable a workstation
 ConfirmDisableWorkstation=Are you sure you want to disable workstation <b>%s</b> ?
 DisableAWorkstation=Disable a workstation
-DeleteWorkstation=Supprimer
+DeleteWorkstation=Delete
 NbOperatorsRequired=Number of operators required
 THMOperatorEstimated=Estimated operator THM
 THMMachineEstimated=Estimated machine THM
diff --git a/htdocs/langs/sw_SW/orders.lang b/htdocs/langs/sw_SW/orders.lang
index 87d196eb22f..5dab5b99bf1 100644
--- a/htdocs/langs/sw_SW/orders.lang
+++ b/htdocs/langs/sw_SW/orders.lang
@@ -11,6 +11,7 @@ OrderDate=Order date
 OrderDateShort=Order date
 OrderToProcess=Order to process
 NewOrder=New order
+NewSupplierOrderShort=New order
 NewOrderSupplier=New Purchase Order
 ToOrder=Make order
 MakeOrder=Make order
@@ -73,6 +74,7 @@ DeleteOrder=Delete order
 CancelOrder=Cancel order
 OrderReopened= Order %s re-open
 AddOrder=Create order
+AddSupplierOrderShort=Create order
 AddPurchaseOrder=Create purchase order
 AddToDraftOrders=Add to draft order
 ShowOrder=Show order
diff --git a/htdocs/langs/sw_SW/other.lang b/htdocs/langs/sw_SW/other.lang
index 95297a98859..bb35099ab82 100644
--- a/htdocs/langs/sw_SW/other.lang
+++ b/htdocs/langs/sw_SW/other.lang
@@ -129,6 +129,7 @@ ClosedByLogin=User login who closed
 FileWasRemoved=File %s was removed
 DirWasRemoved=Directory %s was removed
 FeatureNotYetAvailable=Feature not yet available in the current version
+FeatureNotAvailableOnDevicesWithoutMouse=Feature not available on devices without mouse
 FeaturesSupported=Supported features
 Width=Width
 Height=Height
@@ -263,7 +264,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
-PrefixSession=Prefix for session ID
+SuffixSessionName=Suffix for session name
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/sw_SW/partnership.lang b/htdocs/langs/sw_SW/partnership.lang
index 09059995a8d..2fb10e8159e 100644
--- a/htdocs/langs/sw_SW/partnership.lang
+++ b/htdocs/langs/sw_SW/partnership.lang
@@ -16,41 +16,72 @@
 #
 # Generic
 #
-ModulePartnershipName = Partnership management
-PartnershipDescription = Module Partnership management
+ModulePartnershipName=Partnership management
+PartnershipDescription=Module Partnership management
 PartnershipDescriptionLong= Module Partnership management
 
+AddPartnership=Add partnership
+CancelPartnershipForExpiredMembers=Partnership: Cancel partnership of members with expired subscriptions
+PartnershipCheckBacklink=Partnership: Check referring backlink
+
 #
 # Menu
 #
-NewPartnership = New Partnership
-ListOfPartnerships = List of partnership
+NewPartnership=New Partnership
+ListOfPartnerships=List of partnership
 
 #
 # Admin page
 #
-PartnershipSetup = Partnership setup
-PartnershipAbout = About Partnership
-PartnershipAboutPage = Partnership about page
-
+PartnershipSetup=Partnership setup
+PartnershipAbout=About Partnership
+PartnershipAboutPage=Partnership about page
+partnershipforthirdpartyormember=Partner status must be set on a 'thirdparty' or a 'member'
+PARTNERSHIP_IS_MANAGED_FOR=Partnership managed for
+PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks to check
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb of days before cancelling status of a partnership when a subscription has expired
+ReferingWebsiteCheck=Check of website referring
+ReferingWebsiteCheckDesc=You can enable a feature to check that your partners has added a backlink to your website domains on their own website.
 
 #
 # Object
 #
+DeletePartnership=Delete a partnership
+PartnershipDedicatedToThisThirdParty=Partnership dedicated to this third party
+PartnershipDedicatedToThisMember=Partnership dedicated to this member
 DatePartnershipStart=Start date
 DatePartnershipEnd=End date
+ReasonDecline=Decline reason
+ReasonDeclineOrCancel=Decline reason
+PartnershipAlreadyExist=Partnership already exist
+ManagePartnership=Manage partnership
+BacklinkNotFoundOnPartnerWebsite=Backlink not found on partner website
+ConfirmClosePartnershipAsk=Are you sure you want to cancel this partnership?
+PartnershipType=Partnership type
 
 #
 # Template Mail
 #
+SendingEmailOnPartnershipWillSoonBeCanceled=Partnership will soon be canceled
+SendingEmailOnPartnershipRefused=Partnership refused
+SendingEmailOnPartnershipAccepted=Partnership accepted
+SendingEmailOnPartnershipCanceled=Partnership canceled
 
+YourPartnershipWillSoonBeCanceledTopic=Partnership will soon be canceled
+YourPartnershipRefusedTopic=Partnership refused
+YourPartnershipAcceptedTopic=Partnership accepted
+YourPartnershipCanceledTopic=Partnership canceled
+
+YourPartnershipWillSoonBeCanceledContent=We inform you that your partnership will soon be canceled (Backlink not found)
+YourPartnershipRefusedContent=We inform you that your partnership request has been refused.
+YourPartnershipAcceptedContent=We inform you that your partnership request has been accepted.
+YourPartnershipCanceledContent=We inform you that your partnership has been canceled.
 
 #
 # Status
 #
-PartnershipDraft = Draft
-PartnershipAccepted = Accepted
-PartnershipRefused = Refused
-PartnershipCanceled = Canceled
-
+PartnershipDraft=Draft
+PartnershipAccepted=Accepted
+PartnershipRefused=Refused
+PartnershipCanceled=Canceled
 PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/sw_SW/productbatch.lang b/htdocs/langs/sw_SW/productbatch.lang
index ad2db658e2e..450d0285819 100644
--- a/htdocs/langs/sw_SW/productbatch.lang
+++ b/htdocs/langs/sw_SW/productbatch.lang
@@ -1,4 +1,4 @@
-# ProductBATCH language file - en_US - ProductBATCH
+# ProductBATCH language file - Source file is en_US - ProductBATCH
 ManageLotSerial=Use lot/serial number
 ProductStatusOnBatch=Yes (lot required)
 ProductStatusOnSerial=Yes (unique serial number required)
@@ -33,3 +33,13 @@ CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+LifeTime=Life span (in days)
+EndOfLife=End of life
+ManufacturingDate=Manufacturing date
+DestructionDate=Destruction date
+FirstUseDate=First use date
+QCFrequency=Quality control frequency (in days)
+
+#Traceability - qc status
+OutOfOrder=Out of order
+InWorkingOrder=In working order
diff --git a/htdocs/langs/sw_SW/products.lang b/htdocs/langs/sw_SW/products.lang
index 0875be0dc07..9638dfe5a25 100644
--- a/htdocs/langs/sw_SW/products.lang
+++ b/htdocs/langs/sw_SW/products.lang
@@ -396,3 +396,5 @@ ActionAvailableOnVariantProductOnly=Action only available on the variant of prod
 ProductsPricePerCustomer=Product prices per customers
 ProductSupplierExtraFields=Additional Attributes (Supplier Prices)
 DeleteLinkedProduct=Delete the child product linked to the combination
+PMPValue=Weighted average price
+PMPValueShort=WAP
diff --git a/htdocs/langs/sw_SW/projects.lang b/htdocs/langs/sw_SW/projects.lang
index 79c974f6e24..6c96fadb5c1 100644
--- a/htdocs/langs/sw_SW/projects.lang
+++ b/htdocs/langs/sw_SW/projects.lang
@@ -267,9 +267,11 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=New invoice
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+OneLinePerTimeSpentLine=One line for each time spent declaration
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
 AddPersonToTask=Add also to tasks
 UsageOrganizeEvent=Usage: Event Organization
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
+SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
diff --git a/htdocs/langs/sw_SW/receptions.lang b/htdocs/langs/sw_SW/receptions.lang
index 760ff884fa0..338602e722e 100644
--- a/htdocs/langs/sw_SW/receptions.lang
+++ b/htdocs/langs/sw_SW/receptions.lang
@@ -44,4 +44,4 @@ ValidateOrderFirstBeforeReception=You must first validate the order before being
 ReceptionsNumberingModules=Numbering module for receptions
 ReceptionsReceiptModel=Document templates for receptions
 NoMorePredefinedProductToDispatch=No more predefined products to dispatch
-
+ReceptionExist=A reception exists
diff --git a/htdocs/langs/sw_SW/stocks.lang b/htdocs/langs/sw_SW/stocks.lang
index 9ec523427b1..d39791932a3 100644
--- a/htdocs/langs/sw_SW/stocks.lang
+++ b/htdocs/langs/sw_SW/stocks.lang
@@ -56,8 +56,6 @@ UnitPurchaseValue=Unit purchase price
 StockTooLow=Stock too low
 StockLowerThanLimit=Stock lower than alert limit (%s)
 EnhancedValue=Value
-PMPValue=Weighted average price
-PMPValueShort=WAP
 EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
@@ -251,7 +249,10 @@ SelectAStockMovementFileToImport=select a stock movement file to import
 InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
 LabelOfInventoryMovemement=Inventory %s
 ReOpen=Reopen
-ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock to the real qty you entered into the inventory.
 ObjectNotFound=%s not found
 MakeMovementsAndClose=Generate movements and close
 AutofillWithExpected=Fill real quantity with expected quantity
+ShowAllBatchByDefault=By default, show batch details on product "stock" tab
+CollapseBatchDetailHelp=You can set batch detail default display in stocks module configuration
+FieldCannotBeNegative=Field "%s" cannot be negative
diff --git a/htdocs/langs/sw_SW/ticket.lang b/htdocs/langs/sw_SW/ticket.lang
index df73daf4a0d..1da32a5a99e 100644
--- a/htdocs/langs/sw_SW/ticket.lang
+++ b/htdocs/langs/sw_SW/ticket.lang
@@ -304,7 +304,7 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
-BoxTicketType=Number of open tickets by type
+BoxTicketType=Distribution of open tickets by type
 BoxTicketSeverity=Number of open tickets by severity
 BoxNoTicketSeverity=No tickets opened
 BoxTicketLastXDays=Number of new tickets by days the last %s days
diff --git a/htdocs/langs/th_TH/accountancy.lang b/htdocs/langs/th_TH/accountancy.lang
index b1831be4744..99d12afed14 100644
--- a/htdocs/langs/th_TH/accountancy.lang
+++ b/htdocs/langs/th_TH/accountancy.lang
@@ -158,7 +158,7 @@ ACCOUNTING_LENGTH_AACCOUNT=Length of the third-party accounting accounts (If you
 ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of an accounting account. Needed by some countries (like Switzerland). If set to off (default), you can set the following two parameters to ask the application to add virtual zeros.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties, break ability to search on a part of value)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
@@ -328,6 +328,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountanc
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
+NotifiedExportDate=Notified export date (modification of the entries will not be possible)
+NotifiedValidationDate=Validation of the entries (modification or deletion of the entries will not be possible)
+ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=Export draft journal
 Modelcsv=รูปแบบของการส่งออก
 Selectmodelcsv=เลือกรูปแบบของการส่งออก
diff --git a/htdocs/langs/th_TH/admin.lang b/htdocs/langs/th_TH/admin.lang
index 7718a6b1db0..7ccdbdef6d6 100644
--- a/htdocs/langs/th_TH/admin.lang
+++ b/htdocs/langs/th_TH/admin.lang
@@ -221,8 +221,8 @@ NotCompatible=This module does not seem compatible with your Dolibarr %s (Min %s
 CompatibleAfterUpdate=This module requires an update to your Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=See in Market place
 SeeSetupOfModule=ดูการตั้งค่าของโมดูล% s
+SetOptionTo=Set option <b>%s</b> to %s
 Updated=Updated
-Nouveauté=Novelty
 AchatTelechargement=Buy / Download
 GoModuleSetupArea=To deploy/install a new module, go to the Module setup area: <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore สถานที่อย่างเป็นทางการสำหรับตลาด Dolibarr ERP / CRM โมดูลภายนอก
@@ -399,6 +399,7 @@ SecurityToken=กุญแจสำคัญในการรักษาคว
 NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
 PDF=รูปแบบไฟล์ PDF
 PDFDesc=Global options for PDF generation
+PDFOtherDesc=PDF Option specific to some modules
 PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
 PDFRulesForSalesTax=Rules for Sales Tax / VAT
@@ -561,7 +562,7 @@ Module53Desc=Management of Services
 Module54Name=สัญญา / สมัครสมาชิก
 Module54Desc=Management of contracts (services or recurring subscriptions)
 Module55Name=บาร์โค้ด
-Module55Desc=การจัดการบาร์โค้ด
+Module55Desc=Barcode or QR code management
 Module56Name=Payment by credit transfer
 Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
 Module57Name=Payments by Direct Debit
@@ -848,10 +849,10 @@ Permission402=สร้าง / แก้ไขส่วนลด
 Permission403=ตรวจสอบส่วนลด
 Permission404=ลบส่วนลด
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries (yours and subordinates)
-Permission512=Create/modify payments of salaries
-Permission514=Delete payments of salaries
-Permission517=Read payments of salaries of everybody
+Permission511=Read salaries and payments (yours and subordinates)
+Permission512=Create/modify salaries and payments
+Permission514=Delete salaries and payments
+Permission517=Read salaries and payments everybody
 Permission519=เงินเดือนส่งออก
 Permission520=อ่านสินเชื่อ
 Permission522=สร้าง / แก้ไขการให้กู้ยืมเงิน
@@ -965,6 +966,8 @@ Permission23003=ลบงานที่กำหนด
 Permission23004=การดำเนินงานที่กำหนด
 Permission50101=Use Point of Sale (SimplePOS)
 Permission50151=Use Point of Sale (TakePOS)
+Permission50152=Edit sales lines
+Permission50153=Edit ordered sales lines
 Permission50201=อ่านการทำธุรกรรม
 Permission50202=การทำธุรกรรมนำเข้า
 Permission50330=Read objects of Zapier
@@ -1039,11 +1042,12 @@ DictionaryMeasuringUnits=Measuring Units
 DictionarySocialNetworks=Social Networks
 DictionaryProspectStatus=Prospect status for companies
 DictionaryProspectContactStatus=Prospect status for contacts
-DictionaryHolidayTypes=Types of leave
+DictionaryHolidayTypes=Leave - Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
 DictionaryTransportMode=Intracomm report - Transport mode
+DictionaryBatchStatus=Product lot/serial Quality Control status
 TypeOfUnit=Type of unit
 SetupSaved=การตั้งค่าที่บันทึกไว้
 SetupNotSaved=Setup not saved
@@ -1187,7 +1191,7 @@ SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of m
 SetupDescription5=Other Setup menu entries manage optional parameters.
 AuditedSecurityEvents=Security events that are audited
 NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
-Audit=การตรวจสอบบัญชี
+Audit=Security events
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
 InfoOS=About OS
@@ -1319,9 +1323,12 @@ ConditionIsCurrently=สภาพปัจจุบันคือ% s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
 NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
+ComboListOptim=Combo list loading optimization
 SearchOptim=ค้นหาการเพิ่มประสิทธิภาพ
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
-YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
+YouHaveXObjectUseComboOptim=You have %s %s in the database. You can go into setup of module to enable loading of combo list on key pressed event.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other.
+YouHaveXObjectUseSearchOptimDesc=This limits the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to %s in Home-Setup-Other.
 BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
 BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
 PHPModuleLoaded=PHP component %s is loaded
@@ -1433,6 +1440,7 @@ MemberMainOptions=ตัวเลือกหลัก
 AdherentLoginRequired= เข้าสู่ระบบการจัดการสำหรับสมาชิกแต่ละคน
 AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=ช่องทำเครื่องหมายยืนยันที่จะส่งอีเมลไปยังสมาชิก (การตรวจสอบหรือการสมัครสมาชิกใหม่) เป็นตามค่าเริ่มต้น
+MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
 MembersDocModules=Document templates for documents generated from member record
@@ -1763,7 +1771,7 @@ AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting men
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
-AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the scheduled job %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=คลิกเพื่อกดติดตั้งโมดูล
@@ -1979,6 +1987,8 @@ 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_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add picture on proposal line
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add electronic sign in PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
@@ -2096,7 +2106,6 @@ PDF_SHOW_PROJECT=Show project on document
 ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
-FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
@@ -2120,12 +2129,18 @@ ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by
 MailToSendEventOrganization=Event Organization
 AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
 YouShouldDisablePHPFunctions=You should disable PHP functions
-IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands in custom code, you shoud disable PHP functions
+PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
+NotRecommended=Not recommanded
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
 ModuleUpdateAvailable=An update is available
 NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
+RandomlySelectedIfSeveral=Randomly selected if several pictures are available
+DatabasePasswordObfuscated=Database password is obfuscated in conf file
+DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
diff --git a/htdocs/langs/th_TH/agenda.lang b/htdocs/langs/th_TH/agenda.lang
index f2a93b36d8b..3c76a772ca7 100644
--- a/htdocs/langs/th_TH/agenda.lang
+++ b/htdocs/langs/th_TH/agenda.lang
@@ -4,7 +4,7 @@ Actions=เหตุการณ์ที่เกิดขึ้น
 Agenda=ระเบียบวาระการประชุม
 TMenuAgenda=ระเบียบวาระการประชุม
 Agendas=วาระ
-LocalAgenda=ปฏิทินภายใน
+LocalAgenda=Default calendar
 ActionsOwnedBy=เหตุการณ์ที่เป็นเจ้าของโดย
 ActionsOwnedByShort=เจ้าของ
 AffectedTo=ได้รับมอบหมายให้
@@ -14,13 +14,13 @@ EventsNb=จำนวนของเหตุการณ์ที่
 ListOfActions=รายการของเหตุการณ์
 EventReports=Event reports
 Location=สถานที่
-ToUserOfGroup=Event assigned to any user in group
+ToUserOfGroup=Event assigned to any user in the group
 EventOnFullDay=เหตุการณ์ทุกวัน (s)
 MenuToDoActions=ทุกเหตุการณ์ที่ไม่สมบูรณ์
 MenuDoneActions=เหตุการณ์ยกเลิกทั้งหมด
 MenuToDoMyActions=เหตุการณ์ที่ไม่สมบูรณ์ของฉัน
 MenuDoneMyActions=เหตุการณ์สิ้นสุดของฉัน
-ListOfEvents=รายการของเหตุการณ์ (ปฏิทินภายใน)
+ListOfEvents=List of events (default calendar)
 ActionsAskedBy=เหตุการณ์รายงานโดย
 ActionsToDoBy=เหตุการณ์ที่เกิดขึ้นได้รับมอบหมายให้
 ActionsDoneBy=เหตุการณ์กระทำโดย
@@ -38,6 +38,7 @@ ActionsEvents=กิจกรรมสำหรับ Dolibarr ซึ่งจ
 EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Third party %s created
+COMPANY_MODIFYInDolibarr=Third party %s modified
 COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=สัญญา% ผ่านการตรวจสอบ
 CONTRACT_DELETEInDolibarr=Contract %s deleted
@@ -87,6 +88,7 @@ OrderDeleted=Order deleted
 InvoiceDeleted=Invoice deleted
 DraftInvoiceDeleted=Draft invoice deleted
 CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_MODIFYInDolibarr=Contact %s modified
 CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Product %s created
 PRODUCT_MODIFYInDolibarr=Product %s modified
@@ -119,6 +121,7 @@ MRP_MO_UNVALIDATEInDolibarr=MO set to draft status
 MRP_MO_PRODUCEDInDolibarr=MO produced
 MRP_MO_DELETEInDolibarr=MO deleted
 MRP_MO_CANCELInDolibarr=MO canceled
+PAIDInDolibarr=%s paid
 ##### End agenda events #####
 AgendaModelModule=Document templates for event
 DateActionStart=วันที่เริ่มต้น
@@ -130,7 +133,7 @@ AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to use
 AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
 AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic events.
 AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> to include events of holidays.
-AgendaShowBirthdayEvents=Show birthdays of contacts
+AgendaShowBirthdayEvents=Birthdays of contacts
 AgendaHideBirthdayEvents=Hide birthdays of contacts
 Busy=ไม่ว่าง
 ExportDataset_event1=รายการของเหตุการณ์วาระการประชุม
@@ -152,6 +155,7 @@ ActionType=ประเภทเหตุการณ์
 DateActionBegin=วันที่เริ่มต้นเหตุการณ์
 ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b>?
 RepeatEvent=เหตุการณ์ซ้ำ
+OnceOnly=Once only
 EveryWeek=ทุกสัปดาห์
 EveryMonth=ทุกเดือน
 DayOfMonth=วันของเดือน
@@ -165,4 +169,4 @@ TimeType=Duration type
 ReminderType=Callback type
 AddReminder=Create an automatic reminder notification for this event
 ErrorReminderActionCommCreation=Error creating the reminder notification for this event
-BrowserPush=Browser Notification
+BrowserPush=Browser Popup Notification
diff --git a/htdocs/langs/th_TH/bills.lang b/htdocs/langs/th_TH/bills.lang
index 583cd85d1ef..9b93ef61f60 100644
--- a/htdocs/langs/th_TH/bills.lang
+++ b/htdocs/langs/th_TH/bills.lang
@@ -259,6 +259,7 @@ DateMaxPayment=Payment due on
 DateInvoice=วันที่ใบแจ้งหนี้
 DatePointOfTax=Point of tax
 NoInvoice=ไม่มีใบแจ้งหนี้
+NoOpenInvoice=No open invoice
 ClassifyBill=แยกประเภทใบแจ้งหนี้
 SupplierBillsToPay=Unpaid vendor invoices
 CustomerBillsUnpaid=ใบแจ้งหนี้ของลูกค้าที่ค้างชำระ
@@ -589,3 +590,4 @@ FacParentLine=Invoice Line Parent
 SituationTotalRayToRest=Remainder to pay without taxe
 PDFSituationTitle=Situation n° %d
 SituationTotalProgress=Total progress %d %%
+SearchUnpaidInvoicesWithDueDate=Search unpaid invoices with a due date = %s
diff --git a/htdocs/langs/th_TH/cashdesk.lang b/htdocs/langs/th_TH/cashdesk.lang
index 6ec140d41ce..d8717b96ff0 100644
--- a/htdocs/langs/th_TH/cashdesk.lang
+++ b/htdocs/langs/th_TH/cashdesk.lang
@@ -102,7 +102,7 @@ CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal numb
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
 SaleStartedAt=Sale started at %s
-ControlCashOpening=Control cash popup at opening POS
+ControlCashOpening=Open the "Control cash" popup when opening the POS
 CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -126,5 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
-ShowPriceHT = Display the price excluding tax column
-ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
+ShowPriceHT = Display the column with the price excluding tax (on screen)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
diff --git a/htdocs/langs/th_TH/compta.lang b/htdocs/langs/th_TH/compta.lang
index 80f555eef67..734b1c95524 100644
--- a/htdocs/langs/th_TH/compta.lang
+++ b/htdocs/langs/th_TH/compta.lang
@@ -286,3 +286,9 @@ ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
 IncludeLoansInResults = Include loans in reports
+InvoiceLate30Days = Invoices late > 30 days
+InvoiceLate15Days = Invoices late > 15 days
+InvoiceLateMinus15Days = Invoices late
+InvoiceNotLate = To be collected < 15 days
+InvoiceNotLate15Days = To be collected in 15 days
+InvoiceNotLate30Days = To be collected in 30 days
diff --git a/htdocs/langs/th_TH/cron.lang b/htdocs/langs/th_TH/cron.lang
index 8294f683d7e..e1127814217 100644
--- a/htdocs/langs/th_TH/cron.lang
+++ b/htdocs/langs/th_TH/cron.lang
@@ -60,7 +60,7 @@ CronErrEndDateStartDt=วันที่สิ้นสุดไม่สาม
 StatusAtInstall=Status at module installation
 CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=ปิดการใช้งาน
-CronTaskInactive=งานนี้ถูกปิดใช้งาน
+CronTaskInactive=This job is disabled (not scheduled)
 CronId=Id
 CronClassFile=Filename with class
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example 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>
diff --git a/htdocs/langs/th_TH/errors.lang b/htdocs/langs/th_TH/errors.lang
index a6a8cadcfef..090c30a1615 100644
--- a/htdocs/langs/th_TH/errors.lang
+++ b/htdocs/langs/th_TH/errors.lang
@@ -11,6 +11,7 @@ ErrorBadValueForParamNotAString=Bad value for your parameter. It appends general
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=เข้าสู่ระบบ% s อยู่แล้ว
 ErrorGroupAlreadyExists=s% กลุ่มที่มีอยู่แล้ว
+ErrorEmailAlreadyExists=Email %s already exists.
 ErrorRecordNotFound=บันทึกไม่พบ
 ErrorFailToCopyFile=ไม่สามารถคัดลอกแฟ้ม <b>'% s'</b> เป็น <b>'% s'</b>
 ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
@@ -117,7 +118,7 @@ ErrorCantReadFile=ไม่สามารถอ่านไฟล์ '% s'
 ErrorCantReadDir=ไม่สามารถอ่านไดเรกทอรี '% s'
 ErrorBadLoginPassword=ค่าที่ไม่ดีเพื่อเข้าสู่ระบบหรือรหัสผ่าน
 ErrorLoginDisabled=บัญชีของคุณถูกปิดการใช้งาน
-ErrorFailedToRunExternalCommand=ไม่สามารถเรียกใช้คำสั่งภายนอก ตรวจสอบสามารถใช้ได้และที่ทำงานโดยเซิร์ฟเวอร์ PHP ของคุณ ถ้า PHP <b>เซฟโหมดที่มีการเปิดใช้การตรวจสอบคำสั่งที่อยู่ภายในไดเรกทอรีที่กำหนดโดยพารามิเตอร์ safe_mode_exec_dir</b>
+ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server user. Check also the command is not protected on shell level by a security layer like apparmor.
 ErrorFailedToChangePassword=ไม่สามารถเปลี่ยนรหัสผ่าน
 ErrorLoginDoesNotExists=ผู้ใช้ที่มี <b>s%</b> เข้าสู่ระบบไม่พบ
 ErrorLoginHasNoEmail=ผู้ใช้นี้ไม่มีที่อยู่อีเมล ขั้นตอนการยกเลิก
@@ -262,6 +263,7 @@ ErrorDateIsInFuture=Error, the date can't be in the future
 ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
 ErrorAPercentIsRequired=Error, please fill in the percentage correctly
 ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
+ErrorFailedToFindEmailTemplate=Failed to find template with code name %s
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -298,3 +300,4 @@ WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So y
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
+ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
diff --git a/htdocs/langs/th_TH/eventorganization.lang b/htdocs/langs/th_TH/eventorganization.lang
index a98071ac8a9..ca7b7131745 100644
--- a/htdocs/langs/th_TH/eventorganization.lang
+++ b/htdocs/langs/th_TH/eventorganization.lang
@@ -1,4 +1,5 @@
 # Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+# Copyright (C) 2021		Dorian Vabre			<dorian.vabre@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
@@ -81,7 +82,10 @@ PriceOfBoothHelp=Subscription price to stand a booth
 EventOrganizationICSLink=Link ICS for events
 ConferenceOrBoothInformation=Conference Or Booth informations
 Attendees = Attendees
+DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
 #
 # Status
 #
@@ -94,8 +98,46 @@ EvntOrgCancelled = Cancelled
 #
 # Public page
 #
+SuggestForm = Suggestion page
+RegisterPage = Page for conferences or booth
+EvntOrgRegistrationHelpMessage = Here, you can vote for an event, or suggest a new conference or booth for the project
+EvntOrgRegistrationConfHelpMessage = Here, you can suggest a new conference for the project
+EvntOrgRegistrationBoothHelpMessage = Here, you can suggest a new booth for the project
+ListOfSuggestedConferences = List of suggested conferences
+ListOfSuggestedBooths = List of suggested booths
+SuggestConference = Suggest a new conference
+SuggestBooth = Suggest a booth
+ViewAndVote = View and vote for suggested events
 PublicAttendeeSubscriptionPage = Public link of registration to a conference
 MissingOrBadSecureKey = The security key is invalid or missing
-EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
-EvntOrgStartDuration = This conference starts on
-EvntOrgEndDuration =  and ends on
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference : '%s'
+EvntOrgDuration = This conference starts on %s and ends on %s.
+ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
+BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
+EventType = ประเภทเหตุการณ์
+
+#
+# Vote page
+#
+EvntOrgRegistrationWelcomeMessage = Welcome on the conference or booth suggestion page.
+EvntOrgRegistrationConfWelcomeMessage = Welcome on the conference suggestion page.
+EvntOrgRegistrationBoothWelcomeMessage = Welcome on the booth suggestion page.
+EvntOrgVoteHelpMessage = Here, you can view and vote for the suggested events for the project
+VoteOk = Your vote has been accepted.
+AlreadyVoted = You have already voted for this event.
+VoteError = An error has occurred during the vote, please try again.
+
+#
+# SubscriptionOk page
+#
+SubscriptionOk = Your subscription to this conference has been validated
+#
+# Subscription validation mail
+#
+ConfAttendeeSubscriptionConfirmation = Confirmation of your subscription to a conference
+#
+# Payment page
+#
+Attendee = Attendee
+PaymentConferenceAttendee = Conference attendee payment
+PaymentBoothLocation = Booth location payment
diff --git a/htdocs/langs/th_TH/hrm.lang b/htdocs/langs/th_TH/hrm.lang
index d449dc659a7..fd3c1e12bcf 100644
--- a/htdocs/langs/th_TH/hrm.lang
+++ b/htdocs/langs/th_TH/hrm.lang
@@ -9,7 +9,7 @@ ConfirmDeleteEstablishment=Are you sure you wish to delete this establishment?
 OpenEtablishment=Open establishment
 CloseEtablishment=Close establishment
 # Dictionary
-DictionaryPublicHolidays=HRM - Public holidays
+DictionaryPublicHolidays=Leave - Public holidays
 DictionaryDepartment=HRM - Department list
 DictionaryFunction=HRM - Job positions
 # Module
diff --git a/htdocs/langs/th_TH/knowledgemanagement.lang b/htdocs/langs/th_TH/knowledgemanagement.lang
index 7a13161b2b9..8440ea40221 100644
--- a/htdocs/langs/th_TH/knowledgemanagement.lang
+++ b/htdocs/langs/th_TH/knowledgemanagement.lang
@@ -47,7 +47,7 @@ KnowledgeManagementArea = Knowledge Management
 # Menu
 #
 MenuKnowledgeRecord = Knowledge base
-ListOfArticles = List of articles
+ListKnowledgeRecord = List of articles
 NewKnowledgeRecord = New article
 ValidateReply = Validate solution
 KnowledgeRecords = Articles
diff --git a/htdocs/langs/th_TH/languages.lang b/htdocs/langs/th_TH/languages.lang
index da1747a0a47..7892f55a64e 100644
--- a/htdocs/langs/th_TH/languages.lang
+++ b/htdocs/langs/th_TH/languages.lang
@@ -3,6 +3,7 @@ Language_am_ET=Ethiopian
 Language_ar_AR=ภาษาอาหรับ
 Language_ar_EG=Arabic (Egypt)
 Language_ar_SA=ภาษาอาหรับ
+Language_ar_TN=Arabic (Tunisia)
 Language_az_AZ=Azerbaijani
 Language_bn_BD=ประเทศบังคลาเทศ
 Language_bn_IN=Bengali (India)
@@ -84,6 +85,7 @@ Language_nl_NL=Dutch
 Language_pl_PL=โปแลนด์
 Language_pt_BR=โปรตุเกส (บราซิล)
 Language_pt_PT=โปรตุเกส
+Language_ro_MD=Romanian (Moldavia)
 Language_ro_RO=โรมาเนีย
 Language_ru_RU=รัสเซีย
 Language_ru_UA=รัสเซีย (ยูเครน)
diff --git a/htdocs/langs/th_TH/main.lang b/htdocs/langs/th_TH/main.lang
index 0da49f6d444..3c1200a884b 100644
--- a/htdocs/langs/th_TH/main.lang
+++ b/htdocs/langs/th_TH/main.lang
@@ -430,6 +430,7 @@ LT1IN=CGST
 LT2IN=SGST
 LT1GC=Additionnal cents
 VATRate=อัตราภาษี
+RateOfTaxN=Rate of tax %s
 VATCode=Tax Rate code
 VATNPR=Tax Rate NPR
 DefaultTaxRate=Default tax rate
@@ -729,6 +730,7 @@ MenuMembers=สมาชิก
 MenuAgendaGoogle=วาระการประชุมของ Google
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr ขีด จำกัด (เมนูที่บ้านการตั้งค่าการรักษาความปลอดภัย):% s Kb, PHP ขีด จำกัด :% s Kb
+ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
 NoFileFound=No documents uploaded
 CurrentUserLanguage=ภาษาปัจจุบัน
 CurrentTheme=รูปแบบปัจจุบัน
@@ -1072,6 +1074,7 @@ ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
 ToClose=To close
+ToRefuse=To refuse
 ToProcess=ในการประมวลผล
 ToApprove=To approve
 GlobalOpenedElemView=Global view
@@ -1126,9 +1129,11 @@ UpdateForAllLines=Update for all lines
 OnHold=ไว้
 Civility=Civility
 AffectTag=Affect Tag
+CreateExternalUser=Create external user
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
 ConfirmCancel=Are you sure you want to cancel
+EmailMsgID=Email MsgID
diff --git a/htdocs/langs/th_TH/members.lang b/htdocs/langs/th_TH/members.lang
index 6615ab0d20c..3e9516fc06f 100644
--- a/htdocs/langs/th_TH/members.lang
+++ b/htdocs/langs/th_TH/members.lang
@@ -213,3 +213,5 @@ SendReminderForExpiredSubscription=Send reminder by email to members when subscr
 MembershipPaid=Membership paid for current period (until %s)
 YouMayFindYourInvoiceInThisEmail=You may find your invoice attached to this email
 XMembersClosed=%s member(s) closed
+XExternalUserCreated=%s external user(s) created
+ForceMemberNature=Force member nature (Individual or Corporation)
diff --git a/htdocs/langs/th_TH/modulebuilder.lang b/htdocs/langs/th_TH/modulebuilder.lang
index 9fdaa1a533a..23a098be2e5 100644
--- a/htdocs/langs/th_TH/modulebuilder.lang
+++ b/htdocs/langs/th_TH/modulebuilder.lang
@@ -143,3 +143,4 @@ AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
 ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
+ImportExportProfiles=Import and export profiles
diff --git a/htdocs/langs/th_TH/mrp.lang b/htdocs/langs/th_TH/mrp.lang
index ec999a473a4..d5d061b855b 100644
--- a/htdocs/langs/th_TH/mrp.lang
+++ b/htdocs/langs/th_TH/mrp.lang
@@ -8,12 +8,12 @@ MenuBOM=Bills of material
 LatestBOMModified=Latest %s Bills of materials modified
 LatestMOModified=Latest %s Manufacturing Orders modified
 Bom=Bills of Material
-BillOfMaterials=Bill of Material
+BillOfMaterials=Bill of Materials
 BOMsSetup=Setup of module BOM
 ListOfBOMs=List of bills of material - BOM
 ListOfManufacturingOrders=List of Manufacturing Orders
-NewBOM=New bill of material
-ProductBOMHelp=Product to create with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
+NewBOM=New bill of materials
+ProductBOMHelp=Product to create (or disassemble) with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
 BOMsNumberingModules=BOM numbering templates
 BOMsModelModule=BOM document templates
 MOsNumberingModules=MO numbering templates
@@ -22,7 +22,7 @@ FreeLegalTextOnBOMs=Free text on document of BOM
 WatermarkOnDraftBOMs=Watermark on draft BOM
 FreeLegalTextOnMOs=Free text on document of MO
 WatermarkOnDraftMOs=Watermark on draft MO
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials %s ?
 ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
 ManufacturingEfficiency=Manufacturing efficiency
 ConsumptionEfficiency=Consumption efficiency
@@ -30,8 +30,8 @@ ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the produc
 ValueOfMeansLossForProductProduced=Value of 0.95 means an average of 5%% of loss of produced product
 DeleteBillOfMaterials=Delete Bill Of Materials
 DeleteMo=Delete Manufacturing Order
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Materials?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Materials?
 MenuMRP=Manufacturing Orders
 NewMO=New Manufacturing Order
 QtyToProduce=Qty to produce
@@ -39,7 +39,7 @@ DateStartPlannedMo=Date start planned
 DateEndPlannedMo=Date end planned
 KeepEmptyForAsap=Empty means 'As Soon As Possible'
 EstimatedDuration=Estimated duration
-EstimatedDurationDesc=Estimated duration to manufacture this product using this BOM
+EstimatedDurationDesc=Estimated duration to manufacture (or disassemble) this product using this BOM
 ConfirmValidateBom=Are you sure you want to validate the BOM with the reference <strong>%s</strong> (you will be able to use it to build new Manufacturing Orders)
 ConfirmCloseBom=Are you sure you want to cancel this BOM (you won't be able to use it to build new Manufacturing Orders anymore) ?
 ConfirmReopenBom=Are you sure you want to re-open this BOM (you will be able to use it to build new Manufacturing Orders)
@@ -63,13 +63,14 @@ ConsumeAndProduceAll=Consume and Produce All
 Manufactured=Manufactured
 TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
 ForAQuantityOf=For a quantity to produce of %s
+ForAQuantityToConsumeOf=For a quantity to disassemble of %s
 ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
 ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
 ProductionForRef=Production of %s
 AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
 NoStockChangeOnServices=No stock change on services
 ProductQtyToConsumeByMO=Product quantity still to consume by open MO
-ProductQtyToProduceByMO=Product quentity still to produce by open MO
+ProductQtyToProduceByMO=Product quantity still to produce by open MO
 AddNewConsumeLines=Add new line to consume
 ProductsToConsume=Products to consume
 ProductsToProduce=Products to produce
@@ -83,15 +84,13 @@ Workstations=Workstations
 WorkstationsDescription=Workstations management
 WorkstationSetup = Workstations setup
 WorkstationSetupPage = Workstations setup page
-WorkstationAbout = About Workstation
-WorkstationAboutPage = Workstations about page
 WorkstationList=Workstation list
 WorkstationCreate=Add new workstation
 ConfirmEnableWorkstation=Are you sure you want to enable workstation <b>%s</b> ?
 EnableAWorkstation=Enable a workstation
 ConfirmDisableWorkstation=Are you sure you want to disable workstation <b>%s</b> ?
 DisableAWorkstation=Disable a workstation
-DeleteWorkstation=Supprimer
+DeleteWorkstation=ลบ
 NbOperatorsRequired=Number of operators required
 THMOperatorEstimated=Estimated operator THM
 THMMachineEstimated=Estimated machine THM
diff --git a/htdocs/langs/th_TH/orders.lang b/htdocs/langs/th_TH/orders.lang
index dccf12e02ac..5b3351f4c3e 100644
--- a/htdocs/langs/th_TH/orders.lang
+++ b/htdocs/langs/th_TH/orders.lang
@@ -11,6 +11,7 @@ OrderDate=วันที่สั่งซื้อ
 OrderDateShort=วันที่สั่งซื้อ
 OrderToProcess=เพื่อที่จะดำเนินการ
 NewOrder=คำสั่งซื้อใหม่
+NewSupplierOrderShort=คำสั่งซื้อใหม่
 NewOrderSupplier=New Purchase Order
 ToOrder=ทำให้การสั่งซื้อ
 MakeOrder=ทำให้การสั่งซื้อ
@@ -73,6 +74,7 @@ DeleteOrder=เพื่อลบ
 CancelOrder=ยกเลิกคำสั่งซื้อ
 OrderReopened= Order %s re-open
 AddOrder=สร้างใบสั่ง
+AddSupplierOrderShort=สร้างใบสั่ง
 AddPurchaseOrder=Create purchase order
 AddToDraftOrders=เพิ่มลงในร่างคำสั่ง
 ShowOrder=เพื่อแสดง
diff --git a/htdocs/langs/th_TH/other.lang b/htdocs/langs/th_TH/other.lang
index b4170631c63..49c22bb16a5 100644
--- a/htdocs/langs/th_TH/other.lang
+++ b/htdocs/langs/th_TH/other.lang
@@ -129,6 +129,7 @@ ClosedByLogin=ผู้ใช้ที่เข้าสู่ระบบปิ
 FileWasRemoved=ไฟล์% s จะถูกลบออก
 DirWasRemoved=สารบบ% s จะถูกลบออก
 FeatureNotYetAvailable=Feature not yet available in the current version
+FeatureNotAvailableOnDevicesWithoutMouse=Feature not available on devices without mouse
 FeaturesSupported=Supported features
 Width=ความกว้าง
 Height=ความสูง
@@ -263,7 +264,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
-PrefixSession=Prefix for session ID
+SuffixSessionName=Suffix for session name
 
 ##### Export #####
 ExportsArea=พื้นที่การส่งออก
diff --git a/htdocs/langs/th_TH/partnership.lang b/htdocs/langs/th_TH/partnership.lang
index 35ad7a84d83..826f7f7c345 100644
--- a/htdocs/langs/th_TH/partnership.lang
+++ b/htdocs/langs/th_TH/partnership.lang
@@ -16,41 +16,72 @@
 #
 # Generic
 #
-ModulePartnershipName = Partnership management
-PartnershipDescription = Module Partnership management
+ModulePartnershipName=Partnership management
+PartnershipDescription=Module Partnership management
 PartnershipDescriptionLong= Module Partnership management
 
+AddPartnership=Add partnership
+CancelPartnershipForExpiredMembers=Partnership: Cancel partnership of members with expired subscriptions
+PartnershipCheckBacklink=Partnership: Check referring backlink
+
 #
 # Menu
 #
-NewPartnership = New Partnership
-ListOfPartnerships = List of partnership
+NewPartnership=New Partnership
+ListOfPartnerships=List of partnership
 
 #
 # Admin page
 #
-PartnershipSetup = Partnership setup
-PartnershipAbout = About Partnership
-PartnershipAboutPage = Partnership about page
-
+PartnershipSetup=Partnership setup
+PartnershipAbout=About Partnership
+PartnershipAboutPage=Partnership about page
+partnershipforthirdpartyormember=Partner status must be set on a 'thirdparty' or a 'member'
+PARTNERSHIP_IS_MANAGED_FOR=Partnership managed for
+PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks to check
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb of days before cancelling status of a partnership when a subscription has expired
+ReferingWebsiteCheck=Check of website referring
+ReferingWebsiteCheckDesc=You can enable a feature to check that your partners has added a backlink to your website domains on their own website.
 
 #
 # Object
 #
+DeletePartnership=Delete a partnership
+PartnershipDedicatedToThisThirdParty=Partnership dedicated to this third party
+PartnershipDedicatedToThisMember=Partnership dedicated to this member
 DatePartnershipStart=วันที่เริ่มต้น
 DatePartnershipEnd=วันที่สิ้นสุด
+ReasonDecline=Decline reason
+ReasonDeclineOrCancel=Decline reason
+PartnershipAlreadyExist=Partnership already exist
+ManagePartnership=Manage partnership
+BacklinkNotFoundOnPartnerWebsite=Backlink not found on partner website
+ConfirmClosePartnershipAsk=Are you sure you want to cancel this partnership?
+PartnershipType=Partnership type
 
 #
 # Template Mail
 #
+SendingEmailOnPartnershipWillSoonBeCanceled=Partnership will soon be canceled
+SendingEmailOnPartnershipRefused=Partnership refused
+SendingEmailOnPartnershipAccepted=Partnership accepted
+SendingEmailOnPartnershipCanceled=Partnership canceled
 
+YourPartnershipWillSoonBeCanceledTopic=Partnership will soon be canceled
+YourPartnershipRefusedTopic=Partnership refused
+YourPartnershipAcceptedTopic=Partnership accepted
+YourPartnershipCanceledTopic=Partnership canceled
+
+YourPartnershipWillSoonBeCanceledContent=We inform you that your partnership will soon be canceled (Backlink not found)
+YourPartnershipRefusedContent=We inform you that your partnership request has been refused.
+YourPartnershipAcceptedContent=We inform you that your partnership request has been accepted.
+YourPartnershipCanceledContent=We inform you that your partnership has been canceled.
 
 #
 # Status
 #
-PartnershipDraft = ร่าง
-PartnershipAccepted = Accepted
-PartnershipRefused = ปฏิเสธ
-PartnershipCanceled = ยกเลิก
-
+PartnershipDraft=ร่าง
+PartnershipAccepted=Accepted
+PartnershipRefused=ปฏิเสธ
+PartnershipCanceled=ยกเลิก
 PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/th_TH/productbatch.lang b/htdocs/langs/th_TH/productbatch.lang
index cf0ca364246..d6e80c1675b 100644
--- a/htdocs/langs/th_TH/productbatch.lang
+++ b/htdocs/langs/th_TH/productbatch.lang
@@ -1,4 +1,4 @@
-# ProductBATCH language file - en_US - ProductBATCH
+# ProductBATCH language file - Source file is en_US - ProductBATCH
 ManageLotSerial=การใช้งานจำนวนมาก / หมายเลขซีเรีย
 ProductStatusOnBatch=Yes (lot required)
 ProductStatusOnSerial=Yes (unique serial number required)
@@ -33,3 +33,13 @@ CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+LifeTime=Life span (in days)
+EndOfLife=End of life
+ManufacturingDate=Manufacturing date
+DestructionDate=Destruction date
+FirstUseDate=First use date
+QCFrequency=Quality control frequency (in days)
+
+#Traceability - qc status
+OutOfOrder=Out of order
+InWorkingOrder=In working order
diff --git a/htdocs/langs/th_TH/products.lang b/htdocs/langs/th_TH/products.lang
index cb46ebae258..e0c9a34bc0d 100644
--- a/htdocs/langs/th_TH/products.lang
+++ b/htdocs/langs/th_TH/products.lang
@@ -396,3 +396,5 @@ ActionAvailableOnVariantProductOnly=Action only available on the variant of prod
 ProductsPricePerCustomer=Product prices per customers
 ProductSupplierExtraFields=Additional Attributes (Supplier Prices)
 DeleteLinkedProduct=Delete the child product linked to the combination
+PMPValue=ราคาเฉลี่ยถ่วงน้ำหนัก
+PMPValueShort=WAP
diff --git a/htdocs/langs/th_TH/projects.lang b/htdocs/langs/th_TH/projects.lang
index 3b133a68f69..2bf666b09d8 100644
--- a/htdocs/langs/th_TH/projects.lang
+++ b/htdocs/langs/th_TH/projects.lang
@@ -267,9 +267,11 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=ใบแจ้งหนี้ใหม่
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+OneLinePerTimeSpentLine=One line for each time spent declaration
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
 AddPersonToTask=Add also to tasks
 UsageOrganizeEvent=Usage: Event Organization
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
+SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
diff --git a/htdocs/langs/th_TH/receptions.lang b/htdocs/langs/th_TH/receptions.lang
index ecc899cc3ea..e774aa9731b 100644
--- a/htdocs/langs/th_TH/receptions.lang
+++ b/htdocs/langs/th_TH/receptions.lang
@@ -44,4 +44,4 @@ ValidateOrderFirstBeforeReception=You must first validate the order before being
 ReceptionsNumberingModules=Numbering module for receptions
 ReceptionsReceiptModel=Document templates for receptions
 NoMorePredefinedProductToDispatch=No more predefined products to dispatch
-
+ReceptionExist=A reception exists
diff --git a/htdocs/langs/th_TH/stocks.lang b/htdocs/langs/th_TH/stocks.lang
index c2d4b2e180a..5af47838e5b 100644
--- a/htdocs/langs/th_TH/stocks.lang
+++ b/htdocs/langs/th_TH/stocks.lang
@@ -56,8 +56,6 @@ UnitPurchaseValue=ราคาซื้อหน่วย
 StockTooLow=หุ้นต่ำเกินไป
 StockLowerThanLimit=Stock lower than alert limit (%s)
 EnhancedValue=มูลค่า
-PMPValue=ราคาเฉลี่ยถ่วงน้ำหนัก
-PMPValueShort=WAP
 EnhancedValueOfWarehouses=ค่าโกดัง
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
@@ -251,7 +249,10 @@ SelectAStockMovementFileToImport=select a stock movement file to import
 InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
 LabelOfInventoryMovemement=Inventory %s
 ReOpen=เปิดใหม่
-ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock to the real qty you entered into the inventory.
 ObjectNotFound=%s not found
 MakeMovementsAndClose=Generate movements and close
 AutofillWithExpected=Fill real quantity with expected quantity
+ShowAllBatchByDefault=By default, show batch details on product "stock" tab
+CollapseBatchDetailHelp=You can set batch detail default display in stocks module configuration
+FieldCannotBeNegative=Field "%s" cannot be negative
diff --git a/htdocs/langs/th_TH/ticket.lang b/htdocs/langs/th_TH/ticket.lang
index 8f739ef8f71..88d644556fd 100644
--- a/htdocs/langs/th_TH/ticket.lang
+++ b/htdocs/langs/th_TH/ticket.lang
@@ -304,7 +304,7 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
-BoxTicketType=Number of open tickets by type
+BoxTicketType=Distribution of open tickets by type
 BoxTicketSeverity=Number of open tickets by severity
 BoxNoTicketSeverity=No tickets opened
 BoxTicketLastXDays=Number of new tickets by days the last %s days
diff --git a/htdocs/langs/tr_TR/accountancy.lang b/htdocs/langs/tr_TR/accountancy.lang
index b04d8c3dd4c..ad3952cc025 100644
--- a/htdocs/langs/tr_TR/accountancy.lang
+++ b/htdocs/langs/tr_TR/accountancy.lang
@@ -158,7 +158,7 @@ ACCOUNTING_LENGTH_AACCOUNT=Length of the third-party accounting accounts (If you
 ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of an accounting account. Needed by some countries (like Switzerland). If set to off (default), you can set the following two parameters to ask the application to add virtual zeros.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties, break ability to search on a part of value)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
@@ -328,6 +328,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountanc
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
+NotifiedExportDate=Notified export date (modification of the entries will not be possible)
+NotifiedValidationDate=Validation of the entries (modification or deletion of the entries will not be possible)
+ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=Export draft journal
 Modelcsv=Dışa aktarım modeli
 Selectmodelcsv=Bir dışa aktarım modeli seçin
diff --git a/htdocs/langs/tr_TR/admin.lang b/htdocs/langs/tr_TR/admin.lang
index 1ae5be5bfa3..66a16a06ae5 100644
--- a/htdocs/langs/tr_TR/admin.lang
+++ b/htdocs/langs/tr_TR/admin.lang
@@ -221,8 +221,8 @@ NotCompatible=Bu modül Dolibarr'ınızla uyumlu görünmüyor %s (Min %s - Maks
 CompatibleAfterUpdate=Bu modül, Dolibarr %s (Min %s - Maks %s) için bir güncelleme gerektirir.
 SeeInMarkerPlace=Market place alanına bakın
 SeeSetupOfModule=%s modülü kurulumuna bak
+SetOptionTo=Set option <b>%s</b> to %s
 Updated=Güncellendi
-Nouveauté=Yenilik
 AchatTelechargement=Satın Al/Yükle
 GoModuleSetupArea=Yeni bir modül almak/yüklemek için, <a href="%s">%s</a> Modül ayar alanına gidin.
 DoliStoreDesc=DoliStore, Dolibarr ERP/CRM dış modülleri için resmi pazar yeri
@@ -399,6 +399,7 @@ SecurityToken=URL leri güvenli kılmak için anahtar
 NoSmsEngine=Sitemde hiç bir SMS gönderme yöneticisi mevcut değil. Standart Dolibarr sürümü ile bir SMS gönderme yöneticisi yüklü gelmez, çünkü bunlar bir dış sağlayıcıya bağlıdır. Yine de şu adresten birkaç tane bulabilirsiniz: %s
 PDF=PDF
 PDFDesc=PDF oluşturma için global seçenekler
+PDFOtherDesc=PDF Option specific to some modules
 PDFAddressForging=Adres bölümü kuralları
 HideAnyVATInformationOnPDF=Satış Vergisi/KDV ile ilgili tüm bilgileri gizle
 PDFRulesForSalesTax=Satış Vergisi/KDV için Kurallar
@@ -561,7 +562,7 @@ Module53Desc=Hizmet Yönetimi
 Module54Name=Sözleşmeler/Abonelikler
 Module54Desc=Sözleşmelerin yönetimi (hizmetler veya yinelenen abonelikler)
 Module55Name=Barkodlar
-Module55Desc=Barkod yönetimi
+Module55Desc=Barcode or QR code management
 Module56Name=Kredi transferiyle ödeme
 Module56Desc=Kredi Transferi siparişleri ile tedarikçilerin ödemelerinin yönetimi. Avrupa ülkeleri için SEPA dosyası oluşturmayı içerir.
 Module57Name=Otomatik Ödeme ile Ödemeler
@@ -848,10 +849,10 @@ Permission402=İndirim oluştur/değiştir
 Permission403=İndirim doğrula
 Permission404=İndirim sil
 Permission430=Hata Ayıklama Çubuğunu Kullan
-Permission511=Maaş ödemelerini okuyun (sizinki ve elemanlarınız)
-Permission512=Maaş ödemeleri oluşturun/değiştirin
-Permission514=Maaş ödemelerini silin
-Permission517=Herkesin maaş ödemelerini okuyun
+Permission511=Read salaries and payments (yours and subordinates)
+Permission512=Create/modify salaries and payments
+Permission514=Delete salaries and payments
+Permission517=Read salaries and payments everybody
 Permission519=Ücretleri çıkart
 Permission520=Borçları oku
 Permission522=Borç oluştur/değiştir
@@ -965,6 +966,8 @@ Permission23003=Planlı iş sil
 Permission23004=Planlı iş yürüt
 Permission50101=Satış Noktası Kullanımı (SimplePOS)
 Permission50151=Satış Noktası Kullanımı (TakePOS)
+Permission50152=Edit sales lines
+Permission50153=Edit ordered sales lines
 Permission50201=Işlemleri oku
 Permission50202=İçe aktarma işlemleri
 Permission50330=Zapier nesnelerini okuyun
@@ -1039,11 +1042,12 @@ DictionaryMeasuringUnits=Ölçü Birimleri
 DictionarySocialNetworks=Sosyal Ağlar
 DictionaryProspectStatus=Şirketler için olasılık durumu
 DictionaryProspectContactStatus=Kişiler için olasılık durumu
-DictionaryHolidayTypes=İzin türleri
+DictionaryHolidayTypes=Leave - Types of leave
 DictionaryOpportunityStatus=Proje/potansiyel müşteri için potansiyel müşteri durumu
 DictionaryExpenseTaxCat=Gider raporu - Ulaşım kategorileri
 DictionaryExpenseTaxRange=Gider raporu - Ulaşım kategorisine göre menzil
 DictionaryTransportMode=Intracomm raporu - Taşıma modu
+DictionaryBatchStatus=Product lot/serial Quality Control status
 TypeOfUnit=Ünite türü
 SetupSaved=Kurulum kaydedildi
 SetupNotSaved=Kurulum kaydedilmedi
@@ -1187,7 +1191,7 @@ SetupDescription4= <a href="%s"> %s -> %s </a> <br> <br> Bu yazılım birçok mo
 SetupDescription5=Ayarlar menüsündeki diğer girişler isteğe bağlı parametreleri yönetmenizi sağlar.
 AuditedSecurityEvents=Denetlenen güvenlik olayları
 NoSecurityEventsAreAduited=Hiçbir güvenlik olayı denetlenmez. Bunları %s menüsünden etkinleştirebilirsiniz
-Audit=Denetim
+Audit=Security events
 InfoDolibarr=Dolibarr Bilgileri
 InfoBrowser=Tarayıcı Bilgileri
 InfoOS=İşletim Sistemi Bilgileri
@@ -1319,9 +1323,12 @@ ConditionIsCurrently=Koşul şu anda %s durumunda
 YouUseBestDriver=Kullandığınız %s sürücüsü şu anda mevcut olan en iyi sürücüdür.
 YouDoNotUseBestDriver=%s sürücüsünü kullanıyorsunuz fakat %s sürücüsü önerilir.
 NbOfObjectIsLowerThanNoPb=Veritabanında yalnızca %s %s var. Bu, herhangi bir özel optimizasyon gerektirmez.
+ComboListOptim=Combo list loading optimization
 SearchOptim=Optimizasyon ara
-YouHaveXObjectUseSearchOptim=Veritabanında %s %s var. %s sabitini Giriş-Ayarlar-Diğer ayarlar'da 1'e ekleyebilirsiniz. Aramayı, veritabanının dizinleri kullanmasını mümkün kılan dizelerin başlangıcıyla sınırlandırın ve anında yanıt almalısınız.
-YouHaveXObjectAndSearchOptimOn=Veritabanında %s %s var ve Giriş-Ayarlar-Diğer ayarlar'da %s sabiti 1 olarak ayarlandı.
+YouHaveXObjectUseComboOptim=You have %s %s in the database. You can go into setup of module to enable loading of combo list on key pressed event.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other.
+YouHaveXObjectUseSearchOptimDesc=This limits the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to %s in Home-Setup-Other.
 BrowserIsOK=%s web tarayıcısını kullanıyorsunuz. Bu tarayıcı güvenlik ve performans açısından uygundur.
 BrowserIsKO=%s web tarayıcısını kullanıyorsunuz. Bu tarayıcının güvenlik, performans ve güvenilirlik açısından kötü bir seçim olduğu bilinmektedir. Firefox, Chrome, Opera veya Safari kullanmanızı öneririz.
 PHPModuleLoaded=%s PHP bileşeni yüklendi
@@ -1433,6 +1440,7 @@ MemberMainOptions=Ana seçenekler
 AdherentLoginRequired= Her üye için bir Kullanıcı adı yürütün
 AdherentMailRequired=Yeni bir üye oluşturmak için e-posta gereklidir
 MemberSendInformationByMailByDefault=Üyelere onay epostası (doğrulama ya da yeni abonelik) göndermek için onay kutusu varsayılan olarak açıktır
+MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
 VisitorCanChooseItsPaymentMode=Ziyaretçi kişi mevcut ödeme türlerinden birini seçebilir
 MEMBER_REMINDER_EMAIL=Süresi dolmuş abonelikler için <b>mail yoluyla</b> otomatik hatırlatıcıyı etkinleştir. Not: Hatırlatıcıyı gönderebilmek için <strong>%s</strong> modülü etkinleştirilmiş ve doğru bir şekilde yapılandırılmış olmalıdır.
 MembersDocModules=Üye kaydından oluşturulan belgeler için belge şablonları
@@ -1763,7 +1771,7 @@ AGENDA_DEFAULT_VIEW=Ajanda menüsünü seçerken varsayılan olarak hangi görü
 AGENDA_REMINDER_BROWSER=Etkinlik hatırlatıcıyı <b> kullanıcının tarayıcısında </b> etkinleştirin (Hatırlatma tarihine ulaşıldığında, tarayıcı tarafından bir açılır pencere gösterilir. Her kullanıcı, bu tür bildirimleri kendi tarayıcı bildirim ayarlarından devre dışı bırakabilir).
 AGENDA_REMINDER_BROWSER_SOUND=Sesli bildirimi etkinleştir
 AGENDA_REMINDER_EMAIL=Etkinlik hatırlatıcıyı <b> e-postalarla </b> etkinleştirin (hatırlatma seçeneği/gecikme her olayda tanımlanabilir).
-AGENDA_REMINDER_EMAIL_NOTE=Not:%s görevinin sıklığı, hatırlatmanın doğru zamanda gönderildiğinden emin olmak için yeterli olmalıdır.
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the scheduled job %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Bağlantılı nesneyi gündem görünümünde göster
 ##### Clicktodial #####
 ClickToDialSetup=TıklaAra modülü kurulumu
@@ -1979,6 +1987,8 @@ MAIN_PDF_MARGIN_RIGHT=PDF'deki sağ boşluk
 MAIN_PDF_MARGIN_TOP=PDF'deki üst boşluk
 MAIN_PDF_MARGIN_BOTTOM=PDF'deki alt kenar boşluğu
 MAIN_DOCUMENTS_LOGO_HEIGHT=PDF'deki logo için yükseklik
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add picture on proposal line
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add electronic sign in PDF
 NothingToSetup=Bu modül için gerekli özel bir kurulum yok.
 SetToYesIfGroupIsComputationOfOtherGroups=Eğer bu grup diğer grupların bir hesaplaması ise bunu evet olarak ayarlayın
 EnterCalculationRuleIfPreviousFieldIsYes=Önceki alan Evet olarak ayarlanmışsa hesaplama kuralını girin. <br> Örneğin: <br> CODEGRP1+CODEGRP2
@@ -2096,7 +2106,6 @@ PDF_SHOW_PROJECT=Belgede projeyi göster
 ShowProjectLabel=Proje Etiketi
 PDF_USE_ALSO_LANGUAGE_CODE=PDF'nizdeki bazı metinlerin aynı oluşturulan PDF'de 2 farklı dilde çoğaltılmasını istiyorsanız, burada bu ikinci dili ayarlamanız gerekir, böylece oluşturulan PDF aynı sayfada 2 farklı dil içerir, biri PDF oluşturulurken seçilir ve bu ( yalnızca birkaç PDF şablonu bunu destekler). PDF başına 1 dil için boş bırakın.
 FafaIconSocialNetworksDesc=Buraya FontAwesome simgesinin kodunu girin. FontAwesome'ın ne olduğunu bilmiyorsanız, fa-address-book genel değerini kullanabilirsiniz.
-FeatureNotAvailableWithReceptionModule=Alış modül etkinleştirildiğinde özellik kullanılamaz
 RssNote=Not: Her RSS akışı tanımı, gösterge tablosunda mevcut olması için etkinleştirmeniz gereken bir pencere öğesi sağlar.
 JumpToBoxes=Kuruluma Atla -> Widget'lar
 MeasuringUnitTypeDesc=Burada "beden", "yüzey", "hacim", "ağırlık", "zaman" gibi bir değer kullanın
@@ -2120,12 +2129,18 @@ ConfFileIsReadableOrWritableByAnyUsers=Conf dosyası herhangi bir kullanıcı ta
 MailToSendEventOrganization=Etkinlik organizasyonu
 AGENDA_EVENT_DEFAULT_STATUS=Formdan bir olay oluştururken varsayılan olay durumu
 YouShouldDisablePHPFunctions=PHP işlevlerini devre dışı bırakmalısınız
-IfCLINotRequiredYouShouldDisablePHPFunctions=Sistem komutlarını çalıştırmanız gerekmesi dışında (örneğin Planlanmış iş modülü için veya harici komut satırı Anti-virüs'ü çalıştırmak için), PHP işlevlerini devre dışı bırakmalısınız.
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands in custom code, you shoud disable PHP functions
+PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=Kök dizininizde ortak programların yazılabilir dosyaları veya dizinleri bulunamadı (İyi)
 RecommendedValueIs=Önerilen: %s
+NotRecommended=Not recommanded
 ARestrictedPath=Kısıtlı bir yol
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
 ModuleUpdateAvailable=An update is available
 NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
+RandomlySelectedIfSeveral=Randomly selected if several pictures are available
+DatabasePasswordObfuscated=Database password is obfuscated in conf file
+DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
diff --git a/htdocs/langs/tr_TR/agenda.lang b/htdocs/langs/tr_TR/agenda.lang
index 82b8160baa5..addc00ef664 100644
--- a/htdocs/langs/tr_TR/agenda.lang
+++ b/htdocs/langs/tr_TR/agenda.lang
@@ -4,7 +4,7 @@ Actions=Etkinlikler
 Agenda=Gündem
 TMenuAgenda=Gündem
 Agendas=Gündemler
-LocalAgenda=İç takvim
+LocalAgenda=Default calendar
 ActionsOwnedBy=Etkinlik sahibi
 ActionsOwnedByShort=Sahibi
 AffectedTo=Atanan
@@ -14,13 +14,13 @@ EventsNb=Etkinlik sayısı
 ListOfActions=Etkinlik listesi
 EventReports=Etkinlik raporları
 Location=Konum
-ToUserOfGroup=Event assigned to any user in group
+ToUserOfGroup=Event assigned to any user in the group
 EventOnFullDay=Tam gün(ler)deki etkinlik
 MenuToDoActions=Sonlandırılmamış tüm etkinlikler
 MenuDoneActions=Sonlandırılmış tüm etkinlikler
 MenuToDoMyActions=Sonlanmamış etkinliklerim
 MenuDoneMyActions=Sonlanmış etkinliklerim
-ListOfEvents=Etkinlik listesi (iç takvim)
+ListOfEvents=List of events (default calendar)
 ActionsAskedBy=Etkinliği bildiren
 ActionsToDoBy=Etkinliğe atanan
 ActionsDoneBy=Etkinliği yapan
@@ -38,6 +38,7 @@ ActionsEvents=Dolibarr'ın gündem içerisinde otomatik olarak bir eylem oluştu
 EventRemindersByEmailNotEnabled=%s modül kurulumunda e-posta yoluyla etkinik hatırlatıcı etkinleştirilmedi.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=%s adlı üçüncü parti oluşturuldu
+COMPANY_MODIFYInDolibarr=Third party %s modified
 COMPANY_DELETEInDolibarr=%s adlı üçüncü parti silindi
 ContractValidatedInDolibarr=%s referans no'lu sözleşme doğrulandı
 CONTRACT_DELETEInDolibarr=%s referans no'lu sözleşme silindi
@@ -87,6 +88,7 @@ OrderDeleted=Sipariş silindi
 InvoiceDeleted=Fatura silindi
 DraftInvoiceDeleted=Draft invoice deleted
 CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_MODIFYInDolibarr=Contact %s modified
 CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=%s kodlu ürün oluşturuldu
 PRODUCT_MODIFYInDolibarr=%s kodlu ürün değiştirildi
@@ -119,6 +121,7 @@ MRP_MO_UNVALIDATEInDolibarr=MO set to draft status
 MRP_MO_PRODUCEDInDolibarr=MO produced
 MRP_MO_DELETEInDolibarr=MO deleted
 MRP_MO_CANCELInDolibarr=MO canceled
+PAIDInDolibarr=%s paid
 ##### End agenda events #####
 AgendaModelModule=Etkinlik için belge şablonları
 DateActionStart=Başlangıç tarihi
@@ -130,7 +133,7 @@ AgendaUrlOptions4=<b>logint=%s</b>, <b>%s</b> kullanıcısına atanmış eylemle
 AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b>, çıkışı <b>__PROJECT_ID__</b> projesine bağlanmış eylemlere sınırlamak için.
 AgendaUrlOptionsNotAutoEvent=Otomatik etkinlikleri hariç tutmak için <b>notactiontype=systemauto</b>
 AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> to include events of holidays.
-AgendaShowBirthdayEvents=Kişilerin doğum günlerini göster
+AgendaShowBirthdayEvents=Birthdays of contacts
 AgendaHideBirthdayEvents=Kişilerin doğum günlerini gizle
 Busy=Meşgul
 ExportDataset_event1=Gündem etkinlikleri listesi
@@ -152,6 +155,7 @@ ActionType=Etkinlik türü
 DateActionBegin=Etkinlik başlangıç tarihi
 ConfirmCloneEvent=<b>%s</b> etkinliğinin kopyasını oluşturmak istediğinizden emin misiniz?
 RepeatEvent=Etkinliği tekrarla
+OnceOnly=Once only
 EveryWeek=Her hafta
 EveryMonth=Her ay
 DayOfMonth=Ayın günü
@@ -165,4 +169,4 @@ TimeType=Duration type
 ReminderType=Callback type
 AddReminder=Create an automatic reminder notification for this event
 ErrorReminderActionCommCreation=Error creating the reminder notification for this event
-BrowserPush=Browser Notification
+BrowserPush=Browser Popup Notification
diff --git a/htdocs/langs/tr_TR/bills.lang b/htdocs/langs/tr_TR/bills.lang
index 0be1e15c206..bd54027c31a 100644
--- a/htdocs/langs/tr_TR/bills.lang
+++ b/htdocs/langs/tr_TR/bills.lang
@@ -259,6 +259,7 @@ DateMaxPayment=Ödeme vadesi
 DateInvoice=Fatura tarihi
 DatePointOfTax=Vergi noktası
 NoInvoice=Fatura yok
+NoOpenInvoice=No open invoice
 ClassifyBill=Faturayı sınıflandır
 SupplierBillsToPay=Ödenmemiş tedarikçi faturaları
 CustomerBillsUnpaid=Ödenmemiş müşteri faturaları
@@ -589,3 +590,4 @@ FacParentLine=Invoice Line Parent
 SituationTotalRayToRest=Remainder to pay without taxe
 PDFSituationTitle=Situation n° %d
 SituationTotalProgress=Total progress %d %%
+SearchUnpaidInvoicesWithDueDate=Search unpaid invoices with a due date = %s
diff --git a/htdocs/langs/tr_TR/cashdesk.lang b/htdocs/langs/tr_TR/cashdesk.lang
index a7ce8a3f6d6..1f99e1ee669 100644
--- a/htdocs/langs/tr_TR/cashdesk.lang
+++ b/htdocs/langs/tr_TR/cashdesk.lang
@@ -102,7 +102,7 @@ CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal numb
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
 SaleStartedAt=Sale started at %s
-ControlCashOpening=Control cash popup at opening POS
+ControlCashOpening=Open the "Control cash" popup when opening the POS
 CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -126,5 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
-ShowPriceHT = Display the price excluding tax column
-ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
+ShowPriceHT = Display the column with the price excluding tax (on screen)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
diff --git a/htdocs/langs/tr_TR/compta.lang b/htdocs/langs/tr_TR/compta.lang
index ccf30c58ba9..e7070c8c24c 100644
--- a/htdocs/langs/tr_TR/compta.lang
+++ b/htdocs/langs/tr_TR/compta.lang
@@ -286,3 +286,9 @@ ReportPurchaseTurnover=Faturalanan satın alma cirosu
 ReportPurchaseTurnoverCollected=Toplanan satın alma cirosu
 IncludeVarpaysInResults = Include various payments in reports
 IncludeLoansInResults = Include loans in reports
+InvoiceLate30Days = Invoices late > 30 days
+InvoiceLate15Days = Invoices late > 15 days
+InvoiceLateMinus15Days = Invoices late
+InvoiceNotLate = To be collected < 15 days
+InvoiceNotLate15Days = To be collected in 15 days
+InvoiceNotLate30Days = To be collected in 30 days
diff --git a/htdocs/langs/tr_TR/cron.lang b/htdocs/langs/tr_TR/cron.lang
index 3c20bddb891..2a1a962c1d7 100644
--- a/htdocs/langs/tr_TR/cron.lang
+++ b/htdocs/langs/tr_TR/cron.lang
@@ -60,7 +60,7 @@ CronErrEndDateStartDt=Bitiş tarihi başlama tarihinden önce olamaz
 StatusAtInstall=Status at module installation
 CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Engelle
-CronTaskInactive=Bu iş devre dışı
+CronTaskInactive=This job is disabled (not scheduled)
 CronId=Kimlik
 CronClassFile=Sınıfıyla beraber dosya adı
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example 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>
diff --git a/htdocs/langs/tr_TR/errors.lang b/htdocs/langs/tr_TR/errors.lang
index 12a16261cab..2364028dd00 100644
--- a/htdocs/langs/tr_TR/errors.lang
+++ b/htdocs/langs/tr_TR/errors.lang
@@ -11,6 +11,7 @@ ErrorBadValueForParamNotAString=Parametreniz için hatalı değer. Genellikle ç
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=%s kullanıcı adı zaten var.
 ErrorGroupAlreadyExists=%s Grubu zaten var.
+ErrorEmailAlreadyExists=Email %s already exists.
 ErrorRecordNotFound=Kayıt bulunamadı.
 ErrorFailToCopyFile='<b>%s</b>' dosyası '<b>%s</b>' içine kopyalanamadı.
 ErrorFailToCopyDir='<b>%s</b>' dizini '<b>%s</b>' içine kopyalanamadı.
@@ -117,7 +118,7 @@ ErrorCantReadFile=Dosya '%s' okunamadı
 ErrorCantReadDir=Dizin '%s' okunamadı
 ErrorBadLoginPassword=Kullanıcı adı veya parola için hatalı değer
 ErrorLoginDisabled=Hesabınız engellendi
-ErrorFailedToRunExternalCommand=Dış komut çalıştırılamıyor. PHP sunucunuz tarafından kullanılabilir ve çalıştırılabilir olup olmadığını kontrol edin. PHP <b>Güvenli Mod</b> etkinse, komutun <b>safe_mode_exec_dir</b> parametresiyle tanımlanmış bir dizin içinde olup olmadığını kontrol edin.
+ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server user. Check also the command is not protected on shell level by a security layer like apparmor.
 ErrorFailedToChangePassword=Parola değiştirilemedi
 ErrorLoginDoesNotExists=<b>%s</b> kullanıcı adlı kullanıcı bulunamadı.
 ErrorLoginHasNoEmail=Bu kullanıcının e-posta adresi yoktur. İşlem iptal edildi.
@@ -262,6 +263,7 @@ ErrorDateIsInFuture=Error, the date can't be in the future
 ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
 ErrorAPercentIsRequired=Error, please fill in the percentage correctly
 ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
+ErrorFailedToFindEmailTemplate=Failed to find template with code name %s
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=PHP'nizdeki upload_max_filesize (%s) parametresi, post_max_size (%s) PHP parametresinden daha yüksek. Bu tutarlı bir kurulum değil.
@@ -298,3 +300,4 @@ WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So y
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
+ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
diff --git a/htdocs/langs/tr_TR/eventorganization.lang b/htdocs/langs/tr_TR/eventorganization.lang
index 60890a736ac..a295bf90631 100644
--- a/htdocs/langs/tr_TR/eventorganization.lang
+++ b/htdocs/langs/tr_TR/eventorganization.lang
@@ -1,4 +1,5 @@
 # Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+# Copyright (C) 2021		Dorian Vabre			<dorian.vabre@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
@@ -81,7 +82,10 @@ PriceOfBoothHelp=Subscription price to stand a booth
 EventOrganizationICSLink=Link ICS for events
 ConferenceOrBoothInformation=Conference Or Booth informations
 Attendees = Attendees
+DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
 #
 # Status
 #
@@ -94,8 +98,46 @@ EvntOrgCancelled = Cancelled
 #
 # Public page
 #
+SuggestForm = Suggestion page
+RegisterPage = Page for conferences or booth
+EvntOrgRegistrationHelpMessage = Here, you can vote for an event, or suggest a new conference or booth for the project
+EvntOrgRegistrationConfHelpMessage = Here, you can suggest a new conference for the project
+EvntOrgRegistrationBoothHelpMessage = Here, you can suggest a new booth for the project
+ListOfSuggestedConferences = List of suggested conferences
+ListOfSuggestedBooths = List of suggested booths
+SuggestConference = Suggest a new conference
+SuggestBooth = Suggest a booth
+ViewAndVote = View and vote for suggested events
 PublicAttendeeSubscriptionPage = Public link of registration to a conference
 MissingOrBadSecureKey = The security key is invalid or missing
-EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
-EvntOrgStartDuration = This conference starts on
-EvntOrgEndDuration =  and ends on
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference : '%s'
+EvntOrgDuration = This conference starts on %s and ends on %s.
+ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
+BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
+EventType = Etkinlik türü
+
+#
+# Vote page
+#
+EvntOrgRegistrationWelcomeMessage = Welcome on the conference or booth suggestion page.
+EvntOrgRegistrationConfWelcomeMessage = Welcome on the conference suggestion page.
+EvntOrgRegistrationBoothWelcomeMessage = Welcome on the booth suggestion page.
+EvntOrgVoteHelpMessage = Here, you can view and vote for the suggested events for the project
+VoteOk = Your vote has been accepted.
+AlreadyVoted = You have already voted for this event.
+VoteError = An error has occurred during the vote, please try again.
+
+#
+# SubscriptionOk page
+#
+SubscriptionOk = Your subscription to this conference has been validated
+#
+# Subscription validation mail
+#
+ConfAttendeeSubscriptionConfirmation = Confirmation of your subscription to a conference
+#
+# Payment page
+#
+Attendee = Attendee
+PaymentConferenceAttendee = Conference attendee payment
+PaymentBoothLocation = Booth location payment
diff --git a/htdocs/langs/tr_TR/hrm.lang b/htdocs/langs/tr_TR/hrm.lang
index 93d2a7e56da..5c1c66a8076 100644
--- a/htdocs/langs/tr_TR/hrm.lang
+++ b/htdocs/langs/tr_TR/hrm.lang
@@ -9,7 +9,7 @@ ConfirmDeleteEstablishment=Bu kuruluşu silmek istediğinizden emin misiniz?
 OpenEtablishment=Kuruluş aç
 CloseEtablishment=Kuruluş kapat
 # Dictionary
-DictionaryPublicHolidays=HRM - Resmi tatiller
+DictionaryPublicHolidays=Leave - Public holidays
 DictionaryDepartment=İKY - Departman listesi
 DictionaryFunction=HRM - Job positions
 # Module
diff --git a/htdocs/langs/tr_TR/knowledgemanagement.lang b/htdocs/langs/tr_TR/knowledgemanagement.lang
index f9f264370c1..77c5f26dc57 100644
--- a/htdocs/langs/tr_TR/knowledgemanagement.lang
+++ b/htdocs/langs/tr_TR/knowledgemanagement.lang
@@ -47,7 +47,7 @@ KnowledgeManagementArea = Knowledge Management
 # Menu
 #
 MenuKnowledgeRecord = Knowledge base
-ListOfArticles = List of articles
+ListKnowledgeRecord = List of articles
 NewKnowledgeRecord = New article
 ValidateReply = Validate solution
 KnowledgeRecords = Articles
diff --git a/htdocs/langs/tr_TR/languages.lang b/htdocs/langs/tr_TR/languages.lang
index 3d30573a595..5fe2f181776 100644
--- a/htdocs/langs/tr_TR/languages.lang
+++ b/htdocs/langs/tr_TR/languages.lang
@@ -3,6 +3,7 @@ Language_am_ET=Ethiopian
 Language_ar_AR=Arapça
 Language_ar_EG=Arabça (Mısır)
 Language_ar_SA=Arapça
+Language_ar_TN=Arabic (Tunisia)
 Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengalce
 Language_bn_IN=Bengali (India)
@@ -84,6 +85,7 @@ Language_nl_NL=Flemenkçe
 Language_pl_PL=Lehçe
 Language_pt_BR=Portekizce (Brezilya)
 Language_pt_PT=Portekizce
+Language_ro_MD=Romanian (Moldavia)
 Language_ro_RO=Romence
 Language_ru_RU=Rusça
 Language_ru_UA=Rusça (Ukrayna)
diff --git a/htdocs/langs/tr_TR/main.lang b/htdocs/langs/tr_TR/main.lang
index d62855ddf72..8c98987dae2 100644
--- a/htdocs/langs/tr_TR/main.lang
+++ b/htdocs/langs/tr_TR/main.lang
@@ -430,6 +430,7 @@ LT1IN=CGST
 LT2IN=SGST
 LT1GC=İlave kuruş
 VATRate=KDV Oranı
+RateOfTaxN=Rate of tax %s
 VATCode=Vergi Oranı kodu
 VATNPR=KDV Oranı NPR
 DefaultTaxRate=Varsayılan KDV oranı
@@ -729,6 +730,7 @@ MenuMembers=Üyeler
 MenuAgendaGoogle=Google gündemi
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr sınırı (Giriş-Ayarlar-Güvenlik menüsü):%s Kb, PHP sınırı:%s Kb
+ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
 NoFileFound=No documents uploaded
 CurrentUserLanguage=Geçerli dil
 CurrentTheme=Geçerli tema
@@ -1072,6 +1074,7 @@ ValidFrom=Şu tarihten itibaren geçerli
 ValidUntil=Şu tarihe kadar geçerli
 NoRecordedUsers=Kullanıcı yok
 ToClose=To close
+ToRefuse=To refuse
 ToProcess=İşlenecek
 ToApprove=Onaylanacak
 GlobalOpenedElemView=Genel görünüm
@@ -1126,9 +1129,11 @@ UpdateForAllLines=Update for all lines
 OnHold=Beklemede
 Civility=Civility
 AffectTag=Affect Tag
+CreateExternalUser=Create external user
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
 ConfirmCancel=Are you sure you want to cancel
+EmailMsgID=Email MsgID
diff --git a/htdocs/langs/tr_TR/members.lang b/htdocs/langs/tr_TR/members.lang
index b3807ddbc10..d9784970f18 100644
--- a/htdocs/langs/tr_TR/members.lang
+++ b/htdocs/langs/tr_TR/members.lang
@@ -213,3 +213,5 @@ SendReminderForExpiredSubscription=Send reminder by email to members when subscr
 MembershipPaid=Membership paid for current period (until %s)
 YouMayFindYourInvoiceInThisEmail=Faturanızı bu e-postanın ekinde bulabilirsiniz
 XMembersClosed=%s üye kapatıldı
+XExternalUserCreated=%s external user(s) created
+ForceMemberNature=Force member nature (Individual or Corporation)
diff --git a/htdocs/langs/tr_TR/modulebuilder.lang b/htdocs/langs/tr_TR/modulebuilder.lang
index 7ca6700d744..c3a70b67173 100644
--- a/htdocs/langs/tr_TR/modulebuilder.lang
+++ b/htdocs/langs/tr_TR/modulebuilder.lang
@@ -143,3 +143,4 @@ AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
 ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
+ImportExportProfiles=Import and export profiles
diff --git a/htdocs/langs/tr_TR/mrp.lang b/htdocs/langs/tr_TR/mrp.lang
index 1c581bebb72..574ddefd491 100644
--- a/htdocs/langs/tr_TR/mrp.lang
+++ b/htdocs/langs/tr_TR/mrp.lang
@@ -8,12 +8,12 @@ MenuBOM=Gereç Cetvelleri
 LatestBOMModified=En son %s değiştirilen gereç cetveli
 LatestMOModified=En son %s değiştirilen Üretim Emri
 Bom=Gereç Cetvelleri
-BillOfMaterials=Bill of Material
+BillOfMaterials=Bill of Materials
 BOMsSetup=BOM (Ürün Ağacı) modülü kurulumu
 ListOfBOMs=Gereç cetveli listesi - BOM
 ListOfManufacturingOrders=Üretim Emirleri Listesi
-NewBOM=Yeni Gereç Cetveli
-ProductBOMHelp=Product to create with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
+NewBOM=New bill of materials
+ProductBOMHelp=Product to create (or disassemble) with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
 BOMsNumberingModules=BOM numbering templates
 BOMsModelModule=BOM document templates
 MOsNumberingModules=MO numbering templates
@@ -22,7 +22,7 @@ FreeLegalTextOnBOMs=BOM belgelerindeki serbest metin
 WatermarkOnDraftBOMs=Watermark on draft BOM
 FreeLegalTextOnMOs=Free text on document of MO
 WatermarkOnDraftMOs=Watermark on draft MO
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials %s ?
 ConfirmCloneMo=%s Üretim Emrini klonlamak istediğinizden emin misiniz?
 ManufacturingEfficiency=Üretim verimliliği
 ConsumptionEfficiency=Consumption efficiency
@@ -30,8 +30,8 @@ ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the produc
 ValueOfMeansLossForProductProduced=Value of 0.95 means an average of 5%% of loss of produced product
 DeleteBillOfMaterials=Delete Bill Of Materials
 DeleteMo=Üretim Emri Sil
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Materials?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Materials?
 MenuMRP=Üretim Emirleri
 NewMO=Yeni Üretim Emiri
 QtyToProduce=Qty to produce
@@ -39,7 +39,7 @@ DateStartPlannedMo=Date start planned
 DateEndPlannedMo=Date end planned
 KeepEmptyForAsap=Empty means 'As Soon As Possible'
 EstimatedDuration=Estimated duration
-EstimatedDurationDesc=Estimated duration to manufacture this product using this BOM
+EstimatedDurationDesc=Estimated duration to manufacture (or disassemble) this product using this BOM
 ConfirmValidateBom= <strong> %s </strong> referanslı BOM'u doğrulamak istediğinizden emin misiniz (yeni Üretim Emirleri oluşturmak için kullanabilirsiniz)
 ConfirmCloseBom=Bu gereç cetvelini iptal etmek istediğinizden emin misiniz (artık yeni Üretim Emirleri oluşturmak için kullanamayacaksınız)?
 ConfirmReopenBom=Bu gereç cetvelini yeniden açmak istediğinizden emin misiniz (yeni Üretim Emirleri oluşturmak için kullanabilirsiniz)
@@ -63,13 +63,14 @@ ConsumeAndProduceAll=Consume and Produce All
 Manufactured=Manufactured
 TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
 ForAQuantityOf=For a quantity to produce of %s
+ForAQuantityToConsumeOf=For a quantity to disassemble of %s
 ConfirmValidateMo=Bu Üretim Emrini doğrulamak istediğinizden emin misiniz?
 ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
 ProductionForRef=Production of %s
 AutoCloseMO=Tüketim ve üretim miktarlarına ulaşıldığında Üretim Emrini otomatik olarak kapatın
 NoStockChangeOnServices=No stock change on services
 ProductQtyToConsumeByMO=Product quantity still to consume by open MO
-ProductQtyToProduceByMO=Product quentity still to produce by open MO
+ProductQtyToProduceByMO=Product quantity still to produce by open MO
 AddNewConsumeLines=Add new line to consume
 ProductsToConsume=Products to consume
 ProductsToProduce=Products to produce
@@ -83,15 +84,13 @@ Workstations=Workstations
 WorkstationsDescription=Workstations management
 WorkstationSetup = Workstations setup
 WorkstationSetupPage = Workstations setup page
-WorkstationAbout = About Workstation
-WorkstationAboutPage = Workstations about page
 WorkstationList=Workstation list
 WorkstationCreate=Add new workstation
 ConfirmEnableWorkstation=Are you sure you want to enable workstation <b>%s</b> ?
 EnableAWorkstation=Enable a workstation
 ConfirmDisableWorkstation=Are you sure you want to disable workstation <b>%s</b> ?
 DisableAWorkstation=Disable a workstation
-DeleteWorkstation=Supprimer
+DeleteWorkstation=Sil
 NbOperatorsRequired=Number of operators required
 THMOperatorEstimated=Estimated operator THM
 THMMachineEstimated=Estimated machine THM
diff --git a/htdocs/langs/tr_TR/orders.lang b/htdocs/langs/tr_TR/orders.lang
index c257cf62b83..818e0f2d862 100644
--- a/htdocs/langs/tr_TR/orders.lang
+++ b/htdocs/langs/tr_TR/orders.lang
@@ -11,6 +11,7 @@ OrderDate=Sipariş Tarihi
 OrderDateShort=Sipariş tarihi
 OrderToProcess=İşlenecek sipariş
 NewOrder=Yeni sipariş
+NewSupplierOrderShort=Yeni sipariş
 NewOrderSupplier=Yeni Satın Alma Siparişi
 ToOrder=Sipariş yap
 MakeOrder=Sipariş yap
@@ -73,6 +74,7 @@ DeleteOrder=Sipariş sil
 CancelOrder=Siparişi iptal et
 OrderReopened= Sipariş %s yeniden açıldı
 AddOrder=Sipariş oluştur
+AddSupplierOrderShort=Sipariş oluştur
 AddPurchaseOrder=Satınalma siparişi oluştur
 AddToDraftOrders=Taslak siparişe ekle
 ShowOrder=Siparişi göster
diff --git a/htdocs/langs/tr_TR/other.lang b/htdocs/langs/tr_TR/other.lang
index 61054fab29e..8d0776849f3 100644
--- a/htdocs/langs/tr_TR/other.lang
+++ b/htdocs/langs/tr_TR/other.lang
@@ -129,6 +129,7 @@ ClosedByLogin=Kapatanın kullanıcı adı
 FileWasRemoved=%s dosyası kaldırıldı
 DirWasRemoved=%s dizini kaldırıldı
 FeatureNotYetAvailable=Özellik henüz bu sürümde yoktur
+FeatureNotAvailableOnDevicesWithoutMouse=Feature not available on devices without mouse
 FeaturesSupported=Desteklenen özellikler
 Width=Genişlik
 Height=Yükseklik
@@ -263,7 +264,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
-PrefixSession=Prefix for session ID
+SuffixSessionName=Suffix for session name
 
 ##### Export #####
 ExportsArea=Dışa aktarma alanı
diff --git a/htdocs/langs/tr_TR/partnership.lang b/htdocs/langs/tr_TR/partnership.lang
index e35e657629e..9774cb8741f 100644
--- a/htdocs/langs/tr_TR/partnership.lang
+++ b/htdocs/langs/tr_TR/partnership.lang
@@ -16,41 +16,72 @@
 #
 # Generic
 #
-ModulePartnershipName = Partnership management
-PartnershipDescription = Module Partnership management
+ModulePartnershipName=Partnership management
+PartnershipDescription=Module Partnership management
 PartnershipDescriptionLong= Module Partnership management
 
+AddPartnership=Add partnership
+CancelPartnershipForExpiredMembers=Partnership: Cancel partnership of members with expired subscriptions
+PartnershipCheckBacklink=Partnership: Check referring backlink
+
 #
 # Menu
 #
-NewPartnership = New Partnership
-ListOfPartnerships = List of partnership
+NewPartnership=New Partnership
+ListOfPartnerships=List of partnership
 
 #
 # Admin page
 #
-PartnershipSetup = Partnership setup
-PartnershipAbout = About Partnership
-PartnershipAboutPage = Partnership about page
-
+PartnershipSetup=Partnership setup
+PartnershipAbout=About Partnership
+PartnershipAboutPage=Partnership about page
+partnershipforthirdpartyormember=Partner status must be set on a 'thirdparty' or a 'member'
+PARTNERSHIP_IS_MANAGED_FOR=Partnership managed for
+PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks to check
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb of days before cancelling status of a partnership when a subscription has expired
+ReferingWebsiteCheck=Check of website referring
+ReferingWebsiteCheckDesc=You can enable a feature to check that your partners has added a backlink to your website domains on their own website.
 
 #
 # Object
 #
+DeletePartnership=Delete a partnership
+PartnershipDedicatedToThisThirdParty=Partnership dedicated to this third party
+PartnershipDedicatedToThisMember=Partnership dedicated to this member
 DatePartnershipStart=Başlangıç tarihi
 DatePartnershipEnd=Bitiş tarihi
+ReasonDecline=Decline reason
+ReasonDeclineOrCancel=Decline reason
+PartnershipAlreadyExist=Partnership already exist
+ManagePartnership=Manage partnership
+BacklinkNotFoundOnPartnerWebsite=Backlink not found on partner website
+ConfirmClosePartnershipAsk=Are you sure you want to cancel this partnership?
+PartnershipType=Partnership type
 
 #
 # Template Mail
 #
+SendingEmailOnPartnershipWillSoonBeCanceled=Partnership will soon be canceled
+SendingEmailOnPartnershipRefused=Partnership refused
+SendingEmailOnPartnershipAccepted=Partnership accepted
+SendingEmailOnPartnershipCanceled=Partnership canceled
 
+YourPartnershipWillSoonBeCanceledTopic=Partnership will soon be canceled
+YourPartnershipRefusedTopic=Partnership refused
+YourPartnershipAcceptedTopic=Partnership accepted
+YourPartnershipCanceledTopic=Partnership canceled
+
+YourPartnershipWillSoonBeCanceledContent=We inform you that your partnership will soon be canceled (Backlink not found)
+YourPartnershipRefusedContent=We inform you that your partnership request has been refused.
+YourPartnershipAcceptedContent=We inform you that your partnership request has been accepted.
+YourPartnershipCanceledContent=We inform you that your partnership has been canceled.
 
 #
 # Status
 #
-PartnershipDraft = Ödeme emri
-PartnershipAccepted = Kabul edildi
-PartnershipRefused = Reddedildi
-PartnershipCanceled = İptal edildi
-
+PartnershipDraft=Ödeme emri
+PartnershipAccepted=Kabul edildi
+PartnershipRefused=Reddedildi
+PartnershipCanceled=İptal edildi
 PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/tr_TR/productbatch.lang b/htdocs/langs/tr_TR/productbatch.lang
index d74092c0f1a..e59b4b50a32 100644
--- a/htdocs/langs/tr_TR/productbatch.lang
+++ b/htdocs/langs/tr_TR/productbatch.lang
@@ -1,4 +1,4 @@
-# ProductBATCH language file - en_US - ProductBATCH
+# ProductBATCH language file - Source file is en_US - ProductBATCH
 ManageLotSerial=Parti/Seri numarası kullan
 ProductStatusOnBatch=Yes (lot required)
 ProductStatusOnSerial=Yes (unique serial number required)
@@ -33,3 +33,13 @@ CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+LifeTime=Life span (in days)
+EndOfLife=End of life
+ManufacturingDate=Manufacturing date
+DestructionDate=Destruction date
+FirstUseDate=First use date
+QCFrequency=Quality control frequency (in days)
+
+#Traceability - qc status
+OutOfOrder=Out of order
+InWorkingOrder=In working order
diff --git a/htdocs/langs/tr_TR/products.lang b/htdocs/langs/tr_TR/products.lang
index fa96dffea66..d8b6348e453 100644
--- a/htdocs/langs/tr_TR/products.lang
+++ b/htdocs/langs/tr_TR/products.lang
@@ -396,3 +396,5 @@ ActionAvailableOnVariantProductOnly=Eylem yalnızca ürün değişkeninde mevcut
 ProductsPricePerCustomer=Müşteri başına ürün fiyatları
 ProductSupplierExtraFields=Ek Nitelikler (Tedarikçi Fiyatları)
 DeleteLinkedProduct=Kombinasyonla bağlantılı alt ürünü silin
+PMPValue=Ağırlıklı ortalama fiyat
+PMPValueShort=AOF
diff --git a/htdocs/langs/tr_TR/projects.lang b/htdocs/langs/tr_TR/projects.lang
index be261f882c6..b421d91d87d 100644
--- a/htdocs/langs/tr_TR/projects.lang
+++ b/htdocs/langs/tr_TR/projects.lang
@@ -267,9 +267,11 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=Yeni fatura
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+OneLinePerTimeSpentLine=One line for each time spent declaration
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
 AddPersonToTask=Add also to tasks
 UsageOrganizeEvent=Usage: Event Organization
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
+SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
diff --git a/htdocs/langs/tr_TR/receptions.lang b/htdocs/langs/tr_TR/receptions.lang
index d6755f4e8db..d0fad3751f1 100644
--- a/htdocs/langs/tr_TR/receptions.lang
+++ b/htdocs/langs/tr_TR/receptions.lang
@@ -44,4 +44,4 @@ ValidateOrderFirstBeforeReception=You must first validate the order before being
 ReceptionsNumberingModules=Numbering module for receptions
 ReceptionsReceiptModel=Document templates for receptions
 NoMorePredefinedProductToDispatch=No more predefined products to dispatch
-
+ReceptionExist=A reception exists
diff --git a/htdocs/langs/tr_TR/stocks.lang b/htdocs/langs/tr_TR/stocks.lang
index ed5884d3da8..2cfdc3bbde2 100644
--- a/htdocs/langs/tr_TR/stocks.lang
+++ b/htdocs/langs/tr_TR/stocks.lang
@@ -56,8 +56,6 @@ UnitPurchaseValue=Alış birim fiyatı
 StockTooLow=Stok çok düşük
 StockLowerThanLimit=Stok uyarı limitinden (%s) düşük
 EnhancedValue=Değer
-PMPValue=Ağırlıklı ortalama fiyat
-PMPValueShort=AOF
 EnhancedValueOfWarehouses=Depolar değeri
 UserWarehouseAutoCreate=Kullanıcı oluştururken otomatik olarak bir kullanıcı deposu oluştur
 AllowAddLimitStockByWarehouse=Her bir ürün için minimum ve istenen stok değerini yönetmenin yanı sıra her bir eşleştirme (ürün-depo) için de minimum ve istenen stok değerini de yönetin
@@ -251,7 +249,10 @@ SelectAStockMovementFileToImport=select a stock movement file to import
 InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
 LabelOfInventoryMovemement=Inventory %s
 ReOpen=Yeniden aç
-ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock to the real qty you entered into the inventory.
 ObjectNotFound=%s not found
 MakeMovementsAndClose=Generate movements and close
 AutofillWithExpected=Fill real quantity with expected quantity
+ShowAllBatchByDefault=By default, show batch details on product "stock" tab
+CollapseBatchDetailHelp=You can set batch detail default display in stocks module configuration
+FieldCannotBeNegative=Field "%s" cannot be negative
diff --git a/htdocs/langs/tr_TR/ticket.lang b/htdocs/langs/tr_TR/ticket.lang
index 3e9d1d27461..e2535207a54 100644
--- a/htdocs/langs/tr_TR/ticket.lang
+++ b/htdocs/langs/tr_TR/ticket.lang
@@ -304,7 +304,7 @@ BoxLastModifiedTicket=En son değiştirilen destek bildirimleri
 BoxLastModifiedTicketDescription=Değiştirilen son %s destek bildirimi
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=Yakın zamanda değiştirilmiş destek bildirimi yok
-BoxTicketType=Number of open tickets by type
+BoxTicketType=Distribution of open tickets by type
 BoxTicketSeverity=Number of open tickets by severity
 BoxNoTicketSeverity=No tickets opened
 BoxTicketLastXDays=Number of new tickets by days the last %s days
diff --git a/htdocs/langs/uk_UA/accountancy.lang b/htdocs/langs/uk_UA/accountancy.lang
index ef34f444156..905d8175026 100644
--- a/htdocs/langs/uk_UA/accountancy.lang
+++ b/htdocs/langs/uk_UA/accountancy.lang
@@ -158,7 +158,7 @@ ACCOUNTING_LENGTH_AACCOUNT=Length of the third-party accounting accounts (If you
 ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of an accounting account. Needed by some countries (like Switzerland). If set to off (default), you can set the following two parameters to ask the application to add virtual zeros.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties, break ability to search on a part of value)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
@@ -328,6 +328,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountanc
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
+NotifiedExportDate=Notified export date (modification of the entries will not be possible)
+NotifiedValidationDate=Validation of the entries (modification or deletion of the entries will not be possible)
+ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=Export draft journal
 Modelcsv=Model of export
 Selectmodelcsv=Select a model of export
diff --git a/htdocs/langs/uk_UA/admin.lang b/htdocs/langs/uk_UA/admin.lang
index 9f38545d660..4489f4f66a8 100644
--- a/htdocs/langs/uk_UA/admin.lang
+++ b/htdocs/langs/uk_UA/admin.lang
@@ -221,8 +221,8 @@ NotCompatible=Цей модуль не сумісний з вашою версі
 CompatibleAfterUpdate=Цей модуль вимагає оновлення версії Dolibarr до %s (Мін %s - Макс %s).
 SeeInMarkerPlace=Дивіться у магазині 
 SeeSetupOfModule=Див. налаштування модуля %s
+SetOptionTo=Set option <b>%s</b> to %s
 Updated=Оновлено
-Nouveauté=Новинка
 AchatTelechargement=Придбати / завантажити
 GoModuleSetupArea=Щоб розгорнути/встановити новий модуль, перейдіть на сторінку встановлення модулів: <a href="%s"> %s </a>.
 DoliStoreDesc=DoliStore, офіційне місце для зовнішніх модулів Dolibarr ERP / CRM
@@ -399,6 +399,7 @@ SecurityToken=Ключ до захищених URL-адрес
 NoSmsEngine=Не встановлено провайдера послуг для надсилання SMS. Модулі підтримки провайдерів послуг может знайти тут: %s
 PDF=PDF
 PDFDesc=Глобальні налаштування генерації PDF
+PDFOtherDesc=PDF Option specific to some modules
 PDFAddressForging=Правила вибору адреси
 HideAnyVATInformationOnPDF=Сховати всю інформацію щодо податків та зборів
 PDFRulesForSalesTax=Правила податків та зборів
@@ -561,7 +562,7 @@ Module53Desc=Management of Services
 Module54Name=Contracts/Subscriptions
 Module54Desc=Management of contracts (services or recurring subscriptions)
 Module55Name=Barcodes
-Module55Desc=Barcode management
+Module55Desc=Barcode or QR code management
 Module56Name=Payment by credit transfer
 Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
 Module57Name=Payments by Direct Debit
@@ -848,10 +849,10 @@ Permission402=Create/modify discounts
 Permission403=Validate discounts
 Permission404=Delete discounts
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries (yours and subordinates)
-Permission512=Create/modify payments of salaries
-Permission514=Delete payments of salaries
-Permission517=Read payments of salaries of everybody
+Permission511=Read salaries and payments (yours and subordinates)
+Permission512=Create/modify salaries and payments
+Permission514=Delete salaries and payments
+Permission517=Read salaries and payments everybody
 Permission519=Export salaries
 Permission520=Read Loans
 Permission522=Create/modify loans
@@ -965,6 +966,8 @@ Permission23003=Delete Scheduled job
 Permission23004=Execute Scheduled job
 Permission50101=Use Point of Sale (SimplePOS)
 Permission50151=Use Point of Sale (TakePOS)
+Permission50152=Edit sales lines
+Permission50153=Edit ordered sales lines
 Permission50201=Read transactions
 Permission50202=Import transactions
 Permission50330=Read objects of Zapier
@@ -1039,11 +1042,12 @@ DictionaryMeasuringUnits=Measuring Units
 DictionarySocialNetworks=Соціальні мережі
 DictionaryProspectStatus=Prospect status for companies
 DictionaryProspectContactStatus=Prospect status for contacts
-DictionaryHolidayTypes=Types of leave
+DictionaryHolidayTypes=Leave - Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
 DictionaryTransportMode=Intracomm report - Transport mode
+DictionaryBatchStatus=Product lot/serial Quality Control status
 TypeOfUnit=Type of unit
 SetupSaved=Setup saved
 SetupNotSaved=Setup not saved
@@ -1187,7 +1191,7 @@ SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of m
 SetupDescription5=Other Setup menu entries manage optional parameters.
 AuditedSecurityEvents=Security events that are audited
 NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
-Audit=Audit
+Audit=Security events
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
 InfoOS=About OS
@@ -1319,9 +1323,12 @@ ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
 NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
+ComboListOptim=Combo list loading optimization
 SearchOptim=Search optimization
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
-YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
+YouHaveXObjectUseComboOptim=You have %s %s in the database. You can go into setup of module to enable loading of combo list on key pressed event.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other.
+YouHaveXObjectUseSearchOptimDesc=This limits the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to %s in Home-Setup-Other.
 BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
 BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
 PHPModuleLoaded=PHP component %s is loaded
@@ -1433,6 +1440,7 @@ MemberMainOptions=Main options
 AdherentLoginRequired= Manage a Login for each member
 AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
+MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
 MembersDocModules=Document templates for documents generated from member record
@@ -1763,7 +1771,7 @@ AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting men
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
-AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the scheduled job %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
@@ -1979,6 +1987,8 @@ 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_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add picture on proposal line
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add electronic sign in PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
@@ -2096,7 +2106,6 @@ PDF_SHOW_PROJECT=Show project on document
 ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
-FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
@@ -2120,12 +2129,18 @@ ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by
 MailToSendEventOrganization=Event Organization
 AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
 YouShouldDisablePHPFunctions=You should disable PHP functions
-IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands in custom code, you shoud disable PHP functions
+PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
+NotRecommended=Not recommanded
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
 ModuleUpdateAvailable=An update is available
 NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
+RandomlySelectedIfSeveral=Randomly selected if several pictures are available
+DatabasePasswordObfuscated=Database password is obfuscated in conf file
+DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
diff --git a/htdocs/langs/uk_UA/agenda.lang b/htdocs/langs/uk_UA/agenda.lang
index 6798f1d9d63..a1dbb1baff0 100644
--- a/htdocs/langs/uk_UA/agenda.lang
+++ b/htdocs/langs/uk_UA/agenda.lang
@@ -4,7 +4,7 @@ Actions=Події
 Agenda=Повістка дня
 TMenuAgenda=Повістка дня
 Agendas=Повістки денні
-LocalAgenda=Внутрішній календар
+LocalAgenda=Default calendar
 ActionsOwnedBy=Event owned by
 ActionsOwnedByShort=Owner
 AffectedTo=Призначено
@@ -14,13 +14,13 @@ EventsNb=Кількість подій
 ListOfActions=Список подій
 EventReports=Event reports
 Location=Розташування
-ToUserOfGroup=Event assigned to any user in group
+ToUserOfGroup=Event assigned to any user in the group
 EventOnFullDay=Подія на цілий день(дні)
 MenuToDoActions=Усі невиконані події
 MenuDoneActions=All terminated events
 MenuToDoMyActions=My incomplete events
 MenuDoneMyActions=My terminated events
-ListOfEvents=List of events (internal calendar)
+ListOfEvents=List of events (default calendar)
 ActionsAskedBy=Events reported by
 ActionsToDoBy=Events assigned to
 ActionsDoneBy=Events done by
@@ -38,6 +38,7 @@ ActionsEvents=Events for which Dolibarr will create an action in agenda automati
 EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Third party %s created
+COMPANY_MODIFYInDolibarr=Third party %s modified
 COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=Contract %s validated
 CONTRACT_DELETEInDolibarr=Contract %s deleted
@@ -87,6 +88,7 @@ OrderDeleted=Order deleted
 InvoiceDeleted=Invoice deleted
 DraftInvoiceDeleted=Draft invoice deleted
 CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_MODIFYInDolibarr=Contact %s modified
 CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Product %s created
 PRODUCT_MODIFYInDolibarr=Product %s modified
@@ -119,6 +121,7 @@ MRP_MO_UNVALIDATEInDolibarr=MO set to draft status
 MRP_MO_PRODUCEDInDolibarr=MO produced
 MRP_MO_DELETEInDolibarr=MO deleted
 MRP_MO_CANCELInDolibarr=MO canceled
+PAIDInDolibarr=%s paid
 ##### End agenda events #####
 AgendaModelModule=Document templates for event
 DateActionStart=Start date
@@ -130,7 +133,7 @@ AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to use
 AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
 AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic events.
 AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> to include events of holidays.
-AgendaShowBirthdayEvents=Show birthdays of contacts
+AgendaShowBirthdayEvents=Birthdays of contacts
 AgendaHideBirthdayEvents=Hide birthdays of contacts
 Busy=Busy
 ExportDataset_event1=List of agenda events
@@ -152,6 +155,7 @@ ActionType=Event type
 DateActionBegin=Start event date
 ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b>?
 RepeatEvent=Repeat event
+OnceOnly=Once only
 EveryWeek=Every week
 EveryMonth=Every month
 DayOfMonth=Day of month
@@ -165,4 +169,4 @@ TimeType=Duration type
 ReminderType=Callback type
 AddReminder=Create an automatic reminder notification for this event
 ErrorReminderActionCommCreation=Error creating the reminder notification for this event
-BrowserPush=Browser Notification
+BrowserPush=Browser Popup Notification
diff --git a/htdocs/langs/uk_UA/bills.lang b/htdocs/langs/uk_UA/bills.lang
index a6760dfe02e..f0768b2c175 100644
--- a/htdocs/langs/uk_UA/bills.lang
+++ b/htdocs/langs/uk_UA/bills.lang
@@ -259,6 +259,7 @@ DateMaxPayment=Payment due on
 DateInvoice=Дата рахунку-фактури
 DatePointOfTax=Point of tax
 NoInvoice=Немає рахунків-фактур
+NoOpenInvoice=No open invoice
 ClassifyBill=Класифікувати рахунок-фактуру
 SupplierBillsToPay=Unpaid vendor invoices
 CustomerBillsUnpaid=Несплачені рахунки клієнта
@@ -589,3 +590,4 @@ FacParentLine=Invoice Line Parent
 SituationTotalRayToRest=Remainder to pay without taxe
 PDFSituationTitle=Situation n° %d
 SituationTotalProgress=Total progress %d %%
+SearchUnpaidInvoicesWithDueDate=Search unpaid invoices with a due date = %s
diff --git a/htdocs/langs/uk_UA/cashdesk.lang b/htdocs/langs/uk_UA/cashdesk.lang
index 94e3e33ff42..e6fad46fd10 100644
--- a/htdocs/langs/uk_UA/cashdesk.lang
+++ b/htdocs/langs/uk_UA/cashdesk.lang
@@ -102,7 +102,7 @@ CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal numb
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
 SaleStartedAt=Sale started at %s
-ControlCashOpening=Control cash popup at opening POS
+ControlCashOpening=Open the "Control cash" popup when opening the POS
 CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -126,5 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
-ShowPriceHT = Display the price excluding tax column
-ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
+ShowPriceHT = Display the column with the price excluding tax (on screen)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
diff --git a/htdocs/langs/uk_UA/compta.lang b/htdocs/langs/uk_UA/compta.lang
index f7e2340b7c2..8a79e2a0af9 100644
--- a/htdocs/langs/uk_UA/compta.lang
+++ b/htdocs/langs/uk_UA/compta.lang
@@ -286,3 +286,9 @@ ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
 IncludeLoansInResults = Include loans in reports
+InvoiceLate30Days = Invoices late > 30 days
+InvoiceLate15Days = Invoices late > 15 days
+InvoiceLateMinus15Days = Invoices late
+InvoiceNotLate = To be collected < 15 days
+InvoiceNotLate15Days = To be collected in 15 days
+InvoiceNotLate30Days = To be collected in 30 days
diff --git a/htdocs/langs/uk_UA/cron.lang b/htdocs/langs/uk_UA/cron.lang
index 46c3b30f128..c0d7c18bb44 100644
--- a/htdocs/langs/uk_UA/cron.lang
+++ b/htdocs/langs/uk_UA/cron.lang
@@ -60,7 +60,7 @@ CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
 CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Disable
-CronTaskInactive=This job is disabled
+CronTaskInactive=This job is disabled (not scheduled)
 CronId=Id
 CronClassFile=Filename with class
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example 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>
diff --git a/htdocs/langs/uk_UA/errors.lang b/htdocs/langs/uk_UA/errors.lang
index 9b14b5ad1d2..670f8c7a6bc 100644
--- a/htdocs/langs/uk_UA/errors.lang
+++ b/htdocs/langs/uk_UA/errors.lang
@@ -11,6 +11,7 @@ ErrorBadValueForParamNotAString=Bad value for your parameter. It appends general
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s already exists.
 ErrorGroupAlreadyExists=Group %s already exists.
+ErrorEmailAlreadyExists=Email %s already exists.
 ErrorRecordNotFound=Record not found.
 ErrorFailToCopyFile=Failed to copy file '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
@@ -117,7 +118,7 @@ ErrorCantReadFile=Failed to read file '%s'
 ErrorCantReadDir=Failed to read directory '%s'
 ErrorBadLoginPassword=Bad value for login or password
 ErrorLoginDisabled=Your account has been disabled
-ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server. If PHP <b>Safe Mode</b> is enabled, check that command is inside a directory defined by parameter <b>safe_mode_exec_dir</b>.
+ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server user. Check also the command is not protected on shell level by a security layer like apparmor.
 ErrorFailedToChangePassword=Failed to change password
 ErrorLoginDoesNotExists=User with login <b>%s</b> could not be found.
 ErrorLoginHasNoEmail=This user has no email address. Process aborted.
@@ -262,6 +263,7 @@ ErrorDateIsInFuture=Error, the date can't be in the future
 ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
 ErrorAPercentIsRequired=Error, please fill in the percentage correctly
 ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
+ErrorFailedToFindEmailTemplate=Failed to find template with code name %s
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -298,3 +300,4 @@ WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So y
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
+ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
diff --git a/htdocs/langs/uk_UA/eventorganization.lang b/htdocs/langs/uk_UA/eventorganization.lang
index 87a5de3d484..1164a61e175 100644
--- a/htdocs/langs/uk_UA/eventorganization.lang
+++ b/htdocs/langs/uk_UA/eventorganization.lang
@@ -1,4 +1,5 @@
 # Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+# Copyright (C) 2021		Dorian Vabre			<dorian.vabre@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
@@ -81,7 +82,10 @@ PriceOfBoothHelp=Subscription price to stand a booth
 EventOrganizationICSLink=Link ICS for events
 ConferenceOrBoothInformation=Conference Or Booth informations
 Attendees = Attendees
+DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
 #
 # Status
 #
@@ -94,8 +98,46 @@ EvntOrgCancelled = Cancelled
 #
 # Public page
 #
+SuggestForm = Suggestion page
+RegisterPage = Page for conferences or booth
+EvntOrgRegistrationHelpMessage = Here, you can vote for an event, or suggest a new conference or booth for the project
+EvntOrgRegistrationConfHelpMessage = Here, you can suggest a new conference for the project
+EvntOrgRegistrationBoothHelpMessage = Here, you can suggest a new booth for the project
+ListOfSuggestedConferences = List of suggested conferences
+ListOfSuggestedBooths = List of suggested booths
+SuggestConference = Suggest a new conference
+SuggestBooth = Suggest a booth
+ViewAndVote = View and vote for suggested events
 PublicAttendeeSubscriptionPage = Public link of registration to a conference
 MissingOrBadSecureKey = The security key is invalid or missing
-EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
-EvntOrgStartDuration = This conference starts on
-EvntOrgEndDuration =  and ends on
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference : '%s'
+EvntOrgDuration = This conference starts on %s and ends on %s.
+ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
+BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
+EventType = Event type
+
+#
+# Vote page
+#
+EvntOrgRegistrationWelcomeMessage = Welcome on the conference or booth suggestion page.
+EvntOrgRegistrationConfWelcomeMessage = Welcome on the conference suggestion page.
+EvntOrgRegistrationBoothWelcomeMessage = Welcome on the booth suggestion page.
+EvntOrgVoteHelpMessage = Here, you can view and vote for the suggested events for the project
+VoteOk = Your vote has been accepted.
+AlreadyVoted = You have already voted for this event.
+VoteError = An error has occurred during the vote, please try again.
+
+#
+# SubscriptionOk page
+#
+SubscriptionOk = Your subscription to this conference has been validated
+#
+# Subscription validation mail
+#
+ConfAttendeeSubscriptionConfirmation = Confirmation of your subscription to a conference
+#
+# Payment page
+#
+Attendee = Attendee
+PaymentConferenceAttendee = Conference attendee payment
+PaymentBoothLocation = Booth location payment
diff --git a/htdocs/langs/uk_UA/hrm.lang b/htdocs/langs/uk_UA/hrm.lang
index 3b8f137e103..da098e10bdb 100644
--- a/htdocs/langs/uk_UA/hrm.lang
+++ b/htdocs/langs/uk_UA/hrm.lang
@@ -9,7 +9,7 @@ ConfirmDeleteEstablishment=Are you sure you wish to delete this establishment?
 OpenEtablishment=Open establishment
 CloseEtablishment=Close establishment
 # Dictionary
-DictionaryPublicHolidays=HRM - Public holidays
+DictionaryPublicHolidays=Leave - Public holidays
 DictionaryDepartment=HRM - Department list
 DictionaryFunction=HRM - Job positions
 # Module
diff --git a/htdocs/langs/uk_UA/knowledgemanagement.lang b/htdocs/langs/uk_UA/knowledgemanagement.lang
index b0a14cb4840..8aa25200226 100644
--- a/htdocs/langs/uk_UA/knowledgemanagement.lang
+++ b/htdocs/langs/uk_UA/knowledgemanagement.lang
@@ -47,7 +47,7 @@ KnowledgeManagementArea = Knowledge Management
 # Menu
 #
 MenuKnowledgeRecord = Knowledge base
-ListOfArticles = List of articles
+ListKnowledgeRecord = List of articles
 NewKnowledgeRecord = New article
 ValidateReply = Validate solution
 KnowledgeRecords = Articles
diff --git a/htdocs/langs/uk_UA/languages.lang b/htdocs/langs/uk_UA/languages.lang
index 40a7330e156..47156a02965 100644
--- a/htdocs/langs/uk_UA/languages.lang
+++ b/htdocs/langs/uk_UA/languages.lang
@@ -3,6 +3,7 @@ Language_am_ET=Ethiopian
 Language_ar_AR=Арабська
 Language_ar_EG=Арабська (Єгипет)
 Language_ar_SA=Арабська
+Language_ar_TN=Arabic (Tunisia)
 Language_az_AZ=Azerbaijani
 Language_bn_BD=Бенгальська
 Language_bn_IN=Bengali (India)
@@ -84,6 +85,7 @@ Language_nl_NL=Dutch
 Language_pl_PL=Польський
 Language_pt_BR=Португальська (Бразилія)
 Language_pt_PT=Португальська
+Language_ro_MD=Romanian (Moldavia)
 Language_ro_RO=Румунська
 Language_ru_RU=Русский
 Language_ru_UA=Російський (Україна)
diff --git a/htdocs/langs/uk_UA/main.lang b/htdocs/langs/uk_UA/main.lang
index 70578c88f31..7583ada65b5 100644
--- a/htdocs/langs/uk_UA/main.lang
+++ b/htdocs/langs/uk_UA/main.lang
@@ -430,6 +430,7 @@ LT1IN=CGST
 LT2IN=SGST
 LT1GC=Additionnal cents
 VATRate=Tax Rate
+RateOfTaxN=Rate of tax %s
 VATCode=Tax Rate code
 VATNPR=Tax Rate NPR
 DefaultTaxRate=Default tax rate
@@ -729,6 +730,7 @@ MenuMembers=Members
 MenuAgendaGoogle=Google agenda
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
+ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
 NoFileFound=No documents uploaded
 CurrentUserLanguage=Current language
 CurrentTheme=Current theme
@@ -1072,6 +1074,7 @@ ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
 ToClose=To close
+ToRefuse=To refuse
 ToProcess=To process
 ToApprove=To approve
 GlobalOpenedElemView=Global view
@@ -1126,9 +1129,11 @@ UpdateForAllLines=Update for all lines
 OnHold=On hold
 Civility=Civility
 AffectTag=Affect Tag
+CreateExternalUser=Create external user
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
 ConfirmCancel=Are you sure you want to cancel
+EmailMsgID=Email MsgID
diff --git a/htdocs/langs/uk_UA/members.lang b/htdocs/langs/uk_UA/members.lang
index fede3a71083..bd43c51c6ee 100644
--- a/htdocs/langs/uk_UA/members.lang
+++ b/htdocs/langs/uk_UA/members.lang
@@ -213,3 +213,5 @@ SendReminderForExpiredSubscription=Send reminder by email to members when subscr
 MembershipPaid=Membership paid for current period (until %s)
 YouMayFindYourInvoiceInThisEmail=You may find your invoice attached to this email
 XMembersClosed=%s member(s) closed
+XExternalUserCreated=%s external user(s) created
+ForceMemberNature=Force member nature (Individual or Corporation)
diff --git a/htdocs/langs/uk_UA/modulebuilder.lang b/htdocs/langs/uk_UA/modulebuilder.lang
index b9019a9a9d3..fe54a4c332f 100644
--- a/htdocs/langs/uk_UA/modulebuilder.lang
+++ b/htdocs/langs/uk_UA/modulebuilder.lang
@@ -143,3 +143,4 @@ AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
 ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
+ImportExportProfiles=Import and export profiles
diff --git a/htdocs/langs/uk_UA/mrp.lang b/htdocs/langs/uk_UA/mrp.lang
index ec999a473a4..2414a92cefb 100644
--- a/htdocs/langs/uk_UA/mrp.lang
+++ b/htdocs/langs/uk_UA/mrp.lang
@@ -8,12 +8,12 @@ MenuBOM=Bills of material
 LatestBOMModified=Latest %s Bills of materials modified
 LatestMOModified=Latest %s Manufacturing Orders modified
 Bom=Bills of Material
-BillOfMaterials=Bill of Material
+BillOfMaterials=Bill of Materials
 BOMsSetup=Setup of module BOM
 ListOfBOMs=List of bills of material - BOM
 ListOfManufacturingOrders=List of Manufacturing Orders
-NewBOM=New bill of material
-ProductBOMHelp=Product to create with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
+NewBOM=New bill of materials
+ProductBOMHelp=Product to create (or disassemble) with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
 BOMsNumberingModules=BOM numbering templates
 BOMsModelModule=BOM document templates
 MOsNumberingModules=MO numbering templates
@@ -22,7 +22,7 @@ FreeLegalTextOnBOMs=Free text on document of BOM
 WatermarkOnDraftBOMs=Watermark on draft BOM
 FreeLegalTextOnMOs=Free text on document of MO
 WatermarkOnDraftMOs=Watermark on draft MO
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials %s ?
 ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
 ManufacturingEfficiency=Manufacturing efficiency
 ConsumptionEfficiency=Consumption efficiency
@@ -30,8 +30,8 @@ ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the produc
 ValueOfMeansLossForProductProduced=Value of 0.95 means an average of 5%% of loss of produced product
 DeleteBillOfMaterials=Delete Bill Of Materials
 DeleteMo=Delete Manufacturing Order
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Materials?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Materials?
 MenuMRP=Manufacturing Orders
 NewMO=New Manufacturing Order
 QtyToProduce=Qty to produce
@@ -39,7 +39,7 @@ DateStartPlannedMo=Date start planned
 DateEndPlannedMo=Date end planned
 KeepEmptyForAsap=Empty means 'As Soon As Possible'
 EstimatedDuration=Estimated duration
-EstimatedDurationDesc=Estimated duration to manufacture this product using this BOM
+EstimatedDurationDesc=Estimated duration to manufacture (or disassemble) this product using this BOM
 ConfirmValidateBom=Are you sure you want to validate the BOM with the reference <strong>%s</strong> (you will be able to use it to build new Manufacturing Orders)
 ConfirmCloseBom=Are you sure you want to cancel this BOM (you won't be able to use it to build new Manufacturing Orders anymore) ?
 ConfirmReopenBom=Are you sure you want to re-open this BOM (you will be able to use it to build new Manufacturing Orders)
@@ -63,13 +63,14 @@ ConsumeAndProduceAll=Consume and Produce All
 Manufactured=Manufactured
 TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
 ForAQuantityOf=For a quantity to produce of %s
+ForAQuantityToConsumeOf=For a quantity to disassemble of %s
 ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
 ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
 ProductionForRef=Production of %s
 AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
 NoStockChangeOnServices=No stock change on services
 ProductQtyToConsumeByMO=Product quantity still to consume by open MO
-ProductQtyToProduceByMO=Product quentity still to produce by open MO
+ProductQtyToProduceByMO=Product quantity still to produce by open MO
 AddNewConsumeLines=Add new line to consume
 ProductsToConsume=Products to consume
 ProductsToProduce=Products to produce
@@ -83,15 +84,13 @@ Workstations=Workstations
 WorkstationsDescription=Workstations management
 WorkstationSetup = Workstations setup
 WorkstationSetupPage = Workstations setup page
-WorkstationAbout = About Workstation
-WorkstationAboutPage = Workstations about page
 WorkstationList=Workstation list
 WorkstationCreate=Add new workstation
 ConfirmEnableWorkstation=Are you sure you want to enable workstation <b>%s</b> ?
 EnableAWorkstation=Enable a workstation
 ConfirmDisableWorkstation=Are you sure you want to disable workstation <b>%s</b> ?
 DisableAWorkstation=Disable a workstation
-DeleteWorkstation=Supprimer
+DeleteWorkstation=Delete
 NbOperatorsRequired=Number of operators required
 THMOperatorEstimated=Estimated operator THM
 THMMachineEstimated=Estimated machine THM
diff --git a/htdocs/langs/uk_UA/orders.lang b/htdocs/langs/uk_UA/orders.lang
index af2ffe84443..9f5354ec537 100644
--- a/htdocs/langs/uk_UA/orders.lang
+++ b/htdocs/langs/uk_UA/orders.lang
@@ -11,6 +11,7 @@ OrderDate=Order date
 OrderDateShort=Order date
 OrderToProcess=Order to process
 NewOrder=New order
+NewSupplierOrderShort=New order
 NewOrderSupplier=New Purchase Order
 ToOrder=Make order
 MakeOrder=Make order
@@ -73,6 +74,7 @@ DeleteOrder=Delete order
 CancelOrder=Cancel order
 OrderReopened= Order %s re-open
 AddOrder=Create order
+AddSupplierOrderShort=Create order
 AddPurchaseOrder=Create purchase order
 AddToDraftOrders=Add to draft order
 ShowOrder=Show order
diff --git a/htdocs/langs/uk_UA/other.lang b/htdocs/langs/uk_UA/other.lang
index 54e294264bf..e0c1ab7baec 100644
--- a/htdocs/langs/uk_UA/other.lang
+++ b/htdocs/langs/uk_UA/other.lang
@@ -129,6 +129,7 @@ ClosedByLogin=User login who closed
 FileWasRemoved=File %s was removed
 DirWasRemoved=Directory %s was removed
 FeatureNotYetAvailable=Feature not yet available in the current version
+FeatureNotAvailableOnDevicesWithoutMouse=Feature not available on devices without mouse
 FeaturesSupported=Supported features
 Width=Width
 Height=Height
@@ -263,7 +264,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
-PrefixSession=Prefix for session ID
+SuffixSessionName=Suffix for session name
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/uk_UA/partnership.lang b/htdocs/langs/uk_UA/partnership.lang
index c5aab446cd3..8941504dbc9 100644
--- a/htdocs/langs/uk_UA/partnership.lang
+++ b/htdocs/langs/uk_UA/partnership.lang
@@ -16,41 +16,72 @@
 #
 # Generic
 #
-ModulePartnershipName = Partnership management
-PartnershipDescription = Module Partnership management
+ModulePartnershipName=Partnership management
+PartnershipDescription=Module Partnership management
 PartnershipDescriptionLong= Module Partnership management
 
+AddPartnership=Add partnership
+CancelPartnershipForExpiredMembers=Partnership: Cancel partnership of members with expired subscriptions
+PartnershipCheckBacklink=Partnership: Check referring backlink
+
 #
 # Menu
 #
-NewPartnership = New Partnership
-ListOfPartnerships = List of partnership
+NewPartnership=New Partnership
+ListOfPartnerships=List of partnership
 
 #
 # Admin page
 #
-PartnershipSetup = Partnership setup
-PartnershipAbout = About Partnership
-PartnershipAboutPage = Partnership about page
-
+PartnershipSetup=Partnership setup
+PartnershipAbout=About Partnership
+PartnershipAboutPage=Partnership about page
+partnershipforthirdpartyormember=Partner status must be set on a 'thirdparty' or a 'member'
+PARTNERSHIP_IS_MANAGED_FOR=Partnership managed for
+PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks to check
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb of days before cancelling status of a partnership when a subscription has expired
+ReferingWebsiteCheck=Check of website referring
+ReferingWebsiteCheckDesc=You can enable a feature to check that your partners has added a backlink to your website domains on their own website.
 
 #
 # Object
 #
+DeletePartnership=Delete a partnership
+PartnershipDedicatedToThisThirdParty=Partnership dedicated to this third party
+PartnershipDedicatedToThisMember=Partnership dedicated to this member
 DatePartnershipStart=Start date
 DatePartnershipEnd=End date
+ReasonDecline=Decline reason
+ReasonDeclineOrCancel=Decline reason
+PartnershipAlreadyExist=Partnership already exist
+ManagePartnership=Manage partnership
+BacklinkNotFoundOnPartnerWebsite=Backlink not found on partner website
+ConfirmClosePartnershipAsk=Are you sure you want to cancel this partnership?
+PartnershipType=Partnership type
 
 #
 # Template Mail
 #
+SendingEmailOnPartnershipWillSoonBeCanceled=Partnership will soon be canceled
+SendingEmailOnPartnershipRefused=Partnership refused
+SendingEmailOnPartnershipAccepted=Partnership accepted
+SendingEmailOnPartnershipCanceled=Partnership canceled
 
+YourPartnershipWillSoonBeCanceledTopic=Partnership will soon be canceled
+YourPartnershipRefusedTopic=Partnership refused
+YourPartnershipAcceptedTopic=Partnership accepted
+YourPartnershipCanceledTopic=Partnership canceled
+
+YourPartnershipWillSoonBeCanceledContent=We inform you that your partnership will soon be canceled (Backlink not found)
+YourPartnershipRefusedContent=We inform you that your partnership request has been refused.
+YourPartnershipAcceptedContent=We inform you that your partnership request has been accepted.
+YourPartnershipCanceledContent=We inform you that your partnership has been canceled.
 
 #
 # Status
 #
-PartnershipDraft = Проект
-PartnershipAccepted = Accepted
-PartnershipRefused = Refused
-PartnershipCanceled = Canceled
-
+PartnershipDraft=Проект
+PartnershipAccepted=Accepted
+PartnershipRefused=Refused
+PartnershipCanceled=Canceled
 PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/uk_UA/productbatch.lang b/htdocs/langs/uk_UA/productbatch.lang
index ade9324a883..57dcb3fe2ff 100644
--- a/htdocs/langs/uk_UA/productbatch.lang
+++ b/htdocs/langs/uk_UA/productbatch.lang
@@ -1,4 +1,4 @@
-# ProductBATCH language file - en_US - ProductBATCH
+# ProductBATCH language file - Source file is en_US - ProductBATCH
 ManageLotSerial=Use lot/serial number
 ProductStatusOnBatch=Yes (lot required)
 ProductStatusOnSerial=Yes (unique serial number required)
@@ -33,3 +33,13 @@ CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+LifeTime=Life span (in days)
+EndOfLife=End of life
+ManufacturingDate=Manufacturing date
+DestructionDate=Destruction date
+FirstUseDate=First use date
+QCFrequency=Quality control frequency (in days)
+
+#Traceability - qc status
+OutOfOrder=Out of order
+InWorkingOrder=In working order
diff --git a/htdocs/langs/uk_UA/products.lang b/htdocs/langs/uk_UA/products.lang
index e87414f9e76..fab11e7d273 100644
--- a/htdocs/langs/uk_UA/products.lang
+++ b/htdocs/langs/uk_UA/products.lang
@@ -396,3 +396,5 @@ ActionAvailableOnVariantProductOnly=Action only available on the variant of prod
 ProductsPricePerCustomer=Product prices per customers
 ProductSupplierExtraFields=Additional Attributes (Supplier Prices)
 DeleteLinkedProduct=Delete the child product linked to the combination
+PMPValue=Weighted average price
+PMPValueShort=WAP
diff --git a/htdocs/langs/uk_UA/projects.lang b/htdocs/langs/uk_UA/projects.lang
index 4a360315952..15baef10d78 100644
--- a/htdocs/langs/uk_UA/projects.lang
+++ b/htdocs/langs/uk_UA/projects.lang
@@ -267,9 +267,11 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=Новий рахунок-фактура
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+OneLinePerTimeSpentLine=One line for each time spent declaration
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
 AddPersonToTask=Add also to tasks
 UsageOrganizeEvent=Usage: Event Organization
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
+SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
diff --git a/htdocs/langs/uk_UA/receptions.lang b/htdocs/langs/uk_UA/receptions.lang
index 3d4fa336ff4..c6e036709bd 100644
--- a/htdocs/langs/uk_UA/receptions.lang
+++ b/htdocs/langs/uk_UA/receptions.lang
@@ -44,4 +44,4 @@ ValidateOrderFirstBeforeReception=You must first validate the order before being
 ReceptionsNumberingModules=Numbering module for receptions
 ReceptionsReceiptModel=Document templates for receptions
 NoMorePredefinedProductToDispatch=No more predefined products to dispatch
-
+ReceptionExist=A reception exists
diff --git a/htdocs/langs/uk_UA/stocks.lang b/htdocs/langs/uk_UA/stocks.lang
index c1f5129c375..21bb7f12ff4 100644
--- a/htdocs/langs/uk_UA/stocks.lang
+++ b/htdocs/langs/uk_UA/stocks.lang
@@ -56,8 +56,6 @@ UnitPurchaseValue=Unit purchase price
 StockTooLow=Stock too low
 StockLowerThanLimit=Stock lower than alert limit (%s)
 EnhancedValue=Value
-PMPValue=Weighted average price
-PMPValueShort=WAP
 EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
@@ -251,7 +249,10 @@ SelectAStockMovementFileToImport=select a stock movement file to import
 InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
 LabelOfInventoryMovemement=Inventory %s
 ReOpen=Reopen
-ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock to the real qty you entered into the inventory.
 ObjectNotFound=%s not found
 MakeMovementsAndClose=Generate movements and close
 AutofillWithExpected=Fill real quantity with expected quantity
+ShowAllBatchByDefault=By default, show batch details on product "stock" tab
+CollapseBatchDetailHelp=You can set batch detail default display in stocks module configuration
+FieldCannotBeNegative=Field "%s" cannot be negative
diff --git a/htdocs/langs/uk_UA/ticket.lang b/htdocs/langs/uk_UA/ticket.lang
index 920703320ae..6c7acc8f632 100644
--- a/htdocs/langs/uk_UA/ticket.lang
+++ b/htdocs/langs/uk_UA/ticket.lang
@@ -304,7 +304,7 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
-BoxTicketType=Number of open tickets by type
+BoxTicketType=Distribution of open tickets by type
 BoxTicketSeverity=Number of open tickets by severity
 BoxNoTicketSeverity=No tickets opened
 BoxTicketLastXDays=Number of new tickets by days the last %s days
diff --git a/htdocs/langs/uz_UZ/accountancy.lang b/htdocs/langs/uz_UZ/accountancy.lang
index 354cddb62c2..50b67af85d2 100644
--- a/htdocs/langs/uz_UZ/accountancy.lang
+++ b/htdocs/langs/uz_UZ/accountancy.lang
@@ -5,35 +5,35 @@ ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
 ACCOUNTING_EXPORT_DATE=Date format for export file
 ACCOUNTING_EXPORT_PIECE=Export the number of piece
 ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account
-ACCOUNTING_EXPORT_LABEL=Export label
-ACCOUNTING_EXPORT_AMOUNT=Export amount
-ACCOUNTING_EXPORT_DEVISE=Export currency
+ACCOUNTING_EXPORT_LABEL=Yorliqni eksport qilish
+ACCOUNTING_EXPORT_AMOUNT=Eksport miqdori
+ACCOUNTING_EXPORT_DEVISE=Valyutani eksport qilish
 Selectformat=Select the format for the file
 ACCOUNTING_EXPORT_FORMAT=Select the format for the file
 ACCOUNTING_EXPORT_ENDLINE=Select the carriage return type
 ACCOUNTING_EXPORT_PREFIX_SPEC=Specify the prefix for the file name
-ThisService=This service
-ThisProduct=This product
-DefaultForService=Default for service
-DefaultForProduct=Default for product
+ThisService=Ushbu xizmat
+ThisProduct=Ushbu mahsulot
+DefaultForService=Xizmat uchun standart
+DefaultForProduct=Mahsulot uchun standart
 ProductForThisThirdparty=Product for this thirdparty
 ServiceForThisThirdparty=Service for this thirdparty
-CantSuggest=Can't suggest
-AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s
-ConfigAccountingExpert=Configuration of the module accounting (double entry)
-Journalization=Journalization
+CantSuggest=Taklif qila olmayman
+AccountancySetupDoneFromAccountancyMenu=Buxgalteriya hisobining ko'pgina sozlamalari %s menyusida amalga oshiriladi
+ConfigAccountingExpert=Modulni hisobga olish konfiguratsiyasi (ikki martalik yozuv)
+Journalization=Jurnalistika
 Journals=Journals
 JournalFinancial=Financial journals
 BackToChartofaccounts=Return chart of accounts
-Chartofaccounts=Chart of accounts
+Chartofaccounts=Hisob-kitoblar rejasi
 ChartOfSubaccounts=Chart of individual accounts
 ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
-CurrentDedicatedAccountingAccount=Current dedicated account
-AssignDedicatedAccountingAccount=New account to assign
-InvoiceLabel=Invoice label
-OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to an accounting account
-OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to an accounting account
-OtherInfo=Other information
+CurrentDedicatedAccountingAccount=Joriy ajratilgan hisob
+AssignDedicatedAccountingAccount=Tayinlash uchun yangi hisob
+InvoiceLabel=Hisob-faktura yorlig'i
+OverviewOfAmountOfLinesNotBound=Buxgalteriya hisobi bilan bog'liq bo'lmagan satrlar miqdoriga umumiy nuqtai
+OverviewOfAmountOfLinesBound=Buxgalteriya hisobi bilan bog'langan chiziqlar miqdoriga umumiy nuqtai
+OtherInfo=Boshqa ma'lumotlar
 DeleteCptCategory=Remove accounting account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group?
 JournalizationInLedgerStatus=Status of journalization
@@ -58,37 +58,37 @@ MainAccountForUsersNotDefined=Main accounting account for users not defined in s
 MainAccountForVatPaymentNotDefined=Main accounting account for VAT payment not defined in setup
 MainAccountForSubscriptionPaymentNotDefined=Main accounting account for subscription payment not defined in setup
 
-AccountancyArea=Accounting area
-AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
-AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
-AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+AccountancyArea=Buxgalteriya hisobi maydoni
+AccountancyAreaDescIntro=Buxgalteriya modulidan foydalanish bir necha bosqichda amalga oshiriladi:
+AccountancyAreaDescActionOnce=Quyidagi harakatlar odatda faqat bir marta yoki yiliga bir marta amalga oshiriladi ...
+AccountancyAreaDescActionOnceBis=Kelgusida sizning vaqtingizni tejash uchun jurnalistikani rasmiylashtirishda to'g'ri sukut bo'yicha buxgalteriya hisobini taklif qilish orqali (Jurnallarda va Bosh daftarda yozuvlarni yozish) taklif qilish kerak.
+AccountancyAreaDescActionFreq=Quyidagi harakatlar odatda har oyda, haftada yoki kunda juda katta kompaniyalar uchun amalga oshiriladi ...
 
 AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
-AccountancyAreaDescChartModel=STEP %s: Check that a model of chart of account exists or create one from menu %s
-AccountancyAreaDescChart=STEP %s: Select and|or complete your chart of account from menu %s
+AccountancyAreaDescChartModel=QADAM %s: hisob jadvalining modeli mavjudligini tekshiring yoki menyudan %s yarating.
+AccountancyAreaDescChart=QADAM %s: tanlang va | yoki hisob qaydnomangizni %s menyusidan to'ldiring.
 
-AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
+AccountancyAreaDescVat=QADAM %s: har bir QQS stavkasi bo'yicha buxgalteriya hisobini belgilang. Buning uchun %s menyu yozuvidan foydalaning.
 AccountancyAreaDescDefault=STEP %s: Define default accounting accounts. For this, use the menu entry %s.
-AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
-AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
-AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expenses (miscellaneous taxes). For this, use the menu entry %s.
-AccountancyAreaDescDonation=STEP %s: Define default accounting accounts for donation. For this, use the menu entry %s.
+AccountancyAreaDescExpenseReport=QADAM %s: har bir hisobot turi bo'yicha buxgalteriya hisobini belgilang. Buning uchun %s menyu yozuvidan foydalaning.
+AccountancyAreaDescSal=QADAM %s: Ish haqini to'lash bo'yicha buxgalteriya hisobini belgilang. Buning uchun %s menyu yozuvidan foydalaning.
+AccountancyAreaDescContrib=QADAM %s: Maxsus xarajatlar (turli xil soliqlar) bo'yicha buxgalteriya hisobini belgilang. Buning uchun %s menyu yozuvidan foydalaning.
+AccountancyAreaDescDonation=QADAM %s: xayr-ehson uchun buxgalteriya hisobini belgilang. Buning uchun %s menyu yozuvidan foydalaning.
 AccountancyAreaDescSubscription=STEP %s: Define default accounting accounts for member subscription. For this, use the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Define mandatory default account and default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
-AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
-AccountancyAreaDescBank=STEP %s: Define accounting accounts and journal code for each bank and financial accounts. For this, use the menu entry %s.
-AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+AccountancyAreaDescMisc=QADAM %s: Turli xil operatsiyalar uchun majburiy sukut qaydnomasi va buxgalteriya hisobini belgilang. Buning uchun %s menyu yozuvidan foydalaning.
+AccountancyAreaDescLoan=QADAM %s: ssudalar bo'yicha ssudalarning buxgalteriya hisobini belgilang. Buning uchun %s menyu yozuvidan foydalaning.
+AccountancyAreaDescBank=QADAM %s: har bir bank va moliyaviy hisob uchun buxgalteriya hisobi va jurnal kodini aniqlang. Buning uchun %s menyu yozuvidan foydalaning.
+AccountancyAreaDescProd=QADAM %s: Mahsulotlaringiz / xizmatlaringiz bo'yicha buxgalteriya hisoblarini aniqlang. Buning uchun %s menyu yozuvidan foydalaning.
 
 AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
-AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
-AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
+AccountancyAreaDescWriteRecords=QADAM %s: operatsiyalarni kitobga yozing. Buning uchun <strong> %s </strong> menyusiga o'ting va <strong> %s </strong> tugmachasini bosing.
+AccountancyAreaDescAnalyze=QADAM %s: Mavjud operatsiyalarni qo'shish yoki tahrirlash, hisobotlar va eksportlarni yaratish.
 
-AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
+AccountancyAreaDescClosePeriod=QADAM %s: Yopish davri, shuning uchun kelajakda o'zgartirishlar kiritolmaymiz.
 
 TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
-Selectchartofaccounts=Select active chart of accounts
-ChangeAndLoad=Change and load
+Selectchartofaccounts=Faol hisobvaraqlar rejasini tanlang
+ChangeAndLoad=O'zgartirish va yuklash
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
 AccountAccountingShort=Account
@@ -98,67 +98,67 @@ ShowAccountingAccount=Show accounting account
 ShowAccountingJournal=Show accounting journal
 ShowAccountingAccountInLedger=Show accounting account in ledger
 ShowAccountingAccountInJournals=Show accounting account in journals
-AccountAccountingSuggest=Accounting account suggested
-MenuDefaultAccounts=Default accounts
+AccountAccountingSuggest=Buxgalteriya hisobi tavsiya etildi
+MenuDefaultAccounts=Standart hisoblar
 MenuBankAccounts=Bank accounts
-MenuVatAccounts=Vat accounts
-MenuTaxAccounts=Tax accounts
-MenuExpenseReportAccounts=Expense report accounts
-MenuLoanAccounts=Loan accounts
-MenuProductsAccounts=Product accounts
+MenuVatAccounts=QQS hisob-kitoblari
+MenuTaxAccounts=Soliq hisobvaraqlari
+MenuExpenseReportAccounts=Xarajatlar bo'yicha hisobotlar
+MenuLoanAccounts=Kredit hisobvaraqlari
+MenuProductsAccounts=Mahsulot hisoblari
 MenuClosureAccounts=Closure accounts
 MenuAccountancyClosure=Closure
 MenuAccountancyValidationMovements=Validate movements
-ProductsBinding=Products accounts
+ProductsBinding=Mahsulotlar hisoblari
 TransferInAccounting=Transfer in accounting
 RegistrationInAccounting=Registration in accounting
 Binding=Binding to accounts
-CustomersVentilation=Customer invoice binding
-SuppliersVentilation=Vendor invoice binding
-ExpenseReportsVentilation=Expense report binding
-CreateMvts=Create new transaction
-UpdateMvts=Modification of a transaction
+CustomersVentilation=Xaridorlarning hisob-fakturasi majburiy
+SuppliersVentilation=Sotuvchi hisob-fakturasini majburiy ravishda to'ldirish
+ExpenseReportsVentilation=Xarajatlar to'g'risidagi hisobotni majburiy ravishda bajarish
+CreateMvts=Yangi tranzaksiya yarating
+UpdateMvts=Bitimni o'zgartirish
 ValidTransaction=Validate transaction
-WriteBookKeeping=Register transactions in accounting
-Bookkeeping=Ledger
+WriteBookKeeping=Buxgalteriya hisobidagi operatsiyalarni ro'yxatdan o'tkazing
+Bookkeeping=Kitob
 BookkeepingSubAccount=Subledger
-AccountBalance=Account balance
+AccountBalance=Hisob balansi
 ObjectsRef=Source object ref
-CAHTF=Total purchase vendor before tax
-TotalExpenseReport=Total expense report
-InvoiceLines=Lines of invoices to bind
-InvoiceLinesDone=Bound lines of invoices
-ExpenseReportLines=Lines of expense reports to bind
-ExpenseReportLinesDone=Bound lines of expense reports
-IntoAccount=Bind line with the accounting account
+CAHTF=Soliqqa qadar jami sotib olish sotuvchisi
+TotalExpenseReport=Jami xarajatlar hisoboti
+InvoiceLines=Yopish uchun schyot-fakturalar
+InvoiceLinesDone=Hisob-fakturalarning chegaralangan chiziqlari
+ExpenseReportLines=Bog'lanish uchun xarajatlar hisobotlari qatorlari
+ExpenseReportLinesDone=Xarajatlar to'g'risidagi hisobotlarning chegaralangan chiziqlari
+IntoAccount=Buxgalteriya hisobi bilan bog'lanish
 TotalForAccount=Total accounting account
 
 
-Ventilate=Bind
-LineId=Id line
+Ventilate=Bog'lash
+LineId=Id chizig'i
 Processing=Processing
-EndProcessing=Process terminated.
+EndProcessing=Jarayon tugadi.
 SelectedLines=Selected lines
 Lineofinvoice=Line of invoice
-LineOfExpenseReport=Line of expense report
-NoAccountSelected=No accounting account selected
-VentilatedinAccount=Binded successfully to the accounting account
-NotVentilatedinAccount=Not bound to the accounting account
-XLineSuccessfullyBinded=%s products/services successfully bound to an accounting account
-XLineFailedToBeBinded=%s products/services were not bound to any accounting account
+LineOfExpenseReport=Xarajatlar to'g'risidagi hisobot liniyasi
+NoAccountSelected=Buxgalteriya hisobi tanlanmagan
+VentilatedinAccount=Buxgalteriya hisobiga muvaffaqiyatli bog'langan
+NotVentilatedinAccount=Buxgalteriya hisobi bilan bog'liq emas
+XLineSuccessfullyBinded=%s mahsulotlari / xizmatlari buxgalteriya hisobiga muvaffaqiyatli bog'langan
+XLineFailedToBeBinded=%s mahsulotlari / xizmatlari hech qanday buxgalteriya hisobiga bog'lanmagan
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Ro'yxat va bog'lash sahifasidagi maksimal qatorlar soni (tavsiya etiladi: 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=So'nggi elementlar bo'yicha "Bajarish majburiy" sahifani saralashni boshlang
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=So'nggi elementlar bo'yicha "Majburiy amalga oshirildi" sahifasini saralashni boshlang
 
-ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts (If you set value to 6 here, the account '706' will appear like '706000' on screen)
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third-party accounting accounts (If you set value to 6 here, the account '401' will appear like '401000' on screen)
-ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of an accounting account. Needed by some countries (like Switzerland). If set to off (default), you can set the following two parameters to ask the application to add virtual zeros.
-BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
+ACCOUNTING_LENGTH_DESCRIPTION=X belgilaridan keyin ro'yxatdagi mahsulot va xizmatlarning tavsifini qisqartiring (Eng yaxshi = 50)
+ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=X belgilaridan so'ng ro'yxatdagi mahsulot va xizmatlar hisobini tavsiflash shaklini qisqartiring (Best = 50)
+ACCOUNTING_LENGTH_GACCOUNT=Umumiy buxgalteriya hisoblarining uzunligi (Agar siz bu erda 6 qiymatini belgilasangiz, '706' qaydnomasi ekranda '706000' kabi ko'rinadi)
+ACCOUNTING_LENGTH_AACCOUNT=Uchinchi tomon buxgalteriya hisoblarining uzunligi (Agar siz bu erda 6 qiymatini belgilasangiz, '401' qaydnomasi ekranda '401000' kabi ko'rinadi)
+ACCOUNTING_MANAGE_ZERO=Buxgalteriya hisobi oxirida turli xil nollarni boshqarishga ruxsat bering. Ba'zi mamlakatlar tomonidan kerak (masalan, Shveytsariya). Agar o'chirilgan (standart) bo'lsa, siz dasturdan virtual nollarni qo'shishni so'rash uchun quyidagi ikkita parametrni o'rnatishingiz mumkin.
+BANK_DISABLE_DIRECT_INPUT=Bank hisobvarag'idagi operatsiyani to'g'ridan-to'g'ri yozib olishni o'chirib qo'ying
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties, break ability to search on a part of value)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
@@ -173,26 +173,26 @@ ACCOUNTING_RESULT_PROFIT=Result accounting account (Profit)
 ACCOUNTING_RESULT_LOSS=Result accounting account (Loss)
 ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Journal of closure
 
-ACCOUNTING_ACCOUNT_TRANSFER_CASH=Accounting account of transitional bank transfer
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=O'tish davri o'tkazmalarining buxgalteriya hisobi
 TransitionalAccount=Transitional bank transfer account
 
-ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
-DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
+ACCOUNTING_ACCOUNT_SUSPENSE=Kutishning buxgalteriya hisobi
+DONATION_ACCOUNTINGACCOUNT=Xayriya mablag'larini ro'yxatdan o'tkazish uchun buxgalteriya hisobi
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
 ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
 
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Xarid qilingan mahsulotlar uchun sukut bo'yicha buxgalteriya hisobi (agar mahsulot varag'ida belgilanmagan bo'lsa foydalaniladi)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Sotilgan mahsulotlar uchun sukut bo'yicha buxgalteriya hisobi (agar mahsulot varag'ida belgilanmagan bo'lsa foydalaniladi)
 ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Accounting account by default for the products sold in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Accounting account by default for the products sold and exported out of EEC (used if not defined in the product sheet)
 
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Sotib olingan xizmatlar uchun sukut bo'yicha buxgalteriya hisobi (agar xizmat varag'ida belgilanmagan bo'lsa foydalaniladi)
 ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Accounting account by default for the bought services in EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought services and imported out of EEC (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Sotilgan xizmatlar uchun sukut bo'yicha buxgalteriya hisobi (agar xizmat varag'ida belgilanmagan bo'lsa foydalaniladi)
 ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Accounting account by default for the services sold in EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Accounting account by default for the services sold and exported out of EEC (used if not defined in the service sheet)
 
@@ -201,47 +201,47 @@ Docdate=Date
 Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
-Sens=Direction
+Sens=Yo'nalish
 AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you have received<br>For an accounting account of a supplier, use Debit to record a payment you made
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
 JournalLabel=Journal label
-NumPiece=Piece number
-TransactionNumShort=Num. transaction
-AccountingCategory=Custom group
-GroupByAccountAccounting=Group by general ledger account
+NumPiece=Parcha raqami
+TransactionNumShort=Raqam bitim
+AccountingCategory=Maxsus guruh
+GroupByAccountAccounting=Bosh kitob schyoti bo'yicha guruhlash
 GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
 ByAccounts=By accounts
 ByPredefinedAccountGroups=By predefined groups
 ByPersonalizedAccountGroups=By personalized groups
 ByYear=By year
-NotMatch=Not Set
-DeleteMvt=Delete some operation lines from accounting
+NotMatch=O'rnatilmagan
+DeleteMvt=Buxgalteriya hisobidan ba'zi operatsion liniyalarni o'chirib tashlang
 DelMonth=Month to delete
-DelYear=Year to delete
-DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger.
-ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted)
+DelYear=O'chirish yili
+DelJournal=O'chirish uchun jurnal
+ConfirmDeleteMvt=Bu yil / oy va / yoki ma'lum bir jurnal uchun buxgalteriya hisobining barcha operatsion yo'nalishlarini o'chirib tashlaydi (kamida bitta mezon talab qilinadi). O'chirilgan yozuvni daftarga qaytarish uchun '%s' xususiyatidan qayta foydalanishingiz kerak bo'ladi.
+ConfirmDeleteMvtPartial=Bu operatsiyani buxgalteriya hisobidan o'chirib tashlaydi (bir xil operatsiyaga tegishli barcha operatsion liniyalar o'chiriladi)
 FinanceJournal=Finance journal
-ExpenseReportsJournal=Expense reports journal
+ExpenseReportsJournal=Xarajatlar hisoboti jurnali
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
-VATAccountNotDefined=Account for VAT not defined
-ThirdpartyAccountNotDefined=Account for third party not defined
-ProductAccountNotDefined=Account for product not defined
-FeeAccountNotDefined=Account for fee not defined
-BankAccountNotDefined=Account for bank not defined
+DescJournalOnlyBindedVisible=Bu buxgalteriya hisobi bilan bog'liq bo'lgan yozuvlar va Jurnallar va Daftarlarga yozilishi mumkin bo'lgan ko'rinishdir.
+VATAccountNotDefined=QQS uchun hisob-kitob aniqlanmagan
+ThirdpartyAccountNotDefined=Uchinchi tomon uchun hisob belgilanmagan
+ProductAccountNotDefined=Mahsulot hisobi aniqlanmagan
+FeeAccountNotDefined=To'lov uchun hisob-kitob aniqlanmagan
+BankAccountNotDefined=Bank hisobi aniqlanmagan
 CustomerInvoicePayment=Payment of invoice customer
-ThirdPartyAccount=Third-party account
-NewAccountingMvt=New transaction
-NumMvts=Numero of transaction
-ListeMvts=List of movements
+ThirdPartyAccount=Uchinchi tomon hisobi
+NewAccountingMvt=Yangi bitim
+NumMvts=Bitim soni
+ListeMvts=Harakatlar ro'yxati
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
 AddCompteFromBK=Add accounting accounts to the group
-ReportThirdParty=List third-party account
-DescThirdPartyReport=Consult here the list of third-party customers and vendors and their accounting accounts
+ReportThirdParty=Uchinchi tomon hisoblarini ro'yxatlash
+DescThirdPartyReport=Uchinchi tomon mijozlari va sotuvchilari ro'yxati va ularning buxgalteriya hisoblari bilan bu erda maslahatlashing
 ListAccounts=List of the accounting accounts
 UnknownAccountForThirdparty=Unknown third-party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third-party account. Blocking error
@@ -255,7 +255,7 @@ ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
 ShowSubtotalByGroup=Show subtotal by level
 
-Pcgtype=Group of account
+Pcgtype=Hisob guruhi
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
 
 Reconcilable=Reconcilable
@@ -263,18 +263,18 @@ Reconcilable=Reconcilable
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
 
-DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
-DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still have some lines not bound to an account, you will have to make a manual binding from the menu "<strong>%s</strong>".
-DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
-DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
-ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
+DescVentilCustomer=Mahsulotni hisobga olish hisobvarag'iga bog'langan (yoki bo'lmagan) mijozlarning hisob-fakturalari satrlari ro'yxati bilan bu erda maslahatlashing
+DescVentilMore=Ko'pgina hollarda, agar siz oldindan belgilangan mahsulot yoki xizmatlardan foydalansangiz va mahsulot / xizmat kartasida hisob raqamini o'rnatgan bo'lsangiz, ilova sizning hisob-faktura satrlari va sizning hisobvaraqlar rejangizning buxgalteriya hisobi o'rtasidagi majburiylikni amalga oshirishi mumkin. <strong> "%s" </strong> tugmasi bilan bir marta bosish. Agar mahsulot / xizmat kartalarida hisob o'rnatilmagan bo'lsa yoki sizda hali ham biron bir qatorga bog'liq bo'lmagan bo'lsa, siz "<strong> %s </strong>" menyusidan majburiy ravishda majburiy ulanishingiz kerak bo'ladi.
+DescVentilDoneCustomer=Xaridorlarning schyot-fakturalari ro'yxati va ularning mahsulotlarini hisobga olish hisobi bilan bu erda maslahatlashing
+DescVentilTodoCustomer=Mahsulotni hisobga olish hisobvarag'i bilan bog'lanmagan hisob-faktura satrlarini bog'lab qo'ying
+ChangeAccount=Tanlangan yo'nalishlar uchun mahsulot / xizmatning buxgalteriya hisobini quyidagi buxgalteriya hisobi bilan o'zgartiring:
 Vide=-
-DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account (only record not already transfered in accountancy are visible)
-DescVentilDoneSupplier=Consult here the list of the lines of vendor invoices and their accounting account
-DescVentilTodoExpenseReport=Bind expense report lines not already bound with a fee accounting account
-DescVentilExpenseReport=Consult here the list of expense report lines bound (or not) to a fee accounting account
-DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
-DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
+DescVentilSupplier=Mahsulotni hisobga olish hisobvarag'iga bog'langan yoki hali bog'lanmagan sotuvchining faktura satrlari ro'yxati bilan bu erda maslahatlashing (faqat buxgalteriyada o'tkazilmagan yozuvlar ko'rinadi)
+DescVentilDoneSupplier=Bu erda sotuvchilarning schyot-fakturalari ro'yxati va ularning buxgalteriya hisobi bilan maslahatlashing
+DescVentilTodoExpenseReport=To'lovlarni hisobga olish hisobvarag'i bilan bog'lanmagan majburiy xarajatlar to'g'risidagi hisobot satrlari
+DescVentilExpenseReport=To'lovlarni hisobga olish hisobvarag'iga bog'langan (yoki bo'lmagan) xarajatlar hisobotlari ro'yxati bilan bu erda maslahatlashing
+DescVentilExpenseReportMore=Agar siz buxgalteriya hisobini xarajatlar to'g'risidagi hisobot satrlari turiga o'rnatgan bo'lsangiz, ilova sizning hisob-kitoblar jadvalingizdagi buxgalteriya hisobi o'rtasidagi majburiylikni amalga oshirishi mumkin, faqat bir marta bosish orqali <strong> "%s" </strong>. Agar to'lovlar lug'atiga hisob o'rnatilmagan bo'lsa yoki sizda hali ham biron bir qayd bilan bog'lanmagan qatorlar mavjud bo'lsa, "<strong> %s </strong>" menyusidan majburiy ravishda majburiy amal qilishingiz kerak bo'ladi.
+DescVentilDoneExpenseReport=Xarajatlar hisobotlari ro'yxati va ularning to'lovlarini hisobga olish hisobi bilan bu erda maslahatlashing
 
 Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
@@ -284,18 +284,18 @@ NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
 
-ValidateHistory=Bind Automatically
-AutomaticBindingDone=Automatic binding done
+ValidateHistory=Avtomatik bog'lash
+AutomaticBindingDone=Avtomatik ulanish amalga oshirildi
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
-MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
+MvtNotCorrectlyBalanced=Harakat to'g'ri muvozanatlashtirilmagan. Debit = %s | Kredit = %s
 Balancing=Balancing
-FicheVentilation=Binding card
-GeneralLedgerIsWritten=Transactions are written in the Ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
-NoNewRecordSaved=No more record to journalize
-ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
-ChangeBinding=Change the binding
+FicheVentilation=Majburiy karta
+GeneralLedgerIsWritten=Bitimlar kitobda yozilgan
+GeneralLedgerSomeRecordWasNotRecorded=Ba'zi operatsiyalarni jurnalga yozib bo'lmaydi. Agar boshqa xato xabari bo'lmasa, bu ular allaqachon jurnalga yozilganligi sababli bo'lishi mumkin.
+NoNewRecordSaved=Jurnalizatsiya qilish uchun boshqa yozuv yo'q
+ListOfProductsWithoutAccountingAccount=Hech qanday buxgalteriya hisobiga bog'lanmagan mahsulotlar ro'yxati
+ChangeBinding=Majburiylikni o'zgartiring
 Accounted=Accounted in ledger
 NotYetAccounted=Not yet accounted in the ledger
 ShowTutorial=Show Tutorial
@@ -304,9 +304,9 @@ WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledg
 
 ## Admin
 BindingOptions=Binding options
-ApplyMassCategories=Apply mass categories
-AddAccountFromBookKeepingWithNoCategories=Available account not yet in the personalized group
-CategoryDeleted=Category for the accounting account has been removed
+ApplyMassCategories=Ommaviy toifalarni qo'llang
+AddAccountFromBookKeepingWithNoCategories=Mavjud hisob hali moslashtirilgan guruhda emas
+CategoryDeleted=Buxgalteriya hisobi toifasi olib tashlandi
 AccountingJournals=Accounting journals
 AccountingJournal=Accounting journal
 NewAccountingJournal=New accounting journal
@@ -328,17 +328,20 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountanc
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
+NotifiedExportDate=Notified export date (modification of the entries will not be possible)
+NotifiedValidationDate=Validation of the entries (modification or deletion of the entries will not be possible)
+ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=Export draft journal
 Modelcsv=Model of export
 Selectmodelcsv=Select a model of export
 Modelcsv_normal=Classic export
-Modelcsv_CEGID=Export for CEGID Expert Comptabilité
-Modelcsv_COALA=Export for Sage Coala
-Modelcsv_bob50=Export for Sage BOB 50
-Modelcsv_ciel=Export for Sage Ciel Compta or Compta Evolution
-Modelcsv_quadratus=Export for Quadratus QuadraCompta
-Modelcsv_ebp=Export for EBP
-Modelcsv_cogilog=Export for Cogilog
+Modelcsv_CEGID=CEGID Expert Comptabilité uchun eksport
+Modelcsv_COALA=Sage Coala uchun eksport
+Modelcsv_bob50=Sage BOB 50 uchun eksport
+Modelcsv_ciel=Sage Ciel Compta yoki Compta Evolution uchun eksport
+Modelcsv_quadratus=Quadratus QuadraCompta uchun eksport
+Modelcsv_ebp=EBP uchun eksport
+Modelcsv_cogilog=Cogilog uchun eksport
 Modelcsv_agiris=Export for Agiris
 Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
 Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
@@ -350,32 +353,32 @@ Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
 Modelcsv_Gestinumv5Export for Gestinum (v5)
-ChartofaccountsId=Chart of accounts Id
+ChartofaccountsId=Hisob-kitoblar rejasi
 
 ## Tools - Init accounting account on product / service
-InitAccountancy=Init accountancy
-InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accounting account defined for sales and purchases.
-DefaultBindingDesc=This page can be used to set a default account to use to link transactions record about payment salaries, donation, taxes and vat when no specific accounting account were already set.
+InitAccountancy=Buxgalteriya hisobi
+InitAccountancyDesc=Ushbu sahifada sotish va sotib olish uchun aniqlangan buxgalteriya hisobi bo'lmagan mahsulotlar va xizmatlar bo'yicha buxgalteriya hisobini boshlash uchun foydalanish mumkin.
+DefaultBindingDesc=Ushbu sahifada oldindan hisob-kitob hisobvarag'i o'rnatilmagan taqdirda, ish haqi, xayriya mablag'lari, soliqlar va QQS bo'yicha operatsiyalar yozuvlarini bog'lash uchun standart hisobni o'rnatish uchun foydalanish mumkin.
 DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
-Options=Options
-OptionModeProductSell=Mode sales
+Options=Variantlar
+OptionModeProductSell=Sotish rejimi
 OptionModeProductSellIntra=Mode sales exported in EEC
 OptionModeProductSellExport=Mode sales exported in other countries
-OptionModeProductBuy=Mode purchases
+OptionModeProductBuy=Sotib olish tartibi
 OptionModeProductBuyIntra=Mode purchases imported in EEC
 OptionModeProductBuyExport=Mode purchased imported from other countries
-OptionModeProductSellDesc=Show all products with accounting account for sales.
+OptionModeProductSellDesc=Sotish bo'yicha buxgalteriya hisobi bilan barcha mahsulotlarni ko'rsating.
 OptionModeProductSellIntraDesc=Show all products with accounting account for sales in EEC.
 OptionModeProductSellExportDesc=Show all products with accounting account for other foreign sales.
-OptionModeProductBuyDesc=Show all products with accounting account for purchases.
+OptionModeProductBuyDesc=Xaridlar uchun buxgalteriya hisobi bilan barcha mahsulotlarni ko'rsating.
 OptionModeProductBuyIntraDesc=Show all products with accounting account for purchases in EEC.
 OptionModeProductBuyExportDesc=Show all products with accounting account for other foreign purchases.
-CleanFixHistory=Remove accounting code from lines that not exists into charts of account
-CleanHistory=Reset all bindings for selected year
+CleanFixHistory=Hisob jadvallarida mavjud bo'lmagan chiziqlardan buxgalteriya kodini olib tashlang
+CleanHistory=Tanlangan yil uchun barcha bog'lanishlarni tiklang
 PredefinedGroups=Predefined groups
-WithoutValidAccount=Without valid dedicated account
-WithValidAccount=With valid dedicated account
-ValueNotIntoChartOfAccount=This value of accounting account does not exist into chart of account
+WithoutValidAccount=Yaratilgan maxsus hisobsiz
+WithValidAccount=Yaratilgan maxsus hisob bilan
+ValueNotIntoChartOfAccount=Buxgalteriya hisobining bu qiymati hisob rejasida mavjud emas
 AccountRemovedFromGroup=Account removed from group
 SaleLocal=Local sale
 SaleExport=Export sale
@@ -384,20 +387,20 @@ SaleEECWithVAT=Sale in EEC with a VAT not null, so we suppose this is NOT an int
 SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fallback on the product account for standard sales. You can fix the VAT ID of thirdparty or the product account if needed.
 
 ## Dictionary
-Range=Range of accounting account
-Calculated=Calculated
+Range=Buxgalteriya hisobi doirasi
+Calculated=Hisoblangan
 Formula=Formula
 
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
-ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
+ErrorNoAccountingCategoryForThisCountry=%s mamlakati uchun buxgalteriya hisobi guruhi mavjud emas (Uyga qarang - O'rnatish - Lug'atlar)
 ErrorInvoiceContainsLinesNotYetBounded=You try to journalize some lines of the invoice <strong>%s</strong>, but some other lines are not yet bounded to accounting account. Journalization of all invoice lines for this invoice are refused.
 ErrorInvoiceContainsLinesNotYetBoundedShort=Some lines on invoice are not bound to accounting account.
-ExportNotSupported=The export format setuped is not supported into this page
-BookeppingLineAlreayExists=Lines already existing into bookkeeping
+ExportNotSupported=Ushbu sahifada eksport formati o'rnatilmagan
+BookeppingLineAlreayExists=Buxgalteriya hisobida mavjud bo'lgan chiziqlar
 NoJournalDefined=No journal defined
-Binded=Lines bound
-ToBind=Lines to bind
+Binded=Chiziqlar bog'langan
+ToBind=Bog'lash uchun chiziqlar
 UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to make the binding manually
 
 ## Import
@@ -423,7 +426,7 @@ FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
 FECFormatMulticurrencyCode=Multicurrency code (Idevise)
 
 DateExport=Date export
-WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
+WarningReportNotReliable=Diqqat, ushbu hisobot daftarga asoslanmagan, shuning uchun daftarda qo'lda o'zgartirilgan bitimni o'z ichiga olmaydi. Agar sizning jurnalizatsiya dolzarb bo'lsa, buxgalteriya hisobi yanada aniqroq bo'ladi.
 ExpenseReportJournal=Expense Report Journal
 InventoryJournal=Inventory Journal
 
diff --git a/htdocs/langs/uz_UZ/admin.lang b/htdocs/langs/uz_UZ/admin.lang
index fb4513a09b4..323c5555826 100644
--- a/htdocs/langs/uz_UZ/admin.lang
+++ b/htdocs/langs/uz_UZ/admin.lang
@@ -1,216 +1,216 @@
 # Dolibarr language file - Source file is en_US - admin
-Foundation=Foundation
-Version=Version
-Publisher=Publisher
-VersionProgram=Version program
-VersionLastInstall=Initial install version
-VersionLastUpgrade=Latest version upgrade
-VersionExperimental=Experimental
-VersionDevelopment=Development
-VersionUnknown=Unknown
-VersionRecommanded=Recommended
-FileCheck=Fileset Integrity Checks
-FileCheckDesc=This tool allows you to check the integrity of files and the setup of your application, comparing each file with the official one. The value of some setup constants may also be checked. You can use this tool to determine if any files have been modified (e.g by a hacker).
-FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
-FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files have been added.
-FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
-GlobalChecksum=Global checksum
-MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
-LocalSignature=Embedded local signature (less reliable)
-RemoteSignature=Remote distant signature (more reliable)
-FilesMissing=Missing Files
-FilesUpdated=Updated Files
-FilesModified=Modified Files
-FilesAdded=Added Files
-FileCheckDolibarr=Check integrity of application files
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when the application is installed from an official package
-XmlNotFound=Xml Integrity File of application not found
-SessionId=Session ID
-SessionSaveHandler=Handler to save sessions
-SessionSavePath=Session save location
-PurgeSessions=Purge of sessions
-ConfirmPurgeSessions=Do you really want to purge all sessions? This will disconnect every user (except yourself).
-NoSessionListWithThisHandler=Save session handler configured in your PHP does not allow listing all running sessions.
-LockNewSessions=Lock new connections
-ConfirmLockNewSessions=Are you sure you want to restrict any new Dolibarr connection to yourself? Only user <b>%s</b> will be able to connect after that.
-UnlockNewSessions=Remove connection lock
-YourSession=Your session
-Sessions=Users Sessions
-WebUserGroup=Web server user/group
+Foundation=Jamg'arma
+Version=Versiya
+Publisher=Nashriyotchi
+VersionProgram=Dastur versiyasi
+VersionLastInstall=Dastlabki o'rnatish versiyasi
+VersionLastUpgrade=Eng so'nggi versiya yangilandi
+VersionExperimental=Eksperimental
+VersionDevelopment=Rivojlanish
+VersionUnknown=Noma'lum
+VersionRecommanded=Tavsiya etiladi
+FileCheck=Fayllar yaxlitligini tekshiradi
+FileCheckDesc=Ushbu vosita har bir faylni rasmiy fayl bilan taqqoslab, fayllarning yaxlitligini va sizning ilovangizni sozlashni tekshirishga imkon beradi. Ba'zi o'rnatish barqarorlarining qiymati ham tekshirilishi mumkin. Ushbu vositadan biron bir fayl o'zgartirilganligini aniqlash uchun foydalanishingiz mumkin (masalan, xaker tomonidan).
+FileIntegrityIsStrictlyConformedWithReference=Fayllarning yaxlitligi ma'lumotnomaga to'liq mos keladi.
+FileIntegrityIsOkButFilesWereAdded=Fayllarning yaxlitligini tekshirish o'tdi, ammo ba'zi yangi fayllar qo'shildi.
+FileIntegritySomeFilesWereRemovedOrModified=Fayllarning yaxlitligini tekshirib bo'lmadi. Ba'zi fayllar o'zgartirildi, olib tashlandi yoki qo'shildi.
+GlobalChecksum=Global nazorat summasi
+MakeIntegrityAnalysisFrom=Dastur fayllarining yaxlitligini tahlil qiling
+LocalSignature=O'rnatilgan mahalliy imzo (unchalik ishonchli emas)
+RemoteSignature=Masofadagi uzoq imzo (ishonchli)
+FilesMissing=Yo'qotilgan fayllar
+FilesUpdated=Yangilangan fayllar
+FilesModified=O'zgartirilgan fayllar
+FilesAdded=Fayllar qo'shildi
+FileCheckDolibarr=Ilova fayllarining yaxlitligini tekshiring
+AvailableOnlyOnPackagedVersions=Butunlikni tekshirish uchun mahalliy fayl faqat dastur rasmiy paketdan o'rnatilganda mavjud bo'ladi
+XmlNotFound=Xml Integrity Ilova fayli topilmadi
+SessionId=Sessiya identifikatori
+SessionSaveHandler=Seanslarni saqlash uchun ishlov beruvchi
+SessionSavePath=Sessiyani saqlash joyini saqlash
+PurgeSessions=Sessiyalarni tozalash
+ConfirmPurgeSessions=Siz haqiqatan ham barcha mashg'ulotlarni tozalashni xohlaysizmi? Bu har bir foydalanuvchini o'chiradi (o'zingizdan tashqari).
+NoSessionListWithThisHandler=PHP-da tuzilgan sessiya ishlovchilarini saqlash barcha ishlaydigan sessiyalarni ro'yxatlashiga yo'l qo'ymaydi.
+LockNewSessions=Yangi ulanishlarni qulflang
+ConfirmLockNewSessions=Dolibarr-ning yangi ulanishini o'zingiz bilan cheklashni xohlaysizmi? Shundan so'ng faqat <b> %s </b> foydalanuvchisi ulanish imkoniyatiga ega bo'ladi.
+UnlockNewSessions=Ulanish qulfini olib tashlang
+YourSession=Sizning sessiyangiz
+Sessions=Foydalanuvchilar sessiyalari
+WebUserGroup=Veb-server foydalanuvchisi / guruhi
 PermissionsOnFiles=Permissions on files
 PermissionsOnFilesInWebRoot=Permissions on files in web root directory
 PermissionsOnFile=Permissions on file %s
-NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
-DBStoringCharset=Database charset to store data
-DBSortingCharset=Database charset to sort data
+NoSessionFound=Sizning PHP konfiguratsiyangiz faol seanslar ro'yxatiga ruxsat berilmaganga o'xshaydi. Seanslarni saqlash uchun ishlatiladigan katalog (<b> %s </b>) himoyalangan bo'lishi mumkin (masalan, OS ruxsatnomalari yoki open_basedir PHP direktivasi bilan).
+DBStoringCharset=Ma'lumotlarni saqlash uchun ma'lumotlar bazasi belgisi
+DBSortingCharset=Ma'lumotlarni saralash uchun ma'lumotlar bazasi belgisi
 HostCharset=Host charset
 ClientCharset=Client charset
 ClientSortingCharset=Client collation
-WarningModuleNotActive=Module <b>%s</b> must be enabled
-WarningOnlyPermissionOfActivatedModules=Only permissions related to activated modules are shown here. You can activate other modules in the Home->Setup->Modules page.
-DolibarrSetup=Dolibarr install or upgrade
-InternalUser=Internal user
-ExternalUser=External user
-InternalUsers=Internal users
-ExternalUsers=External users
-GUISetup=Display
-SetupArea=Setup
+WarningModuleNotActive=<b> %s </b> moduli yoqilgan bo'lishi kerak
+WarningOnlyPermissionOfActivatedModules=Bu erda faqat faollashtirilgan modullarga tegishli ruxsatlar ko'rsatilgan. Boshqa modullarni Home-> Setup-> Modules sahifasida faollashtirishingiz mumkin.
+DolibarrSetup=Dolibarr-ni o'rnating yoki yangilang
+InternalUser=Ichki foydalanuvchi
+ExternalUser=Tashqi foydalanuvchi
+InternalUsers=Ichki foydalanuvchilar
+ExternalUsers=Tashqi foydalanuvchilar
+GUISetup=Displey
+SetupArea=Sozlash; o'rnatish
 UploadNewTemplate=Upload new template(s)
-FormToTestFileUploadForm=Form to test file upload (according to setup)
+FormToTestFileUploadForm=Faylni yuklashni sinab ko'rish uchun shakl (sozlash bo'yicha)
 ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
 ModuleIsEnabled=The module/application <b>%s</b> has been enabled
-IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
-RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
-RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
-SecuritySetup=Security setup
+IfModuleEnabled=Eslatma: ha faqat <b> %s </b> moduli yoqilgan taqdirda samarali bo'ladi.
+RemoveLock=Yangilash / O'rnatish vositasidan foydalanishga ruxsat berish uchun fayl mavjud bo'lsa, uni o'chirish / qayta nomlash <b> %s </b>.
+RestoreLock=Yangilash / O'rnatish vositasidan boshqa foydalanishni o'chirish uchun faqat o'qish uchun ruxsat berilgan holda <b> %s </b> faylini tiklang.
+SecuritySetup=Xavfsizlikni sozlash
 PHPSetup=PHP setup
 OSSetup=OS setup
-SecurityFilesDesc=Define here options related to security about uploading files.
-ErrorModuleRequirePHPVersion=Error, this module requires PHP version %s or higher
-ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %s or higher
-ErrorDecimalLargerThanAreForbidden=Error, a precision higher than <b>%s</b> is not supported.
-DictionarySetup=Dictionary setup
-Dictionary=Dictionaries
-ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record
-ErrorCodeCantContainZero=Code can't contain value 0
-DisableJavascript=Disable JavaScript and Ajax functions
+SecurityFilesDesc=Fayllarni yuklash bilan bog'liq xavfsizlik bilan bog'liq variantlarni bu erda aniqlang.
+ErrorModuleRequirePHPVersion=Xato, ushbu modulda PHP-ning %s yoki undan yuqori versiyasi talab qilinadi
+ErrorModuleRequireDolibarrVersion=Xato, ushbu modulda Dolibarr %s yoki undan yuqori versiyasi talab qilinadi
+ErrorDecimalLargerThanAreForbidden=Xato, <b> %s </b> dan yuqori aniqlik qo'llab-quvvatlanmaydi.
+DictionarySetup=Lug'atni sozlash
+Dictionary=Lug'atlar
+ErrorReservedTypeSystemSystemAuto="System" va "systemauto" qiymati saqlanib qolgan. O'zingizning yozuvingizni qo'shish uchun "foydalanuvchi" dan qiymat sifatida foydalanishingiz mumkin
+ErrorCodeCantContainZero=Kod 0 qiymatini o'z ichiga olmaydi
+DisableJavascript=JavaScript va Ajax funktsiyalarini o'chirib qo'ying
 DisableJavascriptNote=Note: For test or debug purpose. For optimization for blind person or text browsers, you may prefer to use the setup on the profile of user
-UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
-DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
-NumberOfKeyToSearch=Number of characters to trigger search: %s
+UseSearchToSelectCompanyTooltip=Agar sizda uchinchi tomonlar soni ko'p bo'lsa (> 100 000), tezlikni COMPANY_DONOTSEARCH_ANYWHERE-ni Setup-> Other-da 1-ga o'rnatish orqali oshirishingiz mumkin. Keyin qidirish satr boshlanishi bilan cheklanadi.
+UseSearchToSelectContactTooltip=Agar sizda uchinchi tomonlar soni juda katta bo'lsa (> 100 000), siz CONTACT_DONOTSEARCH_ANYWHERE doimiyligini O'rnatish -> Boshqalar-da 1 ga o'rnatish orqali tezlikni oshirishingiz mumkin. Keyin qidirish satr boshlanishi bilan cheklanadi.
+DelaiedFullListToSelectCompany=Uchinchi tomonlarning birlashtirilgan ro'yxati tarkibini yuklashdan oldin tugma bosilguncha kuting. <br> Agar sizda uchinchi tomonlar ko'p bo'lsa, bu unumdorlikni oshirishi mumkin, ammo bu unchalik qulay emas.
+DelaiedFullListToSelectContact=Kontaktlar ro'yxati tarkibini yuklashdan oldin tugma bosilguncha kuting. <br> Agar sizda ko'plab kontaktlar mavjud bo'lsa, bu ishlashni oshirishi mumkin, ammo bu unchalik qulay emas.
+NumberOfKeyToSearch=Qidiruvni boshlash uchun belgilar soni: %s
 NumberOfBytes=Number of Bytes
 SearchString=Search string
-NotAvailableWhenAjaxDisabled=Not available when Ajax disabled
-AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
-JavascriptDisabled=JavaScript disabled
-UsePreviewTabs=Use preview tabs
-ShowPreview=Show preview
+NotAvailableWhenAjaxDisabled=Ajax o'chirib qo'yilganda mavjud emas
+AllowToSelectProjectFromOtherCompany=Uchinchi shaxsning hujjatida boshqa uchinchi tomon bilan bog'langan loyihani tanlashi mumkin
+JavascriptDisabled=JavaScript o'chirilgan
+UsePreviewTabs=Oldindan ko'rish yorliqlaridan foydalaning
+ShowPreview=Oldindan ko'rishni ko'rsatish
 ShowHideDetails=Show-Hide details
-PreviewNotAvailable=Preview not available
-ThemeCurrentlyActive=Theme currently active
-MySQLTimeZone=TimeZone MySql (database)
-TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submitted string. The timezone has effect only when using the UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
-Space=Space
-Table=Table
-Fields=Fields
-Index=Index
-Mask=Mask
-NextValue=Next value
-NextValueForInvoices=Next value (invoices)
-NextValueForCreditNotes=Next value (credit notes)
-NextValueForDeposit=Next value (down payment)
-NextValueForReplacements=Next value (replacements)
-MustBeLowerThanPHPLimit=Note: your PHP configuration currently limits the maximum filesize for upload to <b>%s</b> %s, irrespective of the value of this parameter
-NoMaxSizeByPHPLimit=Note: No limit is set in your PHP configuration
-MaxSizeForUploadedFiles=Maximum size for uploaded files (0 to disallow any upload)
-UseCaptchaCode=Use graphical code (CAPTCHA) on login page
-AntiVirusCommand=Full path to antivirus command
-AntiVirusCommandExample=Example for ClamAv Daemon (require clamav-daemon): /usr/bin/clamdscan<br>Example for ClamWin (very very slow): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
-AntiVirusParam= More parameters on command line
-AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
-ComptaSetup=Accounting module setup
-UserSetup=User management setup
-MultiCurrencySetup=Multi-currency setup
-MenuLimits=Limits and accuracy
-MenuIdParent=Parent menu ID
-DetailMenuIdParent=ID of parent menu (empty for a top menu)
-DetailPosition=Sort number to define menu position
-AllMenus=All
-NotConfigured=Module/Application not configured
-Active=Active
-SetupShort=Setup
-OtherOptions=Other options
-OtherSetup=Other Setup
-CurrentValueSeparatorDecimal=Decimal separator
-CurrentValueSeparatorThousand=Thousand separator
-Destination=Destination
-IdModule=Module ID
-IdPermissions=Permissions ID
-LanguageBrowserParameter=Parameter %s
-LocalisationDolibarrParameters=Localization parameters
-ClientTZ=Client Time Zone (user)
-ClientHour=Client time (user)
-OSTZ=Server OS Time Zone
-PHPTZ=PHP server Time Zone
-DaylingSavingTime=Daylight saving time
-CurrentHour=PHP Time (server)
-CurrentSessionTimeOut=Current session timeout
-YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a .htaccess file with a line like this "SetEnv TZ Europe/Paris"
+PreviewNotAvailable=Oldindan ko‘rib chiqish imkoniyati mavjud emas
+ThemeCurrentlyActive=Mavzu hozirda faol
+MySQLTimeZone=TimeZone MySql (ma'lumotlar bazasi)
+TZHasNoEffect=Sanalar ma'lumotlar bazasi serveri tomonidan saqlanadi va qaytariladi, xuddi taqdim etilgan satrda saqlangandek. Vaqt zonasi faqat UNIX_TIMESTAMP funktsiyasidan foydalanganda ta'sir qiladi (Dolibarr tomonidan foydalanilmasligi kerak, shuning uchun ma'lumotlar bazasi TZ hech qanday ta'sir ko'rsatmasligi kerak, hatto ma'lumotlar kiritilganidan keyin ham o'zgarishi kerak).
+Space=Bo'shliq
+Table=Jadval
+Fields=Maydonlar
+Index=Indeks
+Mask=Niqob
+NextValue=Keyingi qiymat
+NextValueForInvoices=Keyingi qiymat (hisob-fakturalar)
+NextValueForCreditNotes=Keyingi qiymat (kredit yozuvlari)
+NextValueForDeposit=Keyingi qiymat (dastlabki to'lov)
+NextValueForReplacements=Keyingi qiymat (almashtirish)
+MustBeLowerThanPHPLimit=Eslatma: sizning PHP konfiguratsiyangiz hozirda ushbu parametr qiymatidan qat'i nazar, <b> %s </b> %s-ga yuklash uchun maksimal hajmni cheklaydi
+NoMaxSizeByPHPLimit=Eslatma: PHP-ning konfiguratsiyasida chegara o'rnatilmagan
+MaxSizeForUploadedFiles=Yuklangan fayllar uchun maksimal o'lcham (har qanday yuklashga ruxsat bermaslik uchun 0)
+UseCaptchaCode=Kirish sahifasida grafik koddan (CAPTCHA) foydalaning
+AntiVirusCommand=Antivirus buyrug'iga to'liq yo'l
+AntiVirusCommandExample=ClamAv Daemon uchun namuna (clamav-demon talab qilinadi): / usr / bin / clamdscan <br> ClamWin uchun misol (juda sekin): c: \\ Progra ~ 1 \\ ClamWin \\ bin \\ clamscan.exe
+AntiVirusParam= Buyruq satrida ko'proq parametrlar
+AntiVirusParamExample=ClamAv Daemon uchun namuna: --fdpass <br> ClamWin uchun misol: --database = "C: \\ Program Files (x86) \\ ClamWin \\ lib"
+ComptaSetup=Buxgalteriya modulini sozlash
+UserSetup=Foydalanuvchilarni boshqarish sozlamalari
+MultiCurrencySetup=Ko'p valyutani sozlash
+MenuLimits=Cheklovlar va aniqlik
+MenuIdParent=Ota-ona menyusi identifikatori
+DetailMenuIdParent=Asosiy menyu identifikatori (yuqori menyu uchun bo'sh)
+DetailPosition=Menyu holatini aniqlash uchun raqamni saralash
+AllMenus=Hammasi
+NotConfigured=Modul / dastur tuzilmagan
+Active=Faol
+SetupShort=Sozlash; o'rnatish
+OtherOptions=Boshqa variantlar
+OtherSetup=Boshqa sozlash
+CurrentValueSeparatorDecimal=O'nli ajratuvchi
+CurrentValueSeparatorThousand=Ming ajratuvchi
+Destination=Belgilangan joy
+IdModule=Modul identifikatori
+IdPermissions=Ruxsatlar identifikatori
+LanguageBrowserParameter=Parametr %s
+LocalisationDolibarrParameters=Mahalliylashtirish parametrlari
+ClientTZ=Mijozning vaqt zonasi (foydalanuvchi)
+ClientHour=Mijoz vaqti (foydalanuvchi)
+OSTZ=Server operatsion tizimining vaqt zonasi
+PHPTZ=PHP-server vaqt zonasi
+DaylingSavingTime=Yozgi vaqt
+CurrentHour=PHP vaqti (server)
+CurrentSessionTimeOut=Joriy mashg'ulotning tanaffusi
+YouCanEditPHPTZ=Boshqa PHP vaqt zonasini o'rnatish uchun (shart emas), siz "SetEnv TZ Europe / Paris" kabi qator bilan .htaccess faylini qo'shishga urinib ko'rishingiz mumkin.
 HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but of the timezone of the server.
-Box=Widget
-Boxes=Widgets
-MaxNbOfLinesForBoxes=Max. number of lines for widgets
+Box=Vidjet
+Boxes=Vidjetlar
+MaxNbOfLinesForBoxes=Maks. vidjetlar uchun qatorlar soni
 AllWidgetsWereEnabled=All available widgets are enabled
-PositionByDefault=Default order
-Position=Position
-MenusDesc=Menu managers set content of the two menu bars (horizontal and 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.
-MenuForUsers=Menu for users
-LangFile=.lang file
+PositionByDefault=Standart buyurtma
+Position=Lavozim
+MenusDesc=Menyu menejerlari ikkita menyu satrining tarkibini belgilaydilar (gorizontal va vertikal).
+MenusEditorDesc=Menyu muharriri maxsus menyu yozuvlarini aniqlashga imkon beradi. Beqarorlik va menyuga doimiy ravishda kirib bo'lmaydigan yozuvlarni oldini olish uchun uni diqqat bilan ishlating. <br> Ba'zi modullar menyu yozuvlarini qo'shadilar (menyuda <b> Hammasi asosan </b>). Agar siz ushbu yozuvlarning bir qismini xato bilan olib tashlasangiz, ularni o'chirib qo'yish va modulni qayta tiklashni tiklashingiz mumkin.
+MenuForUsers=Foydalanuvchilar uchun menyu
+LangFile=.lang fayli
 Language_en_US_es_MX_etc=Language (en_US, es_MX, ...)
-System=System
-SystemInfo=System information
-SystemToolsArea=System tools area
-SystemToolsAreaDesc=This area provides administration functions. Use the menu to choose the required feature.
-Purge=Purge
-PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
-PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Parameter can be 'tempfilesold', 'logfiles' or both 'tempfilesold+logfiles'. Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete log and temporary files
-PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
-PurgeRunNow=Purge now
-PurgeNothingToDelete=No directory or files to delete.
-PurgeNDirectoriesDeleted=<b>%s</b> files or directories deleted.
+System=Tizim
+SystemInfo=Tizim haqida ma'lumot
+SystemToolsArea=Tizim asboblari maydoni
+SystemToolsAreaDesc=Ushbu yo'nalish ma'muriy funktsiyalarni taqdim etadi. Kerakli xususiyatni tanlash uchun menyudan foydalaning.
+Purge=Tozalash
+PurgeAreaDesc=Ushbu sahifa Dolibarr tomonidan yaratilgan yoki saqlangan barcha fayllarni o'chirishga imkon beradi (vaqtinchalik fayllar yoki <b> %s </b> katalogidagi barcha fayllar). Ushbu xususiyatdan foydalanish odatda shart emas. Dolibarr veb-server tomonidan yaratilgan fayllarni o'chirishga ruxsat bermaydigan provayder tomonidan joylashtirilgan foydalanuvchilar uchun vaqtinchalik echim sifatida taqdim etiladi.
+PurgeDeleteLogFile=Syslog moduli uchun belgilangan <b> %s </b>, shu jumladan jurnal fayllarini o'chirish (ma'lumotlarni yo'qotish xavfi yo'q)
+PurgeDeleteTemporaryFiles=Barcha jurnal va vaqtinchalik fayllarni o'chirib tashlang (ma'lumotlarni yo'qotish xavfi yo'q). Parametr "tempfilesold", "logfiles" yoki ikkalasi ham "tempfilesold + logfiles" bo'lishi mumkin. Eslatma: Vaqtinchalik fayllarni o'chirish faqat vaqtinchalik katalog 24 soatdan ko'proq vaqt oldin yaratilgan taqdirda amalga oshiriladi.
+PurgeDeleteTemporaryFilesShort=Jurnal va vaqtinchalik fayllarni o'chirib tashlang
+PurgeDeleteAllFilesInDocumentsDir=Katalogdagi barcha fayllarni o'chirib tashlang: <b> %s </b>. <br> Bu elementlar bilan bog'liq barcha yaratilgan hujjatlarni (uchinchi shaxslar, hisob-fakturalar va boshqalar), ECM moduliga yuklangan fayllarni, ma'lumotlar bazasining zaxira zaxiralarini va vaqtinchalik fayllarni o'chirib tashlaydi.
+PurgeRunNow=Hozir tozalang
+PurgeNothingToDelete=O'chirish uchun katalog yoki fayl yo'q.
+PurgeNDirectoriesDeleted= <b> %s </b> fayllari yoki kataloglari o'chirildi.
 PurgeNDirectoriesFailed=Failed to delete <b>%s</b> files or directories.
-PurgeAuditEvents=Purge all security events
-ConfirmPurgeAuditEvents=Are you sure you want to purge all security events? All security logs will be deleted, no other data will be removed.
-GenerateBackup=Generate backup
-Backup=Backup
-Restore=Restore
-RunCommandSummary=Backup has been launched with the following command
-BackupResult=Backup result
-BackupFileSuccessfullyCreated=Backup file successfully generated
-YouCanDownloadBackupFile=The generated file can now be downloaded
-NoBackupFileAvailable=No backup files available.
-ExportMethod=Export method
-ImportMethod=Import method
-ToBuildBackupFileClickHere=To build a backup file, click <a href="%s">here</a>.
-ImportMySqlDesc=To import a MySQL backup file, you may use phpMyAdmin via your hosting or use the mysql command from the Command line.<br>For example:
-ImportPostgreSqlDesc=To import a backup file, you must use pg_restore command from command line:
-ImportMySqlCommand=%s %s < mybackupfile.sql
+PurgeAuditEvents=Barcha xavfsizlik tadbirlarini tozalang
+ConfirmPurgeAuditEvents=Barcha xavfsizlik tadbirlarini tozalamoqchimisiz? Barcha xavfsizlik jurnallari o'chiriladi, boshqa ma'lumotlar o'chirilmaydi.
+GenerateBackup=Zaxira nusxasini yarating
+Backup=Zaxira nusxasi
+Restore=Qayta tiklash
+RunCommandSummary=Zaxira nusxasi quyidagi buyruq bilan ishga tushirildi
+BackupResult=Zaxira natijasi
+BackupFileSuccessfullyCreated=Zaxira fayli muvaffaqiyatli yaratildi
+YouCanDownloadBackupFile=Yaratilgan faylni endi yuklab olish mumkin
+NoBackupFileAvailable=Zaxira fayllari mavjud emas.
+ExportMethod=Eksport usuli
+ImportMethod=Import usuli
+ToBuildBackupFileClickHere=Zaxira faylini yaratish uchun <a href="%s"> tugmachasini bosing </a>.
+ImportMySqlDesc=MySQL-ning zaxira faylini import qilish uchun phpMyAdmin-dan xosting orqali foydalanishingiz yoki buyruq satridan mysql buyrug'idan foydalanishingiz mumkin. <br> Masalan:
+ImportPostgreSqlDesc=Zaxira faylini import qilish uchun buyruq satridan pg_restore buyrug'ini ishlatishingiz kerak:
+ImportMySqlCommand=%s %s <mybackupfile.sql
 ImportPostgreSqlCommand=%s %s mybackupfile.sql
-FileNameToGenerate=Filename for backup:
-Compression=Compression
-CommandsToDisableForeignKeysForImport=Command to disable foreign keys on import
-CommandsToDisableForeignKeysForImportWarning=Mandatory if you want to be able to restore your sql dump later
-ExportCompatibility=Compatibility of generated export file
+FileNameToGenerate=Zaxira nusxasi uchun fayl nomi:
+Compression=Siqish
+CommandsToDisableForeignKeysForImport=Import paytida chet el kalitlarini o'chirib qo'yish buyrug'i
+CommandsToDisableForeignKeysForImportWarning=SQL dump-ni keyinroq tiklashni xohlasangiz, majburiydir
+ExportCompatibility=Yaratilgan eksport faylining mosligi
 ExportUseMySQLQuickParameter=Use the --quick parameter
 ExportUseMySQLQuickParameterHelp=The '--quick' parameter helps limit RAM consumption for large tables.
-MySqlExportParameters=MySQL export parameters
-PostgreSqlExportParameters= PostgreSQL export parameters
-UseTransactionnalMode=Use transactional mode
-FullPathToMysqldumpCommand=Full path to mysqldump command
-FullPathToPostgreSQLdumpCommand=Full path to pg_dump command
-AddDropDatabase=Add DROP DATABASE command
-AddDropTable=Add DROP TABLE command
-ExportStructure=Structure
-NameColumn=Name columns
-ExtendedInsert=Extended INSERT
-NoLockBeforeInsert=No lock commands around INSERT
-DelayedInsert=Delayed insert
-EncodeBinariesInHexa=Encode binary data in hexadecimal
-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
-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 trashcan to disable it.
-OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button <span class="small valignmiddle">%s</span> of each module to enable or disable a module/application.
-ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
-ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
-ModulesMarketPlaces=Find external app/modules
+MySqlExportParameters=MySQL eksport parametrlari
+PostgreSqlExportParameters= PostgreSQL eksport parametrlari
+UseTransactionnalMode=Tranzaksiya rejimidan foydalaning
+FullPathToMysqldumpCommand=Mysqldump buyrug'iga to'liq yo'l
+FullPathToPostgreSQLdumpCommand=Pg_dump buyrug'iga to'liq yo'l
+AddDropDatabase=DROP DATABASE buyrug'ini qo'shing
+AddDropTable=DROP TABLE buyrug'ini qo'shing
+ExportStructure=Tuzilishi
+NameColumn=Ustunlarni nomlash
+ExtendedInsert=Kengaytirilgan INSERT
+NoLockBeforeInsert=INSERT atrofida qulflash buyruqlari yo'q
+DelayedInsert=Kechiktirilgan joylashtirma
+EncodeBinariesInHexa=Ikkilik ma'lumotlarni o'n oltilikda kodlash
+IgnoreDuplicateRecords=Ikki nusxadagi yozuvning xatolariga e'tibor bermang (INSERT IGNORE)
+AutoDetectLang=Avtomatik aniqlash (brauzer tili)
+FeatureDisabledInDemo=Demo-da xususiyat o'chirilgan
+FeatureAvailableOnlyOnStable=Xususiyat faqat rasmiy barqaror versiyalarida mavjud
+BoxesDesc=Vidjetlar - bu ba'zi sahifalarni shaxsiylashtirish uchun qo'shishingiz mumkin bo'lgan ba'zi ma'lumotlarni aks ettiruvchi komponentlar. Maqsadli sahifani tanlash va "Faollashtirish" tugmachasini bosish yoki o'chirish uchun axlat qutisini bosish orqali vidjetni ko'rsatish yoki ko'rsatmaslik o'rtasida tanlov qilishingiz mumkin.
+OnlyActiveElementsAreShown=Faqat <a href="%s"> yoqilgan </a> modullarining elementlari ko'rsatilgan.
+ModulesDesc=Modullar / dasturlar dasturiy ta'minotda qaysi funktsiyalar mavjudligini aniqlaydi. Ba'zi modullar modulni faollashtirgandan so'ng foydalanuvchilarga ruxsat berilishini talab qiladi. Modul / dasturni yoqish yoki o'chirish uchun har bir modulning <span class="small valignmiddle"> %s </span> tugmachasini bosing.
+ModulesMarketPlaceDesc=Internetda tashqi veb-saytlarda yuklab olish uchun ko'proq modullarni topishingiz mumkin ...
+ModulesDeployDesc=Agar sizning fayl tizimingizdagi ruxsatnomalar bunga yo'l qo'ysa, siz ushbu vositadan tashqi modulni joylashtirish uchun foydalanishingiz mumkin. Keyin modul <strong> %s </strong> yorlig'ida ko'rinadi.
+ModulesMarketPlaces=Tashqi ilova / modullarni toping
 ModulesDevelopYourModule=Develop your own app/modules
 ModulesDevelopDesc=You may also develop your own module or find a partner to develop one for you.
 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 perform the search on the external market place for you (may be slow, need an internet access)...
@@ -221,282 +221,283 @@ NotCompatible=This module does not seem compatible with your Dolibarr %s (Min %s
 CompatibleAfterUpdate=This module requires an update to your Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=See in Market place
 SeeSetupOfModule=See setup of module %s
+SetOptionTo=Set option <b>%s</b> to %s
 Updated=Updated
-Nouveauté=Novelty
 AchatTelechargement=Buy / Download
-GoModuleSetupArea=To deploy/install a new module, go to the Module setup area: <a href="%s">%s</a>.
-DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
-DoliPartnersDesc=List of companies providing custom-developed modules or features.<br>Note: since Dolibarr is an open source application, <i>anyone</i> experienced in PHP programming should be able to develop a module.
-WebSiteDesc=External websites for more add-on (non-core) modules...
+GoModuleSetupArea=Yangi modulni joylashtirish / o'rnatish uchun Modulni sozlash maydoniga o'ting: <a href="%s"> %s </a>.
+DoliStoreDesc=DoliStore, Dolibarr ERP / CRM tashqi modullari uchun rasmiy bozor
+DoliPartnersDesc=Maxsus ishlab chiqilgan modullar yoki xususiyatlarni taqdim etadigan kompaniyalar ro'yxati. <br> Eslatma: Dolibarr ochiq kodli dastur bo'lgani uchun, <i> PHP dasturlashda tajribali </i> kimdir modul ishlab chiqishi kerak.
+WebSiteDesc=Qo'shimcha (yadroli bo'lmagan) modullar uchun tashqi veb-saytlar ...
 DevelopYourModuleDesc=Some solutions to develop your own module...
-URL=URL
+URL=URL manzili
 RelativeURL=Relative URL
-BoxesAvailable=Widgets available
-BoxesActivated=Widgets activated
-ActivateOn=Activate on
-ActiveOn=Activated on
+BoxesAvailable=Vidjetlar mavjud
+BoxesActivated=Vidjetlar faollashtirildi
+ActivateOn=Yoqish
+ActiveOn=Yoqilgan
 ActivatableOn=Activatable on
-SourceFile=Source file
-AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled
-Required=Required
-UsedOnlyWithTypeOption=Used by some agenda option only
-Security=Security
-Passwords=Passwords
-DoNotStoreClearPassword=Encrypt passwords stored in database (NOT as plain-text). It is strongly recommended to activate this option.
-MainDbPasswordFileConfEncrypted=Encrypt database password stored in conf.php. It is strongly recommended to activate this option.
-InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
-InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
-ProtectAndEncryptPdfFiles=Protect generated PDF files. This is NOT recommended as it breaks bulk PDF generation.
-ProtectAndEncryptPdfFilesDesc=Protection of a PDF document keeps it available to read and print with any PDF browser. However, editing and copying is not possible anymore. Note that using this feature makes building of a global merged PDFs not working.
-Feature=Feature
-DolibarrLicense=License
-Developpers=Developers/contributors
-OfficialWebSite=Dolibarr official web site
-OfficialWebSiteLocal=Local web site (%s)
-OfficialWiki=Dolibarr documentation / Wiki
-OfficialDemo=Dolibarr online demo
-OfficialMarketPlace=Official market place for external modules/addons
-OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
-ReferencedPreferredPartners=Preferred Partners
-OtherResources=Other resources
+SourceFile=Manba fayli
+AvailableOnlyIfJavascriptAndAjaxNotDisabled=Faqatgina JavaScript o'chirib qo'yilmagan bo'lsa mavjud
+Required=Majburiy
+UsedOnlyWithTypeOption=Faqat ba'zi kun tartibi variantlari tomonidan ishlatiladi
+Security=Xavfsizlik
+Passwords=Parollar
+DoNotStoreClearPassword=Ma'lumotlar bazasida saqlangan parollarni shifrlang (oddiy matn sifatida EMAS). Ushbu parametrni faollashtirish tavsiya etiladi.
+MainDbPasswordFileConfEncrypted=Conf.php-da saqlangan ma'lumotlar bazasi parolini shifrlash. Ushbu parametrni faollashtirish tavsiya etiladi.
+InstrucToEncodePass=Parolni <b> conf.php </b> faylida kodlash uchun <br> <b> $ dolibarr_main_db_pass = "..." qatorini almashtiring; </b> <br> tomonidan <br> <b> $ dolibarr_main_db_pass = "crypted: %s"; </b>
+InstrucToClearPass=Parolni <b> conf.php </b> faylida dekodlash (aniq) qilish uchun <br> <b> $ dolibarr_main_db_pass = "crypted: ..." qatorini almashtiring; </b> <br> tomonidan <br> <b> $ dolibarr_main_db_pass = "%s"; </b>
+ProtectAndEncryptPdfFiles=Yaratilgan PDF-fayllarni himoya qilish. Bu tavsiya etilmaydi, chunki u ommaviy ishlab chiqarishni buzadi.
+ProtectAndEncryptPdfFilesDesc=PDF-hujjatni himoya qilish har qanday PDF-brauzerda o'qish va chop etish imkoniyatini beradi. Biroq, tahrirlash va nusxalash endi mumkin emas. Shuni esda tutingki, ushbu funktsiyadan foydalanish global birlashtirilgan PDF-fayllarni yaratishni yaroqsiz holga keltiradi.
+Feature=Xususiyat
+DolibarrLicense=Litsenziya
+Developpers=Ishlab chiquvchilar / hissadorlar
+OfficialWebSite=Dolibarr rasmiy veb-sayti
+OfficialWebSiteLocal=Mahalliy veb-sayt (%s)
+OfficialWiki=Dolibarr hujjatlari / Wiki
+OfficialDemo=Dolibarr onlayn demo
+OfficialMarketPlace=Tashqi modullar / qo'shimchalar uchun rasmiy bozor joyi
+OfficialWebHostingService=Yuborilgan veb-xosting xizmatlari (Cloud hosting)
+ReferencedPreferredPartners=Afzal sheriklar
+OtherResources=Boshqa manbalar
 ExternalResources=External Resources
 SocialNetworks=Social Networks
 SocialNetworkId=Social Network ID
-ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
-ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
-HelpCenterDesc1=Here are some resources for getting help and support with Dolibarr.
-HelpCenterDesc2=Some of these resources are only available in <b>english</b>.
-CurrentMenuHandler=Current menu handler
-MeasuringUnit=Measuring unit
-LeftMargin=Left margin
-TopMargin=Top margin
-PaperSize=Paper type
-Orientation=Orientation
+ForDocumentationSeeWiki=<br> foydalanuvchi yoki ishlab chiquvchi hujjatlari uchun (Dolib, Savol-javoblar ...) Dolibarr Wiki-ga qarang: <br> <b> <a href="%s" target="_blank"> %s a0e40dc079cf87
+ForAnswersSeeForum=Boshqa savollar / yordam uchun siz Dolibarr forumidan foydalanishingiz mumkin: <br> <b> <a href="%s" target="_blank"> %s </a> </b>
+HelpCenterDesc1=Dolibarr bilan yordam va yordam olish uchun ba'zi manbalar.
+HelpCenterDesc2=Ushbu manbalardan ba'zilari faqat <b> inglizcha </b> da mavjud.
+CurrentMenuHandler=Joriy menyu boshqaruvchisi
+MeasuringUnit=O'lchov birligi
+LeftMargin=Chap chekka
+TopMargin=Yuqori marja
+PaperSize=Qog'oz turi
+Orientation=Yo'nalish
 SpaceX=Space X
-SpaceY=Space Y
-FontSize=Font size
-Content=Content
-NoticePeriod=Notice period
-NewByMonth=New by month
-Emails=Emails
-EMailsSetup=Emails setup
-EMailsDesc=This page allows you to set parameters or options for email sending.
+SpaceY=Bo'shliq Y
+FontSize=Shrift hajmi
+Content=Tarkib
+NoticePeriod=Bildirishnoma muddati
+NewByMonth=Oyga yangi
+Emails=Elektron pochta xabarlari
+EMailsSetup=Elektron pochta xabarlarini sozlash
+EMailsDesc=Ushbu sahifa sizga elektron pochta xabarlarini yuborish parametrlari yoki parametrlarini o'rnatishga imkon beradi.
 EmailSenderProfiles=Emails sender profiles
 EMailsSenderProfileDesc=You can keep this section empty. If you enter some emails here, they will be added to the list of possible senders into the combobox when your write a new email.
-MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (default value in php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (default value in php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix-like systems)
-MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into PHP on Unix-like systems)
-MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (default value in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Email used for error returns emails (fields 'Errors-To' in emails sent)
-MAIN_MAIL_AUTOCOPY_TO= Copy (Bcc) all sent emails to
-MAIN_DISABLE_ALL_MAILS=Disable all email sending (for test purposes or demos)
+MAIN_MAIL_SMTP_PORT=SMTP / SMTPS porti (php.ini-da standart qiymat: <b> %s </b>)
+MAIN_MAIL_SMTP_SERVER=SMTP / SMTPS Host (php.ini-da standart qiymat: <b> %s </b>)
+MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP / SMTPS porti (Unix-ga o'xshash tizimlarda PHP-da aniqlanmagan)
+MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP / SMTPS xosti (Unixga o'xshash tizimlarda PHP-da aniqlanmagan)
+MAIN_MAIL_EMAIL_FROM=Avtomatik elektron pochta xabarlari uchun jo'natuvchi elektron pochtasi (php.ini-da standart qiymat: <b> %s </b>)
+MAIN_MAIL_ERRORS_TO=Xato uchun foydalanilgan elektron pochta xabarlarini qaytaradi (elektron pochtalarda "Xatolar" maydonlari)
+MAIN_MAIL_AUTOCOPY_TO= Barcha elektron pochta xabarlarini nusxa ko'chiring (Bcc)
+MAIN_DISABLE_ALL_MAILS=Barcha elektron pochta xabarlarini yuborishni o'chirib qo'ying (sinov maqsadida yoki namoyish uchun)
 MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
 MAIN_MAIL_ENABLED_USER_DEST_SELECT=Suggest emails of employees (if defined) into the list of predefined recipient when writing a new email
-MAIN_MAIL_SENDMODE=Email sending method
-MAIN_MAIL_SMTPS_ID=SMTP ID (if sending server requires authentication)
-MAIN_MAIL_SMTPS_PW=SMTP Password (if sending server requires authentication)
-MAIN_MAIL_EMAIL_TLS=Use TLS (SSL) encryption
-MAIN_MAIL_EMAIL_STARTTLS=Use TLS (STARTTLS) encryption
+MAIN_MAIL_SENDMODE=Elektron pochta xabarlarini yuborish usuli
+MAIN_MAIL_SMTPS_ID=SMTP identifikatori (agar serverni yuborish autentifikatsiyani talab qilsa)
+MAIN_MAIL_SMTPS_PW=SMTP paroli (agar serverni yuborish autentifikatsiyani talab qilsa)
+MAIN_MAIL_EMAIL_TLS=TLS (SSL) shifrlashdan foydalaning
+MAIN_MAIL_EMAIL_STARTTLS=TLS (STARTTLS) shifrlashdan foydalaning
 MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Use DKIM to generate email signature
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Email Domain for use with dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Name of dkim selector
 MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY=Private key for dkim signing
-MAIN_DISABLE_ALL_SMS=Disable all SMS sending (for test purposes or demos)
-MAIN_SMS_SENDMODE=Method to use to send SMS
-MAIN_MAIL_SMS_FROM=Default sender phone number for SMS sending
-MAIN_MAIL_DEFAULT_FROMTYPE=Default sender email for manual sending (User email or Company email)
-UserEmail=User email
-CompanyEmail=Company Email
-FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your sendmail program locally.
+MAIN_DISABLE_ALL_SMS=Barcha SMS-xabarlarni yuborishni o'chirib qo'ying (sinov maqsadida yoki namoyish uchun)
+MAIN_SMS_SENDMODE=SMS yuborishda foydalanish usuli
+MAIN_MAIL_SMS_FROM=SMS yuborish uchun standart yuboruvchi telefon raqami
+MAIN_MAIL_DEFAULT_FROMTYPE=Qo'lda yuborish uchun standart yuboruvchi elektron pochta xabarlari (foydalanuvchi elektron pochtasi yoki kompaniya elektron pochtasi)
+UserEmail=Foydalanuvchi elektron pochtasi
+CompanyEmail=Kompaniyaning elektron pochtasi
+FeatureNotAvailableOnLinux=Xususiyat Unix tizimlarida mavjud emas. Sendmail dasturini mahalliy darajada sinab ko'ring.
 FixOnTransifex=Fix the translation on the online translation platform of project
-SubmitTranslation=If the translation for this language is not complete or you find errors, you can correct this by editing files in directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
-ModuleSetup=Module setup
-ModulesSetup=Modules/Application setup
-ModuleFamilyBase=System
-ModuleFamilyCrm=Customer Relationship Management (CRM)
-ModuleFamilySrm=Vendor Relationship Management (VRM)
-ModuleFamilyProducts=Product Management (PM)
-ModuleFamilyHr=Human Resource Management (HR)
-ModuleFamilyProjects=Projects/Collaborative work
-ModuleFamilyOther=Other
-ModuleFamilyTechnic=Multi-modules tools
-ModuleFamilyExperimental=Experimental modules
-ModuleFamilyFinancial=Financial Modules (Accounting/Treasury)
-ModuleFamilyECM=Electronic Content Management (ECM)
-ModuleFamilyPortal=Websites and other frontal application
-ModuleFamilyInterface=Interfaces with external systems
-MenuHandlers=Menu handlers
-MenuAdmin=Menu editor
-DoNotUseInProduction=Do not use in production
-ThisIsProcessToFollow=Upgrade procedure:
-ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
-StepNb=Step %s
-FindPackageFromWebSite=Find a package that provides the features you need (for example on the official web site %s).
-DownloadPackageFromWebSite=Download package (for example from the official web site %s).
-UnpackPackageInDolibarrRoot=Unpack/unzip the packaged files into your Dolibarr server directory: <b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack/unzip the packaged files into the server directory dedicated to external modules:<br><b>%s</b>
-SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going to the page setup modules: <a href="%s">%s</a>.
-NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
-InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<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=You can upload the .zip file of module package from here:
-CurrentVersion=Dolibarr current version
-CallUpdatePage=Browse to the page that updates the database structure and data: %s.
-LastStableVersion=Latest stable version
-LastActivationDate=Latest activation date
+SubmitTranslation=Agar ushbu til uchun tarjima tugallanmagan bo'lsa yoki siz xatolarni topsangiz, buni <b> langs / %s </b> katalogidagi fayllarni tahrirlash orqali o'zgartirishingiz va o'zgartirishingizni www.transifex.com/dolibarr-association/dolibarr/ ga yuborishingiz mumkin.
+SubmitTranslationENUS=Agar ushbu til uchun tarjima tugallanmagan bo'lsa yoki xatolarni topsangiz, uni fayllarni <b> langs / %s </b> katalogiga tahrirlash va o'zgartirilgan fayllarni dolibarr.org/forum saytiga yuborish yoki agar ishlab chiquvchi bo'lsangiz, github-da PR bilan tuzatish orqali tuzatishingiz mumkin. .com / Dolibarr / dolibarr
+ModuleSetup=Modulni sozlash
+ModulesSetup=Modullar / dasturni sozlash
+ModuleFamilyBase=Tizim
+ModuleFamilyCrm=Mijozlar bilan munosabatlarni boshqarish (CRM)
+ModuleFamilySrm=Sotuvchilar bilan munosabatlarni boshqarish (VRM)
+ModuleFamilyProducts=Mahsulotlarni boshqarish (PM)
+ModuleFamilyHr=Inson resurslarini boshqarish (HR)
+ModuleFamilyProjects=Loyihalar / Birgalikda ishlash
+ModuleFamilyOther=Boshqalar
+ModuleFamilyTechnic=Ko'p modulli vositalar
+ModuleFamilyExperimental=Eksperimental modullar
+ModuleFamilyFinancial=Moliyaviy modullar (Buxgalteriya / G'aznachilik)
+ModuleFamilyECM=Elektron tarkibni boshqarish (ECM)
+ModuleFamilyPortal=Veb-saytlar va boshqa frontal dastur
+ModuleFamilyInterface=Tashqi tizimlar bilan interfeyslar
+MenuHandlers=Menyu ishlovchilari
+MenuAdmin=Menyu muharriri
+DoNotUseInProduction=Ishlab chiqarishda foydalanmang
+ThisIsProcessToFollow=Yangilash tartibi:
+ThisIsAlternativeProcessToFollow=Bu qo'lda ishlov berish uchun muqobil o'rnatish:
+StepNb=%s qadam
+FindPackageFromWebSite=Sizga kerakli xususiyatlarni taqdim etadigan paketni toping (masalan, rasmiy veb-sayt %s).
+DownloadPackageFromWebSite=To'plamni yuklab oling (masalan, rasmiy veb-sayt %s dan).
+UnpackPackageInDolibarrRoot=Paketlangan fayllarni Dolibarr server katalogiga oching / oching: <b> %s </b>
+UnpackPackageInModulesRoot=Tashqi modulni joylashtirish / o'rnatish uchun paketlangan fayllarni tashqi modullarga bag'ishlangan server katalogiga oching / oching: <br> <b> %s </b>
+SetupIsReadyForUse=Modulni joylashtirish tugallandi. Biroq, sahifani o'rnatish modullariga o'tib, sizning ilovangizdagi modulni yoqishingiz va sozlashingiz kerak: <a href="%s"> %s </a>.
+NotExistsDirect=Mavjud katalog uchun muqobil ildiz katalogi aniqlanmagan. <br>
+InfDirAlt=3-versiyadan boshlab muqobil ildiz katalogini aniqlash mumkin. Bu sizga maxsus katalog, plaginlar va maxsus andozalarni saqlashga imkon beradi. <br> Faqat Dolibarrning ildizida katalog yarating (masalan: maxsus). <br>
+InfDirExample= <br> keyin fayl <strong> conf.php </strong> <br> $ dolibarr_main_url_root_alt = '/ odatlarning "<br> $ dolibarr_main_document_root_alt =' / path / / Dolibarr / htdocs / odatlarning" ushbu satrlarni "#" bilan izohladi bo'lsa <br>, ularni ta'minlash uchun uni e'lon , faqat "#" belgisini olib tashlab, izoh qoldirmang.
+YouCanSubmitFile=Siz modul paketining .zip faylini shu yerdan yuklashingiz mumkin:
+CurrentVersion=Dolibarrning joriy versiyasi
+CallUpdatePage=Ma'lumotlar bazasi tuzilishi va ma'lumotlarini yangilaydigan sahifani ko'rib chiqing: %s.
+LastStableVersion=Oxirgi barqaror versiya
+LastActivationDate=So'nggi faollashtirilgan sana
 LastActivationAuthor=Latest activation author
 LastActivationIP=Latest activation IP
-UpdateServerOffline=Update server offline
+UpdateServerOffline=Serverni oflayn rejimda yangilang
 WithCounter=Manage a counter
-GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first %s. <br><b>{000000@x}</b> same as the previous one but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then the sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated to the customer. This counter dedicated to customer is reset at same time as the global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
-GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
+GenericMaskCodes=Siz istalgan raqamlash maskasini kiritishingiz mumkin. Ushbu niqobda quyidagi teglardan foydalanish mumkin: <br> <b> {000000} </b> har bir %s bo'yicha ko'paytiriladigan raqamga mos keladi. Hisoblagichning istalgan uzunligidagi nollarni kiriting. Niqob kabi shuncha nolga ega bo'lish uchun hisoblagich chap tomondan nollar bilan to'ldiriladi. <br> <b> {000000 + 000} </b> oldingi bilan bir xil, lekin + belgisining o'ng tomonidagi raqamga mos keladigan ofset birinchi %s dan boshlab qo'llaniladi. <br> <b> {000000 @ x} </b> oldingisiga o'xshash, ammo x oyiga yetganda hisoblagich nolga o'rnatiladi (x 1 dan 12 gacha yoki 0 sizning konfiguratsiyangizda aniqlangan moliya yilining dastlabki oylaridan foydalanish uchun, yoki 99 dan har oy nolga qaytarish). Agar ushbu parametr ishlatilsa va x 2 yoki undan yuqori bo'lsa, unda {yy} {mm} yoki {yyyy} {mm} ketma-ketligi ham talab qilinadi. <br> <b> {dd} </b> kun (01 dan 31 gacha). <br> <b> {mm} </b> oy (01 dan 12 gacha). <br> <b> {yy} </b>, <b> {yyyy} </b> yoki <b> {y} af90, y0 a79 <br>
+GenericMaskCodes2= <b> {cccc} </b> n kodidagi mijoz kodi <br> <b> {cccc000} a09a4b8 client Xaridorga bag'ishlangan ushbu hisoblagich global hisoblagich bilan bir vaqtning o'zida tiklanadi. <br> <b> {tttt} </b> n belgidagi uchinchi tomon kodining kodi (Uy - O'rnatish - Lug'at - Uchinchi tomon turlari menyusiga qarang). Agar siz ushbu yorliqni qo'shsangiz, hisoblagich har bir uchinchi tomon turi uchun farq qiladi. <br>
+GenericMaskCodes3=Maskadagi barcha boshqa belgilar buzilmasdan qoladi. <br> bo'sh joylarga ruxsat berilmaydi. <br>
 GenericMaskCodes3EAN=All other characters in the mask will remain intact (except * or ? in 13th position in EAN13).<br>Spaces are not allowed.<br>In EAN13, the last character after the last } in 13th position should be * or ? . It will be replaced by the calculated key.<br>
-GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
-GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
-GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> will give <b>IN0701-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
-GenericNumRefModelDesc=Returns a customizable number according to a defined mask.
-ServerAvailableOnIPOrPort=Server is available at address <b>%s</b> on port <b>%s</b>
-ServerNotAvailableOnIPOrPort=Server is not available at address <b>%s</b> on port <b>%s</b>
-DoTestServerAvailability=Test server connectivity
-DoTestSend=Test sending
-DoTestSendHTML=Test sending HTML
-ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each year if sequence {yy} or {yyyy} is not in mask.
-ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, can't use option @ if sequence {yy}{mm} or {yyyy}{mm} is not in mask.
-UMask=UMask parameter for new files on Unix/Linux/BSD/Mac file system.
-UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone).<br>This parameter is useless on a Windows server.
-SeeWikiForAllTeam=Take a look at the Wiki page for a list of contributors and their organization
-UseACacheDelay= Delay for caching export response in seconds (0 or empty for no cache)
-DisableLinkToHelpCenter=Hide link "<b>Need help or support</b>" on login page
-DisableLinkToHelp=Hide link to online help "<b>%s</b>"
-AddCRIfTooLong=There is no automatic text wrapping, text that is too long will not display on documents. Please add carriage returns in the text area if needed.
-ConfirmPurge=Are you sure you want to execute this purge?<br>This will permanently delete all your data files with no way to restore them (ECM files, attached files...).
-MinLength=Minimum length
-LanguageFilesCachedIntoShmopSharedMemory=Files .lang loaded in shared memory
+GenericMaskCodes4a= <u> uchinchi tomon TheCompany kompaniyasining 99-chi %s-dagi misoli, 2007-01-31 sanasi bilan: </u> <br>
+GenericMaskCodes4b= <u> 2007-03-01 da yaratilgan uchinchi tomonga misol: </u> <br>
+GenericMaskCodes4c= <u> 2007-03-01 da yaratilgan mahsulotga misol: </u> <br>
+GenericMaskCodes5= <b> ABC {asr} {mm} - {000000} </b> beraman <b> ABC0701-000099 </b> <br> <b> {0000 + 100 @ 1} -ZZZ / {dd} / XXX </b> beraman <b> 0199-ZZZ / 31 / XXX </b> <br> <b> IN {yy} {mm} - {0000} - {t} </b> <b> IN0701-0099-A </b> beradi, agar kompaniyaning turi "javobli Inscripto 'bilan bo'lsa'
+GenericNumRefModelDesc=Belgilangan niqobga ko'ra moslashtirilgan raqamni qaytaradi.
+ServerAvailableOnIPOrPort=Server <b> %s </b> manzilida <b> %s </b>
+ServerNotAvailableOnIPOrPort=Server <b> %s </b> manzilida <b> %s </b> manzilida mavjud emas
+DoTestServerAvailability=Server ulanishini sinab ko'ring
+DoTestSend=Sinov yuborish
+DoTestSendHTML=HTML yuborish uchun sinov
+ErrorCantUseRazIfNoYearInMask=Xatolik, har yili {yy} yoki {yyyy} ketma-ketligi niqobda bo'lmasa, hisoblagichni tiklash uchun @ parametridan foydalanib bo'lmaydi.
+ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Xato, agar {yy} {mm} yoki {yyyy} {mm} ketma-ketligi niqobda bo'lmasa @ parametridan foydalanib bo'lmaydi.
+UMask=Unix / Linux / BSD / Mac fayl tizimidagi yangi fayllar uchun UMask parametri.
+UMaskExplanation=Ushbu parametr serverda Dolibarr tomonidan yaratilgan fayllarda sukut bo'yicha o'rnatilgan ruxsatlarni aniqlashga imkon beradi (masalan, yuklash paytida). <br> Bu sakkizli qiymat bo'lishi kerak (masalan, 0666 hamma uchun o'qish va yozishni anglatadi). <br> Windows serverida ushbu parametr foydasiz.
+SeeWikiForAllTeam=Hissadorlar va ularning tashkilotlari ro'yxatini olish uchun Wiki sahifasini ko'rib chiqing
+UseACacheDelay= Bir necha soniya ichida eksportga javobni keshlash uchun kechikish (0 yoki bo'sh joy uchun bo'sh)
+DisableLinkToHelpCenter=Kirish sahifasida "<b> yordamga muhtoj yoki </b>" havolasini yashirish.
+DisableLinkToHelp=Onlayn yordam uchun havolani yashirish "<b> %s </b>"
+AddCRIfTooLong=Matnni avtomatik o'rash mavjud emas, juda uzun bo'lgan matn hujjatlarda ko'rinmaydi. Iltimos, agar kerak bo'lsa, matn maydoniga karetka qaytishini qo'shing.
+ConfirmPurge=Ushbu tozalashni amalga oshirishni xohlaysizmi? <br> bu sizning barcha ma'lumotlar fayllaringizni qayta tiklashning imkoni bo'lmagan holda butunlay yo'q qiladi (ECM fayllari, biriktirilgan fayllar ...).
+MinLength=Minimal uzunlik
+LanguageFilesCachedIntoShmopSharedMemory=Fayllar .lang umumiy xotiraga yuklandi
 LanguageFile=Language file
-ExamplesWithCurrentSetup=Examples with current configuration
-ListOfDirectories=List of OpenDocument templates directories
-ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
-NumberOfModelFilesFound=Number of ODT/ODS template files found in these directories
-ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
-FollowingSubstitutionKeysCanBeUsed=<br>To know how to create your odt document templates, before storing them in those directories, read wiki documentation:
+ExamplesWithCurrentSetup=Joriy konfiguratsiyaga misollar
+ListOfDirectories=OpenDocument shablonlari kataloglari ro'yxati
+ListOfDirectoriesForModelGenODT=OpenDocument formatidagi shablon fayllarini o'z ichiga olgan kataloglar ro'yxati. <br> <br> kataloglarning to'liq yo'lini qo'ying. <br> eah katalogi orasida karetka qaytishini qo'shing. <br> GED moduli katalogini qo'shish uchun bu erga <b> DOL_DATA_ROOT / ecm / yourdirectoryname </b> qo'shing. <br> <br> Ushbu kataloglardagi fayllar <b> .odt </b> yoki <b> .ods </b> bilan tugashi kerak.
+NumberOfModelFilesFound=Ushbu kataloglarda topilgan ODT / ODS shablon fayllari soni
+ExampleOfDirectoriesForModelGen=Sintaksis namunalari: <br> c: \\ myapp \\ mydocumentdir \\ mysubdir <br> / home / myapp / mydocumentdir / mysubdir <br> DOL_DATA_ROOT / ecm / ecmdir
+FollowingSubstitutionKeysCanBeUsed= <br> Odt hujjat shablonlarini qanday yaratishni bilish uchun ularni o'sha kataloglarda saqlashdan oldin wiki hujjatlarini o'qing:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
-FirstnameNamePosition=Position of Name/Lastname
-DescWeather=The following images will be shown on the dashboard when the number of late actions reach the following values:
-KeyForWebServicesAccess=Key to use Web Services (parameter "dolibarrkey" in webservices)
-TestSubmitForm=Input test form
-ThisForceAlsoTheme=Using this menu manager will also use its own theme whatever the user choice. Also this menu manager specialized for smartphones does not work on all smartphone. Use another menu manager if you experience problems with yours.
-ThemeDir=Skins directory
-ConnectionTimeout=Connection timeout
-ResponseTimeout=Response timeout
-SmsTestMessage=Test message from __PHONEFROM__ to __PHONETO__
-ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this feature.
-SecurityToken=Key to secure URLs
-NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
+FirstnameNamePosition=Ism / familiyaning joylashuvi
+DescWeather=Kechiktirilgan harakatlar soni quyidagi qiymatlarga yetganda quyidagi rasmlar panelida ko'rsatiladi:
+KeyForWebServicesAccess=Veb-xizmatlardan foydalanish kaliti (veb-xizmatlarda "dolibarrkey" parametri)
+TestSubmitForm=Kirish test shakli
+ThisForceAlsoTheme=Ushbu menyu menejeridan foydalanish, shuningdek, foydalanuvchi o'zi xohlagan mavzudan foydalanadi. Smartfonlarga ixtisoslashgan ushbu menyu menejeri barcha smartfonlarda ishlamaydi. Agar sizda muammolar yuzaga kelsa, boshqa menyu menejeridan foydalaning.
+ThemeDir=Terilar katalogi
+ConnectionTimeout=Ulanish vaqti tugadi
+ResponseTimeout=Javob tugashi
+SmsTestMessage=__PHONEFROM__ dan __PHONETO__ gacha bo'lgan sinov xabarlari
+ModuleMustBeEnabledFirst=Agar sizga ushbu xususiyat kerak bo'lsa, avvalo <b> %s </b> moduli yoqilishi kerak.
+SecurityToken=Xavfsiz URL manzillari uchun kalit
+NoSmsEngine=SMS yuboruvchi menejeri mavjud emas. SMS yuboruvchisi menejeri standart tarqatish bilan o'rnatilmagan, chunki ular tashqi sotuvchiga bog'liq, ammo siz ularni %s da topishingiz mumkin.
 PDF=PDF
-PDFDesc=Global options for PDF generation
-PDFAddressForging=Rules for address section
-HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
+PDFDesc=PDF yaratish uchun global imkoniyatlar
+PDFOtherDesc=PDF Option specific to some modules
+PDFAddressForging=Manzil bo'limi qoidalari
+HideAnyVATInformationOnPDF=Savdo solig'i / QQS bilan bog'liq barcha ma'lumotlarni yashirish
 PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
 HideLocalTaxOnPDF=Hide %s rate in column Sale Tax / VAT
-HideDescOnPDF=Hide products description
-HideRefOnPDF=Hide products ref.
-HideDetailsOnPDF=Hide product lines details
-PlaceCustomerAddressToIsoLocation=Use french standard position (La Poste) for customer address position
-Library=Library
-UrlGenerationParameters=Parameters to secure URLs
-SecurityTokenIsUnique=Use a unique securekey parameter for each URL
-EnterRefToBuildUrl=Enter reference for object %s
-GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
-OldVATRates=Old VAT rate
-NewVATRates=New VAT rate
-PriceBaseTypeToChange=Modify on prices with base reference value defined on
-MassConvert=Launch bulk conversion
+HideDescOnPDF=Mahsulotlar tavsifini yashirish
+HideRefOnPDF=Mahsulotlarni yashirish ref.
+HideDetailsOnPDF=Mahsulot liniyalari tafsilotlarini yashirish
+PlaceCustomerAddressToIsoLocation=Mijozning manzili uchun frantsuz standart pozitsiyasidan (La Poste) foydalaning
+Library=Kutubxona
+UrlGenerationParameters=URL manzillarini himoyalash parametrlari
+SecurityTokenIsUnique=Har bir URL uchun noyob securekey parametridan foydalaning
+EnterRefToBuildUrl=%s ob'ekti uchun ma'lumotnomani kiriting
+GetSecuredUrl=Hisoblangan URLni oling
+ButtonHideUnauthorized=Ichki foydalanuvchilar uchun ham ruxsatsiz harakat tugmachalarini yashirish (aks holda och rangda)
+OldVATRates=Eski QQS stavkasi
+NewVATRates=QQSning yangi stavkasi
+PriceBaseTypeToChange=Belgilangan asosiy mos yozuvlar qiymati bilan narxlarni o'zgartiring
+MassConvert=Ommaviy konversiyani ishga tushiring
 PriceFormatInCurrentLanguage=Price Format In Current Language
-String=String
+String=Ip
 String1Line=String (1 line)
-TextLong=Long text
+TextLong=Uzoq matn
 TextLongNLines=Long text (n lines)
 HtmlText=Html text
-Int=Integer
+Int=Butun son
 Float=Float
-DateAndTime=Date and hour
-Unique=Unique
-Boolean=Boolean (one checkbox)
-ExtrafieldPhone = Phone
-ExtrafieldPrice = Price
-ExtrafieldMail = Email
+DateAndTime=Sana va soat
+Unique=Noyob
+Boolean=Mantiqiy (bitta katakcha)
+ExtrafieldPhone = Telefon
+ExtrafieldPrice = Narx
+ExtrafieldMail = Elektron pochta
 ExtrafieldUrl = Url
-ExtrafieldSelect = Select list
-ExtrafieldSelectList = Select from table
-ExtrafieldSeparator=Separator (not a field)
-ExtrafieldPassword=Password
-ExtrafieldRadio=Radio buttons (one choice only)
-ExtrafieldCheckBox=Checkboxes
-ExtrafieldCheckBoxFromList=Checkboxes from table
-ExtrafieldLink=Link to an object
+ExtrafieldSelect = Ro'yxatni tanlang
+ExtrafieldSelectList = Jadvaldan tanlang
+ExtrafieldSeparator=Ajratuvchi (maydon emas)
+ExtrafieldPassword=Parol
+ExtrafieldRadio=Radio tugmalari (faqat bitta tanlov)
+ExtrafieldCheckBox=Belgilash katakchalari
+ExtrafieldCheckBoxFromList=Jadvaldagi katakchalar
+ExtrafieldLink=Ob'ektga havola
 ComputedFormula=Computed field
 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->fetchNoCompute($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->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
 Computedpersistent=Store computed field
 ComputedpersistentDesc=Computed extra fields will be stored in the database, however, the value will only be recalculated when the object of this field is changed. If the computed field depends on other objects or global data this value might be wrong!!
 ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored without encryption (field must be only hidden with star on screen).<br>Set  'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retrieve original value)
-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::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarly a primary int key<br>- filtersql is a SQL condition. It can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<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::filtersql<br>Example: c_typent:libelle:id::filtersql<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=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
+ExtrafieldParamHelpselect=Qadriyatlar ro'yxati format bo'lishi kerak, bu erda kalit '0' bo'lishi mumkin emas <br> masalan: <br> 2, value2 <br> boshqa to'ldiruvchi xususiyati ro'yxatida qarab ro'yxati: <br> 1, VALUE1 | options_ <i> parent_list_code </i>: parent_key <br> 2, değer2 | options_ <i> parent_list_code </i>: maqsadida parent_key <br> <br> boshqa ro'yxatiga qarab ro'yxatini ega bo'lishi: <br> 1, VALUE1 | <i> parent_list_code </i>: parent_key <br> 2, value2 | <i> parent_list_code </i>: parent_key
+ExtrafieldParamHelpcheckbox=Qadriyatlar ro'yxati format kaliti bo'lgan satrlardan iborat bo'lishi kerak, (agar bu erda '0' bo'lishi mumkin emas) <br> <br> masalan: <br> 1, value1 <br> 2, value2 <br> 3 ,03f03f
+ExtrafieldParamHelpradio=Qadriyatlar ro'yxati format kaliti bo'lgan satrlardan iborat bo'lishi kerak, (agar bu erda '0' bo'lishi mumkin emas) <br> <br> masalan: <br> 1, value1 <br> 2, value2 <br> 3 ,03f03f
+ExtrafieldParamHelpsellist=Qadriyatlar ro'yxati <br> jadvalidan kelib chiqadi Sintaksis: table_name: label_field: id_field :: filtersql <br> Masalan: c_typent: libelle: id :: filtersql <br> <br> aqqf - 194 <br> faol qiymatini ko'rsatish uchun oddiy sinov bo'lishi mumkin (masalan, faol = 1) Siz shuningdek, joriy ob'ekt <br> ning joriy identifikatori bo'lgan filtrda $ ID $ dan foydalanishingiz mumkin, SELECTni filtrga ishlatish uchun $ SEL $ kalit so'zidan foydalaning in'ektsiyaga qarshi himoya qilishni chetlab o'tish. <br>, agar siz ekstra maydonlarda filtrlashni xohlasangiz, sintaksisidan foydalaning extra.fieldcode = ... (bu erda maydon kodi ekstrafildagi koddir) <br> <br> Boshqa qo'shimcha xususiyatlar ro'yxatiga qarab ro'yxatga ega bo'lish uchun: <br> cty: <i> parent_list_code </i> | parent_column: filter <br> <br> Boshqa ro'yxatga qarab ro'yxatga ega bo'lish uchun: <br> c_typent: libelle: parent0 :000800_0_0_0_0_n_06_b_n_06
+ExtrafieldParamHelpchkbxlst=Qadriyatlar ro'yxati <br> jadvalidan olingan Sintaksis: table_name: label_field: id_field :: filtersql <br> Misol: c_typent: libelle: id :: filtersql <br> <br> filter faqat oddiy bo'lishi mumkin jodugarda $ ID $ ni ishlatishi mumkin, bu joriy ob'ektning identifikatori <br> Filtrda SELECT qilish uchun $ SEL $ <br> dan foydalaning, agar ekstra maydonlarda filtrlashni xohlasangiz, sintaksisidan foydalaning. extra.fieldcode = ... (bu erda maydon kodi extrafield kodi) <br> <br> boshqa to'ldiruvchi xususiyati ro'yxatida qarab ro'yxatini bo'lishi uchun: <br> c_typent: libelle: id: options_ <i> parent_list_code </i> | parent_column: filtri <br> <br> boshqa ro'yxatiga qarab ro'yxatini ega bo'lish uchun: <br> c_typent: libelle: id: <i> parent_list_code </i> | parent_column: filter
+ExtrafieldParamHelplink=Parametrlar ObjectName: Classpath <br> sintaksis: ObjectName: Classpath bo'lishi kerak
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
-LibraryToBuildPDF=Library used for PDF generation
-LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the second and third tax and its rate. Possible type are:<br>1: local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2: local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3: local tax apply on products without vat (localtax is calculated on amount without tax)<br>4: local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5: local tax apply on services without vat (localtax is calculated on amount without tax)<br>6: local tax apply on services including vat (localtax is calculated on amount + tax)
+LibraryToBuildPDF=PDF yaratish uchun foydalaniladigan kutubxona
+LocalTaxDesc=Ba'zi mamlakatlar har bir faktura satrida ikki yoki uchta soliqni qo'llashlari mumkin. Agar shunday bo'lsa, ikkinchi va uchinchi soliq turini va uning stavkasini tanlang. Mumkin bo'lgan turlari: <br> 1: Mahsulotlar va xizmatlarga mahalliy soliq QQSsiz qo'llaniladi (mahalliy soliq soliqsiz miqdorda hisoblab chiqiladi) <br> 2: Mahsulotlar va xizmatlarga mahalliy soliq, shu jumladan QQS (localtax summa + asosiy soliq bo'yicha hisoblanadi) <br> 3: Mahalliy soliq QQSsiz mahsulotlarga qo'llaniladi (localtax soliqsiz miqdor bo'yicha hisoblanadi) <br> 4: mahalliy soliq, shu jumladan, QQS bo'lgan mahsulotlarga qo'llaniladi (localtax summa + asosiy so'm bo'yicha hisoblanadi) <br> 5: QQSsiz xizmatlarga mahalliy soliq (localtax hisoblanadi <br> 6: QQS, shu jumladan xizmatlarga mahalliy soliq qo'llaniladi (mahalliy soliq soliq + soliq bo'yicha hisoblanadi)
 SMS=SMS
-LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
-RefreshPhoneLink=Refresh link
-LinkToTest=Clickable link generated for user <strong>%s</strong> (click phone number to test)
-KeepEmptyToUseDefault=Keep empty to use default value
+LinkToTestClickToDial=<strong> %s </strong> foydalanuvchisi uchun ClickToDial urlini sinab ko'rish uchun havolani ko'rsatish uchun qo'ng'iroq qilish uchun telefon raqamini kiriting.
+RefreshPhoneLink=Havolani yangilang
+LinkToTest=<strong> %s </strong> foydalanuvchisi uchun yaratilgan bosish havolasi (sinov uchun telefon raqamini bosing)
+KeepEmptyToUseDefault=Standart qiymatdan foydalanish uchun bo'sh joyni saqlang
 KeepThisEmptyInMostCases=In most cases, you can keep this field empy.
-DefaultLink=Default link
-SetAsDefault=Set as default
-ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
-ExternalModule=External module
+DefaultLink=Standart havola
+SetAsDefault=Odatiy sifatida o'rnating
+ValueOverwrittenByUserSetup=Diqqat, ushbu qiymat foydalanuvchi tomonidan o'rnatilishi bilan yozilishi mumkin (har bir foydalanuvchi o'z klikktodial urlini o'rnatishi mumkin)
+ExternalModule=Tashqi modul
 InstalledInto=Installed into directory %s
 BarcodeInitForThirdparties=Mass barcode init for third-parties
-BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
+BarcodeInitForProductsOrServices=Mahsulotlar yoki xizmatlar uchun ommaviy shtrix kodni qayta tiklash yoki tiklash
 CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
-InitEmptyBarCode=Init value for next %s empty records
-EraseAllCurrentBarCode=Erase all current barcode values
-ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values?
-AllBarcodeReset=All barcode values have been removed
-NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled in the Barcode module setup.
-EnableFileCache=Enable file cache
-ShowDetailsInPDFPageFoot=Add more details into footer, such as company address or manager names (in addition to professional ids, company capital and VAT number).
-NoDetails=No additional details in footer
-DisplayCompanyInfo=Display company address
-DisplayCompanyManagers=Display manager names
-DisplayCompanyInfoAndManagers=Display company address and manager names
-EnableAndSetupModuleCron=If you want to have this recurring invoice generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template using the *Create* button. Note that even if you enabled automatic generation, you can still safely launch manual generation. Generation of duplicates for the same period is not possible.
+InitEmptyBarCode=Keyingi %s bo'sh yozuvlar uchun boshlang'ich qiymati
+EraseAllCurrentBarCode=Barcha joriy shtrix qiymatlarini o'chirib tashlang
+ConfirmEraseAllCurrentBarCode=Haqiqatan ham barcha shtrix kod qiymatlarini o'chirishni xohlaysizmi?
+AllBarcodeReset=Barcha shtrix qiymatlari o'chirildi
+NoBarcodeNumberingTemplateDefined=Shtrixli modulni o'rnatishda shtrix-shablonni raqamlash imkoniyati yoqilmagan.
+EnableFileCache=Fayl keshini yoqish
+ShowDetailsInPDFPageFoot=Korxona manzili yoki menejer nomi (masalan, professional identifikatorlar, kompaniya kapitali va QQS raqamidan tashqari) kabi altbilgiga qo'shimcha ma'lumotlarni qo'shing.
+NoDetails=Taglavhada qo'shimcha ma'lumot yo'q
+DisplayCompanyInfo=Kompaniyaning manzilini ko'rsatish
+DisplayCompanyManagers=Displey menejeri nomlari
+DisplayCompanyInfoAndManagers=Kompaniya manzili va menejer nomlarini ko'rsatish
+EnableAndSetupModuleCron=Agar siz ushbu takrorlanadigan hisob-fakturani avtomatik ravishda yaratishni istasangiz, * %s * moduli yoqilgan va to'g'ri sozlanishi kerak. Aks holda, hisob-fakturalarni yaratish * Yaratish * tugmasi yordamida ushbu shablondan qo'lda bajarilishi kerak. Shuni esda tutingki, siz avtomatik ishlab chiqarishni yoqsangiz ham, siz qo'lda ishlab chiqarishni xavfsiz ravishda boshlashingiz mumkin. Xuddi shu davr uchun nusxalarini yaratish mumkin emas.
 ModuleCompanyCodeCustomerAquarium=%s followed by customer code for a customer accounting code
 ModuleCompanyCodeSupplierAquarium=%s followed by vendor code for a vendor accounting code
-ModuleCompanyCodePanicum=Return an empty accounting code.
-ModuleCompanyCodeDigitaria=Returns a compound accounting code according to the name of the third party. The code consists of a prefix that can be defined in the first position followed by the number of characters defined in the third party code.
+ModuleCompanyCodePanicum=Bo'sh buxgalteriya kodini qaytaring.
+ModuleCompanyCodeDigitaria=Uchinchi shaxsning nomiga ko'ra murakkab buxgalteriya kodini qaytaradi. Kod birinchi pozitsiyada aniqlanishi mumkin bo'lgan prefiksdan, keyin uchinchi tomon kodida belgilangan belgilar sonidan iborat.
 ModuleCompanyCodeCustomerDigitaria=%s followed by the truncated customer name by the number of characters: %s for the customer accounting code.
 ModuleCompanyCodeSupplierDigitaria=%s followed by the truncated supplier name by the number of characters: %s for the supplier accounting 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=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: The setup to send emails from the application is using the default generic setup. It is often better to setup outgoing emails to use the email server of your Email Service Provider instead of the default setup for several reasons:
+Use3StepsApproval=Odatiy bo'lib, Sotib olish to'g'risida buyurtmalarni 2 xil foydalanuvchi yaratishi va tasdiqlashi kerak (bitta qadam / foydalanuvchi yaratishi va bitta qadam / foydalanuvchi tasdiqlashi kerak. E'tibor bering, agar foydalanuvchi yaratish va tasdiqlash huquqiga ega bo'lsa, bitta qadam / foydalanuvchi etarli bo'ladi) . Ushbu parametr bilan siz uchinchi bosqichni / foydalanuvchi tomonidan tasdiqlanishini so'rashingiz mumkin, agar miqdori ajratilgan qiymatdan yuqori bo'lsa (shuning uchun 3 ta qadam kerak bo'ladi: 1 = tasdiqlash, 2 = birinchi tasdiqlash va 3 = ikkinchi tasdiqlash miqdori etarli bo'lsa). <br> Agar bitta tasdiqlash (2 ta qadam) etarli bo'lsa, buni bo'sh qilib qo'ying, agar har doim ikkinchi ma'qullash (3 bosqich) kerak bo'lsa, uni juda past qiymatga (0,1) o'rnating.
+UseDoubleApproval=Miqdor (soliqsiz) ... dan yuqori bo'lsa, 3 bosqichli tasdiqdan foydalaning.
+WarningPHPMail=OGOHLANTIRISH: Ilovadan elektron pochta xabarlarini yuborish uchun sozlash odatiy umumiy sozlamalardan foydalanmoqda. Odatda, bir nechta sabablarga ko'ra standart o'rnatish o'rniga elektron pochta xizmati provayderingiz elektron pochta serveridan foydalanish uchun chiquvchi elektron pochta xabarlarini sozlash yaxshiroqdir:
 WarningPHPMailA=- Using the server of the Email Service Provider increases the trustability of your email, so it increases the deliverablity without being flagged as SPAM
 WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota).
 WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
 WarningPHPMailD=If the method 'PHP Mail' is really the method you would like to use, you can remove this warning by adding the constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP to 1 in Home - Setup - Other.
 WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
 WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
-ClickToShowDescription=Click to show description
+ClickToShowDescription=Tavsifni ko'rsatish uchun bosing
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
 TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
@@ -524,345 +525,345 @@ DAV_ALLOW_PUBLIC_DIRTooltip=The generic public directory is a WebDAV directory a
 DAV_ALLOW_ECM_DIR=Enable the DMS/ECM private directory (root directory of the DMS/ECM module - login required)
 DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploaded when using the DMS/ECM module. Similarly as access from the web interface, you will need a valid login/password with adecuate permissions to access it.
 # Modules
-Module0Name=Users & Groups
-Module0Desc=Users / Employees and Groups management
-Module1Name=Third Parties
-Module1Desc=Companies and contacts management (customers, prospects...)
-Module2Name=Commercial
-Module2Desc=Commercial management
-Module10Name=Accounting (simplified)
-Module10Desc=Simple accounting reports (journals, turnover) based on database content. Does not use any ledger table.
-Module20Name=Proposals
-Module20Desc=Commercial proposal management
-Module22Name=Mass Emailings
-Module22Desc=Manage bulk emailing
-Module23Name=Energy
-Module23Desc=Monitoring the consumption of energies
-Module25Name=Sales Orders
-Module25Desc=Sales order management
-Module30Name=Invoices
-Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
-Module40Name=Vendors
-Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
-Module42Name=Debug Logs
-Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
+Module0Name=Foydalanuvchilar va guruhlar
+Module0Desc=Foydalanuvchilar / xodimlar va guruhlarni boshqarish
+Module1Name=Uchinchi tomonlar
+Module1Desc=Kompaniyalar va aloqalarni boshqarish (mijozlar, istiqbollar ...)
+Module2Name=Tijorat
+Module2Desc=Tijorat menejmenti
+Module10Name=Buxgalteriya hisobi (soddalashtirilgan)
+Module10Desc=Ma'lumotlar bazasi tarkibiga asoslangan oddiy buxgalteriya hisobotlari (jurnallar, oborot). Biron bir jadval jadvalidan foydalanmaydi.
+Module20Name=Takliflar
+Module20Desc=Tijorat takliflarini boshqarish
+Module22Name=Ommaviy elektron pochta xabarlari
+Module22Desc=Ommaviy elektron pochta xabarlarini boshqaring
+Module23Name=Energiya
+Module23Desc=Energiya sarfini kuzatish
+Module25Name=Sotish bo'yicha buyurtmalar
+Module25Desc=Savdo buyurtmalarini boshqarish
+Module30Name=Hisob-fakturalar
+Module30Desc=Xaridorlar uchun hisob-fakturalar va kredit yozuvlarini boshqarish. Yetkazib beruvchilar uchun hisob-fakturalar va kredit yozuvlarini boshqarish
+Module40Name=Sotuvchilar
+Module40Desc=Sotuvchilar va sotib olishni boshqarish (sotib olish buyurtmalari va etkazib beruvchilarning hisob-fakturalari)
+Module42Name=Xatolarni tuzatish jurnallari
+Module42Desc=Kundaliklarni ro'yxatga olish vositalari (fayl, syslog, ...). Bunday jurnallar texnik / disk raskadrovka uchun mo'ljallangan.
 Module43Name=Debug Bar
 Module43Desc=A tool for developper adding a debug bar in your browser.
-Module49Name=Editors
-Module49Desc=Editor management
-Module50Name=Products
-Module50Desc=Management of Products
-Module51Name=Mass mailings
-Module51Desc=Mass paper mailing management
-Module52Name=Stocks
-Module52Desc=Stock management
-Module53Name=Services
-Module53Desc=Management of Services
-Module54Name=Contracts/Subscriptions
-Module54Desc=Management of contracts (services or recurring subscriptions)
-Module55Name=Barcodes
-Module55Desc=Barcode management
-Module56Name=Payment by credit transfer
-Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
-Module57Name=Payments by Direct Debit
-Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
+Module49Name=Tahrirlovchilar
+Module49Desc=Muharrirlarni boshqarish
+Module50Name=Mahsulotlar
+Module50Desc=Mahsulotlarni boshqarish
+Module51Name=Ommaviy pochta jo'natmalari
+Module51Desc=Ommaviy qog'ozni pochta orqali boshqarish
+Module52Name=Qimmatli qog'ozlar
+Module52Desc=Aktsiyalarni boshqarish
+Module53Name=Xizmatlar
+Module53Desc=Xizmatlarni boshqarish
+Module54Name=Shartnomalar / Obunalar
+Module54Desc=Shartnomalarni boshqarish (xizmatlar yoki takroriy obunalar)
+Module55Name=Shtrixli kodlar
+Module55Desc=Barcode or QR code management
+Module56Name=Kredit o'tkazish yo'li bilan to'lov
+Module56Desc=Kredit o'tkazmalari buyurtmalari bo'yicha etkazib beruvchilarning to'lovlarini boshqarish. U Evropa mamlakatlari uchun SEPA faylini yaratishni o'z ichiga oladi.
+Module57Name=To'g'ridan-to'g'ri debet orqali to'lovlar
+Module57Desc=To'g'ridan-to'g'ri debet buyurtmalarini boshqarish. U Evropa mamlakatlari uchun SEPA faylini yaratishni o'z ichiga oladi.
 Module58Name=ClickToDial
-Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
+Module58Desc=ClickToDial tizimining integratsiyasi (Asterisk, ...)
 Module60Name=Stickers
 Module60Desc=Management of stickers
-Module70Name=Interventions
-Module70Desc=Intervention management
-Module75Name=Expense and trip notes
-Module75Desc=Expense and trip notes management
-Module80Name=Shipments
-Module80Desc=Shipments and delivery note management
-Module85Name=Banks & Cash
-Module85Desc=Management of bank or cash accounts
-Module100Name=External Site
-Module100Desc=Add a link to an external website as a main menu icon. Website is shown in a frame under the top menu.
-Module105Name=Mailman and SPIP
-Module105Desc=Mailman or SPIP interface for member module
+Module70Name=Aralashuvlar
+Module70Desc=Intervensiyani boshqarish
+Module75Name=Xarajatlar va sayohat yozuvlari
+Module75Desc=Xarajatlarni va sayohat yozuvlarini boshqarish
+Module80Name=Yuklar
+Module80Desc=Jo'natmalar va etkazib berish yozuvlarini boshqarish
+Module85Name=Banklar va naqd pul
+Module85Desc=Bank yoki kassa hisobvaraqlarini boshqarish
+Module100Name=Tashqi sayt
+Module100Desc=Asosiy menyu belgisi sifatida tashqi veb-saytga havola qo'shing. Veb-sayt yuqori menyu ostidagi ramkada ko'rsatilgan.
+Module105Name=Pochtachi va SPIP
+Module105Desc=Ro'yxatdan moduli uchun pochtachi yoki SPIP interfeysi
 Module200Name=LDAP
-Module200Desc=LDAP directory synchronization
+Module200Desc=LDAP katalogini sinxronlashtirish
 Module210Name=PostNuke
-Module210Desc=PostNuke integration
-Module240Name=Data exports
-Module240Desc=Tool to export Dolibarr data (with assistance)
-Module250Name=Data imports
-Module250Desc=Tool to import data into Dolibarr (with assistance)
-Module310Name=Members
-Module310Desc=Foundation members management
-Module320Name=RSS Feed
-Module320Desc=Add a RSS feed to Dolibarr pages
-Module330Name=Bookmarks & Shortcuts
-Module330Desc=Create shortcuts, always accessible, to the internal or external pages to which you frequently access
-Module400Name=Projects or Leads
-Module400Desc=Management of projects, leads/opportunities and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
-Module410Name=Webcalendar
-Module410Desc=Webcalendar integration
-Module500Name=Taxes & Special Expenses
-Module500Desc=Management of other expenses (sale taxes, social or fiscal taxes, dividends, ...)
-Module510Name=Salaries
-Module510Desc=Record and track employee payments
-Module520Name=Loans
-Module520Desc=Management of loans
-Module600Name=Notifications on business event
-Module600Desc=Send email notifications triggered by a business event: per user (setup defined on each user), per third-party contacts (setup defined on each third party) or by specific emails
+Module210Desc=PostNuke integratsiyasi
+Module240Name=Ma'lumotlar eksporti
+Module240Desc=Dolibarr ma'lumotlarini eksport qilish vositasi (yordam bilan)
+Module250Name=Ma'lumotlar importi
+Module250Desc=Dolibarr-ga ma'lumotlarni import qilish vositasi (yordam bilan)
+Module310Name=A'zolar
+Module310Desc=Jamg'arma a'zolarini boshqarish
+Module320Name=RSS tasmasi
+Module320Desc=Dolibarr sahifalariga RSS tasmasini qo'shing
+Module330Name=Xatcho'plar va yorliqlar
+Module330Desc=Siz tez-tez kiradigan ichki yoki tashqi sahifalarga har doim kirish mumkin bo'lgan yorliqlarni yarating
+Module400Name=Loyihalar yoki etakchilar
+Module400Desc=Loyihalarni boshqarish, imkoniyatlar va / yoki vazifalar. Shuningdek, siz loyihaga istalgan elementni (faktura, buyurtma, taklif, aralashuv, ...) tayinlashingiz va loyiha ko'rinishidan transversal ko'rinishni olishingiz mumkin.
+Module410Name=Veb-taqvim
+Module410Desc=Veb-taqvim integratsiyasi
+Module500Name=Soliqlar va maxsus xarajatlar
+Module500Desc=Boshqa xarajatlarni boshqarish (sotish soliqlari, ijtimoiy yoki soliq soliqlari, dividendlar, ...)
+Module510Name=Ish haqi
+Module510Desc=Xodimlarning to'lovlarini yozib oling va kuzatib boring
+Module520Name=Kreditlar
+Module520Desc=Kreditlarni boshqarish
+Module600Name=Tadbir to'g'risida bildirishnomalar
+Module600Desc=Ishbilarmonlik hodisasi bilan bog'liq elektron pochta xabarlarini yuboring: har bir foydalanuvchi uchun (har bir foydalanuvchi uchun sozlash belgilanadi), har bir uchinchi tomon aloqasi uchun (har bir uchinchi tomon uchun belgilanadi) yoki ma'lum elektron pochta orqali.
 Module600Long=Note that this module sends emails in real-time when a specific business event occurs. If you are looking for a feature to send email reminders for agenda events, go into the setup of module Agenda.
 Module610Name=Product Variants
 Module610Desc=Creation of product variants (color, size etc.)
-Module700Name=Donations
-Module700Desc=Donation management
-Module770Name=Expense Reports
-Module770Desc=Manage expense reports claims (transportation, meal, ...)
-Module1120Name=Vendor Commercial Proposals
-Module1120Desc=Request vendor commercial proposal and prices
+Module700Name=Xayriyalar
+Module700Desc=Xayriya mablag'larini boshqarish
+Module770Name=Xarajatlar bo'yicha hisobotlar
+Module770Desc=Xarajatlar to'g'risidagi hisobotlarni boshqarish (transport, ovqatlanish, ...)
+Module1120Name=Sotuvchilarning tijorat takliflari
+Module1120Desc=Sotuvchidan tijorat taklifi va narxlarini so'rang
 Module1200Name=Mantis
-Module1200Desc=Mantis integration
-Module1520Name=Document Generation
-Module1520Desc=Mass email document generation
-Module1780Name=Tags/Categories
-Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
-Module2000Name=WYSIWYG editor
-Module2000Desc=Allow text fields to be edited/formatted using CKEditor (html)
-Module2200Name=Dynamic Prices
-Module2200Desc=Use maths expressions for auto-generation of prices
-Module2300Name=Scheduled jobs
-Module2300Desc=Scheduled jobs management (alias cron or chrono table)
-Module2400Name=Events/Agenda
-Module2400Desc=Track events. Log automatic events for tracking purposes or record manual events or meetings. This is the principal module for good Customer or Vendor Relationship Management.
+Module1200Desc=Mantis integratsiyasi
+Module1520Name=Hujjatlarni yaratish
+Module1520Desc=Ommaviy elektron pochta hujjatlarini yaratish
+Module1780Name=Teglar / toifalar
+Module1780Desc=Teglar / toifalar yarating (mahsulotlar, mijozlar, etkazib beruvchilar, kontaktlar yoki a'zolar)
+Module2000Name=WYSIWYG muharriri
+Module2000Desc=Matn maydonlarini CKEditor (html) yordamida tahrirlash / formatlashga ruxsat berish.
+Module2200Name=Dinamik narxlar
+Module2200Desc=Narxlarni avtomatik ishlab chiqarish uchun matematik ifodalardan foydalaning
+Module2300Name=Rejalashtirilgan ish joylari
+Module2300Desc=Rejalashtirilgan ishlarni boshqarish (taxallusli cron yoki xron jadval)
+Module2400Name=Tadbirlar / kun tartibi
+Module2400Desc=Voqealarni kuzatib borish. Kuzatish maqsadida avtomatik tadbirlarni ro'yxatdan o'tkazing yoki qo'lda sodir bo'lgan voqealar yoki uchrashuvlarni yozib oling. Bu yaxshi mijozlar yoki sotuvchilar bilan munosabatlarni boshqarish uchun asosiy moduldir.
 Module2500Name=DMS / ECM
-Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
-Module2600Name=API/Web services (SOAP server)
-Module2600Desc=Enable the Dolibarr SOAP server providing API services
-Module2610Name=API/Web services (REST server)
-Module2610Desc=Enable the Dolibarr REST server providing API services
-Module2660Name=Call WebServices (SOAP client)
-Module2660Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Only Purchase orders are currently supported.)
+Module2500Desc=Hujjatlarni boshqarish tizimi / elektron tarkibni boshqarish. Yaratilgan yoki saqlanadigan hujjatlaringizni avtomatik ravishda tashkil etish. Agar kerak bo'lsa, ularni baham ko'ring.
+Module2600Name=API / veb-xizmatlar (SOAP-server)
+Module2600Desc=API xizmatlarini taqdim etadigan Dolibarr SOAP serverini yoqing
+Module2610Name=API / veb-xizmatlar (REST-server)
+Module2610Desc=API xizmatlarini ko'rsatadigan Dolibarr REST serverini yoqing
+Module2660Name=WebServices-ga qo'ng'iroq qiling (SOAP mijozi)
+Module2660Desc=Dolibarr veb-xizmatlari mijozini yoqing (Ma'lumotlarni / so'rovlarni tashqi serverlarga yuborish uchun ishlatilishi mumkin. Hozirda faqat Buyurtma buyurtmalari qo'llab-quvvatlanadi.)
 Module2700Name=Gravatar
-Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Needs Internet access
-Module2800Desc=FTP Client
+Module2700Desc=Foydalanuvchilar / a'zolarning fotosuratlarini ko'rsatish uchun elektron pochta xizmatidan (www.gravatar.com) foydalaning (elektron pochta xabarlari bilan topilgan). Internetga kirish kerak
+Module2800Desc=FTP mijozi
 Module2900Name=GeoIPMaxmind
-Module2900Desc=GeoIP Maxmind conversions capabilities
+Module2900Desc=GeoIP Maxmind konversiyalari imkoniyatlari
 Module3200Name=Unalterable Archives
 Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries.
 Module3400Name=Social Networks
 Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
 Module4000Name=HRM
-Module4000Desc=Human resources management (management of department, employee contracts and feelings)
-Module5000Name=Multi-company
-Module5000Desc=Allows you to manage multiple companies
-Module6000Name=Inter-modules Workflow
-Module6000Desc=Workflow management between different modules (automatic creation of object and/or automatic status change)
-Module10000Name=Websites
-Module10000Desc=Create websites (public) with a WYSIWYG editor. This is a webmaster or developer oriented CMS (it is better to know HTML and CSS language). 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 Request Management
-Module20000Desc=Define and track employee leave requests
-Module39000Name=Product Lots
-Module39000Desc=Lots, serial numbers, eat-by/sell-by date management for products
+Module4000Desc=Inson resurslarini boshqarish (bo'limni boshqarish, xodimlarning shartnomalari va hissiyotlari)
+Module5000Name=Ko'p kompaniya
+Module5000Desc=Bir nechta kompaniyalarni boshqarishga imkon beradi
+Module6000Name=Modullararo ish jarayoni
+Module6000Desc=Turli xil modullar orasidagi ish oqimini boshqarish (ob'ektni avtomatik yaratish va / yoki holatni avtomatik o'zgartirish)
+Module10000Name=Veb-saytlar
+Module10000Desc=WYSIWYG muharriri bilan veb-saytlar (umumiy) yarating. Bu veb-usta yoki ishlab chiquvchiga yo'naltirilgan CMS (HTML va CSS tillarini bilish yaxshiroq). Shaxsiy veb-serveringizni (Apache, Nginx, ...) sozlashingiz kerak, bu sizning domen nomingiz bilan Internetda onlayn bo'lish uchun maxsus Dolibarr katalogiga ishora qiling.
+Module20000Name=So'rovni boshqarishni tark eting
+Module20000Desc=Xodimlarning ta'tilga chiqishlarini aniqlash va kuzatib borish
+Module39000Name=Mahsulotlar juda ko'p
+Module39000Desc=Mahsulotlar uchun lotlar, seriya raqamlari, ovqatlanish / sotish sanasini boshqarish
 Module40000Name=Multicurrency
 Module40000Desc=Use alternative currencies in prices and documents
 Module50000Name=PayBox
-Module50000Desc=Offer customers a PayBox online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
+Module50000Desc=Mijozlarga PayBox onlayn to'lov sahifasini (kredit / debet kartalari) taklif eting. Bu sizning mijozlaringizga vaqtinchalik to'lovlarni yoki ma'lum bir Dolibarr ob'ekti bilan bog'liq to'lovlarni amalga oshirishga ruxsat berish uchun ishlatilishi mumkin (hisob-faktura, buyurtma va hk ...)
 Module50100Name=POS SimplePOS
-Module50100Desc=Point of Sale module SimplePOS (simple POS).
+Module50100Desc=Sotish nuqtasi SimplePOS (oddiy POS) moduli.
 Module50150Name=POS TakePOS
 Module50150Desc=Point of Sale module TakePOS (touchscreen POS, for shops, bars or restaurants).
 Module50200Name=Paypal
-Module50200Desc=Offer customers a PayPal online payment page (PayPal account or credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
+Module50200Desc=Mijozlarga PayPal onlayn to'lov sahifasini taklif eting (PayPal hisob qaydnomasi yoki kredit / debet kartalari). Bu sizning mijozlaringizga vaqtinchalik to'lovlarni yoki ma'lum bir Dolibarr ob'ekti bilan bog'liq to'lovlarni amalga oshirishga ruxsat berish uchun ishlatilishi mumkin (hisob-faktura, buyurtma va hk ...)
 Module50300Name=Stripe
 Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
-Module50400Name=Accounting (double entry)
-Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
+Module50400Name=Buxgalteriya hisobi (ikki martalik yozuv)
+Module50400Desc=Buxgalteriya hisobini boshqarish (ikki tomonlama yozuvlar, Bosh va yordamchi kitoblarni qo'llab-quvvatlash). Buxgalteriya dasturini boshqa bir qancha buxgalteriya dasturlari formatida eksport qiling.
 Module54000Name=PrintIPP
-Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installed on server).
-Module55000Name=Poll, Survey or Vote
-Module55000Desc=Create online polls, surveys or votes (like Doodle, Studs, RDVz etc...)
-Module59000Name=Margins
-Module59000Desc=Module to follow margins
-Module60000Name=Commissions
-Module60000Desc=Module to manage commissions
+Module54000Desc=Cups IPP interfeysi yordamida to'g'ridan-to'g'ri chop etish (hujjatlarni ochmasdan) (Printer serverdan ko'rinadigan bo'lishi va serverga CUPS o'rnatilgan bo'lishi kerak).
+Module55000Name=So'rovnoma, so'rovnoma yoki ovoz berish
+Module55000Desc=Onlayn so'rovnomalar, so'rovnomalar yoki ovozlarni yarating (Doodle, Studs, RDVz va boshqalar kabi).
+Module59000Name=Chegaralar
+Module59000Desc=Chegaralarni kuzatib borish uchun modul
+Module60000Name=Komissiyalar
+Module60000Desc=Komissiyalarni boshqarish moduli
 Module62000Name=Incoterms
 Module62000Desc=Add features to manage Incoterms
-Module63000Name=Resources
-Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
-Permission11=Read customer invoices
-Permission12=Create/modify customer invoices
-Permission13=Invalidate customer invoices
-Permission14=Validate customer invoices
-Permission15=Send customer invoices by email
-Permission16=Create payments for customer invoices
-Permission19=Delete customer invoices
-Permission21=Read commercial proposals
-Permission22=Create/modify commercial proposals
-Permission24=Validate commercial proposals
-Permission25=Send commercial proposals
-Permission26=Close commercial proposals
-Permission27=Delete commercial proposals
-Permission28=Export commercial proposals
-Permission31=Read products
-Permission32=Create/modify products
-Permission34=Delete products
-Permission36=See/manage hidden products
-Permission38=Export products
+Module63000Name=Resurslar
+Module63000Desc=Tadbirlarga ajratish uchun resurslarni (printerlar, mashinalar, xonalar, ...) boshqaring
+Permission11=Mijozlarning hisob-fakturalarini o'qing
+Permission12=Mijozlarning hisob-kitoblarini yaratish / o'zgartirish
+Permission13=Mijozlarning hisob-kitoblarini bekor qilish
+Permission14=Xaridorlarning hisob-fakturalarini tasdiqlang
+Permission15=Xaridorlarning hisob-fakturalarini elektron pochta orqali yuboring
+Permission16=Xaridorlarning hisob-fakturalari uchun to'lovlarni yarating
+Permission19=Xaridorlarning hisob-fakturalarini o'chirib tashlang
+Permission21=Tijorat takliflarini o'qing
+Permission22=Tijorat takliflarini yaratish / o'zgartirish
+Permission24=Tijorat takliflarini tasdiqlash
+Permission25=Tijorat takliflarini yuboring
+Permission26=Tijorat takliflarini yoping
+Permission27=Tijorat takliflarini o'chirib tashlang
+Permission28=Tijorat takliflarini eksport qiling
+Permission31=Mahsulotlarni o'qing
+Permission32=Mahsulotlarni yaratish / o'zgartirish
+Permission34=Mahsulotlarni o'chirish
+Permission36=Yashirin mahsulotlarni ko'ring / boshqaring
+Permission38=Mahsulotlarni eksport qilish
 Permission39=Ignore minimum price
-Permission41=Read projects and tasks (shared project and projects I'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
-Permission42=Create/modify projects (shared project and projects I'm contact for). Can also create tasks and assign users to project and tasks
-Permission44=Delete projects (shared project and projects I'm contact for)
-Permission45=Export projects
-Permission61=Read interventions
-Permission62=Create/modify interventions
-Permission64=Delete interventions
-Permission67=Export interventions
+Permission41=Loyihalar va vazifalarni o'qing (umumiy loyiha va men aloqada bo'lgan loyihalar). Belgilangan vazifalar bo'yicha men uchun yoki mening ierarxiyam uchun sarflangan vaqtni ham kiritish mumkin (Timesheet)
+Permission42=Loyihalarni yaratish / o'zgartirish (umumiy loyiha va men aloqada bo'lgan loyihalar). Vazifalar yaratishi va foydalanuvchilarni loyiha va vazifalarga tayinlashi mumkin
+Permission44=Loyihalarni o'chirish (umumiy loyiha va men bog'langan loyihalar)
+Permission45=Loyihalarni eksport qilish
+Permission61=Ta'sirlarni o'qing
+Permission62=Interventsiyalarni yaratish / o'zgartirish
+Permission64=Ta'sirlarni o'chirib tashlang
+Permission67=Eksport tadbirlari
 Permission68=Send interventions by email
 Permission69=Validate interventions
 Permission70=Invalidate interventions
-Permission71=Read members
-Permission72=Create/modify members
-Permission74=Delete members
-Permission75=Setup types of membership
-Permission76=Export data
-Permission78=Read subscriptions
-Permission79=Create/modify subscriptions
-Permission81=Read customers orders
-Permission82=Create/modify customers orders
-Permission84=Validate customers orders
-Permission86=Send customers orders
-Permission87=Close customers orders
-Permission88=Cancel customers orders
-Permission89=Delete customers orders
-Permission91=Read social or fiscal taxes and vat
-Permission92=Create/modify social or fiscal taxes and vat
-Permission93=Delete social or fiscal taxes and vat
-Permission94=Export social or fiscal taxes
-Permission95=Read reports
-Permission101=Read sendings
-Permission102=Create/modify sendings
-Permission104=Validate sendings
+Permission71=A'zolarni o'qing
+Permission72=A'zolarni yaratish / o'zgartirish
+Permission74=A'zolarni o'chirish
+Permission75=A'zolik turlarini sozlash
+Permission76=Ma'lumotlarni eksport qilish
+Permission78=Obunalarni o'qing
+Permission79=Obunalarni yaratish / o'zgartirish
+Permission81=Mijozlarning buyurtmalarini o'qing
+Permission82=Mijozlarning buyurtmalarini yaratish / o'zgartirish
+Permission84=Mijozlarning buyurtmalarini tasdiqlash
+Permission86=Mijozlarga buyurtmalar yuboring
+Permission87=Mijozlarning buyurtmalarini yopish
+Permission88=Mijozlarning buyurtmalarini bekor qilish
+Permission89=Mijozlarning buyurtmalarini o'chirish
+Permission91=Ijtimoiy yoki soliq soliqlari va QQSni o'qing
+Permission92=Ijtimoiy yoki soliq soliqlari va QQSni yaratish / o'zgartirish
+Permission93=Ijtimoiy yoki soliq soliqlari va QQSni o'chirib tashlang
+Permission94=Ijtimoiy yoki soliq soliqlarini eksport qiling
+Permission95=Hisobotlarni o'qing
+Permission101=Yuborishlarni o'qing
+Permission102=Yuborishlarni yaratish / o'zgartirish
+Permission104=Yuborishlarni tasdiqlash
 Permission105=Send sendings by email
-Permission106=Export sendings
-Permission109=Delete sendings
-Permission111=Read financial accounts
-Permission112=Create/modify/delete and compare transactions
-Permission113=Setup financial accounts (create, manage categories)
-Permission114=Reconcile transactions
-Permission115=Export transactions and account statements
-Permission116=Transfers between accounts
-Permission117=Manage checks dispatching
-Permission121=Read third parties linked to user
-Permission122=Create/modify third parties linked to user
-Permission125=Delete third parties linked to user
-Permission126=Export third parties
-Permission141=Read all projects and tasks (also private projects for which I am not a contact)
-Permission142=Create/modify all projects and tasks (also private projects for which I am not a contact)
-Permission144=Delete all projects and tasks (also private projects i am not contact for)
-Permission146=Read providers
-Permission147=Read stats
-Permission151=Read direct debit payment orders
-Permission152=Create/modify a direct debit payment orders
-Permission153=Send/Transmit direct debit payment orders
-Permission154=Record Credits/Rejections of direct debit payment orders
-Permission161=Read contracts/subscriptions
-Permission162=Create/modify contracts/subscriptions
-Permission163=Activate a service/subscription of a contract
-Permission164=Disable a service/subscription of a contract
-Permission165=Delete contracts/subscriptions
-Permission167=Export contracts
-Permission171=Read trips and expenses (yours and your subordinates)
-Permission172=Create/modify trips and expenses
-Permission173=Delete trips and expenses
-Permission174=Read all trips and expenses
-Permission178=Export trips and expenses
-Permission180=Read suppliers
-Permission181=Read purchase orders
-Permission182=Create/modify purchase orders
-Permission183=Validate purchase orders
-Permission184=Approve purchase orders
-Permission185=Order or cancel purchase orders
-Permission186=Receive purchase orders
-Permission187=Close purchase orders
-Permission188=Cancel purchase orders
-Permission192=Create lines
-Permission193=Cancel lines
-Permission194=Read the bandwidth lines
-Permission202=Create ADSL connections
-Permission203=Order connections orders
-Permission204=Order connections
-Permission205=Manage connections
-Permission206=Read connections
-Permission211=Read Telephony
-Permission212=Order lines
-Permission213=Activate line
-Permission214=Setup Telephony
-Permission215=Setup providers
-Permission221=Read emailings
-Permission222=Create/modify emailings (topic, recipients...)
-Permission223=Validate emailings (allows sending)
-Permission229=Delete emailings
-Permission237=View recipients and info
-Permission238=Manually send mailings
-Permission239=Delete mailings after validation or sent
-Permission241=Read categories
-Permission242=Create/modify categories
-Permission243=Delete categories
-Permission244=See the contents of the hidden categories
-Permission251=Read other users and groups
-PermissionAdvanced251=Read other users
-Permission252=Read permissions of other users
-Permission253=Create/modify other users, groups and permissions
-PermissionAdvanced253=Create/modify internal/external users and permissions
-Permission254=Create/modify external users only
-Permission255=Modify other users password
-Permission256=Delete or disable other users
-Permission262=Extend access to all third parties AND their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission106=Eksport jo'natmalari
+Permission109=Yuborishlarni o'chirish
+Permission111=Moliyaviy hisoblarni o'qing
+Permission112=Tranzaktsiyalarni yaratish / o'zgartirish / o'chirish va taqqoslash
+Permission113=Moliyaviy hisoblarni sozlash (toifalarni yaratish, boshqarish)
+Permission114=Tranzaktsiyalarni yarashtirish
+Permission115=Eksport operatsiyalari va hisobvaraqlar bo'yicha ko'chirmalar
+Permission116=Hisob-kitoblar o'rtasida o'tkazmalar
+Permission117=Cheklarni jo'natishni boshqarish
+Permission121=Foydalanuvchiga bog'langan uchinchi tomonlarni o'qing
+Permission122=Foydalanuvchiga bog'langan uchinchi shaxslarni yaratish / o'zgartirish
+Permission125=Foydalanuvchiga bog'langan uchinchi tomonlarni o'chirib tashlang
+Permission126=Uchinchi tomonlarni eksport qilish
+Permission141=Barcha loyihalar va topshiriqlarni o'qing (shuningdek, men ular bilan aloqa qilmaydigan xususiy loyihalar)
+Permission142=Barcha loyihalar va vazifalarni yaratish / o'zgartirish (shuningdek, men ular bilan aloqa qilmaydigan xususiy loyihalar)
+Permission144=Barcha loyihalar va vazifalarni o'chirib tashlang (shuningdek, xususiy loyihalar bilan bog'lanmayman)
+Permission146=Provayderlarni o'qing
+Permission147=Statistikani o'qing
+Permission151=To'g'ridan-to'g'ri debet to'lovlarini o'qing
+Permission152=To'g'ridan-to'g'ri debetli to'lov buyurtmalarini yaratish / o'zgartirish
+Permission153=To'g'ridan-to'g'ri debet to'lovlarini yuborish / uzatish
+Permission154=Rekord kreditlar / To'g'ridan-to'g'ri debetli to'lov topshiriqlarini rad etish
+Permission161=Shartnomalarni / obunalarni o'qing
+Permission162=Shartnomalarni / obunalarni yarating / o'zgartiring
+Permission163=Shartnoma xizmatini / obunasini faollashtiring
+Permission164=Shartnoma xizmatini / obunasini o'chirib qo'ying
+Permission165=Shartnomalarni / obunalarni o'chirib tashlang
+Permission167=Eksport shartnomalari
+Permission171=Safarlar va xarajatlarni o'qing (o'zingiz va bo'ysunuvchilaringiz)
+Permission172=Safarlar va xarajatlarni yaratish / o'zgartirish
+Permission173=Safarlar va xarajatlarni o'chirib tashlang
+Permission174=Barcha sayohatlar va xarajatlarni o'qing
+Permission178=Eksportga sayohat va xarajatlar
+Permission180=Ta'minlovchilarni o'qing
+Permission181=Xarid qilish buyurtmalarini o'qing
+Permission182=Sotib olish to'g'risida buyurtmalarni yaratish / o'zgartirish
+Permission183=Xarid buyurtmalarini tasdiqlang
+Permission184=Xarid qilish buyurtmalarini tasdiqlash
+Permission185=Xarid qilish buyurtmalariga buyurtma bering yoki bekor qiling
+Permission186=Xarid qilish buyurtmalarini oling
+Permission187=Xarid buyurtmalarini yoping
+Permission188=Sotib olish buyurtmalarini bekor qilish
+Permission192=Chiziqlar yarating
+Permission193=Chiziqlarni bekor qilish
+Permission194=Tarmoqli kenglik satrlarini o'qing
+Permission202=ADSL ulanishlarini yarating
+Permission203=Ulanish buyurtmalariga buyurtma bering
+Permission204=Aloqalarni buyurtma qiling
+Permission205=Ulanishlarni boshqarish
+Permission206=Ulanishlarni o'qing
+Permission211=Telefoniyani o'qing
+Permission212=Buyurtma satrlari
+Permission213=Chiziqni yoqing
+Permission214=Telefoniyani o'rnatish
+Permission215=O'rnatish provayderlari
+Permission221=Elektron pochta xabarlarini o'qing
+Permission222=Elektron pochta xabarlarini yaratish / o'zgartirish (mavzu, qabul qiluvchilar ...)
+Permission223=Elektron pochta xabarlarini tasdiqlash (yuborishga imkon beradi)
+Permission229=Elektron pochta xabarlarini o'chirish
+Permission237=Qabul qiluvchilarni va ma'lumotlarni ko'ring
+Permission238=Pochta xabarlarini qo'lda yuboring
+Permission239=Tasdiqlangandan yoki yuborilgandan so'ng pochta xabarlarini o'chirib tashlang
+Permission241=Kategoriyalarni o'qing
+Permission242=Kategoriyalarni yaratish / o'zgartirish
+Permission243=Kategoriyalarni o'chirish
+Permission244=Yashirin toifalarning tarkibiga qarang
+Permission251=Boshqa foydalanuvchilar va guruhlarni o'qing
+PermissionAdvanced251=Boshqa foydalanuvchilarni o'qing
+Permission252=Boshqa foydalanuvchilarning ruxsatlarini o'qing
+Permission253=Boshqa foydalanuvchilar, guruhlar va ruxsatlarni yaratish / o'zgartirish
+PermissionAdvanced253=Ichki / tashqi foydalanuvchilar va ruxsatlarni yaratish / o'zgartirish
+Permission254=Faqat tashqi foydalanuvchilarni yarating / o'zgartiring
+Permission255=Boshqa foydalanuvchilarning parolini o'zgartiring
+Permission256=Boshqa foydalanuvchilarni o'chirish yoki o'chirish
+Permission262=Barcha uchinchi shaxslarga va ularning ob'ektlariga kirishni kengaytiring (nafaqat foydalanuvchi savdo vakili bo'lgan uchinchi shaxslar). <br> tashqi foydalanuvchilar uchun samarali emas (takliflar, buyurtmalar, hisob-fakturalar, shartnomalar va boshqalar uchun har doim o'zlari bilan cheklangan). <br> Loyihalar uchun samarali emas (faqat loyiha ruxsatnomalari qoidalari, ko'rinishi va tayinlash masalalari).
 Permission263=Extend access to all third parties WITHOUT their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
-Permission271=Read CA
-Permission272=Read invoices
-Permission273=Issue invoices
-Permission281=Read contacts
-Permission282=Create/modify contacts
-Permission283=Delete contacts
-Permission286=Export contacts
-Permission291=Read tariffs
-Permission292=Set permissions on the tariffs
-Permission293=Modify customer's tariffs
-Permission300=Read barcodes
-Permission301=Create/modify barcodes
-Permission302=Delete barcodes
-Permission311=Read services
-Permission312=Assign service/subscription to contract
-Permission331=Read bookmarks
-Permission332=Create/modify bookmarks
-Permission333=Delete bookmarks
-Permission341=Read its own permissions
-Permission342=Create/modify his own user information
-Permission343=Modify his own password
-Permission344=Modify its own permissions
-Permission351=Read groups
-Permission352=Read groups permissions
-Permission353=Create/modify groups
-Permission354=Delete or disable groups
-Permission358=Export users
-Permission401=Read discounts
-Permission402=Create/modify discounts
-Permission403=Validate discounts
-Permission404=Delete discounts
+Permission271=CA ni o'qing
+Permission272=Hisob-fakturalarni o'qing
+Permission273=Hisob-fakturalarni chiqarish
+Permission281=Kontaktlarni o'qing
+Permission282=Kontaktlarni yaratish / o'zgartirish
+Permission283=Kontaktlarni o'chirish
+Permission286=Kontaktlarni eksport qilish
+Permission291=Tariflarni o'qing
+Permission292=Tariflar bo'yicha ruxsatnomalarni o'rnating
+Permission293=Mijozning tariflarini o'zgartiring
+Permission300=Shtrixli kodlarni o'qing
+Permission301=Shtrixli kodlarni yaratish / o'zgartirish
+Permission302=Shtrixli kodlarni o'chirish
+Permission311=Xizmatlarni o'qing
+Permission312=Shartnomaga xizmat / obuna tayinlang
+Permission331=Xatcho'plarni o'qing
+Permission332=Xatcho'plarni yaratish / o'zgartirish
+Permission333=Xatcho'plarni o'chirish
+Permission341=O'zining ruxsatlarini o'qing
+Permission342=O'zining foydalanuvchi ma'lumotlarini yaratish / o'zgartirish
+Permission343=O'zining parolini o'zgartiring
+Permission344=O'zining ruxsatlarini o'zgartiring
+Permission351=Guruhlarni o'qing
+Permission352=Guruhlarning ruxsatlarini o'qing
+Permission353=Guruhlarni yaratish / o'zgartirish
+Permission354=Guruhlarni o'chirish yoki o'chirish
+Permission358=Foydalanuvchilarni eksport qilish
+Permission401=Chegirmalarni o'qing
+Permission402=Chegirmalar yaratish / o'zgartirish
+Permission403=Chegirmalarni tasdiqlang
+Permission404=Chegirmalarni o'chirib tashlang
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries (yours and subordinates)
-Permission512=Create/modify payments of salaries
-Permission514=Delete payments of salaries
-Permission517=Read payments of salaries of everybody
+Permission511=Read salaries and payments (yours and subordinates)
+Permission512=Create/modify salaries and payments
+Permission514=Delete salaries and payments
+Permission517=Read salaries and payments everybody
 Permission519=Export salaries
-Permission520=Read Loans
-Permission522=Create/modify loans
-Permission524=Delete loans
-Permission525=Access loan calculator
-Permission527=Export loans
-Permission531=Read services
-Permission532=Create/modify services
-Permission534=Delete services
-Permission536=See/manage hidden services
-Permission538=Export services
+Permission520=Kreditlarni o'qing
+Permission522=Kreditlarni yaratish / o'zgartirish
+Permission524=Kreditlarni o'chirish
+Permission525=Kredit kalkulyatori
+Permission527=Eksport kreditlari
+Permission531=Xizmatlarni o'qing
+Permission532=Xizmatlarni yaratish / o'zgartirish
+Permission534=Xizmatlarni o'chirish
+Permission536=Yashirin xizmatlarni ko'rish / boshqarish
+Permission538=Eksport xizmatlari
 Permission561=Read payment orders by credit transfer
 Permission562=Create/modify payment order by credit transfer
 Permission563=Send/Transmit payment order by credit transfer
@@ -876,72 +877,72 @@ Permission652=Delete Bills of Materials
 Permission660=Read Manufacturing Order (MO)
 Permission661=Create/Update Manufacturing Order (MO)
 Permission662=Delete Manufacturing Order (MO)
-Permission701=Read donations
-Permission702=Create/modify donations
-Permission703=Delete donations
-Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
-Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
-Permission775=Approve expense reports
-Permission776=Pay expense reports
+Permission701=Xayr-ehsonlarni o'qing
+Permission702=Xayriya mablag'larini yaratish / o'zgartirish
+Permission703=Xayriyalarni o'chirib tashlang
+Permission771=Xarajatlar to'g'risidagi hisobotlarni o'qing (o'zingiz va sizning bo'ysunuvchilaringiz)
+Permission772=Xarajatlar to'g'risidagi hisobotlarni yaratish / o'zgartirish
+Permission773=Xarajatlar to'g'risidagi hisobotlarni o'chirish
+Permission774=Barcha xarajatlar hisobotlarini o'qing (hatto bo'ysunuvchi bo'lmagan foydalanuvchi uchun ham)
+Permission775=Xarajatlar to'g'risidagi hisobotlarni tasdiqlash
+Permission776=Xarajatlar bo'yicha hisobotlarni to'lash
 Permission777=Read expense reports of everybody
 Permission778=Create/modify expense reports of everybody
-Permission779=Export expense reports
-Permission1001=Read stocks
-Permission1002=Create/modify warehouses
-Permission1003=Delete warehouses
-Permission1004=Read stock movements
-Permission1005=Create/modify stock movements
-Permission1101=Read delivery receipts
-Permission1102=Create/modify delivery receipts
-Permission1104=Validate delivery receipts
-Permission1109=Delete delivery receipts
+Permission779=Eksport xarajatlari to'g'risidagi hisobotlar
+Permission1001=Qimmatli qog'ozlarni o'qing
+Permission1002=Omborlarni yaratish / o'zgartirish
+Permission1003=Omborlarni o'chirish
+Permission1004=Birja harakatlarini o'qing
+Permission1005=Birja harakatlarini yaratish / o'zgartirish
+Permission1101=Yetkazib berish kvitansiyasini o'qing
+Permission1102=Yetkazib berish kvitansiyasini yarating / o'zgartiring
+Permission1104=Yetkazib berish kvitansiyasini tasdiqlang
+Permission1109=Yetkazib berish kvitansiyasini o'chirib tashlang
 Permission1121=Read supplier proposals
 Permission1122=Create/modify supplier proposals
 Permission1123=Validate supplier proposals
 Permission1124=Send supplier proposals
 Permission1125=Delete supplier proposals
 Permission1126=Close supplier price requests
-Permission1181=Read suppliers
-Permission1182=Read purchase orders
-Permission1183=Create/modify purchase orders
-Permission1184=Validate purchase orders
-Permission1185=Approve purchase orders
-Permission1186=Order purchase orders
-Permission1187=Acknowledge receipt of purchase orders
-Permission1188=Delete purchase orders
+Permission1181=Ta'minlovchilarni o'qing
+Permission1182=Xarid qilish buyurtmalarini o'qing
+Permission1183=Sotib olish to'g'risida buyurtmalarni yaratish / o'zgartirish
+Permission1184=Xarid buyurtmalarini tasdiqlang
+Permission1185=Xarid qilish buyurtmalarini tasdiqlash
+Permission1186=Xarid buyurtmalariga buyurtma bering
+Permission1187=Sotib olish to'g'risida buyurtmalar olinganligini tasdiqlang
+Permission1188=Xarid buyurtmalarini o'chirib tashlang
 Permission1189=Check/Uncheck a purchase order reception
-Permission1190=Approve (second approval) purchase orders
+Permission1190=Sotib olish buyurtmalarini tasdiqlash (ikkinchi tasdiqlash)
 Permission1191=Export supplier orders and their attributes
-Permission1201=Get result of an export
-Permission1202=Create/Modify an export
-Permission1231=Read vendor invoices
-Permission1232=Create/modify vendor invoices
-Permission1233=Validate vendor invoices
-Permission1234=Delete vendor invoices
-Permission1235=Send vendor invoices by email
-Permission1236=Export vendor invoices, attributes and payments
-Permission1237=Export purchase orders and their details
-Permission1251=Run mass imports of external data into database (data load)
-Permission1321=Export customer invoices, attributes and payments
-Permission1322=Reopen a paid bill
-Permission1421=Export sales orders and attributes
+Permission1201=Eksport natijasini oling
+Permission1202=Eksportni yaratish / o'zgartirish
+Permission1231=Sotuvchi fakturalarini o'qing
+Permission1232=Sotuvchi hisob-fakturalarini yaratish / o'zgartirish
+Permission1233=Sotuvchi hisob-fakturalarini tasdiqlash
+Permission1234=Sotuvchi hisob-fakturalarini o'chirib tashlang
+Permission1235=Sotuvchi hisob-fakturalarini elektron pochta orqali yuboring
+Permission1236=Sotuvchi hisob-fakturalarini, atributlarini va to'lovlarini eksport qiling
+Permission1237=Xarid qilish buyurtmalarini va ularning tafsilotlarini eksport qiling
+Permission1251=Ma'lumotlar bazasiga tashqi ma'lumotlarning ommaviy importini olib borish (ma'lumotlar yuklanishi)
+Permission1321=Xaridorlarning hisob-fakturalarini, atributlarini va to'lovlarini eksport qiling
+Permission1322=To'langan hisobni qayta oching
+Permission1421=Sotish bo'yicha buyurtmalar va atributlarni eksport qiling
 Permission1521=Read documents
 Permission1522=Delete documents
-Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
-Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
-Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
-Permission2411=Read actions (events or tasks) of others
-Permission2412=Create/modify actions (events or tasks) of others
-Permission2413=Delete actions (events or tasks) of others
-Permission2414=Export actions/tasks of others
-Permission2501=Read/Download documents
-Permission2502=Download documents
-Permission2503=Submit or delete documents
-Permission2515=Setup documents directories
-Permission2801=Use FTP client in read mode (browse and download only)
-Permission2802=Use FTP client in write mode (delete or upload files)
+Permission2401=Uning foydalanuvchi akkauntiga bog'langan amallarni (voqealar yoki vazifalarni) o'qing (agar tadbir egasi yoki unga tayinlangan bo'lsa)
+Permission2402=Uning foydalanuvchi akkauntiga bog'langan amallarni (voqealar yoki vazifalarni) yaratish / o'zgartirish (agar tadbir egasi bo'lsa)
+Permission2403=Uning foydalanuvchi akkauntiga bog'langan amallarni (voqealar yoki vazifalarni) o'chirish (agar tadbir egasi bo'lsa)
+Permission2411=Boshqalarning harakatlarini (hodisalarini yoki vazifalarini) o'qing
+Permission2412=Boshqalarning harakatlarini (hodisalarini yoki vazifalarini) yarating / o'zgartiring
+Permission2413=Boshqalarning harakatlarini (hodisalarini yoki vazifalarini) o'chirib tashlang
+Permission2414=Boshqalarning harakatlarini / vazifalarini eksport qilish
+Permission2501=Hujjatlarni o'qish / yuklab olish
+Permission2502=Hujjatlarni yuklab oling
+Permission2503=Hujjatlarni yuborish yoki o'chirish
+Permission2515=Hujjatlar kataloglarini sozlash
+Permission2801=FTP mijozidan o'qish rejimida foydalaning (faqat ko'rib chiqing va yuklab oling)
+Permission2802=Yozish rejimida FTP mijozidan foydalaning (fayllarni o'chirish yoki yuklash)
 Permission3200=Read archived events and fingerprints
 Permission3301=Generate new modules
 Permission4001=See employees
@@ -952,21 +953,23 @@ Permission10001=Read website content
 Permission10002=Create/modify website content (html and javascript content)
 Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
 Permission10005=Delete website content
-Permission20001=Read leave requests (your leave and those of your subordinates)
-Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
-Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Admin leave requests (setup and update balance)
+Permission20001=Ta'tilga bo'lgan talablarni o'qing (sizning va sizning bo'ysunuvchilaringizning ta'tillari)
+Permission20002=Ta'tilga oid so'rovlarni yaratish (o'zgartirish va o'zingizning bo'ysunuvchilaringiz)
+Permission20003=Dam olish uchun so'rovlarni o'chirib tashlang
+Permission20004=Barcha ta'tilga oid so'rovlarni o'qing (hatto foydalanuvchi unga bo'ysunmagan)
+Permission20005=Barchaga (hattoki tobe bo'lmagan foydalanuvchi uchun ham) ta'tilga chiqish so'rovlarini yaratish / o'zgartirish
+Permission20006=Administrator so'rovlarni qoldiradi (sozlash va balansni yangilash)
 Permission20007=Approve leave requests
-Permission23001=Read Scheduled job
-Permission23002=Create/update Scheduled job
-Permission23003=Delete Scheduled job
-Permission23004=Execute Scheduled job
-Permission50101=Use Point of Sale (SimplePOS)
+Permission23001=Rejalashtirilgan ishni o'qing
+Permission23002=Rejalashtirilgan ishni yaratish / yangilash
+Permission23003=Rejalashtirilgan ishni o'chirish
+Permission23004=Rejalashtirilgan ishni bajaring
+Permission50101=Savdo punktidan foydalaning (SimplePOS)
 Permission50151=Use Point of Sale (TakePOS)
-Permission50201=Read transactions
-Permission50202=Import transactions
+Permission50152=Edit sales lines
+Permission50153=Edit ordered sales lines
+Permission50201=Tranzaksiyalarni o'qing
+Permission50202=Import operatsiyalari
 Permission50330=Read objects of Zapier
 Permission50331=Create/Update objects of Zapier
 Permission50332=Delete objects of Zapier
@@ -983,16 +986,16 @@ Permission51001=Read assets
 Permission51002=Create/Update assets
 Permission51003=Delete assets
 Permission51005=Setup types of asset
-Permission54001=Print
-Permission55001=Read polls
-Permission55002=Create/modify polls
-Permission59001=Read commercial margins
-Permission59002=Define commercial margins
-Permission59003=Read every user margin
-Permission63001=Read resources
-Permission63002=Create/modify resources
-Permission63003=Delete resources
-Permission63004=Link resources to agenda events
+Permission54001=Chop etish
+Permission55001=So'rovnomalarni o'qing
+Permission55002=So'rovlarni yaratish / o'zgartirish
+Permission59001=Tijorat chekkalarini o'qing
+Permission59002=Tijorat chekkalarini aniqlang
+Permission59003=Har bir foydalanuvchi marjini o'qing
+Permission63001=Resurslarni o'qing
+Permission63002=Resurslarni yaratish / o'zgartirish
+Permission63003=Resurslarni o'chirish
+Permission63004=Resurslarni kun tartibidagi voqealar bilan bog'lang
 Permission64001=Allow direct printing
 Permission67000=Allow printing of receipts
 Permission68001=Read intracomm report
@@ -1004,563 +1007,568 @@ Permission941603=Validate receipts
 Permission941604=Send receipts by email
 Permission941605=Export receipts
 Permission941606=Delete receipts
-DictionaryCompanyType=Third-party types
-DictionaryCompanyJuridicalType=Third-party legal entities
-DictionaryProspectLevel=Prospect potential level for companies
+DictionaryCompanyType=Uchinchi tomon turlari
+DictionaryCompanyJuridicalType=Uchinchi tomon yuridik shaxslari
+DictionaryProspectLevel=Kompaniyalar uchun istiqbolli potentsial darajasi
 DictionaryProspectContactLevel=Prospect potential level for contacts
-DictionaryCanton=States/Provinces
-DictionaryRegion=Regions
-DictionaryCountry=Countries
-DictionaryCurrency=Currencies
-DictionaryCivility=Honorific titles
-DictionaryActions=Types of agenda events
-DictionarySocialContributions=Types of social or fiscal taxes
-DictionaryVAT=VAT Rates or Sales Tax Rates
-DictionaryRevenueStamp=Amount of tax stamps
-DictionaryPaymentConditions=Payment Terms
-DictionaryPaymentModes=Payment Modes
-DictionaryTypeContact=Contact/Address types
+DictionaryCanton=Shtatlar / viloyatlar
+DictionaryRegion=Mintaqalar
+DictionaryCountry=Mamlakatlar
+DictionaryCurrency=Valyutalar
+DictionaryCivility=Faxriy unvonlar
+DictionaryActions=Kun tartibidagi tadbirlar turlari
+DictionarySocialContributions=Ijtimoiy yoki soliq soliqlarining turlari
+DictionaryVAT=QQS stavkalari yoki sotish uchun soliq stavkalari
+DictionaryRevenueStamp=Soliq markalari miqdori
+DictionaryPaymentConditions=To'lov shartlari
+DictionaryPaymentModes=To'lov usullari
+DictionaryTypeContact=Aloqa / manzil turlari
 DictionaryTypeOfContainer=Website - Type of website pages/containers
-DictionaryEcotaxe=Ecotax (WEEE)
-DictionaryPaperFormat=Paper formats
-DictionaryFormatCards=Card formats
-DictionaryFees=Expense report - Types of expense report lines
-DictionarySendingMethods=Shipping methods
-DictionaryStaff=Number of Employees
-DictionaryAvailability=Delivery delay
-DictionaryOrderMethods=Ordering methods
-DictionarySource=Origin of proposals/orders
-DictionaryAccountancyCategory=Personalized groups for reports
-DictionaryAccountancysystem=Models for chart of accounts
+DictionaryEcotaxe=Ekotaks (WEEE)
+DictionaryPaperFormat=Qog'oz formatlari
+DictionaryFormatCards=Karta formatlari
+DictionaryFees=Xarajatlar to'g'risidagi hisobot - xarajatlar hisobotining turlari
+DictionarySendingMethods=Yuk tashish usullari
+DictionaryStaff=Xodimlar soni
+DictionaryAvailability=Yetkazib berishning kechikishi
+DictionaryOrderMethods=Buyurtma usullari
+DictionarySource=Takliflarning / buyurtmalarning kelib chiqishi
+DictionaryAccountancyCategory=Hisobotlar uchun moslashtirilgan guruhlar
+DictionaryAccountancysystem=Hisob-kitoblar rejasi uchun modellar
 DictionaryAccountancyJournal=Accounting journals
-DictionaryEMailTemplates=Email Templates
-DictionaryUnits=Units
+DictionaryEMailTemplates=Elektron pochta shablonlari
+DictionaryUnits=Birlik
 DictionaryMeasuringUnits=Measuring Units
 DictionarySocialNetworks=Social Networks
-DictionaryProspectStatus=Prospect status for companies
+DictionaryProspectStatus=Kompaniyalarning istiqbolli holati
 DictionaryProspectContactStatus=Prospect status for contacts
-DictionaryHolidayTypes=Types of leave
-DictionaryOpportunityStatus=Lead status for project/lead
+DictionaryHolidayTypes=Dam olish - ta'til turlari
+DictionaryOpportunityStatus=Loyiha / qo'rg'oshin uchun etakchi holat
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
 DictionaryTransportMode=Intracomm report - Transport mode
+DictionaryBatchStatus=Product lot/serial Quality Control status
 TypeOfUnit=Type of unit
-SetupSaved=Setup saved
+SetupSaved=O'rnatish saqlandi
 SetupNotSaved=Setup not saved
-BackToModuleList=Back to Module list
-BackToDictionaryList=Back to Dictionaries list
+BackToModuleList=Modullar ro'yxatiga qaytish
+BackToDictionaryList=Lug'atlar ro'yxatiga qaytish
 TypeOfRevenueStamp=Type of tax stamp
-VATManagement=Sales Tax Management
-VATIsUsedDesc=By default when creating prospects, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependant on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
-VATIsNotUsedDesc=By default the proposed Sales tax is 0 which can be used for cases like associations, individuals or small companies.
-VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real). A system in which VAT is declared.
-VATIsNotUsedExampleFR=In France, it means associations that are non Sales tax declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (Sales tax in franchise) and paid a franchise Sales tax without any Sales tax declaration.  This choice will display the reference "Non applicable Sales tax - art-293B of CGI" on invoices.
+VATManagement=Sotish bo'yicha soliqni boshqarish
+VATIsUsedDesc=Sukut bo'yicha istiqbollarni, schyot-fakturalarni, buyurtmalarni va boshqalarni yaratishda Soliq stavkasi amaldagi standart qoidaga amal qiladi: <br> Agar sotuvchiga Sotuv solig'i olinmasa, u holda Soliq solig'i sukut bo'yicha 0 ga teng bo'ladi. Qoida oxiri. <br> ((sotuvchining mamlakati = xaridorning mamlakati) bo'lsa, u holda sotuvlar bo'yicha soliq sukut bo'yicha sotuvchining mamlakatidagi sotish solig'iga teng bo'ladi. Qoidaning tugashi. <br> Agar sotuvchi va xaridor ikkalasi ham Evropa hamjamiyatida bo'lsa va tovarlar transport bilan bog'liq mahsulotlar (yuk tashish, yuk tashish, aviakompaniya) bo'lsa, standart QQS 0. Bu qoida sotuvchining mamlakatiga bog'liq - iltimos, buxgalteringiz bilan maslahatlashing. QQSni xaridor sotuvchiga emas, balki o'z mamlakatlaridagi bojxona idoralariga to'lashi kerak. Qoidaning tugashi. <br> Agar sotuvchi va xaridor ikkalasi ham Evropa hamjamiyatida bo'lsa va xaridor kompaniya bo'lmasa (ro'yxatdan o'tgan QQS raqami bilan), u holda QQS sotuvchi mamlakatining QQS stavkasiga mos kelmaydi. Qoidaning tugashi. <br> Agar sotuvchi va xaridor ikkalasi ham Evropa hamjamiyatida bo'lsa va xaridor shirkat bo'lsa (ro'yxatdan o'tgan jamiyat ichidagi QQS raqami bilan), unda QQS sukut bo'yicha 0 ga teng. Qoidaning tugashi. <br> Boshqa har qanday holatda, taklif qilingan sukut sotish solig'i = 0. Qoidaning tugashi.
+VATIsNotUsedDesc=Sukut bo'yicha taklif qilinadigan Soliq solig'i 0 ga teng bo'lib, u assotsiatsiyalar, jismoniy shaxslar yoki kichik kompaniyalar kabi hollarda ishlatilishi mumkin.
+VATIsUsedExampleFR=Frantsiyada bu haqiqiy fiskal tizimga ega bo'lgan kompaniyalar yoki tashkilotlarni anglatadi (Soddalashtirilgan real yoki normal real). QQS e'lon qilingan tizim.
+VATIsNotUsedExampleFR=Frantsiyada bu Sotishdan tashqari deklaratsiyalangan assotsiatsiyalarni yoki mikrofirma fiskal tizimini tanlagan (franchayzadagi savdo solig'i) va franchayzing savdo soliqlarini hech qanday savdo deklaratsiyasisiz to'lagan kompaniyalar, tashkilotlar yoki liberal kasblarni anglatadi. Ushbu tanlovda hisobvaraq-fakturalarda "Amalga oshirilmaydigan savdo solig'i - CGI san'ati-293B" ma'lumotnomasi ko'rsatiladi.
 ##### Local Taxes #####
 TypeOfSaleTaxes=Type of sales tax
-LTRate=Rate
-LocalTax1IsNotUsed=Do not use second tax
-LocalTax1IsUsedDesc=Use a second type of tax (other than first one)
-LocalTax1IsNotUsedDesc=Do not use other type of tax (other than first one)
-LocalTax1Management=Second type of tax
+LTRate=Tezlik
+LocalTax1IsNotUsed=Ikkinchi soliqdan foydalanmang
+LocalTax1IsUsedDesc=Soliqning ikkinchi turidan foydalaning (birinchisidan tashqari)
+LocalTax1IsNotUsedDesc=Boshqa soliq turlaridan foydalanmang (birinchisidan tashqari)
+LocalTax1Management=Soliqning ikkinchi turi
 LocalTax1IsUsedExample=
 LocalTax1IsNotUsedExample=
-LocalTax2IsNotUsed=Do not use third tax
-LocalTax2IsUsedDesc=Use a third type of tax (other than first one)
-LocalTax2IsNotUsedDesc=Do not use other type of tax (other than first one)
-LocalTax2Management=Third type of tax
+LocalTax2IsNotUsed=Uchinchi soliqdan foydalanmang
+LocalTax2IsUsedDesc=Uchinchi soliq turidan foydalaning (birinchisidan tashqari)
+LocalTax2IsNotUsedDesc=Boshqa soliq turlaridan foydalanmang (birinchisidan tashqari)
+LocalTax2Management=Soliqning uchinchi turi
 LocalTax2IsUsedExample=
 LocalTax2IsNotUsedExample=
-LocalTax1ManagementES=RE Management
-LocalTax1IsUsedDescES=The RE rate by default when creating prospects, invoices, orders etc. follow the active standard rule:<br>If the buyer is not subjected to RE, RE by default=0. End of rule.<br>If the buyer is subjected to RE then the RE by default. End of rule.<br>
-LocalTax1IsNotUsedDescES=By default the proposed RE is 0. End of rule.
-LocalTax1IsUsedExampleES=In Spain they are professionals subject to some specific sections of the Spanish IAE.
-LocalTax1IsNotUsedExampleES=In Spain they are professional and societies and subject to certain sections of the Spanish IAE.
-LocalTax2ManagementES=IRPF Management
-LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices, orders etc. follow the active standard rule:<br>If the seller is not subjected to IRPF, then IRPF by default=0. End of rule.<br>If the seller is subjected to IRPF then the IRPF by default. End of rule.<br>
-LocalTax2IsNotUsedDescES=By default the proposed IRPF is 0. End of rule.
-LocalTax2IsUsedExampleES=In Spain, freelancers and independent professionals who provide services and companies who have chosen the tax system of modules.
-LocalTax2IsNotUsedExampleES=In Spain they are businesses not subject to tax system of modules.
+LocalTax1ManagementES=RE boshqaruvi
+LocalTax1IsUsedDescES=Istiqbollar, hisob-fakturalar, buyurtmalar va boshqalarni yaratishda RE stavkasi sukut bo'yicha faol standart qoidaga amal qiladi: <br> Agar xaridor REga bo'ysunmasa, sukut bo'yicha RE = 0. Qoidaning tugashi. <br> Agar xaridor REga duch kelsa, u holda RE sukut bo'yicha. Qoidaning tugashi. <br>
+LocalTax1IsNotUsedDescES=Odatiy bo'lib, taklif qilingan RE 0. Qoidaning oxiri.
+LocalTax1IsUsedExampleES=Ispaniyada ular Ispaniya IAE ning ba'zi bir aniq bo'limlariga bo'ysunadigan mutaxassislardir.
+LocalTax1IsNotUsedExampleES=Ispaniyada ular professional va jamiyatdir va Ispaniya IAEning ayrim bo'limlariga bo'ysunadilar.
+LocalTax2ManagementES=IRPF menejmenti
+LocalTax2IsUsedDescES=Istiqbollar, hisob-fakturalar, buyurtmalar va boshqalarni yaratishda IRPF stavkasi faol standart qoidaga amal qiladi: <br> Agar sotuvchi IRPFga bo'ysunmasa, u holda IRPF sukut bo'yicha = 0 bo'ladi. Qoidaning tugashi. <br> Agar sotuvchiga IRPF tegishli bo'lsa, u holda IRPF sukut bo'yicha. Qoidaning tugashi. <br>
+LocalTax2IsNotUsedDescES=Odatiy bo'lib, taklif qilingan IRPF 0. Qoidalarning oxiri.
+LocalTax2IsUsedExampleES=Ispaniyada xizmat ko'rsatuvchi frilanserlar va mustaqil mutaxassislar va modullarning soliq tizimini tanlagan kompaniyalar.
+LocalTax2IsNotUsedExampleES=Ispaniyada ular modul soliq tizimiga bo'ysunmaydigan korxonalardir.
 RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
 UseRevenueStamp=Use a tax stamp
 UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
-CalcLocaltax=Reports on local taxes
-CalcLocaltax1=Sales - Purchases
-CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
-CalcLocaltax2=Purchases
-CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
-CalcLocaltax3=Sales
-CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
+CalcLocaltax=Mahalliy soliqlar bo'yicha hisobotlar
+CalcLocaltax1=Sotish - sotib olish
+CalcLocaltax1Desc=Mahalliy soliqlar bo'yicha hisobotlar mahalliy soliqlarni sotish va mahalliy soliqlarni sotib olish o'rtasidagi farq bilan hisoblanadi
+CalcLocaltax2=Xaridlar
+CalcLocaltax2Desc=Mahalliy soliqlar bo'yicha hisobotlar - bu mahalliy soliqlarni sotib olishning umumiy miqdori
+CalcLocaltax3=Sotish
+CalcLocaltax3Desc=Mahalliy soliqlar bo'yicha hisobotlar - bu mahalliy soliqlar bo'yicha sotuvlar yig'indisi
 NoLocalTaxXForThisCountry=According to the setup of taxes (See %s - %s - %s), your country does not need to use such type of tax
-LabelUsedByDefault=Label used by default if no translation can be found for code
-LabelOnDocuments=Label on documents
+LabelUsedByDefault=Agar kod uchun tarjima topilmasa, sukut bo'yicha ishlatiladigan yorliq
+LabelOnDocuments=Hujjatlardagi yorliq
 LabelOrTranslationKey=Label or translation key
 ValueOfConstantKey=Value of a configuration constant
 ConstantIsOn=Option %s is on
-NbOfDays=No. of days
-AtEndOfMonth=At end of month
-CurrentNext=Current/Next
-Offset=Offset
-AlwaysActive=Always active
-Upgrade=Upgrade
-MenuUpgrade=Upgrade / Extend
-AddExtensionThemeModuleOrOther=Deploy/install external app/module
-WebServer=Web server
-DocumentRootServer=Web server's root directory
-DataRootServer=Data files directory
+NbOfDays=Kunlar soni
+AtEndOfMonth=Oy oxirida
+CurrentNext=Joriy / keyingi
+Offset=Ofset
+AlwaysActive=Har doim faol
+Upgrade=Yangilash
+MenuUpgrade=Yangilash / uzaytirish
+AddExtensionThemeModuleOrOther=Tashqi ilova / modulni joylashtiring / o'rnating
+WebServer=Veb-server
+DocumentRootServer=Veb-serverning ildiz katalogi
+DataRootServer=Ma'lumotlar fayllari katalogi
 IP=IP
 Port=Port
-VirtualServerName=Virtual server name
+VirtualServerName=Virtual server nomi
 OS=OS
-PhpWebLink=Web-Php link
+PhpWebLink=Web-Php havolasi
 Server=Server
-Database=Database
-DatabaseServer=Database host
-DatabaseName=Database name
-DatabasePort=Database port
-DatabaseUser=Database user
-DatabasePassword=Database password
-Tables=Tables
-TableName=Table name
-NbOfRecord=No. of records
+Database=Ma'lumotlar bazasi
+DatabaseServer=Ma'lumotlar bazasi xosti
+DatabaseName=Ma'lumotlar bazasi nomi
+DatabasePort=Ma'lumotlar bazasi porti
+DatabaseUser=Ma'lumotlar bazasi foydalanuvchisi
+DatabasePassword=Ma'lumotlar bazasi paroli
+Tables=Jadvallar
+TableName=Jadval nomi
+NbOfRecord=Yozuvlar soni
 Host=Server
-DriverType=Driver type
-SummarySystem=System information summary
-SummaryConst=List of all Dolibarr setup parameters
-MenuCompanySetup=Company/Organization
-DefaultMenuManager= Standard menu manager
-DefaultMenuSmartphoneManager=Smartphone menu manager
-Skin=Skin theme
-DefaultSkin=Default skin theme
-MaxSizeList=Max length for list
-DefaultMaxSizeList=Default max length for lists
-DefaultMaxSizeShortList=Default max length for short lists (i.e. in customer card)
-MessageOfDay=Message of the day
-MessageLogin=Login page message
+DriverType=Haydovchi turi
+SummarySystem=Tizim haqida qisqacha ma'lumot
+SummaryConst=Barcha Dolibarr parametrlarini ro'yxati
+MenuCompanySetup=Kompaniya / tashkilot
+DefaultMenuManager= Standart menyu menejeri
+DefaultMenuSmartphoneManager=Smartfon menyusi menejeri
+Skin=Teri mavzusi
+DefaultSkin=Standart teri mavzusi
+MaxSizeList=Ro'yxat uchun maksimal uzunlik
+DefaultMaxSizeList=Ro'yxatlar uchun standart maksimal uzunlik
+DefaultMaxSizeShortList=Qisqa ro'yxatlar uchun standart maksimal uzunlik (ya'ni mijozlar kartasida)
+MessageOfDay=Kunning xabari
+MessageLogin=Kirish sahifasidagi xabar
 LoginPage=Login page
 BackgroundImageLogin=Background image
-PermanentLeftSearchForm=Permanent search form on left menu
-DefaultLanguage=Default language
-EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
-EnableShowLogo=Show the company logo in the menu
-CompanyInfo=Company/Organization
-CompanyIds=Company/Organization identities
-CompanyName=Name
-CompanyAddress=Address
+PermanentLeftSearchForm=Chap menyuda doimiy qidiruv shakli
+DefaultLanguage=Standart til
+EnableMultilangInterface=Xaridor yoki sotuvchi munosabatlari uchun ko'p tilli yordamni yoqing
+EnableShowLogo=Menyuda kompaniya logotipini ko'rsating
+CompanyInfo=Kompaniya / tashkilot
+CompanyIds=Kompaniya / tashkilotning identifikatorlari
+CompanyName=Ism
+CompanyAddress=Manzil
 CompanyZip=Zip
-CompanyTown=Town
-CompanyCountry=Country
-CompanyCurrency=Main currency
-CompanyObject=Object of the company
+CompanyTown=Shahar
+CompanyCountry=Mamlakat
+CompanyCurrency=Asosiy valyuta
+CompanyObject=Kompaniya ob'ekti
 IDCountry=ID country
-Logo=Logo
+Logo=Logotip
 LogoDesc=Main logo of company. Will be used into generated documents (PDF, ...)
 LogoSquarred=Logo (squarred)
 LogoSquarredDesc=Must be a squarred icon (width = height). This logo will be used as the favorite icon or other need like for the top menu bar (if not disabled into display setup).
-DoNotSuggestPaymentMode=Do not suggest
-NoActiveBankAccountDefined=No active bank account defined
-OwnerOfBankAccount=Owner of bank account %s
-BankModuleNotActive=Bank accounts module not enabled
-ShowBugTrackLink=Define the link "<strong>%s</strong>" (empty to not display this link, 'github' for the link to the Dolibarr project or define directly an url 'https://...')
-Alerts=Alerts
-DelaysOfToleranceBeforeWarning=Delay before displaying a warning alert for:
-DelaysOfToleranceDesc=Set the delay before an alert icon %s is shown onscreen for the late element.
-Delays_MAIN_DELAY_ACTIONS_TODO=Planned events (agenda events) not completed
-Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Project not closed in time
-Delays_MAIN_DELAY_TASKS_TODO=Planned task (project tasks) not completed
-Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Order not processed
-Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Purchase order not processed
-Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Proposal not closed
-Delays_MAIN_DELAY_PROPALS_TO_BILL=Proposal not billed
-Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Service to activate
-Delays_MAIN_DELAY_RUNNING_SERVICES=Expired service
-Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Unpaid vendor invoice
-Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Unpaid customer invoice
-Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Pending bank reconciliation
-Delays_MAIN_DELAY_MEMBERS=Delayed membership fee
-Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Check deposit not done
-Delays_MAIN_DELAY_EXPENSEREPORTS=Expense report to approve
+DoNotSuggestPaymentMode=Taklif qilmang
+NoActiveBankAccountDefined=Faol bank hisob raqami aniqlanmadi
+OwnerOfBankAccount=%s bank hisobvarag'ining egasi
+BankModuleNotActive=Bank hisoblari moduli yoqilmagan
+ShowBugTrackLink="<strong> %s </strong>" havolasini aniqlang (bu havolani namoyish qilmaslik uchun bo'sh, Dolibarr loyihasiga havola uchun 'github' yoki to'g'ridan-to'g'ri URL manzilini belgilang 'https: // ...')
+Alerts=Ogohlantirishlar
+DelaysOfToleranceBeforeWarning=Ogohlantirish signalini ko'rsatishdan oldin kechikish:
+DelaysOfToleranceDesc=Kechiktirilgan elementni ekranda %s ogohlantirish belgisi paydo bo'lishidan oldin kechiktirishni o'rnating.
+Delays_MAIN_DELAY_ACTIONS_TODO=Rejalashtirilgan tadbirlar (kun tartibidagi tadbirlar) tugallanmagan
+Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Loyiha o'z vaqtida yopilmagan
+Delays_MAIN_DELAY_TASKS_TODO=Rejalashtirilgan vazifa (loyiha vazifalari) bajarilmagan
+Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Buyurtma bajarilmadi
+Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Xarid qilish buyurtmasi qayta ishlanmadi
+Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Taklif yopilmagan
+Delays_MAIN_DELAY_PROPALS_TO_BILL=Taklif taqdim etilmaydi
+Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Yoqish uchun xizmat
+Delays_MAIN_DELAY_RUNNING_SERVICES=Muddati o'tgan xizmat
+Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=To'lovsiz sotuvchining hisob-fakturasi
+Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=To'lanmagan mijozlar uchun hisob-faktura
+Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Bank bilan kelishuv kutilmoqda
+Delays_MAIN_DELAY_MEMBERS=Kechiktirilgan a'zolik badali
+Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Depozitni tekshirish amalga oshirilmagan
+Delays_MAIN_DELAY_EXPENSEREPORTS=Tasdiqlash uchun xarajatlar to'g'risidagi hisobot
 Delays_MAIN_DELAY_HOLIDAYS=Leave requests to approve
-SetupDescription1=Before starting to use Dolibarr some initial parameters must be defined and modules enabled/configured.
-SetupDescription2=The following two sections are mandatory (the two first entries in the Setup menu):
-SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
-SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
-SetupDescription5=Other Setup menu entries manage optional parameters.
+SetupDescription1=Dolibarr-dan foydalanishni boshlashdan oldin ba'zi bir boshlang'ich parametrlarni aniqlash va modullarni yoqish / sozlash kerak.
+SetupDescription2=Quyidagi ikkita bo'lim majburiydir (O'rnatish menyusidagi ikkita birinchi yozuv):
+SetupDescription3= <a href="%s"> %s -> %s </a> <br> <br> Ilovangizning standart xatti-harakatlarini sozlash uchun ishlatiladigan asosiy parametrlar (masalan, mamlakat bilan bog'liq).
+SetupDescription4= <a href="%s"> %s -> %s </a> <br> <br> Ushbu dastur ko'plab modullar / ilovalar to'plamidir. Sizning ehtiyojlaringiz bilan bog'liq modullarni yoqish va sozlash kerak. Ushbu modullar yoqilganda menyu yozuvlari paydo bo'ladi.
+SetupDescription5=Boshqa O'rnatish menyusi yozuvlari ixtiyoriy parametrlarni boshqaradi.
 AuditedSecurityEvents=Security events that are audited
 NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
-Audit=Audit
-InfoDolibarr=About Dolibarr
-InfoBrowser=About Browser
-InfoOS=About OS
-InfoWebServer=About Web Server
-InfoDatabase=About Database
-InfoPHP=About PHP
-InfoPerf=About Performances
+Audit=Security events
+InfoDolibarr=Dolibarr haqida
+InfoBrowser=Brauzer haqida
+InfoOS=OS haqida
+InfoWebServer=Veb-server haqida
+InfoDatabase=Ma'lumotlar bazasi haqida
+InfoPHP=PHP haqida
+InfoPerf=Ijrolar haqida
 InfoSecurity=About Security
-BrowserName=Browser name
-BrowserOS=Browser OS
-ListOfSecurityEvents=List of Dolibarr security events
-SecurityEventsPurged=Security events purged
-LogEventDesc=Enable logging for specific security events. Administrators the log via menu <b>%s - %s</b>. Warning, this feature can generate a large amount of data in the database.
-AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
-SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
-SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
-CompanyFundationDesc=Edit the information of your company/organization. Click on "%s" button at the bottom of the page when done.
+BrowserName=Brauzer nomi
+BrowserOS=Brauzer OS
+ListOfSecurityEvents=Dolibarr xavfsizlik tadbirlari ro'yxati
+SecurityEventsPurged=Xavfsizlik tadbirlari tozalandi
+LogEventDesc=Muayyan xavfsizlik hodisalari uchun jurnalga yozishni yoqing. Administratorlar jurnalni <b> %s - %s </b> menyusi orqali qayd etishadi. Ogohlantirish, ushbu xususiyat ma'lumotlar bazasida katta hajmdagi ma'lumotlarni yaratishi mumkin.
+AreaForAdminOnly=O'rnatish parametrlarini faqat <b> administrator foydalanuvchilari </b> tomonidan o'rnatishi mumkin.
+SystemInfoDesc=Tizim ma'lumotlari faqat o'qish rejimida olinadigan va faqat administratorlar uchun ko'rinadigan turli xil texnik ma'lumotlardir.
+SystemAreaForAdminOnly=Ushbu maydon faqat administrator foydalanuvchilari uchun mavjud. Dolibarr foydalanuvchi ruxsatnomalari ushbu cheklovni o'zgartira olmaydi.
+CompanyFundationDesc=Kompaniyangiz / tashkilotingiz ma'lumotlarini tahrirlash. Ish tugagandan so'ng sahifaning pastki qismidagi "%s" tugmasini bosing.
 AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
 AccountantFileNumber=Accountant code
-DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
-AvailableModules=Available app/modules
-ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
-SessionTimeOut=Time out for session
+DisplayDesc=Dolibarr tashqi ko'rinishiga va xatti-harakatlariga ta'sir qiladigan parametrlarni bu erda o'zgartirish mumkin.
+AvailableModules=Mavjud ilova / modullar
+ToActivateModule=Modullarni faollashtirish uchun o'rnatish maydoniga o'ting (Uy-> O'rnatish-> Modullar).
+SessionTimeOut=Mashg'ulot uchun vaqt tugadi
 SessionExplanation=This number guarantees that the session will never expire before this delay, if the session cleaner is done by Internal PHP session cleaner (and nothing else). Internal PHP session cleaner does not guarantee that the session will expire after this delay. It will expire, after this delay, and when the session cleaner is run, so every <b>%s/%s</b> access, but only during access made by other sessions (if value is 0, it means clearing of session is done only by an external process).<br>Note: on some servers with an external session cleaning mechanism (cron under debian, ubuntu ...), the sessions can be destroyed after a period defined by an external setup, no matter what the value entered here is.
 SessionsPurgedByExternalSystem=Sessions on this server seems to be cleaned by an external mechanism (cron under debian, ubuntu ...), probably every <b>%s</b> seconds (= value of parameter <b>session.gc_maxlifetime</b>), so changing the value here has no effect. You must ask the server administrator to change session delay.
-TriggersAvailable=Available triggers
-TriggersDesc=Triggers are files that will modify the behavior of Dolibarr workflow once copied into the directory <b>htdocs/core/triggers</b>. They realize new actions, activated on Dolibarr events (new company creation, invoice validation, ...).
-TriggerDisabledByName=Triggers in this file are disabled by the <b>-NORUN</b> suffix in their name.
-TriggerDisabledAsModuleDisabled=Triggers in this file are disabled as module <b>%s</b> is disabled.
-TriggerAlwaysActive=Triggers in this file are always active, whatever are the activated Dolibarr modules.
-TriggerActiveAsModuleActive=Triggers in this file are active as module <b>%s</b> is enabled.
-GeneratedPasswordDesc=Choose the method to be used for auto-generated passwords.
-DictionaryDesc=Insert all reference data. You can add your values to the default.
-ConstDesc=This page allows you to edit (override) parameters not available in other pages. These are mostly reserved parameters for developers/advanced troubleshooting only.
-MiscellaneousDesc=All other security related parameters are defined here.
-LimitsSetup=Limits/Precision setup
-LimitsDesc=You can define limits, precisions and optimizations used by Dolibarr here
-MAIN_MAX_DECIMALS_UNIT=Max. decimals for unit prices
-MAIN_MAX_DECIMALS_TOT=Max. decimals for total prices
-MAIN_MAX_DECIMALS_SHOWN=Max. decimals for prices <b>shown on screen</b>. Add an ellipsis <b>...</b> after this parameter (e.g. "2...") if you want to see "<b>...</b>" suffixed to the truncated price.
-MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something other than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
-UnitPriceOfProduct=Net unit price of a product
-TotalPriceAfterRounding=Total price (excl/vat/incl tax) after rounding
-ParameterActiveForNextInputOnly=Parameter effective for next input only
-NoEventOrNoAuditSetup=No security event has been logged. This is normal if Audit has not been enabled in the "Setup - Security - Events" page.
-NoEventFoundWithCriteria=No security event has been found for this search criteria.
-SeeLocalSendMailSetup=See your local sendmail setup
-BackupDesc=A <b>complete</b> backup of a Dolibarr installation requires two steps.
-BackupDesc2=Backup the contents of the "documents" directory (<b>%s</b>) containing all uploaded and generated files. This will also include all the dump files generated in Step 1. This operation may last several minutes.
-BackupDesc3=Backup the structure and contents of your database (<b>%s</b>) into a dump file. For this, you can use the following assistant.
-BackupDescX=The archived directory should be stored in a secure place.
-BackupDescY=The generated dump file should be stored in a secure place.
-BackupPHPWarning=Backup cannot be guaranteed with this method. Previous one recommended.
-RestoreDesc=To restore a Dolibarr backup, two steps are required.
-RestoreDesc2=Restore the backup file (zip file for example) of the "documents" directory to a new Dolibarr installation or into this current documents directory (<b>%s</b>).
-RestoreDesc3=Restore the database structure and data from a backup dump file into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once the restore is complete, you must use a login/password, that existed from the backup time/installation to connect again.<br>To restore a backup database into this current installation, you can follow this assistant.
-RestoreMySQL=MySQL import
-ForcedToByAModule=This rule is forced to <b>%s</b> by an activated module
+TriggersAvailable=Mavjud triggerlar
+TriggersDesc=Triggerlar - bu <b> htdocs / core / triggers </b> katalogiga ko'chirilgandan so'ng, Dolibarr ish oqimini o'zgartiradigan fayllar. Ular Dolibarr tadbirlarida faollashtirilgan yangi harakatlarni amalga oshiradilar (yangi kompaniya yaratish, hisob-fakturani tasdiqlash, ...).
+TriggerDisabledByName=Ushbu fayldagi triggerlar o'z nomidagi <b> -NORUN </b> qo'shimchasi tomonidan o'chirib qo'yilgan.
+TriggerDisabledAsModuleDisabled=Ushbu faylda triggerlar o'chirilgan, chunki <b> %s </b> moduli o'chirilgan.
+TriggerAlwaysActive=Dolibarr modullari qanday bo'lishidan qat'i nazar, ushbu fayldagi triggerlar har doim faol bo'ladi.
+TriggerActiveAsModuleActive=<b> %s </b> moduli yoqilganligi sababli ushbu fayldagi tetiklar faoldir.
+GeneratedPasswordDesc=Avtomatik ravishda yaratilgan parollar uchun ishlatiladigan usulni tanlang.
+DictionaryDesc=Barcha mos yozuvlar ma'lumotlarini joylashtiring. Siz o'zingizning qadriyatlarni sukut bo'yicha qo'shishingiz mumkin.
+ConstDesc=Ushbu sahifa boshqa sahifalarda mavjud bo'lmagan parametrlarni tahrirlash (bekor qilish) imkonini beradi. Ular asosan ishlab chiquvchilar uchun ajratilgan parametrlardir / faqat rivojlangan muammolarni bartaraf etish.
+MiscellaneousDesc=Xavfsizlik bilan bog'liq barcha boshqa parametrlar bu erda aniqlangan.
+LimitsSetup=Cheklovlar / aniqlik sozlamalari
+LimitsDesc=Dolibarr tomonidan qo'llaniladigan limitlar, aniqliklar va optimallashtirishlarni bu erda belgilashingiz mumkin
+MAIN_MAX_DECIMALS_UNIT=Maks. birlik narxlari uchun o'nlik
+MAIN_MAX_DECIMALS_TOT=Maks. umumiy narxlar uchun o'nlik
+MAIN_MAX_DECIMALS_SHOWN=Maks. <b> narxlari uchun o'nlik, </b> ekranida ko'rsatilgan. Agar kesilgan narxga qo'shilgan "<b> ... </b>" ni ko'rishni istasangiz, ushbu parametrdan keyin (masalan, "2 ...") ellipsis <b> ... </b> qo'shing.
+MAIN_ROUNDING_RULE_TOT=Yuvarlama oralig'ining bosqichi (yaxlitlash 10-asosdan boshqasida amalga oshiriladigan mamlakatlar uchun. Masalan, yaxlitlash 0,05 qadam bilan bajarilsa, 0,05 qo'ying)
+UnitPriceOfProduct=Mahsulotning sof birlik narxi
+TotalPriceAfterRounding=Dumaloqlashdan keyingi umumiy narx (QQS / soliqni hisobga olmaganda)
+ParameterActiveForNextInputOnly=Parametr faqat keyingi kiritish uchun samarali
+NoEventOrNoAuditSetup=Hech qanday xavfsizlik hodisasi qayd etilmagan. Agar "O'rnatish - Xavfsizlik - tadbirlar" sahifasida Audit yoqilmagan bo'lsa, bu normal holat.
+NoEventFoundWithCriteria=Ushbu qidiruv mezonlari uchun hech qanday xavfsizlik hodisasi topilmadi.
+SeeLocalSendMailSetup=Mahalliy sendmail sozlamalarini ko'ring
+BackupDesc=<b> Dolibarr o'rnatilishini to'liq </b> zaxiralash uchun ikki bosqich talab qilinadi.
+BackupDesc2=Yuklangan va yaratilgan barcha fayllarni o'z ichiga olgan "hujjatlar" katalogining tarkibini zaxiralash (<b> %s </b>). Bunga 1-bosqichda yaratilgan barcha dump fayllari ham kiradi. Ushbu operatsiya bir necha daqiqa davom etishi mumkin.
+BackupDesc3=Ma'lumotlar bazangizning tuzilishi va tarkibini zaxira nusxasini (<b> %s </b>) zaxira nusxasini zaxiralash. Buning uchun siz quyidagi yordamchidan foydalanishingiz mumkin.
+BackupDescX=Arxivlangan katalog xavfsiz joyda saqlanishi kerak.
+BackupDescY=Yaratilgan dump fayli xavfsiz joyda saqlanishi kerak.
+BackupPHPWarning=Ushbu usul bilan zaxiralashni kafolatlash mumkin emas. Oldingi tavsiya etilgan.
+RestoreDesc=Dolibarr zaxira nusxasini tiklash uchun ikkita qadam kerak.
+RestoreDesc2="Hujjatlar" katalogining zaxira faylini (masalan, zip fayli) yangi Dolibarr o'rnatilishiga yoki ushbu joriy hujjatlar katalogiga tiklang (<b> %s </b>).
+RestoreDesc3=Ma'lumotlar bazasi tuzilishini va zaxira dump faylidan yangi Dolibarr o'rnatilishi ma'lumotlar bazasiga yoki ushbu joriy o'rnatish bazasiga tiklang (<b> %s </b>). Ogohlantirish, tiklash tugallangandan so'ng, qayta ulanish uchun zaxira vaqti / o'rnatilishidan oldin mavjud bo'lgan login / paroldan foydalanishingiz kerak. <br> zaxira ma'lumotlar bazasini ushbu joriy o'rnatishga qaytarish uchun ushbu yordamchiga ergashishingiz mumkin.
+RestoreMySQL=MySQL-ni import qilish
+ForcedToByAModule=Ushbu qoida majburiy ravishda faollashtirilgan modul tomonidan <b> %s </b>
 ValueIsForcedBySystem=This value is forced by the system. You can't change it.
-PreviousDumpFiles=Existing backup files
+PreviousDumpFiles=Mavjud zaxira fayllari
 PreviousArchiveFiles=Existing archive files
-WeekStartOnDay=First day of the week
-RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be required (Program version %s differs from Database version %s)
+WeekStartOnDay=Haftaning birinchi kuni
+RunningUpdateProcessMayBeRequired=Yangilash jarayonini bajarish talab etilgandek tuyuladi (%s dastur versiyasi %s ma'lumotlar bazasidan farq qiladi)
 YouMustRunCommandFromCommandLineAfterLoginToUser=You must run this command from command line after login to a shell with user <b>%s</b> or you must add -W option at end of command line to provide <b>%s</b> password.
-YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP
-DownloadMoreSkins=More skins to download
-SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
+YourPHPDoesNotHaveSSLSupport=Sizning PHP-da SSL funktsiyalari mavjud emas
+DownloadMoreSkins=Yuklab olish uchun ko'proq terilar
+SimpleNumRefModelDesc=%syymm-nnnn formatidagi mos yozuvlar raqamini qaytaradi, bu erda yy yil, mm oy va nnnn ketma-ket avtomatik ortib boruvchi raqam
 SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
-ShowProfIdInAddress=Show professional id with addresses
-ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
-TranslationUncomplete=Partial translation
-MAIN_DISABLE_METEO=Disable meteorological view
+ShowProfIdInAddress=Professional identifikatorni manzillari bilan ko'rsating
+ShowVATIntaInAddress=Hamjamiyat ichidagi QQS raqamini manzillari bilan yashirish
+TranslationUncomplete=Qisman tarjima
+MAIN_DISABLE_METEO=Meteorologik ko'rinishni o'chirib qo'ying
 MeteoStdMod=Standard mode
 MeteoStdModEnabled=Standard mode enabled
 MeteoPercentageMod=Percentage mode
 MeteoPercentageModEnabled=Percentage mode enabled
 MeteoUseMod=Click to use %s
-TestLoginToAPI=Test login to API
-ProxyDesc=Some features of Dolibarr require internet access. Define here the internet connection parameters such as access through a proxy server if necessary.
-ExternalAccess=External/Internet Access
-MAIN_PROXY_USE=Use a proxy server (otherwise access is direct to the internet)
-MAIN_PROXY_HOST=Proxy server: Name/Address
-MAIN_PROXY_PORT=Proxy server: Port
-MAIN_PROXY_USER=Proxy server: Login/User
-MAIN_PROXY_PASS=Proxy server: Password
-DefineHereComplementaryAttributes=Define any additional / custom attributes that must be added to: %s
-ExtraFields=Complementary attributes
-ExtraFieldsLines=Complementary attributes (lines)
+TestLoginToAPI=API-ga kirishni sinab ko'ring
+ProxyDesc=Dolibarr-ning ba'zi xususiyatlari Internetga kirishni talab qiladi. Agar kerak bo'lsa, proksi-server orqali kirish kabi Internetga ulanish parametrlarini bu erda aniqlang.
+ExternalAccess=Tashqi / Internetga kirish
+MAIN_PROXY_USE=Proksi-serverdan foydalaning (aks holda kirish Internetga to'g'ridan-to'g'ri)
+MAIN_PROXY_HOST=Proksi-server: Ism / manzil
+MAIN_PROXY_PORT=Proksi-server: Port
+MAIN_PROXY_USER=Proksi-server: Kirish / Foydalanuvchi
+MAIN_PROXY_PASS=Proksi-server: parol
+DefineHereComplementaryAttributes=Qo'shilishi kerak bo'lgan har qanday qo'shimcha / maxsus atributlarni aniqlang: %s
+ExtraFields=Bir-birini to'ldiruvchi atributlar
+ExtraFieldsLines=Qo'shimcha atributlar (chiziqlar)
 ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
-ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
-ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
-ExtraFieldsThirdParties=Complementary attributes (third party)
-ExtraFieldsContacts=Complementary attributes (contacts/address)
-ExtraFieldsMember=Complementary attributes (member)
-ExtraFieldsMemberType=Complementary attributes (member type)
-ExtraFieldsCustomerInvoices=Complementary attributes (invoices)
+ExtraFieldsSupplierOrdersLines=Qo'shimcha atributlar (buyurtma satrlari)
+ExtraFieldsSupplierInvoicesLines=Qo'shimcha atributlar (hisob-faktura satrlari)
+ExtraFieldsThirdParties=Qo'shimcha atributlar (uchinchi tomon)
+ExtraFieldsContacts=Qo'shimcha atributlar (kontaktlar / manzil)
+ExtraFieldsMember=Qo'shimcha atributlar (a'zo)
+ExtraFieldsMemberType=Qo'shimcha atributlar (a'zo turi)
+ExtraFieldsCustomerInvoices=Qo'shimcha atributlar (hisob-fakturalar)
 ExtraFieldsCustomerInvoicesRec=Complementary attributes (templates invoices)
-ExtraFieldsSupplierOrders=Complementary attributes (orders)
-ExtraFieldsSupplierInvoices=Complementary attributes (invoices)
-ExtraFieldsProject=Complementary attributes (projects)
-ExtraFieldsProjectTask=Complementary attributes (tasks)
+ExtraFieldsSupplierOrders=Qo'shimcha atributlar (buyurtmalar)
+ExtraFieldsSupplierInvoices=Qo'shimcha atributlar (hisob-fakturalar)
+ExtraFieldsProject=Qo'shimcha atributlar (loyihalar)
+ExtraFieldsProjectTask=Qo'shimcha atributlar (vazifalar)
 ExtraFieldsSalaries=Complementary attributes (salaries)
-ExtraFieldHasWrongValue=Attribute %s has a wrong value.
-AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
-SendmailOptionNotComplete=Warning, on some Linux systems, to send email from your email, sendmail execution setup must contains option -ba (parameter mail.force_extra_parameters into your php.ini file). If some recipients never receive emails, try to edit this PHP parameter with mail.force_extra_parameters = -ba).
-PathToDocuments=Path to documents
-PathDirectory=Directory
-SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might not be parsed correctly by some receiving mail servers. The result is that some mails can't be read by people hosted by those bugged platforms. This is the case for some Internet providers (Ex: Orange in France). This is not a problem with Dolibarr or PHP but with the receiving mail server. You can however add an option MAIN_FIX_FOR_BUGGED_MTA to 1 in Setup - Other to modify Dolibarr to avoid this. However, you may experience problems with other servers that strictly use the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" which has no disadvantages.
-TranslationSetup=Setup of translation
-TranslationKeySearch=Search a translation key or string
-TranslationOverwriteKey=Overwrite a translation string
-TranslationDesc=How to set the display language:<br>* Default/Systemwide: menu <strong>Home -> Setup -> Display</strong><br>* Per user: Click on the username at the top of the screen and modify the <strong>User Display Setup</strong> tab on the user card.
-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 which translation key to use
-TranslationString=Translation string
-CurrentTranslationString=Current translation string
-WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
-NewTranslationStringToShow=New translation string to show
-OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
+ExtraFieldHasWrongValue=%s atributi noto'g'ri qiymatga ega.
+AlphaNumOnlyLowerCharsAndNoSpace=bo'sh joysiz faqat alfasayısal va kichik harflar
+SendmailOptionNotComplete=E'tibor bering, ba'zi bir Linux tizimlarida elektron pochtangizdan elektron pochta xabarlarini yuborish uchun sendmail-ning bajarilishini o'rnatish -ba parametrini o'z ichiga olishi kerak (sizning php.ini faylingizga mail.force_extra_parameters parametri). Agar ba'zi bir qabul qiluvchilar hech qachon elektron pochta xabarlarini olmasalar, ushbu PHP parametrini mail.force_extra_parameters = -ba) bilan tahrir qilib ko'ring.
+PathToDocuments=Hujjatlar yo'li
+PathDirectory=Katalog
+SendmailOptionMayHurtBuggedMTA=Xabarlarni "PHP mail direct" usuli yordamida yuborish xususiyati ba'zi qabul qiluvchi pochta serverlari tomonidan to'g'ri tahlil qilinmasligi mumkin bo'lgan pochta xabarini hosil qiladi. Natijada, ba'zi xatlarni o'sha buzilgan platformalar joylashtirilgan odamlar o'qiy olmaydi. Bu ba'zi bir Internet-provayderlarga tegishli (Masalan: Frantsiyada apelsin). Bu Dolibarr yoki PHP bilan emas, balki qabul qiluvchi pochta serverida muammo. Siz buni o'rnatish uchun MAIN_FIX_FOR_BUGGED_MTA-ga 1-ga qo'shishingiz mumkin, bunga yo'l qo'ymaslik uchun Dolibarr-ni o'zgartirish. Biroq, siz SMTP standartidan qat'iy foydalanadigan boshqa serverlarda muammolarga duch kelishingiz mumkin. Boshqa echim (tavsiya etiladi) kamchiliklari bo'lmagan "SMTP socket library" usulidan foydalanish.
+TranslationSetup=Tarjimani sozlash
+TranslationKeySearch=Tarjima kaliti yoki satrini qidiring
+TranslationOverwriteKey=Tarjima qatorini qayta yozing
+TranslationDesc=Ko'rgazmali tilni qanday o'rnatish kerak: <br> * Default / Systemwide: menyu <strong> Bosh sahifa -> O'rnatish -> Displey </strong> <br> * Har bir foydalanuvchiga: ekranning yuqori qismidagi foydalanuvchi nomini bosing va foydalanuvchi006 ni o'rnating a09 karta.
+TranslationOverwriteDesc=Bundan tashqari, quyidagi jadvalni to'ldiradigan satrlarni bekor qilishingiz mumkin. "%s" ochiladigan oynasidan tilingizni tanlang, tarjima kaliti qatorini "%s" ga va yangi tarjimangizni "%s" ga qo'ying
+TranslationOverwriteDesc2=Qaysi tarjima kalitidan foydalanishni bilishingiz uchun boshqa yorliqni ishlatishingiz mumkin
+TranslationString=Tarjima qatori
+CurrentTranslationString=Joriy tarjima qatori
+WarningAtLeastKeyOrTranslationRequired=Hech bo'lmaganda kalit yoki tarjima satri uchun qidiruv mezonlari talab qilinadi
+NewTranslationStringToShow=Ko'rsatiladigan yangi tarjima qatori
+OriginalValueWas=Asl tarjima ustiga yozilgan. Asl qiymati: <br> <br> %s
 TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exist in any language files
 TitleNumberOfActivatedModules=Activated modules
-TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
-YouMustEnableOneModule=You must at least enable 1 module
-ClassNotFoundIntoPathWarning=Class %s not found in PHP path
-YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only the following modules are available to external users (irrespective of the permissions of such users) and only if permissions are granted:<br>
-SuhosinSessionEncrypt=Session storage encrypted by Suhosin
-ConditionIsCurrently=Condition is currently %s
-YouUseBestDriver=You use driver %s which is the best driver currently available.
-YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
+TotalNumberOfActivatedModules=Faollashtirilgan modullar: <b> %s </b> / <b> %s </b>
+YouMustEnableOneModule=Siz kamida 1 ta modulni yoqishingiz kerak
+ClassNotFoundIntoPathWarning=%s sinfi PHP yo'lida topilmadi
+YesInSummer=Ha yozda
+OnlyFollowingModulesAreOpenedToExternalUsers=E'tibor bering, tashqi foydalanuvchilar uchun faqat quyidagi modullar mavjud (bunday foydalanuvchilarning ruxsatlaridan qat'i nazar) va faqat ruxsatlar berilgan taqdirda: <br>
+SuhosinSessionEncrypt=Suxsin tomonidan shifrlangan sessiyani saqlash
+ConditionIsCurrently=Vaziyat hozirda %s
+YouUseBestDriver=Siz hozirda mavjud bo'lgan eng yaxshi haydovchi bo'lgan %s drayveridan foydalanasiz.
+YouDoNotUseBestDriver=Siz haydovchi %s dan foydalanasiz, lekin %s drayveri tavsiya etiladi.
 NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
-SearchOptim=Search optimization
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
-YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
-BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
-BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
+ComboListOptim=Combo list loading optimization
+SearchOptim=Qidiruvni optimallashtirish
+YouHaveXObjectUseComboOptim=You have %s %s in the database. You can go into setup of module to enable loading of combo list on key pressed event.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other.
+YouHaveXObjectUseSearchOptimDesc=This limits the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to %s in Home-Setup-Other.
+BrowserIsOK=Siz %s veb-brauzeridan foydalanmoqdasiz. Ushbu brauzer xavfsizlik va ishlash uchun yaxshi.
+BrowserIsKO=Siz %s veb-brauzeridan foydalanmoqdasiz. Ushbu brauzer xavfsizlik, ishlash va ishonchlilik uchun yomon tanlov ekanligi ma'lum. Firefox, Chrome, Opera yoki Safari-dan foydalanishni tavsiya etamiz.
 PHPModuleLoaded=PHP component %s is loaded
 PreloadOPCode=Preloaded OPCode is used
-AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
+AddRefInList=Mijoz / sotuvchini ko'rsatish. ma'lumot ro'yxati (ro'yxat yoki kombinatsion qutini tanlang) va ko'prikning ko'pligi. <br> Uchinchi tomonlar "CC12345 - SC45678 - Katta kompaniya korpusi" nom formatida paydo bo'ladi. "Katta kompaniya korpusi" o'rniga.
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
 AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
-AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
-FieldEdition=Edition of field %s
-FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
-GetBarCode=Get barcode
+AskForPreferredShippingMethod=Uchinchi shaxslar uchun jo'natilgan transport usulini so'rang.
+FieldEdition=%s maydonining nashri
+FillThisOnlyIfRequired=Misol: +2 (faqat vaqt mintaqasini ofset bilan bog'liq muammolar yuzaga kelganda to'ldiring)
+GetBarCode=Shtrixli kodni oling
 NumberingModules=Numbering models
 DocumentModules=Document models
 ##### Module password generation
-PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
-PasswordGenerationNone=Do not suggest a generated password. Password must be typed in manually.
-PasswordGenerationPerso=Return a password according to your personally defined configuration.
-SetupPerso=According to your configuration
-PasswordPatternDesc=Password pattern description
+PasswordGenerationStandard=Ichki Dolibarr algoritmiga binoan yaratilgan parolni qaytaring: %s belgilarida umumiy raqamlar va kichik harflardagi belgilar mavjud.
+PasswordGenerationNone=Yaratilgan parolni taklif qilmang. Parolni qo'lda kiritish kerak.
+PasswordGenerationPerso=Shaxsiy belgilangan konfiguratsiyaga muvofiq parolni qaytaring.
+SetupPerso=Sizning konfiguratsiyangizga muvofiq
+PasswordPatternDesc=Parol naqshining tavsifi
 ##### Users setup #####
-RuleForGeneratedPasswords=Rules to generate and validate passwords
-DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link on the Login page
-UsersSetup=Users module setup
-UserMailRequired=Email required to create a new user
+RuleForGeneratedPasswords=Parollarni yaratish va tasdiqlash qoidalari
+DisableForgetPasswordLinkOnLogonPage=Kirish sahifasida "Parol unutilgan" havolasini ko'rsatmang
+UsersSetup=Foydalanuvchilar modulini sozlash
+UserMailRequired=Yangi foydalanuvchi yaratish uchun elektron pochta kerak
 UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
 UsersDocModules=Document templates for documents generated from user record
 GroupsDocModules=Document templates for documents generated from a group record
 ##### HRM setup #####
-HRMSetup=HRM module setup
+HRMSetup=HRM modulini sozlash
 ##### Company setup #####
-CompanySetup=Companies module setup
-CompanyCodeChecker=Options for automatic generation of customer/vendor codes
-AccountCodeManager=Options for automatic generation of customer/vendor accounting codes
-NotificationsDesc=Email notifications can be sent automatically for some Dolibarr events.<br>Recipients of notifications can be defined:
-NotificationsDescUser=* per user, one user at a time.
-NotificationsDescContact=* per third-party contacts (customers or vendors), one contact at a time.
-NotificationsDescGlobal=* or by setting global email addresses in this setup page.
-ModelModules=Document Templates
-DocumentModelOdt=Generate documents from OpenDocument templates (.ODT / .ODS files from LibreOffice, OpenOffice, KOffice, TextEdit,...)
-WatermarkOnDraft=Watermark on draft document
-JSOnPaimentBill=Activate feature to autofill payment lines on payment form
-CompanyIdProfChecker=Rules for Professional IDs
-MustBeUnique=Must be unique?
-MustBeMandatory=Mandatory to create third parties (if VAT number or type of company defined) ?
-MustBeInvoiceMandatory=Mandatory to validate invoices?
+CompanySetup=Kompaniyalar modulini sozlash
+CompanyCodeChecker=Mijoz / sotuvchi kodlarini avtomatik ishlab chiqarish uchun imkoniyatlar
+AccountCodeManager=Mijozlar / sotuvchilarning buxgalteriya kodlarini avtomatik ravishda ishlab chiqarish variantlari
+NotificationsDesc=Ba'zi Dolibarr tadbirlari uchun elektron pochta xabarlari avtomatik ravishda yuborilishi mumkin. <br> Bildirishnoma oluvchilarni aniqlash mumkin:
+NotificationsDescUser=* har bir foydalanuvchi uchun, bir vaqtning o'zida bitta foydalanuvchi.
+NotificationsDescContact=* uchinchi tomon kontaktlariga (mijozlar yoki sotuvchilar), bir vaqtning o'zida bitta kontakt.
+NotificationsDescGlobal=* yoki ushbu sozlash sahifasida global elektron pochta manzillarini o'rnatish orqali.
+ModelModules=Hujjat shablonlari
+DocumentModelOdt=OpenDocument shablonlaridan hujjatlar yaratish (.OdT / .ODS fayllari LibreOffice, OpenOffice, KOffice, TextEdit, ...)
+WatermarkOnDraft=Hujjat loyihasidagi suv belgisi
+JSOnPaimentBill=To'lov shaklidagi to'lov liniyalarini avtomatik to'ldirish xususiyatini faollashtiring
+CompanyIdProfChecker=Professional guvohnomalar uchun qoidalar
+MustBeUnique=Noyob bo'lishi kerakmi?
+MustBeMandatory=Uchinchi shaxslarni yaratish majburiymi (agar QQS raqami yoki kompaniya turi aniqlangan bo'lsa)?
+MustBeInvoiceMandatory=Hisob-fakturalarni tasdiqlash majburiymi?
 TechnicalServicesProvided=Technical services provided
 #####DAV #####
 WebDAVSetupDesc=This is the link to access the WebDAV directory. It contains a "public" dir open to any user knowing the URL (if public directory access allowed) and a "private" directory that needs an existing login account/password for access.
 WebDavServer=Root URL of %s server: %s
 ##### Webcal setup #####
-WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
+WebCalUrlForVCalExport=<b> %s </b> formatiga eksport havolasi quyidagi havolada mavjud: %s
 ##### Invoices #####
-BillsSetup=Invoices module setup
-BillsNumberingModule=Invoices and credit notes numbering model
-BillsPDFModules=Invoice documents models
+BillsSetup=Hisob-fakturalar modulini sozlash
+BillsNumberingModule=Hisob-fakturalar va kredit yozuvlarini raqamlash modeli
+BillsPDFModules=Hisob-faktura hujjatlari modellari
 BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
 PaymentsPDFModules=Payment documents models
-ForceInvoiceDate=Force invoice date to validation date
-SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined on the invoice
-SuggestPaymentByRIBOnAccount=Suggest payment by withdrawal on account
-SuggestPaymentByChequeToAddress=Suggest payment by check to
-FreeLegalTextOnInvoices=Free text on invoices
-WatermarkOnDraftInvoices=Watermark on draft invoices (none if empty)
-PaymentsNumberingModule=Payments numbering model
-SuppliersPayment=Vendor payments
-SupplierPaymentSetup=Vendor payments setup
+ForceInvoiceDate=Hisob-fakturani tasdiqlash sanasiga majburlang
+SuggestedPaymentModesIfNotDefinedInInvoice=Hisob-fakturada belgilanmagan bo'lsa, sukut bo'yicha hisob-kitob bo'yicha tavsiya etilgan to'lovlar rejimi
+SuggestPaymentByRIBOnAccount=Hisobga pul tushirish orqali to'lovni taklif eting
+SuggestPaymentByChequeToAddress=To'lovni chek orqali taklif eting
+FreeLegalTextOnInvoices=Hisob-fakturalarda bepul matn
+WatermarkOnDraftInvoices=Hisob-fakturalardagi suv belgisi (agar bo'sh bo'lmasa)
+PaymentsNumberingModule=To'lovlarni raqamlash modeli
+SuppliersPayment=Sotuvchi uchun to'lovlar
+SupplierPaymentSetup=Sotuvchi to'lovlarini sozlash
 ##### Proposals #####
-PropalSetup=Commercial proposals module setup
-ProposalsNumberingModules=Commercial proposal numbering models
-ProposalsPDFModules=Commercial proposal documents models
+PropalSetup=Tijorat takliflari modulini sozlash
+ProposalsNumberingModules=Tijorat takliflarini raqamlash modellari
+ProposalsPDFModules=Tijorat takliflari hujjatlari modellari
 SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined on the proposal
-FreeLegalTextOnProposal=Free text on commercial proposals
-WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+FreeLegalTextOnProposal=Tijorat takliflari bo'yicha bepul matn
+WatermarkOnDraftProposal=Tijorat takliflari loyihasidagi suv belgisi (bo'sh bo'lmasa)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Bank hisobvarag'i bo'yicha taklifni so'rang
 ##### SupplierProposal #####
-SupplierProposalSetup=Price requests suppliers module setup
-SupplierProposalNumberingModules=Price requests suppliers numbering models
-SupplierProposalPDFModules=Price requests suppliers documents models
-FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
-WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
-WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
+SupplierProposalSetup=Ta'minlovchilarning modullarini sozlash bo'yicha narxlar
+SupplierProposalNumberingModules=Narxlar etkazib beruvchilarni raqamlash modellarini talab qiladi
+SupplierProposalPDFModules=Narx so'rovlari etkazib beruvchilarning hujjatlar modellari
+FreeLegalTextOnSupplierProposal=Ta'minlovchilar narxlari bo'yicha bepul matn
+WatermarkOnDraftSupplierProposal=Yetkazib beruvchilarning narxlari bo'yicha buyurtmalariga moybo'yoqli belgi (agar bo'sh bo'lmasa)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Narx so'rovi bo'yicha bank hisob raqamini so'rang
+WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Buyurtma uchun Ombor manbasini so'rang
 ##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Xarid qilish buyurtmasi bo'yicha bank hisob raqamini so'rang
 ##### Orders #####
 SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sale order by default if not defined on the order
-OrdersSetup=Sales Orders management setup
-OrdersNumberingModules=Orders numbering models
-OrdersModelModule=Order documents models
-FreeLegalTextOnOrders=Free text on orders
-WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
-ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
-BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
+OrdersSetup=Savdo buyurtmalarini boshqarishni sozlash
+OrdersNumberingModules=Buyurtmalarni raqamlash modellari
+OrdersModelModule=Hujjatlar modellarini buyurtma qilish
+FreeLegalTextOnOrders=Buyurtmalar bo'yicha bepul matn
+WatermarkOnDraftOrders=Chizma buyurtmalaridagi suv belgisi (agar bo'sh bo'lmasa)
+ShippableOrderIconInList=Buyurtmalar ro'yxatiga buyurtma yuborilishi mumkinligini ko'rsatadigan belgi qo'shing
+BANK_ASK_PAYMENT_BANK_DURING_ORDER=Bank hisob raqamiga buyurtma berish joyini so'rang
 ##### Interventions #####
-InterventionsSetup=Interventions module setup
-FreeLegalTextOnInterventions=Free text on intervention documents
-FicheinterNumberingModules=Intervention numbering models
-TemplatePDFInterventions=Intervention card documents models
-WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
+InterventionsSetup=Interventsiyalar modulini sozlash
+FreeLegalTextOnInterventions=Interventsiya hujjatlaridagi bepul matn
+FicheinterNumberingModules=Intervensiyani raqamlash modellari
+TemplatePDFInterventions=Interventsiya kartalari hujjatlari modellari
+WatermarkOnDraftInterventionCards=Interventsiya kartasidagi hujjatdagi suv belgisi (agar bo'sh bo'lmasa)
 ##### Contracts #####
-ContractsSetup=Contracts/Subscriptions module setup
-ContractsNumberingModules=Contracts numbering modules
-TemplatePDFContracts=Contracts documents models
-FreeLegalTextOnContracts=Free text on contracts
-WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty)
+ContractsSetup=Shartnomalar / Obunalar modulini sozlash
+ContractsNumberingModules=Shartnomalarni raqamlash modullari
+TemplatePDFContracts=Shartnomalar hujjatlari modellari
+FreeLegalTextOnContracts=Shartnomalar bo'yicha bepul matn
+WatermarkOnDraftContractCards=Shartnoma loyihalari bo'yicha suv belgisi (agar bo'sh bo'lmasa)
 ##### Members #####
-MembersSetup=Members module setup
-MemberMainOptions=Main options
-AdherentLoginRequired= Manage a Login for each member
-AdherentMailRequired=Email required to create a new member
-MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
+MembersSetup=A'zolar modulini sozlash
+MemberMainOptions=Asosiy variantlar
+AdherentLoginRequired= Har bir a'zo uchun tizimga kirishni boshqaring
+AdherentMailRequired=Yangi a'zo yaratish uchun elektron pochta kerak
+MemberSendInformationByMailByDefault=Odatiy ravishda a'zolarga pochta orqali tasdiqlash (tasdiqlash yoki yangi obuna) yuborish uchun tasdiqlash qutisi yoqilgan
+MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
 MembersDocModules=Document templates for documents generated from member record
 ##### LDAP setup #####
-LDAPSetup=LDAP Setup
+LDAPSetup=LDAP-ni sozlash
 LDAPGlobalParameters=Global parameters
-LDAPUsersSynchro=Users
-LDAPGroupsSynchro=Groups
-LDAPContactsSynchro=Contacts
-LDAPMembersSynchro=Members
+LDAPUsersSynchro=Foydalanuvchilar
+LDAPGroupsSynchro=Guruhlar
+LDAPContactsSynchro=Kontaktlar
+LDAPMembersSynchro=A'zolar
 LDAPMembersTypesSynchro=Members types
-LDAPSynchronization=LDAP synchronisation
-LDAPFunctionsNotAvailableOnPHP=LDAP functions are not available on your PHP
+LDAPSynchronization=LDAP sinxronizatsiyasi
+LDAPFunctionsNotAvailableOnPHP=PHP-da LDAP funktsiyalari mavjud emas
 LDAPToDolibarr=LDAP -> Dolibarr
 DolibarrToLDAP=Dolibarr -> LDAP
-LDAPNamingAttribute=Key in LDAP
-LDAPSynchronizeUsers=Organization of users in LDAP
-LDAPSynchronizeGroups=Organization of groups in LDAP
-LDAPSynchronizeContacts=Organization of contacts in LDAP
-LDAPSynchronizeMembers=Organization of foundation's members in LDAP
+LDAPNamingAttribute=LDAP-ga kiring
+LDAPSynchronizeUsers=LDAP-da foydalanuvchilarni tashkil etish
+LDAPSynchronizeGroups=LDAP da guruhlarni tashkil etish
+LDAPSynchronizeContacts=LDAP-da aloqalarni tashkil etish
+LDAPSynchronizeMembers=LDAPda fond a'zolarini tashkil etish
 LDAPSynchronizeMembersTypes=Organization of foundation's members types in LDAP
-LDAPPrimaryServer=Primary server
-LDAPSecondaryServer=Secondary server
-LDAPServerPort=Server port
-LDAPServerPortExample=Default port: 389
-LDAPServerProtocolVersion=Protocol version
-LDAPServerUseTLS=Use TLS
-LDAPServerUseTLSExample=Your LDAP server use TLS
+LDAPPrimaryServer=Asosiy server
+LDAPSecondaryServer=Ikkilamchi server
+LDAPServerPort=Server porti
+LDAPServerPortExample=Standart port: 389
+LDAPServerProtocolVersion=Protokol versiyasi
+LDAPServerUseTLS=TLS-dan foydalaning
+LDAPServerUseTLSExample=Sizning LDAP-serveringiz TLS-dan foydalanadi
 LDAPServerDn=Server DN
 LDAPAdminDn=Administrator DN
-LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
-LDAPPassword=Administrator password
-LDAPUserDn=Users' DN
-LDAPUserDnExample=Complete DN (ex: ou=users,dc=example,dc=com)
-LDAPGroupDn=Groups' DN
-LDAPGroupDnExample=Complete DN (ex: ou=groups,dc=example,dc=com)
-LDAPServerExample=Server address (ex: localhost, 192.168.0.2, ldaps://ldap.example.com/)
-LDAPServerDnExample=Complete DN (ex: dc=example,dc=com)
-LDAPDnSynchroActive=Users and groups synchronization
-LDAPDnSynchroActiveExample=LDAP to Dolibarr or Dolibarr to LDAP synchronization
-LDAPDnContactActive=Contacts' synchronization
-LDAPDnContactActiveExample=Activated/Unactivated synchronization
-LDAPDnMemberActive=Members' synchronization
-LDAPDnMemberActiveExample=Activated/Unactivated synchronization
+LDAPAdminDnExample=To'liq DN (masalan: cn = administrator, dc = misol, dc = com yoki cn = administrator, cn = foydalanuvchilar, dc = misol, dc = com faol katalog uchun)
+LDAPPassword=Administrator paroli
+LDAPUserDn=Foydalanuvchilarning DN
+LDAPUserDnExample=To'liq DN (masalan: ou = foydalanuvchilar, dc = misol, dc = com)
+LDAPGroupDn=Guruhlarning DN
+LDAPGroupDnExample=To'liq DN (masalan: ou = guruhlar, dc = misol, dc = com)
+LDAPServerExample=Server manzili (masalan: localhost, 192.168.0.2, ldaps: //ldap.example.com/)
+LDAPServerDnExample=To'liq DN (masalan: dc = misol, dc = com)
+LDAPDnSynchroActive=Foydalanuvchilar va guruhlarni sinxronlashtirish
+LDAPDnSynchroActiveExample=LDAP-dan Dolibarr-ga yoki Dolibarr-dan LDAP-ga sinxronizatsiya qilish
+LDAPDnContactActive=Kontaktlarni sinxronlashtirish
+LDAPDnContactActiveExample=Faollashtirilgan / yoqilmagan sinxronizatsiya
+LDAPDnMemberActive=A'zolarni sinxronlashtirish
+LDAPDnMemberActiveExample=Faollashtirilgan / yoqilmagan sinxronizatsiya
 LDAPDnMemberTypeActive=Members types' synchronization
 LDAPDnMemberTypeActiveExample=Activated/Unactivated synchronization
-LDAPContactDn=Dolibarr contacts' DN
-LDAPContactDnExample=Complete DN (ex: ou=contacts,dc=example,dc=com)
-LDAPMemberDn=Dolibarr members DN
-LDAPMemberDnExample=Complete DN (ex: ou=members,dc=example,dc=com)
-LDAPMemberObjectClassList=List of objectClass
-LDAPMemberObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
+LDAPContactDn=Dolibarr kontaktlarining DN
+LDAPContactDnExample=To'liq DN (masalan: ou = kontaktlar, dc = misol, dc = com)
+LDAPMemberDn=Dolibarr a'zolari DN
+LDAPMemberDnExample=To'liq DN (masalan: ou = a'zolar, dc = misol, dc = com)
+LDAPMemberObjectClassList=ObjectClass ro'yxati
+LDAPMemberObjectClassListExample=Reklama atributlarini belgilaydigan objectClass ro'yxati (masalan: top, inetOrgPerson yoki top, faol katalog uchun foydalanuvchi)
 LDAPMemberTypeDn=Dolibarr members types DN
 LDAPMemberTypepDnExample=Complete DN (ex: ou=memberstypes,dc=example,dc=com)
 LDAPMemberTypeObjectClassList=List of objectClass
 LDAPMemberTypeObjectClassListExample=List of objectClass defining record attributes (ex: top,groupOfUniqueNames)
-LDAPUserObjectClassList=List of objectClass
-LDAPUserObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPGroupObjectClassList=List of objectClass
-LDAPGroupObjectClassListExample=List of objectClass defining record attributes (ex: top,groupOfUniqueNames)
-LDAPContactObjectClassList=List of objectClass
-LDAPContactObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPTestConnect=Test LDAP connection
-LDAPTestSynchroContact=Test contacts synchronization
-LDAPTestSynchroUser=Test user synchronization
-LDAPTestSynchroGroup=Test group synchronization
-LDAPTestSynchroMember=Test member synchronization
+LDAPUserObjectClassList=ObjectClass ro'yxati
+LDAPUserObjectClassListExample=Reklama atributlarini belgilaydigan objectClass ro'yxati (masalan: top, inetOrgPerson yoki top, faol katalog uchun foydalanuvchi)
+LDAPGroupObjectClassList=ObjectClass ro'yxati
+LDAPGroupObjectClassListExample=Reklama atributlarini belgilaydigan objectClass ro'yxati (masalan: top, groupOfUniqueNames)
+LDAPContactObjectClassList=ObjectClass ro'yxati
+LDAPContactObjectClassListExample=Reklama atributlarini belgilaydigan objectClass ro'yxati (masalan: top, inetOrgPerson yoki top, faol katalog uchun foydalanuvchi)
+LDAPTestConnect=LDAP ulanishini sinab ko'ring
+LDAPTestSynchroContact=Kontaktlar sinxronizatsiyasini sinab ko'ring
+LDAPTestSynchroUser=Foydalanuvchi bilan sinxronlashni sinab ko'ring
+LDAPTestSynchroGroup=Sinov guruhini sinxronlashtirish
+LDAPTestSynchroMember=Sinov a'zolarini sinxronlashtirish
 LDAPTestSynchroMemberType=Test member type synchronization
-LDAPTestSearch= Test a LDAP search
-LDAPSynchroOK=Synchronization test successful
-LDAPSynchroKO=Failed synchronization test
-LDAPSynchroKOMayBePermissions=Failed synchronization test. Check that the connection to the server is correctly configured and allows LDAP updates
-LDAPTCPConnectOK=TCP connect to LDAP server successful (Server=%s, Port=%s)
-LDAPTCPConnectKO=TCP connect to LDAP server failed (Server=%s, Port=%s)
-LDAPBindOK=Connect/Authenticate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s)
-LDAPBindKO=Connect/Authenticate to LDAP server failed (Server=%s, Port=%s, Admin=%s, Password=%s)
-LDAPSetupForVersion3=LDAP server configured for version 3
-LDAPSetupForVersion2=LDAP server configured for version 2
-LDAPDolibarrMapping=Dolibarr Mapping
-LDAPLdapMapping=LDAP Mapping
-LDAPFieldLoginUnix=Login (unix)
-LDAPFieldLoginExample=Example: uid
-LDAPFilterConnection=Search filter
-LDAPFilterConnectionExample=Example: &(objectClass=inetOrgPerson)
+LDAPTestSearch= LDAP qidiruvini sinab ko'ring
+LDAPSynchroOK=Sinxronizatsiya testi muvaffaqiyatli o'tdi
+LDAPSynchroKO=Sinxronizatsiya sinovi muvaffaqiyatsiz tugadi
+LDAPSynchroKOMayBePermissions=Sinxronizatsiya sinovi muvaffaqiyatsiz tugadi. Serverga ulanish to'g'ri sozlanganligini va LDAP yangilanishlariga ruxsat berishini tekshiring
+LDAPTCPConnectOK=TCP LDAP-serverga muvaffaqiyatli ulandi (Server = %s, Port = %s)
+LDAPTCPConnectKO=TCP LDAP serveriga ulanmadi (Server = %s, Port = %s)
+LDAPBindOK=LDAP-serverga ulanish / autentifikatsiya qilish muvaffaqiyatli (Server = %s, Port = %s, Admin = %s, Password = %s)
+LDAPBindKO=LDAP-serverga ulanish / tasdiqlash amalga oshmadi (Server = %s, Port = %s, Admin = %s, Password = %s)
+LDAPSetupForVersion3=LDAP-server 3-versiya uchun tuzilgan
+LDAPSetupForVersion2=LDAP-server 2-versiya uchun tuzilgan
+LDAPDolibarrMapping=Dolibarr xaritasi
+LDAPLdapMapping=LDAP xaritasi
+LDAPFieldLoginUnix=Kirish (unix)
+LDAPFieldLoginExample=Misol: uid
+LDAPFilterConnection=Qidiruv filtri
+LDAPFilterConnectionExample=Misol: & (objectClass = inetOrgPerson)
 LDAPGroupFilterExample=Example: &(objectClass=groupOfUsers)
-LDAPFieldLoginSamba=Login (samba, activedirectory)
-LDAPFieldLoginSambaExample=Example: samaccountname
-LDAPFieldFullname=Full name
-LDAPFieldFullnameExample=Example: cn
-LDAPFieldPasswordNotCrypted=Password not encrypted
-LDAPFieldPasswordCrypted=Password encrypted
-LDAPFieldPasswordExample=Example: userPassword
-LDAPFieldCommonNameExample=Example: cn
-LDAPFieldName=Name
-LDAPFieldNameExample=Example: sn
-LDAPFieldFirstName=First name
-LDAPFieldFirstNameExample=Example: givenName
-LDAPFieldMail=Email address
-LDAPFieldMailExample=Example: mail
-LDAPFieldPhone=Professional phone number
-LDAPFieldPhoneExample=Example: telephonenumber
-LDAPFieldHomePhone=Personal phone number
-LDAPFieldHomePhoneExample=Example: homephone
-LDAPFieldMobile=Cellular phone
-LDAPFieldMobileExample=Example: mobile
-LDAPFieldFax=Fax number
-LDAPFieldFaxExample=Example: facsimiletelephonenumber
-LDAPFieldAddress=Street
-LDAPFieldAddressExample=Example: street
+LDAPFieldLoginSamba=Kirish (samba, activedirectory)
+LDAPFieldLoginSambaExample=Misol: samaccountname
+LDAPFieldFullname=To'liq ism
+LDAPFieldFullnameExample=Misol: cn
+LDAPFieldPasswordNotCrypted=Parol shifrlanmagan
+LDAPFieldPasswordCrypted=Parol shifrlangan
+LDAPFieldPasswordExample=Misol: userPassword
+LDAPFieldCommonNameExample=Misol: cn
+LDAPFieldName=Ism
+LDAPFieldNameExample=Misol: sn
+LDAPFieldFirstName=Ism
+LDAPFieldFirstNameExample=Misol: givenName
+LDAPFieldMail=E-pochta manzili
+LDAPFieldMailExample=Misol: pochta
+LDAPFieldPhone=Professional telefon raqami
+LDAPFieldPhoneExample=Misol: telefon raqamlari
+LDAPFieldHomePhone=Shaxsiy telefon raqami
+LDAPFieldHomePhoneExample=Misol: uy telefoni
+LDAPFieldMobile=Uyali telefon
+LDAPFieldMobileExample=Misol: mobil
+LDAPFieldFax=Faks raqami
+LDAPFieldFaxExample=Misol: fakssimiletelephonenumber
+LDAPFieldAddress=Ko'cha
+LDAPFieldAddressExample=Misol: ko'cha
 LDAPFieldZip=Zip
-LDAPFieldZipExample=Example: postalcode
-LDAPFieldTown=Town
-LDAPFieldTownExample=Example: l
-LDAPFieldCountry=Country
-LDAPFieldDescription=Description
-LDAPFieldDescriptionExample=Example: description
-LDAPFieldNotePublic=Public Note
-LDAPFieldNotePublicExample=Example: publicnote
-LDAPFieldGroupMembers= Group members
-LDAPFieldGroupMembersExample= Example: uniqueMember
-LDAPFieldBirthdate=Birthdate
-LDAPFieldCompany=Company
-LDAPFieldCompanyExample=Example: o
+LDAPFieldZipExample=Misol: pochta indeksi
+LDAPFieldTown=Shahar
+LDAPFieldTownExample=Misol: l
+LDAPFieldCountry=Mamlakat
+LDAPFieldDescription=Tavsif
+LDAPFieldDescriptionExample=Misol: tavsif
+LDAPFieldNotePublic=Ommaviy eslatma
+LDAPFieldNotePublicExample=Misol: publicnote
+LDAPFieldGroupMembers= Guruh a'zolari
+LDAPFieldGroupMembersExample= Misol: uniqueMember
+LDAPFieldBirthdate=Tug'ilgan kun sanasi
+LDAPFieldCompany=Kompaniya
+LDAPFieldCompanyExample=Misol: o
 LDAPFieldSid=SID
-LDAPFieldSidExample=Example: objectsid
-LDAPFieldEndLastSubscription=Date of subscription end
-LDAPFieldTitle=Job position
-LDAPFieldTitleExample=Example: title
+LDAPFieldSidExample=Misol: objectid
+LDAPFieldEndLastSubscription=Obuna tugagan sana
+LDAPFieldTitle=Ish joyi
+LDAPFieldTitleExample=Misol: sarlavha
 LDAPFieldGroupid=Group id
 LDAPFieldGroupidExample=Exemple : gidnumber
 LDAPFieldUserid=User id
@@ -1568,37 +1576,37 @@ LDAPFieldUseridExample=Exemple : uidnumber
 LDAPFieldHomedirectory=Home directory
 LDAPFieldHomedirectoryExample=Exemple : homedirectory
 LDAPFieldHomedirectoryprefix=Home directory prefix
-LDAPSetupNotComplete=LDAP setup not complete (go on others tabs)
-LDAPNoUserOrPasswordProvidedAccessIsReadOnly=No administrator or password provided. LDAP access will be anonymous and in read only mode.
-LDAPDescContact=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr contacts.
-LDAPDescUsers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr users.
-LDAPDescGroups=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr groups.
-LDAPDescMembers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members module.
+LDAPSetupNotComplete=LDAP-ni sozlash tugallanmagan (boshqalarga o'tish)
+LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Hech qanday administrator yoki parol taqdim etilmagan. LDAP-ga kirish noma'lum va faqat o'qish rejimida bo'ladi.
+LDAPDescContact=Ushbu sahifa Dolibarr kontaktlarida topilgan har bir ma'lumot uchun LDAP daraxtidagi LDAP atributlari nomini aniqlashga imkon beradi.
+LDAPDescUsers=Ushbu sahifa Dolibarr foydalanuvchilarida topilgan har bir ma'lumot uchun LDAP daraxtidagi LDAP atributlari nomini aniqlashga imkon beradi.
+LDAPDescGroups=Ushbu sahifa Dolibarr guruhlarida topilgan har bir ma'lumot uchun LDAP daraxtidagi LDAP atributlari nomini aniqlashga imkon beradi.
+LDAPDescMembers=Ushbu sahifa Dolibarr a'zolari modulida topilgan har bir ma'lumot uchun LDAP daraxtidagi LDAP atributlari nomini aniqlashga imkon beradi.
 LDAPDescMembersTypes=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members types.
-LDAPDescValues=Example values are designed for <b>OpenLDAP</b> with following loaded schemas: <b>core.schema, cosine.schema, inetorgperson.schema</b>). If you use thoose values and OpenLDAP, modify your LDAP config file <b>slapd.conf</b> to have all thoose schemas loaded.
-ForANonAnonymousAccess=For an authenticated access (for a write access for example)
-PerfDolibarr=Performance setup/optimizing report
-YouMayFindPerfAdviceHere=This page provides some checks or advice related to performance.
-NotInstalled=Not installed.
+LDAPDescValues=Misol qiymatlari <b> OpenLDAP </b> uchun quyidagi yuklangan sxemalar bilan yaratilgan: <b> core.schema, cosine.schema, inetorgperson.schema </b>). Agar siz qadriyatlar va OpenLDAP-dan foydalansangiz, LDAP konfiguratsiya faylini <b> slapd.conf </b>-ga o'zgartiring.
+ForANonAnonymousAccess=Tasdiqlangan kirish uchun (masalan, yozishga kirish uchun)
+PerfDolibarr=Ishlashni sozlash / optimallashtirish hisoboti
+YouMayFindPerfAdviceHere=Ushbu sahifada ishlash bilan bog'liq ba'zi tekshirishlar yoki tavsiyalar berilgan.
+NotInstalled=O'rnatilmagan
 NotSlowedDownByThis=Not slowed down by this.
 NotRiskOfLeakWithThis=Not risk of leak with this.
-ApplicativeCache=Applicative cache
-MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
-MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
-MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled.
-OPCodeCache=OPCode cache
-NoOPCodeCacheFound=No OPCode cache found. Maybe you are using an OPCode cache other than XCache or eAccelerator (good), or maybe you don't have OPCode cache (very bad).
-HTTPCacheStaticResources=HTTP cache for static resources (css, img, javascript)
-FilesOfTypeCached=Files of type %s are cached by HTTP server
-FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
-FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
-FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
-CacheByServer=Cache by server
+ApplicativeCache=Amaliy kesh
+MemcachedNotAvailable=Amaliy kesh topilmadi. Siz Memcached kesh-serverini va ushbu kesh-serverdan foydalanishga qodir bo'lgan modulni o'rnatish orqali ish faoliyatini oshirishingiz mumkin. <br> Qo'shimcha ma'lumot bu erda <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN"> http://wiki.dolibarr.org/index.php/Module_MemCached_EN </a>. <br> E'tibor bering, ko'plab veb-xosting provayderlari bunday kesh-serverni ta'minlamaydilar.
+MemcachedModuleAvailableButNotSetup=Amaliy kesh uchun memcached moduli topildi, ammo modulni sozlash tugallanmagan.
+MemcachedAvailableAndSetup=Memcached serveridan foydalanishga bag'ishlangan memcached moduli yoqilgan.
+OPCodeCache=OPCode kesh
+NoOPCodeCacheFound=OPCode keshi topilmadi. Ehtimol, siz XCache yoki eAccelerator (yaxshi) dan tashqari OPCode keshidan foydalanmoqdasiz yoki ehtimol sizda OPCode keshi yo'q (juda yomon).
+HTTPCacheStaticResources=Statik manbalar uchun HTTP kesh (css, img, javascript)
+FilesOfTypeCached=%s turidagi fayllar HTTP server tomonidan keshlanadi
+FilesOfTypeNotCached=%s turidagi fayllar HTTP server tomonidan keshlanmagan
+FilesOfTypeCompressed=%s tipidagi fayllar HTTP server tomonidan siqiladi
+FilesOfTypeNotCompressed=%s turidagi fayllar HTTP-server tomonidan siqilmagan
+CacheByServer=Server tomonidan keshlash
 CacheByServerDesc=For example using the Apache directive "ExpiresByType image/gif A2592000"
-CacheByClient=Cache by browser
-CompressionOfResources=Compression of HTTP responses
+CacheByClient=Brauzer orqali keshlash
+CompressionOfResources=HTTP javoblarini siqish
 CompressionOfResourcesDesc=For example using the Apache directive "AddOutputFilterByType DEFLATE"
-TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
+TestNotPossibleWithCurrentBrowsers=Hozirgi brauzerlarda bunday avtomatik aniqlash mumkin emas
 DefaultValuesDesc=Here you may define the default value you wish to use when creating a new record, and/or default filters or the sort order when you list records.
 DefaultCreateForm=Default values (to use on forms)
 DefaultSearchFilters=Default search filters
@@ -1606,369 +1614,369 @@ DefaultSortOrder=Default sort orders
 DefaultFocus=Default focus fields
 DefaultMandatory=Mandatory form fields
 ##### Products #####
-ProductSetup=Products module setup
-ServiceSetup=Services module setup
-ProductServiceSetup=Products and Services modules setup
-NumberOfProductShowInSelect=Maximum number of products to show in combo select lists (0=no limit)
-ViewProductDescInFormAbility=Display product descriptions in forms (otherwise shown in a tooltip popup)
+ProductSetup=Mahsulotlar modulini sozlash
+ServiceSetup=Xizmatlar modulini sozlash
+ProductServiceSetup=Mahsulotlar va xizmatlar modullarini sozlash
+NumberOfProductShowInSelect=Kombinatsiyalangan ro'yxatlarda ko'rsatiladigan mahsulotlarning maksimal soni (0 = chegara yo'q)
+ViewProductDescInFormAbility=Shakllarda mahsulot tavsiflarini aks ettiring (aks holda ko'rsatmalar oynasi oynasida ko'rsatiladi)
 DoNotAddProductDescAtAddLines=Do not add product description (from product card) on submit add lines on forms
 OnProductSelectAddProductDesc=How to use the description of the products when adding a product as a line of a document
 AutoFillFormFieldBeforeSubmit=Auto fill the description input field with the description of product
 DoNotAutofillButAutoConcat=Do not autofill the input field with description of product. Description of the product will be concatenated to the entered description automatically.
 DoNotUseDescriptionOfProdut=Description of the product will never be included into the description of lines of documents
-MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
-ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
-UseSearchToSelectProductTooltip=Also if you have a large number of products (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-UseSearchToSelectProduct=Wait until you press a key before loading content of product combo list (This may increase performance if you have a large number of products, but it is less convenient)
-SetDefaultBarcodeTypeProducts=Default barcode type to use for products
-SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
-UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
-ProductCodeChecker= Module for product code generation and checking (product or service)
-ProductOtherConf= Product / Service configuration
-IsNotADir=is not a directory!
+MergePropalProductCard=Agar mahsulot / xizmat taklifda bo'lsa, mahsulotning PDF-hujjati bilan mahsulotning PDF-hujjatini birlashtirish uchun mahsulot / xizmatda biriktirilgan fayllar yorlig'ini faollashtiring.
+ViewProductDescInThirdpartyLanguageAbility=Mahsulot tavsiflarini uchinchi tomon tilida (aks holda foydalanuvchi tilida) shakllarda ko'rsatish
+UseSearchToSelectProductTooltip=Agar sizda ko'p miqdordagi mahsulotlar (> 100 000) bo'lsa, doimiy ravishda PRODUCT_DONOTSEARCH_ANYWHERE-ni Setup-> Other-da 1 ga o'rnatib tezlikni oshirishingiz mumkin. Keyin qidirish satr boshlanishi bilan cheklanadi.
+UseSearchToSelectProduct=Mahsulotlar ro'yxati tarkibini yuklashdan oldin tugmachani bosguncha kuting (bu sizning mahsulotingiz ko'p bo'lsa, unumdorligini oshirishi mumkin, ammo bu unchalik qulay emas)
+SetDefaultBarcodeTypeProducts=Mahsulotlar uchun ishlatiladigan standart shtrix-kod turi
+SetDefaultBarcodeTypeThirdParties=Uchinchi shaxslar uchun ishlatiladigan standart shtrix kod turi
+UseUnits=Buyurtma, taklif yoki schyot-fakturani nashr qilish paytida Miqdor uchun o'lchov birligini aniqlang
+ProductCodeChecker= Mahsulot kodini ishlab chiqarish va tekshirish moduli (mahsulot yoki xizmat)
+ProductOtherConf= Mahsulot / xizmat konfiguratsiyasi
+IsNotADir=katalog emas!
 ##### Syslog #####
-SyslogSetup=Logs module setup
-SyslogOutput=Logs outputs
-SyslogFacility=Facility
-SyslogLevel=Level
-SyslogFilename=File name and path
-YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
-ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
-OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
+SyslogSetup=Jurnallar modulini sozlash
+SyslogOutput=Jurnal natijalari
+SyslogFacility=Qulaylik
+SyslogLevel=Daraja
+SyslogFilename=Fayl nomi va yo'li
+YouCanUseDOL_DATA_ROOT=Dolibarr "hujjatlar" katalogidagi jurnal fayli uchun DOL_DATA_ROOT / dolibarr.log dan foydalanishingiz mumkin. Ushbu faylni saqlash uchun boshqa yo'lni belgilashingiz mumkin.
+ErrorUnknownSyslogConstant=Doimiy %s ma'lum Syslog doimiysi emas
+OnlyWindowsLOG_USER=Windows-da faqat LOG_USER moslamasi qo'llab-quvvatlanadi
 CompressSyslogs=Compression and backup of debug log files (generated by module Log for debug)
 SyslogFileNumberOfSaves=Number of backup logs to keep
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
-DonationsSetup=Donation module setup
-DonationsReceiptModel=Template of donation receipt
+DonationsSetup=Xayriya modulini sozlash
+DonationsReceiptModel=Xayr-ehson olish to'g'risidagi shablon
 ##### Barcode #####
-BarcodeSetup=Barcode setup
-PaperFormatModule=Print format module
-BarcodeEncodeModule=Barcode encoding type
-CodeBarGenerator=Barcode generator
-ChooseABarCode=No generator defined
-FormatNotSupportedByGenerator=Format not supported by this generator
-BarcodeDescEAN8=Barcode of type EAN8
-BarcodeDescEAN13=Barcode of type EAN13
-BarcodeDescUPC=Barcode of type UPC
-BarcodeDescISBN=Barcode of type ISBN
-BarcodeDescC39=Barcode of type C39
-BarcodeDescC128=Barcode of type C128
-BarcodeDescDATAMATRIX=Barcode of type Datamatrix
-BarcodeDescQRCODE=Barcode of type QR code
-GenbarcodeLocation=Bar code 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
-BarcodeInternalEngine=Internal engine
-BarCodeNumberManager=Manager to auto define barcode numbers
+BarcodeSetup=Shtrixli sozlash
+PaperFormatModule=Format modulini chop etish
+BarcodeEncodeModule=Shtrixli kodlash turi
+CodeBarGenerator=Shtrixli generator
+ChooseABarCode=Hech qanday generator aniqlanmagan
+FormatNotSupportedByGenerator=Format ushbu generator tomonidan qo'llab-quvvatlanmaydi
+BarcodeDescEAN8=EAN8 tipidagi shtrix-kod
+BarcodeDescEAN13=EAN13 tipidagi shtrix-kod
+BarcodeDescUPC=UPC tipidagi shtrix-kod
+BarcodeDescISBN=ISBN tipidagi shtrix-kod
+BarcodeDescC39=C39 tipidagi shtrix-kod
+BarcodeDescC128=C128 tipidagi shtrix-kod
+BarcodeDescDATAMATRIX=Datamatrix tipidagi shtrix-kod
+BarcodeDescQRCODE=QR kodli shtrix kod
+GenbarcodeLocation=Shtrixli kodni yaratish buyruq satri vositasi (ba'zi shtrix-kod turlari uchun ichki dvigatel tomonidan ishlatiladi). "Genbarcode" bilan mos bo'lishi kerak. <br> Masalan: / usr / local / bin / genbarcode
+BarcodeInternalEngine=Ichki dvigatel
+BarCodeNumberManager=Shtrixli raqamlarni avtomatik aniqlash uchun menejer
 ##### Prelevements #####
-WithdrawalsSetup=Setup of module Direct Debit payments
+WithdrawalsSetup=To'g'ridan-to'g'ri to'lovlar modulini o'rnatish
 ##### ExternalRSS #####
-ExternalRSSSetup=External RSS imports setup
-NewRSS=New RSS Feed
-RSSUrl=RSS URL
-RSSUrlExample=An interesting RSS feed
+ExternalRSSSetup=Tashqi RSS importini sozlash
+NewRSS=Yangi RSS tasmasi
+RSSUrl=RSS URL manzili
+RSSUrlExample=Qiziqarli RSS tasmasi
 ##### Mailing #####
-MailingSetup=EMailing module setup
-MailingEMailFrom=Sender email (From) for emails sent by emailing module
-MailingEMailError=Return Email (Errors-to) for emails with errors
-MailingDelay=Seconds to wait after sending next message
+MailingSetup=EMailing modulini sozlash
+MailingEMailFrom=Elektron pochta orqali yuborilgan elektron pochta xabarlari uchun elektron pochta xabarini yuboruvchi (Kimdan)
+MailingEMailError=Xatolari bo'lgan elektron pochta xabarlari uchun elektron pochtani qaytaring (Xatolar)
+MailingDelay=Keyingi xabarni yuborgandan keyin kutish uchun soniya
 ##### Notification #####
-NotificationSetup=Email Notification module setup
-NotificationEMailFrom=Sender email (From) for emails sent by the Notifications module
-FixedEmailTarget=Recipient
+NotificationSetup=Elektron pochta xabarnomasi modulini sozlash
+NotificationEMailFrom=Bildirishnomalar moduli tomonidan yuborilgan elektron pochta xabarlari uchun jo'natuvchi elektron pochtasi (dan)
+FixedEmailTarget=Qabul qiluvchi
 ##### Sendings #####
-SendingsSetup=Shipping module setup
-SendingsReceiptModel=Sending receipt model
-SendingsNumberingModules=Sendings numbering modules
-SendingsAbility=Support shipping sheets for customer deliveries
-NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that are received and signed by customer. Hence the product deliveries receipt is a duplicated feature and is rarely activated.
-FreeLegalTextOnShippings=Free text on shipments
+SendingsSetup=Yuk tashish modulini sozlash
+SendingsReceiptModel=Qabul qilish modelini yuborish
+SendingsNumberingModules=Yuborish raqamlash modullari
+SendingsAbility=Mijozlarni etkazib berish uchun jo'natma varaqlarini qo'llab-quvvatlash
+NoNeedForDeliveryReceipts=Ko'pgina hollarda, jo'natma varaqalari ham mijozlarni etkazib berish uchun varaqalar (yuboriladigan mahsulotlar ro'yxati), ham mijoz tomonidan qabul qilingan va imzolangan varaqlar sifatida ishlatiladi. Shuning uchun mahsulotni etkazib berish kvitansiyasi takrorlanadigan xususiyat bo'lib, kamdan-kam hollarda faollashtiriladi.
+FreeLegalTextOnShippings=Yuklarni jo'natishda bepul matn
 ##### Deliveries #####
-DeliveryOrderNumberingModules=Products deliveries receipt numbering module
-DeliveryOrderModel=Products deliveries receipt model
-DeliveriesOrderAbility=Support products deliveries receipts
-FreeLegalTextOnDeliveryReceipts=Free text on delivery receipts
+DeliveryOrderNumberingModules=Mahsulotlarni etkazib berish kvitansiyasini raqamlash moduli
+DeliveryOrderModel=Mahsulotlarni etkazib berish kvitansiyasi modeli
+DeliveriesOrderAbility=Mahsulotlarni etkazib berish kvitansiyasini qo'llab-quvvatlash
+FreeLegalTextOnDeliveryReceipts=Yetkazib berish kvitansiyalari bo'yicha bepul matn
 ##### FCKeditor #####
-AdvancedEditor=Advanced editor
-ActivateFCKeditor=Activate advanced editor for:
-FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services)
-FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
-FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing)
-FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
-FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
+AdvancedEditor=Murakkab muharrir
+ActivateFCKeditor=Kengaytirilgan tahrirlovchini faollashtirish:
+FCKeditorForCompany=WYSIWIG elementlarini tavsiflash va eslatma yaratish / nashr qilish (mahsulot / xizmatlardan tashqari)
+FCKeditorForProduct=WYSIWIG mahsulotlarini / xizmatlarini yaratish / nashr qilish tavsifi va eslatmasi
+FCKeditorForProductDetails=WYSIWIG mahsulotlarini yaratish / nashr qilish barcha sub'ektlar uchun tafsilotlar liniyalari (takliflar, buyurtmalar, hisob-fakturalar va boshqalar ...). <span class="warning"> Ogohlantirish: ushbu holat uchun ushbu parametrdan foydalanish jiddiy tavsiya etilmaydi, chunki u PDF-fayllarni yaratishda maxsus belgilar va sahifalarni formatlash bilan bog'liq muammolarni keltirib chiqarishi mumkin. </span>
+FCKeditorForMailing= Ommaviy elektron pochta xabarlari uchun WYSIWIG yaratish / nashr (Asboblar -> Elektron pochta)
+FCKeditorForUserSignature=WYSIWIG yaratish / foydalanuvchi imzosini nashr etish
+FCKeditorForMail=Barcha pochta uchun WYSIWIG yaratish / nashr (Asboblar -> elektron pochtadan tashqari)
 FCKeditorForTicket=WYSIWIG creation/edition for tickets
 ##### Stock #####
-StockSetup=Stock module setup
-IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
+StockSetup=Birja modulini sozlash
+IfYouUsePointOfSaleCheckModule=Agar siz sukut bo'yicha taqdim etilgan Sotish nuqtasi moduli (POS) yoki tashqi moduldan foydalansangiz, ushbu sozlash POS modulingiz tomonidan e'tiborsiz qoldirilishi mumkin. Ko'pgina POS-modullar sukut bo'yicha darhol hisob-fakturani yaratish va bu erdagi variantlardan qat'iy nazar zaxiralarni kamaytirish uchun ishlab chiqilgan. Shunday qilib, sizning POS-dan savdo-sotiqni ro'yxatdan o'tkazishda sizda aktsiyalar kamayishi kerak bo'lsa yoki kerak bo'lmasa, shuningdek POS modul sozlamalarini tekshiring.
 ##### Menu #####
-MenuDeleted=Menu deleted
-Menu=Menu
-Menus=Menus
-TreeMenuPersonalized=Personalized menus
-NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
-NewMenu=New menu
-MenuHandler=Menu handler
-MenuModule=Source module
-HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
-DetailId=Id menu
-DetailMenuHandler=Menu handler where to show new menu
-DetailMenuModule=Module name if menu entry come from a module
-DetailType=Type of menu (top or left)
-DetailTitre=Menu label or label code for translation
-DetailUrl=URL where menu send you (Absolute URL link or external link with http://)
-DetailEnabled=Condition to show or not entry
-DetailRight=Condition to display unauthorized grey menus
-DetailLangs=Lang file name for label code translation
-DetailUser=Intern / Extern / All
-Target=Target
-DetailTarget=Target for links (_blank top opens a new window)
-DetailLevel=Level (-1:top menu, 0:header menu, >0 menu and sub menu)
-ModifMenu=Menu change
-DeleteMenu=Delete menu entry
-ConfirmDeleteMenu=Are you sure you want to delete menu entry <b>%s</b>?
-FailedToInitializeMenu=Failed to initialize menu
+MenuDeleted=Menyu o'chirildi
+Menu=Menyu
+Menus=Menyular
+TreeMenuPersonalized=Shaxsiylashtirilgan menyular
+NotTopTreeMenuPersonalized=Shaxsiy menyular yuqori menyu yozuviga bog'lanmagan
+NewMenu=Yangi menyu
+MenuHandler=Menyu boshqaruvchisi
+MenuModule=Manba moduli
+HideUnauthorizedMenu=Ichki foydalanuvchilar uchun ham ruxsatsiz menyularni yashirish (aks holda ochko'zlik)
+DetailId=Id menyusi
+DetailMenuHandler=Yangi menyu ko'rsatiladigan menyu boshqaruvchisi
+DetailMenuModule=Agar menyuga kirish moduldan keladigan bo'lsa, modul nomi
+DetailType=Menyu turi (yuqori yoki chap)
+DetailTitre=Tarjima qilish uchun menyu yorlig'i yoki yorliq kodi
+DetailUrl=Sizga menyu yuboradigan URL (Mutlaq URL havolasi yoki http: // bilan tashqi havola)
+DetailEnabled=Kirish yoki ko'rsatmaslik sharti
+DetailRight=Ruxsatsiz kulrang menyularni ko'rsatish sharti
+DetailLangs=Yorliq kodini tarjima qilish uchun lang fayl nomi
+DetailUser=Intern / Extern / Hammasi
+Target=Maqsad
+DetailTarget=Havolalar uchun maqsad (_blank top yangi oynani ochadi)
+DetailLevel=Daraja (-1: yuqori menyu, 0: sarlavha menyusi,> 0 menyu va pastki menyu)
+ModifMenu=Menyu o'zgarishi
+DeleteMenu=Menyu yozuvini o'chirish
+ConfirmDeleteMenu=<b> %s </b> menyu yozuvini o'chirishni xohlaysizmi?
+FailedToInitializeMenu=Menyu ishga tushirilmadi
 ##### Tax #####
-TaxSetup=Taxes, social or fiscal taxes and dividends module setup
-OptionVatMode=VAT due
-OptionVATDefault=Standard basis
-OptionVATDebitOption=Accrual basis
-OptionVatDefaultDesc=VAT is due:<br>- on delivery of goods (based on invoice date)<br>- on payments for services
-OptionVatDebitOptionDesc=VAT is due:<br>- on delivery of goods (based on invoice date)<br>- on invoice (debit) for services
+TaxSetup=Soliqlar, ijtimoiy yoki soliq soliqlari va dividendlar modulini o'rnatish
+OptionVatMode=QQS to'lashi kerak
+OptionVATDefault=Standart asos
+OptionVATDebitOption=Hisoblash usuli
+OptionVatDefaultDesc=QQS muddati: <br> - tovarlarni etkazib berish bo'yicha (hisob-kitob sana asosida) <br> - xizmatlar uchun to'lovlar bo'yicha
+OptionVatDebitOptionDesc=QQS muddati: <br> - tovarlarni etkazib berish bo'yicha (hisob-kitob sana asosida) <br> - xizmatlar uchun hisob-kitob (debet) bo'yicha
 OptionPaymentForProductAndServices=Cash basis for products and services
 OptionPaymentForProductAndServicesDesc=VAT is due:<br>- on payment for goods<br>- on payments for services
-SummaryOfVatExigibilityUsedByDefault=Time of VAT eligibility by default according to chosen option:
-OnDelivery=On delivery
-OnPayment=On payment
-OnInvoice=On invoice
-SupposedToBePaymentDate=Payment date used
-SupposedToBeInvoiceDate=Invoice date used
-Buy=Buy
-Sell=Sell
-InvoiceDateUsed=Invoice date used
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organization), so there is no VAT options to setup.
-AccountancyCode=Accounting Code
-AccountancyCodeSell=Sale account. code
-AccountancyCodeBuy=Purchase account. code
+SummaryOfVatExigibilityUsedByDefault=Tanlangan variant bo'yicha sukut bo'yicha QQS olish vaqti:
+OnDelivery=Yetkazib berish paytida
+OnPayment=To'lov bo'yicha
+OnInvoice=Hisob-fakturada
+SupposedToBePaymentDate=To'lov sanasi ishlatilgan
+SupposedToBeInvoiceDate=Hisob-faktura sanasi ishlatilgan
+Buy=Sotib oling
+Sell=Sotish
+InvoiceDateUsed=Hisob-faktura sanasi ishlatilgan
+YourCompanyDoesNotUseVAT=Sizning kompaniyangiz QQSdan foydalanmasligi aniqlandi (Uy - O'rnatish - Kompaniya / tashkilot), shuning uchun sozlash uchun QQS variantlari mavjud emas.
+AccountancyCode=Buxgalteriya kodi
+AccountancyCodeSell=Sotish hisobi. kod
+AccountancyCodeBuy=Hisobni sotib olish. kod
 CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Keep the checkbox “Automatically create the payment” empty by default when creating a new tax
 ##### Agenda #####
-AgendaSetup=Events and agenda module setup
-PasswordTogetVCalExport=Key to authorize export link
+AgendaSetup=Voqealar va kun tartibi modulini o'rnatish
+PasswordTogetVCalExport=Eksport havolasini tasdiqlash uchun kalit
 SecurityKey = Security Key
-PastDelayVCalExport=Do not export event older than
-AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries -> Type of agenda events)
-AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
-AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
-AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
-AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
+PastDelayVCalExport=Eskiroq voqeani eksport qilmang
+AGENDA_USE_EVENT_TYPE=Voqealar turlaridan foydalaning (O'rnatish menyusi -> Lug'atlar -> Kun tartibidagi tadbirlar turi)
+AGENDA_USE_EVENT_TYPE_DEFAULT=Voqeani yaratish shaklida voqea turi uchun ushbu standart qiymatni avtomatik ravishda sozlash
+AGENDA_DEFAULT_FILTER_TYPE=Ushbu turdagi tadbirlarni kun tartibi ko'rinishidagi qidiruv filtrida avtomatik ravishda o'rnating
+AGENDA_DEFAULT_FILTER_STATUS=Ushbu holatni kun tartibi ko'rinishidagi qidiruv filtridagi voqealar uchun avtomatik ravishda o'rnating
+AGENDA_DEFAULT_VIEW=Kun tartibi menyusini tanlashda qaysi ko'rinishni sukut bo'yicha ochishni xohlaysiz
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
-AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the scheduled job %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
-ClickToDialSetup=Click To Dial module setup
-ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
-ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
-ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
+ClickToDialSetup=To Dial modulini o'rnatish uchun bosing
+ClickToDialUrlDesc=Telefon piktogrammasi bosilganda url chaqirdi. URL, siz foydalanishingiz mumkin tags <br> <b> __PHONETO__ </b> deb <br> <b> __PHONEFROM__ </b> ClickToDial bilan almashtiriladi shaxs (seniki) qo'ng'iroq telefon raqamini <br> <b> __LOGIN__ </b> bilan almashtiriladi, deb qo'ng'iroq qilish shaxsning telefon raqami bilan almashtiriladi kirish (foydalanuvchi kartasida belgilangan) <br> <b> __PASS__ </b>, bu klikktodial parol bilan almashtiriladi (foydalanuvchi kartasida aniqlangan).
+ClickToDialDesc=Ushbu modul statsionar kompyuterdan foydalanilganda telefon raqamlarini bosish mumkin bo'lgan havolalarga o'zgartiradi. Bir marta bosish raqamga qo'ng'iroq qiladi. Bu ish stolida yumshoq telefondan foydalanilganda yoki masalan, SIP protokoliga asoslangan CTI tizimidan foydalanilganda telefon qo'ng'irog'ini boshlash uchun ishlatilishi mumkin. Eslatma: Smartfondan foydalanganda telefon raqamlari doim bosilishi mumkin.
+ClickToDialUseTelLink=Telefon raqamlarida faqat "tel:" havolasidan foydalaning
+ClickToDialUseTelLinkDesc=Agar sizning foydalanuvchilaringizda dasturiy ta'minot interfeysi o'rnatilgan bo'lsa yoki brauzer bilan bir xil kompyuterda o'rnatilgan bo'lsa va brauzeringizda "tel:" bilan boshlanadigan havolani bosganingizda ushbu usuldan foydalaning. Agar sizga to'liq server echimi kerak bo'lsa (mahalliy dasturiy ta'minotni o'rnatishga hojat yo'q), uni "Yo'q" ga o'rnatishingiz va keyingi maydonni to'ldirishingiz kerak.
 ##### Point Of Sale (CashDesk) #####
-CashDesk=Point of Sale
-CashDeskSetup=Point of Sales module setup
-CashDeskThirdPartyForSell=Default generic third party to use for sales
-CashDeskBankAccountForSell=Default account to use to receive cash payments
-CashDeskBankAccountForCheque=Default account to use to receive payments by check
-CashDeskBankAccountForCB=Default account to use to receive payments by credit cards
+CashDesk=Sotish punkti
+CashDeskSetup=Savdo modulini o'rnatish nuqtasi
+CashDeskThirdPartyForSell=Sotish uchun foydalaniladigan odatiy umumiy uchinchi shaxs
+CashDeskBankAccountForSell=Naqd to'lovlarni qabul qilish uchun foydalaniladigan standart hisob
+CashDeskBankAccountForCheque=To'lovlarni chek orqali qabul qilish uchun foydalaniladigan standart hisob
+CashDeskBankAccountForCB=Kredit kartalar orqali to'lovlarni qabul qilish uchun foydalaniladigan standart hisob
 CashDeskBankAccountForSumup=Default bank account to use to receive payments by SumUp
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sale is done from Point of Sale (if "no", stock decrease is done for each sale done from POS, irrespective of the option set in module Stock).
-CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
-StockDecreaseForPointOfSaleDisabled=Stock decrease from Point of Sale disabled
-StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with module Serial/Lot management (currently active) so stock decrease is disabled.
-CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sale from Point of Sale. Hence a warehouse is required.
+CashDeskDoNotDecreaseStock=Sotish nuqtasi Savdo punktidan amalga oshirilganda aktsiyalarni pasaytirishni o'chirib qo'ying (agar "yo'q" bo'lsa, aktsiyalarni pasaytirish har bir POS-dan amalga oshiriladi, ushbu modulda o'rnatilgan variantdan qat'i nazar).
+CashDeskIdWareHouse=Omborni kamaytirish uchun omborni majburan cheklang va cheklang
+StockDecreaseForPointOfSaleDisabled=Savdo punktida aksiyalarning pasayishi o'chirilgan
+StockDecreaseForPointOfSaleDisabledbyBatch=POS-da aktsiyalarning pasayishi Serial / Lot moduli bilan mos kelmaydi (hozirda faol), shuning uchun aktsiyalarni pasaytirish o'chirilgan.
+CashDeskYouDidNotDisableStockDecease=Sale of Sale-dan savdo-sotiqni amalga oshirayotganda siz aktsiyalarning pasayishini o'chirib qo'ymadingiz. Shuning uchun ombor kerak.
 CashDeskForceDecreaseStockLabel=Stock decrease for batch products was forced.
 CashDeskForceDecreaseStockDesc=Decrease first by the oldest eatby and sellby dates.
 CashDeskReaderKeyCodeForEnter=Key code for "Enter" defined in barcode reader (Example: 13)
 ##### Bookmark #####
-BookmarkSetup=Bookmark module setup
-BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or external web sites on your left menu.
-NbOfBoomarkToShow=Maximum number of bookmarks to show in left menu
+BookmarkSetup=Xatcho'plar modulini sozlash
+BookmarkDesc=Ushbu modul sizga xatcho'plarni boshqarish imkonini beradi. Shuningdek, chap menyuda joylashgan har qanday Dolibarr sahifalariga yoki tashqi veb-saytlarga yorliq qo'shishingiz mumkin.
+NbOfBoomarkToShow=Chap menyuda ko'rsatiladigan maksimal xatcho'plar soni
 ##### WebServices #####
-WebServicesSetup=Webservices module setup
-WebServicesDesc=By enabling this module, Dolibarr become a web service server to provide miscellaneous web services.
-WSDLCanBeDownloadedHere=WSDL descriptor files of provided services can be download here
-EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint available at URL
+WebServicesSetup=Veb-xizmatlar modulini sozlash
+WebServicesDesc=Ushbu modulni yoqish orqali Dolibarr turli xil veb-xizmatlarni taqdim etadigan veb-xizmat serveriga aylanadi.
+WSDLCanBeDownloadedHere=Taqdim etilgan xizmatlarning tavsiflovchi fayllarini bu erdan yuklab olish mumkin
+EndPointIs=SOAP mijozlari o'zlarining so'rovlarini URL-da joylashgan Dolibarr so'nggi nuqtasiga yuborishlari kerak
 ##### API ####
-ApiSetup=API module setup
-ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore and test the APIs at URL
-OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
-ApiKey=Key for API
-WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
+ApiSetup=API modulini sozlash
+ApiDesc=Ushbu modulni yoqish orqali Dolibarr turli xil veb-xizmatlarni taqdim etadigan REST-serverga aylanadi.
+ApiProductionMode=Ishlab chiqarish rejimini yoqing (bu xizmatlarni boshqarish uchun keshdan foydalanishni faollashtiradi)
+ApiExporerIs=Siz API-larni URL manzilida o'rganishingiz va sinab ko'rishingiz mumkin
+OnlyActiveElementsAreExposed=Faqatgina yoqilgan modullarning elementlari paydo bo'ladi
+ApiKey=API uchun kalit
+WarningAPIExplorerDisabled=API Explorer o'chirilgan. API xizmatlarini taqdim etish uchun API Explorer talab qilinmaydi. Bu ishlab chiquvchi uchun REST API-larni topish / sinab ko'rish vositasi. Agar sizga ushbu vosita kerak bo'lsa, uni faollashtirish uchun API REST modulini sozlang.
 ##### Bank #####
-BankSetupModule=Bank module setup
-FreeLegalTextOnChequeReceipts=Free text on check receipts
-BankOrderShow=Display order of bank accounts for countries using "detailed bank number"
-BankOrderGlobal=General
-BankOrderGlobalDesc=General display order
-BankOrderES=Spanish
-BankOrderESDesc=Spanish display order
-ChequeReceiptsNumberingModule=Check Receipts Numbering Module
+BankSetupModule=Bank modulini sozlash
+FreeLegalTextOnChequeReceipts=Chek kvitansiyalaridagi bepul matn
+BankOrderShow="Batafsil bank raqami" dan foydalanadigan mamlakatlar uchun bank hisobvaraqlarining tartibini ko'rsatish
+BankOrderGlobal=Umumiy
+BankOrderGlobalDesc=Bosh ekran tartibi
+BankOrderES=Ispaniya
+BankOrderESDesc=Ispaniyaning namoyish tartibi
+ChequeReceiptsNumberingModule=Kvitansiyalarni raqamlash modulini tekshiring
 ##### Multicompany #####
-MultiCompanySetup=Multi-company module setup
+MultiCompanySetup=Ko'p kompaniyalar uchun modulni sozlash
 ##### Suppliers #####
-SuppliersSetup=Vendor module setup
-SuppliersCommandModel=Complete template of Purchase Order
+SuppliersSetup=Sotuvchi modulini sozlash
+SuppliersCommandModel=Xarid qilish buyurtmasining to'liq shablonlari
 SuppliersCommandModelMuscadet=Complete template of Purchase Order (old implementation of cornas template)
-SuppliersInvoiceModel=Complete template of Vendor Invoice
-SuppliersInvoiceNumberingModel=Vendor invoices numbering models
-IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
+SuppliersInvoiceModel=Sotuvchi fakturasining to'liq shabloni
+SuppliersInvoiceNumberingModel=Sotuvchi fakturalarni raqamlash modellari
+IfSetToYesDontForgetPermission=Agar nol qiymatga o'rnatilgan bo'lsa, ikkinchi tasdiqlash uchun ruxsat berilgan guruhlarga yoki foydalanuvchilarga ruxsat berishni unutmang
 ##### GeoIPMaxmind #####
-GeoIPMaxmindSetup=GeoIP Maxmind module setup
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
-NoteOnPathLocation=Note that your ip to country data file must be inside a directory your PHP can read (Check your PHP open_basedir setup and filesystem permissions).
-YouCanDownloadFreeDatFileTo=You can download a <b>free demo version</b> of the Maxmind GeoIP country file at %s.
-YouCanDownloadAdvancedDatFileTo=You can also download a more <b>complete version, with updates,</b> of the Maxmind GeoIP country file at %s.
-TestGeoIPResult=Test of a conversion IP -> country
+GeoIPMaxmindSetup=GeoIP Maxmind modulini sozlash
+PathToGeoIPMaxmindCountryDataFile=Maxmind ipni mamlakat tarjimasiga o'z ichiga olgan faylga yo'l. <br> Misollar: <br> /usr/local/share/GeoIP/GeoIP.dat <br> /usr/share/GeoIP/GeoIP.dat <br> /usr/share/Gare-Cite/Gare/Bare/Gare/Bare
+NoteOnPathLocation=Sizning mamlakatingizga ip ma'lumotlari sizning PHP o'qishi mumkin bo'lgan katalog ichida bo'lishi kerakligini unutmang (PHP open_basedir sozlamalarini va fayl tizimining ruxsatlarini tekshiring).
+YouCanDownloadFreeDatFileTo=Maxmind GeoIP mamlakat faylining <b> </b> bepul demo versiyasini %s manzilidan yuklab olishingiz mumkin.
+YouCanDownloadAdvancedDatFileTo=Bundan tashqari, %s manzilidan Maxmind GeoIP mamlakat faylining </b> yangilangan to'liq versiyasini yuklab olishingiz mumkin.
+TestGeoIPResult=Konversiyani sinab ko'rish IP -> mamlakat
 ##### Projects #####
-ProjectsNumberingModules=Projects numbering module
-ProjectsSetup=Project module setup
-ProjectsModelModule=Project reports document model
-TasksNumberingModules=Tasks numbering module
-TaskModelModule=Tasks reports document model
-UseSearchToSelectProject=Wait until a key is pressed before loading content of Project combo list.<br>This may improve performance if you have a large number of projects, but it is less convenient.
+ProjectsNumberingModules=Loyihalarni raqamlash moduli
+ProjectsSetup=Loyiha modulini sozlash
+ProjectsModelModule=Loyiha hisobotlari hujjat modeli
+TasksNumberingModules=Vazifalarni raqamlash moduli
+TaskModelModule=Vazifalar hujjat modeli hisobotlari
+UseSearchToSelectProject=Project combo ro'yxatining tarkibini yuklashdan oldin tugma bosilguncha kuting. <br> Agar sizda ko'plab loyihalar mavjud bo'lsa, bu ishlashni yaxshilashi mumkin, ammo bu unchalik qulay emas.
 ##### ECM (GED) #####
 ##### Fiscal Year #####
-AccountingPeriods=Accounting periods
-AccountingPeriodCard=Accounting period
-NewFiscalYear=New accounting period
-OpenFiscalYear=Open accounting period
-CloseFiscalYear=Close accounting period
-DeleteFiscalYear=Delete accounting period
-ConfirmDeleteFiscalYear=Are you sure to delete this accounting period?
-ShowFiscalYear=Show accounting period
-AlwaysEditable=Can always be edited
-MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
-NbMajMin=Minimum number of uppercase characters
-NbNumMin=Minimum number of numeric characters
-NbSpeMin=Minimum number of special characters
-NbIteConsecutive=Maximum number of repeating same characters
-NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
-SalariesSetup=Setup of module salaries
-SortOrder=Sort order
-Format=Format
-TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and suppliers payment type
-IncludePath=Include path (defined into variable %s)
-ExpenseReportsSetup=Setup of module Expense Reports
-TemplatePDFExpenseReports=Document templates to generate expense report document
+AccountingPeriods=Buxgalteriya davrlari
+AccountingPeriodCard=Hisob davri
+NewFiscalYear=Yangi hisobot davri
+OpenFiscalYear=Ochiq hisob-kitob davri
+CloseFiscalYear=Hisob davri yopiladi
+DeleteFiscalYear=Hisob davri o'chirilsin
+ConfirmDeleteFiscalYear=Ushbu hisobot davrini o'chirishga ishonchingiz komilmi?
+ShowFiscalYear=Hisob-kitob davri
+AlwaysEditable=Har doim tahrir qilish mumkin
+MAIN_APPLICATION_TITLE=Ko'rinadigan dastur nomini majburlash (ogohlantirish: bu erda o'z ismingizni o'rnatish DoliDroid mobil ilovasidan foydalanilganda avtomatik to'ldirish tizimiga kirish xususiyatini buzishi mumkin)
+NbMajMin=Bosh harflarning minimal soni
+NbNumMin=Raqamli belgilarning minimal soni
+NbSpeMin=Maxsus belgilarning minimal soni
+NbIteConsecutive=Bir xil belgilarni takrorlashning maksimal soni
+NoAmbiCaracAutoGeneration=Avtomatik ishlab chiqarish uchun noaniq belgilarni ("1", "l", "i", "|", "0", "O") ishlatmang
+SalariesSetup=Modullarning ish haqini sozlash
+SortOrder=Saralash tartibi
+Format=Formatlash
+TypePaymentDesc=0: mijozning to'lov turi, 1: sotuvchining to'lov turi, 2: mijozlar ham, etkazib beruvchilar uchun ham to'lov turi
+IncludePath=Yo'lni qo'shing (%s o'zgaruvchisiga belgilangan)
+ExpenseReportsSetup=Moddiy xarajatlar to'g'risidagi hisobotni sozlash
+TemplatePDFExpenseReports=Xarajatlar to'g'risidagi hujjatni yaratish uchun hujjat shablonlari
 ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
-NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
-YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for email notifications by enabling and configuring the module "Notification".
-ListOfNotificationsPerUser=List of automatic notifications per user*
-ListOfNotificationsPerUserOrContact=List of possible automatic notifications (on business event) available per user* or per contact**
-ListOfFixedNotifications=List of automatic fixed notifications
-GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go to the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
-Threshold=Threshold
-BackupDumpWizard=Wizard to build the database dump file
+NoModueToManageStockIncrease=Zaxiralarni avtomatik ravishda oshirishni boshqaradigan biron bir modul faollashtirilmagan. Aksiyalarni ko'paytirish faqat qo'lda kiritish orqali amalga oshiriladi.
+YouMayFindNotificationsFeaturesIntoModuleNotification="Bildirishnoma" modulini yoqish va sozlash orqali elektron pochta xabarlari uchun variantlarni topishingiz mumkin.
+ListOfNotificationsPerUser=Har bir foydalanuvchi uchun avtomatik bildirishnomalar ro'yxati *
+ListOfNotificationsPerUserOrContact=Har bir foydalanuvchi * yoki har bir kontakt uchun mavjud bo'lgan avtomatik xabarnomalar ro'yxati (ishbilarmonlik tadbirlarida) **
+ListOfFixedNotifications=Avtomatik sobit xabarnomalar ro'yxati
+GoOntoUserCardToAddMore=Foydalanuvchilar uchun bildirishnomalarni qo'shish yoki o'chirish uchun "Bildirishnomalar" yorlig'iga o'ting
+GoOntoContactCardToAddMore=Kontaktlar / manzillar uchun bildirishnomalarni qo'shish yoki o'chirish uchun uchinchi tomonning "Bildirishnomalar" yorlig'iga o'ting
+Threshold=Eshik
+BackupDumpWizard=Ma'lumotlar bazasi dump faylini yaratish ustasi
 BackupZipWizard=Wizard to build the archive of documents directory
-SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
-SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is a manual process only a privileged user may perform.
-InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
+SomethingMakeInstallFromWebNotPossible=Tashqi modulni o'rnatish quyidagi sabablarga ko'ra veb-interfeysdan mumkin emas:
+SomethingMakeInstallFromWebNotPossible2=Shu sababli, bu erda tavsiflangan yangilash jarayoni faqat imtiyozli foydalanuvchi amalga oshirishi mumkin bo'lgan qo'lda bajariladigan jarayondir.
+InstallModuleFromWebHasBeenDisabledByFile=Ilovadan tashqi modulni o'rnatishni administratoringiz o'chirib qo'ydi. Ushbu funktsiyaga ruxsat berish uchun siz undan <strong> %s </strong> faylini olib tashlashini so'rashingiz kerak.
 ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
-HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
-HighlightLinesColor=Highlight color of the line when the mouse passes over (use 'ffffff' for no highlight)
+HighlightLinesOnMouseHover=Sichqoncha harakati o'tib ketganda jadval satrlarini ajratib ko'rsatish
+HighlightLinesColor=Sichqoncha o'tib ketganda chiziq rangini belgilang (ajratish uchun 'ffffff' dan foydalaning)
 HighlightLinesChecked=Highlight color of the line when it is checked (use 'ffffff' for no highlight)
-TextTitleColor=Text color of Page title
-LinkColor=Color of links
-PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
-NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
-BackgroundColor=Background color
-TopMenuBackgroundColor=Background color for Top menu
-TopMenuDisableImages=Hide images in Top menu
-LeftMenuBackgroundColor=Background color for Left menu
-BackgroundTableTitleColor=Background color for Table title line
+TextTitleColor=Sahifa sarlavhasining matni rangi
+LinkColor=Havolalarning rangi
+PressF5AfterChangingThis=Klaviaturada CTRL + F5 tugmachalarini bosing yoki ushbu qiymatni o'zgartirgandan so'ng brauzer keshini tozalang
+NotSupportedByAllThemes=Will asosiy mavzular bilan ishlaydi, tashqi mavzular tomonidan qo'llab-quvvatlanmasligi mumkin
+BackgroundColor=Fon rangi
+TopMenuBackgroundColor=Yuqori menyu uchun fon rangi
+TopMenuDisableImages=Yuqori menyuda rasmlarni yashirish
+LeftMenuBackgroundColor=Chap menyu uchun fon rangi
+BackgroundTableTitleColor=Jadval sarlavhasi uchun fon rangi
 BackgroundTableTitleTextColor=Text color for Table title line
 BackgroundTableTitleTextlinkColor=Text color for Table title link line
-BackgroundTableLineOddColor=Background color for odd table lines
-BackgroundTableLineEvenColor=Background color for even table lines
-MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
-NbAddedAutomatically=Number of days added to counters of users (automatically) each month
-EnterAnyCode=This field contains a reference to identify the line. Enter any value of your choice, but without special characters.
+BackgroundTableLineOddColor=Toq jadval chiziqlari uchun fon rangi
+BackgroundTableLineEvenColor=Jadvalning tekis chiziqlari uchun fon rangi
+MinimumNoticePeriod=Minimal ogohlantirish davri (ta'tilga chiqish so'rovingiz ushbu kechiktirishdan oldin amalga oshirilishi kerak)
+NbAddedAutomatically=Foydalanuvchilarning hisoblagichlariga har oy qo'shilgan kunlar soni (avtomatik ravishda)
+EnterAnyCode=Ushbu maydonda chiziqni aniqlash uchun ma'lumotnoma mavjud. Siz tanlagan har qanday qiymatni kiriting, lekin maxsus belgilarsiz.
 Enter0or1=Enter 0 or 1
-UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
+UnicodeCurrency=Qavslar oralig'iga bu erga kiriting, valyuta belgisini ko'rsatadigan bayt raqamlari ro'yxati. Masalan: $ uchun, [36] kiriting - Braziliya uchun haqiqiy R $ [82,36] - € uchun, [8364] kiriting
 ColorFormat=The RGB color is in HEX format, eg: FF0000
 PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
-PositionIntoComboList=Position of line into combo lists
-SellTaxRate=Sale tax rate
-RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some state in France. Keep value to "No" in all other cases.
-UrlTrackingDesc=If the provider or transport service offers a page or web site to check the status of your shipments, you may enter it here. You can use the key {TRACKID} in the URL parameters so the system will replace it with the tracking number the user entered into the shipment card.
-OpportunityPercent=When you create a lead, you will define an estimated amount of project/lead. According to status of the lead, this amount may be multiplied by this rate to evaluate a total amount all your leads may generate. Value is a percentage (between 0 and 100).
-TemplateForElement=This template record is dedicated to which element
-TypeOfTemplate=Type of template
-TemplateIsVisibleByOwnerOnly=Template is visible to owner only
+PositionIntoComboList=Chiziqning kombinatsion ro'yxatlarga joylashishi
+SellTaxRate=Sotish uchun soliq stavkasi
+RecuperableOnly=Frantsiyaning biron bir shtati uchun ajratilgan "Qabul qilinmagan, ammo tiklanadigan" QQS uchun ha. Boshqa barcha holatlarda "Yo'q" qiymatini saqlang.
+UrlTrackingDesc=Agar provayder yoki transport xizmati sizning jo'natmalaringiz holatini tekshirish uchun sahifa yoki veb-sayt taklif qilsa, uni bu erga kiritishingiz mumkin. Siz URL parametrlarida {TRACKID} tugmachasidan foydalanishingiz mumkin, shunda tizim uni foydalanuvchi jo'natma kartasiga kiritgan kuzatuv raqami bilan almashtiradi.
+OpportunityPercent=Qo'rg'oshin yaratishda siz taxminiy loyiha / qo'rg'oshin miqdorini aniqlaysiz. Qo'rg'oshin maqomiga ko'ra, ushbu miqdor ushbu stavkaga ko'paytirilishi mumkin, bu sizning barcha potentsialingiz ishlab chiqarishi mumkin bo'lgan umumiy miqdorni baholash uchun. Qiymat foiz hisoblanadi (0 dan 100 gacha).
+TemplateForElement=Ushbu shablon yozuvi qaysi elementga bag'ishlangan
+TypeOfTemplate=Shablon turi
+TemplateIsVisibleByOwnerOnly=Andoza faqat egasiga ko'rinadi
 VisibleEverywhere=Visible everywhere
 VisibleNowhere=Visible nowhere
-FixTZ=TimeZone fix
-FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
-ExpectedChecksum=Expected Checksum
-CurrentChecksum=Current Checksum
+FixTZ=TimeZone-ni tuzatish
+FillFixTZOnlyIfRequired=Misol: +2 (faqat muammo yuzaga kelganda to'ldiring)
+ExpectedChecksum=Kutilayotgan summa
+CurrentChecksum=Joriy summa
 ExpectedSize=Expected size
 CurrentSize=Current size
-ForcedConstants=Required constant values
-MailToSendProposal=Customer proposals
-MailToSendOrder=Sales orders
-MailToSendInvoice=Customer invoices
-MailToSendShipment=Shipments
-MailToSendIntervention=Interventions
-MailToSendSupplierRequestForQuotation=Quotation request
-MailToSendSupplierOrder=Purchase orders
-MailToSendSupplierInvoice=Vendor invoices
-MailToSendContract=Contracts
+ForcedConstants=Kerakli doimiy qiymatlar
+MailToSendProposal=Mijozlarning takliflari
+MailToSendOrder=Savdo buyurtmalari
+MailToSendInvoice=Mijozlarning hisob-fakturalari
+MailToSendShipment=Yuklar
+MailToSendIntervention=Aralashuvlar
+MailToSendSupplierRequestForQuotation=Kotirovka so'rovi
+MailToSendSupplierOrder=Sotib olish uchun buyurtmalar
+MailToSendSupplierInvoice=Sotuvchi hisob-fakturalari
+MailToSendContract=Shartnomalar
 MailToSendReception=Receptions
-MailToThirdparty=Third parties
+MailToThirdparty=Uchinchi shaxslar
 MailToMember=Members
 MailToUser=Users
 MailToProject=Projects
 MailToTicket=Tickets
-ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the latest stable version
-TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
-TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
-ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so contains only bug fixes. We recommend all users to upgrade to this version. A maintenance release does not introduce new features or changes to the database. You may download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read the <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
-MultiPriceRuleDesc=When option "Several levels of prices per product/service" is enabled, you can define different prices (one per price level) for each product. To save you time, here you may enter a rule to autocalculate a price for each level based on the price of the first level, so you will have to only enter a price for the first level for each product. This page is designed to save you time but is useful only if your prices for each level are relative to first level. You can ignore this page in most cases.
-ModelModulesProduct=Templates for product documents
+ByDefaultInList=Ro'yxat ko'rinishida sukut bo'yicha ko'rsatish
+YouUseLastStableVersion=Siz eng so'nggi barqaror versiyadan foydalanasiz
+TitleExampleForMajorRelease=Ushbu yirik nashrni e'lon qilish uchun foydalanishingiz mumkin bo'lgan xabarning namunasi (uni o'zingizning veb-saytingizda ishlating)
+TitleExampleForMaintenanceRelease=Xizmat namunasi, ushbu texnik xizmat ko'rsatilishini e'lon qilish uchun foydalanishingiz mumkin (uni veb-saytlaringizda ishlating)
+ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s mavjud. %s versiyasi foydalanuvchilar uchun ham, ishlab chiquvchilar uchun ham juda ko'p yangi xususiyatlarga ega bo'lgan katta versiyadir. Siz uni https://www.dolibarr.org portalining yuklab olish maydonidan yuklab olishingiz mumkin (katalogning barqaror versiyalari). O'zgarishlarning to'liq ro'yxati uchun <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog"> ChangeLog </a> o'qishingiz mumkin.
+ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s mavjud. %s versiyasi parvarishlash versiyasidir, shuning uchun faqat xatolarni tuzatishni o'z ichiga oladi. Barcha foydalanuvchilarga ushbu versiyaga o'tishni tavsiya etamiz. Ta'minot versiyasi ma'lumotlar bazasiga yangi xususiyatlar yoki o'zgarishlar kiritmaydi. Siz uni https://www.dolibarr.org portalining yuklab olish joyidan yuklab olishingiz mumkin (katalogning barqaror versiyalari). O'zgarishlarning to'liq ro'yxati uchun <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog"> ChangeLog </a> ni o'qishingiz mumkin.
+MultiPriceRuleDesc="Mahsulot / xizmat uchun narxlarning bir necha darajalari" opsiyasi yoqilganda, har bir mahsulot uchun har xil narxlarni (narx darajasiga bitta) belgilashingiz mumkin. Vaqtingizni tejash uchun bu erda siz har bir darajadagi narxni birinchi darajadagi narxga qarab avtokalkulyatsiya qilish qoidasini kiritishingiz mumkin, shuning uchun har bir mahsulot uchun faqat birinchi darajadagi narxni kiritishingiz kerak bo'ladi. Ushbu sahifa sizning vaqtingizni tejashga mo'ljallangan, ammo har bir darajadagi narxlaringiz birinchi darajaga nisbatan foydali bo'lgan taqdirdagina foydali bo'ladi. Ko'p hollarda ushbu sahifani e'tiborsiz qoldirishingiz mumkin.
+ModelModulesProduct=Mahsulot hujjatlari uchun shablonlar
 WarehouseModelModules=Templates for documents of warehouses
-ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate codes automatically, you must first define a manager to auto-define the barcode number.
-SeeSubstitutionVars=See * note for list of possible substitution variables
+ToGenerateCodeDefineAutomaticRuleFirst=Kodlarni avtomatik ravishda yaratish uchun avval shtrix raqamini avtomatik aniqlash uchun menejerni belgilashingiz kerak.
+SeeSubstitutionVars=Mumkin bo'lgan o'zgaruvchan o'zgaruvchilar ro'yxati uchun * eslatmani ko'ring
 SeeChangeLog=See ChangeLog file (english only)
-AllPublishers=All publishers
-UnknownPublishers=Unknown publishers
-AddRemoveTabs=Add or remove tabs
+AllPublishers=Barcha noshirlar
+UnknownPublishers=Noma'lum noshirlar
+AddRemoveTabs=Yorliqlarni qo'shing yoki olib tashlang
 AddDataTables=Add object tables
-AddDictionaries=Add dictionaries tables
+AddDictionaries=Lug'at jadvallarini qo'shing
 AddData=Add objects or dictionaries data
-AddBoxes=Add widgets
-AddSheduledJobs=Add scheduled jobs
-AddHooks=Add hooks
-AddTriggers=Add triggers
-AddMenus=Add menus
-AddPermissions=Add permissions
-AddExportProfiles=Add export profiles
-AddImportProfiles=Add import profiles
-AddOtherPagesOrServices=Add other pages or services
-AddModels=Add document or numbering templates
-AddSubstitutions=Add keys substitutions
-DetectionNotPossible=Detection not possible
-UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received it is saved in database user table and must be provided on each API call)
-ListOfAvailableAPIs=List of available APIs
-activateModuleDependNotSatisfied=Module "%s" depends on module "%s", that is missing, so module "%1$s" may not work correctly. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
-CommandIsNotInsideAllowedCommands=The command you are trying to run is not in the list of allowed commands defined in parameter <strong>$dolibarr_main_restrict_os_commands</strong> in the <strong>conf.php</strong> file.
-LandingPage=Landing page
-SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", the price will also be the same for all companies if products are shared between environments
-ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users or groups manually if necessary.
-UserHasNoPermissions=This user has no permissions defined
+AddBoxes=Vidjetlarni qo'shing
+AddSheduledJobs=Rejalashtirilgan ish joylarini qo'shing
+AddHooks=Kancalar qo'shing
+AddTriggers=Triggerlar qo'shing
+AddMenus=Menyularni qo'shing
+AddPermissions=Ruxsatnomalarni qo'shing
+AddExportProfiles=Eksport rejimlarini qo'shing
+AddImportProfiles=Import profillarini qo'shing
+AddOtherPagesOrServices=Boshqa sahifalarni yoki xizmatlarni qo'shing
+AddModels=Hujjat yoki raqamlash shablonlarini qo'shing
+AddSubstitutions=Kalit almashtirishlarni qo'shing
+DetectionNotPossible=Aniqlash mumkin emas
+UrlToGetKeyToUseAPIs=API-dan foydalanish uchun token olish uchun url (token olinganidan so'ng ma'lumotlar bazasi foydalanuvchi jadvalida saqlanadi va har bir API chaqiruvida ko'rsatilishi kerak)
+ListOfAvailableAPIs=Mavjud API-lar ro'yxati
+activateModuleDependNotSatisfied="%s" moduli "%s" moduliga bog'liq, chunki u etishmayapti, shuning uchun "%1$s" moduli to'g'ri ishlamasligi mumkin. Iltimos, "%2$s" modulini o'rnating yoki "%1$s" modulini o'chirib qo'ying
+CommandIsNotInsideAllowedCommands=Siz bajarmoqchi bo'lgan buyruq <strong> $ dolibarr_main_restrict_os_commands </strong> <strong> conf.php a0a65d071f6fc parametrida belgilangan ruxsat berilgan buyruqlar ro'yxatida yo'q.
+LandingPage=Ochilish sahifasi
+SamePriceAlsoForSharedCompanies=Agar siz "Yagona narx" tanlovi bilan ko'pkompaniyali moduldan foydalansangiz, mahsulot atrof-muhit o'rtasida taqsimlansa, narx barcha kompaniyalar uchun bir xil bo'ladi.
+ModuleEnabledAdminMustCheckRights=Modul faollashtirildi. Faollashtirilgan modul (lar) ga ruxsat faqat administrator foydalanuvchilariga berilgan. Agar kerak bo'lsa, boshqa foydalanuvchilarga yoki guruhlarga ruxsatnomalarni qo'lda berishingiz kerak bo'lishi mumkin.
+UserHasNoPermissions=Ushbu foydalanuvchi uchun ruxsatlar aniqlanmagan
 TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "%s")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "%s" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month after delta (delta is field "%s", N is stored into field "%s")
 BaseCurrency=Reference currency of the company (go into setup of company to change this)
 WarningNoteModuleInvoiceForFrenchLaw=This module %s is compliant with French laws (Loi Finance 2016).
@@ -1979,6 +1987,8 @@ 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_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add picture on proposal line
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add electronic sign in PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
@@ -2035,10 +2045,10 @@ ECMAutoTree=Show automatic ECM tree
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
-ResourceSetup=Configuration of Resource module
-UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disable feature to link a resource to users
-DisabledResourceLinkContact=Disable feature to link a resource to contacts
+ResourceSetup=Resurs modulining konfiguratsiyasi
+UseSearchToSelectResource=Resursni tanlash uchun qidiruv shaklidan foydalaning (ochiladigan ro'yxat o'rniga).
+DisabledResourceLinkUser=Resursni foydalanuvchilar bilan bog'lash xususiyatini o'chirib qo'ying
+DisabledResourceLinkContact=Resursni kontaktlarga bog'lash xususiyatini o'chirib qo'ying
 EnableResourceUsedInEventCheck=Enable feature to check if a resource is in use in an event
 ConfirmUnactivation=Confirm module reset
 OnMobileOnly=On small screen (smartphone) only
@@ -2096,7 +2106,6 @@ PDF_SHOW_PROJECT=Show project on document
 ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
-FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
@@ -2120,12 +2129,18 @@ ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by
 MailToSendEventOrganization=Event Organization
 AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
 YouShouldDisablePHPFunctions=You should disable PHP functions
-IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands in custom code, you shoud disable PHP functions
+PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
+NotRecommended=Not recommanded
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
 ModuleUpdateAvailable=An update is available
 NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
+RandomlySelectedIfSeveral=Randomly selected if several pictures are available
+DatabasePasswordObfuscated=Database password is obfuscated in conf file
+DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
diff --git a/htdocs/langs/uz_UZ/agenda.lang b/htdocs/langs/uz_UZ/agenda.lang
index 09d82139a49..253224d4263 100644
--- a/htdocs/langs/uz_UZ/agenda.lang
+++ b/htdocs/langs/uz_UZ/agenda.lang
@@ -1,92 +1,94 @@
 # Dolibarr language file - Source file is en_US - agenda
-IdAgenda=ID event
-Actions=Events
-Agenda=Agenda
-TMenuAgenda=Agenda
-Agendas=Agendas
-LocalAgenda=Internal calendar
-ActionsOwnedBy=Event owned by
-ActionsOwnedByShort=Owner
-AffectedTo=Assigned to
-Event=Event
-Events=Events
-EventsNb=Number of events
-ListOfActions=List of events
+IdAgenda=ID hodisasi
+Actions=Tadbirlar
+Agenda=Kun tartibi
+TMenuAgenda=Kun tartibi
+Agendas=Kun tartibi
+LocalAgenda=Odatiy taqvim
+ActionsOwnedBy=Tadbir
+ActionsOwnedByShort=Egasi
+AffectedTo=Tayinlangan
+Event=Tadbir
+Events=Tadbirlar
+EventsNb=Tadbirlar soni
+ListOfActions=Tadbirlar ro'yxati
 EventReports=Event reports
-Location=Location
-ToUserOfGroup=Event assigned to any user in group
-EventOnFullDay=Event on all day(s)
-MenuToDoActions=All incomplete events
-MenuDoneActions=All terminated events
-MenuToDoMyActions=My incomplete events
-MenuDoneMyActions=My terminated events
-ListOfEvents=List of events (internal calendar)
-ActionsAskedBy=Events reported by
-ActionsToDoBy=Events assigned to
-ActionsDoneBy=Events done by
-ActionAssignedTo=Event assigned to
-ViewCal=Month view
-ViewDay=Day view
-ViewWeek=Week view
-ViewPerUser=Per user view
-ViewPerType=Per type view
-AutoActions= Automatic filling
-AgendaAutoActionDesc= Here you may define events which you want Dolibarr to create automatically  in Agenda. If nothing is checked, only manual actions will be included in logs and displayed in Agenda. Automatic tracking of business actions done on objects (validation, status change) will not be saved.
-AgendaSetupOtherDesc= This page provides options to allow the export of your Dolibarr events into an external calendar (Thunderbird, Google Calendar etc...)
-AgendaExtSitesDesc=This page allows to declare external sources of calendars to see their events into Dolibarr agenda.
-ActionsEvents=Events for which Dolibarr will create an action in agenda automatically
+Location=Manzil
+ToUserOfGroup=Tadbir guruhdagi har qanday foydalanuvchiga tayinlangan
+EventOnFullDay=Barcha kun (lar) da tadbir
+MenuToDoActions=Barcha to'liq bo'lmagan voqealar
+MenuDoneActions=Barcha tugatilgan tadbirlar
+MenuToDoMyActions=Mening to'liq bo'lmagan voqealarim
+MenuDoneMyActions=Mening tugatilgan voqealarim
+ListOfEvents=Voqealar ro'yxati (standart taqvim)
+ActionsAskedBy=Xabar bergan voqealar
+ActionsToDoBy=Belgilangan tadbirlar
+ActionsDoneBy=Hodisalar
+ActionAssignedTo=Tadbir tayinlangan
+ViewCal=Oylik ko'rinish
+ViewDay=Kunduzgi ko'rinish
+ViewWeek=Hafta ko'rinishi
+ViewPerUser=Har bir foydalanuvchi ko'rinishi uchun
+ViewPerType=Har bir ko'rinish uchun
+AutoActions= Avtomatik to'ldirish
+AgendaAutoActionDesc= Bu erda siz Dolibarr-ning kun tartibida avtomatik ravishda yaratishini xohlagan voqealarni belgilashingiz mumkin. Hech narsa tekshirilmasa, faqat qo'lda bajariladigan harakatlar jurnallarga kiritiladi va kun tartibida ko'rsatiladi. Ob'ektlarda amalga oshirilgan ishbilarmonlik harakatlarini avtomatik ravishda kuzatish (tasdiqlash, holatni o'zgartirish) saqlanmaydi.
+AgendaSetupOtherDesc= Ushbu sahifada Dolibarr tadbirlarini tashqi taqvimga (Thunderbird, Google Calendar va boshqalar) eksport qilishga ruxsat berish imkoniyatlari berilgan.
+AgendaExtSitesDesc=Ushbu sahifa o'z voqealarini Dolibarr kun tartibiga kiritish uchun taqvimlarning tashqi manbalarini e'lon qilishga imkon beradi.
+ActionsEvents=Dolibarr avtomatik ravishda kun tartibida harakat yaratadigan tadbirlar
 EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
 ##### Agenda event labels #####
-NewCompanyToDolibarr=Third party %s created
+NewCompanyToDolibarr=Uchinchi tomon %s yaratildi
+COMPANY_MODIFYInDolibarr=Third party %s modified
 COMPANY_DELETEInDolibarr=Third party %s deleted
-ContractValidatedInDolibarr=Contract %s validated
+ContractValidatedInDolibarr=%s shartnomasi tasdiqlangan
 CONTRACT_DELETEInDolibarr=Contract %s deleted
-PropalClosedSignedInDolibarr=Proposal %s signed
-PropalClosedRefusedInDolibarr=Proposal %s refused
-PropalValidatedInDolibarr=Proposal %s validated
-PropalClassifiedBilledInDolibarr=Proposal %s classified billed
-InvoiceValidatedInDolibarr=Invoice %s validated
-InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
-InvoiceBackToDraftInDolibarr=Invoice %s go back to draft status
-InvoiceDeleteDolibarr=Invoice %s deleted
-InvoicePaidInDolibarr=Invoice %s changed to paid
-InvoiceCanceledInDolibarr=Invoice %s canceled
-MemberValidatedInDolibarr=Member %s validated
+PropalClosedSignedInDolibarr=%s taklifi imzolandi
+PropalClosedRefusedInDolibarr=%s taklifi rad etildi
+PropalValidatedInDolibarr=%s taklifi tasdiqlangan
+PropalClassifiedBilledInDolibarr=%s taklifi tasniflangan
+InvoiceValidatedInDolibarr=%s hisob-fakturasi tasdiqlangan
+InvoiceValidatedInDolibarrFromPos=POS-dan tasdiqlangan %s hisob-fakturasi
+InvoiceBackToDraftInDolibarr=%s hisob-fakturasi qoralama holatiga qaytadi
+InvoiceDeleteDolibarr=%s hisob-fakturasi o'chirildi
+InvoicePaidInDolibarr=%s hisob-fakturasi to'langanga o'zgartirildi
+InvoiceCanceledInDolibarr=%s hisob-fakturasi bekor qilindi
+MemberValidatedInDolibarr=%s a'zosi tasdiqlangan
 MemberModifiedInDolibarr=Member %s modified
-MemberResiliatedInDolibarr=Member %s terminated
-MemberDeletedInDolibarr=Member %s deleted
-MemberSubscriptionAddedInDolibarr=Subscription %s for member %s added
+MemberResiliatedInDolibarr=%s a'zosi tugatildi
+MemberDeletedInDolibarr=%s a'zosi o'chirildi
+MemberSubscriptionAddedInDolibarr=%s a'zosi uchun %s obunasi qo'shildi
 MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified
 MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted
-ShipmentValidatedInDolibarr=Shipment %s validated
-ShipmentClassifyClosedInDolibarr=Shipment %s classified billed
-ShipmentUnClassifyCloseddInDolibarr=Shipment %s classified re-open
+ShipmentValidatedInDolibarr=%s jo'natmasi tasdiqlangan
+ShipmentClassifyClosedInDolibarr=%s jo'natmasi tasniflangan
+ShipmentUnClassifyCloseddInDolibarr=%s jo'natmasi qayta ochilgan
 ShipmentBackToDraftInDolibarr=Shipment %s go back to draft status
-ShipmentDeletedInDolibarr=Shipment %s deleted
+ShipmentDeletedInDolibarr=%s jo'natmasi o'chirildi
 ReceptionValidatedInDolibarr=Reception %s validated
-OrderCreatedInDolibarr=Order %s created
-OrderValidatedInDolibarr=Order %s validated
-OrderDeliveredInDolibarr=Order %s classified delivered
-OrderCanceledInDolibarr=Order %s canceled
-OrderBilledInDolibarr=Order %s classified billed
-OrderApprovedInDolibarr=Order %s approved
-OrderRefusedInDolibarr=Order %s refused
-OrderBackToDraftInDolibarr=Order %s go back to draft status
-ProposalSentByEMail=Commercial proposal %s sent by email
+OrderCreatedInDolibarr=%s buyurtmasi yaratildi
+OrderValidatedInDolibarr=%s buyurtmasi tasdiqlangan
+OrderDeliveredInDolibarr=Buyurtma tasniflangan tasniflangan %s
+OrderCanceledInDolibarr=%s buyurtmasi bekor qilindi
+OrderBilledInDolibarr=Buyurtma %s tasniflangan tasniflangan
+OrderApprovedInDolibarr=%s buyurtmasi tasdiqlandi
+OrderRefusedInDolibarr=%s buyurtmasi rad etildi
+OrderBackToDraftInDolibarr=%s buyurtmasi qoralama holatiga qaytadi
+ProposalSentByEMail=Elektron pochta orqali yuborilgan %s tijorat taklifi
 ContractSentByEMail=Contract %s sent by email
-OrderSentByEMail=Sales order %s sent by email
-InvoiceSentByEMail=Customer invoice %s sent by email
-SupplierOrderSentByEMail=Purchase order %s sent by email
+OrderSentByEMail=%s savdo buyurtmasi elektron pochta orqali yuborilgan
+InvoiceSentByEMail=Mijozlarning hisob-fakturasi %s elektron pochta orqali yuborilgan
+SupplierOrderSentByEMail=Elektron pochta orqali yuborilgan %s buyurtmasini sotib oling
 ORDER_SUPPLIER_DELETEInDolibarr=Purchase order %s deleted
-SupplierInvoiceSentByEMail=Vendor invoice %s sent by email
-ShippingSentByEMail=Shipment %s sent by email
-ShippingValidated= Shipment %s validated
-InterventionSentByEMail=Intervention %s sent by email
-ProposalDeleted=Proposal deleted
-OrderDeleted=Order deleted
-InvoiceDeleted=Invoice deleted
+SupplierInvoiceSentByEMail=Sotuvchi hisob-fakturasi %s elektron pochta orqali yuborilgan
+ShippingSentByEMail=%s jo'natmasi elektron pochta orqali yuborilgan
+ShippingValidated= %s jo'natmasi tasdiqlangan
+InterventionSentByEMail=Elektron pochta orqali yuborilgan aralashuv %s
+ProposalDeleted=Taklif o'chirildi
+OrderDeleted=Buyurtma o'chirildi
+InvoiceDeleted=Hisob-faktura o'chirildi
 DraftInvoiceDeleted=Draft invoice deleted
 CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_MODIFYInDolibarr=Contact %s modified
 CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Product %s created
 PRODUCT_MODIFYInDolibarr=Product %s modified
@@ -119,44 +121,46 @@ MRP_MO_UNVALIDATEInDolibarr=MO set to draft status
 MRP_MO_PRODUCEDInDolibarr=MO produced
 MRP_MO_DELETEInDolibarr=MO deleted
 MRP_MO_CANCELInDolibarr=MO canceled
+PAIDInDolibarr=%s paid
 ##### End agenda events #####
 AgendaModelModule=Document templates for event
-DateActionStart=Start date
-DateActionEnd=End date
-AgendaUrlOptions1=You can also add following parameters to filter output:
-AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
+DateActionStart=Boshlanish vaqti
+DateActionEnd=Tugash sanasi
+AgendaUrlOptions1=Chiqishni filtrlash uchun siz quyidagi parametrlarni qo'shishingiz mumkin:
+AgendaUrlOptions3= <b> logina = %s </b> <b> %s </b> foydalanuvchisiga tegishli harakatlar bilan chiqishni cheklash.
 AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> to restrict output to actions not owned by user <b>%s</b>.
-AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b> (owner and others).
-AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
+AgendaUrlOptions4= <b> logint = %s </b> foydalanuvchi <b> %s </b> (egasi va boshqalar) ga tayinlangan harakatlar bilan chiqishni cheklash uchun.
+AgendaUrlOptionsProject= <b> project = __ PROJECT_ID__ </b> loyihani <b> __PROJECT_ID__ </b> loyihasi bilan bog'liq harakatlar bilan cheklash.
 AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic events.
 AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> to include events of holidays.
-AgendaShowBirthdayEvents=Show birthdays of contacts
-AgendaHideBirthdayEvents=Hide birthdays of contacts
-Busy=Busy
-ExportDataset_event1=List of agenda events
-DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6)
-DefaultWorkingHours=Default working hours in day (Example: 9-18)
+AgendaShowBirthdayEvents=Kontaktlarning tug'ilgan kunlari
+AgendaHideBirthdayEvents=Kontaktlarning tug'ilgan kunlarini yashirish
+Busy=Band
+ExportDataset_event1=Kun tartibidagi tadbirlar ro'yxati
+DefaultWorkingDays=Odatiy ish kunlari haftada (Masalan: 1-5, 1-6)
+DefaultWorkingHours=Kunduzgi standart ish vaqti (Masalan: 9-18)
 # External Sites ical
-ExportCal=Export calendar
-ExtSites=Import external calendars
-ExtSitesEnableThisTool=Show external calendars (defined in global setup) in Agenda. Does not affect external calendars defined by users.
-ExtSitesNbOfAgenda=Number of calendars
-AgendaExtNb=Calendar no. %s
-ExtSiteUrlAgenda=URL to access .ical file
-ExtSiteNoLabel=No Description
-VisibleTimeRange=Visible time range
-VisibleDaysRange=Visible days range
-AddEvent=Create event
-MyAvailability=My availability
-ActionType=Event type
-DateActionBegin=Start event date
-ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b>?
-RepeatEvent=Repeat event
-EveryWeek=Every week
-EveryMonth=Every month
-DayOfMonth=Day of month
-DayOfWeek=Day of week
-DateStartPlusOne=Date start + 1 hour
+ExportCal=Kalendarni eksport qilish
+ExtSites=Tashqi kalendarlarni import qilish
+ExtSitesEnableThisTool=Tashqi kalendarlarni (global sozlamalarda aniqlangan) kun tartibida ko'rsating. Foydalanuvchilar tomonidan belgilangan tashqi taqvimlarga ta'sir qilmaydi.
+ExtSitesNbOfAgenda=Kalendarlar soni
+AgendaExtNb=Kalendar №. %s
+ExtSiteUrlAgenda=.Ical fayliga kirish uchun URL
+ExtSiteNoLabel=Tavsif yo'q
+VisibleTimeRange=Ko'rinadigan vaqt oralig'i
+VisibleDaysRange=Ko'rinadigan kunlar oralig'i
+AddEvent=Tadbir yaratish
+MyAvailability=Mening mavjudligim
+ActionType=Tadbir turi
+DateActionBegin=Tadbirni boshlash sanasi
+ConfirmCloneEvent=Hodisani <b> %s </b> klonlashni xohlaysizmi?
+RepeatEvent=Voqeani takrorlang
+OnceOnly=Once only
+EveryWeek=Har hafta
+EveryMonth=Har oy
+DayOfMonth=Oy kuni
+DayOfWeek=Haftaning kuni
+DateStartPlusOne=Sana boshlanishi + 1 soat
 SetAllEventsToTodo=Set all events to todo
 SetAllEventsToInProgress=Set all events to in progress
 SetAllEventsToFinished=Set all events to finished
@@ -165,4 +169,4 @@ TimeType=Duration type
 ReminderType=Callback type
 AddReminder=Create an automatic reminder notification for this event
 ErrorReminderActionCommCreation=Error creating the reminder notification for this event
-BrowserPush=Browser Notification
+BrowserPush=Browser Popup Notification
diff --git a/htdocs/langs/uz_UZ/banks.lang b/htdocs/langs/uz_UZ/banks.lang
index df7192bee25..e8b924ef2d7 100644
--- a/htdocs/langs/uz_UZ/banks.lang
+++ b/htdocs/langs/uz_UZ/banks.lang
@@ -1,166 +1,166 @@
 # Dolibarr language file - Source file is en_US - banks
 Bank=Bank
-MenuBankCash=Banks | Cash
+MenuBankCash=Banklar | Naqd pul
 MenuVariousPayment=Miscellaneous payments
 MenuNewVariousPayment=New Miscellaneous payment
-BankName=Bank name
+BankName=Bank nomi
 FinancialAccount=Account
-BankAccount=Bank account
-BankAccounts=Bank accounts
+BankAccount=bank hisob raqami
+BankAccounts=Bank hisobvaraqlari
 BankAccountsAndGateways=Bank accounts | Gateways
-ShowAccount=Show Account
-AccountRef=Financial account ref
-AccountLabel=Financial account label
-CashAccount=Cash account
-CashAccounts=Cash accounts
-CurrentAccounts=Current accounts
-SavingAccounts=Savings accounts
-ErrorBankLabelAlreadyExists=Financial account label already exists
-BankBalance=Balance
-BankBalanceBefore=Balance before
-BankBalanceAfter=Balance after
-BalanceMinimalAllowed=Minimum allowed balance
-BalanceMinimalDesired=Minimum desired balance
-InitialBankBalance=Initial balance
-EndBankBalance=End balance
-CurrentBalance=Current balance
-FutureBalance=Future balance
-ShowAllTimeBalance=Show balance from start
-AllTime=From start
-Reconciliation=Reconciliation
-RIB=Bank Account Number
-IBAN=IBAN number
-BIC=BIC/SWIFT code
-SwiftValid=BIC/SWIFT valid
-SwiftVNotalid=BIC/SWIFT not valid
-IbanValid=BAN valid
-IbanNotValid=BAN not valid
-StandingOrders=Direct debit orders
-StandingOrder=Direct debit order
+ShowAccount=Hisobni ko'rsatish
+AccountRef=Moliyaviy hisob
+AccountLabel=Moliyaviy hisob yorlig'i
+CashAccount=Naqd hisob
+CashAccounts=Naqd pul hisobvaraqlari
+CurrentAccounts=Joriy hisob-kitoblar
+SavingAccounts=Jamg'arma hisobvaraqlari
+ErrorBankLabelAlreadyExists=Moliyaviy hisob yorlig'i allaqachon mavjud
+BankBalance=Balans
+BankBalanceBefore=Oldingi qoldiq
+BankBalanceAfter=Balansdan keyin
+BalanceMinimalAllowed=Minimal ruxsat berilgan qoldiq
+BalanceMinimalDesired=Minimal kerakli qoldiq
+InitialBankBalance=Dastlabki qoldiq
+EndBankBalance=Balansni yakunlash
+CurrentBalance=Joriy balans
+FutureBalance=Kelajakdagi balans
+ShowAllTimeBalance=Balansni boshidanoq ko'rsating
+AllTime=Boshidan
+Reconciliation=Yarashish
+RIB=Bank hisob raqami
+IBAN=IBAN raqami
+BIC=BIC / SWIFT kodi
+SwiftValid=BIC / SWIFT amal qiladi
+SwiftVNotalid=BIC / SWIFT yaroqsiz
+IbanValid=BAN amal qiladi
+IbanNotValid=BAN haqiqiy emas
+StandingOrders=To'g'ridan-to'g'ri debet buyurtmalari
+StandingOrder=To'g'ridan-to'g'ri debet buyurtmasi
 PaymentByDirectDebit=Payment by direct debit
 PaymentByBankTransfers=Payments by credit transfer
 PaymentByBankTransfer=Payment by credit transfer
-AccountStatement=Account statement
-AccountStatementShort=Statement
-AccountStatements=Account statements
-LastAccountStatements=Last account statements
-IOMonthlyReporting=Monthly reporting
-BankAccountDomiciliation=Bank address
-BankAccountCountry=Account country
-BankAccountOwner=Account owner name
-BankAccountOwnerAddress=Account owner address
-RIBControlError=Integrity check of values failed. This means the information for this account number is not complete or is incorrect (check country, numbers and IBAN).
-CreateAccount=Create account
-NewBankAccount=New account
-NewFinancialAccount=New financial account
-MenuNewFinancialAccount=New financial account
-EditFinancialAccount=Edit account
-LabelBankCashAccount=Bank or cash label
-AccountType=Account type
-BankType0=Savings account
-BankType1=Current or credit card account
-BankType2=Cash account
-AccountsArea=Accounts area
-AccountCard=Account card
-DeleteAccount=Delete account
-ConfirmDeleteAccount=Are you sure you want to delete this account?
+AccountStatement=Hisob-kitob varaqasi
+AccountStatementShort=Bayonot
+AccountStatements=Hisob-kitob varaqalari
+LastAccountStatements=Oxirgi hisobvaraqlar
+IOMonthlyReporting=Oylik hisobot
+BankAccountDomiciliation=Bank manzili
+BankAccountCountry=Hisob qaydnomasi mamlakati
+BankAccountOwner=Hisob qaydnomasi egasining ismi
+BankAccountOwnerAddress=Hisob egasining manzili
+RIBControlError=Qiymatlarning yaxlitligini tekshirish muvaffaqiyatsiz tugadi. Bu shuni anglatadiki, ushbu hisob raqamiga oid ma'lumotlar to'liq emas yoki noto'g'ri (mamlakatni, raqamlarni va IBANni tekshiring).
+CreateAccount=Hisob yaratish
+NewBankAccount=Yangi hisob
+NewFinancialAccount=Yangi moliyaviy hisob
+MenuNewFinancialAccount=Yangi moliyaviy hisob
+EditFinancialAccount=Hisobni tahrirlash
+LabelBankCashAccount=Bank yoki pul yorlig'i
+AccountType=Hisob turi
+BankType0=Jamg'arma hisobi
+BankType1=Joriy yoki kredit karta hisobvarag'i
+BankType2=Naqd hisob
+AccountsArea=Hisoblar maydoni
+AccountCard=Hisob kartasi
+DeleteAccount=Hisobni o'chirish
+ConfirmDeleteAccount=Ushbu hisobni o'chirishni xohlaysizmi?
 Account=Account
-BankTransactionByCategories=Bank entries by categories
-BankTransactionForCategory=Bank entries for category <b>%s</b>
-RemoveFromRubrique=Remove link with category
-RemoveFromRubriqueConfirm=Are you sure you want to remove link between the entry and the category?
-ListBankTransactions=List of bank entries
-IdTransaction=Transaction ID
-BankTransactions=Bank entries
+BankTransactionByCategories=Toifalar bo'yicha bank yozuvlari
+BankTransactionForCategory=<b> %s </b> toifasi uchun bank yozuvlari
+RemoveFromRubrique=Kategoriya bilan havolani olib tashlang
+RemoveFromRubriqueConfirm=Kirish va toifadagi aloqani olib tashlamoqchimisiz?
+ListBankTransactions=Bank yozuvlari ro'yxati
+IdTransaction=Tranzaksiya identifikatori
+BankTransactions=Bank yozuvlari
 BankTransaction=Bank entry
-ListTransactions=List entries
-ListTransactionsByCategory=List entries/category
-TransactionsToConciliate=Entries to reconcile
+ListTransactions=Yozuvlar ro'yxati
+ListTransactionsByCategory=Ro'yxat yozuvlari / toifasi
+TransactionsToConciliate=Yarashtirish uchun yozuvlar
 TransactionsToConciliateShort=To reconcile
-Conciliable=Can be reconciled
-Conciliate=Reconcile
-Conciliation=Reconciliation
+Conciliable=Yarashtirilishi mumkin
+Conciliate=Yarashish
+Conciliation=Yarashish
 SaveStatementOnly=Save statement only
-ReconciliationLate=Reconciliation late
-IncludeClosedAccount=Include closed accounts
-OnlyOpenedAccount=Only open accounts
-AccountToCredit=Account to credit
-AccountToDebit=Account to debit
-DisableConciliation=Disable reconciliation feature for this account
-ConciliationDisabled=Reconciliation feature disabled
-LinkedToAConciliatedTransaction=Linked to a conciliated entry
-StatusAccountOpened=Open
-StatusAccountClosed=Closed
-AccountIdShort=Number
-LineRecord=Transaction
-AddBankRecord=Add entry
-AddBankRecordLong=Add entry manually
+ReconciliationLate=Yarashuv kech
+IncludeClosedAccount=Yopiq hisoblarni qo'shing
+OnlyOpenedAccount=Faqat hisoblarni oching
+AccountToCredit=Hisobni kreditlash uchun
+AccountToDebit=Hisobni chiqarish uchun
+DisableConciliation=Ushbu hisob uchun yarashtirish xususiyatini o'chirib qo'ying
+ConciliationDisabled=Yarashtirish xususiyati o'chirilgan
+LinkedToAConciliatedTransaction=Kelishilgan yozuv bilan bog'langan
+StatusAccountOpened=Ochiq
+StatusAccountClosed=Yopiq
+AccountIdShort=Raqam
+LineRecord=Tranzaksiya
+AddBankRecord=Kirish kiritish
+AddBankRecordLong=Kiritishni qo'lda qo'shing
 Conciliated=Reconciled
-ConciliatedBy=Reconciled by
-DateConciliating=Reconcile date
-BankLineConciliated=Entry reconciled with bank receipt
-Reconciled=Reconciled
-NotReconciled=Not reconciled
-CustomerInvoicePayment=Customer payment
-SupplierInvoicePayment=Vendor payment
-SubscriptionPayment=Subscription payment
-WithdrawalPayment=Debit payment order
-SocialContributionPayment=Social/fiscal tax payment
-BankTransfer=Credit transfer
-BankTransfers=Credit transfers
-MenuBankInternalTransfer=Internal transfer
-TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
-TransferFrom=From
-TransferTo=To
+ConciliatedBy=Tomonidan yarashtirildi
+DateConciliating=Sana yarashtirildi
+BankLineConciliated=Kirish bank kvitansiyasi bilan taqqoslangan
+Reconciled=Yarashtirildi
+NotReconciled=Yarashtirilmagan
+CustomerInvoicePayment=Mijozlar uchun to'lov
+SupplierInvoicePayment=Sotuvchining to'lovi
+SubscriptionPayment=Obuna to'lovi
+WithdrawalPayment=Debet bo'yicha to'lov topshirig'i
+SocialContributionPayment=Ijtimoiy / soliq soliq to'lovi
+BankTransfer=Kredit o'tkazish
+BankTransfers=Kredit o'tkazmalari
+MenuBankInternalTransfer=Ichki transfer
+TransferDesc=Bir hisobdan boshqasiga o'tkazish uchun ichki o'tkazmalardan foydalaning, ilova ikkita yozuv yozadi: manba hisobvarag'idagi debet va maqsadli hisobdagi kredit. Ushbu bitim uchun xuddi shu miqdor, yorliq va sana ishlatiladi.
+TransferFrom=Kimdan
+TransferTo=Kimga
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
-CheckTransmitter=Sender
-ValidateCheckReceipt=Validate this check receipt?
-ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
-DeleteCheckReceipt=Delete this check receipt?
-ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
-BankChecks=Bank checks
-BankChecksToReceipt=Checks awaiting deposit
+CheckTransmitter=Yuboruvchi
+ValidateCheckReceipt=Ushbu chek kvitansiyasi tasdiqlansinmi?
+ConfirmValidateCheckReceipt=Ushbu chek kvitansiyasini tasdiqlash uchun topshirmoqchi ekanligingizga aminmisiz? Hech qanday o'zgartirish mumkin emas.
+DeleteCheckReceipt=Ushbu chek kvitansiyasi o'chirilsinmi?
+ConfirmDeleteCheckReceipt=Ushbu chek kvitansiyasini o'chirishni xohlaysizmi?
+BankChecks=Bank cheklari
+BankChecksToReceipt=Depozitni kutayotgan cheklar
 BankChecksToReceiptShort=Checks awaiting deposit
-ShowCheckReceipt=Show check deposit receipt
-NumberOfCheques=No. of check
-DeleteTransaction=Delete entry
-ConfirmDeleteTransaction=Are you sure you want to delete this entry?
-ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
-BankMovements=Movements
-PlannedTransactions=Planned entries
-Graph=Graphs
-ExportDataset_banque_1=Bank entries and account statement
-ExportDataset_banque_2=Deposit slip
-TransactionOnTheOtherAccount=Transaction on the other account
-PaymentNumberUpdateSucceeded=Payment number updated successfully
-PaymentNumberUpdateFailed=Payment number could not be updated
-PaymentDateUpdateSucceeded=Payment date updated successfully
-PaymentDateUpdateFailed=Payment date could not be updated
-Transactions=Transactions
-BankTransactionLine=Bank entry
-AllAccounts=All bank and cash accounts
-BackToAccount=Back to account
-ShowAllAccounts=Show for all accounts
-FutureTransaction=Future transaction. Unable to reconcile.
-SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
-InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
-EventualyAddCategory=Eventually, specify a category in which to classify the records
-ToConciliate=To reconcile?
-ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
-DefaultRIB=Default BAN
-AllRIB=All BAN
-LabelRIB=BAN Label
-NoBANRecord=No BAN record
-DeleteARib=Delete BAN record
-ConfirmDeleteRib=Are you sure you want to delete this BAN record?
-RejectCheck=Check returned
-ConfirmRejectCheck=Are you sure you want to mark this check as rejected?
-RejectCheckDate=Date the check was returned
-CheckRejected=Check returned
-CheckRejectedAndInvoicesReopened=Check returned and invoices re-open
-BankAccountModelModule=Document templates for bank accounts
-DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
-DocumentModelBan=Template to print a page with BAN information.
+ShowCheckReceipt=Chek depozit kvitansiyasini ko'rsating
+NumberOfCheques=Chek raqami
+DeleteTransaction=Kirishni o'chirish
+ConfirmDeleteTransaction=Ushbu yozuvni o'chirishni xohlaysizmi?
+ThisWillAlsoDeleteBankRecord=Bu shuningdek yaratilgan bank yozuvlarini o'chirib tashlaydi
+BankMovements=Harakatlar
+PlannedTransactions=Rejalashtirilgan yozuvlar
+Graph=Grafiklar
+ExportDataset_banque_1=Bank yozuvlari va hisobvarag'idan ko'chirma
+ExportDataset_banque_2=Depozit taloni
+TransactionOnTheOtherAccount=Boshqa hisobvaraq bo'yicha operatsiyalar
+PaymentNumberUpdateSucceeded=To'lov raqami muvaffaqiyatli yangilandi
+PaymentNumberUpdateFailed=To'lov raqami yangilanmadi
+PaymentDateUpdateSucceeded=To'lov sanasi muvaffaqiyatli yangilandi
+PaymentDateUpdateFailed=To'lov sanasini yangilab bo'lmadi
+Transactions=Tranzaksiyalar
+BankTransactionLine=Bank yozuvlari
+AllAccounts=Barcha bank va naqd hisobvaraqlar
+BackToAccount=Hisobga qaytish
+ShowAllAccounts=Barcha hisoblar uchun ko'rsatish
+FutureTransaction=Kelajakdagi operatsiya. Yarashmayapti.
+SelectChequeTransactionAndGenerate=Chek depozit kvitansiyasiga kiritiladigan cheklarni tanlang / filtrlang. Keyin, "Yaratish" tugmasini bosing.
+InputReceiptNumber=Yarashtirish bilan bog'liq bank bayonnomasini tanlang. Tartiblanadigan raqamli qiymatdan foydalaning: YYYYMM yoki YYYYMMDD
+EventualyAddCategory=Oxir-oqibat, yozuvlarni tasniflash uchun toifani ko'rsating
+ToConciliate=Yarashish uchunmi?
+ThenCheckLinesAndConciliate=So'ngra, bank ko'chirmasidagi satrlarni tekshiring va bosing
+DefaultRIB=Standart taqiq
+AllRIB=Hamma taqiq
+LabelRIB=BAN yorlig'i
+NoBANRecord=BAN yozuvlari yo'q
+DeleteARib=BAN yozuvini o'chirish
+ConfirmDeleteRib=Ushbu BAN yozuvini o'chirishni xohlaysizmi?
+RejectCheck=Chek qaytarildi
+ConfirmRejectCheck=Haqiqatan ham ushbu chekni rad etilgan deb belgilamoqchimisiz?
+RejectCheckDate=Chek qaytarilgan sana
+CheckRejected=Chek qaytarildi
+CheckRejectedAndInvoicesReopened=Qaytganligini tekshiring va hisob-fakturalarni qayta oching
+BankAccountModelModule=Bank hisobvaraqlari uchun hujjatlar shablonlari
+DocumentModelSepaMandate=SEPA mandatining shabloni. Faqatgina Evropa Ittifoqidagi Evropa mamlakatlari uchun foydalidir.
+DocumentModelBan=BAN ma'lumotlari bilan sahifani chop etish uchun shablon.
 NewVariousPayment=New miscellaneous payment
 VariousPayment=Miscellaneous payment
 VariousPayments=Miscellaneous payments
diff --git a/htdocs/langs/uz_UZ/bills.lang b/htdocs/langs/uz_UZ/bills.lang
index c55f483873b..a7d1da66661 100644
--- a/htdocs/langs/uz_UZ/bills.lang
+++ b/htdocs/langs/uz_UZ/bills.lang
@@ -1,217 +1,217 @@
 # Dolibarr language file - Source file is en_US - bills
-Bill=Invoice
-Bills=Invoices
-BillsCustomers=Customer invoices
-BillsCustomer=Customer invoice
-BillsSuppliers=Vendor invoices
-BillsCustomersUnpaid=Unpaid customer invoices
-BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
-BillsSuppliersUnpaid=Unpaid vendor invoices
-BillsSuppliersUnpaidForCompany=Unpaid vendors invoices for %s
-BillsLate=Late payments
-BillsStatistics=Customers invoices statistics
-BillsStatisticsSuppliers=Vendors invoices statistics
+Bill=Hisob-faktura
+Bills=Hisob-fakturalar
+BillsCustomers=Mijozlarning hisob-fakturalari
+BillsCustomer=Mijozlarning hisob-fakturasi
+BillsSuppliers=Sotuvchi hisob-fakturalari
+BillsCustomersUnpaid=To'lovsiz mijozlar uchun hisob-fakturalar
+BillsCustomersUnpaidForCompany=%s uchun to'lanmagan mijozlar uchun hisob-fakturalar
+BillsSuppliersUnpaid=To'lovsiz sotuvchi hisob-fakturalari
+BillsSuppliersUnpaidForCompany=%s uchun to'lanmagan sotuvchilarning hisob-fakturalari
+BillsLate=Kechiktirilgan to'lovlar
+BillsStatistics=Mijozlar hisob-fakturalari statistikasi
+BillsStatisticsSuppliers=Sotuvchilarning hisob-fakturalari statistikasi
 DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping
 DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter.
-DisabledBecauseNotErasable=Disabled because cannot be erased
-InvoiceStandard=Standard invoice
-InvoiceStandardAsk=Standard invoice
-InvoiceStandardDesc=This kind of invoice is the common invoice.
-InvoiceDeposit=Down payment invoice
-InvoiceDepositAsk=Down payment invoice
-InvoiceDepositDesc=This kind of invoice is done when a down payment has been received.
-InvoiceProForma=Proforma invoice
-InvoiceProFormaAsk=Proforma invoice
-InvoiceProFormaDesc=<b>Proforma invoice</b> is an image of a true invoice but has no accountancy value.
-InvoiceReplacement=Replacement invoice
-InvoiceReplacementAsk=Replacement invoice for invoice
-InvoiceReplacementDesc=<b>Replacement invoice</b> is used to completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
-InvoiceAvoir=Credit note
-InvoiceAvoirAsk=Credit note to correct invoice
-InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice shows an amount that differs from the amount actually paid (eg the customer paid too much by mistake, or will not pay the complete amount since some products were returned).
-invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
-invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
-invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
-ReplaceInvoice=Replace invoice %s
-ReplacementInvoice=Replacement invoice
-ReplacedByInvoice=Replaced by invoice %s
-ReplacementByInvoice=Replaced by invoice
-CorrectInvoice=Correct invoice %s
-CorrectionInvoice=Correction invoice
-UsedByInvoice=Used to pay invoice %s
-ConsumedBy=Consumed by
-NotConsumed=Not consumed
-NoReplacableInvoice=No replaceable invoices
-NoInvoiceToCorrect=No invoice to correct
-InvoiceHasAvoir=Was source of one or several credit notes
-CardBill=Invoice card
-PredefinedInvoices=Predefined Invoices
-Invoice=Invoice
+DisabledBecauseNotErasable=O'chirilganligi sababli o'chirib qo'yilgan
+InvoiceStandard=Standart hisob-faktura
+InvoiceStandardAsk=Standart hisob-faktura
+InvoiceStandardDesc=Ushbu turdagi schyot-faktura umumiy hisob-fakturadir.
+InvoiceDeposit=Dastlabki hisob-faktura
+InvoiceDepositAsk=Dastlabki hisob-faktura
+InvoiceDepositDesc=Bunday hisob-faktura dastlabki to'lov kelib tushganda amalga oshiriladi.
+InvoiceProForma=Dastlabki hisob
+InvoiceProFormaAsk=Dastlabki hisob
+InvoiceProFormaDesc= <b> Proforma hisob-fakturasi </b> haqiqiy fakturaning tasviridir, ammo buxgalteriya qiymati yo'q.
+InvoiceReplacement=O'zgartirilgan hisob-faktura
+InvoiceReplacementAsk=Hisob-fakturani almashtirish
+InvoiceReplacementDesc= <b> zaxira hisob-fakturasi </b> allaqachon qabul qilinmagan to'lovsiz hisob-fakturani to'liq almashtirish uchun ishlatiladi. <br> <br> Eslatma: Faqat to'lovi bo'lmagan hisob-fakturalarni almashtirish mumkin. Agar siz almashtirgan hisob-faktura hali yopilmagan bo'lsa, u avtomatik ravishda "tashlab qo'yilgan" uchun yopiladi.
+InvoiceAvoir=Kredit eslatma
+InvoiceAvoirAsk=Hisob-fakturani tuzatish uchun kredit yozuvi
+InvoiceAvoirDesc=<b> kredit notasi </b> - bu fakturada haqiqatda to'langan summadan farq qiladigan summani ko'rsatishini tuzatish uchun ishlatiladigan salbiy hisob-kitob (masalan, mijoz xato bilan juda ko'p to'lagan yoki ba'zi mahsulotlar qaytarib berilgandan beri to'liq summani to'lamaydi). .
+invoiceAvoirWithLines=Hisob-fakturadan chiziqlar bilan kredit yozuvini yarating
+invoiceAvoirWithPaymentRestAmount=Qabul qilinmagan kelib tushgan schyot-fakturani qo'shib, kredit yozuvini yarating
+invoiceAvoirLineWithPaymentRestAmount=Qolgan to'lanmagan miqdor uchun kredit eslatmasi
+ReplaceInvoice=%s hisob-fakturasini almashtiring
+ReplacementInvoice=O'zgartirilgan hisob-faktura
+ReplacedByInvoice=%s hisob-fakturasi bilan almashtirildi
+ReplacementByInvoice=Hisob-faktura bilan almashtirildi
+CorrectInvoice=%s to'g'ri hisob-fakturasi
+CorrectionInvoice=Tuzatish fakturasi
+UsedByInvoice=%s hisob-fakturasini to'lash uchun foydalaniladi
+ConsumedBy=Tomonidan iste'mol qilinadi
+NotConsumed=Iste'mol qilinmaydi
+NoReplacableInvoice=O'zgartiriladigan schyotlar yo'q
+NoInvoiceToCorrect=Tuzatish uchun hisob-faktura yo'q
+InvoiceHasAvoir=Bir yoki bir nechta kredit yozuvlari manbai bo'lgan
+CardBill=Hisob-faktura kartasi
+PredefinedInvoices=Oldindan belgilangan hisob-fakturalar
+Invoice=Hisob-faktura
 PdfInvoiceTitle=Invoice
-Invoices=Invoices
-InvoiceLine=Invoice line
-InvoiceCustomer=Customer invoice
-CustomerInvoice=Customer invoice
-CustomersInvoices=Customer invoices
-SupplierInvoice=Vendor invoice
-SuppliersInvoices=Vendor invoices
+Invoices=Hisob-fakturalar
+InvoiceLine=Hisob-faktura chizig'i
+InvoiceCustomer=Mijozlarning hisob-fakturasi
+CustomerInvoice=Mijozlarning hisob-fakturasi
+CustomersInvoices=Mijozlarning hisob-fakturalari
+SupplierInvoice=Sotuvchi hisob-fakturasi
+SuppliersInvoices=Sotuvchi hisob-fakturalari
 SupplierInvoiceLines=Vendor invoice lines
-SupplierBill=Vendor invoice
-SupplierBills=Vendor invoices
-Payment=Payment
-PaymentBack=Refund
-CustomerInvoicePaymentBack=Refund
-Payments=Payments
-PaymentsBack=Refunds
-paymentInInvoiceCurrency=in invoices currency
-PaidBack=Paid back
-DeletePayment=Delete payment
-ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this %s into an available credit?
+SupplierBill=Sotuvchi hisob-fakturasi
+SupplierBills=Sotuvchi hisob-fakturalari
+Payment=To'lov
+PaymentBack=Pulni qaytarish
+CustomerInvoicePaymentBack=Pulni qaytarish
+Payments=To'lovlar
+PaymentsBack=Pulni qaytarish
+paymentInInvoiceCurrency=hisob-fakturalar valyutasida
+PaidBack=Qaytib to'langan
+DeletePayment=To'lovni o'chirib tashlang
+ConfirmDeletePayment=Haqiqatan ham ushbu to'lovni o'chirishni xohlaysizmi?
+ConfirmConvertToReduc=Ushbu %s-ni mavjud kreditga aylantirmoqchimisiz?
 ConfirmConvertToReduc2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
 ConfirmConvertToReducSupplier=Do you want to convert this %s into an available credit?
 ConfirmConvertToReducSupplier2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
-SupplierPayments=Vendor payments
-ReceivedPayments=Received payments
-ReceivedCustomersPayments=Payments received from customers
-PayedSuppliersPayments=Payments paid to vendors
-ReceivedCustomersPaymentsToValid=Received customers payments to validate
-PaymentsReportsForYear=Payments reports for %s
-PaymentsReports=Payments reports
-PaymentsAlreadyDone=Payments already done
-PaymentsBackAlreadyDone=Refunds already done
-PaymentRule=Payment rule
-PaymentMode=Payment Type
+SupplierPayments=Sotuvchi uchun to'lovlar
+ReceivedPayments=Qabul qilingan to'lovlar
+ReceivedCustomersPayments=Mijozlardan olingan to'lovlar
+PayedSuppliersPayments=Sotuvchilarga to'lanadigan to'lovlar
+ReceivedCustomersPaymentsToValid=Tasdiqlash uchun mijozlarga to'lovlarni qabul qildi
+PaymentsReportsForYear=%s uchun to'lovlar bo'yicha hisobotlar
+PaymentsReports=To'lovlar to'g'risida hisobotlar
+PaymentsAlreadyDone=To'lovlar allaqachon amalga oshirilgan
+PaymentsBackAlreadyDone=Pulni qaytarish allaqachon amalga oshirilgan
+PaymentRule=To'lov qoidasi
+PaymentMode=To'lov turi
 DefaultPaymentMode=Default Payment Type
 DefaultBankAccount=Default Bank Account
-PaymentTypeDC=Debit/Credit Card
+PaymentTypeDC=Debet / kredit karta
 PaymentTypePP=PayPal
-IdPaymentMode=Payment Type (id)
-CodePaymentMode=Payment Type (code)
-LabelPaymentMode=Payment Type (label)
-PaymentModeShort=Payment Type
-PaymentTerm=Payment Term
-PaymentConditions=Payment Terms
-PaymentConditionsShort=Payment Terms
-PaymentAmount=Payment amount
-PaymentHigherThanReminderToPay=Payment higher than reminder to pay
-HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
-ClassifyPaid=Classify 'Paid'
+IdPaymentMode=To'lov turi (id)
+CodePaymentMode=To'lov turi (kod)
+LabelPaymentMode=To'lov turi (yorliq)
+PaymentModeShort=To'lov turi
+PaymentTerm=To'lov muddati
+PaymentConditions=To'lov shartlari
+PaymentConditionsShort=To'lov shartlari
+PaymentAmount=To'lov miqdori
+PaymentHigherThanReminderToPay=To'lov to'lashni eslatgandan yuqori
+HelpPaymentHigherThanReminderToPay=E'tibor bering, bir yoki bir nechta veksellarni to'lash miqdori to'lash kerak bo'lgan miqdoridan yuqori. <br> yozuvingizni tahrirlang, aks holda har bir ortiqcha to'langan hisob-faktura uchun olingan ortiqcha uchun kredit yozuvini yaratishni tasdiqlang va ko'rib chiqing.
+HelpPaymentHigherThanReminderToPaySupplier=E'tibor bering, bir yoki bir nechta veksellarni to'lash miqdori to'lash kerak bo'lgan miqdoridan yuqori. <br> yozuvingizni tahrirlang, aks holda har bir ortiqcha to'langan hisob-faktura uchun to'langan ortiqcha uchun kredit yozuvini yaratishni tasdiqlang va ko'rib chiqing.
+ClassifyPaid="Pulli" deb tasniflang
 ClassifyUnPaid=Classify 'Unpaid'
-ClassifyPaidPartially=Classify 'Paid partially'
-ClassifyCanceled=Classify 'Abandoned'
-ClassifyClosed=Classify 'Closed'
-ClassifyUnBilled=Classify 'Unbilled'
-CreateBill=Create Invoice
-CreateCreditNote=Create credit note
-AddBill=Create invoice or credit note
-AddToDraftInvoices=Add to draft invoice
-DeleteBill=Delete invoice
-SearchACustomerInvoice=Search for a customer invoice
-SearchASupplierInvoice=Search for a vendor invoice
-CancelBill=Cancel an invoice
-SendRemindByMail=Send reminder by email
-DoPayment=Enter payment
-DoPaymentBack=Enter refund
-ConvertToReduc=Mark as credit available
-ConvertExcessReceivedToReduc=Convert excess received into available credit
+ClassifyPaidPartially="Qisman to'langan" deb tasniflang
+ClassifyCanceled="Tashlab ketilgan" deb tasniflang
+ClassifyClosed="Yopiq" deb tasniflash
+ClassifyUnBilled="Hisob-kitob qilinmagan" tasnifi
+CreateBill=Hisob-fakturani yarating
+CreateCreditNote=Kredit yozuvini yarating
+AddBill=Hisob-fakturani yoki kredit yozuvini yarating
+AddToDraftInvoices=Hisob-fakturaga qo'shish
+DeleteBill=Hisob-fakturani o'chirish
+SearchACustomerInvoice=Mijozlarning hisob-fakturasini qidirib toping
+SearchASupplierInvoice=Sotuvchi hisob-fakturasini qidirib toping
+CancelBill=Hisob-fakturani bekor qilish
+SendRemindByMail=Elektron pochta orqali eslatma yuboring
+DoPayment=To'lovni kiriting
+DoPaymentBack=Qaytarishni kiriting
+ConvertToReduc=Kredit mavjud deb belgilang
+ConvertExcessReceivedToReduc=Qabul qilingan ortiqcha miqdorni mavjud kreditga aylantiring
 ConvertExcessPaidToReduc=Convert excess paid into available discount
-EnterPaymentReceivedFromCustomer=Enter payment received from customer
-EnterPaymentDueToCustomer=Make payment due to customer
-DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
-PriceBase=Base price
-BillStatus=Invoice status
-StatusOfGeneratedInvoices=Status of generated invoices
-BillStatusDraft=Draft (needs to be validated)
-BillStatusPaid=Paid
-BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
-BillStatusConverted=Paid (ready for consumption in final invoice)
-BillStatusCanceled=Abandoned
-BillStatusValidated=Validated (needs to be paid)
-BillStatusStarted=Started
-BillStatusNotPaid=Not paid
-BillStatusNotRefunded=Not refunded
-BillStatusClosedUnpaid=Closed (unpaid)
-BillStatusClosedPaidPartially=Paid (partially)
-BillShortStatusDraft=Draft
-BillShortStatusPaid=Paid
-BillShortStatusPaidBackOrConverted=Refunded or converted
+EnterPaymentReceivedFromCustomer=Mijozdan olingan to'lovni kiriting
+EnterPaymentDueToCustomer=Mijozga tegishli to'lovni amalga oshiring
+DisabledBecauseRemainderToPayIsZero=O'chirilgan, chunki to'lovsiz qolgan nolga teng
+PriceBase=Asosiy narx
+BillStatus=Hisob-faktura holati
+StatusOfGeneratedInvoices=Tuzilgan hisob-fakturalarning holati
+BillStatusDraft=Qoralama (tasdiqlanishi kerak)
+BillStatusPaid=To'langan
+BillStatusPaidBackOrConverted=Kredit yozuvini qaytarish yoki kredit sifatida belgilangan
+BillStatusConverted=Pulli (oxirgi hisob-fakturada iste'mol qilishga tayyor)
+BillStatusCanceled=Tashlab ketilgan
+BillStatusValidated=Tasdiqlangan (to'lash kerak)
+BillStatusStarted=Boshlandi
+BillStatusNotPaid=To'lanmaydi
+BillStatusNotRefunded=Pul qaytarilmaydi
+BillStatusClosedUnpaid=Yopiq (to'lanmagan)
+BillStatusClosedPaidPartially=Pulli (qisman)
+BillShortStatusDraft=Qoralama
+BillShortStatusPaid=To'langan
+BillShortStatusPaidBackOrConverted=Qaytarilgan yoki konvertatsiya qilingan
 Refunded=Refunded
-BillShortStatusConverted=Paid
-BillShortStatusCanceled=Abandoned
-BillShortStatusValidated=Validated
-BillShortStatusStarted=Started
-BillShortStatusNotPaid=Not paid
-BillShortStatusNotRefunded=Not refunded
-BillShortStatusClosedUnpaid=Closed
-BillShortStatusClosedPaidPartially=Paid (partially)
-PaymentStatusToValidShort=To validate
-ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
-ErrorNoPaiementModeConfigured=No default payment type defined. Go to Invoice module setup to fix this.
-ErrorCreateBankAccount=Create a bank account, then go to Setup panel of Invoice module to define payment types
-ErrorBillNotFound=Invoice %s does not exist
-ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
-ErrorDiscountAlreadyUsed=Error, discount already used
-ErrorInvoiceAvoirMustBeNegative=Error, correct invoice must have a negative amount
-ErrorInvoiceOfThisTypeMustBePositive=Error, this type of invoice must have an amount excluding tax positive (or null)
-ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice that has been replaced by another invoice that is still in draft status
+BillShortStatusConverted=To'langan
+BillShortStatusCanceled=Tashlab ketilgan
+BillShortStatusValidated=Tasdiqlangan
+BillShortStatusStarted=Boshlandi
+BillShortStatusNotPaid=To'lanmaydi
+BillShortStatusNotRefunded=Pul qaytarilmaydi
+BillShortStatusClosedUnpaid=Yopiq
+BillShortStatusClosedPaidPartially=Pulli (qisman)
+PaymentStatusToValidShort=Tasdiqlash uchun
+ErrorVATIntraNotConfigured=Jamiyat ichi QQS raqami hali aniqlanmagan
+ErrorNoPaiementModeConfigured=Standart to'lov turi aniqlanmagan. Buni tuzatish uchun faktura modulini o'rnatishga o'ting.
+ErrorCreateBankAccount=Bank hisobini yarating, so'ngra to'lov turlarini aniqlash uchun Hisob-faktura modulini o'rnatish paneliga o'ting
+ErrorBillNotFound=%s hisob-fakturasi mavjud emas
+ErrorInvoiceAlreadyReplaced=Xato, siz hisob-fakturani %s o'rniga almashtirish uchun tasdiqlashga harakat qildingiz. Ammo bu allaqachon hisob-faktura bilan almashtirilgan %s.
+ErrorDiscountAlreadyUsed=Xato, chegirma allaqachon ishlatilgan
+ErrorInvoiceAvoirMustBeNegative=Xato, to'g'ri hisob-fakturada salbiy miqdor bo'lishi kerak
+ErrorInvoiceOfThisTypeMustBePositive=Xato, ushbu turdagi hisob-fakturada soliqdan tashqari (yoki bekor qilingan) soliq miqdori bo'lmagan miqdor bo'lishi kerak
+ErrorCantCancelIfReplacementInvoiceNotValidated=Xato, boshqa hisob-faktura bilan almashtirilgan fakturani bekor qilish mumkin emas
 ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
-BillFrom=From
-BillTo=To
-ActionsOnBill=Actions on invoice
-RecurringInvoiceTemplate=Template / Recurring invoice
-NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
-FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
-NotARecurringInvoiceTemplate=Not a recurring template invoice
-NewBill=New invoice
-LastBills=Latest %s invoices
+BillFrom=Kimdan
+BillTo=Kimga
+ActionsOnBill=Hisob-fakturadagi harakatlar
+RecurringInvoiceTemplate=Shablon / Takroriy hisob-faktura
+NoQualifiedRecurringInvoiceTemplateFound=Avlodga mos keladigan takrorlanadigan shablon hisob-fakturasi yo'q.
+FoundXQualifiedRecurringInvoiceTemplate=%s takrorlanadigan shablon hisob-fakturalari (lar) ni yaratish uchun mos deb topildi.
+NotARecurringInvoiceTemplate=Takrorlanadigan shablon hisob-fakturasi emas
+NewBill=Yangi hisob-faktura
+LastBills=Oxirgi %s hisob-fakturalari
 LatestTemplateInvoices=Latest %s template invoices
 LatestCustomerTemplateInvoices=Latest %s customer template invoices
 LatestSupplierTemplateInvoices=Latest %s vendor template invoices
-LastCustomersBills=Latest %s customer invoices
-LastSuppliersBills=Latest %s vendor invoices
-AllBills=All invoices
+LastCustomersBills=%s mijozlarining so'nggi hisob-fakturalari
+LastSuppliersBills=Oxirgi %s sotuvchisi hisob-fakturalari
+AllBills=Barcha hisob-fakturalar
 AllCustomerTemplateInvoices=All template invoices
-OtherBills=Other invoices
-DraftBills=Draft invoices
-CustomersDraftInvoices=Customer draft invoices
-SuppliersDraftInvoices=Vendor draft invoices
-Unpaid=Unpaid
+OtherBills=Boshqa hisob-fakturalar
+DraftBills=Hisob-fakturalar
+CustomersDraftInvoices=Xaridorlarning hisob-fakturalari
+SuppliersDraftInvoices=Xaridor hisob-fakturalari
+Unpaid=To'lanmagan
 ErrorNoPaymentDefined=Error No payment defined
-ConfirmDeleteBill=Are you sure you want to delete this invoice?
-ConfirmValidateBill=Are you sure you want to validate this invoice with reference <b>%s</b>?
-ConfirmUnvalidateBill=Are you sure you want to change invoice <b>%s</b> to draft status?
-ConfirmClassifyPaidBill=Are you sure you want to change invoice <b>%s</b> to status paid?
-ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b>?
-ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'?
-ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid?
-ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What is the reason for closing this invoice?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularize the VAT with a credit note.
+ConfirmDeleteBill=Ushbu hisob-fakturani o'chirishni xohlaysizmi?
+ConfirmValidateBill=Ushbu fakturani <b> %s </b> ma'lumotnomasi bilan tasdiqlamoqchimisiz?
+ConfirmUnvalidateBill=Hisob-fakturani <b> %s </b> holatini qoralama holatiga o'zgartirishni xohlaysizmi?
+ConfirmClassifyPaidBill=Hisob-fakturani <b> %s </b> ni to'langan holatga o'zgartirishni xohlaysizmi?
+ConfirmCancelBill=Hisob-fakturani bekor qilishni xohlaysizmi <b> %s </b>?
+ConfirmCancelBillQuestion=Nima uchun ushbu hisob-fakturani "tashlab qo'yilgan" deb tasniflashni xohlaysiz?
+ConfirmClassifyPaidPartially=Hisob-fakturani <b> %s </b> ni to'langan holatga o'zgartirishni xohlaysizmi?
+ConfirmClassifyPaidPartiallyQuestion=Ushbu hisob-faktura to'liq to'lanmagan. Ushbu hisob-fakturani yopish sababi nima?
+ConfirmClassifyPaidPartiallyReasonAvoir=Qolgan to'lanmagan <b> (%s %s) </b> - bu chegirma, chunki to'lov muddatidan oldin amalga oshirilgan. Men QQSni kredit yozuvlari bilan tartibga solaman.
 ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
-ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer
-ConfirmClassifyPaidPartiallyReasonProductReturned=Products partially returned
-ConfirmClassifyPaidPartiallyReasonOther=Amount abandoned for other reason
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
-ConfirmClassifyPaidPartiallyReasonAvoirDesc=Use this choice if all other does not suit
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
-ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=This choice is used when payment is not complete because some of products were returned
-ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
-ConfirmClassifyAbandonReasonOther=Other
-ConfirmClassifyAbandonReasonOtherDesc=This choice will be used in all other cases. For example because you plan to create a replacing invoice.
-ConfirmCustomerPayment=Do you confirm this payment input for <b>%s</b> %s?
-ConfirmSupplierPayment=Do you confirm this payment input for <b>%s</b> %s?
-ConfirmValidatePayment=Are you sure you want to validate this payment? No change can be made once payment is validated.
-ValidateBill=Validate invoice
-UnvalidateBill=Unvalidate invoice
-NumberOfBills=No. of invoices
-NumberOfBillsByMonth=No. of invoices per month
-AmountOfBills=Amount of invoices
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Qolgan to'lanmagan <b> (%s %s) </b> - bu chegirma, chunki to'lov muddatidan oldin amalga oshirilgan. Ushbu chegirmada QQSni yo'qotishni qabul qilaman.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Qolgan to'lanmagan <b> (%s %s) </b> - bu chegirma, chunki to'lov muddatidan oldin amalga oshirilgan. Men ushbu chegirma bo'yicha QQSni kredit yozuvisiz qaytarib olaman.
+ConfirmClassifyPaidPartiallyReasonBadCustomer=Yomon mijoz
+ConfirmClassifyPaidPartiallyReasonProductReturned=Mahsulotlar qisman qaytarildi
+ConfirmClassifyPaidPartiallyReasonOther=Miqdor boshqa sabablarga ko'ra qoldirilgan
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Ushbu tanlov sizning hisob-fakturangizga tegishli izohlar bilan ta'minlangan bo'lsa mumkin. (Masalan «Faqatgina to'langan narxga mos keladigan soliq chegirma huquqini beradi»)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=Ba'zi mamlakatlarda bu tanlov sizning fakturangizda to'g'ri yozuvlar mavjud bo'lganda bo'lishi mumkin.
+ConfirmClassifyPaidPartiallyReasonAvoirDesc=Agar boshqalari mos kelmasa, ushbu tanlovdan foydalaning
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=<b> yomon mijoz </b> - qarzini to'lashdan bosh tortgan mijoz.
+ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Ushbu tanlov to'lov to'liq bo'lmaganda ishlatiladi, chunki ba'zi mahsulotlar qaytarib berildi
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Agar boshqalar mos kelmasa, ushbu tanlovdan foydalaning, masalan quyidagi vaziyatda: <br> - to'lov to'liq emas, chunki ba'zi mahsulotlar orqaga jo'natildi kredit yozuvini yaratish orqali buxgalteriya tizimida.
+ConfirmClassifyAbandonReasonOther=Boshqalar
+ConfirmClassifyAbandonReasonOtherDesc=Ushbu tanlov boshqa barcha hollarda qo'llaniladi. Masalan, siz hisob-fakturani almashtirishni rejalashtirganingiz uchun.
+ConfirmCustomerPayment=<b> %s </b> %s uchun ushbu to'lov kiritilishini tasdiqlaysizmi?
+ConfirmSupplierPayment=<b> %s </b> %s uchun ushbu to'lov kiritilishini tasdiqlaysizmi?
+ConfirmValidatePayment=Ushbu to'lovni tasdiqlamoqchimisiz? To'lov tasdiqlangandan keyin hech qanday o'zgartirish kiritilmaydi.
+ValidateBill=Hisob-fakturani tasdiqlang
+UnvalidateBill=Hisob-faktura yaroqsiz
+NumberOfBills=Hisob-fakturalar soni
+NumberOfBillsByMonth=Oyiga hisob-fakturalar soni
+AmountOfBills=Hisob-fakturalar miqdori
 AmountOfBillsHT=Amount of invoices (net of tax)
-AmountOfBillsByMonthHT=Amount of invoices by month (net of tax)
+AmountOfBillsByMonthHT=Hisob-fakturalarning oy bo'yicha miqdori (soliqni hisobga olmaganda)
 UseSituationInvoices=Allow situation invoice
 UseSituationInvoicesCreditNote=Allow situation invoice credit note
 Retainedwarranty=Retained warranty
@@ -229,348 +229,349 @@ setretainedwarranty=Set retained warranty
 setretainedwarrantyDateLimit=Set retained warranty date limit
 RetainedWarrantyDateLimit=Retained warranty date limit
 RetainedWarrantyNeed100Percent=The situation invoice need to be at 100%% progress to be displayed on PDF
-AlreadyPaid=Already paid
-AlreadyPaidBack=Already paid back
-AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and down payments)
-Abandoned=Abandoned
-RemainderToPay=Remaining unpaid
-RemainderToTake=Remaining amount to take
-RemainderToPayBack=Remaining amount to refund
-Rest=Pending
-AmountExpected=Amount claimed
-ExcessReceived=Excess received
+AlreadyPaid=Allaqachon to'langan
+AlreadyPaidBack=Qaytib to'langan
+AlreadyPaidNoCreditNotesNoDeposits=Oldindan to'langan (kredit yozuvlari va dastlabki to'lovlarsiz)
+Abandoned=Tashlab ketilgan
+RemainderToPay=Qolganlari to'lanmagan
+RemainderToTake=Qolgan miqdor
+RemainderToPayBack=Pulni qaytarish uchun qolgan mablag '
+Rest=Kutilmoqda
+AmountExpected=Da'vo qilingan miqdor
+ExcessReceived=Ortiqcha olingan
 ExcessPaid=Excess paid
-EscompteOffered=Discount offered (payment before term)
-EscompteOfferedShort=Discount
-SendBillRef=Submission of invoice %s
-SendReminderBillRef=Submission of invoice %s (reminder)
-NoDraftBills=No draft invoices
-NoOtherDraftBills=No other draft invoices
-NoDraftInvoices=No draft invoices
-RefBill=Invoice ref
-ToBill=To bill
-RemainderToBill=Remainder to bill
-SendBillByMail=Send invoice by email
-SendReminderBillByMail=Send reminder by email
-RelatedCommercialProposals=Related commercial proposals
-RelatedRecurringCustomerInvoices=Related recurring customer invoices
-MenuToValid=To valid
-DateMaxPayment=Payment due on
-DateInvoice=Invoice date
-DatePointOfTax=Point of tax
-NoInvoice=No invoice
-ClassifyBill=Classify invoice
-SupplierBillsToPay=Unpaid vendor invoices
-CustomerBillsUnpaid=Unpaid customer invoices
-NonPercuRecuperable=Non-recoverable
-SetConditions=Set Payment Terms
-SetMode=Set Payment Type
-SetRevenuStamp=Set revenue stamp
-Billed=Billed
-RecurringInvoices=Recurring invoices
-RepeatableInvoice=Template invoice
-RepeatableInvoices=Template invoices
-Repeatable=Template
-Repeatables=Templates
-ChangeIntoRepeatableInvoice=Convert into template invoice
-CreateRepeatableInvoice=Create template invoice
-CreateFromRepeatableInvoice=Create from template invoice
-CustomersInvoicesAndInvoiceLines=Customer invoices and invoice details
-CustomersInvoicesAndPayments=Customer invoices and payments
-ExportDataset_invoice_1=Customer invoices and invoice details
-ExportDataset_invoice_2=Customer invoices and payments
+EscompteOffered=Taklif qilingan chegirma (muddatidan oldin to'lov)
+EscompteOfferedShort=Chegirma
+SendBillRef=%s hisob-fakturasini taqdim etish
+SendReminderBillRef=%s hisob-fakturasini taqdim etish (eslatma)
+NoDraftBills=Hisob-fakturalar yo‘q
+NoOtherDraftBills=Boshqa hisob-fakturalar mavjud emas
+NoDraftInvoices=Hisob-fakturalar yo‘q
+RefBill=Hisob-faktura
+ToBill=Hisob-kitob qilish
+RemainderToBill=Hisob-kitob uchun qoldiq
+SendBillByMail=Hisob-fakturani elektron pochta orqali yuboring
+SendReminderBillByMail=Elektron pochta orqali eslatma yuboring
+RelatedCommercialProposals=Tegishli tijorat takliflari
+RelatedRecurringCustomerInvoices=Tegishli takrorlanadigan mijozlar hisob-fakturalari
+MenuToValid=Haqiqiy
+DateMaxPayment=To'lov muddati
+DateInvoice=Hisob-faktura sanasi
+DatePointOfTax=Soliq punkti
+NoInvoice=Hisob-faktura yo‘q
+NoOpenInvoice=No open invoice
+ClassifyBill=Hisob-fakturani tasniflang
+SupplierBillsToPay=To'lovsiz sotuvchi hisob-fakturalari
+CustomerBillsUnpaid=To'lovsiz mijozlar uchun hisob-fakturalar
+NonPercuRecuperable=Qayta tiklanmaydi
+SetConditions=To'lov shartlarini o'rnating
+SetMode=To'lov turini o'rnating
+SetRevenuStamp=Daromad shtampini o'rnating
+Billed=Hisob-kitob
+RecurringInvoices=Takroriy hisob-fakturalar
+RepeatableInvoice=Shablon hisob-fakturasi
+RepeatableInvoices=Shablon hisob-fakturalari
+Repeatable=Andoza
+Repeatables=Shablonlar
+ChangeIntoRepeatableInvoice=Shablon hisob-fakturasiga aylantirish
+CreateRepeatableInvoice=Shablon hisob-fakturasini yarating
+CreateFromRepeatableInvoice=Shablon hisob-fakturasidan yarating
+CustomersInvoicesAndInvoiceLines=Mijozlarning hisob-fakturalari va hisob-kitob ma'lumotlari
+CustomersInvoicesAndPayments=Mijozlarning hisob-kitoblari va to'lovlari
+ExportDataset_invoice_1=Mijozlarning hisob-fakturalari va hisob-kitob ma'lumotlari
+ExportDataset_invoice_2=Mijozlarning hisob-kitoblari va to'lovlari
 ProformaBill=Proforma Bill:
-Reduction=Reduction
-ReductionShort=Disc.
-Reductions=Reductions
-ReductionsShort=Disc.
-Discounts=Discounts
-AddDiscount=Create discount
-AddRelativeDiscount=Create relative discount
-EditRelativeDiscount=Edit relative discount
-AddGlobalDiscount=Create absolute discount
-EditGlobalDiscounts=Edit absolute discounts
-AddCreditNote=Create credit note
-ShowDiscount=Show discount
-ShowReduc=Show the discount
+Reduction=Kamaytirish
+ReductionShort=Disk.
+Reductions=Kamaytirish
+ReductionsShort=Disk.
+Discounts=Chegirmalar
+AddDiscount=Chegirma yarating
+AddRelativeDiscount=Nisbatan chegirma yarating
+EditRelativeDiscount=Nisbatan chegirmani tahrirlash
+AddGlobalDiscount=Mutlaq chegirma yarating
+EditGlobalDiscounts=Mutlaq chegirmalarni tahrirlash
+AddCreditNote=Kredit yozuvini yarating
+ShowDiscount=Chegirmani ko'rsating
+ShowReduc=Chegirmani ko'rsating
 ShowSourceInvoice=Show the source invoice
-RelativeDiscount=Relative discount
-GlobalDiscount=Global discount
-CreditNote=Credit note
-CreditNotes=Credit notes
+RelativeDiscount=Nisbatan chegirma
+GlobalDiscount=Global chegirma
+CreditNote=Kredit eslatma
+CreditNotes=Kredit yozuvlari
 CreditNotesOrExcessReceived=Credit notes or excess received
-Deposit=Down payment
-Deposits=Down payments
-DiscountFromCreditNote=Discount from credit note %s
-DiscountFromDeposit=Down payments from invoice %s
-DiscountFromExcessReceived=Payments in excess of invoice %s
+Deposit=Ilk to'lov
+Deposits=Dastlabki to'lovlar
+DiscountFromCreditNote=%s kredit notasidan chegirma
+DiscountFromDeposit=Hisob-fakturadan dastlabki to'lovlar %s
+DiscountFromExcessReceived=Hisob-fakturadan ortiqcha to'lovlar %s
 DiscountFromExcessPaid=Payments in excess of invoice %s
-AbsoluteDiscountUse=This kind of credit can be used on invoice before its validation
-CreditNoteDepositUse=Invoice must be validated to use this kind of credits
-NewGlobalDiscount=New absolute discount
-NewRelativeDiscount=New relative discount
+AbsoluteDiscountUse=Ushbu turdagi kreditni tasdiqlashdan oldin hisob-fakturada ishlatish mumkin
+CreditNoteDepositUse=Ushbu turdagi kreditlardan foydalanish uchun hisob-fakturani tasdiqlash kerak
+NewGlobalDiscount=Yangi mutlaq chegirma
+NewRelativeDiscount=Yangi nisbiy chegirma
 DiscountType=Discount type
-NoteReason=Note/Reason
-ReasonDiscount=Reason
-DiscountOfferedBy=Granted by
-DiscountStillRemaining=Discounts or credits available
-DiscountAlreadyCounted=Discounts or credits already consumed
+NoteReason=Izoh / sabab
+ReasonDiscount=Sabab
+DiscountOfferedBy=Tomonidan berilgan
+DiscountStillRemaining=Chegirmalar yoki kreditlar mavjud
+DiscountAlreadyCounted=Oldindan iste'mol qilingan chegirmalar yoki kreditlar
 CustomerDiscounts=Customer discounts
 SupplierDiscounts=Vendors discounts
-BillAddress=Bill address
-HelpEscompte=This discount is a discount granted to customer because payment was made before term.
-HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loss.
-HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example)
-IdSocialContribution=Social/fiscal tax payment id
-PaymentId=Payment id
-PaymentRef=Payment ref.
-InvoiceId=Invoice id
-InvoiceRef=Invoice ref.
-InvoiceDateCreation=Invoice creation date
-InvoiceStatus=Invoice status
-InvoiceNote=Invoice note
-InvoicePaid=Invoice paid
+BillAddress=Hisob-kitob manzili
+HelpEscompte=Ushbu chegirma mijozga berilgan chegirmadir, chunki to'lov muddatidan oldin amalga oshirilgan.
+HelpAbandonBadCustomer=Ushbu miqdordan voz kechildi (mijoz yomon mijoz deb aytdi) va bu juda katta zarar deb hisoblanadi.
+HelpAbandonOther=Ushbu miqdor xato bo'lganligi sababli qoldirildi (noto'g'ri mijoz yoki hisob-faktura boshqasiga almashtirildi)
+IdSocialContribution=Ijtimoiy / soliq soliq to'lovi identifikatori
+PaymentId=To'lov identifikatori
+PaymentRef=To'lov ref.
+InvoiceId=Hisob-faktura identifikatori
+InvoiceRef=Hisob-faktura
+InvoiceDateCreation=Hisob-fakturani yaratish sanasi
+InvoiceStatus=Hisob-faktura holati
+InvoiceNote=Hisob-faktura yozuvi
+InvoicePaid=Hisob-faktura to'landi
 InvoicePaidCompletely=Paid completely
 InvoicePaidCompletelyHelp=Invoice that are paid completely. This excludes invoices that are paid partially. To get list of all 'Closed' or non 'Closed' invoices, prefer to use a filter on the invoice status.
 OrderBilled=Order billed
 DonationPaid=Donation paid
-PaymentNumber=Payment number
-RemoveDiscount=Remove discount
-WatermarkOnDraftBill=Watermark on draft invoices (nothing if empty)
-InvoiceNotChecked=No invoice selected
-ConfirmCloneInvoice=Are you sure you want to clone this invoice <b>%s</b>?
-DisabledBecauseReplacedInvoice=Action disabled because invoice has been replaced
-DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only records with payments during the fixed year are included here.
-NbOfPayments=No. of payments
-SplitDiscount=Split discount in two
-ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into two smaller discounts?
-TypeAmountOfEachNewDiscount=Input amount for each of two parts:
-TotalOfTwoDiscountMustEqualsOriginal=The total of the two new discounts must be equal to the original discount amount.
-ConfirmRemoveDiscount=Are you sure you want to remove this discount?
-RelatedBill=Related invoice
-RelatedBills=Related invoices
-RelatedCustomerInvoices=Related customer invoices
-RelatedSupplierInvoices=Related vendor invoices
-LatestRelatedBill=Latest related invoice
-WarningBillExist=Warning, one or more invoices already exist
-MergingPDFTool=Merging PDF tool
-AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
-PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company
-PaymentNote=Payment note
-ListOfPreviousSituationInvoices=List of previous situation invoices
-ListOfNextSituationInvoices=List of next situation invoices
+PaymentNumber=To'lov raqami
+RemoveDiscount=Chegirmani olib tashlang
+WatermarkOnDraftBill=Hisob-fakturalardagi suv belgisi (bo'sh bo'lsa, hech narsa yo'q)
+InvoiceNotChecked=Hisob-faktura tanlanmagan
+ConfirmCloneInvoice=Ushbu fakturani klonlamoqchimisiz <b> %s </b>?
+DisabledBecauseReplacedInvoice=Hisob-faktura almashtirilganligi sababli harakat o'chirib qo'yildi
+DescTaxAndDividendsArea=Ushbu sohada maxsus xarajatlar uchun qilingan barcha to'lovlarning qisqacha mazmuni keltirilgan. Bu erda faqat belgilangan yil davomida to'lovlar bo'lgan yozuvlar kiritilgan.
+NbOfPayments=To'lovlar soni
+SplitDiscount=Chegirmani ikkiga bo'ling
+ConfirmSplitDiscount=<b> %s </b> %s ushbu chegirmani ikkita kichik chegirmaga bo'lishni xohlaysizmi?
+TypeAmountOfEachNewDiscount=Ikkala qismning har biri uchun kirish miqdori:
+TotalOfTwoDiscountMustEqualsOriginal=Ikkita yangi chegirmalarning barchasi dastlabki chegirma miqdoriga teng bo'lishi kerak.
+ConfirmRemoveDiscount=Ushbu chegirmani olib tashlamoqchimisiz?
+RelatedBill=Tegishli hisob-faktura
+RelatedBills=Tegishli hisob-fakturalar
+RelatedCustomerInvoices=Tegishli mijozlarning hisob-fakturalari
+RelatedSupplierInvoices=Tegishli sotuvchi hisob-fakturalari
+LatestRelatedBill=Oxirgi tegishli hisob-faktura
+WarningBillExist=Diqqat, bir yoki bir nechta faktura allaqachon mavjud
+MergingPDFTool=PDF vositasini birlashtirish
+AmountPaymentDistributedOnInvoice=Hisob-fakturada tarqatilgan to'lov miqdori
+PaymentOnDifferentThirdBills=Turli xil uchinchi shaxslarning veksellari bo'yicha to'lovlarni amalga oshirishga ruxsat bering, lekin bitta bosh kompaniya
+PaymentNote=To'lov uchun eslatma
+ListOfPreviousSituationInvoices=Avvalgi vaziyat bo'yicha hisob-fakturalar ro'yxati
+ListOfNextSituationInvoices=Keyingi vaziyat bo'yicha hisob-fakturalar ro'yxati
 ListOfSituationInvoices=List of situation invoices
 CurrentSituationTotal=Total current situation
 DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
 RemoveSituationFromCycle=Remove this invoice from cycle
 ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
 ConfirmOuting=Confirm outing
-FrequencyPer_d=Every %s days
-FrequencyPer_m=Every %s months
-FrequencyPer_y=Every %s years
+FrequencyPer_d=Har bir %s kun ichida
+FrequencyPer_m=Har %s oy
+FrequencyPer_y=Har %s yilda
 FrequencyUnit=Frequency unit
-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 for next invoice generation
+toolTipFrequency=Misollar: <br> <b> 7-to'plam, kun </b>: har 7 kunda yangi hisob-faktura bering <br> <b> 3-to'plam, oy a09a4b739f17fz
+NextDateToExecution=Keyingi hisob-fakturani yaratish sanasi
 NextDateToExecutionShort=Date next gen.
-DateLastGeneration=Date of latest generation
+DateLastGeneration=Oxirgi avlod sanasi
 DateLastGenerationShort=Date latest gen.
-MaxPeriodNumber=Max. number of invoice generation
-NbOfGenerationDone=Number of invoice generation already done
+MaxPeriodNumber=Maks. hisob-fakturani yaratish soni
+NbOfGenerationDone=Hisob-fakturani yaratish soni allaqachon bajarilgan
 NbOfGenerationOfRecordDone=Number of record generation already done
 NbOfGenerationDoneShort=Number of generation done
-MaxGenerationReached=Maximum number of generations reached
-InvoiceAutoValidate=Validate invoices automatically
-GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
-DateIsNotEnough=Date not reached yet
-InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
+MaxGenerationReached=Yetib kelgan avlodlarning maksimal soni
+InvoiceAutoValidate=Hisob-fakturalarni avtomatik ravishda tasdiqlang
+GeneratedFromRecurringInvoice=%s shablonidan takrorlanadigan hisob-fakturadan yaratilgan
+DateIsNotEnough=Sana hali aniqlanmagan
+InvoiceGeneratedFromTemplate=%s shablonidan takrorlanadigan shablondan hosil qilingan %s schyoti
 GeneratedFromTemplate=Generated from template invoice %s
-WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
-WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
+WarningInvoiceDateInFuture=Ogohlantirish, faktura sanasi joriy sanadan yuqori
+WarningInvoiceDateTooFarInFuture=Diqqat! Hisob-faktura sanasi joriy sanadan juda uzoq
 ViewAvailableGlobalDiscounts=View available discounts
 GroupPaymentsByModOnReports=Group payments by mode on reports
 # PaymentConditions
-Statut=Status
-PaymentConditionShortRECEP=Due Upon Receipt
-PaymentConditionRECEP=Due Upon Receipt
-PaymentConditionShort30D=30 days
-PaymentCondition30D=30 days
-PaymentConditionShort30DENDMONTH=30 days of month-end
-PaymentCondition30DENDMONTH=Within 30 days following the end of the month
-PaymentConditionShort60D=60 days
-PaymentCondition60D=60 days
-PaymentConditionShort60DENDMONTH=60 days of month-end
-PaymentCondition60DENDMONTH=Within 60 days following the end of the month
-PaymentConditionShortPT_DELIVERY=Delivery
-PaymentConditionPT_DELIVERY=On delivery
-PaymentConditionShortPT_ORDER=Order
-PaymentConditionPT_ORDER=On order
+Statut=Holat
+PaymentConditionShortRECEP=Qabul qilingandan keyin
+PaymentConditionRECEP=Qabul qilingandan keyin
+PaymentConditionShort30D=30 kun
+PaymentCondition30D=30 kun
+PaymentConditionShort30DENDMONTH=Oy oxirida 30 kun
+PaymentCondition30DENDMONTH=Oy oxiridan keyingi 30 kun ichida
+PaymentConditionShort60D=60 kun
+PaymentCondition60D=60 kun
+PaymentConditionShort60DENDMONTH=Oy oxirida 60 kun
+PaymentCondition60DENDMONTH=Oy oxiridan keyingi 60 kun ichida
+PaymentConditionShortPT_DELIVERY=Yetkazib berish
+PaymentConditionPT_DELIVERY=Yetkazib berish paytida
+PaymentConditionShortPT_ORDER=Buyurtma
+PaymentConditionPT_ORDER=Buyurtma bo'yicha
 PaymentConditionShortPT_5050=50-50
-PaymentConditionPT_5050=50%% in advance, 50%% on delivery
-PaymentConditionShort10D=10 days
-PaymentCondition10D=10 days
-PaymentConditionShort10DENDMONTH=10 days of month-end
-PaymentCondition10DENDMONTH=Within 10 days following the end of the month
-PaymentConditionShort14D=14 days
-PaymentCondition14D=14 days
-PaymentConditionShort14DENDMONTH=14 days of month-end
-PaymentCondition14DENDMONTH=Within 14 days following the end of the month
-FixAmount=Fixed amount - 1 line with label '%s'
-VarAmount=Variable amount (%% tot.)
+PaymentConditionPT_5050=50%% oldindan, etkazib berish paytida 50%%
+PaymentConditionShort10D=10 kun
+PaymentCondition10D=10 kun
+PaymentConditionShort10DENDMONTH=Oy tugashining 10 kuni
+PaymentCondition10DENDMONTH=Oy tugaganidan keyingi 10 kun ichida
+PaymentConditionShort14D=14 kun
+PaymentCondition14D=14 kun
+PaymentConditionShort14DENDMONTH=Oy tugashining 14 kuni
+PaymentCondition14DENDMONTH=Oy tugaganidan keyingi 14 kun ichida
+FixAmount=Ruxsat etilgan miqdor - '%s' yorlig'i bilan 1 qator
+VarAmount=O'zgaruvchan miqdor (%% tot.)
 VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
 VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
 # PaymentType
-PaymentTypeVIR=Bank transfer
-PaymentTypeShortVIR=Bank transfer
-PaymentTypePRE=Direct debit payment order
-PaymentTypeShortPRE=Debit payment order
-PaymentTypeLIQ=Cash
-PaymentTypeShortLIQ=Cash
-PaymentTypeCB=Credit card
-PaymentTypeShortCB=Credit card
-PaymentTypeCHQ=Check
-PaymentTypeShortCHQ=Check
-PaymentTypeTIP=TIP (Documents against Payment)
-PaymentTypeShortTIP=TIP Payment
-PaymentTypeVAD=Online payment
-PaymentTypeShortVAD=Online payment
-PaymentTypeTRA=Bank draft
-PaymentTypeShortTRA=Draft
-PaymentTypeFAC=Factor
-PaymentTypeShortFAC=Factor
-BankDetails=Bank details
-BankCode=Bank code
-DeskCode=Branch code
-BankAccountNumber=Account number
-BankAccountNumberKey=Checksum
-Residence=Address
-IBANNumber=IBAN account number
+PaymentTypeVIR=Bank o'tkazmasi
+PaymentTypeShortVIR=Bank o'tkazmasi
+PaymentTypePRE=To'g'ridan-to'g'ri debet to'lovi buyurtmasi
+PaymentTypeShortPRE=Debet bo'yicha to'lov topshirig'i
+PaymentTypeLIQ=Naqd pul
+PaymentTypeShortLIQ=Naqd pul
+PaymentTypeCB=Kredit kartasi
+PaymentTypeShortCB=Kredit kartasi
+PaymentTypeCHQ=Tekshiring
+PaymentTypeShortCHQ=Tekshiring
+PaymentTypeTIP=Maslahat (To'lovga qarshi hujjatlar)
+PaymentTypeShortTIP=Maslahat to'lovi
+PaymentTypeVAD=Onlayn to'lov
+PaymentTypeShortVAD=Onlayn to'lov
+PaymentTypeTRA=Bank loyihasi
+PaymentTypeShortTRA=Qoralama
+PaymentTypeFAC=Faktor
+PaymentTypeShortFAC=Faktor
+BankDetails=Bank tafsilotlari
+BankCode=Bank kodi
+DeskCode=Filial kodi
+BankAccountNumber=Hisob raqami
+BankAccountNumberKey=Tekshirish summasi
+Residence=Manzil
+IBANNumber=IBAN hisob raqami
 IBAN=IBAN
 CustomerIBAN=IBAN of customer
 SupplierIBAN=IBAN of vendor
-BIC=BIC/SWIFT
-BICNumber=BIC/SWIFT code
-ExtraInfos=Extra infos
-RegulatedOn=Regulated on
-ChequeNumber=Check N°
-ChequeOrTransferNumber=Check/Transfer N°
-ChequeBordereau=Check schedule
-ChequeMaker=Check/Transfer sender
-ChequeBank=Bank of Check
-CheckBank=Check
-NetToBePaid=Net to be paid
+BIC=BIC / SWIFT
+BICNumber=BIC / SWIFT kodi
+ExtraInfos=Qo'shimcha ma'lumotlar
+RegulatedOn=Tartibga solingan
+ChequeNumber=N ° ni tekshiring
+ChequeOrTransferNumber=N ° ni tekshiring / o'tkazing
+ChequeBordereau=Jadvalni tekshiring
+ChequeMaker=Yuboruvchini tekshiring / o'tkazing
+ChequeBank=Chek banki
+CheckBank=Tekshiring
+NetToBePaid=To'lanadigan to'r
 PhoneNumber=Tel
-FullPhoneNumber=Telephone
-TeleFax=Fax
-PrettyLittleSentence=Accept the amount of payments due by checks issued in my name as a Member of an accounting association approved by the Fiscal Administration.
-IntracommunityVATNumber=Intra-Community VAT ID
-PaymentByChequeOrderedTo=Check payments (including tax) are payable to %s, send to
-PaymentByChequeOrderedToShort=Check payments (incl. tax) are payable to
-SendTo=sent to
-PaymentByTransferOnThisBankAccount=Payment by transfer to the following bank account
-VATIsNotUsedForInvoice=* Non applicable VAT art-293B of CGI
-LawApplicationPart1=By application of the law 80.335 of 12/05/80
-LawApplicationPart2=the goods remain the property of
-LawApplicationPart3=the seller until full payment of
-LawApplicationPart4=their price.
-LimitedLiabilityCompanyCapital=SARL with Capital of
-UseLine=Apply
-UseDiscount=Use discount
-UseCredit=Use credit
-UseCreditNoteInInvoicePayment=Reduce amount to pay with this credit
-MenuChequeDeposits=Check Deposits
-MenuCheques=Checks
-MenuChequesReceipts=Check receipts
-NewChequeDeposit=New deposit
-ChequesReceipts=Check receipts
-ChequesArea=Check deposits area
-ChequeDeposits=Check deposits
-Cheques=Checks
-DepositId=Id deposit
-NbCheque=Number of checks
-CreditNoteConvertedIntoDiscount=This %s has been converted into %s
-UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third-party address as recipient for invoices
-ShowUnpaidAll=Show all unpaid invoices
-ShowUnpaidLateOnly=Show late unpaid invoices only
-PaymentInvoiceRef=Payment invoice %s
-ValidateInvoice=Validate invoice
-ValidateInvoices=Validate invoices
-Cash=Cash
-Reported=Delayed
-DisabledBecausePayments=Not possible since there are some payments
-CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified paid
+FullPhoneNumber=Telefon
+TeleFax=Faks
+PrettyLittleSentence=Fiskal ma'muriyat tomonidan tasdiqlangan buxgalteriya assotsiatsiyasining a'zosi sifatida mening nomimga berilgan cheklar orqali to'lanadigan to'lovlar miqdorini qabul qiling.
+IntracommunityVATNumber=Jamiyat ichidagi QQS identifikatori
+PaymentByChequeOrderedTo=Chex to'lovlari (soliqni o'z ichiga olgan holda) %s uchun to'lanadi, yuboring
+PaymentByChequeOrderedToShort=Chek to'lovlari (soliqni o'z ichiga olgan holda) to'lanishi kerak
+SendTo=yuborilgan
+PaymentByTransferOnThisBankAccount=To'lov quyidagi bank hisob raqamiga o'tkazish orqali
+VATIsNotUsedForInvoice=* Qo'llanilmaydigan QQS san'ati-293B CGI
+LawApplicationPart1=12.05.08 yildagi 80.335-sonli qonunni qo'llash orqali
+LawApplicationPart2=tovarlarning mulki bo'lib qoladi
+LawApplicationPart3=to'liq to'laguniga qadar sotuvchi
+LawApplicationPart4=ularning narxi.
+LimitedLiabilityCompanyCapital=SARL sarmoyasi bilan
+UseLine=Qo'llash
+UseDiscount=Chegirmadan foydalaning
+UseCredit=Kreditdan foydalaning
+UseCreditNoteInInvoicePayment=Ushbu kredit bilan to'lash miqdorini kamaytiring
+MenuChequeDeposits=Omonatlarni tekshiring
+MenuCheques=Chexlar
+MenuChequesReceipts=Kvitansiyalarni tekshiring
+NewChequeDeposit=Yangi depozit
+ChequesReceipts=Kvitansiyalarni tekshiring
+ChequesArea=Depozit maydonini tekshiring
+ChequeDeposits=Omonatlarni tekshiring
+Cheques=Chexlar
+DepositId=Identifikatsiya depoziti
+NbCheque=Cheklar soni
+CreditNoteConvertedIntoDiscount=Ushbu %s %s ga aylantirildi
+UsBillingContactAsIncoiveRecipientIfExist=Hisob-fakturalarni qabul qiluvchi sifatida uchinchi tomon manzilining o'rniga "hisob-kitob aloqasi" turidagi aloqa / manzildan foydalaning
+ShowUnpaidAll=Barcha to'lanmagan hisob-fakturalarni ko'rsatish
+ShowUnpaidLateOnly=Faqat kech to'lanmagan hisob-fakturalarni ko'rsatish
+PaymentInvoiceRef=To'lov uchun hisob-faktura %s
+ValidateInvoice=Hisob-fakturani tasdiqlang
+ValidateInvoices=Hisob-fakturalarni tasdiqlang
+Cash=Naqd pul
+Reported=Kechiktirildi
+DisabledBecausePayments=Mumkin emas, chunki ba'zi to'lovlar mavjud
+CantRemovePaymentWithOneInvoicePaid=To'lovni olib tashlab bo'lmaydi, chunki kamida bitta to'langan hisob-faktura mavjud
 CantRemovePaymentVATPaid=Can't remove payment since VAT declaration is classified paid
 CantRemovePaymentSalaryPaid=Can't remove payment since salary is classified paid
-ExpectedToPay=Expected payment
-CantRemoveConciliatedPayment=Can't remove reconciled payment
-PayedByThisPayment=Paid by this payment
-ClosePaidInvoicesAutomatically=Classify automatically all standard, down payment or replacement invoices as "Paid" when payment is done entirely.
-ClosePaidCreditNotesAutomatically=Classify automatically all credit notes as "Paid" when refund is done entirely.
-ClosePaidContributionsAutomatically=Classify automatically all social or fiscal contributions as "Paid" when payment is done entirely.
+ExpectedToPay=Kutilayotgan to'lov
+CantRemoveConciliatedPayment=Taqqoslangan to'lovni olib tashlab bo'lmaydi
+PayedByThisPayment=Ushbu to'lov orqali to'lanadi
+ClosePaidInvoicesAutomatically=To'lov to'liq amalga oshirilgandan so'ng barcha standart, dastlabki to'lovlar yoki almashtirish hisob-fakturalarini avtomatik ravishda "To'langan" deb tasniflang.
+ClosePaidCreditNotesAutomatically=To'liq qaytarib berilgandan so'ng barcha kredit yozuvlarini avtomatik ravishda "To'langan" deb tasniflang.
+ClosePaidContributionsAutomatically=To'lov to'liq amalga oshirilganda barcha ijtimoiy yoki soliq to'lovlarini avtomatik ravishda "To'langan" deb tasniflang.
 ClosePaidVATAutomatically=Classify automatically VAT declaration as "Paid" when payment is done entirely.
 ClosePaidSalaryAutomatically=Classify automatically salary as "Paid" when payment is done entirely.
-AllCompletelyPayedInvoiceWillBeClosed=All invoices with no remainder to pay will be automatically closed with status "Paid".
-ToMakePayment=Pay
-ToMakePaymentBack=Pay back
-ListOfYourUnpaidInvoices=List of unpaid invoices
-NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
-RevenueStamp=Tax stamp
-YouMustCreateInvoiceFromThird=This option is only available when creating an invoice from tab "Customer" of third party
-YouMustCreateInvoiceFromSupplierThird=This option is only available when creating an invoice from tab "Vendor" of third party
-YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
+AllCompletelyPayedInvoiceWillBeClosed=To'lash uchun qoldiq bo'lmagan barcha hisob-fakturalar "To'langan" holati bilan avtomatik ravishda yopiladi.
+ToMakePayment=To'lash
+ToMakePaymentBack=To'lovni qaytaring
+ListOfYourUnpaidInvoices=To'lanmagan hisob-fakturalar ro'yxati
+NoteListOfYourUnpaidInvoices=Izoh: Ushbu ro'yxatda faqat siz savdo vakili sifatida bog'langan uchinchi shaxslar uchun hisob-fakturalar mavjud.
+RevenueStamp=Soliq markasi
+YouMustCreateInvoiceFromThird=Ushbu parametr faqat uchinchi tomonning "Mijoz" yorlig'idan hisob-fakturani yaratishda mavjud bo'ladi
+YouMustCreateInvoiceFromSupplierThird=Ushbu parametr faqat uchinchi tomonning "Sotuvchi" yorlig'idan hisob-fakturani yaratishda mavjud bo'ladi
+YouMustCreateStandardInvoiceFirstDesc=Avval siz standart hisob-fakturani yaratishingiz va yangi shablon hisob-fakturasini yaratish uchun uni "shablonga" o'tkazishingiz kerak
+PDFCrabeDescription=Hisob-fakturaning PDF shabloni Crabe. To'liq hisob-faktura shablonini (shimgichni shablonini eski versiyasi)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
-PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
-TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+PDFCrevetteDescription=Hisob-fakturaning PDF shablonini Crevette. Vaziyat-fakturalar uchun to'liq hisob-faktura shabloni
+TerreNumRefModelDesc1=Standart hisob-fakturalar uchun %syymm-nnnn formatidagi qaytarish raqami va kredit yozuvlari uchun %syymm-nnnn, yy yil, mm oy va nnnn ketma-ket avtomatik ko'paytiriladigan raqam bo'lib, tanaffussiz va 0 ga qaytish mumkin emas.
 MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
-TerreNumRefModelError=A bill starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.
-CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+TerreNumRefModelError=$ Syymm bilan boshlangan qonun loyihasi allaqachon mavjud va ushbu ketma-ketlik modeliga mos kelmaydi. Ushbu modulni faollashtirish uchun uni olib tashlang yoki nomini o'zgartiring.
+CactusNumRefModelDesc1=Standart hisob-fakturalar uchun %syymm-nnnn formatidagi, kredit yozuvlari uchun %syymm-nnnn va %syymm-nnnn formatidagi qaytarish raqami, yy yil, mm-raqam o'sish va raqamlar 0
 EarlyClosingReason=Early closing reason
 EarlyClosingComment=Early closing note
 ##### Types de contacts #####
-TypeContact_facture_internal_SALESREPFOLL=Representative following-up customer invoice
-TypeContact_facture_external_BILLING=Customer invoice contact
-TypeContact_facture_external_SHIPPING=Customer shipping contact
-TypeContact_facture_external_SERVICE=Customer service contact
-TypeContact_invoice_supplier_internal_SALESREPFOLL=Representative following-up vendor invoice
-TypeContact_invoice_supplier_external_BILLING=Vendor invoice contact
-TypeContact_invoice_supplier_external_SHIPPING=Vendor shipping contact
-TypeContact_invoice_supplier_external_SERVICE=Vendor service contact
+TypeContact_facture_internal_SALESREPFOLL=Vakilni kuzatib boradigan mijozlarning hisob-fakturasi
+TypeContact_facture_external_BILLING=Mijozlarning hisob-fakturasi bilan aloqa qilish
+TypeContact_facture_external_SHIPPING=Mijozlarni etkazib berish bo'yicha aloqa
+TypeContact_facture_external_SERVICE=Mijozlarga xizmat ko'rsatish bo'yicha aloqa
+TypeContact_invoice_supplier_internal_SALESREPFOLL=Vakilni kuzatib boruvchi sotuvchining hisob-fakturasi
+TypeContact_invoice_supplier_external_BILLING=Sotuvchi fakturasi bilan aloqa qilish
+TypeContact_invoice_supplier_external_SHIPPING=Sotuvchining etkazib berish aloqasi
+TypeContact_invoice_supplier_external_SERVICE=Sotuvchi xizmatiga murojaat qilish
 # Situation invoices
-InvoiceFirstSituationAsk=First situation invoice
-InvoiceFirstSituationDesc=The <b>situation invoices</b> are tied to situations related to a progression, for example the progression of a construction. Each situation is tied to an invoice.
-InvoiceSituation=Situation invoice
+InvoiceFirstSituationAsk=Birinchi vaziyat uchun hisob-faktura
+InvoiceFirstSituationDesc=<b> vaziyat schyotlari </b> progressiya bilan bog'liq vaziyatlarga bog'langan, masalan qurilishning rivojlanishi. Har bir vaziyat hisob-fakturaga bog'langan.
+InvoiceSituation=Vaziyat bo'yicha hisob-faktura
 PDFInvoiceSituation=Situation invoice
-InvoiceSituationAsk=Invoice following the situation
-InvoiceSituationDesc=Create a new situation following an already existing one
-SituationAmount=Situation invoice amount(net)
-SituationDeduction=Situation subtraction
-ModifyAllLines=Modify all lines
-CreateNextSituationInvoice=Create next situation
+InvoiceSituationAsk=Vaziyatdan keyin hisob-faktura
+InvoiceSituationDesc=Mavjud vaziyatdan so'ng yangi vaziyat yarating
+SituationAmount=Vaziyat bo'yicha hisob-faktura summasi (aniq)
+SituationDeduction=Vaziyatni ayirish
+ModifyAllLines=Barcha qatorlarni o'zgartiring
+CreateNextSituationInvoice=Keyingi vaziyatni yarating
 ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
 ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
 ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
-NotLastInCycle=This invoice is not the latest in cycle and must not be modified.
-DisabledBecauseNotLastInCycle=The next situation already exists.
-DisabledBecauseFinal=This situation is final.
+NotLastInCycle=Ushbu hisob-faktura tsiklning so'nggi versiyasi emas va o'zgartirilmasligi kerak.
+DisabledBecauseNotLastInCycle=Keyingi vaziyat allaqachon mavjud.
+DisabledBecauseFinal=Bu holat yakuniy.
 situationInvoiceShortcode_AS=AS
 situationInvoiceShortcode_S=S
-CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
-NoSituations=No open situations
-InvoiceSituationLast=Final and general invoice
-PDFCrevetteSituationNumber=Situation N°%s
-PDFCrevetteSituationInvoiceLineDecompte=Situation invoice - COUNT
-PDFCrevetteSituationInvoiceTitle=Situation invoice
+CantBeLessThanMinPercent=Taraqqiyot avvalgi vaziyatdagi qiymatdan kichik bo'lishi mumkin emas.
+NoSituations=Ochiq vaziyatlar yo'q
+InvoiceSituationLast=Yakuniy va umumiy hisob-faktura
+PDFCrevetteSituationNumber=Vaziyat N ° %s
+PDFCrevetteSituationInvoiceLineDecompte=Vaziyat uchun hisob-faktura - COUNT
+PDFCrevetteSituationInvoiceTitle=Vaziyat bo'yicha hisob-faktura
 PDFCrevetteSituationInvoiceLine=Situation N°%s: Inv. N°%s on %s
-TotalSituationInvoice=Total situation
-invoiceLineProgressError=Invoice line progress can't be greater than or equal to the next invoice line
-updatePriceNextInvoiceErrorUpdateline=Error: update price on invoice line: %s
-ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
-ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
-ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both methods (manual and automatic) can be used together with no risk of duplication.
-DeleteRepeatableInvoice=Delete template invoice
-ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
-CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
-BillCreated=%s invoice(s) generated
+TotalSituationInvoice=Umumiy holat
+invoiceLineProgressError=Hisob-faktura satrining o'sishi keyingi hisob-kitob satridan katta yoki teng bo'lmasligi kerak
+updatePriceNextInvoiceErrorUpdateline=Xato: hisob-fakturadagi narxni yangilash: %s
+ToCreateARecurringInvoice=Ushbu shartnoma uchun takroriy hisob-fakturani yaratish uchun avval ushbu hisob-fakturani yarating, so'ng uni hisob-faktura shabloniga o'zgartiring va kelajakdagi hisob-kitoblarni yaratish chastotasini aniqlang.
+ToCreateARecurringInvoiceGene=Kelajakdagi schyot-fakturalarni muntazam ravishda va qo'lda yaratish uchun <strong> %s - %s - %s </strong> menyusiga o'ting.
+ToCreateARecurringInvoiceGeneAuto=Agar sizda bunday hisob-fakturalar avtomatik ravishda tuzilishi kerak bo'lsa, administratoringizdan <strong> %s </strong> modulini yoqishni va sozlashni so'rang. E'tibor bering, ikkala usul ham (qo'lda va avtomatik) birgalikda ishlatilishi mumkin, takrorlanish xavfi yo'q.
+DeleteRepeatableInvoice=Shablon hisob-fakturasini o'chirish
+ConfirmDeleteRepeatableInvoice=Shablon hisob-fakturasini o'chirishni xohlaysizmi?
+CreateOneBillByThird=Uchinchi tomon uchun bitta hisob-faktura yarating (aks holda, buyurtma uchun bitta hisob-faktura)
+BillCreated=%s hisob-fakturasi (lar) yaratilgan
 BillXCreated=Invoice %s generated
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
@@ -589,3 +590,4 @@ FacParentLine=Invoice Line Parent
 SituationTotalRayToRest=Remainder to pay without taxe
 PDFSituationTitle=Situation n° %d
 SituationTotalProgress=Total progress %d %%
+SearchUnpaidInvoicesWithDueDate=Search unpaid invoices with a due date = %s
diff --git a/htdocs/langs/uz_UZ/bookmarks.lang b/htdocs/langs/uz_UZ/bookmarks.lang
index 9d2003f34d3..ee1ba4fb8e3 100644
--- a/htdocs/langs/uz_UZ/bookmarks.lang
+++ b/htdocs/langs/uz_UZ/bookmarks.lang
@@ -1,20 +1,21 @@
 # Dolibarr language file - Source file is en_US - marque pages
-AddThisPageToBookmarks=Add current page to bookmarks
-Bookmark=Bookmark
-Bookmarks=Bookmarks
+AddThisPageToBookmarks=Xatcho'plarga joriy sahifani qo'shing
+Bookmark=Xatcho'p
+Bookmarks=Xatcho'plar
 ListOfBookmarks=List of bookmarks
 EditBookmarks=List/edit bookmarks
-NewBookmark=New bookmark
-ShowBookmark=Show bookmark
-OpenANewWindow=Open a new window
-ReplaceWindow=Replace current window
-BookmarkTargetNewWindowShort=New window
-BookmarkTargetReplaceWindowShort=Current window
-BookmarkTitle=Bookmark title
-UrlOrLink=URL
-BehaviourOnClick=Behaviour when a bookmark URL is selected
-CreateBookmark=Create bookmark
-SetHereATitleForLink=Set a title for the bookmark
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Use an external http URL or a relative Dolibarr URL
-ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Choose if linked page must open in new window or not
-BookmarksManagement=Bookmarks management
+NewBookmark=Yangi xatcho'p
+ShowBookmark=Xatcho'pni ko'rsatish
+OpenANewWindow=Yangi yorliqni oching
+ReplaceWindow=Joriy yorliqni almashtirish
+BookmarkTargetNewWindowShort=Yangi yorliq
+BookmarkTargetReplaceWindowShort=Joriy yorliq
+BookmarkTitle=Xatcho'p nomi
+UrlOrLink=URL manzili
+BehaviourOnClick=Xatcho'p URL manzili tanlanganida o'zini tutishi
+CreateBookmark=Xatcho'p yarating
+SetHereATitleForLink=Xatcho'p uchun nom o'rnating
+UseAnExternalHttpLinkOrRelativeDolibarrLink=Tashqi / mutlaq havoladan (https: // URL) yoki ichki / nisbiy havoladan foydalaning (/ DOLIBARR_ROOT / htdocs / ...)
+ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Bog'langan sahifa joriy yorliqda yoki yangi yorliqda ochilishini tanlang
+BookmarksManagement=Xatcho'plarni boshqarish
+BookmarksMenuShortCut=Ctrl + shift + m
diff --git a/htdocs/langs/uz_UZ/boxes.lang b/htdocs/langs/uz_UZ/boxes.lang
index 0c9ea302fb8..b17d8c0b18e 100644
--- a/htdocs/langs/uz_UZ/boxes.lang
+++ b/htdocs/langs/uz_UZ/boxes.lang
@@ -1,103 +1,103 @@
 # Dolibarr language file - Source file is en_US - boxes
 BoxDolibarrStateBoard=Statistics on main business objects in database
 BoxLoginInformation=Login Information
-BoxLastRssInfos=RSS Information
-BoxLastProducts=Latest %s Products/Services
-BoxProductsAlertStock=Stock alerts for products
-BoxLastProductsInContract=Latest %s contracted products/services
-BoxLastSupplierBills=Latest Vendor invoices
-BoxLastCustomerBills=Latest Customer invoices
-BoxOldestUnpaidCustomerBills=Oldest unpaid customer invoices
-BoxOldestUnpaidSupplierBills=Oldest unpaid vendor invoices
-BoxLastProposals=Latest commercial proposals
-BoxLastProspects=Latest modified prospects
-BoxLastCustomers=Latest modified customers
-BoxLastSuppliers=Latest modified suppliers
-BoxLastCustomerOrders=Latest sales orders
-BoxLastActions=Latest actions
-BoxLastContracts=Latest contracts
-BoxLastContacts=Latest contacts/addresses
-BoxLastMembers=Latest members
+BoxLastRssInfos=RSS haqida ma'lumot
+BoxLastProducts=Eng so'nggi %s mahsulotlari / xizmatlari
+BoxProductsAlertStock=Mahsulotlar uchun birja ogohlantirishlari
+BoxLastProductsInContract=Oxirgi %s shartnomaviy mahsulot / xizmatlari
+BoxLastSupplierBills=Vendorning so'nggi hisob-fakturalari
+BoxLastCustomerBills=Mijozlarning so'nggi hisob-fakturalari
+BoxOldestUnpaidCustomerBills=Xaridorlarning eng qadimgi to'lanmagan hisob-fakturalari
+BoxOldestUnpaidSupplierBills=Eng qadimgi to'lanmagan sotuvchi hisob-fakturalari
+BoxLastProposals=Oxirgi tijorat takliflari
+BoxLastProspects=Oxirgi o'zgartirilgan istiqbollar
+BoxLastCustomers=Eng so'nggi o'zgartirilgan mijozlar
+BoxLastSuppliers=Eng so'nggi o'zgartirilgan etkazib beruvchilar
+BoxLastCustomerOrders=Oxirgi savdo buyurtmalari
+BoxLastActions=Oxirgi harakatlar
+BoxLastContracts=Oxirgi shartnomalar
+BoxLastContacts=So'nggi kontaktlar / manzillar
+BoxLastMembers=Oxirgi a'zolar
 BoxLastModifiedMembers=Latest modified members
 BoxLastMembersSubscriptions=Latest member subscriptions
-BoxFicheInter=Latest interventions
-BoxCurrentAccounts=Open accounts balance
+BoxFicheInter=Oxirgi tadbirlar
+BoxCurrentAccounts=Hisob balansini oching
 BoxTitleMemberNextBirthdays=Birthdays of this month (members)
 BoxTitleMembersByType=Members by type
 BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
 BoxTitleLastRssInfos=Latest %s news from %s
-BoxTitleLastProducts=Products/Services: last %s modified
-BoxTitleProductsAlertStock=Products: stock alert
-BoxTitleLastSuppliers=Latest %s recorded suppliers
-BoxTitleLastModifiedSuppliers=Vendors: last %s modified
-BoxTitleLastModifiedCustomers=Customers: last %s modified
-BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s modified Customer invoices
-BoxTitleLastSupplierBills=Latest %s modified Vendor invoices
-BoxTitleLastModifiedProspects=Prospects: last %s modified
-BoxTitleLastModifiedMembers=Latest %s members
-BoxTitleLastFicheInter=Latest %s modified interventions
-BoxTitleOldestUnpaidCustomerBills=Customer Invoices: oldest %s unpaid
-BoxTitleOldestUnpaidSupplierBills=Vendor Invoices: oldest %s unpaid
-BoxTitleCurrentAccounts=Open Accounts: balances
+BoxTitleLastProducts=Mahsulotlar / xizmatlar: oxirgi %s o'zgartirilgan
+BoxTitleProductsAlertStock=Mahsulotlar: aktsiyalar to'g'risida ogohlantirish
+BoxTitleLastSuppliers=Oxirgi %s ta'minotchilari qayd etilgan
+BoxTitleLastModifiedSuppliers=Sotuvchilar: oxirgi %s o'zgartirilgan
+BoxTitleLastModifiedCustomers=Mijozlar: oxirgi %s o'zgartirilgan
+BoxTitleLastCustomersOrProspects=Oxirgi %s mijozlari yoki istiqbollari
+BoxTitleLastCustomerBills=Oxirgi %s o'zgartirilgan mijozlar hisob-fakturalari
+BoxTitleLastSupplierBills=Eng so'nggi %s sotuvchisi schyot-fakturalari
+BoxTitleLastModifiedProspects=Istiqbollari: oxirgi %s o'zgartirilgan
+BoxTitleLastModifiedMembers=Eng so'nggi %s a'zolari
+BoxTitleLastFicheInter=Oxirgi %s o'zgartirilgan aralashuvlar
+BoxTitleOldestUnpaidCustomerBills=Mijozlarning hisob-fakturalari: eng qadimgi %s to'lanmagan
+BoxTitleOldestUnpaidSupplierBills=Sotuvchi fakturalari: eng qadimgi %s to'lanmagan
+BoxTitleCurrentAccounts=Ochiq hisoblar: qoldiqlar
 BoxTitleSupplierOrdersAwaitingReception=Supplier orders awaiting reception
-BoxTitleLastModifiedContacts=Contacts/Addresses: last %s modified
-BoxMyLastBookmarks=Bookmarks: latest %s
-BoxOldestExpiredServices=Oldest active expired services
-BoxLastExpiredServices=Latest %s oldest contacts with active expired services
-BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s contracts which were modified
-BoxTitleLastModifiedDonations=Latest %s donations which were modified
-BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
+BoxTitleLastModifiedContacts=Aloqa / manzillar: oxirgi marta o'zgartirilgan %s
+BoxMyLastBookmarks=Xatcho'plar: so'nggi %s
+BoxOldestExpiredServices=Muddati tugagan eng qadimgi faol xizmatlar
+BoxLastExpiredServices=Faol muddati o'tgan xizmatlar bilan eng so'nggi %s eng eski aloqalar
+BoxTitleLastActionsToDo=Oxirgi %s amallari
+BoxTitleLastContracts=O'zgartirilgan so'nggi %s shartnomalari
+BoxTitleLastModifiedDonations=O'zgartirilgan so'nggi %s xayriya mablag'lari
+BoxTitleLastModifiedExpenses=Oxirgi %s xarajatlar hisoboti o'zgartirildi
 BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
 BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
 BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
-BoxGlobalActivity=Global activity (invoices, proposals, orders)
-BoxGoodCustomers=Good customers
-BoxTitleGoodCustomers=%s Good customers
+BoxGlobalActivity=Global faoliyat (hisob-fakturalar, takliflar, buyurtmalar)
+BoxGoodCustomers=Yaxshi mijozlar
+BoxTitleGoodCustomers=%s Yaxshi mijozlar
 BoxScheduledJobs=Scheduled jobs
 BoxTitleFunnelOfProspection=Lead funnel
-FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
-LastRefreshDate=Latest refresh date
-NoRecordedBookmarks=No bookmarks defined.
-ClickToAdd=Click here to add.
-NoRecordedCustomers=No recorded customers
-NoRecordedContacts=No recorded contacts
-NoActionsToDo=No actions to do
-NoRecordedOrders=No recorded sales orders
-NoRecordedProposals=No recorded proposals
-NoRecordedInvoices=No recorded customer invoices
-NoUnpaidCustomerBills=No unpaid customer invoices
-NoUnpaidSupplierBills=No unpaid vendor invoices
-NoModifiedSupplierBills=No recorded vendor invoices
-NoRecordedProducts=No recorded products/services
-NoRecordedProspects=No recorded prospects
-NoContractedProducts=No products/services contracted
-NoRecordedContracts=No recorded contracts
-NoRecordedInterventions=No recorded interventions
-BoxLatestSupplierOrders=Latest purchase orders
+FailedToRefreshDataInfoNotUpToDate=RSS oqimini yangilab bo'lmadi. Oxirgi muvaffaqiyatli yangilanish sanasi: %s
+LastRefreshDate=Oxirgi yangilanish sanasi
+NoRecordedBookmarks=Xatcho'plar aniqlanmagan.
+ClickToAdd=Qo'shish uchun shu erni bosing.
+NoRecordedCustomers=Ro'yxatdan o'tgan mijozlar yo'q
+NoRecordedContacts=Yozilgan kontaktlar yo'q
+NoActionsToDo=Amalga oshiriladigan harakatlar yo'q
+NoRecordedOrders=Sotish bo'yicha yozilgan buyurtmalar yo'q
+NoRecordedProposals=Yozilgan takliflar yo'q
+NoRecordedInvoices=Mijozlarning qayd qilingan schyot-fakturalari yo'q
+NoUnpaidCustomerBills=Mijozlarning to'lanmagan schyot-fakturalari yo'q
+NoUnpaidSupplierBills=To'lovsiz sotuvchilarning hisob-fakturalari yo'q
+NoModifiedSupplierBills=Sotuvchi tomonidan qayd qilingan schyot-fakturalar yo‘q
+NoRecordedProducts=Yozilgan mahsulotlar / xizmatlar yo'q
+NoRecordedProspects=Ro'yxatga olingan istiqbollar yo'q
+NoContractedProducts=Hech qanday mahsulot / xizmat bilan shartnoma tuzilmagan
+NoRecordedContracts=Yozilgan shartnomalar yo'q
+NoRecordedInterventions=Yozilgan aralashuvlar yo'q
+BoxLatestSupplierOrders=Oxirgi sotib olish buyurtmalari
 BoxLatestSupplierOrdersAwaitingReception=Latest Purchase Orders (with a pending reception)
-NoSupplierOrder=No recorded purchase order
-BoxCustomersInvoicesPerMonth=Customer Invoices per month
-BoxSuppliersInvoicesPerMonth=Vendor Invoices per month
-BoxCustomersOrdersPerMonth=Sales Orders per month
-BoxSuppliersOrdersPerMonth=Vendor Orders per month
-BoxProposalsPerMonth=Proposals per month
-NoTooLowStockProducts=No products are under the low stock limit
-BoxProductDistribution=Products/Services Distribution
+NoSupplierOrder=Sotib olish to'g'risida yozilgan buyurtma yo'q
+BoxCustomersInvoicesPerMonth=Mijozlarning oyiga hisob-fakturalari
+BoxSuppliersInvoicesPerMonth=Oyiga sotuvchi fakturalar
+BoxCustomersOrdersPerMonth=Oyiga sotish bo'yicha buyurtmalar
+BoxSuppliersOrdersPerMonth=Oyiga sotuvchi buyurtmalari
+BoxProposalsPerMonth=Oyiga takliflar
+NoTooLowStockProducts=Hech qanday mahsulot past stok cheklovida emas
+BoxProductDistribution=Mahsulotlar / xizmatlarni tarqatish
 ForObject=On %s
-BoxTitleLastModifiedSupplierBills=Vendor Invoices: last %s modified
-BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
-BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
-BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
-BoxTitleLastModifiedPropals=Latest %s modified proposals
+BoxTitleLastModifiedSupplierBills=Sotuvchi hisob-fakturalari: oxirgi %s o'zgartirilgan
+BoxTitleLatestModifiedSupplierOrders=Sotuvchi buyurtmalari: oxirgi %s o'zgartirilgan
+BoxTitleLastModifiedCustomerBills=Mijozlarning hisob-fakturalari: oxirgi %s o'zgartirilgan
+BoxTitleLastModifiedCustomerOrders=Sotish bo'yicha buyurtmalar: oxirgi %s o'zgartirilgan
+BoxTitleLastModifiedPropals=Oxirgi %s o'zgartirilgan takliflar
 BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
 BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
-ForCustomersInvoices=Customers invoices
-ForCustomersOrders=Customers orders
-ForProposals=Proposals
-LastXMonthRolling=The latest %s month rolling
-ChooseBoxToAdd=Add widget to your dashboard
+ForCustomersInvoices=Mijozlarning hisob-fakturalari
+ForCustomersOrders=Mijozlar buyurtma berishadi
+ForProposals=Takliflar
+LastXMonthRolling=%s oylik eng so'nggi oylik
+ChooseBoxToAdd=Vidjetni boshqaruv panelingizga qo'shing
 BoxAdded=Widget was added in your dashboard
 BoxTitleUserBirthdaysOfMonth=Birthdays of this month (users)
 BoxLastManualEntries=Latest record in accountancy entered manually or without source document
diff --git a/htdocs/langs/uz_UZ/cashdesk.lang b/htdocs/langs/uz_UZ/cashdesk.lang
index 240503842f3..d162830a17d 100644
--- a/htdocs/langs/uz_UZ/cashdesk.lang
+++ b/htdocs/langs/uz_UZ/cashdesk.lang
@@ -1,38 +1,38 @@
 # Language file - Source file is en_US - cashdesk
-CashDeskMenu=Point of sale
-CashDesk=Point of sale
-CashDeskBankCash=Bank account (cash)
-CashDeskBankCB=Bank account (card)
-CashDeskBankCheque=Bank account (cheque)
-CashDeskWarehouse=Warehouse
-CashdeskShowServices=Selling services
-CashDeskProducts=Products
-CashDeskStock=Stock
-CashDeskOn=on
-CashDeskThirdParty=Third party
-ShoppingCart=Shopping cart
-NewSell=New sell
-AddThisArticle=Add this article
-RestartSelling=Go back on sell
-SellFinished=Sale complete
-PrintTicket=Print ticket
+CashDeskMenu=Savdo nuqtasi
+CashDesk=Savdo nuqtasi
+CashDeskBankCash=Bank hisobvarag'i (naqd pul)
+CashDeskBankCB=Bank hisobvarag'i (karta)
+CashDeskBankCheque=Bank hisobvarag'i (chek)
+CashDeskWarehouse=Ombor
+CashdeskShowServices=Sotish bo'yicha xizmatlar
+CashDeskProducts=Mahsulotlar
+CashDeskStock=Aksiya
+CashDeskOn=kuni
+CashDeskThirdParty=Uchinchi tomon
+ShoppingCart=Xarid savati
+NewSell=Yangi sotuv
+AddThisArticle=Ushbu maqolani qo'shing
+RestartSelling=Sotishga qaytib boring
+SellFinished=Sotish yakunlandi
+PrintTicket=Chiptani chop eting
 SendTicket=Send ticket
-NoProductFound=No article found
-ProductFound=product found
-NoArticle=No article
-Identification=Identification
-Article=Article
-Difference=Difference
-TotalTicket=Total ticket
-NoVAT=No VAT for this sale
-Change=Excess received
-BankToPay=Account for payment
-ShowCompany=Show company
-ShowStock=Show warehouse
-DeleteArticle=Click to remove this article
-FilterRefOrLabelOrBC=Search (Ref/Label)
-UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that uses POS needs to have permission to edit stock.
-DolibarrReceiptPrinter=Dolibarr Receipt Printer
+NoProductFound=Maqola topilmadi
+ProductFound=mahsulot topildi
+NoArticle=Maqola yo'q
+Identification=Identifikatsiya
+Article=Maqola
+Difference=Farqi
+TotalTicket=Jami chipta
+NoVAT=Ushbu sotish uchun QQS yo'q
+Change=Ortiqcha olingan
+BankToPay=To'lov uchun hisob
+ShowCompany=Shou kompaniyasi
+ShowStock=Omborni ko'rsatish
+DeleteArticle=Ushbu maqolani olib tashlash uchun bosing
+FilterRefOrLabelOrBC=Qidiruv (Ref / Yorliq)
+UserNeedPermissionToEditStockToUsePos=Hisob-fakturani yaratishda zaxiralarni kamaytirishni so'raysiz, shuning uchun POS-dan foydalanuvchi aktsiyalarni tahrirlash uchun ruxsatga ega bo'lishi kerak.
+DolibarrReceiptPrinter=Dolibarr qabul qilish printeri
 PointOfSale=Point of Sale
 PointOfSaleShort=POS
 CloseBill=Close Bill
@@ -102,7 +102,7 @@ CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal numb
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
 SaleStartedAt=Sale started at %s
-ControlCashOpening=Control cash popup at opening POS
+ControlCashOpening=Open the "Control cash" popup when opening the POS
 CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -126,5 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
-ShowPriceHT = Display the price excluding tax column
-ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
+ShowPriceHT = Display the column with the price excluding tax (on screen)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
diff --git a/htdocs/langs/uz_UZ/categories.lang b/htdocs/langs/uz_UZ/categories.lang
index 29e08f66541..5a0d2180920 100644
--- a/htdocs/langs/uz_UZ/categories.lang
+++ b/htdocs/langs/uz_UZ/categories.lang
@@ -1,97 +1,97 @@
 # Dolibarr language file - Source file is en_US - categories
-Rubrique=Tag/Category
-Rubriques=Tags/Categories
+Rubrique=Tag / toifali
+Rubriques=Teglar / toifalar
 RubriquesTransactions=Tags/Categories of transactions
-categories=tags/categories
-NoCategoryYet=No tag/category of this type has been created
-In=In
-AddIn=Add in
-modify=modify
-Classify=Classify
-CategoriesArea=Tags/Categories area
-ProductsCategoriesArea=Product/Service tags/categories area
-SuppliersCategoriesArea=Vendor tags/categories area
-CustomersCategoriesArea=Customer tags/categories area
-MembersCategoriesArea=Member tags/categories area
-ContactsCategoriesArea=Contact tags/categories area
-AccountsCategoriesArea=Bank account tags/categories area
-ProjectsCategoriesArea=Project tags/categories area
+categories=teglar / toifalar
+NoCategoryYet=Ushbu turdagi yorliq / toifalar yaratilmagan
+In=Yilda
+AddIn=Qo'shish
+modify=o'zgartirish
+Classify=Tasniflang
+CategoriesArea=Teglar / toifalar maydoni
+ProductsCategoriesArea=Mahsulot / xizmat teglari / toifalar maydoni
+SuppliersCategoriesArea=Sotuvchi teglari / toifalari maydoni
+CustomersCategoriesArea=Mijozlar teglari / toifalari maydoni
+MembersCategoriesArea=Ro'yxatdan teglar / toifalar maydoni
+ContactsCategoriesArea=Aloqa teglari / toifalari maydoni
+AccountsCategoriesArea=Bank hisobvarag'i teglari / toifalari maydoni
+ProjectsCategoriesArea=Loyiha teglari / toifalari maydoni
 UsersCategoriesArea=User tags/categories area
-SubCats=Sub-categories
-CatList=List of tags/categories
+SubCats=Kichik toifalar
+CatList=Teglar / toifalar ro'yxati
 CatListAll=List of tags/categories (all types)
-NewCategory=New tag/category
-ModifCat=Modify tag/category
-CatCreated=Tag/category created
-CreateCat=Create tag/category
-CreateThisCat=Create this tag/category
-NoSubCat=No subcategory.
-SubCatOf=Subcategory
-FoundCats=Found tags/categories
-ImpossibleAddCat=Impossible to add the tag/category %s
-WasAddedSuccessfully=<b>%s</b> was added successfully.
-ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
-ProductIsInCategories=Product/service is linked to following tags/categories
-CompanyIsInCustomersCategories=This third party is linked to following customers/prospects tags/categories
-CompanyIsInSuppliersCategories=This third party is linked to following vendors tags/categories
-MemberIsInCategories=This member is linked to following members tags/categories
-ContactIsInCategories=This contact is linked to following contacts tags/categories
-ProductHasNoCategory=This product/service is not in any tags/categories
-CompanyHasNoCategory=This third party is not in any tags/categories
-MemberHasNoCategory=This member is not in any tags/categories
-ContactHasNoCategory=This contact is not in any tags/categories
-ProjectHasNoCategory=This project is not in any tags/categories
-ClassifyInCategory=Add to tag/category
-NotCategorized=Without tag/category
-CategoryExistsAtSameLevel=This category already exists with this ref
-ContentsVisibleByAllShort=Contents visible by all
-ContentsNotVisibleByAllShort=Contents not visible by all
-DeleteCategory=Delete tag/category
-ConfirmDeleteCategory=Are you sure you want to delete this tag/category?
-NoCategoriesDefined=No tag/category defined
-SuppliersCategoryShort=Vendors tag/category
-CustomersCategoryShort=Customers tag/category
-ProductsCategoryShort=Products tag/category
-MembersCategoryShort=Members tag/category
-SuppliersCategoriesShort=Vendors tags/categories
-CustomersCategoriesShort=Customers tags/categories
-ProspectsCategoriesShort=Prospects tags/categories
-CustomersProspectsCategoriesShort=Cust./Prosp. tags/categories
-ProductsCategoriesShort=Products tags/categories
-MembersCategoriesShort=Members tags/categories
-ContactCategoriesShort=Contacts tags/categories
-AccountsCategoriesShort=Accounts tags/categories
-ProjectsCategoriesShort=Projects tags/categories
+NewCategory=Yangi teg / turkum
+ModifCat=Teg / toifani o'zgartiring
+CatCreated=Tag / kategoriya yaratildi
+CreateCat=Teg / toifani yarating
+CreateThisCat=Ushbu teg / toifani yarating
+NoSubCat=Subkategori yo'q.
+SubCatOf=Subkategory
+FoundCats=Topilgan teglar / toifalar
+ImpossibleAddCat=%s tegini / toifasini qo'shib bo'lmaydi
+WasAddedSuccessfully= <b> %s </b> muvaffaqiyatli qo'shildi.
+ObjectAlreadyLinkedToCategory=Element allaqachon ushbu teg / toifaga bog'langan.
+ProductIsInCategories=Mahsulot / xizmat quyidagi teglar / toifalarga bog'langan
+CompanyIsInCustomersCategories=Ushbu uchinchi tomon quyidagi mijozlar / istiqbolli teglar / toifalar bilan bog'liq
+CompanyIsInSuppliersCategories=Ushbu uchinchi tomon quyidagi sotuvchilar teglari / toifalari bilan bog'langan
+MemberIsInCategories=Ushbu a'zo quyidagi a'zolarga teglar / toifalarga bog'langan
+ContactIsInCategories=Ushbu kontakt quyidagi teglar / toifalarga bog'langan
+ProductHasNoCategory=Ushbu mahsulot / xizmat biron bir teg / toifada emas
+CompanyHasNoCategory=Ushbu uchinchi tomon hech qanday teg / toifada emas
+MemberHasNoCategory=Ushbu a'zo hech qanday teg / toifada emas
+ContactHasNoCategory=Ushbu aloqa hech qanday teg / toifada emas
+ProjectHasNoCategory=Ushbu loyiha biron bir teg / toifada emas
+ClassifyInCategory=Tag / toifaga qo'shish
+NotCategorized=Tag / toifasiz
+CategoryExistsAtSameLevel=Ushbu turkum ushbu havola bilan allaqachon mavjud
+ContentsVisibleByAllShort=Hamma ko'rinadigan tarkib
+ContentsNotVisibleByAllShort=Tarkibi hammaga ko'rinmaydi
+DeleteCategory=Teg / toifani o'chirish
+ConfirmDeleteCategory=Ushbu yorliqni / toifani o'chirishni xohlaysizmi?
+NoCategoriesDefined=Hech qanday teg / toifa aniqlanmagan
+SuppliersCategoryShort=Sotuvchilar yorlig'i / toifasi
+CustomersCategoryShort=Mijozlar yorlig'i / toifasi
+ProductsCategoryShort=Mahsulotlar yorlig'i / toifasi
+MembersCategoryShort=A'zolar yorlig'i / toifasi
+SuppliersCategoriesShort=Sotuvchilar teglari / toifalari
+CustomersCategoriesShort=Mijozlar teglari / toifalari
+ProspectsCategoriesShort=Teglarni / toifalarni istiqbollari
+CustomersProspectsCategoriesShort=Saqlash ./Prosp. teglar / toifalar
+ProductsCategoriesShort=Mahsulotlar teglari / toifalari
+MembersCategoriesShort=A'zolar teglari / toifalari
+ContactCategoriesShort=Aloqa teglari / toifalari
+AccountsCategoriesShort=Hisob teglari / toifalari
+ProjectsCategoriesShort=Loyihalar teglari / toifalari
 UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
-CategId=Tag/category id
+CategId=Tag / kategoriya identifikatori
 ParentCategory=Parent tag/category
 ParentCategoryLabel=Label of parent tag/category
-CatSupList=List of vendors tags/categories
-CatCusList=List of customers/prospects tags/categories
-CatProdList=List of products tags/categories
-CatMemberList=List of members tags/categories
-CatContactList=List of contacts tags/categories
+CatSupList=Sotuvchilar teglari / toifalari ro'yxati
+CatCusList=Mijozlar ro'yxati / istiqbollari teglari / toifalari
+CatProdList=Mahsulot teglari / toifalari ro'yxati
+CatMemberList=A'zolar teglari / toifalari ro'yxati
+CatContactList=Kontakt teglari / toifalari ro'yxati
 CatProjectsList=List of projects tags/categories
 CatUsersList=List of users tags/categories
-CatSupLinks=Links between vendors and tags/categories
-CatCusLinks=Links between customers/prospects and tags/categories
+CatSupLinks=Sotuvchilar va teglar / toifalar o'rtasidagi aloqalar
+CatCusLinks=Mijozlar / istiqbollar va teglar / toifalar o'rtasidagi aloqalar
 CatContactsLinks=Links between contacts/addresses and tags/categories
-CatProdLinks=Links between products/services and tags/categories
+CatProdLinks=Mahsulotlar / xizmatlar va teglar / toifalar o'rtasidagi aloqalar
 CatMembersLinks=Links between members and tags/categories
 CatProjectsLinks=Links between projects and tags/categories
 CatUsersLinks=Links between users and tags/categories
-DeleteFromCat=Remove from tags/category
-ExtraFieldsCategories=Complementary attributes
-CategoriesSetup=Tags/categories setup
-CategorieRecursiv=Link with parent tag/category automatically
-CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category.
-AddProductServiceIntoCategory=Add the following product/service
+DeleteFromCat=Teglardan / toifadan olib tashlash
+ExtraFieldsCategories=Bir-birini to'ldiruvchi atributlar
+CategoriesSetup=Teglar / toifalarni sozlash
+CategorieRecursiv=Ota-ona yorlig'i / toifasi bilan avtomatik ravishda bog'lanish
+CategorieRecursivHelp=Agar parametr yoniq bo'lsa, mahsulotni pastki toifaga qo'shganda, mahsulot ota-onalar toifasiga qo'shiladi.
+AddProductServiceIntoCategory=Quyidagi mahsulot / xizmatni qo'shing
 AddCustomerIntoCategory=Assign category to customer
 AddSupplierIntoCategory=Assign category to supplier
-ShowCategory=Show tag/category
-ByDefaultInList=By default in list
+ShowCategory=Teg / toifani ko'rsatish
+ByDefaultInList=Odatiy bo'lib, ro'yxatda
 ChooseCategory=Choose category
 StocksCategoriesArea=Warehouse Categories
 ActionCommCategoriesArea=Event Categories
diff --git a/htdocs/langs/uz_UZ/commercial.lang b/htdocs/langs/uz_UZ/commercial.lang
index 10c536e0d48..edefeaf6e95 100644
--- a/htdocs/langs/uz_UZ/commercial.lang
+++ b/htdocs/langs/uz_UZ/commercial.lang
@@ -1,77 +1,78 @@
 # Dolibarr language file - Source file is en_US - commercial
-Commercial=Commerce
-CommercialArea=Commerce area
-Customer=Customer
-Customers=Customers
-Prospect=Prospect
-Prospects=Prospects
-DeleteAction=Delete an event
-NewAction=New event
-AddAction=Create event
-AddAnAction=Create an event
-AddActionRendezVous=Create a Rendez-vous event
-ConfirmDeleteAction=Are you sure you want to delete this event?
-CardAction=Event card
-ActionOnCompany=Related company
-ActionOnContact=Related contact
-TaskRDVWith=Meeting with %s
-ShowTask=Show task
-ShowAction=Show event
-ActionsReport=Events report
-ThirdPartiesOfSaleRepresentative=Third parties with sales representative
+Commercial=Savdo
+CommercialArea=Savdo sohasi
+Customer=Mijoz
+Customers=Xaridorlar
+Prospect=Istiqbol
+Prospects=Istiqbollari
+DeleteAction=Tadbirni o'chirish
+NewAction=Yangi voqea
+AddAction=Tadbir yaratish
+AddAnAction=Tadbir yarating
+AddActionRendezVous=Rendez-vous tadbirini yarating
+ConfirmDeleteAction=Ushbu tadbirni o'chirishni xohlaysizmi?
+CardAction=Tadbir kartasi
+ActionOnCompany=Tegishli kompaniya
+ActionOnContact=Tegishli aloqa
+TaskRDVWith=%s bilan uchrashuv
+ShowTask=Vazifani ko'rsatish
+ShowAction=Tadbirni ko'rsatish
+ActionsReport=Voqealar to'g'risida hisobot
+ThirdPartiesOfSaleRepresentative=Savdo vakili bilan uchinchi shaxslar
 SaleRepresentativesOfThirdParty=Sales representatives of third party
-SalesRepresentative=Sales representative
-SalesRepresentatives=Sales representatives
-SalesRepresentativeFollowUp=Sales representative (follow-up)
-SalesRepresentativeSignature=Sales representative (signature)
-NoSalesRepresentativeAffected=No particular sales representative assigned
-ShowCustomer=Show customer
-ShowProspect=Show prospect
-ListOfProspects=List of prospects
-ListOfCustomers=List of customers
-LastDoneTasks=Latest %s completed actions
-LastActionsToDo=Oldest %s not completed actions
-DoneAndToDoActions=Completed and To do events
-DoneActions=Completed events
-ToDoActions=Incomplete events
-SendPropalRef=Submission of commercial proposal %s
-SendOrderRef=Submission of order %s
-StatusNotApplicable=Not applicable
-StatusActionToDo=To do
-StatusActionDone=Complete
-StatusActionInProcess=In process
-TasksHistoryForThisContact=Events for this contact
-LastProspectDoNotContact=Do not contact
-LastProspectNeverContacted=Never contacted
-LastProspectToContact=To contact
-LastProspectContactInProcess=Contact in process
-LastProspectContactDone=Contact done
-ActionAffectedTo=Event assigned to
-ActionDoneBy=Event done by
-ActionAC_TEL=Phone call
-ActionAC_FAX=Send fax
-ActionAC_PROP=Send proposal by mail
-ActionAC_EMAIL=Send Email
+SalesRepresentative=Savdo bo'yicha menejer
+SalesRepresentatives=Savdo vakillari
+SalesRepresentativeFollowUp=Savdo vakili (kuzatuv)
+SalesRepresentativeSignature=Savdo vakili (imzo)
+NoSalesRepresentativeAffected=Hech qanday maxsus savdo vakili tayinlanmagan
+ShowCustomer=Xaridorni ko'rsatish
+ShowProspect=Istiqbolni ko'rsatish
+ListOfProspects=Istiqbollar ro'yxati
+ListOfCustomers=Mijozlar ro'yxati
+LastDoneTasks=Oxirgi %s bajarilgan harakatlar
+LastActionsToDo=Eng qadimgi %s bajarilmagan amallar
+DoneAndToDoActions=Voqealar tugallandi va bajarilishi kerak
+DoneActions=Tugallangan tadbirlar
+ToDoActions=Tugallanmagan voqealar
+SendPropalRef=%s tijorat taklifini yuborish
+SendOrderRef=%s buyurtmasini yuborish
+StatusNotApplicable=Qo'llanilmaydigan, qo'llab bo'lmaydigan
+StatusActionToDo=Qilmoq
+StatusActionDone=Bajarildi
+StatusActionInProcess=Jarayonida
+TasksHistoryForThisContact=Ushbu aloqa uchun tadbirlar
+LastProspectDoNotContact=Aloqa qilmang
+LastProspectNeverContacted=Hech qachon bog'lanmagan
+LastProspectToContact=Aloqa uchun
+LastProspectContactInProcess=Aloqa jarayonida
+LastProspectContactDone=Aloqa tugadi
+ActionAffectedTo=Tadbir tayinlangan
+ActionDoneBy=Tadbir amalga oshirildi
+ActionAC_TEL=Telefon qo'ng'irog'i
+ActionAC_FAX=Faks yuboring
+ActionAC_PROP=Taklifni pochta orqali yuboring
+ActionAC_EMAIL=Elektron pochta xabarini yuboring
 ActionAC_EMAIL_IN=Reception of Email
-ActionAC_RDV=Meetings
-ActionAC_INT=Intervention on site
-ActionAC_FAC=Send customer invoice by mail
-ActionAC_REL=Send customer invoice by mail (reminder)
-ActionAC_CLO=Close
-ActionAC_EMAILING=Send mass email
-ActionAC_COM=Send sales order by mail
-ActionAC_SHIP=Send shipping by mail
-ActionAC_SUP_ORD=Send purchase order by mail
-ActionAC_SUP_INV=Send vendor invoice by mail
-ActionAC_OTH=Other
-ActionAC_OTH_AUTO=Automatically inserted events
-ActionAC_MANUAL=Manually inserted events
-ActionAC_AUTO=Automatically inserted events
-ActionAC_OTH_AUTOShort=Auto
-Stats=Sales statistics
-StatusProsp=Prospect status
-DraftPropals=Draft commercial proposals
-NoLimit=No limit
+ActionAC_RDV=Uchrashuvlar
+ActionAC_INT=Saytdagi aralashuv
+ActionAC_FAC=Mijozlarning hisob-fakturasini pochta orqali yuboring
+ActionAC_REL=Xaridorlarga hisob-fakturani pochta orqali yuborish (eslatish)
+ActionAC_CLO=Yoping
+ActionAC_EMAILING=Ommaviy elektron pochta xabarlarini yuboring
+ActionAC_COM=Savdo buyurtmasini pochta orqali yuboring
+ActionAC_SHIP=Jo'natmani pochta orqali yuboring
+ActionAC_SUP_ORD=Xarid buyurtmasini pochta orqali yuboring
+ActionAC_SUP_INV=Sotuvchi hisob-fakturasini pochta orqali yuboring
+ActionAC_OTH=Boshqalar
+ActionAC_OTH_AUTO=Boshqa avtoulov
+ActionAC_MANUAL=Qo'lda kiritilgan voqealar
+ActionAC_AUTO=Avtomatik ravishda kiritilgan hodisalar
+ActionAC_OTH_AUTOShort=Other
+ActionAC_EVENTORGANIZATION=Event organization events
+Stats=Savdo statistikasi
+StatusProsp=Istiqbol holati
+DraftPropals=Tijorat takliflari loyihasi
+NoLimit=Cheklov yo'q
 ToOfferALinkForOnlineSignature=Link for online signature
 WelcomeOnOnlineSignaturePage=Welcome to the page to accept commercial proposals from %s
 ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
diff --git a/htdocs/langs/uz_UZ/companies.lang b/htdocs/langs/uz_UZ/companies.lang
index fbe75f09ab0..0574c3b6c03 100644
--- a/htdocs/langs/uz_UZ/companies.lang
+++ b/htdocs/langs/uz_UZ/companies.lang
@@ -1,107 +1,107 @@
 # Dolibarr language file - Source file is en_US - companies
-ErrorCompanyNameAlreadyExists=Company name %s already exists. Choose another one.
-ErrorSetACountryFirst=Set the country first
-SelectThirdParty=Select a third party
-ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
-DeleteContact=Delete a contact/address
-ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
-MenuNewThirdParty=New Third Party
-MenuNewCustomer=New Customer
-MenuNewProspect=New Prospect
-MenuNewSupplier=New Vendor
-MenuNewPrivateIndividual=New private individual
-NewCompany=New company (prospect, customer, vendor)
-NewThirdParty=New Third Party (prospect, customer, vendor)
-CreateDolibarrThirdPartySupplier=Create a third party (vendor)
-CreateThirdPartyOnly=Create third party
-CreateThirdPartyAndContact=Create a third party + a child contact
-ProspectionArea=Prospection area
-IdThirdParty=Id third party
-IdCompany=Company Id
-IdContact=Contact Id
-ThirdPartyContacts=Third-party contacts
-ThirdPartyContact=Third-party contact/address
-Company=Company
-CompanyName=Company name
-AliasNames=Alias name (commercial, trademark, ...)
-AliasNameShort=Alias Name
-Companies=Companies
-CountryIsInEEC=Country is inside the European Economic Community
+ErrorCompanyNameAlreadyExists=%s kompaniyasining nomi allaqachon mavjud. Boshqasini tanlang.
+ErrorSetACountryFirst=Avval mamlakatni o'rnating
+SelectThirdParty=Uchinchi tomonni tanlang
+ConfirmDeleteCompany=Ushbu kompaniyani va unga tegishli barcha ma'lumotlarni o'chirib tashlamoqchimisiz?
+DeleteContact=Kontaktni / manzilni o'chirib tashlang
+ConfirmDeleteContact=Ushbu kontaktni va unga tegishli barcha ma'lumotlarni o'chirishni xohlaysizmi?
+MenuNewThirdParty=Yangi Uchinchi tomon
+MenuNewCustomer=Yangi mijoz
+MenuNewProspect=Yangi istiqbol
+MenuNewSupplier=Yangi sotuvchi
+MenuNewPrivateIndividual=Yangi xususiy shaxs
+NewCompany=Yangi kompaniya (prospekt, mijoz, sotuvchi)
+NewThirdParty=Yangi Uchinchi tomon (prospekt, mijoz, sotuvchi)
+CreateDolibarrThirdPartySupplier=Uchinchi tomonni (sotuvchini) yarating
+CreateThirdPartyOnly=Uchinchi tomonni yarating
+CreateThirdPartyAndContact=Uchinchi tomon + bolalar bilan aloqa yaratish
+ProspectionArea=Qidiruv maydoni
+IdThirdParty=Uchinchi shaxs
+IdCompany=Kompaniya identifikatori
+IdContact=Aloqa identifikatori
+ThirdPartyContacts=Uchinchi tomon aloqalari
+ThirdPartyContact=Uchinchi tomon bilan aloqa / manzil
+Company=Kompaniya
+CompanyName=Kopmaniya nomi
+AliasNames=Taxallus nomi (savdo, savdo belgisi, ...)
+AliasNameShort=Taxallus nomi
+Companies=Kompaniyalar
+CountryIsInEEC=Mamlakat Evropa iqtisodiy hamjamiyatiga kiradi
 PriceFormatInCurrentLanguage=Price display format in the current language and currency
-ThirdPartyName=Third-party name
+ThirdPartyName=Uchinchi tomon nomi
 ThirdPartyEmail=Third-party email
-ThirdParty=Third-party
-ThirdParties=Third-parties
-ThirdPartyProspects=Prospects
-ThirdPartyProspectsStats=Prospects
-ThirdPartyCustomers=Customers
-ThirdPartyCustomersStats=Customers
-ThirdPartyCustomersWithIdProf12=Customers with %s or %s
-ThirdPartySuppliers=Vendors
-ThirdPartyType=Third-party type
-Individual=Private individual
-ToCreateContactWithSameName=Will automatically create a contact/address with same information as the third party under the third party. In most cases, even if your third party is a physical person, creating a third party alone is enough.
-ParentCompany=Parent company
-Subsidiaries=Subsidiaries
+ThirdParty=Uchinchi tomon
+ThirdParties=Uchinchi tomonlar
+ThirdPartyProspects=Istiqbollari
+ThirdPartyProspectsStats=Istiqbollari
+ThirdPartyCustomers=Xaridorlar
+ThirdPartyCustomersStats=Xaridorlar
+ThirdPartyCustomersWithIdProf12=%s yoki %s ga ega mijozlar
+ThirdPartySuppliers=Sotuvchilar
+ThirdPartyType=Uchinchi tomon turi
+Individual=Xususiy shaxs
+ToCreateContactWithSameName=Uchinchi shaxs ostida uchinchi shaxs bilan bir xil ma'lumotlarga ega bo'lgan kontakt / manzilni avtomatik ravishda yaratadi. Ko'pgina hollarda, sizning uchinchi shaxsingiz jismoniy shaxs bo'lsa ham, uchinchi shaxsni o'zi yaratish kifoya.
+ParentCompany=Bosh kompaniya
+Subsidiaries=Filiallar
 ReportByMonth=Report per month
-ReportByCustomers=Report per customer
+ReportByCustomers=Xaridor uchun hisobot
 ReportByThirdparties=Report per thirdparty
-ReportByQuarter=Report per rate
-CivilityCode=Civility code
-RegisteredOffice=Registered office
-Lastname=Last name
-Firstname=First name
-PostOrFunction=Job position
-UserTitle=Title
+ReportByQuarter=Har bir stavka bo'yicha hisobot
+CivilityCode=Fuqarolik kodi
+RegisteredOffice=Ro'yxatdan o'tgan ofis
+Lastname=Familiya
+Firstname=Ism
+PostOrFunction=Ish joyi
+UserTitle=Sarlavha
 NatureOfThirdParty=Nature of Third party
 NatureOfContact=Nature of Contact
-Address=Address
-State=State/Province
+Address=Manzil
+State=Shtat / viloyat
 StateCode=State/Province code
-StateShort=State
-Region=Region
+StateShort=Shtat
+Region=Mintaqa
 Region-State=Region - State
-Country=Country
-CountryCode=Country code
-CountryId=Country id
-Phone=Phone
-PhoneShort=Phone
+Country=Mamlakat
+CountryCode=Mamlakat kodi
+CountryId=Mamlakat identifikatori
+Phone=Telefon
+PhoneShort=Telefon
 Skype=Skype
-Call=Call
+Call=Qo'ng'iroq qiling
 Chat=Chat
-PhonePro=Bus. phone
-PhonePerso=Pers. phone
-PhoneMobile=Mobile
-No_Email=Refuse bulk emailings
-Fax=Fax
-Zip=Zip Code
-Town=City
-Web=Web
-Poste= Position
-DefaultLang=Default language
-VATIsUsed=Sales tax used
+PhonePro=Avtobus. telefon
+PhonePerso=Pers. telefon
+PhoneMobile=Mobil
+No_Email=Ommaviy elektron pochta xabarlarini rad eting
+Fax=Faks
+Zip=Pochta indeksi
+Town=Shahar
+Web=Internet
+Poste= Lavozim
+DefaultLang=Standart til
+VATIsUsed=Sotishdan foydalanilgan soliq
 VATIsUsedWhenSelling=This defines if this third party includes a sale tax or not when it makes an invoice to its own customers
-VATIsNotUsed=Sales tax is not used
-CopyAddressFromSoc=Copy address from third-party details
-ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available referring objects
+VATIsNotUsed=Savdo solig'i ishlatilmaydi
+CopyAddressFromSoc=Uchinchi tomon tafsilotlaridan manzilni nusxalash
+ThirdpartyNotCustomerNotSupplierSoNoRef=Uchinchi tomon na mijoz, na sotuvchi, mavjud mos yozuvlar ob'ekti yo'q
 ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor vendor, discounts are not available
-PaymentBankAccount=Payment bank account
-OverAllProposals=Proposals
-OverAllOrders=Orders
-OverAllInvoices=Invoices
-OverAllSupplierProposals=Price requests
+PaymentBankAccount=To'lov bank hisobvarag'i
+OverAllProposals=Takliflar
+OverAllOrders=Buyurtmalar
+OverAllInvoices=Hisob-fakturalar
+OverAllSupplierProposals=Narxlar bo'yicha so'rovlar
 ##### Local Taxes #####
-LocalTax1IsUsed=Use second tax
-LocalTax1IsUsedES= RE is used
-LocalTax1IsNotUsedES= RE is not used
-LocalTax2IsUsed=Use third tax
-LocalTax2IsUsedES= IRPF is used
-LocalTax2IsNotUsedES= IRPF is not used
-WrongCustomerCode=Customer code invalid
-WrongSupplierCode=Vendor code invalid
-CustomerCodeModel=Customer code model
-SupplierCodeModel=Vendor code model
-Gencod=Barcode
+LocalTax1IsUsed=Ikkinchi soliqdan foydalaning
+LocalTax1IsUsedES= RE ishlatiladi
+LocalTax1IsNotUsedES= RE ishlatilmaydi
+LocalTax2IsUsed=Uchinchi soliqdan foydalaning
+LocalTax2IsUsedES= IRPF ishlatiladi
+LocalTax2IsNotUsedES= IRPF ishlatilmaydi
+WrongCustomerCode=Mijoz kodi yaroqsiz
+WrongSupplierCode=Sotuvchi kodi yaroqsiz
+CustomerCodeModel=Mijoz kodining modeli
+SupplierCodeModel=Sotuvchi kodining modeli
+Gencod=Shtrixli kod
 ##### Professional ID #####
 ProfId1Short=Prof. id 1
 ProfId2Short=Prof. id 2
@@ -115,17 +115,17 @@ ProfId3=Professional ID 3
 ProfId4=Professional ID 4
 ProfId5=Professional ID 5
 ProfId6=Professional ID 6
-ProfId1AR=Prof Id 1 (CUIT/CUIL)
+ProfId1AR=Prof Id 1 (CUIT / CUIL)
 ProfId2AR=Prof Id 2 (Revenu brutes)
 ProfId3AR=-
 ProfId4AR=-
 ProfId5AR=-
 ProfId6AR=-
 ProfId1AT=Prof Id 1 (USt.-IdNr)
-ProfId2AT=Prof Id 2 (USt.-Nr)
+ProfId2AT=Prof Id 2 (US-Nr)
 ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=EORI number
+ProfId5AT=EORI raqami
 ProfId6AT=-
 ProfId1AU=Prof Id 1 (ABN)
 ProfId2AU=-
@@ -133,23 +133,23 @@ ProfId3AU=-
 ProfId4AU=-
 ProfId5AU=-
 ProfId6AU=-
-ProfId1BE=Prof Id 1 (Professional number)
+ProfId1BE=Prof Id 1 (Professional raqam)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=EORI number
+ProfId5BE=EORI raqami
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inscricao Estadual)
-ProfId3BR=IM (Inscricao Municipal)
+ProfId3BR=IM (Inscricao munitsipal)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
 ProfId1CH=UID-Nummer
 ProfId2CH=-
-ProfId3CH=Prof Id 1 (Federal number)
-ProfId4CH=Prof Id 2 (Commercial Record number)
-ProfId5CH=EORI number
+ProfId3CH=Prof Id 1 (Federal raqam)
+ProfId4CH=Prof Id 2 (tijorat yozuvlari raqami)
+ProfId5CH=EORI raqami
 ProfId6CH=-
 ProfId1CL=Prof Id 1 (R.U.T.)
 ProfId2CL=-
@@ -164,22 +164,22 @@ ProfId4CO=-
 ProfId5CO=-
 ProfId6CO=-
 ProfId1DE=Prof Id 1 (USt.-IdNr)
-ProfId2DE=Prof Id 2 (USt.-Nr)
+ProfId2DE=Prof Id 2 (US-Nr)
 ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
 ProfId4DE=-
-ProfId5DE=EORI number
+ProfId5DE=EORI raqami
 ProfId6DE=-
-ProfId1ES=Prof Id 1 (CIF/NIF)
-ProfId2ES=Prof Id 2 (Social security number)
+ProfId1ES=Prof Id 1 (CIF / NIF)
+ProfId2ES=Prof Id 2 (ijtimoiy sug'urta raqami)
 ProfId3ES=Prof Id 3 (CNAE)
-ProfId4ES=Prof Id 4 (Collegiate number)
-ProfId5ES=Prof Id 5 (EORI number)
+ProfId4ES=Prof Id 4 (kollej raqami)
+ProfId5ES=Prof Id 5 (EORI raqami)
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
-ProfId3FR=Prof Id 3 (NAF, old APE)
-ProfId4FR=Prof Id 4 (RCS/RM)
-ProfId5FR=Prof Id 5 (numéro EORI)
+ProfId3FR=Prof Id 3 (NAF, eski APE)
+ProfId4FR=Prof Id 4 (RCS / RM)
+ProfId5FR=Prof Id 5 (raqamli EORI)
 ProfId6FR=-
 ProfId1ShortFR=SIREN
 ProfId2ShortFR=SIRET
@@ -187,7 +187,7 @@ ProfId3ShortFR=NAF
 ProfId4ShortFR=RCS
 ProfId5ShortFR=EORI
 ProfId6ShortFR=-
-ProfId1GB=Registration Number
+ProfId1GB=Ro'yxatdan o'tish raqami
 ProfId2GB=-
 ProfId3GB=SIC
 ProfId4GB=-
@@ -201,7 +201,7 @@ ProfId5HN=-
 ProfId6HN=-
 ProfId1IN=Prof Id 1 (TIN)
 ProfId2IN=Prof Id 2 (PAN)
-ProfId3IN=Prof Id 3 (SRVC TAX)
+ProfId3IN=Prof Id 3 (SRVC soliq)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
@@ -211,35 +211,35 @@ ProfId3IT=-
 ProfId4IT=-
 ProfId5IT=EORI number
 ProfId6IT=-
-ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
-ProfId2LU=Id. prof. 2 (Business permit)
+ProfId1LU=Id. prof. 1 (R.C.S. Lyuksemburg)
+ProfId2LU=Id. prof. 2 (biznes uchun ruxsatnoma)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=EORI number
+ProfId5LU=EORI raqami
 ProfId6LU=-
 ProfId1MA=Id prof. 1 (R.C.)
 ProfId2MA=Id prof. 2 (Patente)
 ProfId3MA=Id prof. 3 (I.F.)
 ProfId4MA=Id prof. 4 (C.N.S.S.)
-ProfId5MA=Id prof. 5 (I.C.E.)
+ProfId5MA=Id prof. 5 (miloddan avvalgi)
 ProfId6MA=-
 ProfId1MX=Prof Id 1 (R.F.C).
 ProfId2MX=Prof Id 2 (R..P. IMSS)
-ProfId3MX=Prof Id 3 (Profesional Charter)
+ProfId3MX=Prof Id 3 (Professional Nizom)
 ProfId4MX=-
 ProfId5MX=-
 ProfId6MX=-
-ProfId1NL=KVK nummer
+ProfId1NL=KVK nummeri
 ProfId2NL=-
 ProfId3NL=-
-ProfId4NL=Burgerservicenummer (BSN)
-ProfId5NL=EORI number
+ProfId4NL=Burgerservitsenummer (BSN)
+ProfId5NL=EORI raqami
 ProfId6NL=-
 ProfId1PT=Prof Id 1 (NIPC)
-ProfId2PT=Prof Id 2 (Social security number)
-ProfId3PT=Prof Id 3 (Commercial Record number)
-ProfId4PT=Prof Id 4 (Conservatory)
-ProfId5PT=Prof Id 5 (EORI number)
+ProfId2PT=Prof Id 2 (ijtimoiy sug'urta raqami)
+ProfId3PT=Prof Id 3 (tijorat yozuvlari raqami)
+ProfId4PT=Prof Id 4 (Konservatoriya)
+ProfId5PT=Prof Id 5 (EORI raqami)
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -248,8 +248,8 @@ ProfId4SN=-
 ProfId5SN=-
 ProfId6SN=-
 ProfId1TN=Prof Id 1 (RC)
-ProfId2TN=Prof Id 2 (Fiscal matricule)
-ProfId3TN=Prof Id 3 (Douane code)
+ProfId2TN=Prof Id 2 (moliyaviy matritsa)
+ProfId3TN=Prof Id 3 (Douane kodi)
 ProfId4TN=Prof Id 4 (BAN)
 ProfId5TN=-
 ProfId6TN=-
@@ -272,160 +272,160 @@ ProfId4RU=Prof Id 4 (OKPO)
 ProfId5RU=-
 ProfId6RU=-
 ProfId1DZ=RC
-ProfId2DZ=Art.
+ProfId2DZ=San'at.
 ProfId3DZ=NIF
 ProfId4DZ=NIS
-VATIntra=VAT ID
-VATIntraShort=VAT ID
-VATIntraSyntaxIsValid=Syntax is valid
+VATIntra=QQS identifikatori
+VATIntraShort=QQS identifikatori
+VATIntraSyntaxIsValid=Sintaksis haqiqiydir
 VATReturn=VAT return
-ProspectCustomer=Prospect / Customer
-Prospect=Prospect
-CustomerCard=Customer Card
-Customer=Customer
-CustomerRelativeDiscount=Relative customer discount
+ProspectCustomer=Prospekt / mijoz
+Prospect=Istiqbol
+CustomerCard=Mijozlar kartasi
+Customer=Mijoz
+CustomerRelativeDiscount=Mijozlarga nisbatan chegirma
 SupplierRelativeDiscount=Relative vendor discount
-CustomerRelativeDiscountShort=Relative discount
-CustomerAbsoluteDiscountShort=Absolute discount
-CompanyHasRelativeDiscount=This customer has a default discount of <b>%s%%</b>
-CompanyHasNoRelativeDiscount=This customer has no relative discount by default
+CustomerRelativeDiscountShort=Nisbatan chegirma
+CustomerAbsoluteDiscountShort=Mutlaq chegirma
+CompanyHasRelativeDiscount=Ushbu mijozda standart chegirma mavjud: <b> %s%% </b>
+CompanyHasNoRelativeDiscount=Ushbu mijozda sukut bo'yicha nisbatan chegirma mavjud emas
 HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this vendor
 HasNoRelativeDiscountFromSupplier=You have no default relative discount from this vendor
-CompanyHasAbsoluteDiscount=This customer has discounts available (credits notes or down payments) for <b>%s</b> %s
+CompanyHasAbsoluteDiscount=Ushbu mijozda <b> %s </b> %s uchun chegirmalar mavjud (kredit yozuvlari yoki dastlabki to'lovlar).
 CompanyHasDownPaymentOrCommercialDiscount=This customer has discounts available (commercial, down payments) for <b>%s</b> %s
-CompanyHasCreditNote=This customer still has credit notes for <b>%s</b> %s
+CompanyHasCreditNote=Ushbu mijozda hali ham <b> %s </b> %s uchun kredit yozuvlari mavjud
 HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this vendor
 HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this vendor
 HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this vendor
 HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this vendor
-CompanyHasNoAbsoluteDiscount=This customer has no discount credit available
-CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
-CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
+CompanyHasNoAbsoluteDiscount=Ushbu mijozda chegirmali kredit mavjud emas
+CustomerAbsoluteDiscountAllUsers=Mijozlarga mutlaqo chegirmalar (barcha foydalanuvchilar tomonidan beriladi)
+CustomerAbsoluteDiscountMy=Mijozlarga mutlaqo chegirmalar (o'zingiz berasiz)
 SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (entered by all users)
 SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself)
 DiscountNone=None
 Vendor=Vendor
 Supplier=Vendor
-AddContact=Create contact
-AddContactAddress=Create contact/address
-EditContact=Edit contact
-EditContactAddress=Edit contact/address
-Contact=Contact/Address
-Contacts=Contacts/Addresses
-ContactId=Contact id
-ContactsAddresses=Contacts/Addresses
-FromContactName=Name:
-NoContactDefinedForThirdParty=No contact defined for this third party
-NoContactDefined=No contact defined
-DefaultContact=Default contact/address
+AddContact=Kontakt yarating
+AddContactAddress=Kontakt / manzil yarating
+EditContact=Kontaktni tahrirlash
+EditContactAddress=Kontakt / manzilni tahrirlash
+Contact=Aloqa / manzil
+Contacts=Aloqa / manzillar
+ContactId=Aloqa identifikatori
+ContactsAddresses=Aloqa / manzillar
+FromContactName=Ism:
+NoContactDefinedForThirdParty=Ushbu uchinchi tomon uchun hech qanday aloqa aniqlanmagan
+NoContactDefined=Hech qanday aloqa aniqlanmadi
+DefaultContact=Odatiy aloqa / manzil
 ContactByDefaultFor=Default contact/address for
-AddThirdParty=Create third party
-DeleteACompany=Delete a company
-PersonalInformations=Personal data
+AddThirdParty=Uchinchi tomonni yarating
+DeleteACompany=Kompaniyani o'chirib tashlang
+PersonalInformations=Shaxsiy malumot
 AccountancyCode=Accounting account
-CustomerCode=Customer Code
-SupplierCode=Vendor Code
-CustomerCodeShort=Customer Code
-SupplierCodeShort=Vendor Code
-CustomerCodeDesc=Customer Code, unique for all customers
-SupplierCodeDesc=Vendor Code, unique for all vendors
-RequiredIfCustomer=Required if third party is a customer or prospect
-RequiredIfSupplier=Required if third party is a vendor
-ValidityControledByModule=Validity controlled by the module
-ThisIsModuleRules=Rules for this module
-ProspectToContact=Prospect to contact
-CompanyDeleted=Company "%s" deleted from database.
-ListOfContacts=List of contacts/addresses
-ListOfContactsAddresses=List of contacts/addresses
-ListOfThirdParties=List of Third Parties
+CustomerCode=Mijozlar kodi
+SupplierCode=Sotuvchi kodi
+CustomerCodeShort=Mijozlar kodi
+SupplierCodeShort=Sotuvchi kodi
+CustomerCodeDesc=Mijozlar kodi, barcha mijozlar uchun noyobdir
+SupplierCodeDesc=Sotuvchi kodi, barcha sotuvchilar uchun noyobdir
+RequiredIfCustomer=Uchinchi shaxs mijoz yoki istiqbolli bo'lsa, talab qilinadi
+RequiredIfSupplier=Uchinchi tomon sotuvchi bo'lsa, talab qilinadi
+ValidityControledByModule=Modul tomonidan boshqariladigan amal qilish muddati
+ThisIsModuleRules=Ushbu modul uchun qoidalar
+ProspectToContact=Aloqa qilish istiqboli
+CompanyDeleted="%s" kompaniyasi ma'lumotlar bazasidan o'chirildi.
+ListOfContacts=Kontaktlar / manzillar ro'yxati
+ListOfContactsAddresses=Kontaktlar / manzillar ro'yxati
+ListOfThirdParties=Uchinchi tomonlarning ro'yxati
 ShowCompany=Third Party
-ShowContact=Contact-Address
-ContactsAllShort=All (No filter)
-ContactType=Contact type
-ContactForOrders=Order's contact
-ContactForOrdersOrShipments=Order's or shipment's contact
-ContactForProposals=Proposal's contact
-ContactForContracts=Contract's contact
-ContactForInvoices=Invoice's contact
-NoContactForAnyOrder=This contact is not a contact for any order
-NoContactForAnyOrderOrShipments=This contact is not a contact for any order or shipment
-NoContactForAnyProposal=This contact is not a contact for any commercial proposal
-NoContactForAnyContract=This contact is not a contact for any contract
-NoContactForAnyInvoice=This contact is not a contact for any invoice
-NewContact=New contact
-NewContactAddress=New Contact/Address
-MyContacts=My contacts
-Capital=Capital
-CapitalOf=Capital of %s
-EditCompany=Edit company
-ThisUserIsNot=This user is not a prospect, customer or vendor
-VATIntraCheck=Check
-VATIntraCheckDesc=The VAT ID must include the country prefix. The link <b>%s</b> uses the European VAT checker service (VIES) which requires internet access from the Dolibarr server.
+ShowContact=Aloqa manzili
+ContactsAllShort=Hammasi (filtrsiz)
+ContactType=Aloqa turi
+ContactForOrders=Buyurtmaning aloqasi
+ContactForOrdersOrShipments=Buyurtma yoki jo'natma bilan aloqa qilish
+ContactForProposals=Taklifning aloqasi
+ContactForContracts=Shartnomaning aloqasi
+ContactForInvoices=Hisob-fakturaning aloqasi
+NoContactForAnyOrder=Ushbu aloqa har qanday buyurtma uchun kontakt emas
+NoContactForAnyOrderOrShipments=Ushbu aloqa har qanday buyurtma yoki jo'natma uchun kontakt emas
+NoContactForAnyProposal=Ushbu aloqa har qanday tijorat taklifi uchun kontakt emas
+NoContactForAnyContract=Ushbu aloqa har qanday shartnoma uchun kontakt emas
+NoContactForAnyInvoice=Ushbu kontakt har qanday hisob-faktura uchun kontakt emas
+NewContact=Yangi aloqa
+NewContactAddress=Yangi aloqa / manzil
+MyContacts=Mening kontaktlarim
+Capital=Poytaxt
+CapitalOf=%s poytaxti
+EditCompany=Kompaniyani tahrirlash
+ThisUserIsNot=Ushbu foydalanuvchi istiqbolli, mijoz yoki sotuvchi emas
+VATIntraCheck=Tekshiring
+VATIntraCheckDesc=QQS identifikatorida mamlakat prefiksi bo'lishi kerak. <b> %s </b> havolasida Dolibarr serveridan Internetga kirishni talab qiladigan Evropa QQS tekshiruvi xizmati (VIES) ishlatiladi.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
-VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commission website
-VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
-ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
-NorProspectNorCustomer=Not prospect, nor customer
-JuridicalStatus=Business entity type
+VATIntraCheckableOnEUSite=Evropa Komissiyasi veb-saytida Jamiyat ichidagi QQS identifikatorini tekshiring
+VATIntraManualCheck=Shuningdek, siz Evropa Komissiyasining veb-saytida <a href="%s" target="_blank"> %s </a>
+ErrorVATCheckMS_UNAVAILABLE=Tekshirib bo'lmaydi. Chek xizmati a'zo davlat tomonidan taqdim etilmaydi (%s).
+NorProspectNorCustomer=Istiqbolli ham, mijoz ham emas
+JuridicalStatus=Xo'jalik yurituvchi sub'ekt turi
 Workforce=Workforce
-Staff=Employees
-ProspectLevelShort=Potential
-ProspectLevel=Prospect potential
-ContactPrivate=Private
-ContactPublic=Shared
-ContactVisibility=Visibility
-ContactOthers=Other
-OthersNotLinkedToThirdParty=Others, not linked to a third party
-ProspectStatus=Prospect status
+Staff=Xodimlar
+ProspectLevelShort=Potentsial
+ProspectLevel=Istiqbolli salohiyat
+ContactPrivate=Xususiy
+ContactPublic=Umumiy
+ContactVisibility=Ko'rinish
+ContactOthers=Boshqalar
+OthersNotLinkedToThirdParty=Uchinchi tomon bilan bog'liq bo'lmagan boshqalar
+ProspectStatus=Istiqbol holati
 PL_NONE=None
-PL_UNKNOWN=Unknown
-PL_LOW=Low
-PL_MEDIUM=Medium
-PL_HIGH=High
+PL_UNKNOWN=Noma'lum
+PL_LOW=Kam
+PL_MEDIUM=O'rta
+PL_HIGH=Yuqori
 TE_UNKNOWN=-
-TE_STARTUP=Startup
-TE_GROUP=Large company
-TE_MEDIUM=Medium company
-TE_ADMIN=Governmental
-TE_SMALL=Small company
-TE_RETAIL=Retailer
-TE_WHOLE=Wholesaler
-TE_PRIVATE=Private individual
-TE_OTHER=Other
-StatusProspect-1=Do not contact
-StatusProspect0=Never contacted
-StatusProspect1=To be contacted
-StatusProspect2=Contact in process
-StatusProspect3=Contact done
-ChangeDoNotContact=Change status to 'Do not contact'
-ChangeNeverContacted=Change status to 'Never contacted'
-ChangeToContact=Change status to 'To be contacted'
-ChangeContactInProcess=Change status to 'Contact in process'
-ChangeContactDone=Change status to 'Contact done'
-ProspectsByStatus=Prospects by status
+TE_STARTUP=Ish boshlash
+TE_GROUP=Katta kompaniya
+TE_MEDIUM=O'rta kompaniya
+TE_ADMIN=Hukumat
+TE_SMALL=Kichik kompaniya
+TE_RETAIL=Chakana savdo
+TE_WHOLE=Ulgurji sotuvchi
+TE_PRIVATE=Xususiy shaxs
+TE_OTHER=Boshqalar
+StatusProspect-1=Aloqa qilmang
+StatusProspect0=Hech qachon bog'lanmagan
+StatusProspect1=Bog'lanish uchun
+StatusProspect2=Aloqa jarayonida
+StatusProspect3=Aloqa tugadi
+ChangeDoNotContact="Kontakt qilmang" holatini o'zgartirish
+ChangeNeverContacted="Hech qachon bog'lanmagan" holatini o'zgartirish
+ChangeToContact=Vaziyatni "Bog'lanish uchun" ga o'zgartirish
+ChangeContactInProcess=Statusni "Kontakt jarayonda" ga o'zgartirish
+ChangeContactDone="Kontakt tugadi" holatini o'zgartirish
+ProspectsByStatus=Vaziyat bo'yicha istiqbollar
 NoParentCompany=None
-ExportCardToFormat=Export card to format
-ContactNotLinkedToCompany=Contact not linked to any third party
-DolibarrLogin=Dolibarr login
-NoDolibarrAccess=No Dolibarr access
-ExportDataset_company_1=Third-parties (companies/foundations/physical people) and their properties
-ExportDataset_company_2=Contacts and their properties
-ImportDataset_company_1=Third-parties and their properties
-ImportDataset_company_2=Third-parties additional contacts/addresses and attributes
-ImportDataset_company_3=Third-parties Bank accounts
-ImportDataset_company_4=Third-parties Sales representatives (assign sales representatives/users to companies)
-PriceLevel=Price Level
+ExportCardToFormat=Kartani formatlash uchun eksport qiling
+ContactNotLinkedToCompany=Uchinchi tomon bilan bog'lanmagan aloqa
+DolibarrLogin=Dolibarr tizimiga kirish
+NoDolibarrAccess=Dolibarr-ga kirish taqiqlangan
+ExportDataset_company_1=Uchinchi tomonlar (kompaniyalar / fondlar / jismoniy odamlar) va ularning xususiyatlari
+ExportDataset_company_2=Kontaktlar va ularning xususiyatlari
+ImportDataset_company_1=Uchinchi shaxslar va ularning xususiyatlari
+ImportDataset_company_2=Uchinchi tomonlar qo'shimcha kontaktlar / manzillar va atributlar
+ImportDataset_company_3=Uchinchi tomonlarning bank hisobvaraqlari
+ImportDataset_company_4=Uchinchi tomon savdo vakillari (savdo vakillarini / foydalanuvchilarni kompaniyalarga tayinlash)
+PriceLevel=Narx darajasi
 PriceLevelLabels=Price Level Labels
-DeliveryAddress=Delivery address
-AddAddress=Add address
-SupplierCategory=Vendor category
-JuridicalStatus200=Independent
-DeleteFile=Delete file
-ConfirmDeleteFile=Are you sure you want to delete this file?
-AllocateCommercial=Assigned to sales representative
-Organization=Organization
-FiscalYearInformation=Fiscal Year
-FiscalMonthStart=Starting month of the fiscal year
+DeliveryAddress=Etkazib berish manzili
+AddAddress=Manzil qo'shing
+SupplierCategory=Sotuvchi toifasi
+JuridicalStatus200=Mustaqil
+DeleteFile=Faylni o'chirish
+ConfirmDeleteFile=Ushbu faylni o'chirishni xohlaysizmi?
+AllocateCommercial=Savdo vakiliga tayinlangan
+Organization=Tashkilot
+FiscalYearInformation=Moliyaviy yil
+FiscalMonthStart=Moliya yilidan boshlab
 SocialNetworksInformation=Social networks
 SocialNetworksFacebookURL=Facebook URL
 SocialNetworksTwitterURL=Twitter URL
@@ -433,34 +433,34 @@ SocialNetworksLinkedinURL=Linkedin URL
 SocialNetworksInstagramURL=Instagram URL
 SocialNetworksYoutubeURL=Youtube URL
 SocialNetworksGithubURL=Github URL
-YouMustAssignUserMailFirst=You must create an email for this user prior to being able to add an email notification.
-YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
-ListSuppliersShort=List of Vendors
-ListProspectsShort=List of Prospects
-ListCustomersShort=List of Customers
-ThirdPartiesArea=Third Parties/Contacts
-LastModifiedThirdParties=Latest %s Third Parties which were modified
-UniqueThirdParties=Total number of Third Parties
-InActivity=Open
-ActivityCeased=Closed
-ThirdPartyIsClosed=Third party is closed
-ProductsIntoElements=List of products/services mapped to %s
-CurrentOutstandingBill=Current outstanding bill
-OutstandingBill=Max. for outstanding bill
-OutstandingBillReached=Max. for outstanding bill reached
+YouMustAssignUserMailFirst=Elektron pochta xabarnomasini qo'shishdan oldin siz ushbu foydalanuvchi uchun elektron pochta xabarini yaratishingiz kerak.
+YouMustCreateContactFirst=Elektron pochta xabarnomalarini qo'shish uchun avval uchinchi tomon uchun tegishli elektron pochta xabarlari bilan aloqa o'rnatishingiz kerak
+ListSuppliersShort=Sotuvchilar ro'yxati
+ListProspectsShort=Istiqbollar ro'yxati
+ListCustomersShort=Mijozlar ro'yxati
+ThirdPartiesArea=Uchinchi tomonlar / Kontaktlar
+LastModifiedThirdParties=Oxirgi %s o'zgartirilgan uchinchi tomonlar
+UniqueThirdParties=Uchinchi tomonlarning umumiy soni
+InActivity=Ochiq
+ActivityCeased=Yopiq
+ThirdPartyIsClosed=Uchinchi tomon yopiq
+ProductsIntoElements=%s-ga bog'langan mahsulot / xizmatlarning ro'yxati
+CurrentOutstandingBill=Amaldagi hisob-kitob
+OutstandingBill=Maks. qarzdorlik uchun
+OutstandingBillReached=Maks. qarzdorlik uchun
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
-LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
-ManagingDirectors=Manager(s) name (CEO, director, president...)
-MergeOriginThirdparty=Duplicate third party (third party you want to delete)
-MergeThirdparties=Merge third parties
-ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
-ThirdpartiesMergeSuccess=Third parties have been merged
-SaleRepresentativeLogin=Login of sales representative
-SaleRepresentativeFirstname=First name of sales representative
-SaleRepresentativeLastname=Last name of sales representative
-ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
-NewCustomerSupplierCodeProposed=Customer or Vendor code already used, a new code is suggested
+MonkeyNumRefModelDesc=Mijoz kodi uchun %syymm-nnnn formatidagi raqamni va sotuvchi kodi uchun %syymm-nnnn ni qaytaring, bu erda yy yil, mm oy va nnnn ketma-ket avtomatik ortib boruvchi raqam va 0 ga qaytmaydi.
+LeopardNumRefModelDesc=Kod bepul. Ushbu kodni istalgan vaqtda o'zgartirish mumkin.
+ManagingDirectors=Menejer (lar) ning ismi (bosh direktor, direktor, prezident ...)
+MergeOriginThirdparty=Uchinchi tomonning nusxasini oling (o'chirmoqchi bo'lgan uchinchi tomon)
+MergeThirdparties=Uchinchi tomonlarni birlashtirish
+ConfirmMergeThirdparties=Tanlangan uchinchi tomonni amaldagi bilan birlashtirishni xohlaysizmi? Barcha bog'langan ob'ektlar (hisob-fakturalar, buyurtmalar, ...) joriy uchinchi tomonga ko'chiriladi, shundan so'ng tanlangan uchinchi tomon o'chiriladi.
+ThirdpartiesMergeSuccess=Uchinchi tomonlar birlashtirildi
+SaleRepresentativeLogin=Savdo vakili kirish
+SaleRepresentativeFirstname=Savdo vakilining ismi
+SaleRepresentativeLastname=Savdo vakilining familiyasi
+ErrorThirdpartiesMerge=Uchinchi tomonlarni o'chirishda xatolik yuz berdi. Iltimos, jurnalni tekshiring. O'zgarishlar qaytarildi.
+NewCustomerSupplierCodeProposed=Mijoz yoki sotuvchi kodi allaqachon ishlatilgan, yangi kod taklif etiladi
 KeepEmptyIfGenericAddress=Keep this field empty if this address is a generic address
 #Imports
 PaymentTypeCustomer=Payment Type - Customer
diff --git a/htdocs/langs/uz_UZ/compta.lang b/htdocs/langs/uz_UZ/compta.lang
index 7cae82e6ac7..a3910f04a4e 100644
--- a/htdocs/langs/uz_UZ/compta.lang
+++ b/htdocs/langs/uz_UZ/compta.lang
@@ -1,268 +1,268 @@
 # Dolibarr language file - Source file is en_US - compta
-MenuFinancial=Billing | Payment
-TaxModuleSetupToModifyRules=Go to <a href="%s">Taxes module setup</a> to modify rules for calculation
-TaxModuleSetupToModifyRulesLT=Go to <a href="%s">Company setup</a> to modify rules for calculation
-OptionMode=Option for accountancy
-OptionModeTrue=Option Incomes-Expenses
-OptionModeVirtual=Option Claims-Debts
-OptionModeTrueDesc=In this context, the turnover is calculated over payments (date of payments). The validity of the figures is assured only if the book-keeping is scrutinized through the input/output on the accounts via invoices.
-OptionModeVirtualDesc=In this context, the turnover is calculated over invoices (date of validation). When these invoices are due, whether they have been paid or not, they are listed in the turnover output.
-FeatureIsSupportedInInOutModeOnly=Feature only available in CREDITS-DEBTS accountancy mode (See Accountancy module configuration)
-VATReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Tax module setup.
-LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Company setup.
-Param=Setup
-RemainingAmountPayment=Amount payment remaining:
+MenuFinancial=Hisob-kitoblar | To'lov
+TaxModuleSetupToModifyRules=Hisoblash qoidalarini o'zgartirish uchun <a href="%s"> soliqlar modulini o'rnatish </a> ga o'ting.
+TaxModuleSetupToModifyRulesLT=Hisoblash qoidalarini o'zgartirish uchun <a href="%s"> kompaniyasini sozlash </a>-ga o'ting.
+OptionMode=Buxgalteriya uchun variant
+OptionModeTrue=Variant-xarajatlar
+OptionModeVirtual=Optsion da'volar-qarzlar
+OptionModeTrueDesc=Shu nuqtai nazardan, tovar aylanmasi to'lovlar bo'yicha (to'lovlar sanasi) bo'yicha hisoblanadi. Hisob-kitoblarni hisobga olish-fakturalar orqali kiritish / chiqarish orqali buxgalteriya hisobi tekshirilgandagina raqamlarning haqiqiyligi ta'minlanadi.
+OptionModeVirtualDesc=Shu nuqtai nazardan, tovar aylanmasi schyot-fakturalar bo'yicha hisoblanadi (tasdiqlash sanasi). Ushbu hisob-fakturalar to'langan yoki to'lanmaganligiga qaramay, ular tovar aylanmasi bo'yicha ro'yxatga olinadi.
+FeatureIsSupportedInInOutModeOnly=Xususiyat faqat CREDITS-DEBTS buxgalteriya rejimida mavjud (Buxgalteriya moduli konfiguratsiyasini ko'ring)
+VATReportBuildWithOptionDefinedInModule=Bu erda ko'rsatilgan miqdorlar Soliq modulini o'rnatish qoidalari asosida hisoblanadi.
+LTReportBuildWithOptionDefinedInModule=Bu erda ko'rsatilgan mablag'lar Kompaniya sozlamalari bo'yicha belgilangan qoidalar asosida hisoblanadi.
+Param=Sozlash; o'rnatish
+RemainingAmountPayment=Qolgan to'lov miqdori:
 Account=Account
-Accountparent=Parent account
-Accountsparent=Parent accounts
-Income=Income
-Outcome=Expense
+Accountparent=Ota-ona hisobi
+Accountsparent=Ota-onalar hisoblari
+Income=Daromad
+Outcome=Xarajatlar
 MenuReportInOut=Income / Expense
-ReportInOut=Balance of income and expenses
-ReportTurnover=Turnover invoiced
+ReportInOut=Daromadlar va xarajatlar balansi
+ReportTurnover=Tovar-faktura
 ReportTurnoverCollected=Turnover collected
-PaymentsNotLinkedToInvoice=Payments not linked to any invoice, so not linked to any third party
-PaymentsNotLinkedToUser=Payments not linked to any user
-Profit=Profit
-AccountingResult=Accounting result
+PaymentsNotLinkedToInvoice=To'lovlar hech qanday hisob-fakturaga bog'lanmagan, shuning uchun hech qanday uchinchi tomon bilan bog'lanmagan
+PaymentsNotLinkedToUser=Hech qanday foydalanuvchi bilan bog'lanmagan to'lovlar
+Profit=Foyda
+AccountingResult=Buxgalteriya natijasi
 BalanceBefore=Balance (before)
-Balance=Balance
-Debit=Debit
-Credit=Credit
-Piece=Accounting Doc.
-AmountHTVATRealReceived=Net collected
-AmountHTVATRealPaid=Net paid
-VATToPay=Tax sales
-VATReceived=Tax received
-VATToCollect=Tax purchases
-VATSummary=Tax monthly
+Balance=Balans
+Debit=Debet
+Credit=Kredit
+Piece=Buxgalteriya hujjati.
+AmountHTVATRealReceived=Tarmoq yig'ildi
+AmountHTVATRealPaid=Net to'langan
+VATToPay=Soliqni sotish
+VATReceived=Soliq olingan
+VATToCollect=Soliq xaridlari
+VATSummary=Soliq har oy
 VATBalance=Tax Balance
-VATPaid=Tax paid
+VATPaid=To'langan soliq
 LT1Summary=Tax 2 summary
 LT2Summary=Tax 3 summary
-LT1SummaryES=RE Balance
-LT2SummaryES=IRPF Balance
+LT1SummaryES=RE balansi
+LT2SummaryES=IRPF balansi
 LT1SummaryIN=CGST Balance
 LT2SummaryIN=SGST Balance
 LT1Paid=Tax 2 paid
 LT2Paid=Tax 3 paid
-LT1PaidES=RE Paid
-LT2PaidES=IRPF Paid
+LT1PaidES=RE to'langan
+LT2PaidES=IRPF pullik
 LT1PaidIN=CGST Paid
 LT2PaidIN=SGST Paid
 LT1Customer=Tax 2 sales
 LT1Supplier=Tax 2 purchases
-LT1CustomerES=RE sales
-LT1SupplierES=RE purchases
+LT1CustomerES=RE savdolari
+LT1SupplierES=RE xaridlari
 LT1CustomerIN=CGST sales
 LT1SupplierIN=CGST purchases
 LT2Customer=Tax 3 sales
 LT2Supplier=Tax 3 purchases
-LT2CustomerES=IRPF sales
-LT2SupplierES=IRPF purchases
+LT2CustomerES=IRPF sotuvi
+LT2SupplierES=IRPF xaridlari
 LT2CustomerIN=SGST sales
 LT2SupplierIN=SGST purchases
-VATCollected=VAT collected
+VATCollected=QQS yig'ildi
 StatusToPay=To pay
-SpecialExpensesArea=Area for all special payments
+SpecialExpensesArea=Barcha maxsus to'lovlar uchun maydon
 VATExpensesArea=Area for all TVA payments
-SocialContribution=Social or fiscal tax
-SocialContributions=Social or fiscal taxes
-SocialContributionsDeductibles=Deductible social or fiscal taxes
-SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+SocialContribution=Ijtimoiy yoki fiskal soliq
+SocialContributions=Ijtimoiy yoki soliq soliqlari
+SocialContributionsDeductibles=Chegiriladigan ijtimoiy yoki soliq soliqlari
+SocialContributionsNondeductibles=Chegirilmaydigan ijtimoiy yoki soliq soliqlari
 DateOfSocialContribution=Date of social or fiscal tax
-LabelContrib=Label contribution
-TypeContrib=Type contribution
-MenuSpecialExpenses=Special expenses
-MenuTaxAndDividends=Taxes and dividends
-MenuSocialContributions=Social/fiscal taxes
-MenuNewSocialContribution=New social/fiscal tax
-NewSocialContribution=New social/fiscal tax
+LabelContrib=Yorliq hissasi
+TypeContrib=Hissa turi
+MenuSpecialExpenses=Maxsus xarajatlar
+MenuTaxAndDividends=Soliqlar va dividendlar
+MenuSocialContributions=Ijtimoiy / soliq soliqlari
+MenuNewSocialContribution=Yangi ijtimoiy / fiskal soliq
+NewSocialContribution=Yangi ijtimoiy / fiskal soliq
 AddSocialContribution=Add social/fiscal tax
-ContributionsToPay=Social/fiscal taxes to pay
-AccountancyTreasuryArea=Billing and payment area
-NewPayment=New payment
-PaymentCustomerInvoice=Customer invoice payment
+ContributionsToPay=To'lanadigan ijtimoiy / soliq soliqlari
+AccountancyTreasuryArea=Hisob-kitob va to'lov maydoni
+NewPayment=Yangi to'lov
+PaymentCustomerInvoice=Mijozlar uchun hisob-fakturani to'lash
 PaymentSupplierInvoice=vendor invoice payment
-PaymentSocialContribution=Social/fiscal tax payment
-PaymentVat=VAT payment
+PaymentSocialContribution=Ijtimoiy / soliq soliq to'lovi
+PaymentVat=QQS to'lovi
 AutomaticCreationPayment=Automatically record the payment
-ListPayment=List of payments
-ListOfCustomerPayments=List of customer payments
-ListOfSupplierPayments=List of vendor payments
-DateStartPeriod=Date start period
-DateEndPeriod=Date end period
-newLT1Payment=New tax 2 payment
-newLT2Payment=New tax 3 payment
-LT1Payment=Tax 2 payment
-LT1Payments=Tax 2 payments
-LT2Payment=Tax 3 payment
-LT2Payments=Tax 3 payments
-newLT1PaymentES=New RE payment
-newLT2PaymentES=New IRPF payment
-LT1PaymentES=RE Payment
-LT1PaymentsES=RE Payments
-LT2PaymentES=IRPF Payment
-LT2PaymentsES=IRPF Payments
-VATPayment=Sales tax payment
-VATPayments=Sales tax payments
+ListPayment=To'lovlar ro'yxati
+ListOfCustomerPayments=Mijozlar uchun to'lovlar ro'yxati
+ListOfSupplierPayments=Sotuvchilarning to'lovlari ro'yxati
+DateStartPeriod=Sana boshlanish davri
+DateEndPeriod=Sana tugash davri
+newLT1Payment=Yangi soliq 2 to'lovi
+newLT2Payment=Yangi soliq 3 to'lovi
+LT1Payment=Soliq 2 to'lash
+LT1Payments=Soliq 2 to'lovlari
+LT2Payment=Soliq 3 to'lovi
+LT2Payments=Soliq 3 to'lovlari
+newLT1PaymentES=Yangi RE to'lovi
+newLT2PaymentES=IRPFning yangi to'lovi
+LT1PaymentES=RE to'lovi
+LT1PaymentsES=RE to'lovlari
+LT2PaymentES=IRPF to'lovi
+LT2PaymentsES=IRPF to'lovlari
+VATPayment=Savdo uchun soliq to'lash
+VATPayments=Sotish bo'yicha soliq to'lovlari
 VATDeclarations=VAT declarations
 VATDeclaration=VAT declaration
-VATRefund=Sales tax refund
+VATRefund=Savdo solig'ini qaytarish
 NewVATPayment=New sales tax payment
 NewLocalTaxPayment=New tax %s payment
-Refund=Refund
-SocialContributionsPayments=Social/fiscal taxes payments
-ShowVatPayment=Show VAT payment
-TotalToPay=Total to pay
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted on %s and filtered on 1 bank account (with no other filters)
-CustomerAccountancyCode=Customer accounting code
-SupplierAccountancyCode=Vendor accounting code
-CustomerAccountancyCodeShort=Cust. account. code
-SupplierAccountancyCodeShort=Sup. account. code
-AccountNumber=Account number
-NewAccountingAccount=New account
+Refund=Pulni qaytarish
+SocialContributionsPayments=Ijtimoiy / soliq soliqlari bo'yicha to'lovlar
+ShowVatPayment=QQS to'lovini ko'rsatish
+TotalToPay=To'lov uchun jami
+BalanceVisibilityDependsOnSortAndFilters=Balans ushbu ro'yxatda faqat jadval %s bo'yicha tartiblangan va 1 ta bank hisobvarag'ida filtrlangan bo'lsa ko'rinadi (boshqa filtrlarsiz)
+CustomerAccountancyCode=Mijozlarni hisobga olish kodi
+SupplierAccountancyCode=Sotuvchini hisobga olish kodi
+CustomerAccountancyCodeShort=Himoyalash. hisob qaydnomasi. kod
+SupplierAccountancyCodeShort=Sup. hisob qaydnomasi. kod
+AccountNumber=Hisob raqami
+NewAccountingAccount=Yangi hisob
 Turnover=Turnover invoiced
 TurnoverCollected=Turnover collected
-SalesTurnoverMinimum=Minimum turnover
-ByExpenseIncome=By expenses & incomes
-ByThirdParties=By third parties
-ByUserAuthorOfInvoice=By invoice author
-CheckReceipt=Check deposit
-CheckReceiptShort=Check deposit
-LastCheckReceiptShort=Latest %s check receipts
-NewCheckReceipt=New discount
-NewCheckDeposit=New check deposit
-NewCheckDepositOn=Create receipt for deposit on account: %s
-NoWaitingChecks=No checks awaiting deposit.
-DateChequeReceived=Check receiving date
-NbOfCheques=No. of checks
-PaySocialContribution=Pay a social/fiscal tax
+SalesTurnoverMinimum=Minimal oborot
+ByExpenseIncome=Xarajatlar va daromadlar bo'yicha
+ByThirdParties=Uchinchi shaxslar tomonidan
+ByUserAuthorOfInvoice=Hisob-faktura muallifi tomonidan
+CheckReceipt=Depozitni tekshiring
+CheckReceiptShort=Depozitni tekshiring
+LastCheckReceiptShort=Oxirgi %s cheklari
+NewCheckReceipt=Yangi chegirma
+NewCheckDeposit=Yangi chegirma depoziti
+NewCheckDepositOn=Hisob raqamiga depozit uchun kvitansiya yarating: %s
+NoWaitingChecks=Depozitni kutayotgan cheklar yo'q.
+DateChequeReceived=Qabul qilingan kunni tekshiring
+NbOfCheques=Chexlar soni
+PaySocialContribution=Ijtimoiy / soliq soliqlarini to'lang
 PayVAT=Pay a VAT declaration
 PaySalary=Pay a salary card
-ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid ?
+ConfirmPaySocialContribution=Haqiqatan ham ushbu ijtimoiy yoki soliq soliqlarini to'langan deb tasniflashni xohlaysizmi?
 ConfirmPayVAT=Are you sure you want to classify this VAT declaration as paid ?
 ConfirmPaySalary=Are you sure you want to classify this salary card as paid?
-DeleteSocialContribution=Delete a social or fiscal tax payment
+DeleteSocialContribution=Ijtimoiy yoki soliq soliq to'lovini o'chirib tashlang
 DeleteVAT=Delete a VAT declaration
 DeleteSalary=Delete a salary card
-ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment ?
+ConfirmDeleteSocialContribution=Ushbu ijtimoiy / soliq soliq to'lovini o'chirishni xohlaysizmi?
 ConfirmDeleteVAT=Are you sure you want to delete this VAT declaration ?
 ConfirmDeleteSalary=Are you sure you want to delete this salary?
-ExportDataset_tax_1=Social and fiscal taxes and payments
-CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
-CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
-CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
-CalcModeEngagement=Analysis of known recorded payments, even if they are not yet accounted in Ledger.
+ExportDataset_tax_1=Ijtimoiy va soliq soliqlari va to'lovlari
+CalcModeVATDebt=Modda <b> %s majburiyatlarni hisobga olish bo'yicha QQS %s </b>.
+CalcModeVATEngagement=<b> %s daromad-xarajatlar bo'yicha QQS %s </b>.
+CalcModeDebt=Hali ham daftarda hisobga olinmagan bo'lsa ham, ma'lum qayd qilingan hujjatlarni tahlil qilish.
+CalcModeEngagement=Hali Ledjerda hisobga olinmagan bo'lsa ham, ma'lum yozilgan to'lovlarni tahlil qilish.
 CalcModeBookkeeping=Analysis of data journalized in Bookkeeping Ledger table.
-CalcModeLT1= Mode <b>%sRE on customer invoices - suppliers invoices%s</b>
-CalcModeLT1Debt=Mode <b>%sRE on customer invoices%s</b>
-CalcModeLT1Rec= Mode <b>%sRE on suppliers invoices%s</b>
-CalcModeLT2= Mode <b>%sIRPF on customer invoices - suppliers invoices%s</b>
-CalcModeLT2Debt=Mode <b>%sIRPF on customer invoices%s</b>
-CalcModeLT2Rec= Mode <b>%sIRPF on suppliers invoices%s</b>
-AnnualSummaryDueDebtMode=Balance of income and expenses, annual summary
-AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
+CalcModeLT1= Xaridorlarning hisob-fakturalarida <b> %sRE rejimi - etkazib beruvchilar invoices%s </b>
+CalcModeLT1Debt=<b> %sRE rejimi xaridorlarning invoyslarida %s </b>
+CalcModeLT1Rec= <b> %sRE rejimi etkazib beruvchilar bo'yicha invoices%s </b>
+CalcModeLT2= <b> %sIRPF rejimi xaridorlarning hisob-fakturalarida - etkazib beruvchilar invoices%s </b>
+CalcModeLT2Debt=<b> %sIRPF rejimi mijozning hisob-fakturalarida %s </b>
+CalcModeLT2Rec= <b> %sIRPF etkazib beruvchilar bo'yicha invoices%s </b>
+AnnualSummaryDueDebtMode=Daromadlar va xarajatlar balansi, yillik xulosa
+AnnualSummaryInputOutputMode=Daromadlar va xarajatlar balansi, yillik xulosa
 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>.
+AnnualByCompaniesDueDebtMode=Daromadlar va xarajatlar balansi, oldindan aniqlangan guruhlar bo'yicha batafsil ma'lumot, <b> %sClaims-Debts%s </b> <b> majburiyatlarni hisobga olish a098
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See <b>%sanalysis of payments%s</b> for a calculation based on <b>recorded payments</b> made even if they are not yet accounted in Ledger
-SeeReportInDueDebtMode=See <b>%sanalysis of recorded documents%s</b> for a calculation based on known <b>recorded documents</b> even if they are not yet accounted in Ledger
+SeeReportInInputOutputMode=<b> %s to'lovni tahlil qilishs%s </b> ga asoslanib, <b> asosida yozilgan to'lovlarni ko'ring </b>, agar ular amalga oshirilmagan bo'lsa ham
+SeeReportInDueDebtMode=<b> %s yozilgan hujjatlarni tahlil qilish %s </b> ga asoslanib, ma'lum <b> yozilgan hujjatlar </b> even ifed
 SeeReportInBookkeepingMode=See <b>%sanalysis of bookeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
-RulesAmountWithTaxIncluded=- Amounts shown are with all taxes included
-RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
-RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
-RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the billing date of these invoices.<br>
-RulesCAIn=- It includes all the effective payments of invoices received from customers.<br>- It is based on the payment date of these invoices<br>
+RulesAmountWithTaxIncluded=- Ko'rsatilgan summalar barcha soliqlarni hisobga olgan holda
+RulesResultDue=- Unda to'lamagan-to'lanmagan hisob-fakturalar, xarajatlar, QQS, xayr-ehsonlar mavjud. Shuningdek, unga to'langan ish haqi kiradi. <br> - Bu schyot-fakturalarni taqdim etish sanasiga va xarajatlar yoki soliq to'lovlarini to'lash sanasiga asoslanadi. Ish haqi moduli bilan belgilangan ish haqi uchun to'lovning sanasi qo'llaniladi.
+RulesResultInOut=- Unda fakturalar, xarajatlar, QQS va ish haqi bo'yicha amalga oshirilgan real to'lovlar mavjud. <br> - Bu hisob-fakturalar, xarajatlar, QQS va ish haqlarini to'lash sanalariga asoslanadi. Xayriya uchun xayr-ehson sanasi.
+RulesCADue=- U mijozning to'lash yoki to'lamasligidan kelib chiqadigan hisob-fakturalarini o'z ichiga oladi. <br> - Ushbu hisob-fakturalarning hisob-kitob sanasiga asoslanadi. <br>
+RulesCAIn=- Bu mijozlardan olingan hisob-fakturalarning barcha samarali to'lovlarini o'z ichiga oladi. <br> - u ushbu hisob-fakturalarni to'lash sanasiga asoslanadi <br>
 RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
 RulesSalesTurnoverOfIncomeAccounts=It includes (credit - debit) of lines for product accounts in group INCOME
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
-DepositsAreNotIncluded=- Down payment invoices are not included
-DepositsAreIncluded=- Down payment invoices are included
+DepositsAreNotIncluded=- Dastlabki to'lovlar bo'yicha hisob-kitoblar kiritilmagan
+DepositsAreIncluded=- Dastlabki hisob-fakturalar kiritilgan
 LT1ReportByMonth=Tax 2 report by month
 LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Report by third party IRPF
-VATReport=Sale tax report
+VATReport=Sotish bo'yicha soliq hisoboti
 VATReportByPeriods=Sale tax report by period
 VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
-VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
-VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+VATReportByCustomersInInputOutputMode=Mijoz tomonidan yig'ilgan va to'langan QQS bo'yicha hisobot
+VATReportByQuartersInInputOutputMode=Sotish bo'yicha hisobot, yig'ilgan va to'langan soliqning soliq stavkasi
 VATReportShowByRateDetails=Show details of this rate
 LT1ReportByQuarters=Report tax 2 by rate
 LT2ReportByQuarters=Report tax 3 by rate
 LT1ReportByQuartersES=Report by RE rate
 LT2ReportByQuartersES=Report by IRPF rate
-SeeVATReportInInputOutputMode=See report <b>%sVAT encasement%s</b> for a standard calculation
-SeeVATReportInDueDebtMode=See report <b>%sVAT on flow%s</b> for a calculation with an option on the flow
-RulesVATInServices=- For services, the report includes the VAT regulations actually received or issued on the basis of the date of payment.
-RulesVATInProducts=- For material assets, the report includes the VAT received or issued on the basis of the date of payment.
-RulesVATDueServices=- For services, the report includes VAT invoices due, paid or not, based on the invoice date.
-RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
-OptionVatInfoModuleComptabilite=Note: For material assets, it should use the date of delivery to be more fair.
+SeeVATReportInInputOutputMode=Standart hisob-kitob uchun <b> %sVAT encasement%s </b> hisobotiga qarang
+SeeVATReportInDueDebtMode=Flow%s </b> bo'yicha <b> %sVAT hisobotiga qarang
+RulesVATInServices=- Xizmatlar uchun hisobotda to'lov sanasi asosida olingan yoki chiqarilgan QQS bo'yicha qoidalar mavjud.
+RulesVATInProducts=- Moddiy boyliklar uchun hisobotga to'lov sanasi asosida olingan yoki chiqarilgan QQS qo'shiladi.
+RulesVATDueServices=- Xizmatlar uchun hisobotda hisob-kitob sanasi asosida to'lanadigan yoki to'lanmagan QQS hisob-fakturalari mavjud.
+RulesVATDueProducts=- Moddiy boyliklar uchun hisobotda sana asosida QQS bo'yicha hisob-kitoblar mavjud.
+OptionVatInfoModuleComptabilite=Izoh: Moddiy boyliklar uchun etkazib berish sanasidan ko'proq adolatli bo'lishi kerak.
 ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
-PercentOfInvoice=%%/invoice
-NotUsedForGoods=Not used on goods
-ProposalStats=Statistics on proposals
-OrderStats=Statistics on orders
-InvoiceStats=Statistics on bills
-Dispatch=Dispatching
-Dispatched=Dispatched
-ToDispatch=To dispatch
-ThirdPartyMustBeEditAsCustomer=Third party must be defined as a customer
-SellsJournal=Sales Journal
-PurchasesJournal=Purchases Journal
-DescSellsJournal=Sales Journal
-DescPurchasesJournal=Purchases Journal
-CodeNotDef=Not defined
-WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
-DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
-Pcg_version=Chart of accounts models
-Pcg_type=Pcg type
-Pcg_subtype=Pcg subtype
-InvoiceLinesToDispatch=Invoice lines to dispatch
-ByProductsAndServices=By product and service
-RefExt=External ref
-ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
-LinkedOrder=Link to order
-Mode1=Method 1
-Mode2=Method 2
-CalculationRuleDesc=To calculate total VAT, there is two methods:<br>Method 1 is rounding vat on each line, then summing them.<br>Method 2 is summing all vat on each line, then rounding result.<br>Final result may differs from few cents. Default mode is mode <b>%s</b>.
-CalculationRuleDescSupplier=According to vendor, choose appropriate method to apply same calculation rule and get same result expected by your vendor.
-TurnoverPerProductInCommitmentAccountingNotRelevant=The report of Turnover collected per product is not available. This report is only available for turnover invoiced.
+PercentOfInvoice=%% / hisob-faktura
+NotUsedForGoods=Tovarlarda ishlatilmaydi
+ProposalStats=Takliflar bo'yicha statistika
+OrderStats=Buyurtmalar bo'yicha statistika
+InvoiceStats=Xarajatlar bo'yicha statistika
+Dispatch=Jo'natish
+Dispatched=Jo'natildi
+ToDispatch=Jo'natish uchun
+ThirdPartyMustBeEditAsCustomer=Uchinchi tomon mijoz sifatida aniqlanishi kerak
+SellsJournal=Savdo jurnali
+PurchasesJournal=Xaridlar jurnali
+DescSellsJournal=Savdo jurnali
+DescPurchasesJournal=Xaridlar jurnali
+CodeNotDef=Belgilanmagan
+WarningDepositsNotIncluded=Dastlabki hisob-fakturalar ushbu hisobga olish moduli bilan ushbu versiyaga kiritilmagan.
+DatePaymentTermCantBeLowerThanObjectDate=To'lov muddati sana ob'ekt sanasidan past bo'lishi mumkin emas.
+Pcg_version=Hisob-kitoblar modellari sxemasi
+Pcg_type=Kompyuter turi
+Pcg_subtype=PCC pastki turi
+InvoiceLinesToDispatch=Jo'natish uchun hisob-faktura satrlari
+ByProductsAndServices=Mahsulot va xizmat bo'yicha
+RefExt=Tashqi ref
+ToCreateAPredefinedInvoice=Shablon hisob-fakturasini yaratish uchun standart hisob-fakturani yarating, keyin uni tasdiqlamasdan "%s" tugmasini bosing.
+LinkedOrder=Buyurtma uchun havola
+Mode1=1-usul
+Mode2=2-usul
+CalculationRuleDesc=Jami QQSni hisoblash uchun ikkita usul mavjud: <br> 1-usul har bir satrda QQSni yaxlitlash, so'ngra ularni yig'ish. <br> 2-usul har bir satrda barcha QQSni yig'ib, so'ngra yaxlitlash natijasini beradi. <br> yakuniy natija bir necha sentdan farq qilishi mumkin. Standart rejim - bu <b> %s </b> rejimi.
+CalculationRuleDescSupplier=Sotuvchiga ko'ra, xuddi shu hisoblash qoidasini qo'llash uchun tegishli usulni tanlang va sotuvchingiz kutgan natijani oling.
+TurnoverPerProductInCommitmentAccountingNotRelevant=Har bir mahsulot uchun to'plangan tovar aylanmasi to'g'risida hisobot mavjud emas. Ushbu hisobot faqat tovar aylanmasi uchun taqdim etiladi.
 TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=The report of Turnover collected per sale tax rate is not available. This report is only available for turnover invoiced.
-CalculationMode=Calculation mode
-AccountancyJournal=Accounting code journal
-ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
+CalculationMode=Hisoblash rejimi
+AccountancyJournal=Buxgalteriya kodlari jurnali
+ACCOUNTING_VAT_SOLD_ACCOUNT=Sotish bo'yicha QQS uchun sukut bo'yicha buxgalteriya hisobi (agar QQS lug'atida o'rnatilmagan bo'lsa ishlatiladi)
+ACCOUNTING_VAT_BUY_ACCOUNT=Xaridlarda QQS uchun sukut bo'yicha buxgalteriya hisobi (agar QQS lug'atida o'rnatilmagan bo'lsa ishlatiladi)
+ACCOUNTING_VAT_PAY_ACCOUNT=QQS to'lash uchun sukut bo'yicha buxgalteriya hisobi
+ACCOUNTING_ACCOUNT_CUSTOMER=Mijozlarning uchinchi shaxslari uchun foydalaniladigan buxgalteriya hisobi
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accounting account on third party is not defined.
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
+ACCOUNTING_ACCOUNT_SUPPLIER=Sotuvchi uchinchi shaxslar uchun foydalaniladigan buxgalteriya hisobi
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated vendor accounting account on third party is not defined.
-ConfirmCloneTax=Confirm the clone of a social/fiscal tax
+ConfirmCloneTax=Ijtimoiy / soliq soliqlarining klonini tasdiqlang
 ConfirmCloneVAT=Confirm the clone of a VAT declaration
 ConfirmCloneSalary=Confirm the clone of a salary
-CloneTaxForNextMonth=Clone it for next month
-SimpleReport=Simple report
-AddExtraReport=Extra reports (add foreign and national customer report)
-OtherCountriesCustomersReport=Foreign customers report
-BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Based on the two first letters of the VAT number being different from your own company's country code
-SameCountryCustomersWithVAT=National customers report
-BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Based on the two first letters of the VAT number being the same as your own company's country code
-LinkedFichinter=Link to an intervention
-ImportDataset_tax_contrib=Social/fiscal taxes
-ImportDataset_tax_vat=Vat payments
-ErrorBankAccountNotFound=Error: Bank account not found
-FiscalPeriod=Accounting period
+CloneTaxForNextMonth=Uni keyingi oyga klonlang
+SimpleReport=Oddiy hisobot
+AddExtraReport=Qo'shimcha hisobotlar (xorijiy va milliy mijozlar hisobotini qo'shing)
+OtherCountriesCustomersReport=Xorijiy mijozlar hisobot berishadi
+BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=QQS raqamining ikkita birinchi harfi asosida o'zingizning kompaniyangizning mamlakat kodidan farq qiladi
+SameCountryCustomersWithVAT=Milliy mijozlar hisobot berishadi
+BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=O'zingizning kompaniyangizning mamlakat kodi bilan bir xil bo'lgan QQS raqamining ikkita birinchi harfi asosida
+LinkedFichinter=Aralashuvga havola
+ImportDataset_tax_contrib=Ijtimoiy / soliq soliqlari
+ImportDataset_tax_vat=QQS bo'yicha to'lovlar
+ErrorBankAccountNotFound=Xato: bank hisobi topilmadi
+FiscalPeriod=Hisob davri
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
 AccountingAffectation=Accounting assignment
@@ -286,3 +286,9 @@ ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
 IncludeLoansInResults = Include loans in reports
+InvoiceLate30Days = Invoices late > 30 days
+InvoiceLate15Days = Invoices late > 15 days
+InvoiceLateMinus15Days = Invoices late
+InvoiceNotLate = To be collected < 15 days
+InvoiceNotLate15Days = To be collected in 15 days
+InvoiceNotLate30Days = To be collected in 30 days
diff --git a/htdocs/langs/uz_UZ/contracts.lang b/htdocs/langs/uz_UZ/contracts.lang
index a9ac308142a..7f29c707c1f 100644
--- a/htdocs/langs/uz_UZ/contracts.lang
+++ b/htdocs/langs/uz_UZ/contracts.lang
@@ -1,104 +1,104 @@
 # Dolibarr language file - Source file is en_US - contracts
-ContractsArea=Contracts area
-ListOfContracts=List of contracts
-AllContracts=All contracts
-ContractCard=Contract card
-ContractStatusNotRunning=Not running
-ContractStatusDraft=Draft
-ContractStatusValidated=Validated
-ContractStatusClosed=Closed
-ServiceStatusInitial=Not running
-ServiceStatusRunning=Running
-ServiceStatusNotLate=Running, not expired
-ServiceStatusNotLateShort=Not expired
-ServiceStatusLate=Running, expired
-ServiceStatusLateShort=Expired
-ServiceStatusClosed=Closed
-ShowContractOfService=Show contract of service
-Contracts=Contracts
-ContractsSubscriptions=Contracts/Subscriptions
-ContractsAndLine=Contracts and line of contracts
-Contract=Contract
-ContractLine=Contract line
-Closing=Closing
-NoContracts=No contracts
-MenuServices=Services
-MenuInactiveServices=Services not active
-MenuRunningServices=Running services
-MenuExpiredServices=Expired services
-MenuClosedServices=Closed services
-NewContract=New contract
-NewContractSubscription=New contract or subscription
-AddContract=Create contract
-DeleteAContract=Delete a contract
+ContractsArea=Shartnomalar maydoni
+ListOfContracts=Shartnomalar ro'yxati
+AllContracts=Barcha shartnomalar
+ContractCard=Shartnoma kartasi
+ContractStatusNotRunning=Ishlamayapti
+ContractStatusDraft=Qoralama
+ContractStatusValidated=Tasdiqlangan
+ContractStatusClosed=Yopiq
+ServiceStatusInitial=Ishlamayapti
+ServiceStatusRunning=Yugurish
+ServiceStatusNotLate=Yugurish, muddati tugamagan
+ServiceStatusNotLateShort=Muddati tugamagan
+ServiceStatusLate=Yugurish, muddati tugagan
+ServiceStatusLateShort=Muddati tugagan
+ServiceStatusClosed=Yopiq
+ShowContractOfService=Xizmat shartnomasini ko'rsatish
+Contracts=Shartnomalar
+ContractsSubscriptions=Shartnomalar / Obunalar
+ContractsAndLine=Shartnomalar va shartnomalar liniyasi
+Contract=Shartnoma
+ContractLine=Shartnoma liniyasi
+Closing=Yopish
+NoContracts=Shartnomalar yo'q
+MenuServices=Xizmatlar
+MenuInactiveServices=Xizmatlar faol emas
+MenuRunningServices=Ishlayotgan xizmatlar
+MenuExpiredServices=Muddati o'tgan xizmatlar
+MenuClosedServices=Yopiq xizmatlar
+NewContract=Yangi shartnoma
+NewContractSubscription=Yangi shartnoma yoki obuna
+AddContract=Shartnoma tuzing
+DeleteAContract=Shartnomani o'chirib tashlang
 ActivateAllOnContract=Activate all services
-CloseAContract=Close a contract
-ConfirmDeleteAContract=Are you sure you want to delete this contract and all its services?
-ConfirmValidateContract=Are you sure you want to validate this contract under name <b>%s</b>?
+CloseAContract=Shartnomani yoping
+ConfirmDeleteAContract=Ushbu shartnomani va uning barcha xizmatlarini o'chirishni xohlaysizmi?
+ConfirmValidateContract=Ushbu shartnomani <b> %s </b> nomi bilan tasdiqlamoqchimisiz?
 ConfirmActivateAllOnContract=This will open all services (not yet active). Are you sure you want to open all services?
-ConfirmCloseContract=This will close all services (active or not). Are you sure you want to close this contract?
-ConfirmCloseService=Are you sure you want to close this service with date <b>%s</b>?
-ValidateAContract=Validate a contract
-ActivateService=Activate service
-ConfirmActivateService=Are you sure you want to activate this service with date <b>%s</b>?
-RefContract=Contract reference
-DateContract=Contract date
-DateServiceActivate=Service activation date
-ListOfServices=List of services
-ListOfInactiveServices=List of not active services
-ListOfExpiredServices=List of expired active services
-ListOfClosedServices=List of closed services
-ListOfRunningServices=List of running services
-NotActivatedServices=Inactive services (among validated contracts)
-BoardNotActivatedServices=Services to activate among validated contracts
+ConfirmCloseContract=Bu barcha xizmatlarni yopadi (faol yoki yo'q). Ushbu shartnomani yopmoqchi ekanligingizga aminmisiz?
+ConfirmCloseService=Ushbu xizmatni <b> %s </b> sanasi bilan yopishni xohlaysizmi?
+ValidateAContract=Shartnomani tasdiqlang
+ActivateService=Xizmatni yoqing
+ConfirmActivateService=Siz ushbu xizmatni <b> %s </b> sanasi bilan faollashtirishni xohlaysizmi?
+RefContract=Shartnoma bo'yicha ma'lumotnoma
+DateContract=Shartnoma tuzilgan sana
+DateServiceActivate=Xizmatni yoqish sanasi
+ListOfServices=Xizmatlar ro'yxati
+ListOfInactiveServices=Faol bo'lmagan xizmatlarning ro'yxati
+ListOfExpiredServices=Muddati o'tgan faol xizmatlarning ro'yxati
+ListOfClosedServices=Yopiq xizmatlarning ro'yxati
+ListOfRunningServices=Amaldagi xizmatlarning ro'yxati
+NotActivatedServices=Faol bo'lmagan xizmatlar (tasdiqlangan shartnomalar orasida)
+BoardNotActivatedServices=Tasdiqlangan shartnomalar orasida faollashtirish uchun xizmatlar
 BoardNotActivatedServicesShort=Services to activate
-LastContracts=Latest %s contracts
-LastModifiedServices=Latest %s modified services
-ContractStartDate=Start date
-ContractEndDate=End date
-DateStartPlanned=Planned start date
-DateStartPlannedShort=Planned start date
-DateEndPlanned=Planned end date
-DateEndPlannedShort=Planned end date
-DateStartReal=Real start date
-DateStartRealShort=Real start date
-DateEndReal=Real end date
-DateEndRealShort=Real end date
-CloseService=Close service
-BoardRunningServices=Services running
+LastContracts=Oxirgi %s shartnomalari
+LastModifiedServices=Oxirgi %s o'zgartirilgan xizmatlari
+ContractStartDate=Boshlanish vaqti
+ContractEndDate=Tugash sanasi
+DateStartPlanned=Rejalashtirilgan boshlanish sanasi
+DateStartPlannedShort=Rejalashtirilgan boshlanish sanasi
+DateEndPlanned=Rejalashtirilgan tugash sanasi
+DateEndPlannedShort=Rejalashtirilgan tugash sanasi
+DateStartReal=Haqiqiy boshlanish sanasi
+DateStartRealShort=Haqiqiy boshlanish sanasi
+DateEndReal=Haqiqiy tugash sanasi
+DateEndRealShort=Haqiqiy tugash sanasi
+CloseService=Xizmatni yoping
+BoardRunningServices=Xizmatlar ishlaydi
 BoardRunningServicesShort=Services running
 BoardExpiredServices=Services expired
 BoardExpiredServicesShort=Services expired
-ServiceStatus=Status of service
-DraftContracts=Drafts contracts
-CloseRefusedBecauseOneServiceActive=Contract can't be closed as there is at least one open service on it
+ServiceStatus=Xizmat holati
+DraftContracts=Shartnomalar
+CloseRefusedBecauseOneServiceActive=Shartnomani yopish mumkin emas, chunki unda kamida bitta ochiq xizmat mavjud
 ActivateAllContracts=Activate all contract lines
-CloseAllContracts=Close all contract lines
-DeleteContractLine=Delete a contract line
-ConfirmDeleteContractLine=Are you sure you want to delete this contract line?
-MoveToAnotherContract=Move service into another contract.
-ConfirmMoveToAnotherContract=I choosed new target contract and confirm I want to move this service into this contract.
-ConfirmMoveToAnotherContractQuestion=Choose in which existing contract (of same third party), you want to move this service to?
-PaymentRenewContractId=Renew contract line (number %s)
-ExpiredSince=Expiration date
-NoExpiredServices=No expired active services
-ListOfServicesToExpireWithDuration=List of Services to expire in %s days
-ListOfServicesToExpireWithDurationNeg=List of Services expired from more than %s days
-ListOfServicesToExpire=List of Services to expire
-NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative.
-StandardContractsTemplate=Standard contracts template
-ContactNameAndSignature=For %s, name and signature:
-OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
+CloseAllContracts=Barcha shartnoma satrlarini yoping
+DeleteContractLine=Shartnoma satrini o'chirib tashlang
+ConfirmDeleteContractLine=Ushbu shartnoma qatorini o'chirishni xohlaysizmi?
+MoveToAnotherContract=Xizmatni boshqa shartnomaga o'tkazing.
+ConfirmMoveToAnotherContract=Men yangi maqsadli shartnomani tanladim va ushbu xizmatni ushbu shartnomaga o'tkazishni xohlayotganimni tasdiqladim.
+ConfirmMoveToAnotherContractQuestion=Qaysi amaldagi shartnomada (xuddi shu uchinchi tomonda) ushbu xizmatga o'tishni xohlaysizmi?
+PaymentRenewContractId=Shartnomani yangilang (raqam %s)
+ExpiredSince=Tugash muddati
+NoExpiredServices=Muddati o'tgan faol xizmatlar yo'q
+ListOfServicesToExpireWithDuration=%s kun ichida tugaydigan xizmatlar ro'yxati
+ListOfServicesToExpireWithDurationNeg=Xizmatlar ro'yxati %s kundan ortiq muddatda tugagan
+ListOfServicesToExpire=Muddati tugaydigan xizmatlar ro'yxati
+NoteListOfYourExpiredServices=Ushbu ro'yxatda faqat savdo vakili sifatida bog'langan uchinchi shaxslar uchun shartnomalar xizmatlari mavjud.
+StandardContractsTemplate=Standart shartnomalar shabloni
+ContactNameAndSignature=%s uchun ism va imzo:
+OnlyLinesWithTypeServiceAreUsed=Faqat "Xizmat" turidagi liniyalar klonlanadi.
 ConfirmCloneContract=Are you sure you want to clone the contract <b>%s</b>?
 LowerDateEndPlannedShort=Lower planned end date of active services
 SendContractRef=Contract information __REF__
 OtherContracts=Other contracts
 ##### Types de contacts #####
-TypeContact_contrat_internal_SALESREPSIGN=Sales representative signing contract
-TypeContact_contrat_internal_SALESREPFOLL=Sales representative following-up contract
-TypeContact_contrat_external_BILLING=Billing customer contact
-TypeContact_contrat_external_CUSTOMER=Follow-up customer contact
-TypeContact_contrat_external_SALESREPSIGN=Signing contract customer contact
+TypeContact_contrat_internal_SALESREPSIGN=Savdo vakili shartnomani imzolash
+TypeContact_contrat_internal_SALESREPFOLL=Savdo vakili keyingi shartnoma
+TypeContact_contrat_external_BILLING=Xaridor bilan hisob-kitob qilish
+TypeContact_contrat_external_CUSTOMER=Keyingi mijozlar bilan aloqa
+TypeContact_contrat_external_SALESREPSIGN=Mijozlar bilan aloqa shartnomasini imzolash
 HideClosedServiceByDefault=Hide closed services by default
 ShowClosedServices=Show Closed Services
 HideClosedServices=Hide Closed Services
diff --git a/htdocs/langs/uz_UZ/cron.lang b/htdocs/langs/uz_UZ/cron.lang
index 2ebdda1e685..5e77e8a66e2 100644
--- a/htdocs/langs/uz_UZ/cron.lang
+++ b/htdocs/langs/uz_UZ/cron.lang
@@ -1,88 +1,88 @@
 # Dolibarr language file - Source file is en_US - cron
 # About page
 # Right
-Permission23101 = Read Scheduled job
-Permission23102 = Create/update Scheduled job
-Permission23103 = Delete Scheduled job
-Permission23104 = Execute Scheduled job
+Permission23101 = Rejalashtirilgan ishni o'qing
+Permission23102 = Rejalashtirilgan ishni yaratish / yangilash
+Permission23103 = Rejalashtirilgan ishni o'chirish
+Permission23104 = Rejalashtirilgan ishni bajaring
 # Admin
-CronSetup=Scheduled job management setup
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs from a browser
-OrToLaunchASpecificJob=Or to check and launch a specific job from a browser
-KeyForCronAccess=Security key for URL to launch cron jobs
-FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
-CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
-CronExplainHowToRunWin=On Microsoft(tm) Windows environment you can use Scheduled Task tools to run the command line each 5 minutes
-CronMethodDoesNotExists=Class %s does not contains any method %s
+CronSetup=Rejalashtirilgan ishni boshqarish
+URLToLaunchCronJobs=Brauzerdan malakali cron ishlarini tekshirish va ishga tushirish uchun URL
+OrToLaunchASpecificJob=Yoki brauzerdan ma'lum bir ishni tekshirish va ishga tushirish uchun
+KeyForCronAccess=Cron ishlarini boshlash uchun URL uchun xavfsizlik kaliti
+FileToLaunchCronJobs=Malakali cron ishlarini tekshirish va ishga tushirish uchun buyruq satri
+CronExplainHowToRunUnix=Unix muhitida buyruq satrini har 5 daqiqada bajarish uchun quyidagi crontab yozuvidan foydalanishingiz kerak
+CronExplainHowToRunWin=Microsoft (tm) Windows muhitida har 5 daqiqada buyruq satrini bajarish uchun Rejalashtirilgan Vazifa vositalaridan foydalanishingiz mumkin
+CronMethodDoesNotExists=%s sinfida %s usuli mavjud emas
 CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
 CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
 CronJobProfiles=List of predefined cron job profiles
 # Menu
-EnabledAndDisabled=Enabled and disabled
+EnabledAndDisabled=Yoqilgan va o'chirilgan
 # Page list
-CronLastOutput=Latest run output
-CronLastResult=Latest result code
-CronCommand=Command
-CronList=Scheduled jobs
-CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
-CronExecute=Launch scheduled job
-CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
-CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
-CronTask=Job
+CronLastOutput=Oxirgi ishlash natijasi
+CronLastResult=Oxirgi natija kodi
+CronCommand=Buyruq
+CronList=Rejalashtirilgan ish joylari
+CronDelete=Rejalashtirilgan ishlarni o'chirish
+CronConfirmDelete=Ushbu rejalashtirilgan ishlarni o'chirishni xohlaysizmi?
+CronExecute=Rejalashtirilgan ishni boshlash
+CronConfirmExecute=Ushbu rejalashtirilgan ishlarni hoziroq bajarishni xohlaysizmi?
+CronInfo=Rejalashtirilgan ish moduli ishlarni avtomatik ravishda bajarilishini rejalashtirishga imkon beradi. Ishlarni qo'lda boshlash ham mumkin.
+CronTask=Ish
 CronNone=None
-CronDtStart=Not before
-CronDtEnd=Not after
-CronDtNextLaunch=Next execution
-CronDtLastLaunch=Start date of latest execution
-CronDtLastResult=End date of latest execution
-CronFrequency=Frequency
-CronClass=Class
-CronMethod=Method
-CronModule=Module
-CronNoJobs=No jobs registered
-CronPriority=Priority
-CronLabel=Label
-CronNbRun=Number of launches
-CronMaxRun=Maximum number of launches
-CronEach=Every
-JobFinished=Job launched and finished
+CronDtStart=Oldin emas
+CronDtEnd=Keyin emas
+CronDtNextLaunch=Keyingi ijro
+CronDtLastLaunch=Oxirgi ijroning boshlanish sanasi
+CronDtLastResult=Oxirgi ijroning tugash sanasi
+CronFrequency=Chastotani
+CronClass=Sinf
+CronMethod=Usul
+CronModule=Modul
+CronNoJobs=Hech qanday ish joyi ro'yxatdan o'tkazilmagan
+CronPriority=Afzallik
+CronLabel=Yorliq
+CronNbRun=Ishga tushirilganlar soni
+CronMaxRun=Ishga tushirishning maksimal soni
+CronEach=Har bir
+JobFinished=Ish ishga tushirildi va tugadi
 Scheduled=Scheduled
 #Page card
-CronAdd= Add jobs
-CronEvery=Execute job each
-CronObject=Instance/Object to create
-CronArgs=Parameters
-CronSaveSucess=Save successfully
-CronNote=Comment
-CronFieldMandatory=Fields %s is mandatory
-CronErrEndDateStartDt=End date cannot be before start date
+CronAdd= Ish joylarini qo'shing
+CronEvery=Har bir ishni bajaring
+CronObject=Yaratiladigan misol / ob'ekt
+CronArgs=Parametrlar
+CronSaveSucess=Muvaffaqiyatli saqlang
+CronNote=Izoh
+CronFieldMandatory=%s maydonlari majburiydir
+CronErrEndDateStartDt=Tugash sanasi boshlanish sanasidan oldin bo'lishi mumkin emas
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Schedule
-CronStatusInactiveBtn=Disable
-CronTaskInactive=This job is disabled
+CronStatusActiveBtn=Jadval
+CronStatusInactiveBtn=O'chirish
+CronTaskInactive=Bu ish o'chirilgan (rejalashtirilgan emas)
 CronId=Id
-CronClassFile=Filename with class
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example 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>
-CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For example 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 example 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 example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
-CronArgsHelp=The method arguments. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
-CronCommandHelp=The system command line to execute.
-CronCreateJob=Create new Scheduled Job
-CronFrom=From
+CronClassFile=Sinf bilan fayl nomi
+CronModuleHelp=Dolibarr moduli katalogining nomi (tashqi Dolibarr moduli bilan ham ishlaydi). <BR> Masalan, Dolibarr Product ob'ektini olish usulini chaqirish uchun object / htdocs / <u> product </u> /class/product.class.php, modul uchun qiymat <br> a04927zbac18
+CronClassFileHelp=Yuklanadigan nisbiy yo'l va fayl nomi (yo'l veb-serverning ildiz katalogiga nisbatan). <BR> Masalan, Dolibarr Product ob'ektini olish usulini chaqirish uchun htdocs / product / class / <u> product.class.php </u>, sinf fayli nomi uchun qiymati <br> a049271ecaf / product07f.c8f
+CronObjectHelp=Yuklanadigan ob'ekt nomi. <BR> Masalan, Dolibarr Product ob'ektini olish usulini chaqirish uchun
+CronMethodHelp=Ob'ektni ishga tushirish usuli. <BR> Masalan, Dolibarr Product ob'ektini olish usulini chaqirish uchun
+CronArgsHelp=Usul argumentlari. <BR> Masalan, Dolibarr Product ob'ektini olish usulini chaqirish uchun
+CronCommandHelp=Amalga oshirish uchun tizim buyruq satri.
+CronCreateJob=Yangi Rejalashtirilgan ish yarating
+CronFrom=Kimdan
 # Info
 # Common
-CronType=Job type
-CronType_method=Call method of a PHP Class
-CronType_command=Shell command
-CronCannotLoadClass=Cannot load class file %s (to use class %s)
+CronType=Ish turi
+CronType_method=PHP sinfining qo'ng'iroq usuli
+CronType_command=Shell buyrug'i
+CronCannotLoadClass=%s sinf fayli yuklanmadi (%s sinfidan foydalanish uchun)
 CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
-UseMenuModuleToolsToAddCronJobs=Go into menu "<a href="%s">Home - Admin tools - Scheduled jobs</a>" to see and edit scheduled jobs.
-JobDisabled=Job disabled
-MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql', 'pgsql', 'auto'), 1, 'auto' or filename to build, number of backup files to keep
-WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
+UseMenuModuleToolsToAddCronJobs=Rejalashtirilgan ishlarni ko'rish va tahrirlash uchun "<a href="%s"> Bosh sahifa - Administrator vositalari - Rejalashtirilgan ish o'rinlari </a>" menyusiga o'ting.
+JobDisabled=Ish o'chirilgan
+MakeLocalDatabaseDumpShort=Mahalliy ma'lumotlar bazasini zaxiralash
+MakeLocalDatabaseDump=Mahalliy ma'lumotlar bazasi axlatxonasini yarating. Parametrlar quyidagilardir: siqish ('gz' yoki 'bz' yoki 'yo'q'), zaxira turi ('mysql', 'pgsql', 'auto'), 1, 'auto' yoki fayl nomi yaratish, saqlash uchun zaxira fayllar soni
+WarningCronDelayed=E'tibor bering, ishga tushirilgan ish kunining keyingi sanasi qanday bo'lishidan qat'i nazar, sizning ishingiz bajarilishidan oldin maksimal %s soatga kechiktirilishi mumkin.
 DATAPOLICYJob=Data cleaner and anonymizer
 JobXMustBeEnabled=Job %s must be enabled
 # Cron Boxes
diff --git a/htdocs/langs/uz_UZ/deliveries.lang b/htdocs/langs/uz_UZ/deliveries.lang
index 1f48c01de75..c178879f73c 100644
--- a/htdocs/langs/uz_UZ/deliveries.lang
+++ b/htdocs/langs/uz_UZ/deliveries.lang
@@ -1,31 +1,32 @@
 # Dolibarr language file - Source file is en_US - deliveries
-Delivery=Delivery
-DeliveryRef=Ref Delivery
-DeliveryCard=Receipt card
-DeliveryOrder=Delivery receipt
-DeliveryDate=Delivery date
-CreateDeliveryOrder=Generate delivery receipt
-DeliveryStateSaved=Delivery state saved
-SetDeliveryDate=Set shipping date
-ValidateDeliveryReceipt=Validate delivery receipt
-ValidateDeliveryReceiptConfirm=Are you sure you want to validate this delivery receipt?
-DeleteDeliveryReceipt=Delete delivery receipt
-DeleteDeliveryReceiptConfirm=Are you sure you want to delete delivery receipt <b>%s</b>?
-DeliveryMethod=Delivery method
-TrackingNumber=Tracking number
-DeliveryNotValidated=Delivery not validated
-StatusDeliveryCanceled=Canceled
-StatusDeliveryDraft=Draft
-StatusDeliveryValidated=Received
+Delivery=Yetkazib berish
+DeliveryRef=Yetkazib berish
+DeliveryCard=Kvitansiya kartasi
+DeliveryOrder=Yetkazib berish kvitansiyasi
+DeliveryDate=Yetkazib berish sanasi
+CreateDeliveryOrder=Yetkazib berish kvitansiyasini yarating
+DeliveryStateSaved=Yetkazib berish holati saqlandi
+SetDeliveryDate=Yetkazib berish sanasini belgilang
+ValidateDeliveryReceipt=Yetkazib berish kvitansiyasini tasdiqlang
+ValidateDeliveryReceiptConfirm=Ushbu etkazib berish kvitansiyasini tasdiqlamoqchimisiz?
+DeleteDeliveryReceipt=Yetkazib berish kvitansiyasini o'chirib tashlang
+DeleteDeliveryReceiptConfirm=<b> %s </b> etkazib berish kvitansiyasini o'chirishni xohlaysizmi?
+DeliveryMethod=Yetkazib berish usuli
+TrackingNumber=Joylashuvni kuzatish raqami
+DeliveryNotValidated=Yetkazib berish tasdiqlanmagan
+StatusDeliveryCanceled=Bekor qilindi
+StatusDeliveryDraft=Qoralama
+StatusDeliveryValidated=Qabul qildi
 # merou PDF model
-NameAndSignature=Name and Signature:
-ToAndDate=To___________________________________ on ____/_____/__________
-GoodStatusDeclaration=Have received the goods above in good condition,
-Deliverer=Deliverer:
-Sender=Sender
-Recipient=Recipient
-ErrorStockIsNotEnough=There's not enough stock
-Shippable=Shippable
-NonShippable=Not Shippable
-ShowReceiving=Show delivery receipt
+NameAndSignature=Ism va imzo:
+ToAndDate=____ / _____ / __________ kuni ___________________________________ gacha
+GoodStatusDeclaration=Yuqoridagi tovarlarni yaxshi holatda oldingiz,
+Deliverer=Yetkazib beruvchi:
+Sender=Yuboruvchi
+Recipient=Qabul qiluvchi
+ErrorStockIsNotEnough=Aktsiyalar yetarli emas
+Shippable=Yuk tashish mumkin
+NonShippable=Yuk tashish mumkin emas
+ShowShippableStatus=Show shippable status
+ShowReceiving=Yetkazib berish kvitansiyasini ko'rsating
 NonExistentOrder=Nonexistent order
diff --git a/htdocs/langs/uz_UZ/dict.lang b/htdocs/langs/uz_UZ/dict.lang
index ec315d97142..af1ec8973bd 100644
--- a/htdocs/langs/uz_UZ/dict.lang
+++ b/htdocs/langs/uz_UZ/dict.lang
@@ -1,333 +1,333 @@
 # Dolibarr language file - Source file is en_US - dict
-CountryFR=France
-CountryBE=Belgium
-CountryIT=Italy
-CountryES=Spain
-CountryDE=Germany
-CountryCH=Switzerland
+CountryFR=Frantsiya
+CountryBE=Belgiya
+CountryIT=Italiya
+CountryES=Ispaniya
+CountryDE=Germaniya
+CountryCH=Shveytsariya
 # Warning, country code GB is for United Kingdom. UK Does not exists as country code in ISO standard.
-CountryGB=United Kingdom
-CountryUK=United Kingdom
-CountryIE=Ireland
-CountryCN=China
-CountryTN=Tunisia
-CountryUS=United States
-CountryMA=Morocco
-CountryDZ=Algeria
-CountryCA=Canada
-CountryTG=Togo
+CountryGB=Birlashgan Qirollik
+CountryUK=Birlashgan Qirollik
+CountryIE=Irlandiya
+CountryCN=Xitoy
+CountryTN=Tunis
+CountryUS=Qo'shma Shtatlar
+CountryMA=Marokash
+CountryDZ=Jazoir
+CountryCA=Kanada
+CountryTG=Bormoq
 CountryGA=Gabon
-CountryNL=Netherlands
-CountryHU=Hungary
-CountryRU=Russia
-CountrySE=Sweden
-CountryCI=Ivoiry Coast
+CountryNL=Gollandiya
+CountryHU=Vengriya
+CountryRU=Rossiya
+CountrySE=Shvetsiya
+CountryCI=Fil suyagi qirg'og'i
 CountrySN=Senegal
 CountryAR=Argentina
-CountryCM=Cameroon
-CountryPT=Portugal
-CountrySA=Saudi Arabia
-CountryMC=Monaco
-CountryAU=Australia
-CountrySG=Singapore
-CountryAF=Afghanistan
-CountryAX=Åland Islands
-CountryAL=Albania
-CountryAS=American Samoa
+CountryCM=Kamerun
+CountryPT=Portugaliya
+CountrySA=Saudiya Arabistoni
+CountryMC=Monako
+CountryAU=Avstraliya
+CountrySG=Singapur
+CountryAF=Afg'oniston
+CountryAX=Alandiya orollari
+CountryAL=Albaniya
+CountryAS=Amerika Samoasi
 CountryAD=Andorra
 CountryAO=Angola
-CountryAI=Anguilla
-CountryAQ=Antarctica
-CountryAG=Antigua and Barbuda
-CountryAM=Armenia
+CountryAI=Angilya
+CountryAQ=Antarktida
+CountryAG=Antigua va Barbuda
+CountryAM=Armaniston
 CountryAW=Aruba
-CountryAT=Austria
-CountryAZ=Azerbaijan
-CountryBS=Bahamas
-CountryBH=Bahrain
+CountryAT=Avstriya
+CountryAZ=Ozarbayjon
+CountryBS=Bagama orollari
+CountryBH=Bahrayn
 CountryBD=Bangladesh
 CountryBB=Barbados
-CountryBY=Belarus
-CountryBZ=Belize
+CountryBY=Belorussiya
+CountryBZ=Beliz
 CountryBJ=Benin
-CountryBM=Bermuda
-CountryBT=Bhutan
-CountryBO=Bolivia
-CountryBA=Bosnia and Herzegovina
-CountryBW=Botswana
+CountryBM=Bermud
+CountryBT=Butan
+CountryBO=Boliviya
+CountryBA=Bosniya va Gertsegovina
+CountryBW=Botsvana
 CountryBV=Bouvet Island
-CountryBR=Brazil
-CountryIO=British Indian Ocean Territory
-CountryBN=Brunei Darussalam
-CountryBG=Bulgaria
-CountryBF=Burkina Faso
+CountryBR=Braziliya
+CountryIO=Britaniya Hind okeanining hududi
+CountryBN=Bruney-Darussalom
+CountryBG=Bolgariya
+CountryBF=Burkina-Faso
 CountryBI=Burundi
-CountryKH=Cambodia
-CountryCV=Cape Verde
-CountryKY=Cayman Islands
-CountryCF=Central African Republic
+CountryKH=Kambodja
+CountryCV=Kabo-Verde
+CountryKY=Kayman orollari
+CountryCF=Markaziy Afrika Respublikasi
 CountryTD=Chad
-CountryCL=Chile
-CountryCX=Christmas Island
-CountryCC=Cocos (Keeling) Islands
-CountryCO=Colombia
-CountryKM=Comoros
-CountryCG=Congo
-CountryCD=Congo, The Democratic Republic of the
-CountryCK=Cook Islands
-CountryCR=Costa Rica
-CountryHR=Croatia
-CountryCU=Cuba
-CountryCY=Cyprus
-CountryCZ=Czech Republic
-CountryDK=Denmark
-CountryDJ=Djibouti
-CountryDM=Dominica
-CountryDO=Dominican Republic
-CountryEC=Ecuador
-CountryEG=Egypt
-CountrySV=El Salvador
-CountryGQ=Equatorial Guinea
-CountryER=Eritrea
-CountryEE=Estonia
-CountryET=Ethiopia
-CountryFK=Falkland Islands
-CountryFO=Faroe Islands
-CountryFJ=Fiji Islands
-CountryFI=Finland
-CountryGF=French Guiana
-CountryPF=French Polynesia
-CountryTF=French Southern Territories
-CountryGM=Gambia
-CountryGE=Georgia
-CountryGH=Ghana
+CountryCL=Chili
+CountryCX=Rojdestvo oroli
+CountryCC=Kokos (Kiling) orollari
+CountryCO=Kolumbiya
+CountryKM=Komor orollari
+CountryCG=Kongo
+CountryCD=Kongo, Demokratik Respublikasi
+CountryCK=Kuk orollari
+CountryCR=Kosta-Rika
+CountryHR=Xorvatiya
+CountryCU=Kuba
+CountryCY=Kipr
+CountryCZ=Chex Respublikasi
+CountryDK=Daniya
+CountryDJ=Jibuti
+CountryDM=Dominika
+CountryDO=Dominika Respublikasi
+CountryEC=Ekvador
+CountryEG=Misr
+CountrySV=Salvador
+CountryGQ=Ekvatorial Gvineya
+CountryER=Eritreya
+CountryEE=Estoniya
+CountryET=Efiopiya
+CountryFK=Folklend orollari
+CountryFO=Farer orollari
+CountryFJ=Fidji orollari
+CountryFI=Finlyandiya
+CountryGF=Frantsiya Gvianasi
+CountryPF=Frantsiya Polineziyasi
+CountryTF=Frantsiyaning janubiy hududlari
+CountryGM=Gambiya
+CountryGE=Gruziya
+CountryGH=Gana
 CountryGI=Gibraltar
-CountryGR=Greece
-CountryGL=Greenland
+CountryGR=Gretsiya
+CountryGL=Grenlandiya
 CountryGD=Grenada
-CountryGP=Guadeloupe
+CountryGP=Gvadelupa
 CountryGU=Guam
-CountryGT=Guatemala
-CountryGN=Guinea
-CountryGW=Guinea-Bissau
-CountryGY=Guyana
-CountryHT=Haïti
-CountryHM=Heard Island and McDonald
-CountryVA=Holy See (Vatican City State)
-CountryHN=Honduras
-CountryHK=Hong Kong
-CountryIS=Iceland
-CountryIN=India
-CountryID=Indonesia
-CountryIR=Iran
-CountryIQ=Iraq
-CountryIL=Israel
-CountryJM=Jamaica
-CountryJP=Japan
-CountryJO=Jordan
-CountryKZ=Kazakhstan
-CountryKE=Kenya
+CountryGT=Gvatemala
+CountryGN=Gvineya
+CountryGW=Gvineya-Bisau
+CountryGY=Gayana
+CountryHT=Haiti
+CountryHM=Xerd oroli va McDonald
+CountryVA=Muqaddas Taxt (Vatikan Shtati)
+CountryHN=Gonduras
+CountryHK=Gonkong
+CountryIS=Islandiya
+CountryIN=Hindiston
+CountryID=Indoneziya
+CountryIR=Eron
+CountryIQ=Iroq
+CountryIL=Isroil
+CountryJM=Yamayka
+CountryJP=Yaponiya
+CountryJO=Iordaniya
+CountryKZ=Qozog'iston
+CountryKE=Keniya
 CountryKI=Kiribati
-CountryKP=North Korea
-CountryKR=South Korea
-CountryKW=Kuwait
-CountryKG=Kyrgyzstan
-CountryLA=Lao
-CountryLV=Latvia
-CountryLB=Lebanon
-CountryLS=Lesotho
-CountryLR=Liberia
-CountryLY=Libyan
-CountryLI=Liechtenstein
-CountryLT=Lithuania
-CountryLU=Luxembourg
-CountryMO=Macao
-CountryMK=Macedonia, the former Yugoslav of
-CountryMG=Madagascar
-CountryMW=Malawi
-CountryMY=Malaysia
-CountryMV=Maldives
+CountryKP=Shimoliy Koreya
+CountryKR=Janubiy Koreya
+CountryKW=Quvayt
+CountryKG=Qirg'iziston
+CountryLA=Laos
+CountryLV=Latviya
+CountryLB=Livan
+CountryLS=Lesoto
+CountryLR=Liberiya
+CountryLY=Liviya
+CountryLI=Lixtenshteyn
+CountryLT=Litva
+CountryLU=Lyuksemburg
+CountryMO=Makao
+CountryMK=Makedoniya, sobiq Yugoslaviya
+CountryMG=Madagaskar
+CountryMW=Malavi
+CountryMY=Malayziya
+CountryMV=Maldiv orollari
 CountryML=Mali
 CountryMT=Malta
-CountryMH=Marshall Islands
-CountryMQ=Martinique
-CountryMR=Mauritania
-CountryMU=Mauritius
-CountryYT=Mayotte
-CountryMX=Mexico
-CountryFM=Micronesia
+CountryMH=Marshal orollari
+CountryMQ=Martinika
+CountryMR=Mavritaniya
+CountryMU=Mavrikiy
+CountryYT=Mayot
+CountryMX=Meksika
+CountryFM=Mikroneziya
 CountryMD=Moldova
-CountryMN=Mongolia
+CountryMN=Mo'g'uliston
 CountryMS=Monserrat
-CountryMZ=Mozambique
-CountryMM=Myanmar (Burma)
-CountryNA=Namibia
+CountryMZ=Mozambik
+CountryMM=Myanma (Birma)
+CountryNA=Namibiya
 CountryNR=Nauru
 CountryNP=Nepal
-CountryAN=Netherlands Antilles
-CountryNC=New Caledonia
-CountryNZ=New Zealand
-CountryNI=Nicaragua
+CountryAN=Niderlandiya Antil orollari
+CountryNC=Yangi Kaledoniya
+CountryNZ=Yangi Zelandiya
+CountryNI=Nikaragua
 CountryNE=Niger
-CountryNG=Nigeria
+CountryNG=Nigeriya
 CountryNU=Niue
-CountryNF=Norfolk Island
-CountryMP=Northern Mariana Islands
-CountryNO=Norway
-CountryOM=Oman
-CountryPK=Pakistan
+CountryNF=Norfolk oroli
+CountryMP=Shimoliy Mariana orollari
+CountryNO=Norvegiya
+CountryOM=Ummon
+CountryPK=Pokiston
 CountryPW=Palau
-CountryPS=Palestinian Territory, Occupied
+CountryPS=Falastin hududi, bosib olingan
 CountryPA=Panama
-CountryPG=Papua New Guinea
-CountryPY=Paraguay
+CountryPG=Papua-Yangi Gvineya
+CountryPY=Paragvay
 CountryPE=Peru
-CountryPH=Philippines
-CountryPN=Pitcairn Islands
-CountryPL=Poland
-CountryPR=Puerto Rico
+CountryPH=Filippinlar
+CountryPN=Pitkarn orollari
+CountryPL=Polsha
+CountryPR=Puerto-Riko
 CountryQA=Qatar
-CountryRE=Reunion
-CountryRO=Romania
-CountryRW=Rwanda
-CountrySH=Saint Helena
-CountryKN=Saint Kitts and Nevis
-CountryLC=Saint Lucia
-CountryPM=Saint Pierre and Miquelon
-CountryVC=Saint Vincent and Grenadines
+CountryRE=Uchrashuv
+CountryRO=Ruminiya
+CountryRW=Ruanda
+CountrySH=Avliyo Yelena
+CountryKN=Sent-Kits va Nevis
+CountryLC=Sankt-Lucia
+CountryPM=Sent-Pyer va Mikelon
+CountryVC=Sent-Vinsent va Grenadinlar
 CountryWS=Samoa
-CountrySM=San Marino
-CountryST=Sao Tome and Principe
-CountryRS=Serbia
-CountrySC=Seychelles
-CountrySL=Sierra Leone
-CountrySK=Slovakia
-CountrySI=Slovenia
-CountrySB=Solomon Islands
-CountrySO=Somalia
-CountryZA=South Africa
-CountryGS=South Georgia and the South Sandwich Islands
-CountryLK=Sri Lanka
+CountrySM=San-Marino
+CountryST=San-Tome va Printsip
+CountryRS=Serbiya
+CountrySC=Seyshel orollari
+CountrySL=Serra-Leone
+CountrySK=Slovakiya
+CountrySI=Sloveniya
+CountrySB=Solomon orollari
+CountrySO=Somali
+CountryZA=Janubiy Afrika
+CountryGS=Janubiy Jorjiya va Janubiy sendvich orollari
+CountryLK=Shri-Lanka
 CountrySD=Sudan
-CountrySR=Suriname
-CountrySJ=Svalbard and Jan Mayen
-CountrySZ=Swaziland
-CountrySY=Syrian
-CountryTW=Taiwan
-CountryTJ=Tajikistan
-CountryTZ=Tanzania
-CountryTH=Thailand
+CountrySR=Surinam
+CountrySJ=Shvalbard va Yan Mayen
+CountrySZ=Svazilend
+CountrySY=Suriya
+CountryTW=Tayvan
+CountryTJ=Tojikiston
+CountryTZ=Tanzaniya
+CountryTH=Tailand
 CountryTL=Timor-Leste
 CountryTK=Tokelau
 CountryTO=Tonga
-CountryTT=Trinidad and Tobago
-CountryTR=Turkey
-CountryTM=Turkmenistan
-CountryTC=Turks and Caicos Islands
+CountryTT=Trinidad va Tobago
+CountryTR=kurka
+CountryTM=Turkmaniston
+CountryTC=Turk va Kaykos orollari
 CountryTV=Tuvalu
 CountryUG=Uganda
-CountryUA=Ukraine
-CountryAE=United Arab Emirates
-CountryUM=United States Minor Outlying Islands
-CountryUY=Uruguay
-CountryUZ=Uzbekistan
+CountryUA=Ukraina
+CountryAE=Birlashgan Arab Amirliklari
+CountryUM=Qo'shma Shtatlarning Kichik chet orollari
+CountryUY=Urugvay
+CountryUZ=O'zbekiston
 CountryVU=Vanuatu
-CountryVE=Venezuela
-CountryVN=Viet Nam
-CountryVG=Virgin Islands, British
-CountryVI=Virgin Islands, U.S.
-CountryWF=Wallis and Futuna
-CountryEH=Western Sahara
-CountryYE=Yemen
-CountryZM=Zambia
-CountryZW=Zimbabwe
-CountryGG=Guernsey
-CountryIM=Isle of Man
-CountryJE=Jersey
-CountryME=Montenegro
-CountryBL=Saint Barthelemy
-CountryMF=Saint Martin
+CountryVE=Venesuela
+CountryVN=Vetnam
+CountryVG=Virjiniya orollari, Britaniya
+CountryVI=Virjiniya orollari, AQSh
+CountryWF=Uollis va Futuna
+CountryEH=G'arbiy Sahara
+CountryYE=Yaman
+CountryZM=Zambiya
+CountryZW=Zimbabve
+CountryGG=Gernsi
+CountryIM=Men oroli
+CountryJE=Jersi
+CountryME=Chernogoriya
+CountryBL=Sankt-Barthelemey
+CountryMF=Avliyo Martin
 
 ##### Civilities #####
-CivilityMME=Mrs.
-CivilityMR=Mr.
-CivilityMLE=Ms.
-CivilityMTRE=Master
-CivilityDR=Doctor
+CivilityMME=Xonim.
+CivilityMR=Janob.
+CivilityMLE=Xonim.
+CivilityMTRE=Ustoz
+CivilityDR=Doktor
 ##### Currencies #####
-Currencyeuros=Euros
-CurrencyAUD=AU Dollars
+Currencyeuros=Evro
+CurrencyAUD=AU Dollar
 CurrencySingAUD=AU Dollar
-CurrencyCAD=CAN Dollars
-CurrencySingCAD=CAN Dollar
-CurrencyCHF=Swiss Francs
-CurrencySingCHF=Swiss Franc
-CurrencyEUR=Euros
-CurrencySingEUR=Euro
-CurrencyFRF=French Francs
-CurrencySingFRF=French Franc
-CurrencyGBP=GB Pounds
-CurrencySingGBP=GB Pound
-CurrencyINR=Indian rupees
-CurrencySingINR=Indian rupee
+CurrencyCAD=JON Dollar
+CurrencySingCAD=JON Dollar
+CurrencyCHF=Shveytsariya franklari
+CurrencySingCHF=Shveytsariya franki
+CurrencyEUR=Evro
+CurrencySingEUR=Evro
+CurrencyFRF=Frantsiya franklari
+CurrencySingFRF=Frantsuz franki
+CurrencyGBP=GB funt
+CurrencySingGBP=GB funt
+CurrencyINR=Hind rupiyalari
+CurrencySingINR=Hind rupisi
 CurrencyMAD=Dirham
 CurrencySingMAD=Dirham
 CurrencyMGA=Ariary
 CurrencySingMGA=Ariary
-CurrencyMUR=Mauritius rupees
-CurrencySingMUR=Mauritius rupee
-CurrencyNOK=Norwegian krones
-CurrencySingNOK=Norwegian kronas
-CurrencyTND=Tunisian dinars
-CurrencySingTND=Tunisian dinar
-CurrencyUSD=US Dollars
-CurrencySingUSD=US Dollar
-CurrencyUAH=Hryvnia
-CurrencySingUAH=Hryvnia
-CurrencyXAF=CFA Francs BEAC
-CurrencySingXAF=CFA Franc BEAC
-CurrencyXOF=CFA Francs BCEAO
-CurrencySingXOF=CFA Franc BCEAO
-CurrencyXPF=CFP Francs
-CurrencySingXPF=CFP Franc
+CurrencyMUR=Mavrikiy rupiyasi
+CurrencySingMUR=Mavrikiy rupiyasi
+CurrencyNOK=Norvegiya kronalari
+CurrencySingNOK=Norvegiya kronasi
+CurrencyTND=Tunis dinarlari
+CurrencySingTND=Tunis dinari
+CurrencyUSD=AQSh dollari
+CurrencySingUSD=AQSh dollari
+CurrencyUAH=Grivnası
+CurrencySingUAH=Grivnası
+CurrencyXAF=CFA Frantsiyalari BEAC
+CurrencySingXAF=CFA Franciya BEAC
+CurrencyXOF=CFA Frantsiyalari BCEAO
+CurrencySingXOF=CFA Frantsiyasi BCEAO
+CurrencyXPF=CFP Frants
+CurrencySingXPF=CFP franki
 CurrencyCentEUR=cents
-CurrencyCentSingEUR=cent
+CurrencyCentSingEUR=sent
 CurrencyCentINR=paisa
 CurrencyCentSingINR=paise
-CurrencyThousandthSingTND=thousandth
+CurrencyThousandthSingTND=minginchi
 #### Input reasons #####
 DemandReasonTypeSRC_INTE=Internet
-DemandReasonTypeSRC_CAMP_MAIL=Mailing campaign
-DemandReasonTypeSRC_CAMP_EMAIL=EMailing campaign
-DemandReasonTypeSRC_CAMP_PHO=Phone campaign
-DemandReasonTypeSRC_CAMP_FAX=Fax campaign
-DemandReasonTypeSRC_COMM=Commercial contact
-DemandReasonTypeSRC_SHOP=Shop contact
-DemandReasonTypeSRC_WOM=Word of mouth
-DemandReasonTypeSRC_PARTNER=Partner
-DemandReasonTypeSRC_EMPLOYEE=Employee
-DemandReasonTypeSRC_SPONSORING=Sponsorship
+DemandReasonTypeSRC_CAMP_MAIL=Pochta yuborish kampaniyasi
+DemandReasonTypeSRC_CAMP_EMAIL=Elektron pochta xabarlari kampaniyasi
+DemandReasonTypeSRC_CAMP_PHO=Telefon kampaniyasi
+DemandReasonTypeSRC_CAMP_FAX=Faks kampaniyasi
+DemandReasonTypeSRC_COMM=Tijorat aloqasi
+DemandReasonTypeSRC_SHOP=Do'kon bilan aloqa
+DemandReasonTypeSRC_WOM=Og'zaki so'z
+DemandReasonTypeSRC_PARTNER=Hamkor
+DemandReasonTypeSRC_EMPLOYEE=Xodim
+DemandReasonTypeSRC_SPONSORING=Homiylik
 DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
 #### Paper formats ####
-PaperFormatEU4A0=Format 4A0
+PaperFormatEU4A0=4A0 formati
 PaperFormatEU2A0=Format 2A0
 PaperFormatEUA0=Format A0
 PaperFormatEUA1=Format A1
 PaperFormatEUA2=Format A2
-PaperFormatEUA3=Format A3
+PaperFormatEUA3=A3 formati
 PaperFormatEUA4=Format A4
 PaperFormatEUA5=Format A5
 PaperFormatEUA6=Format A6
-PaperFormatUSLETTER=Format Letter US
-PaperFormatUSLEGAL=Format Legal US
-PaperFormatUSEXECUTIVE=Format Executive US
-PaperFormatUSLEDGER=Format Ledger/Tabloid
-PaperFormatCAP1=Format P1 Canada
-PaperFormatCAP2=Format P2 Canada
-PaperFormatCAP3=Format P3 Canada
-PaperFormatCAP4=Format P4 Canada
-PaperFormatCAP5=Format P5 Canada
-PaperFormatCAP6=Format P6 Canada
+PaperFormatUSLETTER=AQSh xatini formatlash
+PaperFormatUSLEGAL=Huquqiy AQSh formatini shakllantirish
+PaperFormatUSEXECUTIVE=Ijroiya AQSh formatini shakllantirish
+PaperFormatUSLEDGER=Ledger / Tabloid formatlash
+PaperFormatCAP1=Format P1 Kanada
+PaperFormatCAP2=P2 formatidagi Kanada
+PaperFormatCAP3=Formati P3 Kanada
+PaperFormatCAP4=P4 formatidagi Kanada
+PaperFormatCAP5=P5 formatidagi Kanada
+PaperFormatCAP6=P6 formatidagi Kanada
 #### Expense report categories ####
 ExpAutoCat=Car
 ExpCycloCat=Moped
diff --git a/htdocs/langs/uz_UZ/donations.lang b/htdocs/langs/uz_UZ/donations.lang
index de4bdf68f03..42324ddd6c2 100644
--- a/htdocs/langs/uz_UZ/donations.lang
+++ b/htdocs/langs/uz_UZ/donations.lang
@@ -1,34 +1,35 @@
 # Dolibarr language file - Source file is en_US - donations
-Donation=Donation
-Donations=Donations
-DonationRef=Donation ref.
+Donation=Xayriya
+Donations=Xayriyalar
+DonationRef=Xayriya ma'lumoti
 Donor=Donor
-AddDonation=Create a donation
-NewDonation=New donation
-DeleteADonation=Delete a donation
-ConfirmDeleteADonation=Are you sure you want to delete this donation?
-PublicDonation=Public donation
-DonationsArea=Donations area
-DonationStatusPromiseNotValidated=Draft promise
-DonationStatusPromiseValidated=Validated promise
-DonationStatusPaid=Donation received
-DonationStatusPromiseNotValidatedShort=Draft
-DonationStatusPromiseValidatedShort=Validated
-DonationStatusPaidShort=Received
-DonationTitle=Donation receipt
+AddDonation=Xayr-ehson yarating
+NewDonation=Yangi xayriya
+DeleteADonation=Xayriyani o'chirib tashlang
+ConfirmDeleteADonation=Ushbu xayr-ehsonni o'chirishni xohlaysizmi?
+PublicDonation=Jamoat ehsoni
+DonationsArea=Xayriya maydoni
+DonationStatusPromiseNotValidated=Va'da loyihasi
+DonationStatusPromiseValidated=Tasdiqlangan va'da
+DonationStatusPaid=Xayriya qabul qilindi
+DonationStatusPromiseNotValidatedShort=Qoralama
+DonationStatusPromiseValidatedShort=Tasdiqlangan
+DonationStatusPaidShort=Qabul qildi
+DonationTitle=Xayriya kvitansiyasi
 DonationDate=Donation date
-DonationDatePayment=Payment date
-ValidPromess=Validate promise
-DonationReceipt=Donation receipt
-DonationsModels=Documents models for donation receipts
-LastModifiedDonations=Latest %s modified donations
-DonationRecipient=Donation recipient
-IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount
-MinimumAmount=Minimum amount is  %s
-FreeTextOnDonations=Free text to show in footer
-FrenchOptions=Options for France
-DONATION_ART200=Show article 200 from CGI if you are concerned
-DONATION_ART238=Show article 238 from CGI if you are concerned
-DONATION_ART885=Show article 885 from CGI if you are concerned
-DonationPayment=Donation payment
+DonationDatePayment=To'lov sanasi
+ValidPromess=Va'dani tasdiqlang
+DonationReceipt=Xayriya kvitansiyasi
+DonationsModels=Xayriya tushumlari uchun hujjatlar modellari
+LastModifiedDonations=Oxirgi %s o'zgartirilgan xayriya mablag'lari
+DonationRecipient=Xayriya oluvchi
+IConfirmDonationReception=Qabul qiluvchilar quyidagi mablag'ni xayr-ehson sifatida qabul qilish to'g'risida e'lon qilishadi
+MinimumAmount=Minimal miqdor - %s
+FreeTextOnDonations=Taglavhada ko'rsatish uchun bepul matn
+FrenchOptions=Frantsiya uchun variantlar
+DONATION_ART200=Agar xavotirda bo'lsangiz, CGI-dan 200-maqolani ko'rsating
+DONATION_ART238=Agar xavotirda bo'lsangiz, CGI-dan 238-maqolani ko'rsating
+DONATION_ART885=Agar xavotirda bo'lsangiz, CGI-dan 885-maqolani ko'rsating
+DonationPayment=Xayriya to'lovi
 DonationValidated=Donation %s validated
+DonationUseThirdparties=Use an existing thirdparty as coordinates of donators
diff --git a/htdocs/langs/uz_UZ/ecm.lang b/htdocs/langs/uz_UZ/ecm.lang
index bc18bed4a29..c4064174d8c 100644
--- a/htdocs/langs/uz_UZ/ecm.lang
+++ b/htdocs/langs/uz_UZ/ecm.lang
@@ -1,39 +1,39 @@
 # Dolibarr language file - Source file is en_US - ecm
-ECMNbOfDocs=No. of documents in directory
-ECMSection=Directory
-ECMSectionManual=Manual directory
-ECMSectionAuto=Automatic directory
-ECMSectionsManual=Manual tree
-ECMSectionsAuto=Automatic tree
-ECMSections=Directories
-ECMRoot=ECM Root
-ECMNewSection=New directory
-ECMAddSection=Add directory
-ECMCreationDate=Creation date
-ECMNbOfFilesInDir=Number of files in directory
-ECMNbOfSubDir=Number of sub-directories
-ECMNbOfFilesInSubDir=Number of files in sub-directories
-ECMCreationUser=Creator
-ECMArea=DMS/ECM area
-ECMAreaDesc=The DMS/ECM (Document Management System / Electronic Content Management) area allows you to save, share and search quickly all kind of documents in Dolibarr.
-ECMAreaDesc2=* Automatic directories are filled automatically when adding documents from card of an element.<br>* Manual directories can be used to save documents not linked to a particular element.
-ECMSectionWasRemoved=Directory <b>%s</b> has been deleted.
+ECMNbOfDocs=Katalogdagi hujjatlar soni
+ECMSection=Katalog
+ECMSectionManual=Qo'llanma katalogi
+ECMSectionAuto=Avtomatik katalog
+ECMSectionsManual=Qo'lda ishlatiladigan daraxt
+ECMSectionsAuto=Avtomatik daraxt
+ECMSections=Kataloglar
+ECMRoot=ECM ildizi
+ECMNewSection=Yangi katalog
+ECMAddSection=Katalog qo'shish
+ECMCreationDate=Yaratilish sanasi
+ECMNbOfFilesInDir=Katalogdagi fayllar soni
+ECMNbOfSubDir=Ichki kataloglar soni
+ECMNbOfFilesInSubDir=Ichki kataloglardagi fayllar soni
+ECMCreationUser=Ijodkor
+ECMArea=DMS / ECM maydoni
+ECMAreaDesc=DMS / ECM (Hujjatlarni boshqarish tizimi / Elektron kontentni boshqarish) maydoni Dolibarrdagi barcha turdagi hujjatlarni saqlash, almashish va tezkor qidirish imkonini beradi.
+ECMAreaDesc2=* Element kartasidan hujjatlar qo'shilganda avtomatik kataloglar avtomatik ravishda to'ldiriladi. <br> * qo'llanma kataloglaridan ma'lum bir elementga bog'lanmagan hujjatlarni saqlash uchun foydalanish mumkin.
+ECMSectionWasRemoved=<b> %s </b> katalog o'chirildi.
 ECMSectionWasCreated=Directory <b>%s</b> has been created.
-ECMSearchByKeywords=Search by keywords
-ECMSearchByEntity=Search by object
-ECMSectionOfDocuments=Directories of documents
-ECMTypeAuto=Automatic
+ECMSearchByKeywords=Kalit so'zlar bo'yicha qidirish
+ECMSearchByEntity=Ob'ekt bo'yicha qidirish
+ECMSectionOfDocuments=Hujjatlar kataloglari
+ECMTypeAuto=Avtomatik
 ECMDocsBy=Documents linked to %s
-ECMNoDirectoryYet=No directory created
-ShowECMSection=Show directory
-DeleteSection=Remove directory
-ConfirmDeleteSection=Can you confirm you want to delete the directory <b>%s</b>?
-ECMDirectoryForFiles=Relative directory for files
+ECMNoDirectoryYet=Hech qanday katalog yaratilmagan
+ShowECMSection=Katalogni ko'rsatish
+DeleteSection=Katalogni olib tashlash
+ConfirmDeleteSection=<b> %s </b> katalogini o'chirishni xohlayotganingizni tasdiqlay olasizmi?
+ECMDirectoryForFiles=Fayllar uchun nisbiy katalog
 CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
-CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
-ECMFileManager=File manager
-ECMSelectASection=Select a directory in the tree...
-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.
+CannotRemoveDirectoryContainsFiles=O'chirish mumkin emas, chunki unda ba'zi fayllar mavjud
+ECMFileManager=Fayl menejeri
+ECMSelectASection=Daraxtdagi katalogni tanlang ...
+DirNotSynchronizedSyncFirst=Ushbu katalog ECM modulidan tashqarida yaratilgan yoki o'zgartirilganga o'xshaydi. Ushbu katalog tarkibini olish uchun disk va ma'lumotlar bazasini sinxronlashtirish uchun avval "Qayta sinxronlashtirish" tugmachasini bosishingiz kerak.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
 NoDirectoriesFound=No directories found
diff --git a/htdocs/langs/uz_UZ/errors.lang b/htdocs/langs/uz_UZ/errors.lang
index 9b14b5ad1d2..074d27652d8 100644
--- a/htdocs/langs/uz_UZ/errors.lang
+++ b/htdocs/langs/uz_UZ/errors.lang
@@ -1,213 +1,214 @@
 # Dolibarr language file - Source file is en_US - errors
 
 # No errors
-NoErrorCommitIsDone=No error, we commit
+NoErrorCommitIsDone=Biz xato qilamiz
 # Errors
-ErrorButCommitIsDone=Errors found but we validate despite this
-ErrorBadEMail=Email %s is incorrect
+ErrorButCommitIsDone=Xatolar topildi, ammo shunga qaramay biz tasdiqlaymiz
+ErrorBadEMail=%s elektron pochtasi noto'g'ri
 ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
-ErrorBadUrl=Url %s is incorrect
-ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
-ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
-ErrorLoginAlreadyExists=Login %s already exists.
-ErrorGroupAlreadyExists=Group %s already exists.
-ErrorRecordNotFound=Record not found.
-ErrorFailToCopyFile=Failed to copy file '<b>%s</b>' into '<b>%s</b>'.
-ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
-ErrorFailToRenameFile=Failed to rename file '<b>%s</b>' into '<b>%s</b>'.
-ErrorFailToDeleteFile=Failed to remove file '<b>%s</b>'.
-ErrorFailToCreateFile=Failed to create file '<b>%s</b>'.
-ErrorFailToRenameDir=Failed to rename directory '<b>%s</b>' into '<b>%s</b>'.
-ErrorFailToCreateDir=Failed to create directory '<b>%s</b>'.
-ErrorFailToDeleteDir=Failed to delete directory '<b>%s</b>'.
+ErrorBadUrl=Url %s noto'g'ri
+ErrorBadValueForParamNotAString=Parametringiz uchun yomon qiymat. Odatda tarjima etishmayotganida qo'shiladi.
+ErrorRefAlreadyExists=<b> %s </b> ma'lumotnomasi allaqachon mavjud.
+ErrorLoginAlreadyExists=%s-ga kirish allaqachon mavjud.
+ErrorGroupAlreadyExists=%s guruhi allaqachon mavjud.
+ErrorEmailAlreadyExists=Email %s already exists.
+ErrorRecordNotFound=Yozuv topilmadi.
+ErrorFailToCopyFile='<b> %s </b>' faylini '<b> %s </b>' ga ko'chirib bo'lmadi.
+ErrorFailToCopyDir='<b> %s </b>' katalogini '<b> %s </b>' ga ko'chirib bo'lmadi.
+ErrorFailToRenameFile='<b> %s </b>' faylini '<b> %s </b>' deb o'zgartirib bo'lmadi.
+ErrorFailToDeleteFile='<b> %s </b>' faylini o'chirib bo'lmadi.
+ErrorFailToCreateFile='<b> %s </b>' fayli yaratilmadi.
+ErrorFailToRenameDir='<b> %s </b>' katalogini '<b> %s </b>' deb o'zgartirib bo'lmadi.
+ErrorFailToCreateDir='<b> %s </b>' katalogini yaratib bo'lmadi.
+ErrorFailToDeleteDir='<b> %s </b>' katalogini o'chirib bo'lmadi.
 ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
 ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
-ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as contact for this type.
-ErrorCashAccountAcceptsOnlyCashMoney=This bank account is a cash account, so it accepts payments of type cash only.
-ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be different.
-ErrorBadThirdPartyName=Bad value for third-party name
-ErrorProdIdIsMandatory=The %s is mandatory
-ErrorBadCustomerCodeSyntax=Bad syntax for customer code
-ErrorBadBarCodeSyntax=Bad syntax for barcode. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
-ErrorCustomerCodeRequired=Customer code required
-ErrorBarCodeRequired=Barcode required
-ErrorCustomerCodeAlreadyUsed=Customer code already used
-ErrorBarCodeAlreadyUsed=Barcode already used
-ErrorPrefixRequired=Prefix required
-ErrorBadSupplierCodeSyntax=Bad syntax for vendor code
-ErrorSupplierCodeRequired=Vendor code required
-ErrorSupplierCodeAlreadyUsed=Vendor code already used
-ErrorBadParameters=Bad parameters
+ErrorThisContactIsAlreadyDefinedAsThisType=Ushbu kontakt allaqachon ushbu turdagi aloqa sifatida aniqlangan.
+ErrorCashAccountAcceptsOnlyCashMoney=Ushbu bank hisobvarag'i kassa hisobvarag'i hisoblanadi, shuning uchun u faqat naqd turdagi to'lovlarni qabul qiladi.
+ErrorFromToAccountsMustDiffers=Bank hisob raqamlarining manbalari va maqsadlari boshqacha bo'lishi kerak.
+ErrorBadThirdPartyName=Uchinchi tomon nomi uchun noto'g'ri qiymat
+ErrorProdIdIsMandatory=%s majburiydir
+ErrorBadCustomerCodeSyntax=Mijoz kodi uchun noto'g'ri sintaksis
+ErrorBadBarCodeSyntax=Shtrixli kod uchun noto'g'ri sintaksis. Ehtimol, siz shtrix-kodning yomon turini o'rnatdingiz yoki skanerlangan qiymatga mos kelmaydigan raqamlash uchun shtrix-niqobni aniqladingiz.
+ErrorCustomerCodeRequired=Mijoz kodi talab qilinadi
+ErrorBarCodeRequired=Shtrixli kod kerak
+ErrorCustomerCodeAlreadyUsed=Mijoz kodi allaqachon ishlatilgan
+ErrorBarCodeAlreadyUsed=Shtrix allaqachon ishlatilgan
+ErrorPrefixRequired=Prefiks kerak
+ErrorBadSupplierCodeSyntax=Sotuvchi kodi uchun noto'g'ri sintaksis
+ErrorSupplierCodeRequired=Sotuvchi kodi talab qilinadi
+ErrorSupplierCodeAlreadyUsed=Sotuvchi kodi allaqachon ishlatilgan
+ErrorBadParameters=Yomon parametrlar
 ErrorWrongParameters=Wrong or missing parameters
-ErrorBadValueForParameter=Wrong value '%s' for parameter '%s'
-ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
-ErrorBadDateFormat=Value '%s' has wrong date format
-ErrorWrongDate=Date is not correct!
-ErrorFailedToWriteInDir=Failed to write in directory %s
-ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s)
-ErrorUserCannotBeDelete=User cannot be deleted. Maybe it is associated to Dolibarr entities.
-ErrorFieldsRequired=Some required fields have been left blank.
+ErrorBadValueForParameter="%s" parametri uchun noto'g'ri qiymat '%s'
+ErrorBadImageFormat=Rasm fayli qo'llab-quvvatlanadigan formatga ega emas (sizning PHP-da ushbu formatdagi rasmlarni o'zgartirish funktsiyalari mavjud emas)
+ErrorBadDateFormat="%s" qiymati noto'g'ri sana formatiga ega
+ErrorWrongDate=Sana to'g'ri emas!
+ErrorFailedToWriteInDir=%s katalogiga yozib bo'lmadi
+ErrorFoundBadEmailInFile=Faylda %s satrlari uchun noto'g'ri elektron pochta sintaksisini topdi (masalan, %s qatori elektron pochta bilan = %s)
+ErrorUserCannotBeDelete=Foydalanuvchini o'chirib bo'lmaydi. Ehtimol, bu Dolibarr sub'ektlari bilan bog'liq.
+ErrorFieldsRequired=Ba'zi majburiy maydonlar bo'sh qoldirildi.
 ErrorSubjectIsRequired=The email subject is required
-ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
-ErrorNoMailDefinedForThisUser=No mail defined for this user
+ErrorFailedToCreateDir=Katalog yaratilmadi. Veb-server foydalanuvchisida Dolibarr hujjatlar katalogiga yozish uchun ruxsat borligini tekshiring. Agar ushbu PHP-da <b> safe_mode </b> parametri yoqilgan bo'lsa, Dolibarr php fayllari veb-server foydalanuvchisiga (yoki guruhiga) tegishli ekanligini tekshiring.
+ErrorNoMailDefinedForThisUser=Ushbu foydalanuvchi uchun hech qanday pochta belgilanmagan
 ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
-ErrorFeatureNeedJavascript=This feature need javascript to be activated to work. Change this in setup - display.
-ErrorTopMenuMustHaveAParentWithId0=A menu of type 'Top' can't have a parent menu. Put 0 in parent menu or choose a menu of type 'Left'.
-ErrorLeftMenuMustHaveAParentId=A menu of type 'Left' must have a parent id.
-ErrorFileNotFound=File <b>%s</b> not found (Bad path, wrong permissions or access denied by PHP openbasedir or safe_mode parameter)
-ErrorDirNotFound=Directory <b>%s</b> not found (Bad path, wrong permissions or access denied by PHP openbasedir or safe_mode parameter)
-ErrorFunctionNotAvailableInPHP=Function <b>%s</b> is required for this feature but is not available in this version/setup of PHP.
-ErrorDirAlreadyExists=A directory with this name already exists.
-ErrorFileAlreadyExists=A file with this name already exists.
+ErrorFeatureNeedJavascript=Ushbu xususiyatni ishga tushirish uchun javascript kerak. Buni sozlash - displeyda o'zgartiring.
+ErrorTopMenuMustHaveAParentWithId0="Top" turidagi menyuda asosiy menyu bo'lishi mumkin emas. Bosh menyuga 0 qo'ying yoki "Chap" turidagi menyuni tanlang.
+ErrorLeftMenuMustHaveAParentId="Chap" turidagi menyuda ota-ona identifikatori bo'lishi kerak.
+ErrorFileNotFound=<b> %s </b> fayl topilmadi (Yomon yo'l, noto'g'ri ruxsat yoki PHP openbasedir yoki safe_mode parametri tomonidan rad etilgan)
+ErrorDirNotFound=<b> %s </b> katalog topilmadi (Yomon yo'l, noto'g'ri ruxsat yoki PHP openbasedir yoki safe_mode parametri tomonidan rad etilgan)
+ErrorFunctionNotAvailableInPHP=Ushbu funktsiya uchun <b> %s </b> funktsiyasi talab qilinadi, ammo PHP-ning ushbu versiyasida / sozlamalarida mavjud emas.
+ErrorDirAlreadyExists=Ushbu nomdagi katalog allaqachon mavjud.
+ErrorFileAlreadyExists=Bunday nomdagi fayl allaqachon mavjud.
 ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exists.
-ErrorPartialFile=File not received completely by server.
-ErrorNoTmpDir=Temporary directy %s does not exists.
-ErrorUploadBlockedByAddon=Upload blocked by a PHP/Apache plugin.
-ErrorFileSizeTooLarge=File size is too large.
+ErrorPartialFile=Fayl server tomonidan to'liq qabul qilinmadi.
+ErrorNoTmpDir=Vaqtinchalik to'g'ridan-to'g'ri %s mavjud emas.
+ErrorUploadBlockedByAddon=Yuklash PHP / Apache plaginlari tomonidan bloklangan.
+ErrorFileSizeTooLarge=Fayl hajmi juda katta.
 ErrorFieldTooLong=Field %s is too long.
-ErrorSizeTooLongForIntType=Size too long for int type (%s digits maximum)
-ErrorSizeTooLongForVarcharType=Size too long for string type (%s chars maximum)
-ErrorNoValueForSelectType=Please fill value for select list
-ErrorNoValueForCheckBoxType=Please fill value for checkbox list
-ErrorNoValueForRadioType=Please fill value for radio list
-ErrorBadFormatValueList=The list value cannot have more than one comma: <u>%s</u>, but need at least one: key,value
-ErrorFieldCanNotContainSpecialCharacters=The field <b>%s</b> must not contains special characters.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=The field <b>%s</b> must not contain special characters, nor upper case characters and cannot contain only numbers.
+ErrorSizeTooLongForIntType=Int turi uchun juda uzun (maksimal %s raqam)
+ErrorSizeTooLongForVarcharType=Ip turi uchun o'lcham juda uzun (%s belgilar maksimal)
+ErrorNoValueForSelectType=Iltimos, tanlangan ro'yxat uchun qiymatni to'ldiring
+ErrorNoValueForCheckBoxType=Iltimos, katakchalar ro'yxati uchun qiymatni to'ldiring
+ErrorNoValueForRadioType=Iltimos, radio ro'yxati uchun qiymatni to'ldiring
+ErrorBadFormatValueList=Ro'yxat qiymati bitta verguldan iborat bo'lishi mumkin emas: <u> %s </u>, lekin kamida bittasi kerak: key, value
+ErrorFieldCanNotContainSpecialCharacters=<b> %s </b> maydonida maxsus belgilar bo'lmasligi kerak.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=<b> %s </b> maydonida maxsus belgilar, shuningdek katta harflar bo'lmasligi va faqat raqamlardan iborat bo'lishi kerak.
 ErrorFieldMustHaveXChar=The field <b>%s</b> must have at least %s characters.
-ErrorNoAccountancyModuleLoaded=No accountancy module activated
-ErrorExportDuplicateProfil=This profile name already exists for this export set.
-ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
-ErrorLDAPMakeManualTest=A .ldif file has been generated in directory %s. Try to load it manually from command line to have more information on errors.
-ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
-ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
-ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
-ErrorRecordHasChildren=Failed to delete record since it has some child records.
+ErrorNoAccountancyModuleLoaded=Buxgalteriya moduli faollashtirilmagan
+ErrorExportDuplicateProfil=Ushbu eksport to'plami uchun ushbu profil nomi allaqachon mavjud.
+ErrorLDAPSetupNotComplete=Dolibarr-LDAP mos kelmadi.
+ErrorLDAPMakeManualTest=%s katalogida .ldif fayli yaratilgan. Xatolar haqida ko'proq ma'lumotga ega bo'lish uchun uni buyruq satridan qo'lda yuklashga harakat qiling.
+ErrorCantSaveADoneUserWithZeroPercentage=Agar "bajarilgan" maydoni ham to'ldirilgan bo'lsa, "holat boshlanmadi" bilan amalni saqlab bo'lmaydi.
+ErrorRefAlreadyExists=<b> %s </b> ma'lumotnomasi allaqachon mavjud.
+ErrorPleaseTypeBankTransactionReportName=Iltimos, yozuv haqida xabar berish kerak bo'lgan bank ma'lumotnomasining nomini kiriting (YYYYMM yoki YYYYMMDD formati)
+ErrorRecordHasChildren=Yozuv o'chirilmadi, chunki ba'zi bir bolalar yozuvlari mavjud.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
-ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into another object.
-ErrorModuleRequireJavascript=Javascript must not be disabled to have this feature working. To enable/disable Javascript, go to menu Home->Setup->Display.
-ErrorPasswordsMustMatch=Both typed passwords must match each other
-ErrorContactEMail=A technical error occured. Please, contact administrator to following email <b>%s</b> and provide the error code <b>%s</b> in your message, or add a screen copy of this page.
+ErrorRecordIsUsedCantDelete=Yozuvni o‘chirib bo‘lmadi. U allaqachon ishlatilgan yoki boshqa ob'ektga kiritilgan.
+ErrorModuleRequireJavascript=Ushbu xususiyat ishlashi uchun Javascript o'chirib qo'yilmasligi kerak. Javascriptni yoqish / o'chirish uchun Home-> Setup-> Display menyusiga o'ting.
+ErrorPasswordsMustMatch=Yozilgan har ikkala parol bir-biriga mos kelishi kerak
+ErrorContactEMail=Texnik xatolik yuz berdi. Iltimos, administrator bilan bog'laning. <b> %s </b> elektron pochta manziliga va sizning xabaringiz nusxasida ushbu ekranning nusxasini yoki sizning ekraningizda nusxa ko'chirish xatosini yuboring <b> %s </b>,
 ErrorWrongValueForField=Field <b>%s</b>: '<b>%s</b>' does not match regex rule <b>%s</b>
-ErrorFieldValueNotIn=Field <b>%s</b>: '<b>%s</b>' is not a value found in field <b>%s</b> of <b>%s</b>
+ErrorFieldValueNotIn=Dala <b> %s </b>: «<b> %s </b>" bir qiymati dala <b> %s </b> topilmadi <b> %s </b>
 ErrorFieldRefNotIn=Field <b>%s</b>: '<b>%s</b>' is not a <b>%s</b> existing ref
-ErrorsOnXLines=%s errors found
-ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus)
-ErrorSpecialCharNotAllowedForField=Special characters are not allowed for field "%s"
-ErrorNumRefModel=A reference exists into database (%s) and is not compatible with this numbering rule. Remove record or renamed reference to activate this module.
-ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this vendor
+ErrorsOnXLines=%s xatolar topildi
+ErrorFileIsInfectedWithAVirus=Antivirus dasturi faylni tekshira olmadi (faylga virus yuqishi mumkin)
+ErrorSpecialCharNotAllowedForField="%s" maydoni uchun maxsus belgilarga ruxsat berilmaydi
+ErrorNumRefModel=Ma'lumotlar bazasida (%s) ma'lumotlar bazasi mavjud va bu raqamlash qoidalariga mos kelmaydi. Ushbu modulni faollashtirish uchun yozuvni o'chirib tashlang yoki nomini o'zgartiring.
+ErrorQtyTooLowForThisSupplier=Ushbu sotuvchi uchun juda kam miqdor yoki ushbu sotuvchida ushbu mahsulot uchun narx belgilanmagan
 ErrorOrdersNotCreatedQtyTooLow=Some orders haven't been created because of too-low quantities
-ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
-ErrorBadMask=Error on mask
-ErrorBadMaskFailedToLocatePosOfSequence=Error, mask without sequence number
-ErrorBadMaskBadRazMonth=Error, bad reset value
-ErrorMaxNumberReachForThisMask=Maximum number reached for this mask
-ErrorCounterMustHaveMoreThan3Digits=Counter must have more than 3 digits
-ErrorSelectAtLeastOne=Error, select at least one entry.
-ErrorDeleteNotPossibleLineIsConsolidated=Delete not possible because record is linked to a bank transaction that is conciliated
-ErrorProdIdAlreadyExist=%s is assigned to another third
-ErrorFailedToSendPassword=Failed to send password
-ErrorFailedToLoadRSSFile=Fails to get RSS feed. Try to add constant MAIN_SIMPLEXMLLOAD_DEBUG if error messages does not provide enough information.
-ErrorForbidden=Access denied.<br>You try to access to a page, area or feature of a disabled module or without being in an authenticated session or that is not allowed to your user.
-ErrorForbidden2=Permission for this login can be defined by your Dolibarr administrator from menu %s->%s.
-ErrorForbidden3=It seems that Dolibarr is not used through an authenticated session. Take a look at Dolibarr setup documentation to know how to manage authentications (htaccess, mod_auth or other...).
-ErrorNoImagickReadimage=Class Imagick is not found in this PHP. No preview can be available. Administrators can disable this tab from menu Setup - Display.
-ErrorRecordAlreadyExists=Record already exists
+ErrorModuleSetupNotComplete=%s modulini sozlash tugallanmaganga o'xshaydi. Tugatish uchun Home - Setup - Modullarga o'ting.
+ErrorBadMask=Maskada xato
+ErrorBadMaskFailedToLocatePosOfSequence=Xato, tartib raqami bo'lmagan niqob
+ErrorBadMaskBadRazMonth=Xato, qayta tiklash qiymati yomon
+ErrorMaxNumberReachForThisMask=Ushbu niqob uchun maksimal raqam
+ErrorCounterMustHaveMoreThan3Digits=Hisoblagich 3 ta raqamdan ortiq bo'lishi kerak
+ErrorSelectAtLeastOne=Xato, kamida bitta yozuvni tanlang.
+ErrorDeleteNotPossibleLineIsConsolidated=Yo'q qilish mumkin emas, chunki yozuvlar kelishilgan bank operatsiyalari bilan bog'liq
+ErrorProdIdAlreadyExist=%s yana uchdan biriga tayinlangan
+ErrorFailedToSendPassword=Parolni yuborib bo'lmadi
+ErrorFailedToLoadRSSFile=RSS tasmasini ololmadi. Xato xabarlari etarli ma'lumot bermasa, doimiy ravishda MAIN_SIMPLEXMLLOAD_DEBUG qo'shishga harakat qiling.
+ErrorForbidden=Ruxsat yo'q. <br> Siz o'chirib qo'yilgan modulning sahifasiga, maydoniga yoki xususiyatiga yoki autentifikatsiya qilingan sessiyada bo'lmasdan yoki foydalanuvchingizga ruxsat berilmagan holda kirishga harakat qilasiz.
+ErrorForbidden2=Ushbu kirish uchun ruxsat sizning Dolibarr administratoringiz tomonidan %s-> %s menyusidan aniqlanishi mumkin.
+ErrorForbidden3=Dolibarr autentifikatsiya qilingan seans orqali ishlatilmaydi. Autentifikatsiyani qanday boshqarishni bilish uchun Dolibarrni sozlash bo'yicha hujjatlarni ko'rib chiqing (htaccess, mod_auth yoki boshqa ...).
+ErrorNoImagickReadimage=Imagick sinfi ushbu PHP-da mavjud emas. Hech qanday oldindan ko'rish mumkin emas. Administrator ushbu yorliqni O'rnatish - Displey menyusidan o'chirib qo'yishi mumkin.
+ErrorRecordAlreadyExists=Yozuv allaqachon mavjud
 ErrorLabelAlreadyExists=This label already exists
-ErrorCantReadFile=Failed to read file '%s'
-ErrorCantReadDir=Failed to read directory '%s'
-ErrorBadLoginPassword=Bad value for login or password
-ErrorLoginDisabled=Your account has been disabled
-ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server. If PHP <b>Safe Mode</b> is enabled, check that command is inside a directory defined by parameter <b>safe_mode_exec_dir</b>.
-ErrorFailedToChangePassword=Failed to change password
-ErrorLoginDoesNotExists=User with login <b>%s</b> could not be found.
-ErrorLoginHasNoEmail=This user has no email address. Process aborted.
-ErrorBadValueForCode=Bad value for security code. Try again with new value...
-ErrorBothFieldCantBeNegative=Fields %s and %s can't be both negative
+ErrorCantReadFile='%s' faylini o'qib bo'lmadi
+ErrorCantReadDir='%s' katalogini o'qib bo'lmadi
+ErrorBadLoginPassword=Kirish yoki parol uchun noto'g'ri qiymat
+ErrorLoginDisabled=Sizning hisobingiz o'chirilgan
+ErrorFailedToRunExternalCommand=Tashqi buyruqni bajarib bo'lmadi. PHP-server foydalanuvchisi uni mavjudligini va boshqarilishini tekshiring. Shuningdek tekshiring, buyruq qobiq darajasida apparmor kabi xavfsizlik qatlami bilan himoyalanmagan.
+ErrorFailedToChangePassword=Parolni o'zgartirib bo'lmadi
+ErrorLoginDoesNotExists=<b> %s </b> tizimiga kirgan foydalanuvchi topilmadi.
+ErrorLoginHasNoEmail=Ushbu foydalanuvchi elektron pochta manziliga ega emas. Jarayon bekor qilindi.
+ErrorBadValueForCode=Xavfsizlik kodi noto'g'ri. Yangi qiymat bilan qayta urinib ko'ring ...
+ErrorBothFieldCantBeNegative=%s va %s maydonlari ikkalasi ham salbiy bo'lishi mumkin emas
 ErrorFieldCantBeNegativeOnInvoice=Field <strong>%s</strong> cannot be negative on this type of invoice. If you need to add a discount line, just create the discount first (from field '%s' in thirdparty card) and apply it to the invoice.
 ErrorLinesCantBeNegativeForOneVATRate=Total of lines (net of tax) can't be negative for a given not null VAT rate (Found a negative total for VAT rate <b>%s</b>%%).
 ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a deposit. You will face problems when you will need to consume the deposit in final invoice if you do so.
-ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
-ErrorWebServerUserHasNotPermission=User account <b>%s</b> used to execute web server has no permission for that
-ErrorNoActivatedBarcode=No barcode type activated
-ErrUnzipFails=Failed to unzip %s with ZipArchive
-ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
-ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
-ErrorModuleFileRequired=You must select a Dolibarr module package file
-ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with Paypal
-ErrorFailedToAddToMailmanList=Failed to add record %s to Mailman list %s or SPIP base
-ErrorFailedToRemoveToMailmanList=Failed to remove record %s to Mailman list %s or SPIP base
-ErrorNewValueCantMatchOldValue=New value can't be equal to old one
-ErrorFailedToValidatePasswordReset=Failed to reinit password. May be the reinit was already done (this link can be used only one time). If not, try to restart the reinit process.
-ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
-ErrorFailedToAddContact=Failed to add contact
-ErrorDateMustBeBeforeToday=The date must be lower than today
+ErrorQtyForCustomerInvoiceCantBeNegative=Xaridorlarning schyot-fakturalari qatori salbiy bo'lishi mumkin emas
+ErrorWebServerUserHasNotPermission=Veb-serverni amalga oshirish uchun foydalanilgan <b> %s </b> foydalanuvchi qayd yozuvida bunga ruxsat yo'q
+ErrorNoActivatedBarcode=Shtrixli kod yoqilmagan
+ErrUnzipFails=%s ni ZipArchive bilan ochib bo'lmadi
+ErrNoZipEngine=Ushbu PHP-da %s faylini ziplash / ochish uchun vosita yo'q
+ErrorFileMustBeADolibarrPackage=%s fayli Dolibarr zip to'plami bo'lishi kerak
+ErrorModuleFileRequired=Dolibarr moduli to'plami faylini tanlashingiz kerak
+ErrorPhpCurlNotInstalled=PHP CURL o'rnatilmagan, bu Paypal bilan suhbatlashish uchun juda muhimdir
+ErrorFailedToAddToMailmanList=%s yoki MailIP ro'yxatiga %s yozuvini yoki SPIP bazasini qo'shib bo'lmadi
+ErrorFailedToRemoveToMailmanList=%s yozuvini %s yoki SPIP bazasini pochtachilar ro'yxatiga o'chirib bo'lmadi
+ErrorNewValueCantMatchOldValue=Yangi qiymat eskisiga teng bo'lishi mumkin emas
+ErrorFailedToValidatePasswordReset=Parolni qayta tiklab bo'lmadi. Qayta tiklash allaqachon amalga oshirilgan bo'lishi mumkin (bu havola faqat bir marta ishlatilishi mumkin). Agar yo'q bo'lsa, qayta tiklash jarayonini qayta boshlashga harakat qiling.
+ErrorToConnectToMysqlCheckInstance=Ma'lumotlar bazasiga ulanish muvaffaqiyatsiz tugadi. Ma'lumotlar bazasi serveri ishlayotganligini tekshiring (masalan,
+ErrorFailedToAddContact=Kontakt qo'shilmadi
+ErrorDateMustBeBeforeToday=Sana bugundan pastroq bo'lishi kerak
 ErrorDateMustBeInFuture=The date must be greater than today
-ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setup of module Invoice was not completed to define information to show for this payment mode.
-ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use this feature.
-ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
-ErrorWarehouseMustDiffers=Source and target warehouses must differs
-ErrorBadFormat=Bad format!
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any third party. Link member to an existing third party or create a new third party before creating subscription with invoice.
-ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
-ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank entry that was reconciled
-ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Paid
-ErrorPriceExpression1=Cannot assign to constant '%s'
-ErrorPriceExpression2=Cannot redefine built-in function '%s'
-ErrorPriceExpression3=Undefined variable '%s' in function definition
-ErrorPriceExpression4=Illegal character '%s'
-ErrorPriceExpression5=Unexpected '%s'
-ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
-ErrorPriceExpression8=Unexpected operator '%s'
-ErrorPriceExpression9=An unexpected error occured
-ErrorPriceExpression10=Operator '%s' lacks operand
-ErrorPriceExpression11=Expecting '%s'
-ErrorPriceExpression14=Division by zero
-ErrorPriceExpression17=Undefined variable '%s'
-ErrorPriceExpression19=Expression not found
-ErrorPriceExpression20=Empty expression
-ErrorPriceExpression21=Empty result '%s'
-ErrorPriceExpression22=Negative result '%s'
+ErrorPaymentModeDefinedToWithoutSetup=%s yozish uchun to'lov rejimi o'rnatildi, ammo ushbu to'lov rejimi uchun ma'lumotni aniqlash uchun fakturani moduli o'rnatilmagan.
+ErrorPHPNeedModule=Xato, PHP-da ushbu funktsiyadan foydalanish uchun <b> %s </b> moduli o'rnatilgan bo'lishi kerak.
+ErrorOpenIDSetupNotComplete=OpenID autentifikatsiyasiga ruxsat berish uchun Dolibarr konfiguratsiya faylini o'rnatdingiz, ammo OpenID xizmatining URL manzili doimiy ravishda %s shaklida aniqlanmagan
+ErrorWarehouseMustDiffers=Manba va maqsadli omborlar farq qilishi kerak
+ErrorBadFormat=Noto'g'ri format!
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Xato, bu a'zo hali hech qanday uchinchi tomon bilan bog'lanmagan. Hisob-faktura bilan obuna yaratishdan oldin a'zoni mavjud bo'lgan uchinchi tomon bilan bog'lang yoki yangi uchinchi tomonni yarating.
+ErrorThereIsSomeDeliveries=Xato, ushbu etkazib berishga bog'liq bo'lgan ba'zi etkazib berishlar mavjud. Yo'q qilish rad etildi.
+ErrorCantDeletePaymentReconciliated=Yarashtirilgan bank yozuvini yaratgan to'lovni o'chirib bo'lmaydi
+ErrorCantDeletePaymentSharedWithPayedInvoice=Hech bo'lmaganda bitta faktura bilan to'langan to'lovni o'chirib bo'lmaydi, pullik holati mavjud
+ErrorPriceExpression1="%s" doimiyligini tayinlab bo'lmaydi
+ErrorPriceExpression2=O'rnatilgan '%s' funktsiyasini qayta aniqlab bo'lmaydi
+ErrorPriceExpression3=Funktsiya ta'rifida aniqlanmagan '%s' o'zgaruvchisi
+ErrorPriceExpression4=Noqonuniy belgi '%s'
+ErrorPriceExpression5=Kutilmagan '%s'
+ErrorPriceExpression6=Argumentlar soni noto'g'ri (%s berilgan, %s kutilmoqda)
+ErrorPriceExpression8=Kutilmagan operator '%s'
+ErrorPriceExpression9=Kutilmagan xatolik yuz berdi
+ErrorPriceExpression10="%s" operatorida operand yo'q
+ErrorPriceExpression11="%s" kutilmoqda
+ErrorPriceExpression14=Nolga bo'linish
+ErrorPriceExpression17=%s aniqlanmagan o'zgaruvchisi
+ErrorPriceExpression19=Ifoda topilmadi
+ErrorPriceExpression20=Bo'sh ifoda
+ErrorPriceExpression21=Bo'sh natija '%s'
+ErrorPriceExpression22=Salbiy natija '%s'
 ErrorPriceExpression23=Unknown or non set variable '%s' in %s
 ErrorPriceExpression24=Variable '%s' exists but has no value
-ErrorPriceExpressionInternal=Internal error '%s'
-ErrorPriceExpressionUnknown=Unknown error '%s'
-ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
-ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on product '%s' requiring lot/serial information
-ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified (approved or denied) before being allowed to do this action
-ErrorCantSetReceptionToTotalDoneWithReceptionDenied=All recorded receptions must first be verified (approved) before being allowed to do this action
-ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
-ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
-ErrorGlobalVariableUpdater2=Missing parameter '%s'
-ErrorGlobalVariableUpdater3=The requested data was not found in result
-ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
-ErrorGlobalVariableUpdater5=No global variable selected
-ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
-ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
-ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter it's status.
+ErrorPriceExpressionInternal=Ichki xato '%s'
+ErrorPriceExpressionUnknown=Noma'lum xato '%s'
+ErrorSrcAndTargetWarehouseMustDiffers=Manba va maqsadli omborlar farq qilishi kerak
+ErrorTryToMakeMoveOnProductRequiringBatchData=Lot / ketma-ket ma'lumot talab qiladigan '%s' mahsulotida lot / ketma-ket ma'lumotsiz birja harakatini amalga oshirishda xato
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=Ushbu harakatni amalga oshirishga ruxsat berishdan oldin barcha yozib olingan qabullarni tekshirish (tasdiqlash yoki rad etish) kerak
+ErrorCantSetReceptionToTotalDoneWithReceptionDenied=Ushbu harakatni amalga oshirishga ruxsat berishdan oldin barcha yozib olingan qabullarni tekshirish (tasdiqlash) kerak
+ErrorGlobalVariableUpdater0=HTTP so'rovi '%s' xatosi bilan bajarilmadi
+ErrorGlobalVariableUpdater1=Noto'g'ri JSON formati '%s'
+ErrorGlobalVariableUpdater2=Parametr yo'q '%s'
+ErrorGlobalVariableUpdater3=So'ralgan ma'lumotlar natijada topilmadi
+ErrorGlobalVariableUpdater4=SOAP mijozi "%s" xatosi bilan ishlamadi
+ErrorGlobalVariableUpdater5=Hech qanday global o'zgaruvchi tanlanmagan
+ErrorFieldMustBeANumeric=<b> %s </b> maydon raqamli qiymat bo'lishi kerak
+ErrorMandatoryParametersNotProvided=Majburiy parametr (lar) taqdim etilmagan
+ErrorOppStatusRequiredIfAmount=Siz ushbu tanlov uchun taxminiy miqdorni belgiladingiz. Shunday qilib, siz uning holatini ham kiritishingiz kerak.
 ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
-ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
-ErrorSavingChanges=An error has occurred when saving the changes
-ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
-ErrorFileMustHaveFormat=File must have format %s
+ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Modul tavsiflovchisidagi menyu qatorining noto'g'ri ta'rifi (fk_menu tugmasi uchun yomon qiymat)
+ErrorSavingChanges=O'zgarishlarni saqlashda xatolik yuz berdi
+ErrorWarehouseRequiredIntoShipmentLine=Yuk tashish uchun omborxonada talab qilinadi
+ErrorFileMustHaveFormat=Fayl %s formatiga ega bo'lishi kerak
 ErrorFilenameCantStartWithDot=Filename can't start with a '.'
-ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first.
-ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
-ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enough for product %s to add it into a new order.
-ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enough for product %s to add it into a new invoice.
-ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s to add it into a new shipment.
-ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
-ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
-ErrorModuleNotFound=File of module was not found.
-ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
+ErrorSupplierCountryIsNotDefined=Ushbu sotuvchi uchun mamlakat aniqlanmagan. Avval buni tuzating.
+ErrorsThirdpartyMerge=Ikki yozuv birlashtirilmadi. So'rov bekor qilindi.
+ErrorStockIsNotEnoughToAddProductOnOrder=%s mahsuloti uchun uni yangi tartibga qo'shish uchun stok etarli emas.
+ErrorStockIsNotEnoughToAddProductOnInvoice=%s mahsuloti uchun uni yangi hisob-fakturaga qo'shish uchun stok etarli emas.
+ErrorStockIsNotEnoughToAddProductOnShipment=%s mahsuloti uchun uni yangi jo'natishga qo'shish uchun zaxira etarli emas.
+ErrorStockIsNotEnoughToAddProductOnProposal=%s mahsuloti uchun uni yangi taklifga qo'shish uchun stok etarli emas.
+ErrorFailedToLoadLoginFileForMode="%s" rejimi uchun kirish tugmachasini olmadi.
+ErrorModuleNotFound=Modul fayli topilmadi.
+ErrorFieldAccountNotDefinedForBankLine=Buxgalteriya hisobi qiymati %s (%s) manba qatori uchun aniqlanmagan
 ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
 ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
-ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
-ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
-ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
-ErrorTaskAlreadyAssigned=Task already assigned to user
-ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
+ErrorBankStatementNameMustFollowRegex=Xato, bank ko'chirma nomi quyidagi sintaksis qoidasiga amal qilishi kerak %s
+ErrorPhpMailDelivery=Qabul qiluvchilarning juda ko'p sonini ishlatmasligingizni va elektron pochta manzilingiz Spamga o'xshamasligini tekshiring. To'liqroq ma'lumot olish uchun administratoringizdan xavfsizlik devori va server jurnallari fayllarini tekshirishni so'rang.
+ErrorUserNotAssignedToTask=Vaqtni sarflashni kiritish uchun foydalanuvchiga topshiriq berilishi kerak.
+ErrorTaskAlreadyAssigned=Vazifa allaqachon foydalanuvchiga berilgan
+ErrorModuleFileSeemsToHaveAWrongFormat=Modul to'plami noto'g'ri formatga o'xshaydi.
 ErrorModuleFileSeemsToHaveAWrongFormat2=At least one mandatory directory must exists into zip of module: <strong>%s</strong> or <strong>%s</strong>
-ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
+ErrorFilenameDosNotMatchDolibarrPackageRules=Modul paketining nomi (<strong> %s </strong>) kutilgan nom sintaksisiga mos kelmaydi: <strong> %s a0a65d071f6fcz
 ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
 ErrorNoWarehouseDefined=Error, no warehouses defined.
 ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
@@ -262,28 +263,29 @@ ErrorDateIsInFuture=Error, the date can't be in the future
 ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
 ErrorAPercentIsRequired=Error, please fill in the percentage correctly
 ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
+ErrorFailedToFindEmailTemplate=Failed to find template with code name %s
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
-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=Click here to setup mandatory parameters
+WarningPasswordSetWithNoAccount=Ushbu a'zo uchun parol o'rnatildi. Biroq, foydalanuvchi hisobi yaratilmagan. Shunday qilib, ushbu parol saqlanadi, ammo Dolibarr-ga kirish uchun foydalanib bo'lmaydi. U tashqi modul / interfeys tomonidan ishlatilishi mumkin, ammo agar siz a'zo uchun hech qanday login va parolni belgilashga hojat bo'lmasa, siz "har bir a'zo uchun kirishni boshqarish" parametrini a'zo modulidan o'chirib qo'yishingiz mumkin. Agar sizga loginni boshqarish kerak bo'lsa, lekin hech qanday parol kerak bo'lmasa, ushbu ogohlantirishni oldini olish uchun ushbu maydonni bo'sh qoldirishingiz mumkin. Izoh: Agar foydalanuvchi bilan bog'langan bo'lsa, elektron pochta orqali kirish sifatida ham foydalanish mumkin.
+WarningMandatorySetupNotComplete=Majburiy parametrlarni o'rnatish uchun shu erni bosing
 WarningEnableYourModulesApplications=Click here to enable your modules and applications
-WarningSafeModeOnCheckExecDir=Warning, PHP option <b>safe_mode</b> is on so command must be stored inside a directory declared by php parameter <b>safe_mode_exec_dir</b>.
-WarningBookmarkAlreadyExists=A bookmark with this title or this target (URL) already exists.
-WarningPassIsEmpty=Warning, database password is empty. This is a security hole. You should add a password to your database and change your conf.php file to reflect this.
-WarningConfFileMustBeReadOnly=Warning, your config file (<b>htdocs/conf/conf.php</b>) can be overwritten by the web server. This is a serious security hole. Modify permissions on file to be in read only mode for operating system user used by Web server. If you use Windows and FAT format for your disk, you must know that this file system does not allow to add permissions on file, so can't be completely safe.
-WarningsOnXLines=Warnings on <b>%s</b> source record(s)
-WarningNoDocumentModelActivated=No model, for document generation, has been activated. A model will be chosen by default until you check your module setup.
-WarningLockFileDoesNotExists=Warning, once setup is finished, you must disable the installation/migration tools by adding a file <b>install.lock</b> into directory <b>%s</b>. Omitting the creation of this file is a grave security risk.
-WarningUntilDirRemoved=All security warnings (visible by admin users only) will remain active as long as the vulnerability is present (or that constant MAIN_REMOVE_INSTALL_WARNING is added in Setup->Other Setup).
-WarningCloseAlways=Warning, closing is done even if amount differs between source and target elements. Enable this feature with caution.
-WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all pages showing the box.
-WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card).
-WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.
-WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
-WarningTooManyDataPleaseUseMoreFilters=Too many data (more than %s lines). Please use more filters or set the constant %s to a higher limit.
-WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while their hourly rate was not defined. A value of 0 %s per hour was used but this may result in wrong valuation of time spent.
-WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
+WarningSafeModeOnCheckExecDir=Ogohlantirish, PHP opsiyasi <b> </b> yoniq, shuning uchun buyruq php parametri <b> safe_mode_exec_dir </b> php parametri bilan e'lon qilingan katalog ichida saqlanishi kerak.
+WarningBookmarkAlreadyExists=Ushbu nom yoki ushbu maqsad (URL) bilan xatcho'p allaqachon mavjud.
+WarningPassIsEmpty=Ogohlantirish, ma'lumotlar bazasi paroli bo'sh. Bu xavfsizlik teshigi. Ma'lumotlar bazasiga parol qo'shishingiz va conf.php faylini o'zgartirishingiz kerak.
+WarningConfFileMustBeReadOnly=Ogohlantirish, sizning konfiguratsiya fayli (<b> htdocs / conf / conf.php </b>) veb-server tomonidan yozilishi mumkin. Bu jiddiy xavfsizlik teshigi. Veb-server tomonidan ishlatiladigan operatsion tizim foydalanuvchisi uchun faqat o'qish rejimida bo'lishi uchun faylga ruxsatlarni o'zgartiring. Agar siz diskingiz uchun Windows va FAT formatidan foydalansangiz, shuni bilishingiz kerakki, ushbu fayl tizimi faylga ruxsatlarni qo'shishga imkon bermaydi, shuning uchun to'liq xavfsiz bo'lishi mumkin emas.
+WarningsOnXLines=<b> %s </b> manba yozuvlari (lar) haqida ogohlantirishlar
+WarningNoDocumentModelActivated=Hujjatlarni yaratish uchun hech qanday model faollashtirilmagan. Modul sozlamalarini tekshirguningizcha sukut bo'yicha model tanlanadi.
+WarningLockFileDoesNotExists=Ogohlantirish, o'rnatish tugagandan so'ng, <b> faylini qo'shib o'rnatish / ko'chirish vositalarini o'chirib qo'yishingiz kerak </b> katalogiga <b> %s </b>. Ushbu faylni yaratishni tashlab qo'yish xavfsizlikka katta xavf tug'diradi.
+WarningUntilDirRemoved=Barcha xavfsizlik ogohlantirishlari (faqat administrator foydalanuvchilari tomonidan ko'rinadigan) zaiflik mavjud bo'lganda (yoki Setup-> Other Setup-ga doimiy MAIN_REMOVE_INSTALL_WARNING qo'shilsa) faol bo'lib qoladi.
+WarningCloseAlways=Ogohlantirish, yopish, agar manba va maqsad elementlari o'rtasida farq bo'lsa ham amalga oshiriladi. Ushbu xususiyatni ehtiyotkorlik bilan yoqing.
+WarningUsingThisBoxSlowDown=Ogohlantirish, ushbu katakchadan foydalanib, katakchani ko'rsatadigan barcha sahifalarni sekinlashtiring.
+WarningClickToDialUserSetupNotComplete=Foydalanuvchingiz uchun ClickToDial ma'lumotlarini sozlash tugallanmagan (ClickToDial yorlig'ini foydalanuvchi kartangizga qarang).
+WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Displeyni sozlash ko'zi ojizlar yoki matnli brauzerlar uchun optimallashtirilganda o'chirib qo'yilgan.
+WarningPaymentDateLowerThanInvoiceDate=To'lov sanasi (%s) %s hisob-fakturasi uchun hisob-kitob sanasidan (%s) oldinroq.
+WarningTooManyDataPleaseUseMoreFilters=Ma'lumot juda ko'p (%s qatorlaridan ko'p). Iltimos, ko'proq filtrlardan foydalaning yoki %s doimiyligini yuqori chegaraga o'rnating.
+WarningSomeLinesWithNullHourlyRate=Ba'zi foydalanuvchilar ba'zi soatlarda soatlik stavkasi aniqlanmagan holda qayd etishgan. Soatiga 0 %s qiymati ishlatilgan, ammo bu sarflangan vaqtni noto'g'ri baholashga olib kelishi mumkin.
+WarningYourLoginWasModifiedPleaseLogin=Kirishingiz o'zgartirildi. Xavfsizlik maqsadida keyingi harakatlar oldidan yangi tizimga kirishingiz kerak bo'ladi.
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the mass actions on lists
 WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
@@ -298,3 +300,4 @@ WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So y
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
+ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
diff --git a/htdocs/langs/uz_UZ/eventorganization.lang b/htdocs/langs/uz_UZ/eventorganization.lang
index 75b798fbc3a..335c257b224 100644
--- a/htdocs/langs/uz_UZ/eventorganization.lang
+++ b/htdocs/langs/uz_UZ/eventorganization.lang
@@ -1,4 +1,5 @@
 # Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+# Copyright (C) 2021		Dorian Vabre			<dorian.vabre@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
@@ -81,7 +82,10 @@ PriceOfBoothHelp=Subscription price to stand a booth
 EventOrganizationICSLink=Link ICS for events
 ConferenceOrBoothInformation=Conference Or Booth informations
 Attendees = Attendees
+DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
 #
 # Status
 #
@@ -94,8 +98,46 @@ EvntOrgCancelled = Cancelled
 #
 # Public page
 #
+SuggestForm = Suggestion page
+RegisterPage = Page for conferences or booth
+EvntOrgRegistrationHelpMessage = Here, you can vote for an event, or suggest a new conference or booth for the project
+EvntOrgRegistrationConfHelpMessage = Here, you can suggest a new conference for the project
+EvntOrgRegistrationBoothHelpMessage = Here, you can suggest a new booth for the project
+ListOfSuggestedConferences = List of suggested conferences
+ListOfSuggestedBooths = List of suggested booths
+SuggestConference = Suggest a new conference
+SuggestBooth = Suggest a booth
+ViewAndVote = View and vote for suggested events
 PublicAttendeeSubscriptionPage = Public link of registration to a conference
 MissingOrBadSecureKey = The security key is invalid or missing
-EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
-EvntOrgStartDuration = This conference starts on
-EvntOrgEndDuration =  and ends on
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference : '%s'
+EvntOrgDuration = This conference starts on %s and ends on %s.
+ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
+BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
+EventType = Event type
+
+#
+# Vote page
+#
+EvntOrgRegistrationWelcomeMessage = Welcome on the conference or booth suggestion page.
+EvntOrgRegistrationConfWelcomeMessage = Welcome on the conference suggestion page.
+EvntOrgRegistrationBoothWelcomeMessage = Welcome on the booth suggestion page.
+EvntOrgVoteHelpMessage = Here, you can view and vote for the suggested events for the project
+VoteOk = Your vote has been accepted.
+AlreadyVoted = You have already voted for this event.
+VoteError = An error has occurred during the vote, please try again.
+
+#
+# SubscriptionOk page
+#
+SubscriptionOk = Your subscription to this conference has been validated
+#
+# Subscription validation mail
+#
+ConfAttendeeSubscriptionConfirmation = Confirmation of your subscription to a conference
+#
+# Payment page
+#
+Attendee = Attendee
+PaymentConferenceAttendee = Conference attendee payment
+PaymentBoothLocation = Booth location payment
diff --git a/htdocs/langs/uz_UZ/exports.lang b/htdocs/langs/uz_UZ/exports.lang
index a0eb7161ef2..516ca7a2214 100644
--- a/htdocs/langs/uz_UZ/exports.lang
+++ b/htdocs/langs/uz_UZ/exports.lang
@@ -1,136 +1,136 @@
 # Dolibarr language file - Source file is en_US - exports
 ExportsArea=Exports
 ImportArea=Import
-NewExport=New Export
-NewImport=New Import
-ExportableDatas=Exportable dataset
-ImportableDatas=Importable dataset
-SelectExportDataSet=Choose dataset you want to export...
-SelectImportDataSet=Choose dataset you want to import...
-SelectExportFields=Choose the fields you want to export, or select a predefined export profile
-SelectImportFields=Choose the source file fields you want to import and their target field in database by moving them up and down with anchor %s, or select a predefined import profile:
-NotImportedFields=Fields of source file not imported
-SaveExportModel=Save your selections as an export profile/template (for reuse).
-SaveImportModel=Save this import profile (for reuse) ...
-ExportModelName=Export profile name
-ExportModelSaved=Export profile saved as <b>%s</b>.
-ExportableFields=Exportable fields
-ExportedFields=Exported fields
-ImportModelName=Import profile name
-ImportModelSaved=Import profile saved as <b>%s</b>.
-DatasetToExport=Dataset to export
-DatasetToImport=Import file into dataset
-ChooseFieldsOrdersAndTitle=Choose fields order...
-FieldsTitle=Fields title
-FieldTitle=Field title
-NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
-AvailableFormats=Available Formats
-LibraryShort=Library
+NewExport=Yangi eksport
+NewImport=Yangi import
+ExportableDatas=Eksport qilinadigan ma'lumotlar to'plami
+ImportableDatas=Muhim ma'lumotlar to'plami
+SelectExportDataSet=Eksport qilmoqchi bo'lgan ma'lumotlar to'plamini tanlang ...
+SelectImportDataSet=Import qilmoqchi bo'lgan ma'lumotlar to'plamini tanlang ...
+SelectExportFields=Eksport qilmoqchi bo'lgan maydonlarni tanlang yoki oldindan belgilangan eksport profilini tanlang
+SelectImportFields=Import qilmoqchi bo'lgan manba fayl maydonlarini va ularni %s langari yordamida yuqoriga va pastga siljitish orqali ma'lumotlar bazasidagi maqsad maydonini tanlang yoki oldindan belgilangan import profilini tanlang:
+NotImportedFields=Import qilinmagan manba fayl maydonlari
+SaveExportModel=Tanlovlaringizni eksport profil / shablon sifatida saqlang (qayta ishlatish uchun).
+SaveImportModel=Ushbu import profilini saqlang (qayta ishlatish uchun) ...
+ExportModelName=Profil nomini eksport qiling
+ExportModelSaved=Eksport profilini <b> %s </b> sifatida saqlangan.
+ExportableFields=Eksport qilinadigan maydonlar
+ExportedFields=Eksport qilingan maydonlar
+ImportModelName=Profil nomini import qilish
+ImportModelSaved=Import profil <b> %s </b> sifatida saqlandi.
+DatasetToExport=Eksport qilinadigan ma'lumotlar to'plami
+DatasetToImport=Ma'lumotlar to'plamiga faylni import qilish
+ChooseFieldsOrdersAndTitle=Maydonlar tartibini tanlang ...
+FieldsTitle=Maydonlarning sarlavhasi
+FieldTitle=Maydon nomi
+NowClickToGenerateToBuildExportFile=Endi, ochilgan maydonda fayl formatini tanlang va eksport faylini yaratish uchun "Yaratish" tugmasini bosing ...
+AvailableFormats=Mavjud formatlar
+LibraryShort=Kutubxona
 ExportCsvSeparator=Csv caracter separator
 ImportCsvSeparator=Csv caracter separator
-Step=Step
-FormatedImport=Import Assistant
-FormatedImportDesc1=This module allows you to update existing data or add new objects into the database from a file without technical knowledge, using an assistant.
-FormatedImportDesc2=First step is to choose the kind of data you want to import, then the format of the source file, then the fields you want to import.
-FormatedExport=Export Assistant
-FormatedExportDesc1=These tools allow the export of personalized data using an assistant, to help you in the process without requiring technical knowledge.
-FormatedExportDesc2=First step is to choose a predefined dataset, then which fields you want to export, and in which order.
-FormatedExportDesc3=When data to export are selected, you can choose the format of the output file.
-Sheet=Sheet
-NoImportableData=No importable data (no module with definitions to allow data imports)
-FileSuccessfullyBuilt=File generated
-SQLUsedForExport=SQL Request used to extract data
-LineId=Id of line
-LineLabel=Label of line
-LineDescription=Description of line
-LineUnitPrice=Unit price of line
-LineVATRate=VAT Rate of line
-LineQty=Quantity for line
-LineTotalHT=Amount excl. tax for line
-LineTotalTTC=Amount with tax for line
-LineTotalVAT=Amount of VAT for line
-TypeOfLineServiceOrProduct=Type of line (0=product, 1=service)
-FileWithDataToImport=File with data to import
-FileToImport=Source file to import
-FileMustHaveOneOfFollowingFormat=File to import must have one of following formats
-DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
-ChooseFormatOfFileToImport=Choose the file format to use as import file format by clicking on the %s icon to select it...
-ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
-SourceFileFormat=Source file format
-FieldsInSourceFile=Fields in source file
-FieldsInTargetDatabase=Target fields in Dolibarr database (bold=mandatory)
-Field=Field
-NoFields=No fields
-MoveField=Move field column number %s
-ExampleOfImportFile=Example_of_import_file
-SaveImportProfile=Save this import profile
-ErrorImportDuplicateProfil=Failed to save this import profile with this name. An existing profile already exists with this name.
-TablesTarget=Targeted tables
-FieldsTarget=Targeted fields
-FieldTarget=Targeted field
-FieldSource=Source field
-NbOfSourceLines=Number of lines in source file
-NowClickToTestTheImport=Check that the file format (field and string delimiters) of your file matches the options shown and that you have omitted the header line, or these will be flagged as errors in the following simulation.<br>Click on the "<b>%s</b>" button to run a check of the file structure/contents and simulate the import process.<br><b>No data will be changed in your database</b>.
-RunSimulateImportFile=Run Import Simulation
-FieldNeedSource=This field requires data from the source file
-SomeMandatoryFieldHaveNoSource=Some mandatory fields have no source from data file
-InformationOnSourceFile=Information on source file
-InformationOnTargetTables=Information on target fields
-SelectAtLeastOneField=Switch at least one source field in the column of fields to export
-SelectFormat=Choose this import file format
-RunImportFile=Import Data
-NowClickToRunTheImport=Check the results of the import simulation. Correct any errors and re-test.<br>When the simulation reports no errors you may proceed to import the data into the database.
-DataLoadedWithId=The imported data will have an additional field in each database table with this import id: <b>%s</b>, to allow it to be searchable in the case of investigating a problem related to this import.
-ErrorMissingMandatoryValue=Mandatory data is empty in the source file for field <b>%s</b>.
+Step=Qadam
+FormatedImport=Import yordamchisi
+FormatedImportDesc1=Ushbu modul yordamchi yordamida texnik ma'lumotlarga ega bo'lmagan fayldan mavjud ma'lumotlarni yangilash yoki ma'lumotlar bazasiga yangi moslamalarni qo'shish imkonini beradi.
+FormatedImportDesc2=Birinchi qadam - siz import qilmoqchi bo'lgan ma'lumotlar turini, so'ngra manba faylining formatini, so'ngra import qilmoqchi bo'lgan maydonlarni tanlashdir.
+FormatedExport=Eksport bo'yicha yordamchi
+FormatedExportDesc1=Ushbu vositalar yordamchi yordamida shaxsiy ma'lumotlarni eksport qilishga imkon beradi, bu sizga texnik bilimlarni talab qilmasdan yordam beradi.
+FormatedExportDesc2=Birinchi qadam - oldindan belgilangan ma'lumotlar to'plamini tanlash, so'ngra qaysi maydonlarni eksport qilishni va qaysi tartibda.
+FormatedExportDesc3=Eksport qilinadigan ma'lumotlar tanlanganida, siz chiqish faylining formatini tanlashingiz mumkin.
+Sheet=Varaq
+NoImportableData=Import qilinadigan ma'lumotlar yo'q (ma'lumotlarni import qilishga ruxsat beruvchi modul yo'q)
+FileSuccessfullyBuilt=Fayl yaratildi
+SQLUsedForExport=Ma'lumotlarni chiqarish uchun ishlatiladigan SQL so'rovi
+LineId=Chiziq identifikatori
+LineLabel=Chiziq yorlig'i
+LineDescription=Chiziq tavsifi
+LineUnitPrice=Chiziqning birlik narxi
+LineVATRate=QQS stavkasi stavkasi
+LineQty=Chiziq uchun miqdor
+LineTotalHT=Miqdorisiz chiziq uchun soliq
+LineTotalTTC=Chiziq uchun soliq miqdori
+LineTotalVAT=Qator uchun QQS miqdori
+TypeOfLineServiceOrProduct=Qator turi (0 = mahsulot, 1 = xizmat)
+FileWithDataToImport=Import qilish uchun ma'lumotlar bilan fayl
+FileToImport=Import qilish uchun manba fayl
+FileMustHaveOneOfFollowingFormat=Import qilish uchun fayl quyidagi formatlardan biriga ega bo'lishi kerak
+DownloadEmptyExample=Shablon faylini maydon tarkibidagi ma'lumotlar bilan yuklab oling (* majburiy maydonlar)
+ChooseFormatOfFileToImport=Faylni import qilish formati sifatida tanlang, uni tanlash uchun %s belgisini bosing ...
+ChooseFileToImport=Faylni yuklang, so'ngra faylni manba import fayli sifatida tanlash uchun %s belgisini bosing ...
+SourceFileFormat=Manba fayl formati
+FieldsInSourceFile=Manba faylidagi maydonlar
+FieldsInTargetDatabase=Dolibarr ma'lumotlar bazasidagi maqsad maydonlari (qalin = majburiy)
+Field=Maydon
+NoFields=Maydonlar yo‘q
+MoveField=%s maydon ustun satrini siljiting
+ExampleOfImportFile=Import_file-ning namunasi
+SaveImportProfile=Ushbu import profilini saqlang
+ErrorImportDuplicateProfil=Ushbu import profilini ushbu nom bilan saqlab bo'lmadi. Ushbu nom bilan allaqachon mavjud profil mavjud.
+TablesTarget=Maqsadli jadvallar
+FieldsTarget=Maqsadli maydonlar
+FieldTarget=Maqsadli maydon
+FieldSource=Manba maydoni
+NbOfSourceLines=Manba faylidagi qatorlar soni
+NowClickToTestTheImport=Faylingiz formati (maydon va satrlarni ajratuvchi) ko'rsatilgan parametrlarga mos kelishini va sarlavha satrini tashlab qo'yganingizni tekshiring, aks holda ular quyidagi simulyatsiyada xatolar sifatida belgilanadi. <br> "<b> %s </b>" tugmachasini bosib, fayl tuzilishini / tarkibini tekshiring va import jarayonini taqlid qiling. <br> <b> ma'lumotlar bazangizda ma'lumotlar o'zgartirilmaydi </b>.
+RunSimulateImportFile=Import simulyatsiyasini ishga tushiring
+FieldNeedSource=Ushbu maydon manba faylidan ma'lumotlarni talab qiladi
+SomeMandatoryFieldHaveNoSource=Ba'zi majburiy maydonlarda ma'lumotlar fayli manbasi yo'q
+InformationOnSourceFile=Dastlabki fayl haqida ma'lumot
+InformationOnTargetTables=Maqsadli maydonlar haqida ma'lumot
+SelectAtLeastOneField=Eksport qilish uchun maydonlar ustunidagi kamida bitta manba maydonini almashtiring
+SelectFormat=Ushbu import fayl formatini tanlang
+RunImportFile=Ma'lumotlarni import qilish
+NowClickToRunTheImport=Importni simulyatsiya qilish natijalarini tekshiring. Xatolarni tuzating va qayta sinovdan o'tkazing. <br> simulyatsiya xatolar haqida xabar bermasa, ma'lumotlar bazasiga ma'lumotlarni import qilishga o'tishingiz mumkin.
+DataLoadedWithId=Import qilingan ma'lumotlar har bir ma'lumotlar bazasi jadvalida ushbu import identifikatori bilan qo'shimcha maydonga ega bo'ladi: <b> %s </b>, bu import bilan bog'liq muammoni tekshirishda uni qidirib topishga imkon berish uchun.
+ErrorMissingMandatoryValue=Majburiy ma'lumotlar <b> %s </b> maydonining manba faylida bo'sh.
 TooMuchErrors=There are still <b>%s</b> other source lines with errors but output has been limited.
 TooMuchWarnings=There are still <b>%s</b> other source lines with warnings but output has been limited.
-EmptyLine=Empty line (will be discarded)
-CorrectErrorBeforeRunningImport=You <b>must</b> correct all errors <b>before</b> running the definitive import.
-FileWasImported=File was imported with number <b>%s</b>.
-YouCanUseImportIdToFindRecord=You can find all the imported records in your database by filtering on field <b>import_key='%s'</b>.
-NbOfLinesOK=Number of lines with no errors and no warnings: <b>%s</b>.
-NbOfLinesImported=Number of lines successfully imported: <b>%s</b>.
-DataComeFromNoWhere=Value to insert comes from nowhere in source file.
-DataComeFromFileFieldNb=Value to insert comes from field number <b>%s</b> in source file.
-DataComeFromIdFoundFromRef=Value that comes from field number <b>%s</b> of source file will be used to find the id of the parent object to use (so the object <b>%s</b> that has the ref. from source file must exist in the database).
+EmptyLine=Bo'sh satr (bekor qilinadi)
+CorrectErrorBeforeRunningImport=Siz <b> </b> aniq importni ishlatishdan oldin </b> barcha xatolarni <b> tuzatishingiz kerak.
+FileWasImported=Fayl <b> %s </b> raqami bilan import qilingan.
+YouCanUseImportIdToFindRecord=Ma'lumotlar bazangizdagi barcha import qilingan yozuvlarni <b> import_key = '%s' </b> maydonida filtrlash orqali topishingiz mumkin.
+NbOfLinesOK=Xato va ogohlantirishsiz qatorlar soni: <b> %s </b>.
+NbOfLinesImported=Muvaffaqiyatli import qilingan qatorlar soni: <b> %s </b>.
+DataComeFromNoWhere=Qo'shish uchun qiymat manba faylida yo'q.
+DataComeFromFileFieldNb=Qo'shish uchun qiymat manba faylidagi <b> %s </b> maydon raqamidan kelib chiqadi.
+DataComeFromIdFoundFromRef=Manba faylining <b> %s </b> maydon raqamidan kelib chiqadigan qiymat ota-ona ob'ektini identifikatorini topish uchun ishlatiladi (shuning uchun <b> %s a09
 DataComeFromIdFoundFromCodeId=Code that comes from field number <b>%s</b> of source file will be used to find the id of the parent object to use (so the code from source file must exist in the dictionary <b>%s</b>). Note that if you know the id, you can also use it in the source file instead of the code. Import should work in both cases.
-DataIsInsertedInto=Data coming from source file will be inserted into the following field:
-DataIDSourceIsInsertedInto=The id of parent object was found using the data in the source file, will be inserted into the following field:
-DataCodeIDSourceIsInsertedInto=The id of parent line found from code, will be inserted into following field:
-SourceRequired=Data value is mandatory
-SourceExample=Example of possible data value
-ExampleAnyRefFoundIntoElement=Any ref found for element <b>%s</b>
-ExampleAnyCodeOrIdFoundIntoDictionary=Any code (or id) found into dictionary <b>%s</b>
-CSVFormatDesc=<b>Comma Separated Value</b> file format (.csv).<br>This is a text file format where fields are separated by a separator [ %s ]. If separator is found inside a field content, field is rounded by round character [ %s ]. Escape character to escape round character is [ %s ].
-Excel95FormatDesc=<b>Excel</b> file format (.xls)<br>This is the native Excel 95 format (BIFF5).
-Excel2007FormatDesc=<b>Excel</b> file format (.xlsx)<br>This is the native Excel 2007 format (SpreadsheetML).
-TsvFormatDesc=<b>Tab Separated Value</b> file format (.tsv)<br>This is a text file format where fields are separated by a tabulator [tab].
-ExportFieldAutomaticallyAdded=Field <b>%s</b> was automatically added. It will avoid you to have similar lines to be treated as duplicate record (with this field added, all lines will own their own id and will differ).
-CsvOptions=CSV format options
-Separator=Field Separator
+DataIsInsertedInto=Dastlabki fayldan olingan ma'lumotlar quyidagi maydonga kiritiladi:
+DataIDSourceIsInsertedInto=Asosiy ob'ekt identifikatori manba faylidagi ma'lumotlar yordamida topildi, quyidagi maydonga kiritiladi:
+DataCodeIDSourceIsInsertedInto=Koddan topilgan ota-ona identifikatori quyidagi maydonga kiritiladi:
+SourceRequired=Ma'lumot qiymati majburiydir
+SourceExample=Mumkin bo'lgan ma'lumotlar qiymatining misoli
+ExampleAnyRefFoundIntoElement=<b> %s </b> elementi uchun har qanday ref topildi
+ExampleAnyCodeOrIdFoundIntoDictionary=Lug'atda topilgan har qanday kod (yoki id) <b> %s </b>
+CSVFormatDesc= <b> vergul bilan ajratilgan qiymat </b> fayl formati (.csv). <br> Bu matnli fayl formatidir, bu erda maydonlar ajratuvchi [%s] bilan ajratiladi. Agar maydon ajratuvchisi topilsa, maydon [%s] dumaloq belgi bo'yicha yaxlitlanadi. Dumaloq belgidan qochish uchun belgidan qochish [%s].
+Excel95FormatDesc= <b> Excel </b> fayl formati (.xls) <br> Bu mahalliy Excel 95 formati (BIFF5).
+Excel2007FormatDesc= <b> Excel </b> fayl formati (.xlsx) <br> Bu mahalliy Excel 2007 formatidir (SpreadsheetML).
+TsvFormatDesc= <b> tab ajratilgan qiymat </b> fayl formati (.tsv) <br> bu matnli fayl formatidir, bu erda maydonlar tabulyator [tab] bilan ajratilgan.
+ExportFieldAutomaticallyAdded=<b> %s </b> maydon avtomatik ravishda qo'shildi. Ikki nusxadagi yozuv sifatida qaraladigan o'xshash chiziqlardan qochishingiz mumkin (bu maydon qo'shilgan holda, barcha satrlar o'z identifikatoriga ega bo'ladi va farq qiladi).
+CsvOptions=CSV formati parametrlari
+Separator=Maydon ajratuvchi
 Enclosure=String Delimiter
-SpecialCode=Special code
-ExportStringFilter=%% allows replacing one or more characters in the text
-ExportDateFilter=YYYY, YYYYMM, YYYYMMDD: filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD: filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD: filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD: filters on all previous years/months/days
-ExportNumericFilter=NNNNN filters by one value<br>NNNNN+NNNNN filters over a range of values<br>< NNNNN filters by lower values<br>> NNNNN filters by higher values
-ImportFromLine=Import starting from line number
-EndAtLineNb=End at line number
+SpecialCode=Maxsus kod
+ExportStringFilter=%% matndagi bir yoki bir nechta belgini almashtirishga imkon beradi
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD: filtrlar bir yil / oy / kunga <br> YYYY + YYYY, YYYYMM + YYYYMM, YYYYMMDD + YYYYMMDD: Y3YYYMMDD: YYYYMMDD: YYYYYMMDD: Y0YFYYYYYYYMY, yy19y / kun keyingi yillar / oylar / kunlar <br> <YYYY, <YYYYMM, <YYYYMMDD: barcha o'tgan yillar / oylar / kunlar bo'yicha filtrlar
+ExportNumericFilter=NNNNN bitta qiymat bo'yicha filtrlaydi <br> NNNNN + NNNNN <br> <NNNNN pastki qiymatlari bo'yicha filtrlaydi <br>> NNNNN yuqori qiymatlarga ko'ra filtrlaydi
+ImportFromLine=Qator raqamidan boshlab import qilish
+EndAtLineNb=Satr raqamida tugatish
 ImportFromToLine=Limit range (From - To). Eg. to omit header line(s).
-SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines.<br>If the header lines are NOT omitted, this will result in multiple errors in the Import Simulation.
-KeepEmptyToGoToEndOfFile=Keep this field empty to process all lines to the end of the file.
+SetThisValueTo2ToExcludeFirstLine=Masalan, 2 ta birinchi qatorni chiqarib tashlash uchun ushbu qiymatni 3 ga o'rnating. <br> Agar sarlavha satrlari chiqarib tashlanmasa, bu Import Simulyatsiyasida bir nechta xatolarga olib keladi.
+KeepEmptyToGoToEndOfFile=Fayl oxirigacha barcha satrlarni qayta ishlash uchun ushbu maydonni bo'sh qoldiring.
 SelectPrimaryColumnsForUpdateAttempt=Select column(s) to use as primary key for an UPDATE import
 UpdateNotYetSupportedForThisImport=Update is not supported for this type of import (only insert)
 NoUpdateAttempt=No update attempt was performed, only insert
 ImportDataset_user_1=Users (employees or not) and properties
 ComputedField=Computed field
 ## filters
-SelectFilterFields=If you want to filter on some values, just input values here.
-FilteredFields=Filtered fields
-FilteredFieldsValues=Value for filter
-FormatControlRule=Format control rule
+SelectFilterFields=Agar siz ba'zi bir qiymatlar bo'yicha filtrlashni xohlasangiz, bu erda faqat qiymatlarni kiriting.
+FilteredFields=Filtrlangan maydonlar
+FilteredFieldsValues=Filtr uchun qiymat
+FormatControlRule=Formatni boshqarish qoidasi
 ## imports updates
-KeysToUseForUpdates=Key (column) to use for <b>updating</b> existing data
-NbInsert=Number of inserted lines: %s
-NbUpdate=Number of updated lines: %s
-MultipleRecordFoundWithTheseFilters=Multiple records have been found with these filters: %s
+KeysToUseForUpdates=Mavjud ma'lumotlarni </b> yangilash uchun <b> uchun ishlatiladigan kalit (ustun)
+NbInsert=Kiritilgan qatorlar soni: %s
+NbUpdate=Yangilangan qatorlar soni: %s
+MultipleRecordFoundWithTheseFilters=Ushbu filtrlar yordamida bir nechta yozuvlar topildi: %s
 StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
diff --git a/htdocs/langs/uz_UZ/externalsite.lang b/htdocs/langs/uz_UZ/externalsite.lang
index 452100c65b3..db049960d45 100644
--- a/htdocs/langs/uz_UZ/externalsite.lang
+++ b/htdocs/langs/uz_UZ/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
-ExternalSiteSetup=Setup link to external website
-ExternalSiteURL=External Site URL of HTML iframe content
-ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
-ExampleMyMenuEntry=My menu entry
+ExternalSiteSetup=Tashqi veb-saytga havolani o'rnatish
+ExternalSiteURL=HTML iframe tarkibidagi tashqi sayt URL manzili
+ExternalSiteModuleNotComplete=ExternalSite moduli to'g'ri sozlanmagan.
+ExampleMyMenuEntry=Mening yozuvim
diff --git a/htdocs/langs/uz_UZ/ftp.lang b/htdocs/langs/uz_UZ/ftp.lang
index 8ecb0c55cad..4c409340eca 100644
--- a/htdocs/langs/uz_UZ/ftp.lang
+++ b/htdocs/langs/uz_UZ/ftp.lang
@@ -1,14 +1,14 @@
 # Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=FTP Client module setup
-NewFTPClient=New FTP connection setup
-FTPArea=FTP Area
-FTPAreaDesc=This screen show you content of a FTP server view
-SetupOfFTPClientModuleNotComplete=Setup of FTP client module seems to be not complete
-FTPFeatureNotSupportedByYourPHP=Your PHP does not support FTP functions
-FailedToConnectToFTPServer=Failed to connect to FTP server (server %s, port %s)
-FailedToConnectToFTPServerWithCredentials=Failed to login to FTP server with defined login/password
-FTPFailedToRemoveFile=Failed to remove file <b>%s</b>.
-FTPFailedToRemoveDir=Failed to remove directory <b>%s</b> (Check permissions and that directory is empty).
-FTPPassiveMode=Passive mode
-ChooseAFTPEntryIntoMenu=Choose a FTP entry into menu...
-FailedToGetFile=Failed to get files %s
+FTPClientSetup=FTP yoki SFTP Client modulini sozlash
+NewFTPClient=FTP / FTPS ulanishini yangi sozlash
+FTPArea=FTP / FTPS maydoni
+FTPAreaDesc=Ushbu ekran FTP va SFTP serverining ko'rinishini ko'rsatadi.
+SetupOfFTPClientModuleNotComplete=FTP yoki SFTP mijoz modulini sozlash tugallanmaganga o'xshaydi
+FTPFeatureNotSupportedByYourPHP=Sizning PHP-da FTP yoki SFTP funktsiyalari qo'llab-quvvatlanmaydi
+FailedToConnectToFTPServer=Serverga ulanib bo'lmadi (server %s, port %s)
+FailedToConnectToFTPServerWithCredentials=Belgilangan login / parol bilan serverga kirishda xatolik yuz berdi
+FTPFailedToRemoveFile=<b> %s </b> faylini o'chirib bo'lmadi.
+FTPFailedToRemoveDir=<b> %s </b> katalogini o'chirib bo'lmadi: ruxsatlarni tekshiring va katalog bo'sh.
+FTPPassiveMode=Passiv rejim
+ChooseAFTPEntryIntoMenu=Menyudan FTP / SFTP saytini tanlang ...
+FailedToGetFile=%s fayllari olinmadi
diff --git a/htdocs/langs/uz_UZ/help.lang b/htdocs/langs/uz_UZ/help.lang
index da776683a6a..72cef81e44e 100644
--- a/htdocs/langs/uz_UZ/help.lang
+++ b/htdocs/langs/uz_UZ/help.lang
@@ -1,23 +1,23 @@
 # Dolibarr language file - Source file is en_US - help
-CommunitySupport=Forum/Wiki support
-EMailSupport=Emails support
-RemoteControlSupport=Online real time / remote support
-OtherSupport=Other support
-ToSeeListOfAvailableRessources=To contact/see available resources:
-HelpCenter=Help center
-DolibarrHelpCenter=Dolibarr Help and Support Center
-ToGoBackToDolibarr=Otherwise, <a href="%s">click here to continue to use Dolibarr</a>.
-TypeOfSupport=Type of support
-TypeSupportCommunauty=Community (free)
-TypeSupportCommercial=Commercial
-TypeOfHelp=Type
-NeedHelpCenter=Need help or support?
-Efficiency=Efficiency
-TypeHelpOnly=Help only
-TypeHelpDev=Help+Development
-TypeHelpDevForm=Help+Development+Training
-BackToHelpCenter=Otherwise, <a href="%s">go back to Help center home page</a>.
-LinkToGoldMember=You can call one of the trainers preselected by Dolibarr for your language (%s) by clicking their Widget (status and maximum price are automatically updated):
-PossibleLanguages=Supported languages
-SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
-SeeOfficalSupport=For official Dolibarr support in your language: <br><b><a href="%s" target="_blank">%s</a></b>
+CommunitySupport=Forum / Wiki-ni qo'llab-quvvatlash
+EMailSupport=Elektron pochta xabarlarini qo'llab-quvvatlash
+RemoteControlSupport=Onlayn real vaqtda / masofadan qo'llab-quvvatlash
+OtherSupport=Boshqa yordam
+ToSeeListOfAvailableRessources=Mavjud manbalarga murojaat qilish / ko'rish uchun:
+HelpCenter=Yordam markazi
+DolibarrHelpCenter=Dolibarr yordam va qo'llab-quvvatlash markazi
+ToGoBackToDolibarr=Aks holda, Dolibarr </a> dan foydalanishda davom etish uchun <a href="%s"> bu erni bosing.
+TypeOfSupport=Qo'llab-quvvatlash turi
+TypeSupportCommunauty=Hamjamiyat (bepul)
+TypeSupportCommercial=Tijorat
+TypeOfHelp=Turi
+NeedHelpCenter=Yordamga yoki yordamga muhtojmisiz?
+Efficiency=Samaradorlik
+TypeHelpOnly=Faqat yordam bering
+TypeHelpDev=Yordam + taraqqiyot
+TypeHelpDevForm=Yordam + taraqqiyot + trening
+BackToHelpCenter=Aks holda, <a href="%s"> yordam markazining asosiy sahifasi </a>-ga qaytadi.
+LinkToGoldMember=O'zingizning tilingiz uchun Dolibarr tomonidan tanlangan murabbiylardan biriga (%s) ularning vidjetini bosish orqali qo'ng'iroq qilishingiz mumkin (holat va maksimal narx avtomatik ravishda yangilanadi):
+PossibleLanguages=Qo'llab-quvvatlanadigan tillar
+SubscribeToFoundation=Dolibarr loyihasiga yordam bering, fondga obuna bo'ling
+SeeOfficalSupport=Sizning tilingizda rasmiy Dolibarr yordami uchun: <br> <b> <a href="%s" target="_blank"> %s </a> </b>
diff --git a/htdocs/langs/uz_UZ/holiday.lang b/htdocs/langs/uz_UZ/holiday.lang
index eb2cd89adf1..0abdc9dc374 100644
--- a/htdocs/langs/uz_UZ/holiday.lang
+++ b/htdocs/langs/uz_UZ/holiday.lang
@@ -1,100 +1,100 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Leave
-CPTitreMenu=Leave
-MenuReportMonth=Monthly statement
-MenuAddCP=New leave request
-NotActiveModCP=You must enable the module Leave to view this page.
-AddCP=Make a leave request
-DateDebCP=Start date
-DateFinCP=End date
-DraftCP=Draft
-ToReviewCP=Awaiting approval
-ApprovedCP=Approved
-CancelCP=Canceled
-RefuseCP=Refused
-ValidatorCP=Approbator
-ListeCP=List of leave
+Holidays=Keting
+CPTitreMenu=Keting
+MenuReportMonth=Oylik bayonot
+MenuAddCP=Yangi ta'til so'rovi
+NotActiveModCP=Ushbu sahifani ko'rish uchun "Ketish" modulini yoqishingiz kerak.
+AddCP=Dam olish to'g'risida so'rov yuboring
+DateDebCP=Boshlanish vaqti
+DateFinCP=Tugash sanasi
+DraftCP=Qoralama
+ToReviewCP=Tasdiqlash kutilmoqda
+ApprovedCP=Tasdiqlangan
+CancelCP=Bekor qilindi
+RefuseCP=Rad etildi
+ValidatorCP=Tasdiqlovchi
+ListeCP=Ta'til ro'yxati
 Leave=Leave request
 LeaveId=Leave ID
-ReviewedByCP=Will be approved by
+ReviewedByCP=Tomonidan tasdiqlanadi
 UserID=User ID
 UserForApprovalID=User for approval ID
 UserForApprovalFirstname=First name of approval user
 UserForApprovalLastname=Last name of approval user
 UserForApprovalLogin=Login of approval user
-DescCP=Description
-SendRequestCP=Create leave request
-DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Balance of leave
-SoldeCPUser=Leave balance is <b>%s</b> days.
-ErrorEndDateCP=You must select an end date greater than the start date.
-ErrorSQLCreateCP=An SQL error occurred during the creation:
-ErrorIDFicheCP=An error has occurred, the leave request does not exist.
-ReturnCP=Return to previous page
-ErrorUserViewCP=You are not authorized to read this leave request.
-InfosWorkflowCP=Information Workflow
-RequestByCP=Requested by
-TitreRequestCP=Leave request
+DescCP=Tavsif
+SendRequestCP=Dam olish uchun so'rov yarating
+DelayToRequestCP=Dam olish uchun so'rovlar kamida <b> %s kun (lar) dan oldin </b> amalga oshirilishi kerak.
+MenuConfCP=Ta'til qoldig'i
+SoldeCPUser=Dam olish qoldig'i <b> %s </b> kun.
+ErrorEndDateCP=Boshlanish sanasidan kattaroq tugash sanasini tanlashingiz kerak.
+ErrorSQLCreateCP=Yaratish paytida SQL xatosi paydo bo'ldi:
+ErrorIDFicheCP=Xatolik yuz berdi, ta'til so'rovi mavjud emas.
+ReturnCP=Oldingi sahifaga qaytish
+ErrorUserViewCP=Ushbu ta'tilga oid talabni o'qishga vakolatingiz yo'q.
+InfosWorkflowCP=Axborotning ishlash jarayoni
+RequestByCP=Tomonidan so'ralgan
+TitreRequestCP=So'rovni qoldiring
 TypeOfLeaveId=Type of leave ID
 TypeOfLeaveCode=Type of leave code
 TypeOfLeaveLabel=Type of leave label
-NbUseDaysCP=Number of days of vacation consumed
-NbUseDaysCPHelp=The calculation takes into account the non working days and the holidays defined in the dictionary.
-NbUseDaysCPShort=Days consumed
-NbUseDaysCPShortInMonth=Days consumed in month
-DayIsANonWorkingDay=%s is a non working day
+NbUseDaysCP=Ishlatilgan ta'til kunlari soni
+NbUseDaysCPHelp=The calculation takes into account the non-working days and the holidays defined in the dictionary.
+NbUseDaysCPShort=Days of leave
+NbUseDaysCPShortInMonth=Days of leave in month
+DayIsANonWorkingDay=%s is a non-working day
 DateStartInMonth=Start date in month
 DateEndInMonth=End date in month
-EditCP=Edit
-DeleteCP=Delete
-ActionRefuseCP=Refuse
-ActionCancelCP=Cancel
-StatutCP=Status
-TitleDeleteCP=Delete the leave request
-ConfirmDeleteCP=Confirm the deletion of this leave request?
-ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
-CantCreateCP=You don't have the right to make leave requests.
-InvalidValidatorCP=You must choose an approbator to your leave request.
-NoDateDebut=You must select a start date.
-NoDateFin=You must select an end date.
-ErrorDureeCP=Your leave request does not contain working day.
-TitleValidCP=Approve the leave request
-ConfirmValidCP=Are you sure you want to approve the leave request?
-DateValidCP=Date approved
-TitleToValidCP=Send leave request
-ConfirmToValidCP=Are you sure you want to send the leave request?
-TitleRefuseCP=Refuse the leave request
-ConfirmRefuseCP=Are you sure you want to refuse the leave request?
-NoMotifRefuseCP=You must choose a reason for refusing the request.
-TitleCancelCP=Cancel the leave request
-ConfirmCancelCP=Are you sure you want to cancel the leave request?
-DetailRefusCP=Reason for refusal
-DateRefusCP=Date of refusal
-DateCancelCP=Date of cancellation
-DefineEventUserCP=Assign an exceptional leave for a user
-addEventToUserCP=Assign leave
+EditCP=Tahrirlash
+DeleteCP=O'chirish
+ActionRefuseCP=Rad etish
+ActionCancelCP=Bekor qilish
+StatutCP=Holat
+TitleDeleteCP=Dam olish haqidagi so'rovni o'chirib tashlang
+ConfirmDeleteCP=Ushbu ta'til so'rovi o'chirilganligini tasdiqlaysizmi?
+ErrorCantDeleteCP=Xatolik, ushbu ta'tilni o'chirish huquqiga ega emassiz.
+CantCreateCP=Sizda ta'tilga chiqish to'g'risida so'rov yuborish huquqingiz yo'q.
+InvalidValidatorCP=Ta'tilga chiqish uchun tasdiqlovchini tanlashingiz kerak.
+NoDateDebut=Boshlanish sanasini tanlashingiz kerak.
+NoDateFin=Tugash sanasini tanlashingiz kerak.
+ErrorDureeCP=Sizning ta'til so'rovingiz ish kunini o'z ichiga olmaydi.
+TitleValidCP=Dam olish to'g'risidagi talabni ma'qullash
+ConfirmValidCP=Ta'tilga chiqish haqidagi so'rovni ma'qullamoqchimisiz?
+DateValidCP=Sana tasdiqlangan
+TitleToValidCP=Dam olish uchun so'rov yuboring
+ConfirmToValidCP=Haqiqatan ham ta'tilga chiqish so'rovini yubormoqchimisiz?
+TitleRefuseCP=Dam olish to'g'risidagi talabni rad eting
+ConfirmRefuseCP=Haqiqatan ham ta'tildan voz kechishni xohlaysizmi?
+NoMotifRefuseCP=So'rovni rad etish uchun sababni tanlashingiz kerak.
+TitleCancelCP=Dam olish to'g'risidagi talabni bekor qiling
+ConfirmCancelCP=Haqiqatan ham ta'tilni bekor qilishni xohlaysizmi?
+DetailRefusCP=Rad etish sababi
+DateRefusCP=Rad etish sanasi
+DateCancelCP=Bekor qilingan sana
+DefineEventUserCP=Foydalanuvchiga alohida ta'tilni tayinlang
+addEventToUserCP=Ta'tilni tayinlang
 NotTheAssignedApprover=You are not the assigned approver
-MotifCP=Reason
-UserCP=User
-ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
-AddEventToUserOkCP=The addition of the exceptional leave has been completed.
-MenuLogCP=View change logs
-LogCP=Log of updates of available vacation days
-ActionByCP=Performed by
-UserUpdateCP=For the user
-PrevSoldeCP=Previous Balance
-NewSoldeCP=New Balance
-alreadyCPexist=A leave request has already been done on this period.
-FirstDayOfHoliday=First day of vacation
-LastDayOfHoliday=Last day of vacation
-BoxTitleLastLeaveRequests=Latest %s modified leave requests
-HolidaysMonthlyUpdate=Monthly update
-ManualUpdate=Manual update
-HolidaysCancelation=Leave request cancelation
-EmployeeLastname=Employee last name
-EmployeeFirstname=Employee first name
-TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
+MotifCP=Sabab
+UserCP=Foydalanuvchi
+ErrorAddEventToUserCP=Istisno ta'tilini qo'shishda xatolik yuz berdi.
+AddEventToUserOkCP=Istisno ta'tiliga qo'shilish tugallandi.
+MenuLogCP=O'zgarish jurnallarini ko'rish
+LogCP="Ta'til balansi" ga kiritilgan barcha yangilanishlar jurnali
+ActionByCP=Tomonidan yangilangan
+UserUpdateCP=Uchun yangilangan
+PrevSoldeCP=Oldingi qoldiq
+NewSoldeCP=Yangi balans
+alreadyCPexist=Ushbu davrda ta'til so'ralgan.
+FirstDayOfHoliday=Ta'tilga chiqish kunining boshlanishi
+LastDayOfHoliday=Ta'tilni talab qilish kuni tugaydi
+BoxTitleLastLeaveRequests=Oxirgi %s o'zgartirilgan ta'til so'rovlari
+HolidaysMonthlyUpdate=Oylik yangilanish
+ManualUpdate=Qo'lda yangilash
+HolidaysCancelation=So'rovni bekor qilishni qoldiring
+EmployeeLastname=Xodimning familiyasi
+EmployeeFirstname=Xodimning ismi
+TypeWasDisabledOrRemoved=Dam olish turi (id %s) o'chirilgan yoki olib tashlangan
 LastHolidays=Latest %s leave requests
 AllHolidays=All leave requests
 HalfDay=Half day
@@ -104,29 +104,29 @@ LEAVE_SICK=Sick leave
 LEAVE_OTHER=Other leave
 LEAVE_PAID_FR=Paid vacation
 ## Configuration du Module ##
-LastUpdateCP=Latest automatic update of leave allocation
-MonthOfLastMonthlyUpdate=Month of latest automatic update of leave allocation
-UpdateConfCPOK=Updated successfully.
-Module27130Name= Management of leave requests
-Module27130Desc= Management of leave requests
-ErrorMailNotSend=An error occurred while sending email:
-NoticePeriod=Notice period
+LastUpdateCP=Ta'tilni ajratishni oxirgi avtomatik yangilash
+MonthOfLastMonthlyUpdate=Ta'tilni oxirgi avtomatik yangilash oyi
+UpdateConfCPOK=Muvaffaqiyatli yangilandi.
+Module27130Name= Ta'tilga oid so'rovlarni boshqarish
+Module27130Desc= Ta'tilga oid so'rovlarni boshqarish
+ErrorMailNotSend=Elektron pochta xabarini yuborishda xatolik yuz berdi:
+NoticePeriod=Bildirishnoma muddati
 #Messages
-HolidaysToValidate=Validate leave requests
-HolidaysToValidateBody=Below is a leave request to validate
-HolidaysToValidateDelay=This leave request will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
-HolidaysValidated=Validated leave requests
-HolidaysValidatedBody=Your leave request for %s to %s has been validated.
-HolidaysRefused=Request denied
-HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason:
-HolidaysCanceled=Canceled leaved request
-HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
-FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
-NoLeaveWithCounterDefined=There is no leave types defined that need to be followed by a counter
-GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
-HolidaySetup=Setup of module Holiday
-HolidaysNumberingModules=Leave requests numbering models
+HolidaysToValidate=Ta'tilga oid so'rovlarni tasdiqlash
+HolidaysToValidateBody=Quyida tasdiqlash uchun ta'til so'rovi keltirilgan
+HolidaysToValidateDelay=Ushbu ta'til so'rovi %s kundan kam vaqt ichida amalga oshiriladi.
+HolidaysToValidateAlertSolde=Ushbu ta'tilni talab qilgan foydalanuvchi uchun etarli kunlar yo'q.
+HolidaysValidated=Tasdiqlangan ta'tilga oid so'rovlar
+HolidaysValidatedBody=%s dan %s ga bo'lgan ta'til so'rovingiz tasdiqlandi.
+HolidaysRefused=So'rov rad etildi
+HolidaysRefusedBody=%s dan %s uchun ta'til so'rovingiz quyidagi sabablarga ko'ra rad etildi:
+HolidaysCanceled=So'ralgan so'rov bekor qilindi
+HolidaysCanceledBody=%s dan %s uchun ta'til so'rovingiz bekor qilindi.
+FollowedByACounter=1: ushbu ta'tilni hisoblagich bilan kuzatib borish kerak. Hisoblagich qo'lda yoki avtomatik ravishda oshiriladi va ta'til so'rovi tasdiqlanganda hisoblagich kamayadi. <br> 0: Hisoblagich kuzatilmaydi.
+NoLeaveWithCounterDefined=Hisoblagich bilan ta'qib qilinishi kerak bo'lgan ta'til turlari mavjud emas
+GoIntoDictionaryHolidayTypes=<strong> ga kiring Bosh sahifa - O'rnatish - Lug'atlar - Har xil turdagi barglarni sozlash uchun ta'til turi </strong>.
+HolidaySetup=Setup of module Leave
+HolidaysNumberingModules=Numbering models for leave requests
 TemplatePDFHolidays=Template for leave requests PDF
 FreeLegalTextOnHolidays=Free text on PDF
 WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
diff --git a/htdocs/langs/uz_UZ/hrm.lang b/htdocs/langs/uz_UZ/hrm.lang
index 3b8f137e103..f836bf9d263 100644
--- a/htdocs/langs/uz_UZ/hrm.lang
+++ b/htdocs/langs/uz_UZ/hrm.lang
@@ -1,19 +1,19 @@
 # Dolibarr language file - en_US - hrm
 # Admin
-HRM_EMAIL_EXTERNAL_SERVICE=Email to prevent HRM external service
-Establishments=Establishments
-Establishment=Establishment
-NewEstablishment=New establishment
-DeleteEstablishment=Delete establishment
-ConfirmDeleteEstablishment=Are you sure you wish to delete this establishment?
-OpenEtablishment=Open establishment
-CloseEtablishment=Close establishment
+HRM_EMAIL_EXTERNAL_SERVICE=HRM tashqi xizmatining oldini olish uchun elektron pochta
+Establishments=Korxonalar
+Establishment=Tashkilot
+NewEstablishment=Yangi muassasa
+DeleteEstablishment=Korxonani o'chirish
+ConfirmDeleteEstablishment=Ushbu muassasa o'chirilishini xohlaysizmi?
+OpenEtablishment=Ochiq muassasa
+CloseEtablishment=Yaqin muassasasi
 # Dictionary
-DictionaryPublicHolidays=HRM - Public holidays
-DictionaryDepartment=HRM - Department list
-DictionaryFunction=HRM - Job positions
+DictionaryPublicHolidays=Leave - Public holidays
+DictionaryDepartment=HRM - bo'limlar ro'yxati
+DictionaryFunction=HRM - ish joylari
 # Module
-Employees=Employees
-Employee=Employee
-NewEmployee=New employee
+Employees=Xodimlar
+Employee=Xodim
+NewEmployee=Yangi ishchi
 ListOfEmployees=List of employees
diff --git a/htdocs/langs/uz_UZ/install.lang b/htdocs/langs/uz_UZ/install.lang
index 63947dad154..4c78e696d98 100644
--- a/htdocs/langs/uz_UZ/install.lang
+++ b/htdocs/langs/uz_UZ/install.lang
@@ -1,214 +1,214 @@
 # Dolibarr language file - Source file is en_US - install
-InstallEasy=Just follow the instructions step by step.
-MiscellaneousChecks=Prerequisites check
-ConfFileExists=Configuration file <b>%s</b> exists.
-ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created!
-ConfFileCouldBeCreated=Configuration file <b>%s</b> could be created.
-ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
-ConfFileIsWritable=Configuration file <b>%s</b> is writable.
+InstallEasy=Faqat ko'rsatmalarga bosqichma-bosqich amal qiling.
+MiscellaneousChecks=Old shartlar tekshiriladi
+ConfFileExists=<b> %s </b> konfiguratsiya fayli mavjud.
+ConfFileDoesNotExistsAndCouldNotBeCreated=<b> %s </b> konfiguratsiya fayli mavjud emas va yaratib bo'lmadi!
+ConfFileCouldBeCreated=<b> %s </b> konfiguratsiya fayli yaratilishi mumkin.
+ConfFileIsNotWritable=<b> %s </b> konfiguratsiya fayli yozib bo'lmaydi. Ruxsatlarni tekshiring. Birinchi o'rnatish uchun veb-serveringiz ushbu faylga konfiguratsiya jarayonida yozish imkoniyatiga ega bo'lishi kerak ("chmod 666", masalan OS kabi Unix-da).
+ConfFileIsWritable=<b> %s </b> konfiguratsiya fayli yozilishi mumkin.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
-ConfFileReload=Reloading parameters from configuration file.
-PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
-PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
-PHPSupportSessions=This PHP supports sessions.
+ConfFileReload=Parametrlarni konfiguratsiya faylidan qayta yuklash.
+PHPSupportPOSTGETOk=Ushbu PHP POST va GET o'zgaruvchilarini qo'llab-quvvatlaydi.
+PHPSupportPOSTGETKo=PHP sozlamangiz POST va / yoki GET o'zgaruvchilarini qo'llab-quvvatlamasligi mumkin. Php.ini da <b> variables_order </b> parametrini tekshiring.
+PHPSupportSessions=Ushbu PHP sessiyalarni qo'llab-quvvatlaydi.
 PHPSupport=This PHP supports %s functions.
-PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
-PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
-Recheck=Click here for a more detailed test
-ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to allow Dolibarr to work. Check your PHP setup and permissions of the sessions directory.
-ErrorPHPDoesNotSupportGD=Your PHP installation does not support GD graphical functions. No graphs will be available.
-ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
+PHPMemoryOK=Sizning PHP maksimal sessiya xotirangiz <b> %s </b> ga o'rnatildi. Bu etarli bo'lishi kerak.
+PHPMemoryTooLow=PHP max sessiya xotirasi <b> %s </b> baytga o'rnatilgan. Bu juda past. <b> php.ini </b> ni o'zgartiring <b> memory_limit </b> parametrini kamida <b> %s
+Recheck=Batafsil sinov uchun bu erni bosing
+ErrorPHPDoesNotSupportSessions=PHP o'rnatishingiz seanslarni qo'llab-quvvatlamaydi. Ushbu xususiyat Dolibarr ishlashiga ruxsat berish uchun talab qilinadi. PHP-ni sozlashni va sessiyalar katalogining ruxsatlarini tekshiring.
+ErrorPHPDoesNotSupportGD=PHP o'rnatishingiz GD grafik funktsiyalarini qo'llab-quvvatlamaydi. Hech qanday grafik mavjud bo'lmaydi.
+ErrorPHPDoesNotSupportCurl=PHP o'rnatishingiz Curl-ni qo'llab-quvvatlamaydi.
 ErrorPHPDoesNotSupportCalendar=Your PHP installation does not support php calendar extensions.
-ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
+ErrorPHPDoesNotSupportUTF8=PHP o'rnatishingiz UTF8 funktsiyalarini qo'llab-quvvatlamaydi. Dolibarr to'g'ri ishlay olmaydi. Dolibarr dasturini o'rnatishdan oldin buni hal qiling.
 ErrorPHPDoesNotSupportIntl=Your PHP installation does not support Intl functions.
 ErrorPHPDoesNotSupportxDebug=Your PHP installation does not support extend debug functions.
 ErrorPHPDoesNotSupport=Your PHP installation does not support %s functions.
-ErrorDirDoesNotExists=Directory %s does not exist.
-ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
-ErrorWrongValueForParameter=You may have typed a wrong value for parameter '%s'.
-ErrorFailedToCreateDatabase=Failed to create database '%s'.
-ErrorFailedToConnectToDatabase=Failed to connect to database '%s'.
-ErrorDatabaseVersionTooLow=Database version (%s) too old. Version %s or higher is required.
-ErrorPHPVersionTooLow=PHP version too old. Version %s is required.
-ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
-ErrorDatabaseAlreadyExists=Database '%s' already exists.
-IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
-IfDatabaseExistsGoBackAndCheckCreate=If database already exists, go back and uncheck "Create database" option.
-WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
-PHPVersion=PHP Version
-License=Using license
-ConfigurationFile=Configuration file
-WebPagesDirectory=Directory where web pages are stored
-DocumentsDirectory=Directory to store uploaded and generated documents
+ErrorDirDoesNotExists=%s katalogi mavjud emas.
+ErrorGoBackAndCorrectParameters=Orqaga qayting va parametrlarni tekshiring / to'g'rilang.
+ErrorWrongValueForParameter=Siz '%s' parametri uchun noto'g'ri qiymat yozgan bo'lishingiz mumkin.
+ErrorFailedToCreateDatabase='%s' ma'lumotlar bazasini yaratib bo'lmadi.
+ErrorFailedToConnectToDatabase='%s' ma'lumotlar bazasiga ulanib bo'lmadi.
+ErrorDatabaseVersionTooLow=Ma'lumotlar bazasi versiyasi (%s) juda eski. %s yoki undan yuqori versiyasi talab qilinadi.
+ErrorPHPVersionTooLow=PHP versiyasi juda eski. %s versiyasi talab qilinadi.
+ErrorConnectedButDatabaseNotFound=Serverga ulanish muvaffaqiyatli bo'ldi, ammo '%s' ma'lumotlar bazasi topilmadi.
+ErrorDatabaseAlreadyExists='%s' ma'lumotlar bazasi allaqachon mavjud.
+IfDatabaseNotExistsGoBackAndUncheckCreate=Agar ma'lumotlar bazasi mavjud bo'lmasa, orqaga qayting va "Ma'lumotlar bazasini yaratish" bandini tekshiring.
+IfDatabaseExistsGoBackAndCheckCreate=Agar ma'lumotlar bazasi allaqachon mavjud bo'lsa, orqaga qayting va "Ma'lumotlar bazasini yaratish" parametrini olib tashlang.
+WarningBrowserTooOld=Brauzer versiyasi juda eski. Brauzeringizni Firefox, Chrome yoki Opera-ning so'nggi versiyasiga yangilash tavsiya etiladi.
+PHPVersion=PHP versiyasi
+License=Litsenziyadan foydalanish
+ConfigurationFile=Konfiguratsiya fayli
+WebPagesDirectory=Veb-sahifalar saqlanadigan katalog
+DocumentsDirectory=Yuklangan va yaratilgan hujjatlarni saqlash uchun katalog
 URLRoot=URL Root
-ForceHttps=Force secure connections (https)
-CheckToForceHttps=Check this option to force secure connections (https).<br>This requires that the web server is configured with an SSL certificate.
-DolibarrDatabase=Dolibarr Database
-DatabaseType=Database type
-DriverType=Driver type
+ForceHttps=Ishonchli ulanishlarni majburlash (https)
+CheckToForceHttps=Xavfsiz ulanishlarni majburlash uchun ushbu parametrni tekshiring (https). <br> Buning uchun veb-server SSL sertifikati bilan sozlangan bo'lishi kerak.
+DolibarrDatabase=Dolibarr ma'lumotlar bazasi
+DatabaseType=Ma'lumotlar bazasi turi
+DriverType=Haydovchi turi
 Server=Server
-ServerAddressDescription=Name or ip address for the database server. Usually 'localhost' when the database server is hosted on the same server as the web server.
-ServerPortDescription=Database server port. Keep empty if unknown.
-DatabaseServer=Database server
-DatabaseName=Database name
-DatabasePrefix=Database table prefix
+ServerAddressDescription=Ma'lumotlar bazasi serverining nomi yoki ip manzili. Odatda 'localhost' ma'lumotlar bazasi serveri veb-server bilan bir xil serverda joylashganda.
+ServerPortDescription=Ma'lumotlar bazasi server porti. Agar noma'lum bo'lsa, bo'sh qoldiring.
+DatabaseServer=Ma'lumotlar bazasi serveri
+DatabaseName=Ma'lumotlar bazasi nomi
+DatabasePrefix=Ma'lumotlar bazasi jadvali prefiksi
 DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
-AdminLogin=User account for the Dolibarr database owner.
-PasswordAgain=Retype password confirmation
-AdminPassword=Password for Dolibarr database owner.
-CreateDatabase=Create database
-CreateUser=Create user account or grant user account permission on the Dolibarr database
-DatabaseSuperUserAccess=Database server - Superuser access
-CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.<br>In this case, you must also fill in the user name and password for the superuser account at the bottom of this page.
-CheckToCreateUser=Check the box if:<br>the database user account does not yet exist and so must be created, or<br>if the user account exists but the database does not exist and permissions must be granted.<br>In this case, you must enter the user account and password and <b>also</b> the superuser account name and password at the bottom of this page. If this box is unchecked, database owner and password must already exist.
-DatabaseRootLoginDescription=Superuser account name (to create new databases or new users), mandatory if the database or its owner does not already exist.
-KeepEmptyIfNoPassword=Leave empty if superuser has no password (NOT recommended)
-SaveConfigurationFile=Saving parameters to
-ServerConnection=Server connection
-DatabaseCreation=Database creation
-CreateDatabaseObjects=Database objects creation
-ReferenceDataLoading=Reference data loading
-TablesAndPrimaryKeysCreation=Tables and Primary keys creation
-CreateTableAndPrimaryKey=Create table %s
-CreateOtherKeysForTable=Create foreign keys and indexes for table %s
-OtherKeysCreation=Foreign keys and indexes creation
-FunctionsCreation=Functions creation
-AdminAccountCreation=Administrator login creation
-PleaseTypePassword=Please type a password, empty passwords are not allowed!
-PleaseTypeALogin=Please type a login!
-PasswordsMismatch=Passwords differs, please try again!
-SetupEnd=End of setup
-SystemIsInstalled=This installation is complete.
-SystemIsUpgraded=Dolibarr has been upgraded successfully.
-YouNeedToPersonalizeSetup=You need to configure Dolibarr to suit your needs (appearance, features, ...). To do this, please follow the link below:
-AdminLoginCreatedSuccessfuly=Dolibarr administrator login '<b>%s</b>' created successfully.
-GoToDolibarr=Go to Dolibarr
-GoToSetupArea=Go to Dolibarr (setup area)
-MigrationNotFinished=The database version is not completely up to date: run the upgrade process again.
-GoToUpgradePage=Go to upgrade page again
-WithNoSlashAtTheEnd=Without the slash "/" at the end
-DirectoryRecommendation=<span class="warning">IMPORTANT</span>: You must use a directory that is outside of the web pages (so do not use a subdirectory of previous parameter).
-LoginAlreadyExists=Already exists
-DolibarrAdminLogin=Dolibarr admin login
-AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
-FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
-WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, you should add a file called <b>install.lock</b> into the Dolibarr document directory in order to prevent the accidental/malicious use of the install tools again.
-FunctionNotAvailableInThisPHP=Not available in this PHP
-ChoosedMigrateScript=Choose migration script
-DataMigration=Database migration (data)
-DatabaseMigration=Database migration (structure + some data)
-ProcessMigrateScript=Script processing
-ChooseYourSetupMode=Choose your setup mode and click "Start"...
-FreshInstall=Fresh install
-FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode.
-Upgrade=Upgrade
-UpgradeDesc=Use this mode if you have replaced old Dolibarr files with files from a newer version. This will upgrade your database and data.
-Start=Start
-InstallNotAllowed=Setup not allowed by <b>conf.php</b> permissions
-YouMustCreateWithPermission=You must create file %s and set write permissions on it for the web server during install process.
-CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload the page.
-AlreadyDone=Already migrated
-DatabaseVersion=Database version
-ServerVersion=Database server version
-YouMustCreateItAndAllowServerToWrite=You must create this directory and allow for the web server to write into it.
-DBSortingCollation=Character sorting order
+AdminLogin=Dolibarr ma'lumotlar bazasi egasi uchun foydalanuvchi qayd yozuvi.
+PasswordAgain=Parolni tasdiqlashni qayta kiriting
+AdminPassword=Dolibarr ma'lumotlar bazasi egasi uchun parol.
+CreateDatabase=Ma'lumotlar bazasini yaratish
+CreateUser=Dolibarr ma'lumotlar bazasida foydalanuvchi hisobini yarating yoki foydalanuvchi hisobiga ruxsat bering
+DatabaseSuperUserAccess=Ma'lumotlar bazasi serveri - Superuser-ga kirish
+CheckToCreateDatabase=Ma'lumotlar bazasi hali mavjud bo'lmasa va yaratilishi kerak bo'lsa, katakchani belgilang. <br> Bunday holda siz ushbu sahifaning pastki qismida superuser hisob qaydnomasi uchun foydalanuvchi nomi va parolini to'ldirishingiz kerak.
+CheckToCreateUser=Agar quyidagilarni belgilang: <br> ma'lumotlar bazasi foydalanuvchi hisobi hali mavjud emas va shuning uchun uni yaratish kerak, yoki foydalanuvchi qayd yozuvi mavjud bo'lsa, lekin ma'lumotlar bazasi mavjud bo'lmasa va ruxsat berilishi kerak bo'lsa, <br>. <br>, bu holda siz foydalanuvchi qayd yozuvini va parolini kiritishingiz kerak va <b> shuningdek </b> superuser qayd yozuvining nomi va parolini ushbu sahifaning pastki qismiga kiriting. Agar ushbu maydon belgilanmagan bo'lsa, ma'lumotlar bazasi egasi va parol allaqachon mavjud bo'lishi kerak.
+DatabaseRootLoginDescription=Superuser hisobining nomi (yangi ma'lumotlar bazalarini yoki yangi foydalanuvchilarni yaratish uchun), agar ma'lumotlar bazasi yoki uning egasi allaqachon mavjud bo'lmasa majburiydir.
+KeepEmptyIfNoPassword=Agar superuserda parol bo'lmasa, bo'sh qoldiring (tavsiya etilmaydi)
+SaveConfigurationFile=Parametrlarni saqlash
+ServerConnection=Server ulanishi
+DatabaseCreation=Ma'lumotlar bazasini yaratish
+CreateDatabaseObjects=Ma'lumotlar bazasi ob'ektlarini yaratish
+ReferenceDataLoading=Ma'lumotlarni yuklash
+TablesAndPrimaryKeysCreation=Jadvallar va birlamchi kalitlarni yaratish
+CreateTableAndPrimaryKey=%s jadvalini yarating
+CreateOtherKeysForTable=%s jadvali uchun chet el kalitlari va indekslarini yarating
+OtherKeysCreation=Chet el kalitlari va indekslarini yaratish
+FunctionsCreation=Funktsiyalarni yaratish
+AdminAccountCreation=Administratorning login yaratish
+PleaseTypePassword=Iltimos, parolni kiriting, bo'sh parollarga ruxsat berilmaydi!
+PleaseTypeALogin=Kirish yozing!
+PasswordsMismatch=Parollar boshqacha, iltimos, qayta urinib ko'ring!
+SetupEnd=O'rnatish tugadi
+SystemIsInstalled=Ushbu o'rnatish tugallandi.
+SystemIsUpgraded=Dolibarr muvaffaqiyatli yangilandi.
+YouNeedToPersonalizeSetup=Dolibarr-ni o'zingizning ehtiyojlaringizga mos ravishda sozlashingiz kerak (tashqi ko'rinishi, xususiyatlari, ...). Buning uchun quyidagi havolaga o'ting:
+AdminLoginCreatedSuccessfuly=Dolibarr administratori login '<b> %s </b>' muvaffaqiyatli yaratildi.
+GoToDolibarr=Dolibarr-ga o'ting
+GoToSetupArea=Dolibarr-ga o'ting (sozlash maydoni)
+MigrationNotFinished=Ma'lumotlar bazasi versiyasi to'liq yangilanmagan: yangilash jarayonini qayta bajaring.
+GoToUpgradePage=Sahifani yana yangilashga o'ting
+WithNoSlashAtTheEnd=Oxirida "/" chiziqsiz
+DirectoryRecommendation= <span class="warning"> MUHIM </span>: Siz veb-sahifalardan tashqarida bo'lgan katalogdan foydalanishingiz kerak (shuning uchun avvalgi parametrning pastki katalogidan foydalanmang).
+LoginAlreadyExists=Allaqachon mavjud
+DolibarrAdminLogin=Dolibarr administratori bilan kirish
+AdminLoginAlreadyExists=Dolibarr administrator hisobi '<b> %s </b>' allaqachon mavjud. Agar boshqasini yaratmoqchi bo'lsangiz, orqaga qayting.
+FailedToCreateAdminLogin=Dolibarr administratori hisobini yaratib bo'lmadi.
+WarningRemoveInstallDir=Diqqat, xavfsizlik sababli, o'rnatish yoki yangilash tugallangandan so'ng, o'rnatish vositalarining tasodifiy / zararli ishlatilishining oldini olish uchun Dolibarr hujjatlar katalogiga <b> install.lock </b> deb nomlangan faylni qo'shishingiz kerak.
+FunctionNotAvailableInThisPHP=Ushbu PHP-da mavjud emas
+ChoosedMigrateScript=Ko'chirish skriptini tanlang
+DataMigration=Ma'lumotlar bazasining ko'chishi (ma'lumotlar)
+DatabaseMigration=Ma'lumotlar bazasining ko'chishi (tuzilish + ba'zi ma'lumotlar)
+ProcessMigrateScript=Skriptni qayta ishlash
+ChooseYourSetupMode=O'rnatish rejimini tanlang va "Ishga tushirish" tugmasini bosing ...
+FreshInstall=Yangi o'rnatish
+FreshInstallDesc=Agar bu sizning birinchi o'rnatishingiz bo'lsa, ushbu rejimdan foydalaning. Aks holda, ushbu rejim to'liq bo'lmagan oldingi o'rnatishni tuzatishi mumkin. Agar siz o'z versiyangizni yangilamoqchi bo'lsangiz, "Yangilash" rejimini tanlang.
+Upgrade=Yangilash
+UpgradeDesc=Agar eski Dolibarr fayllarini yangi versiyadagi fayllarga almashtirgan bo'lsangiz, ushbu rejimdan foydalaning. Bu sizning ma'lumotlar bazangizni va ma'lumotlaringizni yangilaydi.
+Start=Boshlang
+InstallNotAllowed=<b> conf.php </b> ruxsatlari bilan o'rnatishga ruxsat berilmaydi
+YouMustCreateWithPermission=O'rnatish jarayonida siz %s faylini yaratishingiz va unga veb-server uchun yozish huquqlarini o'rnatishingiz kerak.
+CorrectProblemAndReloadPage=Iltimos, muammoni hal qiling va sahifani qayta yuklash uchun F5 tugmasini bosing.
+AlreadyDone=Zotan ko'chib ketgan
+DatabaseVersion=Ma'lumotlar bazasi versiyasi
+ServerVersion=Ma'lumotlar bazasi serveri versiyasi
+YouMustCreateItAndAllowServerToWrite=Siz ushbu katalogni yaratishingiz va unga veb-serverning yozishiga ruxsat berishingiz kerak.
+DBSortingCollation=Belgilarni saralash tartibi
 YouAskDatabaseCreationSoDolibarrNeedToConnect=You selected create database <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
 YouAskLoginCreationSoDolibarrNeedToConnect=You selected create database user <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
-BecauseConnectionFailedParametersMayBeWrong=The database connection failed: the host or super user parameters must be wrong.
-OrphelinsPaymentsDetectedByMethod=Orphans payment detected by method %s
-RemoveItManuallyAndPressF5ToContinue=Remove it manually and press F5 to continue.
-FieldRenamed=Field renamed
-IfLoginDoesNotExistsCheckCreateUser=If the user does not exist yet, you must check option "Create user"
-ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or the PHP client version may be too old compared to the database version.
-InstallChoiceRecommanded=Recommended choice to install version <b>%s</b> from your current version <b>%s</b>
-InstallChoiceSuggested=<b>Install choice suggested by installer</b>.
-MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions. The install wizard will come back to suggest a further migration once this one is complete.
-CheckThatDatabasenameIsCorrect=Check that the database name "<b>%s</b>" is correct.
-IfAlreadyExistsCheckOption=If this name is correct and that database does not exist yet, you must check option "Create database".
-OpenBaseDir=PHP openbasedir parameter
-YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
-YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form).
-NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing.
-MigrationCustomerOrderShipping=Migrate shipping for sales orders storage
-MigrationShippingDelivery=Upgrade storage of shipping
-MigrationShippingDelivery2=Upgrade storage of shipping 2
-MigrationFinished=Migration finished
-LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the master account to administer all other/additional user accounts.</b>
-ActivateModule=Activate module %s
-ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
-WarningUpgrade=Warning:\nDid you run a database backup first?\nThis is highly recommended. Loss of data (due to for example bugs in mysql version 5.5.40/41/42/43) may be possible during this process, so it is essential to take a complete dump of your database before starting any migration.\n\nClick OK to start migration process...
-ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug, making data loss possible if you make structural changes in your database, such as is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a layer (patched) version (list of known buggy versions: %s)
-KeepDefaultValuesWamp=You used the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you are doing.
-KeepDefaultValuesDeb=You used the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so the values proposed here are already optimized. Only the password of the database owner to create must be entered. Change other parameters only if you know what you are doing.
-KeepDefaultValuesMamp=You used the Dolibarr setup wizard from DoliMamp, so the values proposed here are already optimized. Change them only if you know what you are doing.
-KeepDefaultValuesProxmox=You used the Dolibarr setup wizard from a Proxmox virtual appliance, so the values proposed here are already optimized. Change them only if you know what you are doing.
+BecauseConnectionFailedParametersMayBeWrong=Ma'lumotlar bazasi ulanishi muvaffaqiyatsiz tugadi: xost yoki super foydalanuvchi parametrlari noto'g'ri bo'lishi kerak.
+OrphelinsPaymentsDetectedByMethod=%s usuli bilan etim bolalar uchun to'lov aniqlandi
+RemoveItManuallyAndPressF5ToContinue=Uni qo'lda olib tashlang va davom ettirish uchun F5 tugmasini bosing.
+FieldRenamed=Maydon nomi o'zgartirildi
+IfLoginDoesNotExistsCheckCreateUser=Agar foydalanuvchi hali mavjud bo'lmasa, "Foydalanuvchi yaratish" parametrini tekshirishingiz kerak
+ErrorConnection=Server "<b> %s </b>", ma'lumotlar bazasi nomi "<b> %s </b>", login "<b> %s </b>", yoki ma'lumotlar bazasi parol noto'g'ri bo'lishi mumkin, yoki PHP mijoz versiyasi bazasi versiyasiga nisbatan juda eski bo'lishi mumkin.
+InstallChoiceRecommanded=<b> %s </b> versiyasini joriy versiyangizdan o'rnatish uchun tavsiya etilgan tanlov <b> %s </b>
+InstallChoiceSuggested= <b> </b> o'rnatuvchisi tomonidan tavsiya etilgan o'rnatish tanlovi.
+MigrateIsDoneStepByStep=Maqsadli versiyada (%s) bir nechta versiyalar oralig'i mavjud. O'rnatish ustasi ushbu ko'chirish tugagandan so'ng yana ko'chib o'tishni taklif qilish uchun qaytib keladi.
+CheckThatDatabasenameIsCorrect=Ma'lumotlar bazasi nomi "<b> %s </b>" to'g'riligini tekshiring.
+IfAlreadyExistsCheckOption=Agar ushbu nom to'g'ri bo'lsa va ma'lumotlar bazasi hali mavjud bo'lmasa, "Ma'lumotlar bazasini yaratish" bandini tekshirishingiz kerak.
+OpenBaseDir=PHP openbasedir parametri
+YouAskToCreateDatabaseSoRootRequired=Siz "Ma'lumotlar bazasini yaratish" katagiga belgi qo'ydingiz. Buning uchun superuser-ning login / parolini taqdim etishingiz kerak (shaklning pastki qismida).
+YouAskToCreateDatabaseUserSoRootRequired=Siz "Ma'lumotlar bazasi egasini yaratish" katagiga belgi qo'ydingiz. Buning uchun superuser-ning login / parolini taqdim etishingiz kerak (shaklning pastki qismida).
+NextStepMightLastALongTime=Joriy qadam bir necha daqiqa vaqt olishi mumkin. Davom etishdan oldin keyingi ekran to'liq ko'rsatilishini kuting.
+MigrationCustomerOrderShipping=Savdo buyurtmalarini saqlash uchun yuklarni ko'chirish
+MigrationShippingDelivery=Yuk tashish omborini yangilang
+MigrationShippingDelivery2=2. Yuk tashish omborini yangilash
+MigrationFinished=Migratsiya tugadi
+LastStepDesc= <strong> Oxirgi qadam </strong>: Dolibarr-ga ulanish uchun foydalanmoqchi bo'lgan login va parolni aniqlang. <b> buni yo'qotmang, chunki bu boshqa barcha / qo'shimcha foydalanuvchi hisoblarini boshqarish uchun asosiy hisob. </b>
+ActivateModule=%s modulini faollashtiring
+ShowEditTechnicalParameters=Kengaytirilgan parametrlarni ko'rsatish / tahrirlash uchun shu erni bosing (ekspert rejimi)
+WarningUpgrade=Ogohlantirish:\nAvval ma'lumotlar bazasini zaxira nusxasini yaratdingizmi?\nBu juda tavsiya etiladi. Ma'lumotlarni yo'qotish (masalan, 5.5.40 / 41/42/43 mysql versiyasidagi xatolar tufayli) bu jarayonda bo'lishi mumkin, shuning uchun har qanday ko'chishni boshlashdan oldin ma'lumotlar bazangizni to'liq tashlab qo'yish kerak.\n\nMigratsiya jarayonini boshlash uchun OK tugmasini bosing ...
+ErrorDatabaseVersionForbiddenForMigration=Ma'lumotlar bazasi versiyasi %s. Ushbu ma'lumotlar bazasida migratsiya jarayoni talab qiladigan tarkibiy o'zgarishlarni amalga oshirsangiz, ma'lumotlar yo'qotilishi mumkin bo'lgan juda muhim xato mavjud. Ma'lumotlar bazasini qatlamli (yamalgan) versiyaga yangilamaguningizcha (ma'lum buggy versiyalari ro'yxati: %s) uning ko'chirilishiga yo'l qo'yilmaydi.
+KeepDefaultValuesWamp=Siz DoliWamp-dan Dolibarrni sozlash ustasini ishlatdingiz, shuning uchun bu erda tavsiya etilgan qiymatlar allaqachon optimallashtirilgan. Siz nima qilayotganingizni bilsangizgina ularni o'zgartiring.
+KeepDefaultValuesDeb=Siz Dolibarrni o'rnatish ustasini Linux paketidan ishlatdingiz (Ubuntu, Debian, Fedora ...), shuning uchun bu erda tavsiya etilgan qiymatlar allaqachon optimallashtirilgan. Yaratish uchun faqat ma'lumotlar bazasi egasining parolini kiritish kerak. Faqat nima qilayotganingizni bilsangizgina boshqa parametrlarni o'zgartiring.
+KeepDefaultValuesMamp=Siz DoliMamp-dan Dolibarrni sozlash ustasini ishlatdingiz, shuning uchun bu erda tavsiya etilgan qiymatlar allaqachon optimallashtirilgan. Siz nima qilayotganingizni bilsangizgina ularni o'zgartiring.
+KeepDefaultValuesProxmox=Siz Dolibarrni sozlash ustasini Proxmox virtual uskunasidan foydalandingiz, shuning uchun bu erda tavsiya etilgan qiymatlar allaqachon optimallashtirilgan. Siz nima qilayotganingizni bilsangizgina ularni o'zgartiring.
 UpgradeExternalModule=Run dedicated upgrade process of external module
 SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example:  '...repair.php?standard=confirmed'
 NothingToDelete=Nothing to clean/delete
 NothingToDo=Nothing to do
 #########
 # upgrade
-MigrationFixData=Fix for denormalized data
-MigrationOrder=Data migration for customer's orders
-MigrationSupplierOrder=Data migration for vendor's orders
-MigrationProposal=Data migration for commercial proposals
-MigrationInvoice=Data migration for customer's invoices
-MigrationContract=Data migration for contracts
-MigrationSuccessfullUpdate=Upgrade successful
-MigrationUpdateFailed=Failed upgrade process
-MigrationRelationshipTables=Data migration for relationship tables (%s)
-MigrationPaymentsUpdate=Payment data correction
-MigrationPaymentsNumberToUpdate=%s payment(s) to update
-MigrationProcessPaymentUpdate=Update payment(s) %s
-MigrationPaymentsNothingToUpdate=No more things to do
-MigrationPaymentsNothingUpdatable=No more payments that can be corrected
-MigrationContractsUpdate=Contract data correction
-MigrationContractsNumberToUpdate=%s contract(s) to update
-MigrationContractsLineCreation=Create contract line for contract ref %s
-MigrationContractsNothingToUpdate=No more things to do
-MigrationContractsFieldDontExist=Field fk_facture does not exist anymore. Nothing to do.
-MigrationContractsEmptyDatesUpdate=Contract empty date correction
-MigrationContractsEmptyDatesUpdateSuccess=Contract empty date correction done successfully
-MigrationContractsEmptyDatesNothingToUpdate=No contract empty date to correct
-MigrationContractsEmptyCreationDatesNothingToUpdate=No contract creation date to correct
-MigrationContractsInvalidDatesUpdate=Bad value date contract correction
-MigrationContractsInvalidDateFix=Correct contract %s (Contract date=%s, Starting service date min=%s)
-MigrationContractsInvalidDatesNumber=%s contracts modified
-MigrationContractsInvalidDatesNothingToUpdate=No date with bad value to correct
-MigrationContractsIncoherentCreationDateUpdate=Bad value contract creation date correction
-MigrationContractsIncoherentCreationDateUpdateSuccess=Bad value contract creation date correction done successfully
-MigrationContractsIncoherentCreationDateNothingToUpdate=No bad value for contract creation date to correct
-MigrationReopeningContracts=Open contract closed by error
-MigrationReopenThisContract=Reopen contract %s
-MigrationReopenedContractsNumber=%s contracts modified
-MigrationReopeningContractsNothingToUpdate=No closed contract to open
-MigrationBankTransfertsUpdate=Update links between bank entry and a bank transfer
-MigrationBankTransfertsNothingToUpdate=All links are up to date
-MigrationShipmentOrderMatching=Sendings receipt update
-MigrationDeliveryOrderMatching=Delivery receipt update
-MigrationDeliveryDetail=Delivery update
-MigrationStockDetail=Update stock value of products
-MigrationMenusDetail=Update dynamic menus tables
-MigrationDeliveryAddress=Update delivery address in shipments
-MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
-MigrationProjectUserResp=Data migration field fk_user_resp of llx_projet to llx_element_contact
-MigrationProjectTaskTime=Update time spent in seconds
-MigrationActioncommElement=Update data on actions
-MigrationPaymentMode=Data migration for payment type
-MigrationCategorieAssociation=Migration of categories
-MigrationEvents=Migration of events to add event owner into assignment table
+MigrationFixData=Normalizatsiya qilingan ma'lumotlar uchun tuzatish
+MigrationOrder=Mijozning buyurtmalari bo'yicha ma'lumotlar migratsiyasi
+MigrationSupplierOrder=Sotuvchining buyurtmalari bo'yicha ma'lumotlarning ko'chishi
+MigrationProposal=Tijorat takliflari uchun ma'lumotlar migratsiyasi
+MigrationInvoice=Mijozning hisob-fakturalari uchun ma'lumotlar migratsiyasi
+MigrationContract=Shartnomalar bo'yicha ma'lumotlar migratsiyasi
+MigrationSuccessfullUpdate=Yangilash muvaffaqiyatli amalga oshirildi
+MigrationUpdateFailed=Yangilanish jarayoni amalga oshmadi
+MigrationRelationshipTables=O'zaro munosabatlar jadvallari uchun ma'lumotlar migratsiyasi (%s)
+MigrationPaymentsUpdate=To'lov ma'lumotlarini tuzatish
+MigrationPaymentsNumberToUpdate=yangilash uchun %s to'lov (lar) i
+MigrationProcessPaymentUpdate=%s to'lov (lar) ini yangilang
+MigrationPaymentsNothingToUpdate=Boshqa qiladigan narsalar yo'q
+MigrationPaymentsNothingUpdatable=Endi tuzatilishi mumkin bo'lgan to'lovlar yo'q
+MigrationContractsUpdate=Shartnoma ma'lumotlarini tuzatish
+MigrationContractsNumberToUpdate=%s shartnoma (lar) ni yangilash
+MigrationContractsLineCreation=%s kontrakt uchun shartnoma chizig'ini yarating
+MigrationContractsNothingToUpdate=Boshqa qiladigan narsalar yo'q
+MigrationContractsFieldDontExist=Fk_facture maydoni endi mavjud emas. Qiladigan ish yo'q.
+MigrationContractsEmptyDatesUpdate=Shartnomaning bo'sh sanasini tuzatish
+MigrationContractsEmptyDatesUpdateSuccess=Shartnomani bo'sh sanani tuzatish muvaffaqiyatli amalga oshirildi
+MigrationContractsEmptyDatesNothingToUpdate=Tuzatish uchun hech qanday shartnoma bo'sh sanasi yo'q
+MigrationContractsEmptyCreationDatesNothingToUpdate=Tuzatish uchun shartnoma tuzish sanasi yo'q
+MigrationContractsInvalidDatesUpdate=Noto'g'ri qiymat sanasini shartnomani tuzatish
+MigrationContractsInvalidDateFix=To'g'ri shartnoma %s (Shartnoma tuzilgan sana = %s, xizmat boshlanadigan sana min = %s)
+MigrationContractsInvalidDatesNumber=%s shartnomalari o'zgartirildi
+MigrationContractsInvalidDatesNothingToUpdate=Tuzatish uchun yomon qiymatga ega sana yo'q
+MigrationContractsIncoherentCreationDateUpdate=Noto'g'ri qiymatdagi shartnomani tuzish sanasini tuzatish
+MigrationContractsIncoherentCreationDateUpdateSuccess=Noto'g'ri qiymatdagi shartnomani tuzish sanasini tuzatish muvaffaqiyatli amalga oshirildi
+MigrationContractsIncoherentCreationDateNothingToUpdate=Shartnomani tuzish sanasi uchun yomon qiymat yo'q
+MigrationReopeningContracts=Ochiq shartnoma xato bilan yopildi
+MigrationReopenThisContract=%s shartnomasini qayta oching
+MigrationReopenedContractsNumber=%s shartnomalari o'zgartirildi
+MigrationReopeningContractsNothingToUpdate=Ochish uchun yopiq shartnoma yo'q
+MigrationBankTransfertsUpdate=Bank yozuvlari va bank o'tkazmasi o'rtasidagi aloqalarni yangilang
+MigrationBankTransfertsNothingToUpdate=Barcha havolalar dolzarb
+MigrationShipmentOrderMatching=Yuborilganlik haqidagi kvitansiyani yangilash
+MigrationDeliveryOrderMatching=Yetkazib berish kvitansiyasini yangilash
+MigrationDeliveryDetail=Yetkazib berish yangilanishi
+MigrationStockDetail=Mahsulotlarning zaxira qiymatini yangilang
+MigrationMenusDetail=Dinamik menyu jadvallarini yangilang
+MigrationDeliveryAddress=Yuklarni etkazib berish manzilini yangilang
+MigrationProjectTaskActors=Llx_projet_task_actors jadvali uchun ma'lumotlar migratsiyasi
+MigrationProjectUserResp=Llx_projet ning fk_user_resp ma'lumotlarini llx_element_contact-ga ko'chirish maydoni
+MigrationProjectTaskTime=Bir necha soniya ichida sarflangan vaqtni yangilang
+MigrationActioncommElement=Amallar to'g'risidagi ma'lumotlarni yangilang
+MigrationPaymentMode=To'lov turi bo'yicha ma'lumotlar migratsiyasi
+MigrationCategorieAssociation=Kategoriyalar migratsiyasi
+MigrationEvents=Voqealar egasini tayinlash jadvaliga qo'shish uchun hodisalarning ko'chishi
 MigrationEventsContact=Migration of events to add event contact into assignment table
-MigrationRemiseEntity=Update entity field value of llx_societe_remise
-MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
+MigrationRemiseEntity=Llx_societe_remise ob'ekti maydon qiymatini yangilang
+MigrationRemiseExceptEntity=Llx_societe_remise_except mavjudlik maydon qiymatini yangilang
 MigrationUserRightsEntity=Update entity field value of llx_user_rights
 MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
 MigrationUserPhotoPath=Migration of photo paths for users
 MigrationFieldsSocialNetworks=Migration of users fields social networks (%s)
-MigrationReloadModule=Reload module %s
+MigrationReloadModule=%s modulini qayta yuklang
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
-ShowNotAvailableOptions=Show unavailable options
-HideNotAvailableOptions=Hide unavailable options
-ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
+ShowNotAvailableOptions=Mavjud bo'lmagan variantlarni ko'rsating
+HideNotAvailableOptions=Mavjud bo'lmagan variantlarni yashirish
+ErrorFoundDuringMigration=Migratsiya jarayonida xato (lar) haqida xabar berilgan, shuning uchun keyingi qadam mavjud emas. Xatolarni e'tiborsiz qoldirish uchun siz <a href="%s"> </a> tugmachasini bosishingiz mumkin, ammo xatolar echilmaguncha dastur yoki ba'zi funktsiyalar to'g'ri ishlamasligi mumkin.
 YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (directory renamed with .lock suffix).<br>
 YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
diff --git a/htdocs/langs/uz_UZ/interventions.lang b/htdocs/langs/uz_UZ/interventions.lang
index e5936f8246e..93cef2c595c 100644
--- a/htdocs/langs/uz_UZ/interventions.lang
+++ b/htdocs/langs/uz_UZ/interventions.lang
@@ -1,66 +1,68 @@
 # Dolibarr language file - Source file is en_US - interventions
-Intervention=Intervention
-Interventions=Interventions
-InterventionCard=Intervention card
-NewIntervention=New intervention
-AddIntervention=Create intervention
+Intervention=Aralashish
+Interventions=Aralashuvlar
+InterventionCard=Interventsiya kartasi
+NewIntervention=Yangi aralashuv
+AddIntervention=Aralashuvni yarating
 ChangeIntoRepeatableIntervention=Change to repeatable intervention
-ListOfInterventions=List of interventions
-ActionsOnFicheInter=Actions on intervention
-LastInterventions=Latest %s interventions
-AllInterventions=All interventions
-CreateDraftIntervention=Create draft
-InterventionContact=Intervention contact
-DeleteIntervention=Delete intervention
-ValidateIntervention=Validate intervention
-ModifyIntervention=Modify intervention
-DeleteInterventionLine=Delete intervention line
-ConfirmDeleteIntervention=Are you sure you want to delete this intervention?
-ConfirmValidateIntervention=Are you sure you want to validate this intervention under name <b>%s</b>?
-ConfirmModifyIntervention=Are you sure you want to modify this intervention?
-ConfirmDeleteInterventionLine=Are you sure you want to delete this intervention line?
-ConfirmCloneIntervention=Are you sure you want to clone this intervention?
-NameAndSignatureOfInternalContact=Name and signature of intervening:
-NameAndSignatureOfExternalContact=Name and signature of customer:
-DocumentModelStandard=Standard document model for interventions
-InterventionCardsAndInterventionLines=Interventions and lines of interventions
-InterventionClassifyBilled=Classify "Billed"
-InterventionClassifyUnBilled=Classify "Unbilled"
-InterventionClassifyDone=Classify "Done"
-StatusInterInvoiced=Billed
-SendInterventionRef=Submission of intervention %s
-SendInterventionByMail=Send intervention by email
-InterventionCreatedInDolibarr=Intervention %s created
-InterventionValidatedInDolibarr=Intervention %s validated
-InterventionModifiedInDolibarr=Intervention %s modified
-InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
-InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
-InterventionSentByEMail=Intervention %s sent by email
-InterventionDeletedInDolibarr=Intervention %s deleted
-InterventionsArea=Interventions area
-DraftFichinter=Draft interventions
-LastModifiedInterventions=Latest %s modified interventions
-FichinterToProcess=Interventions to process
-TypeContact_fichinter_external_CUSTOMER=Following-up customer contact
-PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
-PrintProductsOnFichinterDetails=interventions generated from orders
-UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
+ListOfInterventions=Tadbirlar ro'yxati
+ActionsOnFicheInter=Aralashish bo'yicha harakatlar
+LastInterventions=Oxirgi %s aralashuvlari
+AllInterventions=Barcha aralashuvlar
+CreateDraftIntervention=Qoralama yarating
+InterventionContact=Interventsiya aloqasi
+DeleteIntervention=Aralashuvni o'chirib tashlang
+ValidateIntervention=Aralashuvni tasdiqlang
+ModifyIntervention=Aralashuvni o'zgartiring
+DeleteInterventionLine=Intervensiya chizig'ini o'chirish
+ConfirmDeleteIntervention=Ushbu aralashuvni o'chirishni xohlaysizmi?
+ConfirmValidateIntervention=Ushbu aralashuvni <b> %s </b> nomi bilan tasdiqlamoqchimisiz?
+ConfirmModifyIntervention=Ushbu aralashuvni o'zgartirmoqchi ekanligingizga aminmisiz?
+ConfirmDeleteInterventionLine=Ushbu aralashuv satrini o'chirishni xohlaysizmi?
+ConfirmCloneIntervention=Ushbu aralashuvni klonlamoqchimisiz?
+NameAndSignatureOfInternalContact=Aralashuvning nomi va imzosi:
+NameAndSignatureOfExternalContact=Mijozning ismi va imzosi:
+DocumentModelStandard=Interventsiyalar uchun standart hujjat modeli
+InterventionCardsAndInterventionLines=Interventsiyalar va aralashuvlar yo'nalishlari
+InterventionClassifyBilled="Hisob-kitoblar" tasnifi
+InterventionClassifyUnBilled="Hisob-kitob qilinmagan" tasnifi
+InterventionClassifyDone="Bajarildi" tasnifi
+StatusInterInvoiced=Hisob-kitob
+SendInterventionRef=%s aralashuvini yuborish
+SendInterventionByMail=Elektron pochta orqali aralashuvni yuboring
+InterventionCreatedInDolibarr=%s aralashuvi yaratildi
+InterventionValidatedInDolibarr=%s aralashuvi tasdiqlangan
+InterventionModifiedInDolibarr=%s aralashuvi o'zgartirildi
+InterventionClassifiedBilledInDolibarr=%s aralashuvi hisob-kitob sifatida o'rnatildi
+InterventionClassifiedUnbilledInDolibarr=%s aralashuvi to'lanmagan deb belgilandi
+InterventionSentByEMail=Elektron pochta orqali yuborilgan aralashuv %s
+InterventionDeletedInDolibarr=%s aralashuvi o'chirildi
+InterventionsArea=Intervensiyalar maydoni
+DraftFichinter=Aralashmalarning loyihasi
+LastModifiedInterventions=Oxirgi %s o'zgartirilgan aralashuvlar
+FichinterToProcess=Qayta ishlashga aralashuvlar
+TypeContact_fichinter_external_CUSTOMER=Keyingi mijozlar bilan aloqa
+PrintProductsOnFichinter=Interventsiya kartasida "mahsulot" (nafaqat xizmatlar) turidagi qatorlarni chop eting
+PrintProductsOnFichinterDetails=buyurtmalardan kelib chiqadigan aralashuvlar
+UseServicesDurationOnFichinter=Buyurtmalar natijasida yuzaga keladigan aralashuvlar uchun xizmatlarning davomiyligidan foydalaning
 UseDurationOnFichinter=Hides the duration field for intervention records
 UseDateWithoutHourOnFichinter=Hides hours and minutes off the date field for intervention records
-InterventionStatistics=Statistics of interventions
-NbOfinterventions=No. of intervention cards
-NumberOfInterventionsByMonth=No. of intervention cards by month (date of validation)
+InterventionStatistics=Ta'sirlarning statistikasi
+NbOfinterventions=Interventsiya kartalari soni
+NumberOfInterventionsByMonth=Oy bo'yicha aralashuv kartalarining soni (tasdiqlangan sana)
 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.
-InterId=Intervention id
-InterRef=Intervention ref.
-InterDateCreation=Date creation intervention
-InterDuration=Duration intervention
-InterStatus=Status intervention
-InterNote=Note intervention
+InterId=Interferentsiya id
+InterRef=Aralashish ref.
+InterDateCreation=Sana yaratishga aralashish
+InterDuration=Davomiylik aralashuvi
+InterStatus=Holat aralashuvi
+InterNote=Aralashuvga e'tibor bering
 InterLine=Line of intervention
-InterLineId=Line id intervention
-InterLineDate=Line date intervention
-InterLineDuration=Line duration intervention
-InterLineDesc=Line description intervention
+InterLineId=Chiziq identifikatori aralashuvi
+InterLineDate=Qator sana aralashuvi
+InterLineDuration=Chiziq davomiyligi aralashuvi
+InterLineDesc=Chiziq ta'rifi aralashuvi
 RepeatableIntervention=Template of intervention
 ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
+Reopen=Reopen
+ConfirmReopenIntervention=Are you sure you want to open back the intervention <b>%s</b>?
diff --git a/htdocs/langs/uz_UZ/knowledgemanagement.lang b/htdocs/langs/uz_UZ/knowledgemanagement.lang
index 269007e60f8..68f5cced76c 100644
--- a/htdocs/langs/uz_UZ/knowledgemanagement.lang
+++ b/htdocs/langs/uz_UZ/knowledgemanagement.lang
@@ -47,7 +47,7 @@ KnowledgeManagementArea = Knowledge Management
 # Menu
 #
 MenuKnowledgeRecord = Knowledge base
-ListOfArticles = List of articles
+ListKnowledgeRecord = List of articles
 NewKnowledgeRecord = New article
 ValidateReply = Validate solution
 KnowledgeRecords = Articles
diff --git a/htdocs/langs/uz_UZ/languages.lang b/htdocs/langs/uz_UZ/languages.lang
index ba187326705..01fe39dec43 100644
--- a/htdocs/langs/uz_UZ/languages.lang
+++ b/htdocs/langs/uz_UZ/languages.lang
@@ -1,105 +1,107 @@
 # Dolibarr language file - Source file is en_US - languages
 Language_am_ET=Ethiopian
-Language_ar_AR=Arabic
+Language_ar_AR=Arabcha
 Language_ar_EG=Arabic (Egypt)
-Language_ar_SA=Arabic
+Language_ar_SA=Arabcha
+Language_ar_TN=Arabic (Tunisia)
 Language_az_AZ=Azerbaijani
-Language_bn_BD=Bengali
+Language_bn_BD=Bengal tili
 Language_bn_IN=Bengali (India)
-Language_bg_BG=Bulgarian
-Language_bs_BA=Bosnian
-Language_ca_ES=Catalan
-Language_cs_CZ=Czech
-Language_da_DA=Danish
-Language_da_DK=Danish
-Language_de_DE=German
-Language_de_AT=German (Austria)
-Language_de_CH=German (Switzerland)
-Language_el_GR=Greek
-Language_el_CY=Greek (Cyprus)
-Language_en_AU=English (Australia)
-Language_en_CA=English (Canada)
-Language_en_GB=English (United Kingdom)
-Language_en_IN=English (India)
-Language_en_NZ=English (New Zealand)
-Language_en_SA=English (Saudi Arabia)
+Language_bg_BG=Bolgar
+Language_bs_BA=Bosniya
+Language_ca_ES=Kataloniya
+Language_cs_CZ=Chex
+Language_da_DA=Daniya
+Language_da_DK=Daniya
+Language_de_DE=Nemis
+Language_de_AT=Nemis (Avstriya)
+Language_de_CH=Nemis (Shveytsariya)
+Language_el_GR=Yunoncha
+Language_el_CY=Yunon (Kipr)
+Language_en_AU=Ingliz (Avstraliya)
+Language_en_CA=Ingliz (Kanada)
+Language_en_GB=Ingliz (Buyuk Britaniya)
+Language_en_IN=Ingliz (Hindiston)
+Language_en_NZ=Ingliz (Yangi Zelandiya)
+Language_en_SA=Ingliz tili (Saudiya Arabistoni)
 Language_en_SG=English (Singapore)
-Language_en_US=English (United States)
-Language_en_ZA=English (South Africa)
-Language_es_ES=Spanish
-Language_es_AR=Spanish (Argentina)
-Language_es_BO=Spanish (Bolivia)
-Language_es_CL=Spanish (Chile)
-Language_es_CO=Spanish (Colombia)
-Language_es_DO=Spanish (Dominican Republic)
-Language_es_EC=Spanish (Ecuador)
+Language_en_US=Ingliz (Amerika Qo'shma Shtatlari)
+Language_en_ZA=Ingliz (Janubiy Afrika)
+Language_es_ES=Ispaniya
+Language_es_AR=Ispaniya (Argentina)
+Language_es_BO=Ispan (Boliviya)
+Language_es_CL=Ispan (Chili)
+Language_es_CO=Ispan (Kolumbiya)
+Language_es_DO=Ispaniya (Dominik Respublikasi)
+Language_es_EC=Ispan (Ekvador)
 Language_es_GT=Spanish (Guatemala)
-Language_es_HN=Spanish (Honduras)
-Language_es_MX=Spanish (Mexico)
-Language_es_PA=Spanish (Panama)
-Language_es_PY=Spanish (Paraguay)
-Language_es_PE=Spanish (Peru)
-Language_es_PR=Spanish (Puerto Rico)
+Language_es_HN=Ispan (Gonduras)
+Language_es_MX=Ispan (Meksika)
+Language_es_PA=Ispan (Panama)
+Language_es_PY=Ispan (Paragvay)
+Language_es_PE=Ispan (Peru)
+Language_es_PR=Ispan (Puerto-Riko)
 Language_es_US=Spanish (USA)
 Language_es_UY=Spanish (Uruguay)
 Language_es_GT=Spanish (Guatemala)
-Language_es_VE=Spanish (Venezuela)
-Language_et_EE=Estonian
-Language_eu_ES=Basque
-Language_fa_IR=Persian
-Language_fi_FI=Finnish
-Language_fr_BE=French (Belgium)
-Language_fr_CA=French (Canada)
-Language_fr_CH=French (Switzerland)
+Language_es_VE=Ispan (Venesuela)
+Language_et_EE=Estoniya
+Language_eu_ES=Bask
+Language_fa_IR=Fors tili
+Language_fi_FI=Finlyandiya
+Language_fr_BE=Frantsuz (Belgiya)
+Language_fr_CA=Frantsuz (Kanada)
+Language_fr_CH=Frantsuz (Shveytsariya)
 Language_fr_CI=French (Cost Ivory)
 Language_fr_CM=French (Cameroun)
-Language_fr_FR=French
+Language_fr_FR=Frantsuzcha
 Language_fr_GA=French (Gabon)
-Language_fr_NC=French (New Caledonia)
+Language_fr_NC=Frantsuz (Yangi Kaledoniya)
 Language_fr_SN=French (Senegal)
-Language_fy_NL=Frisian
+Language_fy_NL=Friz
 Language_gl_ES=Galician
-Language_he_IL=Hebrew
+Language_he_IL=Ibroniycha
 Language_hi_IN=Hindi (India)
-Language_hr_HR=Croatian
-Language_hu_HU=Hungarian
-Language_id_ID=Indonesian
-Language_is_IS=Icelandic
-Language_it_IT=Italian
+Language_hr_HR=Xorvat
+Language_hu_HU=Venger
+Language_id_ID=Indoneziyalik
+Language_is_IS=Islandcha
+Language_it_IT=Italyancha
 Language_it_CH=Italian (Switzerland)
-Language_ja_JP=Japanese
-Language_ka_GE=Georgian
-Language_km_KH=Khmer
+Language_ja_JP=Yapon
+Language_ka_GE=Gruzin
+Language_km_KH=Kxmer
 Language_kn_IN=Kannada
-Language_ko_KR=Korean
-Language_lo_LA=Lao
-Language_lt_LT=Lithuanian
-Language_lv_LV=Latvian
-Language_mk_MK=Macedonian
-Language_mn_MN=Mongolian
-Language_nb_NO=Norwegian (Bokmål)
+Language_ko_KR=Koreys
+Language_lo_LA=Laos
+Language_lt_LT=Litva
+Language_lv_LV=Latviya
+Language_mk_MK=Makedoniya
+Language_mn_MN=Mo'g'ul
+Language_nb_NO=Norvegiya (Bokmal)
 Language_ne_NP=Nepali
-Language_nl_BE=Dutch (Belgium)
-Language_nl_NL=Dutch
-Language_pl_PL=Polish
-Language_pt_BR=Portuguese (Brazil)
-Language_pt_PT=Portuguese
-Language_ro_RO=Romanian
-Language_ru_RU=Russian
-Language_ru_UA=Russian (Ukraine)
-Language_tr_TR=Turkish
-Language_sl_SI=Slovenian
-Language_sv_SV=Swedish
-Language_sv_SE=Swedish
-Language_sq_AL=Albanian
-Language_sk_SK=Slovakian
-Language_sr_RS=Serbian
-Language_sw_SW=Kiswahili
-Language_th_TH=Thai
-Language_uk_UA=Ukrainian
-Language_uz_UZ=Uzbek
-Language_vi_VN=Vietnamese
-Language_zh_CN=Chinese
-Language_zh_TW=Chinese (Traditional)
+Language_nl_BE=Golland (Belgiya)
+Language_nl_NL=Golland
+Language_pl_PL=Polsha
+Language_pt_BR=Portugal (Braziliya)
+Language_pt_PT=Portugal
+Language_ro_MD=Romanian (Moldavia)
+Language_ro_RO=Rumin
+Language_ru_RU=Ruscha
+Language_ru_UA=Rus (Ukraina)
+Language_tr_TR=Turkcha
+Language_sl_SI=Slovencha
+Language_sv_SV=Shved
+Language_sv_SE=Shved
+Language_sq_AL=Albancha
+Language_sk_SK=Slovakiya
+Language_sr_RS=Serb
+Language_sw_SW=Kisvaxili
+Language_th_TH=Tailandcha
+Language_uk_UA=Ukrain
+Language_uz_UZ=O'zbek
+Language_vi_VN=Vetnam
+Language_zh_CN=Xitoy
+Language_zh_TW=Xitoy (an'anaviy)
 Language_zh_HK=Chinese (Hong Kong)
 Language_bh_MY=Malay
diff --git a/htdocs/langs/uz_UZ/ldap.lang b/htdocs/langs/uz_UZ/ldap.lang
index abe11602147..62eeae4b2e0 100644
--- a/htdocs/langs/uz_UZ/ldap.lang
+++ b/htdocs/langs/uz_UZ/ldap.lang
@@ -1,27 +1,27 @@
 # Dolibarr language file - Source file is en_US - ldap
-YouMustChangePassNextLogon=Password for user <b>%s</b> on the domain <b>%s</b> must be changed.
-UserMustChangePassNextLogon=User must change password on the domain %s
-LDAPInformationsForThisContact=Information in LDAP database for this contact
-LDAPInformationsForThisUser=Information in LDAP database for this user
-LDAPInformationsForThisGroup=Information in LDAP database for this group
-LDAPInformationsForThisMember=Information in LDAP database for this member
+YouMustChangePassNextLogon=<b> %s </b> domenidagi <b> %s </b> foydalanuvchisi uchun parol o'zgartirilishi kerak.
+UserMustChangePassNextLogon=Foydalanuvchi %s domenidagi parolni o'zgartirishi kerak
+LDAPInformationsForThisContact=Ushbu aloqa uchun LDAP ma'lumotlar bazasidagi ma'lumotlar
+LDAPInformationsForThisUser=Ushbu foydalanuvchi uchun LDAP ma'lumotlar bazasidagi ma'lumotlar
+LDAPInformationsForThisGroup=Ushbu guruh uchun LDAP ma'lumotlar bazasidagi ma'lumotlar
+LDAPInformationsForThisMember=Ushbu a'zo uchun LDAP ma'lumotlar bazasidagi ma'lumotlar
 LDAPInformationsForThisMemberType=Information in LDAP database for this member type
-LDAPAttributes=LDAP attributes
-LDAPCard=LDAP card
-LDAPRecordNotFound=Record not found in LDAP database
-LDAPUsers=Users in LDAP database
-LDAPFieldStatus=Status
-LDAPFieldFirstSubscriptionDate=First subscription date
-LDAPFieldFirstSubscriptionAmount=First subscription amount
-LDAPFieldLastSubscriptionDate=Latest subscription date
-LDAPFieldLastSubscriptionAmount=Latest subscription amount
-LDAPFieldSkype=Skype id
-LDAPFieldSkypeExample=Example : skypeName
-UserSynchronized=User synchronized
-GroupSynchronized=Group synchronized
-MemberSynchronized=Member synchronized
+LDAPAttributes=LDAP atributlari
+LDAPCard=LDAP karta
+LDAPRecordNotFound=Yozuv LDAP ma'lumotlar bazasida topilmadi
+LDAPUsers=LDAP ma'lumotlar bazasidagi foydalanuvchilar
+LDAPFieldStatus=Holat
+LDAPFieldFirstSubscriptionDate=Birinchi obuna sanasi
+LDAPFieldFirstSubscriptionAmount=Birinchi obuna miqdori
+LDAPFieldLastSubscriptionDate=Oxirgi obuna sanasi
+LDAPFieldLastSubscriptionAmount=Oxirgi obuna miqdori
+LDAPFieldSkype=Skype identifikatori
+LDAPFieldSkypeExample=Misol: skypeName
+UserSynchronized=Foydalanuvchi sinxronlashtirildi
+GroupSynchronized=Guruh sinxronlashtirildi
+MemberSynchronized=A'zo sinxronlashtirildi
 MemberTypeSynchronized=Member type synchronized
-ContactSynchronized=Contact synchronized
-ForceSynchronize=Force synchronizing Dolibarr -> LDAP
-ErrorFailedToReadLDAP=Failed to read LDAP database. Check LDAP module setup and database accessibility.
+ContactSynchronized=Aloqa sinxronlashtirildi
+ForceSynchronize=Dolibarr -> LDAP-ni sinxronlashtirishni majburlash
+ErrorFailedToReadLDAP=LDAP ma'lumotlar bazasini o'qib bo'lmadi. LDAP modulini sozlashni va ma'lumotlar bazasiga kirishni tekshiring.
 PasswordOfUserInLDAP=Password of user in LDAP
diff --git a/htdocs/langs/uz_UZ/link.lang b/htdocs/langs/uz_UZ/link.lang
index 1ffcd41a18b..a77848aedd1 100644
--- a/htdocs/langs/uz_UZ/link.lang
+++ b/htdocs/langs/uz_UZ/link.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - languages
-LinkANewFile=Link a new file/document
-LinkedFiles=Linked files and documents
-NoLinkFound=No registered links
-LinkComplete=The file has been linked successfully
-ErrorFileNotLinked=The file could not be linked
-LinkRemoved=The link %s has been removed
-ErrorFailedToDeleteLink= Failed to remove link '<b>%s</b>'
-ErrorFailedToUpdateLink= Failed to update link '<b>%s</b>'
-URLToLink=URL to link
+LinkANewFile=Yangi fayl / hujjatni bog'lang
+LinkedFiles=Bog'langan fayllar va hujjatlar
+NoLinkFound=Ro'yxatdan o'tgan havolalar yo'q
+LinkComplete=Fayl muvaffaqiyatli ulandi
+ErrorFileNotLinked=Faylni ulab bo‘lmadi
+LinkRemoved=%s havolasi o'chirildi
+ErrorFailedToDeleteLink= '<b> %s </b>' havolasi o'chirilmadi
+ErrorFailedToUpdateLink= '<b> %s </b>' havolasi yangilanmadi
+URLToLink=Ulanish uchun URL
 OverwriteIfExists=Overwrite file if exists
diff --git a/htdocs/langs/uz_UZ/loan.lang b/htdocs/langs/uz_UZ/loan.lang
index d271ed0c140..208c1cd040b 100644
--- a/htdocs/langs/uz_UZ/loan.lang
+++ b/htdocs/langs/uz_UZ/loan.lang
@@ -1,24 +1,24 @@
 # Dolibarr language file - Source file is en_US - loan
-Loan=Loan
-Loans=Loans
-NewLoan=New Loan
-ShowLoan=Show Loan
-PaymentLoan=Loan payment
-LoanPayment=Loan payment
-ShowLoanPayment=Show Loan Payment
-LoanCapital=Capital
-Insurance=Insurance
-Interest=Interest
-Nbterms=Number of terms
+Loan=Kredit
+Loans=Kreditlar
+NewLoan=Yangi kredit
+ShowLoan=Kreditni ko'rsatish
+PaymentLoan=Kreditni to'lash
+LoanPayment=Kreditni to'lash
+ShowLoanPayment=Kredit to'lovini ko'rsatish
+LoanCapital=Poytaxt
+Insurance=Sug'urta
+Interest=Qiziqish
+Nbterms=Shartlar soni
 Term=Term
-LoanAccountancyCapitalCode=Accounting account capital
-LoanAccountancyInsuranceCode=Accounting account insurance
-LoanAccountancyInterestCode=Accounting account interest
-ConfirmDeleteLoan=Confirm deleting this loan
-LoanDeleted=Loan Deleted Successfully
-ConfirmPayLoan=Confirm classify paid this loan
-LoanPaid=Loan Paid
-ListLoanAssociatedProject=List of loan associated with the project
+LoanAccountancyCapitalCode=Buxgalteriya hisobi kapitali
+LoanAccountancyInsuranceCode=Buxgalteriya hisobini sug'urtalash
+LoanAccountancyInterestCode=Buxgalteriya hisobining foizlari
+ConfirmDeleteLoan=Ushbu kreditni o'chirishni tasdiqlang
+LoanDeleted=Kredit muvaffaqiyatli o'chirildi
+ConfirmPayLoan=Ushbu kreditni to'langanligini tasdiqlang
+LoanPaid=Kredit to'langan
+ListLoanAssociatedProject=Loyiha bilan bog'liq kreditlar ro'yxati
 AddLoan=Create loan
 FinancialCommitment=Financial commitment
 InterestAmount=Interest
@@ -27,8 +27,8 @@ TermPaidAllreadyPaid = This term is allready paid
 CantUseScheduleWithLoanStartedToPaid = Can't use scheduler for a loan with payment started
 CantModifyInterestIfScheduleIsUsed = You can't modify interest if you use schedule
 # Admin
-ConfigLoan=Configuration of the module loan
-LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
-LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
-LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
+ConfigLoan=Modulli kreditni sozlash
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Sukut bo'yicha buxgalteriya hisobi kapitali
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Sukut bo'yicha buxgalteriya hisobi foizlari
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Sukut bo'yicha buxgalteriya hisobini sug'urtalash
 CreateCalcSchedule=Edit financial commitment
diff --git a/htdocs/langs/uz_UZ/mailmanspip.lang b/htdocs/langs/uz_UZ/mailmanspip.lang
index bab4b3576b4..c403293b784 100644
--- a/htdocs/langs/uz_UZ/mailmanspip.lang
+++ b/htdocs/langs/uz_UZ/mailmanspip.lang
@@ -1,27 +1,27 @@
 # Dolibarr language file - Source file is en_US - mailmanspip
-MailmanSpipSetup=Mailman and SPIP module Setup
-MailmanTitle=Mailman mailing list system
-TestSubscribe=To test subscription to Mailman lists
-TestUnSubscribe=To test unsubscribe from Mailman lists
-MailmanCreationSuccess=Subscription test was executed successfully
-MailmanDeletionSuccess=Unsubscription test was executed successfully
-SynchroMailManEnabled=A Mailman update will be performed
-SynchroSpipEnabled=A Spip update will be performed
-DescADHERENT_MAILMAN_ADMINPW=Mailman administrator password
-DescADHERENT_MAILMAN_URL=URL for Mailman subscriptions
-DescADHERENT_MAILMAN_UNSUB_URL=URL for Mailman unsubscriptions
-DescADHERENT_MAILMAN_LISTS=List(s) for automatic inscription of new members (separated by a comma)
-SPIPTitle=SPIP Content Management System
-DescADHERENT_SPIP_SERVEUR=SPIP Server
-DescADHERENT_SPIP_DB=SPIP database name
-DescADHERENT_SPIP_USER=SPIP database login
-DescADHERENT_SPIP_PASS=SPIP database password
-AddIntoSpip=Add into SPIP
-AddIntoSpipConfirmation=Are you sure you want to add this member into SPIP?
-AddIntoSpipError=Failed to add the user in SPIP
-DeleteIntoSpip=Remove from SPIP
-DeleteIntoSpipConfirmation=Are you sure you want to remove this member from SPIP?
-DeleteIntoSpipError=Failed to suppress the user from SPIP
-SPIPConnectionFailed=Failed to connect to SPIP
-SuccessToAddToMailmanList=%s successfully added to mailman list %s or SPIP database
-SuccessToRemoveToMailmanList=%s successfully removed from mailman list %s or SPIP database
+MailmanSpipSetup=Pochtachi va SPIP modulini sozlash
+MailmanTitle=Pochtachi pochta ro'yxati tizimi
+TestSubscribe=Pochtachi ro'yxatlariga obuna bo'lishni sinash uchun
+TestUnSubscribe=Pochtachi ro'yxatlariga obunani bekor qilishni tekshirish uchun
+MailmanCreationSuccess=Obuna testi muvaffaqiyatli bajarildi
+MailmanDeletionSuccess=Obunani bekor qilish testi muvaffaqiyatli bajarildi
+SynchroMailManEnabled=Pochta xizmatining yangilanishi amalga oshiriladi
+SynchroSpipEnabled=Spip yangilanishi amalga oshiriladi
+DescADHERENT_MAILMAN_ADMINPW=Pochtachi ma'murining paroli
+DescADHERENT_MAILMAN_URL=Pochtachi obunalari uchun URL manzili
+DescADHERENT_MAILMAN_UNSUB_URL=Pochtachi obunalarini bekor qilish uchun URL manzili
+DescADHERENT_MAILMAN_LISTS=Yangi a'zolarni avtomatik ravishda yozish uchun ro'yxat (lar) (vergul bilan ajratilgan)
+SPIPTitle=SPIP tarkibini boshqarish tizimi
+DescADHERENT_SPIP_SERVEUR=SPIP-server
+DescADHERENT_SPIP_DB=SPIP ma'lumotlar bazasi nomi
+DescADHERENT_SPIP_USER=SPIP ma'lumotlar bazasiga kirish
+DescADHERENT_SPIP_PASS=SPIP ma'lumotlar bazasi paroli
+AddIntoSpip=SPIP-ga qo'shing
+AddIntoSpipConfirmation=Ushbu a'zoni SPIP-ga qo'shishni xohlaysizmi?
+AddIntoSpipError=Foydalanuvchini SPIP-ga qo'shib bo'lmadi
+DeleteIntoSpip=SPIP-dan olib tashlash
+DeleteIntoSpipConfirmation=Ushbu a'zoni SPIP-dan olib tashlamoqchimisiz?
+DeleteIntoSpipError=Foydalanuvchini SPIP-dan o'chirib bo'lmadi
+SPIPConnectionFailed=SPIP-ga ulanib bo'lmadi
+SuccessToAddToMailmanList=%s xat yuboruvchilar ro'yxatiga muvaffaqiyatli qo'shildi %s yoki SPIP ma'lumotlar bazasi
+SuccessToRemoveToMailmanList=%s xat yuboruvchilar ro'yxatidan muvaffaqiyatli o'chirildi %s yoki SPIP ma'lumotlar bazasi
diff --git a/htdocs/langs/uz_UZ/mails.lang b/htdocs/langs/uz_UZ/mails.lang
index 24c86cc885a..dc1f71e7cb8 100644
--- a/htdocs/langs/uz_UZ/mails.lang
+++ b/htdocs/langs/uz_UZ/mails.lang
@@ -1,92 +1,92 @@
 # Dolibarr language file - Source file is en_US - mails
-Mailing=EMailing
-EMailing=EMailing
-EMailings=EMailings
-AllEMailings=All eMailings
-MailCard=EMailing card
-MailRecipients=Recipients
-MailRecipient=Recipient
-MailTitle=Description
-MailFrom=Sender
-MailErrorsTo=Errors to
-MailReply=Reply to
-MailTo=Receiver(s)
+Mailing=Elektron pochta xabarlari
+EMailing=Elektron pochta xabarlari
+EMailings=Elektron pochta xabarlari
+AllEMailings=Barcha elektron pochta xabarlari
+MailCard=Elektron pochta kartasi
+MailRecipients=Qabul qiluvchilar
+MailRecipient=Qabul qiluvchi
+MailTitle=Tavsif
+MailFrom=Yuboruvchi
+MailErrorsTo=Xatolar
+MailReply=Ga javob
+MailTo=Qabul qiluvchilar (lar)
 MailToUsers=To user(s)
-MailCC=Copy to
+MailCC=Nusxalash
 MailToCCUsers=Copy to users(s)
-MailCCC=Cached copy to
-MailTopic=Email subject
-MailText=Message
-MailFile=Attached files
-MailMessage=Email body
+MailCCC=Keshlangan nusxa
+MailTopic=Elektron pochta mavzusi
+MailText=Xabar
+MailFile=Biriktirilgan fayllar
+MailMessage=Elektron pochta qutisi
 SubjectNotIn=Not in Subject
 BodyNotIn=Not in Body
-ShowEMailing=Show emailing
-ListOfEMailings=List of emailings
-NewMailing=New emailing
-EditMailing=Edit emailing
-ResetMailing=Resend emailing
-DeleteMailing=Delete emailing
-DeleteAMailing=Delete an emailing
-PreviewMailing=Preview emailing
-CreateMailing=Create emailing
-TestMailing=Test email
-ValidMailing=Valid emailing
-MailingStatusDraft=Draft
-MailingStatusValidated=Validated
-MailingStatusSent=Sent
-MailingStatusSentPartialy=Sent partially
-MailingStatusSentCompletely=Sent completely
-MailingStatusError=Error
-MailingStatusNotSent=Not sent
-MailSuccessfulySent=Email (from %s to %s) successfully accepted for delivery
-MailingSuccessfullyValidated=EMailing successfully validated
-MailUnsubcribe=Unsubscribe
-MailingStatusNotContact=Don't contact anymore
-MailingStatusReadAndUnsubscribe=Read and unsubscribe
-ErrorMailRecipientIsEmpty=Email recipient is empty
-WarningNoEMailsAdded=No new Email to add to recipient's list.
-ConfirmValidMailing=Are you sure you want to validate this emailing?
-ConfirmResetMailing=Warning, by re-initializing emailing <b>%s</b>, you will allow the re-sending this email in a bulk mailing. Are you sure you want to do this?
-ConfirmDeleteMailing=Are you sure you want to delete this emailing?
-NbOfUniqueEMails=No. of unique emails
-NbOfEMails=No. of EMails
-TotalNbOfDistinctRecipients=Number of distinct recipients
-NoTargetYet=No recipients defined yet (Go on tab 'Recipients')
+ShowEMailing=Elektron pochta xabarlarini ko'rsatish
+ListOfEMailings=Elektron pochta xabarlari ro'yxati
+NewMailing=Yangi elektron pochta xabarlari
+EditMailing=Elektron pochta xabarlarini tahrirlash
+ResetMailing=Elektron pochta xabarlarini qayta yuboring
+DeleteMailing=Elektron pochta xabarlarini o'chirish
+DeleteAMailing=Elektron pochta xabarini o'chirib tashlang
+PreviewMailing=Elektron pochta xabarlarini oldindan ko'rish
+CreateMailing=Elektron pochta xabarlarini yarating
+TestMailing=Elektron pochtani sinab ko'ring
+ValidMailing=Yaroqli elektron pochta xabarlari
+MailingStatusDraft=Qoralama
+MailingStatusValidated=Tasdiqlangan
+MailingStatusSent=Yuborildi
+MailingStatusSentPartialy=Qisman yuborilgan
+MailingStatusSentCompletely=To'liq yuborildi
+MailingStatusError=Xato
+MailingStatusNotSent=Yuborilmadi
+MailSuccessfulySent=Elektron pochta (%s dan %s dan) etkazib berish uchun muvaffaqiyatli qabul qilindi
+MailingSuccessfullyValidated=Elektron pochta xabarlari tasdiqlandi
+MailUnsubcribe=Obunani bekor qilish
+MailingStatusNotContact=Boshqa aloqa qilmang
+MailingStatusReadAndUnsubscribe=O'qing va obunani bekor qiling
+ErrorMailRecipientIsEmpty=Elektron pochta qabul qiluvchisi bo'sh
+WarningNoEMailsAdded=Qabul qiluvchilar ro'yxatiga qo'shish uchun yangi elektron pochta xabarlari yo'q.
+ConfirmValidMailing=Ushbu elektron pochta xabarini tasdiqlamoqchimisiz?
+ConfirmResetMailing=Ogohlantirish, <b> %s </b> elektron pochtasini qayta boshlash orqali siz ushbu elektron pochtani ommaviy pochta orqali qayta yuborishga ruxsat berasiz. Haqiqatan ham buni qilishni xohlaysizmi?
+ConfirmDeleteMailing=Ushbu elektron pochta xabarini o'chirishni xohlaysizmi?
+NbOfUniqueEMails=Noyob elektron pochta xabarlari soni
+NbOfEMails=Elektron pochta xabarlari soni
+TotalNbOfDistinctRecipients=Alohida qabul qiluvchilar soni
+NoTargetYet=Qabul qiluvchilar aniqlanmagan ("Qabul qiluvchilar" yorlig'iga o'ting)
 NoRecipientEmail=No recipient email for %s
-RemoveRecipient=Remove recipient
-YouCanAddYourOwnPredefindedListHere=To create your email selector module, see htdocs/core/modules/mailings/README.
-EMailTestSubstitutionReplacedByGenericValues=When using test mode, substitutions variables are replaced by generic values
-MailingAddFile=Attach this file
-NoAttachedFiles=No attached files
-BadEMail=Bad value for Email
-ConfirmCloneEMailing=Are you sure you want to clone this emailing?
-CloneContent=Clone message
-CloneReceivers=Cloner recipients
-DateLastSend=Date of latest sending
-DateSending=Date sending
-SentTo=Sent to <b>%s</b>
-MailingStatusRead=Read
-YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubscribe from mailing list
-ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubscribe" feature
-EMailSentToNRecipients=Email sent to %s recipients.
-EMailSentForNElements=Email sent for %s elements.
-XTargetsAdded=<b>%s</b> recipients added into target list
-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 attachments in mass sending in this version).
-AllRecipientSelected=The recipients of the %s record selected (if their email is known).
+RemoveRecipient=Qabul qiluvchini olib tashlash
+YouCanAddYourOwnPredefindedListHere=Elektron pochta tanlov modulini yaratish uchun htdocs / core / modules / mailings / README-ga qarang.
+EMailTestSubstitutionReplacedByGenericValues=Sinov rejimidan foydalanganda almashtirish o'zgaruvchilari umumiy qiymatlar bilan almashtiriladi
+MailingAddFile=Ushbu faylni biriktiring
+NoAttachedFiles=Biriktirilgan fayllar yo'q
+BadEMail=Elektron pochta uchun yomon qiymat
+ConfirmCloneEMailing=Ushbu elektron pochtani klonlamoqchimisiz?
+CloneContent=Xabarni klonlash
+CloneReceivers=Kloner qabul qiluvchilar
+DateLastSend=Oxirgi yuborilgan sana
+DateSending=Yuborilgan sana
+SentTo=<b> %s </b> raqamiga yuborildi
+MailingStatusRead=O'qing
+YourMailUnsubcribeOK=<b> %s </b> elektron pochtasi pochta ro'yxatidan obunani bekor qildi
+ActivateCheckReadKey="O'qish kvitansiyasi" va "Obunani bekor qilish" xususiyati uchun ishlatiladigan URL-ni shifrlash uchun kalit
+EMailSentToNRecipients=%s oluvchilariga elektron pochta xabarlari yuborildi.
+EMailSentForNElements=%s elementlari uchun elektron pochta xabarlari yuborildi.
+XTargetsAdded= <b> %s </b> oluvchilar maqsadlar ro'yxatiga qo'shildi
+OnlyPDFattachmentSupported=Agar PDF hujjatlari ob'ektlarni yuborish uchun allaqachon yaratilgan bo'lsa, ular elektron pochtaga biriktiriladi. Agar bunday bo'lmasa, hech qanday elektron pochta xabarlari yuborilmaydi (shuningdek, ushbu versiyada faqat pdf hujjatlarni ommaviy yuborishda qo'shimcha sifatida qo'llab-quvvatlanishini unutmang).
+AllRecipientSelected=%s yozuvining oluvchilari tanlangan (agar ularning elektron pochtalari ma'lum bo'lsa).
 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.
-ResultOfMailSending=Result of mass Email sending
-NbSelected=Number selected
-NbIgnored=Number ignored
-NbSent=Number sent
+ResultOfMailSending=Ommaviy elektron pochta xabarlarini yuborish natijasi
+NbSelected=Raqam tanlandi
+NbIgnored=Raqam hisobga olinmadi
+NbSent=Raqam yuborildi
 SentXXXmessages=%s message(s) sent.
-ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
-MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
-MailingModuleDescContactsByCompanyCategory=Contacts by third-party category
-MailingModuleDescContactsByCategory=Contacts by categories
-MailingModuleDescContactsByFunction=Contacts by position
+ConfirmUnvalidateEmailing=<b> %s </b> elektron pochtasini qoralama holatiga o'zgartirishni xohlaysizmi?
+MailingModuleDescContactsWithThirdpartyFilter=Mijozlar filtrlari bilan bog'laning
+MailingModuleDescContactsByCompanyCategory=Uchinchi tomon toifalari bo'yicha aloqalar
+MailingModuleDescContactsByCategory=Kategoriyalar bo'yicha aloqalar
+MailingModuleDescContactsByFunction=Kontaktlar joylashuvi bo'yicha
 MailingModuleDescEmailsFromFile=Emails from file
 MailingModuleDescEmailsFromUser=Emails input by user
 MailingModuleDescDolibarrUsers=Users with Emails
@@ -95,77 +95,77 @@ SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
 EmailCollectorFilterDesc=All filters must match to have an email being collected
 
 # Libelle des modules de liste de destinataires mailing
-LineInFile=Line %s in file
-RecipientSelectionModules=Defined requests for recipient's selection
-MailSelectedRecipients=Selected recipients
-MailingArea=EMailings area
-LastMailings=Latest %s emailings
-TargetsStatistics=Targets statistics
-NbOfCompaniesContacts=Unique contacts/addresses
-MailNoChangePossible=Recipients for validated emailing can't be changed
-SearchAMailing=Search mailing
-SendMailing=Send emailing
-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.
-ConfirmSendingEmailing=If you want to send emailing directly from this screen, please confirm you are sure you want to send emailing now from your browser ?
-LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
-TargetsReset=Clear list
-ToClearAllRecipientsClickHere=Click here to clear the recipient list for this emailing
-ToAddRecipientsChooseHere=Add recipients by choosing from the lists
-NbOfEMailingsReceived=Mass emailings received
-NbOfEMailingsSend=Mass emailings sent
-IdRecord=ID record
-DeliveryReceipt=Delivery Ack.
-YouCanUseCommaSeparatorForSeveralRecipients=You can use the <b>comma</b> separator to specify several recipients.
-TagCheckMail=Track mail opening
-TagUnsubscribe=Unsubscribe link
-TagSignature=Signature of sending user
-EMailRecipient=Recipient Email
-TagMailtoEmail=Recipient Email (including html "mailto:" link)
-NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
+LineInFile=Faylda %s qatori
+RecipientSelectionModules=Qabul qiluvchilarni tanlash bo'yicha aniq talablar
+MailSelectedRecipients=Tanlangan qabul qiluvchilar
+MailingArea=Elektron pochta xabarlari maydoni
+LastMailings=Oxirgi %s elektron pochta xabarlari
+TargetsStatistics=Maqsadlar statistikasi
+NbOfCompaniesContacts=Noyob kontaktlar / manzillar
+MailNoChangePossible=Tasdiqlangan elektron pochta xabarlarini qabul qiluvchilarni o'zgartirish mumkin emas
+SearchAMailing=Pochta orqali qidirish
+SendMailing=Elektron pochta xabarlarini yuboring
+SentBy=Yubordi
+MailingNeedCommand=Elektron pochta xabarlarini yuborish buyruq satridan amalga oshirilishi mumkin. Elektron pochta xabarini barcha qabul qiluvchilarga yuborish uchun server administratoridan quyidagi buyruqni boshlashini so'rang:
+MailingNeedCommand2=Siz ularni MAILING_LIMIT_SENDBYWEB parametrini qo'shish orqali ularni onlayn ravishda yuborishingiz mumkin. Buning uchun Home - Setup - Other-ga o'ting.
+ConfirmSendingEmailing=Agar to'g'ridan-to'g'ri ushbu ekrandan elektron pochta xabarlarini yuborishni istasangiz, iltimos, brauzeringizdan elektron pochta xabarlarini yuborishni xohlaganingizga ishonch hosil qiling?
+LimitSendingEmailing=Eslatma: Veb-interfeysdan elektron pochta xabarlarini yuborish xavfsizlik va vaqt tugashi sababli bir necha marta amalga oshiriladi, <b> %s </b> oluvchilar har bir yuborish seansi uchun bir vaqtning o'zida.
+TargetsReset=Ro'yxatni tozalash
+ToClearAllRecipientsClickHere=Ushbu elektron pochta xabarlari uchun qabul qiluvchilar ro'yxatini tozalash uchun shu erni bosing
+ToAddRecipientsChooseHere=Ro'yxatlar orasidan tanlab oluvchilarni qo'shing
+NbOfEMailingsReceived=Ommaviy elektron pochta xabarlari qabul qilindi
+NbOfEMailingsSend=Ommaviy elektron pochta xabarlari yuborildi
+IdRecord=ID yozuvlari
+DeliveryReceipt=Yetkazib berish.
+YouCanUseCommaSeparatorForSeveralRecipients=Bir nechta qabul qiluvchilarni ko'rsatish uchun <b> vergul </b> ajratgichidan foydalanishingiz mumkin.
+TagCheckMail=Pochta ochilishini kuzatib boring
+TagUnsubscribe=Obunani bekor qilish
+TagSignature=Yuboruvchi foydalanuvchining imzosi
+EMailRecipient=Qabul qiluvchining elektron pochtasi
+TagMailtoEmail=Qabul qiluvchining elektron pochtasi (shu jumladan HTML "mailto:" havolasi)
+NoEmailSentBadSenderOrRecipientEmail=Elektron pochta xabarlari yuborilmadi. Yuboruvchi yoki qabul qiluvchi elektron pochtasi noto'g'ri. Foydalanuvchi profilini tasdiqlang.
 # Module Notifications
-Notifications=Notifications
+Notifications=Bildirishnomalar
 NotificationsAuto=Notifications Auto.
-NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
-ANotificationsWillBeSent=1 automatic notification will be sent by email
-SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
-AddNewNotification=Subscribe to a new automatic email notification (target/event)
-ListOfActiveNotifications=List of all active subscriptions (targets/events) for automatic email notification
-ListOfNotificationsDone=List of all automatic email notifications sent
-MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
+NoNotificationsWillBeSent=Ushbu tadbir turi va kompaniya uchun avtomatik elektron pochta xabarlari rejalashtirilmagan
+ANotificationsWillBeSent=1 ta avtomatik bildirishnoma elektron pochta orqali yuboriladi
+SomeNotificationsWillBeSent=%s avtomatik xabarnomalari elektron pochta orqali yuboriladi
+AddNewNotification=Yangi avtomatik elektron xabarnomaga obuna bo'ling (maqsad / voqea)
+ListOfActiveNotifications=Avtomatik elektron pochta orqali xabar berish uchun barcha faol obunalar ro'yxati (maqsadlar / hodisalar)
+ListOfNotificationsDone=Yuborilgan barcha avtomatik elektron xabarnomalar ro'yxati
+MailSendSetupIs=Elektron pochta xabarlarini jo'natish konfiguratsiyasi '%s' ga o'rnatildi. Ushbu rejimdan ommaviy elektron pochta xabarlarini yuborish uchun foydalanib bo'lmaydi.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
-MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
-YouCanAlsoUseSupervisorKeyword=You can also add the keyword <strong>__SUPERVISOREMAIL__</strong> to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
-NbOfTargetedContacts=Current number of targeted contact emails
-UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;firstname;other</strong>
-UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
-MailAdvTargetRecipients=Recipients (advanced selection)
-AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
-AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
-AdvTgtSearchIntHelp=Use interval to select int or float value
-AdvTgtMinVal=Minimum value
-AdvTgtMaxVal=Maximum value
-AdvTgtSearchDtHelp=Use interval to select date value
-AdvTgtStartDt=Start dt.
+MailSendSetupIs3=SMTP-serveringizni sozlash bo'yicha savollaringiz bo'lsa, %s ga murojaat qilishingiz mumkin.
+YouCanAlsoUseSupervisorKeyword=Shuningdek, foydalanuvchi rahbariga elektron pochta xabarlarini yuborish uchun <strong> __SUPERVISOREMAIL__ </strong> kalit so'zini qo'shishingiz mumkin (faqat ushbu nazoratchi uchun elektron pochta manzili belgilangan taqdirda ishlaydi)
+NbOfTargetedContacts=Maqsadli elektron pochta xabarlarining joriy soni
+UseFormatFileEmailToTarget=Import qilingan fayl <strong> formatidagi elektron pochta; ism; ism; boshqa </strong> formatiga ega bo'lishi kerak
+UseFormatInputEmailToTarget=<strong> formatidagi qatorni kiriting elektron pochta; ism; ism; boshqa </strong>
+MailAdvTargetRecipients=Qabul qiluvchilar (kengaytirilgan tanlov)
+AdvTgtTitle=Uchinchi tomonlarni yoki nishonga olish uchun kontaktlarni / manzillarni oldindan tanlash uchun kirish maydonlarini to'ldiring
+AdvTgtSearchTextHelp=%%-dan joker belgilar sifatida foydalaning. Masalan, <b> jean, joe, jim </b> kabi barcha elementlarni topish uchun <b> j%% </b> kabi narsalarni topishingiz mumkin, siz ham foydalanishingiz mumkin; qiymati uchun ajratuvchi sifatida va foydalaning! chunki bu qiymatdan tashqari. Masalan, <b> jean; joe; jim%%;! Jimo;! Jima%% </b> barcha jean, joe, jim bilan boshlanadi, lekin Jimo bilan boshlanadigan hamma narsa emas.
+AdvTgtSearchIntHelp=Int yoki float qiymatini tanlash uchun intervaldan foydalaning
+AdvTgtMinVal=Minimal qiymat
+AdvTgtMaxVal=Maksimal qiymat
+AdvTgtSearchDtHelp=Sana qiymatini tanlash uchun intervaldan foydalaning
+AdvTgtStartDt=Dt boshlash.
 AdvTgtEndDt=End dt.
-AdvTgtTypeOfIncudeHelp=Target Email of third party and email of contact of the third party, or just third-party email or just contact email
-AdvTgtTypeOfIncude=Type of targeted email
-AdvTgtContactHelp=Use only if you target contact into "Type of targeted email"
-AddAll=Add all
-RemoveAll=Remove all
-ItemsCount=Item(s)
-AdvTgtNameTemplate=Filter name
-AdvTgtAddContact=Add emails according to criteria
-AdvTgtLoadFilter=Load filter
-AdvTgtDeleteFilter=Delete filter
-AdvTgtSaveFilter=Save filter
-AdvTgtCreateFilter=Create filter
-AdvTgtOrCreateNewFilter=Name of new filter
-NoContactWithCategoryFound=No contact/address with a category found
-NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing emails
-InGoingEmailSetup=Incoming emails
+AdvTgtTypeOfIncudeHelp=Uchinchi tomonning elektron pochta manzili va uchinchi tomonning elektron pochta manzili, yoki faqat uchinchi tomon elektron pochtasi yoki shunchaki elektron pochta manzili
+AdvTgtTypeOfIncude=Maqsadli elektron pochta turi
+AdvTgtContactHelp=Kontaktni "Maqsadli elektron pochta turi" ga yo'naltirgan taqdirdagina foydalaning
+AddAll=Hammasini qo'shing
+RemoveAll=Barchasini olib tashlang
+ItemsCount=Mahsulot (lar)
+AdvTgtNameTemplate=Filtr nomi
+AdvTgtAddContact=Mezonlarga muvofiq elektron pochta xabarlarini qo'shing
+AdvTgtLoadFilter=Yuk filtri
+AdvTgtDeleteFilter=Filtrni o'chirish
+AdvTgtSaveFilter=Filtrni saqlash
+AdvTgtCreateFilter=Filtr yaratish
+AdvTgtOrCreateNewFilter=Yangi filtr nomi
+NoContactWithCategoryFound=Kategoriya bilan aloqa / manzil topilmadi
+NoContactLinkedToThirdpartieWithCategoryFound=Kategoriya bilan aloqa / manzil topilmadi
+OutGoingEmailSetup=Chiquvchi elektron pochta xabarlari
+InGoingEmailSetup=Kiruvchi elektron pochta xabarlari
 OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
 DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=Information
diff --git a/htdocs/langs/uz_UZ/main.lang b/htdocs/langs/uz_UZ/main.lang
index e9441bb392e..f241d33aa61 100644
--- a/htdocs/langs/uz_UZ/main.lang
+++ b/htdocs/langs/uz_UZ/main.lang
@@ -14,7 +14,7 @@ FormatDateShortJava=dd.MM.yyyy
 FormatDateShortJavaInput=dd.MM.yyyy
 FormatDateShortJQuery=dd.mm.yy
 FormatDateShortJQueryInput=dd.mm.yy
-FormatHourShortJQuery=HH:MI
+FormatHourShortJQuery=HH: MI
 FormatHourShort=%H:%M
 FormatHourShortDuration=%H:%M
 FormatDateTextShort=%d %b %Y
@@ -23,324 +23,324 @@ FormatDateHourShort=%d.%m.%Y %H:%M
 FormatDateHourSecShort=%d.%m.%Y %H:%M:%S
 FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
-DatabaseConnection=Database connection
-NoTemplateDefined=No template available for this email type
-AvailableVariables=Available substitution variables
-NoTranslation=No translation
+DatabaseConnection=Ma'lumotlar bazasiga ulanish
+NoTemplateDefined=Ushbu elektron pochta turi uchun shablon mavjud emas
+AvailableVariables=Mavjud almashtirish o'zgaruvchilari
+NoTranslation=Tarjima yo'q
 Translation=Translation
 CurrentTimeZone=TimeZone PHP (server)
 EmptySearchString=Enter non empty search criterias
 EnterADateCriteria=Enter a date criteria
-NoRecordFound=No record found
-NoRecordDeleted=No record deleted
-NotEnoughDataYet=Not enough data
-NoError=No error
-Error=Error
-Errors=Errors
-ErrorFieldRequired=Field '%s' is required
-ErrorFieldFormat=Field '%s' has a bad value
-ErrorFileDoesNotExists=File %s does not exist
-ErrorFailedToOpenFile=Failed to open file %s
-ErrorCanNotCreateDir=Cannot create dir %s
-ErrorCanNotReadDir=Cannot read dir %s
-ErrorConstantNotDefined=Parameter %s not defined
-ErrorUnknown=Unknown error
-ErrorSQL=SQL Error
-ErrorLogoFileNotFound=Logo file '%s' was not found
-ErrorGoToGlobalSetup=Go to 'Company/Organization' setup to fix this
-ErrorGoToModuleSetup=Go to Module setup to fix this
-ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s)
-ErrorFileNotUploaded=File was not uploaded. Check that size does not exceed maximum allowed, that free space is available on disk and that there is not already a file with same name in this directory.
-ErrorInternalErrorDetected=Error detected
-ErrorWrongHostParameter=Wrong host parameter
-ErrorYourCountryIsNotDefined=Your country is not defined. Go to Home-Setup-Edit and post the form again.
-ErrorRecordIsUsedByChild=Failed to delete this record. This record is used by at least one child record.
-ErrorWrongValue=Wrong value
-ErrorWrongValueForParameterX=Wrong value for parameter %s
-ErrorNoRequestInError=No request in error
-ErrorServiceUnavailableTryLater=Service not available at the moment. Try again later.
-ErrorDuplicateField=Duplicate value in a unique field
-ErrorSomeErrorWereFoundRollbackIsDone=Some errors were found. Changes have been rolled back.
-ErrorConfigParameterNotDefined=Parameter <b>%s</b> is not defined in the Dolibarr config file <b>conf.php</b>.
-ErrorCantLoadUserFromDolibarrDatabase=Failed to find user <b>%s</b> in Dolibarr database.
-ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%s'.
-ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
-ErrorFailedToSaveFile=Error, failed to save file.
-ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of a existing warehouse
-MaxNbOfRecordPerPage=Max. number of records per page
-NotAuthorized=You are not authorized to do that.
-SetDate=Set date
-SelectDate=Select a date
-SeeAlso=See also %s
-SeeHere=See here
-ClickHere=Click here
+NoRecordFound=Hech qanday yozuv topilmadi
+NoRecordDeleted=Hech qanday yozuv o'chirilmagan
+NotEnoughDataYet=Ma'lumot etarli emas
+NoError=Xato yo'q
+Error=Xato
+Errors=Xatolar
+ErrorFieldRequired='%s' maydoni kerak
+ErrorFieldFormat='%s' maydonining qiymati yomon
+ErrorFileDoesNotExists=%s fayli mavjud emas
+ErrorFailedToOpenFile=%s faylini ochib bo'lmadi
+ErrorCanNotCreateDir=Dir %s yaratib bo'lmadi
+ErrorCanNotReadDir=Dir %s o'qib bo'lmadi
+ErrorConstantNotDefined=Parametr %s aniqlanmagan
+ErrorUnknown=Noma'lum xato
+ErrorSQL=SQL xatosi
+ErrorLogoFileNotFound=Logotip fayli '%s' topilmadi
+ErrorGoToGlobalSetup=Buni tuzatish uchun "Kompaniya / tashkilot" sozlamalariga o'ting
+ErrorGoToModuleSetup=Buni tuzatish uchun Modulni sozlashga o'ting
+ErrorFailedToSendMail=Pochta yuborilmadi (jo'natuvchi = %s, qabul qiluvchi = %s)
+ErrorFileNotUploaded=Fayl yuklanmadi. Hajmi ruxsat etilgan maksimal qiymatdan oshmaganligini, diskda bo'sh joy mavjudligini va ushbu katalogda bir xil nomdagi fayl mavjud emasligini tekshiring.
+ErrorInternalErrorDetected=Xato aniqlandi
+ErrorWrongHostParameter=Xost parametri noto'g'ri
+ErrorYourCountryIsNotDefined=Sizning mamlakatingiz aniqlanmagan. Home-Setup-Edit-ga o'ting va formani qayta joylashtiring.
+ErrorRecordIsUsedByChild=Ushbu yozuv o'chirilmadi. Ushbu yozuvdan kamida bitta bolalar yozuvlari foydalanadi.
+ErrorWrongValue=Noto'g'ri qiymat
+ErrorWrongValueForParameterX=%s parametri uchun noto'g'ri qiymat
+ErrorNoRequestInError=Xatolik yo'q
+ErrorServiceUnavailableTryLater=Ayni paytda xizmat mavjud emas. Keyinroq qayta urinib ko'ring.
+ErrorDuplicateField=Noyob maydonda takroriy qiymat
+ErrorSomeErrorWereFoundRollbackIsDone=Ba'zi xatolar topildi. O'zgarishlar orqaga qaytarildi.
+ErrorConfigParameterNotDefined=<b> %s </b> parametri <b> conf.php </b> konfiguratsiya faylida aniqlanmagan.
+ErrorCantLoadUserFromDolibarrDatabase=Dolibarr ma'lumotlar bazasida <b> %s </b> foydalanuvchisi topilmadi.
+ErrorNoVATRateDefinedForSellerCountry=Xato, '%s' mamlakati uchun QQS stavkalari aniqlanmagan.
+ErrorNoSocialContributionForSellerCountry=Xato, '%s' mamlakati uchun ijtimoiy / soliq soliqlari turi aniqlanmagan.
+ErrorFailedToSaveFile=Xato, faylni saqlab bo'lmadi.
+ErrorCannotAddThisParentWarehouse=Siz allaqachon mavjud bo'lgan omborning farzandi bo'lgan ota-ona omborini qo'shishga harakat qilyapsiz
+MaxNbOfRecordPerPage=Maks. bir varaqdagi yozuvlar soni
+NotAuthorized=Buning uchun sizning vakolatingiz yo'q.
+SetDate=Sana belgilang
+SelectDate=Sana tanlang
+SeeAlso=Shuningdek qarang: %s
+SeeHere=Bu erga qarang
+ClickHere=bu yerni bosing
 Here=Here
-Apply=Apply
-BackgroundColorByDefault=Default background color
-FileRenamed=The file was successfully renamed
-FileGenerated=The file was successfully generated
+Apply=Qo'llash
+BackgroundColorByDefault=Standart fon rangi
+FileRenamed=Fayl qayta nomlandi
+FileGenerated=Fayl muvaffaqiyatli yaratildi
 FileSaved=The file was successfully saved
-FileUploaded=The file was successfully uploaded
-FileTransferComplete=File(s) uploaded successfully
+FileUploaded=Fayl yuklandi
+FileTransferComplete=Fayl (lar) muvaffaqiyatli yuklandi
 FilesDeleted=File(s) successfully deleted
-FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this.
-NbOfEntries=No. of entries
-GoToWikiHelpPage=Read online help (Internet access needed)
-GoToHelpPage=Read help
+FileWasNotUploaded=Fayl biriktirish uchun tanlangan, ammo hali yuklanmagan. Buning uchun "Faylni biriktirish" tugmasini bosing.
+NbOfEntries=Yozuvlar soni
+GoToWikiHelpPage=Onlayn yordamni o'qing (Internetga kirish kerak)
+GoToHelpPage=Yordamni o'qing
 DedicatedPageAvailable=There is a dedicated help page related to your current screen
 HomePage=Home Page
-RecordSaved=Record saved
-RecordDeleted=Record deleted
+RecordSaved=Yozuv saqlandi
+RecordDeleted=Yozuv o'chirildi
 RecordGenerated=Record generated
-LevelOfFeature=Level of features
-NotDefined=Not defined
-DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is set to <b>%s</b> in configuration file <b>conf.php</b>.<br>This means that the password database is external to Dolibarr, so changing this field may have no effect.
-Administrator=Administrator
-Undefined=Undefined
-PasswordForgotten=Password forgotten?
+LevelOfFeature=Xususiyatlar darajasi
+NotDefined=Belgilanmagan
+DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr autentifikatsiya qilish rejimi <b> conf.php </b> konfiguratsiya faylida <b> %s </b> ga o'rnatildi. <br> bu shuni anglatadiki, parol ma'lumotlar bazasi Dolibarr uchun tashqi, shuning uchun bu maydonni o'zgartirish hech qanday ta'sir ko'rsatmasligi mumkin.
+Administrator=Ma'mur
+Undefined=Aniqlanmagan
+PasswordForgotten=Parol unutdingizmi?
 NoAccount=No account?
-SeeAbove=See above
-HomeArea=Home
-LastConnexion=Last login
-PreviousConnexion=Previous login
-PreviousValue=Previous value
-ConnectedOnMultiCompany=Connected on environment
-ConnectedSince=Connected since
-AuthenticationMode=Authentication mode
-RequestedUrl=Requested URL
-DatabaseTypeManager=Database type manager
-RequestLastAccessInError=Latest database access request error
-ReturnCodeLastAccessInError=Return code for latest database access request error
-InformationLastAccessInError=Information for latest database access request error
-DolibarrHasDetectedError=Dolibarr has detected a technical error
+SeeAbove=Yuqoriga qarang
+HomeArea=Uy
+LastConnexion=Oxirgi kirish
+PreviousConnexion=Oldingi kirish
+PreviousValue=Oldingi qiymat
+ConnectedOnMultiCompany=Atrof muhitga ulangan
+ConnectedSince=Beri ulangan
+AuthenticationMode=Autentifikatsiya rejimi
+RequestedUrl=So‘ralgan URL
+DatabaseTypeManager=Ma'lumotlar bazasi turi menejeri
+RequestLastAccessInError=Ma'lumotlar bazasiga kirish uchun so'nggi so'rov xatosi
+ReturnCodeLastAccessInError=So'nggi ma'lumotlar bazasiga kirish uchun so'rov xatosi uchun qaytarish kodi
+InformationLastAccessInError=So'nggi ma'lumotlar bazasiga kirish so'rovining xatosi haqida ma'lumot
+DolibarrHasDetectedError=Dolibarr texnik xatolikni aniqladi
 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)
-MoreInformation=More information
-TechnicalInformation=Technical information
-TechnicalID=Technical ID
+InformationToHelpDiagnose=Ushbu ma'lumot diagnostika maqsadida foydali bo'lishi mumkin (bunday xabarnomalarni olib tashlash uchun $ dolibarr_main_prod parametrini '1' ga o'rnatishingiz mumkin)
+MoreInformation=Qo'shimcha ma'lumot
+TechnicalInformation=Texnik ma'lumotlar
+TechnicalID=Texnik guvohnoma
 LineID=Line ID
-NotePublic=Note (public)
-NotePrivate=Note (private)
-PrecisionUnitIsLimitedToXDecimals=Dolibarr was setup to limit precision of unit prices to <b>%s</b> decimals.
-DoTest=Test
-ToFilter=Filter
-NoFilter=No filter
-WarningYouHaveAtLeastOneTaskLate=Warning, you have at least one element that has exceeded the tolerance time.
-yes=yes
-Yes=Yes
-no=no
-No=No
-All=All
-Home=Home
-Help=Help
-OnlineHelp=Online help
-PageWiki=Wiki page
-MediaBrowser=Media browser
-Always=Always
-Never=Never
-Under=under
-Period=Period
-PeriodEndDate=End date for period
+NotePublic=Izoh (ommaviy)
+NotePrivate=Izoh (xususiy)
+PrecisionUnitIsLimitedToXDecimals=Dolibarr birlik narxlarining aniqligini <b> %s </b> o'nliklariga cheklash uchun o'rnatildi.
+DoTest=Sinov
+ToFilter=Filtr
+NoFilter=Filtr yo‘q
+WarningYouHaveAtLeastOneTaskLate=Ogohlantirish, sizda tolerantlik vaqtidan oshib ketgan kamida bitta element mavjud.
+yes=ha
+Yes=Ha
+no=yo'q
+No=Yo'q
+All=Hammasi
+Home=Uy
+Help=Yordam bering
+OnlineHelp=Onlayn yordam
+PageWiki=Wiki sahifasi
+MediaBrowser=Media-brauzer
+Always=Har doim
+Never=Hech qachon
+Under=ostida
+Period=Davr
+PeriodEndDate=Davr uchun tugash sanasi
 SelectedPeriod=Selected period
 PreviousPeriod=Previous period
-Activate=Activate
-Activated=Activated
-Closed=Closed
-Closed2=Closed
-NotClosed=Not closed
-Enabled=Enabled
+Activate=Faollashtirish
+Activated=Faollashtirildi
+Closed=Yopiq
+Closed2=Yopiq
+NotClosed=Yopiq emas
+Enabled=Yoqilgan
 Enable=Enable
-Deprecated=Deprecated
-Disable=Disable
-Disabled=Disabled
-Add=Add
-AddLink=Add link
-RemoveLink=Remove link
-AddToDraft=Add to draft
-Update=Update
-Close=Close
+Deprecated=Eskirgan
+Disable=O'chirish
+Disabled=Nogiron
+Add=Qo'shish
+AddLink=Havolani qo'shish
+RemoveLink=Havolani olib tashlash
+AddToDraft=Qoralamaga qo'shing
+Update=Yangilash
+Close=Yoping
 CloseAs=Set status to
-CloseBox=Remove widget from your dashboard
-Confirm=Confirm
-ConfirmSendCardByMail=Do you really want to send the content of this card by mail to <b>%s</b>?
-Delete=Delete
-Remove=Remove
-Resiliate=Terminate
-Cancel=Cancel
-Modify=Modify
-Edit=Edit
-Validate=Validate
-ValidateAndApprove=Validate and Approve
-ToValidate=To validate
+CloseBox=Vidjetni boshqaruv panelidan olib tashlang
+Confirm=Tasdiqlang
+ConfirmSendCardByMail=Siz haqiqatan ham ushbu karta tarkibini <b> %s </b> manziliga pochta orqali yuborishni xohlaysizmi?
+Delete=O'chirish
+Remove=Olib tashlash
+Resiliate=Tugatish
+Cancel=Bekor qilish
+Modify=O'zgartirish
+Edit=Tahrirlash
+Validate=Tasdiqlash
+ValidateAndApprove=Tasdiqlang va tasdiqlang
+ToValidate=Tasdiqlash uchun
 NotValidated=Not validated
-Save=Save
-SaveAs=Save As
+Save=Saqlash
+SaveAs=Saqlash
 SaveAndStay=Save and stay
 SaveAndNew=Save and new
-TestConnection=Test connection
-ToClone=Clone
+TestConnection=Sinov aloqasi
+ToClone=Klon
 ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
-ConfirmClone=Choose the data you want to clone:
-NoCloneOptionsSpecified=No data to clone defined.
-Of=of
-Go=Go
-Run=Run
-CopyOf=Copy of
-Show=Show
-Hide=Hide
-ShowCardHere=Show card
-Search=Search
-SearchOf=Search
+ConfirmClone=Klonlash uchun kerakli ma'lumotlarni tanlang:
+NoCloneOptionsSpecified=Klonlash uchun ma'lumot yo'q.
+Of=ning
+Go=Boring
+Run=Yugurish
+CopyOf=Nusxasi
+Show=Ko'rsatish
+Hide=Yashirish
+ShowCardHere=Kartani ko'rsatish
+Search=Qidirmoq
+SearchOf=Qidirmoq
 SearchMenuShortCut=Ctrl + shift + f
 QuickAdd=Quick add
 QuickAddMenuShortCut=Ctrl + shift + l
-Valid=Valid
-Approve=Approve
-Disapprove=Disapprove
-ReOpen=Re-Open
-Upload=Upload
-ToLink=Link
-Select=Select
+Valid=Yaroqli
+Approve=Tasdiqlash
+Disapprove=Tasdiqlamayman
+ReOpen=Qayta oching
+Upload=Yuklash
+ToLink=Havola
+Select=Tanlang
 SelectAll=Select all
-Choose=Choose
-Resize=Resize
+Choose=Tanlang
+Resize=O'lchamini o'zgartirish
 ResizeOrCrop=Resize or Crop
-Recenter=Recenter
-Author=Author
-User=User
-Users=Users
-Group=Group
-Groups=Groups
-NoUserGroupDefined=No user group defined
-Password=Password
-PasswordRetype=Retype your password
-NoteSomeFeaturesAreDisabled=Note that a lot of features/modules are disabled in this demonstration.
-Name=Name
+Recenter=Keyingi
+Author=Muallif
+User=Foydalanuvchi
+Users=Foydalanuvchilar
+Group=Guruh
+Groups=Guruhlar
+NoUserGroupDefined=Hech qanday foydalanuvchi guruhi aniqlanmagan
+Password=Parol
+PasswordRetype=Parolingizni qayta kiriting
+NoteSomeFeaturesAreDisabled=Ushbu namoyishda ko'plab funktsiyalar / modullar o'chirilganligini unutmang.
+Name=Ism
 NameSlashCompany=Name / Company
-Person=Person
-Parameter=Parameter
-Parameters=Parameters
-Value=Value
-PersonalValue=Personal value
+Person=Shaxs
+Parameter=Parametr
+Parameters=Parametrlar
+Value=Qiymat
+PersonalValue=Shaxsiy qiymat
 NewObject=New %s
-NewValue=New value
+NewValue=Yangi qiymat
 OldValue=Old value %s
-CurrentValue=Current value
-Code=Code
-Type=Type
-Language=Language
-MultiLanguage=Multi-language
-Note=Note
-Title=Title
-Label=Label
-RefOrLabel=Ref. or label
-Info=Log
-Family=Family
-Description=Description
-Designation=Description
+CurrentValue=Joriy qiymat
+Code=Kod
+Type=Turi
+Language=Til
+MultiLanguage=Ko'p tilli
+Note=Eslatma
+Title=Sarlavha
+Label=Yorliq
+RefOrLabel=Ref. yoki yorliq
+Info=Kirish
+Family=Oila
+Description=Tavsif
+Designation=Tavsif
 DescriptionOfLine=Description of line
 DateOfLine=Date of line
 DurationOfLine=Duration of line
-Model=Doc template
-DefaultModel=Default doc template
-Action=Event
-About=About
-Number=Number
-NumberByMonth=Total reports by month
-AmountByMonth=Amount by month
-Numero=Number
-Limit=Limit
-Limits=Limits
-Logout=Logout
-NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
-Connection=Login
-Setup=Setup
-Alert=Alert
+Model=Hujjat shabloni
+DefaultModel=Standart hujjat shabloni
+Action=Tadbir
+About=Haqida
+Number=Raqam
+NumberByMonth=Jami hisobotlar oylar bo'yicha
+AmountByMonth=Oyga miqdori
+Numero=Raqam
+Limit=Cheklov
+Limits=Cheklovlar
+Logout=Chiqish
+NoLogoutProcessWithAuthMode=<b> %s </b> autentifikatsiya qilish rejimida qo'llaniladigan o'chirish xususiyati yo'q
+Connection=Kirish
+Setup=Sozlash; o'rnatish
+Alert=Ogohlantirish
 MenuWarnings=Alerts
-Previous=Previous
-Next=Next
-Cards=Cards
-Card=Card
-Now=Now
-HourStart=Start hour
+Previous=Oldingi
+Next=Keyingi
+Cards=Kartalar
+Card=Karta
+Now=Endi
+HourStart=Boshlanish soati
 Deadline=Deadline
 Date=Date
-DateAndHour=Date and hour
-DateToday=Today's date
-DateReference=Reference date
-DateStart=Start date
-DateEnd=End date
-DateCreation=Creation date
-DateCreationShort=Creat. date
+DateAndHour=Sana va soat
+DateToday=Bugungi sana
+DateReference=Malumot sanasi
+DateStart=Boshlanish vaqti
+DateEnd=Tugash sanasi
+DateCreation=Yaratilish sanasi
+DateCreationShort=Yaratuvchi. sana
 IPCreation=Creation IP
-DateModification=Modification date
-DateModificationShort=Modif. date
+DateModification=O'zgartirish sanasi
+DateModificationShort=Modif. sana
 IPModification=Modification IP
-DateLastModification=Latest modification date
-DateValidation=Validation date
+DateLastModification=Oxirgi o'zgartirish sanasi
+DateValidation=Tasdiqlash sanasi
 DateSigning=Signing date
-DateClosing=Closing date
-DateDue=Due date
-DateValue=Value date
-DateValueShort=Value date
-DateOperation=Operation date
-DateOperationShort=Oper. Date
-DateLimit=Limit date
-DateRequest=Request date
-DateProcess=Process date
-DateBuild=Report build date
-DatePayment=Date of payment
-DateApprove=Approving date
-DateApprove2=Approving date (second approval)
+DateClosing=Tugatish sanasi
+DateDue=Muddati
+DateValue=Qiymat sanasi
+DateValueShort=Qiymat sanasi
+DateOperation=Ishlash sanasi
+DateOperationShort=Operatsiya. Sana
+DateLimit=Cheklov sanasi
+DateRequest=Talab qilingan sana
+DateProcess=Jarayon sanasi
+DateBuild=Hisobotni tuzish sanasi
+DatePayment=To'lov sanasi
+DateApprove=Tasdiqlangan sana
+DateApprove2=Tasdiqlangan sana (ikkinchi tasdiqlash)
 RegistrationDate=Registration date
-UserCreation=Creation user
-UserModification=Modification user
+UserCreation=Yaratilish foydalanuvchisi
+UserModification=O'zgartirish foydalanuvchisi
 UserValidation=Validation user
-UserCreationShort=Creat. user
-UserModificationShort=Modif. user
+UserCreationShort=Yaratuvchi. foydalanuvchi
+UserModificationShort=Modif. foydalanuvchi
 UserValidationShort=Valid. user
-DurationYear=year
-DurationMonth=month
-DurationWeek=week
-DurationDay=day
-DurationYears=years
-DurationMonths=months
-DurationWeeks=weeks
-DurationDays=days
-Year=Year
-Month=Month
-Week=Week
-WeekShort=Week
-Day=Day
-Hour=Hour
-Minute=Minute
-Second=Second
-Years=Years
-Months=Months
-Days=Days
-days=days
-Hours=Hours
-Minutes=Minutes
-Seconds=Seconds
-Weeks=Weeks
-Today=Today
-Yesterday=Yesterday
-Tomorrow=Tomorrow
-Morning=Morning
-Afternoon=Afternoon
+DurationYear=yil
+DurationMonth=oy
+DurationWeek=hafta
+DurationDay=kun
+DurationYears=yil
+DurationMonths=oylar
+DurationWeeks=hafta
+DurationDays=kunlar
+Year=Yil
+Month=Oy
+Week=Hafta
+WeekShort=Hafta
+Day=Kun
+Hour=Soat
+Minute=Daqiqa
+Second=Ikkinchi
+Years=Yillar
+Months=Oylar
+Days=Kunlar
+days=kunlar
+Hours=Soatlar
+Minutes=Daqiqalar
+Seconds=Soniyalar
+Weeks=Haftalar
+Today=Bugun
+Yesterday=Kecha
+Tomorrow=Ertaga
+Morning=Tong
+Afternoon=Peshindan keyin
 Quadri=Quadri
-MonthOfDay=Month of the day
+MonthOfDay=Kunning oyi
 DaysOfWeek=Days of week
 HourShort=H
 MinuteShort=mn
-Rate=Rate
-CurrencyRate=Currency conversion rate
-UseLocalTax=Include tax
-Bytes=Bytes
-KiloBytes=Kilobytes
-MegaBytes=Megabytes
-GigaBytes=Gigabytes
-TeraBytes=Terabytes
+Rate=Tezlik
+CurrencyRate=Valyutani konvertatsiya qilish darajasi
+UseLocalTax=Soliqni kiriting
+Bytes=Bayt
+KiloBytes=Kilobayt
+MegaBytes=Megabayt
+GigaBytes=Gigabayt
+TeraBytes=Terabayt
 UserAuthor=Ceated by
 UserModif=Updated by
 b=b.
@@ -348,77 +348,77 @@ Kb=Kb
 Mb=Mb
 Gb=Gb
 Tb=Tb
-Cut=Cut
-Copy=Copy
-Paste=Paste
-Default=Default
-DefaultValue=Default value
+Cut=Kesilgan
+Copy=Nusxalash
+Paste=Yapıştır
+Default=Odatiy
+DefaultValue=Standart qiymat
 DefaultValues=Default values/filters/sorting
-Price=Price
+Price=Narx
 PriceCurrency=Price (currency)
-UnitPrice=Unit price
-UnitPriceHT=Unit price (excl.)
+UnitPrice=Donasining narxi
+UnitPriceHT=Birlik narxi (bundan mustasno)
 UnitPriceHTCurrency=Unit price (excl.) (currency)
-UnitPriceTTC=Unit price
+UnitPriceTTC=Donasining narxi
 PriceU=U.P.
-PriceUHT=U.P. (net)
-PriceUHTCurrency=U.P (net) (currency)
-PriceUTTC=U.P. (inc. tax)
-Amount=Amount
-AmountInvoice=Invoice amount
+PriceUHT=U.P. (aniq)
+PriceUHTCurrency=U.P (aniq) (valyuta)
+PriceUTTC=U.P. (soliq bilan birga)
+Amount=Miqdor
+AmountInvoice=Hisob-faktura miqdori
 AmountInvoiced=Amount invoiced
 AmountInvoicedHT=Amount invoiced (excl. tax)
 AmountInvoicedTTC=Amount invoiced (inc. tax)
-AmountPayment=Payment amount
-AmountHTShort=Amount (excl.)
-AmountTTCShort=Amount (inc. tax)
-AmountHT=Amount (excl. tax)
-AmountTTC=Amount (inc. tax)
-AmountVAT=Amount tax
-MulticurrencyAlreadyPaid=Already paid, original currency
-MulticurrencyRemainderToPay=Remain to pay, original currency
-MulticurrencyPaymentAmount=Payment amount, original currency
-MulticurrencyAmountHT=Amount (excl. tax), original currency
-MulticurrencyAmountTTC=Amount (inc. of tax), original currency
-MulticurrencyAmountVAT=Amount tax, original currency
+AmountPayment=To'lov miqdori
+AmountHTShort=Miqdor (bundan mustasno)
+AmountTTCShort=Miqdor (soliq bilan birga)
+AmountHT=Miqdor (soliqdan tashqari)
+AmountTTC=Miqdor (soliq bilan birga)
+AmountVAT=Miqdor solig'i
+MulticurrencyAlreadyPaid=Allaqachon to'langan, asl valyuta
+MulticurrencyRemainderToPay=To'lovda qoling, asl valyuta
+MulticurrencyPaymentAmount=To'lov miqdori, asl valyuta
+MulticurrencyAmountHT=Miqdor (soliqdan tashqari), asl valyuta
+MulticurrencyAmountTTC=Miqdor (soliq inc.), Asl valyuta
+MulticurrencyAmountVAT=Miqdor solig'i, asl valyuta
 MulticurrencySubPrice=Amount sub price multi currency
-AmountLT1=Amount tax 2
-AmountLT2=Amount tax 3
-AmountLT1ES=Amount RE
-AmountLT2ES=Amount IRPF
-AmountTotal=Total amount
-AmountAverage=Average amount
-PriceQtyMinHT=Price quantity min. (excl. tax)
+AmountLT1=Miqdor solig'i 2
+AmountLT2=Miqdor solig'i 3
+AmountLT1ES=RE miqdori
+AmountLT2ES=IRPF miqdori
+AmountTotal=Umumiy hisob
+AmountAverage=O'rtacha miqdor
+PriceQtyMinHT=Narx miqdori min. (soliqdan tashqari)
 PriceQtyMinHTCurrency=Price quantity min. (excl. tax) (currency)
 PercentOfOriginalObject=Percent of original object
 AmountOrPercent=Amount or percent
-Percentage=Percentage
-Total=Total
-SubTotal=Subtotal
-TotalHTShort=Total (excl.)
+Percentage=Foiz
+Total=Jami
+SubTotal=Jami
+TotalHTShort=Jami (bundan mustasno)
 TotalHT100Short=Total 100%% (excl.)
-TotalHTShortCurrency=Total (excl. in currency)
-TotalTTCShort=Total (inc. tax)
-TotalHT=Total (excl. tax)
-TotalHTforthispage=Total (excl. tax) for this page
-Totalforthispage=Total for this page
-TotalTTC=Total (inc. tax)
-TotalTTCToYourCredit=Total (inc. tax) to your credit
-TotalVAT=Total tax
+TotalHTShortCurrency=Jami (valyutadan tashqari)
+TotalTTCShort=Jami (soliq bilan birga)
+TotalHT=Jami (soliqdan tashqari)
+TotalHTforthispage=Ushbu sahifa uchun jami (soliqdan tashqari)
+Totalforthispage=Ushbu sahifa uchun jami
+TotalTTC=Jami (soliq bilan birga)
+TotalTTCToYourCredit=Sizning kreditingiz uchun jami (soliq)
+TotalVAT=Jami soliq
 TotalVATIN=Total IGST
-TotalLT1=Total tax 2
-TotalLT2=Total tax 3
-TotalLT1ES=Total RE
-TotalLT2ES=Total IRPF
+TotalLT1=Jami soliq 2
+TotalLT2=Jami soliq 3
+TotalLT1ES=Jami RE
+TotalLT2ES=Jami IRPF
 TotalLT1IN=Total CGST
 TotalLT2IN=Total SGST
-HT=Excl. tax
-TTC=Inc. tax
+HT=Istisno. soliq
+TTC=Inc soliq
 INCVATONLY=Inc. VAT
 INCT=Inc. all taxes
-VAT=Sales tax
+VAT=Savdo solig'i
 VATIN=IGST
-VATs=Sales taxes
+VATs=Savdo soliqlari
 VATINs=IGST taxes
 LT1=Sales tax 2
 LT1Type=Sales tax 2 type
@@ -429,178 +429,179 @@ LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
 LT1GC=Additionnal cents
-VATRate=Tax Rate
+VATRate=Soliq stavkasi
+RateOfTaxN=Rate of tax %s
 VATCode=Tax Rate code
 VATNPR=Tax Rate NPR
 DefaultTaxRate=Default tax rate
-Average=Average
-Sum=Sum
+Average=O'rtacha
+Sum=Jami
 Delta=Delta
 StatusToPay=To pay
 RemainToPay=Remain to pay
-Module=Module/Application
+Module=Modul / dastur
 Modules=Modules/Applications
-Option=Option
+Option=Variant
 Filters=Filters
-List=List
-FullList=Full list
+List=Ro'yxat
+FullList=To'liq ro'yxat
 FullConversation=Full conversation
-Statistics=Statistics
-OtherStatistics=Other statistics
-Status=Status
-Favorite=Favorite
-ShortInfo=Info.
+Statistics=Statistika
+OtherStatistics=Boshqa statistika
+Status=Holat
+Favorite=Sevimli
+ShortInfo=Ma'lumot.
 Ref=Ref.
-ExternalRef=Ref. extern
-RefSupplier=Ref. vendor
-RefPayment=Ref. payment
-CommercialProposalsShort=Commercial proposals
-Comment=Comment
-Comments=Comments
-ActionsToDo=Events to do
-ActionsToDoShort=To do
-ActionsDoneShort=Done
-ActionNotApplicable=Not applicable
-ActionRunningNotStarted=To start
-ActionRunningShort=In progress
-ActionDoneShort=Finished
-ActionUncomplete=Incomplete
+ExternalRef=Ref. tashqi
+RefSupplier=Ref. sotuvchi
+RefPayment=Ref. to'lov
+CommercialProposalsShort=Tijorat takliflari
+Comment=Izoh
+Comments=Izohlar
+ActionsToDo=Amalga oshiriladigan tadbirlar
+ActionsToDoShort=Qilmoq
+ActionsDoneShort=Bajarildi
+ActionNotApplicable=Qo'llanilmaydigan, qo'llab bo'lmaydigan
+ActionRunningNotStarted=Boshlamoq
+ActionRunningShort=Jarayonda
+ActionDoneShort=Tugadi
+ActionUncomplete=Tugallanmagan
 LatestLinkedEvents=Latest %s linked events
-CompanyFoundation=Company/Organization
+CompanyFoundation=Kompaniya / tashkilot
 Accountant=Accountant
-ContactsForCompany=Contacts for this third party
-ContactsAddressesForCompany=Contacts/addresses for this third party
-AddressesForCompany=Addresses for this third party
-ActionsOnCompany=Events for this third party
+ContactsForCompany=Ushbu uchinchi tomon uchun aloqalar
+ContactsAddressesForCompany=Ushbu uchinchi tomon uchun aloqa / manzillar
+AddressesForCompany=Ushbu uchinchi tomon uchun manzillar
+ActionsOnCompany=Ushbu uchinchi tomon uchun tadbirlar
 ActionsOnContact=Events for this contact/address
 ActionsOnContract=Events for this contract
-ActionsOnMember=Events about this member
+ActionsOnMember=Ushbu a'zo haqidagi tadbirlar
 ActionsOnProduct=Events about this product
-NActionsLate=%s late
+NActionsLate=%s kech
 ToDo=To do
 Completed=Completed
 Running=In progress
-RequestAlreadyDone=Request already recorded
-Filter=Filter
-FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
-RemoveFilter=Remove filter
-ChartGenerated=Chart generated
-ChartNotGenerated=Chart not generated
-GeneratedOn=Build on %s
-Generate=Generate
-Duration=Duration
-TotalDuration=Total duration
-Summary=Summary
-DolibarrStateBoard=Database Statistics
-DolibarrWorkBoard=Open Items
+RequestAlreadyDone=So'rov allaqachon yozib olingan
+Filter=Filtr
+FilterOnInto=%s maydonlariga '<strong> %s </strong>' mezonlari
+RemoveFilter=Filtrni olib tashlang
+ChartGenerated=Diagramma yaratildi
+ChartNotGenerated=Diagramma yaratilmadi
+GeneratedOn=%s-da yarating
+Generate=Yarating
+Duration=Muddati
+TotalDuration=Jami davomiyligi
+Summary=Xulosa
+DolibarrStateBoard=Ma'lumotlar bazasi statistikasi
+DolibarrWorkBoard=Ochiq narsalar
 NoOpenedElementToProcess=No open element to process
-Available=Available
-NotYetAvailable=Not yet available
-NotAvailable=Not available
-Categories=Tags/categories
-Category=Tag/category
+Available=Mavjud
+NotYetAvailable=Hali mavjud emas
+NotAvailable=Mavjud emas
+Categories=Teglar / toifalar
+Category=Tag / kategoriya
 By=By
-From=From
+From=Kimdan
 FromDate=From
 FromLocation=From
-to=to
+to=ga
 To=to
 ToDate=to
 ToLocation=to
 at=at
-and=and
-or=or
-Other=Other
-Others=Others
-OtherInformations=Other information
-Quantity=Quantity
-Qty=Qty
-ChangedBy=Changed by
-ApprovedBy=Approved by
-ApprovedBy2=Approved by (second approval)
-Approved=Approved
-Refused=Refused
-ReCalculate=Recalculate
-ResultKo=Failure
-Reporting=Reporting
-Reportings=Reporting
-Draft=Draft
-Drafts=Drafts
+and=va
+or=yoki
+Other=Boshqalar
+Others=Boshqalar
+OtherInformations=Boshqa ma'lumotlar
+Quantity=Miqdor
+Qty=Miqdor
+ChangedBy=O'zgartirilgan
+ApprovedBy=Tomonidan tasdiqlangan
+ApprovedBy2=Tasdiqlangan (ikkinchi tasdiq)
+Approved=Tasdiqlangan
+Refused=Rad etildi
+ReCalculate=Qayta hisoblang
+ResultKo=Xato
+Reporting=Hisobot berish
+Reportings=Hisobot berish
+Draft=Qoralama
+Drafts=Qoralamalar
 StatusInterInvoiced=Invoiced
-Validated=Validated
+Validated=Tasdiqlangan
 ValidatedToProduce=Validated (To produce)
-Opened=Open
+Opened=Ochiq
 OpenAll=Open (All)
 ClosedAll=Closed (All)
-New=New
-Discount=Discount
-Unknown=Unknown
-General=General
-Size=Size
+New=Yangi
+Discount=Chegirma
+Unknown=Noma'lum
+General=Umumiy
+Size=Hajmi
 OriginalSize=Original size
-Received=Received
-Paid=Paid
-Topic=Subject
-ByCompanies=By third parties
-ByUsers=By user
-Links=Links
-Link=Link
-Rejects=Rejects
-Preview=Preview
-NextStep=Next step
-Datas=Data
+Received=Qabul qildi
+Paid=To'langan
+Topic=Mavzu
+ByCompanies=Uchinchi shaxslar tomonidan
+ByUsers=Foydalanuvchi tomonidan
+Links=Havolalar
+Link=Havola
+Rejects=Rad etadi
+Preview=Oldindan ko'rish
+NextStep=Keyingi qadam
+Datas=Ma'lumotlar
 None=None
 NoneF=None
 NoneOrSeveral=None or several
-Late=Late
-LateDesc=An item is defined as Delayed as per the system configuration in menu Home - Setup - Alerts.
+Late=Kech
+LateDesc=Bosh sahifa - O'rnatish - Ogohlantirishlar menyusidagi tizim konfiguratsiyasi bo'yicha element "Kechiktirilgan" deb belgilanadi.
 NoItemLate=No late item
-Photo=Picture
-Photos=Pictures
-AddPhoto=Add picture
-DeletePicture=Picture delete
-ConfirmDeletePicture=Confirm picture deletion?
-Login=Login
+Photo=Rasm
+Photos=Rasmlar
+AddPhoto=Rasm qo'shish
+DeletePicture=Rasmni o'chirish
+ConfirmDeletePicture=Rasm o'chirilganligini tasdiqlaysizmi?
+Login=Kirish
 LoginEmail=Login (email)
 LoginOrEmail=Login or Email
-CurrentLogin=Current login
-EnterLoginDetail=Enter login details
-January=January
-February=February
-March=March
-April=April
+CurrentLogin=Joriy kirish
+EnterLoginDetail=Kirish tafsilotlarini kiriting
+January=Yanvar
+February=fevral
+March=Mart
+April=Aprel
 May=May
-June=June
-July=July
-August=August
-September=September
-October=October
-November=November
-December=December
-Month01=January
-Month02=February
-Month03=March
-Month04=April
+June=Iyun
+July=Iyul
+August=Avgust
+September=Sentyabr
+October=Oktyabr
+November=Noyabr
+December=Dekabr
+Month01=Yanvar
+Month02=fevral
+Month03=Mart
+Month04=Aprel
 Month05=May
-Month06=June
-Month07=July
-Month08=August
-Month09=September
-Month10=October
-Month11=November
-Month12=December
-MonthShort01=Jan
-MonthShort02=Feb
+Month06=Iyun
+Month07=Iyul
+Month08=Avgust
+Month09=Sentyabr
+Month10=Oktyabr
+Month11=Noyabr
+Month12=Dekabr
+MonthShort01=Yanvar
+MonthShort02=Fevral
 MonthShort03=Mar
-MonthShort04=Apr
+MonthShort04=Aprel
 MonthShort05=May
-MonthShort06=Jun
-MonthShort07=Jul
-MonthShort08=Aug
-MonthShort09=Sep
-MonthShort10=Oct
-MonthShort11=Nov
-MonthShort12=Dec
+MonthShort06=Iyun
+MonthShort07=Iyul
+MonthShort08=Avgust
+MonthShort09=Sentyabr
+MonthShort10=Oktyabr
+MonthShort11=Noyabr
+MonthShort12=Dekabr
 MonthVeryShort01=J
 MonthVeryShort02=F
 MonthVeryShort03=M
@@ -613,308 +614,309 @@ MonthVeryShort09=S
 MonthVeryShort10=O
 MonthVeryShort11=N
 MonthVeryShort12=D
-AttachedFiles=Attached files and documents
+AttachedFiles=Biriktirilgan fayllar va hujjatlar
 JoinMainDoc=Join main document
 DateFormatYYYYMM=YYYY-MM
 DateFormatYYYYMMDD=YYYY-MM-DD
-DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS
-ReportName=Report name
-ReportPeriod=Report period
-ReportDescription=Description
-Report=Report
-Keyword=Keyword
-Origin=Origin
-Legend=Legend
-Fill=Fill
-Reset=Reset
-File=File
-Files=Files
-NotAllowed=Not allowed
-ReadPermissionNotAllowed=Read permission not allowed
-AmountInCurrency=Amount in %s currency
-Example=Example
-Examples=Examples
-NoExample=No example
-FindBug=Report a bug
-NbOfThirdParties=Number of third parties
-NbOfLines=Number of lines
-NbOfObjects=Number of objects
-NbOfObjectReferers=Number of related items
-Referers=Related items
-TotalQuantity=Total quantity
-DateFromTo=From %s to %s
-DateFrom=From %s
-DateUntil=Until %s
-Check=Check
-Uncheck=Uncheck
-Internal=Internal
-External=External
-Internals=Internal
-Externals=External
-Warning=Warning
-Warnings=Warnings
-BuildDoc=Build Doc
-Entity=Environment
-Entities=Entities
-CustomerPreview=Customer preview
-SupplierPreview=Vendor preview
-ShowCustomerPreview=Show customer preview
-ShowSupplierPreview=Show vendor preview
-RefCustomer=Ref. customer
+DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH: SS
+ReportName=Hisobot nomi
+ReportPeriod=Hisobot davri
+ReportDescription=Tavsif
+Report=Hisobot
+Keyword=Kalit so'z
+Origin=Kelib chiqishi
+Legend=Afsona
+Fill=To'ldiring
+Reset=Qayta o'rnatish
+File=Fayl
+Files=Fayllar
+NotAllowed=Ruxsat berilmagan
+ReadPermissionNotAllowed=O'qishga ruxsat berilmaydi
+AmountInCurrency=Miqdor %s valyutasida
+Example=Misol
+Examples=Misollar
+NoExample=Hech qanday misol
+FindBug=Xato haqida xabar bering
+NbOfThirdParties=Uchinchi shaxslar soni
+NbOfLines=Qatorlar soni
+NbOfObjects=Ob'ektlar soni
+NbOfObjectReferers=Tegishli narsalar soni
+Referers=Tegishli narsalar
+TotalQuantity=Jami miqdor
+DateFromTo=%s dan %s gacha
+DateFrom=%s dan
+DateUntil=%s gacha
+Check=Tekshiring
+Uncheck=Belgini olib tashlang
+Internal=Ichki
+External=Tashqi
+Internals=Ichki
+Externals=Tashqi
+Warning=Ogohlantirish!
+Warnings=Ogohlantirishlar
+BuildDoc=Hujjatni yaratish
+Entity=Atrof muhit
+Entities=Korxonalar
+CustomerPreview=Mijozlarni oldindan ko'rish
+SupplierPreview=Sotuvchini oldindan ko'rish
+ShowCustomerPreview=Mijozni oldindan ko'rishni ko'rsatish
+ShowSupplierPreview=Sotuvchini oldindan ko'rishni ko'rsatish
+RefCustomer=Ref. mijoz
 InternalRef=Internal ref.
-Currency=Currency
-InfoAdmin=Information for administrators
-Undo=Undo
-Redo=Redo
-ExpandAll=Expand all
-UndoExpandAll=Undo expand
+Currency=Valyuta
+InfoAdmin=Ma'murlar uchun ma'lumot
+Undo=Bekor qilish
+Redo=Qayta qilish
+ExpandAll=Barchasini kengaytiring
+UndoExpandAll=Kengaytirishni bekor qilish
 SeeAll=See all
-Reason=Reason
-FeatureNotYetSupported=Feature not yet supported
-CloseWindow=Close window
-Response=Response
-Priority=Priority
-SendByMail=Send by email
-MailSentBy=Email sent by
+Reason=Sabab
+FeatureNotYetSupported=Xususiyat hali qo'llab-quvvatlanmaydi
+CloseWindow=Oynani yopish
+Response=Javob
+Priority=Afzallik
+SendByMail=Elektron pochta orqali yuboring
+MailSentBy=Elektron pochta orqali yuborilgan
 NotSent=Not sent
-TextUsedInTheMessageBody=Email body
-SendAcknowledgementByMail=Send confirmation email
+TextUsedInTheMessageBody=Elektron pochta qutisi
+SendAcknowledgementByMail=Tasdiqlovchi elektron pochta xabarini yuboring
 SendMail=Send email
-Email=Email
-NoEMail=No email
+Email=Elektron pochta
+NoEMail=Elektron pochta yo'q
 AlreadyRead=Already read
 NotRead=Unread
-NoMobilePhone=No mobile phone
-Owner=Owner
-FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
-Refresh=Refresh
-BackToList=Back to list
+NoMobilePhone=Mobil telefon yo'q
+Owner=Egasi
+FollowingConstantsWillBeSubstituted=Quyidagi doimiylar tegishli qiymat bilan almashtiriladi.
+Refresh=Yangilang
+BackToList=Ro'yxatga qaytish
 BackToTree=Back to tree
-GoBack=Go back
-CanBeModifiedIfOk=Can be modified if valid
-CanBeModifiedIfKo=Can be modified if not valid
-ValueIsValid=Value is valid
-ValueIsNotValid=Value is not valid
-RecordCreatedSuccessfully=Record created successfully
-RecordModifiedSuccessfully=Record modified successfully
-RecordsModified=%s record(s) modified
-RecordsDeleted=%s record(s) deleted
+GoBack=Ortga qaytish
+CanBeModifiedIfOk=Agar haqiqiy bo'lsa o'zgartirilishi mumkin
+CanBeModifiedIfKo=Agar yaroqsiz bo'lsa o'zgartirilishi mumkin
+ValueIsValid=Qiymat haqiqiydir
+ValueIsNotValid=Qiymat yaroqsiz
+RecordCreatedSuccessfully=Yozuv muvaffaqiyatli yaratildi
+RecordModifiedSuccessfully=Yozuv muvaffaqiyatli o'zgartirildi
+RecordsModified=%s yozuvlari o'zgartirildi
+RecordsDeleted=%s yozuvlari o'chirildi
 RecordsGenerated=%s record(s) generated
-AutomaticCode=Automatic code
-FeatureDisabled=Feature disabled
-MoveBox=Move widget
-Offered=Offered
-NotEnoughPermissions=You don't have permission for this action
-SessionName=Session name
-Method=Method
-Receive=Receive
-CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
-ExpectedValue=Expected Value
+AutomaticCode=Avtomatik kod
+FeatureDisabled=Funktsiya o'chirilgan
+MoveBox=Vidjetni ko'chirish
+Offered=Taklif qilingan
+NotEnoughPermissions=Sizda bu harakat uchun ruxsat yo'q
+SessionName=Sessiya nomi
+Method=Usul
+Receive=Qabul qiling
+CompleteOrNoMoreReceptionExpected=To'liq yoki boshqa hech narsa kutilmaydi
+ExpectedValue=Kutilayotgan qiymat
 ExpectedQty=Expected Qty
-PartialWoman=Partial
-TotalWoman=Total
-NeverReceived=Never received
-Canceled=Canceled
-YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu Setup - Dictionaries
+PartialWoman=Qisman
+TotalWoman=Jami
+NeverReceived=Hech qachon qabul qilinmagan
+Canceled=Bekor qilindi
+YouCanChangeValuesForThisListFromDictionarySetup=Sozlamalar - Lug'atlar menyusidan ushbu ro'yxat uchun qiymatlarni o'zgartirishingiz mumkin
 YouCanChangeValuesForThisListFrom=You can change values for this list from menu %s
-YouCanSetDefaultValueInModuleSetup=You can set the default value used when creating a new record in module setup
-Color=Color
-Documents=Linked files
-Documents2=Documents
-UploadDisabled=Upload disabled
+YouCanSetDefaultValueInModuleSetup=Modulni o'rnatishda yangi yozuv yaratishda foydalaniladigan standart qiymatni belgilashingiz mumkin
+Color=Rang
+Documents=Bog'langan fayllar
+Documents2=Hujjatlar
+UploadDisabled=Yuklash o'chirilgan
 MenuAccountancy=Accounting
-MenuECM=Documents
+MenuECM=Hujjatlar
 MenuAWStats=AWStats
-MenuMembers=Members
-MenuAgendaGoogle=Google agenda
+MenuMembers=A'zolar
+MenuAgendaGoogle=Google kun tartibi
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
-ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
-NoFileFound=No documents uploaded
-CurrentUserLanguage=Current language
-CurrentTheme=Current theme
-CurrentMenuManager=Current menu manager
-Browser=Browser
-Layout=Layout
-Screen=Screen
-DisabledModules=Disabled modules
-For=For
-ForCustomer=For customer
-Signature=Signature
-DateOfSignature=Date of signature
-HidePassword=Show command with password hidden
-UnHidePassword=Show real command with clear password
-Root=Root
+ThisLimitIsDefinedInSetup=Dolibarr limiti (menyuda uyni sozlash-xavfsizlik): %s Kb, PHP limit: %s Kb
+ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
+NoFileFound=Hech qanday hujjat yuklanmadi
+CurrentUserLanguage=Joriy til
+CurrentTheme=Joriy mavzu
+CurrentMenuManager=Amaldagi menyu menejeri
+Browser=Brauzer
+Layout=Maket
+Screen=Ekran
+DisabledModules=O'chirilgan modullar
+For=Uchun
+ForCustomer=Mijoz uchun
+Signature=Imzo
+DateOfSignature=Imzo qo'yilgan sana
+HidePassword=Parolni yashirgan holda buyruqni ko'rsatish
+UnHidePassword=Haqiqiy buyruqni aniq parol bilan ko'rsating
+Root=Ildiz
 RootOfMedias=Root of public medias (/medias)
-Informations=Information
-Page=Page
-Notes=Notes
-AddNewLine=Add new line
-AddFile=Add file
-FreeZone=Free-text product
-FreeLineOfType=Free-text item, type:
-CloneMainAttributes=Clone object with its main attributes
+Informations=Ma `lumot
+Page=Sahifa
+Notes=Izohlar
+AddNewLine=Yangi qator qo'shing
+AddFile=Fayl qo'shish
+FreeZone=Bepul matnli mahsulot
+FreeLineOfType=Bepul matnli element, turi:
+CloneMainAttributes=Ob'ektni asosiy atributlari bilan klonlash
 ReGeneratePDF=Re-generate PDF
-PDFMerge=PDF Merge
-Merge=Merge
+PDFMerge=PDF-ni birlashtirish
+Merge=Birlashtirish
 DocumentModelStandardPDF=Standard PDF template
-PrintContentArea=Show page to print main content area
-MenuManager=Menu manager
-WarningYouAreInMaintenanceMode=Warning, you are in maintenance mode: only login <b>%s</b> is allowed to use the application in this mode.
-CoreErrorTitle=System error
-CoreErrorMessage=Sorry, an error occurred. Contact your system administrator to check the logs or disable $dolibarr_main_prod=1 to get more information.
-CreditCard=Credit card
+PrintContentArea=Asosiy tarkib maydonini chop etish uchun sahifani ko'rsatish
+MenuManager=Menyu menejeri
+WarningYouAreInMaintenanceMode=Ogohlantirish, siz parvarishlash rejimidasiz: dasturdan faqat ushbu rejimda kirish uchun <b> %s </b> ruxsat etiladi.
+CoreErrorTitle=Tizim xatosi
+CoreErrorMessage=Kechirasiz, xato yuz berdi. Kundaliklarni tekshirish uchun tizim ma'muringizga murojaat qiling yoki qo'shimcha ma'lumot olish uchun $ dolibarr_main_prod = 1-ni o'chirib qo'ying.
+CreditCard=Kredit kartasi
 ValidatePayment=Validate payment
 CreditOrDebitCard=Credit or debit card
-FieldsWithAreMandatory=Fields with <b>%s</b> are mandatory
-FieldsWithIsForPublic=Fields with <b>%s</b> are shown in public list of members. If you don't want this, uncheck the "public" box.
-AccordingToGeoIPDatabase=(according to GeoIP conversion)
-Line=Line
-NotSupported=Not supported
-RequiredField=Required field
-Result=Result
-ToTest=Test
-ValidateBefore=Item must be validated before using this feature
-Visibility=Visibility
+FieldsWithAreMandatory=<b> %s </b> bo'lgan maydonlar majburiydir
+FieldsWithIsForPublic=<b> %s </b> bo'lgan maydonlar a'zolarning ochiq ro'yxatida ko'rsatilgan. Agar buni xohlamasangiz, "umumiy" katakchasini olib tashlang.
+AccordingToGeoIPDatabase=(GeoIP konversiyasiga muvofiq)
+Line=Chiziq
+NotSupported=Qo'llab-quvvatlanmaydi
+RequiredField=Majburiy maydon
+Result=Natija
+ToTest=Sinov
+ValidateBefore=Ushbu xususiyatni ishlatishdan oldin mahsulot tasdiqlanishi kerak
+Visibility=Ko'rinish
 Totalizable=Totalizable
 TotalizableDesc=This field is totalizable in list
-Private=Private
-Hidden=Hidden
-Resources=Resources
-Source=Source
-Prefix=Prefix
-Before=Before
-After=After
-IPAddress=IP address
-Frequency=Frequency
-IM=Instant messaging
-NewAttribute=New attribute
-AttributeCode=Attribute code
-URLPhoto=URL of photo/logo
-SetLinkToAnotherThirdParty=Link to another third party
-LinkTo=Link to
-LinkToProposal=Link to proposal
-LinkToOrder=Link to order
-LinkToInvoice=Link to invoice
+Private=Xususiy
+Hidden=Yashirin
+Resources=Resurslar
+Source=Manba
+Prefix=Prefiks
+Before=Oldin
+After=Keyin
+IPAddress=IP-manzil
+Frequency=Chastotani
+IM=Tezkor xabar almashish
+NewAttribute=Yangi atribut
+AttributeCode=Xususiyat kodi
+URLPhoto=Surat / logotipning URL manzili
+SetLinkToAnotherThirdParty=Boshqa uchinchi tomon bilan bog'lanish
+LinkTo=Ga havola
+LinkToProposal=Taklifga havola
+LinkToOrder=Buyurtma uchun havola
+LinkToInvoice=Hisob-fakturaga havola
 LinkToTemplateInvoice=Link to template invoice
-LinkToSupplierOrder=Link to purchase order
-LinkToSupplierProposal=Link to vendor proposal
-LinkToSupplierInvoice=Link to vendor invoice
-LinkToContract=Link to contract
-LinkToIntervention=Link to intervention
+LinkToSupplierOrder=Xarid qilish buyurtmasiga havola
+LinkToSupplierProposal=Yetkazib beruvchining taklifiga havola
+LinkToSupplierInvoice=Sotuvchi fakturasiga havola
+LinkToContract=Shartnomaga havola
+LinkToIntervention=Aralashuvga havola
 LinkToTicket=Link to ticket
-CreateDraft=Create draft
-SetToDraft=Back to draft
-ClickToEdit=Click to edit
+CreateDraft=Qoralama yarating
+SetToDraft=Qoralamaga qaytish
+ClickToEdit=Tahrirlash uchun bosing
 ClickToRefresh=Click to refresh
 EditWithEditor=Edit with CKEditor
 EditWithTextEditor=Edit with Text editor
 EditHTMLSource=Edit HTML Source
-ObjectDeleted=Object %s deleted
-ByCountry=By country
-ByTown=By town
-ByDate=By date
-ByMonthYear=By month/year
-ByYear=By year
-ByMonth=By month
-ByDay=By day
-BySalesRepresentative=By sales representative
-LinkedToSpecificUsers=Linked to a particular user contact
-NoResults=No results
-AdminTools=Admin Tools
-SystemTools=System tools
-ModulesSystemTools=Modules tools
-Test=Test
+ObjectDeleted=%s ob'ekti o'chirildi
+ByCountry=Mamlakatlar bo'yicha
+ByTown=Shahar bo'yicha
+ByDate=Sana bo'yicha
+ByMonthYear=Oy / yil bo'yicha
+ByYear=Yil bo'yicha
+ByMonth=Oyga
+ByDay=Kun bilan
+BySalesRepresentative=Savdo vakili tomonidan
+LinkedToSpecificUsers=Muayyan foydalanuvchi kontaktiga bog'langan
+NoResults=Natija yo'q
+AdminTools=Administrator vositalari
+SystemTools=Tizim vositalari
+ModulesSystemTools=Modullar vositalari
+Test=Sinov
 Element=Element
-NoPhotoYet=No pictures available yet
-Dashboard=Dashboard
-MyDashboard=My Dashboard
-Deductible=Deductible
-from=from
-toward=toward
-Access=Access
-SelectAction=Select action
+NoPhotoYet=Hozircha rasmlar mavjud emas
+Dashboard=Boshqaruv paneli
+MyDashboard=Mening boshqaruv panelim
+Deductible=Chiqib olinadigan
+from=dan
+toward=tomonga
+Access=Kirish
+SelectAction=Amalni tanlang
 SelectTargetUser=Select target user/employee
-HelpCopyToClipboard=Use Ctrl+C to copy to clipboard
-SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
-OriginFileName=Original filename
-SetDemandReason=Set source
-SetBankAccount=Define Bank Account
-AccountCurrency=Account currency
-ViewPrivateNote=View notes
-XMoreLines=%s line(s) hidden
+HelpCopyToClipboard=Buferga nusxalash uchun Ctrl + C tugmalaridan foydalaning
+SaveUploadedFileWithMask=Faylni "<strong> %s </strong>" nomi bilan saqlang (aks holda "%s")
+OriginFileName=Asl fayl nomi
+SetDemandReason=Manbani o'rnating
+SetBankAccount=Bank hisobini aniqlang
+AccountCurrency=Hisob-kitob valyutasi
+ViewPrivateNote=Eslatmalarni ko'rish
+XMoreLines=%s qatorlari yashiringan
 ShowMoreLines=Show more/less lines
-PublicUrl=Public URL
-AddBox=Add box
+PublicUrl=Ochiq URL
+AddBox=Qutini qo'shish
 SelectElementAndClick=Select an element and click on %s
-PrintFile=Print File %s
-ShowTransaction=Show entry on bank account
+PrintFile=Faylni chop etish %s
+ShowTransaction=Bank hisobidagi yozuvni ko'rsatish
 ShowIntervention=Show intervention
 ShowContract=Show contract
-GoIntoSetupToChangeLogo=Go to Home - Setup - Company to change logo or go to Home - Setup - Display to hide.
-Deny=Deny
-Denied=Denied
+GoIntoSetupToChangeLogo=Logotipni o'zgartirish uchun Home - Setup - Company-ga o'ting yoki yashirish uchun Home - Setup - Display-ga o'ting.
+Deny=Rad et
+Denied=Rad etilgan
 ListOf=List of %s
-ListOfTemplates=List of templates
-Gender=Gender
-Genderman=Male
-Genderwoman=Female
+ListOfTemplates=Shablonlar ro'yxati
+Gender=Jins
+Genderman=Erkak
+Genderwoman=Ayol
 Genderother=Other
-ViewList=List view
+ViewList=Ro'yxat ko'rinishi
 ViewGantt=Gantt view
 ViewKanban=Kanban view
-Mandatory=Mandatory
-Hello=Hello
+Mandatory=Majburiy
+Hello=Salom
 GoodBye=GoodBye
-Sincerely=Sincerely
+Sincerely=Hurmat bilan
 ConfirmDeleteObject=Are you sure you want to delete this object?
-DeleteLine=Delete line
-ConfirmDeleteLine=Are you sure you want to delete this line?
+DeleteLine=Chiziqni o'chirish
+ConfirmDeleteLine=Ushbu qatorni o'chirishni xohlaysizmi?
 ErrorPDFTkOutputFileNotFound=Error: the file was not generated. Please check that the 'pdftk' command is installed in a directory included in the $PATH environment variable (linux/unix only) or contact your system administrator.
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
-TooManyRecordForMassAction=Too many records selected for mass action. The action is restricted to a list of %s records.
-NoRecordSelected=No record selected
-MassFilesArea=Area for files built by mass actions
-ShowTempMassFilesArea=Show area of files built by mass actions
+NoPDFAvailableForDocGenAmongChecked=Tekshirilgan yozuvlar orasida hujjat yaratish uchun PDF mavjud emas
+TooManyRecordForMassAction=Ommaviy harakatlar uchun tanlangan yozuvlar juda ko'p. Amal %s yozuvlari ro'yxati bilan cheklangan.
+NoRecordSelected=Hech qanday yozuv tanlanmadi
+MassFilesArea=Ommaviy harakatlar bilan qurilgan fayllar maydoni
+ShowTempMassFilesArea=Ommaviy harakatlar bilan qurilgan fayllar maydonini ko'rsating
 ConfirmMassDeletion=Bulk Delete confirmation
 ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record(s)?
-RelatedObjects=Related Objects
-ClassifyBilled=Classify billed
+RelatedObjects=Tegishli ob'ektlar
+ClassifyBilled=Hisob-kitoblarni tasniflang
 ClassifyUnbilled=Classify unbilled
-Progress=Progress
+Progress=Taraqqiyot
 ProgressShort=Progr.
-FrontOffice=Front office
-BackOffice=Back office
+FrontOffice=Old ofis
+BackOffice=Orqa ofis
 Submit=Submit
-View=View
+View=Ko'rinish
 Export=Export
 Exports=Exports
-ExportFilteredList=Export filtered list
-ExportList=Export list
+ExportFilteredList=Filtrlangan ro'yxatni eksport qilish
+ExportList=Eksport ro'yxati
 ExportOptions=Export Options
 IncludeDocsAlreadyExported=Include docs already exported
 ExportOfPiecesAlreadyExportedIsEnable=Export of pieces already exported is enable
 ExportOfPiecesAlreadyExportedIsDisable=Export of pieces already exported is disable
 AllExportedMovementsWereRecordedAsExported=All exported movements were recorded as exported
 NotAllExportedMovementsCouldBeRecordedAsExported=Not all exported movements could be recorded as exported
-Miscellaneous=Miscellaneous
-Calendar=Calendar
-GroupBy=Group by...
-ViewFlatList=View flat list
+Miscellaneous=Turli xil
+Calendar=Taqvim
+GroupBy=Guruh bo'yicha ...
+ViewFlatList=Yassi ro'yxatni ko'rish
 ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
-RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
-DirectDownloadLink=Public download link
+RemoveString='%s' qatorini olib tashlash
+SomeTranslationAreUncomplete=Taklif qilinadigan ba'zi tillar qisman tarjima qilinishi yoki xatolarga yo'l qo'yishi mumkin. Iltimos, yaxshilangan narsalaringizni qo'shish uchun <a href="https://transifex.com/projects/p/dolibarr/" target="_blank"> https://transifex.com/projects/p/dolibarr/ </a> ro'yxatdan o'tib, tilingizni to'g'rilashga yordam bering.
+DirectDownloadLink=Umumiy yuklab olish havolasi
 PublicDownloadLinkDesc=Only the link is required to download the file
 DirectDownloadInternalLink=Private download link
 PrivateDownloadLinkDesc=You need to be logged and you need permissions to view or download the file
-Download=Download
+Download=Yuklash
 DownloadDocument=Download document
-ActualizeCurrency=Update currency rate
-Fiscalyear=Fiscal year
+ActualizeCurrency=Valyuta kursini yangilang
+Fiscalyear=Moliyaviy yil
 ModuleBuilder=Module and Application Builder
 SetMultiCurrencyCode=Set currency
-BulkActions=Bulk actions
+BulkActions=Ommaviy harakatlar
 ClickToShowHelp=Click to show tooltip help
 WebSite=Website
 WebSites=Websites
@@ -944,30 +946,30 @@ LineNb=Line no.
 IncotermLabel=Incoterms
 TabLetteringCustomer=Customer lettering
 TabLetteringSupplier=Vendor lettering
-Monday=Monday
-Tuesday=Tuesday
-Wednesday=Wednesday
-Thursday=Thursday
-Friday=Friday
-Saturday=Saturday
-Sunday=Sunday
+Monday=Dushanba
+Tuesday=Seshanba
+Wednesday=Chorshanba
+Thursday=Payshanba
+Friday=Juma
+Saturday=Shanba
+Sunday=yakshanba
 MondayMin=Mo
 TuesdayMin=Tu
-WednesdayMin=We
+WednesdayMin=Biz
 ThursdayMin=Th
 FridayMin=Fr
 SaturdayMin=Sa
 SundayMin=Su
-Day1=Monday
-Day2=Tuesday
-Day3=Wednesday
-Day4=Thursday
-Day5=Friday
-Day6=Saturday
-Day0=Sunday
+Day1=Dushanba
+Day2=Seshanba
+Day3=Chorshanba
+Day4=Payshanba
+Day5=Juma
+Day6=Shanba
+Day0=yakshanba
 ShortMonday=M
 ShortTuesday=T
-ShortWednesday=W
+ShortWednesday=V
 ShortThursday=T
 ShortFriday=F
 ShortSaturday=S
@@ -1005,36 +1007,36 @@ million=million
 billion=billion
 trillion=trillion
 quadrillion=quadrillion
-SelectMailModel=Select an email template
-SetRef=Set ref
-Select2ResultFoundUseArrows=Some results found. Use arrows to select.
-Select2NotFound=No result found
-Select2Enter=Enter
-Select2MoreCharacter=or more character
-Select2MoreCharacters=or more characters
+SelectMailModel=Elektron pochta shablonini tanlang
+SetRef=Referani o'rnating
+Select2ResultFoundUseArrows=Ba'zi natijalar topildi. Tanlash uchun strelkalardan foydalaning.
+Select2NotFound=Hech qanday natija topilmadi
+Select2Enter=Kirish
+Select2MoreCharacter=yoki undan ko'p belgi
+Select2MoreCharacters=yoki undan ko'p belgilar
 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=Loading more results...
-Select2SearchInProgress=Search in progress...
-SearchIntoThirdparties=Third parties
-SearchIntoContacts=Contacts
-SearchIntoMembers=Members
-SearchIntoUsers=Users
-SearchIntoProductsOrServices=Products or services
+Select2LoadingMoreResults=Boshqa natijalar yuklanmoqda ...
+Select2SearchInProgress=Qidiruv davom etmoqda ...
+SearchIntoThirdparties=Uchinchi shaxslar
+SearchIntoContacts=Kontaktlar
+SearchIntoMembers=A'zolar
+SearchIntoUsers=Foydalanuvchilar
+SearchIntoProductsOrServices=Mahsulotlar yoki xizmatlar
 SearchIntoBatch=Lots / Serials
-SearchIntoProjects=Projects
+SearchIntoProjects=Loyihalar
 SearchIntoMO=Manufacturing Orders
-SearchIntoTasks=Tasks
-SearchIntoCustomerInvoices=Customer invoices
-SearchIntoSupplierInvoices=Vendor invoices
-SearchIntoCustomerOrders=Sales orders
-SearchIntoSupplierOrders=Purchase orders
-SearchIntoCustomerProposals=Commercial proposals
-SearchIntoSupplierProposals=Vendor proposals
-SearchIntoInterventions=Interventions
-SearchIntoContracts=Contracts
-SearchIntoCustomerShipments=Customer shipments
-SearchIntoExpenseReports=Expense reports
-SearchIntoLeaves=Leave
+SearchIntoTasks=Vazifalar
+SearchIntoCustomerInvoices=Mijozlarning hisob-fakturalari
+SearchIntoSupplierInvoices=Sotuvchi hisob-fakturalari
+SearchIntoCustomerOrders=Savdo buyurtmalari
+SearchIntoSupplierOrders=Sotib olish uchun buyurtmalar
+SearchIntoCustomerProposals=Tijorat takliflari
+SearchIntoSupplierProposals=Sotuvchi takliflari
+SearchIntoInterventions=Aralashuvlar
+SearchIntoContracts=Shartnomalar
+SearchIntoCustomerShipments=Mijozlar jo'natmalari
+SearchIntoExpenseReports=Xarajatlar bo'yicha hisobotlar
+SearchIntoLeaves=Keting
 SearchIntoTickets=Tickets
 SearchIntoCustomerPayments=Customer payments
 SearchIntoVendorPayments=Vendor payments
@@ -1072,6 +1074,7 @@ ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
 ToClose=To close
+ToRefuse=To refuse
 ToProcess=To process
 ToApprove=To approve
 GlobalOpenedElemView=Global view
@@ -1126,9 +1129,11 @@ UpdateForAllLines=Update for all lines
 OnHold=On hold
 Civility=Civility
 AffectTag=Affect Tag
+CreateExternalUser=Create external user
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
 ConfirmCancel=Are you sure you want to cancel
+EmailMsgID=Email MsgID
diff --git a/htdocs/langs/uz_UZ/margins.lang b/htdocs/langs/uz_UZ/margins.lang
index ad5406409b4..1741f81bdb3 100644
--- a/htdocs/langs/uz_UZ/margins.lang
+++ b/htdocs/langs/uz_UZ/margins.lang
@@ -1,45 +1,45 @@
 # Dolibarr language file - Source file is en_US - marges
 
-Margin=Margin
-Margins=Margins
-TotalMargin=Total Margin
-MarginOnProducts=Margin / Products
-MarginOnServices=Margin / Services
-MarginRate=Margin rate
-MarkRate=Mark rate
-DisplayMarginRates=Display margin rates
-DisplayMarkRates=Display mark rates
-InputPrice=Input price
-margin=Profit margins management
-margesSetup=Profit margins management setup
-MarginDetails=Margin details
-ProductMargins=Product margins
-CustomerMargins=Customer margins
-SalesRepresentativeMargins=Sales representative margins
+Margin=Marj
+Margins=Chegaralar
+TotalMargin=Jami marj
+MarginOnProducts=Marj / Mahsulotlar
+MarginOnServices=Marj / xizmatlar
+MarginRate=Marj darajasi
+MarkRate=Belgilangan stavka
+DisplayMarginRates=Marj stavkalarini ko'rsatish
+DisplayMarkRates=Belgilash stavkalarini ko'rsatish
+InputPrice=Kirish narxi
+margin=Foyda marjlarini boshqarish
+margesSetup=Foyda marjlarini boshqarishni sozlash
+MarginDetails=Marj tafsilotlari
+ProductMargins=Mahsulot chegaralari
+CustomerMargins=Mijozlar marjlari
+SalesRepresentativeMargins=Savdo vakili marjlari
 ContactOfInvoice=Contact of invoice
-UserMargins=User margins
-ProductService=Product or Service
-AllProducts=All products and services
-ChooseProduct/Service=Choose product or service
-ForceBuyingPriceIfNull=Force buying/cost price to selling price if not defined
-ForceBuyingPriceIfNullDetails=If buying/cost price not provided when we add a new line, and this option is "ON", the margin will be 0 on the new line (buying/cost price = selling price). If this option is "OFF" (recommended), margin will be equal to the value suggested by default (and may be 100% if no default value can be found).
-MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
-UseDiscountAsProduct=As a product
-UseDiscountAsService=As a service
-UseDiscountOnTotal=On subtotal
-MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
-MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
-MargeType1=Margin on Best vendor price
-MargeType2=Margin on Weighted Average Price (WAP)
-MargeType3=Margin on Cost Price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best vendor price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best vendor price if WAP not yet defined
-CostPrice=Cost price
-UnitCharges=Unit charges
-Charges=Charges
-AgentContactType=Commercial agent contact type
-AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per contact/address. Note that reading statistics on a contact is not reliable since in most cases the contact may not be defined explicitely on the invoices.
-rateMustBeNumeric=Rate must be a numeric value
-markRateShouldBeLesserThan100=Mark rate should be lower than 100
-ShowMarginInfos=Show margin infos
-CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any dedicated sale representative and some third parties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+UserMargins=Foydalanuvchi chekkalari
+ProductService=Mahsulot yoki xizmat
+AllProducts=Barcha mahsulotlar va xizmatlar
+ChooseProduct/Service=Mahsulot yoki xizmatni tanlang
+ForceBuyingPriceIfNull=Agar aniqlanmagan bo'lsa, sotib olish / tannarxni sotish narxiga majburlang
+ForceBuyingPriceIfNullDetails=Agar biz yangi qator qo'shganimizda sotib olish / tannarxi taqdim etilmasa va ushbu parametr "ON" bo'lsa, margin yangi satrda 0 ga teng bo'ladi (sotib olish / tannarx narxi = sotish narxi). Agar ushbu parametr "OFF" bo'lsa (tavsiya etiladi), margin sukut bo'yicha taklif qilingan qiymatga teng bo'ladi (va agar standart qiymat topilmasa, 100% bo'lishi mumkin).
+MARGIN_METHODE_FOR_DISCOUNT=Global chegirmalar uchun margin usuli
+UseDiscountAsProduct=Mahsulot sifatida
+UseDiscountAsService=Xizmat sifatida
+UseDiscountOnTotal=Subtotal bo'yicha
+MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Global chegirma mahsulot, xizmat yoki faqat marjni hisoblash uchun subtotal bo'yicha ko'rib chiqilishini aniqlaydi.
+MARGIN_TYPE=Xarajatlarni hisoblash uchun sukut bo'yicha sotib olish / narx narxlari
+MargeType1=Eng yaxshi sotuvchi narxi bo'yicha marj
+MargeType2=O'rtacha o'rtacha narx (WAP)
+MargeType3=Narxlar bo'yicha marj
+MarginTypeDesc=* Eng yaxshi sotib olish narxidagi marj = Sotish narxi - Mahsulot kartasida aniqlangan sotuvchi narxi <br> * O'rtacha narx bo'yicha marja (WAP) = Sotish narxi - Mahsulotning o'rtacha narxi (WAP) yoki agar WAP hali aniqlanmagan bo'lsa, sotuvchining eng yaxshi narxi <br> * Margin on Narxlar narxi = Sotish narxi - Agar narx belgilanmagan bo'lsa, mahsulot kartasida yoki WAP-da belgilangan narx, yoki WAP hali aniqlanmagan bo'lsa, eng yaxshi sotuvchining narxi.
+CostPrice=Xarajat narxi
+UnitCharges=Birlik uchun to'lovlar
+Charges=To'lovlar
+AgentContactType=Tijorat agentining aloqa turi
+AgentContactTypeDetails=Kontakt / manzil bo'yicha margin hisoboti uchun qanday aloqa turini (hisob-fakturalarda bog'langan) ishlatilishini aniqlang. Kontakt bo'yicha statistik ma'lumotlarni o'qish ishonchli emasligiga e'tibor bering, chunki aksariyat hollarda hisob-fakturalarda aloqa aniq belgilanmasligi mumkin.
+rateMustBeNumeric=Narx raqamli qiymat bo'lishi kerak
+markRateShouldBeLesserThan100=Belgilanish darajasi 100 dan past bo'lishi kerak
+ShowMarginInfos=Margin ma'lumotlarini ko'rsatish
+CheckMargins=Chegaralar tafsiloti
+MarginPerSaleRepresentativeWarning=Har bir savdo vakili marjasini hisoblash uchun har bir foydalanuvchi uchun marj hisoboti uchinchi shaxslar va savdo vakillari o'rtasidagi aloqadan foydalanadi. Ba'zi bir uchinchi tomonlarning biron bir maxsus savdo vakili bo'lmasligi va ba'zi bir uchinchi shaxslar bir nechta bilan bog'lanishi mumkinligi sababli, ba'zi bir summalar ushbu hisobotga kiritilmasligi mumkin (agar savdo vakili bo'lmasa) va ba'zilari turli satrlarda ko'rinishi mumkin (har bir savdo vakili uchun) .
diff --git a/htdocs/langs/uz_UZ/members.lang b/htdocs/langs/uz_UZ/members.lang
index 042b85598c0..d8b9c2f59f3 100644
--- a/htdocs/langs/uz_UZ/members.lang
+++ b/htdocs/langs/uz_UZ/members.lang
@@ -213,3 +213,5 @@ SendReminderForExpiredSubscription=Send reminder by email to members when subscr
 MembershipPaid=Membership paid for current period (until %s)
 YouMayFindYourInvoiceInThisEmail=You may find your invoice attached to this email
 XMembersClosed=%s member(s) closed
+XExternalUserCreated=%s external user(s) created
+ForceMemberNature=Force member nature (Individual or Corporation)
diff --git a/htdocs/langs/uz_UZ/modulebuilder.lang b/htdocs/langs/uz_UZ/modulebuilder.lang
index 9fdaa1a533a..23a098be2e5 100644
--- a/htdocs/langs/uz_UZ/modulebuilder.lang
+++ b/htdocs/langs/uz_UZ/modulebuilder.lang
@@ -143,3 +143,4 @@ AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
 ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
+ImportExportProfiles=Import and export profiles
diff --git a/htdocs/langs/uz_UZ/mrp.lang b/htdocs/langs/uz_UZ/mrp.lang
index ec999a473a4..2414a92cefb 100644
--- a/htdocs/langs/uz_UZ/mrp.lang
+++ b/htdocs/langs/uz_UZ/mrp.lang
@@ -8,12 +8,12 @@ MenuBOM=Bills of material
 LatestBOMModified=Latest %s Bills of materials modified
 LatestMOModified=Latest %s Manufacturing Orders modified
 Bom=Bills of Material
-BillOfMaterials=Bill of Material
+BillOfMaterials=Bill of Materials
 BOMsSetup=Setup of module BOM
 ListOfBOMs=List of bills of material - BOM
 ListOfManufacturingOrders=List of Manufacturing Orders
-NewBOM=New bill of material
-ProductBOMHelp=Product to create with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
+NewBOM=New bill of materials
+ProductBOMHelp=Product to create (or disassemble) with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
 BOMsNumberingModules=BOM numbering templates
 BOMsModelModule=BOM document templates
 MOsNumberingModules=MO numbering templates
@@ -22,7 +22,7 @@ FreeLegalTextOnBOMs=Free text on document of BOM
 WatermarkOnDraftBOMs=Watermark on draft BOM
 FreeLegalTextOnMOs=Free text on document of MO
 WatermarkOnDraftMOs=Watermark on draft MO
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials %s ?
 ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
 ManufacturingEfficiency=Manufacturing efficiency
 ConsumptionEfficiency=Consumption efficiency
@@ -30,8 +30,8 @@ ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the produc
 ValueOfMeansLossForProductProduced=Value of 0.95 means an average of 5%% of loss of produced product
 DeleteBillOfMaterials=Delete Bill Of Materials
 DeleteMo=Delete Manufacturing Order
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Materials?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Materials?
 MenuMRP=Manufacturing Orders
 NewMO=New Manufacturing Order
 QtyToProduce=Qty to produce
@@ -39,7 +39,7 @@ DateStartPlannedMo=Date start planned
 DateEndPlannedMo=Date end planned
 KeepEmptyForAsap=Empty means 'As Soon As Possible'
 EstimatedDuration=Estimated duration
-EstimatedDurationDesc=Estimated duration to manufacture this product using this BOM
+EstimatedDurationDesc=Estimated duration to manufacture (or disassemble) this product using this BOM
 ConfirmValidateBom=Are you sure you want to validate the BOM with the reference <strong>%s</strong> (you will be able to use it to build new Manufacturing Orders)
 ConfirmCloseBom=Are you sure you want to cancel this BOM (you won't be able to use it to build new Manufacturing Orders anymore) ?
 ConfirmReopenBom=Are you sure you want to re-open this BOM (you will be able to use it to build new Manufacturing Orders)
@@ -63,13 +63,14 @@ ConsumeAndProduceAll=Consume and Produce All
 Manufactured=Manufactured
 TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
 ForAQuantityOf=For a quantity to produce of %s
+ForAQuantityToConsumeOf=For a quantity to disassemble of %s
 ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
 ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
 ProductionForRef=Production of %s
 AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
 NoStockChangeOnServices=No stock change on services
 ProductQtyToConsumeByMO=Product quantity still to consume by open MO
-ProductQtyToProduceByMO=Product quentity still to produce by open MO
+ProductQtyToProduceByMO=Product quantity still to produce by open MO
 AddNewConsumeLines=Add new line to consume
 ProductsToConsume=Products to consume
 ProductsToProduce=Products to produce
@@ -83,15 +84,13 @@ Workstations=Workstations
 WorkstationsDescription=Workstations management
 WorkstationSetup = Workstations setup
 WorkstationSetupPage = Workstations setup page
-WorkstationAbout = About Workstation
-WorkstationAboutPage = Workstations about page
 WorkstationList=Workstation list
 WorkstationCreate=Add new workstation
 ConfirmEnableWorkstation=Are you sure you want to enable workstation <b>%s</b> ?
 EnableAWorkstation=Enable a workstation
 ConfirmDisableWorkstation=Are you sure you want to disable workstation <b>%s</b> ?
 DisableAWorkstation=Disable a workstation
-DeleteWorkstation=Supprimer
+DeleteWorkstation=Delete
 NbOperatorsRequired=Number of operators required
 THMOperatorEstimated=Estimated operator THM
 THMMachineEstimated=Estimated machine THM
diff --git a/htdocs/langs/uz_UZ/oauth.lang b/htdocs/langs/uz_UZ/oauth.lang
index 075ff49a895..da2af8c7758 100644
--- a/htdocs/langs/uz_UZ/oauth.lang
+++ b/htdocs/langs/uz_UZ/oauth.lang
@@ -1,32 +1,32 @@
 # Dolibarr language file - Source file is en_US - oauth
-ConfigOAuth=OAuth Configuration
-OAuthServices=OAuth Services
-ManualTokenGeneration=Manual token generation
-TokenManager=Token Manager
-IsTokenGenerated=Is token generated ?
-NoAccessToken=No access token saved into local database
-HasAccessToken=A token was generated and saved into local database
-NewTokenStored=Token received and saved
-ToCheckDeleteTokenOnProvider=Click here to check/delete authorization saved by %s OAuth provider
-TokenDeleted=Token deleted
-RequestAccess=Click here to request/renew access and receive a new token to save
-DeleteAccess=Click here to delete token
-UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when creating your credentials with your OAuth provider:
-ListOfSupportedOauthProviders=Enter the credentials provided by your OAuth2 provider. Only supported OAuth2 providers are listedd here. These services may be used by other modules that need OAuth2 authentication.
-OAuthSetupForLogin=Page to generate an OAuth token
-SeePreviousTab=See previous tab
-OAuthIDSecret=OAuth ID and Secret
-TOKEN_REFRESH=Token Refresh Present
-TOKEN_EXPIRED=Token expired
-TOKEN_EXPIRE_AT=Token expire at
-TOKEN_DELETE=Delete saved token
-OAUTH_GOOGLE_NAME=OAuth Google service
+ConfigOAuth=OAuth konfiguratsiyasi
+OAuthServices=OAuth xizmatlari
+ManualTokenGeneration=Jetonlarni qo'lda yaratish
+TokenManager=Token menejeri
+IsTokenGenerated=Token yaratiladimi?
+NoAccessToken=Mahalliy ma'lumotlar bazasida hech qanday kirish belgisi saqlanmadi
+HasAccessToken=Token yaratildi va mahalliy ma'lumotlar bazasiga saqlandi
+NewTokenStored=Token qabul qilindi va saqlandi
+ToCheckDeleteTokenOnProvider=%s OAuth provayderi tomonidan saqlangan avtorizatsiyani tekshirish / o'chirish uchun shu erni bosing
+TokenDeleted=Jeton o'chirildi
+RequestAccess=Kirish huquqini so'rash / yangilash va saqlash uchun yangi belgini olish uchun shu erni bosing
+DeleteAccess=Tokenni o'chirish uchun shu erni bosing
+UseTheFollowingUrlAsRedirectURI=OAuth provayderingiz bilan hisobga olish ma'lumotlarini yaratishda quyidagi URL manzilini qayta yo'naltirish URI sifatida foydalaning:
+ListOfSupportedOauthProviders=OAuth2 provayderingiz tomonidan taqdim etilgan hisobga olish ma'lumotlarini kiriting. Bu erda faqat qo'llab-quvvatlanadigan OAuth2 provayderlari ro'yxatga olingan. Ushbu xizmatlardan OAuth2 autentifikatsiyasini talab qiladigan boshqa modullar foydalanishi mumkin.
+OAuthSetupForLogin=OAuth belgisini yaratish uchun sahifa
+SeePreviousTab=Oldingi yorliqni ko'ring
+OAuthIDSecret=OAuth identifikatori va maxfiy
+TOKEN_REFRESH=Tokenni yangilash sovg'asi
+TOKEN_EXPIRED=Jeton muddati tugagan
+TOKEN_EXPIRE_AT=Jeton muddati tugaydi
+TOKEN_DELETE=Saqlangan belgini o'chirish
+OAUTH_GOOGLE_NAME=OAuth Google xizmati
 OAUTH_GOOGLE_ID=OAuth Google Id
 OAUTH_GOOGLE_SECRET=OAuth Google Secret
-OAUTH_GOOGLE_DESC=Go to <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">this page</a> then "Credentials" to create OAuth credentials
-OAUTH_GITHUB_NAME=OAuth GitHub service
+OAUTH_GOOGLE_DESC=OAuth hisob ma'lumotlarini yaratish uchun <a class="notasortlink" href="https://console.developers.google.com/" target="_blank"> sahifasiga o'ting </a>, keyin "Ishonch yorliqlari".
+OAUTH_GITHUB_NAME=OAuth GitHub xizmati
 OAUTH_GITHUB_ID=OAuth GitHub Id
 OAUTH_GITHUB_SECRET=OAuth GitHub Secret
-OAUTH_GITHUB_DESC=Go to <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">this page</a> then "Register a new application" to create OAuth credentials
+OAUTH_GITHUB_DESC=Ushbu sahifaga <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">-ga o'ting </a>, keyin OAuth hisob ma'lumotlarini yaratish uchun "yangi dasturni ro'yxatdan o'tkazing".
 OAUTH_STRIPE_TEST_NAME=OAuth Stripe Test
 OAUTH_STRIPE_LIVE_NAME=OAuth Stripe Live
diff --git a/htdocs/langs/uz_UZ/opensurvey.lang b/htdocs/langs/uz_UZ/opensurvey.lang
index 7d26151fa16..2a18ce951aa 100644
--- a/htdocs/langs/uz_UZ/opensurvey.lang
+++ b/htdocs/langs/uz_UZ/opensurvey.lang
@@ -1,61 +1,61 @@
 # Dolibarr language file - Source file is en_US - opensurvey
-Survey=Poll
-Surveys=Polls
-OrganizeYourMeetingEasily=Organize your meetings and polls easily. First select the type of poll...
-NewSurvey=New poll
-OpenSurveyArea=Polls area
-AddACommentForPoll=You can add a comment into poll...
-AddComment=Add comment
-CreatePoll=Create poll
-PollTitle=Poll title
-ToReceiveEMailForEachVote=Receive an email for each vote
-TypeDate=Type date
-TypeClassic=Type standard
-OpenSurveyStep2=Select your dates among the free days (grey). The selected days are green. You can unselect a day previously selected by clicking again on it
-RemoveAllDays=Remove all days
-CopyHoursOfFirstDay=Copy hours of first day
-RemoveAllHours=Remove all hours
-SelectedDays=Selected days
-TheBestChoice=The best choice currently is
-TheBestChoices=The best choices currently are
-with=with
-OpenSurveyHowTo=If you agree to vote in this poll, you have to give your name, choose the values that fit best for you and validate with the plus button at the end of the line.
-CommentsOfVoters=Comments of voters
-ConfirmRemovalOfPoll=Are you sure you want to remove this poll (and all votes)
-RemovePoll=Remove poll
-UrlForSurvey=URL to communicate to get a direct access to poll
-PollOnChoice=You are creating a poll to make a multi-choice for a poll. First enter all possible choices for your poll:
-CreateSurveyDate=Create a date poll
-CreateSurveyStandard=Create a standard poll
-CheckBox=Simple checkbox
-YesNoList=List (empty/yes/no)
-PourContreList=List (empty/for/against)
-AddNewColumn=Add new column
-TitleChoice=Choice label
-ExportSpreadsheet=Export result spreadsheet
-ExpireDate=Limit date
-NbOfSurveys=Number of polls
-NbOfVoters=No. of voters
-SurveyResults=Results
-PollAdminDesc=You are allowed to change all vote lines of this poll with button "Edit". You can, as well, remove a column or a line with %s. You can also add a new column with %s.
-5MoreChoices=5 more choices
-Against=Against
-YouAreInivitedToVote=You are invited to vote for this poll
-VoteNameAlreadyExists=This name was already used for this poll
-AddADate=Add a date
-AddStartHour=Add start hour
-AddEndHour=Add end hour
-votes=vote(s)
-NoCommentYet=No comments have been posted for this poll yet
-CanComment=Voters can comment in the poll
-CanSeeOthersVote=Voters can see other people's vote
-SelectDayDesc=For each selected day, you can choose, or not, meeting hours in the following format:<br>- empty,<br>- "8h", "8H" or "8:00" to give a meeting's start hour,<br>- "8-11", "8h-11h", "8H-11H" or "8:00-11:00" to give a meeting's start and end hour,<br>- "8h15-11h15", "8H15-11H15" or "8:15-11:15" for the same thing but with minutes.
-BackToCurrentMonth=Back to current month
-ErrorOpenSurveyFillFirstSection=You haven't filled the first section of the poll creation
-ErrorOpenSurveyOneChoice=Enter at least one choice
-ErrorInsertingComment=There was an error while inserting your comment
-MoreChoices=Enter more choices for the voters
-SurveyExpiredInfo=The poll has been closed or voting delay has expired.
-EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s
+Survey=So'rovnoma
+Surveys=So'rovnomalar
+OrganizeYourMeetingEasily=Uchrashuvlaringiz va so'rovnomalaringizni osonlikcha tashkil qiling. Avval so'rovnoma turini tanlang ...
+NewSurvey=Yangi so'rovnoma
+OpenSurveyArea=Uchastkalar maydoni
+AddACommentForPoll=Izohni so'rovnomaga qo'shishingiz mumkin ...
+AddComment=Izoh qo'shish
+CreatePoll=So'rovnoma yaratish
+PollTitle=So'rovnoma nomi
+ToReceiveEMailForEachVote=Har bir ovoz berish uchun elektron pochta xabarini oling
+TypeDate=Yozuv sanasi
+TypeClassic=Standart turi
+OpenSurveyStep2=Bepul kunlar orasida sanalaringizni tanlang (kulrang). Tanlangan kunlar yashil rangda. Oldindan tanlangan kunni qayta bosish orqali bekor qilishingiz mumkin
+RemoveAllDays=Barcha kunlarni olib tashlang
+CopyHoursOfFirstDay=Birinchi kunning soatlarini nusxalash
+RemoveAllHours=Barcha soatlarni olib tashlang
+SelectedDays=Tanlangan kunlar
+TheBestChoice=Hozirda eng yaxshi tanlov
+TheBestChoices=Hozirda eng yaxshi tanlov
+with=bilan
+OpenSurveyHowTo=Agar siz ushbu so'rovnomada ovoz berishga rozilik bildirsangiz, ismingizni ko'rsatishingiz, o'zingiz uchun eng mos qiymatlarni tanlashingiz va qatorning oxiridagi plyus tugmasi bilan tasdiqlashingiz kerak.
+CommentsOfVoters=Saylovchilarning mulohazalari
+ConfirmRemovalOfPoll=Ushbu so'rovnomani olib tashlamoqchimisiz (va barcha ovozlar)
+RemovePoll=So'rovnomani olib tashlash
+UrlForSurvey=So'rovnomaga to'g'ridan-to'g'ri kirish huquqini olish uchun aloqa qilish uchun URL manzili
+PollOnChoice=So'rov uchun ko'p tanlov qilish uchun siz so'rovnoma yaratmoqdasiz. Avval so'rovnomangiz uchun barcha mumkin bo'lgan tanlovlarni kiriting:
+CreateSurveyDate=Sana bo'yicha so'rovnoma yarating
+CreateSurveyStandard=Standart so'rovnoma yarating
+CheckBox=Oddiy katakcha
+YesNoList=Ro'yxat (bo'sh / ha / yo'q)
+PourContreList=Ro'yxat (bo'sh / qarshi / qarshi)
+AddNewColumn=Yangi ustun qo'shing
+TitleChoice=Tanlov yorlig'i
+ExportSpreadsheet=Natija jadvalini eksport qilish
+ExpireDate=Cheklov sanasi
+NbOfSurveys=So'rovnomalar soni
+NbOfVoters=Saylovchilar soni
+SurveyResults=Natijalar
+PollAdminDesc=Sizga "Tartibga solish" tugmasi bilan ushbu so'rovnomadagi barcha ovoz satrlarini o'zgartirishingiz mumkin. Siz shuningdek, ustunni yoki qatorni %s bilan olib tashlashingiz mumkin. Bundan tashqari, %s bilan yangi ustun qo'shishingiz mumkin.
+5MoreChoices=Yana 5 ta tanlov
+Against=Qarshi
+YouAreInivitedToVote=Sizni ushbu so'rovnomada ovoz berishga taklif qilishadi
+VoteNameAlreadyExists=Ushbu nom ushbu so'rovda allaqachon ishlatilgan
+AddADate=Sana qo'shing
+AddStartHour=Boshlanish soatini qo'shing
+AddEndHour=Yakuniy soatni qo'shing
+votes=ovoz (lar)
+NoCommentYet=Ushbu so'rov uchun hali hech qanday sharh qoldirilmagan
+CanComment=Ovoz beruvchilar saylovchilar o'z fikrlarini bildirishlari mumkin
+CanSeeOthersVote=Saylovchilar boshqa odamlarning ovozini ko'rishlari mumkin
+SelectDayDesc=Har bir tanlangan kun uchun siz quyidagi formatdagi yig'ilish soatlarini tanlashingiz mumkin yoki yo'q: <br> - bo'sh, <br> - "8h", "8H" yoki "8:00" uchrashuvning boshlanish soatini berish uchun, <br> - "8- 11 "," 8h-11h "," 8H-11H "yoki" 8: 00-11: 00 "yig'ilishning boshlanish va tugash soatini berish uchun, <br> -" 8h15-11h15 "," 8H15-11H15 "yoki" 8: 15-11: 15 "xuddi shu narsa uchun, lekin daqiqalar bilan.
+BackToCurrentMonth=Joriy oyga qaytish
+ErrorOpenSurveyFillFirstSection=Siz so'rovnoma yaratishning birinchi qismini to'ldirmadingiz
+ErrorOpenSurveyOneChoice=Hech bo'lmaganda bitta tanlovni kiriting
+ErrorInsertingComment=Fikringizni kiritishda xatolik yuz berdi
+MoreChoices=Saylovchilar uchun ko'proq tanlovlarni kiriting
+SurveyExpiredInfo=Ovoz berish yopildi yoki ovoz berishni kechiktirish muddati tugadi.
+EmailSomeoneVoted=%s qatorni to'ldirdi.\nSo'rovnomangizni havoladan topishingiz mumkin:\n%s
 ShowSurvey=Show survey
 UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
diff --git a/htdocs/langs/uz_UZ/orders.lang b/htdocs/langs/uz_UZ/orders.lang
index 87d196eb22f..3dda0fbca6c 100644
--- a/htdocs/langs/uz_UZ/orders.lang
+++ b/htdocs/langs/uz_UZ/orders.lang
@@ -1,166 +1,168 @@
 # Dolibarr language file - Source file is en_US - orders
-OrdersArea=Customers orders area
-SuppliersOrdersArea=Purchase orders area
-OrderCard=Order card
-OrderId=Order Id
-Order=Order
+OrdersArea=Mijozlar buyurtma maydoni
+SuppliersOrdersArea=Sotib olish buyurtmalari maydoni
+OrderCard=Buyurtma kartasi
+OrderId=Buyurtma identifikatori
+Order=Buyurtma
 PdfOrderTitle=Order
-Orders=Orders
-OrderLine=Order line
-OrderDate=Order date
-OrderDateShort=Order date
-OrderToProcess=Order to process
-NewOrder=New order
+Orders=Buyurtmalar
+OrderLine=Buyurtma qatori
+OrderDate=Buyurtma sanasi
+OrderDateShort=Buyurtma sanasi
+OrderToProcess=Qayta ishlash uchun buyurtma
+NewOrder=Yangi buyurtma
+NewSupplierOrderShort=New order
 NewOrderSupplier=New Purchase Order
-ToOrder=Make order
-MakeOrder=Make order
-SupplierOrder=Purchase order
-SuppliersOrders=Purchase orders
+ToOrder=Buyurtma qiling
+MakeOrder=Buyurtma qiling
+SupplierOrder=Xarid buyurtmasi
+SuppliersOrders=Sotib olish uchun buyurtmalar
 SaleOrderLines=Sale order lines
 PurchaseOrderLines=Puchase order lines
-SuppliersOrdersRunning=Current purchase orders
-CustomerOrder=Sales Order
-CustomersOrders=Sales Orders
-CustomersOrdersRunning=Current sales orders
-CustomersOrdersAndOrdersLines=Sales orders and order details
-OrdersDeliveredToBill=Sales orders delivered to bill
-OrdersToBill=Sales orders delivered
-OrdersInProcess=Sales orders in process
-OrdersToProcess=Sales orders to process
-SuppliersOrdersToProcess=Purchase orders to process
+SuppliersOrdersRunning=Amaldagi buyurtmalar
+CustomerOrder=Sotish tartibi
+CustomersOrders=Sotish bo'yicha buyurtmalar
+CustomersOrdersRunning=Joriy savdo buyurtmalari
+CustomersOrdersAndOrdersLines=Savdo buyurtmalari va buyurtma tafsilotlari
+OrdersDeliveredToBill=Savdo buyurtmalari hisob-kitobga etkazildi
+OrdersToBill=Savdo buyurtmalari etkazib berildi
+OrdersInProcess=Savdo buyurtmalari amalga oshirilmoqda
+OrdersToProcess=Savdo buyurtmalarini qayta ishlash
+SuppliersOrdersToProcess=Qayta ishlash uchun buyurtmalarni sotib oling
 SuppliersOrdersAwaitingReception=Purchase orders awaiting reception
 AwaitingReception=Awaiting reception
-StatusOrderCanceledShort=Canceled
-StatusOrderDraftShort=Draft
-StatusOrderValidatedShort=Validated
-StatusOrderSentShort=In process
-StatusOrderSent=Shipment in process
-StatusOrderOnProcessShort=Ordered
-StatusOrderProcessedShort=Processed
-StatusOrderDelivered=Delivered
-StatusOrderDeliveredShort=Delivered
-StatusOrderToBillShort=Delivered
-StatusOrderApprovedShort=Approved
-StatusOrderRefusedShort=Refused
-StatusOrderToProcessShort=To process
-StatusOrderReceivedPartiallyShort=Partially received
-StatusOrderReceivedAllShort=Products received
-StatusOrderCanceled=Canceled
-StatusOrderDraft=Draft (needs to be validated)
-StatusOrderValidated=Validated
-StatusOrderOnProcess=Ordered - Standby reception
-StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
-StatusOrderProcessed=Processed
-StatusOrderToBill=Delivered
-StatusOrderApproved=Approved
-StatusOrderRefused=Refused
-StatusOrderReceivedPartially=Partially received
-StatusOrderReceivedAll=All products received
-ShippingExist=A shipment exists
-QtyOrdered=Qty ordered
-ProductQtyInDraft=Product quantity into draft orders
-ProductQtyInDraftOrWaitingApproved=Product quantity into draft or approved orders, not yet ordered
-MenuOrdersToBill=Orders delivered
-MenuOrdersToBill2=Billable orders
-ShipProduct=Ship product
-CreateOrder=Create Order
-RefuseOrder=Refuse order
-ApproveOrder=Approve order
-Approve2Order=Approve order (second level)
-ValidateOrder=Validate order
-UnvalidateOrder=Unvalidate order
-DeleteOrder=Delete order
-CancelOrder=Cancel order
-OrderReopened= Order %s re-open
-AddOrder=Create order
+StatusOrderCanceledShort=Bekor qilindi
+StatusOrderDraftShort=Qoralama
+StatusOrderValidatedShort=Tasdiqlangan
+StatusOrderSentShort=Jarayonida
+StatusOrderSent=Yuk tashish jarayoni
+StatusOrderOnProcessShort=Buyurtma berildi
+StatusOrderProcessedShort=Qayta ishlangan
+StatusOrderDelivered=Yetkazib berildi
+StatusOrderDeliveredShort=Yetkazib berildi
+StatusOrderToBillShort=Yetkazib berildi
+StatusOrderApprovedShort=Tasdiqlangan
+StatusOrderRefusedShort=Rad etildi
+StatusOrderToProcessShort=Qayta ishlash uchun
+StatusOrderReceivedPartiallyShort=Qisman qabul qilindi
+StatusOrderReceivedAllShort=Qabul qilingan mahsulotlar
+StatusOrderCanceled=Bekor qilindi
+StatusOrderDraft=Qoralama (tasdiqlanishi kerak)
+StatusOrderValidated=Tasdiqlangan
+StatusOrderOnProcess=Buyurtma qilingan - kutish holatida qabul qilish
+StatusOrderOnProcessWithValidation=Buyurtma qilingan - kutish holatida qabul qilish yoki tasdiqlash
+StatusOrderProcessed=Qayta ishlangan
+StatusOrderToBill=Yetkazib berildi
+StatusOrderApproved=Tasdiqlangan
+StatusOrderRefused=Rad etildi
+StatusOrderReceivedPartially=Qisman qabul qilindi
+StatusOrderReceivedAll=Qabul qilingan barcha mahsulotlar
+ShippingExist=Yuk tashish mavjud
+QtyOrdered=Miqdor buyurtma berdi
+ProductQtyInDraft=Buyurtma buyurtmalariga mahsulot miqdori
+ProductQtyInDraftOrWaitingApproved=Mahsulot miqdori hali buyurtma qilinmagan, qoralama yoki tasdiqlangan buyurtmalarga kiradi
+MenuOrdersToBill=Buyurtmalar etkazib berildi
+MenuOrdersToBill2=To'lanadigan buyurtmalar
+ShipProduct=Kema mahsuloti
+CreateOrder=Buyurtma yaratish
+RefuseOrder=Buyurtmani rad etish
+ApproveOrder=Buyurtmani tasdiqlash
+Approve2Order=Buyurtmani tasdiqlash (ikkinchi daraja)
+ValidateOrder=Buyurtmani tasdiqlash
+UnvalidateOrder=Buyurtmani bekor qilish
+DeleteOrder=Buyurtmani o'chirish
+CancelOrder=Buyurtmani bekor qilish
+OrderReopened= %s buyurtmasini qayta oching
+AddOrder=Buyurtma yaratish
+AddSupplierOrderShort=Create order
 AddPurchaseOrder=Create purchase order
-AddToDraftOrders=Add to draft order
-ShowOrder=Show order
-OrdersOpened=Orders to process
-NoDraftOrders=No draft orders
-NoOrder=No order
-NoSupplierOrder=No purchase order
-LastOrders=Latest %s sales orders
-LastCustomerOrders=Latest %s sales orders
-LastSupplierOrders=Latest %s purchase orders
-LastModifiedOrders=Latest %s modified orders
-AllOrders=All orders
-NbOfOrders=Number of orders
-OrdersStatistics=Order's statistics
-OrdersStatisticsSuppliers=Purchase order statistics
-NumberOfOrdersByMonth=Number of orders by month
-AmountOfOrdersByMonthHT=Amount of orders by month (excl. tax)
-ListOfOrders=List of orders
-CloseOrder=Close order
-ConfirmCloseOrder=Are you sure you want to set this order to delivered? Once an order is delivered, it can be set to billed.
-ConfirmDeleteOrder=Are you sure you want to delete this order?
-ConfirmValidateOrder=Are you sure you want to validate this order under name <b>%s</b>?
-ConfirmUnvalidateOrder=Are you sure you want to restore order <b>%s</b> to draft status?
-ConfirmCancelOrder=Are you sure you want to cancel this order?
-ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</b>?
-GenerateBill=Generate invoice
-ClassifyShipped=Classify delivered
-DraftOrders=Draft orders
-DraftSuppliersOrders=Draft purchase orders
-OnProcessOrders=In process orders
-RefOrder=Ref. order
-RefCustomerOrder=Ref. order for customer
-RefOrderSupplier=Ref. order for vendor
-RefOrderSupplierShort=Ref. order vendor
-SendOrderByMail=Send order by mail
-ActionsOnOrder=Events on order
-NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order
-OrderMode=Order method
-AuthorRequest=Request author
-UserWithApproveOrderGrant=Users granted with "approve orders" permission.
-PaymentOrderRef=Payment of order %s
-ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b>?
-DispatchSupplierOrder=Receiving purchase order %s
-FirstApprovalAlreadyDone=First approval already done
-SecondApprovalAlreadyDone=Second approval already done
-SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
-SupplierOrderSubmitedInDolibarr=Purchase Order %s submitted
-SupplierOrderClassifiedBilled=Purchase Order %s set billed
+AddToDraftOrders=Chizma buyurtmasiga qo'shing
+ShowOrder=Buyurtmani ko'rsatish
+OrdersOpened=Qayta ishlash uchun buyurtmalar
+NoDraftOrders=Buyurtmalar loyihasi yo'q
+NoOrder=Buyurtma yo'q
+NoSupplierOrder=Sotib olishga buyurtma yo‘q
+LastOrders=Oxirgi %s savdo buyurtmalari
+LastCustomerOrders=Oxirgi %s savdo buyurtmalari
+LastSupplierOrders=Oxirgi %s buyurtmalari
+LastModifiedOrders=Oxirgi %s o'zgartirilgan buyurtmalar
+AllOrders=Barcha buyurtmalar
+NbOfOrders=Buyurtmalar soni
+OrdersStatistics=Buyurtmaning statistikasi
+OrdersStatisticsSuppliers=Sotib olish to'g'risida buyurtma statistikasi
+NumberOfOrdersByMonth=Oylar bo'yicha buyurtmalar soni
+AmountOfOrdersByMonthHT=Oylar bo'yicha buyurtmalar miqdori (soliqdan tashqari)
+ListOfOrders=Buyurtmalar ro'yxati
+CloseOrder=Buyurtmani yopish
+ConfirmCloseOrder=Ushbu buyurtmani etkazib berishga sozlamoqchimisiz? Buyurtma etkazib berilgandan so'ng, u hisob-kitobga o'rnatilishi mumkin.
+ConfirmDeleteOrder=Ushbu buyurtmani o'chirishni xohlaysizmi?
+ConfirmValidateOrder=Ushbu buyurtmani <b> %s </b> nomi ostida tasdiqlamoqchimisiz?
+ConfirmUnvalidateOrder=Vaziyatni tuzish uchun <b> %s </b> tartibini qayta tiklamoqchimisiz?
+ConfirmCancelOrder=Haqiqatan ham ushbu buyurtmani bekor qilmoqchimisiz?
+ConfirmMakeOrder=Ushbu buyurtmani <b> %s </b> orqali amalga oshirganingizni tasdiqlamoqchimisiz?
+GenerateBill=Hisob-fakturani yarating
+ClassifyShipped=Tasnif yetkazib berildi
+DraftOrders=Buyurtmalar loyihasi
+DraftSuppliersOrders=Xarid buyurtmalarining loyihasi
+OnProcessOrders=Jarayon buyurtmalarida
+RefOrder=Ref. buyurtma
+RefCustomerOrder=Ref. mijoz uchun buyurtma
+RefOrderSupplier=Ref. sotuvchi uchun buyurtma
+RefOrderSupplierShort=Ref. buyurtma sotuvchisi
+SendOrderByMail=Buyurtmani pochta orqali yuboring
+ActionsOnOrder=Buyurtma bo'yicha tadbirlar
+NoArticleOfTypeProduct="Mahsulot" turidagi maqola yo'q, shuning uchun ushbu buyurtma uchun jo'natiladigan maqola yo'q
+OrderMode=Buyurtma usuli
+AuthorRequest=Muallifga murojaat qiling
+UserWithApproveOrderGrant="Buyurtmalarni tasdiqlash" uchun ruxsat berilgan foydalanuvchilar.
+PaymentOrderRef=%s buyurtmasini to'lash
+ConfirmCloneOrder=Ushbu buyurtmani klonlamoqchimisiz <b> %s </b>?
+DispatchSupplierOrder=%s sotib olish buyurtmasini qabul qilish
+FirstApprovalAlreadyDone=Birinchi tasdiqlash allaqachon qilingan
+SecondApprovalAlreadyDone=Ikkinchi tasdiqlash allaqachon amalga oshirilgan
+SupplierOrderReceivedInDolibarr=%s sotib olish buyurtmasi %s qabul qilindi
+SupplierOrderSubmitedInDolibarr=%s sotib olish buyurtmasi taqdim etildi
+SupplierOrderClassifiedBilled=Xarid qilish buyurtmasi %s to'plami taqdim etiladi
 OtherOrders=Other orders
 ##### Types de contacts #####
-TypeContact_commande_internal_SALESREPFOLL=Representative following-up sales order
-TypeContact_commande_internal_SHIPPING=Representative following-up shipping
-TypeContact_commande_external_BILLING=Customer invoice contact
-TypeContact_commande_external_SHIPPING=Customer shipping contact
-TypeContact_commande_external_CUSTOMER=Customer contact following-up order
-TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up purchase order
-TypeContact_order_supplier_internal_SHIPPING=Representative following-up shipping
-TypeContact_order_supplier_external_BILLING=Vendor invoice contact
-TypeContact_order_supplier_external_SHIPPING=Vendor shipping contact
-TypeContact_order_supplier_external_CUSTOMER=Vendor contact following-up order
-Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined
-Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined
-Error_OrderNotChecked=No orders to invoice selected
+TypeContact_commande_internal_SALESREPFOLL=Vakilni kuzatib borish bo'yicha buyurtma
+TypeContact_commande_internal_SHIPPING=Vakilni etkazib berish
+TypeContact_commande_external_BILLING=Mijozlarning hisob-fakturasi bilan aloqa qilish
+TypeContact_commande_external_SHIPPING=Mijozlarni etkazib berish bo'yicha aloqa
+TypeContact_commande_external_CUSTOMER=Buyurtmachining keyingi buyurtmasi bilan bog'lanish
+TypeContact_order_supplier_internal_SALESREPFOLL=Vakilni sotib olish buyurtmasi
+TypeContact_order_supplier_internal_SHIPPING=Vakilni etkazib berish
+TypeContact_order_supplier_external_BILLING=Sotuvchi fakturasi bilan aloqa qilish
+TypeContact_order_supplier_external_SHIPPING=Sotuvchining etkazib berish aloqasi
+TypeContact_order_supplier_external_CUSTOMER=Sotuvchiga murojaat qilishning keyingi buyurtmasi
+Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Doimiy COMMANDE_SUPPLIER_ADDON aniqlanmagan
+Error_COMMANDE_ADDON_NotDefined=Doimiy COMMANDE_ADDON aniqlanmagan
+Error_OrderNotChecked=Hisob-fakturaga buyurtmalar tanlanmadi
 # Order modes (how we receive order). Not the "why" are keys stored into dict.lang
-OrderByMail=Mail
-OrderByFax=Fax
-OrderByEMail=Email
-OrderByWWW=Online
-OrderByPhone=Phone
+OrderByMail=Pochta
+OrderByFax=Faks
+OrderByEMail=Elektron pochta
+OrderByWWW=Onlayn
+OrderByPhone=Telefon
 # Documents models
-PDFEinsteinDescription=A complete order model (old implementation of Eratosthene template)
+PDFEinsteinDescription=Buyurtmaning to'liq modeli (Eratosthene shablonining eski qo'llanilishi)
 PDFEratostheneDescription=A complete order model
-PDFEdisonDescription=A simple order model
-PDFProformaDescription=A complete Proforma invoice template
-CreateInvoiceForThisCustomer=Bill orders
+PDFEdisonDescription=Oddiy buyurtma modeli
+PDFProformaDescription=Proforma hisob-fakturasining to'liq shabloni
+CreateInvoiceForThisCustomer=Bill buyurtmalari
 CreateInvoiceForThisSupplier=Bill orders
-NoOrdersToInvoice=No orders billable
-CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
-OrderCreation=Order creation
-Ordered=Ordered
-OrderCreated=Your orders have been created
-OrderFail=An error happened during your orders creation
-CreateOrders=Create orders
-ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
+NoOrdersToInvoice=Hech qanday buyurtma berilmaydi
+CloseProcessedOrdersAutomatically=Barcha tanlangan buyurtmalarni "Qayta ishlangan" deb tasniflang.
+OrderCreation=Buyurtmani yaratish
+Ordered=Buyurtma berildi
+OrderCreated=Sizning buyurtmalaringiz yaratilgan
+OrderFail=Sizning buyurtmalarni yaratishda xato yuz berdi
+CreateOrders=Buyurtma yarating
+ToBillSeveralOrderSelectCustomer=Bir nechta buyurtmalar uchun hisob-fakturani yaratish uchun avval mijozga bosing, so'ngra "%s" -ni tanlang.
 OptionToSetOrderBilledNotEnabled=Option from module Workflow, to set order to 'Billed' automatically when invoice is validated, is not enabled, so you will have to set the status of orders to 'Billed' manually after the invoice has been generated.
 IfValidateInvoiceIsNoOrderStayUnbilled=If invoice validation is 'No', the order will remain to status 'Unbilled' until the invoice is validated.
-CloseReceivedSupplierOrdersAutomatically=Close order to status "%s" automatically if all products are received.
-SetShippingMode=Set shipping mode
+CloseReceivedSupplierOrdersAutomatically=Agar barcha mahsulotlar olingan bo'lsa, buyurtmani avtomatik ravishda "%s" holatiga qadar yoping.
+SetShippingMode=Yuk tashish rejimini o'rnating
 WithReceptionFinished=With reception finished
 #### supplier orders status
 StatusSupplierOrderCanceledShort=Canceled
diff --git a/htdocs/langs/uz_UZ/other.lang b/htdocs/langs/uz_UZ/other.lang
index 95297a98859..10246a90522 100644
--- a/htdocs/langs/uz_UZ/other.lang
+++ b/htdocs/langs/uz_UZ/other.lang
@@ -1,12 +1,12 @@
 # Dolibarr language file - Source file is en_US - other
-SecurityCode=Security code
-NumberingShort=N°
+SecurityCode=Havfsizlik kodi
+NumberingShort=N °
 Tools=Tools
 TMenuTools=Tools
-ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
-Birthday=Birthday
-BirthdayAlertOn=birthday alert active
-BirthdayAlertOff=birthday alert inactive
+ToolsDesc=Boshqa menyu yozuvlariga kiritilmagan barcha vositalar bu erda to'plangan. <br> Barcha vositalarga chap menyu orqali kirish mumkin.
+Birthday=Tug'ilgan kun
+BirthdayAlertOn=tug'ilgan kun haqida ogohlantirish faol
+BirthdayAlertOff=tug'ilgan kun haqida ogohlantirish faol emas
 TransKey=Translation of the key TransKey
 MonthOfInvoice=Month (number 1-12) of invoice date
 TextMonthOfInvoice=Month (text) of invoice date
@@ -35,221 +35,222 @@ OnlyOneFieldForXAxisIsPossible=Only 1 field is currently possible as X-Axis. Onl
 AtLeastOneMeasureIsRequired=At least 1 field for measure is required
 AtLeastOneXAxisIsRequired=At least 1 field for X-Axis is required
 LatestBlogPosts=Latest Blog Posts
-Notify_ORDER_VALIDATE=Sales order validated
-Notify_ORDER_SENTBYMAIL=Sales order sent by mail
-Notify_ORDER_SUPPLIER_SENTBYMAIL=Purchase order sent by email
-Notify_ORDER_SUPPLIER_VALIDATE=Purchase order recorded
-Notify_ORDER_SUPPLIER_APPROVE=Purchase order approved
-Notify_ORDER_SUPPLIER_REFUSE=Purchase order refused
-Notify_PROPAL_VALIDATE=Customer proposal validated
-Notify_PROPAL_CLOSE_SIGNED=Customer proposal closed signed
-Notify_PROPAL_CLOSE_REFUSED=Customer proposal closed refused
-Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail
-Notify_WITHDRAW_TRANSMIT=Transmission withdrawal
-Notify_WITHDRAW_CREDIT=Credit withdrawal
-Notify_WITHDRAW_EMIT=Perform withdrawal
-Notify_COMPANY_CREATE=Third party created
-Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
-Notify_BILL_VALIDATE=Customer invoice validated
-Notify_BILL_UNVALIDATE=Customer invoice unvalidated
-Notify_BILL_PAYED=Customer invoice paid
-Notify_BILL_CANCEL=Customer invoice canceled
-Notify_BILL_SENTBYMAIL=Customer invoice sent by mail
-Notify_BILL_SUPPLIER_VALIDATE=Vendor invoice validated
-Notify_BILL_SUPPLIER_PAYED=Vendor invoice paid
-Notify_BILL_SUPPLIER_SENTBYMAIL=Vendor invoice sent by mail
-Notify_BILL_SUPPLIER_CANCELED=Vendor invoice cancelled
-Notify_CONTRACT_VALIDATE=Contract validated
+Notify_ORDER_VALIDATE=Savdo buyurtmasi tasdiqlangan
+Notify_ORDER_SENTBYMAIL=Savdo buyurtmasi pochta orqali yuborilgan
+Notify_ORDER_SUPPLIER_SENTBYMAIL=Xarid qilish buyurtmasi elektron pochta orqali yuborilgan
+Notify_ORDER_SUPPLIER_VALIDATE=Sotib olish to'g'risida buyurtma yozib olindi
+Notify_ORDER_SUPPLIER_APPROVE=Xarid qilish tartibi tasdiqlandi
+Notify_ORDER_SUPPLIER_REFUSE=Xarid qilish buyurtmasi rad etildi
+Notify_PROPAL_VALIDATE=Mijozning taklifi tasdiqlandi
+Notify_PROPAL_CLOSE_SIGNED=Mijozlar taklifi imzolangan holda yopildi
+Notify_PROPAL_CLOSE_REFUSED=Mijozlar taklifi yopildi
+Notify_PROPAL_SENTBYMAIL=Tijorat taklifi pochta orqali yuborilgan
+Notify_WITHDRAW_TRANSMIT=Transmissiyani olib qo'yish
+Notify_WITHDRAW_CREDIT=Kredit olish
+Notify_WITHDRAW_EMIT=Cheklashni amalga oshiring
+Notify_COMPANY_CREATE=Uchinchi tomon yaratildi
+Notify_COMPANY_SENTBYMAIL=Uchinchi shaxs kartasidan yuborilgan pochta xabarlari
+Notify_BILL_VALIDATE=Mijozlarning hisob-fakturasi tasdiqlangan
+Notify_BILL_UNVALIDATE=Mijozlarning hisob-fakturasi tasdiqlanmagan
+Notify_BILL_PAYED=Mijozlarning hisob-fakturasi to'landi
+Notify_BILL_CANCEL=Mijozlarning hisob-fakturasi bekor qilindi
+Notify_BILL_SENTBYMAIL=Mijozlarning hisob-fakturasi pochta orqali yuborilgan
+Notify_BILL_SUPPLIER_VALIDATE=Sotuvchi fakturasi tasdiqlangan
+Notify_BILL_SUPPLIER_PAYED=Sotuvchi hisob-fakturasi to'langan
+Notify_BILL_SUPPLIER_SENTBYMAIL=Sotuvchi hisob-fakturasi pochta orqali yuborilgan
+Notify_BILL_SUPPLIER_CANCELED=Sotuvchi fakturasi bekor qilindi
+Notify_CONTRACT_VALIDATE=Shartnoma tasdiqlangan
 Notify_FICHINTER_VALIDATE=Intervention validated
-Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
-Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
-Notify_SHIPPING_VALIDATE=Shipping validated
-Notify_SHIPPING_SENTBYMAIL=Shipping sent by mail
-Notify_MEMBER_VALIDATE=Member validated
-Notify_MEMBER_MODIFY=Member modified
-Notify_MEMBER_SUBSCRIPTION=Member subscribed
-Notify_MEMBER_RESILIATE=Member terminated
-Notify_MEMBER_DELETE=Member deleted
-Notify_PROJECT_CREATE=Project creation
-Notify_TASK_CREATE=Task created
-Notify_TASK_MODIFY=Task modified
-Notify_TASK_DELETE=Task deleted
+Notify_FICHINTER_ADD_CONTACT=Interventsiyaga kontakt qo'shildi
+Notify_FICHINTER_SENTBYMAIL=Pochta orqali yuborilgan aralashuv
+Notify_SHIPPING_VALIDATE=Yuk tashish tasdiqlangan
+Notify_SHIPPING_SENTBYMAIL=Yuk tashish pochta orqali yuborilgan
+Notify_MEMBER_VALIDATE=Ro'yxatdan tasdiqlangan
+Notify_MEMBER_MODIFY=A'zo o'zgartirildi
+Notify_MEMBER_SUBSCRIPTION=A'zo obuna bo'ldi
+Notify_MEMBER_RESILIATE=A'zo tugatildi
+Notify_MEMBER_DELETE=A'zo o'chirildi
+Notify_PROJECT_CREATE=Loyihani yaratish
+Notify_TASK_CREATE=Vazifa yaratildi
+Notify_TASK_MODIFY=Vazifa o'zgartirildi
+Notify_TASK_DELETE=Vazifa o'chirildi
 Notify_EXPENSE_REPORT_VALIDATE=Expense report validated (approval required)
 Notify_EXPENSE_REPORT_APPROVE=Expense report approved
 Notify_HOLIDAY_VALIDATE=Leave request validated (approval required)
 Notify_HOLIDAY_APPROVE=Leave request approved
 Notify_ACTION_CREATE=Added action to Agenda
-SeeModuleSetup=See setup of module %s
-NbOfAttachedFiles=Number of attached files/documents
-TotalSizeOfAttachedFiles=Total size of attached files/documents
-MaxSize=Maximum size
-AttachANewFile=Attach a new file/document
-LinkedObject=Linked object
-NbOfActiveNotifications=Number of notifications (no. of recipient emails)
-PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe lines are separated by a carriage return.\n\n__USER_SIGNATURE__
-PredefinedMailTestHtml=__(Hello)__<br>This is a <b>test</b> mail sent to __EMAIL__ (the word test must be in bold).<br>The lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
+SeeModuleSetup=%s modulini o'rnatishga qarang
+NbOfAttachedFiles=Biriktirilgan fayllar / hujjatlar soni
+TotalSizeOfAttachedFiles=Biriktirilgan fayllar / hujjatlarning umumiy hajmi
+MaxSize=Maksimal o'lcham
+AttachANewFile=Yangi fayl / hujjat biriktiring
+LinkedObject=Bog'langan ob'ekt
+NbOfActiveNotifications=Bildirishnomalar soni (oluvchilarning elektron pochtalari yo'q)
+PredefinedMailTest=__(Salom)__\nBu __EMAIL__ manziliga yuborilgan sinov xati.\nChiziqlar vagonni qaytarish bilan ajralib turadi.\n\n__USER_SIGNATURE__
+PredefinedMailTestHtml=__ (Salom) __ <br> Bu __EMAIL__ manziliga yuborilgan <b> test </b> xati (test so'zi qalin bo'lishi kerak). <br> Chiziqlar aravachaning qaytishi bilan ajralib turadi. <br> <br> __USER_SIGNATURE__
 PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached \n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to remind you that the invoice  __REF__ seems to have not been paid. A copy of the invoice is attached as a reminder.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendProposal=__(Hello)__\n\nPlease find commercial proposal __REF__ attached \n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nPlease find price request __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendOrder=__(Hello)__\n\nPlease find order __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nPlease find our order __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Salom)__\n\nIltimos, __REF__ hisob-fakturasini ilova qiling\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__ (samimiyat bilan) __\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Salom)__\n\nSizga shuni eslatib qo'ymoqchimizki, __REF__ schyoti to'lanmaganga o'xshaydi. Hisob-fakturaning nusxasi eslatma sifatida ilova qilinadi.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__ (samimiyat bilan) __\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Salom)__\n\nIltimos, __REF__ tijorat taklifini ilova qiling\n\n\n__ (samimiyat bilan) __\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__(Salom)__\n\nIltimos, __REF__ narxlari bo'yicha so'rovni ilova qiling\n\n\n__ (samimiyat bilan) __\n\n__USER_SIGNATURE__
+PredefinedMailContentSendOrder=__(Salom)__\n\nIltimos, __REF__ buyurtmasini biriktirilgan holda toping\n\n\n__ (samimiyat bilan) __\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierOrder=__(Salom)__\n\nIltimos, bizning __REF__ buyurtmamizni ilova qiling\n\n\n__ (samimiyat bilan) __\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierInvoice=__(Salom)__\n\nIltimos, __REF__ hisob-fakturasini ilova qiling\n\n\n__ (samimiyat bilan) __\n\n__USER_SIGNATURE__
+PredefinedMailContentSendShipping=__(Salom)__\n\nIltimos, __REF__ jo'natilishini biriktirilgan holda toping\n\n\n__ (samimiyat bilan) __\n\n__USER_SIGNATURE__
+PredefinedMailContentSendFichInter=__(Salom)__\n\nIltimos, __REF__ aralashuvini biriktirilgan holda toping\n\n\n__ (samimiyat bilan) __\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendActionComm=Event reminder "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>This is an automatic message, please do not reply.
-DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
-ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
-ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
-DemoFundation=Manage members of a foundation
-DemoFundation2=Manage members and bank account of a foundation
-DemoCompanyServiceOnly=Company or freelance selling service only
-DemoCompanyShopWithCashDesk=Manage a shop with a cash desk
-DemoCompanyProductAndStocks=Shop selling products with Point Of Sales
+DemoDesc=Dolibarr - bu bir nechta biznes modullarini qo'llab-quvvatlovchi ixcham ERP / CRM. Barcha modullarni namoyish etadigan demo hech qanday ma'noga ega emas, chunki bu stsenariy hech qachon ro'y bermaydi (bir necha yuzta mavjud). Shunday qilib, bir nechta demo profillari mavjud.
+ChooseYourDemoProfil=Sizning ehtiyojlaringizga mos keladigan demo profilini tanlang ...
+ChooseYourDemoProfilMore=... yoki o'zingizning profilingizni yarating <br> (modulni qo'lda tanlash)
+DemoFundation=Jamg'arma a'zolarini boshqarish
+DemoFundation2=Jamg'arma a'zolari va bankdagi hisob raqamlarini boshqarish
+DemoCompanyServiceOnly=Faqat kompaniya yoki erkin sotish xizmati
+DemoCompanyShopWithCashDesk=Kassa bilan do'konni boshqaring
+DemoCompanyProductAndStocks=Savdo nuqtasi bilan mahsulot sotadigan do'kon
 DemoCompanyManufacturing=Company manufacturing products
-DemoCompanyAll=Company with multiple activities (all main modules)
-CreatedBy=Created by %s
-ModifiedBy=Modified by %s
-ValidatedBy=Validated by %s
+DemoCompanyAll=Faoliyati ko'p bo'lgan kompaniya (barcha asosiy modullar)
+CreatedBy=%s tomonidan yaratilgan
+ModifiedBy=%s tomonidan o'zgartirilgan
+ValidatedBy=%s tomonidan tasdiqlangan
 SignedBy=Signed by %s
-ClosedBy=Closed by %s
-CreatedById=User id who created
-ModifiedById=User id who made latest change
-ValidatedById=User id who validated
-CanceledById=User id who canceled
-ClosedById=User id who closed
-CreatedByLogin=User login who created
-ModifiedByLogin=User login who made latest change
-ValidatedByLogin=User login who validated
-CanceledByLogin=User login who canceled
-ClosedByLogin=User login who closed
-FileWasRemoved=File %s was removed
-DirWasRemoved=Directory %s was removed
-FeatureNotYetAvailable=Feature not yet available in the current version
-FeaturesSupported=Supported features
-Width=Width
-Height=Height
-Depth=Depth
-Top=Top
-Bottom=Bottom
-Left=Left
-Right=Right
-CalculatedWeight=Calculated weight
-CalculatedVolume=Calculated volume
-Weight=Weight
-WeightUnitton=ton
+ClosedBy=%s tomonidan yopilgan
+CreatedById=Yaratgan foydalanuvchi identifikatori
+ModifiedById=Oxirgi o'zgarishlarni amalga oshirgan foydalanuvchi identifikatori
+ValidatedById=Tasdiqlangan foydalanuvchi identifikatori
+CanceledById=Bekor qilingan foydalanuvchi identifikatori
+ClosedById=Yopilgan foydalanuvchi identifikatori
+CreatedByLogin=Yaratgan foydalanuvchi login
+ModifiedByLogin=Oxirgi o'zgarishlarni amalga oshirgan foydalanuvchi login
+ValidatedByLogin=Tasdiqlangan foydalanuvchi login
+CanceledByLogin=Bekor qilingan foydalanuvchi kirishi
+ClosedByLogin=Yopilgan foydalanuvchi login
+FileWasRemoved=%s fayli olib tashlandi
+DirWasRemoved=%s katalogi olib tashlandi
+FeatureNotYetAvailable=Xususiyat hozirgi versiyada hali mavjud emas
+FeatureNotAvailableOnDevicesWithoutMouse=Feature not available on devices without mouse
+FeaturesSupported=Qo'llab-quvvatlanadigan xususiyatlar
+Width=Kengligi
+Height=Balandligi
+Depth=Chuqurlik
+Top=Yuqori
+Bottom=Pastki
+Left=Chapda
+Right=To'g'ri
+CalculatedWeight=Hisoblangan vazn
+CalculatedVolume=Hisoblangan hajm
+Weight=Og'irligi
+WeightUnitton=tonna
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
-WeightUnitpound=pound
+WeightUnitpound=funt
 WeightUnitounce=ounce
-Length=Length
+Length=Uzunlik
 LengthUnitm=m
 LengthUnitdm=dm
-LengthUnitcm=cm
+LengthUnitcm=sm
 LengthUnitmm=mm
-Surface=Area
+Surface=Maydon
 SurfaceUnitm2=m²
 SurfaceUnitdm2=dm²
-SurfaceUnitcm2=cm²
+SurfaceUnitcm2=sm²
 SurfaceUnitmm2=mm²
 SurfaceUnitfoot2=ft²
-SurfaceUnitinch2=in²
-Volume=Volume
+SurfaceUnitinch2=m2
+Volume=Tovush
 VolumeUnitm3=m³
 VolumeUnitdm3=dm³ (L)
-VolumeUnitcm3=cm³ (ml)
+VolumeUnitcm3=sm³ (ml)
 VolumeUnitmm3=mm³ (µl)
 VolumeUnitfoot3=ft³
 VolumeUnitinch3=in³
-VolumeUnitounce=ounce
-VolumeUnitlitre=litre
-VolumeUnitgallon=gallon
+VolumeUnitounce=untsiya
+VolumeUnitlitre=litr
+VolumeUnitgallon=galon
 SizeUnitm=m
 SizeUnitdm=dm
-SizeUnitcm=cm
+SizeUnitcm=sm
 SizeUnitmm=mm
-SizeUnitinch=inch
-SizeUnitfoot=foot
-SizeUnitpoint=point
-BugTracker=Bug tracker
-SendNewPasswordDesc=This form allows you to request a new password. It will be sent to your email address.<br>Change will become effective once you click on the confirmation link in the email.<br>Check your inbox.
-BackToLoginPage=Back to login page
-AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br>In this mode, Dolibarr can't know nor change your password.<br>Contact your system administrator if you want to change your password.
-EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
-ProfIdShortDesc=<b>Prof Id %s</b> is an information depending on third party country.<br>For example, for country <b>%s</b>, it's code <b>%s</b>.
-DolibarrDemo=Dolibarr ERP/CRM demo
-StatsByNumberOfUnits=Statistics for sum of qty of products/services
-StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
-NumberOfProposals=Number of proposals
-NumberOfCustomerOrders=Number of sales orders
-NumberOfCustomerInvoices=Number of customer invoices
-NumberOfSupplierProposals=Number of vendor proposals
-NumberOfSupplierOrders=Number of purchase orders
-NumberOfSupplierInvoices=Number of vendor invoices
+SizeUnitinch=dyuym
+SizeUnitfoot=oyoq
+SizeUnitpoint=nuqta
+BugTracker=Xatolarni kuzatuvchi
+SendNewPasswordDesc=Ushbu shakl yangi parolni so'rashga imkon beradi. Bu sizning elektron pochta manzilingizga yuboriladi. <br> O'zgartirish elektron pochtadagi tasdiqlash havolasini bosgandan so'ng kuchga kiradi. <br> pochta qutisini tekshiring.
+BackToLoginPage=Kirish sahifasiga qaytish
+AuthenticationDoesNotAllowSendNewPassword=Autentifikatsiya rejimi <b> %s </b>. <br> Ushbu rejimda Dolibarr parolingizni bilolmaydi va o'zgartira olmaydi. <br> Agar parolingizni o'zgartirmoqchi bo'lsangiz, tizim ma'muringizga murojaat qiling.
+EnableGDLibraryDesc=Ushbu parametrdan foydalanish uchun PHP o'rnatishingizda GD kutubxonasini o'rnating yoki yoqing.
+ProfIdShortDesc= <b> Prof Id %s </b> - bu uchinchi tomon mamlakatiga bog'liq bo'lgan ma'lumot. <br> Masalan, <b> %s </b> mamlakati uchun bu <b> %s a09a4b739f8
+DolibarrDemo=Dolibarr ERP / CRM demo
+StatsByNumberOfUnits=Mahsulotlar / xizmatlar miqdori yig'indisi statistikasi
+StatsByNumberOfEntities=Yo'naltiruvchi tashkilotlarning statistikasi (hisob-fakturalar yoki buyurtmalar ...)
+NumberOfProposals=Takliflar soni
+NumberOfCustomerOrders=Sotish bo'yicha buyurtmalar soni
+NumberOfCustomerInvoices=Mijozlarning hisob-fakturalari soni
+NumberOfSupplierProposals=Yetkazib beruvchilarning takliflari soni
+NumberOfSupplierOrders=Sotib olish uchun buyurtmalar soni
+NumberOfSupplierInvoices=Sotuvchi hisob-fakturalari soni
 NumberOfContracts=Number of contracts
 NumberOfMos=Number of manufacturing orders
-NumberOfUnitsProposals=Number of units on proposals
-NumberOfUnitsCustomerOrders=Number of units on sales orders
-NumberOfUnitsCustomerInvoices=Number of units on customer invoices
-NumberOfUnitsSupplierProposals=Number of units on vendor proposals
-NumberOfUnitsSupplierOrders=Number of units on purchase orders
-NumberOfUnitsSupplierInvoices=Number of units on vendor invoices
+NumberOfUnitsProposals=Takliflar bo'yicha birliklar soni
+NumberOfUnitsCustomerOrders=Savdo buyurtmalaridagi birliklar soni
+NumberOfUnitsCustomerInvoices=Xaridorlarning hisob-fakturalaridagi birliklar soni
+NumberOfUnitsSupplierProposals=Sotuvchilarning takliflari bo'yicha birliklar soni
+NumberOfUnitsSupplierOrders=Xarid qilish buyurtmalaridagi birliklar soni
+NumberOfUnitsSupplierInvoices=Sotuvchi fakturalaridagi birliklar soni
 NumberOfUnitsContracts=Number of units on contracts
 NumberOfUnitsMos=Number of units to produce in manufacturing orders
-EMailTextInterventionAddedContact=A new intervention %s has been assigned to you.
-EMailTextInterventionValidated=The intervention %s has been validated.
-EMailTextInvoiceValidated=Invoice %s has been validated.
+EMailTextInterventionAddedContact=Sizga %s yangi aralashuvi tayinlandi.
+EMailTextInterventionValidated=%s aralashuvi tasdiqlandi.
+EMailTextInvoiceValidated=%s hisob-fakturasi tasdiqlangan.
 EMailTextInvoicePayed=Invoice %s has been paid.
-EMailTextProposalValidated=Proposal %s has been validated.
+EMailTextProposalValidated=%s taklifi tasdiqlandi.
 EMailTextProposalClosedSigned=Proposal %s has been closed signed.
-EMailTextOrderValidated=Order %s has been validated.
-EMailTextOrderApproved=Order %s has been approved.
-EMailTextOrderValidatedBy=Order %s has been recorded by %s.
-EMailTextOrderApprovedBy=Order %s has been approved by %s.
-EMailTextOrderRefused=Order %s has been refused.
-EMailTextOrderRefusedBy=Order %s has been refused by %s.
-EMailTextExpeditionValidated=Shipping %s has been validated.
+EMailTextOrderValidated=%s buyurtmasi tasdiqlangan.
+EMailTextOrderApproved=%s buyurtmasi tasdiqlandi.
+EMailTextOrderValidatedBy=%s buyurtmasi %s tomonidan qayd etilgan.
+EMailTextOrderApprovedBy=%s buyurtmasi %s tomonidan tasdiqlangan.
+EMailTextOrderRefused=%s buyurtmasi rad etildi.
+EMailTextOrderRefusedBy=%s buyurtmasi %s tomonidan rad etildi.
+EMailTextExpeditionValidated=%s jo'natmasi tasdiqlangan.
 EMailTextExpenseReportValidated=Expense report %s has been validated.
 EMailTextExpenseReportApproved=Expense report %s has been approved.
 EMailTextHolidayValidated=Leave request %s has been validated.
 EMailTextHolidayApproved=Leave request %s has been approved.
 EMailTextActionAdded=The action %s has been added to the Agenda.
-ImportedWithSet=Importation data set
-DolibarrNotification=Automatic notification
-ResizeDesc=Enter new width <b>OR</b> new height. Ratio will be kept during resizing...
-NewLength=New width
-NewHeight=New height
-NewSizeAfterCropping=New size after cropping
-DefineNewAreaToPick=Define new area on image to pick (left click on image then drag until you reach the opposite corner)
-CurrentInformationOnImage=This tool was designed to help you to resize or crop an image. This is the information on the current edited image
-ImageEditor=Image editor
+ImportedWithSet=Import ma'lumotlari to'plami
+DolibarrNotification=Avtomatik bildirishnoma
+ResizeDesc=Yangi kenglikni kiriting <b> YOKI </b> yangi balandlik. O'lchamini o'zgartirish paytida nisbat saqlanib qoladi ...
+NewLength=Yangi kenglik
+NewHeight=Yangi balandlik
+NewSizeAfterCropping=Kesishdan keyin yangi o'lcham
+DefineNewAreaToPick=Tanlash uchun rasmdagi yangi maydonni aniqlang (rasmni chap tugmasi bilan bosing va keyin qarama-qarshi burchakka yetguncha harakatlantiring)
+CurrentInformationOnImage=Ushbu vosita rasmning o'lchamini o'zgartirish yoki kesishga yordam berish uchun ishlab chiqilgan. Bu joriy tahrirlangan rasmdagi ma'lumotlar
+ImageEditor=Rasm muharriri
 YouReceiveMailBecauseOfNotification=You receive this message because your email has been added to list of targets to be informed of particular events into %s software of %s.
-YouReceiveMailBecauseOfNotification2=This event is the following:
-ThisIsListOfModules=This is a list of modules preselected by this demo profile (only most common modules are visible in this demo). Edit this to have a more personalized demo and click on "Start".
-UseAdvancedPerms=Use the advanced permissions of some modules
-FileFormat=File format
-SelectAColor=Choose a color
-AddFiles=Add Files
-StartUpload=Start upload
-CancelUpload=Cancel upload
-FileIsTooBig=Files is too big
-PleaseBePatient=Please be patient...
+YouReceiveMailBecauseOfNotification2=Ushbu tadbir quyidagilar:
+ThisIsListOfModules=Bu ushbu demo profil tomonidan oldindan tanlangan modullarning ro'yxati (faqat eng keng tarqalgan modullar ushbu demoda ko'rinadi). Shaxsiy demoga ega bo'lish uchun buni tahrirlang va "Ishga tushirish" tugmasini bosing.
+UseAdvancedPerms=Ba'zi modullarning kengaytirilgan ruxsatlaridan foydalaning
+FileFormat=Fayl formati
+SelectAColor=Rangni tanlang
+AddFiles=Fayllarni qo'shish
+StartUpload=Yuklashni boshlang
+CancelUpload=Yuklashni bekor qilish
+FileIsTooBig=Fayllar juda katta
+PleaseBePatient=Iltimos, sabr qiling ...
 NewPassword=New password
 ResetPassword=Reset password
-RequestToResetPasswordReceived=A request to change your password has been received.
-NewKeyIs=This is your new keys to login
-NewKeyWillBe=Your new key to login to software will be
-ClickHereToGoTo=Click here to go to %s
-YouMustClickToChange=You must however first click on the following link to validate this password change
+RequestToResetPasswordReceived=Parolingizni o'zgartirish to'g'risida so'rov kelib tushdi.
+NewKeyIs=Bu sizning kirish uchun yangi kalitlaringiz
+NewKeyWillBe=Dasturiy ta'minotga kirish uchun yangi kalitingiz bo'ladi
+ClickHereToGoTo=%s ga o'tish uchun shu erni bosing
+YouMustClickToChange=Ushbu parol o'zgarishini tasdiqlash uchun avval siz quyidagi havolani bosishingiz kerak
 ConfirmPasswordChange=Confirm password change
-ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
-IfAmountHigherThan=If amount higher than <strong>%s</strong>
-SourcesRepository=Repository for sources
-Chart=Chart
+ForgetIfNothing=Agar siz ushbu o'zgarishni talab qilmagan bo'lsangiz, ushbu elektron pochtani unutishingiz kifoya. Ma'lumotlaringiz xavfsiz saqlanadi.
+IfAmountHigherThan=Agar miqdori <strong> %s </strong> dan yuqori bo'lsa
+SourcesRepository=Manbalar ombori
+Chart=Diagramma
 PassEncoding=Password encoding
 PermissionsAdd=Permissions added
 PermissionsDelete=Permissions removed
@@ -263,23 +264,23 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
-PrefixSession=Prefix for session ID
+SuffixSessionName=Suffix for session name
 
 ##### Export #####
-ExportsArea=Exports area
-AvailableFormats=Available formats
-LibraryUsed=Library used
-LibraryVersion=Library version
-ExportableDatas=Exportable data
-NoExportableData=No exportable data (no modules with exportable data loaded, or missing permissions)
+ExportsArea=Eksport maydoni
+AvailableFormats=Mavjud formatlar
+LibraryUsed=Kutubxonadan foydalanilgan
+LibraryVersion=Kutubxona versiyasi
+ExportableDatas=Eksport qilinadigan ma'lumotlar
+NoExportableData=Eksport qilinadigan ma'lumotlar yo'q (eksport qilinadigan ma'lumotlar yuklangan yoki ruxsat etishmayotgan modullar mavjud emas)
 ##### External sites #####
-WebsiteSetup=Setup of module website
-WEBSITE_PAGEURL=URL of page
-WEBSITE_TITLE=Title
-WEBSITE_DESCRIPTION=Description
+WebsiteSetup=Modul veb-saytini sozlash
+WEBSITE_PAGEURL=Sahifaning URL manzili
+WEBSITE_TITLE=Sarlavha
+WEBSITE_DESCRIPTION=Tavsif
 WEBSITE_IMAGE=Image
 WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a thumbnail in a list of blog posts). Use __WEBSITE_KEY__ in the path if path depends on website name (for example: image/__WEBSITE_KEY__/stories/myimage.png).
-WEBSITE_KEYWORDS=Keywords
+WEBSITE_KEYWORDS=Kalit so'zlar
 LinesToImport=Lines to import
 
 MemoryUsage=Memory usage
diff --git a/htdocs/langs/uz_UZ/partnership.lang b/htdocs/langs/uz_UZ/partnership.lang
index 09059995a8d..2fb10e8159e 100644
--- a/htdocs/langs/uz_UZ/partnership.lang
+++ b/htdocs/langs/uz_UZ/partnership.lang
@@ -16,41 +16,72 @@
 #
 # Generic
 #
-ModulePartnershipName = Partnership management
-PartnershipDescription = Module Partnership management
+ModulePartnershipName=Partnership management
+PartnershipDescription=Module Partnership management
 PartnershipDescriptionLong= Module Partnership management
 
+AddPartnership=Add partnership
+CancelPartnershipForExpiredMembers=Partnership: Cancel partnership of members with expired subscriptions
+PartnershipCheckBacklink=Partnership: Check referring backlink
+
 #
 # Menu
 #
-NewPartnership = New Partnership
-ListOfPartnerships = List of partnership
+NewPartnership=New Partnership
+ListOfPartnerships=List of partnership
 
 #
 # Admin page
 #
-PartnershipSetup = Partnership setup
-PartnershipAbout = About Partnership
-PartnershipAboutPage = Partnership about page
-
+PartnershipSetup=Partnership setup
+PartnershipAbout=About Partnership
+PartnershipAboutPage=Partnership about page
+partnershipforthirdpartyormember=Partner status must be set on a 'thirdparty' or a 'member'
+PARTNERSHIP_IS_MANAGED_FOR=Partnership managed for
+PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks to check
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb of days before cancelling status of a partnership when a subscription has expired
+ReferingWebsiteCheck=Check of website referring
+ReferingWebsiteCheckDesc=You can enable a feature to check that your partners has added a backlink to your website domains on their own website.
 
 #
 # Object
 #
+DeletePartnership=Delete a partnership
+PartnershipDedicatedToThisThirdParty=Partnership dedicated to this third party
+PartnershipDedicatedToThisMember=Partnership dedicated to this member
 DatePartnershipStart=Start date
 DatePartnershipEnd=End date
+ReasonDecline=Decline reason
+ReasonDeclineOrCancel=Decline reason
+PartnershipAlreadyExist=Partnership already exist
+ManagePartnership=Manage partnership
+BacklinkNotFoundOnPartnerWebsite=Backlink not found on partner website
+ConfirmClosePartnershipAsk=Are you sure you want to cancel this partnership?
+PartnershipType=Partnership type
 
 #
 # Template Mail
 #
+SendingEmailOnPartnershipWillSoonBeCanceled=Partnership will soon be canceled
+SendingEmailOnPartnershipRefused=Partnership refused
+SendingEmailOnPartnershipAccepted=Partnership accepted
+SendingEmailOnPartnershipCanceled=Partnership canceled
 
+YourPartnershipWillSoonBeCanceledTopic=Partnership will soon be canceled
+YourPartnershipRefusedTopic=Partnership refused
+YourPartnershipAcceptedTopic=Partnership accepted
+YourPartnershipCanceledTopic=Partnership canceled
+
+YourPartnershipWillSoonBeCanceledContent=We inform you that your partnership will soon be canceled (Backlink not found)
+YourPartnershipRefusedContent=We inform you that your partnership request has been refused.
+YourPartnershipAcceptedContent=We inform you that your partnership request has been accepted.
+YourPartnershipCanceledContent=We inform you that your partnership has been canceled.
 
 #
 # Status
 #
-PartnershipDraft = Draft
-PartnershipAccepted = Accepted
-PartnershipRefused = Refused
-PartnershipCanceled = Canceled
-
+PartnershipDraft=Draft
+PartnershipAccepted=Accepted
+PartnershipRefused=Refused
+PartnershipCanceled=Canceled
 PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/uz_UZ/paybox.lang b/htdocs/langs/uz_UZ/paybox.lang
index 1bbbef4017b..7dcdbde4a46 100644
--- a/htdocs/langs/uz_UZ/paybox.lang
+++ b/htdocs/langs/uz_UZ/paybox.lang
@@ -1,31 +1,30 @@
 # Dolibarr language file - Source file is en_US - paybox
-PayBoxSetup=PayBox module setup
-PayBoxDesc=This module offer pages to allow payment on <a href="http://www.paybox.com" target="_blank">Paybox</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
-FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
-PaymentForm=Payment form
-WelcomeOnPaymentPage=Welcome to our online payment service
-ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
-ThisIsInformationOnPayment=This is information on payment to do
-ToComplete=To complete
-YourEMail=Email to receive payment confirmation
-Creditor=Creditor
-PaymentCode=Payment code
-PayBoxDoPayment=Pay with Paybox
-YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information
-Continue=Next
-SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
-YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
-YourPaymentHasNotBeenRecorded=Your payment has NOT been recorded and the transaction has been canceled. Thank you.
-AccountParameter=Account parameters
-UsageParameter=Usage parameters
-InformationToFindParameters=Help to find your %s account information
-PAYBOX_CGI_URL_V2=Url of Paybox CGI module for payment
-VendorName=Name of vendor
-CSSUrlForPaymentForm=CSS style sheet url for payment form
-NewPayboxPaymentReceived=New Paybox payment received
-NewPayboxPaymentFailed=New Paybox payment tried but failed
-PAYBOX_PAYONLINE_SENDEMAIL=Email notification after payment attempt (success or fail)
-PAYBOX_PBX_SITE=Value for PBX SITE
-PAYBOX_PBX_RANG=Value for PBX Rang
-PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
+PayBoxSetup=PayBox modulini sozlash
+PayBoxDesc=Ushbu modul mijozlar tomonidan <a href="http://www.paybox.com" target="_blank"> Paybox </a> orqali to'lovlarni amalga oshirishga imkon beradigan sahifalarni taqdim etadi. Bu bepul to'lov uchun yoki ma'lum bir Dolibarr ob'ekti uchun to'lov uchun ishlatilishi mumkin (hisob-faktura, buyurtma, ...)
+FollowingUrlAreAvailableToMakePayments=Dolibarr ob'ektlarida to'lovni amalga oshirish uchun xaridorga sahifani taqdim etish uchun quyidagi URL manzillar mavjud
+PaymentForm=To'lov shakli
+WelcomeOnPaymentPage=Onlayn to'lov xizmatimizga xush kelibsiz
+ThisScreenAllowsYouToPay=Ushbu ekran sizga %s raqamiga onlayn to'lovni amalga oshirishga imkon beradi.
+ThisIsInformationOnPayment=Bu to'lash to'g'risida ma'lumot
+ToComplete=Tugatish uchun
+YourEMail=To'lovni tasdiqlash uchun elektron pochta xabarini yuboring
+Creditor=Kreditor
+PaymentCode=To'lov kodi
+PayBoxDoPayment=Paybox bilan to'lash
+YouWillBeRedirectedOnPayBox=Siz kredit karta ma'lumotlarini kiritish uchun xavfsiz Paybox sahifasida yo'naltirilasiz
+Continue=Keyingi
+SetupPayBoxToHavePaymentCreatedAutomatically=Paybox tomonidan tasdiqlanganida to'lov avtomatik ravishda yaratilishi uchun Paybox-ni url <b> %s </b> bilan sozlang.
+YourPaymentHasBeenRecorded=Ushbu sahifa sizning to'lovingiz yozilganligini tasdiqlaydi. Rahmat.
+YourPaymentHasNotBeenRecorded=Sizning to'lovingiz qayd etilmagan va tranzaksiya bekor qilingan. Rahmat.
+AccountParameter=Hisob parametrlari
+UsageParameter=Foydalanish parametrlari
+InformationToFindParameters=%s hisob qaydnomangiz ma'lumotlarini topishga yordam bering
+PAYBOX_CGI_URL_V2=To'lov uchun Paybox CGI modulining url
+CSSUrlForPaymentForm=To'lov shakli uchun CSS uslublar varag'i url
+NewPayboxPaymentReceived=Yangi Paybox to'lovi qabul qilindi
+NewPayboxPaymentFailed=Paybox-ning yangi to'lovi amalga oshirildi, ammo muvaffaqiyatsiz tugadi
+PAYBOX_PAYONLINE_SENDEMAIL=To'lov amalga oshirilgandan so'ng elektron pochta xabarnomasi (muvaffaqiyatli yoki muvaffaqiyatsiz)
+PAYBOX_PBX_SITE=PBX SITE qiymati
+PAYBOX_PBX_RANG=PBX oralig'i uchun qiymat
+PAYBOX_PBX_IDENTIFIANT=PBX identifikatorining qiymati
 PAYBOX_HMAC_KEY=HMAC key
diff --git a/htdocs/langs/uz_UZ/paypal.lang b/htdocs/langs/uz_UZ/paypal.lang
index 5eb5f389445..70f36596519 100644
--- a/htdocs/langs/uz_UZ/paypal.lang
+++ b/htdocs/langs/uz_UZ/paypal.lang
@@ -1,31 +1,31 @@
 # Dolibarr language file - Source file is en_US - paypal
-PaypalSetup=PayPal module setup
-PaypalDesc=This module allows payment by customers via <a href="http://www.paypal.com" target="_blank">PayPal</a>. This can be used for a ad-hoc payment or for a payment related to a Dolibarr object (invoice, order, ...)
-PaypalOrCBDoPayment=Pay with PayPal (Card or PayPal)
-PaypalDoPayment=Pay with PayPal
-PAYPAL_API_SANDBOX=Mode test/sandbox
-PAYPAL_API_USER=API username
-PAYPAL_API_PASSWORD=API password
-PAYPAL_API_SIGNATURE=API signature
-PAYPAL_SSLVERSION=Curl SSL Version
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer "integral" payment (Credit card+PayPal) or "PayPal" only
-PaypalModeIntegral=Integral
-PaypalModeOnlyPaypal=PayPal only
+PaypalSetup=PayPal modulini sozlash
+PaypalDesc=Ushbu modul mijozlar tomonidan <a href="http://www.paypal.com" target="_blank"> PayPal </a> orqali to'lovlarni amalga oshirishga imkon beradi. Bu vaqtinchalik to'lov uchun yoki Dolibarr ob'ekti bilan bog'liq to'lov uchun ishlatilishi mumkin (hisob-faktura, buyurtma, ...)
+PaypalOrCBDoPayment=PayPal (Card yoki PayPal) bilan to'lash
+PaypalDoPayment=PayPal bilan to'lash
+PAYPAL_API_SANDBOX=Rejim sinovi / qum qutisi
+PAYPAL_API_USER=API foydalanuvchi nomi
+PAYPAL_API_PASSWORD=API paroli
+PAYPAL_API_SIGNATURE=API imzosi
+PAYPAL_SSLVERSION=Curl SSL versiyasi
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Faqat "ajralmas" to'lovni taklif eting (Kredit karta + PayPal) yoki faqat "PayPal"
+PaypalModeIntegral=Ajralmas
+PaypalModeOnlyPaypal=Faqat PayPal
 ONLINE_PAYMENT_CSS_URL=Optional URL of CSS stylesheet on online payment page
-ThisIsTransactionId=This is id of transaction: <b>%s</b>
-PAYPAL_ADD_PAYMENT_URL=Include the PayPal payment url when you send a document by email
+ThisIsTransactionId=Bu tranzaksiya identifikatori: <b> %s </b>
+PAYPAL_ADD_PAYMENT_URL=Hujjatni elektron pochta orqali yuborganingizda PayPal to'lov urlini qo'shing
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
 ONLINE_PAYMENT_SENDEMAIL=Email address for notifications after each payment attempt (for success and fail)
-ReturnURLAfterPayment=Return URL after payment
+ReturnURLAfterPayment=To'lovdan so'ng URL manzilini qaytaring
 ValidationOfOnlinePaymentFailed=Validation of online payment failed
 PaymentSystemConfirmPaymentPageWasCalledButFailed=Payment confirmation page was called by payment system returned an error
-SetExpressCheckoutAPICallFailed=SetExpressCheckout API call failed.
-DoExpressCheckoutPaymentAPICallFailed=DoExpressCheckoutPayment API call failed.
-DetailedErrorMessage=Detailed Error Message
-ShortErrorMessage=Short Error Message
-ErrorCode=Error Code
-ErrorSeverityCode=Error Severity Code
+SetExpressCheckoutAPICallFailed=SetExpressCheckout API chaqiruvi amalga oshmadi.
+DoExpressCheckoutPaymentAPICallFailed=DoExpressCheckoutPayment API chaqiruvi amalga oshmadi.
+DetailedErrorMessage=Batafsil xato xabari
+ShortErrorMessage=Qisqa xato xabari
+ErrorCode=Xato kodi
+ErrorSeverityCode=Xatolik darajasi kodi
 OnlinePaymentSystem=Online payment system
 PaypalLiveEnabled=PayPal "live" mode enabled (otherwise test/sandbox mode)
 PaypalImportPayment=Import PayPal payments
diff --git a/htdocs/langs/uz_UZ/printing.lang b/htdocs/langs/uz_UZ/printing.lang
index cc26879e4f1..4809218456c 100644
--- a/htdocs/langs/uz_UZ/printing.lang
+++ b/htdocs/langs/uz_UZ/printing.lang
@@ -1,52 +1,54 @@
 # Dolibarr language file - Source file is en_US - printing
-Module64000Name=Direct Printing
-Module64000Desc=Enable Direct Printing System
-PrintingSetup=Setup of Direct Printing System
-PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module.
-MenuDirectPrinting=Direct Printing jobs
-DirectPrint=Direct print
-PrintingDriverDesc=Configuration variables for printing driver.
-ListDrivers=List of drivers
-PrintTestDesc=List of Printers.
-FileWasSentToPrinter=File %s was sent to printer
+Module64000Name=To'g'ridan-to'g'ri bosib chiqarish
+Module64000Desc=To'g'ridan-to'g'ri bosib chiqarish tizimini yoqing
+PrintingSetup=To'g'ridan-to'g'ri bosib chiqarish tizimini sozlash
+PrintingDesc=Ushbu modul hujjatni boshqa dasturda ochishga hojat qoldirmasdan, hujjatlarni to'g'ridan-to'g'ri printerga bosib chiqarish uchun turli xil modullarga Chop etish tugmachasini qo'shadi.
+MenuDirectPrinting=To'g'ridan-to'g'ri bosib chiqarish ishlari
+DirectPrint=To'g'ridan-to'g'ri chop etish
+PrintingDriverDesc=Drayverni bosib chiqarish uchun konfiguratsiya o'zgaruvchilari.
+ListDrivers=Haydovchilar ro'yxati
+PrintTestDesc=Printerlar ro'yxati.
+FileWasSentToPrinter=%s fayli printerga yuborildi
 ViaModule=via the module
-NoActivePrintingModuleFound=No active driver to print document. Check setup of module %s.
-PleaseSelectaDriverfromList=Please select a driver from list.
-PleaseConfigureDriverfromList=Please configure the selected driver from list.
-SetupDriver=Driver setup
-TargetedPrinter=Targeted printer
-UserConf=Setup per user
-PRINTGCP_INFO=Google OAuth API setup
-PRINTGCP_AUTHLINK=Authentication
+NoActivePrintingModuleFound=Hujjatni chop etish uchun faol haydovchi yo'q. %s modulini sozlashni tekshiring.
+PleaseSelectaDriverfromList=Ro'yxatdan drayverni tanlang.
+PleaseConfigureDriverfromList=Iltimos, tanlangan drayverni ro'yxatdan sozlang.
+SetupDriver=Haydovchini sozlash
+TargetedPrinter=Maqsadli printer
+UserConf=Har bir foydalanuvchi uchun sozlash
+PRINTGCP_INFO=Google OAuth API-ni sozlash
+PRINTGCP_AUTHLINK=Autentifikatsiya
 PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token
-PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print.
-GCP_Name=Name
-GCP_displayName=Display Name
-GCP_Id=Printer Id
-GCP_OwnerName=Owner Name
-GCP_State=Printer State
-GCP_connectionStatus=Online State
-GCP_Type=Printer Type
-PrintIPPDesc=This driver allow to send documents directly to a printer. It requires a Linux system with CUPS installed.
-PRINTIPP_HOST=Print server
+PrintGCPDesc=Ushbu haydovchi hujjatlarni to'g'ridan-to'g'ri printerga Google Cloud Print yordamida yuborishga imkon beradi.
+GCP_Name=Ism
+GCP_displayName=Ko'rsatiladigan ism
+GCP_Id=Printer identifikatori
+GCP_OwnerName=Egasining ismi
+GCP_State=Printer holati
+GCP_connectionStatus=Onlayn shtat
+GCP_Type=Printer turi
+PrintIPPDesc=Ushbu haydovchi hujjatlarni to'g'ridan-to'g'ri printerga yuborishga imkon beradi. Buning uchun CUPS o'rnatilgan Linux tizimi kerak.
+PRINTIPP_HOST=Serverni chop etish
 PRINTIPP_PORT=Port
-PRINTIPP_USER=Login
-PRINTIPP_PASSWORD=Password
-NoDefaultPrinterDefined=No default printer defined
-DefaultPrinter=Default printer
+PRINTIPP_USER=Kirish
+PRINTIPP_PASSWORD=Parol
+NoDefaultPrinterDefined=Standart printer aniqlanmagan
+DefaultPrinter=Standart printer
 Printer=Printer
-IPP_Uri=Printer Uri
-IPP_Name=Printer Name
-IPP_State=Printer State
-IPP_State_reason=State reason
-IPP_State_reason1=State reason1
+IPP_Uri=Uri printeri
+IPP_Name=Printer nomi
+IPP_State=Printer holati
+IPP_State_reason=Davlat sababi
+IPP_State_reason1=Davlat sababi1
 IPP_BW=BW
-IPP_Color=Color
-IPP_Device=Device
+IPP_Color=Rang
+IPP_Device=Qurilma
 IPP_Media=Printer media
-IPP_Supported=Type of media
-DirectPrintingJobsDesc=This page lists printing jobs found for available printers.
-GoogleAuthNotConfigured=Google OAuth setup not done. Enable module OAuth and set a Google ID/Secret.
-GoogleAuthConfigured=Google OAuth credentials were found into setup of module OAuth.
-PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print.
-PrintTestDescprintgcp=List of Printers for Google Cloud Print.
+IPP_Supported=Ommaviy axborot vositalarining turi
+DirectPrintingJobsDesc=Ushbu sahifada mavjud printerlar uchun topilgan chop etish ishlari ro'yxati keltirilgan.
+GoogleAuthNotConfigured=Google OAuth o'rnatilmagan. OAuth modulini yoqing va Google ID / Secretni o'rnating.
+GoogleAuthConfigured=Google OAuth hisob ma'lumotlari OAuth modulini o'rnatishda topildi.
+PrintingDriverDescprintgcp=Google Cloud Print drayverini chop etish uchun konfiguratsiya o'zgaruvchilari.
+PrintingDriverDescprintipp=Configuration variables for printing driver Cups.
+PrintTestDescprintgcp=Google Cloud Print uchun printerlar ro'yxati.
+PrintTestDescprintipp=List of Printers for Cups.
diff --git a/htdocs/langs/uz_UZ/productbatch.lang b/htdocs/langs/uz_UZ/productbatch.lang
index ad2db658e2e..9e342c12790 100644
--- a/htdocs/langs/uz_UZ/productbatch.lang
+++ b/htdocs/langs/uz_UZ/productbatch.lang
@@ -1,28 +1,28 @@
-# ProductBATCH language file - en_US - ProductBATCH
-ManageLotSerial=Use lot/serial number
-ProductStatusOnBatch=Yes (lot required)
+# ProductBATCH language file - Source file is en_US - ProductBATCH
+ManageLotSerial=Lot / seriya raqamidan foydalaning
+ProductStatusOnBatch=Ha (lot talab qilinadi)
 ProductStatusOnSerial=Yes (unique serial number required)
-ProductStatusNotOnBatch=No (lot/serial not used)
+ProductStatusNotOnBatch=Yo'q (lot / seriya ishlatilmadi)
 ProductStatusOnBatchShort=Lot
 ProductStatusOnSerialShort=Serial
-ProductStatusNotOnBatchShort=No
-Batch=Lot/Serial
-atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
-batch_number=Lot/Serial number
-BatchNumberShort=Lot/Serial
-EatByDate=Eat-by date
-SellByDate=Sell-by date
-DetailBatchNumber=Lot/Serial details
-printBatch=Lot/Serial: %s
-printEatby=Eat-by: %s
-printSellby=Sell-by: %s
-printQty=Qty: %d
-AddDispatchBatchLine=Add a line for Shelf Life dispatching
-WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to 'Decrease real stocks on shipping validation' and automatic increase mode is forced to 'Increase real stocks on manual dispatching into warehouses' and can't be edited. Other options can be defined as you want.
-ProductDoesNotUseBatchSerial=This product does not use lot/serial number
-ProductLotSetup=Setup of module lot/serial
-ShowCurrentStockOfLot=Show current stock for couple product/lot
-ShowLogOfMovementIfLot=Show log of movements for couple product/lot
+ProductStatusNotOnBatchShort=Yo'q
+Batch=Lot / ketma-ket
+atleast1batchfield=Ovqatlanish sanasi yoki Sotish sanasi yoki Lot / Seriya raqami
+batch_number=Lot / seriya raqami
+BatchNumberShort=Lot / ketma-ket
+EatByDate=Ovqatlanish sanasi
+SellByDate=Sotish sanasi
+DetailBatchNumber=Lot / ketma-ket tafsilotlar
+printBatch=Lot / ketma-ket: %s
+printEatby=Ovqatlanish: %s
+printSellby=Sotuvchi: %s
+printQty=Miqdor: %d
+AddDispatchBatchLine=Raf umrini jo'natish uchun qator qo'shing
+WhenProductBatchModuleOnOptionAreForced=Lot / Serial moduli yoqilganda, zaxiralarning avtomatik ravishda pasayishi "Yuk tashishni tasdiqlashda haqiqiy zaxiralarni kamaytirish" ga va avtomatik ravishda ko'payish rejimi "omborlarga qo'lda jo'natishda haqiqiy zaxiralarni ko'paytirishga" majbur qilinadi va ularni tahrirlash mumkin emas. Boshqa variantlarni xohlaganingizcha aniqlash mumkin.
+ProductDoesNotUseBatchSerial=Ushbu mahsulotda lot / seriya raqami ishlatilmaydi
+ProductLotSetup=Modul partiyasini o'rnatish / ketma-ketlik
+ShowCurrentStockOfLot=Er-xotin mahsulot / lot uchun joriy zaxiralarni ko'rsating
+ShowLogOfMovementIfLot=Er-xotin mahsulot / lot uchun harakatlar jurnalini ko'rsating
 StockDetailPerBatch=Stock detail per lot
 SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
@@ -33,3 +33,13 @@ CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+LifeTime=Life span (in days)
+EndOfLife=End of life
+ManufacturingDate=Manufacturing date
+DestructionDate=Destruction date
+FirstUseDate=First use date
+QCFrequency=Quality control frequency (in days)
+
+#Traceability - qc status
+OutOfOrder=Out of order
+InWorkingOrder=In working order
diff --git a/htdocs/langs/uz_UZ/products.lang b/htdocs/langs/uz_UZ/products.lang
index 0875be0dc07..c3866f55c51 100644
--- a/htdocs/langs/uz_UZ/products.lang
+++ b/htdocs/langs/uz_UZ/products.lang
@@ -1,202 +1,202 @@
 # Dolibarr language file - Source file is en_US - products
-ProductRef=Product ref.
-ProductLabel=Product label
-ProductLabelTranslated=Translated product label
-ProductDescription=Product description
-ProductDescriptionTranslated=Translated product description
-ProductNoteTranslated=Translated product note
-ProductServiceCard=Products/Services card
-TMenuProducts=Products
-TMenuServices=Services
-Products=Products
-Services=Services
-Product=Product
-Service=Service
-ProductId=Product/service id
-Create=Create
-Reference=Reference
-NewProduct=New product
-NewService=New service
-ProductVatMassChange=Global VAT Update
-ProductVatMassChangeDesc=This tool updates the VAT rate defined on <b><u>ALL</u></b> products and services!
-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)
+ProductRef=Mahsulot ref.
+ProductLabel=Mahsulot yorlig'i
+ProductLabelTranslated=Tarjima qilingan mahsulot yorlig'i
+ProductDescription=Mahsulot tavsifi
+ProductDescriptionTranslated=Tarjima qilingan mahsulot tavsifi
+ProductNoteTranslated=Tarjima qilingan mahsulot haqida eslatma
+ProductServiceCard=Mahsulotlar / xizmatlar kartasi
+TMenuProducts=Mahsulotlar
+TMenuServices=Xizmatlar
+Products=Mahsulotlar
+Services=Xizmatlar
+Product=Mahsulot
+Service=Xizmat
+ProductId=Mahsulot / xizmat identifikatori
+Create=Yaratmoq
+Reference=Malumot
+NewProduct=Yangi mahsulot
+NewService=Yangi xizmat
+ProductVatMassChange=QQS bo'yicha global yangilanish
+ProductVatMassChangeDesc=Ushbu vosita <b> <u> ALL </u> </b> mahsulotlarida aniqlangan QQS stavkasini yangilaydi!
+MassBarcodeInit=Ommaviy shtrix kod
+MassBarcodeInitDesc=Ushbu sahifadan shtrix-kod aniqlanmagan ob'ektlarda shtrix-kodni boshlash uchun foydalanish mumkin. Modul shtrix-kodini o'rnatish tugamasdan oldin tekshiring.
+ProductAccountancyBuyCode=Buxgalteriya kodi (sotib olish)
 ProductAccountancyBuyIntraCode=Accounting code (purchase intra-community)
 ProductAccountancyBuyExportCode=Accounting code (purchase import)
-ProductAccountancySellCode=Accounting code (sale)
+ProductAccountancySellCode=Buxgalteriya kodi (sotish)
 ProductAccountancySellIntraCode=Accounting code (sale intra-Community)
 ProductAccountancySellExportCode=Accounting code (sale export)
-ProductOrService=Product or Service
-ProductsAndServices=Products and Services
-ProductsOrServices=Products or Services
+ProductOrService=Mahsulot yoki xizmat
+ProductsAndServices=Mahsulotlar va xizmatlar
+ProductsOrServices=Mahsulotlar yoki xizmatlar
 ProductsPipeServices=Products | Services
 ProductsOnSale=Products for sale
 ProductsOnPurchase=Products for purchase
 ProductsOnSaleOnly=Products for sale only
 ProductsOnPurchaseOnly=Products for purchase only
-ProductsNotOnSell=Products not for sale and not for purchase
-ProductsOnSellAndOnBuy=Products for sale and for purchase
+ProductsNotOnSell=Mahsulotlar sotilmaydi va sotib olinmaydi
+ProductsOnSellAndOnBuy=Sotish va sotib olish uchun mahsulotlar
 ServicesOnSale=Services for sale
 ServicesOnPurchase=Services for purchase
 ServicesOnSaleOnly=Services for sale only
 ServicesOnPurchaseOnly=Services for purchase only
-ServicesNotOnSell=Services not for sale and not for purchase
-ServicesOnSellAndOnBuy=Services for sale and for purchase
-LastModifiedProductsAndServices=Latest %s products/services which were modified
-LastRecordedProducts=Latest %s recorded products
-LastRecordedServices=Latest %s recorded services
-CardProduct0=Product
-CardProduct1=Service
-Stock=Stock
+ServicesNotOnSell=Xizmatlar sotilmaydi va sotib olinmaydi
+ServicesOnSellAndOnBuy=Sotish va sotib olish uchun xizmatlar
+LastModifiedProductsAndServices=O'zgartirilgan so'nggi %s mahsulot / xizmatlari
+LastRecordedProducts=Eng so'nggi %s yozilgan mahsulotlar
+LastRecordedServices=Oxirgi %s yozilgan xizmatlari
+CardProduct0=Mahsulot
+CardProduct1=Xizmat
+Stock=Aksiya
 MenuStocks=Stocks
-Stocks=Stocks and location (warehouse) of products
-Movements=Movements
-Sell=Sell
-Buy=Purchase
-OnSell=For sale
-OnBuy=For purchase
-NotOnSell=Not for sale
-ProductStatusOnSell=For sale
-ProductStatusNotOnSell=Not for sale
-ProductStatusOnSellShort=For sale
-ProductStatusNotOnSellShort=Not for sale
-ProductStatusOnBuy=For purchase
-ProductStatusNotOnBuy=Not for purchase
-ProductStatusOnBuyShort=For purchase
-ProductStatusNotOnBuyShort=Not for purchase
-UpdateVAT=Update vat
-UpdateDefaultPrice=Update default price
-UpdateLevelPrices=Update prices for each level
-AppliedPricesFrom=Applied from
-SellingPrice=Selling price
-SellingPriceHT=Selling price (excl. tax)
-SellingPriceTTC=Selling price (inc. tax)
+Stocks=Mahsulotlarning zaxiralari va joylashishi (ombori)
+Movements=Harakatlar
+Sell=Sotish
+Buy=Xarid qilish
+OnSell=Sotuvda
+OnBuy=Sotib olish uchun
+NotOnSell=Sotilmaydi
+ProductStatusOnSell=Sotuvda
+ProductStatusNotOnSell=Sotilmaydi
+ProductStatusOnSellShort=Sotuvda
+ProductStatusNotOnSellShort=Sotilmaydi
+ProductStatusOnBuy=Sotib olish uchun
+ProductStatusNotOnBuy=Sotib olish uchun emas
+ProductStatusOnBuyShort=Sotib olish uchun
+ProductStatusNotOnBuyShort=Sotib olish uchun emas
+UpdateVAT=QQSni yangilang
+UpdateDefaultPrice=Standart narxni yangilang
+UpdateLevelPrices=Har bir daraja uchun narxlarni yangilang
+AppliedPricesFrom=Ilova qilingan
+SellingPrice=Sotish narxi
+SellingPriceHT=Sotish narxi (soliqdan tashqari)
+SellingPriceTTC=Sotish narxi (soliq bilan)
 SellingMinPriceTTC=Minimum Selling price (inc. tax)
-CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
-CostPriceUsage=This value could be used for margin calculation.
-SoldAmount=Sold amount
-PurchasedAmount=Purchased amount
-NewPrice=New price
-MinPrice=Min. selling price
+CostPriceDescription=Ushbu narx sohasi (soliqdan tashqari) ushbu mahsulot kompaniyangizga o'rtacha xarajatlarni qoplash uchun ishlatilishi mumkin. Siz o'zingiz hisoblagan har qanday narx bo'lishi mumkin, masalan, o'rtacha sotib olish narxidan ortiqcha ishlab chiqarish va tarqatish narxidan.
+CostPriceUsage=Ushbu qiymat marjni hisoblash uchun ishlatilishi mumkin.
+SoldAmount=Sotilgan summa
+PurchasedAmount=Xarid qilingan summa
+NewPrice=Yangi narx
+MinPrice=Min. sotish narxi
 EditSellingPriceLabel=Edit selling price label
-CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
-ContractStatusClosed=Closed
-ErrorProductAlreadyExists=A product with reference %s already exists.
-ErrorProductBadRefOrLabel=Wrong value for reference or label.
-ErrorProductClone=There was a problem while trying to clone the product or service.
-ErrorPriceCantBeLowerThanMinPrice=Error, price can't be lower than minimum price.
-Suppliers=Vendors
-SupplierRef=Vendor SKU
-ShowProduct=Show product
-ShowService=Show service
-ProductsAndServicesArea=Product and Services area
-ProductsArea=Product area
-ServicesArea=Services area
-ListOfStockMovements=List of stock movements
-BuyingPrice=Buying price
-PriceForEachProduct=Products with specific prices
-SupplierCard=Vendor card
-PriceRemoved=Price removed
-BarCode=Barcode
-BarcodeType=Barcode type
-SetDefaultBarcodeType=Set barcode type
-BarcodeValue=Barcode value
-NoteNotVisibleOnBill=Note (not visible on invoices, proposals...)
-ServiceLimitedDuration=If product is a service with limited duration:
+CantBeLessThanMinPrice=Sotish narxi ushbu mahsulot uchun ruxsat etilgan minimal qiymatdan past bo'lishi mumkin emas (%s soliqsiz). Agar siz juda muhim chegirma yozsangiz, bu xabar ham paydo bo'lishi mumkin.
+ContractStatusClosed=Yopiq
+ErrorProductAlreadyExists=%s mos yozuvli mahsulot allaqachon mavjud.
+ErrorProductBadRefOrLabel=Malumot yoki yorliq uchun noto'g'ri qiymat.
+ErrorProductClone=Mahsulot yoki xizmatni klonlashda muammo yuz berdi.
+ErrorPriceCantBeLowerThanMinPrice=Xato, narx minimal narxdan past bo'lishi mumkin emas.
+Suppliers=Sotuvchilar
+SupplierRef=Sotuvchi SKU
+ShowProduct=Mahsulotni ko'rsatish
+ShowService=Xizmatni ko'rsatish
+ProductsAndServicesArea=Mahsulot va xizmatlar maydoni
+ProductsArea=Mahsulot maydoni
+ServicesArea=Xizmatlar maydoni
+ListOfStockMovements=Birja harakatlari ro'yxati
+BuyingPrice=Xarid qilish narxi
+PriceForEachProduct=Maxsus narxlarga ega mahsulotlar
+SupplierCard=Sotuvchi kartasi
+PriceRemoved=Narx olib tashlandi
+BarCode=Shtrixli kod
+BarcodeType=Shtrixli kod turi
+SetDefaultBarcodeType=Shtrixli turini o'rnating
+BarcodeValue=Shtrixli qiymat
+NoteNotVisibleOnBill=Izoh (hisob-fakturalarda, takliflarda ko'rinmaydi ...)
+ServiceLimitedDuration=Agar mahsulot cheklangan muddati bo'lgan xizmat bo'lsa:
 FillWithLastServiceDates=Fill with last service line dates
-MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
-MultiPricesNumPrices=Number of prices
+MultiPricesAbility=Bir mahsulot / xizmat uchun bir nechta narx segmentlari (har bir mijoz bitta narx segmentida)
+MultiPricesNumPrices=Narxlar soni
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Enable Kits (set of several products)
+AssociatedProductsAbility=To'plamlarni yoqing (bir nechta mahsulot to'plami)
 VariantsAbility=Enable Variants (variations of products, for example color, size)
-AssociatedProducts=Kits
-AssociatedProductsNumber=Number of products composing this kit
-ParentProductsNumber=Number of parent packaging product
-ParentProducts=Parent products
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
-KeywordFilter=Keyword filter
-CategoryFilter=Category filter
-ProductToAddSearch=Search product to add
-NoMatchFound=No match found
-ListOfProductsServices=List of products/services
-ProductAssociationList=List of products/services that are component(s) of this kit
-ProductParentList=List of kits with this product as a component
-ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
-DeleteProduct=Delete a product/service
-ConfirmDeleteProduct=Are you sure you want to delete this product/service?
-ProductDeleted=Product/Service "%s" deleted from database.
-ExportDataset_produit_1=Products
-ExportDataset_service_1=Services
-ImportDataset_produit_1=Products
-ImportDataset_service_1=Services
-DeleteProductLine=Delete product line
-ConfirmDeleteProductLine=Are you sure you want to delete this product line?
-ProductSpecial=Special
-QtyMin=Min. purchase quantity
-PriceQtyMin=Price quantity min.
+AssociatedProducts=To'plamlar
+AssociatedProductsNumber=Ushbu to'plamni tashkil etadigan mahsulotlar soni
+ParentProductsNumber=Ota-ona mahsuloti soni
+ParentProducts=Ota-ona mahsulotlari
+IfZeroItIsNotAVirtualProduct=Agar 0 bo'lsa, bu mahsulot to'plam emas
+IfZeroItIsNotUsedByVirtualProduct=Agar 0 bo'lsa, ushbu mahsulot biron bir to'plam tomonidan ishlatilmaydi
+KeywordFilter=Kalit so'z filtri
+CategoryFilter=Turkum filtri
+ProductToAddSearch=Qo'shish uchun mahsulotni qidiring
+NoMatchFound=Hech narsa topilmadi
+ListOfProductsServices=Mahsulotlar / xizmatlar ro'yxati
+ProductAssociationList=Ushbu to'plamning tarkibiy qismlari bo'lgan mahsulotlar / xizmatlar ro'yxati
+ProductParentList=Ushbu mahsulot tarkibiy qism sifatida to'plamlari ro'yxati
+ErrorAssociationIsFatherOfThis=Tanlangan mahsulotlardan biri joriy mahsulotga ega bo'lgan ota-ona hisoblanadi
+DeleteProduct=Mahsulot / xizmatni o'chirib tashlang
+ConfirmDeleteProduct=Ushbu mahsulotni / xizmatni o'chirishni xohlaysizmi?
+ProductDeleted=Ma'lumotlar bazasidan o'chirilgan "%s" mahsuloti / xizmati.
+ExportDataset_produit_1=Mahsulotlar
+ExportDataset_service_1=Xizmatlar
+ImportDataset_produit_1=Mahsulotlar
+ImportDataset_service_1=Xizmatlar
+DeleteProductLine=Mahsulot qatorini o'chirib tashlang
+ConfirmDeleteProductLine=Ushbu mahsulot qatorini o'chirishni xohlaysizmi?
+ProductSpecial=Maxsus
+QtyMin=Min. sotib olish miqdori
+PriceQtyMin=Narx miqdori min.
 PriceQtyMinCurrency=Price (currency) for this qty. (no discount)
-VATRateForSupplierProduct=VAT Rate (for this vendor/product)
-DiscountQtyMin=Discount for this qty.
-NoPriceDefinedForThisSupplier=No price/qty defined for this vendor/product
-NoSupplierPriceDefinedForThisProduct=No vendor price/qty defined for this product
+VATRateForSupplierProduct=QQS stavkasi (ushbu sotuvchi / mahsulot uchun)
+DiscountQtyMin=Ushbu miqdor uchun chegirma.
+NoPriceDefinedForThisSupplier=Ushbu sotuvchi / mahsulot uchun narx / miqdor aniqlanmagan
+NoSupplierPriceDefinedForThisProduct=Ushbu mahsulot uchun sotuvchi narxi / miqdori aniqlanmagan
 PredefinedItem=Predefined item
-PredefinedProductsToSell=Predefined Product
-PredefinedServicesToSell=Predefined Service
-PredefinedProductsAndServicesToSell=Predefined products/services to sell
-PredefinedProductsToPurchase=Predefined product to purchase
-PredefinedServicesToPurchase=Predefined services to purchase
-PredefinedProductsAndServicesToPurchase=Predefined products/services to purchase
-NotPredefinedProducts=Not predefined products/services
-GenerateThumb=Generate thumb
-ServiceNb=Service #%s
-ListProductServiceByPopularity=List of products/services by popularity
-ListProductByPopularity=List of products by popularity
-ListServiceByPopularity=List of services by popularity
-Finished=Manufactured product
-RowMaterial=Raw Material
-ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
-CloneContentProduct=Clone all main information of the product/service
-ClonePricesProduct=Clone prices
+PredefinedProductsToSell=Oldindan belgilangan mahsulot
+PredefinedServicesToSell=Oldindan belgilangan xizmat
+PredefinedProductsAndServicesToSell=Sotish uchun oldindan belgilangan mahsulotlar / xizmatlar
+PredefinedProductsToPurchase=Sotib olish uchun oldindan belgilangan mahsulot
+PredefinedServicesToPurchase=Xarid qilish uchun oldindan belgilangan xizmatlar
+PredefinedProductsAndServicesToPurchase=Sotib olish uchun oldindan belgilangan mahsulotlar / xizmatlar
+NotPredefinedProducts=Oldindan belgilangan mahsulotlar / xizmatlar emas
+GenerateThumb=Bosh barmog'ini yarating
+ServiceNb=Xizmat # %s
+ListProductServiceByPopularity=Ommabopligi bo'yicha mahsulotlar / xizmatlar ro'yxati
+ListProductByPopularity=Ommabopligi bo'yicha mahsulotlar ro'yxati
+ListServiceByPopularity=Ommabopligi bo'yicha xizmatlarning ro'yxati
+Finished=Ishlab chiqarilgan mahsulot
+RowMaterial=Xom ashyo
+ConfirmCloneProduct=<b> %s </b> mahsulotini yoki xizmatini klonlamoqchimisiz?
+CloneContentProduct=Mahsulot / xizmatning barcha asosiy ma'lumotlarini klonlash
+ClonePricesProduct=Klon narxlari
 CloneCategoriesProduct=Clone linked tags/categories
-CloneCompositionProduct=Clone virtual products/services
-CloneCombinationsProduct=Clone the product variants
-ProductIsUsed=This product is used
-NewRefForClone=Ref. of new product/service
-SellingPrices=Selling prices
-BuyingPrices=Buying prices
-CustomerPrices=Customer prices
-SuppliersPrices=Vendor prices
-SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs|Commodity|HS code
-CountryOrigin=Country of origin
+CloneCompositionProduct=Virtual mahsulotlar / xizmatlarni klonlash
+CloneCombinationsProduct=Mahsulot variantlarini klonlash
+ProductIsUsed=Ushbu mahsulot ishlatilgan
+NewRefForClone=Ref. yangi mahsulot / xizmat
+SellingPrices=Sotish narxi
+BuyingPrices=Xarid qilish narxlari
+CustomerPrices=Mijozlar narxlari
+SuppliersPrices=Sotuvchi narxlari
+SuppliersPricesOfProductsOrServices=Sotuvchi narxlari (mahsulotlar yoki xizmatlar)
+CustomCode=Bojxona | Tovar | HS kodi
+CountryOrigin=Ishlab chiqaruvchi mamlakat; ta'minotchi mamlakat
 RegionStateOrigin=Region of origin
 StateOrigin=State|Province of origin
-Nature=Nature of product (raw/manufactured)
+Nature=Mahsulotning tabiati (xom / ishlab chiqarilgan)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or manufactured product
-ShortLabel=Short label
-Unit=Unit
-p=u.
-set=set
-se=set
-second=second
+ShortLabel=Qisqa yorliq
+Unit=Birlik
+p=siz.
+set=o'rnatilgan
+se=o'rnatilgan
+second=ikkinchi
 s=s
-hour=hour
+hour=soat
 h=h
-day=day
+day=kun
 d=d
-kilogram=kilogram
+kilogram=kilogramm
 kg=Kg
-gram=gram
+gram=gramm
 g=g
-meter=meter
+meter=metr
 m=m
 lm=lm
 m2=m²
 m3=m³
-liter=liter
+liter=litr
 l=L
 unitP=Piece
 unitSET=Set
@@ -235,106 +235,106 @@ unitFT3=ft³
 unitIN3=in³
 unitOZ3=ounce
 unitgallon=gallon
-ProductCodeModel=Product ref template
-ServiceCodeModel=Service ref template
-CurrentProductPrice=Current price
-AlwaysUseNewPrice=Always use current price of product/service
-AlwaysUseFixedPrice=Use the fixed price
-PriceByQuantity=Different prices by quantity
+ProductCodeModel=Mahsulot ref shabloni
+ServiceCodeModel=Xizmat ko'rsatuvchi shablon
+CurrentProductPrice=Joriy narx
+AlwaysUseNewPrice=Har doim mahsulot / xizmatning joriy narxidan foydalaning
+AlwaysUseFixedPrice=Belgilangan narxdan foydalaning
+PriceByQuantity=Miqdoriga ko'ra har xil narxlar
 DisablePriceByQty=Disable prices by quantity
-PriceByQuantityRange=Quantity range
-MultipriceRules=Automatic prices for segment
-UseMultipriceRules=Use price segment rules (defined into product module setup) to auto calculate prices of all other segments according to first segment
-PercentVariationOver=%% variation over %s
-PercentDiscountOver=%% discount over %s
+PriceByQuantityRange=Miqdor oralig'i
+MultipriceRules=Segment uchun avtomatik narxlar
+UseMultipriceRules=Boshqa segmentlarning narxlarini birinchi segmentga muvofiq avtomatik hisoblash uchun narx segmenti qoidalaridan foydalaning (mahsulot moduli sozlamalarida belgilangan)
+PercentVariationOver=%% ning %s orqali o'zgarishi
+PercentDiscountOver=%% %s orqali chegirma
 KeepEmptyForAutoCalculation=Keep empty to have this calculated automatically from weight or volume of products
 VariantRefExample=Examples: COL, SIZE
 VariantLabelExample=Examples: Color, Size
 ### composition fabrication
-Build=Produce
-ProductsMultiPrice=Products and prices for each price segment
-ProductsOrServiceMultiPrice=Customer prices (of products or services, multi-prices)
-ProductSellByQuarterHT=Products turnover quarterly before tax
-ServiceSellByQuarterHT=Services turnover quarterly before tax
-Quarter1=1st. Quarter
-Quarter2=2nd. Quarter
-Quarter3=3rd. Quarter
-Quarter4=4th. Quarter
-BarCodePrintsheet=Print barcode
-PageToGenerateBarCodeSheets=With this tool, you can print sheets of barcode stickers. Choose format of your sticker page, type of barcode and value of barcode, then click on button <b>%s</b>.
-NumberOfStickers=Number of stickers to print on page
-PrintsheetForOneBarCode=Print several stickers for one barcode
-BuildPageToPrint=Generate page to print
-FillBarCodeTypeAndValueManually=Fill barcode type and value manually.
-FillBarCodeTypeAndValueFromProduct=Fill barcode type and value from barcode of a product.
-FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a third party.
-DefinitionOfBarCodeForProductNotComplete=Definition of type or value of barcode not complete for product %s.
-DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of barcode non complete for third party %s.
-BarCodeDataForProduct=Barcode information of product %s:
-BarCodeDataForThirdparty=Barcode information of third party %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
-PricingRule=Rules for selling prices
-AddCustomerPrice=Add price by customer
-ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
-PriceByCustomerLog=Log of previous customer prices
-MinimumPriceLimit=Minimum price can't be lower then %s
-MinimumRecommendedPrice=Minimum recommended price is: %s
-PriceExpressionEditor=Price expression editor
-PriceExpressionSelected=Selected price expression
-PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions
-PriceExpressionEditorHelp2=You can access ExtraFields with variables like <b>#extrafield_myextrafieldkey#</b> and global variables with <b>#global_mycode#</b>
-PriceExpressionEditorHelp3=In both product/service and vendor prices there are these variables available:<br><b>#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#</b>
-PriceExpressionEditorHelp4=In product/service price only: <b>#supplier_min_price#</b><br>In vendor prices only: <b>#supplier_quantity# and #supplier_tva_tx#</b>
-PriceExpressionEditorHelp5=Available global values:
-PriceMode=Price mode
-PriceNumeric=Number
-DefaultPrice=Default price
+Build=Mahsulot
+ProductsMultiPrice=Har bir narx segmenti uchun mahsulotlar va narxlar
+ProductsOrServiceMultiPrice=Mijozlar narxlari (mahsulotlar yoki xizmatlar, ko'p narxlar)
+ProductSellByQuarterHT=Mahsulot aylanmasi soliqdan oldin har chorakda
+ServiceSellByQuarterHT=Xizmatlar aylanmasi soliq to'lashdan oldin har chorakda
+Quarter1=1-chi. Chorak
+Quarter2=2-chi. Chorak
+Quarter3=3-chi. Chorak
+Quarter4=4-chi. Chorak
+BarCodePrintsheet=Shtrixli kodni chop eting
+PageToGenerateBarCodeSheets=Ushbu vosita yordamida siz shtrix-stiker varaqlarini chop etishingiz mumkin. Stiker sahifangizning formatini, shtrix-kod turini va shtrix-kodning qiymatini tanlang, so'ng <b> %s </b> tugmachasini bosing.
+NumberOfStickers=Sahifada chop etiladigan stikerlar soni
+PrintsheetForOneBarCode=Bitta shtrix-kod uchun bir nechta stikerlarni chop eting
+BuildPageToPrint=Chop etish uchun sahifa yarating
+FillBarCodeTypeAndValueManually=Shtrixli kod turini va qiymatini qo'lda to'ldiring.
+FillBarCodeTypeAndValueFromProduct=Shtrixli kod turini va mahsulotning shtrix kodidagi qiymatini to'ldiring.
+FillBarCodeTypeAndValueFromThirdParty=Shtrixli kodning turini va qiymatini uchinchi tomonning shtrix kodidan to'ldiring.
+DefinitionOfBarCodeForProductNotComplete=%s mahsuloti uchun shtrix kodning turi yoki qiymatining ta'rifi to'liq emas.
+DefinitionOfBarCodeForThirdpartyNotComplete=%s uchinchi tomon uchun to'liq bo'lmagan shtrix-kod turini yoki qiymatini aniqlash.
+BarCodeDataForProduct=%s mahsulotining shtrix kodi haqida ma'lumot:
+BarCodeDataForThirdparty=Uchinchi tomonning shtrix kodi %s ma'lumotlari:
+ResetBarcodeForAllRecords=Barcha yozuvlar uchun shtrix qiymatini belgilang (bu shuningdek, yangi qiymatlar bilan belgilangan shtrix qiymatini qayta tiklaydi)
+PriceByCustomer=Har bir mijoz uchun har xil narxlar
+PriceCatalogue=Mahsulot / xizmat uchun bitta sotish narxi
+PricingRule=Narxlarni sotish qoidalari
+AddCustomerPrice=Xaridor tomonidan narx qo'shing
+ForceUpdateChildPriceSoc=Mijozlarning sho'ba korxonalarida bir xil narxni belgilang
+PriceByCustomerLog=Avvalgi mijozlar narxlari jurnali
+MinimumPriceLimit=Minimal narx %s dan past bo'lishi mumkin emas
+MinimumRecommendedPrice=Minimal tavsiya etilgan narx: %s
+PriceExpressionEditor=Narxlarni ifodalash muharriri
+PriceExpressionSelected=Tanlangan narx ifodasi
+PriceExpressionEditorHelp1=narxni belgilash uchun "price = 2 + 2" yoki "2 + 2". Foydalanish; iboralarni ajratish
+PriceExpressionEditorHelp2=ExtraFields-ga <b> # extrafield_myextrafieldkey # </b> va <b> # global_mycode # </b> kabi o'zgaruvchilar bilan kirishingiz mumkin.
+PriceExpressionEditorHelp3=Ikkala mahsulot / xizmat va sotuvchilar narxlarida quyidagi o'zgaruvchilar mavjud: <br> <b> # tva_tx # # localtax1_tx # # localtax2_tx # # weight # # length # # surface # # price_min # </b>
+PriceExpressionEditorHelp4=Faqat mahsulot / xizmat narxida: <b> # Supply_min_price # </b> <br> Faqat sotuvchilar narxlarida: <b> # Supply_quantity # and # Suppli_tva_tx # a0a
+PriceExpressionEditorHelp5=Mavjud global qadriyatlar:
+PriceMode=Narx rejimi
+PriceNumeric=Raqam
+DefaultPrice=Standart narx
 DefaultPriceLog=Log of previous default prices
-ComposedProductIncDecStock=Increase/Decrease stock on parent change
-ComposedProduct=Child products
-MinSupplierPrice=Minimum buying price
-MinCustomerPrice=Minimum selling price
-DynamicPriceConfiguration=Dynamic price configuration
-DynamicPriceDesc=You may define mathematical formulae to calculate Customer or Vendor prices. Such formulas can use all mathematical operators, some constants and variables. You can define here the variables you wish to use. If the variable needs an automatic update, you may define the external URL to allow Dolibarr to update the value automatically.
-AddVariable=Add Variable
-AddUpdater=Add Updater
-GlobalVariables=Global variables
-VariableToUpdate=Variable to update
-GlobalVariableUpdaters=External updaters for variables
+ComposedProductIncDecStock=Ota-onalarni almashtirishda zaxiralarni ko'paytirish / kamaytirish
+ComposedProduct=Bolalar uchun mo'ljallangan mahsulotlar
+MinSupplierPrice=Minimal sotib olish narxi
+MinCustomerPrice=Minimal sotish narxi
+DynamicPriceConfiguration=Dinamik narx konfiguratsiyasi
+DynamicPriceDesc=Siz xaridor yoki sotuvchi narxlarini hisoblash uchun matematik formulalarni belgilashingiz mumkin. Bunday formulalar barcha matematik operatorlardan, ba'zi bir doimiy va o'zgaruvchilardan foydalanishi mumkin. Siz bu erda foydalanmoqchi bo'lgan o'zgaruvchilarni belgilashingiz mumkin. Agar o'zgaruvchiga avtomatik yangilanish kerak bo'lsa, siz Dolibarr-ga qiymatni avtomatik ravishda yangilashiga ruxsat berish uchun tashqi URL manzilini belgilashingiz mumkin.
+AddVariable=O'zgaruvchini qo'shish
+AddUpdater=Updater-ni qo'shing
+GlobalVariables=Global o'zgaruvchilar
+VariableToUpdate=Yangilanadigan o'zgaruvchi
+GlobalVariableUpdaters=O'zgaruvchilar uchun tashqi yangilanuvchilar
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
 GlobalVariableUpdaterHelpFormat0=Format for request {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
 GlobalVariableUpdaterType1=WebService data
 GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
 GlobalVariableUpdaterHelpFormat1=Format for request is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data", "to": "send"}}
-UpdateInterval=Update interval (minutes)
-LastUpdated=Latest update
-CorrectlyUpdated=Correctly updated
-PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
-PropalMergePdfProductChooseFile=Select PDF files
-IncludingProductWithTag=Include products/services with tag
-DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
-WarningSelectOneDocument=Please select at least one document
-DefaultUnitToShow=Unit
-NbOfQtyInProposals=Qty in proposals
-ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
+UpdateInterval=Yangilash oralig'i (daqiqa)
+LastUpdated=Oxirgi yangilanish
+CorrectlyUpdated=To'g'ri yangilangan
+PropalMergePdfProductActualFile=PDF-ga qo'shish uchun ishlatiladigan fayllar Azur are / is
+PropalMergePdfProductChooseFile=PDF-fayllarni tanlang
+IncludingProductWithTag=Mahsulotlarni / xizmatlarni yorlig'i bilan qo'shing
+DefaultPriceRealPriceMayDependOnCustomer=Standart narx, haqiqiy narx mijozga bog'liq bo'lishi mumkin
+WarningSelectOneDocument=Iltimos, kamida bitta hujjatni tanlang
+DefaultUnitToShow=Birlik
+NbOfQtyInProposals=Takliflar soni
+ClinkOnALinkOfColumn=Batafsil ko'rinishni olish uchun %s ustunining havolasini bosing ...
 ProductsOrServicesTranslations=Products/Services translations
-TranslatedLabel=Translated label
-TranslatedDescription=Translated description
-TranslatedNote=Translated notes
-ProductWeight=Weight for 1 product
-ProductVolume=Volume for 1 product
-WeightUnits=Weight unit
-VolumeUnits=Volume unit
+TranslatedLabel=Tarjima qilingan yorliq
+TranslatedDescription=Tarjima qilingan tavsif
+TranslatedNote=Tarjima qilingan yozuvlar
+ProductWeight=1 mahsulot uchun vazn
+ProductVolume=1 ta mahsulot uchun hajm
+WeightUnits=Og'irlik birligi
+VolumeUnits=Tovush birligi
 WidthUnits=Width unit
 LengthUnits=Length unit
 HeightUnits=Height unit
 SurfaceUnits=Surface unit
-SizeUnits=Size unit
-DeleteProductBuyPrice=Delete buying price
-ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
+SizeUnits=Hajmi birligi
+DeleteProductBuyPrice=Xarid narxini o'chirish
+ConfirmDeleteProductBuyPrice=Ushbu xarid narxini o'chirishni xohlaysizmi?
 SubProduct=Sub product
 ProductSheet=Product sheet
 ServiceSheet=Service sheet
@@ -396,3 +396,5 @@ ActionAvailableOnVariantProductOnly=Action only available on the variant of prod
 ProductsPricePerCustomer=Product prices per customers
 ProductSupplierExtraFields=Additional Attributes (Supplier Prices)
 DeleteLinkedProduct=Delete the child product linked to the combination
+PMPValue=Weighted average price
+PMPValueShort=WAP
diff --git a/htdocs/langs/uz_UZ/projects.lang b/htdocs/langs/uz_UZ/projects.lang
index 79c974f6e24..3f82199372e 100644
--- a/htdocs/langs/uz_UZ/projects.lang
+++ b/htdocs/langs/uz_UZ/projects.lang
@@ -1,240 +1,240 @@
 # Dolibarr language file - Source file is en_US - projects
-RefProject=Ref. project
-ProjectRef=Project ref.
-ProjectId=Project Id
-ProjectLabel=Project label
-ProjectsArea=Projects Area
-ProjectStatus=Project status
-SharedProject=Everybody
-PrivateProject=Project contacts
+RefProject=Ref. loyiha
+ProjectRef=Loyiha ref.
+ProjectId=Loyiha identifikatori
+ProjectLabel=Loyiha yorlig'i
+ProjectsArea=Loyihalar maydoni
+ProjectStatus=Loyiha holati
+SharedProject=Hamma
+PrivateProject=Loyiha bo'yicha aloqalar
 ProjectsImContactFor=Projects for which I am explicitly a contact
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=All projects
-MyProjectsDesc=This view is limited to the projects that you are a contact for
-ProjectsPublicDesc=This view presents all projects you are allowed to read.
-TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
-ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
-ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything).
-TasksOnProjectsDesc=This view presents all tasks on all projects (your user permissions grant you permission to view everything).
-MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
-OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
-ClosedProjectsAreHidden=Closed projects are not visible.
-TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
-TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
-AllTaskVisibleButEditIfYouAreAssigned=All tasks for qualified projects are visible, but you can enter time only for task assigned to selected user. Assign task if you need to enter time on it.
-OnlyYourTaskAreVisible=Only tasks assigned to you are visible. If you need to enter time on a task and if the task is not visible here, then you need to assign the task to yourself.
-ImportDatasetTasks=Tasks of projects
+MyProjectsDesc=Ushbu ko'rinish faqat siz aloqada bo'lgan loyihalar bilan cheklangan
+ProjectsPublicDesc=Ushbu ko'rinish sizga o'qishga ruxsat berilgan barcha loyihalarni taqdim etadi.
+TasksOnProjectsPublicDesc=Ushbu ko'rinish sizga o'qishga ruxsat berilgan loyihalar bo'yicha barcha vazifalarni taqdim etadi.
+ProjectsPublicTaskDesc=Ushbu ko'rinish sizga o'qishga ruxsat berilgan barcha loyihalar va vazifalarni taqdim etadi.
+ProjectsDesc=Ushbu ko'rinish barcha loyihalarni taqdim etadi (foydalanuvchi ruxsatlari sizga hamma narsani ko'rishga ruxsat beradi).
+TasksOnProjectsDesc=Ushbu ko'rinish barcha loyihalardagi barcha vazifalarni taqdim etadi (foydalanuvchi ruxsatlari sizga hamma narsani ko'rishga ruxsat beradi).
+MyTasksDesc=Ushbu ko'rinish faqat siz aloqada bo'lgan loyihalar yoki vazifalar bilan cheklangan
+OnlyOpenedProject=Faqat ochiq loyihalar ko'rinadi (qoralama yoki yopiq holatdagi loyihalar ko'rinmaydi).
+ClosedProjectsAreHidden=Yopiq loyihalar ko'rinmaydi.
+TasksPublicDesc=Ushbu ko'rinish sizga o'qishga ruxsat berilgan barcha loyihalar va vazifalarni taqdim etadi.
+TasksDesc=Ushbu ko'rinish barcha loyihalar va vazifalarni taqdim etadi (foydalanuvchi ruxsatlari sizga hamma narsani ko'rishga ruxsat beradi).
+AllTaskVisibleButEditIfYouAreAssigned=Malakali loyihalar uchun barcha vazifalar ko'rinib turadi, ammo siz faqat tanlangan foydalanuvchiga berilgan topshiriq uchun vaqt kiritishingiz mumkin. Agar unga vaqt kiritishingiz kerak bo'lsa, vazifani tayinlang.
+OnlyYourTaskAreVisible=Faqat sizga yuklangan vazifalar ko'rinadi. Agar topshiriq bo'yicha vaqtni kiritishingiz kerak bo'lsa va agar bu erda vazifa ko'rinmasa, unda siz o'zingiz uchun vazifani tayinlashingiz kerak.
+ImportDatasetTasks=Loyihalarning vazifalari
 ProjectCategories=Project tags/categories
-NewProject=New project
-AddProject=Create project
-DeleteAProject=Delete a project
-DeleteATask=Delete a task
-ConfirmDeleteAProject=Are you sure you want to delete this project?
-ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Open projects
-OpenedTasks=Open tasks
-OpportunitiesStatusForOpenedProjects=Leads amount of open projects by status
-OpportunitiesStatusForProjects=Leads amount of projects by status
-ShowProject=Show project
+NewProject=Yangi loyiha
+AddProject=Loyiha yaratish
+DeleteAProject=Loyihani o'chirish
+DeleteATask=Vazifani o'chirib tashlang
+ConfirmDeleteAProject=Ushbu loyihani o'chirishni xohlaysizmi?
+ConfirmDeleteATask=Ushbu vazifani o'chirishni xohlaysizmi?
+OpenedProjects=Ochiq loyihalar
+OpenedTasks=Ochiq vazifalar
+OpportunitiesStatusForOpenedProjects=Status bo'yicha ochiq loyihalarning etakchisi
+OpportunitiesStatusForProjects=Loyihalar miqdori bo'yicha maqomi bo'yicha etakchilik qiladi
+ShowProject=Loyihani namoyish etish
 ShowTask=Show task
-SetProject=Set project
-NoProject=No project defined or owned
-NbOfProjects=Number of projects
+SetProject=Loyihani o'rnating
+NoProject=Hech qanday loyiha aniqlanmagan yoki tegishli emas
+NbOfProjects=Loyihalar soni
 NbOfTasks=Number of tasks
-TimeSpent=Time spent
-TimeSpentByYou=Time spent by you
-TimeSpentByUser=Time spent by user
-TimesSpent=Time spent
+TimeSpent=O'tkazilgan vaqt
+TimeSpentByYou=Siz sarflagan vaqt
+TimeSpentByUser=Foydalanuvchi sarflagan vaqt
+TimesSpent=O'tkazilgan vaqt
 TaskId=Task ID
-RefTask=Task ref.
-LabelTask=Task label
-TaskTimeSpent=Time spent on tasks
-TaskTimeUser=User
-TaskTimeNote=Note
+RefTask=Vazifa ref.
+LabelTask=Vazifa yorlig'i
+TaskTimeSpent=Vazifalarga sarflangan vaqt
+TaskTimeUser=Foydalanuvchi
+TaskTimeNote=Eslatma
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on open projects
-WorkloadNotDefined=Workload not defined
-NewTimeSpent=Time spent
-MyTimeSpent=My time spent
+TasksOnOpenedProject=Ochiq loyihalar bo'yicha vazifalar
+WorkloadNotDefined=Ish hajmi aniqlanmagan
+NewTimeSpent=O'tkazilgan vaqt
+MyTimeSpent=Mening vaqtim o'tgan
 BillTime=Bill the time spent
 BillTimeShort=Bill time
 TimeToBill=Time not billed
 TimeBilled=Time billed
-Tasks=Tasks
-Task=Task
-TaskDateStart=Task start date
-TaskDateEnd=Task end date
-TaskDescription=Task description
-NewTask=New task
-AddTask=Create task
-AddTimeSpent=Create time spent
+Tasks=Vazifalar
+Task=Vazifa
+TaskDateStart=Vazifaning boshlanish sanasi
+TaskDateEnd=Vazifaning tugash sanasi
+TaskDescription=Vazifaning tavsifi
+NewTask=Yangi vazifa
+AddTask=Vazifa yaratish
+AddTimeSpent=O'tkazilgan vaqtni yarating
 AddHereTimeSpentForDay=Add here time spent for this day/task
 AddHereTimeSpentForWeek=Add here time spent for this week/task
-Activity=Activity
-Activities=Tasks/activities
-MyActivities=My tasks/activities
-MyProjects=My projects
-MyProjectsArea=My projects Area
-DurationEffective=Effective duration
-ProgressDeclared=Declared real progress
+Activity=Faoliyat
+Activities=Vazifalar / tadbirlar
+MyActivities=Mening vazifalarim / faoliyatim
+MyProjects=Mening loyihalarim
+MyProjectsArea=Mening loyihalarim
+DurationEffective=Amal qilish muddati
+ProgressDeclared=Haqiqiy taraqqiyot e'lon qilindi
 TaskProgressSummary=Task progress
 CurentlyOpenedTasks=Curently open tasks
 TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared real progress is less %s than the progress on consumption
 TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared real progress is more %s than the progress on consumption
-ProgressCalculated=Progress on consumption
+ProgressCalculated=Iste'mol bo'yicha taraqqiyot
 WhichIamLinkedTo=which I'm linked to
 WhichIamLinkedToProject=which I'm linked to project
-Time=Time
+Time=Vaqt
 TimeConsumed=Consumed
-ListOfTasks=List of tasks
-GoToListOfTimeConsumed=Go to list of time consumed
+ListOfTasks=Vazifalar ro'yxati
+GoToListOfTimeConsumed=Vaqt sarflanganlar ro'yxatiga o'ting
 GanttView=Gantt View
 ListWarehouseAssociatedProject=List of warehouses associated to the project
-ListProposalsAssociatedProject=List of the commercial proposals related to the project
-ListOrdersAssociatedProject=List of sales orders related to the project
-ListInvoicesAssociatedProject=List of customer invoices related to the project
-ListPredefinedInvoicesAssociatedProject=List of customer template invoices related to the project
-ListSupplierOrdersAssociatedProject=List of purchase orders related to the project
-ListSupplierInvoicesAssociatedProject=List of vendor invoices related to the project
-ListContractAssociatedProject=List of contracts related to the project
+ListProposalsAssociatedProject=Loyiha bilan bog'liq tijorat takliflari ro'yxati
+ListOrdersAssociatedProject=Loyiha bilan bog'liq savdo buyurtmalar ro'yxati
+ListInvoicesAssociatedProject=Loyiha bilan bog'liq mijozlarning hisob-fakturalari ro'yxati
+ListPredefinedInvoicesAssociatedProject=Loyiha bilan bog'liq mijozlar shablonlari hisob-fakturalari ro'yxati
+ListSupplierOrdersAssociatedProject=Loyiha bilan bog'liq bo'lgan buyurtmalar ro'yxati
+ListSupplierInvoicesAssociatedProject=Loyiha bilan bog'liq sotuvchilarning hisob-fakturalari ro'yxati
+ListContractAssociatedProject=Loyiha bilan bog'liq shartnomalar ro'yxati
 ListShippingAssociatedProject=List of shippings related to the project
-ListFichinterAssociatedProject=List of interventions related to the project
-ListExpenseReportsAssociatedProject=List of expense reports related to the project
-ListDonationsAssociatedProject=List of donations related to the project
+ListFichinterAssociatedProject=Loyiha bilan bog'liq tadbirlar ro'yxati
+ListExpenseReportsAssociatedProject=Loyiha bilan bog'liq xarajatlar hisobotlari ro'yxati
+ListDonationsAssociatedProject=Loyiha bilan bog'liq xayr-ehsonlar ro'yxati
 ListVariousPaymentsAssociatedProject=List of miscellaneous payments related to the project
 ListSalariesAssociatedProject=List of payments of salaries related to the project
-ListActionsAssociatedProject=List of events related to the project
+ListActionsAssociatedProject=Loyiha bilan bog'liq tadbirlar ro'yxati
 ListMOAssociatedProject=List of manufacturing orders related to the project
-ListTaskTimeUserProject=List of time consumed on tasks of project
+ListTaskTimeUserProject=Loyiha vazifalari bo'yicha sarflanadigan vaqt ro'yxati
 ListTaskTimeForTask=List of time consumed on task
-ActivityOnProjectToday=Activity on project today
-ActivityOnProjectYesterday=Activity on project yesterday
-ActivityOnProjectThisWeek=Activity on project this week
-ActivityOnProjectThisMonth=Activity on project this month
-ActivityOnProjectThisYear=Activity on project this year
+ActivityOnProjectToday=Bugungi loyihadagi faoliyat
+ActivityOnProjectYesterday=Kecha loyihadagi faoliyat
+ActivityOnProjectThisWeek=Ushbu haftadagi loyihadagi faollik
+ActivityOnProjectThisMonth=Ushbu oydagi loyihadagi faoliyat
+ActivityOnProjectThisYear=Bu yilgi loyihadagi faoliyat
 ChildOfProjectTask=Child of project/task
-ChildOfTask=Child of task
+ChildOfTask=Vazifa farzandi
 TaskHasChild=Task has child
-NotOwnerOfProject=Not owner of this private project
-AffectedTo=Allocated to
-CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See tab '%s'.
-ValidateProject=Validate projet
-ConfirmValidateProject=Are you sure you want to validate this project?
-CloseAProject=Close project
-ConfirmCloseAProject=Are you sure you want to close this project?
+NotOwnerOfProject=Ushbu xususiy loyihaning egasi emas
+AffectedTo=Ajratilgan
+CantRemoveProject=Ushbu loyihani olib tashlash mumkin emas, chunki u boshqa ob'ektlar (faktura, buyurtma yoki boshqa) tomonidan havola qilinadi. '%s' yorlig'iga qarang.
+ValidateProject=Proyektorni tasdiqlang
+ConfirmValidateProject=Ushbu loyihani tasdiqlamoqchimisiz?
+CloseAProject=Loyihani yoping
+ConfirmCloseAProject=Ushbu loyihani yopmoqchi ekanligingizga aminmisiz?
 AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
-ReOpenAProject=Open project
-ConfirmReOpenAProject=Are you sure you want to re-open this project?
-ProjectContact=Contacts of project
+ReOpenAProject=Ochiq loyiha
+ConfirmReOpenAProject=Ushbu loyihani qayta ochishni xohlaysizmi?
+ProjectContact=Loyiha aloqalari
 TaskContact=Task contacts
-ActionsOnProject=Events on project
-YouAreNotContactOfProject=You are not a contact of this private project
+ActionsOnProject=Loyiha bo'yicha tadbirlar
+YouAreNotContactOfProject=Siz ushbu xususiy loyihaning aloqasi emassiz
 UserIsNotContactOfProject=User is not a contact of this private project
-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=Contacts of task
-ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
-NoTasks=No tasks for this project
-LinkedToAnotherCompany=Linked to other third party
+DeleteATimeSpent=O'tkazilgan vaqtni o'chirib tashlang
+ConfirmDeleteATimeSpent=Ushbu sarflangan vaqtni o'chirishni xohlaysizmi?
+DoNotShowMyTasksOnly=Menga yuklanmagan vazifalarni ham ko'ring
+ShowMyTasksOnly=Faqat menga yuklangan vazifalarni ko'ring
+TaskRessourceLinks=Vazifa aloqalari
+ProjectsDedicatedToThisThirdParty=Ushbu uchinchi tomonga bag'ishlangan loyihalar
+NoTasks=Ushbu loyiha uchun hech qanday vazifa yo'q
+LinkedToAnotherCompany=Boshqa uchinchi tomon bilan bog'langan
 TaskIsNotAssignedToUser=Task not assigned to user. Use button '<strong>%s</strong>' to assign task now.
-ErrorTimeSpentIsEmpty=Time spent is empty
-ThisWillAlsoRemoveTasks=This action will also delete all tasks of project (<b>%s</b> tasks at the moment) and all inputs of time spent.
+ErrorTimeSpentIsEmpty=O'tkazilgan vaqt bo'sh
+ThisWillAlsoRemoveTasks=Ushbu amal shuningdek, loyihaning barcha vazifalarini (<b> %s </b> vazifalari) va sarf qilingan barcha vaqtlarni o'chirib tashlaydi.
 IfNeedToUseOtherObjectKeepEmpty=If some objects (invoice, order, ...), belonging to another third party, must be linked to the project to create, keep this empty to have the project being multi third parties.
-CloneTasks=Clone tasks
-CloneContacts=Clone contacts
-CloneNotes=Clone notes
-CloneProjectFiles=Clone project joined files
-CloneTaskFiles=Clone task(s) joined files (if task(s) cloned)
-CloneMoveDate=Update project/tasks dates from now?
-ConfirmCloneProject=Are you sure to clone this project?
-ProjectReportDate=Change task dates according to new project start date
-ErrorShiftTaskDate=Impossible to shift task date according to new project start date
-ProjectsAndTasksLines=Projects and tasks
-ProjectCreatedInDolibarr=Project %s created
+CloneTasks=Klon vazifalari
+CloneContacts=Kontaktlarni klonlash
+CloneNotes=Klon yozuvlari
+CloneProjectFiles=Klon loyihasi qo'shilgan fayllar
+CloneTaskFiles=Birlashtirilgan fayllarni klonlash vazifasi (agar klonlangan bo'lsa)
+CloneMoveDate=Loyiha / vazifalar sanalari bundan buyon yangilansinmi?
+ConfirmCloneProject=Ushbu loyihani klonlashingizga ishonchingiz komilmi?
+ProjectReportDate=Loyihaning yangi boshlanish sanasiga ko'ra topshiriq sanalarini o'zgartiring
+ErrorShiftTaskDate=Loyihaning yangi boshlanish sanasiga ko'ra topshiriq sanasini almashtirish mumkin emas
+ProjectsAndTasksLines=Loyihalar va vazifalar
+ProjectCreatedInDolibarr=%s loyihasi yaratildi
 ProjectValidatedInDolibarr=Project %s validated
-ProjectModifiedInDolibarr=Project %s modified
-TaskCreatedInDolibarr=Task %s created
-TaskModifiedInDolibarr=Task %s modified
-TaskDeletedInDolibarr=Task %s deleted
-OpportunityStatus=Lead status
-OpportunityStatusShort=Lead status
-OpportunityProbability=Lead probability
-OpportunityProbabilityShort=Lead probab.
-OpportunityAmount=Lead amount
-OpportunityAmountShort=Lead amount
+ProjectModifiedInDolibarr=%s loyihasi o'zgartirildi
+TaskCreatedInDolibarr=%s vazifasi yaratildi
+TaskModifiedInDolibarr=Vazifa %s o'zgartirildi
+TaskDeletedInDolibarr=%s vazifasi o'chirildi
+OpportunityStatus=Qo'rg'oshin holati
+OpportunityStatusShort=Qo'rg'oshin holati
+OpportunityProbability=Qo'rg'oshin ehtimoli
+OpportunityProbabilityShort=Qo'rg'oshin probab.
+OpportunityAmount=Qo'rg'oshin miqdori
+OpportunityAmountShort=Qo'rg'oshin miqdori
 OpportunityWeightedAmount=Opportunity weighted amount
 OpportunityWeightedAmountShort=Opp. weighted amount
-OpportunityAmountAverageShort=Average lead amount
-OpportunityAmountWeigthedShort=Weighted lead amount
-WonLostExcluded=Won/Lost excluded
+OpportunityAmountAverageShort=O'rtacha qo'rg'oshin miqdori
+OpportunityAmountWeigthedShort=Qo'rg'oshin miqdori
+WonLostExcluded=Yutdi / Yo'qotildi chiqarib tashlandi
 ##### Types de contacts #####
-TypeContact_project_internal_PROJECTLEADER=Project leader
-TypeContact_project_external_PROJECTLEADER=Project leader
-TypeContact_project_internal_PROJECTCONTRIBUTOR=Contributor
-TypeContact_project_external_PROJECTCONTRIBUTOR=Contributor
-TypeContact_project_task_internal_TASKEXECUTIVE=Task executive
-TypeContact_project_task_external_TASKEXECUTIVE=Task executive
-TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
-TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
-SelectElement=Select element
-AddElement=Link to element
+TypeContact_project_internal_PROJECTLEADER=Loyiha rahbari
+TypeContact_project_external_PROJECTLEADER=Loyiha rahbari
+TypeContact_project_internal_PROJECTCONTRIBUTOR=Xissador
+TypeContact_project_external_PROJECTCONTRIBUTOR=Xissador
+TypeContact_project_task_internal_TASKEXECUTIVE=Vazifa ijro etuvchi
+TypeContact_project_task_external_TASKEXECUTIVE=Vazifa ijro etuvchi
+TypeContact_project_task_internal_TASKCONTRIBUTOR=Xissador
+TypeContact_project_task_external_TASKCONTRIBUTOR=Xissador
+SelectElement=Elementni tanlang
+AddElement=Elementga havola
 LinkToElementShort=Link to
 # Documents models
-DocumentModelBeluga=Project document template for linked objects overview
-DocumentModelBaleine=Project document template for tasks
+DocumentModelBeluga=Bog'langan ob'ektlarga umumiy nuqtai uchun loyiha hujjati shabloni
+DocumentModelBaleine=Vazifalar uchun loyiha hujjati shabloni
 DocumentModelTimeSpent=Project report template for time spent
-PlannedWorkload=Planned workload
-PlannedWorkloadShort=Workload
-ProjectReferers=Related items
-ProjectMustBeValidatedFirst=Project must be validated first
-FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
-InputPerDay=Input per day
-InputPerWeek=Input per week
+PlannedWorkload=Rejalashtirilgan ish hajmi
+PlannedWorkloadShort=Ish hajmi
+ProjectReferers=Tegishli narsalar
+ProjectMustBeValidatedFirst=Avval loyiha tasdiqlanishi kerak
+FirstAddRessourceToAllocateTime=Vaqt ajratish uchun foydalanuvchi resursini loyihaning aloqasi sifatida tayinlang
+InputPerDay=Kuniga kiritish
+InputPerWeek=Haftada kiritish
 InputPerMonth=Input per month
 InputDetail=Input detail
-TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
-ProjectsWithThisUserAsContact=Projects with this user as contact
-TasksWithThisUserAsContact=Tasks assigned to this user
-ResourceNotAssignedToProject=Not assigned to project
-ResourceNotAssignedToTheTask=Not assigned to the task
+TimeAlreadyRecorded=Bu allaqachon ushbu vazifa uchun yozilgan vaqt va foydalanuvchi %s
+ProjectsWithThisUserAsContact=Ushbu foydalanuvchi bilan aloqa sifatida loyihalar
+TasksWithThisUserAsContact=Ushbu foydalanuvchiga berilgan vazifalar
+ResourceNotAssignedToProject=Loyihaga tayinlanmagan
+ResourceNotAssignedToTheTask=Vazifaga tayinlanmagan
 NoUserAssignedToTheProject=No users assigned to this project
 TimeSpentBy=Time spent by
 TasksAssignedTo=Tasks assigned to
-AssignTaskToMe=Assign task to myself
+AssignTaskToMe=O'zimga vazifa bering
 AssignTaskToUser=Assign task to %s
 SelectTaskToAssign=Select task to assign...
-AssignTask=Assign
-ProjectOverview=Overview
-ManageTasks=Use projects to follow tasks and/or report time spent (timesheets)
-ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
-ProjectNbProjectByMonth=No. of created projects by month
+AssignTask=Tayinlang
+ProjectOverview=Umumiy nuqtai
+ManageTasks=Vazifalarni bajarish va / yoki sarflangan vaqt (vaqt jadvallari) haqida xabar berish uchun loyihalardan foydalaning
+ManageOpportunitiesStatus=Loyihalarni / imkoniyatlarni kuzatib borish uchun foydalaning
+ProjectNbProjectByMonth=Oy davomida yaratilgan loyihalar soni
 ProjectNbTaskByMonth=No. of created tasks by month
-ProjectOppAmountOfProjectsByMonth=Amount of leads by month
-ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of leads by month
-ProjectOpenedProjectByOppStatus=Open project|lead by lead status
-ProjectsStatistics=Statistics on projects or leads
+ProjectOppAmountOfProjectsByMonth=Oylar bo'yicha etakchilar miqdori
+ProjectWeightedOppAmountOfProjectsByMonth=Qo'rg'oshinlarning oylik miqdori
+ProjectOpenedProjectByOppStatus=Ochiq loyiha | etakchi maqomi bo'yicha etakchi
+ProjectsStatistics=Loyihalar yoki etakchilar bo'yicha statistika
 TasksStatistics=Statistics on tasks of projects or leads
-TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
-IdTaskTime=Id task time
-YouCanCompleteRef=If you want to complete the ref with some suffix, it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-MYSUFFIX
-OpenedProjectsByThirdparties=Open projects by third parties
-OnlyOpportunitiesShort=Only leads
-OpenedOpportunitiesShort=Open leads
+TaskAssignedToEnterTime=Vazifa tayinlandi. Ushbu topshiriq bo'yicha vaqtni kiritish mumkin bo'lishi kerak.
+IdTaskTime=Id vazifasi vaqti
+YouCanCompleteRef=Agar siz ba'zi bir qo'shimchalar bilan refni to'ldirishni istasangiz, uni ajratish uchun belgi qo'shishingiz tavsiya etiladi, shuning uchun avtomatik raqamlash keyingi loyihalar uchun to'g'ri ishlaydi. Masalan %s-MYSUFFIX
+OpenedProjectsByThirdparties=Uchinchi tomonlarning ochiq loyihalari
+OnlyOpportunitiesShort=Faqat rahbarlik qiladi
+OpenedOpportunitiesShort=Ochiq chiziqlar
 NotOpenedOpportunitiesShort=Not an open lead
-NotAnOpportunityShort=Not a lead
-OpportunityTotalAmount=Total amount of leads
-OpportunityPonderatedAmount=Weighted amount of leads
-OpportunityPonderatedAmountDesc=Leads amount weighted with probability
-OppStatusPROSP=Prospection
-OppStatusQUAL=Qualification
-OppStatusPROPO=Proposal
-OppStatusNEGO=Negociation
-OppStatusPENDING=Pending
-OppStatusWON=Won
-OppStatusLOST=Lost
-Budget=Budget
+NotAnOpportunityShort=Qo'rg'oshin emas
+OpportunityTotalAmount=Qo'rg'oshinlarning umumiy miqdori
+OpportunityPonderatedAmount=Qo'rg'oshinlarning og'irligi
+OpportunityPonderatedAmountDesc=Ehtimollik bilan tortilgan etakchi miqdor
+OppStatusPROSP=Istiqbol
+OppStatusQUAL=Malaka
+OppStatusPROPO=Taklif
+OppStatusNEGO=Salbiylik
+OppStatusPENDING=Kutilmoqda
+OppStatusWON=Yutuq
+OppStatusLOST=Yo'qotilgan
+Budget=Byudjet
 AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>Supported values:</u><br>- Keep empty: Can link any project of the company (default)<br>- "all": Can link any projects, even projects of other companies<br>- A list of third-party ids separated by commas: can link all projects of these third partys (Example: 123,4795,53)<br>
 LatestProjects=Latest %s projects
 LatestModifiedProjects=Latest %s modified projects
@@ -267,9 +267,11 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=New invoice
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+OneLinePerTimeSpentLine=One line for each time spent declaration
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
 AddPersonToTask=Add also to tasks
 UsageOrganizeEvent=Usage: Event Organization
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
+SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
diff --git a/htdocs/langs/uz_UZ/propal.lang b/htdocs/langs/uz_UZ/propal.lang
index edbc08236d3..12c6f691d68 100644
--- a/htdocs/langs/uz_UZ/propal.lang
+++ b/htdocs/langs/uz_UZ/propal.lang
@@ -1,88 +1,88 @@
 # Dolibarr language file - Source file is en_US - propal
-Proposals=Commercial proposals
-Proposal=Commercial proposal
-ProposalShort=Proposal
-ProposalsDraft=Draft commercial proposals
-ProposalsOpened=Open commercial proposals
-CommercialProposal=Commercial proposal
+Proposals=Tijorat takliflari
+Proposal=Tijorat taklifi
+ProposalShort=Taklif
+ProposalsDraft=Tijorat takliflari loyihasi
+ProposalsOpened=Tijorat takliflarini oching
+CommercialProposal=Tijorat taklifi
 PdfCommercialProposalTitle=Commercial proposal
-ProposalCard=Proposal card
-NewProp=New commercial proposal
-NewPropal=New proposal
-Prospect=Prospect
-DeleteProp=Delete commercial proposal
-ValidateProp=Validate commercial proposal
-AddProp=Create proposal
-ConfirmDeleteProp=Are you sure you want to delete this commercial proposal?
-ConfirmValidateProp=Are you sure you want to validate this commercial proposal under name <b>%s</b>?
-LastPropals=Latest %s proposals
-LastModifiedProposals=Latest %s modified proposals
-AllPropals=All proposals
-SearchAProposal=Search a proposal
-NoProposal=No proposal
-ProposalsStatistics=Commercial proposal's statistics
-NumberOfProposalsByMonth=Number by month
-AmountOfProposalsByMonthHT=Amount by month (excl. tax)
-NbOfProposals=Number of commercial proposals
-ShowPropal=Show proposal
-PropalsDraft=Drafts
-PropalsOpened=Open
-PropalStatusDraft=Draft (needs to be validated)
-PropalStatusValidated=Validated (proposal is open)
-PropalStatusSigned=Signed (needs billing)
-PropalStatusNotSigned=Not signed (closed)
-PropalStatusBilled=Billed
-PropalStatusDraftShort=Draft
+ProposalCard=Taklif kartasi
+NewProp=Yangi tijorat taklifi
+NewPropal=Yangi taklif
+Prospect=Istiqbol
+DeleteProp=Tijorat taklifini o'chirish
+ValidateProp=Tijorat taklifini tasdiqlash
+AddProp=Taklif yaratish
+ConfirmDeleteProp=Ushbu tijorat taklifini o'chirishni xohlaysizmi?
+ConfirmValidateProp=Ushbu tijorat taklifini <b> %s </b> nomi bilan tasdiqlamoqchimisiz?
+LastPropals=Oxirgi %s takliflari
+LastModifiedProposals=Oxirgi %s o'zgartirilgan takliflar
+AllPropals=Barcha takliflar
+SearchAProposal=Taklifni qidiring
+NoProposal=Taklif yo'q
+ProposalsStatistics=Tijorat takliflarining statistikasi
+NumberOfProposalsByMonth=Oy bo'yicha raqam
+AmountOfProposalsByMonthHT=Oy bo'yicha miqdori (soliqdan tashqari)
+NbOfProposals=Tijorat takliflari soni
+ShowPropal=Taklifni ko'rsatish
+PropalsDraft=Qoralamalar
+PropalsOpened=Ochiq
+PropalStatusDraft=Qoralama (tasdiqlanishi kerak)
+PropalStatusValidated=Tasdiqlangan (taklif ochiq)
+PropalStatusSigned=Imzolangan (hisob-kitob kerak)
+PropalStatusNotSigned=Imzo qo'yilmagan (yopiq)
+PropalStatusBilled=Hisob-kitob
+PropalStatusDraftShort=Qoralama
 PropalStatusValidatedShort=Validated (open)
-PropalStatusClosedShort=Closed
-PropalStatusSignedShort=Signed
-PropalStatusNotSignedShort=Not signed
-PropalStatusBilledShort=Billed
-PropalsToClose=Commercial proposals to close
-PropalsToBill=Signed commercial proposals to bill
-ListOfProposals=List of commercial proposals
-ActionsOnPropal=Events on proposal
-RefProposal=Commercial proposal ref
-SendPropalByMail=Send commercial proposal by mail
-DatePropal=Date of proposal
-DateEndPropal=Validity ending date
-ValidityDuration=Validity duration
-SetAcceptedRefused=Set accepted/refused
-ErrorPropalNotFound=Propal %s not found
-AddToDraftProposals=Add to draft proposal
-NoDraftProposals=No draft proposals
-CopyPropalFrom=Create commercial proposal by copying existing proposal
-CreateEmptyPropal=Create empty commercial proposal or from list of products/services
-DefaultProposalDurationValidity=Default commercial proposal validity duration (in days)
-UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
-ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b>?
-ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
-ProposalsAndProposalsLines=Commercial proposal and lines
-ProposalLine=Proposal line
+PropalStatusClosedShort=Yopiq
+PropalStatusSignedShort=Imzolangan
+PropalStatusNotSignedShort=Imzo qo'yilmagan
+PropalStatusBilledShort=Hisob-kitob
+PropalsToClose=Tijorat takliflarini yopish
+PropalsToBill=Hisob-kitob qilish uchun imzolangan tijorat takliflari
+ListOfProposals=Tijorat takliflari ro'yxati
+ActionsOnPropal=Taklif bo'yicha tadbirlar
+RefProposal=Tijorat taklifi
+SendPropalByMail=Tijorat taklifini pochta orqali yuboring
+DatePropal=Taklif qilingan sana
+DateEndPropal=Amal qilish muddati tugagan sana
+ValidityDuration=Amal qilish muddati
+SetAcceptedRefused=To'siq qabul qilindi / rad etildi
+ErrorPropalNotFound=%s taklifi topilmadi
+AddToDraftProposals=Taklif loyihasiga qo'shing
+NoDraftProposals=Takliflar loyihasi yo'q
+CopyPropalFrom=Mavjud taklifni nusxalash orqali tijorat taklifini yarating
+CreateEmptyPropal=Bo'sh tijorat taklifini yoki mahsulot / xizmatlar ro'yxatidan yarating
+DefaultProposalDurationValidity=Standart tijorat taklifining amal qilish muddati (kunlar ichida)
+UseCustomerContactAsPropalRecipientIfExist=Uchinchi shaxs manzili o'rniga taklif oluvchining manzili belgilangan bo'lsa, "Kontaktni kuzatib boruvchi taklif" turi bilan aloqa / manzildan foydalaning
+ConfirmClonePropal=<b> %s </b> tijorat taklifini klonlamoqchimisiz?
+ConfirmReOpenProp=<b> %s </b> tijorat taklifini ochmoqchi ekanligingizga aminmisiz?
+ProposalsAndProposalsLines=Tijorat takliflari va yo'nalishlari
+ProposalLine=Taklif liniyasi
 ProposalLines=Proposal lines
-AvailabilityPeriod=Availability delay
-SetAvailability=Set availability delay
-AfterOrder=after order
+AvailabilityPeriod=Mavjudligini kechiktirish
+SetAvailability=Mavjudligini kechiktirishni o'rnating
+AfterOrder=buyurtmadan keyin
 OtherProposals=Other proposals
 ##### Availability #####
-AvailabilityTypeAV_NOW=Immediate
-AvailabilityTypeAV_1W=1 week
-AvailabilityTypeAV_2W=2 weeks
-AvailabilityTypeAV_3W=3 weeks
-AvailabilityTypeAV_1M=1 month
+AvailabilityTypeAV_NOW=Darhol
+AvailabilityTypeAV_1W=1 hafta
+AvailabilityTypeAV_2W=2 hafta
+AvailabilityTypeAV_3W=3 hafta
+AvailabilityTypeAV_1M=1 oy
 ##### Types de contacts #####
-TypeContact_propal_internal_SALESREPFOLL=Representative following-up proposal
-TypeContact_propal_external_BILLING=Customer invoice contact
-TypeContact_propal_external_CUSTOMER=Customer contact following-up proposal
+TypeContact_propal_internal_SALESREPFOLL=Vakilning keyingi taklifi
+TypeContact_propal_external_BILLING=Mijozlarning hisob-fakturasi bilan aloqa qilish
+TypeContact_propal_external_CUSTOMER=Keyingi taklif bilan mijozlar bilan bog'lanish
 TypeContact_propal_external_SHIPPING=Customer contact for delivery
 # Document models
-DocModelAzurDescription=A complete proposal model (old implementation of Cyan template)
+DocModelAzurDescription=Taklifning to'liq modeli (Cyan shablonining eski tatbiqi)
 DocModelCyanDescription=A complete proposal model
-DefaultModelPropalCreate=Default model creation
-DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
-DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
-ProposalCustomerSignature=Written acceptance, company stamp, date and signature
-ProposalsStatisticsSuppliers=Vendor proposals statistics
+DefaultModelPropalCreate=Standart model yaratish
+DefaultModelPropalToBill=Tijorat taklifini yopish paytida standart shablon (hisob-faktura)
+DefaultModelPropalClosed=Tijorat taklifini yopish paytida standart shablon (taqdim etilmagan)
+ProposalCustomerSignature=Yozma qabul, kompaniya muhri, sanasi va imzosi
+ProposalsStatisticsSuppliers=Sotuvchi takliflari statistikasi
 CaseFollowedBy=Case followed by
 SignedOnly=Signed only
 IdProposal=Proposal ID
diff --git a/htdocs/langs/uz_UZ/receiptprinter.lang b/htdocs/langs/uz_UZ/receiptprinter.lang
index 2574ff1b4bd..2b9e1367331 100644
--- a/htdocs/langs/uz_UZ/receiptprinter.lang
+++ b/htdocs/langs/uz_UZ/receiptprinter.lang
@@ -1,50 +1,50 @@
 # Dolibarr language file - Source file is en_US - receiptprinter
-ReceiptPrinterSetup=Setup of module ReceiptPrinter
-PrinterAdded=Printer %s added
-PrinterUpdated=Printer %s updated
-PrinterDeleted=Printer %s deleted
-TestSentToPrinter=Test Sent To Printer %s
-ReceiptPrinter=Receipt printers
-ReceiptPrinterDesc=Setup of receipt printers
-ReceiptPrinterTemplateDesc=Setup of Templates
-ReceiptPrinterTypeDesc=Description of Receipt Printer's type
-ReceiptPrinterProfileDesc=Description of Receipt Printer's Profile
-ListPrinters=List of Printers
-SetupReceiptTemplate=Template Setup
-CONNECTOR_DUMMY=Dummy Printer
-CONNECTOR_NETWORK_PRINT=Network Printer
-CONNECTOR_FILE_PRINT=Local Printer
-CONNECTOR_WINDOWS_PRINT=Local Windows Printer
+ReceiptPrinterSetup=ReceiptPrinter modulini sozlash
+PrinterAdded=%s printer qo'shildi
+PrinterUpdated=Printer %s yangilandi
+PrinterDeleted=%s printeri o'chirildi
+TestSentToPrinter=Sinov printerga yuborildi %s
+ReceiptPrinter=Kvitansiya printerlari
+ReceiptPrinterDesc=Kvitansiya printerlarini sozlash
+ReceiptPrinterTemplateDesc=Shablonlarni sozlash
+ReceiptPrinterTypeDesc=Qabul qilish printeri turining tavsifi
+ReceiptPrinterProfileDesc=Qabul qilish printeri profilining tavsifi
+ListPrinters=Printerlar ro'yxati
+SetupReceiptTemplate=Shablonni sozlash
+CONNECTOR_DUMMY=Dummy printer
+CONNECTOR_NETWORK_PRINT=Tarmoq printeri
+CONNECTOR_FILE_PRINT=Mahalliy printer
+CONNECTOR_WINDOWS_PRINT=Mahalliy Windows printeri
 CONNECTOR_CUPS_PRINT=Cups Printer
-CONNECTOR_DUMMY_HELP=Fake Printer for test, does nothing
-CONNECTOR_NETWORK_PRINT_HELP=10.x.x.x:9100
-CONNECTOR_FILE_PRINT_HELP=/dev/usb/lp0, /dev/usb/lp1
-CONNECTOR_WINDOWS_PRINT_HELP=LPT1, COM1, smb://FooUser:secret@computername/workgroup/Receipt Printer
+CONNECTOR_DUMMY_HELP=Sinov uchun soxta printer, hech narsa qilmaydi
+CONNECTOR_NETWORK_PRINT_HELP=10.x.x.x: 9100
+CONNECTOR_FILE_PRINT_HELP=/ dev / usb / lp0, / dev / usb / lp1
+CONNECTOR_WINDOWS_PRINT_HELP=LPT1, COM1, smb: // FooUser: secret @ computername / workgroup / Qabul qilish printeri
 CONNECTOR_CUPS_PRINT_HELP=CUPS printer name, example: HPRT_TP805L
-PROFILE_DEFAULT=Default Profile
-PROFILE_SIMPLE=Simple Profile
-PROFILE_EPOSTEP=Epos Tep Profile
-PROFILE_P822D=P822D Profile
-PROFILE_STAR=Star Profile
-PROFILE_DEFAULT_HELP=Default Profile suitable for Epson printers
-PROFILE_SIMPLE_HELP=Simple Profile No Graphics
-PROFILE_EPOSTEP_HELP=Epos Tep Profile
-PROFILE_P822D_HELP=P822D Profile No Graphics
-PROFILE_STAR_HELP=Star Profile
+PROFILE_DEFAULT=Standart profil
+PROFILE_SIMPLE=Oddiy profil
+PROFILE_EPOSTEP=Epos Tep profili
+PROFILE_P822D=P822D profili
+PROFILE_STAR=Yulduzli profil
+PROFILE_DEFAULT_HELP=Epson printerlari uchun mos bo'lgan standart profil
+PROFILE_SIMPLE_HELP=Grafika yo'q oddiy profil
+PROFILE_EPOSTEP_HELP=Epos Tep profili
+PROFILE_P822D_HELP=P822D profili Grafika yo'q
+PROFILE_STAR_HELP=Yulduzli profil
 DOL_LINE_FEED=Skip line
-DOL_ALIGN_LEFT=Left align text
-DOL_ALIGN_CENTER=Center text
-DOL_ALIGN_RIGHT=Right align text
-DOL_USE_FONT_A=Use font A of printer
-DOL_USE_FONT_B=Use font B of printer
-DOL_USE_FONT_C=Use font C of printer
-DOL_PRINT_BARCODE=Print barcode
-DOL_PRINT_BARCODE_CUSTOMER_ID=Print barcode customer id
-DOL_CUT_PAPER_FULL=Cut ticket completely
-DOL_CUT_PAPER_PARTIAL=Cut ticket partially
-DOL_OPEN_DRAWER=Open cash drawer
-DOL_ACTIVATE_BUZZER=Activate buzzer
-DOL_PRINT_QRCODE=Print QR Code
+DOL_ALIGN_LEFT=Matnni chapga tekislang
+DOL_ALIGN_CENTER=Markaziy matn
+DOL_ALIGN_RIGHT=Matnni o'ngga tekislang
+DOL_USE_FONT_A=Printerning A shriftidan foydalaning
+DOL_USE_FONT_B=Printerning B shriftidan foydalaning
+DOL_USE_FONT_C=Printerning C shriftidan foydalaning
+DOL_PRINT_BARCODE=Shtrixli kodni chop eting
+DOL_PRINT_BARCODE_CUSTOMER_ID=Shtrixli mijoz identifikatorini chop eting
+DOL_CUT_PAPER_FULL=Chiptani butunlay kesib tashlang
+DOL_CUT_PAPER_PARTIAL=Chiptani qisman kesib oling
+DOL_OPEN_DRAWER=Ochiq kassa
+DOL_ACTIVATE_BUZZER=Zilni yoqing
+DOL_PRINT_QRCODE=QR kodini chop eting
 DOL_PRINT_LOGO=Print logo of my company
 DOL_PRINT_LOGO_OLD=Print logo of my company (old printers)
 DOL_BOLD=Bold
@@ -54,7 +54,7 @@ DOL_DOUBLE_WIDTH=Double width size
 DOL_DEFAULT_HEIGHT_WIDTH=Default height and width size
 DOL_UNDERLINE=Enable underline
 DOL_UNDERLINE_DISABLED=Disable underline
-DOL_BEEP=Beed sound
+DOL_BEEP=Beep sound
 DOL_PRINT_TEXT=Print text
 DateInvoiceWithTime=Invoice date and time
 YearInvoice=Invoice year
diff --git a/htdocs/langs/uz_UZ/receptions.lang b/htdocs/langs/uz_UZ/receptions.lang
index 760ff884fa0..338602e722e 100644
--- a/htdocs/langs/uz_UZ/receptions.lang
+++ b/htdocs/langs/uz_UZ/receptions.lang
@@ -44,4 +44,4 @@ ValidateOrderFirstBeforeReception=You must first validate the order before being
 ReceptionsNumberingModules=Numbering module for receptions
 ReceptionsReceiptModel=Document templates for receptions
 NoMorePredefinedProductToDispatch=No more predefined products to dispatch
-
+ReceptionExist=A reception exists
diff --git a/htdocs/langs/uz_UZ/resource.lang b/htdocs/langs/uz_UZ/resource.lang
index 5a907f6ba23..b74c921472e 100644
--- a/htdocs/langs/uz_UZ/resource.lang
+++ b/htdocs/langs/uz_UZ/resource.lang
@@ -1,36 +1,39 @@
 # Dolibarr language file - Source file is en_US - resource
-MenuResourceIndex=Resources
-MenuResourceAdd=New resource
-DeleteResource=Delete resource
-ConfirmDeleteResourceElement=Confirm delete the resource for this element
-NoResourceInDatabase=No resource in database.
-NoResourceLinked=No resource linked
+MenuResourceIndex=Resurslar
+MenuResourceAdd=Yangi manba
+DeleteResource=Resursni o'chirish
+ConfirmDeleteResourceElement=Ushbu element uchun manbani o'chirishni tasdiqlang
+NoResourceInDatabase=Ma'lumotlar bazasida manba yo'q.
+NoResourceLinked=Hech qanday manbaga ulanmagan
+ActionsOnResource=Events about this resource
+ResourcePageIndex=Resurslar ro'yxati
+ResourceSingular=Manba
+ResourceCard=Resurs kartasi
+AddResource=Resurs yarating
+ResourceFormLabel_ref=Resurs nomi
+ResourceType=Resurs turi
+ResourceFormLabel_description=Resurs tavsifi
 
-ResourcePageIndex=Resources list
-ResourceSingular=Resource
-ResourceCard=Resource card
-AddResource=Create a resource
-ResourceFormLabel_ref=Resource name
-ResourceType=Resource type
-ResourceFormLabel_description=Resource description
+ResourcesLinkedToElement=Element bilan bog'langan manbalar
 
-ResourcesLinkedToElement=Resources linked to element
+ShowResource=Resursni ko'rsatish
 
-ShowResource=Show resource
+ResourceElementPage=Element manbalari
+ResourceCreatedWithSuccess=Resurs muvaffaqiyatli yaratildi
+RessourceLineSuccessfullyDeleted=Resurs liniyasi muvaffaqiyatli o'chirildi
+RessourceLineSuccessfullyUpdated=Resurs liniyasi muvaffaqiyatli yangilandi
+ResourceLinkedWithSuccess=Resurs muvaffaqiyat bilan bog'liq
 
-ResourceElementPage=Element resources
-ResourceCreatedWithSuccess=Resource successfully created
-RessourceLineSuccessfullyDeleted=Resource line successfully deleted
-RessourceLineSuccessfullyUpdated=Resource line successfully updated
-ResourceLinkedWithSuccess=Resource linked with success
+ConfirmDeleteResource=Ushbu manbani o'chirishni tasdiqlang
+RessourceSuccessfullyDeleted=Resurs o'chirildi
+DictionaryResourceType=Resurslar turi
 
-ConfirmDeleteResource=Confirm to delete this resource
-RessourceSuccessfullyDeleted=Resource successfully deleted
-DictionaryResourceType=Type of resources
-
-SelectResource=Select resource
+SelectResource=Resursni tanlang
 
 IdResource=Id resource
 AssetNumber=Serial number
 ResourceTypeCode=Resource type code
 ImportDataset_resource_1=Resources
+
+ErrorResourcesAlreadyInUse=Some resources are in use
+ErrorResourceUseInEvent=%s used in %s event
diff --git a/htdocs/langs/uz_UZ/salaries.lang b/htdocs/langs/uz_UZ/salaries.lang
index 7c3c08a65bd..57f46f48e75 100644
--- a/htdocs/langs/uz_UZ/salaries.lang
+++ b/htdocs/langs/uz_UZ/salaries.lang
@@ -1,19 +1,22 @@
 # Dolibarr language file - Source file is en_US - salaries
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Foydalanuvchi uchinchi shaxslar uchun foydalaniladigan buxgalteriya hisobi
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
-SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
-Salary=Salary
-Salaries=Salaries
-NewSalaryPayment=New salary payment
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Ish haqi to'lovlari bo'yicha sukut bo'yicha buxgalteriya hisobi
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=By default, leave empty the option "Automatically create a total payment" when creating a Salary
+Salary=Ish haqi
+Salaries=Ish haqi
+NewSalary=New salary
+NewSalaryPayment=Yangi ish haqi kartasi
 AddSalaryPayment=Add salary payment
-SalaryPayment=Salary payment
-SalariesPayments=Salaries payments
-ShowSalaryPayment=Show salary payment
-THM=Average hourly rate
-TJM=Average daily rate
-CurrentSalary=Current salary
-THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
-TJMDescription=This value is currently for information only and is not used for any calculation
+SalaryPayment=Ish haqi to'lash
+SalariesPayments=Ish haqi bo'yicha to'lovlar
+SalariesPaymentsOf=Salaries payments of %s
+ShowSalaryPayment=Ish haqini to'lashni ko'rsating
+THM=O'rtacha soatlik stavka
+TJM=O'rtacha kunlik stavka
+CurrentSalary=Amaldagi ish haqi
+THMDescription=Ushbu qiymat, agar modul loyihasi ishlatilgan bo'lsa, foydalanuvchilar tomonidan kiritilgan loyihaga sarf qilingan vaqt xarajatlarini hisoblash uchun ishlatilishi mumkin
+TJMDescription=Ushbu qiymat hozircha faqat ma'lumot uchun mo'ljallangan va hisoblash uchun ishlatilmaydi
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
 SalariesStatistics=Salary statistics
diff --git a/htdocs/langs/uz_UZ/sendings.lang b/htdocs/langs/uz_UZ/sendings.lang
index b94891d79c5..fb3344d921e 100644
--- a/htdocs/langs/uz_UZ/sendings.lang
+++ b/htdocs/langs/uz_UZ/sendings.lang
@@ -1,76 +1,76 @@
 # Dolibarr language file - Source file is en_US - sendings
-RefSending=Ref. shipment
-Sending=Shipment
-Sendings=Shipments
-AllSendings=All Shipments
-Shipment=Shipment
-Shipments=Shipments
-ShowSending=Show Shipments
-Receivings=Delivery Receipts
-SendingsArea=Shipments area
-ListOfSendings=List of shipments
-SendingMethod=Shipping method
-LastSendings=Latest %s shipments
-StatisticsOfSendings=Statistics for shipments
-NbOfSendings=Number of shipments
-NumberOfShipmentsByMonth=Number of shipments by month
-SendingCard=Shipment card
-NewSending=New shipment
-CreateShipment=Create shipment
-QtyShipped=Qty shipped
+RefSending=Ref. jo'natish
+Sending=Jo'natma
+Sendings=Yuklar
+AllSendings=Barcha jo'natmalar
+Shipment=Jo'natma
+Shipments=Yuklar
+ShowSending=Yuklarni ko'rsatish
+Receivings=Yetkazib berish kvitansiyalari
+SendingsArea=Yuklarni etkazib berish maydoni
+ListOfSendings=Yuklarni etkazib berish ro'yxati
+SendingMethod=Yuk tashish usuli
+LastSendings=Oxirgi %s jo'natmalari
+StatisticsOfSendings=Yuklarni etkazib berish statistikasi
+NbOfSendings=Yuk tashishlar soni
+NumberOfShipmentsByMonth=Oy bo'yicha etkazib berish soni
+SendingCard=Jo'natma kartasi
+NewSending=Yangi yuk
+CreateShipment=Yuklarni yarating
+QtyShipped=Miqdor jo'natildi
 QtyShippedShort=Qty ship.
-QtyPreparedOrShipped=Qty prepared or shipped
-QtyToShip=Qty to ship
+QtyPreparedOrShipped=Miqdor tayyorlangan yoki jo'natilgan
+QtyToShip=Yetkazib berish uchun miqdor
 QtyToReceive=Qty to receive
-QtyReceived=Qty received
-QtyInOtherShipments=Qty in other shipments
-KeepToShip=Remain to ship
+QtyReceived=Miqdor olingan
+QtyInOtherShipments=Miqdor boshqa jo'natmalarda
+KeepToShip=Yuk tashishda qoling
 KeepToShipShort=Remain
-OtherSendingsForSameOrder=Other shipments for this order
-SendingsAndReceivingForSameOrder=Shipments and receipts for this order
-SendingsToValidate=Shipments to validate
-StatusSendingCanceled=Canceled
+OtherSendingsForSameOrder=Ushbu buyurtma uchun boshqa jo'natmalar
+SendingsAndReceivingForSameOrder=Ushbu buyurtma uchun jo'natmalar va kvitansiyalar
+SendingsToValidate=Tasdiqlash uchun jo'natmalar
+StatusSendingCanceled=Bekor qilindi
 StatusSendingCanceledShort=Canceled
-StatusSendingDraft=Draft
-StatusSendingValidated=Validated (products to ship or already shipped)
-StatusSendingProcessed=Processed
-StatusSendingDraftShort=Draft
-StatusSendingValidatedShort=Validated
-StatusSendingProcessedShort=Processed
-SendingSheet=Shipment sheet
-ConfirmDeleteSending=Are you sure you want to delete this shipment?
-ConfirmValidateSending=Are you sure you want to validate this shipment with reference <b>%s</b>?
-ConfirmCancelSending=Are you sure you want to cancel this shipment?
-DocumentModelMerou=Merou A5 model
-WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
-StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
-DateDeliveryPlanned=Planned date of delivery
-RefDeliveryReceipt=Ref delivery receipt
-StatusReceipt=Status delivery receipt
-DateReceived=Date delivery received
+StatusSendingDraft=Qoralama
+StatusSendingValidated=Tasdiqlangan (jo'natiladigan yoki allaqachon jo'natilgan mahsulotlar)
+StatusSendingProcessed=Qayta ishlangan
+StatusSendingDraftShort=Qoralama
+StatusSendingValidatedShort=Tasdiqlangan
+StatusSendingProcessedShort=Qayta ishlangan
+SendingSheet=Yuk jo'natmasi
+ConfirmDeleteSending=Ushbu yukni o'chirishni xohlaysizmi?
+ConfirmValidateSending=Ushbu jo'natmani <b> %s </b> ma'lumotnomasi bilan tasdiqlamoqchimisiz?
+ConfirmCancelSending=Ushbu yukni bekor qilmoqchi ekanligingizga aminmisiz?
+DocumentModelMerou=Merou A5 modeli
+WarningNoQtyLeftToSend=Ogohlantirish, jo'natilishini kutayotgan mahsulotlar yo'q.
+StatsOnShipmentsOnlyValidated=Statistika faqat tasdiqlangan yuklar uchun. Ishlatilgan sana - bu etkazib berishni tasdiqlash sanasi (etkazib berishning rejalashtirilgan sanasi har doim ham ma'lum emas)
+DateDeliveryPlanned=Rejalashtirilgan etkazib berish sanasi
+RefDeliveryReceipt=Yetkazib berish kvitansiyasi
+StatusReceipt=Vaziyatni etkazib berish kvitansiyasi
+DateReceived=Qabul qilingan sana qabul qilindi
 ClassifyReception=Classify reception
-SendShippingByEMail=Send shipment by email
-SendShippingRef=Submission of shipment %s
-ActionsOnShipping=Events on shipment
-LinkToTrackYourPackage=Link to track your package
-ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the order card.
-ShipmentLine=Shipment line
-ProductQtyInCustomersOrdersRunning=Product quantity from open sales orders
-ProductQtyInSuppliersOrdersRunning=Product quantity from open purchase orders
-ProductQtyInShipmentAlreadySent=Product quantity from open sales order already sent
-ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from open purchase orders already received
-NoProductToShipFoundIntoStock=No product to ship found in warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
-WeightVolShort=Weight/Vol.
-ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
+SendShippingByEMail=Yukni elektron pochta orqali yuboring
+SendShippingRef=%s jo'natmasini yuborish
+ActionsOnShipping=Yuk tashish bo'yicha tadbirlar
+LinkToTrackYourPackage=Paketingizni kuzatish uchun havola
+ShipmentCreationIsDoneFromOrder=Hozircha yangi jo'natmani yaratish buyurtma kartasidan amalga oshiriladi.
+ShipmentLine=Yuk tashish liniyasi
+ProductQtyInCustomersOrdersRunning=Ochiq savdo buyurtmalaridan mahsulot miqdori
+ProductQtyInSuppliersOrdersRunning=Ochiq sotib olish buyurtmalaridan mahsulot miqdori
+ProductQtyInShipmentAlreadySent=Ochiq savdo buyurtmasidan mahsulot miqdori allaqachon yuborilgan
+ProductQtyInSuppliersShipmentAlreadyRecevied=Qabul qilingan ochiq xarid buyurtmalaridan olingan mahsulot miqdori
+NoProductToShipFoundIntoStock=<b> %s </b> omborida jo'natiladigan mahsulot topilmadi. Zaxirani to'g'rilang yoki boshqa omborni tanlash uchun qaytib boring.
+WeightVolShort=Og'irligi / jild
+ValidateOrderFirstBeforeShipment=Yuklarni jo'natishdan oldin avval buyurtmani tasdiqlashingiz kerak.
 
 # Sending methods
 # ModelDocument
-DocumentModelTyphon=More complete document model for delivery receipts (logo...)
+DocumentModelTyphon=Yetkazib berish kvitansiyalari uchun to'liq hujjat modeli (logotip ...)
 DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
-Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
-SumOfProductVolumes=Sum of product volumes
-SumOfProductWeights=Sum of product weights
+Error_EXPEDITION_ADDON_NUMBER_NotDefined=Doimiy EXPEDITION_ADDON_NUMBER aniqlanmagan
+SumOfProductVolumes=Mahsulot hajmi
+SumOfProductWeights=Mahsulot og'irliklari yig'indisi
 
 # warehouse details
-DetailWarehouseNumber= Warehouse details
-DetailWarehouseFormat= W:%s (Qty: %d)
+DetailWarehouseNumber= Ombor tafsilotlari
+DetailWarehouseFormat= V: %s (Miqdor: %d)
diff --git a/htdocs/langs/uz_UZ/sms.lang b/htdocs/langs/uz_UZ/sms.lang
index 8c0517a132e..49229886551 100644
--- a/htdocs/langs/uz_UZ/sms.lang
+++ b/htdocs/langs/uz_UZ/sms.lang
@@ -1,51 +1,51 @@
 # Dolibarr language file - Source file is en_US - sms
-Sms=Sms
-SmsSetup=Sms setup
-SmsDesc=This page allows you to define globals options on SMS features
-SmsCard=SMS Card
-AllSms=All SMS campains
-SmsTargets=Targets
-SmsRecipients=Targets
-SmsRecipient=Target
-SmsTitle=Description
-SmsFrom=Sender
-SmsTo=Target
-SmsTopic=Topic of SMS
-SmsText=Message
-SmsMessage=SMS Message
-ShowSms=Show Sms
-ListOfSms=List SMS campains
-NewSms=New SMS campain
-EditSms=Edit Sms
-ResetSms=New sending
-DeleteSms=Delete Sms campain
-DeleteASms=Remove a Sms campain
-PreviewSms=Previuw Sms
-PrepareSms=Prepare Sms
-CreateSms=Create Sms
-SmsResult=Result of Sms sending
-TestSms=Test Sms
-ValidSms=Validate Sms
-ApproveSms=Approve Sms
-SmsStatusDraft=Draft
-SmsStatusValidated=Validated
-SmsStatusApproved=Approved
-SmsStatusSent=Sent
-SmsStatusSentPartialy=Sent partially
-SmsStatusSentCompletely=Sent completely
-SmsStatusError=Error
-SmsStatusNotSent=Not sent
-SmsSuccessfulySent=Sms correctly sent (from %s to %s)
-ErrorSmsRecipientIsEmpty=Number of target is empty
-WarningNoSmsAdded=No new phone number to add to target list
-ConfirmValidSms=Do you confirm validation of this campain?
-NbOfUniqueSms=Nb dof unique phone numbers
-NbOfSms=Nbre of phon numbers
-ThisIsATestMessage=This is a test message
-SendSms=Send SMS
-SmsInfoCharRemain=Nb of remaining characters
-SmsInfoNumero= (format international ie : +33899701761)
-DelayBeforeSending=Delay before sending (minutes)
-SmsNoPossibleSenderFound=No sender available. Check setup of your SMS provider.
-SmsNoPossibleRecipientFound=No target available. Check setup of your SMS provider.
+Sms=SMS
+SmsSetup=SMS sozlamalari
+SmsDesc=Ushbu sahifa SMS funktsiyalari bo'yicha global parametrlarni aniqlashga imkon beradi
+SmsCard=SMS-karta
+AllSms=Barcha SMS-aksiyalar
+SmsTargets=Maqsadlar
+SmsRecipients=Maqsadlar
+SmsRecipient=Maqsad
+SmsTitle=Tavsif
+SmsFrom=Yuboruvchi
+SmsTo=Maqsad
+SmsTopic=SMS mavzusi
+SmsText=Xabar
+SmsMessage=SMS xabar
+ShowSms=SMS-xabarlarni ko'rsatish
+ListOfSms=SMS-aksiyalarni ro'yxatlash
+NewSms=Yangi SMS-aksiya
+EditSms=SMSni tahrirlash
+ResetSms=Yangi yuborish
+DeleteSms=SMS-aksiyani o'chirish
+DeleteASms=SMS-aksiyani olib tashlang
+PreviewSms=Oldindan SMS
+PrepareSms=SMS tayyorlang
+CreateSms=SMS yarating
+SmsResult=SMS yuborish natijasi
+TestSms=SMS-xabarlarni sinab ko'ring
+ValidSms=SMSni tasdiqlang
+ApproveSms=SMS-xabarlarni tasdiqlash
+SmsStatusDraft=Qoralama
+SmsStatusValidated=Tasdiqlangan
+SmsStatusApproved=Tasdiqlangan
+SmsStatusSent=Yuborildi
+SmsStatusSentPartialy=Qisman yuborilgan
+SmsStatusSentCompletely=To'liq yuborildi
+SmsStatusError=Xato
+SmsStatusNotSent=Yuborilmadi
+SmsSuccessfulySent=SMS to'g'ri yuborilgan (%s dan %s dan)
+ErrorSmsRecipientIsEmpty=Maqsad soni bo'sh
+WarningNoSmsAdded=Maqsadlar ro'yxatiga qo'shiladigan yangi telefon raqami yo'q
+ConfirmValidSms=Ushbu aksiyaning tasdiqlanganligini tasdiqlaysizmi?
+NbOfUniqueSms=Noyob telefon raqamlari soni
+NbOfSms=Telefon raqamlari soni
+ThisIsATestMessage=Bu sinov xabari
+SendSms=SMS yuboring
+SmsInfoCharRemain=Qolgan belgilar soni
+SmsInfoNumero= (xalqaro format, ya'ni: +33899701761)
+DelayBeforeSending=Yuborishdan oldin kechikish (daqiqa)
+SmsNoPossibleSenderFound=Yuboruvchi topilmadi. SMS-provayderingiz sozlamalarini tekshiring.
+SmsNoPossibleRecipientFound=Maqsad mavjud emas. SMS-provayderingiz sozlamalarini tekshiring.
 DisableStopIfSupported=Disable STOP message (if supported)
diff --git a/htdocs/langs/uz_UZ/stocks.lang b/htdocs/langs/uz_UZ/stocks.lang
index 9ec523427b1..1b6b7ba760d 100644
--- a/htdocs/langs/uz_UZ/stocks.lang
+++ b/htdocs/langs/uz_UZ/stocks.lang
@@ -1,66 +1,64 @@
 # Dolibarr language file - Source file is en_US - stocks
-WarehouseCard=Warehouse card
-Warehouse=Warehouse
-Warehouses=Warehouses
-ParentWarehouse=Parent warehouse
-NewWarehouse=New warehouse / Stock Location
-WarehouseEdit=Modify warehouse
-MenuNewWarehouse=New warehouse
-WarehouseSource=Source warehouse
-WarehouseSourceNotDefined=No warehouse defined,
+WarehouseCard=Ombor kartasi
+Warehouse=Ombor
+Warehouses=Omborlar
+ParentWarehouse=Ota-onalar ombori
+NewWarehouse=Yangi ombor / Qimmatbaho joy
+WarehouseEdit=Omborni o'zgartirish
+MenuNewWarehouse=Yangi ombor
+WarehouseSource=Manba ombori
+WarehouseSourceNotDefined=Hech qanday ombor aniqlanmagan,
 AddWarehouse=Create warehouse
-AddOne=Add one
+AddOne=Bittasini qo'shing
 DefaultWarehouse=Default warehouse
-WarehouseTarget=Target warehouse
-ValidateSending=Delete sending
-CancelSending=Cancel sending
-DeleteSending=Delete sending
-Stock=Stock
-Stocks=Stocks
+WarehouseTarget=Maqsadli ombor
+ValidateSending=Yuborishni o'chirish
+CancelSending=Yuborishni bekor qilish
+DeleteSending=Yuborishni o'chirish
+Stock=Aksiya
+Stocks=Qimmatli qog'ozlar
 MissingStocks=Missing stocks
 StockAtDate=Stocks at date
 StockAtDateInPast=Date in the past
 StockAtDateInFuture=Date in the future
-StocksByLotSerial=Stocks by lot/serial
-LotSerial=Lots/Serials
-LotSerialList=List of lot/serials
-Movements=Movements
-ErrorWarehouseRefRequired=Warehouse reference name is required
-ListOfWarehouses=List of warehouses
-ListOfStockMovements=List of stock movements
+StocksByLotSerial=Qurilma / seriya bo'yicha aktsiyalar
+LotSerial=Ko'p / seriyalar
+LotSerialList=Lot / seriyalar ro'yxati
+Movements=Harakatlar
+ErrorWarehouseRefRequired=Omborga mos yozuvlar nomi talab qilinadi
+ListOfWarehouses=Omborlar ro'yxati
+ListOfStockMovements=Birja harakatlari ro'yxati
 ListOfInventories=List of inventories
 MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
-StocksArea=Warehouses area
+StocksArea=Omborlar maydoni
 AllWarehouses=All warehouses
 IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
-Location=Location
-LocationSummary=Short name of location
-NumberOfDifferentProducts=Number of unique products
-NumberOfProducts=Total number of products
-LastMovement=Latest movement
-LastMovements=Latest movements
-Units=Units
-Unit=Unit
-StockCorrection=Stock correction
+Location=Manzil
+LocationSummary=Joylashuvning qisqacha nomi
+NumberOfDifferentProducts=Noyob mahsulotlar soni
+NumberOfProducts=Mahsulotlarning umumiy soni
+LastMovement=Oxirgi harakat
+LastMovements=Oxirgi harakatlar
+Units=Birlik
+Unit=Birlik
+StockCorrection=Qimmatli qog'ozlarni tuzatish
 CorrectStock=Correct stock
-StockTransfer=Stock transfer
+StockTransfer=Qimmatli qog'ozlarni o'tkazish
 TransferStock=Transfer stock
-MassStockTransferShort=Mass stock transfer
-StockMovement=Stock movement
-StockMovements=Stock movements
-NumberOfUnit=Number of units
-UnitPurchaseValue=Unit purchase price
-StockTooLow=Stock too low
-StockLowerThanLimit=Stock lower than alert limit (%s)
-EnhancedValue=Value
-PMPValue=Weighted average price
-PMPValueShort=WAP
-EnhancedValueOfWarehouses=Warehouses value
-UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
-AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
+MassStockTransferShort=Ommaviy aktsiyalarni o'tkazish
+StockMovement=Birja harakati
+StockMovements=Birja harakatlari
+NumberOfUnit=Birlik soni
+UnitPurchaseValue=Birlikni sotib olish narxi
+StockTooLow=Aksiya juda past
+StockLowerThanLimit=Qimmatbaho qog'ozlar ogohlantirish chegarasidan past (%s)
+EnhancedValue=Qiymat
+EnhancedValueOfWarehouses=Omborlarning qiymati
+UserWarehouseAutoCreate=Foydalanuvchini yaratishda avtomatik ravishda foydalanuvchi omborini yarating
+AllowAddLimitStockByWarehouse=Shuningdek, har bir mahsulot uchun minimal va kerakli zaxira qiymatidan tashqari, har bir juftlik uchun minimal va kerakli stok qiymatini (mahsulot ombori) boshqaring
 RuleForWarehouse=Rule for warehouses
 WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
 WarehouseAskWarehouseDuringPropal=Set a warehouse on Commercial proposals
@@ -69,115 +67,115 @@ UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
 MainDefaultWarehouseUser=Use a default warehouse for each user
 MainDefaultWarehouseUserDesc=By activating this option, during creation of a product, the warehouse assigned to the product will be defined on this one. If no warehouse is defined on the user, the default warehouse is defined.
-IndependantSubProductStock=Product stock and subproduct stock are independent
-QtyDispatched=Quantity dispatched
-QtyDispatchedShort=Qty dispatched
-QtyToDispatchShort=Qty to dispatch
-OrderDispatch=Item receipts
-RuleForStockManagementDecrease=Choose Rule for automatic stock decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
-RuleForStockManagementIncrease=Choose Rule for automatic stock increase (manual increase is always possible, even if an automatic increase rule is activated)
-DeStockOnBill=Decrease real stocks on validation of customer invoice/credit note
-DeStockOnValidateOrder=Decrease real stocks on validation of sales order
-DeStockOnShipment=Decrease real stocks on shipping validation
-DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
-ReStockOnBill=Increase real stocks on validation of vendor invoice/credit note
-ReStockOnValidateOrder=Increase real stocks on purchase order approval
-ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouse, after purchase order receipt of goods
+IndependantSubProductStock=Mahsulot zaxiralari va subproduct zaxiralari mustaqil
+QtyDispatched=Miqdor yuborildi
+QtyDispatchedShort=Miqdor jo'natildi
+QtyToDispatchShort=Yuborish uchun miqdor
+OrderDispatch=Mahsulot tushumlari
+RuleForStockManagementDecrease=Aktsiyalarni avtomatik ravishda kamaytirish uchun qoidani tanlang (avtomatik ravishda pasayish qoidasi yoqilgan bo'lsa ham, qo'lda pasayish har doim ham mumkin)
+RuleForStockManagementIncrease=Qimmatli qog'ozlarni avtomatik ravishda oshirish uchun qoidani tanlang (avtomatik ravishda oshirish qoidasi yoqilgan bo'lsa ham, qo'lda oshirish har doim ham mumkin)
+DeStockOnBill=Mijozlarning hisob-fakturasini / kredit yozuvlarini tasdiqlash bo'yicha haqiqiy zaxiralarni kamaytiring
+DeStockOnValidateOrder=Savdo buyurtmasini tasdiqlash bo'yicha haqiqiy zaxiralarni kamaytiring
+DeStockOnShipment=Yuk tashishni tasdiqlash bo'yicha haqiqiy zaxiralarni kamaytiring
+DeStockOnShipmentOnClosing=Yuk tashish yopiq bo'lsa, haqiqiy zaxiralarni kamaytiring
+ReStockOnBill=Sotuvchi fakturasini / kredit yozuvini tasdiqlash bo'yicha real zaxiralarni ko'paytiring
+ReStockOnValidateOrder=Xarid buyurtmalarini tasdiqlash bo'yicha haqiqiy zaxiralarni ko'paytiring
+ReStockOnDispatchOrder=Tovarlarni sotib olish buyurtmasi olinganidan keyin omborga qo'lda jo'natish uchun real zaxiralarni ko'paytiring
 StockOnReception=Increase real stocks on validation of reception
 StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
-OrderStatusNotReadyToDispatch=Order has not yet or no more a status that allows dispatching of products in stock warehouses.
-StockDiffPhysicTeoric=Explanation for difference between physical and virtual stock
-NoPredefinedProductToDispatch=No predefined products for this object. So no dispatching in stock is required.
-DispatchVerb=Dispatch
-StockLimitShort=Limit for alert
-StockLimit=Stock limit for alert
+OrderStatusNotReadyToDispatch=Buyurtma hali omborlarda mahsulotlarni jo'natishga imkon beradigan maqomga ega emas yoki yo'q.
+StockDiffPhysicTeoric=Jismoniy va virtual zaxiralar o'rtasidagi farqni tushuntirish
+NoPredefinedProductToDispatch=Ushbu ob'ekt uchun oldindan belgilangan mahsulotlar yo'q. Shuning uchun stokda dispetcherlik talab qilinmaydi.
+DispatchVerb=Jo'natish
+StockLimitShort=Ogohlantirish chegarasi
+StockLimit=Ogohlantirish uchun stok cheklovi
 StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
-PhysicalStock=Physical Stock
-RealStock=Real Stock
+PhysicalStock=Jismoniy aktsiyalar
+RealStock=Haqiqiy aktsiya
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
-VirtualStock=Virtual stock
+VirtualStock=Virtual zaxira
 VirtualStockAtDate=Virtual stock at date
 VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen date will be finished
 VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
 AtDate=At date
-IdWarehouse=Id warehouse
-DescWareHouse=Description warehouse
-LieuWareHouse=Localisation warehouse
-WarehousesAndProducts=Warehouses and products
-WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
-AverageUnitPricePMPShort=Weighted average price
+IdWarehouse=Idish ombori
+DescWareHouse=Tavsif ombori
+LieuWareHouse=Mahalliylashtirish ombori
+WarehousesAndProducts=Omborlar va mahsulotlar
+WarehousesAndProductsBatchDetail=Omborlar va mahsulotlar (lot / seriya bo'yicha batafsil ma'lumot bilan)
+AverageUnitPricePMPShort=O'rtacha narx
 AverageUnitPricePMPDesc=The input average unit price we had to expense to get 1 unit of product into our stock.
-SellPriceMin=Selling Unit Price
-EstimatedStockValueSellShort=Value for sell
-EstimatedStockValueSell=Value for sell
-EstimatedStockValueShort=Input stock value
-EstimatedStockValue=Input stock value
-DeleteAWarehouse=Delete a warehouse
-ConfirmDeleteWarehouse=Are you sure you want to delete the warehouse <b>%s</b>?
-PersonalStock=Personal stock %s
-ThisWarehouseIsPersonalStock=This warehouse represents personal stock of %s %s
-SelectWarehouseForStockDecrease=Choose warehouse to use for stock decrease
-SelectWarehouseForStockIncrease=Choose warehouse to use for stock increase
-NoStockAction=No stock action
-DesiredStock=Desired Stock
-DesiredStockDesc=This stock amount will be the value used to fill the stock by replenishment feature.
-StockToBuy=To order
-Replenishment=Replenishment
-ReplenishmentOrders=Replenishment orders
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
+SellPriceMin=Sotish birligi narxi
+EstimatedStockValueSellShort=Sotish uchun qiymati
+EstimatedStockValueSell=Sotish uchun qiymati
+EstimatedStockValueShort=Kirish qiymati
+EstimatedStockValue=Kirish qiymati
+DeleteAWarehouse=Omborni o'chirish
+ConfirmDeleteWarehouse=<b> %s </b> omborini o'chirishni xohlaysizmi?
+PersonalStock=Shaxsiy kabinetga %s
+ThisWarehouseIsPersonalStock=Ushbu ombor %s %s shaxsiy zaxirasini aks ettiradi
+SelectWarehouseForStockDecrease=Qimmatli qog'ozlarni kamaytirish uchun foydalaniladigan omborni tanlang
+SelectWarehouseForStockIncrease=Qimmatli qog'ozlarni ko'paytirish uchun foydalaniladigan omborni tanlang
+NoStockAction=Birja aktsiyasi yo'q
+DesiredStock=Kerakli aksiya
+DesiredStockDesc=Ushbu zaxira miqdori zaxirani to'ldirish xususiyati bilan to'ldirish uchun ishlatiladigan qiymat bo'ladi.
+StockToBuy=Buyurtma qilish
+Replenishment=To'ldirish
+ReplenishmentOrders=To'ldirish buyurtmalari
+VirtualDiffersFromPhysical=Aksiyalarning ko'payishi / kamayishi bo'yicha jismoniy aktsiyalar va virtual aktsiyalar (jismoniy aktsiyalar + ochiq buyurtmalar) farq qilishi mumkin
 UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
 ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
-UseVirtualStock=Use virtual stock
-UsePhysicalStock=Use physical stock
-CurentSelectionMode=Current selection mode
-CurentlyUsingVirtualStock=Virtual stock
-CurentlyUsingPhysicalStock=Physical stock
-RuleForStockReplenishment=Rule for stocks replenishment
-SelectProductWithNotNullQty=Select at least one product with a qty not null and a vendor
-AlertOnly= Alerts only
+UseVirtualStock=Virtual zaxiradan foydalaning
+UsePhysicalStock=Jismoniy zaxiradan foydalaning
+CurentSelectionMode=Joriy tanlov rejimi
+CurentlyUsingVirtualStock=Virtual zaxira
+CurentlyUsingPhysicalStock=Jismoniy zaxiralar
+RuleForStockReplenishment=Qimmatli qog'ozlarni to'ldirish qoidasi
+SelectProductWithNotNullQty=Miqdor null bo'lmagan va sotuvchisi bo'lgan kamida bitta mahsulotni tanlang
+AlertOnly= Faqat ogohlantirishlar
 IncludeProductWithUndefinedAlerts = Include also negative stock for products with no desired quantity defined, to restore them to 0
-WarehouseForStockDecrease=The warehouse <b>%s</b> will be used for stock decrease
-WarehouseForStockIncrease=The warehouse <b>%s</b> will be used for stock increase
-ForThisWarehouse=For this warehouse
-ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create purchase orders to fill the difference.
+WarehouseForStockDecrease=<b> %s </b> ombori zaxiralarni kamaytirish uchun ishlatiladi
+WarehouseForStockIncrease=<b> %s </b> ombori zaxiralarni ko'paytirish uchun ishlatiladi
+ForThisWarehouse=Ushbu ombor uchun
+ReplenishmentStatusDesc=Bu kerakli zaxiradan past bo'lgan (yoki "faqat ogohlantirish" katagiga belgi qo'yilgan bo'lsa, ogohlantirish qiymatidan past bo'lgan) barcha mahsulotlarning ro'yxati. Belgilash katagidan foydalanib, siz farqni to'ldirish uchun sotib olish buyurtmalarini yaratishingiz mumkin.
 ReplenishmentStatusDescPerWarehouse=If you want a replenishment based on desired quantity defined per warehouse, you must add a filter on the warehouse.
-ReplenishmentOrdersDesc=This is a list of all open purchase orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
-Replenishments=Replenishments
-NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
-NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
-MassMovement=Mass movement
-SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
-RecordMovement=Record transfer
-ReceivingForSameOrder=Receipts for this order
-StockMovementRecorded=Stock movements recorded
-RuleForStockAvailability=Rules on stock requirements
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever the rule for automatic stock change)
-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 the 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 the rule for automatic stock change)
-MovementLabel=Label of movement
+ReplenishmentOrdersDesc=Bu oldindan belgilangan mahsulotlarni o'z ichiga olgan barcha ochiq sotib olish buyurtmalarining ro'yxati. Bu erda faqat oldindan belgilangan mahsulotlarga ega bo'lgan ochiq buyurtmalar, shu sababli aktsiyalarga ta'sir qilishi mumkin bo'lgan buyurtmalar ko'rinadi.
+Replenishments=To'ldirish
+NbOfProductBeforePeriod=%s mahsulotining tanlangan muddatgacha zaxiradagi miqdori (<%s)
+NbOfProductAfterPeriod=Tanlangan davrdan keyin zaxiradagi %s mahsulotining miqdori (> %s)
+MassMovement=Ommaviy harakat
+SelectProductInAndOutWareHouse=Manba omborini va maqsadli omborni, mahsulotni va miqdorni tanlang, so'ng "%s" tugmasini bosing. Bu barcha kerakli harakatlar uchun bajarilgandan so'ng, "%s" tugmasini bosing.
+RecordMovement=Yozuvni o'tkazish
+ReceivingForSameOrder=Ushbu buyurtma uchun kvitansiyalar
+StockMovementRecorded=Qimmatli qog'ozlar harakati qayd etildi
+RuleForStockAvailability=Qimmatli qog'ozlarga talablar bo'yicha qoidalar
+StockMustBeEnoughForInvoice=Hisob-fakturaga mahsulot / xizmatni qo'shish uchun birja darajasi etarli bo'lishi kerak (tekshirish avtomatik ravishda o'zgartirish qoidasi qanday bo'lishidan qat'iy nazar, fakturaga qator qo'shilganda, amaldagi real zaxirada tekshiriladi)
+StockMustBeEnoughForOrder=Qimmatbaho qog'ozlar darajasi buyurtma berish uchun mahsulot / xizmatni qo'shish uchun etarli bo'lishi kerak (tekshirish avtomatik ravishda o'zgartirish qoidalari qanday bo'lishidan qat'i nazar, qatorni qo'shganda joriy real zaxirada amalga oshiriladi)
+StockMustBeEnoughForShipment= Qimmatbaho qog'ozlar darajasi mahsulotni / xizmatni jo'natishga qo'shish uchun etarli bo'lishi kerak (tekshirish avtomatik ravishda o'zgarishi uchun qanday qoidaga rioya qilinsa, etkazib berishga chiziq qo'shilganda joriy real zaxirada tekshiriladi)
+MovementLabel=Harakat yorlig'i
 TypeMovement=Direction of movement
 DateMovement=Date of movement
-InventoryCode=Movement or inventory code
-IsInPackage=Contained into package
-WarehouseAllowNegativeTransfer=Stock can be negative
-qtyToTranferIsNotEnough=You don't have enough stock from your source warehouse and your setup does not allow negative stocks.
+InventoryCode=Harakat yoki inventarizatsiya kodi
+IsInPackage=Paket ichida mavjud
+WarehouseAllowNegativeTransfer=Qimmatli qog'ozlar salbiy bo'lishi mumkin
+qtyToTranferIsNotEnough=Sizda manba omboridan etarli miqdordagi zaxira yo'q va sizning sozlamangiz salbiy zaxiralarga yo'l qo'ymaydi.
 qtyToTranferLotIsNotEnough=You don't have enough stock, for this lot number, from your source warehouse and your setup does not allow negative stocks (Qty for product '%s' with lot '%s' is %s in warehouse '%s').
-ShowWarehouse=Show warehouse
-MovementCorrectStock=Stock correction for product %s
-MovementTransferStock=Stock transfer of product %s into another warehouse
-InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to open purchase order
-ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
-OpenAll=Open for all actions
-OpenInternal=Open only for internal actions
-UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on purchase order reception
-OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a product has several selling price so value for sell can't be calculated
-ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock correctly created
-ProductStockWarehouseUpdated=Stock limit for alert and desired optimal stock correctly updated
-ProductStockWarehouseDeleted=Stock limit for alert and desired optimal stock correctly deleted
-AddNewProductStockWarehouse=Set new limit for alert and desired optimal stock
-AddStockLocationLine=Decrease quantity then click to add another warehouse for this product
+ShowWarehouse=Omborni ko'rsatish
+MovementCorrectStock=%s mahsuloti uchun aktsiyalarni tuzatish
+MovementTransferStock=%s mahsulotini boshqa omborga zaxirada o'tkazish
+InventoryCodeShort=Inv. / Mov. kod
+NoPendingReceptionOnSupplierOrder=Ochiq sotib olish buyurtmasi tufayli kutish kutilmagan
+ThisSerialAlreadyExistWithDifferentDate=Bu ko'p / seriya raqami (<strong> %s </strong>) allaqachon mavjud, lekin har xil eatby yoki sellby sana (<strong> %s </strong> topildi lekin siz <strong> %s </strong> kiriting).
+OpenAll=Barcha harakatlar uchun ochiq
+OpenInternal=Faqat ichki harakatlar uchun oching
+UseDispatchStatus=Xarid buyurtmalarini qabul qilishda mahsulot yo'nalishlari uchun jo'natish holatidan foydalaning (tasdiqlash / rad etish)
+OptionMULTIPRICESIsOn="Bir segment uchun bir nechta narxlar" opsiyasi yoqilgan. Bu shuni anglatadiki, mahsulot bir necha sotish narxiga ega, shuning uchun sotish qiymatini hisoblab bo'lmaydi
+ProductStockWarehouseCreated=Ogohlantirish uchun stok chegarasi va kerakli optimal stok to'g'ri yaratilgan
+ProductStockWarehouseUpdated=Ogohlantirish uchun kerakli limit va kerakli optimal stok to'g'ri yangilangan
+ProductStockWarehouseDeleted=Ogohlantirish uchun kerakli limit va kerakli optimal stok to'g'ri o'chirildi
+AddNewProductStockWarehouse=Ogohlantirish va kerakli optimal stok uchun yangi chegara o'rnating
+AddStockLocationLine=Miqdorni kamaytiring, so'ngra ushbu mahsulot uchun boshqa omborni qo'shish uchun bosing
 InventoryDate=Inventory date
 NewInventory=New inventory
 inventorySetup = Inventory Setup
@@ -251,7 +249,10 @@ SelectAStockMovementFileToImport=select a stock movement file to import
 InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
 LabelOfInventoryMovemement=Inventory %s
 ReOpen=Reopen
-ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock to the real qty you entered into the inventory.
 ObjectNotFound=%s not found
 MakeMovementsAndClose=Generate movements and close
 AutofillWithExpected=Fill real quantity with expected quantity
+ShowAllBatchByDefault=By default, show batch details on product "stock" tab
+CollapseBatchDetailHelp=You can set batch detail default display in stocks module configuration
+FieldCannotBeNegative=Field "%s" cannot be negative
diff --git a/htdocs/langs/uz_UZ/supplier_proposal.lang b/htdocs/langs/uz_UZ/supplier_proposal.lang
index ce5bdf0425a..76e2dea549e 100644
--- a/htdocs/langs/uz_UZ/supplier_proposal.lang
+++ b/htdocs/langs/uz_UZ/supplier_proposal.lang
@@ -1,54 +1,58 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=Vendor commercial proposals
-supplier_proposalDESC=Manage price requests to suppliers
-SupplierProposalNew=New price request
-CommRequest=Price request
-CommRequests=Price requests
-SearchRequest=Find a request
-DraftRequests=Draft requests
-SupplierProposalsDraft=Draft vendor proposals
-LastModifiedRequests=Latest %s modified price requests
-RequestsOpened=Open price requests
-SupplierProposalArea=Vendor proposals area
-SupplierProposalShort=Vendor proposal
-SupplierProposals=Vendor proposals
-SupplierProposalsShort=Vendor proposals
-NewAskPrice=New price request
-ShowSupplierProposal=Show price request
-AddSupplierProposal=Create a price request
-SupplierProposalRefFourn=Vendor ref
-SupplierProposalDate=Delivery date
-SupplierProposalRefFournNotice=Before closing to "Accepted", think to grasp suppliers references.
-ConfirmValidateAsk=Are you sure you want to validate this price request under name <b>%s</b>?
-DeleteAsk=Delete request
-ValidateAsk=Validate request
-SupplierProposalStatusDraft=Draft (needs to be validated)
-SupplierProposalStatusValidated=Validated (request is open)
-SupplierProposalStatusClosed=Closed
-SupplierProposalStatusSigned=Accepted
-SupplierProposalStatusNotSigned=Refused
-SupplierProposalStatusDraftShort=Draft
-SupplierProposalStatusValidatedShort=Validated
-SupplierProposalStatusClosedShort=Closed
-SupplierProposalStatusSignedShort=Accepted
-SupplierProposalStatusNotSignedShort=Refused
-CopyAskFrom=Create a price request by copying an existing request
-CreateEmptyAsk=Create blank request
-ConfirmCloneAsk=Are you sure you want to clone the price request <b>%s</b>?
-ConfirmReOpenAsk=Are you sure you want to open back the price request <b>%s</b>?
-SendAskByMail=Send price request by mail
-SendAskRef=Sending the price request %s
-SupplierProposalCard=Request card
-ConfirmDeleteAsk=Are you sure you want to delete this price request <b>%s</b>?
-ActionsOnSupplierProposal=Events on price request
-DocModelAuroreDescription=A complete request model (logo...)
-CommercialAsk=Price request
-DefaultModelSupplierProposalCreate=Default model creation
-DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
-DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
+SupplierProposal=Tijorat takliflarini sotuvchi
+supplier_proposalDESC=Yetkazib beruvchilarga narx bo'yicha so'rovlarni boshqaring
+SupplierProposalNew=Yangi narx bo'yicha so'rov
+CommRequest=Narx so'rovi
+CommRequests=Narxlar bo'yicha so'rovlar
+SearchRequest=So'rovni toping
+DraftRequests=So'rovlar loyihasi
+SupplierProposalsDraft=Sotuvchilarning takliflari loyihasi
+LastModifiedRequests=Oxirgi %s narxlari bo'yicha o'zgartirilgan so'rovlar
+RequestsOpened=Narx bo'yicha so'rovlarni oching
+SupplierProposalArea=Sotuvchi takliflari maydoni
+SupplierProposalShort=Sotuvchi taklifi
+SupplierProposals=Sotuvchi takliflari
+SupplierProposalsShort=Sotuvchi takliflari
+AskPrice=Price request
+NewAskPrice=Yangi narx bo'yicha so'rov
+ShowSupplierProposal=Narx so'rovini ko'rsatish
+AddSupplierProposal=Narx so'rovini yarating
+SupplierProposalRefFourn=Sotuvchi ref
+SupplierProposalDate=Yetkazib berish sanasi
+SupplierProposalRefFournNotice="Qabul qilingan" bandini yopishdan oldin, etkazib beruvchilarning ma'lumotnomalarini tushunib oling.
+ConfirmValidateAsk=Ushbu narx talabini <b> %s </b> nomi ostida tasdiqlamoqchimisiz?
+DeleteAsk=So'rovni o'chirish
+ValidateAsk=So'rovni tasdiqlash
+SupplierProposalStatusDraft=Qoralama (tasdiqlanishi kerak)
+SupplierProposalStatusValidated=Tasdiqlangan (so'rov ochiq)
+SupplierProposalStatusClosed=Yopiq
+SupplierProposalStatusSigned=Qabul qilindi
+SupplierProposalStatusNotSigned=Rad etildi
+SupplierProposalStatusDraftShort=Qoralama
+SupplierProposalStatusValidatedShort=Tasdiqlangan
+SupplierProposalStatusClosedShort=Yopiq
+SupplierProposalStatusSignedShort=Qabul qilindi
+SupplierProposalStatusNotSignedShort=Rad etildi
+CopyAskFrom=Mavjud so'rovni nusxalash orqali narx bo'yicha so'rov yarating
+CreateEmptyAsk=Bo'sh so'rov yarating
+ConfirmCloneAsk=Narx so'rovini <b> %s </b> klonlamoqchimisiz?
+ConfirmReOpenAsk=Narx so'rovini qayta ochishni xohlaysizmi <b> %s </b>?
+SendAskByMail=Pochta orqali narx bo'yicha so'rov yuboring
+SendAskRef=%s narx so'rovini yuborish
+SupplierProposalCard=Kartani so'rash
+ConfirmDeleteAsk=Ushbu narx talabini o'chirishni xohlaysizmi <b> %s </b>?
+ActionsOnSupplierProposal=Narxlar bo'yicha so'rov bo'yicha tadbirlar
+DocModelAuroreDescription=To'liq so'rov modeli (logotip ...)
+CommercialAsk=Narx so'rovi
+DefaultModelSupplierProposalCreate=Standart model yaratish
+DefaultModelSupplierProposalToBill=Narx so'rovini yopishda standart shablon (qabul qilinadi)
+DefaultModelSupplierProposalClosed=Narx so'rovini yopishda standart shablon (rad etilgan)
 ListOfSupplierProposals=List of vendor proposal requests
-ListSupplierProposalsAssociatedProject=List of vendor proposals associated with project
-SupplierProposalsToClose=Vendor proposals to close
-SupplierProposalsToProcess=Vendor proposals to process
-LastSupplierProposals=Latest %s price requests
-AllPriceRequests=All requests
+ListSupplierProposalsAssociatedProject=Loyiha bilan bog'liq sotuvchilar takliflari ro'yxati
+SupplierProposalsToClose=Yopish uchun sotuvchilarning takliflari
+SupplierProposalsToProcess=Ishlab chiqaruvchilarning takliflarini qayta ishlash
+LastSupplierProposals=%s narxlari bo'yicha so'nggi so'rovlar
+AllPriceRequests=Barcha so'rovlar
+TypeContact_supplier_proposal_external_SHIPPING=Vendor contact for delivery
+TypeContact_supplier_proposal_external_BILLING=Vendor contact for billing
+TypeContact_supplier_proposal_external_SERVICE=Representative following-up proposal
diff --git a/htdocs/langs/uz_UZ/suppliers.lang b/htdocs/langs/uz_UZ/suppliers.lang
index ca9ee174d29..47500b9b9b2 100644
--- a/htdocs/langs/uz_UZ/suppliers.lang
+++ b/htdocs/langs/uz_UZ/suppliers.lang
@@ -1,49 +1,49 @@
 # Dolibarr language file - Source file is en_US - vendors
-Suppliers=Vendors
-SuppliersInvoice=Vendor invoice
+Suppliers=Sotuvchilar
+SuppliersInvoice=Sotuvchi hisob-fakturasi
 SupplierInvoices=Vendor invoices
-ShowSupplierInvoice=Show Vendor Invoice
-NewSupplier=New vendor
-History=History
-ListOfSuppliers=List of vendors
-ShowSupplier=Show vendor
-OrderDate=Order date
-BuyingPriceMin=Best buying price
-BuyingPriceMinShort=Best buying price
-TotalBuyingPriceMinShort=Total of subproducts buying prices
-TotalSellingPriceMinShort=Total of subproducts selling prices
-SomeSubProductHaveNoPrices=Some sub-products have no price defined
-AddSupplierPrice=Add buying price
-ChangeSupplierPrice=Change buying price
+ShowSupplierInvoice=Sotuvchi fakturasini ko'rsating
+NewSupplier=Yangi sotuvchi
+History=Tarix
+ListOfSuppliers=Sotuvchilar ro'yxati
+ShowSupplier=Sotuvchini ko'rsatish
+OrderDate=Buyurtma sanasi
+BuyingPriceMin=Eng yaxshi sotib olish narxi
+BuyingPriceMinShort=Eng yaxshi sotib olish narxi
+TotalBuyingPriceMinShort=Sotib olinadigan subproductlarning umumiy narxi
+TotalSellingPriceMinShort=Sotish narxlarining subproductlari jami
+SomeSubProductHaveNoPrices=Ba'zi bir kichik mahsulotlarda narx belgilanmagan
+AddSupplierPrice=Xarid qilish narxini qo'shing
+ChangeSupplierPrice=Xarid narxini o'zgartiring
 SupplierPrices=Vendor prices
-ReferenceSupplierIsAlreadyAssociatedWithAProduct=This vendor reference is already associated with a product: %s
-NoRecordedSuppliers=No vendor recorded
-SupplierPayment=Vendor payment
-SuppliersArea=Vendor area
-RefSupplierShort=Ref. vendor
-Availability=Availability
-ExportDataset_fournisseur_1=Vendor invoices and invoice details
-ExportDataset_fournisseur_2=Vendor invoices and payments
-ExportDataset_fournisseur_3=Purchase orders and order details
-ApproveThisOrder=Approve this order
-ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
-DenyingThisOrder=Deny this order
-ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
-ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
-AddSupplierOrder=Create Purchase Order
-AddSupplierInvoice=Create vendor invoice
-ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
-SentToSuppliers=Sent to vendors
-ListOfSupplierOrders=List of purchase orders
-MenuOrdersSupplierToBill=Purchase orders to invoice
-NbDaysToDelivery=Delivery delay (days)
-DescNbDaysToDelivery=The longest delivery delay of the products from this order
-SupplierReputation=Vendor reputation
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=Ushbu sotuvchi ma'lumotnomasi allaqachon mahsulot bilan bog'langan: %s
+NoRecordedSuppliers=Hech qanday sotuvchi yozilmagan
+SupplierPayment=Sotuvchining to'lovi
+SuppliersArea=Sotuvchi maydoni
+RefSupplierShort=Ref. sotuvchi
+Availability=Mavjudligi
+ExportDataset_fournisseur_1=Sotuvchi hisob-fakturalari va hisob-kitob ma'lumotlari
+ExportDataset_fournisseur_2=Sotuvchi hisob-kitoblari va to'lovlari
+ExportDataset_fournisseur_3=Sotib olish buyurtmalari va buyurtma tafsilotlari
+ApproveThisOrder=Ushbu buyurtmani tasdiqlash
+ConfirmApproveThisOrder=<b> %s </b> buyurtmasini tasdiqlashingizga ishonchingiz komilmi?
+DenyingThisOrder=Ushbu buyurtmani rad eting
+ConfirmDenyingThisOrder=Ushbu buyurtmani rad qilishni xohlaysizmi <b> %s </b>?
+ConfirmCancelThisOrder=Haqiqatan ham ushbu buyurtmani bekor qilishni xohlaysizmi <b> %s </b>?
+AddSupplierOrder=Xarid buyurtmasini yarating
+AddSupplierInvoice=Sotuvchi hisob-fakturasini yarating
+ListOfSupplierProductForSupplier=<b> %s </b> sotuvchisi uchun mahsulotlar va narxlar ro'yxati.
+SentToSuppliers=Sotuvchilarga yuborildi
+ListOfSupplierOrders=Sotib olish uchun buyurtmalar ro'yxati
+MenuOrdersSupplierToBill=Hisob-fakturaga buyurtma sotib oling
+NbDaysToDelivery=Yetkazib berishning kechikishi (kunlar)
+DescNbDaysToDelivery=Ushbu buyurtma bo'yicha mahsulotlarni etkazib berishning eng uzoq kechikishi
+SupplierReputation=Sotuvchining obro'si
 ReferenceReputation=Reference reputation
-DoNotOrderThisProductToThisSupplier=Do not order
-NotTheGoodQualitySupplier=Low quality
-ReputationForThisProduct=Reputation
-BuyerName=Buyer name
+DoNotOrderThisProductToThisSupplier=Buyurtma bermang
+NotTheGoodQualitySupplier=Past sifatli
+ReputationForThisProduct=Obro'-e'tibor
+BuyerName=Xaridor nomi
 AllProductServicePrices=All product / service prices
 AllProductReferencesOfSupplier=All references of vendor
 BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/uz_UZ/ticket.lang b/htdocs/langs/uz_UZ/ticket.lang
index df73daf4a0d..1da32a5a99e 100644
--- a/htdocs/langs/uz_UZ/ticket.lang
+++ b/htdocs/langs/uz_UZ/ticket.lang
@@ -304,7 +304,7 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
-BoxTicketType=Number of open tickets by type
+BoxTicketType=Distribution of open tickets by type
 BoxTicketSeverity=Number of open tickets by severity
 BoxNoTicketSeverity=No tickets opened
 BoxTicketLastXDays=Number of new tickets by days the last %s days
diff --git a/htdocs/langs/uz_UZ/trips.lang b/htdocs/langs/uz_UZ/trips.lang
index e34078e8fc2..c4d47ce0867 100644
--- a/htdocs/langs/uz_UZ/trips.lang
+++ b/htdocs/langs/uz_UZ/trips.lang
@@ -1,54 +1,54 @@
 # Dolibarr language file - Source file is en_US - trips
-ShowExpenseReport=Show expense report
-Trips=Expense reports
-TripsAndExpenses=Expenses reports
-TripsAndExpensesStatistics=Expense reports statistics
-TripCard=Expense report card
-AddTrip=Create expense report
-ListOfTrips=List of expense reports
-ListOfFees=List of fees
-TypeFees=Types of fees
-ShowTrip=Show expense report
-NewTrip=New expense report
+ShowExpenseReport=Xarajatlar hisobotini ko'rsatish
+Trips=Xarajatlar bo'yicha hisobotlar
+TripsAndExpenses=Xarajatlar to'g'risida hisobotlar
+TripsAndExpensesStatistics=Xarajatlar bo'yicha hisobotlar
+TripCard=Xarajatlarni hisobga olish kartasi
+AddTrip=Xarajatlar to'g'risida hisobot yarating
+ListOfTrips=Xarajatlar bo'yicha hisobotlar ro'yxati
+ListOfFees=To'lovlar ro'yxati
+TypeFees=To'lov turlari
+ShowTrip=Xarajatlar hisobotini ko'rsatish
+NewTrip=Yangi xarajatlar hisoboti
 LastExpenseReports=Latest %s expense reports
 AllExpenseReports=All expense reports
-CompanyVisited=Company/organization visited
-FeesKilometersOrAmout=Amount or kilometers
-DeleteTrip=Delete expense report
-ConfirmDeleteTrip=Are you sure you want to delete this expense report?
-ListTripsAndExpenses=List of expense reports
-ListToApprove=Waiting for approval
-ExpensesArea=Expense reports area
-ClassifyRefunded=Classify 'Refunded'
-ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
-ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
-ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
-ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.<br>The %s, you refused to approve the expense report for this reason: %s.<br>A new version has been proposed and waiting for your approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
-ExpenseReportApproved=An expense report was approved
-ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
-ExpenseReportRefused=An expense report was refused
+CompanyVisited=Kompaniya / tashkilot tashrif buyurdi
+FeesKilometersOrAmout=Miqdor yoki kilometr
+DeleteTrip=Xarajatlar to'g'risidagi hisobotni o'chirish
+ConfirmDeleteTrip=Ushbu xarajatlar hisobotini o'chirishni xohlaysizmi?
+ListTripsAndExpenses=Xarajatlar bo'yicha hisobotlar ro'yxati
+ListToApprove=Tasdiqlashni kutmoqdaman
+ExpensesArea=Xarajatlar bo'yicha hisobotlar maydoni
+ClassifyRefunded="Qaytarilgan" deb tasniflang
+ExpenseReportWaitingForApproval=Tasdiqlash uchun yangi xarajatlar hisoboti taqdim etildi
+ExpenseReportWaitingForApprovalMessage=Xarajatlar bo'yicha yangi hisobot taqdim etildi va tasdiqlashni kutmoqda. <br> - Foydalanuvchi: %s <br> - Davr: %s <br> Tasdiqlash uchun shu yerni bosing: %s
+ExpenseReportWaitingForReApproval=Xarajatlar to'g'risidagi hisobot qayta tasdiqlash uchun taqdim etildi
+ExpenseReportWaitingForReApprovalMessage=Xarajatlar to'g'risidagi hisobot taqdim etildi va qayta tasdiqlashni kutmoqda. <br> %s, siz shu sababli xarajatlar hisobotini tasdiqlashdan bosh tortdingiz: %s. <br> Yangi versiyasi taklif qilindi va sizning roziligingizni kutmoqda. <br> - Foydalanuvchi: %s <br> - Davr: %s <br> Tasdiqlash uchun shu yerni bosing: %s
+ExpenseReportApproved=Xarajatlar to'g'risidagi hisobot tasdiqlandi
+ExpenseReportApprovedMessage=%s xarajatlar hisoboti tasdiqlandi. <br> - Foydalanuvchi: %s <br> - Tasdiqlagan: %s <br> Xarajatlar hisobotini ko'rsatish uchun shu yerni bosing: %s
+ExpenseReportRefused=Xarajatlar to'g'risidagi hisobot rad etildi
 ExpenseReportRefusedMessage=The expense report %s was refused.<br> - User: %s<br> - Refused by: %s<br> - Motive for refusal: %s<br>Click here to show the expense report: %s
-ExpenseReportCanceled=An expense report was canceled
+ExpenseReportCanceled=Xarajatlar to'g'risidagi hisobot bekor qilindi
 ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<br> - Canceled by: %s<br> - Motive for cancellation: %s<br>Click here to show the expense report: %s
-ExpenseReportPaid=An expense report was paid
-ExpenseReportPaidMessage=The expense report %s was paid.<br> - User: %s<br> - Paid by: %s<br>Click here to show the expense report: %s
-TripId=Id expense report
-AnyOtherInThisListCanValidate=Person to inform for validation.
-TripSociete=Information company
-TripNDF=Informations expense report
-PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
-ExpenseReportLine=Expense report line
-TF_OTHER=Other
-TF_TRIP=Transportation
-TF_LUNCH=Lunch
+ExpenseReportPaid=Xarajatlar to'g'risidagi hisobot to'langan
+ExpenseReportPaidMessage=%s xarajatlar hisoboti to'landi. <br> - Foydalanuvchi: %s <br> - To'langan: %s <br> Xarajatlar hisobotini ko'rsatish uchun shu yerni bosing: %s
+TripId=Id xarajatlari to'g'risidagi hisobot
+AnyOtherInThisListCanValidate=So'rovni tasdiqlash uchun xabardor qilinadigan shaxs.
+TripSociete=Axborot kompaniyasi
+TripNDF=Axborot xarajatlari to'g'risidagi hisobot
+PDFStandardExpenseReports=Xarajatlar hisoboti uchun PDF hujjatini yaratish uchun standart shablon
+ExpenseReportLine=Xarajatlar bo'yicha hisobot chizig'i
+TF_OTHER=Boshqalar
+TF_TRIP=Transport
+TF_LUNCH=Tushlik
 TF_METRO=Metro
-TF_TRAIN=Train
-TF_BUS=Bus
-TF_CAR=Car
-TF_PEAGE=Toll
-TF_ESSENCE=Fuel
-TF_HOTEL=Hotel
-TF_TAXI=Taxi
+TF_TRAIN=Poezd
+TF_BUS=Avtobus
+TF_CAR=Avtomobil
+TF_PEAGE=Yo'l uchun haq
+TF_ESSENCE=Yoqilg'i
+TF_HOTEL=Mehmonxona
+TF_TAXI=Taksi
 EX_KME=Mileage costs
 EX_FUE=Fuel CV
 EX_HOT=Hotel
@@ -75,42 +75,42 @@ DefaultCategoryCar=Default transportation mode
 DefaultRangeNumber=Default range number
 UploadANewFileNow=Upload a new document now
 Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
-ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
-AucuneLigne=There is no expense report declared yet
-ModePaiement=Payment mode
-VALIDATOR=User responsible for approval
-VALIDOR=Approved by
-AUTHOR=Recorded by
-AUTHORPAIEMENT=Paid by
-REFUSEUR=Denied by
-CANCEL_USER=Deleted by
-MOTIF_REFUS=Reason
-MOTIF_CANCEL=Reason
-DATE_REFUS=Deny date
-DATE_SAVE=Validation date
-DATE_CANCEL=Cancelation date
-DATE_PAIEMENT=Payment date
-BROUILLONNER=Reopen
+ErrorDoubleDeclaration=Shunga o'xshash sana oralig'ida boshqa xarajatlar hisobotini e'lon qildingiz.
+AucuneLigne=Hozircha xarajatlar to'g'risida hisobot e'lon qilinmagan
+ModePaiement=To'lov rejimi
+VALIDATOR=Tasdiqlash uchun javobgar foydalanuvchi
+VALIDOR=Tomonidan tasdiqlangan
+AUTHOR=Yozib olingan
+AUTHORPAIEMENT=To'langan
+REFUSEUR=Rad etilgan
+CANCEL_USER=O'chirilgan
+MOTIF_REFUS=Sabab
+MOTIF_CANCEL=Sabab
+DATE_REFUS=Sana rad etilsin
+DATE_SAVE=Tasdiqlash sanasi
+DATE_CANCEL=Bekor qilish sanasi
+DATE_PAIEMENT=To'lov sanasi
+BROUILLONNER=Qayta oching
 ExpenseReportRef=Ref. expense report
-ValidateAndSubmit=Validate and submit for approval
-ValidatedWaitingApproval=Validated (waiting for approval)
-NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
-ConfirmRefuseTrip=Are you sure you want to deny this expense report?
-ValideTrip=Approve expense report
-ConfirmValideTrip=Are you sure you want to approve this expense report?
-PaidTrip=Pay an expense report
-ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid"?
-ConfirmCancelTrip=Are you sure you want to cancel this expense report?
-BrouillonnerTrip=Move back expense report to status "Draft"
-ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft"?
-SaveTrip=Validate expense report
-ConfirmSaveTrip=Are you sure you want to validate this expense report?
-NoTripsToExportCSV=No expense report to export for this period.
-ExpenseReportPayment=Expense report payment
-ExpenseReportsToApprove=Expense reports to approve
-ExpenseReportsToPay=Expense reports to pay
-ConfirmCloneExpenseReport=Are you sure you want to clone this expense report ?
-ExpenseReportsIk=Expense report milles index
+ValidateAndSubmit=Tasdiqlang va tasdiqlash uchun topshiring
+ValidatedWaitingApproval=Tasdiqlangan (tasdiqlashni kutmoqda)
+NOT_AUTHOR=Siz ushbu xarajatlar hisobotining muallifi emassiz. Amal bekor qilindi.
+ConfirmRefuseTrip=Ushbu xarajatlar hisobotini rad etishni xohlaysizmi?
+ValideTrip=Xarajatlar to'g'risidagi hisobotni tasdiqlash
+ConfirmValideTrip=Ushbu xarajatlar hisobotini tasdiqlamoqchimisiz?
+PaidTrip=Xarajatlar to'g'risidagi hisobotni to'lash
+ConfirmPaidTrip=Ushbu xarajatlar hisobotining holatini "Pulli" ga o'zgartirishni xohlaysizmi?
+ConfirmCancelTrip=Ushbu xarajatlar hisobotini bekor qilmoqchimisiz?
+BrouillonnerTrip=Xarajatlar hisobotini "Qoralama" holatiga o'tkazing
+ConfirmBrouillonnerTrip=Ushbu xarajatlar hisobotini "Qoralama" holatiga o'tkazishni xohlaysizmi?
+SaveTrip=Xarajatlar to'g'risidagi hisobotni tasdiqlash
+ConfirmSaveTrip=Ushbu xarajatlar hisobotini tasdiqlamoqchimisiz?
+NoTripsToExportCSV=Ushbu davr uchun eksport uchun xarajatlar hisoboti yo'q.
+ExpenseReportPayment=Xarajatlar bo'yicha hisobotni to'lash
+ExpenseReportsToApprove=Tasdiqlash uchun xarajatlar hisobotlari
+ExpenseReportsToPay=To'lov uchun hisobot
+ConfirmCloneExpenseReport=Ushbu xarajatlar hisobotini klonlamoqchimisiz?
+ExpenseReportsIk=Configuration of mileage charges
 ExpenseReportsRules=Expense report rules
 ExpenseReportIkDesc=You can modify the calculation of kilometers expense by category and range who they are previously defined. <b>d</b> is the distance in kilometers
 ExpenseReportRulesDesc=You can create or update any rules of calculation. This part will be used when user will create a new expense report
@@ -145,7 +145,7 @@ nolimitbyEX_DAY=by day (no limitation)
 nolimitbyEX_MON=by month (no limitation)
 nolimitbyEX_YEA=by year (no limitation)
 nolimitbyEX_EXP=by line (no limitation)
-CarCategory=Category of car
+CarCategory=Vehicle category
 ExpenseRangeOffset=Offset amount: %s
 RangeIk=Mileage range
-AttachTheNewLineToTheDocument=Attach the new line to an existing document
+AttachTheNewLineToTheDocument=Attach the line to an uploaded document
diff --git a/htdocs/langs/uz_UZ/users.lang b/htdocs/langs/uz_UZ/users.lang
index 372090ea5ad..b285c074000 100644
--- a/htdocs/langs/uz_UZ/users.lang
+++ b/htdocs/langs/uz_UZ/users.lang
@@ -1,119 +1,119 @@
 # Dolibarr language file - Source file is en_US - users
-HRMArea=HRM area
-UserCard=User card
-GroupCard=Group card
-Permission=Permission
-Permissions=Permissions
-EditPassword=Edit password
-SendNewPassword=Regenerate and send password
+HRMArea=HRM maydoni
+UserCard=Foydalanuvchi kartasi
+GroupCard=Guruh kartasi
+Permission=Ruxsat
+Permissions=Ruxsatlar
+EditPassword=Parolni tahrirlash
+SendNewPassword=Parolni qayta yarating va yuboring
 SendNewPasswordLink=Send link to reset password
-ReinitPassword=Regenerate password
-PasswordChangedTo=Password changed to: %s
-SubjectNewPassword=Your new password for %s
-GroupRights=Group permissions
-UserRights=User permissions
+ReinitPassword=Parolni qayta yarating
+PasswordChangedTo=Parol o'zgartirildi: %s
+SubjectNewPassword=%s uchun yangi parolingiz
+GroupRights=Guruh ruxsatnomalari
+UserRights=Foydalanuvchi ruxsatlari
 Credentials=Credentials
-UserGUISetup=User Display Setup
-DisableUser=Disable
-DisableAUser=Disable a user
-DeleteUser=Delete
-DeleteAUser=Delete a user
-EnableAUser=Enable a user
-DeleteGroup=Delete
-DeleteAGroup=Delete a group
-ConfirmDisableUser=Are you sure you want to disable user <b>%s</b>?
-ConfirmDeleteUser=Are you sure you want to delete user <b>%s</b>?
-ConfirmDeleteGroup=Are you sure you want to delete group <b>%s</b>?
-ConfirmEnableUser=Are you sure you want to enable user <b>%s</b>?
-ConfirmReinitPassword=Are you sure you want to generate a new password for user <b>%s</b>?
-ConfirmSendNewPassword=Are you sure you want to generate and send new password for user <b>%s</b>?
-NewUser=New user
-CreateUser=Create user
-LoginNotDefined=Login is not defined.
-NameNotDefined=Name is not defined.
-ListOfUsers=List of users
+UserGUISetup=Foydalanuvchining displeyini sozlash
+DisableUser=O'chirish
+DisableAUser=Foydalanuvchini o'chirib qo'ying
+DeleteUser=O'chirish
+DeleteAUser=Foydalanuvchini o'chirish
+EnableAUser=Foydalanuvchini yoqish
+DeleteGroup=O'chirish
+DeleteAGroup=Guruhni o'chirish
+ConfirmDisableUser=<b> %s </b> foydalanuvchisini o'chirishni xohlaysizmi?
+ConfirmDeleteUser=<b> %s </b> foydalanuvchisini o'chirishni xohlaysizmi?
+ConfirmDeleteGroup=<b> %s </b> guruhini o'chirishni xohlaysizmi?
+ConfirmEnableUser=<b> %s </b> foydalanuvchisini yoqmoqchimisiz?
+ConfirmReinitPassword=<b> %s </b> foydalanuvchisi uchun yangi parol yaratmoqchimisiz?
+ConfirmSendNewPassword=<b> %s </b> foydalanuvchisi uchun yangi parolni yaratmoqchi va yuborishni xohlaysizmi?
+NewUser=Yangi foydalanuvchi
+CreateUser=Foydalanuvchini yarating
+LoginNotDefined=Kirish aniqlanmagan.
+NameNotDefined=Ism aniqlanmagan.
+ListOfUsers=Foydalanuvchilar ro'yxati
 SuperAdministrator=Super Administrator
 SuperAdministratorDesc=Global administrator
-AdministratorDesc=Administrator
-DefaultRights=Default Permissions
-DefaultRightsDesc=Define here the <u>default</u> permissions that are automatically granted to a <u>new</u> user (to modify permissions for existing users, go to the user card).
-DolibarrUsers=Dolibarr users
-LastName=Last name
-FirstName=First name
-ListOfGroups=List of groups
-NewGroup=New group
-CreateGroup=Create group
-RemoveFromGroup=Remove from group
-PasswordChangedAndSentTo=Password changed and sent to <b>%s</b>.
+AdministratorDesc=Ma'mur
+DefaultRights=Standart ruxsatnomalar
+DefaultRightsDesc=Bu erda avtomatik ravishda <u> yangi </u> foydalanuvchisiga beriladigan <u> standart </u> ruxsatnomalarini aniqlang (mavjud foydalanuvchilar uchun ruxsatlarni o'zgartirish uchun foydalanuvchi kartasiga o'ting).
+DolibarrUsers=Dolibarr foydalanuvchilari
+LastName=Familiya
+FirstName=Ism
+ListOfGroups=Guruhlar ro'yxati
+NewGroup=Yangi guruh
+CreateGroup=Guruh yarating
+RemoveFromGroup=Guruhdan olib tashlash
+PasswordChangedAndSentTo=Parol o'zgartirildi va <b> %s </b> raqamiga yuborildi.
 PasswordChangeRequest=Request to change password for <b>%s</b>
-PasswordChangeRequestSent=Request to change password for <b>%s</b> sent to <b>%s</b>.
+PasswordChangeRequestSent=<b> %s </b> uchun <b> %s </b> uchun parolni o'zgartirish uchun so'rov.
 IfLoginExistPasswordRequestSent=If this login is a valid account, an email to reset password has been sent.
 IfEmailExistPasswordRequestSent=If this email is a valid account, an email to reset password has been sent.
 ConfirmPasswordReset=Confirm password reset
-MenuUsersAndGroups=Users & Groups
-LastGroupsCreated=Latest %s groups created
-LastUsersCreated=Latest %s users created
-ShowGroup=Show group
-ShowUser=Show user
-NonAffectedUsers=Non assigned users
-UserModified=User modified successfully
-PhotoFile=Photo file
-ListOfUsersInGroup=List of users in this group
-ListOfGroupsForUser=List of groups for this user
-LinkToCompanyContact=Link to third party / contact
-LinkedToDolibarrMember=Link to member
-LinkedToDolibarrUser=Link to Dolibarr user
-LinkedToDolibarrThirdParty=Link to Dolibarr third party
-CreateDolibarrLogin=Create a user
-CreateDolibarrThirdParty=Create a third party
-LoginAccountDisableInDolibarr=Account disabled in Dolibarr.
-UsePersonalValue=Use personal value
-InternalUser=Internal user
-ExportDataset_user_1=Users and their properties
-DomainUser=Domain user %s
-Reactivate=Reactivate
-CreateInternalUserDesc=This form allows you to create an internal user in your company/organization. To create an external user (customer, vendor etc.  ..), use the button 'Create Dolibarr User' from that third-party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization, or is a partner user outside of your organization that may need to see more data  than data related to his company (the permission system will define what he can or can't see or do).<br>An <b>external</b> user is a customer, vendor or other that must view ONLY data related to himself (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, you must grant permissions on the features that the user need.
-PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group.
-Inherited=Inherited
+MenuUsersAndGroups=Foydalanuvchilar va guruhlar
+LastGroupsCreated=Eng so'nggi %s guruhlari yaratildi
+LastUsersCreated=Oxirgi %s foydalanuvchilari yaratildi
+ShowGroup=Guruhni ko'rsatish
+ShowUser=Foydalanuvchini ko'rsatish
+NonAffectedUsers=Belgilanmagan foydalanuvchilar
+UserModified=Foydalanuvchi muvaffaqiyatli o'zgartirildi
+PhotoFile=Fotosurat fayli
+ListOfUsersInGroup=Ushbu guruhdagi foydalanuvchilar ro'yxati
+ListOfGroupsForUser=Ushbu foydalanuvchi uchun guruhlar ro'yxati
+LinkToCompanyContact=Uchinchi tomon / kontaktga bog'lanish
+LinkedToDolibarrMember=A'zoga havola
+LinkedToDolibarrUser=Dolibarr foydalanuvchisiga havola
+LinkedToDolibarrThirdParty=Dolibarr uchinchi tomoniga havola
+CreateDolibarrLogin=Foydalanuvchini yarating
+CreateDolibarrThirdParty=Uchinchi tomonni yarating
+LoginAccountDisableInDolibarr=Dolibarr-da hisob o'chirilgan.
+UsePersonalValue=Shaxsiy qiymatdan foydalaning
+InternalUser=Ichki foydalanuvchi
+ExportDataset_user_1=Foydalanuvchilar va ularning xususiyatlari
+DomainUser=Domen foydalanuvchisi %s
+Reactivate=Qayta faollashtiring
+CreateInternalUserDesc=Ushbu shakl sizning kompaniyangiz / tashkilotingizda ichki foydalanuvchi yaratishga imkon beradi. Tashqi foydalanuvchini (mijoz, sotuvchi va boshqalarni) yaratish uchun ushbu uchinchi tomonning aloqa kartasidagi "Dolibarr foydalanuvchisini yaratish" tugmasidan foydalaning.
+InternalExternalDesc=<b> ichki </b> foydalanuvchisi - bu sizning kompaniyangiz / tashkilotingiz tarkibiga kiradigan foydalanuvchi yoki sizning kompaniyangiz bilan bog'liq ma'lumotlardan ko'ra ko'proq ma'lumotlarni ko'rishingiz kerak bo'lishi mumkin bo'lgan tashkilotingiz tashqarisidagi sherik foydalanuvchidir (ruxsat berish tizimi u nimani yoki nimani aniqlay oladi ko'rmayapman yoki qilmayman). <br> <b> tashqi </b> foydalanuvchisi faqat o'zi bilan bog'liq ma'lumotlarni ko'rishi kerak bo'lgan mijoz, sotuvchi yoki boshqa narsadir (Uchinchi tomon uchun tashqi foydalanuvchini yaratish uchinchi tomonning aloqa yozuvlaridan amalga oshirilishi mumkin). <br> <br> Ikkala holatda ham foydalanuvchi uchun zarur bo'lgan xususiyatlarga ruxsat berishingiz kerak.
+PermissionInheritedFromAGroup=Ruxsat berilgan, chunki foydalanuvchi guruhlaridan biridan meros bo'lib qolgan.
+Inherited=Meros
 UserWillBe=Created user will be
-UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party)
-UserWillBeExternalUser=Created user will be an external user (because linked to a particular third party)
-IdPhoneCaller=Id phone caller
-NewUserCreated=User %s created
-NewUserPassword=Password change for %s
+UserWillBeInternalUser=Yaratilgan foydalanuvchi ichki foydalanuvchi bo'ladi (chunki ma'lum bir uchinchi tomon bilan bog'lanmagan)
+UserWillBeExternalUser=Yaratilgan foydalanuvchi tashqi foydalanuvchi bo'ladi (chunki ma'lum bir uchinchi tomon bilan bog'langan)
+IdPhoneCaller=Telefon raqamini qidiruvchi
+NewUserCreated=%s foydalanuvchisi yaratildi
+NewUserPassword=%s uchun parolni o'zgartirish
 NewPasswordValidated=Your new password have been validated and must be used now to login.
-EventUserModified=User %s modified
-UserDisabled=User %s disabled
-UserEnabled=User %s activated
-UserDeleted=User %s removed
-NewGroupCreated=Group %s created
-GroupModified=Group %s modified
-GroupDeleted=Group %s removed
-ConfirmCreateContact=Are you sure you want to create a Dolibarr account for this contact?
-ConfirmCreateLogin=Are you sure you want to create a Dolibarr account for this member?
-ConfirmCreateThirdParty=Are you sure you want to create a third party for this member?
-LoginToCreate=Login to create
-NameToCreate=Name of third party to create
-YourRole=Your roles
-YourQuotaOfUsersIsReached=Your quota of active users is reached !
-NbOfUsers=No. of users
+EventUserModified=Foydalanuvchi %s o'zgartirilgan
+UserDisabled=Foydalanuvchi %s o'chirilgan
+UserEnabled=Foydalanuvchi %s faollashtirildi
+UserDeleted=Foydalanuvchi %s o'chirildi
+NewGroupCreated=%s guruhi yaratildi
+GroupModified=Guruh %s o'zgartirilgan
+GroupDeleted=%s guruhi olib tashlandi
+ConfirmCreateContact=Ushbu kontakt uchun Dolibarr qayd yozuvini yaratishni xohlaysizmi?
+ConfirmCreateLogin=Ushbu a'zo uchun Dolibarr qayd yozuvini yaratishni xohlaysizmi?
+ConfirmCreateThirdParty=Haqiqatan ham ushbu a'zo uchun uchinchi tomonni yaratmoqchimisiz?
+LoginToCreate=Yaratish uchun kirish
+NameToCreate=Yaratish uchun uchinchi tomon nomi
+YourRole=Sizning rollaringiz
+YourQuotaOfUsersIsReached=Faol foydalanuvchilar kvotangizga erishildi!
+NbOfUsers=Foydalanuvchilar soni
 NbOfPermissions=No. of permissions
-DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin
-HierarchicalResponsible=Supervisor
-HierarchicView=Hierarchical view
-UseTypeFieldToChange=Use field Type to change
-OpenIDURL=OpenID URL
-LoginUsingOpenID=Use OpenID to login
-WeeklyHours=Hours worked (per week)
+DontDowngradeSuperAdmin=Faqat superadmin faqat superadminni pasaytirishi mumkin
+HierarchicalResponsible=Nazoratchi
+HierarchicView=Ierarxik ko'rinish
+UseTypeFieldToChange=O'zgartirish uchun maydon turidan foydalaning
+OpenIDURL=OpenID URL manzili
+LoginUsingOpenID=Kirish uchun OpenID-dan foydalaning
+WeeklyHours=Ishlagan soatlari (haftasiga)
 ExpectedWorkedHours=Expected hours worked per week
-ColorUser=Color of the user
-DisabledInMonoUserMode=Disabled in maintenance mode
-UserAccountancyCode=User accounting code
-UserLogoff=User logout
-UserLogged=User logged
+ColorUser=Foydalanuvchining rangi
+DisabledInMonoUserMode=Xizmat ko'rsatish rejimida o'chirilgan
+UserAccountancyCode=Foydalanuvchining hisobga olish kodi
+UserLogoff=Foydalanuvchidan chiqish
+UserLogged=Foydalanuvchi tizimga kirdi
 DateOfEmployment=Employment date
-DateEmployment=Employment
+DateEmployment=Bandlik
 DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Employment End Date
 RangeOfLoginValidity=Access validity date range
diff --git a/htdocs/langs/uz_UZ/website.lang b/htdocs/langs/uz_UZ/website.lang
index 1e727415ec2..f90fe1b8122 100644
--- a/htdocs/langs/uz_UZ/website.lang
+++ b/htdocs/langs/uz_UZ/website.lang
@@ -1,15 +1,15 @@
 # Dolibarr language file - Source file is en_US - website
-Shortname=Code
-WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
-DeleteWebsite=Delete website
-ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain.
+Shortname=Kod
+WebsiteSetupDesc=Bu erda siz foydalanmoqchi bo'lgan veb-saytlarni yarating. Keyin ularni tahrirlash uchun veb-saytlar menyusiga o'ting.
+DeleteWebsite=Veb-saytni o'chirish
+ConfirmDeleteWebsite=Ushbu veb-saytni o'chirishni xohlaysizmi? Uning barcha sahifalari va tarkibi ham o'chiriladi. Yuklangan fayllar (masalan, Medlar katalogiga, ECM moduliga, ...) qoladi.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
-WEBSITE_PAGENAME=Page name/alias
+WEBSITE_PAGENAME=Sahifa nomi / taxallusi
 WEBSITE_ALIASALT=Alternative page names/aliases
 WEBSITE_ALIASALTDesc=Use here list of other name/aliases so the page can also be accessed using this other names/aliases (for example the old name after renaming the alias to keep backlink on old link/name working). Syntax is:<br>alternativename1, alternativename2, ...
-WEBSITE_CSS_URL=URL of external CSS file
-WEBSITE_CSS_INLINE=CSS file content (common to all pages)
+WEBSITE_CSS_URL=Tashqi CSS-faylning URL manzili
+WEBSITE_CSS_INLINE=CSS fayli tarkibi (barcha sahifalar uchun umumiy)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
@@ -21,27 +21,27 @@ EnterHereLicenseInformation=Enter here meta data or license information to fille
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
-MediaFiles=Media library
-EditCss=Edit website properties
-EditMenu=Edit menu
+MediaFiles=Media kutubxonasi
+EditCss=Veb-sayt xususiyatlarini tahrirlash
+EditMenu=Tartibga solish menyusi
 EditMedias=Edit medias
-EditPageMeta=Edit page/container properties
+EditPageMeta=Sahifa / konteyner xususiyatlarini tahrirlash
 EditInLine=Edit inline
 AddWebsite=Add website
-Webpage=Web page/container
-AddPage=Add page/container
+Webpage=Veb-sahifa / konteyner
+AddPage=Sahifa / konteyner qo'shing
 PageContainer=Page
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
-RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
+PreviewOfSiteNotYetAvailable=Veb-saytingizni oldindan ko'rib chiqish <strong> %s </strong> hali mavjud emas. Avval siz '<strong> </strong> veb-sayt shablonini to'liq import qilishingiz kerak' yoki shunchaki '<strong> sahifa / konteyner qo'shing </strong>'.
+RequestedPageHasNoContentYet=%s id bilan so'ralgan sahifada hali tarkib yo'q yoki .tpl.php kesh fayli o'chirildi. Buni hal qilish uchun sahifaning tarkibini tahrirlash.
 SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
-PageDeleted=Page/Contenair '%s' of website %s deleted
-PageAdded=Page/Contenair '%s' added
-ViewSiteInNewTab=View site in new tab
-ViewPageInNewTab=View page in new tab
-SetAsHomePage=Set as Home page
-RealURL=Real URL
-ViewWebsiteInProduction=View web site using home URLs
+PageDeleted=%s veb-saytining sahifasi / Contenair '%s' o'chirildi.
+PageAdded=Sahifa / Contenair '%s' qo'shildi
+ViewSiteInNewTab=Saytni yangi varaqda ko'ring
+ViewPageInNewTab=Sahifani yangi varaqda ko'rish
+SetAsHomePage=Uy sahifasi sifatida o'rnating
+RealURL=Haqiqiy URL
+ViewWebsiteInProduction=Uy manzillaridan foydalangan holda veb-saytni ko'ring
 SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server (Apache, Nginx, ...) a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong>
 ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
@@ -51,7 +51,7 @@ ReadPerm=Read
 WritePerm=Write
 TestDeployOnWeb=Test/deploy on web
 PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
+PreviewSiteServedByDolibarr= <u> %s-ni yangi varoqda oldindan ko'rib chiqing. </u> <br> <br> %s-ga Dolibarr server tomonidan xizmat ko'rsatiladi, shuning uchun qo'shimcha veb-server (Apache, Nginx, IIS kabi) o'rnatilishi shart emas. <br> Noqulay narsa shundaki, sahifalarning URL manzillari foydalanuvchilar uchun qulay emas va Dolibarr-ning yo'lidan boshlanadi. <br> URL Dolibarr tomonidan xizmat: <br> <strong> %s </strong> <br> <br>, bu veb-sayt xizmat veb-serverda bir virtual mezbon yaratish uchun o'z tashqi veb-server foydalanish uchun, bu katalog ball <br> <strong> %s </strong> <br> keyin bu virtual server nomini kiriting ushbu veb-saytning xususiyatlarida va "Internetda sinash / tarqatish" havolasini bosing.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
diff --git a/htdocs/langs/uz_UZ/withdrawals.lang b/htdocs/langs/uz_UZ/withdrawals.lang
index 059b3451c11..a87fad457ff 100644
--- a/htdocs/langs/uz_UZ/withdrawals.lang
+++ b/htdocs/langs/uz_UZ/withdrawals.lang
@@ -1,130 +1,131 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=Payments by Direct debit orders
-SuppliersStandingOrdersArea=Payments by Credit transfer
+CustomersStandingOrdersArea=To'g'ridan-to'g'ri debet buyurtmalari bo'yicha to'lovlar
+SuppliersStandingOrdersArea=Kredit o'tkazish yo'li bilan to'lovlar
 StandingOrdersPayment=Direct debit payment orders
 StandingOrderPayment=Direct debit payment order
-NewStandingOrder=New direct debit order
+NewStandingOrder=To'g'ridan-to'g'ri debet bo'yicha yangi buyurtma
 NewPaymentByBankTransfer=New payment by credit transfer
-StandingOrderToProcess=To process
+StandingOrderToProcess=Qayta ishlash uchun
 PaymentByBankTransferReceipts=Credit transfer orders
 PaymentByBankTransferLines=Credit transfer order lines
-WithdrawalsReceipts=Direct debit orders
-WithdrawalReceipt=Direct debit order
+WithdrawalsReceipts=To'g'ridan-to'g'ri debet buyurtmalari
+WithdrawalReceipt=To'g'ridan-to'g'ri debet buyurtmasi
 BankTransferReceipts=Credit transfer orders
 BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
-LastWithdrawalReceipts=Latest %s direct debit files
+LastWithdrawalReceipts=Oxirgi %s to'g'ridan-to'g'ri debet fayllari
 WithdrawalsLine=Direct debit order line
 CreditTransferLine=Credit transfer line
-WithdrawalsLines=Direct debit order lines
+WithdrawalsLines=To'g'ridan-to'g'ri debet buyurtma liniyalari
 CreditTransferLines=Credit transfer lines
-RequestStandingOrderToTreat=Requests for direct debit payment order to process
-RequestStandingOrderTreated=Requests for direct debit payment order processed
+RequestStandingOrderToTreat=To'g'ridan-to'g'ri debet to'lovlarini qayta ishlash uchun buyurtmalar
+RequestStandingOrderTreated=To'g'ridan-to'g'ri debet to'lovi bo'yicha so'rovlar ko'rib chiqildi
 RequestPaymentsByBankTransferToTreat=Requests for credit transfer to process
 RequestPaymentsByBankTransferTreated=Requests for credit transfer processed
-NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
-NbOfInvoiceToWithdraw=No. of qualified customer invoices with waiting direct debit order
-NbOfInvoiceToWithdrawWithInfo=No. of customer invoice with direct debit payment orders having defined bank account information
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Hozircha mumkin emas. Muayyan qatorlarda rad etish to'g'risida e'lon qilishdan oldin pulni qaytarib olish holati "hisobga olingan" deb belgilanishi kerak.
+NbOfInvoiceToWithdraw=To'g'ridan-to'g'ri debet buyurtmasini kutayotgan malakali mijozlarning hisob-fakturalari soni
+NbOfInvoiceToWithdrawWithInfo=Bank hisobvarag'i to'g'risidagi ma'lumotlarga ega bo'lgan to'g'ridan-to'g'ri debetli to'lov topshiriqlari bilan mijozlar hisobvarag'ining raqami
 NbOfInvoiceToPayByBankTransfer=No. of qualified supplier invoices waiting for a payment by credit transfer
 SupplierInvoiceWaitingWithdraw=Vendor invoice waiting for payment by credit transfer
-InvoiceWaitingWithdraw=Invoice waiting for direct debit
+InvoiceWaitingWithdraw=To'lov debetini kutayotgan hisob-faktura
 InvoiceWaitingPaymentByBankTransfer=Invoice waiting for credit transfer
-AmountToWithdraw=Amount to withdraw
-NoInvoiceToWithdraw=No invoice open for '%s' is waiting. Go on tab '%s' on invoice card to make a request.
+AmountToWithdraw=Chiqish uchun mablag '
+NoInvoiceToWithdraw="%s" uchun hech qanday hisob-faktura kutilmaydi. So'rov yuborish uchun faktura kartasidagi '%s' yorlig'iga o'ting.
 NoSupplierInvoiceToWithdraw=No supplier invoice with open 'Direct credit requests' is waiting. Go on tab '%s' on invoice card to make a request.
-ResponsibleUser=User Responsible
-WithdrawalsSetup=Direct debit payment setup
+ResponsibleUser=Foydalanuvchi uchun javobgar
+WithdrawalsSetup=To'g'ridan-to'g'ri debet to'lovini sozlash
 CreditTransferSetup=Credit transfer setup
-WithdrawStatistics=Direct debit payment statistics
+WithdrawStatistics=To'g'ridan-to'g'ri debet to'lovlari statistikasi
 CreditTransferStatistics=Credit transfer statistics
 Rejects=Rejects
-LastWithdrawalReceipt=Latest %s direct debit receipts
-MakeWithdrawRequest=Make a direct debit payment request
+LastWithdrawalReceipt=Oxirgi %s to'g'ridan-to'g'ri debet tushumlari
+MakeWithdrawRequest=To'g'ridan-to'g'ri debetni to'lash to'g'risida so'rov yuboring
 MakeBankTransferOrder=Make a credit transfer request
 WithdrawRequestsDone=%s direct debit payment requests recorded
 BankTransferRequestsDone=%s credit transfer requests recorded
-ThirdPartyBankCode=Third-party bank code
-NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
-ClassCredited=Classify credited
-ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
-TransData=Transmission date
-TransMetod=Transmission method
-Send=Send
-Lines=Lines
-StandingOrderReject=Issue a rejection
-WithdrawsRefused=Direct debit refused
-WithdrawalRefused=Withdrawal refused
+ThirdPartyBankCode=Uchinchi tomonning bank kodi
+NoInvoiceCouldBeWithdrawed=Hech qanday schyot-faktura muvaffaqiyatli hisobdan chiqarilmagan. Hisob-kitoblarning amaldagi IBANga ega kompaniyalarda ekanligini va IBAN-da <strong> %s </strong> rejimida UMR (noyob mandat ma'lumotnomasi) mavjudligini tekshiring.
+WithdrawalCantBeCreditedTwice=This withdrawal receipt is already marked as credited; this can't be done twice, as this would potentially create duplicate payments and bank entries.
+ClassCredited=Tasniflangan kredit
+ClassCreditedConfirm=Ushbu olib qo'yilgan kvitansiyani sizning bank hisob raqamingizga kiritilgan deb tasniflashni xohlaganingizga ishonchingiz komilmi?
+TransData=Etkazish sanasi
+TransMetod=Uzatish usuli
+Send=Yuborish
+Lines=Chiziqlar
+StandingOrderReject=Rad etish to'g'risida xabar bering
+WithdrawsRefused=To'g'ridan-to'g'ri debet rad etildi
+WithdrawalRefused=Cheklov rad etildi
 CreditTransfersRefused=Credit transfers refused
-WithdrawalRefusedConfirm=Are you sure you want to enter a withdrawal rejection for society
-RefusedData=Date of rejection
-RefusedReason=Reason for rejection
-RefusedInvoicing=Billing the rejection
-NoInvoiceRefused=Do not charge the rejection
-InvoiceRefused=Invoice refused (Charge the rejection to customer)
+WithdrawalRefusedConfirm=Jamiyat uchun pulni rad etishni xohlaganingizga aminmisiz
+RefusedData=Rad etilgan sana
+RefusedReason=Rad etish sababi
+RefusedInvoicing=Rad etish uchun hisob-kitob
+NoInvoiceRefused=Rad etishni talab qilmang
+InvoiceRefused=Hisob-faktura rad etildi (rad etish mijozga etkaziladi)
 StatusDebitCredit=Status debit/credit
-StatusWaiting=Waiting
-StatusTrans=Sent
+StatusWaiting=Kutish
+StatusTrans=Yuborildi
 StatusDebited=Debited
-StatusCredited=Credited
+StatusCredited=Kreditlangan
 StatusPaid=Paid
-StatusRefused=Refused
-StatusMotif0=Unspecified
-StatusMotif1=Insufficient funds
-StatusMotif2=Request contested
-StatusMotif3=No direct debit payment order
-StatusMotif4=Sales Order
-StatusMotif5=RIB unusable
-StatusMotif6=Account without balance
-StatusMotif7=Judicial Decision
-StatusMotif8=Other reason
+StatusRefused=Rad etildi
+StatusMotif0=Belgilanmagan
+StatusMotif1=Mablag'lar etishmayapti
+StatusMotif2=Talab bahsli
+StatusMotif3=To'g'ridan-to'g'ri debet to'lovi buyurtmasi yo'q
+StatusMotif4=Sotish tartibi
+StatusMotif5=RIB yaroqsiz
+StatusMotif6=Balanssiz hisob
+StatusMotif7=Sud qarori
+StatusMotif8=Boshqa sabab
 CreateForSepaFRST=Create direct debit file (SEPA FRST)
 CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
-CreateAll=Create direct debit file (all)
+CreateAll=To'g'ridan-to'g'ri debet faylini yaratish (barchasi)
 CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
-CreateGuichet=Only office
-CreateBanque=Only bank
-OrderWaiting=Waiting for treatment
-NotifyTransmision=Record file transmission of order
-NotifyCredit=Record credit of order
-NumeroNationalEmetter=National Transmitter Number
-WithBankUsingRIB=For bank accounts using RIB
-WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT
-BankToReceiveWithdraw=Receiving Bank Account
+CreateGuichet=Faqat ofis
+CreateBanque=Faqat bank
+OrderWaiting=Davolashni kutish
+NotifyTransmision=Buyurtmaning fayl uzatilishini yozib oling
+NotifyCredit=Buyurtmaning rekord krediti
+NumeroNationalEmetter=Milliy transmitter raqami
+WithBankUsingRIB=RIB-dan foydalangan holda bank hisobvaraqlari uchun
+WithBankUsingBANBIC=IBAN / BIC / SWIFT-dan foydalangan holda bank hisobvaraqlari uchun
+BankToReceiveWithdraw=Bank hisobvarag'ini olish
 BankToPayCreditTransfer=Bank Account used as source of payments
-CreditDate=Credit on
-WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
-ShowWithdraw=Show Direct Debit Order
-IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Payment by direct debit to generate and manage the direct debit order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+CreditDate=Kredit bo'yicha
+WithdrawalFileNotCapable=%s mamlakatingiz uchun pul olish kvitansiyasini yaratib bo'lmadi (Sizning mamlakatingiz qo'llab-quvvatlanmaydi)
+ShowWithdraw=To'g'ridan-to'g'ri debet buyurtmasini ko'rsatish
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Biroq, agar hisob-fakturada hali kamida bitta to'g'ridan-to'g'ri debet to'lovi buyurtmasi qayta ishlanmagan bo'lsa, uni oldindan olib qo'yishni boshqarish uchun to'lov sifatida o'rnatilmaydi.
+DoStandingOrdersBeforePayments=Ushbu yorliq to'g'ridan-to'g'ri debet to'lovi buyurtmasini talab qilishga imkon beradi. Amalga oshirilgandan so'ng to'g'ridan-to'g'ri debet buyurtmasini yaratish va boshqarish uchun Bank-> To'g'ridan-to'g'ri debet orqali to'lov menyusiga o'ting. To'g'ridan-to'g'ri debet buyurtmasi yopilganda, hisob-fakturalar bo'yicha to'lov avtomatik ravishda qayd etiladi va qolgan to'lovlar bekor qilingan taqdirda hisob-kitoblar yopiladi.
 DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Payment by credit transfer to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-WithdrawalFile=Debit order file
+WithdrawalFile=Debet buyurtma fayli
 CreditTransferFile=Credit transfer file
-SetToStatusSent=Set to status "File Sent"
-ThisWillAlsoAddPaymentOnInvoice=This will also record payments on invoices and will classify them as "Paid" if remain to pay is null
-StatisticsByLineStatus=Statistics by status of lines
+SetToStatusSent="Fayl yuborildi" holatiga o'rnating
+ThisWillAlsoAddPaymentOnInvoice=Bunda hisob-fakturalar bo'yicha to'lovlar qayd etiladi va agar ular to'lash muddati bekor bo'lsa, ularni "To'langan" deb tasniflanadi
+StatisticsByLineStatus=Chiziqlar holati bo'yicha statistika
 RUM=UMR
 DateRUM=Mandate signature date
-RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
-WithdrawMode=Direct debit mode (FRST or RECUR)
-WithdrawRequestAmount=Amount of Direct debit request:
+RUMLong=Noyob mandat ma'lumotnomasi
+RUMWillBeGenerated=Agar bo'sh bo'lsa, UMR (noyob mandat ma'lumotnomasi) bank hisobvarag'i ma'lumotlari saqlangandan so'ng hosil bo'ladi.
+WithdrawMode=To'g'ridan-to'g'ri debet rejimi (FRST yoki RECUR)
+WithdrawRequestAmount=To'g'ridan-to'g'ri debetga so'rov miqdori:
 BankTransferAmount=Amount of Credit Transfer request:
-WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
-SepaMandate=SEPA Direct Debit Mandate
-SepaMandateShort=SEPA Mandate
-PleaseReturnMandate=Please return this mandate form by email to %s or by mail to
-SEPALegalText=By signing this mandate form, you authorize (A) %s to send instructions to your bank to debit your account and (B) your bank to debit your account in accordance with the instructions from %s. As part of your rights, you are entitled to a refund from your bank under the terms and conditions of your agreement with your bank. A refund must be claimed within 8 weeks starting from the date on which your account was debited. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
-CreditorIdentifier=Creditor Identifier
-CreditorName=Creditor Name
-SEPAFillForm=(B) Please complete all the fields marked *
-SEPAFormYourName=Your name
-SEPAFormYourBAN=Your Bank Account Name (IBAN)
-SEPAFormYourBIC=Your Bank Identifier Code (BIC)
-SEPAFrstOrRecur=Type of payment
-ModeRECUR=Recurring payment
-ModeFRST=One-off payment
-PleaseCheckOne=Please check one only
+WithdrawRequestErrorNilAmount=Bo'sh miqdor uchun to'g'ridan-to'g'ri debet so'rovi yaratib bo'lmadi.
+SepaMandate=SEPA to'g'ridan-to'g'ri debet mandati
+SepaMandateShort=SEPA mandati
+PleaseReturnMandate=Iltimos, ushbu mandat shaklini elektron pochta orqali %s raqamiga yoki pochta orqali qaytaring
+SEPALegalText=Ushbu mandat formasini imzolash orqali siz (A) %s ga sizning hisob raqamingizni chiqarish bo'yicha ko'rsatmalarni yuborishingizga va (B) %s ko'rsatmalariga binoan sizning bankingiz hisobingizni o'chirish uchun ko'rsatmalar yuborishingizga ruxsat berasiz. O'z huquqlaringizning bir qismi sifatida siz o'zingizning bankingiz bilan tuzgan shartnomangiz shartlari va shartlariga binoan bankingizdan pulni qaytarib olishga haqlisiz. Hisobingizdan chiqarilgan kundan boshlab 8 hafta ichida pulni qaytarib berishni talab qilish kerak. Yuqoridagi mandat bo'yicha sizning huquqlaringiz, sizning bankingizdan olishingiz mumkin bo'lgan bayonotda bayon etilgan.
+CreditorIdentifier=Kreditor identifikatori
+CreditorName=Kreditor nomi
+SEPAFillForm=(B) * belgilangan barcha maydonlarni to'ldiring.
+SEPAFormYourName=Ismingiz
+SEPAFormYourBAN=Sizning bank hisob raqamingiz (IBAN)
+SEPAFormYourBIC=Sizning bank identifikatoringiz kodi (BIC)
+SEPAFrstOrRecur=To'lov turi
+ModeRECUR=Takroriy to'lov
+ModeFRST=Bir martalik to'lov
+PleaseCheckOne=Iltimos, bittasini tekshiring
 CreditTransferOrderCreated=Credit transfer order %s created
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
@@ -139,14 +140,14 @@ USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
 NoDefaultIBANFound=No default IBAN found for this third party
 ### Notifications
-InfoCreditSubject=Payment of direct debit payment order %s by the bank
-InfoCreditMessage=The direct debit payment order %s has been paid by the bank<br>Data of payment: %s
-InfoTransSubject=Transmission of direct debit payment order %s to bank
-InfoTransMessage=The direct debit payment order %s has been sent to bank by %s %s.<br><br>
-InfoTransData=Amount: %s<br>Method: %s<br>Date: %s
-InfoRejectSubject=Direct debit payment order refused
+InfoCreditSubject=%s to'g'ridan-to'g'ri debet to'lov topshirig'ini bank tomonidan to'lash
+InfoCreditMessage=%s to'g'ridan-to'g'ri debet to'lov topshirig'ini bank tomonidan to'langan <br> To'lov ma'lumotlari: %s
+InfoTransSubject=%s to'g'ridan-to'g'ri debet to'lov topshirig'ini bankka yuborish
+InfoTransMessage=%s to'g'ridan-to'g'ri debet to'lov buyurtmasi %s %s tomonidan bankka yuborildi. <br> <br>
+InfoTransData=Miqdor: %s <br> usuli: %s <br> Sana: %s
+InfoRejectSubject=To'g'ridan-to'g'ri debet to'lovi buyurtmasi rad etildi
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
-ModeWarning=Option for real mode was not set, we stop after this simulation
+ModeWarning=Haqiqiy rejim uchun parametr o'rnatilmagan, biz ushbu simulyatsiyadan so'ng to'xtaymiz
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
 ErrorICSmissing=Missing ICS in Bank account %s
 TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Total amount of direct debit order differs from sum of lines
diff --git a/htdocs/langs/uz_UZ/workflow.lang b/htdocs/langs/uz_UZ/workflow.lang
index 494a0424a75..976d0e62426 100644
--- a/htdocs/langs/uz_UZ/workflow.lang
+++ b/htdocs/langs/uz_UZ/workflow.lang
@@ -1,25 +1,25 @@
 # Dolibarr language file - Source file is en_US - workflow
-WorkflowSetup=Workflow module setup
-WorkflowDesc=This module provides some automatic actions. By default, the workflow is open (you can do things in the order you want) but here you can activate some automatic actions.
-ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
+WorkflowSetup=Ish oqimi modulini sozlash
+WorkflowDesc=Ushbu modul ba'zi bir avtomatik harakatlarni ta'minlaydi. Odatiy bo'lib, ish oqimi ochiq (siz o'zingiz xohlagan tartibda ish qilishingiz mumkin), lekin bu erda siz ba'zi avtomatik harakatlarni faollashtirishingiz mumkin.
+ThereIsNoWorkflowToModify=Faollashtirilgan modullar bilan ishlash jarayonini o'zgartirishlar mavjud emas.
 # Autocreate
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a sales order after a commercial proposal is signed (the new order will have same amount as the proposal)
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (the new invoice will have same amount as the proposal)
-descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Automatically create a customer invoice after a contract is validated
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a sales order is closed (the new invoice will have same amount as the order)
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Tijorat taklifi imzolanganidan so'ng avtomatik ravishda savdo buyurtmasini yarating (yangi buyurtma taklif bilan bir xil miqdorda bo'ladi)
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Tijorat taklifi imzolangandan so'ng mijozning hisob-fakturasini avtomatik ravishda yarating (yangi hisob-faktura taklif bilan bir xil miqdorda bo'ladi)
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Shartnoma tasdiqlangandan so'ng mijozning hisob-fakturasini avtomatik ravishda yarating
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Savdo buyurtmasi yopilgandan so'ng avtomatik ravishda mijozning hisob-fakturasini yarating (yangi hisob-faktura buyurtma bilan bir xil miqdorda bo'ladi)
 # Autoclassify customer proposal or order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposal)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposal)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked order)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales order as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Savdo buyurtmasi billingga o'rnatilganda (va agar buyurtma miqdori imzolangan bog'langan taklifning umumiy miqdori bilan bir xil bo'lsa) bog'langan manba taklifini hisob-kitob sifatida tasniflang.
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Mijozlarning hisob-fakturasi tasdiqlanganda (va agar schyot-faktura miqdori imzolangan bog'langan taklifning umumiy miqdori bilan bir xil bo'lsa) bog'langan manba taklifini hisob-kitob sifatida tasniflang.
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Mijozlarning hisob-fakturasi tasdiqlanganda (va agar schyot-faktura miqdori bog'langan buyurtmaning umumiy miqdori bilan bir xil bo'lsa) bog'langan manbalarni sotish buyurtmasini billing sifatida tasniflang.
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Mijozlarning hisob-fakturasi to'lash uchun o'rnatilganda (va agar schyot-faktura miqdori bog'langan buyurtmaning umumiy miqdori bilan bir xil bo'lsa) bog'langan manbalarni sotish buyurtmasini billing sifatida tasniflang.
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Bog'langan manbalarni sotish buyurtmasini jo'natma tasdiqlanganda jo'natilgan deb tasniflang (va agar barcha jo'natmalar tomonidan jo'natilgan miqdor yangilanish uchun buyurtma bilan bir xil bo'lsa)
 # Autoclassify purchase order
 descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked proposal)
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
 descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
 # Autoclose intervention
 descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
-AutomaticCreation=Automatic creation
-AutomaticClassification=Automatic classification
+AutomaticCreation=Avtomatik yaratish
+AutomaticClassification=Avtomatik tasnif
 # Autoclassify shipment
 descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when customer invoice is validated
diff --git a/htdocs/langs/vi_VN/accountancy.lang b/htdocs/langs/vi_VN/accountancy.lang
index 6b1f50bfdb1..51ede68ef22 100644
--- a/htdocs/langs/vi_VN/accountancy.lang
+++ b/htdocs/langs/vi_VN/accountancy.lang
@@ -158,7 +158,7 @@ ACCOUNTING_LENGTH_AACCOUNT=Độ dài của tài khoản kế toán bên thứ b
 ACCOUNTING_MANAGE_ZERO=Cho phép quản lý các số không khác nhau ở cuối tài khoản kế toán. Nó cần thiết cho một số nước (như Thụy Sĩ). Nếu được đặt thành tắt (mặc định), bạn có thể đặt hai tham số sau để yêu cầu ứng dụng thêm số không ảo.
 BANK_DISABLE_DIRECT_INPUT=Vô hiệu hóa ghi trực tiếp giao dịch trong tài khoản ngân hàng
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Cho phép xuất dữ liệu bản nháp trong nhật ký
-ACCOUNTANCY_COMBO_FOR_AUX=Bật danh sách kết hợp cho tài khoản công ty con (có thể chậm nếu bạn có nhiều bên thứ ba)
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties, break ability to search on a part of value)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
@@ -328,6 +328,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountanc
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
+NotifiedExportDate=Notified export date (modification of the entries will not be possible)
+NotifiedValidationDate=Validation of the entries (modification or deletion of the entries will not be possible)
+ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=Xuất dữ liệu bản nháp nhật ký
 Modelcsv=Mô hình xuất dữ liệu
 Selectmodelcsv=Chọn một mô hình xuất dữ liệu
diff --git a/htdocs/langs/vi_VN/admin.lang b/htdocs/langs/vi_VN/admin.lang
index fa276b338cb..1472187c65c 100644
--- a/htdocs/langs/vi_VN/admin.lang
+++ b/htdocs/langs/vi_VN/admin.lang
@@ -221,8 +221,8 @@ NotCompatible=Mô-đun này dường như không tương thích với Dolibarr %
 CompatibleAfterUpdate=Mô-đun này yêu cầu cập nhật lên Dolibarr %s của bạn (Min %s - Max %s).
 SeeInMarkerPlace=Xem ở chợ
 SeeSetupOfModule=Xem thiết lập mô-đun %s
+SetOptionTo=Set option <b>%s</b> to %s
 Updated=Đã cập nhật
-Nouveauté=Mới lạ
 AchatTelechargement=Mua / Tải xuống
 GoModuleSetupArea=Để triển khai / cài đặt một mô-đun mới, hãy chuyển đến khu vực thiết lập Mô-đun: <a href="%s">%s</a> .
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
@@ -399,6 +399,7 @@ SecurityToken=Key to secure URLs
 NoSmsEngine=Không có trình quản lý gửi SMS có sẵn. Trình quản lý gửi SMS không được cài đặt với phân phối mặc định vì chúng phụ thuộc vào nhà cung cấp bên ngoài, nhưng bạn có thể tìm thấy một số trên %s
 PDF=PDF
 PDFDesc=Global options for PDF generation
+PDFOtherDesc=PDF Option specific to some modules
 PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Ẩn tất cả thông tin liên quan đến Thuế bán hàng / VAT
 PDFRulesForSalesTax=Quy tắc thuế bán hàng / VAT
@@ -561,7 +562,7 @@ Module53Desc=Quản lý dịch vụ
 Module54Name=Hợp đồng/Thuê bao
 Module54Desc=Quản lý hợp đồng (dịch vụ hoặc đăng ký định kỳ)
 Module55Name=Mã vạch
-Module55Desc=Quản lý mã vạch
+Module55Desc=Barcode or QR code management
 Module56Name=Payment by credit transfer
 Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
 Module57Name=Payments by Direct Debit
@@ -848,10 +849,10 @@ Permission402=Tạo/chỉnh sửa giảm giá
 Permission403=Xác nhận giảm giá
 Permission404=Xóa giảm giá
 Permission430=Sử dụng thanh gỡ lỗi
-Permission511=Read payments of salaries (yours and subordinates)
-Permission512=Tạo / sửa đổi các khoản thanh toán tiền lương
-Permission514=Xóa các khoản thanh toán tiền lương
-Permission517=Read payments of salaries of everybody
+Permission511=Read salaries and payments (yours and subordinates)
+Permission512=Create/modify salaries and payments
+Permission514=Delete salaries and payments
+Permission517=Read salaries and payments everybody
 Permission519=Xuất dữ liệu lương
 Permission520=Xem cho vay
 Permission522=Tạo/Chỉnh sửa cho vay
@@ -965,6 +966,8 @@ Permission23003=Xóa công việc theo lịch trình
 Permission23004=Thực thi công việc theo lịch trình
 Permission50101=Use Point of Sale (SimplePOS)
 Permission50151=Use Point of Sale (TakePOS)
+Permission50152=Edit sales lines
+Permission50153=Edit ordered sales lines
 Permission50201=Xem giao dịch
 Permission50202=Giao dịch nhập dữ liệu
 Permission50330=Read objects of Zapier
@@ -1039,11 +1042,12 @@ DictionaryMeasuringUnits=Đơn vị đo lường
 DictionarySocialNetworks=Mạng xã hội
 DictionaryProspectStatus=Prospect status for companies
 DictionaryProspectContactStatus=Prospect status for contacts
-DictionaryHolidayTypes=Các loại nghỉ phép
+DictionaryHolidayTypes=Leave - Types of leave
 DictionaryOpportunityStatus=Trạng thái khách hàng tiềm năng cho dự án/ khách hàng tiềm năng
 DictionaryExpenseTaxCat=Báo cáo chi phí - Danh mục vận tải
 DictionaryExpenseTaxRange=Báo cáo chi phí - Phạm vi theo danh mục vận chuyển
 DictionaryTransportMode=Intracomm report - Transport mode
+DictionaryBatchStatus=Product lot/serial Quality Control status
 TypeOfUnit=Type of unit
 SetupSaved=Cài đặt đã lưu
 SetupNotSaved=Thiết lập không được lưu
@@ -1187,7 +1191,7 @@ SetupDescription4=<a href="%s">%s -> %s</a> <br> Phần mềm này là một b
 SetupDescription5=Các menu thiết lập khác quản lý các tham số tùy chọn.
 AuditedSecurityEvents=Security events that are audited
 NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
-Audit=Kiểm toán
+Audit=Security events
 InfoDolibarr=Thông tin về Dolibarr
 InfoBrowser=Thông tin trình duyệt
 InfoOS=Thông tin về hệ điều hành
@@ -1319,9 +1323,12 @@ ConditionIsCurrently=Điều kiện là hiện tại %s
 YouUseBestDriver=Bạn sử dụng trình điều khiển %s, trình điều khiển tốt nhất hiện có.
 YouDoNotUseBestDriver=Bạn sử dụng trình điều khiển %s nhưng trình điều khiển %s được khuyến nghị.
 NbOfObjectIsLowerThanNoPb=Bạn chỉ có %s %s trong cơ sở dữ liệu. Điều này không yêu cầu bất kỳ tối ưu hóa cụ thể.
+ComboListOptim=Combo list loading optimization
 SearchOptim=Tối ưu hóa tìm kiếm
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
-YouHaveXObjectAndSearchOptimOn=Bạn có %s %s trong cơ sở dữ liệu và hằng số %s được đặt thành 1 trong Nhà - Cài đặt - Khác.
+YouHaveXObjectUseComboOptim=You have %s %s in the database. You can go into setup of module to enable loading of combo list on key pressed event.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other.
+YouHaveXObjectUseSearchOptimDesc=This limits the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to %s in Home-Setup-Other.
 BrowserIsOK=Bạn đang sử dụng trình duyệt web %s. Trình duyệt này là ổn cho bảo mật và hiệu suất.
 BrowserIsKO=Bạn đang sử dụng trình duyệt web %s. Trình duyệt này được biết đến là một lựa chọn xấu cho bảo mật, hiệu suất và độ tin cậy. Chúng tôi khuyên bạn nên sử dụng Firefox, Chrome, Opera hoặc Safari.
 PHPModuleLoaded=Thành phần PHP %s được tải
@@ -1433,6 +1440,7 @@ MemberMainOptions=Lựa chọn chính
 AdherentLoginRequired= Quản lý một Đăng nhập cho mỗi thành viên
 AdherentMailRequired=Yêu cầu email để tạo thành viên mới
 MemberSendInformationByMailByDefault=Hộp kiểm để gửi thư xác nhận cho các thành viên (xác nhận hoặc đăng ký mới) là theo mặc định
+MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
 VisitorCanChooseItsPaymentMode=Khách truy cập có thể chọn từ các chế độ thanh toán có sẵn
 MEMBER_REMINDER_EMAIL=Cho phép nhắc nhở tự động <b>qua email</b> của các thuê bao đã hết hạn. Lưu ý: Mô-đun <strong>%s</strong> phải được bật và thiết lập chính xác để gửi lời nhắc.
 MembersDocModules=Document templates for documents generated from member record
@@ -1763,7 +1771,7 @@ AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting men
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Bật thông báo âm thanh
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
-AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the scheduled job %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Hiển thị đối tượng được liên kết vào chế độ xem chương trình nghị sự
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
@@ -1979,6 +1987,8 @@ MAIN_PDF_MARGIN_RIGHT=Lề phải trên PDF
 MAIN_PDF_MARGIN_TOP=Lề trên PDF
 MAIN_PDF_MARGIN_BOTTOM=Lề dưới PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add picture on proposal line
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add electronic sign in PDF
 NothingToSetup=Không có thiết lập cụ thể cần thiết cho mô-đun này.
 SetToYesIfGroupIsComputationOfOtherGroups=Đặt cái này thành Có nếu nhóm này là sự tính toán của các nhóm khác
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
@@ -2096,7 +2106,6 @@ PDF_SHOW_PROJECT=Show project on document
 ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=Nếu bạn muốn có text trong PDF của mình bằng 2 ngôn ngữ khác nhau trong cùng một tệp PDF được tạo, bạn phải đặt ở đây ngôn ngữ thứ hai này để PDF được tạo sẽ chứa 2 ngôn ngữ khác nhau trong cùng một trang, một ngôn ngữ được chọn khi tạo PDF và ngôn ngữ này ( chỉ có vài mẫu PDF hỗ trợ này). Giữ trống cho 1 ngôn ngữ trên mỗi PDF.
 FafaIconSocialNetworksDesc=Nhập vào đây mã của biểu tượng FontAwgie. Nếu bạn không biết FontAwgie là gì, bạn có thể sử dụng  fa-address-book
-FeatureNotAvailableWithReceptionModule=Tính năng không khả dụng khi mô-đun Tiếp nhận được bật
 RssNote=Lưu ý: Mỗi nguồn cấp RSS cung cấp một tiện ích mà bạn phải kích hoạt để có sẵn trong bảng điều khiển
 JumpToBoxes=Chuyển tới  Thiết lập --> Widgets
 MeasuringUnitTypeDesc=Sử dụng ở đây một giá trị như "kích thước", "diện tích", "khối lượng", "trọng lượng", "thời gian"
@@ -2120,12 +2129,18 @@ ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by
 MailToSendEventOrganization=Event Organization
 AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
 YouShouldDisablePHPFunctions=You should disable PHP functions
-IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands in custom code, you shoud disable PHP functions
+PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
+NotRecommended=Not recommanded
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
 ModuleUpdateAvailable=An update is available
 NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
+RandomlySelectedIfSeveral=Randomly selected if several pictures are available
+DatabasePasswordObfuscated=Database password is obfuscated in conf file
+DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
diff --git a/htdocs/langs/vi_VN/agenda.lang b/htdocs/langs/vi_VN/agenda.lang
index c8e17edbe45..6f00d67b0a4 100644
--- a/htdocs/langs/vi_VN/agenda.lang
+++ b/htdocs/langs/vi_VN/agenda.lang
@@ -4,7 +4,7 @@ Actions=Sự kiện
 Agenda=Lịch làm việc
 TMenuAgenda=Chương trình nghị sự
 Agendas=Lịch làm việc
-LocalAgenda=Lịch nội bộ
+LocalAgenda=Default calendar
 ActionsOwnedBy=Tổ chức sự kiện thuộc sở hữu của
 ActionsOwnedByShort=Chủ sở hữu
 AffectedTo=Giao cho
@@ -14,13 +14,13 @@ EventsNb=Số sự kiện
 ListOfActions=Danh sách các sự kiện
 EventReports=Báo cáo sự kiện
 Location=Địa phương
-ToUserOfGroup=Event assigned to any user in group
+ToUserOfGroup=Event assigned to any user in the group
 EventOnFullDay=Tất cả sự kiện
 MenuToDoActions=Tất cả sự kiện chưa xong
 MenuDoneActions=Tất cả sự kiện đã chấm dứt
 MenuToDoMyActions=Sự kiện chưa xong của tôi
 MenuDoneMyActions=Sự kiện đã chấm dứt của tôi
-ListOfEvents=Danh sách sự kiện (lịch nội bộ)
+ListOfEvents=List of events (default calendar)
 ActionsAskedBy=Sự kiện báo cáo bởi
 ActionsToDoBy=Sự kiện được giao
 ActionsDoneBy=Sự kiện được thực hiện bởi
@@ -38,6 +38,7 @@ ActionsEvents=Sự kiện mà Dolibarr sẽ tạo ra một hành động trong c
 EventRemindersByEmailNotEnabled=Lời nhắc sự kiện qua email không được bật vào thiết lập mô-đun %s.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Đã tạo bên thứ ba %s
+COMPANY_MODIFYInDolibarr=Third party %s modified
 COMPANY_DELETEInDolibarr=Đã xóa bên thứ ba %s
 ContractValidatedInDolibarr=Hợp đồng %s được xác thực
 CONTRACT_DELETEInDolibarr=Hợp đồng %s đã bị xóa
@@ -87,6 +88,7 @@ OrderDeleted=Đã xóa đơn hàng
 InvoiceDeleted=Hóa đơn đã bị xóa
 DraftInvoiceDeleted=Hoá đơn dự thảo đã được xoá
 CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_MODIFYInDolibarr=Contact %s modified
 CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Sản phẩm %s được tạo
 PRODUCT_MODIFYInDolibarr=Sản phẩm %s được sửa đổi
@@ -119,6 +121,7 @@ MRP_MO_UNVALIDATEInDolibarr=MO set to draft status
 MRP_MO_PRODUCEDInDolibarr=MO đã tạo
 MRP_MO_DELETEInDolibarr=MO đã xóa
 MRP_MO_CANCELInDolibarr=MO canceled
+PAIDInDolibarr=%s paid
 ##### End agenda events #####
 AgendaModelModule=Mẫu tài liệu cho sự kiện
 DateActionStart=Ngày bắt đầu
@@ -130,7 +133,7 @@ AgendaUrlOptions4=<b>logint = %s</b> để hạn chế đầu ra cho các hành
 AgendaUrlOptionsProject=<b>project = __PROJECT_ID__</b> để hạn chế đầu ra cho các hành động được liên kết với dự án <b>__PROJECT_ID__</b>.
 AgendaUrlOptionsNotAutoEvent=<b>notactiontype = systemauto</b> để loại trừ các sự kiện tự động.
 AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> bào gồm các ngày nghỉ sự kiện
-AgendaShowBirthdayEvents=Hiển thị ngày sinh của các liên lạc
+AgendaShowBirthdayEvents=Birthdays of contacts
 AgendaHideBirthdayEvents=Ẩn ngày sinh của các liên lạc
 Busy=Bận
 ExportDataset_event1=Danh sách các sự kiện chương trình nghị sự
@@ -152,6 +155,7 @@ ActionType=Loại sự kiện
 DateActionBegin=Ngày bắt đầu sự kiện
 ConfirmCloneEvent=Bạn có chắc chắn muốn sao chép sự kiện <b>%s</b> ?
 RepeatEvent=Lặp lại sự kiện
+OnceOnly=Once only
 EveryWeek=Mỗi tuần
 EveryMonth=Mỗi tháng
 DayOfMonth=Ngày trong tháng
@@ -165,4 +169,4 @@ TimeType=Duration type
 ReminderType=Callback type
 AddReminder=Create an automatic reminder notification for this event
 ErrorReminderActionCommCreation=Error creating the reminder notification for this event
-BrowserPush=Browser Notification
+BrowserPush=Browser Popup Notification
diff --git a/htdocs/langs/vi_VN/bills.lang b/htdocs/langs/vi_VN/bills.lang
index 1797521d9b3..22b8ae978e6 100644
--- a/htdocs/langs/vi_VN/bills.lang
+++ b/htdocs/langs/vi_VN/bills.lang
@@ -259,6 +259,7 @@ DateMaxPayment=Thanh toán vào ngày
 DateInvoice=Ngày hóa đơn
 DatePointOfTax=Điểm thuế
 NoInvoice=Không có hoá đơn
+NoOpenInvoice=No open invoice
 ClassifyBill=Phân loại hóa đơn
 SupplierBillsToPay=Hóa đơn nhà cung cấp chưa thanh toán
 CustomerBillsUnpaid=Hóa đơn khách hàng chưa thanh toán
@@ -589,3 +590,4 @@ FacParentLine=Invoice Line Parent
 SituationTotalRayToRest=Remainder to pay without taxe
 PDFSituationTitle=Situation n° %d
 SituationTotalProgress=Total progress %d %%
+SearchUnpaidInvoicesWithDueDate=Search unpaid invoices with a due date = %s
diff --git a/htdocs/langs/vi_VN/cashdesk.lang b/htdocs/langs/vi_VN/cashdesk.lang
index 7197ca2dbce..ebe9f02e17d 100644
--- a/htdocs/langs/vi_VN/cashdesk.lang
+++ b/htdocs/langs/vi_VN/cashdesk.lang
@@ -102,7 +102,7 @@ CashDeskGenericMaskCodes6 = <br><b>{TN}</b>được sử dụng để thêm số
 TakeposGroupSameProduct=Nhóm sản phẩm cùng dòng
 StartAParallelSale=Bắt đầu bán hàng mới
 SaleStartedAt=Sale started at %s
-ControlCashOpening=Control cash popup at opening POS
+ControlCashOpening=Open the "Control cash" popup when opening the POS
 CloseCashFence=Close cash desk control
 CashReport=Báo cáo tiền mặt
 MainPrinterToUse=Máy in chính để dùng
@@ -126,5 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
-ShowPriceHT = Display the price excluding tax column
-ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
+ShowPriceHT = Display the column with the price excluding tax (on screen)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
diff --git a/htdocs/langs/vi_VN/compta.lang b/htdocs/langs/vi_VN/compta.lang
index e55aee4b875..ee7a289c62e 100644
--- a/htdocs/langs/vi_VN/compta.lang
+++ b/htdocs/langs/vi_VN/compta.lang
@@ -286,3 +286,9 @@ ReportPurchaseTurnover=Doanh số hàng mua đã ra hoá đơn
 ReportPurchaseTurnoverCollected=Doanh số hàng mua đã tập hợp
 IncludeVarpaysInResults = Include various payments in reports
 IncludeLoansInResults = Include loans in reports
+InvoiceLate30Days = Invoices late > 30 days
+InvoiceLate15Days = Invoices late > 15 days
+InvoiceLateMinus15Days = Invoices late
+InvoiceNotLate = To be collected < 15 days
+InvoiceNotLate15Days = To be collected in 15 days
+InvoiceNotLate30Days = To be collected in 30 days
diff --git a/htdocs/langs/vi_VN/cron.lang b/htdocs/langs/vi_VN/cron.lang
index 3ea052d3289..401b1d5e1f7 100644
--- a/htdocs/langs/vi_VN/cron.lang
+++ b/htdocs/langs/vi_VN/cron.lang
@@ -60,7 +60,7 @@ CronErrEndDateStartDt=Ngày kết thúc không thể trước ngày bắt đầu
 StatusAtInstall=Trạng thái khi cài đặt mô-đun
 CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Vô hiệu hoá
-CronTaskInactive=Công việc này bị vô hiệu hóa
+CronTaskInactive=This job is disabled (not scheduled)
 CronId=Id
 CronClassFile=Tên tệp với lớp
 CronModuleHelp=Tên của thư mục mô-đun Dolibarr (cũng hoạt động với mô-đun Dolibarr bên ngoài). <BR> Ví dụ: để gọi phương thức tìm nạp của đối tượng sản phẩm Dolibarr/htdocs/<u>product</u>/class/products.class.php, giá trị cho mô-đun là <br> <i>product</i>
diff --git a/htdocs/langs/vi_VN/errors.lang b/htdocs/langs/vi_VN/errors.lang
index eec57671b9e..6b10871a692 100644
--- a/htdocs/langs/vi_VN/errors.lang
+++ b/htdocs/langs/vi_VN/errors.lang
@@ -11,6 +11,7 @@ ErrorBadValueForParamNotAString=Giá trị xấu cho tham số của bạn. Nói
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Đăng nhập% s đã tồn tại.
 ErrorGroupAlreadyExists=Nhóm% s đã tồn tại.
+ErrorEmailAlreadyExists=Email %s already exists.
 ErrorRecordNotFound=Ghi lại không tìm thấy.
 ErrorFailToCopyFile=Không thể sao chép tập tin <b>'% s'</b> vào <b>'% s'.</b>
 ErrorFailToCopyDir=Không thể sao chép thư mục ' <b>%s</b> ' vào ' <b>%s</b> '.
@@ -117,7 +118,7 @@ ErrorCantReadFile=Không thể đọc tập tin '% s'
 ErrorCantReadDir=Không thể đọc thư mục '% s'
 ErrorBadLoginPassword=Bad giá trị để đăng nhập hoặc mật khẩu
 ErrorLoginDisabled=Tài khoản của bạn đã bị vô hiệu
-ErrorFailedToRunExternalCommand=Không thể chạy lệnh bên ngoài. Kiểm tra xem nó có sẵn và Runnable bởi máy chủ PHP của bạn. Nếu PHP <b>Safe Mode</b> được kích hoạt, kiểm tra lệnh đó là bên trong một thư mục được xác định bởi tham số <b>safe_mode_exec_dir.</b>
+ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server user. Check also the command is not protected on shell level by a security layer like apparmor.
 ErrorFailedToChangePassword=Không thể thay đổi mật khẩu
 ErrorLoginDoesNotExists=Người sử dụng có đăng <b>nhập% s</b> không thể được tìm thấy.
 ErrorLoginHasNoEmail=Thành viên này không có địa chỉ email. Quá trình hủy bỏ.
@@ -262,6 +263,7 @@ ErrorDateIsInFuture=Error, the date can't be in the future
 ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
 ErrorAPercentIsRequired=Error, please fill in the percentage correctly
 ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
+ErrorFailedToFindEmailTemplate=Failed to find template with code name %s
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Tham số PHP của bạn upload_max_filesize (%s) cao hơn tham số PHP post_max_size (%s). Đây không phải là một thiết lập phù hợp.
@@ -298,3 +300,4 @@ WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So y
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
+ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
diff --git a/htdocs/langs/vi_VN/eventorganization.lang b/htdocs/langs/vi_VN/eventorganization.lang
index 13b14f0c1e5..2732b9eda3b 100644
--- a/htdocs/langs/vi_VN/eventorganization.lang
+++ b/htdocs/langs/vi_VN/eventorganization.lang
@@ -1,4 +1,5 @@
 # Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+# Copyright (C) 2021		Dorian Vabre			<dorian.vabre@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
@@ -81,7 +82,10 @@ PriceOfBoothHelp=Subscription price to stand a booth
 EventOrganizationICSLink=Link ICS for events
 ConferenceOrBoothInformation=Conference Or Booth informations
 Attendees = Attendees
+DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
 #
 # Status
 #
@@ -94,8 +98,46 @@ EvntOrgCancelled = Cancelled
 #
 # Public page
 #
+SuggestForm = Suggestion page
+RegisterPage = Page for conferences or booth
+EvntOrgRegistrationHelpMessage = Here, you can vote for an event, or suggest a new conference or booth for the project
+EvntOrgRegistrationConfHelpMessage = Here, you can suggest a new conference for the project
+EvntOrgRegistrationBoothHelpMessage = Here, you can suggest a new booth for the project
+ListOfSuggestedConferences = List of suggested conferences
+ListOfSuggestedBooths = List of suggested booths
+SuggestConference = Suggest a new conference
+SuggestBooth = Suggest a booth
+ViewAndVote = View and vote for suggested events
 PublicAttendeeSubscriptionPage = Public link of registration to a conference
 MissingOrBadSecureKey = The security key is invalid or missing
-EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
-EvntOrgStartDuration = This conference starts on
-EvntOrgEndDuration =  and ends on
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference : '%s'
+EvntOrgDuration = This conference starts on %s and ends on %s.
+ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
+BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
+EventType = Loại sự kiện
+
+#
+# Vote page
+#
+EvntOrgRegistrationWelcomeMessage = Welcome on the conference or booth suggestion page.
+EvntOrgRegistrationConfWelcomeMessage = Welcome on the conference suggestion page.
+EvntOrgRegistrationBoothWelcomeMessage = Welcome on the booth suggestion page.
+EvntOrgVoteHelpMessage = Here, you can view and vote for the suggested events for the project
+VoteOk = Your vote has been accepted.
+AlreadyVoted = You have already voted for this event.
+VoteError = An error has occurred during the vote, please try again.
+
+#
+# SubscriptionOk page
+#
+SubscriptionOk = Your subscription to this conference has been validated
+#
+# Subscription validation mail
+#
+ConfAttendeeSubscriptionConfirmation = Confirmation of your subscription to a conference
+#
+# Payment page
+#
+Attendee = Attendee
+PaymentConferenceAttendee = Conference attendee payment
+PaymentBoothLocation = Booth location payment
diff --git a/htdocs/langs/vi_VN/hrm.lang b/htdocs/langs/vi_VN/hrm.lang
index cbac0b87e6e..6ea66b614d0 100644
--- a/htdocs/langs/vi_VN/hrm.lang
+++ b/htdocs/langs/vi_VN/hrm.lang
@@ -9,7 +9,7 @@ ConfirmDeleteEstablishment=Bạn có chắc chắn muốn xóa cơ sở này?
 OpenEtablishment=Mở cơ sở
 CloseEtablishment=Đóng cơ sở
 # Dictionary
-DictionaryPublicHolidays=HRM - Ngày lễ
+DictionaryPublicHolidays=Leave - Public holidays
 DictionaryDepartment=HRM - Danh sách phòng/ban
 DictionaryFunction=HRM - Job positions
 # Module
diff --git a/htdocs/langs/vi_VN/knowledgemanagement.lang b/htdocs/langs/vi_VN/knowledgemanagement.lang
index 0de9c4ff2c6..c6893b41233 100644
--- a/htdocs/langs/vi_VN/knowledgemanagement.lang
+++ b/htdocs/langs/vi_VN/knowledgemanagement.lang
@@ -47,7 +47,7 @@ KnowledgeManagementArea = Knowledge Management
 # Menu
 #
 MenuKnowledgeRecord = Knowledge base
-ListOfArticles = List of articles
+ListKnowledgeRecord = List of articles
 NewKnowledgeRecord = New article
 ValidateReply = Validate solution
 KnowledgeRecords = Articles
diff --git a/htdocs/langs/vi_VN/languages.lang b/htdocs/langs/vi_VN/languages.lang
index c9dd762ef9f..f1299789e8e 100644
--- a/htdocs/langs/vi_VN/languages.lang
+++ b/htdocs/langs/vi_VN/languages.lang
@@ -3,6 +3,7 @@ Language_am_ET=Ethiopian
 Language_ar_AR=Ả Rập
 Language_ar_EG=Ả Rập (Ai Cập)
 Language_ar_SA=Ả Rập
+Language_ar_TN=Arabic (Tunisia)
 Language_az_AZ=Azerbaijani
 Language_bn_BD=Tiếng Bengal
 Language_bn_IN=Bengali (India)
@@ -84,6 +85,7 @@ Language_nl_NL=Hà Lan
 Language_pl_PL=Ba Lan
 Language_pt_BR=Bồ Đào Nha (Brazil)
 Language_pt_PT=Bồ Đào Nha
+Language_ro_MD=Romanian (Moldavia)
 Language_ro_RO=Rumani
 Language_ru_RU=Nga
 Language_ru_UA=Nga (Ukraine)
diff --git a/htdocs/langs/vi_VN/main.lang b/htdocs/langs/vi_VN/main.lang
index d6b2960b446..e59f3484fde 100644
--- a/htdocs/langs/vi_VN/main.lang
+++ b/htdocs/langs/vi_VN/main.lang
@@ -430,6 +430,7 @@ LT1IN=CGST
 LT2IN=SGST
 LT1GC=Xu bổ sung
 VATRate=Thuế suất
+RateOfTaxN=Rate of tax %s
 VATCode=Mã thuế suất
 VATNPR=Thuế suất NPR
 DefaultTaxRate=Thuế suất mặc định
@@ -729,6 +730,7 @@ MenuMembers=Thành viên
 MenuAgendaGoogle=Google agenda
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Giới hạn của Dolibarr (Thực đơn Nhà-Thiết lập-Bảo mật): %s Kb, giới hạn của PHP: %s Kb
+ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
 NoFileFound=No documents uploaded
 CurrentUserLanguage=Ngôn ngữ hiện tại
 CurrentTheme=Theme hiện tại
@@ -1072,6 +1074,7 @@ ValidFrom=Có hiệu lực từ
 ValidUntil=Có hiệu lực đến
 NoRecordedUsers=Không có người dùng
 ToClose=Để đóng
+ToRefuse=To refuse
 ToProcess=Để xử lý
 ToApprove=Phê duyệt
 GlobalOpenedElemView=Xem toàn cục
@@ -1126,9 +1129,11 @@ UpdateForAllLines=Update for all lines
 OnHold=On hold
 Civility=Civility
 AffectTag=Affect Tag
+CreateExternalUser=Create external user
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
 ConfirmCancel=Are you sure you want to cancel
+EmailMsgID=Email MsgID
diff --git a/htdocs/langs/vi_VN/members.lang b/htdocs/langs/vi_VN/members.lang
index c2df22f839f..d1e6790968a 100644
--- a/htdocs/langs/vi_VN/members.lang
+++ b/htdocs/langs/vi_VN/members.lang
@@ -213,3 +213,5 @@ SendReminderForExpiredSubscription=Gửi lời nhắc qua email cho các thành
 MembershipPaid=Tư cách thành viên đã trả tiền cho kỳ hiện tại (cho đến khi %s)
 YouMayFindYourInvoiceInThisEmail=Bạn có thể tìm thấy hóa đơn của bạn được đính kèm với email này
 XMembersClosed=%s (các) thành viên đã đóng
+XExternalUserCreated=%s external user(s) created
+ForceMemberNature=Force member nature (Individual or Corporation)
diff --git a/htdocs/langs/vi_VN/modulebuilder.lang b/htdocs/langs/vi_VN/modulebuilder.lang
index 6a1addc2a0d..905b86c8472 100644
--- a/htdocs/langs/vi_VN/modulebuilder.lang
+++ b/htdocs/langs/vi_VN/modulebuilder.lang
@@ -143,3 +143,4 @@ AsciiToHtmlConverter=Chuyển mã ASCII sang HTML
 AsciiToPdfConverter=Chuyển ASCII sang PDF
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
 ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
+ImportExportProfiles=Import and export profiles
diff --git a/htdocs/langs/vi_VN/mrp.lang b/htdocs/langs/vi_VN/mrp.lang
index 1133ac46a0b..f708bed87af 100644
--- a/htdocs/langs/vi_VN/mrp.lang
+++ b/htdocs/langs/vi_VN/mrp.lang
@@ -8,12 +8,12 @@ MenuBOM=Hóa đơn của vật liệu
 LatestBOMModified=Hóa đơn vật liệu được sửa đổi mới nhất %s 
 LatestMOModified=Đơn đặt hàng sản xuất được sửa đổi mới nhất %s 
 Bom=Hóa đơn của vật liệu
-BillOfMaterials=Hóa đơn vật liệu
+BillOfMaterials=Bill of Materials
 BOMsSetup=Thiết lập mô-đun BOM
 ListOfBOMs=Danh sách hóa đơn vật liệu - BOM
 ListOfManufacturingOrders=Danh sách các đơn đặt hàng sản xuất
-NewBOM=Thêm Hóa đơn vật liệu
-ProductBOMHelp=Sản phẩm để tạo với BOM này. <br> Lưu ý: Các sản phẩm có thuộc tính 'Bản chất của sản phẩm' = 'Vật liệu' không hiển thị trong danh sách này.
+NewBOM=New bill of materials
+ProductBOMHelp=Product to create (or disassemble) with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
 BOMsNumberingModules=Mẫu đánh số BOM
 BOMsModelModule=Mẫu tài liệu BOM
 MOsNumberingModules=Mẫu đánh số MO
@@ -22,7 +22,7 @@ FreeLegalTextOnBOMs=Văn bản tủy ý trên tài liệu của BOM
 WatermarkOnDraftBOMs=Hình mờ trên dự thảo BOM
 FreeLegalTextOnMOs=Văn bản tủy ý trên tài liệu của MO
 WatermarkOnDraftMOs=Hình mờ trên dự thảo MO
-ConfirmCloneBillOfMaterials=Bạn có chắc chắn muốn sao chép hóa đơn vật liệu %s?
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials %s ?
 ConfirmCloneMo=Bạn có chắc chắn muốn sao chép Đơn hàng sản xuất %s không?
 ManufacturingEfficiency=Hiệu quả sản xuất
 ConsumptionEfficiency=Consumption efficiency
@@ -30,8 +30,8 @@ ValueOfMeansLoss=Giá trị 0,95 có nghĩa là trung bình mất 5%% trong quá
 ValueOfMeansLossForProductProduced=Value of 0.95 means an average of 5%% of loss of produced product
 DeleteBillOfMaterials=Xóa hóa đơn vật liệu
 DeleteMo=Xóa đơn hàng sản xuất
-ConfirmDeleteBillOfMaterials=Bạn có chắc chắn muốn xóa Hóa đơn vật liệu này không?
-ConfirmDeleteMo=Bạn có chắc chắn muốn xóa Hóa đơn vật liệu này không?
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Materials?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Materials?
 MenuMRP=Đơn đặt hàng sản xuất
 NewMO=Thêm Đơn hàng sản xuất
 QtyToProduce=Số lượng để sản xuất
@@ -39,7 +39,7 @@ DateStartPlannedMo=Ngày bắt đầu kế hoạch
 DateEndPlannedMo=Ngày kết thúc dự kiến
 KeepEmptyForAsap=Trống có nghĩa là 'càng sớm càng tốt'
 EstimatedDuration=Thời gian dự tính
-EstimatedDurationDesc=Thời gian dự kiến để sản xuất sản phẩm này bằng BOM này
+EstimatedDurationDesc=Estimated duration to manufacture (or disassemble) this product using this BOM
 ConfirmValidateBom=Bạn có chắc chắn muốn xác nhận BOM với tham chiếu <strong>%s</strong> (bạn sẽ có thể sử dụng nó để xây dựng Đơn hàng sản xuất mới)
 ConfirmCloseBom=Bạn có chắc chắn muốn hủy BOM này (bạn sẽ không thể sử dụng nó để xây dựng Đơn đặt hàng sản xuất mới nữa)?
 ConfirmReopenBom=Bạn có chắc chắn muốn mở lại BOM này (bạn sẽ có thể sử dụng nó để xây dựng Đơn đặt hàng sản xuất mới)
@@ -63,13 +63,14 @@ ConsumeAndProduceAll=Tiêu thụ và sản xuất tất cả
 Manufactured=Được sản xuất
 TheProductXIsAlreadyTheProductToProduce=Các sản phẩm để thêm đã là sản phẩm để sản xuất.
 ForAQuantityOf=For a quantity to produce of %s
+ForAQuantityToConsumeOf=For a quantity to disassemble of %s
 ConfirmValidateMo=Bạn có chắc chắn muốn xác nhận Đơn hàng sản xuất này không?
 ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
 ProductionForRef=Production of %s
 AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
 NoStockChangeOnServices=No stock change on services
 ProductQtyToConsumeByMO=Product quantity still to consume by open MO
-ProductQtyToProduceByMO=Product quentity still to produce by open MO
+ProductQtyToProduceByMO=Product quantity still to produce by open MO
 AddNewConsumeLines=Add new line to consume
 ProductsToConsume=Products to consume
 ProductsToProduce=Products to produce
@@ -83,15 +84,13 @@ Workstations=Workstations
 WorkstationsDescription=Workstations management
 WorkstationSetup = Workstations setup
 WorkstationSetupPage = Workstations setup page
-WorkstationAbout = About Workstation
-WorkstationAboutPage = Workstations about page
 WorkstationList=Workstation list
 WorkstationCreate=Add new workstation
 ConfirmEnableWorkstation=Are you sure you want to enable workstation <b>%s</b> ?
 EnableAWorkstation=Enable a workstation
 ConfirmDisableWorkstation=Are you sure you want to disable workstation <b>%s</b> ?
 DisableAWorkstation=Disable a workstation
-DeleteWorkstation=Supprimer
+DeleteWorkstation=Xóa
 NbOperatorsRequired=Number of operators required
 THMOperatorEstimated=Estimated operator THM
 THMMachineEstimated=Estimated machine THM
diff --git a/htdocs/langs/vi_VN/orders.lang b/htdocs/langs/vi_VN/orders.lang
index 8cfeed65329..39bace9ec46 100644
--- a/htdocs/langs/vi_VN/orders.lang
+++ b/htdocs/langs/vi_VN/orders.lang
@@ -11,6 +11,7 @@ OrderDate=Ngày đặt hàng
 OrderDateShort=Ngày đặt hàng
 OrderToProcess=Đơn hàng xử lý
 NewOrder=Đơn hàng mới
+NewSupplierOrderShort=Đơn hàng mới
 NewOrderSupplier=Đơn đặt hàng mua mới
 ToOrder=Tạo đơn hàng
 MakeOrder=Tạo đơn hàng
@@ -73,6 +74,7 @@ DeleteOrder=Xóa đơn hàng
 CancelOrder=Hủy đơn hàng
 OrderReopened= Đơn hàng %s được mở lại
 AddOrder=Tạo đơn hàng
+AddSupplierOrderShort=Tạo đơn hàng
 AddPurchaseOrder=Tạo đơn hàng mua
 AddToDraftOrders=Thêm vào đơn hàng dự thảo
 ShowOrder=Hiển thị đơn hàng
diff --git a/htdocs/langs/vi_VN/other.lang b/htdocs/langs/vi_VN/other.lang
index 0a96b0891f0..40d5904d04b 100644
--- a/htdocs/langs/vi_VN/other.lang
+++ b/htdocs/langs/vi_VN/other.lang
@@ -129,6 +129,7 @@ ClosedByLogin=Người sử dụng đăng nhập người đóng
 FileWasRemoved=Tập tin% s đã được gỡ bỏ
 DirWasRemoved=Thư mục% s đã được gỡ bỏ
 FeatureNotYetAvailable=Tính năng chưa có trong phiên bản hiện tại
+FeatureNotAvailableOnDevicesWithoutMouse=Feature not available on devices without mouse
 FeaturesSupported=Các tính năng được hỗ trợ
 Width=Chiều rộng
 Height=Chiều cao
@@ -263,7 +264,7 @@ ContactCreatedByEmailCollector=Liên hệ / địa chỉ được tạo bởi tr
 ProjectCreatedByEmailCollector=Dự án được tạo bởi trình thu thập email từ email MSGID %s
 TicketCreatedByEmailCollector=Vé được tạo bởi trình thu thập email từ email MSGID %s
 OpeningHoursFormatDesc=Sử dụng một - để tách giờ mở và đóng cửa. <br> Sử dụng một khoảng trắng để nhập các phạm vi khác nhau. <br> Ví dụ: 8-12 14-18
-PrefixSession=Prefix for session ID
+SuffixSessionName=Suffix for session name
 
 ##### Export #####
 ExportsArea=Khu vực xuất khẩu
diff --git a/htdocs/langs/vi_VN/partnership.lang b/htdocs/langs/vi_VN/partnership.lang
index 0a690c176b4..5fec8be4894 100644
--- a/htdocs/langs/vi_VN/partnership.lang
+++ b/htdocs/langs/vi_VN/partnership.lang
@@ -16,41 +16,72 @@
 #
 # Generic
 #
-ModulePartnershipName = Partnership management
-PartnershipDescription = Module Partnership management
+ModulePartnershipName=Partnership management
+PartnershipDescription=Module Partnership management
 PartnershipDescriptionLong= Module Partnership management
 
+AddPartnership=Add partnership
+CancelPartnershipForExpiredMembers=Partnership: Cancel partnership of members with expired subscriptions
+PartnershipCheckBacklink=Partnership: Check referring backlink
+
 #
 # Menu
 #
-NewPartnership = New Partnership
-ListOfPartnerships = List of partnership
+NewPartnership=New Partnership
+ListOfPartnerships=List of partnership
 
 #
 # Admin page
 #
-PartnershipSetup = Partnership setup
-PartnershipAbout = About Partnership
-PartnershipAboutPage = Partnership about page
-
+PartnershipSetup=Partnership setup
+PartnershipAbout=About Partnership
+PartnershipAboutPage=Partnership about page
+partnershipforthirdpartyormember=Partner status must be set on a 'thirdparty' or a 'member'
+PARTNERSHIP_IS_MANAGED_FOR=Partnership managed for
+PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks to check
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb of days before cancelling status of a partnership when a subscription has expired
+ReferingWebsiteCheck=Check of website referring
+ReferingWebsiteCheckDesc=You can enable a feature to check that your partners has added a backlink to your website domains on their own website.
 
 #
 # Object
 #
+DeletePartnership=Delete a partnership
+PartnershipDedicatedToThisThirdParty=Partnership dedicated to this third party
+PartnershipDedicatedToThisMember=Partnership dedicated to this member
 DatePartnershipStart=Ngày bắt đầu
 DatePartnershipEnd=Ngày kết thúc
+ReasonDecline=Decline reason
+ReasonDeclineOrCancel=Decline reason
+PartnershipAlreadyExist=Partnership already exist
+ManagePartnership=Manage partnership
+BacklinkNotFoundOnPartnerWebsite=Backlink not found on partner website
+ConfirmClosePartnershipAsk=Are you sure you want to cancel this partnership?
+PartnershipType=Partnership type
 
 #
 # Template Mail
 #
+SendingEmailOnPartnershipWillSoonBeCanceled=Partnership will soon be canceled
+SendingEmailOnPartnershipRefused=Partnership refused
+SendingEmailOnPartnershipAccepted=Partnership accepted
+SendingEmailOnPartnershipCanceled=Partnership canceled
 
+YourPartnershipWillSoonBeCanceledTopic=Partnership will soon be canceled
+YourPartnershipRefusedTopic=Partnership refused
+YourPartnershipAcceptedTopic=Partnership accepted
+YourPartnershipCanceledTopic=Partnership canceled
+
+YourPartnershipWillSoonBeCanceledContent=We inform you that your partnership will soon be canceled (Backlink not found)
+YourPartnershipRefusedContent=We inform you that your partnership request has been refused.
+YourPartnershipAcceptedContent=We inform you that your partnership request has been accepted.
+YourPartnershipCanceledContent=We inform you that your partnership has been canceled.
 
 #
 # Status
 #
-PartnershipDraft = Dự thảo
-PartnershipAccepted = Đã được chấp nhận
-PartnershipRefused = Bị từ chối
-PartnershipCanceled = Đã hủy
-
+PartnershipDraft=Dự thảo
+PartnershipAccepted=Đã được chấp nhận
+PartnershipRefused=Bị từ chối
+PartnershipCanceled=Đã hủy
 PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/vi_VN/productbatch.lang b/htdocs/langs/vi_VN/productbatch.lang
index 664b919a209..8d7e76e7b7c 100644
--- a/htdocs/langs/vi_VN/productbatch.lang
+++ b/htdocs/langs/vi_VN/productbatch.lang
@@ -1,4 +1,4 @@
-# ProductBATCH language file - en_US - ProductBATCH
+# ProductBATCH language file - Source file is en_US - ProductBATCH
 ManageLotSerial=Sử dụng số lô / số sê-ri
 ProductStatusOnBatch=Yes (lot required)
 ProductStatusOnSerial=Yes (unique serial number required)
@@ -33,3 +33,13 @@ CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+LifeTime=Life span (in days)
+EndOfLife=End of life
+ManufacturingDate=Manufacturing date
+DestructionDate=Destruction date
+FirstUseDate=First use date
+QCFrequency=Quality control frequency (in days)
+
+#Traceability - qc status
+OutOfOrder=Out of order
+InWorkingOrder=In working order
diff --git a/htdocs/langs/vi_VN/products.lang b/htdocs/langs/vi_VN/products.lang
index de924f3ac3a..c0d647c8ee7 100644
--- a/htdocs/langs/vi_VN/products.lang
+++ b/htdocs/langs/vi_VN/products.lang
@@ -396,3 +396,5 @@ ActionAvailableOnVariantProductOnly=Hành động chỉ có hiệu lực trên b
 ProductsPricePerCustomer=Giá sản phẩm mỗi khách hàng
 ProductSupplierExtraFields=Thuộc tính bổ sung (Giá Nhà cung cấp)
 DeleteLinkedProduct=Xóa sản phẩm con được liên kết với sự kết hợp
+PMPValue=Giá bình quân gia quyền
+PMPValueShort=WAP
diff --git a/htdocs/langs/vi_VN/projects.lang b/htdocs/langs/vi_VN/projects.lang
index 5736bb007fe..c0282207a0e 100644
--- a/htdocs/langs/vi_VN/projects.lang
+++ b/htdocs/langs/vi_VN/projects.lang
@@ -267,9 +267,11 @@ InvoiceToUse=Hoá đơn dự thảo sử dụng
 NewInvoice=Hóa đơn mới
 OneLinePerTask=Dòng dòng một công việc
 OneLinePerPeriod=Một dòng cho một khoảng thời gian
+OneLinePerTimeSpentLine=One line for each time spent declaration
 RefTaskParent=Tham chiếu công việc cấp cha
 ProfitIsCalculatedWith=Profit is calculated using
 AddPersonToTask=Add also to tasks
 UsageOrganizeEvent=Usage: Event Organization
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
+SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
diff --git a/htdocs/langs/vi_VN/receptions.lang b/htdocs/langs/vi_VN/receptions.lang
index 6deb00337fe..43e74be8acf 100644
--- a/htdocs/langs/vi_VN/receptions.lang
+++ b/htdocs/langs/vi_VN/receptions.lang
@@ -44,4 +44,4 @@ ValidateOrderFirstBeforeReception=Trước tiên, bạn phải xác nhận đơn
 ReceptionsNumberingModules=Mô-đun đánh số cho tiếp nhận
 ReceptionsReceiptModel=Mẫu tài liệu cho tiếp nhận
 NoMorePredefinedProductToDispatch=No more predefined products to dispatch
-
+ReceptionExist=A reception exists
diff --git a/htdocs/langs/vi_VN/stocks.lang b/htdocs/langs/vi_VN/stocks.lang
index 6ca53c6ae44..03a000c78d7 100644
--- a/htdocs/langs/vi_VN/stocks.lang
+++ b/htdocs/langs/vi_VN/stocks.lang
@@ -56,8 +56,6 @@ UnitPurchaseValue=Giá mua đơn vị
 StockTooLow=Tồn kho quá thấp
 StockLowerThanLimit=Tồn kho thấp hơn giới hạn cảnh báo (%s)
 EnhancedValue=Giá trị
-PMPValue=Giá bình quân gia quyền
-PMPValueShort=WAP
 EnhancedValueOfWarehouses=Giá trị kho
 UserWarehouseAutoCreate=Tự động tạo người dùng kho khi tạo người dùng
 AllowAddLimitStockByWarehouse=Quản lý đồng thời giá trị cho tồn kho tối thiểu và mong muốn trên mỗi cặp (sản phẩm - kho) ngoài giá trị cho tồn kho tối thiểu và mong muốn trên mỗi sản phẩm
@@ -251,7 +249,10 @@ SelectAStockMovementFileToImport=select a stock movement file to import
 InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
 LabelOfInventoryMovemement=Inventory %s
 ReOpen=Mở lại
-ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock to the real qty you entered into the inventory.
 ObjectNotFound=%s not found
 MakeMovementsAndClose=Generate movements and close
 AutofillWithExpected=Fill real quantity with expected quantity
+ShowAllBatchByDefault=By default, show batch details on product "stock" tab
+CollapseBatchDetailHelp=You can set batch detail default display in stocks module configuration
+FieldCannotBeNegative=Field "%s" cannot be negative
diff --git a/htdocs/langs/vi_VN/ticket.lang b/htdocs/langs/vi_VN/ticket.lang
index dad560fa10f..eb59437398d 100644
--- a/htdocs/langs/vi_VN/ticket.lang
+++ b/htdocs/langs/vi_VN/ticket.lang
@@ -304,7 +304,7 @@ BoxLastModifiedTicket=Vé sửa đổi mới nhất
 BoxLastModifiedTicketDescription=Vé sửa đổi mới nhất %s
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=Không có vé sửa đổi gần đây
-BoxTicketType=Number of open tickets by type
+BoxTicketType=Distribution of open tickets by type
 BoxTicketSeverity=Number of open tickets by severity
 BoxNoTicketSeverity=No tickets opened
 BoxTicketLastXDays=Number of new tickets by days the last %s days
diff --git a/htdocs/langs/zh_CN/accountancy.lang b/htdocs/langs/zh_CN/accountancy.lang
index 6d6fdd5baa6..8a549782450 100644
--- a/htdocs/langs/zh_CN/accountancy.lang
+++ b/htdocs/langs/zh_CN/accountancy.lang
@@ -158,7 +158,7 @@ ACCOUNTING_LENGTH_AACCOUNT=Length of the third-party accounting accounts (If you
 ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of an accounting account. Needed by some countries (like Switzerland). If set to off (default), you can set the following two parameters to ask the application to add virtual zeros.
 BANK_DISABLE_DIRECT_INPUT=禁止在银行帐户中直接记录交易
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=在日记帐上启用草稿导出
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties, break ability to search on a part of value)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
@@ -328,6 +328,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountanc
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
+NotifiedExportDate=Notified export date (modification of the entries will not be possible)
+NotifiedValidationDate=Validation of the entries (modification or deletion of the entries will not be possible)
+ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=导出日常报表草稿
 Modelcsv=导出型号
 Selectmodelcsv=请选择一个导出模板
diff --git a/htdocs/langs/zh_CN/admin.lang b/htdocs/langs/zh_CN/admin.lang
index 0ddf580c5f6..be986a707fe 100644
--- a/htdocs/langs/zh_CN/admin.lang
+++ b/htdocs/langs/zh_CN/admin.lang
@@ -221,8 +221,8 @@ NotCompatible=此模块似乎与您的Dolibarr %s（Min %s  -  Max %s）不兼
 CompatibleAfterUpdate=此模块需要更新Dolibarr %s（Min %s  -  Max %s）。
 SeeInMarkerPlace=在市场上看到
 SeeSetupOfModule=参见模块设置 %s
+SetOptionTo=Set option <b>%s</b> to %s
 Updated=已更新
-Nouveauté=新颖
 AchatTelechargement=购买/下载
 GoModuleSetupArea=To deploy/install a new module, go to the Module setup area: <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore，为 Dolibarr 的 ERP/CRM 的外部模块官方市场
@@ -399,6 +399,7 @@ SecurityToken=保护URL链接的密钥
 NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
 PDF=PDF格式
 PDFDesc=Global options for PDF generation
+PDFOtherDesc=PDF Option specific to some modules
 PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
 PDFRulesForSalesTax=销售税/增值税规则
@@ -561,7 +562,7 @@ Module53Desc=Management of Services
 Module54Name=联系人/订阅
 Module54Desc=Management of contracts (services or recurring subscriptions)
 Module55Name=条码
-Module55Desc=条码管理
+Module55Desc=Barcode or QR code management
 Module56Name=Payment by credit transfer
 Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
 Module57Name=Payments by Direct Debit
@@ -848,10 +849,10 @@ Permission402=创建/变更折扣
 Permission403=确认折扣
 Permission404=删除折扣
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries (yours and subordinates)
-Permission512=Create/modify payments of salaries
-Permission514=Delete payments of salaries
-Permission517=Read payments of salaries of everybody
+Permission511=Read salaries and payments (yours and subordinates)
+Permission512=Create/modify salaries and payments
+Permission514=Delete salaries and payments
+Permission517=Read salaries and payments everybody
 Permission519=导出工资
 Permission520=读取贷款
 Permission522=创建/变更贷款
@@ -965,6 +966,8 @@ Permission23003=删除排定任务
 Permission23004=执行排定任务
 Permission50101=Use Point of Sale (SimplePOS)
 Permission50151=Use Point of Sale (TakePOS)
+Permission50152=Edit sales lines
+Permission50153=Edit ordered sales lines
 Permission50201=读取交易
 Permission50202=导入交易
 Permission50330=Read objects of Zapier
@@ -1039,11 +1042,12 @@ DictionaryMeasuringUnits=Measuring Units
 DictionarySocialNetworks=社交网络
 DictionaryProspectStatus=Prospect status for companies
 DictionaryProspectContactStatus=Prospect status for contacts
-DictionaryHolidayTypes=Types of leave
+DictionaryHolidayTypes=Leave - Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=费用报告 - 运输类别
 DictionaryExpenseTaxRange=费用报告 - 按运输类别排列
 DictionaryTransportMode=Intracomm report - Transport mode
+DictionaryBatchStatus=Product lot/serial Quality Control status
 TypeOfUnit=Type of unit
 SetupSaved=设置已经成功保存
 SetupNotSaved=安装程序未保存
@@ -1187,7 +1191,7 @@ SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of m
 SetupDescription5=Other Setup menu entries manage optional parameters.
 AuditedSecurityEvents=Security events that are audited
 NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
-Audit=安全稽核
+Audit=Security events
 InfoDolibarr=关于Dolibarr
 InfoBrowser=关于浏览器
 InfoOS=关于OS
@@ -1319,9 +1323,12 @@ ConditionIsCurrently=当前条件为 %s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
 NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
+ComboListOptim=Combo list loading optimization
 SearchOptim=搜索优化
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
-YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
+YouHaveXObjectUseComboOptim=You have %s %s in the database. You can go into setup of module to enable loading of combo list on key pressed event.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other.
+YouHaveXObjectUseSearchOptimDesc=This limits the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to %s in Home-Setup-Other.
 BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
 BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
 PHPModuleLoaded=PHP component %s is loaded
@@ -1433,6 +1440,7 @@ MemberMainOptions=主要选项
 AdherentLoginRequired= 管理人员登陆
 AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=设置向会员发送邮件确认(会员确认或添加订阅)复选框默认为启用
+MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
 MembersDocModules=Document templates for documents generated from member record
@@ -1763,7 +1771,7 @@ AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting men
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=启用声音通知
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
-AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the scheduled job %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=将链接对象显示在议程视图中
 ##### Clicktodial #####
 ClickToDialSetup=点击拨号模块设置
@@ -1979,6 +1987,8 @@ MAIN_PDF_MARGIN_RIGHT=PDF的右边距
 MAIN_PDF_MARGIN_TOP=PDF的上边距
 MAIN_PDF_MARGIN_BOTTOM=PDF的底部边距
 MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add picture on proposal line
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add electronic sign in PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=如果此组是其他组的计算，则将此值设置为yes
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
@@ -2096,7 +2106,6 @@ PDF_SHOW_PROJECT=Show project on document
 ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
-FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
@@ -2120,12 +2129,18 @@ ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by
 MailToSendEventOrganization=Event Organization
 AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
 YouShouldDisablePHPFunctions=You should disable PHP functions
-IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands in custom code, you shoud disable PHP functions
+PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
+NotRecommended=Not recommanded
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
 ModuleUpdateAvailable=An update is available
 NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
+RandomlySelectedIfSeveral=Randomly selected if several pictures are available
+DatabasePasswordObfuscated=Database password is obfuscated in conf file
+DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
diff --git a/htdocs/langs/zh_CN/agenda.lang b/htdocs/langs/zh_CN/agenda.lang
index 0537baf6b02..ca2be71a2ef 100644
--- a/htdocs/langs/zh_CN/agenda.lang
+++ b/htdocs/langs/zh_CN/agenda.lang
@@ -4,7 +4,7 @@ Actions=事件
 Agenda=待办事项
 TMenuAgenda=待办事项
 Agendas=待办事项
-LocalAgenda=内部日历
+LocalAgenda=Default calendar
 ActionsOwnedBy=按用户活动
 ActionsOwnedByShort=用户
 AffectedTo=分配给
@@ -14,13 +14,13 @@ EventsNb=事件数
 ListOfActions=事件列表
 EventReports=活动报告
 Location=位置
-ToUserOfGroup=Event assigned to any user in group
+ToUserOfGroup=Event assigned to any user in the group
 EventOnFullDay=全天事件
 MenuToDoActions=所有未完成的事件
 MenuDoneActions=所有终止事件
 MenuToDoMyActions=我的未完成事件
 MenuDoneMyActions=我的已经终结的事件
-ListOfEvents=事件列表(内部日历)
+ListOfEvents=List of events (default calendar)
 ActionsAskedBy=记录操作
 ActionsToDoBy=事件分配给
 ActionsDoneBy=做的动作
@@ -38,6 +38,7 @@ ActionsEvents=Dolibarr将为其自动创建一个动作的事件
 EventRemindersByEmailNotEnabled=通过电子邮件发送的事件提醒未启用到%s模块设置中。
 ##### Agenda event labels #####
 NewCompanyToDolibarr=合作方 %s 已创建
+COMPANY_MODIFYInDolibarr=Third party %s modified
 COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=联系人 %s 已验证
 CONTRACT_DELETEInDolibarr=合同%s已删除
@@ -87,6 +88,7 @@ OrderDeleted=订单已删除
 InvoiceDeleted=发票已删除
 DraftInvoiceDeleted=Draft invoice deleted
 CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_MODIFYInDolibarr=Contact %s modified
 CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=产品%s已创建
 PRODUCT_MODIFYInDolibarr=产品%s改装
@@ -119,6 +121,7 @@ MRP_MO_UNVALIDATEInDolibarr=MO set to draft status
 MRP_MO_PRODUCEDInDolibarr=MO produced
 MRP_MO_DELETEInDolibarr=MO deleted
 MRP_MO_CANCELInDolibarr=MO canceled
+PAIDInDolibarr=%s paid
 ##### End agenda events #####
 AgendaModelModule=事件的文档模板
 DateActionStart=开始日期
@@ -130,7 +133,7 @@ AgendaUrlOptions4=<b> logint = %s</b>将输出限制为分配给用户<b> %s </b
 AgendaUrlOptionsProject=<b> project = __ PROJECT_ID __</b>将输出限制为链接到项目<b> __ PROJECT_ID __</b>的操作。
 AgendaUrlOptionsNotAutoEvent=<b> notactiontype = systemauto </b>排除自动事件。
 AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> to include events of holidays.
-AgendaShowBirthdayEvents=显示联系人生日
+AgendaShowBirthdayEvents=Birthdays of contacts
 AgendaHideBirthdayEvents=隐藏联系人生日
 Busy=忙碌
 ExportDataset_event1=待办事项事件列表
@@ -152,6 +155,7 @@ ActionType=活动类型
 DateActionBegin=活动开始日期
 ConfirmCloneEvent=您确定要克隆事件<b> %s </b>吗？
 RepeatEvent=重复事件
+OnceOnly=Once only
 EveryWeek=每周
 EveryMonth=每月
 DayOfMonth=每月天数
@@ -165,4 +169,4 @@ TimeType=Duration type
 ReminderType=Callback type
 AddReminder=Create an automatic reminder notification for this event
 ErrorReminderActionCommCreation=Error creating the reminder notification for this event
-BrowserPush=Browser Notification
+BrowserPush=Browser Popup Notification
diff --git a/htdocs/langs/zh_CN/bills.lang b/htdocs/langs/zh_CN/bills.lang
index 270e7c8f78a..15f621ad140 100644
--- a/htdocs/langs/zh_CN/bills.lang
+++ b/htdocs/langs/zh_CN/bills.lang
@@ -259,6 +259,7 @@ DateMaxPayment=付款到期
 DateInvoice=发票日期
 DatePointOfTax=税点
 NoInvoice=没有发票
+NoOpenInvoice=No open invoice
 ClassifyBill=分类发票
 SupplierBillsToPay=Unpaid vendor invoices
 CustomerBillsUnpaid=未付款顾客发票
@@ -589,3 +590,4 @@ FacParentLine=Invoice Line Parent
 SituationTotalRayToRest=Remainder to pay without taxe
 PDFSituationTitle=Situation n° %d
 SituationTotalProgress=Total progress %d %%
+SearchUnpaidInvoicesWithDueDate=Search unpaid invoices with a due date = %s
diff --git a/htdocs/langs/zh_CN/cashdesk.lang b/htdocs/langs/zh_CN/cashdesk.lang
index 3d9202d5443..a3f2b9b5b87 100644
--- a/htdocs/langs/zh_CN/cashdesk.lang
+++ b/htdocs/langs/zh_CN/cashdesk.lang
@@ -102,7 +102,7 @@ CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal numb
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
 SaleStartedAt=Sale started at %s
-ControlCashOpening=Control cash popup at opening POS
+ControlCashOpening=Open the "Control cash" popup when opening the POS
 CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -126,5 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
-ShowPriceHT = Display the price excluding tax column
-ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
+ShowPriceHT = Display the column with the price excluding tax (on screen)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
diff --git a/htdocs/langs/zh_CN/compta.lang b/htdocs/langs/zh_CN/compta.lang
index ddafa9046fd..f30ade1ef86 100644
--- a/htdocs/langs/zh_CN/compta.lang
+++ b/htdocs/langs/zh_CN/compta.lang
@@ -286,3 +286,9 @@ ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
 IncludeLoansInResults = Include loans in reports
+InvoiceLate30Days = Invoices late > 30 days
+InvoiceLate15Days = Invoices late > 15 days
+InvoiceLateMinus15Days = Invoices late
+InvoiceNotLate = To be collected < 15 days
+InvoiceNotLate15Days = To be collected in 15 days
+InvoiceNotLate30Days = To be collected in 30 days
diff --git a/htdocs/langs/zh_CN/cron.lang b/htdocs/langs/zh_CN/cron.lang
index 63b93692f0e..d14d20202fa 100644
--- a/htdocs/langs/zh_CN/cron.lang
+++ b/htdocs/langs/zh_CN/cron.lang
@@ -60,7 +60,7 @@ CronErrEndDateStartDt=结束日期不能早过开始日期啊，时光不能倒
 StatusAtInstall=模块安装时的状态
 CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=禁用
-CronTaskInactive=这个工作已失效
+CronTaskInactive=This job is disabled (not scheduled)
 CronId=Id
 CronClassFile=带有类的文件名
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example 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>
diff --git a/htdocs/langs/zh_CN/errors.lang b/htdocs/langs/zh_CN/errors.lang
index f3840ee22b4..8938226cf7c 100644
--- a/htdocs/langs/zh_CN/errors.lang
+++ b/htdocs/langs/zh_CN/errors.lang
@@ -11,6 +11,7 @@ ErrorBadValueForParamNotAString=参数值不正确。它通常在缺少翻译时
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=登陆%s已经存在。
 ErrorGroupAlreadyExists=组%s已经存在。
+ErrorEmailAlreadyExists=Email %s already exists.
 ErrorRecordNotFound=记录没有找到。
 ErrorFailToCopyFile=无法复制文件<b>'%s'</b>成<b>'%s'。</b>
 ErrorFailToCopyDir=无法将目录“<b> %s </b>”复制到“<b> %s </b>”中。
@@ -117,7 +118,7 @@ ErrorCantReadFile=无法读取档案'%s'
 ErrorCantReadDir=无法读取目录'%s'
 ErrorBadLoginPassword=帐号密码不正确
 ErrorLoginDisabled=您的帐户已被禁用
-ErrorFailedToRunExternalCommand=无法运行外部命令。检查它是可用和可运行在PHP的服务器。如果PHP <b>安全模式</b>被激活，请检查命令<b>safe_mode_exec_dir之</b>内，是由参数定义一个目录。
+ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server user. Check also the command is not protected on shell level by a security layer like apparmor.
 ErrorFailedToChangePassword=无法更改密码
 ErrorLoginDoesNotExists=登陆账号 <b>%s</b> 有误——系统中没有这个账户.
 ErrorLoginHasNoEmail=此账户未设定Email地址。无法使用该功能.
@@ -262,6 +263,7 @@ ErrorDateIsInFuture=Error, the date can't be in the future
 ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
 ErrorAPercentIsRequired=Error, please fill in the percentage correctly
 ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
+ErrorFailedToFindEmailTemplate=Failed to find template with code name %s
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -298,3 +300,4 @@ WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So y
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
+ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
diff --git a/htdocs/langs/zh_CN/eventorganization.lang b/htdocs/langs/zh_CN/eventorganization.lang
index 90ded2ddd49..783f3173661 100644
--- a/htdocs/langs/zh_CN/eventorganization.lang
+++ b/htdocs/langs/zh_CN/eventorganization.lang
@@ -1,4 +1,5 @@
 # Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+# Copyright (C) 2021		Dorian Vabre			<dorian.vabre@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
@@ -81,7 +82,10 @@ PriceOfBoothHelp=Subscription price to stand a booth
 EventOrganizationICSLink=Link ICS for events
 ConferenceOrBoothInformation=Conference Or Booth informations
 Attendees = Attendees
+DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
 #
 # Status
 #
@@ -94,8 +98,46 @@ EvntOrgCancelled = Cancelled
 #
 # Public page
 #
+SuggestForm = Suggestion page
+RegisterPage = Page for conferences or booth
+EvntOrgRegistrationHelpMessage = Here, you can vote for an event, or suggest a new conference or booth for the project
+EvntOrgRegistrationConfHelpMessage = Here, you can suggest a new conference for the project
+EvntOrgRegistrationBoothHelpMessage = Here, you can suggest a new booth for the project
+ListOfSuggestedConferences = List of suggested conferences
+ListOfSuggestedBooths = List of suggested booths
+SuggestConference = Suggest a new conference
+SuggestBooth = Suggest a booth
+ViewAndVote = View and vote for suggested events
 PublicAttendeeSubscriptionPage = Public link of registration to a conference
 MissingOrBadSecureKey = The security key is invalid or missing
-EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
-EvntOrgStartDuration = This conference starts on
-EvntOrgEndDuration =  and ends on
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference : '%s'
+EvntOrgDuration = This conference starts on %s and ends on %s.
+ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
+BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
+EventType = 活动类型
+
+#
+# Vote page
+#
+EvntOrgRegistrationWelcomeMessage = Welcome on the conference or booth suggestion page.
+EvntOrgRegistrationConfWelcomeMessage = Welcome on the conference suggestion page.
+EvntOrgRegistrationBoothWelcomeMessage = Welcome on the booth suggestion page.
+EvntOrgVoteHelpMessage = Here, you can view and vote for the suggested events for the project
+VoteOk = Your vote has been accepted.
+AlreadyVoted = You have already voted for this event.
+VoteError = An error has occurred during the vote, please try again.
+
+#
+# SubscriptionOk page
+#
+SubscriptionOk = Your subscription to this conference has been validated
+#
+# Subscription validation mail
+#
+ConfAttendeeSubscriptionConfirmation = Confirmation of your subscription to a conference
+#
+# Payment page
+#
+Attendee = Attendee
+PaymentConferenceAttendee = Conference attendee payment
+PaymentBoothLocation = Booth location payment
diff --git a/htdocs/langs/zh_CN/hrm.lang b/htdocs/langs/zh_CN/hrm.lang
index bb00a894f4c..30fea256e29 100644
--- a/htdocs/langs/zh_CN/hrm.lang
+++ b/htdocs/langs/zh_CN/hrm.lang
@@ -9,7 +9,7 @@ ConfirmDeleteEstablishment=Are you sure you wish to delete this establishment?
 OpenEtablishment=打开机构
 CloseEtablishment=关闭机构
 # Dictionary
-DictionaryPublicHolidays=HRM - Public holidays
+DictionaryPublicHolidays=Leave - Public holidays
 DictionaryDepartment=HRM - 部门列表
 DictionaryFunction=HRM - Job positions
 # Module
diff --git a/htdocs/langs/zh_CN/knowledgemanagement.lang b/htdocs/langs/zh_CN/knowledgemanagement.lang
index bd0b2f939c5..c34af640995 100644
--- a/htdocs/langs/zh_CN/knowledgemanagement.lang
+++ b/htdocs/langs/zh_CN/knowledgemanagement.lang
@@ -47,7 +47,7 @@ KnowledgeManagementArea = Knowledge Management
 # Menu
 #
 MenuKnowledgeRecord = Knowledge base
-ListOfArticles = List of articles
+ListKnowledgeRecord = List of articles
 NewKnowledgeRecord = New article
 ValidateReply = Validate solution
 KnowledgeRecords = Articles
diff --git a/htdocs/langs/zh_CN/languages.lang b/htdocs/langs/zh_CN/languages.lang
index 40a45ccfaec..c76f9240de0 100644
--- a/htdocs/langs/zh_CN/languages.lang
+++ b/htdocs/langs/zh_CN/languages.lang
@@ -3,6 +3,7 @@ Language_am_ET=Ethiopian
 Language_ar_AR=阿拉伯语
 Language_ar_EG=阿拉伯语（埃及）
 Language_ar_SA=阿拉伯语
+Language_ar_TN=Arabic (Tunisia)
 Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengali
 Language_bn_IN=Bengali (India)
@@ -84,6 +85,7 @@ Language_nl_NL=Dutch
 Language_pl_PL=波兰语
 Language_pt_BR=葡萄牙语（巴西）
 Language_pt_PT=葡萄牙
+Language_ro_MD=Romanian (Moldavia)
 Language_ro_RO=罗马尼亚
 Language_ru_RU=俄
 Language_ru_UA=俄语（乌克兰）
diff --git a/htdocs/langs/zh_CN/main.lang b/htdocs/langs/zh_CN/main.lang
index 458863d28bc..f41cc602ff4 100644
--- a/htdocs/langs/zh_CN/main.lang
+++ b/htdocs/langs/zh_CN/main.lang
@@ -180,7 +180,7 @@ SaveAndNew=Save and new
 TestConnection=测试连接
 ToClone=复制
 ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
-ConfirmClone=Choose data you want to clone:
+ConfirmClone=Choose the data you want to clone:
 NoCloneOptionsSpecified=未定义可复制数据
 Of=的
 Go=下一步
@@ -246,7 +246,7 @@ DefaultModel=默认文档模板
 Action=事件
 About=关于
 Number=数字
-NumberByMonth=按月份数
+NumberByMonth=Total reports by month
 AmountByMonth=每月金额
 Numero=数字
 Limit=限制
@@ -341,8 +341,8 @@ KiloBytes=KB
 MegaBytes=MB
 GigaBytes=GB
 TeraBytes=TB
-UserAuthor=创建的用户
-UserModif=更新的用户
+UserAuthor=Ceated by
+UserModif=Updated by
 b=b.
 Kb=Kb
 Mb=兆
@@ -430,6 +430,7 @@ LT1IN=CGST
 LT2IN=SGST
 LT1GC=Additionnal cents
 VATRate=增值税率
+RateOfTaxN=Rate of tax %s
 VATCode=税率代码
 VATNPR=税率NPR
 DefaultTaxRate=默认税率
@@ -503,9 +504,11 @@ By=由
 From=从
 FromDate=从
 FromLocation=从
-at=at
 to=至
 To=至
+ToDate=至
+ToLocation=至
+at=at
 and=和
 or=或
 Other=其他
@@ -727,6 +730,7 @@ MenuMembers=会员
 MenuAgendaGoogle=谷歌议程
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=来自Dolibarr本身的大小限制(菜单：home-setup-security)为：%s Kb，而PHP的限制为: %s Kb
+ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
 NoFileFound=No documents uploaded
 CurrentUserLanguage=当前语言
 CurrentTheme=当前主题样式
@@ -843,7 +847,7 @@ XMoreLines=%s 明细(s) 隐藏
 ShowMoreLines=显示更多/更少的行
 PublicUrl=公开网址
 AddBox=添加信息框
-SelectElementAndClick=选择一个元素，然后单击%s
+SelectElementAndClick=Select an element and click on %s
 PrintFile=打印文件 %s
 ShowTransaction=在银行帐户条目
 ShowIntervention=显示干预
@@ -854,8 +858,8 @@ Denied=否认
 ListOf=列表%s
 ListOfTemplates=模板列表
 Gender=性别
-Genderman=男人
-Genderwoman=女人
+Genderman=Male
+Genderwoman=Female
 Genderother=其他
 ViewList=列表视图
 ViewGantt=Gantt view
@@ -1070,6 +1074,7 @@ ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
 ToClose=To close
+ToRefuse=To refuse
 ToProcess=待处理
 ToApprove=To approve
 GlobalOpenedElemView=Global view
@@ -1124,8 +1129,11 @@ UpdateForAllLines=Update for all lines
 OnHold=On hold
 Civility=Civility
 AffectTag=Affect Tag
+CreateExternalUser=Create external user
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
+ConfirmCancel=Are you sure you want to cancel
+EmailMsgID=Email MsgID
diff --git a/htdocs/langs/zh_CN/members.lang b/htdocs/langs/zh_CN/members.lang
index 2c4186f315b..9b1593a67a6 100644
--- a/htdocs/langs/zh_CN/members.lang
+++ b/htdocs/langs/zh_CN/members.lang
@@ -213,3 +213,5 @@ SendReminderForExpiredSubscription=Send reminder by email to members when subscr
 MembershipPaid=Membership paid for current period (until %s)
 YouMayFindYourInvoiceInThisEmail=You may find your invoice attached to this email
 XMembersClosed=%s member(s) closed
+XExternalUserCreated=%s external user(s) created
+ForceMemberNature=Force member nature (Individual or Corporation)
diff --git a/htdocs/langs/zh_CN/modulebuilder.lang b/htdocs/langs/zh_CN/modulebuilder.lang
index e9af897fbef..a095d3efaaf 100644
--- a/htdocs/langs/zh_CN/modulebuilder.lang
+++ b/htdocs/langs/zh_CN/modulebuilder.lang
@@ -143,3 +143,4 @@ AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
 ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
+ImportExportProfiles=Import and export profiles
diff --git a/htdocs/langs/zh_CN/mrp.lang b/htdocs/langs/zh_CN/mrp.lang
index ec999a473a4..86170bd9d91 100644
--- a/htdocs/langs/zh_CN/mrp.lang
+++ b/htdocs/langs/zh_CN/mrp.lang
@@ -8,12 +8,12 @@ MenuBOM=Bills of material
 LatestBOMModified=Latest %s Bills of materials modified
 LatestMOModified=Latest %s Manufacturing Orders modified
 Bom=Bills of Material
-BillOfMaterials=Bill of Material
+BillOfMaterials=Bill of Materials
 BOMsSetup=Setup of module BOM
 ListOfBOMs=List of bills of material - BOM
 ListOfManufacturingOrders=List of Manufacturing Orders
-NewBOM=New bill of material
-ProductBOMHelp=Product to create with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
+NewBOM=New bill of materials
+ProductBOMHelp=Product to create (or disassemble) with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
 BOMsNumberingModules=BOM numbering templates
 BOMsModelModule=BOM document templates
 MOsNumberingModules=MO numbering templates
@@ -22,7 +22,7 @@ FreeLegalTextOnBOMs=Free text on document of BOM
 WatermarkOnDraftBOMs=Watermark on draft BOM
 FreeLegalTextOnMOs=Free text on document of MO
 WatermarkOnDraftMOs=Watermark on draft MO
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials %s ?
 ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
 ManufacturingEfficiency=Manufacturing efficiency
 ConsumptionEfficiency=Consumption efficiency
@@ -30,8 +30,8 @@ ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the produc
 ValueOfMeansLossForProductProduced=Value of 0.95 means an average of 5%% of loss of produced product
 DeleteBillOfMaterials=Delete Bill Of Materials
 DeleteMo=Delete Manufacturing Order
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Materials?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Materials?
 MenuMRP=Manufacturing Orders
 NewMO=New Manufacturing Order
 QtyToProduce=Qty to produce
@@ -39,7 +39,7 @@ DateStartPlannedMo=Date start planned
 DateEndPlannedMo=Date end planned
 KeepEmptyForAsap=Empty means 'As Soon As Possible'
 EstimatedDuration=Estimated duration
-EstimatedDurationDesc=Estimated duration to manufacture this product using this BOM
+EstimatedDurationDesc=Estimated duration to manufacture (or disassemble) this product using this BOM
 ConfirmValidateBom=Are you sure you want to validate the BOM with the reference <strong>%s</strong> (you will be able to use it to build new Manufacturing Orders)
 ConfirmCloseBom=Are you sure you want to cancel this BOM (you won't be able to use it to build new Manufacturing Orders anymore) ?
 ConfirmReopenBom=Are you sure you want to re-open this BOM (you will be able to use it to build new Manufacturing Orders)
@@ -63,13 +63,14 @@ ConsumeAndProduceAll=Consume and Produce All
 Manufactured=Manufactured
 TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
 ForAQuantityOf=For a quantity to produce of %s
+ForAQuantityToConsumeOf=For a quantity to disassemble of %s
 ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
 ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
 ProductionForRef=Production of %s
 AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
 NoStockChangeOnServices=No stock change on services
 ProductQtyToConsumeByMO=Product quantity still to consume by open MO
-ProductQtyToProduceByMO=Product quentity still to produce by open MO
+ProductQtyToProduceByMO=Product quantity still to produce by open MO
 AddNewConsumeLines=Add new line to consume
 ProductsToConsume=Products to consume
 ProductsToProduce=Products to produce
@@ -83,15 +84,13 @@ Workstations=Workstations
 WorkstationsDescription=Workstations management
 WorkstationSetup = Workstations setup
 WorkstationSetupPage = Workstations setup page
-WorkstationAbout = About Workstation
-WorkstationAboutPage = Workstations about page
 WorkstationList=Workstation list
 WorkstationCreate=Add new workstation
 ConfirmEnableWorkstation=Are you sure you want to enable workstation <b>%s</b> ?
 EnableAWorkstation=Enable a workstation
 ConfirmDisableWorkstation=Are you sure you want to disable workstation <b>%s</b> ?
 DisableAWorkstation=Disable a workstation
-DeleteWorkstation=Supprimer
+DeleteWorkstation=删除
 NbOperatorsRequired=Number of operators required
 THMOperatorEstimated=Estimated operator THM
 THMMachineEstimated=Estimated machine THM
diff --git a/htdocs/langs/zh_CN/orders.lang b/htdocs/langs/zh_CN/orders.lang
index 16f4506f62f..a8fc4ffbf35 100644
--- a/htdocs/langs/zh_CN/orders.lang
+++ b/htdocs/langs/zh_CN/orders.lang
@@ -11,6 +11,7 @@ OrderDate=订购日期
 OrderDateShort=订单日期
 OrderToProcess=待处理订单
 NewOrder=新订单
+NewSupplierOrderShort=新订单
 NewOrderSupplier=New Purchase Order
 ToOrder=订单填写
 MakeOrder=订单填写
@@ -73,6 +74,7 @@ DeleteOrder=删除订单
 CancelOrder=取消订单
 OrderReopened= Order %s re-open
 AddOrder=创建订单
+AddSupplierOrderShort=创建订单
 AddPurchaseOrder=Create purchase order
 AddToDraftOrders=添加订单草稿
 ShowOrder=显示订单
diff --git a/htdocs/langs/zh_CN/other.lang b/htdocs/langs/zh_CN/other.lang
index e62ec686b2c..da40db325fc 100644
--- a/htdocs/langs/zh_CN/other.lang
+++ b/htdocs/langs/zh_CN/other.lang
@@ -129,6 +129,7 @@ ClosedByLogin=关闭的登陆账户
 FileWasRemoved=档案%s被删除
 DirWasRemoved=目录%s被删除
 FeatureNotYetAvailable=在当前版本中还没有可用的功能
+FeatureNotAvailableOnDevicesWithoutMouse=Feature not available on devices without mouse
 FeaturesSupported=支持的功能
 Width=宽
 Height=高
@@ -263,7 +264,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
-PrefixSession=Prefix for session ID
+SuffixSessionName=Suffix for session name
 
 ##### Export #####
 ExportsArea=导出区
diff --git a/htdocs/langs/zh_CN/partnership.lang b/htdocs/langs/zh_CN/partnership.lang
index 7c93d028f53..c6e60620deb 100644
--- a/htdocs/langs/zh_CN/partnership.lang
+++ b/htdocs/langs/zh_CN/partnership.lang
@@ -16,41 +16,72 @@
 #
 # Generic
 #
-ModulePartnershipName = Partnership management
-PartnershipDescription = Module Partnership management
+ModulePartnershipName=Partnership management
+PartnershipDescription=Module Partnership management
 PartnershipDescriptionLong= Module Partnership management
 
+AddPartnership=Add partnership
+CancelPartnershipForExpiredMembers=Partnership: Cancel partnership of members with expired subscriptions
+PartnershipCheckBacklink=Partnership: Check referring backlink
+
 #
 # Menu
 #
-NewPartnership = New Partnership
-ListOfPartnerships = List of partnership
+NewPartnership=New Partnership
+ListOfPartnerships=List of partnership
 
 #
 # Admin page
 #
-PartnershipSetup = Partnership setup
-PartnershipAbout = About Partnership
-PartnershipAboutPage = Partnership about page
-
+PartnershipSetup=Partnership setup
+PartnershipAbout=About Partnership
+PartnershipAboutPage=Partnership about page
+partnershipforthirdpartyormember=Partner status must be set on a 'thirdparty' or a 'member'
+PARTNERSHIP_IS_MANAGED_FOR=Partnership managed for
+PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks to check
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb of days before cancelling status of a partnership when a subscription has expired
+ReferingWebsiteCheck=Check of website referring
+ReferingWebsiteCheckDesc=You can enable a feature to check that your partners has added a backlink to your website domains on their own website.
 
 #
 # Object
 #
+DeletePartnership=Delete a partnership
+PartnershipDedicatedToThisThirdParty=Partnership dedicated to this third party
+PartnershipDedicatedToThisMember=Partnership dedicated to this member
 DatePartnershipStart=开始日期
 DatePartnershipEnd=结束日期
+ReasonDecline=Decline reason
+ReasonDeclineOrCancel=Decline reason
+PartnershipAlreadyExist=Partnership already exist
+ManagePartnership=Manage partnership
+BacklinkNotFoundOnPartnerWebsite=Backlink not found on partner website
+ConfirmClosePartnershipAsk=Are you sure you want to cancel this partnership?
+PartnershipType=Partnership type
 
 #
 # Template Mail
 #
+SendingEmailOnPartnershipWillSoonBeCanceled=Partnership will soon be canceled
+SendingEmailOnPartnershipRefused=Partnership refused
+SendingEmailOnPartnershipAccepted=Partnership accepted
+SendingEmailOnPartnershipCanceled=Partnership canceled
 
+YourPartnershipWillSoonBeCanceledTopic=Partnership will soon be canceled
+YourPartnershipRefusedTopic=Partnership refused
+YourPartnershipAcceptedTopic=Partnership accepted
+YourPartnershipCanceledTopic=Partnership canceled
+
+YourPartnershipWillSoonBeCanceledContent=We inform you that your partnership will soon be canceled (Backlink not found)
+YourPartnershipRefusedContent=We inform you that your partnership request has been refused.
+YourPartnershipAcceptedContent=We inform you that your partnership request has been accepted.
+YourPartnershipCanceledContent=We inform you that your partnership has been canceled.
 
 #
 # Status
 #
-PartnershipDraft = 草稿
-PartnershipAccepted = 接受
-PartnershipRefused = 已被拒绝
-PartnershipCanceled = 已取消
-
+PartnershipDraft=草稿
+PartnershipAccepted=接受
+PartnershipRefused=已被拒绝
+PartnershipCanceled=已取消
 PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/zh_CN/productbatch.lang b/htdocs/langs/zh_CN/productbatch.lang
index 1fbb1699543..2f2ebf5f722 100644
--- a/htdocs/langs/zh_CN/productbatch.lang
+++ b/htdocs/langs/zh_CN/productbatch.lang
@@ -1,4 +1,4 @@
-# ProductBATCH language file - en_US - ProductBATCH
+# ProductBATCH language file - Source file is en_US - ProductBATCH
 ManageLotSerial=使用批号/序列号
 ProductStatusOnBatch=Yes (lot required)
 ProductStatusOnSerial=Yes (unique serial number required)
@@ -33,3 +33,13 @@ CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+LifeTime=Life span (in days)
+EndOfLife=End of life
+ManufacturingDate=Manufacturing date
+DestructionDate=Destruction date
+FirstUseDate=First use date
+QCFrequency=Quality control frequency (in days)
+
+#Traceability - qc status
+OutOfOrder=Out of order
+InWorkingOrder=In working order
diff --git a/htdocs/langs/zh_CN/products.lang b/htdocs/langs/zh_CN/products.lang
index 4e7397d4a13..1ae64001f22 100644
--- a/htdocs/langs/zh_CN/products.lang
+++ b/htdocs/langs/zh_CN/products.lang
@@ -396,3 +396,5 @@ ActionAvailableOnVariantProductOnly=Action only available on the variant of prod
 ProductsPricePerCustomer=Product prices per customers
 ProductSupplierExtraFields=Additional Attributes (Supplier Prices)
 DeleteLinkedProduct=Delete the child product linked to the combination
+PMPValue=加权平均价格
+PMPValueShort=的WAP
diff --git a/htdocs/langs/zh_CN/projects.lang b/htdocs/langs/zh_CN/projects.lang
index 4589082f6b9..42f1c27b628 100644
--- a/htdocs/langs/zh_CN/projects.lang
+++ b/htdocs/langs/zh_CN/projects.lang
@@ -267,9 +267,11 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=新建发票
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+OneLinePerTimeSpentLine=One line for each time spent declaration
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
 AddPersonToTask=Add also to tasks
 UsageOrganizeEvent=Usage: Event Organization
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
+SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
diff --git a/htdocs/langs/zh_CN/receptions.lang b/htdocs/langs/zh_CN/receptions.lang
index f4729171019..270d6afc2f2 100644
--- a/htdocs/langs/zh_CN/receptions.lang
+++ b/htdocs/langs/zh_CN/receptions.lang
@@ -44,4 +44,4 @@ ValidateOrderFirstBeforeReception=You must first validate the order before being
 ReceptionsNumberingModules=Numbering module for receptions
 ReceptionsReceiptModel=Document templates for receptions
 NoMorePredefinedProductToDispatch=No more predefined products to dispatch
-
+ReceptionExist=A reception exists
diff --git a/htdocs/langs/zh_CN/stocks.lang b/htdocs/langs/zh_CN/stocks.lang
index a9af10ccd53..e57e352e059 100644
--- a/htdocs/langs/zh_CN/stocks.lang
+++ b/htdocs/langs/zh_CN/stocks.lang
@@ -56,8 +56,6 @@ UnitPurchaseValue=采购单价
 StockTooLow=库存过低
 StockLowerThanLimit=库存低于警戒限额（%s）
 EnhancedValue=值
-PMPValue=加权平均价格
-PMPValueShort=的WAP
 EnhancedValueOfWarehouses=仓库价值
 UserWarehouseAutoCreate=创建用户时自动创建用户仓库
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
@@ -251,7 +249,10 @@ SelectAStockMovementFileToImport=select a stock movement file to import
 InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
 LabelOfInventoryMovemement=Inventory %s
 ReOpen=重新打开
-ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock to the real qty you entered into the inventory.
 ObjectNotFound=%s not found
 MakeMovementsAndClose=Generate movements and close
 AutofillWithExpected=Fill real quantity with expected quantity
+ShowAllBatchByDefault=By default, show batch details on product "stock" tab
+CollapseBatchDetailHelp=You can set batch detail default display in stocks module configuration
+FieldCannotBeNegative=Field "%s" cannot be negative
diff --git a/htdocs/langs/zh_CN/ticket.lang b/htdocs/langs/zh_CN/ticket.lang
index 9546af9bd17..c203431c156 100644
--- a/htdocs/langs/zh_CN/ticket.lang
+++ b/htdocs/langs/zh_CN/ticket.lang
@@ -304,7 +304,7 @@ BoxLastModifiedTicket=最新修改的票据
 BoxLastModifiedTicketDescription=最新%s改装票据
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=没有最近修改的票据
-BoxTicketType=Number of open tickets by type
+BoxTicketType=Distribution of open tickets by type
 BoxTicketSeverity=Number of open tickets by severity
 BoxNoTicketSeverity=No tickets opened
 BoxTicketLastXDays=Number of new tickets by days the last %s days
diff --git a/htdocs/langs/zh_HK/accountancy.lang b/htdocs/langs/zh_HK/accountancy.lang
index 354cddb62c2..27be673dd9c 100644
--- a/htdocs/langs/zh_HK/accountancy.lang
+++ b/htdocs/langs/zh_HK/accountancy.lang
@@ -158,7 +158,7 @@ ACCOUNTING_LENGTH_AACCOUNT=Length of the third-party accounting accounts (If you
 ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of an accounting account. Needed by some countries (like Switzerland). If set to off (default), you can set the following two parameters to ask the application to add virtual zeros.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties, break ability to search on a part of value)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
@@ -328,6 +328,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountanc
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
+NotifiedExportDate=Notified export date (modification of the entries will not be possible)
+NotifiedValidationDate=Validation of the entries (modification or deletion of the entries will not be possible)
+ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=Export draft journal
 Modelcsv=Model of export
 Selectmodelcsv=Select a model of export
diff --git a/htdocs/langs/zh_HK/admin.lang b/htdocs/langs/zh_HK/admin.lang
index fb4513a09b4..be9aca94599 100644
--- a/htdocs/langs/zh_HK/admin.lang
+++ b/htdocs/langs/zh_HK/admin.lang
@@ -221,8 +221,8 @@ NotCompatible=This module does not seem compatible with your Dolibarr %s (Min %s
 CompatibleAfterUpdate=This module requires an update to your Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=See in Market place
 SeeSetupOfModule=See setup of module %s
+SetOptionTo=Set option <b>%s</b> to %s
 Updated=Updated
-Nouveauté=Novelty
 AchatTelechargement=Buy / Download
 GoModuleSetupArea=To deploy/install a new module, go to the Module setup area: <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
@@ -399,6 +399,7 @@ SecurityToken=Key to secure URLs
 NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
 PDF=PDF
 PDFDesc=Global options for PDF generation
+PDFOtherDesc=PDF Option specific to some modules
 PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
 PDFRulesForSalesTax=Rules for Sales Tax / VAT
@@ -561,7 +562,7 @@ Module53Desc=Management of Services
 Module54Name=Contracts/Subscriptions
 Module54Desc=Management of contracts (services or recurring subscriptions)
 Module55Name=Barcodes
-Module55Desc=Barcode management
+Module55Desc=Barcode or QR code management
 Module56Name=Payment by credit transfer
 Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
 Module57Name=Payments by Direct Debit
@@ -848,10 +849,10 @@ Permission402=Create/modify discounts
 Permission403=Validate discounts
 Permission404=Delete discounts
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries (yours and subordinates)
-Permission512=Create/modify payments of salaries
-Permission514=Delete payments of salaries
-Permission517=Read payments of salaries of everybody
+Permission511=Read salaries and payments (yours and subordinates)
+Permission512=Create/modify salaries and payments
+Permission514=Delete salaries and payments
+Permission517=Read salaries and payments everybody
 Permission519=Export salaries
 Permission520=Read Loans
 Permission522=Create/modify loans
@@ -965,6 +966,8 @@ Permission23003=Delete Scheduled job
 Permission23004=Execute Scheduled job
 Permission50101=Use Point of Sale (SimplePOS)
 Permission50151=Use Point of Sale (TakePOS)
+Permission50152=Edit sales lines
+Permission50153=Edit ordered sales lines
 Permission50201=Read transactions
 Permission50202=Import transactions
 Permission50330=Read objects of Zapier
@@ -1039,11 +1042,12 @@ DictionaryMeasuringUnits=Measuring Units
 DictionarySocialNetworks=Social Networks
 DictionaryProspectStatus=Prospect status for companies
 DictionaryProspectContactStatus=Prospect status for contacts
-DictionaryHolidayTypes=Types of leave
+DictionaryHolidayTypes=Leave - Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
 DictionaryTransportMode=Intracomm report - Transport mode
+DictionaryBatchStatus=Product lot/serial Quality Control status
 TypeOfUnit=Type of unit
 SetupSaved=Setup saved
 SetupNotSaved=Setup not saved
@@ -1187,7 +1191,7 @@ SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of m
 SetupDescription5=Other Setup menu entries manage optional parameters.
 AuditedSecurityEvents=Security events that are audited
 NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
-Audit=Audit
+Audit=Security events
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
 InfoOS=About OS
@@ -1319,9 +1323,12 @@ ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
 NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
+ComboListOptim=Combo list loading optimization
 SearchOptim=Search optimization
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
-YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
+YouHaveXObjectUseComboOptim=You have %s %s in the database. You can go into setup of module to enable loading of combo list on key pressed event.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other.
+YouHaveXObjectUseSearchOptimDesc=This limits the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to %s in Home-Setup-Other.
 BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
 BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
 PHPModuleLoaded=PHP component %s is loaded
@@ -1433,6 +1440,7 @@ MemberMainOptions=Main options
 AdherentLoginRequired= Manage a Login for each member
 AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
+MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
 MembersDocModules=Document templates for documents generated from member record
@@ -1763,7 +1771,7 @@ AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting men
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
-AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the scheduled job %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
@@ -1979,6 +1987,8 @@ 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_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add picture on proposal line
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add electronic sign in PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
@@ -2096,7 +2106,6 @@ PDF_SHOW_PROJECT=Show project on document
 ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
-FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
@@ -2120,12 +2129,18 @@ ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by
 MailToSendEventOrganization=Event Organization
 AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
 YouShouldDisablePHPFunctions=You should disable PHP functions
-IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands in custom code, you shoud disable PHP functions
+PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
+NotRecommended=Not recommanded
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
 ModuleUpdateAvailable=An update is available
 NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
+RandomlySelectedIfSeveral=Randomly selected if several pictures are available
+DatabasePasswordObfuscated=Database password is obfuscated in conf file
+DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
diff --git a/htdocs/langs/zh_HK/agenda.lang b/htdocs/langs/zh_HK/agenda.lang
index 09d82139a49..a1183841b00 100644
--- a/htdocs/langs/zh_HK/agenda.lang
+++ b/htdocs/langs/zh_HK/agenda.lang
@@ -4,7 +4,7 @@ Actions=Events
 Agenda=Agenda
 TMenuAgenda=Agenda
 Agendas=Agendas
-LocalAgenda=Internal calendar
+LocalAgenda=Default calendar
 ActionsOwnedBy=Event owned by
 ActionsOwnedByShort=Owner
 AffectedTo=Assigned to
@@ -14,13 +14,13 @@ EventsNb=Number of events
 ListOfActions=List of events
 EventReports=Event reports
 Location=Location
-ToUserOfGroup=Event assigned to any user in group
+ToUserOfGroup=Event assigned to any user in the group
 EventOnFullDay=Event on all day(s)
 MenuToDoActions=All incomplete events
 MenuDoneActions=All terminated events
 MenuToDoMyActions=My incomplete events
 MenuDoneMyActions=My terminated events
-ListOfEvents=List of events (internal calendar)
+ListOfEvents=List of events (default calendar)
 ActionsAskedBy=Events reported by
 ActionsToDoBy=Events assigned to
 ActionsDoneBy=Events done by
@@ -38,6 +38,7 @@ ActionsEvents=Events for which Dolibarr will create an action in agenda automati
 EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Third party %s created
+COMPANY_MODIFYInDolibarr=Third party %s modified
 COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=Contract %s validated
 CONTRACT_DELETEInDolibarr=Contract %s deleted
@@ -87,6 +88,7 @@ OrderDeleted=Order deleted
 InvoiceDeleted=Invoice deleted
 DraftInvoiceDeleted=Draft invoice deleted
 CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_MODIFYInDolibarr=Contact %s modified
 CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Product %s created
 PRODUCT_MODIFYInDolibarr=Product %s modified
@@ -119,6 +121,7 @@ MRP_MO_UNVALIDATEInDolibarr=MO set to draft status
 MRP_MO_PRODUCEDInDolibarr=MO produced
 MRP_MO_DELETEInDolibarr=MO deleted
 MRP_MO_CANCELInDolibarr=MO canceled
+PAIDInDolibarr=%s paid
 ##### End agenda events #####
 AgendaModelModule=Document templates for event
 DateActionStart=Start date
@@ -130,7 +133,7 @@ AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to use
 AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
 AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic events.
 AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> to include events of holidays.
-AgendaShowBirthdayEvents=Show birthdays of contacts
+AgendaShowBirthdayEvents=Birthdays of contacts
 AgendaHideBirthdayEvents=Hide birthdays of contacts
 Busy=Busy
 ExportDataset_event1=List of agenda events
@@ -152,6 +155,7 @@ ActionType=Event type
 DateActionBegin=Start event date
 ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b>?
 RepeatEvent=Repeat event
+OnceOnly=Once only
 EveryWeek=Every week
 EveryMonth=Every month
 DayOfMonth=Day of month
@@ -165,4 +169,4 @@ TimeType=Duration type
 ReminderType=Callback type
 AddReminder=Create an automatic reminder notification for this event
 ErrorReminderActionCommCreation=Error creating the reminder notification for this event
-BrowserPush=Browser Notification
+BrowserPush=Browser Popup Notification
diff --git a/htdocs/langs/zh_HK/bills.lang b/htdocs/langs/zh_HK/bills.lang
index c55f483873b..7b8c997d2e6 100644
--- a/htdocs/langs/zh_HK/bills.lang
+++ b/htdocs/langs/zh_HK/bills.lang
@@ -259,6 +259,7 @@ DateMaxPayment=Payment due on
 DateInvoice=Invoice date
 DatePointOfTax=Point of tax
 NoInvoice=No invoice
+NoOpenInvoice=No open invoice
 ClassifyBill=Classify invoice
 SupplierBillsToPay=Unpaid vendor invoices
 CustomerBillsUnpaid=Unpaid customer invoices
@@ -589,3 +590,4 @@ FacParentLine=Invoice Line Parent
 SituationTotalRayToRest=Remainder to pay without taxe
 PDFSituationTitle=Situation n° %d
 SituationTotalProgress=Total progress %d %%
+SearchUnpaidInvoicesWithDueDate=Search unpaid invoices with a due date = %s
diff --git a/htdocs/langs/zh_HK/cashdesk.lang b/htdocs/langs/zh_HK/cashdesk.lang
index 240503842f3..aea1f02f834 100644
--- a/htdocs/langs/zh_HK/cashdesk.lang
+++ b/htdocs/langs/zh_HK/cashdesk.lang
@@ -102,7 +102,7 @@ CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal numb
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
 SaleStartedAt=Sale started at %s
-ControlCashOpening=Control cash popup at opening POS
+ControlCashOpening=Open the "Control cash" popup when opening the POS
 CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -126,5 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
-ShowPriceHT = Display the price excluding tax column
-ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
+ShowPriceHT = Display the column with the price excluding tax (on screen)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
diff --git a/htdocs/langs/zh_HK/compta.lang b/htdocs/langs/zh_HK/compta.lang
index 7cae82e6ac7..8329346c163 100644
--- a/htdocs/langs/zh_HK/compta.lang
+++ b/htdocs/langs/zh_HK/compta.lang
@@ -286,3 +286,9 @@ ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
 IncludeLoansInResults = Include loans in reports
+InvoiceLate30Days = Invoices late > 30 days
+InvoiceLate15Days = Invoices late > 15 days
+InvoiceLateMinus15Days = Invoices late
+InvoiceNotLate = To be collected < 15 days
+InvoiceNotLate15Days = To be collected in 15 days
+InvoiceNotLate30Days = To be collected in 30 days
diff --git a/htdocs/langs/zh_HK/cron.lang b/htdocs/langs/zh_HK/cron.lang
index 2ebdda1e685..4fd2220dea6 100644
--- a/htdocs/langs/zh_HK/cron.lang
+++ b/htdocs/langs/zh_HK/cron.lang
@@ -60,7 +60,7 @@ CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
 CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Disable
-CronTaskInactive=This job is disabled
+CronTaskInactive=This job is disabled (not scheduled)
 CronId=Id
 CronClassFile=Filename with class
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example 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>
diff --git a/htdocs/langs/zh_HK/errors.lang b/htdocs/langs/zh_HK/errors.lang
index 9b14b5ad1d2..670f8c7a6bc 100644
--- a/htdocs/langs/zh_HK/errors.lang
+++ b/htdocs/langs/zh_HK/errors.lang
@@ -11,6 +11,7 @@ ErrorBadValueForParamNotAString=Bad value for your parameter. It appends general
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s already exists.
 ErrorGroupAlreadyExists=Group %s already exists.
+ErrorEmailAlreadyExists=Email %s already exists.
 ErrorRecordNotFound=Record not found.
 ErrorFailToCopyFile=Failed to copy file '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
@@ -117,7 +118,7 @@ ErrorCantReadFile=Failed to read file '%s'
 ErrorCantReadDir=Failed to read directory '%s'
 ErrorBadLoginPassword=Bad value for login or password
 ErrorLoginDisabled=Your account has been disabled
-ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server. If PHP <b>Safe Mode</b> is enabled, check that command is inside a directory defined by parameter <b>safe_mode_exec_dir</b>.
+ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server user. Check also the command is not protected on shell level by a security layer like apparmor.
 ErrorFailedToChangePassword=Failed to change password
 ErrorLoginDoesNotExists=User with login <b>%s</b> could not be found.
 ErrorLoginHasNoEmail=This user has no email address. Process aborted.
@@ -262,6 +263,7 @@ ErrorDateIsInFuture=Error, the date can't be in the future
 ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
 ErrorAPercentIsRequired=Error, please fill in the percentage correctly
 ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
+ErrorFailedToFindEmailTemplate=Failed to find template with code name %s
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -298,3 +300,4 @@ WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So y
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
+ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
diff --git a/htdocs/langs/zh_HK/eventorganization.lang b/htdocs/langs/zh_HK/eventorganization.lang
index 75b798fbc3a..335c257b224 100644
--- a/htdocs/langs/zh_HK/eventorganization.lang
+++ b/htdocs/langs/zh_HK/eventorganization.lang
@@ -1,4 +1,5 @@
 # Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+# Copyright (C) 2021		Dorian Vabre			<dorian.vabre@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
@@ -81,7 +82,10 @@ PriceOfBoothHelp=Subscription price to stand a booth
 EventOrganizationICSLink=Link ICS for events
 ConferenceOrBoothInformation=Conference Or Booth informations
 Attendees = Attendees
+DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
 #
 # Status
 #
@@ -94,8 +98,46 @@ EvntOrgCancelled = Cancelled
 #
 # Public page
 #
+SuggestForm = Suggestion page
+RegisterPage = Page for conferences or booth
+EvntOrgRegistrationHelpMessage = Here, you can vote for an event, or suggest a new conference or booth for the project
+EvntOrgRegistrationConfHelpMessage = Here, you can suggest a new conference for the project
+EvntOrgRegistrationBoothHelpMessage = Here, you can suggest a new booth for the project
+ListOfSuggestedConferences = List of suggested conferences
+ListOfSuggestedBooths = List of suggested booths
+SuggestConference = Suggest a new conference
+SuggestBooth = Suggest a booth
+ViewAndVote = View and vote for suggested events
 PublicAttendeeSubscriptionPage = Public link of registration to a conference
 MissingOrBadSecureKey = The security key is invalid or missing
-EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
-EvntOrgStartDuration = This conference starts on
-EvntOrgEndDuration =  and ends on
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference : '%s'
+EvntOrgDuration = This conference starts on %s and ends on %s.
+ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
+BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
+EventType = Event type
+
+#
+# Vote page
+#
+EvntOrgRegistrationWelcomeMessage = Welcome on the conference or booth suggestion page.
+EvntOrgRegistrationConfWelcomeMessage = Welcome on the conference suggestion page.
+EvntOrgRegistrationBoothWelcomeMessage = Welcome on the booth suggestion page.
+EvntOrgVoteHelpMessage = Here, you can view and vote for the suggested events for the project
+VoteOk = Your vote has been accepted.
+AlreadyVoted = You have already voted for this event.
+VoteError = An error has occurred during the vote, please try again.
+
+#
+# SubscriptionOk page
+#
+SubscriptionOk = Your subscription to this conference has been validated
+#
+# Subscription validation mail
+#
+ConfAttendeeSubscriptionConfirmation = Confirmation of your subscription to a conference
+#
+# Payment page
+#
+Attendee = Attendee
+PaymentConferenceAttendee = Conference attendee payment
+PaymentBoothLocation = Booth location payment
diff --git a/htdocs/langs/zh_HK/hrm.lang b/htdocs/langs/zh_HK/hrm.lang
index 3b8f137e103..da098e10bdb 100644
--- a/htdocs/langs/zh_HK/hrm.lang
+++ b/htdocs/langs/zh_HK/hrm.lang
@@ -9,7 +9,7 @@ ConfirmDeleteEstablishment=Are you sure you wish to delete this establishment?
 OpenEtablishment=Open establishment
 CloseEtablishment=Close establishment
 # Dictionary
-DictionaryPublicHolidays=HRM - Public holidays
+DictionaryPublicHolidays=Leave - Public holidays
 DictionaryDepartment=HRM - Department list
 DictionaryFunction=HRM - Job positions
 # Module
diff --git a/htdocs/langs/zh_HK/knowledgemanagement.lang b/htdocs/langs/zh_HK/knowledgemanagement.lang
index 269007e60f8..68f5cced76c 100644
--- a/htdocs/langs/zh_HK/knowledgemanagement.lang
+++ b/htdocs/langs/zh_HK/knowledgemanagement.lang
@@ -47,7 +47,7 @@ KnowledgeManagementArea = Knowledge Management
 # Menu
 #
 MenuKnowledgeRecord = Knowledge base
-ListOfArticles = List of articles
+ListKnowledgeRecord = List of articles
 NewKnowledgeRecord = New article
 ValidateReply = Validate solution
 KnowledgeRecords = Articles
diff --git a/htdocs/langs/zh_HK/languages.lang b/htdocs/langs/zh_HK/languages.lang
index ba187326705..da8ad5376a1 100644
--- a/htdocs/langs/zh_HK/languages.lang
+++ b/htdocs/langs/zh_HK/languages.lang
@@ -3,6 +3,7 @@ Language_am_ET=Ethiopian
 Language_ar_AR=Arabic
 Language_ar_EG=Arabic (Egypt)
 Language_ar_SA=Arabic
+Language_ar_TN=Arabic (Tunisia)
 Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengali
 Language_bn_IN=Bengali (India)
@@ -84,6 +85,7 @@ Language_nl_NL=Dutch
 Language_pl_PL=Polish
 Language_pt_BR=Portuguese (Brazil)
 Language_pt_PT=Portuguese
+Language_ro_MD=Romanian (Moldavia)
 Language_ro_RO=Romanian
 Language_ru_RU=Russian
 Language_ru_UA=Russian (Ukraine)
diff --git a/htdocs/langs/zh_HK/main.lang b/htdocs/langs/zh_HK/main.lang
index 13793aad13f..863b94af564 100644
--- a/htdocs/langs/zh_HK/main.lang
+++ b/htdocs/langs/zh_HK/main.lang
@@ -430,6 +430,7 @@ LT1IN=CGST
 LT2IN=SGST
 LT1GC=Additionnal cents
 VATRate=Tax Rate
+RateOfTaxN=Rate of tax %s
 VATCode=Tax Rate code
 VATNPR=Tax Rate NPR
 DefaultTaxRate=Default tax rate
@@ -729,6 +730,7 @@ MenuMembers=Members
 MenuAgendaGoogle=Google agenda
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
+ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
 NoFileFound=No documents uploaded
 CurrentUserLanguage=Current language
 CurrentTheme=Current theme
@@ -1072,6 +1074,7 @@ ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
 ToClose=To close
+ToRefuse=To refuse
 ToProcess=To process
 ToApprove=To approve
 GlobalOpenedElemView=Global view
@@ -1126,9 +1129,11 @@ UpdateForAllLines=Update for all lines
 OnHold=On hold
 Civility=Civility
 AffectTag=Affect Tag
+CreateExternalUser=Create external user
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
 ConfirmCancel=Are you sure you want to cancel
+EmailMsgID=Email MsgID
diff --git a/htdocs/langs/zh_HK/members.lang b/htdocs/langs/zh_HK/members.lang
index 042b85598c0..d8b9c2f59f3 100644
--- a/htdocs/langs/zh_HK/members.lang
+++ b/htdocs/langs/zh_HK/members.lang
@@ -213,3 +213,5 @@ SendReminderForExpiredSubscription=Send reminder by email to members when subscr
 MembershipPaid=Membership paid for current period (until %s)
 YouMayFindYourInvoiceInThisEmail=You may find your invoice attached to this email
 XMembersClosed=%s member(s) closed
+XExternalUserCreated=%s external user(s) created
+ForceMemberNature=Force member nature (Individual or Corporation)
diff --git a/htdocs/langs/zh_HK/modulebuilder.lang b/htdocs/langs/zh_HK/modulebuilder.lang
index 9fdaa1a533a..23a098be2e5 100644
--- a/htdocs/langs/zh_HK/modulebuilder.lang
+++ b/htdocs/langs/zh_HK/modulebuilder.lang
@@ -143,3 +143,4 @@ AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
 ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
+ImportExportProfiles=Import and export profiles
diff --git a/htdocs/langs/zh_HK/mrp.lang b/htdocs/langs/zh_HK/mrp.lang
index ec999a473a4..2414a92cefb 100644
--- a/htdocs/langs/zh_HK/mrp.lang
+++ b/htdocs/langs/zh_HK/mrp.lang
@@ -8,12 +8,12 @@ MenuBOM=Bills of material
 LatestBOMModified=Latest %s Bills of materials modified
 LatestMOModified=Latest %s Manufacturing Orders modified
 Bom=Bills of Material
-BillOfMaterials=Bill of Material
+BillOfMaterials=Bill of Materials
 BOMsSetup=Setup of module BOM
 ListOfBOMs=List of bills of material - BOM
 ListOfManufacturingOrders=List of Manufacturing Orders
-NewBOM=New bill of material
-ProductBOMHelp=Product to create with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
+NewBOM=New bill of materials
+ProductBOMHelp=Product to create (or disassemble) with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
 BOMsNumberingModules=BOM numbering templates
 BOMsModelModule=BOM document templates
 MOsNumberingModules=MO numbering templates
@@ -22,7 +22,7 @@ FreeLegalTextOnBOMs=Free text on document of BOM
 WatermarkOnDraftBOMs=Watermark on draft BOM
 FreeLegalTextOnMOs=Free text on document of MO
 WatermarkOnDraftMOs=Watermark on draft MO
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials %s ?
 ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
 ManufacturingEfficiency=Manufacturing efficiency
 ConsumptionEfficiency=Consumption efficiency
@@ -30,8 +30,8 @@ ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the produc
 ValueOfMeansLossForProductProduced=Value of 0.95 means an average of 5%% of loss of produced product
 DeleteBillOfMaterials=Delete Bill Of Materials
 DeleteMo=Delete Manufacturing Order
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Materials?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Materials?
 MenuMRP=Manufacturing Orders
 NewMO=New Manufacturing Order
 QtyToProduce=Qty to produce
@@ -39,7 +39,7 @@ DateStartPlannedMo=Date start planned
 DateEndPlannedMo=Date end planned
 KeepEmptyForAsap=Empty means 'As Soon As Possible'
 EstimatedDuration=Estimated duration
-EstimatedDurationDesc=Estimated duration to manufacture this product using this BOM
+EstimatedDurationDesc=Estimated duration to manufacture (or disassemble) this product using this BOM
 ConfirmValidateBom=Are you sure you want to validate the BOM with the reference <strong>%s</strong> (you will be able to use it to build new Manufacturing Orders)
 ConfirmCloseBom=Are you sure you want to cancel this BOM (you won't be able to use it to build new Manufacturing Orders anymore) ?
 ConfirmReopenBom=Are you sure you want to re-open this BOM (you will be able to use it to build new Manufacturing Orders)
@@ -63,13 +63,14 @@ ConsumeAndProduceAll=Consume and Produce All
 Manufactured=Manufactured
 TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
 ForAQuantityOf=For a quantity to produce of %s
+ForAQuantityToConsumeOf=For a quantity to disassemble of %s
 ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
 ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
 ProductionForRef=Production of %s
 AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
 NoStockChangeOnServices=No stock change on services
 ProductQtyToConsumeByMO=Product quantity still to consume by open MO
-ProductQtyToProduceByMO=Product quentity still to produce by open MO
+ProductQtyToProduceByMO=Product quantity still to produce by open MO
 AddNewConsumeLines=Add new line to consume
 ProductsToConsume=Products to consume
 ProductsToProduce=Products to produce
@@ -83,15 +84,13 @@ Workstations=Workstations
 WorkstationsDescription=Workstations management
 WorkstationSetup = Workstations setup
 WorkstationSetupPage = Workstations setup page
-WorkstationAbout = About Workstation
-WorkstationAboutPage = Workstations about page
 WorkstationList=Workstation list
 WorkstationCreate=Add new workstation
 ConfirmEnableWorkstation=Are you sure you want to enable workstation <b>%s</b> ?
 EnableAWorkstation=Enable a workstation
 ConfirmDisableWorkstation=Are you sure you want to disable workstation <b>%s</b> ?
 DisableAWorkstation=Disable a workstation
-DeleteWorkstation=Supprimer
+DeleteWorkstation=Delete
 NbOperatorsRequired=Number of operators required
 THMOperatorEstimated=Estimated operator THM
 THMMachineEstimated=Estimated machine THM
diff --git a/htdocs/langs/zh_HK/orders.lang b/htdocs/langs/zh_HK/orders.lang
index 87d196eb22f..5dab5b99bf1 100644
--- a/htdocs/langs/zh_HK/orders.lang
+++ b/htdocs/langs/zh_HK/orders.lang
@@ -11,6 +11,7 @@ OrderDate=Order date
 OrderDateShort=Order date
 OrderToProcess=Order to process
 NewOrder=New order
+NewSupplierOrderShort=New order
 NewOrderSupplier=New Purchase Order
 ToOrder=Make order
 MakeOrder=Make order
@@ -73,6 +74,7 @@ DeleteOrder=Delete order
 CancelOrder=Cancel order
 OrderReopened= Order %s re-open
 AddOrder=Create order
+AddSupplierOrderShort=Create order
 AddPurchaseOrder=Create purchase order
 AddToDraftOrders=Add to draft order
 ShowOrder=Show order
diff --git a/htdocs/langs/zh_HK/other.lang b/htdocs/langs/zh_HK/other.lang
index 95297a98859..bb35099ab82 100644
--- a/htdocs/langs/zh_HK/other.lang
+++ b/htdocs/langs/zh_HK/other.lang
@@ -129,6 +129,7 @@ ClosedByLogin=User login who closed
 FileWasRemoved=File %s was removed
 DirWasRemoved=Directory %s was removed
 FeatureNotYetAvailable=Feature not yet available in the current version
+FeatureNotAvailableOnDevicesWithoutMouse=Feature not available on devices without mouse
 FeaturesSupported=Supported features
 Width=Width
 Height=Height
@@ -263,7 +264,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
-PrefixSession=Prefix for session ID
+SuffixSessionName=Suffix for session name
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/zh_HK/partnership.lang b/htdocs/langs/zh_HK/partnership.lang
index 09059995a8d..2fb10e8159e 100644
--- a/htdocs/langs/zh_HK/partnership.lang
+++ b/htdocs/langs/zh_HK/partnership.lang
@@ -16,41 +16,72 @@
 #
 # Generic
 #
-ModulePartnershipName = Partnership management
-PartnershipDescription = Module Partnership management
+ModulePartnershipName=Partnership management
+PartnershipDescription=Module Partnership management
 PartnershipDescriptionLong= Module Partnership management
 
+AddPartnership=Add partnership
+CancelPartnershipForExpiredMembers=Partnership: Cancel partnership of members with expired subscriptions
+PartnershipCheckBacklink=Partnership: Check referring backlink
+
 #
 # Menu
 #
-NewPartnership = New Partnership
-ListOfPartnerships = List of partnership
+NewPartnership=New Partnership
+ListOfPartnerships=List of partnership
 
 #
 # Admin page
 #
-PartnershipSetup = Partnership setup
-PartnershipAbout = About Partnership
-PartnershipAboutPage = Partnership about page
-
+PartnershipSetup=Partnership setup
+PartnershipAbout=About Partnership
+PartnershipAboutPage=Partnership about page
+partnershipforthirdpartyormember=Partner status must be set on a 'thirdparty' or a 'member'
+PARTNERSHIP_IS_MANAGED_FOR=Partnership managed for
+PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks to check
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb of days before cancelling status of a partnership when a subscription has expired
+ReferingWebsiteCheck=Check of website referring
+ReferingWebsiteCheckDesc=You can enable a feature to check that your partners has added a backlink to your website domains on their own website.
 
 #
 # Object
 #
+DeletePartnership=Delete a partnership
+PartnershipDedicatedToThisThirdParty=Partnership dedicated to this third party
+PartnershipDedicatedToThisMember=Partnership dedicated to this member
 DatePartnershipStart=Start date
 DatePartnershipEnd=End date
+ReasonDecline=Decline reason
+ReasonDeclineOrCancel=Decline reason
+PartnershipAlreadyExist=Partnership already exist
+ManagePartnership=Manage partnership
+BacklinkNotFoundOnPartnerWebsite=Backlink not found on partner website
+ConfirmClosePartnershipAsk=Are you sure you want to cancel this partnership?
+PartnershipType=Partnership type
 
 #
 # Template Mail
 #
+SendingEmailOnPartnershipWillSoonBeCanceled=Partnership will soon be canceled
+SendingEmailOnPartnershipRefused=Partnership refused
+SendingEmailOnPartnershipAccepted=Partnership accepted
+SendingEmailOnPartnershipCanceled=Partnership canceled
 
+YourPartnershipWillSoonBeCanceledTopic=Partnership will soon be canceled
+YourPartnershipRefusedTopic=Partnership refused
+YourPartnershipAcceptedTopic=Partnership accepted
+YourPartnershipCanceledTopic=Partnership canceled
+
+YourPartnershipWillSoonBeCanceledContent=We inform you that your partnership will soon be canceled (Backlink not found)
+YourPartnershipRefusedContent=We inform you that your partnership request has been refused.
+YourPartnershipAcceptedContent=We inform you that your partnership request has been accepted.
+YourPartnershipCanceledContent=We inform you that your partnership has been canceled.
 
 #
 # Status
 #
-PartnershipDraft = Draft
-PartnershipAccepted = Accepted
-PartnershipRefused = Refused
-PartnershipCanceled = Canceled
-
+PartnershipDraft=Draft
+PartnershipAccepted=Accepted
+PartnershipRefused=Refused
+PartnershipCanceled=Canceled
 PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/zh_HK/productbatch.lang b/htdocs/langs/zh_HK/productbatch.lang
index ad2db658e2e..450d0285819 100644
--- a/htdocs/langs/zh_HK/productbatch.lang
+++ b/htdocs/langs/zh_HK/productbatch.lang
@@ -1,4 +1,4 @@
-# ProductBATCH language file - en_US - ProductBATCH
+# ProductBATCH language file - Source file is en_US - ProductBATCH
 ManageLotSerial=Use lot/serial number
 ProductStatusOnBatch=Yes (lot required)
 ProductStatusOnSerial=Yes (unique serial number required)
@@ -33,3 +33,13 @@ CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+LifeTime=Life span (in days)
+EndOfLife=End of life
+ManufacturingDate=Manufacturing date
+DestructionDate=Destruction date
+FirstUseDate=First use date
+QCFrequency=Quality control frequency (in days)
+
+#Traceability - qc status
+OutOfOrder=Out of order
+InWorkingOrder=In working order
diff --git a/htdocs/langs/zh_HK/products.lang b/htdocs/langs/zh_HK/products.lang
index 0875be0dc07..9638dfe5a25 100644
--- a/htdocs/langs/zh_HK/products.lang
+++ b/htdocs/langs/zh_HK/products.lang
@@ -396,3 +396,5 @@ ActionAvailableOnVariantProductOnly=Action only available on the variant of prod
 ProductsPricePerCustomer=Product prices per customers
 ProductSupplierExtraFields=Additional Attributes (Supplier Prices)
 DeleteLinkedProduct=Delete the child product linked to the combination
+PMPValue=Weighted average price
+PMPValueShort=WAP
diff --git a/htdocs/langs/zh_HK/projects.lang b/htdocs/langs/zh_HK/projects.lang
index 79c974f6e24..6c96fadb5c1 100644
--- a/htdocs/langs/zh_HK/projects.lang
+++ b/htdocs/langs/zh_HK/projects.lang
@@ -267,9 +267,11 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=New invoice
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+OneLinePerTimeSpentLine=One line for each time spent declaration
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
 AddPersonToTask=Add also to tasks
 UsageOrganizeEvent=Usage: Event Organization
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
+SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
diff --git a/htdocs/langs/zh_HK/receptions.lang b/htdocs/langs/zh_HK/receptions.lang
index 760ff884fa0..338602e722e 100644
--- a/htdocs/langs/zh_HK/receptions.lang
+++ b/htdocs/langs/zh_HK/receptions.lang
@@ -44,4 +44,4 @@ ValidateOrderFirstBeforeReception=You must first validate the order before being
 ReceptionsNumberingModules=Numbering module for receptions
 ReceptionsReceiptModel=Document templates for receptions
 NoMorePredefinedProductToDispatch=No more predefined products to dispatch
-
+ReceptionExist=A reception exists
diff --git a/htdocs/langs/zh_HK/stocks.lang b/htdocs/langs/zh_HK/stocks.lang
index 9ec523427b1..d39791932a3 100644
--- a/htdocs/langs/zh_HK/stocks.lang
+++ b/htdocs/langs/zh_HK/stocks.lang
@@ -56,8 +56,6 @@ UnitPurchaseValue=Unit purchase price
 StockTooLow=Stock too low
 StockLowerThanLimit=Stock lower than alert limit (%s)
 EnhancedValue=Value
-PMPValue=Weighted average price
-PMPValueShort=WAP
 EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
@@ -251,7 +249,10 @@ SelectAStockMovementFileToImport=select a stock movement file to import
 InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
 LabelOfInventoryMovemement=Inventory %s
 ReOpen=Reopen
-ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock to the real qty you entered into the inventory.
 ObjectNotFound=%s not found
 MakeMovementsAndClose=Generate movements and close
 AutofillWithExpected=Fill real quantity with expected quantity
+ShowAllBatchByDefault=By default, show batch details on product "stock" tab
+CollapseBatchDetailHelp=You can set batch detail default display in stocks module configuration
+FieldCannotBeNegative=Field "%s" cannot be negative
diff --git a/htdocs/langs/zh_HK/ticket.lang b/htdocs/langs/zh_HK/ticket.lang
index df73daf4a0d..1da32a5a99e 100644
--- a/htdocs/langs/zh_HK/ticket.lang
+++ b/htdocs/langs/zh_HK/ticket.lang
@@ -304,7 +304,7 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
-BoxTicketType=Number of open tickets by type
+BoxTicketType=Distribution of open tickets by type
 BoxTicketSeverity=Number of open tickets by severity
 BoxNoTicketSeverity=No tickets opened
 BoxTicketLastXDays=Number of new tickets by days the last %s days
diff --git a/htdocs/langs/zh_TW/accountancy.lang b/htdocs/langs/zh_TW/accountancy.lang
index b7e0039de20..16603c5910a 100644
--- a/htdocs/langs/zh_TW/accountancy.lang
+++ b/htdocs/langs/zh_TW/accountancy.lang
@@ -158,7 +158,7 @@ ACCOUNTING_LENGTH_AACCOUNT=合作方會計帳戶的長度（如果在此處將
 ACCOUNTING_MANAGE_ZERO=允許在會計帳戶末尾管理不同數量的零。一些國家（例如瑞士）需要。如果設置為off（默認），則可以設置以下兩個參數來要求應用程序添加虛擬零。
 BANK_DISABLE_DIRECT_INPUT=停用銀行帳戶中直接記錄交易
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=在日記帳上啟用草稿匯出
-ACCOUNTANCY_COMBO_FOR_AUX=為子公司帳戶啟用組合列表（如果您有很多合作方，可能會很慢）
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties, break ability to search on a part of value)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
@@ -328,6 +328,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountanc
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
+NotifiedExportDate=Notified export date (modification of the entries will not be possible)
+NotifiedValidationDate=Validation of the entries (modification or deletion of the entries will not be possible)
+ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=匯出日記帳草稿
 Modelcsv=匯出模式
 Selectmodelcsv=選擇匯出模型
diff --git a/htdocs/langs/zh_TW/admin.lang b/htdocs/langs/zh_TW/admin.lang
index f8ad1094586..d7d1e9d7cf5 100644
--- a/htdocs/langs/zh_TW/admin.lang
+++ b/htdocs/langs/zh_TW/admin.lang
@@ -63,8 +63,8 @@ IfModuleEnabled=註：若模組<b>%s</b>啓用時，「是的」有效。
 RemoveLock=如果存在<b>%s</b>檔案,刪除/重新命名文件以允許使用更新/安裝工具。
 RestoreLock=還原檔案唯讀權限檔案<b>%s</b> ，以禁止使用更新/安裝工具。
 SecuritySetup=安全設定
-PHPSetup=PHP setup
-OSSetup=OS setup
+PHPSetup=PHP 設定
+OSSetup=OS 設定
 SecurityFilesDesc=在此定義上傳檔案相關的安全設定。
 ErrorModuleRequirePHPVersion=錯誤，這個模組需要的PHP版本是 %s 或更高版本
 ErrorModuleRequireDolibarrVersion=錯誤，這個模組需要 Dolibarr 版本 %s 或更高版本
@@ -157,7 +157,7 @@ SystemToolsAreaDesc=此區域提供管理功能。使用選單選擇所需的功
 Purge=清除
 PurgeAreaDesc=此頁面允許您刪除Dolibarr產生或儲存的所有文件（暫存檔案或<b>%s</b>目錄中的所有文件）。通常不需要使用此功能。此功能提供無權限刪除Web服務器產生之文件的Dolibarr用戶提供了一種解決方法。
 PurgeDeleteLogFile=刪除 log 檔案，包含Syslog 模組的 <b>%s</b> (沒有遺失資料風險)
-PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Parameter can be 'tempfilesold', 'logfiles' or both 'tempfilesold+logfiles'. Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFiles=刪除所有日誌與暫存檔案（沒有丟失資料的風險）。 參數可以是“tempfilesold”、“logfiles”或兩者“tempfilesold+logfiles”。 注意：只有在 24 小時之前所建立的臨時目錄，才會刪除臨時文件。
 PurgeDeleteTemporaryFilesShort=刪除紀錄和暫存檔案
 PurgeDeleteAllFilesInDocumentsDir=刪除資料夾中的所有檔案： <b>%s</b> 。 <br>這將刪除所有與元件（合作方，發票等）相關的所有產生文件，上傳到ECM模組中的檔案，資料庫備份轉存和臨時文件。
 PurgeRunNow=立即清除
@@ -221,8 +221,8 @@ NotCompatible=此模組似乎不相容您 Dolibarr %s (適用最低版本 %s - 
 CompatibleAfterUpdate=此模組需要升級您的 Dolibarr %s (最低版本%s -最高版本 %s)。
 SeeInMarkerPlace=在市場可以看到
 SeeSetupOfModule=請參閱模組%s的設定
+SetOptionTo=Set option <b>%s</b> to %s
 Updated=升級
-Nouveauté=新奇
 AchatTelechargement=購買 / 下載
 GoModuleSetupArea=要部署/安裝新模組，請前往模組設定區域： <a href="%s">%s</a> 。
 DoliStoreDesc=DoliStore 是 Dolibarr ERP / CRM 外部模組的官方市集
@@ -235,7 +235,7 @@ BoxesAvailable=可用小工具
 BoxesActivated=小工具已啟用
 ActivateOn=啟用
 ActiveOn=已啟用
-ActivatableOn=Activatable on
+ActivatableOn=可啟用在
 SourceFile=來源檔案
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=僅當 JavaScript 不是停用時可用
 Required=必須
@@ -351,7 +351,7 @@ LastActivationAuthor=最新啟動的作者
 LastActivationIP=最新啟動的 IP
 UpdateServerOffline=離線更新伺服器
 WithCounter=管理計數器
-GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first %s. <br><b>{000000@x}</b> same as the previous one but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then the sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
+GenericMaskCodes=您可以輸入任何編號遮罩。在此遮罩中，可以使用以下標籤： <br> <b>{000000}</b>對應一個數字，該數字將在每個%s上遞增。輸入與計數器所需長度一樣多的零。計數器將從左側的零開始補全，以便具有與遮罩一樣多的零。 <br> <b>{000000+000}</b>與上一個相同，但是從第一個%s開始應用與+號右邊的數字相對應的偏移量。 <br> <b>{000000 @ x}</b>與上一個相同，但是當到達月份x時，計數器會重置為零（x在1到12之間，或者為0以使用您配置中定義的會計年度的前幾個月，或者為99每月重置為零）。如果使用此選項並且x為2或更高，則還需要序列{yy} {mm}或{yyyy} {mm}。 <br> <b>{dd}</b>天（01到31）。 <br> <b>{mm}</b>月（01到12）。 <br> <b>{yy}</b> ， <b>{yyyy}</b>或<b>{y}</b>年超過2、4或1個數字。 <br>
 GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated to the customer. This counter dedicated to customer is reset at same time as the global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=遮罩中的所有其他字元將保持不變。 <br>不允許使用空格。 <br>
 GenericMaskCodes3EAN=All other characters in the mask will remain intact (except * or ? in 13th position in EAN13).<br>Spaces are not allowed.<br>In EAN13, the last character after the last } in 13th position should be * or ? . It will be replaced by the calculated key.<br>
@@ -399,6 +399,7 @@ SecurityToken=安全的網址的金鑰
 NoSmsEngine=沒有可用的簡訊發送管理器.由於依賴於外部供應商,所以預設發布版本未安裝簡訊發送管理器，但是您可以在%s上找到它們。
 PDF=PDF格式
 PDFDesc=生成PDF 的全域選項
+PDFOtherDesc=PDF Option specific to some modules
 PDFAddressForging=規則給地址的部分
 HideAnyVATInformationOnPDF=隱藏與銷售稅/營業稅相關的所有訊息
 PDFRulesForSalesTax=銷售稅 / 營業稅規則
@@ -561,7 +562,7 @@ Module53Desc=服務管理
 Module54Name=合約/訂閱
 Module54Desc=合約管理（服務或定期訂閱）
 Module55Name=條碼
-Module55Desc=條碼管理
+Module55Desc=Barcode or QR code management
 Module56Name=信用轉帳付款
 Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
 Module57Name=銀行直接轉帳付款
@@ -848,10 +849,10 @@ Permission402=建立/修改折扣
 Permission403=驗證折扣
 Permission404=刪除折扣
 Permission430=使用除錯欄
-Permission511=讀取薪資支付（您和您的下屬）
-Permission512=建立/修改薪水支付
-Permission514=刪除薪水支付
-Permission517=讀取每個人的薪資支付
+Permission511=Read salaries and payments (yours and subordinates)
+Permission512=Create/modify salaries and payments
+Permission514=Delete salaries and payments
+Permission517=Read salaries and payments everybody
 Permission519=匯出薪水
 Permission520=讀取借款
 Permission522=建立/修改借款
@@ -965,6 +966,8 @@ Permission23003=刪除預定工作
 Permission23004=執行預定工作
 Permission50101=使用銷售點（SimplePOS）
 Permission50151=使用銷售點（TakePOS）
+Permission50152=編輯銷售行數
+Permission50153=編輯已訂購銷售行數
 Permission50201=讀取交易
 Permission50202=匯入交易
 Permission50330=讀取Zapier的物件
@@ -1039,11 +1042,12 @@ DictionaryMeasuringUnits=計算單位
 DictionarySocialNetworks=社群網路
 DictionaryProspectStatus=公司的潛在狀態
 DictionaryProspectContactStatus=聯絡人的潛在狀態
-DictionaryHolidayTypes=休假類型
+DictionaryHolidayTypes=離職 - 離職類型
 DictionaryOpportunityStatus=專案/潛在的潛在狀態
 DictionaryExpenseTaxCat=費用報表 -交通類別
 DictionaryExpenseTaxRange=費用報表 - 依交通類別劃分範圍
 DictionaryTransportMode=通訊報告-傳送模式
+DictionaryBatchStatus=Product lot/serial Quality Control status
 TypeOfUnit=單位類型
 SetupSaved=設定已儲存
 SetupNotSaved=設定未儲存
@@ -1185,9 +1189,9 @@ SetupDescription2=以下兩個部分是必需的（“設定”選單中的前
 SetupDescription3= <a href="%s"> %s-> %s </a> <br> <br>用於自訂您的應用程式預設行為的基本參數（例如 跟國家相關的功能）。
 SetupDescription4= <a href="%s"> %s-> %s </a> <br> <br>此軟體是許多模組/應用程式的套件。必須啟用和配置與您的需求相關的模組。這些模組啟動後將會顯示在選單上。
 SetupDescription5=其他設定選單項目管理可選參數。
-AuditedSecurityEvents=Security events that are audited
-NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
-Audit=稽核
+AuditedSecurityEvents=已審計的安全性事件
+NoSecurityEventsAreAduited=無已審計的安全性事件。您可以啟用從選單 %s
+Audit=Security events
 InfoDolibarr=關於 Dolibarr
 InfoBrowser=關於瀏覽器
 InfoOS=關於作業系統
@@ -1319,9 +1323,12 @@ ConditionIsCurrently=目前情況 %s
 YouUseBestDriver=您使用的驅動程式%s是目前的最佳驅動程式。
 YouDoNotUseBestDriver=您使用驅動程式%s，但建議使用驅動程式%s。
 NbOfObjectIsLowerThanNoPb=您的資料庫中有%s %s。這不需要任何特定的優化。
+ComboListOptim=組合清單載入優化
 SearchOptim=搜尋最佳化
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
-YouHaveXObjectAndSearchOptimOn=您在資料庫中具有%s %s，並且在首頁-設定-其他中，常數%s設定為1。
+YouHaveXObjectUseComboOptim=您有 %s %s 在資料庫內。您可以進入模組設定以啟用在按鍵事件上加載組合清單。
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other.
+YouHaveXObjectUseSearchOptimDesc=This limits the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to %s in Home-Setup-Other.
 BrowserIsOK=您正在使用%s 網頁瀏覽器。此瀏覽器可以確保安全性和性能。
 BrowserIsKO=您正在使用%s 網頁瀏覽器。眾所周知，此瀏覽器是安全性，性能和可靠性的錯誤選擇。我們建議使用Firefox，Chrome，Opera或Safari。
 PHPModuleLoaded=PHP組件%s已載入
@@ -1433,6 +1440,7 @@ MemberMainOptions=主要選項
 AdherentLoginRequired= 管理每位會員登入
 AdherentMailRequired=建立新會員需要電子郵件
 MemberSendInformationByMailByDefault=已勾選預設傳送電子郵件驗證成員（驗證或新訂閲）
+MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
 VisitorCanChooseItsPaymentMode=訪客可以選擇可用的付款方式
 MEMBER_REMINDER_EMAIL=以<b>電子郵件</b>啟動自動提醒過期的訂閱。注意：必須啟用模組<strong>%s</strong>並正確設定才能發送提醒。
 MembersDocModules=Document templates for documents generated from member record
@@ -1763,7 +1771,7 @@ AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting men
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=啟用音效警告
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
-AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the scheduled job %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=顯示已連結項目到行程的檢視中
 ##### Clicktodial #####
 ClickToDialSetup=點擊撥號模組設定
@@ -1979,6 +1987,8 @@ MAIN_PDF_MARGIN_RIGHT=PDF右邊邊距
 MAIN_PDF_MARGIN_TOP=PDF頂部邊距
 MAIN_PDF_MARGIN_BOTTOM=PDF底部邊距
 MAIN_DOCUMENTS_LOGO_HEIGHT=PDF上Logo的高度
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add picture on proposal line
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add electronic sign in PDF
 NothingToSetup=此模組不需要特別的設定。
 SetToYesIfGroupIsComputationOfOtherGroups=若此群組是其他群組的計算值，則將其設定為 "是"
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
@@ -2096,7 +2106,6 @@ PDF_SHOW_PROJECT=Show project on document
 ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=如果您要在生成同一的PDF中以兩種不同的語言複製一些文字，則必須在此處設置第二種語言讓生成的PDF在同一頁中包含兩種不同的語言，選擇的可以用來生成PDF跟另一種語言（只有少數PDF模板支援此功能)。PDF只有一種語言則留空。
 FafaIconSocialNetworksDesc=在此處輸入FontAwesome圖示的代碼。如果您不知道什麼是FontAwesome，則可以使用通用值fa-address-book。
-FeatureNotAvailableWithReceptionModule=啟用接收模組後，此功能不可用
 RssNote=注意：每個RSS feed定義都提供一個小部件，您必須啟用該小部件才能使其在儀表板中看到
 JumpToBoxes=跳至設定 -> 小部件
 MeasuringUnitTypeDesc=使用值例如 "size", "surface", "volume", "weight", "time"
@@ -2120,12 +2129,18 @@ ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by
 MailToSendEventOrganization=Event Organization
 AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
 YouShouldDisablePHPFunctions=You should disable PHP functions
-IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands in custom code, you shoud disable PHP functions
+PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
+NotRecommended=Not recommanded
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
 ModuleUpdateAvailable=An update is available
 NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
+RandomlySelectedIfSeveral=Randomly selected if several pictures are available
+DatabasePasswordObfuscated=Database password is obfuscated in conf file
+DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
diff --git a/htdocs/langs/zh_TW/agenda.lang b/htdocs/langs/zh_TW/agenda.lang
index b72514bf7b6..9b4f589916b 100644
--- a/htdocs/langs/zh_TW/agenda.lang
+++ b/htdocs/langs/zh_TW/agenda.lang
@@ -4,7 +4,7 @@ Actions=事件
 Agenda=應辦事項
 TMenuAgenda=應辦事項
 Agendas=應辦事項
-LocalAgenda=內部行事曆
+LocalAgenda=Default calendar
 ActionsOwnedBy=事件承辦人
 ActionsOwnedByShort=承辦人
 AffectedTo=指定給
@@ -20,7 +20,7 @@ MenuToDoActions=全部未完成事件
 MenuDoneActions=全部已停止事件
 MenuToDoMyActions=我的未完成事件
 MenuDoneMyActions=我的已停止事件
-ListOfEvents=事件清單(內部事件)
+ListOfEvents=List of events (default calendar)
 ActionsAskedBy=誰的事件報表
 ActionsToDoBy=事件指定給
 ActionsDoneBy=由誰完成事件
@@ -38,6 +38,7 @@ ActionsEvents=Dolibarr 會在待辦事項中自動建立行動事件
 EventRemindersByEmailNotEnabled=電子郵件事件提醒未在%s模組設定中啟用。
 ##### Agenda event labels #####
 NewCompanyToDolibarr=合作方 %s 已建立
+COMPANY_MODIFYInDolibarr=Third party %s modified
 COMPANY_DELETEInDolibarr=合作方%s已刪除
 ContractValidatedInDolibarr=合約 %s 已驗證
 CONTRACT_DELETEInDolibarr=合約%s已刪除
@@ -87,6 +88,7 @@ OrderDeleted=訂單已刪除
 InvoiceDeleted=發票已刪除
 DraftInvoiceDeleted=發票草稿已刪除
 CONTACT_CREATEInDolibarr=聯絡人%s已建立
+CONTACT_MODIFYInDolibarr=Contact %s modified
 CONTACT_DELETEInDolibarr=聯絡人%s已刪除
 PRODUCT_CREATEInDolibarr=產品 %s 已建立
 PRODUCT_MODIFYInDolibarr=產品 %s 已修改
@@ -119,6 +121,7 @@ MRP_MO_UNVALIDATEInDolibarr=MO已設定為草稿狀態
 MRP_MO_PRODUCEDInDolibarr=MO已生產
 MRP_MO_DELETEInDolibarr=MO已刪除
 MRP_MO_CANCELInDolibarr=MO已取消
+PAIDInDolibarr=%s paid
 ##### End agenda events #####
 AgendaModelModule=事件的文件範本
 DateActionStart=開始日期
@@ -130,7 +133,7 @@ AgendaUrlOptions4=<b>logint = %s</b>將限制輸出分配給用戶<b>%s</b> （
 AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> 將限制輸出為已連結專案操作 <b>PROJECT_ID</b>.
 AgendaUrlOptionsNotAutoEvent=<b>notactiontype = systemauto</b>排除自動事件。
 AgendaUrlOptionsIncludeHolidays=設定<b>includeholidays=1</b>以包括假期活動。
-AgendaShowBirthdayEvents=顯示連絡人生日
+AgendaShowBirthdayEvents=Birthdays of contacts
 AgendaHideBirthdayEvents=隱藏連絡人生日
 Busy=忙錄
 ExportDataset_event1=待辦行程事件清單
diff --git a/htdocs/langs/zh_TW/assets.lang b/htdocs/langs/zh_TW/assets.lang
index face9d89bc9..8de301c2735 100644
--- a/htdocs/langs/zh_TW/assets.lang
+++ b/htdocs/langs/zh_TW/assets.lang
@@ -61,5 +61,7 @@ MenuListTypeAssets = 清單列表
 #
 # Module
 #
+Asset=資產
 NewAssetType=新資產類型
 NewAsset=新資產
+ConfirmDeleteAsset=您確定要刪除此資產?
diff --git a/htdocs/langs/zh_TW/bills.lang b/htdocs/langs/zh_TW/bills.lang
index 4640ce19133..a3478b05742 100644
--- a/htdocs/langs/zh_TW/bills.lang
+++ b/htdocs/langs/zh_TW/bills.lang
@@ -259,6 +259,7 @@ DateMaxPayment=付款到期日
 DateInvoice=發票日期
 DatePointOfTax=稅點
 NoInvoice=沒有發票
+NoOpenInvoice=No open invoice
 ClassifyBill=分類發票
 SupplierBillsToPay=未付款的供應商發票
 CustomerBillsUnpaid=尚未付款的客戶發票
@@ -589,3 +590,4 @@ FacParentLine=發票的母行
 SituationTotalRayToRest=剩下的不含稅
 PDFSituationTitle=情況n°%d
 SituationTotalProgress=總進度%d %%
+SearchUnpaidInvoicesWithDueDate=Search unpaid invoices with a due date = %s
diff --git a/htdocs/langs/zh_TW/blockedlog.lang b/htdocs/langs/zh_TW/blockedlog.lang
index 01d6e9d8300..829d2667a78 100644
--- a/htdocs/langs/zh_TW/blockedlog.lang
+++ b/htdocs/langs/zh_TW/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=不可更改的日誌
 ShowAllFingerPrintsMightBeTooLong=顯示所有存檔的日誌（可能很長）
 ShowAllFingerPrintsErrorsMightBeTooLong=顯示所有無效的歸檔日誌（可能很長）
 DownloadBlockChain=下載指紋
-KoCheckFingerprintValidity=歸檔的日誌條目無效。這意味著某人（黑客？）在記錄後已經修改了該記錄的某些數據，或者刪除了先前的存檔記錄（檢查是否存在具有先前＃號的行）。
+KoCheckFingerprintValidity=存檔日誌條目失效。 這意味著有人（駭客？）在記錄後修改了這筆記錄的一些數據，或是已經刪除了之前的存檔記錄（檢查前面#的那行是否存在）或者修改了之前記錄的校驗。
 OkCheckFingerprintValidity=歸檔日誌記錄有效。此行上的數據未修改，並且該條目位於上一個條目之後。
 OkCheckFingerprintValidityButChainIsKo=與以前的日誌相比，已歸檔的日誌似乎有效，但是先前的鏈已損壞。
 AddedByAuthority=已儲存到遠端授權中
diff --git a/htdocs/langs/zh_TW/cashdesk.lang b/htdocs/langs/zh_TW/cashdesk.lang
index e8f9444c07f..76a92cdbec5 100644
--- a/htdocs/langs/zh_TW/cashdesk.lang
+++ b/htdocs/langs/zh_TW/cashdesk.lang
@@ -102,7 +102,7 @@ CashDeskGenericMaskCodes6 = <br> <b> {TN} </b>標籤用於增加站台
 TakeposGroupSameProduct=群組相同產品線
 StartAParallelSale=開啟新的平行銷售
 SaleStartedAt=銷售開始於%s
-ControlCashOpening=在打開POS時控制現金彈出窗口
+ControlCashOpening=Open the "Control cash" popup when opening the POS
 CloseCashFence=關閉收銀台控制
 CashReport=現金報告
 MainPrinterToUse=要使用的主印表機
@@ -126,5 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=必須先啟用收據印表機模組
 AllowDelayedPayment=允許延遲付款
 PrintPaymentMethodOnReceipts=在收據上列印付款方式
 WeighingScale=秤重
-ShowPriceHT = Display the price excluding tax column
-ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
+ShowPriceHT = Display the column with the price excluding tax (on screen)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
diff --git a/htdocs/langs/zh_TW/categories.lang b/htdocs/langs/zh_TW/categories.lang
index fbbf4dbc51b..6f362a9d7a3 100644
--- a/htdocs/langs/zh_TW/categories.lang
+++ b/htdocs/langs/zh_TW/categories.lang
@@ -3,20 +3,20 @@ Rubrique=標籤/分類
 Rubriques=標籤/分類
 RubriquesTransactions=交易標籤/分類
 categories=標籤/分類
-NoCategoryYet=No tag/category of this type has been created
+NoCategoryYet=無此類型的 標籤/分類被建立
 In=在
 AddIn=加入
 modify=修改
 Classify=分類
 CategoriesArea=標籤/類別區域
-ProductsCategoriesArea=Product/Service tags/categories area
-SuppliersCategoriesArea=Vendor tags/categories area
-CustomersCategoriesArea=Customer tags/categories area
-MembersCategoriesArea=Member tags/categories area
-ContactsCategoriesArea=Contact tags/categories area
-AccountsCategoriesArea=Bank account tags/categories area
-ProjectsCategoriesArea=Project tags/categories area
-UsersCategoriesArea=User tags/categories area
+ProductsCategoriesArea=產品/服務 標籤/分類 區域
+SuppliersCategoriesArea=供應商 標籤/分類 區域
+CustomersCategoriesArea=客戶 標籤/分類 區域
+MembersCategoriesArea=會員 標籤/類別 區域
+ContactsCategoriesArea=聯絡人 標籤/類別 區域
+AccountsCategoriesArea=銀行帳戶 標籤/類別 區域
+ProjectsCategoriesArea=專案 標籤/類別 區域
+UsersCategoriesArea=使用者 標籤/類別 區域
 SubCats=子類別
 CatList=標籤/類別清單
 CatListAll=標籤/分類清單（所有類型）
@@ -93,7 +93,7 @@ AddSupplierIntoCategory=分配類別給供應商
 ShowCategory=顯示標籤/類別
 ByDefaultInList=預設在清單中
 ChooseCategory=選擇類別
-StocksCategoriesArea=Warehouse Categories
-ActionCommCategoriesArea=Event Categories
+StocksCategoriesArea=倉庫分類
+ActionCommCategoriesArea=事件分類
 WebsitePagesCategoriesArea=頁面容器類別
-UseOrOperatorForCategories=Use 'OR' operator for categories
+UseOrOperatorForCategories=分類使用 'OR' 運算符號
diff --git a/htdocs/langs/zh_TW/companies.lang b/htdocs/langs/zh_TW/companies.lang
index 42bc3707cd9..53a11b64ace 100644
--- a/htdocs/langs/zh_TW/companies.lang
+++ b/htdocs/langs/zh_TW/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=公司名稱%s已經存在。請選擇另一個。
 ErrorSetACountryFirst=請先設定國家
 SelectThirdParty=選擇一個合作方
-ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
+ConfirmDeleteCompany=您確定要刪除此公司和所有關聯的資訊嗎？
 DeleteContact=刪除連絡人/地址
-ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
+ConfirmDeleteContact=您確定要刪除此連絡人和所有相關資訊？
 MenuNewThirdParty=新合作方
 MenuNewCustomer=新客戶
 MenuNewProspect=新潛在方
@@ -43,10 +43,10 @@ Individual=私營個體
 ToCreateContactWithSameName=會自動新增一個與合作方具有相同資訊的聯絡人/地址。在大多數情況下，即使您的合作方是自然人，只需建立合作方即可。
 ParentCompany=母公司
 Subsidiaries=子公司
-ReportByMonth=Report per month
-ReportByCustomers=Report per customer
-ReportByThirdparties=Report per thirdparty
-ReportByQuarter=Report per rate
+ReportByMonth=報表依月份
+ReportByCustomers=報表依客戶
+ReportByThirdparties=報表依第三方
+ReportByQuarter=報表依費率
 CivilityCode=Civility code
 RegisteredOffice=已註冊辦公室
 Lastname=姓氏
@@ -69,7 +69,7 @@ PhoneShort=電話
 Skype=Skype
 Call=通話
 Chat=對話
-PhonePro=Bus. phone
+PhonePro=商務電話
 PhonePerso=個人電話號碼
 PhoneMobile=手機號碼
 No_Email=拒絕批次發送電子郵件
@@ -173,7 +173,7 @@ ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 （社會安全號碼）
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (學院編號)
-ProfId5ES=Prof Id 5 (EORI number)
+ProfId5ES=Prof Id 5 (EORI 號碼)
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
@@ -239,7 +239,7 @@ ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2（社會安全號碼）
 ProfId3PT=Prof Id 3（商業記錄碼）
 ProfId4PT=Prof Id 4 (音樂學院)
-ProfId5PT=Prof Id 5 (EORI number)
+ProfId5PT=Prof Id 5 (EORI 號碼)
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -263,7 +263,7 @@ ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
 ProfId4RO=Prof Id 5 (EUID)
-ProfId5RO=Prof Id 5 (EORI number)
+ProfId5RO=Prof Id 5 (EORI 號碼)
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
diff --git a/htdocs/langs/zh_TW/compta.lang b/htdocs/langs/zh_TW/compta.lang
index 7ea8019f6d0..7182e21ce6d 100644
--- a/htdocs/langs/zh_TW/compta.lang
+++ b/htdocs/langs/zh_TW/compta.lang
@@ -286,3 +286,9 @@ ReportPurchaseTurnover=已開票營業額
 ReportPurchaseTurnoverCollected=採購營業額
 IncludeVarpaysInResults = 在報告中包括各種付款
 IncludeLoansInResults = 在報告中包括貸款
+InvoiceLate30Days = Invoices late > 30 days
+InvoiceLate15Days = Invoices late > 15 days
+InvoiceLateMinus15Days = Invoices late
+InvoiceNotLate = To be collected < 15 days
+InvoiceNotLate15Days = To be collected in 15 days
+InvoiceNotLate30Days = To be collected in 30 days
diff --git a/htdocs/langs/zh_TW/cron.lang b/htdocs/langs/zh_TW/cron.lang
index 7bc4d4b9d74..e61de80d07a 100644
--- a/htdocs/langs/zh_TW/cron.lang
+++ b/htdocs/langs/zh_TW/cron.lang
@@ -60,7 +60,7 @@ CronErrEndDateStartDt=結束日期不能早於開始日期
 StatusAtInstall=模組安裝狀態
 CronStatusActiveBtn=計畫表
 CronStatusInactiveBtn=停用
-CronTaskInactive=此工作已停用
+CronTaskInactive=此作業已停用（未排程）
 CronId=Id
 CronClassFile=類別的檔案名稱
 CronModuleHelp=Dolibarr模組資料夾名稱（也適用於外部Dolibarr模組）。 <BR>例如，調用Dolibarr產品項目/ htdocs / <u>product</u> /class/product.class.php的提取方法，模組的值為<br> <i>product</i>
diff --git a/htdocs/langs/zh_TW/donations.lang b/htdocs/langs/zh_TW/donations.lang
index 9e5a55db3a4..94330ae9a9b 100644
--- a/htdocs/langs/zh_TW/donations.lang
+++ b/htdocs/langs/zh_TW/donations.lang
@@ -7,7 +7,6 @@ AddDonation=建立捐贈
 NewDonation=新捐贈
 DeleteADonation=刪除捐贈
 ConfirmDeleteADonation=您確定要刪除此捐贈嗎？
-ShowDonation=顯示捐贈
 PublicDonation=公益捐贈
 DonationsArea=捐贈區
 DonationStatusPromiseNotValidated=承諾草案
@@ -33,3 +32,4 @@ DONATION_ART238=如果您擔心，請顯示CGI的第238條
 DONATION_ART885=如果您擔心，請顯示CGI的第885條
 DonationPayment=捐款付款
 DonationValidated=捐贈%s已驗證
+DonationUseThirdparties=使用現有的第三方作為捐助者的目標
diff --git a/htdocs/langs/zh_TW/ecm.lang b/htdocs/langs/zh_TW/ecm.lang
index 575ed2de2b3..8646dcbb472 100644
--- a/htdocs/langs/zh_TW/ecm.lang
+++ b/htdocs/langs/zh_TW/ecm.lang
@@ -38,10 +38,10 @@ ReSyncListOfDir=重新同步目錄清單
 HashOfFileContent=檔案內容的雜湊值
 NoDirectoriesFound=找不到目錄
 FileNotYetIndexedInDatabase=檔案尚未編入資料庫（嘗試重新上傳）
-ExtraFieldsEcmFiles=Extrafields Ecm Files
-ExtraFieldsEcmDirectories=Extrafields Ecm Directories
+ExtraFieldsEcmFiles=額外欄位 Ecm 檔案
+ExtraFieldsEcmDirectories=額外欄位 Ecm 目錄
 ECMSetup=ECM設定
-GenerateImgWebp=Duplicate all images with another version with .webp format
-ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
-ConfirmImgWebpCreation=Confirm all images duplication
-SucessConvertImgWebp=Images successfully duplicated
+GenerateImgWebp=用 .webp 格式複製所有影像到另一種版本
+ConfirmGenerateImgWebp=如果您確認，您將對目前所有影像生成 .webp 格式檔案至此資料夾 (不包含子資料夾),,,
+ConfirmImgWebpCreation=確認所有影像複製
+SucessConvertImgWebp=影像已複製成功
diff --git a/htdocs/langs/zh_TW/errors.lang b/htdocs/langs/zh_TW/errors.lang
index c91ab496622..2b1162b14e3 100644
--- a/htdocs/langs/zh_TW/errors.lang
+++ b/htdocs/langs/zh_TW/errors.lang
@@ -11,6 +11,7 @@ ErrorBadValueForParamNotAString=您的參數值錯誤。一般在轉譯遺失時
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=登入者%s已經存在。
 ErrorGroupAlreadyExists=群組%s已經存在。
+ErrorEmailAlreadyExists=Email %s already exists.
 ErrorRecordNotFound=記錄沒有找到。
 ErrorFailToCopyFile=無法將檔案'<b>%s</b>'複製到'<b>%s</b>'
 ErrorFailToCopyDir=無法將資料夾'<b>%s</b>' 複製到'<b>%s</b>'.
@@ -117,7 +118,7 @@ ErrorCantReadFile=無法讀取檔案'%s'
 ErrorCantReadDir=無法讀取資料夾'%s'
 ErrorBadLoginPassword=錯誤的帳號或密碼
 ErrorLoginDisabled=您的帳戶已被停用
-ErrorFailedToRunExternalCommand=無法執行外部命令。檢查它是可用並且可執行在PHP的伺服器上。如果PHP <b>安全模式</b>被啟用，請檢查命令已在資料夾中並以參數<b>safe_mode_exec_dir</b>定義。
+ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server user. Check also the command is not protected on shell level by a security layer like apparmor.
 ErrorFailedToChangePassword=無法更改密碼
 ErrorLoginDoesNotExists=找不到登入名稱<b>%s</b>的用戶。
 ErrorLoginHasNoEmail=這位用戶沒有電子郵件地址。程序中止。
@@ -262,6 +263,7 @@ ErrorDateIsInFuture=Error, the date can't be in the future
 ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
 ErrorAPercentIsRequired=Error, please fill in the percentage correctly
 ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
+ErrorFailedToFindEmailTemplate=Failed to find template with code name %s
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=您的PHP參數upload_max_filesize（%s）高於PHP參數post_max_size（%s）。這不是相同的設定。
@@ -298,3 +300,4 @@ WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So y
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
+ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
diff --git a/htdocs/langs/zh_TW/eventorganization.lang b/htdocs/langs/zh_TW/eventorganization.lang
index 27e902102f9..7db22c3484a 100644
--- a/htdocs/langs/zh_TW/eventorganization.lang
+++ b/htdocs/langs/zh_TW/eventorganization.lang
@@ -1,4 +1,5 @@
 # Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+# Copyright (C) 2021		Dorian Vabre			<dorian.vabre@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
@@ -81,7 +82,10 @@ PriceOfBoothHelp=Subscription price to stand a booth
 EventOrganizationICSLink=Link ICS for events
 ConferenceOrBoothInformation=Conference Or Booth informations
 Attendees = Attendees
+DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
 #
 # Status
 #
@@ -94,8 +98,46 @@ EvntOrgCancelled = Cancelled
 #
 # Public page
 #
+SuggestForm = Suggestion page
+RegisterPage = Page for conferences or booth
+EvntOrgRegistrationHelpMessage = Here, you can vote for an event, or suggest a new conference or booth for the project
+EvntOrgRegistrationConfHelpMessage = Here, you can suggest a new conference for the project
+EvntOrgRegistrationBoothHelpMessage = Here, you can suggest a new booth for the project
+ListOfSuggestedConferences = List of suggested conferences
+ListOfSuggestedBooths = List of suggested booths
+SuggestConference = Suggest a new conference
+SuggestBooth = Suggest a booth
+ViewAndVote = View and vote for suggested events
 PublicAttendeeSubscriptionPage = Public link of registration to a conference
 MissingOrBadSecureKey = The security key is invalid or missing
-EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
-EvntOrgStartDuration = This conference starts on
-EvntOrgEndDuration =  and ends on
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference : '%s'
+EvntOrgDuration = This conference starts on %s and ends on %s.
+ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
+BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
+EventType = 事件類別
+
+#
+# Vote page
+#
+EvntOrgRegistrationWelcomeMessage = Welcome on the conference or booth suggestion page.
+EvntOrgRegistrationConfWelcomeMessage = Welcome on the conference suggestion page.
+EvntOrgRegistrationBoothWelcomeMessage = Welcome on the booth suggestion page.
+EvntOrgVoteHelpMessage = Here, you can view and vote for the suggested events for the project
+VoteOk = Your vote has been accepted.
+AlreadyVoted = You have already voted for this event.
+VoteError = An error has occurred during the vote, please try again.
+
+#
+# SubscriptionOk page
+#
+SubscriptionOk = Your subscription to this conference has been validated
+#
+# Subscription validation mail
+#
+ConfAttendeeSubscriptionConfirmation = Confirmation of your subscription to a conference
+#
+# Payment page
+#
+Attendee = Attendee
+PaymentConferenceAttendee = Conference attendee payment
+PaymentBoothLocation = Booth location payment
diff --git a/htdocs/langs/zh_TW/hrm.lang b/htdocs/langs/zh_TW/hrm.lang
index e62a5430c67..240980f71d7 100644
--- a/htdocs/langs/zh_TW/hrm.lang
+++ b/htdocs/langs/zh_TW/hrm.lang
@@ -9,7 +9,7 @@ ConfirmDeleteEstablishment=您確定要刪除此營業所嗎？
 OpenEtablishment=開啟營業所
 CloseEtablishment=關閉營業所
 # Dictionary
-DictionaryPublicHolidays=HRM-公共假期
+DictionaryPublicHolidays=Leave - Public holidays
 DictionaryDepartment=HRM-部門清單
 DictionaryFunction=人力資源管理-職位
 # Module
diff --git a/htdocs/langs/zh_TW/knowledgemanagement.lang b/htdocs/langs/zh_TW/knowledgemanagement.lang
index 0e4462985f9..4556692999f 100644
--- a/htdocs/langs/zh_TW/knowledgemanagement.lang
+++ b/htdocs/langs/zh_TW/knowledgemanagement.lang
@@ -47,7 +47,7 @@ KnowledgeManagementArea = Knowledge Management
 # Menu
 #
 MenuKnowledgeRecord = Knowledge base
-ListOfArticles = List of articles
+ListKnowledgeRecord = List of articles
 NewKnowledgeRecord = New article
 ValidateReply = Validate solution
 KnowledgeRecords = Articles
diff --git a/htdocs/langs/zh_TW/languages.lang b/htdocs/langs/zh_TW/languages.lang
index 2c762a9075b..e8199dc4fd9 100644
--- a/htdocs/langs/zh_TW/languages.lang
+++ b/htdocs/langs/zh_TW/languages.lang
@@ -3,6 +3,7 @@ Language_am_ET=衣索比亞
 Language_ar_AR=阿拉伯語
 Language_ar_EG=阿拉伯語（埃及）
 Language_ar_SA=阿拉伯語
+Language_ar_TN=Arabic (Tunisia)
 Language_az_AZ=亞塞拜然
 Language_bn_BD=孟加拉語
 Language_bn_IN=孟加拉語（印度）
@@ -84,6 +85,7 @@ Language_nl_NL=荷蘭人
 Language_pl_PL=波蘭語
 Language_pt_BR=葡萄牙語（巴西）
 Language_pt_PT=葡萄牙語
+Language_ro_MD=Romanian (Moldavia)
 Language_ro_RO=羅馬尼亞語
 Language_ru_RU=俄語
 Language_ru_UA=俄語（烏克蘭）
diff --git a/htdocs/langs/zh_TW/main.lang b/htdocs/langs/zh_TW/main.lang
index ee97d8fc01c..911e650e96a 100644
--- a/htdocs/langs/zh_TW/main.lang
+++ b/htdocs/langs/zh_TW/main.lang
@@ -430,6 +430,7 @@ LT1IN=CGST
 LT2IN=SGST
 LT1GC=附加美分
 VATRate=稅率
+RateOfTaxN=Rate of tax %s
 VATCode=稅率代碼
 VATNPR=NPR 稅率
 DefaultTaxRate=預設稅率
@@ -729,6 +730,7 @@ MenuMembers=會員
 MenuAgendaGoogle=Google 行事曆
 MenuTaxesAndSpecialExpenses=稅金|特別費用
 ThisLimitIsDefinedInSetup=Dolibarr 的限制（選單 首頁 - 設定 - 安全）： %s Kb, PHP的限制：%s Kb
+ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
 NoFileFound=No documents uploaded
 CurrentUserLanguage=目前語言
 CurrentTheme=目前主題
@@ -1072,6 +1074,7 @@ ValidFrom=有效期自
 ValidUntil=有效期至
 NoRecordedUsers=無使用者
 ToClose=關閉
+ToRefuse=To refuse
 ToProcess=處理
 ToApprove=核准
 GlobalOpenedElemView=全域顯示
@@ -1126,9 +1129,11 @@ UpdateForAllLines=更新所有行
 OnHold=On hold
 Civility=稱謂或頭銜
 AffectTag=影響標籤
+CreateExternalUser=Create external user
 ConfirmAffectTag=批量標籤影響
 ConfirmAffectTagQuestion=您確定要影響對%s所選記錄的標籤嗎？
 CategTypeNotFound=找不到記錄類型的標籤類型
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
 ConfirmCancel=Are you sure you want to cancel
+EmailMsgID=Email MsgID
diff --git a/htdocs/langs/zh_TW/members.lang b/htdocs/langs/zh_TW/members.lang
index 9bfb8a79af4..68771cc7892 100644
--- a/htdocs/langs/zh_TW/members.lang
+++ b/htdocs/langs/zh_TW/members.lang
@@ -213,3 +213,5 @@ SendReminderForExpiredSubscription=當訂閱即將到期時，通過電子郵件
 MembershipPaid=本期已支付的會費（直到%s）
 YouMayFindYourInvoiceInThisEmail=您可在此電子郵件中找到發票
 XMembersClosed=%s會員已關閉
+XExternalUserCreated=%s external user(s) created
+ForceMemberNature=Force member nature (Individual or Corporation)
diff --git a/htdocs/langs/zh_TW/modulebuilder.lang b/htdocs/langs/zh_TW/modulebuilder.lang
index 04eb61a2a70..b7962b22242 100644
--- a/htdocs/langs/zh_TW/modulebuilder.lang
+++ b/htdocs/langs/zh_TW/modulebuilder.lang
@@ -143,3 +143,4 @@ AsciiToHtmlConverter=ASCII到HTML轉換器
 AsciiToPdfConverter=ASCII到PDF轉換器
 TableNotEmptyDropCanceled=表不為空。刪除已被取消。
 ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
+ImportExportProfiles=Import and export profiles
diff --git a/htdocs/langs/zh_TW/mrp.lang b/htdocs/langs/zh_TW/mrp.lang
index 58bbdd4bcc7..2f4bfbfa146 100644
--- a/htdocs/langs/zh_TW/mrp.lang
+++ b/htdocs/langs/zh_TW/mrp.lang
@@ -8,12 +8,12 @@ MenuBOM=物料清單
 LatestBOMModified=最新的%s物料清單已修改
 LatestMOModified=最新%s筆製造訂單已修改
 Bom=物料清單
-BillOfMaterials=物料清單
+BillOfMaterials=材料清單
 BOMsSetup=BOM模組設定
 ListOfBOMs=物料清單-BOM
 ListOfManufacturingOrders=製造訂單清單
 NewBOM=新物料清單
-ProductBOMHelp=此物料清單建立的產品。<br>注意：屬性為“原料”的產品 =“原材料”在此清單中不可見。
+ProductBOMHelp=Product to create (or disassemble) with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
 BOMsNumberingModules=BOM編號範本
 BOMsModelModule=BOM文件範本
 MOsNumberingModules=MO編號範本
@@ -39,7 +39,7 @@ DateStartPlannedMo=計劃開始日期
 DateEndPlannedMo=計劃結束日期
 KeepEmptyForAsap=空白表示“盡快”
 EstimatedDuration=預計時間
-EstimatedDurationDesc=使用此物料清單估計製造此產品的時間
+EstimatedDurationDesc=Estimated duration to manufacture (or disassemble) this product using this BOM
 ConfirmValidateBom=您確定要使用參考<strong>%s</strong>來驗證物料清單（您將能夠使用它來建立新的製造訂單）
 ConfirmCloseBom=您確定要取消此物料清單（您將無法再使用它來建立新的製造訂單）？
 ConfirmReopenBom=您確定要重新打開此物料清單嗎（您將能夠使用它來建立新的製造訂單）
@@ -63,13 +63,14 @@ ConsumeAndProduceAll=消耗並生產所有產品
 Manufactured=已製造
 TheProductXIsAlreadyTheProductToProduce=要增加的產品已經是要生產的產品。
 ForAQuantityOf=數量為%s
+ForAQuantityToConsumeOf=For a quantity to disassemble of %s
 ConfirmValidateMo=您確定要驗證此製造訂單嗎？
 ConfirmProductionDesc=通過點擊“%s”，您將驗證數量設定的消耗量和/或生產量。這還將更新庫存並記錄庫存動向。
 ProductionForRef=生產%s
 AutoCloseMO=如果達到消耗和生產的數量，則自動關閉製造訂單
 NoStockChangeOnServices=服務無庫存變化
 ProductQtyToConsumeByMO=開放MO仍要消耗的產品數量
-ProductQtyToProduceByMO=開放MO仍可產生的產品優先等級
+ProductQtyToProduceByMO=Product quantity still to produce by open MO
 AddNewConsumeLines=增加新的行來使用
 ProductsToConsume=消耗的產品
 ProductsToProduce=生產的產品
@@ -78,27 +79,25 @@ TotalCost=總計花費
 BOMTotalCost=根據每個要消耗的數量和產品的成本產生此BOM的成本（如果定義則使用“成本價”，如果定義則使用“平均加權價格”，否則使用“最佳採購價”）
 GoOnTabProductionToProduceFirst=您必須先開始生產才能關閉生產訂單（請參見分頁“ %s”）。但是您可以取消它。
 ErrorAVirtualProductCantBeUsedIntoABomOrMo=套件不能用於物料清單或製造訂單
-Workstation=Workstation
-Workstations=Workstations
-WorkstationsDescription=Workstations management
-WorkstationSetup = Workstations setup
-WorkstationSetupPage = Workstations setup page
-WorkstationAbout = About Workstation
-WorkstationAboutPage = Workstations about page
-WorkstationList=Workstation list
-WorkstationCreate=Add new workstation
-ConfirmEnableWorkstation=Are you sure you want to enable workstation <b>%s</b> ?
-EnableAWorkstation=Enable a workstation
-ConfirmDisableWorkstation=Are you sure you want to disable workstation <b>%s</b> ?
-DisableAWorkstation=Disable a workstation
-DeleteWorkstation=Supprimer
-NbOperatorsRequired=Number of operators required
-THMOperatorEstimated=Estimated operator THM
-THMMachineEstimated=Estimated machine THM
-WorkstationType=Workstation type
-Human=Human
-Machine=Machine
-HumanMachine=Human / Machine
-WorkstationArea=Workstation area
-Machines=Machines
-THMEstimatedHelp=This rate makes it possible to define a forecast cost of the item
+Workstation=工作站
+Workstations=工作站
+WorkstationsDescription=工作站管理
+WorkstationSetup = 工作站設定
+WorkstationSetupPage = 工作站設定頁面
+WorkstationList=工作站清單
+WorkstationCreate=新增工作站
+ConfirmEnableWorkstation=您確定要啟用工作站<b> %s </b>嗎？
+EnableAWorkstation=啟用工作站
+ConfirmDisableWorkstation=您確定要停用工作站<b> %s </b>嗎？
+DisableAWorkstation=停用工作站
+DeleteWorkstation=刪除
+NbOperatorsRequired=所需的營運商數量
+THMOperatorEstimated=估計營運商THM
+THMMachineEstimated=估計機器THM
+WorkstationType=工作站類型
+Human=人員
+Machine=機器
+HumanMachine=人員/機器
+WorkstationArea=工作站區域
+Machines=機器
+THMEstimatedHelp=此費率使得可以定義物料的預估成本
diff --git a/htdocs/langs/zh_TW/orders.lang b/htdocs/langs/zh_TW/orders.lang
index 7d2f56c434e..2f23c61d0db 100644
--- a/htdocs/langs/zh_TW/orders.lang
+++ b/htdocs/langs/zh_TW/orders.lang
@@ -11,6 +11,7 @@ OrderDate=訂購日期
 OrderDateShort=訂購日期
 OrderToProcess=訂單處理
 NewOrder=建立新訂單
+NewSupplierOrderShort=建立新訂單
 NewOrderSupplier=新採購訂單
 ToOrder=製作訂單
 MakeOrder=製作訂單
@@ -73,6 +74,7 @@ DeleteOrder=刪除訂單
 CancelOrder=取消訂單
 OrderReopened= 訂單%s重新打開
 AddOrder=新增訂單
+AddSupplierOrderShort=新增訂單
 AddPurchaseOrder=新增採購訂單
 AddToDraftOrders=加入到草稿訂單
 ShowOrder=顯示訂單
diff --git a/htdocs/langs/zh_TW/other.lang b/htdocs/langs/zh_TW/other.lang
index 364d1de3f2d..15b6f7aec08 100644
--- a/htdocs/langs/zh_TW/other.lang
+++ b/htdocs/langs/zh_TW/other.lang
@@ -129,6 +129,7 @@ ClosedByLogin=已關閉的用戶登入名稱
 FileWasRemoved=檔案%s已刪除
 DirWasRemoved=資料夾%s已刪除
 FeatureNotYetAvailable=此功能在目前版本中尚不可用
+FeatureNotAvailableOnDevicesWithoutMouse=Feature not available on devices without mouse
 FeaturesSupported=已支援功能
 Width=寬度
 Height=高度
@@ -263,7 +264,7 @@ ContactCreatedByEmailCollector=電子郵件收集器從電子郵件MSGID %s建
 ProjectCreatedByEmailCollector=電子郵件收集器從電子郵件MSGID %s建立的專案
 TicketCreatedByEmailCollector=電子郵件收集器從電子郵件MSGID %s建立的服務單
 OpeningHoursFormatDesc=使用-分隔營業開始時間和營業結束時間。 <br>使用空格輸入不同的範圍。 <br>範例：8-12 14-18
-PrefixSession=程序ID的前綴
+SuffixSessionName=Suffix for session name
 
 ##### Export #####
 ExportsArea=出口地區
diff --git a/htdocs/langs/zh_TW/partnership.lang b/htdocs/langs/zh_TW/partnership.lang
index 6563edeeac8..34be595010d 100644
--- a/htdocs/langs/zh_TW/partnership.lang
+++ b/htdocs/langs/zh_TW/partnership.lang
@@ -16,41 +16,72 @@
 #
 # Generic
 #
-ModulePartnershipName = Partnership management
-PartnershipDescription = Module Partnership management
+ModulePartnershipName=Partnership management
+PartnershipDescription=Module Partnership management
 PartnershipDescriptionLong= Module Partnership management
 
+AddPartnership=Add partnership
+CancelPartnershipForExpiredMembers=Partnership: Cancel partnership of members with expired subscriptions
+PartnershipCheckBacklink=Partnership: Check referring backlink
+
 #
 # Menu
 #
-NewPartnership = New Partnership
-ListOfPartnerships = List of partnership
+NewPartnership=New Partnership
+ListOfPartnerships=List of partnership
 
 #
 # Admin page
 #
-PartnershipSetup = Partnership setup
-PartnershipAbout = About Partnership
-PartnershipAboutPage = Partnership about page
-
+PartnershipSetup=Partnership setup
+PartnershipAbout=About Partnership
+PartnershipAboutPage=Partnership about page
+partnershipforthirdpartyormember=Partner status must be set on a 'thirdparty' or a 'member'
+PARTNERSHIP_IS_MANAGED_FOR=Partnership managed for
+PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks to check
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb of days before cancelling status of a partnership when a subscription has expired
+ReferingWebsiteCheck=Check of website referring
+ReferingWebsiteCheckDesc=You can enable a feature to check that your partners has added a backlink to your website domains on their own website.
 
 #
 # Object
 #
+DeletePartnership=Delete a partnership
+PartnershipDedicatedToThisThirdParty=Partnership dedicated to this third party
+PartnershipDedicatedToThisMember=Partnership dedicated to this member
 DatePartnershipStart=開始日期
 DatePartnershipEnd=結束日期
+ReasonDecline=Decline reason
+ReasonDeclineOrCancel=Decline reason
+PartnershipAlreadyExist=Partnership already exist
+ManagePartnership=Manage partnership
+BacklinkNotFoundOnPartnerWebsite=Backlink not found on partner website
+ConfirmClosePartnershipAsk=Are you sure you want to cancel this partnership?
+PartnershipType=Partnership type
 
 #
 # Template Mail
 #
+SendingEmailOnPartnershipWillSoonBeCanceled=Partnership will soon be canceled
+SendingEmailOnPartnershipRefused=Partnership refused
+SendingEmailOnPartnershipAccepted=Partnership accepted
+SendingEmailOnPartnershipCanceled=Partnership canceled
 
+YourPartnershipWillSoonBeCanceledTopic=Partnership will soon be canceled
+YourPartnershipRefusedTopic=Partnership refused
+YourPartnershipAcceptedTopic=Partnership accepted
+YourPartnershipCanceledTopic=Partnership canceled
+
+YourPartnershipWillSoonBeCanceledContent=We inform you that your partnership will soon be canceled (Backlink not found)
+YourPartnershipRefusedContent=We inform you that your partnership request has been refused.
+YourPartnershipAcceptedContent=We inform you that your partnership request has been accepted.
+YourPartnershipCanceledContent=We inform you that your partnership has been canceled.
 
 #
 # Status
 #
-PartnershipDraft = 草稿
-PartnershipAccepted = 已接受
-PartnershipRefused = 已拒絕
-PartnershipCanceled = 已取消
-
+PartnershipDraft=草稿
+PartnershipAccepted=已接受
+PartnershipRefused=已拒絕
+PartnershipCanceled=已取消
 PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/zh_TW/productbatch.lang b/htdocs/langs/zh_TW/productbatch.lang
index d88de961d99..82f4324aa0e 100644
--- a/htdocs/langs/zh_TW/productbatch.lang
+++ b/htdocs/langs/zh_TW/productbatch.lang
@@ -1,4 +1,4 @@
-# ProductBATCH language file - en_US - ProductBATCH
+# ProductBATCH language file - Source file is en_US - ProductBATCH
 ManageLotSerial=使用批次/序號數字
 ProductStatusOnBatch=Yes (lot required)
 ProductStatusOnSerial=Yes (unique serial number required)
@@ -33,3 +33,13 @@ CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+LifeTime=Life span (in days)
+EndOfLife=End of life
+ManufacturingDate=Manufacturing date
+DestructionDate=Destruction date
+FirstUseDate=First use date
+QCFrequency=Quality control frequency (in days)
+
+#Traceability - qc status
+OutOfOrder=Out of order
+InWorkingOrder=In working order
diff --git a/htdocs/langs/zh_TW/products.lang b/htdocs/langs/zh_TW/products.lang
index b603120fada..e34cc1f39a4 100644
--- a/htdocs/langs/zh_TW/products.lang
+++ b/htdocs/langs/zh_TW/products.lang
@@ -396,3 +396,5 @@ ActionAvailableOnVariantProductOnly=僅對產品的變數提供操作
 ProductsPricePerCustomer=每個客戶的產品價格
 ProductSupplierExtraFields=附加屬性（供應商價格）
 DeleteLinkedProduct=刪除連結到組合的子產品
+PMPValue=加權平均價格
+PMPValueShort=WAP
diff --git a/htdocs/langs/zh_TW/projects.lang b/htdocs/langs/zh_TW/projects.lang
index 6223ae8f6e8..7057f38a761 100644
--- a/htdocs/langs/zh_TW/projects.lang
+++ b/htdocs/langs/zh_TW/projects.lang
@@ -267,9 +267,11 @@ InvoiceToUse=發票草稿
 NewInvoice=新發票
 OneLinePerTask=每個任務一行
 OneLinePerPeriod=每個週期一行
+OneLinePerTimeSpentLine=One line for each time spent declaration
 RefTaskParent=參考上層任務
 ProfitIsCalculatedWith=利潤計算是使用
 AddPersonToTask=Add also to tasks
 UsageOrganizeEvent=Usage: Event Organization
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
+SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
diff --git a/htdocs/langs/zh_TW/receptions.lang b/htdocs/langs/zh_TW/receptions.lang
index ada80f386c7..07092969024 100644
--- a/htdocs/langs/zh_TW/receptions.lang
+++ b/htdocs/langs/zh_TW/receptions.lang
@@ -44,4 +44,4 @@ ValidateOrderFirstBeforeReception=您必須先驗證訂單，然後才能進行
 ReceptionsNumberingModules=收貨編號模組
 ReceptionsReceiptModel=收貨用文件範本
 NoMorePredefinedProductToDispatch=沒有更多預定義的產品要調度
-
+ReceptionExist=A reception exists
diff --git a/htdocs/langs/zh_TW/stocks.lang b/htdocs/langs/zh_TW/stocks.lang
index 73c7afa1e00..39839073299 100644
--- a/htdocs/langs/zh_TW/stocks.lang
+++ b/htdocs/langs/zh_TW/stocks.lang
@@ -56,8 +56,6 @@ UnitPurchaseValue=單位購買價格
 StockTooLow=庫存過低
 StockLowerThanLimit=庫存低於警報限制（%s）
 EnhancedValue=價值
-PMPValue=加權平均價格
-PMPValueShort=WAP
 EnhancedValueOfWarehouses=倉庫價值
 UserWarehouseAutoCreate=新增用戶時自動新增用戶倉庫
 AllowAddLimitStockByWarehouse=除了每個產品的最小和期望庫存值之外，還管理每個配對（產品倉庫）的最小和期望庫存值
@@ -251,7 +249,10 @@ SelectAStockMovementFileToImport=選擇要匯入的庫存移動檔案
 InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
 LabelOfInventoryMovemement=%s的庫存
 ReOpen=重新打開
-ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock to the real qty you entered into the inventory.
 ObjectNotFound=%s not found
 MakeMovementsAndClose=Generate movements and close
 AutofillWithExpected=Fill real quantity with expected quantity
+ShowAllBatchByDefault=By default, show batch details on product "stock" tab
+CollapseBatchDetailHelp=You can set batch detail default display in stocks module configuration
+FieldCannotBeNegative=Field "%s" cannot be negative
diff --git a/htdocs/langs/zh_TW/ticket.lang b/htdocs/langs/zh_TW/ticket.lang
index b1ce38cce62..ed96eadd5bc 100644
--- a/htdocs/langs/zh_TW/ticket.lang
+++ b/htdocs/langs/zh_TW/ticket.lang
@@ -51,14 +51,14 @@ MenuListNonClosed=開放服務單
 
 TypeContact_ticket_internal_CONTRIBUTOR=合作者
 TypeContact_ticket_internal_SUPPORTTEC=已分配用戶
-TypeContact_ticket_external_SUPPORTCLI=客戶聯絡/事件跟踪
+TypeContact_ticket_external_SUPPORTCLI=客戶聯絡人/事件追踪
 TypeContact_ticket_external_CONTRIBUTOR=外部合作者
 
 OriginEmail=電子郵件來源
 Notify_TICKET_SENTBYMAIL=以電子郵件發送服務單訊息
 
 # Status
-Read=已讀
+Read=已讀取
 Assigned=已分配
 InProgress=進行中
 NeedMoreInformation=等待訊息
@@ -70,8 +70,8 @@ Deleted=已刪除
 # Dict
 Type=類型
 Severity=嚴重程度
-TicketGroupIsPublic=Group is public
-TicketGroupIsPublicDesc=If a ticket group is public, it will be visible in the form when creating a ticket from the public interface
+TicketGroupIsPublic=為公共群組
+TicketGroupIsPublicDesc=如果服務單群組為公共的，則在從公共界面建立服務單時可見到在表單中
 
 # Email templates
 MailToSendTicketMessage=從服務單訊息發送電子郵件
@@ -94,7 +94,7 @@ TicketNewEmailBodyLabel=建立服務單後發送的訊息
 TicketNewEmailBodyHelp=此處指定的文字將插入到從公共界面建立新服務單的電子郵件中。將自動加入有關故障服務單諮詢的資訊。
 TicketParamPublicInterface=公共界面設定
 TicketsEmailMustExist=需要現有的電子郵件地址來建立服務單
-TicketsEmailMustExistHelp=在公共界面中，電子郵件地址應該已經填入到數據庫中以建立服務單。
+TicketsEmailMustExistHelp=在公共界面中，電子郵件地址應該已經填入到資料庫中以建立服務單。
 PublicInterface=公共界面
 TicketUrlPublicInterfaceLabelAdmin=公共界面的備用網址
 TicketUrlPublicInterfaceHelpAdmin=可以為網站伺服器定義別名，使得公共界面可以與另一個網址一起使用（伺服器必須充當此新網址的代理）
@@ -110,13 +110,13 @@ TicketCkEditorEmailNotActivated=HTML編輯器未啟動。請將FCKEDITOR_ENABLE_
 TicketsDisableEmail=不要為服務單建立或訊息紀錄發送電子郵件
 TicketsDisableEmailHelp=預設情況下，在建立新服務單或訊息時會發送電子郵件。啟用此選項可關閉*所有*電子郵件通知
 TicketsLogEnableEmail=通過電子郵件啟用日誌
-TicketsLogEnableEmailHelp=每次更改時，都會向與此服務單有關的**每個聯絡人**發送電子郵件。
+TicketsLogEnableEmailHelp=每次更改時，都會向與此服務單有關的**每個聯絡人**寄送電子郵件。
 TicketParams=參數
 TicketsShowModuleLogo=在公共界面中顯示模組的商標
 TicketsShowModuleLogoHelp=啟用此選項可在公共界面的頁面中隱藏商標模組
 TicketsShowCompanyLogo=在公共界面上顯示公司商標
 TicketsShowCompanyLogoHelp=啟用此選項可在公共界面的頁面中隱藏主要公司的商標
-TicketsEmailAlsoSendToMainAddress=Also send a notification to the main email address
+TicketsEmailAlsoSendToMainAddress=同時向主要電子郵件地址寄送通知
 TicketsEmailAlsoSendToMainAddressHelp=Enable this option to also send an email to the address defined into setup "%s" (see tab "%s")
 TicketsLimitViewAssignedOnly=限制顯示分配給目前用戶的服務單。（對外部用戶無效，始終被限制於他們所依賴的合作方）
 TicketsLimitViewAssignedOnlyHelp=僅顯示分配給目前用戶的服務單。不適用於具有服務單管理權限的用戶。
@@ -128,7 +128,7 @@ TicketNumberingModules=服務單編號模組
 TicketsModelModule=服務單的文件範本
 TicketNotifyTiersAtCreation=建立時通知合作方
 TicketsDisableCustomerEmail=從公共界面建立服務單時，始終禁用電子郵件
-TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is added to a ticket
+TicketsPublicNotificationNewMessage=當有新的訊息/意見新增到服務單時寄送Email
 TicketsPublicNotificationNewMessageHelp=當公共界面有新增訊息時寄送電子郵件(給已分配用戶或寄送通知電子郵件給(更新)與/或通知電子郵件給)
 TicketPublicNotificationNewMessageDefaultEmail=通知電子郵件寄送到（更新）
 TicketPublicNotificationNewMessageDefaultEmailHelp=Send an email to this address for each new message notifications if the ticket doesn't have a user assigned to it or if the user doesn't have any known email.
@@ -304,13 +304,13 @@ BoxLastModifiedTicket=最新修改的服務單
 BoxLastModifiedTicketDescription=最新%s張修改的服務單
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=沒有最近修改的服務單
-BoxTicketType=Number of open tickets by type
-BoxTicketSeverity=Number of open tickets by severity
-BoxNoTicketSeverity=No tickets opened
-BoxTicketLastXDays=Number of new tickets by days the last %s days
-BoxTicketLastXDayswidget = Number of new tickets by days the last X days
-BoxNoTicketLastXDays=No new tickets the last %s days
-BoxNumberOfTicketByDay=Number of new tickets by day
-BoxNewTicketVSClose=Number of today's new tickets versus today's closed tickets
-TicketCreatedToday=Ticket created today
-TicketClosedToday=Ticket closed today
+BoxTicketType=依類型分佈的已開放服務單
+BoxTicketSeverity=按嚴重性分類的已開放服務單
+BoxNoTicketSeverity=沒有已開放服務單
+BoxTicketLastXDays=最近 %s 天中依日期的新服務單數量
+BoxTicketLastXDayswidget = 最近X天中依日期的新服務單數量
+BoxNoTicketLastXDays=最近%s天沒有新服務單
+BoxNumberOfTicketByDay=每日新服務單數量
+BoxNewTicketVSClose=今日的新服務單數量與今日已關閉的服務單數量
+TicketCreatedToday=今天建立的服務單
+TicketClosedToday=今日已關閉的服務單
diff --git a/htdocs/langs/zh_TW/trips.lang b/htdocs/langs/zh_TW/trips.lang
index af8c2c1e923..2a19c0f088f 100644
--- a/htdocs/langs/zh_TW/trips.lang
+++ b/htdocs/langs/zh_TW/trips.lang
@@ -33,7 +33,7 @@ ExpenseReportCanceledMessage=費用報表%s已取消。 <br> -用戶：%s <br> -
 ExpenseReportPaid=費用報表已支付
 ExpenseReportPaidMessage=費用報表%s已支付。 <br> -用戶：%s <br> -付款人：%s <br>點擊此處顯示費用報表：%s
 TripId=費用報表編號
-AnyOtherInThisListCanValidate=通知進行驗證的人。
+AnyOtherInThisListCanValidate=被告知驗證請求的人。
 TripSociete=公司資訊
 TripNDF=費用報表資訊
 PDFStandardExpenseReports=標準範本，用於產生費用報表的PDF文件
@@ -63,14 +63,14 @@ EX_DOC=文件資料
 EX_CUR=客戶禮品
 EX_OTR=其他禮品
 EX_POS=郵資
-EX_CAM=CV maintenance and repair
+EX_CAM=履歷維護與修復
 EX_EMM=員工餐點
 EX_GUM=客人餐點
 EX_BRE=早餐
-EX_FUE_VP=Fuel PV
-EX_TOL_VP=Toll PV
-EX_PAR_VP=Parking PV
-EX_CAM_VP=PV maintenance and repair
+EX_FUE_VP=燃料PV
+EX_TOL_VP=收費PV
+EX_PAR_VP=停車PV
+EX_CAM_VP=PV維護與修復
 DefaultCategoryCar=預設運輸模式
 DefaultRangeNumber=預設範圍號碼
 UploadANewFileNow=立即上傳新文件
@@ -110,7 +110,7 @@ ExpenseReportPayment=費用報表支付
 ExpenseReportsToApprove=需要批准的費用報表
 ExpenseReportsToPay=需要支付的費用報表
 ConfirmCloneExpenseReport=您確定要複製此費用報表嗎？
-ExpenseReportsIk=費用報表里程索引
+ExpenseReportsIk=里程費用的設定
 ExpenseReportsRules=費用報表規則
 ExpenseReportIkDesc=您可以修改依類別的里程費用計算並且事先定義範圍。 <b>d</b>是以公里為單位的距離
 ExpenseReportRulesDesc=您可以建立或更新任何計算規則。用戶建立新費用報表時將使用此部分
@@ -145,7 +145,7 @@ nolimitbyEX_DAY=按天（無限制）
 nolimitbyEX_MON=按月（無限制）
 nolimitbyEX_YEA=按年（無限制）
 nolimitbyEX_EXP=按行（無限制）
-CarCategory=汽車類別
+CarCategory=車輛類別
 ExpenseRangeOffset=抵銷金額：%s
 RangeIk=里程範圍
 AttachTheNewLineToTheDocument=將行附加到已上傳的檔案
diff --git a/htdocs/langs/zh_TW/users.lang b/htdocs/langs/zh_TW/users.lang
index 4a17d9da51b..9e1e3162a55 100644
--- a/htdocs/langs/zh_TW/users.lang
+++ b/htdocs/langs/zh_TW/users.lang
@@ -12,7 +12,7 @@ PasswordChangedTo=密碼更改為：%s
 SubjectNewPassword=您新的密碼是 %s
 GroupRights=群組權限
 UserRights=用戶權限
-Credentials=Credentials
+Credentials=證書
 UserGUISetup=用戶顯示設定
 DisableUser=停用用戶
 DisableAUser=停用一位用戶
@@ -73,7 +73,7 @@ ExportDataset_user_1=用戶及其屬性
 DomainUser=網域用戶%s
 Reactivate=重新啟用
 CreateInternalUserDesc=此表單使您可以在公司/組織中建立內部用戶。要建立外部用戶（客戶，供應商等），請使用該第三方聯絡卡中的“建立Dolibarr用戶”按鈕。
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization, or is a partner user outside of your organization that may need to see more data  than data related to his company (the permission system will define what he can or can't see or do).<br>An <b>external</b> user is a customer, vendor or other that must view ONLY data related to himself (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, you must grant permissions on the features that the user need.
+InternalExternalDesc=連絡人<b> 內部 </b> 用戶是屬於您公司/組織的用戶，或者是您組織外部的合作夥伴用戶，可能需要查看比其公司相關的資料更多的資料（權限系統將定義他可以或不可以看或做什麼）。 <br> 一個<b> 外部 </b> 用戶是客戶、供應商或其他僅可以查看與自己相關的資料的用戶（可以從合作方的通訊錄中為合作方建立外部用戶）。 <br> <br> 在這兩種情況下，您都必須授予用戶所需功能的權限。
 PermissionInheritedFromAGroup=因為從權限授予一個用戶的一組繼承。
 Inherited=繼承
 UserWillBe=建立的用戶將是
@@ -106,7 +106,7 @@ UseTypeFieldToChange=使用欄位類型進行更改
 OpenIDURL=OpenID URL
 LoginUsingOpenID=使用OpenID登入
 WeeklyHours=工作小時數（每週）
-ExpectedWorkedHours=Expected hours worked per week
+ExpectedWorkedHours=預計每週工作時數
 ColorUser=用戶顏色
 DisabledInMonoUserMode=在維護模式下已關閉
 UserAccountancyCode=用戶帳號
@@ -116,7 +116,7 @@ DateOfEmployment=到職日期
 DateEmployment=雇傭期間
 DateEmploymentstart=入職日期
 DateEmploymentEnd=離職日期
-RangeOfLoginValidity=Access validity date range
+RangeOfLoginValidity=訪問有效日期範圍
 CantDisableYourself=您不能關閉自己的用戶記錄
 ForceUserExpenseValidator=強制使用費用報告表驗證
 ForceUserHolidayValidator=強制使用休假請求驗證
diff --git a/htdocs/langs/zh_TW/withdrawals.lang b/htdocs/langs/zh_TW/withdrawals.lang
index 10539908125..3d27a5d350c 100644
--- a/htdocs/langs/zh_TW/withdrawals.lang
+++ b/htdocs/langs/zh_TW/withdrawals.lang
@@ -42,9 +42,10 @@ LastWithdrawalReceipt=最新%s張直接轉帳付款收據
 MakeWithdrawRequest=提出直接轉帳付款請求
 MakeBankTransferOrder=提出貸記轉帳請求
 WithdrawRequestsDone=已記錄%s直接轉帳付款請求
-BankTransferRequestsDone=%s credit transfer requests recorded
+BankTransferRequestsDone=記錄了%s的信用轉移請求
 ThirdPartyBankCode=合作方銀行代碼
 NoInvoiceCouldBeWithdrawed=沒有直接轉帳成功的發票。檢查發票上是否有有效IBAN的公司，以及IBAN是否具有模式為<strong> %s </strong>的UMR（唯一授權參考）。
+WithdrawalCantBeCreditedTwice=此提款收據已標記為已記入；此無法執行兩次，因為這可能會產生重複的付款和銀行分錄。
 ClassCredited=分類為已記入
 ClassCreditedConfirm=您確定要將此提款收據分類為銀行帳戶中的已記入嗎？
 TransData=傳送日期
@@ -98,8 +99,8 @@ ShowWithdraw=顯示直接轉帳付款訂單
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=但是，如果發票中至少有一個直接轉帳付款訂單尚未處理，則不會將其設定為已付款以允許事先提款管理。
 DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Payment by direct debit to generate and manage the direct debit order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
 DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Payment by credit transfer to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-WithdrawalFile=Debit order file
-CreditTransferFile=Credit transfer file
+WithdrawalFile=直接轉帳文件
+CreditTransferFile=信用轉帳文件
 SetToStatusSent=設定狀態為“檔案已傳送”
 ThisWillAlsoAddPaymentOnInvoice=這還將記錄發票的付款，如果要支付的餘額為空白，則將其分類為“已付款”
 StatisticsByLineStatus=依照行狀態統計
@@ -109,7 +110,7 @@ RUMLong=唯一授權參考
 RUMWillBeGenerated=如果為空，則在保存銀行帳戶資訊後將產生UMR（唯一授權參考）。
 WithdrawMode=直接轉帳付款模式 (FRST or RECUR)
 WithdrawRequestAmount=直接轉帳付款請求金額：
-BankTransferAmount=Amount of Credit Transfer request:
+BankTransferAmount=轉帳金額需求:
 WithdrawRequestErrorNilAmount=無法為空金額建立直接轉帳付款請求。
 SepaMandate=SEPA直接轉帳付款授權
 SepaMandateShort=SEPA授權
@@ -125,19 +126,19 @@ SEPAFrstOrRecur=付款方式
 ModeRECUR=定期付款
 ModeFRST=一次性付款
 PleaseCheckOne=請只確認一個
-CreditTransferOrderCreated=Credit transfer order %s created
+CreditTransferOrderCreated=已建立轉帳訂單%s
 DirectDebitOrderCreated=已建立直接轉帳付款訂單%s
 AmountRequested=要求的金額
 SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=執行日期
 CreateForSepa=建立直接轉帳付款檔案
-ICS=Creditor Identifier CI for direct debit
-ICSTransfer=Creditor Identifier CI for bank transfer
+ICS=直接借記的債權人確認CI
+ICSTransfer=銀行轉帳的債權人確認 CI
 END_TO_END="EndToEndId" SEPA XML標籤- 每筆交易分配的唯一ID
 USTRD="Unstructured" SEPA XML標籤
 ADDDAYS=將天數加到執行日期
-NoDefaultIBANFound=No default IBAN found for this third party
+NoDefaultIBANFound=沒找到此合作方的預設IBAN
 ### Notifications
 InfoCreditSubject=銀行支付直接轉帳付款訂單%s
 InfoCreditMessage=直接轉帳付款訂單%s已由銀行<br>支付。付款資料：%s
@@ -147,6 +148,6 @@ InfoTransData=金額：%s <br> 方式：%s <br>日期：%s
 InfoRejectSubject=直接轉帳付款訂單已被拒絕
 InfoRejectMessage=您好，<br><br>銀行拒絕了與公司%s相關的發票%s的直接轉帳付款訂單 。%s的金額已被銀行拒絕 <br> <br>--<br> %s
 ModeWarning=未設定實際模式選項，我們將在此模擬後停止
-ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
-ErrorICSmissing=Missing ICS in Bank account %s
-TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Total amount of direct debit order differs from sum of lines
+ErrorCompanyHasDuplicateDefaultBAN=ID為%s的公司擁有多個預設銀行帳戶.無法得知要使用哪一個.
+ErrorICSmissing=銀行帳戶%s遺失ICS
+TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=直接借記訂單總金額與行的總和不同

From 15fdf95c227b1799c08698d34d9aab9fc7fde309 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 27 Jun 2021 00:02:25 +0200
Subject: [PATCH 0902/1497] css

---
 htdocs/societe/checkvat/checkVatPopup.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/societe/checkvat/checkVatPopup.php b/htdocs/societe/checkvat/checkVatPopup.php
index 577256f06aa..21cd629dc67 100644
--- a/htdocs/societe/checkvat/checkVatPopup.php
+++ b/htdocs/societe/checkvat/checkVatPopup.php
@@ -41,7 +41,7 @@ $conf->dol_hide_leftmenu = 1;
 
 llxHeader('', $langs->trans("VATIntraCheckableOnEUSite"));
 
-print '<div class="vatcheckarea" style="margin-bottom: 10px">';
+print '<div class="vatcheckarea margintoponly marginbottomonly">';
 
 print load_fiche_titre($langs->trans("VATIntraCheckableOnEUSite"), '', 'title_setup');
 

From 8332385bd5962eee9fbe2ad48c8d8276fa8299ad Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Sun, 27 Jun 2021 08:40:37 +0200
Subject: [PATCH 0903/1497] Fix links in box last BOM

---
 htdocs/core/boxes/box_boms.php | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/htdocs/core/boxes/box_boms.php b/htdocs/core/boxes/box_boms.php
index ee248d0a083..23e525fc00b 100644
--- a/htdocs/core/boxes/box_boms.php
+++ b/htdocs/core/boxes/box_boms.php
@@ -85,7 +85,11 @@ class box_boms extends ModeleBoxes
 		$this->info_box_head = array('text' => $langs->trans("BoxTitleLatestModifiedBoms", $max));
 
 		if ($user->rights->bom->read) {
-			$sql = "SELECT p.ref as product_ref, p.tobuy, p.tosell";
+			$sql = "SELECT p.ref as product_ref";
+			$sql .= ", p.rowid as productid";
+			$sql .= ", p.tosell";
+			$sql .= ", p.tobuy";
+			$sql .= ", p.tobatch";
 			$sql .= ", c.rowid";
 			$sql .= ", c.date_creation";
 			$sql .= ", c.tms";
@@ -111,12 +115,13 @@ class box_boms extends ModeleBoxes
 
 					$bomstatic->id = $objp->rowid;
 					$bomstatic->ref = $objp->ref;
-					$bomstatic->id = $objp->socid;
 					$bomstatic->status = $objp->status;
 
+					$productstatic->id = $objp->productid;
 					$productstatic->ref = $objp->product_ref;
-					$productstatic->status = $objp->tobuy;
-					$productstatic->status_buy = $objp->tosell;
+					$productstatic->status = $objp->tosell;
+					$productstatic->status_buy = $objp->tobuy;
+					$productstatic->status_batch = $objp->tobatch;
 
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="nowraponall"',
@@ -130,17 +135,6 @@ class box_boms extends ModeleBoxes
 						'asis' => 1,
 					);
 
-					if (!empty($conf->global->BOM_BOX_LAST_BOMS_SHOW_VALIDATE_USER)) {
-						if ($objp->fk_user_valid > 0) {
-							$userstatic->fetch($objp->fk_user_valid);
-						}
-						$this->info_box_contents[$line][] = array(
-							'td' => 'class="right"',
-							'text' => (($objp->fk_user_valid > 0) ? $userstatic->getNomUrl(1) : ''),
-							'asis' => 1,
-						);
-					}
-
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="right"',
 						'text' => dol_print_date($datem, 'day', 'tzuserrel'),

From c3cbd295422cfcc4015548b3b4bcb27423d242eb Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Sun, 27 Jun 2021 09:04:47 +0200
Subject: [PATCH 0904/1497] Fix #17836 : order delay warning in list was wrong,
 date_commande is deprecated

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

diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 4890f1c0a2e..3712a6eea1b 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -4054,7 +4054,7 @@ class Commande extends CommonOrder
 
 		$now = dol_now();
 
-		return max($this->date_commande, $this->date_livraison) < ($now - $conf->commande->client->warning_delay);
+		return max($this->date, $this->date_livraison) < ($now - $conf->commande->client->warning_delay);
 	}
 
 	/**

From 2e2d9002ad5db73f19f385ec0ba2c77891164aef Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 27 Jun 2021 14:54:17 +0200
Subject: [PATCH 0905/1497] Code comment

---
 htdocs/admin/modules.php          | 2 +-
 htdocs/core/lib/functions.lib.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 3b443276509..494dfc2f625 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -29,7 +29,7 @@
  *  \brief      Page to activate/disable all modules
  */
 
-if (!defined('CSRFCHECK_WITH_TOKEN') && (empty($_GET['action']) || $_GET['action'] != 'reset')) {	// We do not force security to disable modules so we can do it if problem
+if (!defined('CSRFCHECK_WITH_TOKEN') && (empty($_GET['action']) || $_GET['action'] != 'reset')) {	// We force security except to disable modules so we can do it if problem of a module
 	define('CSRFCHECK_WITH_TOKEN', '1'); // Force use of CSRF protection with tokens even for GET
 }
 
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 8573cdfe961..e3b288aff8e 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3119,7 +3119,7 @@ function getUserRemoteIP()
 	if (empty($_SERVER['HTTP_X_FORWARDED_FOR']) || preg_match('/[^0-9\.\:,\[\]]/', $_SERVER['HTTP_X_FORWARDED_FOR'])) {
 		if (empty($_SERVER['HTTP_CLIENT_IP']) || preg_match('/[^0-9\.\:,\[\]]/', $_SERVER['HTTP_CLIENT_IP'])) {
 			if (empty($_SERVER["HTTP_CF_CONNECTING_IP"])) {
-				$ip = (empty($_SERVER['REMOTE_ADDR']) ? '' : $_SERVER['REMOTE_ADDR']);	// value may have been forged by client
+				$ip = (empty($_SERVER['REMOTE_ADDR']) ? '' : $_SERVER['REMOTE_ADDR']);	// value may have been the IP of the proxy and not the client
 			} else {
 				$ip = $_SERVER["HTTP_CF_CONNECTING_IP"];	// value here may have been forged by client
 			}

From 813440bd16cb8e6bf9aac8312744ed592d82e7ac Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 27 Jun 2021 18:29:54 +0200
Subject: [PATCH 0906/1497] Trans

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

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index efe674e7ca8..a05c9e7ea97 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -2144,4 +2144,5 @@ YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You s
 RandomlySelectedIfSeveral=Randomly selected if several pictures are available
 DatabasePasswordObfuscated=Database password is obfuscated in conf file
 DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
-APIsAreNotEnabled=APIs modules are not enabled
\ No newline at end of file
+APIsAreNotEnabled=APIs modules are not enabled
+YouShouldSetThisToOff=You should set this to 0 or off
\ No newline at end of file

From fa28a02d748a3845cab7379104cc58e9ec37e698 Mon Sep 17 00:00:00 2001
From: lvessiller <lvessiller@open-dsi.fr>
Date: Mon, 28 Jun 2021 11:03:22 +0200
Subject: [PATCH 0907/1497] FIX update contact birthday alert

---
 htdocs/contact/class/contact.class.php | 56 ++++++++++++--------------
 1 file changed, 25 insertions(+), 31 deletions(-)

diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index ac415afce6c..7febbf32fc0 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -740,38 +740,32 @@ class Contact extends CommonObject
 			$this->error = $this->db->lasterror();
 		}
 
-		// Mis a jour alerte birthday
-		if ($this->birthday_alert)
-		{
-			//check existing
-			$sql_check = "SELECT rowid FROM ".MAIN_DB_PREFIX."user_alert WHERE type=1 AND fk_contact=".$this->db->escape($id)." AND fk_user=".$user->id;
-			$result_check = $this->db->query($sql_check);
-			if (!$result_check || ($this->db->num_rows($result_check) < 1))
-			{
-				//insert
-				$sql = "INSERT INTO ".MAIN_DB_PREFIX."user_alert(type,fk_contact,fk_user) ";
-				$sql .= "VALUES (1,".$this->db->escape($id).",".$user->id.")";
-				$result = $this->db->query($sql);
-				if (!$result)
-				{
-                    $error++;
-                    $this->error = $this->db->lasterror();
+		if ($user) {
+			// Mis a jour alerte birthday
+			if ($this->birthday_alert) {
+				//check existing
+				$sql_check = "SELECT rowid FROM " . MAIN_DB_PREFIX . "user_alert WHERE type=1 AND fk_contact=" . $this->db->escape($id) . " AND fk_user=" . $user->id;
+				$result_check = $this->db->query($sql_check);
+				if (!$result_check || ($this->db->num_rows($result_check) < 1)) {
+					//insert
+					$sql = "INSERT INTO " . MAIN_DB_PREFIX . "user_alert(type,fk_contact,fk_user) ";
+					$sql .= "VALUES (1," . $this->db->escape($id) . "," . $user->id . ")";
+					$result = $this->db->query($sql);
+					if (!$result) {
+						$error++;
+						$this->error = $this->db->lasterror();
+					}
+				} else {
+					$result = true;
+				}
+			} else {
+				$sql = "DELETE FROM " . MAIN_DB_PREFIX . "user_alert ";
+				$sql .= "WHERE type=1 AND fk_contact=" . $this->db->escape($id) . " AND fk_user=" . $user->id;
+				$result = $this->db->query($sql);
+				if (!$result) {
+					$error++;
+					$this->error = $this->db->lasterror();
 				}
-			}
-			else
-			{
-				$result = true;
-			}
-		}
-		else
-		{
-			$sql = "DELETE FROM ".MAIN_DB_PREFIX."user_alert ";
-			$sql .= "WHERE type=1 AND fk_contact=".$this->db->escape($id)." AND fk_user=".$user->id;
-			$result = $this->db->query($sql);
-			if (!$result)
-			{
-                $error++;
-                $this->error = $this->db->lasterror();
 			}
 		}
 

From 923a015aac52a434c008aca4c7f768f8471d5f33 Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Mon, 28 Jun 2021 11:38:34 +0200
Subject: [PATCH 0908/1497] Fix #18014 : update of compta/facture/card.php

---
 htdocs/compta/facture/card.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 585cabc1be4..b44b7d22fd8 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -2375,12 +2375,12 @@ if (empty($reshook)) {
 				setEventMessages($mesg, null, 'warnings');
 				$error++;
 				$result = -1;
+			} elseif (GETPOST('progress') < $percent) {
+				$mesg = '<div class="warning">'.$langs->trans("CantBeLessThanMinPercent").'</div>';
+				setEventMessages($mesg, null, 'warnings');
+				$error++;
+				$result = -1;
 			}
-		} elseif (GETPOST('progress') < $percent) {
-			$mesg = '<div class="warning">'.$langs->trans("CantBeLessThanMinPercent").'</div>';
-			setEventMessages($mesg, null, 'warnings');
-			$error++;
-			$result = -1;
 		}
 
 		// Check minimum price

From 477b1272e01c881dfef4a2df8a5fdc671b52efe2 Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Mon, 28 Jun 2021 13:30:26 +0200
Subject: [PATCH 0909/1497] Fix CI bot error

---
 htdocs/langs/nl_NL/main.lang | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/langs/nl_NL/main.lang b/htdocs/langs/nl_NL/main.lang
index 4a0eb506398..75529001b12 100644
--- a/htdocs/langs/nl_NL/main.lang
+++ b/htdocs/langs/nl_NL/main.lang
@@ -10,8 +10,8 @@ SeparatorDecimal=,
 SeparatorThousand=Space
 FormatDateShort=%m/%d/%Y
 FormatDateShortInput=%m/%d/%Y
-FormatDateShortJava=MM/dd/jjjj
-FormatDateShortJavaInput=MM/dd/jjjj
+FormatDateShortJava=MM/dd/yyyy
+FormatDateShortJavaInput=MM/dd/yyyy
 FormatDateShortJQuery=mm/dd/jj
 FormatDateShortJQueryInput=mm/dd/jj
 FormatHourShortJQuery=HH:MI

From 69affc5df54694cde74eb789d6be27ae3adca26e Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Mon, 28 Jun 2021 16:25:16 +0200
Subject: [PATCH 0910/1497] Fix php 8 warnings

---
 htdocs/commande/class/commande.class.php | 8 +++++---
 htdocs/commande/list.php                 | 8 ++++++--
 htdocs/fourn/commande/list.php           | 3 ++-
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 2805f4556d3..a819bb40f1c 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -4131,7 +4131,7 @@ class OrderLine extends CommonOrderLine
 		$sql .= ' cd.fk_unit,';
 		$sql .= ' cd.fk_multicurrency, cd.multicurrency_code, cd.multicurrency_subprice, cd.multicurrency_total_ht, cd.multicurrency_total_tva, cd.multicurrency_total_ttc,';
 		$sql .= ' p.ref as product_ref, p.label as product_label, p.description as product_desc, p.tobatch as product_tobatch,';
-		$sql .= ' cd.date_start, cd.date_end';
+		$sql .= ' cd.date_start, cd.date_end, cd.vat_src_code';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'commandedet as cd';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON cd.fk_product = p.rowid';
 		$sql .= ' WHERE cd.rowid = '.((int) $rowid);
@@ -4352,7 +4352,8 @@ class OrderLine extends CommonOrderLine
 
 		// if buy price not defined, define buyprice as configured in margin admin
 		if ($this->pa_ht == 0 && $pa_ht_isemptystring) {
-			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0) {
+			$result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product);
+			if ($result < 0) {
 				return $result;
 			} else {
 				$this->pa_ht = $result;
@@ -4529,7 +4530,8 @@ class OrderLine extends CommonOrderLine
 
 		// if buy price not defined, define buyprice as configured in margin admin
 		if ($this->pa_ht == 0 && $pa_ht_isemptystring) {
-			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0) {
+			$result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product);
+			if ($result < 0) {
 				return $result;
 			} else {
 				$this->pa_ht = $result;
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 98bbd00b351..73413d1070f 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -1373,7 +1373,7 @@ if ($resql) {
 	$generic_product = new Product($db);
 	$userstatic = new User($db);
 	$i = 0;
-	$totalarray = array();
+	$totalarray = array('nbfield' => 0, 'val' => array(), 'pos' => array());
 	while ($i < min($num, $limit)) {
 		$obj = $db->fetch_object($resql);
 
@@ -1610,7 +1610,11 @@ if ($resql) {
 			if (!$i) {
 				$totalarray['pos'][$totalarray['nbfield']] = 'c.total_ht';
 			}
-			  $totalarray['val']['c.total_ht'] += $obj->total_ht;
+			if (isset($totalarray['val']['c.total_ht'])) {
+				$totalarray['val']['c.total_ht'] += $obj->total_ht;
+			} else {
+				$totalarray['val']['c.total_ht'] = $obj->total_ht;
+			}
 		}
 		// Amount VAT
 		if (!empty($arrayfields['c.total_vat']['checked'])) {
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index c644f9e35a5..bf8e53e8b82 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -610,7 +610,7 @@ $sql .= ' cf.fk_multicurrency, cf.multicurrency_code, cf.multicurrency_tx, cf.mu
 $sql .= ' cf.date_creation as date_creation, cf.tms as date_update,';
 $sql .= ' cf.note_public, cf.note_private,';
 $sql .= " p.rowid as project_id, p.ref as project_ref, p.title as project_title,";
-$sql .= " u.firstname, u.lastname, u.photo, u.login, u.email as user_email";
+$sql .= " u.firstname, u.lastname, u.photo, u.login, u.email as user_email, u.statut as user_status";
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
@@ -1346,6 +1346,7 @@ if ($resql) {
 		$userstatic->login = $obj->login;
 		$userstatic->photo = $obj->photo;
 		$userstatic->email = $obj->user_email;
+		$userstatic->statut = $obj->user_status;
 		if (!empty($arrayfields['u.login']['checked'])) {
 			print '<td class="tdoverflowmax150">';
 			if ($userstatic->id) {

From d7fbddb8e1387b382a64bf3f83c4a11ccf6fa183 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 28 Jun 2021 16:45:29 +0200
Subject: [PATCH 0911/1497] Add rowid/ref in response

---
 htdocs/societe/class/societe.class.php | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index fdfd32cb5d8..a213cca5577 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -4383,21 +4383,24 @@ class Societe extends CommonObject
 			$table = 'supplier_proposal';
 		}
 
-		$sql  = "SELECT rowid, total_ht, total_ttc, fk_statut as status FROM ".MAIN_DB_PREFIX.$table." as f";
-		$sql .= " WHERE fk_soc = ".$this->id;
+		$sql  = "SELECT rowid, ref, total_ht, total_ttc, fk_statut as status FROM ".MAIN_DB_PREFIX.$table." as f";
+		$sql .= " WHERE fk_soc = ".((int) $this->id);
 		if ($mode == 'supplier') {
 			$sql .= " AND entity IN (".getEntity('supplier_proposal').")";
 		} else {
 			$sql .= " AND entity IN (".getEntity('propal').")";
 		}
 
-		dol_syslog("getOutstandingProposals", LOG_DEBUG);
+		dol_syslog("getOutstandingProposals for fk_soc = ".((int) $this->id), LOG_DEBUG);
+
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$outstandingOpened = 0;
 			$outstandingTotal = 0;
 			$outstandingTotalIncTax = 0;
+			$arrayofref = array();
 			while ($obj = $this->db->fetch_object($resql)) {
+				$arrayofref[$obj->rowid] = $obj->ref;
 				$outstandingTotal += $obj->total_ht;
 				$outstandingTotalIncTax += $obj->total_ttc;
 				if ($obj->status != 0) {
@@ -4405,7 +4408,7 @@ class Societe extends CommonObject
 					$outstandingOpened += $obj->total_ttc;
 				}
 			}
-			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax); // 'opened' is 'incl taxes'
+			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax, 'refs'=>$arrayofref); // 'opened' is 'incl taxes'
 		} else {
 			return array();
 		}
@@ -4424,8 +4427,8 @@ class Societe extends CommonObject
 			$table = 'commande_fournisseur';
 		}
 
-		$sql  = "SELECT rowid, total_ht, total_ttc, fk_statut as status FROM ".MAIN_DB_PREFIX.$table." as f";
-		$sql .= " WHERE fk_soc = ".$this->id;
+		$sql  = "SELECT rowid, ref, total_ht, total_ttc, fk_statut as status FROM ".MAIN_DB_PREFIX.$table." as f";
+		$sql .= " WHERE fk_soc = ".((int) $this->id);
 		if ($mode == 'supplier') {
 			$sql .= " AND entity IN (".getEntity('supplier_order').")";
 		} else {
@@ -4438,7 +4441,9 @@ class Societe extends CommonObject
 			$outstandingOpened = 0;
 			$outstandingTotal = 0;
 			$outstandingTotalIncTax = 0;
+			$arrayofref = array();
 			while ($obj = $this->db->fetch_object($resql)) {
+				$arrayofref[$obj->rowid] = $obj->ref;
 				$outstandingTotal += $obj->total_ht;
 				$outstandingTotalIncTax += $obj->total_ttc;
 				if ($obj->status != 0) {
@@ -4446,7 +4451,7 @@ class Societe extends CommonObject
 					$outstandingOpened += $obj->total_ttc;
 				}
 			}
-			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax); // 'opened' is 'incl taxes'
+			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax, 'refs'=>$arrayofref); // 'opened' is 'incl taxes'
 		} else {
 			return array();
 		}
@@ -4473,7 +4478,7 @@ class Societe extends CommonObject
 		 $alreadypayed=price2num($paiement + $creditnotes + $deposits,'MT');
 		 $remaintopay=price2num($invoice->total_ttc - $paiement - $creditnotes - $deposits,'MT');
 		 */
-		$sql = "SELECT rowid, total_ht, total_ttc, paye, type, fk_statut as status, close_code FROM ".MAIN_DB_PREFIX.$table." as f";
+		$sql = "SELECT rowid, ref, total_ht, total_ttc, paye, type, fk_statut as status, close_code FROM ".MAIN_DB_PREFIX.$table." as f";
 		$sql .= " WHERE fk_soc = ".((int) $this->id);
 		if (!empty($late)) {
 			$sql .= " AND date_lim_reglement < '".$this->db->idate(dol_now())."'";
@@ -4490,6 +4495,7 @@ class Societe extends CommonObject
 			$outstandingOpened = 0;
 			$outstandingTotal = 0;
 			$outstandingTotalIncTax = 0;
+			$arrayofref = array();
 			if ($mode == 'supplier') {
 				require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 				$tmpobject = new FactureFournisseur($this->db);
@@ -4498,6 +4504,7 @@ class Societe extends CommonObject
 				$tmpobject = new Facture($this->db);
 			}
 			while ($obj = $this->db->fetch_object($resql)) {
+				$arrayofref[$obj->rowid] = $obj->ref;
 				$tmpobject->id = $obj->rowid;
 
 				if ($obj->status != $tmpobject::STATUS_DRAFT                                           // Not a draft
@@ -4524,7 +4531,7 @@ class Societe extends CommonObject
 					$outstandingOpened -= $tmpobject->getSumFromThisCreditNotesNotUsed();
 				}
 			}
-			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax); // 'opened' is 'incl taxes'
+			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax, 'refs'=>$arrayofref); // 'opened' is 'incl taxes'
 		} else {
 			dol_syslog("Sql error ".$this->db->lasterror, LOG_ERR);
 			return array();

From b534fbae77bfe951fc36cf21cdc6aedf55a7aa14 Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Mon, 28 Jun 2021 19:12:19 +0200
Subject: [PATCH 0912/1497] Fix warning php 8 in product ajax.

---
 htdocs/product/ajax/products.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/product/ajax/products.php b/htdocs/product/ajax/products.php
index ac2e70e3287..77acafbbd55 100644
--- a/htdocs/product/ajax/products.php
+++ b/htdocs/product/ajax/products.php
@@ -235,7 +235,7 @@ if (!empty($action) && $action == 'fetch' && !empty($id)) {
 	// When used from jQuery, the search term is added as GET param "term".
 	$searchkey = (($idprod && GETPOST($idprod, 'alpha')) ? GETPOST($idprod, 'alpha') : (GETPOST($htmlname, 'alpha') ? GETPOST($htmlname, 'alpha') : ''));
 
-	if (!is_object($form)) {
+	if (!isset($form) || !is_object($form)) {
 		$form = new Form($db);
 	}
 

From 4558efdea37875a456beba1efdc781d06c2ef2b7 Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Mon, 28 Jun 2021 19:21:29 +0200
Subject: [PATCH 0913/1497] Fix travis, also fixed upstream transifex

---
 htdocs/langs/nl_NL/main.lang | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/langs/nl_NL/main.lang b/htdocs/langs/nl_NL/main.lang
index 4a0eb506398..9c0fcdfa791 100644
--- a/htdocs/langs/nl_NL/main.lang
+++ b/htdocs/langs/nl_NL/main.lang
@@ -10,10 +10,10 @@ SeparatorDecimal=,
 SeparatorThousand=Space
 FormatDateShort=%m/%d/%Y
 FormatDateShortInput=%m/%d/%Y
-FormatDateShortJava=MM/dd/jjjj
-FormatDateShortJavaInput=MM/dd/jjjj
-FormatDateShortJQuery=mm/dd/jj
-FormatDateShortJQueryInput=mm/dd/jj
+FormatDateShortJava=MM/dd/yyyy
+FormatDateShortJavaInput=MM/dd/yyyy
+FormatDateShortJQuery=mm/dd/yy
+FormatDateShortJQueryInput=mm/dd/yy
 FormatHourShortJQuery=HH:MI
 FormatHourShort=%I:%M %p
 FormatHourShortDuration=%H:%M

From 9b59f264fd873129fe50990415187a399cfb51a8 Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Mon, 28 Jun 2021 20:00:10 +0200
Subject: [PATCH 0914/1497] Fix some php 8 warning

---
 htdocs/core/class/html.form.class.php     | 2 +-
 htdocs/core/tpl/object_discounts.tpl.php  | 2 +-
 htdocs/core/tpl/objectline_create.tpl.php | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index b3ed477596c..33e2ed8b972 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -7778,7 +7778,7 @@ class Form
 						print '<input type="radio" name="idtolinkto" id="'.$key.'_'.$objp->rowid.'" value="'.$objp->rowid.'">';
 						print '</td>';
 						print '<td class="center"><label for="'.$key.'_'.$objp->rowid.'">'.$objp->ref.'</label></td>';
-						print '<td>'.(!empty($objp->ref_client) ? $objp->ref_client : $objp->ref_supplier).'</td>';
+						print '<td>'.(!empty($objp->ref_client) ? $objp->ref_client : (!empty($objp->ref_supplier) ? $objp->ref_supplier : '')).'</td>';
 						print '<td class="right">';
 						if ($possiblelink['label'] == 'LinkToContract') {
 							$form = new Form($this->db);
diff --git a/htdocs/core/tpl/object_discounts.tpl.php b/htdocs/core/tpl/object_discounts.tpl.php
index e5bf1e1017c..4761e5857c2 100644
--- a/htdocs/core/tpl/object_discounts.tpl.php
+++ b/htdocs/core/tpl/object_discounts.tpl.php
@@ -53,7 +53,7 @@ if ($isNewObject) {
 
 // Is there is commercial discount or down payment available ?
 if ($absolute_discount > 0) {
-	if ($cannotApplyDiscount || !$isInvoice || $isNewObject || $object->statut > $objclassname::STATUS_DRAFT || $object->type == $objclassname::TYPE_CREDIT_NOTE || $object->type == $objclassname::TYPE_DEPOSIT) {
+	if (!empty($cannotApplyDiscount) || !$isInvoice || $isNewObject || $object->statut > $objclassname::STATUS_DRAFT || $object->type == $objclassname::TYPE_CREDIT_NOTE || $object->type == $objclassname::TYPE_DEPOSIT) {
 		$translationKey = !empty($discount_type) ? 'HasAbsoluteDiscountFromSupplier' : 'CompanyHasAbsoluteDiscount';
 		$text = $langs->trans($translationKey, price($absolute_discount), $langs->transnoentities("Currency".$conf->currency)).'.';
 
diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index e181acd16e1..474b1a24957 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -128,7 +128,7 @@ if ($nolinesbefore) {
 		<td class="linecoldiscount right"><?php echo $langs->trans('ReductionShort'); ?></td>
 		<?php
 		// Fields for situation invoice
-		if ($this->situation_cycle_ref) {
+		if (isset($this->situation_cycle_ref) && $this->situation_cycle_ref) {
 			print '<td class="linecolcycleref right">'.$langs->trans('Progress').'</td>';
 			print '<td class="linecolcycleref2 right"></td>';
 		}
@@ -416,7 +416,7 @@ if ($nolinesbefore) {
 	?>
 	<td class="nobottom nowrap linecoldiscount right"><input type="text" size="1" name="remise_percent" id="remise_percent" class="flat right" value="<?php echo (GETPOSTISSET("remise_percent") ? GETPOST("remise_percent", 'alpha', 2) : $remise_percent); ?>"><span class="hideonsmartphone">%</span></td>
 	<?php
-	if ($this->situation_cycle_ref) {
+	if (isset($this->situation_cycle_ref) && $this->situation_cycle_ref) {
 		$coldisplay++;
 		print '<td class="nobottom nowrap right"><input class="falt right" type="text" size="1" value="0" name="progress">%</td>';
 		$coldisplay++;

From 69e0381e55c1956555a303f45064a53eb8c6b807 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 29 Jun 2021 02:39:20 +0200
Subject: [PATCH 0915/1497] Prepare v14

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

diff --git a/htdocs/core/modules/modKnowledgeManagement.class.php b/htdocs/core/modules/modKnowledgeManagement.class.php
index 14e5aabb681..6d9bef40232 100644
--- a/htdocs/core/modules/modKnowledgeManagement.class.php
+++ b/htdocs/core/modules/modKnowledgeManagement.class.php
@@ -68,7 +68,7 @@ class modKnowledgeManagement extends DolibarrModules
 		$this->descriptionlong = "Manage a Knowledge Management (KM) or Help-Desk base";
 
 		// Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'
-		$this->version = 'development';
+		$this->version = 'experimental';
 		// Url to the file with your last numberversion of this module
 		//$this->url_last_version = 'http://www.example.com/versionmodule.txt';
 

From c90730d5304ca809c00df17a98409427f0915ba5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 29 Jun 2021 02:40:05 +0200
Subject: [PATCH 0916/1497] Prepare branch to dev v15

---
 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 777fde21885..1f7a51c706d 100644
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -34,7 +34,7 @@ if (!defined('DOL_APPLICATION_TITLE')) {
 	define('DOL_APPLICATION_TITLE', 'Dolibarr');
 }
 if (!defined('DOL_VERSION')) {
-	define('DOL_VERSION', '14.0.0-beta'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
+	define('DOL_VERSION', '15.0.0-alpha'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
 }
 
 if (!defined('EURO')) {

From 52b8044517af3df2ed4c8b01c65c680ed97ab645 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Tue, 29 Jun 2021 04:25:32 +0200
Subject: [PATCH 0917/1497] FIX Accountancy - Suggested account of product not
 concerned by account of thirdparty

---
 htdocs/accountancy/customer/list.php | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index 97d94a42f00..5ce9f5e13e8 100644
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -739,13 +739,11 @@ if ($result) {
 			$s .= (empty($objp->code_sell_p) ? '<span style="'.$code_sell_p_notset.'">'.$langs->trans("NotDefined").'</span>' : length_accountg($objp->code_sell_p));
 			print $form->textwithpicto($s, $shelp, 1, $ttype, '', 0, 2, '', 1);
 		} else {
-			if (!empty($conf->global->ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY)) {
-				print '<br>';
-				$s = '2. '.(($objp->type_l == 1) ? $langs->trans("ThisService") : $langs->trans("ThisProduct")).': ';
-				$shelp = '';
-				$s .= $langs->trans("NotDefined");
-				print $form->textwithpicto($s, $shelp, 1, 'help', '', 0, 2, '', 1);
-			}
+			print '<br>';
+			$s = '2. '.(($objp->type_l == 1) ? $langs->trans("ThisService") : $langs->trans("ThisProduct")).': ';
+			$shelp = '';
+			$s .= $langs->trans("NotDefined");
+			print $form->textwithpicto($s, $shelp, 1, 'help', '', 0, 2, '', 1);
 		}
 		if (!empty($conf->global->ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY)) {
 			print '<br>';

From ef8aaa7fd72f7825deb4703d0a6c9d7a9d49adf3 Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe@altairis.fr>
Date: Tue, 29 Jun 2021 15:26:04 +0200
Subject: [PATCH 0918/1497] generate intervention from time spent

---
 htdocs/core/class/html.form.class.php | 166 ++++++++++++++++++++++++++
 htdocs/langs/en_US/interventions.lang |   1 +
 htdocs/langs/en_US/projects.lang      |   7 +-
 htdocs/langs/fr_FR/interventions.lang |   1 +
 htdocs/langs/fr_FR/projects.lang      |   7 +-
 htdocs/projet/tasks/time.php          | 134 +++++++++++++++++++--
 6 files changed, 307 insertions(+), 9 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index b3ed477596c..9e1bcb34251 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -8741,6 +8741,172 @@ class Form
 		return $out;
 	}
 
+	/**
+	 *  Output a combo list with interventions qualified for a third party
+	 *
+	 *  @param	int		$socid      	Id third party (-1=all, 0=only projects not linked to a third party, id=projects not linked or linked to third party id)
+	 *  @param  int		$selected   	Id intervention preselected
+	 *  @param  string	$htmlname   	Name of HTML select
+	 *	@param	int		$maxlength		Maximum length of label
+	 *	@param	int		$option_only	Return only html options lines without the select tag
+	 *	@param	string	$show_empty		Add an empty line ('1' or string to show for empty line)
+	 *  @param	int		$discard_closed Discard closed projects (0=Keep,1=hide completely,2=Disable)
+     *  @param	int		$forcefocus		Force focus on field (works with javascript only)
+     *  @param	int		$disabled		Disabled
+	 *  @param	string	$morecss        More css added to the select component
+	 *  @param	string	$projectsListId ''=Automatic filter on project allowed. List of id=Filter on project ids.
+	 *  @param	string	$showproject	'all' = Show project info, ''=Hide project info
+	 *  @param	User	$usertofilter	User object to use for filtering
+	 *	@return int         			Nbr of project if OK, <0 if KO
+	 */
+    public function selectIntervention($socid = -1, $selected = '', $htmlname = 'interid', $maxlength = 24, $option_only = 0, $show_empty = '1', $discard_closed = 0, $forcefocus = 0, $disabled = 0, $morecss = 'maxwidth500', $projectsListId = '', $showproject = 'all', $usertofilter = null)
+	{
+		global $user, $conf, $langs;
+
+		require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+
+		if (is_null($usertofilter))
+		{
+			$usertofilter = $user;
+		}
+
+		$out = '';
+
+		$hideunselectables = false;
+		if (!empty($conf->global->PROJECT_HIDE_UNSELECTABLES)) $hideunselectables = true;
+
+		if (empty($projectsListId))
+		{
+			if (empty($usertofilter->rights->projet->all->lire))
+			{
+				$projectstatic = new Project($this->db);
+				$projectsListId = $projectstatic->getProjectsAuthorizedForUser($usertofilter, 0, 1);
+			}
+		}
+
+		// Search all projects
+        $sql = 'SELECT i.rowid, i.ref as ref, p.fk_soc, p.fk_statut, p.public,';
+		$sql .= ' s.nom as name';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'projet as p';
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON s.rowid = p.fk_soc,';
+		$sql .= ' '.MAIN_DB_PREFIX.'fichinter as i';
+		$sql .= " WHERE p.entity IN (".getEntity('project').")";
+		$sql .= " AND i.fk_projet = p.rowid AND i.fk_statut=0"; //Brouillons seulement
+		if ($projectsListId) $sql.= " AND p.rowid IN (".$projectsListId.")";
+		if ($socid == 0) $sql.= " AND (p.fk_soc=0 OR p.fk_soc IS NULL)";
+		if ($socid > 0)  $sql.= " AND (p.fk_soc=".$socid." OR p.fk_soc IS NULL)";
+		$sql .= " GROUP BY i.ref ORDER BY p.ref, i.ref ASC";
+
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			// Use select2 selector
+			if (!empty($conf->use_javascript_ajax))
+			{
+				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+	           	$comboenhancement = ajax_combobox($htmlname, '', 0, $forcefocus);
+            	$out .= $comboenhancement;
+            	$morecss = 'minwidth200imp maxwidth500';
+			}
+
+			if (empty($option_only)) {
+				$out .= '<select class="valignmiddle flat'.($morecss ? ' '.$morecss : '').'"'.($disabled ? ' disabled="disabled"' : '').' id="'.$htmlname.'" name="'.$htmlname.'">';
+			}
+			if (!empty($show_empty)) {
+				$out .= '<option value="0" class="optiongrey">';
+				if (!is_numeric($show_empty)) $out .= $show_empty;
+				else $out .= '&nbsp;';
+				$out .= '</option>';
+			}
+			$num = $this->db->num_rows($resql);
+			$i = 0;
+			if ($num)
+			{
+				while ($i < $num)
+				{
+					$obj = $this->db->fetch_object($resql);
+					// If we ask to filter on a company and user has no permission to see all companies and project is linked to another company, we hide project.
+					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && empty($usertofilter->rights->societe->lire))
+					{
+						// Do nothing
+					}
+					else
+					{
+						if ($discard_closed == 1 && $obj->fk_statut == Project::STATUS_CLOSED)
+						{
+							$i++;
+							continue;
+						}
+
+						$labeltoshow = '';
+
+						if ($showproject == 'all')
+						{
+							$labeltoshow .= dol_trunc($obj->ref, 18); // Intervention ref
+							if ($obj->name) $labeltoshow .= ' - '.$obj->name; // Soc name
+
+							$disabled = 0;
+							if ($obj->fk_statut == Project::STATUS_DRAFT)
+							{
+								$disabled = 1;
+								$labeltoshow .= ' - '.$langs->trans("Draft");
+							}
+							elseif ($obj->fk_statut == Project::STATUS_CLOSED)
+							{
+								if ($discard_closed == 2) $disabled = 1;
+								$labeltoshow .= ' - '.$langs->trans("Closed");
+							}
+							elseif ($socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid))
+							{
+								$disabled = 1;
+								$labeltoshow .= ' - '.$langs->trans("LinkedToAnotherCompany");
+							}
+						}
+
+						if (!empty($selected) && $selected == $obj->rowid)
+						{
+							$out .= '<option value="'.$obj->rowid.'" selected';
+							//if ($disabled) $out.=' disabled';						// with select2, field can't be preselected if disabled
+							$out .= '>'.$labeltoshow.'</option>';
+						}
+						else
+						{
+							if ($hideunselectables && $disabled && ($selected != $obj->rowid))
+							{
+								$resultat = '';
+							}
+							else
+							{
+								$resultat = '<option value="'.$obj->rowid.'"';
+								if ($disabled) $resultat .= ' disabled';
+								//if ($obj->public) $labeltoshow.=' ('.$langs->trans("Public").')';
+								//else $labeltoshow.=' ('.$langs->trans("Private").')';
+								$resultat .= '>';
+								$resultat .= $labeltoshow;
+								$resultat .= '</option>';
+							}
+							$out .= $resultat;
+						}
+					}
+					$i++;
+				}
+			}
+			if (empty($option_only)) {
+				$out .= '</select>';
+			}
+
+			print $out;
+
+			$this->db->free($resql);
+			return $num;
+		}
+		else
+		{
+			dol_print_error($this->db);
+			return -1;
+		}
+	}
+
 	/**
 	 *  Output a combo list with invoices qualified for a third party
 	 *
diff --git a/htdocs/langs/en_US/interventions.lang b/htdocs/langs/en_US/interventions.lang
index 51079fca278..ff5de8b1b3e 100644
--- a/htdocs/langs/en_US/interventions.lang
+++ b/htdocs/langs/en_US/interventions.lang
@@ -66,3 +66,4 @@ RepeatableIntervention=Template of intervention
 ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
 Reopen=Reopen
 ConfirmReopenIntervention=Are you sure you want to open back the intervention <b>%s</b>?
+GenerateInter=Generate intervention
diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index 2fda7e1df0e..0bc78b8c62d 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -241,6 +241,7 @@ LatestModifiedProjects=Latest %s modified projects
 OtherFilteredTasks=Other filtered tasks
 NoAssignedTasks=No assigned tasks found (assign project/tasks to the current user from the top select box to enter time on it)
 ThirdPartyRequiredToGenerateInvoice=A third party must be defined on project to be able to invoice it.
+ThirdPartyRequiredToGenerateInvoice=A third party must be defined on project to be able to create intervention.
 ChooseANotYetAssignedTask=Choose a task not yet assigned to you
 # Comments trans
 AllowCommentOnTask=Allow user comments on tasks
@@ -252,10 +253,12 @@ SendProjectRef=Information project %s
 ModuleSalaryToDefineHourlyRateMustBeEnabled=Module 'Salaries' must be enabled to define employee hourly rate to have time spent valorized
 NewTaskRefSuggested=Task ref already used, a new task ref is required
 TimeSpentInvoiced=Time spent billed
+TimeSpentForIntervention=Time spent
 TimeSpentForInvoice=Time spent
 OneLinePerUser=One line per user
 ServiceToUseOnLines=Service to use on lines
 InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
+InterventionGeneratedFromTimeSpent=Intervention %s has been generated from time spent on project
 ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
 ProjectFollowOpportunity=Follow opportunity
 ProjectFollowTasks=Follow tasks or time spent
@@ -264,7 +267,9 @@ UsageOpportunity=Usage: Opportunity
 UsageTasks=Usage: Tasks
 UsageBillTimeShort=Usage: Bill time
 InvoiceToUse=Draft invoice to use
+InterToUse=Draft intervention to use
 NewInvoice=New invoice
+NewInter=New intervention
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
 OneLinePerTimeSpentLine=One line for each time spent declaration
@@ -274,4 +279,4 @@ AddPersonToTask=Add also to tasks
 UsageOrganizeEvent=Usage: Event Organization
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
-SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them 
\ No newline at end of file
+SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
diff --git a/htdocs/langs/fr_FR/interventions.lang b/htdocs/langs/fr_FR/interventions.lang
index 43722fe2bfd..50c24662069 100644
--- a/htdocs/langs/fr_FR/interventions.lang
+++ b/htdocs/langs/fr_FR/interventions.lang
@@ -64,3 +64,4 @@ InterLineDuration=Durée ligne intervention
 InterLineDesc=Description ligne intervention
 RepeatableIntervention=Modèle d'intervention
 ToCreateAPredefinedIntervention=Pour créer une intervention prédéfinie ou récurrente, créez une intervention standard et convertissez-la en modèle d'intervention
+GenerateInter=Générer une fiche d'intervention
diff --git a/htdocs/langs/fr_FR/projects.lang b/htdocs/langs/fr_FR/projects.lang
index 6b342e4eb88..d574362118a 100644
--- a/htdocs/langs/fr_FR/projects.lang
+++ b/htdocs/langs/fr_FR/projects.lang
@@ -241,6 +241,7 @@ LatestModifiedProjects=Les %s derniers projets modifiés
 OtherFilteredTasks=Autres tâches filtrées
 NoAssignedTasks=Aucune tâche assignée (assignez un projet/tâche à l'utilisateur depuis la liste déroulante utilisateur en haut pour pouvoir saisir du temps dessus)
 ThirdPartyRequiredToGenerateInvoice=Un tiers doit être défini sur le projet pour pouvoir le facturer.
+ThirdPartyRequiredToGenerateIntervention=Un tiers doit être défini sur le projet pour pouvoir créer une intervention.
 ChooseANotYetAssignedTask=Choisissez une tâche qui ne vous est pas encore assignée
 # Comments trans
 AllowCommentOnTask=Autoriser les utilisateurs à ajouter des commentaires sur les tâches
@@ -253,18 +254,22 @@ ModuleSalaryToDefineHourlyRateMustBeEnabled=Le module 'Paiement des salaires des
 NewTaskRefSuggested=Réf de tâche déjà utilisée, une nouvelle référence de tâche est requise
 TimeSpentInvoiced=Temps passé facturé
 TimeSpentForInvoice=Temps consommés
+TimeSpentForIntervention=Temps consommés
 OneLinePerUser=Une ligne par utilisateur
 ServiceToUseOnLines=Service à utiliser sur les lignes
 InvoiceGeneratedFromTimeSpent=La facture %s a été générée à partir du temps passé sur le projet
+InterventionGeneratedFromTimeSpent=L'intervention %s a été générée à partir du temps passé sur le projet
 ProjectBillTimeDescription=Cochez si vous saisissez du temps sur les tâches du projet ET prévoyez de générer des factures à partir des temps pour facturer le client du projet (ne cochez pas si vous comptez créer une facture qui n'est pas basée sur la saisie des temps). Note: Pour générer une facture, aller sur l'onglet 'Temps consommé' du project et sélectionnez les lignes à inclure.
-ProjectFollowOpportunity=Suivre une opportunité 
+ProjectFollowOpportunity=Suivre une opportunité
 ProjectFollowTasks=Suivre des tâches ou du temps passé
 Usage=Usage
 UsageOpportunity=Utilisation: Opportunité
 UsageTasks=Utilisation: Tâches
 UsageBillTimeShort=Utilisation: Facturation du temps
 InvoiceToUse=Facture brouillon à utiliser
+InterToUse=Intervention brouillon à utiliser
 NewInvoice=Nouvelle facture
+NewInter=Nouvelle intervention
 OneLinePerTask=Une ligne par tâche
 OneLinePerPeriod=Une ligne par période
 OneLinePerTimeSpentLine=One line for each time spent declaration
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index a9316bcedcd..62890b5b749 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2011		Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2018		Ferran Marcet			<fmarcet@2byte.es>
  * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
- * Copyright (C) 2019       Christophe Battarel		<christophe@altairis.fr>
+ * Copyright (C) 2019-2021  Christophe Battarel		<christophe@altairis.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
@@ -115,7 +115,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 if (GETPOST('cancel', 'alpha')) {
 	$action = '';
 }
-if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend' && $massaction != 'confirm_generateinvoice') {
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend' && $massaction != 'confirm_generateinvoice' && $massaction != 'confirm_generateinter') {
 	$massaction = '';
 }
 
@@ -536,6 +536,90 @@ if ($action == 'confirm_generateinvoice') {
 	}
 }
 
+if ($action == 'confirm_generateinter')
+{
+	$langs->load('interventions');
+
+	if (!empty($projectstatic->socid)) $projectstatic->fetch_thirdparty();
+
+	if (!($projectstatic->thirdparty->id > 0)) {
+		setEventMessages($langs->trans("ThirdPartyRequiredToGenerateIntervention"), null, 'errors');
+	} else {
+		include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+
+
+		require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
+		$tmpinter = new Fichinter($db);
+		$tmptimespent = new Task($db);
+		$fuser = new User($db);
+
+		$db->begin();
+        $interToUse = GETPOST('interid', 'int');
+
+
+		$tmpinter->socid = $projectstatic->thirdparty->id;
+		$tmpinter->date = dol_mktime(GETPOST('rehour', 'int'), GETPOST('remin', 'int'), GETPOST('resec', 'int'), GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
+		$tmpinter->fk_project = $projectstatic->id;
+		$tmpinter->description = $projectstatic->title . ( ! empty($projectstatic->description) ? '-' . $projectstatic->label : '' );
+
+        if ($interToUse) {
+            $tmpinter->fetch($interToUse);
+        }
+        else {
+		    $result = $tmpinter->create($user);
+		    if ($result <= 0)
+		    {
+		    	$error++;
+		    	setEventMessages($tmpinter->error, $tmpinter->errors, 'errors');
+		    }
+        }
+
+		if (!$error)
+		{
+			$arrayoftasks = array();
+			foreach ($toselect as $key => $value)
+				{
+				// Get userid, timepent
+				$object->fetchTimeSpent($value);
+				// $object->id is the task id
+				$arrayoftasks[$object->timespent_id]['timespent'] = $object->timespent_duration;
+				$arrayoftasks[$object->timespent_id]['totalvaluetodivideby3600'] = $object->timespent_duration * $object->timespent_thm;
+				$arrayoftasks[$object->timespent_id]['note'] = $object->timespent_note;
+				$arrayoftasks[$object->timespent_id]['date'] = date('Y-m-d H:i:s', $object->timespent_datehour);
+			}
+
+			foreach ($arrayoftasks as $timespent_id => $value)
+			{
+				$ftask = new Task($db);
+				$ftask->fetch($object->id);
+				// Define qty per hour
+				$qtyhour = $value['timespent'] / 3600;
+				$qtyhourtext = convertSecondToTime($value['timespent'], 'all', $conf->global->MAIN_DURATION_OF_WORKDAY);
+
+				// Add lines
+				$lineid = $tmpinter->addline($user, $tmpinter->id, $ftask->label . ( ! empty($value['note']) ? ' - ' . $value['note'] : '' ), $value['date'], $value['timespent']);
+			}
+		}
+
+		if (!$error)
+		{
+			$urltointer = $tmpinter->getNomUrl(0);
+			$mesg = $langs->trans("InterventionGeneratedFromTimeSpent", '{s1}');
+			$mesg = str_replace('{s1}', $urltointer, $mesg);
+			setEventMessages($mesg, null, 'mesgs');
+
+			//var_dump($tmpinvoice);
+
+			$db->commit();
+		}
+		else
+		{
+			$db->rollback();
+		}
+	}
+}
 
 /*
  * View
@@ -749,12 +833,16 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0) {
 			'generateinvoice'=>$langs->trans("GenerateBill"),
 			//'builddoc'=>$langs->trans("PDFMerge"),
 		);
-		//if ($user->rights->projet->creer) $arrayofmassactions['predelete']='<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
-		if (in_array($massaction, array('presend', 'predelete', 'generateinvoice'))) {
-			$arrayofmassactions = array();
-		}
-		$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 	}
+	if ( ! empty($conf->ficheinter->enabled) && $user->rights->ficheinter->creer) {
+		$langs->load("interventions");
+		$arrayofmassactions['generateinter'] = $langs->trans("GenerateInter");
+	}
+	//if ($user->rights->projet->creer) $arrayofmassactions['predelete']='<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
+	if (in_array($massaction, array('presend', 'predelete', 'generateinvoice', 'generateinter'))) {
+		$arrayofmassactions = array();
+	}
+	$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 	// Show section with information of task. If id of task is not defined and project id defined, then $projectidforalltimes is not empty.
 	if (empty($projectidforalltimes)) {
@@ -944,6 +1032,8 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0) {
 			print '<input type="hidden" name="action" value="addtimespent">';
 		} elseif ($massaction == 'generateinvoice' && $user->rights->facture->lire) {
 			print '<input type="hidden" name="action" value="confirm_generateinvoice">';
+		} elseif ($massaction == 'generateinter' && $user->rights->ficheinter->lire) {
+			print '<input type="hidden" name="action" value="confirm_generateinter">';
 		} else {
 			print '<input type="hidden" name="action" value="list">';
 		}
@@ -1026,6 +1116,36 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0) {
 				print '</div>';
 				$massaction = '';
 			}
+		} elseif ($massaction == 'generateinter') {
+		// Form to convert time spent into invoice
+			print '<input type="hidden" name="massaction" value="confirm_createinter">';
+
+			if ($projectstatic->thirdparty->id > 0) {
+				print '<table class="noborder" width="100%" >';
+				print '<tr>';
+				print '<td class="titlefield">';
+				print $langs->trans('InterToUse');
+				print '</td>';
+				print '<td>';
+	            $form->selectIntervention($projectstatic->thirdparty->id, '', 'interid', 24, 0, $langs->trans('NewInter'),
+				1, 0, 0, 'maxwidth500', '', 'all');
+				print '</td>';
+				print '</tr>';
+				print '</table>';
+
+				print '<br>';
+				print '<div class="center">';
+				print '<input type="submit" class="button" id="createinter" name="createinter" value="'.$langs->trans('GenerateInter').'">  ';
+				print '<input type="submit" class="button" id="cancel" name="cancel" value="'.$langs->trans('Cancel').'">';
+				print '</div>';
+				print '<br>';
+			} else {
+				print '<div class="warning">'.$langs->trans("ThirdPartyRequiredToGenerateInter").'</div>';
+				print '<div class="center">';
+				print '<input type="submit" class="button" id="cancel" name="cancel" value="'.$langs->trans('Cancel').'">';
+				print '</div>';
+				$massaction = '';
+			}
 		}
 
 		/*

From a123154446998811c0c768bf1accb6e278ddc8ec Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 29 Jun 2021 15:29:28 +0200
Subject: [PATCH 0919/1497] Fix clean alias

---
 htdocs/website/class/websitepage.class.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/htdocs/website/class/websitepage.class.php b/htdocs/website/class/websitepage.class.php
index ddfdea57ef2..16053069d30 100644
--- a/htdocs/website/class/websitepage.class.php
+++ b/htdocs/website/class/websitepage.class.php
@@ -233,6 +233,10 @@ class WebsitePage extends CommonObject
 			$this->aliasalt = ','.preg_replace('/,+$/', '', preg_replace('/^,+/', '', $this->aliasalt)).','; // content in database must be ',xxx,...,yyy,'
 		}
 
+		$this->pageurl = preg_replace('/[^a-z0-9\-\_]/i', '', $this->pageurl);
+		$this->pageurl = preg_replace('/\-\-+/', '-', $this->pageurl);
+		$this->pageurl = preg_replace('/^\-/', '', $this->pageurl);
+
 		// Remove spaces and be sure we have main language only
 		$this->lang = preg_replace('/[_-].*$/', '', trim($this->lang)); // en_US or en-US -> en
 
@@ -576,6 +580,10 @@ class WebsitePage extends CommonObject
 			$this->aliasalt = ','.preg_replace('/,+$/', '', preg_replace('/^,+/', '', $this->aliasalt)).','; // content in database must be ',xxx,...,yyy,'
 		}
 
+		$this->pageurl = preg_replace('/[^a-z0-9\-\_]/i', '', $this->pageurl);
+		$this->pageurl = preg_replace('/\-\-+/', '-', $this->pageurl);
+		$this->pageurl = preg_replace('/^\-/', '', $this->pageurl);
+
 		// Remove spaces and be sure we have main language only
 		$this->lang = preg_replace('/[_-].*$/', '', trim($this->lang)); // en_US or en-US -> en
 

From 9b328bd8be1e2ab3bc0054504b58a409865761d4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 29 Jun 2021 15:31:42 +0200
Subject: [PATCH 0920/1497] Trans

---
 htdocs/langs/en_US/website.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang
index bd23bd39a5c..cd1964ff383 100644
--- a/htdocs/langs/en_US/website.lang
+++ b/htdocs/langs/en_US/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 PageContainer=Page
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
+PreviewOfSiteNotYetAvailable=The preview of your website <strong>%s</strong> is not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair

From 6d77f5e12f856949df49bab9806c27f072647f8a Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe@altairis.fr>
Date: Tue, 29 Jun 2021 15:38:24 +0200
Subject: [PATCH 0921/1497] fix translation string

---
 htdocs/projet/tasks/time.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 62890b5b749..b4b0f46f8ba 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -1140,7 +1140,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0) {
 				print '</div>';
 				print '<br>';
 			} else {
-				print '<div class="warning">'.$langs->trans("ThirdPartyRequiredToGenerateInter").'</div>';
+				print '<div class="warning">'.$langs->trans("ThirdPartyRequiredToGenerateIntervention").'</div>';
 				print '<div class="center">';
 				print '<input type="submit" class="button" id="cancel" name="cancel" value="'.$langs->trans('Cancel').'">';
 				print '</div>';

From 474df5fef29c85a7aa28204a17f1002542a8db33 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 29 Jun 2021 15:41:21 +0200
Subject: [PATCH 0922/1497] Update box_boms.php

---
 htdocs/core/boxes/box_boms.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/htdocs/core/boxes/box_boms.php b/htdocs/core/boxes/box_boms.php
index 23e525fc00b..fb0bdeb0625 100644
--- a/htdocs/core/boxes/box_boms.php
+++ b/htdocs/core/boxes/box_boms.php
@@ -135,6 +135,17 @@ class box_boms extends ModeleBoxes
 						'asis' => 1,
 					);
 
+					if (!empty($conf->global->BOM_BOX_LAST_BOMS_SHOW_VALIDATE_USER)) {
+						if ($objp->fk_user_valid > 0) {
+							$userstatic->fetch($objp->fk_user_valid);
+						}
+						$this->info_box_contents[$line][] = array(
+							'td' => 'class="right"',
+							'text' => (($objp->fk_user_valid > 0) ? $userstatic->getNomUrl(1) : ''),
+							'asis' => 1,
+						);
+					}
+					
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="right"',
 						'text' => dol_print_date($datem, 'day', 'tzuserrel'),

From ab4dbcf5aecadae3a36130a82914f0531941031b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 29 Jun 2021 15:41:48 +0200
Subject: [PATCH 0923/1497] Update box_mos.php

---
 htdocs/core/boxes/box_mos.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/htdocs/core/boxes/box_mos.php b/htdocs/core/boxes/box_mos.php
index 171d129dbd3..8305bbabf32 100644
--- a/htdocs/core/boxes/box_mos.php
+++ b/htdocs/core/boxes/box_mos.php
@@ -132,6 +132,17 @@ class box_mos extends ModeleBoxes
 						'asis' => 1,
 					);
 
+					if (!empty($conf->global->MRP_BOX_LAST_MOS_SHOW_VALIDATE_USER)) {
+						if ($objp->fk_user_valid > 0) {
+							$userstatic->fetch($objp->fk_user_valid);
+						}
+						$this->info_box_contents[$line][] = array(
+							'td' => 'class="right"',
+							'text' => (($objp->fk_user_valid > 0) ? $userstatic->getNomUrl(1) : ''),
+							'asis' => 1,
+						);
+					}
+					
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="center nowraponall"',
 						'text' => dol_print_date($datem, 'day', 'tzuserrel'),

From d423e47d3b839e1ac6a779a377450b055508bc1a Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe@altairis.fr>
Date: Tue, 29 Jun 2021 15:50:41 +0200
Subject: [PATCH 0924/1497] stickler

---
 htdocs/core/class/html.form.class.php | 71 +++++++++------------------
 htdocs/projet/tasks/time.php          | 47 ++++++++----------
 2 files changed, 43 insertions(+), 75 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 9e1bcb34251..bf284a77997 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -8751,22 +8751,21 @@ class Form
 	 *	@param	int		$option_only	Return only html options lines without the select tag
 	 *	@param	string	$show_empty		Add an empty line ('1' or string to show for empty line)
 	 *  @param	int		$discard_closed Discard closed projects (0=Keep,1=hide completely,2=Disable)
-     *  @param	int		$forcefocus		Force focus on field (works with javascript only)
-     *  @param	int		$disabled		Disabled
+	 *  @param	int		$forcefocus		Force focus on field (works with javascript only)
+	 *  @param	int		$disabled		Disabled
 	 *  @param	string	$morecss        More css added to the select component
 	 *  @param	string	$projectsListId ''=Automatic filter on project allowed. List of id=Filter on project ids.
 	 *  @param	string	$showproject	'all' = Show project info, ''=Hide project info
 	 *  @param	User	$usertofilter	User object to use for filtering
 	 *	@return int         			Nbr of project if OK, <0 if KO
 	 */
-    public function selectIntervention($socid = -1, $selected = '', $htmlname = 'interid', $maxlength = 24, $option_only = 0, $show_empty = '1', $discard_closed = 0, $forcefocus = 0, $disabled = 0, $morecss = 'maxwidth500', $projectsListId = '', $showproject = 'all', $usertofilter = null)
+	public function selectIntervention($socid = -1, $selected = '', $htmlname = 'interid', $maxlength = 24, $option_only = 0, $show_empty = '1', $discard_closed = 0, $forcefocus = 0, $disabled = 0, $morecss = 'maxwidth500', $projectsListId = '', $showproject = 'all', $usertofilter = null)
 	{
 		global $user, $conf, $langs;
 
 		require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
-		if (is_null($usertofilter))
-		{
+		if (is_null($usertofilter))	{
 			$usertofilter = $user;
 		}
 
@@ -8775,17 +8774,15 @@ class Form
 		$hideunselectables = false;
 		if (!empty($conf->global->PROJECT_HIDE_UNSELECTABLES)) $hideunselectables = true;
 
-		if (empty($projectsListId))
-		{
-			if (empty($usertofilter->rights->projet->all->lire))
-			{
+		if (empty($projectsListId))	{
+			if (empty($usertofilter->rights->projet->all->lire)) {
 				$projectstatic = new Project($this->db);
 				$projectsListId = $projectstatic->getProjectsAuthorizedForUser($usertofilter, 0, 1);
 			}
 		}
 
 		// Search all projects
-        $sql = 'SELECT i.rowid, i.ref as ref, p.fk_soc, p.fk_statut, p.public,';
+		$sql = 'SELECT i.rowid, i.ref as ref, p.fk_soc, p.fk_statut, p.public,';
 		$sql .= ' s.nom as name';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'projet as p';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON s.rowid = p.fk_soc,';
@@ -8798,11 +8795,9 @@ class Form
 		$sql .= " GROUP BY i.ref ORDER BY p.ref, i.ref ASC";
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql)	{
 			// Use select2 selector
-			if (!empty($conf->use_javascript_ajax))
-			{
+			if (!empty($conf->use_javascript_ajax))	{
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 	           	$comboenhancement = ajax_combobox($htmlname, '', 0, $forcefocus);
             	$out .= $comboenhancement;
@@ -8820,63 +8815,45 @@ class Form
 			}
 			$num = $this->db->num_rows($resql);
 			$i = 0;
-			if ($num)
-			{
-				while ($i < $num)
-				{
+			if ($num) {
+				while ($i < $num) {
 					$obj = $this->db->fetch_object($resql);
 					// If we ask to filter on a company and user has no permission to see all companies and project is linked to another company, we hide project.
-					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && empty($usertofilter->rights->societe->lire))
-					{
+					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && empty($usertofilter->rights->societe->lire)) {
 						// Do nothing
-					}
-					else
-					{
-						if ($discard_closed == 1 && $obj->fk_statut == Project::STATUS_CLOSED)
-						{
+					} else {
+						if ($discard_closed == 1 && $obj->fk_statut == Project::STATUS_CLOSED) {
 							$i++;
 							continue;
 						}
 
 						$labeltoshow = '';
 
-						if ($showproject == 'all')
-						{
+						if ($showproject == 'all') {
 							$labeltoshow .= dol_trunc($obj->ref, 18); // Intervention ref
 							if ($obj->name) $labeltoshow .= ' - '.$obj->name; // Soc name
 
 							$disabled = 0;
-							if ($obj->fk_statut == Project::STATUS_DRAFT)
-							{
+							if ($obj->fk_statut == Project::STATUS_DRAFT) {
 								$disabled = 1;
 								$labeltoshow .= ' - '.$langs->trans("Draft");
-							}
-							elseif ($obj->fk_statut == Project::STATUS_CLOSED)
-							{
+							} elseif ($obj->fk_statut == Project::STATUS_CLOSED) {
 								if ($discard_closed == 2) $disabled = 1;
 								$labeltoshow .= ' - '.$langs->trans("Closed");
-							}
-							elseif ($socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid))
-							{
+							} elseif ($socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid)) {
 								$disabled = 1;
 								$labeltoshow .= ' - '.$langs->trans("LinkedToAnotherCompany");
 							}
 						}
 
-						if (!empty($selected) && $selected == $obj->rowid)
-						{
+						if (!empty($selected) && $selected == $obj->rowid) {
 							$out .= '<option value="'.$obj->rowid.'" selected';
 							//if ($disabled) $out.=' disabled';						// with select2, field can't be preselected if disabled
 							$out .= '>'.$labeltoshow.'</option>';
-						}
-						else
-						{
-							if ($hideunselectables && $disabled && ($selected != $obj->rowid))
-							{
+						} else {
+							if ($hideunselectables && $disabled && ($selected != $obj->rowid)) {
 								$resultat = '';
-							}
-							else
-							{
+							} else {
 								$resultat = '<option value="'.$obj->rowid.'"';
 								if ($disabled) $resultat .= ' disabled';
 								//if ($obj->public) $labeltoshow.=' ('.$langs->trans("Public").')';
@@ -8899,9 +8876,7 @@ class Form
 
 			$this->db->free($resql);
 			return $num;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index b4b0f46f8ba..40ae02624bb 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -536,8 +536,7 @@ if ($action == 'confirm_generateinvoice') {
 	}
 }
 
-if ($action == 'confirm_generateinter')
-{
+if ($action == 'confirm_generateinter') {
 	$langs->load('interventions');
 
 	if (!empty($projectstatic->socid)) $projectstatic->fetch_thirdparty();
@@ -556,7 +555,7 @@ if ($action == 'confirm_generateinter')
 		$fuser = new User($db);
 
 		$db->begin();
-        $interToUse = GETPOST('interid', 'int');
+		$interToUse = GETPOST('interid', 'int');
 
 
 		$tmpinter->socid = $projectstatic->thirdparty->id;
@@ -564,23 +563,21 @@ if ($action == 'confirm_generateinter')
 		$tmpinter->fk_project = $projectstatic->id;
 		$tmpinter->description = $projectstatic->title . ( ! empty($projectstatic->description) ? '-' . $projectstatic->label : '' );
 
-        if ($interToUse) {
-            $tmpinter->fetch($interToUse);
-        }
-        else {
-		    $result = $tmpinter->create($user);
-		    if ($result <= 0)
-		    {
-		    	$error++;
-		    	setEventMessages($tmpinter->error, $tmpinter->errors, 'errors');
-		    }
-        }
+		if ($interToUse) {
+			$tmpinter->fetch($interToUse);
+		}
+		else {
+			$result = $tmpinter->create($user);
+			if ($result <= 0)
+			{
+				$error++;
+				setEventMessages($tmpinter->error, $tmpinter->errors, 'errors');
+			}
+		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$arrayoftasks = array();
-			foreach ($toselect as $key => $value)
-				{
+			foreach ($toselect as $key => $value) {
 				// Get userid, timepent
 				$object->fetchTimeSpent($value);
 				// $object->id is the task id
@@ -590,8 +587,7 @@ if ($action == 'confirm_generateinter')
 				$arrayoftasks[$object->timespent_id]['date'] = date('Y-m-d H:i:s', $object->timespent_datehour);
 			}
 
-			foreach ($arrayoftasks as $timespent_id => $value)
-			{
+			foreach ($arrayoftasks as $timespent_id => $value) {
 				$ftask = new Task($db);
 				$ftask->fetch($object->id);
 				// Define qty per hour
@@ -603,8 +599,7 @@ if ($action == 'confirm_generateinter')
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$urltointer = $tmpinter->getNomUrl(0);
 			$mesg = $langs->trans("InterventionGeneratedFromTimeSpent", '{s1}');
 			$mesg = str_replace('{s1}', $urltointer, $mesg);
@@ -613,9 +608,7 @@ if ($action == 'confirm_generateinter')
 			//var_dump($tmpinvoice);
 
 			$db->commit();
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 		}
 	}
@@ -1117,7 +1110,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0) {
 				$massaction = '';
 			}
 		} elseif ($massaction == 'generateinter') {
-		// Form to convert time spent into invoice
+			// Form to convert time spent into invoice
 			print '<input type="hidden" name="massaction" value="confirm_createinter">';
 
 			if ($projectstatic->thirdparty->id > 0) {
@@ -1127,7 +1120,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0) {
 				print $langs->trans('InterToUse');
 				print '</td>';
 				print '<td>';
-	            $form->selectIntervention($projectstatic->thirdparty->id, '', 'interid', 24, 0, $langs->trans('NewInter'),
+				$form->selectIntervention($projectstatic->thirdparty->id, '', 'interid', 24, 0, $langs->trans('NewInter'),
 				1, 0, 0, 'maxwidth500', '', 'all');
 				print '</td>';
 				print '</tr>';

From c8f55907eb36ac5d5fef8ec9fcf47de95ee228f2 Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe@altairis.fr>
Date: Tue, 29 Jun 2021 15:52:50 +0200
Subject: [PATCH 0925/1497] stickler

---
 htdocs/core/class/html.form.class.php | 6 +++---
 htdocs/projet/tasks/time.php          | 6 ++----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index bf284a77997..49d69747c7b 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -8799,9 +8799,9 @@ class Form
 			// Use select2 selector
 			if (!empty($conf->use_javascript_ajax))	{
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
-	           	$comboenhancement = ajax_combobox($htmlname, '', 0, $forcefocus);
-            	$out .= $comboenhancement;
-            	$morecss = 'minwidth200imp maxwidth500';
+				$comboenhancement = ajax_combobox($htmlname, '', 0, $forcefocus);
+				$out .= $comboenhancement;
+				$morecss = 'minwidth200imp maxwidth500';
 			}
 
 			if (empty($option_only)) {
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 40ae02624bb..5f3d4df5292 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -565,11 +565,9 @@ if ($action == 'confirm_generateinter') {
 
 		if ($interToUse) {
 			$tmpinter->fetch($interToUse);
-		}
-		else {
+		} else {
 			$result = $tmpinter->create($user);
-			if ($result <= 0)
-			{
+			if ($result <= 0) {
 				$error++;
 				setEventMessages($tmpinter->error, $tmpinter->errors, 'errors');
 			}

From 3d41c00199b9ade39948493397560f14b50a41f2 Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Tue, 29 Jun 2021 16:13:03 +0200
Subject: [PATCH 0926/1497] New : selectGroupTicket  multilevel >1 level

---
 htdocs/core/class/html.formticket.class.php | 153 ++++++++++++--------
 1 file changed, 90 insertions(+), 63 deletions(-)

diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index f4e076640c4..daafa88333f 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -569,14 +569,14 @@ class FormTicket
 	 *      @param  int    $noadmininfo 0=Add admin info, 1=Disable admin info
 	 *      @param  int    $maxlength   Max length of label
 	 *      @param	string	$morecss	More CSS
-	 * 		@param	int 	$use_multilevel	if != 0 create a multilevel select ( Do not use any of the other params)
+	 * 		@param	int 	$use_multilevel	if > 0 create a multilevel select which use $htmlname example: $use_multilevel = 1 permit to have 2 select boxes.
 	 *      @return void
 	 */
 	public function selectGroupTickets($selected = '', $htmlname = 'ticketcategory', $filtertype = '', $format = 0, $empty = 0, $noadmininfo = 0, $maxlength = 0, $morecss = '', $use_multilevel = 0)
 	{
 		global $langs, $user;
 
-		if ($use_multilevel == 0) {
+		if ($use_multilevel <= 0) {
 			$ticketstat = new Ticket($this->db);
 
 			dol_syslog(get_class($this)."::selectCategoryTickets ".$selected.", ".$htmlname.", ".$filtertype.", ".$format, LOG_DEBUG);
@@ -655,12 +655,13 @@ class FormTicket
 			}
 
 			print ajax_combobox('select'.$htmlname);
-		} else {
-			$groupticket=GETPOST('groupticket', 'aZ09');
-			$groupticketchild=GETPOST('groupticket_child', 'aZ09');
+		} elseif ($htmlname!='') {
+			$groupticket=GETPOST($htmlname, 'aZ09');
+			$groupticketchild=GETPOST($htmlname.'_child', 'aZ09');
 			$arraycodenotparent[] = "";
+			$arrayidused = array();
 			$stringtoprint = '<span class="supportemailfield bold">'.$langs->trans("GroupOfTicket").'</span> ';
-			$stringtoprint .= '<select name="groupticket" id ="groupticket" class="maxwidth500 minwidth400">';
+			$stringtoprint .= '<select name="'.$htmlname.'" id ="'.$htmlname.'" class="maxwidth500 minwidth400" child_id="0">';
 			$stringtoprint .= '<option value="">&nbsp;</option>';
 
 			$sql = "SELECT ctc.rowid, ctc.code, ctc.label, ctc.fk_parent, ";
@@ -682,10 +683,11 @@ class FormTicket
 						$grouplabel = $obj->label;
 						$isparent = $obj->isparent;
 						$iselected = $groupticket == $obj->code ?'selected':'';
-						$stringtoprint .= '<option '.$iselected.' class="groupticket'.dol_escape_htmltag($grouprowid).'" value="'.dol_escape_htmltag($groupvalue).'" data-html="'.dol_escape_htmltag($grouplabel).'">'.dol_escape_htmltag($grouplabel).'</option>';
+						$stringtoprint .= '<option '.$iselected.' class="'.$htmlname.dol_escape_htmltag($grouprowid).'" value="'.dol_escape_htmltag($groupvalue).'" data-html="'.dol_escape_htmltag($grouplabel).'">'.dol_escape_htmltag($grouplabel).'</option>';
 						if ($isparent == 'NOTPARENT') {
 							$arraycodenotparent[] = $groupvalue;
 						}
+						$arrayidused[]=$grouprowid;
 					}
 					$i++;
 				}
@@ -693,68 +695,93 @@ class FormTicket
 				dol_print_error($this->db);
 			}
 			if ($num_rows == 1) {
-				return '<input type="hidden" name="groupticket" id="groupticket" value="'.dol_escape_htmltag($groupvalue).'">';
+				return '<input type="hidden" name="'.$htmlname.'" id="'.$htmlname.'" value="'.dol_escape_htmltag($groupvalue).'">';
 			}
 			$stringtoprint .= '</select>&nbsp';
+			$levelid = 1;
+			while ($levelid <= $use_multilevel) {
+				$tabscript = array();
+				$stringtoprint .= '<select name="'.$htmlname.'_child_'.$levelid.'" id ="'.$htmlname.'_child_'.$levelid.'" class="maxwidth500 minwidth400 groupticketchild" child_id="'.$levelid.'">';
+				$stringtoprint .= '<option value="">&nbsp;</option>';
 
-			$stringtoprint .= '<select name="groupticket_child" id ="groupticket_child" class="maxwidth500 minwidth400">';
-			$stringtoprint .= '<option value="">&nbsp;</option>';
-
-			$sql = "SELECT ctc.rowid, ctc.code, ctc.label, ctc.fk_parent, ctcjoin.code as codefather";
-			$sql .= " FROM ".MAIN_DB_PREFIX."c_ticket_category as ctc";
-			$sql .= " JOIN ".MAIN_DB_PREFIX."c_ticket_category as ctcjoin ON ctc.fk_parent = ctcjoin.rowid";
-			$sql .= " WHERE ctc.public = 1";
-			$sql .= " AND ctc.active = 1";
-			$sql .= " AND ctc.fk_parent <> 0";
-			$sql .= $this->db->order('ctc.pos', 'ASC');
-			$resql = $this->db->query($sql);
-			if ($resql) {
-				$num_rows = $this->db->num_rows($resql);
-				$i = 0;
-				while ($i < $num_rows) {
-					$obj = $this->db->fetch_object($resql);
-					if ($obj) {
-						$grouprowid = $obj->rowid;
-						$groupvalue = $obj->code;
-						$grouplabel = $obj->label;
-						$fatherid = $obj->fk_parent;
-						$groupcodefather = $obj->codefather;
-						$iselected = $groupticketchild == $obj->code ?'selected':'';
-						$stringtoprint .= '<option '.$iselected.' class="groupticket_'.dol_escape_htmltag($fatherid).'_child" value="'.dol_escape_htmltag($groupvalue).'" data-html="'.dol_escape_htmltag($grouplabel).'">'.dol_escape_htmltag($grouplabel).'</option>';
-						$tabscript[] = 'if($("#groupticket")[0].value == "'.dol_escape_js($groupcodefather).'"){
-							$(".groupticket_'.dol_escape_htmltag($fatherid).'_child").show()
-						}else{
-							$(".groupticket_'.dol_escape_htmltag($fatherid).'_child").hide()
-						}';
+				$sql = "SELECT ctc.rowid, ctc.code, ctc.label, ctc.fk_parent, ctcjoin.code as codefather, ";
+				$sql .= $this->db->ifsql("ctc.rowid NOT IN (SELECT ctcfather.rowid FROM llx_c_ticket_category as ctcfather JOIN llx_c_ticket_category as ctcjoin ON ctcfather.rowid = ctcjoin.fk_parent)", "'NOTPARENT'", "'PARENT'")." as isparent";
+				$sql .= " FROM ".MAIN_DB_PREFIX."c_ticket_category as ctc";
+				$sql .= " JOIN ".MAIN_DB_PREFIX."c_ticket_category as ctcjoin ON ctc.fk_parent = ctcjoin.rowid";
+				$sql .= " WHERE ctc.public = 1";
+				$sql .= " AND ctc.active = 1";
+				if (!empty($arrayidused)) {
+					$sql .= " AND ctc.fk_parent IN ( ";
+					foreach ($arrayidused as $idused) {
+						$sql .= $idused.", ";
 					}
-					$i++;
-				}
-			} else {
-				dol_print_error($this->db);
-			}
-			$stringtoprint .='</select>';
-
-			$stringtoprint .='<script>';
-			$stringtoprint .='var arraynotparents = '.json_encode($arraycodenotparent).';';
-			$stringtoprint .='if (arraynotparents.includes($("#groupticket")[0].value)){$("#groupticket_child").hide()}
-			else{';
-			foreach ($tabscript as $script) {
-				$stringtoprint .= $script;
-			};
-			$stringtoprint .='}
-			$("#groupticket").change(function() {
-				$("#groupticket_child")[0].value = ""
-				if (!arraynotparents.includes(this.value)) {
-				$("#groupticket_child").show()
+					$sql = substr($sql, 0, -2);
+					$sql .= ")";
 				} else {
-				$("#groupticket_child").hide()
 				}
-			';
-			foreach ($tabscript as $script) {
-				$stringtoprint .= $script;
-			};
-			$stringtoprint .='})';
-			$stringtoprint .='</script>';
+				$sql .= $this->db->order('ctc.pos', 'ASC');
+				$resql = $this->db->query($sql);
+				if ($resql) {
+					$num_rows = $this->db->num_rows($resql);
+					$i = 0;
+					$arrayidused=array();
+					while ($i < $num_rows) {
+						$obj = $this->db->fetch_object($resql);
+						if ($obj) {
+							$grouprowid = $obj->rowid;
+							$groupvalue = $obj->code;
+							$grouplabel = $obj->label;
+							$isparent = $obj->isparent;
+							$fatherid = $obj->fk_parent;
+							$arrayidused[] = $grouprowid;
+							$groupcodefather = $obj->codefather;
+							if ($isparent == 'NOTPARENT') {
+								$arraycodenotparent[] = $groupvalue;
+							}
+							$iselected = $groupticketchild == $obj->code ?'selected':'';
+							$stringtoprint .= '<option '.$iselected.' class="'.$htmlname.'_'.dol_escape_htmltag($fatherid).'_child_'.$levelid.'" value="'.dol_escape_htmltag($groupvalue).'" data-html="'.dol_escape_htmltag($grouplabel).'">'.dol_escape_htmltag($grouplabel).'</option>';
+							if (empty($tabscript[$groupcodefather])) {
+								$tabscript[$groupcodefather] = 'if($("#'.$htmlname.($levelid > 1 ?'_child_'.$levelid-1:'').'")[0].value == "'.dol_escape_js($groupcodefather).'"){
+									$(".'.$htmlname.'_'.dol_escape_htmltag($fatherid).'_child_'.$levelid.'").show()
+									console.log("We show childs tickets of '.$groupcodefather.' group ticket")
+								}else{
+									$(".'.$htmlname.'_'.dol_escape_htmltag($fatherid).'_child_'.$levelid.'").hide()
+									console.log("We hide childs tickets of '.$groupcodefather.' group ticket")
+								}';
+							}
+						}
+						$i++;
+					}
+				} else {
+					dol_print_error($this->db);
+				}
+				$stringtoprint .='</select>';
+
+				$stringtoprint .='<script>';
+				$stringtoprint .='arraynotparents = '.json_encode($arraycodenotparent).';';
+				$stringtoprint .='if (arraynotparents.includes($("#'.$htmlname.($levelid > 1 ?'_child_'.$levelid-1:'').'")[0].value)){$("#'.$htmlname.'_child_'.$levelid.'").hide()}
+				$("#'.$htmlname.($levelid > 1 ?'_child_'.$levelid-1:'').'").change(function() {
+					child_id = this.attributes.child_id.value;
+					$(".groupticketchild").each(function(){
+						if(this.attributes.child_id.value > child_id){
+							this.value = ""
+							$(this).attr("style", "display : none;")
+						}
+					})
+					$("#'.$htmlname.'_child_'.$levelid.'")[0].value = ""
+					if (!arraynotparents.includes(this.value)) {
+					$("#'.$htmlname.'_child_'.$levelid.'").show()
+					} else {
+					$("#'.$htmlname.'_child_'.$levelid.'").hide()
+					}
+				';
+				$levelid++;
+				foreach ($tabscript as $script) {
+					$stringtoprint .= $script;
+				};
+				$stringtoprint .='})';
+				$stringtoprint .='</script>';
+			}
 			return $stringtoprint;
 		}
 	}

From b83f57da4897b22406602a4f06a96d93a322afe1 Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Tue, 29 Jun 2021 16:26:48 +0200
Subject: [PATCH 0927/1497] Fix some proposal php 8 warning

---
 htdocs/comm/index.php                     | 2 ++
 htdocs/comm/propal/class/propal.class.php | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index 0a39e596ba3..9d0d9f1befc 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -65,6 +65,8 @@ $socid = GETPOST("socid", 'int');
 if ($user->socid > 0) {
 	$action = '';
 	$id = $user->socid;
+} else {
+	$id = 0;
 }
 restrictedArea($user, 'societe', $id, '&societe', '', 'fk_soc', 'rowid', 0);
 
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 6c670c82364..940e0156c7e 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -2535,12 +2535,12 @@ class Propal extends CommonObject
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			// Status self::STATUS_REFUSED by default
-			$modelpdf = $conf->global->PROPALE_ADDON_PDF_ODT_CLOSED ? $conf->global->PROPALE_ADDON_PDF_ODT_CLOSED : $this->model_pdf;
+			$modelpdf = !empty($conf->global->PROPALE_ADDON_PDF_ODT_CLOSED) ? $conf->global->PROPALE_ADDON_PDF_ODT_CLOSED : $this->model_pdf;
 			$trigger_name = 'PROPAL_CLOSE_REFUSED';
 
 			if ($status == self::STATUS_SIGNED) {	// Status self::STATUS_SIGNED
 				$trigger_name = 'PROPAL_CLOSE_SIGNED';
-				$modelpdf = $conf->global->PROPALE_ADDON_PDF_ODT_TOBILL ? $conf->global->PROPALE_ADDON_PDF_ODT_TOBILL:$this->model_pdf;
+				$modelpdf = !empty($conf->global->PROPALE_ADDON_PDF_ODT_TOBILL) ? $conf->global->PROPALE_ADDON_PDF_ODT_TOBILL : $this->model_pdf;
 
 				// The connected company is classified as a client
 				$soc=new Societe($this->db);

From b8f5dc74d70bcb831a1690712562d2b6ba243fa6 Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Tue, 29 Jun 2021 16:30:36 +0200
Subject: [PATCH 0928/1497] Some order php 8 warning

---
 htdocs/commande/class/commande.class.php      | 2 +-
 htdocs/commande/tpl/linkedobjectblock.tpl.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 2805f4556d3..f601606be33 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -1368,7 +1368,7 @@ class Commande extends CommonOrder
 		}
 		// Possibility to add external linked objects with hooks
 		$this->linked_objects[$this->origin] = $this->origin_id;
-		if (is_array($object->other_linked_objects) && !empty($object->other_linked_objects)) {
+		if (isset($object->other_linked_objects) && is_array($object->other_linked_objects) && !empty($object->other_linked_objects)) {
 			$this->linked_objects = array_merge($this->linked_objects, $object->other_linked_objects);
 		}
 
diff --git a/htdocs/commande/tpl/linkedobjectblock.tpl.php b/htdocs/commande/tpl/linkedobjectblock.tpl.php
index 428589aa844..a0641c4c493 100644
--- a/htdocs/commande/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/commande/tpl/linkedobjectblock.tpl.php
@@ -47,7 +47,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 	}
 	echo '<tr class="'.$trclass.'" >';
 	echo '<td class="linkedcol-element" >'.$langs->trans("CustomerOrder");
-	if (!empty($showImportButton) && $conf->global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES) {
+	if (!empty($showImportButton) && !empty($conf->global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES)) {
 		print '<a class="objectlinked_importbtn" href="'.$objectlink->getNomUrl(0, '', 0, 1).'&amp;action=selectlines" data-element="'.$objectlink->element.'" data-id="'.$objectlink->id.'"  > <i class="fa fa-indent"></i> </a';
 	}
 	echo '</td>';

From e4f61d430f9dc55aa8a630cf70c5cf11d0133547 Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Tue, 29 Jun 2021 16:33:24 +0200
Subject: [PATCH 0929/1497] Invoice php 8 issue and warnings. Seems if ("" < 0)
 is true in php 8

---
 htdocs/compta/facture/card.php | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 585cabc1be4..6ec837fe1d1 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -112,7 +112,12 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 // Load object
 if ($id > 0 || !empty($ref)) {
 	if ($action != 'add') {
-		$ret = $object->fetch($id, $ref, '', '', $conf->global->INVOICE_USE_SITUATION);
+		if (empty($conf->global->INVOICE_USE_SITUATION)) {
+			$fetch_situation = false;
+		} else {
+			$fetch_situation = true;
+		}
+		$ret = $object->fetch($id, $ref, '', '', $fetch_situation);
 	}
 }
 
@@ -607,7 +612,7 @@ if (empty($reshook)) {
 		}
 
 		// Check for mandatory fields in invoice
-		$array_to_check = array('REF_CUSTOMER'=>'RefCustomer');
+		$array_to_check = array('REF_CLIENT'=>'RefCustomer');
 		foreach ($array_to_check as $key => $val) {
 			$keymin = strtolower($key);
 			$vallabel = $object->$keymin;
@@ -2362,21 +2367,22 @@ if (empty($reshook)) {
 		$line = new FactureLigne($db);
 		$line->fetch(GETPOST('lineid', 'int'));
 		$percent = $line->get_prev_progress($object->id);
+		$progress = floatval(GETPOST('progress', 'int'));
 
 		if ($object->type == Facture::TYPE_CREDIT_NOTE && $object->situation_cycle_ref > 0) {
 			// in case of situation credit note
-			if (GETPOST('progress') >= 0) {
+			if ($progress >= 0) {
 				$mesg = $langs->trans("CantBeNullOrPositive");
 				setEventMessages($mesg, null, 'warnings');
 				$error++;
 				$result = -1;
-			} elseif (GETPOST('progress') < $line->situation_percent) { // TODO : use a modified $line->get_prev_progress($object->id) result
+			} elseif ($progress < $line->situation_percent) { // TODO : use a modified $line->get_prev_progress($object->id) result
 				$mesg = $langs->trans("CantBeLessThanMinPercent");
 				setEventMessages($mesg, null, 'warnings');
 				$error++;
 				$result = -1;
 			}
-		} elseif (GETPOST('progress') < $percent) {
+		} elseif ($progress < $percent) {
 			$mesg = '<div class="warning">'.$langs->trans("CantBeLessThanMinPercent").'</div>';
 			setEventMessages($mesg, null, 'warnings');
 			$error++;

From 0d7fccc7b30b00b241f85d5b1e28fdbbf19042e3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 29 Jun 2021 16:33:53 +0200
Subject: [PATCH 0930/1497] Fix test

---
 test/other/test_serialize.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/other/test_serialize.php b/test/other/test_serialize.php
index 2fdfffaef3e..74d1d40e025 100644
--- a/test/other/test_serialize.php
+++ b/test/other/test_serialize.php
@@ -3,7 +3,10 @@
 
 $path = __DIR__ . '/';
 
+
 $res=@include_once $path.'/../htdocs/master.inc.php';
+$res=@include_once $path.'/../../htdocs/master.inc.php';
+if (! $res) @include_once '../../master.inc.php';
 if (! $res) @include_once '../master.inc.php';
 if (! $res) @include_once './master.inc.php';
 include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';

From 051bb3f3ef8d7f31706f81457a6435af235581f6 Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Tue, 29 Jun 2021 16:37:07 +0200
Subject: [PATCH 0931/1497] Fix some core php8 warnings. Fixing php 8 warnings
 seems also to solve some situations like a paiment condition removed from
 dictionary can not be selected.

---
 htdocs/core/class/html.form.class.php    | 7 ++++++-
 htdocs/core/tpl/ajaxrow.tpl.php          | 1 -
 htdocs/core/tpl/objectline_title.tpl.php | 2 +-
 htdocs/core/tpl/objectline_view.tpl.php  | 4 ++--
 htdocs/langs/en_US/errors.lang           | 1 +
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 33e2ed8b972..0b1504d229a 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5085,7 +5085,12 @@ class Form
 		} else {
 			if ($selected) {
 				$this->load_cache_conditions_paiements();
-				print $this->cache_conditions_paiements[$selected]['label'];
+				if (isset($this->cache_conditions_paiements[$selected])) {
+					print $this->cache_conditions_paiements[$selected]['label'];
+				} else {
+					$langs->load('errors');
+					print $langs->trans('ErrorNotInDictionaryPaymentConditions');
+				}
 			} else {
 				print "&nbsp;";
 			}
diff --git a/htdocs/core/tpl/ajaxrow.tpl.php b/htdocs/core/tpl/ajaxrow.tpl.php
index 6d6df3a5408..88c643c641d 100644
--- a/htdocs/core/tpl/ajaxrow.tpl.php
+++ b/htdocs/core/tpl/ajaxrow.tpl.php
@@ -79,7 +79,6 @@ $(document).ready(function(){
 					function() {
 						console.log("tableDND end of ajax call");
 						if (reloadpage == 1) {
-							//console.log('<?php echo $urltorefreshaftermove.' - '.$_SERVER['PHP_SELF'].' - '.dol_escape_js($_SERVER['QUERY_STRING']); ?>');
 							<?php
 							$redirectURL = empty($urltorefreshaftermove) ? ($_SERVER['PHP_SELF'].'?'.dol_escape_js($_SERVER['QUERY_STRING'])) : $urltorefreshaftermove;
 							// remove action parameter from URL
diff --git a/htdocs/core/tpl/objectline_title.tpl.php b/htdocs/core/tpl/objectline_title.tpl.php
index b530f5215cc..e1f89b18937 100644
--- a/htdocs/core/tpl/objectline_title.tpl.php
+++ b/htdocs/core/tpl/objectline_title.tpl.php
@@ -105,7 +105,7 @@ if (!empty($conf->global->PRODUCT_USE_UNITS)) {
 print '<td class="linecoldiscount right">'.$langs->trans('ReductionShort').'</td>';
 
 // Fields for situation invoice
-if ($this->situation_cycle_ref) {
+if (isset($this->situation_cycle_ref) && $this->situation_cycle_ref) {
 	print '<td class="linecolcycleref right">'.$langs->trans('Progress').'</td>';
 	print '<td class="linecolcycleref2 right">'.$form->textwithpicto($langs->trans('TotalHT100Short'), $langs->trans('UnitPriceXQtyLessDiscount')).'</td>';
 }
diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php
index 8e9d72d40b4..3b4bb3cfdcb 100644
--- a/htdocs/core/tpl/objectline_view.tpl.php
+++ b/htdocs/core/tpl/objectline_view.tpl.php
@@ -132,7 +132,7 @@ if (($line->info_bits & 2) == 2) {
 		}
 	}
 } else {
-	$format = $conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE ? 'dayhour' : 'day';
+	$format = (isset($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE) && $conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE) ? 'dayhour' : 'day';
 
 	if ($line->fk_product > 0) {
 		print $form->textwithtooltip($text, $description, 3, '', '', $i, 0, (!empty($line->fk_parent_line) ?img_picto('', 'rightarrow') : ''));
@@ -288,7 +288,7 @@ if (!empty($line->remise_percent) && $line->special_code != 3) {
 }
 
 // Fields for situation invoices
-if ($this->situation_cycle_ref) {
+if (isset($this->situation_cycle_ref) && $this->situation_cycle_ref) {
 	include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 	$coldisplay++;
 	print '<td class="linecolcycleref nowrap right">'.$line->situation_percent.'%</td>';
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index c4e8a1d7226..3ed7441afa5 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -301,3 +301,4 @@ ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
 ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
+ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.

From 796b2d201acb9938b903fb2afa297db289ecc93e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 29 Jun 2021 18:17:27 +0200
Subject: [PATCH 0932/1497] Enhance the sanitizing.

---
 htdocs/core/lib/functions.lib.php |  8 ++++++--
 htdocs/main.inc.php               |  9 +++++----
 test/phpunit/SecurityTest.php     | 10 +++++-----
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index e3b288aff8e..87a4b966056 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -778,8 +778,12 @@ function checkVal($out = '', $check = 'alphanohtml', $filter = null, $options =
 			do {
 				$oldstringtoclean = $out;
 
-				// We replace chars encoded with numeric HTML entities with real char (to avoid to have numeric entities used for obfuscation of injections)
-				$out = preg_replace_callback('/&#(x?[0-9][0-9a-f]+);/i', 'realCharForNumericEntities', $out);
+				// We replace chars from a/A to z/Z encoded with numeric HTML entities with the real char so we won't loose the chars at the next step.
+				// No need to use a loop here, this step is not to sanitize (this is done at next step, this is to try to save chars, even if they are
+				// using a non coventionnel way to be encoded, to not have them sanitized just after)
+				$out = preg_replace_callback('/&#(x?[0-9][0-9a-f]+;?)/i', 'realCharForNumericEntities', $out);
+
+				// Now we remove all remaining HTML entities staring with a number. We don't want such entities.
 				$out = preg_replace('/&#x?[0-9]+/i', '', $out);	// For example if we have j&#x61vascript with an entities without the ; to hide the 'a' of 'javascript'.
 
 				$out = dol_string_onlythesehtmltags($out, 0, 1, 1);
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 93388190275..b66b5f5b211 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -53,7 +53,7 @@ if (!empty($_SERVER['MAIN_SHOW_TUNING_INFO'])) {
 
 /**
  * Return the real char for a numeric entities.
- * This function is required by testSqlAndScriptInject().
+ * WARNING: This function is required by testSqlAndScriptInject() and the GETPOST 'restricthtml'. Regex calling must be similar.
  *
  * @param	string		$matches			String of numeric entity
  * @return	string							New value
@@ -61,17 +61,18 @@ if (!empty($_SERVER['MAIN_SHOW_TUNING_INFO'])) {
 function realCharForNumericEntities($matches)
 {
 	$newstringnumentity = $matches[1];
+	//print  '$newstringnumentity='.$newstringnumentity;
 
 	if (preg_match('/^x/i', $newstringnumentity)) {
-		$newstringnumentity = hexdec(preg_replace('/^x/i', '', $newstringnumentity));
+		$newstringnumentity = hexdec(preg_replace('/;$/', '', preg_replace('/^x/i', '', $newstringnumentity)));
 	}
 
-	// The numeric value we don't want as entities
+	// The numeric value we don't want as entities because they encode ascii char, and why using html entities on ascii except for haking ?
 	if (($newstringnumentity >= 65 && $newstringnumentity <= 90) || ($newstringnumentity >= 97 && $newstringnumentity <= 122)) {
 		return chr((int) $newstringnumentity);
 	}
 
-	return '&#'.$matches[1];
+	return '&#'.$matches[1];	// Value will be unchanged because regex was /&#(  )/
 }
 
 /**
diff --git a/test/phpunit/SecurityTest.php b/test/phpunit/SecurityTest.php
index 7e93f7673f2..08d4ec88703 100644
--- a/test/phpunit/SecurityTest.php
+++ b/test/phpunit/SecurityTest.php
@@ -345,7 +345,7 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 		$_GET["param5"]="a_1-b";
 		$_POST["param6"]="&quot;&gt;<svg o&#110;load='console.log(&quot;123&quot;)'&gt;";
 		$_POST["param6b"]='<<<../>../>../svg><<<../>../>../animate =alert(1)>abc';
-		$_GET["param7"]='"c:\this is a path~1\aaa&#110;" abc<bad>def</bad>';
+		$_GET["param7"]='"c:\this is a path~1\aaa&#110; &#x&#x31;&#x31;&#x30;;" abc<bad>def</bad>';
 		$_POST["param8a"]="Hacker<svg o&#110;load='console.log(&quot;123&quot;)'";	// html tag is not closed so it is not detected as html tag but is still harmfull
 		$_POST['param8b']='<img src=x onerror=alert(document.location) t=';		// this is html obfuscated by non closing tag
 		$_POST['param8c']='< with space after is ok';
@@ -479,8 +479,8 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 		$this->assertEquals('&quot;&gt;', $result);
 
 		$result=GETPOST("param7", 'restricthtml');
-		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('"c:\this is a path~1\aaan" abcdef', $result);
+		print __METHOD__." result param7 = ".$result."\n";
+		$this->assertEquals('"c:\this is a path~1\aaan &#x;;;;" abcdef', $result);
 
 		$result=GETPOST("param12", 'restricthtml');
 		print __METHOD__." result=".$result."\n";
@@ -488,11 +488,11 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 
 		$result=GETPOST("param13", 'restricthtml');
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('n n &gt; &lt; &quot; <a href=\"alert(document.domain)\">XSS</a>', $result, 'Test that HTML entities are decoded with restricthtml, but only for common alpha chars');
+		$this->assertEquals('n n &gt; &lt; &quot; <a href=\"alert(document.domain)\">XSS</a>', $result, 'Test 13 that HTML entities are decoded with restricthtml, but only for common alpha chars');
 
 		$result=GETPOST("param13b", 'restricthtml');
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('n n &gt; &lt; &quot; <a href=\"jvascript:alert(document.domain)\">XSS</a>', $result, 'Test that HTML entities are decoded with restricthtml, but only for common alpha chars');
+		$this->assertEquals('n n &gt; &lt; &quot; <a href=\"alert(document.domain)\">XSS</a>', $result, 'Test 13b that HTML entities are decoded with restricthtml, but only for common alpha chars');
 
 		// Special test for GETPOST of backtopage, backtolist or backtourl parameter
 

From 7aeb652c66a7cfff1e43fbbfe8985fed14b5b770 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 29 Jun 2021 18:22:36 +0200
Subject: [PATCH 0933/1497] Better sanitizing, fix phpcs

---
 .../reception/doc/pdf_squille.modules.php      |  3 +--
 .../doc/pdf_standard_myobject.modules.php      | 16 ++++++++--------
 ...standard_recruitmentjobposition.modules.php | 18 +++++++++---------
 3 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/htdocs/core/modules/reception/doc/pdf_squille.modules.php b/htdocs/core/modules/reception/doc/pdf_squille.modules.php
index 2f4427d7566..68ceb87ba96 100644
--- a/htdocs/core/modules/reception/doc/pdf_squille.modules.php
+++ b/htdocs/core/modules/reception/doc/pdf_squille.modules.php
@@ -145,8 +145,7 @@ class pdf_squille extends ModelePdfReception
 				$objphoto = new Product($this->db);
 				$objphoto->fetch($object->lines[$i]->fk_product);
 
-				if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
-				{
+				if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {
 					$pdir = get_exdir($object->lines[$i]->fk_product, 2, 0, 0, $objphoto, 'product').$object->lines[$i]->fk_product."/photos/";
 					$dir = $conf->product->dir_output.'/'.$pdir;
 				} else {
diff --git a/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php b/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
index e5e352def43..43457d6620d 100644
--- a/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
+++ b/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
@@ -240,14 +240,14 @@ class pdf_standard_myobject extends ModelePDFMyObject
 			{
 				if (empty($object->lines[$i]->fk_product)) continue;
 
-	            //var_dump($objphoto->ref);exit;
-	            if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {
-	                $pdir[0] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/";
-	                $pdir[1] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/';
-	            } else {
-	                $pdir[0] = get_exdir(0, 0, 0, 0, $objphoto, 'product'); // default
-	                $pdir[1] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/"; // alternative
-	            }
+				//var_dump($objphoto->ref);exit;
+				if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {
+					$pdir[0] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/";
+					$pdir[1] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/';
+				} else {
+					$pdir[0] = get_exdir(0, 0, 0, 0, $objphoto, 'product'); // default
+					$pdir[1] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/"; // alternative
+				}
 
 				$arephoto = false;
 				foreach ($pdir as $midir)
diff --git a/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php b/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
index 4600377ee01..4c6cb84783a 100644
--- a/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
+++ b/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
@@ -251,15 +251,15 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
 			{
 				if (empty($object->lines[$i]->fk_product)) continue;
 
-	            $objphoto->fetch($object->lines[$i]->fk_product);
-	            //var_dump($objphoto->ref);exit;
-	            if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {
-	                $pdir[0] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/";
-	                $pdir[1] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/';
-	            } else {
-	                $pdir[0] = get_exdir(0, 0, 0, 0, $objphoto, 'product'); // default
-	                $pdir[1] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/"; // alternative
-	            }
+				$objphoto->fetch($object->lines[$i]->fk_product);
+				//var_dump($objphoto->ref);exit;
+				if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {
+					$pdir[0] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/";
+					$pdir[1] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/';
+				} else {
+					$pdir[0] = get_exdir(0, 0, 0, 0, $objphoto, 'product'); // default
+					$pdir[1] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/"; // alternative
+				}
 
 				$arephoto = false;
 				foreach ($pdir as $midir)

From 0f020d5b203e5724b17e3e5f05c2eb0d4aa6b991 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 29 Jun 2021 19:05:18 +0200
Subject: [PATCH 0934/1497] Fix for phpv8

---
 htdocs/core/lib/geturl.lib.php | 2 +-
 htdocs/main.inc.php            | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/lib/geturl.lib.php b/htdocs/core/lib/geturl.lib.php
index f87e7b7b4cd..3398189a771 100644
--- a/htdocs/core/lib/geturl.lib.php
+++ b/htdocs/core/lib/geturl.lib.php
@@ -223,7 +223,7 @@ function getURLContent($url, $postorget = 'GET', $param = '', $followlocation =
 
 			// Set CURLOPT_CONNECT_TO so curl will not try another resolution that may give a different result. Possible only on PHP v7+
 			if (defined('CURLOPT_CONNECT_TO')) {
-				$connect_to = array(sprintf("%s:%d:%s:%d", $newUrlArray['host'], $newUrlArray['port'], $iptocheck, $newUrlArray['port']));
+				$connect_to = array(sprintf("%s:%d:%s:%d", $newUrlArray['host'], empty($newUrlArray['port'])?'':$newUrlArray['port'], $iptocheck, empty($newUrlArray['port'])?'':$newUrlArray['port']));
 				//var_dump($newUrlArray);
 				//var_dump($connect_to);
 				curl_setopt($ch, CURLOPT_CONNECT_TO, $connect_to);
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index b66b5f5b211..bd0d77d3389 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -60,11 +60,11 @@ if (!empty($_SERVER['MAIN_SHOW_TUNING_INFO'])) {
  */
 function realCharForNumericEntities($matches)
 {
-	$newstringnumentity = $matches[1];
-	//print  '$newstringnumentity='.$newstringnumentity;
+	$newstringnumentity = preg_replace('/;$/', '', $matches[1]);
+	//print  ' $newstringnumentity='.$newstringnumentity;
 
 	if (preg_match('/^x/i', $newstringnumentity)) {
-		$newstringnumentity = hexdec(preg_replace('/;$/', '', preg_replace('/^x/i', '', $newstringnumentity)));
+		$newstringnumentity = hexdec(preg_replace('/^x/i', '', $newstringnumentity));
 	}
 
 	// The numeric value we don't want as entities because they encode ascii char, and why using html entities on ascii except for haking ?

From 56787bc292074f4f576b1386f1c3073a246c8971 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 29 Jun 2021 19:14:03 +0200
Subject: [PATCH 0935/1497] Update card.php

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

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 265f515233f..1f6a03ca351 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -2367,7 +2367,7 @@ if (empty($reshook)) {
 		$line = new FactureLigne($db);
 		$line->fetch(GETPOST('lineid', 'int'));
 		$percent = $line->get_prev_progress($object->id);
-		$progress = floatval(GETPOST('progress', 'int'));
+		$progress = price2num(GETPOST('progress', 'alpha'));
 
 		if ($object->type == Facture::TYPE_CREDIT_NOTE && $object->situation_cycle_ref > 0) {
 			// in case of situation credit note

From 2860e12b6558c1bb5dfd39a1e9072b530ad70ffb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 29 Jun 2021 19:16:29 +0200
Subject: [PATCH 0936/1497] Update objectline_view.tpl.php

---
 htdocs/core/tpl/objectline_view.tpl.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php
index 3b4bb3cfdcb..c0339c28fc4 100644
--- a/htdocs/core/tpl/objectline_view.tpl.php
+++ b/htdocs/core/tpl/objectline_view.tpl.php
@@ -132,7 +132,7 @@ if (($line->info_bits & 2) == 2) {
 		}
 	}
 } else {
-	$format = (isset($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE) && $conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE) ? 'dayhour' : 'day';
+	$format = (!empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE) ? 'dayhour' : 'day');
 
 	if ($line->fk_product > 0) {
 		print $form->textwithtooltip($text, $description, 3, '', '', $i, 0, (!empty($line->fk_parent_line) ?img_picto('', 'rightarrow') : ''));

From d379151da6a4543294f68cc70ee3f2e630fbd7af Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 29 Jun 2021 19:19:38 +0200
Subject: [PATCH 0937/1497] Fix doc

---
 test/phpunit/KnowledgeRecordTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/phpunit/KnowledgeRecordTest.php b/test/phpunit/KnowledgeRecordTest.php
index fc6f385e25d..5e4d9a0d301 100644
--- a/test/phpunit/KnowledgeRecordTest.php
+++ b/test/phpunit/KnowledgeRecordTest.php
@@ -87,7 +87,7 @@ class KnowledgeRecordTest extends PHPUnit\Framework\TestCase
 		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
 		if (empty($conf->knowledgemanagement->enabled)) {
-			print __METHOD__." module knowledgemanagement order must be enabled.\n"; die(1);
+			print __METHOD__." module knowledgemanagement must be enabled.\n"; die(1);
 		}
 	}
 

From d59dfcb08a11c10323c75b2e35e424af4a02e059 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 29 Jun 2021 19:21:35 +0200
Subject: [PATCH 0938/1497] Update list.php

---
 htdocs/accountancy/customer/list.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index 5ce9f5e13e8..97d94a42f00 100644
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -739,11 +739,13 @@ if ($result) {
 			$s .= (empty($objp->code_sell_p) ? '<span style="'.$code_sell_p_notset.'">'.$langs->trans("NotDefined").'</span>' : length_accountg($objp->code_sell_p));
 			print $form->textwithpicto($s, $shelp, 1, $ttype, '', 0, 2, '', 1);
 		} else {
-			print '<br>';
-			$s = '2. '.(($objp->type_l == 1) ? $langs->trans("ThisService") : $langs->trans("ThisProduct")).': ';
-			$shelp = '';
-			$s .= $langs->trans("NotDefined");
-			print $form->textwithpicto($s, $shelp, 1, 'help', '', 0, 2, '', 1);
+			if (!empty($conf->global->ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY)) {
+				print '<br>';
+				$s = '2. '.(($objp->type_l == 1) ? $langs->trans("ThisService") : $langs->trans("ThisProduct")).': ';
+				$shelp = '';
+				$s .= $langs->trans("NotDefined");
+				print $form->textwithpicto($s, $shelp, 1, 'help', '', 0, 2, '', 1);
+			}
 		}
 		if (!empty($conf->global->ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY)) {
 			print '<br>';

From c74060d02cdc3da264a8c1ab4bdc5b5aa7805b6a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 29 Jun 2021 19:24:46 +0200
Subject: [PATCH 0939/1497] Fix lost change in merge

---
 htdocs/accountancy/customer/list.php | 12 +++++-------
 htdocs/societe/card.php              |  6 ++----
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index 97d94a42f00..5ce9f5e13e8 100644
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -739,13 +739,11 @@ if ($result) {
 			$s .= (empty($objp->code_sell_p) ? '<span style="'.$code_sell_p_notset.'">'.$langs->trans("NotDefined").'</span>' : length_accountg($objp->code_sell_p));
 			print $form->textwithpicto($s, $shelp, 1, $ttype, '', 0, 2, '', 1);
 		} else {
-			if (!empty($conf->global->ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY)) {
-				print '<br>';
-				$s = '2. '.(($objp->type_l == 1) ? $langs->trans("ThisService") : $langs->trans("ThisProduct")).': ';
-				$shelp = '';
-				$s .= $langs->trans("NotDefined");
-				print $form->textwithpicto($s, $shelp, 1, 'help', '', 0, 2, '', 1);
-			}
+			print '<br>';
+			$s = '2. '.(($objp->type_l == 1) ? $langs->trans("ThisService") : $langs->trans("ThisProduct")).': ';
+			$shelp = '';
+			$s .= $langs->trans("NotDefined");
+			print $form->textwithpicto($s, $shelp, 1, 'help', '', 0, 2, '', 1);
 		}
 		if (!empty($conf->global->ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY)) {
 			print '<br>';
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index a2b229147fa..8e1d03411cd 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -1659,8 +1659,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				$accountancy_code_buy = GETPOST('accountancy_code_buy', 'alpha');
 				print $formaccounting->select_account($accountancy_code_buy, 'accountancy_code_buy', 1, null, 1, 1, '');
 				print '</td></tr>';
-			} else // For external software
-			{
+			} else { // For external software
 				// Accountancy_code_sell
 				print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellCode").'</td>';
 				print '<td class="maxwidthonsmartphone"><input class="minwidth100" name="accountancy_code_sell" value="'.$object->accountancy_code_sell.'">';
@@ -2364,8 +2363,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 					print '<td>';
 					print $formaccounting->select_account($object->accountancy_code_buy, 'accountancy_code_buy', 1, '', 1, 1);
 					print '</td></tr>';
-				} else // For external software
-				{
+				} else { // For external software
 					// Accountancy_code_sell
 					print '<tr><td class="titlefield">'.$langs->trans("ProductAccountancySellCode").'</td>';
 					print '<td><input name="accountancy_code_sell" class="maxwidth200" value="'.$object->accountancy_code_sell.'">';

From c7befd9acc929cd1f3e3e2969a1ad2d07ce15397 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 29 Jun 2021 19:49:26 +0200
Subject: [PATCH 0940/1497] Fix php8 (related to #18019)

---
 htdocs/core/class/commonobject.class.php | 6 +++---
 htdocs/core/lib/files.lib.php            | 6 +++---
 htdocs/core/photos_resize.php            | 4 ++--
 htdocs/ecm/file_card.php                 | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 789bfb4e8b2..ec9449eba8f 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -940,7 +940,7 @@ abstract class CommonObject
 				$ecmfile->fullpath_orig = '';
 				$ecmfile->gen_or_uploaded = 'generated';
 				$ecmfile->description = '';    // indexed content
-				$ecmfile->keyword = '';        // keyword content
+				$ecmfile->keywords = '';        // keyword content
 				$ecmfile->share = getRandomPassword(true);
 				$result = $ecmfile->create($user);
 				if ($result < 0)
@@ -5261,7 +5261,7 @@ abstract class CommonObject
 								$ecmfile->fullpath_orig = '';
 								$ecmfile->gen_or_uploaded = 'generated';
 								$ecmfile->description = ''; // indexed content
-								$ecmfile->keyword = ''; // keyword content
+								$ecmfile->keywords = ''; // keyword content
 								$result = $ecmfile->update($user);
 								if ($result < 0) {
 									setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
@@ -5274,7 +5274,7 @@ abstract class CommonObject
 								$ecmfile->fullpath_orig = '';
 								$ecmfile->gen_or_uploaded = 'generated';
 								$ecmfile->description = ''; // indexed content
-								$ecmfile->keyword = ''; // keyword content
+								$ecmfile->keywords = ''; // keyword content
 								$ecmfile->src_object_type = $this->table_element;
 								$ecmfile->src_object_id   = $this->id;
 
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 7e34eec5ecd..05d8c6c4ec5 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -377,7 +377,7 @@ function completeFileArrayWithDatabaseInfo(&$filearray, $relativedir)
 				$ecmfile->fullpath_orig = $filearray[$key]['fullname'];
 				$ecmfile->gen_or_uploaded = 'unknown';
 				$ecmfile->description = ''; // indexed content
-				$ecmfile->keyword = ''; // keyword content
+				$ecmfile->keywords = ''; // keyword content
 				$result = $ecmfile->create($user);
 				if ($result < 0) {
 					setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
@@ -933,7 +933,7 @@ function dol_move($srcfile, $destfile, $newmask = 0, $overwriteifexists = 1, $te
 					$ecmfile->fullpath_orig = $srcfile;
 					$ecmfile->gen_or_uploaded = 'unknown';
 					$ecmfile->description = ''; // indexed content
-					$ecmfile->keyword = ''; // keyword content
+					$ecmfile->keywords = ''; // keyword content
 					$resultecm = $ecmfile->create($user);
 					if ($resultecm < 0) {
 						setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
@@ -1785,7 +1785,7 @@ function addFileIntoDatabaseIndex($dir, $file, $fullpathorig = '', $mode = 'uplo
 		$ecmfile->fullpath_orig = $fullpathorig;
 		$ecmfile->gen_or_uploaded = $mode;
 		$ecmfile->description = ''; // indexed content
-		$ecmfile->keyword = ''; // keyword content
+		$ecmfile->keywords = ''; // keyword content
 
 		if (is_object($object) && $object->id > 0) {
 			$ecmfile->src_object_id = $object->id;
diff --git a/htdocs/core/photos_resize.php b/htdocs/core/photos_resize.php
index 7c7813fbe14..374f381c098 100644
--- a/htdocs/core/photos_resize.php
+++ b/htdocs/core/photos_resize.php
@@ -383,7 +383,7 @@ if ($action == 'confirm_resize' && GETPOSTISSET("file") && GETPOSTISSET("sizex")
 			$ecmfile->fullpath_orig = $fullpath;
 			$ecmfile->gen_or_uploaded = 'unknown';
 			$ecmfile->description = ''; // indexed content
-			$ecmfile->keyword = ''; // keyword content
+			$ecmfile->keywords = ''; // keyword content
 			$result = $ecmfile->create($user);
 			if ($result < 0) {
 				setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
@@ -448,7 +448,7 @@ if ($action == 'confirm_crop') {
 			$ecmfile->fullpath_orig = $fullpath;
 			$ecmfile->gen_or_uploaded = 'unknown';
 			$ecmfile->description = ''; // indexed content
-			$ecmfile->keyword = ''; // keyword content
+			$ecmfile->keywords = ''; // keyword content
 			$result = $ecmfile->create($user);
 			if ($result < 0) {
 				setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
diff --git a/htdocs/ecm/file_card.php b/htdocs/ecm/file_card.php
index 14bc7e377f0..5ca1667ac9f 100644
--- a/htdocs/ecm/file_card.php
+++ b/htdocs/ecm/file_card.php
@@ -205,7 +205,7 @@ if ($action == 'update' && $permtoadd) {
 			$object->fullpath_orig = '';
 			$object->gen_or_uploaded = 'unknown';
 			$object->description = ''; // indexed content
-			$object->keyword = ''; // keyword content
+			$object->keywords = ''; // keyword content
 			$result = $object->create($user);
 			if ($result < 0) {
 				setEventMessages($object->error, $object->errors, 'warnings');

From 6f128123292ffa521adbb63fe7efcac69f33cfae Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Tue, 29 Jun 2021 23:07:20 +0200
Subject: [PATCH 0941/1497] FIX Accountancy - Clean virtual zero on the import

---
 htdocs/core/modules/import/import_csv.modules.php  | 2 ++
 htdocs/core/modules/import/import_xlsx.modules.php | 2 ++
 htdocs/core/modules/modAccounting.class.php        | 7 +++++++
 3 files changed, 11 insertions(+)

diff --git a/htdocs/core/modules/import/import_csv.modules.php b/htdocs/core/modules/import/import_csv.modules.php
index 1768029b97e..52b7af1fee5 100644
--- a/htdocs/core/modules/import/import_csv.modules.php
+++ b/htdocs/core/modules/import/import_csv.modules.php
@@ -623,6 +623,8 @@ class ImportCsv extends ModeleImports
 									}
 								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'numeric') {
 									$newval = price2num($newval);
+								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'accountingaccount') {
+									$newval = rtrim($newval, "0");
 								}
 
 								//print 'Val to use as insert is '.$newval.'<br>';
diff --git a/htdocs/core/modules/import/import_xlsx.modules.php b/htdocs/core/modules/import/import_xlsx.modules.php
index d90a52755e3..abc2a80abc9 100644
--- a/htdocs/core/modules/import/import_xlsx.modules.php
+++ b/htdocs/core/modules/import/import_xlsx.modules.php
@@ -664,6 +664,8 @@ class ImportXlsx extends ModeleImports
 									}
 								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'numeric') {
 									$newval = price2num($newval);
+								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'accountingaccount') {
+									$newval = rtrim($newval, "0");
 								}
 
 								//print 'Val to use as insert is '.$newval.'<br>';
diff --git a/htdocs/core/modules/modAccounting.class.php b/htdocs/core/modules/modAccounting.class.php
index 21618c56bc9..f86a2078c9e 100644
--- a/htdocs/core/modules/modAccounting.class.php
+++ b/htdocs/core/modules/modAccounting.class.php
@@ -297,6 +297,10 @@ class modAccounting extends DolibarrModules
 		);
 		$this->import_fieldshidden_array[$r] = array('b.doc_type'=>'const-import_from_external', 'b.fk_doc'=>'const-0', 'b.fk_docdet'=>'const-0', 'b.fk_user_author'=>'user->id', 'b.date_creation'=>'const-'.dol_print_date(dol_now(), 'standard')); // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
 		$this->import_regex_array[$r] = array('b.doc_date'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$');
+		$this->import_convertvalue_array[$r]=array(
+			'b.numero_compte'=>array('rule'=>'accountingaccount'),
+			'b.subledger_account'=>array('rule'=>'accountingaccount')
+		);
 		$this->import_examplevalues_array[$r] = array(
 			'b.piece_num'=>'123 (!!! use next value not already used)',
 			'b.doc_date'=>dol_print_date(dol_now(), "%Y-%m-%d"),
@@ -350,6 +354,8 @@ class modAccounting extends DolibarrModules
 			'b.sens'=>'rule-computeSens'
 		); // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
 		$this->import_convertvalue_array[$r]=array(
+			'b.numero_compte'=>array('rule'=>'accountingaccount'),
+			'b.subledger_account'=>array('rule'=>'accountingaccount'),
 			'b.montant' => array('rule' => 'compute', 'classfile' => '/accountancy/class/accountancyimport.class.php', 'class' => 'AccountancyImport', 'method' => 'computeAmount', 'element' => 'Accountancy'),
 			'b.sens' => array('rule' => 'compute', 'classfile' => '/accountancy/class/accountancyimport.class.php', 'class' => 'AccountancyImport', 'method' => 'computeDirection', 'element' => 'Accountancy'),
 		);
@@ -395,6 +401,7 @@ class modAccounting extends DolibarrModules
 		$this->import_fields_array[$r] = array('aa.fk_pcg_version'=>"Chartofaccounts*", 'aa.account_number'=>"AccountAccounting*", 'aa.label'=>"Label*", 'aa.account_parent'=>"Accountparent", "aa.fk_accounting_category"=>"AccountingCategory", "aa.pcg_type"=>"Pcgtype*", 'aa.active'=>'Status*', 'aa.datec'=>"DateCreation");
 		$this->import_regex_array[$r] = array('aa.fk_pcg_version'=>'pcg_version@'.MAIN_DB_PREFIX.'accounting_system', 'aa.account_number'=>'^.{1,32}$', 'aa.label'=>'^.{1,255}$', 'aa.account_parent'=>'^.{0,32}$', 'aa.fk_accounting_category'=>'rowid@'.MAIN_DB_PREFIX.'c_accounting_category', 'aa.pcg_type'=>'^.{1,20}$', 'aa.active'=>'^0|1$', 'aa.datec'=>'^\d{4}-\d{2}-\d{2}$');
 		$this->import_convertvalue_array[$r] = array(
+			'aa.account_number'=>array('rule'=>'accountingaccount'),
 			'aa.account_parent'=>array('rule'=>'fetchidfromref', 'classfile'=>'/accountancy/class/accountingaccount.class.php', 'class'=>'AccountingAccount', 'method'=>'fetch', 'element'=>'AccountingAccount'),
 			'aa.fk_accounting_category'=>array('rule'=>'fetchidfromcodeorlabel', 'classfile'=>'/accountancy/class/accountancycategory.class.php', 'class'=>'AccountancyCategory', 'method'=>'fetch', 'dict'=>'DictionaryAccountancyCategory'),
 		);

From 5e37c2ef74664c2608620e149cbfe60fa69391bf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 30 Jun 2021 01:36:49 +0200
Subject: [PATCH 0942/1497] CSS

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

diff --git a/htdocs/product/index.php b/htdocs/product/index.php
index 4aaaf3a0fa7..cab4f537c5d 100644
--- a/htdocs/product/index.php
+++ b/htdocs/product/index.php
@@ -354,10 +354,10 @@ if ((!empty($conf->product->enabled) || !empty($conf->service->enabled)) && ($us
 
 
 				print '<tr class="oddeven">';
-				print '<td class="nowrap">';
+				print '<td class="nowraponall tdoverflowmax100">';
 				print $product_static->getNomUrl(1, '', 16);
 				print "</td>\n";
-				print '<td>'.dol_trunc($objp->label, 32).'</td>';
+				print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($objp->label).'">'.dol_escape_htmltag($objp->label).'</td>';
 				print "<td>";
 				print dol_print_date($db->jdate($objp->datem), 'day');
 				print "</td>";

From 94974af738d9e15edfd1f3f5397fce775aeb291a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 30 Jun 2021 01:52:54 +0200
Subject: [PATCH 0943/1497] trans

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

diff --git a/htdocs/knowledgemanagement/knowledgerecord_list.php b/htdocs/knowledgemanagement/knowledgerecord_list.php
index efaf99b63a9..173ec749e2a 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_list.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_list.php
@@ -202,7 +202,7 @@ $now = dol_now();
 
 //$help_url="EN:Module_KnowledgeRecord|FR:Module_KnowledgeRecord_FR|ES:Módulo_KnowledgeRecord";
 $help_url = '';
-$title = $langs->trans('ListOfArticles');
+$title = $langs->trans('ListKnowledgeRecord');
 $morejs = array();
 $morecss = array();
 

From f95b5be971ded339888d57099c3af77288b73538 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Wed, 30 Jun 2021 04:55:22 +0200
Subject: [PATCH 0944/1497] FIX Accountancy - Clean virtual zero on the import

---
 htdocs/core/modules/import/import_csv.modules.php  | 6 +++++-
 htdocs/core/modules/import/import_xlsx.modules.php | 6 +++++-
 htdocs/core/modules/modAccounting.class.php        | 6 +++---
 htdocs/core/modules/modProduct.class.php           | 8 +++++++-
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/modules/import/import_csv.modules.php b/htdocs/core/modules/import/import_csv.modules.php
index 52b7af1fee5..6bec94d6130 100644
--- a/htdocs/core/modules/import/import_csv.modules.php
+++ b/htdocs/core/modules/import/import_csv.modules.php
@@ -624,7 +624,11 @@ class ImportCsv extends ModeleImports
 								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'numeric') {
 									$newval = price2num($newval);
 								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'accountingaccount') {
-									$newval = rtrim($newval, "0");
+									if (empty($conf->global->ACCOUNTING_MANAGE_ZERO)) {
+										$newval = rtrim(trim($newval), "0");
+									} else {
+										$newval = trim($newval);
+									}
 								}
 
 								//print 'Val to use as insert is '.$newval.'<br>';
diff --git a/htdocs/core/modules/import/import_xlsx.modules.php b/htdocs/core/modules/import/import_xlsx.modules.php
index abc2a80abc9..0378180475d 100644
--- a/htdocs/core/modules/import/import_xlsx.modules.php
+++ b/htdocs/core/modules/import/import_xlsx.modules.php
@@ -665,7 +665,11 @@ class ImportXlsx extends ModeleImports
 								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'numeric') {
 									$newval = price2num($newval);
 								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'accountingaccount') {
-									$newval = rtrim($newval, "0");
+									if (empty($conf->global->ACCOUNTING_MANAGE_ZERO)) {
+										$newval = rtrim(trim($newval), "0");
+									} else {
+										$newval = trim($newval);
+									}
 								}
 
 								//print 'Val to use as insert is '.$newval.'<br>';
diff --git a/htdocs/core/modules/modAccounting.class.php b/htdocs/core/modules/modAccounting.class.php
index f86a2078c9e..d6127f65b83 100644
--- a/htdocs/core/modules/modAccounting.class.php
+++ b/htdocs/core/modules/modAccounting.class.php
@@ -297,9 +297,9 @@ class modAccounting extends DolibarrModules
 		);
 		$this->import_fieldshidden_array[$r] = array('b.doc_type'=>'const-import_from_external', 'b.fk_doc'=>'const-0', 'b.fk_docdet'=>'const-0', 'b.fk_user_author'=>'user->id', 'b.date_creation'=>'const-'.dol_print_date(dol_now(), 'standard')); // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
 		$this->import_regex_array[$r] = array('b.doc_date'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$');
-		$this->import_convertvalue_array[$r]=array(
-			'b.numero_compte'=>array('rule'=>'accountingaccount'),
-			'b.subledger_account'=>array('rule'=>'accountingaccount')
+		$this->import_convertvalue_array[$r] = array(
+			'b.numero_compte' => array('rule' => 'accountingaccount'),
+			'b.subledger_account' => array('rule' => 'accountingaccount')
 		);
 		$this->import_examplevalues_array[$r] = array(
 			'b.piece_num'=>'123 (!!! use next value not already used)',
diff --git a/htdocs/core/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php
index 3459973a699..37cda4b7b30 100644
--- a/htdocs/core/modules/modProduct.class.php
+++ b/htdocs/core/modules/modProduct.class.php
@@ -572,7 +572,13 @@ class modProduct extends DolibarrModules
 					'class' => 'CProductNature',
 					'method' => 'fetch',
 					'dict' => 'DictionaryProductNature'
-					),
+				),
+				'p.accountancy_code_sell'=>array('rule'=>'accountingaccount'),
+				'p.accountancy_code_sell_intra'=>array('rule'=>'accountingaccount'),
+				'p.accountancy_code_sell_export'=>array('rule'=>'accountingaccount'),
+				'p.accountancy_code_buy'=>array('rule'=>'accountingaccount'),
+				'p.accountancy_code_buy_intra'=>array('rule'=>'accountingaccount'),
+				'p.accountancy_code_buy_export'=>array('rule'=>'accountingaccount'),
 		);
 
 		$this->import_regex_array[$r] = array(

From 94416072d8a5ae072cfeed77781fb5db8b88c59f Mon Sep 17 00:00:00 2001
From: Florian Mortgat <florian.mortgat@atm-consulting.fr>
Date: Wed, 30 Jun 2021 09:34:49 +0200
Subject: [PATCH 0945/1497] FIX after PR feedback: remove uses of `keyword`
 attribute of EcmFiles (use `keywords` instead)

---
 htdocs/core/lib/files.lib.php       | 4 ++--
 htdocs/ecm/class/ecmfiles.class.php | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 8e44e30f445..5b2f9fa7f4b 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1785,13 +1785,13 @@ function addFileIntoDatabaseIndex($dir, $file, $fullpathorig = '', $mode = 'uplo
 		$ecmfile->fullpath_orig = $fullpathorig;
 		$ecmfile->gen_or_uploaded = $mode;
 		$ecmfile->description = ''; // indexed content
-		$ecmfile->keyword = ''; // keyword content
+		$ecmfile->keywords = ''; // keyword content
 
 		if (is_object($object) && $object->id > 0) {
 			$ecmfile->src_object_id = $object->id;
 			if (isset($object->table_element)) $ecmfile->src_object_type = $object->table_element;
 			if (isset($object->src_object_description)) $ecmfile->description = $object->src_object_description;
-			if (isset($object->src_object_keyword)) $ecmfile->keyword = $object->src_object_keyword;
+			if (isset($object->src_object_keywords)) $ecmfile->keywords = $object->src_object_keywords;
 		}
 
 		if ($setsharekey) {
diff --git a/htdocs/ecm/class/ecmfiles.class.php b/htdocs/ecm/class/ecmfiles.class.php
index df18aa13d2f..035a7aee9c6 100644
--- a/htdocs/ecm/class/ecmfiles.class.php
+++ b/htdocs/ecm/class/ecmfiles.class.php
@@ -288,7 +288,6 @@ class EcmFiles extends CommonObject
 		$sql .= 'fullpath_orig,';
 		$sql .= 'description,';
 		$sql .= 'keywords,';
-		$sql .= 'keyword,';
 		$sql .= 'cover,';
 		$sql .= 'position,';
 		$sql .= 'gen_or_uploaded,';
@@ -310,7 +309,6 @@ class EcmFiles extends CommonObject
 		$sql .= ' '.(!isset($this->fullpath_orig) ? 'NULL' : "'".$this->db->escape($this->fullpath_orig)."'").',';
 		$sql .= ' '.(!isset($this->description) ? 'NULL' : "'".$this->db->escape($this->description)."'").',';
 		$sql .= ' '.(!isset($this->keywords) ? 'NULL' : "'".$this->db->escape($this->keywords)."'").',';
-		$sql .= ' '.(!isset($this->keyword) ? 'NULL' : "'".$this->db->escape($this->keyword)."'").',';
 		$sql .= ' '.(!isset($this->cover) ? 'NULL' : "'".$this->db->escape($this->cover)."'").',';
 		$sql .= ' '.$maxposition.',';
 		$sql .= ' '.(!isset($this->gen_or_uploaded) ? 'NULL' : "'".$this->db->escape($this->gen_or_uploaded)."'").',';

From 0b5e231dd5cbd63a4e00dd3ebfef1479eab60cbf Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe@altairis.fr>
Date: Wed, 30 Jun 2021 10:18:14 +0200
Subject: [PATCH 0946/1497] add labels and export only latest prices

---
 htdocs/core/modules/modProduct.class.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php
index 3459973a699..dc769451e67 100644
--- a/htdocs/core/modules/modProduct.class.php
+++ b/htdocs/core/modules/modProduct.class.php
@@ -322,7 +322,7 @@ class modProduct extends DolibarrModules
 			$this->export_code[$r] = $this->rights_class.'_'.$r;
 			$this->export_label[$r] = "ProductsMultiPrice"; // Translation key (used only if key ExportDataset_xxx_z not found)
 			$this->export_permission[$r] = array(array("produit", "export"));
-			$this->export_fields_array[$r] = array('p.rowid'=>"Id", 'p.ref'=>"Ref",
+			$this->export_fields_array[$r] = array('p.rowid'=>"Id", 'p.ref'=>"Ref", 'p.label'=>"Label",
 				'pr.price_base_type'=>"PriceBase", 'pr.price_level'=>"PriceLevel",
 				'pr.price'=>"PriceLevelUnitPriceHT", 'pr.price_ttc'=>"PriceLevelUnitPriceTTC",
 				'pr.price_min'=>"MinPriceLevelUnitPriceHT", 'pr.price_min_ttc'=>"MinPriceLevelUnitPriceTTC",
@@ -337,7 +337,7 @@ class modProduct extends DolibarrModules
 			//	'p.price_base_type'=>"Text",'p.price'=>"Numeric",'p.price_ttc'=>"Numeric",'p.tva_tx'=>'Numeric','p.tosell'=>"Boolean",'p.tobuy'=>"Boolean",
 			//	'p.datec'=>'Date','p.tms'=>'Date'
 			//);
-			$this->export_entities_array[$r] = array('p.rowid'=>"product", 'p.ref'=>"product",
+			$this->export_entities_array[$r] = array('p.rowid'=>"product", 'p.ref'=>"product", 'p.label'=>"Label",
 				'pr.price_base_type'=>"product", 'pr.price_level'=>"product", 'pr.price'=>"product",
 				'pr.price_ttc'=>"product",
 				'pr.price_min'=>"product", 'pr.price_min_ttc'=>"product",
@@ -348,6 +348,8 @@ class modProduct extends DolibarrModules
 			$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'product as p';
 			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_price as pr ON p.rowid = pr.fk_product AND pr.entity = '.$conf->entity; // export prices only for the current entity
 			$this->export_sql_end[$r] .= ' WHERE p.entity IN ('.getEntity('product').')'; // For product and service profile
+			$this->export_sql_end[$r] .= ' AND pr.date_price = (SELECT MAX(pr2.date_price) FROM '.MAIN_DB_PREFIX.'product_price as pr2 WHERE pr2.fk_product = pr.fk_product)';
+			$this->export_sql_end[$r] .= ' ORDER BY p.ref, pr.price_level';
 		}
 
 		if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
@@ -356,7 +358,7 @@ class modProduct extends DolibarrModules
 			$this->export_code[$r] = $this->rights_class.'_'.$r;
 			$this->export_label[$r] = "ProductsPricePerCustomer"; // Translation key (used only if key ExportDataset_xxx_z not found)
 			$this->export_permission[$r] = array(array("produit", "export"));
-			$this->export_fields_array[$r] = array('p.rowid'=>"Id", 'p.ref'=>"Ref",
+			$this->export_fields_array[$r] = array('p.rowid'=>"Id", 'p.ref'=>"Ref", 'p.label'=>"Label",
 				's.nom'=>'ThirdParty',
 				'pr.price_base_type'=>"PriceBase",
 				'pr.price'=>"PriceUnitPriceHT", 'pr.price_ttc'=>"PriceUnitPriceTTC",
@@ -367,7 +369,7 @@ class modProduct extends DolibarrModules
 			if (is_object($mysoc) && $usenpr) {
 				$this->export_fields_array[$r]['pr.recuperableonly'] = 'NPR';
 			}
-			$this->export_entities_array[$r] = array('p.rowid'=>"product", 'p.ref'=>"product",
+			$this->export_entities_array[$r] = array('p.rowid'=>"product", 'p.ref'=>"product", 'p.label'=>"Label",
 				's.nom'=>'company',
 				'pr.price_base_type'=>"product", 'pr.price'=>"product",
 				'pr.price_ttc'=>"product",

From 4f2e579bb2c5966a86ea7e33149a35589ea8797a Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe@altairis.fr>
Date: Wed, 30 Jun 2021 10:21:31 +0200
Subject: [PATCH 0947/1497] add labels and export only latest prices

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

diff --git a/htdocs/core/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php
index dc769451e67..62e355d8e6a 100644
--- a/htdocs/core/modules/modProduct.class.php
+++ b/htdocs/core/modules/modProduct.class.php
@@ -348,7 +348,7 @@ class modProduct extends DolibarrModules
 			$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'product as p';
 			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_price as pr ON p.rowid = pr.fk_product AND pr.entity = '.$conf->entity; // export prices only for the current entity
 			$this->export_sql_end[$r] .= ' WHERE p.entity IN ('.getEntity('product').')'; // For product and service profile
-			$this->export_sql_end[$r] .= ' AND pr.date_price = (SELECT MAX(pr2.date_price) FROM '.MAIN_DB_PREFIX.'product_price as pr2 WHERE pr2.fk_product = pr.fk_product)';
+			$this->export_sql_end[$r] .= ' AND pr.date_price = (SELECT MAX(pr2.date_price) FROM '.MAIN_DB_PREFIX.'product_price as pr2 WHERE pr2.fk_product = pr.fk_product)'; // export only latest prices not full history
 			$this->export_sql_end[$r] .= ' ORDER BY p.ref, pr.price_level';
 		}
 

From dcd4d5362247db1bda448c64b6b6760108b5e5d1 Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Wed, 30 Jun 2021 10:22:00 +0200
Subject: [PATCH 0948/1497] Fix php 8 warning in adherents list

---
 htdocs/adherents/list.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index d669270b565..1c93b247dfc 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -65,6 +65,7 @@ $search_filter = GETPOST("search_filter", 'alpha');
 $search_status = GETPOST("search_status", 'intcomma');
 $catid        = GETPOST("catid", 'int');
 $optioncss = GETPOST('optioncss', 'alpha');
+$socid = GETPOST('socid', 'int');
 
 $filter = GETPOST("filter", 'alpha');
 if ($filter) {

From 2ab97d522d523507c7fefd966c351d2945827b0d Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Wed, 30 Jun 2021 10:30:46 +0200
Subject: [PATCH 0949/1497] Fix php 8.0 warning societe index

---
 htdocs/societe/index.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php
index f5a4392a0c0..14901dc8a9c 100644
--- a/htdocs/societe/index.php
+++ b/htdocs/societe/index.php
@@ -185,6 +185,7 @@ $thirdpartygraph .= '</td></tr>';
 $thirdpartygraph .= '</table>';
 $thirdpartygraph .= '</div>';
 
+$thirdpartycateggraph = '';
 if (!empty($conf->categorie->enabled) && !empty($conf->global->CATEGORY_GRAPHSTATS_ON_THIRDPARTIES)) {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 	$elementtype = 'societe';

From 3b4ea5c5af71d6fb2ab46895a01e59112bfeec1e Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe@altairis.fr>
Date: Wed, 30 Jun 2021 10:56:09 +0200
Subject: [PATCH 0950/1497] use formintervention

---
 htdocs/core/class/html.form.class.php         | 141 ------------------
 .../class/html.formintervention.class.php     |  13 +-
 htdocs/projet/tasks/time.php                  |   5 +-
 3 files changed, 12 insertions(+), 147 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 8d0f1931763..0b1504d229a 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -8746,147 +8746,6 @@ class Form
 		return $out;
 	}
 
-	/**
-	 *  Output a combo list with interventions qualified for a third party
-	 *
-	 *  @param	int		$socid      	Id third party (-1=all, 0=only projects not linked to a third party, id=projects not linked or linked to third party id)
-	 *  @param  int		$selected   	Id intervention preselected
-	 *  @param  string	$htmlname   	Name of HTML select
-	 *	@param	int		$maxlength		Maximum length of label
-	 *	@param	int		$option_only	Return only html options lines without the select tag
-	 *	@param	string	$show_empty		Add an empty line ('1' or string to show for empty line)
-	 *  @param	int		$discard_closed Discard closed projects (0=Keep,1=hide completely,2=Disable)
-	 *  @param	int		$forcefocus		Force focus on field (works with javascript only)
-	 *  @param	int		$disabled		Disabled
-	 *  @param	string	$morecss        More css added to the select component
-	 *  @param	string	$projectsListId ''=Automatic filter on project allowed. List of id=Filter on project ids.
-	 *  @param	string	$showproject	'all' = Show project info, ''=Hide project info
-	 *  @param	User	$usertofilter	User object to use for filtering
-	 *	@return int         			Nbr of project if OK, <0 if KO
-	 */
-	public function selectIntervention($socid = -1, $selected = '', $htmlname = 'interid', $maxlength = 24, $option_only = 0, $show_empty = '1', $discard_closed = 0, $forcefocus = 0, $disabled = 0, $morecss = 'maxwidth500', $projectsListId = '', $showproject = 'all', $usertofilter = null)
-	{
-		global $user, $conf, $langs;
-
-		require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-
-		if (is_null($usertofilter))	{
-			$usertofilter = $user;
-		}
-
-		$out = '';
-
-		$hideunselectables = false;
-		if (!empty($conf->global->PROJECT_HIDE_UNSELECTABLES)) $hideunselectables = true;
-
-		if (empty($projectsListId))	{
-			if (empty($usertofilter->rights->projet->all->lire)) {
-				$projectstatic = new Project($this->db);
-				$projectsListId = $projectstatic->getProjectsAuthorizedForUser($usertofilter, 0, 1);
-			}
-		}
-
-		// Search all projects
-		$sql = 'SELECT i.rowid, i.ref as ref, p.fk_soc, p.fk_statut, p.public,';
-		$sql .= ' s.nom as name';
-		$sql .= ' FROM '.MAIN_DB_PREFIX.'projet as p';
-		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON s.rowid = p.fk_soc,';
-		$sql .= ' '.MAIN_DB_PREFIX.'fichinter as i';
-		$sql .= " WHERE p.entity IN (".getEntity('project').")";
-		$sql .= " AND i.fk_projet = p.rowid AND i.fk_statut=0"; //Brouillons seulement
-		if ($projectsListId) $sql.= " AND p.rowid IN (".$projectsListId.")";
-		if ($socid == 0) $sql.= " AND (p.fk_soc=0 OR p.fk_soc IS NULL)";
-		if ($socid > 0)  $sql.= " AND (p.fk_soc=".$socid." OR p.fk_soc IS NULL)";
-		$sql .= " GROUP BY i.ref ORDER BY p.ref, i.ref ASC";
-
-		$resql = $this->db->query($sql);
-		if ($resql)	{
-			// Use select2 selector
-			if (!empty($conf->use_javascript_ajax))	{
-				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
-				$comboenhancement = ajax_combobox($htmlname, '', 0, $forcefocus);
-				$out .= $comboenhancement;
-				$morecss = 'minwidth200imp maxwidth500';
-			}
-
-			if (empty($option_only)) {
-				$out .= '<select class="valignmiddle flat'.($morecss ? ' '.$morecss : '').'"'.($disabled ? ' disabled="disabled"' : '').' id="'.$htmlname.'" name="'.$htmlname.'">';
-			}
-			if (!empty($show_empty)) {
-				$out .= '<option value="0" class="optiongrey">';
-				if (!is_numeric($show_empty)) $out .= $show_empty;
-				else $out .= '&nbsp;';
-				$out .= '</option>';
-			}
-			$num = $this->db->num_rows($resql);
-			$i = 0;
-			if ($num) {
-				while ($i < $num) {
-					$obj = $this->db->fetch_object($resql);
-					// If we ask to filter on a company and user has no permission to see all companies and project is linked to another company, we hide project.
-					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && empty($usertofilter->rights->societe->lire)) {
-						// Do nothing
-					} else {
-						if ($discard_closed == 1 && $obj->fk_statut == Project::STATUS_CLOSED) {
-							$i++;
-							continue;
-						}
-
-						$labeltoshow = '';
-
-						if ($showproject == 'all') {
-							$labeltoshow .= dol_trunc($obj->ref, 18); // Intervention ref
-							if ($obj->name) $labeltoshow .= ' - '.$obj->name; // Soc name
-
-							$disabled = 0;
-							if ($obj->fk_statut == Project::STATUS_DRAFT) {
-								$disabled = 1;
-								$labeltoshow .= ' - '.$langs->trans("Draft");
-							} elseif ($obj->fk_statut == Project::STATUS_CLOSED) {
-								if ($discard_closed == 2) $disabled = 1;
-								$labeltoshow .= ' - '.$langs->trans("Closed");
-							} elseif ($socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid)) {
-								$disabled = 1;
-								$labeltoshow .= ' - '.$langs->trans("LinkedToAnotherCompany");
-							}
-						}
-
-						if (!empty($selected) && $selected == $obj->rowid) {
-							$out .= '<option value="'.$obj->rowid.'" selected';
-							//if ($disabled) $out.=' disabled';						// with select2, field can't be preselected if disabled
-							$out .= '>'.$labeltoshow.'</option>';
-						} else {
-							if ($hideunselectables && $disabled && ($selected != $obj->rowid)) {
-								$resultat = '';
-							} else {
-								$resultat = '<option value="'.$obj->rowid.'"';
-								if ($disabled) $resultat .= ' disabled';
-								//if ($obj->public) $labeltoshow.=' ('.$langs->trans("Public").')';
-								//else $labeltoshow.=' ('.$langs->trans("Private").')';
-								$resultat .= '>';
-								$resultat .= $labeltoshow;
-								$resultat .= '</option>';
-							}
-							$out .= $resultat;
-						}
-					}
-					$i++;
-				}
-			}
-			if (empty($option_only)) {
-				$out .= '</select>';
-			}
-
-			print $out;
-
-			$this->db->free($resql);
-			return $num;
-		} else {
-			dol_print_error($this->db);
-			return -1;
-		}
-	}
-
 	/**
 	 *  Output a combo list with invoices qualified for a third party
 	 *
diff --git a/htdocs/core/class/html.formintervention.class.php b/htdocs/core/class/html.formintervention.class.php
index 7058e80b1d7..b9564c6aa52 100644
--- a/htdocs/core/class/html.formintervention.class.php
+++ b/htdocs/core/class/html.formintervention.class.php
@@ -57,10 +57,11 @@ class FormIntervention
 	 *	@param  int		$selected   Id intervention preselected
 	 *	@param  string	$htmlname   Nom de la zone html
 	 *	@param	int		$maxlength	Maximum length of label
-	 *	@param	int		$showempty	Show empty line
+	 *	@param	int		$showempty	Show empty line ('1' or string to show for empty line)
+	 *	@param	int		$draftonly	Show only drafts intervention
 	 *	@return int         		Nbre of project if OK, <0 if KO
 	 */
-	public function select_interventions($socid = -1, $selected = '', $htmlname = 'interventionid', $maxlength = 16, $showempty = 1)
+	public function select_interventions($socid = -1, $selected = '', $htmlname = 'interventionid', $maxlength = 16, $showempty = 1, $draftonly = false)
 	{
 		// phpcs:enable
 		global $db, $user, $conf, $langs;
@@ -80,13 +81,17 @@ class FormIntervention
 				$sql .= " AND f.fk_soc = ".((int) $socid);
 			}
 		}
+		if ($draftonly) $sql .= " AND f.fk_statut = 0";
 
 		dol_syslog(get_class($this)."::select_intervention", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$out .= '<select id="interventionid" class="flat" name="'.dol_escape_htmltag($htmlname).'">';
 			if ($showempty) {
-				$out .= '<option value="0">&nbsp;</option>';
+				$out .= '<option value="0">';
+				if (!is_numeric($showempty)) $out .= $showempty;
+				else $out .= '&nbsp;';
+				$out .= '</option>';
 			}
 			$num = $this->db->num_rows($resql);
 			$i = 0;
@@ -102,7 +107,7 @@ class FormIntervention
 							$out .= '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
 						} else {
 							$disabled = 0;
-							if (!$obj->fk_statut > 0) {
+							if (!$obj->fk_statut > 0 && ! $draftonly) {
 								$disabled = 1;
 								$labeltoshow .= ' ('.$langs->trans("Draft").')';
 							}
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 5f3d4df5292..cf785631b70 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -35,6 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formintervention.class.php';
 
 // Load translation files required by the page
 $langsLoad=array('projects', 'bills', 'orders');
@@ -1118,8 +1119,8 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0) {
 				print $langs->trans('InterToUse');
 				print '</td>';
 				print '<td>';
-				$form->selectIntervention($projectstatic->thirdparty->id, '', 'interid', 24, 0, $langs->trans('NewInter'),
-				1, 0, 0, 'maxwidth500', '', 'all');
+				$forminter = new FormIntervention($db);
+				print $forminter->select_interventions($projectstatic->thirdparty->id, '', 'interid', 24, $langs->trans('NewInter'), true);
 				print '</td>';
 				print '</tr>';
 				print '</table>';

From 8772c53723ed13e655deba058aceb9f7fa1a531a Mon Sep 17 00:00:00 2001
From: atm-arnaud <asp@atm-consulting.fr>
Date: Wed, 30 Jun 2021 12:37:21 +0200
Subject: [PATCH 0951/1497] FIX deposit can create credit note in payment conf

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

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 31c42e5ba9e..e15b2722800 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -5260,7 +5260,7 @@ elseif ($id > 0 || !empty($ref))
 			}
 
 			// Create a credit note
-			if (($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_DEPOSIT || $object->type == Facture::TYPE_PROFORMA) && $object->statut > 0 && $usercancreate)
+			if (($object->type == Facture::TYPE_STANDARD || ($object->type == Facture::TYPE_DEPOSIT && empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS) ) || $object->type == Facture::TYPE_PROFORMA) && $object->statut > 0 && $usercancreate)
 			{
 				if (!$objectidnext)
 				{

From 51456741d97337329bde1f8fd0b8fa8861db1036 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 30 Jun 2021 12:43:44 +0200
Subject: [PATCH 0952/1497] FIX Can't edit replacement invoice FIX Status of
 invoice when making a replacement invoice

---
 htdocs/compta/facture/card.php                |  6 ++---
 htdocs/compta/facture/class/facture.class.php | 26 +++++++++++-------
 htdocs/core/tpl/objectline_edit.tpl.php       | 27 ++++++++++++++-----
 3 files changed, 39 insertions(+), 20 deletions(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 54994eaf187..b3a33b11d1b 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -3131,10 +3131,10 @@ if ($action == 'create')
 				foreach ($facids as $facparam)
 				{
 					$options .= '<option value="'.$facparam ['id'].'"';
-					if ($facparam ['id'] == $_POST['fac_replacement'])
+					if ($facparam['id'] == $_POST['fac_replacement'])
 						$options .= ' selected';
-					$options .= '>'.$facparam ['ref'];
-					$options .= ' ('.$facturestatic->LibStatut(0, $facparam ['status']).')';
+					$options .= '>'.$facparam['ref'];
+					$options .= ' ('.$facturestatic->LibStatut($facparam['paid'], $facparam['status'], 0, $facparam['alreadypaid']).')';
 					$options .= '</option>';
 				}
 			}
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 4ae9fe197fe..63a7b2f8e21 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -3927,8 +3927,8 @@ class Facture extends CommonInvoice
 	 *	Invoices matching the following rules are returned:
 	 *	(Status validated or abandonned for a reason 'other') + not payed + no payment at all + not already replaced
 	 *
-	 *	@param		int		$socid		Id thirdparty
-	 *	@return    	array|int			Array of invoices ('id'=>id, 'ref'=>ref, 'status'=>status, 'paymentornot'=>0/1)
+	 *	@param		int			$socid		Id thirdparty
+	 *	@return    	array|int				Array of invoices ('id'=>id, 'ref'=>ref, 'status'=>status, 'paymentornot'=>0/1)
 	 */
 	public function list_replacable_invoices($socid = 0)
 	{
@@ -3937,17 +3937,19 @@ class Facture extends CommonInvoice
 
 		$return = array();
 
-		$sql = "SELECT f.rowid as rowid, f.ref, f.fk_statut,";
+		$sql = "SELECT f.rowid as rowid, f.ref, f.fk_statut as status, f.paye as paid,";
 		$sql .= " ff.rowid as rowidnext";
+		//$sql .= ", SUM(pf.amount) as alreadypaid";
 		$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON f.rowid = pf.fk_facture";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture as ff ON f.rowid = ff.fk_facture_source";
 		$sql .= " WHERE (f.fk_statut = ".self::STATUS_VALIDATED." OR (f.fk_statut = ".self::STATUS_ABANDONED." AND f.close_code = '".self::CLOSECODE_ABANDONED."'))";
 		$sql .= " AND f.entity IN (".getEntity('invoice').")";
-		$sql .= " AND f.paye = 0"; // Pas classee payee completement
-		$sql .= " AND pf.fk_paiement IS NULL"; // Aucun paiement deja fait
-		$sql .= " AND ff.fk_statut IS NULL"; // Renvoi vrai si pas facture de remplacement
-		if ($socid > 0) $sql .= " AND f.fk_soc = ".$socid;
+		$sql .= " AND f.paye = 0"; // Not paid completely
+		$sql .= " AND pf.fk_paiement IS NULL"; // No payment already done
+		$sql .= " AND ff.fk_statut IS NULL"; // Return true if it is not a replacement invoice
+		if ($socid > 0) $sql .= " AND f.fk_soc = ".((int) $socid);
+		//$sql .= " GROUP BY f.rowid, f.ref, f.fk_statut, f.paye, ff.rowid";
 		$sql .= " ORDER BY f.ref";
 
 		dol_syslog(get_class($this)."::list_replacable_invoices", LOG_DEBUG);
@@ -3956,9 +3958,13 @@ class Facture extends CommonInvoice
 		{
 			while ($obj = $this->db->fetch_object($resql))
 			{
-				$return[$obj->rowid] = array('id' => $obj->rowid,
-				'ref' => $obj->ref,
-				'status' => $obj->fk_statut);
+				$return[$obj->rowid] = array(
+					'id' => $obj->rowid,
+					'ref' => $obj->ref,
+					'status' => $obj->status,
+					'paid' => $obj->paid,
+					'alreadypaid' => 0
+				);
 			}
 			//print_r($return);
 			return $return;
diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php
index bc6b87a3353..685cc78fe67 100644
--- a/htdocs/core/tpl/objectline_edit.tpl.php
+++ b/htdocs/core/tpl/objectline_edit.tpl.php
@@ -109,9 +109,16 @@ $coldisplay++;
 		$reshook = $hookmanager->executeHooks('formEditProductOptions', $parameters, $this, $action);
 	}
 
+	$situationinvoicelinewithparent = 0;
+	if ($line->fk_prev_id != null && in_array($object->element, array('facture', 'facturedet'))) {
+		if ($object->type == $object::TYPE_SITUATION) {	// The constant TYPE_SITUATION exists only for object invoice
+			// Set constant to disallow editing during a situation cycle
+			$situationinvoicelinewithparent = 1;
+		}
+	}
+
 	// Do not allow editing during a situation cycle
-	if ($line->fk_prev_id == null)
-	{
+	if (!$situationinvoicelinewithparent) {
 		// editor wysiwyg
 		require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 		$nbrows = ROWS_2;
@@ -149,7 +156,7 @@ $coldisplay++;
 	}
 
 	$coldisplay++;
-	if ($line->fk_prev_id == null) {
+	if (!$situationinvoicelinewithparent) {
 		print '<td class="right">'.$form->load_tva('tva_tx', $line->tva_tx.($line->vat_src_code ? (' ('.$line->vat_src_code.')') : ''), $seller, $buyer, 0, $line->info_bits, $line->product_type, false, 1).'</td>';
 	} else {
 		print '<td class="right"><input size="1" type="text" class="flat right" name="tva_tx" value="'.price($line->tva_tx).'" readonly />%</td>';
@@ -157,7 +164,9 @@ $coldisplay++;
 
 	$coldisplay++;
 	print '<td class="right"><input type="text" class="flat right" size="5" id="price_ht" name="price_ht" value="'.(isset($line->pu_ht) ?price($line->pu_ht, 0, '', 0) : price($line->subprice, 0, '', 0)).'"';
-	if ($line->fk_prev_id != null) print ' readonly';
+	if ($situationinvoicelinewithparent) {
+		print ' readonly';
+	}
 	print '></td>';
 
 	if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) {
@@ -176,12 +185,14 @@ $coldisplay++;
 	<td class="right">
 	<?php $coldisplay++;
 	if (($line->info_bits & 2) != 2) {
-		// I comment this because it shows info even when not required
+		// I comment warning of stock because it shows the info even when it should not.
 		// for example always visible on invoice but must be visible only if stock module on and stock decrease option is on invoice validation and status is not validated
 		// must also not be output for most entities (proposal, intervention, ...)
 		//if($line->qty > $line->stock) print img_picto($langs->trans("StockTooLow"),"warning", 'style="vertical-align: bottom;"')." ";
 		print '<input size="3" type="text" class="flat right" name="qty" id="qty" value="'.$line->qty.'"';
-		if ($line->fk_prev_id != null) print ' readonly';
+		if ($situationinvoicelinewithparent) {	// Do not allow editing during a situation cycle
+			print ' readonly';
+		}
 		print '>';
 	} else { ?>
 		&nbsp;
@@ -202,7 +213,9 @@ $coldisplay++;
 	<?php $coldisplay++;
 	if (($line->info_bits & 2) != 2) {
 		print '<input size="1" type="text" class="flat right" name="remise_percent" id="remise_percent" value="'.$line->remise_percent.'"';
-		if ($line->fk_prev_id != null) print ' readonly';
+		if ($situationinvoicelinewithparent) {
+			print ' readonly';
+		}
 		print '>%';
 	} else { ?>
 		&nbsp;

From a914ffa42c0861febd39256a6415297558f8edb1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 30 Jun 2021 15:00:04 +0200
Subject: [PATCH 0953/1497] CSS

---
 htdocs/core/lib/project.lib.php | 2 +-
 htdocs/projet/tasks.php         | 2 +-
 htdocs/projet/tasks/time.php    | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index d20a0348d3d..93c061310a5 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -849,7 +849,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 
 				// Contacts of task
 				if (count($arrayfields) > 0 && !empty($arrayfields['c.assigned']['checked'])) {
-					print '<td>';
+					print '<td class="center">';
 					foreach (array('internal', 'external') as $source) {
 						$tab = $lines[$i]->liste_contact(-1, $source);
 						$num = count($tab);
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index 9de05d67e29..d4b5bf89bbf 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -902,7 +902,7 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 	}
 	*/
 	if (!empty($arrayfields['c.assigned']['checked'])) {
-		print_liste_field_titre($arrayfields['c.assigned']['label'], $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'right ', '');
+		print_liste_field_titre($arrayfields['c.assigned']['label'], $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'center ', '');
 	}
 	// Extra fields
 	$disablesortlink = 1;
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index a9316bcedcd..bbe9671faf3 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -1410,7 +1410,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0) {
 
 			// By User
 			if (!empty($arrayfields['author']['checked'])) {
-				print '<td class="nowrap">';
+				print '<td class="tdoverflowmax100">';
 				if ($action == 'editline' && $_GET['lineid'] == $task_time->rowid) {
 					if (empty($object->id)) {
 						$object->fetch($id);
@@ -1441,7 +1441,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0) {
 
 			// Note
 			if (!empty($arrayfields['t.note']['checked'])) {
-				print '<td class="left">';
+				print '<td class="small">';
 				if ($action == 'editline' && $_GET['lineid'] == $task_time->rowid) {
 					print '<textarea name="timespent_note_line" width="95%" rows="'.ROWS_2.'">'.$task_time->note.'</textarea>';
 				} else {
@@ -1773,7 +1773,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0) {
 
 				// Note
 				if (!empty($arrayfields['t.note']['checked'])) {
-					print '<td class="left">';
+					print '<td class="small tdoverflowmax300"">';
 					if ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid) {
 						print '<textarea name="timespent_note_line_2" width="95%" rows="'.ROWS_2.'">'.$task_time->note.'</textarea>';
 					} else {

From ac6cb5853e7c6406681a4ca7e5d8a5339871e0d5 Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe@altairis.fr>
Date: Wed, 30 Jun 2021 15:35:55 +0200
Subject: [PATCH 0954/1497] fix for multientity

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

diff --git a/htdocs/core/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php
index 62e355d8e6a..5b0a1c06b85 100644
--- a/htdocs/core/modules/modProduct.class.php
+++ b/htdocs/core/modules/modProduct.class.php
@@ -348,7 +348,7 @@ class modProduct extends DolibarrModules
 			$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'product as p';
 			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_price as pr ON p.rowid = pr.fk_product AND pr.entity = '.$conf->entity; // export prices only for the current entity
 			$this->export_sql_end[$r] .= ' WHERE p.entity IN ('.getEntity('product').')'; // For product and service profile
-			$this->export_sql_end[$r] .= ' AND pr.date_price = (SELECT MAX(pr2.date_price) FROM '.MAIN_DB_PREFIX.'product_price as pr2 WHERE pr2.fk_product = pr.fk_product)'; // export only latest prices not full history
+			$this->export_sql_end[$r] .= ' AND pr.date_price = (SELECT MAX(pr2.date_price) FROM '.MAIN_DB_PREFIX.'product_price as pr2 WHERE pr2.fk_product = pr.fk_product AND pr2.entity IN ('.getEntity('product').'))'; // export only latest prices not full history
 			$this->export_sql_end[$r] .= ' ORDER BY p.ref, pr.price_level';
 		}
 

From bda36337cd005fbe25f6e68d7cdfecabf35fcaaa Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 30 Jun 2021 17:14:19 +0200
Subject: [PATCH 0955/1497] Prepare fix #yogosha6443

---
 htdocs/api/class/api_setup.class.php          |   2 +-
 htdocs/blockedlog/class/blockedlog.class.php  |   2 -
 htdocs/compta/bank/treso.php                  |  26 ++-
 htdocs/core/class/commonobject.class.php      |  19 --
 htdocs/core/class/extrafields.class.php       |   4 +-
 htdocs/core/commonfieldsinexport.inc.php      |   2 +-
 htdocs/core/extrafieldsinexport.inc.php       |   4 +-
 htdocs/core/lib/functions.lib.php             |  21 +-
 .../modules/export/export_csv.modules.php     |   4 +-
 .../export/export_excel2007.modules.php       |   4 +-
 .../modules/export/export_tsv.modules.php     |   4 +-
 htdocs/core/modules/modFournisseur.class.php  | 211 ++----------------
 .../install/mysql/tables/llx_oauth_token.sql  |   4 +-
 test/phpunit/JsonLibTest.php                  |   9 +
 14 files changed, 78 insertions(+), 238 deletions(-)

diff --git a/htdocs/api/class/api_setup.class.php b/htdocs/api/class/api_setup.class.php
index 1f59762c865..f5f301e9c16 100644
--- a/htdocs/api/class/api_setup.class.php
+++ b/htdocs/api/class/api_setup.class.php
@@ -1013,7 +1013,7 @@ class Setup extends DolibarrApi
 					$list[$tab->elementtype][$tab->name]['computed'] = $tab->fieldcomputed;
 					$list[$tab->elementtype][$tab->name]['unique'] = $tab->fieldunique;
 					$list[$tab->elementtype][$tab->name]['required'] = $tab->fieldrequired;
-					$list[$tab->elementtype][$tab->name]['param'] = ($tab->param ? unserialize($tab->param) : '');
+					$list[$tab->elementtype][$tab->name]['param'] = ($tab->param ? jsonOrUnserialize($tab->param) : '');	// This may be a string encoded with serialise() or json_encode()
 					$list[$tab->elementtype][$tab->name]['pos'] = $tab->pos;
 					$list[$tab->elementtype][$tab->name]['alwayseditable'] = $tab->alwayseditable;
 					$list[$tab->elementtype][$tab->name]['perms'] = $tab->perms;
diff --git a/htdocs/blockedlog/class/blockedlog.class.php b/htdocs/blockedlog/class/blockedlog.class.php
index 366d7042d77..112456480e1 100644
--- a/htdocs/blockedlog/class/blockedlog.class.php
+++ b/htdocs/blockedlog/class/blockedlog.class.php
@@ -777,10 +777,8 @@ class BlockedLog
 	public function dolDecodeBlockedData($data, $mode = 0)
 	{
 		try {
-			//include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 			//include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 			$aaa = unserialize($data);
-			//$aaa = unserialize($data);
 		} catch (Exception $e) {
 			//print $e->getErrs);
 		}
diff --git a/htdocs/compta/bank/treso.php b/htdocs/compta/bank/treso.php
index 6ccd953a68b..d9b54ad1c3d 100644
--- a/htdocs/compta/bank/treso.php
+++ b/htdocs/compta/bank/treso.php
@@ -163,8 +163,8 @@ if (GETPOST("account") || GETPOST("ref")) {
 	$sqls[] = $sql;
 
 	// Social contributions
-	$sql = " SELECT 'social_contribution' as family, cs.rowid as objid, cs.libelle as ref, (-1*cs.amount) as total_ttc, ccs.libelle as type, cs.date_ech as dlr";
-	$sql .= ", cs.fk_account";
+	$sql = " SELECT 'social_contribution' as family, cs.rowid as objid, cs.libelle as ref, (-1*cs.amount) as total_ttc, ccs.libelle as type, cs.date_ech as dlr,";
+	$sql .= " 0 as socid, 'noname' as name, 0 as fournisseur";
 	$sql .= " FROM ".MAIN_DB_PREFIX."chargesociales as cs";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_chargesociales as ccs ON cs.fk_type = ccs.id";
 	$sql .= " WHERE cs.entity = ".$conf->entity;
@@ -188,7 +188,18 @@ if (GETPOST("account") || GETPOST("ref")) {
 		$resql = $db->query($sql);
 		if ($resql) {
 			while ($sqlobj = $db->fetch_object($resql)) {
-				$tab_sqlobj[] = $sqlobj;
+				$tmpobj = new stdClass();
+				$tmpobj->family = $sqlobj->family;
+				$tmpobj->objid = $sqlobj->objid;
+				$tmpobj->ref = $sqlobj->ref;
+				$tmpobj->total_ttc = $sqlobj->total_ttc;
+				$tmpobj->type = $sqlobj->type;
+				$tmpobj->dlt = $sqlobj->dlr;
+				$tmpobj->socid = $sqlobj->socid;
+				$tmpobj->name = $sqlobj->name;
+				$tmpobj->fournisseur = $sqlobj->fournisseur;
+
+				$tab_sqlobj[] = $tmpobj;
 				$tab_sqlobjOrder[] = $db->jdate($sqlobj->dlr);
 			}
 			$db->free($resql);
@@ -201,15 +212,6 @@ if (GETPOST("account") || GETPOST("ref")) {
 	if (!$error) {
 		array_multisort($tab_sqlobjOrder, $tab_sqlobj);
 
-		// Apply distinct filter
-		foreach ($tab_sqlobj as $key => $value) {
-			$tab_sqlobj[$key] = "'".serialize($value)."'";
-		}
-		$tab_sqlobj = array_unique($tab_sqlobj);
-		foreach ($tab_sqlobj as $key => $value) {
-			$tab_sqlobj[$key] = unserialize(trim($value, "'"));
-		}
-
 		$num = count($tab_sqlobj);
 
 		$i = 0;
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index ec9449eba8f..5467490ea0e 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -8167,15 +8167,6 @@ abstract class CommonObject
 				} else {
 					$queryarray[$field] = $this->db->idate($this->{$field});
 				}
-			} elseif ($this->isArray($info)) {
-				if (!empty($this->{$field})) {
-					if (!is_array($this->{$field})) {
-						$this->{$field} = array($this->{$field});
-					}
-					$queryarray[$field] = serialize($this->{$field});
-				} else {
-					$queryarray[$field] = null;
-				}
 			} elseif ($this->isDuration($info)) {
 				// $this->{$field} may be null, '', 0, '0', 123, '123'
 				if ((isset($this->{$field}) && $this->{$field} != '') || !empty($info['notnull'])) {
@@ -8236,16 +8227,6 @@ abstract class CommonObject
 				} else {
 					$this->{$field} = $db->jdate($obj->{$field});
 				}
-			} elseif ($this->isArray($info)) {
-				if (!empty($obj->{$field})) {
-					$this->{$field} = @unserialize($obj->{$field});
-					// Hack for data not in UTF8
-					if ($this->{$field } === false) {
-						@unserialize(utf8_decode($obj->{$field}));
-					}
-				} else {
-					$this->{$field} = array();
-				}
 			} elseif ($this->isInt($info)) {
 				if ($field == 'rowid') {
 					$this->id = (int) $obj->{$field};
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index b4d7f1a74df..54d812aeafb 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -936,7 +936,7 @@ class ExtraFields
 					$this->attribute_computed[$tab->name] = $tab->fieldcomputed;
 					$this->attribute_unique[$tab->name] = $tab->fieldunique;
 					$this->attribute_required[$tab->name] = $tab->fieldrequired;
-					$this->attribute_param[$tab->name] = ($tab->param ? unserialize($tab->param) : '');
+					$this->attribute_param[$tab->name] = ($tab->param ? jsonOrUnserialize($tab->param) : '');
 					$this->attribute_pos[$tab->name] = $tab->pos;
 					$this->attribute_alwayseditable[$tab->name] = $tab->alwayseditable;
 					$this->attribute_perms[$tab->name] = (strlen($tab->perms) == 0 ? 1 : $tab->perms);
@@ -954,7 +954,7 @@ class ExtraFields
 					$this->attributes[$tab->elementtype]['computed'][$tab->name] = $tab->fieldcomputed;
 					$this->attributes[$tab->elementtype]['unique'][$tab->name] = $tab->fieldunique;
 					$this->attributes[$tab->elementtype]['required'][$tab->name] = $tab->fieldrequired;
-					$this->attributes[$tab->elementtype]['param'][$tab->name] = ($tab->param ? unserialize($tab->param) : '');
+					$this->attributes[$tab->elementtype]['param'][$tab->name] = ($tab->param ? jsonOrUnserialize($tab->param) : '');
 					$this->attributes[$tab->elementtype]['pos'][$tab->name] = $tab->pos;
 					$this->attributes[$tab->elementtype]['alwayseditable'][$tab->name] = $tab->alwayseditable;
 					$this->attributes[$tab->elementtype]['perms'][$tab->name] = (strlen($tab->perms) == 0 ? 1 : $tab->perms);
diff --git a/htdocs/core/commonfieldsinexport.inc.php b/htdocs/core/commonfieldsinexport.inc.php
index a02a21afdd6..3b201e4f10a 100644
--- a/htdocs/core/commonfieldsinexport.inc.php
+++ b/htdocs/core/commonfieldsinexport.inc.php
@@ -37,7 +37,7 @@ if (class_exists($keyforclass)) {
 			/*
 			 * case 'sellist':
 			 * $tmp='';
-			 * $tmpparam=unserialize($obj->param); // $tmp ay be array 'options' => array 'c_currencies:code_iso:code_iso' => null
+			 * $tmpparam=jsonOrUnserialize($obj->param); // $tmp ay be array 'options' => array 'c_currencies:code_iso:code_iso' => null
 			 * if ($tmpparam['options'] && is_array($tmpparam['options'])) {
 			 * $tmpkeys=array_keys($tmpparam['options']);
 			 * $tmp=array_shift($tmpkeys);
diff --git a/htdocs/core/extrafieldsinexport.inc.php b/htdocs/core/extrafieldsinexport.inc.php
index 861ef142c25..70dd0077e57 100644
--- a/htdocs/core/extrafieldsinexport.inc.php
+++ b/htdocs/core/extrafieldsinexport.inc.php
@@ -39,7 +39,7 @@ if ($resql) {    // This can fail when class is used on old database (during mig
 			case 'checkbox':
 			case 'select':
 				if (!empty($conf->global->EXPORT_LABEL_FOR_SELECT)) {
-					$tmpparam = unserialize($obj->param); // $tmpparam may be array with 'options' = array(key1=>val1, key2=>val2 ...)
+					$tmpparam = jsonOrUnserialize($obj->param); // $tmpparam may be array with 'options' = array(key1=>val1, key2=>val2 ...)
 					if ($tmpparam['options'] && is_array($tmpparam['options'])) {
 						$typeFilter = "Select:".$obj->param;
 					}
@@ -47,7 +47,7 @@ if ($resql) {    // This can fail when class is used on old database (during mig
 				break;
 			case 'sellist':
 				$tmp = '';
-				$tmpparam = unserialize($obj->param); // $tmp ay be array 'options' => array 'c_currencies:code_iso:code_iso' => null
+				$tmpparam = jsonOrUnserialize($obj->param); // $tmp may be array 'options' => array 'c_currencies:code_iso:code_iso' => null
 				if ($tmpparam['options'] && is_array($tmpparam['options'])) {
 					$tmpkeys = array_keys($tmpparam['options']);
 					$tmp = array_shift($tmpkeys);
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 87a4b966056..33a073920ff 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -993,7 +993,7 @@ function dol_buildpath($path, $type = 0, $returnemptyifnotfound = 0)
 function dol_clone($object, $native = 0)
 {
 	if (empty($native)) {
-		$myclone = unserialize(serialize($object));
+		$myclone = unserialize(serialize($object));	// serialize then unserialize is hack to be sure to have a new object for all fields
 	} else {
 		$myclone = clone $object; // PHP clone is a shallow copy only, not a real clone, so properties of references will keep the reference (refering to the same target/variable)
 	}
@@ -10301,9 +10301,10 @@ function readfileLowMemory($fullpath_original_file_osencoded, $method = -1)
  */
 function showValueWithClipboardCPButton($valuetocopy, $showonlyonhover = 1, $texttoshow = '')
 {
+	/*
 	global $conf;
 
-	/*if (!empty($conf->dol_no_mouse_hover)) {
+	if (!empty($conf->dol_no_mouse_hover)) {
 		$showonlyonhover = 0;
 	}*/
 
@@ -10315,3 +10316,19 @@ function showValueWithClipboardCPButton($valuetocopy, $showonlyonhover = 1, $tex
 
 	return $result;
 }
+
+
+/**
+ * Decode an encode string. The string can be encoded in json format (recommended) or with serialize (avoid this)
+ *
+ * @param string	$stringtodecode		String to decode (json or serialize coded)
+ */
+function jsonOrUnserialize($stringtodecode)
+{
+	$result = json_decode($stringtodecode);
+	if ($result === null) {
+		$result = unserialize($stringtodecode);
+	}
+
+	return $result;
+}
diff --git a/htdocs/core/modules/export/export_csv.modules.php b/htdocs/core/modules/export/export_csv.modules.php
index 2d15f3999d0..88ae937bb6d 100644
--- a/htdocs/core/modules/export/export_csv.modules.php
+++ b/htdocs/core/modules/export/export_csv.modules.php
@@ -277,8 +277,8 @@ class ExportCsv extends ModeleExports
 
 			$newvalue = $this->csvClean($newvalue, $outputlangs->charset_output);
 
-			if (preg_match('/^Select:/i', $typefield, $reg) && $typefield = substr($typefield, 7)) {
-				$array = unserialize($typefield);
+			if (preg_match('/^Select:/i', $typefield) && $typefield = substr($typefield, 7)) {
+				$array = json_decode($typefield, true);
 				$array = $array['options'];
 				$newvalue = $array[$newvalue];
 			}
diff --git a/htdocs/core/modules/export/export_excel2007.modules.php b/htdocs/core/modules/export/export_excel2007.modules.php
index 370fc49df7e..54842ff8278 100644
--- a/htdocs/core/modules/export/export_excel2007.modules.php
+++ b/htdocs/core/modules/export/export_excel2007.modules.php
@@ -315,8 +315,8 @@ class ExportExcel2007 extends ModeleExports
 			$newvalue = $this->excel_clean($newvalue);
 			$typefield = isset($array_types[$code]) ? $array_types[$code] : '';
 
-			if (preg_match('/^Select:/i', $typefield, $reg) && $typefield = substr($typefield, 7)) {
-				$array = unserialize($typefield);
+			if (preg_match('/^Select:/i', $typefield) && $typefield = substr($typefield, 7)) {
+				$array = json_decode($typefield, true);
 				$array = $array['options'];
 				$newvalue = $array[$newvalue];
 			}
diff --git a/htdocs/core/modules/export/export_tsv.modules.php b/htdocs/core/modules/export/export_tsv.modules.php
index c93787a762c..7718dd3e350 100644
--- a/htdocs/core/modules/export/export_tsv.modules.php
+++ b/htdocs/core/modules/export/export_tsv.modules.php
@@ -252,8 +252,8 @@ class ExportTsv extends ModeleExports
 
 			$newvalue = $this->tsv_clean($newvalue, $outputlangs->charset_output);
 
-			if (preg_match('/^Select:/i', $typefield, $reg) && $typefield = substr($typefield, 7)) {
-				$array = unserialize($typefield);
+			if (preg_match('/^Select:/i', $typefield) && $typefield = substr($typefield, 7)) {
+				$array = json_decode($typefield, true);
 				$array = $array['options'];
 				$newvalue = $array[$newvalue];
 			}
diff --git a/htdocs/core/modules/modFournisseur.class.php b/htdocs/core/modules/modFournisseur.class.php
index 41107d5c34a..5d71a5abdc8 100644
--- a/htdocs/core/modules/modFournisseur.class.php
+++ b/htdocs/core/modules/modFournisseur.class.php
@@ -285,7 +285,7 @@ class modFournisseur extends DolibarrModules
 		$r++;
 		$this->export_code[$r] = $this->rights_class.'_'.$r;
 		$this->export_label[$r] = 'Vendor invoices and lines of invoices';
-		$this->export_icon[$r] = 'bill';
+		$this->export_icon[$r] = 'invoice';
 		$this->export_permission[$r] = array(array("fournisseur", "facture", "export"));
 		$this->export_fields_array[$r] = array(
 			's.rowid'=>"IdCompany", 's.nom'=>'CompanyName', 'ps.nom'=>'ParentCompany', 's.address'=>'Address', 's.zip'=>'Zip', 's.town'=>'Town', 'c.code'=>'CountryCode', 's.phone'=>'Phone',
@@ -328,81 +328,14 @@ class modFournisseur extends DolibarrModules
 		);
 		$this->export_dependencies_array[$r] = array('invoice_line'=>'fd.rowid', 'product'=>'fd.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
 		// Add extra fields object
-		$sql = "SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'facture_fourn' AND entity IN (0, ".$conf->entity.")";
-		$resql = $this->db->query($sql);
-		if ($resql) {    // This can fail when class is used on old database (during migration for example)
-			while ($obj = $this->db->fetch_object($resql)) {
-				$fieldname = 'extra.'.$obj->name;
-				$fieldlabel = ucfirst($obj->label);
-				$typeFilter = "Text";
-				switch ($obj->type) {
-					case 'int':
-					case 'double':
-					case 'price':
-						$typeFilter = "Numeric";
-						break;
-					case 'date':
-					case 'datetime':
-						$typeFilter = "Date";
-						break;
-					case 'boolean':
-						$typeFilter = "Boolean";
-						break;
-					case 'sellist':
-						$tmp = '';
-						$tmpparam = unserialize($obj->param); // $tmp ay be array 'options' => array 'c_currencies:code_iso:code_iso' => null
-						if ($tmpparam['options'] && is_array($tmpparam['options'])) {
-							$var = array_keys($tmpparam['options']);
-							$tmp = array_shift($var);
-						}
-						if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) {
-							$typeFilter = "List:".$tmp;
-						}
-						break;
-				}
-				$this->export_fields_array[$r][$fieldname] = $fieldlabel;
-				$this->export_TypeFields_array[$r][$fieldname] = $typeFilter;
-				$this->export_entities_array[$r][$fieldname] = 'invoice';
-			}
-		}
-		// End add extra fields
-		// Add extra fields line
-		$sql = "SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'facture_fourn_det' AND entity IN (0, ".$conf->entity.")";
-		$resql = $this->db->query($sql);
-		if ($resql) {    // This can fail when class is used on old database (during migration for example)
-			while ($obj = $this->db->fetch_object($resql)) {
-				$fieldname = 'extraline.'.$obj->name;
-				$fieldlabel = ucfirst($obj->label);
-				$typeFilter = "Text";
-				switch ($obj->type) {
-					case 'int':
-					case 'double':
-					case 'price':
-						$typeFilter = "Numeric";
-						break;
-					case 'date':
-					case 'datetime':
-						$typeFilter = "Date";
-						break;
-					case 'boolean':
-						$typeFilter = "Boolean";
-						break;
-					case 'sellist':
-						$tmp = '';
-						$tmpparam = unserialize($obj->param); // $tmp ay be array 'options' => array 'c_currencies:code_iso:code_iso' => null
-						if ($tmpparam['options'] && is_array($tmpparam['options'])) {
-							$tmp = array_shift(array_keys($tmpparam['options']));
-						}
-						if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) {
-							$typeFilter = "List:".$tmp;
-						}
-						break;
-				}
-				$this->export_fields_array[$r][$fieldname] = $fieldlabel;
-				$this->export_TypeFields_array[$r][$fieldname] = $typeFilter;
-				$this->export_entities_array[$r][$fieldname] = 'invoice_line';
-			}
-		}
+		$keyforselect = 'facture_fourn';
+		$keyforelement = 'invoice';
+		$keyforaliasextra = 'extra';
+		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+		$keyforselect = 'facture_fourn_det';
+		$keyforelement = 'invoice_line';
+		$keyforaliasextra = 'extraline';
+		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 		// End add extra fields line
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'societe as s';
@@ -426,7 +359,7 @@ class modFournisseur extends DolibarrModules
 		$r++;
 		$this->export_code[$r] = $this->rights_class.'_'.$r;
 		$this->export_label[$r] = 'Factures fournisseurs et reglements';
-		$this->export_icon[$r] = 'bill';
+		$this->export_icon[$r] = 'invoice';
 		$this->export_permission[$r] = array(array("fournisseur", "facture", "export"));
 		$this->export_fields_array[$r] = array(
 			's.rowid'=>"IdCompany", 's.nom'=>'CompanyName', 's.address'=>'Address', 's.zip'=>'Zip', 's.town'=>'Town', 'c.code'=>'CountryCode', 's.phone'=>'Phone',
@@ -465,43 +398,10 @@ class modFournisseur extends DolibarrModules
 			'p.datep'=>'payment', 'p.num_paiement'=>'payment', 'p.fk_bank'=>'account', 'project.rowid'=>'project', 'project.ref'=>'project', 'project.title'=>'project');
 		$this->export_dependencies_array[$r] = array('payment'=>'p.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
 		// Add extra fields object
-		$sql = "SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'facture_fourn' AND entity IN (0, ".$conf->entity.")";
-		$resql = $this->db->query($sql);
-		if ($resql) {    // This can fail when class is used on old database (during migration for example)
-			while ($obj = $this->db->fetch_object($resql)) {
-				$fieldname = 'extra.'.$obj->name;
-				$fieldlabel = ucfirst($obj->label);
-				$typeFilter = "Text";
-				switch ($obj->type) {
-					case 'int':
-					case 'double':
-					case 'price':
-						$typeFilter = "Numeric";
-						break;
-					case 'date':
-					case 'datetime':
-						$typeFilter = "Date";
-						break;
-					case 'boolean':
-						$typeFilter = "Boolean";
-						break;
-					case 'sellist':
-						$tmp = '';
-						$tmpparam = unserialize($obj->param); // $tmp ay be array 'options' => array 'c_currencies:code_iso:code_iso' => null
-						if ($tmpparam['options'] && is_array($tmpparam['options'])) {
-							$array_keys = array_keys($tmpparam['options']);
-							$tmp = array_shift($array_keys);
-						}
-						if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) {
-							$typeFilter = "List:".$tmp;
-						}
-						break;
-				}
-				$this->export_fields_array[$r][$fieldname] = $fieldlabel;
-				$this->export_TypeFields_array[$r][$fieldname] = $typeFilter;
-				$this->export_entities_array[$r][$fieldname] = 'invoice';
-			}
-		}
+		$keyforselect = 'facture_fourn';
+		$keyforelement = 'invoice';
+		$keyforaliasextra = 'extra';
+		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 		// End add extra fields object
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'societe as s';
@@ -564,83 +464,16 @@ class modFournisseur extends DolibarrModules
 		);
 		$this->export_dependencies_array[$r] = array('order_line'=>'fd.rowid', 'product'=>'fd.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
 		// Add extra fields object
-		$sql = "SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'commande_fournisseur' AND entity IN (0, ".$conf->entity.")";
-		$resql = $this->db->query($sql);
-		if ($resql) {    // This can fail when class is used on old database (during migration for example)
-			while ($obj = $this->db->fetch_object($resql)) {
-				$fieldname = 'extra.'.$obj->name;
-				$fieldlabel = ucfirst($obj->label);
-				$typeFilter = "Text";
-				switch ($obj->type) {
-					case 'int':
-					case 'double':
-					case 'price':
-						$typeFilter = "Numeric";
-						break;
-					case 'date':
-					case 'datetime':
-						$typeFilter = "Date";
-						break;
-					case 'boolean':
-						$typeFilter = "Boolean";
-						break;
-					case 'sellist':
-						$tmp = '';
-						$tmpparam = unserialize($obj->param); // $tmp ay be array 'options' => array 'c_currencies:code_iso:code_iso' => null
-						$tmpkey = array_keys($tmpparam['options']);
-						if ($tmpparam['options'] && is_array($tmpparam['options'])) {
-							$tmp = array_shift($tmpkey);
-						}
-						if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) {
-							$typeFilter = "List:".$tmp;
-						}
-						break;
-				}
-				$this->export_fields_array[$r][$fieldname] = $fieldlabel;
-				$this->export_TypeFields_array[$r][$fieldname] = $typeFilter;
-				$this->export_entities_array[$r][$fieldname] = 'order';
-			}
-		}
+		$keyforselect = 'commande_fournisseur';
+		$keyforelement = 'order';
+		$keyforaliasextra = 'extra';
+		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 		// End add extra fields object
 		// Add extra fields line
-		$sql = "SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'commande_fournisseurdet' AND entity IN (0, ".$conf->entity.")";
-		$resql = $this->db->query($sql);
-		if ($resql) {    // This can fail when class is used on old database (during migration for example)
-			while ($obj = $this->db->fetch_object($resql)) {
-				$fieldname = 'extraline.'.$obj->name;
-				$fieldlabel = ucfirst($obj->label);
-				$typeFilter = "Text";
-				switch ($obj->type) {
-					case 'int':
-					case 'double':
-					case 'price':
-						$typeFilter = "Numeric";
-						break;
-					case 'date':
-					case 'datetime':
-						$typeFilter = "Date";
-						break;
-					case 'boolean':
-						$typeFilter = "Boolean";
-						break;
-					case 'sellist':
-						$tmp = '';
-						$tmpparam = unserialize($obj->param); // $tmp ay be array 'options' => array 'c_currencies:code_iso:code_iso' => null
-
-						if ($tmpparam['options'] && is_array($tmpparam['options'])) {
-							$tmpparam_param_key = array_keys($tmpparam['options']);
-							$tmp = array_shift($tmpparam_param_key);
-						}
-						if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) {
-							$typeFilter = "List:".$tmp;
-						}
-						break;
-				}
-				$this->export_fields_array[$r][$fieldname] = $fieldlabel;
-				$this->export_TypeFields_array[$r][$fieldname] = $typeFilter;
-				$this->export_entities_array[$r][$fieldname] = 'order_line';
-			}
-		}
+		$keyforselect = 'commande_fournisseurdet';
+		$keyforelement = 'order_line';
+		$keyforaliasextra = 'extraline';
+		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 		// End add extra fields line
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'societe as s';
diff --git a/htdocs/install/mysql/tables/llx_oauth_token.sql b/htdocs/install/mysql/tables/llx_oauth_token.sql
index 7674f7f3455..62542d13401 100644
--- a/htdocs/install/mysql/tables/llx_oauth_token.sql
+++ b/htdocs/install/mysql/tables/llx_oauth_token.sql
@@ -18,8 +18,8 @@
 CREATE TABLE llx_oauth_token (
     rowid 			integer AUTO_INCREMENT PRIMARY KEY,
     service 		varchar(36),         	-- What king of key or token: 'Google', 'Stripe', 'auth-public-key', ...
-    token 			text,				 	-- token in serialize() format, of an object StdOAuth2Token of library phpoauth2
-    tokenstring 	text,				 	-- token in text or json format. Value depends on 'service'. For example for an OAUTH service: '{"access_token": "sk_test_cccc", "refresh_token": "rt_aaa", "token_type": "bearer", ..., "scope": "read_write"}
+    token 			text,				 	-- token in serialize format, of an object StdOAuth2Token of library phpoauth2. Deprecated, use tokenstring instead.
+    tokenstring 	text,				 	-- token in json or text format. Value depends on 'service'. For example for an OAUTH service: '{"access_token": "sk_test_cccc", "refresh_token": "rt_aaa", "token_type": "bearer", ..., "scope": "read_write"}
     fk_soc 			integer,				-- Id of thirdparty in llx_societe
     fk_user 		integer,             	-- Id of user in llx_user
     fk_adherent 	integer,				-- Id of member in llx_adherent
diff --git a/test/phpunit/JsonLibTest.php b/test/phpunit/JsonLibTest.php
index ddb62a90204..a8619ae08c5 100644
--- a/test/phpunit/JsonLibTest.php
+++ b/test/phpunit/JsonLibTest.php
@@ -161,6 +161,15 @@ class JsonLibTest extends PHPUnit\Framework\TestCase
 		$this->savlangs=$langs;
 		$this->savdb=$db;
 
+		// Try to decode a string encoded with serialize
+		$encoded = 'a:1:{s:7:"options";a:3:{s:3:"app";s:11:"Application";s:6:"system";s:6:"System";s:6:"option";s:6:"Option";}}';
+		$decoded=json_decode($encoded, true);
+		$this->assertEquals(null, $decoded, 'test to json_decode() a string that was encoded with serialize()');
+
+		$encoded = 'rubishstring!aa{bcd';
+		$decoded=json_decode($encoded, true);
+		$this->assertEquals(null, $decoded, 'test to json_decode() a string that was encoded with serialize()');
+
 		// Do a test with an array starting with 0
 		$arraytotest=array(0=>array('key'=>1,'value'=>'PRODREF','label'=>'Product ref with é and special chars \\ \' "'));
 		$arrayencodedexpected='[{"key":1,"value":"PRODREF","label":"Product ref with \u00e9 and special chars \\\\ \' \""}]';

From bf7f8f7c459c6988d41db1d9ba21aa1204969175 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 30 Jun 2021 17:28:23 +0200
Subject: [PATCH 0956/1497] Fix phpcs

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 33a073920ff..28c553d747c 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -10321,7 +10321,8 @@ function showValueWithClipboardCPButton($valuetocopy, $showonlyonhover = 1, $tex
 /**
  * Decode an encode string. The string can be encoded in json format (recommended) or with serialize (avoid this)
  *
- * @param string	$stringtodecode		String to decode (json or serialize coded)
+ * @param 	string	$stringtodecode		String to decode (json or serialize coded)
+ * @return	mixed						The decoded object.
  */
 function jsonOrUnserialize($stringtodecode)
 {

From 4cff865c6b09c994d13d3d759c59e9abc6666dab Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 30 Jun 2021 18:22:40 +0200
Subject: [PATCH 0957/1497] Trans

---
 htdocs/admin/clicktodial.php                 | 11 ++++++++---
 htdocs/core/modules/modClickToDial.class.php |  5 +++--
 htdocs/langs/en_US/admin.lang                |  2 +-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/htdocs/admin/clicktodial.php b/htdocs/admin/clicktodial.php
index 7b1c94de1ec..25ada4d2d89 100644
--- a/htdocs/admin/clicktodial.php
+++ b/htdocs/admin/clicktodial.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2005-2020 Laurent Destailleur  <eldy@users.sourceforge.org>
+ * Copyright (C) 2005-2021 Laurent Destailleur  <eldy@users.sourceforge.org>
  * Copyright (C) 2011-2013 Juanjo Menent		<jmenent@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -20,7 +20,7 @@
 /**
  *   \file       htdocs/admin/clicktodial.php
  *   \ingroup    clicktodial
- *   \brief      Page to setup module clicktodial
+ *   \brief      Page to setup module ClickToDial
  */
 
 require '../main.inc.php';
@@ -99,7 +99,12 @@ print '<input class="quatrevingtpercent" type="text" id="CLICKTODIAL_URL" name="
 print ajax_autoselect('CLICKTODIAL_URL');
 print '<br>';
 print $langs->trans("ClickToDialUrlDesc").'<br>';
-print $langs->trans("Example").':<br>http://myphoneserver/mypage?login=__LOGIN__&password=__PASS__&caller=__PHONEFROM__&called=__PHONETO__';
+print '<br>';
+print '<span class="opacitymedium">';
+print $langs->trans("Example").':<br>';
+print 'http://myphoneserver/mypage?login=__LOGIN__&password=__PASS__&caller=__PHONEFROM__&called=__PHONETO__<br>';
+print 'sip:__PHONETO__@my.sip.server';
+print '</span>';
 
 //if (! empty($user->clicktodial_url))
 //{
diff --git a/htdocs/core/modules/modClickToDial.class.php b/htdocs/core/modules/modClickToDial.class.php
index f28659bbd5d..18f1e6befeb 100644
--- a/htdocs/core/modules/modClickToDial.class.php
+++ b/htdocs/core/modules/modClickToDial.class.php
@@ -18,7 +18,7 @@
 
 /**
  *	\defgroup   clicktodial      Module clicktodial
- *	\brief      Module pour gerer l'appel automatique
+ *	\brief      Module to manage a ClickToDial system
  *	\file       htdocs/core/modules/modClickToDial.class.php
  *	\ingroup    clicktodial
  *	\brief      Description and activation file for the module Click to Dial
@@ -46,7 +46,8 @@ class modClickToDial extends DolibarrModules
 		$this->family = "interface";
 		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
 		$this->name = preg_replace('/^mod/i', '', get_class($this));
-		$this->description = "Gestion du Click To Dial";
+		$this->description = "Integration of a ClickToDial system (Asterisk, ...)";
+		$this->descriptionlong = "Support a Click To Dial feature with a SIP system. When clicking on a phone number, your phone system automatically call the callee.";
 
 		$this->version = 'dolibarr'; // 'development' or 'experimental' or 'dolibarr' or version
 
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index a05c9e7ea97..0fef25c033a 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1778,7 +1778,7 @@ ClickToDialSetup=Click To Dial module setup
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
 ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface, installed on the same computer as the browser, and called when you click on a link starting with "tel:" in your browser. If you need link that start with "sip:" or a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Point of Sale
 CashDeskSetup=Point of Sales module setup

From 1de165a6cdea46a4d4765252e657d3f9c2d828d9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 30 Jun 2021 18:34:04 +0200
Subject: [PATCH 0958/1497] css

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

diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index a6e3af11979..7fcfe3bc92b 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -1030,7 +1030,7 @@ foreach ($listofreferent as $key => $value) {
 				$addform .= '<input type="hidden" name="dateerfc" value="'.dol_print_date($datee, 'dayhourrfc').'">';
 				$addform .= '<table><tr><td><span class="hideonsmartphone opacitymedium">'.$langs->trans("SelectElement").'</span></td>';
 				$addform .= '<td>'.$selectList.'</td>';
-				$addform .= '<td><input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("LinkToElementShort")).'"></td>';
+				$addform .= '<td><input type="submit" class="button smallpaddingimp" value="'.dol_escape_htmltag($langs->trans("LinkToElementShort")).'"></td>';
 				$addform .= '</tr></table>';
 				$addform .= '</form>';
 				$addform .= '</div>';
@@ -1039,7 +1039,7 @@ foreach ($listofreferent as $key => $value) {
 		if (empty($conf->global->PROJECT_CREATE_ON_OVERVIEW_DISABLED) && $urlnew) {
 			$addform .= '<div class="inline-block valignmiddle">';
 			if ($testnew) {
-				$addform .= '<a class="buttonxxx" href="'.$urlnew.'"><span class="valignmiddle text-plus-circle hideonsmartphone">'.($buttonnew ? $langs->trans($buttonnew) : $langs->trans("Create")).'</span><span class="fa fa-plus-circle valignmiddle paddingleft"></span></a>';
+				$addform .= '<a class="buttonxxx marginleftonly" href="'.$urlnew.'"><span class="valignmiddle text-plus-circle hideonsmartphone">'.($buttonnew ? $langs->trans($buttonnew) : $langs->trans("Create")).'</span><span class="fa fa-plus-circle valignmiddle paddingleft"></span></a>';
 			} elseif (empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED)) {
 				$addform .= '<a class="buttonxxx buttonRefused" disabled="disabled" href="#"><span class="valignmiddle text-plus-circle hideonsmartphone">'.($buttonnew ? $langs->trans($buttonnew) : $langs->trans("Create")).'</span><span class="fa fa-plus-circle valignmiddle paddingleft"></span></a>';
 			}

From 1a63a379cc447c3ddc07dd1c9c715db9efe11141 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 1 Jul 2021 03:03:59 +0200
Subject: [PATCH 0959/1497] Fix missing permission

---
 htdocs/comm/propal/list.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index d99c8b81b2c..1b0b57afc7a 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -226,6 +226,7 @@ if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
 } else {
 	$permissiontovalidate = $user->rights->propal->creer;
 	$permissiontoclose = $user->rights->propal->creer;
+	$permissiontosendbymail = $user->rights->propale->lire;
 }
 
 

From 5b34ea6c228210fd613d5f813d94e32f2030ebce Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 1 Jul 2021 03:06:40 +0200
Subject: [PATCH 0960/1497] FIX permission to close a proposal when using
 advanced permissions

---
 htdocs/comm/propal/card.php              | 11 ++++++++---
 htdocs/comm/propal/list.php              |  6 +++++-
 htdocs/core/modules/modPropale.class.php |  3 ++-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 175486dcca0..c220e1f320d 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -2520,9 +2520,14 @@ if ($action == 'create')
 				}
 
 				// Close as accepted/refused
-				if ($object->statut == Propal::STATUS_VALIDATED && $usercanclose) {
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=closeas'.(empty($conf->global->MAIN_JUMP_TAG) ? '' : '#close').'"';
-					print '>'.$langs->trans('SetAcceptedRefused').'</a>';
+				if ($object->statut == Propal::STATUS_VALIDATED) {
+					if ($usercanclose) {
+						print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=closeas'.(empty($conf->global->MAIN_JUMP_TAG) ? '' : '#close').'"';
+						print '>'.$langs->trans('SetAcceptedRefused').'</a>';
+					} else {
+						print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'"';
+						print '>'.$langs->trans('SetAcceptedRefused').'</a>';
+					}
 				}
 
 				// Clone
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index fcd8f067e01..e5700fca445 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -114,7 +114,11 @@ if (!$sortorder) $sortorder = 'DESC';
 $permissiontoread = $user->rights->propal->lire;
 $permissiontoadd = $user->rights->propal->write;
 $permissiontodelete = $user->rights->propal->supprimer;
-$permissiontoclose = $user->rights->propal->cloturer;
+if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
+	$permissiontoclose = $user->rights->propale->propal_advance->close;
+} else {
+	$permissiontoclose = $user->rights->propal->creer;
+}
 
 // Security check
 $module = 'propal';
diff --git a/htdocs/core/modules/modPropale.class.php b/htdocs/core/modules/modPropale.class.php
index c0ffa6f0811..9b40a236511 100644
--- a/htdocs/core/modules/modPropale.class.php
+++ b/htdocs/core/modules/modPropale.class.php
@@ -157,7 +157,8 @@ class modPropale extends DolibarrModules
 		$this->rights[$r][1] = 'Close commercial proposals'; // libelle de la permission
 		$this->rights[$r][2] = 'd'; // type de la permission (deprecie a ce jour)
 		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
-		$this->rights[$r][4] = 'cloturer';
+		$this->rights[$r][4] = 'propal_advance';
+		$this->rights[$r][5] = 'close';
 
 		$r++;
 		$this->rights[$r][0] = 27; // id de la permission

From 9b71f1e16b5d699c6f0375f0fc192509b585325c Mon Sep 17 00:00:00 2001
From: Nicolas <nicolas@eoxia.com>
Date: Thu, 1 Jul 2021 11:55:06 +0200
Subject: [PATCH 0961/1497] fix : move check if invoice module is enabled into
 paymentok.php

---
 htdocs/commande/card.php            |   2 +-
 htdocs/public/payment/paymentok.php | 119 +++++++++++++++-------------
 2 files changed, 63 insertions(+), 58 deletions(-)

diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 4913731efb5..1ef37552f1f 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -2633,7 +2633,7 @@ if ($action == 'create' && $usercancreate)
 			$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem, $compatibleImportElementsList);
 
 			// Show online payment link
-			$useonlinepayment = ((!empty($conf->paypal->enabled) || !empty($conf->stripe->enabled) || !empty($conf->paybox->enabled)) && !empty($conf->facture->enabled));
+			$useonlinepayment = (!empty($conf->paypal->enabled) || !empty($conf->stripe->enabled) || !empty($conf->paybox->enabled));
 			if (!empty($conf->global->ORDER_HIDE_ONLINE_PAYMENT_ON_ORDER)) $useonlinepayment = 0;
 			if ($object->statut != Commande::STATUS_DRAFT && $useonlinepayment)
 			{
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 5f8f90ba72b..d6d4da28c9e 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -742,80 +742,85 @@ if ($ispaymentok)
 			$currencyCodeType = $_SESSION['currencyCodeType'];
 
 			// Do action only if $FinalPaymentAmt is set (session variable is cleaned after this page to avoid duplicate actions when page is POST a second time)
-			if (!empty($FinalPaymentAmt) && $paymentTypeId > 0) {
-				include_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
-				$invoice = new Facture($db);
-				$result = $invoice->createFromOrder($object, $user);
-				if ($result > 0) {
-					$object->classifyBilled($user);
-					$invoice->validate($user);
-					// Creation of payment line
-					include_once DOL_DOCUMENT_ROOT . '/compta/paiement/class/paiement.class.php';
-					$paiement = new Paiement($db);
-					$paiement->datepaye = $now;
-					if ($currencyCodeType == $conf->currency) {
-						$paiement->amounts = array($invoice->id => $FinalPaymentAmt); // Array with all payments dispatching with invoice id
-					} else {
-						$paiement->multicurrency_amounts = array($invoice->id => $FinalPaymentAmt); // Array with all payments dispatching
-
-						$postactionmessages[] = 'Payment was done in a different currency that currency expected of company';
-						$ispostactionok = -1;
-						$error++; // Not yet supported
-					}
-					$paiement->paiementid = $paymentTypeId;
-					$paiement->num_payment = '';
-					$paiement->note_public = 'Online payment ' . dol_print_date($now, 'standard') . ' from ' . $ipaddress;
-					$paiement->ext_payment_id = $TRANSACTIONID;
-					$paiement->ext_payment_site = $service;
-
-					if (!$error) {
-						$paiement_id = $paiement->create($user, 1); // This include closing invoices and regenerating documents
-						if ($paiement_id < 0) {
-							$postactionmessages[] = $paiement->error . ' ' . join("<br>\n", $paiement->errors);
-							$ispostactionok = -1;
-							$error++;
+			if (!empty($conf->banque->enabled)) {
+				if (!empty($FinalPaymentAmt) && $paymentTypeId > 0 ) {
+					include_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
+					$invoice = new Facture($db);
+					$result = $invoice->createFromOrder($object, $user);
+					if ($result > 0) {
+						$object->classifyBilled($user);
+						$invoice->validate($user);
+						// Creation of payment line
+						include_once DOL_DOCUMENT_ROOT . '/compta/paiement/class/paiement.class.php';
+						$paiement = new Paiement($db);
+						$paiement->datepaye = $now;
+						if ($currencyCodeType == $conf->currency) {
+							$paiement->amounts = array($invoice->id => $FinalPaymentAmt); // Array with all payments dispatching with invoice id
 						} else {
-							$postactionmessages[] = 'Payment created';
-							$ispostactionok = 1;
+							$paiement->multicurrency_amounts = array($invoice->id => $FinalPaymentAmt); // Array with all payments dispatching
+
+							$postactionmessages[] = 'Payment was done in a different currency that currency expected of company';
+							$ispostactionok = -1;
+							$error++; // Not yet supported
 						}
-					}
+						$paiement->paiementid = $paymentTypeId;
+						$paiement->num_payment = '';
+						$paiement->note_public = 'Online payment ' . dol_print_date($now, 'standard') . ' from ' . $ipaddress;
+						$paiement->ext_payment_id = $TRANSACTIONID;
+						$paiement->ext_payment_site = '';
 
-					if (!$error && !empty($conf->banque->enabled)) {
-						$bankaccountid = 0;
-						if ($paymentmethod == 'paybox') $bankaccountid = $conf->global->PAYBOX_BANK_ACCOUNT_FOR_PAYMENTS;
-						elseif ($paymentmethod == 'paypal') $bankaccountid = $conf->global->PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS;
-						elseif ($paymentmethod == 'stripe') $bankaccountid = $conf->global->STRIPE_BANK_ACCOUNT_FOR_PAYMENTS;
-
-						if ($bankaccountid > 0) {
-							$label = '(CustomerInvoicePayment)';
-							if ($object->type == Facture::TYPE_CREDIT_NOTE) $label = '(CustomerInvoicePaymentBack)'; // Refund of a credit note
-							$result = $paiement->addPaymentToBank($user, 'payment', $label, $bankaccountid, '', '');
-							if ($result < 0) {
+						if (!$error) {
+							$paiement_id = $paiement->create($user, 1); // This include closing invoices and regenerating documents
+							if ($paiement_id < 0) {
 								$postactionmessages[] = $paiement->error . ' ' . join("<br>\n", $paiement->errors);
 								$ispostactionok = -1;
 								$error++;
 							} else {
-								$postactionmessages[] = 'Bank transaction of payment created';
+								$postactionmessages[] = 'Payment created';
 								$ispostactionok = 1;
 							}
-						} else {
-							$postactionmessages[] = 'Setup of bank account to use in module ' . $paymentmethod . ' was not set. No way to record the payment.';
-							$ispostactionok = -1;
-							$error++;
 						}
-					}
 
-					if (!$error) {
-						$db->commit();
+						if (!$error && !empty($conf->banque->enabled)) {
+							$bankaccountid = 0;
+							if ($paymentmethod == 'paybox') $bankaccountid = $conf->global->PAYBOX_BANK_ACCOUNT_FOR_PAYMENTS;
+							elseif ($paymentmethod == 'paypal') $bankaccountid = $conf->global->PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS;
+							elseif ($paymentmethod == 'stripe') $bankaccountid = $conf->global->STRIPE_BANK_ACCOUNT_FOR_PAYMENTS;
+
+							if ($bankaccountid > 0) {
+								$label = '(CustomerInvoicePayment)';
+								if ($object->type == Facture::TYPE_CREDIT_NOTE) $label = '(CustomerInvoicePaymentBack)'; // Refund of a credit note
+								$result = $paiement->addPaymentToBank($user, 'payment', $label, $bankaccountid, '', '');
+								if ($result < 0) {
+									$postactionmessages[] = $paiement->error . ' ' . join("<br>\n", $paiement->errors);
+									$ispostactionok = -1;
+									$error++;
+								} else {
+									$postactionmessages[] = 'Bank transaction of payment created';
+									$ispostactionok = 1;
+								}
+							} else {
+								$postactionmessages[] = 'Setup of bank account to use in module ' . $paymentmethod . ' was not set. No way to record the payment.';
+								$ispostactionok = -1;
+								$error++;
+							}
+						}
+
+						if (!$error) {
+							$db->commit();
+						} else {
+							$db->rollback();
+						}
 					} else {
-						$db->rollback();
+						$postactionmessages[] = 'Failed to create invoice form order ' . $tmptag['ORD'] . '.';
+						$ispostactionok = -1;
 					}
 				} else {
-					$postactionmessages[] = 'Failed to create invoice form order ' . $tmptag['ORD'] . '.';
+					$postactionmessages[] = 'Failed to get a valid value for "amount paid" (' . $FinalPaymentAmt . ') or "payment type" (' . $paymentType . ') to record the payment of order ' . $tmptag['ORD'] . '. May be payment was already recorded.';
 					$ispostactionok = -1;
 				}
 			} else {
-				$postactionmessages[] = 'Failed to get a valid value for "amount paid" (' . $FinalPaymentAmt . ') or "payment type" (' . $paymentType . ') to record the payment of order ' . $tmptag['ORD'] . '. May be payment was already recorded.';
+				$postactionmessages[] = 'Invoice module is not enable';
 				$ispostactionok = -1;
 			}
 		} else {

From 3e6eeeb977fca91c09e645cf8718ee05d50e6365 Mon Sep 17 00:00:00 2001
From: Nicolas <nicolas@eoxia.com>
Date: Thu, 1 Jul 2021 11:59:00 +0200
Subject: [PATCH 0962/1497] fix : remove comments

---
 htdocs/public/payment/paymentok.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index d6d4da28c9e..18fef28d1c2 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -722,7 +722,6 @@ if ($ispaymentok)
 			$ispostactionok = -1;
 		}
 	} elseif (array_key_exists('ORD', $tmptag) && $tmptag['ORD'] > 0) {
-		// Record payment
 		include_once DOL_DOCUMENT_ROOT . '/commande/class/commande.class.php';
 		$object = new Commande($db);
 		$result = $object->fetch($tmptag['ORD']);
@@ -761,7 +760,7 @@ if ($ispaymentok)
 
 							$postactionmessages[] = 'Payment was done in a different currency that currency expected of company';
 							$ispostactionok = -1;
-							$error++; // Not yet supported
+							$error++;
 						}
 						$paiement->paiementid = $paymentTypeId;
 						$paiement->num_payment = '';

From b102dc619fad8f7c679c930fd5520f4bb06d7aaf Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Thu, 1 Jul 2021 10:15:55 +0000
Subject: [PATCH 0963/1497] Fixing style errors.

---
 htdocs/public/payment/paymentok.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 71c338cb6fc..5bb3f4de0fc 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -916,17 +916,17 @@ if ($ispaymentok) {
 			}
 		} else {
 			$postactionmessages[] = 'Order paid ' . $tmptag['ORD'] . ' was not found';
-      $ispostactionok = -1;
-    }
-  } elseif (array_key_exists('DON', $tmptag) && $tmptag['DON'] > 0) {
+			$ispostactionok = -1;
+		}
+	} elseif (array_key_exists('DON', $tmptag) && $tmptag['DON'] > 0) {
 		include_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
 		$don = new Don($db);
 		$result = $don->fetch($tmptag['DON']);
-    if ($result) {
+		if ($result) {
 			$FinalPaymentAmt = $_SESSION["FinalPaymentAmt"];
-      
-      $paymentTypeId = 0;
-    	if ($paymentmethod == 'paybox') {
+
+			$paymentTypeId = 0;
+			if ($paymentmethod == 'paybox') {
 				$paymentTypeId = $conf->global->PAYBOX_PAYMENT_MODE_FOR_PAYMENTS;
 			}
 			if ($paymentmethod == 'paypal') {
@@ -940,9 +940,9 @@ if ($ispaymentok) {
 				if (empty($paymentType)) {
 					$paymentType = 'CB';
 				}
-        $paymentTypeId = dol_getIdFromCode($db, $paymentType, 'c_paiement', 'code', 'id', 1);
+				$paymentTypeId = dol_getIdFromCode($db, $paymentType, 'c_paiement', 'code', 'id', 1);
 			}
-        
+
 			$currencyCodeType = $_SESSION['currencyCodeType'];
 
 			// Do action only if $FinalPaymentAmt is set (session variable is cleaned after this page to avoid duplicate actions when page is POST a second time)

From 9392624e54d301fc0b36690ef201c292677410f5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 1 Jul 2021 13:36:04 +0200
Subject: [PATCH 0964/1497] Fix deletion of line on replacement invoice

---
 htdocs/core/tpl/objectline_view.tpl.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php
index 428fac31789..3463de14240 100644
--- a/htdocs/core/tpl/objectline_view.tpl.php
+++ b/htdocs/core/tpl/objectline_view.tpl.php
@@ -315,6 +315,15 @@ if ($outputalsopricetotalwithtax) {
 }
 
 if ($this->statut == 0 && ($object_rights->creer) && $action != 'selectlines') {
+
+	$situationinvoicelinewithparent = 0;
+	if ($line->fk_prev_id != null && in_array($object->element, array('facture', 'facturedet'))) {
+		if ($object->type == $object::TYPE_SITUATION) {	// The constant TYPE_SITUATION exists only for object invoice
+			// Set constant to disallow editing during a situation cycle
+			$situationinvoicelinewithparent = 1;
+		}
+	}
+
 	print '<td class="linecoledit center">';
 	$coldisplay++;
 	if (($line->info_bits & 2) == 2 || !empty($disableedit)) {
@@ -326,7 +335,7 @@ if ($this->statut == 0 && ($object_rights->creer) && $action != 'selectlines') {
 
 	print '<td class="linecoldelete center">';
 	$coldisplay++;
-	if (($line->fk_prev_id == null) && empty($disableremove)) { //La suppression n'est autorisée que si il n'y a pas de ligne dans une précédente situation
+	if (!$situationinvoicelinewithparent && empty($disableremove)) { // For situation invoice, deletion is not possible if there is a parent company.
 		print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=ask_deleteline&amp;lineid='.$line->id.'">';
 		print img_delete();
 		print '</a>';

From 3aa24cccffd35d1a087be7f909023c9389e93df0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 1 Jul 2021 15:15:35 +0200
Subject: [PATCH 0965/1497] fix can't remove extrafield date or datetime value

---
 htdocs/core/class/commonobject.class.php | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 91c09f1226a..417cb3042b7 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -5739,10 +5739,12 @@ abstract class CommonObject
 					$this->array_options["options_".$key] = price2num($this->array_options["options_".$key]);
 					break;
 				case 'date':
-					$this->array_options["options_".$key] = $this->db->idate($this->array_options["options_".$key]);
-					break;
 				case 'datetime':
-					$this->array_options["options_".$key] = $this->db->idate($this->array_options["options_".$key]);
+					if (empty($this->array_options["options_".$key])) {
+						$this->array_options["options_".$key] = null;
+					} else {
+						$this->array_options["options_".$key] = $this->db->idate($this->array_options["options_".$key]);
+					}
 					break;
 				/*
 				case 'link':
@@ -5790,7 +5792,11 @@ abstract class CommonObject
 			}
 
 			if ($linealreadyfound) {
-				$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element."_extrafields SET ".$key." = '".$this->db->escape($this->array_options["options_".$key])."'";
+				if ($this->array_options["options_".$key] === null) {
+					$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element."_extrafields SET ".$key." = null";
+				} else {
+					$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element."_extrafields SET ".$key." = '".$this->db->escape($this->array_options["options_".$key])."'";
+				}
 				$sql .= " WHERE fk_object = ".$this->id;
 			} else {
 				$result = $this->insertExtraFields('', $user);

From de847250b11287ca812ffe30702468a7bd97af7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20David?= <theo.david@evarisk.com>
Date: Thu, 1 Jul 2021 17:55:54 +0200
Subject: [PATCH 0966/1497] NEW #18046 Add ticket categories data model

---
 .../mysql/tables/llx_categorie_ticket.key.sql | 21 +++++++++++++++++++
 .../mysql/tables/llx_categorie_ticket.sql     | 21 +++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 htdocs/install/mysql/tables/llx_categorie_ticket.key.sql
 create mode 100644 htdocs/install/mysql/tables/llx_categorie_ticket.sql

diff --git a/htdocs/install/mysql/tables/llx_categorie_ticket.key.sql b/htdocs/install/mysql/tables/llx_categorie_ticket.key.sql
new file mode 100644
index 00000000000..012b9a9eadc
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_categorie_ticket.key.sql
@@ -0,0 +1,21 @@
+-- Copyright (C) 2021 EOXIA <dev@eoxia.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
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see https://www.gnu.org/licenses/.
+
+ALTER TABLE llx_categorie_ticket ADD PRIMARY KEY pk_categorie_ticket (fk_categorie, fk_ticket);
+ALTER TABLE llx_categorie_ticket ADD INDEX idx_categorie_ticket_fk_categorie (fk_categorie);
+ALTER TABLE llx_categorie_ticket ADD INDEX idx_categorie_ticket_fk_ticket (fk_ticket);
+
+ALTER TABLE llx_categorie_ticket ADD CONSTRAINT fk_categorie_ticket_categorie_rowid FOREIGN KEY (fk_categorie) REFERENCES llx_categorie (rowid);
+ALTER TABLE llx_categorie_ticket ADD CONSTRAINT fk_categorie_ticket_ticket_rowid   FOREIGN KEY (fk_ticket) REFERENCES llx_ticket (rowid);
diff --git a/htdocs/install/mysql/tables/llx_categorie_ticket.sql b/htdocs/install/mysql/tables/llx_categorie_ticket.sql
new file mode 100644
index 00000000000..16ab92522c6
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_categorie_ticket.sql
@@ -0,0 +1,21 @@
+-- Copyright (C) 2021 EOXIA <dev@eoxia.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
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see https://www.gnu.org/licenses/.
+
+create table llx_categorie_ticket
+(
+  fk_categorie  integer NOT NULL,
+  fk_ticket    integer NOT NULL,
+  import_key    varchar(14)
+)ENGINE=innodb;

From 664af6ad1f10d9e6200acfb40fbabb531787c126 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 1 Jul 2021 18:22:33 +0200
Subject: [PATCH 0967/1497] Fix trans

---
 htdocs/langs/en_US/salaries.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/salaries.lang b/htdocs/langs/en_US/salaries.lang
index 6b4fdc94163..cc28f87d883 100644
--- a/htdocs/langs/en_US/salaries.lang
+++ b/htdocs/langs/en_US/salaries.lang
@@ -20,5 +20,5 @@ TJMDescription=This value is currently for information only and is not used for
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
 SalariesStatistics=Salary statistics
-# Export
 SalariesAndPayments=Salaries and payments
+ConfirmDeleteSalaryPayment=Do you want to delete this payment of salary ?
\ No newline at end of file

From 414da8345649384f5a959b99f7a7afd42760414b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 1 Jul 2021 18:45:07 +0200
Subject: [PATCH 0968/1497] Fix colspan

---
 htdocs/salaries/payments.php | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/htdocs/salaries/payments.php b/htdocs/salaries/payments.php
index bfc795ebcef..c2805cfbd93 100644
--- a/htdocs/salaries/payments.php
+++ b/htdocs/salaries/payments.php
@@ -124,6 +124,22 @@ foreach ($object->fields as $key => $val) {
 	}
 }
 
+// Definition of array of fields for columns
+$arrayfields = array();
+foreach ($object->fields as $key => $val) {
+	// If $val['visible']==0, then we never show the field
+	if (!empty($val['visible'])) {
+		$visible = (int) dol_eval($val['visible'], 1);
+		$arrayfields['t.'.$key] = array(
+			'label'=>$val['label'],
+			'checked'=>(($visible < 0) ? 0 : 1),
+			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
+			'position'=>$val['position'],
+			'help'=>$val['help']
+		);
+	}
+}
+
 $permissiontoread = $user->rights->salaries->read;
 $permissiontoadd = $user->rights->salaries->write;
 $permissiontodelete = $user->rights->salaries->delete;
@@ -666,11 +682,13 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
 
 // If no record found
 if ($num == 0) {
-	$colspan = 1;
-	foreach ($arrayfields as $key => $val) { if (!empty($val['checked'])) {
+	/*$colspan = 1;
+	foreach ($arrayfields as $key => $val) {
+		if (!empty($val['checked'])) {
 			$colspan++;
-	}
-	}
+		}
+	}*/
+	$colspan = 12;
 	print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
 }
 

From 0dce34f52776141f69e534becc05c9fcc98faec1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 1 Jul 2021 19:06:16 +0200
Subject: [PATCH 0969/1497] Fix trans

---
 htdocs/langs/en_US/salaries.lang       |  6 +++---
 htdocs/salaries/class/salary.class.php |  3 +++
 htdocs/user/bank.php                   | 29 ++++++++++++--------------
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/htdocs/langs/en_US/salaries.lang b/htdocs/langs/en_US/salaries.lang
index cc28f87d883..504f0fbcc16 100644
--- a/htdocs/langs/en_US/salaries.lang
+++ b/htdocs/langs/en_US/salaries.lang
@@ -17,8 +17,8 @@ TJM=Average daily rate
 CurrentSalary=Current salary
 THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
 TJMDescription=This value is currently for information only and is not used for any calculation
-LastSalaries=Latest %s salary payments
-AllSalaries=All salary payments
+LastSalaries=Latest %s salaries
+AllSalaries=All salaries
 SalariesStatistics=Salary statistics
 SalariesAndPayments=Salaries and payments
-ConfirmDeleteSalaryPayment=Do you want to delete this payment of salary ?
\ No newline at end of file
+ConfirmDeleteSalaryPayment=Do you want to delete this salary payment ?
\ No newline at end of file
diff --git a/htdocs/salaries/class/salary.class.php b/htdocs/salaries/class/salary.class.php
index 2f87fdd99d2..35ceb8a1931 100644
--- a/htdocs/salaries/class/salary.class.php
+++ b/htdocs/salaries/class/salary.class.php
@@ -502,6 +502,9 @@ class Salary extends CommonObject
 		if ($this->datesp && $this->dateep) {
 			$label .= '<br><b>'.$langs->trans('Period').':</b> '.dol_print_date($this->datesp, 'day').' - '.dol_print_date($this->dateep, 'day');
 		}
+		if (isset($this->amount)) {
+			$label .= '<br><b>'.$langs->trans('Amount').':</b> '.price($this->amount);
+		}
 
 		$url = DOL_URL_ROOT.'/salaries/card.php?id='.$this->id;
 
diff --git a/htdocs/user/bank.php b/htdocs/user/bank.php
index 0b179653487..fc9002e13fb 100644
--- a/htdocs/user/bank.php
+++ b/htdocs/user/bank.php
@@ -366,12 +366,12 @@ if ($action != 'edit' && $action != 'create') {		// If not bank account yet, $ac
 		$payment_salary = new PaymentSalary($db);
 		$salary = new Salary($db);
 
-		$sql = "SELECT s.rowid as sid, s.ref as sref, s.label, s.datesp, s.dateep, s.paye, SUM(ps.amount) as alreadypaid";
+		$sql = "SELECT s.rowid as sid, s.ref as sref, s.label, s.datesp, s.dateep, s.paye, s.amount, SUM(ps.amount) as alreadypaid";
 		$sql .= " FROM ".MAIN_DB_PREFIX."salary as s";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."payment_salary as ps ON (s.rowid = ps.fk_salary)";
 		$sql .= " WHERE s.fk_user = ".$object->id;
 		$sql .= " AND s.entity IN (".getEntity('salary').")";
-		$sql .= " GROUP BY s.rowid, s.ref, s.label, s.datesp, s.dateep, s.paye";
+		$sql .= " GROUP BY s.rowid, s.ref, s.label, s.datesp, s.dateep, s.paye, s.amount";
 		$sql .= " ORDER BY s.dateep DESC";
 
 		$resql = $db->query($sql);
@@ -381,7 +381,7 @@ if ($action != 'edit' && $action != 'create') {		// If not bank account yet, $ac
 			print '<table class="noborder centpercent">';
 
 			print '<tr class="liste_titre">';
-			print '<td colspan="4"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("LastSalaries", ($num <= $MAXLIST ? "" : $MAXLIST)).'</td><td class="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/salaries/list.php?search_user='.$object->login.'">'.$langs->trans("AllSalaries").'<span class="badge marginleftonlyshort">'.$num.'</span></a></td>';
+			print '<td colspan="5"><table class="nobordernopadding centpercent"><tr><td>'.$langs->trans("LastSalaries", ($num <= $MAXLIST ? "" : $MAXLIST)).'</td><td class="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/salaries/list.php?search_user='.$object->login.'">'.$langs->trans("AllSalaries").'<span class="badge marginleftonlyshort">'.$num.'</span></a></td>';
 			print '</tr></table></td>';
 			print '</tr>';
 
@@ -389,16 +389,17 @@ if ($action != 'edit' && $action != 'create') {		// If not bank account yet, $ac
 			while ($i < $num && $i < $MAXLIST) {
 				$objp = $db->fetch_object($resql);
 
-				$payment_salary->id = $objp->rowid;
-				$payment_salary->ref = $objp->ref;
-				$payment_salary->datep = $db->jdate($objp->datep);
-
 				$salary->id = $objp->sid;
 				$salary->ref = $objp->sref ? $objp->sref : $objp->sid;
 				$salary->label = $objp->label;
 				$salary->datesp = $db->jdate($objp->datesp);
 				$salary->dateep = $db->jdate($objp->dateep);
 				$salary->paye = $objp->paye;
+				$salary->amount = $objp->amount;
+
+				$payment_salary->id = $objp->rowid;
+				$payment_salary->ref = $objp->ref;
+				$payment_salary->datep = $db->jdate($objp->datep);
 
 				print '<tr class="oddeven">';
 				print '<td class="nowraponall">';
@@ -407,7 +408,7 @@ if ($action != 'edit' && $action != 'create') {		// If not bank account yet, $ac
 
 				print '<td class="right" width="80px">'.dol_print_date($db->jdate($objp->datesp), 'day')."</td>\n";
 				print '<td class="right" width="80px">'.dol_print_date($db->jdate($objp->dateep), 'day')."</td>\n";
-				//print '<td class="right" class="nowraponall"><span class="ampount">'.price($objp->amount).'</span></td>';
+				print '<td class="right" class="nowraponall"><span class="amount">'.price($objp->amount).'</span></td>';
 				print '<td class="right" class="nowraponall">'.$salary->getLibStatut(5, $objp->alreadypaid).'</td>';
 
 				print '</tr>';
@@ -416,7 +417,7 @@ if ($action != 'edit' && $action != 'create') {		// If not bank account yet, $ac
 			$db->free($resql);
 
 			if ($num <= 0) {
-				print '<td colspan="4" class="opacitymedium">'.$langs->trans("None").'</a>';
+				print '<td colspan="5" class="opacitymedium">'.$langs->trans("None").'</a>';
 			}
 			print "</table>";
 		} else {
@@ -424,9 +425,7 @@ if ($action != 'edit' && $action != 'create') {		// If not bank account yet, $ac
 		}
 	}
 
-	/*
-	 * Last holidays
-	 */
+	// Latest leave requests
 	if (!empty($conf->holiday->enabled) &&
 		($user->rights->holiday->readall || ($user->rights->holiday->read && $object->id == $user->id))
 		) {
@@ -478,9 +477,7 @@ if ($action != 'edit' && $action != 'create') {		// If not bank account yet, $ac
 		}
 	}
 
-	/*
-	 * Last expense report
-	 */
+	// Latest expense report
 	if (!empty($conf->expensereport->enabled) &&
 		($user->rights->expensereport->readall || ($user->rights->expensereport->lire && $object->id == $user->id))
 		) {
@@ -516,7 +513,7 @@ if ($action != 'edit' && $action != 'create') {		// If not bank account yet, $ac
 				print '<td class="nowrap">';
 				print $exp->getNomUrl(1);
 				print '</td><td class="right" width="80px">'.dol_print_date($db->jdate($objp->date_debut), 'day')."</td>\n";
-				print '<td class="right" style="min-width: 60px">'.price($objp->total_ttc).'</td>';
+				print '<td class="right" style="min-width: 60px"><span class="amount">'.price($objp->total_ttc).'</span></td>';
 				print '<td class="right nowrap" style="min-width: 60px">'.$exp->LibStatut($objp->status, 5).'</td></tr>';
 				$i++;
 			}

From 110b0fecf5cc040e1de44f981619c77522deadc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20David?= <theo.david@evarisk.com>
Date: Thu, 1 Jul 2021 19:30:00 +0200
Subject: [PATCH 0970/1497] NEW #18046 Add ticket categories views

---
 htdocs/categories/viewcat.php      | 90 +++++++++++++++++++++++++++++-
 htdocs/langs/fr_FR/categories.lang |  2 +
 htdocs/ticket/card.php             | 18 +++++-
 3 files changed, 108 insertions(+), 2 deletions(-)

diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index eeca990ef28..12263d8df2c 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -142,6 +142,11 @@ if ($id > 0 && $removeelem > 0) {
 		$tmpobject = new User($db);
 		$result = $tmpobject->fetch($removeelem);
 		$elementtype = 'user';
+	} elseif ($type == Categorie::TYPE_TICKET && $user->rights->ticket->write) {
+		require_once DOL_DOCUMENT_ROOT.'/ticket/class/ticket.class.php';
+		$tmpobject = new Ticket($db);
+		$result = $tmpobject->fetch($removeelem);
+		$elementtype = 'ticket';
 	}
 
 	$result = $object->del_type($tmpobject, $elementtype);
@@ -167,7 +172,8 @@ if ($user->rights->categorie->supprimer && $action == 'confirm_delete' && $confi
 if ($elemid && $action == 'addintocategory' &&
 	(($type == Categorie::TYPE_PRODUCT && ($user->rights->produit->creer || $user->rights->service->creer)) ||
 	 ($type == Categorie::TYPE_CUSTOMER && $user->rights->societe->creer) ||
-	 ($type == Categorie::TYPE_SUPPLIER && $user->rights->societe->creer)
+	 ($type == Categorie::TYPE_SUPPLIER && $user->rights->societe->creer) ||
+	 ($type == Categorie::TYPE_TICKET && $user->rights->ticket->write)
    )) {
 	if ($type == Categorie::TYPE_PRODUCT) {
 		require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
@@ -181,6 +187,10 @@ if ($elemid && $action == 'addintocategory' &&
 		require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 		$newobject = new Societe($db);
 		$elementtype = 'supplier';
+	} elseif ($type == Categorie::TYPE_TICKET) {
+		require_once DOL_DOCUMENT_ROOT.'/ticket/class/ticket.class.php';
+		$newobject = new Ticket($db);
+		$elementtype = 'ticket';
 	}
 	$result = $newobject->fetch($elemid);
 
@@ -1024,6 +1034,84 @@ if ($type == Categorie::TYPE_WAREHOUSE) {
 	}
 }
 
+if ($type == Categorie::TYPE_TICKET)
+{
+	$permission = ($user->rights->categorie->creer || $user->rights->categorie->creer);
+
+	$tickets = $object->getObjectsInCateg($type, 0, $limit, $offset);
+	if ($tickets < 0)
+	{
+		dol_print_error($db, $object->error, $object->errors);
+	} else {
+		// Form to add record into a category
+		$showclassifyform = 1;
+		if ($showclassifyform)
+		{
+			print '<br>';
+			print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
+			print '<input type="hidden" name="token" value="'.newToken().'">';
+			print '<input type="hidden" name="typeid" value="'.$typeid.'">';
+			print '<input type="hidden" name="type" value="'.$typeid.'">';
+			print '<input type="hidden" name="id" value="'.$object->id.'">';
+			print '<input type="hidden" name="action" value="addintocategory">';
+			print '<table class="noborder centpercent">';
+			print '<tr class="liste_titre"><td>';
+			print $langs->trans("AddTicketIntoCategory").' &nbsp;';
+			$form->select_tickets('', 'elemid');
+			print '<input type="submit" class="button buttongen" value="'.$langs->trans("ClassifyInCategory").'"></td>';
+			print '</tr>';
+			print '</table>';
+			print '</form>';
+		}
+
+		print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
+		print '<input type="hidden" name="typeid" value="'.$typeid.'">';
+		print '<input type="hidden" name="type" value="'.$typeid.'">';
+		print '<input type="hidden" name="id" value="'.$object->id.'">';
+		print '<input type="hidden" name="action" value="list">';
+
+		print '<br>';
+		$param = '&limit='.$limit.'&id='.$id.'&type='.$type; $num = count($tickets); $nbtotalofrecords = ''; $newcardbutton = '';
+		print_barre_liste($langs->trans("Ticket"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'ticket', 0, $newcardbutton, '', $limit);
+
+
+		print '<table class="noborder centpercent">'."\n";
+		print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Ref").'</td></tr>'."\n";
+
+		if (count($tickets) > 0)
+		{
+			$i = 0;
+			foreach ($tickets as $ticket)
+			{
+				$i++;
+				if ($i > $limit) break;
+
+				print "\t".'<tr class="oddeven">'."\n";
+				print '<td class="nowrap" valign="top">';
+				print $ticket->getNomUrl(1);
+				print "</td>\n";
+				print '<td class="tdtop">'.$ticket->label."</td>\n";
+				// Link to delete from category
+				print '<td class="right">';
+				if ($permission)
+				{
+					print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&amp;type=".$typeid."&amp;removeelem=".$ticket->id."'>";
+					print $langs->trans("DeleteFromCat");
+					print img_picto($langs->trans("DeleteFromCat"), 'unlink', '', false, 0, 0, '', 'paddingleft');
+					print "</a>";
+				}
+				print '</td>';
+				print "</tr>\n";
+			}
+		} else {
+			print '<tr class="oddeven"><td colspan="2" class="opacitymedium">'.$langs->trans("ThisCategoryHasNoItems").'</td></tr>';
+		}
+		print "</table>\n";
+
+		print '</form>'."\n";
+	}
+}
 
 // End of page
 llxFooter();
diff --git a/htdocs/langs/fr_FR/categories.lang b/htdocs/langs/fr_FR/categories.lang
index 4b806e1edbd..20bfb122c75 100644
--- a/htdocs/langs/fr_FR/categories.lang
+++ b/htdocs/langs/fr_FR/categories.lang
@@ -17,6 +17,7 @@ ContactsCategoriesArea=Espace tags/catégories de contacts
 AccountsCategoriesArea=Espace des tags/categories de comptes bancaires
 ProjectsCategoriesArea=Espace des tags/catégories des projets
 UsersCategoriesArea=Espace des tags/catégories des utilisateurs
+TicketsCategoriesArea=Espace tags/catégories des tickets
 SubCats=Sous-catégories
 CatList=Liste des tags/catégories
 CatListAll=Liste de toutes les catégories (de tous types)
@@ -90,6 +91,7 @@ CategorieRecursivHelp=Si l'option est activé, quand un produit est ajouté dans
 AddProductServiceIntoCategory=Ajouter le produit/service suivant
 AddCustomerIntoCategory=Assigner cette catégorie au client
 AddSupplierIntoCategory=Assigner cette catégorie au fournisseur
+AddTicketIntoCategory=Assigner cette catégorie au ticket
 ShowCategory=Afficher tag/catégorie
 ByDefaultInList=Par défaut dans la liste
 ChooseCategory=Choisissez une catégorie
diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index 5faa7b201b7..9be858fd795 100644
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -31,6 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 if (!empty($conf->projet->enabled)) {
 	include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
@@ -202,6 +203,10 @@ if (empty($reshook)) {
 				$contactid = GETPOST('contactid', 'int');
 				$type_contact = GETPOST("type", 'alpha');
 
+				// Category association
+				$categories = GETPOST('categories', 'array');
+				$object->setCategories($categories);
+
 				if ($contactid > 0 && $type_contact) {
 					$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
 					$result = $object->add_contact($contactid, $typeid, 'external');
@@ -312,7 +317,11 @@ if (empty($reshook)) {
 			$object->severity_code = GETPOST('severity_code', 'alpha');
 
 			$ret = $object->update($user);
-			if ($ret <= 0) {
+			if ($ret > 0) {
+				// Category association
+				$categories = GETPOST('categories', 'array');
+				$object->setCategories($categories);
+			} else {
 				$error++;
 			}
 
@@ -1054,6 +1063,13 @@ if ($action == 'create' || $action == 'presend') {
 			print '</td></tr>';
 		}
 
+		// Categories
+		if ($conf->categorie->enabled) {
+			print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td colspan="3">';
+			print $form->showCategories($object->id, Categorie::TYPE_TICKET, 1);
+			print "</td></tr>";
+		}
+		
 		// Other attributes
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 

From 079608fe00c1296787ba57fb7734c7fdee5f33af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20David?= <theo.david@evarisk.com>
Date: Fri, 2 Jul 2021 10:26:03 +0200
Subject: [PATCH 0971/1497] NEW #18046 Add ticket ticket categories functions

---
 htdocs/categories/class/categorie.class.php |  13 +-
 htdocs/core/class/html.form.class.php       | 219 ++++++++++++++++++++
 htdocs/core/class/html.formticket.class.php |   9 +
 htdocs/core/modules/modTicket.class.php     |  13 ++
 htdocs/ticket/class/ticket.class.php        |  45 ++++
 5 files changed, 296 insertions(+), 3 deletions(-)

diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index b98cff5b3a5..caeab5b8ddd 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -34,6 +34,7 @@
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/ticket/class/ticket.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 
@@ -56,6 +57,7 @@ class Categorie extends CommonObject
 	const TYPE_WAREHOUSE = 'warehouse';
 	const TYPE_ACTIONCOMM = 'actioncomm';
 	const TYPE_WEBSITE_PAGE = 'website_page';
+	const TYPE_TICKET = 'ticket';
 
 	/**
 	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
@@ -78,7 +80,8 @@ class Categorie extends CommonObject
 		'bank_line'    => 8,
 		'warehouse'    => 9,
 		'actioncomm'   => 10,
-		'website_page' => 11
+		'website_page' => 11,
+		'ticket'       => 12
 	);
 
 	/**
@@ -98,7 +101,8 @@ class Categorie extends CommonObject
 		8 => 'bank_line',
 		9 => 'warehouse',
 		10 => 'actioncomm',
-		11 => 'website_page'
+		11 => 'website_page',
+		12 => 'ticket'
 	);
 
 	/**
@@ -141,7 +145,8 @@ class Categorie extends CommonObject
 		'project'  => 'Project',
 		'warehouse'=> 'Entrepot',
 		'actioncomm' => 'ActionComm',
-		'website_page' => 'WebsitePage'
+		'website_page' => 'WebsitePage',
+		'ticket' => 'Ticket'
 	);
 
 	/**
@@ -234,6 +239,8 @@ class Categorie extends CommonObject
 	 * @see Categorie::TYPE_WAREHOUSE
 	 * @see Categorie::TYPE_ACTIONCOMM
 	 * @see Categorie::TYPE_WEBSITE_PAGE
+	 * @see Categorie::TYPE_TICKET
+
 	 */
 	public $type;
 
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 0b1504d229a..2d648ef1fd9 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -6578,6 +6578,225 @@ class Form
 		return;
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Return list of tickets in Ajax if Ajax activated or go to select_tickets_list
+	 *
+	 *  @param		int			$selected				Preselected tickets
+	 *  @param		string		$htmlname				Name of HTML select field (must be unique in page).
+	 *  @param		int			$limit					Limit on number of returned lines
+	 *  @param		int			$status					Ticket status
+	 *  @param		string		$selected_input_value	Value of preselected input text (for use with ajax)
+	 *  @param		int			$hidelabel				Hide label (0=no, 1=yes, 2=show search icon (before) and placeholder, 3 search icon after)
+	 *  @param		array		$ajaxoptions			Options for ajax_autocompleter
+	 *  @param      int			$socid					Thirdparty Id (to get also price dedicated to this customer)
+	 *  @param		string		$showempty				'' to not show empty line. Translation key to show an empty line. '1' show empty line with no text.
+	 * 	@param		int			$forcecombo				Force to use combo box
+	 *  @param      string      $morecss                Add more css on select
+	 *  @param 		array 		$selected_combinations 	Selected combinations. Format: array([attrid] => attrval, [...])
+	 *  @param		string		$nooutput				No print, return the output into a string
+	 *  @return		void|string
+	 */
+	public function select_tickets($selected = '', $htmlname = 'ticketid', $filtertype = '', $limit = 0, $status = 1, $selected_input_value = '', $hidelabel = 0, $ajaxoptions = array(), $socid = 0, $showempty = '1', $forcecombo = 0, $morecss = '', $selected_combinations = null, $nooutput = 0)
+	{
+		// phpcs:enable
+		global $langs, $conf;
+
+		$out = '';
+
+		// check parameters
+		if (is_null($ajaxoptions)) $ajaxoptions = array();
+
+		if (!empty($conf->use_javascript_ajax) && !empty($conf->global->TICKET_USE_SEARCH_TO_SELECT))
+		{
+			$placeholder = '';
+
+			if ($selected && empty($selected_input_value))
+			{
+				require_once DOL_DOCUMENT_ROOT.'/ticket/class/ticket.class.php';
+				$tickettmpselect = new Ticket($this->db);
+				$tickettmpselect->fetch($selected);
+				$selected_input_value = $tickettmpselect->ref;
+				unset($tickettmpselect);
+			}
+
+			$out .= ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/ticket/ajax/tickets.php', $urloption, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT, 1, $ajaxoptions);
+
+			if (empty($hidelabel)) $out .= $langs->trans("RefOrLabel").' : ';
+			elseif ($hidelabel > 1) {
+				$placeholder = ' placeholder="'.$langs->trans("RefOrLabel").'"';
+				if ($hidelabel == 2) {
+					$out .= img_picto($langs->trans("Search"), 'search');
+				}
+			}
+			$out .= '<input type="text" class="minwidth100" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'"'.$placeholder.' '.(!empty($conf->global->PRODUCT_SEARCH_AUTOFOCUS) ? 'autofocus' : '').' />';
+			if ($hidelabel == 3) {
+				$out .= img_picto($langs->trans("Search"), 'search');
+			}
+		} else {
+			$out .= $this->select_tickets_list($selected, $htmlname, $filtertype, $limit, $status, 0, $socid, $showempty, $forcecombo, $morecss);
+		}
+
+		if (empty($nooutput)) print $out;
+		else return $out;
+	}
+
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Return list of tickets.
+	 *  Called by select_tickets.
+	 *
+	 *	@param      int		$selected           Preselected ticket
+	 *	@param      string	$htmlname           Name of select html
+	 *  @param		string	$filtertype         Filter on ticket type
+	 *	@param      int		$limit              Limit on number of returned lines
+	 * 	@param      string	$filterkey          Filter on product
+	 *	@param		int		$status             Ticket status
+	 *  @param      int		$outputmode         0=HTML select string, 1=Array
+	 *  @param		string	$showempty		    '' to not show empty line. Translation key to show an empty line. '1' show empty line with no text.
+	 * 	@param		int		$forcecombo		    Force to use combo box
+	 *  @param      string  $morecss            Add more css on select
+	 *  @return     array    				    Array of keys for json
+	 */
+	public function select_tickets_list($selected = '', $htmlname = 'ticketid', $filtertype = '', $limit = 20, $filterkey = '', $status = 1, $outputmode = 0, $showempty = '1', $forcecombo = 0, $morecss = '')
+	{
+		// phpcs:enable
+		global $langs, $conf, $user, $db;
+
+		$out = '';
+		$outarray = array();
+
+		$selectFields = " p.rowid, p.ref, p.message";
+
+		$sql = "SELECT ";
+		$sql .= $selectFields;
+		$sql .= " FROM ".MAIN_DB_PREFIX."ticket as p";
+		$sql .= ' WHERE p.entity IN ('.getEntity('ticket').')';
+
+		// Add criteria on ref/label
+		if ($filterkey != '')
+		{
+			$sql .= ' AND (';
+			$prefix = empty($conf->global->TICKET_DONOTSEARCH_ANYWHERE) ? '%' : ''; // Can use index if PRODUCT_DONOTSEARCH_ANYWHERE is on
+			// For natural search
+			$scrit = explode(' ', $filterkey);
+			$i = 0;
+			if (count($scrit) > 1) $sql .= "(";
+			foreach ($scrit as $crit)
+			{
+				if ($i > 0) $sql .= " AND ";
+				$sql .= "(p.ref LIKE '".$this->db->escape($prefix.$crit)."%' OR p.label LIKE '".$this->db->escape($prefix.$crit)."%'";
+				$sql .= ")";
+				$i++;
+			}
+			if (count($scrit) > 1) $sql .= ")";
+			$sql .= ')';
+		}
+
+		$sql .= $this->db->plimit($limit, 0);
+
+		// Build output string
+		dol_syslog(get_class($this)."::select_tickets_list search tickets", LOG_DEBUG);
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			require_once DOL_DOCUMENT_ROOT.'/ticket/class/ticket.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/ticket.lib.php';
+
+			$num = $this->db->num_rows($result);
+
+			$events = null;
+
+			if (!$forcecombo)
+			{
+				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+				$out .= ajax_combobox($htmlname, $events, $conf->global->TICKET_USE_SEARCH_TO_SELECT);
+			}
+
+			$out .= '<select class="flat'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'" id="'.$htmlname.'">';
+
+			$textifempty = '';
+			// Do not use textifempty = ' ' or '&nbsp;' here, or search on key will search on ' key'.
+			//if (! empty($conf->use_javascript_ajax) || $forcecombo) $textifempty='';
+			if (!empty($conf->global->TICKET_USE_SEARCH_TO_SELECT))
+			{
+				if ($showempty && !is_numeric($showempty)) $textifempty = $langs->trans($showempty);
+				else $textifempty .= $langs->trans("All");
+			} else {
+				if ($showempty && !is_numeric($showempty)) $textifempty = $langs->trans($showempty);
+			}
+			if ($showempty) $out .= '<option value="0" selected>'.$textifempty.'</option>';
+
+			$i = 0;
+			while ($num && $i < $num)
+			{
+				$opt = '';
+				$optJson = array();
+				$objp = $this->db->fetch_object($result);
+
+				$this->constructTicketListOption($objp, $opt, $optJson, $selected, $filterkey);
+				// Add new entry
+				// "key" value of json key array is used by jQuery automatically as selected value
+				// "label" value of json key array is used by jQuery automatically as text for combo box
+				$out .= $opt;
+				array_push($outarray, $optJson);
+
+
+				$i++;
+			}
+
+			$out .= '</select>';
+
+			$this->db->free($result);
+
+			if (empty($outputmode)) return $out;
+			return $outarray;
+		} else {
+			dol_print_error($db);
+		}
+	}
+
+	/**
+	 * constructTicketListOption.
+	 * This define value for &$opt and &$optJson.
+	 *
+	 * @param 	resource	$objp			    Result set of fetch
+	 * @param 	string		$opt			    Option (var used for returned value in string option format)
+	 * @param 	string		$optJson		    Option (var used for returned value in json format)
+	 * @param 	string		$selected		    Preselected value
+	 * @param   string      $filterkey          Filter key to highlight
+	 * @return	void
+	 */
+	protected function constructTicketListOption(&$objp, &$opt, &$optJson, $selected, $filterkey = '')
+	{
+		global $langs, $conf, $user, $db;
+
+		$outkey = '';
+		$outval = '';
+		$outref = '';
+		$outlabel = '';
+		$outtype = '';
+
+		$label = $objp->label;
+
+		$outkey = $objp->rowid;
+		$outref = $objp->ref;
+		$outlabel = $objp->label;
+		$outtype = $objp->fk_product_type;
+
+		$opt = '<option value="'.$objp->rowid.'"';
+		$opt .= ($objp->rowid == $selected) ? ' selected' : '';
+		$opt .= '>';
+		$opt .= $objp->ref;
+		$objRef = $objp->ref;
+		if (!empty($filterkey) && $filterkey != '') $objRef = preg_replace('/('.preg_quote($filterkey, '/').')/i', '<strong>$1</strong>', $objRef, 1);
+		$outval .= $objRef;
+
+		$opt .= "</option>\n";
+		$optJson = array('key'=>$outkey, 'value'=>$outref, 'type'=>$outtypem);
+	}
+
 
 	/**
 	 * Generic method to select a component from a combo list.
diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index daafa88333f..2178a02cb89 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -272,6 +272,15 @@ class FormTicket
 			print '</td></tr>';
 		}
 
+		//Categories
+		if ($conf->categorie->enabled) {
+			// Categories
+			print '<tr><td>'.$langs->trans("Categories").'</td><td colspan="3">';
+			$cate_arbo = $form->select_all_categories(Categorie::TYPE_TICKET, '', 'parent', 64, 0, 1);
+			print img_picto('', 'category').$form->multiselectarray('categories', $cate_arbo, GETPOST('categories', 'array'), '', 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
+			print "</td></tr>";
+		}
+
 		// Attached files
 		if (!empty($this->withfile)) {
 			// Define list of attached files
diff --git a/htdocs/core/modules/modTicket.class.php b/htdocs/core/modules/modTicket.class.php
index 8b1a1dc8525..2a717ae4f42 100644
--- a/htdocs/core/modules/modTicket.class.php
+++ b/htdocs/core/modules/modTicket.class.php
@@ -283,6 +283,19 @@ class modTicket extends DolibarrModules
 			'target' => '',
 			'user' => 0);
 		$r++;
+
+		$this->menu[$r] = array('fk_menu' => 'fk_mainmenu=ticket,fk_leftmenu=ticket',
+			'type' => 'left',
+			'titre' => 'Categories',
+			'mainmenu' => 'ticket',
+			'url' => '/categories/index.php?type=12',
+			'langs' => 'ticket',
+			'position' => 107,
+			'enabled' => '$conf->categorie->enabled',
+			'perms' => '$user->rights->ticket->read',
+			'target' => '',
+			'user' => 0);
+		$r++;
 	}
 
 	/**
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index 89f239db6c6..36d90c5519d 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -2497,6 +2497,51 @@ class Ticket extends CommonObject
 		return array('listofpaths'=>$listofpaths, 'listofnames'=>$listofnames, 'listofmimes'=>$mimetype);
 	}
 
+	/**
+	 * Sets object to supplied categories.
+	 *
+	 * Deletes object from existing categories not supplied.
+	 * Adds it to non existing supplied categories.
+	 * Existing categories are left untouch.
+	 *
+	 * @param  int[]|int $categories Category or categories IDs
+	 * @return void
+	 */
+	public function setCategories($categories)
+	{
+		// Handle single category
+		if (!is_array($categories)) {
+			$categories = array($categories);
+		}
+
+		// Get current categories
+		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+		$c = new Categorie($this->db);
+		$existing = $c->containing($this->id, Categorie::TYPE_TICKET, 'id');
+
+		// Diff
+		if (is_array($existing)) {
+			$to_del = array_diff($existing, $categories);
+			$to_add = array_diff($categories, $existing);
+		} else {
+			$to_del = array(); // Nothing to delete
+			$to_add = $categories;
+		}
+
+		// Process
+		foreach ($to_del as $del) {
+			if ($c->fetch($del) > 0) {
+				$c->del_type($this, Categorie::TYPE_TICKET);
+			}
+		}
+		foreach ($to_add as $add) {
+			if ($c->fetch($add) > 0) {
+				$c->add_type($this, Categorie::TYPE_TICKET);
+			}
+		}
+
+		return;
+	}
 
 	/**
 	 * Add new message on a ticket (private/public area). Can also send it be email if GETPOST('send_email', 'int') is set.

From 7c072c7960bf6535e80efe147e49a303b37a54a9 Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Fri, 2 Jul 2021 10:47:57 +0200
Subject: [PATCH 0972/1497] Fix Error type ent in fourn/commande/list.php

---
 htdocs/fourn/commande/list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index c644f9e35a5..bd5686b71f1 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -1406,7 +1406,7 @@ if ($resql) {
 		// Type ent
 		if (!empty($arrayfields['typent.code']['checked'])) {
 			print '<td class="center">';
-			if (count($typenArray) == 0) {
+			if (empty($typenArray)) {
 				$typenArray = $formcompany->typent_array(1);
 			}
 			print $typenArray[$obj->typent_code];

From 783257706ca6c20776efe59ea84852a04281adbc Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Fri, 2 Jul 2021 10:53:51 +0200
Subject: [PATCH 0973/1497] fix: payment ok should trigger
 PAYMENTONLINE_PAYMENT_OK even on custom object

---
 htdocs/public/payment/paymentok.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 60d763593fe..fb23e57d1ed 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -746,6 +746,12 @@ if ($ispaymentok)
 		$result = $object->call_trigger('PAYMENTONLINE_PAYMENT_OK', $user);
 		if ($result < 0) $error++;
 		// End call triggers
+	} elseif (get_class($object)=='stdClass') {
+		//In some case $object is not instanciate (for paiement on custom object) We need to deal with payment
+		include_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
+		$paiement = new Paiement($db);
+		$result = $paiement->call_trigger('PAYMENTONLINE_PAYMENT_OK', $user);
+		if ($result < 0) $error++;
 	}
 
 	print $langs->trans("YourPaymentHasBeenRecorded")."<br>\n";

From 97938f489ef937662de07ddbe020c133e01eaeb4 Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <68746600+marc-dll@users.noreply.github.com>
Date: Fri, 2 Jul 2021 11:35:26 +0200
Subject: [PATCH 0974/1497] FIX: holiday: status filter parameter has been
 renamed but not in links it was used

---
 htdocs/core/menus/standard/eldy.lib.php | 10 +++++-----
 htdocs/holiday/class/holiday.class.php  |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index ed835a3d4c0..76d51069885 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1755,11 +1755,11 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				$newmenu->add("/holiday/card.php?mainmenu=hrm&leftmenu=holiday&action=create", $langs->trans("New"), 1, $user->rights->holiday->write);
 				$newmenu->add("/holiday/list.php?mainmenu=hrm&leftmenu=hrm", $langs->trans("List"), 1, $user->rights->holiday->read);
 				if ($usemenuhider || empty($leftmenu) || $leftmenu == "hrm") {
-					$newmenu->add("/holiday/list.php?search_statut=1&mainmenu=hrm&leftmenu=hrm", $langs->trans("DraftCP"), 2, $user->rights->holiday->read);
-					$newmenu->add("/holiday/list.php?search_statut=2&mainmenu=hrm&leftmenu=hrm", $langs->trans("ToReviewCP"), 2, $user->rights->holiday->read);
-					$newmenu->add("/holiday/list.php?search_statut=3&mainmenu=hrm&leftmenu=hrm", $langs->trans("ApprovedCP"), 2, $user->rights->holiday->read);
-					$newmenu->add("/holiday/list.php?search_statut=4&mainmenu=hrm&leftmenu=hrm", $langs->trans("CancelCP"), 2, $user->rights->holiday->read);
-					$newmenu->add("/holiday/list.php?search_statut=5&mainmenu=hrm&leftmenu=hrm", $langs->trans("RefuseCP"), 2, $user->rights->holiday->read);
+					$newmenu->add("/holiday/list.php?search_status=1&mainmenu=hrm&leftmenu=hrm", $langs->trans("DraftCP"), 2, $user->rights->holiday->read);
+					$newmenu->add("/holiday/list.php?search_status=2&mainmenu=hrm&leftmenu=hrm", $langs->trans("ToReviewCP"), 2, $user->rights->holiday->read);
+					$newmenu->add("/holiday/list.php?search_status=3&mainmenu=hrm&leftmenu=hrm", $langs->trans("ApprovedCP"), 2, $user->rights->holiday->read);
+					$newmenu->add("/holiday/list.php?search_status=4&mainmenu=hrm&leftmenu=hrm", $langs->trans("CancelCP"), 2, $user->rights->holiday->read);
+					$newmenu->add("/holiday/list.php?search_status=5&mainmenu=hrm&leftmenu=hrm", $langs->trans("RefuseCP"), 2, $user->rights->holiday->read);
 				}
 				$newmenu->add("/holiday/define_holiday.php?mainmenu=hrm&action=request", $langs->trans("MenuConfCP"), 1, $user->rights->holiday->read);
 				$newmenu->add("/holiday/month_report.php?mainmenu=hrm&leftmenu=holiday", $langs->trans("MenuReportMonth"), 1, $user->rights->holiday->readall);
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index f61c0a66ca8..717e9a07c58 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -2248,7 +2248,7 @@ class Holiday extends CommonObject
 			$response->warning_delay = $conf->holiday->approve->warning_delay / 60 / 60 / 24;
 			$response->label = $langs->trans("HolidaysToApprove");
 			$response->labelShort = $langs->trans("ToApprove");
-			$response->url = DOL_URL_ROOT.'/holiday/list.php?search_statut=2&amp;mainmenu=hrm&amp;leftmenu=holiday';
+			$response->url = DOL_URL_ROOT.'/holiday/list.php?search_status=2&amp;mainmenu=hrm&amp;leftmenu=holiday';
 			$response->img = img_object('', "holiday");
 
 			while ($obj = $this->db->fetch_object($resql))

From 3c5bc3fef421b34feb50a1d30b148dc4f0b1e015 Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe@altairis.fr>
Date: Fri, 2 Jul 2021 11:53:32 +0200
Subject: [PATCH 0975/1497] fix division by zero on of create

---
 htdocs/mrp/class/mo.class.php            | 2 +-
 htdocs/mrp/tpl/originproductline.tpl.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index f8ff5751221..1369741e07d 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -649,7 +649,7 @@ class Mo extends CommonObject
 							if ($line->qty_frozen) {
 								$moline->qty = $line->qty; // Qty to consume does not depends on quantity to produce
 							} else {
-								$moline->qty = price2num(($line->qty / $bom->qty) * $this->qty / $line->efficiency, 'MS'); // Calculate with Qty to produce and  more presition
+								$moline->qty = price2num(($line->qty / ( ! empty($bom->qty) ? $bom->qty : 1 ) ) * $this->qty / ( ! empty($line->efficiency) ? $line->efficiency : 1 ), 'MS'); // Calculate with Qty to produce and  more presition
 							}
 							if ($moline->qty <= 0) {
 								$error++;
diff --git a/htdocs/mrp/tpl/originproductline.tpl.php b/htdocs/mrp/tpl/originproductline.tpl.php
index 6f3b63f6d4e..f149a75589f 100644
--- a/htdocs/mrp/tpl/originproductline.tpl.php
+++ b/htdocs/mrp/tpl/originproductline.tpl.php
@@ -25,7 +25,7 @@ if (empty($conf) || !is_object($conf))
 
 if (!is_object($form)) $form = new Form($db);
 
-$qtytoconsumeforline = $this->tpl['qty'] / $this->tpl['efficiency'];
+$qtytoconsumeforline = $this->tpl['qty'] / ( ! empty($this->tpl['efficiency']) ? $this->tpl['efficiency'] : 1 );
 /*if ((empty($this->tpl['qty_frozen']) && $this->tpl['qty_bom'] > 1)) {
 	$qtytoconsumeforline = $qtytoconsumeforline / $this->tpl['qty_bom'];
 }*/

From 3bf268796cd415328353c8494241d43a3aeaecfe Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Fri, 2 Jul 2021 12:47:42 +0200
Subject: [PATCH 0976/1497] Fix #18063 : search filter status lost "Back to
 list"

---
 htdocs/fourn/class/fournisseur.commande.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index daa943ffee9..f315661b90c 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -3017,13 +3017,13 @@ class CommandeFournisseur extends CommonOrder
 			$response->warning_delay = $conf->commande->fournisseur->warning_delay / 60 / 60 / 24;
 			$response->label = $langs->trans("SuppliersOrdersToProcess");
 			$response->labelShort = $langs->trans("Opened");
-			$response->url = DOL_URL_ROOT.'/fourn/commande/list.php?statut=1,2&mainmenu=commercial&leftmenu=orders_suppliers';
+			$response->url = DOL_URL_ROOT.'/fourn/commande/list.php?search_status=1,2&mainmenu=commercial&leftmenu=orders_suppliers';
 			$response->img = img_object('', "order");
 
 			if ($mode === 'awaiting') {
 				$response->label = $langs->trans("SuppliersOrdersAwaitingReception");
 				$response->labelShort = $langs->trans("AwaitingReception");
-				$response->url = DOL_URL_ROOT.'/fourn/commande/list.php?statut=3,4&mainmenu=commercial&leftmenu=orders_suppliers';
+				$response->url = DOL_URL_ROOT.'/fourn/commande/list.php?search_status=3,4&mainmenu=commercial&leftmenu=orders_suppliers';
 			}
 
 			while ($obj = $this->db->fetch_object($resql)) {

From 903adadcc45df890e1b01abf1734df63e74ba928 Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Fri, 2 Jul 2021 10:47:57 +0200
Subject: [PATCH 0977/1497] Fix Error type ent in fourn/commande/list.php

---
 htdocs/fourn/commande/list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index bf8e53e8b82..d1946cc9b4c 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -1407,7 +1407,7 @@ if ($resql) {
 		// Type ent
 		if (!empty($arrayfields['typent.code']['checked'])) {
 			print '<td class="center">';
-			if (count($typenArray) == 0) {
+			if (empty($typenArray)) {
 				$typenArray = $formcompany->typent_array(1);
 			}
 			print $typenArray[$obj->typent_code];

From 2a30c699acf30879342fc73774f0b4eaa944f65e Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Fri, 2 Jul 2021 12:47:42 +0200
Subject: [PATCH 0978/1497] Fix #18063 : search filter status lost "Back to
 list"

---
 htdocs/fourn/class/fournisseur.commande.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index daa943ffee9..f315661b90c 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -3017,13 +3017,13 @@ class CommandeFournisseur extends CommonOrder
 			$response->warning_delay = $conf->commande->fournisseur->warning_delay / 60 / 60 / 24;
 			$response->label = $langs->trans("SuppliersOrdersToProcess");
 			$response->labelShort = $langs->trans("Opened");
-			$response->url = DOL_URL_ROOT.'/fourn/commande/list.php?statut=1,2&mainmenu=commercial&leftmenu=orders_suppliers';
+			$response->url = DOL_URL_ROOT.'/fourn/commande/list.php?search_status=1,2&mainmenu=commercial&leftmenu=orders_suppliers';
 			$response->img = img_object('', "order");
 
 			if ($mode === 'awaiting') {
 				$response->label = $langs->trans("SuppliersOrdersAwaitingReception");
 				$response->labelShort = $langs->trans("AwaitingReception");
-				$response->url = DOL_URL_ROOT.'/fourn/commande/list.php?statut=3,4&mainmenu=commercial&leftmenu=orders_suppliers';
+				$response->url = DOL_URL_ROOT.'/fourn/commande/list.php?search_status=3,4&mainmenu=commercial&leftmenu=orders_suppliers';
 			}
 
 			while ($obj = $this->db->fetch_object($resql)) {

From 8bade0e4e7c06d163670f533dd4e7dd7f69c0628 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 2 Jul 2021 16:11:42 +0200
Subject: [PATCH 0979/1497] Fix add permission

---
 htdocs/comm/propal/list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index e5700fca445..d92ec87ca29 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -112,7 +112,7 @@ if (!$sortfield) $sortfield = 'p.ref';
 if (!$sortorder) $sortorder = 'DESC';
 
 $permissiontoread = $user->rights->propal->lire;
-$permissiontoadd = $user->rights->propal->write;
+$permissiontoadd = $user->rights->propal->creer;
 $permissiontodelete = $user->rights->propal->supprimer;
 if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
 	$permissiontoclose = $user->rights->propale->propal_advance->close;

From e35ecdf58d4280c528eb236c629325824293b091 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 3 Jul 2021 17:58:37 +0200
Subject: [PATCH 0980/1497] Fix trans

---
 htdocs/langs/en_US/users.lang | 4 ++--
 htdocs/user/group/card.php    | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/htdocs/langs/en_US/users.lang b/htdocs/langs/en_US/users.lang
index a14db3882b0..841ee0f3daf 100644
--- a/htdocs/langs/en_US/users.lang
+++ b/htdocs/langs/en_US/users.lang
@@ -97,8 +97,8 @@ LoginToCreate=Login to create
 NameToCreate=Name of third party to create
 YourRole=Your roles
 YourQuotaOfUsersIsReached=Your quota of active users is reached !
-NbOfUsers=No. of users
-NbOfPermissions=No. of permissions
+NbOfUsers=Number of users
+NbOfPermissions=Number of permissions
 DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin
 HierarchicalResponsible=Supervisor
 HierarchicView=Hierarchical view
diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php
index 0e60e70e42a..5c1e16e4a0c 100644
--- a/htdocs/user/group/card.php
+++ b/htdocs/user/group/card.php
@@ -428,6 +428,7 @@ if ($action == 'create') {
 				 * Group members
 				 */
 
+				print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
 				print '<table class="noborder centpercent">';
 				print '<tr class="liste_titre">';
 				print '<td class="liste_titre">'.$langs->trans("Login").'</td>';
@@ -440,7 +441,7 @@ if ($action == 'create') {
 				if (!empty($object->members)) {
 					foreach ($object->members as $useringroup) {
 						print '<tr class="oddeven">';
-						print '<td>';
+						print '<td class="tdoverflowmax150">';
 						print $useringroup->getNomUrl(-1, '', 0, 0, 24, 0, 'login');
 						if ($useringroup->admin && !$useringroup->entity) {
 							print img_picto($langs->trans("SuperAdministrator"), 'redstar');
@@ -465,6 +466,7 @@ if ($action == 'create') {
 					print '<tr><td colspan="6" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 				}
 				print "</table>";
+				print '</div>';
 			}
 
 			print "<br>";

From 7fb094602228edef5b08713a6533df36fbbb8b72 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 3 Jul 2021 18:09:48 +0200
Subject: [PATCH 0981/1497] Fix link

---
 htdocs/user/class/usergroup.class.php | 10 +++++++---
 htdocs/user/group/list.php            | 10 +++++++---
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php
index 083b1bcc18c..1f0bb2891c6 100644
--- a/htdocs/user/class/usergroup.class.php
+++ b/htdocs/user/class/usergroup.class.php
@@ -711,7 +711,7 @@ class UserGroup extends CommonObject
 	 *  Use this->id,this->lastname, this->firstname
 	 *
 	 *  @param  int		$withpicto					Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto, -1=Include photo into link, -2=Only picto photo, -3=Only photo very small)
-	 *	@param  string	$option						On what the link point to ('nolink', )
+	 *	@param  string	$option						On what the link point to ('nolink', 'permissions')
 	 *  @param	integer	$notooltip					1=Disable tooltip on picto and name
 	 *  @param  string  $morecss            		Add more css on link
 	 *  @param  int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
@@ -730,12 +730,16 @@ class UserGroup extends CommonObject
 		$result = ''; $label = '';
 
 		$label .= '<div class="centpercent">';
-		$label .= '<u>'.$langs->trans("Group").'</u><br>';
+		$label .= img_picto('', 'group').' <u>'.$langs->trans("Group").'</u><br>';
 		$label .= '<b>'.$langs->trans('Name').':</b> '.$this->name;
 		$label .= '<br><b>'.$langs->trans("Description").':</b> '.$this->note;
 		$label .= '</div>';
 
-		$url = DOL_URL_ROOT.'/user/group/card.php?id='.$this->id;
+		if ($option == 'permissions') {
+			$url = DOL_URL_ROOT.'/user/group/perms.php?id='.$this->id;
+		} else {
+			$url = DOL_URL_ROOT.'/user/group/card.php?id='.$this->id;
+		}
 
 		if ($option != 'nolink') {
 			// Add param to save lastsearch_values or not
diff --git a/htdocs/user/group/list.php b/htdocs/user/group/list.php
index 302d697c563..493383076b0 100644
--- a/htdocs/user/group/list.php
+++ b/htdocs/user/group/list.php
@@ -122,7 +122,7 @@ if (empty($reshook)) {
 
 llxHeader();
 
-$sql = "SELECT g.rowid, g.nom as name, g.note, g.entity, g.datec, COUNT(DISTINCT ugu.fk_user) as nb, COUNT(DISTINCT ugr.fk_id) as nbpermissions";
+$sql = "SELECT g.rowid, g.nom as name, g.note, g.entity, g.datec, g.tms as datem, COUNT(DISTINCT ugu.fk_user) as nb, COUNT(DISTINCT ugr.fk_id) as nbpermissions";
 $sql .= " FROM ".MAIN_DB_PREFIX."usergroup as g";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ugu ON ugu.fk_usergroup = g.rowid";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_rights as ugr ON ugr.fk_usergroup = g.rowid";
@@ -137,7 +137,7 @@ if (!empty($search_group)) {
 if ($sall) {
 	$sql .= natural_search(array("g.nom", "g.note"), $sall);
 }
-$sql .= " GROUP BY g.rowid, g.nom, g.note, g.entity, g.datec";
+$sql .= " GROUP BY g.rowid, g.nom, g.note, g.entity, g.datec, g.tms";
 $sql .= $db->order($sortfield, $sortorder);
 
 $resql = $db->query($sql);
@@ -197,6 +197,7 @@ if ($resql) {
 	print_liste_field_titre("NbOfUsers", $_SERVER["PHP_SELF"], "nb", $param, "", '', $sortfield, $sortorder, 'center ');
 	print_liste_field_titre("NbOfPermissions", $_SERVER["PHP_SELF"], "nbpermissions", $param, "", '', $sortfield, $sortorder, 'center ');
 	print_liste_field_titre("DateCreationShort", $_SERVER["PHP_SELF"], "g.datec", $param, "", '', $sortfield, $sortorder, 'center ');
+	print_liste_field_titre("DateLastModification", $_SERVER["PHP_SELF"], "g.tms", $param, "", '', $sortfield, $sortorder, 'center ');
 	print_liste_field_titre("", $_SERVER["PHP_SELF"]);
 	print "</tr>\n";
 
@@ -222,8 +223,11 @@ if ($resql) {
 			print '<td class="center">'.$mc->label.'</td>';
 		}
 		print '<td class="center">'.$obj->nb.'</td>';
-		print '<td class="center">'.$obj->nbpermissions.'</td>';
+		print '<td class="center">';
+		print '<a href="'.DOL_URL_ROOT.'/user/group/perms.php?id='.$obj->rowid.'">'.$obj->nbpermissions.'</a>';
+		print '</td>';
 		print '<td class="center nowrap">'.dol_print_date($db->jdate($obj->datec), "dayhour").'</td>';
+		print '<td class="center nowrap">'.dol_print_date($db->jdate($obj->datem), "dayhour").'</td>';
 		print '<td></td>';
 		print "</tr>\n";
 		$i++;

From bb0daa4f0d953cdc42e40755561ec81bdeaf5303 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 3 Jul 2021 18:11:01 +0200
Subject: [PATCH 0982/1497] Prepare v14

---
 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 777fde21885..8aa64da85f1 100644
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -34,7 +34,7 @@ if (!defined('DOL_APPLICATION_TITLE')) {
 	define('DOL_APPLICATION_TITLE', 'Dolibarr');
 }
 if (!defined('DOL_VERSION')) {
-	define('DOL_VERSION', '14.0.0-beta'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
+	define('DOL_VERSION', '14.0.0'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
 }
 
 if (!defined('EURO')) {

From 8a3b92a32dcdbe6ba3526cb8b13d388d0b1ba1a6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 3 Jul 2021 18:30:58 +0200
Subject: [PATCH 0983/1497] Fix filter

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

diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index c62185d5f2a..ece1f9c9ec7 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -117,7 +117,7 @@ $search_month_end    = GETPOST('search_month_end', 'int');
 $search_year_end     = GETPOST('search_year_end', 'int');
 $search_employee     = GETPOST('search_employee', 'int');
 $search_valideur     = GETPOST('search_valideur', 'int');
-$search_status       = GETPOST('search_status', 'int');
+$search_status       = GETPOSTISSET('search_status') ? GETPOST('search_status', 'int') : GETPOST('search_statut', 'int');
 $search_type         = GETPOST('search_type', 'int');
 
 // Initialize technical objects

From 30f9eb9f23fc1998f853d39c7e114117b3fbf5b0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 3 Jul 2021 18:32:52 +0200
Subject: [PATCH 0984/1497] Fix phpcs

---
 htdocs/core/tpl/objectline_view.tpl.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php
index 3f7e1616aff..56aba732c6b 100644
--- a/htdocs/core/tpl/objectline_view.tpl.php
+++ b/htdocs/core/tpl/objectline_view.tpl.php
@@ -354,7 +354,6 @@ if ($outputalsopricetotalwithtax) {
 }
 
 if ($this->statut == 0 && ($object_rights->creer) && $action != 'selectlines') {
-
 	$situationinvoicelinewithparent = 0;
 	if ($line->fk_prev_id != null && in_array($object->element, array('facture', 'facturedet'))) {
 		if ($object->type == $object::TYPE_SITUATION) {	// The constant TYPE_SITUATION exists only for object invoice

From df498def86d9f640f807ea02b4d7560dc3f48651 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 3 Jul 2021 18:38:43 +0200
Subject: [PATCH 0985/1497] Fix css

---
 htdocs/contact/class/contact.class.php | 6 +++---
 htdocs/contact/list.php                | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index a5f408f4299..165a7bf7bc3 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -100,15 +100,15 @@ class Contact extends CommonObject
 		'firstname' =>array('type'=>'varchar(50)', 'label'=>'Firstname', 'enabled'=>1, 'visible'=>1, 'position'=>50, 'showoncombobox'=>1, 'searchall'=>1),
 		'address' =>array('type'=>'varchar(255)', 'label'=>'Address', 'enabled'=>1, 'visible'=>-1, 'position'=>55),
 		'zip' =>array('type'=>'varchar(25)', 'label'=>'Zip', 'enabled'=>1, 'visible'=>1, 'position'=>60),
-		'town' =>array('type'=>'text', 'label'=>'Town', 'enabled'=>1, 'visible'=>1, 'position'=>65),
+		'town' =>array('type'=>'text', 'label'=>'Town', 'enabled'=>1, 'visible'=>-1, 'position'=>65),
 		'fk_departement' =>array('type'=>'integer', 'label'=>'Fk departement', 'enabled'=>1, 'visible'=>3, 'position'=>70),
 		'fk_pays' =>array('type'=>'integer', 'label'=>'Fk pays', 'enabled'=>1, 'visible'=>3, 'position'=>75),
 		'birthday' =>array('type'=>'date', 'label'=>'Birthday', 'enabled'=>1, 'visible'=>3, 'position'=>80),
 		'poste' =>array('type'=>'varchar(80)', 'label'=>'PostOrFunction', 'enabled'=>1, 'visible'=>-1, 'position'=>85),
 		'phone' =>array('type'=>'varchar(30)', 'label'=>'Phone', 'enabled'=>1, 'visible'=>1, 'position'=>90, 'searchall'=>1),
-		'phone_perso' =>array('type'=>'varchar(30)', 'label'=>'PhonePerso', 'enabled'=>1, 'visible'=>1, 'position'=>95, 'searchall'=>1),
+		'phone_perso' =>array('type'=>'varchar(30)', 'label'=>'PhonePerso', 'enabled'=>1, 'visible'=>-1, 'position'=>95, 'searchall'=>1),
 		'phone_mobile' =>array('type'=>'varchar(30)', 'label'=>'PhoneMobile', 'enabled'=>1, 'visible'=>1, 'position'=>100, 'searchall'=>1),
-		'fax' =>array('type'=>'varchar(30)', 'label'=>'Fax', 'enabled'=>1, 'visible'=>1, 'position'=>105, 'searchall'=>1),
+		'fax' =>array('type'=>'varchar(30)', 'label'=>'Fax', 'enabled'=>1, 'visible'=>-1, 'position'=>105, 'searchall'=>1),
 		'email' =>array('type'=>'varchar(255)', 'label'=>'Email', 'enabled'=>1, 'visible'=>1, 'position'=>110, 'searchall'=>1),
 		'socialnetworks' =>array('type'=>'text', 'label'=>'SocialNetworks', 'enabled'=>1, 'visible'=>3, 'position'=>115),
 		'photo' =>array('type'=>'varchar(255)', 'label'=>'Photo', 'enabled'=>1, 'visible'=>3, 'position'=>170),
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index fe8e20bac9c..e5a9ab3f0d6 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -1097,28 +1097,28 @@ while ($i < min($num, $limit)) {
 	}
 	// Phone
 	if (!empty($arrayfields['p.phone']['checked'])) {
-		print '<td class="nowraponall">'.dol_print_phone($obj->phone_pro, $obj->country_code, $obj->rowid, $obj->socid, 'AC_TEL', ' ', 'phone').'</td>';
+		print '<td class="nowraponall tdoverflowmax150">'.dol_print_phone($obj->phone_pro, $obj->country_code, $obj->rowid, $obj->socid, 'AC_TEL', ' ', 'phone').'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
 	}
 	// Phone perso
 	if (!empty($arrayfields['p.phone_perso']['checked'])) {
-		print '<td class="nowraponall">'.dol_print_phone($obj->phone_perso, $obj->country_code, $obj->rowid, $obj->socid, 'AC_TEL', ' ', 'phone').'</td>';
+		print '<td class="nowraponall tdoverflowmax150">'.dol_print_phone($obj->phone_perso, $obj->country_code, $obj->rowid, $obj->socid, 'AC_TEL', ' ', 'phone').'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
 	}
 	// Phone mobile
 	if (!empty($arrayfields['p.phone_mobile']['checked'])) {
-		print '<td class="nowraponall">'.dol_print_phone($obj->phone_mobile, $obj->country_code, $obj->rowid, $obj->socid, 'AC_TEL', ' ', 'mobile').'</td>';
+		print '<td class="nowraponall tdoverflowmax150">'.dol_print_phone($obj->phone_mobile, $obj->country_code, $obj->rowid, $obj->socid, 'AC_TEL', ' ', 'mobile').'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
 	}
 	// Fax
 	if (!empty($arrayfields['p.fax']['checked'])) {
-		print '<td class="nowraponall">'.dol_print_phone($obj->fax, $obj->country_code, $obj->rowid, $obj->socid, 'AC_TEL', ' ', 'fax').'</td>';
+		print '<td class="nowraponall tdoverflowmax150">'.dol_print_phone($obj->fax, $obj->country_code, $obj->rowid, $obj->socid, 'AC_TEL', ' ', 'fax').'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}

From affe6d963196dfbb5f6bc31bb28a481a8b87e417 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 3 Jul 2021 19:00:58 +0200
Subject: [PATCH 0986/1497] Sync transifex

---
 htdocs/fourn/facture/list.php               |  14 +-
 htdocs/fourn/paiement/list.php              |   6 +-
 htdocs/langs/am_ET/deliveries.lang          |   2 +
 htdocs/langs/am_ET/exports.lang             |   3 +-
 htdocs/langs/ar_EG/website.lang             |   1 +
 htdocs/langs/ar_IQ/deliveries.lang          |   1 +
 htdocs/langs/ar_IQ/exports.lang             |   3 +-
 htdocs/langs/ar_SA/exports.lang             |   3 +-
 htdocs/langs/az_AZ/deliveries.lang          |   2 +
 htdocs/langs/az_AZ/exports.lang             |   3 +-
 htdocs/langs/bg_BG/deliveries.lang          |   2 +
 htdocs/langs/bg_BG/exports.lang             |   3 +-
 htdocs/langs/bn_BD/deliveries.lang          |   2 +
 htdocs/langs/bn_BD/exports.lang             |   3 +-
 htdocs/langs/bn_IN/deliveries.lang          |   2 +
 htdocs/langs/bn_IN/exports.lang             |   3 +-
 htdocs/langs/bs_BA/deliveries.lang          |   2 +
 htdocs/langs/bs_BA/exports.lang             |   3 +-
 htdocs/langs/ca_ES/deliveries.lang          |   2 +
 htdocs/langs/ca_ES/exports.lang             |   7 +-
 htdocs/langs/cs_CZ/deliveries.lang          |   2 +
 htdocs/langs/cs_CZ/exports.lang             |   3 +-
 htdocs/langs/da_DK/accountancy.lang         |   3 +-
 htdocs/langs/da_DK/admin.lang               |   1 +
 htdocs/langs/da_DK/deliveries.lang          |   2 +
 htdocs/langs/da_DK/exports.lang             |   3 +-
 htdocs/langs/da_DK/knowledgemanagement.lang |  10 +-
 htdocs/langs/da_DK/languages.lang           |   2 +
 htdocs/langs/da_DK/products.lang            |   3 +-
 htdocs/langs/da_DK/stocks.lang              |   6 +-
 htdocs/langs/da_DK/ticket.lang              |  11 +-
 htdocs/langs/de_AT/admin.lang               |   1 +
 htdocs/langs/de_AT/salaries.lang            |   3 +
 htdocs/langs/de_AT/users.lang               |   2 +
 htdocs/langs/de_AT/website.lang             |   2 +
 htdocs/langs/de_CH/website.lang             |   1 +
 htdocs/langs/de_DE/deliveries.lang          |   1 +
 htdocs/langs/de_DE/exports.lang             |   7 +-
 htdocs/langs/el_CY/admin.lang               |   1 +
 htdocs/langs/el_CY/users.lang               |   3 +
 htdocs/langs/el_CY/website.lang             |   2 +
 htdocs/langs/el_GR/deliveries.lang          |   2 +
 htdocs/langs/el_GR/exports.lang             |   3 +-
 htdocs/langs/en_AU/admin.lang               |   1 +
 htdocs/langs/en_AU/salaries.lang            |   3 +
 htdocs/langs/en_AU/users.lang               |   3 +
 htdocs/langs/en_AU/website.lang             |   2 +
 htdocs/langs/en_CA/admin.lang               |   1 +
 htdocs/langs/en_CA/salaries.lang            |   3 +
 htdocs/langs/en_CA/users.lang               |   3 +
 htdocs/langs/en_CA/website.lang             |   2 +
 htdocs/langs/en_GB/admin.lang               |   1 +
 htdocs/langs/en_IN/admin.lang               |   1 +
 htdocs/langs/en_IN/salaries.lang            |   3 +
 htdocs/langs/en_IN/users.lang               |   3 +
 htdocs/langs/en_IN/website.lang             |   2 +
 htdocs/langs/en_SG/admin.lang               |   1 +
 htdocs/langs/en_SG/salaries.lang            |   3 +
 htdocs/langs/en_SG/users.lang               |   3 +
 htdocs/langs/en_SG/website.lang             |   2 +
 htdocs/langs/es_AR/admin.lang               |   1 +
 htdocs/langs/es_BO/admin.lang               |   1 +
 htdocs/langs/es_BO/salaries.lang            |   3 +
 htdocs/langs/es_BO/users.lang               |   3 +
 htdocs/langs/es_BO/website.lang             |   2 +
 htdocs/langs/es_CL/exports.lang             |   1 -
 htdocs/langs/es_CL/main.lang                |   1 +
 htdocs/langs/es_CL/products.lang            |   1 -
 htdocs/langs/es_CO/main.lang                |   1 +
 htdocs/langs/es_CO/ticket.lang              |   3 -
 htdocs/langs/es_CO/users.lang               |   2 +
 htdocs/langs/es_CO/website.lang             |   2 +
 htdocs/langs/es_DO/admin.lang               |   1 +
 htdocs/langs/es_DO/salaries.lang            |   3 +
 htdocs/langs/es_DO/users.lang               |   3 +
 htdocs/langs/es_DO/website.lang             |   2 +
 htdocs/langs/es_EC/exports.lang             |   1 -
 htdocs/langs/es_EC/main.lang                |   1 +
 htdocs/langs/es_EC/ticket.lang              |   3 -
 htdocs/langs/es_ES/accountancy.lang         |   9 +-
 htdocs/langs/es_ES/admin.lang               |  11 +-
 htdocs/langs/es_ES/deliveries.lang          |   1 +
 htdocs/langs/es_ES/errors.lang              |   2 +-
 htdocs/langs/es_ES/exports.lang             |   3 +-
 htdocs/langs/es_ES/knowledgemanagement.lang |  10 +-
 htdocs/langs/es_ES/languages.lang           |   2 +
 htdocs/langs/es_ES/main.lang                |   4 +-
 htdocs/langs/es_ES/products.lang            |   3 +-
 htdocs/langs/es_ES/stocks.lang              |   6 +-
 htdocs/langs/es_ES/ticket.lang              |  11 +-
 htdocs/langs/es_GT/admin.lang               |   1 +
 htdocs/langs/es_GT/salaries.lang            |   3 +
 htdocs/langs/es_GT/users.lang               |   3 +
 htdocs/langs/es_GT/website.lang             |   2 +
 htdocs/langs/es_HN/admin.lang               |   1 +
 htdocs/langs/es_HN/salaries.lang            |   3 +
 htdocs/langs/es_HN/users.lang               |   3 +
 htdocs/langs/es_HN/website.lang             |   2 +
 htdocs/langs/es_MX/users.lang               |   2 +
 htdocs/langs/es_PA/admin.lang               |   1 +
 htdocs/langs/es_PA/salaries.lang            |   3 +
 htdocs/langs/es_PA/users.lang               |   3 +
 htdocs/langs/es_PA/website.lang             |   2 +
 htdocs/langs/es_PE/admin.lang               |   1 +
 htdocs/langs/es_PE/users.lang               |   2 +
 htdocs/langs/es_PY/admin.lang               |   1 +
 htdocs/langs/es_PY/salaries.lang            |   3 +
 htdocs/langs/es_PY/users.lang               |   3 +
 htdocs/langs/es_PY/website.lang             |   2 +
 htdocs/langs/es_US/admin.lang               |   1 +
 htdocs/langs/es_US/salaries.lang            |   3 +
 htdocs/langs/es_US/users.lang               |   3 +
 htdocs/langs/es_US/website.lang             |   2 +
 htdocs/langs/es_UY/admin.lang               |   1 +
 htdocs/langs/es_UY/salaries.lang            |   3 +
 htdocs/langs/es_UY/users.lang               |   3 +
 htdocs/langs/es_UY/website.lang             |   2 +
 htdocs/langs/es_VE/admin.lang               |   1 +
 htdocs/langs/es_VE/users.lang               |   3 +
 htdocs/langs/es_VE/website.lang             |   2 +
 htdocs/langs/et_EE/deliveries.lang          |   2 +
 htdocs/langs/et_EE/exports.lang             |   3 +-
 htdocs/langs/eu_ES/deliveries.lang          |   2 +
 htdocs/langs/eu_ES/exports.lang             |   3 +-
 htdocs/langs/fa_IR/deliveries.lang          |   2 +
 htdocs/langs/fa_IR/exports.lang             |   3 +-
 htdocs/langs/fi_FI/deliveries.lang          |   2 +
 htdocs/langs/fi_FI/exports.lang             |   3 +-
 htdocs/langs/fr_BE/admin.lang               |   1 +
 htdocs/langs/fr_BE/salaries.lang            |   3 +
 htdocs/langs/fr_BE/users.lang               |   3 +
 htdocs/langs/fr_BE/website.lang             |   2 +
 htdocs/langs/fr_CA/admin.lang               |   1 +
 htdocs/langs/fr_CA/products.lang            |   1 -
 htdocs/langs/fr_CA/users.lang               |   2 +
 htdocs/langs/fr_CA/website.lang             |   1 +
 htdocs/langs/fr_CH/admin.lang               |   1 +
 htdocs/langs/fr_CH/salaries.lang            |   3 +
 htdocs/langs/fr_CH/users.lang               |   3 +
 htdocs/langs/fr_CH/website.lang             |   2 +
 htdocs/langs/fr_CI/admin.lang               |   1 +
 htdocs/langs/fr_CI/salaries.lang            |   3 +
 htdocs/langs/fr_CI/users.lang               |   3 +
 htdocs/langs/fr_CI/website.lang             |   2 +
 htdocs/langs/fr_CM/admin.lang               |   1 +
 htdocs/langs/fr_CM/salaries.lang            |   3 +
 htdocs/langs/fr_CM/users.lang               |   3 +
 htdocs/langs/fr_CM/website.lang             |   2 +
 htdocs/langs/fr_FR/compta.lang              |  10 +-
 htdocs/langs/fr_FR/exports.lang             |   3 +-
 htdocs/langs/fr_GA/admin.lang               |   1 +
 htdocs/langs/fr_GA/salaries.lang            |   3 +
 htdocs/langs/fr_GA/users.lang               |   3 +
 htdocs/langs/fr_GA/website.lang             |   2 +
 htdocs/langs/gl_ES/deliveries.lang          |   1 +
 htdocs/langs/gl_ES/exports.lang             |   3 +-
 htdocs/langs/he_IL/deliveries.lang          |   2 +
 htdocs/langs/he_IL/exports.lang             |   3 +-
 htdocs/langs/hi_IN/deliveries.lang          |   2 +
 htdocs/langs/hi_IN/exports.lang             |   3 +-
 htdocs/langs/hr_HR/deliveries.lang          |   2 +
 htdocs/langs/hr_HR/exports.lang             |   3 +-
 htdocs/langs/hu_HU/deliveries.lang          |   2 +
 htdocs/langs/hu_HU/exports.lang             |   3 +-
 htdocs/langs/id_ID/deliveries.lang          |   2 +
 htdocs/langs/id_ID/exports.lang             |   3 +-
 htdocs/langs/is_IS/deliveries.lang          |   2 +
 htdocs/langs/is_IS/exports.lang             |   3 +-
 htdocs/langs/it_CH/salaries.lang            |   3 +
 htdocs/langs/it_CH/users.lang               |   3 +
 htdocs/langs/it_IT/deliveries.lang          |   1 +
 htdocs/langs/it_IT/exports.lang             |   3 +-
 htdocs/langs/ja_JP/accountancy.lang         |   3 +-
 htdocs/langs/ja_JP/admin.lang               |   1 +
 htdocs/langs/ja_JP/deliveries.lang          |   4 +-
 htdocs/langs/ja_JP/exports.lang             |   3 +-
 htdocs/langs/ja_JP/knowledgemanagement.lang |  10 +-
 htdocs/langs/ja_JP/languages.lang           |   2 +
 htdocs/langs/ja_JP/products.lang            |   3 +-
 htdocs/langs/ja_JP/stocks.lang              |   6 +-
 htdocs/langs/ja_JP/ticket.lang              |  11 +-
 htdocs/langs/ka_GE/deliveries.lang          |   2 +
 htdocs/langs/ka_GE/exports.lang             |   3 +-
 htdocs/langs/km_KH/deliveries.lang          |   2 +
 htdocs/langs/km_KH/exports.lang             |   3 +-
 htdocs/langs/kn_IN/deliveries.lang          |   2 +
 htdocs/langs/kn_IN/exports.lang             |   3 +-
 htdocs/langs/ko_KR/deliveries.lang          |   2 +
 htdocs/langs/ko_KR/exports.lang             |   3 +-
 htdocs/langs/lo_LA/deliveries.lang          |   2 +
 htdocs/langs/lo_LA/exports.lang             |   3 +-
 htdocs/langs/lt_LT/deliveries.lang          |   2 +
 htdocs/langs/lt_LT/exports.lang             |   3 +-
 htdocs/langs/lv_LV/accountancy.lang         |  57 +++----
 htdocs/langs/lv_LV/admin.lang               | 151 ++++++++---------
 htdocs/langs/lv_LV/agenda.lang              |  12 +-
 htdocs/langs/lv_LV/assets.lang              |  14 +-
 htdocs/langs/lv_LV/banks.lang               |  12 +-
 htdocs/langs/lv_LV/bills.lang               |  32 ++--
 htdocs/langs/lv_LV/blockedlog.lang          |   4 +-
 htdocs/langs/lv_LV/boxes.lang               |  28 ++--
 htdocs/langs/lv_LV/cashdesk.lang            |  20 +--
 htdocs/langs/lv_LV/categories.lang          |  24 +--
 htdocs/langs/lv_LV/commercial.lang          |   5 +-
 htdocs/langs/lv_LV/companies.lang           |  36 ++---
 htdocs/langs/lv_LV/compta.lang              |  58 +++----
 htdocs/langs/lv_LV/cron.lang                |   2 +-
 htdocs/langs/lv_LV/deliveries.lang          |   2 +
 htdocs/langs/lv_LV/dict.lang                |   2 +-
 htdocs/langs/lv_LV/donations.lang           |   2 +-
 htdocs/langs/lv_LV/ecm.lang                 |   8 +-
 htdocs/langs/lv_LV/errors.lang              |  40 ++---
 htdocs/langs/lv_LV/eventorganization.lang   | 162 +++++++++----------
 htdocs/langs/lv_LV/exports.lang             |   5 +-
 htdocs/langs/lv_LV/externalsite.lang        |   2 +-
 htdocs/langs/lv_LV/holiday.lang             |  32 ++--
 htdocs/langs/lv_LV/hrm.lang                 |   2 +-
 htdocs/langs/lv_LV/knowledgemanagement.lang |  36 ++---
 htdocs/langs/lv_LV/languages.lang           |   6 +-
 htdocs/langs/lv_LV/mails.lang               |   6 +-
 htdocs/langs/lv_LV/main.lang                |  54 +++----
 htdocs/langs/lv_LV/margins.lang             |   2 +-
 htdocs/langs/lv_LV/members.lang             |  60 +++----
 htdocs/langs/lv_LV/modulebuilder.lang       |  10 +-
 htdocs/langs/lv_LV/mrp.lang                 |   8 +-
 htdocs/langs/lv_LV/orders.lang              |   4 +-
 htdocs/langs/lv_LV/other.lang               |  12 +-
 htdocs/langs/lv_LV/partnership.lang         |  80 ++++-----
 htdocs/langs/lv_LV/productbatch.lang        |  42 ++---
 htdocs/langs/lv_LV/products.lang            |  31 ++--
 htdocs/langs/lv_LV/projects.lang            |  22 +--
 htdocs/langs/lv_LV/propal.lang              |   2 +-
 htdocs/langs/lv_LV/receptions.lang          |   2 +-
 htdocs/langs/lv_LV/recruitment.lang         |   2 +-
 htdocs/langs/lv_LV/salaries.lang            |   5 +-
 htdocs/langs/lv_LV/sendings.lang            |   2 +-
 htdocs/langs/lv_LV/stocks.lang              |  58 +++----
 htdocs/langs/lv_LV/supplier_proposal.lang   |   4 +
 htdocs/langs/lv_LV/ticket.lang              |  43 ++---
 htdocs/langs/lv_LV/trips.lang               |   8 +-
 htdocs/langs/lv_LV/users.lang               |   8 +-
 htdocs/langs/lv_LV/website.lang             |  16 +-
 htdocs/langs/lv_LV/withdrawals.lang         |  11 +-
 htdocs/langs/lv_LV/zapier.lang              |   4 +-
 htdocs/langs/mk_MK/deliveries.lang          |   2 +
 htdocs/langs/mk_MK/exports.lang             |   3 +-
 htdocs/langs/mn_MN/deliveries.lang          |   2 +
 htdocs/langs/mn_MN/exports.lang             |   3 +-
 htdocs/langs/nb_NO/deliveries.lang          |   1 +
 htdocs/langs/nb_NO/exports.lang             |   3 +-
 htdocs/langs/ne_NP/deliveries.lang          |   2 +
 htdocs/langs/ne_NP/exports.lang             |   3 +-
 htdocs/langs/nl_BE/admin.lang               |   1 +
 htdocs/langs/nl_BE/ticket.lang              |   1 -
 htdocs/langs/nl_BE/website.lang             |   1 +
 htdocs/langs/nl_NL/deliveries.lang          |   1 +
 htdocs/langs/nl_NL/exports.lang             |   3 +-
 htdocs/langs/pl_PL/deliveries.lang          |  10 +-
 htdocs/langs/pl_PL/exports.lang             | 113 ++++++-------
 htdocs/langs/pt_AO/admin.lang               |   2 +
 htdocs/langs/pt_AO/salaries.lang            |   3 +
 htdocs/langs/pt_AO/website.lang             |   2 +
 htdocs/langs/pt_BR/deliveries.lang          |   1 +
 htdocs/langs/pt_BR/exports.lang             |   1 +
 htdocs/langs/pt_BR/products.lang            |   1 -
 htdocs/langs/pt_BR/ticket.lang              |   2 -
 htdocs/langs/pt_PT/deliveries.lang          |   2 +
 htdocs/langs/pt_PT/exports.lang             |   3 +-
 htdocs/langs/ro_RO/deliveries.lang          |  38 ++---
 htdocs/langs/ro_RO/exports.lang             | 169 ++++++++++----------
 htdocs/langs/ru_UA/salaries.lang            |   3 +
 htdocs/langs/ru_UA/users.lang               |   3 +
 htdocs/langs/ru_UA/website.lang             |   2 +
 htdocs/langs/sk_SK/deliveries.lang          |   2 +
 htdocs/langs/sk_SK/exports.lang             |   3 +-
 htdocs/langs/sl_SI/deliveries.lang          |   2 +
 htdocs/langs/sl_SI/exports.lang             |   3 +-
 htdocs/langs/sq_AL/deliveries.lang          |   2 +
 htdocs/langs/sq_AL/exports.lang             |   3 +-
 htdocs/langs/sr_RS/deliveries.lang          |   2 +
 htdocs/langs/sr_RS/exports.lang             |   3 +-
 htdocs/langs/sw_SW/deliveries.lang          |   2 +
 htdocs/langs/sw_SW/exports.lang             |   3 +-
 htdocs/langs/th_TH/deliveries.lang          |   2 +
 htdocs/langs/th_TH/exports.lang             |   3 +-
 htdocs/langs/tr_TR/deliveries.lang          |   2 +
 htdocs/langs/tr_TR/exports.lang             |   3 +-
 htdocs/langs/uk_UA/deliveries.lang          |   2 +
 htdocs/langs/uk_UA/exports.lang             |   3 +-
 htdocs/langs/vi_VN/deliveries.lang          |   2 +
 htdocs/langs/vi_VN/exports.lang             |   3 +-
 htdocs/langs/zh_CN/deliveries.lang          |   2 +
 htdocs/langs/zh_CN/exports.lang             |   3 +-
 htdocs/langs/zh_HK/deliveries.lang          |   2 +
 htdocs/langs/zh_HK/exports.lang             |   3 +-
 htdocs/langs/zh_TW/admin.lang               |  45 +++---
 htdocs/langs/zh_TW/agenda.lang              |  12 +-
 htdocs/langs/zh_TW/boxes.lang               |  32 ++--
 htdocs/langs/zh_TW/cashdesk.lang            |  20 +--
 htdocs/langs/zh_TW/companies.lang           |   6 +-
 htdocs/langs/zh_TW/compta.lang              |  22 +--
 htdocs/langs/zh_TW/deliveries.lang          |   1 +
 htdocs/langs/zh_TW/errors.lang              |  86 +++++-----
 htdocs/langs/zh_TW/eventorganization.lang   |   6 +-
 htdocs/langs/zh_TW/exports.lang             |   3 +-
 htdocs/langs/zh_TW/holiday.lang             |  44 ++---
 htdocs/langs/zh_TW/hrm.lang                 |   2 +-
 htdocs/langs/zh_TW/languages.lang           |   6 +-
 htdocs/langs/zh_TW/main.lang                |  54 +++----
 htdocs/langs/zh_TW/margins.lang             |   2 +-
 htdocs/langs/zh_TW/members.lang             |  60 +++----
 htdocs/langs/zh_TW/mrp.lang                 |   8 +-
 htdocs/langs/zh_TW/orders.lang              |   4 +-
 htdocs/langs/zh_TW/other.lang               |  12 +-
 htdocs/langs/zh_TW/partnership.lang         |  80 ++++-----
 htdocs/langs/zh_TW/productbatch.lang        |  40 ++---
 htdocs/langs/zh_TW/products.lang            |  31 ++--
 htdocs/langs/zh_TW/projects.lang            |  22 +--
 htdocs/langs/zh_TW/propal.lang              |   2 +-
 htdocs/langs/zh_TW/receptions.lang          |   2 +-
 htdocs/langs/zh_TW/recruitment.lang         |  28 ++--
 htdocs/langs/zh_TW/salaries.lang            |   5 +-
 htdocs/langs/zh_TW/sendings.lang            |   8 +-
 htdocs/langs/zh_TW/stocks.lang              |  48 +++---
 htdocs/langs/zh_TW/supplier_proposal.lang   |  58 +++----
 htdocs/langs/zh_TW/ticket.lang              |  15 +-
 326 files changed, 1697 insertions(+), 1293 deletions(-)
 create mode 100644 htdocs/langs/de_AT/salaries.lang
 create mode 100644 htdocs/langs/de_AT/website.lang
 create mode 100644 htdocs/langs/el_CY/users.lang
 create mode 100644 htdocs/langs/el_CY/website.lang
 create mode 100644 htdocs/langs/en_AU/salaries.lang
 create mode 100644 htdocs/langs/en_AU/users.lang
 create mode 100644 htdocs/langs/en_AU/website.lang
 create mode 100644 htdocs/langs/en_CA/salaries.lang
 create mode 100644 htdocs/langs/en_CA/users.lang
 create mode 100644 htdocs/langs/en_CA/website.lang
 create mode 100644 htdocs/langs/en_IN/salaries.lang
 create mode 100644 htdocs/langs/en_IN/users.lang
 create mode 100644 htdocs/langs/en_IN/website.lang
 create mode 100644 htdocs/langs/en_SG/salaries.lang
 create mode 100644 htdocs/langs/en_SG/users.lang
 create mode 100644 htdocs/langs/en_SG/website.lang
 create mode 100644 htdocs/langs/es_BO/salaries.lang
 create mode 100644 htdocs/langs/es_BO/users.lang
 create mode 100644 htdocs/langs/es_BO/website.lang
 create mode 100644 htdocs/langs/es_CO/website.lang
 create mode 100644 htdocs/langs/es_DO/salaries.lang
 create mode 100644 htdocs/langs/es_DO/users.lang
 create mode 100644 htdocs/langs/es_DO/website.lang
 create mode 100644 htdocs/langs/es_GT/salaries.lang
 create mode 100644 htdocs/langs/es_GT/users.lang
 create mode 100644 htdocs/langs/es_GT/website.lang
 create mode 100644 htdocs/langs/es_HN/salaries.lang
 create mode 100644 htdocs/langs/es_HN/users.lang
 create mode 100644 htdocs/langs/es_HN/website.lang
 create mode 100644 htdocs/langs/es_PA/salaries.lang
 create mode 100644 htdocs/langs/es_PA/users.lang
 create mode 100644 htdocs/langs/es_PA/website.lang
 create mode 100644 htdocs/langs/es_PY/salaries.lang
 create mode 100644 htdocs/langs/es_PY/users.lang
 create mode 100644 htdocs/langs/es_PY/website.lang
 create mode 100644 htdocs/langs/es_US/salaries.lang
 create mode 100644 htdocs/langs/es_US/users.lang
 create mode 100644 htdocs/langs/es_US/website.lang
 create mode 100644 htdocs/langs/es_UY/salaries.lang
 create mode 100644 htdocs/langs/es_UY/users.lang
 create mode 100644 htdocs/langs/es_UY/website.lang
 create mode 100644 htdocs/langs/es_VE/users.lang
 create mode 100644 htdocs/langs/es_VE/website.lang
 create mode 100644 htdocs/langs/fr_BE/salaries.lang
 create mode 100644 htdocs/langs/fr_BE/users.lang
 create mode 100644 htdocs/langs/fr_BE/website.lang
 create mode 100644 htdocs/langs/fr_CH/salaries.lang
 create mode 100644 htdocs/langs/fr_CH/users.lang
 create mode 100644 htdocs/langs/fr_CH/website.lang
 create mode 100644 htdocs/langs/fr_CI/salaries.lang
 create mode 100644 htdocs/langs/fr_CI/users.lang
 create mode 100644 htdocs/langs/fr_CI/website.lang
 create mode 100644 htdocs/langs/fr_CM/salaries.lang
 create mode 100644 htdocs/langs/fr_CM/users.lang
 create mode 100644 htdocs/langs/fr_CM/website.lang
 create mode 100644 htdocs/langs/fr_GA/salaries.lang
 create mode 100644 htdocs/langs/fr_GA/users.lang
 create mode 100644 htdocs/langs/fr_GA/website.lang
 create mode 100644 htdocs/langs/it_CH/salaries.lang
 create mode 100644 htdocs/langs/it_CH/users.lang
 create mode 100644 htdocs/langs/pt_AO/admin.lang
 create mode 100644 htdocs/langs/pt_AO/salaries.lang
 create mode 100644 htdocs/langs/pt_AO/website.lang
 create mode 100644 htdocs/langs/ru_UA/salaries.lang
 create mode 100644 htdocs/langs/ru_UA/users.lang
 create mode 100644 htdocs/langs/ru_UA/website.lang

diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 9d5343c47c4..5e4cc3fc05e 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -45,10 +45,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
-if (!$user->rights->fournisseur->facture->lire) {
-	accessforbidden();
-}
-
 // Load translation files required by the page
 $langs->loadLangs(array('products', 'bills', 'companies', 'projects'));
 
@@ -214,6 +210,16 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
+if ((empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD))
+	|| (empty($conf->supplier_invoice->enabled) && !empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD))) {
+	accessforbidden();
+}
+if ((empty($user->rights->fournisseur->facture->lire) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD))
+	|| (empty($user->rights->supplier_invoice->lire) && !empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD))) {
+	accessforbidden();
+}
+
+
 
 /*
  * Actions
diff --git a/htdocs/fourn/paiement/list.php b/htdocs/fourn/paiement/list.php
index 4da69cfc0c1..40d36e5e4f6 100644
--- a/htdocs/fourn/paiement/list.php
+++ b/htdocs/fourn/paiement/list.php
@@ -112,10 +112,12 @@ if ($user->socid) {
 // require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
 // $object = new PaiementFourn($db);
 // restrictedArea($user, $object->element);
-if ((empty($conf->fournisseur->enabled) && !empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || empty($conf->supplier_invoice->enabled)) {
+if ((empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD))
+	|| (empty($conf->supplier_invoice->enabled) && !empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD))) {
 	accessforbidden();
 }
-if (!$user->rights->fournisseur->facture->lire || !$user->rights->supplier_invoice->lire) {
+if ((empty($user->rights->fournisseur->facture->lire) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD))
+	|| (empty($user->rights->supplier_invoice->lire) && !empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD))) {
 	accessforbidden();
 }
 
diff --git a/htdocs/langs/am_ET/deliveries.lang b/htdocs/langs/am_ET/deliveries.lang
index 1f48c01de75..cd8a36e6c70 100644
--- a/htdocs/langs/am_ET/deliveries.lang
+++ b/htdocs/langs/am_ET/deliveries.lang
@@ -27,5 +27,7 @@ Recipient=Recipient
 ErrorStockIsNotEnough=There's not enough stock
 Shippable=Shippable
 NonShippable=Not Shippable
+ShowShippableStatus=Show shippable status
 ShowReceiving=Show delivery receipt
 NonExistentOrder=Nonexistent order
+StockQuantitiesAlreadyAllocatedOnPreviousLines = Stock quantities already allocated on previous lines
diff --git a/htdocs/langs/am_ET/exports.lang b/htdocs/langs/am_ET/exports.lang
index a0eb7161ef2..cb652229825 100644
--- a/htdocs/langs/am_ET/exports.lang
+++ b/htdocs/langs/am_ET/exports.lang
@@ -53,7 +53,8 @@ TypeOfLineServiceOrProduct=Type of line (0=product, 1=service)
 FileWithDataToImport=File with data to import
 FileToImport=Source file to import
 FileMustHaveOneOfFollowingFormat=File to import must have one of following formats
-DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
+DownloadEmptyExample=Download template file with field content information
+StarAreMandatory=* are mandatory fields
 ChooseFormatOfFileToImport=Choose the file format to use as import file format by clicking on the %s icon to select it...
 ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
 SourceFileFormat=Source file format
diff --git a/htdocs/langs/ar_EG/website.lang b/htdocs/langs/ar_EG/website.lang
index 4f2ff392475..5bc16ab4864 100644
--- a/htdocs/langs/ar_EG/website.lang
+++ b/htdocs/langs/ar_EG/website.lang
@@ -9,3 +9,4 @@ WEBSITE_ALIASALT=أسماء الصفحات / الأسماء المستعارة 
 WEBSITE_ALIASALTDesc=استخدم هنا قائمة بأسماء / أسماء مستعارة أخرى بحيث يمكن الوصول إلى الصفحة أيضًا باستخدام هذه الأسماء / الأسماء المستعارة الأخرى (على سبيل المثال ، الاسم القديم بعد إعادة تسمية الاسم المستعار للحفاظ على الرابط الخلفي في عمل الرابط / الاسم القديم). النحو هو: <br> Alternativename1 ، و Alternativename2 ، ...
 WEBSITE_CSS_URL=عنوان URL لملف CSS الخارجي
 WEBSITE_CSS_INLINE=محتوى ملف CSS (مشترك لجميع الصفحات)
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
diff --git a/htdocs/langs/ar_IQ/deliveries.lang b/htdocs/langs/ar_IQ/deliveries.lang
index fdfd6404a8a..cd8a36e6c70 100644
--- a/htdocs/langs/ar_IQ/deliveries.lang
+++ b/htdocs/langs/ar_IQ/deliveries.lang
@@ -30,3 +30,4 @@ NonShippable=Not Shippable
 ShowShippableStatus=Show shippable status
 ShowReceiving=Show delivery receipt
 NonExistentOrder=Nonexistent order
+StockQuantitiesAlreadyAllocatedOnPreviousLines = Stock quantities already allocated on previous lines
diff --git a/htdocs/langs/ar_IQ/exports.lang b/htdocs/langs/ar_IQ/exports.lang
index a0eb7161ef2..cb652229825 100644
--- a/htdocs/langs/ar_IQ/exports.lang
+++ b/htdocs/langs/ar_IQ/exports.lang
@@ -53,7 +53,8 @@ TypeOfLineServiceOrProduct=Type of line (0=product, 1=service)
 FileWithDataToImport=File with data to import
 FileToImport=Source file to import
 FileMustHaveOneOfFollowingFormat=File to import must have one of following formats
-DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
+DownloadEmptyExample=Download template file with field content information
+StarAreMandatory=* are mandatory fields
 ChooseFormatOfFileToImport=Choose the file format to use as import file format by clicking on the %s icon to select it...
 ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
 SourceFileFormat=Source file format
diff --git a/htdocs/langs/ar_SA/exports.lang b/htdocs/langs/ar_SA/exports.lang
index 53ce1753324..41308469daa 100644
--- a/htdocs/langs/ar_SA/exports.lang
+++ b/htdocs/langs/ar_SA/exports.lang
@@ -53,7 +53,8 @@ TypeOfLineServiceOrProduct=Type of line (0=product, 1=نوع الخط (0= منت
 FileWithDataToImport=ملف استيراد البيانات
 FileToImport=مصدر لاستيراد ملف
 FileMustHaveOneOfFollowingFormat=File to import must have one of following formats
-DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
+DownloadEmptyExample=Download template file with field content information
+StarAreMandatory=* are mandatory fields
 ChooseFormatOfFileToImport=Choose the file format to use as import file format by clicking on the %s icon to select it...
 ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
 SourceFileFormat=مصدر تنسيق ملف
diff --git a/htdocs/langs/az_AZ/deliveries.lang b/htdocs/langs/az_AZ/deliveries.lang
index 1f48c01de75..cd8a36e6c70 100644
--- a/htdocs/langs/az_AZ/deliveries.lang
+++ b/htdocs/langs/az_AZ/deliveries.lang
@@ -27,5 +27,7 @@ Recipient=Recipient
 ErrorStockIsNotEnough=There's not enough stock
 Shippable=Shippable
 NonShippable=Not Shippable
+ShowShippableStatus=Show shippable status
 ShowReceiving=Show delivery receipt
 NonExistentOrder=Nonexistent order
+StockQuantitiesAlreadyAllocatedOnPreviousLines = Stock quantities already allocated on previous lines
diff --git a/htdocs/langs/az_AZ/exports.lang b/htdocs/langs/az_AZ/exports.lang
index a0eb7161ef2..cb652229825 100644
--- a/htdocs/langs/az_AZ/exports.lang
+++ b/htdocs/langs/az_AZ/exports.lang
@@ -53,7 +53,8 @@ TypeOfLineServiceOrProduct=Type of line (0=product, 1=service)
 FileWithDataToImport=File with data to import
 FileToImport=Source file to import
 FileMustHaveOneOfFollowingFormat=File to import must have one of following formats
-DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
+DownloadEmptyExample=Download template file with field content information
+StarAreMandatory=* are mandatory fields
 ChooseFormatOfFileToImport=Choose the file format to use as import file format by clicking on the %s icon to select it...
 ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
 SourceFileFormat=Source file format
diff --git a/htdocs/langs/bg_BG/deliveries.lang b/htdocs/langs/bg_BG/deliveries.lang
index b3ce159a9d2..f6ad8076ae9 100644
--- a/htdocs/langs/bg_BG/deliveries.lang
+++ b/htdocs/langs/bg_BG/deliveries.lang
@@ -27,5 +27,7 @@ Recipient=Получател
 ErrorStockIsNotEnough=Няма достатъчна наличност
 Shippable=Годно за изпращане
 NonShippable=Негодно за изпращане
+ShowShippableStatus=Show shippable status
 ShowReceiving=Показване на разписка за доставка
 NonExistentOrder=Несъществуваща поръчка
+StockQuantitiesAlreadyAllocatedOnPreviousLines = Stock quantities already allocated on previous lines
diff --git a/htdocs/langs/bg_BG/exports.lang b/htdocs/langs/bg_BG/exports.lang
index f371671587f..8abaa3d6bf5 100644
--- a/htdocs/langs/bg_BG/exports.lang
+++ b/htdocs/langs/bg_BG/exports.lang
@@ -53,7 +53,8 @@ TypeOfLineServiceOrProduct=Тип ред (0 = продукт, 1 = услуга)
 FileWithDataToImport=Файл с данни за импортиране
 FileToImport=Входен файл за импортиране
 FileMustHaveOneOfFollowingFormat=Файлът за импортиране трябва да бъде в един от следните формати
-DownloadEmptyExample=Изтегляне на шаблонния файл с информация за съдържанието на полето (* са задължителни полета)
+DownloadEmptyExample=Download template file with field content information
+StarAreMandatory=* are mandatory fields
 ChooseFormatOfFileToImport=Изберете формата на файла, който да използвате като формат за импортиране, като кликнете върху иконата на %s, за да го изберете...
 ChooseFileToImport=Прикачете файл, след това кликнете върху иконата %s, за да изберете файла като източник при импортиране...
 SourceFileFormat=Формат на входния файл
diff --git a/htdocs/langs/bn_BD/deliveries.lang b/htdocs/langs/bn_BD/deliveries.lang
index 1f48c01de75..cd8a36e6c70 100644
--- a/htdocs/langs/bn_BD/deliveries.lang
+++ b/htdocs/langs/bn_BD/deliveries.lang
@@ -27,5 +27,7 @@ Recipient=Recipient
 ErrorStockIsNotEnough=There's not enough stock
 Shippable=Shippable
 NonShippable=Not Shippable
+ShowShippableStatus=Show shippable status
 ShowReceiving=Show delivery receipt
 NonExistentOrder=Nonexistent order
+StockQuantitiesAlreadyAllocatedOnPreviousLines = Stock quantities already allocated on previous lines
diff --git a/htdocs/langs/bn_BD/exports.lang b/htdocs/langs/bn_BD/exports.lang
index a0eb7161ef2..cb652229825 100644
--- a/htdocs/langs/bn_BD/exports.lang
+++ b/htdocs/langs/bn_BD/exports.lang
@@ -53,7 +53,8 @@ TypeOfLineServiceOrProduct=Type of line (0=product, 1=service)
 FileWithDataToImport=File with data to import
 FileToImport=Source file to import
 FileMustHaveOneOfFollowingFormat=File to import must have one of following formats
-DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
+DownloadEmptyExample=Download template file with field content information
+StarAreMandatory=* are mandatory fields
 ChooseFormatOfFileToImport=Choose the file format to use as import file format by clicking on the %s icon to select it...
 ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
 SourceFileFormat=Source file format
diff --git a/htdocs/langs/bn_IN/deliveries.lang b/htdocs/langs/bn_IN/deliveries.lang
index 1f48c01de75..cd8a36e6c70 100644
--- a/htdocs/langs/bn_IN/deliveries.lang
+++ b/htdocs/langs/bn_IN/deliveries.lang
@@ -27,5 +27,7 @@ Recipient=Recipient
 ErrorStockIsNotEnough=There's not enough stock
 Shippable=Shippable
 NonShippable=Not Shippable
+ShowShippableStatus=Show shippable status
 ShowReceiving=Show delivery receipt
 NonExistentOrder=Nonexistent order
+StockQuantitiesAlreadyAllocatedOnPreviousLines = Stock quantities already allocated on previous lines
diff --git a/htdocs/langs/bn_IN/exports.lang b/htdocs/langs/bn_IN/exports.lang
index a0eb7161ef2..cb652229825 100644
--- a/htdocs/langs/bn_IN/exports.lang
+++ b/htdocs/langs/bn_IN/exports.lang
@@ -53,7 +53,8 @@ TypeOfLineServiceOrProduct=Type of line (0=product, 1=service)
 FileWithDataToImport=File with data to import
 FileToImport=Source file to import
 FileMustHaveOneOfFollowingFormat=File to import must have one of following formats
-DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
+DownloadEmptyExample=Download template file with field content information
+StarAreMandatory=* are mandatory fields
 ChooseFormatOfFileToImport=Choose the file format to use as import file format by clicking on the %s icon to select it...
 ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
 SourceFileFormat=Source file format
diff --git a/htdocs/langs/bs_BA/deliveries.lang b/htdocs/langs/bs_BA/deliveries.lang
index 1d1cc2fba9b..4ccb70f6a24 100644
--- a/htdocs/langs/bs_BA/deliveries.lang
+++ b/htdocs/langs/bs_BA/deliveries.lang
@@ -27,5 +27,7 @@ Recipient=Primalac
 ErrorStockIsNotEnough=There's not enough stock
 Shippable=Shippable
 NonShippable=Not Shippable
+ShowShippableStatus=Show shippable status
 ShowReceiving=Show delivery receipt
 NonExistentOrder=Nonexistent order
+StockQuantitiesAlreadyAllocatedOnPreviousLines = Stock quantities already allocated on previous lines
diff --git a/htdocs/langs/bs_BA/exports.lang b/htdocs/langs/bs_BA/exports.lang
index 30e7e97e5a5..c030d48d370 100644
--- a/htdocs/langs/bs_BA/exports.lang
+++ b/htdocs/langs/bs_BA/exports.lang
@@ -53,7 +53,8 @@ TypeOfLineServiceOrProduct=Type of line (0=product, 1=service)
 FileWithDataToImport=File with data to import
 FileToImport=Source file to import
 FileMustHaveOneOfFollowingFormat=File to import must have one of following formats
-DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
+DownloadEmptyExample=Download template file with field content information
+StarAreMandatory=* are mandatory fields
 ChooseFormatOfFileToImport=Choose the file format to use as import file format by clicking on the %s icon to select it...
 ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
 SourceFileFormat=Source file format
diff --git a/htdocs/langs/ca_ES/deliveries.lang b/htdocs/langs/ca_ES/deliveries.lang
index f1dd899fea4..b6d8fbf55f8 100644
--- a/htdocs/langs/ca_ES/deliveries.lang
+++ b/htdocs/langs/ca_ES/deliveries.lang
@@ -27,5 +27,7 @@ Recipient=Destinatari
 ErrorStockIsNotEnough=No hi ha estoc suficient
 Shippable=Es pot enviar
 NonShippable=No es pot enviar
+ShowShippableStatus=Mostra l'estat d'enviament
 ShowReceiving=Mostra el rebut d'entrega
 NonExistentOrder=Comanda inexistent
+StockQuantitiesAlreadyAllocatedOnPreviousLines = Stock quantities already allocated on previous lines
diff --git a/htdocs/langs/ca_ES/exports.lang b/htdocs/langs/ca_ES/exports.lang
index f66769a30f7..f0ebbe4d451 100644
--- a/htdocs/langs/ca_ES/exports.lang
+++ b/htdocs/langs/ca_ES/exports.lang
@@ -33,7 +33,7 @@ FormatedImport=Assistent d'importació
 FormatedImportDesc1=Aquest mòdul us permet actualitzar les dades existents o afegir nous objectes a la base de dades d'un fitxer sense coneixements tècnics, utilitzant un assistent.
 FormatedImportDesc2=El primer pas és triar el tipus de dades que voleu importar, a continuació, el format del fitxer font, a continuació, els camps que voleu importar.
 FormatedExport=Assistent d'exportació
-FormatedExportDesc1=Aquestes eines permeten l'exportació de dades personalitzades mitjançant un assistent, per ajudar-vos en el procés sense necessitat de coneixements tècnics.
+FormatedExportDesc1=Aquestes eines permeten exportar dades personalitzades mitjançant un assistent per a ajudar-vos en el procés sense necessitat de coneixements tècnics.
 FormatedExportDesc2=El primer pas és triar un conjunt de dades predefinit, després els camps que voleu exportar i en quin ordre.
 FormatedExportDesc3=Quan se seleccionen les dades per a exportar, podeu triar el format del fitxer de sortida.
 Sheet=Fulla
@@ -53,7 +53,8 @@ TypeOfLineServiceOrProduct=Tipus de línia (0=producte, 1=servei)
 FileWithDataToImport=Arxiu que conté les dades a importar
 FileToImport=Arxiu origen a importar
 FileMustHaveOneOfFollowingFormat=El fitxer a importar ha de tenir un dels següents formats
-DownloadEmptyExample=Baixeu un fitxer de plantilla amb informació de contingut de camp (* són camps obligatoris)
+DownloadEmptyExample=Download template file with field content information
+StarAreMandatory=* are mandatory fields
 ChooseFormatOfFileToImport=Trieu el format del fitxer que voleu utilitzar com a format de fitxer d'importació fent clic a la icona %s per seleccionar-lo ...
 ChooseFileToImport=Pengeu un fitxer i feu clic a la icona %s per seleccionar el fitxer com a fitxer d'importació d'origen ...
 SourceFileFormat=Format de l'arxiu origen
@@ -80,7 +81,7 @@ SelectAtLeastOneField=Bascular com a mínim un camp origen a la columna de camps
 SelectFormat=Seleccioneu aquest format de fitxer d'importació
 RunImportFile=Importa dades
 NowClickToRunTheImport=Comproveu els resultats de la simulació d'importació. Corregiu els errors i torneu a provar. <br> Quan la simulació no informa d'errors, pot procedir a importar les dades a la base de dades.
-DataLoadedWithId=Les dades importades tindran un camp addicional a cada taula de base de dades amb aquest identificador d'importació: <b> %s </b>, per permetre que es pugui cercar en el cas d'investigar un problema relacionat amb aquesta importació.
+DataLoadedWithId=Les dades importades tindran un camp addicional a cada taula de base de dades amb aquest identificador d'importació: <b> %s </b>, per a permetre que es pugui cercar en el cas d'investigar un problema relacionat amb aquesta importació.
 ErrorMissingMandatoryValue=Les dades obligatòries estan buides al fitxer de codi font <b> %s </b>.
 TooMuchErrors=Encara hi ha 0xaek83365837f %s </b> altres línies d'origen amb errors, però la producció ha estat limitada.
 TooMuchWarnings=Encara hi ha <b> %s </b> altres línies d'origen amb advertències, però la producció ha estat limitada.
diff --git a/htdocs/langs/cs_CZ/deliveries.lang b/htdocs/langs/cs_CZ/deliveries.lang
index e38b668da7f..5941d685f1b 100644
--- a/htdocs/langs/cs_CZ/deliveries.lang
+++ b/htdocs/langs/cs_CZ/deliveries.lang
@@ -27,5 +27,7 @@ Recipient=Příjemce
 ErrorStockIsNotEnough=Dostatečné množství není skladem
 Shippable=Doručitelné
 NonShippable=Nedoručitelné
+ShowShippableStatus=Show shippable status
 ShowReceiving=Zobrazit potvrzení o doručení
 NonExistentOrder=Neexistující objednávka
+StockQuantitiesAlreadyAllocatedOnPreviousLines = Stock quantities already allocated on previous lines
diff --git a/htdocs/langs/cs_CZ/exports.lang b/htdocs/langs/cs_CZ/exports.lang
index 34c0d9b41d6..f185c884609 100644
--- a/htdocs/langs/cs_CZ/exports.lang
+++ b/htdocs/langs/cs_CZ/exports.lang
@@ -53,7 +53,8 @@ TypeOfLineServiceOrProduct=Použitý typ řádku (0 = produkt, 1 = služba)
 FileWithDataToImport=Soubor s daty pro import
 FileToImport=Zdrojový soubor k importu
 FileMustHaveOneOfFollowingFormat=Importovaný soubor musí mít jeden z následujících formátů
-DownloadEmptyExample=Stáhnout soubor šablony s informacemi o obsahu pole (* jsou povinná pole)
+DownloadEmptyExample=Download template file with field content information
+StarAreMandatory=* are mandatory fields
 ChooseFormatOfFileToImport=Vyberte formát souboru, který chcete použít jako formát souboru importu klepnutím na ikonu %s pro jeho výběr ...
 ChooseFileToImport=Pro nahrání souboru klepněte na ikonku %s pro výběr souboru jako zdrojový soubor importu ...
 SourceFileFormat=Zdrojový soubor
diff --git a/htdocs/langs/da_DK/accountancy.lang b/htdocs/langs/da_DK/accountancy.lang
index 374c373fffe..4153f9133a9 100644
--- a/htdocs/langs/da_DK/accountancy.lang
+++ b/htdocs/langs/da_DK/accountancy.lang
@@ -48,7 +48,8 @@ CountriesNotInEEC=Lande ikke i EU
 CountriesInEECExceptMe=Lande i EU undtagen %s
 CountriesExceptMe=Alle lande undtagen %s
 AccountantFiles=Eksporter kildedokumenter
-ExportAccountingSourceDocHelp=Med dette værktøj kan du eksportere de kildehændelser (liste og PDF-filer), der blev brugt til at generere din regnskab. For at eksportere dine tidsskrifter skal du bruge menuindgangen %s - %s.
+ExportAccountingSourceDocHelp=Med dette værktøj kan du eksportere de kildehændelser (liste i CSV og PDF-filer), der blev brugt til at generere din regnskab.
+ExportAccountingSourceDocHelp2=For at eksportere dine tidsskrifter skal du bruge menuindgangen %s - %s.
 VueByAccountAccounting=Vis efter regnskabskonto
 VueBySubAccountAccounting=Vis efter regnskabsmæssig underkonto
 
diff --git a/htdocs/langs/da_DK/admin.lang b/htdocs/langs/da_DK/admin.lang
index 060f9b2a504..25c27871bd5 100644
--- a/htdocs/langs/da_DK/admin.lang
+++ b/htdocs/langs/da_DK/admin.lang
@@ -2144,3 +2144,4 @@ YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=Du aktiverede forældet WS API. Du s
 RandomlySelectedIfSeveral=Valgt tilfældigt, hvis der er flere billeder tilgængelige
 DatabasePasswordObfuscated=Databaseadgangskode er tilsløret i conf-fil
 DatabasePasswordNotObfuscated=Databaseadgangskode er IKKE tilsløret i conf-fil
+APIsAreNotEnabled=API-moduler er ikke aktiveret
diff --git a/htdocs/langs/da_DK/deliveries.lang b/htdocs/langs/da_DK/deliveries.lang
index d4ea903643c..f5bb5bc9ae1 100644
--- a/htdocs/langs/da_DK/deliveries.lang
+++ b/htdocs/langs/da_DK/deliveries.lang
@@ -27,5 +27,7 @@ Recipient=Modtager
 ErrorStockIsNotEnough=Der er ikke nok lager
 Shippable=Fragtvarer
 NonShippable=Kan ikke sendes
+ShowShippableStatus=Vis status, der kan sendes
 ShowReceiving=Vis leverings kvittering
 NonExistentOrder=ikke-eksisterende ordre
+StockQuantitiesAlreadyAllocatedOnPreviousLines = Lagermængder, der allerede er tildelt på tidligere linjer
diff --git a/htdocs/langs/da_DK/exports.lang b/htdocs/langs/da_DK/exports.lang
index 3b1b4072def..374aad967a5 100644
--- a/htdocs/langs/da_DK/exports.lang
+++ b/htdocs/langs/da_DK/exports.lang
@@ -53,7 +53,8 @@ TypeOfLineServiceOrProduct=Strækningstype (0= produkt, 1= tjeneste)
 FileWithDataToImport=Fil med data til at importere
 FileToImport=Kildefilen til at importere
 FileMustHaveOneOfFollowingFormat=Fil, der skal importeres, skal have et af følgende formater
-DownloadEmptyExample=Download skabelonfil med feltindholdsinformation (* er obligatoriske felter)
+DownloadEmptyExample=Download skabelonfil med feltindholdsoplysninger
+StarAreMandatory=* er obligatoriske felter
 ChooseFormatOfFileToImport=Vælg det filformat, der skal bruges som importfilformat, ved at klikke på ikonet %s for at vælge det ...
 ChooseFileToImport=Upload fil og klik derefter på ikonet %s for at vælge fil som kilde importfil ...
 SourceFileFormat=Kilde filformat
diff --git a/htdocs/langs/da_DK/knowledgemanagement.lang b/htdocs/langs/da_DK/knowledgemanagement.lang
index fbd9de8b1ee..b3035583a95 100644
--- a/htdocs/langs/da_DK/knowledgemanagement.lang
+++ b/htdocs/langs/da_DK/knowledgemanagement.lang
@@ -37,15 +37,7 @@ About = Om
 KnowledgeManagementAbout = Om Knowledge Management
 KnowledgeManagementAboutPage = Videnstyring om side
 
-#
-# Sample page
-#
 KnowledgeManagementArea = Videnshåndtering
-
-
-#
-# Menu
-#
 MenuKnowledgeRecord = Videnbase
 ListKnowledgeRecord = Liste over artikler
 NewKnowledgeRecord = Ny artikel
@@ -53,3 +45,5 @@ ValidateReply = Valider løsning
 KnowledgeRecords = Artikler
 KnowledgeRecord = Artikel
 KnowledgeRecordExtraFields = Ekstra felter til artikel
+GroupOfTicket=Gruppe af billetter
+YouCanLinkArticleToATicketCategory=Du kan linke en artikel til en billetgruppe (så artiklen vil blive foreslået under kvalificeringen af nye billetter)
diff --git a/htdocs/langs/da_DK/languages.lang b/htdocs/langs/da_DK/languages.lang
index bf7456b4cfd..1ca08b5f366 100644
--- a/htdocs/langs/da_DK/languages.lang
+++ b/htdocs/langs/da_DK/languages.lang
@@ -4,6 +4,7 @@ Language_ar_AR=Arabisk
 Language_ar_EG=Arabisk (Egypten)
 Language_ar_SA=Arabisk
 Language_ar_TN=Arabisk (Tunesien)
+Language_ar_IQ=Arabisk (Irak)
 Language_az_AZ=Aserbajdsjansk
 Language_bn_BD=Bengali
 Language_bn_IN=Bengali (Indien)
@@ -83,6 +84,7 @@ Language_ne_NP=nepalesisk
 Language_nl_BE=Hollandsk (Belgien)
 Language_nl_NL=Hollandske
 Language_pl_PL=Polsk
+Language_pt_AO=Portugisisk (Angola)
 Language_pt_BR=Portugisisk (Brasilien)
 Language_pt_PT=Portugisisk
 Language_ro_MD=Rumænsk (Moldavien)
diff --git a/htdocs/langs/da_DK/products.lang b/htdocs/langs/da_DK/products.lang
index 0daacebcd03..8c90dd9aa44 100644
--- a/htdocs/langs/da_DK/products.lang
+++ b/htdocs/langs/da_DK/products.lang
@@ -277,7 +277,7 @@ PriceByCustomer=Forskellige priser for hver kunde
 PriceCatalogue=En enkelt salgspris pr. Produkt / service
 PricingRule=Regler for salgspriser
 AddCustomerPrice=Tilføj pris ved kunde
-ForceUpdateChildPriceSoc=Indstil samme pris på kundernes datterselskaber
+ForceUpdateChildPriceSoc=Angiv samme pris på kundens datterselskaber
 PriceByCustomerLog=Log af tidligere kundepriser
 MinimumPriceLimit=Minimumsprisen kan ikke være lavere end %s
 MinimumRecommendedPrice=Minimum anbefalet pris er: %s
@@ -296,6 +296,7 @@ ComposedProductIncDecStock=Forøg / sænk lagerbeholdning ved forældreændring
 ComposedProduct=Børneprodukter
 MinSupplierPrice=Min købskurs
 MinCustomerPrice=Mindste salgspris
+NoDynamicPrice=Ingen dynamisk pris
 DynamicPriceConfiguration=Dynamisk priskonfiguration
 DynamicPriceDesc=Du kan definere matematiske formler til beregning af kunde- eller leverandørpriser. Sådanne formler kan bruge alle matematiske operatorer, nogle konstanter og variabler. Du kan her definere de variabler, du vil bruge. Hvis variablen har brug for en automatisk opdatering, kan du definere den eksterne URL, så Dolibarr kan opdatere værdien automatisk.
 AddVariable=Tilføj variabel
diff --git a/htdocs/langs/da_DK/stocks.lang b/htdocs/langs/da_DK/stocks.lang
index 5cfede398e2..05a8fbbf978 100644
--- a/htdocs/langs/da_DK/stocks.lang
+++ b/htdocs/langs/da_DK/stocks.lang
@@ -60,7 +60,7 @@ EnhancedValueOfWarehouses=Lager værdi
 UserWarehouseAutoCreate=Opret et brugerlager automatisk, når du opretter en bruger
 AllowAddLimitStockByWarehouse=Administrer også værdi for minimum og ønsket lager pr. Parring (produktlager) ud over værdien for minimum og ønsket lager pr. Produkt
 RuleForWarehouse=Regel for lagre
-WarehouseAskWarehouseOnThirparty=Indstil et lager på tredjepart
+WarehouseAskWarehouseOnThirparty=Indstil et lager på tredjeparter
 WarehouseAskWarehouseDuringPropal=Sæt et lager på kommercielle forslag
 WarehouseAskWarehouseDuringOrder=Indstil et lager med salgsordrer
 UserDefaultWarehouse=Indstil et lager til brugere
@@ -167,8 +167,8 @@ MovementTransferStock=Lageroverførsel af produkt %s til et andet lager
 InventoryCodeShort=Inv./Mov. kode
 NoPendingReceptionOnSupplierOrder=Ingen afventende modtagelse på grund af åben indkøbsordre
 ThisSerialAlreadyExistWithDifferentDate=Dette parti / serienummer (<strong> %s </strong>) eksisterer allerede, men med forskellige eatby eller sellby dato (fundet <strong> %s </strong> men du skrev <strong> %s </strong>)
-OpenAll=Åbn for alle handlinger
-OpenInternal=Åben kun for interne handlinger
+OpenAnyMovement=Åben (alle bevægelser)
+OpenInternal=Åben (kun intern bevægelse)
 UseDispatchStatus=Brug en forsendelsesstatus (godkend / afvis) til produktlinjer ved modtagelse af indkøbsordrer
 OptionMULTIPRICESIsOn=Mulighed for "flere priser pr. Segment" er på. Det betyder, at et produkt har flere salgspriser, så værdien til salg ikke kan beregnes
 ProductStockWarehouseCreated=Lagergrænse for alarm og ønsket optimal lager korrekt oprettet
diff --git a/htdocs/langs/da_DK/ticket.lang b/htdocs/langs/da_DK/ticket.lang
index d668d4dabb9..ef63445750d 100644
--- a/htdocs/langs/da_DK/ticket.lang
+++ b/htdocs/langs/da_DK/ticket.lang
@@ -34,7 +34,8 @@ TicketDictResolution=Opgave - Afsluttet
 
 TicketTypeShortCOM=Kommercielt spørgsmål
 TicketTypeShortHELP=Anmodning om hjælp
-TicketTypeShortISSUE=Problem, fejl eller problemer
+TicketTypeShortISSUE=Problem eller fejl
+TicketTypeShortPROBLEM=Problem
 TicketTypeShortREQUEST=Skift eller anmodning om forbedring
 TicketTypeShortPROJET=Projekt
 TicketTypeShortOTHER=Andre
@@ -54,14 +55,15 @@ TypeContact_ticket_internal_SUPPORTTEC=Tildelt bruger
 TypeContact_ticket_external_SUPPORTCLI=Kundekontakt / hændelsesporing
 TypeContact_ticket_external_CONTRIBUTOR=Ekstern bidragyder
 
-OriginEmail=Email kilde
+OriginEmail=E-mail reporter
 Notify_TICKET_SENTBYMAIL=Send opgaver besked via Email
 
 # Status
 Read=Læs
 Assigned=Tildelt
 InProgress=I gang
-NeedMoreInformation=Venter på information
+NeedMoreInformation=Venter på reporterfeedback
+NeedMoreInformationShort=Venter på feedback
 Answered=Besvaret
 Waiting=Venter
 Closed=Lukket
@@ -160,7 +162,7 @@ CreatedBy=Lavet af
 NewTicket=Ny opgave
 SubjectAnswerToTicket=Opgave svar
 TicketTypeRequest=Anmodningstype
-TicketCategory=Gruppe
+TicketCategory=Billetkategorisering
 SeeTicket=Se opgave
 TicketMarkedAsRead=Opgaven er blevet markeret som læst
 TicketReadOn=Læs videre
@@ -211,6 +213,7 @@ TicketMessageHelp=Kun denne tekst gemmes i meddelelseslisten på billetkort.
 TicketMessageSubstitutionReplacedByGenericValues=Substitutionsvariabler erstattes af generiske værdier.
 TimeElapsedSince=Tid forløbet siden
 TicketTimeToRead=Tid forløbet før læst
+TicketTimeElapsedBeforeSince=Forløbet tid før / siden
 TicketContacts=Kontakter billet
 TicketDocumentsLinked=Dokumenter knyttet til opgaven
 ConfirmReOpenTicket=Bekræft genåbne denne opgave?
diff --git a/htdocs/langs/de_AT/admin.lang b/htdocs/langs/de_AT/admin.lang
index 34368689cf1..084f4086695 100644
--- a/htdocs/langs/de_AT/admin.lang
+++ b/htdocs/langs/de_AT/admin.lang
@@ -148,6 +148,7 @@ LDAPSynchronization=LDAP Synchronisierung
 LDAPFunctionsNotAvailableOnPHP=LDAP Funktionen nicht verfügbar in Deinem PHP
 LDAPFieldFullname=vollständiger Name
 ClickToDialSetup=Click-to-Dial-Moduleinstellungen
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 MailToSendShipment=Sendungen
 MailToSendIntervention=Eingriffe
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
diff --git a/htdocs/langs/de_AT/salaries.lang b/htdocs/langs/de_AT/salaries.lang
new file mode 100644
index 00000000000..c9bd3bec17b
--- /dev/null
+++ b/htdocs/langs/de_AT/salaries.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - salaries
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
diff --git a/htdocs/langs/de_AT/users.lang b/htdocs/langs/de_AT/users.lang
index 271a945e1f3..80a15bddaf3 100644
--- a/htdocs/langs/de_AT/users.lang
+++ b/htdocs/langs/de_AT/users.lang
@@ -5,3 +5,5 @@ PasswordChangedAndSentTo=Passwort geändert und an <b>%s</b> gesandt.
 PasswordChangeRequestSent=Antrag auf eine Änderung das Passworts für <b>%s</b> an <b>%s</b> gesandt.
 LinkedToDolibarrUser=Mit Systembenutzer verknüpfen
 LinkedToDolibarrThirdParty=Mit Partner verknüpfen
+NbOfUsers=No. of users
+NbOfPermissions=No. of permissions
diff --git a/htdocs/langs/de_AT/website.lang b/htdocs/langs/de_AT/website.lang
new file mode 100644
index 00000000000..910cff6b702
--- /dev/null
+++ b/htdocs/langs/de_AT/website.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - website
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
diff --git a/htdocs/langs/de_CH/website.lang b/htdocs/langs/de_CH/website.lang
index 8504c7c5535..687f5a43d7d 100644
--- a/htdocs/langs/de_CH/website.lang
+++ b/htdocs/langs/de_CH/website.lang
@@ -5,6 +5,7 @@ WEBSITE_TYPE_CONTAINER=Seiten - / Containertyp
 WEBSITE_PAGE_EXAMPLE=Webseite als Vorlage benutzen
 WEBSITE_ALIASALT=Zusätzliche Seitennamen / Aliase
 WEBSITE_CSS_URL=URL zu externer CSS Datei
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 ViewSiteInNewTab=Webauftritt in neuem Tab anzeigen
 SetAsHomePage=Als Startseite definieren
 WebsiteAccounts=Webseitenkonten
diff --git a/htdocs/langs/de_DE/deliveries.lang b/htdocs/langs/de_DE/deliveries.lang
index c3c906b07e4..e2b3395ea88 100644
--- a/htdocs/langs/de_DE/deliveries.lang
+++ b/htdocs/langs/de_DE/deliveries.lang
@@ -30,3 +30,4 @@ NonShippable=Nicht versandfertig
 ShowShippableStatus=Versandstatus anzeigen
 ShowReceiving=Zustellbestätigung anzeigen
 NonExistentOrder=Auftrag existiert nicht
+StockQuantitiesAlreadyAllocatedOnPreviousLines = Stock quantities already allocated on previous lines
diff --git a/htdocs/langs/de_DE/exports.lang b/htdocs/langs/de_DE/exports.lang
index 911f2646c68..4afed3a9e25 100644
--- a/htdocs/langs/de_DE/exports.lang
+++ b/htdocs/langs/de_DE/exports.lang
@@ -30,10 +30,10 @@ ExportCsvSeparator=CSV-Trennzeichen
 ImportCsvSeparator=CSV-Trennzeichen
 Step=Schritt
 FormatedImport=Import-Assistent 
-FormatedImportDesc1=Mit diesem Modul können Sie vorhandene Daten aktualisieren oder mithilfe eines Assistenten neue Objekte aus einer Datei in die Datenbank einfügen, ohne über technische Kenntnisse zu verfügen.
+FormatedImportDesc1=Dieses Modul ermöglicht den Import personalisierter Daten mithilfe eines Assistenten.\nTechnische Kenntnisse sind hierbei nicht erforderlich.
 FormatedImportDesc2=Zunächst müssen Sie die Art der zu importierenden Daten, dann das Format der Quelldatei und dann die zu importierenden Felder auswählen.
 FormatedExport=Export-Assistent 
-FormatedExportDesc1=Diese Tools ermöglichen den Export personalisierter Daten mithilfe eines Assistenten, um Sie dabei zu unterstützen, ohne dass technische Kenntnisse erforderlich sind.
+FormatedExportDesc1=Dieses Modul ermöglicht den Export personalisierter Daten mithilfe eines Assistenten.\nTechnische Kenntnisse sind hierbei nicht erforderlich.
 FormatedExportDesc2=Der erste Schritt besteht darin, einen vordefinierten Datensatz auszuwählen und dann anzugeben, welche Felder in welcher Reihenfolge exportiert werden sollen.
 FormatedExportDesc3=Wenn zu exportierende Daten ausgewählt sind, können Sie das Format der Ausgabedatei auswählen.
 Sheet=Blatt
@@ -53,7 +53,8 @@ TypeOfLineServiceOrProduct=Art der Zeile (0=Produkt, 1=Leistung)
 FileWithDataToImport=Datei mit zu importierenden Daten
 FileToImport=Quelldatei für Import
 FileMustHaveOneOfFollowingFormat=Die zu importierende Datei muss eines der folgenden Formate haben
-DownloadEmptyExample=Vorlagendatei mit Feldinhaltsinformationen herunterladen (* sind Pflichtfelder)
+DownloadEmptyExample=Download template file with field content information
+StarAreMandatory=* are mandatory fields
 ChooseFormatOfFileToImport=Wählen Sie das Dateiformat aus, das als Importdateiformat verwendet werden soll, indem Sie auf das Symbol %s klicken, um es auszuwählen ...
 ChooseFileToImport=Datei hochladen und dann auf das Symbol %s klicken, um die Datei als Quell-Importdatei auszuwählen ...
 SourceFileFormat=Quelldateiformat
diff --git a/htdocs/langs/el_CY/admin.lang b/htdocs/langs/el_CY/admin.lang
index 74ee870f906..e2d4c78a52e 100644
--- a/htdocs/langs/el_CY/admin.lang
+++ b/htdocs/langs/el_CY/admin.lang
@@ -1,2 +1,3 @@
 # Dolibarr language file - Source file is en_US - admin
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/el_CY/users.lang b/htdocs/langs/el_CY/users.lang
new file mode 100644
index 00000000000..4a412122b08
--- /dev/null
+++ b/htdocs/langs/el_CY/users.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - users
+NbOfUsers=No. of users
+NbOfPermissions=No. of permissions
diff --git a/htdocs/langs/el_CY/website.lang b/htdocs/langs/el_CY/website.lang
new file mode 100644
index 00000000000..910cff6b702
--- /dev/null
+++ b/htdocs/langs/el_CY/website.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - website
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
diff --git a/htdocs/langs/el_GR/deliveries.lang b/htdocs/langs/el_GR/deliveries.lang
index cdb0fc9be46..5ec67327cf4 100644
--- a/htdocs/langs/el_GR/deliveries.lang
+++ b/htdocs/langs/el_GR/deliveries.lang
@@ -27,5 +27,7 @@ Recipient=Παραλήπτης
 ErrorStockIsNotEnough=Δεν υπάρχει αρκετό απόθεμα
 Shippable=Για Αποστολή
 NonShippable=Δεν αποστέλλονται
+ShowShippableStatus=Show shippable status
 ShowReceiving=Show delivery receipt
 NonExistentOrder=Ανύπαρκτη σειρά
+StockQuantitiesAlreadyAllocatedOnPreviousLines = Stock quantities already allocated on previous lines
diff --git a/htdocs/langs/el_GR/exports.lang b/htdocs/langs/el_GR/exports.lang
index 28459f2238d..d61a2aa3779 100644
--- a/htdocs/langs/el_GR/exports.lang
+++ b/htdocs/langs/el_GR/exports.lang
@@ -53,7 +53,8 @@ TypeOfLineServiceOrProduct=Type of line (0=product, 1=service)
 FileWithDataToImport=File with data to import
 FileToImport=Source file to import
 FileMustHaveOneOfFollowingFormat=Το αρχείο για εισαγωγή πρέπει να έχει μία από τις ακόλουθες μορφές
-DownloadEmptyExample=Λήψη αρχείου προτύπου με πληροφορίες περιεχομένου πεδίου (* είναι υποχρεωτικά πεδία)
+DownloadEmptyExample=Download template file with field content information
+StarAreMandatory=* are mandatory fields
 ChooseFormatOfFileToImport=Επιλέξτε τη μορφή αρχείου που θα χρησιμοποιηθεί ως μορφή αρχείου εισαγωγής κάνοντας κλικ στο εικονίδιο %s για να το επιλέξετε ...
 ChooseFileToImport=Μεταφορτώστε το αρχείο και κάντε κλικ στο εικονίδιο %s για να επιλέξετε αρχείο ως αρχείο εισαγωγής πηγής ...
 SourceFileFormat=Source file format
diff --git a/htdocs/langs/en_AU/admin.lang b/htdocs/langs/en_AU/admin.lang
index 0980facb414..7cac2619318 100644
--- a/htdocs/langs/en_AU/admin.lang
+++ b/htdocs/langs/en_AU/admin.lang
@@ -3,6 +3,7 @@ OldVATRates=Old GST rate
 NewVATRates=New GST rate
 DictionaryVAT=GST Rates or Sales Tax Rates
 OptionVatMode=GST due
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 LinkColor=Colour of links
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/en_AU/salaries.lang b/htdocs/langs/en_AU/salaries.lang
new file mode 100644
index 00000000000..c9bd3bec17b
--- /dev/null
+++ b/htdocs/langs/en_AU/salaries.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - salaries
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
diff --git a/htdocs/langs/en_AU/users.lang b/htdocs/langs/en_AU/users.lang
new file mode 100644
index 00000000000..4a412122b08
--- /dev/null
+++ b/htdocs/langs/en_AU/users.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - users
+NbOfUsers=No. of users
+NbOfPermissions=No. of permissions
diff --git a/htdocs/langs/en_AU/website.lang b/htdocs/langs/en_AU/website.lang
new file mode 100644
index 00000000000..910cff6b702
--- /dev/null
+++ b/htdocs/langs/en_AU/website.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - website
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
diff --git a/htdocs/langs/en_CA/admin.lang b/htdocs/langs/en_CA/admin.lang
index 62dd510c5e0..4f26613c7ae 100644
--- a/htdocs/langs/en_CA/admin.lang
+++ b/htdocs/langs/en_CA/admin.lang
@@ -2,6 +2,7 @@
 LocalTax1Management=PST Management
 CompanyZip=Postal code
 LDAPFieldZip=Postal code
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 FormatZip=Postal code
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/en_CA/salaries.lang b/htdocs/langs/en_CA/salaries.lang
new file mode 100644
index 00000000000..c9bd3bec17b
--- /dev/null
+++ b/htdocs/langs/en_CA/salaries.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - salaries
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
diff --git a/htdocs/langs/en_CA/users.lang b/htdocs/langs/en_CA/users.lang
new file mode 100644
index 00000000000..4a412122b08
--- /dev/null
+++ b/htdocs/langs/en_CA/users.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - users
+NbOfUsers=No. of users
+NbOfPermissions=No. of permissions
diff --git a/htdocs/langs/en_CA/website.lang b/htdocs/langs/en_CA/website.lang
new file mode 100644
index 00000000000..910cff6b702
--- /dev/null
+++ b/htdocs/langs/en_CA/website.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - website
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
diff --git a/htdocs/langs/en_GB/admin.lang b/htdocs/langs/en_GB/admin.lang
index 0ed13e41f0f..fd5b1c3f7df 100644
--- a/htdocs/langs/en_GB/admin.lang
+++ b/htdocs/langs/en_GB/admin.lang
@@ -44,6 +44,7 @@ DictionaryAccountancyJournal=Finance journals
 CompanyZip=Postcode
 LDAPFieldZip=Postcode
 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
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 FormatZip=Postcode
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/en_IN/admin.lang b/htdocs/langs/en_IN/admin.lang
index 4b3c42b80b1..dd7034100a9 100644
--- a/htdocs/langs/en_IN/admin.lang
+++ b/htdocs/langs/en_IN/admin.lang
@@ -13,6 +13,7 @@ ProposalsNumberingModules=Quotation numbering models
 ProposalsPDFModules=Quotation documents models
 FreeLegalTextOnProposal=Free text on quotations
 WatermarkOnDraftProposal=Watermark on draft quotations (none if empty)
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 MailToSendProposal=Customer quotations
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/en_IN/salaries.lang b/htdocs/langs/en_IN/salaries.lang
new file mode 100644
index 00000000000..c9bd3bec17b
--- /dev/null
+++ b/htdocs/langs/en_IN/salaries.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - salaries
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
diff --git a/htdocs/langs/en_IN/users.lang b/htdocs/langs/en_IN/users.lang
new file mode 100644
index 00000000000..4a412122b08
--- /dev/null
+++ b/htdocs/langs/en_IN/users.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - users
+NbOfUsers=No. of users
+NbOfPermissions=No. of permissions
diff --git a/htdocs/langs/en_IN/website.lang b/htdocs/langs/en_IN/website.lang
new file mode 100644
index 00000000000..910cff6b702
--- /dev/null
+++ b/htdocs/langs/en_IN/website.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - website
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
diff --git a/htdocs/langs/en_SG/admin.lang b/htdocs/langs/en_SG/admin.lang
index c1d306ec390..25265594de5 100644
--- a/htdocs/langs/en_SG/admin.lang
+++ b/htdocs/langs/en_SG/admin.lang
@@ -1,3 +1,4 @@
 # Dolibarr language file - Source file is en_US - admin
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/en_SG/salaries.lang b/htdocs/langs/en_SG/salaries.lang
new file mode 100644
index 00000000000..c9bd3bec17b
--- /dev/null
+++ b/htdocs/langs/en_SG/salaries.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - salaries
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
diff --git a/htdocs/langs/en_SG/users.lang b/htdocs/langs/en_SG/users.lang
new file mode 100644
index 00000000000..4a412122b08
--- /dev/null
+++ b/htdocs/langs/en_SG/users.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - users
+NbOfUsers=No. of users
+NbOfPermissions=No. of permissions
diff --git a/htdocs/langs/en_SG/website.lang b/htdocs/langs/en_SG/website.lang
new file mode 100644
index 00000000000..910cff6b702
--- /dev/null
+++ b/htdocs/langs/en_SG/website.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - website
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
diff --git a/htdocs/langs/es_AR/admin.lang b/htdocs/langs/es_AR/admin.lang
index 831d264dea4..2c3e48b8ff6 100644
--- a/htdocs/langs/es_AR/admin.lang
+++ b/htdocs/langs/es_AR/admin.lang
@@ -523,6 +523,7 @@ LDAPFieldCompany=Compañía
 ViewProductDescInFormAbility=Mostrar descripción de productos en formularios (de otro forma es mostrado en una venta emergente tooltip popup)
 Target=Destino
 Sell=Vender
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 PositionIntoComboList=Posición de la línea en las listas de combo
 SellTaxRate=Tasa de impuesto de venta
 RecuperableOnly=Sí, para el IVA "No percibido pero recuperable" dedicado a algún estado de Francia. Mantenga el valor en "No" en todos los demás casos.
diff --git a/htdocs/langs/es_BO/admin.lang b/htdocs/langs/es_BO/admin.lang
index c1d306ec390..25265594de5 100644
--- a/htdocs/langs/es_BO/admin.lang
+++ b/htdocs/langs/es_BO/admin.lang
@@ -1,3 +1,4 @@
 # Dolibarr language file - Source file is en_US - admin
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/es_BO/salaries.lang b/htdocs/langs/es_BO/salaries.lang
new file mode 100644
index 00000000000..c9bd3bec17b
--- /dev/null
+++ b/htdocs/langs/es_BO/salaries.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - salaries
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
diff --git a/htdocs/langs/es_BO/users.lang b/htdocs/langs/es_BO/users.lang
new file mode 100644
index 00000000000..4a412122b08
--- /dev/null
+++ b/htdocs/langs/es_BO/users.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - users
+NbOfUsers=No. of users
+NbOfPermissions=No. of permissions
diff --git a/htdocs/langs/es_BO/website.lang b/htdocs/langs/es_BO/website.lang
new file mode 100644
index 00000000000..910cff6b702
--- /dev/null
+++ b/htdocs/langs/es_BO/website.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - website
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
diff --git a/htdocs/langs/es_CL/exports.lang b/htdocs/langs/es_CL/exports.lang
index d30d032606e..a419b15a966 100644
--- a/htdocs/langs/es_CL/exports.lang
+++ b/htdocs/langs/es_CL/exports.lang
@@ -36,7 +36,6 @@ TypeOfLineServiceOrProduct=Tipo de línea (0 = producto, 1 = servicio)
 FileWithDataToImport=Archivo con datos para importar
 FileToImport=Archivo fuente para importar
 FileMustHaveOneOfFollowingFormat=El archivo a importar debe tener uno de los siguientes formatos.
-DownloadEmptyExample=Descargar archivo de plantilla con información de contenido de campo (* son campos obligatorios)
 ChooseFormatOfFileToImport=Elija el formato de archivo que se usará como formato de archivo de importación haciendo clic en el icono %s para seleccionarlo ...
 SourceFileFormat=Formato de archivo fuente
 FieldsInSourceFile=Campos en el archivo fuente
diff --git a/htdocs/langs/es_CL/main.lang b/htdocs/langs/es_CL/main.lang
index f67ea6b4eee..80f355253ea 100644
--- a/htdocs/langs/es_CL/main.lang
+++ b/htdocs/langs/es_CL/main.lang
@@ -269,6 +269,7 @@ ResultKo=Fracaso
 Reporting=Informes
 Drafts=Borrador
 Opened=Abierto
+OpenAll=Abrir todo)
 ClosedAll=Cerrado (todos)
 Size=tamaño
 Topic=Tema
diff --git a/htdocs/langs/es_CL/products.lang b/htdocs/langs/es_CL/products.lang
index 7795586ce04..f09d02e994c 100644
--- a/htdocs/langs/es_CL/products.lang
+++ b/htdocs/langs/es_CL/products.lang
@@ -127,7 +127,6 @@ PriceByCustomer=Diferentes precios para cada cliente
 PriceCatalogue=Un único precio de venta por producto / servicio
 PricingRule=Reglas para los precios de venta.
 AddCustomerPrice=Agregar precio por cliente
-ForceUpdateChildPriceSoc=Establezca el mismo precio en las subsidiarias de los clientes
 PriceByCustomerLog=Registro de precios anteriores de los clientes
 MinimumPriceLimit=El precio mínimo no puede ser inferior a %s
 PriceExpressionSelected=Expresión de precio seleccionado
diff --git a/htdocs/langs/es_CO/main.lang b/htdocs/langs/es_CO/main.lang
index 26b4e7b349c..0a9505ada84 100644
--- a/htdocs/langs/es_CO/main.lang
+++ b/htdocs/langs/es_CO/main.lang
@@ -155,6 +155,7 @@ NoOpenedElementToProcess=Ningún elemento abierto para procesar
 Categories=Etiquetas / categorías
 Category=Etiqueta / categoría
 ValidatedToProduce=Validado (Para producir)
+OpenAll=Abrir (todo)
 ClosedAll=Cerrado (todo)
 Topic=Tema
 LateDesc=Un elemento se define como Retrasado según la configuración del sistema en el menú Inicio - Configuración - Alertas.
diff --git a/htdocs/langs/es_CO/ticket.lang b/htdocs/langs/es_CO/ticket.lang
index 8d0457e7d49..e194d4fa18f 100644
--- a/htdocs/langs/es_CO/ticket.lang
+++ b/htdocs/langs/es_CO/ticket.lang
@@ -6,17 +6,14 @@ Permission56005=Ver tickets de todos los terceros (no efectivo para usuarios ext
 TicketDictType=Ticket - Tipos
 TicketDictCategory=Entrada - Groupes
 TicketDictSeverity=Ticket - Severidades
-TicketTypeShortISSUE=Problema, error o problema
 MenuTicketMyAssign=Mis entradas
 MenuTicketMyAssignNonClosed=Mis entradas abiertas
 MenuListNonClosed=Entradas abiertas
 TypeContact_ticket_internal_CONTRIBUTOR=Contribuyente
 TypeContact_ticket_external_SUPPORTCLI=Contacto con el cliente / seguimiento de incidentes
 TypeContact_ticket_external_CONTRIBUTOR=Colaborador externo
-OriginEmail=Fuente de correo electrónico
 Notify_TICKET_SENTBYMAIL=Enviar mensaje de ticket por correo electrónico
 Read=Leer
-NeedMoreInformation=Esperando información
 Waiting=Esperando
 Type=Tipo
 MailToSendTicketMessage=Para enviar correo electrónico desde el mensaje del ticket
diff --git a/htdocs/langs/es_CO/users.lang b/htdocs/langs/es_CO/users.lang
index b6c1a01ffe9..f0ab77f3da1 100644
--- a/htdocs/langs/es_CO/users.lang
+++ b/htdocs/langs/es_CO/users.lang
@@ -1,2 +1,4 @@
 # Dolibarr language file - Source file is en_US - users
 MenuUsersAndGroups=Usuarios y Grupos
+NbOfUsers=No. of users
+NbOfPermissions=No. of permissions
diff --git a/htdocs/langs/es_CO/website.lang b/htdocs/langs/es_CO/website.lang
new file mode 100644
index 00000000000..910cff6b702
--- /dev/null
+++ b/htdocs/langs/es_CO/website.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - website
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
diff --git a/htdocs/langs/es_DO/admin.lang b/htdocs/langs/es_DO/admin.lang
index 6dbaf311a2a..81c0cd3e1a0 100644
--- a/htdocs/langs/es_DO/admin.lang
+++ b/htdocs/langs/es_DO/admin.lang
@@ -7,5 +7,6 @@ Permission93=Eliminar impuestos e ITBIS
 DictionaryVAT=Tasa de ITBIS (Impuesto sobre ventas en EEUU)
 UnitPriceOfProduct=Precio unitario sin ITBIS de un producto
 OptionVatMode=Opción de carga de ITBIS
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/es_DO/salaries.lang b/htdocs/langs/es_DO/salaries.lang
new file mode 100644
index 00000000000..c9bd3bec17b
--- /dev/null
+++ b/htdocs/langs/es_DO/salaries.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - salaries
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
diff --git a/htdocs/langs/es_DO/users.lang b/htdocs/langs/es_DO/users.lang
new file mode 100644
index 00000000000..4a412122b08
--- /dev/null
+++ b/htdocs/langs/es_DO/users.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - users
+NbOfUsers=No. of users
+NbOfPermissions=No. of permissions
diff --git a/htdocs/langs/es_DO/website.lang b/htdocs/langs/es_DO/website.lang
new file mode 100644
index 00000000000..910cff6b702
--- /dev/null
+++ b/htdocs/langs/es_DO/website.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - website
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
diff --git a/htdocs/langs/es_EC/exports.lang b/htdocs/langs/es_EC/exports.lang
index b1f9927f4d1..87bb1574d61 100644
--- a/htdocs/langs/es_EC/exports.lang
+++ b/htdocs/langs/es_EC/exports.lang
@@ -36,7 +36,6 @@ TypeOfLineServiceOrProduct=Tipo de línea (0 = producto, 1 = servicio)
 FileWithDataToImport=Archivo con datos para importar
 FileToImport=Archivo de origen para importar
 FileMustHaveOneOfFollowingFormat=El archivo a importar debe tener uno de los siguientes formatos.
-DownloadEmptyExample=Descargar archivo de plantilla con información de contenido de campo (* son campos obligatorios)
 ChooseFormatOfFileToImport=Elija el formato de archivo para usar como formato de archivo de importación haciendo clic en el icono %s para seleccionarlo ...
 SourceFileFormat=Formato del archivo fuente
 FieldsInSourceFile=Campos del archivo de origen
diff --git a/htdocs/langs/es_EC/main.lang b/htdocs/langs/es_EC/main.lang
index bf25355ae9c..66619747638 100644
--- a/htdocs/langs/es_EC/main.lang
+++ b/htdocs/langs/es_EC/main.lang
@@ -276,6 +276,7 @@ ResultKo=Fallo
 Reporting=Informes
 Validated=validado
 Opened=Abierto
+OpenAll=Abrir (todo)
 ClosedAll=Cerrado (todos)
 Topic=Tema
 ByCompanies=Por cliente
diff --git a/htdocs/langs/es_EC/ticket.lang b/htdocs/langs/es_EC/ticket.lang
index de9e0c92141..4e80f1e8378 100644
--- a/htdocs/langs/es_EC/ticket.lang
+++ b/htdocs/langs/es_EC/ticket.lang
@@ -4,15 +4,12 @@ Permission56005=Vea los tickets de todos los cliente/proveedor (no es efectivo p
 TicketDictType=Tipos - Tickets
 TicketDictCategory=Ticket - Grupos
 TicketDictSeverity=Ticket - Prioridades
-TicketTypeShortISSUE=Problema o Error
 ErrorBadEmailAddress=Campo '%s' incorrecto
 MenuListNonClosed=Tikests abiertos
 TypeContact_ticket_internal_CONTRIBUTOR=Contribuyente
 TypeContact_ticket_external_SUPPORTCLI=Contacto con el cliente / seguimiento de incidentes
-OriginEmail=Origen del correo electrónico
 Notify_TICKET_SENTBYMAIL=Enviar mensaje del ticket por correo electrónico
 Read=Leer
-NeedMoreInformation=Esperando información
 Waiting=Esperando
 Type=Tipo
 MailToSendTicketMessage=Para enviar un correo electrónico desde un ticket
diff --git a/htdocs/langs/es_ES/accountancy.lang b/htdocs/langs/es_ES/accountancy.lang
index 67422fcdc78..dfdb3fd42b7 100644
--- a/htdocs/langs/es_ES/accountancy.lang
+++ b/htdocs/langs/es_ES/accountancy.lang
@@ -48,7 +48,8 @@ CountriesNotInEEC=Países no incluidos en la CEE
 CountriesInEECExceptMe=Países en la CEE excepto %s
 CountriesExceptMe=Todos los países excepto %s
 AccountantFiles=Exportar documentos de origen
-ExportAccountingSourceDocHelp=Con esta herramienta, puede exportar los eventos de origen (lista y PDF) que se utilizaron para generar su contabilidad. Para exportar sus diarios, use la entrada de menú %s - %s.
+ExportAccountingSourceDocHelp=Con esta herramienta, puede exportar los eventos de origen (lista en CSV y PDF) que se utilizaron para generar su contabilidad.
+ExportAccountingSourceDocHelp2=Para exportar sus diarios, use la entrada de menú %s - %s.
 VueByAccountAccounting=Ver por cuenta contable
 VueBySubAccountAccounting=Ver por subcuenta contable
 
@@ -328,9 +329,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Deshabilitar la vinculación y transfere
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Desactive la vinculación y transferencia en contabilidad en informes de gastos (los informes de gastos no se tendrán en cuenta en la contabilidad)
 
 ## Export
-NotifiedExportDate=Notified export date (modification of the entries will not be possible)
-NotifiedValidationDate=Validation of the entries (modification or deletion of the entries will not be possible)
-ConfirmExportFile=Confirmation of the generation of the accounting export file ?
+NotifiedExportDate=Fecha de exportación notificada (no será posible modificar las entradas)
+NotifiedValidationDate=Validación de las entradas (no será posible modificar o eliminar las entradas)
+ConfirmExportFile=¿Confirmación de la generación del archivo de exportación contable?
 ExportDraftJournal=Exportar libro borrador
 Modelcsv=Modelo de exportación
 Selectmodelcsv=Seleccione un modelo de exportación
diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang
index 6071cf40a9c..9dcd8620ca1 100644
--- a/htdocs/langs/es_ES/admin.lang
+++ b/htdocs/langs/es_ES/admin.lang
@@ -562,7 +562,7 @@ Module53Desc=Gestión de servicios
 Module54Name=Contratos/Suscripciones
 Module54Desc=Gestión de contratos (servicios o suscripciones recurrentes)
 Module55Name=Códigos de barras
-Module55Desc=Barcode or QR code management
+Module55Desc=Gestión de códigos de barras o códigos QR
 Module56Name=Pago por transferencia bancaria
 Module56Desc=Gestión de pagos a proveedores mediante órdenes de transferencia bancaria. Incluye la generación de archivos SEPA para países europeos.
 Module57Name=Pagos por domiciliación bancaria
@@ -849,10 +849,10 @@ Permission402=Crear/modificar haberes
 Permission403=Validar haberes
 Permission404=Eliminar haberes
 Permission430=Usa barra de debug
-Permission511=Read salaries and payments (yours and subordinates)
-Permission512=Create/modify salaries and payments
-Permission514=Delete salaries and payments
-Permission517=Read salaries and payments everybody
+Permission511=Leer salarios y pagos (suyos y subordinados)
+Permission512=Crear / modificar salarios y pagos
+Permission514=Eliminar salarios y pagos
+Permission517=Leer sueldos y pagos de todos
 Permission519=Exportar salarios
 Permission520=Consultar Créditos
 Permission522=Crear/modificar Créditos
@@ -2144,3 +2144,4 @@ YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=Habilitó la API WS obsoleta. En su
 RandomlySelectedIfSeveral=Seleccionado aleatoriamente si hay varias imágenes disponibles
 DatabasePasswordObfuscated=La contraseña de la base de datos está oculta en el archivo conf
 DatabasePasswordNotObfuscated=La contraseña de la base de datos NO está oculta en el archivo conf
+APIsAreNotEnabled=Los módulos de API no están habilitados
diff --git a/htdocs/langs/es_ES/deliveries.lang b/htdocs/langs/es_ES/deliveries.lang
index f766e2d6734..e7778831157 100644
--- a/htdocs/langs/es_ES/deliveries.lang
+++ b/htdocs/langs/es_ES/deliveries.lang
@@ -30,3 +30,4 @@ NonShippable=No enviable
 ShowShippableStatus=Mostrar estado del envío
 ShowReceiving=Mostrar nota de recepción
 NonExistentOrder=Pedido inexistente
+StockQuantitiesAlreadyAllocatedOnPreviousLines = Cantidades de stock ya asignadas en líneas anteriores
diff --git a/htdocs/langs/es_ES/errors.lang b/htdocs/langs/es_ES/errors.lang
index 3528cd3411d..2f59947aba4 100644
--- a/htdocs/langs/es_ES/errors.lang
+++ b/htdocs/langs/es_ES/errors.lang
@@ -11,7 +11,7 @@ ErrorBadValueForParamNotAString=Valor incorrecto para su parámetro. Generalment
 ErrorRefAlreadyExists=La referencia <b>%s</b> ya existe.
 ErrorLoginAlreadyExists=El login %s ya existe.
 ErrorGroupAlreadyExists=El grupo %s ya existe.
-ErrorEmailAlreadyExists=Email %s already exists.
+ErrorEmailAlreadyExists=El correo electrónico %s ya existe.
 ErrorRecordNotFound=Registro no encontrado
 ErrorFailToCopyFile=Error al copiar el archivo '<b>%s</b>' en '<b>%s</b>'.
 ErrorFailToCopyDir=Error al copiar el directorio  '<b>%s</b>' en '<b>%s</b>'.
diff --git a/htdocs/langs/es_ES/exports.lang b/htdocs/langs/es_ES/exports.lang
index 9a0e7decd49..9efcdbaae44 100644
--- a/htdocs/langs/es_ES/exports.lang
+++ b/htdocs/langs/es_ES/exports.lang
@@ -53,7 +53,8 @@ TypeOfLineServiceOrProduct=Tipo de línea (0=producto, 1=servicio)
 FileWithDataToImport=Archivo que contiene los datos a importar
 FileToImport=Archivo origen a importar
 FileMustHaveOneOfFollowingFormat=El archivo de importación debe tener uno de los siguientes formatos
-DownloadEmptyExample=Descargar una plantilla con la información de los contenidos de los campos (los marcados con * son obligatorios)
+DownloadEmptyExample=Descargar archivo de plantilla con información de contenido de campo
+StarAreMandatory=* son campos obligatorios
 ChooseFormatOfFileToImport=Elija el formato de archivo que desea importar haciendo en la imagen %s para seleccionarlo...
 ChooseFileToImport=Cargue el archivo y luego haga clic en el icono %s para seleccionar el archivo como archivo de importación de origen ...
 SourceFileFormat=Formato del archivo origen
diff --git a/htdocs/langs/es_ES/knowledgemanagement.lang b/htdocs/langs/es_ES/knowledgemanagement.lang
index 3c760eaac50..9a7f688b94b 100644
--- a/htdocs/langs/es_ES/knowledgemanagement.lang
+++ b/htdocs/langs/es_ES/knowledgemanagement.lang
@@ -37,15 +37,7 @@ About = Acerca de
 KnowledgeManagementAbout = Acerca de la Gestión del Conocimiento
 KnowledgeManagementAboutPage = Gestión del Conocimiento sobre la página
 
-#
-# Sample page
-#
 KnowledgeManagementArea = Gestión del Conocimiento
-
-
-#
-# Menu
-#
 MenuKnowledgeRecord = Base de Conocimientos
 ListKnowledgeRecord = Lista de articulos
 NewKnowledgeRecord = Articulo nuevo
@@ -53,3 +45,5 @@ ValidateReply = Validar solución
 KnowledgeRecords = Artículos
 KnowledgeRecord = Artículo
 KnowledgeRecordExtraFields = Campos adicionales para el artículo
+GroupOfTicket=Grupo de tickets
+YouCanLinkArticleToATicketCategory=Puede vincular un artículo a un grupo de tickets (por lo que el artículo se sugerirá durante la calificación de nuevos tickets)
diff --git a/htdocs/langs/es_ES/languages.lang b/htdocs/langs/es_ES/languages.lang
index 1a3480bec23..88bd2e399a0 100644
--- a/htdocs/langs/es_ES/languages.lang
+++ b/htdocs/langs/es_ES/languages.lang
@@ -4,6 +4,7 @@ Language_ar_AR=Árabe
 Language_ar_EG=Árabe (Egipto)
 Language_ar_SA=Árabe
 Language_ar_TN=Árabe (Túnez)
+Language_ar_IQ=Árabe (Irak)
 Language_az_AZ=Azerbaiyano
 Language_bn_BD=Bengalí
 Language_bn_IN=Bengalí (India)
@@ -83,6 +84,7 @@ Language_ne_NP=Nepalí
 Language_nl_BE=Neerlandés (Bélgica)
 Language_nl_NL=Holandés
 Language_pl_PL=Polaco
+Language_pt_AO=Portugués (Angola)
 Language_pt_BR=Portugués (Brasil)
 Language_pt_PT=Portugués
 Language_ro_MD=Rumano (Moldavia)
diff --git a/htdocs/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang
index 151b6de8f7d..9fd6092f046 100644
--- a/htdocs/langs/es_ES/main.lang
+++ b/htdocs/langs/es_ES/main.lang
@@ -730,7 +730,7 @@ MenuMembers=Miembros
 MenuAgendaGoogle=Agenda Google
 MenuTaxesAndSpecialExpenses=Impuestos | Gastos especiales
 ThisLimitIsDefinedInSetup=Límite Dolibarr (Menú inicio-configuración-seguridad): %s Kb, PHP limit: %s Kb
-ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
+ThisLimitIsDefinedInSetupAt=Límite Dolibarr (Menú %s): %s Kb, Límite PHP (Param %s): %s Kb
 NoFileFound=No se cargaron documentos
 CurrentUserLanguage=Idioma actual
 CurrentTheme=Tema actual
@@ -1136,4 +1136,4 @@ CategTypeNotFound=No se encontró ningún tipo de etiqueta para el tipo de regis
 CopiedToClipboard=Copiado al portapapeles
 InformationOnLinkToContract=Esta cantidad es solo el total de todas las líneas del contrato. No se toma en consideración ninguna noción de tiempo.
 ConfirmCancel=Estas seguro que quieres cancelar
-EmailMsgID=Email MsgID
+EmailMsgID=MsgID de correo electrónico
diff --git a/htdocs/langs/es_ES/products.lang b/htdocs/langs/es_ES/products.lang
index 521840692ad..06c1af87189 100644
--- a/htdocs/langs/es_ES/products.lang
+++ b/htdocs/langs/es_ES/products.lang
@@ -277,7 +277,7 @@ PriceByCustomer=Cambiar precios para cada cliente
 PriceCatalogue=Un precio único de venta por producto/servicio
 PricingRule=Reglas para precios de venta
 AddCustomerPrice=Añadir precio a cliente
-ForceUpdateChildPriceSoc=Establecer el mismo precio en las filiales de los clientes
+ForceUpdateChildPriceSoc=Establecer el mismo precio en las subsidiarias del cliente
 PriceByCustomerLog=Historial de precios a clientes
 MinimumPriceLimit=El precio mínimo no puede ser menor que %s
 MinimumRecommendedPrice=El precio mínimo recomendado es: %s
@@ -296,6 +296,7 @@ ComposedProductIncDecStock=Incrementar/Decrementar stock al cambiar su padre
 ComposedProduct=Sub-producto
 MinSupplierPrice=Precio mínimo de compra
 MinCustomerPrice=Precio de venta mínimo
+NoDynamicPrice=Sin precio dinámico
 DynamicPriceConfiguration=Configuración de precio dinámico
 DynamicPriceDesc=Puede establecer funciones matemáticas para calcular los precios de cliente o proveedor. Esta función puede utilizar todos los operadores matemáticos, algunas constantes y variables. Puede definir aquí las variables que desea utilizar y si la variable necesita una actualización automática, la URL externa que debe utilizarse para pedirle a Dolibarr que actualice automáticamente el valor.
 AddVariable=Añadir variable
diff --git a/htdocs/langs/es_ES/stocks.lang b/htdocs/langs/es_ES/stocks.lang
index 51c70a2409b..fa6354bcf4f 100644
--- a/htdocs/langs/es_ES/stocks.lang
+++ b/htdocs/langs/es_ES/stocks.lang
@@ -60,7 +60,7 @@ EnhancedValueOfWarehouses=Valor de stocks
 UserWarehouseAutoCreate=Crear automáticamente existencias/almacén propio del usuario en la creación del usuario
 AllowAddLimitStockByWarehouse=Administrar también el valor del stock mínimo y deseado de la cupla (producto-almacén) además del valor del stock mínimo y deseado por producto
 RuleForWarehouse=Regla para almacenes
-WarehouseAskWarehouseOnThirparty=Establecer un almacén en un tercero
+WarehouseAskWarehouseOnThirparty=Establecer un almacén en terceros
 WarehouseAskWarehouseDuringPropal=Establecer un almacén en presupuestos comerciales
 WarehouseAskWarehouseDuringOrder=Indicar un almacén en pedidos de clientes
 UserDefaultWarehouse=Indicar un almacén en usuarios
@@ -167,8 +167,8 @@ MovementTransferStock=Transferencia de stock del producto %s a otro almacén
 InventoryCodeShort=Código Inv./Mov.
 NoPendingReceptionOnSupplierOrder=No existen recepciones pendientes ya que el pedido está abierto
 ThisSerialAlreadyExistWithDifferentDate=Este número de lote/serie  (<strong>%s</strong>) ya existe, pero con una fecha de caducidad o venta diferente (encontrada <strong>%s</strong> pero ha introducido <strong>%s</strong>).
-OpenAll=Abierto para todas las acciones
-OpenInternal=Abierto para acciones internas
+OpenAnyMovement=Abierto (todo movimiento)
+OpenInternal=Abierto (solo movimiento interno)
 UseDispatchStatus=Utilice un estado  (aprobar/rechazar) para las líneas de las recepciones de los pedidos a proveedor
 OptionMULTIPRICESIsOn=La opción "varios precios por segmento" está activada. Esto significa que un producto tiene varios precio de venta, por lo que el valor de venta no puede calcularse
 ProductStockWarehouseCreated=Límite stock para alertas y stock óptimo deseado creado correctamente
diff --git a/htdocs/langs/es_ES/ticket.lang b/htdocs/langs/es_ES/ticket.lang
index c022e7d79a9..9385e5cf360 100644
--- a/htdocs/langs/es_ES/ticket.lang
+++ b/htdocs/langs/es_ES/ticket.lang
@@ -34,7 +34,8 @@ TicketDictResolution=Ticket - Resolución
 
 TicketTypeShortCOM=Pregunta comercial
 TicketTypeShortHELP=Solicitud de ayuda funcional
-TicketTypeShortISSUE=Asunto, error o problema
+TicketTypeShortISSUE=Problema o error
+TicketTypeShortPROBLEM=Problema
 TicketTypeShortREQUEST=Solicitud de cambio o mejora
 TicketTypeShortPROJET=Proyecto
 TicketTypeShortOTHER=Otro
@@ -54,14 +55,15 @@ TypeContact_ticket_internal_SUPPORTTEC=Usuario asignado
 TypeContact_ticket_external_SUPPORTCLI=Contacto cliente / seguimiento de incidentes
 TypeContact_ticket_external_CONTRIBUTOR=Contribuidor externo
 
-OriginEmail=Origen E-Mail
+OriginEmail=Remitente de correo electrónico
 Notify_TICKET_SENTBYMAIL=Enviar mensaje de ticket por e-mail
 
 # Status
 Read=Leido
 Assigned=Asignado
 InProgress=En progreso
-NeedMoreInformation=En espera de información
+NeedMoreInformation=Esperando comentarios del remitente
+NeedMoreInformationShort=Esperando comentarios
 Answered=Contestado
 Waiting=En espera
 Closed=Cerrado
@@ -160,7 +162,7 @@ CreatedBy=Creado por
 NewTicket=Nuevo ticket
 SubjectAnswerToTicket=Respuesta
 TicketTypeRequest=Tipo de solicitud
-TicketCategory=Grupo
+TicketCategory=Categorización de tickets
 SeeTicket=Ver ticket
 TicketMarkedAsRead=El ticket ha sido marcado como leído
 TicketReadOn=Leído el
@@ -211,6 +213,7 @@ TicketMessageHelp=Solo este texto se guardará en la lista de mensajes en la fic
 TicketMessageSubstitutionReplacedByGenericValues=Las variables de sustitución se reemplazan por valores genéricos.
 TimeElapsedSince=Tiempo transcurrido desde
 TicketTimeToRead=Tiempo transcurrido antes de leer el ticket
+TicketTimeElapsedBeforeSince=Tiempo transcurrido antes / desde
 TicketContacts=Contactos del ticket
 TicketDocumentsLinked=Documentos relacionados con el ticket
 ConfirmReOpenTicket=¿Está seguro de querer reabrir este ticket?
diff --git a/htdocs/langs/es_GT/admin.lang b/htdocs/langs/es_GT/admin.lang
index c1d306ec390..25265594de5 100644
--- a/htdocs/langs/es_GT/admin.lang
+++ b/htdocs/langs/es_GT/admin.lang
@@ -1,3 +1,4 @@
 # Dolibarr language file - Source file is en_US - admin
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/es_GT/salaries.lang b/htdocs/langs/es_GT/salaries.lang
new file mode 100644
index 00000000000..c9bd3bec17b
--- /dev/null
+++ b/htdocs/langs/es_GT/salaries.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - salaries
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
diff --git a/htdocs/langs/es_GT/users.lang b/htdocs/langs/es_GT/users.lang
new file mode 100644
index 00000000000..4a412122b08
--- /dev/null
+++ b/htdocs/langs/es_GT/users.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - users
+NbOfUsers=No. of users
+NbOfPermissions=No. of permissions
diff --git a/htdocs/langs/es_GT/website.lang b/htdocs/langs/es_GT/website.lang
new file mode 100644
index 00000000000..910cff6b702
--- /dev/null
+++ b/htdocs/langs/es_GT/website.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - website
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
diff --git a/htdocs/langs/es_HN/admin.lang b/htdocs/langs/es_HN/admin.lang
index c1d306ec390..25265594de5 100644
--- a/htdocs/langs/es_HN/admin.lang
+++ b/htdocs/langs/es_HN/admin.lang
@@ -1,3 +1,4 @@
 # Dolibarr language file - Source file is en_US - admin
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/es_HN/salaries.lang b/htdocs/langs/es_HN/salaries.lang
new file mode 100644
index 00000000000..c9bd3bec17b
--- /dev/null
+++ b/htdocs/langs/es_HN/salaries.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - salaries
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
diff --git a/htdocs/langs/es_HN/users.lang b/htdocs/langs/es_HN/users.lang
new file mode 100644
index 00000000000..4a412122b08
--- /dev/null
+++ b/htdocs/langs/es_HN/users.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - users
+NbOfUsers=No. of users
+NbOfPermissions=No. of permissions
diff --git a/htdocs/langs/es_HN/website.lang b/htdocs/langs/es_HN/website.lang
new file mode 100644
index 00000000000..910cff6b702
--- /dev/null
+++ b/htdocs/langs/es_HN/website.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - website
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
diff --git a/htdocs/langs/es_MX/users.lang b/htdocs/langs/es_MX/users.lang
index ddd9b610db2..217c37db5fe 100644
--- a/htdocs/langs/es_MX/users.lang
+++ b/htdocs/langs/es_MX/users.lang
@@ -11,3 +11,5 @@ DisableAUser=Deshabilitar un usuario
 EnableAUser=Habilitar un usuario
 LastName=Apellido
 FirstName=Nombre(s)
+NbOfUsers=No. of users
+NbOfPermissions=No. of permissions
diff --git a/htdocs/langs/es_PA/admin.lang b/htdocs/langs/es_PA/admin.lang
index f0c05a924c9..01d1912f886 100644
--- a/htdocs/langs/es_PA/admin.lang
+++ b/htdocs/langs/es_PA/admin.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - admin
 VersionUnknown=Desconocido
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/es_PA/salaries.lang b/htdocs/langs/es_PA/salaries.lang
new file mode 100644
index 00000000000..c9bd3bec17b
--- /dev/null
+++ b/htdocs/langs/es_PA/salaries.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - salaries
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
diff --git a/htdocs/langs/es_PA/users.lang b/htdocs/langs/es_PA/users.lang
new file mode 100644
index 00000000000..4a412122b08
--- /dev/null
+++ b/htdocs/langs/es_PA/users.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - users
+NbOfUsers=No. of users
+NbOfPermissions=No. of permissions
diff --git a/htdocs/langs/es_PA/website.lang b/htdocs/langs/es_PA/website.lang
new file mode 100644
index 00000000000..910cff6b702
--- /dev/null
+++ b/htdocs/langs/es_PA/website.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - website
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
diff --git a/htdocs/langs/es_PE/admin.lang b/htdocs/langs/es_PE/admin.lang
index 6ab8ad59b97..80e43a5bb33 100644
--- a/htdocs/langs/es_PE/admin.lang
+++ b/htdocs/langs/es_PE/admin.lang
@@ -8,6 +8,7 @@ Permission93=Eliminar impuestos e IGV
 DictionaryVAT=Tasa de IGV o tasa de impuesto a las ventas
 UnitPriceOfProduct=Precio unitario sin IGV de un producto
 OptionVatMode=IGV adeudado
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 MailToSendInvoice=Facturas de Clientes
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/es_PE/users.lang b/htdocs/langs/es_PE/users.lang
index 185c0f9f101..c25a9be3f4e 100644
--- a/htdocs/langs/es_PE/users.lang
+++ b/htdocs/langs/es_PE/users.lang
@@ -2,3 +2,5 @@
 DisableUser=Inhabilitar
 DeleteUser=Borrar
 DeleteGroup=Borrar
+NbOfUsers=No. of users
+NbOfPermissions=No. of permissions
diff --git a/htdocs/langs/es_PY/admin.lang b/htdocs/langs/es_PY/admin.lang
index c1d306ec390..25265594de5 100644
--- a/htdocs/langs/es_PY/admin.lang
+++ b/htdocs/langs/es_PY/admin.lang
@@ -1,3 +1,4 @@
 # Dolibarr language file - Source file is en_US - admin
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/es_PY/salaries.lang b/htdocs/langs/es_PY/salaries.lang
new file mode 100644
index 00000000000..c9bd3bec17b
--- /dev/null
+++ b/htdocs/langs/es_PY/salaries.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - salaries
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
diff --git a/htdocs/langs/es_PY/users.lang b/htdocs/langs/es_PY/users.lang
new file mode 100644
index 00000000000..4a412122b08
--- /dev/null
+++ b/htdocs/langs/es_PY/users.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - users
+NbOfUsers=No. of users
+NbOfPermissions=No. of permissions
diff --git a/htdocs/langs/es_PY/website.lang b/htdocs/langs/es_PY/website.lang
new file mode 100644
index 00000000000..910cff6b702
--- /dev/null
+++ b/htdocs/langs/es_PY/website.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - website
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
diff --git a/htdocs/langs/es_US/admin.lang b/htdocs/langs/es_US/admin.lang
index c1d306ec390..25265594de5 100644
--- a/htdocs/langs/es_US/admin.lang
+++ b/htdocs/langs/es_US/admin.lang
@@ -1,3 +1,4 @@
 # Dolibarr language file - Source file is en_US - admin
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/es_US/salaries.lang b/htdocs/langs/es_US/salaries.lang
new file mode 100644
index 00000000000..c9bd3bec17b
--- /dev/null
+++ b/htdocs/langs/es_US/salaries.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - salaries
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
diff --git a/htdocs/langs/es_US/users.lang b/htdocs/langs/es_US/users.lang
new file mode 100644
index 00000000000..4a412122b08
--- /dev/null
+++ b/htdocs/langs/es_US/users.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - users
+NbOfUsers=No. of users
+NbOfPermissions=No. of permissions
diff --git a/htdocs/langs/es_US/website.lang b/htdocs/langs/es_US/website.lang
new file mode 100644
index 00000000000..910cff6b702
--- /dev/null
+++ b/htdocs/langs/es_US/website.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - website
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
diff --git a/htdocs/langs/es_UY/admin.lang b/htdocs/langs/es_UY/admin.lang
index c1d306ec390..25265594de5 100644
--- a/htdocs/langs/es_UY/admin.lang
+++ b/htdocs/langs/es_UY/admin.lang
@@ -1,3 +1,4 @@
 # Dolibarr language file - Source file is en_US - admin
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/es_UY/salaries.lang b/htdocs/langs/es_UY/salaries.lang
new file mode 100644
index 00000000000..c9bd3bec17b
--- /dev/null
+++ b/htdocs/langs/es_UY/salaries.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - salaries
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
diff --git a/htdocs/langs/es_UY/users.lang b/htdocs/langs/es_UY/users.lang
new file mode 100644
index 00000000000..4a412122b08
--- /dev/null
+++ b/htdocs/langs/es_UY/users.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - users
+NbOfUsers=No. of users
+NbOfPermissions=No. of permissions
diff --git a/htdocs/langs/es_UY/website.lang b/htdocs/langs/es_UY/website.lang
new file mode 100644
index 00000000000..910cff6b702
--- /dev/null
+++ b/htdocs/langs/es_UY/website.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - website
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
diff --git a/htdocs/langs/es_VE/admin.lang b/htdocs/langs/es_VE/admin.lang
index 271cb2be3a5..3eaf5ae876c 100644
--- a/htdocs/langs/es_VE/admin.lang
+++ b/htdocs/langs/es_VE/admin.lang
@@ -30,5 +30,6 @@ WatermarkOnDraftSupplierProposal=Marca de agua en solicitudes de precios a prove
 LDAPMemberObjectClassListExample=Lista de ObjectClass que definen los atributos de un registro (ej: top,inetOrgPerson o top,user for active directory)
 LDAPUserObjectClassListExample=Lista de ObjectClass que definen los atributos de un registro (ej: top,inetOrgPerson o top,user for active directory)
 LDAPContactObjectClassListExample=Lista de objectClass que definen los atributos de un registro (ej: top,inetOrgPerson o top,user for active directory)
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/es_VE/users.lang b/htdocs/langs/es_VE/users.lang
new file mode 100644
index 00000000000..4a412122b08
--- /dev/null
+++ b/htdocs/langs/es_VE/users.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - users
+NbOfUsers=No. of users
+NbOfPermissions=No. of permissions
diff --git a/htdocs/langs/es_VE/website.lang b/htdocs/langs/es_VE/website.lang
new file mode 100644
index 00000000000..910cff6b702
--- /dev/null
+++ b/htdocs/langs/es_VE/website.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - website
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
diff --git a/htdocs/langs/et_EE/deliveries.lang b/htdocs/langs/et_EE/deliveries.lang
index c08d77986b4..69449b457ca 100644
--- a/htdocs/langs/et_EE/deliveries.lang
+++ b/htdocs/langs/et_EE/deliveries.lang
@@ -27,5 +27,7 @@ Recipient=Vastuvõtja
 ErrorStockIsNotEnough=There's not enough stock
 Shippable=Shippable
 NonShippable=Not Shippable
+ShowShippableStatus=Show shippable status
 ShowReceiving=Show delivery receipt
 NonExistentOrder=Nonexistent order
+StockQuantitiesAlreadyAllocatedOnPreviousLines = Stock quantities already allocated on previous lines
diff --git a/htdocs/langs/et_EE/exports.lang b/htdocs/langs/et_EE/exports.lang
index ed1048c18f3..d3524c6c436 100644
--- a/htdocs/langs/et_EE/exports.lang
+++ b/htdocs/langs/et_EE/exports.lang
@@ -53,7 +53,8 @@ TypeOfLineServiceOrProduct=Rea liik (0=toode, 1=teenus)
 FileWithDataToImport=Imporditavate andmetega fai
 FileToImport=Imporditav lähtefai
 FileMustHaveOneOfFollowingFormat=File to import must have one of following formats
-DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
+DownloadEmptyExample=Download template file with field content information
+StarAreMandatory=* are mandatory fields
 ChooseFormatOfFileToImport=Choose the file format to use as import file format by clicking on the %s icon to select it...
 ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
 SourceFileFormat=Lähtefaili formaat
diff --git a/htdocs/langs/eu_ES/deliveries.lang b/htdocs/langs/eu_ES/deliveries.lang
index 1f48c01de75..cd8a36e6c70 100644
--- a/htdocs/langs/eu_ES/deliveries.lang
+++ b/htdocs/langs/eu_ES/deliveries.lang
@@ -27,5 +27,7 @@ Recipient=Recipient
 ErrorStockIsNotEnough=There's not enough stock
 Shippable=Shippable
 NonShippable=Not Shippable
+ShowShippableStatus=Show shippable status
 ShowReceiving=Show delivery receipt
 NonExistentOrder=Nonexistent order
+StockQuantitiesAlreadyAllocatedOnPreviousLines = Stock quantities already allocated on previous lines
diff --git a/htdocs/langs/eu_ES/exports.lang b/htdocs/langs/eu_ES/exports.lang
index bcb14df4934..15648132025 100644
--- a/htdocs/langs/eu_ES/exports.lang
+++ b/htdocs/langs/eu_ES/exports.lang
@@ -53,7 +53,8 @@ TypeOfLineServiceOrProduct=Type of line (0=product, 1=service)
 FileWithDataToImport=File with data to import
 FileToImport=Source file to import
 FileMustHaveOneOfFollowingFormat=File to import must have one of following formats
-DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
+DownloadEmptyExample=Download template file with field content information
+StarAreMandatory=* are mandatory fields
 ChooseFormatOfFileToImport=Choose the file format to use as import file format by clicking on the %s icon to select it...
 ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
 SourceFileFormat=Source file format
diff --git a/htdocs/langs/fa_IR/deliveries.lang b/htdocs/langs/fa_IR/deliveries.lang
index 9874e159bd4..212ff06390f 100644
--- a/htdocs/langs/fa_IR/deliveries.lang
+++ b/htdocs/langs/fa_IR/deliveries.lang
@@ -27,5 +27,7 @@ Recipient=دریافت کننده
 ErrorStockIsNotEnough=این سهام به اندازه کافی وجود ندارد
 Shippable=حمل و نقلی
 NonShippable=حمل و نقلی نیست
+ShowShippableStatus=Show shippable status
 ShowReceiving=نمایش رسید تحویل
 NonExistentOrder=سفارش ناقص
+StockQuantitiesAlreadyAllocatedOnPreviousLines = Stock quantities already allocated on previous lines
diff --git a/htdocs/langs/fa_IR/exports.lang b/htdocs/langs/fa_IR/exports.lang
index c514c0638f1..d7f97893e3d 100644
--- a/htdocs/langs/fa_IR/exports.lang
+++ b/htdocs/langs/fa_IR/exports.lang
@@ -53,7 +53,8 @@ TypeOfLineServiceOrProduct=نوع سطر (0 = محصول، 1 = خدمات)
 FileWithDataToImport=فایل حاوی داده برای وارد کردن
 FileToImport=فایل منبع برای واردکردن
 FileMustHaveOneOfFollowingFormat=فایلی که وارد می‌شود باید یکی از انواع زیر باشد
-DownloadEmptyExample=دریافت فایل قالب با اطلاعات محتوای بخش‌ها ( * بخش‌های الزامی است)
+DownloadEmptyExample=Download template file with field content information
+StarAreMandatory=* are mandatory fields
 ChooseFormatOfFileToImport=انتخاب نوع فایل برای استفاده به‌عنوان فایل واردات با کلیک بر روی نمادک %s برای انتخاب آن ...
 ChooseFileToImport=فایل را بالاگذاری کرده و سپس روی نشانک %s کلیک کرده تا به‌عنوان فایل منبع واردات استفاده شود.
 SourceFileFormat=نوع فایل منبع
diff --git a/htdocs/langs/fi_FI/deliveries.lang b/htdocs/langs/fi_FI/deliveries.lang
index abae1108dc9..57f53382a71 100644
--- a/htdocs/langs/fi_FI/deliveries.lang
+++ b/htdocs/langs/fi_FI/deliveries.lang
@@ -27,5 +27,7 @@ Recipient=Vastaanottaja
 ErrorStockIsNotEnough=Varaston saldo ei riitä
 Shippable=Toimitettavissa
 NonShippable=Ei toimitettavissa
+ShowShippableStatus=Show shippable status
 ShowReceiving=Näytä lähetyslista
 NonExistentOrder=Tilausta ei ole järjestelmässä
+StockQuantitiesAlreadyAllocatedOnPreviousLines = Stock quantities already allocated on previous lines
diff --git a/htdocs/langs/fi_FI/exports.lang b/htdocs/langs/fi_FI/exports.lang
index 446bb468010..c97b7b37722 100644
--- a/htdocs/langs/fi_FI/exports.lang
+++ b/htdocs/langs/fi_FI/exports.lang
@@ -53,7 +53,8 @@ TypeOfLineServiceOrProduct=Type of line (0= tuotteen, 1= palvelu)
 FileWithDataToImport=Tiedoston tiedot tuoda
 FileToImport=Lähdetiedostoa tuoda
 FileMustHaveOneOfFollowingFormat=File to import must have one of following formats
-DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
+DownloadEmptyExample=Download template file with field content information
+StarAreMandatory=* are mandatory fields
 ChooseFormatOfFileToImport=Choose the file format to use as import file format by clicking on the %s icon to select it...
 ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
 SourceFileFormat=Lähde tiedostomuoto
diff --git a/htdocs/langs/fr_BE/admin.lang b/htdocs/langs/fr_BE/admin.lang
index 5d24a311ccd..96140bd1362 100644
--- a/htdocs/langs/fr_BE/admin.lang
+++ b/htdocs/langs/fr_BE/admin.lang
@@ -17,5 +17,6 @@ IfModuleEnabled=Note: oui ne fonctionne que si le module <b>%s</b> est activé
 Module20Name=Propales
 Module30Name=Factures
 Target=Objectif
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/fr_BE/salaries.lang b/htdocs/langs/fr_BE/salaries.lang
new file mode 100644
index 00000000000..c9bd3bec17b
--- /dev/null
+++ b/htdocs/langs/fr_BE/salaries.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - salaries
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
diff --git a/htdocs/langs/fr_BE/users.lang b/htdocs/langs/fr_BE/users.lang
new file mode 100644
index 00000000000..4a412122b08
--- /dev/null
+++ b/htdocs/langs/fr_BE/users.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - users
+NbOfUsers=No. of users
+NbOfPermissions=No. of permissions
diff --git a/htdocs/langs/fr_BE/website.lang b/htdocs/langs/fr_BE/website.lang
new file mode 100644
index 00000000000..910cff6b702
--- /dev/null
+++ b/htdocs/langs/fr_BE/website.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - website
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
diff --git a/htdocs/langs/fr_CA/admin.lang b/htdocs/langs/fr_CA/admin.lang
index 61a863bf5a2..98e4baf170d 100644
--- a/htdocs/langs/fr_CA/admin.lang
+++ b/htdocs/langs/fr_CA/admin.lang
@@ -177,6 +177,7 @@ OptionVatMode=TPS/TVH due
 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).
 ClickToDialUseTelLink=Utilisez juste un lien "tel: " sur les numéros de téléphone
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 EndPointIs=Les clients SOAP doivent envoyer leurs demandes au point d'extrémité Dolibarr disponible à l'URL
 ApiSetup=Configuration du module API
 ApiDesc=En activant ce module , Dolibarr devenir un serveur REST pour fournir des services Web divers .
diff --git a/htdocs/langs/fr_CA/products.lang b/htdocs/langs/fr_CA/products.lang
index 947742b3356..6e3f9b4042e 100644
--- a/htdocs/langs/fr_CA/products.lang
+++ b/htdocs/langs/fr_CA/products.lang
@@ -120,7 +120,6 @@ ResetBarcodeForAllRecords=Définissez la valeur du code-barres pour tous les enr
 PriceByCustomer=Différents prix pour chaque client
 PriceCatalogue=Un prix de vente unique par produit / service
 AddCustomerPrice=Ajouter un prix par client
-ForceUpdateChildPriceSoc=Définir le même prix sur les filiales clientes
 PriceByCustomerLog=Enregistrement des prix clients précédents
 MinimumPriceLimit=Le prix minimum ne peut pas être inférieur à %s
 PriceExpressionSelected=Expression de prix choisie
diff --git a/htdocs/langs/fr_CA/users.lang b/htdocs/langs/fr_CA/users.lang
index 81db7ef3370..e38af3483dc 100644
--- a/htdocs/langs/fr_CA/users.lang
+++ b/htdocs/langs/fr_CA/users.lang
@@ -10,3 +10,5 @@ LastUsersCreated=Derniers %s utilisateurs créés
 ConfirmCreateContact=Êtes-vous sûr de vouloir créer un compte Dolibarr pour ce contact?
 ConfirmCreateLogin=Êtes-vous sûr de vouloir créer un compte Dolibarr pour ce membre?
 ConfirmCreateThirdParty=Êtes-vous sûr de vouloir créer un tiers pour ce membre?
+NbOfUsers=No. of users
+NbOfPermissions=No. of permissions
diff --git a/htdocs/langs/fr_CA/website.lang b/htdocs/langs/fr_CA/website.lang
index 5255b2f9da5..f37354f9d32 100644
--- a/htdocs/langs/fr_CA/website.lang
+++ b/htdocs/langs/fr_CA/website.lang
@@ -4,6 +4,7 @@ WEBSITE_PAGENAME=Nom / alias de la page
 WEBSITE_CSS_URL=URL du fichier CSS externe
 MediaFiles=Médiathèque
 EditMenu=Menu Edition
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 ViewSiteInNewTab=Afficher le site dans un nouvel onglet
 ViewPageInNewTab=Afficher la page dans un nouvel onglet
 ViewWebsiteInProduction=Afficher le site Web à l'aide d'URL d'accueil
diff --git a/htdocs/langs/fr_CH/admin.lang b/htdocs/langs/fr_CH/admin.lang
index c1d306ec390..25265594de5 100644
--- a/htdocs/langs/fr_CH/admin.lang
+++ b/htdocs/langs/fr_CH/admin.lang
@@ -1,3 +1,4 @@
 # Dolibarr language file - Source file is en_US - admin
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/fr_CH/salaries.lang b/htdocs/langs/fr_CH/salaries.lang
new file mode 100644
index 00000000000..c9bd3bec17b
--- /dev/null
+++ b/htdocs/langs/fr_CH/salaries.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - salaries
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
diff --git a/htdocs/langs/fr_CH/users.lang b/htdocs/langs/fr_CH/users.lang
new file mode 100644
index 00000000000..4a412122b08
--- /dev/null
+++ b/htdocs/langs/fr_CH/users.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - users
+NbOfUsers=No. of users
+NbOfPermissions=No. of permissions
diff --git a/htdocs/langs/fr_CH/website.lang b/htdocs/langs/fr_CH/website.lang
new file mode 100644
index 00000000000..910cff6b702
--- /dev/null
+++ b/htdocs/langs/fr_CH/website.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - website
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
diff --git a/htdocs/langs/fr_CI/admin.lang b/htdocs/langs/fr_CI/admin.lang
index c1d306ec390..25265594de5 100644
--- a/htdocs/langs/fr_CI/admin.lang
+++ b/htdocs/langs/fr_CI/admin.lang
@@ -1,3 +1,4 @@
 # Dolibarr language file - Source file is en_US - admin
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/fr_CI/salaries.lang b/htdocs/langs/fr_CI/salaries.lang
new file mode 100644
index 00000000000..c9bd3bec17b
--- /dev/null
+++ b/htdocs/langs/fr_CI/salaries.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - salaries
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
diff --git a/htdocs/langs/fr_CI/users.lang b/htdocs/langs/fr_CI/users.lang
new file mode 100644
index 00000000000..4a412122b08
--- /dev/null
+++ b/htdocs/langs/fr_CI/users.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - users
+NbOfUsers=No. of users
+NbOfPermissions=No. of permissions
diff --git a/htdocs/langs/fr_CI/website.lang b/htdocs/langs/fr_CI/website.lang
new file mode 100644
index 00000000000..910cff6b702
--- /dev/null
+++ b/htdocs/langs/fr_CI/website.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - website
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
diff --git a/htdocs/langs/fr_CM/admin.lang b/htdocs/langs/fr_CM/admin.lang
index c1d306ec390..25265594de5 100644
--- a/htdocs/langs/fr_CM/admin.lang
+++ b/htdocs/langs/fr_CM/admin.lang
@@ -1,3 +1,4 @@
 # Dolibarr language file - Source file is en_US - admin
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/fr_CM/salaries.lang b/htdocs/langs/fr_CM/salaries.lang
new file mode 100644
index 00000000000..c9bd3bec17b
--- /dev/null
+++ b/htdocs/langs/fr_CM/salaries.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - salaries
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
diff --git a/htdocs/langs/fr_CM/users.lang b/htdocs/langs/fr_CM/users.lang
new file mode 100644
index 00000000000..4a412122b08
--- /dev/null
+++ b/htdocs/langs/fr_CM/users.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - users
+NbOfUsers=No. of users
+NbOfPermissions=No. of permissions
diff --git a/htdocs/langs/fr_CM/website.lang b/htdocs/langs/fr_CM/website.lang
new file mode 100644
index 00000000000..910cff6b702
--- /dev/null
+++ b/htdocs/langs/fr_CM/website.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - website
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
diff --git a/htdocs/langs/fr_FR/compta.lang b/htdocs/langs/fr_FR/compta.lang
index 6ee3e204b0a..4628673fd9e 100644
--- a/htdocs/langs/fr_FR/compta.lang
+++ b/htdocs/langs/fr_FR/compta.lang
@@ -286,9 +286,9 @@ ReportPurchaseTurnover=Chiffre d'affaires d'achat facturé
 ReportPurchaseTurnoverCollected=Chiffre d'affaires d'achat encaissé
 IncludeVarpaysInResults = Inclure les paiements divers dans les rapports
 IncludeLoansInResults = Inclure les prêts dans les rapports
-InvoiceLate30Days = Factures impayés à échéance dépassé de plus de 30 jours
-InvoiceLate15Days = Factures impayés à échéance dépassé de plus de 15 jours
+InvoiceLate30Days = Factures en retard > 30 jours
+InvoiceLate15Days = Factures en retard > 15 jours
 InvoiceLateMinus15Days = Factures en retard
-InvoiceNotLate = Règlements à recevoir dans moins de 15 jours
-InvoiceNotLate15Days = Règlements à recevoir dans 15 jours
-InvoiceNotLate30Days = Règlements à recevoir dans les 30 jours
+InvoiceNotLate = A recevoir < 15 jours
+InvoiceNotLate15Days = A recevoir dans 15 jours
+InvoiceNotLate30Days = A recevoir dans 30 jours
diff --git a/htdocs/langs/fr_FR/exports.lang b/htdocs/langs/fr_FR/exports.lang
index c3c426daf4e..8f9c38a45dd 100644
--- a/htdocs/langs/fr_FR/exports.lang
+++ b/htdocs/langs/fr_FR/exports.lang
@@ -53,7 +53,8 @@ TypeOfLineServiceOrProduct=Type de ligne (0=produit, 1=service)
 FileWithDataToImport=Fichier contenant les données à importer
 FileToImport=Fichier source à importer
 FileMustHaveOneOfFollowingFormat=Le fichier à importer doit avoir un des formats suivants
-DownloadEmptyExample=Télécharger fichier vierge exemple (* sont les champs obligatoires)
+DownloadEmptyExample=Download template file with field content information
+StarAreMandatory=* are mandatory fields
 ChooseFormatOfFileToImport=Choisissez le format de fichier à importer en cliquant sur le pictogramme %s pour le sélectionner…
 ChooseFileToImport=Ajoutez le fichier à importer puis cliquez sur le pictogramme %s pour le sélectionner comme fichier source d'import…
 SourceFileFormat=Format du fichier source
diff --git a/htdocs/langs/fr_GA/admin.lang b/htdocs/langs/fr_GA/admin.lang
index 8c6135dc874..6455856627f 100644
--- a/htdocs/langs/fr_GA/admin.lang
+++ b/htdocs/langs/fr_GA/admin.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
 Module20Name=Devis
 Module30Name=Factures
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/fr_GA/salaries.lang b/htdocs/langs/fr_GA/salaries.lang
new file mode 100644
index 00000000000..c9bd3bec17b
--- /dev/null
+++ b/htdocs/langs/fr_GA/salaries.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - salaries
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
diff --git a/htdocs/langs/fr_GA/users.lang b/htdocs/langs/fr_GA/users.lang
new file mode 100644
index 00000000000..4a412122b08
--- /dev/null
+++ b/htdocs/langs/fr_GA/users.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - users
+NbOfUsers=No. of users
+NbOfPermissions=No. of permissions
diff --git a/htdocs/langs/fr_GA/website.lang b/htdocs/langs/fr_GA/website.lang
new file mode 100644
index 00000000000..910cff6b702
--- /dev/null
+++ b/htdocs/langs/fr_GA/website.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - website
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
diff --git a/htdocs/langs/gl_ES/deliveries.lang b/htdocs/langs/gl_ES/deliveries.lang
index 49996ef672a..60e8ca17833 100644
--- a/htdocs/langs/gl_ES/deliveries.lang
+++ b/htdocs/langs/gl_ES/deliveries.lang
@@ -30,3 +30,4 @@ NonShippable=Non enviable
 ShowShippableStatus=Amosar estado de envío
 ShowReceiving=Mostrar nota de recepción
 NonExistentOrder=Pedimento inexistente
+StockQuantitiesAlreadyAllocatedOnPreviousLines = Cantidades de stock xa asignadas en liñas anteriores 
diff --git a/htdocs/langs/gl_ES/exports.lang b/htdocs/langs/gl_ES/exports.lang
index aeb080ad0b7..49bed28e022 100644
--- a/htdocs/langs/gl_ES/exports.lang
+++ b/htdocs/langs/gl_ES/exports.lang
@@ -53,7 +53,8 @@ TypeOfLineServiceOrProduct=Tipo de liña (0=producto, 1=servizo)
 FileWithDataToImport=Ficheiro cos datos a importar
 FileToImport=Ficheiro orixe a importar
 FileMustHaveOneOfFollowingFormat=O ficheiro de importación debe conter un dos seguintes formatos
-DownloadEmptyExample=Descargar ficheiro de exemplo baleiro
+DownloadEmptyExample=Descargue un ficheiro de modelo con información de contido do campo 
+StarAreMandatory=* son campos obrigatorios 
 ChooseFormatOfFileToImport=Escolla o formato de ficheiro que desexa importar e prema na imaxe %s para seleccionalo...
 ChooseFileToImport=Escolla o ficheiro de importación e faga clic na imaxe %s para seleccionalo como ficheiro orixe de importación...
 SourceFileFormat=Formato do ficheiro orixe
diff --git a/htdocs/langs/he_IL/deliveries.lang b/htdocs/langs/he_IL/deliveries.lang
index 1f48c01de75..cd8a36e6c70 100644
--- a/htdocs/langs/he_IL/deliveries.lang
+++ b/htdocs/langs/he_IL/deliveries.lang
@@ -27,5 +27,7 @@ Recipient=Recipient
 ErrorStockIsNotEnough=There's not enough stock
 Shippable=Shippable
 NonShippable=Not Shippable
+ShowShippableStatus=Show shippable status
 ShowReceiving=Show delivery receipt
 NonExistentOrder=Nonexistent order
+StockQuantitiesAlreadyAllocatedOnPreviousLines = Stock quantities already allocated on previous lines
diff --git a/htdocs/langs/he_IL/exports.lang b/htdocs/langs/he_IL/exports.lang
index a0eb7161ef2..cb652229825 100644
--- a/htdocs/langs/he_IL/exports.lang
+++ b/htdocs/langs/he_IL/exports.lang
@@ -53,7 +53,8 @@ TypeOfLineServiceOrProduct=Type of line (0=product, 1=service)
 FileWithDataToImport=File with data to import
 FileToImport=Source file to import
 FileMustHaveOneOfFollowingFormat=File to import must have one of following formats
-DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
+DownloadEmptyExample=Download template file with field content information
+StarAreMandatory=* are mandatory fields
 ChooseFormatOfFileToImport=Choose the file format to use as import file format by clicking on the %s icon to select it...
 ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
 SourceFileFormat=Source file format
diff --git a/htdocs/langs/hi_IN/deliveries.lang b/htdocs/langs/hi_IN/deliveries.lang
index 1f48c01de75..cd8a36e6c70 100644
--- a/htdocs/langs/hi_IN/deliveries.lang
+++ b/htdocs/langs/hi_IN/deliveries.lang
@@ -27,5 +27,7 @@ Recipient=Recipient
 ErrorStockIsNotEnough=There's not enough stock
 Shippable=Shippable
 NonShippable=Not Shippable
+ShowShippableStatus=Show shippable status
 ShowReceiving=Show delivery receipt
 NonExistentOrder=Nonexistent order
+StockQuantitiesAlreadyAllocatedOnPreviousLines = Stock quantities already allocated on previous lines
diff --git a/htdocs/langs/hi_IN/exports.lang b/htdocs/langs/hi_IN/exports.lang
index a0eb7161ef2..cb652229825 100644
--- a/htdocs/langs/hi_IN/exports.lang
+++ b/htdocs/langs/hi_IN/exports.lang
@@ -53,7 +53,8 @@ TypeOfLineServiceOrProduct=Type of line (0=product, 1=service)
 FileWithDataToImport=File with data to import
 FileToImport=Source file to import
 FileMustHaveOneOfFollowingFormat=File to import must have one of following formats
-DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
+DownloadEmptyExample=Download template file with field content information
+StarAreMandatory=* are mandatory fields
 ChooseFormatOfFileToImport=Choose the file format to use as import file format by clicking on the %s icon to select it...
 ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
 SourceFileFormat=Source file format
diff --git a/htdocs/langs/hr_HR/deliveries.lang b/htdocs/langs/hr_HR/deliveries.lang
index b74558fbdd7..56123a13cd5 100644
--- a/htdocs/langs/hr_HR/deliveries.lang
+++ b/htdocs/langs/hr_HR/deliveries.lang
@@ -27,5 +27,7 @@ Recipient=Primatelj
 ErrorStockIsNotEnough=Nema dovoljno robe na skladištu
 Shippable=Isporuka moguća
 NonShippable=Isporuka nije moguća
+ShowShippableStatus=Show shippable status
 ShowReceiving=Prikaži dostavnu primku
 NonExistentOrder=Nonexistent order
+StockQuantitiesAlreadyAllocatedOnPreviousLines = Stock quantities already allocated on previous lines
diff --git a/htdocs/langs/hr_HR/exports.lang b/htdocs/langs/hr_HR/exports.lang
index f214e7f85dd..c9238c0cdcf 100644
--- a/htdocs/langs/hr_HR/exports.lang
+++ b/htdocs/langs/hr_HR/exports.lang
@@ -53,7 +53,8 @@ TypeOfLineServiceOrProduct=Type of line (0=product, 1=service)
 FileWithDataToImport=File with data to import
 FileToImport=Source file to import
 FileMustHaveOneOfFollowingFormat=File to import must have one of following formats
-DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
+DownloadEmptyExample=Download template file with field content information
+StarAreMandatory=* are mandatory fields
 ChooseFormatOfFileToImport=Choose the file format to use as import file format by clicking on the %s icon to select it...
 ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
 SourceFileFormat=Source file format
diff --git a/htdocs/langs/hu_HU/deliveries.lang b/htdocs/langs/hu_HU/deliveries.lang
index f7656297b0f..c907a121477 100644
--- a/htdocs/langs/hu_HU/deliveries.lang
+++ b/htdocs/langs/hu_HU/deliveries.lang
@@ -27,5 +27,7 @@ Recipient=Címzett
 ErrorStockIsNotEnough=Nincs elég raktáron
 Shippable=Szállítható
 NonShippable=Nem szállítható
+ShowShippableStatus=Show shippable status
 ShowReceiving=Mutassa az átvételi elismervényt
 NonExistentOrder=Nem létező megrendelés
+StockQuantitiesAlreadyAllocatedOnPreviousLines = Stock quantities already allocated on previous lines
diff --git a/htdocs/langs/hu_HU/exports.lang b/htdocs/langs/hu_HU/exports.lang
index 207e255a0f7..c8945321c10 100644
--- a/htdocs/langs/hu_HU/exports.lang
+++ b/htdocs/langs/hu_HU/exports.lang
@@ -53,7 +53,8 @@ TypeOfLineServiceOrProduct=Vonal típusa (0 = a termék, 1 = szolgáltatás)
 FileWithDataToImport=File adatokat importálni
 FileToImport=Forrás fájlt importálni
 FileMustHaveOneOfFollowingFormat=File to import must have one of following formats
-DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
+DownloadEmptyExample=Download template file with field content information
+StarAreMandatory=* are mandatory fields
 ChooseFormatOfFileToImport=Choose the file format to use as import file format by clicking on the %s icon to select it...
 ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
 SourceFileFormat=Forrás fájlformátum
diff --git a/htdocs/langs/id_ID/deliveries.lang b/htdocs/langs/id_ID/deliveries.lang
index e04f7ef16e6..ef3921e9540 100644
--- a/htdocs/langs/id_ID/deliveries.lang
+++ b/htdocs/langs/id_ID/deliveries.lang
@@ -27,5 +27,7 @@ Recipient=Penerima
 ErrorStockIsNotEnough=Tidak ada stok yang cukup
 Shippable=Dapat dikirim
 NonShippable=Tidak Dapat Dikirim
+ShowShippableStatus=Show shippable status
 ShowReceiving=Tampilkan tanda terima pengiriman
 NonExistentOrder=Pesanan tidak ada
+StockQuantitiesAlreadyAllocatedOnPreviousLines = Stock quantities already allocated on previous lines
diff --git a/htdocs/langs/id_ID/exports.lang b/htdocs/langs/id_ID/exports.lang
index 39cc5685c18..85901957857 100644
--- a/htdocs/langs/id_ID/exports.lang
+++ b/htdocs/langs/id_ID/exports.lang
@@ -53,7 +53,8 @@ TypeOfLineServiceOrProduct=Jenis garis (0 = produk, 1 = layanan)
 FileWithDataToImport=File dengan data untuk diimpor
 FileToImport=Sumber file untuk diimpor
 FileMustHaveOneOfFollowingFormat=File yang akan diimpor harus memiliki salah satu format berikut
-DownloadEmptyExample=Unduh file template dengan informasi konten bidang (* adalah bidang wajib)
+DownloadEmptyExample=Download template file with field content information
+StarAreMandatory=* are mandatory fields
 ChooseFormatOfFileToImport=Pilih format file untuk digunakan sebagai format file impor dengan mengklik ikon %s untuk memilihnya ...
 ChooseFileToImport=Unggah file kemudian klik ikon %s untuk memilih file sebagai file impor sumber ...
 SourceFileFormat=Format file sumber
diff --git a/htdocs/langs/is_IS/deliveries.lang b/htdocs/langs/is_IS/deliveries.lang
index 74a29497802..3d037b8919e 100644
--- a/htdocs/langs/is_IS/deliveries.lang
+++ b/htdocs/langs/is_IS/deliveries.lang
@@ -27,5 +27,7 @@ Recipient=Viðtakandi
 ErrorStockIsNotEnough=There's not enough stock
 Shippable=Shippable
 NonShippable=Not Shippable
+ShowShippableStatus=Show shippable status
 ShowReceiving=Show delivery receipt
 NonExistentOrder=Nonexistent order
+StockQuantitiesAlreadyAllocatedOnPreviousLines = Stock quantities already allocated on previous lines
diff --git a/htdocs/langs/is_IS/exports.lang b/htdocs/langs/is_IS/exports.lang
index a9f6a31bddf..05defcccffc 100644
--- a/htdocs/langs/is_IS/exports.lang
+++ b/htdocs/langs/is_IS/exports.lang
@@ -53,7 +53,8 @@ TypeOfLineServiceOrProduct=Tegund línu (0 = vara, 1 = þjónustu)
 FileWithDataToImport=Skrá með upplýsingum til að flytja inn
 FileToImport=Frumskrár að flytja inn
 FileMustHaveOneOfFollowingFormat=File to import must have one of following formats
-DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
+DownloadEmptyExample=Download template file with field content information
+StarAreMandatory=* are mandatory fields
 ChooseFormatOfFileToImport=Choose the file format to use as import file format by clicking on the %s icon to select it...
 ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
 SourceFileFormat=Heimild skráarsnið
diff --git a/htdocs/langs/it_CH/salaries.lang b/htdocs/langs/it_CH/salaries.lang
new file mode 100644
index 00000000000..c9bd3bec17b
--- /dev/null
+++ b/htdocs/langs/it_CH/salaries.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - salaries
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
diff --git a/htdocs/langs/it_CH/users.lang b/htdocs/langs/it_CH/users.lang
new file mode 100644
index 00000000000..4a412122b08
--- /dev/null
+++ b/htdocs/langs/it_CH/users.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - users
+NbOfUsers=No. of users
+NbOfPermissions=No. of permissions
diff --git a/htdocs/langs/it_IT/deliveries.lang b/htdocs/langs/it_IT/deliveries.lang
index a24bb962dac..723f46c4c0f 100644
--- a/htdocs/langs/it_IT/deliveries.lang
+++ b/htdocs/langs/it_IT/deliveries.lang
@@ -30,3 +30,4 @@ NonShippable=Non disponibile per spedizione
 ShowShippableStatus=Mostra lo stato di spedizione
 ShowReceiving=Mostra ricevuta di consegna
 NonExistentOrder=Ordine inesistente
+StockQuantitiesAlreadyAllocatedOnPreviousLines = Stock quantities already allocated on previous lines
diff --git a/htdocs/langs/it_IT/exports.lang b/htdocs/langs/it_IT/exports.lang
index 5b616c68eaf..5a5e6dd1820 100644
--- a/htdocs/langs/it_IT/exports.lang
+++ b/htdocs/langs/it_IT/exports.lang
@@ -53,7 +53,8 @@ TypeOfLineServiceOrProduct=Linea tipo (0 = prodotto, servizio = 1)
 FileWithDataToImport=File con i dati da importare
 FileToImport=File da importare
 FileMustHaveOneOfFollowingFormat=File da importare deve avere uno dei seguenti formati
-DownloadEmptyExample=Download esempio di fonte file vuoto
+DownloadEmptyExample=Download template file with field content information
+StarAreMandatory=* are mandatory fields
 ChooseFormatOfFileToImport=Scegliete il formato di file da utilizzare per l'importazione cliccando sull'icona %s
 ChooseFileToImport=Scegli il file da importare e poi clicca sull'icona %s
 SourceFileFormat=Fonte formato di file
diff --git a/htdocs/langs/ja_JP/accountancy.lang b/htdocs/langs/ja_JP/accountancy.lang
index f398117d37c..bf9dc355840 100644
--- a/htdocs/langs/ja_JP/accountancy.lang
+++ b/htdocs/langs/ja_JP/accountancy.lang
@@ -48,7 +48,8 @@ CountriesNotInEEC=EECにない国
 CountriesInEECExceptMe=%sを除くEECの国
 CountriesExceptMe=%sを除くすべての国
 AccountantFiles=ソースドキュメントのエクスポート
-ExportAccountingSourceDocHelp=このツールを使用すると、会計処理の生成に使用されたソースイベント(リストとPDF)をエクスポートできる。仕訳をエクスポートするには、メニューエントリ%s-%sを使用する。
+ExportAccountingSourceDocHelp=このツールを使用すると、会計の生成に使用されたソースイベント(CSVおよびPDFのリスト)をエクスポートできる。
+ExportAccountingSourceDocHelp2=ジャーナルをエクスポートするには、メニューエントリ%s --%sを使用。
 VueByAccountAccounting=会計科目順に表示
 VueBySubAccountAccounting=アカウンティングサブアカウントで表示
 
diff --git a/htdocs/langs/ja_JP/admin.lang b/htdocs/langs/ja_JP/admin.lang
index a21a12947f7..09c80dc7550 100644
--- a/htdocs/langs/ja_JP/admin.lang
+++ b/htdocs/langs/ja_JP/admin.lang
@@ -2144,3 +2144,4 @@ YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=非推奨のWS APIが有効化され
 RandomlySelectedIfSeveral=画像が複数ある場合はランダムに選択
 DatabasePasswordObfuscated=データベースのパスワードは conf ファイルで難読化されている
 DatabasePasswordNotObfuscated=データベースのパスワードは conf ファイルで難読化されていない
+APIsAreNotEnabled=APIモジュールが有効になっていない
diff --git a/htdocs/langs/ja_JP/deliveries.lang b/htdocs/langs/ja_JP/deliveries.lang
index fd9cbcae01d..950d219d9cb 100644
--- a/htdocs/langs/ja_JP/deliveries.lang
+++ b/htdocs/langs/ja_JP/deliveries.lang
@@ -9,7 +9,7 @@ DeliveryStateSaved=保存された配送状態
 SetDeliveryDate=出荷の日付を設定する
 ValidateDeliveryReceipt=配送の領収書を検証する
 ValidateDeliveryReceiptConfirm=この配送領収書を検証してもよいか？
-DeleteDeliveryReceipt=配送済みメッセージを削除する
+DeleteDeliveryReceipt=配送済メッセージを削除する
 DeleteDeliveryReceiptConfirm=領収書<b>%s </b>を削除してもよいか？
 DeliveryMethod=配送方法
 TrackingNumber=追跡番号
@@ -27,5 +27,7 @@ Recipient=受領者
 ErrorStockIsNotEnough=在庫が不足
 Shippable=発送可能
 NonShippable=発送不可
+ShowShippableStatus=出荷可能なステータスを表示する
 ShowReceiving=配送領収書を表示する
 NonExistentOrder=存在しない注文
+StockQuantitiesAlreadyAllocatedOnPreviousLines = 前の行にすでに割り当てられている在庫数量
diff --git a/htdocs/langs/ja_JP/exports.lang b/htdocs/langs/ja_JP/exports.lang
index 326ea5ad052..ae3f4eaff99 100644
--- a/htdocs/langs/ja_JP/exports.lang
+++ b/htdocs/langs/ja_JP/exports.lang
@@ -53,7 +53,8 @@ TypeOfLineServiceOrProduct=回線の種類(0 =製品、1 =サービス)
 FileWithDataToImport=インポートするデータを持つファイル
 FileToImport=インポートするソースファイル
 FileMustHaveOneOfFollowingFormat=インポートするファイルは、次のいずれかの形式である必要がある
-DownloadEmptyExample=フィールドコンテンツ情報を含むテンプレートファイルをダウンロードする(*は必須フィールド )
+DownloadEmptyExample=フィールドコンテンツ情報を含むテンプレートファイルをダウンロードする
+StarAreMandatory=*は必須フィールド
 ChooseFormatOfFileToImport=%sアイコンをクリックして選択し、インポートファイル形式として使用するファイル形式を選択する...
 ChooseFileToImport=ファイルをアップロードし、%sアイコンをクリックして、ソースインポートファイルとしてファイルを選択する。
 SourceFileFormat=ソースファイルの形式
diff --git a/htdocs/langs/ja_JP/knowledgemanagement.lang b/htdocs/langs/ja_JP/knowledgemanagement.lang
index cb54cb27245..db45e5e7daa 100644
--- a/htdocs/langs/ja_JP/knowledgemanagement.lang
+++ b/htdocs/langs/ja_JP/knowledgemanagement.lang
@@ -37,15 +37,7 @@ About = 約
 KnowledgeManagementAbout = 知識管理について
 KnowledgeManagementAboutPage = 知識管理に関するページ
 
-#
-# Sample page
-#
 KnowledgeManagementArea = 知識管理
-
-
-#
-# Menu
-#
 MenuKnowledgeRecord = 知識ベース
 ListKnowledgeRecord = 記事一覧
 NewKnowledgeRecord = 新しい記事
@@ -53,3 +45,5 @@ ValidateReply = ソリューションを検証する
 KnowledgeRecords = 記事
 KnowledgeRecord = 記事
 KnowledgeRecordExtraFields = 記事のエクストラフィールド
+GroupOfTicket=チケットのグループ
+YouCanLinkArticleToATicketCategory=記事をチケットグループにリンクできる(新規チケット認定時に記事が提案されるようになる)
diff --git a/htdocs/langs/ja_JP/languages.lang b/htdocs/langs/ja_JP/languages.lang
index 65ea4f02be5..06b8e61f2c4 100644
--- a/htdocs/langs/ja_JP/languages.lang
+++ b/htdocs/langs/ja_JP/languages.lang
@@ -4,6 +4,7 @@ Language_ar_AR=アラビア語
 Language_ar_EG=アラビア語(エジプト)
 Language_ar_SA=アラビア語
 Language_ar_TN=アラビア語 (チュニジア)
+Language_ar_IQ=アラビア語(イラク)
 Language_az_AZ=アゼルバイジャン語
 Language_bn_BD=ベンガル語
 Language_bn_IN=ベンガル語(インド)
@@ -83,6 +84,7 @@ Language_ne_NP=ネパール語
 Language_nl_BE=オランダ語 (ベルギー)
 Language_nl_NL=オランダ語
 Language_pl_PL=ポーランド語
+Language_pt_AO=ポルトガル語(アンゴラ)
 Language_pt_BR=ポルトガル語 (ブラジル)
 Language_pt_PT=ポルトガル語
 Language_ro_MD=ルーマニア語 (モルダビア)
diff --git a/htdocs/langs/ja_JP/products.lang b/htdocs/langs/ja_JP/products.lang
index 86f4f8816f2..486cd6736c5 100644
--- a/htdocs/langs/ja_JP/products.lang
+++ b/htdocs/langs/ja_JP/products.lang
@@ -277,7 +277,7 @@ PriceByCustomer=顧客ごとに異なる価格
 PriceCatalogue=製品/サービスごとの単一の販売価格
 PricingRule=販売価格のルール
 AddCustomerPrice=顧客ごとに価格を追加
-ForceUpdateChildPriceSoc=顧客子会社に同じ価格を設定する
+ForceUpdateChildPriceSoc=顧客の子会社に同じ価格を設定する
 PriceByCustomerLog=以前の顧客価格のログ
 MinimumPriceLimit=最低価格は%sより低くすることはできない
 MinimumRecommendedPrice=最小推奨価格は次のとおり：%s
@@ -296,6 +296,7 @@ ComposedProductIncDecStock=親の変更時に在庫を増減する
 ComposedProduct=子供向け製品
 MinSupplierPrice=最小購入価格
 MinCustomerPrice=最低販売価格
+NoDynamicPrice=動的価格でない
 DynamicPriceConfiguration=動的な価格構成
 DynamicPriceDesc=数式を定義して、顧客または仕入先の価格を計算できる。このような数式では、すべての数学演算子、一部の定数および変数を使用できる。ここで、使用する変数を定義できる。変数に自動更新が必要な場合は、外部URLを定義して、Dolibarrが値を自動的に更新できるようにすることができる。
 AddVariable=変数を追加
diff --git a/htdocs/langs/ja_JP/stocks.lang b/htdocs/langs/ja_JP/stocks.lang
index 96bb184fe6f..7c6c6baa8c2 100644
--- a/htdocs/langs/ja_JP/stocks.lang
+++ b/htdocs/langs/ja_JP/stocks.lang
@@ -60,7 +60,7 @@ EnhancedValueOfWarehouses=倉庫の値
 UserWarehouseAutoCreate=ユーザーの作成時にユーザー倉庫を自動的に作成する
 AllowAddLimitStockByWarehouse=製品ごとの最小在庫と希望在庫の値に加えて、ペアリングごとの最小在庫と希望在庫の値(製品倉庫)も管理する。
 RuleForWarehouse=倉庫のルール
-WarehouseAskWarehouseOnThirparty=取引先に倉庫を設定する
+WarehouseAskWarehouseOnThirparty=取引先に倉庫を設置する
 WarehouseAskWarehouseDuringPropal=商業提案に倉庫を設定する
 WarehouseAskWarehouseDuringOrder=販売注文に倉庫を設定する
 UserDefaultWarehouse=ユーザーに倉庫を設定する
@@ -167,8 +167,8 @@ MovementTransferStock=製品%sの別の倉庫への在庫移転
 InventoryCodeShort=Inv./Mov。コード
 NoPendingReceptionOnSupplierOrder=注文書が開いているため、保留中の受付はない
 ThisSerialAlreadyExistWithDifferentDate=ロット/シリアル 番号 (<strong>%s</strong>) は異なる賞味期限または販売期限で ( <strong>%s</strong> が見つかったが、入力したのは <strong>%s</strong>).
-OpenAll=すべてのアクションに対して開く
-OpenInternal=内部アクションのためにのみ開く
+OpenAnyMovement=開く(全移動)
+OpenInternal=オープン(内部移動のみ)
 UseDispatchStatus=発注書受付の製品ラインにディスパッチステータス(承認/拒否)を使用する
 OptionMULTIPRICESIsOn=オプション「セグメントごとのいくつかの価格」がオンになっている。これは、製品に複数の販売価格があるため、販売価値を計算できないことを意味する
 ProductStockWarehouseCreated=アラートの在庫制限と希望する最適在庫が正しく作成された
diff --git a/htdocs/langs/ja_JP/ticket.lang b/htdocs/langs/ja_JP/ticket.lang
index ac4a6290b3f..d128c8c37bc 100644
--- a/htdocs/langs/ja_JP/ticket.lang
+++ b/htdocs/langs/ja_JP/ticket.lang
@@ -34,7 +34,8 @@ TicketDictResolution=チケット-解決策
 
 TicketTypeShortCOM=商業的な質問
 TicketTypeShortHELP=機能的なヘルプのリクエスト
-TicketTypeShortISSUE=問題、バグまたは問題
+TicketTypeShortISSUE=問題またはバグ
+TicketTypeShortPROBLEM=問題
 TicketTypeShortREQUEST=変更または拡張リクエスト
 TicketTypeShortPROJET=プロジェクト
 TicketTypeShortOTHER=その他
@@ -54,14 +55,15 @@ TypeContact_ticket_internal_SUPPORTTEC=割り当てられたユーザー
 TypeContact_ticket_external_SUPPORTCLI=顧客連絡/インシデント追跡
 TypeContact_ticket_external_CONTRIBUTOR=外部寄稿者
 
-OriginEmail=メールソース
+OriginEmail=メールレポーター
 Notify_TICKET_SENTBYMAIL=メールでチケットメッセージを送信する
 
 # Status
 Read=読む
 Assigned=割り当て済
 InProgress=進行中
-NeedMoreInformation=情報を待っている
+NeedMoreInformation=記者のフィードバック待機中
+NeedMoreInformationShort=フィードバック待機中
 Answered=答えた
 Waiting=待っている
 Closed=閉じた
@@ -160,7 +162,7 @@ CreatedBy=によって作成された
 NewTicket=新規チケット
 SubjectAnswerToTicket=チケットの回答
 TicketTypeRequest=リクエストの種類
-TicketCategory=グループ
+TicketCategory=チケット分類
 SeeTicket=チケットを見る
 TicketMarkedAsRead=チケットは既読としてマークされている
 TicketReadOn=読む
@@ -211,6 +213,7 @@ TicketMessageHelp=このテキストのみがチケットカードのメッセ
 TicketMessageSubstitutionReplacedByGenericValues=置換変数は一般的な値に置き換えられます。
 TimeElapsedSince=からの経過時間
 TicketTimeToRead=読み取るまでの経過時間
+TicketTimeElapsedBeforeSince=前後の経過時間
 TicketContacts=連絡先チケット
 TicketDocumentsLinked=チケットにリンクされているドキュメント
 ConfirmReOpenTicket=このチケットを再度開くことを確認するか？
diff --git a/htdocs/langs/ka_GE/deliveries.lang b/htdocs/langs/ka_GE/deliveries.lang
index 1f48c01de75..cd8a36e6c70 100644
--- a/htdocs/langs/ka_GE/deliveries.lang
+++ b/htdocs/langs/ka_GE/deliveries.lang
@@ -27,5 +27,7 @@ Recipient=Recipient
 ErrorStockIsNotEnough=There's not enough stock
 Shippable=Shippable
 NonShippable=Not Shippable
+ShowShippableStatus=Show shippable status
 ShowReceiving=Show delivery receipt
 NonExistentOrder=Nonexistent order
+StockQuantitiesAlreadyAllocatedOnPreviousLines = Stock quantities already allocated on previous lines
diff --git a/htdocs/langs/ka_GE/exports.lang b/htdocs/langs/ka_GE/exports.lang
index a0eb7161ef2..cb652229825 100644
--- a/htdocs/langs/ka_GE/exports.lang
+++ b/htdocs/langs/ka_GE/exports.lang
@@ -53,7 +53,8 @@ TypeOfLineServiceOrProduct=Type of line (0=product, 1=service)
 FileWithDataToImport=File with data to import
 FileToImport=Source file to import
 FileMustHaveOneOfFollowingFormat=File to import must have one of following formats
-DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
+DownloadEmptyExample=Download template file with field content information
+StarAreMandatory=* are mandatory fields
 ChooseFormatOfFileToImport=Choose the file format to use as import file format by clicking on the %s icon to select it...
 ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
 SourceFileFormat=Source file format
diff --git a/htdocs/langs/km_KH/deliveries.lang b/htdocs/langs/km_KH/deliveries.lang
index 1f48c01de75..cd8a36e6c70 100644
--- a/htdocs/langs/km_KH/deliveries.lang
+++ b/htdocs/langs/km_KH/deliveries.lang
@@ -27,5 +27,7 @@ Recipient=Recipient
 ErrorStockIsNotEnough=There's not enough stock
 Shippable=Shippable
 NonShippable=Not Shippable
+ShowShippableStatus=Show shippable status
 ShowReceiving=Show delivery receipt
 NonExistentOrder=Nonexistent order
+StockQuantitiesAlreadyAllocatedOnPreviousLines = Stock quantities already allocated on previous lines
diff --git a/htdocs/langs/km_KH/exports.lang b/htdocs/langs/km_KH/exports.lang
index a0eb7161ef2..cb652229825 100644
--- a/htdocs/langs/km_KH/exports.lang
+++ b/htdocs/langs/km_KH/exports.lang
@@ -53,7 +53,8 @@ TypeOfLineServiceOrProduct=Type of line (0=product, 1=service)
 FileWithDataToImport=File with data to import
 FileToImport=Source file to import
 FileMustHaveOneOfFollowingFormat=File to import must have one of following formats
-DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
+DownloadEmptyExample=Download template file with field content information
+StarAreMandatory=* are mandatory fields
 ChooseFormatOfFileToImport=Choose the file format to use as import file format by clicking on the %s icon to select it...
 ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
 SourceFileFormat=Source file format
diff --git a/htdocs/langs/kn_IN/deliveries.lang b/htdocs/langs/kn_IN/deliveries.lang
index 1f48c01de75..cd8a36e6c70 100644
--- a/htdocs/langs/kn_IN/deliveries.lang
+++ b/htdocs/langs/kn_IN/deliveries.lang
@@ -27,5 +27,7 @@ Recipient=Recipient
 ErrorStockIsNotEnough=There's not enough stock
 Shippable=Shippable
 NonShippable=Not Shippable
+ShowShippableStatus=Show shippable status
 ShowReceiving=Show delivery receipt
 NonExistentOrder=Nonexistent order
+StockQuantitiesAlreadyAllocatedOnPreviousLines = Stock quantities already allocated on previous lines
diff --git a/htdocs/langs/kn_IN/exports.lang b/htdocs/langs/kn_IN/exports.lang
index a0eb7161ef2..cb652229825 100644
--- a/htdocs/langs/kn_IN/exports.lang
+++ b/htdocs/langs/kn_IN/exports.lang
@@ -53,7 +53,8 @@ TypeOfLineServiceOrProduct=Type of line (0=product, 1=service)
 FileWithDataToImport=File with data to import
 FileToImport=Source file to import
 FileMustHaveOneOfFollowingFormat=File to import must have one of following formats
-DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
+DownloadEmptyExample=Download template file with field content information
+StarAreMandatory=* are mandatory fields
 ChooseFormatOfFileToImport=Choose the file format to use as import file format by clicking on the %s icon to select it...
 ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
 SourceFileFormat=Source file format
diff --git a/htdocs/langs/ko_KR/deliveries.lang b/htdocs/langs/ko_KR/deliveries.lang
index 19a2ebe4d02..b3a63cc4e78 100644
--- a/htdocs/langs/ko_KR/deliveries.lang
+++ b/htdocs/langs/ko_KR/deliveries.lang
@@ -27,5 +27,7 @@ Recipient=Recipient
 ErrorStockIsNotEnough=There's not enough stock
 Shippable=Shippable
 NonShippable=Not Shippable
+ShowShippableStatus=Show shippable status
 ShowReceiving=Show delivery receipt
 NonExistentOrder=Nonexistent order
+StockQuantitiesAlreadyAllocatedOnPreviousLines = Stock quantities already allocated on previous lines
diff --git a/htdocs/langs/ko_KR/exports.lang b/htdocs/langs/ko_KR/exports.lang
index fda64411c9f..445f09b42a4 100644
--- a/htdocs/langs/ko_KR/exports.lang
+++ b/htdocs/langs/ko_KR/exports.lang
@@ -53,7 +53,8 @@ TypeOfLineServiceOrProduct=Type of line (0=product, 1=service)
 FileWithDataToImport=File with data to import
 FileToImport=Source file to import
 FileMustHaveOneOfFollowingFormat=File to import must have one of following formats
-DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
+DownloadEmptyExample=Download template file with field content information
+StarAreMandatory=* are mandatory fields
 ChooseFormatOfFileToImport=Choose the file format to use as import file format by clicking on the %s icon to select it...
 ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
 SourceFileFormat=Source file format
diff --git a/htdocs/langs/lo_LA/deliveries.lang b/htdocs/langs/lo_LA/deliveries.lang
index 1f48c01de75..cd8a36e6c70 100644
--- a/htdocs/langs/lo_LA/deliveries.lang
+++ b/htdocs/langs/lo_LA/deliveries.lang
@@ -27,5 +27,7 @@ Recipient=Recipient
 ErrorStockIsNotEnough=There's not enough stock
 Shippable=Shippable
 NonShippable=Not Shippable
+ShowShippableStatus=Show shippable status
 ShowReceiving=Show delivery receipt
 NonExistentOrder=Nonexistent order
+StockQuantitiesAlreadyAllocatedOnPreviousLines = Stock quantities already allocated on previous lines
diff --git a/htdocs/langs/lo_LA/exports.lang b/htdocs/langs/lo_LA/exports.lang
index a0eb7161ef2..cb652229825 100644
--- a/htdocs/langs/lo_LA/exports.lang
+++ b/htdocs/langs/lo_LA/exports.lang
@@ -53,7 +53,8 @@ TypeOfLineServiceOrProduct=Type of line (0=product, 1=service)
 FileWithDataToImport=File with data to import
 FileToImport=Source file to import
 FileMustHaveOneOfFollowingFormat=File to import must have one of following formats
-DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
+DownloadEmptyExample=Download template file with field content information
+StarAreMandatory=* are mandatory fields
 ChooseFormatOfFileToImport=Choose the file format to use as import file format by clicking on the %s icon to select it...
 ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
 SourceFileFormat=Source file format
diff --git a/htdocs/langs/lt_LT/deliveries.lang b/htdocs/langs/lt_LT/deliveries.lang
index ea5c1f3265a..0c394aef77d 100644
--- a/htdocs/langs/lt_LT/deliveries.lang
+++ b/htdocs/langs/lt_LT/deliveries.lang
@@ -27,5 +27,7 @@ Recipient=Gavėjas
 ErrorStockIsNotEnough=Nėra pakankamai atsargų
 Shippable=Pristatomas
 NonShippable=Nepristatomas
+ShowShippableStatus=Show shippable status
 ShowReceiving=Show delivery receipt
 NonExistentOrder=Nonexistent order
+StockQuantitiesAlreadyAllocatedOnPreviousLines = Stock quantities already allocated on previous lines
diff --git a/htdocs/langs/lt_LT/exports.lang b/htdocs/langs/lt_LT/exports.lang
index b42cd43974d..6e8e3929002 100644
--- a/htdocs/langs/lt_LT/exports.lang
+++ b/htdocs/langs/lt_LT/exports.lang
@@ -53,7 +53,8 @@ TypeOfLineServiceOrProduct=Eilutės tipas (0 = produktas, 1 = paslaugos)
 FileWithDataToImport=Failas su duomenimis importui
 FileToImport=Šaltinio failas importui
 FileMustHaveOneOfFollowingFormat=File to import must have one of following formats
-DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
+DownloadEmptyExample=Download template file with field content information
+StarAreMandatory=* are mandatory fields
 ChooseFormatOfFileToImport=Choose the file format to use as import file format by clicking on the %s icon to select it...
 ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
 SourceFileFormat=Šaltinio failo formatas
diff --git a/htdocs/langs/lv_LV/accountancy.lang b/htdocs/langs/lv_LV/accountancy.lang
index e0eeea0b8a2..ce348d56481 100644
--- a/htdocs/langs/lv_LV/accountancy.lang
+++ b/htdocs/langs/lv_LV/accountancy.lang
@@ -48,7 +48,8 @@ CountriesNotInEEC=Valstis, kas nav EEK valstīs
 CountriesInEECExceptMe=Valstis EEK, izņemot %s
 CountriesExceptMe=Visas valstis, izņemot %s
 AccountantFiles=Eksportēt pirmdokumentus
-ExportAccountingSourceDocHelp=Izmantojot šo rīku, varat eksportēt avota notikumus (sarakstu un PDF failus), kas tika izmantoti grāmatvedības ģenerēšanai. Lai eksportētu žurnālus, izmantojiet izvēlnes ierakstu %s - %s.
+ExportAccountingSourceDocHelp=Izmantojot šo rīku, varat eksportēt avota notikumus (sarakstu CSV un PDF formātā), kas tika izmantoti grāmatvedības ģenerēšanai.
+ExportAccountingSourceDocHelp2=Lai eksportētu žurnālus, izmantojiet izvēlnes ierakstu %s - %s.
 VueByAccountAccounting=Skatīt pēc grāmatvedības konta
 VueBySubAccountAccounting=Skatīt pēc grāmatvedības apakškonta
 
@@ -131,7 +132,7 @@ InvoiceLinesDone=Iesaistīto rēķinu līnijas
 ExpenseReportLines=Izdevumu atskaites līnijas, kas saistītas
 ExpenseReportLinesDone=Saistītās izdevumu pārskatu līnijas
 IntoAccount=Bind line ar grāmatvedības kontu
-TotalForAccount=Total accounting account
+TotalForAccount=Kopējais grāmatvedības konts
 
 
 Ventilate=Saistīt
@@ -158,7 +159,7 @@ ACCOUNTING_LENGTH_AACCOUNT=Trešo pušu grāmatvedības kontu garums (ja iestat
 ACCOUNTING_MANAGE_ZERO=Atļaujiet pārvaldīt atšķirīgu skaitu nulles grāmatvedības konta beigās. Nepieciešamas dažas valstis (piemēram, Šveice). Ja iestatījums ir izslēgts (noklusējums), varat iestatīt šādus divus parametrus, lai pieprasītu lietojumprogrammai pievienot virtuālās nulles.
 BANK_DISABLE_DIRECT_INPUT=Atspējot tiešu darījumu reģistrāciju bankas kontā
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Iespējot eksporta projektu žurnālā
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties, break ability to search on a part of value)
+ACCOUNTANCY_COMBO_FOR_AUX=Iespējot kombinēto sarakstu meitas kontam (tas var būt lēns, ja jums ir daudz trešo pušu, pārtraukt iespēju meklēt daļu vērtības)
 ACCOUNTING_DATE_START_BINDING=Definējiet datumu, lai sāktu iesiešanu un pārskaitīšanu grāmatvedībā. Zem šī datuma darījumi netiks pārnesti uz grāmatvedību.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Pārsūtot grāmatvedību, pēc noklusējuma atlasiet periodu
 
@@ -202,14 +203,14 @@ Docref=Atsauce
 LabelAccount=Konta nosaukums
 LabelOperation=Etiķetes darbība
 Sens=Virziens
-AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you have received<br>For an accounting account of a supplier, use Debit to record a payment you made
+AccountingDirectionHelp=Klienta grāmatvedības kontā izmantojiet kredītu, lai reģistrētu saņemto maksājumu <br> Piegādātāja grāmatvedības kontā izmantojiet Debets, lai reģistrētu veikto maksājumu
 LetteringCode=Burtu kods
 Lettering=Burti
 Codejournal=Žurnāls
 JournalLabel=Žurnāla etiķete
 NumPiece=Gabala numurs
 TransactionNumShort=Num. darījums
-AccountingCategory=Custom group
+AccountingCategory=Pielāgota grupa
 GroupByAccountAccounting=Grupēt pēc galvenās grāmatas konta
 GroupBySubAccountAccounting=Grupēt pēc apakšzinēja konta
 AccountingAccountGroupsDesc=Šeit jūs varat definēt dažas grāmatvedības kontu grupas. Tie tiks izmantoti personificētiem grāmatvedības pārskatiem.
@@ -297,7 +298,7 @@ NoNewRecordSaved=Neviens ieraksts žurnālistikai nav
 ListOfProductsWithoutAccountingAccount=Produktu saraksts, uz kuriem nav saistīta kāds grāmatvedības konts
 ChangeBinding=Mainiet saites
 Accounted=Uzskaitīts virsgrāmatā
-NotYetAccounted=Not yet accounted in the ledger
+NotYetAccounted=Vēl nav uzskaitīti virsgrāmatā
 ShowTutorial=Rādīt apmācību
 NotReconciled=Nesaskaņots
 WarningRecordWithoutSubledgerAreExcluded=Brīdinājums: visas darbības, kurās nav definēts apakškārtas konts, tiek filtrētas un izslēgtas no šī skata
@@ -328,9 +329,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Atspējot saistīšanu un pārsūtīšan
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Atspējojiet grāmatvedībā iesiešanu un pārskaitīšanu izdevumu pārskatos (grāmatvedībā netiks ņemti vērā izdevumu pārskati)
 
 ## Export
-NotifiedExportDate=Notified export date (modification of the entries will not be possible)
-NotifiedValidationDate=Validation of the entries (modification or deletion of the entries will not be possible)
-ConfirmExportFile=Confirmation of the generation of the accounting export file ?
+NotifiedExportDate=Paziņots eksporta datums (ierakstus nevarēs modificēt)
+NotifiedValidationDate=Ierakstu validācija (modificēt vai dzēst ierakstus nebūs iespējams)
+ConfirmExportFile=Apstiprinājums par grāmatvedības eksporta faila ģenerēšanu?
 ExportDraftJournal=Eksporta žurnāla projekts
 Modelcsv=Eksporta modulis
 Selectmodelcsv=Atlasiet eksporta modeli
@@ -405,29 +406,29 @@ UseMenuToSetBindindManualy=Līnijas, kas vēl nav saistītas, izmantojiet izvēl
 
 ## Import
 ImportAccountingEntries=Grāmatvedības ieraksti
-ImportAccountingEntriesFECFormat=Accounting entries - FEC format
-FECFormatJournalCode=Code journal (JournalCode)
-FECFormatJournalLabel=Label journal (JournalLib)
-FECFormatEntryNum=Piece number (EcritureNum)
-FECFormatEntryDate=Piece date (EcritureDate)
-FECFormatGeneralAccountNumber=General account number (CompteNum)
-FECFormatGeneralAccountLabel=General account label (CompteLib)
-FECFormatSubledgerAccountNumber=Subledger account number (CompAuxNum)
-FECFormatSubledgerAccountLabel=Subledger account number (CompAuxLib)
+ImportAccountingEntriesFECFormat=Grāmatvedības ieraksti - FEC formāts
+FECFormatJournalCode=Kodu žurnāls (JournalCode)
+FECFormatJournalLabel=Iezīmju žurnāls (JournalLib)
+FECFormatEntryNum=Gabala numurs (EcritureNum)
+FECFormatEntryDate=Gabala datums (EcritureDate)
+FECFormatGeneralAccountNumber=Vispārējais konta numurs (CompteNum)
+FECFormatGeneralAccountLabel=Vispārīga konta iezīme (CompteLib)
+FECFormatSubledgerAccountNumber=Zemesgrāmatas konta numurs (CompAuxNum)
+FECFormatSubledgerAccountLabel=Zemesgrāmatas konta numurs (CompAuxLib)
 FECFormatPieceRef=Piece ref (PieceRef)
-FECFormatPieceDate=Piece date creation (PieceDate)
-FECFormatLabelOperation=Label operation (EcritureLib)
-FECFormatDebit=Debit (Debit)
-FECFormatCredit=Credit (Credit)
-FECFormatReconcilableCode=Reconcilable code (EcritureLet)
-FECFormatReconcilableDate=Reconcilable date (DateLet)
-FECFormatValidateDate=Piece date validated (ValidDate)
-FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
-FECFormatMulticurrencyCode=Multicurrency code (Idevise)
+FECFormatPieceDate=Gabala datuma izveide (PieceDate)
+FECFormatLabelOperation=Etiķetes darbība (EcritureLib)
+FECFormatDebit=Debets (debets)
+FECFormatCredit=Kredīts (kredīts)
+FECFormatReconcilableCode=Saskaņojams kods (EcritureLet)
+FECFormatReconcilableDate=Samierināms datums (DateLet)
+FECFormatValidateDate=Gabala datums ir validēts (ValidDate)
+FECFormatMulticurrencyAmount=Daudzvalūtu summa (Montantdevise)
+FECFormatMulticurrencyCode=Daudzvalūtu kods (Idevise)
 
 DateExport=Eksporta datums
 WarningReportNotReliable=Brīdinājums. Šis pārskats nav balstīts uz grāmatvedi, tādēļ tajā nav darījumu, kas Manuāli ir manuāli modificēts. Ja žurnāls ir atjaunināts, grāmatvedības skats ir precīzāks.
 ExpenseReportJournal=Izdevumu atskaites žurnāls
 InventoryJournal=Inventāra žurnāls
 
-NAccounts=%s accounts
+NAccounts=%s konti
diff --git a/htdocs/langs/lv_LV/admin.lang b/htdocs/langs/lv_LV/admin.lang
index 05a605ecedf..ae71ef1b18c 100644
--- a/htdocs/langs/lv_LV/admin.lang
+++ b/htdocs/langs/lv_LV/admin.lang
@@ -37,7 +37,7 @@ UnlockNewSessions=Noņemt savienojuma bloķēšanu
 YourSession=Jūsu sesija
 Sessions=Lietotāju sesijas
 WebUserGroup=Web servera lietotājs/grupa
-PermissionsOnFiles=Permissions on files
+PermissionsOnFiles=Atļaujas failiem
 PermissionsOnFilesInWebRoot=Atļaujas failiem tīmekļa saknes direktorijā
 PermissionsOnFile=Atļaujas failā %s
 NoSessionFound=Šķiet, ka jūsu PHP konfigurācija neļauj iekļaut aktīvās sesijas. Direktorija, kuru izmanto sesiju saglabāšanai (<b>%s</b>), var būt aizsargāta (piemēram, ar OS atļaujām vai PHP direktīvu open_basedir).
@@ -63,8 +63,8 @@ IfModuleEnabled=Piezīme: jā, ir efektīva tikai tad, ja modulis <b>%s</b> ir i
 RemoveLock=Ja ir, noņemiet/pārdēvējiet failu <b>%s</b>, lai varētu izmantot atjaunināšanas/instalēšanas rīku.
 RestoreLock=Atjaunojiet failu <b>%s</b> tikai ar lasīšanas atļauju, lai atspējotu jebkādu turpmāku atjaunināšanas/instalēšanas rīka izmantošanu.
 SecuritySetup=Drošības iestatījumi
-PHPSetup=PHP setup
-OSSetup=OS setup
+PHPSetup=PHP iestatīšana
+OSSetup=OS iestatīšana
 SecurityFilesDesc=Šeit definējiet ar drošību saistītās iespējas failu augšupielādei.
 ErrorModuleRequirePHPVersion=Kļūda, šim modulim ir nepieciešama PHP versija %s vai augstāka
 ErrorModuleRequireDolibarrVersion=Kļūda, šim modulim nepieciešama Dolibarr versija %s vai augstāka
@@ -157,7 +157,7 @@ SystemToolsAreaDesc=Šī sadaļa nodrošina administrēšanas funkcijas. Izmanto
 Purge=Tīrīt
 PurgeAreaDesc=Šī lapa ļauj izdzēst visus Dolibarr ģenerētos vai glabātos failus (pagaidu faili vai visi faili <b> %s </b> direktorijā). Šīs funkcijas izmantošana parasti nav nepieciešama. Tas tiek nodrošināts kā risinājums lietotājiem, kuru Dolibarr uztur pakalpojumu sniedzējs, kas nepiedāvā atļaujas, lai dzēstu tīmekļa servera ģenerētos failus.
 PurgeDeleteLogFile=Dzēsiet žurnāla failus, tostarp <b>%s</b>, kas definēti Syslog modulim (nav datu pazaudēšanas riska).
-PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Parameter can be 'tempfilesold', 'logfiles' or both 'tempfilesold+logfiles'. Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFiles=Izdzēsiet visus žurnāla un pagaidu failus (nav datu zaudēšanas riska). Parametrs var būt “tempfilesold”, “logfiles” vai abi “tempfilesold + logfiles”. Piezīme. Pagaidu failu dzēšana tiek veikta tikai tad, ja temp direktorija tika izveidota vairāk nekā pirms 24 stundām.
 PurgeDeleteTemporaryFilesShort=Dzēst žurnālu un pagaidu failus
 PurgeDeleteAllFilesInDocumentsDir=Dzēsiet visus failus direktorijā: <b> %s </b>. <br> Tas izdzēsīs visus radītos dokumentus, kas saistīti ar elementiem (trešajām personām, rēķiniem utt.), ECM modulī augšupielādētiem failiem, datu bāzes rezerves izgāztuvēm un pagaidu failus.
 PurgeRunNow=Tīrīt tagad
@@ -221,7 +221,7 @@ NotCompatible=Šis modulis, šķiet, nav savietojams ar jūsu Dolibarr %s (Min %
 CompatibleAfterUpdate=Šis modulis prasa atjaunināt Dolibarr %s (Min %s - Maks %s).
 SeeInMarkerPlace=Skatiet Marketplace
 SeeSetupOfModule=See setup of module %s
-SetOptionTo=Set option <b>%s</b> to %s
+SetOptionTo=Iestatiet opciju <b> %s </b> uz %s
 Updated=Atjaunots
 AchatTelechargement=Pirkt / lejupielādēt
 GoModuleSetupArea=Lai izvietotu / instalētu jaunu moduli, dodieties uz moduļa iestatīšanas apgabalu: <a href="%s"> %s </a>.
@@ -235,7 +235,7 @@ BoxesAvailable=Pieejamie logrīki
 BoxesActivated=Logrīki aktivizēti
 ActivateOn=Aktivizēt
 ActiveOn=Aktivizēts
-ActivatableOn=Activatable on
+ActivatableOn=Aktivizējams
 SourceFile=Avota fails
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Pieejams tikai tad, ja JavaScript nav atslēgts
 Required=Nepieciešams
@@ -351,10 +351,10 @@ LastActivationAuthor=Jaunākais aktivizētāja autors
 LastActivationIP=Jaunākā aktivizācijas IP adrese
 UpdateServerOffline=Atjaunināšanas serveris bezsaistē
 WithCounter=Pārvaldīt skaitītāju
-GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first %s. <br><b>{000000@x}</b> same as the previous one but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then the sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated to the customer. This counter dedicated to customer is reset at same time as the global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
+GenericMaskCodes=Jūs varat ievadīt jebkuru numerācijas masku. Šajā maskā var izmantot šādus tagus: <br> <b> {000000} </b> atbilst skaitlim, kas tiks palielināts katrā %s. Ievadiet tik daudz nulles, cik vēlamais skaitītāja garums. Skaitītāju aizpildīs ar nulli no kreisās puses, lai tajā būtu tikpat daudz nulles kā maskā. <br> <b> {000000 + 000} </b> tāds pats kā iepriekšējais, bet nobīde, kas atbilst skaitlim pa labi no zīmes +, tiek piemērota, sākot ar pirmo %s. <br> <b> {000000 @ x} </b> tāds pats kā iepriekšējais, bet skaitītājs tiek atiestatīts uz nulli, kad ir sasniegts mēnesis x (x no 1 līdz 12, vai 0, lai izmantotu jūsu konfigurācijā definētos fiskālā gada sākuma mēnešus, vai no 99 līdz katru mēnesi atiestatīt uz nulli). Ja tiek izmantota šī opcija un x ir 2 vai lielāks, ir nepieciešama arī secība {yy} {mm} vai {gggg} {mm}. <br> <b> {dd} </b> diena (no 01 līdz 31). <br> <b> {mm} </b> mēnesis (no 01 līdz 12). <br> <b> {yy} </b>, <b> {yyyy} </b> vai <b> {y} a09a4b <br>
+GenericMaskCodes2= <b> {cccc} </b> klienta kods uz n rakstzīmēm <br> <b> {cccc000} a09a4b739f17fz Šis klientam veltītais skaitītājs tiek atiestatīts vienlaikus ar globālo skaitītāju. <br> <b> {tttt} </b> Trešās puses tipa kods uz n rakstzīmēm (skatiet izvēlni Sākums - Iestatīšana - Vārdnīca - Trešo personu veidi). Ja pievienosit šo tagu, katram trešās puses tipam skaitītājs būs atšķirīgs. <br>
 GenericMaskCodes3=Visas citas rakstzīmes masku paliks neskartas.<br>Atstarpes nav atļautas.<br>
-GenericMaskCodes3EAN=All other characters in the mask will remain intact (except * or ? in 13th position in EAN13).<br>Spaces are not allowed.<br>In EAN13, the last character after the last } in 13th position should be * or ? . It will be replaced by the calculated key.<br>
+GenericMaskCodes3EAN=Visas pārējās maskas rakstzīmes paliks neskartas (izņemot * vai? EAN13 13. pozīcijā). <br> Atstarpes nav atļautas. <br> EAN13, pēdējam rakstzīmei pēc pēdējā} 13. pozīcijā jābūt * vai? . To aizstās aprēķinātā atslēga. <br>
 GenericMaskCodes4a=<u>Piemērs 99. %s no trešās personas TheCompany, ar datumu 2007-01-31: </u><br>
 GenericMaskCodes4b=<u>Piemērs trešā persona veidota 2007-03-01:</u><br>
 GenericMaskCodes4c=<u>Piemērs produkts veidots 2007-03-01:</u><br>
@@ -399,7 +399,7 @@ SecurityToken=Atslēga uz drošu saiti
 NoSmsEngine=Nav pieejams neviens SMS sūtītāja pārvaldnieks. SMS sūtītāja pārvaldnieks nav instalēts ar noklusējuma izplatīšanu, jo tie ir atkarīgi no ārēja piegādātāja, bet jūs varat atrast kādu no %s
 PDF=PDF
 PDFDesc=Globālās iespējas PDF ģenerēšanai
-PDFOtherDesc=PDF Option specific to some modules
+PDFOtherDesc=PDF opcija, kas raksturīga dažiem moduļiem
 PDFAddressForging=Noteikumi par adreses sadaļu
 HideAnyVATInformationOnPDF=Slēpt visu informāciju, kas saistīta ar pārdošanas nodokli / PVN
 PDFRulesForSalesTax=Pārdošanas nodokļa / PVN noteikumi
@@ -450,8 +450,8 @@ ExtrafieldParamHelpPassword=Atstājot šo lauku tukšu, tas nozīmē, ka šī v
 ExtrafieldParamHelpselect=Vērtību sarakstam jābūt rindām ar formāta atslēgu, vērtība (kur atslēga nevar būt '0') <br> <br>, piemēram,: 1, vērtība1 <br> 2, vērtība2 <br> kods3, vērtība3 < br> ... <br> <br> Lai saraksts būtu atkarīgs no cita papildinošā atribūtu saraksta: <br> 1, vērtība1 | opcijas_ <i> vecāku_līmeņa kods </i>: vecāku_skava <br> 2, vērtība2 | opcijas_ <i> vecāku saraksts_code </i>: parent_key <br> <br> Lai saraksts būtu atkarīgs no cita saraksta: <br> 1, vērtība1 | <i> vecāku saraksts_code </i>: vecāku_skava <br> 2, vērtība2 | <i> vecāku saraksts_code </i>: vecāku_poga
 ExtrafieldParamHelpcheckbox=Vērtību sarakstam jābūt rindām ar formāta atslēgu, vērtība (kur atslēga nevar būt '0') <br> <br>, piemēram,: 1, vērtība1 <br> 2, vērtība2 <br> 3, vērtība3 < br> ...
 ExtrafieldParamHelpradio=Vērtību sarakstam jābūt rindām ar formāta atslēgu, vērtība (kur atslēga nevar būt '0') <br> <br>, piemēram,: 1, vērtība1 <br> 2, vērtība2 <br> 3, vērtība3 < br> ...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarly a primary int key<br>- filtersql is a SQL condition. It can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<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::filtersql<br>Example: c_typent:libelle:id::filtersql<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
+ExtrafieldParamHelpsellist=Vērtību saraksts tiek iegūts no tabulas <br> Sintakse: table_name: label_field: id_field :: filtersql <br> Piemērs: c_typent: libelle: id :: filtersql <br> <br> - id_f0 af2 ir a2_fails ir obligāts. Tas var būt vienkāršs tests (piemēram, aktīvs = 1), lai parādītu tikai aktīvo vērtību <br>. Filtrā var izmantot arī $ ID $, kas ir pašreizējā objekta <br> ID. Lai filtrā izmantotu SELECT, izmantojiet atslēgvārdu $ SEL $ apiet pretinjekcijas aizsardzību. <br>, ja vēlaties filtrēt ekstrefieldos, izmantojiet sintaksi extra.fieldcode = ... (kur lauka kods ir extrafield kods) <br> <br> Lai saraksts būtu atkarīgs no cita papildu atribūtu saraksta: <br>: <br> <i> parent_list_code </i> | parent_column: filter <br> <br> Lai saraksts būtu atkarīgs no cita saraksta: <br> c_typent: libelle: ID: a04927
+ExtrafieldParamHelpchkbxlst=Vērtību saraksts nāk no tabulas <br> Sintakse: table_name: label_field: id_field :: filtersql <br> Piemērs: c_typent: libelle: id :: filtersql <br> <br> tikai aktīvs displejs var izmantot arī $ ID $ filtrā. ragana ir pašreizējā objekta <br> ID. Lai atlasītu filtru, izmantojiet $ SEL $ <br>, ja vēlaties filtrēt ekstra laukos, izmantojiet sintaksi extra.fieldcode = ... (kur lauka kods ir kods extrafield) <br> <br> lai būtu sarakstu atkarībā citā papildu atribūtu saraksta: <br> c_typent: Libelle: id: options_ <i> parent_list_code </i> | parent_column: filtrs <br> <br> lai iegūtu sarakstu, atkarībā no citu sarakstā: <br> c_typent: libelle: id: <i> parent_list_code </i> | parent_column: filtrs
 ExtrafieldParamHelplink=Parametriem jābūt ObjectName: Classpath <br> Sintakse: ObjectName: Classpath
 ExtrafieldParamHelpSeparator=Vienkārša atdalītāja atstāšana tukša <br> Iestatiet to uz 1 sabrūkošajam atdalītājam (pēc noklusējuma atveriet jaunu sesiju, pēc tam katras lietotāja sesijai tiek saglabāts statuss) <br> Iestatiet to uz 2 sabrukušajam atdalītājam (jaunajai sesijai pēc noklusējuma sabrūk, pēc tam katras lietotāja sesijas laikā tiek saglabāts statuss)
 LibraryToBuildPDF=Bibliotēka, ko izmanto PDF veidošanai
@@ -548,7 +548,7 @@ Module40Desc=Pārdevēju un pirkumu vadība (pirkumu pasūtījumi un rēķini pa
 Module42Name=Atkļūdošanas žurnāli
 Module42Desc=Žurnalēšana (fails, syslog, ...). Šādi žurnāli ir paredzēti tehniskiem / atkļūdošanas nolūkiem.
 Module43Name=Atkļūdošanas josla
-Module43Desc=A tool for developper adding a debug bar in your browser.
+Module43Desc=Izstrādātāja rīks, kas pārlūkprogrammā pievieno atkļūdošanas joslu.
 Module49Name=Redaktors
 Module49Desc=Redaktora vadība
 Module50Name=Produkti
@@ -562,7 +562,7 @@ Module53Desc=Pakalpojumu pārvaldība
 Module54Name=Līgumi / Abonementi
 Module54Desc=Līgumu (pakalpojumu vai regulāru abonēšanas) vadība
 Module55Name=Svītrkodi
-Module55Desc=Barcode or QR code management
+Module55Desc=Svītrkodu vai QR kodu pārvaldība
 Module56Name=Maksājums ar pārskaitījumu
 Module56Desc=Piegādātāju norēķinu vadīšana ar kredīta pārveduma rīkojumiem. Tas ietver SEPA faila ģenerēšanu Eiropas valstīm.
 Module57Name=Maksājumi ar tiešo debetu
@@ -648,13 +648,13 @@ Module2900Desc=GeoIP MaxMind pārveidošanu iespējas
 Module3200Name=Nemainīgi arhīvi
 Module3200Desc=Iespējojiet nemainīgu biznesa notikumu žurnālu. Notikumi tiek arhivēti reāllaikā. Žurnāls ir tikai lasāmu tabulu ķēdes notikumus, kurus var eksportēt. Šis modulis dažās valstīs var būt obligāts.
 Module3400Name=Sociālie tīkli
-Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
+Module3400Desc=Iespējojiet sociālo tīklu laukus trešajām pusēm un adresēm (skype, twitter, facebook, ...).
 Module4000Name=HRM
 Module4000Desc=Cilvēkresursu vadība (departamenta vadība, darbinieku līgumi un jūtas)
 Module5000Name=Multi-kompānija
 Module5000Desc=Ļauj jums pārvaldīt vairākus uzņēmumus
-Module6000Name=Inter-modules Workflow
-Module6000Desc=Workflow management between different modules (automatic creation of object and/or automatic status change)
+Module6000Name=Starpmoduļu darbplūsma
+Module6000Desc=Darbplūsmas pārvaldība starp dažādiem moduļiem (automātiska objekta izveidošana un / vai automātiska statusa maiņa)
 Module10000Name=Mājas lapas
 Module10000Desc=Izveidojiet vietnes (publiskas) ar WYSIWYG redaktoru. Šī ir tīmekļa pārziņa vai izstrādātāja orientēta CMS (labāk ir zināt HTML un CSS valodu). Vienkārši iestatiet savu tīmekļa serveri (Apache, Nginx, ...), lai norādītu uz atvēlēto Dolibarr direktoriju, lai tas būtu tiešsaistē internetā ar savu domēna vārdu.
 Module20000Name=Atvaļinājumu pieprasījumu pārvaldība
@@ -815,8 +815,8 @@ PermissionAdvanced253=Izveidot/mainīt iekšējoss/ārējos lietotājus un atļa
 Permission254=Izveidot/mainīt ārējos lietotājus tikai
 Permission255=Mainīt citu lietotāju paroli
 Permission256=Izdzēst vai bloķēt citus lietotājus
-Permission262=Extend access to all third parties AND their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
-Permission263=Extend access to all third parties WITHOUT their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission262=Paplašiniet piekļuvi visām trešajām personām UN viņu objektiem (ne tikai trešajām pusēm, kuru lietotājs ir pārdošanas pārstāvis). <br> Nav efektīvs ārējiem lietotājiem (vienmēr tikai un vienīgi attiecībā uz priekšlikumiem, pasūtījumiem, rēķiniem, līgumiem utt.) <br> Nav spēkā projektiem (tikai noteikumi par projekta atļaujām, redzamību un piešķiršanas jautājumiem).
+Permission263=Paplašiniet piekļuvi visām trešajām pusēm BEZ viņu objektiem (ne tikai trešajām personām, kuru lietotājs ir pārdošanas pārstāvis). <br> Nav efektīvs ārējiem lietotājiem (vienmēr tikai un vienīgi attiecībā uz priekšlikumiem, pasūtījumiem, rēķiniem, līgumiem utt.) <br> Nav spēkā projektiem (tikai noteikumi par projekta atļaujām, redzamību un piešķiršanas jautājumiem).
 Permission271=Lasīt CA
 Permission272=Lasīt rēķinus
 Permission273=Izrakstīt rēķinus
@@ -849,10 +849,10 @@ Permission402=Izveidot/mainīt atlaides
 Permission403=Apstiprināt atlaides
 Permission404=Dzēst atlaides
 Permission430=Izmantot Debug Bar
-Permission511=Read salaries and payments (yours and subordinates)
-Permission512=Create/modify salaries and payments
-Permission514=Delete salaries and payments
-Permission517=Read salaries and payments everybody
+Permission511=Lasiet algas un maksājumus (jūsu un padoto)
+Permission512=Izveidojiet / modificējiet algas un maksājumus
+Permission514=Dzēst algas un maksājumus
+Permission517=Lasiet algas un maksājumus visiem
 Permission519=Eksportēt algas
 Permission520=Lasīt aizdevumus
 Permission522=Izveidot / labot aizdevumus
@@ -966,8 +966,8 @@ Permission23003=Dzēst ieplānoto uzdevumu
 Permission23004=Izpildīt ieplānoto uzdevumu
 Permission50101=Izmantot tirdzniecības vietu (SimplePOS)
 Permission50151=Izmantot tirdzniecības vietu (TakePOS)
-Permission50152=Edit sales lines
-Permission50153=Edit ordered sales lines
+Permission50152=Rediģēt pārdošanas rindas
+Permission50153=Rediģēt pasūtītās pārdošanas līnijas
 Permission50201=Lasīt darījumus
 Permission50202=Importēt darījumus
 Permission50330=Lasīt Zapier objektus
@@ -1042,12 +1042,12 @@ DictionaryMeasuringUnits=Mērvienības
 DictionarySocialNetworks=Sociālie tīkli
 DictionaryProspectStatus=Prospekta statuss uzņēmumiem
 DictionaryProspectContactStatus=Prospekta statuss kontaktiem
-DictionaryHolidayTypes=Leave - Types of leave
+DictionaryHolidayTypes=Atvaļinājums - atvaļinājuma veidi
 DictionaryOpportunityStatus=Vadošais statuss projektu / vadībai
 DictionaryExpenseTaxCat=Izdevumu pārskats - transporta kategorijas
 DictionaryExpenseTaxRange=Izdevumu pārskats - diapazons pēc transporta kategorijas
 DictionaryTransportMode=Intracomm pārskats - transporta veids
-DictionaryBatchStatus=Product lot/serial Quality Control status
+DictionaryBatchStatus=Produkta partijas / sērijas kvalitātes kontroles statuss
 TypeOfUnit=Vienības veids
 SetupSaved=Iestatījumi saglabāti
 SetupNotSaved=Iestatīšana nav saglabāta
@@ -1164,7 +1164,7 @@ DoNotSuggestPaymentMode=Neieteikt
 NoActiveBankAccountDefined=Nav definēts aktīvs bankas konts
 OwnerOfBankAccount=Bankas konta īpašnieks %s
 BankModuleNotActive=Bankas kontu modulis nav ieslēgts
-ShowBugTrackLink=Define the link "<strong>%s</strong>" (empty to not display this link, 'github' for the link to the Dolibarr project or define directly an url 'https://...')
+ShowBugTrackLink=Definējiet saiti "<strong> %s </strong>" (tukša, lai nerādītu šo saiti, 'github' saitei uz Dolibarr projektu vai tieši definējiet URL 'https: // ...')
 Alerts=Brīdinājumi
 DelaysOfToleranceBeforeWarning=Kavēšanās, pirms tiek parādīts brīdinājuma brīdinājums par:
 DelaysOfToleranceDesc=Iestatiet aizkavi pirms brīdinājuma ikonas %s parādīšanas ekrānā par novēloto elementu.
@@ -1189,9 +1189,9 @@ SetupDescription2=Šīs divas sadaļas ir obligātas (divi pirmie ieraksti iesta
 SetupDescription3= <a href="%s"> %s -> %s </a> <br> <br> Pamata parametri, ko izmanto, lai pielāgotu ar jūsu lietojumprogrammu saistīto noklusējuma uzvedību (piemēram, valstij).
 SetupDescription4= <a href="%s"> %s -> %s </a> <br> <br> Šī programmatūra ir daudzu moduļu / lietojumprogrammu komplekts. Ar jūsu vajadzībām saistītajiem moduļiem jābūt iespējotiem un konfigurētiem. Parādīsies izvēlnes ieraksti, aktivizējot šos moduļus.
 SetupDescription5=Citi iestatījumu izvēlnes ieraksti pārvalda izvēles parametrus.
-AuditedSecurityEvents=Security events that are audited
-NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
-Audit=Security events
+AuditedSecurityEvents=Drošības pasākumi, kas tiek pārbaudīti
+NoSecurityEventsAreAduited=Netiek pārbaudīti nekādi drošības notikumi. Tos var iespējot no izvēlnes %s
+Audit=Drošības notikumi
 InfoDolibarr=Par Dolibarr
 InfoBrowser=Pārlūkprogrammas info
 InfoOS=Par OS
@@ -1258,8 +1258,8 @@ RunningUpdateProcessMayBeRequired=Šķiet, ka nepieciešams veikt atjaunināšan
 YouMustRunCommandFromCommandLineAfterLoginToUser=Jums ir palaist šo komandu no komandrindas pēc pieteikšanās uz apvalks ar lietotāju <b>%s,</b> vai jums ir pievienot-W iespēju beigās komandrindas, lai sniegtu <b>%s</b> paroli.
 YourPHPDoesNotHaveSSLSupport=SSL funkcijas, kas nav pieejama jūsu PHP
 DownloadMoreSkins=Vairāki izskati lejupielādei
-SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
-SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
+SimpleNumRefModelDesc=Atgriež atsauces numuru formātā %syymm-nnnn, kur yy ir gads, mm ir mēnesis un nnnn ir secīgs automātiski palielināms skaitlis bez atiestatīšanas
+SimpleNumRefNoDateModelDesc=Atgriež atsauces numuru formātā %s-nnnn, kur nnnn ir secīgs automātiski pieaugošs skaitlis bez atiestatīšanas
 ShowProfIdInAddress=Rādīt profesionālo ID ar adresēm
 ShowVATIntaInAddress=Slēpt Kopienas iekšējo PVN numuru ar adresēm
 TranslationUncomplete=Daļējs tulkojums
@@ -1277,7 +1277,7 @@ MAIN_PROXY_HOST=Starpniekserveris: nosaukums/adrese
 MAIN_PROXY_PORT=Starpniekserveris: ports
 MAIN_PROXY_USER=Starpniekserveris: pieteikšanās/lietotājs
 MAIN_PROXY_PASS=Starpniekserveris: parole
-DefineHereComplementaryAttributes=Define any additional / custom attributes that must be added to: %s
+DefineHereComplementaryAttributes=Definējiet visus papildu / pielāgotos atribūtus, kas jāpievieno: %s
 ExtraFields=Papildus atribūti
 ExtraFieldsLines=Papildinošas atribūti (līnijas)
 ExtraFieldsLinesRec=Papildu atribūti (veidņu rēķinu līnijas)
@@ -1323,12 +1323,12 @@ ConditionIsCurrently=Stāvoklis šobrīd ir %s
 YouUseBestDriver=Jūs izmantojat draiveri %s, kas ir labākais šobrīd pieejams draiveris.
 YouDoNotUseBestDriver=Jūs izmantojat draiveri %s, bet ieteicams ir %s.
 NbOfObjectIsLowerThanNoPb=Jums datu bāzē ir tikai %s %s. Tam nav nepieciešama īpaša optimizācija.
-ComboListOptim=Combo list loading optimization
+ComboListOptim=Kombinētā saraksta ielādes optimizācija
 SearchOptim=Meklēšanas optimizācija
-YouHaveXObjectUseComboOptim=You have %s %s in the database. You can go into setup of module to enable loading of combo list on key pressed event.
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other.
-YouHaveXObjectUseSearchOptimDesc=This limits the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
-YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to %s in Home-Setup-Other.
+YouHaveXObjectUseComboOptim=Jums datu bāzē ir %s %s. Jūs varat pāriet uz moduļa iestatīšanu, lai iespējotu kombinēto sarakstu ielādēšanu uz taustiņa nospiešanas notikuma.
+YouHaveXObjectUseSearchOptim=Jums datu bāzē ir %s %s. Pastāvīgo %s var pievienot vienumam 1 sadaļā Mājas iestatīšana - Cits.
+YouHaveXObjectUseSearchOptimDesc=Tas ierobežo meklēšanu tikai virkņu sākumā, kas ļauj datu bāzei izmantot indeksus, un jums nekavējoties jāsaņem atbilde.
+YouHaveXObjectAndSearchOptimOn=Jums datu bāzē ir %s %s, un konstante %s ir iestatīta uz %s sadaļā Home-Setup-Other.
 BrowserIsOK=Jūs izmantojat tīmekļa pārlūku %s. Šī pārlūkprogramma ir droša un ātrdarbīgs.
 BrowserIsKO=Jūs izmantojat tīmekļa pārlūku %s. Šī pārlūka informācija ir slikta izvēle drošībai, veiktspējai un uzticamībai. Mēs iesakām izmantot Firefox, Chrome, Opera vai Safari.
 PHPModuleLoaded=Tiek ielādēts PHP komponents %s
@@ -1440,7 +1440,7 @@ MemberMainOptions=Galvenās iespējas
 AdherentLoginRequired= Pārvaldīt Pieteikšanos katram dalībniekam
 AdherentMailRequired=Lai izveidotu jaunu dalībnieku, nepieciešams e-pasts
 MemberSendInformationByMailByDefault=Rūtiņu, lai nosūtītu pasta apstiprinājums locekļiem (validāciju vai jauns abonements) ir ieslēgts pēc noklusējuma
-MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
+MemberCreateAnExternalUserForSubscriptionValidated=Katram apstiprinātam jaunam dalībnieka abonementam izveidojiet ārēju lietotāja pieteikuminformāciju
 VisitorCanChooseItsPaymentMode=Apmeklētājs var izvēlēties no pieejamiem maksājumu veidiem
 MEMBER_REMINDER_EMAIL=Iespējot automātisku atgādinājumu <b> pa e-pastu </b> par beidzies abonementi. Piezīme. Modulim <strong> %s </strong> jābūt iespējotai un pareizi iestatītai, lai nosūtītu atgādinājumus.
 MembersDocModules=Dokumentu veidnes dokumentiem, kas ģenerēti no dalībnieku ieraksta
@@ -1525,7 +1525,7 @@ LDAPFieldLoginUnix=Lietotājs (Unix)
 LDAPFieldLoginExample=Piemērs: uid
 LDAPFilterConnection=Meklēšanas filtrs
 LDAPFilterConnectionExample=Piemērs: & (objectClass = inetOrgPerson)
-LDAPGroupFilterExample=Example: &(objectClass=groupOfUsers)
+LDAPGroupFilterExample=Piemērs: & (objectClass = groupOfUsers)
 LDAPFieldLoginSamba=Lietotāja vārds (samba, Aktīvā direktorija)
 LDAPFieldLoginSambaExample=Piemērs: kāds konta nosaukums
 LDAPFieldFullname=Vārds un uzvārds
@@ -1757,11 +1757,11 @@ YourCompanyDoesNotUseVAT=Jūsu uzņēmumam ir noteikts, ka PVN netiek izmantots
 AccountancyCode=Grāmatvedības kods
 AccountancyCodeSell=Tirdzniecība kontu. kods
 AccountancyCodeBuy=Iegādes konta. kods
-CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Keep the checkbox “Automatically create the payment” empty by default when creating a new tax
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Veidojot jaunu nodokli, pēc noklusējuma turiet izvēles rūtiņu “Automātiski izveidot maksājumu” tukšu
 ##### Agenda #####
 AgendaSetup=Notikumi un kārtības modulis uzstādīšana
 PasswordTogetVCalExport=Galvenais atļaut eksporta saiti
-SecurityKey = Security Key
+SecurityKey = Drošības atslēga
 PastDelayVCalExport=Neeksportē notikums, kuri vecāki par
 AGENDA_USE_EVENT_TYPE=Izmantojiet notikumu tipus (tiek pārvaldīti izvēlnē Iestatīšana -> Vārdnīcas -> Darba kārtības notikumu veids).
 AGENDA_USE_EVENT_TYPE_DEFAULT=Veidojot notikuma veidlapu, automātiski iestatiet šo noklusējuma vērtību
@@ -1771,7 +1771,7 @@ AGENDA_DEFAULT_VIEW=Kuru skatu vēlaties atvērt pēc noklusējuma, izvēloties
 AGENDA_REMINDER_BROWSER=Iespējojiet notikuma atgādinājumu <b> lietotāja pārlūkprogrammā </b> (Kad ir atgādinājuma datums, pārlūkprogramma parāda uznirstošo logu. Katrs lietotājs var atspējot šādus paziņojumus pārlūka paziņojumu iestatījumos).
 AGENDA_REMINDER_BROWSER_SOUND=Iespējot skaņas paziņojumu
 AGENDA_REMINDER_EMAIL=Iespējojiet notikuma atgādinājumu <b>, nosūtot e-pastus </b> (katram notikumam var noteikt atgādinājuma opciju / aizkavi).
-AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the scheduled job %s must be enough to be sure that the remind are sent at the correct moment.
+AGENDA_REMINDER_EMAIL_NOTE=Piezīme: Plānotā darba %s biežumam jābūt pietiekamam, lai pārliecinātos, ka atgādinājums tiek nosūtīts pareizajā brīdī.
 AGENDA_SHOW_LINKED_OBJECT=Parādīt saistīto objektu darba kārtībā
 ##### Clicktodial #####
 ClickToDialSetup=Klikšķiniet lai  Dial moduļa uzstādīšanas
@@ -1902,7 +1902,7 @@ BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
-EnterAnyCode=This field contains a reference to identify the line. Enter any value of your choice, but without special characters.
+EnterAnyCode=Šajā laukā ir norāde, lai identificētu līniju. Ievadiet jebkuru izvēlēto vērtību, bet bez īpašām rakstzīmēm.
 Enter0or1=Ievadiet 0 vai 1
 UnicodeCurrency=Ievadiet šeit starp aplikācijām, baitu skaitļu sarakstu, kas attēlo valūtas simbolu. Piemēram: attiecībā uz $ ievadiet [36] - Brazīlijas reālajam R $ [82,36] - par € ievadiet [8364]
 ColorFormat=RGB krāsa ir HEX formātā, piemēram: FF0000
@@ -1987,11 +1987,11 @@ MAIN_PDF_MARGIN_RIGHT=Labā puse PDF failā
 MAIN_PDF_MARGIN_TOP=Galvene PDF failā
 MAIN_PDF_MARGIN_BOTTOM=Kājene PDF failā
 MAIN_DOCUMENTS_LOGO_HEIGHT=Logotipa augstums PDF formātā
-MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add picture on proposal line
-MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add electronic sign in PDF
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Pievienojiet attēlu uz piedāvājuma līnijas
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Pievienojiet elektronisko pierakstu PDF formātā
 NothingToSetup=Šim modulim nav nepieciešama īpaša iestatīšana.
 SetToYesIfGroupIsComputationOfOtherGroups=Iestatiet to uz "jā", ja šī grupa ir citu grupu aprēķins
-EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
+EnterCalculationRuleIfPreviousFieldIsYes=Ievadiet aprēķina kārtulu, ja iepriekšējais lauks bija iestatīts uz Jā. <br> Piemēram: <br> CODEGRP1 + CODEGRP2
 SeveralLangugeVariatFound=Atrasti vairāki valodu varianti
 RemoveSpecialChars=Noņemt īpašās rakstzīmes
 COMPANY_AQUARIUM_CLEAN_REGEX=Regex filtrs tīrajai vērtībai (COMPANY_AQUARIUM_CLEAN_REGEX)
@@ -2007,7 +2007,7 @@ SocialNetworkSetup=Moduļa Sociālo tīklu iestatīšana
 EnableFeatureFor=Iespējot funkcijas <strong> %s </strong>
 VATIsUsedIsOff=Piezīme. Izvēlnē %s - %s izvēlētā pārdošanas nodokļa vai PVN izmantošana ir iestatīta uz <strong> Izslēgts </strong>, tāpēc pārdošanas nodoklis vai izmantotais PVN vienmēr būs 0 pārdošanai.
 SwapSenderAndRecipientOnPDF=Pārsūtīt sūtītāja un adresāta adreses pozīciju PDF dokumentos
-FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields and combo lists only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
+FeatureSupportedOnTextFieldsOnly=Brīdinājums, funkcija tiek atbalstīta tikai teksta laukos un kombinētajos sarakstos. Lai aktivizētu šo funkciju, ir jāiestata arī URL parametrs action = create vai action = edit. VAI lapas nosaukumam jābeidzas ar “new.php”.
 EmailCollector=E-pasta savācējs
 EmailCollectorDescription=Pievienojiet ieplānoto darbu un iestatīšanas lapu, lai regulāri skenētu e-pasta kastes (izmantojot IMAP protokolu) un ierakstītu savā pieteikumā saņemtos e-pasta ziņojumus pareizajā vietā un / vai automātiski izveidotu ierakstus (piemēram, vadus).
 NewEmailCollector=Jauns e-pasta savācējs
@@ -2074,11 +2074,11 @@ UseDebugBar=Izmantojiet atkļūdošanas joslu
 DEBUGBAR_LOGS_LINES_NUMBER=Pēdējo žurnālu rindu skaits, kas jāsaglabā konsolē
 WarningValueHigherSlowsDramaticalyOutput=Brīdinājums, augstākas vērtības palēnina dramatisko izeju
 ModuleActivated=Modulis %s ir aktivizēts un palēnina saskarni
-ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances and security)
-ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
+ModuleActivatedWithTooHighLogLevel=Modulis %s tiek aktivizēts ar pārāk augstu mežizstrādes līmeni (labākai veiktspējai un drošībai mēģiniet izmantot zemāku līmeni)
+ModuleSyslogActivatedButLevelNotTooVerbose=Modulis %s ir aktivizēts un žurnāla līmenis (%s) ir pareizs (ne pārāk daudzbalsīgs)
 IfYouAreOnAProductionSetThis=Ja izmantojat ražošanas vidi, šim rekvizītam ir jāiestata kā %s.
 AntivirusEnabledOnUpload=Augšupielādētajos failos ir iespējota antivīruss
-SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
+SomeFilesOrDirInRootAreWritable=Daži faili vai direktoriji nav tikai lasīšanas režīmā
 EXPORTS_SHARE_MODELS=Eksporta modeļi ir kopīgi ar visiem
 ExportSetup=Moduļa Eksportēšana iestatīšana
 ImportSetup=Moduļa importēšanas iestatīšana
@@ -2102,8 +2102,8 @@ MakeAnonymousPing=Izveidojiet anonīmu Ping '+1' Dolibarr pamata serverim (to ve
 FeatureNotAvailableWithReceptionModule=Funkcija nav pieejama, ja ir iespējota moduļa uztveršana
 EmailTemplate=E-pasta veidne
 EMailsWillHaveMessageID=E-pastam būs tags “Atsauces”, kas atbilst šai sintaksei
-PDF_SHOW_PROJECT=Show project on document
-ShowProjectLabel=Project Label
+PDF_SHOW_PROJECT=Parādīt projektu dokumentā
+ShowProjectLabel=Projekta etiķete
 PDF_USE_ALSO_LANGUAGE_CODE=Ja vēlaties, lai daži PDF faili tiktu dublēti 2 dažādās valodās tajā pašā ģenerētajā PDF failā, jums šeit ir jāiestata šī otrā valoda, lai ģenerētais PDF saturētu vienā un tajā pašā lappusē 2 dažādas valodas, vienu izvēloties, ģenerējot PDF, un šo ( tikai dažas PDF veidnes to atbalsta). Vienā PDF formātā atstājiet tukšumu 1 valodā.
 FafaIconSocialNetworksDesc=Šeit ievadiet FontAwesome ikonas kodu. Ja jūs nezināt, kas ir FontAwesome, varat izmantot vispārīgo vērtību fa-adrešu grāmata.
 RssNote=Piezīme. Katra RSS plūsmas definīcija nodrošina logrīku, kas jums jāiespējo, lai tas būtu pieejams informācijas panelī
@@ -2118,29 +2118,30 @@ SwitchThisForABetterSecurity=Lai nodrošinātu lielāku drošību, ieteicams šo
 DictionaryProductNature= Produkta veids
 CountryIfSpecificToOneCountry=Valsts (ja tā ir konkrēta valsts)
 YouMayFindSecurityAdviceHere=Šeit varat atrast drošības konsultācijas
-ModuleActivatedMayExposeInformation=This PHP extension may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedMayExposeInformation=Šis PHP paplašinājums var atklāt konfidenciālus datus. Ja jums tas nav nepieciešams, atspējojiet to.
 ModuleActivatedDoNotUseInProduction=Izstrādei paredzētais modulis ir iespējots. Neiespējojiet to ražošanas vidē.
 CombinationsSeparator=Atdalītāja raksturs produktu kombinācijām
 SeeLinkToOnlineDocumentation=Piemēru skatiet saiti uz tiešsaistes dokumentēšanu augšējā izvēlnē
 SHOW_SUBPRODUCT_REF_IN_PDF=Ja tiek izmantots moduļa <b> %s </b> līdzeklis "%s", parādiet sīkāku informāciju par komplekta apakšproduktiem PDF formātā.
 AskThisIDToYourBank=Lai iegūtu šo ID, sazinieties ar savu banku
-AdvancedModeOnly=Permision available in Advanced permission mode only
-ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
-MailToSendEventOrganization=Event Organization
-AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
-YouShouldDisablePHPFunctions=You should disable PHP functions
-IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands in custom code, you shoud disable PHP functions
-PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
-NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
-RecommendedValueIs=Recommended: %s
-NotRecommended=Not recommanded
-ARestrictedPath=A restricted path
-CheckForModuleUpdate=Check for external modules updates
-CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
-ModuleUpdateAvailable=An update is available
-NoExternalModuleWithUpdate=No updates found for external modules
-SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
-YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
-RandomlySelectedIfSeveral=Randomly selected if several pictures are available
-DatabasePasswordObfuscated=Database password is obfuscated in conf file
-DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
+AdvancedModeOnly=Atļauja ir pieejama tikai papildu atļauju režīmā
+ConfFileIsReadableOrWritableByAnyUsers=Conf fails ir lasāms vai rakstāms visiem lietotājiem. Piešķirt atļauju tikai tīmekļa servera lietotājam un grupai.
+MailToSendEventOrganization=Pasākuma organizēšana
+AGENDA_EVENT_DEFAULT_STATUS=Noklusējuma notikuma statuss, veidojot notikumu no formas
+YouShouldDisablePHPFunctions=Jums vajadzētu atspējot PHP funkcijas
+IfCLINotRequiredYouShouldDisablePHPFunctions=PHP funkcijas ir jāatspējo, izņemot gadījumus, kad sistēmas komandas ir jāpalaiž pielāgotā kodā
+PHPFunctionsRequiredForCLI=Apvalka vajadzībām (piemēram, ieplānota darba dublēšana vai anitivurs programmas palaišana) jums ir jāsaglabā PHP funkcijas
+NoWritableFilesFoundIntoRootDir=Jūsu saknes direktorijā netika atrasti ierasto failu vai direktoriju kopējās programmas (labi)
+RecommendedValueIs=Ieteicams: %s
+NotRecommended=Nav ieteikts
+ARestrictedPath=Ierobežots ceļš
+CheckForModuleUpdate=Pārbaudiet, vai nav atjaunināti ārējie moduļi
+CheckForModuleUpdateHelp=Šī darbība izveidos savienojumu ar ārējo moduļu redaktoriem, lai pārbaudītu, vai ir pieejama jauna versija.
+ModuleUpdateAvailable=Ir pieejams atjauninājums
+NoExternalModuleWithUpdate=Ārējiem moduļiem nav atrasti atjauninājumi
+SwaggerDescriptionFile=Swagger API apraksta fails (piemēram, lietošanai ar pārorientēšanu)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=Jūs iespējojāt novecojušu WS API. Tā vietā jums vajadzētu izmantot REST API.
+RandomlySelectedIfSeveral=Nejauši izvēlēts, ja ir pieejami vairāki attēli
+DatabasePasswordObfuscated=Datu bāzes parole ir neskaidra konf failā
+DatabasePasswordNotObfuscated=Datu bāzes parole NAV apmulsināta conf failā
+APIsAreNotEnabled=API moduļi nav iespējoti
diff --git a/htdocs/langs/lv_LV/agenda.lang b/htdocs/langs/lv_LV/agenda.lang
index f985c7f994e..d2525186222 100644
--- a/htdocs/langs/lv_LV/agenda.lang
+++ b/htdocs/langs/lv_LV/agenda.lang
@@ -4,7 +4,7 @@ Actions=Notikumi
 Agenda=Darba kārtība
 TMenuAgenda=Darba kārtība
 Agendas=Darba kārtības
-LocalAgenda=Default calendar
+LocalAgenda=Noklusējuma kalendārs
 ActionsOwnedBy=Notikums pieder
 ActionsOwnedByShort=Īpašnieks
 AffectedTo=Piešķirts
@@ -20,7 +20,7 @@ MenuToDoActions=Visi nepabeigtie pasākumi
 MenuDoneActions=Visi izbeigtie notikumi
 MenuToDoMyActions=Mani nepabeigtie notikumi
 MenuDoneMyActions=Mani izbeigtie notikumi
-ListOfEvents=List of events (default calendar)
+ListOfEvents=Notikumu saraksts (noklusējuma kalendārs)
 ActionsAskedBy=Notikumu ziņoja
 ActionsToDoBy=Pasākums piešķirts
 ActionsDoneBy=Pasākumi, ko veikuši
@@ -38,7 +38,7 @@ ActionsEvents=Pasākumi, par kuriem Dolibarr radīs prasību kārtībā automāt
 EventRemindersByEmailNotEnabled=Pasākumu atgādinājumi pa e-pastu netika iespējoti %s moduļa iestatījumos.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Trešā puse izveidota %s
-COMPANY_MODIFYInDolibarr=Third party %s modified
+COMPANY_MODIFYInDolibarr=Trešā puse %s modificēta
 COMPANY_DELETEInDolibarr=Izdzēsta trešā persona %s
 ContractValidatedInDolibarr=Līgumi %s apstiprināti
 CONTRACT_DELETEInDolibarr=Līgums %s svītrots
@@ -88,7 +88,7 @@ OrderDeleted=Pasūtījums dzēsts
 InvoiceDeleted=Rēķins dzēsts
 DraftInvoiceDeleted=Rēķina melnraksts ir izdzēsts
 CONTACT_CREATEInDolibarr=Kontaktpersona %s ir izveidota
-CONTACT_MODIFYInDolibarr=Contact %s modified
+CONTACT_MODIFYInDolibarr=Saziņa %s ir modificēta
 CONTACT_DELETEInDolibarr=Kontaktpersona %s ir izdzēsta
 PRODUCT_CREATEInDolibarr=Produkts %s ir izveidots
 PRODUCT_MODIFYInDolibarr=Produkts %s ir labots
@@ -121,7 +121,7 @@ MRP_MO_UNVALIDATEInDolibarr=MO iestatīts uz melnraksta statusu
 MRP_MO_PRODUCEDInDolibarr=MO ražots
 MRP_MO_DELETEInDolibarr=MO ir izdzēsts
 MRP_MO_CANCELInDolibarr=MO atcelts
-PAIDInDolibarr=%s paid
+PAIDInDolibarr=%s samaksāts
 ##### End agenda events #####
 AgendaModelModule=Dokumentu veidnes notikumam
 DateActionStart=Sākuma datums
@@ -133,7 +133,7 @@ AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to use
 AgendaUrlOptionsProject=<b> project = __ PROJECT_ID __ </ b>, lai ierobežotu izlaidi darbībām, kas saistītas ar projektu <b> __ PROJECT_ID __ </ b>.
 AgendaUrlOptionsNotAutoEvent=<b> notactiontype = systemauto </b>, lai izslēgtu automātiskus notikumus.
 AgendaUrlOptionsIncludeHolidays= <b> includeholidays = 1 </b>, lai iekļautu svētku pasākumus.
-AgendaShowBirthdayEvents=Birthdays of contacts
+AgendaShowBirthdayEvents=Kontaktu dzimšanas dienas
 AgendaHideBirthdayEvents=Slēpt kontaktu dzimšanas dienas
 Busy=Aizņemts
 ExportDataset_event1=Notikumu saraksts
diff --git a/htdocs/langs/lv_LV/assets.lang b/htdocs/langs/lv_LV/assets.lang
index 7779c6b5ec0..29583351333 100644
--- a/htdocs/langs/lv_LV/assets.lang
+++ b/htdocs/langs/lv_LV/assets.lang
@@ -22,7 +22,7 @@ AccountancyCodeAsset = Grāmatvedības kods (aktīvs)
 AccountancyCodeDepreciationAsset = Grāmatvedības kods (nolietojuma aktīvu konts)
 AccountancyCodeDepreciationExpense = Grāmatvedības kods (nolietojuma izmaksu konts)
 NewAssetType=Jauns aktīvu veids
-AssetsTypeSetup=Aktīvu veidu iestatīšana
+AssetsTypeSetup=Aktīvu veida iestatīšana
 AssetTypeModified=Pamatlīdzekļu veids pārveidots
 AssetType=Aktīva veids
 AssetsLines=Aktīvi
@@ -42,7 +42,7 @@ ModuleAssetsDesc = Aktīvu apraksts
 AssetsSetup = Aktīvu uzstādīšana
 Settings = Iestatījumi
 AssetsSetupPage = Aktīvu iestatīšanas lapa
-ExtraFieldsAssetsType = Papildu atribūti (Assets type)
+ExtraFieldsAssetsType = Papildu atribūti (aktīvu veids)
 AssetsType=Aktīva veids
 AssetsTypeId=Aktīva veida id
 AssetsTypeLabel=Aktīva veida nosaukums
@@ -55,5 +55,13 @@ MenuAssets = Aktīvi
 MenuNewAsset = Jauns aktīvs
 MenuTypeAssets = Ierakstiet aktīvus
 MenuListAssets = Saraksts
-MenuNewTypeAssets = Jauns veids
+MenuNewTypeAssets = Jauns
 MenuListTypeAssets = Saraksts
+
+#
+# Module
+#
+Asset=Aktīvs
+NewAssetType=Jauns aktīvu veids
+NewAsset=Jauns aktīvs
+ConfirmDeleteAsset=Vai tiešām vēlaties dzēst šo īpašumu?
diff --git a/htdocs/langs/lv_LV/banks.lang b/htdocs/langs/lv_LV/banks.lang
index 7fefb3ed206..ca4bcbbb463 100644
--- a/htdocs/langs/lv_LV/banks.lang
+++ b/htdocs/langs/lv_LV/banks.lang
@@ -109,13 +109,13 @@ SocialContributionPayment=Sociālā/fiskālā nodokļa samaksa
 BankTransfer=Kredīta pārvedums
 BankTransfers=Kredīta pārvedumi
 MenuBankInternalTransfer=Iekšējā pārsūtīšana
-TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
+TransferDesc=Izmantojiet iekšējo pārskaitījumu, lai pārsūtītu no viena konta uz citu, lietojumprogramma ierakstīs divus ierakstus: debets avota kontā un kredīts mērķa kontā. Šim darījumam tiks izmantota tā pati summa, etiķete un datums.
 TransferFrom=No
 TransferTo=Kam
 TransferFromToDone=No <b>%s</b> nodošana <b>%s</b> par <b>%s</b> %s ir ierakstīta.
 CheckTransmitter=Nosūtītājs
 ValidateCheckReceipt=Vai apstiprināt šo čeku?
-ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
+ConfirmValidateCheckReceipt=Vai tiešām vēlaties iesniegt šo čeku apstiprināšanai? Tas nav izdarīts.
 DeleteCheckReceipt=Dzēst šo čeku?
 ConfirmDeleteCheckReceipt=Vai tiešām vēlaties dzēst šo čeka kvīti?
 BankChecks=Bankas čeki
@@ -128,7 +128,7 @@ ConfirmDeleteTransaction=Vai tiešām vēlaties dzēst šo ierakstu?
 ThisWillAlsoDeleteBankRecord=Tas arī izdzēš izveidotos bankas darījumus
 BankMovements=Kustība
 PlannedTransactions=Plānotie darījumi
-Graph=Graphs
+Graph=Grafiki
 ExportDataset_banque_1=Banku darījumi un konta izraksts
 ExportDataset_banque_2=Depozīta kvīts
 TransactionOnTheOtherAccount=Pārskaitījums uz otru kontu
@@ -142,7 +142,7 @@ AllAccounts=Visi bankas un naudas konti
 BackToAccount=Atpakaļ uz kontu
 ShowAllAccounts=Parādīt visiem kontiem
 FutureTransaction=Nākotnes darījums. Nevar saskaņot.
-SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
+SelectChequeTransactionAndGenerate=Atlasiet / filtrējiet čekus, kas jāiekļauj čeku depozīta kvītī. Pēc tam noklikšķiniet uz "Izveidot".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Galu galā, norādiet kategoriju, kurā klasificēt ierakstus
 ToConciliate=Saskaņot?
@@ -174,11 +174,11 @@ YourSEPAMandate=Jūsu SEPA mandāts
 FindYourSEPAMandate=Tas ir jūsu SEPA mandāts, lai pilnvarotu mūsu uzņēmumu veikt tiešā debeta pasūtījumu savai bankai. Atgriezt to parakstu (skenēt parakstīto dokumentu) vai nosūtīt pa pastu uz
 AutoReportLastAccountStatement=Veicot saskaņošanu, automātiski aizpildiet lauka “bankas izraksta numurs” ar pēdējo izraksta numuru
 CashControl=POS kases kontrole
-NewCashFence=New cash desk opening or closing
+NewCashFence=Jaunas kases atvēršana vai aizvēršana
 BankColorizeMovement=Krāsojiet kustības
 BankColorizeMovementDesc=Ja šī funkcija ir iespējota, jūs varat izvēlēties īpašu fona krāsu debeta vai kredīta pārvietošanai
 BankColorizeMovementName1=Debeta kustības fona krāsa
 BankColorizeMovementName2=Kredīta aprites fona krāsa
 IfYouDontReconcileDisableProperty=Ja dažos bankas kontos neveicat bankas saskaņošanu, atspējojiet rekvizītu "%s", lai noņemtu šo brīdinājumu.
 NoBankAccountDefined=Nav noteikts bankas konts
-NoRecordFoundIBankcAccount=No record found in bank account. Commonly, this occurs when a record has been deleted manually from the list of transaction in the bank account (for example during a reconciliation of the bank account). Another reason is that the payment was recorded when the module "%s" was disabled.
+NoRecordFoundIBankcAccount=Bankas kontā nav atrasts neviens ieraksts. Parasti tas notiek, ja ieraksts ir manuāli izdzēsts no bankas konta darījumu saraksta (piemēram, bankas konta saskaņošanas laikā). Vēl viens iemesls ir tas, ka maksājums tika reģistrēts, kad tika atspējots modulis "%s".
diff --git a/htdocs/langs/lv_LV/bills.lang b/htdocs/langs/lv_LV/bills.lang
index 90ad7a9ad47..e5220e44b61 100644
--- a/htdocs/langs/lv_LV/bills.lang
+++ b/htdocs/langs/lv_LV/bills.lang
@@ -55,7 +55,7 @@ CustomerInvoice=Klienta rēķins
 CustomersInvoices=Klienta rēķini
 SupplierInvoice=Piegādātāja rēķins
 SuppliersInvoices=Piegādātāja rēķini
-SupplierInvoiceLines=Vendor invoice lines
+SupplierInvoiceLines=Pārdevēja rēķina rindas
 SupplierBill=Piegādātāja rēķins
 SupplierBills=Piegādātāja rēķini
 Payment=Maksājums
@@ -82,8 +82,8 @@ PaymentsAlreadyDone=Jau samaksāts
 PaymentsBackAlreadyDone=Jau veiktas atmaksas
 PaymentRule=Maksājuma noteikums
 PaymentMode=Maksājuma veids
-DefaultPaymentMode=Default Payment Type
-DefaultBankAccount=Default Bank Account
+DefaultPaymentMode=Noklusējuma maksājuma veids
+DefaultBankAccount=Noklusējuma bankas konts
 PaymentTypeDC=Debet karte/ kredīt karte
 PaymentTypePP=PayPal
 IdPaymentMode=Maksājuma veids (id)
@@ -120,7 +120,7 @@ ConvertExcessPaidToReduc=Konvertēt pārsniegto summu par atlaidi
 EnterPaymentReceivedFromCustomer=Ievadiet no klienta saņemto naudas summu
 EnterPaymentDueToCustomer=Veikt maksājumu dēļ klientam
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
-PriceBase=Base price
+PriceBase=Bāzes cena
 BillStatus=Rēķina statuss
 StatusOfGeneratedInvoices=Izveidoto rēķinu statuss
 BillStatusDraft=Melnraksts (jāapstiprina)
@@ -259,7 +259,7 @@ DateMaxPayment=Jāapmaksā līdz
 DateInvoice=Rēķina datums
 DatePointOfTax=Nodokļu punkts
 NoInvoice=Nav rēķinu
-NoOpenInvoice=No open invoice
+NoOpenInvoice=Nav atvērta rēķina
 ClassifyBill=Klasificēt rēķinu
 SupplierBillsToPay=Neapmaksāti pārdevēja rēķini
 CustomerBillsUnpaid=Neapmaksātie klienta rēķini
@@ -377,7 +377,7 @@ DateLastGeneration=Jaunākais veidošanas datums
 DateLastGenerationShort=Datuma pēdējais gen.
 MaxPeriodNumber=Maks. rēķinu veidošanas skaits
 NbOfGenerationDone=Rēķina paaudzes skaits jau ir pabeigts
-NbOfGenerationOfRecordDone=Number of record generation already done
+NbOfGenerationOfRecordDone=Jau veikto ierakstu ģenerēšanas skaits
 NbOfGenerationDoneShort=Veicamās paaudzes skaits
 MaxGenerationReached=Maksimālais sasniegto paaudžu skaits
 InvoiceAutoValidate=Rēķinus automātiski apstiprināt
@@ -418,7 +418,7 @@ PaymentCondition14DENDMONTH=14 dienu laikā pēc mēneša beigām
 FixAmount=Fiksēta summa - 1 rinda ar etiķeti '%s'
 VarAmount=Mainīgais apjoms (%% kop.)
 VarAmountOneLine=Mainīgā summa (%% kopā) - 1 rinda ar etiķeti '%s'
-VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
+VarAmountAllLines=Mainīga summa (%% tot.) - visas līnijas no sākuma
 # PaymentType
 PaymentTypeVIR=Bankas pārskaitījums
 PaymentTypeShortVIR=Bankas pārskaitījums
@@ -455,7 +455,7 @@ RegulatedOn=Regulēta uz
 ChequeNumber=Pārbaudiet N °
 ChequeOrTransferNumber=Pārbaudiet / Transfer N °
 ChequeBordereau=Pārbaudīt grafiku
-ChequeMaker=Check/Transfer sender
+ChequeMaker=Pārbaudīt / pārsūtīt sūtītāju
 ChequeBank=Čeka izsniegšanas banka
 CheckBank=Čeks
 NetToBePaid=Neto jāmaksā
@@ -499,16 +499,16 @@ Cash=Skaidra nauda
 Reported=Kavējas
 DisabledBecausePayments=Nav iespējams, kopš šeit ir daži no maksājumiem
 CantRemovePaymentWithOneInvoicePaid=Nevar dzēst maksājumu, jo eksistē kaut viens rēķins, kas klasificēts kā samaksāts
-CantRemovePaymentVATPaid=Can't remove payment since VAT declaration is classified paid
-CantRemovePaymentSalaryPaid=Can't remove payment since salary is classified paid
+CantRemovePaymentVATPaid=Nevar noņemt maksājumu, jo PVN deklarācija ir klasificēta kā apmaksāta
+CantRemovePaymentSalaryPaid=Nevar noņemt maksājumu, jo alga ir klasificēta kā samaksāta
 ExpectedToPay=Gaidāmais maksājums
 CantRemoveConciliatedPayment=Nevar noņemt saskaņoto maksājumu
 PayedByThisPayment=Samaksāts ar šo maksājumu
 ClosePaidInvoicesAutomatically=Automātiski klasificējiet visus standarta, priekšapmaksas vai rezerves rēķinus kā “Apmaksāts”, ja maksājums ir pilnībā veikts.
 ClosePaidCreditNotesAutomatically=Automātiski klasificējiet visas kredītzīmes kā "Apmaksātu", kad atmaksa tiek veikta pilnībā.
 ClosePaidContributionsAutomatically=Automātiski klasificējiet visas sociālās vai fiskālās iemaksas kā &quot;Apmaksātās&quot;, ja maksājums tiek veikts pilnībā.
-ClosePaidVATAutomatically=Classify automatically VAT declaration as "Paid" when payment is done entirely.
-ClosePaidSalaryAutomatically=Classify automatically salary as "Paid" when payment is done entirely.
+ClosePaidVATAutomatically=Ja maksājums tiek veikts pilnībā, automātiski klasificējiet PVN deklarāciju kā “Apmaksāts”.
+ClosePaidSalaryAutomatically=Ja maksājums tiek veikts pilnībā, klasificējiet algu automātiski kā “Maksātu”.
 AllCompletelyPayedInvoiceWillBeClosed=Visi rēķini, kuriem nav jāmaksā, tiks automātiski aizvērti ar statusu "Paid".
 ToMakePayment=Maksāt
 ToMakePaymentBack=Atmaksāt
@@ -521,10 +521,10 @@ YouMustCreateStandardInvoiceFirstDesc=Vispirms vispirms jāizveido standarta rē
 PDFCrabeDescription=Rēķina PDF veidne Krabis. Pilna rēķina veidne (vecā Sponge veidnes ieviešana)
 PDFSpongeDescription=Rēķina PDF veidne Sponge. Pilnīga rēķina veidne
 PDFCrevetteDescription=Rēķina PDF veidne Crevette. Pabeigta rēķina veidne situāciju rēķiniem
-TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
-MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+TerreNumRefModelDesc1=Atgriešanās numurs formātā %syymm-nnnn standarta rēķiniem un %syymm-nnnn kredītzīmēm, kur yy ir gads, mm ir mēnesis, un nnnn ir secīgs automātiski palielināms skaitlis bez pārtraukuma un bez atgriešanās pie 0
+MarsNumRefModelDesc1=Atgriešanas numurs formātā %syymm-nnnn standarta rēķiniem, %syymm-nnnn aizstājējrēķiniem, %syymm-nnnn priekšapmaksas rēķiniem un %syymn-nnnn ir bez pārtraukuma un bez atgriešanās pie 0
 TerreNumRefModelError=Rēķinu sākot ar syymm $ jau pastāv un nav saderīgs ar šo modeli secību. Noņemt to vai pārdēvēt to aktivizētu šo moduli.
-CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+CactusNumRefModelDesc1=Atgriešanās numurs formātā %syymm-nnnn standarta rēķiniem, %syymm-nnnn kredītzīmēm un %syymm-nnnn priekšapmaksas rēķiniem, kur yy ir gads, mm ir mēnesis, un nnnn nav secīgs automātiskais pārtraukums. 0
 EarlyClosingReason=Priekšlaicīgas slēgšanas iemesls
 EarlyClosingComment=Priekšlaicīgās slēgšanas piezīme
 ##### Types de contacts #####
@@ -590,4 +590,4 @@ FacParentLine=Rēķinu rindas vecāks
 SituationTotalRayToRest=Atlikušais maksājums bez nodokļa
 PDFSituationTitle=Situācija Nr. %d
 SituationTotalProgress=Kopējais progress %d %%
-SearchUnpaidInvoicesWithDueDate=Search unpaid invoices with a due date = %s
+SearchUnpaidInvoicesWithDueDate=Meklēt neapmaksātos rēķinos ar termiņu = %s
diff --git a/htdocs/langs/lv_LV/blockedlog.lang b/htdocs/langs/lv_LV/blockedlog.lang
index 3318d1d334c..79ac073bbad 100644
--- a/htdocs/langs/lv_LV/blockedlog.lang
+++ b/htdocs/langs/lv_LV/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Nepārveidojami žurnāli
 ShowAllFingerPrintsMightBeTooLong=Rādīt visus arhivētos žurnālus (var būt daudz)
 ShowAllFingerPrintsErrorsMightBeTooLong=Rādīt visus nederīgos arhīva žurnālus (var būt garš)
 DownloadBlockChain=Lejupielādējiet pirkstu nospiedumus
-KoCheckFingerprintValidity=Arhivēts žurnāla ieraksts nav derīgs. Tas nozīmē, ka kāds (hakeris?) Ir mainījis dažus šī ieraksta datus pēc tā ierakstīšanas vai ir izdzēsis iepriekšējo arhivēto ierakstu (pārbaudiet, vai pastāv līnija ar iepriekšējo #).
+KoCheckFingerprintValidity=Arhivētais žurnāla ieraksts nav derīgs. Tas nozīmē, ka kāds (hakeris?) Ir pārveidojis dažus šī ieraksta datus pēc to ierakstīšanas, vai ir izdzēsis iepriekšējo arhivēto ierakstu (pārbaudiet, vai pastāv rinda ar iepriekšējo #) vai ir mainījusi iepriekšējā ieraksta kontrolsummu.
 OkCheckFingerprintValidity=Arhivēts žurnāla ieraksts ir derīgs. Dati par šo līniju netika mainīti un ieraksts seko iepriekšējam.
 OkCheckFingerprintValidityButChainIsKo=Arhivētais žurnāls šķiet derīgs salīdzinājumā ar iepriekšējo, bet ķēde agrāk tika bojāta.
 AddedByAuthority=Uzglabāti tālvadības iestādē
@@ -35,7 +35,7 @@ logDON_DELETE=Ziedojuma loģiska dzēšana
 logMEMBER_SUBSCRIPTION_CREATE=Dalībnieka abonements izveidots
 logMEMBER_SUBSCRIPTION_MODIFY=Dalībnieku abonēšana ir labota
 logMEMBER_SUBSCRIPTION_DELETE=Locekļu abonēšanas loģiskā dzēšana
-logCASHCONTROL_VALIDATE=Cash desk closing recording
+logCASHCONTROL_VALIDATE=Kases slēgšanas ieraksts
 BlockedLogBillDownload=Klientu rēķinu lejupielāde
 BlockedLogBillPreview=Klienta rēķina priekšskatījums
 BlockedlogInfoDialog=Žurnāla detaļas
diff --git a/htdocs/langs/lv_LV/boxes.lang b/htdocs/langs/lv_LV/boxes.lang
index e861854a92e..bc76a9b79d3 100644
--- a/htdocs/langs/lv_LV/boxes.lang
+++ b/htdocs/langs/lv_LV/boxes.lang
@@ -18,13 +18,13 @@ BoxLastActions=Jaunākās darbības
 BoxLastContracts=Jaunākie līgumi
 BoxLastContacts=Jaunākie kontakti/adreses
 BoxLastMembers=Jaunākie dalībnieki
-BoxLastModifiedMembers=Latest modified members
-BoxLastMembersSubscriptions=Latest member subscriptions
+BoxLastModifiedMembers=Jaunākie modificētie dalībnieki
+BoxLastMembersSubscriptions=Jaunākie dalībnieku abonementi
 BoxFicheInter=Jaunākās intervences
 BoxCurrentAccounts=Atvērto kontu atlikums
 BoxTitleMemberNextBirthdays=Šī mēneša dzimšanas dienas (dalībnieki)
-BoxTitleMembersByType=Members by type
-BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
+BoxTitleMembersByType=Locekļi pēc veida
+BoxTitleMembersSubscriptionsByYear=Dalībnieku abonēšana pēc gada
 BoxTitleLastRssInfos=Jaunākās %s ziņas no %s
 BoxTitleLastProducts=Produkti / Pakalpojumi: pēdējais %s modificēts
 BoxTitleProductsAlertStock=Produkti: krājumu brīdinājums
@@ -46,11 +46,11 @@ BoxMyLastBookmarks=Grāmatzīmes: jaunākās %s
 BoxOldestExpiredServices=Vecākais aktīvais beidzies pakalpojums
 BoxLastExpiredServices=Jaunākie %s vecākie kontakti ar aktīviem derīguma termiņa beigām
 BoxTitleLastActionsToDo=Jaunākās %s darbības, ko darīt
-BoxTitleLastContracts=Latest %s contracts which were modified
-BoxTitleLastModifiedDonations=Latest %s donations which were modified
-BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
-BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
-BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
+BoxTitleLastContracts=Jaunākie %s līgumi, kas tika mainīti
+BoxTitleLastModifiedDonations=Jaunākie %s ziedojumi, kas tika mainīti
+BoxTitleLastModifiedExpenses=Jaunākie %s izdevumu pārskati, kas tika mainīti
+BoxTitleLatestModifiedBoms=Jaunākās %s moduļi
+BoxTitleLatestModifiedMos=Jaunākie %s ražošanas pasūtījumi, kas tika mainīti
 BoxTitleLastOutstandingBillReached=Pārsniegti klienti ar maksimālo nesamaksāto summu
 BoxGlobalActivity=Global darbība (pavadzīmes, priekšlikumi, rīkojumi)
 BoxGoodCustomers=Labi klienti
@@ -112,9 +112,9 @@ BoxTitleLastCustomerShipments=Jaunākie %s klientu sūtījumi
 NoRecordedShipments=Nav reģistrēts klienta sūtījums
 BoxCustomersOutstandingBillReached=Ir sasniegti klienti ar ierobežojumu
 # Pages
-UsersHome=Home users and groups
-MembersHome=Home Membership
-ThirdpartiesHome=Home Thirdparties
-TicketsHome=Home Tickets
-AccountancyHome=Home Accountancy
+UsersHome=Mājas lietotāji un grupas
+MembersHome=Dalība mājās
+ThirdpartiesHome=Mājas trešās puses
+TicketsHome=Mājas biļetes
+AccountancyHome=Mājas grāmatvedība
 ValidatedProjects=Apstiprināti projekti
diff --git a/htdocs/langs/lv_LV/cashdesk.lang b/htdocs/langs/lv_LV/cashdesk.lang
index bedf85060f9..fa44b524a1d 100644
--- a/htdocs/langs/lv_LV/cashdesk.lang
+++ b/htdocs/langs/lv_LV/cashdesk.lang
@@ -41,8 +41,8 @@ Floor=Stāvs
 AddTable=Pievienot tabulu
 Place=Vieta
 TakeposConnectorNecesary=Ir nepieciešams "TakePOS Connector"
-OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
-NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser:
+OrderPrinters=Pievienojiet pogu, lai pasūtījumu nosūtītu dažiem norādītajiem printeriem bez maksas (piemēram, lai nosūtītu pasūtījumu uz virtuvi)
+NotAvailableWithBrowserPrinter=Nav pieejams, ja printeris saņemšanai ir iestatīts uz pārlūku:
 SearchProduct=Meklēt produktu
 Receipt=Saņemšana
 Header=Galvene
@@ -57,9 +57,9 @@ Paymentnumpad=Padeves veids maksājuma ievadīšanai
 Numberspad=Numbers Pad
 BillsCoinsPad=Monētas un banknotes
 DolistorePosCategory=TakePOS moduļi un citi POS risinājumi Dolibarr
-TakeposNeedsCategories=TakePOS needs at least one product categorie to work
-TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS needs at least 1 product category under the category <b>%s</b> to work
-OrderNotes=Can add some notes to each ordered items
+TakeposNeedsCategories=Lai darbotos, TakePOS ir nepieciešama vismaz viena produktu kategorija
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=Lai darbotos, TakePOS nepieciešama vismaz viena produktu kategorija kategorijā <b> %s </b>
+OrderNotes=Var pievienot dažas piezīmes katram pasūtītajam priekšmetam
 CashDeskBankAccountFor=Noklusējuma konts, ko izmantot maksājumiem
 NoPaimementModesDefined=TakePOS konfigurācijā nav definēts paiment režīms
 TicketVatGrouped=Grupējiet PVN pēc likmes biļetēs | kvītis
@@ -84,7 +84,7 @@ InvoiceIsAlreadyValidated=Rēķins jau ir apstiprināts
 NoLinesToBill=Nav rēķinu
 CustomReceipt=Pielāgota kvīts
 ReceiptName=Kvīts nosaukums
-ProductSupplements=Manage supplements of products
+ProductSupplements=Pārvaldiet produktu papildinājumus
 SupplementCategory=Papildinājuma kategorija
 ColorTheme=Krāsu tēma
 Colorful=Krāsains
@@ -94,7 +94,7 @@ Browser=Pārlūkprogramma
 BrowserMethodDescription=Vienkārša un ērta kvīts drukāšana. Tikai daži parametri, lai konfigurētu kvīti. Drukājiet, izmantojot pārlūku.
 TakeposConnectorMethodDescription=Ārējs modulis ar papildu funkcijām. Iespēja drukāt no mākoņa.
 PrintMethod=Drukas metode
-ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. The server hosting the application can't be in the Cloud (must be able to reach the printers in your network).
+ReceiptPrinterMethodDescription=Jaudīga metode ar daudziem parametriem. Pilnībā pielāgojams ar veidnēm. Serveris, kurā mitinās lietojumprogramma, nevar atrasties mākonī (tam jāspēj sasniegt jūsu tīkla printerus).
 ByTerminal=Ar termināli
 TakeposNumpadUsePaymentIcon=Izmantojiet ikonu, nevis tekstu uz numpad numura maksāšanas pogām
 CashDeskRefNumberingModules=Numerācijas modulis tirdzniecības vietu tirdzniecībai
@@ -102,7 +102,7 @@ CashDeskGenericMaskCodes6 =  <br> <b> {TN} </b> tagu izmanto, lai pievienotu te
 TakeposGroupSameProduct=Grupējiet tās pašas produktu līnijas
 StartAParallelSale=Sāciet jaunu paralēlu izpārdošanu
 SaleStartedAt=Pārdošana sākās vietnē %s
-ControlCashOpening=Open the "Control cash" popup when opening the POS
+ControlCashOpening=Atverot POS, atveriet uznirstošo logu “Kontrolēt skaidru naudu”
 CloseCashFence=Aizveriet kases kontroli
 CashReport=Skaidras naudas pārskats
 MainPrinterToUse=Galvenais izmantojamais printeris
@@ -126,5 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Vispirms jābūt iespējotam moduļa saņemša
 AllowDelayedPayment=Atļaut kavētu maksājumu
 PrintPaymentMethodOnReceipts=Izdrukājiet maksājuma veidu uz biļetēm |
 WeighingScale=Svari
-ShowPriceHT = Display the column with the price excluding tax (on screen)
-ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
+ShowPriceHT = Parādīt kolonnu ar cenu bez nodokļiem (ekrānā)
+ShowPriceHTOnReceipt = Parādīt kolonnu ar cenu bez nodokļiem (saņemot)
diff --git a/htdocs/langs/lv_LV/categories.lang b/htdocs/langs/lv_LV/categories.lang
index 9be0e84b700..17b9a57000f 100644
--- a/htdocs/langs/lv_LV/categories.lang
+++ b/htdocs/langs/lv_LV/categories.lang
@@ -3,20 +3,20 @@ Rubrique=Etiķete/Sadaļa
 Rubriques=Etiķetes/Sadaļas
 RubriquesTransactions=Tags/Categories of transactions
 categories=etiķetes/sadaļas
-NoCategoryYet=No tag/category of this type has been created
+NoCategoryYet=Šāda veida tags / kategorija nav izveidota
 In=Uz
 AddIn=Pievienot
 modify=modificēt
 Classify=Klasificēt
 CategoriesArea=Etiķešu/Sadaļu sadaļa
-ProductsCategoriesArea=Product/Service tags/categories area
-SuppliersCategoriesArea=Vendor tags/categories area
-CustomersCategoriesArea=Customer tags/categories area
-MembersCategoriesArea=Member tags/categories area
-ContactsCategoriesArea=Contact tags/categories area
-AccountsCategoriesArea=Bank account tags/categories area
-ProjectsCategoriesArea=Project tags/categories area
-UsersCategoriesArea=User tags/categories area
+ProductsCategoriesArea=Produktu / pakalpojumu tagu / kategoriju apgabals
+SuppliersCategoriesArea=Pārdevēja tagu / kategoriju apgabals
+CustomersCategoriesArea=Klientu tagu / kategoriju apgabals
+MembersCategoriesArea=Dalībnieku tagu / kategoriju apgabals
+ContactsCategoriesArea=Kontaktu tagu / kategoriju apgabals
+AccountsCategoriesArea=Bankas kontu tagi / kategoriju apgabals
+ProjectsCategoriesArea=Projekta tagu / kategoriju apgabals
+UsersCategoriesArea=Lietotāju tagu / kategoriju apgabals
 SubCats=Apakšsadaļas
 CatList=Atslēgvārdu/sadaļu saraksts
 CatListAll=Tagu / kategoriju saraksts (visi veidi)
@@ -93,7 +93,7 @@ AddSupplierIntoCategory=Piešķirt kategoriju piegādātājam
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
 ChooseCategory=Izvēlies sadaļu
-StocksCategoriesArea=Warehouse Categories
-ActionCommCategoriesArea=Event Categories
+StocksCategoriesArea=Noliktavas kategorijas
+ActionCommCategoriesArea=Pasākumu kategorijas
 WebsitePagesCategoriesArea=Lapu konteineru kategorijas
-UseOrOperatorForCategories=Use 'OR' operator for categories
+UseOrOperatorForCategories=Kategorijām izmantojiet operatoru “OR”
diff --git a/htdocs/langs/lv_LV/commercial.lang b/htdocs/langs/lv_LV/commercial.lang
index 294d6b7c321..2a5b51abed4 100644
--- a/htdocs/langs/lv_LV/commercial.lang
+++ b/htdocs/langs/lv_LV/commercial.lang
@@ -64,10 +64,11 @@ ActionAC_SHIP=Nosūtīt piegādi pa pastu
 ActionAC_SUP_ORD=Nosūtiet pirkumu pa pastu
 ActionAC_SUP_INV=Nosūtiet pārdevēju rēķinu pa pastu
 ActionAC_OTH=Cits
-ActionAC_OTH_AUTO=Automātiski ievietoti notikumi
+ActionAC_OTH_AUTO=Cits auto
 ActionAC_MANUAL=Manuāli ievietoti notikumi
 ActionAC_AUTO=Automātiski ievietoti notikumi
-ActionAC_OTH_AUTOShort=Auto
+ActionAC_OTH_AUTOShort=Cits
+ActionAC_EVENTORGANIZATION=Pasākumu organizēšanas pasākumi
 Stats=Tirdzniecības statistika
 StatusProsp=Prospekta statuss
 DraftPropals=Izstrādā komerciālos priekšlikumus
diff --git a/htdocs/langs/lv_LV/companies.lang b/htdocs/langs/lv_LV/companies.lang
index f9471964586..046527ed90e 100644
--- a/htdocs/langs/lv_LV/companies.lang
+++ b/htdocs/langs/lv_LV/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=Uzņēmuma nosaukums %s jau pastāv. Izvēlieties citu.
 ErrorSetACountryFirst=Izvēlieties vispirms valsti
 SelectThirdParty=Izvēlieties trešo pusi
-ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
+ConfirmDeleteCompany=Vai tiešām vēlaties dzēst šo uzņēmumu un visu saistīto informāciju?
 DeleteContact=Izdzēst kontaktu / adresi
-ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
+ConfirmDeleteContact=Vai tiešām vēlaties dzēst šo kontaktpersonu un visu saistīto informāciju?
 MenuNewThirdParty=Jauna trešā persona
 MenuNewCustomer=Jauns klients
 MenuNewProspect=Jauns prospekts
@@ -43,10 +43,10 @@ Individual=Privātpersona
 ToCreateContactWithSameName=Automātiski izveidos kontaktu / adresi ar tādu pašu informāciju kā trešā persona trešās puses ietvaros. Vairumā gadījumu pat tad, ja jūsu trešā persona ir fiziska persona, pietiek ar trešās personas izveidošanu vien.
 ParentCompany=Mātes uzņēmums
 Subsidiaries=Filiāles
-ReportByMonth=Report per month
-ReportByCustomers=Report per customer
-ReportByThirdparties=Report per thirdparty
-ReportByQuarter=Report per rate
+ReportByMonth=Pārskats mēnesī
+ReportByCustomers=Pārskats par katru klientu
+ReportByThirdparties=Ziņojums par katru trešo personu
+ReportByQuarter=Ziņot par likmi
 CivilityCode=Pieklājība kods
 RegisteredOffice=Juridiskā adrese
 Lastname=Uzvārds
@@ -69,7 +69,7 @@ PhoneShort=Telefons
 Skype=Skype
 Call=Zvanīt
 Chat=Čats
-PhonePro=Bus. phone
+PhonePro=Autobuss. tālruni
 PhonePerso=Pers. telefons
 PhoneMobile=Mobilais
 No_Email=Atteikties no lielapjoma pasta sūtījumiem
@@ -173,17 +173,17 @@ ProfId1ES=Prof ID 1 (CIF / NIF)
 ProfId2ES=Prof Id 2 (Sociālās apdrošināšanas numurs)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate numurs)
-ProfId5ES=Prof Id 5 (EORI number)
+ProfId5ES=Prof Id 5 (EORI numurs)
 ProfId6ES=-
 ProfId1FR=Prof ID 1 (Sirēnas)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NBS, vecais APE)
 ProfId4FR=Prof Id 4 (RCS / RM)
-ProfId5FR=Prof Id 5 (numéro EORI)
+ProfId5FR=Prof Id 5 (numoro EORI)
 ProfId6FR=-
 ProfId1ShortFR=SIREN
 ProfId2ShortFR=SIRET
-ProfId3ShortFR=NAF
+ProfId3ShortFR=NBS
 ProfId4ShortFR=RCS
 ProfId5ShortFR=EORI
 ProfId6ShortFR=-
@@ -239,7 +239,7 @@ ProfId1PT=Prof ID 1 (NIPC)
 ProfId2PT=Prof Id 2 (Sociālās apdrošināšanas numurs)
 ProfId3PT=Prof Id 3 (Tirdzniecības Ieraksta numurs)
 ProfId4PT=Prof Id 4 (konservatorija)
-ProfId5PT=Prof Id 5 (EORI number)
+ProfId5PT=Prof Id 5 (EORI numurs)
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -263,7 +263,7 @@ ProfId1RO=1. prof. ID (CUI)
 ProfId2RO=Prof Id 2 (Nr. Manmatriculare)
 ProfId3RO=3. profils (CAEN)
 ProfId4RO=Prof Id 5 (EUID)
-ProfId5RO=Prof Id 5 (EORI number)
+ProfId5RO=Prof Id 5 (EORI numurs)
 ProfId6RO=-
 ProfId1RU=Prof ID 1 (BIN)
 ProfId2RU=Prof Id 2 (INN)
@@ -331,7 +331,7 @@ CustomerCodeDesc=Klienta kods, unikāls visiem klientiem
 SupplierCodeDesc=Pārdevēja kods, unikāls visiem pārdevējiem
 RequiredIfCustomer=Nepieciešams, ja trešā puse ir klients vai perspektīva
 RequiredIfSupplier=Nepieciešams, ja trešā puse ir pārdevējs
-ValidityControledByModule=Validity controlled by the module
+ValidityControledByModule=Derīgumu kontrolē modulis
 ThisIsModuleRules=Noteikumi šim modulim
 ProspectToContact=Perspektīva ar ko sazināties
 CompanyDeleted=Kompānija "%s" dzēsta no datubāzes.
@@ -439,22 +439,22 @@ ListSuppliersShort=Pārdevēju saraksts
 ListProspectsShort=Perspektīvu saraksts
 ListCustomersShort=Klientu saraksts
 ThirdPartiesArea=Trešās puses/Kontakti
-LastModifiedThirdParties=Latest %s Third Parties which were modified
-UniqueThirdParties=Total number of Third Parties
+LastModifiedThirdParties=Jaunākās %s Trešās puses, kas tika modificētas
+UniqueThirdParties=Kopējais trešo personu skaits
 InActivity=Atvērts
 ActivityCeased=Slēgts
 ThirdPartyIsClosed=Trešā persona ir slēgta
-ProductsIntoElements=List of products/services mapped to %s
+ProductsIntoElements=Produktu / pakalpojumu saraksts, kas kartēti ar %s
 CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Maks. par izcilu rēķinu
 OutstandingBillReached=Maks. par izcilu rēķinu
 OrderMinAmount=Minimālā pasūtījuma summa
-MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
+MonkeyNumRefModelDesc=Klienta kodam atgrieziet skaitli formātā %syymm-nnnn un pārdevēja kodam %syymm-nnnn, kur yy ir gads, mm ir mēnesis, un nnnn ir secīgs automātiskās pieauguma skaitlis bez pārtraukuma un bez atgriešanās uz 0.
 LeopardNumRefModelDesc=Kods ir bez maksas. Šo kodu var mainīt jebkurā laikā.
 ManagingDirectors=Menedžera(u) vārds (CEO, direktors, prezidents...) 
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
 MergeThirdparties=Apvienot trešās puses
-ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
+ConfirmMergeThirdparties=Vai tiešām vēlaties apvienot izvēlēto trešo pusi ar pašreizējo? Visi saistītie objekti (rēķini, pasūtījumi, ...) tiks pārvietoti uz pašreizējo trešo pusi, pēc tam izvēlētā trešā puse tiks izdzēsta.
 ThirdpartiesMergeSuccess=Trešās puses ir apvienotas
 SaleRepresentativeLogin=Tirdzniecības pārstāvja pieteikšanās
 SaleRepresentativeFirstname=Tirdzniecības pārstāvja vārds
diff --git a/htdocs/langs/lv_LV/compta.lang b/htdocs/langs/lv_LV/compta.lang
index 9e153347a87..28483b81d2f 100644
--- a/htdocs/langs/lv_LV/compta.lang
+++ b/htdocs/langs/lv_LV/compta.lang
@@ -65,7 +65,7 @@ LT2SupplierIN=SGST pirkumi
 VATCollected=Iekasētais PVN
 StatusToPay=Jāsamaksā
 SpecialExpensesArea=Sadaļa visiem īpašajiem maksājumiem
-VATExpensesArea=Area for all TVA payments
+VATExpensesArea=Platība visiem TVA maksājumiem
 SocialContribution=Sociālais vai fiskālais nodoklis
 SocialContributions=Sociālie vai fiskālie nodokļi
 SocialContributionsDeductibles=Atskaitāmi sociālie vai fiskālie nodokļi
@@ -86,7 +86,7 @@ PaymentCustomerInvoice=Klienta rēķina apmaksa
 PaymentSupplierInvoice=pārdevēja rēķina apmaksa
 PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=PVN maksājumi
-AutomaticCreationPayment=Automatically record the payment
+AutomaticCreationPayment=Automātiski reģistrēt maksājumu
 ListPayment=Maksājumu saraksts
 ListOfCustomerPayments=Klientu maksājumu  saraksts
 ListOfSupplierPayments=Pārdevēja maksājumu saraksts
@@ -106,8 +106,8 @@ LT2PaymentES=IRPF Maksājumu
 LT2PaymentsES=IRPF Maksājumi
 VATPayment=Tirdzniecības nodokļa samaksa
 VATPayments=Tirdzniecības nodokļa maksājumi
-VATDeclarations=VAT declarations
-VATDeclaration=VAT declaration
+VATDeclarations=PVN deklarācijas
+VATDeclaration=PVN deklarācija
 VATRefund=PVN atmaksa
 NewVATPayment=Jauns apgrozījuma nodokļa maksājums
 NewLocalTaxPayment=Jauns nodokļa %s maksājums
@@ -135,20 +135,20 @@ NewCheckReceipt=Jauna atlaide
 NewCheckDeposit=Jauns pārbaude depozīts
 NewCheckDepositOn=Izveidot kvīti par depozīta kontā: %s
 NoWaitingChecks=No checks awaiting deposit.
-DateChequeReceived=Check receiving date
+DateChequeReceived=Pārbaudiet saņemšanas datumu
 NbOfCheques=Pārbaužu skaits
 PaySocialContribution=Maksāt sociālo/fiskālo nodokli
-PayVAT=Pay a VAT declaration
-PaySalary=Pay a salary card
-ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid ?
-ConfirmPayVAT=Are you sure you want to classify this VAT declaration as paid ?
-ConfirmPaySalary=Are you sure you want to classify this salary card as paid?
+PayVAT=Samaksājiet PVN deklarāciju
+PaySalary=Samaksājiet algas karti
+ConfirmPaySocialContribution=Vai tiešām vēlaties klasificēt šo sociālo vai fiskālo nodokli kā samaksātu?
+ConfirmPayVAT=Vai tiešām vēlaties klasificēt šo PVN deklarāciju kā apmaksātu?
+ConfirmPaySalary=Vai tiešām vēlaties klasificēt šo algas karti kā apmaksātu?
 DeleteSocialContribution=Dzēst sociālo vai fiskālo nodokļu maksājumu
-DeleteVAT=Delete a VAT declaration
-DeleteSalary=Delete a salary card
-ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment ?
-ConfirmDeleteVAT=Are you sure you want to delete this VAT declaration ?
-ConfirmDeleteSalary=Are you sure you want to delete this salary?
+DeleteVAT=Dzēst PVN deklarāciju
+DeleteSalary=Dzēst algas karti
+ConfirmDeleteSocialContribution=Vai tiešām vēlaties dzēst šo sociālā / fiskālā nodokļa maksājumu?
+ConfirmDeleteVAT=Vai tiešām vēlaties dzēst šo PVN deklarāciju?
+ConfirmDeleteSalary=Vai tiešām vēlaties dzēst šo algu?
 ExportDataset_tax_1=Sociālie un fiskālie nodokļi un maksājumi
 CalcModeVATDebt=Mode <b>%sVAT par saistību accounting%s.</b>
 CalcModeVATEngagement=Mode <b>%sVAT par ienākumu-expense%sS.</b>
@@ -175,7 +175,7 @@ RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT
 RulesCADue=- Tajā ir iekļauti klienta rēķini, par kuriem ir samaksāts. <br> - tas ir balstīts uz šo rēķinu apmaksas datumu. <br>
 RulesCAIn=- Tas ietver visus no klientiem saņemto rēķinu faktiskos maksājumus. <br> - Tas ir balstīts uz šo rēķinu apmaksas datumu
 RulesCATotalSaleJournal=Tas ietver visas kredītlīnijas no pārdošanas žurnāla.
-RulesSalesTurnoverOfIncomeAccounts=It includes (credit - debit) of lines for product accounts in group INCOME
+RulesSalesTurnoverOfIncomeAccounts=Tas ietver (kredīts - debets) rindas produktu kontiem IENĀKUMS
 RulesAmountOnInOutBookkeepingRecord=Tas ietver jūsu Ledger ierakstu ar grāmatvedības kontiem, kuriem ir grupa "IZDEVUMS" vai "IENĀKUMS"
 RulesResultBookkeepingPredefined=Tas ietver jūsu Ledger ierakstu ar grāmatvedības kontiem, kuriem ir grupa "IZDEVUMS" vai "IENĀKUMS"
 RulesResultBookkeepingPersonalized=Tas rāda jūsu grāmatvedībā ierakstu ar grāmatvedības kontiem <b>grupējot pēc personalizētām grupām</b>
@@ -196,7 +196,7 @@ VATReportByThirdParties=Trešo personu pārdošanas nodokļa pārskats
 VATReportByCustomers=Pārdošanas nodokļa pārskats pēc klienta
 VATReportByCustomersInInputOutputMode=Ziņojums klientu PVN iekasē un izmaksā
 VATReportByQuartersInInputOutputMode=Ienākuma nodokļa likmes aprēķins par iekasēto un samaksāto nodokli
-VATReportShowByRateDetails=Show details of this rate
+VATReportShowByRateDetails=Parādīt detalizētu informāciju par šo likmi
 LT1ReportByQuarters=Ziņot par nodokli 2 pēc likmes
 LT2ReportByQuarters=Ziņojiet par nodokli 3 pēc likmes
 LT1ReportByQuartersES=Report by RE rate
@@ -231,7 +231,7 @@ Pcg_subtype=PCG apakštipu
 InvoiceLinesToDispatch=Rēķina līnijas nosūtīšanas
 ByProductsAndServices=Pēc produkta un pakalpojuma
 RefExt=Ārējā ref
-ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
+ToCreateAPredefinedInvoice=Lai izveidotu rēķina veidni, izveidojiet standarta rēķinu, pēc tam, to neapstiprinot, noklikšķiniet uz pogas "%s".
 LinkedOrder=Saite uz pasūtījumu
 Mode1=Metode 1
 Mode2=Metode 2
@@ -249,8 +249,8 @@ ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Īpašais grāmatvedības konts, kas noteikts t
 ACCOUNTING_ACCOUNT_SUPPLIER=Pārdevēja trešo personu grāmatvedības konts
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Trešās puses kartē noteiktais īpašais grāmatvedības konts tiks izmantots tikai Subledger grāmatvedībai. Tas tiks izmantots galvenajai grāmatai un Subledger grāmatvedības noklusējuma vērtība, ja nav definēts īpašs pārdevēja grāmatvedības konts trešajā pusē.
 ConfirmCloneTax=Apstipriniet sociālā / fiskālā nodokļa klonu
-ConfirmCloneVAT=Confirm the clone of a VAT declaration
-ConfirmCloneSalary=Confirm the clone of a salary
+ConfirmCloneVAT=Apstipriniet PVN deklarācijas klonu
+ConfirmCloneSalary=Apstipriniet algas klonu
 CloneTaxForNextMonth=Klonēt nākošam mēnesim
 SimpleReport=Vienkāršs pārskats
 AddExtraReport=Papildu pārskati (pievienojiet ārvalstu un valsts klientu pārskatu)
@@ -269,8 +269,8 @@ AccountingAffectation=Grāmatvedības uzskaite
 LastDayTaxIsRelatedTo=Nodokļa pēdējā diena ir saistīta ar
 VATDue=Pieprasītais pārdošanas nodoklis
 ClaimedForThisPeriod=Pretendē uz periodu
-PaidDuringThisPeriod=Paid for this period
-PaidDuringThisPeriodDesc=This is the sum of all payments linked to VAT declarations which have an end-of-period date in the selected date range
+PaidDuringThisPeriod=Samaksāts par šo periodu
+PaidDuringThisPeriodDesc=Šī ir visu to maksājumu summa, kas saistīti ar PVN deklarācijām un kuru izvēlētajā datumu diapazonā ir perioda beigu datums
 ByVatRate=Ar pārdošanas nodokļa likmi
 TurnoverbyVatrate=Apgrozījums, par kuru tiek aprēķināta pārdošanas nodokļa likme
 TurnoverCollectedbyVatrate=Apgrozījums, kas iegūts, pārdodot nodokli
@@ -281,14 +281,14 @@ PurchaseTurnoverCollected=Apkopots pirkumu apgrozījums
 RulesPurchaseTurnoverDue=- Tajā ir iekļauti piegādātāja rēķini par samaksu neatkarīgi no tā, vai tie ir samaksāti. <br> - tas ir balstīts uz šo rēķinu izrakstīšanas datumu. <br>
 RulesPurchaseTurnoverIn=- Tas ietver visus faktiskos rēķinu maksājumus, kas veikti piegādātājiem. <br> - tas ir balstīts uz šo rēķinu apmaksas datumu <br>
 RulesPurchaseTurnoverTotalPurchaseJournal=Tas ietver visas pirkuma žurnāla debeta līnijas.
-RulesPurchaseTurnoverOfExpenseAccounts=It includes (debit - credit) of lines for product accounts in group EXPENSE
+RulesPurchaseTurnoverOfExpenseAccounts=Tas ietver (debets - kredīts) līnijas produktu kontiem grupā EXPENSE
 ReportPurchaseTurnover=Par pirkuma apgrozījumu izrakstīts rēķins
 ReportPurchaseTurnoverCollected=Apkopots pirkumu apgrozījums
 IncludeVarpaysInResults = Pārskatos iekļaujiet dažādus maksājumus
 IncludeLoansInResults = Iekļaujiet pārskatos aizdevumus
-InvoiceLate30Days = Invoices late > 30 days
-InvoiceLate15Days = Invoices late > 15 days
-InvoiceLateMinus15Days = Invoices late
-InvoiceNotLate = To be collected < 15 days
-InvoiceNotLate15Days = To be collected in 15 days
-InvoiceNotLate30Days = To be collected in 30 days
+InvoiceLate30Days = Rēķini nokavēti> 30 dienas
+InvoiceLate15Days = Rēķini nokavēti> 15 dienas
+InvoiceLateMinus15Days = Kavēti rēķini
+InvoiceNotLate = Jāsavāc <15 dienas
+InvoiceNotLate15Days = Tiek savākts 15 dienu laikā
+InvoiceNotLate30Days = Tiek savākts 30 dienu laikā
diff --git a/htdocs/langs/lv_LV/cron.lang b/htdocs/langs/lv_LV/cron.lang
index 12595393d64..062d5230372 100644
--- a/htdocs/langs/lv_LV/cron.lang
+++ b/htdocs/langs/lv_LV/cron.lang
@@ -60,7 +60,7 @@ CronErrEndDateStartDt=Beigu datums nevar būt pirms sākuma datuma
 StatusAtInstall=Statuss moduļa instalācijā
 CronStatusActiveBtn=Grafiks
 CronStatusInactiveBtn=Izslēgt
-CronTaskInactive=This job is disabled (not scheduled)
+CronTaskInactive=Šis darbs ir atspējots (nav ieplānots)
 CronId=Id
 CronClassFile=Faila nosaukums ar klasi
 CronModuleHelp=Dolibarr moduļu direktorijas nosaukums (arī darbojas ar ārēju Dolibarr moduli). <BR> Piemēram, lai izsauktu Dolibarr produkta objektu /htdocs/<u>product</u>/class/product.class.php iegūšanas metodi, moduļa vērtība ir <br> <i>produkts</i>
diff --git a/htdocs/langs/lv_LV/deliveries.lang b/htdocs/langs/lv_LV/deliveries.lang
index fa28f02fb09..cfe026979d6 100644
--- a/htdocs/langs/lv_LV/deliveries.lang
+++ b/htdocs/langs/lv_LV/deliveries.lang
@@ -27,5 +27,7 @@ Recipient=Saņēmējs
 ErrorStockIsNotEnough=Nav pietiekami daudz krājumu
 Shippable=Shippable
 NonShippable=Nav nosūtāms
+ShowShippableStatus=Rādīt pārsūtāmo statusu
 ShowReceiving=Rādīt piegādes kvīti
 NonExistentOrder=Neeksistējošs pasūtījums
+StockQuantitiesAlreadyAllocatedOnPreviousLines = Krājumu daudzumi, kas jau piešķirti iepriekšējās rindās
diff --git a/htdocs/langs/lv_LV/dict.lang b/htdocs/langs/lv_LV/dict.lang
index a56b6837c4a..1b232c953ca 100644
--- a/htdocs/langs/lv_LV/dict.lang
+++ b/htdocs/langs/lv_LV/dict.lang
@@ -290,7 +290,7 @@ CurrencyXOF=CFA franki BCEAO
 CurrencySingXOF=CFA Franc BCEAO
 CurrencyXPF=KZP franki
 CurrencySingXPF=CFP Franc
-CurrencyCentEUR=centiem
+CurrencyCentEUR=centi
 CurrencyCentSingEUR=cents
 CurrencyCentINR=paisa
 CurrencyCentSingINR=paise
diff --git a/htdocs/langs/lv_LV/donations.lang b/htdocs/langs/lv_LV/donations.lang
index e9ae4ae5464..26019bfad78 100644
--- a/htdocs/langs/lv_LV/donations.lang
+++ b/htdocs/langs/lv_LV/donations.lang
@@ -7,7 +7,6 @@ AddDonation=Izveidot ziedojumu
 NewDonation=Jauns ziedojums
 DeleteADonation=Dzēst ziedojumu
 ConfirmDeleteADonation=Vai tiešām vēlaties dzēst šo ziedojumu?
-ShowDonation=Rādīt ziedojumu
 PublicDonation=Sabiedrības ziedojums
 DonationsArea=Ziedojumu sadaļa
 DonationStatusPromiseNotValidated=Sagataves solījums
@@ -33,3 +32,4 @@ DONATION_ART238=Show article 238 from CGI if you are concerned
 DONATION_ART885=Show article 885 from CGI if you are concerned
 DonationPayment=Ziedojuma maksājums
 DonationValidated=Ziedojums %s apstiprināts
+DonationUseThirdparties=Izmantojiet esošo donoru kā donoru koordinātas
diff --git a/htdocs/langs/lv_LV/ecm.lang b/htdocs/langs/lv_LV/ecm.lang
index 459119bffcd..d3549d4d369 100644
--- a/htdocs/langs/lv_LV/ecm.lang
+++ b/htdocs/langs/lv_LV/ecm.lang
@@ -41,7 +41,7 @@ FileNotYetIndexedInDatabase=Fails vēl nav indeksēts datu bāzē (mēģiniet to
 ExtraFieldsEcmFiles=Extrafields Ecm failus
 ExtraFieldsEcmDirectories=Extrafields Ecm direktoriji
 ECMSetup=ECM iestatīšana
-GenerateImgWebp=Duplicate all images with another version with .webp format
-ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
-ConfirmImgWebpCreation=Confirm all images duplication
-SucessConvertImgWebp=Images successfully duplicated
+GenerateImgWebp=Dublējiet visus attēlus ar citu versiju ar .webp formātu
+ConfirmGenerateImgWebp=Ja apstiprināsit, visiem šajā mapē esošajiem attēliem tiks ģenerēts attēls .webp formātā (apakšmapes nav iekļautas) ...
+ConfirmImgWebpCreation=Apstipriniet visu attēlu dublēšanos
+SucessConvertImgWebp=Attēli ir veiksmīgi dublēti
diff --git a/htdocs/langs/lv_LV/errors.lang b/htdocs/langs/lv_LV/errors.lang
index 5df40e192b9..d90bd6c508b 100644
--- a/htdocs/langs/lv_LV/errors.lang
+++ b/htdocs/langs/lv_LV/errors.lang
@@ -4,14 +4,14 @@
 NoErrorCommitIsDone=Nav kļūda, mēs apstiprinam
 # Errors
 ErrorButCommitIsDone=Kļūdas atrasta, bet mēs apstiprinājām neskatoties uz to
-ErrorBadEMail=Email %s is incorrect
-ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
-ErrorBadUrl=Url %s is incorrect
+ErrorBadEMail=E-pasts %s nav pareizs
+ErrorBadMXDomain=E-pasts %s šķiet nepareizs (domēnam nav derīga MX ieraksta)
+ErrorBadUrl=URL %s nav pareizs
 ErrorBadValueForParamNotAString=Jūsu parametra nepareiza vērtība. Tas parasti parādās, ja trūkst tulkojuma.
 ErrorRefAlreadyExists=Atsauce <b> %s </b> jau pastāv.
 ErrorLoginAlreadyExists=Lietotājs %s jau pastāv.
 ErrorGroupAlreadyExists=Grupa %s jau pastāv.
-ErrorEmailAlreadyExists=Email %s already exists.
+ErrorEmailAlreadyExists=E-pasts %s jau pastāv.
 ErrorRecordNotFound=Ierakstīt nav atrasts.
 ErrorFailToCopyFile=Neizdevās nokopēt failu '<b>%s</b>' uz '<b>%s</b>'.
 ErrorFailToCopyDir=Neizdevās kopēt direktoriju '<b>%s</b>' uz ' <b>%s</b>'.
@@ -47,8 +47,8 @@ ErrorWrongDate=Datums nav pareizs
 ErrorFailedToWriteInDir=Neizdevās ierakstīt direktorijā %s
 ErrorFoundBadEmailInFile=Atrasts nepareiza e-pasta sintakse %s līnijām failā (piemērs line %s ar e-pasta = %s)
 ErrorUserCannotBeDelete=Lietotāju nevar izdzēst. Varbūt tas ir saistīts ar Dolibarr vienībām.
-ErrorFieldsRequired=Some required fields have been left blank.
-ErrorSubjectIsRequired=The email subject is required
+ErrorFieldsRequired=Daži obligāti aizpildāmie lauki ir atstāti tukši.
+ErrorSubjectIsRequired=Nepieciešama e-pasta tēma
 ErrorFailedToCreateDir=Neizdevās izveidot direktoriju. Pārbaudiet, vai Web servera lietotājam ir tiesības rakstīt uz Dolibarr dokumentus direktorijā. Ja parametrs <b>safe_mode</b> ir iespējots uz šo PHP, pārbaudiet, Dolibarr php faili pieder web servera lietotājam (vai grupa).
 ErrorNoMailDefinedForThisUser=Nav definēts e-pasts šim lietotājam
 ErrorSetupOfEmailsNotComplete=E-pastu iestatīšana nav pabeigta
@@ -60,7 +60,7 @@ ErrorDirNotFound=Directory <b>%s</b> nav atrasts (Bad ceļš, aplamas tiesības
 ErrorFunctionNotAvailableInPHP=Funkcija <b>%s</b> ir nepieciešama šī funkcija, bet nav pieejams šajā versijā / uzstādīšanas PHP.
 ErrorDirAlreadyExists=Direrktorija ar šādu nosaukumu jau pastāv.
 ErrorFileAlreadyExists=Fails ar šādu nosaukumu jau eksistē.
-ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exists.
+ErrorDestinationAlreadyExists=Jau pastāv cits fails ar nosaukumu <b> %s </b>.
 ErrorPartialFile=Serveris failu nav saņemis pilnīgi.
 ErrorNoTmpDir=Pagaidu direktorija %s neeksistē.
 ErrorUploadBlockedByAddon=Augšupielāde bloķēja ar PHP/Apache spraudni.
@@ -118,7 +118,7 @@ ErrorCantReadFile=Neizdevās nolasīt failu '%s'
 ErrorCantReadDir=Neizdevās nolasīt katalogu '%s'
 ErrorBadLoginPassword=Nepareiza vērtība lietotājvārdam vai parolei
 ErrorLoginDisabled=Jūsu konts ir bloķēts
-ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server user. Check also the command is not protected on shell level by a security layer like apparmor.
+ErrorFailedToRunExternalCommand=Neizdevās palaist ārējo komandu. Pārbaudiet, vai tas ir pieejams un darbojas jūsu PHP servera lietotājam. Pārbaudiet arī, vai komandu čaulas līmenī neaizsargā tāds drošības slānis kā apparmor.
 ErrorFailedToChangePassword=Neizdevās nomainīt paroli
 ErrorLoginDoesNotExists=Lietotāju ar pieteikšanos <b>%s</b> nevar atrast.
 ErrorLoginHasNoEmail=Šim lietotājam nav e-pasta adrese. Process atcelts.
@@ -227,9 +227,9 @@ ErrorAPageWithThisNameOrAliasAlreadyExists=Lapā / konteinerā <strong> %s </str
 ErrorDuringChartLoad=Kļūda, ielādējot kontu diagrammu. Ja daži konti netika ielādēti, tos joprojām varat ievadīt manuāli.
 ErrorBadSyntaxForParamKeyForContent=Slikta sintakse param keyforcontent. Jābūt vērtībai, kas sākas ar %s vai %s
 ErrorVariableKeyForContentMustBeSet=Kļūda, ir jāiestata konstants ar nosaukumu %s (ar teksta saturu, kas jāparāda) vai %s (ar ārējo URL).
-ErrorURLMustEndWith=URL %s must end %s
+ErrorURLMustEndWith=Vietrādim URL %s ir jābeidzas %s
 ErrorURLMustStartWithHttp=URL %s jāsāk ar http: // vai https: //
-ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
+ErrorHostMustNotStartWithHttp=Resursdatora nosaukums %s NEVAJĀ sākas ar http: // vai https: //
 ErrorNewRefIsAlreadyUsed=Kļūda, jaunā atsauce jau ir izmantota
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Kļūda, dzēšot maksājumu, kas sasaistīts ar slēgtu rēķinu.
 ErrorSearchCriteriaTooSmall=Meklēšanas kritēriji ir pārāk mazi.
@@ -259,11 +259,11 @@ ErrorPublicInterfaceNotEnabled=Publiskā saskarne netika iespējota
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=Jaunās lapas valoda ir jādefinē, ja tā ir iestatīta kā citas lapas tulkojums
 ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=Jaunas lapas valoda nedrīkst būt avota valoda, ja tā ir iestatīta kā citas lapas tulkojums
 ErrorAParameterIsRequiredForThisOperation=Šai darbībai ir obligāts parametrs
-ErrorDateIsInFuture=Error, the date can't be in the future
-ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
-ErrorAPercentIsRequired=Error, please fill in the percentage correctly
-ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
-ErrorFailedToFindEmailTemplate=Failed to find template with code name %s
+ErrorDateIsInFuture=Kļūda, datums nevar būt nākotnē
+ErrorAnAmountWithoutTaxIsRequired=Kļūda, summa ir obligāta
+ErrorAPercentIsRequired=Kļūda, lūdzu, pareizi aizpildiet procentuālo daudzumu
+ErrorYouMustFirstSetupYourChartOfAccount=Vispirms jums ir jāiestata konta plāns
+ErrorFailedToFindEmailTemplate=Neizdevās atrast veidni ar koda nosaukumu %s
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Jūsu PHP parametrs upload_max_filesize (%s) ir augstāks nekā PHP parametrs post_max_size (%s). Šī nav konsekventa iestatīšana.
@@ -296,8 +296,8 @@ WarningFailedToAddFileIntoDatabaseIndex=Brīdinājums, neizdevās pievienot fail
 WarningTheHiddenOptionIsOn=Brīdinājums: slēpta opcija <b> %s </b> ir ieslēgta.
 WarningCreateSubAccounts=Brīdinājums: jūs nevarat izveidot tieši apakškontu, jums ir jāizveido trešā puse vai lietotājs un jāpiešķir viņiem grāmatvedības kods, lai tos atrastu šajā sarakstā
 WarningAvailableOnlyForHTTPSServers=Pieejams tikai tad, ja tiek izmantots HTTPS drošais savienojums.
-WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
-ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
-ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
-CheckVersionFail=Version check fail
-ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
+WarningModuleXDisabledSoYouMayMissEventHere=Modulis %s nav iespējots. Tāpēc jūs varat izlaist daudz notikumu šeit.
+ErrorActionCommPropertyUserowneridNotDefined=Nepieciešams lietotāja īpašnieks
+ErrorActionCommBadType=Atlasītais notikuma veids (id: %n, kods: %s) nepastāv notikuma veida vārdnīcā
+CheckVersionFail=Versijas pārbaude neizdevās
+ErrorWrongFileName=Faila nosaukumā nedrīkst būt __SOMETHING__
diff --git a/htdocs/langs/lv_LV/eventorganization.lang b/htdocs/langs/lv_LV/eventorganization.lang
index 70a2a0146c2..d28955ce942 100644
--- a/htdocs/langs/lv_LV/eventorganization.lang
+++ b/htdocs/langs/lv_LV/eventorganization.lang
@@ -17,127 +17,127 @@
 #
 # Generic
 #
-ModuleEventOrganizationName = Event Organization
-EventOrganizationDescription = Event Organization through Module Project
-EventOrganizationDescriptionLong= Manage Event organization for conference, attendees, speaker, and attendees, with public subcription page
+ModuleEventOrganizationName = Pasākuma organizēšana
+EventOrganizationDescription = Pasākuma organizēšana, izmantojot moduļu projektu
+EventOrganizationDescriptionLong= Pārvaldiet konferences, dalībnieku, runātāju un dalībnieku pasākuma organizēšanu ar publisku abonēšanas lapu
 #
 # Menu
 #
-EventOrganizationMenuLeft = Organized events
-EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
+EventOrganizationMenuLeft = Organizēja pasākumus
+EventOrganizationConferenceOrBoothMenuLeft = Konference vai stends
 
 #
 # Admin page
 #
-EventOrganizationSetup = Event Organization setup
+EventOrganizationSetup = Pasākuma organizācijas iestatīšana
 Settings = Iestatījumi
-EventOrganizationSetupPage = Event Organization setup page
-EVENTORGANIZATION_TASK_LABEL = Label of tasks to create automatically when project is validated
-EVENTORGANIZATION_TASK_LABELTooltip = When you validate an organized event, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conference<br>Send Call for Booth<br>Receive call for conferences<br>Receive call for Booth<br>Open subscriptions to events for attendees<br>Send remind of event to speakers<br>Send remind of event to Booth hoster<br>Send remind of event to attendees
-EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties automatically created when someone suggests a conference
-EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Category to add to third-parties automatically created when they suggests a booth
-EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Template of email to send after receiving a suggestion of a conference.
-EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Template of email to send after receiving a suggestion of a booth.
-EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Template of email to send  after a subscription to a booth has been paid.
-EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Template of email to send after a subscription to an event has been paid.
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Template of email of massaction to attendes
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
-EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+EventOrganizationSetupPage = Pasākuma organizācijas iestatīšanas lapa
+EVENTORGANIZATION_TASK_LABEL = Uzdevumu iezīme, kas jāizveido automātiski, kad projekts ir apstiprināts
+EVENTORGANIZATION_TASK_LABELTooltip = Apstiprinot organizētu notikumu, dažus uzdevumus var automātiski izveidot projektā <br> <br> Piemēram: <br> Sūtīt konferences zvanu <br> Sūtīt zvanu stendam <br> A032fccfz19bz0 A032fccfz19bz002 Saņemt konferences zvanu03 atgādināt par notikumu runātājiem <br> Nosūtīt atgādinājumu par notikumu Booth hoster <br> Nosūtīt atgādinājumu par pasākumu dalībniekiem
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Kategorija, ko pievienot trešajām pusēm, tiek automātiski izveidota, kad kāds iesaka konferenci
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Kategorija, ko pievienot trešajām pusēm, tiek automātiski izveidota, kad viņi iesaka stendu
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = E-pasta ziņojuma veidne, kas jānosūta pēc konferences ieteikuma saņemšanas.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = E-pasta ziņojuma veidne, kas jānosūta pēc stenda ieteikuma saņemšanas.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = E-pasta ziņojuma veidne, kas jānosūta pēc tam, kad ir samaksāts abonēšanas stends.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = E-pasta ziņojuma veidne, kas jānosūta pēc pasākuma abonēšanas apmaksas.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Masveida dalībnieku e-pasta veidne
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Masu sarunu e-pasta ziņojuma veidne
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Filtrējiet trešās puses atlasīto sarakstu dalībnieku izveides kartītē / veidlapā ar kategoriju
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filtrējiet trešās puses atlasīto sarakstu dalībnieku izveidošanas kartītē / veidlapā ar klienta tipu
 
 #
 # Object
 #
-EventOrganizationConfOrBooth= Conference Or Booth
-ManageOrganizeEvent = Manage event organisation
-ConferenceOrBooth = Conference Or Booth
-ConferenceOrBoothTab = Conference Or Booth
-AmountOfSubscriptionPaid = Amount of subscription paid
-DateSubscription = Date of subscription
-ConferenceOrBoothAttendee = Conference Or Booth Attendee
+EventOrganizationConfOrBooth= Konference vai stends
+ManageOrganizeEvent = Pārvaldīt pasākumu organizēšanu
+ConferenceOrBooth = Konference vai stends
+ConferenceOrBoothTab = Konference vai stends
+AmountOfSubscriptionPaid = Apmaksātā abonēšanas summa
+DateSubscription = Abonēšanas datums
+ConferenceOrBoothAttendee = Konferences vai stenda apmeklētājs
 
 #
 # Template Mail
 #
-YourOrganizationEventConfRequestWasReceived = Your request for conference was received
-YourOrganizationEventBoothRequestWasReceived = Your request for booth was received
-EventOrganizationEmailAskConf = Request for conference
-EventOrganizationEmailAskBooth = Request for booth
-EventOrganizationEmailSubsBooth = Subscription for booth
-EventOrganizationEmailSubsEvent = Subscription for an event
-EventOrganizationMassEmailAttendees = Communication to attendees
-EventOrganizationMassEmailSpeakers = Communication to speakers
+YourOrganizationEventConfRequestWasReceived = Jūsu konferences pieprasījums tika saņemts
+YourOrganizationEventBoothRequestWasReceived = Jūsu pieprasījums pēc stenda tika saņemts
+EventOrganizationEmailAskConf = Pieprasījums pēc konferences
+EventOrganizationEmailAskBooth = Pieprasījums pēc stenda
+EventOrganizationEmailSubsBooth = Stenda abonēšana
+EventOrganizationEmailSubsEvent = Pasākuma abonēšana
+EventOrganizationMassEmailAttendees = Saziņa ar apmeklētājiem
+EventOrganizationMassEmailSpeakers = Saziņa ar runātājiem
 
 #
 # Event
 #
-AllowUnknownPeopleSuggestConf=Allow unknown people to suggest conferences
-AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest conferences
-AllowUnknownPeopleSuggestBooth=Allow unknown people to suggest booth
-AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to suggest booth
-PriceOfRegistration=Price of registration
-PriceOfRegistrationHelp=Price of registration
-PriceOfBooth=Subscription price to stand a booth
-PriceOfBoothHelp=Subscription price to stand a booth
-EventOrganizationICSLink=Link ICS for events
-ConferenceOrBoothInformation=Conference Or Booth informations
-Attendees = Attendees
-DownloadICSLink = Download ICS link
-EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
-SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
-SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
+AllowUnknownPeopleSuggestConf=Ļaujiet nezināmiem cilvēkiem ieteikt konferences
+AllowUnknownPeopleSuggestConfHelp=Ļaujiet nezināmiem cilvēkiem ieteikt konferences
+AllowUnknownPeopleSuggestBooth=Ļaujiet nezināmiem cilvēkiem ieteikt kabīni
+AllowUnknownPeopleSuggestBoothHelp=Ļaujiet nezināmiem cilvēkiem ieteikt kabīni
+PriceOfRegistration=Reģistrācijas cena
+PriceOfRegistrationHelp=Reģistrācijas cena
+PriceOfBooth=Abonēšanas cena, lai stāvētu kabīnē
+PriceOfBoothHelp=Abonēšanas cena, lai stāvētu kabīnē
+EventOrganizationICSLink=Saistiet notikumu ICS
+ConferenceOrBoothInformation=Konferences vai stenda informācija
+Attendees = Dalībnieki
+DownloadICSLink = Lejupielādēt ICS saiti
+EVENTORGANIZATION_SECUREKEY = Konferences publiskās reģistrācijas saites drošā atslēga
+SERVICE_BOOTH_LOCATION = Pakalpojums, kas izmantots rēķinu rindai par kabīnes atrašanās vietu
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Pakalpojums, kas tiek izmantots rēķina rindā par konferences dalībnieka abonementu
 #
 # Status
 #
 EvntOrgDraft = Melnraksts
-EvntOrgSuggested = Suggested
-EvntOrgConfirmed = Confirmed
-EvntOrgNotQualified = Not Qualified
+EvntOrgSuggested = Ieteikts
+EvntOrgConfirmed = Apstiprināts
+EvntOrgNotQualified = Nav kvalificēts
 EvntOrgDone = Darīts
-EvntOrgCancelled = Cancelled
+EvntOrgCancelled = Atcelts
 #
 # Public page
 #
-SuggestForm = Suggestion page
-RegisterPage = Page for conferences or booth
-EvntOrgRegistrationHelpMessage = Here, you can vote for an event, or suggest a new conference or booth for the project
-EvntOrgRegistrationConfHelpMessage = Here, you can suggest a new conference for the project
-EvntOrgRegistrationBoothHelpMessage = Here, you can suggest a new booth for the project
-ListOfSuggestedConferences = List of suggested conferences
-ListOfSuggestedBooths = List of suggested booths
-SuggestConference = Suggest a new conference
-SuggestBooth = Suggest a booth
-ViewAndVote = View and vote for suggested events
-PublicAttendeeSubscriptionPage = Public link of registration to a conference
-MissingOrBadSecureKey = The security key is invalid or missing
-EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference : '%s'
-EvntOrgDuration = This conference starts on %s and ends on %s.
-ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
-BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
+SuggestForm = Ieteikumu lapa
+RegisterPage = Konferenču vai stenda lapa
+EvntOrgRegistrationHelpMessage = Šeit jūs varat balsot par pasākumu vai ieteikt jaunu konferenci vai stendu projektam
+EvntOrgRegistrationConfHelpMessage = Šeit jūs varat ieteikt jaunu projekta konferenci
+EvntOrgRegistrationBoothHelpMessage = Šeit jūs varat ieteikt jaunu stendu projektam
+ListOfSuggestedConferences = Ieteicamo konferenču saraksts
+ListOfSuggestedBooths = Ieteicamo kabīņu saraksts
+SuggestConference = Ieteikt jaunu konferenci
+SuggestBooth = Ieteikt stendu
+ViewAndVote = Skatiet ierosinātos pasākumus un balsojiet par tiem
+PublicAttendeeSubscriptionPage = Publiska reģistrācijas saite ar konferenci
+MissingOrBadSecureKey = Drošības atslēga nav derīga vai tās nav
+EvntOrgWelcomeMessage = Šī veidlapa ļauj reģistrēties kā jaunam konferences dalībniekam: '%s'
+EvntOrgDuration = Šī konference sākas ar %s un beidzas ar %s.
+ConferenceAttendeeFee = Konferences dalībnieka maksa par pasākumu: '%s', kas notiek no %s līdz %s.
+BoothLocationFee = Pasākuma stenda atrašanās vieta: '%s', kas notiek no %s līdz %s
 EventType = Pasākuma veids
 
 #
 # Vote page
 #
-EvntOrgRegistrationWelcomeMessage = Welcome on the conference or booth suggestion page.
-EvntOrgRegistrationConfWelcomeMessage = Welcome on the conference suggestion page.
-EvntOrgRegistrationBoothWelcomeMessage = Welcome on the booth suggestion page.
-EvntOrgVoteHelpMessage = Here, you can view and vote for the suggested events for the project
-VoteOk = Your vote has been accepted.
-AlreadyVoted = You have already voted for this event.
-VoteError = An error has occurred during the vote, please try again.
+EvntOrgRegistrationWelcomeMessage = Laipni lūdzam konferences vai stenda ieteikumu lapā.
+EvntOrgRegistrationConfWelcomeMessage = Laipni lūdzam konferences ieteikumu lapā.
+EvntOrgRegistrationBoothWelcomeMessage = Laipni lūdzam stenda ieteikumu lapā.
+EvntOrgVoteHelpMessage = Šeit jūs varat apskatīt ierosinātos projekta pasākumus un balsot par tiem
+VoteOk = Jūsu balsojums ir pieņemts.
+AlreadyVoted = Jūs jau esat balsojis par šo notikumu.
+VoteError = Balsojuma laikā radās kļūda. Lūdzu, mēģiniet vēlreiz.
 
 #
 # SubscriptionOk page
 #
-SubscriptionOk = Your subscription to this conference has been validated
+SubscriptionOk = Jūsu abonements šai konferencei ir apstiprināts
 #
 # Subscription validation mail
 #
-ConfAttendeeSubscriptionConfirmation = Confirmation of your subscription to a conference
+ConfAttendeeSubscriptionConfirmation = Konferences abonēšanas apstiprinājums
 #
 # Payment page
 #
-Attendee = Attendee
-PaymentConferenceAttendee = Conference attendee payment
-PaymentBoothLocation = Booth location payment
+Attendee = Dalībnieks
+PaymentConferenceAttendee = Konferences dalībnieka samaksa
+PaymentBoothLocation = Kabīnes atrašanās vietas maksājums
diff --git a/htdocs/langs/lv_LV/exports.lang b/htdocs/langs/lv_LV/exports.lang
index c7732d16a4b..62971ec4f46 100644
--- a/htdocs/langs/lv_LV/exports.lang
+++ b/htdocs/langs/lv_LV/exports.lang
@@ -53,7 +53,8 @@ TypeOfLineServiceOrProduct=Veids (0=produkts, 1=pakalpojums)
 FileWithDataToImport=Fails ar datiem, lai importētu
 FileToImport=Avota fails, kas jāimportē
 FileMustHaveOneOfFollowingFormat=Importa failam ir jābūt šādam formātam
-DownloadEmptyExample=Lejupielādēt veidlapas failu ar lauka satura informāciju (* ir obligāti aizpildāmie lauki)
+DownloadEmptyExample=Lejupielādējiet veidnes failu ar lauka satura informāciju
+StarAreMandatory=* ir obligāti aizpildāmi lauki
 ChooseFormatOfFileToImport=Izvēlieties faila formātu, ko izmantot kā importa faila formātu, noklikšķinot uz %s ikonas, lai to atlasītu ...
 ChooseFileToImport=Augšupielādējiet failu, pēc tam noklikšķiniet uz %s ikonas, lai atlasītu failu kā avota importa failu ...
 SourceFileFormat=Avota faila formāts
@@ -133,4 +134,4 @@ KeysToUseForUpdates=Atslēga (sleja), ko izmantot esošo datu <b> atjaunināšan
 NbInsert=Ievietoto līniju skaits: %s
 NbUpdate=Atjaunināto līniju skaits: %s
 MultipleRecordFoundWithTheseFilters=Ar šiem filtriem tika atrasti vairāki ieraksti: %s
-StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
+StocksWithBatch=Produktu krājumi un atrašanās vieta (noliktava) ar partijas / sērijas numuru
diff --git a/htdocs/langs/lv_LV/externalsite.lang b/htdocs/langs/lv_LV/externalsite.lang
index 925c1286ec8..23725bd616a 100644
--- a/htdocs/langs/lv_LV/externalsite.lang
+++ b/htdocs/langs/lv_LV/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
 ExternalSiteSetup=Ārējo vietņu iestatīšana
-ExternalSiteURL=External Site URL of HTML iframe content
+ExternalSiteURL=HTML iframe satura ārējās vietnes URL
 ExternalSiteModuleNotComplete=Modulis ExternalSite nav pareizi konfigurēts.
 ExampleMyMenuEntry=Manas izvēlnes ieraksti
diff --git a/htdocs/langs/lv_LV/holiday.lang b/htdocs/langs/lv_LV/holiday.lang
index 79611027bf4..013c4b1a1b9 100644
--- a/htdocs/langs/lv_LV/holiday.lang
+++ b/htdocs/langs/lv_LV/holiday.lang
@@ -13,7 +13,7 @@ ToReviewCP=Gaida apstiprināšanu
 ApprovedCP=Apstiprināts
 CancelCP=Atcelts
 RefuseCP=Atteikts
-ValidatorCP=Asistents
+ValidatorCP=Apstiprinātājs
 ListeCP=Atvaļinājuma saraksts
 Leave=Atstāt pieprasījumu
 LeaveId=Atvaļinājuma ID
@@ -39,11 +39,11 @@ TitreRequestCP=Atstāt pieprasījumu
 TypeOfLeaveId=Atvaļinājuma ID veids
 TypeOfLeaveCode=Atvaļinājuma kods
 TypeOfLeaveLabel=Atvaļinājuma veids
-NbUseDaysCP=Patērēto atvaļinājuma dienu skaits
-NbUseDaysCPHelp=Aprēķinā tiek ņemtas vērā vārdnīcā noteiktās brīvās dienas un brīvdienas.
-NbUseDaysCPShort=Patērētās dienas
-NbUseDaysCPShortInMonth=Mēneša laikā patērētās dienas
-DayIsANonWorkingDay=%s nav darba diena
+NbUseDaysCP=Izmantoto atvaļinājumu dienu skaits
+NbUseDaysCPHelp=Aprēķinā tiek ņemtas vērā vārdnīcā noteiktās brīvdienas un brīvdienas.
+NbUseDaysCPShort=Atvaļinājuma dienas
+NbUseDaysCPShortInMonth=Atvaļinājuma dienas mēnesī
+DayIsANonWorkingDay=%s ir darba diena
 DateStartInMonth=Sākuma datums mēnesī
 DateEndInMonth=Mēneša beigu datums
 EditCP=Rediģēt
@@ -55,7 +55,7 @@ TitleDeleteCP=Dzēst atvaļinājuma pieprasījumu
 ConfirmDeleteCP=Apstiprināt šī atvaļinājuma pieprasījuma dzēšanu?
 ErrorCantDeleteCP=Kļūda, Jums nav tiesību izdzēst šo atvaļinājuma pieprasījumu.
 CantCreateCP=Jums nav tiesību veikt atvaļinājumu pieprasījumus.
-InvalidValidatorCP=Jūsu atvaļinājuma pieprasījumam jāizvēlas apstiprinātājs.
+InvalidValidatorCP=Atvaļinājuma pieprasījumam jums jāizvēlas apstiprinātājs.
 NoDateDebut=Jums ir jāizvēlas sākuma datums.
 NoDateFin=Jums ir jāizvēlas beigu datums.
 ErrorDureeCP=Jūsu atvaļinājuma pieprasījumā nav darba dienas.
@@ -80,14 +80,14 @@ UserCP=Lietotājs
 ErrorAddEventToUserCP=Pievienojot ārpuskārtas atvaļinājumu, radās kļūda.
 AddEventToUserOkCP=Par ārkārtas atvaļinājumu papildinājums ir pabeigta.
 MenuLogCP=Skatīt izmaiņu žurnālus
-LogCP=Pieejamo atvaļinājumu dienu atjauninājumu žurnāls
-ActionByCP=Veic
-UserUpdateCP=Lietotājam
+LogCP=Visu atjauninājumu žurnāls “Atvaļinājuma atlikums”
+ActionByCP=Atjaunināja
+UserUpdateCP=Atjaunināts
 PrevSoldeCP=Iepriekšējā bilance
 NewSoldeCP=Jana Bilance
 alreadyCPexist=Šajā periodā atvaļinājuma pieprasījums jau ir veikts.
-FirstDayOfHoliday=Pirmā atvaļinājuma diena
-LastDayOfHoliday=Pēdēja atvaļinājuma diena
+FirstDayOfHoliday=Atvaļinājuma sākuma diena
+LastDayOfHoliday=Atvaļinājuma beigu diena
 BoxTitleLastLeaveRequests=Jaunākie %s labotie atvaļinājumu pieprasījumi
 HolidaysMonthlyUpdate=Ikmēneša atjauninājums
 ManualUpdate=Manuāla aktualizēšana
@@ -104,8 +104,8 @@ LEAVE_SICK=Slimības lapa
 LEAVE_OTHER=Cits atvaļinājums
 LEAVE_PAID_FR=Apmaksāts atvaļinājums
 ## Configuration du Module ##
-LastUpdateCP=Jaunākais atvaļinājumu piešķiršanas atjauninājums
-MonthOfLastMonthlyUpdate=Pēdējā automātiskā atvaļinājuma piešķiršanas mēneša pēdējā mēneša laikā
+LastUpdateCP=Pēdējā automātiskā atvaļinājumu piešķiršanas atjaunināšana
+MonthOfLastMonthlyUpdate=Atvaļinājumu sadalījuma pēdējās automātiskās atjaunināšanas mēnesis
 UpdateConfCPOK=Veiksmīgi atjaunināta.
 Module27130Name= Atvaļinājuma pieprasījumu pārvaldība
 Module27130Desc= Atvaļinājumu pieprasījumu vadīšana
@@ -125,8 +125,8 @@ HolidaysCanceledBody=Jūsu atvaļinājuma pieprasījums no %s līdz %s ir atcelt
 FollowedByACounter=1: Šāda veida atvaļinājumam jāievēro skaitītājs. Skaitījtājs tiek palielināts manuāli vai automātiski, un, ja atvaļinājuma pieprasījums ir apstiprināts, skaitītājs tiek samazināts. <br> 0: neseko skaitītājs.
 NoLeaveWithCounterDefined=There is no leave types defined that need to be followed by a counter
 GoIntoDictionaryHolidayTypes=Iet uz <strong>Sākums - Iestatīšana - Vārdnīcas - Atvaļinājuma veids </strong>, lai iestatītu dažādu veidu lapas.
-HolidaySetup=Moduļa brīvdienas uzstādīšana
-HolidaysNumberingModules=Atvaļinājuma pieprasījumu numerācijas modeļi
+HolidaySetup=Moduļa atvaļinājums iestatīšana
+HolidaysNumberingModules=Numerācijas modeļi atvaļinājumu pieprasījumiem
 TemplatePDFHolidays=PDF veidne atvaļinājumu pieprasīšanai
 FreeLegalTextOnHolidays=Brīvs teksts PDF
 WatermarkOnDraftHolidayCards=Ūdenszīmes uz atvaļinājuma pieprasījumiem
diff --git a/htdocs/langs/lv_LV/hrm.lang b/htdocs/langs/lv_LV/hrm.lang
index fb12bb86555..4a22ad40b4e 100644
--- a/htdocs/langs/lv_LV/hrm.lang
+++ b/htdocs/langs/lv_LV/hrm.lang
@@ -9,7 +9,7 @@ ConfirmDeleteEstablishment=Vai tiešām vēlaties dzēst šo uzņēmumu?
 OpenEtablishment=Atvērts uzņēmums
 CloseEtablishment=Aizvērt uzņēmumu
 # Dictionary
-DictionaryPublicHolidays=Leave - Public holidays
+DictionaryPublicHolidays=Atvaļinājums - svētku dienas
 DictionaryDepartment=HRM - Department list
 DictionaryFunction=HRM - darba vietas
 # Module
diff --git a/htdocs/langs/lv_LV/knowledgemanagement.lang b/htdocs/langs/lv_LV/knowledgemanagement.lang
index 92b3a320067..bb146a13017 100644
--- a/htdocs/langs/lv_LV/knowledgemanagement.lang
+++ b/htdocs/langs/lv_LV/knowledgemanagement.lang
@@ -18,38 +18,32 @@
 #
 
 # Module label 'ModuleKnowledgeManagementName'
-ModuleKnowledgeManagementName = Knowledge Management System
+ModuleKnowledgeManagementName = Zināšanu pārvaldības sistēma
 # Module description 'ModuleKnowledgeManagementDesc'
-ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+ModuleKnowledgeManagementDesc=Pārvaldiet zināšanu pārvaldības (KM) vai palīdzības dienesta bāzi
 
 #
 # Admin page
 #
-KnowledgeManagementSetup = Knowledge Management System setup
+KnowledgeManagementSetup = Zināšanu pārvaldības sistēmas iestatīšana
 Settings = Iestatījumi
-KnowledgeManagementSetupPage = Knowledge Management System setup page
+KnowledgeManagementSetupPage = Zināšanu pārvaldības sistēmas iestatīšanas lapa
 
 
 #
 # About page
 #
 About = Par
-KnowledgeManagementAbout = About Knowledge Management
-KnowledgeManagementAboutPage = Knowledge Management about page
+KnowledgeManagementAbout = Par zināšanu pārvaldību
+KnowledgeManagementAboutPage = Zināšanu pārvaldība par lapu
 
-#
-# Sample page
-#
-KnowledgeManagementArea = Knowledge Management
-
-
-#
-# Menu
-#
-MenuKnowledgeRecord = Knowledge base
-ListKnowledgeRecord = List of articles
-NewKnowledgeRecord = New article
-ValidateReply = Validate solution
-KnowledgeRecords = Articles
+KnowledgeManagementArea = Zināšanu pārvaldība
+MenuKnowledgeRecord = Zināšanu bāze
+ListKnowledgeRecord = Rakstu saraksts
+NewKnowledgeRecord = Jauns raksts
+ValidateReply = Apstipriniet šķīdumu
+KnowledgeRecords = Raksti
 KnowledgeRecord = Raksts
-KnowledgeRecordExtraFields = Extrafields for Article
+KnowledgeRecordExtraFields = Raksta paplašinājumi
+GroupOfTicket=Biļešu grupa
+YouCanLinkArticleToATicketCategory=Rakstu var saistīt ar biļešu grupu (tāpēc raksts tiks ieteikts jauno biļešu kvalifikācijas iegūšanas laikā)
diff --git a/htdocs/langs/lv_LV/languages.lang b/htdocs/langs/lv_LV/languages.lang
index 248390f73a0..7dee3237fc3 100644
--- a/htdocs/langs/lv_LV/languages.lang
+++ b/htdocs/langs/lv_LV/languages.lang
@@ -3,7 +3,8 @@ Language_am_ET=Etiopietis
 Language_ar_AR=Arābu
 Language_ar_EG=Arābu (Ēģipte)
 Language_ar_SA=Arābu
-Language_ar_TN=Arabic (Tunisia)
+Language_ar_TN=Arābu (Tunisija)
+Language_ar_IQ=Arābu (Irāka)
 Language_az_AZ=Azerbaidžāņi
 Language_bn_BD=Bengali
 Language_bn_IN=Bengāļu (Indija)
@@ -83,9 +84,10 @@ Language_ne_NP=Nepālietis
 Language_nl_BE=Holandiešu (Beļģijas)
 Language_nl_NL=Holandiešu
 Language_pl_PL=Poļu
+Language_pt_AO=Portugāļu (Angola)
 Language_pt_BR=Portugāļu (Brazīlija)
 Language_pt_PT=Portugāļu
-Language_ro_MD=Romanian (Moldavia)
+Language_ro_MD=Rumāņu (Moldāvija)
 Language_ro_RO=Rumāņu
 Language_ru_RU=Krievu
 Language_ru_UA=Krievu (Ukraina)
diff --git a/htdocs/langs/lv_LV/mails.lang b/htdocs/langs/lv_LV/mails.lang
index a959d345f2b..e6768ebf724 100644
--- a/htdocs/langs/lv_LV/mails.lang
+++ b/htdocs/langs/lv_LV/mails.lang
@@ -15,7 +15,7 @@ MailToUsers=Lietotājam (-iem)
 MailCC=Kopēt
 MailToCCUsers=Kopēt lietotājiem (-iem)
 MailCCC=Kešatmiņas kopija
-MailTopic=Email subject
+MailTopic=E-pasta tēma
 MailText=Ziņa
 MailFile=Pievienotie faili
 MailMessage=E-pasta saturs
@@ -131,8 +131,8 @@ NoNotificationsWillBeSent=Šim notikuma veidam un uzņēmumam nav plānoti autom
 ANotificationsWillBeSent=1 automātisks paziņojums tiks nosūtīts pa e-pastu
 SomeNotificationsWillBeSent=%s automātiskie paziņojumi tiks nosūtīti pa e-pastu
 AddNewNotification=Abonējiet jaunu automātisku e-pasta paziņojumu (mērķis / notikums)
-ListOfActiveNotifications=List of all active subscriptions (targets/events) for automatic email notification
-ListOfNotificationsDone=List of all automatic email notifications sent
+ListOfActiveNotifications=Visu aktīvo abonementu (mērķu / notikumu) saraksts automātiskai e-pasta paziņošanai
+ListOfNotificationsDone=Visu nosūtīto automātisko e-pasta paziņojumu saraksts
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/lv_LV/main.lang b/htdocs/langs/lv_LV/main.lang
index 0b76b3bbb10..0343778b95e 100644
--- a/htdocs/langs/lv_LV/main.lang
+++ b/htdocs/langs/lv_LV/main.lang
@@ -180,7 +180,7 @@ SaveAndNew=Saglabāt un jaunu
 TestConnection=Savienojuma pārbaude
 ToClone=Klonēt
 ConfirmCloneAsk=Vai tiešām vēlaties klonēt objektu <b> %s </b>?
-ConfirmClone=Choose the data you want to clone:
+ConfirmClone=Izvēlieties datus, kurus vēlaties klonēt:
 NoCloneOptionsSpecified=Nav datu klons noteikts.
 Of=no
 Go=Iet
@@ -246,7 +246,7 @@ DefaultModel=Noklusējuma doc veidne
 Action=Notikums
 About=Par
 Number=Numurs
-NumberByMonth=Total reports by month
+NumberByMonth=Kopējais pārskatu skaits mēnesī
 AmountByMonth=Summa šķirota pēc mēneša nosaukuma
 Numero=Numurs
 Limit=Ierobežot
@@ -278,7 +278,7 @@ DateModificationShort=Modif. datums
 IPModification=Modifikācijas IP
 DateLastModification=Jaunākais labošanas datums
 DateValidation=Apstiprināšanas datums
-DateSigning=Signing date
+DateSigning=Parakstīšanas datums
 DateClosing=Beigu datums
 DateDue=Izpildes datums
 DateValue=Valutēšanas datums
@@ -341,8 +341,8 @@ KiloBytes=Kilobaiti
 MegaBytes=Megabaiti
 GigaBytes=Gigabaiti
 TeraBytes=Terabaiti
-UserAuthor=Ceated by
-UserModif=Updated by
+UserAuthor=Apkrāpts ar
+UserModif=Atjaunināja
 b=b.
 Kb=Kb
 Mb=Mb
@@ -362,7 +362,7 @@ UnitPriceHTCurrency=Vienības cena (izņemot) (valūta)
 UnitPriceTTC=Vienības cena
 PriceU=UP
 PriceUHT=UP (neto)
-PriceUHTCurrency=U.P (net) (currency)
+PriceUHTCurrency=ASV (neto) (valūta)
 PriceUTTC=U.P. (inc. tax)
 Amount=Summa
 AmountInvoice=Rēķina summa
@@ -390,8 +390,8 @@ AmountTotal=Kopējā summa
 AmountAverage=Vidējā summa
 PriceQtyMinHT=Cenu daudzums min. (bez nodokļiem)
 PriceQtyMinHTCurrency=Cenu daudzums min. (bez nodokļa) (valūta)
-PercentOfOriginalObject=Percent of original object
-AmountOrPercent=Amount or percent
+PercentOfOriginalObject=Oriģinālā objekta procenti
+AmountOrPercent=Summa vai procenti
 Percentage=Procentuālā attiecība
 Total=Kopsumma
 SubTotal=Starpsumma
@@ -430,7 +430,7 @@ LT1IN=CGST
 LT2IN=SGST
 LT1GC=Papildu centi
 VATRate=Nodokļa likme
-RateOfTaxN=Rate of tax %s
+RateOfTaxN=Nodokļa likme %s
 VATCode=Nodokļu likmes kods
 VATNPR=Nodokļa likme NPR
 DefaultTaxRate=Noklusētā nodokļa likme
@@ -730,8 +730,8 @@ MenuMembers=Dalībnieki
 MenuAgendaGoogle=Google darba kārtība
 MenuTaxesAndSpecialExpenses=Nodokļi | Īpašie izdevumi
 ThisLimitIsDefinedInSetup=Dolibarr robeža (Menu mājas uzstādīšana-drošība): %s Kb, PHP robeža: %s Kb
-ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
-NoFileFound=No documents uploaded
+ThisLimitIsDefinedInSetupAt=Dolibarr limits (izvēlne %s): %s Kb, PHP ierobežojums (Param %s): %s Kb
+NoFileFound=Nav augšupielādēts neviens dokuments
 CurrentUserLanguage=Pašreizējā valoda
 CurrentTheme=Pašreizējā tēma
 CurrentMenuManager=Pašreizējais izvēlnes pārvaldnieks
@@ -847,7 +847,7 @@ XMoreLines=%s līnija(as) slēptas
 ShowMoreLines=Parādīt vairāk / mazāk rindas
 PublicUrl=Publiskā saite
 AddBox=Pievienot info logu
-SelectElementAndClick=Select an element and click on %s
+SelectElementAndClick=Atlasiet elementu un noklikšķiniet uz %s
 PrintFile=Drukāt failu %s
 ShowTransaction=Rādīt ierakstu bankas kontā
 ShowIntervention=Rādīt iejaukšanās
@@ -858,8 +858,8 @@ Denied=Aizliegts
 ListOf=%s saraksts
 ListOfTemplates=Saraksts ar veidnēm
 Gender=Dzimums
-Genderman=Male
-Genderwoman=Female
+Genderman=Vīrietis
+Genderwoman=Sieviete
 Genderother=Cits
 ViewList=Saraksta skats
 ViewGantt=Ganta skats
@@ -906,10 +906,10 @@ ViewAccountList=Skatīt virsgrāmatu
 ViewSubAccountList=Skatīt apakškonta virsgrāmatu
 RemoveString=Noņemt virkni '%s'
 SomeTranslationAreUncomplete=Dažas piedāvātās valodas var būt tikai daļēji tulkotas vai var saturēt kļūdas. Lūdzu, palīdziet labot savu valodu, reģistrējoties <a href="https://transifex.com/projects/p/dolibarr/" target="_blank"> https://transifex.com/projects/p/dolibarr/ </a>, lai pievienotu savus uzlabojumus.
-DirectDownloadLink=Public download link
-PublicDownloadLinkDesc=Only the link is required to download the file
-DirectDownloadInternalLink=Private download link
-PrivateDownloadLinkDesc=You need to be logged and you need permissions to view or download the file
+DirectDownloadLink=Publiska lejupielādes saite
+PublicDownloadLinkDesc=Lai lejupielādētu failu, nepieciešama tikai saite
+DirectDownloadInternalLink=Privāta lejupielādes saite
+PrivateDownloadLinkDesc=Lai skatītu vai lejupielādētu failu, jums ir jāpiesakās un jums ir vajadzīgas atļaujas
 Download=Lejupielādēt
 DownloadDocument=Lejupielādēt dokumentu
 ActualizeCurrency=Atjaunināt valūtas kursu
@@ -1022,7 +1022,7 @@ SearchIntoContacts=Kontakti
 SearchIntoMembers=Dalībnieki
 SearchIntoUsers=Lietotāji
 SearchIntoProductsOrServices=Preces un pakalpojumi
-SearchIntoBatch=Lots / Serials
+SearchIntoBatch=Daudz / sērijas
 SearchIntoProjects=Projekti
 SearchIntoMO=Ražošanas pasūtījumi
 SearchIntoTasks=Uzdevumi
@@ -1059,13 +1059,13 @@ KeyboardShortcut=Tastatūras saīsne
 AssignedTo=Piešķirts
 Deletedraft=Dzēst melnrakstu
 ConfirmMassDraftDeletion=Projekta masveida dzēšanas apstiprinājums
-FileSharedViaALink=File shared with a public link
+FileSharedViaALink=Fails ir kopīgots ar publisku saiti
 SelectAThirdPartyFirst=Vispirms izvēlieties trešo pusi ...
 YouAreCurrentlyInSandboxMode=Pašlaik esat %s "smilšu kastes" režīmā
 Inventory=Inventārs
 AnalyticCode=Analītiskais kods
 TMenuMRP=MRP
-ShowCompanyInfos=Show company infos
+ShowCompanyInfos=Rādīt uzņēmuma informāciju
 ShowMoreInfos=Rādīt vairāk informācijas
 NoFilesUploadedYet=Lūdzu, vispirms augšupielādējiet dokumentu
 SeePrivateNote=Skatīt privāto piezīmi
@@ -1074,7 +1074,7 @@ ValidFrom=Derīgs no
 ValidUntil=Derīgs līdz
 NoRecordedUsers=Nav lietotāju
 ToClose=Aizvērt
-ToRefuse=To refuse
+ToRefuse=Atteikties
 ToProcess=Jāapstrādā
 ToApprove=Apstiprināt
 GlobalOpenedElemView=Globālais izskats
@@ -1129,11 +1129,11 @@ UpdateForAllLines=Atjauninājums visām līnijām
 OnHold=On hold
 Civility=Laipnība
 AffectTag=Ietekmēt tagu
-CreateExternalUser=Create external user
+CreateExternalUser=Izveidot ārēju lietotāju
 ConfirmAffectTag=Masveida tagu ietekme
 ConfirmAffectTagQuestion=Vai tiešām vēlaties ietekmēt atlasītā (-o) ieraksta (-u) %s tagus?
 CategTypeNotFound=Ierakstu veidam nav atrasts neviens tagu tips
-CopiedToClipboard=Copied to clipboard
-InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
-ConfirmCancel=Are you sure you want to cancel
-EmailMsgID=Email MsgID
+CopiedToClipboard=Kopēts starpliktuvē
+InformationOnLinkToContract=Šī summa ir tikai visu līguma rindu kopsumma. Laika jēdziens netiek ņemts vērā.
+ConfirmCancel=Vai tiešām vēlaties atcelt
+EmailMsgID=Nosūtīt e-pastu MsgID
diff --git a/htdocs/langs/lv_LV/margins.lang b/htdocs/langs/lv_LV/margins.lang
index 92c24a82dc9..6a5520e8680 100644
--- a/htdocs/langs/lv_LV/margins.lang
+++ b/htdocs/langs/lv_LV/margins.lang
@@ -22,7 +22,7 @@ ProductService=Produkts vai pakalpojums
 AllProducts=Visi produkti un pakalpojumi
 ChooseProduct/Service=Izvēlies preci vai pakalpojumu
 ForceBuyingPriceIfNull=Force buying/cost price to selling price if not defined
-ForceBuyingPriceIfNullDetails=If buying/cost price not provided when we add a new line, and this option is "ON", the margin will be 0 on the new line (buying/cost price = selling price). If this option is "OFF" (recommended), margin will be equal to the value suggested by default (and may be 100% if no default value can be found).
+ForceBuyingPriceIfNullDetails=Ja pirkšanas / pašizmaksa nav norādīta, kad pievienojam jaunu rindu, un šī opcija ir “IESLĒGTS”, jaunajā rindā starpība būs 0 (pirkšanas / pašizmaksa = pārdošanas cena). Ja šī opcija ir "OFF" (ieteicams), starpība būs vienāda ar noklusējuma ieteikto vērtību (un, ja noklusējuma vērtību nevar atrast, tā var būt 100%).
 MARGIN_METHODE_FOR_DISCOUNT=Maržinālā metode pasaules atlaides
 UseDiscountAsProduct=Kā produktu
 UseDiscountAsService=Kā pakalpojums
diff --git a/htdocs/langs/lv_LV/members.lang b/htdocs/langs/lv_LV/members.lang
index 37bfdb2018b..966a410adef 100644
--- a/htdocs/langs/lv_LV/members.lang
+++ b/htdocs/langs/lv_LV/members.lang
@@ -15,24 +15,24 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Vēl viens dalībnieks (nosaukums: <b
 ErrorUserPermissionAllowsToLinksToItselfOnly=Drošības apsvērumu dēļ, jums ir jāpiešķir atļaujas, lai rediģētu visi lietotāji varētu saistīt locekli, lai lietotājam, kas nav jūsu.
 SetLinkToUser=Saite uz Dolibarr lietotāju
 SetLinkToThirdParty=Saite uz Dolibarr trešo personu
-MembersCards=Business cards for members
+MembersCards=Vizītkartes dalībniekiem
 MembersList=Dalībnieku saraksts
 MembersListToValid=Saraksts projektu dalībnieki (tiks apstiprināts)
 MembersListValid=Derīgo dalībnieku saraksts
 MembersListUpToDate=Derīgu dalībnieku saraksts ar atjauninātu abonementu
 MembersListNotUpToDate=Derīgo dalībnieku saraksts ar novecojušu abonementu
-MembersListExcluded=List of excluded members
+MembersListExcluded=Izslēgto dalībnieku saraksts
 MembersListResiliated=Dzēsto dalībnieku saraksts
 MembersListQualified=Saraksts kvalificētiem locekļiem
 MenuMembersToValidate=Projektu dalībnieki
 MenuMembersValidated=Apstiprināti biedri
-MenuMembersExcluded=Excluded members
+MenuMembersExcluded=Izslēgtie dalībnieki
 MenuMembersResiliated=Izslēgtie dalībnieki
 MembersWithSubscriptionToReceive=Dalībniekiem ar abonementu, lai saņemtu
 MembersWithSubscriptionToReceiveShort=Abonēšana saņemt
 DateSubscription=Abonēšanas datums
 DateEndSubscription=Abonēšanas beigu datums
-EndSubscription=Subscription Ends
+EndSubscription=Abonēšana beidzas
 SubscriptionId=Abonēšana id
 WithoutSubscription=Bez abonēšanas
 MemberId=Dalībnieka id
@@ -49,12 +49,12 @@ MemberStatusActiveLate=Abonements beidzies
 MemberStatusActiveLateShort=Beidzies
 MemberStatusPaid=Abonēšana atjaunināta
 MemberStatusPaidShort=Aktuāls
-MemberStatusExcluded=Excluded member
-MemberStatusExcludedShort=Excluded
+MemberStatusExcluded=Izslēgts dalībnieks
+MemberStatusExcludedShort=Izslēgts
 MemberStatusResiliated=Apturēts dalībnieks
 MemberStatusResiliatedShort=Izbeigta
 MembersStatusToValid=Projektu dalībnieki
-MembersStatusExcluded=Excluded members
+MembersStatusExcluded=Izslēgtie dalībnieki
 MembersStatusResiliated=Izbeigti dalībnieki
 MemberStatusNoSubscription=Validēts (abonēšana nav nepieciešama)
 MemberStatusNoSubscriptionShort=Apstiprināts
@@ -83,12 +83,12 @@ WelcomeEMail=Laipni lūdzam pasts
 SubscriptionRequired=Abonēšana nepieciešama
 DeleteType=Dzēst
 VoteAllowed=Balsot atļauts
-Physical=Individual
-Moral=Corporation
-MorAndPhy=Corporation and Individual
-Reenable=Re-Enable
-ExcludeMember=Exclude a member
-ConfirmExcludeMember=Are you sure you want to exclude this member ?
+Physical=Individuāls
+Moral=Korporācija
+MorAndPhy=Korporācija un privātpersona
+Reenable=Atkārtoti iespējot
+ExcludeMember=Izslēgt dalībnieku
+ConfirmExcludeMember=Vai tiešām vēlaties izslēgt šo dalībnieku?
 ResiliateMember=Izslēgt dalībnieku
 ConfirmResiliateMember=Vai tiešām vēlaties pārtraukt šo dalībnieku?
 DeleteMember=Dzēst dalībnieku
@@ -144,7 +144,7 @@ DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=E-pasta veidne, kas jāizmanto, la
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=E-pasta veidne, ko izmanto, lai nosūtītu e-pastu dalībniekam jaunā abonēšanas ierakstā
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=E-pasta veidne, ko izmanto, lai nosūtītu e-pasta atgādinājumu, kad abonements drīz beigsies
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=E-pasta veidne, kas jāizmanto, lai nosūtītu e-pastu dalībniekam dalībnieka atcelšanas laikā
-DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=E-pasta veidne, kas jāizmanto, lai nosūtītu e-pastu dalībniekam par dalībnieku izslēgšanu
 DescADHERENT_MAIL_FROM=Sūtītāja e-pasts automātiskajiem e-pastiem
 DescADHERENT_ETIQUETTE_TYPE=Formāts etiķešu lapā
 DescADHERENT_ETIQUETTE_TEXT=Teksts drukāts uz dalībnieku adrešu lapām
@@ -170,31 +170,31 @@ DocForLabels=Izveidot adrešu lapas
 SubscriptionPayment=Abonēšanas maksa
 LastSubscriptionDate=Pēdējā abonēšanas maksājuma datums
 LastSubscriptionAmount=Jaunākās abonēšanas summa
-LastMemberType=Last Member type
+LastMemberType=Pēdējā locekļa tips
 MembersStatisticsByCountries=Dalībnieku statistika pa valstīm
 MembersStatisticsByState=Dalībnieku statistika pēc štatiem/provincēm
 MembersStatisticsByTown=Dalībnieku statistika pa pilsētām
 MembersStatisticsByRegion=Dalībnieku statistika pa reģioniem
-NbOfMembers=Total number of members
-NbOfActiveMembers=Total number of current active members
+NbOfMembers=Kopējais dalībnieku skaits
+NbOfActiveMembers=Kopējais pašreizējo aktīvo dalībnieku skaits
 NoValidatedMemberYet=Nav apstiprinātas locekļi atrasti
-MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
-MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
-MembersByTownDesc=This screen show you statistics of members by town.
-MembersByNature=This screen show you statistics of members by nature.
-MembersByRegion=This screen show you statistics of members by region.
+MembersByCountryDesc=Šajā ekrānā tiek parādīta dalībnieku statistika pa valstīm. Grafiki un diagrammas ir atkarīgas no Google tiešsaistes grafiku pakalpojuma pieejamības, kā arī no darbojoša interneta savienojuma pieejamības.
+MembersByStateDesc=Šajā ekrānā tiek parādīta dalībvalstu statistika pēc štata / provincēm / kantona.
+MembersByTownDesc=Šajā ekrānā tiek parādīta dalībnieku statistika pa pilsētām.
+MembersByNature=Šis ekrāns parāda dalībnieku statistiku pēc būtības.
+MembersByRegion=Šajā ekrānā tiek parādīta dalībnieku statistika pēc reģiona.
 MembersStatisticsDesc=Izvēlieties statistiku kuru vēlaties izlasīt ...
 MenuMembersStats=Statistika
-LastMemberDate=Latest membership date
+LastMemberDate=Jaunākais dalības datums
 LatestSubscriptionDate=Jaunākais piereģistrēšanās datums
-MemberNature=Nature of the member
-MembersNature=Nature of the members
-Public=Information is public
+MemberNature=Dalībnieka raksturs
+MembersNature=Locekļu raksturs
+Public=Informācija ir publiska
 NewMemberbyWeb=Jauns dalībnieks pievienots. Gaida apstiprinājumu
 NewMemberForm=Jauna dalībnieka forma
-SubscriptionsStatistics=Subscriptions statistics
+SubscriptionsStatistics=Abonementu statistika
 NbOfSubscriptions=Abonementu skaits
-AmountOfSubscriptions=Amount collected from subscriptions
+AmountOfSubscriptions=No abonementiem iekasētā summa
 TurnoverOrBudget=Apgrozījums (uzņēmumam) vai budžets (par pamatu)
 DefaultAmount=Noklusējuma abonēšanas summa
 CanEditAmount=Apmeklētājs var izvēlēties / rediģēt summu no tās parakstītā
@@ -213,5 +213,5 @@ SendReminderForExpiredSubscription=Sūtīt atgādinājumu pa e-pastu dalībnieki
 MembershipPaid=Dalība, kas samaksāta par kārtējo periodu (līdz %s)
 YouMayFindYourInvoiceInThisEmail=Jūsu rēķinu varat atrast šī e-pasta pielikumā
 XMembersClosed=%s dalībnieks (-i) slēgts
-XExternalUserCreated=%s external user(s) created
-ForceMemberNature=Force member nature (Individual or Corporation)
+XExternalUserCreated=%s izveidots (-i) ārējs (-i) lietotājs (i)
+ForceMemberNature=Spēka locekļa raksturs (indivīds vai korporācija)
diff --git a/htdocs/langs/lv_LV/modulebuilder.lang b/htdocs/langs/lv_LV/modulebuilder.lang
index d441a4cedd3..88216a624c2 100644
--- a/htdocs/langs/lv_LV/modulebuilder.lang
+++ b/htdocs/langs/lv_LV/modulebuilder.lang
@@ -85,7 +85,7 @@ ListOfPermissionsDefined=Noteikto atļauju saraksts
 SeeExamples=Skatiet piemērus šeit
 EnabledDesc=Nosacījums, lai šis lauks būtu aktīvs (piemēri: 1 vai $ conf-> globāla-> MYMODULE_MYOPTION)
 VisibleDesc=Vai lauks ir redzams? (Piemēri: 0 = nekad nav redzams, 1 = redzams sarakstā un izveidojiet / atjauniniet / skatiet veidlapas, 2 = ir redzams tikai sarakstā, 3 = ir redzams tikai izveides / atjaunināšanas / skata formā (nav sarakstā), 4 = ir redzams sarakstā un tikai atjaunināt / skatīt formu (neveidot), 5 = redzama tikai saraksta beigu skata formā (neveidot, ne atjaunināt). <br> <br> Negatīvas vērtības līdzekļu izmantošana lauka pēc noklusējuma netiek parādīta, bet to var atlasīt apskatei). <br> <br> Tas var būt izteiciens, piemēram: <br> preg_match ('/ public /', $ _SERVER ['PHP_SELF'])? 0: 1 <br> ($ user-> rights-> rights-
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br><br><strong>For document :</strong><br>0 = not displayed <br>1 = display<br>2 = display only if not empty<br><br><strong>For document lines :</strong><br>0 = not displayed <br>1 = displayed in a column<br>3 = display in line description column after the description<br>4 = display in description column after the description only if not empty
+DisplayOnPdfDesc=Parādiet šo lauku saderīgos PDF dokumentos, pozīciju var pārvaldīt, izmantojot lauku “Pozīcija”. <br> Pašlaik zināmie saderīgie PDF modeļi ir: eratosthene (pasūtījums), espadon (kuģis), sūklis (rēķini), ciāns (propāls / citāts), radzenes (piegādātāja pasūtījums) = displejs <br> 2 = parādīt tikai tad, ja nav iztukšot <br> <br> <strong> dokumentu līnijas: </strong> <br> 0 = nav redzama <br> 1 = parādīti kolonnā <br> 3 = displeja līnija apraksta slejā pēc apraksta <br> 4 = displeja apraksta ailē pēc tam, kad apraksts tikai tad, ja tas nav tukšs
 DisplayOnPdf=Displejs PDF formātā
 IsAMeasureDesc=Vai lauka vērtību var uzkrāties, lai kopsumma tiktu iekļauta sarakstā? (Piemēri: 1 vai 0)
 SearchAllDesc=Vai laukums tiek izmantots, lai veiktu meklēšanu no ātrās meklēšanas rīka? (Piemēri: 1 vai 0)
@@ -133,9 +133,9 @@ IncludeDocGeneration=Es gribu no objekta ģenerēt dažus dokumentus
 IncludeDocGenerationHelp=Ja to atzīmēsit, tiks izveidots kāds kods, lai ierakstam pievienotu rūtiņu “Ģenerēt dokumentu”.
 ShowOnCombobox=Rādīt vērtību kombinētajā lodziņā
 KeyForTooltip=Rīka padoma atslēga
-CSSClass=CSS for edit/create form
-CSSViewClass=CSS for read form
-CSSListClass=CSS for list
+CSSClass=CSS rediģēšanas / izveides veidlapai
+CSSViewClass=CSS lasāmai formai
+CSSListClass=CSS sarakstam
 NotEditable=Nav rediģējams
 ForeignKey=Sveša atslēga
 TypeOfFieldsHelp=Lauku tips: <br> varchar (99), double (24,8), real, text, html, datetime, timestamp, integer, integer: ClassName: reliapath / to / classfile.class.php [: 1 [: filter]] ('1' nozīmē mēs pievienojam pogu + pēc kombināta, lai izveidotu ierakstu; “filtrs” var būt “status = 1 UN fk_user = __USER_ID UN entītija (piemēram, __SHARED_ENTITIES__)”.
@@ -143,4 +143,4 @@ AsciiToHtmlConverter=Ascii uz HTML pārveidotāju
 AsciiToPdfConverter=Ascii uz PDF pārveidotāju
 TableNotEmptyDropCanceled=Tabula nav tukša. Dzēšana tika atcelta.
 ModuleBuilderNotAllowed=Moduļu veidotājs ir pieejams, bet nav atļauts jūsu lietotājam.
-ImportExportProfiles=Import and export profiles
+ImportExportProfiles=Importēt un eksportēt profilus
diff --git a/htdocs/langs/lv_LV/mrp.lang b/htdocs/langs/lv_LV/mrp.lang
index 0ac6b6843af..25d867bbd20 100644
--- a/htdocs/langs/lv_LV/mrp.lang
+++ b/htdocs/langs/lv_LV/mrp.lang
@@ -13,7 +13,7 @@ BOMsSetup=Moduļa BOM iestatīšana
 ListOfBOMs=Materiālu rēķinu saraksts - BOM
 ListOfManufacturingOrders=Ražošanas pasūtījumu saraksts
 NewBOM=Jauns materiālu saraksts
-ProductBOMHelp=Product to create (or disassemble) with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
+ProductBOMHelp=Produkts, kuru izveidot (vai izjaukt) ar šo BOM. <br> Piezīme: Produkti ar īpašību 'Produkta veids' = 'Izejvielas' šajā sarakstā nav redzami.
 BOMsNumberingModules=BOM numerācijas veidnes
 BOMsModelModule=BOM dokumentu veidnes
 MOsNumberingModules=MO numerācijas veidnes
@@ -39,7 +39,7 @@ DateStartPlannedMo=Plānots sākuma datums
 DateEndPlannedMo=Plānots datuma beigas
 KeepEmptyForAsap=Tukša nozīmē “cik drīz vien iespējams”
 EstimatedDuration=Paredzamais ilgums
-EstimatedDurationDesc=Estimated duration to manufacture (or disassemble) this product using this BOM
+EstimatedDurationDesc=Paredzamais šī produkta izgatavošanas (vai demontāžas) ilgums, izmantojot šo BOM
 ConfirmValidateBom=Vai tiešām vēlaties apstiprināt BOM ar atsauci <strong>%s</strong> (jūs to varēsit izmantot, lai izveidotu jaunus ražošanas pasūtījumus)
 ConfirmCloseBom=Vai tiešām vēlaties atcelt šo BOM (jūs to vairs nevarēsit izmantot, lai izveidotu jaunus ražošanas pasūtījumus)?
 ConfirmReopenBom=Vai tiešām vēlaties atkārtoti atvērt šo BOM (jūs to varēsit izmantot, lai izveidotu jaunus ražošanas pasūtījumus)
@@ -63,14 +63,14 @@ ConsumeAndProduceAll=Patērēt un ražot visu
 Manufactured=Izgatavots
 TheProductXIsAlreadyTheProductToProduce=Pievienojamais produkts jau ir produkts, ko ražot.
 ForAQuantityOf=Par saražoto daudzumu %s
-ForAQuantityToConsumeOf=For a quantity to disassemble of %s
+ForAQuantityToConsumeOf=Lai izjauktu daudzumu %s
 ConfirmValidateMo=Vai tiešām vēlaties apstiprināt šo ražošanas pasūtījumu?
 ConfirmProductionDesc=Noklikšķinot uz “%s”, jūs apstiprināsit noteikto daudzumu patēriņu un / vai ražošanu. Tas arī atjauninās krājumus un reģistrēs krājumu kustību.
 ProductionForRef=%s ražošana
 AutoCloseMO=Automātiski aizveriet ražošanas pasūtījumu, ja ir sasniegti patērējamie un saražotie daudzumi
 NoStockChangeOnServices=Pakalpojumu krājumi nemainās
 ProductQtyToConsumeByMO=Produkta daudzums, ko vēl vajadzētu patērēt atvērtā MO
-ProductQtyToProduceByMO=Product quantity still to produce by open MO
+ProductQtyToProduceByMO=Produkta daudzums, kas vēl jāražo ar atvērtu MO
 AddNewConsumeLines=Pievienojiet jaunu rindu patērēšanai
 ProductsToConsume=Produkti, kurus patērēt
 ProductsToProduce=Izgatavojamie produkti
diff --git a/htdocs/langs/lv_LV/orders.lang b/htdocs/langs/lv_LV/orders.lang
index 1dc27b5f27c..1f8d5768509 100644
--- a/htdocs/langs/lv_LV/orders.lang
+++ b/htdocs/langs/lv_LV/orders.lang
@@ -17,8 +17,8 @@ ToOrder=Veicot pasūtījumu
 MakeOrder=Veicot pasūtījumu
 SupplierOrder=Pirkuma pasūtījums
 SuppliersOrders=Pirkuma pasūtījumi
-SaleOrderLines=Sale order lines
-PurchaseOrderLines=Puchase order lines
+SaleOrderLines=Izpārdošanas pasūtījumu līnijas
+PurchaseOrderLines=Puchase pasūtījuma līnijas
 SuppliersOrdersRunning=Pašreizējie pirkumu pasūtījumi
 CustomerOrder=Pārdošanas pasūtījums
 CustomersOrders=Pārdošanas pasūtījumi
diff --git a/htdocs/langs/lv_LV/other.lang b/htdocs/langs/lv_LV/other.lang
index 04863c42be0..64cae5e5bc6 100644
--- a/htdocs/langs/lv_LV/other.lang
+++ b/htdocs/langs/lv_LV/other.lang
@@ -114,7 +114,7 @@ DemoCompanyAll=Uzņēmums ar vairākām darbībām (visi galvenie moduļi)
 CreatedBy=Izveidoja %s
 ModifiedBy=Laboja %s
 ValidatedBy=Apstiprināja %s
-SignedBy=Signed by %s
+SignedBy=Parakstījis %s
 ClosedBy=Slēdza %s
 CreatedById=Lietotāja id kurš izveidojis
 ModifiedById=Lietotāja id kurš veica pēdējās izmaiņas
@@ -129,7 +129,7 @@ ClosedByLogin=Lietotājs, kurš slēdzis
 FileWasRemoved=Fails %s tika dzēsts
 DirWasRemoved=Katalogs %s tika dzēsts
 FeatureNotYetAvailable=Funkcija pašreizējā versijā vēl nav pieejama
-FeatureNotAvailableOnDevicesWithoutMouse=Feature not available on devices without mouse
+FeatureNotAvailableOnDevicesWithoutMouse=Funkcija nav pieejama ierīcēs bez peles
 FeaturesSupported=Atbalstītās funkcijas
 Width=Platums
 Height=Augstums
@@ -184,7 +184,7 @@ EnableGDLibraryDesc=Instalējiet vai iespējojiet GD bibliotēku savā PHP insta
 ProfIdShortDesc=<b>Prof ID %s</b> ir informācija, atkarībā no trešās puses valstīm. <br> Piemēram, attiecībā uz valstu <b>%s,</b> tas ir kods <b>%s.</b>
 DolibarrDemo=Dolibarr ERP/CRM demo
 StatsByNumberOfUnits=Statistics for sum of qty of products/services
-StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
+StatsByNumberOfEntities=Statistika par nosūtītāju skaitu (rēķinu vai pasūtījumu skaits ...)
 NumberOfProposals=Priekšlikumu skaits
 NumberOfCustomerOrders=Pārdošanas pasūtījumu skaits
 NumberOfCustomerInvoices=Klientu rēķinu skaits
@@ -246,7 +246,7 @@ NewKeyIs=Tas ir jūsu jaunās atslēgas, lai pieteiktos
 NewKeyWillBe=Jūsu jaunais galvenais, lai pieteiktos uz programmatūru, būs
 ClickHereToGoTo=Klikšķiniet šeit, lai dotos uz %s
 YouMustClickToChange=Jums ir Taču vispirms noklikšķiniet uz šīs saites, lai apstiprinātu šo paroles maiņa
-ConfirmPasswordChange=Confirm password change
+ConfirmPasswordChange=Apstipriniet paroles maiņu
 ForgetIfNothing=Ja Jums nav lūgt šīs izmaiņas, vienkārši aizmirst šo e-pastu. Jūsu akreditācijas dati tiek glabāti drošībā.
 IfAmountHigherThan=Ja summa pārsniedz  <strong>%s </strong>
 SourcesRepository=Repository for sources
@@ -264,7 +264,7 @@ ContactCreatedByEmailCollector=Kontaktpersona / adrese, ko izveidojis e-pasta ko
 ProjectCreatedByEmailCollector=Projekts, ko izveidojis e-pasta savācējs no e-pasta MSGID %s
 TicketCreatedByEmailCollector=Biļete, ko izveidojis e-pasta kolekcionārs no e-pasta MSGID %s
 OpeningHoursFormatDesc=Izmantojiet taustiņu -, lai nodalītu darba un aizvēršanas stundas. <br> Izmantojiet atstarpi, lai ievadītu dažādus diapazonus. <br> Piemērs: 8.-12
-SuffixSessionName=Suffix for session name
+SuffixSessionName=Sesijas nosaukuma sufikss
 
 ##### Export #####
 ExportsArea=Eksportēšanas sadaļa
@@ -290,4 +290,4 @@ PopuProp=Produkti / pakalpojumi pēc popularitātes priekšlikumos
 PopuCom=Produkti / pakalpojumi pēc popularitātes pasūtījumos
 ProductStatistics=Produktu/pakalpojumu statistika
 NbOfQtyInOrders=Daudzums pasūtījumos
-SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
+SelectTheTypeOfObjectToAnalyze=Atlasiet objektu, lai skatītu tā statistiku ...
diff --git a/htdocs/langs/lv_LV/partnership.lang b/htdocs/langs/lv_LV/partnership.lang
index d9de28dd450..bc720b88482 100644
--- a/htdocs/langs/lv_LV/partnership.lang
+++ b/htdocs/langs/lv_LV/partnership.lang
@@ -16,66 +16,66 @@
 #
 # Generic
 #
-ModulePartnershipName=Partnership management
-PartnershipDescription=Module Partnership management
-PartnershipDescriptionLong= Module Partnership management
+ModulePartnershipName=Partnerības vadība
+PartnershipDescription=Partnerības vadības modulis
+PartnershipDescriptionLong= Partnerības vadības modulis
 
-AddPartnership=Add partnership
-CancelPartnershipForExpiredMembers=Partnership: Cancel partnership of members with expired subscriptions
-PartnershipCheckBacklink=Partnership: Check referring backlink
+AddPartnership=Pievienojiet partnerību
+CancelPartnershipForExpiredMembers=Partnerība: atceļ partnerību ar abonementiem, kuriem beidzies derīguma termiņš
+PartnershipCheckBacklink=Partnerība: pārbaudiet atsauces saiti
 
 #
 # Menu
 #
-NewPartnership=New Partnership
-ListOfPartnerships=List of partnership
+NewPartnership=Jauna partnerība
+ListOfPartnerships=Partnerības saraksts
 
 #
 # Admin page
 #
-PartnershipSetup=Partnership setup
-PartnershipAbout=About Partnership
-PartnershipAboutPage=Partnership about page
-partnershipforthirdpartyormember=Partner status must be set on a 'thirdparty' or a 'member'
-PARTNERSHIP_IS_MANAGED_FOR=Partnership managed for
-PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks to check
-PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb of days before cancelling status of a partnership when a subscription has expired
-ReferingWebsiteCheck=Check of website referring
-ReferingWebsiteCheckDesc=You can enable a feature to check that your partners has added a backlink to your website domains on their own website.
+PartnershipSetup=Partnerības iestatīšana
+PartnershipAbout=Par partnerību
+PartnershipAboutPage=Partnerība par lapu
+partnershipforthirdpartyormember=Partnera statusam jābūt iestatītam “trešajai pusei” vai “dalībniekam”
+PARTNERSHIP_IS_MANAGED_FOR=Partnerattiecības pārvaldītas
+PARTNERSHIP_BACKLINKS_TO_CHECK=Atpakaļsaites, lai pārbaudītu
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb dienas pirms partnerības statusa atcelšanas, kad abonements ir beidzies
+ReferingWebsiteCheck=Vietnes atsauces pārbaude
+ReferingWebsiteCheckDesc=Varat iespējot funkciju, lai pārbaudītu, vai jūsu partneri ir pievienojuši atpakaļsaišu jūsu vietnes domēniem savā vietnē.
 
 #
 # Object
 #
-DeletePartnership=Delete a partnership
-PartnershipDedicatedToThisThirdParty=Partnership dedicated to this third party
-PartnershipDedicatedToThisMember=Partnership dedicated to this member
+DeletePartnership=Dzēst partnerību
+PartnershipDedicatedToThisThirdParty=Partnerība, kas veltīta šai trešajai pusei
+PartnershipDedicatedToThisMember=Šim dalībniekam veltīta partnerība
 DatePartnershipStart=Sākuma datums
 DatePartnershipEnd=Beigu datums
-ReasonDecline=Decline reason
-ReasonDeclineOrCancel=Decline reason
-PartnershipAlreadyExist=Partnership already exist
-ManagePartnership=Manage partnership
-BacklinkNotFoundOnPartnerWebsite=Backlink not found on partner website
-ConfirmClosePartnershipAsk=Are you sure you want to cancel this partnership?
-PartnershipType=Partnership type
+ReasonDecline=Noraidīt iemeslu
+ReasonDeclineOrCancel=Noraidīt iemeslu
+PartnershipAlreadyExist=Partnerattiecības jau pastāv
+ManagePartnership=Pārvaldiet partnerību
+BacklinkNotFoundOnPartnerWebsite=Atpakaļsaite nav atrasta partnera vietnē
+ConfirmClosePartnershipAsk=Vai tiešām vēlaties atcelt šo partnerību?
+PartnershipType=Partnerības veids
 
 #
 # Template Mail
 #
-SendingEmailOnPartnershipWillSoonBeCanceled=Partnership will soon be canceled
-SendingEmailOnPartnershipRefused=Partnership refused
-SendingEmailOnPartnershipAccepted=Partnership accepted
-SendingEmailOnPartnershipCanceled=Partnership canceled
+SendingEmailOnPartnershipWillSoonBeCanceled=Partnerība drīz tiks atcelta
+SendingEmailOnPartnershipRefused=Partnerība atteikta
+SendingEmailOnPartnershipAccepted=Partnerība pieņemta
+SendingEmailOnPartnershipCanceled=Partnerattiecības atceltas
 
-YourPartnershipWillSoonBeCanceledTopic=Partnership will soon be canceled
-YourPartnershipRefusedTopic=Partnership refused
-YourPartnershipAcceptedTopic=Partnership accepted
-YourPartnershipCanceledTopic=Partnership canceled
+YourPartnershipWillSoonBeCanceledTopic=Partnerība drīz tiks atcelta
+YourPartnershipRefusedTopic=Partnerība atteikta
+YourPartnershipAcceptedTopic=Partnerība pieņemta
+YourPartnershipCanceledTopic=Partnerattiecības atceltas
 
-YourPartnershipWillSoonBeCanceledContent=We inform you that your partnership will soon be canceled (Backlink not found)
-YourPartnershipRefusedContent=We inform you that your partnership request has been refused.
-YourPartnershipAcceptedContent=We inform you that your partnership request has been accepted.
-YourPartnershipCanceledContent=We inform you that your partnership has been canceled.
+YourPartnershipWillSoonBeCanceledContent=Mēs jūs informējam, ka jūsu partnerība drīz tiks atcelta (atpakaļsaite nav atrasta)
+YourPartnershipRefusedContent=Mēs jūs informējam, ka jūsu partnerības pieprasījums ir noraidīts.
+YourPartnershipAcceptedContent=Mēs jūs informējam, ka jūsu partnerības pieprasījums ir pieņemts.
+YourPartnershipCanceledContent=Mēs jūs informējam, ka jūsu partnerattiecības ir atceltas.
 
 #
 # Status
@@ -84,4 +84,4 @@ PartnershipDraft=Melnraksts
 PartnershipAccepted=Pieņemts
 PartnershipRefused=Atteikts
 PartnershipCanceled=Atcelts
-PartnershipManagedFor=Partners are
+PartnershipManagedFor=Partneri ir
diff --git a/htdocs/langs/lv_LV/productbatch.lang b/htdocs/langs/lv_LV/productbatch.lang
index 2f03a347eee..7e54bf7debd 100644
--- a/htdocs/langs/lv_LV/productbatch.lang
+++ b/htdocs/langs/lv_LV/productbatch.lang
@@ -1,10 +1,10 @@
 # ProductBATCH language file - Source file is en_US - ProductBATCH
 ManageLotSerial=Izmantot partijas / sērijas numuru
-ProductStatusOnBatch=Yes (lot required)
-ProductStatusOnSerial=Yes (unique serial number required)
+ProductStatusOnBatch=Jā (nepieciešama partija)
+ProductStatusOnSerial=Jā (nepieciešams unikāls sērijas numurs)
 ProductStatusNotOnBatch=Nav (partija / sērijas numurs netiek izmantots)
-ProductStatusOnBatchShort=Lot
-ProductStatusOnSerialShort=Serial
+ProductStatusOnBatchShort=Daudz
+ProductStatusOnSerialShort=Seriāls
 ProductStatusNotOnBatchShort=Nē
 Batch=Lot/seriāls
 atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
@@ -24,22 +24,22 @@ ProductLotSetup=Moduļu partijas / sērijas uzstādīšana
 ShowCurrentStockOfLot=Parādīt pašreizējo krājumu par pāris produktu / partiju
 ShowLogOfMovementIfLot=Rādīt žurnālu par kustību pāriem produktam / partijai
 StockDetailPerBatch=Krājumu dati par partiju
-SerialNumberAlreadyInUse=Serial number %s is already used for product %s
-TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
-BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
-BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
-ManageLotMask=Custom mask
-CustomMasks=Adds an option to define mask in the product card
-LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
-SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
-QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
-LifeTime=Life span (in days)
-EndOfLife=End of life
-ManufacturingDate=Manufacturing date
-DestructionDate=Destruction date
-FirstUseDate=First use date
-QCFrequency=Quality control frequency (in days)
+SerialNumberAlreadyInUse=Sērijas numurs %s jau tiek izmantots produktam %s
+TooManyQtyForSerialNumber=Jums var būt tikai viens produkts %s sērijas numuram %s
+BatchLotNumberingModules=Iespējas automātiskai sērijveida produktu ģenerēšanai, ko pārvalda partijas
+BatchSerialNumberingModules=Iespējas automātiskai sērijveida produktu ģenerēšanai, kurus pārvalda sērijas numuri
+ManageLotMask=Pielāgota maska
+CustomMasks=Produkta kartē tiek pievienota iespēja definēt masku
+LotProductTooltip=Produkta kartē tiek pievienota opcija, lai noteiktu īpašu partijas numura masku
+SNProductTooltip=Produkta kartē tiek pievienota opcija, lai noteiktu īpašu sērijas numura masku
+QtyToAddAfterBarcodeScan=Katram skenētajam svītrkodam / partijai / sērijai jāpievieno daudzums
+LifeTime=Mūža ilgums (dienās)
+EndOfLife=Dzīves beigas
+ManufacturingDate=Ražošanas datums
+DestructionDate=Iznīcināšanas datums
+FirstUseDate=Pirmās lietošanas datums
+QCFrequency=Kvalitātes kontroles biežums (dienās)
 
 #Traceability - qc status
-OutOfOrder=Out of order
-InWorkingOrder=In working order
+OutOfOrder=Nedarbojas
+InWorkingOrder=Darba kārtībā
diff --git a/htdocs/langs/lv_LV/products.lang b/htdocs/langs/lv_LV/products.lang
index b3ca5f5434a..e5a50f0a6ca 100644
--- a/htdocs/langs/lv_LV/products.lang
+++ b/htdocs/langs/lv_LV/products.lang
@@ -43,7 +43,7 @@ ServicesOnSaleOnly=Pakalpojumi pārdošanai
 ServicesOnPurchaseOnly=Pakalpojumi tikai pirkšanai
 ServicesNotOnSell=Pakalpojumi, kas nav paredzēti pārdošanai un nav paredzēti pirkšanai
 ServicesOnSellAndOnBuy=Services for sale and for purchase
-LastModifiedProductsAndServices=Latest %s products/services which were modified
+LastModifiedProductsAndServices=Jaunākie %s produkti / pakalpojumi, kas tika modificēti
 LastRecordedProducts=Jaunākie ieraksti %s
 LastRecordedServices=Jaunākie %s reģistrētie pakalpojumi
 CardProduct0=Produkts
@@ -73,12 +73,12 @@ SellingPrice=Pārdošanas cena
 SellingPriceHT=Pārdošanas cena (bez nodokļa)
 SellingPriceTTC=Pārdošanas cena (ar PVN)
 SellingMinPriceTTC=Minimālā pārdošanas cena (ieskaitot nodokli)
-CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
+CostPriceDescription=Šo cenu lauku (bez nodokļiem) var izmantot, lai attēlotu vidējo summu, ko šis produkts izmaksā jūsu uzņēmumam. Tā var būt jebkura cena, kuru pats aprēķināt, piemēram, no vidējās pirkšanas cenas plus vidējās ražošanas un izplatīšanas izmaksas.
 CostPriceUsage=Šo vērtību var izmantot, lai aprēķinātu peļņu.
 SoldAmount=Pārdošanas apjoms
 PurchasedAmount=Iegādātā summa
 NewPrice=Jaunā cena
-MinPrice=Min. selling price
+MinPrice=Min. pārdošanas cena
 EditSellingPriceLabel=Labot pārdošanas cenas nosaukumu
 CantBeLessThanMinPrice=Pārdošanas cena nevar būt zemāka par minimālo pieļaujamo šī produkta (%s bez PVN). Šis ziņojums var būt arī parādās, ja esat ievadījis pārāk lielu atlaidi.
 ContractStatusClosed=Slēgts
@@ -141,7 +141,7 @@ VATRateForSupplierProduct=PVN likme (šim pārdevējam / produktam)
 DiscountQtyMin=Atlaide šim daudzumam.
 NoPriceDefinedForThisSupplier=Šim pārdevējam / produktam nav noteikta cena / daudzums
 NoSupplierPriceDefinedForThisProduct=Šim produktam nav noteikta pārdevēja cena / daudzums
-PredefinedItem=Predefined item
+PredefinedItem=Iepriekš definēts vienums
 PredefinedProductsToSell=Iepriekš definēts produkts
 PredefinedServicesToSell=Iepriekš definēts pakalpojums
 PredefinedProductsAndServicesToSell=Iepriekš definēti produkti/pakalpojumi, kurus pārdot
@@ -157,11 +157,11 @@ ListServiceByPopularity=Pakalpojumu saraksts pēc pārdošanas popularitātes
 Finished=Ražota prece
 RowMaterial=Izejviela
 ConfirmCloneProduct=Vai jūs tiešām vēlaties klonēt šo produktu vai pakalpojumu <b>%s?</b>
-CloneContentProduct=Clone all main information of the product/service
+CloneContentProduct=Klonējiet visu galveno informāciju par produktu / pakalpojumu
 ClonePricesProduct=Klonēt cenas
-CloneCategoriesProduct=Clone linked tags/categories
-CloneCompositionProduct=Clone virtual products/services
-CloneCombinationsProduct=Clone the product variants
+CloneCategoriesProduct=Klonējiet saistītos tagus / kategorijas
+CloneCompositionProduct=Klonējiet virtuālos produktus / pakalpojumus
+CloneCombinationsProduct=Klonējiet produktu variantus
 ProductIsUsed=Šis produkts tiek izmantots
 NewRefForClone=Ref. jaunu produktu / pakalpojumu
 SellingPrices=Pārdošanas cenas
@@ -170,12 +170,12 @@ CustomerPrices=Klienta cenas
 SuppliersPrices=Pārdevēja cenas
 SuppliersPricesOfProductsOrServices=Pārdevēja cenas (produktiem vai pakalpojumiem)
 CustomCode=Muita | prece | HS kods
-CountryOrigin=Country of origin
-RegionStateOrigin=Region of origin
-StateOrigin=State|Province of origin
-Nature=Nature of product (raw/manufactured)
+CountryOrigin=Izcelsmes valsts
+RegionStateOrigin=Izcelsmes reģions
+StateOrigin=Valsts | Izcelsmes province
+Nature=Produkta veids (neapstrādāts / ražots)
 NatureOfProductShort=Produkta veids
-NatureOfProductDesc=Raw material or manufactured product
+NatureOfProductDesc=Izejviela vai ražots produkts
 ShortLabel=Īsais nosaukums
 Unit=Vienība
 p=u.
@@ -277,7 +277,7 @@ PriceByCustomer=Dažādas cenas katram klientam
 PriceCatalogue=Viena produkta/pakalpojuma pārdošanas cena
 PricingRule=Noteikumi par pārdošanas cenām
 AddCustomerPrice=Pievienot cenu katram klientam
-ForceUpdateChildPriceSoc=Iestatiet to pašu cenu klientu meitasuzņēmumiem
+ForceUpdateChildPriceSoc=Nosakiet to pašu cenu klienta meitasuzņēmumiem
 PriceByCustomerLog=Log of previous customer prices
 MinimumPriceLimit=Minimum price can't be lower then %s
 MinimumRecommendedPrice=Minimālā ieteicamā cena ir: %s
@@ -296,6 +296,7 @@ ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Apakš produkti
 MinSupplierPrice=Minimālā iepirkuma cena
 MinCustomerPrice=Minimālā pārdošanas cena
+NoDynamicPrice=Nav dinamiskas cenas
 DynamicPriceConfiguration=Dynamic price configuration
 DynamicPriceDesc=Jūs varat noteikt matemātiskās formulas, lai aprēķinātu Klienta vai pārdevēja cenas. Šādas formulas var izmantot visus matemātiskos operatorus, dažas konstantes un mainīgos. Šeit varat definēt mainīgos, kurus vēlaties izmantot. Ja mainīgajam nepieciešams automātisks atjauninājums, varat definēt ārējo URL, lai Dolibarr varētu automātiski atjaunināt vērtību.
 AddVariable=Pievienot mainīgo
@@ -314,7 +315,7 @@ LastUpdated=Pēdējo reizi atjaunots
 CorrectlyUpdated=Pareizi atjaunināts
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=Izvēlieties PDF failus
-IncludingProductWithTag=Include products/services with tag
+IncludingProductWithTag=Iekļaujiet produktus / pakalpojumus ar tagu
 DefaultPriceRealPriceMayDependOnCustomer=Noklusējuma cena, reālā cena var būt atkarīga no klienta
 WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Vienība
diff --git a/htdocs/langs/lv_LV/projects.lang b/htdocs/langs/lv_LV/projects.lang
index 19f959ab524..0391b4e8434 100644
--- a/htdocs/langs/lv_LV/projects.lang
+++ b/htdocs/langs/lv_LV/projects.lang
@@ -10,19 +10,19 @@ PrivateProject=Projekta kontakti
 ProjectsImContactFor=Projekti, par kuriem tieši esmu kontaktpersona
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=Visi projekti
-MyProjectsDesc=This view is limited to the projects that you are a contact for
+MyProjectsDesc=Šis skats attiecas tikai uz projektiem, ar kuriem esat kontaktpersona
 ProjectsPublicDesc=Šo viedokli iepazīstina visus projektus jums ir atļauts lasīt.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
 ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
 ProjectsDesc=Šo viedokli iepazīstina visus projektus (jūsu lietotāja atļaujas piešķirt jums atļauju skatīt visu).
 TasksOnProjectsDesc=Šis skats atspoguļo visus uzdevumus visos projektos (jūsu lietotāja atļaujas piešķir jums atļauju apskatī visu).
-MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
+MyTasksDesc=Šis skats attiecas tikai uz projektiem vai uzdevumiem, ar kuriem esat kontaktpersona
 OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 ClosedProjectsAreHidden=Slēgtie projekti nav redzami.
 TasksPublicDesc=Šo viedokli iepazīstina visus projektus un uzdevumus, jums ir atļauts lasīt.
 TasksDesc=Šo viedokli iepazīstina visus projektus un uzdevumus (jūsu lietotāja atļaujas piešķirt jums atļauju skatīt visu).
 AllTaskVisibleButEditIfYouAreAssigned=Visi uzdevumi kvalificētiem projektiem ir redzami, taču jūs varat ievadīt laiku tikai tam uzdevumam, kas piešķirts izvēlētajam lietotājam. Piešķirt uzdevumu, ja uz to ir jāievada laiks.
-OnlyYourTaskAreVisible=Only tasks assigned to you are visible. If you need to enter time on a task and if the task is not visible here, then you need to assign the task to yourself.
+OnlyYourTaskAreVisible=Ir redzami tikai jums piešķirtie uzdevumi. Ja jums jāievada uzdevuma izpildes laiks un ja uzdevums šeit nav redzams, jums tas jāpiešķir sev.
 ImportDatasetTasks=Projektu uzdevumi
 ProjectCategories=Projekta tagi / sadaļas
 NewProject=Jauns projekts
@@ -89,7 +89,7 @@ TimeConsumed=Patērēts
 ListOfTasks=Uzdevumu saraksts
 GoToListOfTimeConsumed=Pāriet uz patērētā laika sarakstu
 GanttView=Ganta skats
-ListWarehouseAssociatedProject=List of warehouses associated to the project
+ListWarehouseAssociatedProject=Ar projektu saistīto noliktavu saraksts
 ListProposalsAssociatedProject=Ar projektu saistīto komerciālo priekšlikumu saraksts
 ListOrdersAssociatedProject=Ar projektu saistīto pārdošanas pasūtījumu saraksts
 ListInvoicesAssociatedProject=Saraksts ar klienta rēķiniem, kas saistīti ar projektu
@@ -202,7 +202,7 @@ ResourceNotAssignedToTheTask=Uzdevumam nav piešķirts
 NoUserAssignedToTheProject=Neviens lietotājs nav piešķirts šim projektam
 TimeSpentBy=Pavadītais laiks
 TasksAssignedTo=Uzdevumi, kas piešķirti
-AssignTaskToMe=Assign task to myself
+AssignTaskToMe=Piešķiriet sev uzdevumu
 AssignTaskToUser=Piešķirt uzdevumu %s
 SelectTaskToAssign=Atlasiet uzdevumu, lai piešķirtu ...
 AssignTask=Piešķirt
@@ -267,11 +267,11 @@ InvoiceToUse=Izmantojamais rēķina projekts
 NewInvoice=Jauns rēķins
 OneLinePerTask=Viena rinda katram uzdevumam
 OneLinePerPeriod=Viena rindiņa vienam periodam
-OneLinePerTimeSpentLine=One line for each time spent declaration
+OneLinePerTimeSpentLine=Viena rinda par katru pavadīto deklarāciju
 RefTaskParent=Ref. Vecāku uzdevums
 ProfitIsCalculatedWith=Peļņa tiek aprēķināta, izmantojot
-AddPersonToTask=Add also to tasks
-UsageOrganizeEvent=Usage: Event Organization
-PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
-PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
-SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
+AddPersonToTask=Pievienojiet arī uzdevumiem
+UsageOrganizeEvent=Lietošana: Pasākumu organizēšana
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Klasificējiet projektu kā slēgtu, kad visi tā uzdevumi ir izpildīti (progress 100%%)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Piezīme: esošie projekti ar visiem 100%% uzdevumiem netiks ietekmēti: tie būs jāaizver manuāli. Šī opcija ietekmē tikai atvērtos projektus.
+SelectLinesOfTimeSpentToInvoice=Atlasiet pavadītās laika rindas, kas nav izrakstītas, un pēc tam veiciet lielapjoma darbību “Ģenerēt rēķinu”, lai par tām izrakstītu rēķinus
diff --git a/htdocs/langs/lv_LV/propal.lang b/htdocs/langs/lv_LV/propal.lang
index 868562cdf15..ae0c9ace708 100644
--- a/htdocs/langs/lv_LV/propal.lang
+++ b/htdocs/langs/lv_LV/propal.lang
@@ -59,7 +59,7 @@ ConfirmClonePropal=Vai tiešām vēlaties klonēt komerciālo priekšlikumu <b>
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
 ProposalsAndProposalsLines=Commercial priekšlikumu un līnijas
 ProposalLine=Priekšlikuma līnija
-ProposalLines=Proposal lines
+ProposalLines=Priekšlikuma rindas
 AvailabilityPeriod=Pieejamība kavēšanās
 SetAvailability=Uzstādīt pieejamību kavēšanos
 AfterOrder=pēc pasūtījuma
diff --git a/htdocs/langs/lv_LV/receptions.lang b/htdocs/langs/lv_LV/receptions.lang
index 8c62d5199b5..42d3e64e35a 100644
--- a/htdocs/langs/lv_LV/receptions.lang
+++ b/htdocs/langs/lv_LV/receptions.lang
@@ -44,4 +44,4 @@ ValidateOrderFirstBeforeReception=Vispirms jums ir jāapstiprina pasūtījums, l
 ReceptionsNumberingModules=Pieņemšanas numurēšanas modulis
 ReceptionsReceiptModel=Pieņemšanas dokumentu veidnes
 NoMorePredefinedProductToDispatch=Vairs nav iepriekš nosūtītu produktu
-ReceptionExist=A reception exists
+ReceptionExist=Reģistratūra pastāv
diff --git a/htdocs/langs/lv_LV/recruitment.lang b/htdocs/langs/lv_LV/recruitment.lang
index 40957c1b2df..d85ea93e206 100644
--- a/htdocs/langs/lv_LV/recruitment.lang
+++ b/htdocs/langs/lv_LV/recruitment.lang
@@ -72,5 +72,5 @@ YourCandidatureAnswerMessage=Paldies par jūsu pieteikumu. <br> ...
 JobClosedTextCandidateFound=Darba vieta ir slēgta. Amats ir aizpildīts.
 JobClosedTextCanceled=Darba vieta ir slēgta.
 ExtrafieldsJobPosition=Papildu atribūti (amata vietas)
-ExtrafieldsApplication=Complementary attributes (job applications)
+ExtrafieldsApplication=Papildu atribūti (darba pieteikumi)
 MakeOffer=Uztaisīt piedāvājumu
diff --git a/htdocs/langs/lv_LV/salaries.lang b/htdocs/langs/lv_LV/salaries.lang
index 816227ad4cb..711751a30b5 100644
--- a/htdocs/langs/lv_LV/salaries.lang
+++ b/htdocs/langs/lv_LV/salaries.lang
@@ -2,12 +2,15 @@
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Grāmatvedības konts, ko izmanto trešām pusēm
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=Lietotāja kartē norādītais grāmatvedības konts tiks izmantots tikai pakārtotajam grāmatvedim. Šis viens tiks izmantots General Ledger un noklusējuma vērtība Subledged grāmatvedībai, ja lietotāja definēts lietotāju grāmatvedības konts nav definēts.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Grāmatvedības konts pēc noklusējuma algu maksājumiem
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=Pēc noklusējuma, veidojot algu, atstājiet tukšu opciju "Automātiski izveidot kopējo maksājumu"
 Salary=Alga
 Salaries=Algas
-NewSalaryPayment=Jauna algas izmaksa
+NewSalary=Jauna alga
+NewSalaryPayment=Jauna algas karte
 AddSalaryPayment=Pievienot algas maksājumu
 SalaryPayment=Algas maksājums
 SalariesPayments=Algu maksājumi
+SalariesPaymentsOf=Algas maksājumi %s
 ShowSalaryPayment=Rādīt algu maksājumus
 THM=Vidējā stundas cena
 TJM=Vidējā dienas likme
diff --git a/htdocs/langs/lv_LV/sendings.lang b/htdocs/langs/lv_LV/sendings.lang
index ae1c4042f5d..af79dcd83ee 100644
--- a/htdocs/langs/lv_LV/sendings.lang
+++ b/htdocs/langs/lv_LV/sendings.lang
@@ -43,7 +43,7 @@ ConfirmValidateSending=Vai jūs tiešām vēlaties apstiprināt šo sūtījumu a
 ConfirmCancelSending=Vai esat pārliecināts, ka vēlaties atcelt šo sūtījumu?
 DocumentModelMerou=Merou A5 modelis
 WarningNoQtyLeftToSend=Uzmanību, nav produktu kuri gaida nosūtīšanu.
-StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
+StatsOnShipmentsOnlyValidated=Statistika attiecas tikai uz apstiprinātiem sūtījumiem. Izmantotais datums ir sūtījuma apstiprināšanas datums (plānotais piegādes datums ne vienmēr ir zināms)
 DateDeliveryPlanned=Plānotais piegādes datums
 RefDeliveryReceipt=Ref piegādes kvīts
 StatusReceipt=Piegādes kvīts statuss
diff --git a/htdocs/langs/lv_LV/stocks.lang b/htdocs/langs/lv_LV/stocks.lang
index f6c3d4166fe..e3a3f3764a0 100644
--- a/htdocs/langs/lv_LV/stocks.lang
+++ b/htdocs/langs/lv_LV/stocks.lang
@@ -19,8 +19,8 @@ Stock=Krājums
 Stocks=Krājumi
 MissingStocks=Trūkst krājumu
 StockAtDate=Krājumi datumā
-StockAtDateInPast=Date in the past
-StockAtDateInFuture=Date in the future
+StockAtDateInPast=Datums pagātnē
+StockAtDateInFuture=Datums nākotnē
 StocksByLotSerial=Krājumi pēc partijas/sērijas
 LotSerial=Daudz / sērijas nr
 LotSerialList=Partijas saraksts / sērijas nr
@@ -37,8 +37,8 @@ AllWarehouses=Visas noliktavas
 IncludeEmptyDesiredStock=Iekļaujiet arī negatīvo krājumu ar nenoteiktu vēlamo krājumu
 IncludeAlsoDraftOrders=Iekļaujiet arī pasūtījumu projektus
 Location=Vieta
-LocationSummary=Short name of location
-NumberOfDifferentProducts=Number of unique products
+LocationSummary=Īss atrašanās vietas nosaukums
+NumberOfDifferentProducts=Unikālo produktu skaits
 NumberOfProducts=Kopējais produktu skaits
 LastMovement=Pēdējā pārvietošana
 LastMovements=Pēdējās pārvietošanas
@@ -60,8 +60,8 @@ EnhancedValueOfWarehouses=Noliktavas vērtība
 UserWarehouseAutoCreate=Lietotāja noliktavas izveide, izveidojot lietotāju
 AllowAddLimitStockByWarehouse=Pārvaldiet arī minimālā un vēlamā krājuma vērtību pārī (produkta noliktava), papildus minimālā un vēlamā krājuma vērtībai vienam produktam
 RuleForWarehouse=Noteikumi noliktavām
-WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
-WarehouseAskWarehouseDuringPropal=Set a warehouse on Commercial proposals
+WarehouseAskWarehouseOnThirparty=Iestatiet noliktavu trešajām pusēm
+WarehouseAskWarehouseDuringPropal=Iestatiet komerciālu priekšlikumu noliktavu
 WarehouseAskWarehouseDuringOrder=Iestatiet noliktavu pārdošanas pasūtījumiem
 UserDefaultWarehouse=Iestatiet noliktavu lietotājiem
 MainDefaultWarehouse=Noklusētā noliktava
@@ -89,23 +89,23 @@ NoPredefinedProductToDispatch=Nav iepriekš produktu šo objektu. Līdz ar to na
 DispatchVerb=Nosūtīšana
 StockLimitShort=Brīdinājuma limits
 StockLimit=Krājumu brīdinājuma limits
-StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
+StockLimitDesc=(tukšs) nozīmē, ka nav brīdinājuma. <br> 0 var izmantot, lai aktivizētu brīdinājumu, tiklīdz krājums ir tukšs.
 PhysicalStock=Fiziskais krājums
 RealStock=Rālie krājumi
 RealStockDesc=Fiziskā / reālā krājumi ir krājumi, kas pašlaik atrodas noliktavās.
 RealStockWillAutomaticallyWhen=Reālais krājums tiks mainīts saskaņā ar šo noteikumu (kā noteikts Stock modulī):
 VirtualStock=Virtuālie krājumi
 VirtualStockAtDate=Virtuālais krājums datumā
-VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen date will be finished
+VirtualStockAtDateDesc=Virtuālais krājums, kad tiks pabeigti visi neapstiprinātie pasūtījumi, kurus plānots apstrādāt pirms izvēlētā datuma
 VirtualStockDesc=Virtuālais krājums ir aprēķinātais krājums, kas pieejams, kad visas atvērtās / neapstiprinātās darbības (kas ietekmē krājumus) ir aizvērtas (saņemti pirkumu pasūtījumi, nosūtīti pārdošanas pasūtījumi, saražoti ražošanas pasūtījumi utt.)
-AtDate=At date
+AtDate=Datumā
 IdWarehouse=Id noliktava
 DescWareHouse=Apraksts noliktava
 LieuWareHouse=Lokālā noliktava
 WarehousesAndProducts=Noliktavas un produkti
 WarehousesAndProductsBatchDetail=Noliktavas un produkti (ar informāciju par partiju/sēriju)
 AverageUnitPricePMPShort=Vidējā svērtā cena
-AverageUnitPricePMPDesc=The input average unit price we had to expense to get 1 unit of product into our stock.
+AverageUnitPricePMPDesc=Ievadītā vidējā vienības cena, kas mums bija jātērē, lai iegūtu 1 produkta vienību mūsu krājumos.
 SellPriceMin=Pārdošanas Vienības cena
 EstimatedStockValueSellShort=Pārdošanas cena
 EstimatedStockValueSell=Pārdošanas cena
@@ -145,7 +145,7 @@ Replenishments=Papildinājumus
 NbOfProductBeforePeriod=Produktu daudzums %s noliktavā pirms izvēlētā perioda (< %s)
 NbOfProductAfterPeriod=Produktu daudzums %s krājumā pēc izvēlētā perioda (>%s)
 MassMovement=Masveida pārvietošana
-SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
+SelectProductInAndOutWareHouse=Atlasiet avota noliktavu un mērķa noliktavu, produktu un daudzumu, pēc tam noklikšķiniet uz "%s". Kad tas ir izdarīts visām nepieciešamajām kustībām, noklikšķiniet uz "%s".
 RecordMovement=Ierakstīt pārvietošanu
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Krājumu pārvietošana saglabāta
@@ -154,7 +154,7 @@ StockMustBeEnoughForInvoice=Krājumu līmenim ir jābūt pietiekamam, lai produk
 StockMustBeEnoughForOrder=Krājuma līmenim ir jābūt pietiekamam, lai produktu / pakalpojumu pasūtītam pēc pasūtījuma (pārbaudiet, vai pašreizējā reālā krājumā tiek pievienota rinda, lai kāds būtu noteikums automātiskai krājumu maiņai).
 StockMustBeEnoughForShipment= Krājumu līmenim ir jābūt pietiekamam, lai produktu / pakalpojumu nosūtītu sūtījumam (pārbaudiet pašreizējo reālo krājumu, pievienojot līniju sūtījumā neatkarīgi no automātiskās krājumu maiņas)
 MovementLabel=Kustības marķējums
-TypeMovement=Direction of movement
+TypeMovement=Kustības virziens
 DateMovement=Pārvietošanas datums
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
@@ -167,8 +167,8 @@ MovementTransferStock=Stock transfer of product %s into another warehouse
 InventoryCodeShort=Inv./Mov. code
 NoPendingReceptionOnSupplierOrder=Nav atvērta saņemšanas, jo atvērts pirkuma pasūtījums
 ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
-OpenAll=Atvērt visām darbībām
-OpenInternal=Atveras tikai iekšējām darbībām
+OpenAnyMovement=Atvērt (visas kustības)
+OpenInternal=Atvērta (tikai iekšēja kustība)
 UseDispatchStatus=Izmantojiet nosūtīšanas statusu (apstipriniet / noraidiet) produktu līnijām pirkuma pasūtījuma saņemšanā
 OptionMULTIPRICESIsOn=Ir ieslēgta opcija "vairākas cenas par segmentu". Tas nozīmē, ka produktam ir vairākas pārdošanas cenas, tāpēc pārdošanas vērtību nevar aprēķināt
 ProductStockWarehouseCreated=Brīdinājuma krājuma limits un pareizi izveidots vēlamais optimālais krājums
@@ -183,7 +183,7 @@ inventoryCreatePermission=Izveidot jaunu inventāru
 inventoryReadPermission=Skatīt krājumus
 inventoryWritePermission=Atjaunināt krājumus
 inventoryValidatePermission=Pārbaudīt inventāru
-inventoryDeletePermission=Delete inventory
+inventoryDeletePermission=Dzēst krājumus
 inventoryTitle=Inventārs
 inventoryListTitle=Inventāri
 inventoryListEmpty=Netiek veikta neviena inventarizācija
@@ -236,23 +236,23 @@ StockIsRequiredToChooseWhichLotToUse=Lai izvēlētos izmantojamo partiju, ir nep
 ForceTo=Piespiest līdz
 AlwaysShowFullArbo=Parādiet pilnu noliktavas koku uznirstošajās noliktavu saitēs (Brīdinājums: tas var dramatiski samazināt veiktspēju)
 StockAtDatePastDesc=Šeit varat apskatīt krājumus (reālos krājumus) noteiktā datumā pagātnē
-StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
+StockAtDateFutureDesc=Šeit varat apskatīt akcijas (virtuālās akcijas) noteiktā datumā nākotnē
 CurrentStock=Pašreizējais krājums
 InventoryRealQtyHelp=Iestatiet vērtību 0, lai atiestatītu daudzumu <br>. Saglabājiet lauku tukšu vai noņemiet līniju, lai paliktu nemainīgs
-UpdateByScaning=Fill real qty by scaning
+UpdateByScaning=Aizpildiet reālo daudzumu, skenējot
 UpdateByScaningProductBarcode=Atjaunināšana, skenējot (produkta svītrkods)
 UpdateByScaningLot=Atjaunināt, skenējot (partija | sērijas svītrkods)
 DisableStockChangeOfSubProduct=Deaktivizējiet krājumu maiņu visiem šī komplekta apakšproduktiem šīs kustības laikā.
-ImportFromCSV=Import CSV list of movement
-ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
-SelectAStockMovementFileToImport=select a stock movement file to import
-InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
-LabelOfInventoryMovemement=Inventory %s
+ImportFromCSV=Importēt CSV kustību sarakstu
+ChooseFileToImport=Augšupielādējiet failu, pēc tam noklikšķiniet uz ikonas %s, lai atlasītu failu kā avota importēšanas failu ...
+SelectAStockMovementFileToImport=atlasiet importējamo krājumu kustības failu
+InfoTemplateImport=Augšupielādētajam failam ir jābūt šādam formātam (* ir obligāti aizpildāmi lauki): <br> Avota noliktava * | Mērķa noliktava * | Produkts * | Daudzums * | Partijas / sērijas numuram <br> CSV rakstzīmju atdalītājam jābūt "<b> %s </b>"
+LabelOfInventoryMovemement=Inventārs %s
 ReOpen=Atvērt pa jaunu
-ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock to the real qty you entered into the inventory.
-ObjectNotFound=%s not found
-MakeMovementsAndClose=Generate movements and close
-AutofillWithExpected=Fill real quantity with expected quantity
-ShowAllBatchByDefault=By default, show batch details on product "stock" tab
-CollapseBatchDetailHelp=You can set batch detail default display in stocks module configuration
-FieldCannotBeNegative=Field "%s" cannot be negative
+ConfirmFinish=Vai jūs apstiprināt inventāra slēgšanu? Tas ģenerēs visas krājumu kustības, lai atjauninātu krājumus līdz reālajam daudzumam, kuru ievadījāt krājumā.
+ObjectNotFound=%s nav atrasts
+MakeMovementsAndClose=Ģenerējiet kustības un aizveriet
+AutofillWithExpected=Aizpildiet reālo daudzumu ar paredzamo daudzumu
+ShowAllBatchByDefault=Pēc noklusējuma parādīt partijas informāciju cilnē “Akciju”
+CollapseBatchDetailHelp=Krājumu moduļa konfigurācijā varat iestatīt partijas detaļu noklusējuma attēlojumu
+FieldCannotBeNegative=Lauks "%s" nevar būt negatīvs
diff --git a/htdocs/langs/lv_LV/supplier_proposal.lang b/htdocs/langs/lv_LV/supplier_proposal.lang
index a092448a3fc..cffb1a4b837 100644
--- a/htdocs/langs/lv_LV/supplier_proposal.lang
+++ b/htdocs/langs/lv_LV/supplier_proposal.lang
@@ -13,6 +13,7 @@ SupplierProposalArea=Pārdevēju piedāvājumu apgabals
 SupplierProposalShort=Pārdevēja piedāvājums
 SupplierProposals=Pārdevēja priekšlikumi
 SupplierProposalsShort=Pārdevēja priekšlikumi
+AskPrice=Cenas pieprasījums
 NewAskPrice=Jauns cenas pieprasījums
 ShowSupplierProposal=Rādīt cenas pieprasījumu
 AddSupplierProposal=Izveidot cenas pieprasījumu
@@ -52,3 +53,6 @@ SupplierProposalsToClose=Pārdevēja priekšlikumi slēgt
 SupplierProposalsToProcess=Pārdevēja priekšlikumi apstrādāt
 LastSupplierProposals=Jaunākie %s cenu pieprasījumi
 AllPriceRequests=Visi pieprasījumi
+TypeContact_supplier_proposal_external_SHIPPING=Piegādes gadījumā sazinieties ar pārdevēja kontaktu
+TypeContact_supplier_proposal_external_BILLING=Pārdevēja kontaktpersona norēķinu veikšanai
+TypeContact_supplier_proposal_external_SERVICE=Pārstāvis turpinot darboties priekšlikums
diff --git a/htdocs/langs/lv_LV/ticket.lang b/htdocs/langs/lv_LV/ticket.lang
index 9d71f3f79b6..72e4141fcde 100644
--- a/htdocs/langs/lv_LV/ticket.lang
+++ b/htdocs/langs/lv_LV/ticket.lang
@@ -34,7 +34,8 @@ TicketDictResolution=Biļete - izšķirtspēja
 
 TicketTypeShortCOM=Tirdzniecības jautājums
 TicketTypeShortHELP=Funkcionālās palīdzības pieprasījums
-TicketTypeShortISSUE=Izdošana, kļūda vai problēma
+TicketTypeShortISSUE=Izdevums vai kļūda
+TicketTypeShortPROBLEM=Problēma
 TicketTypeShortREQUEST=Mainīt vai uzlabot pieprasījumu
 TicketTypeShortPROJET=Projekts
 TicketTypeShortOTHER=Cits
@@ -54,14 +55,15 @@ TypeContact_ticket_internal_SUPPORTTEC=Piešķirtais lietotājs
 TypeContact_ticket_external_SUPPORTCLI=Klientu kontaktu / incidentu izsekošana
 TypeContact_ticket_external_CONTRIBUTOR=Ārējais ieguldītājs
 
-OriginEmail=E-pasta avots
+OriginEmail=E-pasta reportieris
 Notify_TICKET_SENTBYMAIL=Sūtīt biļeti pa e-pastu
 
 # Status
 Read=Lasīt
 Assigned=Piešķirts
 InProgress=Procesā
-NeedMoreInformation=Gaida informāciju
+NeedMoreInformation=Gaida reportiera atsauksmes
+NeedMoreInformationShort=Gaida atsauksmes
 Answered=Atbildēts
 Waiting=Gaida
 Closed=Slēgts
@@ -70,8 +72,8 @@ Deleted=Dzēsts
 # Dict
 Type=Veids
 Severity=Smagums
-TicketGroupIsPublic=Group is public
-TicketGroupIsPublicDesc=If a ticket group is public, it will be visible in the form when creating a ticket from the public interface
+TicketGroupIsPublic=Grupa ir publiska
+TicketGroupIsPublicDesc=Ja biļešu grupa ir publiska, tā būs redzama formā, veidojot biļeti no publiskās saskarnes
 
 # Email templates
 MailToSendTicketMessage=Lai nosūtītu e-pastu no pieteikuma
@@ -116,8 +118,8 @@ TicketsShowModuleLogo=Parādiet moduļa logotipi publiskajā saskarnē
 TicketsShowModuleLogoHelp=Iespējojiet šo opciju, lai slēptu logotipa moduli publiskās saskarnes lapās
 TicketsShowCompanyLogo=Parādīt uzņēmuma logotipi publiskā saskarnē
 TicketsShowCompanyLogoHelp=Iespējojiet šo opciju, lai slēptu galvenā uzņēmuma logotipi publiskās saskarnes lapās
-TicketsEmailAlsoSendToMainAddress=Also send a notification to the main email address
-TicketsEmailAlsoSendToMainAddressHelp=Enable this option to also send an email to the address defined into setup "%s" (see tab "%s")
+TicketsEmailAlsoSendToMainAddress=Nosūtiet arī paziņojumu uz galveno e-pasta adresi
+TicketsEmailAlsoSendToMainAddressHelp=Iespējojiet šo opciju, lai nosūtītu e-pastu arī uz adresi, kas definēta iestatījumā "%s" (skatiet cilni "%s").
 TicketsLimitViewAssignedOnly=Ierobežot displeju līdz pašreizējam lietotājam piešķirtajām biļetēm (nav efektīvs ārējiem lietotājiem, vienmēr ierobežojiet to ar trešo personu, kurai tie ir atkarīgi)
 TicketsLimitViewAssignedOnlyHelp=Tiks redzamas tikai pašreizējam lietotājam piešķirtās biļetes. Neattiecas uz lietotāju ar biļešu pārvaldīšanas tiesībām.
 TicketsActivatePublicInterface=Aktivizēt publisko saskarni
@@ -128,10 +130,10 @@ TicketNumberingModules=Čeku numerācijas modulis
 TicketsModelModule=Biļešu dokumentu veidnes
 TicketNotifyTiersAtCreation=Paziņot trešajai pusei radīšanas laikā
 TicketsDisableCustomerEmail=Vienmēr atspējojiet e-pasta ziņojumus, ja biļete tiek veidota no publiskās saskarnes
-TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is added to a ticket
+TicketsPublicNotificationNewMessage=Sūtīt e-pastu (-us), kad biļetei tiek pievienots jauns ziņojums / komentārs
 TicketsPublicNotificationNewMessageHelp=Sūtiet e-pastu (s), kad no publiskās saskarnes tiek pievienots jauns ziņojums (piešķirtajam lietotājam vai paziņojumu e-pastu uz (atjaunināt) un / vai paziņojumu e-pastu uz)
 TicketPublicNotificationNewMessageDefaultEmail=Paziņojumu e-pasts adresātam (atjaunināt)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Send an email to this address for each new message notifications if the ticket doesn't have a user assigned to it or if the user doesn't have any known email.
+TicketPublicNotificationNewMessageDefaultEmailHelp=Nosūtiet e-pastu uz šo adresi par katru jaunu ziņojumu paziņojumu, ja biļetei nav piešķirts lietotājs vai ja lietotājam nav zināms e-pasts.
 #
 # Index & list page
 #
@@ -160,7 +162,7 @@ CreatedBy=Izveidojis
 NewTicket=Jauns notikums
 SubjectAnswerToTicket=Pieteikuma atbilde
 TicketTypeRequest=Pieprasījuma veids
-TicketCategory=Grupa
+TicketCategory=Biļešu kategorizēšana
 SeeTicket=Apskatīt pieteikumu
 TicketMarkedAsRead=Pieteikums ir atzīmēts kā lasīts
 TicketReadOn=Izlasīts
@@ -211,6 +213,7 @@ TicketMessageHelp=Tikai šis teksts tiks saglabāts ziņojumu sarakstā uz biļe
 TicketMessageSubstitutionReplacedByGenericValues=Mainīšanas mainīgos aizstāj ar vispārējām vērtībām.
 TimeElapsedSince=Laiks pagājis kopš
 TicketTimeToRead=Laiks, kas pagājis pirms izlasīšanas
+TicketTimeElapsedBeforeSince=Laiks, kas pagājis pirms / kopš
 TicketContacts=Kontakti biļete
 TicketDocumentsLinked=Ar biļeti saistītie dokumenti
 ConfirmReOpenTicket=Vai apstiprināt atkārtotu pieteikuma atvēršanu ?
@@ -304,13 +307,13 @@ BoxLastModifiedTicket=Jaunākie labotie pieteikumi
 BoxLastModifiedTicketDescription=Jaunākās %s lanbotās biļetes
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=Nav nesen labotu pieteikumu
-BoxTicketType=Distribution of open tickets by type
-BoxTicketSeverity=Number of open tickets by severity
-BoxNoTicketSeverity=No tickets opened
-BoxTicketLastXDays=Number of new tickets by days the last %s days
-BoxTicketLastXDayswidget = Number of new tickets by days the last X days
-BoxNoTicketLastXDays=No new tickets the last %s days
-BoxNumberOfTicketByDay=Number of new tickets by day
-BoxNewTicketVSClose=Number of today's new tickets versus today's closed tickets
-TicketCreatedToday=Ticket created today
-TicketClosedToday=Ticket closed today
+BoxTicketType=Atvērto biļešu sadalījums pa veidiem
+BoxTicketSeverity=Atvērto biļešu skaits pēc smaguma pakāpes
+BoxNoTicketSeverity=Netika atvērta neviena biļete
+BoxTicketLastXDays=Jauno biļešu skaits pa dienām pēdējās %s dienās
+BoxTicketLastXDayswidget = Jauno biļešu skaits pa dienām pēdējās X dienās
+BoxNoTicketLastXDays=Pēdējās %s dienās nav jaunu biļešu
+BoxNumberOfTicketByDay=Jauno biļešu skaits dienā
+BoxNewTicketVSClose=Šodienas jauno biļešu skaits pret šodienas slēgtajām biļetēm
+TicketCreatedToday=Biļete izveidota šodien
+TicketClosedToday=Biļete šodien ir slēgta
diff --git a/htdocs/langs/lv_LV/trips.lang b/htdocs/langs/lv_LV/trips.lang
index 39090aec17a..b6825952b39 100644
--- a/htdocs/langs/lv_LV/trips.lang
+++ b/htdocs/langs/lv_LV/trips.lang
@@ -33,7 +33,7 @@ ExpenseReportCanceledMessage=Izdevumu pārskats %s tika atcelts. <br> - Lietotā
 ExpenseReportPaid=Izdevumu pārskats tika samaksāts
 ExpenseReportPaidMessage=Izmaksu pārskats %s tika samaksāts. <br> - Lietotājs: %s <br> - Maksā: %s <br> Uzklikšķināt šeit, lai parādītu izdevumu pārskatu: %s
 TripId=Id expense report
-AnyOtherInThisListCanValidate=Person to inform for validation.
+AnyOtherInThisListCanValidate=Persona, kas jāinformē par pieprasījuma apstiprināšanu.
 TripSociete=Uzņēmuma informācija
 TripNDF=Informācijas izdevumu pārskats
 PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
@@ -106,11 +106,11 @@ ConfirmBrouillonnerTrip=Vai tiešām vēlaties pārvietot šo izdevumu pārskatu
 SaveTrip=Validate expense report
 ConfirmSaveTrip=Vai tiešām vēlaties apstiprināt šo izdevumu pārskatu?
 NoTripsToExportCSV=No expense report to export for this period.
-ExpenseReportPayment=Expense report payment
+ExpenseReportPayment=Izdevumu pārskata maksājums
 ExpenseReportsToApprove=Izdevumu ziņojumi jāapstiprina
 ExpenseReportsToPay=Izdevumu pārskati kas jāsamaksā
 ConfirmCloneExpenseReport=Vai tiešām vēlaties klonēt šo izdevumu pārskatu?
-ExpenseReportsIk=Izdevumu pārskats, kurā ir indekss
+ExpenseReportsIk=Nobraukuma maksu konfigurēšana
 ExpenseReportsRules=Izdevumu pārskatu noteikumi
 ExpenseReportIkDesc=Varat mainīt kilometru izdevumu aprēķinu pa kategorijām un diapazoniem, kurus tie iepriekš ir definējuši. <b> d </b> ir attālums kilometros
 ExpenseReportRulesDesc=Jūs varat izveidot vai atjaunināt visus aprēķina noteikumus. Šī daļa tiks izmantota, ja lietotājs izveidos jaunu izdevumu pārskatu
@@ -145,7 +145,7 @@ nolimitbyEX_DAY=pēc dienas (bez ierobežojuma)
 nolimitbyEX_MON=pa mēnešiem (bez ierobežojumiem)
 nolimitbyEX_YEA=pa gadiem (bez ierobežojumiem)
 nolimitbyEX_EXP=pēc rindas (bez ierobežojuma)
-CarCategory=Automašīnu sadaļa
+CarCategory=Transportlīdzekļa kategorija
 ExpenseRangeOffset=Kompensācijas summa: %s
 RangeIk=Nobraukums
 AttachTheNewLineToTheDocument=Pievienojiet rindu augšupielādētajam dokumentam
diff --git a/htdocs/langs/lv_LV/users.lang b/htdocs/langs/lv_LV/users.lang
index 9a902874c9c..8f0731e79c4 100644
--- a/htdocs/langs/lv_LV/users.lang
+++ b/htdocs/langs/lv_LV/users.lang
@@ -12,7 +12,7 @@ PasswordChangedTo=Parole mainīts: %s
 SubjectNewPassword=Jūsu jaunā parole %s
 GroupRights=Grupas atļaujas
 UserRights=Lietotāja atļaujas
-Credentials=Credentials
+Credentials=Akreditācijas dati
 UserGUISetup=Lietotāja displeja iestatīšana
 DisableUser=Bloķēt
 DisableAUser=Bloķēt lietotāju
@@ -73,7 +73,7 @@ ExportDataset_user_1=Lietotāji un to īpašības
 DomainUser=Domēna lietotājs %s
 Reactivate=Aktivizēt
 CreateInternalUserDesc=Šī veidlapa ļauj izveidot iekšējo lietotāju savā uzņēmumā/organizācijā. Lai izveidotu ārēju lietotāju (klientu, pārdevēju utt.), Izmantojiet trešās puses kontakta kartītes pogu “Izveidot Dolibarr lietotāju”.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization, or is a partner user outside of your organization that may need to see more data  than data related to his company (the permission system will define what he can or can't see or do).<br>An <b>external</b> user is a customer, vendor or other that must view ONLY data related to himself (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, you must grant permissions on the features that the user need.
+InternalExternalDesc=Iekšējais <b> </b> lietotājs ir lietotājs, kas ir jūsu uzņēmuma / organizācijas daļa vai ir partnera lietotājs ārpus jūsu organizācijas un kuram, iespējams, būs jāredz vairāk datu nekā ar viņa uzņēmumu saistīto datu (atļauju sistēma noteiks, ko viņš var vai var neredzu un neredzu). <br> Ārējs <b> </b> lietotājs ir klients, pārdevējs vai cits lietotājs, kuram ir jāskata TIKAI ar sevi saistītie dati (Ārēja lietotāja izveidošanu trešajai pusei var veikt no trešās puses kontaktu ieraksta). <br> <br> Abos gadījumos jums jāpiešķir atļaujas lietotājam nepieciešamajām funkcijām.
 PermissionInheritedFromAGroup=Atļauja piešķirta, jo mantojis no viena lietotāja grupai.
 Inherited=Iedzimta
 UserWillBe=Izveidotais lietotājs būs
@@ -106,7 +106,7 @@ UseTypeFieldToChange=Izmantojiet lauka veids, lai mainītu
 OpenIDURL=OpenID URL
 LoginUsingOpenID=Izmantojiet OpenID, lai pieteiktos
 WeeklyHours=Nostrādātais laiks (nedēļā)
-ExpectedWorkedHours=Expected hours worked per week
+ExpectedWorkedHours=Paredzamās nostrādātās stundas nedēļā
 ColorUser=Lietotāja krāsa
 DisabledInMonoUserMode=Atspējots uzturēšanas režīmā
 UserAccountancyCode=Lietotāja grāmatvedības kods
@@ -116,7 +116,7 @@ DateOfEmployment=Nodarbināšanas datums
 DateEmployment=Nodarbinātība
 DateEmploymentstart=Nodarbinātības sākuma datums
 DateEmploymentEnd=Nodarbinātības beigu datums
-RangeOfLoginValidity=Access validity date range
+RangeOfLoginValidity=Piekļuves derīguma datumu diapazons
 CantDisableYourself=Jūs nevarat atspējot savu lietotāja ierakstu
 ForceUserExpenseValidator=Spēka izdevumu pārskata apstiprinātājs
 ForceUserHolidayValidator=Piespiedu atvaļinājuma pieprasījuma validētājs
diff --git a/htdocs/langs/lv_LV/website.lang b/htdocs/langs/lv_LV/website.lang
index 6fe5bbf285a..e70ddb84bac 100644
--- a/htdocs/langs/lv_LV/website.lang
+++ b/htdocs/langs/lv_LV/website.lang
@@ -51,7 +51,7 @@ ReadPerm=Lasīt
 WritePerm=Rakstīt
 TestDeployOnWeb=Pārbaudiet / izvietojiet tīmeklī
 PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
+PreviewSiteServedByDolibarr= <u> Priekšskatīt %s jaunā cilnē. </u> <br> <br> %s apkalpos Dolibarr serveris, tāpēc tam nav nepieciešams instalēt papildu tīmekļa serveri (piemēram, Apache, Nginx, IIS). <br> Neērti ir tas, ka lapu vietrāži URL nav lietotājam draudzīgi un sākas ar jūsu Dolibarr ceļu. <br> URL apkalpo Dolibarr: <br> <strong> %s </strong> <br> <br> Lai izmantotu savu ārējo web serveri, lai kalpotu šo tīmekļa vietni, izveidot virtuālo uzņēmējas jūsu tīmekļa serverī, kas norāda uz direktoriju <br> <strong> %s </strong> <br> tad ievadiet nosaukumu šī virtuālā servera šīs vietnes rekvizītos un noklikšķiniet uz saites "Pārbaudīt / izvietot tīmeklī".
 VirtualHostUrlNotDefined=Virtuālā resursdatora adrese, kuru apkalpo ārējs tīmekļa serveris, nav definēts
 NoPageYet=Vēl nav nevienas lapas
 YouCanCreatePageOrImportTemplate=Jūs varat izveidot jaunu lapu vai importēt pilnu vietnes veidni
@@ -137,11 +137,11 @@ PagesRegenerated=reģenerēta %s lapa (s) / konteiners (-i)
 RegenerateWebsiteContent=Atjaunojiet tīmekļa vietnes kešatmiņas failus
 AllowedInFrames=Atļauts rāmjos
 DefineListOfAltLanguagesInWebsiteProperties=Vietņu rekvizītos definējiet visu pieejamo valodu sarakstu.
-GenerateSitemaps=Generate website sitemap file
-ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
-ConfirmSitemapsCreation=Confirm sitemap generation
-SitemapGenerated=Sitemap file <b>%s</b> generated
+GenerateSitemaps=Ģenerēt vietnes vietnes kartes failu
+ConfirmGenerateSitemaps=Ja apstiprināsit, jūs izdzēsīsit esošo vietnes kartes failu ...
+ConfirmSitemapsCreation=Apstipriniet vietnes kartes ģenerēšanu
+SitemapGenerated=Vietnes kartes fails <b> %s </b> ģenerēts
 ImportFavicon=Favicon
-ErrorFaviconType=Favicon must be png
-ErrorFaviconSize=Favicon must be sized 16x16, 32x32 or 64x64
-FaviconTooltip=Upload an image which needs to be a png (16x16, 32x32 or 64x64)
+ErrorFaviconType=Favicon jābūt png
+ErrorFaviconSize=Favicon izmēram jābūt 16x16, 32x32 vai 64x64
+FaviconTooltip=Augšupielādējiet attēlu, kuram jābūt png (16x16, 32x32 vai 64x64)
diff --git a/htdocs/langs/lv_LV/withdrawals.lang b/htdocs/langs/lv_LV/withdrawals.lang
index f547e315cce..1e31473dc70 100644
--- a/htdocs/langs/lv_LV/withdrawals.lang
+++ b/htdocs/langs/lv_LV/withdrawals.lang
@@ -42,9 +42,10 @@ LastWithdrawalReceipt=Jaunākie %s tiešā debeta ieņēmumi
 MakeWithdrawRequest=Izveidojiet tiešā debeta maksājumu pieprasījumu
 MakeBankTransferOrder=Veiciet kredīta pārveduma pieprasījumu
 WithdrawRequestsDone=%s reģistrēti tiešā debeta maksājumu pieprasījumi
-BankTransferRequestsDone=%s credit transfer requests recorded
+BankTransferRequestsDone=%s reģistrēti kredīta pārveduma pieprasījumi
 ThirdPartyBankCode=Trešās puses bankas kods
 NoInvoiceCouldBeWithdrawed=Netika veiksmīgi norakstīts rēķins. Pārbaudiet, vai rēķini ir norādīti uzĦēmumiem ar derīgu IBAN un IBAN ir UMR (unikālas pilnvaras atsauce) ar režīmu <strong> %s </strong>.
+WithdrawalCantBeCreditedTwice=Šī izņemšanas kvīts jau ir atzīmēta kā ieskaitīta; to nevar izdarīt divreiz, jo tas potenciāli radītu maksājumu un bankas ierakstu dublikātus.
 ClassCredited=Klasificēt kreditēts
 ClassCreditedConfirm=Vai tiešām vēlaties klasificēt šo atsaukuma kvīti kā kredītu jūsu bankas kontā?
 TransData=Darījuma datums
@@ -132,8 +133,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA vispirms
 ExecutionDate=Izpildes datums
 CreateForSepa=Izveidojiet tiešā debeta failu
-ICS=Creditor Identifier CI for direct debit
-ICSTransfer=Creditor Identifier CI for bank transfer
+ICS=Kreditora identifikators CI tiešajam debetam
+ICSTransfer=Kreditora identifikators CI bankas pārskaitījumam
 END_TO_END="EndToEndId" SEPA XML tag - katram darījumam piešķirts unikāls ID
 USTRD="Nestrukturēts" SEPA XML tag
 ADDDAYS=Pievienojiet dienas izpildes datumam
@@ -148,5 +149,5 @@ InfoRejectSubject=Tiešais debeta maksājuma uzdevums ir noraidīts
 InfoRejectMessage=Labdien, <br> <br> banka noraidījusi rēķina %s tiešā debeta maksājuma uzdevumu saistībā ar uzņēmumu %s ar summu %s. <br> <br> - <br> %s
 ModeWarning=Iespēja reālā režīmā nav noteikts, mēs pārtraucam pēc šīs simulācijas
 ErrorCompanyHasDuplicateDefaultBAN=Uzņēmumam ar ID %s ir vairāk nekā viens noklusējuma bankas konts. Nevar uzzināt, kuru izmantot.
-ErrorICSmissing=Missing ICS in Bank account %s
-TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Total amount of direct debit order differs from sum of lines
+ErrorICSmissing=Bankas kontā %s trūkst ICS
+TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Tiešā debeta rīkojuma kopējā summa atšķiras no rindu summas
diff --git a/htdocs/langs/lv_LV/zapier.lang b/htdocs/langs/lv_LV/zapier.lang
index c524a9afb6f..48a4287c4ee 100644
--- a/htdocs/langs/lv_LV/zapier.lang
+++ b/htdocs/langs/lv_LV/zapier.lang
@@ -17,5 +17,5 @@ ModuleZapierForDolibarrName = Zapier priekš Dolibarr
 ModuleZapierForDolibarrDesc = Par zapier Dolibarr moduli
 ZapierForDolibarrSetup=Zapier iestatīšana Dolibarr
 ZapierDescription=Saskarne ar Zapier
-ZapierAbout=About the module Zapier
-ZapierSetupPage=There is no need for a setup on Dolibarr side to use Zapier. However, you must generate and publish a package on zapier to be able to use Zapier with Dolibarr. See documentation on <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">this wiki page</a>.
+ZapierAbout=Par moduli Zapier
+ZapierSetupPage=Lai izmantotu Zapier, Dolibarr pusē nav nepieciešama iestatīšana. Tomēr, lai varētu izmantot Zapier ar Dolibarr, jums ir jāizveido un jāpublicē pakete zapier. Skatiet šīs wiki lapas <a href="https://wiki.dolibarr.org/index.php/Module_Zapier"> dokumentāciju </a>.
diff --git a/htdocs/langs/mk_MK/deliveries.lang b/htdocs/langs/mk_MK/deliveries.lang
index 1f48c01de75..cd8a36e6c70 100644
--- a/htdocs/langs/mk_MK/deliveries.lang
+++ b/htdocs/langs/mk_MK/deliveries.lang
@@ -27,5 +27,7 @@ Recipient=Recipient
 ErrorStockIsNotEnough=There's not enough stock
 Shippable=Shippable
 NonShippable=Not Shippable
+ShowShippableStatus=Show shippable status
 ShowReceiving=Show delivery receipt
 NonExistentOrder=Nonexistent order
+StockQuantitiesAlreadyAllocatedOnPreviousLines = Stock quantities already allocated on previous lines
diff --git a/htdocs/langs/mk_MK/exports.lang b/htdocs/langs/mk_MK/exports.lang
index a0eb7161ef2..cb652229825 100644
--- a/htdocs/langs/mk_MK/exports.lang
+++ b/htdocs/langs/mk_MK/exports.lang
@@ -53,7 +53,8 @@ TypeOfLineServiceOrProduct=Type of line (0=product, 1=service)
 FileWithDataToImport=File with data to import
 FileToImport=Source file to import
 FileMustHaveOneOfFollowingFormat=File to import must have one of following formats
-DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
+DownloadEmptyExample=Download template file with field content information
+StarAreMandatory=* are mandatory fields
 ChooseFormatOfFileToImport=Choose the file format to use as import file format by clicking on the %s icon to select it...
 ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
 SourceFileFormat=Source file format
diff --git a/htdocs/langs/mn_MN/deliveries.lang b/htdocs/langs/mn_MN/deliveries.lang
index 1f48c01de75..cd8a36e6c70 100644
--- a/htdocs/langs/mn_MN/deliveries.lang
+++ b/htdocs/langs/mn_MN/deliveries.lang
@@ -27,5 +27,7 @@ Recipient=Recipient
 ErrorStockIsNotEnough=There's not enough stock
 Shippable=Shippable
 NonShippable=Not Shippable
+ShowShippableStatus=Show shippable status
 ShowReceiving=Show delivery receipt
 NonExistentOrder=Nonexistent order
+StockQuantitiesAlreadyAllocatedOnPreviousLines = Stock quantities already allocated on previous lines
diff --git a/htdocs/langs/mn_MN/exports.lang b/htdocs/langs/mn_MN/exports.lang
index a0eb7161ef2..cb652229825 100644
--- a/htdocs/langs/mn_MN/exports.lang
+++ b/htdocs/langs/mn_MN/exports.lang
@@ -53,7 +53,8 @@ TypeOfLineServiceOrProduct=Type of line (0=product, 1=service)
 FileWithDataToImport=File with data to import
 FileToImport=Source file to import
 FileMustHaveOneOfFollowingFormat=File to import must have one of following formats
-DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
+DownloadEmptyExample=Download template file with field content information
+StarAreMandatory=* are mandatory fields
 ChooseFormatOfFileToImport=Choose the file format to use as import file format by clicking on the %s icon to select it...
 ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
 SourceFileFormat=Source file format
diff --git a/htdocs/langs/nb_NO/deliveries.lang b/htdocs/langs/nb_NO/deliveries.lang
index 97f8ad9cdac..31485f7bafa 100644
--- a/htdocs/langs/nb_NO/deliveries.lang
+++ b/htdocs/langs/nb_NO/deliveries.lang
@@ -30,3 +30,4 @@ NonShippable=Kan ikke sendes
 ShowShippableStatus=Vis status sendingsklar
 ShowReceiving=Vis leveringskvittering
 NonExistentOrder=Ikkeeksisterende ordre
+StockQuantitiesAlreadyAllocatedOnPreviousLines = Stock quantities already allocated on previous lines
diff --git a/htdocs/langs/nb_NO/exports.lang b/htdocs/langs/nb_NO/exports.lang
index e4e5740d9ee..666dc723afa 100644
--- a/htdocs/langs/nb_NO/exports.lang
+++ b/htdocs/langs/nb_NO/exports.lang
@@ -53,7 +53,8 @@ TypeOfLineServiceOrProduct=Linjetype (0=vare, 1=tjeneste)
 FileWithDataToImport=Fil med data som skal importeres
 FileToImport=Kildefilen du vil importere
 FileMustHaveOneOfFollowingFormat=Fil som skal importeres må ha ett av følgende formater
-DownloadEmptyExample=Last ned malfil med feltinnholdsinformasjon (* er obligatoriske felt)
+DownloadEmptyExample=Download template file with field content information
+StarAreMandatory=* are mandatory fields
 ChooseFormatOfFileToImport=Velg filformatet som skal brukes som importfilformat ved å klikke på %s-ikonet for å velge det ...
 ChooseFileToImport=Last opp fil og klikk deretter på %s ikonet for å velge fil som kilde-importfil ...
 SourceFileFormat=Kildefil-format
diff --git a/htdocs/langs/ne_NP/deliveries.lang b/htdocs/langs/ne_NP/deliveries.lang
index 1f48c01de75..cd8a36e6c70 100644
--- a/htdocs/langs/ne_NP/deliveries.lang
+++ b/htdocs/langs/ne_NP/deliveries.lang
@@ -27,5 +27,7 @@ Recipient=Recipient
 ErrorStockIsNotEnough=There's not enough stock
 Shippable=Shippable
 NonShippable=Not Shippable
+ShowShippableStatus=Show shippable status
 ShowReceiving=Show delivery receipt
 NonExistentOrder=Nonexistent order
+StockQuantitiesAlreadyAllocatedOnPreviousLines = Stock quantities already allocated on previous lines
diff --git a/htdocs/langs/ne_NP/exports.lang b/htdocs/langs/ne_NP/exports.lang
index a0eb7161ef2..cb652229825 100644
--- a/htdocs/langs/ne_NP/exports.lang
+++ b/htdocs/langs/ne_NP/exports.lang
@@ -53,7 +53,8 @@ TypeOfLineServiceOrProduct=Type of line (0=product, 1=service)
 FileWithDataToImport=File with data to import
 FileToImport=Source file to import
 FileMustHaveOneOfFollowingFormat=File to import must have one of following formats
-DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
+DownloadEmptyExample=Download template file with field content information
+StarAreMandatory=* are mandatory fields
 ChooseFormatOfFileToImport=Choose the file format to use as import file format by clicking on the %s icon to select it...
 ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
 SourceFileFormat=Source file format
diff --git a/htdocs/langs/nl_BE/admin.lang b/htdocs/langs/nl_BE/admin.lang
index d13852849fd..3755e870c31 100644
--- a/htdocs/langs/nl_BE/admin.lang
+++ b/htdocs/langs/nl_BE/admin.lang
@@ -234,6 +234,7 @@ YouMustEnableOneModule=Je moet minstens 1 module aktiveren
 BillsPDFModules=Factuur documentsjablonen
 LDAPGlobalParameters=Globale instellingen
 LDAPPassword=Beheerderswachtwoord
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 SalariesSetup=Setup van module salarissen
 MailToSendProposal=Klant voorstellen
 MailToSendInvoice=Klantfacturen
diff --git a/htdocs/langs/nl_BE/ticket.lang b/htdocs/langs/nl_BE/ticket.lang
index f1e3f473db3..25cd0e0dc63 100644
--- a/htdocs/langs/nl_BE/ticket.lang
+++ b/htdocs/langs/nl_BE/ticket.lang
@@ -5,7 +5,6 @@ Permission56003=Tickets verwijderen
 Permission56005=Bekijk tickets van alle externe partijen (niet effectief voor externe gebruikers, altijd beperkt tot de derde partij waarvan ze afhankelijk zijn)
 TicketDictCategory=Ticket - Groepen
 TicketDictSeverity=Ticket - Gradaties
-TicketTypeShortISSUE=Probleem, bug of probleem
 TicketTypeShortREQUEST=Verander- of verbeteringsverzoek
 TicketTypeShortOTHER=Ander
 ErrorBadEmailAddress=Veld '%s' onjuist
diff --git a/htdocs/langs/nl_BE/website.lang b/htdocs/langs/nl_BE/website.lang
index e8f0a2d4af0..96584adea66 100644
--- a/htdocs/langs/nl_BE/website.lang
+++ b/htdocs/langs/nl_BE/website.lang
@@ -3,6 +3,7 @@ DeleteWebsite=Verwijder website
 WEBSITE_CSS_URL=URL van extern CSS bestand
 MediaFiles=Mediabibliotheek
 EditMenu=Bewerk menu
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 ViewSiteInNewTab=Bekijk de site in een nieuwe tab
 ViewPageInNewTab=Bekijk de pagina in een nieuwe tab
 SetAsHomePage=Zet als Homepagina
diff --git a/htdocs/langs/nl_NL/deliveries.lang b/htdocs/langs/nl_NL/deliveries.lang
index 329c2b74ad0..99c87f7f7af 100644
--- a/htdocs/langs/nl_NL/deliveries.lang
+++ b/htdocs/langs/nl_NL/deliveries.lang
@@ -30,3 +30,4 @@ NonShippable=Niet verzendbaar
 ShowShippableStatus=Toon verzendstatus
 ShowReceiving=Toon afleverbon
 NonExistentOrder=Niet bestaande order
+StockQuantitiesAlreadyAllocatedOnPreviousLines = Stock quantities already allocated on previous lines
diff --git a/htdocs/langs/nl_NL/exports.lang b/htdocs/langs/nl_NL/exports.lang
index 5ea7b305541..65e9a9ed814 100644
--- a/htdocs/langs/nl_NL/exports.lang
+++ b/htdocs/langs/nl_NL/exports.lang
@@ -53,7 +53,8 @@ TypeOfLineServiceOrProduct=Type van de regel (0=product, 1=dienst)
 FileWithDataToImport=Bestand met te importeren gegevens
 FileToImport=Te importeren bronbestand
 FileMustHaveOneOfFollowingFormat=Het te importeren bestand moet een van de volgende indelingen hebben
-DownloadEmptyExample=Sjabloonbestand downloaden met veldinhoudsinformatie (* zijn verplichte velden)
+DownloadEmptyExample=Download template file with field content information
+StarAreMandatory=* are mandatory fields
 ChooseFormatOfFileToImport=Kies de bestandsindeling die u als importbestandsindeling wilt gebruiken door op het pictogram %s te klikken om deze te selecteren ...
 ChooseFileToImport=Upload het bestand en klik vervolgens op het pictogram %s om het bestand te selecteren als bronimportbestand ...
 SourceFileFormat=Bestandsformaat van het bronbestand
diff --git a/htdocs/langs/pl_PL/deliveries.lang b/htdocs/langs/pl_PL/deliveries.lang
index 336a696e731..8d0ea676b8d 100644
--- a/htdocs/langs/pl_PL/deliveries.lang
+++ b/htdocs/langs/pl_PL/deliveries.lang
@@ -2,7 +2,7 @@
 Delivery=Dostawa
 DeliveryRef=Numer referencyjny dostawy
 DeliveryCard=Karta przyjęcia
-DeliveryOrder=Delivery receipt
+DeliveryOrder=Kwit dostawy
 DeliveryDate=Data dostawy
 CreateDeliveryOrder=Generuj przyjęcie dostawy
 DeliveryStateSaved=Stan dostawy zapisany
@@ -18,14 +18,16 @@ StatusDeliveryCanceled=Anulowano
 StatusDeliveryDraft=Projekt
 StatusDeliveryValidated=Przyjęto
 # merou PDF model
-NameAndSignature=Name and Signature:
+NameAndSignature=Imię i nazwisko oraz podpis:
 ToAndDate=To___________________________________ na ____ / _____ / __________
 GoodStatusDeclaration=Otrzymano towary w dobrym stanie,
-Deliverer=Deliverer:
+Deliverer=Dostawca:
 Sender=Nadawca
 Recipient=Odbiorca
 ErrorStockIsNotEnough=Brak wystarczającego zapasu w magazynie
 Shippable=Możliwa wysyłka
 NonShippable=Nie do wysyłki
+ShowShippableStatus=Pokaż status do wysyłki
 ShowReceiving=Pokaż przyjęte dostawy
-NonExistentOrder=Nonexistent order
+NonExistentOrder=Nieistniejący porządek
+StockQuantitiesAlreadyAllocatedOnPreviousLines = Stock quantities already allocated on previous lines
diff --git a/htdocs/langs/pl_PL/exports.lang b/htdocs/langs/pl_PL/exports.lang
index 4a291b908d4..d30ec56438b 100644
--- a/htdocs/langs/pl_PL/exports.lang
+++ b/htdocs/langs/pl_PL/exports.lang
@@ -1,61 +1,62 @@
 # Dolibarr language file - Source file is en_US - exports
 ExportsArea=Eksporty
 ImportArea=Import
-NewExport=New Export
-NewImport=New Import
+NewExport=Nowy eksport
+NewImport=Nowy import
 ExportableDatas=Eksportowalny zbiór danych
 ImportableDatas=Importowalny zbiór danych
 SelectExportDataSet=Wybierz zbiór danych, który chcesz wyeksportować...
 SelectImportDataSet=Wybierz zbiór danych, który chcesz zaimportować...
-SelectExportFields=Choose the fields you want to export, or select a predefined export profile
-SelectImportFields=Choose the source file fields you want to import and their target field in database by moving them up and down with anchor %s, or select a predefined import profile:
+SelectExportFields=Wybierz pola, które chcesz wyeksportować, lub wybierz predefiniowany profil eksportu
+SelectImportFields=Wybierz pola pliku źródłowego, które chcesz zaimportować, i ich pole docelowe w bazie danych, przesuwając je w górę iw dół za pomocą kotwicy %s lub wybierz wstępnie zdefiniowany profil importu:
 NotImportedFields=Obszary plik przywożonych źródła nie
-SaveExportModel=Save your selections as an export profile/template (for reuse).
-SaveImportModel=Save this import profile (for reuse) ...
+SaveExportModel=Zapisz swoje wybory jako profil / szablon eksportu (do ponownego wykorzystania).
+SaveImportModel=Zapisz ten profil importu (do ponownego wykorzystania) ...
 ExportModelName=Nazwa profilu eksportowego
-ExportModelSaved=Export profile saved as <b>%s</b>.
+ExportModelSaved=Profil eksportu zapisany jako <b> %s </b>.
 ExportableFields=Wywóz pola
 ExportedFields=Eksportowane pola
 ImportModelName=Importuj nazwę profilu
-ImportModelSaved=Import profile saved as <b>%s</b>.
+ImportModelSaved=Importuj profil zapisany jako <b> %s </b>.
 DatasetToExport=Zbiór danych do eksportu
 DatasetToImport=Dataset importować
 ChooseFieldsOrdersAndTitle=Wybierz kolejność pól...
 FieldsTitle=Obszary tytuł
 FieldTitle=pole tytuł
-NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
-AvailableFormats=Available Formats
+NowClickToGenerateToBuildExportFile=Teraz wybierz format pliku w polu kombi i kliknij „Generuj”, aby zbudować plik eksportu ...
+AvailableFormats=Dostępne formaty
 LibraryShort=Biblioteka
-ExportCsvSeparator=Csv caracter separator
-ImportCsvSeparator=Csv caracter separator
+ExportCsvSeparator=Separator znaków CSV
+ImportCsvSeparator=Separator znaków CSV
 Step=Krok
-FormatedImport=Import Assistant
-FormatedImportDesc1=This module allows you to update existing data or add new objects into the database from a file without technical knowledge, using an assistant.
-FormatedImportDesc2=First step is to choose the kind of data you want to import, then the format of the source file, then the fields you want to import.
-FormatedExport=Export Assistant
-FormatedExportDesc1=These tools allow the export of personalized data using an assistant, to help you in the process without requiring technical knowledge.
-FormatedExportDesc2=First step is to choose a predefined dataset, then which fields you want to export, and in which order.
-FormatedExportDesc3=When data to export are selected, you can choose the format of the output file.
+FormatedImport=Asystent importu
+FormatedImportDesc1=Moduł ten umożliwia aktualizację istniejących danych lub dodawanie nowych obiektów do bazy danych z pliku bez wiedzy technicznej, przy pomocy asystenta.
+FormatedImportDesc2=Pierwszym krokiem jest wybór rodzaju danych, które chcesz zaimportować, następnie format pliku źródłowego, a następnie pola, które chcesz zaimportować.
+FormatedExport=Asystent Eksportu
+FormatedExportDesc1=Narzędzia te pozwalają na eksport spersonalizowanych danych za pomocą asystenta, aby pomóc Ci w procesie bez konieczności posiadania wiedzy technicznej.
+FormatedExportDesc2=Pierwszym krokiem jest wybranie predefiniowanego zbioru danych, a następnie pól, które chcesz wyeksportować, oraz w jakiej kolejności.
+FormatedExportDesc3=Po wybraniu danych do wyeksportowania można wybrać format pliku wyjściowego.
 Sheet=Arkusz
 NoImportableData=Nr przywozowe danych (bez modułu z definicji pozwalają na import danych)
 FileSuccessfullyBuilt=Wygenerowano plik
-SQLUsedForExport=SQL Request used to extract data
+SQLUsedForExport=Żądanie SQL używane do wyodrębniania danych
 LineId=Identyfikator linii
 LineLabel=Etykieta linii
 LineDescription=Opis pozycji
 LineUnitPrice=Cena jednostkowa pozycji
 LineVATRate=Stawka VAT pozycji
 LineQty=Ilość dla pozycji
-LineTotalHT=Amount excl. tax for line
+LineTotalHT=Kwota bez podatek za linię
 LineTotalTTC=Kwota z podatkiem dla pozycji
 LineTotalVAT=Kwota podatku VAT dla pozycji
 TypeOfLineServiceOrProduct=Rodzaj pozycji (0=produkt, 1=usługa)
 FileWithDataToImport=Plik z danymi do importu
 FileToImport=Plik źródłowy do zaimportowania
-FileMustHaveOneOfFollowingFormat=File to import must have one of following formats
-DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
-ChooseFormatOfFileToImport=Choose the file format to use as import file format by clicking on the %s icon to select it...
-ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
+FileMustHaveOneOfFollowingFormat=Plik do zaimportowania musi mieć jeden z następujących formatów
+DownloadEmptyExample=Download template file with field content information
+StarAreMandatory=* are mandatory fields
+ChooseFormatOfFileToImport=Wybierz format pliku, który ma być używany jako format pliku importu, klikając ikonę %s, aby go wybrać ...
+ChooseFileToImport=Prześlij plik, a następnie kliknij ikonę %s, aby wybrać plik jako źródłowy plik importu ...
 SourceFileFormat=Format pliku źródłowego
 FieldsInSourceFile=Pola w pliku źródłowym
 FieldsInTargetDatabase=Pola docelowe w bazie danych Dolibarr (wytłuszczenie = obowiązkowe)
@@ -70,57 +71,57 @@ FieldsTarget=Pola docelowe
 FieldTarget=Pole docelowe
 FieldSource=Pole źródłowe
 NbOfSourceLines=Liczba linii w pliku źródłowym
-NowClickToTestTheImport=Check that the file format (field and string delimiters) of your file matches the options shown and that you have omitted the header line, or these will be flagged as errors in the following simulation.<br>Click on the "<b>%s</b>" button to run a check of the file structure/contents and simulate the import process.<br><b>No data will be changed in your database</b>.
-RunSimulateImportFile=Run Import Simulation
+NowClickToTestTheImport=Sprawdź, czy format pliku (ograniczniki pól i ciągów znaków) w Twoim pliku jest zgodny z przedstawionymi opcjami i czy pominięto wiersz nagłówka, w przeciwnym razie zostaną one oflagowane jako błędy w następnej symulacji. <br> Kliknij przycisk „<b> %s </b>”, aby sprawdzić strukturę / zawartość pliku i zasymulować proces importu. <br> <b> Żadne dane w Twojej bazie danych nie zostaną zmienione </b>.
+RunSimulateImportFile=Uruchom symulację importu
 FieldNeedSource=To pole wymaga danych z pliku źródłowego
 SomeMandatoryFieldHaveNoSource=Niektóre z pól obowiązkowych nie ma źródła danych z pliku
 InformationOnSourceFile=Informacje o pliku źródłowego
 InformationOnTargetTables=Informacji na temat docelowego pola
 SelectAtLeastOneField=Switch co najmniej jednego źródła pola w kolumnie pól do wywozu
 SelectFormat=Wybierz ten format pliku importu
-RunImportFile=Import Data
-NowClickToRunTheImport=Check the results of the import simulation. Correct any errors and re-test.<br>When the simulation reports no errors you may proceed to import the data into the database.
-DataLoadedWithId=The imported data will have an additional field in each database table with this import id: <b>%s</b>, to allow it to be searchable in the case of investigating a problem related to this import.
-ErrorMissingMandatoryValue=Mandatory data is empty in the source file for field <b>%s</b>.
-TooMuchErrors=There are still <b>%s</b> other source lines with errors but output has been limited.
-TooMuchWarnings=There are still <b>%s</b> other source lines with warnings but output has been limited.
+RunImportFile=Zaimportować dane
+NowClickToRunTheImport=Sprawdź wyniki symulacji importu. Popraw wszystkie błędy i przeprowadź ponownie test. <br> Gdy symulacja nie wykaże żadnych błędów, możesz przystąpić do importu danych do bazy danych.
+DataLoadedWithId=Zaimportowane dane będą miały dodatkowe pole w każdej tabeli bazy danych o tym identyfikatorze importu: <b> %s </b>, aby umożliwić ich przeszukiwanie w przypadku badania problemu związanego z tym importem.
+ErrorMissingMandatoryValue=Obowiązkowe dane są puste w pliku źródłowym dla pola <b> %s </b>.
+TooMuchErrors=Nadal istnieją <b> %s </b> innych wierszy źródłowych z błędami, ale dane wyjściowe są ograniczone.
+TooMuchWarnings=Nadal istnieją <b> %s </b> inne wiersze źródłowe z ostrzeżeniami, ale dane wyjściowe są ograniczone.
 EmptyLine=Pusty wiersz (zostanie odrzucona)
-CorrectErrorBeforeRunningImport=You <b>must</b> correct all errors <b>before</b> running the definitive import.
+CorrectErrorBeforeRunningImport=Musisz <b> </b> poprawić wszystkie błędy <b> przed </b> uruchomieniem ostatecznego importu.
 FileWasImported=Plik został przywieziony z <b>%s</b> numerycznych.
-YouCanUseImportIdToFindRecord=You can find all the imported records in your database by filtering on field <b>import_key='%s'</b>.
+YouCanUseImportIdToFindRecord=Możesz znaleźć wszystkie zaimportowane rekordy w swojej bazie danych, filtrując według pola <b> import_key = '%s' </b>.
 NbOfLinesOK=Liczba linii bez błędów i żadnych ostrzeżeń: <b>%s.</b>
 NbOfLinesImported=Liczba linii zaimportowany: <b>%s.</b>
 DataComeFromNoWhere=Wartości, aby dodać pochodzi z nigdzie w pliku źródłowym.
 DataComeFromFileFieldNb=Wartość do dodania pochodzi z pola numer <b>%s</b> w pliku źródłowym.
-DataComeFromIdFoundFromRef=Value that comes from field number <b>%s</b> of source file will be used to find the id of the parent object to use (so the object <b>%s</b> that has the ref. from source file must exist in the database).
-DataComeFromIdFoundFromCodeId=Code that comes from field number <b>%s</b> of source file will be used to find the id of the parent object to use (so the code from source file must exist in the dictionary <b>%s</b>). Note that if you know the id, you can also use it in the source file instead of the code. Import should work in both cases.
+DataComeFromIdFoundFromRef=Wartość pochodząca z pola o numerze <b> %s </b> pliku źródłowego zostanie użyta do znalezienia identyfikatora obiektu nadrzędnego do użycia (więc obiekt <b> %s a09a4b739f17f8 musi istnieć w pliku źródłowym.
+DataComeFromIdFoundFromCodeId=Kod pochodzący z pola o numerze <b> %s </b> pliku źródłowego zostanie użyty do znalezienia identyfikatora obiektu nadrzędnego do użycia (więc kod z pliku źródłowego musi istnieć w słowniku <b> %s39f17f). Zauważ, że jeśli znasz identyfikator, możesz go również użyć w pliku źródłowym zamiast w kodzie. Import powinien działać w obu przypadkach.
 DataIsInsertedInto=Dane pochodzące z pliku źródłowego zostaną wstawione w następujące pola:
-DataIDSourceIsInsertedInto=The id of parent object was found using the data in the source file, will be inserted into the following field:
+DataIDSourceIsInsertedInto=Identyfikator obiektu nadrzędnego został znaleziony przy użyciu danych w pliku źródłowym, zostanie wstawiony w następujące pole:
 DataCodeIDSourceIsInsertedInto=Id linii macierzystej znaleźć z kodem, zostaną włączone do następnego pola:
 SourceRequired=Wartość danych jest obowiązkowe
 SourceExample=Przykład możliwych wartości danych
 ExampleAnyRefFoundIntoElement=Wszelkie ref dla <b>%s</b> elementów
 ExampleAnyCodeOrIdFoundIntoDictionary=Każdy kod (lub identyfikator) znajduje się w <b>słowniku% s</b>
-CSVFormatDesc=<b>Comma Separated Value</b> file format (.csv).<br>This is a text file format where fields are separated by a separator [ %s ]. If separator is found inside a field content, field is rounded by round character [ %s ]. Escape character to escape round character is [ %s ].
-Excel95FormatDesc=<b>Excel</b> file format (.xls)<br>This is the native Excel 95 format (BIFF5).
-Excel2007FormatDesc=<b>Excel</b> file format (.xlsx)<br>This is the native Excel 2007 format (SpreadsheetML).
+CSVFormatDesc= <b> Wartość oddzielona przecinkami </b> Format pliku (.csv). <br> Jest to format pliku tekstowego, w którym pola są oddzielone separatorem [%s]. Jeśli separator znajduje się w treści pola, pole jest zaokrąglane okrągłym znakiem [%s]. Znak ucieczki do rundy ucieczki to [%s].
+Excel95FormatDesc= <b> Format pliku programu Excel </b> (.xls) <br> Jest to natywny format programu Excel 95 (BIFF5).
+Excel2007FormatDesc= <b> Format pliku programu Excel </b> (.xlsx) <br> Jest to natywny format programu Excel 2007 (SpreadsheetML).
 TsvFormatDesc=<b>Tab separacji</b> format <b>Wartość</b> (.tsv) <br> Jest to format pliku tekstowego, gdzie pola są oddzielone tabulator [TAB].
-ExportFieldAutomaticallyAdded=Field <b>%s</b> was automatically added. It will avoid you to have similar lines to be treated as duplicate record (with this field added, all lines will own their own id and will differ).
-CsvOptions=CSV format options
-Separator=Field Separator
-Enclosure=String Delimiter
+ExportFieldAutomaticallyAdded=Pole <b> %s </b> zostało dodane automatycznie. Pozwoli to uniknąć sytuacji, w których podobne wiersze będą traktowane jako zduplikowany rekord (po dodaniu tego pola wszystkie wiersze będą miały własny identyfikator i będą się różnić).
+CsvOptions=Opcje formatu CSV
+Separator=Separator pól
+Enclosure=Separator ciągów
 SpecialCode=Specjalny kod
 ExportStringFilter=%% Umożliwia zastąpienie jednego lub więcej znaków w tekście
-ExportDateFilter=YYYY, YYYYMM, YYYYMMDD: filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD: filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD: filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD: filters on all previous years/months/days
-ExportNumericFilter=NNNNN filters by one value<br>NNNNN+NNNNN filters over a range of values<br>< NNNNN filters by lower values<br>> NNNNN filters by higher values
+ExportDateFilter=RRRR, RRRRMM, RRRRMMDD: filtry według jednego roku / miesiąca / dnia <br> RRRR + RRRR, RRRRMM + RRRRMM, RRRRMMDD + RRRRMMDD: filtry w zakresie lat / miesięcy / dni / dni: RRRR / m / dni kolejne lata / miesiące / dni <br> <RRRR, <RRRRMM, <RRRRMMDD: filtruje wszystkie poprzednie lata / miesiące / dni
+ExportNumericFilter=NNNNN filtruje według jednej wartości <br> NNNNN + NNNNN filtruje w zakresie wartości <br> <br>> NNNNN filtruje według wyższych wartości
 ImportFromLine=Import rozpocznij od linii numer
 EndAtLineNb=Zakończ na linii numer
-ImportFromToLine=Limit range (From - To). Eg. to omit header line(s).
-SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines.<br>If the header lines are NOT omitted, this will result in multiple errors in the Import Simulation.
-KeepEmptyToGoToEndOfFile=Keep this field empty to process all lines to the end of the file.
-SelectPrimaryColumnsForUpdateAttempt=Select column(s) to use as primary key for an UPDATE import
-UpdateNotYetSupportedForThisImport=Update is not supported for this type of import (only insert)
-NoUpdateAttempt=No update attempt was performed, only insert
+ImportFromToLine=Zakres graniczny (od - do). Na przykład. pominąć linię (y) nagłówka.
+SetThisValueTo2ToExcludeFirstLine=Na przykład ustaw tę wartość na 3, aby wykluczyć 2 pierwsze wiersze. <br> Jeśli wiersze nagłówka NIE zostaną pominięte, spowoduje to wiele błędów w symulacji importu.
+KeepEmptyToGoToEndOfFile=Pozostaw to pole puste, aby przetworzyć wszystkie wiersze do końca pliku.
+SelectPrimaryColumnsForUpdateAttempt=Wybierz kolumny, które będą używane jako klucz podstawowy do importu UPDATE
+UpdateNotYetSupportedForThisImport=Aktualizacja nie jest obsługiwana dla tego typu importu (tylko wstaw)
+NoUpdateAttempt=Nie podjęto próby aktualizacji, tylko włóż
 ImportDataset_user_1=Użytkownicy (pracownicy lub nie) i ustawienia
 ComputedField=Obliczone pole
 ## filters
@@ -129,8 +130,8 @@ FilteredFields=Filtrowane pola
 FilteredFieldsValues=Wartość dla filtra
 FormatControlRule=Zasada kontroli formatu
 ## imports updates
-KeysToUseForUpdates=Key (column) to use for <b>updating</b> existing data
+KeysToUseForUpdates=Klucz (kolumna) do użycia dla <b> aktualizacji </b> istniejących danych
 NbInsert=ilość wprowadzonych linii: %s
 NbUpdate=Ilość zaktualizowanych linii: %s
-MultipleRecordFoundWithTheseFilters=Multiple records have been found with these filters: %s
-StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
+MultipleRecordFoundWithTheseFilters=Znaleziono wiele rekordów z tymi filtrami: %s
+StocksWithBatch=Stany i lokalizacja (magazyn) produktów z numerem partii / serii
diff --git a/htdocs/langs/pt_AO/admin.lang b/htdocs/langs/pt_AO/admin.lang
new file mode 100644
index 00000000000..4b09f74acdb
--- /dev/null
+++ b/htdocs/langs/pt_AO/admin.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - admin
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
diff --git a/htdocs/langs/pt_AO/salaries.lang b/htdocs/langs/pt_AO/salaries.lang
new file mode 100644
index 00000000000..c9bd3bec17b
--- /dev/null
+++ b/htdocs/langs/pt_AO/salaries.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - salaries
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
diff --git a/htdocs/langs/pt_AO/website.lang b/htdocs/langs/pt_AO/website.lang
new file mode 100644
index 00000000000..910cff6b702
--- /dev/null
+++ b/htdocs/langs/pt_AO/website.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - website
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
diff --git a/htdocs/langs/pt_BR/deliveries.lang b/htdocs/langs/pt_BR/deliveries.lang
index 7c5fec6ed99..ad1c983b4a0 100644
--- a/htdocs/langs/pt_BR/deliveries.lang
+++ b/htdocs/langs/pt_BR/deliveries.lang
@@ -19,5 +19,6 @@ Sender=Remetente
 ErrorStockIsNotEnough=Não existe estoque suficiente
 Shippable=Disponivel para envio
 NonShippable=Não disponivel para envio
+ShowShippableStatus=Mostrar status entregável
 ShowReceiving=Mostrar recibo de entrega
 NonExistentOrder=Pedido inexistente
diff --git a/htdocs/langs/pt_BR/exports.lang b/htdocs/langs/pt_BR/exports.lang
index 4475adb3a39..2e11c55f5aa 100644
--- a/htdocs/langs/pt_BR/exports.lang
+++ b/htdocs/langs/pt_BR/exports.lang
@@ -68,3 +68,4 @@ ComputedField=Campo computado
 SelectFilterFields=Se você deseja filtrar alguns valores, apenas os valores de entrada aqui.
 FilteredFieldsValues=Valor para o filtro
 MultipleRecordFoundWithTheseFilters=Múltiplos registros foram encontrados com esses filtros: %s
+StocksWithBatch=Estoques e localização (armazém) de produtos com lote / número de série
diff --git a/htdocs/langs/pt_BR/products.lang b/htdocs/langs/pt_BR/products.lang
index ae31027f0ab..a4293c94ace 100644
--- a/htdocs/langs/pt_BR/products.lang
+++ b/htdocs/langs/pt_BR/products.lang
@@ -133,7 +133,6 @@ ResetBarcodeForAllRecords=Definir o valor do código de barras para todos os reg
 PriceByCustomer=Preços diferenteas para cada cliente
 PriceCatalogue=Um único preço de venda por produto/serviço
 AddCustomerPrice=Adicionar preço por cliente
-ForceUpdateChildPriceSoc=Situado mesmo preço em outros pedidos dos clientes
 PriceByCustomerLog=Registros de preços de cliente anteriores
 MinimumPriceLimit=Preço mínimo não pode ser inferior, em seguida %s
 MinimumRecommendedPrice=Preço minimo recomendado é : %s
diff --git a/htdocs/langs/pt_BR/ticket.lang b/htdocs/langs/pt_BR/ticket.lang
index b88555bee7f..6c7827f0c15 100644
--- a/htdocs/langs/pt_BR/ticket.lang
+++ b/htdocs/langs/pt_BR/ticket.lang
@@ -8,7 +8,6 @@ TicketDictCategory=Tickets - Grupos
 TicketDictSeverity=Tickets - Gravidades
 TicketDictResolution=Ticket - Resolução
 TicketTypeShortHELP=Pedido de ajuda funcional
-TicketTypeShortISSUE=Questão, bug ou problema
 TicketTypeShortREQUEST=Solicitação de alteração ou aprimoramento
 TicketTypeShortOTHER=Outros
 TicketSeverityShortLOW=Baixa
@@ -18,7 +17,6 @@ MenuTicketMyAssignNonClosed=Meus tickets abertos
 MenuListNonClosed=Tickets abertos
 TypeContact_ticket_external_CONTRIBUTOR=Contribuidor externo
 Notify_TICKET_SENTBYMAIL=Envio do ticket por e-mail
-NeedMoreInformation=Aguardando informação
 Waiting=Aguardando
 Severity=Gravidade
 MailToSendTicketMessage=Para enviar e-mail da mensagem do ticket
diff --git a/htdocs/langs/pt_PT/deliveries.lang b/htdocs/langs/pt_PT/deliveries.lang
index 35cad55eb41..c8777e9fdf1 100644
--- a/htdocs/langs/pt_PT/deliveries.lang
+++ b/htdocs/langs/pt_PT/deliveries.lang
@@ -27,5 +27,7 @@ Recipient=Destinatário
 ErrorStockIsNotEnough=Não existe stock suficiente
 Shippable= Transportável
 NonShippable=Não Transportável
+ShowShippableStatus=Show shippable status
 ShowReceiving=Mostrar recibo da entrega
 NonExistentOrder=Nonexistent order
+StockQuantitiesAlreadyAllocatedOnPreviousLines = Stock quantities already allocated on previous lines
diff --git a/htdocs/langs/pt_PT/exports.lang b/htdocs/langs/pt_PT/exports.lang
index 083e48f5527..49f2eee70c0 100644
--- a/htdocs/langs/pt_PT/exports.lang
+++ b/htdocs/langs/pt_PT/exports.lang
@@ -53,7 +53,8 @@ TypeOfLineServiceOrProduct=Tipo de linha (0= produto, serviço de 1=)
 FileWithDataToImport=Arquivo com os dados de importação
 FileToImport=Fonte ficheiro a importar
 FileMustHaveOneOfFollowingFormat=O arquivo a ser importado deve ter um dos seguintes formatos
-DownloadEmptyExample=Faça o download do arquivo de modelo com informações sobre o conteúdo do campo (* são campos obrigatórios)
+DownloadEmptyExample=Download template file with field content information
+StarAreMandatory=* are mandatory fields
 ChooseFormatOfFileToImport=Escolha o formato de arquivo para usar como formato de arquivo de importação clicando no ícone %s para selecioná-lo ...
 ChooseFileToImport=Carregar arquivo, em seguida, clique no ícone %s para selecionar o arquivo como arquivo de importação de origem ...
 SourceFileFormat=Formato de arquivo de origem
diff --git a/htdocs/langs/ro_RO/deliveries.lang b/htdocs/langs/ro_RO/deliveries.lang
index 53e4e7d825b..7537953cb21 100644
--- a/htdocs/langs/ro_RO/deliveries.lang
+++ b/htdocs/langs/ro_RO/deliveries.lang
@@ -1,31 +1,33 @@
 # Dolibarr language file - Source file is en_US - deliveries
 Delivery=Livrare
 DeliveryRef=Ref Livrare
-DeliveryCard=Chitanta card
+DeliveryCard=Notă de livrare
 DeliveryOrder=Bon de livrare
-DeliveryDate=Data de livrare
-CreateDeliveryOrder=Generați chitanța de livrare
-DeliveryStateSaved=Stare livrare salvata
+DeliveryDate=Dată de livrare
+CreateDeliveryOrder=Generați nota de livrare
+DeliveryStateSaved=Stare livrare salvată
 SetDeliveryDate=Setaţi data de expediere
-ValidateDeliveryReceipt=Validare recepţie  livrare
-ValidateDeliveryReceiptConfirm=Sigur doriți să validați această chitanță de livrare?
-DeleteDeliveryReceipt=Ştergeţi recepţie livrare
-DeleteDeliveryReceiptConfirm=Sigur doriți să ștergeți chitanța de livrare <b> %s </b>?
-DeliveryMethod=Metoda de livrare
-TrackingNumber=Număr de urmărire
-DeliveryNotValidated=Livrare  nevalidată
-StatusDeliveryCanceled=Anulata
-StatusDeliveryDraft=Draft
+ValidateDeliveryReceipt=Validare notă de livrare
+ValidateDeliveryReceiptConfirm=Sigur doriți să validați această notă de livrare?
+DeleteDeliveryReceipt=Ştergere notă de livrare
+DeleteDeliveryReceiptConfirm=Sigur doriți să ștergeți nota de livrare <b>%s</b>?
+DeliveryMethod=Metodă de livrare
+TrackingNumber=Număr de urmărire AWB
+DeliveryNotValidated=Livrare nevalidată
+StatusDeliveryCanceled=Anulată
+StatusDeliveryDraft=Schiţă
 StatusDeliveryValidated=Primit
 # merou PDF model
 NameAndSignature=Numele și semnătura:
-ToAndDate=To___________________________________ pe ____ / _____ / __________
-GoodStatusDeclaration=Au primit bunurile în bună stare de mai sus,
-Deliverer=Expeditor:
+ToAndDate=Către___________________________________ pe data de ____ / _____ / __________
+GoodStatusDeclaration=Au primit bunurile de mai sus, în stare bună,
+Deliverer=Livrator:
 Sender=Expeditor
-Recipient=Recipient
+Recipient=Destinatar
 ErrorStockIsNotEnough=Nu există stoc suficient
 Shippable=Livrabil
 NonShippable=Nelivrabil
+ShowShippableStatus=Afișare status de expediere
 ShowReceiving= Afișare notă de recepție
-NonExistentOrder=Ordin inexistent
+NonExistentOrder=Comandă inexistentă
+StockQuantitiesAlreadyAllocatedOnPreviousLines = Cantități de stoc deja alocate pe liniile anterioare
diff --git a/htdocs/langs/ro_RO/exports.lang b/htdocs/langs/ro_RO/exports.lang
index 08f9a64d27e..28c2266d9f6 100644
--- a/htdocs/langs/ro_RO/exports.lang
+++ b/htdocs/langs/ro_RO/exports.lang
@@ -1,136 +1,137 @@
 # Dolibarr language file - Source file is en_US - exports
 ExportsArea=Exporturi
 ImportArea=Import
-NewExport=Exportul nou
-NewImport=Importul nou
-ExportableDatas=Exportabil de date
-ImportableDatas=Importable de date
-SelectExportDataSet=Alegeţi de date pe care doriţi să le export ...
-SelectImportDataSet=Alegeţi de date pe care doriţi să o import ...
+NewExport=Export nou
+NewImport=Import nou
+ExportableDatas=Set de date exportabil
+ImportableDatas=Set de date importabil
+SelectExportDataSet=Alege setul de date pe care doreşti să-l exporţi...
+SelectImportDataSet=Alege setul de date pe care doreşti să-l imporţi...
 SelectExportFields=Alegeți câmpurile pe care doriți să le exportați sau selectați un profil de export predefinit
-SelectImportFields=Alegeți câmpurile sursă de fișier pe care doriți să le importați și câmpul țintă în baza de date deplasându-le în sus și în jos cu ancora %s sau selectând un profil predefinit de import:
-NotImportedFields=Câmpurile fişierului sursă nu importate
+SelectImportFields=Alege câmpurile din fișierul sursă pe care doreşti să le imporți și câmpurile țintă din baza de date deplasându-te în sus și în jos cu ancora %s sau selectând un profil predefinit de import:
+NotImportedFields=Câmpurile fişierului sursă nu au fost importate
 SaveExportModel=Salvați selecțiile ca profil de export/șablon (pentru reutilizare).
 SaveImportModel=Salvați acest profil de import (pentru reutilizare) ...
-ExportModelName=Export profil nume
-ExportModelSaved=Exportați profilul salvat ca <b> %s </b>.
+ExportModelName=Nume profil export date
+ExportModelSaved=Exportați profilul salvat ca <b>%s</b>.
 ExportableFields=Câmpuri exportabile
 ExportedFields=Câmpuri exportate
-ImportModelName=Import profil nume
-ImportModelSaved=Profilul de import a fost salvat ca <b> %s </b>.
-DatasetToExport=De date la export
-DatasetToImport=De date pentru a importa
-ChooseFieldsOrdersAndTitle=Alegeţi câmpurile pentru ...
-FieldsTitle=Câmpuri  titlu
-FieldTitle=Domeniul titlu
+ImportModelName=Nume profil import date
+ImportModelSaved=Profilul de import a fost salvat ca <b>%s</b>.
+DatasetToExport=Set de date de exportat
+DatasetToImport=Import fişier în set de date
+ChooseFieldsOrdersAndTitle=Alegeţi ordinea câmpurilor...
+FieldsTitle=Câmpuri titlu
+FieldTitle=Titlu câmp
 NowClickToGenerateToBuildExportFile=Acum, selectați formatul de fișier în caseta combo și faceți clic pe "Generare" pentru a construi fișierul de export ...
 AvailableFormats=Formate disponibile
-LibraryShort=Biblioteca
+LibraryShort=Bibliotecă
 ExportCsvSeparator=Separator caractere CSV 
 ImportCsvSeparator=Separator caractere CSV 
-Step=Pasul
+Step=Pas
 FormatedImport=Asistent import
 FormatedImportDesc1=Acest modul vă permite să actualizați datele existente sau să adăugați obiecte noi în baza de date dintr-un fișier fără cunoștințe tehnice, utilizând un asistent.
-FormatedImportDesc2=Primul pas este să alegeți tipul de date pe care doriți să îl importați, apoi formatul fișierului sursă, apoi câmpurile pe care doriți să le importați.
+FormatedImportDesc2=Primul pas este să alegi tipul de date pe care doreşti să-l imporți, apoi formatul fișierului sursă, apoi câmpurile pe care vrei să le imporți.
 FormatedExport=Asistent export
-FormatedExportDesc1=Aceste instrumente permit exportul de date personalizate folosind un asistent, pentru a vă ajuta în acest proces fără a necesita cunoștințe tehnice.
+FormatedExportDesc1=Aceste instrumente permit exportul de date personalizate folosind un asistent, pentru a te ajuta în acest proces fără a necesita cunoștințe tehnice.
 FormatedExportDesc2=Primul pas este să alegeți un set de date predefinit, apoi câmpurile pe care doriți să le exportați și în ce ordine.
 FormatedExportDesc3=Când sunt selectate datele de export, puteți alege formatul fișierului de ieșire.
 Sheet=Foaie
-NoImportableData=Nu importable de date (nu cu modul de definiţii, pentru a permite importul de date)
+NoImportableData=Date neimportabile (niciun modul cu definiţii care să permită importul)
 FileSuccessfullyBuilt=Fișierul generat
 SQLUsedForExport=Interogare SQL utilizată pentru extragerea datelor
-LineId=Id-ul de linie
-LineLabel=Eticheta linie
-LineDescription=Descriere de linie
-LineUnitPrice=Preţul unitar de linie
-LineVATRate=TVA de linie
-LineQty=Cantitate de linie
-LineTotalHT=Cantitate excl. taxa pentru linie
-LineTotalTTC=Suma cu taxa de linie
-LineTotalVAT=Suma TVA pentru linia
+LineId=Id linie
+LineLabel=Etichetă linie
+LineDescription=Descriere linie
+LineUnitPrice=Preţul unitar pentru linie
+LineVATRate=Cota TVA pentru linie
+LineQty=Cantitate pentru linie
+LineTotalHT=Valoarea fără taxe pentru linie
+LineTotalTTC=Valoarea cu taxe pentru linie
+LineTotalVAT=Valoare TVA pentru linie
 TypeOfLineServiceOrProduct=Tip de linie (0= produs, 1= serviciu)
 FileWithDataToImport=Fişiere cu date de import
 FileToImport=Fişierul sursă de import
 FileMustHaveOneOfFollowingFormat=Fișierul de import trebuie să aibă unul din următoarele formate
-DownloadEmptyExample=Descărcați fișierul șablon cu informații despre conținutul câmpului (* sunt câmpuri obligatorii)
-ChooseFormatOfFileToImport=Alegeți formatul de fișier pentru a fi utilizat ca format de fișier de import făcând clic pe pictograma %s pentru a o selecta ...
-ChooseFileToImport=Încărcați fișierul, apoi dați clic pe pictograma %s pentru a selecta fișierul ca fișier de import al sursei ...
-SourceFileFormat=Sursa Format fişier
-FieldsInSourceFile=Câmpuri  in fişierul sursă
-FieldsInTargetDatabase=Câmpuri-țintă în baza de date Dolibarr (bold = obligatoriu)
+DownloadEmptyExample=Descărcare fișier șablon cu informații despre conținutul câmpului
+StarAreMandatory=* sunt câmpuri obligatorii
+ChooseFormatOfFileToImport=Alegeți formatul de fișier care va fi utilizat ca format de fișier de import făcând clic pe pictograma %s pentru selecţie...
+ChooseFileToImport=Încărcați fișierul, apoi dați clic pe pictograma %s pentru a selecta fișierul ca sursă de import...
+SourceFileFormat=Format fişier sursă
+FieldsInSourceFile=Câmpuri în fişierul sursă
+FieldsInTargetDatabase=Câmpuri-țintă în baza de date a sistemului (bold = obligatoriu)
 Field=Câmp
 NoFields=Niciun câmp
-MoveField=Mutare coloana %s domeniul număr
+MoveField=Mută câmpul coloană cu numărul %s
 ExampleOfImportFile=Example_of_import_file
-SaveImportProfile=Salvaţi acest profil de import
-ErrorImportDuplicateProfil=Nu am putut salva acest profil de import cu acest nume. Un profil existent deja cu acest nume.
+SaveImportProfile=Salvează acest profil de import
+ErrorImportDuplicateProfil=Nu am putut salva profilul de import cu acest nume. Un profil există deja cu acest nume.
 TablesTarget=Tabelele vizate
 FieldsTarget=Câmpuri vizate
 FieldTarget=Câmp vizat
-FieldSource=Sursa de câmp
+FieldSource=Câmp sursă
 NbOfSourceLines=Numărul de linii în fişierul sursă
-NowClickToTestTheImport=Verificați dacă formatul fișierului (câmpurile și delimitatorii de șir) al fișierului dvs. corespunde opțiunilor afișate și că ați omis linia antetului sau acestea vor fi semnalate ca erori în următoarea simulare. <br> Faceți clic pe butonul "<b> %s </b>" pentru a rula o verificare a structurii / conținutului fișierelor și a simula procesul de importare. <br> <b> Nu se vor schimba date în baza dumneavoastră de date </b>.
+NowClickToTestTheImport=Verifică dacă formatul fișierului (câmpurile și delimitatorii de șir) din fișierul tău corespunde opțiunilor afișate și că ai omis linia antetului; acestea vor fi semnalate ca erori în următoarea simulare. <br> Faceți clic pe butonul "<b> %s </b>" pentru a rula o verificare a structurii/conținutului fișierelor și a simula procesul de importare. <br> <b> Nu se vor modifica informaţii din baza de date </b>.
 RunSimulateImportFile=Rulați simularea de import
 FieldNeedSource=Acest câmp cere date din fişierul sursă
-SomeMandatoryFieldHaveNoSource=Unele câmpuri obligatorii nu au nicio sursă de date de la dosar
-InformationOnSourceFile=Informaţii privind fişier sursă
+SomeMandatoryFieldHaveNoSource=Unele câmpuri obligatorii nu au nicio sursă de date din fişier
+InformationOnSourceFile=Informaţii privind fişierul sursă
 InformationOnTargetTables=Informaţii privind câmpurile ţintă
 SelectAtLeastOneField=Comută cel puțin un câmp sursă în coloana de câmpuri de exportat
-SelectFormat=Alegeţi acest fişier format de import
-RunImportFile=Importați date
-NowClickToRunTheImport=Verificați rezultatele simulării de import. Corectați orice eroare și retestați. <br> Când simularea nu raportează erori, puteți continua să importați datele în baza de date.
+SelectFormat=Alege acest format de fişier de import
+RunImportFile=Import date
+NowClickToRunTheImport=Verifică rezultatele simulării de import. Corectează orice eroare și re-testează. <br> Când simularea nu mai raportează erori, poţi importa datele în baza de date.
 DataLoadedWithId=Datele importate vor avea un câmp suplimentar în fiecare tabelă de bază de date cu acest id de import: <b> %s </b>, pentru a permite ca acesta să poată fi căutat în cazul investigării unei probleme legate de acest import.
-ErrorMissingMandatoryValue=Datele obligatorii sunt goale în fișierul sursă pentru câmpul <b> %s </b>.
-TooMuchErrors=Există încă <b> %s </b> alte linii sursă cu erori, dar ieșirea a fost limitată.
-TooMuchWarnings=Există încă <b> %s </b> alte linii sursă cu avertismente, dar ieșirea a fost limitată.
-EmptyLine=linie goală (vor fi aruncate)
-CorrectErrorBeforeRunningImport=Trebuie să <b> trebuie să </b> corectaţi toate erorile <b> înainte ca </b> să ruleze importul definitiv.
-FileWasImported=Dosarul a fost importat cu <b>%s</b> număr.
-YouCanUseImportIdToFindRecord=Puteți găsi toate înregistrările importate în baza dvs. de date prin filtrarea pe câmpul <b> import_key = '%s' </b>.
-NbOfLinesOK=Numărul de linii fără erori şi fără avertismente: <b>%s.</b>
-NbOfLinesImported=Numărul de linii cu succes importate: <b>%s.</b>
-DataComeFromNoWhere=Valoare pentru a introduce vine de nicăieri în fişierul sursă.
-DataComeFromFileFieldNb=Valoare pentru a introduce <b>%s</b> vine de la numărul de câmp în fişierul sursă.
-DataComeFromIdFoundFromRef=Valoarea care vine de la numărul câmpului <b> %s </b> din fișierul sursă va fi utilizată pentru a găsi id-ul obiectului parental de folosit (astfel încât obiectul <b> %s </b> care are ref. din fișierul sursă trebuie să existe în baza de date).
-DataComeFromIdFoundFromCodeId=Codul care vine de la numărul de câmp <b> %s </b> din fișierul sursă va fi folosit pentru a găsi id-ul obiectului parental de folosit (astfel încât codul din fișierul sursă trebuie să existe în dicționar <b> %s </b>). Rețineți că, dacă cunoașteți idul, îl puteți utiliza și în fișierul sursă în locul codului. Importul ar trebui să funcționeze în ambele cazuri.
-DataIsInsertedInto=Datele provin din fişierul sursă va fi inserat în câmpul de următoarele:
-DataIDSourceIsInsertedInto=ID-ul obiectului părinte a fost găsit utilizând datele din fișierul sursă, va fi introdus în câmpul următor:
-DataCodeIDSourceIsInsertedInto=ID-ul de linie de la mamă găsit codul, va fi introdus în câmpul următorul text:
-SourceRequired=valoarea datelor este obligatorie
-SourceExample=Exemplu de valoare posibilă de date
-ExampleAnyRefFoundIntoElement=Orice Ref gasit pentru <b>%s</b> element
+ErrorMissingMandatoryValue=Date obligatorii sunt necompletate în fișierul sursă pentru câmpul <b>%s</b>.
+TooMuchErrors=Există încă <b>%s</b> alte linii sursă cu erori, dar afişarea a fost limitată.
+TooMuchWarnings=Există încă <b>%s</b> alte linii sursă cu avertismente, dar afişarea a fost limitată.
+EmptyLine=Linie goală (va fi ignorată)
+CorrectErrorBeforeRunningImport=<b>Trebuie</b> să corectezi toate erorile <b>înainte</b> de a rula importul definitiv.
+FileWasImported=Fişierul a fost importat cu numărul <b>%s</b>.
+YouCanUseImportIdToFindRecord=Găsiţi toate înregistrările importate în baza de date filtrând pe câmpul <b>import_key = '%s'</b>.
+NbOfLinesOK=Număr de linii fără erori şi fără avertismente: <b>%s</b>.
+NbOfLinesImported=Număr de linii importate cu succes: <b>%s</b>.
+DataComeFromNoWhere=Valoarea de inserare necunoscută în fişierul sursă.
+DataComeFromFileFieldNb=Valoarea de introdus vine din câmpul cu numărul <b>%s</b> din fişierul sursă.
+DataComeFromIdFoundFromRef=Valoarea care provine din câmpul cu numărul  <b>%s</b> din fișierul sursă va fi utilizată pentru a găsi id-ul obiectului părinte care se va folosi (astfel încât obiectul <b>%s</b> care are referinţa din fișierul sursă trebuie să existe în baza de date).
+DataComeFromIdFoundFromCodeId=Codul care provine din câmpul cu numărul <b>%s</b> din fișierul sursă va fi folosit pentru a găsi id-ul obiectului părinte utilizat (deci codul din fișierul sursă trebuie să existe în dicționarul <b>%s</b>). Reține că, dacă cunoști id-ul, îl poți utiliza și în fișierul sursă în locul codului. Importul ar trebui să funcționeze în ambele cazuri.
+DataIsInsertedInto=Datele care provin din fişierul sursă vor fi inserate în următorul câmp:
+DataIDSourceIsInsertedInto=ID-ul obiectului părinte a fost găsit utilizând datele din fișierul sursă, va fi introdus în următorul câmp:
+DataCodeIDSourceIsInsertedInto=ID-ul liniei părinte găsit în cod, va fi introdus în următorul câmp:
+SourceRequired=Valoarea de tip dată este obligatorie
+SourceExample=Exemplu de valoare posibilă
+ExampleAnyRefFoundIntoElement=Orice referinţă gasită pentru elementul <b>%s</b>
 ExampleAnyCodeOrIdFoundIntoDictionary=Orice cod (sau id) găsit  în dicţionarul <b>%s</b> 
-CSVFormatDesc=<b> Valoarea separată prin virgulă </b> formatul de fișier (.csv). <br> Acesta este un format de fișier text în care câmpurile sunt separate printr-un separator [%s]. Dacă separatorul se găsește într-un conținut de câmp, câmpul este rotunjit de caracterul rotund [%s]. Caracterul ESC pentru a scăpa de caracterul rotund este [%s].
-Excel95FormatDesc=<b> Excel format </b> (.xls) <br> Acesta este formatul nativ Excel 95 (BIFF5).
-Excel2007FormatDesc=<b> Excel </b> format fișier (.xlsx) <br> Acesta este formatul nativ Excel 2007 (SpreadsheetML).
-TsvFormatDesc=<b> Tab Separat Valoare </b> format de fișier (.tsv) <br> Acesta este un format de fișier text în care câmpurile sunt separate printr-un tabulator [tab].
-ExportFieldAutomaticallyAdded=Câmpul <b> %s </b> a fost adăugat automat. Va evita să aveți linii similare pentru a fi tratate ca înregistrări duplicate (cu acest câmp adăugat, toate liniile vor avea propriul id și vor diferi).
-CsvOptions=Optiuni de format CSV
+CSVFormatDesc=Formatul de fişier (.csv) <b> Valoare separată prin virgulă </b>. <br> Acesta este un format de fișier text în care câmpurile sunt separate printr-un separator [%s]. Dacă separatorul se găsește într-un câmp de conţinut, câmpul este trunchiat de caracterul [%s]. Caracterul de evadare este [%s].
+Excel95FormatDesc=Formatul de fişier <b>Excel</b> (.xls) <br> Acesta este formatul nativ Excel 95 (BIFF5).
+Excel2007FormatDesc=Formatul de fişier <b>Excel</b> (.xlsx) <br> Acesta este formatul nativ Excel 2007 (SpreadsheetML).
+TsvFormatDesc=Formatul de fişier (.tsv) <b>Valori separate prin Tab</b> <br> Acesta este un format de fișier text în care câmpurile sunt separate printr-un tabulator [tab].
+ExportFieldAutomaticallyAdded=Câmpul <b>%s</b> a fost adăugat automat. Se va evita introducerea de   linii similare considerate ca înregistrări duplicate (cu acest câmp adăugat, toate liniile vor avea propriul id și vor diferi).
+CsvOptions=Opţiuni format CSV
 Separator=Separator de câmp
 Enclosure=Delimitator de şir
 SpecialCode=Cod special
-ExportStringFilter=%% permite înlocuirea unuia sau mai multor caractere in text
-ExportDateFilter=AAAA, AAAALL, AAAALLZZ: filtre pe un an / lună / zi <br> AAAA + AAAA, AAAALL + AAAALL, AAAALLZZ + AAAALLZZ: filtre pe o perioadă de ani / luni / zile <br> > AAAA, > AAAALL, > AAAALLZZ: filtre pentru toți anii / lunile / zilele urmatori<br> <AAAAA, <AAAALL, <AAAALLZZ: filtre pentru toți anii / lunile / zilele anterioare
-ExportNumericFilter=Filtrele NNNNN cu o valoare <br> NNNNN + NNNNN filtrează peste un interval de valori <br> Filtre NNNNN prin valori mai mici <br>> Filtre NNNNN prin valori mai mari
-ImportFromLine=Importul pornind de la linia numărul 
+ExportStringFilter=%% permite înlocuirea unuia sau mai multor caractere în text
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD: filtre după an/lună/zi<br> YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD: filtre pe o perioadă de ani/luni/zile <br> > YYYY, > YYYYMM, > YYYYMMDD: filtre pentru toţi anii/lunile/zilele următoare<br> < YYYY, < YYYYMM, < YYYYMMDD: filtre pentru toți anii/lunile/zilele anterioare
+ExportNumericFilter=NNNNN filtrează după o valoare <br> NNNNN + NNNNN filtrează după un interval de valori <br>< NNNNN filtrează după valori mai mici <br>> NNNNN după valori mai mari
+ImportFromLine=Importă începând cu linia numărul 
 EndAtLineNb=Sfârșit la linia numărul 
 ImportFromToLine=Interval limită (De la - Până la). Ex. pentru a omite linia(ile) de cap de tabel.  
-SetThisValueTo2ToExcludeFirstLine=De exemplu, setați această valoare la 3 pentru a exclude primele 2 linii. <br> Dacă liniile de antet NU sunt omise, aceasta va duce la mai multe erori în simularea importului.
+SetThisValueTo2ToExcludeFirstLine=De exemplu, setează această valoare la 3 pentru a exclude primele 2 linii. <br> Dacă liniile de antet NU sunt omise, aceasta va duce la mai multe erori în simularea importului.
 KeepEmptyToGoToEndOfFile=Păstrați acest câmp gol pentru a procesa toate liniile până la sfârșitul fișierului.
-SelectPrimaryColumnsForUpdateAttempt=Selectați coloana (coloanele) de utilizat ca cheie primară pentru o importare UPDATE
-UpdateNotYetSupportedForThisImport=Actualizarea nu este acceptată pentru acest tip de import (inserați numai)
-NoUpdateAttempt=Nu a fost efectuată nicio încercare de actualizare, se introduce numai
+SelectPrimaryColumnsForUpdateAttempt=Selectează coloana(coloanele) de utilizat ca cheie primară pentru un import cu actualizare UPDATE
+UpdateNotYetSupportedForThisImport=Actualizarea nu este acceptată pentru acest tip de import (doar inserare)
+NoUpdateAttempt=Nu a fost efectuată nicio încercare de actualizare, doar se inserează
 ImportDataset_user_1=Utilizatori (angajați sau nu) și proprietăți
-ComputedField=Câmpul calculat
+ComputedField=Câmp calculat
 ## filters
 SelectFilterFields=Dacă doriți să filtrați pe anumite valori, doar introduceţi valorile aici.
 FilteredFields=Câmpuri filtrate
 FilteredFieldsValues=Valoare pentru filtru
 FormatControlRule=Regula de control a formatelor
 ## imports updates
-KeysToUseForUpdates=Tastă (coloană) de utilizat pentru <b>actualizarea </b>datelor 
-NbInsert=Numărul liniilor inserate: %s
-NbUpdate=Numărul liniilor actualizate: %s
+KeysToUseForUpdates=Cheie (coloană) de utilizat pentru <b>actualizarea </b> datelor existente 
+NbInsert=Număr linii inserate: %s
+NbUpdate=Număr linii actualizate: %s
 MultipleRecordFoundWithTheseFilters=Au fost găsite mai multe înregistrări cu ajutorul acestor filtre: %s
 StocksWithBatch=Stocuri și locație (depozit) a produselor cu număr de lot/serie
diff --git a/htdocs/langs/ru_UA/salaries.lang b/htdocs/langs/ru_UA/salaries.lang
new file mode 100644
index 00000000000..c9bd3bec17b
--- /dev/null
+++ b/htdocs/langs/ru_UA/salaries.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - salaries
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
diff --git a/htdocs/langs/ru_UA/users.lang b/htdocs/langs/ru_UA/users.lang
new file mode 100644
index 00000000000..4a412122b08
--- /dev/null
+++ b/htdocs/langs/ru_UA/users.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - users
+NbOfUsers=No. of users
+NbOfPermissions=No. of permissions
diff --git a/htdocs/langs/ru_UA/website.lang b/htdocs/langs/ru_UA/website.lang
new file mode 100644
index 00000000000..910cff6b702
--- /dev/null
+++ b/htdocs/langs/ru_UA/website.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - website
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
diff --git a/htdocs/langs/sk_SK/deliveries.lang b/htdocs/langs/sk_SK/deliveries.lang
index bbbd23eb949..a9399816f13 100644
--- a/htdocs/langs/sk_SK/deliveries.lang
+++ b/htdocs/langs/sk_SK/deliveries.lang
@@ -27,5 +27,7 @@ Recipient=Príjemca
 ErrorStockIsNotEnough=There's not enough stock
 Shippable=Shippable
 NonShippable=Not Shippable
+ShowShippableStatus=Show shippable status
 ShowReceiving=Show delivery receipt
 NonExistentOrder=Nonexistent order
+StockQuantitiesAlreadyAllocatedOnPreviousLines = Stock quantities already allocated on previous lines
diff --git a/htdocs/langs/sk_SK/exports.lang b/htdocs/langs/sk_SK/exports.lang
index a9991f8c0fd..27c4c0f4a2d 100644
--- a/htdocs/langs/sk_SK/exports.lang
+++ b/htdocs/langs/sk_SK/exports.lang
@@ -53,7 +53,8 @@ TypeOfLineServiceOrProduct=Použitý typ linky (0 = produkt, 1 = služba)
 FileWithDataToImport=Súbor s dátami pre import
 FileToImport=Zdrojový súbor na import
 FileMustHaveOneOfFollowingFormat=File to import must have one of following formats
-DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
+DownloadEmptyExample=Download template file with field content information
+StarAreMandatory=* are mandatory fields
 ChooseFormatOfFileToImport=Choose the file format to use as import file format by clicking on the %s icon to select it...
 ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
 SourceFileFormat=Zdrojový súbor
diff --git a/htdocs/langs/sl_SI/deliveries.lang b/htdocs/langs/sl_SI/deliveries.lang
index 6c10f871fba..a2045ed2786 100644
--- a/htdocs/langs/sl_SI/deliveries.lang
+++ b/htdocs/langs/sl_SI/deliveries.lang
@@ -27,5 +27,7 @@ Recipient=Prejemnik
 ErrorStockIsNotEnough=Zaloga je premajhna
 Shippable=Možna odprema
 NonShippable=Ni možna odprema
+ShowShippableStatus=Show shippable status
 ShowReceiving=Show delivery receipt
 NonExistentOrder=Nonexistent order
+StockQuantitiesAlreadyAllocatedOnPreviousLines = Stock quantities already allocated on previous lines
diff --git a/htdocs/langs/sl_SI/exports.lang b/htdocs/langs/sl_SI/exports.lang
index e48218574d6..9b77df1cc21 100644
--- a/htdocs/langs/sl_SI/exports.lang
+++ b/htdocs/langs/sl_SI/exports.lang
@@ -53,7 +53,8 @@ TypeOfLineServiceOrProduct=Tip vrstice (0=proizvod, 1=storitev)
 FileWithDataToImport=Datoteka s podatki za uvoz
 FileToImport=Izvorna datoteka za uvoz
 FileMustHaveOneOfFollowingFormat=File to import must have one of following formats
-DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
+DownloadEmptyExample=Download template file with field content information
+StarAreMandatory=* are mandatory fields
 ChooseFormatOfFileToImport=Choose the file format to use as import file format by clicking on the %s icon to select it...
 ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
 SourceFileFormat=Format izvorne datoteke
diff --git a/htdocs/langs/sq_AL/deliveries.lang b/htdocs/langs/sq_AL/deliveries.lang
index 903710c110d..05b090f1123 100644
--- a/htdocs/langs/sq_AL/deliveries.lang
+++ b/htdocs/langs/sq_AL/deliveries.lang
@@ -27,5 +27,7 @@ Recipient=Recipient
 ErrorStockIsNotEnough=There's not enough stock
 Shippable=Shippable
 NonShippable=Not Shippable
+ShowShippableStatus=Show shippable status
 ShowReceiving=Show delivery receipt
 NonExistentOrder=Nonexistent order
+StockQuantitiesAlreadyAllocatedOnPreviousLines = Stock quantities already allocated on previous lines
diff --git a/htdocs/langs/sq_AL/exports.lang b/htdocs/langs/sq_AL/exports.lang
index a0eb7161ef2..cb652229825 100644
--- a/htdocs/langs/sq_AL/exports.lang
+++ b/htdocs/langs/sq_AL/exports.lang
@@ -53,7 +53,8 @@ TypeOfLineServiceOrProduct=Type of line (0=product, 1=service)
 FileWithDataToImport=File with data to import
 FileToImport=Source file to import
 FileMustHaveOneOfFollowingFormat=File to import must have one of following formats
-DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
+DownloadEmptyExample=Download template file with field content information
+StarAreMandatory=* are mandatory fields
 ChooseFormatOfFileToImport=Choose the file format to use as import file format by clicking on the %s icon to select it...
 ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
 SourceFileFormat=Source file format
diff --git a/htdocs/langs/sr_RS/deliveries.lang b/htdocs/langs/sr_RS/deliveries.lang
index 0ab45d43795..6590466b478 100644
--- a/htdocs/langs/sr_RS/deliveries.lang
+++ b/htdocs/langs/sr_RS/deliveries.lang
@@ -27,5 +27,7 @@ Recipient=Primalac
 ErrorStockIsNotEnough=Nema dovoljno zaliha
 Shippable=Isporučivo
 NonShippable=Nije isporučivo
+ShowShippableStatus=Show shippable status
 ShowReceiving=Show delivery receipt
 NonExistentOrder=Nonexistent order
+StockQuantitiesAlreadyAllocatedOnPreviousLines = Stock quantities already allocated on previous lines
diff --git a/htdocs/langs/sr_RS/exports.lang b/htdocs/langs/sr_RS/exports.lang
index 41f2f5ed861..6ad60fe9e52 100644
--- a/htdocs/langs/sr_RS/exports.lang
+++ b/htdocs/langs/sr_RS/exports.lang
@@ -53,7 +53,8 @@ TypeOfLineServiceOrProduct=Tip linije (0=proizvod, 1=usluga)
 FileWithDataToImport=Fajl sa podacima za import
 FileToImport=Izvorni fajl za import
 FileMustHaveOneOfFollowingFormat=File to import must have one of following formats
-DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
+DownloadEmptyExample=Download template file with field content information
+StarAreMandatory=* are mandatory fields
 ChooseFormatOfFileToImport=Choose the file format to use as import file format by clicking on the %s icon to select it...
 ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
 SourceFileFormat=Format izvornog fajla
diff --git a/htdocs/langs/sw_SW/deliveries.lang b/htdocs/langs/sw_SW/deliveries.lang
index 1f48c01de75..cd8a36e6c70 100644
--- a/htdocs/langs/sw_SW/deliveries.lang
+++ b/htdocs/langs/sw_SW/deliveries.lang
@@ -27,5 +27,7 @@ Recipient=Recipient
 ErrorStockIsNotEnough=There's not enough stock
 Shippable=Shippable
 NonShippable=Not Shippable
+ShowShippableStatus=Show shippable status
 ShowReceiving=Show delivery receipt
 NonExistentOrder=Nonexistent order
+StockQuantitiesAlreadyAllocatedOnPreviousLines = Stock quantities already allocated on previous lines
diff --git a/htdocs/langs/sw_SW/exports.lang b/htdocs/langs/sw_SW/exports.lang
index a0eb7161ef2..cb652229825 100644
--- a/htdocs/langs/sw_SW/exports.lang
+++ b/htdocs/langs/sw_SW/exports.lang
@@ -53,7 +53,8 @@ TypeOfLineServiceOrProduct=Type of line (0=product, 1=service)
 FileWithDataToImport=File with data to import
 FileToImport=Source file to import
 FileMustHaveOneOfFollowingFormat=File to import must have one of following formats
-DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
+DownloadEmptyExample=Download template file with field content information
+StarAreMandatory=* are mandatory fields
 ChooseFormatOfFileToImport=Choose the file format to use as import file format by clicking on the %s icon to select it...
 ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
 SourceFileFormat=Source file format
diff --git a/htdocs/langs/th_TH/deliveries.lang b/htdocs/langs/th_TH/deliveries.lang
index cac9f569166..84b94f406b3 100644
--- a/htdocs/langs/th_TH/deliveries.lang
+++ b/htdocs/langs/th_TH/deliveries.lang
@@ -27,5 +27,7 @@ Recipient=ผู้รับ
 ErrorStockIsNotEnough=มีไม่มากพอที่หุ้น
 Shippable=shippable
 NonShippable=ไม่ shippable
+ShowShippableStatus=Show shippable status
 ShowReceiving=Show delivery receipt
 NonExistentOrder=Nonexistent order
+StockQuantitiesAlreadyAllocatedOnPreviousLines = Stock quantities already allocated on previous lines
diff --git a/htdocs/langs/th_TH/exports.lang b/htdocs/langs/th_TH/exports.lang
index 4ec434b49a1..c378db35d2c 100644
--- a/htdocs/langs/th_TH/exports.lang
+++ b/htdocs/langs/th_TH/exports.lang
@@ -53,7 +53,8 @@ TypeOfLineServiceOrProduct=ประเภทของสาย (0 = ผลิ
 FileWithDataToImport=ไฟล์ที่มีข้อมูลที่จะนำเข้า
 FileToImport=แหล่งที่มาของไฟล์ที่จะนำเข้า
 FileMustHaveOneOfFollowingFormat=File to import must have one of following formats
-DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
+DownloadEmptyExample=Download template file with field content information
+StarAreMandatory=* are mandatory fields
 ChooseFormatOfFileToImport=Choose the file format to use as import file format by clicking on the %s icon to select it...
 ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
 SourceFileFormat=แหล่งที่มาของรูปแบบไฟล์
diff --git a/htdocs/langs/tr_TR/deliveries.lang b/htdocs/langs/tr_TR/deliveries.lang
index 9e7fe45cb1e..0bb2ba24e55 100644
--- a/htdocs/langs/tr_TR/deliveries.lang
+++ b/htdocs/langs/tr_TR/deliveries.lang
@@ -27,5 +27,7 @@ Recipient=Alıcı
 ErrorStockIsNotEnough=Yeterli stok yok
 Shippable=Sevkedilebilir
 NonShippable=Sevkedilemez
+ShowShippableStatus=Show shippable status
 ShowReceiving=Teslimat Fişini göster
 NonExistentOrder=Mevcut olmayan sipariş
+StockQuantitiesAlreadyAllocatedOnPreviousLines = Stock quantities already allocated on previous lines
diff --git a/htdocs/langs/tr_TR/exports.lang b/htdocs/langs/tr_TR/exports.lang
index a909d78355e..b57587b63a8 100644
--- a/htdocs/langs/tr_TR/exports.lang
+++ b/htdocs/langs/tr_TR/exports.lang
@@ -53,7 +53,8 @@ TypeOfLineServiceOrProduct=Satır türü (0 = ürün, 1 = hizmet)
 FileWithDataToImport=İçe aktarılacak verileri içeren dosya
 FileToImport=İçe aktarılacak kaynak dosya
 FileMustHaveOneOfFollowingFormat=İçe aktarılacak dosya aşağıdaki formatlardan biri olmalıdır
-DownloadEmptyExample=Şablon dosyasını alan içeriği bilgisiyle indir (* olanlar zorunlu alanlardır)
+DownloadEmptyExample=Download template file with field content information
+StarAreMandatory=* are mandatory fields
 ChooseFormatOfFileToImport=Kullanmak istediğiniz içe aktarma dosya biçimini, %s simgesine tıklayarak seçin...
 ChooseFileToImport=Dosyayı yükleyin ve daha sonra bu dosyayı kaynak içe aktarma dosyası olarak seçmek için %s simgesine tıklayın...
 SourceFileFormat=Kaynak dosya biçimi
diff --git a/htdocs/langs/uk_UA/deliveries.lang b/htdocs/langs/uk_UA/deliveries.lang
index e285559f004..590ee2a0dfe 100644
--- a/htdocs/langs/uk_UA/deliveries.lang
+++ b/htdocs/langs/uk_UA/deliveries.lang
@@ -27,5 +27,7 @@ Recipient=Recipient
 ErrorStockIsNotEnough=There's not enough stock
 Shippable=Shippable
 NonShippable=Not Shippable
+ShowShippableStatus=Show shippable status
 ShowReceiving=Show delivery receipt
 NonExistentOrder=Nonexistent order
+StockQuantitiesAlreadyAllocatedOnPreviousLines = Stock quantities already allocated on previous lines
diff --git a/htdocs/langs/uk_UA/exports.lang b/htdocs/langs/uk_UA/exports.lang
index e075edfbcbe..317badfbf30 100644
--- a/htdocs/langs/uk_UA/exports.lang
+++ b/htdocs/langs/uk_UA/exports.lang
@@ -53,7 +53,8 @@ TypeOfLineServiceOrProduct=Type of line (0=product, 1=service)
 FileWithDataToImport=File with data to import
 FileToImport=Source file to import
 FileMustHaveOneOfFollowingFormat=File to import must have one of following formats
-DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
+DownloadEmptyExample=Download template file with field content information
+StarAreMandatory=* are mandatory fields
 ChooseFormatOfFileToImport=Choose the file format to use as import file format by clicking on the %s icon to select it...
 ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
 SourceFileFormat=Source file format
diff --git a/htdocs/langs/vi_VN/deliveries.lang b/htdocs/langs/vi_VN/deliveries.lang
index 5156d289e9c..46fd7d5197d 100644
--- a/htdocs/langs/vi_VN/deliveries.lang
+++ b/htdocs/langs/vi_VN/deliveries.lang
@@ -27,5 +27,7 @@ Recipient=Người nhận
 ErrorStockIsNotEnough=Không có đủ tồn kho
 Shippable=Vận chuyển được
 NonShippable=Không vận chuyển được
+ShowShippableStatus=Show shippable status
 ShowReceiving=Hiển thị biên nhận giao hàng
 NonExistentOrder=Đơn hàng không tồn tại
+StockQuantitiesAlreadyAllocatedOnPreviousLines = Stock quantities already allocated on previous lines
diff --git a/htdocs/langs/vi_VN/exports.lang b/htdocs/langs/vi_VN/exports.lang
index f15be790dc6..2cdb1136e64 100644
--- a/htdocs/langs/vi_VN/exports.lang
+++ b/htdocs/langs/vi_VN/exports.lang
@@ -53,7 +53,8 @@ TypeOfLineServiceOrProduct=Loại dòng (0 = sản phẩm, dịch vụ = 1)
 FileWithDataToImport=Tập tin với dữ liệu để nhập
 FileToImport=Tập tin nguồn để nhập dữ liệu
 FileMustHaveOneOfFollowingFormat=Tệp để nhập phải có một trong các định dạng sau
-DownloadEmptyExample=Tải xuống tệp mẫu với thông tin nội dung trường (* là các trường bắt buộc)
+DownloadEmptyExample=Download template file with field content information
+StarAreMandatory=* are mandatory fields
 ChooseFormatOfFileToImport=Chọn định dạng tệp để sử dụng làm định dạng tệp nhập bằng cách nhấp vào biểu tượng %s để chọn ...
 ChooseFileToImport=Tải lên tệp sau đó nhấp vào biểu tượng %s để lựa chọn tệp là tệp nguồn nhập
 SourceFileFormat=Định dạng tệp nguồn
diff --git a/htdocs/langs/zh_CN/deliveries.lang b/htdocs/langs/zh_CN/deliveries.lang
index 38c9b4fc09e..af63b1c926c 100644
--- a/htdocs/langs/zh_CN/deliveries.lang
+++ b/htdocs/langs/zh_CN/deliveries.lang
@@ -27,5 +27,7 @@ Recipient=接收方
 ErrorStockIsNotEnough=库存不足
 Shippable=可运输
 NonShippable=不可运输
+ShowShippableStatus=Show shippable status
 ShowReceiving=显示送达回执
 NonExistentOrder=Nonexistent order
+StockQuantitiesAlreadyAllocatedOnPreviousLines = Stock quantities already allocated on previous lines
diff --git a/htdocs/langs/zh_CN/exports.lang b/htdocs/langs/zh_CN/exports.lang
index 11cfd2fcb7e..3836e3d001e 100644
--- a/htdocs/langs/zh_CN/exports.lang
+++ b/htdocs/langs/zh_CN/exports.lang
@@ -53,7 +53,8 @@ TypeOfLineServiceOrProduct=型号明细(0 =表示产品，1 =表示服务)
 FileWithDataToImport=与数据文件导入
 FileToImport=源文件导入
 FileMustHaveOneOfFollowingFormat=File to import must have one of following formats
-DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
+DownloadEmptyExample=Download template file with field content information
+StarAreMandatory=* are mandatory fields
 ChooseFormatOfFileToImport=Choose the file format to use as import file format by clicking on the %s icon to select it...
 ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
 SourceFileFormat=源文件格式
diff --git a/htdocs/langs/zh_HK/deliveries.lang b/htdocs/langs/zh_HK/deliveries.lang
index 1f48c01de75..cd8a36e6c70 100644
--- a/htdocs/langs/zh_HK/deliveries.lang
+++ b/htdocs/langs/zh_HK/deliveries.lang
@@ -27,5 +27,7 @@ Recipient=Recipient
 ErrorStockIsNotEnough=There's not enough stock
 Shippable=Shippable
 NonShippable=Not Shippable
+ShowShippableStatus=Show shippable status
 ShowReceiving=Show delivery receipt
 NonExistentOrder=Nonexistent order
+StockQuantitiesAlreadyAllocatedOnPreviousLines = Stock quantities already allocated on previous lines
diff --git a/htdocs/langs/zh_HK/exports.lang b/htdocs/langs/zh_HK/exports.lang
index a0eb7161ef2..cb652229825 100644
--- a/htdocs/langs/zh_HK/exports.lang
+++ b/htdocs/langs/zh_HK/exports.lang
@@ -53,7 +53,8 @@ TypeOfLineServiceOrProduct=Type of line (0=product, 1=service)
 FileWithDataToImport=File with data to import
 FileToImport=Source file to import
 FileMustHaveOneOfFollowingFormat=File to import must have one of following formats
-DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
+DownloadEmptyExample=Download template file with field content information
+StarAreMandatory=* are mandatory fields
 ChooseFormatOfFileToImport=Choose the file format to use as import file format by clicking on the %s icon to select it...
 ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
 SourceFileFormat=Source file format
diff --git a/htdocs/langs/zh_TW/admin.lang b/htdocs/langs/zh_TW/admin.lang
index d7d1e9d7cf5..365ca72b6e7 100644
--- a/htdocs/langs/zh_TW/admin.lang
+++ b/htdocs/langs/zh_TW/admin.lang
@@ -37,7 +37,7 @@ UnlockNewSessions=移除連線鎖定
 YourSession=您的程序
 Sessions=用戶程序
 WebUserGroup=網頁伺服器用戶/組別
-PermissionsOnFiles=Permissions on files
+PermissionsOnFiles=檔案權限
 PermissionsOnFilesInWebRoot=網站根目錄中檔案的權限
 PermissionsOnFile=檔案%s的權限
 NoSessionFound=您的PHP設定似乎不允許列出活動程序。用於保存程序的資料夾（ <b>%s</b> ）可能受到保護（例如，通過OS權限或PHP指令open_basedir）。
@@ -221,7 +221,7 @@ NotCompatible=此模組似乎不相容您 Dolibarr %s (適用最低版本 %s - 
 CompatibleAfterUpdate=此模組需要升級您的 Dolibarr %s (最低版本%s -最高版本 %s)。
 SeeInMarkerPlace=在市場可以看到
 SeeSetupOfModule=請參閱模組%s的設定
-SetOptionTo=Set option <b>%s</b> to %s
+SetOptionTo=將選項<b>%s</b>設定為%s
 Updated=升級
 AchatTelechargement=購買 / 下載
 GoModuleSetupArea=要部署/安裝新模組，請前往模組設定區域： <a href="%s">%s</a> 。
@@ -399,7 +399,7 @@ SecurityToken=安全的網址的金鑰
 NoSmsEngine=沒有可用的簡訊發送管理器.由於依賴於外部供應商,所以預設發布版本未安裝簡訊發送管理器，但是您可以在%s上找到它們。
 PDF=PDF格式
 PDFDesc=生成PDF 的全域選項
-PDFOtherDesc=PDF Option specific to some modules
+PDFOtherDesc=某些模組的特別PDF 選項
 PDFAddressForging=規則給地址的部分
 HideAnyVATInformationOnPDF=隱藏與銷售稅/營業稅相關的所有訊息
 PDFRulesForSalesTax=銷售稅 / 營業稅規則
@@ -648,13 +648,13 @@ Module2900Desc=GeoIP Maxmind轉換功能
 Module3200Name=不可改變的檔案
 Module3200Desc=啟用不可更改的商業事件日誌。事件是即時存檔的。日誌是可以匯出的鍊式事件的唯讀表格。在某些國家/地區，此模組可能是必需的。
 Module3400Name=社群網路
-Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
+Module3400Desc=啟用合作方與地址的社群網路欄位 (skype, twitter, facebook, ...).
 Module4000Name=人資
 Module4000Desc=人力資源管理(部門、員工合約及感受的管理)
 Module5000Name=多重公司
 Module5000Desc=允許您管理多重公司
-Module6000Name=Inter-modules Workflow
-Module6000Desc=Workflow management between different modules (automatic creation of object and/or automatic status change)
+Module6000Name=內部模組工作流程
+Module6000Desc=模組工作流管理（自動建立項目和/或自動更改狀態）
 Module10000Name=網站
 Module10000Desc=使用所見即所得編輯器建立網站（公共）。這是一個面向網站管理員或面向開發人員的CMS（最好了解HTML和CSS語言）。只需將您的Web伺服器（Apache，Nginx等）設定為指向專用的Dolibarr資料夾，即可使用您自己的網域名稱在Internet上連線。
 Module20000Name=休假申請管理
@@ -2102,8 +2102,8 @@ MakeAnonymousPing=對Dolibarr基金會服務器進行匿名Ping'+1'（僅在安
 FeatureNotAvailableWithReceptionModule=啟用接收模組後，此功能不可用
 EmailTemplate=電子郵件模板
 EMailsWillHaveMessageID=電子郵件將具有與此語法匹配的標籤“參考”
-PDF_SHOW_PROJECT=Show project on document
-ShowProjectLabel=Project Label
+PDF_SHOW_PROJECT=在文件中顯示專案
+ShowProjectLabel=專案標籤
 PDF_USE_ALSO_LANGUAGE_CODE=如果您要在生成同一的PDF中以兩種不同的語言複製一些文字，則必須在此處設置第二種語言讓生成的PDF在同一頁中包含兩種不同的語言，選擇的可以用來生成PDF跟另一種語言（只有少數PDF模板支援此功能)。PDF只有一種語言則留空。
 FafaIconSocialNetworksDesc=在此處輸入FontAwesome圖示的代碼。如果您不知道什麼是FontAwesome，則可以使用通用值fa-address-book。
 RssNote=注意：每個RSS feed定義都提供一個小部件，您必須啟用該小部件才能使其在儀表板中看到
@@ -2118,29 +2118,30 @@ SwitchThisForABetterSecurity=建議將此值變更為%s以提高安全性
 DictionaryProductNature= 產品性質
 CountryIfSpecificToOneCountry=國家（如果特定於給定國家）
 YouMayFindSecurityAdviceHere=您可以在這裡找到安全建議
-ModuleActivatedMayExposeInformation=This PHP extension may expose sensitive data. If you don't need it, disable it.
-ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+ModuleActivatedMayExposeInformation=這個 PHP外掛可能會暴露敏感資料。如果您不需要它，請關閉它。
+ModuleActivatedDoNotUseInProduction=為研發所設計的一個模組已經啟用。請不要在正式生產環境中使用。
 CombinationsSeparator=產品組合的分隔符號
 SeeLinkToOnlineDocumentation=有關範例，請參見選單上的線上文件連結。
 SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
 AskThisIDToYourBank=請聯絡您的銀行以獲取此ID
 AdvancedModeOnly=Permision available in Advanced permission mode only
 ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
-MailToSendEventOrganization=Event Organization
+MailToSendEventOrganization=事件組織
 AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
-YouShouldDisablePHPFunctions=You should disable PHP functions
+YouShouldDisablePHPFunctions=您應該停用 PHP 功能
 IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands in custom code, you shoud disable PHP functions
 PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
-NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
-RecommendedValueIs=Recommended: %s
-NotRecommended=Not recommanded
-ARestrictedPath=A restricted path
-CheckForModuleUpdate=Check for external modules updates
+NoWritableFilesFoundIntoRootDir=在您的根目錄中找不到一般程式可寫入的檔案或目錄（好）
+RecommendedValueIs=建議：%s
+NotRecommended=不建議
+ARestrictedPath=受限路徑
+CheckForModuleUpdate=檢查外部模組更新
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
-ModuleUpdateAvailable=An update is available
-NoExternalModuleWithUpdate=No updates found for external modules
+ModuleUpdateAvailable=有可用的更新
+NoExternalModuleWithUpdate=未找到外部模組的更新
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
 YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
-RandomlySelectedIfSeveral=Randomly selected if several pictures are available
-DatabasePasswordObfuscated=Database password is obfuscated in conf file
-DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
+RandomlySelectedIfSeveral=有多張圖片時隨機選擇
+DatabasePasswordObfuscated=資料庫密碼在conf檔案中為加密
+DatabasePasswordNotObfuscated=資料庫密碼在conf檔案中不是加密
+APIsAreNotEnabled=未啟用 API 模組
diff --git a/htdocs/langs/zh_TW/agenda.lang b/htdocs/langs/zh_TW/agenda.lang
index 9b4f589916b..0995ebd2ab4 100644
--- a/htdocs/langs/zh_TW/agenda.lang
+++ b/htdocs/langs/zh_TW/agenda.lang
@@ -4,7 +4,7 @@ Actions=事件
 Agenda=應辦事項
 TMenuAgenda=應辦事項
 Agendas=應辦事項
-LocalAgenda=Default calendar
+LocalAgenda=預設行事曆
 ActionsOwnedBy=事件承辦人
 ActionsOwnedByShort=承辦人
 AffectedTo=指定給
@@ -20,7 +20,7 @@ MenuToDoActions=全部未完成事件
 MenuDoneActions=全部已停止事件
 MenuToDoMyActions=我的未完成事件
 MenuDoneMyActions=我的已停止事件
-ListOfEvents=List of events (default calendar)
+ListOfEvents=事件清單(預設行事曆)
 ActionsAskedBy=誰的事件報表
 ActionsToDoBy=事件指定給
 ActionsDoneBy=由誰完成事件
@@ -38,7 +38,7 @@ ActionsEvents=Dolibarr 會在待辦事項中自動建立行動事件
 EventRemindersByEmailNotEnabled=電子郵件事件提醒未在%s模組設定中啟用。
 ##### Agenda event labels #####
 NewCompanyToDolibarr=合作方 %s 已建立
-COMPANY_MODIFYInDolibarr=Third party %s modified
+COMPANY_MODIFYInDolibarr= 合作方%s已變更
 COMPANY_DELETEInDolibarr=合作方%s已刪除
 ContractValidatedInDolibarr=合約 %s 已驗證
 CONTRACT_DELETEInDolibarr=合約%s已刪除
@@ -88,7 +88,7 @@ OrderDeleted=訂單已刪除
 InvoiceDeleted=發票已刪除
 DraftInvoiceDeleted=發票草稿已刪除
 CONTACT_CREATEInDolibarr=聯絡人%s已建立
-CONTACT_MODIFYInDolibarr=Contact %s modified
+CONTACT_MODIFYInDolibarr=聯絡人%s已變更
 CONTACT_DELETEInDolibarr=聯絡人%s已刪除
 PRODUCT_CREATEInDolibarr=產品 %s 已建立
 PRODUCT_MODIFYInDolibarr=產品 %s 已修改
@@ -121,7 +121,7 @@ MRP_MO_UNVALIDATEInDolibarr=MO已設定為草稿狀態
 MRP_MO_PRODUCEDInDolibarr=MO已生產
 MRP_MO_DELETEInDolibarr=MO已刪除
 MRP_MO_CANCELInDolibarr=MO已取消
-PAIDInDolibarr=%s paid
+PAIDInDolibarr=%s已付款
 ##### End agenda events #####
 AgendaModelModule=事件的文件範本
 DateActionStart=開始日期
@@ -133,7 +133,7 @@ AgendaUrlOptions4=<b>logint = %s</b>將限制輸出分配給用戶<b>%s</b> （
 AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> 將限制輸出為已連結專案操作 <b>PROJECT_ID</b>.
 AgendaUrlOptionsNotAutoEvent=<b>notactiontype = systemauto</b>排除自動事件。
 AgendaUrlOptionsIncludeHolidays=設定<b>includeholidays=1</b>以包括假期活動。
-AgendaShowBirthdayEvents=Birthdays of contacts
+AgendaShowBirthdayEvents=聯絡人生日
 AgendaHideBirthdayEvents=隱藏連絡人生日
 Busy=忙錄
 ExportDataset_event1=待辦行程事件清單
diff --git a/htdocs/langs/zh_TW/boxes.lang b/htdocs/langs/zh_TW/boxes.lang
index d093fea93e2..2d7399e21f9 100644
--- a/htdocs/langs/zh_TW/boxes.lang
+++ b/htdocs/langs/zh_TW/boxes.lang
@@ -18,13 +18,13 @@ BoxLastActions=最新活動
 BoxLastContracts=最新合約
 BoxLastContacts=最新通訊錄/地址
 BoxLastMembers=最新會員
-BoxLastModifiedMembers=Latest modified members
-BoxLastMembersSubscriptions=Latest member subscriptions
+BoxLastModifiedMembers=最新已修改會員
+BoxLastMembersSubscriptions=最新會員訂閱
 BoxFicheInter=最新干預
 BoxCurrentAccounts=開啟帳戶餘額
 BoxTitleMemberNextBirthdays=本月生日（會員）
-BoxTitleMembersByType=Members by type
-BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
+BoxTitleMembersByType=依類型會員
+BoxTitleMembersSubscriptionsByYear=依年份會員訂閱
 BoxTitleLastRssInfos=來自%s的最新%s筆消息
 BoxTitleLastProducts=產品/服務：最新%s筆已修改
 BoxTitleProductsAlertStock=產品：庫存警報
@@ -32,8 +32,8 @@ BoxTitleLastSuppliers=最新%s位已記錄供應商
 BoxTitleLastModifiedSuppliers=供應商：最新的%s位已修改
 BoxTitleLastModifiedCustomers=客戶：最新%s位已修改
 BoxTitleLastCustomersOrProspects=最新%s位客戶或潛在方
-BoxTitleLastCustomerBills=最近%s修改的客戶發票
-BoxTitleLastSupplierBills=最近%s修改的供應商發票
+BoxTitleLastCustomerBills=最新%s張已修改客戶發票
+BoxTitleLastSupplierBills=最新%s張已修改的供應商發票
 BoxTitleLastModifiedProspects=潛在方：最新%s位已修改
 BoxTitleLastModifiedMembers=最新%s位會員
 BoxTitleLastFicheInter=最新%s筆已修改干預措施
@@ -46,11 +46,11 @@ BoxMyLastBookmarks=書籤：最新%s筆
 BoxOldestExpiredServices=最舊的活動已過期服務
 BoxLastExpiredServices=具有活動已過期服務的最新%s位最早聯絡人
 BoxTitleLastActionsToDo=最新%s次動作
-BoxTitleLastContracts=Latest %s contracts which were modified
-BoxTitleLastModifiedDonations=Latest %s donations which were modified
-BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
-BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
-BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
+BoxTitleLastContracts=最新%s位聯絡人已修改
+BoxTitleLastModifiedDonations=最新%s筆捐款已修改
+BoxTitleLastModifiedExpenses=最新%s筆費用報表已修改
+BoxTitleLatestModifiedBoms=最新%s筆BOM已修改
+BoxTitleLatestModifiedMos=最新%s筆生產訂單已修改
 BoxTitleLastOutstandingBillReached=超過最大未償還額的客戶
 BoxGlobalActivity=全球活動(發票、提案/建議書、訂單)
 BoxGoodCustomers=好客戶
@@ -112,9 +112,9 @@ BoxTitleLastCustomerShipments=最新%s筆客戶發貨
 NoRecordedShipments=沒有已記錄的客戶發貨
 BoxCustomersOutstandingBillReached=達到最大客戶數
 # Pages
-UsersHome=Home users and groups
-MembersHome=Home Membership
-ThirdpartiesHome=Home Thirdparties
-TicketsHome=Home Tickets
-AccountancyHome=Home Accountancy
+UsersHome=使用者與群組首頁
+MembersHome=會員首頁
+ThirdpartiesHome=合作方首頁
+TicketsHome=服務單首頁
+AccountancyHome=會計首頁
 ValidatedProjects=已驗證的專案
diff --git a/htdocs/langs/zh_TW/cashdesk.lang b/htdocs/langs/zh_TW/cashdesk.lang
index 76a92cdbec5..62c009bf199 100644
--- a/htdocs/langs/zh_TW/cashdesk.lang
+++ b/htdocs/langs/zh_TW/cashdesk.lang
@@ -41,8 +41,8 @@ Floor=樓
 AddTable=新增表格
 Place=地點
 TakeposConnectorNecesary=需要“ TakePOS連接器”
-OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
-NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser:
+OrderPrinters=增加一個按鈕將訂單傳送到某些特定的印表機，無需付款（例如將訂單傳送到廚房）
+NotAvailableWithBrowserPrinter=當收據印表機設定為瀏覽器時不可用：
 SearchProduct=搜尋商品
 Receipt=收據
 Header=頁首
@@ -57,9 +57,9 @@ Paymentnumpad=輸入付款的便籤類型
 Numberspad=號碼便籤
 BillsCoinsPad=硬幣和紙幣便籤
 DolistorePosCategory=用於Dolibarr的TakePOS模組與其他POS解決方案
-TakeposNeedsCategories=TakePOS needs at least one product categorie to work
-TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS needs at least 1 product category under the category <b>%s</b> to work
-OrderNotes=Can add some notes to each ordered items
+TakeposNeedsCategories=TakePOS 需要至少一個產品類別才能正常使用
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS 需要在類別 <b> %s </b> 下至少有 1 個產品類別才能正常使用
+OrderNotes=可以為每個訂購的項目增加一些註解
 CashDeskBankAccountFor=用於付款的預設帳戶
 NoPaimementModesDefined=在 TakePOS 設定中未定義付款方式
 TicketVatGrouped=按銷售單中的費率合計營業稅
@@ -84,7 +84,7 @@ InvoiceIsAlreadyValidated=發票已通過驗證
 NoLinesToBill=無計費項目
 CustomReceipt=自訂收據
 ReceiptName=收據名稱
-ProductSupplements=Manage supplements of products
+ProductSupplements=管理產品的補充
 SupplementCategory=補充品類別
 ColorTheme=顏色主題
 Colorful=彩色
@@ -94,7 +94,7 @@ Browser=瀏覽器
 BrowserMethodDescription=簡易列印收據。僅需幾個參數即可設定收據。通過瀏覽器列印。
 TakeposConnectorMethodDescription=具有附加功能的外部模組。可以從雲端列印。
 PrintMethod=列印方式
-ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. The server hosting the application can't be in the Cloud (must be able to reach the printers in your network).
+ReceiptPrinterMethodDescription=具有大量參數的強大方法。完全可定制的模板。程式的伺服器不能位於雲端當中（必須能夠使用您網路中的印表機）。
 ByTerminal=依照站台
 TakeposNumpadUsePaymentIcon=在小鍵盤的付款按鈕上使用圖示而不是文字
 CashDeskRefNumberingModules=POS銷售編號模組
@@ -102,7 +102,7 @@ CashDeskGenericMaskCodes6 = <br> <b> {TN} </b>標籤用於增加站台
 TakeposGroupSameProduct=群組相同產品線
 StartAParallelSale=開啟新的平行銷售
 SaleStartedAt=銷售開始於%s
-ControlCashOpening=Open the "Control cash" popup when opening the POS
+ControlCashOpening=開啟POS時跳出"控制收銀"
 CloseCashFence=關閉收銀台控制
 CashReport=現金報告
 MainPrinterToUse=要使用的主印表機
@@ -126,5 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=必須先啟用收據印表機模組
 AllowDelayedPayment=允許延遲付款
 PrintPaymentMethodOnReceipts=在收據上列印付款方式
 WeighingScale=秤重
-ShowPriceHT = Display the column with the price excluding tax (on screen)
-ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
+ShowPriceHT = 顯示不包含稅金的欄位(在畫面中)
+ShowPriceHTOnReceipt = 顯示不包含稅金的欄位(在發票/收據中)
diff --git a/htdocs/langs/zh_TW/companies.lang b/htdocs/langs/zh_TW/companies.lang
index 53a11b64ace..4fa44fbc166 100644
--- a/htdocs/langs/zh_TW/companies.lang
+++ b/htdocs/langs/zh_TW/companies.lang
@@ -179,7 +179,7 @@ ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, old APE)
 ProfId4FR=Prof Id 4 (RCS/RM)
-ProfId5FR=Prof Id 5 (numéro EORI)
+ProfId5FR=專業ID5(歐盟增值稅號EORI)
 ProfId6FR=-
 ProfId1ShortFR=SIREN
 ProfId2ShortFR=SIRET
@@ -331,7 +331,7 @@ CustomerCodeDesc=客戶代碼,每個客戶都有一個號碼
 SupplierCodeDesc=供應商代碼，每個供應商都有一個號碼
 RequiredIfCustomer=若合作方屬於客戶或潛在方，則必需填入
 RequiredIfSupplier=若合作方是供應商，則必需填入
-ValidityControledByModule=Validity controlled by the module
+ValidityControledByModule=已確定由模組控制
 ThisIsModuleRules=此模組的規則
 ProspectToContact=需聯絡的潛在方
 CompanyDeleted=已從資料庫中刪除“%s”公司。
@@ -439,7 +439,7 @@ ListSuppliersShort=供應商清單
 ListProspectsShort=潛在方清單
 ListCustomersShort=客戶清單
 ThirdPartiesArea=合作方/通訊錄
-LastModifiedThirdParties=Latest %s Third Parties which were modified
+LastModifiedThirdParties=最新已修改合作方%s
 UniqueThirdParties=Total number of Third Parties
 InActivity=開放
 ActivityCeased=關閉
diff --git a/htdocs/langs/zh_TW/compta.lang b/htdocs/langs/zh_TW/compta.lang
index 7182e21ce6d..cde0f870a95 100644
--- a/htdocs/langs/zh_TW/compta.lang
+++ b/htdocs/langs/zh_TW/compta.lang
@@ -65,7 +65,7 @@ LT2SupplierIN=SGST購買品
 VATCollected=已收取營業稅
 StatusToPay=付款
 SpecialExpensesArea=所有特殊付款區域
-VATExpensesArea=Area for all TVA payments
+VATExpensesArea=TVA 付款區域
 SocialContribution=社會稅或財政稅
 SocialContributions=社會稅或財政稅
 SocialContributionsDeductibles=可抵扣的社會稅或財政稅
@@ -86,7 +86,7 @@ PaymentCustomerInvoice=客戶發票付款
 PaymentSupplierInvoice=供應商發票付款
 PaymentSocialContribution=社會/財政稅款付款
 PaymentVat=營業稅付款
-AutomaticCreationPayment=Automatically record the payment
+AutomaticCreationPayment=自動記錄付款
 ListPayment=付款清單
 ListOfCustomerPayments=客戶付款清單
 ListOfSupplierPayments=供應商付款清單
@@ -135,7 +135,7 @@ NewCheckReceipt=新折扣
 NewCheckDeposit=新的支票存款
 NewCheckDepositOn=建立帳戶存款收據：%s
 NoWaitingChecks=沒有支票等待存入。
-DateChequeReceived=Check receiving date
+DateChequeReceived=確認收到日期
 NbOfCheques=支票數量
 PaySocialContribution=支付社會/財政稅
 PayVAT=支付稅金申報
@@ -146,9 +146,9 @@ ConfirmPaySalary=您確定要將此薪資卡分類為已付款嗎？
 DeleteSocialContribution=刪除社會或財政稅金
 DeleteVAT=刪除稅金申報
 DeleteSalary=刪除薪資卡
-ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment ?
-ConfirmDeleteVAT=Are you sure you want to delete this VAT declaration ?
-ConfirmDeleteSalary=Are you sure you want to delete this salary?
+ConfirmDeleteSocialContribution=您確定要刪除此社會/財政稅款嗎？
+ConfirmDeleteVAT=您確定要刪除此增值稅申報單嗎？
+ConfirmDeleteSalary=您確定要刪除此薪資嗎？
 ExportDataset_tax_1=社會和財政稅金及繳稅
 CalcModeVATDebt=<b>%s承諾會計營業稅%s</b>模式.
 CalcModeVATEngagement=<b>%s收入-支出營業稅%s</b>模式.
@@ -250,7 +250,7 @@ ACCOUNTING_ACCOUNT_SUPPLIER=供應商合作方使用的會計科目
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=合作方卡上定義的專用會計科目將僅用於子帳會計。如果未定義第三方的專用供應商會計科目，則此科目將用於“總帳”，並作為“子帳”會計的預設值。
 ConfirmCloneTax=確認複製社會/財政稅
 ConfirmCloneVAT=確認複製稅金申報
-ConfirmCloneSalary=Confirm the clone of a salary
+ConfirmCloneSalary=確認複製薪資
 CloneTaxForNextMonth=為下個月複製此稅
 SimpleReport=簡易報告
 AddExtraReport=其他報告（增加外國和國家客戶報告）
@@ -269,7 +269,7 @@ AccountingAffectation=會計分配
 LastDayTaxIsRelatedTo=稅期的最後一天
 VATDue=要求營業稅
 ClaimedForThisPeriod=要求的期間
-PaidDuringThisPeriod=Paid for this period
+PaidDuringThisPeriod=本期支付
 PaidDuringThisPeriodDesc=This is the sum of all payments linked to VAT declarations which have an end-of-period date in the selected date range
 ByVatRate=依營業稅率
 TurnoverbyVatrate=依營業稅率開票的營業額
@@ -286,9 +286,9 @@ ReportPurchaseTurnover=已開票營業額
 ReportPurchaseTurnoverCollected=採購營業額
 IncludeVarpaysInResults = 在報告中包括各種付款
 IncludeLoansInResults = 在報告中包括貸款
-InvoiceLate30Days = Invoices late > 30 days
-InvoiceLate15Days = Invoices late > 15 days
-InvoiceLateMinus15Days = Invoices late
+InvoiceLate30Days = 發票延遲 > 30 天
+InvoiceLate15Days = 發票延遲 > 15 天
+InvoiceLateMinus15Days = 發票延遲
 InvoiceNotLate = To be collected < 15 days
 InvoiceNotLate15Days = To be collected in 15 days
 InvoiceNotLate30Days = To be collected in 30 days
diff --git a/htdocs/langs/zh_TW/deliveries.lang b/htdocs/langs/zh_TW/deliveries.lang
index 489be238c4e..6d6c7d15554 100644
--- a/htdocs/langs/zh_TW/deliveries.lang
+++ b/htdocs/langs/zh_TW/deliveries.lang
@@ -30,3 +30,4 @@ NonShippable=無法運送
 ShowShippableStatus=顯示可運送狀態
 ShowReceiving=顯示交貨單
 NonExistentOrder=不存在的訂單
+StockQuantitiesAlreadyAllocatedOnPreviousLines = 已在先前的行上分配庫存數量
diff --git a/htdocs/langs/zh_TW/errors.lang b/htdocs/langs/zh_TW/errors.lang
index 2b1162b14e3..2448ae31222 100644
--- a/htdocs/langs/zh_TW/errors.lang
+++ b/htdocs/langs/zh_TW/errors.lang
@@ -4,14 +4,14 @@
 NoErrorCommitIsDone=我們保證沒有錯誤
 # Errors
 ErrorButCommitIsDone=發現錯誤，但儘管如此我們仍進行驗證
-ErrorBadEMail=Email %s is incorrect
-ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
-ErrorBadUrl=Url %s is incorrect
+ErrorBadEMail=電子郵件 %s 不正確
+ErrorBadMXDomain=電子郵件 %s 似乎不正確（網域沒有有效的 MX 記錄）
+ErrorBadUrl=網址 %s 不正確
 ErrorBadValueForParamNotAString=您的參數值錯誤。一般在轉譯遺失時產生。
-ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
+ErrorRefAlreadyExists=參考<b>%s</b>已經存在。
 ErrorLoginAlreadyExists=登入者%s已經存在。
 ErrorGroupAlreadyExists=群組%s已經存在。
-ErrorEmailAlreadyExists=Email %s already exists.
+ErrorEmailAlreadyExists=電子郵件 %s 已存在。
 ErrorRecordNotFound=記錄沒有找到。
 ErrorFailToCopyFile=無法將檔案'<b>%s</b>'複製到'<b>%s</b>'
 ErrorFailToCopyDir=無法將資料夾'<b>%s</b>' 複製到'<b>%s</b>'.
@@ -39,7 +39,7 @@ ErrorBadSupplierCodeSyntax=供應商代碼語法錯誤
 ErrorSupplierCodeRequired=需要供應商代碼
 ErrorSupplierCodeAlreadyUsed=供應商代碼已使用
 ErrorBadParameters=錯誤的參數
-ErrorWrongParameters=Wrong or missing parameters
+ErrorWrongParameters=錯誤或缺少參數
 ErrorBadValueForParameter=參數"%s"中的錯誤值 "%s'"
 ErrorBadImageFormat=圖片檔案格式不支援（您的PHP不支援轉換此格式圖片）
 ErrorBadDateFormat="%s"日期格式錯誤
@@ -47,11 +47,11 @@ ErrorWrongDate=日期不正確！
 ErrorFailedToWriteInDir=無法寫入資料夾%s
 ErrorFoundBadEmailInFile=找到電子郵件文件中的%s行語法不正確（例如電子郵件%s行 =%s）
 ErrorUserCannotBeDelete=無法刪除用戶。也許它與Dolibarr實體相關。
-ErrorFieldsRequired=Some required fields have been left blank.
-ErrorSubjectIsRequired=The email subject is required
+ErrorFieldsRequired=一些必填欄位已留空。
+ErrorSubjectIsRequired=電子郵件主題為必填
 ErrorFailedToCreateDir=無法建立資料夾。檢查網頁伺服器中的用戶有權限寫入Dolibarr檔案資料夾。如果PHP使用了參數<b>safe_mode</b>，檢查網頁伺服器的用戶（或群組）擁有Dolibarr php檔案。
 ErrorNoMailDefinedForThisUser=沒有此用戶的定義郵件
-ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
+ErrorSetupOfEmailsNotComplete=電子郵件設定未完成
 ErrorFeatureNeedJavascript=此功能需要啟動Javascript。需要變更請前往設定 - 顯示。
 ErrorTopMenuMustHaveAParentWithId0=一個類型'頂部'選單不能有一個母選單。在母選單填入0或選擇一個類型為'左'的選單。
 ErrorLeftMenuMustHaveAParentId=一個類型為'左'的選單必須有一個母選單的ID。
@@ -60,7 +60,7 @@ ErrorDirNotFound=未找到資料夾<b>%s</b>（錯誤的路徑，錯誤的權限
 ErrorFunctionNotAvailableInPHP=此功能需要函數<b>%s</b>，但是無法在此PHP版本中使用。
 ErrorDirAlreadyExists=具有此名稱的資料夾已經存在。
 ErrorFileAlreadyExists=具有此名稱的檔案已經存在。
-ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exists.
+ErrorDestinationAlreadyExists=檔案名稱<b>%s</b>已存在
 ErrorPartialFile=伺服器未完整的收到檔案。
 ErrorNoTmpDir=臨時指示%s不存在。
 ErrorUploadBlockedByAddon=PHP / Apache的插件已阻擋上傳。
@@ -80,7 +80,7 @@ ErrorExportDuplicateProfil=此匯出設定已存在此設定檔案名稱。
 ErrorLDAPSetupNotComplete=Dolibarr與LDAP的匹配不完整。
 ErrorLDAPMakeManualTest=.ldif檔案已在資料夾%s中.請以命令行手動讀取以得到更多的錯誤信息。
 ErrorCantSaveADoneUserWithZeroPercentage=如果填寫了“完成者”欄位，則無法使用“狀態未開始”保存操作。
-ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
+ErrorRefAlreadyExists=參考<b>%s</b>已經存在。
 ErrorPleaseTypeBankTransactionReportName=請輸入必須在報告條目中的銀行對帳單名稱（格式YYYYMM或YYYYMMDD）
 ErrorRecordHasChildren=因為有子記錄所以刪除失敗。
 ErrorRecordHasAtLeastOneChildOfType=項目至少有一個子類別%s
@@ -118,7 +118,7 @@ ErrorCantReadFile=無法讀取檔案'%s'
 ErrorCantReadDir=無法讀取資料夾'%s'
 ErrorBadLoginPassword=錯誤的帳號或密碼
 ErrorLoginDisabled=您的帳戶已被停用
-ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server user. Check also the command is not protected on shell level by a security layer like apparmor.
+ErrorFailedToRunExternalCommand=無法執行外部命令。檢查它是可用並且可執行在PHP的伺服器上。同樣地請確認此命令在Shell層級中不被如apparmor的安全層級保護。
 ErrorFailedToChangePassword=無法更改密碼
 ErrorLoginDoesNotExists=找不到登入名稱<b>%s</b>的用戶。
 ErrorLoginHasNoEmail=這位用戶沒有電子郵件地址。程序中止。
@@ -141,8 +141,8 @@ ErrorNewValueCantMatchOldValue=新值不能等於舊值
 ErrorFailedToValidatePasswordReset=重置密碼失敗。可能是重新初始化已經完成（此連結只能使用一次）。如果不是，請嘗試再重置密碼一次。
 ErrorToConnectToMysqlCheckInstance=連結資料庫失敗。檢查資料庫伺服器是否正在執行（例如mysql / mariadb，您可以使用“ sudo service mysql start”命令行啟動它）。
 ErrorFailedToAddContact=新增聯絡人失敗
-ErrorDateMustBeBeforeToday=The date must be lower than today
-ErrorDateMustBeInFuture=The date must be greater than today
+ErrorDateMustBeBeforeToday=日期必須早於今天
+ErrorDateMustBeInFuture=日期必須晚於今天
 ErrorPaymentModeDefinedToWithoutSetup=付款方式已設定為%s類型，但模組“發票”尚未完整定義要為此付款方式顯示的資訊設定。
 ErrorPHPNeedModule=錯誤，您的PHP必須安裝模組<b>%s</b>才能使用此功能。
 ErrorOpenIDSetupNotComplete=您設定了Dolibarr設定檔案以允許OpenID身份驗證，但未將OpenID的服務網址定義為常數%s
@@ -221,15 +221,15 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=您必須選擇商品是否為預
 ErrorDiscountLargerThanRemainToPaySplitItBefore=您嘗試使用的折扣大於剩餘的折扣。將之前的折扣分成2個較小的折扣。
 ErrorFileNotFoundWithSharedLink=找不到檔案。可能是共享金鑰最近被修改或檔案被刪除了。
 ErrorProductBarCodeAlreadyExists=產品條碼%s已存在於另一個產品參考上。
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=請注意使用Kit時，如果一個子產品(或子產品的子產品)需要序號/批號時，無法自動增加/減少子產品。
 ErrorDescRequiredForFreeProductLines=對於帶有免費產品的行，必須進行描述說明
 ErrorAPageWithThisNameOrAliasAlreadyExists=此頁面/容器<strong>%s</strong>與您嘗試使用的名稱/別名相同
 ErrorDuringChartLoad=載入會計科目表時出錯。如果幾個帳戶沒有被載入，您仍然可以手動輸入。
 ErrorBadSyntaxForParamKeyForContent=參數keyforcontent的語法錯誤。必須具有以%s或%s開頭的值
 ErrorVariableKeyForContentMustBeSet=錯誤，必須設定名稱為%s（帶有文字內容）或%s（帶有外部網址）的常數。
-ErrorURLMustEndWith=URL %s must end %s
+ErrorURLMustEndWith=網址 %s 必須以 %s 結尾
 ErrorURLMustStartWithHttp=網址 %s 必須以 http://或https://開始
-ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
+ErrorHostMustNotStartWithHttp=主機名稱 %s 不能以 http:// 或 https:// 開頭
 ErrorNewRefIsAlreadyUsed=錯誤，新參考已被使用
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=錯誤，無法刪除連結到已關閉發票的付款。
 ErrorSearchCriteriaTooSmall=搜尋條件太小。
@@ -247,23 +247,23 @@ ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=倉庫“ %s”中產品“
 ErrorOnlyOneFieldForGroupByIsPossible=“群組依據”只能使用1個欄位（其他欄位則被丟棄）
 ErrorTooManyDifferentValueForSelectedGroupBy=為欄位“ <b> %s </b>”發現了太多不同的值（多於<b> %s </b>），因此我們不能將其用作“分組依據”。 “分組依據”欄位已刪除。也許您想將其用作X軸？
 ErrorReplaceStringEmpty=錯誤，要替換的字串為空
-ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
-ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
-ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
-ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<b> to allow use of Command Line Interface by the internal job scheduler
-ErrorLoginDateValidity=Error, this login is outside the validity date range
-ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
-ErrorReservedKeyword=The word '<b>%s</b>' is a reserved keyword
-ErrorNotAvailableWithThisDistribution=Not available with this distribution
+ErrorProductNeedBatchNumber=錯誤，產品“<b> %s </b>”需要批號/序號
+ErrorProductDoesNotNeedBatchNumber=錯誤，產品“<b> %s </b>”不接受批號/序號
+ErrorFailedToReadObject=錯誤，無法讀取 <b> %s </b> 類型的項目
+ErrorParameterMustBeEnabledToAllwoThisFeature=錯誤，必須在<b>  conf/conf.php <b> 中啟用參數<b>%s</b>以允許內部命令列工作排程界面使用
+ErrorLoginDateValidity=錯誤，此登錄超過有效日期範圍
+ErrorValueLength=欄位“<b> %s </b>”的長度必須大於“<b> %s</b>"
+ErrorReservedKeyword=單詞“<b> %s </b>”是保留關鍵字
+ErrorNotAvailableWithThisDistribution=不適用於此發行版本
 ErrorPublicInterfaceNotEnabled=未啟用公共界面
-ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
-ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
-ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
-ErrorDateIsInFuture=Error, the date can't be in the future
-ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
-ErrorAPercentIsRequired=Error, please fill in the percentage correctly
-ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
-ErrorFailedToFindEmailTemplate=Failed to find template with code name %s
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=如果將新頁面設定為其他頁面的翻譯，則必須定義新頁面的語言
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=如果新頁面的語言為另一頁面的翻譯，則該語言不得為來源語言
+ErrorAParameterIsRequiredForThisOperation=此操作必須有一個參數
+ErrorDateIsInFuture=錯誤，日期不能是未來
+ErrorAnAmountWithoutTaxIsRequired=錯誤，金額為必填項目
+ErrorAPercentIsRequired=錯誤，請正確填寫百分比
+ErrorYouMustFirstSetupYourChartOfAccount=您必須先設定會計項目表
+ErrorFailedToFindEmailTemplate=無法找到代號為 %s 的模板
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=您的PHP參數upload_max_filesize（%s）高於PHP參數post_max_size（%s）。這不是相同的設定。
@@ -289,15 +289,15 @@ WarningYourLoginWasModifiedPleaseLogin=您的登入名稱已修改。為了安
 WarningAnEntryAlreadyExistForTransKey=此語言的翻譯密鑰條目已存在
 WarningNumberOfRecipientIsRestrictedInMassAction=警告，在清單上使用批次操作時，其他收件人的數量限制為<b>%s</b>
 WarningDateOfLineMustBeInExpenseReportRange=警告，行的日期不在費用報告的範圍內
-WarningProjectDraft=Project is still in draft mode. Don't forget to validate it if you plan to use tasks.
+WarningProjectDraft=專案仍處於草案模式。如果您計劃使用任務，請不要忘記驗證它。
 WarningProjectClosed=專案已關閉。您必須先重新打開它。
 WarningSomeBankTransactionByChequeWereRemovedAfter=在產生包括它們的收據之後，一些銀行交易將被刪除。因此支票的數量和收據的數量可能與清單中的數量和總數有所不同。
-WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into ECM database index table
-WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
-WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
-WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
-WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
-ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
-ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
-CheckVersionFail=Version check fail
-ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
+WarningFailedToAddFileIntoDatabaseIndex=警告，無法將檔案條目增加到 ECM 資料庫索引表中
+WarningTheHiddenOptionIsOn=警告，隱藏選項 <b> %s </b> 已開啟。
+WarningCreateSubAccounts=警告，您不能直接建立子帳戶，您必須建立合作方或用戶並為其分配會計代碼才能在此清單中找到它們
+WarningAvailableOnlyForHTTPSServers=僅在使用 HTTPS 安全連線時可用。
+WarningModuleXDisabledSoYouMayMissEventHere=模組 %s 尚未啟用。所以你可能會在這裡錯過很多事件。
+ErrorActionCommPropertyUserowneridNotDefined=需要用戶的擁有者
+ErrorActionCommBadType=選擇的事件類型（id：%n，代碼：%s）在事件類型分類中不存在
+CheckVersionFail=版本檢查失敗
+ErrorWrongFileName=檔案名稱中不可以有__SOMETHING__
diff --git a/htdocs/langs/zh_TW/eventorganization.lang b/htdocs/langs/zh_TW/eventorganization.lang
index 7db22c3484a..603424ac9b2 100644
--- a/htdocs/langs/zh_TW/eventorganization.lang
+++ b/htdocs/langs/zh_TW/eventorganization.lang
@@ -17,8 +17,8 @@
 #
 # Generic
 #
-ModuleEventOrganizationName = Event Organization
-EventOrganizationDescription = Event Organization through Module Project
+ModuleEventOrganizationName = 事件組織
+EventOrganizationDescription = 使用專案模組組織事件
 EventOrganizationDescriptionLong= Manage Event organization for conference, attendees, speaker, and attendees, with public subcription page
 #
 # Menu
@@ -31,7 +31,7 @@ EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
 #
 EventOrganizationSetup = Event Organization setup
 Settings = 設定
-EventOrganizationSetupPage = Event Organization setup page
+EventOrganizationSetupPage = 事件組織設定頁面
 EVENTORGANIZATION_TASK_LABEL = Label of tasks to create automatically when project is validated
 EVENTORGANIZATION_TASK_LABELTooltip = When you validate an organized event, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conference<br>Send Call for Booth<br>Receive call for conferences<br>Receive call for Booth<br>Open subscriptions to events for attendees<br>Send remind of event to speakers<br>Send remind of event to Booth hoster<br>Send remind of event to attendees
 EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties automatically created when someone suggests a conference
diff --git a/htdocs/langs/zh_TW/exports.lang b/htdocs/langs/zh_TW/exports.lang
index 721e44dfde2..13c3a18d0de 100644
--- a/htdocs/langs/zh_TW/exports.lang
+++ b/htdocs/langs/zh_TW/exports.lang
@@ -53,7 +53,8 @@ TypeOfLineServiceOrProduct=類型（0 =產品，1 =服務）
 FileWithDataToImport=匯入有資料的檔案
 FileToImport=欲匯入的來源檔案
 FileMustHaveOneOfFollowingFormat=要匯入的檔案必須是以下格式
-DownloadEmptyExample=下載帶有欄位內容資料的範本檔案（*為必填欄位）
+DownloadEmptyExample=Download template file with field content information
+StarAreMandatory=* are mandatory fields
 ChooseFormatOfFileToImport=通過點選%s圖示選擇要匯入的檔案格式...
 ChooseFileToImport=上傳檔案，然後點擊%s圖示以選擇要匯入的檔案...
 SourceFileFormat=來源檔案格式
diff --git a/htdocs/langs/zh_TW/holiday.lang b/htdocs/langs/zh_TW/holiday.lang
index 72b939ec843..2fcd554e4f3 100644
--- a/htdocs/langs/zh_TW/holiday.lang
+++ b/htdocs/langs/zh_TW/holiday.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - holiday
-HRM=人資
+HRM=人力資源
 Holidays=休假
 CPTitreMenu=休假
 MenuReportMonth=月結單
@@ -13,7 +13,7 @@ ToReviewCP=等待批准
 ApprovedCP=已批准
 CancelCP=已取消
 RefuseCP=已拒絕
-ValidatorCP=批准人
+ValidatorCP=Approver
 ListeCP=休假清單
 Leave=休假申請
 LeaveId=休假編號
@@ -39,11 +39,11 @@ TitreRequestCP=休假申請
 TypeOfLeaveId=休假ID類型
 TypeOfLeaveCode=休假代碼類型
 TypeOfLeaveLabel=休假標籤類型
-NbUseDaysCP=已休假天數
-NbUseDaysCPHelp=此計算考慮了字典中定義的非工作日和假期。
-NbUseDaysCPShort=已休假天數
-NbUseDaysCPShortInMonth=已休假天數(月)
-DayIsANonWorkingDay=%s是非工作日
+NbUseDaysCP=Number of days of leave used
+NbUseDaysCPHelp=The calculation takes into account the non-working days and the holidays defined in the dictionary.
+NbUseDaysCPShort=Days of leave
+NbUseDaysCPShortInMonth=Days of leave in month
+DayIsANonWorkingDay=%s is a non-working day
 DateStartInMonth=開始日期（月份）
 DateEndInMonth=結束日期（月份）
 EditCP=編輯
@@ -55,7 +55,7 @@ TitleDeleteCP=刪除休假申請
 ConfirmDeleteCP=確認刪除此休假申請嗎？
 ErrorCantDeleteCP=錯誤，您無權刪除此休假申請。
 CantCreateCP=您無權提出休假申請。
-InvalidValidatorCP=您必須為休假申請選擇批准人。
+InvalidValidatorCP=You must choose the approver for your leave request.
 NoDateDebut=您必須選擇開始日期。
 NoDateFin=您必須選擇結束日期。
 ErrorDureeCP=您的休假申請不包含工作日。
@@ -80,14 +80,14 @@ UserCP=用戶
 ErrorAddEventToUserCP=增加特殊假期時發生錯誤。
 AddEventToUserOkCP=特別假期的增加已經完成。
 MenuLogCP=檢視變更日誌
-LogCP=可用假期更新日誌
-ActionByCP=執行者
-UserUpdateCP=對於用戶
+LogCP=Log of all updates made to "Balance of Leave"
+ActionByCP=更新者
+UserUpdateCP=Updated for
 PrevSoldeCP=剩餘假期
 NewSoldeCP=新剩餘假期
 alreadyCPexist=在此期間之休假申請已完成。
-FirstDayOfHoliday=假期的第一天
-LastDayOfHoliday=假期的最後一天
+FirstDayOfHoliday=Beginning day of leave request
+LastDayOfHoliday=Ending day of leave request
 BoxTitleLastLeaveRequests=最新%s筆已修改的休假申請
 HolidaysMonthlyUpdate=每月更新
 ManualUpdate=手動更新
@@ -99,13 +99,13 @@ LastHolidays=最新%s的休假申請
 AllHolidays=所有休假申請
 HalfDay=半天
 NotTheAssignedApprover=您不是分配的批准人
-LEAVE_PAID=帶薪休假
+LEAVE_PAID=年假
 LEAVE_SICK=病假
-LEAVE_OTHER=其他休假
-LEAVE_PAID_FR=帶薪休假
+LEAVE_OTHER=事假
+LEAVE_PAID_FR=年假
 ## Configuration du Module ##
-LastUpdateCP=假期分配的最新自動更新
-MonthOfLastMonthlyUpdate=假期分配的最新自動月更新
+LastUpdateCP=Last automatic update of leave allocation
+MonthOfLastMonthlyUpdate=Month of last automatic update of leave allocation
 UpdateConfCPOK=已更新成功。
 Module27130Name= 休假管理
 Module27130Desc= 休假管理
@@ -125,10 +125,10 @@ HolidaysCanceledBody=您從%s到%s的休假申請已被取消。
 FollowedByACounter=1：這種類型的休假需有計數器追蹤。計數器手動或自動遞增，並且當休假申請通過驗證後，計數器遞減。 <br> 0：沒有被計數器追蹤。
 NoLeaveWithCounterDefined=沒有休假類型被定義成需要被計數器追蹤
 GoIntoDictionaryHolidayTypes=前往<strong>首頁-設定-字典-休假類型</strong>以設定不同類型的休假。
-HolidaySetup=假期模組的設定
-HolidaysNumberingModules=休假申請編號模型
+HolidaySetup=Setup of module Leave
+HolidaysNumberingModules=Numbering models for leave requests
 TemplatePDFHolidays=休假PDF範本
-FreeLegalTextOnHolidays=PDF上的自由正文
-WatermarkOnDraftHolidayCards=休假申請草案上的水印
+FreeLegalTextOnHolidays=PDF上的自由文字
+WatermarkOnDraftHolidayCards=休假申請草案上的浮水印
 HolidaysToApprove=可批准假期
 NobodyHasPermissionToValidateHolidays=沒有人有權限驗證假期
diff --git a/htdocs/langs/zh_TW/hrm.lang b/htdocs/langs/zh_TW/hrm.lang
index 240980f71d7..9a981ea4d89 100644
--- a/htdocs/langs/zh_TW/hrm.lang
+++ b/htdocs/langs/zh_TW/hrm.lang
@@ -9,7 +9,7 @@ ConfirmDeleteEstablishment=您確定要刪除此營業所嗎？
 OpenEtablishment=開啟營業所
 CloseEtablishment=關閉營業所
 # Dictionary
-DictionaryPublicHolidays=Leave - Public holidays
+DictionaryPublicHolidays=休假 - 公共假期
 DictionaryDepartment=HRM-部門清單
 DictionaryFunction=人力資源管理-職位
 # Module
diff --git a/htdocs/langs/zh_TW/languages.lang b/htdocs/langs/zh_TW/languages.lang
index e8199dc4fd9..bd3940ba997 100644
--- a/htdocs/langs/zh_TW/languages.lang
+++ b/htdocs/langs/zh_TW/languages.lang
@@ -3,7 +3,8 @@ Language_am_ET=衣索比亞
 Language_ar_AR=阿拉伯語
 Language_ar_EG=阿拉伯語（埃及）
 Language_ar_SA=阿拉伯語
-Language_ar_TN=Arabic (Tunisia)
+Language_ar_TN=阿拉伯語（突尼斯）
+Language_ar_IQ=阿拉伯語（伊拉克）
 Language_az_AZ=亞塞拜然
 Language_bn_BD=孟加拉語
 Language_bn_IN=孟加拉語（印度）
@@ -83,9 +84,10 @@ Language_ne_NP=尼泊爾語
 Language_nl_BE=荷蘭語（比利時）
 Language_nl_NL=荷蘭人
 Language_pl_PL=波蘭語
+Language_pt_AO=葡萄牙語（安哥拉）
 Language_pt_BR=葡萄牙語（巴西）
 Language_pt_PT=葡萄牙語
-Language_ro_MD=Romanian (Moldavia)
+Language_ro_MD=羅馬尼亞語（摩爾達維亞）
 Language_ro_RO=羅馬尼亞語
 Language_ru_RU=俄語
 Language_ru_UA=俄語（烏克蘭）
diff --git a/htdocs/langs/zh_TW/main.lang b/htdocs/langs/zh_TW/main.lang
index 911e650e96a..68196c1bc0c 100644
--- a/htdocs/langs/zh_TW/main.lang
+++ b/htdocs/langs/zh_TW/main.lang
@@ -180,7 +180,7 @@ SaveAndNew=儲存並新增
 TestConnection=測試連線
 ToClone=複製
 ConfirmCloneAsk=您確定要複製物件 <b>%s</b>?
-ConfirmClone=Choose the data you want to clone:
+ConfirmClone=選擇要複製的資料：
 NoCloneOptionsSpecified=沒有已定義要複製的資料。
 Of=的
 Go=前往
@@ -246,7 +246,7 @@ DefaultModel=預設文件範本
 Action=事件
 About=關於
 Number=數量
-NumberByMonth=Total reports by month
+NumberByMonth=每月報告總數
 AmountByMonth=每月金額
 Numero=數量
 Limit=限制
@@ -278,7 +278,7 @@ DateModificationShort=修改日
 IPModification=修改IP
 DateLastModification=最新修改日期
 DateValidation=驗證日期
-DateSigning=Signing date
+DateSigning=簽名日期
 DateClosing=關閉日期
 DateDue=截止日期
 DateValue=值的日期
@@ -341,8 +341,8 @@ KiloBytes=KB
 MegaBytes=MB
 GigaBytes=GB
 TeraBytes=TB
-UserAuthor=Ceated by
-UserModif=Updated by
+UserAuthor=建立者
+UserModif=更新者
 b=b.
 Kb=Kb
 Mb=Mb
@@ -362,7 +362,7 @@ UnitPriceHTCurrency=單價（不含）（貨幣）
 UnitPriceTTC=單位價格
 PriceU=單價
 PriceUHT=單價(淨)
-PriceUHTCurrency=U.P (net) (currency)
+PriceUHTCurrency=U.P（淨值）（貨幣）
 PriceUTTC=單價(含稅)
 Amount=金額
 AmountInvoice=發票金額
@@ -390,8 +390,8 @@ AmountTotal=總金額
 AmountAverage=平均金額
 PriceQtyMinHT=最小數量價格（不含稅）
 PriceQtyMinHTCurrency=最小數量價格（不含稅）（貨幣）
-PercentOfOriginalObject=Percent of original object
-AmountOrPercent=Amount or percent
+PercentOfOriginalObject=原始項目的百分比
+AmountOrPercent=金額或百分比
 Percentage=百分比
 Total=總計
 SubTotal=小計
@@ -430,7 +430,7 @@ LT1IN=CGST
 LT2IN=SGST
 LT1GC=附加美分
 VATRate=稅率
-RateOfTaxN=Rate of tax %s
+RateOfTaxN=稅率%s
 VATCode=稅率代碼
 VATNPR=NPR 稅率
 DefaultTaxRate=預設稅率
@@ -730,8 +730,8 @@ MenuMembers=會員
 MenuAgendaGoogle=Google 行事曆
 MenuTaxesAndSpecialExpenses=稅金|特別費用
 ThisLimitIsDefinedInSetup=Dolibarr 的限制（選單 首頁 - 設定 - 安全）： %s Kb, PHP的限制：%s Kb
-ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
-NoFileFound=No documents uploaded
+ThisLimitIsDefinedInSetupAt=Dolibarr限制 (選單%s): %s Kb, PHP限制(參數 %s): %s Kb
+NoFileFound=沒有上傳文件
 CurrentUserLanguage=目前語言
 CurrentTheme=目前主題
 CurrentMenuManager=目前選單管理器
@@ -847,7 +847,7 @@ XMoreLines=%s 行(數)被隱藏
 ShowMoreLines=顯示更多/更少行數
 PublicUrl=公開網址
 AddBox=增加盒子
-SelectElementAndClick=Select an element and click on %s
+SelectElementAndClick=選擇一個元件並且點選%s
 PrintFile=列印檔案 %s
 ShowTransaction=在銀行帳戶中顯示交易
 ShowIntervention=顯示干預
@@ -858,8 +858,8 @@ Denied=已拒絕
 ListOf=%s 清單
 ListOfTemplates=範本清單
 Gender=性別
-Genderman=Male
-Genderwoman=Female
+Genderman=男性
+Genderwoman=女性
 Genderother=其他
 ViewList=檢視清單
 ViewGantt=甘特圖
@@ -906,10 +906,10 @@ ViewAccountList=檢視總帳
 ViewSubAccountList=檢視子帳戶總帳
 RemoveString=移除字串‘%s’
 SomeTranslationAreUncomplete=提供的某些語言可能僅被部分翻譯，或者可能包含錯誤。請通過註冊<a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>來進行改進，以幫助修正您的語言。
-DirectDownloadLink=Public download link
-PublicDownloadLinkDesc=Only the link is required to download the file
-DirectDownloadInternalLink=Private download link
-PrivateDownloadLinkDesc=You need to be logged and you need permissions to view or download the file
+DirectDownloadLink=公共下載連結
+PublicDownloadLinkDesc=只需要連結即可下載檔案
+DirectDownloadInternalLink=私人下載連結
+PrivateDownloadLinkDesc=您需要登錄，並且需要有查看或下載檔案的權限
 Download=下載
 DownloadDocument=下載文件
 ActualizeCurrency=更新匯率
@@ -1022,7 +1022,7 @@ SearchIntoContacts=通訊錄
 SearchIntoMembers=會員
 SearchIntoUsers=用戶
 SearchIntoProductsOrServices=產品或服務
-SearchIntoBatch=Lots / Serials
+SearchIntoBatch=批號/序號
 SearchIntoProjects=專案
 SearchIntoMO=製造訂單
 SearchIntoTasks=任務
@@ -1059,13 +1059,13 @@ KeyboardShortcut=快捷鍵
 AssignedTo=指定人
 Deletedraft=刪除草稿
 ConfirmMassDraftDeletion=草稿批次刪除確認
-FileSharedViaALink=File shared with a public link
+FileSharedViaALink=通過公共連結共享的檔案
 SelectAThirdPartyFirst=先選擇合作方(客戶/供應商)...
 YouAreCurrentlyInSandboxMode=您目前在 %s "沙盒" 模式
 Inventory=庫存
 AnalyticCode=分析代碼
 TMenuMRP=製造資源計劃(MRP)
-ShowCompanyInfos=Show company infos
+ShowCompanyInfos=顯示公司資訊
 ShowMoreInfos=顯示更多信息
 NoFilesUploadedYet=請先上傳文件
 SeePrivateNote=查看私人筆記
@@ -1074,7 +1074,7 @@ ValidFrom=有效期自
 ValidUntil=有效期至
 NoRecordedUsers=無使用者
 ToClose=關閉
-ToRefuse=To refuse
+ToRefuse=拒絕
 ToProcess=處理
 ToApprove=核准
 GlobalOpenedElemView=全域顯示
@@ -1129,11 +1129,11 @@ UpdateForAllLines=更新所有行
 OnHold=On hold
 Civility=稱謂或頭銜
 AffectTag=影響標籤
-CreateExternalUser=Create external user
+CreateExternalUser=建立外部用戶
 ConfirmAffectTag=批量標籤影響
 ConfirmAffectTagQuestion=您確定要影響對%s所選記錄的標籤嗎？
 CategTypeNotFound=找不到記錄類型的標籤類型
-CopiedToClipboard=Copied to clipboard
-InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
-ConfirmCancel=Are you sure you want to cancel
-EmailMsgID=Email MsgID
+CopiedToClipboard=複製到剪貼簿
+InformationOnLinkToContract=這個金額只是合約所有行的總和。沒有考慮時間的因素。
+ConfirmCancel=您確定要取消？
+EmailMsgID=電子郵件訊息 ID
diff --git a/htdocs/langs/zh_TW/margins.lang b/htdocs/langs/zh_TW/margins.lang
index b3cc74b2402..dc68a99e36a 100644
--- a/htdocs/langs/zh_TW/margins.lang
+++ b/htdocs/langs/zh_TW/margins.lang
@@ -22,7 +22,7 @@ ProductService=產品或服務
 AllProducts=所有產品和服務
 ChooseProduct/Service=選擇產品或服務
 ForceBuyingPriceIfNull=如果未定義，強制將買入/成本價轉換為賣價
-ForceBuyingPriceIfNullDetails=If buying/cost price not provided when we add a new line, and this option is "ON", the margin will be 0 on the new line (buying/cost price = selling price). If this option is "OFF" (recommended), margin will be equal to the value suggested by default (and may be 100% if no default value can be found).
+ForceBuyingPriceIfNullDetails=如果我們增加新行時未提供買入/成本價，且此選項為“ON”，則新行的利潤將為 0（買入/成本價 = 賣價）。如果此選項為“OFF”（推薦），則利潤將預設等於建議值（如果找不到預設值，則可能為 100%）。
 MARGIN_METHODE_FOR_DISCOUNT=全球折扣的利潤規則
 UseDiscountAsProduct=作為產品
 UseDiscountAsService=作為服務
diff --git a/htdocs/langs/zh_TW/members.lang b/htdocs/langs/zh_TW/members.lang
index 68771cc7892..e6b83cbef57 100644
--- a/htdocs/langs/zh_TW/members.lang
+++ b/htdocs/langs/zh_TW/members.lang
@@ -15,24 +15,24 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=另一名會員（名稱<b>：%s</b>
 ErrorUserPermissionAllowsToLinksToItselfOnly=出於安全原因，必須授予您編輯所有用戶的權限，以便能夠將會員連結到其他用戶。
 SetLinkToUser=連結Dolibarr用戶
 SetLinkToThirdParty=連接到Dolibarr合作方
-MembersCards=Business cards for members
+MembersCards=會員名片
 MembersList=會員清單
 MembersListToValid=草案會員清單（待確認）
 MembersListValid=有效會員清單
 MembersListUpToDate=最新訂閱的有效會員清單
 MembersListNotUpToDate=訂閱過期的有效會員清單
-MembersListExcluded=List of excluded members
+MembersListExcluded=排除會員的清單
 MembersListResiliated=已被終止會員清單
 MembersListQualified=合格會員清單
 MenuMembersToValidate=草案會員
 MenuMembersValidated=已驗證會員
-MenuMembersExcluded=Excluded members
+MenuMembersExcluded=排除會員
 MenuMembersResiliated=已終止會員
 MembersWithSubscriptionToReceive=可接收訂閱會員
 MembersWithSubscriptionToReceiveShort=接收訂閱
 DateSubscription=訂閱日期
 DateEndSubscription=訂閱結束日期
-EndSubscription=Subscription Ends
+EndSubscription=訂閱結束
 SubscriptionId=訂閱編號
 WithoutSubscription=沒有訂閱
 MemberId=會員編號
@@ -49,12 +49,12 @@ MemberStatusActiveLate=訂閱已過期
 MemberStatusActiveLateShort=已過期
 MemberStatusPaid=訂閱最新
 MemberStatusPaidShort=最新
-MemberStatusExcluded=Excluded member
-MemberStatusExcludedShort=Excluded
+MemberStatusExcluded=排除會員
+MemberStatusExcludedShort=排除
 MemberStatusResiliated=已終止成員
 MemberStatusResiliatedShort=已終止
 MembersStatusToValid=草案會員
-MembersStatusExcluded=Excluded members
+MembersStatusExcluded=排除會員
 MembersStatusResiliated=已終止會員
 MemberStatusNoSubscription=已驗證（無需訂閱）
 MemberStatusNoSubscriptionShort=已驗證
@@ -83,12 +83,12 @@ WelcomeEMail=歡迎電子郵件
 SubscriptionRequired=需要訂閱
 DeleteType=刪除
 VoteAllowed=允許投票
-Physical=Individual
-Moral=Corporation
-MorAndPhy=Corporation and Individual
-Reenable=Re-Enable
-ExcludeMember=Exclude a member
-ConfirmExcludeMember=Are you sure you want to exclude this member ?
+Physical=個人
+Moral=公司
+MorAndPhy=公司和個人
+Reenable=重新啟用
+ExcludeMember=排除會員
+ConfirmExcludeMember=您確定要排除此會員嗎？
 ResiliateMember=終止會員
 ConfirmResiliateMember=您確定要終止此會員嗎？
 DeleteMember=刪除會員
@@ -144,7 +144,7 @@ DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=電子郵件範本，用於會員
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=電子郵件範本，用於新的訂閱記錄時向會員發送電子郵件
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=電子郵件範本, 用於訂閱即將到期時發送電子郵件提醒
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=電子郵件範本，用於在會員取消時向會員發送電子郵件
-DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=用於會員排除時向會員發出電子郵件的模板
 DescADHERENT_MAIL_FROM=自動發送電子郵件之發件人電子郵件
 DescADHERENT_ETIQUETTE_TYPE=標籤頁格式
 DescADHERENT_ETIQUETTE_TEXT=會員地址列表文字
@@ -170,31 +170,31 @@ DocForLabels=產生地址表
 SubscriptionPayment=訂閱付款
 LastSubscriptionDate=最新訂閱付款的日期
 LastSubscriptionAmount=最新訂閱金額
-LastMemberType=Last Member type
+LastMemberType=最新的會員類型
 MembersStatisticsByCountries=會員統計(國家/城市)
 MembersStatisticsByState=會員統計(州/省)
 MembersStatisticsByTown=會員統計(城鎮)
 MembersStatisticsByRegion=會員統計(地區)
-NbOfMembers=Total number of members
-NbOfActiveMembers=Total number of current active members
+NbOfMembers=會員總數
+NbOfActiveMembers=目前活躍會員數
 NoValidatedMemberYet=無已驗證的會員
-MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
-MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
-MembersByTownDesc=This screen show you statistics of members by town.
-MembersByNature=This screen show you statistics of members by nature.
-MembersByRegion=This screen show you statistics of members by region.
+MembersByCountryDesc=此畫面顯示依國家/地區劃分的會員統計資訊。圖形取決於Google線上圖形服務，並且僅可在網路連線正常時可用。
+MembersByStateDesc=此畫面依州/省顯示有關會員的統計資訊。
+MembersByTownDesc=此畫面顯示依城市劃分的會員統計資訊。
+MembersByNature=此畫面依性質顯示有關會員的統計資訊。
+MembersByRegion=此畫面依區域顯示有關會員的統計資訊。
 MembersStatisticsDesc=選擇要讀取的統計訊息...
 MenuMembersStats=統計
-LastMemberDate=Latest membership date
+LastMemberDate=最新入會日期
 LatestSubscriptionDate=最新訂閱日期
-MemberNature=Nature of the member
-MembersNature=Nature of the members
-Public=Information is public
+MemberNature=會員性質
+MembersNature=會員性質
+Public=資訊是公開的
 NewMemberbyWeb=增加了新會員。等待核准
 NewMemberForm=新會員表格
-SubscriptionsStatistics=Subscriptions statistics
+SubscriptionsStatistics=訂閱統計
 NbOfSubscriptions=訂閱數
-AmountOfSubscriptions=Amount collected from subscriptions
+AmountOfSubscriptions=訂閱金額
 TurnoverOrBudget=營業額（對於公司）或預算（對於財團）
 DefaultAmount=預設訂閱金額
 CanEditAmount=訪客可以選擇/編輯其訂閱金額
@@ -213,5 +213,5 @@ SendReminderForExpiredSubscription=當訂閱即將到期時，通過電子郵件
 MembershipPaid=本期已支付的會費（直到%s）
 YouMayFindYourInvoiceInThisEmail=您可在此電子郵件中找到發票
 XMembersClosed=%s會員已關閉
-XExternalUserCreated=%s external user(s) created
-ForceMemberNature=Force member nature (Individual or Corporation)
+XExternalUserCreated=已建立%s位外部用戶
+ForceMemberNature=強制會員性質（個人或公司）
diff --git a/htdocs/langs/zh_TW/mrp.lang b/htdocs/langs/zh_TW/mrp.lang
index 2f4bfbfa146..f257a5fc7f3 100644
--- a/htdocs/langs/zh_TW/mrp.lang
+++ b/htdocs/langs/zh_TW/mrp.lang
@@ -13,7 +13,7 @@ BOMsSetup=BOM模組設定
 ListOfBOMs=物料清單-BOM
 ListOfManufacturingOrders=製造訂單清單
 NewBOM=新物料清單
-ProductBOMHelp=Product to create (or disassemble) with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
+ProductBOMHelp=使用此物料清單建立(或拆解)產品。<br>注記:具有"產品屬性"的產品="原料"不會顯示於此清單
 BOMsNumberingModules=BOM編號範本
 BOMsModelModule=BOM文件範本
 MOsNumberingModules=MO編號範本
@@ -39,7 +39,7 @@ DateStartPlannedMo=計劃開始日期
 DateEndPlannedMo=計劃結束日期
 KeepEmptyForAsap=空白表示“盡快”
 EstimatedDuration=預計時間
-EstimatedDurationDesc=Estimated duration to manufacture (or disassemble) this product using this BOM
+EstimatedDurationDesc=使用此物料清單製造（或拆解）此產品的預計工期
 ConfirmValidateBom=您確定要使用參考<strong>%s</strong>來驗證物料清單（您將能夠使用它來建立新的製造訂單）
 ConfirmCloseBom=您確定要取消此物料清單（您將無法再使用它來建立新的製造訂單）？
 ConfirmReopenBom=您確定要重新打開此物料清單嗎（您將能夠使用它來建立新的製造訂單）
@@ -63,14 +63,14 @@ ConsumeAndProduceAll=消耗並生產所有產品
 Manufactured=已製造
 TheProductXIsAlreadyTheProductToProduce=要增加的產品已經是要生產的產品。
 ForAQuantityOf=數量為%s
-ForAQuantityToConsumeOf=For a quantity to disassemble of %s
+ForAQuantityToConsumeOf=%s中拆解的數量
 ConfirmValidateMo=您確定要驗證此製造訂單嗎？
 ConfirmProductionDesc=通過點擊“%s”，您將驗證數量設定的消耗量和/或生產量。這還將更新庫存並記錄庫存動向。
 ProductionForRef=生產%s
 AutoCloseMO=如果達到消耗和生產的數量，則自動關閉製造訂單
 NoStockChangeOnServices=服務無庫存變化
 ProductQtyToConsumeByMO=開放MO仍要消耗的產品數量
-ProductQtyToProduceByMO=Product quantity still to produce by open MO
+ProductQtyToProduceByMO=產品數量仍由開放MO生產
 AddNewConsumeLines=增加新的行來使用
 ProductsToConsume=消耗的產品
 ProductsToProduce=生產的產品
diff --git a/htdocs/langs/zh_TW/orders.lang b/htdocs/langs/zh_TW/orders.lang
index 2f23c61d0db..37fbc2d0e30 100644
--- a/htdocs/langs/zh_TW/orders.lang
+++ b/htdocs/langs/zh_TW/orders.lang
@@ -17,8 +17,8 @@ ToOrder=製作訂單
 MakeOrder=製作訂單
 SupplierOrder=採購訂單
 SuppliersOrders=採購訂單
-SaleOrderLines=Sale order lines
-PurchaseOrderLines=Puchase order lines
+SaleOrderLines=銷售訂單行
+PurchaseOrderLines=採購訂單行
 SuppliersOrdersRunning=目前的採購訂單
 CustomerOrder=銷售訂單
 CustomersOrders=銷售訂單
diff --git a/htdocs/langs/zh_TW/other.lang b/htdocs/langs/zh_TW/other.lang
index 15b6f7aec08..ad8c0fde085 100644
--- a/htdocs/langs/zh_TW/other.lang
+++ b/htdocs/langs/zh_TW/other.lang
@@ -114,7 +114,7 @@ DemoCompanyAll=有多項活動的公司（所有主要模組）
 CreatedBy=由%s建立
 ModifiedBy=由%s修改
 ValidatedBy=由%s驗證
-SignedBy=Signed by %s
+SignedBy=由%s簽署
 ClosedBy=由%s關閉
 CreatedById=建立的用戶ID
 ModifiedById=進行最新更改的用戶ID
@@ -129,7 +129,7 @@ ClosedByLogin=已關閉的用戶登入名稱
 FileWasRemoved=檔案%s已刪除
 DirWasRemoved=資料夾%s已刪除
 FeatureNotYetAvailable=此功能在目前版本中尚不可用
-FeatureNotAvailableOnDevicesWithoutMouse=Feature not available on devices without mouse
+FeatureNotAvailableOnDevicesWithoutMouse=沒有滑鼠的設備上不可用的功能
 FeaturesSupported=已支援功能
 Width=寬度
 Height=高度
@@ -184,7 +184,7 @@ EnableGDLibraryDesc=在PHP安裝上安裝或啟用GD程式庫以使用此選項
 ProfIdShortDesc=<b>Prof Id %s</b>的資訊取決於合作方國家/地區。 <br>例如，對於國家<b>%s</b> ，其代碼為<b>%s</b> 。
 DolibarrDemo=Dolibarr的ERP / CRM的DEMO
 StatsByNumberOfUnits=產品/服務數量統計
-StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
+StatsByNumberOfEntities=參考實體數量的統計數據（發票數量或訂單數量...）
 NumberOfProposals=提案/建議書的數量
 NumberOfCustomerOrders=銷售訂單數量
 NumberOfCustomerInvoices=客戶發票數量
@@ -246,7 +246,7 @@ NewKeyIs=這是您的新登入密碼
 NewKeyWillBe=您用於登入軟體的新密鑰將為
 ClickHereToGoTo=點擊這裡前往%s
 YouMustClickToChange=您必須先點擊以下連結驗證此密碼更改
-ConfirmPasswordChange=Confirm password change
+ConfirmPasswordChange=確認密碼變更
 ForgetIfNothing=如果您沒有請求此更改，請忽略此電子郵件。您的憑證仍保持安全狀態。
 IfAmountHigherThan=如果金額高於<strong> %s </strong>
 SourcesRepository=資料庫
@@ -264,7 +264,7 @@ ContactCreatedByEmailCollector=電子郵件收集器從電子郵件MSGID %s建
 ProjectCreatedByEmailCollector=電子郵件收集器從電子郵件MSGID %s建立的專案
 TicketCreatedByEmailCollector=電子郵件收集器從電子郵件MSGID %s建立的服務單
 OpeningHoursFormatDesc=使用-分隔營業開始時間和營業結束時間。 <br>使用空格輸入不同的範圍。 <br>範例：8-12 14-18
-SuffixSessionName=Suffix for session name
+SuffixSessionName=程序名稱的後綴
 
 ##### Export #####
 ExportsArea=出口地區
@@ -290,4 +290,4 @@ PopuProp=依照在提案中受歡迎程度列出的產品/服務
 PopuCom=依照在訂單中受歡迎程度列出的產品/服務
 ProductStatistics=產品/服務統計
 NbOfQtyInOrders=訂單數量
-SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
+SelectTheTypeOfObjectToAnalyze=選擇一個項目以查看其統計資訊...
diff --git a/htdocs/langs/zh_TW/partnership.lang b/htdocs/langs/zh_TW/partnership.lang
index 34be595010d..f28af8cf442 100644
--- a/htdocs/langs/zh_TW/partnership.lang
+++ b/htdocs/langs/zh_TW/partnership.lang
@@ -16,66 +16,66 @@
 #
 # Generic
 #
-ModulePartnershipName=Partnership management
-PartnershipDescription=Module Partnership management
-PartnershipDescriptionLong= Module Partnership management
+ModulePartnershipName=合作夥伴關係管理
+PartnershipDescription=合作夥伴管理模組
+PartnershipDescriptionLong= 合作夥伴管理模組
 
-AddPartnership=Add partnership
-CancelPartnershipForExpiredMembers=Partnership: Cancel partnership of members with expired subscriptions
-PartnershipCheckBacklink=Partnership: Check referring backlink
+AddPartnership=增加合作夥伴
+CancelPartnershipForExpiredMembers=合作夥伴：取消訂閱過期會員的合作關係
+PartnershipCheckBacklink=合作夥伴：檢查參考反向連結
 
 #
 # Menu
 #
-NewPartnership=New Partnership
-ListOfPartnerships=List of partnership
+NewPartnership=新合作夥伴
+ListOfPartnerships=合作夥伴清單
 
 #
 # Admin page
 #
-PartnershipSetup=Partnership setup
-PartnershipAbout=About Partnership
-PartnershipAboutPage=Partnership about page
-partnershipforthirdpartyormember=Partner status must be set on a 'thirdparty' or a 'member'
-PARTNERSHIP_IS_MANAGED_FOR=Partnership managed for
-PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks to check
-PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb of days before cancelling status of a partnership when a subscription has expired
-ReferingWebsiteCheck=Check of website referring
-ReferingWebsiteCheckDesc=You can enable a feature to check that your partners has added a backlink to your website domains on their own website.
+PartnershipSetup=合作夥伴設定
+PartnershipAbout=關於合作夥伴
+PartnershipAboutPage=合作夥伴關於頁面
+partnershipforthirdpartyormember=合作夥伴狀態必須設定為“合作方”或“會員”
+PARTNERSHIP_IS_MANAGED_FOR=夥伴關係管理
+PARTNERSHIP_BACKLINKS_TO_CHECK=要檢查的反向連結
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=訂閱到期後取消合作關係狀態前的 Nb 天
+ReferingWebsiteCheck=檢查網站參考
+ReferingWebsiteCheckDesc=您可以啟用一項功能來檢查您的合作夥伴是否在他們自己的網站上增加了指向您網站網域的反向連結。
 
 #
 # Object
 #
-DeletePartnership=Delete a partnership
-PartnershipDedicatedToThisThirdParty=Partnership dedicated to this third party
-PartnershipDedicatedToThisMember=Partnership dedicated to this member
+DeletePartnership=刪除合作夥伴
+PartnershipDedicatedToThisThirdParty=致力於此合作方的合作夥伴
+PartnershipDedicatedToThisMember=致力於此會員的合作夥伴
 DatePartnershipStart=開始日期
 DatePartnershipEnd=結束日期
-ReasonDecline=Decline reason
-ReasonDeclineOrCancel=Decline reason
-PartnershipAlreadyExist=Partnership already exist
-ManagePartnership=Manage partnership
-BacklinkNotFoundOnPartnerWebsite=Backlink not found on partner website
-ConfirmClosePartnershipAsk=Are you sure you want to cancel this partnership?
-PartnershipType=Partnership type
+ReasonDecline=拒絕原因
+ReasonDeclineOrCancel=拒絕原因
+PartnershipAlreadyExist=合作夥伴已存在
+ManagePartnership=管理合作夥伴
+BacklinkNotFoundOnPartnerWebsite=在合作夥伴網站上找不到反向連結
+ConfirmClosePartnershipAsk=您確定要取消此合作關係嗎？
+PartnershipType=合作夥伴類型
 
 #
 # Template Mail
 #
-SendingEmailOnPartnershipWillSoonBeCanceled=Partnership will soon be canceled
-SendingEmailOnPartnershipRefused=Partnership refused
-SendingEmailOnPartnershipAccepted=Partnership accepted
-SendingEmailOnPartnershipCanceled=Partnership canceled
+SendingEmailOnPartnershipWillSoonBeCanceled=合作關係即將取消
+SendingEmailOnPartnershipRefused=已拒絕合作
+SendingEmailOnPartnershipAccepted=已接受合作
+SendingEmailOnPartnershipCanceled=已取消合作夥伴
 
-YourPartnershipWillSoonBeCanceledTopic=Partnership will soon be canceled
-YourPartnershipRefusedTopic=Partnership refused
-YourPartnershipAcceptedTopic=Partnership accepted
-YourPartnershipCanceledTopic=Partnership canceled
+YourPartnershipWillSoonBeCanceledTopic=合作關係即將取消
+YourPartnershipRefusedTopic=已拒絕合作
+YourPartnershipAcceptedTopic=已接受合作
+YourPartnershipCanceledTopic=已取消合作
 
-YourPartnershipWillSoonBeCanceledContent=We inform you that your partnership will soon be canceled (Backlink not found)
-YourPartnershipRefusedContent=We inform you that your partnership request has been refused.
-YourPartnershipAcceptedContent=We inform you that your partnership request has been accepted.
-YourPartnershipCanceledContent=We inform you that your partnership has been canceled.
+YourPartnershipWillSoonBeCanceledContent=我們通知您，您的合作夥伴關係即將取消（未找到反向連結）
+YourPartnershipRefusedContent=我們通知您，您的合作請求已被拒絕。
+YourPartnershipAcceptedContent=我們通知您，您的合作請求已被接受。
+YourPartnershipCanceledContent=我們通知您，您的合作夥伴關係已被取消。
 
 #
 # Status
@@ -84,4 +84,4 @@ PartnershipDraft=草稿
 PartnershipAccepted=已接受
 PartnershipRefused=已拒絕
 PartnershipCanceled=已取消
-PartnershipManagedFor=Partners are
+PartnershipManagedFor=合作夥伴是
diff --git a/htdocs/langs/zh_TW/productbatch.lang b/htdocs/langs/zh_TW/productbatch.lang
index 82f4324aa0e..e97a9eb8d05 100644
--- a/htdocs/langs/zh_TW/productbatch.lang
+++ b/htdocs/langs/zh_TW/productbatch.lang
@@ -1,10 +1,10 @@
 # ProductBATCH language file - Source file is en_US - ProductBATCH
 ManageLotSerial=使用批次/序號數字
-ProductStatusOnBatch=Yes (lot required)
-ProductStatusOnSerial=Yes (unique serial number required)
+ProductStatusOnBatch=是(需要批號/序號)
+ProductStatusOnSerial=是（需要唯一的批號/序號）
 ProductStatusNotOnBatch=不是(不使用批次/序號)
-ProductStatusOnBatchShort=Lot
-ProductStatusOnSerialShort=Serial
+ProductStatusOnBatchShort=批號
+ProductStatusOnSerialShort=序號
 ProductStatusNotOnBatchShort=No
 Batch=批次/序號
 atleast1batchfield=有效日期或銷售日期或批次/序號
@@ -24,22 +24,22 @@ ProductLotSetup=批次/序號模組的設定
 ShowCurrentStockOfLot=顯示關聯產品/批次的目前庫存
 ShowLogOfMovementIfLot=顯示產品/批次的移動記錄
 StockDetailPerBatch=每批次的庫存詳細資料
-SerialNumberAlreadyInUse=Serial number %s is already used for product %s
-TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
-BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
-BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
-ManageLotMask=Custom mask
-CustomMasks=Adds an option to define mask in the product card
-LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
-SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
-QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
-LifeTime=Life span (in days)
-EndOfLife=End of life
-ManufacturingDate=Manufacturing date
-DestructionDate=Destruction date
-FirstUseDate=First use date
-QCFrequency=Quality control frequency (in days)
+SerialNumberAlreadyInUse= 序號%s已經被產品%s使用
+TooManyQtyForSerialNumber=序號%s只能使用在產品%s上
+BatchLotNumberingModules=依批號自動產生批次產品的選項
+BatchSerialNumberingModules=依序號自動產生批次產品的選項
+ManageLotMask=自定義遮罩
+CustomMasks=在產品卡中增加一個定義遮罩的選項
+LotProductTooltip=在產品卡中增加一個定義專用批號遮罩的選項
+SNProductTooltip=在產品卡中增加一個定義專用序號遮罩的選項
+QtyToAddAfterBarcodeScan=每一個已掃描的條碼/批號/序號要增加的數量
+LifeTime=有效期（天）
+EndOfLife=已到期
+ManufacturingDate=生產日期
+DestructionDate=銷毀日期
+FirstUseDate=首次使用日期
+QCFrequency=品質控制頻率（天）
 
 #Traceability - qc status
 OutOfOrder=Out of order
-InWorkingOrder=In working order
+InWorkingOrder=在生產訂單中
diff --git a/htdocs/langs/zh_TW/products.lang b/htdocs/langs/zh_TW/products.lang
index e34cc1f39a4..1885cb18f9d 100644
--- a/htdocs/langs/zh_TW/products.lang
+++ b/htdocs/langs/zh_TW/products.lang
@@ -43,7 +43,7 @@ ServicesOnSaleOnly=僅供銷售服務
 ServicesOnPurchaseOnly=僅供採購服務
 ServicesNotOnSell=無法銷售與採購之服務
 ServicesOnSellAndOnBuy=可供銷售與購買之服務
-LastModifiedProductsAndServices=Latest %s products/services which were modified
+LastModifiedProductsAndServices=最新%s筆已修改的產品/服務
 LastRecordedProducts=最新 %s 紀錄的產品
 LastRecordedServices=最新%s 紀錄的服務
 CardProduct0=產品
@@ -73,12 +73,12 @@ SellingPrice=售價
 SellingPriceHT=售價（不含稅）
 SellingPriceTTC=售價（含稅）
 SellingMinPriceTTC=最低售價（含稅）
-CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
+CostPriceDescription=此價格欄位（不含稅）可用於取得該產品給貴公司的平均價格。它可以是您自己計算的任何價格，例如，根據平均購買價格加上平均生產和分銷成本得出的價格。
 CostPriceUsage=此值可用於利潤計算。
 SoldAmount=銷售數量
 PurchasedAmount=購買數量
 NewPrice=新價格
-MinPrice=Min. selling price
+MinPrice=最低售價
 EditSellingPriceLabel=修改售價標籤
 CantBeLessThanMinPrice=售價不能低於該產品的最低售價(%s 不含稅)。如果你輸入的折扣過高也會出現此訊息。
 ContractStatusClosed=已關閉
@@ -141,7 +141,7 @@ VATRateForSupplierProduct=營業稅率（此供應商/產品）
 DiscountQtyMin=此數量的折扣。
 NoPriceDefinedForThisSupplier=沒有此供應商/產品定義的價格/數量
 NoSupplierPriceDefinedForThisProduct=沒有定義此產品供應商價格/數量
-PredefinedItem=Predefined item
+PredefinedItem=預定義項目
 PredefinedProductsToSell=預定義產品
 PredefinedServicesToSell=預定義服務
 PredefinedProductsAndServicesToSell=預定義的可銷售產品/服務
@@ -157,11 +157,11 @@ ListServiceByPopularity=熱門服務列表
 Finished=成品
 RowMaterial=原材料
 ConfirmCloneProduct=您確定要複製產品或服務<b>%s</b>嗎？
-CloneContentProduct=Clone all main information of the product/service
+CloneContentProduct=複製產品/服務的所有主要資訊
 ClonePricesProduct=複製價格
-CloneCategoriesProduct=Clone linked tags/categories
-CloneCompositionProduct=Clone virtual products/services
-CloneCombinationsProduct=Clone the product variants
+CloneCategoriesProduct=複製已連結標籤/類別
+CloneCompositionProduct=複製虛擬產品/服務
+CloneCombinationsProduct=複製產品變異
 ProductIsUsed=該產品是用於
 NewRefForClone=新的產品/服務參考
 SellingPrices=銷售價格
@@ -170,12 +170,12 @@ CustomerPrices=客戶價格
 SuppliersPrices=供應商價格
 SuppliersPricesOfProductsOrServices=供應商價格（產品或服務）
 CustomCode=海關|商品| HS碼
-CountryOrigin=Country of origin
-RegionStateOrigin=Region of origin
-StateOrigin=State|Province of origin
-Nature=Nature of product (raw/manufactured)
+CountryOrigin=原產地
+RegionStateOrigin=原產地
+StateOrigin=州|原產地
+Nature=產品性質（原料/成品）
 NatureOfProductShort=產品性質
-NatureOfProductDesc=Raw material or manufactured product
+NatureOfProductDesc=原料或成品
 ShortLabel=短標籤
 Unit=單位
 p=u.
@@ -277,7 +277,7 @@ PriceByCustomer=每個客戶的價格不同
 PriceCatalogue=每個產品/服務的單次銷售價格
 PricingRule=售價規則
 AddCustomerPrice=依客戶新增價格
-ForceUpdateChildPriceSoc=為客戶子公司設置相同的價格
+ForceUpdateChildPriceSoc=為客戶子公司設定相同的價格
 PriceByCustomerLog=舊客戶價格的日誌
 MinimumPriceLimit=最低價格不能低於%s
 MinimumRecommendedPrice=最低建議價格是：%s
@@ -296,6 +296,7 @@ ComposedProductIncDecStock=母產品變更時增加/減少庫存
 ComposedProduct=子產品
 MinSupplierPrice=最低採購價格
 MinCustomerPrice=最低銷售價格
+NoDynamicPrice=沒有動態價格
 DynamicPriceConfiguration=動態價格設置
 DynamicPriceDesc=您可以定義數學公式來計算客戶或供應商的價格。這樣的公式可以使用所有數學運算符，一些常數和變數。您可以在此處定義要使用的變數。如果變數需要自動更新，則可以定義外部URL以允許Dolibarr自動更新值。
 AddVariable=增加變數
@@ -314,7 +315,7 @@ LastUpdated=最新更新
 CorrectlyUpdated=更新成功
 PropalMergePdfProductActualFile=用於增加到PDF Azur的文件是
 PropalMergePdfProductChooseFile=選擇PDF文件
-IncludingProductWithTag=Include products/services with tag
+IncludingProductWithTag=包含有標籤的產品/服務
 DefaultPriceRealPriceMayDependOnCustomer=預設價格，實際價格可能取決於客戶
 WarningSelectOneDocument=請至少選擇一份文件
 DefaultUnitToShow=單位
diff --git a/htdocs/langs/zh_TW/projects.lang b/htdocs/langs/zh_TW/projects.lang
index 7057f38a761..5137b622b09 100644
--- a/htdocs/langs/zh_TW/projects.lang
+++ b/htdocs/langs/zh_TW/projects.lang
@@ -10,19 +10,19 @@ PrivateProject=專案聯絡人
 ProjectsImContactFor=我是聯絡人的專案
 AllAllowedProjects=我可以讀取的所有專案（我的+公共項目）
 AllProjects=所有專案
-MyProjectsDesc=This view is limited to the projects that you are a contact for
+MyProjectsDesc=此檢視僅顯示您為聯絡人之專案
 ProjectsPublicDesc=此檢視顯示您被允許讀取的所有專案。
 TasksOnProjectsPublicDesc=此檢視顯示您可讀取之專案的所有任務。
 ProjectsPublicTaskDesc=此檢視顯示所有您可以讀取之專案與任務。
 ProjectsDesc=此檢視顯示全部專案(您的用戶權限授予您檢視所有內容)。
 TasksOnProjectsDesc=此檢視顯示所有專案上的所有任務（您的用戶權限授予您檢視所有內容）。
-MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
+MyTasksDesc=此檢視僅顯示您是聯絡人之專案或任務
 OnlyOpenedProject=僅顯示開放專案(不顯示草案或是已關閉狀態之專案)
 ClosedProjectsAreHidden=不顯示已關閉專案
 TasksPublicDesc=此檢視顯示您可讀取之所有專案及任務。
 TasksDesc=此檢視顯示所有專案及任務(您的用戶權限授予您查看所有內容)。
 AllTaskVisibleButEditIfYouAreAssigned=合格專案的所有任務都可見，但是您只能輸入分配給所選用戶之任務的時間。如果需要輸入時間，請分配任務。
-OnlyYourTaskAreVisible=Only tasks assigned to you are visible. If you need to enter time on a task and if the task is not visible here, then you need to assign the task to yourself.
+OnlyYourTaskAreVisible=僅顯示分配給您的任務。如果您需要輸入時間並且看不見任務，則您需要將任務分配給自己。
 ImportDatasetTasks=專案任務
 ProjectCategories=專案標籤/類別
 NewProject=新專案
@@ -89,7 +89,7 @@ TimeConsumed=已消耗
 ListOfTasks=任務清單
 GoToListOfTimeConsumed=前往工作時間清單
 GanttView=甘特圖
-ListWarehouseAssociatedProject=List of warehouses associated to the project
+ListWarehouseAssociatedProject=與專案有關的倉庫清單
 ListProposalsAssociatedProject=與專案有關的商業建議書清單
 ListOrdersAssociatedProject=與專案相關的銷售訂單清單
 ListInvoicesAssociatedProject=與專案相關的客戶發票清單
@@ -202,7 +202,7 @@ ResourceNotAssignedToTheTask=未分配給任務
 NoUserAssignedToTheProject=沒有分配給此專案的用戶
 TimeSpentBy=花費時間者
 TasksAssignedTo=任務分配給
-AssignTaskToMe=Assign task to myself
+AssignTaskToMe=分配任務給自己
 AssignTaskToUser=將任務分配給%s
 SelectTaskToAssign=選擇要分配的任務...
 AssignTask=分配
@@ -267,11 +267,11 @@ InvoiceToUse=發票草稿
 NewInvoice=新發票
 OneLinePerTask=每個任務一行
 OneLinePerPeriod=每個週期一行
-OneLinePerTimeSpentLine=One line for each time spent declaration
+OneLinePerTimeSpentLine=一行為一筆時間花費申報
 RefTaskParent=參考上層任務
 ProfitIsCalculatedWith=利潤計算是使用
-AddPersonToTask=Add also to tasks
-UsageOrganizeEvent=Usage: Event Organization
-PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
-PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
-SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
+AddPersonToTask=也增加到任務
+UsageOrganizeEvent=用途：事件組織
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=當所有任務完成時將專案分類為關閉(進度100%%)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=注意：所有任務進度為 100%% 的現有專案不會受到影響：您必須手動關閉它們。此選項僅影響打開的專案。
+SelectLinesOfTimeSpentToInvoice=選擇未計費的時間行，然後批次操作“產生發票”來計費
diff --git a/htdocs/langs/zh_TW/propal.lang b/htdocs/langs/zh_TW/propal.lang
index ba1758df186..acdb64c9cc0 100644
--- a/htdocs/langs/zh_TW/propal.lang
+++ b/htdocs/langs/zh_TW/propal.lang
@@ -59,7 +59,7 @@ ConfirmClonePropal=您確定您要完整複製商業提案/建議書<b>%s</b>？
 ConfirmReOpenProp=您確定要再打開商業提案/建議書<b>%s</b>嗎？
 ProposalsAndProposalsLines=商業提案/建議書和行
 ProposalLine=提案/建議書行
-ProposalLines=Proposal lines
+ProposalLines=提案/建議書行
 AvailabilityPeriod=交貨期
 SetAvailability=設定交貨期
 AfterOrder=訂單後
diff --git a/htdocs/langs/zh_TW/receptions.lang b/htdocs/langs/zh_TW/receptions.lang
index 07092969024..798b7f6efcb 100644
--- a/htdocs/langs/zh_TW/receptions.lang
+++ b/htdocs/langs/zh_TW/receptions.lang
@@ -44,4 +44,4 @@ ValidateOrderFirstBeforeReception=您必須先驗證訂單，然後才能進行
 ReceptionsNumberingModules=收貨編號模組
 ReceptionsReceiptModel=收貨用文件範本
 NoMorePredefinedProductToDispatch=沒有更多預定義的產品要調度
-ReceptionExist=A reception exists
+ReceptionExist=有櫃台
diff --git a/htdocs/langs/zh_TW/recruitment.lang b/htdocs/langs/zh_TW/recruitment.lang
index f1f347585b2..beb5762cbe2 100644
--- a/htdocs/langs/zh_TW/recruitment.lang
+++ b/htdocs/langs/zh_TW/recruitment.lang
@@ -50,27 +50,27 @@ PositionsToBeFilled=工作職位
 ListOfPositionsToBeFilled=工作職位清單
 NewPositionToBeFilled=新職位
 
-JobOfferToBeFilled=Job position to be filled
+JobOfferToBeFilled=職位空缺
 ThisIsInformationOnJobPosition=工作職位空缺訊息
 ContactForRecruitment=招聘連絡人
 EmailRecruiter=電子郵件招聘者
 ToUseAGenericEmail=使用普通電子郵件。如果未定義，將使用招聘負責人的電子郵件
-NewCandidature=New application
-ListOfCandidatures=List of applications
+NewCandidature=新申請
+ListOfCandidatures=申請清單
 RequestedRemuneration=要求的薪資
 ProposedRemuneration=擬議薪資
 ContractProposed=擬議合約
 ContractSigned=合約已簽訂
-ContractRefused=Contract refused
-RecruitmentCandidature=Application
+ContractRefused=合約被拒絕
+RecruitmentCandidature=申請
 JobPositions=工作職位
-RecruitmentCandidatures=Applications
+RecruitmentCandidatures=申請
 InterviewToDo=面試事項
-AnswerCandidature=Application answer
-YourCandidature=Your application
-YourCandidatureAnswerMessage=Thanks you for your application.<br>...
-JobClosedTextCandidateFound=The job position is closed. The position has been filled.
-JobClosedTextCanceled=The job position is closed.
-ExtrafieldsJobPosition=Complementary attributes (job positions)
-ExtrafieldsApplication=Complementary attributes (job applications)
-MakeOffer=Make an offer
+AnswerCandidature=申請回覆
+YourCandidature=您的申請
+YourCandidatureAnswerMessage=感謝您的申請。 <br> ...
+JobClosedTextCandidateFound=此職位已關閉。此職位已招聘完成。
+JobClosedTextCanceled=此職位已關閉。
+ExtrafieldsJobPosition=補充屬性（職位）
+ExtrafieldsApplication=補充屬性（工作申請）
+MakeOffer=開價
diff --git a/htdocs/langs/zh_TW/salaries.lang b/htdocs/langs/zh_TW/salaries.lang
index f741a3a051c..d3fc9900a41 100644
--- a/htdocs/langs/zh_TW/salaries.lang
+++ b/htdocs/langs/zh_TW/salaries.lang
@@ -2,12 +2,15 @@
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=用戶合作方使用的會計帳戶
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=用戶卡上定義的專用會計帳戶將僅用於子帳會計。如果未定義用戶專用的用戶帳戶，則此帳戶將用於“總帳”，並作為“子帳”帳戶的默認值。
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=默認支付薪資的會計帳戶
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=預設,當建立薪資時將"自動建立所有支付"選項留空
 Salary=薪資
 Salaries=薪資
-NewSalaryPayment=新支付薪資
+NewSalary=新薪資
+NewSalaryPayment=新薪資卡
 AddSalaryPayment=新增支付薪資
 SalaryPayment=支付薪資
 SalariesPayments=支付薪資
+SalariesPaymentsOf=%s 的薪資支付
 ShowSalaryPayment=顯示支付薪資
 THM=平均時薪
 TJM=平均日薪
diff --git a/htdocs/langs/zh_TW/sendings.lang b/htdocs/langs/zh_TW/sendings.lang
index ef3e9fc3a8d..fcdd10a92c7 100644
--- a/htdocs/langs/zh_TW/sendings.lang
+++ b/htdocs/langs/zh_TW/sendings.lang
@@ -43,14 +43,14 @@ ConfirmValidateSending=您確定要使用參考<b>%s</b>驗證此出貨嗎？
 ConfirmCancelSending=您確定要取消此出貨嗎？
 DocumentModelMerou=Merou A5 範本
 WarningNoQtyLeftToSend=警告，沒有等待出貨的產品。
-StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
+StatsOnShipmentsOnlyValidated=統計數據僅適用於經過驗證的出貨。日期是使用出貨驗證日期（並不是總是知道計劃的出貨日期）
 DateDeliveryPlanned=預計交貨日期
 RefDeliveryReceipt=參考交貨收據
-StatusReceipt=交貨收據狀態
+StatusReceipt=送貨單狀態
 DateReceived=收貨日期
 ClassifyReception=收貨分類
-SendShippingByEMail=通過電子郵件發送出貨
-SendShippingRef=提交出貨%s
+SendShippingByEMail=通過電子郵件寄送出貨
+SendShippingRef=提交出貨%s 
 ActionsOnShipping=出貨事件
 LinkToTrackYourPackage=連結追踪您的包裹
 ShipmentCreationIsDoneFromOrder=目前，新建立出貨已經由訂單卡完成。
diff --git a/htdocs/langs/zh_TW/stocks.lang b/htdocs/langs/zh_TW/stocks.lang
index 39839073299..318a92ed1a9 100644
--- a/htdocs/langs/zh_TW/stocks.lang
+++ b/htdocs/langs/zh_TW/stocks.lang
@@ -60,7 +60,7 @@ EnhancedValueOfWarehouses=倉庫價值
 UserWarehouseAutoCreate=新增用戶時自動新增用戶倉庫
 AllowAddLimitStockByWarehouse=除了每個產品的最小和期望庫存值之外，還管理每個配對（產品倉庫）的最小和期望庫存值
 RuleForWarehouse=倉庫規則
-WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+WarehouseAskWarehouseOnThirparty=為合作方設定倉庫
 WarehouseAskWarehouseDuringPropal=為商業提案/建議書設定一個倉庫
 WarehouseAskWarehouseDuringOrder=在銷售訂單上設定一個倉庫
 UserDefaultWarehouse=在用戶上設定一個倉庫
@@ -89,15 +89,15 @@ NoPredefinedProductToDispatch=沒有此專案的預定義產品。因此無需
 DispatchVerb=調度
 StockLimitShort=警報限制
 StockLimit=庫存限制的警報
-StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
+StockLimitDesc=（空白）表示沒有警告。 <br> 0 可用於庫存為0時立即觸發警告。
 PhysicalStock=實體庫存
 RealStock=實際庫存
 RealStockDesc=實體/實際庫存是目前倉庫中的庫存。
 RealStockWillAutomaticallyWhen=實際庫存將根據以下規則（在“庫存”模組中定義）進行修改：
 VirtualStock=虛擬庫存
 VirtualStockAtDate=截至日期的虛擬庫存
-VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen date will be finished
-VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
+VirtualStockAtDateDesc=虛擬庫存將於即將執行的待辦訂單所選擇的日期前完成
+VirtualStockDesc=虛擬庫存是在所有未完成/待辦操作（影響庫存）關閉（收到採購訂單、銷售訂單發貨、生產製造訂單等）後計算出的庫存
 AtDate=目前
 IdWarehouse=編號倉庫
 DescWareHouse=說明倉庫
@@ -105,7 +105,7 @@ LieuWareHouse=本地化倉庫
 WarehousesAndProducts=倉庫和產品
 WarehousesAndProductsBatchDetail=倉庫和產品（有批次/序列的詳細信息）
 AverageUnitPricePMPShort=加權平均價格
-AverageUnitPricePMPDesc=The input average unit price we had to expense to get 1 unit of product into our stock.
+AverageUnitPricePMPDesc=我們取得一單位產品進入我們庫存所需要的花費為平均輸入單價
 SellPriceMin=銷售單價
 EstimatedStockValueSellShort=銷售價值
 EstimatedStockValueSell=銷售價值
@@ -123,9 +123,9 @@ DesiredStockDesc=該庫存量將是用於補貨功能中補充庫存的值。
 StockToBuy=訂購
 Replenishment=補貨
 ReplenishmentOrders=補貨單
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
-UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
-ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
+VirtualDiffersFromPhysical=根據新增/減少庫存選項,真實庫存與虛擬庫存(真實庫存加開放訂單)也許不同
+UseRealStockByDefault=為補貨功能使用真實庫存而不是虛擬庫存
+ReplenishmentCalculation=訂購數量將是（需求數量 - 實際庫存）而不是（需求數量 - 虛擬庫存）
 UseVirtualStock=使用虛擬庫存
 UsePhysicalStock=使用實體庫存
 CurentSelectionMode=目前選擇模式
@@ -134,7 +134,7 @@ CurentlyUsingPhysicalStock=實體庫存
 RuleForStockReplenishment=補貨規則
 SelectProductWithNotNullQty=選擇至少一個數量不為空的產品和一個供應商
 AlertOnly= 只警告
-IncludeProductWithUndefinedAlerts = Include also negative stock for products with no desired quantity defined, to restore them to 0
+IncludeProductWithUndefinedAlerts = 也包括未定義需求數量產品的負庫存，將其恢復為 0
 WarehouseForStockDecrease=倉庫<b>%s</b>將用於減少庫存
 WarehouseForStockIncrease=倉庫<b>%s</b>將用於庫存增加
 ForThisWarehouse=用於這個倉庫
@@ -145,7 +145,7 @@ Replenishments=補貨
 NbOfProductBeforePeriod=選則期間以前產品%s庫存的數量(<%s）
 NbOfProductAfterPeriod=選則期間之後產品%s庫存的數量(> %s)
 MassMovement=全部活動
-SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
+SelectProductInAndOutWareHouse=選擇一個來源倉庫,目標倉庫,產品與數量然後點選"%s"。當所有移動後完成後請點選"%s"。
 RecordMovement=記錄轉移
 ReceivingForSameOrder=此訂單的收據
 StockMovementRecorded=庫存變動已記錄
@@ -154,7 +154,7 @@ StockMustBeEnoughForInvoice=庫存水平必須足以將產品/服務新增到發
 StockMustBeEnoughForOrder=庫存水平必須足以將產品/服務新增到訂單中（將此筆加到訂單中時，無論自動庫存更改的規則如何，都要對當前實際庫存進行檢查）
 StockMustBeEnoughForShipment= 庫存水平必須足以將產品/服務新增到發貨中（將此筆加到發貨中時，無論自動庫存更改的規則如何，都要對當前實際庫存進行檢查）
 MovementLabel=產品移動標籤
-TypeMovement=Direction of movement
+TypeMovement=移動方向
 DateMovement=移動日期
 InventoryCode=移動或庫存代碼
 IsInPackage=包含在包裝中
@@ -167,8 +167,8 @@ MovementTransferStock=將產品%s庫存轉移到另一個倉庫
 InventoryCodeShort=庫存/移動碼
 NoPendingReceptionOnSupplierOrder=由於是未完成採購訂單，沒有待處理的接收處
 ThisSerialAlreadyExistWithDifferentDate=此批號/序列號（ <strong>%s</strong> ）已存在，但入庫日期或出庫日期不同（找到<strong>%s，</strong>但您輸入<strong>%s</strong> ）。
-OpenAll=打開所有活動
-OpenInternal=僅開啟內部活動
+OpenAnyMovement=開啟(所有移動)
+OpenInternal=開啟(只有內部移動)
 UseDispatchStatus=產品在採購訂單接收處時,使用一個調度狀態（批准/拒絕）
 OptionMULTIPRICESIsOn=選項“分段價格”已啟用。這意味著一個產品有多個售價，因此無法計算出銷售價值
 ProductStockWarehouseCreated=已正確產生庫存限制警報和需求最佳庫存
@@ -236,23 +236,23 @@ StockIsRequiredToChooseWhichLotToUse=庫存需要選擇要使用的批次
 ForceTo=強制到
 AlwaysShowFullArbo=在倉庫連結的彈出窗口上顯示完整的倉庫樹狀圖（警告：這可能會大大降低性能）
 StockAtDatePastDesc=您可以在此處檢視給定之過去日期的庫存（實際庫存）
-StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
+StockAtDateFutureDesc=您可以在此檢視未來某一天的庫存(虛擬庫存)
 CurrentStock=目前庫存
 InventoryRealQtyHelp=將值設定為0以重置數量<br>保持欄位為空或刪除行以保持不變
-UpdateByScaning=Fill real qty by scaning
+UpdateByScaning=使用掃描填入實際數量
 UpdateByScaningProductBarcode=掃描更新（產品條碼）
 UpdateByScaningLot=掃描更新（批次|序列條碼）
-DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
+DisableStockChangeOfSubProduct=在此移動期間停止此組合所有子產品的庫存變化。
 ImportFromCSV=匯入CSV移動清單
 ChooseFileToImport=上傳檔案，然後點擊%s圖示以選擇要匯入的檔案...
 SelectAStockMovementFileToImport=選擇要匯入的庫存移動檔案
-InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
+InfoTemplateImport=上傳的檔案需要採用這種格式（*為必填欄位）：<br> 來源倉庫* |目標倉庫* |產品* |數量* |批號/序號 <br> CSV 字元分隔符號必須是“<b> %s </b>”
 LabelOfInventoryMovemement=%s的庫存
 ReOpen=重新打開
-ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock to the real qty you entered into the inventory.
-ObjectNotFound=%s not found
-MakeMovementsAndClose=Generate movements and close
-AutofillWithExpected=Fill real quantity with expected quantity
-ShowAllBatchByDefault=By default, show batch details on product "stock" tab
-CollapseBatchDetailHelp=You can set batch detail default display in stocks module configuration
-FieldCannotBeNegative=Field "%s" cannot be negative
+ConfirmFinish=您確定要關閉此盤點嗎？這將使得產生所有庫存移動並且更新您庫存中的真實數量。
+ObjectNotFound=未發現%s
+MakeMovementsAndClose=產生移動並關閉
+AutofillWithExpected=用預期數量填入實際數量
+ShowAllBatchByDefault=預設,在產品"庫存"分頁顯示批次詳細資料
+CollapseBatchDetailHelp=您可以在庫存模組設定中設定預設顯示批次詳細資料
+FieldCannotBeNegative=欄位“%s”不能為負值
diff --git a/htdocs/langs/zh_TW/supplier_proposal.lang b/htdocs/langs/zh_TW/supplier_proposal.lang
index 7bb87f2607e..b029b7f1ee2 100644
--- a/htdocs/langs/zh_TW/supplier_proposal.lang
+++ b/htdocs/langs/zh_TW/supplier_proposal.lang
@@ -1,27 +1,28 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
 SupplierProposal=供應商商業提案/建議書
 supplier_proposalDESC=管理對供應商的價格要求
-SupplierProposalNew=新價格要求
-CommRequest=價格要求
-CommRequests=請求報價
-SearchRequest=搜尋要求
-DraftRequests=草擬要求
+SupplierProposalNew=新供應商報價
+CommRequest=供應商報價
+CommRequests=供應商報價
+SearchRequest=搜尋供應商報價
+DraftRequests=供應商報價草案
 SupplierProposalsDraft=供應商提案/建議書草稿
 LastModifiedRequests=最新%s的價格要求
-RequestsOpened=公開價格要求
+RequestsOpened=打開的報價
 SupplierProposalArea=供應商提案/建議書區
 SupplierProposalShort=供應商提案/建議書
 SupplierProposals=供應商提案/建議書
 SupplierProposalsShort=供應商提案/建議書
-NewAskPrice=新價格要求
-ShowSupplierProposal=顯示價格要求
-AddSupplierProposal=新增價格要求
+AskPrice=供應商報價
+NewAskPrice=新供應商報價
+ShowSupplierProposal=顯示供應商報價
+AddSupplierProposal=建立供應商價格報價
 SupplierProposalRefFourn=供應商參考
 SupplierProposalDate=交貨日期
 SupplierProposalRefFournNotice=在關閉成為“已接受”之前，請確認供應商的參考。
-ConfirmValidateAsk=您確定要以名稱<b>%s</b>驗證此價格要求嗎？
-DeleteAsk=刪除要求
-ValidateAsk=驗證要求
+ConfirmValidateAsk=您確定要以名稱<b>%s</b>驗證此供應商報價嗎？
+DeleteAsk=刪除供應商報價
+ValidateAsk=驗證供應商報價
 SupplierProposalStatusDraft=草案（等待驗證）
 SupplierProposalStatusValidated=已驗證（要求已打開）
 SupplierProposalStatusClosed=已關閉
@@ -32,23 +33,26 @@ SupplierProposalStatusValidatedShort=已驗證
 SupplierProposalStatusClosedShort=已關閉
 SupplierProposalStatusSignedShort=已接受
 SupplierProposalStatusNotSignedShort=已拒絕
-CopyAskFrom=複製現有要求以建立價格要求
-CreateEmptyAsk=新增空白的要求
-ConfirmCloneAsk=您確定要複製價格請求<b>%s</b>嗎？
-ConfirmReOpenAsk=您確定要重新打開價格請求<b>%s</b>嗎？
-SendAskByMail=使用郵件發送價格要求
-SendAskRef=傳送價格要求%s
-SupplierProposalCard=要求卡
-ConfirmDeleteAsk=您確定要刪除此價格要求<b>%s</b>嗎？
-ActionsOnSupplierProposal=價格要求紀錄
+CopyAskFrom=複製現有報價以建立供應商報價
+CreateEmptyAsk=建立空白的供應商報價
+ConfirmCloneAsk=您確定要複製供應商報價<b>%s</b>嗎？
+ConfirmReOpenAsk=您確定要重新打開供應商報價<b>%s</b>嗎？
+SendAskByMail=使用郵件發送供應商報價
+SendAskRef=傳送供應商報價%s
+SupplierProposalCard=供應商報價需求卡
+ConfirmDeleteAsk=您確定要刪除供應商報價<b>%s</b>嗎？
+ActionsOnSupplierProposal=供應商報價事件
 DocModelAuroreDescription=完整的需求模組（logo...）
-CommercialAsk=價格要求
-DefaultModelSupplierProposalCreate=預設模型新增
-DefaultModelSupplierProposalToBill=關閉價格要求時的預設範本（已接受）
-DefaultModelSupplierProposalClosed=關閉價格要求時的預設範本（已拒絕）
+CommercialAsk=供應商報價
+DefaultModelSupplierProposalCreate=預設模型建立
+DefaultModelSupplierProposalToBill=關閉供應商報價時的預設範本（已接受）
+DefaultModelSupplierProposalClosed=關閉供應商報價時的預設範本（已拒絕）
 ListOfSupplierProposals=要求供應商提案/建議書清單
 ListSupplierProposalsAssociatedProject=專案中供應商提案/建議書清單
 SupplierProposalsToClose=將供應商提案/建議書結案
 SupplierProposalsToProcess=將處理供應商提案/建議書
-LastSupplierProposals=最新%s價格要求
-AllPriceRequests=所有要求
+LastSupplierProposals=最新%s的供應商報價
+AllPriceRequests=所有供應商報價
+TypeContact_supplier_proposal_external_SHIPPING=供應商出貨聯絡人
+TypeContact_supplier_proposal_external_BILLING=供應商發票聯絡人
+TypeContact_supplier_proposal_external_SERVICE=提案/建議書聯絡人
diff --git a/htdocs/langs/zh_TW/ticket.lang b/htdocs/langs/zh_TW/ticket.lang
index ed96eadd5bc..b4dfb98e9a6 100644
--- a/htdocs/langs/zh_TW/ticket.lang
+++ b/htdocs/langs/zh_TW/ticket.lang
@@ -34,7 +34,8 @@ TicketDictResolution=服務單-決議
 
 TicketTypeShortCOM=商業問題
 TicketTypeShortHELP=請求有用的幫助
-TicketTypeShortISSUE=錯誤或問題
+TicketTypeShortISSUE=問題或錯誤
+TicketTypeShortPROBLEM=問題
 TicketTypeShortREQUEST=變更或增強要求
 TicketTypeShortPROJET=專案
 TicketTypeShortOTHER=其他
@@ -54,14 +55,15 @@ TypeContact_ticket_internal_SUPPORTTEC=已分配用戶
 TypeContact_ticket_external_SUPPORTCLI=客戶聯絡人/事件追踪
 TypeContact_ticket_external_CONTRIBUTOR=外部合作者
 
-OriginEmail=電子郵件來源
+OriginEmail=電子郵件作者
 Notify_TICKET_SENTBYMAIL=以電子郵件發送服務單訊息
 
 # Status
 Read=已讀取
 Assigned=已分配
 InProgress=進行中
-NeedMoreInformation=等待訊息
+NeedMoreInformation=等待作者回覆
+NeedMoreInformationShort=等待回覆
 Answered=已回覆
 Waiting=等待中
 Closed=已關閉
@@ -117,7 +119,7 @@ TicketsShowModuleLogoHelp=啟用此選項可在公共界面的頁面中隱藏商
 TicketsShowCompanyLogo=在公共界面上顯示公司商標
 TicketsShowCompanyLogoHelp=啟用此選項可在公共界面的頁面中隱藏主要公司的商標
 TicketsEmailAlsoSendToMainAddress=同時向主要電子郵件地址寄送通知
-TicketsEmailAlsoSendToMainAddressHelp=Enable this option to also send an email to the address defined into setup "%s" (see tab "%s")
+TicketsEmailAlsoSendToMainAddressHelp=啟用此選項會同時寄送一封Email至設定中預設的電子信箱"%s"(查看分頁"%s")
 TicketsLimitViewAssignedOnly=限制顯示分配給目前用戶的服務單。（對外部用戶無效，始終被限制於他們所依賴的合作方）
 TicketsLimitViewAssignedOnlyHelp=僅顯示分配給目前用戶的服務單。不適用於具有服務單管理權限的用戶。
 TicketsActivatePublicInterface=啟用公共界面
@@ -131,7 +133,7 @@ TicketsDisableCustomerEmail=從公共界面建立服務單時，始終禁用電
 TicketsPublicNotificationNewMessage=當有新的訊息/意見新增到服務單時寄送Email
 TicketsPublicNotificationNewMessageHelp=當公共界面有新增訊息時寄送電子郵件(給已分配用戶或寄送通知電子郵件給(更新)與/或通知電子郵件給)
 TicketPublicNotificationNewMessageDefaultEmail=通知電子郵件寄送到（更新）
-TicketPublicNotificationNewMessageDefaultEmailHelp=Send an email to this address for each new message notifications if the ticket doesn't have a user assigned to it or if the user doesn't have any known email.
+TicketPublicNotificationNewMessageDefaultEmailHelp=如果服務單未分配給用戶或是用戶沒有已知的電子郵件則為每一個新訊息提醒寄送一封電子郵件至這個信箱
 #
 # Index & list page
 #
@@ -160,7 +162,7 @@ CreatedBy=建立者
 NewTicket=新服務單
 SubjectAnswerToTicket=服務單回應
 TicketTypeRequest=需求類型
-TicketCategory=群組
+TicketCategory=服務單分類
 SeeTicket=查閱服務單
 TicketMarkedAsRead=服務單已標記為已讀
 TicketReadOn=繼續讀取
@@ -211,6 +213,7 @@ TicketMessageHelp=此段文字將會被儲存在服務單卡片的訊息清單
 TicketMessageSubstitutionReplacedByGenericValues=替換變量將被替換為一般值。
 TimeElapsedSince=已經過時間
 TicketTimeToRead=讀取前經過的時間
+TicketTimeElapsedBeforeSince=之前/之後經過的時間
 TicketContacts=聯絡人服務單
 TicketDocumentsLinked=已連結到服務單的文件
 ConfirmReOpenTicket=您確定要重新開啟此服務單嗎?

From ab1ba5bc6adaf6a184d1834f064bbe6bb16b3242 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 3 Jul 2021 19:26:04 +0200
Subject: [PATCH 0987/1497] css

---
 htdocs/compta/bank/list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/compta/bank/list.php b/htdocs/compta/bank/list.php
index 67599ffff0e..c1b446a9dd0 100644
--- a/htdocs/compta/bank/list.php
+++ b/htdocs/compta/bank/list.php
@@ -564,7 +564,7 @@ foreach ($accounts as $key => $type) {
 
 	// Account number
 	if (!empty($arrayfields['b.account_number']['checked'])) {
-		print '<td class="tdoverflowmax300">';
+		print '<td class="tdoverflowmax250">';
 		if (!empty($conf->accounting->enabled) && !empty($objecttmp->account_number)) {
 			$accountingaccount = new AccountingAccount($db);
 			$accountingaccount->fetch('', $objecttmp->account_number, 1);

From d51599f8f1819c115b037c98311c7fb919c61921 Mon Sep 17 00:00:00 2001
From: Lenin Rivas <53640168+leninrivas@users.noreply.github.com>
Date: Sat, 3 Jul 2021 22:41:16 -0500
Subject: [PATCH 0988/1497] Update unicode and name of currency

---
 htdocs/install/mysql/data/llx_c_currencies.sql | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_c_currencies.sql b/htdocs/install/mysql/data/llx_c_currencies.sql
index 478c263af4c..df887d68be7 100644
--- a/htdocs/install/mysql/data/llx_c_currencies.sql
+++ b/htdocs/install/mysql/data/llx_c_currencies.sql
@@ -7,6 +7,7 @@
 -- Copyright (C) 2007 	    Patrick Raguin        <patrick.raguin@gmail.com>
 -- Copyright (C) 2011 	    Juanjo Menent         <jmenent@2byte.es>
 -- Copyright (C) 2020 	    Udo Tamm              <dev@dolibit.de>
+-- Copyright (C) 2021 	    Lenin Rivas           <lenin@leninrivas.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
@@ -50,7 +51,7 @@ INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'BDT'
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'BYR', '[112,46]', 1,			  'Belarus Ruble');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'BZD', '[66,90,36]', 1,			'Belize Dollar');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'BMD', '[36]', 1,				    'Bermuda Dollar');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'BOB', '[36,98]', 1,				  'Bolivia Boliviano');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'BOB', '[66,115]', 1,				'Bolivia Boliviano');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'BAM', '[75,77]', 1,			  	'Bosnia and Herzegovina Convertible Marka');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'BWP', '[80]', 1,				    'Botswana Pula');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'BGN', '[1083,1074]', 1,			'Bulgaria Lev');
@@ -70,6 +71,7 @@ INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'CZK'
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'DKK', '[107,114]', 1,	  		'Denmark Krone');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'DOP', '[82,68,36]', 1,			'Dominican Republic Peso');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'XCD', '[36]', 1,		    		'East Caribbean Dollar');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'ECS', '[83,47,46]', 1,		  'Ecuador Sucre');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'EGP', '[163]', 1,	    			'Egypt Pound');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'SVC', '[36]', 1,			    	'El Salvador Colon');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'EEK', '[107,114]', 1,	  		'Estonia Kroon');
@@ -126,7 +128,7 @@ INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'OMR'
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'PKR', '[8360]', 1,		  		'Pakistan Rupee');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'PAB', '[66,47,46]', 1,			'Panama Balboa');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'PYG', '[71,115]', 1,		  	'Paraguay Guarani');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'PEN', '[83,47,46]', 1,			'Peru Nuevo Sol');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'PEN', '[83,47]', 1,			    'Perú Sol');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'PHP', '[8369]', 1,			  	'Philippines Peso');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'PLN', '[122,322]', 1,	  		'Poland Zloty');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'QAR', '[65020]', 1,		  		'Qatar Riyal');

From cb7ac94e15d94b509707f165d248d2402273aaca Mon Sep 17 00:00:00 2001
From: damien clochard <damien@dalibo.com>
Date: Sun, 4 Jul 2021 14:27:51 +0200
Subject: [PATCH 0989/1497] FIX #18085: Migration 13 to 14 : Explicit cast when
 changing the type of llx_c_ticket_category.pos

---
 htdocs/install/mysql/migration/13.0.0-14.0.0.sql | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index a01f589aa20..c10e4aa5282 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -428,6 +428,10 @@ create table llx_eventorganization_conferenceorboothattendee_extrafields
 ALTER TABLE llx_eventorganization_conferenceorboothattendee_extrafields ADD INDEX idx_conferenceorboothattendee_fk_object(fk_object);
 
 ALTER TABLE llx_c_ticket_category ADD COLUMN public integer DEFAULT 0;
+
+-- VPGSQL8.2 ALTER TABLE llx_c_ticket_category ALTER COLUMN pos TYPE INTEGER USING pos::INTEGER;
+-- VPGSQL8.2 ALTER TABLE llx_c_ticket_category ALTER COLUMN pos SET NOT NULL;
+-- VPGSQL8.2 ALTER TABLE llx_c_ticket_category ALTER COLUMN pos SET DEFAULT 0;
 ALTER TABLE llx_c_ticket_category MODIFY COLUMN pos	integer DEFAULT 0 NOT NULL;
 
 

From 744a95ce7e5fc3227c8f712ad7ad1bccacfd14fb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 4 Jul 2021 18:30:20 +0200
Subject: [PATCH 0990/1497] Fix var init

---
 htdocs/admin/index.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/admin/index.php b/htdocs/admin/index.php
index 396570b2155..aa571644871 100644
--- a/htdocs/admin/index.php
+++ b/htdocs/admin/index.php
@@ -51,6 +51,7 @@ if (!empty($conf->global->MAIN_MOTD_SETUPPAGE)) {
 	$conf->global->MAIN_MOTD_SETUPPAGE = preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>/i', '<br>', $conf->global->MAIN_MOTD_SETUPPAGE);
 	if (!empty($conf->global->MAIN_MOTD_SETUPPAGE)) {
 		$i = 0;
+		$reg = array();
 		while (preg_match('/__\(([a-zA-Z|@]+)\)__/i', $conf->global->MAIN_MOTD_SETUPPAGE, $reg) && $i < 100) {
 			$tmp = explode('|', $reg[1]);
 			if (!empty($tmp[1])) {

From 0cccfb1cee8a5cd53c9bfcf31fcefd432707a81f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 4 Jul 2021 19:23:04 +0200
Subject: [PATCH 0991/1497] Fix phpcs v14

---
 htdocs/adherents/card.php                     |  10 +-
 htdocs/admin/accountant.php                   |  13 +-
 htdocs/admin/company.php                      |  16 +-
 htdocs/admin/pdf.php                          |  24 +-
 htdocs/admin/pdf_other.php                    |   3 +-
 htdocs/admin/security.php                     |   2 +-
 htdocs/compta/bank/card.php                   |  14 +-
 htdocs/contact/card.php                       |   2 +
 htdocs/core/class/html.formadmin.class.php    |   2 +
 htdocs/core/lib/functions.lib.php             |   6 +-
 htdocs/langs/en_US/admin.lang                 |   4 +-
 .../template/class/myobject.class.php         |   2 +-
 .../modulebuilder/template/myobject_list.php  |   6 +-
 htdocs/product/card.php                       |  24 +-
 .../inventory/class/inventory.class.php       |  35 +--
 htdocs/product/inventory/list.php             | 205 +++++++++++-------
 htdocs/product/list.php                       |   8 +-
 htdocs/societe/card.php                       |   2 +
 htdocs/theme/eldy/global.inc.php              |   2 +-
 htdocs/theme/md/style.css.php                 |  18 +-
 htdocs/user/card.php                          |   2 +
 21 files changed, 241 insertions(+), 159 deletions(-)

diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index da84fd5bf6b..7c5d074d51e 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -1054,6 +1054,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		// Country
 		$object->country_id = $object->country_id ? $object->country_id : $mysoc->country_id;
 		print '<tr><td width="25%">'.$langs->trans('Country').'</td><td>';
+		print img_picto('', 'country', 'class="pictofixedwidth"');
 		print $form->select_country(GETPOSTISSET('country_id') ? GETPOST('country_id', 'alpha') : $object->country_id, 'country_id');
 		if ($user->admin) {
 			print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
@@ -1064,6 +1065,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		if (empty($conf->global->MEMBER_DISABLE_STATE)) {
 			print '<tr><td>'.$langs->trans('State').'</td><td>';
 			if ($object->country_id) {
+				print img_picto('', 'state', 'class="pictofixedwidth"');
 				print $formcompany->select_state(GETPOSTISSET('state_id') ? GETPOST('state_id', 'int') : $object->state_id, $object->country_code);
 			} else {
 				print $countrynotdefined;
@@ -1303,6 +1305,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		// Country
 		//$object->country_id=$object->country_id?$object->country_id:$mysoc->country_id;    // In edit mode we don't force to company country if not defined
 		print '<tr><td>'.$langs->trans('Country').'</td><td>';
+		print img_picto('', 'country', 'class="pictofixedwidth"');
 		print $form->select_country(GETPOSTISSET("country_id") ? GETPOST("country_id", "alpha") : $object->country_id, 'country_id');
 		if ($user->admin) {
 			print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
@@ -1312,21 +1315,22 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		// State
 		if (empty($conf->global->MEMBER_DISABLE_STATE)) {
 			print '<tr><td>'.$langs->trans('State').'</td><td>';
+			print img_picto('', 'state', 'class="pictofixedwidth"');
 			print $formcompany->select_state($object->state_id, GETPOSTISSET("country_id") ? GETPOST("country_id", "alpha") : $object->country_id);
 			print '</td></tr>';
 		}
 
 		// Pro phone
 		print '<tr><td>'.$langs->trans("PhonePro").'</td>';
-		print '<td>'.img_picto('', 'object_phoning').' <input type="text" name="phone" value="'.(GETPOSTISSET("phone") ? GETPOST("phone") : $object->phone).'"></td></tr>';
+		print '<td>'.img_picto('', 'object_phoning', 'class="pictofixedwidth"').' <input type="text" name="phone" value="'.(GETPOSTISSET("phone") ? GETPOST("phone") : $object->phone).'"></td></tr>';
 
 		// Personal phone
 		print '<tr><td>'.$langs->trans("PhonePerso").'</td>';
-		print '<td>'.img_picto('', 'object_phoning').' <input type="text" name="phone_perso" value="'.(GETPOSTISSET("phone_perso") ? GETPOST("phone_perso") : $object->phone_perso).'"></td></tr>';
+		print '<td>'.img_picto('', 'object_phoning', 'class="pictofixedwidth"').' <input type="text" name="phone_perso" value="'.(GETPOSTISSET("phone_perso") ? GETPOST("phone_perso") : $object->phone_perso).'"></td></tr>';
 
 		// Mobile phone
 		print '<tr><td>'.$langs->trans("PhoneMobile").'</td>';
-		print '<td>'.img_picto('', 'object_phoning_mobile').' <input type="text" name="phone_mobile" value="'.(GETPOSTISSET("phone_mobile") ? GETPOST("phone_mobile") : $object->phone_mobile).'"></td></tr>';
+		print '<td>'.img_picto('', 'object_phoning_mobile', 'class="pictofixedwidth"').' <input type="text" name="phone_mobile" value="'.(GETPOSTISSET("phone_mobile") ? GETPOST("phone_mobile") : $object->phone_mobile).'"></td></tr>';
 
 		if (!empty($conf->socialnetworks->enabled)) {
 			foreach ($socialnetworks as $key => $value) {
diff --git a/htdocs/admin/accountant.php b/htdocs/admin/accountant.php
index 1e924699cd5..7c82775abad 100644
--- a/htdocs/admin/accountant.php
+++ b/htdocs/admin/accountant.php
@@ -131,7 +131,7 @@ print '<input name="town" class="minwidth100" id="town" value="'.(GETPOSTISSET('
 
 // Country
 print '<tr class="oddeven"><td><label for="selectcountry_id">'.$langs->trans("Country").'</label></td><td class="maxwidthonsmartphone">';
-print img_picto('', 'globe-americas', 'class="paddingrightonly"');
+print img_picto('', 'globe-americas', 'class="pictofixedwidth"');
 print $form->select_country((GETPOSTISSET('country_id') ? GETPOST('country_id', 'int') : (!empty($conf->global->MAIN_INFO_ACCOUNTANT_COUNTRY) ? $conf->global->MAIN_INFO_ACCOUNTANT_COUNTRY : '')), 'country_id');
 if ($user->admin) {
 	print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
@@ -139,27 +139,28 @@ if ($user->admin) {
 print '</td></tr>'."\n";
 
 print '<tr class="oddeven"><td><label for="state_id">'.$langs->trans("State").'</label></td><td class="maxwidthonsmartphone">';
-$formcompany->select_departement((GETPOSTISSET('state_id') ? GETPOST('state_id', 'alpha') : (!empty($conf->global->MAIN_INFO_ACCOUNTANT_STATE) ? $conf->global->MAIN_INFO_ACCOUNTANT_STATE : '')), (GETPOSTISSET('country_id') ? GETPOST('country_id', 'int') : (!empty($conf->global->MAIN_INFO_ACCOUNTANT_COUNTRY) ? $conf->global->MAIN_INFO_ACCOUNTANT_COUNTRY : '')), 'state_id');
+print img_picto('', 'state', 'class="pictofixedwidth"');
+print $formcompany->select_state((GETPOSTISSET('state_id') ? GETPOST('state_id', 'alpha') : (!empty($conf->global->MAIN_INFO_ACCOUNTANT_STATE) ? $conf->global->MAIN_INFO_ACCOUNTANT_STATE : '')), (GETPOSTISSET('country_id') ? GETPOST('country_id', 'int') : (!empty($conf->global->MAIN_INFO_ACCOUNTANT_COUNTRY) ? $conf->global->MAIN_INFO_ACCOUNTANT_COUNTRY : '')), 'state_id');
 print '</td></tr>'."\n";
 
 print '<tr class="oddeven"><td><label for="phone">'.$langs->trans("Phone").'</label></td><td>';
-print img_picto('', 'object_phoning', '', false, 0, 0, '', 'paddingright');
+print img_picto('', 'object_phoning', '', false, 0, 0, '', 'pictofixedwidth');
 print '<input name="tel" id="phone" class="maxwidth150 widthcentpercentminusx" value="'.(GETPOSTISSET('tel') ? GETPOST('tel', 'alpha') : (!empty($conf->global->MAIN_INFO_ACCOUNTANT_PHONE) ? $conf->global->MAIN_INFO_ACCOUNTANT_PHONE : '')).'"></td></tr>';
 print '</td></tr>'."\n";
 
 print '<tr class="oddeven"><td><label for="fax">'.$langs->trans("Fax").'</label></td><td>';
-print img_picto('', 'object_phoning_fax', '', false, 0, 0, '', 'paddingright');
+print img_picto('', 'object_phoning_fax', '', false, 0, 0, '', 'pictofixedwidth');
 print '<input name="fax" id="fax" class="maxwidth150 widthcentpercentminusx" value="'.(GETPOSTISSET('fax') ? GETPOST('fax', 'alpha') : (!empty($conf->global->MAIN_INFO_ACCOUNTANT_FAX) ? $conf->global->MAIN_INFO_ACCOUNTANT_FAX : '')).'"></td></tr>';
 print '</td></tr>'."\n";
 
 print '<tr class="oddeven"><td><label for="email">'.$langs->trans("EMail").'</label></td><td>';
-print img_picto('', 'object_email', '', false, 0, 0, '', 'paddingright');
+print img_picto('', 'object_email', '', false, 0, 0, '', 'pictofixedwidth');
 print '<input name="mail" id="email" class="maxwidth150 widthcentpercentminusx" value="'.(GETPOSTISSET('mail') ? GETPOST('mail', 'alpha') : (!empty($conf->global->MAIN_INFO_ACCOUNTANT_MAIL) ? $conf->global->MAIN_INFO_ACCOUNTANT_MAIL : '')).'"></td></tr>';
 print '</td></tr>'."\n";
 
 // Web
 print '<tr class="oddeven"><td><label for="web">'.$langs->trans("Web").'</label></td><td>';
-print img_picto('', 'globe', '', false, 0, 0, '', 'paddingright');
+print img_picto('', 'globe', '', false, 0, 0, '', 'pictofixedwidth');
 print '<input name="web" id="web" class="maxwidth300 widthcentpercentminusx" value="'.(GETPOSTISSET('web') ? GETPOST('web', 'alpha') : (!empty($conf->global->MAIN_INFO_ACCOUNTANT_WEB) ? $conf->global->MAIN_INFO_ACCOUNTANT_WEB : '')).'"></td></tr>';
 print '</td></tr>'."\n";
 
diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index 804ed9934bf..d2dac38b500 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -417,7 +417,7 @@ print '<input name="MAIN_INFO_SOCIETE_TOWN" class="minwidth200" id="MAIN_INFO_SO
 
 // Country
 print '<tr class="oddeven"><td class="fieldrequired"><label for="selectcountry_id">'.$langs->trans("Country").'</label></td><td class="maxwidthonsmartphone">';
-print img_picto('', 'globe-americas', 'class="paddingrightonly"');
+print img_picto('', 'globe-americas', 'class="pictofixedwidth"');
 print $form->select_country($mysoc->country_id, 'country_id', '', 0);
 if ($user->admin) {
 	print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
@@ -430,35 +430,37 @@ if (!empty($conf->global->MAIN_INFO_SOCIETE_STATE)) {
 	$tmp = explode(':', $conf->global->MAIN_INFO_SOCIETE_STATE);
 	$state_id = $tmp[0];
 }
-$formcompany->select_departement($state_id, $mysoc->country_code, 'state_id');
+print img_picto('', 'state', 'class="pictofixedwidth"');
+print $formcompany->select_state($state_id, $mysoc->country_code, 'state_id');
 print '</td></tr>'."\n";
 
 // Currency
 print '<tr class="oddeven"><td><label for="currency">'.$langs->trans("CompanyCurrency").'</label></td><td>';
+print img_picto('', 'multicurrency', 'class="pictofixedwidth"');
 print $form->selectCurrency($conf->currency, "currency");
 print '</td></tr>'."\n";
 
 // Phone
 print '<tr class="oddeven"><td><label for="phone">'.$langs->trans("Phone").'</label></td><td>';
-print img_picto('', 'object_phoning', '', false, 0, 0, '', 'paddingright');
+print img_picto('', 'object_phoning', '', false, 0, 0, '', 'pictofixedwidth');
 print '<input class="maxwidth150 widthcentpercentminusx" name="tel" id="phone" value="'.dol_escape_htmltag((GETPOSTISSET('tel') ? GETPOST('tel', 'alphanohtml') : (!empty($conf->global->MAIN_INFO_SOCIETE_TEL) ? $conf->global->MAIN_INFO_SOCIETE_TEL : ''))).'"></td></tr>';
 print '</td></tr>'."\n";
 
 // Fax
 print '<tr class="oddeven"><td><label for="fax">'.$langs->trans("Fax").'</label></td><td>';
-print img_picto('', 'object_phoning_fax', '', false, 0, 0, '', 'paddingright');
+print img_picto('', 'object_phoning_fax', '', false, 0, 0, '', 'pictofixedwidth');
 print '<input class="maxwidth150" name="fax" id="fax" value="'.dol_escape_htmltag((GETPOSTISSET('fax') ? GETPOST('fax', 'alphanohtml') : (!empty($conf->global->MAIN_INFO_SOCIETE_FAX) ? $conf->global->MAIN_INFO_SOCIETE_FAX : ''))).'"></td></tr>';
 print '</td></tr>'."\n";
 
 // Email
 print '<tr class="oddeven"><td><label for="email">'.$langs->trans("EMail").'</label></td><td>';
-print img_picto('', 'object_email', '', false, 0, 0, '', 'paddingright');
+print img_picto('', 'object_email', '', false, 0, 0, '', 'pictofixedwidth');
 print '<input class="maxwidth150" name="mail" id="email" value="'.dol_escape_htmltag((GETPOSTISSET('mail') ? GETPOST('mail', 'alphanohtml') : (!empty($conf->global->MAIN_INFO_SOCIETE_MAIL) ? $conf->global->MAIN_INFO_SOCIETE_MAIL : ''))).'"></td></tr>';
 print '</td></tr>'."\n";
 
 // Web
 print '<tr class="oddeven"><td><label for="web">'.$langs->trans("Web").'</label></td><td>';
-print img_picto('', 'globe', '', false, 0, 0, '', 'paddingright');
+print img_picto('', 'globe', '', false, 0, 0, '', 'pictofixedwidth');
 print '<input class="maxwidth300 widthcentpercentminusx" name="web" id="web" value="'.dol_escape_htmltag((GETPOSTISSET('web') ? GETPOST('web', 'alphanohtml') : (!empty($conf->global->MAIN_INFO_SOCIETE_WEB) ? $conf->global->MAIN_INFO_SOCIETE_WEB : ''))).'"></td></tr>';
 print '</td></tr>'."\n";
 
@@ -466,7 +468,7 @@ print '</td></tr>'."\n";
 if (!empty($conf->barcode->enabled)) {
 	print '<tr class="oddeven"><td>';
 	print '<label for="barcode">'.$langs->trans("Gencod").'</label></td><td>';
-	print '<span class="fa paddingright fa-barcode"></span>';
+	print '<span class="fa fa-barcode pictofixedwidth"></span>';
 	print '<input name="barcode" id="barcode" class="minwidth150 widthcentpercentminusx maxwidth300" value="'.dol_escape_htmltag((GETPOSTISSET('barcode') ? GETPOST('barcode', 'alphanohtml') : (!empty($conf->global->MAIN_INFO_SOCIETE_GENCODE) ? $conf->global->MAIN_INFO_SOCIETE_GENCODE : ''))).'"></td></tr>';
 	print '</td></tr>';
 }
diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php
index 7d7b5e36a40..d5873e2a50e 100644
--- a/htdocs/admin/pdf.php
+++ b/htdocs/admin/pdf.php
@@ -371,17 +371,7 @@ print $formadmin->select_language($selected, 'PDF_USE_ALSO_LANGUAGE_CODE', 0, nu
 //}
 print '</td></tr>';
 
-//Desc
-
-print '<tr class="oddeven"><td>'.$langs->trans("HideDescOnPDF").'</td><td>';
-if ($conf->use_javascript_ajax) {
-	print ajax_constantonoff('MAIN_GENERATE_DOCUMENTS_HIDE_DESC');
-} else {
-	print $form->selectyesno('MAIN_GENERATE_DOCUMENTS_HIDE_DESC', (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC)) ? $conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC : 0, 1);
-}
-print '</td></tr>';
-
-//Ref
+// Ref
 
 print '<tr class="oddeven"><td>'.$langs->trans("HideRefOnPDF").'</td><td>';
 if ($conf->use_javascript_ajax) {
@@ -391,7 +381,17 @@ if ($conf->use_javascript_ajax) {
 }
 print '</td></tr>';
 
-//Details
+// Desc
+
+print '<tr class="oddeven"><td>'.$langs->trans("HideDescOnPDF").'</td><td>';
+if ($conf->use_javascript_ajax) {
+	print ajax_constantonoff('MAIN_GENERATE_DOCUMENTS_HIDE_DESC');
+} else {
+	print $form->selectyesno('MAIN_GENERATE_DOCUMENTS_HIDE_DESC', (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC)) ? $conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC : 0, 1);
+}
+print '</td></tr>';
+
+// Details
 
 print '<tr class="oddeven"><td>'.$langs->trans("HideDetailsOnPDF").'</td><td>';
 if ($conf->use_javascript_ajax) {
diff --git a/htdocs/admin/pdf_other.php b/htdocs/admin/pdf_other.php
index 03c27fd3721..f836b8f0f0c 100644
--- a/htdocs/admin/pdf_other.php
+++ b/htdocs/admin/pdf_other.php
@@ -116,10 +116,11 @@ print '</td></tr>';
 print '</table>';
 print '</div>';
 
-
+/*
 print '<br><div class="center">';
 print '<input class="button button-save" type="submit" name="save" value="'.$langs->trans("Save").'">';
 print '</div>';
+*/
 
 print '</form>';
 
diff --git a/htdocs/admin/security.php b/htdocs/admin/security.php
index e94dd6bad39..064fb5650a4 100644
--- a/htdocs/admin/security.php
+++ b/htdocs/admin/security.php
@@ -251,7 +251,7 @@ foreach ($arrayhandler as $key => $module) {
 		} elseif ($tmp == 'NotConfigured') {
 			print $langs->trans($tmp);
 		} else {
-			print $tmp;
+			print '<span class="opacitymedium">'.$tmp.'</span>';
 		}
 		print '</td>'."\n";
 
diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index 7f1c830d45b..ea9f7799849 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -399,7 +399,8 @@ if ($action == 'create') {
 	// State
 	print '<tr><td>'.$langs->trans('State').'</td><td>';
 	if ($selectedcode) {
-		$formcompany->select_departement(GETPOSTISSET("account_state_id") ? GETPOST("account_state_id") : '', $selectedcode, 'account_state_id');
+		print img_picto('', 'state', 'class="pictofixedwidth"');
+		print $formcompany->select_state(GETPOSTISSET("account_state_id") ? GETPOST("account_state_id") : '', $selectedcode, 'account_state_id');
 	} else {
 		print $countrynotdefined;
 	}
@@ -407,7 +408,10 @@ if ($action == 'create') {
 
 	// Web
 	print '<tr><td>'.$langs->trans("Web").'</td>';
-	print '<td><input class="minwidth300" type="text" class="flat" name="url" value="'.GETPOST("url").'"></td></tr>';
+	print '<td>';
+	print img_picto('', 'globe', 'class="pictofixedwidth"');
+	print '<input class="minwidth300" type="text" class="flat" name="url" value="'.GETPOST("url").'">';
+	print '</td></tr>';
 
 	// Tags-Categories
 	if ($conf->categorie->enabled) {
@@ -865,6 +869,7 @@ if ($action == 'create') {
 		if (!$selectedcode) {
 			$selectedcode = $conf->currency;
 		}
+		print img_picto('', 'multicurrency', 'class="pictofixedwidth"');
 		print $form->selectCurrency((GETPOSTISSET("account_currency_code") ? GETPOST("account_currency_code") : $selectedcode), 'account_currency_code');
 		//print $langs->trans("Currency".$conf->currency);
 		//print '<input type="hidden" name="account_currency_code" value="'.$conf->currency.'">';
@@ -897,6 +902,7 @@ if ($action == 'create') {
 		// State
 		print '<tr><td>'.$langs->trans('State').'</td><td class="maxwidth200onsmartphone">';
 		if ($selectedcode) {
+			print img_picto('', 'state', 'class="pictofixedwidth"');
 			print $formcompany->select_state(GETPOSTISSET("account_state_id") ? GETPOST("account_state_id") : $object->state_id, $selectedcode, 'account_state_id');
 		} else {
 			print $countrynotdefined;
@@ -925,7 +931,9 @@ if ($action == 'create') {
 
 		// Web
 		print '<tr><td>'.$langs->trans("Web").'</td>';
-		print '<td><input class="maxwidth200onsmartphone" type="text" class="flat" name="url" value="'.(GETPOSTISSET("url") ? GETPOST("url") : $object->url).'">';
+		print '<td>';
+		print img_picto('', 'globe', 'class="pictofixedwidth"');
+		print '<input class="maxwidth200onsmartphone" type="text" class="flat" name="url" value="'.(GETPOSTISSET("url") ? GETPOST("url") : $object->url).'">';
 		print '</td></tr>';
 
 		// Tags-Categories
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index dea4f9d185d..469869f00e9 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -726,6 +726,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				}
 
 				if ($object->country_id) {
+					print img_picto('', 'state', 'class="pictofixedwidth"');
 					print $formcompany->select_state(GETPOST("state_id", 'alpha') ? GETPOST("state_id", 'alpha') : $object->state_id, $object->country_code, 'state_id');
 				} else {
 					print $countrynotdefined;
@@ -1019,6 +1020,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 					print '<tr><td><label for="state_id">'.$langs->trans('State').'</label></td><td colspan="3" class="maxwidthonsmartphone">';
 				}
 
+				print img_picto('', 'state', 'class="pictofixedwidth"');
 				print $formcompany->select_state(GETPOSTISSET('state_id') ? GETPOST('state_id', 'alpha') : $object->state_id, $object->country_code, 'state_id');
 				print '</td></tr>';
 			}
diff --git a/htdocs/core/class/html.formadmin.class.php b/htdocs/core/class/html.formadmin.class.php
index 411b45e03a7..d45f952d8b2 100644
--- a/htdocs/core/class/html.formadmin.class.php
+++ b/htdocs/core/class/html.formadmin.class.php
@@ -444,6 +444,8 @@ class FormAdmin
 		}
 		$out .= '</select>';
 
+		$out .= ajax_combobox($htmlname);
+
 		return $out;
 	}
 }
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 28c553d747c..28da21926ab 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3522,7 +3522,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'chevron-left', 'chevron-right', 'chevron-down', 'chevron-top', 'commercial', 'companies',
 				'generic', 'home', 'hrm', 'members', 'products', 'invoicing',
 				'partnership', 'payment', 'pencil-ruler', 'preview', 'project', 'projectpub', 'projecttask', 'question', 'refresh', 'salary', 'shipment',
-				'supplier_invoice', 'supplier_invoicea', 'supplier_invoicer', 'supplier_invoiced',
+				'state', 'supplier_invoice', 'supplier_invoicea', 'supplier_invoicer', 'supplier_invoiced',
 				'technic', 'ticket',
 				'error', 'warning',
 				'recent', 'reception', 'recruitmentcandidature', 'recruitmentjobposition', 'resource',
@@ -3572,7 +3572,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'recent' => 'question', 'reception'=>'dolly', 'recruitmentjobposition'=>'id-card-alt', 'recruitmentcandidature'=>'id-badge',
 				'resize'=>'crop', 'supplier_order'=>'dol-order_supplier', 'supplier_proposal'=>'file-signature',
 				'refresh'=>'redo', 'resource'=>'laptop-house',
-				'security'=>'key', 'salary'=>'wallet', 'shipment'=>'dolly', 'stock'=>'box-open', 'stats' => 'chart-bar', 'split'=>'code-branch', 'stripe'=>'stripe-s',
+				'state'=>'map-marked', 'security'=>'key', 'salary'=>'wallet', 'shipment'=>'dolly', 'stock'=>'box-open', 'stats' => 'chart-bar', 'split'=>'code-branch', 'stripe'=>'stripe-s',
 				'supplier'=>'building', 'supplier_invoice'=>'file-invoice-dollar', 'technic'=>'cogs', 'ticket'=>'ticket-alt',
 				'timespent'=>'clock', 'title_setup'=>'tools', 'title_accountancy'=>'money-check-alt', 'title_bank'=>'university', 'title_hrm'=>'umbrella-beach',
 				'title_agenda'=>'calendar-alt',
@@ -3673,7 +3673,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'partnership'=>'#6c6aa8', 'playdisabled'=>'#ccc', 'printer'=>'#444', 'projectpub'=>'#986c6a', 'reception'=>'#a69944', 'resize'=>'#444', 'rss'=>'#cba',
 				//'shipment'=>'#a69944',
 				'security'=>'#999', 'stats'=>'#444', 'switch_off'=>'#999', 'technic'=>'#999', 'timespent'=>'#555',
-				'uncheck'=>'#800', 'uparrow'=>'#555', 'user-cog'=>'#999', 'country'=>'#aaa', 'globe-americas'=>'#aaa',
+				'uncheck'=>'#800', 'uparrow'=>'#555', 'user-cog'=>'#999', 'country'=>'#aaa', 'globe-americas'=>'#aaa', 'state'=>'#aaa',
 				'website'=>'#304', 'workstation'=>'#a69944'
 			);
 			if (isset($arrayconvpictotocolor[$pictowithouttext])) {
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 0fef25c033a..2a726e9eefe 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1260,8 +1260,8 @@ YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP
 DownloadMoreSkins=More skins to download
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
-ShowProfIdInAddress=Show professional id with addresses
-ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
+ShowProfIdInAddress=Show professional ID with addresses
+ShowVATIntaInAddress=Hide intra-Community VAT number
 TranslationUncomplete=Partial translation
 MAIN_DISABLE_METEO=Disable meteorological view
 MeteoStdMod=Standard mode
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index 41ea75ec515..f07a0f04a10 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -84,7 +84,7 @@ class MyObject extends CommonObject
 	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
-	 *  'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'maxwidth200', 'wordbreak', 'tdoverflowmax200'
+	 *  'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'maxwidth200', 'wordbreak', 'tdoverflowmax200', 'minwidth300 maxwidth500 widthcentpercentminusx'
 	 *  'help' is a 'TranslationString' to use to show a tooltip on field. You can also use 'TranslationString:keyfortooltiponlick' for a tooltip on click.
 	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
 	 *  'disabled' is 1 if we want to have the field locked by a 'disabled' attribute. In most cases, this is never set into the definition of $fields into class, but is set dynamically by some part of code.
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index abc8b879d33..76d736a5670 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -328,7 +328,8 @@ $sql .= $hookmanager->resPrint;
 
 /* If a group by is required
 $sql.= " GROUP BY ";
-foreach($object->fields as $key => $val) {
+foreach($object->fields as $key => $val)
+{
 	$sql.='t.'.$key.', ';
 }
 // Add fields from extrafields
@@ -337,7 +338,7 @@ if (! empty($extrafields->attributes[$object->table_element]['label'])) {
 }
 // Add where from hooks
 $parameters=array();
-$reshook=$hookmanager->executeHooks('printFieldListGroupBy',$parameters, $object);    // Note that $action and $object may have been modified by hook
+$reshook=$hookmanager->executeHooks('printFieldListGroupBy', $parameters, $object);    // Note that $action and $object may have been modified by hook
 $sql.=$hookmanager->resPrint;
 $sql=preg_replace('/,\s*$/','', $sql);
 */
@@ -452,6 +453,7 @@ print '<input type="hidden" name="formfilteraction" id="formfilteraction" value=
 print '<input type="hidden" name="action" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
 $newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', dol_buildpath('/mymodule/myobject_card.php', 1).'?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $permissiontoadd);
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 0aff87cc28b..3d5afd1b16c 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1106,11 +1106,12 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			// Product specific batch number management
 			$status_batch = GETPOST('status_batch');
 			if ($status_batch !== '0') {
+				$langs->load("admin");
 				$tooltip = $langs->trans("GenericMaskCodes", $langs->transnoentities("Batch"), $langs->transnoentities("Batch"));
-				$tooltip .= $langs->trans("GenericMaskCodes2");
-				$tooltip .= $langs->trans("GenericMaskCodes3");
-				$tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("Batch"), $langs->transnoentities("Batch"));
-				$tooltip .= $langs->trans("GenericMaskCodes5");
+				$tooltip .= '<br>'.$langs->trans("GenericMaskCodes2");
+				$tooltip .= '<br>'.$langs->trans("GenericMaskCodes3");
+				$tooltip .= '<br>'.$langs->trans("GenericMaskCodes4a", $langs->transnoentities("Batch"), $langs->transnoentities("Batch"));
+				$tooltip .= '<br>'.$langs->trans("GenericMaskCodes5");
 				if (($conf->global->PRODUCTBATCH_LOT_USE_PRODUCT_MASKS && $conf->global->PRODUCTBATCH_LOT_ADDON == 'mod_lot_advanced')
 					|| ($conf->global->PRODUCTBATCH_SN_USE_PRODUCT_MASKS && $conf->global->PRODUCTBATCH_SN_ADDON == 'mod_sn_advanced')) {
 					print '<tr><td id="mask_option">'.$langs->trans("ManageLotMask").'</td>';
@@ -1301,7 +1302,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print '<tr><td>'.$langs->trans("CountryOrigin").'</td>';
 			print '<td>';
 			print img_picto('', 'globe-americas', 'class="paddingrightonly"');
-			print $form->select_country((GETPOSTISSET('country_id') ? GETPOST('country_id') : $object->country_id), 'country_id', '', 0, 'minwidth300 widthcentpercentminusx');
+			print $form->select_country((GETPOSTISSET('country_id') ? GETPOST('country_id') : $object->country_id), 'country_id', '', 0, 'minwidth300 widthcentpercentminusx maxwidth500');
 			if ($user->admin) {
 				print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 			}
@@ -1316,6 +1317,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 					print '<td>'.$form->editfieldkey('StateOrigin', 'state_id', '', $object, 0).'</td><td>';
 				}
 
+				print img_picto('', 'state', 'class="pictofixedwidth"');
 				print $formcompany->select_state($object->state_id, $object->country_code);
 				print '</tr>';
 			}
@@ -1627,11 +1629,12 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 					print $form->selectarray('status_batch', $statutarray, $object->status_batch);
 					print '</td></tr>';
 					if ($object->status_batch !== '0') {
+						$langs->load("admin");
 						$tooltip = $langs->trans("GenericMaskCodes", $langs->transnoentities("Batch"), $langs->transnoentities("Batch"));
-						$tooltip .= $langs->trans("GenericMaskCodes2");
-						$tooltip .= $langs->trans("GenericMaskCodes3");
-						$tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("Batch"), $langs->transnoentities("Batch"));
-						$tooltip .= $langs->trans("GenericMaskCodes5");
+						$tooltip .= '<br>'.$langs->trans("GenericMaskCodes2");
+						$tooltip .= '<br>'.$langs->trans("GenericMaskCodes3");
+						$tooltip .= '<br>'.$langs->trans("GenericMaskCodes4a", $langs->transnoentities("Batch"), $langs->transnoentities("Batch"));
+						$tooltip .= '<br>'.$langs->trans("GenericMaskCodes5");
 						print '<tr><td id="mask_option">'.$langs->trans("ManageLotMask").'</td>';
 						if ($object->status_batch == '1' && $conf->global->PRODUCTBATCH_LOT_USE_PRODUCT_MASKS && $conf->global->PRODUCTBATCH_LOT_ADDON == 'mod_lot_advanced') {
 							$mask = !empty($object->batch_mask) ? $object->batch_mask : $conf->global->LOT_ADVANCED_MASK;
@@ -1724,6 +1727,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			// Public Url
 			if (empty($conf->global->PRODUCT_DISABLE_PUBLIC_URL)) {
 				print '<tr><td>'.$langs->trans("PublicUrl").'</td><td>';
+				print img_picto('', 'globe', 'class="pictofixedwidth"');
 				print '<input type="text" name="url" class="quatrevingtpercent" value="'.$object->url.'">';
 				print '</td></tr>';
 			}
@@ -1732,6 +1736,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			if ($object->isProduct() && !empty($conf->stock->enabled)) {
 				// Default warehouse
 				print '<tr><td>'.$langs->trans("DefaultWarehouse").'</td><td>';
+				print img_picto($langs->trans("DefaultWarehouse"), 'stock', 'class="pictofixedwidth"');
 				print $formproduct->selectWarehouses($object->fk_default_warehouse, 'fk_default_warehouse', 'warehouseopen', 1);
 				print ' <a href="'.DOL_URL_ROOT.'/product/stock/card.php?action=create&amp;backtopage='.urlencode($_SERVER['PHP_SELF'].'?action=create&type='.GETPOST('type', 'int')).'"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddWarehouse").'"></span></a>';
 				print '</td></tr>';
@@ -1835,6 +1840,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 						print '<td>'.$form->editfieldkey('StateOrigin', 'state_id', '', $object, 0).'</td><td>';
 					}
 
+					print img_picto('', 'state', 'class="pictofixedwidth"');
 					print $formcompany->select_state($object->state_id, $object->country_code);
 					print '</td>';
 					print '</tr>';
diff --git a/htdocs/product/inventory/class/inventory.class.php b/htdocs/product/inventory/class/inventory.class.php
index 1adc9189892..9fb74c96f83 100644
--- a/htdocs/product/inventory/class/inventory.class.php
+++ b/htdocs/product/inventory/class/inventory.class.php
@@ -65,24 +65,29 @@ class Inventory extends CommonObject
 	const STATUS_CANCELED = 9;
 
 	/**
-	 *  'type' if the field format ('integer', 'integer:ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter]]', 'varchar(x)', 'double(24,8)', 'real', 'price', 'text', 'html', 'date', 'datetime', 'timestamp', 'duration', 'mail', 'phone', 'url', 'password')
+	 *  'type' field format ('integer', 'integer:ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter]]', 'sellist:TableName:LabelFieldName[:KeyFieldName[:KeyFieldParent[:Filter]]]', 'varchar(x)', 'double(24,8)', 'real', 'price', 'text', 'text:none', 'html', 'date', 'datetime', 'timestamp', 'duration', 'mail', 'phone', 'url', 'password')
 	 *         Note: Filter can be a string like "(t.ref:like:'SO-%') or (t.date_creation:<:'20160101') or (t.nature:is:NULL)"
 	 *  'label' the translation key.
-	 *  'enabled' is a condition when the field must be managed.
+	 *  'picto' is code of a picto to show before value in forms
+	 *  'enabled' is a condition when the field must be managed (Example: 1 or '$conf->global->MY_SETUP_PARAM)
+	 *  'position' is the sort order of field.
+	 *  'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
 	 *  'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). 5=Visible on list and view only (not create/not update). Using a negative value means field is not shown by default on list but can be selected for viewing)
 	 *  'noteditable' says if field is not editable (1 or 0)
-	 *  'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
-	 *  'default' is a default value for creation (can still be replaced by the global setup of default values)
+	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
 	 *  'index' if we want an index in database.
 	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
-	 *  'position' is the sort order of field.
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
-	 *  'css' is the CSS style to use on field. For example: 'maxwidth200'
-	 *  'help' is a string visible as a tooltip on field
-	 *  'comment' is not used. You can store here any text of your choice. It is not used by application.
+	 *  'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'maxwidth200', 'wordbreak', 'tdoverflowmax200', 'minwidth300 maxwidth500 widthcentpercentminusx'
+	 *  'help' is a 'TranslationString' to use to show a tooltip on field. You can also use 'TranslationString:keyfortooltiponlick' for a tooltip on click.
 	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
-	 *  'arrayofkeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
+	 *  'disabled' is 1 if we want to have the field locked by a 'disabled' attribute. In most cases, this is never set into the definition of $fields into class, but is set dynamically by some part of code.
+	 *  'arrayofkeyval' to set a list of values if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel"). Note that type can be 'integer' or 'varchar'
+	 *  'autofocusoncreate' to have field having the focus on a create form. Only 1 field should have this property set to 1.
+	 *  'comment' is not used. You can store here any text of your choice. It is not used by application.
+	 *
+	 *  Note: To have value dynamic, you can set value to 0 in definition and edit the value on the fly into the constructor.
 	 */
 
 	// BEGIN MODULEBUILDER PROPERTIES
@@ -93,17 +98,17 @@ class Inventory extends CommonObject
 		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'visible'=>-1, 'enabled'=>1, 'position'=>1, 'notnull'=>1, 'index'=>1, 'comment'=>'Id',),
 		'ref' => array('type'=>'varchar(64)', 'label'=>'Ref', 'visible'=>1, 'enabled'=>1, 'position'=>10, 'notnull'=>1, 'index'=>1, 'searchall'=>1, 'comment'=>'Reference of object', 'css'=>'maxwidth200'),
 		'entity'         => array('type'=>'integer', 'label'=>'Entity', 'visible'=>0, 'enabled'=>1, 'position'=>20, 'notnull'=>1, 'index'=>1,),
-		'title'          => array('type'=>'varchar(255)', 'label'=>'Label', 'visible'=>1, 'enabled'=>1, 'position'=>25, 'css'=>'minwidth300'),
-		'fk_warehouse'   => array('type'=>'integer:Entrepot:product/stock/class/entrepot.class.php', 'label'=>'Warehouse', 'visible'=>1, 'enabled'=>1, 'position'=>30, 'index'=>1, 'help'=>'InventoryForASpecificWarehouse'),
-		'fk_product'     => array('type'=>'integer:Product:product/class/product.class.php', 'label'=>'Product', 'visible'=>1, 'enabled'=>1, 'position'=>32, 'index'=>1, 'help'=>'InventoryForASpecificProduct'),
+		'title'          => array('type'=>'varchar(255)', 'label'=>'Label', 'visible'=>1, 'enabled'=>1, 'position'=>25, 'css'=>'minwidth300', 'csslist'=>'tdoverflowmax200'),
+		'fk_warehouse'   => array('type'=>'integer:Entrepot:product/stock/class/entrepot.class.php', 'label'=>'Warehouse', 'visible'=>1, 'enabled'=>1, 'position'=>30, 'index'=>1, 'help'=>'InventoryForASpecificWarehouse', 'picto'=>'stock', 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'csslist'=>'tdoverflowmax200'),
+		'fk_product'     => array('type'=>'integer:Product:product/class/product.class.php', 'label'=>'Product', 'visible'=>1, 'enabled'=>1, 'position'=>32, 'index'=>1, 'help'=>'InventoryForASpecificProduct', 'picto'=>'product', 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'csslist'=>'tdoverflowmax200'),
 		'date_inventory' => array('type'=>'date', 'label'=>'DateValue', 'visible'=>1, 'enabled'=>1, 'position'=>35),
 
 		'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>500),
 		'tms'           => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>501),
 		'date_validation' => array('type'=>'datetime', 'label'=>'DateValidation', 'visible'=>-2, 'enabled'=>1, 'position'=>502),
-		'fk_user_creat' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>510, 'foreignkey'=>'user.rowid'),
-		'fk_user_modif' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'position'=>511),
-		'fk_user_valid' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserValidation', 'visible'=>-2, 'enabled'=>1, 'position'=>512),
+		'fk_user_creat' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>510, 'foreignkey'=>'user.rowid', 'csslist'=>'tdoverflowmax200'),
+		'fk_user_modif' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'position'=>511, 'csslist'=>'tdoverflowmax200'),
+		'fk_user_valid' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserValidation', 'visible'=>-2, 'enabled'=>1, 'position'=>512, 'csslist'=>'tdoverflowmax200'),
 		'import_key'    => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'index'=>0, 'position'=>1000),
 
 		'status' => array('type'=>'integer', 'label'=>'Status', 'visible'=>4, 'enabled'=>1, 'position'=>1000, 'notnull'=>1, 'default'=>0, 'index'=>1, 'arrayofkeyval'=>array(0=>'Draft', 1=>'Validated', 2=>'Recorded', 9=>'Canceled'))
diff --git a/htdocs/product/inventory/list.php b/htdocs/product/inventory/list.php
index 84f9bc137b6..7d792c82ec1 100644
--- a/htdocs/product/inventory/list.php
+++ b/htdocs/product/inventory/list.php
@@ -49,8 +49,9 @@ $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) {
+	// If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
 	$page = 0;
-}     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
+}
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
@@ -66,12 +67,59 @@ $search_array_options = $extrafields->getOptionalsFromPost($object->table_elemen
 
 // Default sort order (if not yet defined by previous GETPOST)
 if (!$sortfield) {
+	reset($object->fields);					// Reset is required to avoid key() to return null.
 	$sortfield = "t.".key($object->fields); // Set here default search field. By default 1st field in definition.
 }
 if (!$sortorder) {
 	$sortorder = "ASC";
 }
 
+// Initialize array of search criterias
+$search_all = GETPOST('search_all', 'alphanohtml');
+$search = array();
+foreach ($object->fields as $key => $val) {
+	if (GETPOST('search_'.$key, 'alpha') !== '') {
+		$search[$key] = GETPOST('search_'.$key, 'alpha');
+	}
+	if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
+		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOST('search_'.$key.'_dtstartmonth', 'int'), GETPOST('search_'.$key.'_dtstartday', 'int'), GETPOST('search_'.$key.'_dtstartyear', 'int'));
+		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOST('search_'.$key.'_dtendmonth', 'int'), GETPOST('search_'.$key.'_dtendday', 'int'), GETPOST('search_'.$key.'_dtendyear', 'int'));
+	}
+}
+
+// List of fields to search into when doing a "search in all"
+$fieldstosearchall = array();
+foreach ($object->fields as $key => $val) {
+	if (!empty($val['searchall'])) {
+		$fieldstosearchall['t.'.$key] = $val['label'];
+	}
+}
+
+// Definition of array of fields for columns
+$arrayfields = array();
+foreach ($object->fields as $key => $val) {
+	// If $val['visible']==0, then we never show the field
+	if (!empty($val['visible'])) {
+		$visible = (int) dol_eval($val['visible'], 1);
+		$arrayfields['t.'.$key] = array(
+			'label'=>$val['label'],
+			'checked'=>(($visible < 0) ? 0 : 1),
+			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
+			'position'=>$val['position'],
+			'help'=>$val['help']
+		);
+	}
+}
+// Extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
+
+$object->fields = dol_sort_array($object->fields, 'position');
+$arrayfields = dol_sort_array($arrayfields, 'position');
+
+$permissiontoread = $user->rights->stock->lire;
+$permissiontoadd = $user->rights->stock->creer;
+$permissiontodelete = $user->rights->stock->supprimer;
+
 // Security check
 $socid = 0;
 if ($user->socid > 0) {	// Protection if external user
@@ -84,58 +132,14 @@ if (empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
 	$result = restrictedArea($user, 'stock', $objectid, '', 'inventory_advance');
 }
 
-// Initialize array of search criterias
-$search_all = GETPOST("search_all", 'alpha');
-$search = array();
-foreach ($object->fields as $key => $val) {
-	if (GETPOST('search_'.$key, 'alpha')) {
-		$search[$key] = GETPOST('search_'.$key, 'alpha');
-	}
-}
-
-// List of fields to search into when doing a "search in all"
-$fieldstosearchall = array();
-foreach ($object->fields as $key => $val) {
-	if (!empty($val['searchall'])) {
-		$fieldstosearchall['t.'.$key] = $val['label'];
-	}
-}
-
-// Definition of fields for list
-$arrayfields = array();
-foreach ($object->fields as $key => $val) {
-	// If $val['visible']==0, then we never show the field
-	if (!empty($val['visible'])) {
-		$arrayfields['t.'.$key] = array('label'=>$val['label'], 'checked'=>(($val['visible'] < 0) ? 0 : 1), 'enabled'=>($val['enabled'] && ($val['visible'] != 3)), 'position'=>$val['position']);
-	}
-}
-// Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0) {
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-		if (!empty($extrafields->attributes[$object->table_element]['list'][$key])) {
-			$arrayfields["ef.".$key] = array(
-				'label'=>$extrafields->attributes[$object->table_element]['label'][$key],
-				'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1),
-				'position'=>$extrafields->attributes[$object->table_element]['pos'][$key],
-				'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key])
-			);
-		}
-	}
-}
-$object->fields = dol_sort_array($object->fields, 'position');
-$arrayfields = dol_sort_array($arrayfields, 'position');
-
-$permissiontoread = $user->rights->stock->lire;
-$permissiontoadd = $user->rights->stock->creer;
-$permissiontodelete = $user->rights->stock->supprimer;
-
 
 /*
  * Actions
  */
 
 if (GETPOST('cancel', 'alpha')) {
-	$action = 'list'; $massaction = '';
+	$action = 'list';
+	$massaction = '';
 }
 if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
 	$massaction = '';
@@ -155,8 +159,12 @@ if (empty($reshook)) {
 	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
 		foreach ($object->fields as $key => $val) {
 			$search[$key] = '';
+			if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
+				$search[$key.'_dtstart'] = '';
+				$search[$key.'_dtend'] = '';
+			}
 		}
-		$toselect = '';
+		$toselect = array();
 		$search_array_options = array();
 	}
 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
@@ -184,18 +192,18 @@ $now = dol_now();
 //$help_url="EN:Module_Inventory|FR:Module_Inventory_FR|ES:Módulo_Inventory";
 $help_url = '';
 $title = $langs->trans('ListOfInventories');
+$morejs = array();
+$morecss = array();
 
 
 // Build and execute select
 // --------------------------------------------------------------------
 $sql = 'SELECT ';
-foreach ($object->fields as $key => $val) {
-	$sql .= 't.'.$key.', ';
-}
+$sql .= $object->getFieldList('t');
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.' as options_'.$key.', ' : '');
+		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key.' as options_'.$key.', ' : '');
 	}
 }
 // Add fields from hooks
@@ -204,29 +212,48 @@ $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $obje
 $sql .= preg_replace('/^,/', '', $hookmanager->resPrint);
 $sql = preg_replace('/,\s*$/', '', $sql);
 $sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
+if (isset($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (t.rowid = ef.fk_object)";
 }
+// Add table from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
 if ($object->ismultientitymanaged == 1) {
 	$sql .= " WHERE t.entity IN (".getEntity($object->element).")";
 } else {
 	$sql .= " WHERE 1 = 1";
 }
 foreach ($search as $key => $val) {
-	if ($key == 'status' && $search[$key] == -1) {
-		continue;
-	}
-	$mode_search = (($object->isInt($object->fields[$key]) || $object->isFloat($object->fields[$key])) ? 1 : 0);
-	if (strpos($object->fields[$key]['type'], 'integer:') === 0) {
-		if ($search[$key] == '-1') {
-			$search[$key] = '';
+	if (array_key_exists($key, $object->fields)) {
+		if ($key == 'status' && $search[$key] == -1) {
+			continue;
+		}
+		$mode_search = (($object->isInt($object->fields[$key]) || $object->isFloat($object->fields[$key])) ? 1 : 0);
+		if ((strpos($object->fields[$key]['type'], 'integer:') === 0) || (strpos($object->fields[$key]['type'], 'sellist:') === 0) || !empty($object->fields[$key]['arrayofkeyval'])) {
+			if ($search[$key] == '-1' || $search[$key] === '0') {
+				$search[$key] = '';
+			}
+			$mode_search = 2;
+		}
+		if ($search[$key] != '') {
+			$sql .= natural_search($key, $search[$key], (($key == 'status') ? 2 : $mode_search));
+		}
+	} else {
+		if (preg_match('/(_dtstart|_dtend)$/', $key) && $search[$key] != '') {
+			$columnName=preg_replace('/(_dtstart|_dtend)$/', '', $key);
+			if (preg_match('/^(date|timestamp|datetime)/', $object->fields[$columnName]['type'])) {
+				if (preg_match('/_dtstart$/', $key)) {
+					$sql .= " AND t." . $columnName . " >= '" . $db->idate($search[$key]) . "'";
+				}
+				if (preg_match('/_dtend$/', $key)) {
+					$sql .= " AND t." . $columnName . " <= '" . $db->idate($search[$key]) . "'";
+				}
+			}
 		}
-		$mode_search = 2;
-	}
-	if ($search[$key] != '') {
-		$sql .= natural_search($key, $search[$key], (($key == 'status') ? 2 : $mode_search));
 	}
 }
+
 if ($search_all) {
 	$sql .= natural_search(array_keys($fieldstosearchall), $search_all);
 }
@@ -239,7 +266,7 @@ $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $objec
 $sql .= $hookmanager->resPrint;
 
 /* If a group by is required
-$sql.= " GROUP BY "
+$sql.= " GROUP BY ";
 foreach($object->fields as $key => $val)
 {
 	$sql.='t.'.$key.', ';
@@ -250,7 +277,7 @@ if (! empty($extrafields->attributes[$object->table_element]['label'])) {
 }
 // Add where from hooks
 $parameters=array();
-$reshook=$hookmanager->executeHooks('printFieldListGroupBy',$parameters);    // Note that $action and $object may have been modified by hook
+$reshook=$hookmanager->executeHooks('printFieldListGroupBy', $parameters, $object);    // Note that $action and $object may have been modified by hook
 $sql.=$hookmanager->resPrint;
 $sql=preg_replace('/,\s*$/','', $sql);
 */
@@ -296,7 +323,7 @@ if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $
 // Output page
 // --------------------------------------------------------------------
 
-llxHeader('', $title, $help_url);
+llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'classforhorizontalscrolloftabs');
 
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
@@ -321,6 +348,10 @@ if ($optioncss != '') {
 }
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
+// Add $param from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object); // Note that $action and $object may have been modified by hook
+$param .= $hookmanager->resPrint;
 
 // List of mass actions available
 $arrayofmassactions = array(
@@ -337,7 +368,7 @@ if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'pr
 }
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
-print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
+print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
 if ($optioncss != '') {
 	print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 }
@@ -351,7 +382,7 @@ print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
 $newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/product/inventory/card.php?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $permissiontoadd);
 
-print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, $object->picto, 0, $newcardbutton, '', $limit);
+print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, $object->picto, 0, $newcardbutton, '', $limit, 0, 0, 1);
 
 // Add code for pre mass action (confirmation or email presend form)
 $topicmail = "Information";
@@ -391,31 +422,38 @@ $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfi
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
-print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 
 // Fields title search
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
 foreach ($object->fields as $key => $val) {
-	$cssforfield = (empty($val['css']) ? '' : $val['css']);
+	$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 	if ($key == 'status') {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
 	} elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
 	} elseif (in_array($val['type'], array('timestamp'))) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') {
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
 	}
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
 		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
-			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
-		} elseif (strpos($val['type'], 'integer:') === 0) {
-			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
-		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) {
-			print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
+			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], (isset($search[$key]) ? $search[$key] : ''), $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
+		} elseif ((strpos($val['type'], 'integer:') === 0) || (strpos($val['type'], 'sellist:') === 0)) {
+			print $object->showInputField($val, $key, (isset($search[$key]) ? $search[$key] : ''), '', '', 'search_', 'maxwidth125', 1);
+		} elseif (!preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
+			print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag(isset($search[$key]) ? $search[$key] : '').'">';
+		} elseif (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
+			print '<div class="nowrap">';
+			print $form->selectDate($search[$key.'_dtstart'] ? $search[$key.'_dtstart'] : '', "search_".$key."_dtstart", 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+			print '</div>';
+			print '<div class="nowrap">';
+			print $form->selectDate($search[$key.'_dtend'] ? $search[$key.'_dtend'] : '', "search_".$key."_dtend", 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
+			print '</div>';
 		}
 		print '</td>';
 	}
@@ -439,14 +477,14 @@ print '</tr>'."\n";
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
 foreach ($object->fields as $key => $val) {
-	$cssforfield = (empty($val['css']) ? '' : $val['css']);
+	$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 	if ($key == 'status') {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
 	} elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
 	} elseif (in_array($val['type'], array('timestamp'))) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') {
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
 	}
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
@@ -466,7 +504,7 @@ print '</tr>'."\n";
 
 // Detect if we need a fetch on each output line
 $needToFetchEachLine = 0;
-if (is_array($extrafields->attributes[$object->table_element]['computed']) && count($extrafields->attributes[$object->table_element]['computed']) > 0) {
+if (isset($extrafields->attributes[$object->table_element]['computed']) && is_array($extrafields->attributes[$object->table_element]['computed']) && count($extrafields->attributes[$object->table_element]['computed']) > 0) {
 	foreach ($extrafields->attributes[$object->table_element]['computed'] as $key => $val) {
 		if (preg_match('/\$object/', $val)) {
 			$needToFetchEachLine++; // There is at least one compute field that use $object
@@ -478,6 +516,7 @@ if (is_array($extrafields->attributes[$object->table_element]['computed']) && co
 // --------------------------------------------------------------------
 $i = 0;
 $totalarray = array();
+$totalarray['nbfield'] = 0;
 while ($i < ($limit ? min($num, $limit) : $num)) {
 	$obj = $db->fetch_object($resql);
 	if (empty($obj)) {
@@ -490,7 +529,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 	// Show here line of result
 	print '<tr class="oddeven">';
 	foreach ($object->fields as $key => $val) {
-		$cssforfield = (empty($val['css']) ? '' : $val['css']);
+		$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 		if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
 			$cssforfield .= ($cssforfield ? ' ' : '').'center';
 		} elseif ($key == 'status') {
@@ -503,7 +542,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
 		}
 
-		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $key != 'status') {
+		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', 'status')) && empty($val['arrayofkeyval'])) {
 			$cssforfield .= ($cssforfield ? ' ' : '').'right';
 		}
 
@@ -511,6 +550,8 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 			print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '').'>';
 			if ($key == 'status') {
 				print $object->getLibStatut(5);
+			} elseif ($key == 'rowid') {
+				print $object->showOutputField($val, $key, $object->id, '');
 			} else {
 				print $object->showOutputField($val, $key, $object->$key, '');
 			}
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 4ec2fcbadb1..a975dc2c21b 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -1023,11 +1023,15 @@ if ($resql) {
 	}
 	// Country
 	if (!empty($arrayfields['p.fk_country']['checked'])) {
-		print '<td class="liste_titre center">'.$form->select_country($search_country, 'search_country', '', 0).'</td>';
+		print '<td class="liste_titre center">';
+		print $form->select_country($search_country, 'search_country', '', 0);
+		print '</td>';
 	}
 	// State
 	if (!empty($arrayfields['p.fk_state']['checked'])) {
-		print '<td class="liste_titre center">'.$formcompany->select_state($search_state, $search_country).'</td>';
+		print '<td class="liste_titre center">';
+		print $formcompany->select_state($search_state, $search_country);
+		print '</td>';
 	}
 	// Accountancy code sell
 	if (!empty($arrayfields[$alias_product_perentity . '.accountancy_code_sell']['checked'])) {
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 8e1d03411cd..e7e8c10d20c 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -1385,6 +1385,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			}
 
 			if ($object->country_id) {
+				print img_picto('', 'state', 'class="pictofixedwidth"');
 				print $formcompany->select_state($object->state_id, $object->country_code);
 			} else {
 				print $countrynotdefined;
@@ -2068,6 +2069,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 					print '<tr><td>'.$form->editfieldkey('State', 'state_id', '', $object, 0).'</td><td colspan="3">';
 				}
 
+				print img_picto('', 'state', 'class="pictofixedwidth"');
 				print $formcompany->select_state($object->state_id, $object->country_code);
 				print '</td></tr>';
 			}
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 89cb19c129b..6046a960b45 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -209,7 +209,7 @@ input, select {
 	margin-bottom: 1px;
 	margin-top: 1px;
 }
-#mainbody input.button:not(.buttongen):not(.bordertransp) {
+#mainbody input.button:not(.buttongen):not(.bordertransp), #mainbody a.button:not(.buttongen):not(.bordertransp) {
 	background: var(--butactionbg);
 	color: #FFF !important;
 	border-radius: 3px;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 5ad564ea5c0..aa87a36f01d 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1507,10 +1507,10 @@ table[summary="list_of_modules"] .fa-cog {
 	div.divphotoref {
 		padding-right: 10px !important;
 	}
-	
+
 	.hideonsmartphone { display: none; }
 	.hideonsmartphoneimp { display: none !important; }
-	
+
 	select.minwidth100imp, select.minwidth100, select.minwidth200, select.minwidth200imp, select.minwidth300 {
 		width: calc(100% - 40px) !important;
 		display: inline-block;
@@ -1519,11 +1519,11 @@ table[summary="list_of_modules"] .fa-cog {
 		width: calc(100% - 70px) !important;
 		display: inline-block;
 	}
-	
+
 	input.maxwidthinputfileonsmartphone {
 		width: 175px;
 	}
-	
+
 	.poweredbyimg {
 		width: 48px;
 	}
@@ -3090,11 +3090,11 @@ div.tabsElem a {
 }
 div.tabBar {
 	color: #<?php echo $colortextbacktab; ?>;
-	padding-top: 16px;
-	padding-left: 16px;
-	padding-right: 16px;
-	padding-bottom: 16px;
-	margin: 0px 0px 16px 0px;
+	padding-top: 21px;
+	padding-left: 18px;
+	padding-right: 18px;
+	padding-bottom: 18px;
+	margin: 0px 0px 18px 0px;
 	-webkit-border-radius: 3px;
 	border-radius: 3px;
 	border-right: 1px solid #BBB;
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 135e2072fdf..ef7136e2450 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1040,6 +1040,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 	// State
 	if (empty($conf->global->USER_DISABLE_STATE)) {
 		print '<tr><td>'.$form->editfieldkey('State', 'state_id', '', $object, 0).'</td><td class="maxwidthonsmartphone">';
+		print img_picto('', 'state', 'class="pictofixedwidth"');
 		print $formcompany->select_state($object->state_id, $object->country_code, 'state_id');
 		print '</td></tr>';
 	}
@@ -2363,6 +2364,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			if (empty($conf->global->USER_DISABLE_STATE)) {
 				print '<tr><td class="tdoverflow">'.$form->editfieldkey('State', 'state_id', '', $object, 0).'</td><td>';
 				if ($caneditfield) {
+					print img_picto('', 'state', 'class="pictofixedwidth"');
 					print $formcompany->select_state($object->state_id, $object->country_code, 'state_id');
 				} else {
 					print $object->state_label;

From 5853aa4c1e4da2f7e3f503ad470f4b72454c3ae6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 4 Jul 2021 20:08:34 +0200
Subject: [PATCH 0992/1497] Look and feel v14

---
 htdocs/bom/bom_list.php                       | 100 +++++++++-----
 htdocs/bom/class/bom.class.php                |  15 ++-
 htdocs/core/lib/functions.lib.php             |   6 +-
 htdocs/core/tpl/commonfields_add.tpl.php      |   2 +-
 htdocs/core/tpl/commonfields_edit.tpl.php     |   2 +-
 .../template/class/myobject.class.php         |   2 +-
 .../modulebuilder/template/myobject_list.php  |   6 +-
 htdocs/mrp/class/mo.class.php                 |  17 ++-
 htdocs/mrp/mo_list.php                        | 123 ++++++++++++------
 9 files changed, 182 insertions(+), 91 deletions(-)

diff --git a/htdocs/bom/bom_list.php b/htdocs/bom/bom_list.php
index a47b1692ca9..6b54e8a4044 100644
--- a/htdocs/bom/bom_list.php
+++ b/htdocs/bom/bom_list.php
@@ -83,6 +83,10 @@ foreach ($object->fields as $key => $val) {
 	if (GETPOST('search_'.$key, 'alpha') !== '') {
 		$search[$key] = GETPOST('search_'.$key, 'alpha');
 	}
+	if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
+		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOST('search_'.$key.'_dtstartmonth', 'int'), GETPOST('search_'.$key.'_dtstartday', 'int'), GETPOST('search_'.$key.'_dtstartyear', 'int'));
+		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOST('search_'.$key.'_dtendmonth', 'int'), GETPOST('search_'.$key.'_dtendday', 'int'), GETPOST('search_'.$key.'_dtendyear', 'int'));
+	}
 }
 
 // List of fields to search into when doing a "search in all"
@@ -131,7 +135,8 @@ $result = restrictedArea($user, 'bom');
  */
 
 if (GETPOST('cancel', 'alpha')) {
-	$action = 'list'; $massaction = '';
+	$action = 'list';
+	$massaction = '';
 }
 if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
 	$massaction = '';
@@ -151,6 +156,10 @@ if (empty($reshook)) {
 	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
 		foreach ($object->fields as $key => $val) {
 			$search[$key] = '';
+			if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
+				$search[$key.'_dtstart'] = '';
+				$search[$key.'_dtend'] = '';
+			}
 		}
 		$toselect = array();
 		$search_array_options = array();
@@ -277,18 +286,18 @@ $now = dol_now();
 
 $help_url = 'EN:Module_BOM';
 $title = $langs->trans('ListOfBOMs');
+$morejs = array();
+$morecss = array();
 
 
 // Build and execute select
 // --------------------------------------------------------------------
 $sql = 'SELECT ';
-foreach ($object->fields as $key => $val) {
-	$sql .= 't.'.$key.', ';
-}
+$sql .= $object->getFieldList('t');
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.' as options_'.$key.', ' : '');
+		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key.' as options_'.$key.', ' : '');
 	}
 }
 // Add fields from hooks
@@ -297,33 +306,52 @@ $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $obje
 $sql .= preg_replace('/^,/', '', $hookmanager->resPrint);
 $sql = preg_replace('/,\s*$/', '', $sql);
 $sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
+if (isset($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (t.rowid = ef.fk_object)";
 }
+// Add table from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
 if ($object->ismultientitymanaged == 1) {
 	$sql .= " WHERE t.entity IN (".getEntity($object->element).")";
 } else {
 	$sql .= " WHERE 1 = 1";
 }
 foreach ($search as $key => $val) {
-	if ($key == 'status' && $search[$key] == -1) {
+	if (array_key_exists($key, $object->fields)) {
+		if ($key == 'status' && $search[$key] == -1) {
 		continue;
-	}
-	$mode_search = (($object->isInt($object->fields[$key]) || $object->isFloat($object->fields[$key])) ? 1 : 0);
-	if (strpos($object->fields[$key]['type'], 'integer:') === 0) {
-		if ($search[$key] == '-1') {
-			$search[$key] = '';
 		}
-		$mode_search = 2;
-	}
-	if ($search[$key] != '') {
-		$sql .= natural_search($key, $search[$key], (($key == 'status') ? 2 : $mode_search));
+		$mode_search = (($object->isInt($object->fields[$key]) || $object->isFloat($object->fields[$key])) ? 1 : 0);
+		if ((strpos($object->fields[$key]['type'], 'integer:') === 0) || (strpos($object->fields[$key]['type'], 'sellist:') === 0) || !empty($object->fields[$key]['arrayofkeyval'])) {
+			if ($search[$key] == '-1' || $search[$key] === '0') {
+				$search[$key] = '';
+			}
+			$mode_search = 2;
+		}
+		if ($search[$key] != '') {
+			$sql .= natural_search($key, $search[$key], (($key == 'status') ? 2 : $mode_search));
+		}
+	} else {
+		if (preg_match('/(_dtstart|_dtend)$/', $key) && $search[$key] != '') {
+			$columnName=preg_replace('/(_dtstart|_dtend)$/', '', $key);
+			if (preg_match('/^(date|timestamp|datetime)/', $object->fields[$columnName]['type'])) {
+				if (preg_match('/_dtstart$/', $key)) {
+					$sql .= " AND t." . $columnName . " >= '" . $db->idate($search[$key]) . "'";
+				}
+				if (preg_match('/_dtend$/', $key)) {
+					$sql .= " AND t." . $columnName . " <= '" . $db->idate($search[$key]) . "'";
+				}
+			}
+		}
 	}
 }
 
 if ($search_all) {
 	$sql .= natural_search(array_keys($fieldstosearchall), $search_all);
 }
+//$sql.= dolSqlDateFilter("t.field", $search_xxxday, $search_xxxmonth, $search_xxxyear);
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 // Add where from hooks
@@ -332,7 +360,7 @@ $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $objec
 $sql .= $hookmanager->resPrint;
 
 /* If a group by is required
-$sql.= " GROUP BY "
+$sql.= " GROUP BY ";
 foreach($object->fields as $key => $val)
 {
 	$sql.='t.'.$key.', ';
@@ -345,7 +373,7 @@ if (! empty($extrafields->attributes[$object->table_element]['label'])) {
 }
 // Add where from hooks
 $parameters=array();
-$reshook=$hookmanager->executeHooks('printFieldListGroupBy',$parameters);    // Note that $action and $object may have been modified by hook
+$reshook=$hookmanager->executeHooks('printFieldListGroupBy', $parameters, $object);    // Note that $action and $object may have been modified by hook
 $sql.=$hookmanager->resPrint;
 $sql=preg_replace('/,\s*$/','', $sql);
 */
@@ -391,7 +419,7 @@ if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $
 // Output page
 // --------------------------------------------------------------------
 
-llxHeader('', $title, $help_url);
+llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', '');
 
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
@@ -416,6 +444,10 @@ if ($optioncss != '') {
 }
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
+// Add $param from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object); // Note that $action and $object may have been modified by hook
+$param .= $hookmanager->resPrint;
 
 // List of mass actions available
 $arrayofmassactions = array(
@@ -431,7 +463,7 @@ if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'pr
 }
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
-print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
+print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
 if ($optioncss != '') {
 	print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 }
@@ -440,11 +472,12 @@ print '<input type="hidden" name="formfilteraction" id="formfilteraction" value=
 print '<input type="hidden" name="action" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
 $newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/bom/bom_card.php?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $user->rights->bom->write);
 
-print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'bom', 0, $newcardbutton, '', $limit, 0, 0, 1);
+print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'object_'.$object->picto, 0, $newcardbutton, '', $limit, 0, 0, 1);
 
 // Add code for pre mass action (confirmation or email presend form)
 $topicmail = "SendBillOfMaterialsRef";
@@ -504,11 +537,18 @@ foreach ($object->fields as $key => $val) {
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
 		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
-			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
+			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], (isset($search[$key]) ? $search[$key] : ''), $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
 		} elseif ((strpos($val['type'], 'integer:') === 0) || (strpos($val['type'], 'sellist:') === 0)) {
-			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth125', 1);
-		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) {
-			print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
+			print $object->showInputField($val, $key, (isset($search[$key]) ? $search[$key] : ''), '', '', 'search_', 'maxwidth125', 1);
+		} elseif (!preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
+			print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag(isset($search[$key]) ? $search[$key] : '').'">';
+		} elseif (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
+			print '<div class="nowrap">';
+			print $form->selectDate($search[$key.'_dtstart'] ? $search[$key.'_dtstart'] : '', "search_".$key."_dtstart", 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+			print '</div>';
+			print '<div class="nowrap">';
+			print $form->selectDate($search[$key.'_dtend'] ? $search[$key.'_dtend'] : '', "search_".$key."_dtend", 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
+			print '</div>';
 		}
 		print '</td>';
 	}
@@ -559,7 +599,7 @@ print '</tr>'."\n";
 
 // Detect if we need a fetch on each output line
 $needToFetchEachLine = 0;
-if (is_array($extrafields->attributes[$object->table_element]['computed']) && count($extrafields->attributes[$object->table_element]['computed']) > 0) {
+if (isset($extrafields->attributes[$object->table_element]['computed']) && is_array($extrafields->attributes[$object->table_element]['computed']) && count($extrafields->attributes[$object->table_element]['computed']) > 0) {
 	foreach ($extrafields->attributes[$object->table_element]['computed'] as $key => $val) {
 		if (preg_match('/\$object/', $val)) {
 			$needToFetchEachLine++; // There is at least one compute field that use $object
@@ -572,6 +612,7 @@ if (is_array($extrafields->attributes[$object->table_element]['computed']) && co
 // --------------------------------------------------------------------
 $i = 0;
 $totalarray = array();
+$totalarray['nbfield'] = 0;
 while ($i < ($limit ? min($num, $limit) : $num)) {
 	$obj = $db->fetch_object($resql);
 	if (empty($obj)) {
@@ -597,17 +638,16 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
 		}
 
-		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $key != 'status' && empty($val['arrayofkeyval'])) {
+		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', 'status')) && empty($val['arrayofkeyval'])) {
 			$cssforfield .= ($cssforfield ? ' ' : '').'right';
 		}
-		if (in_array($key, array('fk_soc', 'fk_user', 'fk_warehouse'))) {
-			$cssforfield = 'tdoverflowmax100';
-		}
 
 		if (!empty($arrayfields['t.'.$key]['checked'])) {
 			print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '').'>';
 			if ($key == 'status') {
 				print $object->getLibStatut(5);
+			} elseif ($key == 'rowid') {
+				print $object->showOutputField($val, $key, $object->id, '');
 			} else {
 				print $object->showOutputField($val, $key, $object->$key, '');
 			}
diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index 0fe08bb1a4a..3996b5e49bd 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -97,23 +97,23 @@ class BOM extends CommonObject
 		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'position'=>1, 'notnull'=>1, 'index'=>1, 'comment'=>"Id",),
 		'entity' => array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'notnull'=> 1, 'default'=>1, 'index'=>1, 'position'=>5),
 		'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>1, 'noteditable'=>1, 'visible'=>4, 'position'=>10, 'notnull'=>1, 'default'=>'(PROV)', 'index'=>1, 'searchall'=>1, 'comment'=>"Reference of BOM", 'showoncombobox'=>'1',),
-		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>1, 'visible'=>1, 'position'=>30, 'notnull'=>1, 'searchall'=>1, 'showoncombobox'=>'2', 'autofocusoncreate'=>1),
+		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>1, 'visible'=>1, 'position'=>30, 'notnull'=>1, 'searchall'=>1, 'showoncombobox'=>'2', 'autofocusoncreate'=>1, 'css'=>'maxwidth300', 'csslist'=>'tdoverflowmax200'),
 		'bomtype' => array('type'=>'integer', 'label'=>'Type', 'enabled'=>1, 'visible'=>1, 'position'=>33, 'notnull'=>1, 'default'=>'0', 'arrayofkeyval'=>array(0=>'Manufacturing', 1=>'Disassemble'), 'css'=>'minwidth150', 'csslist'=>'minwidth150 center'),
 		//'bomtype' => array('type'=>'integer', 'label'=>'Type', 'enabled'=>1, 'visible'=>-1, 'position'=>32, 'notnull'=>1, 'default'=>'0', 'arrayofkeyval'=>array(0=>'Manufacturing')),
-		'fk_product' => array('type'=>'integer:Product:product/class/product.class.php:1:(finished IS NULL or finished <> 0)', 'label'=>'Product', 'picto'=>'product', 'enabled'=>1, 'visible'=>1, 'position'=>35, 'notnull'=>1, 'index'=>1, 'help'=>'ProductBOMHelp', 'css'=>'maxwidth500'),
+		'fk_product' => array('type'=>'integer:Product:product/class/product.class.php:1:(finished IS NULL or finished <> 0)', 'label'=>'Product', 'picto'=>'product', 'enabled'=>1, 'visible'=>1, 'position'=>35, 'notnull'=>1, 'index'=>1, 'help'=>'ProductBOMHelp', 'css'=>'maxwidth500', 'csslist'=>'tdoverflowmax100'),
 		'description' => array('type'=>'text', 'label'=>'Description', 'enabled'=>1, 'visible'=>-1, 'position'=>60, 'notnull'=>-1,),
 		'qty' => array('type'=>'real', 'label'=>'Quantity', 'enabled'=>1, 'visible'=>1, 'default'=>1, 'position'=>55, 'notnull'=>1, 'isameasure'=>'1', 'css'=>'maxwidth75imp'),
 		//'efficiency' => array('type'=>'real', 'label'=>'ManufacturingEfficiency', 'enabled'=>1, 'visible'=>-1, 'default'=>1, 'position'=>100, 'notnull'=>0, 'css'=>'maxwidth50imp', 'help'=>'ValueOfMeansLossForProductProduced'),
 		'duration' => array('type'=>'duration', 'label'=>'EstimatedDuration', 'enabled'=>1, 'visible'=>-1, 'position'=>101, 'notnull'=>-1, 'css'=>'maxwidth50imp', 'help'=>'EstimatedDurationDesc'),
-		'fk_warehouse' => array('type'=>'integer:Entrepot:product/stock/class/entrepot.class.php:0', 'label'=>'WarehouseForProduction', 'picto'=>'stock', 'enabled'=>1, 'visible'=>-1, 'position'=>102, 'css'=>'maxwidth500'),
+		'fk_warehouse' => array('type'=>'integer:Entrepot:product/stock/class/entrepot.class.php:0', 'label'=>'WarehouseForProduction', 'picto'=>'stock', 'enabled'=>1, 'visible'=>-1, 'position'=>102, 'css'=>'maxwidth500', 'csslist'=>'tdoverflowmax100'),
 		'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>-2, 'position'=>161, 'notnull'=>-1,),
 		'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>-2, 'position'=>162, 'notnull'=>-1,),
 		'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-2, 'position'=>300, 'notnull'=>1,),
 		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'position'=>501, 'notnull'=>1,),
 		'date_valid' => array('type'=>'datetime', 'label'=>'DateValidation', 'enabled'=>1, 'visible'=>-2, 'position'=>502, 'notnull'=>0,),
-		'fk_user_creat' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserCreation', 'picto'=>'user', 'enabled'=>1, 'visible'=>-2, 'position'=>510, 'notnull'=>1, 'foreignkey'=>'user.rowid',),
-		'fk_user_modif' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'picto'=>'user', 'enabled'=>1, 'visible'=>-2, 'position'=>511, 'notnull'=>-1,),
-		'fk_user_valid' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserValidation', 'picto'=>'user', 'enabled'=>1, 'visible'=>-2, 'position'=>512, 'notnull'=>0,),
+		'fk_user_creat' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserCreation', 'picto'=>'user', 'enabled'=>1, 'visible'=>-2, 'position'=>510, 'notnull'=>1, 'foreignkey'=>'user.rowid', 'csslist'=>'tdoverflowmax100'),
+		'fk_user_modif' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'picto'=>'user', 'enabled'=>1, 'visible'=>-2, 'position'=>511, 'notnull'=>-1, 'csslist'=>'tdoverflowmax100'),
+		'fk_user_valid' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserValidation', 'picto'=>'user', 'enabled'=>1, 'visible'=>-2, 'position'=>512, 'notnull'=>0, 'csslist'=>'tdoverflowmax100'),
 		'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>1000, 'notnull'=>-1,),
 		'model_pdf' =>array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>1, 'visible'=>0, 'position'=>1010),
 		'status' => array('type'=>'integer', 'label'=>'Status', 'enabled'=>1, 'visible'=>2, 'position'=>1000, 'notnull'=>1, 'default'=>0, 'index'=>1, 'arrayofkeyval'=>array(0=>'Draft', 1=>'Enabled', 9=>'Disabled')),
@@ -786,6 +786,9 @@ class BOM extends CommonObject
 		}
 		$label .= '<br>';
 		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
+		if (isset($this->label)) {
+			$label .= '<br><b>'.$langs->trans('Label').':</b> '.$this->label;
+		}
 
 		$url = DOL_URL_ROOT.'/bom/bom_card.php?id='.$this->id;
 
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 28da21926ab..13358074514 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3610,13 +3610,13 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 			}
 
 			if (in_array($pictowithouttext, array('dollyrevert', 'member', 'members', 'contract', 'group', 'resource', 'shipment'))) {
-				$morecss = 'em092';
+				$morecss .= ' em092';
 			}
 			if (in_array($pictowithouttext, array('conferenceorbooth', 'collab', 'eventorganization', 'holiday', 'info', 'project', 'workstation'))) {
-				$morecss = 'em088';
+				$morecss .= ' em088';
 			}
 			if (in_array($pictowithouttext, array('asset', 'intervention', 'payment', 'loan', 'partnership', 'stock', 'technic'))) {
-				$morecss = 'em080';
+				$morecss .= ' em080';
 			}
 
 			// Define $marginleftonlyshort
diff --git a/htdocs/core/tpl/commonfields_add.tpl.php b/htdocs/core/tpl/commonfields_add.tpl.php
index 3a43f04c149..d1d378e7e60 100644
--- a/htdocs/core/tpl/commonfields_add.tpl.php
+++ b/htdocs/core/tpl/commonfields_add.tpl.php
@@ -63,7 +63,7 @@ foreach ($object->fields as $key => $val) {
 	print '</td>';
 	print '<td class="valuefieldcreate">';
 	if (!empty($val['picto'])) {
-		print img_picto('', $val['picto']);
+		print img_picto('', $val['picto'], '', false, 0, 0, '', 'pictofixedwidth');
 	}
 	if (in_array($val['type'], array('int', 'integer'))) {
 		$value = GETPOST($key, 'int');
diff --git a/htdocs/core/tpl/commonfields_edit.tpl.php b/htdocs/core/tpl/commonfields_edit.tpl.php
index 9fef2d2f2b9..bc74421e808 100644
--- a/htdocs/core/tpl/commonfields_edit.tpl.php
+++ b/htdocs/core/tpl/commonfields_edit.tpl.php
@@ -63,7 +63,7 @@ foreach ($object->fields as $key => $val) {
 	print '</td>';
 	print '<td class="valuefieldcreate">';
 	if (!empty($val['picto'])) {
-		print img_picto('', $val['picto']);
+		print img_picto('', $val['picto'], '', false, 0, 0, '', 'pictofixedwidth');
 	}
 	if (in_array($val['type'], array('int', 'integer'))) {
 		$value = GETPOSTISSET($key) ?GETPOST($key, 'int') : $object->$key;
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index f07a0f04a10..65af15cffa8 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -84,7 +84,7 @@ class MyObject extends CommonObject
 	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
-	 *  'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'maxwidth200', 'wordbreak', 'tdoverflowmax200', 'minwidth300 maxwidth500 widthcentpercentminusx'
+	 *  'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'cssview'=>'wordbreak', 'csslist'=>'tdoverflowmax200'
 	 *  'help' is a 'TranslationString' to use to show a tooltip on field. You can also use 'TranslationString:keyfortooltiponlick' for a tooltip on click.
 	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
 	 *  'disabled' is 1 if we want to have the field locked by a 'disabled' attribute. In most cases, this is never set into the definition of $fields into class, but is set dynamically by some part of code.
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 76d736a5670..0081ec28551 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -334,7 +334,9 @@ foreach($object->fields as $key => $val)
 }
 // Add fields from extrafields
 if (! empty($extrafields->attributes[$object->table_element]['label'])) {
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql.=($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.', ' : '');
+	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
+		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.', ' : '');
+	}
 }
 // Add where from hooks
 $parameters=array();
@@ -384,7 +386,7 @@ if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $
 // Output page
 // --------------------------------------------------------------------
 
-llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'classforhorizontalscrolloftabs');
+llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', '');
 
 // Example : Adding jquery code
 // print '<script type="text/javascript" language="javascript">
diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index 6c08d75d9cf..ee4b64471c3 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -101,19 +101,19 @@ class Mo extends CommonObject
 		'entity' => array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'position'=>5, 'notnull'=>1, 'default'=>'1', 'index'=>1),
 		'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>4, 'position'=>10, 'notnull'=>1, 'default'=>'(PROV)', 'index'=>1, 'searchall'=>1, 'comment'=>"Reference of object", 'showoncombobox'=>'1', 'noteditable'=>1),
 		'fk_bom' => array('type'=>'integer:Bom:bom/class/bom.class.php:0:t.status=1', 'filter'=>'active=1', 'label'=>'BOM', 'enabled'=>1, 'visible'=>1, 'position'=>33, 'notnull'=>-1, 'index'=>1, 'comment'=>"Original BOM", 'css'=>'minwidth100 maxwidth300', 'csslist'=>'nowraponall'),
-		'fk_product' => array('type'=>'integer:Product:product/class/product.class.php:0', 'label'=>'Product', 'enabled'=>1, 'visible'=>1, 'position'=>35, 'notnull'=>1, 'index'=>1, 'comment'=>"Product to produce", 'css'=>'maxwidth300', 'picto'=>'product'),
+		'fk_product' => array('type'=>'integer:Product:product/class/product.class.php:0', 'label'=>'Product', 'enabled'=>1, 'visible'=>1, 'position'=>35, 'notnull'=>1, 'index'=>1, 'comment'=>"Product to produce", 'css'=>'maxwidth300', 'csslist'=>'tdoverflowmax100', 'picto'=>'product'),
 		'qty' => array('type'=>'real', 'label'=>'QtyToProduce', 'enabled'=>1, 'visible'=>1, 'position'=>40, 'notnull'=>1, 'comment'=>"Qty to produce", 'css'=>'width75', 'default'=>1, 'isameasure'=>1),
-		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>1, 'visible'=>1, 'position'=>42, 'notnull'=>-1, 'searchall'=>1, 'showoncombobox'=>'2',),
-		'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1', 'label'=>'ThirdParty', 'picto'=>'company', 'enabled'=>1, 'visible'=>-1, 'position'=>50, 'notnull'=>-1, 'index'=>1, 'css'=>'maxwidth400'),
-		'fk_project' => array('type'=>'integer:Project:projet/class/project.class.php:1:fk_statut=1', 'label'=>'Project', 'picto'=>'project', 'enabled'=>1, 'visible'=>-1, 'position'=>51, 'notnull'=>-1, 'index'=>1, 'css'=>'minwidth200 maxwidth400'),
-		'fk_warehouse' => array('type'=>'integer:Entrepot:product/stock/class/entrepot.class.php:0', 'label'=>'WarehouseForProduction', 'picto'=>'stock', 'enabled'=>1, 'visible'=>1, 'position'=>52, 'css'=>'maxwidth400'),
+		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>1, 'visible'=>1, 'position'=>42, 'notnull'=>-1, 'searchall'=>1, 'showoncombobox'=>'2', 'css'=>'maxwidth300', 'csslist'=>'tdoverflowmax200'),
+		'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1', 'label'=>'ThirdParty', 'picto'=>'company', 'enabled'=>1, 'visible'=>-1, 'position'=>50, 'notnull'=>-1, 'index'=>1, 'css'=>'maxwidth400', 'csslist'=>'tdoverflowmax150'),
+		'fk_project' => array('type'=>'integer:Project:projet/class/project.class.php:1:fk_statut=1', 'label'=>'Project', 'picto'=>'project', 'enabled'=>1, 'visible'=>-1, 'position'=>51, 'notnull'=>-1, 'index'=>1, 'css'=>'minwidth200 maxwidth400', 'csslist'=>'tdoverflowmax100'),
+		'fk_warehouse' => array('type'=>'integer:Entrepot:product/stock/class/entrepot.class.php:0', 'label'=>'WarehouseForProduction', 'picto'=>'stock', 'enabled'=>1, 'visible'=>1, 'position'=>52, 'css'=>'maxwidth400', 'csslist'=>'tdoverflowmax200'),
 		'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>61, 'notnull'=>-1,),
 		'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>62, 'notnull'=>-1,),
 		'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-2, 'position'=>500, 'notnull'=>1,),
 		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'position'=>501, 'notnull'=>1,),
 		'date_valid' => array('type'=>'datetime', 'label'=>'DateValidation', 'enabled'=>1, 'visible'=>-2, 'position'=>502,),
-		'fk_user_creat' => array('type'=>'integer', 'label'=>'UserAuthor', 'enabled'=>1, 'visible'=>-2, 'position'=>510, 'notnull'=>1, 'foreignkey'=>'user.rowid',),
-		'fk_user_modif' => array('type'=>'integer', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-2, 'position'=>511, 'notnull'=>-1,),
+		'fk_user_creat' => array('type'=>'integer', 'label'=>'UserAuthor', 'enabled'=>1, 'visible'=>-2, 'position'=>510, 'notnull'=>1, 'foreignkey'=>'user.rowid', 'csslist'=>'tdoverflowmax100'),
+		'fk_user_modif' => array('type'=>'integer', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-2, 'position'=>511, 'notnull'=>-1, 'csslist'=>'tdoverflowmax100'),
 		'date_start_planned' => array('type'=>'datetime', 'label'=>'DateStartPlannedMo', 'enabled'=>1, 'visible'=>1, 'position'=>55, 'notnull'=>-1, 'index'=>1, 'help'=>'KeepEmptyForAsap'),
 		'date_end_planned' => array('type'=>'datetime', 'label'=>'DateEndPlannedMo', 'enabled'=>1, 'visible'=>1, 'position'=>56, 'notnull'=>-1, 'index'=>1,),
 		'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>1000, 'notnull'=>-1,),
@@ -1007,6 +1007,9 @@ class Mo extends CommonObject
 		}
 		$label .= '<br>';
 		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
+		if (isset($this->label)) {
+			$label .= '<br><b>'.$langs->trans('Label').':</b> '.$this->label;
+		}
 
 		$url = dol_buildpath('/mrp/mo_card.php', 1).'?id='.$this->id;
 		if ($option == 'production') {
diff --git a/htdocs/mrp/mo_list.php b/htdocs/mrp/mo_list.php
index 731a7bcfc50..91821d38ee2 100644
--- a/htdocs/mrp/mo_list.php
+++ b/htdocs/mrp/mo_list.php
@@ -12,7 +12,7 @@
  * 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/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 /**
@@ -54,9 +54,10 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) {
+if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
+	// If $page is not defined, or '' or -1 or if we click on clear filters
 	$page = 0;
-}     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
+}
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
@@ -89,6 +90,10 @@ foreach ($object->fields as $key => $val) {
 	if (GETPOST('search_'.$key, 'alpha') !== '') {
 		$search[$key] = GETPOST('search_'.$key, 'alpha');
 	}
+	if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
+		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOST('search_'.$key.'_dtstartmonth', 'int'), GETPOST('search_'.$key.'_dtstartday', 'int'), GETPOST('search_'.$key.'_dtstartyear', 'int'));
+		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOST('search_'.$key.'_dtendmonth', 'int'), GETPOST('search_'.$key.'_dtendday', 'int'), GETPOST('search_'.$key.'_dtendyear', 'int'));
+	}
 }
 
 // List of fields to search into when doing a "search in all"
@@ -99,11 +104,12 @@ foreach ($object->fields as $key => $val) {
 	}
 }
 
-// Definition of fields for list
+// Definition of array of fields for columns
 $arrayfields = array();
 foreach ($object->fields as $key => $val) {
 	// If $val['visible']==0, then we never show the field
 	if (!empty($val['visible'])) {
+		$visible = (int) dol_eval($val['visible'], 1);
 		$arrayfields['t.'.$key] = array(
 			'label'=>$val['label'],
 			'checked'=>(($visible < 0) ? 0 : 1),
@@ -136,7 +142,8 @@ $result = restrictedArea($user, 'mrp');
  */
 
 if (GETPOST('cancel', 'alpha')) {
-	$action = 'list'; $massaction = '';
+	$action = 'list';
+	$massaction = '';
 }
 if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
 	$massaction = '';
@@ -156,6 +163,10 @@ if (empty($reshook)) {
 	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
 		foreach ($object->fields as $key => $val) {
 			$search[$key] = '';
+			if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
+				$search[$key.'_dtstart'] = '';
+				$search[$key.'_dtend'] = '';
+			}
 		}
 		$toselect = array();
 		$search_array_options = array();
@@ -185,18 +196,18 @@ $now = dol_now();
 //$help_url="EN:Module_Mo|FR:Module_Mo_FR|ES:Módulo_Mo";
 $help_url = '';
 $title = $langs->trans('ListOfManufacturingOrders');
+$morejs = array();
+$morecss = array();
 
 
 // Build and execute select
 // --------------------------------------------------------------------
 $sql = 'SELECT ';
-foreach ($object->fields as $key => $val) {
-	$sql .= 't.'.$key.', ';
-}
+$sql .= $object->getFieldList('t');
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.' as options_'.$key.', ' : '');
+		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key.' as options_'.$key.', ' : '');
 	}
 }
 // Add fields from hooks
@@ -205,27 +216,45 @@ $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $obje
 $sql .= preg_replace('/^,/', '', $hookmanager->resPrint);
 $sql = preg_replace('/,\s*$/', '', $sql);
 $sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
+if (isset($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (t.rowid = ef.fk_object)";
 }
+// Add table from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
 if ($object->ismultientitymanaged == 1) {
 	$sql .= " WHERE t.entity IN (".getEntity($object->element).")";
 } else {
 	$sql .= " WHERE 1 = 1";
 }
 foreach ($search as $key => $val) {
-	if ($key == 'status' && $search[$key] == -1) {
-		continue;
-	}
-	$mode_search = (($object->isInt($object->fields[$key]) || $object->isFloat($object->fields[$key])) ? 1 : 0);
-	if (strpos($object->fields[$key]['type'], 'integer:') === 0) {
-		if ($search[$key] == '-1') {
-			$search[$key] = '';
+	if (array_key_exists($key, $object->fields)) {
+		if ($key == 'status' && $search[$key] == -1) {
+			continue;
+		}
+		$mode_search = (($object->isInt($object->fields[$key]) || $object->isFloat($object->fields[$key])) ? 1 : 0);
+		if ((strpos($object->fields[$key]['type'], 'integer:') === 0) || (strpos($object->fields[$key]['type'], 'sellist:') === 0) || !empty($object->fields[$key]['arrayofkeyval'])) {
+			if ($search[$key] == '-1' || $search[$key] === '0') {
+			$search[$key] = '';
+				}
+			$mode_search = 2;
+		}
+		if ($search[$key] != '') {
+			$sql .= natural_search($key, $search[$key], (($key == 'status') ? 2 : $mode_search));
+		}
+	} else {
+		if (preg_match('/(_dtstart|_dtend)$/', $key) && $search[$key] != '') {
+			$columnName=preg_replace('/(_dtstart|_dtend)$/', '', $key);
+			if (preg_match('/^(date|timestamp|datetime)/', $object->fields[$columnName]['type'])) {
+				if (preg_match('/_dtstart$/', $key)) {
+					$sql .= " AND t." . $columnName . " >= '" . $db->idate($search[$key]) . "'";
+				}
+				if (preg_match('/_dtend$/', $key)) {
+					$sql .= " AND t." . $columnName . " <= '" . $db->idate($search[$key]) . "'";
+				}
+			}
 		}
-		$mode_search = 2;
-	}
-	if ($search[$key] != '') {
-		$sql .= natural_search($key, $search[$key], (($key == 'status') ? 2 : $mode_search));
 	}
 }
 if ($search_all) {
@@ -240,18 +269,20 @@ $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $objec
 $sql .= $hookmanager->resPrint;
 
 /* If a group by is required
-$sql.= " GROUP BY "
+$sql.= " GROUP BY ";
 foreach($object->fields as $key => $val)
 {
 	$sql.='t.'.$key.', ';
 }
 // Add fields from extrafields
 if (! empty($extrafields->attributes[$object->table_element]['label'])) {
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql.=($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.', ' : '');
+	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
+		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.', ' : '');
+	}
 }
 // Add where from hooks
 $parameters=array();
-$reshook=$hookmanager->executeHooks('printFieldListGroupBy',$parameters);    // Note that $action and $object may have been modified by hook
+$reshook=$hookmanager->executeHooks('printFieldListGroupBy', $parameters, $object);    // Note that $action and $object may have been modified by hook
 $sql.=$hookmanager->resPrint;
 $sql=preg_replace('/,\s*$/','', $sql);
 */
@@ -297,7 +328,7 @@ if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $
 // Output page
 // --------------------------------------------------------------------
 
-llxHeader('', $title, $help_url);
+llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', '');
 
 
 $arrayofselected = is_array($toselect) ? $toselect : array();
@@ -323,6 +354,10 @@ if ($optioncss != '') {
 }
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
+// Add $param from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object); // Note that $action and $object may have been modified by hook
+$param .= $hookmanager->resPrint;
 
 // List of mass actions available
 $arrayofmassactions = array(
@@ -339,7 +374,7 @@ if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'pr
 }
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
-print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
+print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
 if ($optioncss != '') {
 	print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 }
@@ -348,11 +383,12 @@ print '<input type="hidden" name="formfilteraction" id="formfilteraction" value=
 print '<input type="hidden" name="action" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
 $newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/mrp/mo_card.php?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $permissiontoadd);
 
-print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'mrp', 0, $newcardbutton, '', $limit, 0, 0, 1);
+print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'object_'.$object->picto, 0, $newcardbutton, '', $limit, 0, 0, 1);
 
 // Add code for pre mass action (confirmation or email presend form)
 $topicmail = "SendMoRef";
@@ -399,24 +435,31 @@ print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwit
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
 foreach ($object->fields as $key => $val) {
-	$cssforfield = (empty($val['css']) ? '' : $val['css']);
+	$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 	if ($key == 'status') {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
 	} elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
 	} elseif (in_array($val['type'], array('timestamp'))) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') {
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
 	}
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
 		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
-			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
-		} elseif (strpos($val['type'], 'integer:') === 0) {
-			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth125', 1);
-		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) {
-			print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
+			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], (isset($search[$key]) ? $search[$key] : ''), $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
+		} elseif ((strpos($val['type'], 'integer:') === 0) || (strpos($val['type'], 'sellist:') === 0)) {
+			print $object->showInputField($val, $key, (isset($search[$key]) ? $search[$key] : ''), '', '', 'search_', 'maxwidth125', 1);
+		} elseif (!preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
+			print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag(isset($search[$key]) ? $search[$key] : '').'">';
+		} elseif (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
+			print '<div class="nowrap">';
+			print $form->selectDate($search[$key.'_dtstart'] ? $search[$key.'_dtstart'] : '', "search_".$key."_dtstart", 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+			print '</div>';
+			print '<div class="nowrap">';
+			print $form->selectDate($search[$key.'_dtend'] ? $search[$key.'_dtend'] : '', "search_".$key."_dtend", 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
+			print '</div>';
 		}
 		print '</td>';
 	}
@@ -447,7 +490,7 @@ foreach ($object->fields as $key => $val) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
 	} elseif (in_array($val['type'], array('timestamp'))) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') {
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
 	}
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
@@ -467,7 +510,7 @@ print '</tr>'."\n";
 
 // Detect if we need a fetch on each output line
 $needToFetchEachLine = 0;
-if (is_array($extrafields->attributes[$object->table_element]['computed']) && count($extrafields->attributes[$object->table_element]['computed']) > 0) {
+if (isset($extrafields->attributes[$object->table_element]['computed']) && is_array($extrafields->attributes[$object->table_element]['computed']) && count($extrafields->attributes[$object->table_element]['computed']) > 0) {
 	foreach ($extrafields->attributes[$object->table_element]['computed'] as $key => $val) {
 		if (preg_match('/\$object/', $val)) {
 			$needToFetchEachLine++; // There is at least one compute field that use $object
@@ -480,6 +523,7 @@ if (is_array($extrafields->attributes[$object->table_element]['computed']) && co
 // --------------------------------------------------------------------
 $i = 0;
 $totalarray = array();
+$totalarray['nbfield'] = 0;
 while ($i < ($limit ? min($num, $limit) : $num)) {
 	$obj = $db->fetch_object($resql);
 	if (empty($obj)) {
@@ -505,17 +549,16 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
 		}
 
-		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $key != 'status') {
+		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', 'status')) && empty($val['arrayofkeyval'])) {
 			$cssforfield .= ($cssforfield ? ' ' : '').'right';
 		}
-		if (in_array($key, array('fk_soc', 'fk_user', 'fk_warehouse'))) {
-			$cssforfield = 'tdoverflowmax100';
-		}
 
 		if (!empty($arrayfields['t.'.$key]['checked'])) {
 			print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '').'>';
 			if ($key == 'status') {
 				print $object->getLibStatut(5);
+			} elseif ($key == 'rowid') {
+				print $object->showOutputField($val, $key, $object->id, '');
 			} else {
 				print $object->showOutputField($val, $key, $object->$key, '');
 			}

From f6efe51032692ce96d41ac79761daf88b14d7e6c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 4 Jul 2021 21:02:02 +0200
Subject: [PATCH 0993/1497] Fix trouble with product id = -1

---
 htdocs/adherents/admin/member.php             |  1 +
 htdocs/comm/propal/card.php                   | 10 ++++-----
 htdocs/comm/propal/class/propal.class.php     |  2 +-
 htdocs/commande/card.php                      | 12 +++++-----
 htdocs/commande/class/commande.class.php      |  4 ++--
 htdocs/compta/facture/card-rec.php            | 12 +++++-----
 htdocs/compta/facture/card.php                | 10 ++++-----
 htdocs/compta/facture/class/facture.class.php |  6 ++---
 htdocs/contrat/card.php                       |  2 +-
 htdocs/core/class/commonobject.class.php      |  2 +-
 htdocs/core/class/html.form.class.php         |  4 ++--
 .../fourn/class/fournisseur.facture.class.php |  4 ++--
 .../product/class/html.formproduct.class.php  | 22 +++++++++----------
 .../class/productstockentrepot.class.php      |  8 +++----
 htdocs/product/stock/stockatdate.php          | 12 +++++-----
 htdocs/supplier_proposal/card.php             |  6 ++---
 .../class/supplier_proposal.class.php         |  4 ++--
 17 files changed, 61 insertions(+), 60 deletions(-)

diff --git a/htdocs/adherents/admin/member.php b/htdocs/adherents/admin/member.php
index 621873afc94..d03beec610e 100644
--- a/htdocs/adherents/admin/member.php
+++ b/htdocs/adherents/admin/member.php
@@ -263,6 +263,7 @@ if ($conf->facture->enabled) {
 		print '<tr class="oddeven"><td>'.$langs->trans("ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS").'</td>';
 		print '<td>';
 		$selected = (empty($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS) ? '' : $conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS);
+		print img_picto('', 'product', 'class="pictofixedwidth"');
 		$form->select_produits($selected, 'ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS', '', 0);
 		print '</td>';
 	}
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 78d139bb764..ce1beacadf3 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -843,16 +843,16 @@ if (empty($reshook)) {
 			}
 		}
 
-		if ($prod_entry_mode == 'free' && empty($idprod) && GETPOST('type') < 0) {
+		if ($prod_entry_mode == 'free' && (empty($idprod) || $idprod < 0) && GETPOST('type') < 0) {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
 			$error++;
 		}
 
-		if ($prod_entry_mode == 'free' && empty($idprod) && $price_ht === '' && $price_ht_devise === '') { 	// Unit price can be 0 but not ''. Also price can be negative for proposal.
+		if ($prod_entry_mode == 'free' && (empty($idprod) || $idprod < 0) && $price_ht === '' && $price_ht_devise === '') { 	// Unit price can be 0 but not ''. Also price can be negative for proposal.
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("UnitPriceHT")), null, 'errors');
 			$error++;
 		}
-		if ($prod_entry_mode == 'free' && empty($idprod) && empty($product_desc)) {
+		if ($prod_entry_mode == 'free' && (empty($idprod) || $idprod < 0) && empty($product_desc)) {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Description")), null, 'errors');
 			$error++;
 		}
@@ -871,7 +871,7 @@ if (empty($reshook)) {
 			}
 		}
 
-		if (!$error && ($qty >= 0) && (!empty($product_desc) || !empty($idprod))) {
+		if (!$error && ($qty >= 0) && (!empty($product_desc) || (!empty($idprod) && $idprod > 0))) {
 			$pu_ht = 0;
 			$pu_ttc = 0;
 			$price_min = 0;
@@ -885,7 +885,7 @@ if (empty($reshook)) {
 			// Ecrase $desc par celui du produit
 			// Ecrase $tva_tx par celui du produit
 			// Replaces $fk_unit with the product unit
-			if (!empty($idprod)) {
+			if (!empty($idprod) && $idprod > 0) {
 				$prod = new Product($db);
 				$prod->fetch($idprod);
 
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 940e0156c7e..3bc30d7d729 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -605,7 +605,7 @@ class Propal extends CommonObject
 			$this->db->begin();
 
 			$product_type = $type;
-			if (!empty($fk_product)) {
+			if (!empty($fk_product) && $fk_product > 0) {
 				$product = new Product($this->db);
 				$result = $product->fetch($fk_product);
 				$product_type = $product->type;
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 6d0badf6380..7908b54bf05 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -645,15 +645,15 @@ if (empty($reshook)) {
 			}
 		}
 
-		if (empty($idprod) && ($price_ht < 0) && ($qty < 0)) {
+		if ((empty($idprod) || $idprod < 0) && ($price_ht < 0) && ($qty < 0)) {
 			setEventMessages($langs->trans('ErrorBothFieldCantBeNegative', $langs->transnoentitiesnoconv('UnitPriceHT'), $langs->transnoentitiesnoconv('Qty')), null, 'errors');
 			$error++;
 		}
-		if ($prod_entry_mode == 'free' && empty($idprod) && GETPOST('type') < 0) {
+		if ($prod_entry_mode == 'free' && (empty($idprod) || $idprod < 0) && GETPOST('type') < 0) {
 			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Type')), null, 'errors');
 			$error++;
 		}
-		if ($prod_entry_mode == 'free' && empty($idprod) && $price_ht == '' && $price_ht_devise == '') { 	// Unit price can be 0 but not ''. Also price can be negative for order.
+		if ($prod_entry_mode == 'free' && (empty($idprod) || $idprod < 0) && $price_ht == '' && $price_ht_devise == '') { 	// Unit price can be 0 but not ''. Also price can be negative for order.
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("UnitPriceHT")), null, 'errors');
 			$error++;
 		}
@@ -661,7 +661,7 @@ if (empty($reshook)) {
 			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Qty')), null, 'errors');
 			$error++;
 		}
-		if ($prod_entry_mode == 'free' && empty($idprod) && empty($product_desc)) {
+		if ($prod_entry_mode == 'free' && (empty($idprod) || $idprod < 0) && empty($product_desc)) {
 			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Description')), null, 'errors');
 			$error++;
 		}
@@ -680,7 +680,7 @@ if (empty($reshook)) {
 			}
 		}
 
-		if (!$error && ($qty >= 0) && (!empty($product_desc) || !empty($idprod))) {
+		if (!$error && ($qty >= 0) && (!empty($product_desc) || (!empty($idprod) && $idprod > 0))) {
 			// Clean parameters
 			$date_start = dol_mktime(GETPOST('date_start'.$predef.'hour'), GETPOST('date_start'.$predef.'min'), GETPOST('date_start'.$predef.'sec'), GETPOST('date_start'.$predef.'month'), GETPOST('date_start'.$predef.'day'), GETPOST('date_start'.$predef.'year'));
 			$date_end = dol_mktime(GETPOST('date_end'.$predef.'hour'), GETPOST('date_end'.$predef.'min'), GETPOST('date_end'.$predef.'sec'), GETPOST('date_end'.$predef.'month'), GETPOST('date_end'.$predef.'day'), GETPOST('date_end'.$predef.'year'));
@@ -690,7 +690,7 @@ if (empty($reshook)) {
 			// Ecrase $desc par celui du produit
 			// Ecrase $tva_tx par celui du produit
 			// Ecrase $base_price_type par celui du produit
-			if (!empty($idprod)) {
+			if (!empty($idprod) && $idprod > 0) {
 				$prod = new Product($db);
 				$prod->fetch($idprod);
 
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index aa9897f9dc7..333d4e2ded6 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -1518,7 +1518,7 @@ class Commande extends CommonOrder
 			$this->db->begin();
 
 			$product_type = $type;
-			if (!empty($fk_product)) {
+			if (!empty($fk_product) && $fk_product > 0) {
 				$product = new Product($this->db);
 				$result = $product->fetch($fk_product);
 				$product_type = $product->type;
@@ -4389,7 +4389,7 @@ class OrderLine extends CommonOrderLine
 		$sql .= " '".price2num($this->localtax2_tx)."',";
 		$sql .= " '".$this->db->escape($this->localtax1_type)."',";
 		$sql .= " '".$this->db->escape($this->localtax2_type)."',";
-		$sql .= ' '.(!empty($this->fk_product) ? $this->fk_product : "null").',';
+		$sql .= ' '.((!empty($this->fk_product) && $this->fk_product > 0) ? $this->fk_product : "null").',';
 		$sql .= " '".$this->db->escape($this->product_type)."',";
 		$sql .= " '".price2num($this->remise_percent)."',";
 		$sql .= " ".(price2num($this->subprice) !== '' ?price2num($this->subprice) : "null").",";
diff --git a/htdocs/compta/facture/card-rec.php b/htdocs/compta/facture/card-rec.php
index dd4042b9e34..affdd2e8991 100644
--- a/htdocs/compta/facture/card-rec.php
+++ b/htdocs/compta/facture/card-rec.php
@@ -447,15 +447,15 @@ if (empty($reshook)) {
 			}
 		}
 
-		if (empty($idprod) && ($price_ht < 0) && ($qty < 0)) {
+		if ((empty($idprod) || $idprod < 0) && ($price_ht < 0) && ($qty < 0)) {
 			setEventMessages($langs->trans('ErrorBothFieldCantBeNegative', $langs->transnoentitiesnoconv('UnitPriceHT'), $langs->transnoentitiesnoconv('Qty')), null, 'errors');
 			$error++;
 		}
-		if ($prod_entry_mode == 'free' && empty($idprod) && GETPOST('type') < 0) {
+		if ($prod_entry_mode == 'free' && (empty($idprod) || $idprod < 0) && GETPOST('type') < 0) {
 			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Type')), null, 'errors');
 			$error++;
 		}
-		if ($prod_entry_mode == 'free' && empty($idprod) && (!($price_ht >= 0) || $price_ht == '')) { 	// Unit price can be 0 but not ''
+		if ($prod_entry_mode == 'free' && (empty($idprod) || $idprod < 0) && (!($price_ht >= 0) || $price_ht == '')) { 	// Unit price can be 0 but not ''
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("UnitPriceHT")), null, 'errors');
 			$error++;
 		}
@@ -463,7 +463,7 @@ if (empty($reshook)) {
 			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Qty')), null, 'errors');
 			$error++;
 		}
-		if ($prod_entry_mode == 'free' && empty($idprod) && empty($product_desc)) {
+		if ($prod_entry_mode == 'free' && (empty($idprod) || $idprod < 0) && empty($product_desc)) {
 			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Description')), null, 'errors');
 			$error++;
 		}
@@ -473,7 +473,7 @@ if (empty($reshook)) {
 			$error++;
 		}
 
-		if (!$error && ($qty >= 0) && (!empty($product_desc) || !empty($idprod))) {
+		if (!$error && ($qty >= 0) && (!empty($product_desc) || (!empty($idprod) && $idprod > 0))) {
 			$ret = $object->fetch($id);
 			if ($ret < 0) {
 				dol_print_error($db, $object->error);
@@ -495,7 +495,7 @@ if (empty($reshook)) {
 			// Ecrase $tva_tx par celui du produit
 			// Ecrase $base_price_type par celui du produit
 			// Replaces $fk_unit with the product's
-			if (!empty($idprod)) {
+			if (!empty($idprod) && $idprod > 0) {
 				$prod = new Product($db);
 				$prod->fetch($idprod);
 
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 00653473cba..507c4ac44c2 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -2000,7 +2000,7 @@ if (empty($reshook)) {
 			}
 		}
 
-		if (empty($idprod) && ($price_ht < 0) && ($qty < 0)) {
+		if ((empty($idprod) || $idprod < 0) && ($price_ht < 0) && ($qty < 0)) {
 			setEventMessages($langs->trans('ErrorBothFieldCantBeNegative', $langs->transnoentitiesnoconv('UnitPriceHT'), $langs->transnoentitiesnoconv('Qty')), null, 'errors');
 			$error++;
 		}
@@ -2010,11 +2010,11 @@ if (empty($reshook)) {
 				$error++;
 			}
 		}
-		if ($prod_entry_mode == 'free' && empty($idprod) && GETPOST('type') < 0) {
+		if ($prod_entry_mode == 'free' && (empty($idprod) || $idprod < 0) && GETPOST('type') < 0) {
 			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Type')), null, 'errors');
 			$error++;
 		}
-		if (($prod_entry_mode == 'free' && empty($idprod) && (($price_ht < 0 && empty($conf->global->FACTURE_ENABLE_NEGATIVE_LINES)) || $price_ht == '') && $price_ht_devise == '') && $object->type != Facture::TYPE_CREDIT_NOTE) { 	// Unit price can be 0 but not ''
+		if (($prod_entry_mode == 'free' && (empty($idprod) || $idprod < 0) && (($price_ht < 0 && empty($conf->global->FACTURE_ENABLE_NEGATIVE_LINES)) || $price_ht == '') && $price_ht_devise == '') && $object->type != Facture::TYPE_CREDIT_NOTE) { 	// Unit price can be 0 but not ''
 			if ($price_ht < 0 && empty($conf->global->FACTURE_ENABLE_NEGATIVE_LINES)) {
 				$langs->load("errors");
 				if ($object->type == $object::TYPE_DEPOSIT) {
@@ -2057,7 +2057,7 @@ if (empty($reshook)) {
 			}
 		}
 
-		if (!$error && ($qty >= 0) && (!empty($product_desc) || !empty($idprod))) {
+		if (!$error && ($qty >= 0) && (!empty($product_desc) || (!empty($idprod) && $idprod > 0))) {
 			$ret = $object->fetch($id);
 			if ($ret < 0) {
 				dol_print_error($db, $object->error);
@@ -2079,7 +2079,7 @@ if (empty($reshook)) {
 			// Ecrase $tva_tx par celui du produit
 			// Ecrase $base_price_type par celui du produit
 			// Replaces $fk_unit with the product's
-			if (!empty($idprod)) {
+			if (!empty($idprod) && $idprod > 0) {
 				$prod = new Product($db);
 				$prod->fetch($idprod);
 
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 735f2877184..9cbfb33e5bd 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -3213,7 +3213,7 @@ class Facture extends CommonInvoice
 			$this->db->begin();
 
 			$product_type = $type;
-			if (!empty($fk_product)) {
+			if (!empty($fk_product) && $fk_product > 0) {
 				$product = new Product($this->db);
 				$result = $product->fetch($fk_product);
 				$product_type = $product->type;
@@ -5342,7 +5342,7 @@ class FactureLigne extends CommonInvoiceLine
 			$this->error = 'ErrorProductTypeMustBe0orMore';
 			return -1;
 		}
-		if (!empty($this->fk_product)) {
+		if (!empty($this->fk_product) && $this->fk_product > 0) {
 			// Check product exists
 			$result = Product::isExistingObject('product', $this->fk_product);
 			if ($result <= 0) {
@@ -5377,7 +5377,7 @@ class FactureLigne extends CommonInvoiceLine
 		$sql .= " ".price2num($this->localtax2_tx).",";
 		$sql .= " '".$this->db->escape($this->localtax1_type)."',";
 		$sql .= " '".$this->db->escape($this->localtax2_type)."',";
-		$sql .= ' '.(!empty($this->fk_product) ? $this->fk_product : "null").',';
+		$sql .= ' '.((!empty($this->fk_product) && $this->fk_product > 0) ? $this->fk_product : "null").',';
 		$sql .= " ".((int) $this->product_type).",";
 		$sql .= " ".price2num($this->remise_percent).",";
 		$sql .= " ".price2num($this->subprice).",";
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 05c7436c22e..32edf9a1558 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -386,7 +386,7 @@ if (empty($reshook)) {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Qty")), null, 'errors');
 			$error++;
 		}
-		if (GETPOST('prod_entry_mode', 'alpha') == 'free' && empty($idprod) && empty($product_desc)) {
+		if (GETPOST('prod_entry_mode', 'alpha') == 'free' && (empty($idprod) || $idprod < 0) && empty($product_desc)) {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Description")), null, 'errors');
 			$error++;
 		}
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 4b38de413e9..64fdb956ab0 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -7717,7 +7717,7 @@ abstract class CommonObject
 			$buyPrice = $unitPrice * (1 - $discountPercent / 100);
 		} else {
 			// Get cost price for margin calculation
-			if (!empty($fk_product)) {
+			if (!empty($fk_product) && $fk_product > 0) {
 				if (isset($conf->global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == 'costprice') {
 					require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 					$product = new Product($this->db);
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 0b1504d229a..83f66b204ee 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -2176,7 +2176,7 @@ class Form
 	 *
 	 *  @param		int			$selected				Preselected products
 	 *  @param		string		$htmlname				Name of HTML select field (must be unique in page).
-	 *  @param		int			$filtertype				Filter on product type (''=nofilter, 0=product, 1=service)
+	 *  @param		int|string	$filtertype				Filter on product type (''=nofilter, 0=product, 1=service)
 	 *  @param		int			$limit					Limit on number of returned lines
 	 *  @param		int			$price_level			Level of price to show
 	 *  @param		int			$status					Sell status -1=Return all products, 0=Products not on sell, 1=Products on sell
@@ -2604,7 +2604,7 @@ class Form
 				}
 			}
 			if ($showempty) {
-				$out .= '<option value="0" selected>'.($textifempty ? $textifempty : '&nbsp;').'</option>';
+				$out .= '<option value="-1" selected>'.($textifempty ? $textifempty : '&nbsp;').'</option>';
 			}
 
 			$i = 0;
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 3c6151ef349..7b5bbbc50c5 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -3550,7 +3550,7 @@ class SupplierInvoiceLine extends CommonObjectLine
 			$this->error = 'ErrorProductTypeMustBe0orMore';
 			return -1;
 		}
-		if (!empty($this->fk_product)) {
+		if (!empty($this->fk_product) && $this->fk_product > 0) {
 			// Check product exists
 			$result = Product::isExistingObject('product', $this->fk_product);
 			if ($result <= 0) {
@@ -3583,7 +3583,7 @@ class SupplierInvoiceLine extends CommonObjectLine
 		$sql .= " ".price2num($this->localtax2_tx).",";
 		$sql .= " '".$this->db->escape($this->localtax1_type)."',";
 		$sql .= " '".$this->db->escape($this->localtax2_type)."',";
-		$sql .= ' '.(!empty($this->fk_product) ? $this->fk_product : "null").',';
+		$sql .= ' '.((!empty($this->fk_product) && $this->fk_product > 0) ? $this->fk_product : "null").',';
 		$sql .= " ".((int) $this->product_type).",";
 		$sql .= " ".price2num($this->remise_percent).",";
 		$sql .= ' '.(! empty($this->fk_remise_except) ? ((int) $this->fk_remise_except) : "null").',';
diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index 5f4f13056a3..5be93a9b9d1 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -93,7 +93,7 @@ class FormProduct
 		}
 
 		$sql = "SELECT e.rowid, e.ref as label, e.description, e.fk_parent";
-		if (!empty($fk_product)) {
+		if (!empty($fk_product) && $fk_product > 0) {
 			if (!empty($batch)) {
 				$sql .= ", pb.qty as stock";
 			} else {
@@ -104,7 +104,7 @@ class FormProduct
 		}
 		$sql .= " FROM ".MAIN_DB_PREFIX."entrepot as e";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as ps on ps.fk_entrepot = e.rowid";
-		if (!empty($fk_product)) {
+		if (!empty($fk_product) && $fk_product > 0) {
 			$sql .= " AND ps.fk_product = ".((int) $fk_product);
 			if (!empty($batch)) {
 				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_batch as pb on pb.fk_product_stock = ps.rowid AND pb.batch = '".$this->db->escape($batch)."'";
@@ -123,11 +123,11 @@ class FormProduct
 
 		// minimum stock
 		if ($stockMin !== false) {
-			if (!empty($fk_product)) {
+			if (!empty($fk_product) && $fk_product > 0) {
 				if (!empty($batch)) {
-					$sql .= " AND pb.qty > ".$this->db->escape($stockMin);
+					$sql .= " AND pb.qty > ".((float) $stockMin);
 				} else {
-					$sql .= " AND ps.reel > ".$this->db->escape($stockMin);
+					$sql .= " AND ps.reel > ".((float) $stockMin);
 				}
 			}
 		}
@@ -137,7 +137,7 @@ class FormProduct
 
 			// minimum stock
 			if ($stockMin !== false) {
-				$sql .= " HAVING sum(ps.reel) > ".$this->db->escape($stockMin);
+				$sql .= " HAVING sum(ps.reel) > ".((float) $stockMin);
 			}
 		}
 		$sql .= " ORDER BY ".$orderBy;
@@ -234,7 +234,7 @@ class FormProduct
 		if (empty($conf->global->ENTREPOT_EXTRA_STATUS)) {
 			$filterstatus = '';
 		}
-		if (!empty($fk_product)) {
+		if (!empty($fk_product) && $fk_product > 0) {
 			$this->cache_warehouses = array();
 		}
 
@@ -549,8 +549,8 @@ class FormProduct
 		$out = '';
 		$productIdArray = array();
 		if (!is_array($objectLines) || !count($objectLines)) {
-			if (!empty($fk_product)) {
-				$productIdArray[] = $fk_product;
+			if (!empty($fk_product) && $fk_product > 0) {
+				$productIdArray[] = (int) $fk_product;
 			}
 		} else {
 			foreach ($objectLines as $line) {
@@ -572,8 +572,8 @@ class FormProduct
 		if ($empty) {
 			$out .= '<option value="-1">'.($empty_label ? $empty_label : '&nbsp;').'</option>';
 		}
-		if (!empty($fk_product)) {
-			$productIdArray = array($fk_product); // only show lot stock for product
+		if (!empty($fk_product) && $fk_product > 0) {
+			$productIdArray = array((int) $fk_product); // only show lot stock for product
 		} else {
 			foreach ($this->cache_lot as $key => $value) {
 				$productIdArray[] = $key;
diff --git a/htdocs/product/stock/class/productstockentrepot.class.php b/htdocs/product/stock/class/productstockentrepot.class.php
index aea8c3e1f14..d8138c7f149 100644
--- a/htdocs/product/stock/class/productstockentrepot.class.php
+++ b/htdocs/product/stock/class/productstockentrepot.class.php
@@ -280,10 +280,10 @@ class ProductStockEntrepot extends CommonObject
 			$sql .= ' AND '.implode(' '.$filtermode.' ', $sqlwhere);
 		}
 
-		if (!empty($fk_product)) {
-			$sql .= ' AND fk_product = '.$fk_product;
-		} elseif (!empty($fk_entrepot)) {
-			$sql .= ' AND fk_entrepot = '.$fk_entrepot;
+		if (!empty($fk_product) && $fk_product > 0) {
+			$sql .= ' AND fk_product = '.((int) $fk_product);
+		} elseif (!empty($fk_entrepot) && $fk_entrepot > 0) {
+			$sql .= ' AND fk_entrepot = '.((int) $fk_entrepot);
 		}
 		// "elseif" used instead of "if" because getting list with specified fk_product and specified fk_entrepot would be the same as doing a fetch
 
diff --git a/htdocs/product/stock/stockatdate.php b/htdocs/product/stock/stockatdate.php
index d9cc186111f..4892004db72 100644
--- a/htdocs/product/stock/stockatdate.php
+++ b/htdocs/product/stock/stockatdate.php
@@ -356,14 +356,14 @@ print '<div class="inline-block valignmiddle" style="padding-right: 20px;">';
 print '<span class="fieldrequired">'.$langs->trans('Date').'</span> '.$form->selectDate(($date ? $date : -1), 'date');
 
 print ' <span class="clearbothonsmartphone marginleftonly paddingleftonly marginrightonly paddingrightonly">&nbsp;</span> ';
-print img_picto('', 'product').' ';
-print $langs->trans('Product').'</span> ';
-print $form->select_produits($productid, 'productid', '', 0, 0, -1, 2, '', 0, array(), 0, '1', 0, 'maxwidth300', 0, '', null, 1);
+print img_picto('', 'product', 'class="pictofiwedwidth"').' ';
+print '</span> ';
+print $form->select_produits($productid, 'productid', '', 0, 0, -1, 2, '', 0, array(), 0, $langs->trans('Product'), 0, 'maxwidth300', 0, '', null, 1);
 
 print ' <span class="clearbothonsmartphone marginleftonly paddingleftonly marginrightonly paddingrightonly">&nbsp;</span> ';
-print img_picto('', 'stock').' ';
-print $langs->trans('Warehouse').'</span> ';
-print $formproduct->selectWarehouses((GETPOSTISSET('fk_warehouse') ? $fk_warehouse : 'ifone'), 'fk_warehouse', '', 1, 0, 0, '', 0, 0, null, '', null, 1, false, 'e.ref');
+print img_picto('', 'stock', 'class="pictofiwedwidth"');
+print '</span> ';
+print $formproduct->selectWarehouses((GETPOSTISSET('fk_warehouse') ? $fk_warehouse : 'ifone'), 'fk_warehouse', '', 1, 0, 0, $langs->trans('Warehouse'), 0, 0, null, '', null, 1, false, 'e.ref');
 print '</div>';
 
 $parameters = array();
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 633f0785fe1..5d22ea05684 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -552,16 +552,16 @@ if (empty($reshook)) {
 			}
 		}
 
-		if ($prod_entry_mode == 'free' && empty($idprod) && GETPOST('type') < 0) {
+		if ($prod_entry_mode == 'free' && (empty($idprod) || $idprod < 0) && GETPOST('type') < 0) {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
 			$error++;
 		}
 
-		if ($prod_entry_mode == 'free' && empty($idprod) && GETPOST('price_ht') === '' && GETPOST('price_ttc') === '' && $price_ht_devise === '') { 	// Unit price can be 0 but not ''. Also price can be negative for proposal.
+		if ($prod_entry_mode == 'free' && (empty($idprod) || $idprod < 0) && GETPOST('price_ht') === '' && GETPOST('price_ttc') === '' && $price_ht_devise === '') { 	// Unit price can be 0 but not ''. Also price can be negative for proposal.
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("UnitPrice")), null, 'errors');
 			$error++;
 		}
-		if ($prod_entry_mode == 'free' && empty($idprod) && empty($product_desc)) {
+		if ($prod_entry_mode == 'free' && (empty($idprod) || $idprod < 0) && empty($product_desc)) {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Description")), null, 'errors');
 			$error++;
 		}
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index 5906db24ee7..eb003cdab9e 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -587,7 +587,7 @@ class SupplierProposal extends CommonObject
 			$this->line->date_end = $date_end;
 
 			// infos marge
-			if (!empty($fk_product) && empty($fk_fournprice) && empty($pa_ht)) {
+			if (!empty($fk_product) && $fk_product > 0 && empty($fk_fournprice) && empty($pa_ht)) {
 				// When fk_fournprice is 0, we take the lowest buying price
 				include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
 				$productFournisseur = new ProductFournisseur($this->db);
@@ -777,7 +777,7 @@ class SupplierProposal extends CommonObject
 			$this->line->fk_unit = $fk_unit;
 
 			// infos marge
-			if (!empty($fk_product) && empty($fk_fournprice) && empty($pa_ht)) {
+			if (!empty($fk_product) && $fk_product > 0 && empty($fk_fournprice) && empty($pa_ht)) {
 				// by external module, take lowest buying price
 				include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
 				$productFournisseur = new ProductFournisseur($this->db);

From 7013f01a416042163b1965289a9079c50c3e571c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 4 Jul 2021 21:14:46 +0200
Subject: [PATCH 0994/1497] Fix look and feel v14

---
 htdocs/bom/bom_card.php                                     | 3 ++-
 htdocs/comm/propal/card.php                                 | 3 ++-
 htdocs/commande/card.php                                    | 3 ++-
 htdocs/compta/facture/card.php                              | 3 ++-
 htdocs/core/tpl/objectline_create.tpl.php                   | 2 +-
 htdocs/eventorganization/conferenceorboothattendee_card.php | 4 ++--
 htdocs/fourn/commande/card.php                              | 3 ++-
 htdocs/fourn/facture/card.php                               | 3 ++-
 htdocs/modulebuilder/template/myobject_card.php             | 3 ++-
 htdocs/mrp/mo_card.php                                      | 3 ++-
 htdocs/partnership/partnership_card.php                     | 3 ++-
 11 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php
index b598b95ae0a..cd530994b9b 100644
--- a/htdocs/bom/bom_card.php
+++ b/htdocs/bom/bom_card.php
@@ -532,10 +532,11 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	 */
 
 	if (!empty($object->table_element_line)) {
-		print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '#addline' : '').'" method="POST">
+		print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '' : '').'" method="POST">
     	<input type="hidden" name="token" value="' . newToken().'">
     	<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline').'">
     	<input type="hidden" name="mode" value="">
+		<input type="hidden" name="page_y" value="">
     	<input type="hidden" name="id" value="' . $object->id.'">
     	';
 
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index ce1beacadf3..3c0d8dd9a28 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -2450,10 +2450,11 @@ if ($action == 'create') {
 	// Show object lines
 	$result = $object->getLinesArray();
 
-	print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '#addline' : '#line_'.GETPOST('lineid', 'int')).'" method="POST">
+	print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '' : '#line_'.GETPOST('lineid', 'int')).'" method="POST">
 	<input type="hidden" name="token" value="' . newToken().'">
 	<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline').'">
 	<input type="hidden" name="mode" value="">
+	<input type="hidden" name="page_y" value="">
 	<input type="hidden" name="id" value="' . $object->id.'">
 	';
 
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 7908b54bf05..7363ceace5c 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -2417,10 +2417,11 @@ if ($action == 'create' && $usercancreate) {
 		 */
 		$result = $object->getLinesArray();
 
-		print '<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '#addline' : '#line_'.GETPOST('lineid', 'int')).'" method="POST">
+		print '<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '' : '#line_'.GETPOST('lineid', 'int')).'" method="POST">
 		<input type="hidden" name="token" value="' . newToken().'">
 		<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline').'">
 		<input type="hidden" name="mode" value="">
+		<input type="hidden" name="page_y" value="">
 		<input type="hidden" name="id" value="' . $object->id.'">';
 
 		if (!empty($conf->use_javascript_ajax) && $object->statut == Commande::STATUS_DRAFT) {
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 507c4ac44c2..699a10d3ef5 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -5195,10 +5195,11 @@ if ($action == 'create') {
 		}
 	}
 
-	print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '#addline' : '#line_'.GETPOST('lineid', 'int')).'" method="POST">
+	print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '' : '#line_'.GETPOST('lineid', 'int')).'" method="POST">
 	<input type="hidden" name="token" value="' . newToken().'">
 	<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline').'">
 	<input type="hidden" name="mode" value="">
+	<input type="hidden" name="page_y" value="">
 	<input type="hidden" name="id" value="' . $object->id.'">
 	';
 
diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index 474b1a24957..f978a436354 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -448,7 +448,7 @@ if ($nolinesbefore) {
 	$coldisplay += $colspan;
 	?>
 	<td class="nobottom linecoledit center valignmiddle" colspan="<?php echo $colspan; ?>">
-		<input type="submit" class="button" value="<?php echo $langs->trans('Add'); ?>" name="addline" id="addline">
+		<input type="submit" class="button reposition" value="<?php echo $langs->trans('Add'); ?>" name="addline" id="addline">
 	</td>
 </tr>
 
diff --git a/htdocs/eventorganization/conferenceorboothattendee_card.php b/htdocs/eventorganization/conferenceorboothattendee_card.php
index 8a3767f0606..c5f3a91b10e 100644
--- a/htdocs/eventorganization/conferenceorboothattendee_card.php
+++ b/htdocs/eventorganization/conferenceorboothattendee_card.php
@@ -1,6 +1,5 @@
 <?php
 /* 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
  * it under the terms of the GNU General Public License as published by
@@ -571,10 +570,11 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		// Show object lines
 		$result = $object->getLinesArray();
 
-		print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '#addline' : '#line_'.GETPOST('lineid', 'int')).'" method="POST">
+		print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '' : '#line_'.GETPOST('lineid', 'int')).'" method="POST">
 		<input type="hidden" name="token" value="' . newToken().'">
 		<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline').'">
 		<input type="hidden" name="mode" value="">
+		<input type="hidden" name="page_y" value="">
 		<input type="hidden" name="id" value="' . $object->id.'">
 		';
 
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 6e89abbf953..cc0f67e4b4e 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -2303,10 +2303,11 @@ if ($action == 'create') {
 	//$result = $object->getLinesArray();
 
 
-	print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '#addline' : '#line_'.GETPOST('lineid', 'int')).'" method="POST">
+	print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '' : '#line_'.GETPOST('lineid', 'int')).'" method="POST">
 	<input type="hidden" name="token" value="'.newToken().'">
 	<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline').'">
 	<input type="hidden" name="mode" value="">
+	<input type="hidden" name="page_y" value="">
 	<input type="hidden" name="id" value="'.$object->id.'">
     <input type="hidden" name="socid" value="'.$societe->id.'">
 	';
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index a28b8c13331..7d8d29b307c 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -3292,10 +3292,11 @@ if ($action == 'create') {
 		/*
 		 * Lines
 		 */
-		print '<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '#addline' : '#line_'.GETPOST('lineid', 'int')).'" method="POST">';
+		print '<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '' : '#line_'.GETPOST('lineid', 'int')).'" method="POST">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="action" value="'.(($action != 'editline') ? 'addline' : 'updateline').'">';
 		print '<input type="hidden" name="mode" value="">';
+		print '<input type="hidden" name="page_y" value="">';
 		print '<input type="hidden" name="id" value="'.$object->id.'">';
 		print '<input type="hidden" name="socid" value="'.$societe->id.'">';
 
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index cac59593950..b074412b6b3 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -434,10 +434,11 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		// Show object lines
 		$result = $object->getLinesArray();
 
-		print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '#addline' : '#line_'.GETPOST('lineid', 'int')).'" method="POST">
+		print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '' : '#line_'.GETPOST('lineid', 'int')).'" method="POST">
 		<input type="hidden" name="token" value="' . newToken().'">
 		<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline').'">
 		<input type="hidden" name="mode" value="">
+		<input type="hidden" name="page_y" value="">
 		<input type="hidden" name="id" value="' . $object->id.'">
 		';
 
diff --git a/htdocs/mrp/mo_card.php b/htdocs/mrp/mo_card.php
index b6cc502bd60..732cde2ef2f 100644
--- a/htdocs/mrp/mo_card.php
+++ b/htdocs/mrp/mo_card.php
@@ -506,10 +506,11 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		//$result = $object->getLinesArray();
 		$object->fetchLines();
 
-		print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '#addline' : '#line_'.GETPOST('lineid', 'int')).'" method="POST">
+		print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '' : '#line_'.GETPOST('lineid', 'int')).'" method="POST">
     	<input type="hidden" name="token" value="' . newToken().'">
     	<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline').'">
     	<input type="hidden" name="mode" value="">
+		<input type="hidden" name="page_y" value="">
     	<input type="hidden" name="id" value="' . $object->id.'">
     	';
 
diff --git a/htdocs/partnership/partnership_card.php b/htdocs/partnership/partnership_card.php
index 29789072773..e79924caf48 100644
--- a/htdocs/partnership/partnership_card.php
+++ b/htdocs/partnership/partnership_card.php
@@ -474,10 +474,11 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		// Show object lines
 		$result = $object->getLinesArray();
 
-		print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '#addline' : '#line_'.GETPOST('lineid', 'int')).'" method="POST">
+		print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '' : '#line_'.GETPOST('lineid', 'int')).'" method="POST">
 		<input type="hidden" name="token" value="' . newToken().'">
 		<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline').'">
 		<input type="hidden" name="mode" value="">
+		<input type="hidden" name="page_y" value="">
 		<input type="hidden" name="id" value="' . $object->id.'">
 		';
 

From f37a62b1d45e185a949184a7b28672bcb85433b9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 4 Jul 2021 21:40:30 +0200
Subject: [PATCH 0995/1497] CSS v14

---
 htdocs/theme/md/style.css.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index aa87a36f01d..8a642a0e170 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -3091,8 +3091,8 @@ div.tabsElem a {
 div.tabBar {
 	color: #<?php echo $colortextbacktab; ?>;
 	padding-top: 21px;
-	padding-left: 18px;
-	padding-right: 18px;
+	padding-left: 24px;
+	padding-right: 24px;
 	padding-bottom: 18px;
 	margin: 0px 0px 18px 0px;
 	-webkit-border-radius: 3px;
@@ -3439,9 +3439,9 @@ tr.liste_titre_filter td.liste_titre {
 }
 .liste_titre_create td, .liste_titre_create th, .liste_titre_create .tagtd
 {
-	/*border-top-width: 1px;
+	border-top-width: 1px;
 	border-top-color: rgb(<?php echo $colortopbordertitle1 ?>);
-	border-top-style: solid;*/
+	border-top-style: solid;
 }
 .liste_titre_add td, .liste_titre_add th, .liste_titre_add .tagtd
 {
@@ -3830,7 +3830,7 @@ div.liste_titre_bydiv, .liste_titre div.tagtr, tr.liste_titre, tr.liste_titre_se
 {
 	background: rgb(<?php echo $colorbacktitle1; ?>);
 	font-weight: <?php echo $useboldtitle ? 'bold' : 'normal'; ?>;
-	border-bottom: 1px solid #FDFFFF;
+	/* border-bottom: 1px solid #FDFFFF; */
 
 	color: rgb(<?php echo $colortexttitle; ?>);
 	font-family: <?php print $fontlist ?>;

From a709cc583f18c8d643f31427dd907d809ee71152 Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Sun, 4 Jul 2021 22:59:53 +0200
Subject: [PATCH 0996/1497] Add modal option to btn

---
 htdocs/core/js/lib_foot.js.php    | 56 +++++++++++++++++++++++++++++++
 htdocs/core/lib/functions.lib.php | 39 +++++++++++++++++++--
 htdocs/langs/en_US/other.lang     |  4 +++
 htdocs/langs/fr_FR/other.lang     |  4 +++
 4 files changed, 100 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/js/lib_foot.js.php b/htdocs/core/js/lib_foot.js.php
index dce74d93653..d7e8b669528 100644
--- a/htdocs/core/js/lib_foot.js.php
+++ b/htdocs/core/js/lib_foot.js.php
@@ -245,3 +245,59 @@ print 'jQuery(\'.clipboardCPButton, .clipboardCPValueToPrint\').click(function()
 		lastchild.innerHTML = \''.dol_escape_js($langs->trans('CopiedToClipboard')).'\';
 		setTimeout(() => { lastchild.innerHTML = tmp; }, 1000);
 	})'."\n";
+
+
+print "\n/* JS CODE TO ENABLE ClipBoard copy paste*/\n";
+print '$( document ).ready(function() {
+	$(document).on("click", \'.butActionConfirm\', function(event) {
+		event.preventDefault();
+
+		// I don\'t use jquery $(this).data(\'confirm-url\'); to get $(this).attr(\'data-confirm-url\'); because .data() can doesn\'t work with ajax
+		var confirmUrl  			= $(this).attr(\'data-confirm-url\');
+		var confirmTitle 			= $(this).attr(\'data-confirm-title\');
+		var confirmContent 			= $(this).attr(\'data-confirm-content\');
+		var confirmActionBtnLabel 	= $(this).attr(\'data-confirm-action-btn-label\');
+		var confirmCancelBtnLabel 	= $(this).attr(\'data-confirm-cancel-btn-label\');
+
+		var confirmId = \'confirm-dialog-box\';
+		if($(this).attr(\'id\') != undefined){ var confirmId = confirmId + "-" + $(this).attr(\'id\'); }
+		if($("#" + confirmId)  != undefined) { $(\'#\' + confirmId).remove(); }
+
+		// Create modal box
+
+		var $confirmBox = $(\'<div/>\', {
+			id: confirmId,
+			title: confirmTitle
+		}).appendTo(\'body\');
+
+		$confirmBox.dialog({
+			autoOpen: true,
+			modal: false,
+			//width: Math.min($( window ).width() - 50, 1700),
+			dialogClass: \'confirm-dialog-box\',
+			buttons: [
+				{
+					text: confirmActionBtnLabel,
+					"class": \'ui-state-information\',
+					click: function () {
+					window.location.replace(confirmUrl);
+				}
+				},
+				{
+					text: confirmCancelBtnLabel,
+					"class": \'ui-state-information\',
+					click: function () {
+					$(this).dialog("close");
+				}
+				}
+			],
+			close: function( event, ui ) {
+	$(\'#\'+confirmBox).remove();
+},
+			open: function( event, ui ) {
+	$confirmBox.html(confirmContent);
+}
+		});
+	});
+});
+'."\n";
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 28c553d747c..2acfeedb2d9 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -9734,6 +9734,8 @@ function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $st
  */
 function dolGetButtonAction($label, $html = '', $actionType = 'default', $url = '', $id = '', $userRight = 1, $params = array())
 {
+	global $hookmanager, $action, $object, $langs;
+
 	$class = 'butAction';
 	if ($actionType == 'danger' || $actionType == 'delete') {
 		$class = 'butActionDelete';
@@ -9774,12 +9776,21 @@ function dolGetButtonAction($label, $html = '', $actionType = 'default', $url =
 		}
 	}
 
+	// Js Confirm button
+	if (!empty($params['confirm']) && is_array($params['confirm']) && !empty($params['confirm']['url'])) {
+		// for js desabled compatibility set $url as call to confirm action and $params['confirm']['url'] to confirmed action
+		$attr['data-confirm-url'] = $params['confirm']['url'];
+		$attr['data-confirm-title'] = !empty($params['confirm']['title']) ? $params['confirm']['title'] : $langs->trans('ConfirmBtnCommonTitle', $label);
+		$attr['data-confirm-content'] = !empty($params['confirm']['content']) ? $params['confirm']['content'] : $langs->trans('ConfirmBtnCommonContent', $label);
+		$attr['data-confirm-action-btn-label'] = !empty($params['confirm']['action-btn-label']) ? $params['confirm']['action-btn-label'] : $langs->trans('Confirm');
+		$attr['data-confirm-cancel-btn-label'] = !empty($params['confirm']['cancel-btn-label']) ? $params['confirm']['cancel-btn-label'] : $langs->trans('CloseDialog');
+		$attr['class'].= ' butActionConfirm';
+	}
+
 	if (isset($attr['href']) && empty($attr['href'])) {
 		unset($attr['href']);
 	}
 
-	// TODO : add a hook
-
 	// escape all attribute
 	$attr = array_map('dol_escape_htmltag', $attr);
 
@@ -9792,7 +9803,29 @@ function dolGetButtonAction($label, $html = '', $actionType = 'default', $url =
 
 	$tag = !empty($attr['href']) ? 'a' : 'span';
 
-	return '<'.$tag.' '.$compiledAttributes.'>'.$html.'</'.$tag.'>';
+
+	$parameters = array(
+		'TCompiledAttr' => $TCompiledAttr,
+		'compiledAttributes' => $compiledAttributes,
+		'attr' => $attr,
+		'tag' => $tag,
+		'label' => $label,
+		'html' => $html,
+		'actionType' => $actionType,
+		'url' => $url,
+		'id' => $id,
+		'userRight' => $userRight,
+		'params' => $params
+	);
+
+	$reshook = $hookmanager->executeHooks('dolGetButtonAction', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+	if (empty($reshook)) {
+		return '<' . $tag . ' ' . $compiledAttributes . '>' . $html . '</' . $tag . '>';
+	} else {
+		return $hookmanager->resPrint;
+	}
 }
 
 /**
diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index bb35099ab82..ea280968ef4 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -291,3 +291,7 @@ PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
 SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
+
+ConfirmBtnCommonContent = Are you sure you want to "%s" ?
+ConfirmBtnCommonTitle = Confirm your action
+CloseDialog = Close
diff --git a/htdocs/langs/fr_FR/other.lang b/htdocs/langs/fr_FR/other.lang
index 05af1498cb6..32aee9c92a6 100644
--- a/htdocs/langs/fr_FR/other.lang
+++ b/htdocs/langs/fr_FR/other.lang
@@ -291,3 +291,7 @@ PopuCom=Produits/services par popularité dans les commandes
 ProductStatistics=Statistiques sur les produits / services
 NbOfQtyInOrders=Qté en commandes
 SelectTheTypeOfObjectToAnalyze=Sélectionner un objet pour en voir les statistiques
+
+ConfirmBtnCommonContent = Êtes-vous sûr de vouloir : "%s" ?
+ConfirmBtnCommonTitle = Confirmez votre action
+CloseDialog = Fermer

From 752fe22c68c305e47999b06ec5313f15cf345e52 Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Sun, 4 Jul 2021 23:24:38 +0200
Subject: [PATCH 0997/1497] Add simple auto mode

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 2acfeedb2d9..3b4c27fd6ca 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -9777,7 +9777,13 @@ function dolGetButtonAction($label, $html = '', $actionType = 'default', $url =
 	}
 
 	// Js Confirm button
-	if (!empty($params['confirm']) && is_array($params['confirm']) && !empty($params['confirm']['url'])) {
+	if (!empty($params['confirm'])) {
+		if (!is_array($params['confirm'])) {
+			$params['confirm'] = array(
+				'url' => $url . (strpos($url, '?') > 0 ? '&' : '?') . 'confirm=yes'
+			);
+		}
+
 		// for js desabled compatibility set $url as call to confirm action and $params['confirm']['url'] to confirmed action
 		$attr['data-confirm-url'] = $params['confirm']['url'];
 		$attr['data-confirm-title'] = !empty($params['confirm']['title']) ? $params['confirm']['title'] : $langs->trans('ConfirmBtnCommonTitle', $label);

From 8bde61c2c63fb917633db414c684204dfd428d6e Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 5 Jul 2021 06:58:10 +0200
Subject: [PATCH 0998/1497] FIX Accountancy - Link from admin

---
 htdocs/accountancy/admin/index.php          |  2 +-
 htdocs/admin/accounting.php                 | 11 ++++++-----
 htdocs/core/modules/modAccounting.class.php |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/htdocs/accountancy/admin/index.php b/htdocs/accountancy/admin/index.php
index 24d31acddd6..98320613bfc 100644
--- a/htdocs/accountancy/admin/index.php
+++ b/htdocs/accountancy/admin/index.php
@@ -259,7 +259,7 @@ llxHeader('', $title);
 
 $linkback = '';
 //$linkback = '<a href="' . DOL_URL_ROOT . '/admin/modules.php?restore_lastsearch_values=1">' . $langs->trans("BackToModuleList") . '</a>';
-print load_fiche_titre($langs->trans('ConfigAccountingExpert'), $linkback, 'accountancy');
+print load_fiche_titre($title, $linkback, 'accountancy');
 
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
diff --git a/htdocs/admin/accounting.php b/htdocs/admin/accounting.php
index e775f5bd8e3..ebe0712b03a 100644
--- a/htdocs/admin/accounting.php
+++ b/htdocs/admin/accounting.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2018       Alexandre Spangaro      <aspangaro@open-dsi.fr>
+/* Copyright (C) 2018-2021	Alexandre Spangaro      <aspangaro@open-dsi.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
 /**
  *	\file       htdocs/admin/accounting.php
  *	\ingroup    accounting
- *	\brief      Setup page to configure accountanting module
+ *	\brief      Setup page to configure accounting module
  */
 
 require '../main.inc.php';
@@ -32,7 +32,7 @@ $action = GETPOST('action', 'aZ09');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'adminaccoutant'; // To manage different context of search
 
 // Load translation files required by the page
-$langs->loadLangs(array('admin', 'companies'));
+$langs->loadLangs(array('admin', 'companies', 'accountancy'));
 
 if (!$user->admin) {
 	accessforbidden();
@@ -52,12 +52,13 @@ $error = 0;
  * View
  */
 
+$title = $langs->trans("ConfigAccountingExpert");
 $help_url = '';
-llxHeader('', $langs->trans("ConfigAccountingExpert"), $help_url);
+llxHeader('', $title, $help_url);
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
 
-print load_fiche_titre($langs->trans("ConfigAccountingExpert"), $linkback, 'title_setup');
+print load_fiche_titre($title, $linkback, 'title_setup');
 
 print "<br>\n";
 print '<span class="opacitymedium">'.$langs->trans("AccountancySetupDoneFromAccountancyMenu", $langs->transnoentitiesnoconv("Accounting").' - '.$langs->transnoentitiesnoconv("Setup"))."</span><br>\n";
diff --git a/htdocs/core/modules/modAccounting.class.php b/htdocs/core/modules/modAccounting.class.php
index d6127f65b83..e0bf3a9bbc5 100644
--- a/htdocs/core/modules/modAccounting.class.php
+++ b/htdocs/core/modules/modAccounting.class.php
@@ -60,7 +60,7 @@ class modAccounting extends DolibarrModules
 		$this->dirs = array('/accounting/temp');
 
 		// Config pages
-		$this->config_page_url = array('accounting.php');
+		$this->config_page_url = array('accounting.php?mainmenu=accountancy&leftmenu=accountancy_admin');
 
 		// Dependencies
 		$this->depends = array("modFacture", "modBanque", "modTax"); // List of modules id that must be enabled if this module is enabled

From ad62062cd533c5409a2e1846d4e8447c4dbc60eb Mon Sep 17 00:00:00 2001
From: jpb <jean-pascal.boudet@atm-consulting>
Date: Mon, 5 Jul 2021 08:55:03 +0200
Subject: [PATCH 0999/1497] add filter

---
 htdocs/commande/list.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 73413d1070f..3acae2f8180 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -494,7 +494,7 @@ if ($search_billed != '' && $search_billed >= 0) {
 	$sql .= ' AND c.facture = '.((int) $search_billed);
 }
 if ($search_status <> '') {
-	if ($search_status < 4 && $search_status > -3) {
+	if ($search_status < 4 && $search_status > -4) {
 		if ($search_status == 1 && empty($conf->expedition->enabled)) {
 			$sql .= ' AND c.fk_statut IN (1,2)'; // If module expedition disabled, we include order with status 'sending in process' into 'validated'
 		} else {
@@ -513,6 +513,12 @@ if ($search_status <> '') {
 		//$sql.= ' AND c.facture = 0'; // invoice not created
 		$sql .= ' AND ((c.fk_statut IN (1,2)) OR (c.fk_statut = 3 AND c.facture = 0))'; // validated, in process or closed but not billed
 	}
+	if ($search_status == -4)	// To bill
+	{
+
+		$sql .= ' AND (c.fk_statut IN (1,2))'; // validated, in process
+	}
+
 }
 
 if ($search_datecloture_start) {
@@ -675,6 +681,9 @@ if ($resql) {
 	if ($search_status == -3) {
 		$title .= ' - '.$langs->trans('StatusOrderValidated').', '.(empty($conf->expedition->enabled) ? '' : $langs->trans("StatusOrderSent").', ').$langs->trans('StatusOrderToBill');
 	}
+	if ($search_status == -4) {
+		$title .= ' - '.$langs->trans("StatusOrderValidatedShort").'+'.$langs->trans("StatusOrderSentShort");
+	}
 
 	$num = $db->num_rows($resql);
 
@@ -1236,6 +1245,7 @@ if ($resql) {
 			Commande::STATUS_SHIPMENTONPROCESS=>$langs->trans("StatusOrderSentShort"),
 			Commande::STATUS_CLOSED=>$langs->trans("StatusOrderDelivered"),
 			-3=>$langs->trans("StatusOrderValidatedShort").'+'.$langs->trans("StatusOrderSentShort").'+'.$langs->trans("StatusOrderDelivered"),
+			-4=>$langs->trans("StatusOrderValidatedShort").'+'.$langs->trans("StatusOrderSentShort"),
 			Commande::STATUS_CANCELED=>$langs->trans("StatusOrderCanceledShort")
 		);
 		print $form->selectarray('search_status', $liststatus, $search_status, -4, 0, 0, '', 0, 0, 0, '', 'maxwidth100', 1);

From bcb06d5c909664e6195acc395bddb23357ba0824 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Mon, 5 Jul 2021 07:40:44 +0000
Subject: [PATCH 1000/1497] Fixing style errors.

---
 htdocs/commande/list.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 3acae2f8180..8971d942de6 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -513,12 +513,9 @@ if ($search_status <> '') {
 		//$sql.= ' AND c.facture = 0'; // invoice not created
 		$sql .= ' AND ((c.fk_statut IN (1,2)) OR (c.fk_statut = 3 AND c.facture = 0))'; // validated, in process or closed but not billed
 	}
-	if ($search_status == -4)	// To bill
-	{
-
+	if ($search_status == -4) {	// To bill
 		$sql .= ' AND (c.fk_statut IN (1,2))'; // validated, in process
 	}
-
 }
 
 if ($search_datecloture_start) {

From dfee489e7e1650fab9c187406a40c4275a0ff731 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 5 Jul 2021 11:33:32 +0200
Subject: [PATCH 1001/1497] Fix sanitizing entity

---
 htdocs/user/class/user.class.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 37ce6544cd0..ef530cbe6f5 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -442,7 +442,7 @@ class User extends CommonObject
 
 		if ($entity < 0) {
 			if ((empty($conf->multicompany->enabled) || empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) && (!empty($user->entity))) {
-				$sql .= " WHERE u.entity IN (0, ".$this->db->sanitize($conf->entity).")";
+				$sql .= " WHERE u.entity IN (0, ".((int) $conf->entity).")";
 			} else {
 				$sql .= " WHERE u.entity IS NOT NULL"; // multicompany is on in transverse mode or user making fetch is on entity 0, so user is allowed to fetch anywhere into database
 			}
@@ -451,7 +451,7 @@ class User extends CommonObject
 			if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
 				$sql .= " WHERE u.entity IS NOT NULL"; // multicompany is on in transverse mode or user making fetch is on entity 0, so user is allowed to fetch anywhere into database
 			} else {
-				$sql .= " WHERE u.entity IN (0, ".$this->db->sanitize(($entity != '' && $entity >= 0) ? $entity : $conf->entity).")"; // search in entity provided in parameter
+				$sql .= " WHERE u.entity IN (0, ".((int) (($entity != '' && $entity >= 0) ? $entity : $conf->entity)).")"; // search in entity provided in parameter
 			}
 		}
 
@@ -2109,8 +2109,8 @@ class User extends CommonObject
 		$outputlangs = new Translate("", $conf);
 
 		if (isset($this->conf->MAIN_LANG_DEFAULT)
-		&& $this->conf->MAIN_LANG_DEFAULT != 'auto') {	// If user has defined its own language (rare because in most cases, auto is used)
-			$outputlangs->getDefaultLang($this->conf->MAIN_LANG_DEFAULT);
+			&& $this->conf->MAIN_LANG_DEFAULT != 'auto') {	// If user has defined its own language (rare because in most cases, auto is used)
+				$outputlangs->getDefaultLang($this->conf->MAIN_LANG_DEFAULT);
 		}
 
 		if ($this->conf->MAIN_LANG_DEFAULT) {
@@ -2184,7 +2184,7 @@ class User extends CommonObject
 			'',
 			'',
 			$trackid
-		);
+			);
 
 		if ($mailfile->sendfile()) {
 			return 1;
@@ -3222,8 +3222,8 @@ class User extends CommonObject
 			foreach ($this->users as $key => $val) {
 				if (preg_match('/'.$keyfilter1.'/', $val['fullpath']) || preg_match('/'.$keyfilter2.'/', $val['fullpath'])
 					|| preg_match('/'.$keyfilter3.'/', $val['fullpath']) || preg_match('/'.$keyfilter4.'/', $val['fullpath'])) {
-					unset($this->users[$key]);
-				}
+						unset($this->users[$key]);
+					}
 			}
 		}
 

From b7c86f3aeccf5b935de5e213608b2c5e5388a96f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 5 Jul 2021 11:41:55 +0200
Subject: [PATCH 1002/1497] Fix ldap

---
 htdocs/core/login/functions_ldap.php | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/login/functions_ldap.php b/htdocs/core/login/functions_ldap.php
index 9de95be506b..0f3927709eb 100644
--- a/htdocs/core/login/functions_ldap.php
+++ b/htdocs/core/login/functions_ldap.php
@@ -29,7 +29,7 @@
  *
  * @param	string	$usertotest		Login
  * @param	string	$passwordtotest	Password
- * @param   int		$entitytotest   Number of instance (always 1 if module multicompany not enabled)
+ * @param   int		$entitytotest   Numero of instance (always 1 if module multicompany not enabled)
  * @return	string					Login if OK, '' if KO
  */
 function check_user_password_ldap($usertotest, $passwordtotest, $entitytotest)
@@ -151,10 +151,13 @@ function check_user_password_ldap($usertotest, $passwordtotest, $entitytotest)
 		if ($result > 0) {
 			if ($result == 2) {	// Connection is ok for user/pass into LDAP
 				$login = $usertotest;
-				if (!empty($conf->global->LDAP_FIELD_LOGIN)) {
-					$login = $ldap->login;
-				}
 				dol_syslog("functions_ldap::check_user_password_ldap $login authentication ok");
+				// For the case, we search the user id using a search key without the login (but using other fields like id),
+				// we need to get the real login to use in the ldap answer.
+				if (!empty($conf->global->LDAP_FIELD_LOGIN) && !empty($ldap->login)) {
+					$login = $ldap->login;
+					dol_syslog("functions_ldap::check_user_password_ldap login is now $login (LDAP_FIELD_LOGIN=".$conf->global->LDAP_FIELD_LOGIN.")");
+				}
 
 				require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
@@ -207,7 +210,7 @@ function check_user_password_ldap($usertotest, $passwordtotest, $entitytotest)
 					}
 
 					$usertmp = new User($db);
-					$resultFetchUser = $usertmp->fetch('', $login, $sid);
+					$resultFetchUser = $usertmp->fetch('', $login, $sid, 1, ($entitytotest > 0 ? $entitytotest : -1));
 					if ($resultFetchUser > 0) {
 						dol_syslog("functions_ldap::check_user_password_ldap Sync user found user id=".$usertmp->id);
 						// On verifie si le login a change et on met a jour les attributs dolibarr
@@ -215,7 +218,7 @@ function check_user_password_ldap($usertotest, $passwordtotest, $entitytotest)
 						if ($usertmp->login != $ldap->login && $ldap->login) {
 							$usertmp->login = $ldap->login;
 							$usertmp->update($usertmp);
-							// TODO Que faire si update echoue car on update avec un login deja existant.
+							// TODO Que faire si update echoue car on update avec un login deja existant pour un autre compte.
 						}
 
 						//$resultUpdate = $usertmp->update_ldap2dolibarr($ldap);
@@ -231,7 +234,7 @@ function check_user_password_ldap($usertotest, $passwordtotest, $entitytotest)
 					$usertmp->fetch('', $login);
 					$ret = $mc->checkRight($usertmp->id, $entitytotest);
 					if ($ret < 0) {
-						dol_syslog("functions_ldap::check_user_password_ldap Authentication KO entity '".$entitytotest."' not allowed for user '".$usertmp->id."'", LOG_NOTICE);
+						dol_syslog("functions_ldap::check_user_password_ldap Authentication KO entity '".$entitytotest."' not allowed for user id '".$usertmp->id."'", LOG_NOTICE);
 						$login = ''; // force authentication failure
 					}
 					unset($usertmp);

From 2eddc02deb6f2eb7f353606f15bb75637a127076 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 5 Jul 2021 11:59:30 +0200
Subject: [PATCH 1003/1497] Fix selection of Autofill description

---
 htdocs/product/admin/product.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php
index b23cfbc5c4c..867876f4631 100644
--- a/htdocs/product/admin/product.php
+++ b/htdocs/product/admin/product.php
@@ -624,9 +624,10 @@ if (empty($conf->global->PRODUIT_USE_SEARCH_TO_SELECT)) {
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("OnProductSelectAddProductDesc").'</td>';
 print '<td class="right">';
+print '<!-- PRODUIT_AUTOFILL_DESC -->';
 print $form->selectarray(
 	"activate_FillProductDescAuto",
-	array(1=>'AutoFillFormFieldBeforeSubmit', 0=>'DoNotAutofillButAutoConcat', -1=>'DoNotUseDescriptionOfProdut'),
+	array(0=>'DoNotAutofillButAutoConcat', 1=>'AutoFillFormFieldBeforeSubmit', 2=>'DoNotUseDescriptionOfProdut'),
 	empty($conf->global->PRODUIT_AUTOFILL_DESC) ? 0 : $conf->global->PRODUIT_AUTOFILL_DESC,
 	0,
 	0,

From d43e043b48bf531737f2d2dca7c7ed0f2669cb46 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 5 Jul 2021 12:49:10 +0200
Subject: [PATCH 1004/1497] Fix regression when adding a product with
 multicompany

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

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index fdc50d5fe87..0ac8cba1391 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -2236,7 +2236,7 @@ class Product extends CommonObject
 		// Check parameters
 		if (!$id && !$ref && !$ref_ext && !$barcode) {
 			$this->error = 'ErrorWrongParameters';
-			dol_syslog(get_class($this)."::fetch ".$this->error);
+			dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
 			return -1;
 		}
 
@@ -2286,7 +2286,7 @@ class Product extends CommonObject
 			$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity);
 		}
 		if ($separatedStock) {
-			$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_stock as sp ON sp.fk_product = p.rowid";
+			$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_stock as sp ON sp.fk_product = p.rowid AND sp.fk_entrepot IN (SELECT rowid FROM ".MAIN_DB_PREFIX."entrepot WHERE entity IN (".$this->db->sanitize($visibleWarehousesEntities)."))";
 		}
 		if ($id) {
 			$sql .= " WHERE p.rowid = ".((int) $id);
@@ -2300,9 +2300,6 @@ class Product extends CommonObject
 				$sql .= " AND p.barcode = '".$this->db->escape($barcode)."'";
 			}
 		}
-		if ($separatedStock) {
-			$sql .= " AND sp.fk_entrepot IN (SELECT rowid FROM ".MAIN_DB_PREFIX."entrepot WHERE entity IN (".$this->db->sanitize($visibleWarehousesEntities)."))";
-		}
 		if ($separatedStock) {
 			$sql .= " GROUP BY p.rowid, p.ref, p.ref_ext, p.label, p.description, p.url, p.note_public, p.note, p.customcode, p.fk_country, p.fk_state, p.lifetime, p.qc_frequency, p.price, p.price_ttc,";
 			$sql .= " p.price_min, p.price_min_ttc, p.price_base_type, p.cost_price, p.default_vat_code, p.tva_tx, p.recuperableonly, p.localtax1_tx, p.localtax2_tx, p.localtax1_type, p.localtax2_type, p.tosell,";

From 5d824899e55ce02f54739242dec306e25c96f3f9 Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Mon, 5 Jul 2021 13:44:05 +0200
Subject: [PATCH 1005/1497] Fix php 8 warning on home page

---
 htdocs/main.inc.php                                        | 6 +++---
 htdocs/projet/class/project.class.php                      | 2 +-
 htdocs/projet/class/task.class.php                         | 2 +-
 htdocs/supplier_proposal/class/supplier_proposal.class.php | 6 +++---
 htdocs/user/class/user.class.php                           | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index bd0d77d3389..e9f5b16b6a9 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -509,7 +509,7 @@ if ((!defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck) && !empty($conf->gl
 		//print 'Unset POST by CSRF protection in main.inc.php.';	// Do not output anything because this create problems when using the BACK button on browsers.
 		setEventMessages('SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry', null, 'warnings');
 		//if ($conf->global->MAIN_FEATURES_LEVEL >= 1) setEventMessages('Unset POST and GET params by CSRF protection in main.inc.php (Token provided was not generated by the previous page).'."<br>\n".'$_SERVER[REQUEST_URI] = '.$_SERVER['REQUEST_URI'].' $_SERVER[REQUEST_METHOD] = '.$_SERVER['REQUEST_METHOD'].' GETPOST(token) = '.GETPOST('token', 'alpha').' $_SESSION[token] = '.$_SESSION['token'], null, 'warnings');
-		$savid = ((int) $_POST['id']);
+		if (isset($_POST['id'])) $savid = ((int) $_POST['id']);
 		unset($_POST);
 		//unset($_POST['action']); unset($_POST['massaction']);
 		//unset($_POST['confirm']); unset($_POST['confirmmassaction']);
@@ -517,7 +517,7 @@ if ((!defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck) && !empty($conf->gl
 		unset($_GET['action']);
 		unset($_GET['confirmmassaction']);
 		unset($_GET['massaction']);
-		$_POST['id'] = ((int) $savid);
+		if (isset($savid)) $_POST['id'] = ((int) $savid);
 	}
 
 	// Note: There is another CSRF protection into the filefunc.inc.php
@@ -3146,7 +3146,7 @@ if (!function_exists("llxFooter")) {
 		}
 
 		// Wrapper to add log when clicking on download or preview
-		if (!empty($conf->blockedlog->enabled) && is_object($object) && $object->id > 0 && $object->statut > 0) {
+		if (!empty($conf->blockedlog->enabled) && is_object($object) && !empty($object->id) && $object->id > 0 && $object->statut > 0) {
 			if (in_array($object->element, array('facture'))) {       // Restrict for the moment to element 'facture'
 				print "\n<!-- JS CODE TO ENABLE log when making a download or a preview of a document -->\n";
 				?>
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index ce2db90fa5d..a570e8ed7bb 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -2050,7 +2050,7 @@ class Project extends CommonObject
 				$response->nbtodo++;
 
 				$project_static->statut = $obj->status;
-				$project_static->opp_status = $obj->opp_status;
+				$project_static->opp_status = $obj->fk_opp_status;
 				$project_static->datee = $this->db->jdate($obj->datee);
 
 				if ($project_static->hasDelay()) {
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index bd25398776e..5e17c92c562 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -2118,7 +2118,7 @@ class Task extends CommonObject
 
 		$now = dol_now();
 
-		$datetouse = ($this->date_end > 0) ? $this->date_end : ($this->datee > 0 ? $this->datee : 0);
+		$datetouse = ($this->date_end > 0) ? $this->date_end : ((isset($this->datee) && $this->datee > 0) ? $this->datee : 0);
 
 		return ($datetouse > 0 && ($datetouse < ($now - $conf->projet->task->warning_delay)));
 	}
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index eb003cdab9e..6d43222bcf2 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -2216,7 +2216,7 @@ class SupplierProposal extends CommonObject
 		$this->nbtodo = $this->nbtodolate = 0;
 		$clause = " WHERE";
 
-		$sql = "SELECT p.rowid, p.ref, p.datec as datec";
+		$sql = "SELECT p.rowid, p.ref, p.datec as datec, p.date_cloture as datefin";
 		$sql .= " FROM ".MAIN_DB_PREFIX."supplier_proposal as p";
 		if (!$user->rights->societe->client->voir && !$user->socid) {
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON p.fk_soc = sc.fk_soc";
@@ -2239,13 +2239,13 @@ class SupplierProposal extends CommonObject
 			$label = $labelShort = '';
 			$status = '';
 			if ($mode == 'opened') {
-				$delay_warning = $conf->supplier_proposal->cloture->warning_delay;
+				$delay_warning = !empty($conf->supplier_proposal->cloture->warning_delay) ? $conf->supplier_proposal->cloture->warning_delay : 0;
 				$status = self::STATUS_VALIDATED;
 				$label = $langs->trans("SupplierProposalsToClose");
 				$labelShort = $langs->trans("ToAcceptRefuse");
 			}
 			if ($mode == 'signed') {
-				$delay_warning = $conf->supplier_proposal->facturation->warning_delay;
+				$delay_warning = !empty($conf->supplier_proposal->facturation->warning_delay) ? $conf->supplier_proposal->facturation->warning_delay : 0;
 				$status = self::STATUS_SIGNED;
 				$label = $langs->trans("SupplierProposalsToProcess"); // May be billed or ordered
 				$labelShort = $langs->trans("ToClose");
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 37ce6544cd0..acfe581b3c9 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -3298,7 +3298,7 @@ class User extends CommonObject
 		$i = 0; $cursor_user = $id_user;
 
 		$useridfound = array($id_user);
-		while (!empty($this->parentof[$cursor_user])) {
+		while (!empty($this->parentof[$cursor_user]) && !empty($this->users[$this->parentof[$cursor_user]])) {
 			if (in_array($this->parentof[$cursor_user], $useridfound)) {
 				dol_syslog("The hierarchy of user has a recursive loop", LOG_WARNING);
 				return -1; // Should not happen. Protection against looping hierarchy

From 383c6782001f79c7c6950abcbc32aee5d656de09 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 5 Jul 2021 14:09:01 +0200
Subject: [PATCH 1006/1497] Trans

---
 htdocs/langs/en_US/admin.lang    |  1 +
 htdocs/product/admin/product.php | 54 +++++++++++++++++++++-----------
 2 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 2a726e9eefe..0e357e27577 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -53,6 +53,7 @@ InternalUser=Internal user
 ExternalUser=External user
 InternalUsers=Internal users
 ExternalUsers=External users
+UserInterface=User interface
 GUISetup=Display
 SetupArea=Setup
 UploadNewTemplate=Upload new template(s)
diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php
index 867876f4631..5a83c685e0f 100644
--- a/htdocs/product/admin/product.php
+++ b/htdocs/product/admin/product.php
@@ -507,14 +507,16 @@ print "<br>";
 
 print "<br>";
 
-print load_fiche_titre($langs->trans("ProductOtherConf"), '', '');
-
 
 print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="other">';
 print '<input type="hidden" name="page_y" value="">';
 
+
+print load_fiche_titre($langs->trans("ProductOtherConf"), '', '');
+
+
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Parameters").'</td>'."\n";
@@ -592,6 +594,38 @@ print $form->selectPriceBaseType($conf->global->PRODUCT_PRICE_BASE_TYPE, "price_
 print '</td>';
 print '</tr>';
 
+if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) {
+	print '<tr class="oddeven">';
+	print '<td>'.$langs->trans("UseProductFournDesc").'</td>';
+	print '<td class="right">';
+	print $form->selectyesno("activate_useProdFournDesc", (!empty($conf->global->PRODUIT_FOURN_TEXTS) ? $conf->global->PRODUIT_FOURN_TEXTS : 0), 1);
+	print '</td>';
+	print '</tr>';
+
+	print '<tr class="oddeven">';
+	print '<td>'.$langs->trans("UseProductSupplierPackaging").'</td>';
+	print '<td align="right">';
+	print $form->selectyesno("activate_useProdSupplierPackaging", (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING) ? $conf->global->PRODUCT_USE_SUPPLIER_PACKAGING : 0), 1);
+	print '</td>';
+	print '</tr>';
+}
+
+print '</table>';
+
+print '<div class="center">';
+print '<input type="submit" class="button reposition" value="'.$langs->trans("Modify").'">';
+print '</div>';
+
+
+print load_fiche_titre($langs->trans("UserInterface"), '', '');
+
+
+print '<table class="noborder centpercent">';
+print '<tr class="liste_titre">';
+print '<td>'.$langs->trans("Parameters").'</td>'."\n";
+print '<td class="right" width="60">'.$langs->trans("Value").'</td>'."\n";
+print '</tr>'."\n";
+
 // Use Ajax form to select a product
 
 print '<tr class="oddeven">';
@@ -683,22 +717,6 @@ if (!empty($conf->global->MAIN_MULTILANGS)) {
 	print '</tr>';
 }
 
-if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) {
-	print '<tr class="oddeven">';
-	print '<td>'.$langs->trans("UseProductFournDesc").'</td>';
-	print '<td class="right">';
-	print $form->selectyesno("activate_useProdFournDesc", (!empty($conf->global->PRODUIT_FOURN_TEXTS) ? $conf->global->PRODUIT_FOURN_TEXTS : 0), 1);
-	print '</td>';
-	print '</tr>';
-
-	print '<tr class="oddeven">';
-	print '<td>'.$langs->trans("UseProductSupplierPackaging").'</td>';
-	print '<td align="right">';
-	print $form->selectyesno("activate_useProdSupplierPackaging", (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING) ? $conf->global->PRODUCT_USE_SUPPLIER_PACKAGING : 0), 1);
-	print '</td>';
-	print '</tr>';
-}
-
 
 if (!empty($conf->global->PRODUCT_CANVAS_ABILITY)) {
 	// Add canvas feature

From 87241c94a3e589589c7250a9701c2d2cb29744d0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 5 Jul 2021 14:41:40 +0200
Subject: [PATCH 1007/1497] Code comment

---
 htdocs/install/mysql/tables/llx_actioncomm.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/tables/llx_actioncomm.sql b/htdocs/install/mysql/tables/llx_actioncomm.sql
index 9012f6b3a66..2f3f7660698 100644
--- a/htdocs/install/mysql/tables/llx_actioncomm.sql
+++ b/htdocs/install/mysql/tables/llx_actioncomm.sql
@@ -55,7 +55,7 @@ create table llx_actioncomm
   durationp			real,							-- planed duration
 
   label				varchar(255) NOT NULL,			-- label/title of event or topic of email
-  note				text,							-- note of event or content of email
+  note				text,							-- private note of event or content of email
   
   calling_duration  integer,                        -- when event is a phone call, duration of phone call
   

From df5878b3d63713694e273a61a4195a07cbcb97ba Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Mon, 5 Jul 2021 14:45:00 +0200
Subject: [PATCH 1008/1497] Fix php 8 warning in inventory module

---
 htdocs/product/inventory/card.php      | 15 +++++++--------
 htdocs/product/inventory/inventory.php |  4 ++--
 htdocs/product/inventory/list.php      | 13 ++++++++-----
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/htdocs/product/inventory/card.php b/htdocs/product/inventory/card.php
index 5ec359e5d8a..754c2b64155 100644
--- a/htdocs/product/inventory/card.php
+++ b/htdocs/product/inventory/card.php
@@ -49,7 +49,10 @@ if (empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
 // Initialize technical objects
 $object = new Inventory($db);
 $extrafields = new ExtraFields($db);
-$diroutputmassaction = $conf->stock->dir_output.'/temp/massgeneration/'.$user->id;
+// no inventory docs yet
+$includedocgeneration = false;
+$diroutputmassaction = null;
+// $diroutputmassaction = $conf->stock->dir_output.'/temp/massgeneration/'.$user->id;
 $hookmanager->initHooks(array('inventorycard', 'globalcard')); // Note that conf->hooks_modules contains array
 
 // Fetch optionals attributes and labels
@@ -180,7 +183,7 @@ if ($action == 'create') {
 	if ($backtopage) {
 		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 	}
-	if ($backtopageforcancel) {
+	if (isset($backtopageforcancel)) {
 		print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
 	}
 
@@ -261,10 +264,6 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	if ($action == 'delete') {
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteInventory'), $langs->trans('ConfirmDeleteObject'), 'confirm_delete', '', 0, 1);
 	}
-	// Confirmation to delete line
-	if ($action == 'deleteline') {
-		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_deleteline', '', 0, 1);
-	}
 
 	// Clone confirmation
 	if ($action == 'clone') {
@@ -290,7 +289,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	}
 
 	// Call Hook formConfirm
-	$parameters = array('formConfirm' => $formconfirm, 'lineid' => $lineid);
+	$parameters = array('formConfirm' => $formconfirm);
 	$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 	if (empty($reshook)) {
 		$formconfirm .= $hookmanager->resPrint;
@@ -469,7 +468,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		// List of actions on element
 		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
 		$formactions = new FormActions($db);
-		$somethingshown = $formactions->showactions($object, 'inventory', $socid, 1, '', $MAXEVENT, '', $morehtmlright);
+		$somethingshown = $formactions->showactions($object, 'inventory', 0, 1, '', $MAXEVENT, '', $morehtmlright);
 
 		print '</div></div></div>';
 	}
diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php
index 89394e56e29..85cd0932f46 100644
--- a/htdocs/product/inventory/inventory.php
+++ b/htdocs/product/inventory/inventory.php
@@ -616,7 +616,7 @@ if ($object->id > 0) {
 		while ($i < $num) {
 			$obj = $db->fetch_object($resql);
 
-			if (is_object($cacheOfWarehouses[$obj->fk_warehouse])) {
+			if (isset($cacheOfWarehouses[$obj->fk_warehouse])) {
 				$warehouse_static = $cacheOfWarehouses[$obj->fk_warehouse];
 			} else {
 				$warehouse_static = new Entrepot($db);
@@ -625,7 +625,7 @@ if ($object->id > 0) {
 				$cacheOfWarehouses[$warehouse_static->id] = $warehouse_static;
 			}
 
-			if (is_object($cacheOfProducts[$obj->fk_product])) {
+			if (isset($cacheOfProducts[$obj->fk_product])) {
 				$product_static = $cacheOfProducts[$obj->fk_product];
 			} else {
 				$product_static = new Product($db);
diff --git a/htdocs/product/inventory/list.php b/htdocs/product/inventory/list.php
index 7d792c82ec1..e9c162a0bcf 100644
--- a/htdocs/product/inventory/list.php
+++ b/htdocs/product/inventory/list.php
@@ -59,7 +59,9 @@ $pagenext = $page + 1;
 // Initialize technical objects
 $object = new Inventory($db);
 $extrafields = new ExtraFields($db);
-$diroutputmassaction = $conf->inventory->dir_output.'/temp/massgeneration/'.$user->id;
+// no inventory docs yet
+// $diroutputmassaction = $conf->inventory->dir_output.'/temp/massgeneration/'.$user->id;
+$diroutputmassaction = null;
 $hookmanager->initHooks(array('inventorylist')); // Note that conf->hooks_modules contains array
 // Fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);
@@ -127,9 +129,9 @@ if ($user->socid > 0) {	// Protection if external user
 	accessforbidden();
 }
 if (empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
-	$result = restrictedArea($user, 'stock', $objectid);
+	$result = restrictedArea($user, 'stock');
 } else {
-	$result = restrictedArea($user, 'stock', $objectid, '', 'inventory_advance');
+	$result = restrictedArea($user, 'stock', 0, '', 'inventory_advance');
 }
 
 
@@ -624,7 +626,8 @@ print '</table>'."\n";
 print '</div>'."\n";
 
 print '</form>'."\n";
-
+// no inventory docs yet
+/*
 if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
 	$hidegeneratedfilelistifempty = 1;
 	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
@@ -644,7 +647,7 @@ if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $n
 
 	print $formfile->showdocuments('massfilesarea_mymodule', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
 }
-
+*/
 // End of page
 llxFooter();
 $db->close();

From 1333ca366066aae4432bdbe606df4cefdca6c76e Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Mon, 5 Jul 2021 14:51:34 +0200
Subject: [PATCH 1009/1497] Fix php 8 warning on not set field keys

---
 htdocs/bom/bom_list.php                                     | 2 +-
 htdocs/compta/cashcontrol/cashcontrol_list.php              | 2 +-
 htdocs/core/tpl/commonfields_add.tpl.php                    | 2 +-
 htdocs/core/tpl/commonfields_edit.tpl.php                   | 2 +-
 htdocs/eventorganization/conferenceorbooth_list.php         | 2 +-
 htdocs/eventorganization/conferenceorboothattendee_list.php | 2 +-
 htdocs/knowledgemanagement/knowledgerecord_list.php         | 2 +-
 htdocs/modulebuilder/template/myobject_list.php             | 2 +-
 htdocs/mrp/mo_list.php                                      | 2 +-
 htdocs/partnership/partnership_list.php                     | 2 +-
 htdocs/product/inventory/list.php                           | 2 +-
 htdocs/product/stock/list.php                               | 2 +-
 htdocs/projet/list.php                                      | 2 +-
 htdocs/salaries/list.php                                    | 2 +-
 htdocs/salaries/payments.php                                | 2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/htdocs/bom/bom_list.php b/htdocs/bom/bom_list.php
index 6b54e8a4044..c51603147c8 100644
--- a/htdocs/bom/bom_list.php
+++ b/htdocs/bom/bom_list.php
@@ -108,7 +108,7 @@ foreach ($object->fields as $key => $val) {
 			'checked'=>(($visible < 0) ? 0 : 1),
 			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
 			'position'=>$val['position'],
-			'help'=>$val['help']
+			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
 	}
 }
diff --git a/htdocs/compta/cashcontrol/cashcontrol_list.php b/htdocs/compta/cashcontrol/cashcontrol_list.php
index ec7af37940c..42e53085ea8 100644
--- a/htdocs/compta/cashcontrol/cashcontrol_list.php
+++ b/htdocs/compta/cashcontrol/cashcontrol_list.php
@@ -131,7 +131,7 @@ foreach ($object->fields as $key => $val) {
 			'checked'=>(($visible < 0) ? 0 : 1),
 			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
 			'position'=>$val['position'],
-			'help'=>$val['help']
+			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
 	}
 }
diff --git a/htdocs/core/tpl/commonfields_add.tpl.php b/htdocs/core/tpl/commonfields_add.tpl.php
index d1d378e7e60..cd07c0b8191 100644
--- a/htdocs/core/tpl/commonfields_add.tpl.php
+++ b/htdocs/core/tpl/commonfields_add.tpl.php
@@ -47,7 +47,7 @@ foreach ($object->fields as $key => $val) {
 	print '<tr class="field_'.$key.'">';
 	print '<td';
 	print ' class="titlefieldcreate';
-	if ($val['notnull'] > 0) {
+	if (isset($val['notnull']) && $val['notnull'] > 0) {
 		print ' fieldrequired';
 	}
 	if ($val['type'] == 'text' || $val['type'] == 'html') {
diff --git a/htdocs/core/tpl/commonfields_edit.tpl.php b/htdocs/core/tpl/commonfields_edit.tpl.php
index bc74421e808..9670271d1a4 100644
--- a/htdocs/core/tpl/commonfields_edit.tpl.php
+++ b/htdocs/core/tpl/commonfields_edit.tpl.php
@@ -48,7 +48,7 @@ foreach ($object->fields as $key => $val) {
 
 	print '<tr class="field_'.$key.'"><td';
 	print ' class="titlefieldcreate';
-	if ($val['notnull'] > 0) {
+	if (isset($val['notnull']) && $val['notnull'] > 0) {
 		print ' fieldrequired';
 	}
 	if (preg_match('/^(text|html)/', $val['type'])) {
diff --git a/htdocs/eventorganization/conferenceorbooth_list.php b/htdocs/eventorganization/conferenceorbooth_list.php
index d7f7cdb8bb1..0b1221006a8 100644
--- a/htdocs/eventorganization/conferenceorbooth_list.php
+++ b/htdocs/eventorganization/conferenceorbooth_list.php
@@ -119,7 +119,7 @@ foreach ($object->fields as $key => $val) {
 			'checked'=>(($visible < 0) ? 0 : 1),
 			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
 			'position'=>$val['position'],
-			'help'=>$val['help']
+			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
 	}
 }
diff --git a/htdocs/eventorganization/conferenceorboothattendee_list.php b/htdocs/eventorganization/conferenceorboothattendee_list.php
index 97748640f17..658640d5834 100644
--- a/htdocs/eventorganization/conferenceorboothattendee_list.php
+++ b/htdocs/eventorganization/conferenceorboothattendee_list.php
@@ -128,7 +128,7 @@ foreach ($object->fields as $key => $val) {
 			'checked'=>(($visible < 0) ? 0 : 1),
 			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
 			'position'=>$val['position'],
-			'help'=>$val['help']
+			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
 	}
 }
diff --git a/htdocs/knowledgemanagement/knowledgerecord_list.php b/htdocs/knowledgemanagement/knowledgerecord_list.php
index efaf99b63a9..1fc21143fdc 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_list.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_list.php
@@ -115,7 +115,7 @@ foreach ($object->fields as $key => $val) {
 			'checked'=>(($visible < 0) ? 0 : 1),
 			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
 			'position'=>$val['position'],
-			'help'=>$val['help']
+			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
 	}
 }
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 0081ec28551..4633a69e6dd 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -165,7 +165,7 @@ foreach ($object->fields as $key => $val) {
 			'checked'=>(($visible < 0) ? 0 : 1),
 			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
 			'position'=>$val['position'],
-			'help'=>$val['help']
+			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
 	}
 }
diff --git a/htdocs/mrp/mo_list.php b/htdocs/mrp/mo_list.php
index 91821d38ee2..da2e2c599e0 100644
--- a/htdocs/mrp/mo_list.php
+++ b/htdocs/mrp/mo_list.php
@@ -115,7 +115,7 @@ foreach ($object->fields as $key => $val) {
 			'checked'=>(($visible < 0) ? 0 : 1),
 			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
 			'position'=>$val['position'],
-			'help'=>$val['help']
+			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
 	}
 }
diff --git a/htdocs/partnership/partnership_list.php b/htdocs/partnership/partnership_list.php
index 49d46c652fd..f5b72dca2d2 100644
--- a/htdocs/partnership/partnership_list.php
+++ b/htdocs/partnership/partnership_list.php
@@ -126,7 +126,7 @@ foreach ($object->fields as $key => $val) {
 			'checked'=>(($visible < 0) ? 0 : 1),
 			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
 			'position'=>$val['position'],
-			'help'=>$val['help']
+			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
 	}
 }
diff --git a/htdocs/product/inventory/list.php b/htdocs/product/inventory/list.php
index e9c162a0bcf..bc2ebdf20b4 100644
--- a/htdocs/product/inventory/list.php
+++ b/htdocs/product/inventory/list.php
@@ -108,7 +108,7 @@ foreach ($object->fields as $key => $val) {
 			'checked'=>(($visible < 0) ? 0 : 1),
 			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
 			'position'=>$val['position'],
-			'help'=>$val['help']
+			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
 	}
 }
diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index 79f74343fb2..b8f998c0ec0 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -123,7 +123,7 @@ foreach ($object->fields as $key => $val) {
 			'checked'=>(($visible < 0) ? 0 : 1),
 			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
 			'position'=>$val['position'],
-			'help'=>$val['help']
+			'help'=> isset($val['help']) ? $val['help'] : 'help'
 		);
 	}
 }
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 39a47e969a8..6d7ec7d351e 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -167,7 +167,7 @@ foreach ($object->fields as $key => $val) {
 			'checked'=>(($visible < 0) ? 0 : 1),
 			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
 			'position'=>$val['position'],
-			'help'=>$val['help']
+			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
 	}
 }
diff --git a/htdocs/salaries/list.php b/htdocs/salaries/list.php
index 690f8df4c8c..7a8b3ebca10 100644
--- a/htdocs/salaries/list.php
+++ b/htdocs/salaries/list.php
@@ -140,7 +140,7 @@ foreach ($object->fields as $key => $val) {
 			'checked'=>(($visible < 0) ? 0 : 1),
 			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
 			'position'=>$val['position'],
-			'help'=>$val['help']
+			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
 	}
 }
diff --git a/htdocs/salaries/payments.php b/htdocs/salaries/payments.php
index c2805cfbd93..f129e6304ab 100644
--- a/htdocs/salaries/payments.php
+++ b/htdocs/salaries/payments.php
@@ -135,7 +135,7 @@ foreach ($object->fields as $key => $val) {
 			'checked'=>(($visible < 0) ? 0 : 1),
 			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
 			'position'=>$val['position'],
-			'help'=>$val['help']
+			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
 	}
 }

From cb2c10551b48d927df9c6a1f89cffc1957e128b3 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Mon, 5 Jul 2021 15:17:21 +0200
Subject: [PATCH 1010/1497] on goign

---
 .../class/conferenceorbooth.class.php         |   3 +-
 htdocs/langs/en_US/eventorganization.lang     |   4 +
 .../attendee_subscription.php                 | 154 +++++++++---------
 htdocs/public/project/suggestbooth.php        |  39 ++---
 htdocs/public/project/suggestconference.php   |  35 ++--
 5 files changed, 122 insertions(+), 113 deletions(-)

diff --git a/htdocs/eventorganization/class/conferenceorbooth.class.php b/htdocs/eventorganization/class/conferenceorbooth.class.php
index ae35f3eb892..10ed5668c63 100644
--- a/htdocs/eventorganization/class/conferenceorbooth.class.php
+++ b/htdocs/eventorganization/class/conferenceorbooth.class.php
@@ -108,7 +108,7 @@ class ConferenceOrBooth extends ActionComm
 		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>'1', 'position'=>30, 'notnull'=>0, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth300', 'help'=>"Help text", 'showoncombobox'=>'1',),
 		'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'ThirdParty', 'enabled'=>'1', 'position'=>50, 'notnull'=>-1, 'visible'=>1, 'index'=>1, 'help'=>"LinkToThirparty",),
 		'fk_project' => array('type'=>'integer:Project:projet/class/project.class.php:1::eventorganization', 'label'=>'Project', 'enabled'=>'1', 'position'=>52, 'notnull'=>-1, 'visible'=>-1, 'index'=>1,),
-		'note' => array('type'=>'text', 'label'=>'Description', 'enabled'=>'1', 'position'=>60, 'notnull'=>0, 'visible'=>1,),
+		'note' => array('type'=>'text', 'label'=>'Description', 'enabled'=>'1', 'position'=>60, 'notnull'=>0, 'visible'=>1, 'csslist'=>'small'),
 		'fk_action' => array('type'=>'sellist:c_actioncomm:libelle:id::module LIKE (\'%@eventorganization\')', 'label'=>'Format', 'enabled'=>'1', 'position'=>60, 'notnull'=>1, 'visible'=>1,),
 		'datep' => array('type'=>'datetime', 'label'=>'DateStart', 'enabled'=>'1', 'position'=>70, 'notnull'=>0, 'visible'=>1, 'showoncombobox'=>'2',),
 		'datep2' => array('type'=>'datetime', 'label'=>'DateEnd', 'enabled'=>'1', 'position'=>71, 'notnull'=>0, 'visible'=>1, 'showoncombobox'=>'3',),
@@ -118,6 +118,7 @@ class ConferenceOrBooth extends ActionComm
 		'fk_user_mod' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>'1', 'position'=>511, 'notnull'=>-1, 'visible'=>-2,),
 		'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>'1', 'position'=>1000, 'notnull'=>-1, 'visible'=>-2,),
 		'status' => array('type'=>'smallint', 'label'=>'Status', 'enabled'=>'1', 'position'=>1000, 'notnull'=>1, 'visible'=>1, 'default'=>'0', 'index'=>1, 'arrayofkeyval'=>array('0'=>'EvntOrgDraft', '1'=>'EvntOrgSuggested', '2'=> 'EvntOrgConfirmed', '3' =>'EvntOrgNotQualified', '4' =>'EvntOrgDone', '9'=>'EvntOrgCancelled'),),
+		'num_vote' => array('type'=>'smallint', 'label'=>'NbVotes', 'enabled'=>'1', 'position'=>1001, 'notnull'=>-1, 'visible'=>5, 'default'=>'0', 'index'=>0),
 	);
 	public $rowid;
 	public $id;
diff --git a/htdocs/langs/en_US/eventorganization.lang b/htdocs/langs/en_US/eventorganization.lang
index 335c257b224..f361e6bc192 100644
--- a/htdocs/langs/en_US/eventorganization.lang
+++ b/htdocs/langs/en_US/eventorganization.lang
@@ -86,6 +86,7 @@ DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
 SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
 SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
+NbVotes=Number of votes
 #
 # Status
 #
@@ -115,6 +116,9 @@ EvntOrgDuration = This conference starts on %s and ends on %s.
 ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
 BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
 EventType = Event type
+LabelOfBooth=Booth label
+LabelOfconference=Conference label
+ConferenceIsNotConfirmed=Subcription not available, conference is not confirmed yet
 
 #
 # Vote page
diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index 19bb2007bda..afdfdb9f806 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -205,7 +205,7 @@ if ($reshook < 0) {
 }
 
 // Action called when page is submitted
-if (empty($reshook) && $action == 'add') {
+if (empty($reshook) && $action == 'add' && $conference->status==2) {
 	$error = 0;
 
 	$urlback = '';
@@ -473,25 +473,27 @@ print $langs->trans("EvntOrgWelcomeMessage", $conference->label);
 print '<br>';
 print $langs->trans("EvntOrgDuration", dol_print_date($conference->datep), dol_print_date($conference->datef));
 print '</div>';
-
 dol_htmloutput_errors($errmsg);
 
-// Print form
-print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST" name="newmember">'."\n";
-print '<input type="hidden" name="token" value="'.newToken().'" / >';
-print '<input type="hidden" name="entity" value="'.$entity.'" />';
-print '<input type="hidden" name="action" value="add" />';
-print '<input type="hidden" name="id" value="'.$id.'" />';
-print '<input type="hidden" name="securekey" value="'.$securekeyreceived.'" />';
+if ($conference->status!=2) {
+	print $langs->trans("ConferenceIsNotConfirmed");
+} else {
+	// Print form
+	print '<form action="' . $_SERVER["PHP_SELF"] . '" method="POST" name="newmember">' . "\n";
+	print '<input type="hidden" name="token" value="' . newToken() . '" / >';
+	print '<input type="hidden" name="entity" value="' . $entity . '" />';
+	print '<input type="hidden" name="action" value="add" />';
+	print '<input type="hidden" name="id" value="' . $id . '" />';
+	print '<input type="hidden" name="securekey" value="' . $securekeyreceived . '" />';
 
-print '<br>';
+	print '<br>';
 
-print '<br><span class="opacitymedium">'.$langs->trans("FieldsWithAreMandatory", '*').'</span><br>';
-//print $langs->trans("FieldsWithIsForPublic",'**').'<br>';
+	print '<br><span class="opacitymedium">' . $langs->trans("FieldsWithAreMandatory", '*') . '</span><br>';
+	//print $langs->trans("FieldsWithIsForPublic",'**').'<br>';
 
-print dol_get_fiche_head('');
+	print dol_get_fiche_head('');
 
-print '<script type="text/javascript">
+	print '<script type="text/javascript">
 jQuery(document).ready(function () {
     jQuery(document).ready(function () {
         jQuery("#selectcountry_id").change(function() {
@@ -502,74 +504,74 @@ jQuery(document).ready(function () {
 });
 </script>';
 
-print '<table class="border" summary="form to subscribe" id="tablesubscribe">'."\n";
+	print '<table class="border" summary="form to subscribe" id="tablesubscribe">' . "\n";
 
-// Email
-print '<tr><td>'.$langs->trans("Email").'<FONT COLOR="red">*</FONT></td><td><input type="text" name="email" maxlength="255" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('email')).'"></td></tr>'."\n";
-// Company
-print '<tr id="trcompany" class="trcompany"><td>'.$langs->trans("Company");
-if (!empty(floatval($project->price_registration))) {
-	print '<FONT COLOR="red">*</FONT>';
-}
-print ' </td><td><input type="text" name="societe" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('societe')).'"></td></tr>'."\n";
-// Address
-print '<tr><td>'.$langs->trans("Address").'</td><td>'."\n";
-print '<textarea name="address" id="address" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.dol_escape_htmltag(GETPOST('address', 'restricthtml'), 0, 1).'</textarea></td></tr>'."\n";
-// Zip / Town
-print '<tr><td>'.$langs->trans('Zip').' / '.$langs->trans('Town').'</td><td>';
-print $formcompany->select_ziptown(GETPOST('zipcode'), 'zipcode', array('town', 'selectcountry_id', 'state_id'), 6, 1);
-print ' / ';
-print $formcompany->select_ziptown(GETPOST('town'), 'town', array('zipcode', 'selectcountry_id', 'state_id'), 0, 1);
-print '</td></tr>';
-// Country
-print '<tr><td>'.$langs->trans('Country').'<FONT COLOR="red">*</FONT></td><td>';
-$country_id = GETPOST('country_id');
-if (!$country_id && !empty($conf->global->MEMBER_NEWFORM_FORCECOUNTRYCODE)) {
-	$country_id = getCountry($conf->global->MEMBER_NEWFORM_FORCECOUNTRYCODE, 2, $db, $langs);
-}
-if (!$country_id && !empty($conf->geoipmaxmind->enabled)) {
-	$country_code = dol_user_country();
-	//print $country_code;
-	if ($country_code) {
-		$new_country_id = getCountry($country_code, 3, $db, $langs);
-		//print 'xxx'.$country_code.' - '.$new_country_id;
-		if ($new_country_id) {
-			$country_id = $new_country_id;
+	// Email
+	print '<tr><td>' . $langs->trans("Email") . '<FONT COLOR="red">*</FONT></td><td><input type="text" name="email" maxlength="255" class="minwidth150" value="' . dol_escape_htmltag(GETPOST('email')) . '"></td></tr>' . "\n";
+	// Company
+	print '<tr id="trcompany" class="trcompany"><td>' . $langs->trans("Company");
+	if (!empty(floatval($project->price_registration))) {
+		print '<FONT COLOR="red">*</FONT>';
+	}
+	print ' </td><td><input type="text" name="societe" class="minwidth150" value="' . dol_escape_htmltag(GETPOST('societe')) . '"></td></tr>' . "\n";
+	// Address
+	print '<tr><td>' . $langs->trans("Address") . '</td><td>' . "\n";
+	print '<textarea name="address" id="address" wrap="soft" class="quatrevingtpercent" rows="' . ROWS_3 . '">' . dol_escape_htmltag(GETPOST('address', 'restricthtml'), 0, 1) . '</textarea></td></tr>' . "\n";
+	// Zip / Town
+	print '<tr><td>' . $langs->trans('Zip') . ' / ' . $langs->trans('Town') . '</td><td>';
+	print $formcompany->select_ziptown(GETPOST('zipcode'), 'zipcode', array('town', 'selectcountry_id', 'state_id'), 6, 1);
+	print ' / ';
+	print $formcompany->select_ziptown(GETPOST('town'), 'town', array('zipcode', 'selectcountry_id', 'state_id'), 0, 1);
+	print '</td></tr>';
+	// Country
+	print '<tr><td>' . $langs->trans('Country') . '<FONT COLOR="red">*</FONT></td><td>';
+	$country_id = GETPOST('country_id');
+	if (!$country_id && !empty($conf->global->MEMBER_NEWFORM_FORCECOUNTRYCODE)) {
+		$country_id = getCountry($conf->global->MEMBER_NEWFORM_FORCECOUNTRYCODE, 2, $db, $langs);
+	}
+	if (!$country_id && !empty($conf->geoipmaxmind->enabled)) {
+		$country_code = dol_user_country();
+		//print $country_code;
+		if ($country_code) {
+			$new_country_id = getCountry($country_code, 3, $db, $langs);
+			//print 'xxx'.$country_code.' - '.$new_country_id;
+			if ($new_country_id) {
+				$country_id = $new_country_id;
+			}
 		}
 	}
-}
-$country_code = getCountry($country_id, 2, $db, $langs);
-print $form->select_country($country_id, 'country_id');
-print '</td></tr>';
-// State
-if (empty($conf->global->SOCIETE_DISABLE_STATE)) {
-	print '<tr><td>'.$langs->trans('State').'</td><td>';
-	if ($country_code) {
-		print $formcompany->select_state(GETPOST("state_id"), $country_code);
-	} else {
-		print '';
-	}
+	$country_code = getCountry($country_id, 2, $db, $langs);
+	print $form->select_country($country_id, 'country_id');
 	print '</td></tr>';
+	// State
+	if (empty($conf->global->SOCIETE_DISABLE_STATE)) {
+		print '<tr><td>' . $langs->trans('State') . '</td><td>';
+		if ($country_code) {
+			print $formcompany->select_state(GETPOST("state_id"), $country_code);
+		} else {
+			print '';
+		}
+		print '</td></tr>';
+	}
+
+	print "</table>\n";
+
+	print dol_get_fiche_end();
+
+	// Save
+	print '<div class="center">';
+	print '<input type="submit" value="' . $langs->trans("Submit") . '" id="submitsave" class="button">';
+	if (!empty($backtopage)) {
+		print ' &nbsp; &nbsp; <input type="submit" value="' . $langs->trans("Cancel") . '" id="submitcancel" class="button button-cancel">';
+	}
+	print '</div>';
+
+
+	print "</form>\n";
+	print "<br>";
+	print '</div></div>';
 }
 
-print "</table>\n";
-
-print dol_get_fiche_end();
-
-// Save
-print '<div class="center">';
-print '<input type="submit" value="'.$langs->trans("Submit").'" id="submitsave" class="button">';
-if (!empty($backtopage)) {
-	print ' &nbsp; &nbsp; <input type="submit" value="'.$langs->trans("Cancel").'" id="submitcancel" class="button button-cancel">';
-}
-print '</div>';
-
-
-print "</form>\n";
-print "<br>";
-print '</div></div>';
-
-
 llxFooterVierge();
 
 $db->close();
diff --git a/htdocs/public/project/suggestbooth.php b/htdocs/public/project/suggestbooth.php
index 6329441778f..43a4b989687 100644
--- a/htdocs/public/project/suggestbooth.php
+++ b/htdocs/public/project/suggestbooth.php
@@ -405,6 +405,7 @@ if (empty($reshook) && $action == 'add') {
 							$facture->paye = 0;
 							$facture->date = dol_now();
 							$facture->cond_reglement_id = $contact->cond_reglement_id;
+							$facture->fk_project = $project->id;
 
 							if (empty($facture->cond_reglement_id)) {
 								$paymenttermstatic = new PaymentTerm($contact->db);
@@ -569,7 +570,7 @@ jQuery(document).ready(function () {
 print '<table class="border" summary="form to subscribe" id="tablesubscribe">'."\n";
 
 // Name
-print '<tr><td><label for="lastname">'.$langs->trans("Lastname").' / '.$langs->trans("Label").'<FONT COLOR="red">*</FONT></label></td>';
+print '<tr><td><label for="lastname">'.$langs->trans("Lastname").'<FONT COLOR="red">*</FONT></label></td>';
 print '<td colspan="3"><input name="lastname" id="lastname" type="text" class="maxwidth100onsmartphone" maxlength="80" value="'.dol_escape_htmltag(GETPOST("lastname", 'alpha') ?GETPOST("lastname", 'alpha') : $object->lastname).'" autofocus="autofocus"></td>';
 print '</tr>';
 // Email
@@ -577,21 +578,6 @@ print '<tr><td>'.$langs->trans("Email").'<FONT COLOR="red">*</FONT></td><td><inp
 // Company
 print '<tr id="trcompany" class="trcompany"><td>'.$langs->trans("Company").'<FONT COLOR="red">*</FONT>';
 print ' </td><td><input type="text" name="societe" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('societe')).'"></td></tr>'."\n";
-// Type of event
-print '<tr><td>'.$langs->trans("EventType").'<FONT COLOR="red">*</FONT></td>'."\n";
-print '<td>'.FORM::selectarray('eventtype', $arrayofeventtype, $eventtype).'</td>';
-// Label
-print '<tr><td>'.$langs->trans("Label").'<FONT COLOR="red">*</FONT></td>'."\n";
-print '</td><td><input type="text" name="label" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('label')).'"></td></tr>'."\n";
-// Note
-print '<tr><td>'.$langs->trans("Note").'<FONT COLOR="red">*</FONT></td>'."\n";
-print '<td><input type="text" name="note" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('note')).'"></td></tr>'."\n";
-// Start Date
-print '<tr><td>'.$langs->trans("DateStart").'<FONT COLOR="red">*</FONT></td>'."\n";
-print '<td><input type="date" name="datestart" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('datestart')).'"></td></tr>'."\n";
-// End Date
-print '<tr><td>'.$langs->trans("DateEnd").'<FONT COLOR="red">*</FONT></td>'."\n";
-print '<td><input type="date" name="dateend" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('dateend')).'"></td></tr>'."\n";
 // Address
 print '<tr><td>'.$langs->trans("Address").'</td><td>'."\n";
 print '<textarea name="address" id="address" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.dol_escape_htmltag(GETPOST('address', 'restricthtml'), 0, 1).'</textarea></td></tr>'."\n";
@@ -603,9 +589,8 @@ print $formcompany->select_ziptown(GETPOST('town'), 'town', array('zipcode', 'se
 print '</td></tr>';
 // Country
 print '<tr><td>'.$langs->trans('Country');
-if (!empty(floatval($project->price_booth))) {
-	print '<FONT COLOR="red">*</FONT>';
-}
+print '<span style="color:red">*</span>';
+
 print '</td><td>';
 $country_id = GETPOST('country_id');
 if (!$country_id && !empty($conf->global->MEMBER_NEWFORM_FORCECOUNTRYCODE)) {
@@ -635,6 +620,22 @@ if (empty($conf->global->SOCIETE_DISABLE_STATE)) {
 	}
 	print '</td></tr>';
 }
+// Type of event
+print '<tr><td>'.$langs->trans("EventType").'<FONT COLOR="red">*</FONT></td>'."\n";
+print '<td>'.FORM::selectarray('eventtype', $arrayofeventtype, $eventtype).'</td>';
+// Label
+print '<tr><td>'.$langs->trans("LabelOfBooth").'<FONT COLOR="red">*</FONT></td>'."\n";
+print '</td><td><input type="text" name="label" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('label')).'"></td></tr>'."\n";
+// Note
+print '<tr><td>'.$langs->trans("Description").'<FONT COLOR="red">*</FONT></td>'."\n";
+print '<td><textarea name="note" id="note" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.dol_escape_htmltag(GETPOST('note', 'restricthtml'), 0, 1).'</textarea></td></tr>'."\n";
+// Start Date
+print '<tr><td>'.$langs->trans("DateStart").'<FONT COLOR="red">*</FONT></td>'."\n";
+print '<td><input type="date" name="datestart" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('datestart')).'"></td></tr>'."\n";
+// End Date
+print '<tr><td>'.$langs->trans("DateEnd").'<FONT COLOR="red">*</FONT></td>'."\n";
+print '<td><input type="date" name="dateend" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('dateend')).'"></td></tr>'."\n";
+
 
 print "</table>\n";
 
diff --git a/htdocs/public/project/suggestconference.php b/htdocs/public/project/suggestconference.php
index 00b093ba215..d63f2d2d98d 100644
--- a/htdocs/public/project/suggestconference.php
+++ b/htdocs/public/project/suggestconference.php
@@ -508,11 +508,11 @@ jQuery(document).ready(function () {
 print '<table class="border" summary="form to subscribe" id="tablesubscribe">'."\n";
 
 // Last Name
-print '<tr><td><label for="lastname">'.$langs->trans("Lastname").' / '.$langs->trans("Label").'<FONT COLOR="red">*</FONT></label></td>';
+print '<tr><td><label for="lastname">'.$langs->trans("Lastname").'<FONT COLOR="red">*</FONT></label></td>';
 print '<td colspan="3"><input name="lastname" id="lastname" type="text" class="maxwidth100onsmartphone" maxlength="80" value="'.dol_escape_htmltag(GETPOST("lastname", 'alpha') ?GETPOST("lastname", 'alpha') : $object->lastname).'" autofocus="autofocus"></td>';
 print '</tr>';
 // First Name
-print '<tr><td><label for="firstname">'.$langs->trans("Firstname").' / '.$langs->trans("Label").'<FONT COLOR="red">*</FONT></label></td>';
+print '<tr><td><label for="firstname">'.$langs->trans("Firstname").'<FONT COLOR="red">*</FONT></label></td>';
 print '<td colspan="3"><input name="firstname" id="firstname" type="text" class="maxwidth100onsmartphone" maxlength="80" value="'.dol_escape_htmltag(GETPOST("firstname", 'alpha') ?GETPOST("firstname", 'alpha') : $object->firstname).'" autofocus="autofocus"></td>';
 print '</tr>';
 // Email
@@ -520,21 +520,6 @@ print '<tr><td>'.$langs->trans("Email").'<FONT COLOR="red">*</FONT></td><td><inp
 // Company
 print '<tr id="trcompany" class="trcompany"><td>'.$langs->trans("Company").'<FONT COLOR="red">*</FONT>';
 print ' </td><td><input type="text" name="societe" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('societe')).'"></td></tr>'."\n";
-// Type of event
-print '<tr><td>'.$langs->trans("EventType").'<FONT COLOR="red">*</FONT></td>'."\n";
-print '<td>'.FORM::selectarray('eventtype', $arrayofeventtype, $eventtype).'</td>';
-// Label
-print '<tr><td>'.$langs->trans("Label").'<FONT COLOR="red">*</FONT></td>'."\n";
-print '</td><td><input type="text" name="label" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('label')).'"></td></tr>'."\n";
-// Note
-print '<tr><td>'.$langs->trans("Note").'<FONT COLOR="red">*</FONT></td>'."\n";
-print '<td><input type="text" name="note" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('note')).'"></td></tr>'."\n";
-// Start Date
-print '<tr><td>'.$langs->trans("DateStart").'</td>'."\n";
-print '<td><input type="date" name="datestart" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('datestart')).'"></td></tr>'."\n";
-// End Date
-print '<tr><td>'.$langs->trans("DateEnd").'</td>'."\n";
-print '<td><input type="date" name="dateend" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('dateend')).'"></td></tr>'."\n";
 // Address
 print '<tr><td>'.$langs->trans("Address").'</td><td>'."\n";
 print '<textarea name="address" id="address" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.dol_escape_htmltag(GETPOST('address', 'restricthtml'), 0, 1).'</textarea></td></tr>'."\n";
@@ -574,6 +559,22 @@ if (empty($conf->global->SOCIETE_DISABLE_STATE)) {
 	}
 	print '</td></tr>';
 }
+// Type of event
+print '<tr><td>'.$langs->trans("EventType").'<FONT COLOR="red">*</FONT></td>'."\n";
+print '<td>'.FORM::selectarray('eventtype', $arrayofeventtype, $eventtype).'</td>';
+// Label
+print '<tr><td>'.$langs->trans("LabelOfconference").'<FONT COLOR="red">*</FONT></td>'."\n";
+print '</td><td><input type="text" name="label" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('label')).'"></td></tr>'."\n";
+// Note
+print '<tr><td>'.$langs->trans("Description").'<FONT COLOR="red">*</FONT></td>'."\n";
+print '<td><textarea name="note" id="note" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.dol_escape_htmltag(GETPOST('note', 'restricthtml'), 0, 1).'</textarea></td></tr>'."\n";
+// Start Date
+print '<tr><td>'.$langs->trans("DateStart").'</td>'."\n";
+print '<td><input type="date" name="datestart" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('datestart')).'"></td></tr>'."\n";
+// End Date
+print '<tr><td>'.$langs->trans("DateEnd").'</td>'."\n";
+print '<td><input type="date" name="dateend" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('dateend')).'"></td></tr>'."\n";
+
 
 print "</table>\n";
 

From ca53abcef2abe690e5dbd1463e1294f3a210ae35 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Mon, 5 Jul 2021 15:35:05 +0200
Subject: [PATCH 1011/1497] fix email template type

---
 .../class/conferenceorbooth.class.php                |  2 +-
 htdocs/install/mysql/data/llx_c_email_templates.sql  | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/eventorganization/class/conferenceorbooth.class.php b/htdocs/eventorganization/class/conferenceorbooth.class.php
index 10ed5668c63..bb84bbe37bd 100644
--- a/htdocs/eventorganization/class/conferenceorbooth.class.php
+++ b/htdocs/eventorganization/class/conferenceorbooth.class.php
@@ -108,7 +108,7 @@ class ConferenceOrBooth extends ActionComm
 		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>'1', 'position'=>30, 'notnull'=>0, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth300', 'help'=>"Help text", 'showoncombobox'=>'1',),
 		'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'ThirdParty', 'enabled'=>'1', 'position'=>50, 'notnull'=>-1, 'visible'=>1, 'index'=>1, 'help'=>"LinkToThirparty",),
 		'fk_project' => array('type'=>'integer:Project:projet/class/project.class.php:1::eventorganization', 'label'=>'Project', 'enabled'=>'1', 'position'=>52, 'notnull'=>-1, 'visible'=>-1, 'index'=>1,),
-		'note' => array('type'=>'text', 'label'=>'Description', 'enabled'=>'1', 'position'=>60, 'notnull'=>0, 'visible'=>1, 'csslist'=>'small'),
+		'note' => array('type'=>'text', 'label'=>'Description', 'enabled'=>'1', 'position'=>60, 'notnull'=>0, 'visible'=>1),
 		'fk_action' => array('type'=>'sellist:c_actioncomm:libelle:id::module LIKE (\'%@eventorganization\')', 'label'=>'Format', 'enabled'=>'1', 'position'=>60, 'notnull'=>1, 'visible'=>1,),
 		'datep' => array('type'=>'datetime', 'label'=>'DateStart', 'enabled'=>'1', 'position'=>70, 'notnull'=>0, 'visible'=>1, 'showoncombobox'=>'2',),
 		'datep2' => array('type'=>'datetime', 'label'=>'DateEnd', 'enabled'=>'1', 'position'=>71, 'notnull'=>0, 'visible'=>1, 'showoncombobox'=>'3',),
diff --git a/htdocs/install/mysql/data/llx_c_email_templates.sql b/htdocs/install/mysql/data/llx_c_email_templates.sql
index acc09bad008..e2b1cd65077 100644
--- a/htdocs/install/mysql/data/llx_c_email_templates.sql
+++ b/htdocs/install/mysql/data/llx_c_email_templates.sql
@@ -35,9 +35,9 @@ INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private,
 INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, enabled, active, topic, content, content_lines, joinfiles) VALUES (0,'recruitment','recruitmentcandidature_send','',0,null,null,'(AnswerCandidature)'       ,100,'$conf->recruitment->enabled',1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(YourCandidature)__',       '__(Hello)__ __CANDIDATE_FULLNAME__,<br><br>\n\n__(YourCandidatureAnswerMessage)__<br>__ONLINE_INTERVIEW_SCHEDULER_TEXT_AND_URL__\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',null, 0);
 
 -- Event organization 
-INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, 'EventOrganizationEmailAskConf',       10, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailAskConf)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventConfRequestWasReceived)__<br /><br />__ONLINE_PAYMENT_TEXT_AND_URL__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
-INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, 'EventOrganizationEmailAskBooth',      20, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailAskBooth)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventBoothRequestWasReceived)__<br /><br />__ONLINE_PAYMENT_TEXT_AND_URL__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
-INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, 'EventOrganizationEmailSubsBooth',     30, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailSubsBooth)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventBoothSubscriptionWasReceived)__<br /><br />__ONLINE_PAYMENT_TEXT_AND_URL__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
-INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, 'EventOrganizationEmailSubsEvent',     40, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailSubsEvent)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventEventSubscriptionWasReceived)__<br /><br />__(Sincerely)__<br /><br />__MYCOMPANY_NAME__<br />__USER_SIGNATURE__', null, '1', null);
-INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, 'EventOrganizationMassEmailAttendees', 50, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationMassEmailAttendees)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventBulkMailToAttendees)__<br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
-INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, 'EventOrganizationMassEmailSpeakers',  60, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationMassEmailSpeakers)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventBulkMailToSpeakers)__<br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
+INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'conferenceorbooth', '', 0, null, null, 'EventOrganizationEmailAskConf',       10, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailAskConf)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventConfRequestWasReceived)__<br /><br />__ONLINE_PAYMENT_TEXT_AND_URL__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
+INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'conferenceorbooth', '', 0, null, null, 'EventOrganizationEmailAskBooth',      20, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailAskBooth)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventBoothRequestWasReceived)__<br /><br />__ONLINE_PAYMENT_TEXT_AND_URL__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
+INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'conferenceorbooth', '', 0, null, null, 'EventOrganizationEmailSubsBooth',     30, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailSubsBooth)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventBoothSubscriptionWasReceived)__<br /><br />__ONLINE_PAYMENT_TEXT_AND_URL__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
+INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'conferenceorbooth', '', 0, null, null, 'EventOrganizationEmailSubsEvent',     40, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailSubsEvent)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventEventSubscriptionWasReceived)__<br /><br />__(Sincerely)__<br /><br />__MYCOMPANY_NAME__<br />__USER_SIGNATURE__', null, '1', null);
+INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'conferenceorbooth', '', 0, null, null, 'EventOrganizationMassEmailAttendees', 50, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationMassEmailAttendees)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventBulkMailToAttendees)__<br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
+INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'conferenceorbooth', '', 0, null, null, 'EventOrganizationMassEmailSpeakers',  60, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationMassEmailSpeakers)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventBulkMailToSpeakers)__<br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);

From 03f8557aaf33e842199a413811eeba2b1bf9efc9 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Mon, 5 Jul 2021 15:36:41 +0200
Subject: [PATCH 1012/1497] fix template email

---
 htdocs/admin/eventorganization.php          | 12 ++++++------
 htdocs/public/project/suggestbooth.php      |  2 +-
 htdocs/public/project/suggestconference.php |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/admin/eventorganization.php b/htdocs/admin/eventorganization.php
index a57df57d782..53d27efeba2 100644
--- a/htdocs/admin/eventorganization.php
+++ b/htdocs/admin/eventorganization.php
@@ -54,12 +54,12 @@ $arrayofparameters = array(
 	'EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH'=>array('type'=>'category:'.Categorie::TYPE_CUSTOMER, 'enabled'=>1),
 	//'EVENTORGANIZATION_FILTERATTENDEES_CAT'=>array('type'=>'category:'.Categorie::TYPE_CUSTOMER, 'enabled'=>1),
 	//'EVENTORGANIZATION_FILTERATTENDEES_TYPE'=>array('type'=>'thirdparty_type:', 'enabled'=>1),
-	'EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF'=>array('type'=>'emailtemplate:eventorganization_send', 'enabled'=>1),
-	'EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH'=>array('type'=>'emailtemplate:eventorganization_send', 'enabled'=>1),
-	'EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH'=>array('type'=>'emailtemplate:eventorganization_send', 'enabled'=>1),
-	'EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT'=>array('type'=>'emailtemplate:eventorganization_send', 'enabled'=>1),
-	'EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER'=>array('type'=>'emailtemplate:eventorganization_send', 'enabled'=>1),
-	'EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES'=>array('type'=>'emailtemplate:eventorganization_send', 'enabled'=>1),
+	'EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF'=>array('type'=>'emailtemplate:conferenceorbooth', 'enabled'=>1),
+	'EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH'=>array('type'=>'emailtemplate:conferenceorbooth', 'enabled'=>1),
+	'EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH'=>array('type'=>'emailtemplate:conferenceorbooth', 'enabled'=>1),
+	'EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT'=>array('type'=>'emailtemplate:conferenceorbooth', 'enabled'=>1),
+	'EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER'=>array('type'=>'emailtemplate:conferenceorbooth', 'enabled'=>1),
+	'EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES'=>array('type'=>'emailtemplate:conferenceorbooth', 'enabled'=>1),
 	'EVENTORGANIZATION_SECUREKEY'=>array('type'=>'securekey', 'enabled'=>1),
 	'SERVICE_BOOTH_LOCATION'=>array('type'=>'product', 'enabled'=>1),
 	'SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION'=>array('type'=>'product', 'enabled'=>1),
diff --git a/htdocs/public/project/suggestbooth.php b/htdocs/public/project/suggestbooth.php
index 43a4b989687..3ab8e165c7e 100644
--- a/htdocs/public/project/suggestbooth.php
+++ b/htdocs/public/project/suggestbooth.php
@@ -470,7 +470,7 @@ if (empty($reshook) && $action == 'add') {
 
 						$labeltouse = $conf->global->EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH;
 						if (!empty($labeltouse)) {
-							$arraydefaultmessage = $formmail->getEMailTemplate($db, 'eventorganization_send', $user, $outputlangs, $labeltouse, 1, '');
+							$arraydefaultmessage = $formmail->getEMailTemplate($db, 'conferenceorbooth', $user, $outputlangs, $labeltouse, 1, '');
 						}
 
 						if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
diff --git a/htdocs/public/project/suggestconference.php b/htdocs/public/project/suggestconference.php
index d63f2d2d98d..399969bc80d 100644
--- a/htdocs/public/project/suggestconference.php
+++ b/htdocs/public/project/suggestconference.php
@@ -409,7 +409,7 @@ if (empty($reshook) && $action == 'add') {
 
 					$labeltouse = $conf->global->EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF;
 					if (!empty($labeltouse)) {
-						$arraydefaultmessage = $formmail->getEMailTemplate($db, 'eventorganization_send', $user, $outputlangs, $labeltouse, 1, '');
+						$arraydefaultmessage = $formmail->getEMailTemplate($db, 'conferenceorbooth', $user, $outputlangs, $labeltouse, 1, '');
 					}
 
 					if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {

From 22c45fe7cc33a901a1bba1386d31458f8f8ca333 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 5 Jul 2021 15:44:11 +0200
Subject: [PATCH 1013/1497] Trans

---
 htdocs/langs/en_US/products.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index fecbe7450c2..bf34efe3f79 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -341,7 +341,7 @@ ProductSheet=Product sheet
 ServiceSheet=Service sheet
 PossibleValues=Possible values
 GoOnMenuToCreateVairants=Go on menu %s - %s to prepare attribute variants (like colors, size, ...)
-UseProductFournDesc=Add a feature to define the descriptions of products defined by the vendors in addition to descriptions for customers
+UseProductFournDesc=Add a feature to define the product description defined by the vendors (for each vendor reference) in addition to the description for customers
 ProductSupplierDescription=Vendor description for the product
 UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
 PackagingForThisProduct=Packaging

From 8b07e99e05a9ed3c57bdc00c6a469fbbaa5672ef Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 5 Jul 2021 16:08:47 +0200
Subject: [PATCH 1014/1497] Fix for &#39; inserted by CKEditor instead of
 &apos;

---
 htdocs/core/lib/functions.lib.php | 6 +++++-
 test/phpunit/SecurityTest.php     | 9 +++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 13358074514..da93b01fc26 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -778,12 +778,16 @@ function checkVal($out = '', $check = 'alphanohtml', $filter = null, $options =
 			do {
 				$oldstringtoclean = $out;
 
+				// Ckeditor use the numeric entitic for apostrophe so we force it to text entity (all other special chars are correctly
+				// encoded using text entities). This is a fix for CKeditor.
+				$out = preg_replace('/&#39;/i', '&apos;', $out);
+
 				// We replace chars from a/A to z/Z encoded with numeric HTML entities with the real char so we won't loose the chars at the next step.
 				// No need to use a loop here, this step is not to sanitize (this is done at next step, this is to try to save chars, even if they are
 				// using a non coventionnel way to be encoded, to not have them sanitized just after)
 				$out = preg_replace_callback('/&#(x?[0-9][0-9a-f]+;?)/i', 'realCharForNumericEntities', $out);
 
-				// Now we remove all remaining HTML entities staring with a number. We don't want such entities.
+				// Now we remove all remaining HTML entities starting with a number. We don't want such entities.
 				$out = preg_replace('/&#x?[0-9]+/i', '', $out);	// For example if we have j&#x61vascript with an entities without the ; to hide the 'a' of 'javascript'.
 
 				$out = dol_string_onlythesehtmltags($out, 0, 1, 1);
diff --git a/test/phpunit/SecurityTest.php b/test/phpunit/SecurityTest.php
index 08d4ec88703..d75ec962020 100644
--- a/test/phpunit/SecurityTest.php
+++ b/test/phpunit/SecurityTest.php
@@ -321,6 +321,10 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 		$test="<a onpointerdown=alert(document.domain)>XSS</a>";
 		$result=testSqlAndScriptInject($test, 0);
 		$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject lll');
+
+		$test="Text with ' encoded with the numeric html entity converted into text entity &#39; (like when submited by CKEditor)";
+		$result=testSqlAndScriptInject($test, 0);
+		$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject mmm');
 	}
 
 	/**
@@ -358,6 +362,7 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 		$_POST["param12"]='<!DOCTYPE html><html>aaa</html>';
 		$_POST["param13"]='&#110; &#x6E; &gt; &lt; &quot; <a href=\"j&#x61;vascript:alert(document.domain)\">XSS</a>';
 		$_POST["param13b"]='&#110; &#x6E; &gt; &lt; &quot; <a href=\"j&#x61vascript:alert(document.domain)\">XSS</a>';
+		$_POST["param14"]="Text with ' encoded with the numeric html entity converted into text entity &#39; (like when submited by CKEditor)";
 		//$_POST["param13"]='javascript%26colon%26%23x3B%3Balert(1)';
 		//$_POST["param14"]='javascripT&javascript#x3a alert(1)';
 
@@ -494,6 +499,10 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('n n &gt; &lt; &quot; <a href=\"alert(document.domain)\">XSS</a>', $result, 'Test 13b that HTML entities are decoded with restricthtml, but only for common alpha chars');
 
+		$result=GETPOST("param14", 'restricthtml');
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals("Text with ' encoded with the numeric html entity converted into text entity &apos; (like when submited by CKEditor)", $result, 'Test 14');
+
 		// Special test for GETPOST of backtopage, backtolist or backtourl parameter
 
 		$_POST["backtopage"]='//www.google.com';

From eea90cef566b3cd234476f59eb8327b328d52c19 Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <68746600+marc-dll@users.noreply.github.com>
Date: Mon, 5 Jul 2021 16:31:33 +0200
Subject: [PATCH 1015/1497] FIX: holiday: balances not updated correctly with
 pgsql because of case sensitivity

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

diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index 2e61c014532..b7a8d41f699 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -2112,7 +2112,7 @@ class Holiday extends CommonObject
 	{
 		global $mysoc;
 
-		$sql = "SELECT rowid, code, label, affect, delay, newByMonth";
+		$sql = "SELECT rowid, code, label, affect, delay, newbymonth";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_holiday_types";
 		$sql .= " WHERE (fk_country IS NULL OR fk_country = ".$mysoc->country_id.')';
 		if ($active >= 0) $sql .= " AND active = ".((int) $active);
@@ -2126,7 +2126,7 @@ class Holiday extends CommonObject
 			{
 				while ($obj = $this->db->fetch_object($result))
 				{
-					$types[$obj->rowid] = array('rowid'=> $obj->rowid, 'code'=> $obj->code, 'label'=>$obj->label, 'affect'=>$obj->affect, 'delay'=>$obj->delay, 'newByMonth'=>$obj->newByMonth);
+					$types[$obj->rowid] = array('rowid'=> $obj->rowid, 'code'=> $obj->code, 'label'=>$obj->label, 'affect'=>$obj->affect, 'delay'=>$obj->delay, 'newByMonth'=>$obj->newbymonth);
 				}
 
 				return $types;

From d414bcb572f4459a863dcdf05a88f68faedc3793 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 5 Jul 2021 17:08:10 +0200
Subject: [PATCH 1016/1497] Fix phpcs

---
 htdocs/core/tpl/objectline_view.tpl.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php
index 3463de14240..444d847e25a 100644
--- a/htdocs/core/tpl/objectline_view.tpl.php
+++ b/htdocs/core/tpl/objectline_view.tpl.php
@@ -314,8 +314,7 @@ if ($outputalsopricetotalwithtax) {
 	$coldisplay++;
 }
 
-if ($this->statut == 0 && ($object_rights->creer) && $action != 'selectlines') {
-
+if ($this->statut == 0 && !empty($object_rights->creer) && $action != 'selectlines') {
 	$situationinvoicelinewithparent = 0;
 	if ($line->fk_prev_id != null && in_array($object->element, array('facture', 'facturedet'))) {
 		if ($object->type == $object::TYPE_SITUATION) {	// The constant TYPE_SITUATION exists only for object invoice

From 87f9530272925f0d651f59337a35661faeb6f377 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 5 Jul 2021 17:29:10 +0200
Subject: [PATCH 1017/1497] Fix report by Ahsan Aziz (can reset the password of
 another user that did not request password reset).

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

diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php
index cb149f1e481..63f33b5f8ec 100644
--- a/htdocs/user/passwordforgotten.php
+++ b/htdocs/user/passwordforgotten.php
@@ -87,14 +87,14 @@ if (empty($reshook)) {
 	// Validate new password
 	if ($action == 'validatenewpassword' && $username && $passworduidhash) {
 		$edituser = new User($db);
-		$result = $edituser->fetch('', $_GET["username"]);
+		$result = $edituser->fetch('', $username);
 		if ($result < 0) {
 			$message = '<div class="error">'.dol_escape_htmltag($langs->trans("ErrorLoginDoesNotExists", $username)).'</div>';
 		} else {
 			global $dolibarr_main_instance_unique_id;
 
 			//print $edituser->pass_temp.'-'.$edituser->id.'-'.$dolibarr_main_instance_unique_id.' '.$passworduidhash;
-			if (dol_verifyHash($edituser->pass_temp.'-'.$edituser->id.'-'.$dolibarr_main_instance_unique_id, $passworduidhash)) {
+			if ($edituser->pass_temp && dol_verifyHash($edituser->pass_temp.'-'.$edituser->id.'-'.$dolibarr_main_instance_unique_id, $passworduidhash)) {
 				// Clear session
 				unset($_SESSION['dol_login']);
 				$_SESSION['dol_loginmesg'] = $langs->trans('NewPasswordValidated'); // Save message for the session page

From f648185839689cf70fd3fcb254b2ce7313ba6c87 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 5 Jul 2021 17:34:25 +0200
Subject: [PATCH 1018/1497] Fix phpcs

---
 htdocs/core/lib/security2.lib.php | 4 ++--
 test/phpunit/SecurityTest.php     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/lib/security2.lib.php b/htdocs/core/lib/security2.lib.php
index 523b8ccf2cb..4408e2ccd52 100644
--- a/htdocs/core/lib/security2.lib.php
+++ b/htdocs/core/lib/security2.lib.php
@@ -476,8 +476,8 @@ function getRandomPassword($generic = false, $replaceambiguouschars = null, $len
 			}
 
 			$generated_password = str_shuffle($randomCode);
-		} else // Old platform, non cryptographic random
-		{
+		} else {
+			// Old platform, non cryptographic random
 			$max = strlen($lowercase) - 1;
 			for ($x = 0; $x < $nbofchar; $x++) {
 				$tmp = mt_rand(0, $max);
diff --git a/test/phpunit/SecurityTest.php b/test/phpunit/SecurityTest.php
index d75ec962020..63c52ac60c5 100644
--- a/test/phpunit/SecurityTest.php
+++ b/test/phpunit/SecurityTest.php
@@ -323,8 +323,8 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 		$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject lll');
 
 		$test="Text with ' encoded with the numeric html entity converted into text entity &#39; (like when submited by CKEditor)";
-		$result=testSqlAndScriptInject($test, 0);
-		$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject mmm');
+		$result=testSqlAndScriptInject($test, 0);	// result must be 0
+		$this->assertEquals(0, $result, 'Error on testSqlAndScriptInject mmm');
 	}
 
 	/**

From 65adb16191c3d1751922267f374b19ed78247a58 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 5 Jul 2021 17:55:17 +0200
Subject: [PATCH 1019/1497] Fix increase entrophy of default password
 generation.

---
 .../generate/modGeneratePassStandard.class.php        | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/modules/security/generate/modGeneratePassStandard.class.php b/htdocs/core/modules/security/generate/modGeneratePassStandard.class.php
index e091b5069e9..a358f916429 100644
--- a/htdocs/core/modules/security/generate/modGeneratePassStandard.class.php
+++ b/htdocs/core/modules/security/generate/modGeneratePassStandard.class.php
@@ -99,7 +99,7 @@ class modGeneratePassStandard extends ModeleGenPassword
 		$password = "";
 
 		// define possible characters
-		$possible = "0123456789bcdfghjkmnpqrstvwxyz";
+		$possible = "0123456789qwertyuiopasdfghjklzxcvbnmASDFGHJKLZXCVBNMQWERTYUIOP";
 
 		// set up a counter
 		$i = 0;
@@ -107,10 +107,13 @@ class modGeneratePassStandard extends ModeleGenPassword
 		// add random characters to $password until $length is reached
 		while ($i < $this->length) {
 			// pick a random character from the possible ones
-			$char = substr($possible, mt_rand(0, dol_strlen($possible) - 1), 1);
+			if (function_exists('random_int')) {	// Cryptographic random
+				$char = substr($possible, random_int(0, dol_strlen($possible) - 1), 1);
+			} else {
+				$char = substr($possible, mt_rand(0, dol_strlen($possible) - 1), 1);
+			}
 
-			// we don't want this character if it's already in the password
-			if (!strstr($password, $char)) {
+			if (substr_count($password, $char) <= 6) {	// we don't want this character if it's already 5 times in the password
 				$password .= $char;
 				$i++;
 			}

From a14c68e996d39cf315a89a4b6ceedc70bfc0871b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 5 Jul 2021 18:14:52 +0200
Subject: [PATCH 1020/1497] Fix Hide sensitive key on info page

---
 htdocs/admin/system/dolibarr.php | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php
index 9af09164469..f1ba888d2ca 100644
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@@ -400,8 +400,10 @@ foreach ($configfileparameters as $key => $value) {
 			if (in_array($newkey, array('dolibarr_main_db_pass', 'dolibarr_main_auth_ldap_admin_pass'))) {
 				if (empty($dolibarr_main_prod)) {
 					print '<!-- '.${$newkey}.' -->';
+					print showValueWithClipboardCPButton(${$newkey}, 0, '********');
+				} else {
+					print '**********';
 				}
-				print '**********';
 			} elseif ($newkey == 'dolibarr_main_url_root' && preg_match('/__auto__/', ${$newkey})) {
 				print ${$newkey}.' => '.constant('DOL_MAIN_URL_ROOT');
 			} elseif ($newkey == 'dolibarr_main_document_root_alt') {
@@ -420,9 +422,14 @@ foreach ($configfileparameters as $key => $value) {
 				}
 			} elseif ($newkey == 'dolibarr_main_instance_unique_id') {
 				//print $conf->file->instance_unique_id;
-				global $dolibarr_main_cookie_cryptkey;
-				$valuetoshow = ${$newkey} ? ${$newkey} : $dolibarr_main_cookie_cryptkey; // Use $dolibarr_main_instance_unique_id first then $dolibarr_main_cookie_cryptkey
-				print $valuetoshow;
+				global $dolibarr_main_cookie_cryptkey, $dolibarr_main_instance_unique_id;
+				$valuetoshow = $dolibarr_main_instance_unique_id ? $dolibarr_main_instance_unique_id : $dolibarr_main_cookie_cryptkey; // Use $dolibarr_main_instance_unique_id first then $dolibarr_main_cookie_cryptkey
+				if (empty($dolibarr_main_prod)) {
+					print '<!-- '.${$newkey}.' -->';
+					print showValueWithClipboardCPButton($valuetoshow, 0, '********');
+				} else {
+					print '**********';
+				}
 				if (empty($valuetoshow)) {
 					print img_warning("EditConfigFileToAddEntry", 'dolibarr_main_instance_unique_id');
 				}

From 38d272e31ad77167cc4c9bbdb3280832d2e2446c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 5 Jul 2021 18:16:52 +0200
Subject: [PATCH 1021/1497] Better position of fields

---
 htdocs/admin/system/dolibarr.php | 103 ++++++++++++++++---------------
 1 file changed, 52 insertions(+), 51 deletions(-)

diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php
index f1ba888d2ca..38c6cdc446a 100644
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@@ -309,57 +309,58 @@ print '<br>';
 
 // Parameters in conf.php file (when a parameter start with ?, it is shown only if defined)
 $configfileparameters = array(
-		'dolibarr_main_url_root' => $langs->trans("URLRoot"),
-		'?dolibarr_main_url_root_alt' => $langs->trans("URLRoot").' (alt)',
-		'dolibarr_main_document_root'=> $langs->trans("DocumentRootServer"),
-		'?dolibarr_main_document_root_alt' => $langs->trans("DocumentRootServer").' (alt)',
-		'dolibarr_main_data_root' => $langs->trans("DataRootServer"),
-		'dolibarr_main_instance_unique_id' => $langs->trans("InstanceUniqueID"),
-		'separator1' => '',
-		'dolibarr_main_db_host' => $langs->trans("DatabaseServer"),
-		'dolibarr_main_db_port' => $langs->trans("DatabasePort"),
-		'dolibarr_main_db_name' => $langs->trans("DatabaseName"),
-		'dolibarr_main_db_type' => $langs->trans("DriverType"),
-		'dolibarr_main_db_user' => $langs->trans("DatabaseUser"),
-		'dolibarr_main_db_pass' => $langs->trans("DatabasePassword"),
-		'dolibarr_main_db_character_set' => $langs->trans("DBStoringCharset"),
-		'dolibarr_main_db_collation' => $langs->trans("DBSortingCollation"),
-		'?dolibarr_main_db_prefix' => $langs->trans("Prefix"),
-		'separator2' => '',
-		'dolibarr_main_authentication' => $langs->trans("AuthenticationMode"),
-		'?multicompany_transverse_mode'=>  $langs->trans("MultiCompanyMode"),
-		'separator'=> '',
-		'?dolibarr_main_auth_ldap_login_attribute' => 'dolibarr_main_auth_ldap_login_attribute',
-		'?dolibarr_main_auth_ldap_host' => 'dolibarr_main_auth_ldap_host',
-		'?dolibarr_main_auth_ldap_port' => 'dolibarr_main_auth_ldap_port',
-		'?dolibarr_main_auth_ldap_version' => 'dolibarr_main_auth_ldap_version',
-		'?dolibarr_main_auth_ldap_dn' => 'dolibarr_main_auth_ldap_dn',
-		'?dolibarr_main_auth_ldap_admin_login' => 'dolibarr_main_auth_ldap_admin_login',
-		'?dolibarr_main_auth_ldap_admin_pass' => 'dolibarr_main_auth_ldap_admin_pass',
-		'?dolibarr_main_auth_ldap_debug' => 'dolibarr_main_auth_ldap_debug',
-		'separator3' => '',
-		'?dolibarr_lib_ADODB_PATH' => 'dolibarr_lib_ADODB_PATH',
-		'?dolibarr_lib_FPDF_PATH' => 'dolibarr_lib_FPDF_PATH',
-		'?dolibarr_lib_TCPDF_PATH' => 'dolibarr_lib_TCPDF_PATH',
-		'?dolibarr_lib_FPDI_PATH' => 'dolibarr_lib_FPDI_PATH',
-		'?dolibarr_lib_TCPDI_PATH' => 'dolibarr_lib_TCPDI_PATH',
-		'?dolibarr_lib_NUSOAP_PATH' => 'dolibarr_lib_NUSOAP_PATH',
-		'?dolibarr_lib_GEOIP_PATH' => 'dolibarr_lib_GEOIP_PATH',
-		'?dolibarr_lib_ODTPHP_PATH' => 'dolibarr_lib_ODTPHP_PATH',
-		'?dolibarr_lib_ODTPHP_PATHTOPCLZIP' => 'dolibarr_lib_ODTPHP_PATHTOPCLZIP',
-		'?dolibarr_js_CKEDITOR' => 'dolibarr_js_CKEDITOR',
-		'?dolibarr_js_JQUERY' => 'dolibarr_js_JQUERY',
-		'?dolibarr_js_JQUERY_UI' => 'dolibarr_js_JQUERY_UI',
-		'?dolibarr_font_DOL_DEFAULT_TTF' => 'dolibarr_font_DOL_DEFAULT_TTF',
-		'?dolibarr_font_DOL_DEFAULT_TTF_BOLD' => 'dolibarr_font_DOL_DEFAULT_TTF_BOLD',
-		'separator4' => '',
-		'dolibarr_main_prod' => 'Production mode (Hide all error messages)',
-		'dolibarr_main_restrict_os_commands' => 'Restrict CLI commands for backups',
-		'dolibarr_main_restrict_ip' => 'Restrict access to some IPs only',
-		'?dolibarr_mailing_limit_sendbyweb' => 'Limit nb of email sent by page',
-		'?dolibarr_mailing_limit_sendbycli' => 'Limit nb of email sent by cli',
-		'?dolibarr_strict_mode' => 'Strict mode is on/off',
-		'?dolibarr_nocsrfcheck' => 'Disable CSRF security checks'
+	'dolibarr_main_prod' => 'Production mode (Hide all error messages)',
+	'separator0' => '',
+	'dolibarr_main_url_root' => $langs->trans("URLRoot"),
+	'?dolibarr_main_url_root_alt' => $langs->trans("URLRoot").' (alt)',
+	'dolibarr_main_document_root'=> $langs->trans("DocumentRootServer"),
+	'?dolibarr_main_document_root_alt' => $langs->trans("DocumentRootServer").' (alt)',
+	'dolibarr_main_data_root' => $langs->trans("DataRootServer"),
+	'dolibarr_main_instance_unique_id' => $langs->trans("InstanceUniqueID"),
+	'separator1' => '',
+	'dolibarr_main_db_host' => $langs->trans("DatabaseServer"),
+	'dolibarr_main_db_port' => $langs->trans("DatabasePort"),
+	'dolibarr_main_db_name' => $langs->trans("DatabaseName"),
+	'dolibarr_main_db_type' => $langs->trans("DriverType"),
+	'dolibarr_main_db_user' => $langs->trans("DatabaseUser"),
+	'dolibarr_main_db_pass' => $langs->trans("DatabasePassword"),
+	'dolibarr_main_db_character_set' => $langs->trans("DBStoringCharset"),
+	'dolibarr_main_db_collation' => $langs->trans("DBSortingCollation"),
+	'?dolibarr_main_db_prefix' => $langs->trans("DatabasePrefix"),
+	'separator2' => '',
+	'dolibarr_main_authentication' => $langs->trans("AuthenticationMode"),
+	'?multicompany_transverse_mode'=>  $langs->trans("MultiCompanyMode"),
+	'separator'=> '',
+	'?dolibarr_main_auth_ldap_login_attribute' => 'dolibarr_main_auth_ldap_login_attribute',
+	'?dolibarr_main_auth_ldap_host' => 'dolibarr_main_auth_ldap_host',
+	'?dolibarr_main_auth_ldap_port' => 'dolibarr_main_auth_ldap_port',
+	'?dolibarr_main_auth_ldap_version' => 'dolibarr_main_auth_ldap_version',
+	'?dolibarr_main_auth_ldap_dn' => 'dolibarr_main_auth_ldap_dn',
+	'?dolibarr_main_auth_ldap_admin_login' => 'dolibarr_main_auth_ldap_admin_login',
+	'?dolibarr_main_auth_ldap_admin_pass' => 'dolibarr_main_auth_ldap_admin_pass',
+	'?dolibarr_main_auth_ldap_debug' => 'dolibarr_main_auth_ldap_debug',
+	'separator3' => '',
+	'?dolibarr_lib_ADODB_PATH' => 'dolibarr_lib_ADODB_PATH',
+	'?dolibarr_lib_FPDF_PATH' => 'dolibarr_lib_FPDF_PATH',
+	'?dolibarr_lib_TCPDF_PATH' => 'dolibarr_lib_TCPDF_PATH',
+	'?dolibarr_lib_FPDI_PATH' => 'dolibarr_lib_FPDI_PATH',
+	'?dolibarr_lib_TCPDI_PATH' => 'dolibarr_lib_TCPDI_PATH',
+	'?dolibarr_lib_NUSOAP_PATH' => 'dolibarr_lib_NUSOAP_PATH',
+	'?dolibarr_lib_GEOIP_PATH' => 'dolibarr_lib_GEOIP_PATH',
+	'?dolibarr_lib_ODTPHP_PATH' => 'dolibarr_lib_ODTPHP_PATH',
+	'?dolibarr_lib_ODTPHP_PATHTOPCLZIP' => 'dolibarr_lib_ODTPHP_PATHTOPCLZIP',
+	'?dolibarr_js_CKEDITOR' => 'dolibarr_js_CKEDITOR',
+	'?dolibarr_js_JQUERY' => 'dolibarr_js_JQUERY',
+	'?dolibarr_js_JQUERY_UI' => 'dolibarr_js_JQUERY_UI',
+	'?dolibarr_font_DOL_DEFAULT_TTF' => 'dolibarr_font_DOL_DEFAULT_TTF',
+	'?dolibarr_font_DOL_DEFAULT_TTF_BOLD' => 'dolibarr_font_DOL_DEFAULT_TTF_BOLD',
+	'separator4' => '',
+	'dolibarr_main_restrict_os_commands' => 'Restrict CLI commands for backups',
+	'dolibarr_main_restrict_ip' => 'Restrict access to some IPs only',
+	'?dolibarr_mailing_limit_sendbyweb' => 'Limit nb of email sent by page',
+	'?dolibarr_mailing_limit_sendbycli' => 'Limit nb of email sent by cli',
+	'?dolibarr_strict_mode' => 'Strict mode is on/off',
+	'?dolibarr_nocsrfcheck' => 'Disable CSRF security checks'
 );
 
 print '<div class="div-table-responsive-no-min">';

From 3ac72fe73c70cd35788f8be7141021a2294403b4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 5 Jul 2021 18:19:02 +0200
Subject: [PATCH 1022/1497] Fix

---
 htdocs/admin/system/dolibarr.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php
index 38c6cdc446a..0271488b65a 100644
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@@ -310,13 +310,13 @@ print '<br>';
 // Parameters in conf.php file (when a parameter start with ?, it is shown only if defined)
 $configfileparameters = array(
 	'dolibarr_main_prod' => 'Production mode (Hide all error messages)',
+	'dolibarr_main_instance_unique_id' => $langs->trans("InstanceUniqueID"),
 	'separator0' => '',
 	'dolibarr_main_url_root' => $langs->trans("URLRoot"),
 	'?dolibarr_main_url_root_alt' => $langs->trans("URLRoot").' (alt)',
 	'dolibarr_main_document_root'=> $langs->trans("DocumentRootServer"),
 	'?dolibarr_main_document_root_alt' => $langs->trans("DocumentRootServer").' (alt)',
 	'dolibarr_main_data_root' => $langs->trans("DataRootServer"),
-	'dolibarr_main_instance_unique_id' => $langs->trans("InstanceUniqueID"),
 	'separator1' => '',
 	'dolibarr_main_db_host' => $langs->trans("DatabaseServer"),
 	'dolibarr_main_db_port' => $langs->trans("DatabasePort"),

From abb1ad6bf0469eccd2b58beb20bdabc18fc36e22 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 5 Jul 2021 18:46:27 +0200
Subject: [PATCH 1023/1497] Fix sql injection

---
 htdocs/compta/bank/class/account.class.php             | 4 ++--
 htdocs/compta/sociales/class/cchargesociales.class.php | 8 ++++----
 htdocs/societe/card.php                                | 2 +-
 htdocs/societe/class/societe.class.php                 | 8 ++++----
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 46d1bb93684..8619ff25dae 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -829,8 +829,8 @@ class Account extends CommonObject
 		$sql .= ",min_desired = ".($this->min_desired != '' ? price2num($this->min_desired) : "null");
 		$sql .= ",comment     = '".$this->db->escape($this->comment)."'";
 
-		$sql .= ",state_id = ".($this->state_id > 0 ? $this->state_id : "null");
-		$sql .= ",fk_pays = ".($this->country_id > 0 ? $this->country_id : "null");
+		$sql .= ",state_id = ".($this->state_id > 0 ? ((int) $this->state_id) : "null");
+		$sql .= ",fk_pays = ".($this->country_id > 0 ? ((int) $this->country_id) : "null");
 		$sql .= ",ics = '".$this->db->escape($this->ics)."'";
 		$sql .= ",ics_transfer = '".$this->db->escape($this->ics_transfer)."'";
 
diff --git a/htdocs/compta/sociales/class/cchargesociales.class.php b/htdocs/compta/sociales/class/cchargesociales.class.php
index 8cfadd84f4f..ee9a270b283 100644
--- a/htdocs/compta/sociales/class/cchargesociales.class.php
+++ b/htdocs/compta/sociales/class/cchargesociales.class.php
@@ -260,13 +260,13 @@ class Cchargesociales
 		// Update request
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' SET';
 		$sql .= ' libelle = '.(isset($this->libelle) ? "'".$this->db->escape($this->libelle)."'" : "null").',';
-		$sql .= ' deductible = '.(isset($this->deductible) ? $this->deductible : "null").',';
-		$sql .= ' active = '.(isset($this->active) ? $this->active : "null").',';
+		$sql .= ' deductible = '.(isset($this->deductible) ? ((int) $this->deductible) : "null").',';
+		$sql .= ' active = '.(isset($this->active) ? ((int) $this->active) : "null").',';
 		$sql .= ' code = '.(isset($this->code) ? "'".$this->db->escape($this->code)."'" : "null").',';
-		$sql .= ' fk_pays = '.(isset($this->fk_pays) ? $this->fk_pays : "null").',';
+		$sql .= ' fk_pays = '.((isset($this->fk_pays) && $this->fk_pays > 0) ? ((int) $this->fk_pays) : "null").',';
 		$sql .= ' module = '.(isset($this->module) ? "'".$this->db->escape($this->module)."'" : "null").',';
 		$sql .= ' accountancy_code = '.(isset($this->accountancy_code) ? "'".$this->db->escape($this->accountancy_code)."'" : "null");
-		$sql .= ' WHERE id='.$this->id;
+		$sql .= ' WHERE id='.((int) $this->id);
 
 		$this->db->begin();
 
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index e7e8c10d20c..ba4023dbba9 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -554,7 +554,7 @@ if (empty($reshook)) {
 				}
 
 				// We set country_id, country_code and country for the selected country
-				$object->country_id = GETPOST('country_id') != '' ?GETPOST('country_id') : $mysoc->country_id;
+				$object->country_id = GETPOST('country_id', 'int') != '' ? GETPOST('country_id', 'int') : $mysoc->country_id;
 				if ($object->country_id) {
 					$tmparray = getCountry($object->country_id, 'all');
 					$object->country_code = $tmparray['code'];
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index a213cca5577..eff2ba39c21 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -894,7 +894,7 @@ class Societe extends CommonObject
 			$sql .= ", ".(!empty($user->id) ? ((int) $user->id) : "null");
 			$sql .= ", ".(!empty($this->typent_id) ? ((int) $this->typent_id) : "null");
 			$sql .= ", ".(!empty($this->canvas) ? "'".$this->db->escape($this->canvas)."'" : "null");
-			$sql .= ", ".$this->status;
+			$sql .= ", ".((int) $this->status);
 			$sql .= ", ".(!empty($this->ref_ext) ? "'".$this->db->escape($this->ref_ext)."'" : "null");
 			$sql .= ", 0";
 			$sql .= ", ".(int) $this->fk_incoterms;
@@ -1369,13 +1369,13 @@ class Societe extends CommonObject
 			$sql .= ",zip = ".(!empty($this->zip) ? "'".$this->db->escape($this->zip)."'" : "null");
 			$sql .= ",town = ".(!empty($this->town) ? "'".$this->db->escape($this->town)."'" : "null");
 
-			$sql .= ",fk_departement = '".(!empty($this->state_id) ? $this->state_id : '0')."'";
-			$sql .= ",fk_pays = '".(!empty($this->country_id) ? $this->country_id : '0')."'";
+			$sql .= ",fk_departement = ".((!empty($this->state_id) && $this->state_id > 0) ? ((int) $this->state_id) : 'null');
+			$sql .= ",fk_pays = ".((!empty($this->country_id) && $this->country_id > 0) ? ((int) $this->country_id) : 'null');
 
 			$sql .= ",phone = ".(!empty($this->phone) ? "'".$this->db->escape($this->phone)."'" : "null");
 			$sql .= ",fax = ".(!empty($this->fax) ? "'".$this->db->escape($this->fax)."'" : "null");
 			$sql .= ",email = ".(!empty($this->email) ? "'".$this->db->escape($this->email)."'" : "null");
-			$sql .= ", socialnetworks = '".$this->db->escape(json_encode($this->socialnetworks))."'";
+			$sql .= ",socialnetworks = '".$this->db->escape(json_encode($this->socialnetworks))."'";
 			$sql .= ",url = ".(!empty($this->url) ? "'".$this->db->escape($this->url)."'" : "null");
 
 			$sql .= ",parent = ".($this->parent > 0 ? $this->parent : "null");

From e2d7de31460a1c4de7aa410874910d96c47f3701 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 5 Jul 2021 18:56:24 +0200
Subject: [PATCH 1024/1497] css

---
 htdocs/core/tpl/login.tpl.php             | 2 +-
 htdocs/core/tpl/passwordforgotten.tpl.php | 2 +-
 htdocs/theme/eldy/global.inc.php          | 7 ++++++-
 htdocs/theme/md/style.css.php             | 7 ++++++-
 htdocs/user/passwordforgotten.php         | 4 ++--
 5 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index 9af5bc7d7b4..e668d1e6d58 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -356,7 +356,7 @@ if (!empty($conf->global->MAIN_EASTER_EGG_COMMITSTRIP)) {
 
 <?php if ($main_home) {
 	?>
-	<div class="center login_main_home paddingtopbottom <?php echo empty($conf->global->MAIN_LOGIN_BACKGROUND) ? '' : ' backgroundsemitransparent'; ?>" style="max-width: 70%">
+	<div class="center login_main_home paddingtopbottom <?php echo empty($conf->global->MAIN_LOGIN_BACKGROUND) ? '' : ' backgroundsemitransparent boxshadow'; ?>" style="max-width: 70%">
 	<?php echo $main_home; ?>
 	</div><br>
 	<?php
diff --git a/htdocs/core/tpl/passwordforgotten.tpl.php b/htdocs/core/tpl/passwordforgotten.tpl.php
index 9e0a222725b..8964145b430 100644
--- a/htdocs/core/tpl/passwordforgotten.tpl.php
+++ b/htdocs/core/tpl/passwordforgotten.tpl.php
@@ -216,7 +216,7 @@ if (!empty($morelogincontent)) {
 </form>
 
 
-<div class="center login_main_home divpasswordmessagedesc paddingtopbottom<?php echo empty($conf->global->MAIN_LOGIN_BACKGROUND) ? '' : ' backgroundsemitransparent'; ?>" style="max-width: 70%">
+<div class="center login_main_home divpasswordmessagedesc paddingtopbottom<?php echo empty($conf->global->MAIN_LOGIN_BACKGROUND) ? '' : ' backgroundsemitransparent boxshadow'; ?>" style="max-width: 70%">
 <?php if ($mode == 'dolibarr' || !$disabled) { ?>
 	<span class="passwordmessagedesc">
 	<?php echo $langs->trans('SendNewPasswordDesc'); ?>
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 6046a960b45..71489fb3b1b 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -2640,7 +2640,7 @@ table.login_table_securitycode tr td {
 }
 
 div.backgroundsemitransparent {
-	background:rgba(255,255,255,0.68);
+	background:rgba(255, 255, 255, 0.7);
 	padding-left: 10px;
 	padding-right: 10px;
 }
@@ -3922,6 +3922,11 @@ table.noborder.paymenttable {
 	box-shadow: 1px 1px 7px #CCC !important;
 }
 
+.boxshadow {
+	-webkit-box-shadow: 0px 0px 5px #888;
+	box-shadow: 0px 0px 5px #888;
+}
+
 div.tabBar .noborder {
 	-webkit-box-shadow: 0px 0px 0px #DDD !important;
 	box-shadow: 0px 0px 0px #DDD !important;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 8a642a0e170..5bd074b31d5 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1862,7 +1862,7 @@ div.login_block {
 
 
 div.backgroundsemitransparent {
-	background:rgba(255,255,255,0.6);
+	background:rgba(255, 255, 255, 0.7);
 	padding-left: 10px;
 	padding-right: 10px;
 }
@@ -3943,6 +3943,11 @@ tr.liste_sub_total, tr.liste_sub_total td {
 	box-shadow: 2px 2px 5px #CCC !important;
 }
 
+.boxshadow {
+	-webkit-box-shadow: 0px 0px 5px #888;
+	box-shadow: 0px 0px 5px #888;
+}
+
 div.tabBar .noborder {
 	-webkit-box-shadow: 0px 0px 0px #f4f4f4 !important;
 	box-shadow: 0px 0px 0px #f4f4f4 !important;
diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php
index 63f33b5f8ec..32fa93cb8a6 100644
--- a/htdocs/user/passwordforgotten.php
+++ b/htdocs/user/passwordforgotten.php
@@ -128,7 +128,7 @@ if (empty($reshook)) {
 			}
 
 			if ($result <= 0 && $edituser->error == 'USERNOTFOUND') {
-				$message = '<div class="warning paddingtopbottom'.(empty($conf->global->MAIN_LOGIN_BACKGROUND) ? '' : ' backgroundsemitransparent').'">';
+				$message = '<div class="warning paddingtopbottom'.(empty($conf->global->MAIN_LOGIN_BACKGROUND) ? '' : ' backgroundsemitransparent boxshadow').'">';
 				if (!$isanemail) {
 					$message .= $langs->trans("IfLoginExistPasswordRequestSent");
 				} else {
@@ -147,7 +147,7 @@ if (empty($reshook)) {
 					} else {
 						// Success
 						if ($edituser->send_password($user, $newpassword, 1) > 0) {
-							$message = '<div class="warning paddingtopbottom'.(empty($conf->global->MAIN_LOGIN_BACKGROUND) ? '' : ' backgroundsemitransparent').'">';
+							$message = '<div class="warning paddingtopbottom'.(empty($conf->global->MAIN_LOGIN_BACKGROUND) ? '' : ' backgroundsemitransparent boxshadow').'">';
 							if (!$isanemail) {
 								$message .= $langs->trans("IfLoginExistPasswordRequestSent");
 							} else {

From a04ed363c700af059213e46e99bf2f674e53a81d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 5 Jul 2021 19:28:50 +0200
Subject: [PATCH 1025/1497] Look and feel v14

---
 htdocs/core/lib/functions.lib.php        | 2 +-
 htdocs/margin/tabs/thirdpartyMargins.php | 8 ++++----
 htdocs/user/agenda_extsites.php          | 2 +-
 htdocs/user/card.php                     | 4 +++-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index da93b01fc26..81984c17316 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -8091,7 +8091,7 @@ function picto_from_langcode($codelang, $moreatt = '')
 	}
 
 	if ($codelang == 'auto') {
-		return '<span class="fa fa-globe"></span>';
+		return '<span class="fa fa-language"></span>';
 	}
 
 	$langtocountryflag = array(
diff --git a/htdocs/margin/tabs/thirdpartyMargins.php b/htdocs/margin/tabs/thirdpartyMargins.php
index 21e922a9fa7..1b3cc468e5c 100644
--- a/htdocs/margin/tabs/thirdpartyMargins.php
+++ b/htdocs/margin/tabs/thirdpartyMargins.php
@@ -142,7 +142,7 @@ if ($socid > 0) {
 
 	// Total Margin
 	print '<tr><td class="titlefield">'.$langs->trans("TotalMargin").'</td><td colspan="3">';
-	print '<span id="totalMargin"></span>'; // set by jquery (see below)
+	print '<span id="totalMargin" class="amount"></span>'; // set by jquery (see below)
 	print '</td></tr>';
 
 	// Margin Rate
@@ -242,9 +242,9 @@ if ($socid > 0) {
 				print "</td>\n";
 				print "<td class=\"center\">";
 				print dol_print_date($db->jdate($objp->datef), 'day')."</td>";
-				print "<td class=\"right\">".price(price2num($objp->selling_price, 'MT'))."</td>\n";
-				print "<td class=\"right\">".price(price2num(($objp->type == 2 ? -1 : 1) * $objp->buying_price, 'MT'))."</td>\n";
-				print "<td class=\"right\">".$sign.price(price2num($objp->marge, 'MT'))."</td>\n";
+				print "<td class=\"right amount\">".price(price2num($objp->selling_price, 'MT'))."</td>\n";
+				print "<td class=\"right amount\">".price(price2num(($objp->type == 2 ? -1 : 1) * $objp->buying_price, 'MT'))."</td>\n";
+				print "<td class=\"right amount\">".$sign.price(price2num($objp->marge, 'MT'))."</td>\n";
 				if (!empty($conf->global->DISPLAY_MARGIN_RATES)) {
 					print "<td class=\"right\">".(($marginRate === '') ? 'n/a' : $sign.price(price2num($marginRate, 'MT'))."%")."</td>\n";
 				}
diff --git a/htdocs/user/agenda_extsites.php b/htdocs/user/agenda_extsites.php
index b474bdfc678..928db5449d8 100644
--- a/htdocs/user/agenda_extsites.php
+++ b/htdocs/user/agenda_extsites.php
@@ -188,7 +188,7 @@ print '<table class="noborder centpercent">';
 print "<tr class=\"liste_titre\">";
 print "<td>".$langs->trans("Parameter")."</td>";
 print "<td>".$langs->trans("Name")."</td>";
-print "<td>".$langs->trans("ExtSiteUrlAgenda").'<div class="hideonsmartphone">'." (".$langs->trans("Example").': http://yoursite/agenda/agenda.ics)</div></td>';
+print "<td>".$langs->trans("ExtSiteUrlAgenda").'<div class="hideonsmartphone opacitymedium">'." (".$langs->trans("Example").': https://externalcalendar/agenda/agenda.ics)</div></td>';
 print "<td>".$form->textwithpicto($langs->trans("FixTZ"), $langs->trans("FillFixTZOnlyIfRequired"), 1).'</td>';
 print '<td class="right">'.$langs->trans("Color").'</td>';
 print "</tr>";
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index ef7136e2450..1efbdb18714 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1421,10 +1421,12 @@ if ($action == 'create' || $action == 'adduserldap') {
 			if ($object->socid > 0) {
 				$type = $langs->trans("External");
 			}
+			print '<span class="badgeneutral">';
 			print $type;
 			if ($object->ldap_sid) {
 				print ' ('.$langs->trans("DomainUser").')';
 			}
+			print '</span>';
 			print '</td></tr>'."\n";
 
 			// Ldap sid
@@ -1534,7 +1536,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 				// Salary
 				print '<tr><td>'.$langs->trans("Salary").'</td>';
 				print '<td>';
-				print ($object->salary != '' ? img_picto('', 'salary', 'class="pictofixedwidth paddingright"').price($object->salary, '', $langs, 1, -1, -1, $conf->currency) : '');
+				print ($object->salary != '' ? img_picto('', 'salary', 'class="pictofixedwidth paddingright"').'<span class="amount">'.price($object->salary, '', $langs, 1, -1, -1, $conf->currency) : '').'</span>';
 				print '</td>';
 				print "</tr>\n";
 			}

From 8e7508dd9f877296b217802aa0878442246f7750 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 5 Jul 2021 19:50:16 +0200
Subject: [PATCH 1026/1497] Clean code

---
 htdocs/expensereport/card.php                 | 22 +++++++------
 .../class/expensereport.class.php             | 32 +++++++++----------
 .../tpl/expensereport_linktofile.tpl.php      |  2 +-
 3 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 344c65832db..35cf2f69b37 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -1084,7 +1084,7 @@ if (empty($reshook)) {
 
 		$fk_c_exp_tax_cat = GETPOST('fk_c_exp_tax_cat', 'int');
 
-		$qty = GETPOST('qty', 'int');
+		$qty = price2num(GETPOST('qty', 'alpha'));
 		if (empty($qty)) {
 			$qty = 1;
 		}
@@ -1101,21 +1101,21 @@ if (empty($reshook)) {
 			$action = '';
 		}
 
-		// Si aucune date n'est rentrée
+		// If no date entered
 		if (empty($date) || $date == "--") {
 			$error++;
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
+		} elseif ($date < $object->date_debut || $date > ($object->date_fin + (24 * 3600 - 1))) {
+			// Warning if date out of range
+			$langs->load("errors");
+			setEventMessages($langs->trans("WarningDateOfLineMustBeInExpenseReportRange"), null, 'warnings');
 		}
-		// Si aucun prix n'est rentré
+
+		// If no price entered
 		if ($value_unit == 0) {
 			$error++;
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("PriceUTTC")), null, 'errors');
 		}
-		// Warning if date out of range
-		if ($date < $object->date_debut || $date > ($object->date_fin + (24 * 3600 - 1))) {
-			$langs->load("errors");
-			setEventMessages($langs->trans("WarningDateOfLineMustBeInExpenseReportRange"), null, 'warnings');
-		}
 
 		if (!$error) {
 			$type = 0; // TODO What if service ? We should take the type product/service from the type of expense report llx_c_type_fees
@@ -1215,12 +1215,12 @@ if (empty($reshook)) {
 			}
 		}
 
-		$rowid = $_POST['rowid'];
+		$rowid = GETPOST('rowid', 'int');
 		$type_fees_id = GETPOST('fk_c_type_fees', 'int');
 		$fk_c_exp_tax_cat = GETPOST('fk_c_exp_tax_cat', 'int');
 		$projet_id = $fk_project;
 		$comments = GETPOST('comments', 'restricthtml');
-		$qty = GETPOST('qty', 'int');
+		$qty = price2num(GETPOST('qty', 'alpha'));
 		$vatrate = GETPOST('vatrate', 'alpha');
 
 		// if VAT is not used in Dolibarr, set VAT rate to 0 because VAT rate is necessary.
@@ -2511,9 +2511,11 @@ if ($action == 'create') {
 	exit(1);
 }
 
+
 /*
  * Action bar
  */
+
 print '<div class="tabsAction">';
 
 if ($action != 'create' && $action != 'edit') {
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 9592f9548af..b9b355be9f3 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -2119,7 +2119,7 @@ class ExpenseReport extends CommonObject
 
 			$this->line->fk_ecm_files = $fk_ecm_files;
 
-			$this->line->id = $rowid;
+			$this->line->id = ((int) $rowid);
 
 			// Select des infos sur le type fees
 			$sql = "SELECT c.code as code_type_fees, c.label as libelle_type_fees";
@@ -2811,26 +2811,26 @@ class ExpenseReportLine
 		// Update line in database
 		$sql = "UPDATE ".MAIN_DB_PREFIX."expensereport_det SET";
 		$sql .= " comments='".$this->db->escape($this->comments)."'";
-		$sql .= ",value_unit = ".((float) $this->value_unit);
-		$sql .= ",qty=".((float) $this->qty);
-		$sql .= ",date='".$this->db->idate($this->date)."'";
-		$sql .= ",total_ht=".((float) price2num($this->total_ht, 'MT'))."";
-		$sql .= ",total_tva=".((float) price2num($this->total_tva, 'MT'))."";
-		$sql .= ",total_ttc=".((float) price2num($this->total_ttc, 'MT'))."";
-		$sql .= ",tva_tx=".((float) $this->vatrate);
-		$sql .= ",vat_src_code='".$this->db->escape($this->vat_src_code)."'";
-		$sql .= ",rule_warning_message='".$this->db->escape($this->rule_warning_message)."'";
-		$sql .= ",fk_c_exp_tax_cat=".$this->db->escape($this->fk_c_exp_tax_cat);
-		$sql .= ",fk_ecm_files=".($this->fk_ecm_files > 0 ? ((int) $this->fk_ecm_files) : 'null');
+		$sql .= ", value_unit = ".((float) $this->value_unit);
+		$sql .= ", qty=".((float) $this->qty);
+		$sql .= ", date='".$this->db->idate($this->date)."'";
+		$sql .= ", total_ht=".((float) price2num($this->total_ht, 'MT'))."";
+		$sql .= ", total_tva=".((float) price2num($this->total_tva, 'MT'))."";
+		$sql .= ", total_ttc=".((float) price2num($this->total_ttc, 'MT'))."";
+		$sql .= ", tva_tx=".((float) $this->vatrate);
+		$sql .= ", vat_src_code='".$this->db->escape($this->vat_src_code)."'";
+		$sql .= ", rule_warning_message='".$this->db->escape($this->rule_warning_message)."'";
+		$sql .= ", fk_c_exp_tax_cat=".$this->db->escape($this->fk_c_exp_tax_cat);
+		$sql .= ", fk_ecm_files=".($this->fk_ecm_files > 0 ? ((int) $this->fk_ecm_files) : 'null');
 		if ($this->fk_c_type_fees) {
-			$sql .= ",fk_c_type_fees = ".((int) $this->fk_c_type_fees);
+			$sql .= ", fk_c_type_fees = ".((int) $this->fk_c_type_fees);
 		} else {
-			$sql .= ",fk_c_type_fees=null";
+			$sql .= ", fk_c_type_fees=null";
 		}
 		if ($this->fk_project > 0) {
-			$sql .= ",fk_projet=".((int) $this->fk_project);
+			$sql .= ", fk_projet=".((int) $this->fk_project);
 		} else {
-			$sql .= ",fk_projet=null";
+			$sql .= ", fk_projet=null";
 		}
 		$sql .= " WHERE rowid = ".((int) ($this->rowid ? $this->rowid : $this->id));
 
diff --git a/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php b/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php
index 42be03263a8..9264400a71f 100644
--- a/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php
+++ b/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php
@@ -72,7 +72,7 @@ if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES)) {
 						}
 						// If the preview file is found
 						if (file_exists($fileimage)) {
-							$thumbshown = '<img height="'.$heightforphotref.'" class="photo photowithmargin photowithborder" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=apercu'.$modulepart.'&amp;file='.urlencode($relativepathimage).'">';
+							$thumbshown = '<img height="'.$heightforphotref.'" class="photo photowithmargin photowithborder" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=apercu'.urlencode($modulepart).'&file='.urlencode($relativepathimage).'">';
 						}
 					}
 				}

From 6a6216898e8dfc2472075f4c2d9400aca91c68f3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 5 Jul 2021 19:57:11 +0200
Subject: [PATCH 1027/1497] Fix unit price of expense report

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

diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index b9b355be9f3..b3601c00deb 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -2703,10 +2703,10 @@ class ExpenseReportLine
 		$sql .= " '".$this->db->escape(empty($this->vat_src_code) ? '' : $this->vat_src_code)."',";
 		$sql .= " '".$this->db->escape($this->comments)."',";
 		$sql .= " ".((float) $this->qty).",";
-		$sql .= " ".((int) $this->value_unit).",";
-		$sql .= " ".price2num($this->total_ht).",";
-		$sql .= " ".price2num($this->total_tva).",";
-		$sql .= " ".price2num($this->total_ttc).",";
+		$sql .= " ".((float) $this->value_unit).",";
+		$sql .= " ".((float) price2num($this->total_ht)).",";
+		$sql .= " ".((float) price2num($this->total_tva)).",";
+		$sql .= " ".((float) price2num($this->total_ttc)).",";
 		$sql .= " '".$this->db->idate($this->date)."',";
 		$sql .= " ".(empty($this->rule_warning_message) ? 'null' : "'".$this->db->escape($this->rule_warning_message)."'").",";
 		$sql .= " ".((int) $this->fk_c_exp_tax_cat).",";

From db95339085aab5a0244ac05809675d92b29745c9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 5 Jul 2021 20:32:05 +0200
Subject: [PATCH 1028/1497] Code comment

---
 htdocs/core/lib/functions.lib.php |  2 +-
 htdocs/expensereport/card.php     | 58 +++++++++++++++----------------
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 81984c17316..f10b430ddbd 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -7439,7 +7439,7 @@ function print_date_range($date_start, $date_end, $format = '', $outputlangs = '
  *    @param    int			$date_end      		End date
  *    @param    string		$format        		Output format
  *    @param	Translate	$outputlangs   		Output language
- *    @param	integer		$withparenthesis	1=Add parenthesis, 0=non parenthesis
+ *    @param	integer		$withparenthesis	1=Add parenthesis, 0=no parenthesis
  *    @return	string							String
  */
 function get_date_range($date_start, $date_end, $format = '', $outputlangs = '', $withparenthesis = 1)
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 35cf2f69b37..d207ffd20c1 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -1675,15 +1675,15 @@ if ($action == 'create') {
 			 print '<tr>';
 			 print '<td class="titlefield">'.$langs->trans("User").'</td>';
 			 print '<td>';
-			if ($object->fk_user_author > 0) {
-				$userauthor = new User($db);
-				$result = $userauthor->fetch($object->fk_user_author);
-				if ($result < 0) {
-					dol_print_error('', $userauthor->error);
-				} elseif ($result > 0) {
-					print $userauthor->getNomUrl(-1);
-				}
-			}
+			 if ($object->fk_user_author > 0) {
+			 	$userauthor = new User($db);
+			 	$result = $userauthor->fetch($object->fk_user_author);
+			 	if ($result < 0) {
+			 		dol_print_error('', $userauthor->error);
+			 	} elseif ($result > 0) {
+			 		print $userauthor->getNomUrl(-1);
+			 	}
+			 }
 			 print '</td></tr>';
 
 			 // Period
@@ -2474,32 +2474,32 @@ if ($action == 'create') {
 					print '</tr>';
 			} // Fin si c'est payé/validé
 
-				print '</table>';
-				print '</div>';
+			print '</table>';
+			print '</div>';
 
-				print '<script javascript>
+			print '<script javascript>
 
-				/* JQuery for product free or predefined select */
-				jQuery(document).ready(function() {
-					jQuery("#value_unit_ht").keyup(function(event) {
-						console.log(event.which);		// discard event tag and arrows
-						if (event.which != 9 && (event.which < 37 ||event.which > 40) && jQuery("#value_unit_ht").val() != "") {
-							jQuery("#value_unit").val("");
-						}
-					});
-					jQuery("#value_unit").keyup(function(event) {
-						console.log(event.which);		// discard event tag and arrows
-						if (event.which != 9 && (event.which < 37 || event.which > 40) && jQuery("#value_unit").val() != "") {
-							jQuery("#value_unit_ht").val("");
-						}
-					});
+			/* JQuery for product free or predefined select */
+			jQuery(document).ready(function() {
+				jQuery("#value_unit_ht").keyup(function(event) {
+					console.log(event.which);		// discard event tag and arrows
+					if (event.which != 9 && (event.which < 37 ||event.which > 40) && jQuery("#value_unit_ht").val() != "") {
+						jQuery("#value_unit").val("");
+					}
 				});
+				jQuery("#value_unit").keyup(function(event) {
+					console.log(event.which);		// discard event tag and arrows
+					if (event.which != 9 && (event.which < 37 || event.which > 40) && jQuery("#value_unit").val() != "") {
+						jQuery("#value_unit_ht").val("");
+					}
+				});
+			});
 
-				</script>';
+			</script>';
 
-				print '</form>';
+			print '</form>';
 
-				print dol_get_fiche_end();
+			print dol_get_fiche_end();
 		}
 	} else {
 		dol_print_error($db);

From f8eadf6fe1755ff3f8063a260b6bdd34897392c1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 5 Jul 2021 22:26:38 +0200
Subject: [PATCH 1029/1497] Fix #yogosha6561

---
 htdocs/core/lib/functions.lib.php | 29 +++++++++++++++++++----------
 test/phpunit/SecurityTest.php     |  4 ++--
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index f10b430ddbd..663158e1ef3 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1029,10 +1029,11 @@ function dol_size($size, $type = '')
 
 
 /**
- *	Clean a string to use it as a file name
+ *	Clean a string to use it as a file name.
+ *  Replace also '--' and ' -' strings, they are used for parameters separation.
  *
  *	@param	string	$str            String to clean
- * 	@param	string	$newstr			String to replace bad chars with
+ * 	@param	string	$newstr			String to replace bad chars with.
  *  @param	int	    $unaccent		1=Remove also accent (default), 0 do not remove them
  *	@return string          		String cleaned (a-zA-Z_)
  *
@@ -1044,8 +1045,11 @@ function dol_sanitizeFileName($str, $newstr = '_', $unaccent = 1)
 	// Char '>' '<' '|' '$' and ';' are special chars for shells.
 	// Char '/' and '\' are file delimiters.
 	// -- car can be used into filename to inject special paramaters like --use-compress-program to make command with file as parameter making remote execution of command
-	$filesystem_forbidden_chars = array('<', '>', '/', '\\', '?', '*', '|', '"', ':', '°', '$', ';', '--');
-	return dol_string_nospecial($unaccent ? dol_string_unaccent($str) : $str, $newstr, $filesystem_forbidden_chars);
+	$filesystem_forbidden_chars = array('<', '>', '/', '\\', '?', '*', '|', '"', ':', '°', '$', ';');
+	$tmp = dol_string_nospecial($unaccent ? dol_string_unaccent($str) : $str, $newstr, $filesystem_forbidden_chars);
+	$tmp = preg_replace('/\-\-+/', '_', $tmp);
+	$tmp = preg_replace('/\s+\-/', ' _', $tmp);
+	return $tmp;
 }
 
 /**
@@ -1157,21 +1161,26 @@ function dol_string_unaccent($str)
  *	Clean a string from all punctuation characters to use it as a ref or login.
  *  This is a more complete function than dol_sanitizeFileName.
  *
- *	@param	string	$str            	String to clean
- * 	@param	string	$newstr				String to replace forbidden chars with
- *  @param  array	$badcharstoreplace  List of forbidden characters
- * 	@return string          			Cleaned string
+ *	@param	string			$str            	String to clean
+ * 	@param	string			$newstr				String to replace forbidden chars with
+ *  @param  array|string	$badcharstoreplace  List of forbidden characters to replace
+ *  @param  array|string	$badcharstoremove   List of forbidden characters to remove
+ * 	@return string          					Cleaned string
  *
  * 	@see    		dol_sanitizeFilename(), dol_string_unaccent(), dol_string_nounprintableascii()
  */
-function dol_string_nospecial($str, $newstr = '_', $badcharstoreplace = '')
+function dol_string_nospecial($str, $newstr = '_', $badcharstoreplace = '', $badcharstoremove = '')
 {
 	$forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ",", ";", "=", '°'); // more complete than dol_sanitizeFileName
 	$forbidden_chars_to_remove = array();
+	//$forbidden_chars_to_remove=array("(",")");
+
 	if (is_array($badcharstoreplace)) {
 		$forbidden_chars_to_replace = $badcharstoreplace;
 	}
-	//$forbidden_chars_to_remove=array("(",")");
+	if (is_array($badcharstoremove)) {
+		$forbidden_chars_to_remove = $badcharstoremove;
+	}
 
 	return str_replace($forbidden_chars_to_replace, $newstr, str_replace($forbidden_chars_to_remove, "", $str));
 }
diff --git a/test/phpunit/SecurityTest.php b/test/phpunit/SecurityTest.php
index 63c52ac60c5..5111b5bd13a 100644
--- a/test/phpunit/SecurityTest.php
+++ b/test/phpunit/SecurityTest.php
@@ -798,8 +798,8 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 		$result=dol_sanitizeFileName('bad file | evilaction');
 		$this->assertEquals('bad file _ evilaction', $result);
 
-		$result=dol_sanitizeFileName('bad file --evilparam');
-		$this->assertEquals('bad file _evilparam', $result);
+		$result=dol_sanitizeFileName('bad file -evilparam --evilparam ---evilparam ----evilparam');
+		$this->assertEquals('bad file_evilparam _evilparam _evilparam _evilparam', $result);
 	}
 
 	/**

From 185ed5ceeb669b0598dd9b5504663e941192abe4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 5 Jul 2021 22:52:37 +0200
Subject: [PATCH 1030/1497] Code comment

---
 htdocs/includes/odtphp/odf.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/htdocs/includes/odtphp/odf.php b/htdocs/includes/odtphp/odf.php
index 91fec8d998e..b780b550b6d 100644
--- a/htdocs/includes/odtphp/odf.php
+++ b/htdocs/includes/odtphp/odf.php
@@ -881,6 +881,11 @@ IMG;
 		//$command = DOL_DOCUMENT_ROOT.'/includes/odtphp/odt2pdf.sh '.$name.' '.$dirname;
 
 		dol_syslog(get_class($this).'::exportAsAttachedPDF $execmethod='.$execmethod.' Run command='.$command,LOG_DEBUG);
+		// TODO Use:
+		// $outputfile = DOL_DATA_ROOT.'/odt2pdf.log';
+		// $result = $utils->executeCLI($command, $outputfile);  and replace test on $execmethod.
+		// $retval will be $result['result']
+		// $errorstring will be $result['output']
 		$retval=0; $output_arr=array();
 		if ($execmethod == 1)
 		{
@@ -909,8 +914,7 @@ IMG;
 			if (! empty($conf->global->MAIN_UMASK)) @chmod($outputfile, octdec($conf->global->MAIN_UMASK));
 		}
 
-		if ($retval == 0)
-		{
+		if ($retval == 0) {
 			dol_syslog(get_class($this).'::exportAsAttachedPDF $ret_val='.$retval, LOG_DEBUG);
 			$filename=''; $linenum=0;
 
@@ -927,8 +931,7 @@ IMG;
 				}
 			}
 
-			if (!empty($conf->global->MAIN_ODT_AS_PDF_DEL_SOURCE))
-			{
+			if (!empty($conf->global->MAIN_ODT_AS_PDF_DEL_SOURCE)) {
 				unlink($name);
 			}
 		} else {

From df1d1209f4cf382726c784b6e93e9b9bb23ec7d1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 5 Jul 2021 22:57:27 +0200
Subject: [PATCH 1031/1497] Fix phpunit

---
 test/phpunit/SecurityTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/phpunit/SecurityTest.php b/test/phpunit/SecurityTest.php
index 5111b5bd13a..16cc8438c91 100644
--- a/test/phpunit/SecurityTest.php
+++ b/test/phpunit/SecurityTest.php
@@ -799,7 +799,7 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 		$this->assertEquals('bad file _ evilaction', $result);
 
 		$result=dol_sanitizeFileName('bad file -evilparam --evilparam ---evilparam ----evilparam');
-		$this->assertEquals('bad file_evilparam _evilparam _evilparam _evilparam', $result);
+		$this->assertEquals('bad file _evilparam _evilparam _evilparam _evilparam', $result);
 	}
 
 	/**

From 0b7b9aae79a5f57f42cdf973ee6eef7d94e0c3b3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 5 Jul 2021 23:07:56 +0200
Subject: [PATCH 1032/1497] Merge branch '14.0' of
 git@github.com:Dolibarr/dolibarr.git into develop

---
 htdocs/includes/odtphp/odf.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/htdocs/includes/odtphp/odf.php b/htdocs/includes/odtphp/odf.php
index d4a21a22314..a66e337aa98 100644
--- a/htdocs/includes/odtphp/odf.php
+++ b/htdocs/includes/odtphp/odf.php
@@ -2,6 +2,9 @@
 
 require 'Segment.php';
 
+/**
+ * Class of ODT Exception
+ */
 class OdfException extends Exception
 {
 }
@@ -148,7 +151,7 @@ class Odf
 
 	/**
 	 * Replaces html tags in odt tags and returns a compatible string
-	 * @param string   $key        Name of the variable within the template
+	 *
 	 * @param string   $value      Replacement value
 	 * @param bool     $encode     If true, special XML characters are encoded
 	 * @param string   $charset    Charset
@@ -395,6 +398,7 @@ class Odf
 	 * Function to convert a HTML string into an ODT string
 	 *
 	 * @param	string	$value	String to convert
+	 * @return	string			String converted
 	 */
 	public function htmlToUTFAndPreOdf($value)
 	{
@@ -427,6 +431,7 @@ class Odf
 	 * Function to convert a HTML string into an ODT string
 	 *
 	 * @param	string	$value	String to convert
+	 * @return	string			String converted
 	 */
 	public function preOdfToOdf($value)
 	{
@@ -564,9 +569,9 @@ IMG;
 					dol_syslog("We found a IF and it was processed");
 					//var_dump($sav);exit;
 				}*/
-			}
-			// Else the value is false, then two cases: no ELSE and we're done, or there is at least one place where there is an ELSE clause, then we replace it
-			else {
+			} else {
+				// Else the value is false, then two cases: no ELSE and we're done, or there is at least one place where there is an ELSE clause, then we replace it
+
 				//dol_syslog("Var ".$key." is not defined, we remove the IF, ELSE and ENDIF ");
 				//$sav=$this->contentXml;
 				// Find all conditional blocks for this variable: from IF to ELSE and to ENDIF

From 0dfa7bdbcc93704333576aa5e634301be74976d0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 6 Jul 2021 00:47:43 +0200
Subject: [PATCH 1033/1497] Add option MAIN_RESTRICTHTML_ONLY_VALID_HTML

---
 htdocs/core/lib/functions.lib.php | 17 ++++++++++++++---
 test/phpunit/SecurityTest.php     | 26 +++++++++++++++++++++++++-
 2 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 663158e1ef3..c622ebf1aba 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -778,6 +778,16 @@ function checkVal($out = '', $check = 'alphanohtml', $filter = null, $options =
 			do {
 				$oldstringtoclean = $out;
 
+				if (!empty($conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML)) {
+					$dom = new DOMDocument;
+					try {
+						$dom->loadHTML($out, LIBXML_ERR_NONE|LIBXML_HTML_NOIMPLIED|LIBXML_HTML_NODEFDTD|LIBXML_NONET|LIBXML_NOWARNING|LIBXML_NOXMLDECL);
+					} catch(Exception $e) {
+						return 'InvalidHTMLString';
+					}
+					$out = $dom->saveHTML();
+				}
+
 				// Ckeditor use the numeric entitic for apostrophe so we force it to text entity (all other special chars are correctly
 				// encoded using text entities). This is a fix for CKeditor.
 				$out = preg_replace('/&#39;/i', '&apos;', $out);
@@ -794,7 +804,8 @@ function checkVal($out = '', $check = 'alphanohtml', $filter = null, $options =
 
 				// We should also exclude non expected attributes
 				if (!empty($conf->global->MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES)) {
-					$out = dol_string_onlythesehtmlattributes($out);
+					// Warning, the function may add a LF so we are forced to trim to compare with old $out without having always a difference and an infinit loop.
+					$out = trim(dol_string_onlythesehtmlattributes($out));
 				}
 			} while ($oldstringtoclean != $out);
 			break;
@@ -6311,7 +6322,7 @@ function dol_string_onlythesehtmltags($stringtoclean, $cleanalsosomestyles = 1,
 	$stringtoclean = preg_replace('/&#58;|&#0+58|&#x3A/i', '', $stringtoclean); // refused string ':' encoded (no reason to have a : encoded like this) to disable 'javascript:...'
 	$stringtoclean = preg_replace('/javascript\s*:/i', '', $stringtoclean);
 
-	$temp = strip_tags($stringtoclean, $allowed_tags_string);
+	$temp = strip_tags($stringtoclean, $allowed_tags_string);	// Warning: This remove also undesired </> changing string obfuscated with </> that pass injection detection into harmfull string
 
 	if ($cleanalsosomestyles) {	// Clean for remaining html tags
 		$temp = preg_replace('/position\s*:\s*(absolute|fixed)\s*!\s*important/i', '', $temp); // Note: If hacker try to introduce css comment into string to bypass this regex, the string must also be encoded by the dol_htmlentitiesbr during output so it become harmless
@@ -6361,8 +6372,8 @@ function dol_string_onlythesehtmlattributes($stringtoclean, $allowed_attributes
 		}
 
 		$return = $dom->saveHTML();
-
 		//$return = '<html><body>aaaa</p>bb<p>ssdd</p>'."\n<p>aaa</p>aa<p>bb</p>";
+
 		$return = preg_replace('/^<html><body>/', '', $return);
 		$return = preg_replace('/<\/body><\/html>$/', '', $return);
 		return $return;
diff --git a/test/phpunit/SecurityTest.php b/test/phpunit/SecurityTest.php
index 16cc8438c91..8e99a03021e 100644
--- a/test/phpunit/SecurityTest.php
+++ b/test/phpunit/SecurityTest.php
@@ -363,6 +363,7 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 		$_POST["param13"]='&#110; &#x6E; &gt; &lt; &quot; <a href=\"j&#x61;vascript:alert(document.domain)\">XSS</a>';
 		$_POST["param13b"]='&#110; &#x6E; &gt; &lt; &quot; <a href=\"j&#x61vascript:alert(document.domain)\">XSS</a>';
 		$_POST["param14"]="Text with ' encoded with the numeric html entity converted into text entity &#39; (like when submited by CKEditor)";
+		$_POST["param15"]="<img onerror<=alert(document.domain)> src=>0xbeefed";
 		//$_POST["param13"]='javascript%26colon%26%23x3B%3Balert(1)';
 		//$_POST["param14"]='javascripT&javascript#x3a alert(1)';
 
@@ -480,7 +481,7 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 		// Test with restricthtml we must remove html open/close tag and content but not htmlentities (we can decode html entities for ascii chars like &#110;)
 
 		$result=GETPOST("param6", 'restricthtml');
-		print __METHOD__." result=".$result."\n";
+		print __METHOD__." result param6=".$result."\n";
 		$this->assertEquals('&quot;&gt;', $result);
 
 		$result=GETPOST("param7", 'restricthtml');
@@ -503,6 +504,29 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals("Text with ' encoded with the numeric html entity converted into text entity &apos; (like when submited by CKEditor)", $result, 'Test 14');
 
+		$result=GETPOST("param15", 'restricthtml');		// <img onerror<=alert(document.domain)> src=>0xbeefed
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals("<img onerror=alert(document.domain) src=>0xbeefed", $result, 'Test 15a');	// The GETPOST return a harmull string
+
+		// Test with restricthtml + MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES to test disabling of bad atrributes
+		$conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML = 1;
+
+		$result=GETPOST("param15", 'restricthtml');
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('InvalidHTMLString', $result, 'Test 15b');
+
+		unset($conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML);
+
+		// Test with restricthtml + MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES to test disabling of bad atrributes
+		$conf->global->MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES = 1;
+
+		$result=GETPOST("param15", 'restricthtml');
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('<img src="">0xbeefed', $result, 'Test 15b');
+
+		unset($conf->global->MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES);
+
+
 		// Special test for GETPOST of backtopage, backtolist or backtourl parameter
 
 		$_POST["backtopage"]='//www.google.com';

From 3dff7e29cc28140db07a67d284e5899b2fac8772 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 6 Jul 2021 01:44:05 +0200
Subject: [PATCH 1034/1497] Fix #yogosha6567

---
 htdocs/comm/mailing/card.php                |  3 +--
 htdocs/comm/mailing/class/mailing.class.php | 12 ++++++++++++
 htdocs/core/lib/functions.lib.php           |  7 +++++--
 test/phpunit/SecurityTest.php               |  4 ++++
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index d801b4429c7..e03d13c29e8 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -577,7 +577,6 @@ if (empty($reshook)) {
 
 		if (!$isupload) {
 			$mesgs = array();
-
 			$object->sujet          = (string) GETPOST("sujet");
 			$object->body           = (string) GETPOST("bodyemail", 'restricthtml');
 			$object->bgcolor        = (string) GETPOST("bgcolor");
@@ -744,7 +743,7 @@ if ($action == 'create') {
 	print '<div style="padding-top: 10px">';
 	// wysiwyg editor
 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-	$doleditor = new DolEditor('bodyemail', GETPOST('bodyemail', 'restricthtml'), '', 600, 'dolibarr_mailings', '', true, true, $conf->global->FCKEDITOR_ENABLE_MAILING, 20, '90%');
+	$doleditor = new DolEditor('bodyemail', GETPOST('bodyemail', 'restricthtmlallowunvalid'), '', 600, 'dolibarr_mailings', '', true, true, $conf->global->FCKEDITOR_ENABLE_MAILING, 20, '90%');
 	$doleditor->Create();
 	print '</div>';
 
diff --git a/htdocs/comm/mailing/class/mailing.class.php b/htdocs/comm/mailing/class/mailing.class.php
index 04d2f7c17d8..d281fcb1a3a 100644
--- a/htdocs/comm/mailing/class/mailing.class.php
+++ b/htdocs/comm/mailing/class/mailing.class.php
@@ -208,6 +208,12 @@ class Mailing extends CommonObject
 	{
 		global $conf, $langs;
 
+		// Check properties
+		if ($this->body === 'InvalidHTMLString') {
+			$this->error = 'InvalidHTMLString';
+			return -1;
+		}
+
 		$this->db->begin();
 
 		$this->title = trim($this->title);
@@ -257,6 +263,12 @@ class Mailing extends CommonObject
 	 */
 	public function update($user)
 	{
+		// Check properties
+		if ($this->body === 'InvalidHTMLString') {
+			$this->error = 'InvalidHTMLString';
+			return -1;
+		}
+
 		$sql = "UPDATE ".MAIN_DB_PREFIX."mailing ";
 		$sql .= " SET titre = '".$this->db->escape($this->title)."'";
 		$sql .= ", sujet = '".$this->db->escape($this->sujet)."'";
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index c622ebf1aba..93a33e5bd5f 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -775,18 +775,21 @@ function checkVal($out = '', $check = 'alphanohtml', $filter = null, $options =
 			}
 			break;
 		case 'restricthtml':		// Recommended for most html textarea
+		case 'restricthtmlallowunvalid':
 			do {
 				$oldstringtoclean = $out;
 
-				if (!empty($conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML)) {
-					$dom = new DOMDocument;
+				if (!empty($conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML) && $check != 'restricthtmlallowunvalid') {
 					try {
+						$dom = new DOMDocument;
 						$dom->loadHTML($out, LIBXML_ERR_NONE|LIBXML_HTML_NOIMPLIED|LIBXML_HTML_NODEFDTD|LIBXML_NONET|LIBXML_NOWARNING|LIBXML_NOXMLDECL);
 					} catch(Exception $e) {
+						//print $e->getMessage();
 						return 'InvalidHTMLString';
 					}
 					$out = $dom->saveHTML();
 				}
+				//var_dump($oldstringtoclean);var_dump($out);
 
 				// Ckeditor use the numeric entitic for apostrophe so we force it to text entity (all other special chars are correctly
 				// encoded using text entities). This is a fix for CKeditor.
diff --git a/test/phpunit/SecurityTest.php b/test/phpunit/SecurityTest.php
index 8e99a03021e..44b391148f5 100644
--- a/test/phpunit/SecurityTest.php
+++ b/test/phpunit/SecurityTest.php
@@ -340,6 +340,10 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
+		// Force default mode
+		$conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML = 0;
+		$conf->global->MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES = 0;
+
 		$_COOKIE["id"]=111;
 		$_GET["param1"]="222";
 		$_POST["param1"]="333";

From 6e24ee48d4564991dfef8f31ac7ddd877e84af64 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 6 Jul 2021 02:07:58 +0200
Subject: [PATCH 1035/1497] Debug security page

---
 htdocs/admin/system/security.php | 107 ++++++++++++++++++-------------
 htdocs/langs/en_US/admin.lang    |   3 +-
 2 files changed, 66 insertions(+), 44 deletions(-)

diff --git a/htdocs/admin/system/security.php b/htdocs/admin/system/security.php
index 0b2f2678521..c4140cfe416 100644
--- a/htdocs/admin/system/security.php
+++ b/htdocs/admin/system/security.php
@@ -251,7 +251,7 @@ print '<br>';
 if (empty($conf->global->SECURITY_DISABLE_TEST_ON_OBFUSCATED_CONF)) {
 	print '<strong>$dolibarr_main_db_pass</strong>: ';
 	if (!empty($dolibarr_main_db_pass) && empty($dolibarr_main_db_encrypted_pass)) {
-		print img_picto('', 'warning').' '.$langs->trans("DatabasePasswordNotObfuscated").' &nbsp; <span class="opacitymedium">('.$langs->trans("Recommanded").': '.$langs->trans("SetOptionTo", $langs->transnoentitiesnoconv("MainDbPasswordFileConfEncrypted"), yn(1)).')</span>';
+		print img_picto('', 'warning').' '.$langs->trans("DatabasePasswordNotObfuscated").' &nbsp; <span class="opacitymedium">('.$langs->trans("Recommended").': '.$langs->trans("SetOptionTo", $langs->transnoentitiesnoconv("MainDbPasswordFileConfEncrypted"), yn(1)).')</span>';
 		//print ' <span class="opacitymedium">('.$langs->trans("RecommendedValueIs", $langs->transnoentitiesnoconv("IPsOfUsers")).')</span>';
 	} else {
 		print img_picto('', 'tick').' '.$langs->trans("DatabasePasswordObfuscated");
@@ -267,49 +267,14 @@ if (empty($conf->global->SECURITY_DISABLE_TEST_ON_OBFUSCATED_CONF)) {
 print '<br>';
 print '<br>';
 print '<br>';
-print load_fiche_titre($langs->trans("Menu").' '.$langs->trans("SecuritySetup").' + '.$langs->trans("OtherSetup"), '', 'folder');
 
-//print '<strong>'.$langs->trans("PasswordEncryption").'</strong>: ';
-print '<strong>MAIN_SECURITY_HASH_ALGO</strong> = '.(empty($conf->global->MAIN_SECURITY_HASH_ALGO) ? '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>' : $conf->global->MAIN_SECURITY_HASH_ALGO)." &nbsp; ";
-if (empty($conf->global->MAIN_SECURITY_HASH_ALGO)) {
-	print '<span class="opacitymedium"> &nbsp; &nbsp; If unset: \'md5\'</span>';
-}
-if ($conf->global->MAIN_SECURITY_HASH_ALGO != 'password_hash') {
-	print '<br><strong>MAIN_SECURITY_SALT</strong> = '.(empty($conf->global->MAIN_SECURITY_SALT) ? '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>' : $conf->global->MAIN_SECURITY_SALT).'<br>';
-} else {
-	print '<span class="opacitymedium">('.$langs->trans("Recommanded").': password_hash)</span>';
-	print '<br>';
-}
-if ($conf->global->MAIN_SECURITY_HASH_ALGO != 'password_hash') {
-	print '<div class="info">The recommanded value for MAIN_SECURITY_HASH_ALGO is now \'password_hash\' but setting it now will make ALL existing passwords of all users not valid, so update is not possible.<br>';
-	print 'If you really want to switch, you must:<br>';
-	print '- Go on home - setup - other and add constant MAIN_SECURITY_HASH_ALGO to value \'password_hash\'<br>';
-	print '- In same session, WITHOUT LOGGING OUT, go into your admin user record and set a new password<br>';
-	print '- You can now logout and login with this new password. You must now reset password of all other users.<br>';
-	print '</div><br>';
-}
+print load_fiche_titre($langs->trans("Menu").' '.$langs->trans("SecuritySetup"), '', 'folder');
+
+
+print '<strong>'.$langs->trans("UseCaptchaCode").'</strong>: ';
+print empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA) ? '' : img_picto('', 'tick').' ';
+print yn(empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA) ? 0 : 1);
 print '<br>';
-
-
-print '<strong>MAIN_SECURITY_ANTI_SSRF_SERVER_IP</strong> = '.(empty($conf->global->MAIN_SECURITY_ANTI_SSRF_SERVER_IP) ? '<span class="opacitymedium">'.$langs->trans("Undefined").'</span> &nbsp; <span class="opacitymedium">('.$langs->trans("Example").': static-ips-of-server - '.$langs->trans("Note").': common loopback ip like 127.*.*.*, [::1] are already added)</span>' : $conf->global->MAIN_SECURITY_ANTI_SSRF_SERVER_IP)."<br>";
-print '<br>';
-
-print '<strong>MAIN_ALLOW_SVG_FILES_AS_IMAGES</strong> = '.(empty($conf->global->MAIN_ALLOW_SVG_FILES_AS_IMAGES) ? '0 &nbsp; <span class="opacitymedium">('.$langs->trans("Recommanded").': 0)</span>' : $conf->global->MAIN_ALLOW_SVG_FILES_AS_IMAGES)."<br>";
-print '<br>';
-
-print '<strong>MAIN_EXEC_USE_POPEN</strong> = ';
-if (empty($conf->global->MAIN_EXEC_USE_POPEN)) {
-	print '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>';
-} else {
-	print $conf->global->MAIN_EXEC_USE_POPEN;
-}
-if ($execmethod == 1) {
-	print ' &nbsp; <span class="opacitymedium">("exec" PHP method will be used for shell commands)</span>';
-}
-if ($execmethod == 2) {
-	print ' &nbsp; <span class="opacitymedium">("popen" PHP method will be used for shell commands)</span>';
-}
-print "<br>";
 print '<br>';
 
 
@@ -354,6 +319,62 @@ if (empty($out)) {
 }
 
 print '<br>';
+print '<br>';
+print '<br>';
+print '<br>';
+
+
+print load_fiche_titre($langs->trans("OtherSetup").' ('.$langs->trans("Experimental").')', '', 'folder');
+
+
+//print '<strong>'.$langs->trans("PasswordEncryption").'</strong>: ';
+print '<strong>MAIN_SECURITY_HASH_ALGO</strong> = '.(empty($conf->global->MAIN_SECURITY_HASH_ALGO) ? '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>' : $conf->global->MAIN_SECURITY_HASH_ALGO)." &nbsp; ";
+if (empty($conf->global->MAIN_SECURITY_HASH_ALGO)) {
+	print '<span class="opacitymedium"> &nbsp; &nbsp; If unset: \'md5\'</span>';
+}
+if ($conf->global->MAIN_SECURITY_HASH_ALGO != 'password_hash') {
+	print '<br><strong>MAIN_SECURITY_SALT</strong> = '.(empty($conf->global->MAIN_SECURITY_SALT) ? '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>' : $conf->global->MAIN_SECURITY_SALT).'<br>';
+} else {
+	print '<span class="opacitymedium">('.$langs->trans("Recommanded").': password_hash)</span>';
+	print '<br>';
+}
+if ($conf->global->MAIN_SECURITY_HASH_ALGO != 'password_hash') {
+	print '<div class="info">The recommanded value for MAIN_SECURITY_HASH_ALGO is now \'password_hash\' but setting it now will make ALL existing passwords of all users not valid, so update is not possible.<br>';
+	print 'If you really want to switch, you must:<br>';
+	print '- Go on home - setup - other and add constant MAIN_SECURITY_HASH_ALGO to value \'password_hash\'<br>';
+	print '- In same session, WITHOUT LOGGING OUT, go into your admin user record and set a new password<br>';
+	print '- You can now logout and login with this new password. You must now reset password of all other users.<br>';
+	print '</div><br>';
+}
+print '<br>';
+
+print '<strong>MAIN_SECURITY_ANTI_SSRF_SERVER_IP</strong> = '.(empty($conf->global->MAIN_SECURITY_ANTI_SSRF_SERVER_IP) ? '<span class="opacitymedium">'.$langs->trans("Undefined").'</span> &nbsp; <span class="opacitymedium">('.$langs->trans("Example").': static-ips-of-server - '.$langs->trans("Note").': common loopback ip like 127.*.*.*, [::1] are already added)</span>' : $conf->global->MAIN_SECURITY_ANTI_SSRF_SERVER_IP)."<br>";
+print '<br>';
+
+print '<strong>MAIN_ALLOW_SVG_FILES_AS_IMAGES</strong> = '.(empty($conf->global->MAIN_ALLOW_SVG_FILES_AS_IMAGES) ? '0 &nbsp; <span class="opacitymedium">('.$langs->trans("Recommanded").': 0)</span>' : $conf->global->MAIN_ALLOW_SVG_FILES_AS_IMAGES)."<br>";
+print '<br>';
+
+print '<strong>MAIN_RESTRICTHTML_ONLY_VALID_HTML</strong> = '.(empty($conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML) ? '<span class="opacitymedium">'.$langs->trans("Undefined").' &nbsp; ('.$langs->trans("Recommanded").': 1)</span>' : '')."<br>";
+print '<br>';
+
+print '<strong>MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES</strong> = '.(empty($conf->global->MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES) ? '<span class="opacitymedium">'.$langs->trans("Undefined").' &nbsp; ('.$langs->trans("Recommanded").': 1)</span>' : '')."<br>";
+print '<br>';
+
+print '<strong>MAIN_EXEC_USE_POPEN</strong> = ';
+if (empty($conf->global->MAIN_EXEC_USE_POPEN)) {
+	print '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>';
+} else {
+	print $conf->global->MAIN_EXEC_USE_POPEN;
+}
+if ($execmethod == 1) {
+	print ' &nbsp; <span class="opacitymedium">("exec" PHP method will be used for shell commands)</span>';
+}
+if ($execmethod == 2) {
+	print ' &nbsp; <span class="opacitymedium">("popen" PHP method will be used for shell commands)</span>';
+}
+print "<br>";
+print '<br>';
+
 
 
 // Modules/Applications
@@ -405,7 +426,7 @@ if (empty($conf->api->enabled) && empty($conf->webservices->enabled)) {
 		print '<br>';
 	}
 	if (!empty($conf->api->enabled)) {
-		print '<strong>API_ENDPOINT_RULES</strong> = '.(empty($conf->global->API_ENDPOINT_RULES) ? '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>' : $conf->global->API_ENDPOINT_RULES)."<br>\n";
+		print '<strong>API_ENDPOINT_RULES</strong> = '.(empty($conf->global->API_ENDPOINT_RULES) ? '<span class="opacitymedium">'.$langs->trans("Undefined").' &nbsp; ('.$langs->trans("Example").': endpoint1:1,endpoint2:1,...)</span>' : $conf->global->API_ENDPOINT_RULES)."<br>\n";
 		print '<br>';
 	}
 }
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 0e357e27577..0c15369a0a9 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -2134,7 +2134,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
-NotRecommended=Not recommanded
+Recommended=Recommended
+NotRecommended=Not recommended
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.

From 407ad4d84d10df206bd8bdf8865c7bb7c4ff93ea Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 6 Jul 2021 02:15:52 +0200
Subject: [PATCH 1036/1497] Fix bad value

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

diff --git a/htdocs/admin/system/security.php b/htdocs/admin/system/security.php
index c4140cfe416..032a23a68c8 100644
--- a/htdocs/admin/system/security.php
+++ b/htdocs/admin/system/security.php
@@ -354,10 +354,10 @@ print '<br>';
 print '<strong>MAIN_ALLOW_SVG_FILES_AS_IMAGES</strong> = '.(empty($conf->global->MAIN_ALLOW_SVG_FILES_AS_IMAGES) ? '0 &nbsp; <span class="opacitymedium">('.$langs->trans("Recommanded").': 0)</span>' : $conf->global->MAIN_ALLOW_SVG_FILES_AS_IMAGES)."<br>";
 print '<br>';
 
-print '<strong>MAIN_RESTRICTHTML_ONLY_VALID_HTML</strong> = '.(empty($conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML) ? '<span class="opacitymedium">'.$langs->trans("Undefined").' &nbsp; ('.$langs->trans("Recommanded").': 1)</span>' : '')."<br>";
+print '<strong>MAIN_RESTRICTHTML_ONLY_VALID_HTML</strong> = '.(empty($conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML) ? '<span class="opacitymedium">'.$langs->trans("Undefined").' &nbsp; ('.$langs->trans("Recommanded").': 1)</span>' : $conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML)."<br>";
 print '<br>';
 
-print '<strong>MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES</strong> = '.(empty($conf->global->MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES) ? '<span class="opacitymedium">'.$langs->trans("Undefined").' &nbsp; ('.$langs->trans("Recommanded").': 1)</span>' : '')."<br>";
+print '<strong>MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES</strong> = '.(empty($conf->global->MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES) ? '<span class="opacitymedium">'.$langs->trans("Undefined").' &nbsp; ('.$langs->trans("Recommanded").': 1)</span>' : $conf->global->MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES)."<br>";
 print '<br>';
 
 print '<strong>MAIN_EXEC_USE_POPEN</strong> = ';

From 61ed899608da89c79fe03536a626a8219bf24c81 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 6 Jul 2021 03:53:42 +0200
Subject: [PATCH 1037/1497] Fix set discount on line in TakePos

---
 htdocs/core/lib/functions.lib.php |  2 +-
 htdocs/takepos/index.php          |  1 +
 htdocs/takepos/invoice.php        | 62 ++++++++++++++++++++++---------
 3 files changed, 46 insertions(+), 19 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 93a33e5bd5f..5118392da9a 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -5497,7 +5497,7 @@ function get_localtax($vatrate, $local, $thirdparty_buyer = "", $thirdparty_sell
 	} else {
 		$sql .= " AND t.recuperableonly = '".$db->escape($vatnpr)."'";
 	}
-	dol_syslog("get_localtax", LOG_DEBUG);
+
 	$resql = $db->query($sql);
 
 	if ($resql) {
diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index b182f37f787..7e2a2d5c1e1 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -72,6 +72,7 @@ if ($setterminal > 0) {
 
 if ($setcurrency != "") {
 	$_SESSION["takeposcustomercurrency"] = $setcurrency;
+	// We will recalculate amount for foreign currency at next call of invoice.php when $_SESSION["takeposcustomercurrency"] differs from invoice->multicurrency_code.
 }
 
 $_SESSION["urlfrom"] = '/takepos/index.php';
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index 3f7e63d84cb..3246b24cc5c 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -163,6 +163,14 @@ if ($invoice->socid > 0) {
  * Actions
  */
 
+// Change the currency of invoice if it was modified
+if (!empty($conf->multicurrency->enabled) && $_SESSION["takeposcustomercurrency"] != "") {
+	if ($invoice->multicurrency_code != $_SESSION["takeposcustomercurrency"]) {
+		$invoice->setMulticurrencyCode($_SESSION["takeposcustomercurrency"]);
+	}
+}
+
+
 // Action to record a payment on a TakePOS invoice
 if ($action == 'valid' && $user->rights->facture->creer) {
 	$bankaccount = 0;
@@ -311,7 +319,7 @@ if ($action == 'valid' && $user->rights->facture->creer) {
 	}
 }
 
-if ($action == 'creditnote') {
+if ($action == 'creditnote' && $user->rights->facture->creer) {
 	$creditnote = new Facture($db);
 	$creditnote->socid = $invoice->socid;
 	$creditnote->date = dol_now();
@@ -459,10 +467,6 @@ if ($action == 'history' || $action == 'creditnote') {
 	$invoice->fetch($placeid);
 }
 
-if (!empty($conf->multicurrency->enabled) && $_SESSION["takeposcustomercurrency"] != "") {
-	$invoice->setMulticurrencyCode($_SESSION["takeposcustomercurrency"]);
-}
-
 if (($action == "addline" || $action == "freezone") && $placeid == 0) {
 	$invoice->socid = $conf->global->$constforcompanyid;
 	$invoice->date = dol_now();
@@ -631,8 +635,11 @@ if ($action == "delete") {
 if ($action == "updateqty") {
 	foreach ($invoice->lines as $line) {
 		if ($line->id == $idline) {
-			if (!$user->rights->takepos->editlines || (!$user->rights->takepos->editorderedlines && $line->special_code == "4")) dol_htmloutput_errors($langs->trans("NotEnoughPermissions", "TakePos"), null, 1);
-			else $result = $invoice->updateline($line->id, $line->desc, $line->subprice, $number, $line->remise_percent, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit);
+			if (!$user->rights->takepos->editlines || (!$user->rights->takepos->editorderedlines && $line->special_code == "4")) {
+				dol_htmloutput_errors($langs->trans("NotEnoughPermissions", "TakePos"), null, 1);
+			} else {
+				$result = $invoice->updateline($line->id, $line->desc, $line->subprice, $number, $line->remise_percent, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit);
+			}
 		}
 	}
 
@@ -640,12 +647,13 @@ if ($action == "updateqty") {
 }
 
 if ($action == "updateprice") {
+	$customer = new Societe($db);
+	$customer->fetch($invoice->socid);
+
 	foreach ($invoice->lines as $line) {
 		if ($line->id == $idline) {
 			$prod = new Product($db);
 			$prod->fetch($line->fk_product);
-			$customer = new Societe($db);
-			$customer->fetch($invoice->socid);
 			$datapriceofproduct = $prod->getSellPrice($mysoc, $customer, 0);
 			$price_min = $datapriceofproduct['price_min'];
 			$usercanproductignorepricemin = ((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->produit->ignore_price_min_advance)) || empty($conf->global->MAIN_USE_ADVANCED_PERMS));
@@ -654,35 +662,52 @@ if ($action == "updateprice") {
 			if ($usercanproductignorepricemin && (!empty($price_min) && (price2num($pu_ht) * (1 - price2num($line->remise_percent) / 100) < price2num($price_min)))) {
 				echo $langs->trans("CantBeLessThanMinPrice");
 			} else {
-				if (!$user->rights->takepos->editlines || (!$user->rights->takepos->editorderedlines && $line->special_code == "4")) dol_htmloutput_errors($langs->trans("NotEnoughPermissions", "TakePos"), null, 1);
-				else $result = $invoice->updateline($line->id, $line->desc, $number, $line->qty, $line->remise_percent, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'TTC', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit);
+				if (empty($user->rights->takepos->editlines) || (empty($user->rights->takepos->editorderedlines) && $line->special_code == "4")) {
+					dol_htmloutput_errors($langs->trans("NotEnoughPermissions", "TakePos"), null, 1);
+				} else {
+					$result = $invoice->updateline($line->id, $line->desc, $number, $line->qty, $line->remise_percent, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'TTC', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit);
+				}
 			}
 		}
 	}
+
+	// Reload data
 	$invoice->fetch($placeid);
 }
 
 if ($action == "updatereduction") {
+	$customer = new Societe($db);
+	$customer->fetch($invoice->socid);
+
 	foreach ($invoice->lines as $line) {
 		if ($line->id == $idline) {
+			dol_syslog("updatereduction Process line ".$line->id.' to apply discount of '.$number.'%');
+
 			$prod = new Product($db);
 			$prod->fetch($line->fk_product);
-			$customer = new Societe($db);
-			$customer->fetch($invoice->socid);
+
 			$datapriceofproduct = $prod->getSellPrice($mysoc, $customer, 0);
 			$price_min = $datapriceofproduct['price_min'];
 			$usercanproductignorepricemin = ((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->produit->ignore_price_min_advance)) || empty($conf->global->MAIN_USE_ADVANCED_PERMS));
-			$pu_ht = price2num($line->multicurrency_subprice / (1 + ($line->tva_tx / 100)), 'MU');
-			//Check min price
-			if ($usercanproductignorepricemin && (!empty($price_min) && (price2num($line->multicurrency_subprice) * (1 - price2num($number) / 100) < price2num($price_min)))) {
+
+			$pu_ht = price2num($line->subprice / (1 + ($line->tva_tx / 100)), 'MU');
+
+			// Check min price
+			if ($usercanproductignorepricemin && (!empty($price_min) && (price2num($line->subprice) * (1 - price2num($number) / 100) < price2num($price_min)))) {
 				echo $langs->trans("CantBeLessThanMinPrice");
 			} else {
-				if (!$user->rights->takepos->editlines || (!$user->rights->takepos->editorderedlines && $line->special_code == "4")) dol_htmloutput_errors($langs->trans("NotEnoughPermissions", "TakePos"), null, 1);
-				else $result = $invoice->updateline($line->id, $line->desc, $line->multicurrency_subprice, $line->qty, $number, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit);
+				if (empty($user->rights->takepos->editlines) || (empty($user->rights->takepos->editorderedlines) && $line->special_code == "4")) {
+					dol_htmloutput_errors($langs->trans("NotEnoughPermissions", "TakePos"), null, 1);
+				} else {
+					$result = $invoice->updateline($line->id, $line->desc, $line->subprice, $line->qty, $number, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit);
+				}
 			}
 		}
 	}
+
+	// Reload data
 	$invoice->fetch($placeid);
+
 } elseif ($action == 'update_reduction_global') {
 	foreach ($invoice->lines as $line) {
 		$result = $invoice->updateline($line->id, $line->desc, $line->subprice, $line->qty, $number, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit);
@@ -709,6 +734,7 @@ if ($action == "order" and $placeid != 0) {
 	$catsprinter1 = explode(';', $conf->global->TAKEPOS_PRINTED_CATEGORIES_1);
 	$catsprinter2 = explode(';', $conf->global->TAKEPOS_PRINTED_CATEGORIES_2);
 	$catsprinter3 = explode(';', $conf->global->TAKEPOS_PRINTED_CATEGORIES_3);
+	$linestoprint = 0;
 	foreach ($invoice->lines as $line) {
 		if ($line->special_code == "4") {
 			continue;

From 555f1c719bd6ea8ef8e700a4b7fdf7cdf7c837c5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 6 Jul 2021 04:29:25 +0200
Subject: [PATCH 1038/1497] Debug v14

---
 htdocs/categories/card.php                      |  3 ++-
 htdocs/core/boxes/box_graph_nb_tickets_type.php | 13 ++-----------
 htdocs/core/lib/functions.lib.php               |  2 +-
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/htdocs/categories/card.php b/htdocs/categories/card.php
index 734f2e89506..141e061ac20 100644
--- a/htdocs/categories/card.php
+++ b/htdocs/categories/card.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2005		Matthieu Valleton	<mv@seeschloss.org>
- * Copyright (C) 2006-2017	Laurent Destailleur	<eldy@users.sourceforge.net>
+ * Copyright (C) 2006-2021	Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2005-2014	Regis Houssin		<regis.houssin@inodbox.com>
  * Copyright (C) 2007		Patrick Raguin		<patrick.raguin@gmail.com>
  * Copyright (C) 2013		Florian Henry		<florian.henry@open-concept.pro>
@@ -257,6 +257,7 @@ if ($user->rights->categorie->creer) {
 
 		// Parent category
 		print '<tr><td>'.$langs->trans("AddIn").'</td><td>';
+		print img_picto($langs->trans("ParentCategory"), 'category', 'class="pictofixedwidth"');
 		print $form->select_all_categories($type, $catorigin, 'parent');
 		print ajax_combobox('parent');
 		print '</td></tr>';
diff --git a/htdocs/core/boxes/box_graph_nb_tickets_type.php b/htdocs/core/boxes/box_graph_nb_tickets_type.php
index 86ea5e2a11c..2da54d84e7a 100644
--- a/htdocs/core/boxes/box_graph_nb_tickets_type.php
+++ b/htdocs/core/boxes/box_graph_nb_tickets_type.php
@@ -69,20 +69,11 @@ class box_graph_nb_tickets_type extends ModeleBoxes
 		global $theme_datacolor, $badgeStatus8;
 
 		require_once DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php";
+		require_once DOL_DOCUMENT_ROOT."/theme/".$conf->theme."/theme_vars.inc.php";
 
 
-		$badgeStatus0 = '#cbd3d3'; // draft
-		$badgeStatus1 = '#bc9526'; // validated
-		$badgeStatus1b = '#bc9526'; // validated
-		$badgeStatus2 = '#9c9c26'; // approved
-		$badgeStatus3 = '#bca52b';
-		$badgeStatus4 = '#25a580'; // Color ok
-		$badgeStatus4b = '#25a580'; // Color ok
-		$badgeStatus5 = '#cad2d2';
-		$badgeStatus6 = '#cad2d2';
-		$badgeStatus7 = '#baa32b';
 		$badgeStatus8 = '#993013';
-		$badgeStatus9 = '#e7f0f0';
+
 		$text = $langs->trans("BoxTicketType");
 		$this->info_box_head = array(
 			'text' => $text,
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 5118392da9a..44e235bea57 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3983,7 +3983,7 @@ function img_edit($titlealt = 'default', $float = 0, $other = '')
  *	@param  string	$other		Add more attributes on img
  *	@return string      		Return tag img
  */
-function img_view($titlealt = 'default', $float = 0, $other = '')
+function img_view($titlealt = 'default', $float = 0, $other = 'class="valignmiddle"')
 {
 	global $langs;
 

From 9a3d2f13a6291cd5d96554e9393b5c8310048b6b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 6 Jul 2021 10:55:23 +0200
Subject: [PATCH 1039/1497] Fix graph per type of expense report

---
 htdocs/expensereport/index.php | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/htdocs/expensereport/index.php b/htdocs/expensereport/index.php
index 8198883e58f..4e01cfe7501 100644
--- a/htdocs/expensereport/index.php
+++ b/htdocs/expensereport/index.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2003		Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2015	Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2021	Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2004		Eric Seigne          <eric.seigne@ryxeo.com>
  * Copyright (C) 2005-2011	Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2015       Alexandre Spangaro   <aspangaro@open-dsi.fr>
@@ -132,6 +132,30 @@ foreach ($listoftype as $code => $label) {
 	$dataseries[] = array($label, (isset($somme[$code]) ? (int) $somme[$code] : 0));
 }
 
+// Sort array with most important first
+$dataseries = dol_sort_array($dataseries, 1, 'desc');
+
+// Merge all entrie after the $KEEPNFIRST one into one entry called "Other..." (to avoid to have too much entries in graphic).
+$KEEPNFIRST = 7;	// Keep first $KEEPNFIRST one + 1 with the remain
+$i = 0;
+if (count($dataseries) > ($KEEPNFIRST + 1)) {
+	foreach($dataseries as $key => $val) {
+		if ($i < $KEEPNFIRST) {
+			$i++;
+			continue;
+		}
+		// Here $key = $KEEPNFIRST
+		$dataseries[$KEEPNFIRST][0] = $langs->trans("Other").'...';
+		if ($key == $KEEPNFIRST) {
+			$i++;
+			continue;
+		}
+		$dataseries[$KEEPNFIRST][1] += $dataseries[$key][1];
+		unset($dataseries[$key]);
+		$i++;
+	}
+}
+
 if ($conf->use_javascript_ajax) {
 	print '<tr><td class="center" colspan="4">';
 

From 7dab4ef571d226598adf38dbc7f78d198b5c3c03 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 6 Jul 2021 11:18:09 +0200
Subject: [PATCH 1040/1497] Debug v14

---
 htdocs/expensereport/index.php          | 8 ++++----
 htdocs/hrm/index.php                    | 6 +++---
 htdocs/langs/en_US/boxes.lang           | 4 ++--
 htdocs/recruitment/recruitmentindex.php | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/htdocs/expensereport/index.php b/htdocs/expensereport/index.php
index 4e01cfe7501..55818721de9 100644
--- a/htdocs/expensereport/index.php
+++ b/htdocs/expensereport/index.php
@@ -245,10 +245,10 @@ if ($result) {
 			$userstatic->photo = $obj->photo;
 
 			print '<tr class="oddeven">';
-			print '<td>'.$expensereportstatic->getNomUrl(1).'</td>';
-			print '<td>'.$userstatic->getNomUrl(-1).'</td>';
-			print '<td class="right">'.price($obj->total_ht).'</td>';
-			print '<td class="right">'.price($obj->total_ttc).'</td>';
+			print '<td class="tdoverflowmax200">'.$expensereportstatic->getNomUrl(1).'</td>';
+			print '<td class="tdoverflowmax150">'.$userstatic->getNomUrl(-1).'</td>';
+			print '<td class="right amount">'.price($obj->total_ht).'</td>';
+			print '<td class="right amount">'.price($obj->total_ttc).'</td>';
 			print '<td class="right">'.dol_print_date($db->jdate($obj->dm), 'day').'</td>';
 			print '<td class="right">';
 			print $expensereportstatic->getLibStatut(3);
diff --git a/htdocs/hrm/index.php b/htdocs/hrm/index.php
index 23d0899cc18..fe2c42b0d1b 100644
--- a/htdocs/hrm/index.php
+++ b/htdocs/hrm/index.php
@@ -310,11 +310,11 @@ if (!empty($conf->expensereport->enabled) && $user->rights->expensereport->lire)
 				$userstatic->photo = $obj->photo;
 
 				print '<tr class="oddeven">';
-				print '<td class="nowraponall">'.$expensereportstatic->getNomUrl(1).'</td>';
+				print '<td class="tdoverflowmax200">'.$expensereportstatic->getNomUrl(1).'</td>';
 				print '<td class="tdoverflowmax150">'.$userstatic->getNomUrl(-1).'</td>';
-				print '<td class="right">'.price($obj->total_ttc).'</td>';
+				print '<td class="right amount">'.price($obj->total_ttc).'</td>';
 				print '<td class="right">'.dol_print_date($db->jdate($obj->dm), 'day').'</td>';
-				print '<td class="right nowrap" width="16">'.$expensereportstatic->LibStatut($obj->status, 3).'</td>';
+				print '<td class="right nowraponall" width="16">'.$expensereportstatic->LibStatut($obj->status, 3).'</td>';
 				print '</tr>';
 
 				$i++;
diff --git a/htdocs/langs/en_US/boxes.lang b/htdocs/langs/en_US/boxes.lang
index 0c9ea302fb8..710d49bfab6 100644
--- a/htdocs/langs/en_US/boxes.lang
+++ b/htdocs/langs/en_US/boxes.lang
@@ -91,8 +91,8 @@ BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
 BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
 BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
 BoxTitleLastModifiedPropals=Latest %s modified proposals
-BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
-BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
+BoxTitleLatestModifiedJobPositions=Latest %s modified job positions
+BoxTitleLatestModifiedCandidatures=Latest %s modified job applications
 ForCustomersInvoices=Customers invoices
 ForCustomersOrders=Customers orders
 ForProposals=Proposals
diff --git a/htdocs/recruitment/recruitmentindex.php b/htdocs/recruitment/recruitmentindex.php
index d3f97e6f3d1..6e9ee616327 100644
--- a/htdocs/recruitment/recruitmentindex.php
+++ b/htdocs/recruitment/recruitmentindex.php
@@ -183,7 +183,7 @@ if ($conf->use_javascript_ajax) {
 
 		print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder nohover centpercent">';
-		print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("Candidatures").'</th></tr>'."\n";
+		print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("RecruitmentCandidatures").'</th></tr>'."\n";
 		$listofstatus = array(0, 1, 3, 5, 8, 9);
 		foreach ($listofstatus as $status) {
 			$dataseries[] = array(dol_html_entity_decode($staticrecruitmentcandidature->LibStatut($status, 1), ENT_QUOTES | ENT_HTML5), (isset($vals[$status]) ? (int) $vals[$status] : 0));

From b4b939e1a9b742e30293decc891d6c110fe9663b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 6 Jul 2021 11:54:32 +0200
Subject: [PATCH 1041/1497] Fix add migration of export/import profile when
 field name changes

---
 htdocs/install/default.css      |  4 ++
 htdocs/install/upgrade2.php     | 81 +++++++++++++++++++++++++++++++++
 htdocs/langs/en_US/install.lang |  1 +
 3 files changed, 86 insertions(+)

diff --git a/htdocs/install/default.css b/htdocs/install/default.css
index fe85649844d..731ac4131b4 100644
--- a/htdocs/install/default.css
+++ b/htdocs/install/default.css
@@ -80,6 +80,10 @@ div.soustitre {
 	text-align: right;
 }
 
+.wordbreak {
+    word-break: break-word;
+}
+
 .minwidth100 { min-width: 100px; }
 .minwidth200 { min-width: 200px; }
 .minwidth300 { min-width: 300px; }
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index d0d1ae256b4..d69baad5a76 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -448,8 +448,17 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
 			migrate_contacts_socialnetworks();
 			migrate_thirdparties_socialnetworks();
 		}
+
+		// Scripts for 14.0
+		$afterversionarray = explode('.', '13.0.9');
+		$beforeversionarray = explode('.', '14.0.9');
+		if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0) {
+			migrate_export_import_profiles('export');
+			migrate_export_import_profiles('import');
+		}
 	}
 
+
 	// Code executed only if migration is LAST ONE. Must always be done.
 	if (versioncompare($versiontoarray, $versionranarray) >= 0 || versioncompare($versiontoarray, $versionranarray) <= -3) {
 		// Reload modules (this must be always done and only into last targeted version, because code to reload module may need table structure of last version)
@@ -4904,3 +4913,75 @@ function migrate_thirdparties_socialnetworks()
 	print '<b>'.$langs->trans('MigrationFieldsSocialNetworks', 'Thirdparties')."</b><br>\n";
 	print '</td></tr>';
 }
+
+
+/**
+ * Migrate export and import profiles to fix field name that was renamed
+ *
+ * @param	string		$mode		'export' or 'import'
+ * @return  void
+ */
+function migrate_export_import_profiles($mode = 'export')
+{
+	global $db, $langs;
+
+	$error = 0;
+	$resultstring = '';
+
+	$db->begin();
+
+	print '<tr class="trforrunsql"><td colspan="4">';
+	$sql = 'SELECT rowid, field';
+	if ($mode == 'export') {
+		$sql .= ', filter';
+	}
+	$sql .= ' FROM '.MAIN_DB_PREFIX.$mode.'_model WHERE';
+	$sql .= " type LIKE 'propale_%' OR type LIKE 'commande_%' OR type LIKE 'facture_%'";
+	//print $sql;
+	$resql = $db->query($sql);
+	if ($resql) {
+		while ($obj = $db->fetch_object($resql)) {
+			$oldfield = $obj->field;
+			$newfield = str_replace(array('f.facnumber,', 'f.total,', 'f.tva,'), array('f.ref,', 'f.total_ht,', 'f.total_tva,'), $oldfield);
+
+			if ($mode == 'export') {
+				$oldfilter = $obj->filter;
+				$newfilter = str_replace(array('f.facnumber,', 'f.total,', 'f.tva,'), array('f.ref,', 'f.total_ht,', 'f.total_tva,'), $oldfilter);
+			} else {
+				$oldfilter = '';
+				$newfilter = '';
+			}
+
+			if ($oldfield != $newfield || $oldfilter != $newfilter) {
+				$sqlupd = 'UPDATE '.MAIN_DB_PREFIX.$mode."_model SET field = '".$db->escape($newfield)."'";
+				if ($mode == 'export') {
+					$sql .= ", filter = '".$db->escape($newfilter)."'";
+				}
+				$sqlupd .= ' WHERE rowid='.$obj->rowid;
+				$resultstring .= '<tr class="trforrunsql" style=""><td class="wordbreak" colspan="4">'.$sqlupd."</td></tr>\n";
+				$resqlupd = $db->query($sqlupd);
+				if (!$resqlupd) {
+					dol_print_error($db);
+					$error++;
+				}
+			}
+		}
+	} else {
+		$error++;
+	}
+	if (!$error) {
+		$db->commit();
+	} else {
+		dol_print_error($db);
+		$db->rollback();
+	}
+	print '<b>'.$langs->trans('MigrationImportOrExportProfiles', $mode)."</b><br>\n";
+	print '</td></tr>';
+
+	if ($resultstring) {
+		print $resultstring;
+	} else {
+		print '<tr class="trforrunsql" style=""><td class="wordbreak" colspan="4">'.$langs->trans("NothingToDo")."</td></tr>\n";
+	}
+}
+
diff --git a/htdocs/langs/en_US/install.lang b/htdocs/langs/en_US/install.lang
index 63947dad154..c1ffee936d7 100644
--- a/htdocs/langs/en_US/install.lang
+++ b/htdocs/langs/en_US/install.lang
@@ -206,6 +206,7 @@ MigrationUserPhotoPath=Migration of photo paths for users
 MigrationFieldsSocialNetworks=Migration of users fields social networks (%s)
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
+MigrationImportOrExportProfiles=Migration of import or export profiles (%s)
 ShowNotAvailableOptions=Show unavailable options
 HideNotAvailableOptions=Hide unavailable options
 ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.

From ab14a070644252678ba845785bffa0e07bfc8622 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 6 Jul 2021 11:58:05 +0200
Subject: [PATCH 1042/1497] Trans

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

diff --git a/htdocs/expensereport/index.php b/htdocs/expensereport/index.php
index 55818721de9..c350f3ae2b4 100644
--- a/htdocs/expensereport/index.php
+++ b/htdocs/expensereport/index.php
@@ -145,7 +145,7 @@ if (count($dataseries) > ($KEEPNFIRST + 1)) {
 			continue;
 		}
 		// Here $key = $KEEPNFIRST
-		$dataseries[$KEEPNFIRST][0] = $langs->trans("Other").'...';
+		$dataseries[$KEEPNFIRST][0] = $langs->trans("Others").'...';
 		if ($key == $KEEPNFIRST) {
 			$i++;
 			continue;

From 4c5bb786baf87b8f5fca024a8a3e6e90eff9be0f Mon Sep 17 00:00:00 2001
From: damien clochard <damien@dalibo.com>
Date: Sun, 4 Jul 2021 14:27:51 +0200
Subject: [PATCH 1043/1497] FIX #18085: Migration 13 to 14 : Explicit cast when
 changing the type of llx_c_ticket_category.pos

---
 htdocs/install/mysql/migration/13.0.0-14.0.0.sql | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index a01f589aa20..c10e4aa5282 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -428,6 +428,10 @@ create table llx_eventorganization_conferenceorboothattendee_extrafields
 ALTER TABLE llx_eventorganization_conferenceorboothattendee_extrafields ADD INDEX idx_conferenceorboothattendee_fk_object(fk_object);
 
 ALTER TABLE llx_c_ticket_category ADD COLUMN public integer DEFAULT 0;
+
+-- VPGSQL8.2 ALTER TABLE llx_c_ticket_category ALTER COLUMN pos TYPE INTEGER USING pos::INTEGER;
+-- VPGSQL8.2 ALTER TABLE llx_c_ticket_category ALTER COLUMN pos SET NOT NULL;
+-- VPGSQL8.2 ALTER TABLE llx_c_ticket_category ALTER COLUMN pos SET DEFAULT 0;
 ALTER TABLE llx_c_ticket_category MODIFY COLUMN pos	integer DEFAULT 0 NOT NULL;
 
 

From a2288b9039ebf4076a7ca309e14ffdc021eb3cb5 Mon Sep 17 00:00:00 2001
From: Lenin Rivas <53640168+leninrivas@users.noreply.github.com>
Date: Sat, 3 Jul 2021 22:41:16 -0500
Subject: [PATCH 1044/1497] Update unicode and name of currency

---
 htdocs/install/mysql/data/llx_c_currencies.sql | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_c_currencies.sql b/htdocs/install/mysql/data/llx_c_currencies.sql
index 478c263af4c..df887d68be7 100644
--- a/htdocs/install/mysql/data/llx_c_currencies.sql
+++ b/htdocs/install/mysql/data/llx_c_currencies.sql
@@ -7,6 +7,7 @@
 -- Copyright (C) 2007 	    Patrick Raguin        <patrick.raguin@gmail.com>
 -- Copyright (C) 2011 	    Juanjo Menent         <jmenent@2byte.es>
 -- Copyright (C) 2020 	    Udo Tamm              <dev@dolibit.de>
+-- Copyright (C) 2021 	    Lenin Rivas           <lenin@leninrivas.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
@@ -50,7 +51,7 @@ INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'BDT'
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'BYR', '[112,46]', 1,			  'Belarus Ruble');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'BZD', '[66,90,36]', 1,			'Belize Dollar');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'BMD', '[36]', 1,				    'Bermuda Dollar');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'BOB', '[36,98]', 1,				  'Bolivia Boliviano');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'BOB', '[66,115]', 1,				'Bolivia Boliviano');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'BAM', '[75,77]', 1,			  	'Bosnia and Herzegovina Convertible Marka');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'BWP', '[80]', 1,				    'Botswana Pula');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'BGN', '[1083,1074]', 1,			'Bulgaria Lev');
@@ -70,6 +71,7 @@ INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'CZK'
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'DKK', '[107,114]', 1,	  		'Denmark Krone');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'DOP', '[82,68,36]', 1,			'Dominican Republic Peso');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'XCD', '[36]', 1,		    		'East Caribbean Dollar');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'ECS', '[83,47,46]', 1,		  'Ecuador Sucre');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'EGP', '[163]', 1,	    			'Egypt Pound');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'SVC', '[36]', 1,			    	'El Salvador Colon');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'EEK', '[107,114]', 1,	  		'Estonia Kroon');
@@ -126,7 +128,7 @@ INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'OMR'
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'PKR', '[8360]', 1,		  		'Pakistan Rupee');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'PAB', '[66,47,46]', 1,			'Panama Balboa');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'PYG', '[71,115]', 1,		  	'Paraguay Guarani');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'PEN', '[83,47,46]', 1,			'Peru Nuevo Sol');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'PEN', '[83,47]', 1,			    'Perú Sol');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'PHP', '[8369]', 1,			  	'Philippines Peso');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'PLN', '[122,322]', 1,	  		'Poland Zloty');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'QAR', '[65020]', 1,		  		'Qatar Riyal');

From 3c0e841877f6358f97752ccb3090317ddd603bd3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 6 Jul 2021 15:55:43 +0200
Subject: [PATCH 1045/1497] Fix function not found

---
 htdocs/admin/dict.php                      |  6 +++---
 htdocs/core/class/html.formadmin.class.php |  1 +
 htdocs/core/lib/functions.lib.php          | 10 +++++-----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 651f6f61611..a0790ba23fe 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -100,7 +100,7 @@ $hookmanager->initHooks(array('admin'));
 // Put here declaration of dictionaries properties
 
 // Sort order to show dictionary (0 is space). All other dictionaries (added by modules) will be at end of this.
-$taborder = array(9, 0, 4, 3, 2, 0, 1, 8, 19, 16, 39, 27, 40, 38, 0, 5, 11, 0, 6, 0, 29, 0, 33, 34, 32, 24, 28, 17, 35, 36, 0, 10, 23, 12, 13, 7, 0, 14, 0, 22, 20, 18, 21, 41, 0, 15, 30, 0, 37, 42, 0, 43, 0, 25, 0);
+$taborder = array(9, 15, 30, 0, 4, 3, 2, 0, 1, 8, 19, 16, 39, 27, 40, 38, 0, 5, 11, 0, 6, 24, 0, 29, 0, 33, 34, 32, 28, 17, 35, 36, 0, 10, 23, 12, 13, 7, 0, 14, 0, 22, 20, 18, 21, 41, 0, 37, 42, 0, 43, 0, 25, 0);
 
 // Name of SQL tables of dictionaries
 $tabname = array();
@@ -568,8 +568,8 @@ $tabhelp[43] = array('code'=>$langs->trans("EnterAnyCode"));
 // Table to store complete informations (will replace all other table). Key is table name.
 $tabcomplete = array(
 	'c_forme_juridique'=>array('picto'=>'company'),
-	'c_departements'=>array('picto'=>'country'),
-	'c_regions'=>array('picto'=>'country'),
+	'c_departements'=>array('picto'=>'state'),
+	'c_regions'=>array('picto'=>'region'),
 	'c_country'=>array('picto'=>'country'),
 	'c_civility'=>array('picto'=>'contact'),
 	'c_actioncomm'=>array('picto'=>'action'),
diff --git a/htdocs/core/class/html.formadmin.class.php b/htdocs/core/class/html.formadmin.class.php
index d45f952d8b2..22af450b997 100644
--- a/htdocs/core/class/html.formadmin.class.php
+++ b/htdocs/core/class/html.formadmin.class.php
@@ -444,6 +444,7 @@ class FormAdmin
 		}
 		$out .= '</select>';
 
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 		$out .= ajax_combobox($htmlname);
 
 		return $out;
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 44e235bea57..4a15fc26707 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3548,8 +3548,8 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'github', 'jabber', 'skype', 'twitter', 'facebook', 'linkedin', 'instagram', 'snapchat', 'youtube', 'google-plus-g', 'whatsapp',
 				'chevron-left', 'chevron-right', 'chevron-down', 'chevron-top', 'commercial', 'companies',
 				'generic', 'home', 'hrm', 'members', 'products', 'invoicing',
-				'partnership', 'payment', 'pencil-ruler', 'preview', 'project', 'projectpub', 'projecttask', 'question', 'refresh', 'salary', 'shipment',
-				'state', 'supplier_invoice', 'supplier_invoicea', 'supplier_invoicer', 'supplier_invoiced',
+				'partnership', 'payment', 'pencil-ruler', 'preview', 'project', 'projectpub', 'projecttask', 'question', 'refresh', 'region',
+				'salary', 'shipment', 'state', 'supplier_invoice', 'supplier_invoicea', 'supplier_invoicer', 'supplier_invoiced',
 				'technic', 'ticket',
 				'error', 'warning',
 				'recent', 'reception', 'recruitmentcandidature', 'recruitmentjobposition', 'resource',
@@ -3598,8 +3598,8 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'partnership'=>'handshake', 'payment'=>'money-check-alt', 'phoning'=>'phone', 'phoning_mobile'=>'mobile-alt', 'phoning_fax'=>'fax', 'previous'=>'arrow-alt-circle-left', 'printer'=>'print', 'product'=>'cube', 'service'=>'concierge-bell',
 				'recent' => 'question', 'reception'=>'dolly', 'recruitmentjobposition'=>'id-card-alt', 'recruitmentcandidature'=>'id-badge',
 				'resize'=>'crop', 'supplier_order'=>'dol-order_supplier', 'supplier_proposal'=>'file-signature',
-				'refresh'=>'redo', 'resource'=>'laptop-house',
-				'state'=>'map-marked', 'security'=>'key', 'salary'=>'wallet', 'shipment'=>'dolly', 'stock'=>'box-open', 'stats' => 'chart-bar', 'split'=>'code-branch', 'stripe'=>'stripe-s',
+				'refresh'=>'redo', 'region'=>'map-marked', 'resource'=>'laptop-house',
+				'state'=>'map-marked-alt', 'security'=>'key', 'salary'=>'wallet', 'shipment'=>'dolly', 'stock'=>'box-open', 'stats' => 'chart-bar', 'split'=>'code-branch', 'stripe'=>'stripe-s',
 				'supplier'=>'building', 'supplier_invoice'=>'file-invoice-dollar', 'technic'=>'cogs', 'ticket'=>'ticket-alt',
 				'timespent'=>'clock', 'title_setup'=>'tools', 'title_accountancy'=>'money-check-alt', 'title_bank'=>'university', 'title_hrm'=>'umbrella-beach',
 				'title_agenda'=>'calendar-alt',
@@ -3700,7 +3700,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'partnership'=>'#6c6aa8', 'playdisabled'=>'#ccc', 'printer'=>'#444', 'projectpub'=>'#986c6a', 'reception'=>'#a69944', 'resize'=>'#444', 'rss'=>'#cba',
 				//'shipment'=>'#a69944',
 				'security'=>'#999', 'stats'=>'#444', 'switch_off'=>'#999', 'technic'=>'#999', 'timespent'=>'#555',
-				'uncheck'=>'#800', 'uparrow'=>'#555', 'user-cog'=>'#999', 'country'=>'#aaa', 'globe-americas'=>'#aaa', 'state'=>'#aaa',
+				'uncheck'=>'#800', 'uparrow'=>'#555', 'user-cog'=>'#999', 'country'=>'#aaa', 'globe-americas'=>'#aaa', 'region'=>'#aaa', 'state'=>'#aaa',
 				'website'=>'#304', 'workstation'=>'#a69944'
 			);
 			if (isset($arrayconvpictotocolor[$pictowithouttext])) {

From e1a45df0d82a411f0693701b76b4fc6a023a2d31 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 6 Jul 2021 16:12:11 +0200
Subject: [PATCH 1046/1497] Fix phpunit

---
 htdocs/core/class/html.formadmin.class.php | 9 ++++++---
 test/phpunit/FormAdminTest.php             | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/class/html.formadmin.class.php b/htdocs/core/class/html.formadmin.class.php
index 22af450b997..8e03f158a02 100644
--- a/htdocs/core/class/html.formadmin.class.php
+++ b/htdocs/core/class/html.formadmin.class.php
@@ -393,9 +393,10 @@ class FormAdmin
 	 *  @param      string	$htmlname       Name of HTML select field
 	 *  @param		string	$filter			Value to filter on code
 	 *  @param		int		$showempty		Add empty value
+	 * 	@param		int		$forcecombo		Force to load all values and output a standard combobox (with no beautification)
 	 *  @return		string					Return HTML output
 	 */
-	public function select_paper_format($selected = '', $htmlname = 'paperformat_id', $filter = 0, $showempty = 0)
+	public function select_paper_format($selected = '', $htmlname = 'paperformat_id', $filter = 0, $showempty = 0, $forcecombo = 0)
 	{
 		// phpcs:enable
 		global $langs;
@@ -444,8 +445,10 @@ class FormAdmin
 		}
 		$out .= '</select>';
 
-		include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
-		$out .= ajax_combobox($htmlname);
+		if (!$forcecombo) {
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+			$out .= ajax_combobox($htmlname);
+		}
 
 		return $out;
 	}
diff --git a/test/phpunit/FormAdminTest.php b/test/phpunit/FormAdminTest.php
index 79019e1e7ed..7217f3b57e2 100644
--- a/test/phpunit/FormAdminTest.php
+++ b/test/phpunit/FormAdminTest.php
@@ -139,7 +139,7 @@ class FormAdminTest extends PHPUnit\Framework\TestCase
 		$db=$this->savdb;
 
 		$localobject=new FormAdmin($this->savdb);
-		$result=$localobject->select_paper_format('', 'paperformat_id', 'A4');
+		$result=$localobject->select_paper_format('', 'paperformat_id', 'A4', 0, 1);
 
 		$this->assertEquals($result, '<select class="flat" id="paperformat_id" name="paperformat_id"><option value="EUA4">Format A4 - 210x297 mm</option></select>');
 		print __METHOD__." result=".$result."\n";

From 874bf8ed4433879bf0b4c8e5f5853234021c4da1 Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Tue, 6 Jul 2021 16:39:58 +0200
Subject: [PATCH 1047/1497] backtopageforcancel can be set but empty

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

diff --git a/htdocs/product/inventory/card.php b/htdocs/product/inventory/card.php
index 754c2b64155..067869ba5ba 100644
--- a/htdocs/product/inventory/card.php
+++ b/htdocs/product/inventory/card.php
@@ -183,7 +183,7 @@ if ($action == 'create') {
 	if ($backtopage) {
 		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 	}
-	if (isset($backtopageforcancel)) {
+	if (!empty($backtopageforcancel)) {
 		print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
 	}
 

From 9f7be989c2f4150ec5327a5ae784fe69fb609884 Mon Sep 17 00:00:00 2001
From: Florian Mortgat <florian.mortgat@atm-consulting.fr>
Date: Tue, 6 Jul 2021 17:38:37 +0200
Subject: [PATCH 1048/1497] FIX 13.0 - fatal - missing inclusion of
 ajax.lib.php for calling `ajax_autocompleter()`

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 945897856f2..1019e9623e4 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1118,6 +1118,7 @@ class Form
 
 		if (!empty($conf->use_javascript_ajax) && !empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT) && !$forcecombo)
 		{
+			require_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
 			// No immediate load of all database
 			$placeholder = '';
 			if ($selected && empty($selected_input_value))

From 70fa742939a7575c079487d78d1a837736a467b4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 6 Jul 2021 18:40:54 +0200
Subject: [PATCH 1049/1497] Fix upgrade

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

diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index d69baad5a76..5960b92f793 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -4942,11 +4942,11 @@ function migrate_export_import_profiles($mode = 'export')
 	if ($resql) {
 		while ($obj = $db->fetch_object($resql)) {
 			$oldfield = $obj->field;
-			$newfield = str_replace(array('f.facnumber,', 'f.total,', 'f.tva,'), array('f.ref,', 'f.total_ht,', 'f.total_tva,'), $oldfield);
+			$newfield = str_replace(array(',f.facnumber', 'f.facnumber,', 'f.total,', 'f.tva,'), array(',f.ref', 'f.ref,', 'f.total_ht,', 'f.total_tva,'), $oldfield);
 
 			if ($mode == 'export') {
 				$oldfilter = $obj->filter;
-				$newfilter = str_replace(array('f.facnumber,', 'f.total,', 'f.tva,'), array('f.ref,', 'f.total_ht,', 'f.total_tva,'), $oldfilter);
+				$newfilter = str_replace(array('f.facnumber=', 'f.total=', 'f.tva='), array('f.ref=', 'f.total_ht=', 'f.total_tva='), $oldfilter);
 			} else {
 				$oldfilter = '';
 				$newfilter = '';

From 9fc2d9fc038c63d237ac40464fd25809df33b8b4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 6 Jul 2021 19:02:03 +0200
Subject: [PATCH 1050/1497] Fix phpcs

---
 htdocs/bom/bom_list.php           |  2 +-
 htdocs/core/lib/functions.lib.php |  2 +-
 htdocs/expensereport/card.php     | 18 +++++++++---------
 htdocs/expensereport/index.php    |  2 +-
 htdocs/install/upgrade2.php       |  1 -
 htdocs/mrp/mo_list.php            |  4 ++--
 htdocs/takepos/invoice.php        |  1 -
 htdocs/user/class/user.class.php  |  2 +-
 8 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/htdocs/bom/bom_list.php b/htdocs/bom/bom_list.php
index 6b54e8a4044..b9a279ae943 100644
--- a/htdocs/bom/bom_list.php
+++ b/htdocs/bom/bom_list.php
@@ -321,7 +321,7 @@ if ($object->ismultientitymanaged == 1) {
 foreach ($search as $key => $val) {
 	if (array_key_exists($key, $object->fields)) {
 		if ($key == 'status' && $search[$key] == -1) {
-		continue;
+			continue;
 		}
 		$mode_search = (($object->isInt($object->fields[$key]) || $object->isFloat($object->fields[$key])) ? 1 : 0);
 		if ((strpos($object->fields[$key]['type'], 'integer:') === 0) || (strpos($object->fields[$key]['type'], 'sellist:') === 0) || !empty($object->fields[$key]['arrayofkeyval'])) {
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 4a15fc26707..60ffa14b75d 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -783,7 +783,7 @@ function checkVal($out = '', $check = 'alphanohtml', $filter = null, $options =
 					try {
 						$dom = new DOMDocument;
 						$dom->loadHTML($out, LIBXML_ERR_NONE|LIBXML_HTML_NOIMPLIED|LIBXML_HTML_NODEFDTD|LIBXML_NONET|LIBXML_NOWARNING|LIBXML_NOXMLDECL);
-					} catch(Exception $e) {
+					} catch (Exception $e) {
 						//print $e->getMessage();
 						return 'InvalidHTMLString';
 					}
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index d207ffd20c1..c01c720f481 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -1675,15 +1675,15 @@ if ($action == 'create') {
 			 print '<tr>';
 			 print '<td class="titlefield">'.$langs->trans("User").'</td>';
 			 print '<td>';
-			 if ($object->fk_user_author > 0) {
-			 	$userauthor = new User($db);
-			 	$result = $userauthor->fetch($object->fk_user_author);
-			 	if ($result < 0) {
-			 		dol_print_error('', $userauthor->error);
-			 	} elseif ($result > 0) {
-			 		print $userauthor->getNomUrl(-1);
-			 	}
-			 }
+			if ($object->fk_user_author > 0) {
+				$userauthor = new User($db);
+				$result = $userauthor->fetch($object->fk_user_author);
+				if ($result < 0) {
+					dol_print_error('', $userauthor->error);
+				} elseif ($result > 0) {
+					print $userauthor->getNomUrl(-1);
+				}
+			}
 			 print '</td></tr>';
 
 			 // Period
diff --git a/htdocs/expensereport/index.php b/htdocs/expensereport/index.php
index c350f3ae2b4..c87cc08fb40 100644
--- a/htdocs/expensereport/index.php
+++ b/htdocs/expensereport/index.php
@@ -139,7 +139,7 @@ $dataseries = dol_sort_array($dataseries, 1, 'desc');
 $KEEPNFIRST = 7;	// Keep first $KEEPNFIRST one + 1 with the remain
 $i = 0;
 if (count($dataseries) > ($KEEPNFIRST + 1)) {
-	foreach($dataseries as $key => $val) {
+	foreach ($dataseries as $key => $val) {
 		if ($i < $KEEPNFIRST) {
 			$i++;
 			continue;
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index 5960b92f793..eb778f521ad 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -4984,4 +4984,3 @@ function migrate_export_import_profiles($mode = 'export')
 		print '<tr class="trforrunsql" style=""><td class="wordbreak" colspan="4">'.$langs->trans("NothingToDo")."</td></tr>\n";
 	}
 }
-
diff --git a/htdocs/mrp/mo_list.php b/htdocs/mrp/mo_list.php
index 91821d38ee2..6b4351bed6c 100644
--- a/htdocs/mrp/mo_list.php
+++ b/htdocs/mrp/mo_list.php
@@ -236,8 +236,8 @@ foreach ($search as $key => $val) {
 		$mode_search = (($object->isInt($object->fields[$key]) || $object->isFloat($object->fields[$key])) ? 1 : 0);
 		if ((strpos($object->fields[$key]['type'], 'integer:') === 0) || (strpos($object->fields[$key]['type'], 'sellist:') === 0) || !empty($object->fields[$key]['arrayofkeyval'])) {
 			if ($search[$key] == '-1' || $search[$key] === '0') {
-			$search[$key] = '';
-				}
+				$search[$key] = '';
+			}
 			$mode_search = 2;
 		}
 		if ($search[$key] != '') {
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index 3246b24cc5c..f55f84130b6 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -707,7 +707,6 @@ if ($action == "updatereduction") {
 
 	// Reload data
 	$invoice->fetch($placeid);
-
 } elseif ($action == 'update_reduction_global') {
 	foreach ($invoice->lines as $line) {
 		$result = $invoice->updateline($line->id, $line->desc, $line->subprice, $line->qty, $number, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit);
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index ef530cbe6f5..0bde31dec50 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -3223,7 +3223,7 @@ class User extends CommonObject
 				if (preg_match('/'.$keyfilter1.'/', $val['fullpath']) || preg_match('/'.$keyfilter2.'/', $val['fullpath'])
 					|| preg_match('/'.$keyfilter3.'/', $val['fullpath']) || preg_match('/'.$keyfilter4.'/', $val['fullpath'])) {
 						unset($this->users[$key]);
-					}
+				}
 			}
 		}
 

From f050a38c6bbf4d4752d16668889fc4823ba5e701 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 7 Jul 2021 01:18:28 +0200
Subject: [PATCH 1051/1497] Fix migration

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

diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index eb778f521ad..b0f4d831473 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -4955,7 +4955,7 @@ function migrate_export_import_profiles($mode = 'export')
 			if ($oldfield != $newfield || $oldfilter != $newfilter) {
 				$sqlupd = 'UPDATE '.MAIN_DB_PREFIX.$mode."_model SET field = '".$db->escape($newfield)."'";
 				if ($mode == 'export') {
-					$sql .= ", filter = '".$db->escape($newfilter)."'";
+					$sqlupd .= ", filter = '".$db->escape($newfilter)."'";
 				}
 				$sqlupd .= ' WHERE rowid='.$obj->rowid;
 				$resultstring .= '<tr class="trforrunsql" style=""><td class="wordbreak" colspan="4">'.$sqlupd."</td></tr>\n";

From 9d010f6d109e27dcdcb7328c9df70e531ed5a124 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 7 Jul 2021 01:24:40 +0200
Subject: [PATCH 1052/1497] Look and feel v14

---
 htdocs/product/index.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/htdocs/product/index.php b/htdocs/product/index.php
index 4aaaf3a0fa7..7069f21e459 100644
--- a/htdocs/product/index.php
+++ b/htdocs/product/index.php
@@ -105,7 +105,8 @@ if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) {     // This may be
 				print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
 			}
 			print '<tr class="oddeven">';
-			print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
+			print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td>';
+			print '<td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
 			if ($i == 0) {
 				print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
 			}
@@ -336,11 +337,11 @@ if ((!empty($conf->product->enabled) || !empty($conf->service->enabled)) && ($us
 				$product_static->status_buy = $objp->tobuy;
 				$product_static->status_batch = $objp->tobatch;
 
-				//Multilangs
+				// Multilangs
 				if (!empty($conf->global->MAIN_MULTILANGS)) {
 					$sql = "SELECT label";
 					$sql .= " FROM ".MAIN_DB_PREFIX."product_lang";
-					$sql .= " WHERE fk_product=".$objp->rowid;
+					$sql .= " WHERE fk_product=".((int) $objp->rowid);
 					$sql .= " AND lang='".$db->escape($langs->getDefaultLang())."'";
 
 					$resultd = $db->query($sql);
@@ -357,7 +358,7 @@ if ((!empty($conf->product->enabled) || !empty($conf->service->enabled)) && ($us
 				print '<td class="nowrap">';
 				print $product_static->getNomUrl(1, '', 16);
 				print "</td>\n";
-				print '<td>'.dol_trunc($objp->label, 32).'</td>';
+				print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($objp->label).'">'.$objp->label.'</td>';
 				print "<td>";
 				print dol_print_date($db->jdate($objp->datem), 'day');
 				print "</td>";
@@ -372,7 +373,7 @@ if ((!empty($conf->product->enabled) || !empty($conf->service->enabled)) && ($us
 							$objp->price = $price_result;
 						}
 					}
-					print '<td class="nowrap right">';
+					print '<td class="nowraponall amount right">';
 					if (isset($objp->price_base_type) && $objp->price_base_type == 'TTC') {
 						print price($objp->price_ttc).' '.$langs->trans("TTC");
 					} else {

From ff94c60cc77eb2d4947b56f8145f1f8c7845398c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 7 Jul 2021 01:45:31 +0200
Subject: [PATCH 1053/1497] Fix GETPOST with restricthtml

---
 htdocs/comm/action/index.php      | 6 +++---
 htdocs/core/lib/functions.lib.php | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 9b76329d8da..af903637e6f 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -138,13 +138,13 @@ if (empty($action) && !GETPOSTISSET('action')) {
 if ($action == 'default') {	// When action is default, we want a calendar view and not the list
 	$action = (($defaultview != 'show_list') ? $defaultview : 'show_month');
 }
-if (GETPOST('viewcal', 'restricthtml') && GETPOST('action', 'alpha') != 'show_day' && GETPOST('action', 'alpha') != 'show_week') {
+if (GETPOST('viewcal', 'int') && GETPOST('action', 'alpha') != 'show_day' && GETPOST('action', 'alpha') != 'show_week') {
 	$action = 'show_month'; $day = '';
 } // View by month
-if (GETPOST('viewweek', 'restricthtml') || GETPOST('action', 'alpha') == 'show_week') {
+if (GETPOST('viewweek', 'int') || GETPOST('action', 'alpha') == 'show_week') {
 	$action = 'show_week'; $week = ($week ? $week : date("W")); $day = ($day ? $day : date("d"));
 } // View by week
-if (GETPOST('viewday', 'restricthtml') || GETPOST('action', 'alpha') == 'show_day') {
+if (GETPOST('viewday', 'int') || GETPOST('action', 'alpha') == 'show_day') {
 	$action = 'show_day'; $day = ($day ? $day : date("d"));
 } // View by day
 
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 60ffa14b75d..2d560281394 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -779,7 +779,7 @@ function checkVal($out = '', $check = 'alphanohtml', $filter = null, $options =
 			do {
 				$oldstringtoclean = $out;
 
-				if (!empty($conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML) && $check != 'restricthtmlallowunvalid') {
+				if (!empty($out) && !empty($conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML) && $check != 'restricthtmlallowunvalid') {
 					try {
 						$dom = new DOMDocument;
 						$dom->loadHTML($out, LIBXML_ERR_NONE|LIBXML_HTML_NOIMPLIED|LIBXML_HTML_NODEFDTD|LIBXML_NONET|LIBXML_NOWARNING|LIBXML_NOXMLDECL);

From 48435eb91102eb830cde01f692f0e1bc26b9f8e7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 7 Jul 2021 01:58:06 +0200
Subject: [PATCH 1054/1497] Fix navigation links

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

diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index af903637e6f..9f566f41a3e 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -148,6 +148,8 @@ if (GETPOST('viewday', 'int') || GETPOST('action', 'alpha') == 'show_day') {
 	$action = 'show_day'; $day = ($day ? $day : date("d"));
 } // View by day
 
+$object = new ActionComm($db);
+
 // Load translation files required by the page
 $langs->loadLangs(array('agenda', 'other', 'commercial'));
 
@@ -197,6 +199,7 @@ if (GETPOST("viewperuser", 'alpha') || $action == 'show_peruser') {
 	exit;
 }
 
+/*
 if ($action == 'delete_action') {
 	$event = new ActionComm($db);
 	$event->fetch($actionid);
@@ -206,6 +209,7 @@ if ($action == 'delete_action') {
 
 	$result = $event->delete();
 }
+*/
 
 
 /*
@@ -484,25 +488,25 @@ $viewmode .= img_picto($langs->trans("List"), 'object_list', 'class="pictoaction
 //$viewmode .= '</span>';
 $viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsmartphone">'.$langs->trans("ViewList").'</span></a>';
 
-$viewmode .= '<a class="btnTitle'.($action == 'show_month' ? ' btnTitleSelected' : '').' reposition" href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_month&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').$paramnoactionodate.'">';
+$viewmode .= '<a class="btnTitle'.($action == 'show_month' ? ' btnTitleSelected' : '').' reposition" href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_month&year='.(isset($object->datep) ? dol_print_date($object->datep, '%Y') : $year).'&month='.(isset($object->datep) ? dol_print_date($object->datep, '%m') : $month).'&day='.(isset($object->datep) ? dol_print_date($object->datep, '%d') : $day).$paramnoactionodate.'">';
 //$viewmode .= '<span class="fa paddingleft imgforviewmode valignmiddle btnTitle-icon">';
 $viewmode .= img_picto($langs->trans("ViewCal"), 'object_calendarmonth', 'class="pictoactionview block"');
 //$viewmode .= '</span>';
 $viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsmartphone">'.$langs->trans("ViewCal").'</span></a>';
 
-$viewmode .= '<a class="btnTitle'.($action == 'show_week' ? ' btnTitleSelected' : '').' reposition" href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_week&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').$paramnoactionodate.'">';
+$viewmode .= '<a class="btnTitle'.($action == 'show_week' ? ' btnTitleSelected' : '').' reposition" href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_week&year='.(isset($object->datep) ? dol_print_date($object->datep, '%Y') : $year).'&month='.(isset($object->datep) ? dol_print_date($object->datep, '%m') : $month).'&day='.(isset($object->datep) ? dol_print_date($object->datep, '%d') : $day).$paramnoactionodate.'">';
 //$viewmode .= '<span class="fa paddingleft imgforviewmode valignmiddle btnTitle-icon">';
 $viewmode .= img_picto($langs->trans("ViewWeek"), 'object_calendarweek', 'class="pictoactionview block"');
 //$viewmode .= '</span>';
 $viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsmartphone">'.$langs->trans("ViewWeek").'</span></a>';
 
-$viewmode .= '<a class="btnTitle'.($action == 'show_day' ? ' btnTitleSelected' : '').' reposition" href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_day&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').$paramnoactionodate.'">';
+$viewmode .= '<a class="btnTitle'.($action == 'show_day' ? ' btnTitleSelected' : '').' reposition" href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_day&year='.(isset($object->datep) ? dol_print_date($object->datep, '%Y') : $year).'&month='.(isset($object->datep) ? dol_print_date($object->datep, '%m') : $month).'&day='.(isset($object->datep) ? dol_print_date($object->datep, '%d') : $day).$paramnoactionodate.'">';
 //$viewmode .= '<span class="fa paddingleft imgforviewmode valignmiddle btnTitle-icon">';
 $viewmode .= img_picto($langs->trans("ViewDay"), 'object_calendarday', 'class="pictoactionview block"');
 //$viewmode .= '</span>';
 $viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsmartphone">'.$langs->trans("ViewDay").'</span></a>';
 
-$viewmode .= '<a class="btnTitle reposition" href="'.DOL_URL_ROOT.'/comm/action/peruser.php?action=show_peruser&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').$paramnoactionodate.'">';
+$viewmode .= '<a class="btnTitle reposition" href="'.DOL_URL_ROOT.'/comm/action/peruser.php?action=show_peruser&year='.(isset($object->datep) ? dol_print_date($object->datep, '%Y') : $year).'&month='.(isset($object->datep) ? dol_print_date($object->datep, '%m') : $month).'&day='.(isset($object->datep) ? dol_print_date($object->datep, '%d') : $day).$paramnoactionodate.'">';
 //$viewmode .= '<span class="fa paddingleft imgforviewmode valignmiddle btnTitle-icon">';
 $viewmode .= img_picto($langs->trans("ViewPerUser"), 'object_calendarperuser', 'class="pictoactionview block"');
 //$viewmode .= '</span>';

From 3bc896be578b976f8b9e30d9259353b3c69b4907 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 7 Jul 2021 02:07:35 +0200
Subject: [PATCH 1055/1497] Debug v14

---
 htdocs/comm/action/index.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 9f566f41a3e..c87af9558e8 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -943,6 +943,7 @@ if ($showbirthday) {
 	}
 }
 
+// LEAVE CALENDAR
 $sql = "SELECT u.rowid as uid, u.lastname, u.firstname, u.statut, x.rowid, x.date_debut as date_start, x.date_fin as date_end, x.halfday, x.statut as status";
 $sql .= " FROM ".MAIN_DB_PREFIX."holiday as x, ".MAIN_DB_PREFIX."user as u";
 $sql .= " WHERE u.rowid = x.fk_user";
@@ -1881,7 +1882,8 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 							$cacheusers[$tmpid] = $newuser;
 						}
 
-						$listofusertoshow .= '<br>'.$cacheusers[$tmpid]->getNomUrl(-3, '', 0, 0, 0, 0, '', 'paddingright valigntextbottom');
+						$listofusertoshow = '';
+						$listofusertoshow .= '<br>'.$cacheusers[$tmpid]->getNomUrl(-1, '', 0, 0, 0, 0, '', 'paddingright valigntextbottom');
 						print $listofusertoshow;
 					} else {										// Other calendar
 						// Picto

From 1a919c9f2be724d0fdf31e52b216a7d214df6e90 Mon Sep 17 00:00:00 2001
From: jpb <jean-pascal.boudet@atm-consulting>
Date: Wed, 7 Jul 2021 08:35:31 +0200
Subject: [PATCH 1056/1497] change comment

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

diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 3acae2f8180..a0053f982de 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -513,7 +513,7 @@ if ($search_status <> '') {
 		//$sql.= ' AND c.facture = 0'; // invoice not created
 		$sql .= ' AND ((c.fk_statut IN (1,2)) OR (c.fk_statut = 3 AND c.facture = 0))'; // validated, in process or closed but not billed
 	}
-	if ($search_status == -4)	// To bill
+	if ($search_status == -4)	//  "To validate and in progress"
 	{
 
 		$sql .= ' AND (c.fk_statut IN (1,2))'; // validated, in process

From 89ffa85290c17d05bcf61e2b45660224c4957108 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Wed, 7 Jul 2021 06:40:12 +0000
Subject: [PATCH 1057/1497] Fixing style errors.

---
 htdocs/commande/list.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 3c4cafd8a95..f8d4fdac1e2 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -514,8 +514,7 @@ if ($search_status <> '') {
 		$sql .= ' AND ((c.fk_statut IN (1,2)) OR (c.fk_statut = 3 AND c.facture = 0))'; // validated, in process or closed but not billed
 	}
 
-	if ($search_status == -4)	//  "To validate and in progress"
-	{
+	if ($search_status == -4) {	//  "To validate and in progress"
 		$sql .= ' AND (c.fk_statut IN (1,2))'; // validated, in process
 	}
 }

From 7e174412b7dc20f0885fd8c3f807a903466d2b11 Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe@altairis.fr>
Date: Wed, 7 Jul 2021 10:30:01 +0200
Subject: [PATCH 1058/1497] FIX display of extrafields on shipping lines

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 64fdb956ab0..b3ae722a5d3 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -7492,6 +7492,9 @@ abstract class CommonObject
 
 						if ($display_type == 'card') {
 							$out .= '<tr '.($html_id ? 'id="'.$html_id.'" ' : '').$csstyle.' class="valuefieldcreate '.$class.$this->element.'_extras_'.$key.' trextrafields_collapse'.$extrafields_collapse_num.(!empty($this->id)?'_'.$this->id:'').'" '.$domData.' >';
+							if ( ! empty($conf->global->MAIN_VIEW_LINE_NUMBER) ) {
+								$out .= '<td></td>';
+							}
 							$out .= '<td class="wordbreak';
 						} elseif ($display_type == 'line') {
 							$out .= '<div '.($html_id ? 'id="'.$html_id.'" ' : '').$csstyle.' class="valuefieldlinecreate '.$class.$this->element.'_extras_'.$key.' trextrafields_collapse'.$extrafields_collapse_num.(!empty($this->id)?'_'.$this->id:'').'" '.$domData.' >';

From d97a95aa2adf6796e9d50b5390cd1e1d3d1f0856 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 7 Jul 2021 14:38:52 +0200
Subject: [PATCH 1059/1497] Fix CSRF token generation must be fast, can have
 low entropy.

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

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index e9f5b16b6a9..9e5d27c26ff 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -448,7 +448,7 @@ if (!defined('NOTOKENRENEWAL')) {
 		}
 
 		// Save in $_SESSION['newtoken'] what will be next token. Into forms, we will add param token = $_SESSION['newtoken']
-		$token = dol_hash(uniqid(mt_rand(), true)); // Generates a hash of a random number
+		$token = dol_hash(uniqid(mt_rand(), false), 'md5'); // Generates a hash of a random number. We don't need a secured hash, just a changing random value.
 		$_SESSION['newtoken'] = $token;
 		dol_syslog("NEW TOKEN generated by : " . $_SERVER['PHP_SELF'], LOG_DEBUG);
 	}

From 2f250799813e7e4faa65cde9e137b420a6ece1e7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 7 Jul 2021 14:38:52 +0200
Subject: [PATCH 1060/1497] Fix CSRF token generation must be fast, can have
 low entropy.

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

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 2301ca75161..df61e752f5c 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -420,7 +420,7 @@ if (!defined('NOTOKENRENEWAL')) {
 		if (isset($_SESSION['newtoken'])) $_SESSION['token'] = $_SESSION['newtoken'];
 
 		// Save in $_SESSION['newtoken'] what will be next token. Into forms, we will add param token = $_SESSION['newtoken']
-		$token = dol_hash(uniqid(mt_rand(), true)); // Generates a hash of a random number
+		$token = dol_hash(uniqid(mt_rand(), false), 'md5'); // Generates a hash of a random number. We don't need a secured hash, just a changing random value.
 		$_SESSION['newtoken'] = $token;
 		dol_syslog("NEW TOKEN generated by : " . $_SERVER['PHP_SELF'], LOG_DEBUG);
 	}

From 0e2c57fe65734dddf69590c7997b22a5c17aa1f3 Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Wed, 7 Jul 2021 14:50:10 +0200
Subject: [PATCH 1061/1497] Fix php 8 warning on user page

---
 htdocs/core/lib/usergroups.lib.php |  4 ++--
 htdocs/user/bank.php               |  3 +--
 htdocs/user/card.php               |  7 +++++--
 htdocs/user/clicktodial.php        |  4 +++-
 htdocs/user/notify/card.php        |  2 +-
 htdocs/user/param_ihm.php          | 10 ++++++----
 htdocs/user/perms.php              |  2 +-
 7 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index cd9ae5ad297..29f208e5254 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -906,7 +906,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	}
 
 	// Use MAIN_OPTIMIZEFORTEXTBROWSER
-	if ($foruserprofile) {
+	if ($foruserprofile && !empty($fuser->conf->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 		//$default=yn($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER);
 		$default = $langs->trans('No');
 		print '<tr class="oddeven">';
@@ -953,7 +953,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 
 
 	// Use MAIN_OPTIMIZEFORTEXTBROWSER
-	if ($foruserprofile) {
+	if ($foruserprofile && !empty($fuser->conf->MAIN_OPTIMIZEFORCOLORBLIND)) {
 		//$default=yn($conf->global->MAIN_OPTIMIZEFORCOLORBLIND);
 		$default = $langs->trans('No');
 		print '<tr class="oddeven">';
diff --git a/htdocs/user/bank.php b/htdocs/user/bank.php
index fc9002e13fb..0eaf3d533a9 100644
--- a/htdocs/user/bank.php
+++ b/htdocs/user/bank.php
@@ -506,7 +506,6 @@ if ($action != 'edit' && $action != 'create') {		// If not bank account yet, $ac
 
 				$exp->id = $objp->rowid;
 				$exp->ref = $objp->ref;
-				$exp->fk_type = $objp->fk_type;
 				$exp->status = $objp->status;
 
 				print '<tr class="oddeven">';
@@ -557,7 +556,7 @@ if ($action != 'edit' && $action != 'create') {		// If not bank account yet, $ac
 	print_liste_field_titre("RIB");
 	print_liste_field_titre("IBAN");
 	print_liste_field_titre("BIC");
-	print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'maxwidthsearch ');
+	print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', '', '', '', 'maxwidthsearch ');
 	print "</tr>\n";
 
 	if ($account->id > 0) {
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 1efbdb18714..92284d45e1c 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1451,8 +1451,11 @@ if ($action == 'create' || $action == 'adduserldap') {
 				print '<span class="opacitymedium">'.$langs->trans("None").'</span>';
 			} else {
 				$huser = new User($db);
-				$huser->fetch($object->fk_user);
-				print $huser->getNomUrl(1);
+				if ($huser->fetch($object->fk_user) > 0) {
+					print $huser->getNomUrl(1);
+				} else {
+					print '<span class="opacitymedium">'.$langs->trans("None").'</span>';
+				}
 			}
 			print '</td>';
 			print "</tr>\n";
diff --git a/htdocs/user/clicktodial.php b/htdocs/user/clicktodial.php
index 0a9a65a2852..79450f2d811 100644
--- a/htdocs/user/clicktodial.php
+++ b/htdocs/user/clicktodial.php
@@ -150,7 +150,9 @@ if ($id > 0) {
 		if (!empty($user->admin)) {
 			print '<tr><td class="titlefield">ClickToDial URL</td>';
 			print '<td class="valeur">';
-			$url = $conf->global->CLICKTODIAL_URL;
+			if (!empty($conf->global->CLICKTODIAL_URL)) {
+				$url = $conf->global->CLICKTODIAL_URL;
+			}
 			if (!empty($object->clicktodial_url)) {
 				$url = $object->clicktodial_url;
 			}
diff --git a/htdocs/user/notify/card.php b/htdocs/user/notify/card.php
index 978c2d990b7..4ef62f25ab5 100644
--- a/htdocs/user/notify/card.php
+++ b/htdocs/user/notify/card.php
@@ -437,7 +437,7 @@ if ($result > 0) {
 	}
 
 	print '<form method="post" action="'.$_SERVER["PHP_SELF"].'" name="formfilter">';
-	if ($optioncss != '') {
+	if (!empty($optioncss)) {
 		print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 	}
 	print '<input type="hidden" name="token" value="'.newToken().'">';
diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php
index b492e31177f..72f9b075be9 100644
--- a/htdocs/user/param_ihm.php
+++ b/htdocs/user/param_ihm.php
@@ -370,10 +370,12 @@ if ($action == 'edit') {
 	print empty($dolibarr_main_demo) ? '' : ' disabled="disabled"'; // Disabled for demo
 	print '> '.$langs->trans("UsePersonalValue").'</td>';
 	print '<td>';
-	if (!empty($tmparray[$object->conf->MAIN_LANDING_PAGE])) {
-		print $langs->trans($tmparray[$object->conf->MAIN_LANDING_PAGE]);
-	} else {
-		print $object->conf->MAIN_LANDING_PAGE;
+	if (!empty($object->conf->MAIN_LANDING_PAGE)) {
+		if (!empty($tmparray[$object->conf->MAIN_LANDING_PAGE])) {
+			print $langs->trans($tmparray[$object->conf->MAIN_LANDING_PAGE]);
+		} else {
+			print $object->conf->MAIN_LANDING_PAGE;
+		}
 	}
 	//print $form->selectarray('MAIN_LANDING_PAGE', $tmparray, (! empty($object->conf->MAIN_LANDING_PAGE)?$object->conf->MAIN_LANDING_PAGE:''), 0, 0, 0, '', 1);
 	print '</td></tr>';
diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php
index 2136d0f07c5..957c7a3a819 100644
--- a/htdocs/user/perms.php
+++ b/htdocs/user/perms.php
@@ -407,7 +407,7 @@ if ($result) {
 			print '<td class="center nowrap">';
 			print img_picto($langs->trans("Active"), 'tick');
 			print '</td>';
-		} elseif (is_array($permsgroupbyentity[$entity])) {
+		} elseif (isset($permsgroupbyentity[$entity]) && is_array($permsgroupbyentity[$entity])) {
 			if (in_array($obj->id, $permsgroupbyentity[$entity])) {	// Permission granted by group
 				if ($caneditperms) {
 					print '<td class="center">';

From a94218312737171b27da53ce8cd7fe841937e8dd Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Wed, 7 Jul 2021 15:02:00 +0200
Subject: [PATCH 1062/1497] better fix for optioncss

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

diff --git a/htdocs/user/notify/card.php b/htdocs/user/notify/card.php
index 4ef62f25ab5..3acad0ac0c3 100644
--- a/htdocs/user/notify/card.php
+++ b/htdocs/user/notify/card.php
@@ -437,7 +437,7 @@ if ($result > 0) {
 	}
 
 	print '<form method="post" action="'.$_SERVER["PHP_SELF"].'" name="formfilter">';
-	if (!empty($optioncss)) {
+	if (isset($optioncss) && $optioncss != '') {
 		print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 	}
 	print '<input type="hidden" name="token" value="'.newToken().'">';

From 45d36d91343179d78f6b3ebbbd623f5400075f30 Mon Sep 17 00:00:00 2001
From: EpixFr <epixfr@opensolus.fr>
Date: Wed, 7 Jul 2021 17:32:48 +0200
Subject: [PATCH 1063/1497] Ajout export compta iSuite Expert

---
 .../class/accountancyexport.class.php         | 57 +++++++++++++++++++
 1 file changed, 57 insertions(+)

diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index f007208cf57..f1b76c2030b 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -59,6 +59,7 @@ class AccountancyExport
 	public static $EXPORT_TYPE_LDCOMPTA10 = 120;
 	public static $EXPORT_TYPE_GESTIMUMV3 = 130;
 	public static $EXPORT_TYPE_GESTIMUMV5 = 135;
+	public static $EXPORT_TYPE_ISUITEEXPERT = 990;
 	public static $EXPORT_TYPE_FEC = 1000;
 	public static $EXPORT_TYPE_FEC2 = 1010;
 
@@ -123,6 +124,7 @@ class AccountancyExport
 			self::$EXPORT_TYPE_GESTIMUMV5 => $langs->trans('Modelcsv_Gestinum_v5'),
 			self::$EXPORT_TYPE_FEC => $langs->trans('Modelcsv_FEC'),
 			self::$EXPORT_TYPE_FEC2 => $langs->trans('Modelcsv_FEC2'),
+			self::$EXPORT_TYPE_ISUITEEXPERT => 'Export iSuite Expert',
 		);
 
 		ksort($listofexporttypes, SORT_NUMERIC);
@@ -158,6 +160,7 @@ class AccountancyExport
 			self::$EXPORT_TYPE_GESTIMUMV5 => 'gestimumv5',
 			self::$EXPORT_TYPE_FEC => 'fec',
 			self::$EXPORT_TYPE_FEC2 => 'fec2',
+			self::$EXPORT_TYPE_ISUITEEXPERT => 'isuiteexpert',
 		);
 
 		return $formatcode[$type];
@@ -243,6 +246,10 @@ class AccountancyExport
 					'label' => $langs->trans('Modelcsv_FEC2'),
 					'ACCOUNTING_EXPORT_FORMAT' => 'txt',
 				),
+				self::$EXPORT_TYPE_ISUITEEXPERT => array(
+					'label' => 'iSuite Expert',
+					'ACCOUNTING_EXPORT_FORMAT' => 'csv',
+				),
 			),
 			'cr'=> array(
 				'1' => $langs->trans("Unix"),
@@ -334,6 +341,9 @@ class AccountancyExport
 			case self::$EXPORT_TYPE_FEC2:
 				$this->exportFEC2($TData);
 				break;
+			case self::$EXPORT_TYPE_ISUITEEXPERT :
+				$this->exportiSuiteExpert($TData);
+				break;
 			default:
 				$this->errors[] = $langs->trans('accountancy_error_modelnotfound');
 				break;
@@ -1752,6 +1762,53 @@ class AccountancyExport
 		}
 	}
 
+	/**
+	* Export format : iSuite Expert
+	*
+	* by OpenSolus [https://opensolus.fr] 
+	*
+	* @param array $objectLines data
+	*
+	* @return void
+	*/
+	public function exportiSuiteExpert($objectLines)
+	{
+		$this->separator = ';';
+        $this->end_line = "\r\n";
+				
+
+		foreach ($objectLines as $line) {
+			$tab = array();
+
+			$date = dol_print_date($line->doc_date, '%d/%m/%Y');
+
+			$tab[] = $line->piece_num;
+			$tab[] = $date;
+			$tab[] = substr($date,6,4);
+			$tab[] = substr($date,3,2);
+			$tab[] = substr($date,0,2);
+			$tab[] = $line->doc_ref;
+			//Conversion de chaine UTF8 en Latin9
+			$tab[] = mb_convert_encoding(str_replace(' - Compte auxiliaire','',$line->label_operation),"Windows-1252",'UTF-8');
+
+			//Création des comptes auxiliaire des clients
+			if (length_accountg($line->numero_compte)=='4110000') {
+				$tab[] = rtrim(length_accounta($line->subledger_account),"0");
+			} else {
+				$tab[] = length_accountg($line->numero_compte);
+			}
+			$nom_client = explode(" - ",$line->label_operation);
+			$tab[] = mb_convert_encoding($nom_client[0],"Windows-1252",'UTF-8');
+			$tab[] = price($line->debit);
+			$tab[] = price($line->credit);
+			$tab[] = price($line->montant);
+			$tab[] = $line->code_journal;
+
+			$separator = $this->separator;
+			print implode($separator, $tab) . $this->end_line;
+		}
+	}
+
 	/**
 	 * trunc
 	 *

From edfd40719b99d95a3ed9f1cadcac815b9f272a77 Mon Sep 17 00:00:00 2001
From: EpixFr <epixfr@opensolus.fr>
Date: Wed, 7 Jul 2021 17:53:10 +0200
Subject: [PATCH 1064/1497] Gestion des longueurs des comptes variables

---
 htdocs/accountancy/class/accountancyexport.class.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index f1b76c2030b..c184ccd901a 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -1791,8 +1791,17 @@ class AccountancyExport
 			//Conversion de chaine UTF8 en Latin9
 			$tab[] = mb_convert_encoding(str_replace(' - Compte auxiliaire','',$line->label_operation),"Windows-1252",'UTF-8');
 
+			//Calcul de la longueur des numéros de comptes
+			$taille_numero = strlen(length_accountg($line->numero_compte));
+
+			//Création du numéro de client générique
+			$numero_cpt_client = '411';
+			for ($i = 1; $i <= ($taille_numero - 3); $i++){
+				$numero_cpt_client .= '0';
+			}
+
 			//Création des comptes auxiliaire des clients
-			if (length_accountg($line->numero_compte)=='4110000') {
+			if (length_accountg($line->numero_compte) == $numero_cpt_client) {			
 				$tab[] = rtrim(length_accounta($line->subledger_account),"0");
 			} else {
 				$tab[] = length_accountg($line->numero_compte);

From 335c3029dc344a4a5c45b1580c244b6fc1aecf79 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Wed, 7 Jul 2021 15:55:07 +0000
Subject: [PATCH 1065/1497] Fixing style errors.

---
 .../class/accountancyexport.class.php         | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index c184ccd901a..a35daa5a888 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -1765,7 +1765,7 @@ class AccountancyExport
 	/**
 	* Export format : iSuite Expert
 	*
-	* by OpenSolus [https://opensolus.fr] 
+	* by OpenSolus [https://opensolus.fr]
 	*
 	* @param array $objectLines data
 	*
@@ -1774,8 +1774,8 @@ class AccountancyExport
 	public function exportiSuiteExpert($objectLines)
 	{
 		$this->separator = ';';
-        $this->end_line = "\r\n";
-				
+		$this->end_line = "\r\n";
+
 
 		foreach ($objectLines as $line) {
 			$tab = array();
@@ -1784,30 +1784,30 @@ class AccountancyExport
 
 			$tab[] = $line->piece_num;
 			$tab[] = $date;
-			$tab[] = substr($date,6,4);
-			$tab[] = substr($date,3,2);
-			$tab[] = substr($date,0,2);
+			$tab[] = substr($date, 6, 4);
+			$tab[] = substr($date, 3, 2);
+			$tab[] = substr($date, 0, 2);
 			$tab[] = $line->doc_ref;
 			//Conversion de chaine UTF8 en Latin9
-			$tab[] = mb_convert_encoding(str_replace(' - Compte auxiliaire','',$line->label_operation),"Windows-1252",'UTF-8');
+			$tab[] = mb_convert_encoding(str_replace(' - Compte auxiliaire', '', $line->label_operation), "Windows-1252", 'UTF-8');
 
 			//Calcul de la longueur des numéros de comptes
 			$taille_numero = strlen(length_accountg($line->numero_compte));
 
 			//Création du numéro de client générique
 			$numero_cpt_client = '411';
-			for ($i = 1; $i <= ($taille_numero - 3); $i++){
+			for ($i = 1; $i <= ($taille_numero - 3); $i++) {
 				$numero_cpt_client .= '0';
 			}
 
 			//Création des comptes auxiliaire des clients
-			if (length_accountg($line->numero_compte) == $numero_cpt_client) {			
-				$tab[] = rtrim(length_accounta($line->subledger_account),"0");
+			if (length_accountg($line->numero_compte) == $numero_cpt_client) {
+				$tab[] = rtrim(length_accounta($line->subledger_account), "0");
 			} else {
 				$tab[] = length_accountg($line->numero_compte);
 			}
-			$nom_client = explode(" - ",$line->label_operation);
-			$tab[] = mb_convert_encoding($nom_client[0],"Windows-1252",'UTF-8');
+			$nom_client = explode(" - ", $line->label_operation);
+			$tab[] = mb_convert_encoding($nom_client[0], "Windows-1252", 'UTF-8');
 			$tab[] = price($line->debit);
 			$tab[] = price($line->credit);
 			$tab[] = price($line->montant);

From 9d3f7c5cddf93cd7bba46815c3a2cfd82e32682d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 7 Jul 2021 18:30:10 +0200
Subject: [PATCH 1066/1497] Support fk_parent into dictionary of ticket
 categories

---
 htdocs/admin/dict.php                   | 33 ++++++++++++++++++-------
 htdocs/core/modules/modTicket.class.php | 10 ++++----
 htdocs/langs/en_US/admin.lang           |  1 +
 3 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index a0790ba23fe..71b4d674044 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -695,7 +695,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify')) {
 	$listfieldmodify = explode(',', $tabfieldinsert[$id]);
 	$listfieldvalue = explode(',', $tabfieldvalue[$id]);
 
-	// Check that all fields are filled
+	// Check that all mandatory fields are filled
 	$ok = 1;
 	foreach ($listfield as $f => $value) {
 		// Discard check of mandatory fields for country for some tables
@@ -1341,6 +1341,9 @@ if ($id) {
 			if ($value == 'short_label') {
 				$valuetoshow = $langs->trans("ShortLabel");
 			}
+			if ($value == 'fk_parent') {
+				$valuetoshow = $langs->trans("ParentID"); $class = 'center';
+			}
 			if ($value == 'range_account') {
 				$valuetoshow = $langs->trans("Range");
 			}
@@ -1686,6 +1689,9 @@ if ($id) {
 			if ($value == 'short_label') {
 				$valuetoshow = $langs->trans("ShortLabel");
 			}
+			if ($value == 'fk_parent') {
+				$valuetoshow = $langs->trans("ParentID"); $cssprefix = 'center ';
+			}
 			if ($value == 'range_account') {
 				$valuetoshow = $langs->trans("Range");
 			}
@@ -1995,16 +2001,13 @@ if ($id) {
 							if ($value == 'position') {
 								$class .= ' right';
 							}
-							if ($value == 'localtax1_type') {
-								$class .= ' nowrap';
-							}
-							if ($value == 'localtax2_type') {
+							if (in_array($value, array('localtax1_type', 'localtax2_type'))) {
 								$class .= ' nowrap';
 							}
 							if ($value == 'pos') {
 								$class .= ' right';
 							}
-							if ($value == 'use_default') {
+							if (in_array($value, array('use_default', 'fk_parent'))) {
 								$class .= ' center';
 							}
 							if ($value == 'public') {
@@ -2271,7 +2274,13 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 			print '<td>';
 			print $form->selectarray('source', $sourceList, (!empty($obj->{$value}) ? $obj->{$value}:''));
 			print '</td>';
+		} elseif (in_array($value, array('public', 'use_default'))) {
+			// Fields 0/1 with a combo select Yes/No
+			print '<td class="center">';
+			print $form->selectyesno($value, (!empty($obj->{$value}) ? $obj->{$value}:''), 1);
+			print '</td>';
 		} elseif ($value == 'private') {
+			// Fields 'no'/'yes' with a combo select Yes/No
 			print '<td>';
 			print $form->selectyesno("private", (!empty($obj->{$value}) ? $obj->{$value}:''));
 			print '</td>';
@@ -2367,7 +2376,7 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 			print $form->selectExpenseRanges($obj->fk_range);
 			print '</td>';
 		} else {
-			$fieldValue = isset($obj->{$value}) ? $obj->{$value}:'';
+			$fieldValue = isset($obj->{$value}) ? $obj->{$value}: '';
 
 			if ($value == 'sortorder') {
 				$fieldlist[$field] = 'position';
@@ -2377,15 +2386,21 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 			if ($fieldlist[$field] == 'code') {
 				$class = 'maxwidth100';
 			}
-			if (in_array($fieldlist[$field], array('dayrule', 'day', 'month', 'year', 'pos', 'use_default', 'affect', 'delay', 'position', 'public', 'sortorder', 'sens', 'category_type'))) {
+			if (in_array($fieldlist[$field], array('dayrule', 'day', 'month', 'year', 'pos', 'use_default', 'affect', 'delay', 'position', 'public', 'sortorder', 'sens', 'category_type', 'fk_parent'))) {
 				$class = 'maxwidth50 center';
 			}
-			if (in_array($fieldlist[$field], array('use_default', 'public'))) {
+			if (in_array($fieldlist[$field], array('use_default', 'public', 'fk_parent'))) {
 				$classtd = 'center';
 			}
 			if (in_array($fieldlist[$field], array('libelle', 'label', 'tracking'))) {
 				$class = 'quatrevingtpercent';
 			}
+			// Fields that must be suggested as '0' instead of ''
+			if ($fieldlist[$field] == 'fk_parent') {
+				if (empty($fieldValue)) {
+					$fieldValue = '0';
+				}
+			}
 			print '<td class="'.$classtd.'">';
 			$transfound = 0;
 			$transkey = '';
diff --git a/htdocs/core/modules/modTicket.class.php b/htdocs/core/modules/modTicket.class.php
index 8b1a1dc8525..15f2b5fecca 100644
--- a/htdocs/core/modules/modTicket.class.php
+++ b/htdocs/core/modules/modTicket.class.php
@@ -127,19 +127,19 @@ class modTicket extends DolibarrModules
 			'tabsql' => array(
 				'SELECT f.rowid as rowid, f.code, f.pos, f.label, f.active, f.use_default FROM '.MAIN_DB_PREFIX.'c_ticket_type as f',
 				'SELECT f.rowid as rowid, f.code, f.pos, f.label, f.active, f.use_default FROM '.MAIN_DB_PREFIX.'c_ticket_severity as f',
-				'SELECT f.rowid as rowid, f.code, f.pos, f.label, f.active, f.use_default, f.public FROM '.MAIN_DB_PREFIX.'c_ticket_category as f',
+				'SELECT f.rowid as rowid, f.code, f.pos, f.label, f.active, f.use_default, f.public, f.fk_parent FROM '.MAIN_DB_PREFIX.'c_ticket_category as f',
 				'SELECT f.rowid as rowid, f.code, f.pos, f.label, f.active, f.use_default FROM '.MAIN_DB_PREFIX.'c_ticket_resolution as f'
 			),
 			'tabsqlsort' => array("pos ASC", "pos ASC", "pos ASC", "pos ASC"),
-			'tabfield' => array("code,label,pos,use_default", "code,label,pos,use_default", "code,label,pos,use_default,public", "code,label,pos,use_default"),
-			'tabfieldvalue' => array("code,label,pos,use_default", "code,label,pos,use_default", "code,label,pos,use_default,public", "code,label,pos,use_default"),
-			'tabfieldinsert' => array("code,label,pos,use_default", "code,label,pos,use_default", "code,label,pos,use_default,public", "code,label,pos,use_default"),
+			'tabfield' => array("code,label,pos,use_default", "code,label,pos,use_default", "code,label,pos,use_default,public,fk_parent", "code,label,pos,use_default"),
+			'tabfieldvalue' => array("code,label,pos,use_default", "code,label,pos,use_default", "code,label,pos,use_default,public,fk_parent", "code,label,pos,use_default"),
+			'tabfieldinsert' => array("code,label,pos,use_default", "code,label,pos,use_default", "code,label,pos,use_default,public,fk_parent", "code,label,pos,use_default"),
 			'tabrowid' => array("rowid", "rowid", "rowid", "rowid"),
 			'tabcond' => array($conf->ticket->enabled, $conf->ticket->enabled, $conf->ticket->enabled, $conf->ticket->enabled),
 			'tabhelp' => array(
 				array('code'=>$langs->trans("EnterAnyCode"), 'use_default'=>$langs->trans("Enter0or1")),
 				array('code'=>$langs->trans("EnterAnyCode"), 'use_default'=>$langs->trans("Enter0or1")),
-				array('code'=>$langs->trans("EnterAnyCode"), 'use_default'=>$langs->trans("Enter0or1"), 'public'=>$langs->trans("Enter0or1").'<br>'.$langs->trans("TicketGroupIsPublicDesc")),
+				array('code'=>$langs->trans("EnterAnyCode"), 'use_default'=>$langs->trans("Enter0or1"), 'public'=>$langs->trans("Enter0or1").'<br>'.$langs->trans("TicketGroupIsPublicDesc"), 'fk_parent'=>$langs->trans("IfThisCategoryIsChildOfAnother")),
 				array('code'=>$langs->trans("EnterAnyCode"), 'use_default'=>$langs->trans("Enter0or1"))
 			),
 		);
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 81f03a9aee6..cd75af67b6d 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -118,6 +118,7 @@ MultiCurrencySetup=Multi-currency setup
 MenuLimits=Limits and accuracy
 MenuIdParent=Parent menu ID
 DetailMenuIdParent=ID of parent menu (empty for a top menu)
+ParentID=Parent ID
 DetailPosition=Sort number to define menu position
 AllMenus=All
 NotConfigured=Module/Application not configured

From 6cfb3c0e168d4ba5b799bd01cf4170073f06c7cc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 7 Jul 2021 18:41:37 +0200
Subject: [PATCH 1067/1497] Fix css for field pos/position in dictionary.

---
 htdocs/admin/dict.php | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 71b4d674044..ff1e96b0ec9 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -882,12 +882,12 @@ if (GETPOST('actionadd') || GETPOST('actionmodify')) {
 			}
 
 			if ($keycode == 'sortorder') {		// For column name 'sortorder', we use the field name 'position'
-				$sql .= "'".(int) GETPOST('position', 'int')."'";
+				$sql .= (int) GETPOST('position', 'int');
 			} elseif ($_POST[$keycode] == '' && !($keycode == 'code' && $id == 10)) {
 				$sql .= "null"; // For vat, we want/accept code = ''
 			} elseif ($keycode == 'content') {
 				$sql .= "'".$db->escape(GETPOST($keycode, 'restricthtml'))."'";
-			} elseif (in_array($keycode, array('joinfile', 'private', 'position', 'scale'))) {
+			} elseif (in_array($keycode, array('joinfile', 'private', 'pos', 'position', 'scale'))) {
 				$sql .= (int) GETPOST($keycode, 'int');
 			} else {
 				$sql .= "'".$db->escape(GETPOST($keycode, 'nohtml'))."'";
@@ -898,8 +898,8 @@ if (GETPOST('actionadd') || GETPOST('actionmodify')) {
 		$sql .= ",1)";
 
 		dol_syslog("actionadd", LOG_DEBUG);
-		$result = $db->query($sql);
-		if ($result) {	// Add is ok
+		$resql = $db->query($sql);
+		if ($resql) {	// Add is ok
 			setEventMessages($langs->transnoentities("RecordCreatedSuccessfully"), null, 'mesgs');
 
 			// Clean $_POST array, we keep only id of dictionary
@@ -956,7 +956,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify')) {
 				$sql .= "null"; // For vat, we want/accept code = ''
 			} elseif ($keycode == 'content') {
 				$sql .= "'".$db->escape(GETPOST($keycode, 'restricthtml'))."'";
-			} elseif (in_array($keycode, array('private', 'position', 'scale'))) {
+			} elseif (in_array($keycode, array('joinfile', 'private', 'pos', 'position', 'scale'))) {
 				$sql .= (int) GETPOST($keycode, 'int');
 			} else {
 				$sql .= "'".$db->escape(GETPOST($keycode, 'nohtml'))."'";
@@ -1626,11 +1626,8 @@ if ($id) {
 			if ($value == 'code') {
 				$valuetoshow = $langs->trans("Code");
 			}
-			if ($value == 'pos') {
-				$cssprefix = 'right '; $valuetoshow = $langs->trans("Position");
-			}
-			if ($value == 'position') {
-				$cssprefix = 'right '; $valuetoshow = $langs->trans("Position");
+			if (in_array($value, array('pos', 'position'))) {
+				$valuetoshow = $langs->trans("Position"); $cssprefix = 'right ';
 			}
 			if ($value == 'libelle' || $value == 'label') {
 				$valuetoshow = $langs->trans("Label");
@@ -1998,15 +1995,12 @@ if ($id) {
 							if ($value == 'tracking') {
 								$class .= ' tdoverflowauto';
 							}
-							if ($value == 'position') {
+							if (in_array($value, array('pos', 'position'))) {
 								$class .= ' right';
 							}
 							if (in_array($value, array('localtax1_type', 'localtax2_type'))) {
 								$class .= ' nowrap';
 							}
-							if ($value == 'pos') {
-								$class .= ' right';
-							}
 							if (in_array($value, array('use_default', 'fk_parent'))) {
 								$class .= ' center';
 							}
@@ -2386,7 +2380,10 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 			if ($fieldlist[$field] == 'code') {
 				$class = 'maxwidth100';
 			}
-			if (in_array($fieldlist[$field], array('dayrule', 'day', 'month', 'year', 'pos', 'use_default', 'affect', 'delay', 'position', 'public', 'sortorder', 'sens', 'category_type', 'fk_parent'))) {
+			if (in_array($fieldlist[$field], array('pos', 'position'))) {
+				$classtd = 'right'; $class = 'maxwidth50 right';
+			}
+			if (in_array($fieldlist[$field], array('dayrule', 'day', 'month', 'year', 'use_default', 'affect', 'delay', 'public', 'sortorder', 'sens', 'category_type', 'fk_parent'))) {
 				$class = 'maxwidth50 center';
 			}
 			if (in_array($fieldlist[$field], array('use_default', 'public', 'fk_parent'))) {

From 9308fab7ca58a3b510a50b0896577e5fa8dcdd86 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 7 Jul 2021 18:41:37 +0200
Subject: [PATCH 1068/1497] Fix css for field pos/position in dictionary.

Conflicts:
	htdocs/admin/dict.php
---
 htdocs/admin/dict.php | 31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index a0790ba23fe..97853ab6a37 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -882,12 +882,12 @@ if (GETPOST('actionadd') || GETPOST('actionmodify')) {
 			}
 
 			if ($keycode == 'sortorder') {		// For column name 'sortorder', we use the field name 'position'
-				$sql .= "'".(int) GETPOST('position', 'int')."'";
+				$sql .= (int) GETPOST('position', 'int');
 			} elseif ($_POST[$keycode] == '' && !($keycode == 'code' && $id == 10)) {
 				$sql .= "null"; // For vat, we want/accept code = ''
 			} elseif ($keycode == 'content') {
 				$sql .= "'".$db->escape(GETPOST($keycode, 'restricthtml'))."'";
-			} elseif (in_array($keycode, array('joinfile', 'private', 'position', 'scale'))) {
+			} elseif (in_array($keycode, array('joinfile', 'private', 'pos', 'position', 'scale'))) {
 				$sql .= (int) GETPOST($keycode, 'int');
 			} else {
 				$sql .= "'".$db->escape(GETPOST($keycode, 'nohtml'))."'";
@@ -898,8 +898,8 @@ if (GETPOST('actionadd') || GETPOST('actionmodify')) {
 		$sql .= ",1)";
 
 		dol_syslog("actionadd", LOG_DEBUG);
-		$result = $db->query($sql);
-		if ($result) {	// Add is ok
+		$resql = $db->query($sql);
+		if ($resql) {	// Add is ok
 			setEventMessages($langs->transnoentities("RecordCreatedSuccessfully"), null, 'mesgs');
 
 			// Clean $_POST array, we keep only id of dictionary
@@ -956,7 +956,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify')) {
 				$sql .= "null"; // For vat, we want/accept code = ''
 			} elseif ($keycode == 'content') {
 				$sql .= "'".$db->escape(GETPOST($keycode, 'restricthtml'))."'";
-			} elseif (in_array($keycode, array('private', 'position', 'scale'))) {
+			} elseif (in_array($keycode, array('joinfile', 'private', 'pos', 'position', 'scale'))) {
 				$sql .= (int) GETPOST($keycode, 'int');
 			} else {
 				$sql .= "'".$db->escape(GETPOST($keycode, 'nohtml'))."'";
@@ -1234,7 +1234,7 @@ if ($id) {
 			$class = '';
 
 			if ($value == 'pos') {
-				$valuetoshow = $langs->trans("Position"); $class = 'maxwidth100';
+				$valuetoshow = $langs->trans("Position"); $class = 'right';
 			}
 			if ($value == 'source') {
 				$valuetoshow = $langs->trans("Contact");
@@ -1623,11 +1623,8 @@ if ($id) {
 			if ($value == 'code') {
 				$valuetoshow = $langs->trans("Code");
 			}
-			if ($value == 'pos') {
-				$cssprefix = 'right '; $valuetoshow = $langs->trans("Position");
-			}
-			if ($value == 'position') {
-				$cssprefix = 'right '; $valuetoshow = $langs->trans("Position");
+			if (in_array($value, array('pos', 'position'))) {
+				$valuetoshow = $langs->trans("Position"); $cssprefix = 'right ';
 			}
 			if ($value == 'libelle' || $value == 'label') {
 				$valuetoshow = $langs->trans("Label");
@@ -1992,7 +1989,7 @@ if ($id) {
 							if ($value == 'tracking') {
 								$class .= ' tdoverflowauto';
 							}
-							if ($value == 'position') {
+							if (in_array($value, array('pos', 'position'))) {
 								$class .= ' right';
 							}
 							if ($value == 'localtax1_type') {
@@ -2001,10 +1998,7 @@ if ($id) {
 							if ($value == 'localtax2_type') {
 								$class .= ' nowrap';
 							}
-							if ($value == 'pos') {
-								$class .= ' right';
-							}
-							if ($value == 'use_default') {
+							if (in_array($value, array('use_default', 'fk_parent'))) {
 								$class .= ' center';
 							}
 							if ($value == 'public') {
@@ -2377,7 +2371,10 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 			if ($fieldlist[$field] == 'code') {
 				$class = 'maxwidth100';
 			}
-			if (in_array($fieldlist[$field], array('dayrule', 'day', 'month', 'year', 'pos', 'use_default', 'affect', 'delay', 'position', 'public', 'sortorder', 'sens', 'category_type'))) {
+			if (in_array($fieldlist[$field], array('pos', 'position'))) {
+				$classtd = 'right'; $class = 'maxwidth50 right';
+			}
+			if (in_array($fieldlist[$field], array('dayrule', 'day', 'month', 'year', 'use_default', 'affect', 'delay', 'public', 'sortorder', 'sens', 'category_type', 'fk_parent'))) {
 				$class = 'maxwidth50 center';
 			}
 			if (in_array($fieldlist[$field], array('use_default', 'public'))) {

From 2acbdc2c80be9a2382207226d5755ac49c9cc959 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 7 Jul 2021 18:51:00 +0200
Subject: [PATCH 1069/1497] Fix avoid error message

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

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 97853ab6a37..1ae714afdc5 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -887,7 +887,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify')) {
 				$sql .= "null"; // For vat, we want/accept code = ''
 			} elseif ($keycode == 'content') {
 				$sql .= "'".$db->escape(GETPOST($keycode, 'restricthtml'))."'";
-			} elseif (in_array($keycode, array('joinfile', 'private', 'pos', 'position', 'scale'))) {
+			} elseif (in_array($keycode, array('joinfile', 'private', 'pos', 'position', 'scale', 'use_default'))) {
 				$sql .= (int) GETPOST($keycode, 'int');
 			} else {
 				$sql .= "'".$db->escape(GETPOST($keycode, 'nohtml'))."'";
@@ -956,7 +956,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify')) {
 				$sql .= "null"; // For vat, we want/accept code = ''
 			} elseif ($keycode == 'content') {
 				$sql .= "'".$db->escape(GETPOST($keycode, 'restricthtml'))."'";
-			} elseif (in_array($keycode, array('joinfile', 'private', 'pos', 'position', 'scale'))) {
+			} elseif (in_array($keycode, array('joinfile', 'private', 'pos', 'position', 'scale', 'use_default'))) {
 				$sql .= (int) GETPOST($keycode, 'int');
 			} else {
 				$sql .= "'".$db->escape(GETPOST($keycode, 'nohtml'))."'";

From 34c7295cbcd23606be3f3cd3d73ee9088d7f469d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 7 Jul 2021 21:01:30 +0200
Subject: [PATCH 1070/1497] Make code more jquery compliant

---
 htdocs/core/class/html.formticket.class.php | 29 ++++++++++++++-------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index daafa88333f..2aa2fc85966 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -697,7 +697,8 @@ class FormTicket
 			if ($num_rows == 1) {
 				return '<input type="hidden" name="'.$htmlname.'" id="'.$htmlname.'" value="'.dol_escape_htmltag($groupvalue).'">';
 			}
-			$stringtoprint .= '</select>&nbsp';
+			$stringtoprint .= '</select>&nbsp;';
+
 			$levelid = 1;
 			while ($levelid <= $use_multilevel) {
 				$tabscript = array();
@@ -741,7 +742,7 @@ class FormTicket
 							$iselected = $groupticketchild == $obj->code ?'selected':'';
 							$stringtoprint .= '<option '.$iselected.' class="'.$htmlname.'_'.dol_escape_htmltag($fatherid).'_child_'.$levelid.'" value="'.dol_escape_htmltag($groupvalue).'" data-html="'.dol_escape_htmltag($grouplabel).'">'.dol_escape_htmltag($grouplabel).'</option>';
 							if (empty($tabscript[$groupcodefather])) {
-								$tabscript[$groupcodefather] = 'if($("#'.$htmlname.($levelid > 1 ?'_child_'.$levelid-1:'').'")[0].value == "'.dol_escape_js($groupcodefather).'"){
+								$tabscript[$groupcodefather] = 'if ($("#'.$htmlname.($levelid > 1 ?'_child_'.$levelid-1:'').'")[0].value == "'.dol_escape_js($groupcodefather).'"){
 									$(".'.$htmlname.'_'.dol_escape_htmltag($fatherid).'_child_'.$levelid.'").show()
 									console.log("We show childs tickets of '.$groupcodefather.' group ticket")
 								}else{
@@ -756,23 +757,31 @@ class FormTicket
 					dol_print_error($this->db);
 				}
 				$stringtoprint .='</select>';
+				//$stringtoprint .= ajax_combobox($htmlname.'_child_'.$levelid);
 
 				$stringtoprint .='<script>';
 				$stringtoprint .='arraynotparents = '.json_encode($arraycodenotparent).';';
 				$stringtoprint .='if (arraynotparents.includes($("#'.$htmlname.($levelid > 1 ?'_child_'.$levelid-1:'').'")[0].value)){$("#'.$htmlname.'_child_'.$levelid.'").hide()}
+
 				$("#'.$htmlname.($levelid > 1 ?'_child_'.$levelid-1:'').'").change(function() {
-					child_id = this.attributes.child_id.value;
+					child_id = $("#'.$htmlname.($levelid > 1 ?'_child_'.$levelid-1:'').'").attr("child_id");
+				    console.log("We select a new value into combo child_id="+child_id);
+
+					/* Hide all selected box that are child of the one modified */
 					$(".groupticketchild").each(function(){
-						if(this.attributes.child_id.value > child_id){
-							this.value = ""
-							$(this).attr("style", "display : none;")
+						if ($(this).attr("child_id") > child_id) {
+							console.log("hide child_id="+$(this).attr("child_id"));
+							$(this).val("");
+							$(this).hide();
 						}
 					})
-					$("#'.$htmlname.'_child_'.$levelid.'")[0].value = ""
+
+					/* Now we enable the next combo */
+					$("#'.$htmlname.'_child_'.$levelid.'").val("");
 					if (!arraynotparents.includes(this.value)) {
-					$("#'.$htmlname.'_child_'.$levelid.'").show()
+						$("#'.$htmlname.'_child_'.$levelid.'").show()
 					} else {
-					$("#'.$htmlname.'_child_'.$levelid.'").hide()
+						$("#'.$htmlname.'_child_'.$levelid.'").hide()
 					}
 				';
 				$levelid++;
@@ -782,6 +791,8 @@ class FormTicket
 				$stringtoprint .='})';
 				$stringtoprint .='</script>';
 			}
+			$stringtoprint .= ajax_combobox($htmlname);
+
 			return $stringtoprint;
 		}
 	}

From 470f683d41775377d2f0048fa4849f0d11d3dd3b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Jul 2021 10:38:36 +0200
Subject: [PATCH 1071/1497] Clean code

---
 htdocs/adherents/canvas/default/tpl/adherentcard_create.tpl.php | 2 --
 htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php    | 2 --
 2 files changed, 4 deletions(-)

diff --git a/htdocs/adherents/canvas/default/tpl/adherentcard_create.tpl.php b/htdocs/adherents/canvas/default/tpl/adherentcard_create.tpl.php
index 87b8a6874c4..419b32f3c34 100644
--- a/htdocs/adherents/canvas/default/tpl/adherentcard_create.tpl.php
+++ b/htdocs/adherents/canvas/default/tpl/adherentcard_create.tpl.php
@@ -31,8 +31,6 @@ print load_fiche_titre($this->control->tpl['title']);
 
 dol_htmloutput_errors((is_numeric($object->error) ? '' : $object->error), $object->errors);
 
-dol_htmloutput_errors((is_numeric($GLOBALS['error']) ? '' : $GLOBALS['error']), $GLOBALS['errors']);
-
 dol_htmloutput_errors($this->control->tpl['error'], $this->control->tpl['errors']);
 
 echo $this->control->tpl['ajax_selectcountry']; ?>
diff --git a/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php b/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php
index cceb6310dc2..bc8ff9ebcf4 100644
--- a/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php
+++ b/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php
@@ -30,8 +30,6 @@ print load_fiche_titre($this->control->tpl['title']);
 
 dol_htmloutput_errors((is_numeric($object->error) ? '' : $object->error), $object->errors);
 
-dol_htmloutput_errors((is_numeric($GLOBALS['error']) ? '' : $GLOBALS['error']), $GLOBALS['errors']);
-
 dol_htmloutput_errors($this->control->tpl['error'], $this->control->tpl['errors']);
 
 echo $this->control->tpl['ajax_selectcountry']; ?>

From 16ee47b12c1de9045461ee60963662f0f49cff08 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Jul 2021 11:13:15 +0200
Subject: [PATCH 1072/1497] Fix warning. Reduce memory need for getmin/max on
 large graphs.

---
 htdocs/core/boxes/box_scheduled_jobs.php |  2 +-
 htdocs/core/class/dolgraph.class.php     | 46 ++++++++++++------------
 htdocs/main.inc.php                      |  2 +-
 3 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/htdocs/core/boxes/box_scheduled_jobs.php b/htdocs/core/boxes/box_scheduled_jobs.php
index 793b0cc8c79..53cf5c79571 100644
--- a/htdocs/core/boxes/box_scheduled_jobs.php
+++ b/htdocs/core/boxes/box_scheduled_jobs.php
@@ -85,7 +85,7 @@ class box_scheduled_jobs extends ModeleBoxes
 			$resultarray = array();
 
 			$result = 0;
-			$sql = "SELECT t.rowid, t.datelastrun, t.datenextrun,";
+			$sql = "SELECT t.rowid, t.datelastrun, t.datenextrun, t.datestart,";
 			$sql .= " t.label, t.status, t.test, t.lastresult";
 			$sql .= " FROM " . MAIN_DB_PREFIX . "cronjob as t";
 			$sql .= " WHERE status <> ".$cronstatic::STATUS_DISABLED;
diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php
index b1819e24ab0..17dcdd557a4 100644
--- a/htdocs/core/class/dolgraph.class.php
+++ b/htdocs/core/class/dolgraph.class.php
@@ -596,7 +596,7 @@ class DolGraph
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 * Get max value
+	 * Get max value among all values of all series
 	 *
 	 * @return	int		Max value
 	 */
@@ -607,25 +607,26 @@ class DolGraph
 			return 0;
 		}
 
-		$k = 0;
-		$vals = array();
+		$max = null;
 
-		$nblines = count($this->data);
-		$nbvalues = (empty($this->data[0]) ? 0 : count($this->data[0]) - 1);
+		$nbseries = (empty($this->data[0]) ? 0 : count($this->data[0]) - 1);
 
-		for ($j = 0; $j < $nblines; $j++) {
-			for ($i = 0; $i < $nbvalues; $i++) {
-				$vals[$k] = $this->data[$j][$i + 1];
-				$k++;
+		foreach($this->data as $x) {	// Loop on each x
+			for ($i = 0; $i < $nbseries; $i++) {	// Loop on each serie
+				if (is_null($max)) {
+					$max = $x[$i + 1];		// $i+1 because the index 0 is the legend
+				} elseif ($max < $x[$i + 1]) {
+					$max = $x[$i + 1];
+				}
 			}
 		}
-		rsort($vals);
-		return $vals[0];
+
+		return $max;
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 * Return min value of all data
+	 * Return min value of all values of all series
 	 *
 	 * @return	int		Min value of all data
 	 */
@@ -636,20 +637,21 @@ class DolGraph
 			return 0;
 		}
 
-		$k = 0;
-		$vals = array();
+		$min = null;
 
-		$nblines = count($this->data);
-		$nbvalues = (empty($this->data[0]) ? 0 : count($this->data[0]) - 1);
+		$nbseries = (empty($this->data[0]) ? 0 : count($this->data[0]) - 1);
 
-		for ($j = 0; $j < $nblines; $j++) {
-			for ($i = 0; $i < $nbvalues; $i++) {
-				$vals[$k] = $this->data[$j][$i + 1];
-				$k++;
+		foreach($this->data as $x) {	// Loop on each x
+			for ($i = 0; $i < $nbseries; $i++) {	// Loop on each serie
+				if (is_null($min)) {
+					$min = $x[$i + 1];		// $i+1 because the index 0 is the legend
+				} elseif ($min > $x[$i + 1]) {
+					$min = $x[$i + 1];
+				}
 			}
 		}
-		sort($vals);
-		return $vals[0];
+
+		return $min;
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 9e5d27c26ff..cbc3a2246cf 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1854,7 +1854,7 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 		if (empty($conf->global->MAIN_PRINT_DISABLELINK) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && $conf->browser->layout != 'phone') {
 			$qs = dol_escape_htmltag($_SERVER["QUERY_STRING"]);
 
-			if (is_array($_POST)) {
+			if (isset($_POST) && is_array($_POST)) {
 				foreach ($_POST as $key => $value) {
 					if ($key !== 'action' && $key !== 'password' && !is_array($value)) {
 						$qs .= '&'.$key.'='.urlencode($value);

From 1380344fdb71811463079acf67ffd45679fc9805 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Jul 2021 12:17:32 +0200
Subject: [PATCH 1073/1497] Fix PHP 8

---
 htdocs/admin/company_socialnetworks.php   |  2 +
 htdocs/admin/defaultvalues.php            |  6 +-
 htdocs/admin/mails_senderprofile_list.php |  2 +-
 htdocs/admin/pdf_other.php                |  3 +-
 htdocs/main.inc.php                       |  2 +-
 htdocs/takepos/ajax/ajax.php              |  4 +-
 htdocs/takepos/index.php                  | 46 ++++++------
 htdocs/takepos/invoice.php                | 85 +++++++++++++----------
 htdocs/theme/md/theme_vars.inc.php        | 17 ++++-
 htdocs/user/group/list.php                |  2 +-
 htdocs/user/hierarchy.php                 | 10 ++-
 11 files changed, 106 insertions(+), 73 deletions(-)

diff --git a/htdocs/admin/company_socialnetworks.php b/htdocs/admin/company_socialnetworks.php
index 4809a418861..2d4b2e6d128 100644
--- a/htdocs/admin/company_socialnetworks.php
+++ b/htdocs/admin/company_socialnetworks.php
@@ -74,6 +74,8 @@ if (($action == 'update' && !GETPOST("cancel", 'alpha'))) {
 			}
 		}
 	}
+
+	setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 }
 
 
diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php
index dc801059e41..038d8d0915c 100644
--- a/htdocs/admin/defaultvalues.php
+++ b/htdocs/admin/defaultvalues.php
@@ -241,7 +241,7 @@ if ($defaultvalue) {
 }
 
 
-print '<form action="'.$_SERVER["PHP_SELF"].((empty($user->entity) && !empty($debug)) ? '?debug=1' : '').'" method="POST">';
+print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 if ($optioncss != '') {
 	print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 }
@@ -393,8 +393,8 @@ if (!is_array($result) && $result<0) {
 		// Actions
 		print '<td class="center">';
 		if ($action != 'edit' || GETPOST('rowid') != $defaultvalue->id)	{
-			print '<a class="editfielda marginleftonly marginrightonly" href="'.$_SERVER['PHP_SELF'].'?rowid='.$defaultvalue->id.'&entity='.$defaultvalue->entity.'&mode='.$mode.'&action=edit&token='.newToken().((empty($user->entity) && $debug) ? '&debug=1' : '').'">'.img_edit().'</a>';
-			print '<a class="marginleftonly marginrightonly" href="'.$_SERVER['PHP_SELF'].'?rowid='.$defaultvalue->id.'&entity='.$defaultvalue->entity.'&mode='.$mode.'&action=delete&token='.newToken().((empty($user->entity) && $debug) ? '&debug=1' : '').'">'.img_delete().'</a>';
+			print '<a class="editfielda marginleftonly marginrightonly" href="'.$_SERVER['PHP_SELF'].'?rowid='.$defaultvalue->id.'&entity='.$defaultvalue->entity.'&mode='.$mode.'&action=edit&token='.newToken().'">'.img_edit().'</a>';
+			print '<a class="marginleftonly marginrightonly" href="'.$_SERVER['PHP_SELF'].'?rowid='.$defaultvalue->id.'&entity='.$defaultvalue->entity.'&mode='.$mode.'&action=delete&token='.newToken().'">'.img_delete().'</a>';
 		} else {
 			print '<input type="hidden" name="page" value="'.$page.'">';
 			print '<input type="hidden" name="rowid" value="'.$id.'">';
diff --git a/htdocs/admin/mails_senderprofile_list.php b/htdocs/admin/mails_senderprofile_list.php
index e27c48b0416..8ba5a990c33 100644
--- a/htdocs/admin/mails_senderprofile_list.php
+++ b/htdocs/admin/mails_senderprofile_list.php
@@ -499,7 +499,7 @@ foreach ($object->fields as $key => $val) {
 		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
 			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], empty($search[$key]) ? '' : $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
 		} elseif (strpos($val['type'], 'integer:') === 0) {
-			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
+			print $object->showInputField($val, $key, empty($search[$key]) ? '' : $search[$key], '', '', 'search_', 'maxwidth150', 1);
 		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) {
 			print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag(empty($search[$key]) ? '' : $search[$key]).'">';
 		}
diff --git a/htdocs/admin/pdf_other.php b/htdocs/admin/pdf_other.php
index f836b8f0f0c..ed14f2ac119 100644
--- a/htdocs/admin/pdf_other.php
+++ b/htdocs/admin/pdf_other.php
@@ -78,7 +78,8 @@ $head = pdf_admin_prepare_head();
 
 print dol_get_fiche_head($head, 'other', $langs->trans("other"), -1, 'pdf');
 
-print '<span class="opacitymedium">'.$form->textwithpicto($langs->trans("PDFOtherDesc"), $s)."</span><br>\n";
+$tooltiptext = '';
+print '<span class="opacitymedium">'.$form->textwithpicto($langs->trans("PDFOtherDesc"), $tooltiptext)."</span><br>\n";
 print "<br>\n";
 
 print load_fiche_titre($langs->trans("Proposal"), '', '');
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index cbc3a2246cf..82ff19e3771 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -2063,7 +2063,7 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
 	$dropdownBody .= '<br><b>'.$langs->trans("ConnectedSince").':</b> '.dol_print_date($user->datelastlogin, "dayhour", 'tzuser');
 	$dropdownBody .= '<br><b>'.$langs->trans("PreviousConnexion").':</b> '.dol_print_date($user->datepreviouslogin, "dayhour", 'tzuser');
 	$dropdownBody .= '<br><b>'.$langs->trans("CurrentTheme").':</b> '.$conf->theme;
-	$dropdownBody .= '<br><b>'.$langs->trans("CurrentMenuManager").':</b> '.$menumanager->name;
+	$dropdownBody .= '<br><b>'.$langs->trans("CurrentMenuManager").':</b> '.(isset($menumanager) ? $menumanager->name : 'unknown');
 	$langFlag = picto_from_langcode($langs->getDefaultLang());
 	$dropdownBody .= '<br><b>'.$langs->trans("CurrentUserLanguage").':</b> '.($langFlag ? $langFlag.' ' : '').$langs->getDefaultLang();
 
diff --git a/htdocs/takepos/ajax/ajax.php b/htdocs/takepos/ajax/ajax.php
index 0ccdeb86b9b..30635c58b8c 100644
--- a/htdocs/takepos/ajax/ajax.php
+++ b/htdocs/takepos/ajax/ajax.php
@@ -60,11 +60,11 @@ if (empty($user->rights->takepos->run)) {
 if ($action == 'getProducts') {
 	$object = new Categorie($db);
 	if ($category == "supplements") {
-		$category = $conf->global->TAKEPOS_SUPPLEMENTS_CATEGORY;
+		$category = getDolGlobalInt('TAKEPOS_SUPPLEMENTS_CATEGORY');
 	}
 	$result = $object->fetch($category);
 	if ($result > 0) {
-		$prods = $object->getObjectsInCateg("product", 0, 0, 0, $conf->global->TAKEPOS_SORTPRODUCTFIELD, 'ASC');
+		$prods = $object->getObjectsInCateg("product", 0, 0, 0, getDolGlobalString('TAKEPOS_SORTPRODUCTFIELD'), 'ASC');
 		// Removed properties we don't need
 		if (is_array($prods) && count($prods) > 0) {
 			foreach ($prods as $prod) {
diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index 7e2a2d5c1e1..1ddab39dcbe 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -703,12 +703,12 @@ function TakeposPrintingTemp(){
 }
 
 function OpenDrawer(){
-	console.log("OpenDrawer call ajax url http://<?php print $conf->global->TAKEPOS_PRINT_SERVER; ?>:8111/print");
+	console.log("OpenDrawer call ajax url http://<?php print getDolGlobalString('TAKEPOS_PRINT_SERVER'); ?>:8111/print");
 	$.ajax({
 		type: "POST",
 		data: { token: 'notrequired' },
 		<?php
-		if (filter_var($conf->global->TAKEPOS_PRINT_SERVER, FILTER_VALIDATE_URL) == true) {
+		if (getDolGlobalString('TAKEPOS_PRINT_SERVER') && filter_var($conf->global->TAKEPOS_PRINT_SERVER, FILTER_VALIDATE_URL) == true) {
 			echo "url: '".$conf->global->TAKEPOS_PRINT_SERVER."/printer/drawer.php',";
 		} else {
 			echo "url: 'http://".$conf->global->TAKEPOS_PRINT_SERVER.":8111/print',";
@@ -781,7 +781,7 @@ function WeighingScale(){
 	$.ajax({
 		type: "POST",
 		data: { token: 'notrequired' },
-		url: '<?php print $conf->global->TAKEPOS_PRINT_SERVER; ?>/scale/index.php',
+		url: '<?php print getDolGlobalString('TAKEPOS_PRINT_SERVER'); ?>/scale/index.php',
 	})
 	.done(function( editnumber ) {
 		$("#poslines").load("invoice.php?action=updateqty&place="+place+"&idline="+selectedline+"&number="+editnumber, function() {
@@ -799,7 +799,7 @@ $( document ).ready(function() {
 	if ($_SESSION["takeposterminal"] == "") {
 		print "ModalBox('ModalTerminal');";
 	}
-	if ($conf->global->TAKEPOS_CONTROL_CASH_OPENING) {
+	if (getDolGlobalString('TAKEPOS_CONTROL_CASH_OPENING')) {
 		$sql = "SELECT rowid, status FROM ".MAIN_DB_PREFIX."pos_cash_fence WHERE";
 		$sql .= " entity = ".$conf->entity." AND ";
 		$sql .= " date_creation > '".$db->idate(dol_get_first_hour(dol_now()))."'";
@@ -818,7 +818,7 @@ $( document ).ready(function() {
 
 <body class="bodytakepos" style="overflow: hidden;">
 <?php
-$keyCodeForEnter = $conf->global->{'CASHDESK_READER_KEYCODE_FOR_ENTER'.$_SESSION['takeposterminal']} > 0 ? $conf->global->{'CASHDESK_READER_KEYCODE_FOR_ENTER'.$_SESSION['takeposterminal']} : '';
+$keyCodeForEnter = getDolGlobalInt('CASHDESK_READER_KEYCODE_FOR_ENTER'.$_SESSION['takeposterminal']) > 0 ? getDolGlobalInt('CASHDESK_READER_KEYCODE_FOR_ENTER'.$_SESSION['takeposterminal']) : '';
 ?>
 <div class="container">
 
@@ -1036,41 +1036,41 @@ $menus[$r++] = array('title'=>'<span class="fa fa-cube paddingrightonly"></span>
 $menus[$r++] = array('title'=>'<span class="fa fa-percent paddingrightonly"></span><div class="trunc">'.$langs->trans("Reduction").'</div>', 'action'=>'Reduction();');
 $menus[$r++] = array('title'=>'<span class="far fa-money-bill-alt paddingrightonly"></span><div class="trunc">'.$langs->trans("Payment").'</div>', 'action'=>'CloseBill();');
 
-if ($conf->global->TAKEPOS_DIRECT_PAYMENT) {
+if (getDolGlobalString('TAKEPOS_DIRECT_PAYMENT')) {
 	$menus[$r++] = array('title'=>'<span class="far fa-money-bill-alt paddingrightonly"></span><div class="trunc">'.$langs->trans("DirectPayment").' <span class="opacitymedium">('.$langs->trans("Cash").')</span></div>', 'action'=>'DirectPayment();');
 }
 
 // BAR RESTAURANT specific menu
-if ($conf->global->TAKEPOS_BAR_RESTAURANT) {
+if (getDolGlobalString('TAKEPOS_BAR_RESTAURANT')) {
 	if ($conf->global->TAKEPOS_ORDER_PRINTERS) {
 		$menus[$r++] = array('title'=>'<span class="fa fa-blender-phone paddingrightonly"></span><div class="trunc">'.$langs->trans("Order").'</span>', 'action'=>'TakeposPrintingOrder();');
 	}
 	//Button to print receipt before payment
-	if ($conf->global->TAKEPOS_BAR_RESTAURANT) {
-		if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector") {
-			if (filter_var($conf->global->TAKEPOS_PRINT_SERVER, FILTER_VALIDATE_URL) == true) {
+	if (getDolGlobalString('TAKEPOS_BAR_RESTAURANT')) {
+		if (getDolGlobalString('TAKEPOS_PRINT_METHOD') == "takeposconnector") {
+			if (getDolGlobalString('TAKEPOS_PRINT_SERVER') && filter_var($conf->global->TAKEPOS_PRINT_SERVER, FILTER_VALIDATE_URL) == true) {
 				$menus[$r++] = array('title'=>'<span class="fa fa-receipt paddingrightonly"></span><div class="trunc">'.$langs->trans("Receipt").'</div>', 'action'=>'TakeposConnector(placeid);');
 			} else {
 				$menus[$r++] = array('title'=>'<span class="fa fa-receipt paddingrightonly"></span><div class="trunc">'.$langs->trans("Receipt").'</div>', 'action'=>'TakeposPrinting(placeid);');
 			}
-		} elseif ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter") {
+		} elseif (getDolGlobalString('TAKEPOS_PRINT_METHOD') == "receiptprinter") {
 			$menus[$r++] = array('title'=>'<span class="fa fa-receipt paddingrightonly"></span><div class="trunc">'.$langs->trans("Receipt").'</div>', 'action'=>'DolibarrTakeposPrinting(placeid);');
 		} else {
 			$menus[$r++] = array('title'=>'<span class="fa fa-receipt paddingrightonly"></span><div class="trunc">'.$langs->trans("Receipt").'</div>', 'action'=>'Print(placeid);');
 		}
 	}
-	if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector" && $conf->global->TAKEPOS_ORDER_NOTES == 1) {
+	if (getDolGlobalString('TAKEPOS_PRINT_METHOD') == "takeposconnector" && getDolGlobalString('TAKEPOS_ORDER_NOTES') == 1) {
 		$menus[$r++] = array('title'=>'<span class="fa fa-sticky-note paddingrightonly"></span><div class="trunc">'.$langs->trans("OrderNotes").'</div>', 'action'=>'TakeposOrderNotes();');
 	}
-	if ($conf->global->TAKEPOS_SUPPLEMENTS) {
+	if (getDolGlobalString('TAKEPOS_SUPPLEMENTS')) {
 		$menus[$r++] = array('title'=>'<span class="fa fa-receipt paddingrightonly"></span><div class="trunc">'.$langs->trans("ProductSupplements").'</div>', 'action'=>'LoadProducts(\'supplements\');');
 	}
 }
 
-if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector") {
+if (getDolGlobalString('TAKEPOS_PRINT_METHOD') == "takeposconnector") {
 	$menus[$r++] = array('title'=>'<span class="fa fa-receipt paddingrightonly"></span><div class="trunc">'.$langs->trans("DOL_OPEN_DRAWER").'</div>', 'action'=>'OpenDrawer();');
 }
-if ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter") {
+if (getDolGlobalString('TAKEPOS_PRINT_METHOD') == "receiptprinter") {
 	$menus[$r++] = array(
 		'title' => '<span class="fa fa-receipt paddingrightonly"></span><div class="trunc">'.$langs->trans("DOL_OPEN_DRAWER").'</div>',
 		'action' => 'DolibarrOpenDrawer();',
@@ -1112,7 +1112,7 @@ if (!empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
 	$menus[$r++] = array('title'=>'<span class="fa fa-sign-out-alt paddingrightonly"></span><div class="trunc">'.$langs->trans("Logout").'</div>', 'action'=>'window.location.href=\''.DOL_URL_ROOT.'/user/logout.php\';');
 }
 
-if ($conf->global->TAKEPOS_WEIGHING_SCALE) {
+if (!empty($conf->global->TAKEPOS_WEIGHING_SCALE)) {
 	$menus[$r++] = array('title'=>'<span class="fa fa-balance-scale paddingrightonly"></span><div class="trunc">'.$langs->trans("WeighingScale").'</div>', 'action'=>'WeighingScale();');
 }
 
@@ -1124,12 +1124,12 @@ if ($conf->global->TAKEPOS_WEIGHING_SCALE) {
 		foreach ($menus as $menu) {
 			$i++;
 			if (count($menus) > 12 and $i == 12) {
-				echo '<button style="'.$menu['style'].'" type="button" id="actionnext" class="actionbutton" onclick="MoreActions('.count($menus).');">'.$langs->trans("Next").'</button>';
-				echo '<button style="display: none;" type="button" id="action'.$i.'" class="actionbutton" onclick="'.$menu['action'].'">'.$menu['title'].'</button>';
+				echo '<button style="'.(empty($menu['style']) ? '' : $menu['style']).'" type="button" id="actionnext" class="actionbutton" onclick="MoreActions('.count($menus).');">'.$langs->trans("Next").'</button>';
+				echo '<button style="display: none;" type="button" id="action'.$i.'" class="actionbutton" onclick="'.(empty($menu['action']) ? '' : $menu['action']).'">'.$menu['title'].'</button>';
 			} elseif ($i > 12) {
-				echo '<button style="display: none;" type="button" id="action'.$i.'" class="actionbutton" onclick="'.$menu['action'].'">'.$menu['title'].'</button>';
+				echo '<button style="display: none;" type="button" id="action'.$i.'" class="actionbutton" onclick="'.(empty($menu['action']) ? '' : $menu['action']).'">'.$menu['title'].'</button>';
 			} else {
-				echo '<button style="'.$menu['style'].'" type="button" id="action'.$i.'" class="actionbutton" onclick="'.$menu['action'].'">'.$menu['title'].'</button>';
+				echo '<button style="'.(empty($menu['style']) ? '' : $menu['style']).'" type="button" id="action'.$i.'" class="actionbutton" onclick="'.(empty($menu['action']) ? '' : $menu['action']).'">'.$menu['title'].'</button>';
 			}
 		}
 
@@ -1169,7 +1169,7 @@ if ($conf->global->TAKEPOS_WEIGHING_SCALE) {
 					//echo '<img class="imgwrapper" src="img/arrow-next-top.png" height="100%" id="catimg'.$count.'" />';
 					echo '<span class="fa fa-chevron-right centerinmiddle" style="font-size: 5em;"></span>';
 				} else {
-					if (!$conf->global->TAKEPOS_HIDE_CATEGORY_IMAGES) {
+					if (!getDolGlobalString('TAKEPOS_HIDE_CATEGORY_IMAGES')) {
 						echo '<img class="imgwrapper" height="100%" id="catimg'.$count.'" />';
 					}
 				}
@@ -1208,7 +1208,7 @@ if ($conf->global->TAKEPOS_WEIGHING_SCALE) {
 						//echo '<img class="imgwrapper" src="img/arrow-next-top.png" height="100%" id="proimg'.$count.'" />';
 						print '<span class="fa fa-chevron-right centerinmiddle" style="font-size: 5em;"></span>';
 					} else {
-						if ($conf->global->TAKEPOS_HIDE_PRODUCT_IMAGES) {
+						if (getDolGlobalString('TAKEPOS_HIDE_PRODUCT_IMAGES')) {
 							echo '<button type="button" id="probutton'.$count.'" class="productbutton" style="display: none;"></button>';
 						} else {
 							print '<div class="" id="proprice'.$count.'"></div>';
@@ -1216,7 +1216,7 @@ if ($conf->global->TAKEPOS_WEIGHING_SCALE) {
 						}
 					}
 					?>
-					<?php if ($count != ($MAXPRODUCT - 2) && $count != ($MAXPRODUCT - 1) && !$conf->global->TAKEPOS_HIDE_PRODUCT_IMAGES) { ?>
+					<?php if ($count != ($MAXPRODUCT - 2) && $count != ($MAXPRODUCT - 1) && !getDolGlobalString('TAKEPOS_HIDE_PRODUCT_IMAGES')) { ?>
 					<div class="description" id="prodivdesc<?php echo $count; ?>">
 						<div class="description_content" id="prodesc<?php echo $count; ?>"></div>
 					</div>
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index f55f84130b6..8cef291c2d7 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -70,10 +70,10 @@ if (empty($user->rights->takepos->run) && !defined('INCLUDE_PHONEPAGE_FROM_PUBLI
  * View
  */
 
-if (($conf->global->TAKEPOS_PHONE_BASIC_LAYOUT == 1 && $conf->browser->layout == 'phone') || defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
+if ((getDolGlobalString('TAKEPOS_PHONE_BASIC_LAYOUT') == 1 && $conf->browser->layout == 'phone') || defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
 	// DIRECT LINK TO THIS PAGE FROM MOBILE AND NO TERMINAL SELECTED
 	if ($_SESSION["takeposterminal"] == "") {
-		if ($conf->global->TAKEPOS_NUM_TERMINALS == "1") {
+		if (getDolGlobalString('TAKEPOS_NUM_TERMINALS') == "1") {
 			$_SESSION["takeposterminal"] = 1;
 		} else {
 			header("Location: ".DOL_URL_ROOT."/takepos/index.php");
@@ -94,6 +94,8 @@ if (($conf->global->TAKEPOS_PHONE_BASIC_LAYOUT == 1 && $conf->browser->layout ==
 	'/takepos/js/jquery.colorbox-min.js'
 	);
 	$arrayofjs = array('/takepos/js/jquery.colorbox-min.js');
+	$disablejs = 0;
+	$disablehead = 0;
 	top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
 }
 
@@ -132,12 +134,19 @@ if ($pay == 'cheque') {
 }
 
 // Retrieve paiementid
-$sql = "SELECT id FROM ".MAIN_DB_PREFIX."c_paiement";
-$sql .= " WHERE entity IN (".getEntity('c_paiement').")";
-$sql .= " AND code = '".$db->escape($paycode)."'";
-$resql = $db->query($sql);
-$obj = $db->fetch_object($resql);
-$paiementid = $obj->id;
+$paiementid = 0;
+if ($paycode) {
+	$sql = "SELECT id FROM ".MAIN_DB_PREFIX."c_paiement";
+	$sql .= " WHERE entity IN (".getEntity('c_paiement').")";
+	$sql .= " AND code = '".$db->escape($paycode)."'";
+	$resql = $db->query($sql);
+	if ($resql) {
+		$obj = $db->fetch_object($resql);
+		if ($obj) {
+			$paiementid = $obj->id;
+		}
+	}
+}
 
 $invoice = new Facture($db);
 if ($invoiceid > 0) {
@@ -164,7 +173,7 @@ if ($invoice->socid > 0) {
  */
 
 // Change the currency of invoice if it was modified
-if (!empty($conf->multicurrency->enabled) && $_SESSION["takeposcustomercurrency"] != "") {
+if (!empty($conf->multicurrency->enabled) && !empty($_SESSION["takeposcustomercurrency"])) {
 	if ($invoice->multicurrency_code != $_SESSION["takeposcustomercurrency"]) {
 		$invoice->setMulticurrencyCode($_SESSION["takeposcustomercurrency"]);
 	}
@@ -855,25 +864,25 @@ if ($action == "valid" || $action == "history" || $action == 'creditnote') {
 		}
 	}
 	$sectionwithinvoicelink .= '</span><br>';
-	if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector") {
-		if (filter_var($conf->global->TAKEPOS_PRINT_SERVER, FILTER_VALIDATE_URL) == true) {
+	if (getDolGlobalString('TAKEPOS_PRINT_METHOD') == "takeposconnector") {
+		if (getDolGlobalString('TAKEPOS_PRINT_SERVER') && filter_var($conf->global->TAKEPOS_PRINT_SERVER, FILTER_VALIDATE_URL) == true) {
 			$sectionwithinvoicelink .= ' <button id="buttonprint" type="button" onclick="TakeposConnector('.$placeid.');">'.$langs->trans('PrintTicket').'</button>';
 		} else {
 			$sectionwithinvoicelink .= ' <button id="buttonprint" type="button" onclick="TakeposPrinting('.$placeid.');">'.$langs->trans('PrintTicket').'</button>';
 		}
-	} elseif ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter") {
+	} elseif (getDolGlobalString('TAKEPOS_PRINT_METHOD') == "receiptprinter") {
 		$sectionwithinvoicelink .= ' <button id="buttonprint" type="button" onclick="DolibarrTakeposPrinting('.$placeid.');">'.$langs->trans('PrintTicket').'</button>';
 	} else {
 		$sectionwithinvoicelink .= ' <button id="buttonprint" type="button" onclick="Print('.$placeid.');">'.$langs->trans('PrintTicket').'</button>';
-		if ($conf->global->TAKEPOS_GIFT_RECEIPT) {
+		if (getDolGlobalString('TAKEPOS_GIFT_RECEIPT')) {
 			$sectionwithinvoicelink .= ' <button id="buttonprint" type="button" onclick="Print('.$placeid.', 1);">'.$langs->trans('GiftReceipt').'</button>';
 		}
 	}
-	if ($conf->global->TAKEPOS_EMAIL_TEMPLATE_INVOICE > 0) {
+	if (getDolGlobalString('TAKEPOS_EMAIL_TEMPLATE_INVOICE') && $conf->global->TAKEPOS_EMAIL_TEMPLATE_INVOICE > 0) {
 		$sectionwithinvoicelink .= ' <button id="buttonsend" type="button" onclick="SendTicket('.$placeid.');">'.$langs->trans('SendTicket').'</button>';
 	}
 
-	if ($remaintopay <= 0 && $conf->global->TAKEPOS_AUTO_PRINT_TICKETS) {
+	if ($remaintopay <= 0 && getDolGlobalString('TAKEPOS_AUTO_PRINT_TICKETS')) {
 		$sectionwithinvoicelink .= '<script language="javascript">$("#buttonprint").click();</script>';
 	}
 }
@@ -891,7 +900,7 @@ var selectedline=0;
 var selectedtext="";
 var placeid=<?php echo ($placeid > 0 ? $placeid : 0); ?>;
 $(document).ready(function() {
-	var idoflineadded = <?php echo ($idoflineadded ? $idoflineadded : 0); ?>;
+	var idoflineadded = <?php echo (empty($idoflineadded) ? 0 : $idoflineadded); ?>;
 
 	$('.posinvoiceline').click(function(){
 		console.log("Click done on "+this.id);
@@ -1017,7 +1026,7 @@ function TakeposPrinting(id){
 		receipt=data.replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, '');
 		$.ajax({
 			type: "POST",
-			url: 'http://<?php print $conf->global->TAKEPOS_PRINT_SERVER; ?>:8111/print',
+			url: 'http://<?php print getDolGlobalString('TAKEPOS_PRINT_SERVER'); ?>:8111/print',
 			data: receipt
 		});
 	});
@@ -1028,7 +1037,7 @@ function TakeposConnector(id){
 	$.get("<?php echo DOL_URL_ROOT; ?>/takepos/ajax/ajax.php?action=printinvoiceticket&term=<?php echo urlencode($_SESSION["takeposterminal"]); ?>&id="+id+"&token=<?php echo currentToken(); ?>", function(data, status) {
 		$.ajax({
 			type: "POST",
-			url: '<?php print $conf->global->TAKEPOS_PRINT_SERVER; ?>/printer/index.php',
+			url: '<?php print getDolGlobalString('TAKEPOS_PRINT_SERVER'); ?>/printer/index.php',
 			data: 'invoice='+data
 		});
 	});
@@ -1083,6 +1092,7 @@ $( document ).ready(function() {
 	$sql .= $db->order('datec', 'ASC');
 	$resql = $db->query($sql);
 	if ($resql) {
+		$max_sale = 0;
 		while ($obj = $db->fetch_object($resql)) {
 			echo '$("#customerandsales").append(\'';
 			echo '<a class="valignmiddle" title="'.dol_escape_js($langs->trans("SaleStartedAt", dol_print_date($db->jdate($obj->datec), '%H:%M', 'tzuser'))).'" onclick="place=\\\'';
@@ -1173,10 +1183,10 @@ $( document ).ready(function() {
 // for tooltip and other js beautifiers must be reexecuted too.
 if (!empty($conf->use_javascript_ajax)) {
 	print "\n".'<!-- Includes JS Footer of Dolibarr -->'."\n";
-	print '<script src="'.DOL_URL_ROOT.'/core/js/lib_foot.js.php?lang='.$langs->defaultlang.($ext ? '&'.$ext : '').'"></script>'."\n";
+	print '<script src="'.DOL_URL_ROOT.'/core/js/lib_foot.js.php?lang='.$langs->defaultlang.'"></script>'."\n";
 }
 
-print '<!-- invoice.php place='.(int) $place.' invoice='.$invoice->ref.' mobilepage='.$mobilepage.' $_SESSION["basiclayout"]='.$_SESSION["basiclayout"].' conf->global->TAKEPOS_BAR_RESTAURANT='.$conf->global->TAKEPOS_BAR_RESTAURANT.' -->'."\n";
+print '<!-- invoice.php place='.(int) $place.' invoice='.$invoice->ref.' mobilepage='.(empty($mobilepage) ? '' : $mobilepage).' $_SESSION["basiclayout"]='.(empty($_SESSION["basiclayout"])?'':$_SESSION["basiclayout"]).' conf->global->TAKEPOS_BAR_RESTAURANT='.getDolGlobalString('TAKEPOS_BAR_RESTAURANT').' -->'."\n";
 print '<div class="div-table-responsive-no-min invoice">';
 print '<table id="tablelines" class="noborder noshadow postablelines" width="100%">';
 if ($sectionwithinvoicelink && ($mobilepage == "invoice" || $mobilepage == "")) {
@@ -1189,10 +1199,10 @@ if ($sectionwithinvoicelink && ($mobilepage == "invoice" || $mobilepage == ""))
 print '<tr class="liste_titre nodrag nodrop">';
 print '<td class="linecoldescription">';
 // In phone version only show when it is invoice page
-if ($mobilepage == "invoice" || $mobilepage == "") {
+if (empty($mobilepage) || $mobilepage == "invoice") {
 	print '<input type="hidden" name="invoiceid" id="invoiceid" value="'.$invoice->id.'">';
 }
-if ($conf->global->TAKEPOS_BAR_RESTAURANT) {
+if (getDolGlobalString('TAKEPOS_BAR_RESTAURANT')) {
 	$sql = "SELECT floor, label FROM ".MAIN_DB_PREFIX."takepos_floor_tables where rowid=".((int) $place);
 	$resql = $db->query($sql);
 	$obj = $db->fetch_object($resql);
@@ -1215,14 +1225,14 @@ if ($conf->global->TAKEPOS_BAR_RESTAURANT) {
 	print $langs->trans("Products");
 }
 print '</td>';
-if ($_SESSION["basiclayout"] != 1) {
+if (empty($_SESSION["basiclayout"]) || $_SESSION["basiclayout"] != 1) {
 	print '<td class="linecolqty right">'.$langs->trans('ReductionShort').'</td>';
 	print '<td class="linecolqty right">'.$langs->trans('Qty').'</td>';
-	if ($conf->global->TAKEPOS_SHOW_HT) {
+	if (getDolGlobalString('TAKEPOS_SHOW_HT')) {
 		print '<td class="linecolht right nowraponall">';
 		print '<span class="opacitymedium small">' . $langs->trans('TotalHTShort') . '</span><br>';
 		// In phone version only show when it is invoice page
-		if ($mobilepage == "invoice" || $mobilepage == "") {
+		if (empty($mobilepage) || $mobilepage == "invoice") {
 			print '<span id="linecolht-span-total" style="font-size:1.3em; font-weight: bold;">' . price($invoice->total_ht, 1, '', 1, -1, -1, $conf->currency) . '</span>';
 			if (!empty($conf->multicurrency->enabled) && $_SESSION["takeposcustomercurrency"] != "" && $conf->currency != $_SESSION["takeposcustomercurrency"]) {
 				//Only show customer currency if multicurrency module is enabled, if currency selected and if this currency selected is not the same as main currency
@@ -1238,9 +1248,9 @@ if ($_SESSION["basiclayout"] != 1) {
 	print '<td class="linecolht right nowraponall">';
 	print '<span class="opacitymedium small">'.$langs->trans('TotalTTCShort').'</span><br>';
 	// In phone version only show when it is invoice page
-	if ($mobilepage == "invoice" || $mobilepage == "") {
+	if (empty($mobilepage) || $mobilepage == "invoice") {
 		print '<span id="linecolht-span-total" style="font-size:1.3em; font-weight: bold;">'.price($invoice->total_ttc, 1, '', 1, -1, -1, $conf->currency).'</span>';
-		if (!empty($conf->multicurrency->enabled) && $_SESSION["takeposcustomercurrency"] != "" && $conf->currency != $_SESSION["takeposcustomercurrency"]) {
+		if (!empty($conf->multicurrency->enabled) && !empty($_SESSION["takeposcustomercurrency"]) && $conf->currency != $_SESSION["takeposcustomercurrency"]) {
 			//Only show customer currency if multicurrency module is enabled, if currency selected and if this currency selected is not the same as main currency
 			include_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
 			$multicurrency = new MultiCurrency($db);
@@ -1256,7 +1266,7 @@ if ($_SESSION["basiclayout"] != 1) {
 print "</tr>\n";
 
 
-if ($_SESSION["basiclayout"] == 1) {
+if (!empty($_SESSION["basiclayout"]) && $_SESSION["basiclayout"] == 1) {
 	if ($mobilepage == "cats") {
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$categorie = new Categorie($db);
@@ -1336,13 +1346,14 @@ if ($_SESSION["basiclayout"] == 1) {
 
 if ($placeid > 0) {
 	//In Phone basic layout hide some content depends situation
-	if ($_SESSION["basiclayout"] == 1 && $mobilepage != "invoice" && $action != "order") {
+	if (!empty($_SESSION["basiclayout"]) && $_SESSION["basiclayout"] == 1 && $mobilepage != "invoice" && $action != "order") {
 		return;
 	}
 
 	if (is_array($invoice->lines) && count($invoice->lines)) {
 		print '<!-- invoice.php show lines of invoices -->'."\n";
 		$tmplines = array_reverse($invoice->lines);
+		$htmlsupplements = array();
 		foreach ($tmplines as $line) {
 			if ($line->fk_parent_line != false) {
 				$htmlsupplements[$line->fk_parent_line] .= '<tr class="drag drop oddeven posinvoiceline';
@@ -1367,7 +1378,7 @@ if ($placeid > 0) {
 					}
 				}
 				$htmlsupplements[$line->fk_parent_line] .= '</td>';
-				if ($_SESSION["basiclayout"] != 1) {
+				if (empty($_SESSION["basiclayout"]) || $_SESSION["basiclayout"] != 1) {
 					$htmlsupplements[$line->fk_parent_line] .= '<td class="right">'.vatrate($line->remise_percent, true).'</td>';
 					$htmlsupplements[$line->fk_parent_line] .= '<td class="right">'.$line->qty.'</td>';
 					$htmlsupplements[$line->fk_parent_line] .= '<td class="right">'.price($line->total_ttc).'</td>';
@@ -1383,7 +1394,7 @@ if ($placeid > 0) {
 			}
 			$htmlforlines .= '" id="'.$line->id.'">';
 			$htmlforlines .= '<td class="left">';
-			if ($_SESSION["basiclayout"] == 1) {
+			if (!empty($_SESSION["basiclayout"]) && $_SESSION["basiclayout"] == 1) {
 				$htmlforlines .= '<span class="phoneqty">'.$line->qty."</span> x ";
 			}
 			if (isset($line->product_type)) {
@@ -1425,10 +1436,10 @@ if ($placeid > 0) {
 			if (!empty($line->array_options['options_order_notes'])) {
 				$htmlforlines .= "<br>(".$line->array_options['options_order_notes'].")";
 			}
-			if ($_SESSION["basiclayout"] == 1) {
+			if (!empty($_SESSION["basiclayout"]) && $_SESSION["basiclayout"] == 1) {
 				$htmlforlines .= '</td><td class="right phonetable"><button type="button" onclick="SetQty(place, '.$line->rowid.', '.($line->qty - 1).');" class="publicphonebutton2 phonered">-</button>&nbsp;&nbsp;<button type="button" onclick="SetQty(place, '.$line->rowid.', '.($line->qty + 1).');" class="publicphonebutton2 phonegreen">+</button>';
 			}
-			if ($_SESSION["basiclayout"] != 1) {
+			if (empty($_SESSION["basiclayout"]) || $_SESSION["basiclayout"] != 1) {
 				$moreinfo = '';
 				$moreinfo .= $langs->transcountry("TotalHT", $mysoc->country_code).': '.price($line->total_ht);
 				if ($line->vat_src_code) {
@@ -1479,10 +1490,10 @@ if ($placeid > 0) {
 				}
 
 				$htmlforlines .= '</td>';
-				if ($conf->global->TAKEPOS_SHOW_HT) {
+				if (getDolGlobalString('TAKEPOS_SHOW_HT')) {
 					$htmlforlines .= '<td class="right classfortooltip" title="'.$moreinfo.'">';
 					$htmlforlines .= price($line->total_ht, 1, '', 1, -1, -1, $conf->currency);
-					if (!empty($conf->multicurrency->enabled) && $_SESSION["takeposcustomercurrency"] != "" && $conf->currency != $_SESSION["takeposcustomercurrency"]) {
+					if (!empty($conf->multicurrency->enabled) && !empty($_SESSION["takeposcustomercurrency"]) && $conf->currency != $_SESSION["takeposcustomercurrency"]) {
 						//Only show customer currency if multicurrency module is enabled, if currency selected and if this currency selected is not the same as main currency
 						include_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
 						$multicurrency = new MultiCurrency($db);
@@ -1493,7 +1504,7 @@ if ($placeid > 0) {
 				}
 				$htmlforlines .= '<td class="right classfortooltip" title="'.$moreinfo.'">';
 				$htmlforlines .= price($line->total_ttc, 1, '', 1, -1, -1, $conf->currency);
-				if (!empty($conf->multicurrency->enabled) && $_SESSION["takeposcustomercurrency"] != "" && $conf->currency != $_SESSION["takeposcustomercurrency"]) {
+				if (!empty($conf->multicurrency->enabled) && !empty($_SESSION["takeposcustomercurrency"]) && $conf->currency != $_SESSION["takeposcustomercurrency"]) {
 					//Only show customer currency if multicurrency module is enabled, if currency selected and if this currency selected is not the same as main currency
 					include_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
 					$multicurrency = new MultiCurrency($db);
@@ -1503,7 +1514,7 @@ if ($placeid > 0) {
 				$htmlforlines .= '</td>';
 			}
 			$htmlforlines .= '</tr>'."\n";
-			$htmlforlines .= $htmlsupplements[$line->id];
+			$htmlforlines .= empty($htmlsupplements[$line->id]) ? '' : empty($htmlsupplements[$line->id]);
 
 			print $htmlforlines;
 		}
diff --git a/htdocs/theme/md/theme_vars.inc.php b/htdocs/theme/md/theme_vars.inc.php
index 9e98a863737..fd37b6376dd 100644
--- a/htdocs/theme/md/theme_vars.inc.php
+++ b/htdocs/theme/md/theme_vars.inc.php
@@ -65,6 +65,9 @@ $colortext = '0,0,0';
 $colortextlink = '0,0,120';
 $fontsize = '14';
 $fontsizesmaller = '11';
+$topMenuFontSize = '1.1em';
+$toolTipBgColor = 'rgba(255, 255, 255, 0.96)';
+$toolTipFontColor = '#333';
 
 // text color
 $textSuccess   = '#28a745';
@@ -83,9 +86,15 @@ $badgeInfo      = '#17a2b8';
 $badgeDark      = '#343a40';
 $badgeLight     = '#f8f9fa';
 
+// badge color ajustement for color blind
+$colorblind_deuteranopes_badgeSuccess   = '#37de5d'; //! text color black
+$colorblind_deuteranopes_badgeSuccess_textColor7 = '#000';
+$colorblind_deuteranopes_badgeWarning   = '#e4e411';
+$colorblind_deuteranopes_badgeDanger    = $badgeDanger; // currently not tested with a color blind people so use default color
+
 /* default color for status : After a quick check, somme status can have oposite function according to objects
 *  So this badges status uses default value according to theme eldy status img
-*  TODO: use color definition vars above for define badges color status X -> expemple $badgeStatusValidate, $badgeStatusClosed, $badgeStatusActive ....
+*  TODO: use color definition vars above for define badges color status X -> exemple $badgeStatusValidate, $badgeStatusClosed, $badgeStatusActive ....
 */
 $badgeStatus0 = '#cbd3d3';
 $badgeStatus1 = '#bc9526';
@@ -99,3 +108,9 @@ $badgeStatus8 = '#993013';
 $badgeStatus9 = '#e7f0f0';
 $badgeStatus10 = '#993013';
 $badgeStatus11 = '#15a540';
+
+// status color ajustement for color blind
+$colorblind_deuteranopes_badgeStatus4 = $colorblind_deuteranopes_badgeStatus7 = $colorblind_deuteranopes_badgeSuccess; //! text color black
+$colorblind_deuteranopes_badgeStatus_textColor4 = $colorblind_deuteranopes_badgeStatus_textColor7 = '#000';
+$colorblind_deuteranopes_badgeStatus1 = $colorblind_deuteranopes_badgeWarning;
+$colorblind_deuteranopes_badgeStatus_textColor1 = '#000';
diff --git a/htdocs/user/group/list.php b/htdocs/user/group/list.php
index 493383076b0..04fa0035418 100644
--- a/htdocs/user/group/list.php
+++ b/htdocs/user/group/list.php
@@ -35,6 +35,7 @@ $sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all',
 $search_group = GETPOST('search_group');
 $optioncss = GETPOST('optioncss', 'alpha');
 $massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
+$contextpage = GETPOST('optioncss', 'aZ09');
 
 // Defini si peux lire/modifier utilisateurs et permisssions
 $caneditperms = ($user->admin || $user->rights->user->user->creer);
@@ -168,7 +169,6 @@ if ($resql) {
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-	print '<input type="hidden" name="mode" value="'.$mode.'">';
 	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
 	print_barre_liste($text, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, "", $num, $nbtotalofrecords, 'object_group', 0, $newcardbutton, '', $limit, 0, 0, 1);
diff --git a/htdocs/user/hierarchy.php b/htdocs/user/hierarchy.php
index 6073ca4c88f..0413fda69b0 100644
--- a/htdocs/user/hierarchy.php
+++ b/htdocs/user/hierarchy.php
@@ -42,9 +42,11 @@ if ($user->socid > 0) {
 	$socid = $user->socid;
 }
 
-$sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
-$search_user = GETPOST('search_user', 'alpha');
 $optioncss = GETPOST('optioncss', 'alpha');
+$contextpage = GETPOST('optioncss', 'aZ09');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 
 // Load mode employee
 $mode = GETPOST("mode", 'alpha');
@@ -94,7 +96,7 @@ if (!is_array($user_arbo) && $user_arbo < 0) {
 	$data[] = array('rowid'=>0, 'fk_menu'=>-1, 'title'=>"racine", 'mainmenu'=>'', 'leftmenu'=>'', 'fk_mainmenu'=>'', 'fk_leftmenu'=>'');
 	foreach ($fulltree as $key => $val) {
 		$userstatic->id = $val['id'];
-		$userstatic->ref = $val['label'];
+		$userstatic->ref = $val['id'];
 		$userstatic->login = $val['login'];
 		$userstatic->firstname = $val['firstname'];
 		$userstatic->lastname = $val['lastname'];
@@ -146,6 +148,8 @@ if (!is_array($user_arbo) && $user_arbo < 0) {
 	$newcardbutton = '';
 	$newcardbutton .= dolGetButtonTitle($langs->trans('NewUser'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/user/card.php?action=create'.($mode == 'employee' ? '&employee=1' : '').'&leftmenu=', '', $canadduser);
 
+	$morehtmlright = '';
+
 	$morehtmlright .= dolGetButtonTitle($langs->trans("List"), '', 'fa fa-list paddingleft imgforviewmode', DOL_URL_ROOT.'/user/list.php'.(($search_statut != '' && $search_statut >= 0) ? '?search_statut='.$search_statut : ''));
 	$param = array('morecss'=>'marginleftonly btnTitleSelected');
 	$morehtmlright .= dolGetButtonTitle($langs->trans("HierarchicView"), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT.'/user/hierarchy.php'.(($search_statut != '' && $search_statut >= 0) ? '?search_statut='.$search_statut : ''), '', 1, $param);

From d6c327ed857c497335558bba0504142fe91b7fc1 Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Thu, 8 Jul 2021 13:17:07 +0200
Subject: [PATCH 1074/1497] Remove duplicate code

---
 htdocs/product/class/product.class.php | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 0ac8cba1391..28bf0288c7b 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -5282,17 +5282,6 @@ class Product extends CommonObject
 			}
 			$stock_commande_fournisseur = $this->stats_commande_fournisseur['qty'];
 		}
-		if (((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) && empty($conf->reception->enabled)) {
-			$filterStatus = '4';
-			if (isset($includedraftpoforvirtual)) {
-				$filterStatus = '0,'.$filterStatus;
-			}
-			$result = $this->load_stats_reception(0, $filterStatus, 1);
-			if ($result < 0) {
-				dol_print_error($this->db, $this->error);
-			}
-			$stock_reception_fournisseur = $this->stats_reception['qty'];
-		}
 		if (((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) && empty($conf->reception->enabled)) {
 			$filterStatus = '4';
 			if (isset($includedraftpoforvirtual)) {

From ad11f7b66d2be49ef189982c4bd9724ffa983892 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Jul 2021 13:59:04 +0200
Subject: [PATCH 1075/1497] Fix type of param Fix test of ckeditor for html doc
 Fix when MAIN_RESTRICTHTML_ONLY_VALID_HTML is on

---
 htdocs/admin/fckeditor.php              |  2 +-
 htdocs/core/class/html.form.class.php   |  1 +
 htdocs/core/lib/functions.lib.php       | 12 ++++++++++--
 htdocs/core/tpl/objectline_view.tpl.php |  6 +++---
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/htdocs/admin/fckeditor.php b/htdocs/admin/fckeditor.php
index 987f435e38f..3388b649a67 100644
--- a/htdocs/admin/fckeditor.php
+++ b/htdocs/admin/fckeditor.php
@@ -117,7 +117,7 @@ if (GETPOST('save', 'alpha')) {
 		$error++;
 	}
 
-	$fckeditor_test = GETPOST('formtestfield');
+	$fckeditor_test = GETPOST('formtestfield', 'restricthtml');
 	if (!empty($fckeditor_test)) {
 		if (!dolibarr_set_const($db, 'FCKEDITOR_TEST', $fckeditor_test, 'chaine', 0, '', $conf->entity)) {
 			$error++;
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 83f66b204ee..d7097587a73 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -589,6 +589,7 @@ class Form
 		if (!$htmltext) {
 			return $text;
 		}
+		$direction = (int) $direction;	// For backward compatibility when $direction was set to '' instead of 0
 
 		$tag = 'td';
 		if ($notabs == 2) {
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 2d560281394..721c553c291 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -782,14 +782,22 @@ function checkVal($out = '', $check = 'alphanohtml', $filter = null, $options =
 				if (!empty($out) && !empty($conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML) && $check != 'restricthtmlallowunvalid') {
 					try {
 						$dom = new DOMDocument;
+						// Add a trick to solve pb with text without parent tag
+						// like '<h1>Foo</h1><p>bar</p>' that ends up with '<h1>Foo<p>bar</p></h1>'
+						// like 'abc' that ends up with '<p>abc</p>'
+						$out = '<div class="tricktoremove">'.$out.'</div>';
+
 						$dom->loadHTML($out, LIBXML_ERR_NONE|LIBXML_HTML_NOIMPLIED|LIBXML_HTML_NODEFDTD|LIBXML_NONET|LIBXML_NOWARNING|LIBXML_NOXMLDECL);
+						$out = trim($dom->saveHTML());
+
+						// Remove the trick added to solve pb with text without parent tag
+						$out = preg_replace('/^<div class="tricktoremove">/', '', $out);
+						$out = preg_replace('/<\/div>$/', '', $out);
 					} catch (Exception $e) {
 						//print $e->getMessage();
 						return 'InvalidHTMLString';
 					}
-					$out = $dom->saveHTML();
 				}
-				//var_dump($oldstringtoclean);var_dump($out);
 
 				// Ckeditor use the numeric entitic for apostrophe so we force it to text entity (all other special chars are correctly
 				// encoded using text entities). This is a fix for CKeditor.
diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php
index a89ac4f826a..3e8ef7ea411 100644
--- a/htdocs/core/tpl/objectline_view.tpl.php
+++ b/htdocs/core/tpl/objectline_view.tpl.php
@@ -135,7 +135,7 @@ if (($line->info_bits & 2) == 2) {
 	$format = (!empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE) ? 'dayhour' : 'day');
 
 	if ($line->fk_product > 0) {
-		print $form->textwithtooltip($text, $description, 3, '', '', $i, 0, (!empty($line->fk_parent_line) ?img_picto('', 'rightarrow') : ''));
+		print $form->textwithtooltip($text, $description, 3, 0, '', $i, 0, (!empty($line->fk_parent_line) ?img_picto('', 'rightarrow') : ''));
 	} else {
 		$type = (!empty($line->product_type) ? $line->product_type : $line->fk_product_type);
 		if ($type == 1) {
@@ -146,7 +146,7 @@ if (($line->info_bits & 2) == 2) {
 
 		if (!empty($line->label)) {
 			$text .= ' <strong>'.$line->label.'</strong>';
-			print $form->textwithtooltip($text, dol_htmlentitiesbr($line->description), 3, '', '', $i, 0, (!empty($line->fk_parent_line) ?img_picto('', 'rightarrow') : ''));
+			print $form->textwithtooltip($text, dol_htmlentitiesbr($line->description), 3, 0, '', $i, 0, (!empty($line->fk_parent_line) ?img_picto('', 'rightarrow') : ''));
 		} else {
 			if (!empty($line->fk_parent_line)) {
 				print img_picto('', 'rightarrow');
@@ -179,7 +179,7 @@ if (($line->info_bits & 2) == 2) {
 		}
 	} else {
 		if ($line->date_start || $line->date_end) {
-			print '<br><div class="clearboth nowraponall">'.get_date_range($line->date_start, $line->date_end, $format).'</div>';
+			print '<br><div class="clearboth nowraponall opacitymedium">'.get_date_range($line->date_start, $line->date_end, $format).'</div>';
 		}
 		//print get_date_range($line->date_start, $line->date_end, $format);
 	}

From 4e77a0d16a4b46314fc13a6c5d70d7cd179a162b Mon Sep 17 00:00:00 2001
From: altairis-noe <noe.cendrier@altairis.fr>
Date: Thu, 8 Jul 2021 15:55:07 +0200
Subject: [PATCH 1076/1497] don't display custom masks if they are not used

---
 htdocs/product/card.php | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 3d5afd1b16c..5b8c431d65d 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1649,21 +1649,30 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 						print '<script type="text/javascript">
 						$(document).ready(function() {
-							$("#field_mask, #mask_option").addClass("hideobject");
-							var preselect = $("#status_batch option:selected");
-							if (preselect !== "0") {
-								$("#field_mask, #mask_option").toggleClass("hideobject");
-							}
-							$("#status_batch").on("change", function () {
+							$("#field_mask").parent().addClass("hideobject");
+							var preselect = $("#status_batch option:selected");';
+						if ($conf->global->PRODUCTBATCH_SN_USE_PRODUCT_MASKS)
+						{
+						print 'if (preselect == "2") {
+								$("#field_mask").parent().toggleClass("hideobject");
+							}';
+						}
+						if ($conf->global->PRODUCTBATCH_LOT_USE_PRODUCT_MASKS)
+						{
+						print 'if (preselect == "1") {
+								$("#field_mask").parent().toggleClass("hideobject");
+							}';
+						}
+						print '$("#status_batch").on("change", function () {
 								console.log("We change batch status");
 								var optionSelected = $("option:selected", this);
 								var valueSelected = this.value;
-								$("#field_mask, #mask_option").addClass("hideobject");
+								$("#field_mask").parent().addClass("hideobject");
 						';
 						if ($conf->global->PRODUCTBATCH_LOT_USE_PRODUCT_MASKS && $conf->global->PRODUCTBATCH_LOT_ADDON == 'mod_lot_advanced') {
 							print '
 								if (this.value == 1) {
-									$("#field_mask, #mask_option").toggleClass("hideobject");
+									$("#field_mask").parent().toggleClass("hideobject");
 									$("#batch_mask_input").val("'.$inherited_mask_lot.'");
 								}
 							';
@@ -1671,7 +1680,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 						if ($conf->global->PRODUCTBATCH_SN_USE_PRODUCT_MASKS && $conf->global->PRODUCTBATCH_SN_ADDON == 'mod_sn_advanced') {
 							print '
 								if (this.value == 2) {
-									$("#field_mask, #mask_option").toggleClass("hideobject");
+									$("#field_mask").parent().toggleClass("hideobject");
 									$("#batch_mask_input").val("'.$inherited_mask_sn.'");
 								}
 							';

From 7870336f2a2cd17b59ce2c7100c74390f77ebe85 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Jul 2021 16:31:01 +0200
Subject: [PATCH 1077/1497] Update card.php

---
 htdocs/user/card.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 92284d45e1c..152c39f79ac 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1451,7 +1451,8 @@ if ($action == 'create' || $action == 'adduserldap') {
 				print '<span class="opacitymedium">'.$langs->trans("None").'</span>';
 			} else {
 				$huser = new User($db);
-				if ($huser->fetch($object->fk_user) > 0) {
+				if ($object->fk_user > 0) {
+					$huser->fetch($object->fk_user);
 					print $huser->getNomUrl(1);
 				} else {
 					print '<span class="opacitymedium">'.$langs->trans("None").'</span>';

From fe20217bfea0b1c1fd364e08535cb969123e8416 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Jul 2021 16:36:53 +0200
Subject: [PATCH 1078/1497] Update accountancyexport.class.php

---
 htdocs/accountancy/class/accountancyexport.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index a35daa5a888..0bd60445613 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -59,7 +59,8 @@ class AccountancyExport
 	public static $EXPORT_TYPE_LDCOMPTA10 = 120;
 	public static $EXPORT_TYPE_GESTIMUMV3 = 130;
 	public static $EXPORT_TYPE_GESTIMUMV5 = 135;
-	public static $EXPORT_TYPE_ISUITEEXPERT = 990;
+	public static $EXPORT_TYPE_ISUITEEXPERT = 200;
+	// Generic FEC after that
 	public static $EXPORT_TYPE_FEC = 1000;
 	public static $EXPORT_TYPE_FEC2 = 1010;
 

From cbd8fa357295477854f244bc4760d59d1ddd64e2 Mon Sep 17 00:00:00 2001
From: altairis-noe <noe.cendrier@altairis.fr>
Date: Thu, 8 Jul 2021 16:42:54 +0200
Subject: [PATCH 1079/1497] better element id

---
 htdocs/product/card.php | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 5b8c431d65d..be278127220 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1650,21 +1650,20 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 						print '<script type="text/javascript">
 						$(document).ready(function() {
 							$("#field_mask").parent().addClass("hideobject");
-							var preselect = $("#status_batch option:selected");';
+							var preselect = document.getElementById("status_batch");';
 						if ($conf->global->PRODUCTBATCH_SN_USE_PRODUCT_MASKS)
 						{
-						print 'if (preselect == "2") {
-								$("#field_mask").parent().toggleClass("hideobject");
+						print 'if (preselect.value == "2") {
+								$("#field_mask").parent().removeClass("hideobject");
 							}';
 						}
 						if ($conf->global->PRODUCTBATCH_LOT_USE_PRODUCT_MASKS)
 						{
-						print 'if (preselect == "1") {
-								$("#field_mask").parent().toggleClass("hideobject");
+						print 'if (preselect.value == "1") {
+								$("#field_mask").parent().removeClass("hideobject");
 							}';
 						}
 						print '$("#status_batch").on("change", function () {
-								console.log("We change batch status");
 								var optionSelected = $("option:selected", this);
 								var valueSelected = this.value;
 								$("#field_mask").parent().addClass("hideobject");
@@ -1672,7 +1671,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 						if ($conf->global->PRODUCTBATCH_LOT_USE_PRODUCT_MASKS && $conf->global->PRODUCTBATCH_LOT_ADDON == 'mod_lot_advanced') {
 							print '
 								if (this.value == 1) {
-									$("#field_mask").parent().toggleClass("hideobject");
+									$("#field_mask").parent().removeClass("hideobject");
 									$("#batch_mask_input").val("'.$inherited_mask_lot.'");
 								}
 							';
@@ -1680,7 +1679,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 						if ($conf->global->PRODUCTBATCH_SN_USE_PRODUCT_MASKS && $conf->global->PRODUCTBATCH_SN_ADDON == 'mod_sn_advanced') {
 							print '
 								if (this.value == 2) {
-									$("#field_mask").parent().toggleClass("hideobject");
+									$("#field_mask").parent().removeClass("hideobject");
 									$("#batch_mask_input").val("'.$inherited_mask_sn.'");
 								}
 							';

From 2e44acbc810ed679d8d67d81499b9c07bd3da5b4 Mon Sep 17 00:00:00 2001
From: jpb <jean-pascal.boudet@atm-consulting>
Date: Thu, 8 Jul 2021 16:43:05 +0200
Subject: [PATCH 1080/1497] update comment

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

diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 3c4cafd8a95..281aedb96c8 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -514,7 +514,7 @@ if ($search_status <> '') {
 		$sql .= ' AND ((c.fk_statut IN (1,2)) OR (c.fk_statut = 3 AND c.facture = 0))'; // validated, in process or closed but not billed
 	}
 
-	if ($search_status == -4)	//  "To validate and in progress"
+	if ($search_status == -4)	//  "validate and in progress"
 	{
 		$sql .= ' AND (c.fk_statut IN (1,2))'; // validated, in process
 	}

From 327481dc78931f171f5735d2b84a5445628eaa16 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Thu, 8 Jul 2021 14:47:38 +0000
Subject: [PATCH 1081/1497] Fixing style errors.

---
 htdocs/commande/list.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index e704058f9b8..77eedcd3e34 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -515,8 +515,7 @@ if ($search_status <> '') {
 	}
 
 
-	if ($search_status == -4)	//  "validate and in progress"
-	{
+	if ($search_status == -4) {	//  "validate and in progress"
 		$sql .= ' AND (c.fk_statut IN (1,2))'; // validated, in process
 	}
 }

From 68442a2d13ff00641b47fdc24b5bcc0e21dbbfed Mon Sep 17 00:00:00 2001
From: altairis-noe <noe.cendrier@altairis.fr>
Date: Thu, 8 Jul 2021 16:49:13 +0200
Subject: [PATCH 1082/1497] stickler corrections

---
 htdocs/product/card.php | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index be278127220..5adb29cbe80 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1651,17 +1651,15 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 						$(document).ready(function() {
 							$("#field_mask").parent().addClass("hideobject");
 							var preselect = document.getElementById("status_batch");';
-						if ($conf->global->PRODUCTBATCH_SN_USE_PRODUCT_MASKS)
-						{
-						print 'if (preselect.value == "2") {
-								$("#field_mask").parent().removeClass("hideobject");
-							}';
+						if ($conf->global->PRODUCTBATCH_SN_USE_PRODUCT_MASKS) {
+							print 'if (preselect.value == "2") {
+									$("#field_mask").parent().removeClass("hideobject");
+								}';
 						}
-						if ($conf->global->PRODUCTBATCH_LOT_USE_PRODUCT_MASKS)
-						{
-						print 'if (preselect.value == "1") {
-								$("#field_mask").parent().removeClass("hideobject");
-							}';
+						if ($conf->global->PRODUCTBATCH_LOT_USE_PRODUCT_MASKS) {
+							print 'if (preselect.value == "1") {
+									$("#field_mask").parent().removeClass("hideobject");
+								}';
 						}
 						print '$("#status_batch").on("change", function () {
 								var optionSelected = $("option:selected", this);

From 66590ba810f5031ae06e9e36146bbf51444ca78c Mon Sep 17 00:00:00 2001
From: altairis-noe <noe.cendrier@altairis.fr>
Date: Thu, 8 Jul 2021 17:10:03 +0200
Subject: [PATCH 1083/1497] getDolGlobalString instead of $conf->global

---
 htdocs/product/card.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 5adb29cbe80..c16c11ef90e 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1636,14 +1636,14 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 						$tooltip .= '<br>'.$langs->trans("GenericMaskCodes4a", $langs->transnoentities("Batch"), $langs->transnoentities("Batch"));
 						$tooltip .= '<br>'.$langs->trans("GenericMaskCodes5");
 						print '<tr><td id="mask_option">'.$langs->trans("ManageLotMask").'</td>';
-						if ($object->status_batch == '1' && $conf->global->PRODUCTBATCH_LOT_USE_PRODUCT_MASKS && $conf->global->PRODUCTBATCH_LOT_ADDON == 'mod_lot_advanced') {
-							$mask = !empty($object->batch_mask) ? $object->batch_mask : $conf->global->LOT_ADVANCED_MASK;
+						if ($object->status_batch == '1' && getDolGlobalString('PRODUCTBATCH_LOT_USE_PRODUCT_MASKS') && getDolGlobalString('PRODUCTBATCH_LOT_ADDON') == 'mod_lot_advanced') {
+							$mask = !empty($object->batch_mask) ? $object->batch_mask : getDolGlobalString('LOT_ADVANCED_MASK');
 						}
-						if ($object->status_batch == '2' && $conf->global->PRODUCTBATCH_SN_USE_PRODUCT_MASKS && $conf->global->PRODUCTBATCH_SN_ADDON == 'mod_sn_advanced') {
+						if ($object->status_batch == '2' && getDolGlobalString('PRODUCTBATCH_SN_USE_PRODUCT_MASKS') && $conf->global->PRODUCTBATCH_SN_ADDON == 'mod_sn_advanced') {
 							$mask = !empty($object->batch_mask) ? $object->batch_mask : $conf->global->SN_ADVANCED_MASK;
 						}
-						$inherited_mask_lot = $conf->global->LOT_ADVANCED_MASK;
-						$inherited_mask_sn = $conf->global->SN_ADVANCED_MASK;
+						$inherited_mask_lot = getDolGlobalString('LOT_ADVANCED_MASK');
+						$inherited_mask_sn = getDolGlobalString('SN_ADVANCED_MASK');
 						print '<td id="field_mask">';
 						print $form->textwithpicto('<input type="text" class="flat minwidth175" name="batch_mask" id="batch_mask_input" value="'.$mask.'">', $tooltip, 1, 1);
 
@@ -1651,12 +1651,12 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 						$(document).ready(function() {
 							$("#field_mask").parent().addClass("hideobject");
 							var preselect = document.getElementById("status_batch");';
-						if ($conf->global->PRODUCTBATCH_SN_USE_PRODUCT_MASKS) {
+						if (getDolGlobalString('PRODUCTBATCH_SN_USE_PRODUCT_MASKS')) {
 							print 'if (preselect.value == "2") {
 									$("#field_mask").parent().removeClass("hideobject");
 								}';
 						}
-						if ($conf->global->PRODUCTBATCH_LOT_USE_PRODUCT_MASKS) {
+						if (getDolGlobalString('PRODUCTBATCH_LOT_USE_PRODUCT_MASKS')) {
 							print 'if (preselect.value == "1") {
 									$("#field_mask").parent().removeClass("hideobject");
 								}';
@@ -1666,7 +1666,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 								var valueSelected = this.value;
 								$("#field_mask").parent().addClass("hideobject");
 						';
-						if ($conf->global->PRODUCTBATCH_LOT_USE_PRODUCT_MASKS && $conf->global->PRODUCTBATCH_LOT_ADDON == 'mod_lot_advanced') {
+						if (getDolGlobalString('PRODUCTBATCH_LOT_USE_PRODUCT_MASKS') && getDolGlobalString('PRODUCTBATCH_LOT_ADDON') == 'mod_lot_advanced') {
 							print '
 								if (this.value == 1) {
 									$("#field_mask").parent().removeClass("hideobject");
@@ -1674,7 +1674,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 								}
 							';
 						}
-						if ($conf->global->PRODUCTBATCH_SN_USE_PRODUCT_MASKS && $conf->global->PRODUCTBATCH_SN_ADDON == 'mod_sn_advanced') {
+						if (getDolGlobalString('PRODUCTBATCH_SN_USE_PRODUCT_MASKS') && getDolGlobalString('PRODUCTBATCH_SN_ADDON') == 'mod_sn_advanced') {
 							print '
 								if (this.value == 2) {
 									$("#field_mask").parent().removeClass("hideobject");

From eaa6987e8b6769af55c08868d3f4cc6731c7e167 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Thu, 8 Jul 2021 17:15:03 +0200
Subject: [PATCH 1084/1497] Fix: formconfim if type radio must be :checked to
 get correct value

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 1019e9623e4..ff6a1a4334a 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4434,7 +4434,7 @@ class Form
                          			var more = "";
 									var inputvalue;
                          			if ($("input[name=\'" + inputname + "\']").attr("type") == "radio") {
-										inputvalue = $("input[name=\'" + inputname + "\']").val();
+										inputvalue = $("input[name=\'" + inputname + "\']:checked").val();
 									} else {
                          		    	if ($("#" + inputname).attr("type") == "checkbox") { more = ":checked"; }
                          				inputvalue = $("#" + inputname + more).val();

From 38fac48c300760283b22a3fa594e88b65f495ec0 Mon Sep 17 00:00:00 2001
From: Florian Mortgat <florian.mortgat@atm-consulting.fr>
Date: Thu, 8 Jul 2021 17:18:47 +0200
Subject: [PATCH 1085/1497] FIX: in kanban view, Dolibarr says "no updates
 available" even if updates are available

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

diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 494dfc2f625..f60e011f41c 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -919,7 +919,6 @@ if ($mode == 'common' || $mode == 'commonkanban') {
 			if ($objMod->needUpdate) {
 				$versionTitle = $langs->trans('ModuleUpdateAvailable').' : '.$objMod->lastVersion;
 				print '<span class="badge badge-warning classfortooltip" title="'.dol_escape_htmltag($versionTitle).'">'.$versiontrans.'</span>';
-				$foundoneexternalmodulewithupdate++;
 			} else {
 				print $versiontrans;
 			}
@@ -937,6 +936,9 @@ if ($mode == 'common' || $mode == 'commonkanban') {
 
 			print "</tr>\n";
 		}
+		if ($objMod->needUpdate) {
+			$foundoneexternalmodulewithupdate++;
+		}
 	}
 
 	if ($action == 'checklastversion') {

From 9983163e7a27d4c568e18257ff1373fcf0ea1c83 Mon Sep 17 00:00:00 2001
From: altairis-noe <noe.cendrier@altairis.fr>
Date: Thu, 8 Jul 2021 17:21:36 +0200
Subject: [PATCH 1086/1497] a few more getDolGlobalString

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

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index c16c11ef90e..19ed281ab00 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1639,8 +1639,8 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 						if ($object->status_batch == '1' && getDolGlobalString('PRODUCTBATCH_LOT_USE_PRODUCT_MASKS') && getDolGlobalString('PRODUCTBATCH_LOT_ADDON') == 'mod_lot_advanced') {
 							$mask = !empty($object->batch_mask) ? $object->batch_mask : getDolGlobalString('LOT_ADVANCED_MASK');
 						}
-						if ($object->status_batch == '2' && getDolGlobalString('PRODUCTBATCH_SN_USE_PRODUCT_MASKS') && $conf->global->PRODUCTBATCH_SN_ADDON == 'mod_sn_advanced') {
-							$mask = !empty($object->batch_mask) ? $object->batch_mask : $conf->global->SN_ADVANCED_MASK;
+						if ($object->status_batch == '2' && getDolGlobalString('PRODUCTBATCH_SN_USE_PRODUCT_MASKS') && getDolGlobalString('PRODUCTBATCH_SN_ADDON') == 'mod_sn_advanced') {
+							$mask = !empty($object->batch_mask) ? $object->batch_mask : getDolGlobalString('SN_ADVANCED_MASK');
 						}
 						$inherited_mask_lot = getDolGlobalString('LOT_ADVANCED_MASK');
 						$inherited_mask_sn = getDolGlobalString('SN_ADVANCED_MASK');

From 08adb73c6e7f0162f3bf63fae2b5fee2888cfacc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Jul 2021 17:24:05 +0200
Subject: [PATCH 1087/1497] Trans

---
 htdocs/langs/en_US/banks.lang    | 2 +-
 htdocs/langs/en_US/cashdesk.lang | 2 +-
 htdocs/langs/en_US/ticket.lang   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/langs/en_US/banks.lang b/htdocs/langs/en_US/banks.lang
index df7192bee25..a0b7942d446 100644
--- a/htdocs/langs/en_US/banks.lang
+++ b/htdocs/langs/en_US/banks.lang
@@ -115,7 +115,7 @@ TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
 CheckTransmitter=Sender
 ValidateCheckReceipt=Validate this check receipt?
-ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes will be possible once validated.
 DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang
index aba05d67fc8..86fdfd753a5 100644
--- a/htdocs/langs/en_US/cashdesk.lang
+++ b/htdocs/langs/en_US/cashdesk.lang
@@ -127,4 +127,4 @@ AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
 ShowPriceHT = Display the column with the price excluding tax (on screen)
-ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on the receipt)
diff --git a/htdocs/langs/en_US/ticket.lang b/htdocs/langs/en_US/ticket.lang
index eea045bdc89..3c074688b8e 100644
--- a/htdocs/langs/en_US/ticket.lang
+++ b/htdocs/langs/en_US/ticket.lang
@@ -55,7 +55,7 @@ TypeContact_ticket_internal_SUPPORTTEC=Assigned user
 TypeContact_ticket_external_SUPPORTCLI=Customer contact / incident tracking
 TypeContact_ticket_external_CONTRIBUTOR=External contributor
 
-OriginEmail=Email reporter
+OriginEmail=Reporter Email
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status

From e83df923591777399da8e468ac9d1c022a2d61e6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Jul 2021 17:24:05 +0200
Subject: [PATCH 1088/1497] Trans

---
 htdocs/langs/en_US/banks.lang    | 2 +-
 htdocs/langs/en_US/cashdesk.lang | 2 +-
 htdocs/langs/en_US/ticket.lang   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/langs/en_US/banks.lang b/htdocs/langs/en_US/banks.lang
index df7192bee25..a0b7942d446 100644
--- a/htdocs/langs/en_US/banks.lang
+++ b/htdocs/langs/en_US/banks.lang
@@ -115,7 +115,7 @@ TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
 CheckTransmitter=Sender
 ValidateCheckReceipt=Validate this check receipt?
-ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes will be possible once validated.
 DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang
index aba05d67fc8..86fdfd753a5 100644
--- a/htdocs/langs/en_US/cashdesk.lang
+++ b/htdocs/langs/en_US/cashdesk.lang
@@ -127,4 +127,4 @@ AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
 ShowPriceHT = Display the column with the price excluding tax (on screen)
-ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on the receipt)
diff --git a/htdocs/langs/en_US/ticket.lang b/htdocs/langs/en_US/ticket.lang
index eea045bdc89..3c074688b8e 100644
--- a/htdocs/langs/en_US/ticket.lang
+++ b/htdocs/langs/en_US/ticket.lang
@@ -55,7 +55,7 @@ TypeContact_ticket_internal_SUPPORTTEC=Assigned user
 TypeContact_ticket_external_SUPPORTCLI=Customer contact / incident tracking
 TypeContact_ticket_external_CONTRIBUTOR=External contributor
 
-OriginEmail=Email reporter
+OriginEmail=Reporter Email
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status

From a44d646946a17b91e002be17d68136075c468a03 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Jul 2021 17:31:41 +0200
Subject: [PATCH 1089/1497] Fix to allow html content

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

diff --git a/htdocs/admin/fckeditor.php b/htdocs/admin/fckeditor.php
index bc6b0dc33ac..0aed2767048 100644
--- a/htdocs/admin/fckeditor.php
+++ b/htdocs/admin/fckeditor.php
@@ -114,7 +114,7 @@ if (GETPOST('save', 'alpha'))
 		$error++;
 	}
 
-	$fckeditor_test = GETPOST('formtestfield');
+	$fckeditor_test = GETPOST('formtestfield', 'restricthtml');
 	if (!empty($fckeditor_test)) {
 		if (!dolibarr_set_const($db, 'FCKEDITOR_TEST', $fckeditor_test, 'chaine', 0, '', $conf->entity)) {
 			$error++;

From 1209253d5791c3e083ec94911870c5e5da543ffe Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Jul 2021 18:12:15 +0200
Subject: [PATCH 1090/1497] Sanitize data

---
 htdocs/core/class/dolreceiptprinter.class.php | 23 ++++++++++---------
 htdocs/core/lib/functions.lib.php             |  8 +++++--
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/htdocs/core/class/dolreceiptprinter.class.php b/htdocs/core/class/dolreceiptprinter.class.php
index c109bc65733..45c87401416 100644
--- a/htdocs/core/class/dolreceiptprinter.class.php
+++ b/htdocs/core/class/dolreceiptprinter.class.php
@@ -390,7 +390,7 @@ class dolReceiptPrinter extends Printer
 		$error = 0;
 		$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'printer_receipt';
 		$sql .= ' (name, fk_type, fk_profile, parameter, entity)';
-		$sql .= ' VALUES ("'.$this->db->escape($name).'", '.$type.', '.$profile.', "'.$this->db->escape($parameter).'", '.$conf->entity.')';
+		$sql .= ' VALUES ("'.$this->db->escape($name).'", '.((int) $type).', '.((int) $profile).', "'.$this->db->escape($parameter).'", '.$conf->entity.')';
 		$resql = $this->db->query($sql);
 		if (!$resql) {
 			$error++;
@@ -415,10 +415,10 @@ class dolReceiptPrinter extends Printer
 		$error = 0;
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'printer_receipt';
 		$sql .= ' SET name="'.$this->db->escape($name).'"';
-		$sql .= ', fk_type='.$type;
-		$sql .= ', fk_profile='.$profile;
+		$sql .= ', fk_type='.((int) $type);
+		$sql .= ', fk_profile='.((int) $profile);
 		$sql .= ', parameter="'.$this->db->escape($parameter).'"';
-		$sql .= ' WHERE rowid='.$printerid;
+		$sql .= ' WHERE rowid='.((int) $printerid);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
 			$error++;
@@ -438,7 +438,7 @@ class dolReceiptPrinter extends Printer
 		global $conf;
 		$error = 0;
 		$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'printer_receipt';
-		$sql .= ' WHERE rowid='.$printerid;
+		$sql .= ' WHERE rowid='.((int) $printerid);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
 			$error++;
@@ -480,7 +480,7 @@ class dolReceiptPrinter extends Printer
 		global $conf;
 		$error = 0;
 		$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'printer_receipt_template';
-		$sql .= " WHERE rowid = ".((int) $this->db->escape($templateid));
+		$sql .= " WHERE rowid = ".((int) $templateid);
 		$sql .= " AND entity = ".$conf->entity;
 		$resql = $this->db->query($sql);
 		if (!$resql) {
@@ -505,7 +505,7 @@ class dolReceiptPrinter extends Printer
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'printer_receipt_template';
 		$sql .= ' SET name="'.$this->db->escape($name).'"';
 		$sql .= ', template="'.$this->db->escape($template).'"';
-		$sql .= ' WHERE rowid='.$templateid;
+		$sql .= ' WHERE rowid='.((int) $templateid);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
 			$error++;
@@ -524,6 +524,7 @@ class dolReceiptPrinter extends Printer
 	public function sendTestToPrinter($printerid)
 	{
 		global $conf;
+
 		$error = 0;
 		$img = EscposImage::load(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo_bw.png');
 		//$this->profile = CapabilityProfile::load("TM-T88IV");
@@ -543,7 +544,7 @@ class dolReceiptPrinter extends Printer
 
 				// If is DummyPrintConnector send to log to debugging
 				if ($this->printer->connector instanceof DummyPrintConnector) {
-					$data = $this->printer->connector-> getData();
+					$data = $this->printer->connector->getData();
 					dol_syslog($data);
 				}
 				$this->printer->close();
@@ -899,7 +900,7 @@ class dolReceiptPrinter extends Printer
 	public function initPrinter($printerid)
 	{
 		global $conf;
-		if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector") {
+		if (getDolGlobalString('TAKEPOS_PRINT_METHOD') == "takeposconnector") {
 			$this->connector = new DummyPrintConnector();
 			$this->printer = new Printer($this->connector, $this->profile);
 			return;
@@ -934,8 +935,8 @@ class dolReceiptPrinter extends Printer
 						$parameters = explode(':', $parameter);
 						$this->connector = new NetworkPrintConnector($parameters[0], $parameters[1]);
 						break;
-					case 4:
-						$this->connector = new WindowsPrintConnector($parameter);
+					case 4:	// LPT1, smb://...
+						$this->connector = new WindowsPrintConnector(dol_sanitizePathName($parameter));
 						break;
 					case 5:
 						$this->connector = new CupsPrintConnector($parameter);
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 721c553c291..c4a8452d1d1 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1075,7 +1075,8 @@ function dol_sanitizeFileName($str, $newstr = '_', $unaccent = 1)
 }
 
 /**
- *	Clean a string to use it as a path name
+ *	Clean a string to use it as a path name.
+ *  Replace also '--' and ' -' strings, they are used for parameters separation.
  *
  *	@param	string	$str            String to clean
  * 	@param	string	$newstr			String to replace bad chars with
@@ -1087,7 +1088,10 @@ function dol_sanitizeFileName($str, $newstr = '_', $unaccent = 1)
 function dol_sanitizePathName($str, $newstr = '_', $unaccent = 1)
 {
 	$filesystem_forbidden_chars = array('<', '>', '?', '*', '|', '"', '°');
-	return dol_string_nospecial($unaccent ? dol_string_unaccent($str) : $str, $newstr, $filesystem_forbidden_chars);
+	$tmp = dol_string_nospecial($unaccent ? dol_string_unaccent($str) : $str, $newstr, $filesystem_forbidden_chars);
+	$tmp = preg_replace('/\-\-+/', '_', $tmp);
+	$tmp = preg_replace('/\s+\-/', ' _', $tmp);
+	return $tmp;
 }
 
 /**

From ddc37ef38c6d1450a55ac1ffe3cedb90417854c3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Jul 2021 20:58:19 +0200
Subject: [PATCH 1091/1497] Fix missing lang param

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

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 82ff19e3771..2647cba166c 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1707,9 +1707,9 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 				print '<!-- Includes JS added by page -->'."\n";
 				foreach ($arrayofjs as $jsfile) {
 					if (preg_match('/^(http|\/\/)/i', $jsfile)) {
-						print '<script src="'.$jsfile.'"></script>'."\n";
+						print '<script src="'.$jsfile.($ext ? ((strpos($jsfile, '?') === false) ? '?' : '&').$ext : '').'"></script>'."\n";
 					} else {
-						print '<script src="'.dol_buildpath($jsfile, 1).'"></script>'."\n";
+						print '<script src="'.dol_buildpath($jsfile, 1).($ext ? ((strpos($jsfile, '?') === false) ? '?' : '&').$ext : '').'"></script>'."\n";
 					}
 				}
 			}

From 12b1f5b23b4b712f851ad6b90d32e382a27744b4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Jul 2021 21:05:56 +0200
Subject: [PATCH 1092/1497] Fix sql

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

diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php
index 17dcdd557a4..a1725526898 100644
--- a/htdocs/core/class/dolgraph.class.php
+++ b/htdocs/core/class/dolgraph.class.php
@@ -611,7 +611,7 @@ class DolGraph
 
 		$nbseries = (empty($this->data[0]) ? 0 : count($this->data[0]) - 1);
 
-		foreach($this->data as $x) {	// Loop on each x
+		foreach ($this->data as $x) {	// Loop on each x
 			for ($i = 0; $i < $nbseries; $i++) {	// Loop on each serie
 				if (is_null($max)) {
 					$max = $x[$i + 1];		// $i+1 because the index 0 is the legend
@@ -641,7 +641,7 @@ class DolGraph
 
 		$nbseries = (empty($this->data[0]) ? 0 : count($this->data[0]) - 1);
 
-		foreach($this->data as $x) {	// Loop on each x
+		foreach ($this->data as $x) {	// Loop on each x
 			for ($i = 0; $i < $nbseries; $i++) {	// Loop on each serie
 				if (is_null($min)) {
 					$min = $x[$i + 1];		// $i+1 because the index 0 is the legend

From c8162e67852ffc6dc6611d462a9710f84a74e119 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Thu, 8 Jul 2021 21:35:25 +0200
Subject: [PATCH 1093/1497] FIX Accountancy - constant
 ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY

---
 htdocs/accountancy/customer/index.php | 12 ++++---
 htdocs/accountancy/supplier/index.php | 12 ++++---
 htdocs/societe/card.php               | 48 +++++++++++++++++++++++----
 3 files changed, 56 insertions(+), 16 deletions(-)

diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php
index dde599a1462..e6b4e95df07 100644
--- a/htdocs/accountancy/customer/index.php
+++ b/htdocs/accountancy/customer/index.php
@@ -201,11 +201,13 @@ if ($action == 'validatehistory') {
 				}
 			}
 
-			// Level 3: Search suggested account for this thirdparty (similar code exists in page index.php to make automatic binding)
-			if (!empty($objp->company_code_sell)) {
-				$objp->code_sell_t = $objp->company_code_sell;
-				$objp->aarowid_suggest = $objp->aarowid_thirdparty;
-				$suggestedaccountingaccountfor = '';
+			if (!empty($conf->global->ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY)) {
+				// Level 3: Search suggested account for this thirdparty (similar code exists in page index.php to make automatic binding)
+				if (!empty($objp->company_code_sell)) {
+					$objp->code_sell_t = $objp->company_code_sell;
+					$objp->aarowid_suggest = $objp->aarowid_thirdparty;
+					$suggestedaccountingaccountfor = '';
+				}
 			}
 
 			if ($objp->aarowid_suggest > 0) {
diff --git a/htdocs/accountancy/supplier/index.php b/htdocs/accountancy/supplier/index.php
index b5c6804c7d6..818455ce979 100644
--- a/htdocs/accountancy/supplier/index.php
+++ b/htdocs/accountancy/supplier/index.php
@@ -202,11 +202,13 @@ if ($action == 'validatehistory') {
 				}
 			}
 
-			// Level 3: Search suggested account for this thirdparty (similar code exists in page index.php to make automatic binding)
-			if (!empty($objp->company_code_buy)) {
-				$objp->code_buy_t = $objp->company_code_buy;
-				$objp->aarowid_suggest = $objp->aarowid_thirdparty;
-				$suggestedaccountingaccountfor = '';
+			if (!empty($conf->global->ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY)) {
+				// Level 3: Search suggested account for this thirdparty (similar code exists in page index.php to make automatic binding)
+				if (!empty($objp->company_code_buy)) {
+					$objp->code_buy_t = $objp->company_code_buy;
+					$objp->aarowid_suggest = $objp->aarowid_thirdparty;
+					$suggestedaccountingaccountfor = '';
+				}
 			}
 
 			if ($objp->aarowid_suggest > 0) {
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index ba4023dbba9..53efb132352 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -495,10 +495,22 @@ if (empty($reshook)) {
 			$object->webservices_key		= GETPOST('webservices_key', 'san_alpha');
 
 			if (GETPOSTISSET('accountancy_code_sell')) {
-				$object->accountancy_code_sell  = GETPOST('accountancy_code_sell', 'alpha');
+				$accountancy_code_sell  = GETPOST('accountancy_code_sell', 'alpha');
+
+				if ($accountancy_code_sell <= 0) {
+					$object->accountancy_code_sell = '';
+				} else {
+					$object->accountancy_code_sell = $accountancy_code_sell;
+				}
 			}
 			if (GETPOSTISSET('accountancy_code_buy')) {
-				$object->accountancy_code_buy   = GETPOST('accountancy_code_buy', 'alpha');
+				$accountancy_code_buy   = GETPOST('accountancy_code_buy', 'alpha');
+
+				if ($accountancy_code_buy <= 0) {
+					$object->accountancy_code_buy = '';
+				} else {
+					$object->accountancy_code_buy = $accountancy_code_buy;
+				}
 			}
 
 			// Incoterms
@@ -1058,10 +1070,22 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		$object->default_lang = GETPOST('default_lang');
 
 		if (GETPOSTISSET('accountancy_code_sell')) {
-			$object->accountancy_code_sell  = GETPOST('accountancy_code_sell', 'alpha');
+			$accountancy_code_sell  = GETPOST('accountancy_code_sell', 'alpha');
+
+			if ($accountancy_code_sell <= 0) {
+				$object->accountancy_code_sell = '';
+			} else {
+				$object->accountancy_code_sell = $accountancy_code_sell;
+			}
 		}
 		if (GETPOSTISSET('accountancy_code_buy')) {
-			$object->accountancy_code_buy   = GETPOST('accountancy_code_buy', 'alpha');
+			$accountancy_code_buy   = GETPOST('accountancy_code_buy', 'alpha');
+
+			if ($accountancy_code_buy <= 0) {
+				$object->accountancy_code_buy = '';
+			} else {
+				$object->accountancy_code_buy = $accountancy_code_buy;
+			}
 		}
 
 		$object->logo = (isset($_FILES['photo']) ?dol_sanitizeFileName($_FILES['photo']['name']) : '');
@@ -1785,10 +1809,22 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				$object->webservices_key        = GETPOST('webservices_key', 'san_alpha');
 
 				if (GETPOSTISSET('accountancy_code_sell')) {
-					$object->accountancy_code_sell  = GETPOST('accountancy_code_sell', 'alpha');
+					$accountancy_code_sell  = GETPOST('accountancy_code_sell', 'alpha');
+
+					if ($accountancy_code_sell <= 0) {
+						$object->accountancy_code_sell = '';
+					} else {
+						$object->accountancy_code_sell = $accountancy_code_sell;
+					}
 				}
 				if (GETPOSTISSET('accountancy_code_buy')) {
-					$object->accountancy_code_buy   = GETPOST('accountancy_code_buy', 'alpha');
+					$accountancy_code_buy   = GETPOST('accountancy_code_buy', 'alpha');
+
+					if ($accountancy_code_buy <= 0) {
+						$object->accountancy_code_buy = '';
+					} else {
+						$object->accountancy_code_buy = $accountancy_code_buy;
+					}
 				}
 
 				//Incoterms

From cd215cda17f3e2c41f25de8304f207a13615e8f9 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Thu, 8 Jul 2021 21:49:53 +0200
Subject: [PATCH 1094/1497] FIX Accountancy - if we define a date start,
 automatic binding try to solve old binding

---
 htdocs/accountancy/customer/index.php | 3 +++
 htdocs/accountancy/supplier/index.php | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php
index 1a5098bda38..943d914a980 100644
--- a/htdocs/accountancy/customer/index.php
+++ b/htdocs/accountancy/customer/index.php
@@ -136,6 +136,9 @@ if ($action == 'validatehistory') {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa3 ON p.accountancy_code_sell_export = aa3.account_number AND aa3.active = 1 AND aa3.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa3.entity = ".$conf->entity;
 	$sql .= " WHERE f.fk_statut > 0 AND l.fk_code_ventilation <= 0";
 	$sql .= " AND l.product_type <= 2";
+	if (!empty($conf->global->ACCOUNTING_DATE_START_BINDING)) {
+		$sql .= " AND f.datef >= '".$db->idate($conf->global->ACCOUNTING_DATE_START_BINDING)."'";
+	}
 
 	dol_syslog('htdocs/accountancy/customer/index.php');
 	$result = $db->query($sql);
diff --git a/htdocs/accountancy/supplier/index.php b/htdocs/accountancy/supplier/index.php
index 0dbe09fa468..f20c238514a 100644
--- a/htdocs/accountancy/supplier/index.php
+++ b/htdocs/accountancy/supplier/index.php
@@ -133,6 +133,9 @@ if ($action == 'validatehistory') {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa3 ON p.accountancy_code_buy_export = aa3.account_number AND aa3.active = 1 AND aa3.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa3.entity = ".$conf->entity;
 	$sql .= " WHERE f.fk_statut > 0 AND l.fk_code_ventilation <= 0";
 	$sql .= " AND l.product_type <= 2";
+	if (!empty($conf->global->ACCOUNTING_DATE_START_BINDING)) {
+		$sql .= " AND f.datef >= '".$db->idate($conf->global->ACCOUNTING_DATE_START_BINDING)."'";
+	}
 
 	dol_syslog('htdocs/accountancy/supplier/index.php');
 

From 76d02ecd7723fbec5ce862845a8c38f66b5cdc10 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Jul 2021 21:53:24 +0200
Subject: [PATCH 1095/1497] Update card.php

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

diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 53efb132352..475c1c57082 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -497,7 +497,7 @@ if (empty($reshook)) {
 			if (GETPOSTISSET('accountancy_code_sell')) {
 				$accountancy_code_sell  = GETPOST('accountancy_code_sell', 'alpha');
 
-				if ($accountancy_code_sell <= 0) {
+				if (empty($accountancy_code_sell) || $accountancy_code_sell == '-1') {
 					$object->accountancy_code_sell = '';
 				} else {
 					$object->accountancy_code_sell = $accountancy_code_sell;
@@ -506,7 +506,7 @@ if (empty($reshook)) {
 			if (GETPOSTISSET('accountancy_code_buy')) {
 				$accountancy_code_buy   = GETPOST('accountancy_code_buy', 'alpha');
 
-				if ($accountancy_code_buy <= 0) {
+				if (empty($accountancy_code_buy) || $accountancy_code_buy == '-1') {
 					$object->accountancy_code_buy = '';
 				} else {
 					$object->accountancy_code_buy = $accountancy_code_buy;
@@ -1072,7 +1072,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		if (GETPOSTISSET('accountancy_code_sell')) {
 			$accountancy_code_sell  = GETPOST('accountancy_code_sell', 'alpha');
 
-			if ($accountancy_code_sell <= 0) {
+			if (empty($accountancy_code_sell) || $accountancy_code_sell == '-1') {
 				$object->accountancy_code_sell = '';
 			} else {
 				$object->accountancy_code_sell = $accountancy_code_sell;
@@ -1081,7 +1081,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		if (GETPOSTISSET('accountancy_code_buy')) {
 			$accountancy_code_buy   = GETPOST('accountancy_code_buy', 'alpha');
 
-			if ($accountancy_code_buy <= 0) {
+			if (empty($accountancy_code_buy) || $accountancy_code_buy == '-1') {
 				$object->accountancy_code_buy = '';
 			} else {
 				$object->accountancy_code_buy = $accountancy_code_buy;

From e5bc32bb7c2973008dd118ac9cf428cc03d90dd7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Jul 2021 21:55:35 +0200
Subject: [PATCH 1096/1497] Update card.php

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

diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 475c1c57082..76ae78fdb51 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -1811,7 +1811,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				if (GETPOSTISSET('accountancy_code_sell')) {
 					$accountancy_code_sell  = GETPOST('accountancy_code_sell', 'alpha');
 
-					if ($accountancy_code_sell <= 0) {
+					if (empty($accountancy_code_sell) || $accountancy_code_sell == '-1') {
 						$object->accountancy_code_sell = '';
 					} else {
 						$object->accountancy_code_sell = $accountancy_code_sell;
@@ -1820,7 +1820,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				if (GETPOSTISSET('accountancy_code_buy')) {
 					$accountancy_code_buy   = GETPOST('accountancy_code_buy', 'alpha');
 
-					if ($accountancy_code_buy <= 0) {
+					if (empty($accountancy_code_buy) || $accountancy_code_buy == '-1') {
 						$object->accountancy_code_buy = '';
 					} else {
 						$object->accountancy_code_buy = $accountancy_code_buy;

From d6be3808166ef6c4bc57b2f1c5e43125e1d4ab05 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Thu, 8 Jul 2021 21:35:25 +0200
Subject: [PATCH 1097/1497] FIX Accountancy - constant
 ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY

---
 htdocs/accountancy/customer/index.php | 12 ++++---
 htdocs/accountancy/supplier/index.php | 12 ++++---
 htdocs/societe/card.php               | 48 +++++++++++++++++++++++----
 3 files changed, 56 insertions(+), 16 deletions(-)

diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php
index dde599a1462..e6b4e95df07 100644
--- a/htdocs/accountancy/customer/index.php
+++ b/htdocs/accountancy/customer/index.php
@@ -201,11 +201,13 @@ if ($action == 'validatehistory') {
 				}
 			}
 
-			// Level 3: Search suggested account for this thirdparty (similar code exists in page index.php to make automatic binding)
-			if (!empty($objp->company_code_sell)) {
-				$objp->code_sell_t = $objp->company_code_sell;
-				$objp->aarowid_suggest = $objp->aarowid_thirdparty;
-				$suggestedaccountingaccountfor = '';
+			if (!empty($conf->global->ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY)) {
+				// Level 3: Search suggested account for this thirdparty (similar code exists in page index.php to make automatic binding)
+				if (!empty($objp->company_code_sell)) {
+					$objp->code_sell_t = $objp->company_code_sell;
+					$objp->aarowid_suggest = $objp->aarowid_thirdparty;
+					$suggestedaccountingaccountfor = '';
+				}
 			}
 
 			if ($objp->aarowid_suggest > 0) {
diff --git a/htdocs/accountancy/supplier/index.php b/htdocs/accountancy/supplier/index.php
index b5c6804c7d6..818455ce979 100644
--- a/htdocs/accountancy/supplier/index.php
+++ b/htdocs/accountancy/supplier/index.php
@@ -202,11 +202,13 @@ if ($action == 'validatehistory') {
 				}
 			}
 
-			// Level 3: Search suggested account for this thirdparty (similar code exists in page index.php to make automatic binding)
-			if (!empty($objp->company_code_buy)) {
-				$objp->code_buy_t = $objp->company_code_buy;
-				$objp->aarowid_suggest = $objp->aarowid_thirdparty;
-				$suggestedaccountingaccountfor = '';
+			if (!empty($conf->global->ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY)) {
+				// Level 3: Search suggested account for this thirdparty (similar code exists in page index.php to make automatic binding)
+				if (!empty($objp->company_code_buy)) {
+					$objp->code_buy_t = $objp->company_code_buy;
+					$objp->aarowid_suggest = $objp->aarowid_thirdparty;
+					$suggestedaccountingaccountfor = '';
+				}
 			}
 
 			if ($objp->aarowid_suggest > 0) {
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index ba4023dbba9..53efb132352 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -495,10 +495,22 @@ if (empty($reshook)) {
 			$object->webservices_key		= GETPOST('webservices_key', 'san_alpha');
 
 			if (GETPOSTISSET('accountancy_code_sell')) {
-				$object->accountancy_code_sell  = GETPOST('accountancy_code_sell', 'alpha');
+				$accountancy_code_sell  = GETPOST('accountancy_code_sell', 'alpha');
+
+				if ($accountancy_code_sell <= 0) {
+					$object->accountancy_code_sell = '';
+				} else {
+					$object->accountancy_code_sell = $accountancy_code_sell;
+				}
 			}
 			if (GETPOSTISSET('accountancy_code_buy')) {
-				$object->accountancy_code_buy   = GETPOST('accountancy_code_buy', 'alpha');
+				$accountancy_code_buy   = GETPOST('accountancy_code_buy', 'alpha');
+
+				if ($accountancy_code_buy <= 0) {
+					$object->accountancy_code_buy = '';
+				} else {
+					$object->accountancy_code_buy = $accountancy_code_buy;
+				}
 			}
 
 			// Incoterms
@@ -1058,10 +1070,22 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		$object->default_lang = GETPOST('default_lang');
 
 		if (GETPOSTISSET('accountancy_code_sell')) {
-			$object->accountancy_code_sell  = GETPOST('accountancy_code_sell', 'alpha');
+			$accountancy_code_sell  = GETPOST('accountancy_code_sell', 'alpha');
+
+			if ($accountancy_code_sell <= 0) {
+				$object->accountancy_code_sell = '';
+			} else {
+				$object->accountancy_code_sell = $accountancy_code_sell;
+			}
 		}
 		if (GETPOSTISSET('accountancy_code_buy')) {
-			$object->accountancy_code_buy   = GETPOST('accountancy_code_buy', 'alpha');
+			$accountancy_code_buy   = GETPOST('accountancy_code_buy', 'alpha');
+
+			if ($accountancy_code_buy <= 0) {
+				$object->accountancy_code_buy = '';
+			} else {
+				$object->accountancy_code_buy = $accountancy_code_buy;
+			}
 		}
 
 		$object->logo = (isset($_FILES['photo']) ?dol_sanitizeFileName($_FILES['photo']['name']) : '');
@@ -1785,10 +1809,22 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				$object->webservices_key        = GETPOST('webservices_key', 'san_alpha');
 
 				if (GETPOSTISSET('accountancy_code_sell')) {
-					$object->accountancy_code_sell  = GETPOST('accountancy_code_sell', 'alpha');
+					$accountancy_code_sell  = GETPOST('accountancy_code_sell', 'alpha');
+
+					if ($accountancy_code_sell <= 0) {
+						$object->accountancy_code_sell = '';
+					} else {
+						$object->accountancy_code_sell = $accountancy_code_sell;
+					}
 				}
 				if (GETPOSTISSET('accountancy_code_buy')) {
-					$object->accountancy_code_buy   = GETPOST('accountancy_code_buy', 'alpha');
+					$accountancy_code_buy   = GETPOST('accountancy_code_buy', 'alpha');
+
+					if ($accountancy_code_buy <= 0) {
+						$object->accountancy_code_buy = '';
+					} else {
+						$object->accountancy_code_buy = $accountancy_code_buy;
+					}
 				}
 
 				//Incoterms

From 5c8ac0cb9da016e6e865f3c2c80c51971ffad4f0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Jul 2021 21:53:24 +0200
Subject: [PATCH 1098/1497] Update card.php

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

diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 53efb132352..475c1c57082 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -497,7 +497,7 @@ if (empty($reshook)) {
 			if (GETPOSTISSET('accountancy_code_sell')) {
 				$accountancy_code_sell  = GETPOST('accountancy_code_sell', 'alpha');
 
-				if ($accountancy_code_sell <= 0) {
+				if (empty($accountancy_code_sell) || $accountancy_code_sell == '-1') {
 					$object->accountancy_code_sell = '';
 				} else {
 					$object->accountancy_code_sell = $accountancy_code_sell;
@@ -506,7 +506,7 @@ if (empty($reshook)) {
 			if (GETPOSTISSET('accountancy_code_buy')) {
 				$accountancy_code_buy   = GETPOST('accountancy_code_buy', 'alpha');
 
-				if ($accountancy_code_buy <= 0) {
+				if (empty($accountancy_code_buy) || $accountancy_code_buy == '-1') {
 					$object->accountancy_code_buy = '';
 				} else {
 					$object->accountancy_code_buy = $accountancy_code_buy;
@@ -1072,7 +1072,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		if (GETPOSTISSET('accountancy_code_sell')) {
 			$accountancy_code_sell  = GETPOST('accountancy_code_sell', 'alpha');
 
-			if ($accountancy_code_sell <= 0) {
+			if (empty($accountancy_code_sell) || $accountancy_code_sell == '-1') {
 				$object->accountancy_code_sell = '';
 			} else {
 				$object->accountancy_code_sell = $accountancy_code_sell;
@@ -1081,7 +1081,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		if (GETPOSTISSET('accountancy_code_buy')) {
 			$accountancy_code_buy   = GETPOST('accountancy_code_buy', 'alpha');
 
-			if ($accountancy_code_buy <= 0) {
+			if (empty($accountancy_code_buy) || $accountancy_code_buy == '-1') {
 				$object->accountancy_code_buy = '';
 			} else {
 				$object->accountancy_code_buy = $accountancy_code_buy;

From 6539961d58784be1eb921a3a03825229da7e7538 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Jul 2021 21:55:35 +0200
Subject: [PATCH 1099/1497] Update card.php

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

diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 475c1c57082..76ae78fdb51 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -1811,7 +1811,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				if (GETPOSTISSET('accountancy_code_sell')) {
 					$accountancy_code_sell  = GETPOST('accountancy_code_sell', 'alpha');
 
-					if ($accountancy_code_sell <= 0) {
+					if (empty($accountancy_code_sell) || $accountancy_code_sell == '-1') {
 						$object->accountancy_code_sell = '';
 					} else {
 						$object->accountancy_code_sell = $accountancy_code_sell;
@@ -1820,7 +1820,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				if (GETPOSTISSET('accountancy_code_buy')) {
 					$accountancy_code_buy   = GETPOST('accountancy_code_buy', 'alpha');
 
-					if ($accountancy_code_buy <= 0) {
+					if (empty($accountancy_code_buy) || $accountancy_code_buy == '-1') {
 						$object->accountancy_code_buy = '';
 					} else {
 						$object->accountancy_code_buy = $accountancy_code_buy;

From be62c2f7f44cd8852f9204301bffbebc7bb814a9 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Thu, 8 Jul 2021 22:11:41 +0200
Subject: [PATCH 1100/1497] FIX Problem of z-index with popup and top menu

---
 htdocs/theme/eldy/global.inc.php | 3 +++
 htdocs/theme/md/style.css.php    | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index e5db84f9719..61cddc1f5a8 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -4108,6 +4108,9 @@ div#card-errors {
 .ui-dialog-content {
 }
 
+.ui-dialog.ui-corner-all.ui-widget.ui-widget-content.ui-front.ui-dialog-buttons.ui-draggable {
+	z-index: 1002 !important;		/* Default 101 with jquery, top menu have a z-index of 1000 */
+}
 
 /* ============================================================================== */
 /* For content of image preview                                                   */
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 3b690993c5d..0912fe2d38b 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -4025,6 +4025,9 @@ div#card-errors {
     font-size: <?php print $fontsize; ?>px !important;
 }
 
+.ui-dialog.ui-corner-all.ui-widget.ui-widget-content.ui-front.ui-dialog-buttons.ui-draggable {
+	z-index: 1002 !important;		/* Default 101 with jquery, top menu have a z-index of 1000 */
+}
 
 /* ============================================================================== */
 /* For content of image preview                                                   */

From a916f668f97c615145f4e0e5880e0270d7fac4c7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Jul 2021 22:16:47 +0200
Subject: [PATCH 1101/1497] Fix param of include js

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

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 2647cba166c..99cfe360f9f 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1689,7 +1689,7 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 
 			// Global js function
 			print '<!-- Includes JS of Dolibarr -->'."\n";
-			print '<script src="'.DOL_URL_ROOT.'/core/js/lib_head.js.php?lang='.$langs->defaultlang.($ext ? '&'.$ext : '').'"></script>'."\n";
+			print '<script src="'.DOL_URL_ROOT.'/core/js/lib_head.js.php?lang='.$langs->defaultlang.($ext ? '&amp;'.$ext : '').'"></script>'."\n";
 
 			// JS forced by modules (relative url starting with /)
 			if (!empty($conf->modules_parts['js'])) {		// $conf->modules_parts['js'] is array('module'=>array('file1','file2'))
@@ -1698,7 +1698,7 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 					$filesjs = (array) $filesjs; // To be sure filejs is an array
 					foreach ($filesjs as $jsfile) {
 						// jsfile is a relative path
-						print '<!-- Include JS added by module '.$modjs.'-->'."\n".'<script src="'.dol_buildpath($jsfile, 1).'"></script>'."\n";
+						print '<!-- Include JS added by module '.$modjs.'-->'."\n".'<script src="'.dol_buildpath($jsfile, 1).((strpos($jsfile, '?') === false) ? '?' : '&amp;').'lang='.$langs->defaultlang.'"></script>'."\n";
 					}
 				}
 			}
@@ -1707,9 +1707,9 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 				print '<!-- Includes JS added by page -->'."\n";
 				foreach ($arrayofjs as $jsfile) {
 					if (preg_match('/^(http|\/\/)/i', $jsfile)) {
-						print '<script src="'.$jsfile.($ext ? ((strpos($jsfile, '?') === false) ? '?' : '&').$ext : '').'"></script>'."\n";
+						print '<script src="'.$jsfile.((strpos($jsfile, '?') === false) ? '?' : '&amp;').'lang='.$langs->defaultlang.'"></script>'."\n";
 					} else {
-						print '<script src="'.dol_buildpath($jsfile, 1).($ext ? ((strpos($jsfile, '?') === false) ? '?' : '&').$ext : '').'"></script>'."\n";
+						print '<script src="'.dol_buildpath($jsfile, 1).((strpos($jsfile, '?') === false) ? '?' : '&amp;').'lang='.$langs->defaultlang.'"></script>'."\n";
 					}
 				}
 			}

From f4005cd7a7b32b656d599eb82aa30a67e5c040dc Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Thu, 8 Jul 2021 22:24:20 +0200
Subject: [PATCH 1102/1497] Update product/card.php

---
 htdocs/product/card.php | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 3d5afd1b16c..1e1a365ead1 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -383,32 +383,32 @@ if (empty($reshook)) {
 			$accountancy_code_buy_intra = GETPOST('accountancy_code_buy_intra', 'alpha');
 			$accountancy_code_buy_export = GETPOST('accountancy_code_buy_export', 'alpha');
 
-			if ($accountancy_code_sell <= 0) {
+			if (empty($accountancy_code_sell) || $accountancy_code_sell == '-1') {
 				$object->accountancy_code_sell = '';
 			} else {
 				$object->accountancy_code_sell = $accountancy_code_sell;
 			}
-			if ($accountancy_code_sell_intra <= 0) {
+			if (empty($accountancy_code_sell_intra) || $accountancy_code_sell_intra == '-1') {
 				$object->accountancy_code_sell_intra = '';
 			} else {
 				$object->accountancy_code_sell_intra = $accountancy_code_sell_intra;
 			}
-			if ($accountancy_code_sell_export <= 0) {
+			if (empty($accountancy_code_sell_export) || $accountancy_code_sell_export == '-1') {
 				$object->accountancy_code_sell_export = '';
 			} else {
 				$object->accountancy_code_sell_export = $accountancy_code_sell_export;
 			}
-			if ($accountancy_code_buy <= 0) {
+			if (empty($accountancy_code_buy) || $accountancy_code_buy == '-1') {
 				$object->accountancy_code_buy = '';
 			} else {
 				$object->accountancy_code_buy = $accountancy_code_buy;
 			}
-			if ($accountancy_code_buy_intra <= 0) {
+			if (empty($accountancy_code_buy_intra) || $accountancy_code_buy_intra == '-1') {
 				$object->accountancy_code_buy_intra = '';
 			} else {
 				$object->accountancy_code_buy_intra = $accountancy_code_buy_intra;
 			}
-			if ($accountancy_code_buy_export <= 0) {
+			if (empty($accountancy_code_buy_export) || $accountancy_code_buy_export == '-1') {
 				$object->accountancy_code_buy_export = '';
 			} else {
 				$object->accountancy_code_buy_export = $accountancy_code_buy_export;
@@ -552,32 +552,32 @@ if (empty($reshook)) {
 				$accountancy_code_buy_intra = GETPOST('accountancy_code_buy_intra', 'alpha');
 				$accountancy_code_buy_export = GETPOST('accountancy_code_buy_export', 'alpha');
 
-				if ($accountancy_code_sell <= 0) {
+				if (empty($accountancy_code_sell) || $accountancy_code_sell == '-1') {
 					$object->accountancy_code_sell = '';
 				} else {
 					$object->accountancy_code_sell = $accountancy_code_sell;
 				}
-				if ($accountancy_code_sell_intra <= 0) {
+				if (empty($accountancy_code_sell_intra) || $accountancy_code_sell_intra == '-1') {
 					$object->accountancy_code_sell_intra = '';
 				} else {
 					$object->accountancy_code_sell_intra = $accountancy_code_sell_intra;
 				}
-				if ($accountancy_code_sell_export <= 0) {
+				if (empty($accountancy_code_sell_export) || $accountancy_code_sell_export == '-1') {
 					$object->accountancy_code_sell_export = '';
 				} else {
 					$object->accountancy_code_sell_export = $accountancy_code_sell_export;
 				}
-				if ($accountancy_code_buy <= 0) {
+				if (empty($accountancy_code_buy) || $accountancy_code_buy == '-1') {
 					$object->accountancy_code_buy = '';
 				} else {
 					$object->accountancy_code_buy = $accountancy_code_buy;
 				}
-				if ($accountancy_code_buy_intra <= 0) {
+				if (empty($accountancy_code_buy_intra) || $accountancy_code_buy_intra == '-1') {
 					$object->accountancy_code_buy_intra = '';
 				} else {
 					$object->accountancy_code_buy_intra = $accountancy_code_buy_intra;
 				}
-				if ($accountancy_code_buy_export <= 0) {
+				if (empty($accountancy_code_buy_export) || $accountancy_code_buy_export == '-1') {
 					$object->accountancy_code_buy_export = '';
 				} else {
 					$object->accountancy_code_buy_export = $accountancy_code_buy_export;

From c2ce8e3c9dc63f6b8df45c685f63c0f714e90f4a Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Thu, 8 Jul 2021 22:29:41 +0200
Subject: [PATCH 1103/1497] Fix comment

---
 htdocs/core/js/lib_foot.js.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/js/lib_foot.js.php b/htdocs/core/js/lib_foot.js.php
index d7e8b669528..78751a07458 100644
--- a/htdocs/core/js/lib_foot.js.php
+++ b/htdocs/core/js/lib_foot.js.php
@@ -247,7 +247,7 @@ print 'jQuery(\'.clipboardCPButton, .clipboardCPValueToPrint\').click(function()
 	})'."\n";
 
 
-print "\n/* JS CODE TO ENABLE ClipBoard copy paste*/\n";
+print "\n/* JS CODE TO ENABLE DIALOG CONFIRM POPUP ON ACTION BUTTON */\n";
 print '$( document ).ready(function() {
 	$(document).on("click", \'.butActionConfirm\', function(event) {
 		event.preventDefault();

From 1306ff4c0bc1bf2bbad99fd2891a50d9e378cefc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Jul 2021 23:19:43 +0200
Subject: [PATCH 1104/1497] Clean code of lib_notification. Now use cache like
 other js.

---
 htdocs/core/js/lib_foot.js.php         |   5 +
 htdocs/core/js/lib_head.js.php         |   5 +
 htdocs/core/js/lib_notification.js.php | 237 +++++++++++++------------
 htdocs/core/js/timepicker.js.php       |   4 +
 4 files changed, 140 insertions(+), 111 deletions(-)

diff --git a/htdocs/core/js/lib_foot.js.php b/htdocs/core/js/lib_foot.js.php
index dce74d93653..764fde5097e 100644
--- a/htdocs/core/js/lib_foot.js.php
+++ b/htdocs/core/js/lib_foot.js.php
@@ -47,6 +47,11 @@ session_cache_limiter('public');
 
 require_once '../../main.inc.php';
 
+
+/*
+ * View
+ */
+
 // Define javascript type
 top_httphead('text/javascript; charset=UTF-8');
 // Important: Following code is to avoid page request by browser and PHP CPU at each Dolibarr page access.
diff --git a/htdocs/core/js/lib_head.js.php b/htdocs/core/js/lib_head.js.php
index a56084d0f32..db63b1a75d4 100644
--- a/htdocs/core/js/lib_head.js.php
+++ b/htdocs/core/js/lib_head.js.php
@@ -50,6 +50,11 @@ session_cache_limiter('public');
 
 require_once '../../main.inc.php';
 
+
+/*
+ * View
+ */
+
 // Define javascript type
 top_httphead('text/javascript; charset=UTF-8');
 // Important: Following code is to avoid page request by browser and PHP CPU at each Dolibarr page access.
diff --git a/htdocs/core/js/lib_notification.js.php b/htdocs/core/js/lib_notification.js.php
index dc46a5e2072..616463b944d 100644
--- a/htdocs/core/js/lib_notification.js.php
+++ b/htdocs/core/js/lib_notification.js.php
@@ -41,132 +41,147 @@ if (!defined('NOREQUIREHTML')) {
 	define('NOREQUIREHTML', 1);
 }
 
+session_cache_limiter('public');
+
 require_once '../../main.inc.php';
 
-if (!($_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root.'/' || $_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root.'/index.php'
-	|| preg_match('/getmenu_div\.php/', $_SERVER['HTTP_REFERER']))) {
-	global $langs, $conf;
 
-	top_httphead('text/javascript; charset=UTF-8');
+/*
+ * View
+ */
 
-	print 'var login = \''.$_SESSION['dol_login'].'\';'."\n";
-	print 'var nowtime = Date.now();';
-	print 'var time_auto_update = '.$conf->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY.';'."\n"; // Always defined
-	print 'var time_js_next_test;'."\n";
-	?>
-
-	/* Check if permission ok */
-	if (Notification.permission !== "granted") {
-		console.log("Ask Notification.permission");
-		Notification.requestPermission()
-	}
-
-	/* Launch timer */
-	   // We set a delay before launching first test so next check will arrive after the time_auto_update compared to previous one.
-	//var time_first_execution = (time_auto_update + (time_js_next_test - nowtime)) * 1000;	//need milliseconds
-	var time_first_execution = <?php echo max(3, empty($conf->global->MAIN_BROWSER_NOTIFICATION_CHECK_FIRST_EXECUTION) ? 0 : $conf->global->MAIN_BROWSER_NOTIFICATION_CHECK_FIRST_EXECUTION); ?>;
-	if (login != '') {
-		setTimeout(first_execution, time_first_execution * 1000);
-		time_js_next_test = nowtime + time_first_execution;
-		console.log("Launch browser notif check: setTimeout is set to launch 'first_execution' function after a wait of time_first_execution="+time_first_execution+". nowtime (time php page generation) = "+nowtime+" time_js_next_check = "+time_js_next_test);
-	} //first run auto check
+top_httphead('text/javascript; charset=UTF-8');
+// Important: Following code is to avoid page request by browser and PHP CPU at each Dolibarr page access.
+if (empty($dolibarr_nocache)) {
+	header('Cache-Control: max-age=10800, public, must-revalidate');
+} else {
+	header('Cache-Control: no-cache');
+}
 
 
-	function first_execution() {
-		console.log("Call first_execution then set repeat time to time_auto_update = MAIN_BROWSER_NOTIFICATION_FREQUENCY = "+time_auto_update);
-		check_events();	//one check before setting the new time for other checks
-		setInterval(check_events, time_auto_update * 1000); // Set new time to run next check events
-	}
+print "jQuery(document).ready(function () {\n";
 
-	function check_events() {
-		if (Notification.permission === "granted")
-		{
-			time_js_next_test += time_auto_update;
-			console.log("Call ajax to check_events with time_js_next_test = "+time_js_next_test);
+//print "	console.log('referrer=".dol_escape_js($_SERVER['HTTP_REFERER'])."');\n";
 
-			$.ajax("<?php print DOL_URL_ROOT.'/core/ajax/check_notifications.php'; ?>", {
-				type: "post",   // Usually post or get
-				async: true,
-				data: { time_js_next_test: time_js_next_test, forcechecknow: 1, token: 'notrequired' },
-				dataType: "json",
-				success: function (result) {
-					//console.log(result);
-					var arrayofpastreminders = Object.values(result.pastreminders);
-					if (arrayofpastreminders && arrayofpastreminders.length > 0) {
-						console.log("Retrieved "+arrayofpastreminders.length+" reminders to do.");
-						var audio = null;
-						<?php
-						if (!empty($conf->global->AGENDA_REMINDER_BROWSER_SOUND)) {
-							print 'audio = new Audio(\''.DOL_URL_ROOT.'/theme/common/sound/notification_agenda.wav\');';
+print '	var nowtime = Date.now();';
+print '	var time_auto_update = '.$conf->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY.';'."\n"; // Always defined
+print '	var time_js_next_test;'."\n";
+?>
+
+/* Check if permission ok */
+if (Notification.permission !== "granted") {
+	console.log("Ask Notification.permission");
+	Notification.requestPermission()
+}
+
+/* Launch timer */
+
+// We set a delay before launching first test so next check will arrive after the time_auto_update compared to previous one.
+//var time_first_execution = (time_auto_update + (time_js_next_test - nowtime)) * 1000;	//need milliseconds
+var time_first_execution = <?php echo max(3, empty($conf->global->MAIN_BROWSER_NOTIFICATION_CHECK_FIRST_EXECUTION) ? 0 : $conf->global->MAIN_BROWSER_NOTIFICATION_CHECK_FIRST_EXECUTION); ?>;
+
+setTimeout(first_execution, time_first_execution * 1000);
+time_js_next_test = nowtime + time_first_execution;
+console.log("Launch browser notif check: setTimeout is set to launch 'first_execution' function after a wait of time_first_execution="+time_first_execution+". nowtime (time php page generation) = "+nowtime+" time_js_next_check = "+time_js_next_test);
+
+
+function first_execution() {
+	console.log("Call first_execution then set repeat time to time_auto_update = MAIN_BROWSER_NOTIFICATION_FREQUENCY = "+time_auto_update);
+	check_events();	//one check before setting the new time for other checks
+	setInterval(check_events, time_auto_update * 1000); // Set new time to run next check events
+}
+
+function check_events() {
+	if (Notification.permission === "granted")
+	{
+		time_js_next_test += time_auto_update;
+		console.log("Call ajax to check_events with time_js_next_test = "+time_js_next_test);
+
+		$.ajax("<?php print DOL_URL_ROOT.'/core/ajax/check_notifications.php'; ?>", {
+			type: "post",   // Usually post or get
+			async: true,
+			data: { time_js_next_test: time_js_next_test, forcechecknow: 1, token: 'notrequired' },
+			dataType: "json",
+			success: function (result) {
+				//console.log(result);
+				var arrayofpastreminders = Object.values(result.pastreminders);
+				if (arrayofpastreminders && arrayofpastreminders.length > 0) {
+					console.log("Retrieved "+arrayofpastreminders.length+" reminders to do.");
+					var audio = null;
+					<?php
+					if (!empty($conf->global->AGENDA_REMINDER_BROWSER_SOUND)) {
+						print 'audio = new Audio(\''.DOL_URL_ROOT.'/theme/common/sound/notification_agenda.wav\');';
+					}
+					?>
+					var listofreminderids = '';
+					var noti = []
+
+					$.each(arrayofpastreminders, function (index, value) {
+						console.log(value);
+						var url = "notdefined";
+						var title = "Not defined";
+						var body = value.label;
+						if (value.type == 'agenda' && value.location != null && value.location != '') {
+							body += '\n' + value.location;
 						}
-						?>
-						var listofreminderids = '';
-						var noti = []
 
-						$.each(arrayofpastreminders, function (index, value) {
-							console.log(value);
-							var url = "notdefined";
-							var title = "Not defined";
-							var body = value.label;
-							if (value.type == 'agenda' && value.location != null && value.location != '') {
-								body += '\n' + value.location;
-							}
+						if (value.type == 'agenda' && (value.event_date_start_formated != null || value.event_date_start_formated['event_date_start'] != '')) {
+							body += '\n' + value.event_date_start_formated;
+						}
 
-							if (value.type == 'agenda' && (value.event_date_start_formated != null || value.event_date_start_formated['event_date_start'] != '')) {
-								body += '\n' + value.event_date_start_formated;
-							}
+						if (value.type == 'agenda')
+						{
+							 url = '<?php print DOL_URL_ROOT.'/comm/action/card.php?id='; ?>' + value.id_agenda;
+							title = '<?php print dol_escape_js($langs->trans('EventReminder')) ?>';
+						}
+						var extra = {
+							icon: '<?php print DOL_URL_ROOT.'/theme/common/bell.png'; ?>',
+							//image: '<?php print DOL_URL_ROOT.'/theme/common/bell.png'; ?>',
+							body: body,
+							tag: value.id_agenda,
+							requireInteraction: true
+						};
 
-							if (value.type == 'agenda')
-							{
-								 url = '<?php print DOL_URL_ROOT.'/comm/action/card.php?id='; ?>' + value.id_agenda;
-								title = '<?php print dol_escape_js($langs->trans('EventReminder')) ?>';
-							}
-							var extra = {
-								icon: '<?php print DOL_URL_ROOT.'/theme/common/bell.png'; ?>',
-								//image: '<?php print DOL_URL_ROOT.'/theme/common/bell.png'; ?>',
-								body: body,
-								tag: value.id_agenda,
-								requireInteraction: true
+						// We release the notify
+						console.log("Send notification on browser");
+						noti[index] = new Notification(title, extra);
+						if (index==0 && audio)
+						{
+							audio.play();
+						}
+
+						if (noti[index]) {
+							noti[index].onclick = function (event) {
+								console.log("A click on notification on browser has been done");
+								event.preventDefault(); // prevent the browser from focusing the Notification's tab
+								window.focus();
+								window.open(url, '_blank');
+								noti[index].close();
 							};
 
-							// We release the notify
-							console.log("Send notification on browser");
-							noti[index] = new Notification(title, extra);
-							if (index==0 && audio)
-							{
-								audio.play();
-							}
+							listofreminderids = (listofreminderids == '' ? '' : listofreminderids + ',') + value.id_reminder
+						}
+					});
 
-							if (noti[index]) {
-								noti[index].onclick = function (event) {
-									console.log("A click on notification on browser has been done");
-									event.preventDefault(); // prevent the browser from focusing the Notification's tab
-									window.focus();
-									window.open(url, '_blank');
-									noti[index].close();
-								};
-
-								listofreminderids = (listofreminderids == '' ? '' : listofreminderids + ',') + value.id_reminder
-							}
-						});
-
-						// Update status of all notifications we sent on browser (listofreminderids)
-						console.log("Flag notification as done for listofreminderids="+listofreminderids);
-						$.ajax("<?php print DOL_URL_ROOT.'/core/ajax/check_notifications.php?action=stopreminder&listofreminderids='; ?>"+listofreminderids, {
-							type: "POST",   // Usually post or get
-							async: true,
-							data: { time_js_next_test: time_js_next_test, token: 'notrequired' }
-						});
-					} else {
-						console.log("No reminder to do found, next search at "+time_js_next_test);
-					}
+					// Update status of all notifications we sent on browser (listofreminderids)
+					console.log("Flag notification as done for listofreminderids="+listofreminderids);
+					$.ajax("<?php print DOL_URL_ROOT.'/core/ajax/check_notifications.php?action=stopreminder&listofreminderids='; ?>"+listofreminderids, {
+						type: "POST",   // Usually post or get
+						async: true,
+						data: { time_js_next_test: time_js_next_test, token: 'notrequired' }
+					});
+				} else {
+					console.log("No reminder to do found, next search at "+time_js_next_test);
 				}
-			});
-		}
-		else
-		{
-			console.log("Cancel check_events. Useless because javascript Notification.permission is "+Notification.permission+" (blocked manualy or web site is not https).");
-		}
+			}
+		});
+	}
+	else
+	{
+		console.log("Cancel check_events. Useless because javascript Notification.permission is "+Notification.permission+" (blocked manualy or web site is not https).");
 	}
-	<?php
 }
+<?php
+
+print "\n";
+print '})'."\n";
diff --git a/htdocs/core/js/timepicker.js.php b/htdocs/core/js/timepicker.js.php
index 11b65e729b5..084a47a2974 100644
--- a/htdocs/core/js/timepicker.js.php
+++ b/htdocs/core/js/timepicker.js.php
@@ -47,6 +47,10 @@ session_cache_limiter('public');
 
 require_once '../../main.inc.php';
 
+/*
+ * View
+ */
+
 // Define javascript type
 top_httphead('text/javascript; charset=UTF-8');
 // Important: Following code is to avoid page request by browser and PHP CPU at each Dolibarr page access.

From aa9d98a336842dd1980be0f425357d59b68d2be4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Jul 2021 23:19:43 +0200
Subject: [PATCH 1105/1497] Clean code of lib_notification. Now use cache like
 other js.

---
 htdocs/core/js/lib_foot.js.php         |   5 +
 htdocs/core/js/lib_head.js.php         |   5 +
 htdocs/core/js/lib_notification.js.php | 237 +++++++++++++------------
 htdocs/core/js/timepicker.js.php       |   4 +
 4 files changed, 140 insertions(+), 111 deletions(-)

diff --git a/htdocs/core/js/lib_foot.js.php b/htdocs/core/js/lib_foot.js.php
index dce74d93653..764fde5097e 100644
--- a/htdocs/core/js/lib_foot.js.php
+++ b/htdocs/core/js/lib_foot.js.php
@@ -47,6 +47,11 @@ session_cache_limiter('public');
 
 require_once '../../main.inc.php';
 
+
+/*
+ * View
+ */
+
 // Define javascript type
 top_httphead('text/javascript; charset=UTF-8');
 // Important: Following code is to avoid page request by browser and PHP CPU at each Dolibarr page access.
diff --git a/htdocs/core/js/lib_head.js.php b/htdocs/core/js/lib_head.js.php
index a56084d0f32..db63b1a75d4 100644
--- a/htdocs/core/js/lib_head.js.php
+++ b/htdocs/core/js/lib_head.js.php
@@ -50,6 +50,11 @@ session_cache_limiter('public');
 
 require_once '../../main.inc.php';
 
+
+/*
+ * View
+ */
+
 // Define javascript type
 top_httphead('text/javascript; charset=UTF-8');
 // Important: Following code is to avoid page request by browser and PHP CPU at each Dolibarr page access.
diff --git a/htdocs/core/js/lib_notification.js.php b/htdocs/core/js/lib_notification.js.php
index dc46a5e2072..616463b944d 100644
--- a/htdocs/core/js/lib_notification.js.php
+++ b/htdocs/core/js/lib_notification.js.php
@@ -41,132 +41,147 @@ if (!defined('NOREQUIREHTML')) {
 	define('NOREQUIREHTML', 1);
 }
 
+session_cache_limiter('public');
+
 require_once '../../main.inc.php';
 
-if (!($_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root.'/' || $_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root.'/index.php'
-	|| preg_match('/getmenu_div\.php/', $_SERVER['HTTP_REFERER']))) {
-	global $langs, $conf;
 
-	top_httphead('text/javascript; charset=UTF-8');
+/*
+ * View
+ */
 
-	print 'var login = \''.$_SESSION['dol_login'].'\';'."\n";
-	print 'var nowtime = Date.now();';
-	print 'var time_auto_update = '.$conf->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY.';'."\n"; // Always defined
-	print 'var time_js_next_test;'."\n";
-	?>
-
-	/* Check if permission ok */
-	if (Notification.permission !== "granted") {
-		console.log("Ask Notification.permission");
-		Notification.requestPermission()
-	}
-
-	/* Launch timer */
-	   // We set a delay before launching first test so next check will arrive after the time_auto_update compared to previous one.
-	//var time_first_execution = (time_auto_update + (time_js_next_test - nowtime)) * 1000;	//need milliseconds
-	var time_first_execution = <?php echo max(3, empty($conf->global->MAIN_BROWSER_NOTIFICATION_CHECK_FIRST_EXECUTION) ? 0 : $conf->global->MAIN_BROWSER_NOTIFICATION_CHECK_FIRST_EXECUTION); ?>;
-	if (login != '') {
-		setTimeout(first_execution, time_first_execution * 1000);
-		time_js_next_test = nowtime + time_first_execution;
-		console.log("Launch browser notif check: setTimeout is set to launch 'first_execution' function after a wait of time_first_execution="+time_first_execution+". nowtime (time php page generation) = "+nowtime+" time_js_next_check = "+time_js_next_test);
-	} //first run auto check
+top_httphead('text/javascript; charset=UTF-8');
+// Important: Following code is to avoid page request by browser and PHP CPU at each Dolibarr page access.
+if (empty($dolibarr_nocache)) {
+	header('Cache-Control: max-age=10800, public, must-revalidate');
+} else {
+	header('Cache-Control: no-cache');
+}
 
 
-	function first_execution() {
-		console.log("Call first_execution then set repeat time to time_auto_update = MAIN_BROWSER_NOTIFICATION_FREQUENCY = "+time_auto_update);
-		check_events();	//one check before setting the new time for other checks
-		setInterval(check_events, time_auto_update * 1000); // Set new time to run next check events
-	}
+print "jQuery(document).ready(function () {\n";
 
-	function check_events() {
-		if (Notification.permission === "granted")
-		{
-			time_js_next_test += time_auto_update;
-			console.log("Call ajax to check_events with time_js_next_test = "+time_js_next_test);
+//print "	console.log('referrer=".dol_escape_js($_SERVER['HTTP_REFERER'])."');\n";
 
-			$.ajax("<?php print DOL_URL_ROOT.'/core/ajax/check_notifications.php'; ?>", {
-				type: "post",   // Usually post or get
-				async: true,
-				data: { time_js_next_test: time_js_next_test, forcechecknow: 1, token: 'notrequired' },
-				dataType: "json",
-				success: function (result) {
-					//console.log(result);
-					var arrayofpastreminders = Object.values(result.pastreminders);
-					if (arrayofpastreminders && arrayofpastreminders.length > 0) {
-						console.log("Retrieved "+arrayofpastreminders.length+" reminders to do.");
-						var audio = null;
-						<?php
-						if (!empty($conf->global->AGENDA_REMINDER_BROWSER_SOUND)) {
-							print 'audio = new Audio(\''.DOL_URL_ROOT.'/theme/common/sound/notification_agenda.wav\');';
+print '	var nowtime = Date.now();';
+print '	var time_auto_update = '.$conf->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY.';'."\n"; // Always defined
+print '	var time_js_next_test;'."\n";
+?>
+
+/* Check if permission ok */
+if (Notification.permission !== "granted") {
+	console.log("Ask Notification.permission");
+	Notification.requestPermission()
+}
+
+/* Launch timer */
+
+// We set a delay before launching first test so next check will arrive after the time_auto_update compared to previous one.
+//var time_first_execution = (time_auto_update + (time_js_next_test - nowtime)) * 1000;	//need milliseconds
+var time_first_execution = <?php echo max(3, empty($conf->global->MAIN_BROWSER_NOTIFICATION_CHECK_FIRST_EXECUTION) ? 0 : $conf->global->MAIN_BROWSER_NOTIFICATION_CHECK_FIRST_EXECUTION); ?>;
+
+setTimeout(first_execution, time_first_execution * 1000);
+time_js_next_test = nowtime + time_first_execution;
+console.log("Launch browser notif check: setTimeout is set to launch 'first_execution' function after a wait of time_first_execution="+time_first_execution+". nowtime (time php page generation) = "+nowtime+" time_js_next_check = "+time_js_next_test);
+
+
+function first_execution() {
+	console.log("Call first_execution then set repeat time to time_auto_update = MAIN_BROWSER_NOTIFICATION_FREQUENCY = "+time_auto_update);
+	check_events();	//one check before setting the new time for other checks
+	setInterval(check_events, time_auto_update * 1000); // Set new time to run next check events
+}
+
+function check_events() {
+	if (Notification.permission === "granted")
+	{
+		time_js_next_test += time_auto_update;
+		console.log("Call ajax to check_events with time_js_next_test = "+time_js_next_test);
+
+		$.ajax("<?php print DOL_URL_ROOT.'/core/ajax/check_notifications.php'; ?>", {
+			type: "post",   // Usually post or get
+			async: true,
+			data: { time_js_next_test: time_js_next_test, forcechecknow: 1, token: 'notrequired' },
+			dataType: "json",
+			success: function (result) {
+				//console.log(result);
+				var arrayofpastreminders = Object.values(result.pastreminders);
+				if (arrayofpastreminders && arrayofpastreminders.length > 0) {
+					console.log("Retrieved "+arrayofpastreminders.length+" reminders to do.");
+					var audio = null;
+					<?php
+					if (!empty($conf->global->AGENDA_REMINDER_BROWSER_SOUND)) {
+						print 'audio = new Audio(\''.DOL_URL_ROOT.'/theme/common/sound/notification_agenda.wav\');';
+					}
+					?>
+					var listofreminderids = '';
+					var noti = []
+
+					$.each(arrayofpastreminders, function (index, value) {
+						console.log(value);
+						var url = "notdefined";
+						var title = "Not defined";
+						var body = value.label;
+						if (value.type == 'agenda' && value.location != null && value.location != '') {
+							body += '\n' + value.location;
 						}
-						?>
-						var listofreminderids = '';
-						var noti = []
 
-						$.each(arrayofpastreminders, function (index, value) {
-							console.log(value);
-							var url = "notdefined";
-							var title = "Not defined";
-							var body = value.label;
-							if (value.type == 'agenda' && value.location != null && value.location != '') {
-								body += '\n' + value.location;
-							}
+						if (value.type == 'agenda' && (value.event_date_start_formated != null || value.event_date_start_formated['event_date_start'] != '')) {
+							body += '\n' + value.event_date_start_formated;
+						}
 
-							if (value.type == 'agenda' && (value.event_date_start_formated != null || value.event_date_start_formated['event_date_start'] != '')) {
-								body += '\n' + value.event_date_start_formated;
-							}
+						if (value.type == 'agenda')
+						{
+							 url = '<?php print DOL_URL_ROOT.'/comm/action/card.php?id='; ?>' + value.id_agenda;
+							title = '<?php print dol_escape_js($langs->trans('EventReminder')) ?>';
+						}
+						var extra = {
+							icon: '<?php print DOL_URL_ROOT.'/theme/common/bell.png'; ?>',
+							//image: '<?php print DOL_URL_ROOT.'/theme/common/bell.png'; ?>',
+							body: body,
+							tag: value.id_agenda,
+							requireInteraction: true
+						};
 
-							if (value.type == 'agenda')
-							{
-								 url = '<?php print DOL_URL_ROOT.'/comm/action/card.php?id='; ?>' + value.id_agenda;
-								title = '<?php print dol_escape_js($langs->trans('EventReminder')) ?>';
-							}
-							var extra = {
-								icon: '<?php print DOL_URL_ROOT.'/theme/common/bell.png'; ?>',
-								//image: '<?php print DOL_URL_ROOT.'/theme/common/bell.png'; ?>',
-								body: body,
-								tag: value.id_agenda,
-								requireInteraction: true
+						// We release the notify
+						console.log("Send notification on browser");
+						noti[index] = new Notification(title, extra);
+						if (index==0 && audio)
+						{
+							audio.play();
+						}
+
+						if (noti[index]) {
+							noti[index].onclick = function (event) {
+								console.log("A click on notification on browser has been done");
+								event.preventDefault(); // prevent the browser from focusing the Notification's tab
+								window.focus();
+								window.open(url, '_blank');
+								noti[index].close();
 							};
 
-							// We release the notify
-							console.log("Send notification on browser");
-							noti[index] = new Notification(title, extra);
-							if (index==0 && audio)
-							{
-								audio.play();
-							}
+							listofreminderids = (listofreminderids == '' ? '' : listofreminderids + ',') + value.id_reminder
+						}
+					});
 
-							if (noti[index]) {
-								noti[index].onclick = function (event) {
-									console.log("A click on notification on browser has been done");
-									event.preventDefault(); // prevent the browser from focusing the Notification's tab
-									window.focus();
-									window.open(url, '_blank');
-									noti[index].close();
-								};
-
-								listofreminderids = (listofreminderids == '' ? '' : listofreminderids + ',') + value.id_reminder
-							}
-						});
-
-						// Update status of all notifications we sent on browser (listofreminderids)
-						console.log("Flag notification as done for listofreminderids="+listofreminderids);
-						$.ajax("<?php print DOL_URL_ROOT.'/core/ajax/check_notifications.php?action=stopreminder&listofreminderids='; ?>"+listofreminderids, {
-							type: "POST",   // Usually post or get
-							async: true,
-							data: { time_js_next_test: time_js_next_test, token: 'notrequired' }
-						});
-					} else {
-						console.log("No reminder to do found, next search at "+time_js_next_test);
-					}
+					// Update status of all notifications we sent on browser (listofreminderids)
+					console.log("Flag notification as done for listofreminderids="+listofreminderids);
+					$.ajax("<?php print DOL_URL_ROOT.'/core/ajax/check_notifications.php?action=stopreminder&listofreminderids='; ?>"+listofreminderids, {
+						type: "POST",   // Usually post or get
+						async: true,
+						data: { time_js_next_test: time_js_next_test, token: 'notrequired' }
+					});
+				} else {
+					console.log("No reminder to do found, next search at "+time_js_next_test);
 				}
-			});
-		}
-		else
-		{
-			console.log("Cancel check_events. Useless because javascript Notification.permission is "+Notification.permission+" (blocked manualy or web site is not https).");
-		}
+			}
+		});
+	}
+	else
+	{
+		console.log("Cancel check_events. Useless because javascript Notification.permission is "+Notification.permission+" (blocked manualy or web site is not https).");
 	}
-	<?php
 }
+<?php
+
+print "\n";
+print '})'."\n";
diff --git a/htdocs/core/js/timepicker.js.php b/htdocs/core/js/timepicker.js.php
index 11b65e729b5..084a47a2974 100644
--- a/htdocs/core/js/timepicker.js.php
+++ b/htdocs/core/js/timepicker.js.php
@@ -47,6 +47,10 @@ session_cache_limiter('public');
 
 require_once '../../main.inc.php';
 
+/*
+ * View
+ */
+
 // Define javascript type
 top_httphead('text/javascript; charset=UTF-8');
 // Important: Following code is to avoid page request by browser and PHP CPU at each Dolibarr page access.

From 924cff44f3230dfc5b261d1f3a3e150d51bb5b17 Mon Sep 17 00:00:00 2001
From: Florian Mortgat <florian.mortgat@atm-consulting.fr>
Date: Fri, 9 Jul 2021 09:16:27 +0200
Subject: [PATCH 1106/1497] FIX PR feedback: in `addFileIntoDatabaseIndex`,
 return error if $object is set with an ID but without a table_element

---
 htdocs/core/lib/files.lib.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index b2244e9b174..45253d6a441 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1789,8 +1789,13 @@ function addFileIntoDatabaseIndex($dir, $file, $fullpathorig = '', $mode = 'uplo
 
 		if (is_object($object) && $object->id > 0) {
 			$ecmfile->src_object_id = $object->id;
-			if (isset($object->table_element)) $ecmfile->src_object_type = $object->table_element;
-			if (isset($object->src_object_description)) $ecmfile->description = $object->src_object_description;
+			if (isset($object->table_element)) {
+				$ecmfile->src_object_type = $object->table_element;
+				if (isset($object->src_object_description)) $ecmfile->description = $object->src_object_description;
+			} else {
+				dol_syslog('Error: object ' . get_class($object) . ' has no table_element attribute.');
+				return -1;
+			}
 			if (isset($object->src_object_keywords)) $ecmfile->keywords = $object->src_object_keywords;
 		}
 

From 823d360202df106559f3f9be8a2ce1a1bdd3ff25 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 9 Jul 2021 12:15:43 +0200
Subject: [PATCH 1107/1497] Fix reposition

---
 htdocs/admin/ihm.php | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index f4ea09966fc..cf4c250a678 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -255,7 +255,7 @@ if ($action == 'update') {
 
 	$_SESSION["mainmenu"] = ""; // Le gestionnaire de menu a pu changer
 
-	header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup");
+	header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup".(GETPOSTISSET('page_y', 'int') ? '&page_y='.GETPOST('page_y', 'int') : ''));
 	exit;
 }
 
@@ -281,6 +281,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 print '<form enctype="multipart/form-data" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="update">';
+print '<input type="hidden" name="page_y" value="">';
 
 clearstatcache();
 
@@ -292,8 +293,9 @@ print '</tr>';
 
 // Default language
 print '<tr class="oddeven"><td>'.$langs->trans("DefaultLanguage").'</td><td>';
+print img_picto('', 'language', 'class="pictofixedwidth"');
 print $formadmin->select_language($conf->global->MAIN_LANG_DEFAULT, 'MAIN_LANG_DEFAULT', 1, null, '', 0, 0, 'minwidth300', 2);
-print '<input class="button button-save" type="submit" name="submit" value="'.$langs->trans("Save").'">';
+//print '<input class="button button-save smallpaddingimp" type="submit" name="submit" value="'.$langs->trans("Save").'">';
 print '</td>';
 print '</tr>';
 
@@ -303,12 +305,24 @@ print ajax_constantonoff("MAIN_MULTILANGS", array(), $conf->entity, 0, 0, 1, 0);
 print '</td>';
 print '</tr>';
 
-print '</table><br>'."\n";
+print '</table>'."\n";
 print '</div>';
 
+print '<br>';
+print '<div class="center">';
+print '<input class="button button-save" type="submit" name="submit" value="'.$langs->trans("Save").'">';
+print '</div>';
+
+print '<br><br>';
+
 // Themes and themes options
 showSkins(null, 1);
 print '<br>';
+print '<div class="center">';
+print '<input class="button button-save reposition" type="submit" name="submit" value="'.$langs->trans("Save").'">';
+print '</div>';
+
+print '<br><br>';
 
 // Other
 print '<div class="div-table-responsive-no-min">';
@@ -440,6 +454,12 @@ print '</div>';
 
 print '<br>';
 
+print '<div class="center">';
+print '<input class="button button-save reposition" type="submit" name="submit" value="'.$langs->trans("Save").'">';
+print '</div>';
+
+print '<br><br>';
+
 // Other
 print '<div class="div-table-responsive-no-min">';
 print '<table summary="edit" class="noborder centpercent editmode tableforfield">';
@@ -497,7 +517,7 @@ print '</div>';
 
 print '<br>';
 print '<div class="center">';
-print '<input class="button button-save" type="submit" name="submit" value="'.$langs->trans("Save").'">';
+print '<input class="button button-save reposition" type="submit" name="submit" value="'.$langs->trans("Save").'">';
 print '</div>';
 
 print '</form>';

From 2bef8a27c8cb871a46a6cc9b56184e8337151ced Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 9 Jul 2021 12:34:51 +0200
Subject: [PATCH 1108/1497] Trans

---
 htdocs/fourn/ajax/getSupplierPrices.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/fourn/ajax/getSupplierPrices.php b/htdocs/fourn/ajax/getSupplierPrices.php
index e0cd9beff0c..889484cec44 100644
--- a/htdocs/fourn/ajax/getSupplierPrices.php
+++ b/htdocs/fourn/ajax/getSupplierPrices.php
@@ -43,7 +43,7 @@ $idprod = GETPOST('idprod', 'int');
 $prices = array();
 
 // Load translation files required by the page
-$langs->loadLangs(array("stocks", "margins"));
+$langs->loadLangs(array("stocks", "margins", "products"));
 
 
 /*

From b7c42c70ef05f16913e50907612acd1dd66b4099 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 9 Jul 2021 13:33:37 +0200
Subject: [PATCH 1109/1497] Fix date for planned entries

---
 htdocs/compta/bank/treso.php  | 140 ++++++++++++++++++----------------
 htdocs/fourn/facture/card.php |  43 ++++++-----
 2 files changed, 96 insertions(+), 87 deletions(-)

diff --git a/htdocs/compta/bank/treso.php b/htdocs/compta/bank/treso.php
index d9b54ad1c3d..98a51947c0e 100644
--- a/htdocs/compta/bank/treso.php
+++ b/htdocs/compta/bank/treso.php
@@ -98,44 +98,6 @@ if (GETPOST("account") || GETPOST("ref")) {
 
 	print dol_get_fiche_end();
 
-	print '<br>';
-
-	$solde = $object->solde(0);
-	if ($conf->global->MULTICOMPANY_INVOICE_SHARING_ENABLED) {
-		$colspan = 6;
-	} else {
-		$colspan = 5;
-	}
-
-	// Show next coming entries
-	print '<div class="div-table-responsive">';
-	print '<table class="noborder centpercent">';
-
-	// Ligne de titre tableau des ecritures
-	print '<tr class="liste_titre">';
-	print '<td>'.$langs->trans("DateDue").'</td>';
-	print '<td>'.$langs->trans("Description").'</td>';
-	if ($conf->global->MULTICOMPANY_INVOICE_SHARING_ENABLED) {
-		print '<td>'.$langs->trans("Entity").'</td>';
-	}
-	print '<td>'.$langs->trans("ThirdParty").'</td>';
-	print '<td class="right">'.$langs->trans("Debit").'</td>';
-	print '<td class="right">'.$langs->trans("Credit").'</td>';
-	print '<td class="right" width="80">'.$langs->trans("BankBalance").'</td>';
-	print '</tr>';
-
-	// Current balance
-	print '<tr class="liste_total">';
-	print '<td class="left" colspan="5">'.$langs->trans("CurrentBalance").'</td>';
-	print '<td class="nowrap right">'.price($solde).'</td>';
-	print '</tr>';
-
-
-	print '<tr class="liste_titre">';
-	print '<td class="left" colspan="'.$colspan.'">'.$langs->trans("RemainderToPay").'</td>';
-	print '<td class="nowrap right">&nbsp;</td>';
-	print '</tr>';
-
 
 	// Remainder to pay in future
 	$sqls = array();
@@ -183,10 +145,12 @@ if (GETPOST("account") || GETPOST("ref")) {
 	$error = 0;
 	$tab_sqlobjOrder = array();
 	$tab_sqlobj = array();
+	$nbtotalofrecords = 0;
 
 	foreach ($sqls as $sql) {
 		$resql = $db->query($sql);
 		if ($resql) {
+			$nbtotalofrecords += $db->num_rows($resql);
 			while ($sqlobj = $db->fetch_object($resql)) {
 				$tmpobj = new stdClass();
 				$tmpobj->family = $sqlobj->family;
@@ -194,7 +158,7 @@ if (GETPOST("account") || GETPOST("ref")) {
 				$tmpobj->ref = $sqlobj->ref;
 				$tmpobj->total_ttc = $sqlobj->total_ttc;
 				$tmpobj->type = $sqlobj->type;
-				$tmpobj->dlt = $sqlobj->dlr;
+				$tmpobj->dlr = $db->jdate($sqlobj->dlr);
 				$tmpobj->socid = $sqlobj->socid;
 				$tmpobj->name = $sqlobj->name;
 				$tmpobj->fournisseur = $sqlobj->fournisseur;
@@ -208,6 +172,48 @@ if (GETPOST("account") || GETPOST("ref")) {
 		}
 	}
 
+	$param = '';
+	$sortfield = '';
+	$sortorder = '';
+	$massactionbutton = '';
+	$num = 0;
+	$picto = '';
+	$morehtml = '';
+	$limit = 0;
+
+	print_barre_liste($langs->trans("RemainderToPay"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, $picto, 0, $morehtml, '', $limit, 0, 0, 1);
+
+
+	$solde = $object->solde(0);
+	if ($conf->global->MULTICOMPANY_INVOICE_SHARING_ENABLED) {
+		$colspan = 6;
+	} else {
+		$colspan = 5;
+	}
+
+	// Show next coming entries
+	print '<div class="div-table-responsive">';
+	print '<table class="noborder centpercent">';
+
+	// Ligne de titre tableau des ecritures
+	print '<tr class="liste_titre">';
+	print '<td>'.$langs->trans("DateDue").'</td>';
+	print '<td>'.$langs->trans("Description").'</td>';
+	if ($conf->global->MULTICOMPANY_INVOICE_SHARING_ENABLED) {
+		print '<td>'.$langs->trans("Entity").'</td>';
+	}
+	print '<td>'.$langs->trans("ThirdParty").'</td>';
+	print '<td class="right">'.$langs->trans("Debit").'</td>';
+	print '<td class="right">'.$langs->trans("Credit").'</td>';
+	print '<td class="right" width="80">'.$langs->trans("BankBalance").'</td>';
+	print '</tr>';
+
+	// Current balance
+	print '<tr class="liste_total">';
+	print '<td class="left" colspan="5">'.$langs->trans("CurrentBalance").'</td>';
+	print '<td class="nowrap right">'.price($solde).'</td>';
+	print '</tr>';
+
 	// Sort array
 	if (!$error) {
 		array_multisort($tab_sqlobjOrder, $tab_sqlobj);
@@ -220,60 +226,60 @@ if (GETPOST("account") || GETPOST("ref")) {
 			$refcomp = '';
 			$totalpayment = '';
 
-			$obj = array_shift($tab_sqlobj);
+			$tmpobj = array_shift($tab_sqlobj);
 
-			if ($obj->family == 'invoice_supplier') {
+			if ($tmpobj->family == 'invoice_supplier') {
 				$showline = 1;
 				// Uncomment this line to avoid to count suppliers credit note (ff.type = 2)
-				//$showline=(($obj->total_ttc < 0 && $obj->type != 2) || ($obj->total_ttc > 0 && $obj->type == 2))
+				//$showline=(($tmpobj->total_ttc < 0 && $tmpobj->type != 2) || ($tmpobj->total_ttc > 0 && $tmpobj->type == 2))
 				if ($showline) {
-					$ref = $obj->ref;
+					$ref = $tmpobj->ref;
 					$facturefournstatic->ref = $ref;
-					$facturefournstatic->id = $obj->objid;
-					$facturefournstatic->type = $obj->type;
+					$facturefournstatic->id = $tmpobj->objid;
+					$facturefournstatic->type = $tmpobj->type;
 					$ref = $facturefournstatic->getNomUrl(1, '');
 
-					$societestatic->id = $obj->socid;
-					$societestatic->name = $obj->name;
+					$societestatic->id = $tmpobj->socid;
+					$societestatic->name = $tmpobj->name;
 					$refcomp = $societestatic->getNomUrl(1, '', 24);
 
 					$totalpayment = -1 * $facturefournstatic->getSommePaiement(); // Payment already done
 				}
 			}
-			if ($obj->family == 'invoice') {
-				$facturestatic->ref = $obj->ref;
-				$facturestatic->id = $obj->objid;
-				$facturestatic->type = $obj->type;
+			if ($tmpobj->family == 'invoice') {
+				$facturestatic->ref = $tmpobj->ref;
+				$facturestatic->id = $tmpobj->objid;
+				$facturestatic->type = $tmpobj->type;
 				$ref = $facturestatic->getNomUrl(1, '');
 
-				$societestatic->id = $obj->socid;
-				$societestatic->name = $obj->name;
+				$societestatic->id = $tmpobj->socid;
+				$societestatic->name = $tmpobj->name;
 				$refcomp = $societestatic->getNomUrl(1, '', 24);
 
 				$totalpayment = $facturestatic->getSommePaiement(); // Payment already done
 				$totalpayment += $facturestatic->getSumDepositsUsed();
 				$totalpayment += $facturestatic->getSumCreditNotesUsed();
 			}
-			if ($obj->family == 'social_contribution') {
-				$socialcontribstatic->ref = $obj->ref;
-				$socialcontribstatic->id = $obj->objid;
-				$socialcontribstatic->label = $obj->type;
+			if ($tmpobj->family == 'social_contribution') {
+				$socialcontribstatic->ref = $tmpobj->ref;
+				$socialcontribstatic->id = $tmpobj->objid;
+				$socialcontribstatic->label = $tmpobj->type;
 				$ref = $socialcontribstatic->getNomUrl(1, 24);
 
 				$totalpayment = -1 * $socialcontribstatic->getSommePaiement(); // Payment already done
 			}
 
-			$parameters = array('obj' => $obj, 'ref' => $ref, 'refcomp' => $refcomp, 'totalpayment' => $totalpayment);
-			$reshook = $hookmanager->executeHooks('moreFamily', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+			$parameters = array('obj' => $tmpobj, 'ref' => $ref, 'refcomp' => $refcomp, 'totalpayment' => $totalpayment);
+			$reshook = $hookmanager->executeHooks('moreFamily', $parameters, $tmpobject, $action); // Note that $action and $tmpobject may have been modified by hook
 			if (empty($reshook)) {
 				$ref = isset($hookmanager->resArray['ref']) ? $hookmanager->resArray['ref'] : $ref;
 				$refcomp = isset($hookmanager->resArray['refcomp']) ? $hookmanager->resArray['refcomp'] : $refcomp;
 				$totalpayment = isset($hookmanager->resArray['totalpayment']) ? $hookmanager->resArray['totalpayment'] : $totalpayment;
 			}
 
-			$total_ttc = $obj->total_ttc;
+			$total_ttc = $tmpobj->total_ttc;
 			if ($totalpayment) {
-				$total_ttc = $obj->total_ttc - $totalpayment;
+				$total_ttc = $tmpobj->total_ttc - $totalpayment;
 			}
 			$solde += $total_ttc;
 
@@ -282,26 +288,26 @@ if (GETPOST("account") || GETPOST("ref")) {
 				// Show line
 				print '<tr class="oddeven">';
 				print '<td>';
-				if ($obj->dlr) {
-					print dol_print_date($db->jdate($obj->dlr), "day");
+				if ($tmpobj->dlr) {
+					print dol_print_date($tmpobj->dlr, "day");
 				} else {
 					print $langs->trans("NotDefined");
 				}
 				print "</td>";
 				print "<td>".$ref."</td>";
 				if ($conf->global->MULTICOMPANY_INVOICE_SHARING_ENABLED) {
-					if ($obj->family == 'invoice') {
-						$mc->getInfo($obj->entity);
+					if ($tmpobj->family == 'invoice') {
+						$mc->getInfo($tmpobj->entity);
 						print "<td>".$mc->label."</td>";
 					} else {
 						print "<td></td>";
 					}
 				}
 				print "<td>".$refcomp."</td>";
-				if ($obj->total_ttc < 0) {
+				if ($tmpobj->total_ttc < 0) {
 					print '<td class="nowrap right">'.price(abs($total_ttc))."</td><td>&nbsp;</td>";
 				};
-				if ($obj->total_ttc >= 0) {
+				if ($tmpobj->total_ttc >= 0) {
 					print '<td>&nbsp;</td><td class="nowrap right">'.price($total_ttc)."</td>";
 				};
 				print '<td class="nowrap right">'.price($solde).'</td>';
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 7d8d29b307c..6b67d0a2dcf 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -2739,14 +2739,17 @@ if ($action == 'create') {
 
 		// Label
 		print '<tr>';
-		print '<td>'.$form->editfieldkey("Label", 'label', $object->label, $object, ($usercancreate)).'</td>';
-		print '<td>'.$form->editfieldval("Label", 'label', $object->label, $object, ($usercancreate)).'</td>';
+		print '<td>'.$form->editfieldkey("Label", 'label', $object->label, $object, $usercancreate).'</td>';
+		print '<td>'.$form->editfieldval("Label", 'label', $object->label, $object, $usercancreate).'</td>';
 		print '</tr>';
 
 		$form_permission = ($object->statut < FactureFournisseur::STATUS_CLOSED) && $usercancreate && ($object->getSommePaiement() <= 0);
+		$form_permission2 = ($object->statut < FactureFournisseur::STATUS_CLOSED) && $usercancreate;
 
 		// Date
-		print '<tr><td>'.$form->editfieldkey("DateInvoice", 'datef', $object->datep, $object, $form_permission, 'datepicker').'</td><td colspan="3">';
+		print '<tr><td>';
+		print $form->editfieldkey("DateInvoice", 'datef', $object->datep, $object, $form_permission, 'datepicker');
+		print '</td><td colspan="3">';
 		print $form->editfieldval("Date", 'datef', $object->datep, $object, $form_permission, 'datepicker');
 		print '</td>';
 
@@ -2756,11 +2759,11 @@ if ($action == 'create') {
 		print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
 		print $langs->trans('PaymentConditions');
 		print '<td>';
-		if ($action != 'editconditions' && $usercancreate) {
+		if ($action != 'editconditions' && $form_permission) {
 			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editconditions&amp;id='.$object->id.'">'.img_edit($langs->trans('SetConditions'), 1).'</a></td>';
 		}
 		print '</tr></table>';
-		print '</td><td colspan="2">';
+		print '</td><td>';
 		if ($action == 'editconditions') {
 			$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id, 'cond_reglement_id');
 		} else {
@@ -2770,8 +2773,10 @@ if ($action == 'create') {
 		print '</tr>';
 
 		// Due date
-		print '<tr><td>'.$form->editfieldkey("DateMaxPayment", 'date_lim_reglement', $object->date_echeance, $object, $form_permission, 'datepicker').'</td><td colspan="3">';
-		print $form->editfieldval("DateMaxPayment", 'date_lim_reglement', $object->date_echeance, $object, $form_permission, 'datepicker');
+		print '<tr><td>';
+		print $form->editfieldkey("DateMaxPayment", 'date_lim_reglement', $object->date_echeance, $object, $form_permission2, 'datepicker');
+		print '</td><td>';
+		print $form->editfieldval("DateMaxPayment", 'date_lim_reglement', $object->date_echeance, $object, $form_permission2, 'datepicker');
 		if ($action != 'editdate_lim_reglement' && $object->hasDelay()) {
 			print img_warning($langs->trans('Late'));
 		}
@@ -2783,11 +2788,11 @@ if ($action == 'create') {
 		print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
 		print $langs->trans('PaymentMode');
 		print '</td>';
-		if ($action != 'editmode' && $usercancreate) {
+		if ($action != 'editmode' && $form_permission2) {
 			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmode&amp;id='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
 		}
 		print '</tr></table>';
-		print '</td><td colspan="2">';
+		print '</td><td>';
 		if ($action == 'editmode') {
 			$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'mode_reglement_id', 'DBIT', 1, 1);
 		} else {
@@ -2807,7 +2812,7 @@ if ($action == 'create') {
 				print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmulticurrencycode&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1).'</a></td>';
 			}
 			print '</tr></table>';
-			print '</td><td colspan="3">';
+			print '</td><td>';
 			if ($action == 'editmulticurrencycode') {
 				$form->form_multicurrency_code($_SERVER['PHP_SELF'].'?id='.$object->id, $object->multicurrency_code, 'multicurrency_code');
 			} else {
@@ -2819,14 +2824,14 @@ if ($action == 'create') {
 			if ($object->multicurrency_code != $conf->currency || $object->multicurrency_tx != 1) {
 				print '<tr>';
 				print '<td>';
-				print '<table class="nobordernopadding" width="100%"><tr><td>';
+				print '<table class="nobordernopadding centpercent"><tr><td>';
 				print $form->editfieldkey('CurrencyRate', 'multicurrency_tx', '', $object, 0);
 				print '</td>';
 				if ($action != 'editmulticurrencyrate' && $object->statut == $object::STATUS_DRAFT && $object->multicurrency_code && $object->multicurrency_code != $conf->currency) {
 					print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmulticurrencyrate&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1).'</a></td>';
 				}
 				print '</tr></table>';
-				print '</td><td colspan="3">';
+				print '</td><td>';
 				if ($action == 'editmulticurrencyrate' || $action == 'actualizemulticurrencyrate') {
 					if ($action == 'actualizemulticurrencyrate') {
 						list($object->fk_multicurrency, $object->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($object->db, $object->multicurrency_code);
@@ -2854,7 +2859,7 @@ if ($action == 'create') {
 				print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'), 1).'</a></td>';
 			}
 			print '</tr></table>';
-			print '</td><td colspan="3">';
+			print '</td><td>';
 			if ($action == 'editbankaccount') {
 				$form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'fk_account', 1);
 			} else {
@@ -2877,7 +2882,7 @@ if ($action == 'create') {
 			}
 			print '</td></tr></table>';
 			print '</td>';
-			print '<td colspan="3">';
+			print '<td>';
 			if ($action != 'editincoterm') {
 				print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
 			} else {
@@ -2898,7 +2903,6 @@ if ($action == 'create') {
 			}
 			print '</tr></table>';
 			print '</td>';
-
 			print '<td>';
 			if ($action == 'editmode') {
 				$form->formSelectTransportMode($_SERVER['PHP_SELF'].'?id='.$object->id, $object->transport_mode_id, 'transport_mode_id', 1, 1);
@@ -2913,8 +2917,8 @@ if ($action == 'create') {
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
 		print '</table>';
-
 		print '</div>';
+
 		print '<div class="fichehalfright">';
 		print '<div class="ficheaddleft">';
 		print '<div class="underbanner clearboth"></div>';
@@ -2933,7 +2937,7 @@ if ($action == 'create') {
 			print '</tr>';
 
 			// Multicurrency Amount TTC
-			print '<tr><td height="10">'.$form->editfieldkey('MulticurrencyAmountTTC', 'multicurrency_total_ttc', '', $object, 0).'</td>';
+			print '<tr><td>'.$form->editfieldkey('MulticurrencyAmountTTC', 'multicurrency_total_ttc', '', $object, 0).'</td>';
 			print '<td>'.price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
 			print '</tr>';
 		}
@@ -2977,9 +2981,8 @@ if ($action == 'create') {
 
 		print '</table>';
 
-		/*
-		 * List of payments
-		 */
+
+		// List of payments
 
 		$totalpaye = 0;
 

From ec6fadf196a73ac8b5313a97a81437e3e71781f1 Mon Sep 17 00:00:00 2001
From: kamel <kamel@kam>
Date: Fri, 9 Jul 2021 15:29:39 +0200
Subject: [PATCH 1110/1497] Fix hook constructCategory when several new
 categories is added by several modules

---
 htdocs/categories/class/categorie.class.php | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index b98cff5b3a5..3144f1f98c3 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -263,15 +263,16 @@ class Categorie extends CommonObject
 			$parameters = array();
 			$reshook = $hookmanager->executeHooks('constructCategory', $parameters, $this); // Note that $action and $object may have been modified by some hooks
 			if ($reshook >= 0 && !empty($hookmanager->resArray)) {
-				$mapList = $hookmanager->resArray;
-				$mapId   = $mapList['id'];
-				$mapCode = $mapList['code'];
-				self::$MAP_ID_TO_CODE[$mapId] = $mapCode;
-				$this->MAP_ID[$mapCode] = $mapId;
-				$this->MAP_CAT_FK[$mapCode] = $mapList['cat_fk'];
-				$this->MAP_CAT_TABLE[$mapCode] = $mapList['cat_table'];
-				$this->MAP_OBJ_CLASS[$mapCode] = $mapList['obj_class'];
-				$this->MAP_OBJ_TABLE[$mapCode] = $mapList['obj_table'];
+				foreach ($hookmanager->resArray as $mapList) {
+					$mapId = $mapList['id'];
+					$mapCode = $mapList['code'];
+					self::$MAP_ID_TO_CODE[$mapId] = $mapCode;
+					$this->MAP_ID[$mapCode] = $mapId;
+					$this->MAP_CAT_FK[$mapCode] = $mapList['cat_fk'];
+					$this->MAP_CAT_TABLE[$mapCode] = $mapList['cat_table'];
+					$this->MAP_OBJ_CLASS[$mapCode] = $mapList['obj_class'];
+					$this->MAP_OBJ_TABLE[$mapCode] = $mapList['obj_table'];
+				}
 			}
 		}
 	}

From 073ace3a9e48c60d90b25717819d4b1ac3636a41 Mon Sep 17 00:00:00 2001
From: kamel <kamel@kam>
Date: Fri, 9 Jul 2021 16:23:46 +0200
Subject: [PATCH 1111/1497] FIX get categories linked to another object type

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

diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index b98cff5b3a5..5bcfa903f75 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -1497,7 +1497,7 @@ class Categorie extends CommonObject
 		} else {
 			$sql = "SELECT ct.fk_categorie, c.label, c.rowid";
 			$sql .= " FROM ".MAIN_DB_PREFIX."categorie_".(empty($this->MAP_CAT_TABLE[$type]) ? $type : $this->MAP_CAT_TABLE[$type])." as ct, ".MAIN_DB_PREFIX."categorie as c";
-			$sql .= " WHERE ct.fk_categorie = c.rowid AND ct.fk_".(empty($this->MAP_CAT_FK[$type]) ? $type : $this->MAP_CAT_FK[$type])." = ".(int) $id." AND c.type = ".$this->MAP_ID[$type];
+			$sql .= " WHERE ct.fk_categorie = c.rowid AND ct.fk_".(empty($this->MAP_CAT_FK[$type]) ? $type : $this->MAP_CAT_FK[$type])." = ".(int) $id;
 			$sql .= " AND c.entity IN (".getEntity('category').")";
 
 			$res = $this->db->query($sql);

From e45d5c1d0dc3fd955016e5b96840a84ede68a6a5 Mon Sep 17 00:00:00 2001
From: fr69400 <82267780+fr69400@users.noreply.github.com>
Date: Fri, 9 Jul 2021 18:36:21 +0200
Subject: [PATCH 1112/1497] NEW add hookmanager on note pages

---
 htdocs/adherents/note.php                         |  9 +++++++--
 htdocs/asset/note.php                             |  6 +++++-
 htdocs/bom/bom_note.php                           |  7 ++++++-
 htdocs/comm/propal/note.php                       | 11 ++++++++++-
 htdocs/commande/card.php                          |  7 ++++---
 htdocs/commande/note.php                          | 11 ++++++++++-
 htdocs/compta/facture/note.php                    |  9 ++++++++-
 htdocs/contact/note.php                           | 10 ++++++++--
 htdocs/contrat/note.php                           | 15 ++++++++++-----
 htdocs/don/note.php                               |  9 ++++++++-
 .../conferenceorboothattendee_note.php            |  6 +++++-
 htdocs/expedition/note.php                        |  9 ++++++++-
 htdocs/expensereport/note.php                     | 10 ++++++++--
 htdocs/fichinter/note.php                         |  8 +++++++-
 htdocs/fourn/commande/note.php                    | 11 ++++++++---
 htdocs/fourn/facture/note.php                     | 10 +++++++++-
 .../knowledgemanagement/knowledgerecord_note.php  |  7 ++++++-
 htdocs/loan/note.php                              | 10 +++++++++-
 htdocs/modulebuilder/template/myobject_note.php   |  7 ++++++-
 htdocs/mrp/mo_note.php                            |  8 +++++++-
 htdocs/partnership/partnership_note.php           |  6 +++++-
 htdocs/product/note.php                           |  9 ++++++++-
 htdocs/projet/note.php                            |  8 +++++++-
 htdocs/projet/tasks/note.php                      | 10 +++++++++-
 htdocs/reception/note.php                         | 12 +++++++++++-
 .../recruitment/recruitmentcandidature_note.php   |  7 ++++++-
 .../recruitment/recruitmentjobposition_note.php   |  7 ++++++-
 htdocs/resource/note.php                          | 10 +++++++++-
 htdocs/societe/note.php                           |  6 ++++++
 htdocs/supplier_proposal/note.php                 | 12 +++++++++++-
 htdocs/workstation/workstation_note.php           |  6 +++++-
 31 files changed, 232 insertions(+), 41 deletions(-)

diff --git a/htdocs/adherents/note.php b/htdocs/adherents/note.php
index cc216d794d1..b351cd2b67d 100644
--- a/htdocs/adherents/note.php
+++ b/htdocs/adherents/note.php
@@ -68,15 +68,20 @@ if ($id) {
 	$caneditfieldmember = $user->rights->adherent->creer;
 }
 
+$hookmanager->initHooks(array('membernote'));
+
 // Security check
 $result = restrictedArea($user, 'adherent', $object->id, '', '', 'socid', 'rowid', 0);
 
-
 /*
  * Actions
  */
+$reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) 
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
+if (empty($reshook)) 
+	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 
 
 
diff --git a/htdocs/asset/note.php b/htdocs/asset/note.php
index 752591ade9e..eaf888fde05 100644
--- a/htdocs/asset/note.php
+++ b/htdocs/asset/note.php
@@ -70,8 +70,12 @@ $permissionnote = 1;
  * Actions
  */
 
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
+$reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) 
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
+if (empty($reshook)) 
+	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 
 /*
  * View
diff --git a/htdocs/bom/bom_note.php b/htdocs/bom/bom_note.php
index 539eb654751..6cd0d8e0692 100644
--- a/htdocs/bom/bom_note.php
+++ b/htdocs/bom/bom_note.php
@@ -70,7 +70,12 @@ restrictedArea($user, 'bom', $object->id, 'bom_bom', '', '', 'rowid', $isdraft);
  * Actions
  */
 
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
+$reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) 
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook)) 
+	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 
 
 /*
diff --git a/htdocs/comm/propal/note.php b/htdocs/comm/propal/note.php
index 6dd62a9990d..d9ff0603e9f 100644
--- a/htdocs/comm/propal/note.php
+++ b/htdocs/comm/propal/note.php
@@ -52,6 +52,10 @@ if ($user->socid > 0) {
 	$socid = $user->socid;
 	$object->id = $user->socid;
 }
+
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('propalnote'));
+
 restrictedArea($user, 'propal', $object->id, 'propal');
 
 
@@ -61,7 +65,12 @@ restrictedArea($user, 'propal', $object->id, 'propal');
 
 $permissionnote = $user->rights->propale->creer; // Used by the include of actions_setnotes.inc.php
 
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once
+$reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) 
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook)) 
+	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 
 
 
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 6d0badf6380..db3d4ee621e 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -91,6 +91,10 @@ $hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (!empty($con
 if (!empty($user->socid)) {
 	$socid = $user->socid;
 }
+
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('ordercard', 'globalcard'));
+
 $result = restrictedArea($user, 'commande', $id);
 
 $object = new Commande($db);
@@ -102,9 +106,6 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 // Load object
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once
 
-// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array('ordercard', 'globalcard'));
-
 $usercanread = $user->rights->commande->lire;
 $usercancreate = $user->rights->commande->creer;
 $usercandelete = $user->rights->commande->supprimer;
diff --git a/htdocs/commande/note.php b/htdocs/commande/note.php
index 6872990a3ec..8fa66913922 100644
--- a/htdocs/commande/note.php
+++ b/htdocs/commande/note.php
@@ -45,6 +45,10 @@ $socid = 0;
 if ($user->socid) {
 	$socid = $user->socid;
 }
+
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('ordernote'));
+
 $result = restrictedArea($user, 'commande', $id, '');
 
 
@@ -61,7 +65,12 @@ $permissionnote = $user->rights->commande->creer; // Used by the include of acti
  * Actions
  */
 
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once
+$reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) 
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook)) 
+	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 
 
 /*
diff --git a/htdocs/compta/facture/note.php b/htdocs/compta/facture/note.php
index f019d822529..0e6ab39f5ca 100644
--- a/htdocs/compta/facture/note.php
+++ b/htdocs/compta/facture/note.php
@@ -54,6 +54,8 @@ $socid = 0;
 if ($user->socid) {
 	$socid = $user->socid;
 }
+$hookmanager->initHooks(array('invoicenote')); 
+
 $result = restrictedArea($user, 'facture', $id, '');
 
 
@@ -61,7 +63,12 @@ $result = restrictedArea($user, 'facture', $id, '');
  * Actions
  */
 
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once
+$reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) 
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook)) 
+	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 
 
 
diff --git a/htdocs/contact/note.php b/htdocs/contact/note.php
index c301ef02276..167ee7ef4a3 100644
--- a/htdocs/contact/note.php
+++ b/htdocs/contact/note.php
@@ -49,13 +49,19 @@ if ($id > 0) {
 $permissionnote = $user->rights->societe->creer; // Used by the include of actions_setnotes.inc.php
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array('contactcard'));
+// $hookmanager->initHooks(array('contactcard')); -> Name conflict with product/card.php
+$hookmanager->initHooks(array('contactnote'));
+
 
 /*
  * Actions
  */
+$reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) 
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once
+if (empty($reshook)) 
+	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once
 
 
 /*
diff --git a/htdocs/contrat/note.php b/htdocs/contrat/note.php
index eab56b97a16..a41a33af6c7 100644
--- a/htdocs/contrat/note.php
+++ b/htdocs/contrat/note.php
@@ -44,6 +44,10 @@ $ref = GETPOST('ref', 'alpha');
 if ($user->socid) {
 	$socid = $user->socid;
 }
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+//$hookmanager->initHooks(array('contractcard', 'globalcard'));  -> Conflict with contrat\card.php
+$hookmanager->initHooks(array('contractnote'));
+
 $result = restrictedArea($user, 'contrat', $id);
 
 $object = new Contrat($db);
@@ -51,16 +55,17 @@ $object->fetch($id, $ref);
 
 $permissionnote = $user->rights->contrat->creer; // Used by the include of actions_setnotes.inc.php
 
-// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array('contractcard', 'globalcard'));
-
-
 
 /*
  * Actions
  */
 
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once
+$reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) 
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook)) 
+	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 
 
 
diff --git a/htdocs/don/note.php b/htdocs/don/note.php
index 2e153d73b95..fdf70350680 100644
--- a/htdocs/don/note.php
+++ b/htdocs/don/note.php
@@ -47,6 +47,8 @@ $socid = 0;
 if ($user->socid) {
 	$socid = $user->socid;
 }
+$hookmanager->initHooks(array('donnote')); 
+
 $result = restrictedArea($user, 'don', $id, '');
 
 $object = new Don($db);
@@ -58,7 +60,12 @@ $permissionnote = $user->rights->don->creer; // Used by the include of actions_s
 /*
  * Actions
  */
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
+$reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) 
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook)) 
+	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 
 if ($action == 'classin' && $user->rights->don->creer) {
 	$object->fetch($id);
diff --git a/htdocs/eventorganization/conferenceorboothattendee_note.php b/htdocs/eventorganization/conferenceorboothattendee_note.php
index 46620112311..02312ded462 100644
--- a/htdocs/eventorganization/conferenceorboothattendee_note.php
+++ b/htdocs/eventorganization/conferenceorboothattendee_note.php
@@ -115,8 +115,12 @@ $permissiontoadd = $user->rights->eventorganization->conferenceorboothattendee->
  * Actions
  */
 
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
+$reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) 
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
+if (empty($reshook)) 
+	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 
 /*
  * View
diff --git a/htdocs/expedition/note.php b/htdocs/expedition/note.php
index a9076162015..4aebfdc7da5 100644
--- a/htdocs/expedition/note.php
+++ b/htdocs/expedition/note.php
@@ -69,6 +69,8 @@ $permissionnote = $user->rights->expedition->creer; // Used by the include of ac
 if ($user->socid) {
 	$socid = $user->socid;
 }
+
+$hookmanager->initHooks(array('expeditionnote'));
 $result = restrictedArea($user, 'expedition', $object->id, '');
 
 
@@ -76,7 +78,12 @@ $result = restrictedArea($user, 'expedition', $object->id, '');
  * Actions
  */
 
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once
+$reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) 
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook)) 
+	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 
 
 /*
diff --git a/htdocs/expensereport/note.php b/htdocs/expensereport/note.php
index b0156c6a475..24ea0dd4643 100644
--- a/htdocs/expensereport/note.php
+++ b/htdocs/expensereport/note.php
@@ -44,6 +44,8 @@ $socid = 0;
 if ($user->socid) {
 	$socid = $user->socid;
 }
+$hookmanager->initHooks(array('expensereportnote')); 
+
 $result = restrictedArea($user, 'expensereport', $id, 'expensereport');
 
 
@@ -68,12 +70,16 @@ if ($object->id > 0) {
 	}
 }
 
-
 /*
  * Actions
  */
 
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
+$reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) 
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook)) 
+	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 
 
 /*
diff --git a/htdocs/fichinter/note.php b/htdocs/fichinter/note.php
index fcc790bf8c2..b671aacf252 100644
--- a/htdocs/fichinter/note.php
+++ b/htdocs/fichinter/note.php
@@ -42,6 +42,7 @@ $action = GETPOST('action', 'aZ09');
 if ($user->socid) {
 	$socid = $user->socid;
 }
+$hookmanager->initHooks(array('fichinternote')); 
 $result = restrictedArea($user, 'ficheinter', $id, 'fichinter');
 
 $object = new Fichinter($db);
@@ -53,7 +54,12 @@ $permissionnote = $user->rights->ficheinter->creer; // Used by the include of ac
  * Actions
  */
 
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once
+$reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) 
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook)) 
+	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 
 
 /*
diff --git a/htdocs/fourn/commande/note.php b/htdocs/fourn/commande/note.php
index d9b0904c7ef..22c93256cbb 100644
--- a/htdocs/fourn/commande/note.php
+++ b/htdocs/fourn/commande/note.php
@@ -43,13 +43,13 @@ $action = GETPOST('action', 'aZ09');
 if ($user->socid) {
 	$socid = $user->socid;
 }
+
+$hookmanager->initHooks(array('ordersuppliercardnote'));
 $result = restrictedArea($user, 'fournisseur', $id, 'commande_fournisseur', 'commande');
 
 $object = new CommandeFournisseur($db);
 $object->fetch($id, $ref);
 
-$hookmanager->initHooks(array('ordersuppliercardnote'));
-
 $permissionnote = ($user->rights->fournisseur->commande->creer || $user->rights->supplier_order->creer); // Used by the include of actions_setnotes.inc.php
 
 
@@ -57,7 +57,12 @@ $permissionnote = ($user->rights->fournisseur->commande->creer || $user->rights-
  * Actions
  */
 
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once
+$reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) 
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook)) 
+	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 
 
 /*
diff --git a/htdocs/fourn/facture/note.php b/htdocs/fourn/facture/note.php
index 5bbf1fdcba6..cede169b8c6 100644
--- a/htdocs/fourn/facture/note.php
+++ b/htdocs/fourn/facture/note.php
@@ -44,6 +44,9 @@ $action = GETPOST('action', 'aZ09');
 if ($user->socid) {
 	$socid = $user->socid;
 }
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('invoicesuppliernote'));
+
 $result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture');
 
 $object = new FactureFournisseur($db);
@@ -56,7 +59,12 @@ $permissionnote = ($user->rights->fournisseur->facture->creer || $user->rights->
  * Actions
  */
 
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once
+$reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) 
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook)) 
+	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 
 // Set label
 if ($action == 'setlabel' && ($user->rights->fournisseur->facture->creer || $user->rights->supplier_invoice->creer)) {
diff --git a/htdocs/knowledgemanagement/knowledgerecord_note.php b/htdocs/knowledgemanagement/knowledgerecord_note.php
index a6a9974a9c8..93be4e841ec 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_note.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_note.php
@@ -66,7 +66,12 @@ $permissiontoadd = $user->rights->knowledgemanagement->knowledgerecord->write; /
  * Actions
  */
 
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
+$reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) 
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook)) 
+	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 
 
 /*
diff --git a/htdocs/loan/note.php b/htdocs/loan/note.php
index f7930b64c9a..3bf520a3ae0 100644
--- a/htdocs/loan/note.php
+++ b/htdocs/loan/note.php
@@ -41,6 +41,8 @@ $langs->loadLangs(array("loan"));
 
 // Security check
 $id = GETPOST('id', 'int');
+
+$hookmanager->initHooks(array('loannote')); 
 $result = restrictedArea($user, 'loan', $id, '&loan');
 
 $object = new Loan($db);
@@ -55,7 +57,13 @@ $permissionnote = $user->rights->loan->write; // Used by the include of actions_
  *  Actions
  */
 
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
+
+$reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) 
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook)) 
+	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 
 
 /*
diff --git a/htdocs/modulebuilder/template/myobject_note.php b/htdocs/modulebuilder/template/myobject_note.php
index f5fc29a2591..48f78c4d37e 100644
--- a/htdocs/modulebuilder/template/myobject_note.php
+++ b/htdocs/modulebuilder/template/myobject_note.php
@@ -117,7 +117,12 @@ $permissiontoadd = $user->rights->mymodule->myobject->write; // Used by the incl
  * Actions
  */
 
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
+$reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) 
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook)) 
+	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 
 
 /*
diff --git a/htdocs/mrp/mo_note.php b/htdocs/mrp/mo_note.php
index 6bbfc503453..e7c08d4378f 100644
--- a/htdocs/mrp/mo_note.php
+++ b/htdocs/mrp/mo_note.php
@@ -68,7 +68,13 @@ $permissionnote = $user->rights->mrp->write;	// Used by the include of actions_s
  * Actions
  */
 
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
+
+$reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) 
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook)) 
+	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 
 
 /*
diff --git a/htdocs/partnership/partnership_note.php b/htdocs/partnership/partnership_note.php
index b9607e5aeb6..90f2e54933d 100644
--- a/htdocs/partnership/partnership_note.php
+++ b/htdocs/partnership/partnership_note.php
@@ -65,8 +65,12 @@ $permissiontoadd = $user->rights->partnership->write; // Used by the include of
 /*
  * Actions
  */
+$reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) 
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
+if (empty($reshook)) 
+	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 
 
 /*
diff --git a/htdocs/product/note.php b/htdocs/product/note.php
index b758f414035..12e1d80774a 100644
--- a/htdocs/product/note.php
+++ b/htdocs/product/note.php
@@ -63,11 +63,18 @@ if ($object->id > 0) {
 }
 
 
+$hookmanager->initHooks(array('productnote'));
+
+
 /*
  * Actions
  */
+$reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) 
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once
+if (empty($reshook)) 
+	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once
 
 
 /*
diff --git a/htdocs/projet/note.php b/htdocs/projet/note.php
index 8b65156570a..e93e361eb64 100644
--- a/htdocs/projet/note.php
+++ b/htdocs/projet/note.php
@@ -46,6 +46,7 @@ if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($ob
 // Security check
 $socid = 0;
 //if ($user->socid > 0) $socid = $user->socid;    // For external user, no check is done on company because readability is managed by public status of project and assignement.
+$hookmanager->initHooks(array('projetnote'));
 $result = restrictedArea($user, 'projet', $id, 'projet&project');
 
 $permissionnote = $user->rights->projet->creer; // Used by the include of actions_setnotes.inc.php
@@ -55,7 +56,12 @@ $permissionnote = $user->rights->projet->creer; // Used by the include of action
  * Actions
  */
 
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once
+$reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) 
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook)) 
+	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 
 
 /*
diff --git a/htdocs/projet/tasks/note.php b/htdocs/projet/tasks/note.php
index 4d581afc30a..8c3e43b578f 100644
--- a/htdocs/projet/tasks/note.php
+++ b/htdocs/projet/tasks/note.php
@@ -44,6 +44,9 @@ $socid = 0;
 if (!$user->rights->projet->lire) {
 	accessforbidden();
 }
+
+$hookmanager->initHooks(array('projettasknote'));
+
 //$result = restrictedArea($user, 'projet', $id, '', 'task'); // TODO ameliorer la verification
 
 $object = new Task($db);
@@ -89,7 +92,12 @@ $permissionnote = ($user->rights->projet->creer || $user->rights->projet->all->c
  * Actions
  */
 
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php';
+$reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) 
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook)) 
+	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 
 
 /*
diff --git a/htdocs/reception/note.php b/htdocs/reception/note.php
index f343e56e14d..90c448294d7 100644
--- a/htdocs/reception/note.php
+++ b/htdocs/reception/note.php
@@ -67,6 +67,11 @@ $permissionnote = $user->rights->reception->creer; // Used by the include of act
 if ($user->socid > 0) {
 	$socid = $user->socid;
 }
+
+
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('receptionnote'));
+
 if ($origin == 'reception') {
 	$result = restrictedArea($user, $origin, $object->id);
 } else {
@@ -87,7 +92,12 @@ if ($origin == 'reception') {
  * Actions
  */
 
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once
+$reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) 
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook)) 
+	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 
 
 /*
diff --git a/htdocs/recruitment/recruitmentcandidature_note.php b/htdocs/recruitment/recruitmentcandidature_note.php
index d4c18155c5d..3b92802d5b1 100644
--- a/htdocs/recruitment/recruitmentcandidature_note.php
+++ b/htdocs/recruitment/recruitmentcandidature_note.php
@@ -94,7 +94,12 @@ $result = restrictedArea($user, 'recruitment', $object->id, 'recruitment_recruit
  * Actions
  */
 
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
+$reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) 
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook)) 
+	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 
 
 /*
diff --git a/htdocs/recruitment/recruitmentjobposition_note.php b/htdocs/recruitment/recruitmentjobposition_note.php
index 9dbcd0e1180..8911fd55361 100644
--- a/htdocs/recruitment/recruitmentjobposition_note.php
+++ b/htdocs/recruitment/recruitmentjobposition_note.php
@@ -99,7 +99,12 @@ $result = restrictedArea($user, 'recruitment', $object->id, 'recruitment_recruit
  * Actions
  */
 
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
+$reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) 
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook)) 
+	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 
 
 /*
diff --git a/htdocs/resource/note.php b/htdocs/resource/note.php
index 07819b1d0b4..1f58cc348f4 100644
--- a/htdocs/resource/note.php
+++ b/htdocs/resource/note.php
@@ -40,6 +40,9 @@ $action = GETPOST('action', 'aZ09');
 if ($user->socid) {
 	$socid = $user->socid;
 }
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('resourcenote'));
+
 $result = restrictedArea($user, 'resource', $id, 'resource');
 
 $object = new DolResource($db);
@@ -52,7 +55,12 @@ $permissionnote = $user->rights->resource->write; // Used by the include of acti
  * Actions
  */
 
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once
+$reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) 
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook)) 
+	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 
 
 /*
diff --git a/htdocs/societe/note.php b/htdocs/societe/note.php
index d4396738966..ee2eeed65a5 100644
--- a/htdocs/societe/note.php
+++ b/htdocs/societe/note.php
@@ -56,6 +56,12 @@ $result = restrictedArea($user, 'societe', $object->id, '&societe');
 /*
  * Actions
  */
+$reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) 
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook)) 
+	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once
 
 include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once
 
diff --git a/htdocs/supplier_proposal/note.php b/htdocs/supplier_proposal/note.php
index d16bc90033e..e463fbcb26c 100644
--- a/htdocs/supplier_proposal/note.php
+++ b/htdocs/supplier_proposal/note.php
@@ -43,6 +43,11 @@ $action = GETPOST('action', 'aZ09');
 if ($user->socid) {
 	$socid = $user->socid;
 }
+
+
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('supplier_proposalnote'));
+
 $result = restrictedArea($user, 'supplier_proposal', $id, 'supplier_proposal');
 
 $object = new SupplierProposal($db);
@@ -55,7 +60,12 @@ $object = new SupplierProposal($db);
 
 $permissionnote = $user->rights->supplier_proposal->creer; // Used by the include of actions_setnotes.inc.php
 
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once
+$reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) 
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook)) 
+	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 
 
 /*
diff --git a/htdocs/workstation/workstation_note.php b/htdocs/workstation/workstation_note.php
index 18fa87b5ea6..f1198e971ab 100755
--- a/htdocs/workstation/workstation_note.php
+++ b/htdocs/workstation/workstation_note.php
@@ -68,8 +68,12 @@ restrictedArea($user, $object->element, $object->id, $object->table_element, 'wo
 /*
  * Actions
  */
+$reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) 
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
+if (empty($reshook)) 
+	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 
 
 /*

From 4272f93aa4b12c8bc0e0d68d16bcd731a6bc46df Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Fri, 9 Jul 2021 16:41:41 +0000
Subject: [PATCH 1113/1497] Fixing style errors.

---
 htdocs/adherents/note.php                                   | 4 ++--
 htdocs/asset/note.php                                       | 4 ++--
 htdocs/bom/bom_note.php                                     | 4 ++--
 htdocs/comm/propal/note.php                                 | 4 ++--
 htdocs/commande/note.php                                    | 4 ++--
 htdocs/compta/facture/note.php                              | 6 +++---
 htdocs/contact/note.php                                     | 4 ++--
 htdocs/contrat/note.php                                     | 4 ++--
 htdocs/don/note.php                                         | 6 +++---
 htdocs/eventorganization/conferenceorboothattendee_note.php | 4 ++--
 htdocs/expedition/note.php                                  | 4 ++--
 htdocs/expensereport/note.php                               | 6 +++---
 htdocs/fichinter/note.php                                   | 6 +++---
 htdocs/fourn/commande/note.php                              | 4 ++--
 htdocs/fourn/facture/note.php                               | 4 ++--
 htdocs/knowledgemanagement/knowledgerecord_note.php         | 4 ++--
 htdocs/loan/note.php                                        | 6 +++---
 htdocs/modulebuilder/template/myobject_note.php             | 4 ++--
 htdocs/mrp/mo_note.php                                      | 4 ++--
 htdocs/partnership/partnership_note.php                     | 4 ++--
 htdocs/product/note.php                                     | 4 ++--
 htdocs/projet/note.php                                      | 4 ++--
 htdocs/projet/tasks/note.php                                | 4 ++--
 htdocs/reception/note.php                                   | 4 ++--
 htdocs/recruitment/recruitmentcandidature_note.php          | 4 ++--
 htdocs/recruitment/recruitmentjobposition_note.php          | 4 ++--
 htdocs/resource/note.php                                    | 4 ++--
 htdocs/societe/note.php                                     | 4 ++--
 htdocs/supplier_proposal/note.php                           | 4 ++--
 htdocs/workstation/workstation_note.php                     | 4 ++--
 30 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/htdocs/adherents/note.php b/htdocs/adherents/note.php
index b351cd2b67d..e26654a07ee 100644
--- a/htdocs/adherents/note.php
+++ b/htdocs/adherents/note.php
@@ -77,10 +77,10 @@ $result = restrictedArea($user, 'adherent', $object->id, '', '', 'socid', 'rowid
  * Actions
  */
 $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) 
+if ($reshook < 0)
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-if (empty($reshook)) 
+if (empty($reshook))
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 
 
diff --git a/htdocs/asset/note.php b/htdocs/asset/note.php
index eaf888fde05..207465d1187 100644
--- a/htdocs/asset/note.php
+++ b/htdocs/asset/note.php
@@ -71,10 +71,10 @@ $permissionnote = 1;
  */
 
 $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) 
+if ($reshook < 0)
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-if (empty($reshook)) 
+if (empty($reshook))
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 
 /*
diff --git a/htdocs/bom/bom_note.php b/htdocs/bom/bom_note.php
index 6cd0d8e0692..3d70c09b35a 100644
--- a/htdocs/bom/bom_note.php
+++ b/htdocs/bom/bom_note.php
@@ -71,10 +71,10 @@ restrictedArea($user, 'bom', $object->id, 'bom_bom', '', '', 'rowid', $isdraft);
  */
 
 $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) 
+if ($reshook < 0)
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-if (empty($reshook)) 
+if (empty($reshook))
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 
 
diff --git a/htdocs/comm/propal/note.php b/htdocs/comm/propal/note.php
index d9ff0603e9f..e42382dfbd6 100644
--- a/htdocs/comm/propal/note.php
+++ b/htdocs/comm/propal/note.php
@@ -66,10 +66,10 @@ restrictedArea($user, 'propal', $object->id, 'propal');
 $permissionnote = $user->rights->propale->creer; // Used by the include of actions_setnotes.inc.php
 
 $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) 
+if ($reshook < 0)
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-if (empty($reshook)) 
+if (empty($reshook))
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 
 
diff --git a/htdocs/commande/note.php b/htdocs/commande/note.php
index 8fa66913922..41598249e8c 100644
--- a/htdocs/commande/note.php
+++ b/htdocs/commande/note.php
@@ -66,10 +66,10 @@ $permissionnote = $user->rights->commande->creer; // Used by the include of acti
  */
 
 $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) 
+if ($reshook < 0)
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-if (empty($reshook)) 
+if (empty($reshook))
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 
 
diff --git a/htdocs/compta/facture/note.php b/htdocs/compta/facture/note.php
index 0e6ab39f5ca..863fde5812b 100644
--- a/htdocs/compta/facture/note.php
+++ b/htdocs/compta/facture/note.php
@@ -54,7 +54,7 @@ $socid = 0;
 if ($user->socid) {
 	$socid = $user->socid;
 }
-$hookmanager->initHooks(array('invoicenote')); 
+$hookmanager->initHooks(array('invoicenote'));
 
 $result = restrictedArea($user, 'facture', $id, '');
 
@@ -64,10 +64,10 @@ $result = restrictedArea($user, 'facture', $id, '');
  */
 
 $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) 
+if ($reshook < 0)
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-if (empty($reshook)) 
+if (empty($reshook))
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 
 
diff --git a/htdocs/contact/note.php b/htdocs/contact/note.php
index 167ee7ef4a3..bbcb660ebdf 100644
--- a/htdocs/contact/note.php
+++ b/htdocs/contact/note.php
@@ -57,10 +57,10 @@ $hookmanager->initHooks(array('contactnote'));
  * Actions
  */
 $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) 
+if ($reshook < 0)
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-if (empty($reshook)) 
+if (empty($reshook))
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once
 
 
diff --git a/htdocs/contrat/note.php b/htdocs/contrat/note.php
index a41a33af6c7..4314b7ab976 100644
--- a/htdocs/contrat/note.php
+++ b/htdocs/contrat/note.php
@@ -61,10 +61,10 @@ $permissionnote = $user->rights->contrat->creer; // Used by the include of actio
  */
 
 $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) 
+if ($reshook < 0)
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-if (empty($reshook)) 
+if (empty($reshook))
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 
 
diff --git a/htdocs/don/note.php b/htdocs/don/note.php
index fdf70350680..03f2d687012 100644
--- a/htdocs/don/note.php
+++ b/htdocs/don/note.php
@@ -47,7 +47,7 @@ $socid = 0;
 if ($user->socid) {
 	$socid = $user->socid;
 }
-$hookmanager->initHooks(array('donnote')); 
+$hookmanager->initHooks(array('donnote'));
 
 $result = restrictedArea($user, 'don', $id, '');
 
@@ -61,10 +61,10 @@ $permissionnote = $user->rights->don->creer; // Used by the include of actions_s
  * Actions
  */
 $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) 
+if ($reshook < 0)
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-if (empty($reshook)) 
+if (empty($reshook))
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 
 if ($action == 'classin' && $user->rights->don->creer) {
diff --git a/htdocs/eventorganization/conferenceorboothattendee_note.php b/htdocs/eventorganization/conferenceorboothattendee_note.php
index 02312ded462..99c01900184 100644
--- a/htdocs/eventorganization/conferenceorboothattendee_note.php
+++ b/htdocs/eventorganization/conferenceorboothattendee_note.php
@@ -116,10 +116,10 @@ $permissiontoadd = $user->rights->eventorganization->conferenceorboothattendee->
  */
 
 $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) 
+if ($reshook < 0)
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-if (empty($reshook)) 
+if (empty($reshook))
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 
 /*
diff --git a/htdocs/expedition/note.php b/htdocs/expedition/note.php
index 4aebfdc7da5..804a4fbc829 100644
--- a/htdocs/expedition/note.php
+++ b/htdocs/expedition/note.php
@@ -79,10 +79,10 @@ $result = restrictedArea($user, 'expedition', $object->id, '');
  */
 
 $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) 
+if ($reshook < 0)
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-if (empty($reshook)) 
+if (empty($reshook))
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 
 
diff --git a/htdocs/expensereport/note.php b/htdocs/expensereport/note.php
index 24ea0dd4643..26e6c23a7ec 100644
--- a/htdocs/expensereport/note.php
+++ b/htdocs/expensereport/note.php
@@ -44,7 +44,7 @@ $socid = 0;
 if ($user->socid) {
 	$socid = $user->socid;
 }
-$hookmanager->initHooks(array('expensereportnote')); 
+$hookmanager->initHooks(array('expensereportnote'));
 
 $result = restrictedArea($user, 'expensereport', $id, 'expensereport');
 
@@ -75,10 +75,10 @@ if ($object->id > 0) {
  */
 
 $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) 
+if ($reshook < 0)
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-if (empty($reshook)) 
+if (empty($reshook))
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 
 
diff --git a/htdocs/fichinter/note.php b/htdocs/fichinter/note.php
index b671aacf252..62fb5fe32ac 100644
--- a/htdocs/fichinter/note.php
+++ b/htdocs/fichinter/note.php
@@ -42,7 +42,7 @@ $action = GETPOST('action', 'aZ09');
 if ($user->socid) {
 	$socid = $user->socid;
 }
-$hookmanager->initHooks(array('fichinternote')); 
+$hookmanager->initHooks(array('fichinternote'));
 $result = restrictedArea($user, 'ficheinter', $id, 'fichinter');
 
 $object = new Fichinter($db);
@@ -55,10 +55,10 @@ $permissionnote = $user->rights->ficheinter->creer; // Used by the include of ac
  */
 
 $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) 
+if ($reshook < 0)
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-if (empty($reshook)) 
+if (empty($reshook))
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 
 
diff --git a/htdocs/fourn/commande/note.php b/htdocs/fourn/commande/note.php
index 22c93256cbb..89272e3b80a 100644
--- a/htdocs/fourn/commande/note.php
+++ b/htdocs/fourn/commande/note.php
@@ -58,10 +58,10 @@ $permissionnote = ($user->rights->fournisseur->commande->creer || $user->rights-
  */
 
 $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) 
+if ($reshook < 0)
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-if (empty($reshook)) 
+if (empty($reshook))
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 
 
diff --git a/htdocs/fourn/facture/note.php b/htdocs/fourn/facture/note.php
index cede169b8c6..e4dbea9a98a 100644
--- a/htdocs/fourn/facture/note.php
+++ b/htdocs/fourn/facture/note.php
@@ -60,10 +60,10 @@ $permissionnote = ($user->rights->fournisseur->facture->creer || $user->rights->
  */
 
 $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) 
+if ($reshook < 0)
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-if (empty($reshook)) 
+if (empty($reshook))
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 
 // Set label
diff --git a/htdocs/knowledgemanagement/knowledgerecord_note.php b/htdocs/knowledgemanagement/knowledgerecord_note.php
index 93be4e841ec..562fe79f216 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_note.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_note.php
@@ -67,10 +67,10 @@ $permissiontoadd = $user->rights->knowledgemanagement->knowledgerecord->write; /
  */
 
 $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) 
+if ($reshook < 0)
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-if (empty($reshook)) 
+if (empty($reshook))
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 
 
diff --git a/htdocs/loan/note.php b/htdocs/loan/note.php
index 3bf520a3ae0..6df215d354a 100644
--- a/htdocs/loan/note.php
+++ b/htdocs/loan/note.php
@@ -42,7 +42,7 @@ $langs->loadLangs(array("loan"));
 // Security check
 $id = GETPOST('id', 'int');
 
-$hookmanager->initHooks(array('loannote')); 
+$hookmanager->initHooks(array('loannote'));
 $result = restrictedArea($user, 'loan', $id, '&loan');
 
 $object = new Loan($db);
@@ -59,10 +59,10 @@ $permissionnote = $user->rights->loan->write; // Used by the include of actions_
 
 
 $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) 
+if ($reshook < 0)
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-if (empty($reshook)) 
+if (empty($reshook))
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 
 
diff --git a/htdocs/modulebuilder/template/myobject_note.php b/htdocs/modulebuilder/template/myobject_note.php
index 48f78c4d37e..aec084ce3c6 100644
--- a/htdocs/modulebuilder/template/myobject_note.php
+++ b/htdocs/modulebuilder/template/myobject_note.php
@@ -118,10 +118,10 @@ $permissiontoadd = $user->rights->mymodule->myobject->write; // Used by the incl
  */
 
 $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) 
+if ($reshook < 0)
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-if (empty($reshook)) 
+if (empty($reshook))
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 
 
diff --git a/htdocs/mrp/mo_note.php b/htdocs/mrp/mo_note.php
index e7c08d4378f..5c65da9c161 100644
--- a/htdocs/mrp/mo_note.php
+++ b/htdocs/mrp/mo_note.php
@@ -70,10 +70,10 @@ $permissionnote = $user->rights->mrp->write;	// Used by the include of actions_s
 
 
 $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) 
+if ($reshook < 0)
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-if (empty($reshook)) 
+if (empty($reshook))
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 
 
diff --git a/htdocs/partnership/partnership_note.php b/htdocs/partnership/partnership_note.php
index 90f2e54933d..0fee9a10ce4 100644
--- a/htdocs/partnership/partnership_note.php
+++ b/htdocs/partnership/partnership_note.php
@@ -66,10 +66,10 @@ $permissiontoadd = $user->rights->partnership->write; // Used by the include of
  * Actions
  */
 $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) 
+if ($reshook < 0)
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-if (empty($reshook)) 
+if (empty($reshook))
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 
 
diff --git a/htdocs/product/note.php b/htdocs/product/note.php
index 12e1d80774a..fb014d3dcca 100644
--- a/htdocs/product/note.php
+++ b/htdocs/product/note.php
@@ -70,10 +70,10 @@ $hookmanager->initHooks(array('productnote'));
  * Actions
  */
 $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) 
+if ($reshook < 0)
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-if (empty($reshook)) 
+if (empty($reshook))
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once
 
 
diff --git a/htdocs/projet/note.php b/htdocs/projet/note.php
index e93e361eb64..3d13aa47afe 100644
--- a/htdocs/projet/note.php
+++ b/htdocs/projet/note.php
@@ -57,10 +57,10 @@ $permissionnote = $user->rights->projet->creer; // Used by the include of action
  */
 
 $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) 
+if ($reshook < 0)
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-if (empty($reshook)) 
+if (empty($reshook))
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 
 
diff --git a/htdocs/projet/tasks/note.php b/htdocs/projet/tasks/note.php
index 8c3e43b578f..2c1f4732925 100644
--- a/htdocs/projet/tasks/note.php
+++ b/htdocs/projet/tasks/note.php
@@ -93,10 +93,10 @@ $permissionnote = ($user->rights->projet->creer || $user->rights->projet->all->c
  */
 
 $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) 
+if ($reshook < 0)
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-if (empty($reshook)) 
+if (empty($reshook))
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 
 
diff --git a/htdocs/reception/note.php b/htdocs/reception/note.php
index 90c448294d7..d9962a9ef18 100644
--- a/htdocs/reception/note.php
+++ b/htdocs/reception/note.php
@@ -93,10 +93,10 @@ if ($origin == 'reception') {
  */
 
 $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) 
+if ($reshook < 0)
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-if (empty($reshook)) 
+if (empty($reshook))
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 
 
diff --git a/htdocs/recruitment/recruitmentcandidature_note.php b/htdocs/recruitment/recruitmentcandidature_note.php
index 3b92802d5b1..c0d71fcd777 100644
--- a/htdocs/recruitment/recruitmentcandidature_note.php
+++ b/htdocs/recruitment/recruitmentcandidature_note.php
@@ -95,10 +95,10 @@ $result = restrictedArea($user, 'recruitment', $object->id, 'recruitment_recruit
  */
 
 $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) 
+if ($reshook < 0)
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-if (empty($reshook)) 
+if (empty($reshook))
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 
 
diff --git a/htdocs/recruitment/recruitmentjobposition_note.php b/htdocs/recruitment/recruitmentjobposition_note.php
index 8911fd55361..519419cb297 100644
--- a/htdocs/recruitment/recruitmentjobposition_note.php
+++ b/htdocs/recruitment/recruitmentjobposition_note.php
@@ -100,10 +100,10 @@ $result = restrictedArea($user, 'recruitment', $object->id, 'recruitment_recruit
  */
 
 $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) 
+if ($reshook < 0)
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-if (empty($reshook)) 
+if (empty($reshook))
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 
 
diff --git a/htdocs/resource/note.php b/htdocs/resource/note.php
index 1f58cc348f4..01e020a8617 100644
--- a/htdocs/resource/note.php
+++ b/htdocs/resource/note.php
@@ -56,10 +56,10 @@ $permissionnote = $user->rights->resource->write; // Used by the include of acti
  */
 
 $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) 
+if ($reshook < 0)
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-if (empty($reshook)) 
+if (empty($reshook))
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 
 
diff --git a/htdocs/societe/note.php b/htdocs/societe/note.php
index ee2eeed65a5..3f07987290f 100644
--- a/htdocs/societe/note.php
+++ b/htdocs/societe/note.php
@@ -57,10 +57,10 @@ $result = restrictedArea($user, 'societe', $object->id, '&societe');
  * Actions
  */
 $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) 
+if ($reshook < 0)
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-if (empty($reshook)) 
+if (empty($reshook))
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once
 
 include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once
diff --git a/htdocs/supplier_proposal/note.php b/htdocs/supplier_proposal/note.php
index e463fbcb26c..dcd529a951f 100644
--- a/htdocs/supplier_proposal/note.php
+++ b/htdocs/supplier_proposal/note.php
@@ -61,10 +61,10 @@ $object = new SupplierProposal($db);
 $permissionnote = $user->rights->supplier_proposal->creer; // Used by the include of actions_setnotes.inc.php
 
 $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) 
+if ($reshook < 0)
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-if (empty($reshook)) 
+if (empty($reshook))
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 
 
diff --git a/htdocs/workstation/workstation_note.php b/htdocs/workstation/workstation_note.php
index f1198e971ab..2f96263f54f 100755
--- a/htdocs/workstation/workstation_note.php
+++ b/htdocs/workstation/workstation_note.php
@@ -69,10 +69,10 @@ restrictedArea($user, $object->element, $object->id, $object->table_element, 'wo
  * Actions
  */
 $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) 
+if ($reshook < 0)
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-if (empty($reshook)) 
+if (empty($reshook))
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 
 

From 9e9af8548d0d607a1db79b7c1b5df8b7ec9b0b5d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 9 Jul 2021 18:47:34 +0200
Subject: [PATCH 1114/1497] Responsive

---
 htdocs/admin/oauth.php            |  2 ++
 htdocs/admin/oauthlogintokens.php | 13 +++++++++----
 htdocs/includes/.htaccess         | 16 ++++++++++++++++
 3 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 htdocs/includes/.htaccess

diff --git a/htdocs/admin/oauth.php b/htdocs/admin/oauth.php
index 079e55cb523..e2f123f627c 100644
--- a/htdocs/admin/oauth.php
+++ b/htdocs/admin/oauth.php
@@ -91,6 +91,7 @@ print dol_get_fiche_head($head, 'services', '', -1, 'technic');
 
 print '<span class="opacitymedium">'.$langs->trans("ListOfSupportedOauthProviders").'</span><br><br>';
 
+print '<div class="div-table-responsive">';
 print '<table class="noborder centpercent">';
 
 $i = 0;
@@ -145,6 +146,7 @@ foreach ($list as $key) {
 }
 
 print '</table>'."\n";
+print '</div>';
 
 print dol_get_fiche_end();
 
diff --git a/htdocs/admin/oauthlogintokens.php b/htdocs/admin/oauthlogintokens.php
index 1b2886cd8ef..998b6c39c0f 100644
--- a/htdocs/admin/oauthlogintokens.php
+++ b/htdocs/admin/oauthlogintokens.php
@@ -230,7 +230,7 @@ if ($mode == 'setup' && $user->admin) {
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="action" value="setconst">';
 
-
+		print '<div class="div-table-responsive">';
 		print '<table class="noborder centpercent">'."\n";
 
 		print '<tr class="liste_titre">';
@@ -262,15 +262,15 @@ if ($mode == 'setup' && $user->admin) {
 			print $langs->trans("NoAccessToken");
 		}
 		print '</td>';
-		print '<td>';
+		print '<td width="50%">';
 		// Links to delete/checks token
 		if (is_object($tokenobj)) {
 			//test on $storage->hasAccessToken($OAUTH_SERVICENAME) ?
-			print '<a class="button" href="'.$urltodelete.'">'.$langs->trans('DeleteAccess').'</a><br>';
+			print '<a class="button smallpaddingimp" href="'.$urltodelete.'">'.$langs->trans('DeleteAccess').'</a><br>';
 		}
 		// Request remote token
 		if ($urltorenew) {
-			print '<a class="button" href="'.$urltorenew.'">'.$langs->trans('RequestAccess').'</a><br>';
+			print '<a class="button smallpaddingimp" href="'.$urltorenew.'">'.$langs->trans('RequestAccess').'</a><br>';
 		}
 		// Check remote access
 		if ($urltocheckperms) {
@@ -330,6 +330,7 @@ if ($mode == 'setup' && $user->admin) {
 		}
 
 		print '</table>';
+		print '</div>';
 
 		if (!empty($driver)) {
 			if ($submit_enabled) {
@@ -345,6 +346,7 @@ if ($mode == 'setup' && $user->admin) {
 if ($mode == 'test' && $user->admin) {
 	print $langs->trans('PrintTestDesc'.$driver)."<br><br>\n";
 
+	print '<div class="div-table-responsive">';
 	print '<table class="noborder centpercent">';
 	if (!empty($driver)) {
 		require_once DOL_DOCUMENT_ROOT.'/core/modules/printing/'.$driver.'.modules.php';
@@ -364,11 +366,13 @@ if ($mode == 'test' && $user->admin) {
 	}
 
 	print '</table>';
+	print '</div>';
 }
 
 if ($mode == 'userconf' && $user->admin) {
 	print $langs->trans('PrintUserConfDesc'.$driver)."<br><br>\n";
 
+	print '<div class="div-table-responsive">';
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
 	print '<th>'.$langs->trans("User").'</th>';
@@ -395,6 +399,7 @@ if ($mode == 'userconf' && $user->admin) {
 		print "</tr>\n";
 	}
 	print '</table>';
+	print '</div>';
 }
 
 print dol_get_fiche_end();
diff --git a/htdocs/includes/.htaccess b/htdocs/includes/.htaccess
new file mode 100644
index 00000000000..c15ce44a5e1
--- /dev/null
+++ b/htdocs/includes/.htaccess
@@ -0,0 +1,16 @@
+# htaccess file to clock
+# The virtual host must have AllowOverride FileInfo to have this file used.
+# You can achieve the same effect by adding a definition to
+#
+#<Directory /path/to/htdocs/includes>
+#RewriteRule \.php$ - [F,L]
+#</Directory>
+
+
+#RewriteRule \.php$ - [F,L]
+
+# If there is no directory with AllowOveride FileInfo, you will get error 500. But
+# we got what we want, php file into external libraries can't be executed directly.
+<FilesMatch "\.php$">
+    SetHandler !
+</FilesMatch>

From 3fadd5cda587c818553cf3799f7b85aaeb736560 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 9 Jul 2021 19:34:17 +0200
Subject: [PATCH 1115/1497] NEW Add $dolibarr_main_db_readonly in conf.php for
 readonly access.

---
 htdocs/admin/system/dolibarr.php                   |  8 ++++++++
 htdocs/conf/conf.php.example                       |  9 +++++++++
 htdocs/core/db/mysqli.class.php                    | 11 ++++++++++-
 htdocs/core/db/pgsql.class.php                     | 14 +++++++++++++-
 htdocs/core/db/sqlite3.class.php                   | 11 ++++++++++-
 scripts/accountancy/export-thirdpartyaccount.php   |  8 ++++----
 scripts/company/sync_contacts_dolibarr2ldap.php    |  5 +++++
 scripts/cron/cron_run_jobs.php                     |  5 +++++
 scripts/emailings/mailing-send.php                 |  5 +++++
 scripts/emailings/reset-invalid-emails.php         |  6 ++++++
 .../email_unpaid_invoices_to_customers.php         |  5 +++++
 .../email_unpaid_invoices_to_representatives.php   |  5 +++++
 scripts/invoices/rebuild_merge_pdf.php             |  6 ++++++
 scripts/members/sync_members_dolibarr2ldap.php     |  5 +++++
 scripts/members/sync_members_ldap2dolibarr.php     |  5 +++++
 .../members/sync_members_types_dolibarr2ldap.php   |  6 ++++++
 .../members/sync_members_types_ldap2dolibarr.php   |  5 +++++
 scripts/website/migrate-news-joomla2dolibarr.php   | 10 ++++++++++
 scripts/website/regenerate-pages.php               | 10 ++++++++++
 19 files changed, 132 insertions(+), 7 deletions(-)

diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php
index 0271488b65a..58f6af55d60 100644
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@@ -327,6 +327,7 @@ $configfileparameters = array(
 	'dolibarr_main_db_character_set' => $langs->trans("DBStoringCharset"),
 	'dolibarr_main_db_collation' => $langs->trans("DBSortingCollation"),
 	'?dolibarr_main_db_prefix' => $langs->trans("DatabasePrefix"),
+	'dolibarr_main_db_readonly' => $langs->trans("ReadOnlyMode"),
 	'separator2' => '',
 	'dolibarr_main_authentication' => $langs->trans("AuthenticationMode"),
 	'?multicompany_transverse_mode'=>  $langs->trans("MultiCompanyMode"),
@@ -449,6 +450,13 @@ foreach ($configfileparameters as $key => $value) {
 				if (!empty($valuetoshow)) {
 					print img_warning($langs->trans('SwitchThisForABetterSecurity', 0));
 				}
+			} elseif ($newkey == 'dolibarr_main_db_readonly') {
+				print ${$newkey};
+
+				$valuetoshow = ${$newkey};
+				if (!empty($valuetoshow)) {
+					print img_warning($langs->trans('ReadOnlyMode', 1));
+				}
 			} else {
 				print (empty(${$newkey}) ? '' : ${$newkey});
 			}
diff --git a/htdocs/conf/conf.php.example b/htdocs/conf/conf.php.example
index fba3e1004f4..71f0a82e32f 100644
--- a/htdocs/conf/conf.php.example
+++ b/htdocs/conf/conf.php.example
@@ -151,6 +151,15 @@ $dolibarr_main_db_character_set='utf8';
 $dolibarr_main_db_collation='utf8_unicode_ci';
 
 
+// dolibarr_main_db_readonly
+// Set this to 1 to have the application working in readonly mode. All sql access INSERT/UPDATE/DELETE/CREATE/ALTER/TRUNCATE/DROP will be disabled. 
+// Default value: 0
+// Examples:
+// $dolibarr_main_db_readonly='0';
+//
+$dolibarr_main_db_readonly=0;
+
+
 // dolibarr_main_instance_unique_id
 // An secret ID that is unique for each installation.
 // This value is also visible and never propagated outside of Dolibarr, so it can be used as a salt / key for some encryption.
diff --git a/htdocs/core/db/mysqli.class.php b/htdocs/core/db/mysqli.class.php
index 343f4c8cc3e..541b1728753 100644
--- a/htdocs/core/db/mysqli.class.php
+++ b/htdocs/core/db/mysqli.class.php
@@ -266,7 +266,7 @@ class DoliDBMysqli extends DoliDB
 	 */
 	public function query($query, $usesavepoint = 0, $type = 'auto')
 	{
-		global $conf;
+		global $conf, $dolibarr_main_db_readonly;
 
 		$query = trim($query);
 
@@ -278,6 +278,15 @@ class DoliDBMysqli extends DoliDB
 			return false; // Return false = error if empty request
 		}
 
+		if (!empty($dolibarr_main_db_readonly)) {
+			if (preg_match('/^(INSERT|UPDATE|DELETE|CREATE|ALTER|TRUNCATE|DROP)/i', $query)) {
+				$this->lasterror = 'Application in read-only mode';
+				$this->lasterrno = 'APPREADONLY';
+				$this->lastquery = $query;
+				return false;
+			}
+		}
+
 		if (!$this->database_name) {
 			// Ordre SQL ne necessitant pas de connexion a une base (exemple: CREATE DATABASE)
 			$ret = $this->db->query($query);
diff --git a/htdocs/core/db/pgsql.class.php b/htdocs/core/db/pgsql.class.php
index 5a9d47dc40c..866ae2edc88 100644
--- a/htdocs/core/db/pgsql.class.php
+++ b/htdocs/core/db/pgsql.class.php
@@ -498,7 +498,7 @@ class DoliDBPgsql extends DoliDB
 	 */
 	public function query($query, $usesavepoint = 0, $type = 'auto')
 	{
-		global $conf;
+		global $conf, $dolibarr_main_db_readonly;
 
 		$query = trim($query);
 
@@ -527,6 +527,18 @@ class DoliDBPgsql extends DoliDB
 			$SYSLOG_SQL_LIMIT = 10000; // limit log to 10kb per line to limit DOS attacks
 			dol_syslog('sql='.substr($query, 0, $SYSLOG_SQL_LIMIT), LOG_DEBUG);
 		}
+		if (empty($query)) {
+			return false; // Return false = error if empty request
+		}
+
+		if (!empty($dolibarr_main_db_readonly)) {
+			if (preg_match('/^(INSERT|UPDATE|DELETE|CREATE|ALTER|TRUNCATE|DROP)/i', $query)) {
+				$this->lasterror = 'Application in read-only mode';
+				$this->lasterrno = 'APPREADONLY';
+				$this->lastquery = $query;
+				return false;
+			}
+		}
 
 		$ret = @pg_query($this->db, $query);
 
diff --git a/htdocs/core/db/sqlite3.class.php b/htdocs/core/db/sqlite3.class.php
index 563ccb19aac..9315320bf79 100644
--- a/htdocs/core/db/sqlite3.class.php
+++ b/htdocs/core/db/sqlite3.class.php
@@ -397,7 +397,7 @@ class DoliDBSqlite3 extends DoliDB
 	 */
 	public function query($query, $usesavepoint = 0, $type = 'auto')
 	{
-		global $conf;
+		global $conf, $dolibarr_main_db_readonly;
 
 		$ret = null;
 
@@ -455,6 +455,15 @@ class DoliDBSqlite3 extends DoliDB
 			return false; // Return false = error if empty request
 		}
 
+		if (!empty($dolibarr_main_db_readonly)) {
+			if (preg_match('/^(INSERT|UPDATE|DELETE|CREATE|ALTER|TRUNCATE|DROP)/i', $query)) {
+				$this->lasterror = 'Application in read-only mode';
+				$this->lasterrno = 'APPREADONLY';
+				$this->lastquery = $query;
+				return false;
+			}
+		}
+
 		// Ordre SQL ne necessitant pas de connexion a une base (exemple: CREATE DATABASE)
 		try {
 			//$ret = $this->db->exec($query);
diff --git a/scripts/accountancy/export-thirdpartyaccount.php b/scripts/accountancy/export-thirdpartyaccount.php
index 6df1f5ca4b8..46dd481566d 100755
--- a/scripts/accountancy/export-thirdpartyaccount.php
+++ b/scripts/accountancy/export-thirdpartyaccount.php
@@ -96,9 +96,12 @@ if (empty($date_start) || empty($date_end)) { // We define date_start and date_e
 		$date_start = dol_get_first_day($year_start, 10, false);
 		$date_end = dol_get_last_day($year_start, 12, false);
 	}
-} else {
 }
 
+/*
+ * Main
+ */
+
 llxHeader();
 
 $form = new Form($db);
@@ -186,9 +189,6 @@ if ($resql) {
 		$i++;
 	}
 
-	/*
-	 * View
-	 */
 
 	$thirdpartystatic = new Societe($db);
 
diff --git a/scripts/company/sync_contacts_dolibarr2ldap.php b/scripts/company/sync_contacts_dolibarr2ldap.php
index 53ec46ddcd8..e161a813ec7 100755
--- a/scripts/company/sync_contacts_dolibarr2ldap.php
+++ b/scripts/company/sync_contacts_dolibarr2ldap.php
@@ -69,6 +69,11 @@ foreach ($argv as $key => $val) {
 
 $now = $argv[1];
 
+if (!empty($dolibarr_main_db_readonly)) {
+	print "Error: instance in read-onyl mode\n";
+	exit(-1);
+}
+
 print "Mails sending disabled (useless in batch mode)\n";
 $conf->global->MAIN_DISABLE_ALL_MAILS = 1; // On bloque les mails
 print "\n";
diff --git a/scripts/cron/cron_run_jobs.php b/scripts/cron/cron_run_jobs.php
index 80f586a6788..a4e015745ca 100755
--- a/scripts/cron/cron_run_jobs.php
+++ b/scripts/cron/cron_run_jobs.php
@@ -108,6 +108,11 @@ if ($key != $conf->global->CRON_KEY) {
 	exit(-1);
 }
 
+if (!empty($dolibarr_main_db_readonly)) {
+	print "Error: instance in read-only mode\n";
+	exit(-1);
+}
+
 // If param userlogin is reserved word 'firstadmin'
 if ($userlogin == 'firstadmin') {
 	$sql = 'SELECT login, entity from '.MAIN_DB_PREFIX.'user WHERE admin = 1 and statut = 1 ORDER BY entity LIMIT 1';
diff --git a/scripts/emailings/mailing-send.php b/scripts/emailings/mailing-send.php
index 0d59a1b5db5..876895d7c87 100755
--- a/scripts/emailings/mailing-send.php
+++ b/scripts/emailings/mailing-send.php
@@ -86,6 +86,11 @@ if (!empty($conf->global->MAILING_DELAY)) {
 if ($conf->global->MAILING_LIMIT_SENDBYCLI == '-1') {
 }
 
+if (!empty($dolibarr_main_db_readonly)) {
+	print "Error: instance in read-only mode\n";
+	exit(-1);
+}
+
 $user = new User($db);
 // for signature, we use user send as parameter
 if (!empty($login)) {
diff --git a/scripts/emailings/reset-invalid-emails.php b/scripts/emailings/reset-invalid-emails.php
index 6eb31abe995..0e7fdb4e6bf 100755
--- a/scripts/emailings/reset-invalid-emails.php
+++ b/scripts/emailings/reset-invalid-emails.php
@@ -57,6 +57,7 @@ require_once DOL_DOCUMENT_ROOT."/comm/mailing/class/mailing.class.php";
 $version = DOL_VERSION;
 $error = 0;
 
+
 /*
  * Main
  */
@@ -71,6 +72,11 @@ if (!in_array($type, array('all', 'thirdparties', 'contacts', 'users', 'members'
 	exit(-1);
 }
 
+if (!empty($dolibarr_main_db_readonly)) {
+	print "Error: instance in read-onyl mode\n";
+	exit(-1);
+}
+
 $db->begin();
 
 
diff --git a/scripts/invoices/email_unpaid_invoices_to_customers.php b/scripts/invoices/email_unpaid_invoices_to_customers.php
index 41c84ee4d41..4657c16bd65 100755
--- a/scripts/invoices/email_unpaid_invoices_to_customers.php
+++ b/scripts/invoices/email_unpaid_invoices_to_customers.php
@@ -80,6 +80,11 @@ if ($mode != 'confirm') {
 	$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 }
 
+if (!empty($dolibarr_main_db_readonly)) {
+	print "Error: instance in read-onyl mode\n";
+	exit(-1);
+}
+
 $sql = "SELECT f.ref, f.total_ttc, f.date_lim_reglement as due_date,";
 $sql .= " s.rowid as sid, s.nom as name, s.email, s.default_lang";
 if ($targettype == 'contacts') {
diff --git a/scripts/invoices/email_unpaid_invoices_to_representatives.php b/scripts/invoices/email_unpaid_invoices_to_representatives.php
index 3cc9ad1a0eb..606ac32ca66 100755
--- a/scripts/invoices/email_unpaid_invoices_to_representatives.php
+++ b/scripts/invoices/email_unpaid_invoices_to_representatives.php
@@ -76,6 +76,11 @@ if ($mode != 'confirm') {
 	$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 }
 
+if (!empty($dolibarr_main_db_readonly)) {
+	print "Error: instance in read-onyl mode\n";
+	exit(-1);
+}
+
 $sql = "SELECT f.ref, f.total_ttc, f.date_lim_reglement as due_date, s.nom as name, s.email, s.default_lang,";
 $sql .= " u.rowid as uid, u.lastname, u.firstname, u.email, u.lang";
 $sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
diff --git a/scripts/invoices/rebuild_merge_pdf.php b/scripts/invoices/rebuild_merge_pdf.php
index 309de5fe4bd..b19398eda50 100755
--- a/scripts/invoices/rebuild_merge_pdf.php
+++ b/scripts/invoices/rebuild_merge_pdf.php
@@ -52,6 +52,7 @@ $langs->load("main");
 $version = DOL_VERSION;
 $error = 0;
 
+
 /*
  * Main
  */
@@ -66,6 +67,11 @@ if (!isset($argv[1])) {
 	exit(-1);
 }
 
+if (!empty($dolibarr_main_db_readonly)) {
+	print "Error: instance in read-onyl mode\n";
+	exit(-1);
+}
+
 $diroutputpdf = $conf->facture->dir_output.'/temp';
 $newlangid = 'en_EN'; // To force a new lang id
 $filter = array();
diff --git a/scripts/members/sync_members_dolibarr2ldap.php b/scripts/members/sync_members_dolibarr2ldap.php
index 4ecbe2e9b08..66c245cf3eb 100755
--- a/scripts/members/sync_members_dolibarr2ldap.php
+++ b/scripts/members/sync_members_dolibarr2ldap.php
@@ -68,6 +68,11 @@ foreach ($argv as $key => $val) {
 	}
 }
 
+if (!empty($dolibarr_main_db_readonly)) {
+	print "Error: instance in read-onyl mode\n";
+	exit(-1);
+}
+
 $now = $argv[1];
 
 print "Mails sending disabled (useless in batch mode)\n";
diff --git a/scripts/members/sync_members_ldap2dolibarr.php b/scripts/members/sync_members_ldap2dolibarr.php
index be312ec1932..b40a267d62e 100755
--- a/scripts/members/sync_members_ldap2dolibarr.php
+++ b/scripts/members/sync_members_ldap2dolibarr.php
@@ -146,6 +146,11 @@ if ($typeid <= 0) {
 	exit(-2);
 }
 
+if (!empty($dolibarr_main_db_readonly)) {
+	print "Error: instance in read-onyl mode\n";
+	exit(-1);
+}
+
 if (!$confirmed) {
 	print "Hit Enter to continue or CTRL+C to stop...\n";
 	$input = trim(fgets(STDIN));
diff --git a/scripts/members/sync_members_types_dolibarr2ldap.php b/scripts/members/sync_members_types_dolibarr2ldap.php
index cec998abda5..3d592673296 100755
--- a/scripts/members/sync_members_types_dolibarr2ldap.php
+++ b/scripts/members/sync_members_types_dolibarr2ldap.php
@@ -70,6 +70,12 @@ dol_syslog($script_file." launched with arg ".join(',', $argv));
  * }
  */
 
+if (!empty($dolibarr_main_db_readonly)) {
+	print "Error: instance in read-onyl mode\n";
+	exit(-1);
+}
+
+
 $sql = "SELECT rowid";
 $sql .= " FROM ".MAIN_DB_PREFIX."adherent_type";
 
diff --git a/scripts/members/sync_members_types_ldap2dolibarr.php b/scripts/members/sync_members_types_ldap2dolibarr.php
index 9aea20fb209..12a83633725 100755
--- a/scripts/members/sync_members_types_ldap2dolibarr.php
+++ b/scripts/members/sync_members_types_ldap2dolibarr.php
@@ -88,6 +88,11 @@ foreach ($argv as $key => $val) {
 	}
 }
 
+if (!empty($dolibarr_main_db_readonly)) {
+	print "Error: instance in read-onyl mode\n";
+	exit(-1);
+}
+
 print "Mails sending disabled (useless in batch mode)\n";
 $conf->global->MAIN_DISABLE_ALL_MAILS = 1; // On bloque les mails
 print "\n";
diff --git a/scripts/website/migrate-news-joomla2dolibarr.php b/scripts/website/migrate-news-joomla2dolibarr.php
index 605f982bd16..bb02274a6a3 100755
--- a/scripts/website/migrate-news-joomla2dolibarr.php
+++ b/scripts/website/migrate-news-joomla2dolibarr.php
@@ -63,8 +63,18 @@ include_once DOL_DOCUMENT_ROOT.'/website/class/website.class.php';
 include_once DOL_DOCUMENT_ROOT.'/website/class/websitepage.class.php';
 include_once DOL_DOCUMENT_ROOT.'/core/lib/website2.lib.php';
 
+
+/*
+ * Main
+ */
+
 $langs->load('main');
 
+if (!empty($dolibarr_main_db_readonly)) {
+	print "Error: instance in read-onyl mode\n";
+	exit(-1);
+}
+
 $joomlaserverinfoarray = preg_split('/(:|@|\/)/', $joomlaserverinfo);
 $joomlalogin = $joomlaserverinfoarray[0];
 $joomlapass = $joomlaserverinfoarray[1];
diff --git a/scripts/website/regenerate-pages.php b/scripts/website/regenerate-pages.php
index 46b9283a4cf..b37e17bf78a 100755
--- a/scripts/website/regenerate-pages.php
+++ b/scripts/website/regenerate-pages.php
@@ -58,8 +58,18 @@ include_once DOL_DOCUMENT_ROOT.'/website/class/website.class.php';
 include_once DOL_DOCUMENT_ROOT.'/website/class/websitepage.class.php';
 include_once DOL_DOCUMENT_ROOT.'/core/lib/website2.lib.php';
 
+
+/*
+ * Main
+ */
+
 $langs->load('main');
 
+if (!empty($dolibarr_main_db_readonly)) {
+	print "Error: instance in read-onyl mode\n";
+	exit(-1);
+}
+
 $website = new Website($db);
 $result = $website->fetch(0, $websiteref);
 if ($result <= 0) {

From f65aa6024f938abc25de176713d9cd005367fe68 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Jul 2021 09:42:20 +0200
Subject: [PATCH 1116/1497] Add replace into forbidden sql in read-only mode

---
 htdocs/core/db/mysqli.class.php  | 2 +-
 htdocs/core/db/pgsql.class.php   | 2 +-
 htdocs/core/db/sqlite3.class.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/db/mysqli.class.php b/htdocs/core/db/mysqli.class.php
index 541b1728753..36974d29218 100644
--- a/htdocs/core/db/mysqli.class.php
+++ b/htdocs/core/db/mysqli.class.php
@@ -279,7 +279,7 @@ class DoliDBMysqli extends DoliDB
 		}
 
 		if (!empty($dolibarr_main_db_readonly)) {
-			if (preg_match('/^(INSERT|UPDATE|DELETE|CREATE|ALTER|TRUNCATE|DROP)/i', $query)) {
+			if (preg_match('/^(INSERT|UPDATE|REPLACE|DELETE|CREATE|ALTER|TRUNCATE|DROP)/i', $query)) {
 				$this->lasterror = 'Application in read-only mode';
 				$this->lasterrno = 'APPREADONLY';
 				$this->lastquery = $query;
diff --git a/htdocs/core/db/pgsql.class.php b/htdocs/core/db/pgsql.class.php
index 866ae2edc88..0513226ac31 100644
--- a/htdocs/core/db/pgsql.class.php
+++ b/htdocs/core/db/pgsql.class.php
@@ -532,7 +532,7 @@ class DoliDBPgsql extends DoliDB
 		}
 
 		if (!empty($dolibarr_main_db_readonly)) {
-			if (preg_match('/^(INSERT|UPDATE|DELETE|CREATE|ALTER|TRUNCATE|DROP)/i', $query)) {
+			if (preg_match('/^(INSERT|UPDATE|REPLACE|DELETE|CREATE|ALTER|TRUNCATE|DROP)/i', $query)) {
 				$this->lasterror = 'Application in read-only mode';
 				$this->lasterrno = 'APPREADONLY';
 				$this->lastquery = $query;
diff --git a/htdocs/core/db/sqlite3.class.php b/htdocs/core/db/sqlite3.class.php
index 9315320bf79..395155973be 100644
--- a/htdocs/core/db/sqlite3.class.php
+++ b/htdocs/core/db/sqlite3.class.php
@@ -456,7 +456,7 @@ class DoliDBSqlite3 extends DoliDB
 		}
 
 		if (!empty($dolibarr_main_db_readonly)) {
-			if (preg_match('/^(INSERT|UPDATE|DELETE|CREATE|ALTER|TRUNCATE|DROP)/i', $query)) {
+			if (preg_match('/^(INSERT|UPDATE|REPLACE|DELETE|CREATE|ALTER|TRUNCATE|DROP)/i', $query)) {
 				$this->lasterror = 'Application in read-only mode';
 				$this->lasterrno = 'APPREADONLY';
 				$this->lastquery = $query;

From 64bd4ef784b0370a8a73fe14b003f660301c4e96 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Jul 2021 20:09:51 +0200
Subject: [PATCH 1117/1497] Fix component to select ticket groups

---
 htdocs/core/class/html.formticket.class.php | 48 +++++++++++----------
 htdocs/ticket/class/ticket.class.php        |  4 +-
 2 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index 2aa2fc85966..0a4a622f4a8 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -561,28 +561,27 @@ class FormTicket
 	/**
 	 *      Return html list of ticket anaytic codes
 	 *
-	 *      @param  string $selected    Id categorie pre-selectionnée
-	 *      @param  string $htmlname    Nom de la zone select
-	 *      @param  string $filtertype  To filter on some properties in llx_c_ticket_category ('public = 1'). This parameter must not come from input of users.
-	 *      @param  int    $format      0=id+libelle, 1=code+code, 2=code+libelle, 3=id+code
-	 *      @param  int    $empty       1=peut etre vide, 0 sinon
-	 *      @param  int    $noadmininfo 0=Add admin info, 1=Disable admin info
-	 *      @param  int    $maxlength   Max length of label
-	 *      @param	string	$morecss	More CSS
-	 * 		@param	int 	$use_multilevel	if > 0 create a multilevel select which use $htmlname example: $use_multilevel = 1 permit to have 2 select boxes.
+	 *      @param  string 	$selected   		Id categorie pre-selectionnée
+	 *      @param  string 	$htmlname   		Name of select component
+	 *      @param  string 	$filtertype 		To filter on some properties in llx_c_ticket_category ('public = 1'). This parameter must not come from input of users.
+	 *      @param  int    	$format     		0=id+libelle, 1=code+code, 2=code+libelle, 3=id+code
+	 *      @param  int    	$empty      		1=peut etre vide, 0 sinon
+	 *      @param  int    	$noadmininfo		0=Add admin info, 1=Disable admin info
+	 *      @param  int    	$maxlength  		Max length of label
+	 *      @param	string	$morecss			More CSS
+	 * 		@param	int 	$use_multilevel		If > 0 create a multilevel select which use $htmlname example: $use_multilevel = 1 permit to have 2 select boxes.
 	 *      @return void
 	 */
 	public function selectGroupTickets($selected = '', $htmlname = 'ticketcategory', $filtertype = '', $format = 0, $empty = 0, $noadmininfo = 0, $maxlength = 0, $morecss = '', $use_multilevel = 0)
 	{
 		global $langs, $user;
 
+		dol_syslog(get_class($this)."::selectCategoryTickets ".$selected.", ".$htmlname.", ".$filtertype.", ".$format, LOG_DEBUG);
+
+		$ticketstat = new Ticket($this->db);
+		$ticketstat->loadCacheCategoriesTickets();
+
 		if ($use_multilevel <= 0) {
-			$ticketstat = new Ticket($this->db);
-
-			dol_syslog(get_class($this)."::selectCategoryTickets ".$selected.", ".$htmlname.", ".$filtertype.", ".$format, LOG_DEBUG);
-
-			$ticketstat->loadCacheCategoriesTickets();
-
 			print '<select id="select'.$htmlname.'" class="flat minwidth100'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'">';
 			if ($empty) {
 				print '<option value="">&nbsp;</option>';
@@ -667,15 +666,17 @@ class FormTicket
 			$sql = "SELECT ctc.rowid, ctc.code, ctc.label, ctc.fk_parent, ";
 			$sql .= $this->db->ifsql("ctc.rowid NOT IN (SELECT ctcfather.rowid FROM llx_c_ticket_category as ctcfather JOIN llx_c_ticket_category as ctcjoin ON ctcfather.rowid = ctcjoin.fk_parent)", "'NOTPARENT'", "'PARENT'")." as isparent";
 			$sql .= " FROM ".MAIN_DB_PREFIX."c_ticket_category as ctc";
-			$sql .= " WHERE ctc.public = 1";
-			$sql .= " AND ctc.active = 1";
+			$sql .= " WHERE ctc.active > 0";
+			if ($filtertype == 'public=1') {
+				$sql .= " AND ctc.public = 1";
+			}
 			$sql .= " AND ctc.fk_parent = 0";
 			$sql .= $this->db->order('ctc.pos', 'ASC');
 			$resql = $this->db->query($sql);
 			if ($resql) {
-				$num_rows = $this->db->num_rows($resql);
+				$num_rows_level0 = $this->db->num_rows($resql);
 				$i = 0;
-				while ($i < $num_rows) {
+				while ($i < $num_rows_level0) {
 					$obj = $this->db->fetch_object($resql);
 					if ($obj) {
 						$grouprowid = $obj->rowid;
@@ -694,7 +695,7 @@ class FormTicket
 			} else {
 				dol_print_error($this->db);
 			}
-			if ($num_rows == 1) {
+			if ($num_rows_level0 == 1) {
 				return '<input type="hidden" name="'.$htmlname.'" id="'.$htmlname.'" value="'.dol_escape_htmltag($groupvalue).'">';
 			}
 			$stringtoprint .= '</select>&nbsp;';
@@ -709,8 +710,10 @@ class FormTicket
 				$sql .= $this->db->ifsql("ctc.rowid NOT IN (SELECT ctcfather.rowid FROM llx_c_ticket_category as ctcfather JOIN llx_c_ticket_category as ctcjoin ON ctcfather.rowid = ctcjoin.fk_parent)", "'NOTPARENT'", "'PARENT'")." as isparent";
 				$sql .= " FROM ".MAIN_DB_PREFIX."c_ticket_category as ctc";
 				$sql .= " JOIN ".MAIN_DB_PREFIX."c_ticket_category as ctcjoin ON ctc.fk_parent = ctcjoin.rowid";
-				$sql .= " WHERE ctc.public = 1";
-				$sql .= " AND ctc.active = 1";
+				$sql .= " WHERE ctc.active = 1";
+				if ($filtertype == 'public=1') {
+					$sql .= " AND ctc.public = 1";
+				}
 				if (!empty($arrayidused)) {
 					$sql .= " AND ctc.fk_parent IN ( ";
 					foreach ($arrayidused as $idused) {
@@ -791,6 +794,7 @@ class FormTicket
 				$stringtoprint .='})';
 				$stringtoprint .='</script>';
 			}
+
 			$stringtoprint .= ajax_combobox($htmlname);
 
 			return $stringtoprint;
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index 89f239db6c6..b3514f5fe0d 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -1177,7 +1177,7 @@ class Ticket extends CommonObject
 		}
 		// Cache deja charge
 
-		$sql = "SELECT rowid, code, label, use_default, pos, description, public, active";
+		$sql = "SELECT rowid, code, label, use_default, pos, description, public, active, force_severity, fk_parent";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_ticket_category";
 		$sql .= " WHERE active > 0";
 		$sql .= " ORDER BY pos";
@@ -1196,6 +1196,8 @@ class Ticket extends CommonObject
 				$this->cache_category_tickets[$obj->rowid]['pos'] = $obj->pos;
 				$this->cache_category_tickets[$obj->rowid]['public'] = $obj->public;
 				$this->cache_category_tickets[$obj->rowid]['active'] = $obj->active;
+				$this->cache_category_tickets[$obj->rowid]['force_severity'] = $obj->force_severity;
+				$this->cache_category_tickets[$obj->rowid]['fk_parent'] = $obj->fk_parent;
 				$i++;
 			}
 			return $num;

From 97ac547fe230d4773f295ff9d68c91f272c11e86 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 11 Jul 2021 00:44:36 +0200
Subject: [PATCH 1118/1497] Fix/debug the numbering module to autocalculate a
 new lot.

---
 htdocs/core/modules/modProductBatch.class.php |   4 +-
 .../product_batch/mod_lot_advanced.php        |  10 +-
 .../product_batch/mod_lot_standard.php        |  27 +-
 .../modules/product_batch/mod_sn_advanced.php |   6 +-
 .../modules/product_batch/mod_sn_standard.php |  31 +-
 htdocs/langs/en_US/productbatch.lang          |   8 +-
 htdocs/product/admin/product_lot.php          | 287 +++++++++---------
 .../product/stock/class/productlot.class.php  |   2 +-
 8 files changed, 198 insertions(+), 177 deletions(-)

diff --git a/htdocs/core/modules/modProductBatch.class.php b/htdocs/core/modules/modProductBatch.class.php
index 79529898bb0..4b508d79d7c 100644
--- a/htdocs/core/modules/modProductBatch.class.php
+++ b/htdocs/core/modules/modProductBatch.class.php
@@ -84,14 +84,14 @@ class modProductBatch extends DolibarrModules
 		$this->const[$r][0] = "PRODUCTBATCH_LOT_ADDON";
 		$this->const[$r][1] = "chaine";
 		$this->const[$r][2] = "mod_lot_free";
-		$this->const[$r][3] = 'Module to control product codes';
+		$this->const[$r][3] = 'Module to control lot number';
 		$this->const[$r][4] = 0;
 		$r++;
 
 		$this->const[$r][0] = "PRODUCTBATCH_SN_ADDON";
 		$this->const[$r][1] = "chaine";
 		$this->const[$r][2] = "mod_sn_free";
-		$this->const[$r][3] = 'Module to control product codes';
+		$this->const[$r][3] = 'Module to control serial number';
 		$this->const[$r][4] = 0;
 		$r++;
 
diff --git a/htdocs/core/modules/product_batch/mod_lot_advanced.php b/htdocs/core/modules/product_batch/mod_lot_advanced.php
index 0bbb124d14b..8ee857bfbea 100644
--- a/htdocs/core/modules/product_batch/mod_lot_advanced.php
+++ b/htdocs/core/modules/product_batch/mod_lot_advanced.php
@@ -128,27 +128,27 @@ class mod_lot_advanced extends ModeleNumRefBatch
 	/**
 	 * 	Return next free value
 	 *
-	 *  @param	Product		$objprod    Object product
+	 *  @param	Societe		$objsoc	    Object Societe
 	 *  @param  Object		$object		Object we need next value for
 	 *  @return string      			Value if KO, <0 if KO
 	 */
-	public function getNextValue($objprod, $object)
+	public function getNextValue($objsoc, $object)
 	{
 		global $db, $conf;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 		// We get cursor rule
-		$mask = $conf->global->BATCH_ADVANCED_MASK;
+		$mask = $conf->global->LOT_ADVANCED_MASK;
 
 		if (!$mask) {
 			$this->error = 'NotConfigured';
 			return 0;
 		}
 
-		$date = $object->date;
+		$date = dol_now();
 
-		$numFinal = get_next_value($db, $mask, 'product_lot', 'ref', '', null, $date);
+		$numFinal = get_next_value($db, $mask, 'product_lot', 'batch', '', null, $date);
 
 		return  $numFinal;
 	}
diff --git a/htdocs/core/modules/product_batch/mod_lot_standard.php b/htdocs/core/modules/product_batch/mod_lot_standard.php
index 0d2b5a55139..59de1965a6e 100644
--- a/htdocs/core/modules/product_batch/mod_lot_standard.php
+++ b/htdocs/core/modules/product_batch/mod_lot_standard.php
@@ -85,17 +85,21 @@ class mod_lot_standard extends ModeleNumRefBatch
 		$coyymm = ''; $max = '';
 
 		$posindice = strlen($this->prefix) + 6;
-		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
+		$sql = "SELECT MAX(CAST(SUBSTRING(batch FROM ".$posindice.") AS SIGNED)) as max";
 		$sql .= " FROM ".MAIN_DB_PREFIX."product_lot";
-		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
+		$sql .= " WHERE batch LIKE '".$db->escape($this->prefix)."____-%'";
 		$sql .= " AND entity = ".$conf->entity;
 
 		$resql = $db->query($sql);
 		if ($resql) {
-			$row = $db->fetch_row($resql);
-			if ($row) { $coyymm = substr($row[0], 0, 6); $max = $row[0]; }
+			$obj = $db->fetch_object($resql);
+			if ($obj) {
+				$max = intval($obj->max);
+			} else {
+				$max = 0;
+			}
 		}
-		if ($coyymm && !preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $coyymm)) {
+		if ($max && !preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $max)) {
 			$langs->load("errors");
 			$this->error = $langs->trans('ErrorNumRefModel', $max);
 			return false;
@@ -117,23 +121,26 @@ class mod_lot_standard extends ModeleNumRefBatch
 
 		// First, we get the max value
 		$posindice = strlen($this->prefix) + 6;
-		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
+		$sql = "SELECT MAX(CAST(SUBSTRING(batch FROM ".$posindice.") AS SIGNED)) as max";
 		$sql .= " FROM ".MAIN_DB_PREFIX."product_lot";
-		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
+		$sql .= " WHERE batch LIKE '".$db->escape($this->prefix)."____-%'";
 		$sql .= " AND entity = ".$conf->entity;
 
 		$resql = $db->query($sql);
 		if ($resql)	{
 			$obj = $db->fetch_object($resql);
-			if ($obj) $max = intval($obj->max);
-			else $max = 0;
+			if ($obj) {
+				$max = intval($obj->max);
+			} else {
+				$max = 0;
+			}
 		} else {
 			dol_syslog("mod_lot_standard::getNextValue", LOG_DEBUG);
 			return -1;
 		}
 
 		//$date=time();
-		$date = $object->date_creation;
+		$date = dol_now();
 		$yymm = strftime("%y%m", $date);
 
 		if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
diff --git a/htdocs/core/modules/product_batch/mod_sn_advanced.php b/htdocs/core/modules/product_batch/mod_sn_advanced.php
index 8117b9e6c6e..54c67291d9a 100644
--- a/htdocs/core/modules/product_batch/mod_sn_advanced.php
+++ b/htdocs/core/modules/product_batch/mod_sn_advanced.php
@@ -139,16 +139,16 @@ class mod_sn_advanced extends ModeleNumRefBatch
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 		// We get cursor rule
-		$mask = $conf->global->BATCH_ADVANCED_MASK;
+		$mask = $conf->global->SN_ADVANCED_MASK;
 
 		if (!$mask)	{
 			$this->error = 'NotConfigured';
 			return 0;
 		}
 
-		$date = $object->date;
+		$date = dol_now();
 
-		$numFinal = get_next_value($db, $mask, 'product_sn', 'ref', '', null, $date);
+		$numFinal = get_next_value($db, $mask, 'product_lot', 'batch', '', null, $date);
 
 		return  $numFinal;
 	}
diff --git a/htdocs/core/modules/product_batch/mod_sn_standard.php b/htdocs/core/modules/product_batch/mod_sn_standard.php
index bef5efcd9f8..845044c39f3 100644
--- a/htdocs/core/modules/product_batch/mod_sn_standard.php
+++ b/htdocs/core/modules/product_batch/mod_sn_standard.php
@@ -85,17 +85,21 @@ class mod_sn_standard extends ModeleNumRefBatch
 		$coyymm = ''; $max = '';
 
 		$posindice = strlen($this->prefix) + 6;
-		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
+		$sql = "SELECT MAX(CAST(SUBSTRING(batch FROM ".$posindice.") AS SIGNED)) as max";
 		$sql .= " FROM ".MAIN_DB_PREFIX."product_lot";
-		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
+		$sql .= " WHERE batch LIKE '".$db->escape($this->prefix)."____-%'";
 		$sql .= " AND entity = ".$conf->entity;
 
 		$resql = $db->query($sql);
 		if ($resql)	{
-			$row = $db->fetch_row($resql);
-			if ($row) { $coyymm = substr($row[0], 0, 6); $max = $row[0]; }
+			$obj = $db->fetch_object($resql);
+			if ($obj) {
+				$max = intval($obj->max);
+			} else {
+				$max = 0;
+			}
 		}
-		if ($coyymm && !preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $coyymm)) {
+		if ($max && !preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $max)) {
 			$langs->load("errors");
 			$this->error = $langs->trans('ErrorNumRefModel', $max);
 			return false;
@@ -107,33 +111,36 @@ class mod_sn_standard extends ModeleNumRefBatch
 	/**
 	 * 	Return next free value
 	 *
-	 *  @param	Product		$objprod    Object product
+	 *  @param	Societe		$objsoc     Object product
 	 *  @param  Object		$object		Object we need next value for
 	 *  @return string      			Value if KO, <0 if KO
 	 */
-	public function getNextValue($objprod, $object)
+	public function getNextValue($objsoc, $object)
 	{
 		global $db, $conf;
 
 		// First, we get the max value
 		$posindice = strlen($this->prefix) + 6;
-		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
+		$sql = "SELECT MAX(CAST(SUBSTRING(batch FROM ".$posindice.") AS SIGNED)) as max";
 		$sql .= " FROM ".MAIN_DB_PREFIX."product_lot";
-		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
+		$sql .= " WHERE batch LIKE '".$db->escape($this->prefix)."____-%'";
 		$sql .= " AND entity = ".$conf->entity;
 
 		$resql = $db->query($sql);
 		if ($resql)	{
 			$obj = $db->fetch_object($resql);
-			if ($obj) $max = intval($obj->max);
-			else $max = 0;
+			if ($obj) {
+				$max = intval($obj->max);
+			} else {
+				$max = 0;
+			}
 		} else {
 			dol_syslog("mod_sn_standard::getNextValue", LOG_DEBUG);
 			return -1;
 		}
 
 		//$date=time();
-		$date = $object->date_creation;
+		$date = dol_now();
 		$yymm = strftime("%y%m", $date);
 
 		if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
diff --git a/htdocs/langs/en_US/productbatch.lang b/htdocs/langs/en_US/productbatch.lang
index 450d0285819..763af20c6b4 100644
--- a/htdocs/langs/en_US/productbatch.lang
+++ b/htdocs/langs/en_US/productbatch.lang
@@ -26,12 +26,10 @@ ShowLogOfMovementIfLot=Show log of movements for couple product/lot
 StockDetailPerBatch=Stock detail per lot
 SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
-BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
-BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
 ManageLotMask=Custom mask
-CustomMasks=Adds an option to define mask in the product card
-LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
-SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+CustomMasks=Option to define a different numbering mask for each product
+BatchLotNumberingModules=Numbering rule for automatic generation of lot number
+BatchSerialNumberingModules=Numbering rule for automatic generation of serial number (for products with property 1 unique lot/serial for each product)
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
diff --git a/htdocs/product/admin/product_lot.php b/htdocs/product/admin/product_lot.php
index 8cafa97e077..3f4fd636de4 100644
--- a/htdocs/product/admin/product_lot.php
+++ b/htdocs/product/admin/product_lot.php
@@ -101,188 +101,197 @@ $head = product_lot_admin_prepare_head();
 
 print dol_get_fiche_head($head, 'settings', $langs->trans("Batch"), -1, 'lot');
 
-/*
- * Lot Numbering models
- */
 
-print load_fiche_titre($langs->trans("BatchLotNumberingModules"), '', '');
+if ($conf->global->MAIN_FEATURES_LEVEL < 2) {
+	// The feature to define the numbering module of lot or serial is no enabled bcause it is not used anywhere in Dolibarr code: You can set it
+	// but the numbering module is not used.
+	// TODO Use it on lot creation page, when you create a lot and when the lot number is kept empty to define the lot according
+	// to the selected product.
+	print $langs->trans("NothingToSetup");
+} else {
+	/*
+	 * Lot Numbering models
+	 */
 
-print '<table class="noborder centpercent">';
-print '<tr class="liste_titre">';
-print '<td>'.$langs->trans("Name").'</td>';
-print '<td>'.$langs->trans("Description").'</td>';
-print '<td class="nowrap">'.$langs->trans("Example").'</td>';
-print '<td class="center" width="60">'.$langs->trans("Status").'</td>';
-print '<td class="center" width="16">'.$langs->trans("ShortInfo").'</td>';
-print '</tr>'."\n";
+	print load_fiche_titre($langs->trans("BatchLotNumberingModules"), '', '');
 
-clearstatcache();
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print '<td>'.$langs->trans("Name").'</td>';
+	print '<td>'.$langs->trans("Description").'</td>';
+	print '<td class="nowrap">'.$langs->trans("Example").'</td>';
+	print '<td class="center" width="60">'.$langs->trans("Status").'</td>';
+	print '<td class="center" width="16">'.$langs->trans("ShortInfo").'</td>';
+	print '</tr>'."\n";
 
-foreach ($dirmodels as $reldir) {
-	$dir = dol_buildpath($reldir."core/modules/product_batch/");
+	clearstatcache();
 
-	if (is_dir($dir)) {
-		$handle = opendir($dir);
-		if (is_resource($handle)) {
-			while (($file = readdir($handle)) !== false) {
-				if (substr($file, 0, 8) == 'mod_lot_' && substr($file, dol_strlen($file) - 3, 3) == 'php') {
-					$file = substr($file, 0, dol_strlen($file) - 4);
+	foreach ($dirmodels as $reldir) {
+		$dir = dol_buildpath($reldir."core/modules/product_batch/");
 
-					require_once $dir.$file.'.php';
+		if (is_dir($dir)) {
+			$handle = opendir($dir);
+			if (is_resource($handle)) {
+				while (($file = readdir($handle)) !== false) {
+					if (substr($file, 0, 8) == 'mod_lot_' && substr($file, dol_strlen($file) - 3, 3) == 'php') {
+						$file = substr($file, 0, dol_strlen($file) - 4);
 
-					$module = new $file($db);
+						require_once $dir.$file.'.php';
 
-					// Show modules according to features level
-					if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
-					if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
+						$module = new $file($db);
 
-					if ($module->isEnabled()) {
-						print '<tr class="oddeven"><td>'.$module->name."</td><td>\n";
-						print $module->info();
-						print '</td>';
+						// Show modules according to features level
+						if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
+						if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
 
-						// Show example of numbering model
-						print '<td class="nowrap">';
-						$tmp = $module->getExample();
-						if (preg_match('/^Error/', $tmp)) print '<div class="error">'.$langs->trans($tmp).'</div>';
-						elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
-						else print $tmp;
-						print '</td>'."\n";
+						if ($module->isEnabled()) {
+							print '<tr class="oddeven"><td>'.$module->name."</td><td>\n";
+							print $module->info();
+							print '</td>';
 
-						print '<td class="center">';
-						if ($conf->global->PRODUCTBATCH_LOT_ADDON == $file) {
-							print img_picto($langs->trans("Activated"), 'switch_on');
-						} else {
-							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmodlot&amp;value='.$file.'">';
-							print img_picto($langs->trans("Disabled"), 'switch_off');
-							print '</a>';
-						}
-						print '</td>';
+							// Show example of numbering model
+							print '<td class="nowrap">';
+							$tmp = $module->getExample();
+							if (preg_match('/^Error/', $tmp)) print '<div class="error">'.$langs->trans($tmp).'</div>';
+							elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+							else print $tmp;
+							print '</td>'."\n";
 
-						$batch = new Productlot($db);
-						$batch->initAsSpecimen();
-
-						// Info
-						$htmltooltip = '';
-						$htmltooltip .= ''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
-						$nextval = $module->getNextValue($mysoc, $batch);
-						if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
-							$htmltooltip .= ''.$langs->trans("NextValue").': ';
-							if ($nextval) {
-								if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured')
-									$nextval = $langs->trans($nextval);
-								$htmltooltip .= $nextval.'<br>';
+							print '<td class="center">';
+							if ($conf->global->PRODUCTBATCH_LOT_ADDON == $file) {
+								print img_picto($langs->trans("Activated"), 'switch_on');
 							} else {
-								$htmltooltip .= $langs->trans($module->error).'<br>';
+								print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmodlot&amp;value='.$file.'">';
+								print img_picto($langs->trans("Disabled"), 'switch_off');
+								print '</a>';
 							}
+							print '</td>';
+
+							$batch = new Productlot($db);
+							$batch->initAsSpecimen();
+
+							// Info
+							$htmltooltip = '';
+							$htmltooltip .= ''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
+							$nextval = $module->getNextValue($mysoc, $batch);
+							if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
+								$htmltooltip .= ''.$langs->trans("NextValue").': ';
+								if ($nextval) {
+									if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured')
+										$nextval = $langs->trans($nextval);
+									$htmltooltip .= $nextval.'<br>';
+								} else {
+									$htmltooltip .= $langs->trans($module->error).'<br>';
+								}
+							}
+
+							print '<td class="center">';
+							print $form->textwithpicto('', $htmltooltip, 1, 0);
+							print '</td>';
+
+							print "</tr>\n";
 						}
-
-						print '<td class="center">';
-						print $form->textwithpicto('', $htmltooltip, 1, 0);
-						print '</td>';
-
-						print "</tr>\n";
 					}
 				}
+				closedir($handle);
 			}
-			closedir($handle);
 		}
 	}
-}
 
-print "</table><br>\n";
+	print "</table><br>\n";
 
 
-/*
- * Serials Numbering models
- */
+	/*
+	 * Serials Numbering models
+	 */
 
-print load_fiche_titre($langs->trans("BatchSerialNumberingModules"), '', '');
+	print load_fiche_titre($langs->trans("BatchSerialNumberingModules"), '', '');
 
-print '<table class="noborder centpercent">';
-print '<tr class="liste_titre">';
-print '<td>'.$langs->trans("Name").'</td>';
-print '<td>'.$langs->trans("Description").'</td>';
-print '<td class="nowrap">'.$langs->trans("Example").'</td>';
-print '<td class="center" width="60">'.$langs->trans("Status").'</td>';
-print '<td class="center" width="16">'.$langs->trans("ShortInfo").'</td>';
-print '</tr>'."\n";
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print '<td>'.$langs->trans("Name").'</td>';
+	print '<td>'.$langs->trans("Description").'</td>';
+	print '<td class="nowrap">'.$langs->trans("Example").'</td>';
+	print '<td class="center" width="60">'.$langs->trans("Status").'</td>';
+	print '<td class="center" width="16">'.$langs->trans("ShortInfo").'</td>';
+	print '</tr>'."\n";
 
-clearstatcache();
+	clearstatcache();
 
-foreach ($dirmodels as $reldir) {
-	$dir = dol_buildpath($reldir."core/modules/product_batch/");
+	foreach ($dirmodels as $reldir) {
+		$dir = dol_buildpath($reldir."core/modules/product_batch/");
 
-	if (is_dir($dir)) {
-		$handle = opendir($dir);
-		if (is_resource($handle)) {
-			while (($file = readdir($handle)) !== false) {
-				if (substr($file, 0, 7) == 'mod_sn_' && substr($file, dol_strlen($file) - 3, 3) == 'php') {
-					$file = substr($file, 0, dol_strlen($file) - 4);
+		if (is_dir($dir)) {
+			$handle = opendir($dir);
+			if (is_resource($handle)) {
+				while (($file = readdir($handle)) !== false) {
+					if (substr($file, 0, 7) == 'mod_sn_' && substr($file, dol_strlen($file) - 3, 3) == 'php') {
+						$file = substr($file, 0, dol_strlen($file) - 4);
 
-					require_once $dir.$file.'.php';
+						require_once $dir.$file.'.php';
 
-					$module = new $file($db);
+						$module = new $file($db);
 
-					// Show modules according to features level
-					if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
-					if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
+						// Show modules according to features level
+						if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
+						if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
 
-					if ($module->isEnabled()) {
-						print '<tr class="oddeven"><td>'.$module->name."</td><td>\n";
-						print $module->info();
-						print '</td>';
+						if ($module->isEnabled()) {
+							print '<tr class="oddeven"><td>'.$module->name."</td><td>\n";
+							print $module->info();
+							print '</td>';
 
-						// Show example of numbering model
-						print '<td class="nowrap">';
-						$tmp = $module->getExample();
-						if (preg_match('/^Error/', $tmp)) print '<div class="error">'.$langs->trans($tmp).'</div>';
-						elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
-						else print $tmp;
-						print '</td>'."\n";
+							// Show example of numbering model
+							print '<td class="nowrap">';
+							$tmp = $module->getExample();
+							if (preg_match('/^Error/', $tmp)) print '<div class="error">'.$langs->trans($tmp).'</div>';
+							elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+							else print $tmp;
+							print '</td>'."\n";
 
-						print '<td class="center">';
-						if ($conf->global->PRODUCTBATCH_SN_ADDON == $file) {
-							print img_picto($langs->trans("Activated"), 'switch_on');
-						} else {
-							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmodsn&amp;value='.$file.'">';
-							print img_picto($langs->trans("Disabled"), 'switch_off');
-							print '</a>';
-						}
-						print '</td>';
-
-						$batch = new Productlot($db);
-						$batch->initAsSpecimen();
-
-						// Info
-						$htmltooltip = '';
-						$htmltooltip .= ''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
-						$nextval = $module->getNextValue($mysoc, $batch);
-						if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
-							$htmltooltip .= ''.$langs->trans("NextValue").': ';
-							if ($nextval) {
-								if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured')
-									$nextval = $langs->trans($nextval);
-								$htmltooltip .= $nextval.'<br>';
+							print '<td class="center">';
+							if ($conf->global->PRODUCTBATCH_SN_ADDON == $file) {
+								print img_picto($langs->trans("Activated"), 'switch_on');
 							} else {
-								$htmltooltip .= $langs->trans($module->error).'<br>';
+								print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmodsn&amp;value='.$file.'">';
+								print img_picto($langs->trans("Disabled"), 'switch_off');
+								print '</a>';
 							}
+							print '</td>';
+
+							$batch = new Productlot($db);
+							$batch->initAsSpecimen();
+
+							// Info
+							$htmltooltip = '';
+							$htmltooltip .= ''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
+							$nextval = $module->getNextValue($mysoc, $batch);
+							if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
+								$htmltooltip .= ''.$langs->trans("NextValue").': ';
+								if ($nextval) {
+									if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured')
+										$nextval = $langs->trans($nextval);
+									$htmltooltip .= $nextval.'<br>';
+								} else {
+									$htmltooltip .= $langs->trans($module->error).'<br>';
+								}
+							}
+
+							print '<td class="center">';
+							print $form->textwithpicto('', $htmltooltip, 1, 0);
+							print '</td>';
+
+							print "</tr>\n";
 						}
-
-						print '<td class="center">';
-						print $form->textwithpicto('', $htmltooltip, 1, 0);
-						print '</td>';
-
-						print "</tr>\n";
 					}
 				}
+				closedir($handle);
 			}
-			closedir($handle);
 		}
 	}
-}
 
-print "</table><br>\n";
+	print "</table><br>\n";
+}
 
 // End of page
 llxFooter();
diff --git a/htdocs/product/stock/class/productlot.class.php b/htdocs/product/stock/class/productlot.class.php
index 2a3b3cf2e20..52322cf4697 100644
--- a/htdocs/product/stock/class/productlot.class.php
+++ b/htdocs/product/stock/class/productlot.class.php
@@ -87,7 +87,7 @@ class Productlot extends CommonObject
 	 */
 	public $fields = array(
 		'rowid'         => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-2, 'noteditable'=>1, 'notnull'=> 1, 'index'=>1, 'position'=>1, 'comment'=>'Id', 'css'=>'left'),
-		'fk_product'    => array('type'=>'integer:Product:product/class/product.class.php', 'label'=>'Product', 'enabled'=>1, 'visible'=>1, 'position'=>15, 'notnull'=>1, 'index'=>1, 'searchall'=>1),
+		'fk_product'    => array('type'=>'integer:Product:product/class/product.class.php', 'label'=>'Product', 'enabled'=>1, 'visible'=>1, 'position'=>5, 'notnull'=>1, 'index'=>1, 'searchall'=>1),
 		'batch'         => array('type'=>'varchar(30)', 'label'=>'Batch', 'enabled'=>1, 'visible'=>1, 'notnull'=>0, 'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'comment'=>'Batch', 'searchall'=>1),
 		'entity'        => array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'default'=>1, 'notnull'=>1, 'index'=>1, 'position'=>20),
 		'sellby'        => array('type'=>'date', 'label'=>'SellByDate', 'enabled'=>'empty($conf->global->PRODUCT_DISABLE_SELLBY)?1:0', 'visible'=>5, 'position'=>60),

From 2091120d77232de12b42c2482e9cf56f590b2e47 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 11 Jul 2021 00:50:57 +0200
Subject: [PATCH 1119/1497] FIX #18122

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

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index b1e892ae2da..9e1cf6af40c 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1628,7 +1628,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 					$statutarray = array('0' => $langs->trans("ProductStatusNotOnBatch"), '1' => $langs->trans("ProductStatusOnBatch"), '2' => $langs->trans("ProductStatusOnSerial"));
 					print $form->selectarray('status_batch', $statutarray, $object->status_batch);
 					print '</td></tr>';
-					if ($object->status_batch !== '0') {
+					if (!empty($object->status_batch) || !empty($conf->use_javascript_ajax)) {
 						$langs->load("admin");
 						$tooltip = $langs->trans("GenericMaskCodes", $langs->transnoentities("Batch"), $langs->transnoentities("Batch"));
 						$tooltip .= '<br>'.$langs->trans("GenericMaskCodes2");

From e7b3280c172e9c3cb439ae39da27950d1de0b6b1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 11 Jul 2021 01:12:52 +0200
Subject: [PATCH 1120/1497] Debug v14 with nojs

---
 htdocs/admin/accountant.php              |   8 +-
 htdocs/admin/company.php                 |   8 +-
 htdocs/core/class/extrafields.class.php  |  48 ++---
 htdocs/core/class/html.form.class.php    | 248 ++++++++++++-----------
 htdocs/core/tpl/extrafields_view.tpl.php |   1 -
 htdocs/product/card.php                  |  88 ++++----
 htdocs/societe/card.php                  |   2 +-
 7 files changed, 210 insertions(+), 193 deletions(-)

diff --git a/htdocs/admin/accountant.php b/htdocs/admin/accountant.php
index 7c82775abad..24df7e0cb68 100644
--- a/htdocs/admin/accountant.php
+++ b/htdocs/admin/accountant.php
@@ -99,14 +99,16 @@ print "<br>\n";
 /**
  * Edit parameters
  */
-print "\n".'<script type="text/javascript" language="javascript">';
-print '$(document).ready(function () {
+if (!empty($conf->use_javascript_ajax)) {
+	print "\n".'<script type="text/javascript" language="javascript">';
+	print '$(document).ready(function () {
 		  $("#selectcountry_id").change(function() {
 			document.form_index.action.value="updateedit";
 			document.form_index.submit();
 		  });
 	  });';
-print '</script>'."\n";
+	print '</script>'."\n";
+}
 
 print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'" name="form_index">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index d2dac38b500..b33c0adde29 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -384,14 +384,16 @@ print "<br>\n";
 /**
  * Edit parameters
  */
-print "\n".'<script type="text/javascript" language="javascript">';
-print '$(document).ready(function () {
+if (!empty($conf->use_javascript_ajax)) {
+	print "\n".'<script type="text/javascript" language="javascript">';
+	print '$(document).ready(function () {
 		  $("#selectcountry_id").change(function() {
 			document.form_index.action.value="updateedit";
 			document.form_index.submit();
 		  });
 	  });';
-print '</script>'."\n";
+	print '</script>'."\n";
+}
 
 print '<form enctype="multipart/form-data" method="POST" action="'.$_SERVER["PHP_SELF"].'" name="form_index">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 54d812aeafb..f6a5ba93d61 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -2006,30 +2006,32 @@ class ExtraFields
 					$collapse_display = ((isset($_COOKIE['DOLCOLLAPSE_'.$object->table_element.'_extrafields_'.$key]) || GETPOST('ignorecollapsesetup', 'int')) ? ($_COOKIE['DOLCOLLAPSE_'.$object->table_element.'_extrafields_'.$key] ? true : false) : ($extrafield_collapse_display_value == 2 ? false : true));
 					$extrafields_collapse_num = $this->attributes[$object->table_element]['pos'][$key].(!empty($object->id)?'_'.$object->id:'');
 
-					$out .= '<!-- Add js script to manage the collapse/uncollapse of extrafields separators '.$key.' -->'."\n";
-					$out .= '<script type="text/javascript">'."\n";
-					$out .= 'jQuery(document).ready(function(){'."\n";
-					if ($collapse_display === false) {
-						$out .= '   jQuery("#trextrafieldseparator'.$key.(!empty($object->id)?'_'.$object->id:'').' '.$tagtype_dyn.'").prepend("<span class=\"cursorpointer far fa-plus-square\"></span>&nbsp;");'."\n";
-						$out .= '   jQuery(".trextrafields_collapse'.$extrafields_collapse_num.'").hide();'."\n";
-					} else {
-						$out .= '   jQuery("#trextrafieldseparator'.$key.(!empty($object->id)?'_'.$object->id:'').' '.$tagtype_dyn.'").prepend("<span class=\"cursorpointer far fa-minus-square\"></span>&nbsp;");'."\n";
-						$out .= '   document.cookie = "DOLCOLLAPSE_'.$object->table_element.'_extrafields_'.$key.'=1; path='.$_SERVER["PHP_SELF"].'"'."\n";
+					if (!empty($conf->use_javascript_ajax)) {
+						$out .= '<!-- Add js script to manage the collapse/uncollapse of extrafields separators '.$key.' -->'."\n";
+						$out .= '<script type="text/javascript">'."\n";
+						$out .= 'jQuery(document).ready(function(){'."\n";
+						if ($collapse_display === false) {
+							$out .= '   jQuery("#trextrafieldseparator'.$key.(!empty($object->id)?'_'.$object->id:'').' '.$tagtype_dyn.'").prepend("<span class=\"cursorpointer far fa-plus-square\"></span>&nbsp;");'."\n";
+							$out .= '   jQuery(".trextrafields_collapse'.$extrafields_collapse_num.'").hide();'."\n";
+						} else {
+							$out .= '   jQuery("#trextrafieldseparator'.$key.(!empty($object->id)?'_'.$object->id:'').' '.$tagtype_dyn.'").prepend("<span class=\"cursorpointer far fa-minus-square\"></span>&nbsp;");'."\n";
+							$out .= '   document.cookie = "DOLCOLLAPSE_'.$object->table_element.'_extrafields_'.$key.'=1; path='.$_SERVER["PHP_SELF"].'"'."\n";
+						}
+						$out .= '   jQuery("#trextrafieldseparator'.$key.(!empty($object->id)?'_'.$object->id:'').'").click(function(){'."\n";
+						$out .= '       console.log("We click on collapse/uncollapse .trextrafields_collapse'.$extrafields_collapse_num.'");'."\n";
+						$out .= '       jQuery(".trextrafields_collapse'.$extrafields_collapse_num.'").toggle(300, function(){'."\n";
+						$out .= '           if (jQuery(".trextrafields_collapse'.$extrafields_collapse_num.'").is(":hidden")) {'."\n";
+						$out .= '               jQuery("#trextrafieldseparator'.$key.(!empty($object->id)?'_'.$object->id:'').' '.$tagtype_dyn.' span").addClass("fa-plus-square").removeClass("fa-minus-square");'."\n";
+						$out .= '               document.cookie = "DOLCOLLAPSE_'.$object->table_element.'_extrafields_'.$key.'=0; path='.$_SERVER["PHP_SELF"].'"'."\n";
+						$out .= '           } else {'."\n";
+						$out .= '               jQuery("#trextrafieldseparator'.$key.(!empty($object->id)?'_'.$object->id:'').' '.$tagtype_dyn.' span").addClass("fa-minus-square").removeClass("fa-plus-square");'."\n";
+						$out .= '               document.cookie = "DOLCOLLAPSE_'.$object->table_element.'_extrafields_'.$key.'=1; path='.$_SERVER["PHP_SELF"].'"'."\n";
+						$out .= '           }'."\n";
+						$out .= '       });'."\n";
+						$out .= '   });'."\n";
+						$out .= '});'."\n";
+						$out .= '</script>'."\n";
 					}
-					$out .= '   jQuery("#trextrafieldseparator'.$key.(!empty($object->id)?'_'.$object->id:'').'").click(function(){'."\n";
-					$out .= '       console.log("We click on collapse/uncollapse .trextrafields_collapse'.$extrafields_collapse_num.'");'."\n";
-					$out .= '       jQuery(".trextrafields_collapse'.$extrafields_collapse_num.'").toggle(300, function(){'."\n";
-					$out .= '           if (jQuery(".trextrafields_collapse'.$extrafields_collapse_num.'").is(":hidden")) {'."\n";
-					$out .= '               jQuery("#trextrafieldseparator'.$key.(!empty($object->id)?'_'.$object->id:'').' '.$tagtype_dyn.' span").addClass("fa-plus-square").removeClass("fa-minus-square");'."\n";
-					$out .= '               document.cookie = "DOLCOLLAPSE_'.$object->table_element.'_extrafields_'.$key.'=0; path='.$_SERVER["PHP_SELF"].'"'."\n";
-					$out .= '           } else {'."\n";
-					$out .= '               jQuery("#trextrafieldseparator'.$key.(!empty($object->id)?'_'.$object->id:'').' '.$tagtype_dyn.' span").addClass("fa-minus-square").removeClass("fa-plus-square");'."\n";
-					$out .= '               document.cookie = "DOLCOLLAPSE_'.$object->table_element.'_extrafields_'.$key.'=1; path='.$_SERVER["PHP_SELF"].'"'."\n";
-					$out .= '           }'."\n";
-					$out .= '       });'."\n";
-					$out .= '   });'."\n";
-					$out .= '});'."\n";
-					$out .= '</script>'."\n";
 				}
 			}
 		}
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 048fbb0cad3..816e0a79225 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -7067,7 +7067,7 @@ class Form
 	public static function selectArrayAjax($htmlname, $url, $id = '', $moreparam = '', $moreparamtourl = '', $disabled = 0, $minimumInputLength = 1, $morecss = '', $callurlonselect = 0, $placeholder = '', $acceptdelayedhtml = 0)
 	{
 		global $conf, $langs;
-		global $delayedhtmlcontent;
+		global $delayedhtmlcontent;	// Will be used later outside of this function
 
 		// TODO Use an internal dolibarr component instead of select2
 		if (empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) && !defined('REQUIRE_JQUERY_MULTISELECT')) {
@@ -7076,68 +7076,71 @@ class Form
 
 		$out = '<select type="text" class="'.$htmlname.($morecss ? ' '.$morecss : '').'" '.($moreparam ? $moreparam.' ' : '').'name="'.$htmlname.'"></select>';
 
-		$tmpplugin = 'select2';
-		$outdelayed = "\n".'<!-- JS CODE TO ENABLE '.$tmpplugin.' for id '.$htmlname.' -->
-	    	<script>
-	    	$(document).ready(function () {
+		$outdelayed = '';
+		if (!empty($conf->use_javascript_ajax)) {
+			$tmpplugin = 'select2';
+			$outdelayed = "\n".'<!-- JS CODE TO ENABLE '.$tmpplugin.' for id '.$htmlname.' -->
+		    	<script>
+		    	$(document).ready(function () {
 
-    	        '.($callurlonselect ? 'var saveRemoteData = [];' : '').'
+	    	        '.($callurlonselect ? 'var saveRemoteData = [];' : '').'
 
-                $(".'.$htmlname.'").select2({
-			    	ajax: {
-				    	dir: "ltr",
-				    	url: "'.$url.'",
-				    	dataType: \'json\',
-				    	delay: 250,
-				    	data: function (params) {
-				    		return {
-						    	q: params.term, 	// search term
-				    			page: params.page
-				    		};
-			    		},
-			    		processResults: function (data) {
-			    			// parse the results into the format expected by Select2.
-			    			// since we are using custom formatting functions we do not need to alter the remote JSON data
-			    			//console.log(data);
-							saveRemoteData = data;
-				    	    /* format json result for select2 */
-				    	    result = []
-				    	    $.each( data, function( key, value ) {
-				    	       result.push({id: key, text: value.text});
-                            });
-			    			//return {results:[{id:\'none\', text:\'aa\'}, {id:\'rrr\', text:\'Red\'},{id:\'bbb\', text:\'Search a into projects\'}], more:false}
-			    			//console.log(result);
-			    			return {results: result, more: false}
-			    		},
-			    		cache: true
-			    	},
-	 				language: select2arrayoflanguage,
-					containerCssClass: \':all:\',					/* Line to add class of origin SELECT propagated to the new <span class="select2-selection...> tag */
-				    placeholder: "'.dol_escape_js($placeholder).'",
-			    	escapeMarkup: function (markup) { return markup; }, 	// let our custom formatter work
-			    	minimumInputLength: '.$minimumInputLength.',
-			        formatResult: function(result, container, query, escapeMarkup) {
-                        return escapeMarkup(result.text);
-                    },
-			    });
+	                $(".'.$htmlname.'").select2({
+				    	ajax: {
+					    	dir: "ltr",
+					    	url: "'.$url.'",
+					    	dataType: \'json\',
+					    	delay: 250,
+					    	data: function (params) {
+					    		return {
+							    	q: params.term, 	// search term
+					    			page: params.page
+					    		};
+				    		},
+				    		processResults: function (data) {
+				    			// parse the results into the format expected by Select2.
+				    			// since we are using custom formatting functions we do not need to alter the remote JSON data
+				    			//console.log(data);
+								saveRemoteData = data;
+					    	    /* format json result for select2 */
+					    	    result = []
+					    	    $.each( data, function( key, value ) {
+					    	       result.push({id: key, text: value.text});
+	                            });
+				    			//return {results:[{id:\'none\', text:\'aa\'}, {id:\'rrr\', text:\'Red\'},{id:\'bbb\', text:\'Search a into projects\'}], more:false}
+				    			//console.log(result);
+				    			return {results: result, more: false}
+				    		},
+				    		cache: true
+				    	},
+		 				language: select2arrayoflanguage,
+						containerCssClass: \':all:\',					/* Line to add class of origin SELECT propagated to the new <span class="select2-selection...> tag */
+					    placeholder: "'.dol_escape_js($placeholder).'",
+				    	escapeMarkup: function (markup) { return markup; }, 	// let our custom formatter work
+				    	minimumInputLength: '.$minimumInputLength.',
+				        formatResult: function(result, container, query, escapeMarkup) {
+	                        return escapeMarkup(result.text);
+	                    },
+				    });
 
-                '.($callurlonselect ? '
-                /* Code to execute a GET when we select a value */
-                $(".'.$htmlname.'").change(function() {
-			    	var selected = $(".'.$htmlname.'").val();
-                	console.log("We select in selectArrayAjax the entry "+selected)
-			        $(".'.$htmlname.'").val("");  /* reset visible combo value */
-    			    $.each( saveRemoteData, function( key, value ) {
-    				        if (key == selected)
-    			            {
-    			                 console.log("selectArrayAjax - Do a redirect to "+value.url)
-    			                 location.assign(value.url);
-    			            }
-                    });
-    			});' : '').'
+	                '.($callurlonselect ? '
+	                /* Code to execute a GET when we select a value */
+	                $(".'.$htmlname.'").change(function() {
+				    	var selected = $(".'.$htmlname.'").val();
+	                	console.log("We select in selectArrayAjax the entry "+selected)
+				        $(".'.$htmlname.'").val("");  /* reset visible combo value */
+	    			    $.each( saveRemoteData, function( key, value ) {
+	    				        if (key == selected)
+	    			            {
+	    			                 console.log("selectArrayAjax - Do a redirect to "+value.url)
+	    			                 location.assign(value.url);
+	    			            }
+	                    });
+	    			});' : '').'
 
-    	   });
-	       </script>';
+	    	   });
+		       </script>';
+		}
 
 		if ($acceptdelayedhtml) {
 			$delayedhtmlcontent .= $outdelayed;
@@ -7168,7 +7171,7 @@ class Form
 	public static function selectArrayFilter($htmlname, $array, $id = '', $moreparam = '', $disableFiltering = 0, $disabled = 0, $minimumInputLength = 1, $morecss = '', $callurlonselect = 0, $placeholder = '', $acceptdelayedhtml = 0)
 	{
 		global $conf, $langs;
-		global $delayedhtmlcontent;
+		global $delayedhtmlcontent;	// Will be used later outside of this function
 
 		// TODO Use an internal dolibarr component instead of select2
 		if (empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) && !defined('REQUIRE_JQUERY_MULTISELECT')) {
@@ -7187,74 +7190,77 @@ class Form
 			$formattedarrayresult[] = $o;
 		}
 
-		$tmpplugin = 'select2';
-		$outdelayed = "\n".'<!-- JS CODE TO ENABLE '.$tmpplugin.' for id '.$htmlname.' -->
-			<script>
-			$(document).ready(function () {
-				var data = '.json_encode($formattedarrayresult).';
+		$outdelayed = '';
+		if (!empty($conf->use_javascript_ajax)) {
+			$tmpplugin = 'select2';
+			$outdelayed = "\n".'<!-- JS CODE TO ENABLE '.$tmpplugin.' for id '.$htmlname.' -->
+				<script>
+				$(document).ready(function () {
+					var data = '.json_encode($formattedarrayresult).';
 
-				'.($callurlonselect ? 'var saveRemoteData = '.json_encode($array).';' : '').'
+					'.($callurlonselect ? 'var saveRemoteData = '.json_encode($array).';' : '').'
 
-				$(".'.$htmlname.'").select2({
-					data: data,
-					language: select2arrayoflanguage,
-					containerCssClass: \':all:\',					/* Line to add class of origin SELECT propagated to the new <span class="select2-selection...> tag */
-					placeholder: "'.dol_escape_js($placeholder).'",
-					escapeMarkup: function (markup) { return markup; }, 	// let our custom formatter work
-					minimumInputLength: '.$minimumInputLength.',
-					formatResult: function(result, container, query, escapeMarkup) {
-						return escapeMarkup(result.text);
-					},
-					matcher: function (params, data) {
+					$(".'.$htmlname.'").select2({
+						data: data,
+						language: select2arrayoflanguage,
+						containerCssClass: \':all:\',					/* Line to add class of origin SELECT propagated to the new <span class="select2-selection...> tag */
+						placeholder: "'.dol_escape_js($placeholder).'",
+						escapeMarkup: function (markup) { return markup; }, 	// let our custom formatter work
+						minimumInputLength: '.$minimumInputLength.',
+						formatResult: function(result, container, query, escapeMarkup) {
+							return escapeMarkup(result.text);
+						},
+						matcher: function (params, data) {
 
-						if(! data.id) return null;';
+							if(! data.id) return null;';
+
+			if ($callurlonselect) {
+				$outdelayed .= '
+
+							var urlBase = data.url;
+							var separ = urlBase.indexOf("?") >= 0 ? "&" : "?";
+							/* console.log("params.term="+params.term); */
+							/* console.log("params.term encoded="+encodeURIComponent(params.term)); */
+							saveRemoteData[data.id].url = urlBase + separ + "sall=" + encodeURIComponent(params.term.replace(/\"/g, ""));';
+			}
+
+			if (!$disableFiltering) {
+				$outdelayed .= '
+
+							if(data.text.match(new RegExp(params.term))) {
+								return data;
+							}
+
+							return null;';
+			} else {
+				$outdelayed .= '
+
+							return data;';
+			}
 
-		if ($callurlonselect) {
 			$outdelayed .= '
-
-						var urlBase = data.url;
-						var separ = urlBase.indexOf("?") >= 0 ? "&" : "?";
-						/* console.log("params.term="+params.term); */
-						/* console.log("params.term encoded="+encodeURIComponent(params.term)); */
-						saveRemoteData[data.id].url = urlBase + separ + "sall=" + encodeURIComponent(params.term.replace(/\"/g, ""));';
-		}
-
-		if (!$disableFiltering) {
-			$outdelayed .= '
-
-						if(data.text.match(new RegExp(params.term))) {
-							return data;
-						}
-
-						return null;';
-		} else {
-			$outdelayed .= '
-
-						return data;';
-		}
-
-		$outdelayed .= '
-					}
-				});
-
-				'.($callurlonselect ? '
-				/* Code to execute a GET when we select a value */
-				$(".'.$htmlname.'").change(function() {
-					var selected = $(".'.$htmlname.'").val();
-					console.log("We select "+selected)
-
-					$(".'.$htmlname.'").val("");  /* reset visible combo value */
-					$.each( saveRemoteData, function( key, value ) {
-						if (key == selected)
-						{
-							console.log("selectArrayFilter - Do a redirect to "+value.url)
-							location.assign(value.url);
 						}
 					});
-				});' : '').'
 
-			});
-			</script>';
+					'.($callurlonselect ? '
+					/* Code to execute a GET when we select a value */
+					$(".'.$htmlname.'").change(function() {
+						var selected = $(".'.$htmlname.'").val();
+						console.log("We select "+selected)
+
+						$(".'.$htmlname.'").val("");  /* reset visible combo value */
+						$.each( saveRemoteData, function( key, value ) {
+							if (key == selected)
+							{
+								console.log("selectArrayFilter - Do a redirect to "+value.url)
+								location.assign(value.url);
+							}
+						});
+					});' : '').'
+
+				});
+				</script>';
+		}
 
 		if ($acceptdelayedhtml) {
 			$delayedhtmlcontent .= $outdelayed;
@@ -7297,7 +7303,7 @@ class Form
 		}
 
 		// Add code for jquery to use multiselect
-		if (!empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT')) {
+		if (!empty($conf->use_javascript_ajax) && !empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT')) {
 			$out .= "\n".'<!-- JS CODE TO ENABLE select for id '.$htmlname.', addjscombo='.$addjscombo.' -->';
 			$out .= "\n".'<script>'."\n";
 			if ($addjscombo == 1) {
diff --git a/htdocs/core/tpl/extrafields_view.tpl.php b/htdocs/core/tpl/extrafields_view.tpl.php
index 3b826b2ead5..e87d6df18dc 100644
--- a/htdocs/core/tpl/extrafields_view.tpl.php
+++ b/htdocs/core/tpl/extrafields_view.tpl.php
@@ -258,7 +258,6 @@ if (empty($reshook) && isset($extrafields->attributes[$object->table_element]['l
 		}
 	}
 
-
 	// Add code to manage list depending on others
 	// TODO Test/enhance this with a more generic solution
 	if (!empty($conf->use_javascript_ajax)) {
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 9e1cf6af40c..01a2d9acfdd 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1016,14 +1016,16 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		//WYSIWYG Editor
 		require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 
-		print '<script type="text/javascript">';
-				print '$(document).ready(function () {
+		if (!empty($conf->use_javascript_ajax)) {
+			print '<script type="text/javascript">';
+			print '$(document).ready(function () {
                         $("#selectcountry_id").change(function() {
                         	document.formprod.action.value="create";
                         	document.formprod.submit();
                         });
                      });';
-				print '</script>'."\n";
+			print '</script>'."\n";
+		}
 
 		// Load object modCodeProduct
 		$module = (!empty($conf->global->PRODUCT_CODEPRODUCT_ADDON) ? $conf->global->PRODUCT_CODEPRODUCT_ADDON : 'mod_codeproduct_leopard');
@@ -1551,14 +1553,16 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			//WYSIWYG Editor
 			require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 
-			print '<script type="text/javascript">';
+			if (!empty($conf->use_javascript_ajax)) {
+				print '<script type="text/javascript">';
 				print '$(document).ready(function () {
                         $("#selectcountry_id").change(function () {
                         	document.formprod.action.value="edit";
                         	document.formprod.submit();
                         });
-		});';
+				});';
 				print '</script>'."\n";
+			}
 
 			// We set country_id, country_code and country for the selected country
 			$object->country_id = GETPOST('country_id') ? GETPOST('country_id') : $object->country_id;
@@ -1646,46 +1650,48 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 						$inherited_mask_sn = getDolGlobalString('SN_ADVANCED_MASK');
 						print '<td id="field_mask">';
 						print $form->textwithpicto('<input type="text" class="flat minwidth175" name="batch_mask" id="batch_mask_input" value="'.$mask.'">', $tooltip, 1, 1);
-
-						print '<script type="text/javascript">
-						$(document).ready(function() {
-							$("#field_mask").parent().addClass("hideobject");
-							var preselect = document.getElementById("status_batch");';
-						if (getDolGlobalString('PRODUCTBATCH_SN_USE_PRODUCT_MASKS')) {
-							print 'if (preselect.value == "2") {
-									$("#field_mask").parent().removeClass("hideobject");
-								}';
-						}
-						if (getDolGlobalString('PRODUCTBATCH_LOT_USE_PRODUCT_MASKS')) {
-							print 'if (preselect.value == "1") {
-									$("#field_mask").parent().removeClass("hideobject");
-								}';
-						}
-						print '$("#status_batch").on("change", function () {
-								var optionSelected = $("option:selected", this);
-								var valueSelected = this.value;
+						// Add javascript to sho/hide field for custom mask
+						if (!empty($conf->use_javascript_ajax)) {
+							print '<script type="text/javascript">
+							$(document).ready(function() {
 								$("#field_mask").parent().addClass("hideobject");
-						';
-						if (getDolGlobalString('PRODUCTBATCH_LOT_USE_PRODUCT_MASKS') && getDolGlobalString('PRODUCTBATCH_LOT_ADDON') == 'mod_lot_advanced') {
-							print '
-								if (this.value == 1) {
-									$("#field_mask").parent().removeClass("hideobject");
-									$("#batch_mask_input").val("'.$inherited_mask_lot.'");
-								}
+								var preselect = document.getElementById("status_batch");';
+							if (getDolGlobalString('PRODUCTBATCH_SN_USE_PRODUCT_MASKS')) {
+								print 'if (preselect.value == "2") {
+										$("#field_mask").parent().removeClass("hideobject");
+									}';
+							}
+							if (getDolGlobalString('PRODUCTBATCH_LOT_USE_PRODUCT_MASKS')) {
+								print 'if (preselect.value == "1") {
+										$("#field_mask").parent().removeClass("hideobject");
+									}';
+							}
+							print '$("#status_batch").on("change", function () {
+									var optionSelected = $("option:selected", this);
+									var valueSelected = this.value;
+									$("#field_mask").parent().addClass("hideobject");
 							';
-						}
-						if (getDolGlobalString('PRODUCTBATCH_SN_USE_PRODUCT_MASKS') && getDolGlobalString('PRODUCTBATCH_SN_ADDON') == 'mod_sn_advanced') {
+							if (getDolGlobalString('PRODUCTBATCH_LOT_USE_PRODUCT_MASKS') && getDolGlobalString('PRODUCTBATCH_LOT_ADDON') == 'mod_lot_advanced') {
+								print '
+									if (this.value == 1) {
+										$("#field_mask").parent().removeClass("hideobject");
+										$("#batch_mask_input").val("'.$inherited_mask_lot.'");
+									}
+								';
+							}
+							if (getDolGlobalString('PRODUCTBATCH_SN_USE_PRODUCT_MASKS') && getDolGlobalString('PRODUCTBATCH_SN_ADDON') == 'mod_sn_advanced') {
+								print '
+									if (this.value == 2) {
+										$("#field_mask").parent().removeClass("hideobject");
+										$("#batch_mask_input").val("'.$inherited_mask_sn.'");
+									}
+								';
+							}
 							print '
-								if (this.value == 2) {
-									$("#field_mask").parent().removeClass("hideobject");
-									$("#batch_mask_input").val("'.$inherited_mask_sn.'");
-								}
-							';
-						}
-						print '
+								})
 							})
-						})
-					</script>';
+						</script>';
+						}
 						print '</td></tr>';
 					}
 				}
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 76ae78fdb51..b62c277cdf2 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -1859,7 +1859,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				$sub2 = 1;
 			}
 
-			if ($conf->use_javascript_ajax) {
+			if (!empty($conf->use_javascript_ajax)) {
 				print "\n".'<script type="text/javascript">';
 				print '$(document).ready(function () {
     			var val='.$sub.';

From f18269bee1c96d4123df2b5271d8d80246542afe Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 11 Jul 2021 01:39:57 +0200
Subject: [PATCH 1121/1497] Comment

---
 htdocs/categories/class/categorie.class.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index a9502586b87..fccea96e5ad 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -1499,6 +1499,9 @@ class Categorie extends CommonObject
 			$sql = "SELECT ct.fk_categorie, c.label, c.rowid";
 			$sql .= " FROM ".MAIN_DB_PREFIX."categorie_".(empty($this->MAP_CAT_TABLE[$type]) ? $type : $this->MAP_CAT_TABLE[$type])." as ct, ".MAIN_DB_PREFIX."categorie as c";
 			$sql .= " WHERE ct.fk_categorie = c.rowid AND ct.fk_".(empty($this->MAP_CAT_FK[$type]) ? $type : $this->MAP_CAT_FK[$type])." = ".(int) $id;
+			// This seems useless because the table already contains id of category of 1 unique type. So commented.
+			// So now it works also with external added categories.
+			//$sql .= " AND c.type = ".$this->MAP_ID[$type];
 			$sql .= " AND c.entity IN (".getEntity('category').")";
 
 			$res = $this->db->query($sql);

From 25d6f1a7c8b28a623745e0290567d3d7eceb7213 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 11 Jul 2021 01:58:37 +0200
Subject: [PATCH 1122/1497] More complete exemple.

---
 htdocs/core/lib/cron.lib.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/lib/cron.lib.php b/htdocs/core/lib/cron.lib.php
index 2d111e37ef8..5216ff554e4 100644
--- a/htdocs/core/lib/cron.lib.php
+++ b/htdocs/core/lib/cron.lib.php
@@ -114,8 +114,13 @@ function dol_print_cron_urls()
 
 	print '<u>'.$langs->trans("FileToLaunchCronJobs").':</u><br>';
 
-	$file = '/scripts/cron/cron_run_jobs.php '.(empty($conf->global->CRON_KEY) ? 'securitykey' : ''.$conf->global->CRON_KEY.'').' '.$logintouse.' [cronjobid]';
-	print '<textarea class="quatrevingtpercent">..'.$file."</textarea><br>\n";
+	$pathtoscript = '/pathtoscript';
+	if (!empty($conf->global->MAIN_DOL_SCRIPTS_ROOT)) {
+		$pathtoscript = $conf->global->MAIN_DOL_SCRIPTS_ROOT;
+	}
+
+	$file = $pathtoscript.'/scripts/cron/cron_run_jobs.php '.(empty($conf->global->CRON_KEY) ? 'securitykey' : ''.$conf->global->CRON_KEY.'').' '.$logintouse.' [cronjobid]';
+	print '<textarea class="quatrevingtpercent">'.$file."</textarea><br>\n";
 	print '<br>';
 
 	// Add note
@@ -131,7 +136,7 @@ function dol_print_cron_urls()
 		if ($linuxlike) {
 			print $langs->trans("CronExplainHowToRunUnix");
 			print '<br>';
-			print '<textarea class="quatrevingtpercent">*/5 * * * * pathtoscript/scripts/cron/cron_run_jobs.php '.(empty($conf->global->CRON_KEY) ? 'securitykey' : ''.$conf->global->CRON_KEY.'').' '.$logintouse.' &gt; '.DOL_DATA_ROOT.'/cron_run_jobs.php.log</textarea><br>';
+			print '<textarea class="quatrevingtpercent">*/5 * * * * '.$pathtoscript.'/scripts/cron/cron_run_jobs.php '.(empty($conf->global->CRON_KEY) ? 'securitykey' : ''.$conf->global->CRON_KEY.'').' '.$logintouse.' &gt; '.DOL_DATA_ROOT.'/cron_run_jobs.php.log</textarea><br>';
 		} else {
 			print $langs->trans("CronExplainHowToRunWin");
 		}

From 93083e39c7e0d1315eb54e3529ddd40d423bd073 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 11 Jul 2021 02:58:18 +0200
Subject: [PATCH 1123/1497] Fix using zip for integrity file

---
 htdocs/admin/system/filecheck.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/htdocs/admin/system/filecheck.php b/htdocs/admin/system/filecheck.php
index 212fcc6228a..a8b323ec7a6 100644
--- a/htdocs/admin/system/filecheck.php
+++ b/htdocs/admin/system/filecheck.php
@@ -79,7 +79,12 @@ $file_list = array('missing' => array(), 'updated' => array());
 
 // Local file to compare to
 $xmlshortfile = dol_sanitizeFileName(GETPOST('xmlshortfile', 'alpha') ? GETPOST('xmlshortfile', 'alpha') : 'filelist-'.DOL_VERSION.(empty($conf->global->MAIN_FILECHECK_LOCAL_SUFFIX) ? '' : $conf->global->MAIN_FILECHECK_LOCAL_SUFFIX).'.xml'.(empty($conf->global->MAIN_FILECHECK_LOCAL_EXT) ? '' : $conf->global->MAIN_FILECHECK_LOCAL_EXT));
+
 $xmlfile = DOL_DOCUMENT_ROOT.'/install/'.$xmlshortfile;
+if (!preg_match('/\.zip$/i', $xmlfile) && dol_is_file($xmlfile.'.zip')) {
+	$xmlfile = $xmlfile.'.zip';
+}
+
 // Remote file to compare to
 $xmlremote = GETPOST('xmlremote', 'alphanohtml');
 if (empty($xmlremote) && !empty($conf->global->MAIN_FILECHECK_URL)) {

From e1e410ce9191c80d59dacec0025ee7c9b7289458 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 11 Jul 2021 03:04:06 +0200
Subject: [PATCH 1124/1497] Fix error message if file corrupted

---
 htdocs/admin/system/filecheck.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/htdocs/admin/system/filecheck.php b/htdocs/admin/system/filecheck.php
index a8b323ec7a6..272ac8d8f19 100644
--- a/htdocs/admin/system/filecheck.php
+++ b/htdocs/admin/system/filecheck.php
@@ -155,6 +155,10 @@ if (GETPOST('target') == 'local') {
 			}
 		}
 		$xml = simplexml_load_file($xmlfile);
+		if ($xml === false) {
+			print '<div class="warning">'.$langs->trans('XmlCorrupted').': '.$xmlfile.'</span>';
+			$error++;
+		}
 	} else {
 		print '<div class="warning">'.$langs->trans('XmlNotFound').': '.$xmlfile.'</span>';
 		$error++;

From 5ec903723dd03e1c7a92bcd91ad9931d125fffd1 Mon Sep 17 00:00:00 2001
From: fr69400 <82267780+fr69400@users.noreply.github.com>
Date: Sun, 11 Jul 2021 09:42:35 +0200
Subject: [PATCH 1125/1497] Update note.php

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

diff --git a/htdocs/adherents/note.php b/htdocs/adherents/note.php
index e26654a07ee..70642612483 100644
--- a/htdocs/adherents/note.php
+++ b/htdocs/adherents/note.php
@@ -77,12 +77,12 @@ $result = restrictedArea($user, 'adherent', $object->id, '', '', 'socid', 'rowid
  * Actions
  */
 $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0)
+if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-
-if (empty($reshook))
+}
+if (empty($reshook)){
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
-
+}
 
 
 /*

From c7e6f66823c5dfd2ad62d7e1ea7bdd862b2a94ac Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Sun, 11 Jul 2021 07:43:02 +0000
Subject: [PATCH 1126/1497] Fixing style errors.

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

diff --git a/htdocs/adherents/note.php b/htdocs/adherents/note.php
index 70642612483..0444d03b2ff 100644
--- a/htdocs/adherents/note.php
+++ b/htdocs/adherents/note.php
@@ -80,7 +80,7 @@ $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); /
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
-if (empty($reshook)){
+if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 }
 

From b8fd4394a17f5e1b6f265df8005564e730fa0291 Mon Sep 17 00:00:00 2001
From: fr69400 <82267780+fr69400@users.noreply.github.com>
Date: Sun, 11 Jul 2021 09:43:08 +0200
Subject: [PATCH 1127/1497] Update note.php

---
 htdocs/asset/note.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/asset/note.php b/htdocs/asset/note.php
index 207465d1187..8a356ec516b 100644
--- a/htdocs/asset/note.php
+++ b/htdocs/asset/note.php
@@ -71,11 +71,12 @@ $permissionnote = 1;
  */
 
 $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0)
+if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-
-if (empty($reshook))
+}
+if (empty($reshook)){
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
+}
 
 /*
  * View

From 698f6db72e62c7c9d5d927b300a0ad2684e57d9e Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Sun, 11 Jul 2021 07:43:34 +0000
Subject: [PATCH 1128/1497] Fixing style errors.

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

diff --git a/htdocs/asset/note.php b/htdocs/asset/note.php
index 8a356ec516b..16af18d8277 100644
--- a/htdocs/asset/note.php
+++ b/htdocs/asset/note.php
@@ -74,7 +74,7 @@ $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); /
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
-if (empty($reshook)){
+if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 }
 

From dafd0fb4b08ccd480f7b66f52edd127e19227417 Mon Sep 17 00:00:00 2001
From: fr69400 <82267780+fr69400@users.noreply.github.com>
Date: Sun, 11 Jul 2021 09:44:01 +0200
Subject: [PATCH 1129/1497] Update bom_note.php

---
 htdocs/bom/bom_note.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/bom/bom_note.php b/htdocs/bom/bom_note.php
index 3d70c09b35a..7e808ee60f5 100644
--- a/htdocs/bom/bom_note.php
+++ b/htdocs/bom/bom_note.php
@@ -71,11 +71,12 @@ restrictedArea($user, 'bom', $object->id, 'bom_bom', '', '', 'rowid', $isdraft);
  */
 
 $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0)
+if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-
-if (empty($reshook))
+}
+if (empty($reshook)){
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
+}
 
 
 /*

From bf03a30a9ff6157202fd2f07fadc9363d5008d64 Mon Sep 17 00:00:00 2001
From: fr69400 <82267780+fr69400@users.noreply.github.com>
Date: Sun, 11 Jul 2021 09:44:18 +0200
Subject: [PATCH 1130/1497] Update note.php

---
 htdocs/comm/propal/note.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/comm/propal/note.php b/htdocs/comm/propal/note.php
index e42382dfbd6..e16b4367390 100644
--- a/htdocs/comm/propal/note.php
+++ b/htdocs/comm/propal/note.php
@@ -66,11 +66,12 @@ restrictedArea($user, 'propal', $object->id, 'propal');
 $permissionnote = $user->rights->propale->creer; // Used by the include of actions_setnotes.inc.php
 
 $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0)
+if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-
-if (empty($reshook))
+}
+if (empty($reshook)){
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
+}
 
 
 

From cc4defd212bf5e93464b7d1403280eb85569e89b Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Sun, 11 Jul 2021 07:44:41 +0000
Subject: [PATCH 1131/1497] Fixing style errors.

---
 htdocs/bom/bom_note.php     | 2 +-
 htdocs/comm/propal/note.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/bom/bom_note.php b/htdocs/bom/bom_note.php
index 7e808ee60f5..f456e7ddf98 100644
--- a/htdocs/bom/bom_note.php
+++ b/htdocs/bom/bom_note.php
@@ -74,7 +74,7 @@ $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); /
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
-if (empty($reshook)){
+if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 }
 
diff --git a/htdocs/comm/propal/note.php b/htdocs/comm/propal/note.php
index e16b4367390..53a3a37c84d 100644
--- a/htdocs/comm/propal/note.php
+++ b/htdocs/comm/propal/note.php
@@ -69,7 +69,7 @@ $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); /
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
-if (empty($reshook)){
+if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 }
 

From a27b0cd797a90ffe8dddda1c30afefc93c1edfe4 Mon Sep 17 00:00:00 2001
From: fr69400 <82267780+fr69400@users.noreply.github.com>
Date: Sun, 11 Jul 2021 09:45:22 +0200
Subject: [PATCH 1132/1497] Update note.php

---
 htdocs/commande/note.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/commande/note.php b/htdocs/commande/note.php
index 41598249e8c..e5c98da9765 100644
--- a/htdocs/commande/note.php
+++ b/htdocs/commande/note.php
@@ -66,11 +66,12 @@ $permissionnote = $user->rights->commande->creer; // Used by the include of acti
  */
 
 $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0)
+if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-
-if (empty($reshook))
+}
+if (empty($reshook)){
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
+}
 
 
 /*

From c7ad0a59c90614349c783b3d08bb067e0238a21e Mon Sep 17 00:00:00 2001
From: fr69400 <82267780+fr69400@users.noreply.github.com>
Date: Sun, 11 Jul 2021 09:45:38 +0200
Subject: [PATCH 1133/1497] Update note.php

---
 htdocs/compta/facture/note.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/compta/facture/note.php b/htdocs/compta/facture/note.php
index 863fde5812b..adc6182dd61 100644
--- a/htdocs/compta/facture/note.php
+++ b/htdocs/compta/facture/note.php
@@ -64,11 +64,12 @@ $result = restrictedArea($user, 'facture', $id, '');
  */
 
 $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0)
+if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-
-if (empty($reshook))
+}
+if (empty($reshook)){
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
+}
 
 
 

From d485d9d2fd1771f5fb8a2bd31576ae2467cdbddd Mon Sep 17 00:00:00 2001
From: fr69400 <82267780+fr69400@users.noreply.github.com>
Date: Sun, 11 Jul 2021 09:45:59 +0200
Subject: [PATCH 1134/1497] Update note.php

---
 htdocs/contact/note.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/htdocs/contact/note.php b/htdocs/contact/note.php
index bbcb660ebdf..a3dbc28554d 100644
--- a/htdocs/contact/note.php
+++ b/htdocs/contact/note.php
@@ -57,11 +57,12 @@ $hookmanager->initHooks(array('contactnote'));
  * Actions
  */
 $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0)
+if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-
-if (empty($reshook))
-	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once
+}
+if (empty($reshook)){
+	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
+}
 
 
 /*

From 556c2c7e5a82333f671495badbf7f6c8b27fd92f Mon Sep 17 00:00:00 2001
From: fr69400 <82267780+fr69400@users.noreply.github.com>
Date: Sun, 11 Jul 2021 09:46:15 +0200
Subject: [PATCH 1135/1497] Update note.php

---
 htdocs/contrat/note.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/contrat/note.php b/htdocs/contrat/note.php
index 4314b7ab976..8b08123a3f4 100644
--- a/htdocs/contrat/note.php
+++ b/htdocs/contrat/note.php
@@ -61,11 +61,12 @@ $permissionnote = $user->rights->contrat->creer; // Used by the include of actio
  */
 
 $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0)
+if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-
-if (empty($reshook))
+}
+if (empty($reshook)){
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
+}
 
 
 

From a8752bf097800258d625e23b884a95b7524a5558 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Sun, 11 Jul 2021 07:46:34 +0000
Subject: [PATCH 1136/1497] Fixing style errors.

---
 htdocs/commande/note.php       | 2 +-
 htdocs/compta/facture/note.php | 2 +-
 htdocs/contact/note.php        | 2 +-
 htdocs/contrat/note.php        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/commande/note.php b/htdocs/commande/note.php
index e5c98da9765..dbfb0bdd43c 100644
--- a/htdocs/commande/note.php
+++ b/htdocs/commande/note.php
@@ -69,7 +69,7 @@ $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); /
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
-if (empty($reshook)){
+if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 }
 
diff --git a/htdocs/compta/facture/note.php b/htdocs/compta/facture/note.php
index adc6182dd61..efb0e23a27a 100644
--- a/htdocs/compta/facture/note.php
+++ b/htdocs/compta/facture/note.php
@@ -67,7 +67,7 @@ $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); /
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
-if (empty($reshook)){
+if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 }
 
diff --git a/htdocs/contact/note.php b/htdocs/contact/note.php
index a3dbc28554d..1cb76b5336e 100644
--- a/htdocs/contact/note.php
+++ b/htdocs/contact/note.php
@@ -60,7 +60,7 @@ $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); /
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
-if (empty($reshook)){
+if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 }
 
diff --git a/htdocs/contrat/note.php b/htdocs/contrat/note.php
index 8b08123a3f4..46a710a754d 100644
--- a/htdocs/contrat/note.php
+++ b/htdocs/contrat/note.php
@@ -64,7 +64,7 @@ $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); /
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
-if (empty($reshook)){
+if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 }
 

From 2eb10c40b2ea7709b145ee0384ff0cce0d118302 Mon Sep 17 00:00:00 2001
From: fr69400 <82267780+fr69400@users.noreply.github.com>
Date: Sun, 11 Jul 2021 09:46:52 +0200
Subject: [PATCH 1137/1497] Update conferenceorboothattendee_note.php

---
 .../eventorganization/conferenceorboothattendee_note.php   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/eventorganization/conferenceorboothattendee_note.php b/htdocs/eventorganization/conferenceorboothattendee_note.php
index 99c01900184..4f0bb74a4e5 100644
--- a/htdocs/eventorganization/conferenceorboothattendee_note.php
+++ b/htdocs/eventorganization/conferenceorboothattendee_note.php
@@ -116,11 +116,12 @@ $permissiontoadd = $user->rights->eventorganization->conferenceorboothattendee->
  */
 
 $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0)
+if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-
-if (empty($reshook))
+}
+if (empty($reshook)){
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
+}
 
 /*
  * View

From fdaf29fd658a842926b1556071894ae85eb41d9f Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Sun, 11 Jul 2021 07:47:08 +0000
Subject: [PATCH 1138/1497] Fixing style errors.

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

diff --git a/htdocs/eventorganization/conferenceorboothattendee_note.php b/htdocs/eventorganization/conferenceorboothattendee_note.php
index 4f0bb74a4e5..fd72b1588e7 100644
--- a/htdocs/eventorganization/conferenceorboothattendee_note.php
+++ b/htdocs/eventorganization/conferenceorboothattendee_note.php
@@ -119,7 +119,7 @@ $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); /
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
-if (empty($reshook)){
+if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 }
 

From cd554459058922848bec023612238fc43685552b Mon Sep 17 00:00:00 2001
From: fr69400 <82267780+fr69400@users.noreply.github.com>
Date: Sun, 11 Jul 2021 09:47:17 +0200
Subject: [PATCH 1139/1497] Update note.php

---
 htdocs/expedition/note.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/expedition/note.php b/htdocs/expedition/note.php
index 804a4fbc829..314633a53d0 100644
--- a/htdocs/expedition/note.php
+++ b/htdocs/expedition/note.php
@@ -79,11 +79,12 @@ $result = restrictedArea($user, 'expedition', $object->id, '');
  */
 
 $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0)
+if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-
-if (empty($reshook))
+}
+if (empty($reshook)){
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
+}
 
 
 /*

From 84493fb55d5f520bec845ea2bb59560b4a956d1b Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Sun, 11 Jul 2021 07:47:32 +0000
Subject: [PATCH 1140/1497] Fixing style errors.

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

diff --git a/htdocs/expedition/note.php b/htdocs/expedition/note.php
index 314633a53d0..d9282481603 100644
--- a/htdocs/expedition/note.php
+++ b/htdocs/expedition/note.php
@@ -82,7 +82,7 @@ $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); /
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
-if (empty($reshook)){
+if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 }
 

From ce9cf63c361662e30996811d227ee8e45571c483 Mon Sep 17 00:00:00 2001
From: fr69400 <82267780+fr69400@users.noreply.github.com>
Date: Sun, 11 Jul 2021 09:47:36 +0200
Subject: [PATCH 1141/1497] Update note.php

---
 htdocs/expensereport/note.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/expensereport/note.php b/htdocs/expensereport/note.php
index 26e6c23a7ec..c0100008bfe 100644
--- a/htdocs/expensereport/note.php
+++ b/htdocs/expensereport/note.php
@@ -75,11 +75,12 @@ if ($object->id > 0) {
  */
 
 $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0)
+if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-
-if (empty($reshook))
+}
+if (empty($reshook)){
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
+}
 
 
 /*

From d22ed4be821a86a11712b10d89bc678553b9dde1 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Sun, 11 Jul 2021 07:47:50 +0000
Subject: [PATCH 1142/1497] Fixing style errors.

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

diff --git a/htdocs/expensereport/note.php b/htdocs/expensereport/note.php
index c0100008bfe..5649f2144e4 100644
--- a/htdocs/expensereport/note.php
+++ b/htdocs/expensereport/note.php
@@ -78,7 +78,7 @@ $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); /
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
-if (empty($reshook)){
+if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 }
 

From b91f5ad500c31c89983a34b0e115e4b9ddab719f Mon Sep 17 00:00:00 2001
From: fr69400 <82267780+fr69400@users.noreply.github.com>
Date: Sun, 11 Jul 2021 09:47:58 +0200
Subject: [PATCH 1143/1497] Update note.php

---
 htdocs/fichinter/note.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/fichinter/note.php b/htdocs/fichinter/note.php
index 62fb5fe32ac..9cacd6205c7 100644
--- a/htdocs/fichinter/note.php
+++ b/htdocs/fichinter/note.php
@@ -55,11 +55,12 @@ $permissionnote = $user->rights->ficheinter->creer; // Used by the include of ac
  */
 
 $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0)
+if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-
-if (empty($reshook))
+}
+if (empty($reshook)){
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
+}
 
 
 /*

From beaee09c984afbd8d5c9e963f12b7e01ed09dc1e Mon Sep 17 00:00:00 2001
From: fr69400 <82267780+fr69400@users.noreply.github.com>
Date: Sun, 11 Jul 2021 09:48:15 +0200
Subject: [PATCH 1144/1497] Update note.php

---
 htdocs/fourn/commande/note.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/fourn/commande/note.php b/htdocs/fourn/commande/note.php
index 89272e3b80a..66716581e03 100644
--- a/htdocs/fourn/commande/note.php
+++ b/htdocs/fourn/commande/note.php
@@ -58,11 +58,12 @@ $permissionnote = ($user->rights->fournisseur->commande->creer || $user->rights-
  */
 
 $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0)
+if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-
-if (empty($reshook))
+}
+if (empty($reshook)){
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
+}
 
 
 /*

From 48846888ccd052ee6d9518d0a8d4470b47f4eb41 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Sun, 11 Jul 2021 07:48:30 +0000
Subject: [PATCH 1145/1497] Fixing style errors.

---
 htdocs/fichinter/note.php      | 2 +-
 htdocs/fourn/commande/note.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/fichinter/note.php b/htdocs/fichinter/note.php
index 9cacd6205c7..01a8d82cf5a 100644
--- a/htdocs/fichinter/note.php
+++ b/htdocs/fichinter/note.php
@@ -58,7 +58,7 @@ $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); /
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
-if (empty($reshook)){
+if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 }
 
diff --git a/htdocs/fourn/commande/note.php b/htdocs/fourn/commande/note.php
index 66716581e03..b3e7d33e5d9 100644
--- a/htdocs/fourn/commande/note.php
+++ b/htdocs/fourn/commande/note.php
@@ -61,7 +61,7 @@ $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); /
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
-if (empty($reshook)){
+if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 }
 

From ce4cab04d45f683ae65af264782e3c59984cdf3b Mon Sep 17 00:00:00 2001
From: fr69400 <82267780+fr69400@users.noreply.github.com>
Date: Sun, 11 Jul 2021 09:48:33 +0200
Subject: [PATCH 1146/1497] Update note.php

---
 htdocs/fourn/facture/note.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/fourn/facture/note.php b/htdocs/fourn/facture/note.php
index e4dbea9a98a..0f6751384e0 100644
--- a/htdocs/fourn/facture/note.php
+++ b/htdocs/fourn/facture/note.php
@@ -60,11 +60,12 @@ $permissionnote = ($user->rights->fournisseur->facture->creer || $user->rights->
  */
 
 $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0)
+if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-
-if (empty($reshook))
+}
+if (empty($reshook)){
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
+}
 
 // Set label
 if ($action == 'setlabel' && ($user->rights->fournisseur->facture->creer || $user->rights->supplier_invoice->creer)) {

From 7f18bdf85bdaf79e46ee305fe649950cd7dccf45 Mon Sep 17 00:00:00 2001
From: fr69400 <82267780+fr69400@users.noreply.github.com>
Date: Sun, 11 Jul 2021 09:48:50 +0200
Subject: [PATCH 1147/1497] Update knowledgerecord_note.php

---
 htdocs/knowledgemanagement/knowledgerecord_note.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/knowledgemanagement/knowledgerecord_note.php b/htdocs/knowledgemanagement/knowledgerecord_note.php
index 562fe79f216..250230b8609 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_note.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_note.php
@@ -67,11 +67,12 @@ $permissiontoadd = $user->rights->knowledgemanagement->knowledgerecord->write; /
  */
 
 $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0)
+if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-
-if (empty($reshook))
+}
+if (empty($reshook)){
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
+}
 
 
 /*

From 789cea9a85a038a751eab3d0e54d4a6ed005332f Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Sun, 11 Jul 2021 07:49:05 +0000
Subject: [PATCH 1148/1497] Fixing style errors.

---
 htdocs/fourn/facture/note.php                       | 2 +-
 htdocs/knowledgemanagement/knowledgerecord_note.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/fourn/facture/note.php b/htdocs/fourn/facture/note.php
index 0f6751384e0..c5ea5feac68 100644
--- a/htdocs/fourn/facture/note.php
+++ b/htdocs/fourn/facture/note.php
@@ -63,7 +63,7 @@ $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); /
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
-if (empty($reshook)){
+if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 }
 
diff --git a/htdocs/knowledgemanagement/knowledgerecord_note.php b/htdocs/knowledgemanagement/knowledgerecord_note.php
index 250230b8609..87d9eed9bdb 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_note.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_note.php
@@ -70,7 +70,7 @@ $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); /
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
-if (empty($reshook)){
+if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 }
 

From 29e0ce787f7f6801ee8b1e0d2d35e88fc8dc3b03 Mon Sep 17 00:00:00 2001
From: fr69400 <82267780+fr69400@users.noreply.github.com>
Date: Sun, 11 Jul 2021 09:49:24 +0200
Subject: [PATCH 1149/1497] Update note.php

---
 htdocs/loan/note.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/loan/note.php b/htdocs/loan/note.php
index 6df215d354a..7cfc8b0df1d 100644
--- a/htdocs/loan/note.php
+++ b/htdocs/loan/note.php
@@ -59,11 +59,12 @@ $permissionnote = $user->rights->loan->write; // Used by the include of actions_
 
 
 $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0)
+if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-
-if (empty($reshook))
+}
+if (empty($reshook)){
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
+}
 
 
 /*

From efbf9db1053312ce851e99e485c967fc0418d7e4 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Sun, 11 Jul 2021 07:49:39 +0000
Subject: [PATCH 1150/1497] Fixing style errors.

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

diff --git a/htdocs/loan/note.php b/htdocs/loan/note.php
index 7cfc8b0df1d..a17445db6cf 100644
--- a/htdocs/loan/note.php
+++ b/htdocs/loan/note.php
@@ -62,7 +62,7 @@ $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); /
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
-if (empty($reshook)){
+if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 }
 

From 35c0008fa073488f1526c5fb152d755f6d335d03 Mon Sep 17 00:00:00 2001
From: fr69400 <82267780+fr69400@users.noreply.github.com>
Date: Sun, 11 Jul 2021 09:49:42 +0200
Subject: [PATCH 1151/1497] Update myobject_note.php

---
 htdocs/modulebuilder/template/myobject_note.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/modulebuilder/template/myobject_note.php b/htdocs/modulebuilder/template/myobject_note.php
index aec084ce3c6..23298fcf80c 100644
--- a/htdocs/modulebuilder/template/myobject_note.php
+++ b/htdocs/modulebuilder/template/myobject_note.php
@@ -118,11 +118,12 @@ $permissiontoadd = $user->rights->mymodule->myobject->write; // Used by the incl
  */
 
 $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0)
+if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-
-if (empty($reshook))
+}
+if (empty($reshook)){
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
+}
 
 
 /*

From 21e213507f8ce5e177b6bd47ae2cb30ddf410f2a Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Sun, 11 Jul 2021 07:49:56 +0000
Subject: [PATCH 1152/1497] Fixing style errors.

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

diff --git a/htdocs/modulebuilder/template/myobject_note.php b/htdocs/modulebuilder/template/myobject_note.php
index 23298fcf80c..7f324fbd456 100644
--- a/htdocs/modulebuilder/template/myobject_note.php
+++ b/htdocs/modulebuilder/template/myobject_note.php
@@ -121,7 +121,7 @@ $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); /
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
-if (empty($reshook)){
+if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 }
 

From aeba1dd2b24606d987cc250d70910c47b1eacdbd Mon Sep 17 00:00:00 2001
From: fr69400 <82267780+fr69400@users.noreply.github.com>
Date: Sun, 11 Jul 2021 09:50:06 +0200
Subject: [PATCH 1153/1497] Update partnership_note.php

---
 htdocs/partnership/partnership_note.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/partnership/partnership_note.php b/htdocs/partnership/partnership_note.php
index 0fee9a10ce4..aed79934306 100644
--- a/htdocs/partnership/partnership_note.php
+++ b/htdocs/partnership/partnership_note.php
@@ -66,11 +66,12 @@ $permissiontoadd = $user->rights->partnership->write; // Used by the include of
  * Actions
  */
 $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0)
+if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-
-if (empty($reshook))
+}
+if (empty($reshook)){
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
+}
 
 
 /*

From 6810391a6a14024e028c192ea37e108b336000bf Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Sun, 11 Jul 2021 07:50:20 +0000
Subject: [PATCH 1154/1497] Fixing style errors.

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

diff --git a/htdocs/partnership/partnership_note.php b/htdocs/partnership/partnership_note.php
index aed79934306..cc97eac5515 100644
--- a/htdocs/partnership/partnership_note.php
+++ b/htdocs/partnership/partnership_note.php
@@ -69,7 +69,7 @@ $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); /
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
-if (empty($reshook)){
+if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 }
 

From 1b2f0fc15507efa6f817a88ba4be990dd044ed7f Mon Sep 17 00:00:00 2001
From: fr69400 <82267780+fr69400@users.noreply.github.com>
Date: Sun, 11 Jul 2021 09:50:24 +0200
Subject: [PATCH 1155/1497] Update note.php

---
 htdocs/product/note.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/htdocs/product/note.php b/htdocs/product/note.php
index fb014d3dcca..0333c360042 100644
--- a/htdocs/product/note.php
+++ b/htdocs/product/note.php
@@ -70,11 +70,12 @@ $hookmanager->initHooks(array('productnote'));
  * Actions
  */
 $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0)
+if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-
-if (empty($reshook))
-	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once
+}
+if (empty($reshook)){
+	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
+}
 
 
 /*

From c6fb975d51dda2465d390f2a7a1dafd467352ebb Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Sun, 11 Jul 2021 07:50:38 +0000
Subject: [PATCH 1156/1497] Fixing style errors.

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

diff --git a/htdocs/product/note.php b/htdocs/product/note.php
index 0333c360042..c54bd3637ae 100644
--- a/htdocs/product/note.php
+++ b/htdocs/product/note.php
@@ -73,7 +73,7 @@ $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); /
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
-if (empty($reshook)){
+if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 }
 

From 2e4b45488f7e7c43190fc7f32f1a3d3b2d0ca81a Mon Sep 17 00:00:00 2001
From: fr69400 <82267780+fr69400@users.noreply.github.com>
Date: Sun, 11 Jul 2021 09:50:42 +0200
Subject: [PATCH 1157/1497] Update note.php

---
 htdocs/projet/note.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/projet/note.php b/htdocs/projet/note.php
index 3d13aa47afe..d7a2af62718 100644
--- a/htdocs/projet/note.php
+++ b/htdocs/projet/note.php
@@ -57,11 +57,12 @@ $permissionnote = $user->rights->projet->creer; // Used by the include of action
  */
 
 $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0)
+if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-
-if (empty($reshook))
+}
+if (empty($reshook)){
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
+}
 
 
 /*

From 2a1eb97b7db97cc5ae81d44793bc8fdd55b2a9c5 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Sun, 11 Jul 2021 07:50:57 +0000
Subject: [PATCH 1158/1497] Fixing style errors.

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

diff --git a/htdocs/projet/note.php b/htdocs/projet/note.php
index d7a2af62718..9fee6615c40 100644
--- a/htdocs/projet/note.php
+++ b/htdocs/projet/note.php
@@ -60,7 +60,7 @@ $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); /
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
-if (empty($reshook)){
+if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 }
 

From 9a6cafb3c5fb65929ae64f8d646776e81325a713 Mon Sep 17 00:00:00 2001
From: fr69400 <82267780+fr69400@users.noreply.github.com>
Date: Sun, 11 Jul 2021 09:52:01 +0200
Subject: [PATCH 1159/1497] Update note.php

---
 htdocs/don/note.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/don/note.php b/htdocs/don/note.php
index 03f2d687012..01a017d7b5d 100644
--- a/htdocs/don/note.php
+++ b/htdocs/don/note.php
@@ -61,11 +61,12 @@ $permissionnote = $user->rights->don->creer; // Used by the include of actions_s
  * Actions
  */
 $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0)
+if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-
-if (empty($reshook))
+}
+if (empty($reshook)){
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
+}
 
 if ($action == 'classin' && $user->rights->don->creer) {
 	$object->fetch($id);

From 21e5d067e267ca6d5eb5d440267fd87489adcfe9 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Sun, 11 Jul 2021 07:52:16 +0000
Subject: [PATCH 1160/1497] Fixing style errors.

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

diff --git a/htdocs/don/note.php b/htdocs/don/note.php
index 01a017d7b5d..13f9b1d4a96 100644
--- a/htdocs/don/note.php
+++ b/htdocs/don/note.php
@@ -64,7 +64,7 @@ $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); /
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
-if (empty($reshook)){
+if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 }
 

From eb6284e15297b97a52fdcba056206fd94e4f47bf Mon Sep 17 00:00:00 2001
From: fr69400 <82267780+fr69400@users.noreply.github.com>
Date: Sun, 11 Jul 2021 09:52:46 +0200
Subject: [PATCH 1161/1497] Update mo_note.php

---
 htdocs/mrp/mo_note.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/mrp/mo_note.php b/htdocs/mrp/mo_note.php
index 5c65da9c161..b584e04cec5 100644
--- a/htdocs/mrp/mo_note.php
+++ b/htdocs/mrp/mo_note.php
@@ -70,11 +70,12 @@ $permissionnote = $user->rights->mrp->write;	// Used by the include of actions_s
 
 
 $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0)
+if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-
-if (empty($reshook))
+}
+if (empty($reshook)){
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
+}
 
 
 /*

From 2d6efd2d4c9a6c346a04ba35380a4f0e8842986e Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Sun, 11 Jul 2021 07:53:01 +0000
Subject: [PATCH 1162/1497] Fixing style errors.

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

diff --git a/htdocs/mrp/mo_note.php b/htdocs/mrp/mo_note.php
index b584e04cec5..fd1e2d8cbfa 100644
--- a/htdocs/mrp/mo_note.php
+++ b/htdocs/mrp/mo_note.php
@@ -73,7 +73,7 @@ $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); /
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
-if (empty($reshook)){
+if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 }
 

From 209fe70da0a2bb78e9a4c15224fde479ac08b84f Mon Sep 17 00:00:00 2001
From: fr69400 <82267780+fr69400@users.noreply.github.com>
Date: Sun, 11 Jul 2021 09:53:13 +0200
Subject: [PATCH 1163/1497] Update note.php

---
 htdocs/projet/tasks/note.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/projet/tasks/note.php b/htdocs/projet/tasks/note.php
index 2c1f4732925..618cc75115b 100644
--- a/htdocs/projet/tasks/note.php
+++ b/htdocs/projet/tasks/note.php
@@ -93,11 +93,12 @@ $permissionnote = ($user->rights->projet->creer || $user->rights->projet->all->c
  */
 
 $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0)
+if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-
-if (empty($reshook))
+}
+if (empty($reshook)){
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
+}
 
 
 /*

From b227a85d31a656778c4edb902dff7d32c594c2f8 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Sun, 11 Jul 2021 07:53:28 +0000
Subject: [PATCH 1164/1497] Fixing style errors.

---
 htdocs/projet/tasks/note.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/projet/tasks/note.php b/htdocs/projet/tasks/note.php
index 618cc75115b..f1fc0c31524 100644
--- a/htdocs/projet/tasks/note.php
+++ b/htdocs/projet/tasks/note.php
@@ -96,7 +96,7 @@ $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); /
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
-if (empty($reshook)){
+if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 }
 

From f3ebbbbbc009e9aff1d07deb2e8ce9c425cfb015 Mon Sep 17 00:00:00 2001
From: fr69400 <82267780+fr69400@users.noreply.github.com>
Date: Sun, 11 Jul 2021 09:53:38 +0200
Subject: [PATCH 1165/1497] Update note.php

---
 htdocs/reception/note.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/reception/note.php b/htdocs/reception/note.php
index d9962a9ef18..10124a8361b 100644
--- a/htdocs/reception/note.php
+++ b/htdocs/reception/note.php
@@ -93,11 +93,12 @@ if ($origin == 'reception') {
  */
 
 $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0)
+if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-
-if (empty($reshook))
+}
+if (empty($reshook)){
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
+}
 
 
 /*

From e617f9ca389c8e582daa439d8721e252ef5de1ea Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Sun, 11 Jul 2021 07:53:53 +0000
Subject: [PATCH 1166/1497] Fixing style errors.

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

diff --git a/htdocs/reception/note.php b/htdocs/reception/note.php
index 10124a8361b..2c1eb55d7b3 100644
--- a/htdocs/reception/note.php
+++ b/htdocs/reception/note.php
@@ -96,7 +96,7 @@ $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); /
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
-if (empty($reshook)){
+if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 }
 

From d35719b939c59eb948eea1ef63120194af464166 Mon Sep 17 00:00:00 2001
From: fr69400 <82267780+fr69400@users.noreply.github.com>
Date: Sun, 11 Jul 2021 09:53:57 +0200
Subject: [PATCH 1167/1497] Update recruitmentcandidature_note.php

---
 htdocs/recruitment/recruitmentcandidature_note.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/recruitment/recruitmentcandidature_note.php b/htdocs/recruitment/recruitmentcandidature_note.php
index c0d71fcd777..478c7f479cf 100644
--- a/htdocs/recruitment/recruitmentcandidature_note.php
+++ b/htdocs/recruitment/recruitmentcandidature_note.php
@@ -95,11 +95,12 @@ $result = restrictedArea($user, 'recruitment', $object->id, 'recruitment_recruit
  */
 
 $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0)
+if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-
-if (empty($reshook))
+}
+if (empty($reshook)){
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
+}
 
 
 /*

From 8bf504d7f39b74a58fd7b291cbf84f58e793e846 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Sun, 11 Jul 2021 07:54:10 +0000
Subject: [PATCH 1168/1497] Fixing style errors.

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

diff --git a/htdocs/recruitment/recruitmentcandidature_note.php b/htdocs/recruitment/recruitmentcandidature_note.php
index 478c7f479cf..19808ca1b59 100644
--- a/htdocs/recruitment/recruitmentcandidature_note.php
+++ b/htdocs/recruitment/recruitmentcandidature_note.php
@@ -98,7 +98,7 @@ $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); /
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
-if (empty($reshook)){
+if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 }
 

From 7e4cf44ed382a6b70a7b9e9e89c8d79fe3fd254f Mon Sep 17 00:00:00 2001
From: fr69400 <82267780+fr69400@users.noreply.github.com>
Date: Sun, 11 Jul 2021 09:54:13 +0200
Subject: [PATCH 1169/1497] Update note.php

---
 htdocs/resource/note.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/resource/note.php b/htdocs/resource/note.php
index 01e020a8617..99b298e5db2 100644
--- a/htdocs/resource/note.php
+++ b/htdocs/resource/note.php
@@ -56,11 +56,12 @@ $permissionnote = $user->rights->resource->write; // Used by the include of acti
  */
 
 $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0)
+if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-
-if (empty($reshook))
+}
+if (empty($reshook)){
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
+}
 
 
 /*

From b5606e31810c07353e6e2f8d9905d54f995ddb8f Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Sun, 11 Jul 2021 07:54:28 +0000
Subject: [PATCH 1170/1497] Fixing style errors.

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

diff --git a/htdocs/resource/note.php b/htdocs/resource/note.php
index 99b298e5db2..b43c9f8cb37 100644
--- a/htdocs/resource/note.php
+++ b/htdocs/resource/note.php
@@ -59,7 +59,7 @@ $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); /
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
-if (empty($reshook)){
+if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 }
 

From d5c8243a121677e1cd0a32f7ef464a9882b9e752 Mon Sep 17 00:00:00 2001
From: fr69400 <82267780+fr69400@users.noreply.github.com>
Date: Sun, 11 Jul 2021 09:54:35 +0200
Subject: [PATCH 1171/1497] Update note.php

---
 htdocs/societe/note.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/htdocs/societe/note.php b/htdocs/societe/note.php
index 3f07987290f..1b5dcb93349 100644
--- a/htdocs/societe/note.php
+++ b/htdocs/societe/note.php
@@ -57,13 +57,12 @@ $result = restrictedArea($user, 'societe', $object->id, '&societe');
  * Actions
  */
 $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0)
+if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-
-if (empty($reshook))
-	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once
-
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once
+}
+if (empty($reshook)){
+	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
+}
 
 
 /*

From 8d75d37cad5776b08b99ea2d619189dc4281ad8c Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Sun, 11 Jul 2021 07:54:50 +0000
Subject: [PATCH 1172/1497] Fixing style errors.

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

diff --git a/htdocs/societe/note.php b/htdocs/societe/note.php
index 1b5dcb93349..c896d4df70a 100644
--- a/htdocs/societe/note.php
+++ b/htdocs/societe/note.php
@@ -60,7 +60,7 @@ $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); /
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
-if (empty($reshook)){
+if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 }
 

From 931d939d74758941660fab3676120ff675fca122 Mon Sep 17 00:00:00 2001
From: fr69400 <82267780+fr69400@users.noreply.github.com>
Date: Sun, 11 Jul 2021 09:55:18 +0200
Subject: [PATCH 1173/1497] Update note.php

---
 htdocs/supplier_proposal/note.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/supplier_proposal/note.php b/htdocs/supplier_proposal/note.php
index dcd529a951f..ce13a4f078a 100644
--- a/htdocs/supplier_proposal/note.php
+++ b/htdocs/supplier_proposal/note.php
@@ -61,11 +61,12 @@ $object = new SupplierProposal($db);
 $permissionnote = $user->rights->supplier_proposal->creer; // Used by the include of actions_setnotes.inc.php
 
 $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0)
+if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-
-if (empty($reshook))
+}
+if (empty($reshook)){
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
+}
 
 
 /*

From e43da11ac8d244f2b9e0119efd368cc4ae0f3d0b Mon Sep 17 00:00:00 2001
From: fr69400 <82267780+fr69400@users.noreply.github.com>
Date: Sun, 11 Jul 2021 09:55:33 +0200
Subject: [PATCH 1174/1497] Update workstation_note.php

---
 htdocs/workstation/workstation_note.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/workstation/workstation_note.php b/htdocs/workstation/workstation_note.php
index 2f96263f54f..cd5a75ce896 100755
--- a/htdocs/workstation/workstation_note.php
+++ b/htdocs/workstation/workstation_note.php
@@ -69,11 +69,12 @@ restrictedArea($user, $object->element, $object->id, $object->table_element, 'wo
  * Actions
  */
 $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0)
+if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-
-if (empty($reshook))
+}
+if (empty($reshook)){
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
+}
 
 
 /*

From 9ec1e7d50e9cf5e4f1a19fbeaba27c407b78c50a Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Sun, 11 Jul 2021 07:55:48 +0000
Subject: [PATCH 1175/1497] Fixing style errors.

---
 htdocs/supplier_proposal/note.php       | 2 +-
 htdocs/workstation/workstation_note.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/supplier_proposal/note.php b/htdocs/supplier_proposal/note.php
index ce13a4f078a..c4ab85e8e20 100644
--- a/htdocs/supplier_proposal/note.php
+++ b/htdocs/supplier_proposal/note.php
@@ -64,7 +64,7 @@ $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); /
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
-if (empty($reshook)){
+if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 }
 
diff --git a/htdocs/workstation/workstation_note.php b/htdocs/workstation/workstation_note.php
index cd5a75ce896..7e1b765bf82 100755
--- a/htdocs/workstation/workstation_note.php
+++ b/htdocs/workstation/workstation_note.php
@@ -72,7 +72,7 @@ $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); /
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
-if (empty($reshook)){
+if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 }
 

From 4d12c6eff66adc7e49e47205bf73949408192061 Mon Sep 17 00:00:00 2001
From: fr69400 <82267780+fr69400@users.noreply.github.com>
Date: Sun, 11 Jul 2021 09:57:04 +0200
Subject: [PATCH 1176/1497] Update recruitmentjobposition_note.php

---
 htdocs/recruitment/recruitmentjobposition_note.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/recruitment/recruitmentjobposition_note.php b/htdocs/recruitment/recruitmentjobposition_note.php
index 519419cb297..4da4e6a160c 100644
--- a/htdocs/recruitment/recruitmentjobposition_note.php
+++ b/htdocs/recruitment/recruitmentjobposition_note.php
@@ -100,11 +100,12 @@ $result = restrictedArea($user, 'recruitment', $object->id, 'recruitment_recruit
  */
 
 $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0)
+if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-
-if (empty($reshook))
+}
+if (empty($reshook)){
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
+}
 
 
 /*

From 986e86e6aeaeb390adbde492821a26223cca7b3b Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Sun, 11 Jul 2021 07:57:19 +0000
Subject: [PATCH 1177/1497] Fixing style errors.

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

diff --git a/htdocs/recruitment/recruitmentjobposition_note.php b/htdocs/recruitment/recruitmentjobposition_note.php
index 4da4e6a160c..dc7cdaef4ae 100644
--- a/htdocs/recruitment/recruitmentjobposition_note.php
+++ b/htdocs/recruitment/recruitmentjobposition_note.php
@@ -103,7 +103,7 @@ $reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); /
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
-if (empty($reshook)){
+if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 }
 

From 802ac58f9a604a982c058e96d7e09e9f04ce6b22 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 11 Jul 2021 18:56:15 +0200
Subject: [PATCH 1178/1497] Clean v14

---
 dev/initdemo/mysqldump_dolibarr_14.0.0.sql    | 774 ------------------
 htdocs/admin/system/database-tables.php       |  25 +-
 .../install/mysql/migration/13.0.0-14.0.0.sql |  14 +
 ...ql => llx_ecm_directories_extrafields.sql} |   0
 htdocs/install/upgrade2.php                   |  13 -
 5 files changed, 38 insertions(+), 788 deletions(-)
 rename htdocs/install/mysql/tables/{llx_ecm_directories_extrafileds.sql => llx_ecm_directories_extrafields.sql} (100%)

diff --git a/dev/initdemo/mysqldump_dolibarr_14.0.0.sql b/dev/initdemo/mysqldump_dolibarr_14.0.0.sql
index 60a951dc679..e80da182309 100644
--- a/dev/initdemo/mysqldump_dolibarr_14.0.0.sql
+++ b/dev/initdemo/mysqldump_dolibarr_14.0.0.sql
@@ -6215,55 +6215,6 @@ LOCK TABLES `llx_establishment` WRITE;
 /*!40000 ALTER TABLE `llx_establishment` ENABLE KEYS */;
 UNLOCK TABLES;
 
---
--- Table structure for table `llx_etapescandidature`
---
-
-DROP TABLE IF EXISTS `llx_etapescandidature`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_etapescandidature` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `label` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
-  `color` varchar(10) CHARACTER SET utf8mb4 DEFAULT NULL,
-  PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_etapescandidature`
---
-
-LOCK TABLES `llx_etapescandidature` WRITE;
-/*!40000 ALTER TABLE `llx_etapescandidature` DISABLE KEYS */;
-INSERT INTO `llx_etapescandidature` VALUES (1,'Qualification_initiale','#DBE270'),(2,'Premier_entretien','#F59A9A'),(3,'Second_entretien','#62B0F7'),(4,'Proposition_contrat','#FFB164'),(5,'Contrat_signe','#59D859');
-/*!40000 ALTER TABLE `llx_etapescandidature` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `llx_etiquettes`
---
-
-DROP TABLE IF EXISTS `llx_etiquettes`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_etiquettes` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `label` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
-  `color` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
-  PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_etiquettes`
---
-
-LOCK TABLES `llx_etiquettes` WRITE;
-/*!40000 ALTER TABLE `llx_etiquettes` DISABLE KEYS */;
-/*!40000 ALTER TABLE `llx_etiquettes` ENABLE KEYS */;
-UNLOCK TABLES;
-
 --
 -- Table structure for table `llx_event_element`
 --
@@ -9781,41 +9732,6 @@ LOCK TABLES `llx_payment_vat` WRITE;
 /*!40000 ALTER TABLE `llx_payment_vat` ENABLE KEYS */;
 UNLOCK TABLES;
 
---
--- Table structure for table `llx_pointage`
---
-
-DROP TABLE IF EXISTS `llx_pointage`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_pointage` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `fk_user` int(11) DEFAULT NULL,
-  `datedeb` datetime DEFAULT NULL,
-  `datefin` datetime DEFAULT NULL,
-  `commentaire_in` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `commentaire_out` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `statut` int(11) DEFAULT NULL,
-  `fk_user_modify_by` int(11) NOT NULL DEFAULT 0,
-  `datemodif` datetime DEFAULT NULL,
-  `ip_deb` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `ip_fin` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `created` datetime DEFAULT NULL,
-  `fk_user_created_by` int(11) NOT NULL DEFAULT 0,
-  PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_pointage`
---
-
-LOCK TABLES `llx_pointage` WRITE;
-/*!40000 ALTER TABLE `llx_pointage` DISABLE KEYS */;
-INSERT INTO `llx_pointage` VALUES (1,12,'2019-06-19 11:51:00','2019-06-19 11:51:00','','',2,0,NULL,'127.0.0.1','127.0.0.1','2019-06-19 11:51:00',0);
-/*!40000 ALTER TABLE `llx_pointage` ENABLE KEYS */;
-UNLOCK TABLES;
-
 --
 -- Table structure for table `llx_pos_cash_fence`
 --
@@ -10029,112 +9945,6 @@ LOCK TABLES `llx_prelevement_rejet` WRITE;
 /*!40000 ALTER TABLE `llx_prelevement_rejet` ENABLE KEYS */;
 UNLOCK TABLES;
 
---
--- Table structure for table `llx_prestashopget_myobject`
---
-
-DROP TABLE IF EXISTS `llx_prestashopget_myobject`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_prestashopget_myobject` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `entity` int(11) NOT NULL DEFAULT 1,
-  `label` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `qty` int(11) DEFAULT NULL,
-  `status` int(11) DEFAULT NULL,
-  `date_creation` datetime NOT NULL,
-  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
-  PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_prestashopget_myobject`
---
-
-LOCK TABLES `llx_prestashopget_myobject` WRITE;
-/*!40000 ALTER TABLE `llx_prestashopget_myobject` DISABLE KEYS */;
-/*!40000 ALTER TABLE `llx_prestashopget_myobject` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `llx_prestashopget_myobject_extrafields`
---
-
-DROP TABLE IF EXISTS `llx_prestashopget_myobject_extrafields`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_prestashopget_myobject_extrafields` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `fk_object` int(11) NOT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
-  PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_prestashopget_myobject_extrafields`
---
-
-LOCK TABLES `llx_prestashopget_myobject_extrafields` WRITE;
-/*!40000 ALTER TABLE `llx_prestashopget_myobject_extrafields` DISABLE KEYS */;
-/*!40000 ALTER TABLE `llx_prestashopget_myobject_extrafields` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `llx_printer_receipt`
---
-
-DROP TABLE IF EXISTS `llx_printer_receipt`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_printer_receipt` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `name` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `fk_type` int(11) DEFAULT NULL,
-  `fk_profile` int(11) DEFAULT NULL,
-  `parameter` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `entity` int(11) DEFAULT NULL,
-  PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_printer_receipt`
---
-
-LOCK TABLES `llx_printer_receipt` WRITE;
-/*!40000 ALTER TABLE `llx_printer_receipt` DISABLE KEYS */;
-/*!40000 ALTER TABLE `llx_printer_receipt` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `llx_printer_receipt_template`
---
-
-DROP TABLE IF EXISTS `llx_printer_receipt_template`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_printer_receipt_template` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `name` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `template` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `entity` int(11) DEFAULT NULL,
-  PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_printer_receipt_template`
---
-
-LOCK TABLES `llx_printer_receipt_template` WRITE;
-/*!40000 ALTER TABLE `llx_printer_receipt_template` DISABLE KEYS */;
-/*!40000 ALTER TABLE `llx_printer_receipt_template` ENABLE KEYS */;
-UNLOCK TABLES;
-
 --
 -- Table structure for table `llx_printing`
 --
@@ -10656,36 +10466,6 @@ LOCK TABLES `llx_product_extrafields` WRITE;
 /*!40000 ALTER TABLE `llx_product_extrafields` ENABLE KEYS */;
 UNLOCK TABLES;
 
---
--- Table structure for table `llx_product_factory`
---
-
-DROP TABLE IF EXISTS `llx_product_factory`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_product_factory` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `fk_product_father` int(11) NOT NULL DEFAULT 0,
-  `fk_product_children` int(11) NOT NULL DEFAULT 0,
-  `pmp` double(24,8) DEFAULT 0.00000000,
-  `price` double(24,8) DEFAULT 0.00000000,
-  `qty` double DEFAULT NULL,
-  PRIMARY KEY (`rowid`),
-  UNIQUE KEY `uk_product_factory` (`fk_product_father`,`fk_product_children`),
-  KEY `idx_product_factory_fils` (`fk_product_children`)
-) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_product_factory`
---
-
-LOCK TABLES `llx_product_factory` WRITE;
-/*!40000 ALTER TABLE `llx_product_factory` DISABLE KEYS */;
-INSERT INTO `llx_product_factory` VALUES (2,26,25,0.00000000,0.00000000,3),(3,27,26,0.00000000,0.00000000,2);
-/*!40000 ALTER TABLE `llx_product_factory` ENABLE KEYS */;
-UNLOCK TABLES;
-
 --
 -- Table structure for table `llx_product_fournisseur_price`
 --
@@ -11092,59 +10872,6 @@ INSERT INTO `llx_product_stock` VALUES (1,'2012-07-08 22:43:51',2,2,1000,NULL),(
 /*!40000 ALTER TABLE `llx_product_stock` ENABLE KEYS */;
 UNLOCK TABLES;
 
---
--- Table structure for table `llx_product_subproduct`
---
-
-DROP TABLE IF EXISTS `llx_product_subproduct`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_product_subproduct` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `fk_product` int(11) NOT NULL,
-  `fk_product_subproduct` int(11) NOT NULL,
-  PRIMARY KEY (`rowid`),
-  UNIQUE KEY `fk_product` (`fk_product`,`fk_product_subproduct`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_product_subproduct`
---
-
-LOCK TABLES `llx_product_subproduct` WRITE;
-/*!40000 ALTER TABLE `llx_product_subproduct` DISABLE KEYS */;
-/*!40000 ALTER TABLE `llx_product_subproduct` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `llx_product_warehouse_properties`
---
-
-DROP TABLE IF EXISTS `llx_product_warehouse_properties`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_product_warehouse_properties` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `fk_product` int(11) NOT NULL,
-  `fk_entrepot` int(11) NOT NULL,
-  `seuil_stock_alerte` float DEFAULT NULL,
-  `desiredstock` float DEFAULT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
-  PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_product_warehouse_properties`
---
-
-LOCK TABLES `llx_product_warehouse_properties` WRITE;
-/*!40000 ALTER TABLE `llx_product_warehouse_properties` DISABLE KEYS */;
-/*!40000 ALTER TABLE `llx_product_warehouse_properties` ENABLE KEYS */;
-UNLOCK TABLES;
-
 --
 -- Table structure for table `llx_projet`
 --
@@ -11351,65 +11078,6 @@ INSERT INTO `llx_projet_task_time` VALUES (2,4,'2016-12-21','2016-12-21 12:00:00
 /*!40000 ALTER TABLE `llx_projet_task_time` ENABLE KEYS */;
 UNLOCK TABLES;
 
---
--- Table structure for table `llx_projet_taskdet`
---
-
-DROP TABLE IF EXISTS `llx_projet_taskdet`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_projet_taskdet` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `fk_task` int(11) NOT NULL DEFAULT 0,
-  `fk_product` int(11) NOT NULL DEFAULT 0,
-  `qty_planned` double DEFAULT NULL,
-  `qty_used` double DEFAULT NULL,
-  `qty_deleted` double DEFAULT NULL,
-  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `pmp` double(24,8) DEFAULT 0.00000000,
-  `price` double(24,8) DEFAULT 0.00000000,
-  `fk_statut` int(11) NOT NULL DEFAULT 0,
-  `note_public` mediumtext COLLATE utf8_unicode_ci DEFAULT NULL,
-  PRIMARY KEY (`rowid`),
-  UNIQUE KEY `uk_projet_taskdet` (`fk_task`,`fk_product`),
-  KEY `idx_projet_taskdet_fk_task` (`fk_task`),
-  KEY `idx_projet_taskdet_fk_product` (`fk_product`),
-  CONSTRAINT `fk_projet_taskdet_fk_task` FOREIGN KEY (`fk_task`) REFERENCES `llx_projet_task` (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_projet_taskdet`
---
-
-LOCK TABLES `llx_projet_taskdet` WRITE;
-/*!40000 ALTER TABLE `llx_projet_taskdet` DISABLE KEYS */;
-/*!40000 ALTER TABLE `llx_projet_taskdet` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `llx_projet_taskdet_equipement`
---
-
-DROP TABLE IF EXISTS `llx_projet_taskdet_equipement`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_projet_taskdet_equipement` (
-  `fk_equipement` int(11) NOT NULL DEFAULT 0,
-  `fk_projet_taskdet` int(11) NOT NULL DEFAULT 0,
-  UNIQUE KEY `uk_factory_equipement` (`fk_equipement`,`fk_projet_taskdet`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_projet_taskdet_equipement`
---
-
-LOCK TABLES `llx_projet_taskdet_equipement` WRITE;
-/*!40000 ALTER TABLE `llx_projet_taskdet_equipement` DISABLE KEYS */;
-/*!40000 ALTER TABLE `llx_projet_taskdet_equipement` ENABLE KEYS */;
-UNLOCK TABLES;
-
 --
 -- Table structure for table `llx_propal`
 --
@@ -12387,34 +12055,6 @@ INSERT INTO `llx_societe_extrafields` VALUES (75,'2018-01-22 16:40:03',10,NULL,N
 /*!40000 ALTER TABLE `llx_societe_extrafields` ENABLE KEYS */;
 UNLOCK TABLES;
 
---
--- Table structure for table `llx_societe_log`
---
-
-DROP TABLE IF EXISTS `llx_societe_log`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_societe_log` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `datel` datetime DEFAULT NULL,
-  `fk_soc` int(11) DEFAULT NULL,
-  `fk_statut` int(11) DEFAULT NULL,
-  `fk_user` int(11) DEFAULT NULL,
-  `author` varchar(30) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `label` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_societe_log`
---
-
-LOCK TABLES `llx_societe_log` WRITE;
-/*!40000 ALTER TABLE `llx_societe_log` DISABLE KEYS */;
-/*!40000 ALTER TABLE `llx_societe_log` ENABLE KEYS */;
-UNLOCK TABLES;
-
 --
 -- Table structure for table `llx_societe_perentity`
 --
@@ -12749,38 +12389,6 @@ LOCK TABLES `llx_socpeople_extrafields` WRITE;
 /*!40000 ALTER TABLE `llx_socpeople_extrafields` ENABLE KEYS */;
 UNLOCK TABLES;
 
---
--- Table structure for table `llx_stock_lotserial`
---
-
-DROP TABLE IF EXISTS `llx_stock_lotserial`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_stock_lotserial` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `entity` int(11) DEFAULT NULL,
-  `fk_product` int(11) NOT NULL,
-  `batch` varchar(30) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `eatby` date DEFAULT NULL,
-  `sellby` date DEFAULT NULL,
-  `datec` datetime DEFAULT NULL,
-  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `fk_user_creat` int(11) DEFAULT NULL,
-  `fk_user_modif` int(11) DEFAULT NULL,
-  `import_key` int(11) DEFAULT NULL,
-  PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_stock_lotserial`
---
-
-LOCK TABLES `llx_stock_lotserial` WRITE;
-/*!40000 ALTER TABLE `llx_stock_lotserial` DISABLE KEYS */;
-/*!40000 ALTER TABLE `llx_stock_lotserial` ENABLE KEYS */;
-UNLOCK TABLES;
-
 --
 -- Table structure for table `llx_stock_mouvement`
 --
@@ -13506,34 +13114,6 @@ INSERT INTO `llx_user_rights` VALUES (12402,1,1,11),(12380,1,1,12),(12385,1,1,13
 /*!40000 ALTER TABLE `llx_user_rights` ENABLE KEYS */;
 UNLOCK TABLES;
 
---
--- Table structure for table `llx_user_twofactorauth_webauthn`
---
-
-DROP TABLE IF EXISTS `llx_user_twofactorauth_webauthn`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_user_twofactorauth_webauthn` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `fk_user` int(11) NOT NULL,
-  `label` varchar(64) CHARACTER SET utf8mb4 NOT NULL,
-  `webauthnkey` text CHARACTER SET utf8mb4 NOT NULL,
-  `active` tinyint(4) NOT NULL DEFAULT 0,
-  PRIMARY KEY (`rowid`),
-  UNIQUE KEY `idx_tfa_label_fk_user` (`fk_user`,`label`),
-  CONSTRAINT `fk_tfa_fk_user` FOREIGN KEY (`fk_user`) REFERENCES `llx_user` (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_user_twofactorauth_webauthn`
---
-
-LOCK TABLES `llx_user_twofactorauth_webauthn` WRITE;
-/*!40000 ALTER TABLE `llx_user_twofactorauth_webauthn` DISABLE KEYS */;
-/*!40000 ALTER TABLE `llx_user_twofactorauth_webauthn` ENABLE KEYS */;
-UNLOCK TABLES;
-
 --
 -- Table structure for table `llx_usergroup`
 --
@@ -13947,181 +13527,6 @@ INSERT INTO `llx_website_page` VALUES (1,5,'blog','','Blog','Blog','blog','<div
 /*!40000 ALTER TABLE `llx_website_page` ENABLE KEYS */;
 UNLOCK TABLES;
 
---
--- Table structure for table `llx_websiteaccount`
---
-
-DROP TABLE IF EXISTS `llx_websiteaccount`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_websiteaccount` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `login` varchar(64) COLLATE utf8_unicode_ci NOT NULL,
-  `password` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `fk_soc` int(11) DEFAULT NULL,
-  `date_creation` datetime NOT NULL,
-  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `fk_user_creat` int(11) NOT NULL,
-  `fk_user_modif` int(11) DEFAULT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `status` int(11) DEFAULT NULL,
-  PRIMARY KEY (`rowid`),
-  KEY `idx_websiteaccount_rowid` (`rowid`),
-  KEY `idx_websiteaccount_login` (`login`),
-  KEY `idx_websiteaccount_fk_soc` (`fk_soc`),
-  KEY `idx_websiteaccount_import_key` (`import_key`),
-  KEY `idx_websiteaccount_status` (`status`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_websiteaccount`
---
-
-LOCK TABLES `llx_websiteaccount` WRITE;
-/*!40000 ALTER TABLE `llx_websiteaccount` DISABLE KEYS */;
-/*!40000 ALTER TABLE `llx_websiteaccount` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `llx_websiteaccount_extrafields`
---
-
-DROP TABLE IF EXISTS `llx_websiteaccount_extrafields`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_websiteaccount_extrafields` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `fk_object` int(11) NOT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
-  PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_websiteaccount_extrafields`
---
-
-LOCK TABLES `llx_websiteaccount_extrafields` WRITE;
-/*!40000 ALTER TABLE `llx_websiteaccount_extrafields` DISABLE KEYS */;
-/*!40000 ALTER TABLE `llx_websiteaccount_extrafields` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `llx_workstation`
---
-
-DROP TABLE IF EXISTS `llx_workstation`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_workstation` (
-  `rowid` int(11) NOT NULL DEFAULT 0,
-  `date_cre` datetime DEFAULT NULL,
-  `date_maj` datetime DEFAULT NULL,
-  `entity` int(11) NOT NULL DEFAULT 0,
-  `fk_usergroup` int(11) NOT NULL DEFAULT 0,
-  `name` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `background` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `type` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `code` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `nb_hour_prepare` double NOT NULL DEFAULT 0,
-  `nb_hour_manufacture` double NOT NULL DEFAULT 0,
-  `nb_hour_capacity` double NOT NULL DEFAULT 0,
-  `nb_ressource` double NOT NULL DEFAULT 0,
-  `thm` double NOT NULL DEFAULT 0,
-  `thm_machine` double NOT NULL DEFAULT 0,
-  `thm_overtime` double NOT NULL DEFAULT 0,
-  `thm_night` double NOT NULL DEFAULT 0,
-  `nb_hour_before` double NOT NULL DEFAULT 0,
-  `nb_hour_after` double NOT NULL DEFAULT 0,
-  `is_parallele` int(11) NOT NULL DEFAULT 0,
-  PRIMARY KEY (`rowid`),
-  KEY `date_cre` (`date_cre`),
-  KEY `date_maj` (`date_maj`),
-  KEY `entity` (`entity`),
-  KEY `fk_usergroup` (`fk_usergroup`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_workstation`
---
-
-LOCK TABLES `llx_workstation` WRITE;
-/*!40000 ALTER TABLE `llx_workstation` DISABLE KEYS */;
-INSERT INTO `llx_workstation` VALUES (1,'2018-11-18 17:50:22','2018-11-18 17:50:22',1,4,'aaaa','#','HUMAN','',0,0,0,0,0,0,0,0,0,0,0);
-/*!40000 ALTER TABLE `llx_workstation` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `llx_workstation_product`
---
-
-DROP TABLE IF EXISTS `llx_workstation_product`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_workstation_product` (
-  `rowid` int(11) NOT NULL DEFAULT 0,
-  `date_cre` datetime DEFAULT NULL,
-  `date_maj` datetime DEFAULT NULL,
-  `fk_product` int(11) NOT NULL DEFAULT 0,
-  `fk_workstation` int(11) NOT NULL DEFAULT 0,
-  `nb_hour` double NOT NULL DEFAULT 0,
-  `rang` double NOT NULL DEFAULT 0,
-  `nb_hour_prepare` double NOT NULL DEFAULT 0,
-  `nb_hour_manufacture` double NOT NULL DEFAULT 0,
-  PRIMARY KEY (`rowid`),
-  KEY `date_cre` (`date_cre`),
-  KEY `date_maj` (`date_maj`),
-  KEY `fk_product` (`fk_product`),
-  KEY `fk_workstation` (`fk_workstation`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_workstation_product`
---
-
-LOCK TABLES `llx_workstation_product` WRITE;
-/*!40000 ALTER TABLE `llx_workstation_product` DISABLE KEYS */;
-/*!40000 ALTER TABLE `llx_workstation_product` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `llx_workstation_schedule`
---
-
-DROP TABLE IF EXISTS `llx_workstation_schedule`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_workstation_schedule` (
-  `rowid` int(11) NOT NULL DEFAULT 0,
-  `date_cre` datetime DEFAULT NULL,
-  `date_maj` datetime DEFAULT NULL,
-  `fk_workstation` int(11) NOT NULL DEFAULT 0,
-  `day_moment` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `week_day` int(11) NOT NULL DEFAULT 0,
-  `nb_ressource` int(11) NOT NULL DEFAULT 0,
-  `date_off` datetime DEFAULT NULL,
-  `nb_hour_capacity` double NOT NULL DEFAULT 0,
-  PRIMARY KEY (`rowid`),
-  KEY `date_cre` (`date_cre`),
-  KEY `date_maj` (`date_maj`),
-  KEY `fk_workstation` (`fk_workstation`),
-  KEY `date_off` (`date_off`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_workstation_schedule`
---
-
-LOCK TABLES `llx_workstation_schedule` WRITE;
-/*!40000 ALTER TABLE `llx_workstation_schedule` DISABLE KEYS */;
-/*!40000 ALTER TABLE `llx_workstation_schedule` ENABLE KEYS */;
-UNLOCK TABLES;
-
 --
 -- Table structure for table `llx_workstation_workstation`
 --
@@ -14189,31 +13594,6 @@ LOCK TABLES `llx_workstation_workstation_resource` WRITE;
 /*!40000 ALTER TABLE `llx_workstation_workstation_resource` ENABLE KEYS */;
 UNLOCK TABLES;
 
---
--- Table structure for table `llx_workstation_workstation_usergroup`
---
-
-DROP TABLE IF EXISTS `llx_workstation_workstation_usergroup`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_workstation_workstation_usergroup` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `fk_usergroup` int(11) DEFAULT NULL,
-  `fk_workstation` int(11) DEFAULT NULL,
-  PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_workstation_workstation_usergroup`
---
-
-LOCK TABLES `llx_workstation_workstation_usergroup` WRITE;
-/*!40000 ALTER TABLE `llx_workstation_workstation_usergroup` DISABLE KEYS */;
-/*!40000 ALTER TABLE `llx_workstation_workstation_usergroup` ENABLE KEYS */;
-UNLOCK TABLES;
-
 --
 -- Table structure for table `llx_zapier_hook`
 --
@@ -14246,160 +13626,6 @@ LOCK TABLES `llx_zapier_hook` WRITE;
 /*!40000 ALTER TABLE `llx_zapier_hook` ENABLE KEYS */;
 UNLOCK TABLES;
 
---
--- Table structure for table `llx_zapier_hook_extrafields`
---
-
-DROP TABLE IF EXISTS `llx_zapier_hook_extrafields`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_zapier_hook_extrafields` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `fk_object` int(11) NOT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
-  PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_zapier_hook_extrafields`
---
-
-LOCK TABLES `llx_zapier_hook_extrafields` WRITE;
-/*!40000 ALTER TABLE `llx_zapier_hook_extrafields` DISABLE KEYS */;
-/*!40000 ALTER TABLE `llx_zapier_hook_extrafields` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `tmp_links`
---
-
-DROP TABLE IF EXISTS `tmp_links`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `tmp_links` (
-  `objectid` int(11) NOT NULL,
-  `label` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
-  `max_rowid` int(11) DEFAULT NULL,
-  `count_rowid` bigint(21) NOT NULL DEFAULT 0
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `tmp_links`
---
-
-LOCK TABLES `tmp_links` WRITE;
-/*!40000 ALTER TABLE `tmp_links` DISABLE KEYS */;
-INSERT INTO `tmp_links` VALUES (3,'fdf',6,2);
-/*!40000 ALTER TABLE `tmp_links` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `tmp_user`
---
-
-DROP TABLE IF EXISTS `tmp_user`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `tmp_user` (
-  `rowid` int(11) NOT NULL DEFAULT 0,
-  `datec` datetime DEFAULT NULL,
-  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `fk_user_creat` int(11) DEFAULT NULL,
-  `fk_user_modif` int(11) DEFAULT NULL,
-  `login` varchar(50) COLLATE utf8_unicode_ci NOT NULL,
-  `entity` int(11) NOT NULL DEFAULT 1,
-  `civility` varchar(6) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `ref_ext` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `ref_int` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `employee` smallint(6) DEFAULT 1,
-  `fk_establishment` int(11) DEFAULT 0,
-  `pass` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `pass_crypted` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `pass_temp` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `api_key` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `lastname` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `firstname` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `job` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `skype` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `office_phone` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `office_fax` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `user_mobile` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `personal_mobile` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `email` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `personal_email` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `socialnetworks` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `signature` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `admin` smallint(6) DEFAULT 0,
-  `webcal_login` varchar(25) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `module_comm` smallint(6) DEFAULT 1,
-  `module_compta` smallint(6) DEFAULT 1,
-  `fk_soc` int(11) DEFAULT NULL,
-  `fk_socpeople` int(11) DEFAULT NULL,
-  `fk_member` int(11) DEFAULT NULL,
-  `note` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `datelastlogin` datetime DEFAULT NULL,
-  `datepreviouslogin` datetime DEFAULT NULL,
-  `egroupware_id` int(11) DEFAULT NULL,
-  `ldap_sid` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `statut` tinyint(4) DEFAULT 1,
-  `photo` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `lang` varchar(6) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `openid` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `fk_user` int(11) DEFAULT NULL,
-  `fk_user_expense_validator` int(11) DEFAULT NULL,
-  `fk_user_holiday_validator` int(11) DEFAULT NULL,
-  `thm` double(24,8) DEFAULT NULL,
-  `address` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `zip` varchar(25) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `town` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `fk_state` int(11) DEFAULT 0,
-  `fk_country` int(11) DEFAULT 0,
-  `color` varchar(6) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `accountancy_code` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `barcode` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `fk_barcode_type` int(11) DEFAULT 0,
-  `nb_holiday` int(11) DEFAULT 0,
-  `salary` double(24,8) DEFAULT NULL,
-  `tjm` double(24,8) DEFAULT NULL,
-  `salaryextra` double(24,8) DEFAULT NULL,
-  `weeklyhours` double(16,8) DEFAULT NULL,
-  `gender` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note_public` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `dateemployment` datetime DEFAULT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `model_pdf` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `birth` date DEFAULT NULL,
-  `pass_encoding` varchar(24) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `default_range` int(11) DEFAULT NULL,
-  `default_c_exp_tax_cat` int(11) DEFAULT NULL,
-  `dateemploymentend` date DEFAULT NULL,
-  `twitter` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `facebook` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `instagram` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `snapchat` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `googleplus` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `youtube` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `whatsapp` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `linkedin` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `fk_warehouse` int(11) DEFAULT NULL,
-  `iplastlogin` varchar(250) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `ippreviouslogin` varchar(250) COLLATE utf8_unicode_ci DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `tmp_user`
---
-
-LOCK TABLES `tmp_user` WRITE;
-/*!40000 ALTER TABLE `tmp_user` DISABLE KEYS */;
-INSERT INTO `tmp_user` VALUES (1,'2012-07-08 13:20:11','2019-11-28 11:52:58',NULL,NULL,'aeinstein',0,NULL,NULL,NULL,1,0,NULL,'11c9c772d6471aa24c27274bdd8a223b',NULL,NULL,'Einstein','Albert','',NULL,'123456789','','','','aeinstein@example.com','','[]','',0,'',1,1,NULL,NULL,NULL,'','2017-10-05 08:32:44','2017-10-03 11:43:50',NULL,'',1,'alberteinstein.jpg',NULL,NULL,14,NULL,NULL,NULL,'','','',NULL,NULL,'aaaaff','',NULL,0,0,NULL,NULL,NULL,44.00000000,'man',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL),(2,'2012-07-08 13:54:48','2019-11-28 11:52:58',NULL,NULL,'demo',1,NULL,NULL,NULL,1,0,NULL,'fe01ce2a7fbac8fafaed7c982a04e229',NULL,NULL,'Doe','David','Trainee',NULL,'09123123','','','','daviddoe@example.com','','[]','',0,'',1,1,NULL,NULL,NULL,'','2018-07-30 23:10:54','2018-07-30 23:04:17',NULL,'',1,'person9.jpeg',NULL,NULL,11,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,35.00000000,'man',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL),(3,'2012-07-11 16:18:59','2020-01-21 09:30:27',NULL,NULL,'pcurie',1,NULL,NULL,NULL,1,0,NULL,'ab335b4eb4c3c99334f656e5db9584c9',NULL,NULL,'Curie','Pierre','',NULL,'','','','','pcurie@example.com','','[]','',0,'',1,1,NULL,NULL,2,'','2014-12-21 17:38:55',NULL,NULL,'',1,'pierrecurie.jpg',NULL,NULL,14,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,39.00000000,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL),(4,'2015-01-23 17:52:27','2019-11-28 11:52:58',NULL,NULL,'bbookkeeper',1,NULL,NULL,NULL,1,0,NULL,'a7d30b58d647fcf59b7163f9592b1dbb',NULL,NULL,'Bookkeeper','Bob','Bookkeeper',NULL,'','','','','bbookkeeper@example.com','','{\"skype\":\"skypebbookkeeper\"}','',0,'',1,1,17,6,NULL,'','2015-02-25 10:18:41','2015-01-23 17:53:20',NULL,'',1,'person8.jpeg',NULL,NULL,11,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,16.00000000,'man',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL),(10,'2017-10-03 11:47:41','2019-11-28 11:52:58',NULL,NULL,'mcurie',1,NULL,NULL,NULL,1,0,NULL,'52cda011808bb282d1d3625ab607a145',NULL,'t3mnkbhs','Curie','Marie','',NULL,'','','','','mcurie@example.com','','[]','',0,NULL,1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,'mariecurie.jpg',NULL,NULL,14,NULL,NULL,NULL,'','','',NULL,NULL,'ffaaff','',NULL,0,0,NULL,NULL,NULL,44.00000000,'woman',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL),(11,'2017-10-05 09:07:52','2019-11-28 11:52:58',NULL,NULL,'zzeceo',1,NULL,NULL,NULL,1,0,NULL,'92af989c4c3a5140fb5d73eb77a52454',NULL,'cq78nf9m','Zeceo','Zack','President - CEO',NULL,'','','','','zzeceo@example.com','','[]','',0,NULL,1,1,NULL,NULL,NULL,'','2017-10-05 22:48:08','2017-10-05 21:18:46',NULL,'',1,'person4.jpeg',NULL,NULL,NULL,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,39.00000000,NULL,NULL,'2019-06-10 00:00:00',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL),(12,'2017-10-05 09:09:46','2020-01-07 13:47:17',NULL,NULL,'admin',0,NULL,NULL,NULL,1,0,NULL,'f6fdffe48c908deb0f4c3bd36c032e72',NULL,'nd6hgbcr','Adminson','Alice','Admin Technical',NULL,'','','','','aadminson@example.com','','[]','Alice - 123',1,NULL,1,1,NULL,NULL,NULL,'','2020-01-21 10:38:41','2020-01-21 10:35:27',NULL,'',1,'person6.jpeg',NULL,NULL,11,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,2700.00000000,NULL,NULL,39.00000000,'woman',NULL,NULL,NULL,'generic_user_odt','1985-09-15',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL),(13,'2017-10-05 21:29:35','2019-11-28 11:52:58',NULL,NULL,'ccommercy',1,NULL,NULL,NULL,1,0,NULL,'179858e041af35e8f4c81d68c55fe9da',NULL,'y451ksdv','Commercy','Coraly','Commercial leader',NULL,'','','','','ccommercy@example.com','','[]','',0,NULL,1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,'person7.jpeg',NULL,NULL,11,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,1890.00000000,NULL,NULL,25.00000000,'woman',NULL,'2018-09-11 00:00:00',NULL,NULL,'1998-12-08',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL),(14,'2017-10-05 21:33:33','2019-11-28 11:52:58',NULL,NULL,'sscientol',1,NULL,NULL,NULL,1,0,NULL,'39bee07ac42f31c98e79cdcd5e5fe4c5',NULL,'s2hp8bxd','Scientol','Sam','Scientist leader',NULL,'','','','','sscientol@example.com','','[]','',0,NULL,1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,'person3.jpeg',NULL,NULL,11,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,3500.00000000,NULL,NULL,39.00000000,NULL,NULL,'2018-07-03 00:00:00',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL),(16,'2017-10-05 22:47:52','2019-11-28 11:52:58',NULL,NULL,'ccommerson',1,NULL,NULL,NULL,1,0,NULL,'d68005ccf362b82d084551b6291792a3',NULL,'cx9y1dk0','Charle1','Commerson','Sale representative',NULL,'','','','','ccommerson@example.com','','[]','',0,NULL,1,1,NULL,NULL,NULL,'','2017-10-05 23:46:24','2017-10-05 23:37:31',NULL,'',1,'person1.jpeg',NULL,NULL,13,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,2900.00000000,NULL,NULL,39.00000000,NULL,NULL,'2019-09-01 00:00:00',NULL,NULL,'1976-02-05',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL),(17,'2017-10-05 22:48:39','2019-11-28 11:52:58',NULL,NULL,'aleerfok',1,NULL,NULL,NULL,1,0,NULL,'a964065211872fb76f876c6c3e952ea3',NULL,'gw8cb7xj','Leerfok','Amanda','Sale representative',NULL,'','','','','aleerfok@example.com','','[]','',0,NULL,1,1,NULL,NULL,NULL,'','2017-10-05 23:16:06',NULL,NULL,'',0,'person5.jpeg',NULL,NULL,13,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,39.00000000,'woman',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL),(18,'2018-01-22 17:27:02','2019-11-28 11:52:58',NULL,NULL,'ldestailleur',1,NULL,NULL,NULL,1,0,NULL,'1bb7805145a7a5066df9e6d585b8b645',NULL,'87g06wbx','Destailleur','Laurent','Project leader of Dolibarr ERP CRM',NULL,'','','','','ldestailleur@example.com','','[]','<div><strong>Laurent DESTAILLEUR</strong></div>\r\n\r\n<div>\r\n<div><span style=\"color:#606163; font-family:arial; font-size:medium\"><strong>Project Director</strong></span><br />\r\n<span style=\"color:#336699\"><span style=\"color:#993399; font-family:tahoma,new york,times,serif\"><span style=\"color:#336699\">ldestailleur@example.com</span></span></span></div>\r\n\r\n<div>&nbsp;</div>\r\n\r\n<div>\r\n<div><span style=\"color:#993399; font-family:arial,helvetica,sans-serif; font-size:small\"><span style=\"color:#336699\"><a href=\"http://www.facebook.com/teclib\" style=\"color: rgb(153, 51, 153); text-decoration: none; cursor: pointer;\" target=\"_blank\">Facebook</a></span>&nbsp;|&nbsp;<span style=\"color:#336699\"><a href=\"http://twitter.com/teclib\" style=\"color: rgb(153, 51, 153); text-decoration: none; cursor: pointer;\" target=\"_blank\">Twitter</a></span>&nbsp;|&nbsp;<span style=\"color:#336699\"><span style=\"color:#993399\"><a href=\"http://www.teclib.com/\" style=\"color: rgb(153, 51, 153); text-decoration: none; cursor: pointer;\" target=\"_blank\">www.teclib.com</a></span></span></span></div>\r\n</div>\r\n</div>',0,NULL,1,1,10,10,NULL,'More information on http://www.mydomain.com','2019-10-04 10:06:40','2017-09-06 11:55:30',NULL,'',1,'ldestailleur_200x200.jpg',NULL,NULL,NULL,NULL,NULL,NULL,'','','',NULL,NULL,'007f7f','',NULL,0,0,NULL,NULL,NULL,NULL,'man',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL),(19,'2017-02-02 03:55:44','2020-01-16 15:44:42',NULL,NULL,'aboston',1,NULL,NULL,NULL,1,0,NULL,'a7a77a5aff2d5fc2f75f2f61507c88d4',NULL,NULL,'Boston','Alex','',NULL,'','','','','aboston@example.com','','[]','<strong>Alex Boston</strong><br />\r\nAdmin support service - 555 01 02 03 04',0,NULL,1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',0,'person2.jpeg',NULL,NULL,12,NULL,NULL,25.00000000,'','','',NULL,NULL,'ff00ff','',NULL,0,0,2700.00000000,NULL,NULL,32.00000000,NULL,NULL,'2016-11-04 00:00:00',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL);
-/*!40000 ALTER TABLE `tmp_user` ENABLE KEYS */;
-UNLOCK TABLES;
-/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
 
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
 /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
diff --git a/htdocs/admin/system/database-tables.php b/htdocs/admin/system/database-tables.php
index 407b873ac59..7535500e799 100644
--- a/htdocs/admin/system/database-tables.php
+++ b/htdocs/admin/system/database-tables.php
@@ -25,6 +25,8 @@
  */
 
 require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 $langs->load("admin");
 
@@ -35,6 +37,10 @@ if (!$user->admin) {
 $action = GETPOST('action', 'aZ09');
 
 
+/*
+ * Actions
+ */
+
 if ($action == 'convert') {
 	$sql = "ALTER TABLE ".$db->escape(GETPOST("table", "aZ09"))." ENGINE=INNODB";
 	$db->query($sql);
@@ -82,6 +88,7 @@ if (!$base) {
 		print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder">';
 		print '<tr class="liste_titre">';
+		print '<td>#</td>';
 		print '<td>'.$langs->trans("TableName").'</td>';
 		print '<td colspan="2">'.$langs->trans("Type").'</td>';
 		print '<td>'.$langs->trans("Format").'</td>';
@@ -105,7 +112,18 @@ if (!$base) {
 				$obj = $db->fetch_object($resql);
 				print '<tr class="oddeven">';
 
-				print '<td><a href="dbtable.php?table='.$obj->Name.'">'.$obj->Name.'</a></td>';
+				print '<td>'.($i+1).'</td>';
+				print '<td><a href="dbtable.php?table='.$obj->Name.'">'.$obj->Name.'</a>';
+				$tablename = preg_replace('/^'.MAIN_DB_PREFIX.'/', 'llx_', $obj->Name);
+				if (dol_is_file(DOL_DOCUMENT_ROOT.'/install/mysql/tables/'.$tablename.'.sql')) {
+					$img = "info";
+					//print img_picto($langs->trans("ExternalModule"), $img);
+				} else {
+					$img = "info_black";
+					//print DOL_DOCUMENT_ROOT.'/install/mysql/tables/'.$tablename.'.sql';
+					print img_picto($langs->trans("ExternalModule"), $img, 'class="small"');
+				}
+				print '</td>';
 				print '<td>'.$obj->Engine.'</td>';
 				if (isset($obj->Engine) && $obj->Engine == "MyISAM") {
 					print '<td><a class="reposition" href="database-tables.php?action=convert&amp;table='.$obj->Name.'">'.$langs->trans("Convert").' InnoDb</a></td>';
@@ -142,6 +160,8 @@ if (!$base) {
 		print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder">';
 		print '<tr class="liste_titre">';
+
+		print '<td>#</td>';
 		print '<td>'.$langs->trans("TableName").'</td>';
 		print '<td>Nb of tuples</td>';
 		print '<td>Nb index fetcher.</td>';
@@ -160,6 +180,7 @@ if (!$base) {
 			while ($i < $num) {
 				$row = $db->fetch_row($resql);
 				print '<tr class="oddeven">';
+				print '<td>'.($i+1).'</td>';
 				print '<td>'.$row[0].'</td>';
 				print '<td class="right">'.$row[1].'</td>';
 				print '<td class="right">'.$row[2].'</td>';
@@ -179,6 +200,7 @@ if (!$base) {
 		print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder">';
 		print '<tr class="liste_titre">';
+		print '<td>#</td>';
 		print '<td>'.$langs->trans("TableName").'</td>';
 		print '<td>'.$langs->trans("NbOfRecord").'</td>';
 		print "</tr>\n";
@@ -197,6 +219,7 @@ if (!$base) {
 				}
 
 				print '<tr class="oddeven">';
+				print '<td>'.($i+1).'</td>';
 				print '<td>'.$row[0].'</td>';
 				print '<td>'.$count.'</td>';
 				print '</tr>';
diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index c10e4aa5282..ea40c5bdfcd 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -569,3 +569,17 @@ create table llx_c_partnership_type
 )ENGINE=innodb;
 
 DELETE FROM llx_rights_def WHERE module = 'hrm' AND perms = 'employee';
+
+
+CREATE TABLE llx_ecm_directories_extrafields
+(
+  rowid                     integer AUTO_INCREMENT PRIMARY KEY,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  fk_object                 integer NOT NULL,
+  import_key                varchar(14)                             -- import key
+) ENGINE=innodb;
+
+DROP TABLE llx_categorie_association;
+DROP TABLE llx_cond_reglement;
+DROP TABLE llx_zapier_hook_extrafields;
+
diff --git a/htdocs/install/mysql/tables/llx_ecm_directories_extrafileds.sql b/htdocs/install/mysql/tables/llx_ecm_directories_extrafields.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_ecm_directories_extrafileds.sql
rename to htdocs/install/mysql/tables/llx_ecm_directories_extrafields.sql
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index b0f4d831473..a11de7c447e 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -3439,19 +3439,6 @@ function migrate_categorie_association($db, $langs, $conf)
 			}
 
 			if (!$error) {
-				// TODO DROP table in the next release
-				/*
-				$sqlDrop = "DROP TABLE ".MAIN_DB_PREFIX."categorie_association";
-				if ($db->query($sqlDrop))
-				{
-					$db->commit();
-				}
-				else
-				{
-					$db->rollback();
-				}
-				*/
-
 				$db->commit();
 			} else {
 				$db->rollback();

From 032b44996c6c731e728e47a6f187937f5440362f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 11 Jul 2021 19:09:51 +0200
Subject: [PATCH 1179/1497] Debug v14

---
 .../mysql/tables/llx_partnership.key.sql      | 21 ++++++++++
 .../install/mysql/tables/llx_partnership.sql  | 40 +++++++++++++++++++
 2 files changed, 61 insertions(+)
 create mode 100644 htdocs/install/mysql/tables/llx_partnership.key.sql
 create mode 100644 htdocs/install/mysql/tables/llx_partnership.sql

diff --git a/htdocs/install/mysql/tables/llx_partnership.key.sql b/htdocs/install/mysql/tables/llx_partnership.key.sql
new file mode 100644
index 00000000000..7d09cdddda8
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_partnership.key.sql
@@ -0,0 +1,21 @@
+-- ===================================================================
+-- Copyright (C) 2012	Laurent Destailleur	<eldy@users.sourceforge.net>
+-- Copyright (C) 2016	Regis Houssin		<regis.houssin@inodbox.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
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <https://www.gnu.org/licenses/>.
+--
+-- ===================================================================
+
+ALTER TABLE llx_partnership ADD INDEX idx_partnership_entity (entity);
+ALTER TABLE llx_partnership ADD UNIQUE INDEX uk_partnership_ref (ref, entity);
diff --git a/htdocs/install/mysql/tables/llx_partnership.sql b/htdocs/install/mysql/tables/llx_partnership.sql
new file mode 100644
index 00000000000..99dfe0d6ffe
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_partnership.sql
@@ -0,0 +1,40 @@
+-- ===================================================================
+-- Copyright (C) 2004		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 <https://www.gnu.org/licenses/>.
+--
+-- ===================================================================
+
+CREATE TABLE llx_partnership(
+	rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL, 
+	ref varchar(128) DEFAULT '(PROV)' NOT NULL, 
+	status smallint NOT NULL DEFAULT '0', 
+	fk_soc integer, 
+	fk_member integer, 
+	date_partnership_start date NOT NULL, 
+	date_partnership_end date NOT NULL, 
+	entity integer DEFAULT 1 NOT NULL,	-- multi company id, 0 = all
+	reason_decline_or_cancel text NULL,
+	date_creation datetime NOT NULL, 
+	fk_user_creat integer NOT NULL, 
+	tms timestamp, 
+	fk_user_modif integer, 
+	note_private text, 
+	note_public text, 
+	last_main_doc varchar(255), 
+	count_last_url_check_error integer DEFAULT '0',
+	last_check_backlink datetime NULL,
+	import_key varchar(14),
+	model_pdf varchar(255)
+) ENGINE=innodb;
\ No newline at end of file

From ab030936c30acc6614b64c29405296495ef7c034 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 11 Jul 2021 19:15:16 +0200
Subject: [PATCH 1180/1497] Fix missing commit on tables

---
 .../llx_partnership_extrafields.key.sql       | 20 +++++++++++++++
 .../tables/llx_partnership_extrafields.sql    | 25 +++++++++++++++++++
 2 files changed, 45 insertions(+)
 create mode 100644 htdocs/install/mysql/tables/llx_partnership_extrafields.key.sql
 create mode 100644 htdocs/install/mysql/tables/llx_partnership_extrafields.sql

diff --git a/htdocs/install/mysql/tables/llx_partnership_extrafields.key.sql b/htdocs/install/mysql/tables/llx_partnership_extrafields.key.sql
new file mode 100644
index 00000000000..a6554ebacf6
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_partnership_extrafields.key.sql
@@ -0,0 +1,20 @@
+-- ===================================================================
+-- Copyright (C) 2019      Alexandre Spangaro	<aspangaro@open-dsi.fr>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <https://www.gnu.org/licenses/>.
+--
+-- ===================================================================
+
+
+ALTER TABLE llx_partnership_extrafields ADD INDEX idx_partnership_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_partnership_extrafields.sql b/htdocs/install/mysql/tables/llx_partnership_extrafields.sql
new file mode 100644
index 00000000000..ebb2eba8c6a
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_partnership_extrafields.sql
@@ -0,0 +1,25 @@
+-- ===================================================================
+-- Copyright (C) 2019      Alexandre Spangaro	<aspangaro@open-dsi.fr>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <https://www.gnu.org/licenses/>.
+--
+-- ===================================================================
+
+create table llx_partnership_extrafields
+(
+  rowid            integer AUTO_INCREMENT PRIMARY KEY,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  fk_object        integer NOT NULL,    -- salary payment id
+  import_key       varchar(14)      	-- import key
+)ENGINE=innodb;

From 52635e43b7df1c36ba93de2ff05a26bdc3dd3f83 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 11 Jul 2021 19:23:44 +0200
Subject: [PATCH 1181/1497] Fix init demo script

---
 dev/initdemo/mysqldump_dolibarr_14.0.0.sql | 919 ---------------------
 1 file changed, 919 deletions(-)

diff --git a/dev/initdemo/mysqldump_dolibarr_14.0.0.sql b/dev/initdemo/mysqldump_dolibarr_14.0.0.sql
index e80da182309..7901dccf24e 100644
--- a/dev/initdemo/mysqldump_dolibarr_14.0.0.sql
+++ b/dev/initdemo/mysqldump_dolibarr_14.0.0.sql
@@ -2241,34 +2241,6 @@ INSERT INTO `llx_c_input_reason` VALUES (1,'SRC_INTE','Web site',1,NULL),(2,'SRC
 /*!40000 ALTER TABLE `llx_c_input_reason` ENABLE KEYS */;
 UNLOCK TABLES;
 
---
--- Table structure for table `llx_c_justificative_type`
---
-
-DROP TABLE IF EXISTS `llx_c_justificative_type`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_c_justificative_type` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `code` varchar(24) COLLATE utf8_unicode_ci NOT NULL,
-  `label` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `active` tinyint(4) NOT NULL DEFAULT 1,
-  `module` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
-  PRIMARY KEY (`rowid`),
-  UNIQUE KEY `uk_c_justificative_type` (`code`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_c_justificative_type`
---
-
-LOCK TABLES `llx_c_justificative_type` WRITE;
-/*!40000 ALTER TABLE `llx_c_justificative_type` DISABLE KEYS */;
-INSERT INTO `llx_c_justificative_type` VALUES (1,'TRAINSUBSCRIPTION','Train subscrption-',1,NULL),(2,'HIGHWAYSUBSCRIPTION','Highway subscription',1,NULL);
-/*!40000 ALTER TABLE `llx_c_justificative_type` ENABLE KEYS */;
-UNLOCK TABLES;
-
 --
 -- Table structure for table `llx_c_lead_status`
 --
@@ -2298,60 +2270,6 @@ INSERT INTO `llx_c_lead_status` VALUES (1,'PROSP','Prospection',10,0.00,1),(2,'Q
 /*!40000 ALTER TABLE `llx_c_lead_status` ENABLE KEYS */;
 UNLOCK TABLES;
 
---
--- Table structure for table `llx_c_lead_type`
---
-
-DROP TABLE IF EXISTS `llx_c_lead_type`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_c_lead_type` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `code` varchar(10) COLLATE utf8_unicode_ci NOT NULL,
-  `label` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `active` tinyint(4) NOT NULL DEFAULT 1,
-  PRIMARY KEY (`rowid`),
-  UNIQUE KEY `code` (`code`)
-) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_c_lead_type`
---
-
-LOCK TABLES `llx_c_lead_type` WRITE;
-/*!40000 ALTER TABLE `llx_c_lead_type` DISABLE KEYS */;
-INSERT INTO `llx_c_lead_type` VALUES (1,'SUPP','Support',1),(2,'TRAIN','Formation',1),(3,'ADVI','Conseil',1);
-/*!40000 ALTER TABLE `llx_c_lead_type` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `llx_c_methode_commande_fournisseur`
---
-
-DROP TABLE IF EXISTS `llx_c_methode_commande_fournisseur`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_c_methode_commande_fournisseur` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `code` varchar(30) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `libelle` varchar(60) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `active` tinyint(4) NOT NULL DEFAULT 1,
-  PRIMARY KEY (`rowid`),
-  UNIQUE KEY `uk_c_methode_commande_fournisseur` (`code`)
-) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_c_methode_commande_fournisseur`
---
-
-LOCK TABLES `llx_c_methode_commande_fournisseur` WRITE;
-/*!40000 ALTER TABLE `llx_c_methode_commande_fournisseur` DISABLE KEYS */;
-INSERT INTO `llx_c_methode_commande_fournisseur` VALUES (1,'OrderByMail','Courrier',1),(2,'OrderByFax','Fax',1),(3,'OrderByEMail','EMail',1),(4,'OrderByPhone','Téléphone',1),(5,'OrderByWWW','En ligne',1);
-/*!40000 ALTER TABLE `llx_c_methode_commande_fournisseur` ENABLE KEYS */;
-UNLOCK TABLES;
-
 --
 -- Table structure for table `llx_c_paiement`
 --
@@ -2384,36 +2302,6 @@ INSERT INTO `llx_c_paiement` VALUES (1,1,'TIP','TIP',2,0,NULL,NULL,0),(2,1,'VIR'
 /*!40000 ALTER TABLE `llx_c_paiement` ENABLE KEYS */;
 UNLOCK TABLES;
 
---
--- Table structure for table `llx_c_paiement_temp`
---
-
-DROP TABLE IF EXISTS `llx_c_paiement_temp`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_c_paiement_temp` (
-  `id` int(11) NOT NULL,
-  `entity` int(11) NOT NULL DEFAULT 1,
-  `code` varchar(6) COLLATE utf8_unicode_ci NOT NULL,
-  `libelle` varchar(62) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `type` smallint(6) DEFAULT NULL,
-  `active` tinyint(4) NOT NULL DEFAULT 1,
-  `accountancy_code` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `module` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `position` int(11) NOT NULL DEFAULT 0
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_c_paiement_temp`
---
-
-LOCK TABLES `llx_c_paiement_temp` WRITE;
-/*!40000 ALTER TABLE `llx_c_paiement_temp` DISABLE KEYS */;
-INSERT INTO `llx_c_paiement_temp` VALUES (1,1,'TIP','TIP',2,0,NULL,NULL,0),(2,1,'VIR','Virement',2,1,NULL,NULL,0),(3,1,'PRE','Prélèvement',2,1,NULL,NULL,0),(4,1,'LIQ','Espèces',2,1,NULL,NULL,0),(6,1,'CB','Carte Bancaire',2,1,NULL,NULL,0),(7,1,'CHQ','Chèque',2,1,NULL,NULL,0),(50,1,'VAD','Paiement en ligne',2,0,NULL,NULL,0),(51,1,'TRA','Traite',2,0,NULL,NULL,0),(52,1,'LCR','LCR',2,0,NULL,NULL,0),(53,1,'FAC','Factor',2,0,NULL,NULL,0);
-/*!40000 ALTER TABLE `llx_c_paiement_temp` ENABLE KEYS */;
-UNLOCK TABLES;
-
 --
 -- Table structure for table `llx_c_paper_format`
 --
@@ -2896,32 +2784,6 @@ INSERT INTO `llx_c_stcommcontact` VALUES (-1,'ST_NO','Do not contact',NULL,1),(0
 /*!40000 ALTER TABLE `llx_c_stcommcontact` ENABLE KEYS */;
 UNLOCK TABLES;
 
---
--- Table structure for table `llx_c_subtotal_free_text`
---
-
-DROP TABLE IF EXISTS `llx_c_subtotal_free_text`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_c_subtotal_free_text` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `label` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
-  `content` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `active` tinyint(4) NOT NULL DEFAULT 1,
-  `entity` int(11) NOT NULL DEFAULT 1,
-  PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_c_subtotal_free_text`
---
-
-LOCK TABLES `llx_c_subtotal_free_text` WRITE;
-/*!40000 ALTER TABLE `llx_c_subtotal_free_text` DISABLE KEYS */;
-/*!40000 ALTER TABLE `llx_c_subtotal_free_text` ENABLE KEYS */;
-UNLOCK TABLES;
-
 --
 -- Table structure for table `llx_c_ticket_category`
 --
@@ -3386,458 +3248,6 @@ INSERT INTO `llx_c_ziptown` VALUES (50270,NULL,NULL,6,'1955','LES VÉRINES (CHAM
 /*!40000 ALTER TABLE `llx_c_ziptown` ENABLE KEYS */;
 UNLOCK TABLES;
 
---
--- Table structure for table `llx_cabinetmed_c_banques`
---
-
-DROP TABLE IF EXISTS `llx_cabinetmed_c_banques`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_cabinetmed_c_banques` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `code` varchar(8) COLLATE utf8_unicode_ci NOT NULL,
-  `label` varchar(64) COLLATE utf8_unicode_ci NOT NULL,
-  `active` smallint(6) NOT NULL DEFAULT 1,
-  PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_cabinetmed_c_banques`
---
-
-LOCK TABLES `llx_cabinetmed_c_banques` WRITE;
-/*!40000 ALTER TABLE `llx_cabinetmed_c_banques` DISABLE KEYS */;
-/*!40000 ALTER TABLE `llx_cabinetmed_c_banques` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `llx_cabinetmed_c_examconclusion`
---
-
-DROP TABLE IF EXISTS `llx_cabinetmed_c_examconclusion`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_cabinetmed_c_examconclusion` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `code` varchar(8) COLLATE utf8_unicode_ci NOT NULL,
-  `label` varchar(64) COLLATE utf8_unicode_ci NOT NULL,
-  `position` int(11) DEFAULT 10,
-  `active` smallint(6) NOT NULL DEFAULT 1,
-  PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_cabinetmed_c_examconclusion`
---
-
-LOCK TABLES `llx_cabinetmed_c_examconclusion` WRITE;
-/*!40000 ALTER TABLE `llx_cabinetmed_c_examconclusion` DISABLE KEYS */;
-INSERT INTO `llx_cabinetmed_c_examconclusion` VALUES (1,'AUTRE','Autre',1,1);
-/*!40000 ALTER TABLE `llx_cabinetmed_c_examconclusion` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `llx_cabinetmed_cons`
---
-
-DROP TABLE IF EXISTS `llx_cabinetmed_cons`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_cabinetmed_cons` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `fk_soc` int(11) DEFAULT NULL,
-  `datecons` date NOT NULL,
-  `typepriseencharge` varchar(8) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `motifconsprinc` varchar(64) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `diaglesprinc` varchar(64) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `motifconssec` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `diaglessec` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `hdm` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `examenclinique` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `examenprescrit` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `traitementprescrit` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `comment` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `typevisit` varchar(8) COLLATE utf8_unicode_ci NOT NULL,
-  `infiltration` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `codageccam` varchar(16) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `montant_cheque` double(24,8) DEFAULT NULL,
-  `montant_espece` double(24,8) DEFAULT NULL,
-  `montant_carte` double(24,8) DEFAULT NULL,
-  `montant_tiers` double(24,8) DEFAULT NULL,
-  `banque` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `date_c` datetime NOT NULL,
-  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `fk_user` int(11) DEFAULT NULL,
-  `fk_user_creation` int(11) DEFAULT NULL,
-  `fk_user_m` int(11) DEFAULT NULL,
-  `fk_agenda` int(11) DEFAULT NULL,
-  PRIMARY KEY (`rowid`),
-  KEY `idx_cabinetmed_cons_fk_soc` (`fk_soc`),
-  KEY `idx_cabinetmed_cons_datecons` (`datecons`),
-  CONSTRAINT `fk_cabinetmed_cons_fk_soc` FOREIGN KEY (`fk_soc`) REFERENCES `llx_societe` (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_cabinetmed_cons`
---
-
-LOCK TABLES `llx_cabinetmed_cons` WRITE;
-/*!40000 ALTER TABLE `llx_cabinetmed_cons` DISABLE KEYS */;
-INSERT INTO `llx_cabinetmed_cons` VALUES (1,12,'2019-12-05','','Cervicalgies Inflammatoires','Canal Carpien','','','None','Very hot','','','','CS','','',10.00000000,NULL,NULL,NULL,'','2019-12-05 14:46:44','2019-12-05 10:46:44',12,12,NULL,NULL),(2,29,'2020-01-06','','Cervicalgies Inflammatoires','','','','aaaaa','','ArthroScanner Epaule','','cccc','CS','','',NULL,NULL,10.00000000,NULL,'','2020-01-06 20:52:28','2020-01-06 16:52:28',12,12,NULL,NULL);
-/*!40000 ALTER TABLE `llx_cabinetmed_cons` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `llx_cabinetmed_cons_extrafields`
---
-
-DROP TABLE IF EXISTS `llx_cabinetmed_cons_extrafields`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_cabinetmed_cons_extrafields` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `fk_object` int(11) NOT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `aaa` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  PRIMARY KEY (`rowid`),
-  KEY `idx_cabinetmed_cons_extrafields` (`fk_object`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_cabinetmed_cons_extrafields`
---
-
-LOCK TABLES `llx_cabinetmed_cons_extrafields` WRITE;
-/*!40000 ALTER TABLE `llx_cabinetmed_cons_extrafields` DISABLE KEYS */;
-INSERT INTO `llx_cabinetmed_cons_extrafields` VALUES (1,'2020-01-06 17:37:28',2,NULL,'bbb');
-/*!40000 ALTER TABLE `llx_cabinetmed_cons_extrafields` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `llx_cabinetmed_diaglec`
---
-
-DROP TABLE IF EXISTS `llx_cabinetmed_diaglec`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_cabinetmed_diaglec` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `code` varchar(8) COLLATE utf8_unicode_ci NOT NULL,
-  `label` varchar(64) COLLATE utf8_unicode_ci NOT NULL,
-  `active` smallint(6) NOT NULL DEFAULT 1,
-  `icd` varchar(12) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `position` int(11) DEFAULT 10,
-  `lang` varchar(12) COLLATE utf8_unicode_ci DEFAULT NULL,
-  PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=42 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_cabinetmed_diaglec`
---
-
-LOCK TABLES `llx_cabinetmed_diaglec` WRITE;
-/*!40000 ALTER TABLE `llx_cabinetmed_diaglec` DISABLE KEYS */;
-INSERT INTO `llx_cabinetmed_diaglec` VALUES (1,'AUTRE','Autre',1,NULL,1,NULL),(2,'LOMBL5D','Lombosciatique L5 droite',1,NULL,10,NULL),(3,'LOMBL5G','Lombosciatique L5 gauche',1,NULL,10,NULL),(4,'LOMBS1D','Lombosciatique S1 droite',1,NULL,10,NULL),(5,'LOMBS1G','Lombosciatique S1 gauche',1,NULL,10,NULL),(6,'NCB','Névralgie cervico-brachiale',1,NULL,10,NULL),(7,'PR','Polyarthrite rhumatoide',1,NULL,10,NULL),(8,'SA','Spondylarthrite ankylosante',1,NULL,10,NULL),(9,'GFTI','Gonarthrose fémoro-tibaile interne',1,NULL,10,NULL),(10,'GFTE','Gonarthrose fémoro-tibiale externe',1,NULL,10,NULL),(11,'COX','Coxarthrose',1,NULL,10,NULL),(12,'CC','Canal Carpien',1,NULL,10,NULL),(16,'CLER','Canal Lombaire Etroit et/ou  Rétréci',1,NULL,10,NULL),(22,'RH_PSO','Rhumatisme Psoriasique',1,NULL,10,NULL),(23,'LEAD','Lupus',1,NULL,10,NULL),(24,'LBDISC','Lombalgie Discale',1,NULL,10,NULL),(25,'LBRADD','Lomboradiculalgie Discale',1,NULL,10,NULL),(26,'LBRADND','Lomboradiculalgie Non Discale',1,NULL,10,NULL),(27,'CH_ROT','Chondropathie Rotulienne',1,NULL,10,NULL),(28,'AFP','Arthrose FémoroPatellaire',1,NULL,10,NULL),(29,'PPR','Pseudo Polyarthrite Rhizomélique',1,NULL,10,NULL),(30,'SHARP','Maladie de Sharp',1,NULL,10,NULL),(31,'SAPHO','SAPHO',1,NULL,10,NULL),(32,'OMARTHC','Omarthrose Centrée',1,NULL,10,NULL),(33,'RH_CCA','Rhumatisme Chondro Calcinosique',1,NULL,10,NULL),(34,'GOUTTE','Arthrite Goutteuse',1,NULL,10,NULL),(35,'CCA','Arthrite Chondro Calcinosique',1,NULL,10,NULL),(36,'ARTH_MCR','Arthrite Microcristalline',1,NULL,10,NULL),(37,'CSA','Conflit Sous Acromial',1,NULL,10,NULL),(38,'TDCALCE','Tendinopathie Calcifiante d\'Epaule',1,NULL,10,NULL),(39,'TDCALCH','Tendinopathie Calcifiante de Hanche',1,NULL,10,NULL),(40,'TBT','TendinoBursite Trochantérienne',1,NULL,10,NULL),(41,'OMARTHE','Omarthrose Excentrée',1,NULL,10,NULL);
-/*!40000 ALTER TABLE `llx_cabinetmed_diaglec` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `llx_cabinetmed_examaut`
---
-
-DROP TABLE IF EXISTS `llx_cabinetmed_examaut`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_cabinetmed_examaut` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `fk_soc` int(11) DEFAULT NULL,
-  `fk_user` int(11) DEFAULT NULL,
-  `dateexam` date NOT NULL,
-  `examprinc` varchar(64) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `examsec` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `concprinc` varchar(64) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `concsec` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_cabinetmed_examaut`
---
-
-LOCK TABLES `llx_cabinetmed_examaut` WRITE;
-/*!40000 ALTER TABLE `llx_cabinetmed_examaut` DISABLE KEYS */;
-INSERT INTO `llx_cabinetmed_examaut` VALUES (1,12,12,'2019-12-05','Scanner Cervical','','Autre','A+ BK++','2019-12-05 10:48:37');
-/*!40000 ALTER TABLE `llx_cabinetmed_examaut` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `llx_cabinetmed_exambio`
---
-
-DROP TABLE IF EXISTS `llx_cabinetmed_exambio`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_cabinetmed_exambio` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `fk_soc` int(11) DEFAULT NULL,
-  `fk_user` int(11) DEFAULT NULL,
-  `dateexam` date NOT NULL,
-  `resultat` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `conclusion` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `comment` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `suivipr_ad` int(11) DEFAULT NULL,
-  `suivipr_ag` int(11) DEFAULT NULL,
-  `suivipr_vs` int(11) DEFAULT NULL,
-  `suivipr_eva` int(11) DEFAULT NULL,
-  `suivipr_das28` double DEFAULT NULL,
-  `suivipr_err` int(11) DEFAULT NULL,
-  `suivisa_fat` int(11) DEFAULT NULL,
-  `suivisa_dax` int(11) DEFAULT NULL,
-  `suivisa_dpe` int(11) DEFAULT NULL,
-  `suivisa_dpa` int(11) DEFAULT NULL,
-  `suivisa_rno` int(11) DEFAULT NULL,
-  `suivisa_dma` int(11) DEFAULT NULL,
-  `suivisa_basdai` double DEFAULT NULL,
-  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_cabinetmed_exambio`
---
-
-LOCK TABLES `llx_cabinetmed_exambio` WRITE;
-/*!40000 ALTER TABLE `llx_cabinetmed_exambio` DISABLE KEYS */;
-/*!40000 ALTER TABLE `llx_cabinetmed_exambio` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `llx_cabinetmed_examenprescrit`
---
-
-DROP TABLE IF EXISTS `llx_cabinetmed_examenprescrit`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_cabinetmed_examenprescrit` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `code` varchar(8) COLLATE utf8_unicode_ci NOT NULL,
-  `label` varchar(64) COLLATE utf8_unicode_ci NOT NULL,
-  `biorad` varchar(8) COLLATE utf8_unicode_ci NOT NULL,
-  `position` int(11) DEFAULT 10,
-  `active` smallint(6) NOT NULL DEFAULT 1,
-  PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=43 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_cabinetmed_examenprescrit`
---
-
-LOCK TABLES `llx_cabinetmed_examenprescrit` WRITE;
-/*!40000 ALTER TABLE `llx_cabinetmed_examenprescrit` DISABLE KEYS */;
-INSERT INTO `llx_cabinetmed_examenprescrit` VALUES (1,'AUTRE','Autre','OTHER',1,1),(2,'IRMLOMB','IRM lombaire','RADIO',10,1),(5,'TDMLOMB','TDM lombaires','RADIO',10,1),(6,'RX_BRL','Radios Bassin-Rachis Lombaire','RADIO',10,1),(7,'RX_RL','Radios Rachis Lombaire','RADIO',10,1),(8,'RX_BASS','Radios Bassin','RADIO',10,1),(9,'RX_BH','Radios Bassin et Hanches','RADIO',10,1),(10,'RX_GEN','Radios Genoux','RADIO',10,1),(11,'RX_CHEV','Radios Chevilles','RADIO',10,1),(12,'RX_AVPD','Radios Avants-Pieds','RADIO',10,1),(13,'RX_EP','Radio Epaule','RADIO',10,1),(14,'RX_MAINS','Radios Mains','RADIO',10,1),(15,'RX_COUDE','Radios Coude','RADIO',10,1),(16,'RX_RC','Radios Rachis Cervical','RADIO',10,1),(17,'RX_RD','Radios Rachis Dorsal','RADIO',10,1),(18,'RX_RCD','Radios Rachis CervicoDorsal','RADIO',10,1),(19,'RX_RDL','Radios DorsoLombaire','RADIO',10,1),(20,'RX_SCO','Bilan Radio Scoliose','RADIO',10,1),(21,'RX_RIC','Bilan Radio Rhumatisme  Inflammatoire','RADIO',10,1),(22,'TDM_LOMB','Scanner Lombaire','RADIO',10,1),(23,'TDM_DORS','Scanner Dorsal','RADIO',10,1),(24,'TDM_CERV','Scanner Cervical','RADIO',10,1),(25,'TDM_HANC','Scanner Hanche','RADIO',10,1),(26,'TDM_GEN','Scanner Genou','RADIO',10,1),(27,'RX_RDL','Radios Rachis DorsoLombaire','RADIO',10,1),(28,'ARTTDMG','ArthroScanner Genou','RADIO',10,1),(29,'ARTTDME','ArthroScanner Epaule','RADIO',10,1),(30,'ARTTDMH','ArthroScanner Hanche','RADIO',10,1),(31,'IRM_GEN','IRM Genou','RADIO',10,1),(32,'IRM_HANC','IRM Hanche','RADIO',10,1),(33,'IRM_EP','IRM Epaule','RADIO',10,1),(34,'IRM_SIL','IRM SacroIliaques','RADIO',10,1),(35,'IRM_RL','IRM Rachis Lombaire','RADIO',10,1),(36,'IRM_RD','IRM Rachis Dorsal','RADIO',10,1),(37,'IRM_RC','IRM Rachis Cervical','RADIO',10,1),(38,'ELECMI','Electromiogramme','RADIO',10,1),(39,'NFS','NFS','BIO',10,1),(40,'BILPHO','Bilan Phosphocalcique','BIO',10,1),(41,'VSCRP','VS/CRP','BIO',10,1),(42,'EPP','Electrophorèse Protéine Plasmatique','BIO',10,1);
-/*!40000 ALTER TABLE `llx_cabinetmed_examenprescrit` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `llx_cabinetmed_motifcons`
---
-
-DROP TABLE IF EXISTS `llx_cabinetmed_motifcons`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_cabinetmed_motifcons` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `code` varchar(8) COLLATE utf8_unicode_ci NOT NULL,
-  `label` varchar(64) COLLATE utf8_unicode_ci NOT NULL,
-  `position` int(11) DEFAULT 10,
-  `active` smallint(6) NOT NULL DEFAULT 1,
-  PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=54 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_cabinetmed_motifcons`
---
-
-LOCK TABLES `llx_cabinetmed_motifcons` WRITE;
-/*!40000 ALTER TABLE `llx_cabinetmed_motifcons` DISABLE KEYS */;
-INSERT INTO `llx_cabinetmed_motifcons` VALUES (5,'AUTRE','Autre',1,1),(6,'DORS','Dorsalgie',10,1),(7,'DOLMSD','Douleur Membre supérieur Droit',10,1),(8,'DOLMSG','Douleur Membre supérieur Gauche',10,1),(9,'DOLMID','Douleur Membre inférieur Droit',10,1),(10,'DOLMIG','Douleur Membre inférieur Gauche',10,1),(11,'PARESM','Paresthésie des mains',10,1),(12,'DOLEPG','Douleur épaule gauche',10,1),(13,'DOLEPD','Douleur épaule droite',10,1),(14,'GONAD','Gonaglie droite',10,1),(15,'GONAG','Gonalgie gauche',10,1),(16,'DOLPD','Douleur Pied Droit',10,1),(17,'DOUL_MIN','Douleur Membre Inférieur',10,1),(18,'POLYAR','Polyarthralgie',10,1),(19,'SUIVIPR','Suivi PR',10,1),(20,'SUIVISPA','Suivi SPA',10,1),(21,'SUIVIRIC','Suivi RI',10,1),(22,'SUIVIPPR','Suivi PPR',10,1),(23,'DOLINGD','Douleur inguinale Droit',10,1),(24,'DOLINGG','Douleur inguinale Gauche',10,1),(25,'DOLCOUDD','Douleur coude Droit',10,1),(26,'DOLCOUDG','Douleur coude Gauche',10,1),(27,'TALAL','Talalgie',10,1),(28,'DOLTENDC','Douleur tandous Calcanien',10,1),(29,'DEROB','Dérobement Membres Inférieurs',10,1),(30,'LOMB_MEC','Lombalgies Mécaniques',10,1),(31,'LOMB_INF','Lombalgies Inflammatoires',10,1),(32,'DORS_MEC','Dorsalgies Mécaniques',10,1),(33,'DORS_INF','Dorsalgies Inflammatoires',10,1),(34,'CERV_MEC','Cervicalgies Mécaniques',10,1),(35,'SCIAT','LomboSciatique ',10,1),(36,'CRUR','LomboCruralgie',10,1),(37,'DOUL_SUP','Douleur Membre Supérieur',10,1),(38,'INGUINAL','Inguinalgie',10,1),(39,'CERV_INF','Cervicalgies Inflammatoires',10,1),(40,'DOUL_EP','Douleur Epaule',10,1),(41,'DOUL_POI','Douleur Poignet',10,1),(42,'DOUL_GEN','Douleur Genou',10,1),(43,'DOUL_COU','Douleur Coude',10,1),(44,'DOUL_HAN','Douleur Hanche',10,1),(45,'PAR_MBRS','Paresthésies Membres Inférieurs',10,1),(46,'PAR_MBRI','Paresthésies Membres Supérieurs',10,1),(47,'TR_RACHI','Traumatisme Rachis',10,1),(48,'TR_MBRS','Traumatisme Membres Supérieurs',10,1),(49,'TR_MBRI','Traumatisme Membres Inférieurs',10,1),(50,'FAT_MBRI','Fatiguabilité Membres Inférieurs',10,1),(51,'DOUL_CHE','Douleur Cheville',10,1),(52,'DOUL_PD','Douleur Pied',10,1),(53,'DOUL_MA','Douleur Main',10,1);
-/*!40000 ALTER TABLE `llx_cabinetmed_motifcons` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `llx_cabinetmed_patient`
---
-
-DROP TABLE IF EXISTS `llx_cabinetmed_patient`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_cabinetmed_patient` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `note_antemed` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note_antechirgen` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note_antechirortho` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note_anterhum` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note_other` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note_traitclass` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note_traitallergie` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note_traitintol` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note_traitspec` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `alert_antemed` smallint(6) DEFAULT NULL,
-  `alert_antechirgen` smallint(6) DEFAULT NULL,
-  `alert_antechirortho` smallint(6) DEFAULT NULL,
-  `alert_anterhum` smallint(6) DEFAULT NULL,
-  `alert_other` smallint(6) DEFAULT NULL,
-  `alert_traitclass` smallint(6) DEFAULT NULL,
-  `alert_traitallergie` smallint(6) DEFAULT NULL,
-  `alert_traitintol` smallint(6) DEFAULT NULL,
-  `alert_traitspec` smallint(6) DEFAULT NULL,
-  `alert_note` smallint(6) DEFAULT NULL,
-  PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=30 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_cabinetmed_patient`
---
-
-LOCK TABLES `llx_cabinetmed_patient` WRITE;
-/*!40000 ALTER TABLE `llx_cabinetmed_patient` DISABLE KEYS */;
-INSERT INTO `llx_cabinetmed_patient` VALUES (29,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0);
-/*!40000 ALTER TABLE `llx_cabinetmed_patient` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `llx_cabinetmed_societe`
---
-
-DROP TABLE IF EXISTS `llx_cabinetmed_societe`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_cabinetmed_societe` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `nom` varchar(60) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `entity` int(11) NOT NULL DEFAULT 1,
-  `ref_ext` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `ref_int` varchar(60) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `statut` smallint(6) DEFAULT 0,
-  `parent` int(11) DEFAULT NULL,
-  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `datec` datetime DEFAULT NULL,
-  `datea` datetime DEFAULT NULL,
-  `status` smallint(6) DEFAULT 1,
-  `code_client` varchar(24) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `code_fournisseur` varchar(24) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `code_compta` varchar(24) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `code_compta_fournisseur` varchar(24) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `address` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `cp` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `ville` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `fk_departement` int(11) DEFAULT 0,
-  `fk_pays` int(11) DEFAULT 0,
-  `tel` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `fax` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `url` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `email` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `fk_effectif` int(11) DEFAULT 0,
-  `fk_typent` int(11) DEFAULT 0,
-  `fk_forme_juridique` int(11) DEFAULT 0,
-  `fk_currency` int(11) DEFAULT 0,
-  `siren` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `siret` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `ape` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `idprof4` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `idprof5` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `idprof6` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `tva_intra` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `capital` double DEFAULT NULL,
-  `fk_stcomm` int(11) NOT NULL DEFAULT 0,
-  `note` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `prefix_comm` varchar(5) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `client` smallint(6) DEFAULT 0,
-  `fournisseur` smallint(6) DEFAULT 0,
-  `supplier_account` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `fk_prospectlevel` varchar(12) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `customer_bad` smallint(6) DEFAULT 0,
-  `customer_rate` double DEFAULT 0,
-  `supplier_rate` double DEFAULT 0,
-  `fk_user_creat` int(11) DEFAULT NULL,
-  `fk_user_modif` int(11) DEFAULT NULL,
-  `remise_client` double DEFAULT 0,
-  `mode_reglement` smallint(6) DEFAULT NULL,
-  `cond_reglement` smallint(6) DEFAULT NULL,
-  `tva_assuj` smallint(6) DEFAULT 1,
-  `localtax1_assuj` smallint(6) DEFAULT 0,
-  `localtax2_assuj` smallint(6) DEFAULT 0,
-  `barcode` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `fk_barcode_type` int(11) DEFAULT 0,
-  `price_level` int(11) DEFAULT NULL,
-  `default_lang` varchar(6) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `logo` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `canvas` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
-  PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_cabinetmed_societe`
---
-
-LOCK TABLES `llx_cabinetmed_societe` WRITE;
-/*!40000 ALTER TABLE `llx_cabinetmed_societe` DISABLE KEYS */;
-/*!40000 ALTER TABLE `llx_cabinetmed_societe` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `llx_captureserver_captureserver`
---
-
-DROP TABLE IF EXISTS `llx_captureserver_captureserver`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_captureserver_captureserver` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `entity` int(11) NOT NULL DEFAULT 1,
-  `ref` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `label` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `type` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `content` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `qty` int(11) DEFAULT NULL,
-  `ip` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `status` int(11) DEFAULT NULL,
-  `date_creation` datetime NOT NULL,
-  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `comment` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
-  PRIMARY KEY (`rowid`),
-  UNIQUE KEY `uk_captureserver_captureserver_uk` (`entity`,`ref`),
-  KEY `idx_captureserver_captureserver_rowid` (`rowid`),
-  KEY `idx_captureserver_captureserver_ref` (`ref`),
-  KEY `idx_captureserver_captureserver_type` (`type`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_captureserver_captureserver`
---
-
-LOCK TABLES `llx_captureserver_captureserver` WRITE;
-/*!40000 ALTER TABLE `llx_captureserver_captureserver` DISABLE KEYS */;
-INSERT INTO `llx_captureserver_captureserver` VALUES (1,1,'dolibarrping_1','dolibarrping 1 ','dolibarrping','[]',1,'127.0.0.1',1,'2020-01-01 16:01:31','2020-01-01 12:01:31','Ping received at 20200101165522, version ',NULL);
-/*!40000 ALTER TABLE `llx_captureserver_captureserver` ENABLE KEYS */;
-UNLOCK TABLES;
-
 --
 -- Table structure for table `llx_categorie`
 --
@@ -4690,52 +4100,6 @@ INSERT INTO `llx_commande_fournisseurdet` VALUES (1,1,NULL,NULL,'','','Chips',19
 /*!40000 ALTER TABLE `llx_commande_fournisseurdet` ENABLE KEYS */;
 UNLOCK TABLES;
 
---
--- Table structure for table `llx_commande_fournisseurdet_asset`
---
-
-DROP TABLE IF EXISTS `llx_commande_fournisseurdet_asset`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_commande_fournisseurdet_asset` (
-  `rowid` int(11) NOT NULL DEFAULT 0,
-  `date_cre` datetime DEFAULT NULL,
-  `date_maj` datetime DEFAULT NULL,
-  `fk_commandedet` int(11) NOT NULL DEFAULT 0,
-  `fk_product` int(11) NOT NULL DEFAULT 0,
-  `fk_warehouse` int(11) NOT NULL DEFAULT 0,
-  `rang` int(11) NOT NULL DEFAULT 0,
-  `lot_number` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
-  `carton` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
-  `numerosuivi` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
-  `imei` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
-  `firmware` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
-  `serial_number` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
-  `weight` double NOT NULL DEFAULT 0,
-  `weight_reel` double NOT NULL DEFAULT 0,
-  `tare` double NOT NULL DEFAULT 0,
-  `dluo` datetime DEFAULT NULL,
-  `weight_unit` int(11) NOT NULL DEFAULT 0,
-  `weight_reel_unit` int(11) NOT NULL DEFAULT 0,
-  `tare_unit` int(11) NOT NULL DEFAULT 0,
-  PRIMARY KEY (`rowid`),
-  KEY `date_cre` (`date_cre`),
-  KEY `date_maj` (`date_maj`),
-  KEY `fk_commandedet` (`fk_commandedet`),
-  KEY `fk_product` (`fk_product`),
-  KEY `fk_warehouse` (`fk_warehouse`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_commande_fournisseurdet_asset`
---
-
-LOCK TABLES `llx_commande_fournisseurdet_asset` WRITE;
-/*!40000 ALTER TABLE `llx_commande_fournisseurdet_asset` DISABLE KEYS */;
-/*!40000 ALTER TABLE `llx_commande_fournisseurdet_asset` ENABLE KEYS */;
-UNLOCK TABLES;
-
 --
 -- Table structure for table `llx_commande_fournisseurdet_extrafields`
 --
@@ -5478,36 +4842,6 @@ INSERT INTO `llx_deplacement` VALUES (1,NULL,1,'2012-07-09 01:58:04','2012-07-08
 /*!40000 ALTER TABLE `llx_deplacement` ENABLE KEYS */;
 UNLOCK TABLES;
 
---
--- Table structure for table `llx_dispatch`
---
-
-DROP TABLE IF EXISTS `llx_dispatch`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_dispatch` (
-  `rowid` int(11) NOT NULL DEFAULT 0,
-  `date_cre` datetime DEFAULT NULL,
-  `date_maj` datetime DEFAULT NULL,
-  `fk_object` int(11) NOT NULL DEFAULT 0,
-  `type_object` varchar(30) CHARACTER SET latin1 DEFAULT NULL,
-  PRIMARY KEY (`rowid`),
-  KEY `date_cre` (`date_cre`),
-  KEY `date_maj` (`date_maj`),
-  KEY `fk_object` (`fk_object`),
-  KEY `type_object` (`type_object`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_dispatch`
---
-
-LOCK TABLES `llx_dispatch` WRITE;
-/*!40000 ALTER TABLE `llx_dispatch` DISABLE KEYS */;
-/*!40000 ALTER TABLE `llx_dispatch` ENABLE KEYS */;
-UNLOCK TABLES;
-
 --
 -- Table structure for table `llx_dispatch_asset`
 --
@@ -5855,33 +5189,6 @@ INSERT INTO `llx_element_element` VALUES (4,1,'order_supplier',20,'invoice_suppl
 /*!40000 ALTER TABLE `llx_element_element` ENABLE KEYS */;
 UNLOCK TABLES;
 
---
--- Table structure for table `llx_element_lock`
---
-
-DROP TABLE IF EXISTS `llx_element_lock`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_element_lock` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `fk_element` int(11) NOT NULL,
-  `elementtype` varchar(32) COLLATE utf8_unicode_ci NOT NULL,
-  `datel` datetime DEFAULT NULL,
-  `datem` datetime DEFAULT NULL,
-  `sessionid` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_element_lock`
---
-
-LOCK TABLES `llx_element_lock` WRITE;
-/*!40000 ALTER TABLE `llx_element_lock` DISABLE KEYS */;
-/*!40000 ALTER TABLE `llx_element_lock` ENABLE KEYS */;
-UNLOCK TABLES;
-
 --
 -- Table structure for table `llx_element_resources`
 --
@@ -6313,140 +5620,6 @@ LOCK TABLES `llx_eventorganization_conferenceorboothattendee_extrafields` WRITE;
 /*!40000 ALTER TABLE `llx_eventorganization_conferenceorboothattendee_extrafields` ENABLE KEYS */;
 UNLOCK TABLES;
 
---
--- Table structure for table `llx_eventorganizer_attendee`
---
-
-DROP TABLE IF EXISTS `llx_eventorganizer_attendee`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_eventorganizer_attendee` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `ref` varchar(128) CHARACTER SET utf8mb4 NOT NULL DEFAULT '(PROV)',
-  `label` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
-  `amount` double(24,8) DEFAULT NULL,
-  `qty` double DEFAULT NULL,
-  `fk_soc` int(11) DEFAULT NULL,
-  `description` text CHARACTER SET utf8mb4 DEFAULT NULL,
-  `note_public` text CHARACTER SET utf8mb4 DEFAULT NULL,
-  `note_private` text CHARACTER SET utf8mb4 DEFAULT NULL,
-  `date_creation` datetime NOT NULL,
-  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `fk_user_creat` int(11) NOT NULL,
-  `fk_user_modif` int(11) DEFAULT NULL,
-  `import_key` varchar(14) CHARACTER SET utf8mb4 DEFAULT NULL,
-  `status` int(11) NOT NULL,
-  `fk_eventorganizer` int(11) NOT NULL,
-  PRIMARY KEY (`rowid`),
-  KEY `idx_eventorganizer_attendee_rowid` (`rowid`),
-  KEY `idx_eventorganizer_attendee_ref` (`ref`),
-  KEY `idx_eventorganizer_attendee_fk_soc` (`fk_soc`),
-  KEY `idx_eventorganizer_attendee_status` (`status`),
-  KEY `idx_eventorganizer_attendee_fk_eventorganizer` (`fk_eventorganizer`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_eventorganizer_attendee`
---
-
-LOCK TABLES `llx_eventorganizer_attendee` WRITE;
-/*!40000 ALTER TABLE `llx_eventorganizer_attendee` DISABLE KEYS */;
-/*!40000 ALTER TABLE `llx_eventorganizer_attendee` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `llx_eventorganizer_attendee_extrafields`
---
-
-DROP TABLE IF EXISTS `llx_eventorganizer_attendee_extrafields`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_eventorganizer_attendee_extrafields` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `fk_object` int(11) NOT NULL,
-  `import_key` varchar(14) CHARACTER SET utf8mb4 DEFAULT NULL,
-  PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_eventorganizer_attendee_extrafields`
---
-
-LOCK TABLES `llx_eventorganizer_attendee_extrafields` WRITE;
-/*!40000 ALTER TABLE `llx_eventorganizer_attendee_extrafields` DISABLE KEYS */;
-/*!40000 ALTER TABLE `llx_eventorganizer_attendee_extrafields` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `llx_eventorganizer_organizedevent`
---
-
-DROP TABLE IF EXISTS `llx_eventorganizer_organizedevent`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_eventorganizer_organizedevent` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `ref` varchar(128) CHARACTER SET utf8mb4 NOT NULL DEFAULT '(PROV)',
-  `entity` int(11) NOT NULL DEFAULT 1,
-  `label` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
-  `amount` double(24,8) DEFAULT NULL,
-  `qty` double DEFAULT NULL,
-  `fk_soc` int(11) DEFAULT NULL,
-  `description` text CHARACTER SET utf8mb4 DEFAULT NULL,
-  `note_public` text CHARACTER SET utf8mb4 DEFAULT NULL,
-  `note_private` text CHARACTER SET utf8mb4 DEFAULT NULL,
-  `date_creation` datetime NOT NULL,
-  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `fk_user_creat` int(11) NOT NULL,
-  `fk_user_modif` int(11) DEFAULT NULL,
-  `import_key` varchar(14) CHARACTER SET utf8mb4 DEFAULT NULL,
-  `status` int(11) NOT NULL,
-  PRIMARY KEY (`rowid`),
-  KEY `idx_eventorganizer_organizedevent_rowid` (`rowid`),
-  KEY `idx_eventorganizer_organizedevent_ref` (`ref`),
-  KEY `idx_eventorganizer_organizedevent_entity` (`entity`),
-  KEY `idx_eventorganizer_organizedevent_fk_soc` (`fk_soc`),
-  KEY `idx_eventorganizer_organizedevent_status` (`status`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_eventorganizer_organizedevent`
---
-
-LOCK TABLES `llx_eventorganizer_organizedevent` WRITE;
-/*!40000 ALTER TABLE `llx_eventorganizer_organizedevent` DISABLE KEYS */;
-/*!40000 ALTER TABLE `llx_eventorganizer_organizedevent` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `llx_eventorganizer_organizedevent_extrafields`
---
-
-DROP TABLE IF EXISTS `llx_eventorganizer_organizedevent_extrafields`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_eventorganizer_organizedevent_extrafields` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `fk_object` int(11) NOT NULL,
-  `import_key` varchar(14) CHARACTER SET utf8mb4 DEFAULT NULL,
-  PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_eventorganizer_organizedevent_extrafields`
---
-
-LOCK TABLES `llx_eventorganizer_organizedevent_extrafields` WRITE;
-/*!40000 ALTER TABLE `llx_eventorganizer_organizedevent_extrafields` DISABLE KEYS */;
-/*!40000 ALTER TABLE `llx_eventorganizer_organizedevent_extrafields` ENABLE KEYS */;
-UNLOCK TABLES;
-
 --
 -- Table structure for table `llx_events`
 --
@@ -6576,34 +5749,6 @@ LOCK TABLES `llx_expedition_extrafields` WRITE;
 /*!40000 ALTER TABLE `llx_expedition_extrafields` ENABLE KEYS */;
 UNLOCK TABLES;
 
---
--- Table structure for table `llx_expedition_methode`
---
-
-DROP TABLE IF EXISTS `llx_expedition_methode`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_expedition_methode` (
-  `rowid` int(11) NOT NULL,
-  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `code` varchar(30) COLLATE utf8_unicode_ci NOT NULL,
-  `libelle` varchar(50) COLLATE utf8_unicode_ci NOT NULL,
-  `description` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `active` tinyint(4) DEFAULT 0,
-  PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_expedition_methode`
---
-
-LOCK TABLES `llx_expedition_methode` WRITE;
-/*!40000 ALTER TABLE `llx_expedition_methode` DISABLE KEYS */;
-INSERT INTO `llx_expedition_methode` VALUES (1,'2012-07-08 11:18:00','CATCH','Catch','Catch by client',1),(2,'2012-07-08 11:18:00','TRANS','Transporter','Generic transporter',1),(3,'2012-07-08 11:18:01','COLSUI','Colissimo Suivi','Colissimo Suivi',0);
-/*!40000 ALTER TABLE `llx_expedition_methode` ENABLE KEYS */;
-UNLOCK TABLES;
-
 --
 -- Table structure for table `llx_expedition_package`
 --
@@ -6670,45 +5815,6 @@ INSERT INTO `llx_expeditiondet` VALUES (1,1,10,3,1,0),(2,2,226,19,2,0);
 /*!40000 ALTER TABLE `llx_expeditiondet` ENABLE KEYS */;
 UNLOCK TABLES;
 
---
--- Table structure for table `llx_expeditiondet_asset`
---
-
-DROP TABLE IF EXISTS `llx_expeditiondet_asset`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_expeditiondet_asset` (
-  `rowid` int(11) NOT NULL DEFAULT 0,
-  `date_cre` datetime DEFAULT NULL,
-  `date_maj` datetime DEFAULT NULL,
-  `fk_expeditiondet` int(11) NOT NULL DEFAULT 0,
-  `fk_asset` int(11) NOT NULL DEFAULT 0,
-  `rang` int(11) NOT NULL DEFAULT 0,
-  `lot_number` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
-  `carton` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
-  `numerosuivi` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
-  `weight` double NOT NULL DEFAULT 0,
-  `weight_reel` double NOT NULL DEFAULT 0,
-  `tare` double NOT NULL DEFAULT 0,
-  `weight_unit` int(11) NOT NULL DEFAULT 0,
-  `weight_reel_unit` int(11) NOT NULL DEFAULT 0,
-  `tare_unit` int(11) NOT NULL DEFAULT 0,
-  PRIMARY KEY (`rowid`),
-  KEY `date_cre` (`date_cre`),
-  KEY `date_maj` (`date_maj`),
-  KEY `fk_expeditiondet` (`fk_expeditiondet`),
-  KEY `fk_asset` (`fk_asset`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_expeditiondet_asset`
---
-
-LOCK TABLES `llx_expeditiondet_asset` WRITE;
-/*!40000 ALTER TABLE `llx_expeditiondet_asset` DISABLE KEYS */;
-/*!40000 ALTER TABLE `llx_expeditiondet_asset` ENABLE KEYS */;
-UNLOCK TABLES;
 
 --
 -- Table structure for table `llx_expeditiondet_batch`
@@ -8221,31 +7327,6 @@ INSERT INTO `llx_inventory` VALUES (1,'aaa',1,NULL,NULL,'aa aaa',0,'2020-01-10 0
 /*!40000 ALTER TABLE `llx_inventory` ENABLE KEYS */;
 UNLOCK TABLES;
 
---
--- Table structure for table `llx_inventory_extrafields`
---
-
-DROP TABLE IF EXISTS `llx_inventory_extrafields`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_inventory_extrafields` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `fk_object` int(11) NOT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
-  PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_inventory_extrafields`
---
-
-LOCK TABLES `llx_inventory_extrafields` WRITE;
-/*!40000 ALTER TABLE `llx_inventory_extrafields` DISABLE KEYS */;
-/*!40000 ALTER TABLE `llx_inventory_extrafields` ENABLE KEYS */;
-UNLOCK TABLES;
-
 --
 -- Table structure for table `llx_inventorydet`
 --

From 41016039b678fb887f0bc02089da7215bc35382f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 11 Jul 2021 19:39:18 +0200
Subject: [PATCH 1182/1497] Fix missing very old table

---
 dev/initdemo/mysqldump_dolibarr_14.0.0.sql    | 173 +-----------------
 .../install/mysql/migration/13.0.0-14.0.0.sql |  13 ++
 .../mysql/tables/llx_onlinesignature.sql      |  31 ++++
 3 files changed, 45 insertions(+), 172 deletions(-)
 create mode 100644 htdocs/install/mysql/tables/llx_onlinesignature.sql

diff --git a/dev/initdemo/mysqldump_dolibarr_14.0.0.sql b/dev/initdemo/mysqldump_dolibarr_14.0.0.sql
index 7901dccf24e..7ab9d424029 100644
--- a/dev/initdemo/mysqldump_dolibarr_14.0.0.sql
+++ b/dev/initdemo/mysqldump_dolibarr_14.0.0.sql
@@ -3123,64 +3123,6 @@ INSERT INTO `llx_c_typent` VALUES (1,'TE_STARTUP','Start-up',NULL,1,NULL,0),(2,'
 /*!40000 ALTER TABLE `llx_c_typent` ENABLE KEYS */;
 UNLOCK TABLES;
 
---
--- Table structure for table `llx_c_ultimatepdf_line`
---
-
-DROP TABLE IF EXISTS `llx_c_ultimatepdf_line`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_c_ultimatepdf_line` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `entity` int(11) NOT NULL DEFAULT 1,
-  `code` varchar(30) NOT NULL,
-  `label` varchar(255) NOT NULL,
-  `description` varchar(128) NOT NULL,
-  `active` tinyint(4) NOT NULL DEFAULT 1,
-  PRIMARY KEY (`rowid`),
-  UNIQUE KEY `uk_c_ultimatepdf_line` (`code`,`entity`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_c_ultimatepdf_line`
---
-
-LOCK TABLES `llx_c_ultimatepdf_line` WRITE;
-/*!40000 ALTER TABLE `llx_c_ultimatepdf_line` DISABLE KEYS */;
-INSERT INTO `llx_c_ultimatepdf_line` VALUES (1,1,'TEXTE1','Garantie 2 ans pièces et main d\'œuvre, retour en atelier (Hors filtre et pièce d\'usure)','texte de garantie',1);
-/*!40000 ALTER TABLE `llx_c_ultimatepdf_line` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `llx_c_ultimatepdf_title`
---
-
-DROP TABLE IF EXISTS `llx_c_ultimatepdf_title`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_c_ultimatepdf_title` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `entity` int(11) NOT NULL DEFAULT 1,
-  `code` varchar(30) NOT NULL,
-  `label` varchar(128) NOT NULL,
-  `description` varchar(255) NOT NULL,
-  `active` tinyint(4) NOT NULL DEFAULT 1,
-  PRIMARY KEY (`rowid`),
-  UNIQUE KEY `uk_c_ultimatepdf_title` (`code`,`entity`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_c_ultimatepdf_title`
---
-
-LOCK TABLES `llx_c_ultimatepdf_title` WRITE;
-/*!40000 ALTER TABLE `llx_c_ultimatepdf_title` DISABLE KEYS */;
-INSERT INTO `llx_c_ultimatepdf_title` VALUES (1,1,'TITLE1','Facture Proforma','Facture proforma',1);
-/*!40000 ALTER TABLE `llx_c_ultimatepdf_title` ENABLE KEYS */;
-UNLOCK TABLES;
-
 --
 -- Table structure for table `llx_c_units`
 --
@@ -4583,34 +4525,6 @@ INSERT INTO `llx_cronjob` VALUES (1,'2015-03-23 18:18:39','2015-03-23 19:18:39',
 /*!40000 ALTER TABLE `llx_cronjob` ENABLE KEYS */;
 UNLOCK TABLES;
 
---
--- Table structure for table `llx_cv_recrutement`
---
-
-DROP TABLE IF EXISTS `llx_cv_recrutement`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_cv_recrutement` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `nom` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
-  `fichier` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
-  `poste` int(11) DEFAULT NULL,
-  `candidature` int(11) DEFAULT NULL,
-  `type` varchar(20) CHARACTER SET utf8mb4 DEFAULT NULL,
-  `date` date DEFAULT NULL,
-  PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_cv_recrutement`
---
-
-LOCK TABLES `llx_cv_recrutement` WRITE;
-/*!40000 ALTER TABLE `llx_cv_recrutement` DISABLE KEYS */;
-/*!40000 ALTER TABLE `llx_cv_recrutement` ENABLE KEYS */;
-UNLOCK TABLES;
-
 --
 -- Table structure for table `llx_default_values`
 --
@@ -4778,31 +4692,6 @@ LOCK TABLES `llx_deliverydet_extrafields` WRITE;
 /*!40000 ALTER TABLE `llx_deliverydet_extrafields` ENABLE KEYS */;
 UNLOCK TABLES;
 
---
--- Table structure for table `llx_departements`
---
-
-DROP TABLE IF EXISTS `llx_departements`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_departements` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `label` varchar(355) CHARACTER SET utf8mb4 DEFAULT NULL,
-  `gestionnaire` int(11) NOT NULL,
-  PRIMARY KEY (`rowid`),
-  KEY `gestionnaire` (`gestionnaire`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_departements`
---
-
-LOCK TABLES `llx_departements` WRITE;
-/*!40000 ALTER TABLE `llx_departements` DISABLE KEYS */;
-/*!40000 ALTER TABLE `llx_departements` ENABLE KEYS */;
-UNLOCK TABLES;
-
 --
 -- Table structure for table `llx_deplacement`
 --
@@ -4842,40 +4731,6 @@ INSERT INTO `llx_deplacement` VALUES (1,NULL,1,'2012-07-09 01:58:04','2012-07-08
 /*!40000 ALTER TABLE `llx_deplacement` ENABLE KEYS */;
 UNLOCK TABLES;
 
---
--- Table structure for table `llx_dispatch_asset`
---
-
-DROP TABLE IF EXISTS `llx_dispatch_asset`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_dispatch_asset` (
-  `rowid` int(11) NOT NULL DEFAULT 0,
-  `date_cre` datetime DEFAULT NULL,
-  `date_maj` datetime DEFAULT NULL,
-  `fk_object` int(11) NOT NULL DEFAULT 0,
-  `fk_dispatch` int(11) NOT NULL DEFAULT 0,
-  `fk_asset` int(11) NOT NULL DEFAULT 0,
-  `type_object` varchar(30) CHARACTER SET latin1 DEFAULT NULL,
-  PRIMARY KEY (`rowid`),
-  KEY `date_cre` (`date_cre`),
-  KEY `date_maj` (`date_maj`),
-  KEY `fk_object` (`fk_object`),
-  KEY `fk_dispatch` (`fk_dispatch`),
-  KEY `fk_asset` (`fk_asset`),
-  KEY `type_object` (`type_object`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_dispatch_asset`
---
-
-LOCK TABLES `llx_dispatch_asset` WRITE;
-/*!40000 ALTER TABLE `llx_dispatch_asset` DISABLE KEYS */;
-/*!40000 ALTER TABLE `llx_dispatch_asset` ENABLE KEYS */;
-UNLOCK TABLES;
-
 --
 -- Table structure for table `llx_document_model`
 --
@@ -7388,7 +7243,7 @@ CREATE TABLE `llx_links` (
 
 LOCK TABLES `llx_links` WRITE;
 /*!40000 ALTER TABLE `llx_links` DISABLE KEYS */;
-INSERT INTO `llx_links` VALUES (1,1,'2018-01-16 16:45:35','http://www.dolicloud.com','The DoliCoud service','societe',10),(2,1,'2018-01-16 17:14:35','https://www.dolistore.com/en/tools-documentation/12-SVG-file-for-85cm-x-200cm-rollup.html','Link to rollup file on dolistore.com','product',11),(3,1,'2018-01-22 17:40:23','http://www.nltechno.com','NLtechno portal','societe',10),(4,1,'2018-01-22 18:32:31','https://play.google.com/store/apps/details?id=com.nltechno.dolidroidpro','Link on Google Play','product',5),(6,1,'2019-11-28 16:52:58','https://www.youtube.com/watch?v=hJSXQj_KeE0','Link on YouTube','product',5),(7,1,'2019-11-28 16:53:46','https://www.youtube.com/watch?v=hMNjvManaF4&vl=fr','Link on YouTube','product',12);
+INSERT INTO `ll	_links` VALUES (1,1,'2018-01-16 16:45:35','http://www.dolicloud.com','The DoliCoud service','societe',10),(2,1,'2018-01-16 17:14:35','https://www.dolistore.com/en/tools-documentation/12-SVG-file-for-85cm-x-200cm-rollup.html','Link to rollup file on dolistore.com','product',11),(3,1,'2018-01-22 17:40:23','http://www.nltechno.com','NLtechno portal','societe',10),(4,1,'2018-01-22 18:32:31','https://play.google.com/store/apps/details?id=com.nltechno.dolidroidpro','Link on Google Play','product',5),(6,1,'2019-11-28 16:52:58','https://www.youtube.com/watch?v=hJSXQj_KeE0','Link on YouTube','product',5),(7,1,'2019-11-28 16:53:46','https://www.youtube.com/watch?v=hMNjvManaF4&vl=fr','Link on YouTube','product',12);
 /*!40000 ALTER TABLE `llx_links` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -7753,32 +7608,6 @@ LOCK TABLES `llx_mrp_mo_extrafields` WRITE;
 /*!40000 ALTER TABLE `llx_mrp_mo_extrafields` ENABLE KEYS */;
 UNLOCK TABLES;
 
---
--- Table structure for table `llx_mrp_myobject_extrafields`
---
-
-DROP TABLE IF EXISTS `llx_mrp_myobject_extrafields`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_mrp_myobject_extrafields` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `fk_object` int(11) NOT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
-  PRIMARY KEY (`rowid`),
-  KEY `idx_fk_object` (`fk_object`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_mrp_myobject_extrafields`
---
-
-LOCK TABLES `llx_mrp_myobject_extrafields` WRITE;
-/*!40000 ALTER TABLE `llx_mrp_myobject_extrafields` DISABLE KEYS */;
-/*!40000 ALTER TABLE `llx_mrp_myobject_extrafields` ENABLE KEYS */;
-UNLOCK TABLES;
-
 --
 -- Table structure for table `llx_mrp_production`
 --
diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index ea40c5bdfcd..26a1c238c86 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -583,3 +583,16 @@ DROP TABLE llx_categorie_association;
 DROP TABLE llx_cond_reglement;
 DROP TABLE llx_zapier_hook_extrafields;
 
+create table llx_onlinesignature
+(
+  rowid                     integer AUTO_INCREMENT PRIMARY KEY,
+  entity                    integer DEFAULT 1 NOT NULL,
+  object_type               varchar(32) NOT NULL,
+  object_id					integer NOT NULL,
+  datec                     datetime NOT NULL,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  name						varchar(255) NOT NULL,
+  ip						varchar(128),
+  pathoffile				varchar(255)
+)ENGINE=innodb;
+
diff --git a/htdocs/install/mysql/tables/llx_onlinesignature.sql b/htdocs/install/mysql/tables/llx_onlinesignature.sql
new file mode 100644
index 00000000000..0c81669c467
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_onlinesignature.sql
@@ -0,0 +1,31 @@
+-- ===================================================================
+-- Copyright (C) 2021 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 <https://www.gnu.org/licenses/>.
+--
+-- Table of with online signatures
+-- ===================================================================
+
+create table llx_onlinesignature
+(
+  rowid                     integer AUTO_INCREMENT PRIMARY KEY,
+  entity                    integer DEFAULT 1 NOT NULL,
+  object_type               varchar(32) NOT NULL,
+  object_id					integer NOT NULL,
+  datec                     datetime NOT NULL,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  name						varchar(255) NOT NULL,
+  ip						varchar(128),
+  pathoffile				varchar(255)
+)ENGINE=innodb;

From 1ffc17f018a386d7f07767fef1e9e157870ae3a6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 11 Jul 2021 19:54:25 +0200
Subject: [PATCH 1183/1497] Clean the demo file

---
 dev/initdemo/mysqldump_dolibarr_14.0.0.sql | 1010 ++++++++++++--------
 1 file changed, 619 insertions(+), 391 deletions(-)

diff --git a/dev/initdemo/mysqldump_dolibarr_14.0.0.sql b/dev/initdemo/mysqldump_dolibarr_14.0.0.sql
index 7ab9d424029..4061fb9f4cf 100644
--- a/dev/initdemo/mysqldump_dolibarr_14.0.0.sql
+++ b/dev/initdemo/mysqldump_dolibarr_14.0.0.sql
@@ -1,8 +1,8 @@
--- MySQL dump 10.17  Distrib 10.3.25-MariaDB, for debian-linux-gnu (x86_64)
+-- MySQL dump 10.19  Distrib 10.3.29-MariaDB, for debian-linux-gnu (x86_64)
 --
 -- Host: localhost    Database: dolibarr_14
 -- ------------------------------------------------------
--- Server version	10.3.25-MariaDB-0ubuntu0.20.04.1
+-- Server version	10.3.29-MariaDB-0ubuntu0.20.04.1
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -102,7 +102,12 @@ CREATE TABLE `llx_accounting_bookkeeping` (
   `date_lim_reglement` datetime DEFAULT NULL,
   `fk_user` int(11) DEFAULT NULL,
   PRIMARY KEY (`rowid`),
-  KEY `idx_accounting_bookkeeping_fk_doc` (`fk_doc`)
+  KEY `idx_accounting_bookkeeping_fk_doc` (`fk_doc`),
+  KEY `idx_accounting_bookkeeping_fk_docdet` (`fk_docdet`),
+  KEY `idx_accounting_bookkeeping_doc_date` (`doc_date`),
+  KEY `idx_accounting_bookkeeping_numero_compte` (`numero_compte`,`entity`),
+  KEY `idx_accounting_bookkeeping_code_journal` (`code_journal`,`entity`),
+  KEY `idx_accounting_bookkeeping_piece_num` (`piece_num`,`entity`)
 ) ENGINE=InnoDB AUTO_INCREMENT=23 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -273,7 +278,7 @@ CREATE TABLE `llx_accounting_system` (
   `fk_country` int(11) DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_accounting_system_pcg_version` (`pcg_version`)
-) ENGINE=InnoDB AUTO_INCREMENT=70 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=73 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -282,7 +287,7 @@ CREATE TABLE `llx_accounting_system` (
 
 LOCK TABLES `llx_accounting_system` WRITE;
 /*!40000 ALTER TABLE `llx_accounting_system` DISABLE KEYS */;
-INSERT INTO `llx_accounting_system` VALUES (1,'PCG99-ABREGE','The simple accountancy french plan',1,1),(2,'PCG99-BASE','The base accountancy french plan',1,1),(3,'PCMN-BASE','The base accountancy belgium plan',1,2),(4,'PCG08-PYME','The PYME accountancy spanish plan',1,4),(5,'PC-MIPYME','The PYME accountancy Chile plan',1,67),(6,'ENG-BASE','England plan',1,7),(7,'SYSCOHADA','Plan comptable Ouest-Africain',0,NULL),(39,'PCG14-DEV','The developed accountancy french plan 2014',1,1),(40,'PCG_SUISSE','Switzerland plan',1,6),(41,'PCN-LUXEMBURG','Plan comptable normalisé Luxembourgeois',1,140),(42,'DK-STD','Standardkontoplan fra SKAT',1,80),(43,'PCT','The Tunisia plan',1,10),(44,'PCG','The Moroccan chart of accounts',1,12),(47,'SYSCOHADA-BJ','Plan comptable Ouest-Africain',1,49),(48,'SYSCOHADA-BF','Plan comptable Ouest-Africain',1,60),(49,'SYSCOHADA-CM','Plan comptable Ouest-Africain',1,24),(50,'SYSCOHADA-CF','Plan comptable Ouest-Africain',1,65),(51,'SYSCOHADA-KM','Plan comptable Ouest-Africain',1,71),(52,'SYSCOHADA-CG','Plan comptable Ouest-Africain',1,72),(53,'SYSCOHADA-CI','Plan comptable Ouest-Africain',1,21),(54,'SYSCOHADA-GA','Plan comptable Ouest-Africain',1,16),(55,'SYSCOHADA-GQ','Plan comptable Ouest-Africain',1,87),(56,'SYSCOHADA-ML','Plan comptable Ouest-Africain',1,147),(57,'SYSCOHADA-NE','Plan comptable Ouest-Africain',1,168),(58,'SYSCOHADA-CD','Plan comptable Ouest-Africain',1,73),(59,'SYSCOHADA-SN','Plan comptable Ouest-Africain',1,22),(60,'SYSCOHADA-TD','Plan comptable Ouest-Africain',1,66),(61,'SYSCOHADA-TG','Plan comptable Ouest-Africain',1,15),(62,'RO-BASE','Plan de conturi romanesc',1,188),(63,'SKR03','Standardkontenrahmen SKR 03',1,5),(64,'SKR04','Standardkontenrahmen SKR 04',1,5),(65,'BAS-K1-MINI','The Swedish mini chart of accounts',1,20),(67,'PCG18-ASSOC','French foundation chart of accounts 2018',1,1),(68,'PCGAFR14-DEV','The developed farm accountancy french plan 2014',1,1),(69,'AT-BASE','Plan Austria',1,41);
+INSERT INTO `llx_accounting_system` VALUES (1,'PCG99-ABREGE','The simple accountancy french plan',1,1),(2,'PCG99-BASE','The base accountancy french plan',1,1),(3,'PCMN-BASE','The base accountancy belgium plan',1,2),(4,'PCG08-PYME','The PYME accountancy spanish plan',1,4),(5,'PC-MIPYME','The PYME accountancy Chile plan',1,67),(6,'ENG-BASE','England plan',1,7),(7,'SYSCOHADA','Plan comptable Ouest-Africain',0,NULL),(39,'PCG14-DEV','The developed accountancy french plan 2014',1,1),(40,'PCG_SUISSE','Switzerland plan',1,6),(41,'PCN-LUXEMBURG','Plan comptable normalisé Luxembourgeois',1,140),(42,'DK-STD','Standardkontoplan fra SKAT',1,80),(43,'PCT','The Tunisia plan',1,10),(44,'PCG','The Moroccan chart of accounts',1,12),(47,'SYSCOHADA-BJ','Plan comptable Ouest-Africain',1,49),(48,'SYSCOHADA-BF','Plan comptable Ouest-Africain',1,60),(49,'SYSCOHADA-CM','Plan comptable Ouest-Africain',1,24),(50,'SYSCOHADA-CF','Plan comptable Ouest-Africain',1,65),(51,'SYSCOHADA-KM','Plan comptable Ouest-Africain',1,71),(52,'SYSCOHADA-CG','Plan comptable Ouest-Africain',1,72),(53,'SYSCOHADA-CI','Plan comptable Ouest-Africain',1,21),(54,'SYSCOHADA-GA','Plan comptable Ouest-Africain',1,16),(55,'SYSCOHADA-GQ','Plan comptable Ouest-Africain',1,87),(56,'SYSCOHADA-ML','Plan comptable Ouest-Africain',1,147),(57,'SYSCOHADA-NE','Plan comptable Ouest-Africain',1,168),(58,'SYSCOHADA-CD','Plan comptable Ouest-Africain',1,73),(59,'SYSCOHADA-SN','Plan comptable Ouest-Africain',1,22),(60,'SYSCOHADA-TD','Plan comptable Ouest-Africain',1,66),(61,'SYSCOHADA-TG','Plan comptable Ouest-Africain',1,15),(62,'RO-BASE','Plan de conturi romanesc',1,188),(63,'SKR03','Standardkontenrahmen SKR 03',1,5),(64,'SKR04','Standardkontenrahmen SKR 04',1,5),(65,'BAS-K1-MINI','The Swedish mini chart of accounts',1,20),(67,'PCG18-ASSOC','French foundation chart of accounts 2018',1,1),(68,'PCGAFR14-DEV','The developed farm accountancy french plan 2014',1,1),(69,'AT-BASE','Plan Austria',1,41),(70,'US-BASE','USA basic chart of accounts',1,11),(71,'CA-ENG-BASE','Canadian basic chart of accounts - English',1,14),(72,'SAT/24-2019','Catalogo y codigo agrupador fiscal del 2019',1,154);
 /*!40000 ALTER TABLE `llx_accounting_system` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -489,6 +494,7 @@ CREATE TABLE `llx_adherent` (
   `state_id` int(11) DEFAULT NULL,
   `country` int(11) DEFAULT NULL,
   `email` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `url` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   `socialnetworks` text COLLATE utf8_unicode_ci DEFAULT NULL,
   `skype` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   `phone` varchar(30) COLLATE utf8_unicode_ci DEFAULT NULL,
@@ -535,7 +541,7 @@ CREATE TABLE `llx_adherent` (
 
 LOCK TABLES `llx_adherent` WRITE;
 /*!40000 ALTER TABLE `llx_adherent` DISABLE KEYS */;
-INSERT INTO `llx_adherent` VALUES (1,'1',1,NULL,NULL,'Smith','Vick','vsmith','vsx1n8tf',NULL,2,'phy',NULL,10,NULL,NULL,NULL,NULL,102,'vsmith@email.com','[]',NULL,NULL,NULL,NULL,'1960-07-07','person5.jpeg',0,0,'2014-07-09 00:00:00',NULL,NULL,'2012-07-10 15:12:56','2012-07-08 23:50:00','2021-04-15 10:22:54',1,12,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'woman'),(2,'2',1,NULL,NULL,'Curie','Pierre','pcurie','pcuriedolibarr',NULL,2,'phy',NULL,12,NULL,NULL,NULL,NULL,NULL,'pcurie@example.com','[]',NULL,NULL,NULL,NULL,NULL,'pierrecurie.jpg',1,1,'2020-07-17 00:00:00',NULL,NULL,'2012-07-10 15:03:32','2012-07-10 15:03:09','2021-04-15 10:22:54',1,12,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(3,'3',1,NULL,NULL,'john','doe','john','8bs6gty5',NULL,2,'phy',NULL,NULL,NULL,NULL,NULL,NULL,1,'johndoe@email.com','[]',NULL,NULL,NULL,NULL,NULL,'person9.jpeg',1,0,'2014-07-17 00:00:00',NULL,NULL,'2013-07-18 21:28:00','2013-07-18 21:10:09','2021-04-15 10:22:54',1,12,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(4,'4',1,NULL,NULL,'smith','smith','Smith','s6hjp10f',NULL,2,'phy',NULL,NULL,NULL,NULL,NULL,NULL,11,'smith@email.com','[]',NULL,NULL,NULL,NULL,NULL,'person2.jpeg',1,0,'2018-07-17 00:00:00',NULL,NULL,'2013-07-18 21:27:52','2013-07-18 21:27:44','2021-04-15 10:22:54',1,12,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+INSERT INTO `llx_adherent` VALUES (1,'1',1,NULL,NULL,'Smith','Vick','vsmith','vsx1n8tf',NULL,2,'phy',NULL,10,NULL,NULL,NULL,NULL,102,'vsmith@email.com',NULL,'[]',NULL,NULL,NULL,NULL,'1960-07-07','person5.jpeg',0,0,'2014-07-09 00:00:00',NULL,NULL,'2012-07-10 15:12:56','2012-07-08 23:50:00','2021-04-15 10:22:54',1,12,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'woman'),(2,'2',1,NULL,NULL,'Curie','Pierre','pcurie','pcuriedolibarr',NULL,2,'phy',NULL,12,NULL,NULL,NULL,NULL,NULL,'pcurie@example.com',NULL,'[]',NULL,NULL,NULL,NULL,NULL,'pierrecurie.jpg',1,1,'2020-07-17 00:00:00',NULL,NULL,'2012-07-10 15:03:32','2012-07-10 15:03:09','2021-04-15 10:22:54',1,12,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(3,'3',1,NULL,NULL,'john','doe','john','8bs6gty5',NULL,2,'phy',NULL,NULL,NULL,NULL,NULL,NULL,1,'johndoe@email.com',NULL,'[]',NULL,NULL,NULL,NULL,NULL,'person9.jpeg',1,0,'2014-07-17 00:00:00',NULL,NULL,'2013-07-18 21:28:00','2013-07-18 21:10:09','2021-04-15 10:22:54',1,12,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(4,'4',1,NULL,NULL,'smith','smith','Smith','s6hjp10f',NULL,2,'phy',NULL,NULL,NULL,NULL,NULL,NULL,11,'smith@email.com',NULL,'[]',NULL,NULL,NULL,NULL,NULL,'person2.jpeg',1,0,'2018-07-17 00:00:00',NULL,NULL,'2013-07-18 21:27:52','2013-07-18 21:27:44','2021-04-15 10:22:54',1,12,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 /*!40000 ALTER TABLE `llx_adherent` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -584,6 +590,7 @@ CREATE TABLE `llx_adherent_type` (
   `statut` smallint(6) NOT NULL DEFAULT 0,
   `libelle` varchar(50) COLLATE utf8_unicode_ci NOT NULL,
   `subscription` varchar(3) COLLATE utf8_unicode_ci NOT NULL DEFAULT '1',
+  `amount` double(24,8) DEFAULT NULL,
   `vote` varchar(3) COLLATE utf8_unicode_ci NOT NULL DEFAULT '1',
   `note` text COLLATE utf8_unicode_ci DEFAULT NULL,
   `mail_valid` text COLLATE utf8_unicode_ci DEFAULT NULL,
@@ -600,7 +607,7 @@ CREATE TABLE `llx_adherent_type` (
 
 LOCK TABLES `llx_adherent_type` WRITE;
 /*!40000 ALTER TABLE `llx_adherent_type` DISABLE KEYS */;
-INSERT INTO `llx_adherent_type` VALUES (1,1,'2020-06-12 17:20:50',1,'Board members','1','1','','','','1y'),(2,1,'2020-06-12 17:21:21',1,'Standard members','1','1','','','','y');
+INSERT INTO `llx_adherent_type` VALUES (1,1,'2020-06-12 17:20:50',1,'Board members','1',NULL,'1','','','','1y'),(2,1,'2020-06-12 17:21:21',1,'Standard members','1',NULL,'1','','','','y');
 /*!40000 ALTER TABLE `llx_adherent_type` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -865,7 +872,7 @@ CREATE TABLE `llx_bank` (
 
 LOCK TABLES `llx_bank` WRITE;
 /*!40000 ALTER TABLE `llx_bank` DISABLE KEYS */;
-INSERT INTO `llx_bank` VALUES (1,'2012-07-08 23:56:14','2020-12-10 12:24:23','2020-07-08','2020-07-08',2000.00000000,'(Initial balance)',1,NULL,1,'SOLD','201210',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(2,'2012-07-09 00:00:24','2020-12-10 12:24:23','2020-07-09','2020-07-09',500.00000000,'(Initial balance)',2,NULL,NULL,'SOLD',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(3,'2012-07-10 13:33:42','2020-12-10 12:24:23','2020-07-10','2020-07-10',0.00000000,'(Solde initial)',3,NULL,NULL,'SOLD',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(5,'2013-07-18 20:50:24','2020-12-10 12:24:23','2020-07-08','2020-07-08',20.00000000,'(CustomerInvoicePayment)',1,1,NULL,'CB','201107',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(6,'2013-07-18 20:50:47','2020-12-10 12:24:23','2020-07-08','2020-07-08',10.00000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(8,'2013-08-01 03:34:11','2020-12-10 12:24:23','2020-08-15','2020-08-01',5.63000000,'(CustomerInvoicePayment)',1,1,1,'CB','201210',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(12,'2013-08-05 23:11:37','2020-12-10 12:24:23','2020-08-12','2020-08-05',-10.00000000,'(SocialContributionPayment)',1,1,1,'VIR','201210',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(13,'2013-08-06 20:33:54','2020-12-10 12:24:23','2020-08-06','2020-08-06',5.98000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(14,'2013-08-08 02:53:40','2020-12-10 12:24:23','2020-08-08','2020-08-08',26.10000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(15,'2013-08-08 02:55:58','2020-12-10 12:24:23','2020-08-08','2020-08-08',26.96000000,'(CustomerInvoicePayment)',1,1,1,'TIP','201211',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(16,'2014-12-09 15:28:44','2020-12-10 12:24:23','2020-12-09','2020-12-09',2.00000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(17,'2014-12-09 15:28:53','2020-12-10 12:24:23','2020-12-09','2020-12-09',-2.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(18,'2014-12-09 17:35:55','2020-12-10 12:24:23','2020-12-09','2020-12-09',-2.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(19,'2014-12-09 17:37:02','2020-12-10 12:24:23','2020-12-09','2020-12-09',2.00000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(20,'2014-12-09 18:35:07','2020-12-10 12:24:23','2020-12-09','2020-12-09',-2.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(21,'2014-12-12 18:54:33','2021-04-15 10:22:31','2020-12-12','2020-12-12',1.00000000,'(CustomerInvoicePayment)',1,1,1,'TIP','201210',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(22,'2015-03-06 16:48:16','2021-04-15 10:22:31','2021-03-06','2021-03-06',20.00000000,'(SubscriptionPayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(23,'2015-03-20 14:30:11','2021-04-15 10:22:31','2021-03-20','2021-03-20',10.00000000,'(SubscriptionPayment)',1,1,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(24,'2016-03-02 19:57:58','2020-12-10 12:24:23','2020-07-09','2020-07-09',605.00000000,'(CustomerInvoicePayment)',1,1,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,'111',NULL,NULL,NULL,NULL,NULL),(26,'2016-03-02 20:01:39','2021-04-15 10:22:31','2021-03-19','2021-03-19',500.00000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(27,'2016-03-02 20:02:06','2021-04-15 10:22:31','2021-03-21','2021-03-21',400.00000000,'(CustomerInvoicePayment)',1,1,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,'ABC and Co',NULL,NULL,NULL,NULL,NULL),(28,'2016-03-03 19:22:32','2020-12-10 12:24:23','2020-10-03','2020-10-03',-400.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(29,'2016-03-03 19:23:16','2021-04-15 10:22:31','2021-03-10','2021-03-10',-300.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(30,'2018-01-22 18:56:34','2021-04-15 10:22:31','2021-01-22','2021-01-22',-900.00000000,'(SupplierInvoicePayment)',1,12,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(31,'2018-07-30 22:42:14','2020-12-10 12:24:23','2020-07-30','2020-07-30',0.00000000,'(Initial balance)',4,0,NULL,'SOLD',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(32,'2017-02-01 19:02:44','2021-04-15 10:22:31','2021-02-01','2021-02-01',-200.00000000,'(SupplierInvoicePayment)',3,12,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(33,'2017-02-06 08:10:24','2021-04-15 10:22:31','2021-03-22','2021-03-22',150.00000000,'(CustomerInvoicePayment)',1,12,NULL,'CHQ',NULL,NULL,0,NULL,2,NULL,'Magic Food Store',NULL,NULL,NULL,NULL,NULL),(34,'2017-02-06 08:10:50','2021-04-15 10:22:31','2021-03-25','2021-03-25',140.00000000,'(CustomerInvoicePayment)',1,12,NULL,'PRE',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(36,'2017-02-16 02:22:09','2021-04-15 10:22:31','2021-02-16','2021-02-16',-1.00000000,'(ExpenseReportPayment)',4,12,NULL,'CHQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(37,'2017-02-21 16:07:43','2021-04-15 10:22:31','2021-02-21','2021-02-21',50.00000000,'(WithdrawalPayment)',1,12,NULL,'PRE',NULL,'T170201',0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(38,'2017-09-06 20:08:36','2020-12-10 12:24:23','2020-09-06','2020-09-06',10.00000000,'(DonationPayment)',3,12,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL),(39,'2018-03-16 13:59:31','2021-04-15 10:22:31','2021-03-16','2021-03-16',10.00000000,'(CustomerInvoicePayment)',4,12,NULL,'CHQ',NULL,NULL,0,NULL,0,NULL,'Indian SAS',NULL,'',NULL,NULL,NULL),(41,'2019-10-04 10:28:14','2021-04-15 10:22:31','2021-01-19','2021-01-19',5.63000000,'(CustomerInvoicePayment)',3,12,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL),(42,'2019-10-08 13:18:50','2020-12-10 12:24:23','2020-10-08','2020-10-08',-1000.00000000,'Salary payment',4,12,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL),(43,'2019-12-26 01:48:30','2021-04-15 10:22:31','2020-12-25','2020-12-25',-5.00000000,'(SocialContributionPayment)',4,12,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL),(44,'2019-12-26 01:48:46','2021-04-15 10:22:31','2020-12-25','2020-12-25',-5.00000000,'(SocialContributionPayment)',3,12,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL),(47,'2020-01-01 20:28:49','2021-04-15 10:22:31','2021-01-01','2021-01-01',304.69000000,'(SupplierInvoicePayment)',4,12,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL),(48,'2020-01-06 20:52:28','2021-04-15 10:22:31','2021-01-06','2021-01-06',10.00000000,'Patient payment',1,12,NULL,'CB',NULL,NULL,0,NULL,0,NULL,'Patient',NULL,'',NULL,NULL,NULL),(49,'2020-01-10 04:42:47','2021-04-15 10:22:31','2021-01-10','2021-01-10',-10.00000000,'Miscellaneous payment',4,12,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL),(50,'2020-01-16 02:36:48','2021-04-15 10:22:31','2021-01-16','2021-01-16',20.50000000,'(CustomerInvoicePayment)',4,12,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,'Magic Food Store',NULL,'',NULL,NULL,NULL),(51,'2020-01-21 01:02:14','2020-12-10 12:24:23','2020-07-18','2020-07-18',50.00000000,'Subscription 2013',4,12,NULL,'CB',NULL,'12345',0,NULL,0,'Bank CBN',NULL,NULL,'',NULL,NULL,NULL),(52,'2020-01-21 10:22:37','2021-04-15 10:22:31','2021-01-21','2021-01-21',50.00000000,'Subscription 2017',4,12,NULL,'CHQ',NULL,NULL,0,NULL,0,NULL,'smith smith',NULL,'',NULL,NULL,NULL),(53,'2020-01-21 10:23:17','2021-04-15 10:22:31','2021-01-21','2021-01-21',50.00000000,'(SubscriptionPayment)',4,12,NULL,'CHQ',NULL,NULL,0,NULL,0,NULL,'Pierre Curie',NULL,'',NULL,NULL,NULL),(54,'2020-01-21 10:23:28','2021-04-15 10:22:31','2021-01-21','2021-01-21',50.00000000,'(SubscriptionPayment)',4,12,NULL,'CHQ',NULL,NULL,0,NULL,0,NULL,'Pierre Curie',NULL,'',NULL,NULL,NULL),(55,'2020-01-21 10:23:49','2021-04-15 10:22:31','2021-01-21','2021-01-21',50.00000000,'(SubscriptionPayment)',4,12,NULL,'CB',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL);
+INSERT INTO `llx_bank` VALUES (1,'2012-07-08 23:56:14','2021-07-11 17:49:28','2021-07-08','2021-07-08',2000.00000000,'(Initial balance)',1,NULL,1,'SOLD','201210',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(2,'2012-07-09 00:00:24','2021-07-11 17:49:28','2021-07-09','2021-07-09',500.00000000,'(Initial balance)',2,NULL,NULL,'SOLD',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(3,'2012-07-10 13:33:42','2021-07-11 17:49:28','2021-07-10','2021-07-10',0.00000000,'(Solde initial)',3,NULL,NULL,'SOLD',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(5,'2013-07-18 20:50:24','2021-07-11 17:49:28','2021-07-08','2021-07-08',20.00000000,'(CustomerInvoicePayment)',1,1,NULL,'CB','201107',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(6,'2013-07-18 20:50:47','2021-07-11 17:49:28','2021-07-08','2021-07-08',10.00000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(8,'2013-08-01 03:34:11','2020-12-10 12:24:23','2020-08-15','2020-08-01',5.63000000,'(CustomerInvoicePayment)',1,1,1,'CB','201210',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(12,'2013-08-05 23:11:37','2020-12-10 12:24:23','2020-08-12','2020-08-05',-10.00000000,'(SocialContributionPayment)',1,1,1,'VIR','201210',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(13,'2013-08-06 20:33:54','2020-12-10 12:24:23','2020-08-06','2020-08-06',5.98000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(14,'2013-08-08 02:53:40','2020-12-10 12:24:23','2020-08-08','2020-08-08',26.10000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(15,'2013-08-08 02:55:58','2020-12-10 12:24:23','2020-08-08','2020-08-08',26.96000000,'(CustomerInvoicePayment)',1,1,1,'TIP','201211',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(16,'2014-12-09 15:28:44','2020-12-10 12:24:23','2020-12-09','2020-12-09',2.00000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(17,'2014-12-09 15:28:53','2020-12-10 12:24:23','2020-12-09','2020-12-09',-2.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(18,'2014-12-09 17:35:55','2020-12-10 12:24:23','2020-12-09','2020-12-09',-2.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(19,'2014-12-09 17:37:02','2020-12-10 12:24:23','2020-12-09','2020-12-09',2.00000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(20,'2014-12-09 18:35:07','2020-12-10 12:24:23','2020-12-09','2020-12-09',-2.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(21,'2014-12-12 18:54:33','2021-04-15 10:22:31','2020-12-12','2020-12-12',1.00000000,'(CustomerInvoicePayment)',1,1,1,'TIP','201210',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(22,'2015-03-06 16:48:16','2021-04-15 10:22:31','2021-03-06','2021-03-06',20.00000000,'(SubscriptionPayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(23,'2015-03-20 14:30:11','2021-04-15 10:22:31','2021-03-20','2021-03-20',10.00000000,'(SubscriptionPayment)',1,1,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(24,'2016-03-02 19:57:58','2021-07-11 17:49:28','2021-07-09','2021-07-09',605.00000000,'(CustomerInvoicePayment)',1,1,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,'111',NULL,NULL,NULL,NULL,NULL),(26,'2016-03-02 20:01:39','2021-04-15 10:22:31','2021-03-19','2021-03-19',500.00000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(27,'2016-03-02 20:02:06','2021-04-15 10:22:31','2021-03-21','2021-03-21',400.00000000,'(CustomerInvoicePayment)',1,1,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,'ABC and Co',NULL,NULL,NULL,NULL,NULL),(28,'2016-03-03 19:22:32','2020-12-10 12:24:23','2020-10-03','2020-10-03',-400.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(29,'2016-03-03 19:23:16','2021-04-15 10:22:31','2021-03-10','2021-03-10',-300.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(30,'2018-01-22 18:56:34','2021-04-15 10:22:31','2021-01-22','2021-01-22',-900.00000000,'(SupplierInvoicePayment)',1,12,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(31,'2018-07-30 22:42:14','2020-12-10 12:24:23','2020-07-30','2020-07-30',0.00000000,'(Initial balance)',4,0,NULL,'SOLD',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(32,'2017-02-01 19:02:44','2021-04-15 10:22:31','2021-02-01','2021-02-01',-200.00000000,'(SupplierInvoicePayment)',3,12,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(33,'2017-02-06 08:10:24','2021-04-15 10:22:31','2021-03-22','2021-03-22',150.00000000,'(CustomerInvoicePayment)',1,12,NULL,'CHQ',NULL,NULL,0,NULL,2,NULL,'Magic Food Store',NULL,NULL,NULL,NULL,NULL),(34,'2017-02-06 08:10:50','2021-04-15 10:22:31','2021-03-25','2021-03-25',140.00000000,'(CustomerInvoicePayment)',1,12,NULL,'PRE',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(36,'2017-02-16 02:22:09','2021-04-15 10:22:31','2021-02-16','2021-02-16',-1.00000000,'(ExpenseReportPayment)',4,12,NULL,'CHQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(37,'2017-02-21 16:07:43','2021-04-15 10:22:31','2021-02-21','2021-02-21',50.00000000,'(WithdrawalPayment)',1,12,NULL,'PRE',NULL,'T170201',0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(38,'2017-09-06 20:08:36','2020-12-10 12:24:23','2020-09-06','2020-09-06',10.00000000,'(DonationPayment)',3,12,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL),(39,'2018-03-16 13:59:31','2021-04-15 10:22:31','2021-03-16','2021-03-16',10.00000000,'(CustomerInvoicePayment)',4,12,NULL,'CHQ',NULL,NULL,0,NULL,0,NULL,'Indian SAS',NULL,'',NULL,NULL,NULL),(41,'2019-10-04 10:28:14','2021-04-15 10:22:31','2021-01-19','2021-01-19',5.63000000,'(CustomerInvoicePayment)',3,12,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL),(42,'2019-10-08 13:18:50','2020-12-10 12:24:23','2020-10-08','2020-10-08',-1000.00000000,'Salary payment',4,12,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL),(43,'2019-12-26 01:48:30','2021-04-15 10:22:31','2020-12-25','2020-12-25',-5.00000000,'(SocialContributionPayment)',4,12,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL),(44,'2019-12-26 01:48:46','2021-04-15 10:22:31','2020-12-25','2020-12-25',-5.00000000,'(SocialContributionPayment)',3,12,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL),(47,'2020-01-01 20:28:49','2021-04-15 10:22:31','2021-01-01','2021-01-01',304.69000000,'(SupplierInvoicePayment)',4,12,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL),(48,'2020-01-06 20:52:28','2021-04-15 10:22:31','2021-01-06','2021-01-06',10.00000000,'Patient payment',1,12,NULL,'CB',NULL,NULL,0,NULL,0,NULL,'Patient',NULL,'',NULL,NULL,NULL),(49,'2020-01-10 04:42:47','2021-04-15 10:22:31','2021-01-10','2021-01-10',-10.00000000,'Miscellaneous payment',4,12,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL),(50,'2020-01-16 02:36:48','2021-04-15 10:22:31','2021-01-16','2021-01-16',20.50000000,'(CustomerInvoicePayment)',4,12,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,'Magic Food Store',NULL,'',NULL,NULL,NULL),(51,'2020-01-21 01:02:14','2020-12-10 12:24:23','2020-07-18','2020-07-18',50.00000000,'Subscription 2013',4,12,NULL,'CB',NULL,'12345',0,NULL,0,'Bank CBN',NULL,NULL,'',NULL,NULL,NULL),(52,'2020-01-21 10:22:37','2021-04-15 10:22:31','2021-01-21','2021-01-21',50.00000000,'Subscription 2017',4,12,NULL,'CHQ',NULL,NULL,0,NULL,0,NULL,'smith smith',NULL,'',NULL,NULL,NULL),(53,'2020-01-21 10:23:17','2021-04-15 10:22:31','2021-01-21','2021-01-21',50.00000000,'(SubscriptionPayment)',4,12,NULL,'CHQ',NULL,NULL,0,NULL,0,NULL,'Pierre Curie',NULL,'',NULL,NULL,NULL),(54,'2020-01-21 10:23:28','2021-04-15 10:22:31','2021-01-21','2021-01-21',50.00000000,'(SubscriptionPayment)',4,12,NULL,'CHQ',NULL,NULL,0,NULL,0,NULL,'Pierre Curie',NULL,'',NULL,NULL,NULL),(55,'2020-01-21 10:23:49','2021-04-15 10:22:31','2021-01-21','2021-01-21',50.00000000,'(SubscriptionPayment)',4,12,NULL,'CB',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL);
 /*!40000 ALTER TABLE `llx_bank` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1335,7 +1342,7 @@ CREATE TABLE `llx_boxes` (
   KEY `idx_boxes_boxid` (`box_id`),
   KEY `idx_boxes_fk_user` (`fk_user`),
   CONSTRAINT `fk_boxes_box_id` FOREIGN KEY (`box_id`) REFERENCES `llx_boxes_def` (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=1453 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=1456 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1344,7 +1351,7 @@ CREATE TABLE `llx_boxes` (
 
 LOCK TABLES `llx_boxes` WRITE;
 /*!40000 ALTER TABLE `llx_boxes` DISABLE KEYS */;
-INSERT INTO `llx_boxes` VALUES (253,2,323,0,'0',0,NULL,NULL),(304,2,324,0,'0',0,NULL,NULL),(305,2,325,0,'0',0,NULL,NULL),(306,2,326,0,'0',0,NULL,NULL),(307,2,327,0,'0',0,NULL,NULL),(308,2,328,0,'0',0,NULL,NULL),(309,2,329,0,'0',0,NULL,NULL),(310,2,330,0,'0',0,NULL,NULL),(311,2,331,0,'0',0,NULL,NULL),(312,2,332,0,'0',0,NULL,NULL),(313,2,333,0,'0',0,NULL,NULL),(314,1,347,0,'A27',0,NULL,NULL),(315,1,348,0,'B20',0,NULL,NULL),(316,1,349,0,'B10',0,NULL,NULL),(317,1,350,0,'B18',0,NULL,NULL),(344,1,374,0,'B08',0,NULL,NULL),(347,1,377,0,'B16',0,NULL,NULL),(348,1,378,0,'B06',0,NULL,NULL),(358,1,388,0,'B38',0,NULL,NULL),(359,1,389,0,'A13',0,NULL,NULL),(360,1,390,0,'B36',0,NULL,NULL),(362,1,392,0,'A35',0,NULL,NULL),(363,1,393,0,'A11',0,NULL,NULL),(366,1,396,0,'B12',0,NULL,NULL),(387,1,403,0,'B22',0,NULL,NULL),(392,1,409,0,'A15',0,NULL,NULL),(393,1,410,0,'A33',0,NULL,NULL),(394,1,411,0,'A25',0,NULL,NULL),(395,1,412,0,'B30',0,NULL,NULL),(396,1,413,0,'A23',0,NULL,NULL),(397,1,414,0,'B28',0,NULL,NULL),(398,1,415,0,'A21',0,NULL,NULL),(399,1,416,0,'B26',0,NULL,NULL),(400,1,417,0,'A19',0,NULL,NULL),(401,1,418,0,'B24',0,NULL,NULL),(501,1,419,0,'A17',0,NULL,NULL),(1019,1,392,0,'A01',2,NULL,NULL),(1021,1,412,0,'A03',2,NULL,NULL),(1022,1,347,0,'A04',2,NULL,NULL),(1023,1,393,0,'A05',2,NULL,NULL),(1025,1,389,0,'A07',2,NULL,NULL),(1026,1,416,0,'A08',2,NULL,NULL),(1027,1,396,0,'B01',2,NULL,NULL),(1028,1,377,0,'B02',2,NULL,NULL),(1031,1,419,0,'B05',2,NULL,NULL),(1036,1,424,0,'A29',0,NULL,NULL),(1037,1,425,0,'B32',0,NULL,NULL),(1038,1,426,0,'B34',0,NULL,NULL),(1150,1,430,0,'A37',0,NULL,NULL),(1151,1,431,0,'A05',0,NULL,NULL),(1152,1,429,0,'A01',1,NULL,NULL),(1153,1,429,0,'B01',2,NULL,NULL),(1154,1,429,0,'A01',11,NULL,NULL),(1156,1,429,0,'A07',0,NULL,NULL),(1183,1,433,0,'A09',0,NULL,NULL),(1184,1,434,0,'B14',0,NULL,NULL),(1235,1,404,0,'B01',1,NULL,NULL),(1236,1,404,0,'B01',2,NULL,NULL),(1237,1,404,0,'B01',11,NULL,NULL),(1239,1,404,0,'A31',0,NULL,NULL),(1407,1,412,0,'A01',12,NULL,NULL),(1408,1,378,0,'A02',12,NULL,NULL),(1409,1,404,0,'A03',12,NULL,NULL),(1410,1,377,0,'A04',12,NULL,NULL),(1411,1,392,0,'B01',12,NULL,NULL),(1412,1,429,0,'B02',12,NULL,NULL),(1414,1,414,0,'B04',12,NULL,NULL),(1415,1,413,0,'B05',12,NULL,NULL),(1416,1,426,0,'B06',12,NULL,NULL),(1418,1,445,0,'B02',0,NULL,NULL),(1419,1,458,0,'A03',0,NULL,NULL),(1420,1,459,0,'B04',0,NULL,NULL),(1421,1,460,0,'A01',0,NULL,NULL),(1426,1,450,2,'A01',0,NULL,NULL),(1427,1,451,2,'B01',0,NULL,NULL),(1428,1,452,2,'A01',0,NULL,NULL),(1429,1,453,2,'B01',0,NULL,NULL),(1430,1,454,11,'A01',0,NULL,NULL),(1431,1,455,11,'B01',0,NULL,NULL),(1432,1,456,11,'A01',0,NULL,NULL),(1433,1,457,11,'B01',0,NULL,NULL),(1434,1,461,11,'A01',0,NULL,NULL),(1435,1,462,11,'B01',0,NULL,NULL),(1436,1,448,0,'A01',1,NULL,NULL),(1437,1,448,0,'B01',2,NULL,NULL),(1438,1,448,0,'A01',11,NULL,NULL),(1439,1,448,0,'A01',12,NULL,NULL),(1440,1,448,0,'A01',0,NULL,NULL),(1441,1,449,0,'B01',1,NULL,NULL),(1442,1,449,0,'A01',2,NULL,NULL),(1443,1,449,0,'B01',11,NULL,NULL),(1444,1,449,0,'A01',12,NULL,NULL),(1445,1,449,0,'B01',0,NULL,NULL),(1449,1,452,2,'A01',12,NULL,NULL),(1450,1,451,2,'B01',12,NULL,NULL),(1451,1,450,2,'B02',12,NULL,NULL),(1452,1,453,2,'B03',12,NULL,NULL);
+INSERT INTO `llx_boxes` VALUES (253,2,323,0,'0',0,NULL,NULL),(304,2,324,0,'0',0,NULL,NULL),(305,2,325,0,'0',0,NULL,NULL),(306,2,326,0,'0',0,NULL,NULL),(307,2,327,0,'0',0,NULL,NULL),(308,2,328,0,'0',0,NULL,NULL),(309,2,329,0,'0',0,NULL,NULL),(310,2,330,0,'0',0,NULL,NULL),(311,2,331,0,'0',0,NULL,NULL),(312,2,332,0,'0',0,NULL,NULL),(313,2,333,0,'0',0,NULL,NULL),(314,1,347,0,'A27',0,NULL,NULL),(315,1,348,0,'B20',0,NULL,NULL),(316,1,349,0,'B10',0,NULL,NULL),(317,1,350,0,'B18',0,NULL,NULL),(344,1,374,0,'B08',0,NULL,NULL),(347,1,377,0,'B16',0,NULL,NULL),(348,1,378,0,'B06',0,NULL,NULL),(358,1,388,0,'B38',0,NULL,NULL),(359,1,389,0,'A13',0,NULL,NULL),(360,1,390,0,'B36',0,NULL,NULL),(362,1,392,0,'A35',0,NULL,NULL),(363,1,393,0,'A11',0,NULL,NULL),(366,1,396,0,'B12',0,NULL,NULL),(387,1,403,0,'B22',0,NULL,NULL),(392,1,409,0,'A15',0,NULL,NULL),(393,1,410,0,'A33',0,NULL,NULL),(394,1,411,0,'A25',0,NULL,NULL),(395,1,412,0,'B30',0,NULL,NULL),(396,1,413,0,'A23',0,NULL,NULL),(397,1,414,0,'B28',0,NULL,NULL),(398,1,415,0,'A21',0,NULL,NULL),(399,1,416,0,'B26',0,NULL,NULL),(400,1,417,0,'A19',0,NULL,NULL),(401,1,418,0,'B24',0,NULL,NULL),(501,1,419,0,'A17',0,NULL,NULL),(1019,1,392,0,'A01',2,NULL,NULL),(1021,1,412,0,'A03',2,NULL,NULL),(1022,1,347,0,'A04',2,NULL,NULL),(1023,1,393,0,'A05',2,NULL,NULL),(1025,1,389,0,'A07',2,NULL,NULL),(1026,1,416,0,'A08',2,NULL,NULL),(1027,1,396,0,'B01',2,NULL,NULL),(1028,1,377,0,'B02',2,NULL,NULL),(1031,1,419,0,'B05',2,NULL,NULL),(1036,1,424,0,'A29',0,NULL,NULL),(1037,1,425,0,'B32',0,NULL,NULL),(1038,1,426,0,'B34',0,NULL,NULL),(1150,1,430,0,'A37',0,NULL,NULL),(1151,1,431,0,'A05',0,NULL,NULL),(1152,1,429,0,'A01',1,NULL,NULL),(1153,1,429,0,'B01',2,NULL,NULL),(1154,1,429,0,'A01',11,NULL,NULL),(1156,1,429,0,'A07',0,NULL,NULL),(1183,1,433,0,'A09',0,NULL,NULL),(1184,1,434,0,'B14',0,NULL,NULL),(1235,1,404,0,'B01',1,NULL,NULL),(1236,1,404,0,'B01',2,NULL,NULL),(1237,1,404,0,'B01',11,NULL,NULL),(1239,1,404,0,'A31',0,NULL,NULL),(1407,1,412,0,'A01',12,NULL,NULL),(1408,1,378,0,'A02',12,NULL,NULL),(1409,1,404,0,'A03',12,NULL,NULL),(1410,1,377,0,'A04',12,NULL,NULL),(1411,1,392,0,'B01',12,NULL,NULL),(1412,1,429,0,'B02',12,NULL,NULL),(1414,1,414,0,'B04',12,NULL,NULL),(1415,1,413,0,'B05',12,NULL,NULL),(1416,1,426,0,'B06',12,NULL,NULL),(1418,1,445,0,'B02',0,NULL,NULL),(1426,1,450,2,'A01',0,NULL,NULL),(1427,1,451,2,'B01',0,NULL,NULL),(1428,1,452,2,'A01',0,NULL,NULL),(1429,1,453,2,'B01',0,NULL,NULL),(1430,1,454,11,'A01',0,NULL,NULL),(1431,1,455,11,'B01',0,NULL,NULL),(1432,1,456,11,'A01',0,NULL,NULL),(1433,1,457,11,'B01',0,NULL,NULL),(1434,1,461,11,'A01',0,NULL,NULL),(1435,1,462,11,'B01',0,NULL,NULL),(1436,1,448,0,'A01',1,NULL,NULL),(1437,1,448,0,'B01',2,NULL,NULL),(1438,1,448,0,'A01',11,NULL,NULL),(1439,1,448,0,'A01',12,NULL,NULL),(1440,1,448,0,'A01',0,NULL,NULL),(1441,1,449,0,'B01',1,NULL,NULL),(1442,1,449,0,'A01',2,NULL,NULL),(1443,1,449,0,'B01',11,NULL,NULL),(1444,1,449,0,'A01',12,NULL,NULL),(1445,1,449,0,'B01',0,NULL,NULL),(1449,1,452,2,'A01',12,NULL,NULL),(1450,1,451,2,'B01',12,NULL,NULL),(1451,1,450,2,'B02',12,NULL,NULL),(1452,1,453,2,'B03',12,NULL,NULL),(1453,1,467,0,'0',0,NULL,NULL),(1454,1,468,0,'0',0,NULL,NULL),(1455,1,469,0,'0',0,NULL,NULL);
 /*!40000 ALTER TABLE `llx_boxes` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1363,7 +1370,7 @@ CREATE TABLE `llx_boxes_def` (
   `note` varchar(130) COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_boxes_def` (`file`,`entity`,`note`)
-) ENGINE=InnoDB AUTO_INCREMENT=467 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=474 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1372,7 +1379,7 @@ CREATE TABLE `llx_boxes_def` (
 
 LOCK TABLES `llx_boxes_def` WRITE;
 /*!40000 ALTER TABLE `llx_boxes_def` DISABLE KEYS */;
-INSERT INTO `llx_boxes_def` VALUES (323,'box_actions.php',2,'2015-03-13 15:29:19',NULL),(324,'box_clients.php',2,'2015-03-13 20:21:35',NULL),(325,'box_prospect.php',2,'2015-03-13 20:21:35',NULL),(326,'box_contacts.php',2,'2015-03-13 20:21:35',NULL),(327,'box_activity.php',2,'2015-03-13 20:21:35','(WarningUsingThisBoxSlowDown)'),(328,'box_propales.php',2,'2015-03-13 20:32:38',NULL),(329,'box_comptes.php',2,'2015-03-13 20:33:09',NULL),(330,'box_factures_imp.php',2,'2015-03-13 20:33:09',NULL),(331,'box_factures.php',2,'2015-03-13 20:33:09',NULL),(332,'box_produits.php',2,'2015-03-13 20:33:09',NULL),(333,'box_produits_alerte_stock.php',2,'2015-03-13 20:33:09',NULL),(347,'box_clients.php',1,'2017-11-15 22:05:57',NULL),(348,'box_prospect.php',1,'2017-11-15 22:05:57',NULL),(349,'box_contacts.php',1,'2017-11-15 22:05:57',NULL),(350,'box_activity.php',1,'2017-11-15 22:05:57','(WarningUsingThisBoxSlowDown)'),(374,'box_services_contracts.php',1,'2017-11-15 22:38:37',NULL),(377,'box_project.php',1,'2017-11-15 22:38:44',NULL),(378,'box_task.php',1,'2017-11-15 22:38:44',NULL),(388,'box_contracts.php',1,'2017-11-15 22:39:52',NULL),(389,'box_services_expired.php',1,'2017-11-15 22:39:52',NULL),(390,'box_ficheinter.php',1,'2017-11-15 22:39:56',NULL),(392,'box_graph_propales_permonth.php',1,'2017-11-15 22:41:47',NULL),(393,'box_propales.php',1,'2017-11-15 22:41:47',NULL),(396,'box_graph_product_distribution.php',1,'2017-11-15 22:41:47',NULL),(403,'box_goodcustomers.php',1,'2018-07-30 11:13:20','(WarningUsingThisBoxSlowDown)'),(404,'box_external_rss.php',1,'2018-07-30 11:15:25','1 (Dolibarr.org News)'),(409,'box_produits.php',1,'2018-07-30 13:38:11',NULL),(410,'box_produits_alerte_stock.php',1,'2018-07-30 13:38:11',NULL),(411,'box_commandes.php',1,'2018-07-30 13:38:11',NULL),(412,'box_graph_orders_permonth.php',1,'2018-07-30 13:38:11',NULL),(413,'box_graph_invoices_supplier_permonth.php',1,'2018-07-30 13:38:11',NULL),(414,'box_graph_orders_supplier_permonth.php',1,'2018-07-30 13:38:11',NULL),(415,'box_fournisseurs.php',1,'2018-07-30 13:38:11',NULL),(416,'box_factures_fourn_imp.php',1,'2018-07-30 13:38:11',NULL),(417,'box_factures_fourn.php',1,'2018-07-30 13:38:11',NULL),(418,'box_supplier_orders.php',1,'2018-07-30 13:38:11',NULL),(419,'box_actions.php',1,'2018-07-30 15:42:32',NULL),(424,'box_factures_imp.php',1,'2017-02-07 18:56:12',NULL),(425,'box_factures.php',1,'2017-02-07 18:56:12',NULL),(426,'box_graph_invoices_permonth.php',1,'2017-02-07 18:56:12',NULL),(429,'box_lastlogin.php',1,'2017-08-27 13:29:14',NULL),(430,'box_bookmarks.php',1,'2018-01-19 11:27:34',NULL),(431,'box_members.php',1,'2018-01-19 11:27:56',NULL),(432,'box_birthdays.php',1,'2019-06-05 08:45:40',NULL),(433,'box_last_ticket',1,'2019-06-05 09:15:29',NULL),(434,'box_last_modified_ticket',1,'2019-06-05 09:15:29',NULL),(436,'box_accountancy_last_manual_entries.php',1,'2019-11-28 11:52:58',NULL),(437,'box_accountancy_suspense_account.php',1,'2019-11-28 11:52:58',NULL),(438,'box_supplier_orders_awaiting_reception.php',1,'2019-11-28 11:52:59',NULL),(445,'box_shipments.php',1,'2020-01-13 14:38:20',NULL),(446,'box_funnel_of_prospection.php',1,'2020-12-10 12:24:40',NULL),(447,'box_customers_outstanding_bill_reached.php',1,'2020-12-10 12:24:40',NULL),(448,'box_scheduled_jobs.php',1,'2021-04-15 10:22:49',NULL),(449,'box_dolibarr_state_board.php',1,'2021-04-15 10:22:54',NULL),(450,'box_members_last_modified.php',1,'2021-04-15 10:22:54',NULL),(451,'box_members_last_subscriptions.php',1,'2021-04-15 10:22:54',NULL),(452,'box_members_subscriptions_by_year.php',1,'2021-04-15 10:22:54',NULL),(453,'box_members_by_type.php',1,'2021-04-15 10:22:54',NULL),(454,'box_graph_ticket_by_severity.php',1,'2021-04-15 10:22:55',NULL),(455,'box_graph_nb_ticket_last_x_days.php',1,'2021-04-15 10:22:55',NULL),(456,'box_graph_nb_tickets_type.php',1,'2021-04-15 10:22:55',NULL),(457,'box_graph_new_vs_close_ticket.php',1,'2021-04-15 10:22:55',NULL),(458,'box_boms.php',1,'2021-04-15 10:22:58',NULL),(459,'box_comptes.php',1,'2021-04-15 10:22:58',NULL),(460,'box_mos.php',1,'2021-04-15 10:23:00',NULL),(461,'box_last_ticket.php',1,'2021-04-15 10:23:01',NULL),(462,'box_last_modified_ticket.php',1,'2021-04-15 10:23:01',NULL),(463,'box_ticket_by_severity.php',1,'2021-04-15 10:23:01',NULL),(464,'box_nb_ticket_last_x_days.php',1,'2021-04-15 10:23:01',NULL),(465,'box_nb_tickets_type.php',1,'2021-04-15 10:23:01',NULL),(466,'box_new_vs_close_ticket.php',1,'2021-04-15 10:23:01',NULL);
+INSERT INTO `llx_boxes_def` VALUES (323,'box_actions.php',2,'2015-03-13 15:29:19',NULL),(324,'box_clients.php',2,'2015-03-13 20:21:35',NULL),(325,'box_prospect.php',2,'2015-03-13 20:21:35',NULL),(326,'box_contacts.php',2,'2015-03-13 20:21:35',NULL),(327,'box_activity.php',2,'2015-03-13 20:21:35','(WarningUsingThisBoxSlowDown)'),(328,'box_propales.php',2,'2015-03-13 20:32:38',NULL),(329,'box_comptes.php',2,'2015-03-13 20:33:09',NULL),(330,'box_factures_imp.php',2,'2015-03-13 20:33:09',NULL),(331,'box_factures.php',2,'2015-03-13 20:33:09',NULL),(332,'box_produits.php',2,'2015-03-13 20:33:09',NULL),(333,'box_produits_alerte_stock.php',2,'2015-03-13 20:33:09',NULL),(347,'box_clients.php',1,'2017-11-15 22:05:57',NULL),(348,'box_prospect.php',1,'2017-11-15 22:05:57',NULL),(349,'box_contacts.php',1,'2017-11-15 22:05:57',NULL),(350,'box_activity.php',1,'2017-11-15 22:05:57','(WarningUsingThisBoxSlowDown)'),(374,'box_services_contracts.php',1,'2017-11-15 22:38:37',NULL),(377,'box_project.php',1,'2017-11-15 22:38:44',NULL),(378,'box_task.php',1,'2017-11-15 22:38:44',NULL),(388,'box_contracts.php',1,'2017-11-15 22:39:52',NULL),(389,'box_services_expired.php',1,'2017-11-15 22:39:52',NULL),(390,'box_ficheinter.php',1,'2017-11-15 22:39:56',NULL),(392,'box_graph_propales_permonth.php',1,'2017-11-15 22:41:47',NULL),(393,'box_propales.php',1,'2017-11-15 22:41:47',NULL),(396,'box_graph_product_distribution.php',1,'2017-11-15 22:41:47',NULL),(403,'box_goodcustomers.php',1,'2018-07-30 11:13:20','(WarningUsingThisBoxSlowDown)'),(404,'box_external_rss.php',1,'2018-07-30 11:15:25','1 (Dolibarr.org News)'),(409,'box_produits.php',1,'2018-07-30 13:38:11',NULL),(410,'box_produits_alerte_stock.php',1,'2018-07-30 13:38:11',NULL),(411,'box_commandes.php',1,'2018-07-30 13:38:11',NULL),(412,'box_graph_orders_permonth.php',1,'2018-07-30 13:38:11',NULL),(413,'box_graph_invoices_supplier_permonth.php',1,'2018-07-30 13:38:11',NULL),(414,'box_graph_orders_supplier_permonth.php',1,'2018-07-30 13:38:11',NULL),(415,'box_fournisseurs.php',1,'2018-07-30 13:38:11',NULL),(416,'box_factures_fourn_imp.php',1,'2018-07-30 13:38:11',NULL),(417,'box_factures_fourn.php',1,'2018-07-30 13:38:11',NULL),(418,'box_supplier_orders.php',1,'2018-07-30 13:38:11',NULL),(419,'box_actions.php',1,'2018-07-30 15:42:32',NULL),(424,'box_factures_imp.php',1,'2017-02-07 18:56:12',NULL),(425,'box_factures.php',1,'2017-02-07 18:56:12',NULL),(426,'box_graph_invoices_permonth.php',1,'2017-02-07 18:56:12',NULL),(429,'box_lastlogin.php',1,'2017-08-27 13:29:14',NULL),(430,'box_bookmarks.php',1,'2018-01-19 11:27:34',NULL),(431,'box_members.php',1,'2018-01-19 11:27:56',NULL),(432,'box_birthdays.php',1,'2019-06-05 08:45:40',NULL),(433,'box_last_ticket',1,'2019-06-05 09:15:29',NULL),(434,'box_last_modified_ticket',1,'2019-06-05 09:15:29',NULL),(436,'box_accountancy_last_manual_entries.php',1,'2019-11-28 11:52:58',NULL),(437,'box_accountancy_suspense_account.php',1,'2019-11-28 11:52:58',NULL),(438,'box_supplier_orders_awaiting_reception.php',1,'2019-11-28 11:52:59',NULL),(445,'box_shipments.php',1,'2020-01-13 14:38:20',NULL),(446,'box_funnel_of_prospection.php',1,'2020-12-10 12:24:40',NULL),(447,'box_customers_outstanding_bill_reached.php',1,'2020-12-10 12:24:40',NULL),(448,'box_scheduled_jobs.php',1,'2021-04-15 10:22:49',NULL),(449,'box_dolibarr_state_board.php',1,'2021-04-15 10:22:54',NULL),(450,'box_members_last_modified.php',1,'2021-04-15 10:22:54',NULL),(451,'box_members_last_subscriptions.php',1,'2021-04-15 10:22:54',NULL),(452,'box_members_subscriptions_by_year.php',1,'2021-04-15 10:22:54',NULL),(453,'box_members_by_type.php',1,'2021-04-15 10:22:54',NULL),(454,'box_graph_ticket_by_severity.php',1,'2021-04-15 10:22:55',NULL),(455,'box_graph_nb_ticket_last_x_days.php',1,'2021-04-15 10:22:55',NULL),(456,'box_graph_nb_tickets_type.php',1,'2021-04-15 10:22:55',NULL),(457,'box_graph_new_vs_close_ticket.php',1,'2021-04-15 10:22:55',NULL),(461,'box_last_ticket.php',1,'2021-04-15 10:23:01',NULL),(462,'box_last_modified_ticket.php',1,'2021-04-15 10:23:01',NULL),(467,'box_boms.php',1,'2021-07-11 17:49:46',NULL),(468,'box_comptes.php',1,'2021-07-11 17:49:46',NULL),(469,'box_mos.php',1,'2021-07-11 17:49:47',NULL),(470,'box_ticket_by_severity.php',1,'2021-07-11 17:49:47',NULL),(471,'box_nb_ticket_last_x_days.php',1,'2021-07-11 17:49:47',NULL),(472,'box_nb_tickets_type.php',1,'2021-07-11 17:49:47',NULL),(473,'box_new_vs_close_ticket.php',1,'2021-07-11 17:49:47',NULL);
 /*!40000 ALTER TABLE `llx_boxes_def` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1492,7 +1499,7 @@ CREATE TABLE `llx_c_action_trigger` (
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_action_trigger_code` (`code`),
   KEY `idx_action_trigger_rang` (`rang`)
-) ENGINE=InnoDB AUTO_INCREMENT=392 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=394 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1501,7 +1508,7 @@ CREATE TABLE `llx_c_action_trigger` (
 
 LOCK TABLES `llx_c_action_trigger` WRITE;
 /*!40000 ALTER TABLE `llx_c_action_trigger` DISABLE KEYS */;
-INSERT INTO `llx_c_action_trigger` VALUES (131,'COMPANY_SENTBYMAIL','Mails sent from third party card','Executed when you send email from third party card','societe',1),(132,'COMPANY_CREATE','Third party created','Executed when a third party is created','societe',1),(133,'PROPAL_VALIDATE','Customer proposal validated','Executed when a commercial proposal is validated','propal',2),(134,'PROPAL_SENTBYMAIL','Commercial proposal sent by mail','Executed when a commercial proposal is sent by mail','propal',3),(135,'ORDER_VALIDATE','Customer order validate','Executed when a customer order is validated','commande',4),(136,'ORDER_CLOSE','Customer order classify delivered','Executed when a customer order is set delivered','commande',5),(137,'ORDER_CLASSIFY_BILLED','Customer order classify billed','Executed when a customer order is set to billed','commande',5),(138,'ORDER_CANCEL','Customer order canceled','Executed when a customer order is canceled','commande',5),(139,'ORDER_SENTBYMAIL','Customer order sent by mail','Executed when a customer order is sent by mail ','commande',5),(140,'BILL_VALIDATE','Customer invoice validated','Executed when a customer invoice is approved','facture',6),(141,'BILL_PAYED','Customer invoice payed','Executed when a customer invoice is payed','facture',7),(142,'BILL_CANCEL','Customer invoice canceled','Executed when a customer invoice is conceled','facture',8),(143,'BILL_SENTBYMAIL','Customer invoice sent by mail','Executed when a customer invoice is sent by mail','facture',9),(144,'BILL_UNVALIDATE','Customer invoice unvalidated','Executed when a customer invoice status set back to draft','facture',10),(145,'ORDER_SUPPLIER_VALIDATE','Supplier order validated','Executed when a supplier order is validated','order_supplier',11),(146,'ORDER_SUPPLIER_APPROVE','Supplier order request approved','Executed when a supplier order is approved','order_supplier',12),(147,'ORDER_SUPPLIER_REFUSE','Supplier order request refused','Executed when a supplier order is refused','order_supplier',13),(148,'ORDER_SUPPLIER_SENTBYMAIL','Supplier order sent by mail','Executed when a supplier order is sent by mail','order_supplier',14),(149,'BILL_SUPPLIER_VALIDATE','Supplier invoice validated','Executed when a supplier invoice is validated','invoice_supplier',15),(150,'BILL_SUPPLIER_PAYED','Supplier invoice payed','Executed when a supplier invoice is payed','invoice_supplier',16),(151,'BILL_SUPPLIER_SENTBYMAIL','Supplier invoice sent by mail','Executed when a supplier invoice is sent by mail','invoice_supplier',17),(152,'BILL_SUPPLIER_CANCELED','Supplier invoice cancelled','Executed when a supplier invoice is cancelled','invoice_supplier',17),(153,'CONTRACT_VALIDATE','Contract validated','Executed when a contract is validated','contrat',18),(154,'SHIPPING_VALIDATE','Shipping validated','Executed when a shipping is validated','shipping',20),(155,'SHIPPING_SENTBYMAIL','Shipping sent by mail','Executed when a shipping is sent by mail','shipping',21),(156,'MEMBER_VALIDATE','Member validated','Executed when a member is validated','member',22),(158,'MEMBER_RESILIATE','Member resiliated','Executed when a member is resiliated','member',24),(159,'MEMBER_MODIFY','Member modified','Executed when a member is modified','member',24),(160,'MEMBER_DELETE','Member deleted','Executed when a member is deleted','member',25),(161,'FICHINTER_VALIDATE','Intervention validated','Executed when a intervention is validated','ficheinter',19),(162,'FICHINTER_CLASSIFY_BILLED','Intervention set billed','Executed when a intervention is set to billed (when option FICHINTER_CLASSIFY_BILLED is set)','ficheinter',19),(163,'FICHINTER_CLASSIFY_UNBILLED','Intervention set unbilled','Executed when a intervention is set to unbilled (when option FICHINTER_CLASSIFY_BILLED is set)','ficheinter',19),(164,'FICHINTER_REOPEN','Intervention opened','Executed when a intervention is re-opened','ficheinter',19),(165,'FICHINTER_SENTBYMAIL','Intervention sent by mail','Executed when a intervention is sent by mail','ficheinter',19),(166,'PROJECT_CREATE','Project creation','Executed when a project is created','project',140),(167,'PROPAL_CLOSE_SIGNED','Customer proposal closed signed','Executed when a customer proposal is closed signed','propal',2),(168,'PROPAL_CLOSE_REFUSED','Customer proposal closed refused','Executed when a customer proposal is closed refused','propal',2),(169,'PROPAL_CLASSIFY_BILLED','Customer proposal set billed','Executed when a customer proposal is set to billed','propal',2),(170,'TASK_CREATE','Task created','Executed when a project task is created','project',35),(171,'TASK_MODIFY','Task modified','Executed when a project task is modified','project',36),(172,'TASK_DELETE','Task deleted','Executed when a project task is deleted','project',37),(173,'BILL_SUPPLIER_UNVALIDATE','Supplier invoice unvalidated','Executed when a supplier invoice status is set back to draft','invoice_supplier',15),(174,'PROJECT_MODIFY','Project modified','Executed when a project is modified','project',141),(175,'PROJECT_DELETE','Project deleted','Executed when a project is deleted','project',142),(176,'ORDER_SUPPLIER_CREATE','Supplier order validated','Executed when a supplier order is validated','order_supplier',11),(177,'ORDER_SUPPLIER_SUBMIT','Supplier order request submited','Executed when a supplier order is approved','order_supplier',12),(178,'ORDER_SUPPLIER_RECEIVE','Supplier order request received','Executed when a supplier order is received','order_supplier',12),(179,'ORDER_SUPPLIER_CLASSIFY_BILLED','Supplier order set billed','Executed when a supplier order is set as billed','order_supplier',14),(180,'PRODUCT_CREATE','Product or service created','Executed when a product or sevice is created','product',30),(181,'PRODUCT_MODIFY','Product or service modified','Executed when a product or sevice is modified','product',30),(182,'PRODUCT_DELETE','Product or service deleted','Executed when a product or sevice is deleted','product',30),(183,'EXPENSE_REPORT_CREATE','Expense report created','Executed when an expense report is created','expensereport',201),(185,'EXPENSE_REPORT_VALIDATE','Expense report validated','Executed when an expense report is validated','expensereport',202),(186,'EXPENSE_REPORT_APPROVE','Expense report approved','Executed when an expense report is approved','expensereport',203),(187,'EXPENSE_REPORT_PAID','Expense report billed','Executed when an expense report is set as billed','expensereport',204),(192,'HOLIDAY_CREATE','Leave request created','Executed when a leave request is created','holiday',221),(193,'HOLIDAY_VALIDATE','Leave request validated','Executed when a leave request is validated','holiday',222),(194,'HOLIDAY_APPROVE','Leave request approved','Executed when a leave request is approved','holiday',223),(210,'MEMBER_SENTBYMAIL','Mails sent from member card','Executed when you send email from member card','member',23),(211,'CONTRACT_SENTBYMAIL','Contract sent by mail','Executed when a contract is sent by mail','contrat',18),(212,'PROPOSAL_SUPPLIER_VALIDATE','Price request validated','Executed when a commercial proposal is validated','proposal_supplier',10),(213,'PROPOSAL_SUPPLIER_SENTBYMAIL','Price request sent by mail','Executed when a commercial proposal is sent by mail','proposal_supplier',10),(214,'PROPOSAL_SUPPLIER_CLOSE_SIGNED','Price request closed signed','Executed when a customer proposal is closed signed','proposal_supplier',10),(215,'PROPOSAL_SUPPLIER_CLOSE_REFUSED','Price request closed refused','Executed when a customer proposal is closed refused','proposal_supplier',10),(216,'MEMBER_SUBSCRIPTION_CREATE','Member subscribtion recorded','Executed when a member subscribtion is deleted','member',24),(217,'MEMBER_SUBSCRIPTION_MODIFY','Member subscribtion modified','Executed when a member subscribtion is modified','member',24),(218,'MEMBER_SUBSCRIPTION_DELETE','Member subscribtion deleted','Executed when a member subscribtion is deleted','member',24),(225,'COMPANY_DELETE','Third party deleted','Executed when you delete third party','societe',1),(226,'PROPAL_DELETE','Customer proposal deleted','Executed when a customer proposal is deleted','propal',2),(227,'ORDER_DELETE','Customer order deleted','Executed when a customer order is deleted','commande',5),(228,'BILL_DELETE','Customer invoice deleted','Executed when a customer invoice is deleted','facture',9),(229,'PROPOSAL_SUPPLIER_DELETE','Price request deleted','Executed when a customer proposal delete','proposal_supplier',10),(230,'ORDER_SUPPLIER_DELETE','Supplier order deleted','Executed when a supplier order is deleted','order_supplier',14),(231,'BILL_SUPPLIER_DELETE','Supplier invoice deleted','Executed when a supplier invoice is deleted','invoice_supplier',17),(232,'CONTRACT_DELETE','Contract deleted','Executed when a contract is deleted','contrat',18),(233,'FICHINTER_DELETE','Intervention is deleted','Executed when a intervention is deleted','ficheinter',35),(234,'EXPENSE_REPORT_DELETE','Expense report deleted','Executed when an expense report is deleted','expensereport',204),(249,'TICKET_CREATE','Ticket created','Executed when a ticket is created','ticket',161),(250,'TICKET_MODIFY','Ticket modified','Executed when a ticket is modified','ticket',163),(251,'TICKET_ASSIGNED','Ticket assigned','Executed when a ticket is assigned to another user','ticket',164),(252,'TICKET_CLOSE','Ticket closed','Executed when a ticket is closed','ticket',165),(253,'TICKET_SENTBYMAIL','Ticket message sent by email','Executed when a message is sent from the ticket record','ticket',166),(254,'TICKET_DELETE','Ticket deleted','Executed when a ticket is deleted','ticket',167),(261,'USER_SENTBYMAIL','Email sent','Executed when an email is sent from user card','user',300),(262,'BOM_VALIDATE','BOM validated','Executed when a BOM is validated','bom',650),(263,'BOM_UNVALIDATE','BOM unvalidated','Executed when a BOM is unvalidated','bom',651),(264,'BOM_CLOSE','BOM disabled','Executed when a BOM is disabled','bom',652),(265,'BOM_REOPEN','BOM reopen','Executed when a BOM is re-open','bom',653),(266,'BOM_DELETE','BOM deleted','Executed when a BOM deleted','bom',654),(351,'MRP_MO_VALIDATE','MO validated','Executed when a MO is validated','bom',660),(352,'MRP_MO_PRODUCED','MO produced','Executed when a MO is produced','bom',661),(353,'MRP_MO_DELETE','MO deleted','Executed when a MO is deleted','bom',662),(354,'MRP_MO_CANCEL','MO canceled','Executed when a MO is canceled','bom',663),(365,'CONTACT_CREATE','Contact address created','Executed when a contact is created','contact',50),(366,'CONTACT_SENTBYMAIL','Mails sent from third party card','Executed when you send email from contact adress card','contact',51),(367,'CONTACT_DELETE','Contact address deleted','Executed when a contact is deleted','contact',52),(368,'RECRUITMENTJOBPOSITION_CREATE','Job created','Executed when a job is created','recruitment',7500),(369,'RECRUITMENTJOBPOSITION_MODIFY','Job modified','Executed when a job is modified','recruitment',7502),(370,'RECRUITMENTJOBPOSITION_SENTBYMAIL','Mails sent from job record','Executed when you send email from job record','recruitment',7504),(371,'RECRUITMENTJOBPOSITION_DELETE','Job deleted','Executed when a job is deleted','recruitment',7506),(372,'RECRUITMENTCANDIDATURE_CREATE','Candidature created','Executed when a candidature is created','recruitment',7510),(373,'RECRUITMENTCANDIDATURE_MODIFY','Candidature modified','Executed when a candidature is modified','recruitment',7512),(374,'RECRUITMENTCANDIDATURE_SENTBYMAIL','Mails sent from candidature record','Executed when you send email from candidature record','recruitment',7514),(375,'RECRUITMENTCANDIDATURE_DELETE','Candidature deleted','Executed when a candidature is deleted','recruitment',7516);
+INSERT INTO `llx_c_action_trigger` VALUES (131,'COMPANY_SENTBYMAIL','Mails sent from third party card','Executed when you send email from third party card','societe',1),(132,'COMPANY_CREATE','Third party created','Executed when a third party is created','societe',1),(133,'PROPAL_VALIDATE','Customer proposal validated','Executed when a commercial proposal is validated','propal',2),(134,'PROPAL_SENTBYMAIL','Commercial proposal sent by mail','Executed when a commercial proposal is sent by mail','propal',3),(135,'ORDER_VALIDATE','Customer order validate','Executed when a customer order is validated','commande',4),(136,'ORDER_CLOSE','Customer order classify delivered','Executed when a customer order is set delivered','commande',5),(137,'ORDER_CLASSIFY_BILLED','Customer order classify billed','Executed when a customer order is set to billed','commande',5),(138,'ORDER_CANCEL','Customer order canceled','Executed when a customer order is canceled','commande',5),(139,'ORDER_SENTBYMAIL','Customer order sent by mail','Executed when a customer order is sent by mail ','commande',5),(140,'BILL_VALIDATE','Customer invoice validated','Executed when a customer invoice is approved','facture',6),(141,'BILL_PAYED','Customer invoice payed','Executed when a customer invoice is payed','facture',7),(142,'BILL_CANCEL','Customer invoice canceled','Executed when a customer invoice is conceled','facture',8),(143,'BILL_SENTBYMAIL','Customer invoice sent by mail','Executed when a customer invoice is sent by mail','facture',9),(144,'BILL_UNVALIDATE','Customer invoice unvalidated','Executed when a customer invoice status set back to draft','facture',10),(145,'ORDER_SUPPLIER_VALIDATE','Supplier order validated','Executed when a supplier order is validated','order_supplier',11),(146,'ORDER_SUPPLIER_APPROVE','Supplier order request approved','Executed when a supplier order is approved','order_supplier',12),(147,'ORDER_SUPPLIER_REFUSE','Supplier order request refused','Executed when a supplier order is refused','order_supplier',13),(148,'ORDER_SUPPLIER_SENTBYMAIL','Supplier order sent by mail','Executed when a supplier order is sent by mail','order_supplier',14),(149,'BILL_SUPPLIER_VALIDATE','Supplier invoice validated','Executed when a supplier invoice is validated','invoice_supplier',15),(150,'BILL_SUPPLIER_PAYED','Supplier invoice payed','Executed when a supplier invoice is payed','invoice_supplier',16),(151,'BILL_SUPPLIER_SENTBYMAIL','Supplier invoice sent by mail','Executed when a supplier invoice is sent by mail','invoice_supplier',17),(152,'BILL_SUPPLIER_CANCELED','Supplier invoice cancelled','Executed when a supplier invoice is cancelled','invoice_supplier',17),(153,'CONTRACT_VALIDATE','Contract validated','Executed when a contract is validated','contrat',18),(154,'SHIPPING_VALIDATE','Shipping validated','Executed when a shipping is validated','shipping',20),(155,'SHIPPING_SENTBYMAIL','Shipping sent by mail','Executed when a shipping is sent by mail','shipping',21),(156,'MEMBER_VALIDATE','Member validated','Executed when a member is validated','member',22),(158,'MEMBER_RESILIATE','Member resiliated','Executed when a member is resiliated','member',24),(159,'MEMBER_MODIFY','Member modified','Executed when a member is modified','member',24),(160,'MEMBER_DELETE','Member deleted','Executed when a member is deleted','member',25),(161,'FICHINTER_VALIDATE','Intervention validated','Executed when a intervention is validated','ficheinter',19),(162,'FICHINTER_CLASSIFY_BILLED','Intervention set billed','Executed when a intervention is set to billed (when option FICHINTER_CLASSIFY_BILLED is set)','ficheinter',19),(163,'FICHINTER_CLASSIFY_UNBILLED','Intervention set unbilled','Executed when a intervention is set to unbilled (when option FICHINTER_CLASSIFY_BILLED is set)','ficheinter',19),(164,'FICHINTER_REOPEN','Intervention opened','Executed when a intervention is re-opened','ficheinter',19),(165,'FICHINTER_SENTBYMAIL','Intervention sent by mail','Executed when a intervention is sent by mail','ficheinter',19),(166,'PROJECT_CREATE','Project creation','Executed when a project is created','project',140),(167,'PROPAL_CLOSE_SIGNED','Customer proposal closed signed','Executed when a customer proposal is closed signed','propal',2),(168,'PROPAL_CLOSE_REFUSED','Customer proposal closed refused','Executed when a customer proposal is closed refused','propal',2),(169,'PROPAL_CLASSIFY_BILLED','Customer proposal set billed','Executed when a customer proposal is set to billed','propal',2),(170,'TASK_CREATE','Task created','Executed when a project task is created','project',35),(171,'TASK_MODIFY','Task modified','Executed when a project task is modified','project',36),(172,'TASK_DELETE','Task deleted','Executed when a project task is deleted','project',37),(173,'BILL_SUPPLIER_UNVALIDATE','Supplier invoice unvalidated','Executed when a supplier invoice status is set back to draft','invoice_supplier',15),(174,'PROJECT_MODIFY','Project modified','Executed when a project is modified','project',141),(175,'PROJECT_DELETE','Project deleted','Executed when a project is deleted','project',142),(176,'ORDER_SUPPLIER_CREATE','Supplier order validated','Executed when a supplier order is validated','order_supplier',11),(177,'ORDER_SUPPLIER_SUBMIT','Supplier order request submited','Executed when a supplier order is approved','order_supplier',12),(178,'ORDER_SUPPLIER_RECEIVE','Supplier order request received','Executed when a supplier order is received','order_supplier',12),(179,'ORDER_SUPPLIER_CLASSIFY_BILLED','Supplier order set billed','Executed when a supplier order is set as billed','order_supplier',14),(180,'PRODUCT_CREATE','Product or service created','Executed when a product or sevice is created','product',30),(181,'PRODUCT_MODIFY','Product or service modified','Executed when a product or sevice is modified','product',30),(182,'PRODUCT_DELETE','Product or service deleted','Executed when a product or sevice is deleted','product',30),(183,'EXPENSE_REPORT_CREATE','Expense report created','Executed when an expense report is created','expensereport',201),(185,'EXPENSE_REPORT_VALIDATE','Expense report validated','Executed when an expense report is validated','expensereport',202),(186,'EXPENSE_REPORT_APPROVE','Expense report approved','Executed when an expense report is approved','expensereport',203),(187,'EXPENSE_REPORT_PAID','Expense report billed','Executed when an expense report is set as billed','expensereport',204),(192,'HOLIDAY_CREATE','Leave request created','Executed when a leave request is created','holiday',221),(193,'HOLIDAY_VALIDATE','Leave request validated','Executed when a leave request is validated','holiday',222),(194,'HOLIDAY_APPROVE','Leave request approved','Executed when a leave request is approved','holiday',223),(210,'MEMBER_SENTBYMAIL','Mails sent from member card','Executed when you send email from member card','member',23),(211,'CONTRACT_SENTBYMAIL','Contract sent by mail','Executed when a contract is sent by mail','contrat',18),(212,'PROPOSAL_SUPPLIER_VALIDATE','Price request validated','Executed when a commercial proposal is validated','proposal_supplier',10),(213,'PROPOSAL_SUPPLIER_SENTBYMAIL','Price request sent by mail','Executed when a commercial proposal is sent by mail','proposal_supplier',10),(214,'PROPOSAL_SUPPLIER_CLOSE_SIGNED','Price request closed signed','Executed when a customer proposal is closed signed','proposal_supplier',10),(215,'PROPOSAL_SUPPLIER_CLOSE_REFUSED','Price request closed refused','Executed when a customer proposal is closed refused','proposal_supplier',10),(216,'MEMBER_SUBSCRIPTION_CREATE','Member subscribtion recorded','Executed when a member subscribtion is deleted','member',24),(217,'MEMBER_SUBSCRIPTION_MODIFY','Member subscribtion modified','Executed when a member subscribtion is modified','member',24),(218,'MEMBER_SUBSCRIPTION_DELETE','Member subscribtion deleted','Executed when a member subscribtion is deleted','member',24),(225,'COMPANY_DELETE','Third party deleted','Executed when you delete third party','societe',1),(226,'PROPAL_DELETE','Customer proposal deleted','Executed when a customer proposal is deleted','propal',2),(227,'ORDER_DELETE','Customer order deleted','Executed when a customer order is deleted','commande',5),(228,'BILL_DELETE','Customer invoice deleted','Executed when a customer invoice is deleted','facture',9),(229,'PROPOSAL_SUPPLIER_DELETE','Price request deleted','Executed when a customer proposal delete','proposal_supplier',10),(230,'ORDER_SUPPLIER_DELETE','Supplier order deleted','Executed when a supplier order is deleted','order_supplier',14),(231,'BILL_SUPPLIER_DELETE','Supplier invoice deleted','Executed when a supplier invoice is deleted','invoice_supplier',17),(232,'CONTRACT_DELETE','Contract deleted','Executed when a contract is deleted','contrat',18),(233,'FICHINTER_DELETE','Intervention is deleted','Executed when a intervention is deleted','ficheinter',35),(234,'EXPENSE_REPORT_DELETE','Expense report deleted','Executed when an expense report is deleted','expensereport',204),(249,'TICKET_CREATE','Ticket created','Executed when a ticket is created','ticket',161),(250,'TICKET_MODIFY','Ticket modified','Executed when a ticket is modified','ticket',163),(251,'TICKET_ASSIGNED','Ticket assigned','Executed when a ticket is assigned to another user','ticket',164),(252,'TICKET_CLOSE','Ticket closed','Executed when a ticket is closed','ticket',165),(253,'TICKET_SENTBYMAIL','Ticket message sent by email','Executed when a message is sent from the ticket record','ticket',166),(254,'TICKET_DELETE','Ticket deleted','Executed when a ticket is deleted','ticket',167),(261,'USER_SENTBYMAIL','Email sent','Executed when an email is sent from user card','user',300),(262,'BOM_VALIDATE','BOM validated','Executed when a BOM is validated','bom',650),(263,'BOM_UNVALIDATE','BOM unvalidated','Executed when a BOM is unvalidated','bom',651),(264,'BOM_CLOSE','BOM disabled','Executed when a BOM is disabled','bom',652),(265,'BOM_REOPEN','BOM reopen','Executed when a BOM is re-open','bom',653),(266,'BOM_DELETE','BOM deleted','Executed when a BOM deleted','bom',654),(351,'MRP_MO_VALIDATE','MO validated','Executed when a MO is validated','bom',660),(352,'MRP_MO_PRODUCED','MO produced','Executed when a MO is produced','bom',661),(353,'MRP_MO_DELETE','MO deleted','Executed when a MO is deleted','bom',662),(354,'MRP_MO_CANCEL','MO canceled','Executed when a MO is canceled','bom',663),(365,'CONTACT_CREATE','Contact address created','Executed when a contact is created','contact',50),(366,'CONTACT_SENTBYMAIL','Mails sent from third party card','Executed when you send email from contact adress card','contact',51),(367,'CONTACT_DELETE','Contact address deleted','Executed when a contact is deleted','contact',52),(368,'RECRUITMENTJOBPOSITION_CREATE','Job created','Executed when a job is created','recruitment',7500),(369,'RECRUITMENTJOBPOSITION_MODIFY','Job modified','Executed when a job is modified','recruitment',7502),(370,'RECRUITMENTJOBPOSITION_SENTBYMAIL','Mails sent from job record','Executed when you send email from job record','recruitment',7504),(371,'RECRUITMENTJOBPOSITION_DELETE','Job deleted','Executed when a job is deleted','recruitment',7506),(372,'RECRUITMENTCANDIDATURE_CREATE','Candidature created','Executed when a candidature is created','recruitment',7510),(373,'RECRUITMENTCANDIDATURE_MODIFY','Candidature modified','Executed when a candidature is modified','recruitment',7512),(374,'RECRUITMENTCANDIDATURE_SENTBYMAIL','Mails sent from candidature record','Executed when you send email from candidature record','recruitment',7514),(375,'RECRUITMENTCANDIDATURE_DELETE','Candidature deleted','Executed when a candidature is deleted','recruitment',7516),(392,'COMPANY_MODIFY','Third party update','Executed when you update third party','societe',1),(393,'CONTACT_MODIFY','Contact address update','Executed when a contact is updated','contact',51);
 /*!40000 ALTER TABLE `llx_c_action_trigger` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1582,7 +1589,7 @@ CREATE TABLE `llx_c_barcode_type` (
   `example` varchar(16) COLLATE utf8_unicode_ci NOT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_c_barcode_type` (`code`,`entity`)
-) ENGINE=InnoDB AUTO_INCREMENT=55 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=63 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1864,7 +1871,7 @@ CREATE TABLE `llx_c_email_templates` (
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_c_email_templates` (`entity`,`label`,`lang`),
   KEY `idx_type` (`type_template`)
-) ENGINE=InnoDB AUTO_INCREMENT=21 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=31 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1873,7 +1880,7 @@ CREATE TABLE `llx_c_email_templates` (
 
 LOCK TABLES `llx_c_email_templates` WRITE;
 /*!40000 ALTER TABLE `llx_c_email_templates` DISABLE KEYS */;
-INSERT INTO `llx_c_email_templates` VALUES (1,1,NULL,'propal_send','',1,NULL,NULL,'2018-01-19 11:17:48','My Private email template for proposals',1,1,'Hello __FIRSTNAME__','We wish you a happy new year<br>__USER_SIGNATURE__',NULL,'1','1'),(2,0,'adherent','member','',0,NULL,NULL,'2018-01-19 11:17:48','(SendAnEMailToMember)',1,1,'__(CardContent)__','__(Hello)__,<br><br>\n\n__(ThisIsContentOfYourCard)__<br>\n__(ID)__ : __ID__<br>\n__(Civiliyty)__ : __MEMBER_CIVILITY__<br>\n__(Firstname)__ : __MEMBER_FIRSTNAME__<br>\n__(Lastname)__ : __MEMBER_LASTNAME__<br>\n__(Fullname)__ : __MEMBER_FULLNAME__<br>\n__(Company)__ : __MEMBER_COMPANY__<br>\n__(Address)__ : __MEMBER_ADDRESS__<br>\n__(Zip)__ : __MEMBER_ZIP__<br>\n__(Town)__ : __MEMBER_TOWN__<br>\n__(Country)__ : __MEMBER_COUNTRY__<br>\n__(Email)__ : __MEMBER_EMAIL__<br>\n__(Birthday)__ : __MEMBER_BIRTH__<br>\n__(Photo)__ : __MEMBER_PHOTO__<br>\n__(Login)__ : __MEMBER_LOGIN__<br>\n__(Password)__ : __MEMBER_PASSWORD__<br>\n__(Phone)__ : __MEMBER_PHONE__<br>\n__(PhonePerso)__ : __MEMBER_PHONEPRO__<br>\n__(PhoneMobile)__ : __MEMBER_PHONEMOBILE__<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',NULL,'1','1'),(3,0,'banque','thirdparty','',0,NULL,NULL,'2018-01-19 11:17:48','(YourSEPAMandate)',1,0,'__(YourSEPAMandate)__','__(Hello)__,<br><br>\n\n__(FindYourSEPAMandate)__ :<br>\n__MYCOMPANY_NAME__<br>\n__MYCOMPANY_FULLADDRESS__<br><br>\n__(Sincerely)__<br>\n__USER_SIGNATURE__',NULL,'1','1'),(6,0,'adherent','member','',0,NULL,NULL,'2018-11-23 11:56:08','(SendingEmailOnAutoSubscription)',10,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(YourMembershipRequestWasReceived)__','__(Hello)__ __MEMBER_FULLNAME__,<br><br>\n\n__(ThisIsContentOfYourMembershipRequestWasReceived)__<br>\n<br>__ONLINE_PAYMENT_TEXT_AND_URL__<br>\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',NULL,'1','0'),(7,0,'adherent','member','',0,NULL,NULL,'2018-11-23 11:56:08','(SendingEmailOnMemberValidation)',20,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(YourMembershipWasValidated)__','__(Hello)__ __MEMBER_FULLNAME__,<br><br>\n\n__(ThisIsContentOfYourMembershipWasValidated)__<br>\n<br>__ONLINE_PAYMENT_TEXT_AND_URL__<br>\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',NULL,'1','0'),(8,0,'adherent','member','',0,NULL,NULL,'2018-11-23 11:56:08','(SendingEmailOnNewSubscription)',30,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(YourSubscriptionWasRecorded)__','__(Hello)__ __MEMBER_FULLNAME__,<br><br>\n\n__(ThisIsContentOfYourSubscriptionWasRecorded)__<br>\n\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',NULL,'1','1'),(9,0,'adherent','member','',0,NULL,NULL,'2018-11-23 11:56:08','(SendingReminderForExpiredSubscription)',40,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(SubscriptionReminderEmail)__','__(Hello)__ __MEMBER_FULLNAME__,<br><br>\n\n__(ThisIsContentOfSubscriptionReminderEmail)__<br>\n<br>__ONLINE_PAYMENT_TEXT_AND_URL__<br>\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',NULL,'1','0'),(10,0,'adherent','member','',0,NULL,NULL,'2018-11-23 11:56:08','(SendingEmailOnCancelation)',50,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(YourMembershipWasCanceled)__','__(Hello)__ __MEMBER_FULLNAME__,<br><br>\n\n__(YourMembershipWasCanceled)__<br>\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',NULL,'1','0'),(11,0,'adherent','member','',0,NULL,NULL,'2018-11-23 11:56:08','(SendingAnEMailToMember)',60,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(CardContent)__','__(Hello)__,<br><br>\n\n__(ThisIsContentOfYourCard)__<br>\n__(ID)__ : __ID__<br>\n__(Civiliyty)__ : __MEMBER_CIVILITY__<br>\n__(Firstname)__ : __MEMBER_FIRSTNAME__<br>\n__(Lastname)__ : __MEMBER_LASTNAME__<br>\n__(Fullname)__ : __MEMBER_FULLNAME__<br>\n__(Company)__ : __MEMBER_COMPANY__<br>\n__(Address)__ : __MEMBER_ADDRESS__<br>\n__(Zip)__ : __MEMBER_ZIP__<br>\n__(Town)__ : __MEMBER_TOWN__<br>\n__(Country)__ : __MEMBER_COUNTRY__<br>\n__(Email)__ : __MEMBER_EMAIL__<br>\n__(Birthday)__ : __MEMBER_BIRTH__<br>\n__(Photo)__ : __MEMBER_PHOTO__<br>\n__(Login)__ : __MEMBER_LOGIN__<br>\n__(Password)__ : __MEMBER_PASSWORD__<br>\n__(Phone)__ : __MEMBER_PHONE__<br>\n__(PhonePerso)__ : __MEMBER_PHONEPRO__<br>\n__(PhoneMobile)__ : __MEMBER_PHONEMOBILE__<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',NULL,'1','0'),(12,0,'recruitment','recruitmentcandidature_send','',0,NULL,NULL,'2020-12-10 12:24:39','(AnswerCandidature)',100,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(YourCandidature)__','__(Hello)__ __CANDIDATE_FULLNAME__,<br><br>\n\n__(YourCandidatureAnswer)__<br>\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',NULL,'$conf->recruitment->enabled','0'),(14,0,'','eventorganization_send','',0,NULL,NULL,'2021-02-14 13:42:41','EventOrganizationEmailAskConf',10,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailAskConf)__','__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventConfRequestWasReceived)__<br /><br />__ONLINE_PAYMENT_TEXT_AND_URL__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__',NULL,'1',NULL),(15,0,'','eventorganization_send','',0,NULL,NULL,'2021-02-14 13:42:41','EventOrganizationEmailAskBooth',20,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailAskBooth)__','__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventBoothRequestWasReceived)__<br /><br />__ONLINE_PAYMENT_TEXT_AND_URL__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__',NULL,'1',NULL),(16,0,'','eventorganization_send','',0,NULL,NULL,'2021-02-14 13:42:41','EventOrganizationEmailSubsBooth',30,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailSubsBooth)__','__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventBoothSubscriptionWasReceived)__<br /><br />__ONLINE_PAYMENT_TEXT_AND_URL__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__',NULL,'1',NULL),(17,0,'','eventorganization_send','',0,NULL,NULL,'2021-02-14 13:42:41','EventOrganizationEmailSubsEvent',40,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailSubsEvent)__','__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventEventSubscriptionWasReceived)__<br /><br />__ONLINE_PAYMENT_TEXT_AND_URL__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__',NULL,'1',NULL),(18,0,'','eventorganization_send','',0,NULL,NULL,'2021-02-14 13:42:41','EventOrganizationMassEmailAttendees',50,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationMassEmailAttendees)__','__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventBulkMailToAttendees)__<br /><br />__(Sincerely)__<br />__USER_SIGNATURE__',NULL,'1',NULL),(19,0,'','eventorganization_send','',0,NULL,NULL,'2021-02-14 13:42:41','EventOrganizationMassEmailSpeakers',60,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationMassEmailSpeakers)__','__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventBulkMailToSpeakers)__<br /><br />__(Sincerely)__<br />__USER_SIGNATURE__',NULL,'1',NULL),(20,0,'partnership','member',NULL,0,NULL,NULL,'2021-04-15 10:22:55','(AlertStatusPartnershipExpiration)',100,1,'[__[MAIN_INFO_SOCIETE_NOM]__] - __(YourMembershipWillSoonExpireTopic)__','<body>\n <p>Dear __MEMBER_FULLNAME__,<br><br>\n__(YourMembershipWillSoonExpireContent)__</p>\n<br />\n\n            __(Sincerely)__ <br />\n            __[PARTNERSHIP_SOCIETE_NOM]__ <br />\n </body>\n',NULL,'1','0');
+INSERT INTO `llx_c_email_templates` VALUES (1,1,NULL,'propal_send','',1,NULL,NULL,'2018-01-19 11:17:48','My Private email template for proposals',1,1,'Hello __FIRSTNAME__','We wish you a happy new year<br>__USER_SIGNATURE__',NULL,'1','1'),(2,0,'adherent','member','',0,NULL,NULL,'2018-01-19 11:17:48','(SendAnEMailToMember)',1,1,'__(CardContent)__','__(Hello)__,<br><br>\n\n__(ThisIsContentOfYourCard)__<br>\n__(ID)__ : __ID__<br>\n__(Civiliyty)__ : __MEMBER_CIVILITY__<br>\n__(Firstname)__ : __MEMBER_FIRSTNAME__<br>\n__(Lastname)__ : __MEMBER_LASTNAME__<br>\n__(Fullname)__ : __MEMBER_FULLNAME__<br>\n__(Company)__ : __MEMBER_COMPANY__<br>\n__(Address)__ : __MEMBER_ADDRESS__<br>\n__(Zip)__ : __MEMBER_ZIP__<br>\n__(Town)__ : __MEMBER_TOWN__<br>\n__(Country)__ : __MEMBER_COUNTRY__<br>\n__(Email)__ : __MEMBER_EMAIL__<br>\n__(Birthday)__ : __MEMBER_BIRTH__<br>\n__(Photo)__ : __MEMBER_PHOTO__<br>\n__(Login)__ : __MEMBER_LOGIN__<br>\n__(Password)__ : __MEMBER_PASSWORD__<br>\n__(Phone)__ : __MEMBER_PHONE__<br>\n__(PhonePerso)__ : __MEMBER_PHONEPRO__<br>\n__(PhoneMobile)__ : __MEMBER_PHONEMOBILE__<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',NULL,'1','1'),(3,0,'banque','thirdparty','',0,NULL,NULL,'2018-01-19 11:17:48','(YourSEPAMandate)',1,0,'__(YourSEPAMandate)__','__(Hello)__,<br><br>\n\n__(FindYourSEPAMandate)__ :<br>\n__MYCOMPANY_NAME__<br>\n__MYCOMPANY_FULLADDRESS__<br><br>\n__(Sincerely)__<br>\n__USER_SIGNATURE__',NULL,'1','1'),(6,0,'adherent','member','',0,NULL,NULL,'2018-11-23 11:56:08','(SendingEmailOnAutoSubscription)',10,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(YourMembershipRequestWasReceived)__','__(Hello)__ __MEMBER_FULLNAME__,<br><br>\n\n__(ThisIsContentOfYourMembershipRequestWasReceived)__<br>\n<br>__ONLINE_PAYMENT_TEXT_AND_URL__<br>\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',NULL,'1','0'),(7,0,'adherent','member','',0,NULL,NULL,'2018-11-23 11:56:08','(SendingEmailOnMemberValidation)',20,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(YourMembershipWasValidated)__','__(Hello)__ __MEMBER_FULLNAME__,<br><br>\n\n__(ThisIsContentOfYourMembershipWasValidated)__<br>\n<br>__ONLINE_PAYMENT_TEXT_AND_URL__<br>\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',NULL,'1','0'),(8,0,'adherent','member','',0,NULL,NULL,'2018-11-23 11:56:08','(SendingEmailOnNewSubscription)',30,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(YourSubscriptionWasRecorded)__','__(Hello)__ __MEMBER_FULLNAME__,<br><br>\n\n__(ThisIsContentOfYourSubscriptionWasRecorded)__<br>\n\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',NULL,'1','1'),(9,0,'adherent','member','',0,NULL,NULL,'2018-11-23 11:56:08','(SendingReminderForExpiredSubscription)',40,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(SubscriptionReminderEmail)__','__(Hello)__ __MEMBER_FULLNAME__,<br><br>\n\n__(ThisIsContentOfSubscriptionReminderEmail)__<br>\n<br>__ONLINE_PAYMENT_TEXT_AND_URL__<br>\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',NULL,'1','0'),(10,0,'adherent','member','',0,NULL,NULL,'2018-11-23 11:56:08','(SendingEmailOnCancelation)',50,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(YourMembershipWasCanceled)__','__(Hello)__ __MEMBER_FULLNAME__,<br><br>\n\n__(YourMembershipWasCanceled)__<br>\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',NULL,'1','0'),(11,0,'adherent','member','',0,NULL,NULL,'2018-11-23 11:56:08','(SendingAnEMailToMember)',60,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(CardContent)__','__(Hello)__,<br><br>\n\n__(ThisIsContentOfYourCard)__<br>\n__(ID)__ : __ID__<br>\n__(Civiliyty)__ : __MEMBER_CIVILITY__<br>\n__(Firstname)__ : __MEMBER_FIRSTNAME__<br>\n__(Lastname)__ : __MEMBER_LASTNAME__<br>\n__(Fullname)__ : __MEMBER_FULLNAME__<br>\n__(Company)__ : __MEMBER_COMPANY__<br>\n__(Address)__ : __MEMBER_ADDRESS__<br>\n__(Zip)__ : __MEMBER_ZIP__<br>\n__(Town)__ : __MEMBER_TOWN__<br>\n__(Country)__ : __MEMBER_COUNTRY__<br>\n__(Email)__ : __MEMBER_EMAIL__<br>\n__(Birthday)__ : __MEMBER_BIRTH__<br>\n__(Photo)__ : __MEMBER_PHOTO__<br>\n__(Login)__ : __MEMBER_LOGIN__<br>\n__(Password)__ : __MEMBER_PASSWORD__<br>\n__(Phone)__ : __MEMBER_PHONE__<br>\n__(PhonePerso)__ : __MEMBER_PHONEPRO__<br>\n__(PhoneMobile)__ : __MEMBER_PHONEMOBILE__<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',NULL,'1','0'),(12,0,'recruitment','recruitmentcandidature_send','',0,NULL,NULL,'2020-12-10 12:24:39','(AnswerCandidature)',100,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(YourCandidature)__','__(Hello)__ __CANDIDATE_FULLNAME__,<br><br>\n\n__(YourCandidatureAnswer)__<br>\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',NULL,'$conf->recruitment->enabled','0'),(14,0,'','eventorganization_send','',0,NULL,NULL,'2021-02-14 13:42:41','EventOrganizationEmailAskConf',10,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailAskConf)__','__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventConfRequestWasReceived)__<br /><br />__ONLINE_PAYMENT_TEXT_AND_URL__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__',NULL,'1',NULL),(15,0,'','eventorganization_send','',0,NULL,NULL,'2021-02-14 13:42:41','EventOrganizationEmailAskBooth',20,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailAskBooth)__','__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventBoothRequestWasReceived)__<br /><br />__ONLINE_PAYMENT_TEXT_AND_URL__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__',NULL,'1',NULL),(16,0,'','eventorganization_send','',0,NULL,NULL,'2021-02-14 13:42:41','EventOrganizationEmailSubsBooth',30,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailSubsBooth)__','__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventBoothSubscriptionWasReceived)__<br /><br />__ONLINE_PAYMENT_TEXT_AND_URL__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__',NULL,'1',NULL),(17,0,'','eventorganization_send','',0,NULL,NULL,'2021-02-14 13:42:41','EventOrganizationEmailSubsEvent',40,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailSubsEvent)__','__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventEventSubscriptionWasReceived)__<br /><br />__ONLINE_PAYMENT_TEXT_AND_URL__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__',NULL,'1',NULL),(18,0,'','eventorganization_send','',0,NULL,NULL,'2021-02-14 13:42:41','EventOrganizationMassEmailAttendees',50,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationMassEmailAttendees)__','__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventBulkMailToAttendees)__<br /><br />__(Sincerely)__<br />__USER_SIGNATURE__',NULL,'1',NULL),(19,0,'','eventorganization_send','',0,NULL,NULL,'2021-02-14 13:42:41','EventOrganizationMassEmailSpeakers',60,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationMassEmailSpeakers)__','__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventBulkMailToSpeakers)__<br /><br />__(Sincerely)__<br />__USER_SIGNATURE__',NULL,'1',NULL),(20,0,'partnership','member',NULL,0,NULL,NULL,'2021-04-15 10:22:55','(AlertStatusPartnershipExpiration)',100,1,'[__[MAIN_INFO_SOCIETE_NOM]__] - __(YourMembershipWillSoonExpireTopic)__','<body>\n <p>Dear __MEMBER_FULLNAME__,<br><br>\n__(YourMembershipWillSoonExpireContent)__</p>\n<br />\n\n            __(Sincerely)__ <br />\n            __[PARTNERSHIP_SOCIETE_NOM]__ <br />\n </body>\n',NULL,'1','0'),(27,0,'partnership','partnership_send','',0,NULL,NULL,'2021-07-11 17:49:44','(SendingEmailOnPartnershipWillSoonBeCanceled)',100,1,'[__[MAIN_INFO_SOCIETE_NOM]__] - __(YourPartnershipWillSoonBeCanceledTopic)__','<body>\n <p>Hello,<br><br>\n__(YourPartnershipWillSoonBeCanceledContent)__</p>\n<br />\n\n<br />\n\n            __(Sincerely)__ <br />\n            __[MAIN_INFO_SOCIETE_NOM]__ <br />\n </body>\n',NULL,'1','0'),(28,0,'partnership','partnership_send','',0,NULL,NULL,'2021-07-11 17:49:44','(SendingEmailOnPartnershipCanceled)',100,1,'[__[MAIN_INFO_SOCIETE_NOM]__] - __(YourPartnershipCanceledTopic)__','<body>\n <p>Hello,<br><br>\n__(YourPartnershipCanceledContent)__</p>\n<br />\n\n<br />\n\n            __(Sincerely)__ <br />\n            __[MAIN_INFO_SOCIETE_NOM]__ <br />\n </body>\n',NULL,'1','0'),(29,0,'partnership','partnership_send','',0,NULL,NULL,'2021-07-11 17:49:44','(SendingEmailOnPartnershipRefused)',100,1,'[__[MAIN_INFO_SOCIETE_NOM]__] - __(YourPartnershipRefusedTopic)__','<body>\n <p>Hello,<br><br>\n__(YourPartnershipRefusedContent)__</p>\n<br />\n\n<br />\n\n            __(Sincerely)__ <br />\n            __[MAIN_INFO_SOCIETE_NOM]__ <br />\n </body>\n',NULL,'1','0'),(30,0,'partnership','partnership_send','',0,NULL,NULL,'2021-07-11 17:49:44','(SendingEmailOnPartnershipAccepted)',100,1,'[__[MAIN_INFO_SOCIETE_NOM]__] - __(YourPartnershipAcceptedTopic)__','<body>\n <p>Hello,<br><br>\n__(YourPartnershipAcceptedContent)__</p>\n<br />\n\n<br />\n\n            __(Sincerely)__ <br />\n            __[MAIN_INFO_SOCIETE_NOM]__ <br />\n </body>\n',NULL,'1','0');
 /*!40000 ALTER TABLE `llx_c_email_templates` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2228,7 +2235,7 @@ CREATE TABLE `llx_c_input_reason` (
   `module` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_c_input_reason` (`code`)
-) ENGINE=MyISAM AUTO_INCREMENT=12 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -2332,6 +2339,32 @@ INSERT INTO `llx_c_paper_format` VALUES (1,'EU4A0','Format 4A0',1682.00,2378.00,
 /*!40000 ALTER TABLE `llx_c_paper_format` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_c_partnership_type`
+--
+
+DROP TABLE IF EXISTS `llx_c_partnership_type`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_partnership_type` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `entity` int(11) NOT NULL DEFAULT 1,
+  `code` varchar(32) COLLATE utf8_unicode_ci NOT NULL,
+  `label` varchar(64) COLLATE utf8_unicode_ci NOT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT 1,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_partnership_type`
+--
+
+LOCK TABLES `llx_c_partnership_type` WRITE;
+/*!40000 ALTER TABLE `llx_c_partnership_type` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_c_partnership_type` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_c_payment_term`
 --
@@ -2455,11 +2488,11 @@ DROP TABLE IF EXISTS `llx_c_product_nature`;
 CREATE TABLE `llx_c_product_nature` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `code` tinyint(4) NOT NULL,
-  `label` varchar(100) DEFAULT NULL,
+  `label` varchar(100) CHARACTER SET utf8mb4 DEFAULT NULL,
   `active` tinyint(4) NOT NULL DEFAULT 1,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_c_product_nature` (`code`)
-) ENGINE=InnoDB AUTO_INCREMENT=79 DEFAULT CHARSET=utf8mb4;
+) ENGINE=InnoDB AUTO_INCREMENT=79 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -2472,6 +2505,34 @@ INSERT INTO `llx_c_product_nature` VALUES (1,0,'RowMaterial',1),(2,1,'Finished',
 /*!40000 ALTER TABLE `llx_c_product_nature` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_c_productbatch_qcstatus`
+--
+
+DROP TABLE IF EXISTS `llx_c_productbatch_qcstatus`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_productbatch_qcstatus` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `entity` int(11) NOT NULL DEFAULT 1,
+  `code` varchar(16) COLLATE utf8_unicode_ci NOT NULL,
+  `label` varchar(50) COLLATE utf8_unicode_ci NOT NULL,
+  `active` int(11) NOT NULL DEFAULT 1,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_c_productbatch_qcstatus` (`code`,`entity`)
+) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_productbatch_qcstatus`
+--
+
+LOCK TABLES `llx_c_productbatch_qcstatus` WRITE;
+/*!40000 ALTER TABLE `llx_c_productbatch_qcstatus` DISABLE KEYS */;
+INSERT INTO `llx_c_productbatch_qcstatus` VALUES (1,1,'OK','InWorkingOrder',1),(2,1,'KO','OutOfOrder',1);
+/*!40000 ALTER TABLE `llx_c_productbatch_qcstatus` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_c_propalst`
 --
@@ -2899,7 +2960,7 @@ CREATE TABLE `llx_c_ticket_type` (
   `description` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_code` (`code`,`entity`)
-) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=14 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -2908,7 +2969,7 @@ CREATE TABLE `llx_c_ticket_type` (
 
 LOCK TABLES `llx_c_ticket_type` WRITE;
 /*!40000 ALTER TABLE `llx_c_ticket_type` DISABLE KEYS */;
-INSERT INTO `llx_c_ticket_type` VALUES (1,1,'COM','10','Commercial question',1,1,NULL),(2,1,'ISSUE','20','Issue or problem',1,0,NULL),(3,1,'REQUEST','25','Change or enhancement request',1,0,NULL),(4,1,'PROJECT','30','Project',0,0,NULL),(5,1,'OTHER','40','Other',1,0,NULL),(11,1,'HELP','15','Request for functionnal help',1,0,NULL);
+INSERT INTO `llx_c_ticket_type` VALUES (1,1,'COM','10','Commercial question',1,1,NULL),(2,1,'ISSUE','20','Issue or bug',1,0,NULL),(3,1,'REQUEST','25','Change or enhancement request',1,0,NULL),(4,1,'PROJECT','30','Project',0,0,NULL),(5,1,'OTHER','40','Other',1,0,NULL),(11,1,'HELP','15','Request for functionnal help',1,0,NULL),(13,1,'PROBLEM','22','Problem',0,0,NULL);
 /*!40000 ALTER TABLE `llx_c_ticket_type` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2922,11 +2983,11 @@ DROP TABLE IF EXISTS `llx_c_transport_mode`;
 CREATE TABLE `llx_c_transport_mode` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `entity` int(11) NOT NULL DEFAULT 1,
-  `code` varchar(3) NOT NULL,
-  `label` varchar(255) NOT NULL,
+  `code` varchar(3) CHARACTER SET utf8mb4 NOT NULL,
+  `label` varchar(255) CHARACTER SET utf8mb4 NOT NULL,
   `active` tinyint(4) NOT NULL DEFAULT 1,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=321 DEFAULT CHARSET=utf8mb4;
+) ENGINE=InnoDB AUTO_INCREMENT=321 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -3190,6 +3251,419 @@ INSERT INTO `llx_c_ziptown` VALUES (50270,NULL,NULL,6,'1955','LES VÉRINES (CHAM
 /*!40000 ALTER TABLE `llx_c_ziptown` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_cabinetmed_c_banques`
+--
+
+DROP TABLE IF EXISTS `llx_cabinetmed_c_banques`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_cabinetmed_c_banques` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `code` varchar(8) COLLATE utf8_unicode_ci NOT NULL,
+  `label` varchar(64) COLLATE utf8_unicode_ci NOT NULL,
+  `active` smallint(6) NOT NULL DEFAULT 1,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_cabinetmed_c_banques`
+--
+
+LOCK TABLES `llx_cabinetmed_c_banques` WRITE;
+/*!40000 ALTER TABLE `llx_cabinetmed_c_banques` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_cabinetmed_c_banques` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_cabinetmed_c_examconclusion`
+--
+
+DROP TABLE IF EXISTS `llx_cabinetmed_c_examconclusion`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_cabinetmed_c_examconclusion` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `code` varchar(8) COLLATE utf8_unicode_ci NOT NULL,
+  `label` varchar(64) COLLATE utf8_unicode_ci NOT NULL,
+  `position` int(11) DEFAULT 10,
+  `active` smallint(6) NOT NULL DEFAULT 1,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_cabinetmed_c_examconclusion`
+--
+
+LOCK TABLES `llx_cabinetmed_c_examconclusion` WRITE;
+/*!40000 ALTER TABLE `llx_cabinetmed_c_examconclusion` DISABLE KEYS */;
+INSERT INTO `llx_cabinetmed_c_examconclusion` VALUES (1,'AUTRE','Autre',1,1);
+/*!40000 ALTER TABLE `llx_cabinetmed_c_examconclusion` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_cabinetmed_cons`
+--
+
+DROP TABLE IF EXISTS `llx_cabinetmed_cons`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_cabinetmed_cons` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_soc` int(11) DEFAULT NULL,
+  `datecons` date NOT NULL,
+  `typepriseencharge` varchar(8) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `motifconsprinc` varchar(64) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `diaglesprinc` varchar(64) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `motifconssec` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `diaglessec` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `hdm` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `examenclinique` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `examenprescrit` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `traitementprescrit` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `comment` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `typevisit` varchar(8) COLLATE utf8_unicode_ci NOT NULL,
+  `infiltration` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `codageccam` varchar(16) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `montant_cheque` double(24,8) DEFAULT NULL,
+  `montant_espece` double(24,8) DEFAULT NULL,
+  `montant_carte` double(24,8) DEFAULT NULL,
+  `montant_tiers` double(24,8) DEFAULT NULL,
+  `banque` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `date_c` datetime NOT NULL,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `fk_user` int(11) DEFAULT NULL,
+  `fk_user_creation` int(11) DEFAULT NULL,
+  `fk_user_m` int(11) DEFAULT NULL,
+  `fk_agenda` int(11) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_cabinetmed_cons_fk_soc` (`fk_soc`),
+  KEY `idx_cabinetmed_cons_datecons` (`datecons`),
+  CONSTRAINT `fk_cabinetmed_cons_fk_soc` FOREIGN KEY (`fk_soc`) REFERENCES `llx_societe` (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_cabinetmed_cons`
+--
+
+LOCK TABLES `llx_cabinetmed_cons` WRITE;
+/*!40000 ALTER TABLE `llx_cabinetmed_cons` DISABLE KEYS */;
+INSERT INTO `llx_cabinetmed_cons` VALUES (1,12,'2019-12-05','','Cervicalgies Inflammatoires','Canal Carpien','','','None','Very hot','','','','CS','','',10.00000000,NULL,NULL,NULL,'','2019-12-05 14:46:44','2019-12-05 10:46:44',12,12,NULL,NULL),(2,29,'2020-01-06','','Cervicalgies Inflammatoires','','','','aaaaa','','ArthroScanner Epaule','','cccc','CS','','',NULL,NULL,10.00000000,NULL,'','2020-01-06 20:52:28','2020-01-06 16:52:28',12,12,NULL,NULL);
+/*!40000 ALTER TABLE `llx_cabinetmed_cons` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_cabinetmed_cons_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_cabinetmed_cons_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_cabinetmed_cons_extrafields` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `fk_object` int(11) NOT NULL,
+  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `aaa` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_cabinetmed_cons_extrafields` (`fk_object`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_cabinetmed_cons_extrafields`
+--
+
+LOCK TABLES `llx_cabinetmed_cons_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_cabinetmed_cons_extrafields` DISABLE KEYS */;
+INSERT INTO `llx_cabinetmed_cons_extrafields` VALUES (1,'2020-01-06 17:37:28',2,NULL,'bbb');
+/*!40000 ALTER TABLE `llx_cabinetmed_cons_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_cabinetmed_diaglec`
+--
+
+DROP TABLE IF EXISTS `llx_cabinetmed_diaglec`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_cabinetmed_diaglec` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `code` varchar(8) COLLATE utf8_unicode_ci NOT NULL,
+  `label` varchar(64) COLLATE utf8_unicode_ci NOT NULL,
+  `active` smallint(6) NOT NULL DEFAULT 1,
+  `icd` varchar(12) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `position` int(11) DEFAULT 10,
+  `lang` varchar(12) COLLATE utf8_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=42 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_cabinetmed_diaglec`
+--
+
+LOCK TABLES `llx_cabinetmed_diaglec` WRITE;
+/*!40000 ALTER TABLE `llx_cabinetmed_diaglec` DISABLE KEYS */;
+INSERT INTO `llx_cabinetmed_diaglec` VALUES (1,'AUTRE','Autre',1,NULL,1,NULL),(2,'LOMBL5D','Lombosciatique L5 droite',1,NULL,10,NULL),(3,'LOMBL5G','Lombosciatique L5 gauche',1,NULL,10,NULL),(4,'LOMBS1D','Lombosciatique S1 droite',1,NULL,10,NULL),(5,'LOMBS1G','Lombosciatique S1 gauche',1,NULL,10,NULL),(6,'NCB','Névralgie cervico-brachiale',1,NULL,10,NULL),(7,'PR','Polyarthrite rhumatoide',1,NULL,10,NULL),(8,'SA','Spondylarthrite ankylosante',1,NULL,10,NULL),(9,'GFTI','Gonarthrose fémoro-tibaile interne',1,NULL,10,NULL),(10,'GFTE','Gonarthrose fémoro-tibiale externe',1,NULL,10,NULL),(11,'COX','Coxarthrose',1,NULL,10,NULL),(12,'CC','Canal Carpien',1,NULL,10,NULL),(16,'CLER','Canal Lombaire Etroit et/ou  Rétréci',1,NULL,10,NULL),(22,'RH_PSO','Rhumatisme Psoriasique',1,NULL,10,NULL),(23,'LEAD','Lupus',1,NULL,10,NULL),(24,'LBDISC','Lombalgie Discale',1,NULL,10,NULL),(25,'LBRADD','Lomboradiculalgie Discale',1,NULL,10,NULL),(26,'LBRADND','Lomboradiculalgie Non Discale',1,NULL,10,NULL),(27,'CH_ROT','Chondropathie Rotulienne',1,NULL,10,NULL),(28,'AFP','Arthrose FémoroPatellaire',1,NULL,10,NULL),(29,'PPR','Pseudo Polyarthrite Rhizomélique',1,NULL,10,NULL),(30,'SHARP','Maladie de Sharp',1,NULL,10,NULL),(31,'SAPHO','SAPHO',1,NULL,10,NULL),(32,'OMARTHC','Omarthrose Centrée',1,NULL,10,NULL),(33,'RH_CCA','Rhumatisme Chondro Calcinosique',1,NULL,10,NULL),(34,'GOUTTE','Arthrite Goutteuse',1,NULL,10,NULL),(35,'CCA','Arthrite Chondro Calcinosique',1,NULL,10,NULL),(36,'ARTH_MCR','Arthrite Microcristalline',1,NULL,10,NULL),(37,'CSA','Conflit Sous Acromial',1,NULL,10,NULL),(38,'TDCALCE','Tendinopathie Calcifiante d\'Epaule',1,NULL,10,NULL),(39,'TDCALCH','Tendinopathie Calcifiante de Hanche',1,NULL,10,NULL),(40,'TBT','TendinoBursite Trochantérienne',1,NULL,10,NULL),(41,'OMARTHE','Omarthrose Excentrée',1,NULL,10,NULL);
+/*!40000 ALTER TABLE `llx_cabinetmed_diaglec` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_cabinetmed_examaut`
+--
+
+DROP TABLE IF EXISTS `llx_cabinetmed_examaut`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_cabinetmed_examaut` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_soc` int(11) DEFAULT NULL,
+  `fk_user` int(11) DEFAULT NULL,
+  `dateexam` date NOT NULL,
+  `examprinc` varchar(64) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `examsec` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `concprinc` varchar(64) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `concsec` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_cabinetmed_examaut`
+--
+
+LOCK TABLES `llx_cabinetmed_examaut` WRITE;
+/*!40000 ALTER TABLE `llx_cabinetmed_examaut` DISABLE KEYS */;
+INSERT INTO `llx_cabinetmed_examaut` VALUES (1,12,12,'2019-12-05','Scanner Cervical','','Autre','A+ BK++','2019-12-05 10:48:37');
+/*!40000 ALTER TABLE `llx_cabinetmed_examaut` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_cabinetmed_exambio`
+--
+
+DROP TABLE IF EXISTS `llx_cabinetmed_exambio`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_cabinetmed_exambio` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_soc` int(11) DEFAULT NULL,
+  `fk_user` int(11) DEFAULT NULL,
+  `dateexam` date NOT NULL,
+  `resultat` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `conclusion` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `comment` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `suivipr_ad` int(11) DEFAULT NULL,
+  `suivipr_ag` int(11) DEFAULT NULL,
+  `suivipr_vs` int(11) DEFAULT NULL,
+  `suivipr_eva` int(11) DEFAULT NULL,
+  `suivipr_das28` double DEFAULT NULL,
+  `suivipr_err` int(11) DEFAULT NULL,
+  `suivisa_fat` int(11) DEFAULT NULL,
+  `suivisa_dax` int(11) DEFAULT NULL,
+  `suivisa_dpe` int(11) DEFAULT NULL,
+  `suivisa_dpa` int(11) DEFAULT NULL,
+  `suivisa_rno` int(11) DEFAULT NULL,
+  `suivisa_dma` int(11) DEFAULT NULL,
+  `suivisa_basdai` double DEFAULT NULL,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_cabinetmed_exambio`
+--
+
+LOCK TABLES `llx_cabinetmed_exambio` WRITE;
+/*!40000 ALTER TABLE `llx_cabinetmed_exambio` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_cabinetmed_exambio` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_cabinetmed_examenprescrit`
+--
+
+DROP TABLE IF EXISTS `llx_cabinetmed_examenprescrit`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_cabinetmed_examenprescrit` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `code` varchar(8) COLLATE utf8_unicode_ci NOT NULL,
+  `label` varchar(64) COLLATE utf8_unicode_ci NOT NULL,
+  `biorad` varchar(8) COLLATE utf8_unicode_ci NOT NULL,
+  `position` int(11) DEFAULT 10,
+  `active` smallint(6) NOT NULL DEFAULT 1,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=43 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_cabinetmed_examenprescrit`
+--
+
+LOCK TABLES `llx_cabinetmed_examenprescrit` WRITE;
+/*!40000 ALTER TABLE `llx_cabinetmed_examenprescrit` DISABLE KEYS */;
+INSERT INTO `llx_cabinetmed_examenprescrit` VALUES (1,'AUTRE','Autre','OTHER',1,1),(2,'IRMLOMB','IRM lombaire','RADIO',10,1),(5,'TDMLOMB','TDM lombaires','RADIO',10,1),(6,'RX_BRL','Radios Bassin-Rachis Lombaire','RADIO',10,1),(7,'RX_RL','Radios Rachis Lombaire','RADIO',10,1),(8,'RX_BASS','Radios Bassin','RADIO',10,1),(9,'RX_BH','Radios Bassin et Hanches','RADIO',10,1),(10,'RX_GEN','Radios Genoux','RADIO',10,1),(11,'RX_CHEV','Radios Chevilles','RADIO',10,1),(12,'RX_AVPD','Radios Avants-Pieds','RADIO',10,1),(13,'RX_EP','Radio Epaule','RADIO',10,1),(14,'RX_MAINS','Radios Mains','RADIO',10,1),(15,'RX_COUDE','Radios Coude','RADIO',10,1),(16,'RX_RC','Radios Rachis Cervical','RADIO',10,1),(17,'RX_RD','Radios Rachis Dorsal','RADIO',10,1),(18,'RX_RCD','Radios Rachis CervicoDorsal','RADIO',10,1),(19,'RX_RDL','Radios DorsoLombaire','RADIO',10,1),(20,'RX_SCO','Bilan Radio Scoliose','RADIO',10,1),(21,'RX_RIC','Bilan Radio Rhumatisme  Inflammatoire','RADIO',10,1),(22,'TDM_LOMB','Scanner Lombaire','RADIO',10,1),(23,'TDM_DORS','Scanner Dorsal','RADIO',10,1),(24,'TDM_CERV','Scanner Cervical','RADIO',10,1),(25,'TDM_HANC','Scanner Hanche','RADIO',10,1),(26,'TDM_GEN','Scanner Genou','RADIO',10,1),(27,'RX_RDL','Radios Rachis DorsoLombaire','RADIO',10,1),(28,'ARTTDMG','ArthroScanner Genou','RADIO',10,1),(29,'ARTTDME','ArthroScanner Epaule','RADIO',10,1),(30,'ARTTDMH','ArthroScanner Hanche','RADIO',10,1),(31,'IRM_GEN','IRM Genou','RADIO',10,1),(32,'IRM_HANC','IRM Hanche','RADIO',10,1),(33,'IRM_EP','IRM Epaule','RADIO',10,1),(34,'IRM_SIL','IRM SacroIliaques','RADIO',10,1),(35,'IRM_RL','IRM Rachis Lombaire','RADIO',10,1),(36,'IRM_RD','IRM Rachis Dorsal','RADIO',10,1),(37,'IRM_RC','IRM Rachis Cervical','RADIO',10,1),(38,'ELECMI','Electromiogramme','RADIO',10,1),(39,'NFS','NFS','BIO',10,1),(40,'BILPHO','Bilan Phosphocalcique','BIO',10,1),(41,'VSCRP','VS/CRP','BIO',10,1),(42,'EPP','Electrophorèse Protéine Plasmatique','BIO',10,1);
+/*!40000 ALTER TABLE `llx_cabinetmed_examenprescrit` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_cabinetmed_motifcons`
+--
+
+DROP TABLE IF EXISTS `llx_cabinetmed_motifcons`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_cabinetmed_motifcons` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `code` varchar(8) COLLATE utf8_unicode_ci NOT NULL,
+  `label` varchar(64) COLLATE utf8_unicode_ci NOT NULL,
+  `position` int(11) DEFAULT 10,
+  `active` smallint(6) NOT NULL DEFAULT 1,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=54 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_cabinetmed_motifcons`
+--
+
+LOCK TABLES `llx_cabinetmed_motifcons` WRITE;
+/*!40000 ALTER TABLE `llx_cabinetmed_motifcons` DISABLE KEYS */;
+INSERT INTO `llx_cabinetmed_motifcons` VALUES (5,'AUTRE','Autre',1,1),(6,'DORS','Dorsalgie',10,1),(7,'DOLMSD','Douleur Membre supérieur Droit',10,1),(8,'DOLMSG','Douleur Membre supérieur Gauche',10,1),(9,'DOLMID','Douleur Membre inférieur Droit',10,1),(10,'DOLMIG','Douleur Membre inférieur Gauche',10,1),(11,'PARESM','Paresthésie des mains',10,1),(12,'DOLEPG','Douleur épaule gauche',10,1),(13,'DOLEPD','Douleur épaule droite',10,1),(14,'GONAD','Gonaglie droite',10,1),(15,'GONAG','Gonalgie gauche',10,1),(16,'DOLPD','Douleur Pied Droit',10,1),(17,'DOUL_MIN','Douleur Membre Inférieur',10,1),(18,'POLYAR','Polyarthralgie',10,1),(19,'SUIVIPR','Suivi PR',10,1),(20,'SUIVISPA','Suivi SPA',10,1),(21,'SUIVIRIC','Suivi RI',10,1),(22,'SUIVIPPR','Suivi PPR',10,1),(23,'DOLINGD','Douleur inguinale Droit',10,1),(24,'DOLINGG','Douleur inguinale Gauche',10,1),(25,'DOLCOUDD','Douleur coude Droit',10,1),(26,'DOLCOUDG','Douleur coude Gauche',10,1),(27,'TALAL','Talalgie',10,1),(28,'DOLTENDC','Douleur tandous Calcanien',10,1),(29,'DEROB','Dérobement Membres Inférieurs',10,1),(30,'LOMB_MEC','Lombalgies Mécaniques',10,1),(31,'LOMB_INF','Lombalgies Inflammatoires',10,1),(32,'DORS_MEC','Dorsalgies Mécaniques',10,1),(33,'DORS_INF','Dorsalgies Inflammatoires',10,1),(34,'CERV_MEC','Cervicalgies Mécaniques',10,1),(35,'SCIAT','LomboSciatique ',10,1),(36,'CRUR','LomboCruralgie',10,1),(37,'DOUL_SUP','Douleur Membre Supérieur',10,1),(38,'INGUINAL','Inguinalgie',10,1),(39,'CERV_INF','Cervicalgies Inflammatoires',10,1),(40,'DOUL_EP','Douleur Epaule',10,1),(41,'DOUL_POI','Douleur Poignet',10,1),(42,'DOUL_GEN','Douleur Genou',10,1),(43,'DOUL_COU','Douleur Coude',10,1),(44,'DOUL_HAN','Douleur Hanche',10,1),(45,'PAR_MBRS','Paresthésies Membres Inférieurs',10,1),(46,'PAR_MBRI','Paresthésies Membres Supérieurs',10,1),(47,'TR_RACHI','Traumatisme Rachis',10,1),(48,'TR_MBRS','Traumatisme Membres Supérieurs',10,1),(49,'TR_MBRI','Traumatisme Membres Inférieurs',10,1),(50,'FAT_MBRI','Fatiguabilité Membres Inférieurs',10,1),(51,'DOUL_CHE','Douleur Cheville',10,1),(52,'DOUL_PD','Douleur Pied',10,1),(53,'DOUL_MA','Douleur Main',10,1);
+/*!40000 ALTER TABLE `llx_cabinetmed_motifcons` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_cabinetmed_patient`
+--
+
+DROP TABLE IF EXISTS `llx_cabinetmed_patient`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_cabinetmed_patient` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `note_antemed` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `note_antechirgen` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `note_antechirortho` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `note_anterhum` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `note_other` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `note_traitclass` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `note_traitallergie` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `note_traitintol` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `note_traitspec` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `alert_antemed` smallint(6) DEFAULT NULL,
+  `alert_antechirgen` smallint(6) DEFAULT NULL,
+  `alert_antechirortho` smallint(6) DEFAULT NULL,
+  `alert_anterhum` smallint(6) DEFAULT NULL,
+  `alert_other` smallint(6) DEFAULT NULL,
+  `alert_traitclass` smallint(6) DEFAULT NULL,
+  `alert_traitallergie` smallint(6) DEFAULT NULL,
+  `alert_traitintol` smallint(6) DEFAULT NULL,
+  `alert_traitspec` smallint(6) DEFAULT NULL,
+  `alert_note` smallint(6) DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=30 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_cabinetmed_patient`
+--
+
+LOCK TABLES `llx_cabinetmed_patient` WRITE;
+/*!40000 ALTER TABLE `llx_cabinetmed_patient` DISABLE KEYS */;
+INSERT INTO `llx_cabinetmed_patient` VALUES (29,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0);
+/*!40000 ALTER TABLE `llx_cabinetmed_patient` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_cabinetmed_societe`
+--
+
+DROP TABLE IF EXISTS `llx_cabinetmed_societe`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_cabinetmed_societe` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `nom` varchar(60) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `entity` int(11) NOT NULL DEFAULT 1,
+  `ref_ext` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `ref_int` varchar(60) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `statut` smallint(6) DEFAULT 0,
+  `parent` int(11) DEFAULT NULL,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `datec` datetime DEFAULT NULL,
+  `datea` datetime DEFAULT NULL,
+  `status` smallint(6) DEFAULT 1,
+  `code_client` varchar(24) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `code_fournisseur` varchar(24) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `code_compta` varchar(24) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `code_compta_fournisseur` varchar(24) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `address` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `cp` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `ville` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `fk_departement` int(11) DEFAULT 0,
+  `fk_pays` int(11) DEFAULT 0,
+  `tel` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `fax` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `url` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `email` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `fk_effectif` int(11) DEFAULT 0,
+  `fk_typent` int(11) DEFAULT 0,
+  `fk_forme_juridique` int(11) DEFAULT 0,
+  `fk_currency` int(11) DEFAULT 0,
+  `siren` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `siret` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `ape` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `idprof4` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `idprof5` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `idprof6` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `tva_intra` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `capital` double DEFAULT NULL,
+  `fk_stcomm` int(11) NOT NULL DEFAULT 0,
+  `note` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `prefix_comm` varchar(5) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `client` smallint(6) DEFAULT 0,
+  `fournisseur` smallint(6) DEFAULT 0,
+  `supplier_account` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `fk_prospectlevel` varchar(12) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `customer_bad` smallint(6) DEFAULT 0,
+  `customer_rate` double DEFAULT 0,
+  `supplier_rate` double DEFAULT 0,
+  `fk_user_creat` int(11) DEFAULT NULL,
+  `fk_user_modif` int(11) DEFAULT NULL,
+  `remise_client` double DEFAULT 0,
+  `mode_reglement` smallint(6) DEFAULT NULL,
+  `cond_reglement` smallint(6) DEFAULT NULL,
+  `tva_assuj` smallint(6) DEFAULT 1,
+  `localtax1_assuj` smallint(6) DEFAULT 0,
+  `localtax2_assuj` smallint(6) DEFAULT 0,
+  `barcode` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `fk_barcode_type` int(11) DEFAULT 0,
+  `price_level` int(11) DEFAULT NULL,
+  `default_lang` varchar(6) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `logo` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `canvas` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_cabinetmed_societe`
+--
+
+LOCK TABLES `llx_cabinetmed_societe` WRITE;
+/*!40000 ALTER TABLE `llx_cabinetmed_societe` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_cabinetmed_societe` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_categorie`
 --
@@ -3287,31 +3761,6 @@ LOCK TABLES `llx_categorie_actioncomm` WRITE;
 /*!40000 ALTER TABLE `llx_categorie_actioncomm` ENABLE KEYS */;
 UNLOCK TABLES;
 
---
--- Table structure for table `llx_categorie_association`
---
-
-DROP TABLE IF EXISTS `llx_categorie_association`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_categorie_association` (
-  `fk_categorie_mere` int(11) NOT NULL,
-  `fk_categorie_fille` int(11) NOT NULL,
-  UNIQUE KEY `uk_categorie_association` (`fk_categorie_mere`,`fk_categorie_fille`),
-  UNIQUE KEY `uk_categorie_association_fk_categorie_fille` (`fk_categorie_fille`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_categorie_association`
---
-
-LOCK TABLES `llx_categorie_association` WRITE;
-/*!40000 ALTER TABLE `llx_categorie_association` DISABLE KEYS */;
-INSERT INTO `llx_categorie_association` VALUES (3,5),(9,11);
-/*!40000 ALTER TABLE `llx_categorie_association` ENABLE KEYS */;
-UNLOCK TABLES;
-
 --
 -- Table structure for table `llx_categorie_contact`
 --
@@ -3755,7 +4204,7 @@ CREATE TABLE `llx_commande` (
 
 LOCK TABLES `llx_commande` WRITE;
 /*!40000 ALTER TABLE `llx_commande` DISABLE KEYS */;
-INSERT INTO `llx_commande` VALUES (1,'2020-12-10 12:24:22',1,NULL,'CO1107-0002',1,NULL,NULL,'','2013-07-20 15:23:12','2020-08-08 13:59:09',NULL,'2020-07-20',1,NULL,1,NULL,NULL,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,'','','einstein',0,NULL,NULL,1,1,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(2,'2020-12-10 12:24:22',1,NULL,'CO1107-0003',1,NULL,NULL,'','2013-07-20 23:20:12','2020-02-12 17:06:51',NULL,'2020-07-21',1,NULL,1,NULL,NULL,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,'','','einstein',0,NULL,NULL,0,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(3,'2020-12-10 12:24:22',1,NULL,'CO1107-0004',1,NULL,NULL,'','2013-07-20 23:22:53','2020-02-17 18:27:56',NULL,'2020-07-21',1,NULL,1,NULL,NULL,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,30.00000000,30.00000000,'','','einstein',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(5,'2020-12-10 12:24:22',1,NULL,'CO1108-0001',1,NULL,NULL,'','2013-08-08 03:04:11','2020-08-08 03:04:21',NULL,'2020-08-08',1,NULL,1,NULL,NULL,2,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,'','','einstein',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(6,'2021-04-15 10:22:31',19,NULL,'(PROV6)',1,NULL,NULL,'','2015-02-17 16:22:14',NULL,NULL,'2021-02-17',1,NULL,NULL,NULL,NULL,0,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,'','','einstein',0,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,'commande/(PROV6)/(PROV6).pdf',NULL,NULL),(17,'2020-06-12 17:12:08',4,NULL,'CO7001-0005',1,NULL,NULL,NULL,'2017-02-15 23:50:34','2019-02-15 23:50:34',NULL,'2020-05-13',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,509.00000000,509.00000000,'','','',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,509.00000000,0.00000000,509.00000000,NULL,NULL,NULL),(18,'2021-04-15 10:22:31',7,4,'CO7001-0006',1,NULL,NULL,NULL,'2017-02-15 23:51:23','2021-02-15 23:51:23',NULL,'2021-02-03',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,900.00000000,900.00000000,'','','',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,900.00000000,0.00000000,900.00000000,NULL,NULL,NULL),(20,'2021-04-15 10:22:31',4,NULL,'CO7001-0007',1,NULL,NULL,NULL,'2017-02-15 23:55:52','2020-02-15 23:55:52',NULL,'2021-04-03',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,330.00000000,330.00000000,'','','',0,NULL,NULL,2,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,330.00000000,0.00000000,330.00000000,NULL,NULL,NULL),(29,'2021-04-15 10:22:31',4,NULL,'CO7001-0008',1,NULL,NULL,NULL,'2017-02-16 00:03:44','2021-02-16 00:03:44',NULL,'2021-02-12',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,457.00000000,457.00000000,'','','',0,NULL,NULL,1,NULL,NULL,2,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,457.00000000,0.00000000,457.00000000,NULL,NULL,NULL),(34,'2021-04-15 10:22:31',11,NULL,'CO7001-0009',1,NULL,NULL,NULL,'2017-02-16 00:05:01','2021-02-16 00:05:01',NULL,'2021-01-03',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,124.00000000,124.00000000,'','','',0,NULL,NULL,2,NULL,NULL,2,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,124.00000000,0.00000000,124.00000000,NULL,NULL,NULL),(38,'2021-04-15 10:22:31',3,NULL,'CO7001-0010',1,NULL,NULL,NULL,'2017-02-16 00:05:01','2021-02-16 00:05:01',NULL,'2021-02-03',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,200.00000000,200.00000000,'','','',0,NULL,NULL,1,NULL,NULL,2,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,200.00000000,0.00000000,200.00000000,NULL,NULL,NULL),(40,'2021-04-15 10:22:31',11,NULL,'CO7001-0011',1,NULL,NULL,NULL,'2017-02-16 00:05:10','2021-02-16 00:05:11',NULL,'2021-01-23',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,1210.00000000,1210.00000000,'','','',0,NULL,NULL,1,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,1210.00000000,0.00000000,1210.00000000,NULL,NULL,NULL),(43,'2021-04-15 10:22:31',10,NULL,'CO7001-0012',1,NULL,NULL,NULL,'2017-02-16 00:05:11','2021-02-16 00:05:11',NULL,'2021-02-13',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,478.00000000,478.00000000,'','','',0,NULL,NULL,2,NULL,NULL,2,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,478.00000000,0.00000000,478.00000000,NULL,NULL,NULL),(47,'2020-12-10 12:24:22',1,NULL,'CO7001-0013',1,NULL,NULL,NULL,'2017-02-16 00:05:11','2020-02-16 00:05:11',NULL,'2020-11-13',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,55.00000000,55.00000000,'','','',0,NULL,NULL,2,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,55.00000000,0.00000000,55.00000000,NULL,NULL,NULL),(48,'2020-12-10 12:24:22',4,NULL,'CO7001-0014',1,NULL,NULL,NULL,'2017-02-16 00:05:11','2020-02-16 00:05:11',NULL,'2020-07-30',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,540.00000000,540.00000000,'','','',0,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,540.00000000,0.00000000,540.00000000,NULL,NULL,NULL),(50,'2021-04-15 10:22:31',1,NULL,'CO7001-0015',1,NULL,NULL,NULL,'2017-02-16 00:05:26','2021-02-16 00:05:26',NULL,'2020-12-12',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,118.00000000,118.00000000,'','','',0,NULL,NULL,1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,118.00000000,0.00000000,118.00000000,NULL,NULL,NULL),(54,'2020-06-12 17:12:08',12,NULL,'CO7001-0016',1,NULL,NULL,NULL,'2017-02-16 00:05:26','2019-02-16 00:05:26','2019-02-16 03:05:56','2020-06-03',12,NULL,12,12,1,3,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,220.00000000,220.00000000,'','','',1,NULL,NULL,NULL,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,220.00000000,0.00000000,220.00000000,NULL,NULL,NULL),(58,'2020-12-10 12:24:22',1,NULL,'CO7001-0017',1,NULL,NULL,NULL,'2017-02-16 00:05:26','2020-02-16 00:05:26',NULL,'2020-07-23',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,436.00000000,436.00000000,'','','',0,NULL,NULL,1,NULL,NULL,2,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,436.00000000,0.00000000,436.00000000,NULL,NULL,NULL),(62,'2021-04-15 10:22:31',19,NULL,'CO7001-0018',1,NULL,NULL,NULL,'2017-02-16 00:05:35','2020-02-16 00:05:35','2020-12-20 20:48:55','2021-02-23',12,NULL,12,12,1,3,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,410.00000000,410.00000000,'','','',0,NULL,NULL,2,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,410.00000000,0.00000000,410.00000000,NULL,NULL,NULL),(68,'2020-06-12 17:12:08',3,NULL,'CO7001-0019',1,NULL,NULL,NULL,'2017-02-16 00:05:35','2019-02-16 00:05:35',NULL,'2020-05-19',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,45.00000000,45.00000000,'','','',0,NULL,NULL,NULL,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,45.00000000,0.00000000,45.00000000,NULL,NULL,NULL),(72,'2020-12-10 12:24:22',6,NULL,'CO7001-0020',1,NULL,NULL,NULL,'2017-02-16 00:05:36','2020-02-16 00:05:36','2021-01-16 02:42:56','2020-11-13',12,NULL,12,12,1,3,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,610.00000000,610.00000000,'','','',1,NULL,NULL,NULL,NULL,NULL,2,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,610.00000000,0.00000000,610.00000000,NULL,NULL,NULL),(75,'2021-04-15 10:22:31',4,NULL,'CO7001-0021',1,NULL,NULL,NULL,'2017-02-16 00:05:37','2020-02-16 04:14:20',NULL,'2021-02-13',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,25.00000000,49.88000000,0.00000000,1200.00000000,1274.88000000,'','','',0,NULL,NULL,2,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,1200.00000000,25.00000000,1274.88000000,NULL,NULL,NULL),(78,'2020-12-10 12:24:22',12,NULL,'CO7001-0022',1,NULL,NULL,NULL,'2017-02-16 00:05:37','2020-02-16 00:05:37',NULL,'2020-10-03',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,928.00000000,928.00000000,'','','',0,NULL,NULL,2,NULL,NULL,2,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,928.00000000,0.00000000,928.00000000,NULL,NULL,NULL),(81,'2020-12-10 12:24:22',11,NULL,'CO7001-0023',1,NULL,NULL,NULL,'2017-02-16 00:05:38','2020-02-16 00:05:38',NULL,'2020-07-03',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,725.00000000,725.00000000,'','','',0,NULL,NULL,2,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,725.00000000,0.00000000,725.00000000,NULL,NULL,NULL),(83,'2021-04-15 10:22:31',26,NULL,'CO7001-0024',1,NULL,NULL,NULL,'2017-02-16 00:05:38','2020-02-16 00:05:38',NULL,'2021-04-03',12,NULL,12,NULL,1,-1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,105.00000000,105.00000000,'','','',0,NULL,NULL,1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,105.00000000,0.00000000,105.00000000,NULL,NULL,NULL),(84,'2020-12-10 12:24:22',2,NULL,'CO7001-0025',1,NULL,NULL,NULL,'2017-02-16 00:05:38','2020-02-16 00:05:38',NULL,'2020-06-19',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,510.00000000,510.00000000,'','','',0,NULL,NULL,1,NULL,NULL,2,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,510.00000000,0.00000000,510.00000000,NULL,NULL,NULL),(85,'2021-04-15 10:22:31',1,NULL,'CO7001-0026',1,NULL,NULL,NULL,'2017-02-16 00:05:38','2020-02-16 00:05:38',NULL,'2021-01-03',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,47.00000000,47.00000000,'','','',0,NULL,NULL,1,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,47.00000000,0.00000000,47.00000000,NULL,NULL,NULL),(88,'2021-04-15 10:22:31',10,NULL,'CO7001-0027',1,NULL,NULL,NULL,'2017-02-16 00:05:38','2020-12-20 20:42:42',NULL,'2020-12-23',12,12,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,50.00000000,50.00000000,'This is a private note','This is a public note','',0,NULL,NULL,1,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,50.00000000,0.00000000,50.00000000,'commande/CO7001-0027/CO7001-0027.pdf',NULL,NULL),(90,'2021-04-15 10:22:31',19,NULL,'(PROV90)',1,NULL,NULL,NULL,'2017-02-16 04:46:31',NULL,NULL,'2021-02-16',12,NULL,NULL,NULL,NULL,0,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,440.00000000,440.00000000,'','','',0,NULL,NULL,3,3,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,440.00000000,0.00000000,440.00000000,NULL,NULL,NULL),(91,'2021-04-15 10:22:31',1,NULL,'(PROV91)',1,NULL,NULL,NULL,'2017-02-16 04:46:37',NULL,NULL,'2021-02-16',12,NULL,NULL,NULL,NULL,0,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,1000.00000000,1000.00000000,'','','',0,NULL,NULL,3,3,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,1000.00000000,0.00000000,1000.00000000,NULL,NULL,NULL),(92,'2021-04-15 10:22:31',3,NULL,'(PROV92)',1,NULL,NULL,NULL,'2017-02-16 04:47:25',NULL,NULL,'2021-02-16',12,NULL,NULL,NULL,NULL,0,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,1018.00000000,1018.00000000,'','','',0,NULL,NULL,3,3,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,1018.00000000,0.00000000,1018.00000000,NULL,NULL,NULL),(93,'2020-12-10 12:24:22',10,NULL,'(PROV93)',1,NULL,NULL,NULL,'2019-09-27 19:32:53',NULL,NULL,'2020-09-27',12,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,'','','einstein',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',1,'EUR',1.00000000,0.00000000,0.00000000,0.00000000,'commande/(PROV93)/(PROV93).pdf',NULL,NULL),(94,'2021-04-15 10:22:31',1,NULL,'(PROV94)',1,NULL,NULL,NULL,'2019-12-20 20:49:54',NULL,NULL,'2020-12-20',12,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0.00000000,0.00000000,0.00000000,1000.00000000,1000.00000000,'','','',0,NULL,NULL,3,3,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,1000.00000000,0.00000000,1000.00000000,NULL,NULL,NULL),(95,'2021-04-15 10:22:31',1,NULL,'(PROV95)',1,NULL,NULL,NULL,'2019-12-20 20:50:23',NULL,NULL,'2020-12-20',12,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0.00000000,0.00000000,0.00000000,1000.00000000,1000.00000000,'','','',0,NULL,NULL,3,3,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,1000.00000000,0.00000000,1000.00000000,NULL,NULL,NULL),(96,'2021-04-15 10:22:31',10,6,'(PROV96)',1,NULL,NULL,NULL,'2020-01-07 23:39:09',NULL,NULL,'2021-01-07',12,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,'aaa','','',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,10.00000000,0.00000000,10.00000000,NULL,NULL,NULL),(97,'2021-04-15 10:22:31',10,6,'(PROV97)',1,NULL,NULL,NULL,'2020-01-07 23:43:06',NULL,NULL,'2021-01-07',12,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,'aaa','','',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,10.00000000,0.00000000,10.00000000,NULL,NULL,NULL),(98,'2021-04-15 10:22:31',1,NULL,'(PROV98)',1,NULL,NULL,NULL,'2020-01-19 14:22:34',NULL,NULL,'2021-01-19',12,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0.00000000,0.45000000,0.45000000,3.00000000,3.90000000,'','','',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,3.00000000,0.00000000,3.90000000,NULL,NULL,NULL),(99,'2021-04-15 10:22:31',1,NULL,'(PROV99)',1,NULL,NULL,NULL,'2020-01-19 14:24:27',NULL,NULL,'2021-01-19',12,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0.24000000,0.00000000,0.00000000,4.00000000,4.24000000,'','','',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,4.00000000,0.24000000,4.24000000,NULL,NULL,NULL);
+INSERT INTO `llx_commande` VALUES (1,'2020-12-10 12:24:22',1,NULL,'CO1107-0002',1,NULL,NULL,'','2013-07-20 15:23:12','2020-08-08 13:59:09',NULL,'2020-07-20',1,NULL,1,NULL,NULL,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,'','','einstein',0,NULL,NULL,1,1,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(2,'2020-12-10 12:24:22',1,NULL,'CO1107-0003',1,NULL,NULL,'','2013-07-20 23:20:12','2020-02-12 17:06:51',NULL,'2020-07-21',1,NULL,1,NULL,NULL,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,'','','einstein',0,NULL,NULL,0,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(3,'2020-12-10 12:24:22',1,NULL,'CO1107-0004',1,NULL,NULL,'','2013-07-20 23:22:53','2020-02-17 18:27:56',NULL,'2020-07-21',1,NULL,1,NULL,NULL,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,30.00000000,30.00000000,'','','einstein',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(5,'2020-12-10 12:24:22',1,NULL,'CO1108-0001',1,NULL,NULL,'','2013-08-08 03:04:11','2020-08-08 03:04:21',NULL,'2020-08-08',1,NULL,1,NULL,NULL,2,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,'','','einstein',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(6,'2021-04-15 10:22:31',19,NULL,'(PROV6)',1,NULL,NULL,'','2015-02-17 16:22:14',NULL,NULL,'2021-02-17',1,NULL,NULL,NULL,NULL,0,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,'','','einstein',0,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,'commande/(PROV6)/(PROV6).pdf',NULL,NULL),(17,'2021-07-11 17:49:28',4,NULL,'CO7001-0005',1,NULL,NULL,NULL,'2017-02-15 23:50:34','2020-02-15 23:50:34',NULL,'2021-05-13',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,509.00000000,509.00000000,'','','',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,509.00000000,0.00000000,509.00000000,NULL,NULL,NULL),(18,'2021-04-15 10:22:31',7,4,'CO7001-0006',1,NULL,NULL,NULL,'2017-02-15 23:51:23','2021-02-15 23:51:23',NULL,'2021-02-03',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,900.00000000,900.00000000,'','','',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,900.00000000,0.00000000,900.00000000,NULL,NULL,NULL),(20,'2021-04-15 10:22:31',4,NULL,'CO7001-0007',1,NULL,NULL,NULL,'2017-02-15 23:55:52','2020-02-15 23:55:52',NULL,'2021-04-03',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,330.00000000,330.00000000,'','','',0,NULL,NULL,2,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,330.00000000,0.00000000,330.00000000,NULL,NULL,NULL),(29,'2021-04-15 10:22:31',4,NULL,'CO7001-0008',1,NULL,NULL,NULL,'2017-02-16 00:03:44','2021-02-16 00:03:44',NULL,'2021-02-12',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,457.00000000,457.00000000,'','','',0,NULL,NULL,1,NULL,NULL,2,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,457.00000000,0.00000000,457.00000000,NULL,NULL,NULL),(34,'2021-04-15 10:22:31',11,NULL,'CO7001-0009',1,NULL,NULL,NULL,'2017-02-16 00:05:01','2021-02-16 00:05:01',NULL,'2021-01-03',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,124.00000000,124.00000000,'','','',0,NULL,NULL,2,NULL,NULL,2,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,124.00000000,0.00000000,124.00000000,NULL,NULL,NULL),(38,'2021-04-15 10:22:31',3,NULL,'CO7001-0010',1,NULL,NULL,NULL,'2017-02-16 00:05:01','2021-02-16 00:05:01',NULL,'2021-02-03',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,200.00000000,200.00000000,'','','',0,NULL,NULL,1,NULL,NULL,2,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,200.00000000,0.00000000,200.00000000,NULL,NULL,NULL),(40,'2021-04-15 10:22:31',11,NULL,'CO7001-0011',1,NULL,NULL,NULL,'2017-02-16 00:05:10','2021-02-16 00:05:11',NULL,'2021-01-23',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,1210.00000000,1210.00000000,'','','',0,NULL,NULL,1,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,1210.00000000,0.00000000,1210.00000000,NULL,NULL,NULL),(43,'2021-04-15 10:22:31',10,NULL,'CO7001-0012',1,NULL,NULL,NULL,'2017-02-16 00:05:11','2021-02-16 00:05:11',NULL,'2021-02-13',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,478.00000000,478.00000000,'','','',0,NULL,NULL,2,NULL,NULL,2,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,478.00000000,0.00000000,478.00000000,NULL,NULL,NULL),(47,'2020-12-10 12:24:22',1,NULL,'CO7001-0013',1,NULL,NULL,NULL,'2017-02-16 00:05:11','2020-02-16 00:05:11',NULL,'2020-11-13',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,55.00000000,55.00000000,'','','',0,NULL,NULL,2,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,55.00000000,0.00000000,55.00000000,NULL,NULL,NULL),(48,'2020-12-10 12:24:22',4,NULL,'CO7001-0014',1,NULL,NULL,NULL,'2017-02-16 00:05:11','2020-02-16 00:05:11',NULL,'2020-07-30',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,540.00000000,540.00000000,'','','',0,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,540.00000000,0.00000000,540.00000000,NULL,NULL,NULL),(50,'2021-04-15 10:22:31',1,NULL,'CO7001-0015',1,NULL,NULL,NULL,'2017-02-16 00:05:26','2021-02-16 00:05:26',NULL,'2020-12-12',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,118.00000000,118.00000000,'','','',0,NULL,NULL,1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,118.00000000,0.00000000,118.00000000,NULL,NULL,NULL),(54,'2021-07-11 17:49:28',12,NULL,'CO7001-0016',1,NULL,NULL,NULL,'2017-02-16 00:05:26','2020-02-16 00:05:26','2020-02-16 03:05:56','2021-06-03',12,NULL,12,12,1,3,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,220.00000000,220.00000000,'','','',1,NULL,NULL,NULL,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,220.00000000,0.00000000,220.00000000,NULL,NULL,NULL),(58,'2020-12-10 12:24:22',1,NULL,'CO7001-0017',1,NULL,NULL,NULL,'2017-02-16 00:05:26','2020-02-16 00:05:26',NULL,'2020-07-23',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,436.00000000,436.00000000,'','','',0,NULL,NULL,1,NULL,NULL,2,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,436.00000000,0.00000000,436.00000000,NULL,NULL,NULL),(62,'2021-04-15 10:22:31',19,NULL,'CO7001-0018',1,NULL,NULL,NULL,'2017-02-16 00:05:35','2020-02-16 00:05:35','2020-12-20 20:48:55','2021-02-23',12,NULL,12,12,1,3,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,410.00000000,410.00000000,'','','',0,NULL,NULL,2,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,410.00000000,0.00000000,410.00000000,NULL,NULL,NULL),(68,'2021-07-11 17:49:28',3,NULL,'CO7001-0019',1,NULL,NULL,NULL,'2017-02-16 00:05:35','2020-02-16 00:05:35',NULL,'2021-05-19',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,45.00000000,45.00000000,'','','',0,NULL,NULL,NULL,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,45.00000000,0.00000000,45.00000000,NULL,NULL,NULL),(72,'2020-12-10 12:24:22',6,NULL,'CO7001-0020',1,NULL,NULL,NULL,'2017-02-16 00:05:36','2020-02-16 00:05:36','2021-01-16 02:42:56','2020-11-13',12,NULL,12,12,1,3,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,610.00000000,610.00000000,'','','',1,NULL,NULL,NULL,NULL,NULL,2,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,610.00000000,0.00000000,610.00000000,NULL,NULL,NULL),(75,'2021-04-15 10:22:31',4,NULL,'CO7001-0021',1,NULL,NULL,NULL,'2017-02-16 00:05:37','2020-02-16 04:14:20',NULL,'2021-02-13',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,25.00000000,49.88000000,0.00000000,1200.00000000,1274.88000000,'','','',0,NULL,NULL,2,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,1200.00000000,25.00000000,1274.88000000,NULL,NULL,NULL),(78,'2020-12-10 12:24:22',12,NULL,'CO7001-0022',1,NULL,NULL,NULL,'2017-02-16 00:05:37','2020-02-16 00:05:37',NULL,'2020-10-03',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,928.00000000,928.00000000,'','','',0,NULL,NULL,2,NULL,NULL,2,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,928.00000000,0.00000000,928.00000000,NULL,NULL,NULL),(81,'2021-07-11 17:49:28',11,NULL,'CO7001-0023',1,NULL,NULL,NULL,'2017-02-16 00:05:38','2021-02-16 00:05:38',NULL,'2021-07-03',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,725.00000000,725.00000000,'','','',0,NULL,NULL,2,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,725.00000000,0.00000000,725.00000000,NULL,NULL,NULL),(83,'2021-04-15 10:22:31',26,NULL,'CO7001-0024',1,NULL,NULL,NULL,'2017-02-16 00:05:38','2020-02-16 00:05:38',NULL,'2021-04-03',12,NULL,12,NULL,1,-1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,105.00000000,105.00000000,'','','',0,NULL,NULL,1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,105.00000000,0.00000000,105.00000000,NULL,NULL,NULL),(84,'2021-07-11 17:49:28',2,NULL,'CO7001-0025',1,NULL,NULL,NULL,'2017-02-16 00:05:38','2021-02-16 00:05:38',NULL,'2021-06-19',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,510.00000000,510.00000000,'','','',0,NULL,NULL,1,NULL,NULL,2,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,510.00000000,0.00000000,510.00000000,NULL,NULL,NULL),(85,'2021-04-15 10:22:31',1,NULL,'CO7001-0026',1,NULL,NULL,NULL,'2017-02-16 00:05:38','2020-02-16 00:05:38',NULL,'2021-01-03',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,47.00000000,47.00000000,'','','',0,NULL,NULL,1,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,47.00000000,0.00000000,47.00000000,NULL,NULL,NULL),(88,'2021-04-15 10:22:31',10,NULL,'CO7001-0027',1,NULL,NULL,NULL,'2017-02-16 00:05:38','2020-12-20 20:42:42',NULL,'2020-12-23',12,12,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,50.00000000,50.00000000,'This is a private note','This is a public note','',0,NULL,NULL,1,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,50.00000000,0.00000000,50.00000000,'commande/CO7001-0027/CO7001-0027.pdf',NULL,NULL),(90,'2021-04-15 10:22:31',19,NULL,'(PROV90)',1,NULL,NULL,NULL,'2017-02-16 04:46:31',NULL,NULL,'2021-02-16',12,NULL,NULL,NULL,NULL,0,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,440.00000000,440.00000000,'','','',0,NULL,NULL,3,3,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,440.00000000,0.00000000,440.00000000,NULL,NULL,NULL),(91,'2021-04-15 10:22:31',1,NULL,'(PROV91)',1,NULL,NULL,NULL,'2017-02-16 04:46:37',NULL,NULL,'2021-02-16',12,NULL,NULL,NULL,NULL,0,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,1000.00000000,1000.00000000,'','','',0,NULL,NULL,3,3,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,1000.00000000,0.00000000,1000.00000000,NULL,NULL,NULL),(92,'2021-04-15 10:22:31',3,NULL,'(PROV92)',1,NULL,NULL,NULL,'2017-02-16 04:47:25',NULL,NULL,'2021-02-16',12,NULL,NULL,NULL,NULL,0,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,1018.00000000,1018.00000000,'','','',0,NULL,NULL,3,3,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,1018.00000000,0.00000000,1018.00000000,NULL,NULL,NULL),(93,'2020-12-10 12:24:22',10,NULL,'(PROV93)',1,NULL,NULL,NULL,'2019-09-27 19:32:53',NULL,NULL,'2020-09-27',12,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,'','','einstein',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',1,'EUR',1.00000000,0.00000000,0.00000000,0.00000000,'commande/(PROV93)/(PROV93).pdf',NULL,NULL),(94,'2021-04-15 10:22:31',1,NULL,'(PROV94)',1,NULL,NULL,NULL,'2019-12-20 20:49:54',NULL,NULL,'2020-12-20',12,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0.00000000,0.00000000,0.00000000,1000.00000000,1000.00000000,'','','',0,NULL,NULL,3,3,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,1000.00000000,0.00000000,1000.00000000,NULL,NULL,NULL),(95,'2021-04-15 10:22:31',1,NULL,'(PROV95)',1,NULL,NULL,NULL,'2019-12-20 20:50:23',NULL,NULL,'2020-12-20',12,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0.00000000,0.00000000,0.00000000,1000.00000000,1000.00000000,'','','',0,NULL,NULL,3,3,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,1000.00000000,0.00000000,1000.00000000,NULL,NULL,NULL),(96,'2021-04-15 10:22:31',10,6,'(PROV96)',1,NULL,NULL,NULL,'2020-01-07 23:39:09',NULL,NULL,'2021-01-07',12,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,'aaa','','',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,10.00000000,0.00000000,10.00000000,NULL,NULL,NULL),(97,'2021-04-15 10:22:31',10,6,'(PROV97)',1,NULL,NULL,NULL,'2020-01-07 23:43:06',NULL,NULL,'2021-01-07',12,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,'aaa','','',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,10.00000000,0.00000000,10.00000000,NULL,NULL,NULL),(98,'2021-04-15 10:22:31',1,NULL,'(PROV98)',1,NULL,NULL,NULL,'2020-01-19 14:22:34',NULL,NULL,'2021-01-19',12,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0.00000000,0.45000000,0.45000000,3.00000000,3.90000000,'','','',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,3.00000000,0.00000000,3.90000000,NULL,NULL,NULL),(99,'2021-04-15 10:22:31',1,NULL,'(PROV99)',1,NULL,NULL,NULL,'2020-01-19 14:24:27',NULL,NULL,'2021-01-19',12,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0.24000000,0.00000000,0.00000000,4.00000000,4.24000000,'','','',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,4.00000000,0.24000000,4.24000000,NULL,NULL,NULL);
 /*!40000 ALTER TABLE `llx_commande` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -3856,7 +4305,7 @@ CREATE TABLE `llx_commande_fournisseur` (
 
 LOCK TABLES `llx_commande_fournisseur` WRITE;
 /*!40000 ALTER TABLE `llx_commande_fournisseur` DISABLE KEYS */;
-INSERT INTO `llx_commande_fournisseur` VALUES (1,'2021-04-15 10:22:31',13,'CF1007-0001',1,NULL,NULL,NULL,'2020-07-11 17:13:40','2021-02-01 18:51:42','2021-02-01 18:52:04',NULL,'2021-02-01',1,NULL,12,12,NULL,0,5,0,0.00000000,0,0,39.20000000,0.00000000,0.00000000,200.00000000,239.20000000,NULL,NULL,'muscadet',2,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL),(2,'2021-04-15 11:40:18',1,'CF1007-0002',1,NULL,NULL,NULL,'2020-07-11 18:46:28','2020-07-11 18:47:33',NULL,NULL,'2020-07-11',1,NULL,1,NULL,NULL,0,4,0,0.00000000,0,0,0.00000000,0.00000000,0.00000000,200.00000000,200.00000000,NULL,NULL,'muscadet',4,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL),(3,'2020-01-20 11:22:53',17,'(PROV3)',1,NULL,NULL,NULL,'2013-08-04 23:00:52',NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,0,0,0,0.00000000,0,0,0.00000000,0.00000000,0.00000000,1079.17000000,1079.17000000,NULL,NULL,'muscadet',0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'USD',1.20000000,1295.00000000,0.00000000,1295.00000000,NULL),(4,'2020-01-20 11:19:49',17,'(PROV4)',1,NULL,NULL,NULL,'2013-08-04 23:19:32',NULL,NULL,NULL,NULL,1,12,NULL,NULL,NULL,0,0,0,0.00000000,0,0,11.88000000,0.00000000,0.00000000,174.17000000,186.05000000,'Private note','Public note','muscadet',0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'EUR',1.00000000,174.17000000,11.88000000,186.05000000,NULL),(13,'2021-04-15 10:22:31',1,'CF1303-0004',1,NULL,NULL,NULL,'2021-03-09 19:39:18','2021-03-09 19:39:27','2021-03-09 19:39:32',NULL,'2021-03-09',1,NULL,1,1,NULL,0,2,0,0.00000000,0,0,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,NULL,NULL,'muscadet',1,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL),(14,'2020-01-20 11:20:11',1,'(PROV14)',1,NULL,'',NULL,'2020-01-20 12:20:11',NULL,NULL,NULL,NULL,12,NULL,NULL,NULL,NULL,0,0,0,NULL,0,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,'','','muscadet',0,1,NULL,NULL,NULL,NULL,NULL,0,'',1,'EUR',1.00000000,0.00000000,0.00000000,0.00000000,NULL);
+INSERT INTO `llx_commande_fournisseur` VALUES (1,'2021-04-15 10:22:31',13,'CF1007-0001',1,NULL,NULL,NULL,'2020-07-11 17:13:40','2021-02-01 18:51:42','2021-02-01 18:52:04',NULL,'2021-02-01',1,NULL,12,12,NULL,0,5,0,0.00000000,0,0,39.20000000,0.00000000,0.00000000,200.00000000,239.20000000,NULL,NULL,'muscadet',2,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL),(2,'2021-07-11 17:49:28',1,'CF1007-0002',1,NULL,NULL,NULL,'2021-07-11 18:46:28','2021-07-11 18:47:33',NULL,NULL,'2021-07-11',1,NULL,1,NULL,NULL,0,4,0,0.00000000,0,0,0.00000000,0.00000000,0.00000000,200.00000000,200.00000000,NULL,NULL,'muscadet',4,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL),(3,'2020-01-20 11:22:53',17,'(PROV3)',1,NULL,NULL,NULL,'2013-08-04 23:00:52',NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,0,0,0,0.00000000,0,0,0.00000000,0.00000000,0.00000000,1079.17000000,1079.17000000,NULL,NULL,'muscadet',0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'USD',1.20000000,1295.00000000,0.00000000,1295.00000000,NULL),(4,'2020-01-20 11:19:49',17,'(PROV4)',1,NULL,NULL,NULL,'2013-08-04 23:19:32',NULL,NULL,NULL,NULL,1,12,NULL,NULL,NULL,0,0,0,0.00000000,0,0,11.88000000,0.00000000,0.00000000,174.17000000,186.05000000,'Private note','Public note','muscadet',0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'EUR',1.00000000,174.17000000,11.88000000,186.05000000,NULL),(13,'2021-04-15 10:22:31',1,'CF1303-0004',1,NULL,NULL,NULL,'2021-03-09 19:39:18','2021-03-09 19:39:27','2021-03-09 19:39:32',NULL,'2021-03-09',1,NULL,1,1,NULL,0,2,0,0.00000000,0,0,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,NULL,NULL,'muscadet',1,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL),(14,'2020-01-20 11:20:11',1,'(PROV14)',1,NULL,'',NULL,'2020-01-20 12:20:11',NULL,NULL,NULL,NULL,12,NULL,NULL,NULL,NULL,0,0,0,NULL,0,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,'','','muscadet',0,1,NULL,NULL,NULL,NULL,NULL,0,'',1,'EUR',1.00000000,0.00000000,0.00000000,0.00000000,NULL);
 /*!40000 ALTER TABLE `llx_commande_fournisseur` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -4195,37 +4644,6 @@ LOCK TABLES `llx_comment` WRITE;
 /*!40000 ALTER TABLE `llx_comment` ENABLE KEYS */;
 UNLOCK TABLES;
 
---
--- Table structure for table `llx_cond_reglement`
---
-
-DROP TABLE IF EXISTS `llx_cond_reglement`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_cond_reglement` (
-  `rowid` int(11) NOT NULL,
-  `code` varchar(16) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `sortorder` smallint(6) DEFAULT NULL,
-  `active` tinyint(4) DEFAULT 1,
-  `libelle` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `libelle_facture` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `fdm` tinyint(4) DEFAULT NULL,
-  `nbjour` smallint(6) DEFAULT NULL,
-  `decalage` smallint(6) DEFAULT NULL,
-  PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_cond_reglement`
---
-
-LOCK TABLES `llx_cond_reglement` WRITE;
-/*!40000 ALTER TABLE `llx_cond_reglement` DISABLE KEYS */;
-INSERT INTO `llx_cond_reglement` VALUES (1,'RECEP',1,1,'A réception','Réception de facture',0,0,NULL),(2,'30D',2,1,'30 jours','Réglement à 30 jours',0,30,NULL),(3,'30DENDMONTH',3,1,'30 jours fin de mois','Réglement à 30 jours fin de mois',1,30,NULL),(4,'60D',4,1,'60 jours','Réglement à 60 jours',0,60,NULL),(5,'60DENDMONTH',5,1,'60 jours fin de mois','Réglement à 60 jours fin de mois',1,60,NULL);
-/*!40000 ALTER TABLE `llx_cond_reglement` ENABLE KEYS */;
-UNLOCK TABLES;
-
 --
 -- Table structure for table `llx_const`
 --
@@ -4244,7 +4662,7 @@ CREATE TABLE `llx_const` (
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_const` (`name`,`entity`)
-) ENGINE=InnoDB AUTO_INCREMENT=8878 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=8943 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -4253,7 +4671,7 @@ CREATE TABLE `llx_const` (
 
 LOCK TABLES `llx_const` WRITE;
 /*!40000 ALTER TABLE `llx_const` DISABLE KEYS */;
-INSERT INTO `llx_const` VALUES (8,'MAIN_UPLOAD_DOC',0,'2048','chaine',0,'Max size for file upload (0 means no upload allowed)','2012-07-08 11:17:57'),(9,'MAIN_SEARCHFORM_SOCIETE',0,'1','yesno',0,'Show form for quick company search','2012-07-08 11:17:57'),(10,'MAIN_SEARCHFORM_CONTACT',0,'1','yesno',0,'Show form for quick contact search','2012-07-08 11:17:57'),(11,'MAIN_SEARCHFORM_PRODUITSERVICE',0,'1','yesno',0,'Show form for quick product search','2012-07-08 11:17:58'),(12,'MAIN_SEARCHFORM_ADHERENT',0,'1','yesno',0,'Show form for quick member search','2012-07-08 11:17:58'),(16,'MAIN_SIZE_LISTE_LIMIT',0,'25','chaine',0,'Longueur maximum des listes','2012-07-08 11:17:58'),(29,'MAIN_DELAY_NOT_ACTIVATED_SERVICES',1,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services à activer','2012-07-08 11:17:58'),(33,'SOCIETE_NOLIST_COURRIER',0,'1','yesno',0,'Liste les fichiers du repertoire courrier','2012-07-08 11:17:58'),(36,'ADHERENT_MAIL_REQUIRED',1,'1','yesno',0,'EMail required to create a new member','2012-07-08 11:17:58'),(37,'ADHERENT_MAIL_FROM',1,'adherents@domain.com','chaine',0,'Sender EMail for automatic emails','2012-07-08 11:17:58'),(38,'ADHERENT_MAIL_RESIL',1,'Your subscription has been resiliated.\r\nWe hope to see you soon again','html',0,'Mail resiliation','2018-11-23 11:56:07'),(39,'ADHERENT_MAIL_VALID',1,'Your subscription has been validated.\r\nThis is a remind of your personal information :\r\n\r\n%INFOS%\r\n\r\n','html',0,'Mail de validation','2018-11-23 11:56:07'),(40,'ADHERENT_MAIL_COTIS',1,'Hello %PRENOM%,\r\nThanks for your subscription.\r\nThis email confirms that your subscription has been received and processed.\r\n\r\n','html',0,'Mail de validation de cotisation','2018-11-23 11:56:07'),(41,'ADHERENT_MAIL_VALID_SUBJECT',1,'Your subscription has been validated','chaine',0,'Sujet du mail de validation','2012-07-08 11:17:59'),(42,'ADHERENT_MAIL_RESIL_SUBJECT',1,'Resiliating your subscription','chaine',0,'Sujet du mail de resiliation','2012-07-08 11:17:59'),(43,'ADHERENT_MAIL_COTIS_SUBJECT',1,'Receipt of your subscription','chaine',0,'Sujet du mail de validation de cotisation','2012-07-08 11:17:59'),(44,'MAILING_EMAIL_FROM',1,'dolibarr@domain.com','chaine',0,'EMail emmetteur pour les envois d emailings','2012-07-08 11:17:59'),(45,'ADHERENT_USE_MAILMAN',1,'0','yesno',0,'Utilisation de Mailman','2012-07-08 11:17:59'),(46,'ADHERENT_MAILMAN_UNSUB_URL',1,'http://lists.domain.com/cgi-bin/mailman/admin/%LISTE%/members?adminpw=%MAILMAN_ADMINPW%&user=%EMAIL%','chaine',0,'Url de desinscription aux listes mailman','2012-07-08 11:17:59'),(47,'ADHERENT_MAILMAN_URL',1,'http://lists.domain.com/cgi-bin/mailman/admin/%LISTE%/members?adminpw=%MAILMAN_ADMINPW%&send_welcome_msg_to_this_batch=1&subscribees=%EMAIL%','chaine',0,'Url pour les inscriptions mailman','2012-07-08 11:17:59'),(48,'ADHERENT_MAILMAN_LISTS',1,'test-test,test-test2','chaine',0,'Listes auxquelles inscrire les nouveaux adherents','2012-07-08 11:17:59'),(49,'ADHERENT_MAILMAN_ADMINPW',1,'','chaine',0,'Mot de passe Admin des liste mailman','2012-07-08 11:17:59'),(50,'ADHERENT_MAILMAN_SERVER',1,'lists.domain.com','chaine',0,'Serveur hebergeant les interfaces d Admin des listes mailman','2012-07-08 11:17:59'),(51,'ADHERENT_MAILMAN_LISTS_COTISANT',1,'','chaine',0,'Liste(s) auxquelles les nouveaux cotisants sont inscris automatiquement','2012-07-08 11:17:59'),(52,'ADHERENT_USE_SPIP',1,'0','yesno',0,'Utilisation de SPIP ?','2012-07-08 11:17:59'),(53,'ADHERENT_USE_SPIP_AUTO',1,'0','yesno',0,'Utilisation de SPIP automatiquement','2012-07-08 11:17:59'),(54,'ADHERENT_SPIP_USER',1,'user','chaine',0,'user spip','2012-07-08 11:17:59'),(55,'ADHERENT_SPIP_PASS',1,'pass','chaine',0,'Pass de connection','2012-07-08 11:17:59'),(56,'ADHERENT_SPIP_SERVEUR',1,'localhost','chaine',0,'serveur spip','2012-07-08 11:17:59'),(57,'ADHERENT_SPIP_DB',1,'spip','chaine',0,'db spip','2012-07-08 11:17:59'),(58,'ADHERENT_CARD_HEADER_TEXT',1,'%ANNEE%','chaine',0,'Texte imprime sur le haut de la carte adherent','2012-07-08 11:17:59'),(59,'ADHERENT_CARD_FOOTER_TEXT',1,'Association AZERTY','chaine',0,'Texte imprime sur le bas de la carte adherent','2012-07-08 11:17:59'),(61,'FCKEDITOR_ENABLE_USER',1,'1','yesno',0,'Activation fckeditor sur notes utilisateurs','2012-07-08 11:17:59'),(62,'FCKEDITOR_ENABLE_SOCIETE',1,'1','yesno',0,'Activation fckeditor sur notes societe','2012-07-08 11:17:59'),(63,'FCKEDITOR_ENABLE_PRODUCTDESC',1,'1','yesno',0,'Activation fckeditor sur notes produits','2012-07-08 11:17:59'),(64,'FCKEDITOR_ENABLE_MEMBER',1,'1','yesno',0,'Activation fckeditor sur notes adherent','2012-07-08 11:17:59'),(65,'FCKEDITOR_ENABLE_MAILING',1,'1','yesno',0,'Activation fckeditor sur emailing','2012-07-08 11:17:59'),(67,'DON_ADDON_MODEL',1,'html_cerfafr','chaine',0,'','2012-07-08 11:18:00'),(68,'PROPALE_ADDON',1,'mod_propale_marbre','chaine',0,'','2012-07-08 11:18:00'),(69,'PROPALE_ADDON_PDF',1,'azur','chaine',0,'','2012-07-08 11:18:00'),(70,'COMMANDE_ADDON',1,'mod_commande_marbre','chaine',0,'','2012-07-08 11:18:00'),(71,'COMMANDE_ADDON_PDF',1,'einstein','chaine',0,'','2012-07-08 11:18:00'),(72,'COMMANDE_SUPPLIER_ADDON',1,'mod_commande_fournisseur_muguet','chaine',0,'','2012-07-08 11:18:00'),(73,'COMMANDE_SUPPLIER_ADDON_PDF',1,'muscadet','chaine',0,'','2012-07-08 11:18:00'),(74,'EXPEDITION_ADDON',1,'enlevement','chaine',0,'','2012-07-08 11:18:00'),(76,'FICHEINTER_ADDON',1,'pacific','chaine',0,'','2012-07-08 11:18:00'),(77,'FICHEINTER_ADDON_PDF',1,'soleil','chaine',0,'','2012-07-08 11:18:00'),(79,'FACTURE_ADDON_PDF',1,'crabe','chaine',0,'','2012-07-08 11:18:00'),(80,'PROPALE_VALIDITY_DURATION',1,'15','chaine',0,'Durée de validitée des propales','2012-07-08 11:18:00'),(230,'COMPANY_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/thirdparties','chaine',0,NULL,'2012-07-08 11:26:20'),(238,'LIVRAISON_ADDON_PDF',1,'typhon','chaine',0,'Nom du gestionnaire de generation des commandes en PDF','2012-07-08 11:26:27'),(239,'DELIVERY_ADDON_NUMBER',1,'mod_delivery_jade','chaine',0,'Nom du gestionnaire de numerotation des bons de livraison','2020-12-10 12:24:40'),(245,'FACTURE_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/invoices','chaine',0,NULL,'2012-07-08 11:28:53'),(249,'DON_FORM',1,'html_cerfafr','chaine',0,'Nom du gestionnaire de formulaire de dons','2017-09-06 16:12:22'),(254,'ADHERENT_BANK_ACCOUNT',1,'','chaine',0,'ID du Compte banquaire utilise','2012-07-08 11:29:05'),(255,'ADHERENT_BANK_CATEGORIE',1,'','chaine',0,'ID de la categorie banquaire des cotisations','2012-07-08 11:29:05'),(256,'ADHERENT_ETIQUETTE_TYPE',1,'L7163','chaine',0,'Type d etiquette (pour impression de planche d etiquette)','2012-07-08 11:29:05'),(269,'PROJECT_ADDON_PDF',1,'baleine','chaine',0,'Nom du gestionnaire de generation des projets en PDF','2012-07-08 11:29:33'),(270,'PROJECT_ADDON',1,'mod_project_simple','chaine',0,'Nom du gestionnaire de numerotation des projets','2012-07-08 11:29:33'),(369,'EXPEDITION_ADDON_PDF',1,'merou','chaine',0,'','2012-07-08 22:58:07'),(377,'FACTURE_ADDON',1,'mod_facture_terre','chaine',0,'','2012-07-08 23:08:12'),(380,'ADHERENT_CARD_TEXT',1,'%TYPE% n° %ID%\r\n%PRENOM% %NOM%\r\n<%EMAIL%>\r\n%ADRESSE%\r\n%CP% %VILLE%\r\n%PAYS%','',0,'Texte imprime sur la carte adherent','2012-07-08 23:14:46'),(381,'ADHERENT_CARD_TEXT_RIGHT',1,'aaa','',0,'','2012-07-08 23:14:55'),(386,'STOCK_CALCULATE_ON_SHIPMENT',1,'1','chaine',0,'','2012-07-08 23:23:21'),(387,'STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER',1,'1','chaine',0,'','2012-07-08 23:23:26'),(392,'MAIN_AGENDA_XCAL_EXPORTKEY',1,'dolibarr','chaine',0,'','2012-07-08 23:27:50'),(393,'MAIN_AGENDA_EXPORT_PAST_DELAY',1,'100','chaine',0,'','2012-07-08 23:27:50'),(610,'CASHDESK_ID_THIRDPARTY',1,'7','chaine',0,'','2012-07-11 17:08:18'),(611,'CASHDESK_ID_BANKACCOUNT_CASH',1,'3','chaine',0,'','2012-07-11 17:08:18'),(612,'CASHDESK_ID_BANKACCOUNT_CHEQUE',1,'1','chaine',0,'','2012-07-11 17:08:18'),(613,'CASHDESK_ID_BANKACCOUNT_CB',1,'1','chaine',0,'','2012-07-11 17:08:18'),(614,'CASHDESK_ID_WAREHOUSE',1,'2','chaine',0,'','2012-07-11 17:08:18'),(660,'LDAP_USER_DN',1,'ou=users,dc=my-domain,dc=com','chaine',0,NULL,'2012-07-18 10:25:27'),(661,'LDAP_GROUP_DN',1,'ou=groups,dc=my-domain,dc=com','chaine',0,NULL,'2012-07-18 10:25:27'),(662,'LDAP_FILTER_CONNECTION',1,'&(objectClass=user)(objectCategory=person)','chaine',0,NULL,'2012-07-18 10:25:27'),(663,'LDAP_FIELD_LOGIN',1,'uid','chaine',0,NULL,'2012-07-18 10:25:27'),(664,'LDAP_FIELD_FULLNAME',1,'cn','chaine',0,NULL,'2012-07-18 10:25:27'),(665,'LDAP_FIELD_NAME',1,'sn','chaine',0,NULL,'2012-07-18 10:25:27'),(666,'LDAP_FIELD_FIRSTNAME',1,'givenname','chaine',0,NULL,'2012-07-18 10:25:27'),(667,'LDAP_FIELD_MAIL',1,'mail','chaine',0,NULL,'2012-07-18 10:25:27'),(668,'LDAP_FIELD_PHONE',1,'telephonenumber','chaine',0,NULL,'2012-07-18 10:25:27'),(669,'LDAP_FIELD_FAX',1,'facsimiletelephonenumber','chaine',0,NULL,'2012-07-18 10:25:27'),(670,'LDAP_FIELD_MOBILE',1,'mobile','chaine',0,NULL,'2012-07-18 10:25:27'),(671,'LDAP_SERVER_TYPE',1,'openldap','chaine',0,'','2012-07-18 10:25:46'),(672,'LDAP_SERVER_PROTOCOLVERSION',1,'3','chaine',0,'','2012-07-18 10:25:47'),(673,'LDAP_SERVER_HOST',1,'localhost','chaine',0,'','2012-07-18 10:25:47'),(674,'LDAP_SERVER_PORT',1,'389','chaine',0,'','2012-07-18 10:25:47'),(675,'LDAP_SERVER_USE_TLS',1,'0','chaine',0,'','2012-07-18 10:25:47'),(676,'LDAP_SYNCHRO_ACTIVE',1,'dolibarr2ldap','chaine',0,'','2012-07-18 10:25:47'),(677,'LDAP_CONTACT_ACTIVE',1,'1','chaine',0,'','2012-07-18 10:25:47'),(678,'LDAP_MEMBER_ACTIVE',1,'1','chaine',0,'','2012-07-18 10:25:47'),(974,'MAIN_MODULE_WORKFLOW_TRIGGERS',1,'1','chaine',0,NULL,'2013-07-18 18:02:20'),(975,'WORKFLOW_PROPAL_AUTOCREATE_ORDER',1,'1','chaine',0,'','2013-07-18 18:02:24'),(980,'PRELEVEMENT_NUMERO_NATIONAL_EMETTEUR',1,'1234567','chaine',0,'','2013-07-18 18:05:50'),(983,'FACTURE_RIB_NUMBER',1,'1','chaine',0,'','2013-07-18 18:35:14'),(984,'FACTURE_CHQ_NUMBER',1,'1','chaine',0,'','2013-07-18 18:35:14'),(1016,'GOOGLE_DUPLICATE_INTO_GCAL',1,'1','chaine',0,'','2013-07-18 21:40:20'),(1152,'SOCIETE_CODECLIENT_ADDON',1,'mod_codeclient_monkey','chaine',0,'','2013-07-29 20:50:02'),(1240,'MAIN_LOGEVENTS_USER_LOGIN',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1241,'MAIN_LOGEVENTS_USER_LOGIN_FAILED',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1242,'MAIN_LOGEVENTS_USER_LOGOUT',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1243,'MAIN_LOGEVENTS_USER_CREATE',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1244,'MAIN_LOGEVENTS_USER_MODIFY',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1245,'MAIN_LOGEVENTS_USER_NEW_PASSWORD',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1246,'MAIN_LOGEVENTS_USER_ENABLEDISABLE',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1247,'MAIN_LOGEVENTS_USER_DELETE',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1248,'MAIN_LOGEVENTS_GROUP_CREATE',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1249,'MAIN_LOGEVENTS_GROUP_MODIFY',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1250,'MAIN_LOGEVENTS_GROUP_DELETE',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1251,'MAIN_BOXES_MAXLINES',1,'5','',0,'','2013-07-29 21:05:42'),(1482,'EXPEDITION_ADDON_NUMBER',1,'mod_expedition_safor','chaine',0,'Nom du gestionnaire de numerotation des expeditions','2013-08-05 17:53:11'),(1490,'CONTRACT_ADDON',1,'mod_contract_serpis','chaine',0,'Nom du gestionnaire de numerotation des contrats','2013-08-05 18:11:58'),(1677,'COMMANDE_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/orders','chaine',0,NULL,'2014-12-08 13:11:02'),(1724,'PROPALE_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/proposals','chaine',0,NULL,'2014-12-08 13:17:14'),(1730,'OPENSTREETMAP_ENABLE_MAPS',1,'1','chaine',0,'','2014-12-08 13:22:47'),(1731,'OPENSTREETMAP_ENABLE_MAPS_CONTACTS',1,'1','chaine',0,'','2014-12-08 13:22:47'),(1732,'OPENSTREETMAP_ENABLE_MAPS_MEMBERS',1,'1','chaine',0,'','2014-12-08 13:22:47'),(1733,'OPENSTREETMAP_MAPS_ZOOM_LEVEL',1,'15','chaine',0,'','2014-12-08 13:22:47'),(1742,'MAIN_MAIL_EMAIL_FROM',2,'dolibarr-robot@domain.com','chaine',0,'EMail emetteur pour les emails automatiques Dolibarr','2014-12-08 14:08:14'),(1743,'MAIN_MENU_STANDARD',2,'eldy_menu.php','chaine',0,'Module de gestion de la barre de menu du haut pour utilisateurs internes','2015-02-11 19:43:54'),(1744,'MAIN_MENUFRONT_STANDARD',2,'eldy_menu.php','chaine',0,'Module de gestion de la barre de menu du haut pour utilisateurs externes','2015-02-11 19:43:54'),(1745,'MAIN_MENU_SMARTPHONE',2,'iphone_backoffice.php','chaine',0,'Module de gestion de la barre de menu smartphone pour utilisateurs internes','2014-12-08 14:08:14'),(1746,'MAIN_MENUFRONT_SMARTPHONE',2,'iphone_frontoffice.php','chaine',0,'Module de gestion de la barre de menu smartphone pour utilisateurs externes','2014-12-08 14:08:14'),(1747,'MAIN_THEME',2,'eldy','chaine',0,'Default theme','2014-12-08 14:08:14'),(1748,'MAIN_DELAY_ACTIONS_TODO',2,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur actions planifiées non réalisées','2014-12-08 14:08:14'),(1749,'MAIN_DELAY_ORDERS_TO_PROCESS',2,'2','chaine',0,'Tolérance de retard avant alerte (en jours) sur commandes clients non traitées','2014-12-08 14:08:14'),(1750,'MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS',2,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur commandes fournisseurs non traitées','2014-12-08 14:08:14'),(1751,'MAIN_DELAY_PROPALS_TO_CLOSE',2,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur propales à cloturer','2014-12-08 14:08:14'),(1752,'MAIN_DELAY_PROPALS_TO_BILL',2,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur propales non facturées','2014-12-08 14:08:14'),(1753,'MAIN_DELAY_CUSTOMER_BILLS_UNPAYED',2,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur factures client impayées','2014-12-08 14:08:14'),(1754,'MAIN_DELAY_SUPPLIER_BILLS_TO_PAY',2,'2','chaine',0,'Tolérance de retard avant alerte (en jours) sur factures fournisseur impayées','2014-12-08 14:08:14'),(1755,'MAIN_DELAY_NOT_ACTIVATED_SERVICES',2,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services à activer','2014-12-08 14:08:14'),(1756,'MAIN_DELAY_RUNNING_SERVICES',2,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services expirés','2014-12-08 14:08:14'),(1757,'MAIN_DELAY_MEMBERS',2,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur cotisations adhérent en retard','2014-12-08 14:08:14'),(1758,'MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE',2,'62','chaine',0,'Tolérance de retard avant alerte (en jours) sur rapprochements bancaires à faire','2014-12-08 14:08:14'),(1759,'MAILING_EMAIL_FROM',2,'dolibarr@domain.com','chaine',0,'EMail emmetteur pour les envois d emailings','2014-12-08 14:08:14'),(1760,'MAIN_INFO_SOCIETE_COUNTRY',3,'1:FR:France','chaine',0,'','2015-02-26 21:56:28'),(1761,'MAIN_INFO_SOCIETE_NOM',3,'bbb','chaine',0,'','2014-12-08 14:08:20'),(1762,'MAIN_INFO_SOCIETE_STATE',3,'0','chaine',0,'','2015-02-27 14:20:27'),(1763,'MAIN_MONNAIE',3,'EUR','chaine',0,'','2014-12-08 14:08:20'),(1764,'MAIN_LANG_DEFAULT',3,'auto','chaine',0,'','2014-12-08 14:08:20'),(1765,'MAIN_MAIL_EMAIL_FROM',3,'dolibarr-robot@domain.com','chaine',0,'EMail emetteur pour les emails automatiques Dolibarr','2014-12-08 14:08:20'),(1766,'MAIN_MENU_STANDARD',3,'eldy_menu.php','chaine',0,'Module de gestion de la barre de menu du haut pour utilisateurs internes','2015-02-11 19:43:54'),(1767,'MAIN_MENUFRONT_STANDARD',3,'eldy_menu.php','chaine',0,'Module de gestion de la barre de menu du haut pour utilisateurs externes','2015-02-11 19:43:54'),(1768,'MAIN_MENU_SMARTPHONE',3,'iphone_backoffice.php','chaine',0,'Module de gestion de la barre de menu smartphone pour utilisateurs internes','2014-12-08 14:08:20'),(1769,'MAIN_MENUFRONT_SMARTPHONE',3,'iphone_frontoffice.php','chaine',0,'Module de gestion de la barre de menu smartphone pour utilisateurs externes','2014-12-08 14:08:20'),(1770,'MAIN_THEME',3,'eldy','chaine',0,'Default theme','2014-12-08 14:08:20'),(1771,'MAIN_DELAY_ACTIONS_TODO',3,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur actions planifiées non réalisées','2014-12-08 14:08:20'),(1772,'MAIN_DELAY_ORDERS_TO_PROCESS',3,'2','chaine',0,'Tolérance de retard avant alerte (en jours) sur commandes clients non traitées','2014-12-08 14:08:20'),(1773,'MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS',3,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur commandes fournisseurs non traitées','2014-12-08 14:08:20'),(1774,'MAIN_DELAY_PROPALS_TO_CLOSE',3,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur propales à cloturer','2014-12-08 14:08:20'),(1775,'MAIN_DELAY_PROPALS_TO_BILL',3,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur propales non facturées','2014-12-08 14:08:20'),(1776,'MAIN_DELAY_CUSTOMER_BILLS_UNPAYED',3,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur factures client impayées','2014-12-08 14:08:20'),(1777,'MAIN_DELAY_SUPPLIER_BILLS_TO_PAY',3,'2','chaine',0,'Tolérance de retard avant alerte (en jours) sur factures fournisseur impayées','2014-12-08 14:08:20'),(1778,'MAIN_DELAY_NOT_ACTIVATED_SERVICES',3,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services à activer','2014-12-08 14:08:20'),(1779,'MAIN_DELAY_RUNNING_SERVICES',3,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services expirés','2014-12-08 14:08:20'),(1780,'MAIN_DELAY_MEMBERS',3,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur cotisations adhérent en retard','2014-12-08 14:08:20'),(1781,'MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE',3,'62','chaine',0,'Tolérance de retard avant alerte (en jours) sur rapprochements bancaires à faire','2014-12-08 14:08:20'),(1782,'MAILING_EMAIL_FROM',3,'dolibarr@domain.com','chaine',0,'EMail emmetteur pour les envois d emailings','2014-12-08 14:08:20'),(1803,'SYSLOG_FILE',1,'DOL_DATA_ROOT/dolibarr.log','chaine',0,'','2014-12-08 14:15:08'),(1804,'SYSLOG_HANDLERS',1,'[\"mod_syslog_file\"]','chaine',0,'','2014-12-08 14:15:08'),(1805,'MAIN_MODULE_SKINCOLOREDITOR',3,'1',NULL,0,NULL,'2014-12-08 14:35:40'),(1922,'PAYPAL_API_SANDBOX',1,'1','chaine',0,'','2014-12-12 12:11:05'),(1923,'PAYPAL_API_USER',1,'seller_1355312017_biz_api1.mydomain.com','chaine',0,'','2014-12-12 12:11:05'),(1924,'PAYPAL_API_PASSWORD',1,'1355312040','chaine',0,'','2014-12-12 12:11:05'),(1925,'PAYPAL_API_SIGNATURE',1,'ABCDEFWBzvfn0q5iNmbuiDv1y.3EAXIMWyl4C5KvDReR9HDwwAd6dQ4Q','chaine',0,'','2014-12-12 12:11:05'),(1926,'PAYPAL_API_INTEGRAL_OR_PAYPALONLY',1,'integral','chaine',0,'','2014-12-12 12:11:05'),(1927,'PAYPAL_SECURITY_TOKEN',1,'50c82fab36bb3b6aa83e2a50691803b2','chaine',0,'','2014-12-12 12:11:05'),(1928,'PAYPAL_SECURITY_TOKEN_UNIQUE',1,'0','chaine',0,'','2014-12-12 12:11:05'),(1929,'PAYPAL_ADD_PAYMENT_URL',1,'1','chaine',0,'','2014-12-12 12:11:05'),(1980,'MAIN_PDF_FORMAT',1,'EUA4','chaine',0,'','2014-12-12 19:58:05'),(1981,'MAIN_PROFID1_IN_ADDRESS',1,'0','chaine',0,'','2014-12-12 19:58:05'),(1982,'MAIN_PROFID2_IN_ADDRESS',1,'0','chaine',0,'','2014-12-12 19:58:05'),(1983,'MAIN_PROFID3_IN_ADDRESS',1,'0','chaine',0,'','2014-12-12 19:58:05'),(1984,'MAIN_PROFID4_IN_ADDRESS',1,'0','chaine',0,'','2014-12-12 19:58:05'),(1985,'MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT',1,'0','chaine',0,'','2014-12-12 19:58:05'),(2835,'MAIN_USE_CONNECT_TIMEOUT',1,'10','chaine',0,'','2015-01-16 19:28:50'),(2836,'MAIN_USE_RESPONSE_TIMEOUT',1,'30','chaine',0,'','2015-01-16 19:28:50'),(2837,'MAIN_PROXY_USE',1,'0','chaine',0,'','2015-01-16 19:28:50'),(2838,'MAIN_PROXY_HOST',1,'localhost','chaine',0,'','2015-01-16 19:28:50'),(2839,'MAIN_PROXY_PORT',1,'8080','chaine',0,'','2015-01-16 19:28:50'),(2840,'MAIN_PROXY_USER',1,'aaa','chaine',0,'','2015-01-16 19:28:50'),(2841,'MAIN_PROXY_PASS',1,'bbb','chaine',0,'','2015-01-16 19:28:50'),(2848,'OVHSMS_NICK',1,'BN196-OVH','chaine',0,'','2015-01-16 19:32:36'),(2849,'OVHSMS_PASS',1,'bigone-10','chaine',0,'','2015-01-16 19:32:36'),(2850,'OVHSMS_SOAPURL',1,'https://www.ovh.com/soapi/soapi-re-1.55.wsdl','chaine',0,'','2015-01-16 19:32:36'),(2854,'THEME_ELDY_RGB',1,'bfbf00','chaine',0,'','2015-01-18 10:02:53'),(2855,'THEME_ELDY_ENABLE_PERSONALIZED',1,'0','chaine',0,'','2015-01-18 10:02:55'),(2858,'MAIN_SESSION_TIMEOUT',1,'2000','chaine',0,'','2015-01-19 17:01:53'),(2867,'FACSIM_ADDON',1,'mod_facsim_alcoy','chaine',0,'','2015-01-19 17:16:25'),(2868,'POS_SERVICES',1,'0','chaine',0,'','2015-01-19 17:16:51'),(2869,'POS_USE_TICKETS',1,'1','chaine',0,'','2015-01-19 17:16:51'),(2870,'POS_MAX_TTC',1,'100','chaine',0,'','2015-01-19 17:16:51'),(3190,'MAIN_MODULE_HOLIDAY',2,'1',NULL,0,NULL,'2015-02-01 08:52:34'),(3195,'INVOICE_SUPPLIER_ADDON_PDF',1,'canelle','chaine',0,'','2015-02-10 19:50:27'),(3199,'MAIN_FORCE_RELOAD_PAGE',1,'1','chaine',0,NULL,'2015-02-12 16:22:55'),(3223,'OVH_THIRDPARTY_IMPORT',1,'2','chaine',0,'','2015-02-13 16:20:18'),(3409,'AGENDA_USE_EVENT_TYPE',1,'1','chaine',0,'','2015-02-27 18:12:24'),(3886,'MAIN_REMOVE_INSTALL_WARNING',1,'1','chaine',1,'','2015-03-02 18:32:50'),(4013,'MAIN_DELAY_ACTIONS_TODO',1,'7','chaine',0,'','2015-03-06 08:59:12'),(4014,'MAIN_DELAY_PROPALS_TO_CLOSE',1,'31','chaine',0,'','2015-03-06 08:59:12'),(4015,'MAIN_DELAY_PROPALS_TO_BILL',1,'7','chaine',0,'','2015-03-06 08:59:12'),(4016,'MAIN_DELAY_ORDERS_TO_PROCESS',1,'2','chaine',0,'','2015-03-06 08:59:12'),(4017,'MAIN_DELAY_CUSTOMER_BILLS_UNPAYED',1,'31','chaine',0,'','2015-03-06 08:59:12'),(4018,'MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS',1,'7','chaine',0,'','2015-03-06 08:59:12'),(4019,'MAIN_DELAY_SUPPLIER_BILLS_TO_PAY',1,'2','chaine',0,'','2015-03-06 08:59:12'),(4020,'MAIN_DELAY_RUNNING_SERVICES',1,'-15','chaine',0,'','2015-03-06 08:59:12'),(4021,'MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE',1,'62','chaine',0,'','2015-03-06 08:59:13'),(4022,'MAIN_DELAY_MEMBERS',1,'31','chaine',0,'','2015-03-06 08:59:13'),(4023,'MAIN_DISABLE_METEO',1,'0','chaine',0,'','2015-03-06 08:59:13'),(4044,'ADHERENT_VAT_FOR_SUBSCRIPTIONS',1,'0','',0,'','2015-03-06 16:06:38'),(4047,'ADHERENT_BANK_USE',1,'bankviainvoice','',0,'','2015-03-06 16:12:30'),(4049,'PHPSANE_SCANIMAGE',1,'/usr/bin/scanimage','chaine',0,'','2015-03-06 21:54:13'),(4050,'PHPSANE_PNMTOJPEG',1,'/usr/bin/pnmtojpeg','chaine',0,'','2015-03-06 21:54:13'),(4051,'PHPSANE_PNMTOTIFF',1,'/usr/bin/pnmtotiff','chaine',0,'','2015-03-06 21:54:13'),(4052,'PHPSANE_OCR',1,'/usr/bin/gocr','chaine',0,'','2015-03-06 21:54:13'),(4548,'ECM_AUTO_TREE_ENABLED',1,'1','chaine',0,'','2015-03-10 15:57:21'),(4579,'MAIN_MODULE_AGENDA',2,'1',NULL,0,NULL,'2015-03-13 15:29:19'),(4580,'MAIN_AGENDA_ACTIONAUTO_COMPANY_CREATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4581,'MAIN_AGENDA_ACTIONAUTO_CONTRACT_VALIDATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4582,'MAIN_AGENDA_ACTIONAUTO_PROPAL_VALIDATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4583,'MAIN_AGENDA_ACTIONAUTO_PROPAL_SENTBYMAIL',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4584,'MAIN_AGENDA_ACTIONAUTO_ORDER_VALIDATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4585,'MAIN_AGENDA_ACTIONAUTO_ORDER_SENTBYMAIL',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4586,'MAIN_AGENDA_ACTIONAUTO_BILL_VALIDATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4587,'MAIN_AGENDA_ACTIONAUTO_BILL_PAYED',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4588,'MAIN_AGENDA_ACTIONAUTO_BILL_CANCEL',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4589,'MAIN_AGENDA_ACTIONAUTO_BILL_SENTBYMAIL',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4590,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_VALIDATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4591,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_VALIDATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4592,'MAIN_AGENDA_ACTIONAUTO_SHIPPING_VALIDATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4593,'MAIN_AGENDA_ACTIONAUTO_SHIPPING_SENTBYMAIL',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4594,'MAIN_AGENDA_ACTIONAUTO_BILL_UNVALIDATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4688,'GOOGLE_ENABLE_AGENDA',2,'1','chaine',0,'','2015-03-13 15:36:29'),(4689,'GOOGLE_AGENDA_NAME1',2,'eldy','chaine',0,'','2015-03-13 15:36:29'),(4690,'GOOGLE_AGENDA_SRC1',2,'eldy10@mail.com','chaine',0,'','2015-03-13 15:36:29'),(4691,'GOOGLE_AGENDA_COLOR1',2,'BE6D00','chaine',0,'','2015-03-13 15:36:29'),(4692,'GOOGLE_AGENDA_COLOR2',2,'7A367A','chaine',0,'','2015-03-13 15:36:29'),(4693,'GOOGLE_AGENDA_COLOR3',2,'7A367A','chaine',0,'','2015-03-13 15:36:29'),(4694,'GOOGLE_AGENDA_COLOR4',2,'7A367A','chaine',0,'','2015-03-13 15:36:29'),(4695,'GOOGLE_AGENDA_COLOR5',2,'7A367A','chaine',0,'','2015-03-13 15:36:29'),(4696,'GOOGLE_AGENDA_TIMEZONE',2,'Europe/Paris','chaine',0,'','2015-03-13 15:36:29'),(4697,'GOOGLE_AGENDA_NB',2,'5','chaine',0,'','2015-03-13 15:36:29'),(4725,'SOCIETE_CODECLIENT_ADDON',2,'mod_codeclient_leopard','chaine',0,'Module to control third parties codes','2015-03-13 20:21:35'),(4726,'SOCIETE_CODECOMPTA_ADDON',2,'mod_codecompta_panicum','chaine',0,'Module to control third parties codes','2015-03-13 20:21:35'),(4727,'SOCIETE_FISCAL_MONTH_START',2,'','chaine',0,'Mettre le numero du mois du debut d\\\'annee fiscale, ex: 9 pour septembre','2015-03-13 20:21:35'),(4728,'MAIN_SEARCHFORM_SOCIETE',2,'1','yesno',0,'Show form for quick company search','2015-03-13 20:21:35'),(4729,'MAIN_SEARCHFORM_CONTACT',2,'1','yesno',0,'Show form for quick contact search','2015-03-13 20:21:35'),(4730,'COMPANY_ADDON_PDF_ODT_PATH',2,'DOL_DATA_ROOT/doctemplates/thirdparties','chaine',0,NULL,'2015-03-13 20:21:35'),(4743,'MAIN_MODULE_CLICKTODIAL',2,'1',NULL,0,NULL,'2015-03-13 20:30:28'),(4744,'MAIN_MODULE_NOTIFICATION',2,'1',NULL,0,NULL,'2015-03-13 20:30:34'),(4745,'MAIN_MODULE_WEBSERVICES',2,'1',NULL,0,NULL,'2015-03-13 20:30:41'),(4746,'MAIN_MODULE_PROPALE',2,'1',NULL,0,NULL,'2015-03-13 20:32:38'),(4747,'PROPALE_ADDON_PDF',2,'azur','chaine',0,'Nom du gestionnaire de generation des propales en PDF','2015-03-13 20:32:38'),(4748,'PROPALE_ADDON',2,'mod_propale_marbre','chaine',0,'Nom du gestionnaire de numerotation des propales','2015-03-13 20:32:38'),(4749,'PROPALE_VALIDITY_DURATION',2,'15','chaine',0,'Duration of validity of business proposals','2015-03-13 20:32:38'),(4750,'PROPALE_ADDON_PDF_ODT_PATH',2,'DOL_DATA_ROOT/doctemplates/proposals','chaine',0,NULL,'2015-03-13 20:32:38'),(4752,'MAIN_MODULE_TAX',2,'1',NULL,0,NULL,'2015-03-13 20:32:47'),(4753,'MAIN_MODULE_DON',2,'1',NULL,0,NULL,'2015-03-13 20:32:54'),(4754,'DON_ADDON_MODEL',2,'html_cerfafr','chaine',0,'Nom du gestionnaire de generation de recu de dons','2015-03-13 20:32:54'),(4755,'POS_USE_TICKETS',2,'1','chaine',0,'','2015-03-13 20:33:09'),(4756,'POS_MAX_TTC',2,'100','chaine',0,'','2015-03-13 20:33:09'),(4757,'MAIN_MODULE_POS',2,'1',NULL,0,NULL,'2015-03-13 20:33:09'),(4758,'TICKET_ADDON',2,'mod_ticket_avenc','chaine',0,'Nom du gestionnaire de numerotation des tickets','2015-03-13 20:33:09'),(4759,'MAIN_MODULE_BANQUE',2,'1',NULL,0,NULL,'2015-03-13 20:33:09'),(4760,'MAIN_MODULE_FACTURE',2,'1',NULL,0,NULL,'2015-03-13 20:33:09'),(4761,'FACTURE_ADDON_PDF',2,'crabe','chaine',0,'Name of PDF model of invoice','2015-03-13 20:33:09'),(4762,'FACTURE_ADDON',2,'mod_facture_terre','chaine',0,'Name of numbering numerotation rules of invoice','2015-03-13 20:33:09'),(4763,'FACTURE_ADDON_PDF_ODT_PATH',2,'DOL_DATA_ROOT/doctemplates/invoices','chaine',0,NULL,'2015-03-13 20:33:09'),(4764,'MAIN_MODULE_SOCIETE',2,'1',NULL,0,NULL,'2015-03-13 20:33:09'),(4765,'MAIN_MODULE_PRODUCT',2,'1',NULL,0,NULL,'2015-03-13 20:33:09'),(4766,'PRODUCT_CODEPRODUCT_ADDON',2,'mod_codeproduct_leopard','chaine',0,'Module to control product codes','2015-03-13 20:33:09'),(4767,'MAIN_SEARCHFORM_PRODUITSERVICE',2,'1','yesno',0,'Show form for quick product search','2015-03-13 20:33:09'),(4772,'FACSIM_ADDON',2,'mod_facsim_alcoy','chaine',0,'','2015-03-13 20:33:32'),(4773,'MAIN_MODULE_MAILING',2,'1',NULL,0,NULL,'2015-03-13 20:33:37'),(4774,'MAIN_MODULE_OPENSURVEY',2,'1',NULL,0,NULL,'2015-03-13 20:33:42'),(4782,'AGENDA_USE_EVENT_TYPE',2,'1','chaine',0,'','2015-03-13 20:53:36'),(4884,'AGENDA_DISABLE_EXT',2,'1','chaine',0,'','2015-03-13 22:03:40'),(4928,'COMMANDE_SUPPLIER_ADDON_NUMBER',1,'mod_commande_fournisseur_muguet','chaine',0,'Nom du gestionnaire de numerotation des commandes fournisseur','2015-03-22 09:24:29'),(4929,'INVOICE_SUPPLIER_ADDON_NUMBER',1,'mod_facture_fournisseur_cactus','chaine',0,'Nom du gestionnaire de numerotation des factures fournisseur','2015-03-22 09:24:29'),(5001,'MAIN_CRON_KEY',0,'bc54582fe30d5d4a830c6f582ec28810','chaine',0,'','2015-03-23 17:54:53'),(5009,'CRON_KEY',0,'2c2e755c20be2014098f629865598006','chaine',0,'','2015-03-23 18:06:24'),(5139,'SOCIETE_ADD_REF_IN_LIST',1,'','yesno',0,'Display customer ref into select list','2015-09-08 23:06:08'),(5150,'PROJECT_TASK_ADDON_PDF',1,'','chaine',0,'Name of PDF/ODT tasks manager class','2015-09-08 23:06:14'),(5151,'PROJECT_TASK_ADDON',1,'mod_task_simple','chaine',0,'Name of Numbering Rule task manager class','2015-09-08 23:06:14'),(5152,'PROJECT_TASK_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/tasks','chaine',0,'','2015-09-08 23:06:14'),(5239,'BOOKMARKS_SHOW_IN_MENU',1,'10','chaine',0,'','2016-03-02 15:42:26'),(5271,'DONATION_ART200',1,'','yesno',0,'Option Française - Eligibilité Art200 du CGI','2016-12-21 12:51:28'),(5272,'DONATION_ART238',1,'','yesno',0,'Option Française - Eligibilité Art238 bis du CGI','2016-12-21 12:51:28'),(5274,'DONATION_MESSAGE',1,'Thank you','chaine',0,'Message affiché sur le récépissé de versements ou dons','2016-12-21 12:51:28'),(5349,'MAIN_SEARCHFORM_CONTACT',1,'1','chaine',0,'','2017-10-03 10:11:33'),(5351,'MAIN_SEARCHFORM_PRODUITSERVICE',1,'1','chaine',0,'','2017-10-03 10:11:33'),(5352,'MAIN_SEARCHFORM_PRODUITSERVICE_SUPPLIER',1,'0','chaine',0,'','2017-10-03 10:11:33'),(5353,'MAIN_SEARCHFORM_ADHERENT',1,'1','chaine',0,'','2017-10-03 10:11:33'),(5354,'MAIN_SEARCHFORM_PROJECT',1,'0','chaine',0,'','2017-10-03 10:11:33'),(5394,'FCKEDITOR_ENABLE_DETAILS',1,'1','yesno',0,'WYSIWIG for products details lines for all entities','2017-11-04 15:27:44'),(5395,'FCKEDITOR_ENABLE_USERSIGN',1,'1','yesno',0,'WYSIWIG for user signature','2017-11-04 15:27:44'),(5396,'FCKEDITOR_ENABLE_MAIL',1,'1','yesno',0,'WYSIWIG for products details lines for all entities','2017-11-04 15:27:44'),(5398,'CATEGORIE_RECURSIV_ADD',1,'','yesno',0,'Affect parent categories','2017-11-04 15:27:46'),(5404,'MAIN_MODULE_CATEGORIE',1,'1',NULL,0,NULL,'2017-11-04 15:41:43'),(5415,'EXPEDITION_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/shipment','chaine',0,NULL,'2017-11-15 22:38:28'),(5416,'LIVRAISON_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/delivery','chaine',0,NULL,'2017-11-15 22:38:28'),(5426,'MAIN_MODULE_PROJET',1,'1',NULL,0,NULL,'2017-11-15 22:38:44'),(5427,'PROJECT_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/projects','chaine',0,NULL,'2017-11-15 22:38:44'),(5428,'PROJECT_USE_OPPORTUNIES',1,'1','chaine',0,NULL,'2017-11-15 22:38:44'),(5430,'MAIN_MODULE_EXPORT',1,'1',NULL,0,NULL,'2017-11-15 22:38:56'),(5431,'MAIN_MODULE_IMPORT',1,'1',NULL,0,NULL,'2017-11-15 22:38:58'),(5432,'MAIN_MODULE_MAILING',1,'1',NULL,0,NULL,'2017-11-15 22:39:00'),(5434,'EXPENSEREPORT_ADDON_PDF',1,'standard','chaine',0,'Name of manager to build PDF expense reports documents','2017-11-15 22:39:05'),(5437,'SALARIES_ACCOUNTING_ACCOUNT_CHARGE',1,'641','chaine',0,NULL,'2017-11-15 22:39:08'),(5441,'ADHERENT_ETIQUETTE_TEXT',1,'%FULLNAME%\n%ADDRESS%\n%ZIP% %TOWN%\n%COUNTRY%','text',0,'Text to print on member address sheets','2018-11-23 11:56:07'),(5443,'MAIN_MODULE_PRELEVEMENT',1,'1',NULL,0,NULL,'2017-11-15 22:39:33'),(5453,'MAIN_MODULE_CONTRAT',1,'1',NULL,0,NULL,'2017-11-15 22:39:52'),(5455,'MAIN_MODULE_FICHEINTER',1,'1',NULL,0,NULL,'2017-11-15 22:39:56'),(5459,'MAIN_MODULE_PAYPAL',1,'1',NULL,0,NULL,'2017-11-15 22:41:02'),(5463,'MAIN_MODULE_PROPALE',1,'1',NULL,0,NULL,'2017-11-15 22:41:47'),(5483,'GENBARCODE_BARCODETYPE_THIRDPARTY',1,'6','chaine',0,'','2018-01-16 15:49:43'),(5484,'PRODUIT_DEFAULT_BARCODE_TYPE',1,'2','chaine',0,'','2018-01-16 15:49:46'),(5586,'MAIN_DELAY_EXPENSEREPORTS_TO_PAY',1,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur les notes de frais impayées','2018-01-22 17:28:18'),(5587,'MAIN_FIX_FOR_BUGGED_MTA',1,'1','chaine',1,'Set constant to fix email ending from PHP with some linux ike system','2018-01-22 17:28:18'),(5590,'MAIN_VERSION_LAST_INSTALL',0,'3.8.3','chaine',0,'Dolibarr version when install','2018-01-22 17:28:42'),(5604,'MAIN_INFO_SOCIETE_LOGO',1,'mybigcompany.png','chaine',0,'','2018-01-22 17:33:49'),(5605,'MAIN_INFO_SOCIETE_LOGO_SMALL',1,'mybigcompany_small.png','chaine',0,'','2018-01-22 17:33:49'),(5606,'MAIN_INFO_SOCIETE_LOGO_MINI',1,'mybigcompany_mini.png','chaine',0,'','2018-01-22 17:33:49'),(5614,'MAIN_SIZE_SHORTLISTE_LIMIT',1,'4','chaine',0,'Longueur maximum des listes courtes (fiche client)','2018-03-13 10:54:46'),(5627,'SUPPLIER_PROPOSAL_ADDON_PDF',1,'aurore','chaine',0,'Name of submodule to generate PDF for supplier quotation request','2018-07-30 11:13:20'),(5628,'SUPPLIER_PROPOSAL_ADDON',1,'mod_supplier_proposal_marbre','chaine',0,'Name of submodule to number supplier quotation request','2018-07-30 11:13:20'),(5629,'SUPPLIER_PROPOSAL_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/supplier_proposal','chaine',0,NULL,'2018-07-30 11:13:20'),(5633,'MAIN_MODULE_API',1,'1',NULL,0,NULL,'2018-07-30 11:13:54'),(5634,'MAIN_MODULE_WEBSERVICES',1,'1',NULL,0,NULL,'2018-07-30 11:13:56'),(5635,'WEBSERVICES_KEY',1,'dolibarrkey','chaine',0,'','2018-07-30 11:14:04'),(5638,'MAIN_MODULE_EXTERNALRSS',1,'1',NULL,0,NULL,'2018-07-30 11:15:04'),(5642,'SOCIETE_CODECOMPTA_ADDON',1,'mod_codecompta_aquarium','chaine',0,'','2018-07-30 11:16:42'),(5707,'CASHDESK_NO_DECREASE_STOCK',1,'1','chaine',0,'','2018-07-30 13:38:11'),(5708,'MAIN_MODULE_PRODUCTBATCH',1,'1',NULL,0,NULL,'2018-07-30 13:38:11'),(5710,'MAIN_MODULE_STOCK',1,'1',NULL,0,NULL,'2018-07-30 13:38:11'),(5711,'MAIN_MODULE_PRODUCT',1,'1',NULL,0,NULL,'2018-07-30 13:38:11'),(5808,'MARGIN_TYPE',1,'costprice','chaine',0,'','2018-07-30 16:32:18'),(5809,'DISPLAY_MARGIN_RATES',1,'1','chaine',0,'','2018-07-30 16:32:20'),(5833,'ACCOUNTING_EXPORT_SEPARATORCSV',1,',','string',0,NULL,'2017-01-29 15:11:56'),(5840,'CHARTOFACCOUNTS',1,'2','chaine',0,NULL,'2017-01-29 15:11:56'),(5841,'ACCOUNTING_EXPORT_MODELCSV',1,'1','chaine',0,NULL,'2017-01-29 15:11:56'),(5842,'ACCOUNTING_LENGTH_GACCOUNT',1,'','chaine',0,NULL,'2017-01-29 15:11:56'),(5843,'ACCOUNTING_LENGTH_AACCOUNT',1,'','chaine',0,NULL,'2017-01-29 15:11:56'),(5844,'ACCOUNTING_LIST_SORT_VENTILATION_TODO',1,'1','yesno',0,NULL,'2017-01-29 15:11:56'),(5845,'ACCOUNTING_LIST_SORT_VENTILATION_DONE',1,'1','yesno',0,NULL,'2017-01-29 15:11:56'),(5846,'ACCOUNTING_EXPORT_DATE',1,'%d%m%Y','chaine',0,NULL,'2017-01-29 15:11:56'),(5848,'ACCOUNTING_EXPORT_FORMAT',1,'csv','chaine',0,NULL,'2017-01-29 15:11:56'),(5853,'MAIN_MODULE_WORKFLOW',1,'1',NULL,0,NULL,'2017-01-29 15:12:12'),(5854,'MAIN_MODULE_NOTIFICATION',1,'1',NULL,0,NULL,'2017-01-29 15:12:35'),(5855,'MAIN_MODULE_OAUTH',1,'1',NULL,0,NULL,'2017-01-29 15:12:41'),(5883,'MAILING_LIMIT_SENDBYWEB',0,'15','chaine',1,'Number of targets to defined packet size when sending mass email','2017-01-29 17:36:33'),(5884,'MAIN_MAIL_DEBUG',1,'0','chaine',1,'','2017-01-29 18:53:02'),(5885,'MAIN_SOAP_DEBUG',1,'0','chaine',1,'','2017-01-29 18:53:02'),(5925,'MAIN_AGENDA_ACTIONAUTO_MEMBER_SUBSCRIPTION',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5931,'DATABASE_PWD_ENCRYPTED',1,'1','chaine',0,'','2017-02-01 15:06:04'),(5932,'MAIN_DISABLE_ALL_MAILS',1,'0','chaine',0,'','2017-02-01 15:09:09'),(5933,'MAIN_MAIL_SENDMODE',1,'mail','chaine',0,'','2017-02-01 15:09:09'),(5934,'MAIN_MAIL_SMTP_PORT',1,'465','chaine',0,'','2017-02-01 15:09:09'),(5935,'MAIN_MAIL_SMTP_SERVER',1,'smtp.mail.com','chaine',0,'','2017-02-01 15:09:09'),(5936,'MAIN_MAIL_SMTPS_ID',1,'eldy10@mail.com','chaine',0,'','2017-02-01 15:09:09'),(5937,'MAIN_MAIL_SMTPS_PW',1,'bidonge','chaine',0,'','2017-02-01 15:09:09'),(5938,'MAIN_MAIL_EMAIL_FROM',1,'robot@example.com','chaine',0,'','2017-02-01 15:09:09'),(5939,'MAIN_MAIL_DEFAULT_FROMTYPE',1,'user','chaine',0,'','2017-02-01 15:09:09'),(5940,'PRELEVEMENT_ID_BANKACCOUNT',1,'1','chaine',0,'','2017-02-06 04:04:47'),(5941,'PRELEVEMENT_ICS',1,'ICS123456','chaine',0,'','2017-02-06 04:04:47'),(5942,'PRELEVEMENT_USER',1,'1','chaine',0,'','2017-02-06 04:04:47'),(5943,'BANKADDON_PDF',1,'sepamandate','chaine',0,'','2017-02-06 04:13:52'),(5947,'CHEQUERECEIPTS_THYME_MASK',1,'CHK{yy}{mm}-{0000@1}','chaine',0,'','2017-02-06 04:16:27'),(5948,'MAIN_MODULE_LOAN',1,'1',NULL,0,NULL,'2017-02-06 19:19:05'),(5954,'MAIN_SUBMODULE_EXPEDITION',1,'1','chaine',0,'','2017-02-06 23:57:37'),(5964,'MAIN_MODULE_TAX',1,'1',NULL,0,NULL,'2017-02-07 18:56:12'),(6019,'MAIN_INFO_SOCIETE_COUNTRY',2,'1:FR:France','chaine',0,'','2017-02-15 17:18:22'),(6020,'MAIN_INFO_SOCIETE_NOM',2,'MySecondCompany','chaine',0,'','2017-02-15 17:18:22'),(6021,'MAIN_INFO_SOCIETE_STATE',2,'0','chaine',0,'','2017-02-15 17:18:22'),(6022,'MAIN_MONNAIE',2,'EUR','chaine',0,'','2017-02-15 17:18:22'),(6023,'MAIN_LANG_DEFAULT',2,'auto','chaine',0,'','2017-02-15 17:18:22'),(6032,'MAIN_MODULE_MULTICURRENCY',1,'1',NULL,0,NULL,'2017-02-15 17:29:59'),(6048,'SYSLOG_FACILITY',0,'LOG_USER','chaine',0,'','2017-02-15 22:37:01'),(6049,'SYSLOG_FIREPHP_INCLUDEPATH',0,'/home/ldestailleur/git/dolibarr_5.0/htdocs/includes/firephp/firephp-core/lib/','chaine',0,'','2017-02-15 22:37:01'),(6050,'SYSLOG_FILE',0,'DOL_DATA_ROOT/dolibarr.log','chaine',0,'','2017-02-15 22:37:01'),(6051,'SYSLOG_CHROMEPHP_INCLUDEPATH',0,'/home/ldestailleur/git/dolibarr_5.0/htdocs/includes/ccampbell/chromephp/','chaine',0,'','2017-02-15 22:37:01'),(6052,'SYSLOG_HANDLERS',0,'[\"mod_syslog_file\"]','chaine',0,'','2017-02-15 22:37:01'),(6092,'MAIN_SIZE_SHORTLIST_LIMIT',0,'3','chaine',0,'Max length for small lists (tabs)','2017-05-12 09:02:38'),(6099,'MAIN_MODULE_SKYPE',1,'1',NULL,0,NULL,'2017-05-12 09:03:51'),(6100,'MAIN_MODULE_GRAVATAR',1,'1',NULL,0,NULL,'2017-05-12 09:03:54'),(6102,'PRODUCT_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/products','chaine',0,'','2017-08-27 13:29:07'),(6103,'CONTRACT_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/contracts','chaine',0,'','2017-08-27 13:29:07'),(6104,'USERGROUP_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/usergroups','chaine',0,'','2017-08-27 13:29:07'),(6105,'USER_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/users','chaine',0,'','2017-08-27 13:29:07'),(6106,'MAIN_ENABLE_OVERWRITE_TRANSLATION',1,'1','chaine',0,'Enable overwrote of translation','2017-08-27 13:29:07'),(6377,'COMMANDE_SAPHIR_MASK',1,'{yy}{mm}{000}{ttt}','chaine',0,'','2017-09-06 07:56:25'),(6518,'GOOGLE_DUPLICATE_INTO_THIRDPARTIES',1,'1','chaine',0,'','2017-09-06 19:43:57'),(6519,'GOOGLE_DUPLICATE_INTO_CONTACTS',1,'0','chaine',0,'','2017-09-06 19:43:57'),(6520,'GOOGLE_TAG_PREFIX',1,'Dolibarr (Thirdparties)','chaine',0,'','2017-09-06 19:43:57'),(6521,'GOOGLE_TAG_PREFIX_CONTACTS',1,'Dolibarr (Contacts/Addresses)','chaine',0,'','2017-09-06 19:43:57'),(6522,'GOOGLE_ENABLE_AGENDA',1,'1','chaine',0,'','2017-09-06 19:44:12'),(6523,'GOOGLE_AGENDA_COLOR1',1,'1B887A','chaine',0,'','2017-09-06 19:44:12'),(6524,'GOOGLE_AGENDA_COLOR2',1,'7A367A','chaine',0,'','2017-09-06 19:44:12'),(6525,'GOOGLE_AGENDA_COLOR3',1,'7A367A','chaine',0,'','2017-09-06 19:44:12'),(6526,'GOOGLE_AGENDA_COLOR4',1,'7A367A','chaine',0,'','2017-09-06 19:44:12'),(6527,'GOOGLE_AGENDA_COLOR5',1,'7A367A','chaine',0,'','2017-09-06 19:44:12'),(6528,'GOOGLE_AGENDA_TIMEZONE',1,'Europe/Paris','chaine',0,'','2017-09-06 19:44:12'),(6529,'GOOGLE_AGENDA_NB',1,'5','chaine',0,'','2017-09-06 19:44:12'),(6543,'MAIN_SMS_DEBUG',0,'1','chaine',1,'This is to enable OVH SMS debug','2017-09-06 19:44:34'),(6562,'BLOCKEDLOG_ENTITY_FINGERPRINT',1,'b63e359ffca54d5c2bab869916eaf23d4a736703028ccbf77ce1167c5f830e7b','chaine',0,'Numeric Unique Fingerprint','2018-01-19 11:27:15'),(6564,'BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY',1,'FR','chaine',0,'This is list of country code where the module may be mandatory','2018-01-19 11:27:15'),(6565,'MAIN_MODULE_BOOKMARK',1,'1',NULL,0,'{\"authorid\":\"12\",\"ip\":\"82.240.38.230\"}','2018-01-19 11:27:34'),(6566,'MAIN_MODULE_ADHERENT',1,'1',NULL,0,'{\"authorid\":\"12\",\"ip\":\"82.240.38.230\"}','2018-01-19 11:27:56'),(6567,'ADHERENT_ADDON_PDF',1,'standard','chaine',0,'Name of PDF model of member','2018-01-19 11:27:56'),(6636,'MAIN_MODULE_TICKET_MODELS',1,'1','chaine',0,NULL,'2019-06-05 09:15:29'),(6647,'MAIN_MODULE_SOCIALNETWORKS',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2019-06-05 09:16:49'),(6795,'TICKET_ADDON',1,'mod_ticket_simple','chaine',0,'','2019-09-26 12:07:59'),(6796,'PRODUCT_CODEPRODUCT_ADDON',1,'mod_codeproduct_elephant','chaine',0,'','2019-09-26 12:59:00'),(6800,'CASHDESK_ID_THIRDPARTY1',1,'7','chaine',0,'','2019-09-26 15:30:09'),(6801,'CASHDESK_ID_BANKACCOUNT_CASH1',1,'3','chaine',0,'','2019-09-26 15:30:09'),(6802,'CASHDESK_ID_BANKACCOUNT_CHEQUE1',1,'4','chaine',0,'','2019-09-26 15:30:09'),(6803,'CASHDESK_ID_BANKACCOUNT_CB1',1,'4','chaine',0,'','2019-09-26 15:30:09'),(6804,'CASHDESK_ID_BANKACCOUNT_PRE1',1,'4','chaine',0,'','2019-09-26 15:30:09'),(6805,'CASHDESK_ID_BANKACCOUNT_VIR1',1,'1','chaine',0,'','2019-09-26 15:30:09'),(6806,'CASHDESK_NO_DECREASE_STOCK1',1,'1','chaine',0,'','2019-09-26 15:30:09'),(6811,'FORCEPROJECT_ON_PROPOSAL',1,'1','chaine',0,'','2019-09-27 14:52:57'),(6813,'PROJECT_USE_OPPORTUNITIES',1,'1','chaine',0,'','2019-10-01 11:48:09'),(6814,'PACKTHEMEACTIVATEDTHEME',0,'modOwnTheme','chaine',0,'','2019-10-02 11:41:58'),(6815,'OWNTHEME_COL1',0,'#6a89cc','chaine',0,'','2019-10-02 11:41:58'),(6816,'OWNTHEME_COL2',0,'#60a3bc','chaine',0,'','2019-10-02 11:41:58'),(6817,'DOL_VERSION',0,'10.0.2','chaine',0,'Dolibarr version','2019-10-02 11:41:58'),(6823,'OWNTHEME_COL_BODY_BCKGRD',0,'#E9E9E9','chaine',0,'','2019-10-02 11:41:58'),(6824,'OWNTHEME_COL_LOGO_BCKGRD',0,'#474c80','chaine',0,'','2019-10-02 11:41:58'),(6825,'OWNTHEME_COL_TXT_MENU',0,'#b8c6e5','chaine',0,'','2019-10-02 11:41:58'),(6826,'OWNTHEME_COL_HEADER_BCKGRD',0,'#474c80','chaine',0,'','2019-10-02 11:41:58'),(6827,'OWNTHEME_CUSTOM_CSS',0,'0','yesno',0,'','2019-10-02 11:41:58'),(6828,'OWNTHEME_CUSTOM_JS',0,'0','yesno',0,'','2019-10-02 11:41:58'),(6829,'OWNTHEME_FIXED_MENU',0,'0','yesno',0,'','2019-10-02 11:41:58'),(6830,'OWNTHEME_D_HEADER_FONT_SIZE',0,'1.7rem','chaine',0,'','2019-10-02 11:41:58'),(6831,'OWNTHEME_S_HEADER_FONT_SIZE',0,'1.6rem','chaine',0,'','2019-10-02 11:41:58'),(6832,'OWNTHEME_D_VMENU_FONT_SIZE',0,'1.2rem','chaine',0,'','2019-10-02 11:41:58'),(6833,'OWNTHEME_S_VMENU_FONT_SIZE',0,'1.2rem','chaine',0,'','2019-10-02 11:41:58'),(6844,'MAIN_THEME',0,'eldy','chaine',0,'','2019-10-02 11:46:02'),(6845,'MAIN_MENU_STANDARD',0,'eldy_menu.php','chaine',0,'','2019-10-02 11:46:02'),(6846,'MAIN_MENUFRONT_STANDARD',0,'eldy_menu.php','chaine',0,'','2019-10-02 11:46:02'),(6847,'MAIN_MENU_SMARTPHONE',0,'eldy_menu.php','chaine',0,'','2019-10-02 11:46:02'),(6848,'MAIN_MENUFRONT_SMARTPHONE',0,'eldy_menu.php','chaine',0,'','2019-10-02 11:46:02'),(6851,'BECREATIVE_COL1',1,'#1e88e5','chaine',0,'','2019-10-02 11:47:10'),(6852,'BECREATIVE_COL2',1,'#1e88e5','chaine',0,'','2019-10-02 11:47:10'),(6853,'DOL_VERSION',1,'10.0.2','chaine',0,'Dolibarr version','2019-10-02 11:47:10'),(6859,'BECREATIVE_COL_BODY_BCKGRD',1,'#e6eaef','chaine',0,'','2019-10-02 11:47:10'),(6860,'BECREATIVE_COL_LOGO_BCKGRD',1,'#1e88e5','chaine',0,'','2019-10-02 11:47:10'),(6861,'BECREATIVE_COL_TXT_MENU',1,'#b8c6e5','chaine',0,'','2019-10-02 11:47:10'),(6862,'BECREATIVE_COL_HEADER_BCKGRD',1,'#26a69a','chaine',0,'','2019-10-02 11:47:10'),(6863,'BECREATIVE_CUSTOM_CSS',1,'0','yesno',0,'','2019-10-02 11:47:10'),(6864,'BECREATIVE_CUSTOM_JS',1,'0','yesno',0,'','2019-10-02 11:47:10'),(6865,'BECREATIVE_FIXED_MENU',1,'0','yesno',0,'','2019-10-02 11:47:10'),(6866,'BECREATIVE_D_HEADER_FONT_SIZE',1,'1.7rem','chaine',0,'','2019-10-02 11:47:10'),(6867,'BECREATIVE_S_HEADER_FONT_SIZE',1,'1.6rem','chaine',0,'','2019-10-02 11:47:10'),(6868,'BECREATIVE_D_VMENU_FONT_SIZE',1,'1.2rem','chaine',0,'','2019-10-02 11:47:10'),(6869,'BECREATIVE_S_VMENU_FONT_SIZE',1,'1.2rem','chaine',0,'','2019-10-02 11:47:10'),(6881,'MAIN_MENU_STANDARD',1,'eldy_menu.php','chaine',0,'','2019-10-02 11:48:49'),(6882,'MAIN_MENUFRONT_STANDARD',1,'eldy_menu.php','chaine',0,'','2019-10-02 11:48:49'),(6883,'MAIN_MENU_SMARTPHONE',1,'eldy_menu.php','chaine',0,'','2019-10-02 11:48:49'),(6884,'MAIN_MENUFRONT_SMARTPHONE',1,'eldy_menu.php','chaine',0,'','2019-10-02 11:48:49'),(6885,'ACCOUNTING_ACCOUNT_CUSTOMER',1,'411','chaine',0,'','2019-10-04 08:15:44'),(6886,'ACCOUNTING_ACCOUNT_SUPPLIER',1,'401','chaine',0,'','2019-10-04 08:15:44'),(6887,'SALARIES_ACCOUNTING_ACCOUNT_PAYMENT',1,'421','chaine',0,'','2019-10-04 08:15:44'),(6888,'ACCOUNTING_PRODUCT_BUY_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6889,'ACCOUNTING_PRODUCT_SOLD_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6890,'ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6891,'ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6892,'ACCOUNTING_SERVICE_BUY_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6893,'ACCOUNTING_SERVICE_SOLD_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6894,'ACCOUNTING_VAT_BUY_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6895,'ACCOUNTING_VAT_SOLD_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6896,'ACCOUNTING_VAT_PAY_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6897,'ACCOUNTING_ACCOUNT_SUSPENSE',1,'471','chaine',0,'','2019-10-04 08:15:44'),(6898,'ACCOUNTING_ACCOUNT_TRANSFER_CASH',1,'58','chaine',0,'','2019-10-04 08:15:44'),(6899,'DONATION_ACCOUNTINGACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6900,'ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6901,'LOAN_ACCOUNTING_ACCOUNT_CAPITAL',1,'164','chaine',0,'','2019-10-04 08:15:44'),(6902,'LOAN_ACCOUNTING_ACCOUNT_INTEREST',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6903,'LOAN_ACCOUNTING_ACCOUNT_INSURANCE',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6912,'TICKET_ENABLE_PUBLIC_INTERFACE',1,'1','chaine',0,'','2019-10-04 11:44:33'),(6934,'TICKET_NOTIFICATION_EMAIL_FROM',1,'fff','chaine',0,'','2019-10-04 12:03:51'),(6935,'TICKET_NOTIFICATION_EMAIL_TO',1,'ff','chaine',0,'','2019-10-04 12:03:51'),(6936,'TICKET_MESSAGE_MAIL_INTRO',1,'Hello,<br />\r\nA new response was sent on a ticket that you contact. Here is the message:<img alt=\"\" src=\"/dolibarr_10.0/htdocs/viewimage.php?modulepart=medias&amp;entity=1&amp;file=image/background_rough-horn.jpg\" style=\"height:1080px; width:1920px\" />','chaine',0,'','2019-10-04 12:03:51'),(6937,'TICKET_MESSAGE_MAIL_SIGNATURE',1,'<p>Sincerely,</p>\r\n\r\n<p>--<img alt=\"\" src=\"/dolibarr_10.0/htdocs/viewimage.php?modulepart=medias&amp;entity=1&amp;file=image/background_rough-horn.jpg\" style=\"height:1080px; width:1920px\" /></p>\r\n','chaine',0,'','2019-10-04 12:03:51'),(7027,'USER_PASSWORD_GENERATED',1,'Perso','chaine',0,'','2019-10-07 10:52:46'),(7028,'USER_PASSWORD_PATTERN',1,'12;1;0;1;0;1','chaine',0,'','2019-10-07 10:57:03'),(7034,'BOM_ADDON',1,'mod_bom_standard','chaine',0,'Name of numbering rules of BOM','2019-10-08 18:49:41'),(7035,'BOM_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/boms','chaine',0,NULL,'2019-10-08 18:49:41'),(7036,'MAIN_MODULE_GEOIPMAXMIND',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2019-10-08 18:51:54'),(7037,'MAIN_MODULE_DAV',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2019-10-08 18:54:07'),(7122,'BOM_ADDON_PDF',1,'generic_bom_odt','chaine',0,'','2019-11-28 14:00:58'),(7195,'MAIN_AGENDA_ACTIONAUTO_MO_VALIDATE',1,'1','chaine',0,'','2019-11-29 08:44:37'),(7196,'MAIN_AGENDA_ACTIONAUTO_MO_PRODUCED',1,'1','chaine',0,'','2019-11-29 08:44:37'),(7197,'MAIN_AGENDA_ACTIONAUTO_MO_DELETE',1,'1','chaine',0,'','2019-11-29 08:44:37'),(7198,'MAIN_AGENDA_ACTIONAUTO_MO_CANCEL',1,'1','chaine',0,'','2019-11-29 08:44:37'),(7201,'TICKET_PUBLIC_INTERFACE_TOPIC',1,'MyBigCompany public interface for Ticket','chaine',0,'','2019-11-29 08:49:36'),(7202,'TICKET_PUBLIC_TEXT_HOME',1,'You can create a support ticket or view existing from its identifier tracking ticket.','chaine',0,'','2019-11-29 08:49:36'),(7203,'TICKET_PUBLIC_TEXT_HELP_MESSAGE',1,'Please accurately describe the problem. Provide the most information possible to allow us to correctly identify your request.','chaine',0,'','2019-11-29 08:49:36'),(7204,'TICKET_MESSAGE_MAIL_NEW',1,'TicketMessageMailNewText','chaine',0,'','2019-11-29 08:49:36'),(7220,'MRP_MO_ADDON',1,'mod_mo_standard','chaine',0,'Name of numbering rules of MO','2019-11-29 08:57:42'),(7221,'MRP_MO_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/mrps','chaine',0,NULL,'2019-11-29 08:57:42'),(7222,'MRP_MO_ADDON_PDF',1,'generic_mo_odt','chaine',0,'','2019-11-29 08:57:47'),(7254,'MAIN_INFO_OPENINGHOURS_MONDAY',1,'8-12 13-18','chaine',0,'','2019-12-19 11:14:21'),(7255,'MAIN_INFO_OPENINGHOURS_TUESDAY',1,'8-12 13-18','chaine',0,'','2019-12-19 11:14:21'),(7256,'MAIN_INFO_OPENINGHOURS_WEDNESDAY',1,'8-13','chaine',0,'','2019-12-19 11:14:21'),(7257,'MAIN_INFO_OPENINGHOURS_THURSDAY',1,'8-12 13-18','chaine',0,'','2019-12-19 11:14:21'),(7258,'MAIN_INFO_OPENINGHOURS_FRIDAY',1,'8-12 13-18','chaine',0,'','2019-12-19 11:14:21'),(7264,'MAIN_INFO_ACCOUNTANT_NAME',1,'Bob Bookkeeper','chaine',0,'','2019-12-19 11:14:54'),(7265,'MAIN_INFO_ACCOUNTANT_TOWN',1,'Berlin','chaine',0,'','2019-12-19 11:14:54'),(7266,'MAIN_INFO_ACCOUNTANT_STATE',1,'0','chaine',0,'','2019-12-19 11:14:54'),(7267,'MAIN_INFO_ACCOUNTANT_COUNTRY',1,'5','chaine',0,'','2019-12-19 11:14:54'),(7268,'MAIN_INFO_ACCOUNTANT_MAIL',1,'mybookkeeper@example.com','chaine',0,'','2019-12-19 11:14:54'),(7313,'MODULEBUILDER_ASCIIDOCTOR',1,'asciidoctor','chaine',0,'','2019-12-20 10:57:21'),(7314,'MODULEBUILDER_ASCIIDOCTORPDF',1,'asciidoctor-pdf','chaine',0,'','2019-12-20 10:57:21'),(7337,'EXTERNAL_RSS_TITLE_1',1,'Dolibarr.org News','chaine',0,'','2019-12-20 12:10:38'),(7338,'EXTERNAL_RSS_URLRSS_1',1,'https://www.dolibarr.org/rss','chaine',0,'','2019-12-20 12:10:38'),(7339,'EXPENSEREPORT_ADDON',1,'mod_expensereport_jade','chaine',0,'','2019-12-20 16:33:46'),(7378,'COMPANY_USE_SEARCH_TO_SELECT',1,'0','chaine',0,'','2019-12-21 15:54:22'),(7420,'CASHDESK_SERVICES',1,'0','chaine',0,'','2019-12-23 12:15:06'),(7421,'TAKEPOS_ROOT_CATEGORY_ID',1,'31','chaine',0,'','2019-12-23 12:15:06'),(7422,'TAKEPOSCONNECTOR',1,'0','chaine',0,'','2019-12-23 12:15:06'),(7423,'TAKEPOS_BAR_RESTAURANT',1,'0','chaine',0,'','2019-12-23 12:15:06'),(7424,'TAKEPOS_TICKET_VAT_GROUPPED',1,'0','chaine',0,'','2019-12-23 12:15:06'),(7425,'TAKEPOS_AUTO_PRINT_TICKETS',1,'0','int',0,'','2019-12-23 12:15:06'),(7426,'TAKEPOS_NUMPAD',1,'0','chaine',0,'','2019-12-23 12:15:06'),(7427,'TAKEPOS_NUM_TERMINALS',1,'1','chaine',0,'','2019-12-23 12:15:06'),(7428,'TAKEPOS_DIRECT_PAYMENT',1,'0','int',0,'','2019-12-23 12:15:06'),(7429,'TAKEPOS_CUSTOM_RECEIPT',1,'0','int',0,'','2019-12-23 12:15:06'),(7430,'TAKEPOS_EMAIL_TEMPLATE_INVOICE',1,'-1','chaine',0,'','2019-12-23 12:15:06'),(7452,'MEMBER_ENABLE_PUBLIC',1,'1','chaine',0,'','2020-01-01 10:31:46'),(7453,'MEMBER_NEWFORM_AMOUNT',1,'20','chaine',0,'','2020-01-01 10:31:46'),(7454,'MEMBER_NEWFORM_EDITAMOUNT',1,'0','chaine',0,'','2020-01-01 10:31:46'),(7455,'MEMBER_NEWFORM_PAYONLINE',1,'all','chaine',0,'','2020-01-01 10:31:46'),(7456,'MEMBER_NEWFORM_FORCETYPE',1,'1','chaine',0,'','2020-01-01 10:31:46'),(7470,'STRIPE_TEST_PUBLISHABLE_KEY',1,'pk_test_123456789','chaine',0,'','2020-01-01 11:43:44'),(7471,'STRIPE_TEST_SECRET_KEY',1,'sk_test_123456','chaine',0,'','2020-01-01 11:43:44'),(7472,'STRIPE_BANK_ACCOUNT_FOR_PAYMENTS',1,'4','chaine',0,'','2020-01-01 11:43:44'),(7473,'STRIPE_USER_ACCOUNT_FOR_ACTIONS',1,'1','chaine',0,'','2020-01-01 11:43:44'),(7489,'CAPTURESERVER_SECURITY_KEY',1,'securitykey123','chaine',0,'','2020-01-01 12:00:49'),(8136,'MAIN_AGENDA_ACTIONAUTO_EXPENSE_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8190,'ACCOUNTING_PRODUCT_MODE',1,'ACCOUNTANCY_SELL_EXPORT','chaine',0,'','2020-01-06 01:23:30'),(8191,'MAIN_ENABLE_DEFAULT_VALUES',1,'1','chaine',0,'','2020-01-06 16:09:52'),(8210,'CABINETMED_RHEUMATOLOGY_ON',1,'0','texte',0,'','2020-01-06 16:51:43'),(8213,'MAIN_SEARCHFORM_SOCIETE',1,'1','texte',0,'','2020-01-06 16:51:43'),(8214,'CABINETMED_BANK_PATIENT_REQUIRED',1,'0','texte',0,'','2020-01-06 16:51:43'),(8215,'DIAGNOSTIC_IS_NOT_MANDATORY',1,'1','texte',0,'','2020-01-06 16:51:43'),(8216,'USER_ADDON_PDF_ODT',1,'generic_user_odt','chaine',0,'','2020-01-07 13:45:19'),(8217,'USERGROUP_ADDON_PDF_ODT',1,'generic_usergroup_odt','chaine',0,'','2020-01-07 13:45:23'),(8230,'MAIN_MODULE_EMAILCOLLECTOR',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2020-01-12 20:13:55'),(8232,'MAIN_MODULE_SUPPLIERPROPOSAL',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2020-01-13 14:37:09'),(8233,'MAIN_MODULE_EXPEDITION',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2020-01-13 14:38:20'),(8252,'SYSTEMTOOLS_MYSQLDUMP',1,'/usr/bin/mysqldump','chaine',0,'','2020-01-15 15:42:41'),(8259,'ACCOUNTING_REEXPORT',1,'1','yesno',0,'','2020-01-17 13:42:56'),(8291,'PRODUIT_MULTIPRICES_LIMIT',1,'5','chaine',0,'','2020-01-17 14:21:46'),(8293,'PRODUIT_CUSTOMER_PRICES_BY_QTY',1,'0','chaine',0,'','2020-01-17 14:21:46'),(8303,'PRODUCT_PRICE_UNIQ',1,'0','chaine',0,'','2020-01-17 14:25:30'),(8304,'PRODUIT_MULTIPRICES',1,'0','chaine',0,'','2020-01-17 14:25:30'),(8305,'PRODUIT_CUSTOMER_PRICES',1,'1','chaine',0,'','2020-01-17 14:25:30'),(8306,'PRODUIT_SOUSPRODUITS',1,'0','chaine',0,'','2020-01-17 14:25:30'),(8307,'PRODUIT_DESC_IN_FORM',1,'0','chaine',0,'','2020-01-17 14:25:30'),(8308,'PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE',1,'0','chaine',0,'','2020-01-17 14:25:30'),(8309,'PRODUIT_USE_SEARCH_TO_SELECT',1,'1','chaine',0,'','2020-01-17 14:25:30'),(8310,'PRODUIT_FOURN_TEXTS',1,'0','chaine',0,'','2020-01-17 14:25:30'),(8313,'MAIN_MODULE_FCKEDITOR',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2020-01-18 17:13:27'),(8314,'FCKEDITOR_ENABLE_TICKET',1,'1','chaine',0,'','2020-01-18 19:39:54'),(8321,'FCKEDITOR_SKIN',1,'moono-lisa','chaine',0,'','2020-01-18 19:41:15'),(8322,'FCKEDITOR_TEST',1,'Test &lt; aaa<br />\r\n<br />\r\n<img alt=\"\" src=\"/dolibarr_11.0/htdocs/viewimage.php?modulepart=medias&amp;entity=1&amp;file=image/background_coder.jpg\" style=\"height:1280px; width:1920px\" />','chaine',0,'','2020-01-18 19:41:15'),(8486,'MAIN_MULTILANGS',1,'1','chaine',0,'','2020-01-21 09:40:00'),(8491,'MAIN_DISABLE_JAVASCRIPT',1,'0','chaine',0,'','2020-01-21 09:40:00'),(8492,'MAIN_BUTTON_HIDE_UNAUTHORIZED',1,'0','chaine',0,'','2020-01-21 09:40:00'),(8496,'MAIN_SHOW_LOGO',1,'1','chaine',0,'','2020-01-21 09:40:00'),(8498,'MAIN_HELPCENTER_DISABLELINK',0,'0','chaine',0,'','2020-01-21 09:40:00'),(8501,'MAIN_BUGTRACK_ENABLELINK',1,'0','chaine',0,'','2020-01-21 09:40:00'),(8554,'MAIN_INFO_SOCIETE_FACEBOOK_URL',1,'dolibarr','chaine',0,'','2020-06-12 17:24:42'),(8555,'MAIN_INFO_SOCIETE_TWITTER_URL',1,'dolibarr','chaine',0,'','2020-06-12 17:24:42'),(8556,'MAIN_INFO_SOCIETE_LINKEDIN_URL',1,'https://www.linkedin.com/company/9400559/admin/','chaine',0,'','2020-06-12 17:24:42'),(8557,'MAIN_INFO_SOCIETE_INSTAGRAM_URL',1,'dolibarr','chaine',0,'','2020-06-12 17:24:42'),(8558,'MAIN_INFO_SOCIETE_YOUTUBE_URL',1,'DolibarrERPCRM','chaine',0,'','2020-06-12 17:24:42'),(8559,'MAIN_INFO_SOCIETE_GITHUB_URL',1,'dolibarr','chaine',0,'','2020-06-12 17:24:42'),(8577,'PRODUCT_PRICE_BASE_TYPE',0,'HT','string',0,NULL,'2020-12-10 12:24:38'),(8612,'MAIN_UPLOAD_DOC',1,'50000','chaine',0,'','2020-12-10 12:26:31'),(8613,'MAIN_UMASK',1,'0664','chaine',0,'','2020-12-10 12:26:31'),(8614,'MAIN_ANTIVIRUS_PARAM',1,'--fdpass','chaine',0,'','2020-12-10 12:26:31'),(8619,'WEBSITE_EDITINLINE',1,'0','chaine',0,'','2020-12-10 12:27:05'),(8620,'WEBSITE_SUBCONTAINERSINLINE',1,'1','chaine',0,'','2020-12-10 12:27:17'),(8633,'MAIN_MODULE_RECEPTION',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2020-12-10 12:30:13'),(8634,'RECEPTION_ADDON_PDF',1,'squille','chaine',0,'Nom du gestionnaire de generation des bons receptions en PDF','2020-12-10 12:30:13'),(8635,'RECEPTION_ADDON_NUMBER',1,'mod_reception_beryl','chaine',0,'Name for numbering manager for receptions','2020-12-10 12:30:13'),(8636,'RECEPTION_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/receptions','chaine',0,NULL,'2020-12-10 12:30:13'),(8637,'MAIN_SUBMODULE_RECEPTION',1,'1','chaine',0,'Enable receptions','2020-12-10 12:30:13'),(8638,'MAIN_MODULE_PAYMENTBYBANKTRANSFER',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2020-12-10 12:30:17'),(8640,'MAIN_MODULE_MARGIN_TABS_0',1,'product:+margin:Margins:margins:$user->rights->margins->liretous:/margin/tabs/productMargins.php?id=__ID__','chaine',0,NULL,'2020-12-10 12:30:20'),(8641,'MAIN_MODULE_MARGIN_TABS_1',1,'thirdparty:+margin:Margins:margins:empty($user->socid) && $user->rights->margins->liretous && ($object->client > 0):/margin/tabs/thirdpartyMargins.php?socid=__ID__','chaine',0,NULL,'2020-12-10 12:30:20'),(8643,'MAIN_MODULE_BLOCKEDLOG',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2020-12-10 12:31:17'),(8644,'MAIN_MODULE_INCOTERM',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2020-12-10 12:31:36'),(8645,'INCOTERM_ACTIVATE',1,'','chaine',0,'Description de INCOTERM_ACTIVATE','2020-12-10 12:31:36'),(8649,'MAIN_MODULE_ACCOUNTING',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-04-15 10:22:57'),(8650,'MAIN_MODULE_AGENDA',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-04-15 10:22:58'),(8651,'MAIN_MODULE_BOM',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-04-15 10:22:58'),(8652,'MAIN_MODULE_BANQUE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-04-15 10:22:58'),(8653,'MAIN_MODULE_BARCODE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-04-15 10:22:58'),(8654,'MAIN_MODULE_CRON',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-04-15 10:22:58'),(8655,'MAIN_MODULE_COMMANDE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-04-15 10:22:58'),(8656,'MAIN_MODULE_DON',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-04-15 10:22:58'),(8657,'MAIN_MODULE_ECM',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-04-15 10:22:59'),(8658,'MAIN_MODULE_EXPENSEREPORT',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-04-15 10:22:59'),(8659,'MAIN_MODULE_FACTURE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-04-15 10:22:59'),(8660,'MAIN_MODULE_FOURNISSEUR',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-04-15 10:22:59'),(8661,'MAIN_MODULE_HOLIDAY',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-04-15 10:23:00'),(8662,'MAIN_MODULE_MARGIN',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-04-15 10:23:00'),(8665,'MAIN_MODULE_MRP',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-04-15 10:23:00'),(8666,'MAIN_MODULE_MRP_TRIGGERS',1,'0','chaine',0,NULL,'2021-04-15 10:23:00'),(8667,'MAIN_MODULE_MRP_LOGIN',1,'0','chaine',0,NULL,'2021-04-15 10:23:00'),(8668,'MAIN_MODULE_MRP_SUBSTITUTIONS',1,'0','chaine',0,NULL,'2021-04-15 10:23:00'),(8669,'MAIN_MODULE_MRP_MENUS',1,'0','chaine',0,NULL,'2021-04-15 10:23:00'),(8670,'MAIN_MODULE_MRP_TPL',1,'0','chaine',0,NULL,'2021-04-15 10:23:00'),(8671,'MAIN_MODULE_MRP_BARCODE',1,'0','chaine',0,NULL,'2021-04-15 10:23:00'),(8672,'MAIN_MODULE_MRP_MODELS',1,'0','chaine',0,NULL,'2021-04-15 10:23:00'),(8673,'MAIN_MODULE_MRP_THEME',1,'0','chaine',0,NULL,'2021-04-15 10:23:00'),(8674,'MAIN_MODULE_MRP_MODULEFOREXTERNAL',1,'0','chaine',0,NULL,'2021-04-15 10:23:00'),(8675,'MAIN_MODULE_OPENSURVEY',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-04-15 10:23:00'),(8676,'MAIN_MODULE_PRINTING',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-04-15 10:23:00'),(8677,'MAIN_MODULE_RECRUITMENT',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-04-15 10:23:00'),(8678,'MAIN_MODULE_RECRUITMENT_TRIGGERS',1,'0','chaine',0,NULL,'2021-04-15 10:23:00'),(8679,'MAIN_MODULE_RECRUITMENT_LOGIN',1,'0','chaine',0,NULL,'2021-04-15 10:23:00'),(8680,'MAIN_MODULE_RECRUITMENT_SUBSTITUTIONS',1,'0','chaine',0,NULL,'2021-04-15 10:23:00'),(8681,'MAIN_MODULE_RECRUITMENT_MENUS',1,'0','chaine',0,NULL,'2021-04-15 10:23:00'),(8682,'MAIN_MODULE_RECRUITMENT_TPL',1,'0','chaine',0,NULL,'2021-04-15 10:23:00'),(8683,'MAIN_MODULE_RECRUITMENT_BARCODE',1,'0','chaine',0,NULL,'2021-04-15 10:23:00'),(8684,'MAIN_MODULE_RECRUITMENT_MODELS',1,'1','chaine',0,NULL,'2021-04-15 10:23:00'),(8685,'MAIN_MODULE_RECRUITMENT_THEME',1,'0','chaine',0,NULL,'2021-04-15 10:23:00'),(8686,'MAIN_MODULE_RECRUITMENT_MODULEFOREXTERNAL',1,'0','chaine',0,NULL,'2021-04-15 10:23:00'),(8687,'MAIN_MODULE_RESOURCE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-04-15 10:23:00'),(8688,'MAIN_MODULE_SALARIES',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-04-15 10:23:00'),(8689,'MAIN_MODULE_SERVICE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-04-15 10:23:00'),(8690,'MAIN_MODULE_SOCIETE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-04-15 10:23:01'),(8691,'MAIN_MODULE_STRIPE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-04-15 10:23:01'),(8692,'MAIN_MODULE_TICKET',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-04-15 10:23:01'),(8693,'MAIN_MODULE_TICKET_TABS_0',1,'thirdparty:+ticket:Tickets:@ticket:$user->rights->ticket->read:/ticket/list.php?socid=__ID__','chaine',0,NULL,'2021-04-15 10:23:01'),(8694,'MAIN_MODULE_TICKET_TABS_1',1,'project:+ticket:Tickets:@ticket:$user->rights->ticket->read:/ticket/list.php?projectid=__ID__','chaine',0,NULL,'2021-04-15 10:23:01'),(8695,'MAIN_MODULE_TICKET_TRIGGERS',1,'1','chaine',0,NULL,'2021-04-15 10:23:01'),(8696,'TAKEPOS_PRINT_METHOD',1,'browser','chaine',0,'','2021-04-15 10:23:01'),(8697,'MAIN_MODULE_TAKEPOS',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-04-15 10:23:01'),(8698,'MAIN_MODULE_TAKEPOS_TRIGGERS',1,'0','chaine',0,NULL,'2021-04-15 10:23:01'),(8699,'MAIN_MODULE_TAKEPOS_LOGIN',1,'0','chaine',0,NULL,'2021-04-15 10:23:01'),(8700,'MAIN_MODULE_TAKEPOS_SUBSTITUTIONS',1,'1','chaine',0,NULL,'2021-04-15 10:23:01'),(8701,'MAIN_MODULE_TAKEPOS_MENUS',1,'0','chaine',0,NULL,'2021-04-15 10:23:01'),(8702,'MAIN_MODULE_TAKEPOS_THEME',1,'0','chaine',0,NULL,'2021-04-15 10:23:01'),(8703,'MAIN_MODULE_TAKEPOS_TPL',1,'0','chaine',0,NULL,'2021-04-15 10:23:01'),(8704,'MAIN_MODULE_TAKEPOS_BARCODE',1,'0','chaine',0,NULL,'2021-04-15 10:23:01'),(8705,'MAIN_MODULE_TAKEPOS_MODELS',1,'0','chaine',0,NULL,'2021-04-15 10:23:01'),(8706,'MAIN_MODULE_USER',0,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-04-15 10:23:01'),(8707,'MAIN_MODULE_VARIANTS',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-04-15 10:23:01'),(8708,'MAIN_MODULE_WEBSITE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-04-15 10:23:02'),(8709,'MAIN_VERSION_LAST_UPGRADE',0,'14.0.0-alpha','chaine',0,'Dolibarr version for last upgrade','2021-04-15 10:25:08'),(8711,'MAIN_FIRST_PING_OK_DATE',1,'20210415102513','chaine',0,'','2021-04-15 10:25:13'),(8712,'MAIN_FIRST_PING_OK_ID',1,'9646d6c55a34bca208868c98dac4678b','chaine',0,'','2021-04-15 10:25:13'),(8714,'MAIN_MODULE_SYSLOG',0,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2021-04-15 10:34:00'),(8715,'SYSLOG_LEVEL',0,'5','chaine',0,'','2021-04-15 10:34:05'),(8716,'MAIN_SECURITY_HASH_ALGO',1,'password_hash','chaine',1,'','2021-04-15 10:38:33'),(8717,'MAIN_INFO_SOCIETE_COUNTRY',1,'117:IN:India','chaine',0,'','2021-04-15 10:46:30'),(8718,'MAIN_INFO_SOCIETE_NOM',1,'MyBigCompany','chaine',0,'','2021-04-15 10:46:30'),(8719,'MAIN_INFO_SOCIETE_ADDRESS',1,'21 Jump street.','chaine',0,'','2021-04-15 10:46:30'),(8720,'MAIN_INFO_SOCIETE_TOWN',1,'MyTown','chaine',0,'','2021-04-15 10:46:30'),(8721,'MAIN_INFO_SOCIETE_ZIP',1,'75500','chaine',0,'','2021-04-15 10:46:30'),(8722,'MAIN_MONNAIE',1,'EUR','chaine',0,'','2021-04-15 10:46:30'),(8723,'MAIN_INFO_SOCIETE_TEL',1,'09123123','chaine',0,'','2021-04-15 10:46:30'),(8724,'MAIN_INFO_SOCIETE_FAX',1,'09123124','chaine',0,'','2021-04-15 10:46:30'),(8725,'MAIN_INFO_SOCIETE_MAIL',1,'myemail@mybigcompany.com','chaine',0,'','2021-04-15 10:46:30'),(8726,'MAIN_INFO_SOCIETE_WEB',1,'https://www.dolibarr.org','chaine',0,'','2021-04-15 10:46:30'),(8727,'MAIN_INFO_SOCIETE_NOTE',1,'This is note about my company','chaine',0,'','2021-04-15 10:46:30'),(8728,'MAIN_INFO_SOCIETE_LOGO_SQUARRED',1,'mybigcompany_squarred.png','chaine',0,'','2021-04-15 10:46:30'),(8729,'MAIN_INFO_SOCIETE_LOGO_SQUARRED_SMALL',1,'mybigcompany_squarred_small.png','chaine',0,'','2021-04-15 10:46:30'),(8730,'MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI',1,'mybigcompany_squarred_mini.png','chaine',0,'','2021-04-15 10:46:30'),(8731,'MAIN_INFO_SOCIETE_MANAGERS',1,'Zack Zeceo','chaine',0,'','2021-04-15 10:46:30'),(8732,'MAIN_INFO_GDPR',1,'Zack Zeceo','chaine',0,'','2021-04-15 10:46:30'),(8733,'MAIN_INFO_CAPITAL',1,'10000','chaine',0,'','2021-04-15 10:46:30'),(8734,'MAIN_INFO_SOCIETE_FORME_JURIDIQUE',1,'0','chaine',0,'','2021-04-15 10:46:30'),(8735,'MAIN_INFO_SIREN',1,'123456','chaine',0,'','2021-04-15 10:46:30'),(8736,'MAIN_INFO_SIRET',1,'ABC-DEF','chaine',0,'','2021-04-15 10:46:30'),(8737,'MAIN_INFO_APE',1,'15E-45-8D','chaine',0,'','2021-04-15 10:46:30'),(8738,'MAIN_INFO_TVAINTRA',1,'FR12345678','chaine',0,'','2021-04-15 10:46:30'),(8739,'MAIN_INFO_SOCIETE_OBJECT',1,'A company demo to show how Dolibarr ERP CRM is wonderfull','chaine',0,'','2021-04-15 10:46:30'),(8740,'SOCIETE_FISCAL_MONTH_START',1,'4','chaine',0,'','2021-04-15 10:46:30'),(8741,'FACTURE_TVAOPTION',1,'1','chaine',0,'','2021-04-15 10:46:30'),(8742,'FACTURE_LOCAL_TAX1_OPTION',1,'localtax1on','chaine',0,'','2021-04-15 10:46:30'),(8743,'FACTURE_LOCAL_TAX2_OPTION',1,'localtax2on','chaine',0,'','2021-04-15 10:46:30'),(8744,'MAIN_INFO_VALUE_LOCALTAX1',1,'0','chaine',0,'','2021-04-15 10:46:30'),(8745,'MAIN_INFO_LOCALTAX_CALC1',1,'0','chaine',0,'','2021-04-15 10:46:30'),(8746,'MAIN_INFO_VALUE_LOCALTAX2',1,'0','chaine',0,'','2021-04-15 10:46:30'),(8747,'MAIN_INFO_LOCALTAX_CALC2',1,'0','chaine',0,'','2021-04-15 10:46:30'),(8759,'MAIN_LOGIN_BACKGROUND',1,'background_dolibarr.jpg','chaine',0,'','2021-04-15 10:54:37'),(8760,'MAIN_LANG_DEFAULT',1,'auto','chaine',0,'','2021-04-15 10:56:30'),(8761,'MAIN_IHM_PARAMS_REV',1,'13','chaine',0,'','2021-04-15 10:56:30'),(8762,'MAIN_THEME',1,'eldy','chaine',0,'','2021-04-15 10:56:30'),(8763,'THEME_ELDY_USE_HOVER',1,'237,244,251','chaine',0,'','2021-04-15 10:56:30'),(8764,'MAIN_SIZE_LISTE_LIMIT',1,'25','chaine',0,'','2021-04-15 10:56:30'),(8765,'MAIN_SIZE_SHORTLIST_LIMIT',1,'3','chaine',0,'','2021-04-15 10:56:30'),(8766,'MAIN_START_WEEK',1,'1','chaine',0,'','2021-04-15 10:56:30'),(8767,'MAIN_DEFAULT_WORKING_DAYS',1,'1-5','chaine',0,'','2021-04-15 10:56:30'),(8768,'MAIN_DEFAULT_WORKING_HOURS',1,'9-18','chaine',0,'','2021-04-15 10:56:30'),(8769,'MAIN_FIRSTNAME_NAME_POSITION',1,'0','chaine',0,'','2021-04-15 10:56:30'),(8770,'MAIN_HOME',1,'__(NoteSomeFeaturesAreDisabled)__<br />\r\n__(SomeTranslationAreUncomplete)__','chaine',0,'','2021-04-15 10:56:30'),(8771,'MAIN_FEATURES_LEVEL',0,'0','chaine',1,'Level of features to show (0=stable only, 1=stable+experimental, 2=stable+experimental+development','2021-04-15 11:46:30'),(8775,'MAIN_AGENDA_ACTIONAUTO_COMPANY_SENTBYMAIL',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8776,'MAIN_AGENDA_ACTIONAUTO_COMPANY_CREATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8777,'MAIN_AGENDA_ACTIONAUTO_COMPANY_DELETE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8778,'MAIN_AGENDA_ACTIONAUTO_PROPAL_CLOSE_REFUSED',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8779,'MAIN_AGENDA_ACTIONAUTO_PROPAL_CLASSIFY_BILLED',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8780,'MAIN_AGENDA_ACTIONAUTO_PROPAL_DELETE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8781,'MAIN_AGENDA_ACTIONAUTO_PROPAL_VALIDATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8782,'MAIN_AGENDA_ACTIONAUTO_PROPAL_CLOSE_SIGNED',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8783,'MAIN_AGENDA_ACTIONAUTO_PROPAL_SENTBYMAIL',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8784,'MAIN_AGENDA_ACTIONAUTO_ORDER_VALIDATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8785,'MAIN_AGENDA_ACTIONAUTO_ORDER_DELETE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8786,'MAIN_AGENDA_ACTIONAUTO_ORDER_SENTBYMAIL',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8787,'MAIN_AGENDA_ACTIONAUTO_ORDER_CANCEL',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8788,'MAIN_AGENDA_ACTIONAUTO_ORDER_CLASSIFY_BILLED',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8789,'MAIN_AGENDA_ACTIONAUTO_ORDER_CLOSE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8790,'MAIN_AGENDA_ACTIONAUTO_BILL_VALIDATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8791,'MAIN_AGENDA_ACTIONAUTO_BILL_PAYED',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8792,'MAIN_AGENDA_ACTIONAUTO_BILL_CANCEL',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8793,'MAIN_AGENDA_ACTIONAUTO_BILL_DELETE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8794,'MAIN_AGENDA_ACTIONAUTO_BILL_SENTBYMAIL',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8795,'MAIN_AGENDA_ACTIONAUTO_PROPOSAL_SUPPLIER_DELETE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8796,'MAIN_AGENDA_ACTIONAUTO_PROPOSAL_SUPPLIER_VALIDATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8797,'MAIN_AGENDA_ACTIONAUTO_PROPOSAL_SUPPLIER_SENTBYMAIL',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8798,'MAIN_AGENDA_ACTIONAUTO_PROPOSAL_SUPPLIER_CLOSE_SIGNED',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8799,'MAIN_AGENDA_ACTIONAUTO_PROPOSAL_SUPPLIER_CLOSE_REFUSED',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8800,'MAIN_AGENDA_ACTIONAUTO_BILL_UNVALIDATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8801,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_CREATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8802,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_VALIDATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8803,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_APPROVE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8804,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_RECEIVE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8805,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_SUBMIT',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8806,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_REFUSE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8807,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_CLASSIFY_BILLED',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8808,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_SENTBYMAIL',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8809,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_DELETE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8810,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_VALIDATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8811,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_UNVALIDATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8812,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_PAYED',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8813,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_SENTBYMAIL',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8814,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_CANCELED',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8815,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_DELETE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8816,'MAIN_AGENDA_ACTIONAUTO_CONTRACT_DELETE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8817,'MAIN_AGENDA_ACTIONAUTO_CONTRACT_SENTBYMAIL',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8818,'MAIN_AGENDA_ACTIONAUTO_CONTRACT_VALIDATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8819,'MAIN_AGENDA_ACTIONAUTO_FICHINTER_SENTBYMAIL',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8820,'MAIN_AGENDA_ACTIONAUTO_FICHINTER_VALIDATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8821,'MAIN_AGENDA_ACTIONAUTO_FICHINTER_REOPEN',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8822,'MAIN_AGENDA_ACTIONAUTO_SHIPPING_VALIDATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8823,'MAIN_AGENDA_ACTIONAUTO_SHIPPING_SENTBYMAIL',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8824,'MAIN_AGENDA_ACTIONAUTO_MEMBER_VALIDATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8825,'MAIN_AGENDA_ACTIONAUTO_MEMBER_SENTBYMAIL',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8826,'MAIN_AGENDA_ACTIONAUTO_MEMBER_SUBSCRIPTION_CREATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8827,'MAIN_AGENDA_ACTIONAUTO_MEMBER_RESILIATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8828,'MAIN_AGENDA_ACTIONAUTO_MEMBER_MODIFY',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8829,'MAIN_AGENDA_ACTIONAUTO_MEMBER_SUBSCRIPTION_MODIFY',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8830,'MAIN_AGENDA_ACTIONAUTO_MEMBER_SUBSCRIPTION_DELETE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8831,'MAIN_AGENDA_ACTIONAUTO_MEMBER_DELETE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8832,'MAIN_AGENDA_ACTIONAUTO_PRODUCT_DELETE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8833,'MAIN_AGENDA_ACTIONAUTO_PRODUCT_CREATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8834,'MAIN_AGENDA_ACTIONAUTO_PRODUCT_MODIFY',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8835,'MAIN_AGENDA_ACTIONAUTO_TASK_CREATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8836,'MAIN_AGENDA_ACTIONAUTO_FICHINTER_DELETE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8837,'MAIN_AGENDA_ACTIONAUTO_TASK_MODIFY',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8838,'MAIN_AGENDA_ACTIONAUTO_TASK_DELETE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8839,'MAIN_AGENDA_ACTIONAUTO_CONTACT_CREATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8840,'MAIN_AGENDA_ACTIONAUTO_CONTACT_SENTBYMAIL',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8841,'MAIN_AGENDA_ACTIONAUTO_CONTACT_DELETE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8842,'MAIN_AGENDA_ACTIONAUTO_PROJECT_CREATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8843,'MAIN_AGENDA_ACTIONAUTO_PROJECT_MODIFY',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8844,'MAIN_AGENDA_ACTIONAUTO_PROJECT_DELETE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8845,'MAIN_AGENDA_ACTIONAUTO_TICKET_CREATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8846,'MAIN_AGENDA_ACTIONAUTO_TICKET_MODIFY',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8847,'MAIN_AGENDA_ACTIONAUTO_TICKET_ASSIGNED',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8848,'MAIN_AGENDA_ACTIONAUTO_TICKET_CLOSE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8849,'MAIN_AGENDA_ACTIONAUTO_TICKET_SENTBYMAIL',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8850,'MAIN_AGENDA_ACTIONAUTO_TICKET_DELETE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8851,'MAIN_AGENDA_ACTIONAUTO_EXPENSE_REPORT_CREATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8852,'MAIN_AGENDA_ACTIONAUTO_EXPENSE_REPORT_VALIDATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8853,'MAIN_AGENDA_ACTIONAUTO_EXPENSE_REPORT_APPROVE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8854,'MAIN_AGENDA_ACTIONAUTO_EXPENSE_REPORT_DELETE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8855,'MAIN_AGENDA_ACTIONAUTO_EXPENSE_REPORT_PAID',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8856,'MAIN_AGENDA_ACTIONAUTO_HOLIDAY_CREATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8857,'MAIN_AGENDA_ACTIONAUTO_HOLIDAY_VALIDATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8858,'MAIN_AGENDA_ACTIONAUTO_HOLIDAY_APPROVE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8859,'MAIN_AGENDA_ACTIONAUTO_USER_SENTBYMAIL',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8860,'MAIN_AGENDA_ACTIONAUTO_BOM_VALIDATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8861,'MAIN_AGENDA_ACTIONAUTO_BOM_UNVALIDATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8862,'MAIN_AGENDA_ACTIONAUTO_BOM_CLOSE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8863,'MAIN_AGENDA_ACTIONAUTO_BOM_REOPEN',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8864,'MAIN_AGENDA_ACTIONAUTO_BOM_DELETE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8865,'MAIN_AGENDA_ACTIONAUTO_MRP_MO_VALIDATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8866,'MAIN_AGENDA_ACTIONAUTO_MRP_MO_PRODUCED',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8867,'MAIN_AGENDA_ACTIONAUTO_MRP_MO_DELETE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8868,'MAIN_AGENDA_ACTIONAUTO_MRP_MO_CANCEL',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8869,'MAIN_AGENDA_ACTIONAUTO_RECRUITMENTJOBPOSITION_CREATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8870,'MAIN_AGENDA_ACTIONAUTO_RECRUITMENTJOBPOSITION_MODIFY',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8871,'MAIN_AGENDA_ACTIONAUTO_RECRUITMENTJOBPOSITION_SENTBYMAIL',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8872,'MAIN_AGENDA_ACTIONAUTO_RECRUITMENTJOBPOSITION_DELETE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8873,'MAIN_AGENDA_ACTIONAUTO_RECRUITMENTCANDIDATURE_CREATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8874,'MAIN_AGENDA_ACTIONAUTO_RECRUITMENTCANDIDATURE_MODIFY',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8875,'MAIN_AGENDA_ACTIONAUTO_RECRUITMENTCANDIDATURE_SENTBYMAIL',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8876,'MAIN_AGENDA_ACTIONAUTO_RECRUITMENTCANDIDATURE_DELETE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8877,'AGENDA_REMINDER_BROWSER',1,'1','chaine',0,'','2021-04-15 13:32:29');
+INSERT INTO `llx_const` VALUES (8,'MAIN_UPLOAD_DOC',0,'2048','chaine',0,'Max size for file upload (0 means no upload allowed)','2012-07-08 11:17:57'),(9,'MAIN_SEARCHFORM_SOCIETE',0,'1','yesno',0,'Show form for quick company search','2012-07-08 11:17:57'),(10,'MAIN_SEARCHFORM_CONTACT',0,'1','yesno',0,'Show form for quick contact search','2012-07-08 11:17:57'),(11,'MAIN_SEARCHFORM_PRODUITSERVICE',0,'1','yesno',0,'Show form for quick product search','2012-07-08 11:17:58'),(12,'MAIN_SEARCHFORM_ADHERENT',0,'1','yesno',0,'Show form for quick member search','2012-07-08 11:17:58'),(16,'MAIN_SIZE_LISTE_LIMIT',0,'25','chaine',0,'Longueur maximum des listes','2012-07-08 11:17:58'),(29,'MAIN_DELAY_NOT_ACTIVATED_SERVICES',1,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services à activer','2012-07-08 11:17:58'),(33,'SOCIETE_NOLIST_COURRIER',0,'1','yesno',0,'Liste les fichiers du repertoire courrier','2012-07-08 11:17:58'),(36,'ADHERENT_MAIL_REQUIRED',1,'1','yesno',0,'EMail required to create a new member','2012-07-08 11:17:58'),(37,'ADHERENT_MAIL_FROM',1,'adherents@domain.com','chaine',0,'Sender EMail for automatic emails','2012-07-08 11:17:58'),(38,'ADHERENT_MAIL_RESIL',1,'Your subscription has been resiliated.\r\nWe hope to see you soon again','html',0,'Mail resiliation','2018-11-23 11:56:07'),(39,'ADHERENT_MAIL_VALID',1,'Your subscription has been validated.\r\nThis is a remind of your personal information :\r\n\r\n%INFOS%\r\n\r\n','html',0,'Mail de validation','2018-11-23 11:56:07'),(40,'ADHERENT_MAIL_COTIS',1,'Hello %PRENOM%,\r\nThanks for your subscription.\r\nThis email confirms that your subscription has been received and processed.\r\n\r\n','html',0,'Mail de validation de cotisation','2018-11-23 11:56:07'),(41,'ADHERENT_MAIL_VALID_SUBJECT',1,'Your subscription has been validated','chaine',0,'Sujet du mail de validation','2012-07-08 11:17:59'),(42,'ADHERENT_MAIL_RESIL_SUBJECT',1,'Resiliating your subscription','chaine',0,'Sujet du mail de resiliation','2012-07-08 11:17:59'),(43,'ADHERENT_MAIL_COTIS_SUBJECT',1,'Receipt of your subscription','chaine',0,'Sujet du mail de validation de cotisation','2012-07-08 11:17:59'),(44,'MAILING_EMAIL_FROM',1,'dolibarr@domain.com','chaine',0,'EMail emmetteur pour les envois d emailings','2012-07-08 11:17:59'),(45,'ADHERENT_USE_MAILMAN',1,'0','yesno',0,'Utilisation de Mailman','2012-07-08 11:17:59'),(46,'ADHERENT_MAILMAN_UNSUB_URL',1,'http://lists.domain.com/cgi-bin/mailman/admin/%LISTE%/members?adminpw=%MAILMAN_ADMINPW%&user=%EMAIL%','chaine',0,'Url de desinscription aux listes mailman','2012-07-08 11:17:59'),(47,'ADHERENT_MAILMAN_URL',1,'http://lists.domain.com/cgi-bin/mailman/admin/%LISTE%/members?adminpw=%MAILMAN_ADMINPW%&send_welcome_msg_to_this_batch=1&subscribees=%EMAIL%','chaine',0,'Url pour les inscriptions mailman','2012-07-08 11:17:59'),(48,'ADHERENT_MAILMAN_LISTS',1,'test-test,test-test2','chaine',0,'Listes auxquelles inscrire les nouveaux adherents','2012-07-08 11:17:59'),(49,'ADHERENT_MAILMAN_ADMINPW',1,'','chaine',0,'Mot de passe Admin des liste mailman','2012-07-08 11:17:59'),(50,'ADHERENT_MAILMAN_SERVER',1,'lists.domain.com','chaine',0,'Serveur hebergeant les interfaces d Admin des listes mailman','2012-07-08 11:17:59'),(51,'ADHERENT_MAILMAN_LISTS_COTISANT',1,'','chaine',0,'Liste(s) auxquelles les nouveaux cotisants sont inscris automatiquement','2012-07-08 11:17:59'),(52,'ADHERENT_USE_SPIP',1,'0','yesno',0,'Utilisation de SPIP ?','2012-07-08 11:17:59'),(53,'ADHERENT_USE_SPIP_AUTO',1,'0','yesno',0,'Utilisation de SPIP automatiquement','2012-07-08 11:17:59'),(54,'ADHERENT_SPIP_USER',1,'user','chaine',0,'user spip','2012-07-08 11:17:59'),(55,'ADHERENT_SPIP_PASS',1,'pass','chaine',0,'Pass de connection','2012-07-08 11:17:59'),(56,'ADHERENT_SPIP_SERVEUR',1,'localhost','chaine',0,'serveur spip','2012-07-08 11:17:59'),(57,'ADHERENT_SPIP_DB',1,'spip','chaine',0,'db spip','2012-07-08 11:17:59'),(58,'ADHERENT_CARD_HEADER_TEXT',1,'%ANNEE%','chaine',0,'Texte imprime sur le haut de la carte adherent','2012-07-08 11:17:59'),(59,'ADHERENT_CARD_FOOTER_TEXT',1,'Association AZERTY','chaine',0,'Texte imprime sur le bas de la carte adherent','2012-07-08 11:17:59'),(61,'FCKEDITOR_ENABLE_USER',1,'1','yesno',0,'Activation fckeditor sur notes utilisateurs','2012-07-08 11:17:59'),(62,'FCKEDITOR_ENABLE_SOCIETE',1,'1','yesno',0,'Activation fckeditor sur notes societe','2012-07-08 11:17:59'),(63,'FCKEDITOR_ENABLE_PRODUCTDESC',1,'1','yesno',0,'Activation fckeditor sur notes produits','2012-07-08 11:17:59'),(64,'FCKEDITOR_ENABLE_MEMBER',1,'1','yesno',0,'Activation fckeditor sur notes adherent','2012-07-08 11:17:59'),(65,'FCKEDITOR_ENABLE_MAILING',1,'1','yesno',0,'Activation fckeditor sur emailing','2012-07-08 11:17:59'),(67,'DON_ADDON_MODEL',1,'html_cerfafr','chaine',0,'','2012-07-08 11:18:00'),(68,'PROPALE_ADDON',1,'mod_propale_marbre','chaine',0,'','2012-07-08 11:18:00'),(69,'PROPALE_ADDON_PDF',1,'azur','chaine',0,'','2012-07-08 11:18:00'),(70,'COMMANDE_ADDON',1,'mod_commande_marbre','chaine',0,'','2012-07-08 11:18:00'),(71,'COMMANDE_ADDON_PDF',1,'einstein','chaine',0,'','2012-07-08 11:18:00'),(72,'COMMANDE_SUPPLIER_ADDON',1,'mod_commande_fournisseur_muguet','chaine',0,'','2012-07-08 11:18:00'),(73,'COMMANDE_SUPPLIER_ADDON_PDF',1,'muscadet','chaine',0,'','2012-07-08 11:18:00'),(74,'EXPEDITION_ADDON',1,'enlevement','chaine',0,'','2012-07-08 11:18:00'),(76,'FICHEINTER_ADDON',1,'pacific','chaine',0,'','2012-07-08 11:18:00'),(77,'FICHEINTER_ADDON_PDF',1,'soleil','chaine',0,'','2012-07-08 11:18:00'),(79,'FACTURE_ADDON_PDF',1,'crabe','chaine',0,'','2012-07-08 11:18:00'),(80,'PROPALE_VALIDITY_DURATION',1,'15','chaine',0,'Durée de validitée des propales','2012-07-08 11:18:00'),(230,'COMPANY_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/thirdparties','chaine',0,NULL,'2012-07-08 11:26:20'),(238,'LIVRAISON_ADDON_PDF',1,'typhon','chaine',0,'Nom du gestionnaire de generation des commandes en PDF','2012-07-08 11:26:27'),(239,'DELIVERY_ADDON_NUMBER',1,'mod_delivery_jade','chaine',0,'Nom du gestionnaire de numerotation des bons de livraison','2020-12-10 12:24:40'),(245,'FACTURE_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/invoices','chaine',0,NULL,'2012-07-08 11:28:53'),(249,'DON_FORM',1,'html_cerfafr','chaine',0,'Nom du gestionnaire de formulaire de dons','2017-09-06 16:12:22'),(254,'ADHERENT_BANK_ACCOUNT',1,'','chaine',0,'ID du Compte banquaire utilise','2012-07-08 11:29:05'),(255,'ADHERENT_BANK_CATEGORIE',1,'','chaine',0,'ID de la categorie banquaire des cotisations','2012-07-08 11:29:05'),(256,'ADHERENT_ETIQUETTE_TYPE',1,'L7163','chaine',0,'Type d etiquette (pour impression de planche d etiquette)','2012-07-08 11:29:05'),(269,'PROJECT_ADDON_PDF',1,'baleine','chaine',0,'Nom du gestionnaire de generation des projets en PDF','2012-07-08 11:29:33'),(270,'PROJECT_ADDON',1,'mod_project_simple','chaine',0,'Nom du gestionnaire de numerotation des projets','2012-07-08 11:29:33'),(369,'EXPEDITION_ADDON_PDF',1,'merou','chaine',0,'','2012-07-08 22:58:07'),(377,'FACTURE_ADDON',1,'mod_facture_terre','chaine',0,'','2012-07-08 23:08:12'),(380,'ADHERENT_CARD_TEXT',1,'%TYPE% n° %ID%\r\n%PRENOM% %NOM%\r\n<%EMAIL%>\r\n%ADRESSE%\r\n%CP% %VILLE%\r\n%PAYS%','',0,'Texte imprime sur la carte adherent','2012-07-08 23:14:46'),(381,'ADHERENT_CARD_TEXT_RIGHT',1,'aaa','',0,'','2012-07-08 23:14:55'),(386,'STOCK_CALCULATE_ON_SHIPMENT',1,'1','chaine',0,'','2012-07-08 23:23:21'),(387,'STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER',1,'1','chaine',0,'','2012-07-08 23:23:26'),(392,'MAIN_AGENDA_XCAL_EXPORTKEY',1,'dolibarr','chaine',0,'','2012-07-08 23:27:50'),(393,'MAIN_AGENDA_EXPORT_PAST_DELAY',1,'100','chaine',0,'','2012-07-08 23:27:50'),(610,'CASHDESK_ID_THIRDPARTY',1,'7','chaine',0,'','2012-07-11 17:08:18'),(611,'CASHDESK_ID_BANKACCOUNT_CASH',1,'3','chaine',0,'','2012-07-11 17:08:18'),(612,'CASHDESK_ID_BANKACCOUNT_CHEQUE',1,'1','chaine',0,'','2012-07-11 17:08:18'),(613,'CASHDESK_ID_BANKACCOUNT_CB',1,'1','chaine',0,'','2012-07-11 17:08:18'),(614,'CASHDESK_ID_WAREHOUSE',1,'2','chaine',0,'','2012-07-11 17:08:18'),(660,'LDAP_USER_DN',1,'ou=users,dc=my-domain,dc=com','chaine',0,NULL,'2012-07-18 10:25:27'),(661,'LDAP_GROUP_DN',1,'ou=groups,dc=my-domain,dc=com','chaine',0,NULL,'2012-07-18 10:25:27'),(662,'LDAP_FILTER_CONNECTION',1,'&(objectClass=user)(objectCategory=person)','chaine',0,NULL,'2012-07-18 10:25:27'),(663,'LDAP_FIELD_LOGIN',1,'uid','chaine',0,NULL,'2012-07-18 10:25:27'),(664,'LDAP_FIELD_FULLNAME',1,'cn','chaine',0,NULL,'2012-07-18 10:25:27'),(665,'LDAP_FIELD_NAME',1,'sn','chaine',0,NULL,'2012-07-18 10:25:27'),(666,'LDAP_FIELD_FIRSTNAME',1,'givenname','chaine',0,NULL,'2012-07-18 10:25:27'),(667,'LDAP_FIELD_MAIL',1,'mail','chaine',0,NULL,'2012-07-18 10:25:27'),(668,'LDAP_FIELD_PHONE',1,'telephonenumber','chaine',0,NULL,'2012-07-18 10:25:27'),(669,'LDAP_FIELD_FAX',1,'facsimiletelephonenumber','chaine',0,NULL,'2012-07-18 10:25:27'),(670,'LDAP_FIELD_MOBILE',1,'mobile','chaine',0,NULL,'2012-07-18 10:25:27'),(671,'LDAP_SERVER_TYPE',1,'openldap','chaine',0,'','2012-07-18 10:25:46'),(672,'LDAP_SERVER_PROTOCOLVERSION',1,'3','chaine',0,'','2012-07-18 10:25:47'),(673,'LDAP_SERVER_HOST',1,'localhost','chaine',0,'','2012-07-18 10:25:47'),(674,'LDAP_SERVER_PORT',1,'389','chaine',0,'','2012-07-18 10:25:47'),(675,'LDAP_SERVER_USE_TLS',1,'0','chaine',0,'','2012-07-18 10:25:47'),(676,'LDAP_SYNCHRO_ACTIVE',1,'dolibarr2ldap','chaine',0,'','2012-07-18 10:25:47'),(677,'LDAP_CONTACT_ACTIVE',1,'1','chaine',0,'','2012-07-18 10:25:47'),(678,'LDAP_MEMBER_ACTIVE',1,'1','chaine',0,'','2012-07-18 10:25:47'),(974,'MAIN_MODULE_WORKFLOW_TRIGGERS',1,'1','chaine',0,NULL,'2013-07-18 18:02:20'),(975,'WORKFLOW_PROPAL_AUTOCREATE_ORDER',1,'1','chaine',0,'','2013-07-18 18:02:24'),(980,'PRELEVEMENT_NUMERO_NATIONAL_EMETTEUR',1,'1234567','chaine',0,'','2013-07-18 18:05:50'),(983,'FACTURE_RIB_NUMBER',1,'1','chaine',0,'','2013-07-18 18:35:14'),(984,'FACTURE_CHQ_NUMBER',1,'1','chaine',0,'','2013-07-18 18:35:14'),(1016,'GOOGLE_DUPLICATE_INTO_GCAL',1,'1','chaine',0,'','2013-07-18 21:40:20'),(1152,'SOCIETE_CODECLIENT_ADDON',1,'mod_codeclient_monkey','chaine',0,'','2013-07-29 20:50:02'),(1240,'MAIN_LOGEVENTS_USER_LOGIN',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1241,'MAIN_LOGEVENTS_USER_LOGIN_FAILED',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1242,'MAIN_LOGEVENTS_USER_LOGOUT',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1243,'MAIN_LOGEVENTS_USER_CREATE',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1244,'MAIN_LOGEVENTS_USER_MODIFY',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1245,'MAIN_LOGEVENTS_USER_NEW_PASSWORD',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1246,'MAIN_LOGEVENTS_USER_ENABLEDISABLE',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1247,'MAIN_LOGEVENTS_USER_DELETE',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1248,'MAIN_LOGEVENTS_GROUP_CREATE',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1249,'MAIN_LOGEVENTS_GROUP_MODIFY',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1250,'MAIN_LOGEVENTS_GROUP_DELETE',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1251,'MAIN_BOXES_MAXLINES',1,'5','',0,'','2013-07-29 21:05:42'),(1482,'EXPEDITION_ADDON_NUMBER',1,'mod_expedition_safor','chaine',0,'Nom du gestionnaire de numerotation des expeditions','2013-08-05 17:53:11'),(1490,'CONTRACT_ADDON',1,'mod_contract_serpis','chaine',0,'Nom du gestionnaire de numerotation des contrats','2013-08-05 18:11:58'),(1677,'COMMANDE_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/orders','chaine',0,NULL,'2014-12-08 13:11:02'),(1724,'PROPALE_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/proposals','chaine',0,NULL,'2014-12-08 13:17:14'),(1730,'OPENSTREETMAP_ENABLE_MAPS',1,'1','chaine',0,'','2014-12-08 13:22:47'),(1731,'OPENSTREETMAP_ENABLE_MAPS_CONTACTS',1,'1','chaine',0,'','2014-12-08 13:22:47'),(1732,'OPENSTREETMAP_ENABLE_MAPS_MEMBERS',1,'1','chaine',0,'','2014-12-08 13:22:47'),(1733,'OPENSTREETMAP_MAPS_ZOOM_LEVEL',1,'15','chaine',0,'','2014-12-08 13:22:47'),(1742,'MAIN_MAIL_EMAIL_FROM',2,'dolibarr-robot@domain.com','chaine',0,'EMail emetteur pour les emails automatiques Dolibarr','2014-12-08 14:08:14'),(1743,'MAIN_MENU_STANDARD',2,'eldy_menu.php','chaine',0,'Module de gestion de la barre de menu du haut pour utilisateurs internes','2015-02-11 19:43:54'),(1744,'MAIN_MENUFRONT_STANDARD',2,'eldy_menu.php','chaine',0,'Module de gestion de la barre de menu du haut pour utilisateurs externes','2015-02-11 19:43:54'),(1745,'MAIN_MENU_SMARTPHONE',2,'iphone_backoffice.php','chaine',0,'Module de gestion de la barre de menu smartphone pour utilisateurs internes','2014-12-08 14:08:14'),(1746,'MAIN_MENUFRONT_SMARTPHONE',2,'iphone_frontoffice.php','chaine',0,'Module de gestion de la barre de menu smartphone pour utilisateurs externes','2014-12-08 14:08:14'),(1747,'MAIN_THEME',2,'eldy','chaine',0,'Default theme','2014-12-08 14:08:14'),(1748,'MAIN_DELAY_ACTIONS_TODO',2,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur actions planifiées non réalisées','2014-12-08 14:08:14'),(1749,'MAIN_DELAY_ORDERS_TO_PROCESS',2,'2','chaine',0,'Tolérance de retard avant alerte (en jours) sur commandes clients non traitées','2014-12-08 14:08:14'),(1750,'MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS',2,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur commandes fournisseurs non traitées','2014-12-08 14:08:14'),(1751,'MAIN_DELAY_PROPALS_TO_CLOSE',2,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur propales à cloturer','2014-12-08 14:08:14'),(1752,'MAIN_DELAY_PROPALS_TO_BILL',2,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur propales non facturées','2014-12-08 14:08:14'),(1753,'MAIN_DELAY_CUSTOMER_BILLS_UNPAYED',2,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur factures client impayées','2014-12-08 14:08:14'),(1754,'MAIN_DELAY_SUPPLIER_BILLS_TO_PAY',2,'2','chaine',0,'Tolérance de retard avant alerte (en jours) sur factures fournisseur impayées','2014-12-08 14:08:14'),(1755,'MAIN_DELAY_NOT_ACTIVATED_SERVICES',2,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services à activer','2014-12-08 14:08:14'),(1756,'MAIN_DELAY_RUNNING_SERVICES',2,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services expirés','2014-12-08 14:08:14'),(1757,'MAIN_DELAY_MEMBERS',2,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur cotisations adhérent en retard','2014-12-08 14:08:14'),(1758,'MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE',2,'62','chaine',0,'Tolérance de retard avant alerte (en jours) sur rapprochements bancaires à faire','2014-12-08 14:08:14'),(1759,'MAILING_EMAIL_FROM',2,'dolibarr@domain.com','chaine',0,'EMail emmetteur pour les envois d emailings','2014-12-08 14:08:14'),(1760,'MAIN_INFO_SOCIETE_COUNTRY',3,'1:FR:France','chaine',0,'','2015-02-26 21:56:28'),(1761,'MAIN_INFO_SOCIETE_NOM',3,'bbb','chaine',0,'','2014-12-08 14:08:20'),(1762,'MAIN_INFO_SOCIETE_STATE',3,'0','chaine',0,'','2015-02-27 14:20:27'),(1763,'MAIN_MONNAIE',3,'EUR','chaine',0,'','2014-12-08 14:08:20'),(1764,'MAIN_LANG_DEFAULT',3,'auto','chaine',0,'','2014-12-08 14:08:20'),(1765,'MAIN_MAIL_EMAIL_FROM',3,'dolibarr-robot@domain.com','chaine',0,'EMail emetteur pour les emails automatiques Dolibarr','2014-12-08 14:08:20'),(1766,'MAIN_MENU_STANDARD',3,'eldy_menu.php','chaine',0,'Module de gestion de la barre de menu du haut pour utilisateurs internes','2015-02-11 19:43:54'),(1767,'MAIN_MENUFRONT_STANDARD',3,'eldy_menu.php','chaine',0,'Module de gestion de la barre de menu du haut pour utilisateurs externes','2015-02-11 19:43:54'),(1768,'MAIN_MENU_SMARTPHONE',3,'iphone_backoffice.php','chaine',0,'Module de gestion de la barre de menu smartphone pour utilisateurs internes','2014-12-08 14:08:20'),(1769,'MAIN_MENUFRONT_SMARTPHONE',3,'iphone_frontoffice.php','chaine',0,'Module de gestion de la barre de menu smartphone pour utilisateurs externes','2014-12-08 14:08:20'),(1770,'MAIN_THEME',3,'eldy','chaine',0,'Default theme','2014-12-08 14:08:20'),(1771,'MAIN_DELAY_ACTIONS_TODO',3,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur actions planifiées non réalisées','2014-12-08 14:08:20'),(1772,'MAIN_DELAY_ORDERS_TO_PROCESS',3,'2','chaine',0,'Tolérance de retard avant alerte (en jours) sur commandes clients non traitées','2014-12-08 14:08:20'),(1773,'MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS',3,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur commandes fournisseurs non traitées','2014-12-08 14:08:20'),(1774,'MAIN_DELAY_PROPALS_TO_CLOSE',3,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur propales à cloturer','2014-12-08 14:08:20'),(1775,'MAIN_DELAY_PROPALS_TO_BILL',3,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur propales non facturées','2014-12-08 14:08:20'),(1776,'MAIN_DELAY_CUSTOMER_BILLS_UNPAYED',3,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur factures client impayées','2014-12-08 14:08:20'),(1777,'MAIN_DELAY_SUPPLIER_BILLS_TO_PAY',3,'2','chaine',0,'Tolérance de retard avant alerte (en jours) sur factures fournisseur impayées','2014-12-08 14:08:20'),(1778,'MAIN_DELAY_NOT_ACTIVATED_SERVICES',3,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services à activer','2014-12-08 14:08:20'),(1779,'MAIN_DELAY_RUNNING_SERVICES',3,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services expirés','2014-12-08 14:08:20'),(1780,'MAIN_DELAY_MEMBERS',3,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur cotisations adhérent en retard','2014-12-08 14:08:20'),(1781,'MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE',3,'62','chaine',0,'Tolérance de retard avant alerte (en jours) sur rapprochements bancaires à faire','2014-12-08 14:08:20'),(1782,'MAILING_EMAIL_FROM',3,'dolibarr@domain.com','chaine',0,'EMail emmetteur pour les envois d emailings','2014-12-08 14:08:20'),(1803,'SYSLOG_FILE',1,'DOL_DATA_ROOT/dolibarr.log','chaine',0,'','2014-12-08 14:15:08'),(1804,'SYSLOG_HANDLERS',1,'[\"mod_syslog_file\"]','chaine',0,'','2014-12-08 14:15:08'),(1805,'MAIN_MODULE_SKINCOLOREDITOR',3,'1',NULL,0,NULL,'2014-12-08 14:35:40'),(1922,'PAYPAL_API_SANDBOX',1,'1','chaine',0,'','2014-12-12 12:11:05'),(1923,'PAYPAL_API_USER',1,'seller_1355312017_biz_api1.mydomain.com','chaine',0,'','2014-12-12 12:11:05'),(1924,'PAYPAL_API_PASSWORD',1,'1355312040','chaine',0,'','2014-12-12 12:11:05'),(1925,'PAYPAL_API_SIGNATURE',1,'ABCDEFWBzvfn0q5iNmbuiDv1y.3EAXIMWyl4C5KvDReR9HDwwAd6dQ4Q','chaine',0,'','2014-12-12 12:11:05'),(1926,'PAYPAL_API_INTEGRAL_OR_PAYPALONLY',1,'integral','chaine',0,'','2014-12-12 12:11:05'),(1927,'PAYPAL_SECURITY_TOKEN',1,'50c82fab36bb3b6aa83e2a50691803b2','chaine',0,'','2014-12-12 12:11:05'),(1928,'PAYPAL_SECURITY_TOKEN_UNIQUE',1,'0','chaine',0,'','2014-12-12 12:11:05'),(1929,'PAYPAL_ADD_PAYMENT_URL',1,'1','chaine',0,'','2014-12-12 12:11:05'),(1980,'MAIN_PDF_FORMAT',1,'EUA4','chaine',0,'','2014-12-12 19:58:05'),(1981,'MAIN_PROFID1_IN_ADDRESS',1,'0','chaine',0,'','2014-12-12 19:58:05'),(1982,'MAIN_PROFID2_IN_ADDRESS',1,'0','chaine',0,'','2014-12-12 19:58:05'),(1983,'MAIN_PROFID3_IN_ADDRESS',1,'0','chaine',0,'','2014-12-12 19:58:05'),(1984,'MAIN_PROFID4_IN_ADDRESS',1,'0','chaine',0,'','2014-12-12 19:58:05'),(1985,'MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT',1,'0','chaine',0,'','2014-12-12 19:58:05'),(2835,'MAIN_USE_CONNECT_TIMEOUT',1,'10','chaine',0,'','2015-01-16 19:28:50'),(2836,'MAIN_USE_RESPONSE_TIMEOUT',1,'30','chaine',0,'','2015-01-16 19:28:50'),(2837,'MAIN_PROXY_USE',1,'0','chaine',0,'','2015-01-16 19:28:50'),(2838,'MAIN_PROXY_HOST',1,'localhost','chaine',0,'','2015-01-16 19:28:50'),(2839,'MAIN_PROXY_PORT',1,'8080','chaine',0,'','2015-01-16 19:28:50'),(2840,'MAIN_PROXY_USER',1,'aaa','chaine',0,'','2015-01-16 19:28:50'),(2841,'MAIN_PROXY_PASS',1,'bbb','chaine',0,'','2015-01-16 19:28:50'),(2848,'OVHSMS_NICK',1,'BN196-OVH','chaine',0,'','2015-01-16 19:32:36'),(2849,'OVHSMS_PASS',1,'bigone-10','chaine',0,'','2015-01-16 19:32:36'),(2850,'OVHSMS_SOAPURL',1,'https://www.ovh.com/soapi/soapi-re-1.55.wsdl','chaine',0,'','2015-01-16 19:32:36'),(2854,'THEME_ELDY_RGB',1,'bfbf00','chaine',0,'','2015-01-18 10:02:53'),(2855,'THEME_ELDY_ENABLE_PERSONALIZED',1,'0','chaine',0,'','2015-01-18 10:02:55'),(2858,'MAIN_SESSION_TIMEOUT',1,'2000','chaine',0,'','2015-01-19 17:01:53'),(2867,'FACSIM_ADDON',1,'mod_facsim_alcoy','chaine',0,'','2015-01-19 17:16:25'),(2868,'POS_SERVICES',1,'0','chaine',0,'','2015-01-19 17:16:51'),(2869,'POS_USE_TICKETS',1,'1','chaine',0,'','2015-01-19 17:16:51'),(2870,'POS_MAX_TTC',1,'100','chaine',0,'','2015-01-19 17:16:51'),(3190,'MAIN_MODULE_HOLIDAY',2,'1',NULL,0,NULL,'2015-02-01 08:52:34'),(3195,'INVOICE_SUPPLIER_ADDON_PDF',1,'canelle','chaine',0,'','2015-02-10 19:50:27'),(3199,'MAIN_FORCE_RELOAD_PAGE',1,'1','chaine',0,NULL,'2015-02-12 16:22:55'),(3223,'OVH_THIRDPARTY_IMPORT',1,'2','chaine',0,'','2015-02-13 16:20:18'),(3409,'AGENDA_USE_EVENT_TYPE',1,'1','chaine',0,'','2015-02-27 18:12:24'),(3886,'MAIN_REMOVE_INSTALL_WARNING',1,'1','chaine',1,'','2015-03-02 18:32:50'),(4013,'MAIN_DELAY_ACTIONS_TODO',1,'7','chaine',0,'','2015-03-06 08:59:12'),(4014,'MAIN_DELAY_PROPALS_TO_CLOSE',1,'31','chaine',0,'','2015-03-06 08:59:12'),(4015,'MAIN_DELAY_PROPALS_TO_BILL',1,'7','chaine',0,'','2015-03-06 08:59:12'),(4016,'MAIN_DELAY_ORDERS_TO_PROCESS',1,'2','chaine',0,'','2015-03-06 08:59:12'),(4017,'MAIN_DELAY_CUSTOMER_BILLS_UNPAYED',1,'31','chaine',0,'','2015-03-06 08:59:12'),(4018,'MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS',1,'7','chaine',0,'','2015-03-06 08:59:12'),(4019,'MAIN_DELAY_SUPPLIER_BILLS_TO_PAY',1,'2','chaine',0,'','2015-03-06 08:59:12'),(4020,'MAIN_DELAY_RUNNING_SERVICES',1,'-15','chaine',0,'','2015-03-06 08:59:12'),(4021,'MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE',1,'62','chaine',0,'','2015-03-06 08:59:13'),(4022,'MAIN_DELAY_MEMBERS',1,'31','chaine',0,'','2015-03-06 08:59:13'),(4023,'MAIN_DISABLE_METEO',1,'0','chaine',0,'','2015-03-06 08:59:13'),(4044,'ADHERENT_VAT_FOR_SUBSCRIPTIONS',1,'0','',0,'','2015-03-06 16:06:38'),(4047,'ADHERENT_BANK_USE',1,'bankviainvoice','',0,'','2015-03-06 16:12:30'),(4049,'PHPSANE_SCANIMAGE',1,'/usr/bin/scanimage','chaine',0,'','2015-03-06 21:54:13'),(4050,'PHPSANE_PNMTOJPEG',1,'/usr/bin/pnmtojpeg','chaine',0,'','2015-03-06 21:54:13'),(4051,'PHPSANE_PNMTOTIFF',1,'/usr/bin/pnmtotiff','chaine',0,'','2015-03-06 21:54:13'),(4052,'PHPSANE_OCR',1,'/usr/bin/gocr','chaine',0,'','2015-03-06 21:54:13'),(4548,'ECM_AUTO_TREE_ENABLED',1,'1','chaine',0,'','2015-03-10 15:57:21'),(4579,'MAIN_MODULE_AGENDA',2,'1',NULL,0,NULL,'2015-03-13 15:29:19'),(4580,'MAIN_AGENDA_ACTIONAUTO_COMPANY_CREATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4581,'MAIN_AGENDA_ACTIONAUTO_CONTRACT_VALIDATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4582,'MAIN_AGENDA_ACTIONAUTO_PROPAL_VALIDATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4583,'MAIN_AGENDA_ACTIONAUTO_PROPAL_SENTBYMAIL',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4584,'MAIN_AGENDA_ACTIONAUTO_ORDER_VALIDATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4585,'MAIN_AGENDA_ACTIONAUTO_ORDER_SENTBYMAIL',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4586,'MAIN_AGENDA_ACTIONAUTO_BILL_VALIDATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4587,'MAIN_AGENDA_ACTIONAUTO_BILL_PAYED',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4588,'MAIN_AGENDA_ACTIONAUTO_BILL_CANCEL',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4589,'MAIN_AGENDA_ACTIONAUTO_BILL_SENTBYMAIL',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4590,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_VALIDATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4591,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_VALIDATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4592,'MAIN_AGENDA_ACTIONAUTO_SHIPPING_VALIDATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4593,'MAIN_AGENDA_ACTIONAUTO_SHIPPING_SENTBYMAIL',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4594,'MAIN_AGENDA_ACTIONAUTO_BILL_UNVALIDATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4688,'GOOGLE_ENABLE_AGENDA',2,'1','chaine',0,'','2015-03-13 15:36:29'),(4689,'GOOGLE_AGENDA_NAME1',2,'eldy','chaine',0,'','2015-03-13 15:36:29'),(4690,'GOOGLE_AGENDA_SRC1',2,'eldy10@mail.com','chaine',0,'','2015-03-13 15:36:29'),(4691,'GOOGLE_AGENDA_COLOR1',2,'BE6D00','chaine',0,'','2015-03-13 15:36:29'),(4692,'GOOGLE_AGENDA_COLOR2',2,'7A367A','chaine',0,'','2015-03-13 15:36:29'),(4693,'GOOGLE_AGENDA_COLOR3',2,'7A367A','chaine',0,'','2015-03-13 15:36:29'),(4694,'GOOGLE_AGENDA_COLOR4',2,'7A367A','chaine',0,'','2015-03-13 15:36:29'),(4695,'GOOGLE_AGENDA_COLOR5',2,'7A367A','chaine',0,'','2015-03-13 15:36:29'),(4696,'GOOGLE_AGENDA_TIMEZONE',2,'Europe/Paris','chaine',0,'','2015-03-13 15:36:29'),(4697,'GOOGLE_AGENDA_NB',2,'5','chaine',0,'','2015-03-13 15:36:29'),(4725,'SOCIETE_CODECLIENT_ADDON',2,'mod_codeclient_leopard','chaine',0,'Module to control third parties codes','2015-03-13 20:21:35'),(4726,'SOCIETE_CODECOMPTA_ADDON',2,'mod_codecompta_panicum','chaine',0,'Module to control third parties codes','2015-03-13 20:21:35'),(4727,'SOCIETE_FISCAL_MONTH_START',2,'','chaine',0,'Mettre le numero du mois du debut d\\\'annee fiscale, ex: 9 pour septembre','2015-03-13 20:21:35'),(4728,'MAIN_SEARCHFORM_SOCIETE',2,'1','yesno',0,'Show form for quick company search','2015-03-13 20:21:35'),(4729,'MAIN_SEARCHFORM_CONTACT',2,'1','yesno',0,'Show form for quick contact search','2015-03-13 20:21:35'),(4730,'COMPANY_ADDON_PDF_ODT_PATH',2,'DOL_DATA_ROOT/doctemplates/thirdparties','chaine',0,NULL,'2015-03-13 20:21:35'),(4743,'MAIN_MODULE_CLICKTODIAL',2,'1',NULL,0,NULL,'2015-03-13 20:30:28'),(4744,'MAIN_MODULE_NOTIFICATION',2,'1',NULL,0,NULL,'2015-03-13 20:30:34'),(4745,'MAIN_MODULE_WEBSERVICES',2,'1',NULL,0,NULL,'2015-03-13 20:30:41'),(4746,'MAIN_MODULE_PROPALE',2,'1',NULL,0,NULL,'2015-03-13 20:32:38'),(4747,'PROPALE_ADDON_PDF',2,'azur','chaine',0,'Nom du gestionnaire de generation des propales en PDF','2015-03-13 20:32:38'),(4748,'PROPALE_ADDON',2,'mod_propale_marbre','chaine',0,'Nom du gestionnaire de numerotation des propales','2015-03-13 20:32:38'),(4749,'PROPALE_VALIDITY_DURATION',2,'15','chaine',0,'Duration of validity of business proposals','2015-03-13 20:32:38'),(4750,'PROPALE_ADDON_PDF_ODT_PATH',2,'DOL_DATA_ROOT/doctemplates/proposals','chaine',0,NULL,'2015-03-13 20:32:38'),(4752,'MAIN_MODULE_TAX',2,'1',NULL,0,NULL,'2015-03-13 20:32:47'),(4753,'MAIN_MODULE_DON',2,'1',NULL,0,NULL,'2015-03-13 20:32:54'),(4754,'DON_ADDON_MODEL',2,'html_cerfafr','chaine',0,'Nom du gestionnaire de generation de recu de dons','2015-03-13 20:32:54'),(4755,'POS_USE_TICKETS',2,'1','chaine',0,'','2015-03-13 20:33:09'),(4756,'POS_MAX_TTC',2,'100','chaine',0,'','2015-03-13 20:33:09'),(4757,'MAIN_MODULE_POS',2,'1',NULL,0,NULL,'2015-03-13 20:33:09'),(4758,'TICKET_ADDON',2,'mod_ticket_avenc','chaine',0,'Nom du gestionnaire de numerotation des tickets','2015-03-13 20:33:09'),(4759,'MAIN_MODULE_BANQUE',2,'1',NULL,0,NULL,'2015-03-13 20:33:09'),(4760,'MAIN_MODULE_FACTURE',2,'1',NULL,0,NULL,'2015-03-13 20:33:09'),(4761,'FACTURE_ADDON_PDF',2,'crabe','chaine',0,'Name of PDF model of invoice','2015-03-13 20:33:09'),(4762,'FACTURE_ADDON',2,'mod_facture_terre','chaine',0,'Name of numbering numerotation rules of invoice','2015-03-13 20:33:09'),(4763,'FACTURE_ADDON_PDF_ODT_PATH',2,'DOL_DATA_ROOT/doctemplates/invoices','chaine',0,NULL,'2015-03-13 20:33:09'),(4764,'MAIN_MODULE_SOCIETE',2,'1',NULL,0,NULL,'2015-03-13 20:33:09'),(4765,'MAIN_MODULE_PRODUCT',2,'1',NULL,0,NULL,'2015-03-13 20:33:09'),(4766,'PRODUCT_CODEPRODUCT_ADDON',2,'mod_codeproduct_leopard','chaine',0,'Module to control product codes','2015-03-13 20:33:09'),(4767,'MAIN_SEARCHFORM_PRODUITSERVICE',2,'1','yesno',0,'Show form for quick product search','2015-03-13 20:33:09'),(4772,'FACSIM_ADDON',2,'mod_facsim_alcoy','chaine',0,'','2015-03-13 20:33:32'),(4773,'MAIN_MODULE_MAILING',2,'1',NULL,0,NULL,'2015-03-13 20:33:37'),(4774,'MAIN_MODULE_OPENSURVEY',2,'1',NULL,0,NULL,'2015-03-13 20:33:42'),(4782,'AGENDA_USE_EVENT_TYPE',2,'1','chaine',0,'','2015-03-13 20:53:36'),(4884,'AGENDA_DISABLE_EXT',2,'1','chaine',0,'','2015-03-13 22:03:40'),(4928,'COMMANDE_SUPPLIER_ADDON_NUMBER',1,'mod_commande_fournisseur_muguet','chaine',0,'Nom du gestionnaire de numerotation des commandes fournisseur','2015-03-22 09:24:29'),(4929,'INVOICE_SUPPLIER_ADDON_NUMBER',1,'mod_facture_fournisseur_cactus','chaine',0,'Nom du gestionnaire de numerotation des factures fournisseur','2015-03-22 09:24:29'),(5001,'MAIN_CRON_KEY',0,'bc54582fe30d5d4a830c6f582ec28810','chaine',0,'','2015-03-23 17:54:53'),(5009,'CRON_KEY',0,'2c2e755c20be2014098f629865598006','chaine',0,'','2015-03-23 18:06:24'),(5139,'SOCIETE_ADD_REF_IN_LIST',1,'','yesno',0,'Display customer ref into select list','2015-09-08 23:06:08'),(5150,'PROJECT_TASK_ADDON_PDF',1,'','chaine',0,'Name of PDF/ODT tasks manager class','2015-09-08 23:06:14'),(5151,'PROJECT_TASK_ADDON',1,'mod_task_simple','chaine',0,'Name of Numbering Rule task manager class','2015-09-08 23:06:14'),(5152,'PROJECT_TASK_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/tasks','chaine',0,'','2015-09-08 23:06:14'),(5239,'BOOKMARKS_SHOW_IN_MENU',1,'10','chaine',0,'','2016-03-02 15:42:26'),(5271,'DONATION_ART200',1,'','yesno',0,'Option Française - Eligibilité Art200 du CGI','2016-12-21 12:51:28'),(5272,'DONATION_ART238',1,'','yesno',0,'Option Française - Eligibilité Art238 bis du CGI','2016-12-21 12:51:28'),(5274,'DONATION_MESSAGE',1,'Thank you','chaine',0,'Message affiché sur le récépissé de versements ou dons','2016-12-21 12:51:28'),(5349,'MAIN_SEARCHFORM_CONTACT',1,'1','chaine',0,'','2017-10-03 10:11:33'),(5351,'MAIN_SEARCHFORM_PRODUITSERVICE',1,'1','chaine',0,'','2017-10-03 10:11:33'),(5352,'MAIN_SEARCHFORM_PRODUITSERVICE_SUPPLIER',1,'0','chaine',0,'','2017-10-03 10:11:33'),(5353,'MAIN_SEARCHFORM_ADHERENT',1,'1','chaine',0,'','2017-10-03 10:11:33'),(5354,'MAIN_SEARCHFORM_PROJECT',1,'0','chaine',0,'','2017-10-03 10:11:33'),(5394,'FCKEDITOR_ENABLE_DETAILS',1,'1','yesno',0,'WYSIWIG for products details lines for all entities','2017-11-04 15:27:44'),(5395,'FCKEDITOR_ENABLE_USERSIGN',1,'1','yesno',0,'WYSIWIG for user signature','2017-11-04 15:27:44'),(5396,'FCKEDITOR_ENABLE_MAIL',1,'1','yesno',0,'WYSIWIG for products details lines for all entities','2017-11-04 15:27:44'),(5398,'CATEGORIE_RECURSIV_ADD',1,'','yesno',0,'Affect parent categories','2017-11-04 15:27:46'),(5404,'MAIN_MODULE_CATEGORIE',1,'1',NULL,0,NULL,'2017-11-04 15:41:43'),(5415,'EXPEDITION_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/shipment','chaine',0,NULL,'2017-11-15 22:38:28'),(5416,'LIVRAISON_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/delivery','chaine',0,NULL,'2017-11-15 22:38:28'),(5426,'MAIN_MODULE_PROJET',1,'1',NULL,0,NULL,'2017-11-15 22:38:44'),(5427,'PROJECT_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/projects','chaine',0,NULL,'2017-11-15 22:38:44'),(5428,'PROJECT_USE_OPPORTUNIES',1,'1','chaine',0,NULL,'2017-11-15 22:38:44'),(5430,'MAIN_MODULE_EXPORT',1,'1',NULL,0,NULL,'2017-11-15 22:38:56'),(5431,'MAIN_MODULE_IMPORT',1,'1',NULL,0,NULL,'2017-11-15 22:38:58'),(5432,'MAIN_MODULE_MAILING',1,'1',NULL,0,NULL,'2017-11-15 22:39:00'),(5434,'EXPENSEREPORT_ADDON_PDF',1,'standard','chaine',0,'Name of manager to build PDF expense reports documents','2017-11-15 22:39:05'),(5437,'SALARIES_ACCOUNTING_ACCOUNT_CHARGE',1,'641','chaine',0,NULL,'2017-11-15 22:39:08'),(5441,'ADHERENT_ETIQUETTE_TEXT',1,'%FULLNAME%\n%ADDRESS%\n%ZIP% %TOWN%\n%COUNTRY%','text',0,'Text to print on member address sheets','2018-11-23 11:56:07'),(5443,'MAIN_MODULE_PRELEVEMENT',1,'1',NULL,0,NULL,'2017-11-15 22:39:33'),(5453,'MAIN_MODULE_CONTRAT',1,'1',NULL,0,NULL,'2017-11-15 22:39:52'),(5455,'MAIN_MODULE_FICHEINTER',1,'1',NULL,0,NULL,'2017-11-15 22:39:56'),(5459,'MAIN_MODULE_PAYPAL',1,'1',NULL,0,NULL,'2017-11-15 22:41:02'),(5463,'MAIN_MODULE_PROPALE',1,'1',NULL,0,NULL,'2017-11-15 22:41:47'),(5483,'GENBARCODE_BARCODETYPE_THIRDPARTY',1,'6','chaine',0,'','2018-01-16 15:49:43'),(5484,'PRODUIT_DEFAULT_BARCODE_TYPE',1,'2','chaine',0,'','2018-01-16 15:49:46'),(5586,'MAIN_DELAY_EXPENSEREPORTS_TO_PAY',1,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur les notes de frais impayées','2018-01-22 17:28:18'),(5587,'MAIN_FIX_FOR_BUGGED_MTA',1,'1','chaine',1,'Set constant to fix email ending from PHP with some linux ike system','2018-01-22 17:28:18'),(5590,'MAIN_VERSION_LAST_INSTALL',0,'3.8.3','chaine',0,'Dolibarr version when install','2018-01-22 17:28:42'),(5604,'MAIN_INFO_SOCIETE_LOGO',1,'mybigcompany.png','chaine',0,'','2018-01-22 17:33:49'),(5605,'MAIN_INFO_SOCIETE_LOGO_SMALL',1,'mybigcompany_small.png','chaine',0,'','2018-01-22 17:33:49'),(5606,'MAIN_INFO_SOCIETE_LOGO_MINI',1,'mybigcompany_mini.png','chaine',0,'','2018-01-22 17:33:49'),(5614,'MAIN_SIZE_SHORTLISTE_LIMIT',1,'4','chaine',0,'Longueur maximum des listes courtes (fiche client)','2018-03-13 10:54:46'),(5627,'SUPPLIER_PROPOSAL_ADDON_PDF',1,'aurore','chaine',0,'Name of submodule to generate PDF for supplier quotation request','2018-07-30 11:13:20'),(5628,'SUPPLIER_PROPOSAL_ADDON',1,'mod_supplier_proposal_marbre','chaine',0,'Name of submodule to number supplier quotation request','2018-07-30 11:13:20'),(5629,'SUPPLIER_PROPOSAL_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/supplier_proposal','chaine',0,NULL,'2018-07-30 11:13:20'),(5633,'MAIN_MODULE_API',1,'1',NULL,0,NULL,'2018-07-30 11:13:54'),(5634,'MAIN_MODULE_WEBSERVICES',1,'1',NULL,0,NULL,'2018-07-30 11:13:56'),(5635,'WEBSERVICES_KEY',1,'dolibarrkey','chaine',0,'','2018-07-30 11:14:04'),(5638,'MAIN_MODULE_EXTERNALRSS',1,'1',NULL,0,NULL,'2018-07-30 11:15:04'),(5642,'SOCIETE_CODECOMPTA_ADDON',1,'mod_codecompta_aquarium','chaine',0,'','2018-07-30 11:16:42'),(5707,'CASHDESK_NO_DECREASE_STOCK',1,'1','chaine',0,'','2018-07-30 13:38:11'),(5708,'MAIN_MODULE_PRODUCTBATCH',1,'1',NULL,0,NULL,'2018-07-30 13:38:11'),(5710,'MAIN_MODULE_STOCK',1,'1',NULL,0,NULL,'2018-07-30 13:38:11'),(5711,'MAIN_MODULE_PRODUCT',1,'1',NULL,0,NULL,'2018-07-30 13:38:11'),(5808,'MARGIN_TYPE',1,'costprice','chaine',0,'','2018-07-30 16:32:18'),(5809,'DISPLAY_MARGIN_RATES',1,'1','chaine',0,'','2018-07-30 16:32:20'),(5833,'ACCOUNTING_EXPORT_SEPARATORCSV',1,',','string',0,NULL,'2017-01-29 15:11:56'),(5840,'CHARTOFACCOUNTS',1,'2','chaine',0,NULL,'2017-01-29 15:11:56'),(5841,'ACCOUNTING_EXPORT_MODELCSV',1,'1','chaine',0,NULL,'2017-01-29 15:11:56'),(5842,'ACCOUNTING_LENGTH_GACCOUNT',1,'','chaine',0,NULL,'2017-01-29 15:11:56'),(5843,'ACCOUNTING_LENGTH_AACCOUNT',1,'','chaine',0,NULL,'2017-01-29 15:11:56'),(5844,'ACCOUNTING_LIST_SORT_VENTILATION_TODO',1,'1','yesno',0,NULL,'2017-01-29 15:11:56'),(5845,'ACCOUNTING_LIST_SORT_VENTILATION_DONE',1,'1','yesno',0,NULL,'2017-01-29 15:11:56'),(5846,'ACCOUNTING_EXPORT_DATE',1,'%d%m%Y','chaine',0,NULL,'2017-01-29 15:11:56'),(5848,'ACCOUNTING_EXPORT_FORMAT',1,'csv','chaine',0,NULL,'2017-01-29 15:11:56'),(5853,'MAIN_MODULE_WORKFLOW',1,'1',NULL,0,NULL,'2017-01-29 15:12:12'),(5854,'MAIN_MODULE_NOTIFICATION',1,'1',NULL,0,NULL,'2017-01-29 15:12:35'),(5855,'MAIN_MODULE_OAUTH',1,'1',NULL,0,NULL,'2017-01-29 15:12:41'),(5883,'MAILING_LIMIT_SENDBYWEB',0,'15','chaine',1,'Number of targets to defined packet size when sending mass email','2017-01-29 17:36:33'),(5884,'MAIN_MAIL_DEBUG',1,'0','chaine',1,'','2017-01-29 18:53:02'),(5885,'MAIN_SOAP_DEBUG',1,'0','chaine',1,'','2017-01-29 18:53:02'),(5925,'MAIN_AGENDA_ACTIONAUTO_MEMBER_SUBSCRIPTION',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5931,'DATABASE_PWD_ENCRYPTED',1,'1','chaine',0,'','2017-02-01 15:06:04'),(5932,'MAIN_DISABLE_ALL_MAILS',1,'0','chaine',0,'','2017-02-01 15:09:09'),(5933,'MAIN_MAIL_SENDMODE',1,'mail','chaine',0,'','2017-02-01 15:09:09'),(5934,'MAIN_MAIL_SMTP_PORT',1,'465','chaine',0,'','2017-02-01 15:09:09'),(5935,'MAIN_MAIL_SMTP_SERVER',1,'smtp.mail.com','chaine',0,'','2017-02-01 15:09:09'),(5936,'MAIN_MAIL_SMTPS_ID',1,'eldy10@mail.com','chaine',0,'','2017-02-01 15:09:09'),(5937,'MAIN_MAIL_SMTPS_PW',1,'bidonge','chaine',0,'','2017-02-01 15:09:09'),(5938,'MAIN_MAIL_EMAIL_FROM',1,'robot@example.com','chaine',0,'','2017-02-01 15:09:09'),(5939,'MAIN_MAIL_DEFAULT_FROMTYPE',1,'user','chaine',0,'','2017-02-01 15:09:09'),(5940,'PRELEVEMENT_ID_BANKACCOUNT',1,'1','chaine',0,'','2017-02-06 04:04:47'),(5941,'PRELEVEMENT_ICS',1,'ICS123456','chaine',0,'','2017-02-06 04:04:47'),(5942,'PRELEVEMENT_USER',1,'1','chaine',0,'','2017-02-06 04:04:47'),(5943,'BANKADDON_PDF',1,'sepamandate','chaine',0,'','2017-02-06 04:13:52'),(5947,'CHEQUERECEIPTS_THYME_MASK',1,'CHK{yy}{mm}-{0000@1}','chaine',0,'','2017-02-06 04:16:27'),(5948,'MAIN_MODULE_LOAN',1,'1',NULL,0,NULL,'2017-02-06 19:19:05'),(5954,'MAIN_SUBMODULE_EXPEDITION',1,'1','chaine',0,'','2017-02-06 23:57:37'),(5964,'MAIN_MODULE_TAX',1,'1',NULL,0,NULL,'2017-02-07 18:56:12'),(6019,'MAIN_INFO_SOCIETE_COUNTRY',2,'1:FR:France','chaine',0,'','2017-02-15 17:18:22'),(6020,'MAIN_INFO_SOCIETE_NOM',2,'MySecondCompany','chaine',0,'','2017-02-15 17:18:22'),(6021,'MAIN_INFO_SOCIETE_STATE',2,'0','chaine',0,'','2017-02-15 17:18:22'),(6022,'MAIN_MONNAIE',2,'EUR','chaine',0,'','2017-02-15 17:18:22'),(6023,'MAIN_LANG_DEFAULT',2,'auto','chaine',0,'','2017-02-15 17:18:22'),(6032,'MAIN_MODULE_MULTICURRENCY',1,'1',NULL,0,NULL,'2017-02-15 17:29:59'),(6048,'SYSLOG_FACILITY',0,'LOG_USER','chaine',0,'','2017-02-15 22:37:01'),(6049,'SYSLOG_FIREPHP_INCLUDEPATH',0,'/home/ldestailleur/git/dolibarr_5.0/htdocs/includes/firephp/firephp-core/lib/','chaine',0,'','2017-02-15 22:37:01'),(6050,'SYSLOG_FILE',0,'DOL_DATA_ROOT/dolibarr.log','chaine',0,'','2017-02-15 22:37:01'),(6051,'SYSLOG_CHROMEPHP_INCLUDEPATH',0,'/home/ldestailleur/git/dolibarr_5.0/htdocs/includes/ccampbell/chromephp/','chaine',0,'','2017-02-15 22:37:01'),(6052,'SYSLOG_HANDLERS',0,'[\"mod_syslog_file\"]','chaine',0,'','2017-02-15 22:37:01'),(6092,'MAIN_SIZE_SHORTLIST_LIMIT',0,'3','chaine',0,'Max length for small lists (tabs)','2017-05-12 09:02:38'),(6099,'MAIN_MODULE_SKYPE',1,'1',NULL,0,NULL,'2017-05-12 09:03:51'),(6100,'MAIN_MODULE_GRAVATAR',1,'1',NULL,0,NULL,'2017-05-12 09:03:54'),(6102,'PRODUCT_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/products','chaine',0,'','2017-08-27 13:29:07'),(6103,'CONTRACT_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/contracts','chaine',0,'','2017-08-27 13:29:07'),(6104,'USERGROUP_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/usergroups','chaine',0,'','2017-08-27 13:29:07'),(6105,'USER_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/users','chaine',0,'','2017-08-27 13:29:07'),(6106,'MAIN_ENABLE_OVERWRITE_TRANSLATION',1,'1','chaine',0,'Enable overwrote of translation','2017-08-27 13:29:07'),(6377,'COMMANDE_SAPHIR_MASK',1,'{yy}{mm}{000}{ttt}','chaine',0,'','2017-09-06 07:56:25'),(6518,'GOOGLE_DUPLICATE_INTO_THIRDPARTIES',1,'1','chaine',0,'','2017-09-06 19:43:57'),(6519,'GOOGLE_DUPLICATE_INTO_CONTACTS',1,'0','chaine',0,'','2017-09-06 19:43:57'),(6520,'GOOGLE_TAG_PREFIX',1,'Dolibarr (Thirdparties)','chaine',0,'','2017-09-06 19:43:57'),(6521,'GOOGLE_TAG_PREFIX_CONTACTS',1,'Dolibarr (Contacts/Addresses)','chaine',0,'','2017-09-06 19:43:57'),(6522,'GOOGLE_ENABLE_AGENDA',1,'1','chaine',0,'','2017-09-06 19:44:12'),(6523,'GOOGLE_AGENDA_COLOR1',1,'1B887A','chaine',0,'','2017-09-06 19:44:12'),(6524,'GOOGLE_AGENDA_COLOR2',1,'7A367A','chaine',0,'','2017-09-06 19:44:12'),(6525,'GOOGLE_AGENDA_COLOR3',1,'7A367A','chaine',0,'','2017-09-06 19:44:12'),(6526,'GOOGLE_AGENDA_COLOR4',1,'7A367A','chaine',0,'','2017-09-06 19:44:12'),(6527,'GOOGLE_AGENDA_COLOR5',1,'7A367A','chaine',0,'','2017-09-06 19:44:12'),(6528,'GOOGLE_AGENDA_TIMEZONE',1,'Europe/Paris','chaine',0,'','2017-09-06 19:44:12'),(6529,'GOOGLE_AGENDA_NB',1,'5','chaine',0,'','2017-09-06 19:44:12'),(6543,'MAIN_SMS_DEBUG',0,'1','chaine',1,'This is to enable OVH SMS debug','2017-09-06 19:44:34'),(6562,'BLOCKEDLOG_ENTITY_FINGERPRINT',1,'b63e359ffca54d5c2bab869916eaf23d4a736703028ccbf77ce1167c5f830e7b','chaine',0,'Numeric Unique Fingerprint','2018-01-19 11:27:15'),(6564,'BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY',1,'FR','chaine',0,'This is list of country code where the module may be mandatory','2018-01-19 11:27:15'),(6565,'MAIN_MODULE_BOOKMARK',1,'1',NULL,0,'{\"authorid\":\"12\",\"ip\":\"82.240.38.230\"}','2018-01-19 11:27:34'),(6566,'MAIN_MODULE_ADHERENT',1,'1',NULL,0,'{\"authorid\":\"12\",\"ip\":\"82.240.38.230\"}','2018-01-19 11:27:56'),(6567,'ADHERENT_ADDON_PDF',1,'standard','chaine',0,'Name of PDF model of member','2018-01-19 11:27:56'),(6636,'MAIN_MODULE_TICKET_MODELS',1,'1','chaine',0,NULL,'2019-06-05 09:15:29'),(6647,'MAIN_MODULE_SOCIALNETWORKS',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2019-06-05 09:16:49'),(6795,'TICKET_ADDON',1,'mod_ticket_simple','chaine',0,'','2019-09-26 12:07:59'),(6796,'PRODUCT_CODEPRODUCT_ADDON',1,'mod_codeproduct_elephant','chaine',0,'','2019-09-26 12:59:00'),(6800,'CASHDESK_ID_THIRDPARTY1',1,'7','chaine',0,'','2019-09-26 15:30:09'),(6801,'CASHDESK_ID_BANKACCOUNT_CASH1',1,'3','chaine',0,'','2019-09-26 15:30:09'),(6802,'CASHDESK_ID_BANKACCOUNT_CHEQUE1',1,'4','chaine',0,'','2019-09-26 15:30:09'),(6803,'CASHDESK_ID_BANKACCOUNT_CB1',1,'4','chaine',0,'','2019-09-26 15:30:09'),(6804,'CASHDESK_ID_BANKACCOUNT_PRE1',1,'4','chaine',0,'','2019-09-26 15:30:09'),(6805,'CASHDESK_ID_BANKACCOUNT_VIR1',1,'1','chaine',0,'','2019-09-26 15:30:09'),(6806,'CASHDESK_NO_DECREASE_STOCK1',1,'1','chaine',0,'','2019-09-26 15:30:09'),(6811,'FORCEPROJECT_ON_PROPOSAL',1,'1','chaine',0,'','2019-09-27 14:52:57'),(6813,'PROJECT_USE_OPPORTUNITIES',1,'1','chaine',0,'','2019-10-01 11:48:09'),(6814,'PACKTHEMEACTIVATEDTHEME',0,'modOwnTheme','chaine',0,'','2019-10-02 11:41:58'),(6815,'OWNTHEME_COL1',0,'#6a89cc','chaine',0,'','2019-10-02 11:41:58'),(6816,'OWNTHEME_COL2',0,'#60a3bc','chaine',0,'','2019-10-02 11:41:58'),(6817,'DOL_VERSION',0,'10.0.2','chaine',0,'Dolibarr version','2019-10-02 11:41:58'),(6823,'OWNTHEME_COL_BODY_BCKGRD',0,'#E9E9E9','chaine',0,'','2019-10-02 11:41:58'),(6824,'OWNTHEME_COL_LOGO_BCKGRD',0,'#474c80','chaine',0,'','2019-10-02 11:41:58'),(6825,'OWNTHEME_COL_TXT_MENU',0,'#b8c6e5','chaine',0,'','2019-10-02 11:41:58'),(6826,'OWNTHEME_COL_HEADER_BCKGRD',0,'#474c80','chaine',0,'','2019-10-02 11:41:58'),(6827,'OWNTHEME_CUSTOM_CSS',0,'0','yesno',0,'','2019-10-02 11:41:58'),(6828,'OWNTHEME_CUSTOM_JS',0,'0','yesno',0,'','2019-10-02 11:41:58'),(6829,'OWNTHEME_FIXED_MENU',0,'0','yesno',0,'','2019-10-02 11:41:58'),(6830,'OWNTHEME_D_HEADER_FONT_SIZE',0,'1.7rem','chaine',0,'','2019-10-02 11:41:58'),(6831,'OWNTHEME_S_HEADER_FONT_SIZE',0,'1.6rem','chaine',0,'','2019-10-02 11:41:58'),(6832,'OWNTHEME_D_VMENU_FONT_SIZE',0,'1.2rem','chaine',0,'','2019-10-02 11:41:58'),(6833,'OWNTHEME_S_VMENU_FONT_SIZE',0,'1.2rem','chaine',0,'','2019-10-02 11:41:58'),(6844,'MAIN_THEME',0,'eldy','chaine',0,'','2019-10-02 11:46:02'),(6845,'MAIN_MENU_STANDARD',0,'eldy_menu.php','chaine',0,'','2019-10-02 11:46:02'),(6846,'MAIN_MENUFRONT_STANDARD',0,'eldy_menu.php','chaine',0,'','2019-10-02 11:46:02'),(6847,'MAIN_MENU_SMARTPHONE',0,'eldy_menu.php','chaine',0,'','2019-10-02 11:46:02'),(6848,'MAIN_MENUFRONT_SMARTPHONE',0,'eldy_menu.php','chaine',0,'','2019-10-02 11:46:02'),(6851,'BECREATIVE_COL1',1,'#1e88e5','chaine',0,'','2019-10-02 11:47:10'),(6852,'BECREATIVE_COL2',1,'#1e88e5','chaine',0,'','2019-10-02 11:47:10'),(6853,'DOL_VERSION',1,'10.0.2','chaine',0,'Dolibarr version','2019-10-02 11:47:10'),(6859,'BECREATIVE_COL_BODY_BCKGRD',1,'#e6eaef','chaine',0,'','2019-10-02 11:47:10'),(6860,'BECREATIVE_COL_LOGO_BCKGRD',1,'#1e88e5','chaine',0,'','2019-10-02 11:47:10'),(6861,'BECREATIVE_COL_TXT_MENU',1,'#b8c6e5','chaine',0,'','2019-10-02 11:47:10'),(6862,'BECREATIVE_COL_HEADER_BCKGRD',1,'#26a69a','chaine',0,'','2019-10-02 11:47:10'),(6863,'BECREATIVE_CUSTOM_CSS',1,'0','yesno',0,'','2019-10-02 11:47:10'),(6864,'BECREATIVE_CUSTOM_JS',1,'0','yesno',0,'','2019-10-02 11:47:10'),(6865,'BECREATIVE_FIXED_MENU',1,'0','yesno',0,'','2019-10-02 11:47:10'),(6866,'BECREATIVE_D_HEADER_FONT_SIZE',1,'1.7rem','chaine',0,'','2019-10-02 11:47:10'),(6867,'BECREATIVE_S_HEADER_FONT_SIZE',1,'1.6rem','chaine',0,'','2019-10-02 11:47:10'),(6868,'BECREATIVE_D_VMENU_FONT_SIZE',1,'1.2rem','chaine',0,'','2019-10-02 11:47:10'),(6869,'BECREATIVE_S_VMENU_FONT_SIZE',1,'1.2rem','chaine',0,'','2019-10-02 11:47:10'),(6881,'MAIN_MENU_STANDARD',1,'eldy_menu.php','chaine',0,'','2019-10-02 11:48:49'),(6882,'MAIN_MENUFRONT_STANDARD',1,'eldy_menu.php','chaine',0,'','2019-10-02 11:48:49'),(6883,'MAIN_MENU_SMARTPHONE',1,'eldy_menu.php','chaine',0,'','2019-10-02 11:48:49'),(6884,'MAIN_MENUFRONT_SMARTPHONE',1,'eldy_menu.php','chaine',0,'','2019-10-02 11:48:49'),(6885,'ACCOUNTING_ACCOUNT_CUSTOMER',1,'411','chaine',0,'','2019-10-04 08:15:44'),(6886,'ACCOUNTING_ACCOUNT_SUPPLIER',1,'401','chaine',0,'','2019-10-04 08:15:44'),(6887,'SALARIES_ACCOUNTING_ACCOUNT_PAYMENT',1,'421','chaine',0,'','2019-10-04 08:15:44'),(6888,'ACCOUNTING_PRODUCT_BUY_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6889,'ACCOUNTING_PRODUCT_SOLD_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6890,'ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6891,'ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6892,'ACCOUNTING_SERVICE_BUY_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6893,'ACCOUNTING_SERVICE_SOLD_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6894,'ACCOUNTING_VAT_BUY_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6895,'ACCOUNTING_VAT_SOLD_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6896,'ACCOUNTING_VAT_PAY_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6897,'ACCOUNTING_ACCOUNT_SUSPENSE',1,'471','chaine',0,'','2019-10-04 08:15:44'),(6898,'ACCOUNTING_ACCOUNT_TRANSFER_CASH',1,'58','chaine',0,'','2019-10-04 08:15:44'),(6899,'DONATION_ACCOUNTINGACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6900,'ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6901,'LOAN_ACCOUNTING_ACCOUNT_CAPITAL',1,'164','chaine',0,'','2019-10-04 08:15:44'),(6902,'LOAN_ACCOUNTING_ACCOUNT_INTEREST',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6903,'LOAN_ACCOUNTING_ACCOUNT_INSURANCE',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6912,'TICKET_ENABLE_PUBLIC_INTERFACE',1,'1','chaine',0,'','2019-10-04 11:44:33'),(6934,'TICKET_NOTIFICATION_EMAIL_FROM',1,'fff','chaine',0,'','2019-10-04 12:03:51'),(6935,'TICKET_NOTIFICATION_EMAIL_TO',1,'ff','chaine',0,'','2019-10-04 12:03:51'),(6936,'TICKET_MESSAGE_MAIL_INTRO',1,'Hello,<br />\r\nA new response was sent on a ticket that you contact. Here is the message:<img alt=\"\" src=\"/dolibarr_10.0/htdocs/viewimage.php?modulepart=medias&amp;entity=1&amp;file=image/background_rough-horn.jpg\" style=\"height:1080px; width:1920px\" />','chaine',0,'','2019-10-04 12:03:51'),(6937,'TICKET_MESSAGE_MAIL_SIGNATURE',1,'<p>Sincerely,</p>\r\n\r\n<p>--<img alt=\"\" src=\"/dolibarr_10.0/htdocs/viewimage.php?modulepart=medias&amp;entity=1&amp;file=image/background_rough-horn.jpg\" style=\"height:1080px; width:1920px\" /></p>\r\n','chaine',0,'','2019-10-04 12:03:51'),(7027,'USER_PASSWORD_GENERATED',1,'Perso','chaine',0,'','2019-10-07 10:52:46'),(7028,'USER_PASSWORD_PATTERN',1,'12;1;0;1;0;1','chaine',0,'','2019-10-07 10:57:03'),(7034,'BOM_ADDON',1,'mod_bom_standard','chaine',0,'Name of numbering rules of BOM','2019-10-08 18:49:41'),(7035,'BOM_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/boms','chaine',0,NULL,'2019-10-08 18:49:41'),(7036,'MAIN_MODULE_GEOIPMAXMIND',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2019-10-08 18:51:54'),(7037,'MAIN_MODULE_DAV',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2019-10-08 18:54:07'),(7122,'BOM_ADDON_PDF',1,'generic_bom_odt','chaine',0,'','2019-11-28 14:00:58'),(7195,'MAIN_AGENDA_ACTIONAUTO_MO_VALIDATE',1,'1','chaine',0,'','2019-11-29 08:44:37'),(7196,'MAIN_AGENDA_ACTIONAUTO_MO_PRODUCED',1,'1','chaine',0,'','2019-11-29 08:44:37'),(7197,'MAIN_AGENDA_ACTIONAUTO_MO_DELETE',1,'1','chaine',0,'','2019-11-29 08:44:37'),(7198,'MAIN_AGENDA_ACTIONAUTO_MO_CANCEL',1,'1','chaine',0,'','2019-11-29 08:44:37'),(7201,'TICKET_PUBLIC_INTERFACE_TOPIC',1,'MyBigCompany public interface for Ticket','chaine',0,'','2019-11-29 08:49:36'),(7202,'TICKET_PUBLIC_TEXT_HOME',1,'You can create a support ticket or view existing from its identifier tracking ticket.','chaine',0,'','2019-11-29 08:49:36'),(7203,'TICKET_PUBLIC_TEXT_HELP_MESSAGE',1,'Please accurately describe the problem. Provide the most information possible to allow us to correctly identify your request.','chaine',0,'','2019-11-29 08:49:36'),(7204,'TICKET_MESSAGE_MAIL_NEW',1,'TicketMessageMailNewText','chaine',0,'','2019-11-29 08:49:36'),(7220,'MRP_MO_ADDON',1,'mod_mo_standard','chaine',0,'Name of numbering rules of MO','2019-11-29 08:57:42'),(7221,'MRP_MO_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/mrps','chaine',0,NULL,'2019-11-29 08:57:42'),(7222,'MRP_MO_ADDON_PDF',1,'generic_mo_odt','chaine',0,'','2019-11-29 08:57:47'),(7254,'MAIN_INFO_OPENINGHOURS_MONDAY',1,'8-12 13-18','chaine',0,'','2019-12-19 11:14:21'),(7255,'MAIN_INFO_OPENINGHOURS_TUESDAY',1,'8-12 13-18','chaine',0,'','2019-12-19 11:14:21'),(7256,'MAIN_INFO_OPENINGHOURS_WEDNESDAY',1,'8-13','chaine',0,'','2019-12-19 11:14:21'),(7257,'MAIN_INFO_OPENINGHOURS_THURSDAY',1,'8-12 13-18','chaine',0,'','2019-12-19 11:14:21'),(7258,'MAIN_INFO_OPENINGHOURS_FRIDAY',1,'8-12 13-18','chaine',0,'','2019-12-19 11:14:21'),(7264,'MAIN_INFO_ACCOUNTANT_NAME',1,'Bob Bookkeeper','chaine',0,'','2019-12-19 11:14:54'),(7265,'MAIN_INFO_ACCOUNTANT_TOWN',1,'Berlin','chaine',0,'','2019-12-19 11:14:54'),(7266,'MAIN_INFO_ACCOUNTANT_STATE',1,'0','chaine',0,'','2019-12-19 11:14:54'),(7267,'MAIN_INFO_ACCOUNTANT_COUNTRY',1,'5','chaine',0,'','2019-12-19 11:14:54'),(7268,'MAIN_INFO_ACCOUNTANT_MAIL',1,'mybookkeeper@example.com','chaine',0,'','2019-12-19 11:14:54'),(7313,'MODULEBUILDER_ASCIIDOCTOR',1,'asciidoctor','chaine',0,'','2019-12-20 10:57:21'),(7314,'MODULEBUILDER_ASCIIDOCTORPDF',1,'asciidoctor-pdf','chaine',0,'','2019-12-20 10:57:21'),(7337,'EXTERNAL_RSS_TITLE_1',1,'Dolibarr.org News','chaine',0,'','2019-12-20 12:10:38'),(7338,'EXTERNAL_RSS_URLRSS_1',1,'https://www.dolibarr.org/rss','chaine',0,'','2019-12-20 12:10:38'),(7339,'EXPENSEREPORT_ADDON',1,'mod_expensereport_jade','chaine',0,'','2019-12-20 16:33:46'),(7378,'COMPANY_USE_SEARCH_TO_SELECT',1,'0','chaine',0,'','2019-12-21 15:54:22'),(7420,'CASHDESK_SERVICES',1,'0','chaine',0,'','2019-12-23 12:15:06'),(7421,'TAKEPOS_ROOT_CATEGORY_ID',1,'31','chaine',0,'','2019-12-23 12:15:06'),(7422,'TAKEPOSCONNECTOR',1,'0','chaine',0,'','2019-12-23 12:15:06'),(7423,'TAKEPOS_BAR_RESTAURANT',1,'0','chaine',0,'','2019-12-23 12:15:06'),(7424,'TAKEPOS_TICKET_VAT_GROUPPED',1,'0','chaine',0,'','2019-12-23 12:15:06'),(7425,'TAKEPOS_AUTO_PRINT_TICKETS',1,'0','int',0,'','2019-12-23 12:15:06'),(7426,'TAKEPOS_NUMPAD',1,'0','chaine',0,'','2019-12-23 12:15:06'),(7427,'TAKEPOS_NUM_TERMINALS',1,'1','chaine',0,'','2019-12-23 12:15:06'),(7428,'TAKEPOS_DIRECT_PAYMENT',1,'0','int',0,'','2019-12-23 12:15:06'),(7429,'TAKEPOS_CUSTOM_RECEIPT',1,'0','int',0,'','2019-12-23 12:15:06'),(7430,'TAKEPOS_EMAIL_TEMPLATE_INVOICE',1,'-1','chaine',0,'','2019-12-23 12:15:06'),(7452,'MEMBER_ENABLE_PUBLIC',1,'1','chaine',0,'','2020-01-01 10:31:46'),(7453,'MEMBER_NEWFORM_AMOUNT',1,'20','chaine',0,'','2020-01-01 10:31:46'),(7454,'MEMBER_NEWFORM_EDITAMOUNT',1,'0','chaine',0,'','2020-01-01 10:31:46'),(7455,'MEMBER_NEWFORM_PAYONLINE',1,'all','chaine',0,'','2020-01-01 10:31:46'),(7456,'MEMBER_NEWFORM_FORCETYPE',1,'1','chaine',0,'','2020-01-01 10:31:46'),(7470,'STRIPE_TEST_PUBLISHABLE_KEY',1,'pk_test_123456789','chaine',0,'','2020-01-01 11:43:44'),(7471,'STRIPE_TEST_SECRET_KEY',1,'sk_test_123456','chaine',0,'','2020-01-01 11:43:44'),(7472,'STRIPE_BANK_ACCOUNT_FOR_PAYMENTS',1,'4','chaine',0,'','2020-01-01 11:43:44'),(7473,'STRIPE_USER_ACCOUNT_FOR_ACTIONS',1,'1','chaine',0,'','2020-01-01 11:43:44'),(7489,'CAPTURESERVER_SECURITY_KEY',1,'securitykey123','chaine',0,'','2020-01-01 12:00:49'),(8136,'MAIN_AGENDA_ACTIONAUTO_EXPENSE_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8190,'ACCOUNTING_PRODUCT_MODE',1,'ACCOUNTANCY_SELL_EXPORT','chaine',0,'','2020-01-06 01:23:30'),(8191,'MAIN_ENABLE_DEFAULT_VALUES',1,'1','chaine',0,'','2020-01-06 16:09:52'),(8210,'CABINETMED_RHEUMATOLOGY_ON',1,'0','texte',0,'','2020-01-06 16:51:43'),(8213,'MAIN_SEARCHFORM_SOCIETE',1,'1','texte',0,'','2020-01-06 16:51:43'),(8214,'CABINETMED_BANK_PATIENT_REQUIRED',1,'0','texte',0,'','2020-01-06 16:51:43'),(8215,'DIAGNOSTIC_IS_NOT_MANDATORY',1,'1','texte',0,'','2020-01-06 16:51:43'),(8216,'USER_ADDON_PDF_ODT',1,'generic_user_odt','chaine',0,'','2020-01-07 13:45:19'),(8217,'USERGROUP_ADDON_PDF_ODT',1,'generic_usergroup_odt','chaine',0,'','2020-01-07 13:45:23'),(8230,'MAIN_MODULE_EMAILCOLLECTOR',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2020-01-12 20:13:55'),(8232,'MAIN_MODULE_SUPPLIERPROPOSAL',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2020-01-13 14:37:09'),(8233,'MAIN_MODULE_EXPEDITION',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2020-01-13 14:38:20'),(8252,'SYSTEMTOOLS_MYSQLDUMP',1,'/usr/bin/mysqldump','chaine',0,'','2020-01-15 15:42:41'),(8259,'ACCOUNTING_REEXPORT',1,'1','yesno',0,'','2020-01-17 13:42:56'),(8291,'PRODUIT_MULTIPRICES_LIMIT',1,'5','chaine',0,'','2020-01-17 14:21:46'),(8293,'PRODUIT_CUSTOMER_PRICES_BY_QTY',1,'0','chaine',0,'','2020-01-17 14:21:46'),(8303,'PRODUCT_PRICE_UNIQ',1,'0','chaine',0,'','2020-01-17 14:25:30'),(8304,'PRODUIT_MULTIPRICES',1,'0','chaine',0,'','2020-01-17 14:25:30'),(8305,'PRODUIT_CUSTOMER_PRICES',1,'1','chaine',0,'','2020-01-17 14:25:30'),(8306,'PRODUIT_SOUSPRODUITS',1,'0','chaine',0,'','2020-01-17 14:25:30'),(8307,'PRODUIT_DESC_IN_FORM',1,'0','chaine',0,'','2020-01-17 14:25:30'),(8308,'PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE',1,'0','chaine',0,'','2020-01-17 14:25:30'),(8309,'PRODUIT_USE_SEARCH_TO_SELECT',1,'1','chaine',0,'','2020-01-17 14:25:30'),(8310,'PRODUIT_FOURN_TEXTS',1,'0','chaine',0,'','2020-01-17 14:25:30'),(8313,'MAIN_MODULE_FCKEDITOR',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2020-01-18 17:13:27'),(8314,'FCKEDITOR_ENABLE_TICKET',1,'1','chaine',0,'','2020-01-18 19:39:54'),(8321,'FCKEDITOR_SKIN',1,'moono-lisa','chaine',0,'','2020-01-18 19:41:15'),(8322,'FCKEDITOR_TEST',1,'Test &lt; aaa<br />\r\n<br />\r\n<img alt=\"\" src=\"/dolibarr_11.0/htdocs/viewimage.php?modulepart=medias&amp;entity=1&amp;file=image/background_coder.jpg\" style=\"height:1280px; width:1920px\" />','chaine',0,'','2020-01-18 19:41:15'),(8486,'MAIN_MULTILANGS',1,'1','chaine',0,'','2020-01-21 09:40:00'),(8491,'MAIN_DISABLE_JAVASCRIPT',1,'0','chaine',0,'','2020-01-21 09:40:00'),(8492,'MAIN_BUTTON_HIDE_UNAUTHORIZED',1,'0','chaine',0,'','2020-01-21 09:40:00'),(8496,'MAIN_SHOW_LOGO',1,'1','chaine',0,'','2020-01-21 09:40:00'),(8498,'MAIN_HELPCENTER_DISABLELINK',0,'0','chaine',0,'','2020-01-21 09:40:00'),(8501,'MAIN_BUGTRACK_ENABLELINK',1,'0','chaine',0,'','2020-01-21 09:40:00'),(8554,'MAIN_INFO_SOCIETE_FACEBOOK_URL',1,'dolibarr','chaine',0,'','2020-06-12 17:24:42'),(8555,'MAIN_INFO_SOCIETE_TWITTER_URL',1,'dolibarr','chaine',0,'','2020-06-12 17:24:42'),(8556,'MAIN_INFO_SOCIETE_LINKEDIN_URL',1,'https://www.linkedin.com/company/9400559/admin/','chaine',0,'','2020-06-12 17:24:42'),(8557,'MAIN_INFO_SOCIETE_INSTAGRAM_URL',1,'dolibarr','chaine',0,'','2020-06-12 17:24:42'),(8558,'MAIN_INFO_SOCIETE_YOUTUBE_URL',1,'DolibarrERPCRM','chaine',0,'','2020-06-12 17:24:42'),(8559,'MAIN_INFO_SOCIETE_GITHUB_URL',1,'dolibarr','chaine',0,'','2020-06-12 17:24:42'),(8577,'PRODUCT_PRICE_BASE_TYPE',0,'HT','string',0,NULL,'2020-12-10 12:24:38'),(8612,'MAIN_UPLOAD_DOC',1,'50000','chaine',0,'','2020-12-10 12:26:31'),(8613,'MAIN_UMASK',1,'0664','chaine',0,'','2020-12-10 12:26:31'),(8614,'MAIN_ANTIVIRUS_PARAM',1,'--fdpass','chaine',0,'','2020-12-10 12:26:31'),(8619,'WEBSITE_EDITINLINE',1,'0','chaine',0,'','2020-12-10 12:27:05'),(8620,'WEBSITE_SUBCONTAINERSINLINE',1,'1','chaine',0,'','2020-12-10 12:27:17'),(8633,'MAIN_MODULE_RECEPTION',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2020-12-10 12:30:13'),(8634,'RECEPTION_ADDON_PDF',1,'squille','chaine',0,'Nom du gestionnaire de generation des bons receptions en PDF','2020-12-10 12:30:13'),(8635,'RECEPTION_ADDON_NUMBER',1,'mod_reception_beryl','chaine',0,'Name for numbering manager for receptions','2020-12-10 12:30:13'),(8636,'RECEPTION_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/receptions','chaine',0,NULL,'2020-12-10 12:30:13'),(8637,'MAIN_SUBMODULE_RECEPTION',1,'1','chaine',0,'Enable receptions','2020-12-10 12:30:13'),(8638,'MAIN_MODULE_PAYMENTBYBANKTRANSFER',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2020-12-10 12:30:17'),(8640,'MAIN_MODULE_MARGIN_TABS_0',1,'product:+margin:Margins:margins:$user->rights->margins->liretous:/margin/tabs/productMargins.php?id=__ID__','chaine',0,NULL,'2020-12-10 12:30:20'),(8641,'MAIN_MODULE_MARGIN_TABS_1',1,'thirdparty:+margin:Margins:margins:empty($user->socid) && $user->rights->margins->liretous && ($object->client > 0):/margin/tabs/thirdpartyMargins.php?socid=__ID__','chaine',0,NULL,'2020-12-10 12:30:20'),(8643,'MAIN_MODULE_BLOCKEDLOG',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2020-12-10 12:31:17'),(8644,'MAIN_MODULE_INCOTERM',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2020-12-10 12:31:36'),(8645,'INCOTERM_ACTIVATE',1,'','chaine',0,'Description de INCOTERM_ACTIVATE','2020-12-10 12:31:36'),(8715,'SYSLOG_LEVEL',0,'5','chaine',0,'','2021-04-15 10:34:05'),(8716,'MAIN_SECURITY_HASH_ALGO',1,'password_hash','chaine',1,'','2021-04-15 10:38:33'),(8717,'MAIN_INFO_SOCIETE_COUNTRY',1,'117:IN:India','chaine',0,'','2021-04-15 10:46:30'),(8718,'MAIN_INFO_SOCIETE_NOM',1,'MyBigCompany','chaine',0,'','2021-04-15 10:46:30'),(8719,'MAIN_INFO_SOCIETE_ADDRESS',1,'21 Jump street.','chaine',0,'','2021-04-15 10:46:30'),(8720,'MAIN_INFO_SOCIETE_TOWN',1,'MyTown','chaine',0,'','2021-04-15 10:46:30'),(8721,'MAIN_INFO_SOCIETE_ZIP',1,'75500','chaine',0,'','2021-04-15 10:46:30'),(8722,'MAIN_MONNAIE',1,'EUR','chaine',0,'','2021-04-15 10:46:30'),(8723,'MAIN_INFO_SOCIETE_TEL',1,'09123123','chaine',0,'','2021-04-15 10:46:30'),(8724,'MAIN_INFO_SOCIETE_FAX',1,'09123124','chaine',0,'','2021-04-15 10:46:30'),(8725,'MAIN_INFO_SOCIETE_MAIL',1,'myemail@mybigcompany.com','chaine',0,'','2021-04-15 10:46:30'),(8726,'MAIN_INFO_SOCIETE_WEB',1,'https://www.dolibarr.org','chaine',0,'','2021-04-15 10:46:30'),(8727,'MAIN_INFO_SOCIETE_NOTE',1,'This is note about my company','chaine',0,'','2021-04-15 10:46:30'),(8728,'MAIN_INFO_SOCIETE_LOGO_SQUARRED',1,'mybigcompany_squarred.png','chaine',0,'','2021-04-15 10:46:30'),(8729,'MAIN_INFO_SOCIETE_LOGO_SQUARRED_SMALL',1,'mybigcompany_squarred_small.png','chaine',0,'','2021-04-15 10:46:30'),(8730,'MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI',1,'mybigcompany_squarred_mini.png','chaine',0,'','2021-04-15 10:46:30'),(8731,'MAIN_INFO_SOCIETE_MANAGERS',1,'Zack Zeceo','chaine',0,'','2021-04-15 10:46:30'),(8732,'MAIN_INFO_GDPR',1,'Zack Zeceo','chaine',0,'','2021-04-15 10:46:30'),(8733,'MAIN_INFO_CAPITAL',1,'10000','chaine',0,'','2021-04-15 10:46:30'),(8734,'MAIN_INFO_SOCIETE_FORME_JURIDIQUE',1,'0','chaine',0,'','2021-04-15 10:46:30'),(8735,'MAIN_INFO_SIREN',1,'123456','chaine',0,'','2021-04-15 10:46:30'),(8736,'MAIN_INFO_SIRET',1,'ABC-DEF','chaine',0,'','2021-04-15 10:46:30'),(8737,'MAIN_INFO_APE',1,'15E-45-8D','chaine',0,'','2021-04-15 10:46:30'),(8738,'MAIN_INFO_TVAINTRA',1,'FR12345678','chaine',0,'','2021-04-15 10:46:30'),(8739,'MAIN_INFO_SOCIETE_OBJECT',1,'A company demo to show how Dolibarr ERP CRM is wonderfull','chaine',0,'','2021-04-15 10:46:30'),(8740,'SOCIETE_FISCAL_MONTH_START',1,'4','chaine',0,'','2021-04-15 10:46:30'),(8741,'FACTURE_TVAOPTION',1,'1','chaine',0,'','2021-04-15 10:46:30'),(8742,'FACTURE_LOCAL_TAX1_OPTION',1,'localtax1on','chaine',0,'','2021-04-15 10:46:30'),(8743,'FACTURE_LOCAL_TAX2_OPTION',1,'localtax2on','chaine',0,'','2021-04-15 10:46:30'),(8744,'MAIN_INFO_VALUE_LOCALTAX1',1,'0','chaine',0,'','2021-04-15 10:46:30'),(8745,'MAIN_INFO_LOCALTAX_CALC1',1,'0','chaine',0,'','2021-04-15 10:46:30'),(8746,'MAIN_INFO_VALUE_LOCALTAX2',1,'0','chaine',0,'','2021-04-15 10:46:30'),(8747,'MAIN_INFO_LOCALTAX_CALC2',1,'0','chaine',0,'','2021-04-15 10:46:30'),(8759,'MAIN_LOGIN_BACKGROUND',1,'background_dolibarr.jpg','chaine',0,'','2021-04-15 10:54:37'),(8760,'MAIN_LANG_DEFAULT',1,'auto','chaine',0,'','2021-04-15 10:56:30'),(8761,'MAIN_IHM_PARAMS_REV',1,'13','chaine',0,'','2021-04-15 10:56:30'),(8762,'MAIN_THEME',1,'eldy','chaine',0,'','2021-04-15 10:56:30'),(8763,'THEME_ELDY_USE_HOVER',1,'237,244,251','chaine',0,'','2021-04-15 10:56:30'),(8764,'MAIN_SIZE_LISTE_LIMIT',1,'25','chaine',0,'','2021-04-15 10:56:30'),(8765,'MAIN_SIZE_SHORTLIST_LIMIT',1,'3','chaine',0,'','2021-04-15 10:56:30'),(8766,'MAIN_START_WEEK',1,'1','chaine',0,'','2021-04-15 10:56:30'),(8767,'MAIN_DEFAULT_WORKING_DAYS',1,'1-5','chaine',0,'','2021-04-15 10:56:30'),(8768,'MAIN_DEFAULT_WORKING_HOURS',1,'9-18','chaine',0,'','2021-04-15 10:56:30'),(8769,'MAIN_FIRSTNAME_NAME_POSITION',1,'0','chaine',0,'','2021-04-15 10:56:30'),(8770,'MAIN_HOME',1,'__(NoteSomeFeaturesAreDisabled)__<br />\r\n__(SomeTranslationAreUncomplete)__','chaine',0,'','2021-04-15 10:56:30'),(8771,'MAIN_FEATURES_LEVEL',0,'0','chaine',1,'Level of features to show (0=stable only, 1=stable+experimental, 2=stable+experimental+development','2021-04-15 11:46:30'),(8775,'MAIN_AGENDA_ACTIONAUTO_COMPANY_SENTBYMAIL',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8776,'MAIN_AGENDA_ACTIONAUTO_COMPANY_CREATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8777,'MAIN_AGENDA_ACTIONAUTO_COMPANY_DELETE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8778,'MAIN_AGENDA_ACTIONAUTO_PROPAL_CLOSE_REFUSED',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8779,'MAIN_AGENDA_ACTIONAUTO_PROPAL_CLASSIFY_BILLED',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8780,'MAIN_AGENDA_ACTIONAUTO_PROPAL_DELETE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8781,'MAIN_AGENDA_ACTIONAUTO_PROPAL_VALIDATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8782,'MAIN_AGENDA_ACTIONAUTO_PROPAL_CLOSE_SIGNED',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8783,'MAIN_AGENDA_ACTIONAUTO_PROPAL_SENTBYMAIL',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8784,'MAIN_AGENDA_ACTIONAUTO_ORDER_VALIDATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8785,'MAIN_AGENDA_ACTIONAUTO_ORDER_DELETE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8786,'MAIN_AGENDA_ACTIONAUTO_ORDER_SENTBYMAIL',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8787,'MAIN_AGENDA_ACTIONAUTO_ORDER_CANCEL',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8788,'MAIN_AGENDA_ACTIONAUTO_ORDER_CLASSIFY_BILLED',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8789,'MAIN_AGENDA_ACTIONAUTO_ORDER_CLOSE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8790,'MAIN_AGENDA_ACTIONAUTO_BILL_VALIDATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8791,'MAIN_AGENDA_ACTIONAUTO_BILL_PAYED',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8792,'MAIN_AGENDA_ACTIONAUTO_BILL_CANCEL',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8793,'MAIN_AGENDA_ACTIONAUTO_BILL_DELETE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8794,'MAIN_AGENDA_ACTIONAUTO_BILL_SENTBYMAIL',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8795,'MAIN_AGENDA_ACTIONAUTO_PROPOSAL_SUPPLIER_DELETE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8796,'MAIN_AGENDA_ACTIONAUTO_PROPOSAL_SUPPLIER_VALIDATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8797,'MAIN_AGENDA_ACTIONAUTO_PROPOSAL_SUPPLIER_SENTBYMAIL',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8798,'MAIN_AGENDA_ACTIONAUTO_PROPOSAL_SUPPLIER_CLOSE_SIGNED',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8799,'MAIN_AGENDA_ACTIONAUTO_PROPOSAL_SUPPLIER_CLOSE_REFUSED',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8800,'MAIN_AGENDA_ACTIONAUTO_BILL_UNVALIDATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8801,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_CREATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8802,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_VALIDATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8803,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_APPROVE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8804,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_RECEIVE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8805,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_SUBMIT',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8806,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_REFUSE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8807,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_CLASSIFY_BILLED',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8808,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_SENTBYMAIL',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8809,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_DELETE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8810,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_VALIDATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8811,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_UNVALIDATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8812,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_PAYED',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8813,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_SENTBYMAIL',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8814,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_CANCELED',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8815,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_DELETE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8816,'MAIN_AGENDA_ACTIONAUTO_CONTRACT_DELETE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8817,'MAIN_AGENDA_ACTIONAUTO_CONTRACT_SENTBYMAIL',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8818,'MAIN_AGENDA_ACTIONAUTO_CONTRACT_VALIDATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8819,'MAIN_AGENDA_ACTIONAUTO_FICHINTER_SENTBYMAIL',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8820,'MAIN_AGENDA_ACTIONAUTO_FICHINTER_VALIDATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8821,'MAIN_AGENDA_ACTIONAUTO_FICHINTER_REOPEN',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8822,'MAIN_AGENDA_ACTIONAUTO_SHIPPING_VALIDATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8823,'MAIN_AGENDA_ACTIONAUTO_SHIPPING_SENTBYMAIL',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8824,'MAIN_AGENDA_ACTIONAUTO_MEMBER_VALIDATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8825,'MAIN_AGENDA_ACTIONAUTO_MEMBER_SENTBYMAIL',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8826,'MAIN_AGENDA_ACTIONAUTO_MEMBER_SUBSCRIPTION_CREATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8827,'MAIN_AGENDA_ACTIONAUTO_MEMBER_RESILIATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8828,'MAIN_AGENDA_ACTIONAUTO_MEMBER_MODIFY',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8829,'MAIN_AGENDA_ACTIONAUTO_MEMBER_SUBSCRIPTION_MODIFY',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8830,'MAIN_AGENDA_ACTIONAUTO_MEMBER_SUBSCRIPTION_DELETE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8831,'MAIN_AGENDA_ACTIONAUTO_MEMBER_DELETE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8832,'MAIN_AGENDA_ACTIONAUTO_PRODUCT_DELETE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8833,'MAIN_AGENDA_ACTIONAUTO_PRODUCT_CREATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8834,'MAIN_AGENDA_ACTIONAUTO_PRODUCT_MODIFY',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8835,'MAIN_AGENDA_ACTIONAUTO_TASK_CREATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8836,'MAIN_AGENDA_ACTIONAUTO_FICHINTER_DELETE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8837,'MAIN_AGENDA_ACTIONAUTO_TASK_MODIFY',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8838,'MAIN_AGENDA_ACTIONAUTO_TASK_DELETE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8839,'MAIN_AGENDA_ACTIONAUTO_CONTACT_CREATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8840,'MAIN_AGENDA_ACTIONAUTO_CONTACT_SENTBYMAIL',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8841,'MAIN_AGENDA_ACTIONAUTO_CONTACT_DELETE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8842,'MAIN_AGENDA_ACTIONAUTO_PROJECT_CREATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8843,'MAIN_AGENDA_ACTIONAUTO_PROJECT_MODIFY',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8844,'MAIN_AGENDA_ACTIONAUTO_PROJECT_DELETE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8845,'MAIN_AGENDA_ACTIONAUTO_TICKET_CREATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8846,'MAIN_AGENDA_ACTIONAUTO_TICKET_MODIFY',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8847,'MAIN_AGENDA_ACTIONAUTO_TICKET_ASSIGNED',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8848,'MAIN_AGENDA_ACTIONAUTO_TICKET_CLOSE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8849,'MAIN_AGENDA_ACTIONAUTO_TICKET_SENTBYMAIL',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8850,'MAIN_AGENDA_ACTIONAUTO_TICKET_DELETE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8851,'MAIN_AGENDA_ACTIONAUTO_EXPENSE_REPORT_CREATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8852,'MAIN_AGENDA_ACTIONAUTO_EXPENSE_REPORT_VALIDATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8853,'MAIN_AGENDA_ACTIONAUTO_EXPENSE_REPORT_APPROVE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8854,'MAIN_AGENDA_ACTIONAUTO_EXPENSE_REPORT_DELETE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8855,'MAIN_AGENDA_ACTIONAUTO_EXPENSE_REPORT_PAID',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8856,'MAIN_AGENDA_ACTIONAUTO_HOLIDAY_CREATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8857,'MAIN_AGENDA_ACTIONAUTO_HOLIDAY_VALIDATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8858,'MAIN_AGENDA_ACTIONAUTO_HOLIDAY_APPROVE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8859,'MAIN_AGENDA_ACTIONAUTO_USER_SENTBYMAIL',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8860,'MAIN_AGENDA_ACTIONAUTO_BOM_VALIDATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8861,'MAIN_AGENDA_ACTIONAUTO_BOM_UNVALIDATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8862,'MAIN_AGENDA_ACTIONAUTO_BOM_CLOSE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8863,'MAIN_AGENDA_ACTIONAUTO_BOM_REOPEN',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8864,'MAIN_AGENDA_ACTIONAUTO_BOM_DELETE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8865,'MAIN_AGENDA_ACTIONAUTO_MRP_MO_VALIDATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8866,'MAIN_AGENDA_ACTIONAUTO_MRP_MO_PRODUCED',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8867,'MAIN_AGENDA_ACTIONAUTO_MRP_MO_DELETE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8868,'MAIN_AGENDA_ACTIONAUTO_MRP_MO_CANCEL',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8869,'MAIN_AGENDA_ACTIONAUTO_RECRUITMENTJOBPOSITION_CREATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8870,'MAIN_AGENDA_ACTIONAUTO_RECRUITMENTJOBPOSITION_MODIFY',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8871,'MAIN_AGENDA_ACTIONAUTO_RECRUITMENTJOBPOSITION_SENTBYMAIL',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8872,'MAIN_AGENDA_ACTIONAUTO_RECRUITMENTJOBPOSITION_DELETE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8873,'MAIN_AGENDA_ACTIONAUTO_RECRUITMENTCANDIDATURE_CREATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8874,'MAIN_AGENDA_ACTIONAUTO_RECRUITMENTCANDIDATURE_MODIFY',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8875,'MAIN_AGENDA_ACTIONAUTO_RECRUITMENTCANDIDATURE_SENTBYMAIL',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8876,'MAIN_AGENDA_ACTIONAUTO_RECRUITMENTCANDIDATURE_DELETE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8877,'AGENDA_REMINDER_BROWSER',1,'1','chaine',0,'','2021-04-15 13:32:29'),(8878,'MAIN_MODULE_ACCOUNTING',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-07-11 17:49:45'),(8879,'MAIN_MODULE_AGENDA',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-07-11 17:49:45'),(8880,'MAIN_MODULE_BOM',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-07-11 17:49:46'),(8881,'MAIN_MODULE_BANQUE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-07-11 17:49:46'),(8882,'MAIN_MODULE_BARCODE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-07-11 17:49:46'),(8883,'MAIN_MODULE_CRON',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-07-11 17:49:46'),(8884,'MAIN_MODULE_COMMANDE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-07-11 17:49:46'),(8885,'MAIN_MODULE_DON',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-07-11 17:49:46'),(8886,'MAIN_MODULE_ECM',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-07-11 17:49:46'),(8887,'MAIN_MODULE_EXPENSEREPORT',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-07-11 17:49:46'),(8888,'MAIN_MODULE_FACTURE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-07-11 17:49:46'),(8889,'MAIN_MODULE_FOURNISSEUR',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-07-11 17:49:46'),(8890,'MAIN_MODULE_HOLIDAY',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-07-11 17:49:46'),(8891,'MAIN_MODULE_MARGIN',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-07-11 17:49:47'),(8894,'MAIN_MODULE_MRP',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-07-11 17:49:47'),(8895,'MAIN_MODULE_MRP_TRIGGERS',1,'0','chaine',0,NULL,'2021-07-11 17:49:47'),(8896,'MAIN_MODULE_MRP_LOGIN',1,'0','chaine',0,NULL,'2021-07-11 17:49:47'),(8897,'MAIN_MODULE_MRP_SUBSTITUTIONS',1,'0','chaine',0,NULL,'2021-07-11 17:49:47'),(8898,'MAIN_MODULE_MRP_MENUS',1,'0','chaine',0,NULL,'2021-07-11 17:49:47'),(8899,'MAIN_MODULE_MRP_TPL',1,'0','chaine',0,NULL,'2021-07-11 17:49:47'),(8900,'MAIN_MODULE_MRP_BARCODE',1,'0','chaine',0,NULL,'2021-07-11 17:49:47'),(8901,'MAIN_MODULE_MRP_MODELS',1,'0','chaine',0,NULL,'2021-07-11 17:49:47'),(8902,'MAIN_MODULE_MRP_THEME',1,'0','chaine',0,NULL,'2021-07-11 17:49:47'),(8903,'MAIN_MODULE_MRP_MODULEFOREXTERNAL',1,'0','chaine',0,NULL,'2021-07-11 17:49:47'),(8904,'MAIN_MODULE_OPENSURVEY',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-07-11 17:49:47'),(8905,'MAIN_MODULE_PRINTING',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-07-11 17:49:47'),(8906,'MAIN_MODULE_RECRUITMENT',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-07-11 17:49:47'),(8907,'MAIN_MODULE_RECRUITMENT_TRIGGERS',1,'0','chaine',0,NULL,'2021-07-11 17:49:47'),(8908,'MAIN_MODULE_RECRUITMENT_LOGIN',1,'0','chaine',0,NULL,'2021-07-11 17:49:47'),(8909,'MAIN_MODULE_RECRUITMENT_SUBSTITUTIONS',1,'0','chaine',0,NULL,'2021-07-11 17:49:47'),(8910,'MAIN_MODULE_RECRUITMENT_MENUS',1,'0','chaine',0,NULL,'2021-07-11 17:49:47'),(8911,'MAIN_MODULE_RECRUITMENT_TPL',1,'0','chaine',0,NULL,'2021-07-11 17:49:47'),(8912,'MAIN_MODULE_RECRUITMENT_BARCODE',1,'0','chaine',0,NULL,'2021-07-11 17:49:47'),(8913,'MAIN_MODULE_RECRUITMENT_MODELS',1,'1','chaine',0,NULL,'2021-07-11 17:49:47'),(8914,'MAIN_MODULE_RECRUITMENT_THEME',1,'0','chaine',0,NULL,'2021-07-11 17:49:47'),(8915,'MAIN_MODULE_RECRUITMENT_MODULEFOREXTERNAL',1,'0','chaine',0,NULL,'2021-07-11 17:49:47'),(8916,'MAIN_MODULE_RESOURCE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-07-11 17:49:47'),(8917,'MAIN_MODULE_SALARIES',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-07-11 17:49:47'),(8918,'MAIN_MODULE_SERVICE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-07-11 17:49:47'),(8919,'MAIN_MODULE_SYSLOG',0,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-07-11 17:49:47'),(8920,'MAIN_MODULE_SOCIETE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-07-11 17:49:47'),(8921,'MAIN_MODULE_STRIPE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-07-11 17:49:47'),(8922,'MAIN_MODULE_TICKET',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-07-11 17:49:47'),(8923,'MAIN_MODULE_TICKET_TABS_0',1,'thirdparty:+ticket:Tickets:@ticket:$user->rights->ticket->read:/ticket/list.php?socid=__ID__','chaine',0,NULL,'2021-07-11 17:49:47'),(8924,'MAIN_MODULE_TICKET_TABS_1',1,'project:+ticket:Tickets:@ticket:$user->rights->ticket->read:/ticket/list.php?projectid=__ID__','chaine',0,NULL,'2021-07-11 17:49:47'),(8925,'MAIN_MODULE_TICKET_TRIGGERS',1,'1','chaine',0,NULL,'2021-07-11 17:49:47'),(8926,'TAKEPOS_PRINT_METHOD',1,'browser','chaine',0,'','2021-07-11 17:49:47'),(8927,'MAIN_MODULE_TAKEPOS',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-07-11 17:49:48'),(8928,'MAIN_MODULE_TAKEPOS_TRIGGERS',1,'0','chaine',0,NULL,'2021-07-11 17:49:48'),(8929,'MAIN_MODULE_TAKEPOS_LOGIN',1,'0','chaine',0,NULL,'2021-07-11 17:49:48'),(8930,'MAIN_MODULE_TAKEPOS_SUBSTITUTIONS',1,'1','chaine',0,NULL,'2021-07-11 17:49:48'),(8931,'MAIN_MODULE_TAKEPOS_MENUS',1,'0','chaine',0,NULL,'2021-07-11 17:49:48'),(8932,'MAIN_MODULE_TAKEPOS_THEME',1,'0','chaine',0,NULL,'2021-07-11 17:49:48'),(8933,'MAIN_MODULE_TAKEPOS_TPL',1,'0','chaine',0,NULL,'2021-07-11 17:49:48'),(8934,'MAIN_MODULE_TAKEPOS_BARCODE',1,'0','chaine',0,NULL,'2021-07-11 17:49:48'),(8935,'MAIN_MODULE_TAKEPOS_MODELS',1,'0','chaine',0,NULL,'2021-07-11 17:49:48'),(8936,'MAIN_MODULE_USER',0,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-07-11 17:49:48'),(8937,'MAIN_MODULE_VARIANTS',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-07-11 17:49:48'),(8938,'MAIN_MODULE_WEBSITE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-07-11 17:49:48'),(8939,'MAIN_VERSION_LAST_UPGRADE',0,'14.0.0','chaine',0,'Dolibarr version for last upgrade','2021-07-11 17:49:49'),(8941,'MAIN_FIRST_PING_OK_DATE',1,'20210711174950','chaine',0,'','2021-07-11 17:49:50'),(8942,'MAIN_FIRST_PING_OK_ID',1,'9646d6c55a34bca208868c98dac4678b','chaine',0,'','2021-07-11 17:49:50');
 /*!40000 ALTER TABLE `llx_const` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -4512,7 +4930,7 @@ CREATE TABLE `llx_cronjob` (
   `test` varchar(255) COLLATE utf8_unicode_ci DEFAULT '1',
   `processing` int(11) NOT NULL DEFAULT 0,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=48 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=49 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -4521,7 +4939,7 @@ CREATE TABLE `llx_cronjob` (
 
 LOCK TABLES `llx_cronjob` WRITE;
 /*!40000 ALTER TABLE `llx_cronjob` DISABLE KEYS */;
-INSERT INTO `llx_cronjob` VALUES (1,'2015-03-23 18:18:39','2015-03-23 19:18:39','command','aaa','aaaa','','','','','','',0,NULL,NULL,'2015-03-23 19:18:00',NULL,NULL,NULL,NULL,'3600',3600,0,0,1,1,'',NULL,0,0,0,NULL,'1',0),(40,'2018-11-23 11:58:15','2018-11-23 12:58:15','method','SendEmailsReminders',NULL,'comm/action/class/actioncomm.class.php','ActionComm','sendEmailsReminder',NULL,NULL,'agenda',10,NULL,NULL,'2018-11-23 12:58:15',NULL,NULL,NULL,NULL,'60',10,NULL,1,NULL,NULL,'SendEMailsReminder',NULL,1,0,0,NULL,'$conf->agenda->enabled',0),(41,'2018-11-23 11:58:16','2018-11-23 12:58:16','method','PurgeDeleteTemporaryFilesShort',NULL,'core/class/utils.class.php','Utils','purgeFiles',NULL,NULL,'cron',50,NULL,NULL,'2018-11-23 12:58:16',NULL,NULL,NULL,NULL,'604800',2,NULL,1,NULL,NULL,'PurgeDeleteTemporaryFiles',NULL,0,0,0,NULL,'1',0),(42,'2020-01-15 15:43:12','2018-11-23 12:58:16','method','MakeLocalDatabaseDumpShort',NULL,'core/class/utils.class.php','Utils','dumpDatabase','none,auto,1,auto,10',NULL,'cron',90,'2020-01-15 19:43:12','2020-01-17 12:58:16','2018-11-23 12:58:16',NULL,'2020-01-15 19:43:12','-1','Failed to run external command. Check it is available and runnable by your PHP server. If PHP <b>Safe Mode</b> is enabled, check that command is inside a directory defined by parameter <b>safe_mode_exec_dir</b>.\nFailed to run external command. Check it is available and runnable by your PHP server. If PHP <b>Safe Mode</b> is enabled, check that command is inside a directory defined by parameter <b>safe_mode_exec_dir</b>.','604800',1,2,1,NULL,12,'MakeLocalDatabaseDump',NULL,0,0,0,NULL,'1',0),(43,'2018-11-23 11:58:17','2018-11-23 12:58:17','method','RecurringInvoices',NULL,'compta/facture/class/facture-rec.class.php','FactureRec','createRecurringInvoices',NULL,NULL,'facture',50,NULL,NULL,'2018-11-23 23:00:00',NULL,NULL,NULL,NULL,'86400',1,NULL,1,NULL,NULL,'Generate recurring invoices',NULL,1,0,0,NULL,'$conf->facture->enabled',0),(45,'2020-01-01 12:00:34','2020-01-01 16:00:34','method','MyJob label',NULL,'/captureserver/class/myobject.class.php','MyObject','doScheduledJob',NULL,NULL,'captureserver',0,NULL,NULL,'2020-01-01 16:00:34',NULL,NULL,NULL,NULL,'3600',2,NULL,0,NULL,NULL,'Comment',NULL,1,0,0,NULL,'$conf->captureserver->enabled',0),(46,'2020-01-12 20:13:55','2020-01-13 00:13:55','method','Email collector',NULL,'/emailcollector/class/emailcollector.class.php','EmailCollector','doCollect',NULL,NULL,'emailcollector',50,NULL,NULL,'2020-01-13 00:13:55',NULL,NULL,NULL,NULL,'60',5,NULL,1,NULL,NULL,'Comment',NULL,1,0,0,NULL,'$conf->emailcollector->enabled',0),(47,'2021-04-15 10:34:00','2021-04-15 07:34:00','method','CompressSyslogs',NULL,'core/class/utils.class.php','Utils','compressSyslogs',NULL,NULL,'syslog',50,NULL,NULL,'2021-04-15 07:34:00',NULL,NULL,NULL,NULL,'86400',1,NULL,0,NULL,NULL,'Compress and archive log files. The number of versions to keep is defined into the setup of module. Warning: Main application cron script must be run with same account than your web server to avoid to get log files with different owner than required by web server. Another solution is to set web server Operating System group as the group of directory documents and set GROUP permission \"rws\" on this directory so log files will always have the group and permissions of the web server Operating System group.',NULL,1,0,0,NULL,'1',0);
+INSERT INTO `llx_cronjob` VALUES (1,'2015-03-23 18:18:39','2015-03-23 19:18:39','command','aaa','aaaa','','','','','','',0,NULL,NULL,'2015-03-23 19:18:00',NULL,NULL,NULL,NULL,'3600',3600,0,0,1,1,'',NULL,0,0,0,NULL,'1',0),(40,'2018-11-23 11:58:15','2018-11-23 12:58:15','method','SendEmailsReminders',NULL,'comm/action/class/actioncomm.class.php','ActionComm','sendEmailsReminder',NULL,NULL,'agenda',10,NULL,NULL,'2018-11-23 12:58:15',NULL,NULL,NULL,NULL,'60',10,NULL,1,NULL,NULL,'SendEMailsReminder',NULL,1,0,0,NULL,'$conf->agenda->enabled',0),(41,'2018-11-23 11:58:16','2018-11-23 12:58:16','method','PurgeDeleteTemporaryFilesShort',NULL,'core/class/utils.class.php','Utils','purgeFiles',NULL,NULL,'cron',50,NULL,NULL,'2018-11-23 12:58:16',NULL,NULL,NULL,NULL,'604800',2,NULL,1,NULL,NULL,'PurgeDeleteTemporaryFiles',NULL,0,0,0,NULL,'1',0),(42,'2020-01-15 15:43:12','2018-11-23 12:58:16','method','MakeLocalDatabaseDumpShort',NULL,'core/class/utils.class.php','Utils','dumpDatabase','none,auto,1,auto,10',NULL,'cron',90,'2020-01-15 19:43:12','2020-01-17 12:58:16','2018-11-23 12:58:16',NULL,'2020-01-15 19:43:12','-1','Failed to run external command. Check it is available and runnable by your PHP server. If PHP <b>Safe Mode</b> is enabled, check that command is inside a directory defined by parameter <b>safe_mode_exec_dir</b>.\nFailed to run external command. Check it is available and runnable by your PHP server. If PHP <b>Safe Mode</b> is enabled, check that command is inside a directory defined by parameter <b>safe_mode_exec_dir</b>.','604800',1,2,1,NULL,12,'MakeLocalDatabaseDump',NULL,0,0,0,NULL,'1',0),(43,'2018-11-23 11:58:17','2018-11-23 12:58:17','method','RecurringInvoices',NULL,'compta/facture/class/facture-rec.class.php','FactureRec','createRecurringInvoices',NULL,NULL,'facture',50,NULL,NULL,'2018-11-23 23:00:00',NULL,NULL,NULL,NULL,'86400',1,NULL,1,NULL,NULL,'Generate recurring invoices',NULL,1,0,0,NULL,'$conf->facture->enabled',0),(45,'2020-01-01 12:00:34','2020-01-01 16:00:34','method','MyJob label',NULL,'/captureserver/class/myobject.class.php','MyObject','doScheduledJob',NULL,NULL,'captureserver',0,NULL,NULL,'2020-01-01 16:00:34',NULL,NULL,NULL,NULL,'3600',2,NULL,0,NULL,NULL,'Comment',NULL,1,0,0,NULL,'$conf->captureserver->enabled',0),(46,'2020-01-12 20:13:55','2020-01-13 00:13:55','method','Email collector',NULL,'/emailcollector/class/emailcollector.class.php','EmailCollector','doCollect',NULL,NULL,'emailcollector',50,NULL,NULL,'2020-01-13 00:13:55',NULL,NULL,NULL,NULL,'60',5,NULL,1,NULL,NULL,'Comment',NULL,1,0,0,NULL,'$conf->emailcollector->enabled',0),(47,'2021-04-15 10:34:00','2021-04-15 07:34:00','method','CompressSyslogs',NULL,'core/class/utils.class.php','Utils','compressSyslogs',NULL,NULL,'syslog',50,NULL,NULL,'2021-04-15 07:34:00',NULL,NULL,NULL,NULL,'86400',1,NULL,0,NULL,NULL,'Compress and archive log files. The number of versions to keep is defined into the setup of module. Warning: Main application cron script must be run with same account than your web server to avoid to get log files with different owner than required by web server. Another solution is to set web server Operating System group as the group of directory documents and set GROUP permission \"rws\" on this directory so log files will always have the group and permissions of the web server Operating System group.',NULL,1,0,0,NULL,'1',0),(48,'2021-07-11 17:49:46','2021-07-11 19:49:46','method','SendEmailsRemindersOnInvoiceDueDate',NULL,'compta/facture/class/facture.class.php','Facture','sendEmailsRemindersOnInvoiceDueDate','10,all,EmailTemplateCode',NULL,'facture',50,NULL,NULL,'2021-07-11 23:00:00',NULL,NULL,NULL,NULL,'86400',1,NULL,0,NULL,NULL,'Send an emails when the unpaid invoices reach a due date + n days = today. First param is the offset n of days, second parameter is \"all\" or a payment mode code, last paramater is the code of email template to use (an email template with EmailTemplateCode must exists. the version in the language of the thirdparty will be used in priority).',NULL,1,0,0,NULL,'$conf->facture->enabled',0);
 /*!40000 ALTER TABLE `llx_cronjob` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -4747,7 +5165,7 @@ CREATE TABLE `llx_document_model` (
   `description` text COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_document_model` (`nom`,`type`,`entity`)
-) ENGINE=InnoDB AUTO_INCREMENT=402 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=410 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -4756,7 +5174,7 @@ CREATE TABLE `llx_document_model` (
 
 LOCK TABLES `llx_document_model` WRITE;
 /*!40000 ALTER TABLE `llx_document_model` DISABLE KEYS */;
-INSERT INTO `llx_document_model` VALUES (9,'merou',1,'shipping',NULL,NULL),(181,'generic_invoice_odt',1,'invoice','ODT templates','FACTURE_ADDON_PDF_ODT_PATH'),(193,'canelle2',1,'invoice_supplier','canelle2',NULL),(195,'canelle',1,'invoice_supplier','canelle',NULL),(198,'azur',2,'propal',NULL,NULL),(199,'html_cerfafr',2,'donation',NULL,NULL),(200,'crabe',2,'invoice',NULL,NULL),(201,'generic_odt',1,'company','ODT templates','COMPANY_ADDON_PDF_ODT_PATH'),(250,'baleine',1,'project',NULL,NULL),(255,'soleil',1,'ficheinter',NULL,NULL),(256,'azur',1,'propal',NULL,NULL),(273,'beluga',1,'project','beluga',NULL),(281,'sepamandate',1,'bankaccount','sepamandate',NULL),(299,'standard',1,'member',NULL,NULL),(319,'generic_bom_odt',1,'bom','ODT templates','BOM_ADDON_PDF_ODT_PATH'),(320,'generic_mo_odt',1,'mrp','ODT templates','MRP_MO_ADDON_PDF_ODT_PATH'),(366,'generic_user_odt',1,'user',NULL,NULL),(367,'generic_usergroup_odt',1,'group',NULL,NULL),(370,'aurore',1,'supplier_proposal',NULL,NULL),(371,'rouget',1,'shipping',NULL,NULL),(372,'typhon',1,'delivery',NULL,NULL),(393,'squille',1,'reception',NULL,NULL),(394,'einstein',1,'order',NULL,NULL),(395,'html_cerfafr',1,'donation',NULL,NULL),(396,'standard',1,'expensereport',NULL,NULL),(397,'crabe',1,'invoice',NULL,NULL),(398,'muscadet',1,'order_supplier',NULL,NULL),(399,'standard_recruitmentjobposition',1,'recruitmentjobposition',NULL,NULL),(400,'generic_recruitmentjobposition_odt',1,'recruitmentjobposition',NULL,NULL),(401,'TICKET_ADDON_PDF_ODT_PATH',1,'ticket',NULL,NULL);
+INSERT INTO `llx_document_model` VALUES (9,'merou',1,'shipping',NULL,NULL),(181,'generic_invoice_odt',1,'invoice','ODT templates','FACTURE_ADDON_PDF_ODT_PATH'),(193,'canelle2',1,'invoice_supplier','canelle2',NULL),(195,'canelle',1,'invoice_supplier','canelle',NULL),(198,'azur',2,'propal',NULL,NULL),(199,'html_cerfafr',2,'donation',NULL,NULL),(200,'crabe',2,'invoice',NULL,NULL),(201,'generic_odt',1,'company','ODT templates','COMPANY_ADDON_PDF_ODT_PATH'),(250,'baleine',1,'project',NULL,NULL),(255,'soleil',1,'ficheinter',NULL,NULL),(256,'azur',1,'propal',NULL,NULL),(273,'beluga',1,'project','beluga',NULL),(281,'sepamandate',1,'bankaccount','sepamandate',NULL),(299,'standard',1,'member',NULL,NULL),(319,'generic_bom_odt',1,'bom','ODT templates','BOM_ADDON_PDF_ODT_PATH'),(320,'generic_mo_odt',1,'mrp','ODT templates','MRP_MO_ADDON_PDF_ODT_PATH'),(366,'generic_user_odt',1,'user',NULL,NULL),(367,'generic_usergroup_odt',1,'group',NULL,NULL),(370,'aurore',1,'supplier_proposal',NULL,NULL),(371,'rouget',1,'shipping',NULL,NULL),(372,'typhon',1,'delivery',NULL,NULL),(393,'squille',1,'reception',NULL,NULL),(402,'einstein',1,'order',NULL,NULL),(403,'html_cerfafr',1,'donation',NULL,NULL),(404,'standard',1,'expensereport',NULL,NULL),(405,'crabe',1,'invoice',NULL,NULL),(406,'muscadet',1,'order_supplier',NULL,NULL),(407,'standard_recruitmentjobposition',1,'recruitmentjobposition',NULL,NULL),(408,'generic_recruitmentjobposition_odt',1,'recruitmentjobposition',NULL,NULL),(409,'TICKET_ADDON_PDF_ODT_PATH',1,'ticket',NULL,NULL);
 /*!40000 ALTER TABLE `llx_document_model` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -4894,10 +5312,10 @@ CREATE TABLE `llx_ecm_directories_extrafields` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `fk_object` int(11) NOT NULL,
-  `import_key` varchar(14) DEFAULT NULL,
+  `import_key` varchar(14) CHARACTER SET utf8mb4 DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_ecm_directories_extrafields` (`fk_object`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -4968,10 +5386,10 @@ CREATE TABLE `llx_ecm_files_extrafields` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `fk_object` int(11) NOT NULL,
-  `import_key` varchar(14) DEFAULT NULL,
+  `import_key` varchar(14) CHARACTER SET utf8mb4 DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_ecm_files_extrafields` (`fk_object`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -5204,70 +5622,6 @@ INSERT INTO `llx_emailcollector_emailcollectorfilter` VALUES (21,3,'withouttrack
 /*!40000 ALTER TABLE `llx_emailcollector_emailcollectorfilter` ENABLE KEYS */;
 UNLOCK TABLES;
 
---
--- Table structure for table `llx_emailsenderprofile`
---
-
-DROP TABLE IF EXISTS `llx_emailsenderprofile`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_emailsenderprofile` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `ref` varchar(64) COLLATE utf8_unicode_ci NOT NULL,
-  `entity` int(11) NOT NULL DEFAULT 1,
-  `label` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `amount` double(24,8) DEFAULT NULL,
-  `note_public` mediumtext COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note_private` mediumtext COLLATE utf8_unicode_ci DEFAULT NULL,
-  `date_creation` datetime NOT NULL,
-  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `fk_user_creat` int(11) NOT NULL,
-  `fk_user_modif` int(11) DEFAULT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `status` int(11) DEFAULT NULL,
-  PRIMARY KEY (`rowid`),
-  KEY `idx_emailsenderprofile_rowid` (`rowid`),
-  KEY `idx_emailsenderprofile_ref` (`ref`),
-  KEY `idx_emailsenderprofile_entity` (`entity`),
-  KEY `idx_emailsenderprofile_import_key` (`import_key`),
-  KEY `idx_emailsenderprofile_status` (`status`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_emailsenderprofile`
---
-
-LOCK TABLES `llx_emailsenderprofile` WRITE;
-/*!40000 ALTER TABLE `llx_emailsenderprofile` DISABLE KEYS */;
-/*!40000 ALTER TABLE `llx_emailsenderprofile` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `llx_emailsenderprofile_extrafields`
---
-
-DROP TABLE IF EXISTS `llx_emailsenderprofile_extrafields`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_emailsenderprofile_extrafields` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `fk_object` int(11) NOT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
-  PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_emailsenderprofile_extrafields`
---
-
-LOCK TABLES `llx_emailsenderprofile_extrafields` WRITE;
-/*!40000 ALTER TABLE `llx_emailsenderprofile_extrafields` DISABLE KEYS */;
-/*!40000 ALTER TABLE `llx_emailsenderprofile_extrafields` ENABLE KEYS */;
-UNLOCK TABLES;
-
 --
 -- Table structure for table `llx_entrepot`
 --
@@ -5670,7 +6024,6 @@ INSERT INTO `llx_expeditiondet` VALUES (1,1,10,3,1,0),(2,2,226,19,2,0);
 /*!40000 ALTER TABLE `llx_expeditiondet` ENABLE KEYS */;
 UNLOCK TABLES;
 
-
 --
 -- Table structure for table `llx_expeditiondet_batch`
 --
@@ -5770,6 +6123,7 @@ CREATE TABLE `llx_expensereport` (
   `integration_compta` int(11) DEFAULT NULL,
   `fk_bank_account` int(11) DEFAULT NULL,
   `model_pdf` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `last_main_doc` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   `fk_multicurrency` int(11) DEFAULT NULL,
   `multicurrency_code` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   `multicurrency_tx` double(24,8) DEFAULT 1.00000000,
@@ -5797,7 +6151,7 @@ CREATE TABLE `llx_expensereport` (
 
 LOCK TABLES `llx_expensereport` WRITE;
 /*!40000 ALTER TABLE `llx_expensereport` DISABLE KEYS */;
-INSERT INTO `llx_expensereport` VALUES (1,'ADMIN-ER00002-150101',1,2,NULL,8.33000000,1.67000000,0.00000000,0.00000000,10.00000000,'2021-01-01','2021-01-03','2021-01-22 19:03:37','2021-01-22 19:06:50','2021-02-16 02:12:40',NULL,NULL,'2021-04-15 10:22:31',12,NULL,12,12,12,NULL,NULL,5,NULL,0,'Holidays',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(2,'ER1912-0001',1,NULL,NULL,141.67000000,28.33000000,0.00000000,0.00000000,170.00000000,'2021-02-01','2021-02-28','2021-01-22 19:04:44','2021-12-20 20:34:13','2021-12-20 20:34:19',NULL,'2021-12-21 00:34:26','2021-04-15 10:22:31',12,12,12,12,12,NULL,12,4,NULL,0,'Work on projet X','','','aaaa',NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(3,'(PROV3)',1,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,'2021-02-02','2021-02-02','2021-02-02 03:57:03','2021-02-02 00:00:00',NULL,NULL,NULL,'2021-04-15 10:22:31',19,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL);
+INSERT INTO `llx_expensereport` VALUES (1,'ADMIN-ER00002-150101',1,2,NULL,8.33000000,1.67000000,0.00000000,0.00000000,10.00000000,'2021-01-01','2021-01-03','2021-01-22 19:03:37','2021-01-22 19:06:50','2021-02-16 02:12:40',NULL,NULL,'2021-04-15 10:22:31',12,NULL,12,12,12,NULL,NULL,5,NULL,0,'Holidays',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(2,'ER1912-0001',1,NULL,NULL,141.67000000,28.33000000,0.00000000,0.00000000,170.00000000,'2021-02-01','2021-02-28','2021-01-22 19:04:44','2021-12-20 20:34:13','2021-12-20 20:34:19',NULL,'2021-12-21 00:34:26','2021-04-15 10:22:31',12,12,12,12,12,NULL,12,4,NULL,0,'Work on projet X','','','aaaa',NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(3,'(PROV3)',1,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,'2021-02-02','2021-02-02','2021-02-02 03:57:03','2021-02-02 00:00:00',NULL,NULL,NULL,'2021-04-15 10:22:31',19,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL);
 /*!40000 ALTER TABLE `llx_expensereport` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -5988,9 +6342,10 @@ CREATE TABLE `llx_export_model` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `fk_user` int(11) NOT NULL DEFAULT 0,
   `label` varchar(50) COLLATE utf8_unicode_ci NOT NULL,
-  `type` varchar(20) COLLATE utf8_unicode_ci NOT NULL,
+  `type` varchar(64) COLLATE utf8_unicode_ci DEFAULT NULL,
   `field` text COLLATE utf8_unicode_ci NOT NULL,
   `filter` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `entity` int(11) NOT NULL DEFAULT 0,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_export_model` (`label`,`type`)
 ) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
@@ -6002,7 +6357,7 @@ CREATE TABLE `llx_export_model` (
 
 LOCK TABLES `llx_export_model` WRITE;
 /*!40000 ALTER TABLE `llx_export_model` DISABLE KEYS */;
-INSERT INTO `llx_export_model` VALUES (1,0,'MyExport','facture_2','s.rowid,s.nom,s.code_client,s.address,s.zip,s.town,c.code,cd.nom,s.phone,s.siren,s.siret,s.ape,s.idprof4,s.code_compta,s.code_compta_fournisseur,s.tva_intra,f.rowid,f.ref,f.ref_client,f.type,f.datec,f.datef,f.date_lim_reglement,f.total,f.total_ttc,f.tva,f.localtax1,f.localtax2,none.rest,f.paye,f.fk_statut,f.note_private,f.note_public,f.fk_user_author,uc.login,f.fk_user_valid,uv.login,pj.ref,pj.title,p.rowid,p.ref,p.amount,pf.amount,p.datep,p.num_paiement,pt.code,pt.libelle,p.note,p.fk_bank,ba.ref,f.multicurrency_code,f.multicurrency_tx,f.multicurrency_total_ht,f.multicurrency_total_tva,f.multicurrency_total_ttc,f.module_source,f.pos_source',''),(2,11,'Export by joe','facture_2','s.rowid,s.nom,s.code_client,s.address,s.zip,s.town,c.code,cd.nom,s.phone,s.siren,s.siret,s.ape,s.idprof4,s.code_compta,s.code_compta_fournisseur,s.tva_intra,f.rowid,f.ref,f.ref_client,f.type,f.datec,f.datef,f.date_lim_reglement,f.total,f.total_ttc,f.tva,f.localtax1,f.localtax2,none.rest,f.paye,f.fk_statut,f.note_private,f.note_public,f.fk_user_author,uc.login,f.fk_user_valid,uv.login,pj.ref,pj.title,p.rowid,p.ref,p.amount,pf.amount,p.datep,p.num_paiement,pt.code,pt.libelle,p.note,p.fk_bank,ba.ref,f.multicurrency_code,f.multicurrency_tx,f.multicurrency_total_ht,f.multicurrency_total_tva,f.multicurrency_total_ttc,f.module_source,f.pos_source',''),(3,12,'test','societe_1','s.rowid,s.nom,s.name_alias,s.status,s.client,s.fournisseur,s.datec,s.tms,s.code_client,s.code_fournisseur,s.code_compta,s.code_compta_fournisseur,s.address,s.zip,s.town,d.nom,c.label,c.code,s.phone,s.fax,s.url,s.email,s.default_lang,s.siren,s.siret,s.ape,s.idprof4,s.idprof5,s.idprof6,s.tva_intra,s.capital,s.note_private,s.note_public,t.libelle,ce.code,cfj.libelle,s.fk_prospectlevel,st.code,payterm.libelle,paymode.libelle,s.price_level,extra.height,extra.weight,extra.prof,extra.birthdate,u.login,u.firstname,u.lastname','s.nom=%a%');
+INSERT INTO `llx_export_model` VALUES (1,0,'MyExport','facture_2','s.rowid,s.nom,s.code_client,s.address,s.zip,s.town,c.code,cd.nom,s.phone,s.siren,s.siret,s.ape,s.idprof4,s.code_compta,s.code_compta_fournisseur,s.tva_intra,f.rowid,f.ref,f.ref_client,f.type,f.datec,f.datef,f.date_lim_reglement,f.total_ht,f.total_ttc,f.total_tva,f.localtax1,f.localtax2,none.rest,f.paye,f.fk_statut,f.note_private,f.note_public,f.fk_user_author,uc.login,f.fk_user_valid,uv.login,pj.ref,pj.title,p.rowid,p.ref,p.amount,pf.amount,p.datep,p.num_paiement,pt.code,pt.libelle,p.note,p.fk_bank,ba.ref,f.multicurrency_code,f.multicurrency_tx,f.multicurrency_total_ht,f.multicurrency_total_tva,f.multicurrency_total_ttc,f.module_source,f.pos_source','',0),(2,11,'Export by joe','facture_2','s.rowid,s.nom,s.code_client,s.address,s.zip,s.town,c.code,cd.nom,s.phone,s.siren,s.siret,s.ape,s.idprof4,s.code_compta,s.code_compta_fournisseur,s.tva_intra,f.rowid,f.ref,f.ref_client,f.type,f.datec,f.datef,f.date_lim_reglement,f.total_ht,f.total_ttc,f.total_tva,f.localtax1,f.localtax2,none.rest,f.paye,f.fk_statut,f.note_private,f.note_public,f.fk_user_author,uc.login,f.fk_user_valid,uv.login,pj.ref,pj.title,p.rowid,p.ref,p.amount,pf.amount,p.datep,p.num_paiement,pt.code,pt.libelle,p.note,p.fk_bank,ba.ref,f.multicurrency_code,f.multicurrency_tx,f.multicurrency_total_ht,f.multicurrency_total_tva,f.multicurrency_total_ttc,f.module_source,f.pos_source','',0),(3,12,'test','societe_1','s.rowid,s.nom,s.name_alias,s.status,s.client,s.fournisseur,s.datec,s.tms,s.code_client,s.code_fournisseur,s.code_compta,s.code_compta_fournisseur,s.address,s.zip,s.town,d.nom,c.label,c.code,s.phone,s.fax,s.url,s.email,s.default_lang,s.siren,s.siret,s.ape,s.idprof4,s.idprof5,s.idprof6,s.tva_intra,s.capital,s.note_private,s.note_public,t.libelle,ce.code,cfj.libelle,s.fk_prospectlevel,st.code,payterm.libelle,paymode.libelle,s.price_level,extra.height,extra.weight,extra.prof,extra.birthdate,u.login,u.firstname,u.lastname','s.nom=%a%',0);
 /*!40000 ALTER TABLE `llx_export_model` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -6151,7 +6506,7 @@ CREATE TABLE `llx_facture` (
 
 LOCK TABLES `llx_facture` WRITE;
 /*!40000 ALTER TABLE `llx_facture` DISABLE KEYS */;
-INSERT INTO `llx_facture` VALUES (2,'FA1007-0002',1,NULL,NULL,0,NULL,NULL,2,'2012-07-10 18:20:13','2020-07-10',NULL,NULL,'2020-12-10 12:24:22',1,10.00000000,NULL,NULL,0,NULL,NULL,0.10000000,0.00000000,0.00000000,0.00000000,46.00000000,46.10000000,2,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2020-07-10',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(3,'FA1107-0006',1,NULL,NULL,0,NULL,NULL,10,'2013-07-18 20:33:35','2020-07-18',NULL,NULL,'2020-12-10 12:24:22',1,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,15.00000000,15.00000000,2,1,NULL,1,NULL,NULL,1,NULL,NULL,1,0,'2020-07-18',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(5,'FA1108-0003',1,NULL,NULL,0,NULL,NULL,7,'2013-08-01 03:34:11','2020-08-01',NULL,NULL,'2020-12-10 12:24:22',1,0.00000000,NULL,NULL,0,NULL,NULL,0.63000000,0.00000000,0.00000000,0.00000000,5.00000000,5.63000000,2,1,NULL,1,NULL,NULL,NULL,NULL,NULL,0,6,'2020-08-01',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(6,'FA1108-0004',1,NULL,NULL,0,NULL,NULL,7,'2013-08-06 20:33:53','2020-08-06',NULL,NULL,'2020-12-10 12:24:22',1,0.00000000,NULL,NULL,0,NULL,NULL,0.98000000,0.00000000,0.00000000,0.00000000,5.00000000,5.98000000,2,1,NULL,1,NULL,NULL,NULL,NULL,NULL,0,4,'2020-08-06','Cash\nReceived : 6 EUR\nRendu : 0.02 EUR\n\n--------------------------------------',NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(8,'FA1108-0005',1,NULL,NULL,3,NULL,NULL,2,'2013-08-08 02:41:44','2020-08-08',NULL,NULL,'2020-12-10 12:24:22',1,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,2,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2020-08-08',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(9,'FA1108-0007',1,NULL,NULL,3,NULL,NULL,10,'2013-08-08 02:55:14','2020-08-08',NULL,NULL,'2020-12-10 12:24:22',0,0.00000000,NULL,NULL,0,NULL,NULL,1.96000000,0.00000000,0.00000000,0.00000000,10.00000000,11.96000000,1,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2020-08-08',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(10,'AV1212-0001',1,NULL,NULL,2,NULL,NULL,10,'2014-12-08 17:45:20','2020-12-08','2020-12-08 00:00:00',NULL,'2020-12-10 12:24:22',0,0.00000000,NULL,NULL,0,NULL,NULL,-0.63000000,0.00000000,0.00000000,0.00000000,-11.00000000,-11.63000000,1,1,NULL,1,NULL,3,NULL,NULL,NULL,0,0,'2020-12-08',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(12,'AV1212-0002',1,NULL,NULL,2,NULL,NULL,10,'2014-12-08 18:20:14','2020-12-08','2020-12-08 00:00:00',NULL,'2020-12-10 12:24:22',1,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,-5.00000000,-5.00000000,2,1,NULL,1,NULL,3,NULL,NULL,NULL,0,0,'2020-12-08',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(13,'FA1212-0011',1,NULL,NULL,0,NULL,NULL,7,'2014-12-09 20:04:19','2020-12-09','2020-02-12 00:00:00',NULL,'2020-12-10 12:24:22',0,0.00000000,NULL,NULL,0,NULL,NULL,2.74000000,0.00000000,0.00000000,0.00000000,14.00000000,16.74000000,1,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2020-12-09',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(32,'FA1212-0021',1,NULL,NULL,0,NULL,NULL,1,'2014-12-11 09:34:23','2020-12-11','2021-03-24 00:00:00',NULL,'2021-04-15 10:22:31',0,0.00000000,NULL,NULL,0,NULL,NULL,90.00000000,0.00000000,0.00000000,0.60000000,520.00000000,610.60000000,1,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2020-12-11','This is a comment (private)','This is a comment (public)','crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(33,'FA1212-0023',1,NULL,NULL,0,NULL,NULL,1,'2014-12-11 09:34:23','2020-12-11','2021-03-03 00:00:00',NULL,'2021-04-15 10:22:31',0,0.00000000,NULL,NULL,0,'abandon',NULL,0.24000000,0.00000000,0.00000000,0.00000000,2.48000000,2.72000000,3,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2020-12-11','This is a comment (private)','This is a comment (public)','crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(55,'FA1212-0009',1,NULL,NULL,0,NULL,NULL,1,'2014-12-11 09:35:51','2020-12-11','2020-12-12 00:00:00',NULL,'2021-04-15 10:22:31',0,0.00000000,NULL,NULL,0,NULL,NULL,0.24000000,0.00000000,0.00000000,0.00000000,2.48000000,2.72000000,1,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2020-12-11','This is a comment (private)','This is a comment (public)','generic_invoice_odt:/home/ldestailleur/git/dolibarr_3.8/documents/doctemplates/invoices/template_invoice.odt',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(148,'FS1301-0001',1,NULL,NULL,0,NULL,NULL,1,'2015-01-19 18:22:48','2021-01-19','2021-01-19 00:00:00',NULL,'2021-04-15 10:22:31',0,0.00000000,NULL,NULL,0,NULL,NULL,0.63000000,0.00000000,0.00000000,0.00000000,5.00000000,5.63000000,1,1,NULL,1,NULL,NULL,NULL,NULL,NULL,0,1,'2021-01-19',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,'facture/FS1301-0001/FS1301-0001.pdf',NULL,NULL),(149,'FA1601-0024',1,NULL,NULL,0,NULL,NULL,1,'2015-01-19 18:30:05','2021-01-19','2020-08-29 00:00:00','2020-01-02 20:49:34','2021-04-15 10:22:31',0,0.00000000,NULL,NULL,0,'other','test',1.80000000,0.90000000,0.90000000,0.00000000,20.00000000,23.60000000,2,1,NULL,12,12,NULL,NULL,NULL,NULL,0,0,'2021-01-19',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,20.00000000,1.80000000,23.60000000,NULL,'facture/FA1601-0024/FA1601-0024.pdf',NULL,NULL),(150,'FA6801-0010',1,NULL,NULL,0,NULL,NULL,1,'2015-01-19 18:31:10','2021-01-19','2020-10-04 00:00:00',NULL,'2021-04-15 10:22:31',0,0.00000000,NULL,NULL,0,NULL,NULL,0.63000000,0.00000000,0.00000000,0.00000000,5.00000000,5.63000000,1,1,NULL,12,NULL,NULL,NULL,NULL,NULL,0,1,'2021-01-19',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,5.00000000,0.63000000,5.63000000,NULL,'facture/FA6801-0010/FA6801-0010.pdf',NULL,NULL),(151,'FS1301-0002',1,NULL,NULL,0,NULL,NULL,1,'2015-01-19 18:31:58','2021-01-19','2021-01-19 00:00:00',NULL,'2021-04-15 10:22:31',1,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,2,1,NULL,1,NULL,NULL,NULL,NULL,NULL,0,1,'2021-01-19',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(160,'FA1507-0015',1,NULL,NULL,0,NULL,NULL,12,'2015-03-06 16:47:48','2020-07-18','2019-03-06 00:00:00',NULL,'2020-12-10 12:24:22',0,0.00000000,NULL,NULL,0,NULL,NULL,1.11000000,0.00000000,0.00000000,0.00000000,8.89000000,10.00000000,1,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2020-07-18',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(210,'FA1107-0019',1,NULL,NULL,0,NULL,NULL,10,'2015-03-20 14:30:11','2020-07-10','2020-03-20 00:00:00',NULL,'2020-12-10 12:24:22',0,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,1,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2020-07-10',NULL,NULL,'generic_invoice_odt:/home/ldestailleur/git/dolibarr_3.8/documents/doctemplates/invoices/template_invoice.odt',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(211,'FA1303-0020',1,NULL,NULL,0,NULL,NULL,19,'2015-03-22 09:40:10','2021-03-22','2020-03-02 00:00:00',NULL,'2021-04-15 10:22:31',0,0.00000000,NULL,NULL,0,NULL,NULL,17.64000000,0.00000000,0.00000000,0.40000000,340.00000000,358.04000000,1,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,3,'2021-03-22',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(213,'AV1303-0003',1,NULL,NULL,2,NULL,NULL,1,'2016-03-03 19:22:03','2021-03-03','2020-03-03 00:00:00',NULL,'2021-04-15 10:22:31',0,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,-1000.00000000,-1000.00000000,1,1,NULL,1,NULL,32,NULL,NULL,NULL,0,0,'2021-03-03',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(216,'(PROV216)',1,NULL,NULL,0,NULL,NULL,26,'2017-02-12 23:21:27','2021-02-12',NULL,NULL,'2021-04-15 10:22:31',0,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2021-02-12',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,0,'',NULL,NULL,0,'EUR',1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(217,'(PROV217)',1,NULL,NULL,0,NULL,NULL,1,'2017-08-31 13:26:17','2020-08-31',NULL,NULL,'2020-12-10 12:24:22',0,0.00000000,NULL,NULL,0,NULL,NULL,1.13000000,0.00000000,0.00000000,0.00000000,21.00000000,22.13000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2020-08-31',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,0,'',NULL,NULL,1,'EUR',1.00000000,21.00000000,1.13000000,22.13000000,NULL,'facture/(PROV217)/(PROV217).pdf',NULL,NULL),(218,'FA1909-0025',1,NULL,NULL,0,NULL,NULL,12,'2019-09-26 17:30:14','2020-09-26','2020-09-26 00:00:00',NULL,'2020-12-10 12:24:22',0,0.00000000,NULL,NULL,0,NULL,NULL,1.08000000,0.00000000,0.00000000,0.00000000,42.50000000,43.58000000,1,12,NULL,12,NULL,NULL,NULL,NULL,NULL,0,0,'2020-09-26',NULL,NULL,'',NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,0,'',NULL,NULL,0,'EUR',1.00000000,42.50000000,1.08000000,43.58000000,NULL,NULL,'takepos','1'),(219,'(PROV-POS1-0)',1,NULL,NULL,0,NULL,NULL,1,'2019-11-28 19:04:03','2020-11-28',NULL,NULL,'2020-12-10 12:24:22',0,0.00000000,NULL,NULL,0,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,5.00000000,6.00000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,'2020-11-28',NULL,NULL,'',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,0,'EUR',1.00000000,5.00000000,1.00000000,6.00000000,NULL,NULL,'takepos','1'),(220,'(PROV220)',1,NULL,NULL,3,NULL,NULL,19,'2020-01-16 02:03:17','2021-01-16',NULL,NULL,'2021-04-15 10:22:31',0,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,100.00000000,100.00000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2021-01-16',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,1,'EUR',1.00000000,100.00000000,0.00000000,100.00000000,NULL,NULL,NULL,NULL),(221,'AC2001-0001',1,NULL,NULL,3,NULL,NULL,19,'2020-01-16 02:21:05','2021-01-16','2021-01-16 00:00:00',NULL,'2021-04-15 10:22:31',0,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,123.00000000,123.00000000,0,12,NULL,12,NULL,NULL,NULL,NULL,NULL,1,0,'2021-01-16',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,1,'EUR',1.00000000,123.00000000,0.00000000,123.00000000,NULL,'facture/AC2001-0001/AC2001-0001.pdf',NULL,NULL),(222,'(PROV222)',1,NULL,NULL,3,NULL,NULL,19,'2020-01-16 02:21:28','2021-01-16',NULL,NULL,'2021-04-15 10:22:31',0,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,100.00000000,100.00000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2021-01-16',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,1,'EUR',1.00000000,100.00000000,0.00000000,100.00000000,NULL,NULL,NULL,NULL),(223,'(PROV223)',1,NULL,NULL,0,NULL,NULL,19,'2020-01-16 02:32:04','2021-01-16',NULL,NULL,'2021-04-15 10:22:31',0,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,410.00000000,410.00000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,0,'2021-02-15',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,1,'EUR',1.00000000,410.00000000,0.00000000,410.00000000,NULL,NULL,NULL,NULL),(224,'AC2001-0002',1,NULL,NULL,3,NULL,NULL,19,'2020-01-16 02:33:19','2021-01-16','2021-01-16 00:00:00','2020-01-16 02:36:48','2021-04-15 10:22:31',1,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,20.50000000,20.50000000,2,12,NULL,12,12,NULL,NULL,NULL,NULL,1,0,'2021-01-16',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,1,'EUR',1.00000000,20.50000000,0.00000000,20.50000000,NULL,'facture/AC2001-0002/AC2001-0002.pdf',NULL,NULL),(225,'(PROV225)',1,NULL,NULL,0,NULL,NULL,19,'2020-01-16 02:37:48','2021-01-16',NULL,NULL,'2021-04-15 10:22:31',0,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,389.50000000,389.50000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,0,'2021-02-15',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,1,'EUR',1.00000000,389.50000000,0.00000000,389.50000000,NULL,'facture/(PROV225)/(PROV225).pdf',NULL,NULL),(226,'(PROV226)',1,NULL,NULL,3,NULL,NULL,11,'2020-01-19 14:20:54','2021-01-19',NULL,NULL,'2021-04-15 10:22:31',0,0.00000000,NULL,NULL,0,NULL,NULL,12.50000000,0.00000000,0.00000000,0.00000000,120.00000000,132.50000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2021-01-19',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,1,'EUR',1.00000000,120.00000000,12.50000000,132.50000000,NULL,'facture/(PROV226)/(PROV226).pdf',NULL,NULL),(227,'AC2001-0003',1,NULL,NULL,3,NULL,NULL,1,'2020-01-19 14:22:54','2021-01-19','2021-01-19 00:00:00',NULL,'2021-04-15 10:22:31',0,0.00000000,NULL,NULL,0,NULL,NULL,39.20000000,0.00000000,0.00000000,0.00000000,200.00000000,239.20000000,0,12,NULL,12,NULL,NULL,NULL,NULL,NULL,1,0,'2021-01-19',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,1,'EUR',1.00000000,200.00000000,39.20000000,239.20000000,NULL,'facture/AC2001-0003/AC2001-0003.pdf',NULL,NULL),(228,'AC2001-0004',1,NULL,NULL,3,NULL,NULL,1,'2020-01-19 14:24:49','2021-01-19','2021-01-19 00:00:00',NULL,'2021-04-15 10:22:31',0,0.00000000,NULL,NULL,0,NULL,NULL,1.94000000,0.00000000,0.00000000,0.00000000,48.60000000,50.54000000,1,12,NULL,12,NULL,NULL,NULL,NULL,NULL,1,0,'2021-01-19',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,1,'EUR',1.00000000,48.60000000,1.94000000,50.54000000,NULL,'facture/AC2001-0004/AC2001-0004.pdf',NULL,NULL),(229,'FA1707-0026',1,NULL,NULL,0,NULL,NULL,12,'2020-01-21 10:23:17','2020-07-18','2022-01-21 00:00:00','2020-01-21 10:23:17','2020-12-10 12:24:22',1,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,50.00000000,50.00000000,2,12,NULL,12,12,NULL,NULL,NULL,NULL,1,0,'2020-07-18',NULL,NULL,'',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,0,'EUR',1.00000000,50.00000000,0.00000000,50.00000000,NULL,'facture/FA1707-0026/FA1707-0026.pdf',NULL,NULL),(230,'FA1807-0027',1,NULL,NULL,0,NULL,NULL,12,'2020-01-21 10:23:28','2020-07-18','2021-01-21 00:00:00','2020-01-21 10:23:28','2020-12-10 12:24:22',1,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,50.00000000,50.00000000,2,12,NULL,12,12,NULL,NULL,NULL,NULL,1,0,'2020-07-18',NULL,NULL,'',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,0,'EUR',1.00000000,50.00000000,0.00000000,50.00000000,NULL,'facture/FA1807-0027/FA1807-0027.pdf',NULL,NULL),(231,'FA1907-0028',1,NULL,NULL,0,NULL,NULL,12,'2020-01-21 10:23:49','2020-07-18','2020-01-21 00:00:00','2020-01-21 10:23:49','2020-12-10 12:24:22',1,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,50.00000000,50.00000000,2,12,NULL,12,12,NULL,NULL,NULL,NULL,1,0,'2020-07-18',NULL,NULL,'',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,0,'EUR',1.00000000,50.00000000,0.00000000,50.00000000,NULL,'facture/FA1907-0028/FA1907-0028.pdf',NULL,NULL);
+INSERT INTO `llx_facture` VALUES (2,'FA1007-0002',1,NULL,NULL,0,NULL,NULL,2,'2012-07-10 18:20:13','2021-07-10',NULL,NULL,'2021-07-11 17:49:28',1,10.00000000,NULL,NULL,0,NULL,NULL,0.10000000,0.00000000,0.00000000,0.00000000,46.00000000,46.10000000,2,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2021-07-10',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(3,'FA1107-0006',1,NULL,NULL,0,NULL,NULL,10,'2013-07-18 20:33:35','2020-07-18',NULL,NULL,'2020-12-10 12:24:22',1,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,15.00000000,15.00000000,2,1,NULL,1,NULL,NULL,1,NULL,NULL,1,0,'2020-07-18',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(5,'FA1108-0003',1,NULL,NULL,0,NULL,NULL,7,'2013-08-01 03:34:11','2020-08-01',NULL,NULL,'2020-12-10 12:24:22',1,0.00000000,NULL,NULL,0,NULL,NULL,0.63000000,0.00000000,0.00000000,0.00000000,5.00000000,5.63000000,2,1,NULL,1,NULL,NULL,NULL,NULL,NULL,0,6,'2020-08-01',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(6,'FA1108-0004',1,NULL,NULL,0,NULL,NULL,7,'2013-08-06 20:33:53','2020-08-06',NULL,NULL,'2020-12-10 12:24:22',1,0.00000000,NULL,NULL,0,NULL,NULL,0.98000000,0.00000000,0.00000000,0.00000000,5.00000000,5.98000000,2,1,NULL,1,NULL,NULL,NULL,NULL,NULL,0,4,'2020-08-06','Cash\nReceived : 6 EUR\nRendu : 0.02 EUR\n\n--------------------------------------',NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(8,'FA1108-0005',1,NULL,NULL,3,NULL,NULL,2,'2013-08-08 02:41:44','2020-08-08',NULL,NULL,'2020-12-10 12:24:22',1,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,2,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2020-08-08',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(9,'FA1108-0007',1,NULL,NULL,3,NULL,NULL,10,'2013-08-08 02:55:14','2020-08-08',NULL,NULL,'2020-12-10 12:24:22',0,0.00000000,NULL,NULL,0,NULL,NULL,1.96000000,0.00000000,0.00000000,0.00000000,10.00000000,11.96000000,1,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2020-08-08',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(10,'AV1212-0001',1,NULL,NULL,2,NULL,NULL,10,'2014-12-08 17:45:20','2020-12-08','2020-12-08 00:00:00',NULL,'2020-12-10 12:24:22',0,0.00000000,NULL,NULL,0,NULL,NULL,-0.63000000,0.00000000,0.00000000,0.00000000,-11.00000000,-11.63000000,1,1,NULL,1,NULL,3,NULL,NULL,NULL,0,0,'2020-12-08',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(12,'AV1212-0002',1,NULL,NULL,2,NULL,NULL,10,'2014-12-08 18:20:14','2020-12-08','2020-12-08 00:00:00',NULL,'2020-12-10 12:24:22',1,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,-5.00000000,-5.00000000,2,1,NULL,1,NULL,3,NULL,NULL,NULL,0,0,'2020-12-08',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(13,'FA1212-0011',1,NULL,NULL,0,NULL,NULL,7,'2014-12-09 20:04:19','2020-12-09','2020-02-12 00:00:00',NULL,'2020-12-10 12:24:22',0,0.00000000,NULL,NULL,0,NULL,NULL,2.74000000,0.00000000,0.00000000,0.00000000,14.00000000,16.74000000,1,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2020-12-09',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(32,'FA1212-0021',1,NULL,NULL,0,NULL,NULL,1,'2014-12-11 09:34:23','2020-12-11','2021-03-24 00:00:00',NULL,'2021-04-15 10:22:31',0,0.00000000,NULL,NULL,0,NULL,NULL,90.00000000,0.00000000,0.00000000,0.60000000,520.00000000,610.60000000,1,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2020-12-11','This is a comment (private)','This is a comment (public)','crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(33,'FA1212-0023',1,NULL,NULL,0,NULL,NULL,1,'2014-12-11 09:34:23','2020-12-11','2021-03-03 00:00:00',NULL,'2021-04-15 10:22:31',0,0.00000000,NULL,NULL,0,'abandon',NULL,0.24000000,0.00000000,0.00000000,0.00000000,2.48000000,2.72000000,3,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2020-12-11','This is a comment (private)','This is a comment (public)','crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(55,'FA1212-0009',1,NULL,NULL,0,NULL,NULL,1,'2014-12-11 09:35:51','2020-12-11','2020-12-12 00:00:00',NULL,'2021-04-15 10:22:31',0,0.00000000,NULL,NULL,0,NULL,NULL,0.24000000,0.00000000,0.00000000,0.00000000,2.48000000,2.72000000,1,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2020-12-11','This is a comment (private)','This is a comment (public)','generic_invoice_odt:/home/ldestailleur/git/dolibarr_3.8/documents/doctemplates/invoices/template_invoice.odt',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(148,'FS1301-0001',1,NULL,NULL,0,NULL,NULL,1,'2015-01-19 18:22:48','2021-01-19','2021-01-19 00:00:00',NULL,'2021-04-15 10:22:31',0,0.00000000,NULL,NULL,0,NULL,NULL,0.63000000,0.00000000,0.00000000,0.00000000,5.00000000,5.63000000,1,1,NULL,1,NULL,NULL,NULL,NULL,NULL,0,1,'2021-01-19',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,'facture/FS1301-0001/FS1301-0001.pdf',NULL,NULL),(149,'FA1601-0024',1,NULL,NULL,0,NULL,NULL,1,'2015-01-19 18:30:05','2021-01-19','2020-08-29 00:00:00','2020-01-02 20:49:34','2021-04-15 10:22:31',0,0.00000000,NULL,NULL,0,'other','test',1.80000000,0.90000000,0.90000000,0.00000000,20.00000000,23.60000000,2,1,NULL,12,12,NULL,NULL,NULL,NULL,0,0,'2021-01-19',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,20.00000000,1.80000000,23.60000000,NULL,'facture/FA1601-0024/FA1601-0024.pdf',NULL,NULL),(150,'FA6801-0010',1,NULL,NULL,0,NULL,NULL,1,'2015-01-19 18:31:10','2021-01-19','2020-10-04 00:00:00',NULL,'2021-04-15 10:22:31',0,0.00000000,NULL,NULL,0,NULL,NULL,0.63000000,0.00000000,0.00000000,0.00000000,5.00000000,5.63000000,1,1,NULL,12,NULL,NULL,NULL,NULL,NULL,0,1,'2021-01-19',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,5.00000000,0.63000000,5.63000000,NULL,'facture/FA6801-0010/FA6801-0010.pdf',NULL,NULL),(151,'FS1301-0002',1,NULL,NULL,0,NULL,NULL,1,'2015-01-19 18:31:58','2021-01-19','2021-01-19 00:00:00',NULL,'2021-04-15 10:22:31',1,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,2,1,NULL,1,NULL,NULL,NULL,NULL,NULL,0,1,'2021-01-19',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(160,'FA1507-0015',1,NULL,NULL,0,NULL,NULL,12,'2015-03-06 16:47:48','2020-07-18','2019-03-06 00:00:00',NULL,'2020-12-10 12:24:22',0,0.00000000,NULL,NULL,0,NULL,NULL,1.11000000,0.00000000,0.00000000,0.00000000,8.89000000,10.00000000,1,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2020-07-18',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(210,'FA1107-0019',1,NULL,NULL,0,NULL,NULL,10,'2015-03-20 14:30:11','2021-07-10','2021-03-20 00:00:00',NULL,'2021-07-11 17:49:28',0,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,1,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2021-07-10',NULL,NULL,'generic_invoice_odt:/home/ldestailleur/git/dolibarr_3.8/documents/doctemplates/invoices/template_invoice.odt',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(211,'FA1303-0020',1,NULL,NULL,0,NULL,NULL,19,'2015-03-22 09:40:10','2021-03-22','2020-03-02 00:00:00',NULL,'2021-04-15 10:22:31',0,0.00000000,NULL,NULL,0,NULL,NULL,17.64000000,0.00000000,0.00000000,0.40000000,340.00000000,358.04000000,1,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,3,'2021-03-22',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(213,'AV1303-0003',1,NULL,NULL,2,NULL,NULL,1,'2016-03-03 19:22:03','2021-03-03','2020-03-03 00:00:00',NULL,'2021-04-15 10:22:31',0,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,-1000.00000000,-1000.00000000,1,1,NULL,1,NULL,32,NULL,NULL,NULL,0,0,'2021-03-03',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(216,'(PROV216)',1,NULL,NULL,0,NULL,NULL,26,'2017-02-12 23:21:27','2021-02-12',NULL,NULL,'2021-04-15 10:22:31',0,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2021-02-12',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,0,'',NULL,NULL,0,'EUR',1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(217,'(PROV217)',1,NULL,NULL,0,NULL,NULL,1,'2017-08-31 13:26:17','2020-08-31',NULL,NULL,'2020-12-10 12:24:22',0,0.00000000,NULL,NULL,0,NULL,NULL,1.13000000,0.00000000,0.00000000,0.00000000,21.00000000,22.13000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2020-08-31',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,0,'',NULL,NULL,1,'EUR',1.00000000,21.00000000,1.13000000,22.13000000,NULL,'facture/(PROV217)/(PROV217).pdf',NULL,NULL),(218,'FA1909-0025',1,NULL,NULL,0,NULL,NULL,12,'2019-09-26 17:30:14','2020-09-26','2020-09-26 00:00:00',NULL,'2020-12-10 12:24:22',0,0.00000000,NULL,NULL,0,NULL,NULL,1.08000000,0.00000000,0.00000000,0.00000000,42.50000000,43.58000000,1,12,NULL,12,NULL,NULL,NULL,NULL,NULL,0,0,'2020-09-26',NULL,NULL,'',NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,0,'',NULL,NULL,0,'EUR',1.00000000,42.50000000,1.08000000,43.58000000,NULL,NULL,'takepos','1'),(219,'(PROV-POS1-0)',1,NULL,NULL,0,NULL,NULL,1,'2019-11-28 19:04:03','2020-11-28',NULL,NULL,'2020-12-10 12:24:22',0,0.00000000,NULL,NULL,0,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,5.00000000,6.00000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,'2020-11-28',NULL,NULL,'',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,0,'EUR',1.00000000,5.00000000,1.00000000,6.00000000,NULL,NULL,'takepos','1'),(220,'(PROV220)',1,NULL,NULL,3,NULL,NULL,19,'2020-01-16 02:03:17','2021-01-16',NULL,NULL,'2021-04-15 10:22:31',0,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,100.00000000,100.00000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2021-01-16',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,1,'EUR',1.00000000,100.00000000,0.00000000,100.00000000,NULL,NULL,NULL,NULL),(221,'AC2001-0001',1,NULL,NULL,3,NULL,NULL,19,'2020-01-16 02:21:05','2021-01-16','2021-01-16 00:00:00',NULL,'2021-04-15 10:22:31',0,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,123.00000000,123.00000000,0,12,NULL,12,NULL,NULL,NULL,NULL,NULL,1,0,'2021-01-16',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,1,'EUR',1.00000000,123.00000000,0.00000000,123.00000000,NULL,'facture/AC2001-0001/AC2001-0001.pdf',NULL,NULL),(222,'(PROV222)',1,NULL,NULL,3,NULL,NULL,19,'2020-01-16 02:21:28','2021-01-16',NULL,NULL,'2021-04-15 10:22:31',0,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,100.00000000,100.00000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2021-01-16',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,1,'EUR',1.00000000,100.00000000,0.00000000,100.00000000,NULL,NULL,NULL,NULL),(223,'(PROV223)',1,NULL,NULL,0,NULL,NULL,19,'2020-01-16 02:32:04','2021-01-16',NULL,NULL,'2021-04-15 10:22:31',0,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,410.00000000,410.00000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,0,'2021-02-15',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,1,'EUR',1.00000000,410.00000000,0.00000000,410.00000000,NULL,NULL,NULL,NULL),(224,'AC2001-0002',1,NULL,NULL,3,NULL,NULL,19,'2020-01-16 02:33:19','2021-01-16','2021-01-16 00:00:00','2020-01-16 02:36:48','2021-04-15 10:22:31',1,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,20.50000000,20.50000000,2,12,NULL,12,12,NULL,NULL,NULL,NULL,1,0,'2021-01-16',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,1,'EUR',1.00000000,20.50000000,0.00000000,20.50000000,NULL,'facture/AC2001-0002/AC2001-0002.pdf',NULL,NULL),(225,'(PROV225)',1,NULL,NULL,0,NULL,NULL,19,'2020-01-16 02:37:48','2021-01-16',NULL,NULL,'2021-04-15 10:22:31',0,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,389.50000000,389.50000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,0,'2021-02-15',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,1,'EUR',1.00000000,389.50000000,0.00000000,389.50000000,NULL,'facture/(PROV225)/(PROV225).pdf',NULL,NULL),(226,'(PROV226)',1,NULL,NULL,3,NULL,NULL,11,'2020-01-19 14:20:54','2021-01-19',NULL,NULL,'2021-04-15 10:22:31',0,0.00000000,NULL,NULL,0,NULL,NULL,12.50000000,0.00000000,0.00000000,0.00000000,120.00000000,132.50000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2021-01-19',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,1,'EUR',1.00000000,120.00000000,12.50000000,132.50000000,NULL,'facture/(PROV226)/(PROV226).pdf',NULL,NULL),(227,'AC2001-0003',1,NULL,NULL,3,NULL,NULL,1,'2020-01-19 14:22:54','2021-01-19','2021-01-19 00:00:00',NULL,'2021-04-15 10:22:31',0,0.00000000,NULL,NULL,0,NULL,NULL,39.20000000,0.00000000,0.00000000,0.00000000,200.00000000,239.20000000,0,12,NULL,12,NULL,NULL,NULL,NULL,NULL,1,0,'2021-01-19',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,1,'EUR',1.00000000,200.00000000,39.20000000,239.20000000,NULL,'facture/AC2001-0003/AC2001-0003.pdf',NULL,NULL),(228,'AC2001-0004',1,NULL,NULL,3,NULL,NULL,1,'2020-01-19 14:24:49','2021-01-19','2021-01-19 00:00:00',NULL,'2021-04-15 10:22:31',0,0.00000000,NULL,NULL,0,NULL,NULL,1.94000000,0.00000000,0.00000000,0.00000000,48.60000000,50.54000000,1,12,NULL,12,NULL,NULL,NULL,NULL,NULL,1,0,'2021-01-19',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,1,'EUR',1.00000000,48.60000000,1.94000000,50.54000000,NULL,'facture/AC2001-0004/AC2001-0004.pdf',NULL,NULL),(229,'FA1707-0026',1,NULL,NULL,0,NULL,NULL,12,'2020-01-21 10:23:17','2020-07-18','2022-01-21 00:00:00','2020-01-21 10:23:17','2020-12-10 12:24:22',1,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,50.00000000,50.00000000,2,12,NULL,12,12,NULL,NULL,NULL,NULL,1,0,'2020-07-18',NULL,NULL,'',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,0,'EUR',1.00000000,50.00000000,0.00000000,50.00000000,NULL,'facture/FA1707-0026/FA1707-0026.pdf',NULL,NULL),(230,'FA1807-0027',1,NULL,NULL,0,NULL,NULL,12,'2020-01-21 10:23:28','2020-07-18','2021-01-21 00:00:00','2020-01-21 10:23:28','2020-12-10 12:24:22',1,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,50.00000000,50.00000000,2,12,NULL,12,12,NULL,NULL,NULL,NULL,1,0,'2020-07-18',NULL,NULL,'',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,0,'EUR',1.00000000,50.00000000,0.00000000,50.00000000,NULL,'facture/FA1807-0027/FA1807-0027.pdf',NULL,NULL),(231,'FA1907-0028',1,NULL,NULL,0,NULL,NULL,12,'2020-01-21 10:23:49','2020-07-18','2020-01-21 00:00:00','2020-01-21 10:23:49','2020-12-10 12:24:22',1,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,50.00000000,50.00000000,2,12,NULL,12,12,NULL,NULL,NULL,NULL,1,0,'2020-07-18',NULL,NULL,'',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,0,'EUR',1.00000000,50.00000000,0.00000000,50.00000000,NULL,'facture/FA1907-0028/FA1907-0028.pdf',NULL,NULL);
 /*!40000 ALTER TABLE `llx_facture` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -6284,6 +6639,7 @@ CREATE TABLE `llx_facture_fourn_det` (
   `pu_ttc` double(24,8) DEFAULT NULL,
   `qty` double DEFAULT NULL,
   `remise_percent` double DEFAULT 0,
+  `fk_remise_except` int(11) DEFAULT NULL,
   `tva_tx` double(6,3) DEFAULT NULL,
   `vat_src_code` varchar(10) COLLATE utf8_unicode_ci DEFAULT '',
   `localtax1_tx` double(6,3) DEFAULT 0.000,
@@ -6311,6 +6667,7 @@ CREATE TABLE `llx_facture_fourn_det` (
   `multicurrency_total_tva` double(24,8) DEFAULT 0.00000000,
   `multicurrency_total_ttc` double(24,8) DEFAULT 0.00000000,
   PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_fk_remise_except` (`fk_remise_except`,`fk_facture_fourn`),
   KEY `idx_facture_fourn_det_fk_facture` (`fk_facture_fourn`),
   KEY `fk_facture_fourn_det_fk_unit` (`fk_unit`),
   KEY `idx_facture_fourn_det_fk_code_ventilation` (`fk_code_ventilation`),
@@ -6326,7 +6683,7 @@ CREATE TABLE `llx_facture_fourn_det` (
 
 LOCK TABLES `llx_facture_fourn_det` WRITE;
 /*!40000 ALTER TABLE `llx_facture_fourn_det` DISABLE KEYS */;
-INSERT INTO `llx_facture_fourn_det` VALUES (44,16,NULL,NULL,NULL,NULL,'<strong>ref :sd.loc.sp.512.6</strong><br>6 mois - Location de SuperPlan avec la connexion 512kbs<br>Du 11/04/2003 &agrave; 11/10/2003',414.00000000,495.14400000,1,0,19.600,'',0.000,'',0.000,'',414.00000000,81.14000000,0.00000000,0.00000000,495.14000000,0,NULL,NULL,0,NULL,105,0,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(45,16,NULL,NULL,NULL,NULL,'<strong>ref :sd.loc.sp.512.6</strong><br>6 mois - Location de SuperPlan avec la connexion 512kbs<br>Du 11/10/2003 &agrave; 11/04/2004',414.00000000,495.14400000,1,0,19.600,'',0.000,'',0.000,'',414.00000000,81.14000000,0.00000000,0.00000000,495.14000000,0,NULL,NULL,0,NULL,104,0,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(46,16,NULL,NULL,NULL,NULL,'<strong>ref :sd.installation.annuel</strong><br>Frais de mise en service d\'un serveur dédié pour un paiement annuel<br>',1.00000000,1.19600000,1,0,19.600,'',0.000,'',0.000,'',1.00000000,0.20000000,0.00000000,0.00000000,1.20000000,0,NULL,NULL,0,NULL,105,0,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(47,17,NULL,NULL,NULL,NULL,'<strong>ref :bk.full250.creation</strong><br>Création du compte backup ftp 250Mo.<br>',1.00000000,1.19600000,1,0,19.600,'',0.000,'',0.000,'',1.00000000,0.20000000,0.00000000,0.00000000,1.20000000,0,NULL,NULL,0,NULL,106,0,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(48,17,NULL,NULL,NULL,NULL,'<strong>ref :bk.full250.12</strong><br>Redevance pour un backup de 250Mo sur 12 mois<br>',25.00000000,29.90000000,1,0,19.600,'',0.000,'',0.000,'',25.00000000,4.90000000,0.00000000,0.00000000,29.90000000,0,NULL,NULL,0,NULL,103,0,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(49,18,NULL,NULL,NULL,NULL,'<strong>ref :bk.full250.creation</strong><br>Création du compte backup ftp 250Mo.<br>',1.00000000,1.19600000,1,0,19.600,'',0.000,'',0.000,'',1.00000000,0.20000000,0.00000000,0.00000000,1.20000000,0,NULL,NULL,0,NULL,0,0,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(50,18,NULL,NULL,NULL,NULL,'<strong>ref :bk.full250.12</strong><br>Redevance pour un backup de 250Mo sur 12 mois<br>',25.00000000,29.90000000,1,0,19.600,'',0.000,'',0.000,'',25.00000000,4.90000000,0.00000000,0.00000000,29.90000000,0,NULL,NULL,0,NULL,0,0,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(51,19,NULL,NULL,NULL,NULL,'<strong>ref :bk.full250.creation</strong><br>Création du compte backup ftp 250Mo.<br>',1.00000000,1.19600000,1,0,19.600,'',0.000,'0',0.000,'0',1.00000000,0.20000000,0.00000000,0.00000000,1.20000000,0,NULL,NULL,0,NULL,0,0,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(52,19,NULL,NULL,NULL,NULL,'<strong>ref :bk.full250.12</strong><br>Redevance pour un backup de 250Mo sur 12 mois<br>',25.00000000,29.90000000,1,0,19.600,'',0.000,'0',0.000,'0',25.00000000,4.90000000,0.00000000,0.00000000,29.90000000,0,NULL,NULL,0,NULL,0,0,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(53,20,NULL,NULL,NULL,NULL,'Chips',20.00000000,23.92000000,10,0,19.600,'',0.000,'0',0.000,'0',200.00000000,39.20000000,0.00000000,0.00000000,239.20000000,0,NULL,NULL,0,NULL,0,0,0,NULL,0,'EUR',20.00000000,200.00000000,39.20000000,239.20000000),(54,21,NULL,1,'aaa',NULL,'A beatifull pink dress',100.00000000,90.00000000,5,10,0.000,'',0.000,'0',0.000,'0',450.00000000,0.00000000,0.00000000,0.00000000,450.00000000,0,NULL,NULL,0,NULL,0,0,1,NULL,1,'EUR',100.00000000,450.00000000,0.00000000,450.00000000),(78,22,NULL,1,'BK01',NULL,'A beatifull pink dress',70.00000000,78.75000000,5,0,12.500,'',0.000,'0',0.000,'0',350.00000000,43.75000000,0.00000000,0.00000000,393.75000000,0,NULL,NULL,0,NULL,0,0,2,NULL,1,'EUR',70.00000000,350.00000000,43.75000000,393.75000000),(83,27,NULL,1,'BK01','Pink dress','A beatifull pink dress',-70.00000000,-78.75000000,5,0,12.500,'',0.000,'0',0.000,'0',-350.00000000,-43.75000000,0.00000000,0.00000000,-393.75000000,0,NULL,NULL,0,NULL,0,0,2,NULL,1,'EUR',70.00000000,350.00000000,43.75000000,393.75000000),(84,28,NULL,1,'BK01',NULL,'A beatifull pink dress',79.16667000,89.06000000,1,0,12.500,'',0.000,'0',0.000,'0',79.17000000,9.89000000,0.00000000,0.00000000,89.06000000,0,NULL,NULL,0,NULL,0,0,1,NULL,1,'EUR',79.16667000,79.17000000,9.89000000,89.06000000),(86,30,NULL,NULL,'',NULL,'<strong>ref :bk.full250.creation</strong><br>Création du compte backup ftp 250Mo.<br>',-1.00000000,-1.20000000,1,0,19.600,'',0.000,'0',0.000,'0',-1.00000000,-0.20000000,0.00000000,0.00000000,-1.20000000,0,NULL,NULL,0,NULL,0,0,0,NULL,0,'',0.00000000,0.00000000,0.00000000,0.00000000),(87,30,NULL,NULL,'',NULL,'<strong>ref :bk.full250.12</strong><br>Redevance pour un backup de 250Mo sur 12 mois<br>',-25.00000000,-29.90000000,1,0,19.600,'',0.000,'0',0.000,'0',-25.00000000,-4.90000000,0.00000000,0.00000000,-29.90000000,0,NULL,NULL,0,NULL,0,0,0,NULL,0,'',0.00000000,0.00000000,0.00000000,0.00000000),(89,22,NULL,2,'BKPEARPIE',NULL,'',7.00000000,7.00000000,1,0,0.000,'',0.000,'0',0.000,'0',7.00000000,0.00000000,0.00000000,0.00000000,7.00000000,0,NULL,NULL,0,NULL,0,0,3,NULL,1,'EUR',7.00000000,7.00000000,0.00000000,7.00000000);
+INSERT INTO `llx_facture_fourn_det` VALUES (44,16,NULL,NULL,NULL,NULL,'<strong>ref :sd.loc.sp.512.6</strong><br>6 mois - Location de SuperPlan avec la connexion 512kbs<br>Du 11/04/2003 &agrave; 11/10/2003',414.00000000,495.14400000,1,0,NULL,19.600,'',0.000,'',0.000,'',414.00000000,81.14000000,0.00000000,0.00000000,495.14000000,0,NULL,NULL,0,NULL,105,0,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(45,16,NULL,NULL,NULL,NULL,'<strong>ref :sd.loc.sp.512.6</strong><br>6 mois - Location de SuperPlan avec la connexion 512kbs<br>Du 11/10/2003 &agrave; 11/04/2004',414.00000000,495.14400000,1,0,NULL,19.600,'',0.000,'',0.000,'',414.00000000,81.14000000,0.00000000,0.00000000,495.14000000,0,NULL,NULL,0,NULL,104,0,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(46,16,NULL,NULL,NULL,NULL,'<strong>ref :sd.installation.annuel</strong><br>Frais de mise en service d\'un serveur dédié pour un paiement annuel<br>',1.00000000,1.19600000,1,0,NULL,19.600,'',0.000,'',0.000,'',1.00000000,0.20000000,0.00000000,0.00000000,1.20000000,0,NULL,NULL,0,NULL,105,0,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(47,17,NULL,NULL,NULL,NULL,'<strong>ref :bk.full250.creation</strong><br>Création du compte backup ftp 250Mo.<br>',1.00000000,1.19600000,1,0,NULL,19.600,'',0.000,'',0.000,'',1.00000000,0.20000000,0.00000000,0.00000000,1.20000000,0,NULL,NULL,0,NULL,106,0,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(48,17,NULL,NULL,NULL,NULL,'<strong>ref :bk.full250.12</strong><br>Redevance pour un backup de 250Mo sur 12 mois<br>',25.00000000,29.90000000,1,0,NULL,19.600,'',0.000,'',0.000,'',25.00000000,4.90000000,0.00000000,0.00000000,29.90000000,0,NULL,NULL,0,NULL,103,0,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(49,18,NULL,NULL,NULL,NULL,'<strong>ref :bk.full250.creation</strong><br>Création du compte backup ftp 250Mo.<br>',1.00000000,1.19600000,1,0,NULL,19.600,'',0.000,'',0.000,'',1.00000000,0.20000000,0.00000000,0.00000000,1.20000000,0,NULL,NULL,0,NULL,0,0,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(50,18,NULL,NULL,NULL,NULL,'<strong>ref :bk.full250.12</strong><br>Redevance pour un backup de 250Mo sur 12 mois<br>',25.00000000,29.90000000,1,0,NULL,19.600,'',0.000,'',0.000,'',25.00000000,4.90000000,0.00000000,0.00000000,29.90000000,0,NULL,NULL,0,NULL,0,0,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(51,19,NULL,NULL,NULL,NULL,'<strong>ref :bk.full250.creation</strong><br>Création du compte backup ftp 250Mo.<br>',1.00000000,1.19600000,1,0,NULL,19.600,'',0.000,'0',0.000,'0',1.00000000,0.20000000,0.00000000,0.00000000,1.20000000,0,NULL,NULL,0,NULL,0,0,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(52,19,NULL,NULL,NULL,NULL,'<strong>ref :bk.full250.12</strong><br>Redevance pour un backup de 250Mo sur 12 mois<br>',25.00000000,29.90000000,1,0,NULL,19.600,'',0.000,'0',0.000,'0',25.00000000,4.90000000,0.00000000,0.00000000,29.90000000,0,NULL,NULL,0,NULL,0,0,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(53,20,NULL,NULL,NULL,NULL,'Chips',20.00000000,23.92000000,10,0,NULL,19.600,'',0.000,'0',0.000,'0',200.00000000,39.20000000,0.00000000,0.00000000,239.20000000,0,NULL,NULL,0,NULL,0,0,0,NULL,0,'EUR',20.00000000,200.00000000,39.20000000,239.20000000),(54,21,NULL,1,'aaa',NULL,'A beatifull pink dress',100.00000000,90.00000000,5,10,NULL,0.000,'',0.000,'0',0.000,'0',450.00000000,0.00000000,0.00000000,0.00000000,450.00000000,0,NULL,NULL,0,NULL,0,0,1,NULL,1,'EUR',100.00000000,450.00000000,0.00000000,450.00000000),(78,22,NULL,1,'BK01',NULL,'A beatifull pink dress',70.00000000,78.75000000,5,0,NULL,12.500,'',0.000,'0',0.000,'0',350.00000000,43.75000000,0.00000000,0.00000000,393.75000000,0,NULL,NULL,0,NULL,0,0,2,NULL,1,'EUR',70.00000000,350.00000000,43.75000000,393.75000000),(83,27,NULL,1,'BK01','Pink dress','A beatifull pink dress',-70.00000000,-78.75000000,5,0,NULL,12.500,'',0.000,'0',0.000,'0',-350.00000000,-43.75000000,0.00000000,0.00000000,-393.75000000,0,NULL,NULL,0,NULL,0,0,2,NULL,1,'EUR',70.00000000,350.00000000,43.75000000,393.75000000),(84,28,NULL,1,'BK01',NULL,'A beatifull pink dress',79.16667000,89.06000000,1,0,NULL,12.500,'',0.000,'0',0.000,'0',79.17000000,9.89000000,0.00000000,0.00000000,89.06000000,0,NULL,NULL,0,NULL,0,0,1,NULL,1,'EUR',79.16667000,79.17000000,9.89000000,89.06000000),(86,30,NULL,NULL,'',NULL,'<strong>ref :bk.full250.creation</strong><br>Création du compte backup ftp 250Mo.<br>',-1.00000000,-1.20000000,1,0,NULL,19.600,'',0.000,'0',0.000,'0',-1.00000000,-0.20000000,0.00000000,0.00000000,-1.20000000,0,NULL,NULL,0,NULL,0,0,0,NULL,0,'',0.00000000,0.00000000,0.00000000,0.00000000),(87,30,NULL,NULL,'',NULL,'<strong>ref :bk.full250.12</strong><br>Redevance pour un backup de 250Mo sur 12 mois<br>',-25.00000000,-29.90000000,1,0,NULL,19.600,'',0.000,'0',0.000,'0',-25.00000000,-4.90000000,0.00000000,0.00000000,-29.90000000,0,NULL,NULL,0,NULL,0,0,0,NULL,0,'',0.00000000,0.00000000,0.00000000,0.00000000),(89,22,NULL,2,'BKPEARPIE',NULL,'',7.00000000,7.00000000,1,0,NULL,0.000,'',0.000,'0',0.000,'0',7.00000000,0.00000000,0.00000000,0.00000000,7.00000000,0,NULL,NULL,0,NULL,0,0,3,NULL,1,'EUR',7.00000000,7.00000000,0.00000000,7.00000000);
 /*!40000 ALTER TABLE `llx_facture_fourn_det` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -7087,8 +7444,9 @@ CREATE TABLE `llx_import_model` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `fk_user` int(11) NOT NULL DEFAULT 0,
   `label` varchar(50) COLLATE utf8_unicode_ci NOT NULL,
-  `type` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `type` varchar(64) COLLATE utf8_unicode_ci DEFAULT NULL,
   `field` text COLLATE utf8_unicode_ci NOT NULL,
+  `entity` int(11) NOT NULL DEFAULT 0,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_import_model` (`label`,`type`)
 ) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
@@ -7100,7 +7458,7 @@ CREATE TABLE `llx_import_model` (
 
 LOCK TABLES `llx_import_model` WRITE;
 /*!40000 ALTER TABLE `llx_import_model` DISABLE KEYS */;
-INSERT INTO `llx_import_model` VALUES (1,12,'Import profile 1','user_1','1=u.login,2=u.lastname,3=u.firstname,4=u.employee,5=u.job,6=u.gender,7=u.accountancy_code,8=u.pass_crypted,9=u.admin,10=u.fk_soc,11=u.address,12=u.zip,13=u.town,14=u.fk_state,15=u.fk_country,16=u.office_phone,17=u.user_mobile,18=u.office_fax,19=u.email,20=u.note,21=u.signature,22=u.fk_user,23=u.thm,24=u.tjm,25=u.weeklyhours,26=u.dateemployment,27=u.salary,28=u.color,29=u.api_key,30=u.birth,31=u.datec,32=u.statut'),(3,0,'Import profile 2','user_1','1=u.login,2=u.lastname,3=u.firstname,4=u.employee,5=u.job,6=u.gender,7=u.accountancy_code,8=u.pass_crypted,9=u.admin,10=u.fk_soc,11=u.address,12=u.zip,13=u.town,14=u.fk_state,15=u.fk_country,16=u.office_phone,17=u.user_mobile,18=u.office_fax,19=u.email,20=u.note,21=u.signature,22=u.fk_user,23=u.thm,24=u.tjm,25=u.weeklyhours,26=u.dateemployment,27=u.salary,28=u.color,29=u.api_key,30=u.birth,31=u.datec,32=u.statut');
+INSERT INTO `llx_import_model` VALUES (1,12,'Import profile 1','user_1','1=u.login,2=u.lastname,3=u.firstname,4=u.employee,5=u.job,6=u.gender,7=u.accountancy_code,8=u.pass_crypted,9=u.admin,10=u.fk_soc,11=u.address,12=u.zip,13=u.town,14=u.fk_state,15=u.fk_country,16=u.office_phone,17=u.user_mobile,18=u.office_fax,19=u.email,20=u.note,21=u.signature,22=u.fk_user,23=u.thm,24=u.tjm,25=u.weeklyhours,26=u.dateemployment,27=u.salary,28=u.color,29=u.api_key,30=u.birth,31=u.datec,32=u.statut',0),(3,0,'Import profile 2','user_1','1=u.login,2=u.lastname,3=u.firstname,4=u.employee,5=u.job,6=u.gender,7=u.accountancy_code,8=u.pass_crypted,9=u.admin,10=u.fk_soc,11=u.address,12=u.zip,13=u.town,14=u.fk_state,15=u.fk_country,16=u.office_phone,17=u.user_mobile,18=u.office_fax,19=u.email,20=u.note,21=u.signature,22=u.fk_user,23=u.thm,24=u.tjm,25=u.weeklyhours,26=u.dateemployment,27=u.salary,28=u.color,29=u.api_key,30=u.birth,31=u.datec,32=u.statut',0);
 /*!40000 ALTER TABLE `llx_import_model` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -7113,17 +7471,17 @@ DROP TABLE IF EXISTS `llx_intracommreport`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_intracommreport` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `ref` varchar(30) NOT NULL,
+  `ref` varchar(30) CHARACTER SET utf8mb4 NOT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
-  `type_declaration` varchar(32) DEFAULT NULL,
-  `period` varchar(32) DEFAULT NULL,
-  `mode` varchar(32) DEFAULT NULL,
-  `content_xml` text DEFAULT NULL,
-  `type_export` varchar(10) DEFAULT NULL,
+  `type_declaration` varchar(32) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `period` varchar(32) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `mode` varchar(32) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `content_xml` text CHARACTER SET utf8mb4 DEFAULT NULL,
+  `type_export` varchar(10) CHARACTER SET utf8mb4 DEFAULT NULL,
   `datec` datetime DEFAULT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -7217,6 +7575,68 @@ LOCK TABLES `llx_inventorydet` WRITE;
 /*!40000 ALTER TABLE `llx_inventorydet` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_knowledgemanagement_knowledgerecord`
+--
+
+DROP TABLE IF EXISTS `llx_knowledgemanagement_knowledgerecord`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_knowledgemanagement_knowledgerecord` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `ref` varchar(128) COLLATE utf8_unicode_ci NOT NULL,
+  `date_creation` datetime NOT NULL,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `last_main_doc` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `fk_user_creat` int(11) NOT NULL,
+  `fk_user_modif` int(11) DEFAULT NULL,
+  `fk_user_valid` int(11) DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `model_pdf` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `question` text COLLATE utf8_unicode_ci NOT NULL,
+  `answer` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `url` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `fk_ticket` int(11) DEFAULT NULL,
+  `fk_c_ticket_category` int(11) DEFAULT NULL,
+  `status` int(11) NOT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_knowledgemanagement_knowledgerecord`
+--
+
+LOCK TABLES `llx_knowledgemanagement_knowledgerecord` WRITE;
+/*!40000 ALTER TABLE `llx_knowledgemanagement_knowledgerecord` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_knowledgemanagement_knowledgerecord` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_knowledgemanagement_knowledgerecord_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_knowledgemanagement_knowledgerecord_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_knowledgemanagement_knowledgerecord_extrafields` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `fk_object` int(11) NOT NULL,
+  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_knowledgemanagement_knowledgerecord_extrafields`
+--
+
+LOCK TABLES `llx_knowledgemanagement_knowledgerecord_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_knowledgemanagement_knowledgerecord_extrafields` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_knowledgemanagement_knowledgerecord_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_links`
 --
@@ -7243,7 +7663,7 @@ CREATE TABLE `llx_links` (
 
 LOCK TABLES `llx_links` WRITE;
 /*!40000 ALTER TABLE `llx_links` DISABLE KEYS */;
-INSERT INTO `ll	_links` VALUES (1,1,'2018-01-16 16:45:35','http://www.dolicloud.com','The DoliCoud service','societe',10),(2,1,'2018-01-16 17:14:35','https://www.dolistore.com/en/tools-documentation/12-SVG-file-for-85cm-x-200cm-rollup.html','Link to rollup file on dolistore.com','product',11),(3,1,'2018-01-22 17:40:23','http://www.nltechno.com','NLtechno portal','societe',10),(4,1,'2018-01-22 18:32:31','https://play.google.com/store/apps/details?id=com.nltechno.dolidroidpro','Link on Google Play','product',5),(6,1,'2019-11-28 16:52:58','https://www.youtube.com/watch?v=hJSXQj_KeE0','Link on YouTube','product',5),(7,1,'2019-11-28 16:53:46','https://www.youtube.com/watch?v=hMNjvManaF4&vl=fr','Link on YouTube','product',12);
+INSERT INTO `llx_links` VALUES (1,1,'2018-01-16 16:45:35','http://www.dolicloud.com','The DoliCoud service','societe',10),(2,1,'2018-01-16 17:14:35','https://www.dolistore.com/en/tools-documentation/12-SVG-file-for-85cm-x-200cm-rollup.html','Link to rollup file on dolistore.com','product',11),(3,1,'2018-01-22 17:40:23','http://www.nltechno.com','NLtechno portal','societe',10),(4,1,'2018-01-22 18:32:31','https://play.google.com/store/apps/details?id=com.nltechno.dolidroidpro','Link on Google Play','product',5),(6,1,'2019-11-28 16:52:58','https://www.youtube.com/watch?v=hJSXQj_KeE0','Link on YouTube','product',5),(7,1,'2019-11-28 16:53:46','https://www.youtube.com/watch?v=hMNjvManaF4&vl=fr','Link on YouTube','product',12);
 /*!40000 ALTER TABLE `llx_links` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -7513,7 +7933,7 @@ CREATE TABLE `llx_menu` (
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `idx_menu_uk_menu` (`menu_handler`,`fk_menu`,`position`,`url`,`entity`),
   KEY `idx_menu_menuhandler_type` (`menu_handler`,`type`)
-) ENGINE=InnoDB AUTO_INCREMENT=167087 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=167134 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -7522,7 +7942,7 @@ CREATE TABLE `llx_menu` (
 
 LOCK TABLES `llx_menu` WRITE;
 /*!40000 ALTER TABLE `llx_menu` DISABLE KEYS */;
-INSERT INTO `llx_menu` VALUES (103094,'all',2,'agenda','top','agenda',0,NULL,NULL,100,'/comm/action/index.php','','Agenda',NULL,'agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103095,'all',2,'agenda','left','agenda',103094,NULL,NULL,100,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda','','Actions',NULL,'agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103096,'all',2,'agenda','left','agenda',103095,NULL,NULL,101,'/comm/action/card.php?mainmenu=agenda&amp;leftmenu=agenda&amp;action=create','','NewAction',NULL,'commercial',NULL,NULL,'($user->rights->agenda->myactions->create||$user->rights->agenda->allactions->create)','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103097,'all',2,'agenda','left','agenda',103095,NULL,NULL,102,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda','','Calendar',NULL,'agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103098,'all',2,'agenda','left','agenda',103097,NULL,NULL,103,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filter=mine','','MenuToDoMyActions',NULL,'agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103099,'all',2,'agenda','left','agenda',103097,NULL,NULL,104,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filter=mine','','MenuDoneMyActions',NULL,'agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103100,'all',2,'agenda','left','agenda',103097,NULL,NULL,105,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo','','MenuToDoActions',NULL,'agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2015-03-13 15:29:19'),(103101,'all',2,'agenda','left','agenda',103097,NULL,NULL,106,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done','','MenuDoneActions',NULL,'agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2015-03-13 15:29:19'),(103102,'all',2,'agenda','left','agenda',103095,NULL,NULL,112,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda','','List',NULL,'agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103103,'all',2,'agenda','left','agenda',103102,NULL,NULL,113,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filter=mine','','MenuToDoMyActions',NULL,'agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103104,'all',2,'agenda','left','agenda',103102,NULL,NULL,114,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filter=mine','','MenuDoneMyActions',NULL,'agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103105,'all',2,'agenda','left','agenda',103102,NULL,NULL,115,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo','','MenuToDoActions',NULL,'agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2015-03-13 15:29:19'),(103106,'all',2,'agenda','left','agenda',103102,NULL,NULL,116,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done','','MenuDoneActions',NULL,'agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2015-03-13 15:29:19'),(103107,'all',2,'agenda','left','agenda',103095,NULL,NULL,120,'/comm/action/rapport/index.php?mainmenu=agenda&amp;leftmenu=agenda','','Reportings',NULL,'agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103134,'all',2,'opensurvey','top','opensurvey',0,NULL,NULL,200,'/opensurvey/index.php','','Surveys',NULL,'opensurvey',NULL,NULL,'$user->rights->opensurvey->survey->read','$conf->opensurvey->enabled',0,'2015-03-13 20:33:42'),(103135,'all',2,'opensurvey','left','opensurvey',-1,NULL,'opensurvey',200,'/opensurvey/index.php?mainmenu=opensurvey&leftmenu=opensurvey','','Survey',NULL,'opensurvey@opensurvey',NULL,'opensurvey','','$conf->opensurvey->enabled',0,'2015-03-13 20:33:42'),(103136,'all',2,'opensurvey','left','opensurvey',-1,'opensurvey','opensurvey',210,'/opensurvey/public/index.php','_blank','NewSurvey',NULL,'opensurvey@opensurvey',NULL,'opensurvey_new','','$conf->opensurvey->enabled',0,'2015-03-13 20:33:42'),(103137,'all',2,'opensurvey','left','opensurvey',-1,'opensurvey','opensurvey',220,'/opensurvey/list.php','','List',NULL,'opensurvey@opensurvey',NULL,'opensurvey_list','','$conf->opensurvey->enabled',0,'2015-03-13 20:33:42'),(161088,'auguria',1,'','top','home',0,NULL,NULL,10,'/index.php?mainmenu=home&amp;leftmenu=','','Home',NULL,'',-1,'','','1',2,'2017-08-30 15:14:30'),(161089,'auguria',1,'societe|fournisseur','top','companies',0,NULL,NULL,20,'/societe/index.php?mainmenu=companies&amp;leftmenu=','','ThirdParties',NULL,'companies',-1,'','$user->rights->societe->lire || $user->rights->societe->contact->lire','( ! empty($conf->societe->enabled) && (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))) || ! empty($conf->fournisseur->enabled)',2,'2017-08-30 15:14:30'),(161090,'auguria',1,'product|service','top','products',0,NULL,NULL,30,'/product/index.php?mainmenu=products&amp;leftmenu=','','Products/Services',NULL,'products',-1,'','$user->rights->produit->lire||$user->rights->service->lire','$conf->product->enabled || $conf->service->enabled',0,'2017-08-30 15:14:30'),(161092,'auguria',1,'propal|commande|fournisseur|contrat|ficheinter','top','commercial',0,NULL,NULL,40,'/comm/index.php?mainmenu=commercial&amp;leftmenu=','','Commercial',NULL,'commercial',-1,'','$user->rights->societe->lire || $user->rights->societe->contact->lire','$conf->propal->enabled || $conf->commande->enabled || $conf->supplier_order->enabled || $conf->contrat->enabled || $conf->ficheinter->enabled',2,'2017-08-30 15:14:30'),(161093,'auguria',1,'comptabilite|accounting|facture|don|tax|salaries|loan','top','accountancy',0,NULL,NULL,50,'/compta/index.php?mainmenu=accountancy&amp;leftmenu=','','MenuFinancial',NULL,'compta',-1,'','$user->rights->compta->resultat->lire || $user->rights->accounting->plancompte->lire || $user->rights->facture->lire|| $user->rights->don->lire || $user->rights->tax->charges->lire || $user->rights->salaries->read || $user->rights->loan->read','$conf->comptabilite->enabled || $conf->accounting->enabled || $conf->facture->enabled || $conf->don->enabled  || $conf->tax->enabled || $conf->salaries->enabled || $conf->supplier_invoice->enabled || $conf->loan->enabled',2,'2017-08-30 15:14:30'),(161094,'auguria',1,'projet','top','project',0,NULL,NULL,70,'/projet/index.php?mainmenu=project&amp;leftmenu=','','Projects',NULL,'projects',-1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2017-08-30 15:14:30'),(161095,'auguria',1,'mailing|export|import|opensurvey|resource','top','tools',0,NULL,NULL,90,'/core/tools.php?mainmenu=tools&amp;leftmenu=','','Tools',NULL,'other',-1,'','$user->rights->mailing->lire || $user->rights->export->lire || $user->rights->import->run || $user->rights->opensurvey->read || $user->rights->resource->read','$conf->mailing->enabled || $conf->export->enabled || $conf->import->enabled || $conf->opensurvey->enabled || $conf->resource->enabled',2,'2017-08-30 15:14:30'),(161101,'auguria',1,'banque|prelevement','top','bank',0,NULL,NULL,60,'/compta/bank/index.php?mainmenu=bank&amp;leftmenu=bank','','MenuBankCash',NULL,'banks',-1,'','$user->rights->banque->lire || $user->rights->prelevement->bons->lire','$conf->banque->enabled || $conf->prelevement->enabled',0,'2017-08-30 15:14:30'),(161102,'auguria',1,'hrm|holiday|deplacement|expensereport','top','hrm',0,NULL,NULL,80,'/hrm/index.php?mainmenu=hrm&amp;leftmenu=','','HRM',NULL,'holiday',-1,'','$user->rights->hrm->employee->read || $user->rights->holiday->write || $user->rights->deplacement->lire || $user->rights->expensereport->lire','$conf->hrm->enabled || $conf->holiday->enabled || $conf->deplacement->enabled || $conf->expensereport->enabled',0,'2017-08-30 15:14:30'),(161177,'auguria',1,'','left','home',161088,NULL,NULL,0,'/index.php','','MyDashboard',NULL,'',0,'','','1',2,'2017-08-30 15:14:30'),(161187,'auguria',1,'','left','home',161088,NULL,NULL,1,'/admin/index.php?leftmenu=setup','','Setup',NULL,'admin',0,'setup','','$user->admin',2,'2017-08-30 15:14:30'),(161188,'auguria',1,'','left','home',161187,NULL,NULL,1,'/admin/company.php?leftmenu=setup','','MenuCompanySetup',NULL,'admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161189,'auguria',1,'','left','home',161187,NULL,NULL,4,'/admin/ihm.php?leftmenu=setup','','GUISetup',NULL,'admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161190,'auguria',1,'','left','home',161187,NULL,NULL,2,'/admin/modules.php?leftmenu=setup','','Modules',NULL,'admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161191,'auguria',1,'','left','home',161187,NULL,NULL,6,'/admin/boxes.php?leftmenu=setup','','Boxes',NULL,'admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161192,'auguria',1,'','left','home',161187,NULL,NULL,3,'/admin/menus.php?leftmenu=setup','','Menus',NULL,'admin',1,'','','$leftmenu==\'setup\'',2,'2017-09-06 08:29:47'),(161193,'auguria',1,'','left','home',161187,NULL,NULL,7,'/admin/delais.php?leftmenu=setup','','Alerts',NULL,'admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161194,'auguria',1,'','left','home',161187,NULL,NULL,10,'/admin/pdf.php?leftmenu=setup','','PDF',NULL,'admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161195,'auguria',1,'','left','home',161187,NULL,NULL,8,'/admin/security_other.php?leftmenu=setup','','Security',NULL,'admin',1,'','','$leftmenu==\'setup\'',2,'2017-09-06 08:29:36'),(161196,'auguria',1,'','left','home',161187,NULL,NULL,11,'/admin/mails.php?leftmenu=setup','','Emails',NULL,'admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161197,'auguria',1,'','left','home',161187,NULL,NULL,9,'/admin/limits.php?leftmenu=setup','','MenuLimits',NULL,'admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161198,'auguria',1,'','left','home',161187,NULL,NULL,13,'/admin/dict.php?leftmenu=setup','','Dictionary',NULL,'admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161199,'auguria',1,'','left','home',161187,NULL,NULL,14,'/admin/const.php?leftmenu=setup','','OtherSetup',NULL,'admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161200,'auguria',1,'','left','home',161187,NULL,NULL,12,'/admin/sms.php?leftmenu=setup','','SMS',NULL,'admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161201,'auguria',1,'','left','home',161187,NULL,NULL,4,'/admin/translation.php?leftmenu=setup','','Translation',NULL,'admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161288,'auguria',1,'','left','home',161387,NULL,NULL,0,'/admin/system/dolibarr.php?leftmenu=admintools','','InfoDolibarr',NULL,'admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161289,'auguria',1,'','left','home',161288,NULL,NULL,2,'/admin/system/modules.php?leftmenu=admintools','','Modules',NULL,'admin',2,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161290,'auguria',1,'','left','home',161288,NULL,NULL,3,'/admin/triggers.php?leftmenu=admintools','','Triggers',NULL,'admin',2,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161291,'auguria',1,'','left','home',161288,NULL,NULL,4,'/admin/system/filecheck.php?leftmenu=admintools','','FileCheck',NULL,'admin',2,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161292,'auguria',1,'','left','home',161387,NULL,NULL,1,'/admin/system/browser.php?leftmenu=admintools','','InfoBrowser',NULL,'admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161293,'auguria',1,'','left','home',161387,NULL,NULL,2,'/admin/system/os.php?leftmenu=admintools','','InfoOS',NULL,'admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161294,'auguria',1,'','left','home',161387,NULL,NULL,3,'/admin/system/web.php?leftmenu=admintools','','InfoWebServer',NULL,'admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161295,'auguria',1,'','left','home',161387,NULL,NULL,4,'/admin/system/phpinfo.php?leftmenu=admintools','','InfoPHP',NULL,'admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161297,'auguria',1,'','left','home',161387,NULL,NULL,5,'/admin/system/database.php?leftmenu=admintools','','InfoDatabase',NULL,'admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161387,'auguria',1,'','left','home',161088,NULL,NULL,2,'/admin/tools/index.php?leftmenu=admintools','','AdminTools',NULL,'admin',0,'admintools','','$user->admin',2,'2017-08-30 15:14:30'),(161388,'auguria',1,'','left','home',161387,NULL,NULL,6,'/admin/tools/dolibarr_export.php?leftmenu=admintools','','Backup',NULL,'admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161389,'auguria',1,'','left','home',161387,NULL,NULL,7,'/admin/tools/dolibarr_import.php?leftmenu=admintools','','Restore',NULL,'admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161392,'auguria',1,'','left','home',161387,NULL,NULL,8,'/admin/tools/update.php?leftmenu=admintools','','MenuUpgrade',NULL,'admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161393,'auguria',1,'','left','home',161387,NULL,NULL,9,'/admin/tools/eaccelerator.php?leftmenu=admintools','','EAccelerator',NULL,'admin',1,'','','$leftmenu==\"admintools\" && function_exists(\"eaccelerator_info\")',2,'2017-08-30 15:14:30'),(161394,'auguria',1,'','left','home',161387,NULL,NULL,10,'/admin/tools/listevents.php?leftmenu=admintools','','Audit',NULL,'admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161395,'auguria',1,'','left','home',161387,NULL,NULL,11,'/admin/tools/listsessions.php?leftmenu=admintools','','Sessions',NULL,'admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161396,'auguria',1,'','left','home',161387,NULL,NULL,12,'/admin/tools/purge.php?leftmenu=admintools','','Purge',NULL,'admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161398,'auguria',1,'','left','home',161387,NULL,NULL,14,'/admin/system/about.php?leftmenu=admintools','','ExternalResources',NULL,'admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161407,'auguria',1,'','left','home',161387,NULL,NULL,15,'/product/admin/product_tools.php?mainmenu=home&amp;leftmenu=admintools','','ProductVatMassChange',NULL,'products',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161487,'auguria',1,'','left','home',161088,NULL,NULL,4,'/user/home.php?leftmenu=users','','MenuUsersAndGroups',NULL,'users',0,'users','','1',2,'2017-08-30 15:14:30'),(161488,'auguria',1,'','left','home',161487,NULL,NULL,0,'/user/index.php?leftmenu=users','','Users',NULL,'users',1,'','$user->rights->user->user->lire || $user->admin','$leftmenu==\"users\"',2,'2017-08-30 15:14:30'),(161489,'auguria',1,'','left','home',161488,NULL,NULL,0,'/user/card.php?leftmenu=users&amp;action=create','','NewUser',NULL,'users',2,'','($user->rights->user->user->creer || $user->admin) && !(! empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE)','$leftmenu==\"users\"',2,'2017-08-30 15:14:30'),(161490,'auguria',1,'','left','home',161487,NULL,NULL,1,'/user/group/index.php?leftmenu=users','','Groups',NULL,'users',1,'','(($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->user->group_advance->read:$user->rights->user->user->lire) || $user->admin) && !(! empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE)','$leftmenu==\"users\"',2,'2017-08-30 15:14:30'),(161491,'auguria',1,'','left','home',161490,NULL,NULL,0,'/user/group/card.php?leftmenu=users&amp;action=create','','NewGroup',NULL,'users',2,'','(($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->user->group_advance->write:$user->rights->user->user->creer) || $user->admin) && !(! empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE)','$leftmenu==\"users\"',2,'2017-08-30 15:14:30'),(161587,'auguria',1,'','left','companies',161089,NULL,NULL,0,'/societe/index.php?leftmenu=thirdparties','','ThirdParty',NULL,'companies',0,'thirdparties','$user->rights->societe->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161588,'auguria',1,'','left','companies',161587,NULL,NULL,0,'/societe/card.php?action=create','','MenuNewThirdParty',NULL,'companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161589,'auguria',1,'','left','companies',161587,NULL,NULL,0,'/societe/list.php?action=create','','List',NULL,'companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161590,'auguria',1,'','left','companies',161587,NULL,NULL,5,'/societe/list.php?type=f&leftmenu=suppliers','','ListSuppliersShort',NULL,'suppliers',1,'','$user->rights->societe->lire && $user->rights->fournisseur->lire','$conf->societe->enabled && $conf->fournisseur->enabled',2,'2017-08-30 15:14:30'),(161591,'auguria',1,'','left','companies',161590,NULL,NULL,0,'/societe/card.php?leftmenu=supplier&amp;action=create&amp;type=f','','NewSupplier',NULL,'suppliers',2,'','$user->rights->societe->creer','$conf->societe->enabled && $conf->fournisseur->enabled',2,'2017-08-30 15:14:30'),(161593,'auguria',1,'','left','companies',161587,NULL,NULL,3,'/societe/list.php?type=p&leftmenu=prospects','','ListProspectsShort',NULL,'companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161594,'auguria',1,'','left','companies',161593,NULL,NULL,0,'/societe/card.php?leftmenu=prospects&amp;action=create&amp;type=p','','MenuNewProspect',NULL,'companies',2,'','$user->rights->societe->creer','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161596,'auguria',1,'','left','companies',161587,NULL,NULL,4,'/societe/list.php?type=c&leftmenu=customers','','ListCustomersShort',NULL,'companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161597,'auguria',1,'','left','companies',161596,NULL,NULL,0,'/societe/card.php?leftmenu=customers&amp;action=create&amp;type=c','','MenuNewCustomer',NULL,'companies',2,'','$user->rights->societe->creer','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161687,'auguria',1,'','left','companies',161089,NULL,NULL,1,'/contact/list.php?leftmenu=contacts','','ContactsAddresses',NULL,'companies',0,'contacts','$user->rights->societe->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161688,'auguria',1,'','left','companies',161687,NULL,NULL,0,'/contact/card.php?leftmenu=contacts&amp;action=create','','NewContactAddress',NULL,'companies',1,'','$user->rights->societe->creer','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161689,'auguria',1,'','left','companies',161687,NULL,NULL,1,'/contact/list.php?leftmenu=contacts','','List',NULL,'companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161691,'auguria',1,'','left','companies',161689,NULL,NULL,1,'/contact/list.php?leftmenu=contacts&amp;type=p','','ThirdPartyProspects',NULL,'companies',2,'','$user->rights->societe->contact->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161692,'auguria',1,'','left','companies',161689,NULL,NULL,2,'/contact/list.php?leftmenu=contacts&amp;type=c','','ThirdPartyCustomers',NULL,'companies',2,'','$user->rights->societe->contact->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161693,'auguria',1,'','left','companies',161689,NULL,NULL,3,'/contact/list.php?leftmenu=contacts&amp;type=f','','ThirdPartySuppliers',NULL,'companies',2,'','$user->rights->societe->contact->lire','$conf->societe->enabled && $conf->fournisseur->enabled',2,'2017-08-30 15:14:30'),(161694,'auguria',1,'','left','companies',161689,NULL,NULL,4,'/contact/list.php?leftmenu=contacts&amp;type=o','','Others',NULL,'companies',2,'','$user->rights->societe->contact->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161737,'auguria',1,'','left','companies',161089,NULL,NULL,3,'/categories/index.php?leftmenu=cat&amp;type=1','','SuppliersCategoriesShort',NULL,'categories',0,'cat','$user->rights->categorie->lire','$conf->societe->enabled && $conf->categorie->enabled',2,'2017-08-30 15:14:30'),(161738,'auguria',1,'','left','companies',161737,NULL,NULL,0,'/categories/card.php?action=create&amp;type=1','','NewCategory',NULL,'categories',1,'','$user->rights->categorie->creer','$conf->societe->enabled && $conf->categorie->enabled',2,'2017-08-30 15:14:30'),(161747,'auguria',1,'','left','companies',161089,NULL,NULL,4,'/categories/index.php?leftmenu=cat&amp;type=2','','CustomersProspectsCategoriesShort',NULL,'categories',0,'cat','$user->rights->categorie->lire','$conf->fournisseur->enabled && $conf->categorie->enabled',2,'2017-08-30 15:14:30'),(161748,'auguria',1,'','left','companies',161747,NULL,NULL,0,'/categories/card.php?action=create&amp;type=2','','NewCategory',NULL,'categories',1,'','$user->rights->categorie->creer','$conf->fournisseur->enabled && $conf->categorie->enabled',2,'2017-08-30 15:14:30'),(161757,'auguria',1,'','left','companies',161089,NULL,NULL,3,'/categories/index.php?leftmenu=cat&amp;type=4','','ContactCategoriesShort',NULL,'categories',0,'cat','$user->rights->categorie->lire','$conf->societe->enabled && $conf->categorie->enabled',2,'2017-08-30 15:14:30'),(161758,'auguria',1,'','left','companies',161757,NULL,NULL,0,'/categories/card.php?action=create&amp;type=4','','NewCategory',NULL,'categories',1,'','$user->rights->categorie->creer','$conf->societe->enabled && $conf->categorie->enabled',2,'2017-08-30 15:14:30'),(162187,'auguria',1,'','left','commercial',161092,NULL,NULL,4,'/comm/propal/index.php?leftmenu=propals','','Prop',NULL,'propal',0,'propals','$user->rights->propale->lire','$conf->propal->enabled',2,'2017-08-30 15:14:30'),(162188,'auguria',1,'','left','commercial',162187,NULL,NULL,0,'/comm/propal/card.php?action=create&amp;leftmenu=propals','','NewPropal',NULL,'propal',1,'','$user->rights->propale->creer','$conf->propal->enabled',2,'2017-08-30 15:14:30'),(162189,'auguria',1,'','left','commercial',162187,NULL,NULL,1,'/comm/propal/list.php?leftmenu=propals','','List',NULL,'propal',1,'','$user->rights->propale->lire','$conf->propal->enabled',2,'2017-08-30 15:14:30'),(162190,'auguria',1,'','left','commercial',162189,NULL,NULL,2,'/comm/propal/list.php?leftmenu=propals&amp;search_status=0','','PropalsDraft',NULL,'propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2017-08-30 15:14:30'),(162191,'auguria',1,'','left','commercial',162189,NULL,NULL,3,'/comm/propal/list.php?leftmenu=propals&amp;search_status=1','','PropalsOpened',NULL,'propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2017-08-30 15:14:30'),(162192,'auguria',1,'','left','commercial',162189,NULL,NULL,4,'/comm/propal/list.php?leftmenu=propals&amp;search_status=2','','PropalStatusSigned',NULL,'propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2017-08-30 15:14:30'),(162193,'auguria',1,'','left','commercial',162189,NULL,NULL,5,'/comm/propal/list.php?leftmenu=propals&amp;search_status=3','','PropalStatusNotSigned',NULL,'propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2017-08-30 15:14:30'),(162194,'auguria',1,'','left','commercial',162189,NULL,NULL,6,'/comm/propal/list.php?leftmenu=propals&amp;search_status=4','','PropalStatusBilled',NULL,'propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2017-08-30 15:14:30'),(162197,'auguria',1,'','left','commercial',162187,NULL,NULL,4,'/comm/propal/stats/index.php?leftmenu=propals','','Statistics',NULL,'propal',1,'','$user->rights->propale->lire','$conf->propal->enabled',2,'2017-08-30 15:14:30'),(162287,'auguria',1,'','left','commercial',161092,NULL,NULL,5,'/commande/index.php?leftmenu=orders','','CustomersOrders',NULL,'orders',0,'orders','$user->rights->commande->lire','$conf->commande->enabled',2,'2017-08-30 15:14:30'),(162288,'auguria',1,'','left','commercial',162287,NULL,NULL,0,'/commande/card.php?action=create&amp;leftmenu=orders','','NewOrder',NULL,'orders',1,'','$user->rights->commande->creer','$conf->commande->enabled',2,'2017-08-30 15:14:30'),(162289,'auguria',1,'','left','commercial',162287,NULL,NULL,1,'/commande/list.php?leftmenu=orders','','List',NULL,'orders',1,'','$user->rights->commande->lire','$conf->commande->enabled',2,'2017-08-30 15:14:30'),(162290,'auguria',1,'','left','commercial',162289,NULL,NULL,2,'/commande/list.php?leftmenu=orders&amp;search_status=0','','StatusOrderDraftShort',NULL,'orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2017-08-30 15:14:30'),(162291,'auguria',1,'','left','commercial',162289,NULL,NULL,3,'/commande/list.php?leftmenu=orders&amp;search_status=1','','StatusOrderValidated',NULL,'orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2017-08-30 15:14:30'),(162292,'auguria',1,'','left','commercial',162289,NULL,NULL,4,'/commande/list.php?leftmenu=orders&amp;search_status=2','','StatusOrderOnProcessShort',NULL,'orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2017-08-30 15:14:30'),(162293,'auguria',1,'','left','commercial',162289,NULL,NULL,5,'/commande/list.php?leftmenu=orders&amp;search_status=3','','StatusOrderToBill',NULL,'orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2017-08-30 15:14:30'),(162294,'auguria',1,'','left','commercial',162289,NULL,NULL,6,'/commande/list.php?leftmenu=orders&amp;search_status=4','','StatusOrderProcessed',NULL,'orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2017-08-30 15:14:30'),(162295,'auguria',1,'','left','commercial',162289,NULL,NULL,7,'/commande/list.php?leftmenu=orders&amp;search_status=-1','','StatusOrderCanceledShort',NULL,'orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2017-08-30 15:14:30'),(162296,'auguria',1,'','left','commercial',162287,NULL,NULL,4,'/commande/stats/index.php?leftmenu=orders','','Statistics',NULL,'orders',1,'','$user->rights->commande->lire','$conf->commande->enabled',2,'2017-08-30 15:14:30'),(162387,'auguria',1,'','left','commercial',161090,NULL,NULL,6,'/expedition/index.php?leftmenu=sendings','','Shipments',NULL,'sendings',0,'sendings','$user->rights->expedition->lire','$conf->expedition->enabled',2,'2017-08-30 15:14:30'),(162388,'auguria',1,'','left','commercial',162387,NULL,NULL,0,'/expedition/card.php?action=create2&leftmenu=sendings','','NewSending',NULL,'sendings',1,'','$user->rights->expedition->creer','$conf->expedition->enabled && $leftmenu==\"sendings\"',2,'2017-08-30 15:14:30'),(162389,'auguria',1,'','left','commercial',162387,NULL,NULL,1,'/expedition/list.php?leftmenu=sendings','','List',NULL,'sendings',1,'','$user->rights->expedition->lire','$conf->expedition->enabled && $leftmenu==\"sendings\"',2,'2017-08-30 15:14:30'),(162390,'auguria',1,'','left','commercial',162387,NULL,NULL,2,'/expedition/stats/index.php?leftmenu=sendings','','Statistics',NULL,'sendings',1,'','$user->rights->expedition->lire','$conf->expedition->enabled && $leftmenu==\"sendings\"',2,'2017-08-30 15:14:30'),(162487,'auguria',1,'','left','commercial',161092,NULL,NULL,7,'/contrat/index.php?leftmenu=contracts','','Contracts',NULL,'contracts',0,'contracts','$user->rights->contrat->lire','$conf->contrat->enabled',2,'2017-08-30 15:14:30'),(162488,'auguria',1,'','left','commercial',162487,NULL,NULL,0,'/contrat/card.php?&action=create&amp;leftmenu=contracts','','NewContract',NULL,'contracts',1,'','$user->rights->contrat->creer','$conf->contrat->enabled',2,'2017-08-30 15:14:30'),(162489,'auguria',1,'','left','commercial',162487,NULL,NULL,1,'/contrat/list.php?leftmenu=contracts','','List',NULL,'contracts',1,'','$user->rights->contrat->lire','$conf->contrat->enabled',2,'2017-08-30 15:14:30'),(162490,'auguria',1,'','left','commercial',162487,NULL,NULL,2,'/contrat/services.php?leftmenu=contracts','','MenuServices',NULL,'contracts',1,'','$user->rights->contrat->lire','$conf->contrat->enabled',2,'2017-08-30 15:14:30'),(162491,'auguria',1,'','left','commercial',162490,NULL,NULL,0,'/contrat/services.php?leftmenu=contracts&amp;mode=0','','MenuInactiveServices',NULL,'contracts',2,'','$user->rights->contrat->lire','$conf->contrat->enabled && $leftmenu==\"contracts\"',2,'2017-08-30 15:14:30'),(162492,'auguria',1,'','left','commercial',162490,NULL,NULL,1,'/contrat/services.php?leftmenu=contracts&amp;mode=4','','MenuRunningServices',NULL,'contracts',2,'','$user->rights->contrat->lire','$conf->contrat->enabled && $leftmenu==\"contracts\"',2,'2017-08-30 15:14:30'),(162493,'auguria',1,'','left','commercial',162490,NULL,NULL,2,'/contrat/services.php?leftmenu=contracts&amp;mode=4&amp;filter=expired','','MenuExpiredServices',NULL,'contracts',2,'','$user->rights->contrat->lire','$conf->contrat->enabled && $leftmenu==\"contracts\"',2,'2017-08-30 15:14:30'),(162494,'auguria',1,'','left','commercial',162490,NULL,NULL,3,'/contrat/services.php?leftmenu=contracts&amp;mode=5','','MenuClosedServices',NULL,'contracts',2,'','$user->rights->contrat->lire','$conf->contrat->enabled && $leftmenu==\"contracts\"',2,'2017-08-30 15:14:30'),(162587,'auguria',1,'','left','commercial',161092,NULL,NULL,8,'/fichinter/list.php?leftmenu=ficheinter','','Interventions',NULL,'interventions',0,'ficheinter','$user->rights->ficheinter->lire','$conf->ficheinter->enabled',2,'2017-08-30 15:14:30'),(162588,'auguria',1,'','left','commercial',162587,NULL,NULL,0,'/fichinter/card.php?action=create&amp;leftmenu=ficheinter','','NewIntervention',NULL,'interventions',1,'','$user->rights->ficheinter->creer','$conf->ficheinter->enabled',2,'2017-08-30 15:14:30'),(162589,'auguria',1,'','left','commercial',162587,NULL,NULL,1,'/fichinter/list.php?leftmenu=ficheinter','','List',NULL,'interventions',1,'','$user->rights->ficheinter->lire','$conf->ficheinter->enabled',2,'2017-08-30 15:14:30'),(162590,'auguria',1,'','left','commercial',162587,NULL,NULL,2,'/fichinter/stats/index.php?leftmenu=ficheinter','','Statistics',NULL,'interventions',1,'','$user->rights->ficheinter->lire','$conf->ficheinter->enabled',2,'2017-08-30 15:14:30'),(162687,'auguria',1,'','left','accountancy',161093,NULL,NULL,3,'/fourn/facture/list.php?leftmenu=suppliers_bills','','BillsSuppliers',NULL,'bills',0,'supplier_bills','$user->rights->fournisseur->facture->lire','$conf->supplier_invoice->enabled',2,'2017-08-30 15:14:30'),(162688,'auguria',1,'','left','accountancy',162687,NULL,NULL,0,'/fourn/facture/card.php?action=create&amp;leftmenu=suppliers_bills','','NewBill',NULL,'bills',1,'','$user->rights->fournisseur->facture->creer','$conf->supplier_invoice->enabled',2,'2017-08-30 15:14:30'),(162689,'auguria',1,'','left','accountancy',162687,NULL,NULL,1,'/fourn/facture/list.php?leftmenu=suppliers_bills','','List',NULL,'bills',1,'','$user->rights->fournisseur->facture->lire','$conf->supplier_invoice->enabled',2,'2017-08-30 15:14:30'),(162690,'auguria',1,'','left','accountancy',162687,NULL,NULL,2,'/fourn/facture/paiement.php?leftmenu=suppliers_bills','','Payments',NULL,'bills',1,'','$user->rights->fournisseur->facture->lire','$conf->supplier_invoice->enabled',2,'2017-08-30 15:14:30'),(162691,'auguria',1,'','left','accountancy',162687,NULL,NULL,8,'/compta/facture/stats/index.php?leftmenu=customers_bills&mode=supplier','','Statistics',NULL,'bills',1,'','$user->rights->fournisseur->facture->lire','$conf->supplier_invoice->enabled',2,'2017-08-30 15:14:30'),(162692,'auguria',1,'','left','accountancy',162690,NULL,NULL,1,'/fourn/facture/rapport.php?leftmenu=suppliers_bills','','Reporting',NULL,'bills',2,'','$user->rights->fournisseur->facture->lire','$conf->supplier_invoice->enabled',2,'2017-08-30 15:14:30'),(162787,'auguria',1,'','left','accountancy',161093,NULL,NULL,3,'/compta/facture/list.php?leftmenu=customers_bills','','BillsCustomers',NULL,'bills',0,'customer_bills','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162788,'auguria',1,'','left','accountancy',162787,NULL,NULL,3,'/compta/facture/card.php?action=create&amp;leftmenu=customers_bills','','NewBill',NULL,'bills',1,'','$user->rights->facture->creer','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162789,'auguria',1,'','left','accountancy',162787,NULL,NULL,5,'/compta/facture/fiche-rec.php?leftmenu=customers_bills','','ListOfTemplates',NULL,'bills',1,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162791,'auguria',1,'','left','accountancy',162787,NULL,NULL,6,'/compta/paiement/list.php?leftmenu=customers_bills','','Payments',NULL,'bills',1,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162792,'auguria',1,'','left','accountancy',162787,NULL,NULL,4,'/compta/facture/list.php?leftmenu=customers_bills','','List',NULL,'bills',1,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162797,'auguria',1,'','left','accountancy',162791,NULL,NULL,1,'/compta/paiement/rapport.php?leftmenu=customers_bills','','Reportings',NULL,'bills',2,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162798,'auguria',1,'','left','accountancy',161101,NULL,NULL,9,'/compta/paiement/cheque/index.php?leftmenu=checks&amp;mainmenu=bank','','MenuChequeDeposits',NULL,'bills',0,'checks','$user->rights->banque->lire','empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT) && ! empty($conf->banque->enabled) && (! empty($conf->facture->enabled) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON))',2,'2017-08-30 15:14:30'),(162799,'auguria',1,'','left','accountancy',162798,NULL,NULL,0,'/compta/paiement/cheque/card.php?leftmenu=checks&amp;action=new','','NewCheckDeposit',NULL,'compta',1,'','$user->rights->banque->lire','empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT) && ! empty($conf->banque->enabled) && (! empty($conf->facture->enabled) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON))',2,'2017-08-30 15:14:30'),(162800,'auguria',1,'','left','accountancy',162798,NULL,NULL,1,'/compta/paiement/cheque/list.php?leftmenu=checks','','List',NULL,'bills',1,'','$user->rights->banque->lire','empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT) && ! empty($conf->banque->enabled) && (! empty($conf->facture->enabled) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON))',2,'2017-08-30 15:14:30'),(162801,'auguria',1,'','left','accountancy',162787,NULL,NULL,8,'/compta/facture/stats/index.php?leftmenu=customers_bills','','Statistics',NULL,'bills',1,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162807,'auguria',1,'','left','accountancy',162792,NULL,NULL,1,'/compta/facture/list.php?leftmenu=customers_bills&amp;search_status=0','','BillShortStatusDraft',NULL,'bills',2,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162808,'auguria',1,'','left','accountancy',162792,NULL,NULL,2,'/compta/facture/list.php?leftmenu=customers_bills&amp;search_status=1','','BillShortStatusNotPaid',NULL,'bills',2,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162809,'auguria',1,'','left','accountancy',162792,NULL,NULL,3,'/compta/facture/list.php?leftmenu=customers_bills&amp;search_status=2','','BillShortStatusPaid',NULL,'bills',2,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162810,'auguria',1,'','left','accountancy',162792,NULL,NULL,4,'/compta/facture/list.php?leftmenu=customers_bills&amp;search_status=3','','BillShortStatusCanceled',NULL,'bills',2,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162987,'auguria',1,'','left','accountancy',161093,NULL,NULL,3,'/commande/list.php?leftmenu=orders&amp;search_status=3','','MenuOrdersToBill',NULL,'orders',0,'orders','$user->rights->commande->lire','$conf->commande->enabled',0,'2017-08-30 15:14:30'),(163087,'auguria',1,'','left','accountancy',161093,NULL,NULL,4,'/don/index.php?leftmenu=donations&amp;mainmenu=accountancy','','Donations',NULL,'donations',0,'donations','$user->rights->don->lire','$conf->don->enabled',2,'2017-08-30 15:14:30'),(163088,'auguria',1,'','left','accountancy',163087,NULL,NULL,0,'/don/card.php?leftmenu=donations&amp;mainmenu=accountancy&amp;action=create','','NewDonation',NULL,'donations',1,'','$user->rights->don->creer','$conf->don->enabled && $leftmenu==\"donations\"',2,'2017-08-30 15:14:30'),(163089,'auguria',1,'','left','accountancy',163087,NULL,NULL,1,'/don/list.php?leftmenu=donations&amp;mainmenu=accountancy','','List',NULL,'donations',1,'','$user->rights->don->lire','$conf->don->enabled && $leftmenu==\"donations\"',2,'2017-08-30 15:14:30'),(163187,'auguria',1,'','left','accountancy',161102,NULL,NULL,5,'/compta/deplacement/index.php?leftmenu=tripsandexpenses','','TripsAndExpenses',NULL,'trips',0,'tripsandexpenses','$user->rights->deplacement->lire','$conf->deplacement->enabled',0,'2017-08-30 15:14:30'),(163188,'auguria',1,'','left','accountancy',163187,NULL,NULL,1,'/compta/deplacement/card.php?action=create&amp;leftmenu=tripsandexpenses','','New',NULL,'trips',1,'','$user->rights->deplacement->creer','$conf->deplacement->enabled',0,'2017-08-30 15:14:30'),(163189,'auguria',1,'','left','accountancy',163187,NULL,NULL,2,'/compta/deplacement/list.php?leftmenu=tripsandexpenses','','List',NULL,'trips',1,'','$user->rights->deplacement->lire','$conf->deplacement->enabled',0,'2017-08-30 15:14:30'),(163190,'auguria',1,'','left','accountancy',163187,NULL,NULL,2,'/compta/deplacement/stats/index.php?leftmenu=tripsandexpenses','','Statistics',NULL,'trips',1,'','$user->rights->deplacement->lire','$conf->deplacement->enabled',0,'2017-08-30 15:14:30'),(163287,'auguria',1,'','left','accountancy',161093,NULL,NULL,6,'/compta/charges/index.php?leftmenu=tax&amp;mainmenu=accountancy','','MenuSpecialExpenses',NULL,'compta',0,'tax','(! empty($conf->tax->enabled) && $user->rights->tax->charges->lire) || (! empty($conf->salaries->enabled) && $user->rights->salaries->read)','$conf->tax->enabled || $conf->salaries->enabled',0,'2017-08-30 15:14:30'),(163297,'auguria',1,'','left','accountancy',163287,NULL,NULL,1,'/compta/salaries/index.php?leftmenu=tax_salary&amp;mainmenu=accountancy','','Salaries',NULL,'salaries',1,'tax_sal','$user->rights->salaries->payment->read','$conf->salaries->enabled',0,'2017-08-30 15:14:30'),(163298,'auguria',1,'','left','accountancy',163297,NULL,NULL,2,'/compta/salaries/card.php?leftmenu=tax_salary&amp;action=create','','NewPayment',NULL,'companies',2,'','$user->rights->salaries->payment->write','$conf->salaries->enabled && $leftmenu==\"tax_salary\"',0,'2017-08-30 15:14:30'),(163299,'auguria',1,'','left','accountancy',163297,NULL,NULL,3,'/compta/salaries/index.php?leftmenu=tax_salary','','Payments',NULL,'companies',2,'','$user->rights->salaries->payment->read','$conf->salaries->enabled && $leftmenu==\"tax_salary\"',0,'2017-08-30 15:14:30'),(163307,'auguria',1,'','left','accountancy',163287,NULL,NULL,1,'/loan/index.php?leftmenu=tax_loan&amp;mainmenu=accountancy','','Loans',NULL,'loan',1,'tax_loan','$user->rights->loan->read','$conf->loan->enabled',0,'2017-08-30 15:14:30'),(163308,'auguria',1,'','left','accountancy',163307,NULL,NULL,2,'/loan/card.php?leftmenu=tax_loan&amp;action=create','','NewLoan',NULL,'loan',2,'','$user->rights->loan->write','$conf->loan->enabled && $leftmenu==\"tax_loan\"',0,'2017-08-30 15:14:30'),(163310,'auguria',1,'','left','accountancy',163307,NULL,NULL,4,'/loan/calc.php?leftmenu=tax_loan','','Calculator',NULL,'companies',2,'','$user->rights->loan->calc','$conf->loan->enabled && $leftmenu==\"tax_loan\" && ! empty($conf->global->LOAN_SHOW_CALCULATOR)',0,'2017-08-30 15:14:30'),(163337,'auguria',1,'','left','accountancy',163287,NULL,NULL,1,'/compta/sociales/index.php?leftmenu=tax_social','','SocialContributions',NULL,'',1,'tax_social','$user->rights->tax->charges->lire','$conf->tax->enabled',0,'2017-08-30 15:14:30'),(163338,'auguria',1,'','left','accountancy',163337,NULL,NULL,2,'/compta/sociales/card.php?leftmenu=tax_social&amp;action=create','','MenuNewSocialContribution',NULL,'',2,'','$user->rights->tax->charges->creer','$conf->tax->enabled && $leftmenu==\"tax_social\"',0,'2017-08-30 15:14:30'),(163339,'auguria',1,'','left','accountancy',163337,NULL,NULL,3,'/compta/sociales/payments.php?leftmenu=tax_social&amp;mainmenu=accountancy&amp;mode=sconly','','Payments',NULL,'',2,'','$user->rights->tax->charges->lire','$conf->tax->enabled && $leftmenu==\"tax_social\"',0,'2017-08-30 15:14:30'),(163387,'auguria',1,'','left','accountancy',163287,NULL,NULL,7,'/compta/tva/index.php?leftmenu=tax_vat&amp;mainmenu=accountancy','','VAT',NULL,'companies',1,'tax_vat','$user->rights->tax->charges->lire','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS)',0,'2017-08-30 15:14:30'),(163388,'auguria',1,'','left','accountancy',163387,NULL,NULL,0,'/compta/tva/card.php?leftmenu=tax_vat&amp;action=create','','New',NULL,'companies',2,'','$user->rights->tax->charges->creer','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu==\"tax_vat\"',0,'2017-08-30 15:14:30'),(163389,'auguria',1,'','left','accountancy',163387,NULL,NULL,1,'/compta/tva/reglement.php?leftmenu=tax_vat','','List',NULL,'companies',2,'','$user->rights->tax->charges->lire','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu==\"tax_vat\"',0,'2017-08-30 15:14:30'),(163390,'auguria',1,'','left','accountancy',163387,NULL,NULL,2,'/compta/tva/clients.php?leftmenu=tax_vat','','ReportByCustomers',NULL,'companies',2,'','$user->rights->tax->charges->lire','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu==\"tax_vat\"',0,'2017-08-30 15:14:30'),(163391,'auguria',1,'','left','accountancy',163387,NULL,NULL,3,'/compta/tva/quadri_detail.php?leftmenu=tax_vat','','ReportByQuarter',NULL,'companies',2,'','$user->rights->tax->charges->lire','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu==\"tax_vat\"',0,'2017-08-30 15:14:30'),(163487,'auguria',1,'','left','accountancy',161093,NULL,NULL,7,'/accountancy/index.php?leftmenu=accountancy','','MenuAccountancy',NULL,'accountancy',0,'accounting','! empty($conf->accounting->enabled) || $user->rights->accounting->bind->write || $user->rights->accounting->bind->write || $user->rights->compta->resultat->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163488,'auguria',1,'','left','accountancy',163487,NULL,NULL,2,'/accountancy/customer/index.php?leftmenu=dispatch_customer','','CustomersVentilation',NULL,'accountancy',1,'dispatch_customer','$user->rights->accounting->bind->write','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163489,'auguria',1,'','left','accountancy',163488,NULL,NULL,3,'/accountancy/customer/list.php','','ToDispatch',NULL,'accountancy',2,'','$user->rights->accounting->bind->write','$conf->accounting->enabled && $leftmenu==\"dispatch_customer\"',0,'2017-08-30 15:14:30'),(163490,'auguria',1,'','left','accountancy',163488,NULL,NULL,4,'/accountancy/customer/lines.php','','Dispatched',NULL,'accountancy',2,'','$user->rights->accounting->bind->write','$conf->accounting->enabled && $leftmenu==\"dispatch_customer\"',0,'2017-08-30 15:14:30'),(163497,'auguria',1,'','left','accountancy',163487,NULL,NULL,5,'/accountancy/supplier/index.php?leftmenu=dispatch_supplier','','SuppliersVentilation',NULL,'accountancy',1,'ventil_supplier','$user->rights->accounting->bind->write','$conf->accounting->enabled && $conf->fournisseur->enabled',0,'2017-08-30 15:14:30'),(163498,'auguria',1,'','left','accountancy',163497,NULL,NULL,6,'/accountancy/supplier/list.php','','ToDispatch',NULL,'accountancy',2,'','$user->rights->accounting->bind->write','$conf->accounting->enabled && $conf->fournisseur->enabled && $leftmenu==\"dispatch_supplier\"',0,'2017-08-30 15:14:30'),(163499,'auguria',1,'','left','accountancy',163497,NULL,NULL,7,'/accountancy/supplier/lines.php','','Dispatched',NULL,'accountancy',2,'','$user->rights->accounting->bind->write','$conf->accounting->enabled && $conf->fournisseur->enabled && $leftmenu==\"dispatch_supplier\"',0,'2017-08-30 15:14:30'),(163507,'auguria',1,'','left','accountancy',163487,NULL,NULL,5,'/accountancy/expensereport/index.php?leftmenu=dispatch_expensereport','','ExpenseReportsVentilation',NULL,'accountancy',1,'ventil_expensereport','$user->rights->accounting->bind->write','$conf->accounting->enabled && $conf->expensereport->enabled',0,'2017-08-30 15:14:30'),(163508,'auguria',1,'','left','accountancy',163507,NULL,NULL,6,'/accountancy/expensereport/list.php','','ToDispatch',NULL,'accountancy',2,'','$user->rights->accounting->bind->write','$conf->accounting->enabled && $conf->expensereport->enabled && $leftmenu==\"dispatch_expensereport\"',0,'2017-08-30 15:14:30'),(163509,'auguria',1,'','left','accountancy',163507,NULL,NULL,7,'/accountancy/expensereport/lines.php','','Dispatched',NULL,'accountancy',2,'','$user->rights->accounting->bind->write','$conf->accounting->enabled && $conf->expensereport->enabled && $leftmenu==\"dispatch_expensereport\"',0,'2017-08-30 15:14:30'),(163517,'auguria',1,'','left','accountancy',163487,NULL,NULL,15,'/accountancy/bookkeeping/list.php','','Bookkeeping',NULL,'accountancy',1,'bookkeeping','$user->rights->accounting->mouvements->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163522,'auguria',1,'','left','accountancy',163487,NULL,NULL,16,'/accountancy/bookkeeping/balance.php','','AccountBalance',NULL,'accountancy',1,'balance','$user->rights->accounting->mouvements->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163527,'auguria',1,'','left','accountancy',163487,NULL,NULL,17,'/accountancy/report/result.php?mainmenu=accountancy&leftmenu=accountancy','','Reportings',NULL,'main',1,'report','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163528,'auguria',1,'','left','accountancy',163527,NULL,NULL,19,'/compta/resultat/index.php?mainmenu=accountancy&leftmenu=accountancy','','ReportInOut',NULL,'main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled && $leftmenu==\"accountancy\"',0,'2017-08-30 15:14:30'),(163529,'auguria',1,'','left','accountancy',163528,NULL,NULL,18,'/accountancy/report/result.php?mainmenu=accountancy&leftmenu=accountancy','','ByAccounts',NULL,'main',3,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled && $leftmenu==\"accountancy\"',0,'2017-08-30 15:14:30'),(163530,'auguria',1,'','left','accountancy',163528,NULL,NULL,20,'/compta/resultat/clientfourn.php?mainmenu=accountancy&leftmenu=accountancy','','ByCompanies',NULL,'main',3,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled && $leftmenu==\"accountancy\"',0,'2017-08-30 15:14:30'),(163531,'auguria',1,'','left','accountancy',163527,NULL,NULL,21,'/compta/stats/index.php?mainmenu=accountancy&leftmenu=accountancy','','ReportTurnover',NULL,'main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled && $leftmenu==\"accountancy\"',0,'2017-08-30 15:14:30'),(163532,'auguria',1,'','left','accountancy',163531,NULL,NULL,22,'/compta/stats/casoc.php?mainmenu=accountancy&leftmenu=accountancy','','ByCompanies',NULL,'main',3,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled && $leftmenu==\"accountancy\"',0,'2017-08-30 15:14:30'),(163533,'auguria',1,'','left','accountancy',163531,NULL,NULL,23,'/compta/stats/cabyuser.php?mainmenu=accountancy&leftmenu=accountancy','','ByUsers',NULL,'main',3,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled && $leftmenu==\"accountancy\"',0,'2017-08-30 15:14:30'),(163534,'auguria',1,'','left','accountancy',163531,NULL,NULL,24,'/compta/stats/cabyprodserv.php?mainmenu=accountancy&leftmenu=accountancy','','ByProductsAndServices',NULL,'main',3,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled && $leftmenu==\"accountancy\"',0,'2017-08-30 15:14:30'),(163537,'auguria',1,'','left','accountancy',163538,NULL,NULL,80,'/accountancy/admin/fiscalyear.php?mainmenu=accountancy&leftmenu=accountancy_admin','','FiscalPeriod',NULL,'admin',1,'accountancy_admin_period','','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\" && $conf->global->MAIN_FEATURES_LEVEL > 0',2,'2017-08-30 15:14:30'),(163538,'auguria',1,'','left','accountancy',163487,NULL,NULL,1,'/accountancy/index.php?mainmenu=accountancy&leftmenu=accountancy_admin','','Setup',NULL,'accountancy',1,'accountancy_admin','$user->rights->accounting->chartofaccount','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163541,'auguria',1,'','left','accountancy',163538,NULL,NULL,10,'/accountancy/admin/journals_list.php?id=35&mainmenu=accountancy&leftmenu=accountancy_admin','','AccountingJournals',NULL,'accountancy',2,'accountancy_admin_journal','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163542,'auguria',1,'','left','accountancy',163538,NULL,NULL,20,'/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin','','Pcg_version',NULL,'accountancy',2,'accountancy_admin_chartmodel','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163543,'auguria',1,'','left','accountancy',163538,NULL,NULL,30,'/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin','','Chartofaccounts',NULL,'accountancy',2,'accountancy_admin_chart','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163544,'auguria',1,'','left','accountancy',163538,NULL,NULL,40,'/accountancy/admin/categories_list.php?id=32&mainmenu=accountancy&leftmenu=accountancy_admin','','AccountingCategory',NULL,'accountancy',2,'accountancy_admin_chart_group','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163545,'auguria',1,'','left','accountancy',163538,NULL,NULL,50,'/accountancy/admin/defaultaccounts.php?mainmenu=accountancy&leftmenu=accountancy_admin','','MenuDefaultAccounts',NULL,'accountancy',2,'accountancy_admin_default','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163546,'auguria',1,'','left','accountancy',163538,NULL,NULL,60,'/admin/dict.php?id=10&from=accountancy&search_country_id=__MYCOUNTRYID__&mainmenu=accountancy&leftmenu=accountancy_admin','','MenuVatAccounts',NULL,'accountancy',2,'accountancy_admin_vat','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163547,'auguria',1,'','left','accountancy',163538,NULL,NULL,70,'/admin/dict.php?id=7&from=accountancy&search_country_id=__MYCOUNTRYID__&mainmenu=accountancy&leftmenu=accountancy_admin','','MenuTaxAccounts',NULL,'accountancy',2,'accountancy_admin_tax','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163548,'auguria',1,'','left','accountancy',163538,NULL,NULL,80,'/admin/dict.php?id=17&from=accountancy&mainmenu=accountancy&leftmenu=accountancy_admin','','MenuExpenseReportAccounts',NULL,'accountancy',2,'accountancy_admin_expensereport','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $conf->expensereport->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163549,'auguria',1,'','left','accountancy',163538,NULL,NULL,90,'/accountancy/admin/productaccount.php?mainmenu=accountancy&leftmenu=accountancy_admin','','MenuProductsAccounts',NULL,'accountancy',2,'accountancy_admin_product','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163587,'auguria',1,'','left','accountancy',161101,NULL,NULL,9,'/compta/prelevement/index.php?leftmenu=withdraw&amp;mainmenu=bank','','StandingOrders',NULL,'withdrawals',0,'withdraw','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled',2,'2017-08-30 15:14:30'),(163589,'auguria',1,'','left','accountancy',163587,NULL,NULL,0,'/compta/prelevement/create.php?leftmenu=withdraw','','NewStandingOrder',NULL,'withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2017-08-30 15:14:30'),(163590,'auguria',1,'','left','accountancy',163587,NULL,NULL,2,'/compta/prelevement/bons.php?leftmenu=withdraw','','WithdrawalsReceipts',NULL,'withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2017-08-30 15:14:30'),(163591,'auguria',1,'','left','accountancy',163587,NULL,NULL,3,'/compta/prelevement/list.php?leftmenu=withdraw','','WithdrawalsLines',NULL,'withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2017-08-30 15:14:30'),(163593,'auguria',1,'','left','accountancy',163587,NULL,NULL,5,'/compta/prelevement/rejets.php?leftmenu=withdraw','','Rejects',NULL,'withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2017-08-30 15:14:30'),(163594,'auguria',1,'','left','accountancy',163587,NULL,NULL,6,'/compta/prelevement/stats.php?leftmenu=withdraw','','Statistics',NULL,'withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2017-08-30 15:14:30'),(163687,'auguria',1,'','left','accountancy',161101,NULL,NULL,1,'/compta/bank/index.php?leftmenu=bank&amp;mainmenu=bank','','MenuBankCash',NULL,'banks',0,'bank','$user->rights->banque->lire','$conf->banque->enabled',0,'2017-08-30 15:14:30'),(163688,'auguria',1,'','left','accountancy',163687,NULL,NULL,0,'/compta/bank/card.php?action=create&amp;leftmenu=bank','','MenuNewFinancialAccount',NULL,'banks',1,'','$user->rights->banque->configurer','$conf->banque->enabled && ($leftmenu==\"bank\" || $leftmenu==\"checks\" || $leftmenu==\"withdraw\")',0,'2017-08-30 15:14:30'),(163690,'auguria',1,'','left','accountancy',163687,NULL,NULL,2,'/compta/bank/bankentries.php?leftmenu=bank','','ListTransactions',NULL,'banks',1,'','$user->rights->banque->lire','$conf->banque->enabled && ($leftmenu==\"bank\" || $leftmenu==\"checks\" || $leftmenu==\"withdraw\")',0,'2017-08-30 15:14:30'),(163691,'auguria',1,'','left','accountancy',163687,NULL,NULL,3,'/compta/bank/budget.php?leftmenu=bank','','ListTransactionsByCategory',NULL,'banks',1,'','$user->rights->banque->lire','$conf->banque->enabled && ($leftmenu==\"bank\" || $leftmenu==\"checks\" || $leftmenu==\"withdraw\")',0,'2017-08-30 15:14:30'),(163693,'auguria',1,'','left','accountancy',163687,NULL,NULL,5,'/compta/bank/transfer.php?leftmenu=bank','','BankTransfers',NULL,'banks',1,'','$user->rights->banque->transfer','$conf->banque->enabled && ($leftmenu==\"bank\" || $leftmenu==\"checks\" || $leftmenu==\"withdraw\")',0,'2017-08-30 15:14:30'),(163737,'auguria',1,'','left','accountancy',161101,NULL,NULL,4,'/categories/index.php?leftmenu=bank&amp;type=5','','Categories',NULL,'categories',0,'cat','$user->rights->categorie->lire','$conf->categorie->enabled',2,'2017-08-30 15:14:30'),(163738,'auguria',1,'','left','accountancy',163737,NULL,NULL,0,'/categories/card.php?leftmenu=bank&amp;action=create&amp;type=5','','NewCategory',NULL,'categories',1,'','$user->rights->categorie->creer','$conf->categorie->enabled',2,'2017-08-30 15:14:30'),(163787,'auguria',1,'','left','accountancy',161093,NULL,NULL,11,'/compta/resultat/index.php?leftmenu=ca&amp;mainmenu=accountancy','','Reportings',NULL,'main',0,'ca','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled',0,'2017-08-30 15:14:30'),(163792,'auguria',1,'','left','accountancy',163487,NULL,NULL,1,'','','Journalization',NULL,'main',1,'','$user->rights->accounting->comptarapport->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163793,'auguria',1,'','left','accountancy',163792,NULL,NULL,4,'/accountancy/journal/sellsjournal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal=1','','SellsJournal',NULL,'main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163794,'auguria',1,'','left','accountancy',163792,NULL,NULL,1,'/accountancy/journal/bankjournal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal=3','','BankJournal',NULL,'main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163795,'auguria',1,'','left','accountancy',163792,NULL,NULL,2,'/accountancy/journal/expensereportsjournal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal=6','','ExpenseReportJournal',NULL,'main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163796,'auguria',1,'','left','accountancy',163792,NULL,NULL,3,'/accountancy/journal/purchasesjournal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal=2','','PurchasesJournal',NULL,'main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163798,'auguria',1,'','left','accountancy',163787,NULL,NULL,0,'/compta/resultat/index.php?leftmenu=ca','','ReportInOut',NULL,'main',1,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled && $leftmenu==\"ca\"',0,'2017-08-30 15:14:30'),(163799,'auguria',1,'','left','accountancy',163788,NULL,NULL,0,'/compta/resultat/clientfourn.php?leftmenu=ca','','ByCompanies',NULL,'main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled && $leftmenu==\"ca\"',0,'2017-08-30 15:14:30'),(163800,'auguria',1,'','left','accountancy',163787,NULL,NULL,1,'/compta/stats/index.php?leftmenu=ca','','ReportTurnover',NULL,'main',1,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled && $leftmenu==\"ca\"',0,'2017-08-30 15:14:30'),(163801,'auguria',1,'','left','accountancy',163790,NULL,NULL,0,'/compta/stats/casoc.php?leftmenu=ca','','ByCompanies',NULL,'main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled && $leftmenu==\"ca\"',0,'2017-08-30 15:14:30'),(163802,'auguria',1,'','left','accountancy',163790,NULL,NULL,1,'/compta/stats/cabyuser.php?leftmenu=ca','','ByUsers',NULL,'main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled && $leftmenu==\"ca\"',0,'2017-08-30 15:14:30'),(163803,'auguria',1,'','left','accountancy',163790,NULL,NULL,1,'/compta/stats/cabyprodserv.php?leftmenu=ca','','ByProductsAndServices',NULL,'main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled && $leftmenu==\"ca\"',0,'2017-08-30 15:14:30'),(163887,'auguria',1,'','left','products',161090,NULL,NULL,0,'/product/index.php?leftmenu=product&amp;type=0','','Products',NULL,'products',0,'product','$user->rights->produit->lire','$conf->product->enabled',2,'2017-08-30 15:14:30'),(163888,'auguria',1,'','left','products',163887,NULL,NULL,0,'/product/card.php?leftmenu=product&amp;action=create&amp;type=0','','NewProduct',NULL,'products',1,'','$user->rights->produit->creer','$conf->product->enabled',2,'2017-08-30 15:14:30'),(163889,'auguria',1,'','left','products',163887,NULL,NULL,1,'/product/list.php?leftmenu=product&amp;type=0','','List',NULL,'products',1,'','$user->rights->produit->lire','$conf->product->enabled',2,'2017-08-30 15:14:30'),(163890,'auguria',1,'','left','products',163887,NULL,NULL,4,'/product/reassort.php?type=0','','Stocks',NULL,'products',1,'','$user->rights->produit->lire && $user->rights->stock->lire','$conf->product->enabled',2,'2017-08-30 15:14:30'),(163891,'auguria',1,'','left','products',163887,NULL,NULL,7,'/product/stats/card.php?id=all&amp;leftmenu=stats&amp;type=0','','Statistics',NULL,'main',1,'','$user->rights->produit->lire','$conf->propal->enabled',2,'2017-08-30 15:14:30'),(163892,'auguria',1,'','left','products',163887,NULL,NULL,5,'/product/reassortlot.php?type=0','','StocksByLotSerial',NULL,'products',1,'','$user->rights->produit->lire && $user->rights->stock->lire','$conf->productbatch->enabled',2,'2017-08-30 15:14:30'),(163893,'auguria',1,'','left','products',163887,NULL,NULL,6,'/product/stock/productlot_list.php','','LotSerial',NULL,'products',1,'','$user->rights->produit->lire && $user->rights->stock->lire','$conf->productbatch->enabled',2,'2017-08-30 15:14:30'),(163987,'auguria',1,'','left','products',161090,NULL,NULL,1,'/product/index.php?leftmenu=service&amp;type=1','','Services',NULL,'products',0,'service','$user->rights->service->lire','$conf->service->enabled',2,'2017-08-30 15:14:30'),(163988,'auguria',1,'','left','products',163987,NULL,NULL,0,'/product/card.php?leftmenu=service&amp;action=create&amp;type=1','','NewService',NULL,'products',1,'','$user->rights->service->creer','$conf->service->enabled',2,'2017-08-30 15:14:30'),(163989,'auguria',1,'','left','products',163987,NULL,NULL,1,'/product/list.php?leftmenu=service&amp;type=1','','List',NULL,'products',1,'','$user->rights->service->lire','$conf->service->enabled',2,'2017-08-30 15:14:30'),(163990,'auguria',1,'','left','products',163987,NULL,NULL,5,'/product/stats/card.php?id=all&amp;leftmenu=stats&amp;type=1','','Statistics',NULL,'main',1,'','$user->rights->service->lire','$conf->propal->enabled',2,'2017-08-30 15:14:30'),(164187,'auguria',1,'','left','products',161090,NULL,NULL,3,'/product/stock/index.php?leftmenu=stock','','Stock',NULL,'stocks',0,'stock','$user->rights->stock->lire','$conf->stock->enabled',2,'2017-08-30 15:14:30'),(164188,'auguria',1,'','left','products',164187,NULL,NULL,0,'/product/stock/card.php?action=create','','MenuNewWarehouse',NULL,'stocks',1,'','$user->rights->stock->creer','$conf->stock->enabled',2,'2017-08-30 15:14:30'),(164189,'auguria',1,'','left','products',164187,NULL,NULL,1,'/product/stock/list.php','','List',NULL,'stocks',1,'','$user->rights->stock->lire','$conf->stock->enabled',2,'2017-08-30 15:14:30'),(164191,'auguria',1,'','left','products',164187,NULL,NULL,3,'/product/stock/mouvement.php','','Movements',NULL,'stocks',1,'','$user->rights->stock->mouvement->lire','$conf->stock->enabled',2,'2017-08-30 15:14:30'),(164192,'auguria',1,'','left','products',164187,NULL,NULL,4,'/product/stock/replenish.php','','Replenishments',NULL,'stocks',1,'','$user->rights->stock->mouvement->creer && $user->rights->fournisseur->lire','$conf->stock->enabled && $conf->supplier_order->enabled',2,'2017-08-30 15:14:30'),(164193,'auguria',1,'','left','products',164187,NULL,NULL,5,'/product/stock/massstockmove.php','','MassStockTransferShort',NULL,'stocks',1,'','$user->rights->stock->mouvement->creer','$conf->stock->enabled',2,'2017-08-30 15:14:30'),(164287,'auguria',1,'','left','products',161090,NULL,NULL,4,'/categories/index.php?leftmenu=cat&amp;type=0','','Categories',NULL,'categories',0,'cat','$user->rights->categorie->lire','$conf->categorie->enabled',2,'2017-08-30 15:14:30'),(164288,'auguria',1,'','left','products',164287,NULL,NULL,0,'/categories/card.php?action=create&amp;type=0','','NewCategory',NULL,'categories',1,'','$user->rights->categorie->creer','$conf->categorie->enabled',2,'2017-08-30 15:14:30'),(164487,'auguria',1,'','left','project',161094,NULL,NULL,3,'/projet/activity/perweek.php?leftmenu=projects','','NewTimeSpent',NULL,'projects',0,'','$user->rights->projet->lire','$conf->projet->enabled && $conf->global->PROJECT_USE_TASKS',2,'2017-08-30 15:14:30'),(164687,'auguria',1,'','left','project',161094,NULL,NULL,0,'/projet/index.php?leftmenu=projects','','Projects',NULL,'projects',0,'projects','$user->rights->projet->lire','$conf->projet->enabled',2,'2017-08-30 15:14:30'),(164688,'auguria',1,'','left','project',164687,NULL,NULL,1,'/projet/card.php?leftmenu=projects&amp;action=create','','NewProject',NULL,'projects',1,'','$user->rights->projet->creer','$conf->projet->enabled',2,'2017-08-30 15:14:30'),(164689,'auguria',1,'','left','project',164687,NULL,NULL,2,'/projet/list.php?leftmenu=projects','','List',NULL,'projects',1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2017-08-30 15:14:30'),(164690,'auguria',1,'','left','project',164687,NULL,NULL,3,'/projet/stats/index.php?leftmenu=projects','','Statistics',NULL,'projects',1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2017-08-30 15:14:30'),(164787,'auguria',1,'','left','project',161094,NULL,NULL,0,'/projet/activity/index.php?leftmenu=projects','','Activities',NULL,'projects',0,'','$user->rights->projet->lire','$conf->projet->enabled && $conf->global->PROJECT_USE_TASKS',2,'2017-08-30 15:14:30'),(164788,'auguria',1,'','left','project',164787,NULL,NULL,1,'/projet/tasks.php?leftmenu=projects&amp;action=create','','NewTask',NULL,'projects',1,'','$user->rights->projet->creer','$conf->projet->enabled && $conf->global->PROJECT_USE_TASKS',2,'2017-08-30 15:14:30'),(164789,'auguria',1,'','left','project',164787,NULL,NULL,2,'/projet/tasks/list.php?leftmenu=projects','','List',NULL,'projects',1,'','$user->rights->projet->lire','$conf->projet->enabled && $conf->global->PROJECT_USE_TASKS',2,'2017-08-30 15:14:30'),(164791,'auguria',1,'','left','project',164787,NULL,NULL,4,'/projet/tasks/stats/index.php?leftmenu=projects','','Statistics',NULL,'projects',1,'','$user->rights->projet->lire','$conf->projet->enabled && $conf->global->PROJECT_USE_TASKS',2,'2017-08-30 15:14:30'),(164891,'auguria',1,'','left','project',161094,NULL,NULL,4,'/categories/index.php?leftmenu=cat&amp;type=6','','Categories',NULL,'categories',0,'cat','$user->rights->categorie->lire','$conf->categorie->enabled',2,'2017-08-30 15:14:30'),(164892,'auguria',1,'','left','project',164891,NULL,NULL,0,'/categories/card.php?action=create&amp;type=6','','NewCategory',NULL,'categories',1,'','$user->rights->categorie->creer','$conf->categorie->enabled',2,'2017-08-30 15:14:30'),(164987,'auguria',1,'','left','tools',161095,NULL,NULL,0,'/comm/mailing/index.php?leftmenu=mailing','','EMailings',NULL,'mails',0,'mailing','$user->rights->mailing->lire','$conf->mailing->enabled',0,'2017-08-30 15:14:30'),(164988,'auguria',1,'','left','tools',164987,NULL,NULL,0,'/comm/mailing/card.php?leftmenu=mailing&amp;action=create','','NewMailing',NULL,'mails',1,'','$user->rights->mailing->creer','$conf->mailing->enabled',0,'2017-08-30 15:14:30'),(164989,'auguria',1,'','left','tools',164987,NULL,NULL,1,'/comm/mailing/list.php?leftmenu=mailing','','List',NULL,'mails',1,'','$user->rights->mailing->lire','$conf->mailing->enabled',0,'2017-08-30 15:14:30'),(165187,'auguria',1,'','left','tools',161095,NULL,NULL,2,'/exports/index.php?leftmenu=export','','FormatedExport',NULL,'exports',0,'export','$user->rights->export->lire','$conf->export->enabled',2,'2017-08-30 15:14:30'),(165188,'auguria',1,'','left','tools',165187,NULL,NULL,0,'/exports/export.php?leftmenu=export','','NewExport',NULL,'exports',1,'','$user->rights->export->creer','$conf->export->enabled',2,'2017-08-30 15:14:30'),(165217,'auguria',1,'','left','tools',161095,NULL,NULL,2,'/imports/index.php?leftmenu=import','','FormatedImport',NULL,'exports',0,'import','$user->rights->import->run','$conf->import->enabled',2,'2017-08-30 15:14:30'),(165218,'auguria',1,'','left','tools',165217,NULL,NULL,0,'/imports/import.php?leftmenu=import','','NewImport',NULL,'exports',1,'','$user->rights->import->run','$conf->import->enabled',2,'2017-08-30 15:14:30'),(165287,'auguria',1,'','left','members',161100,NULL,NULL,0,'/adherents/index.php?leftmenu=members&amp;mainmenu=members','','Members',NULL,'members',0,'members','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165288,'auguria',1,'','left','members',165287,NULL,NULL,0,'/adherents/card.php?leftmenu=members&amp;action=create','','NewMember',NULL,'members',1,'','$user->rights->adherent->creer','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165289,'auguria',1,'','left','members',165287,NULL,NULL,1,'/adherents/list.php','','List',NULL,'members',1,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165290,'auguria',1,'','left','members',165289,NULL,NULL,2,'/adherents/list.php?leftmenu=members&amp;statut=-1','','MenuMembersToValidate',NULL,'members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165291,'auguria',1,'','left','members',165289,NULL,NULL,3,'/adherents/list.php?leftmenu=members&amp;statut=1','','MenuMembersValidated',NULL,'members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165292,'auguria',1,'','left','members',165289,NULL,NULL,4,'/adherents/list.php?leftmenu=members&amp;statut=1&amp;filter=outofdate','','MenuMembersNotUpToDate',NULL,'members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165293,'auguria',1,'','left','members',165289,NULL,NULL,5,'/adherents/list.php?leftmenu=members&amp;statut=1&amp;filter=uptodate','','MenuMembersUpToDate',NULL,'members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165294,'auguria',1,'','left','members',165289,NULL,NULL,6,'/adherents/list.php?leftmenu=members&amp;statut=0','','MenuMembersResiliated',NULL,'members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165295,'auguria',1,'','left','members',165287,NULL,NULL,7,'/adherents/stats/geo.php?leftmenu=members&amp;mode=memberbycountry','','MenuMembersStats',NULL,'members',1,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165387,'auguria',1,'','left','members',161100,NULL,NULL,1,'/adherents/index.php?leftmenu=members&amp;mainmenu=members','','Subscriptions',NULL,'compta',0,'','$user->rights->adherent->cotisation->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165388,'auguria',1,'','left','members',165387,NULL,NULL,0,'/adherents/list.php?statut=-1&amp;leftmenu=accountancy&amp;mainmenu=members','','NewSubscription',NULL,'compta',1,'','$user->rights->adherent->cotisation->creer','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165389,'auguria',1,'','left','members',165387,NULL,NULL,1,'/adherents/subscription/list.php?leftmenu=members','','List',NULL,'compta',1,'','$user->rights->adherent->cotisation->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165390,'auguria',1,'','left','members',165387,NULL,NULL,7,'/adherents/stats/index.php?leftmenu=members','','MenuMembersStats',NULL,'members',1,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165589,'auguria',1,'','left','members',165287,NULL,NULL,9,'/adherents/htpasswd.php?leftmenu=export','','Filehtpasswd',NULL,'members',1,'','$user->rights->adherent->export','! empty($conf->global->MEMBER_LINK_TO_HTPASSWDFILE) && $conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165590,'auguria',1,'','left','members',165287,NULL,NULL,10,'/adherents/cartes/carte.php?leftmenu=export','','MembersCards',NULL,'members',1,'','$user->rights->adherent->export','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165687,'auguria',1,'','left','hrm',161102,NULL,NULL,1,'/user/index.php?leftmenu=hrm&mode=employee','','Employees',NULL,'hrm',0,'hrm','$user->rights->hrm->employee->read','$conf->hrm->enabled',0,'2017-08-30 15:14:30'),(165688,'auguria',1,'','left','hrm',165687,NULL,NULL,1,'/user/card.php?action=create&employee=1','','NewEmployee',NULL,'hrm',1,'','$user->rights->hrm->employee->write','$conf->hrm->enabled',0,'2017-08-30 15:14:30'),(165689,'auguria',1,'','left','hrm',165687,NULL,NULL,2,'/user/index.php?$leftmenu=hrm&mode=employee&contextpage=employeelist','','List',NULL,'hrm',1,'','$user->rights->hrm->employee->read','$conf->hrm->enabled',0,'2017-08-30 15:14:30'),(165787,'auguria',1,'','left','members',161100,NULL,NULL,5,'/adherents/type.php?leftmenu=setup&amp;mainmenu=members','','MembersTypes',NULL,'members',0,'setup','$user->rights->adherent->configurer','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165788,'auguria',1,'','left','members',165787,NULL,NULL,0,'/adherents/type.php?leftmenu=setup&amp;mainmenu=members&amp;action=create','','New',NULL,'members',1,'','$user->rights->adherent->configurer','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165789,'auguria',1,'','left','members',165787,NULL,NULL,1,'/adherents/type.php?leftmenu=setup&amp;mainmenu=members','','List',NULL,'members',1,'','$user->rights->adherent->configurer','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(166087,'auguria',1,'','left','hrm',161102,NULL,NULL,1,'/holiday/list.php?&leftmenu=hrm','','CPTitreMenu',NULL,'holiday',0,'hrm','$user->rights->holiday->read','$conf->holiday->enabled',0,'2017-08-30 15:14:30'),(166088,'auguria',1,'','left','hrm',166087,NULL,NULL,1,'/holiday/card.php?&action=request','','MenuAddCP',NULL,'holiday',1,'','$user->rights->holiday->write','$conf->holiday->enabled',0,'2017-08-30 15:14:30'),(166089,'auguria',1,'','left','hrm',166087,NULL,NULL,1,'/holiday/list.php?&leftmenu=hrm','','List',NULL,'holiday',1,'','$user->rights->holiday->read','$conf->holiday->enabled',0,'2017-08-30 15:14:30'),(166090,'auguria',1,'','left','hrm',166089,NULL,NULL,1,'/holiday/list.php?select_statut=2&leftmenu=hrm','','ListToApprove',NULL,'trips',2,'','$user->rights->holiday->read','$conf->holiday->enabled',0,'2017-08-30 15:14:30'),(166091,'auguria',1,'','left','hrm',166087,NULL,NULL,2,'/holiday/define_holiday.php?&action=request','','MenuConfCP',NULL,'holiday',1,'','$user->rights->holiday->define_holiday','$conf->holiday->enabled',0,'2017-08-30 15:14:30'),(166092,'auguria',1,'','left','hrm',166087,NULL,NULL,3,'/holiday/view_log.php?&action=request','','MenuLogCP',NULL,'holiday',1,'','$user->rights->holiday->define_holiday','$conf->holiday->enabled',0,'2017-08-30 15:14:30'),(166187,'auguria',1,'','left','commercial',161092,NULL,NULL,6,'/fourn/commande/index.php?leftmenu=orders_suppliers','','SuppliersOrders',NULL,'orders',0,'orders_suppliers','$user->rights->fournisseur->commande->lire','$conf->supplier_order->enabled',2,'2017-08-30 15:14:30'),(166188,'auguria',1,'','left','commercial',166187,NULL,NULL,0,'/fourn/commande/card.php?action=create&amp;leftmenu=orders_suppliers','','NewOrder',NULL,'orders',1,'','$user->rights->fournisseur->commande->creer','$conf->supplier_order->enabled',2,'2017-08-30 15:14:30'),(166189,'auguria',1,'','left','commercial',166187,NULL,NULL,1,'/fourn/commande/list.php?leftmenu=orders_suppliers&amp;search_status=0','','List',NULL,'orders',1,'','$user->rights->fournisseur->commande->lire','$conf->supplier_order->enabled',2,'2017-08-30 15:14:30'),(166195,'auguria',1,'','left','commercial',166187,NULL,NULL,7,'/commande/stats/index.php?leftmenu=orders_suppliers&amp;mode=supplier','','Statistics',NULL,'orders',1,'','$user->rights->fournisseur->commande->lire','$conf->supplier_order->enabled',2,'2017-08-30 15:14:30'),(166287,'auguria',1,'','left','members',161100,NULL,NULL,3,'/categories/index.php?leftmenu=cat&amp;type=3','','MembersCategoriesShort',NULL,'categories',0,'cat','$user->rights->categorie->lire','$conf->adherent->enabled && $conf->categorie->enabled',2,'2017-08-30 15:14:30'),(166288,'auguria',1,'','left','members',166287,NULL,NULL,0,'/categories/card.php?action=create&amp;type=3','','NewCategory',NULL,'categories',1,'','$user->rights->categorie->creer','$conf->adherent->enabled && $conf->categorie->enabled',2,'2017-08-30 15:14:30'),(166387,'auguria',1,'','left','hrm',161102,NULL,NULL,5,'/expensereport/index.php?leftmenu=expensereport','','TripsAndExpenses',NULL,'trips',0,'expensereport','$user->rights->expensereport->lire','$conf->expensereport->enabled',0,'2017-08-30 15:14:30'),(166388,'auguria',1,'','left','hrm',166387,NULL,NULL,1,'/expensereport/card.php?action=create&amp;leftmenu=expensereport','','New',NULL,'trips',1,'','$user->rights->expensereport->creer','$conf->expensereport->enabled',0,'2017-08-30 15:14:30'),(166389,'auguria',1,'','left','hrm',166387,NULL,NULL,2,'/expensereport/list.php?leftmenu=expensereport','','List',NULL,'trips',1,'','$user->rights->expensereport->lire','$conf->expensereport->enabled',0,'2017-08-30 15:14:30'),(166390,'auguria',1,'','left','hrm',166389,NULL,NULL,2,'/expensereport/list.php?search_status=2&amp;leftmenu=expensereport','','ListToApprove',NULL,'trips',2,'','$user->rights->expensereport->approve','$conf->expensereport->enabled',0,'2017-08-30 15:14:30'),(166391,'auguria',1,'','left','hrm',166387,NULL,NULL,2,'/expensereport/stats/index.php?leftmenu=expensereport','','Statistics',NULL,'trips',1,'','$user->rights->expensereport->lire','$conf->expensereport->enabled',0,'2017-08-30 15:14:30'),(167038,'all',1,'agenda','top','agenda',0,NULL,NULL,86,'/comm/action/index.php','','TMenuAgenda','<span class=\"fas fa-calendar-alt infobox-action paddingright pictofixedwidth\" style=\"\"></span>','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2021-04-15 10:22:58'),(167039,'all',1,'agenda','left','agenda',167038,NULL,NULL,100,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda','','Actions','<span class=\"fas fa-calendar-alt infobox-action paddingright pictofixedwidth\" style=\"\"></span>','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2021-04-15 10:22:58'),(167040,'all',1,'agenda','left','agenda',167039,NULL,NULL,101,'/comm/action/card.php?mainmenu=agenda&amp;leftmenu=agenda&amp;action=create','','NewAction','','commercial',NULL,NULL,'($user->rights->agenda->myactions->create||$user->rights->agenda->allactions->create)','$conf->agenda->enabled',2,'2021-04-15 10:22:58'),(167041,'all',1,'agenda','left','agenda',167039,NULL,NULL,140,'/comm/action/index.php?action=default&amp;mainmenu=agenda&amp;leftmenu=agenda','','Calendar','','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2021-04-15 10:22:58'),(167042,'all',1,'agenda','left','agenda',167041,NULL,NULL,141,'/comm/action/index.php?action=default&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filter=mine','','MenuToDoMyActions','','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2021-04-15 10:22:58'),(167043,'all',1,'agenda','left','agenda',167041,NULL,NULL,142,'/comm/action/index.php?action=default&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filter=mine','','MenuDoneMyActions','','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2021-04-15 10:22:58'),(167044,'all',1,'agenda','left','agenda',167041,NULL,NULL,143,'/comm/action/index.php?action=default&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filtert=-1','','MenuToDoActions','','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2021-04-15 10:22:58'),(167045,'all',1,'agenda','left','agenda',167041,NULL,NULL,144,'/comm/action/index.php?action=default&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filtert=-1','','MenuDoneActions','','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2021-04-15 10:22:58'),(167046,'all',1,'agenda','left','agenda',167039,NULL,NULL,110,'/comm/action/list.php?action=show_list&amp;mainmenu=agenda&amp;leftmenu=agenda','','List','','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2021-04-15 10:22:58'),(167047,'all',1,'agenda','left','agenda',167046,NULL,NULL,111,'/comm/action/list.php?action=show_list&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filter=mine','','MenuToDoMyActions','','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2021-04-15 10:22:58'),(167048,'all',1,'agenda','left','agenda',167046,NULL,NULL,112,'/comm/action/list.php?action=show_list&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filter=mine','','MenuDoneMyActions','','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2021-04-15 10:22:58'),(167049,'all',1,'agenda','left','agenda',167046,NULL,NULL,113,'/comm/action/list.php?action=show_list&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filtert=-1','','MenuToDoActions','','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2021-04-15 10:22:58'),(167050,'all',1,'agenda','left','agenda',167046,NULL,NULL,114,'/comm/action/list.php?action=show_list&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filtert=-1','','MenuDoneActions','','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2021-04-15 10:22:58'),(167051,'all',1,'agenda','left','agenda',167039,NULL,NULL,160,'/comm/action/rapport/index.php?mainmenu=agenda&amp;leftmenu=agenda','','Reportings','','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$conf->agenda->enabled',2,'2021-04-15 10:22:58'),(167052,'all',1,'agenda','left','agenda',167039,NULL,NULL,170,'/categories/index.php?mainmenu=agenda&amp;leftmenu=agenda&type=10','','Categories','','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$conf->categorie->enabled&&$conf->categorie->enabled',2,'2021-04-15 10:22:58'),(167053,'all',1,'barcode','left','tools',-1,NULL,'tools',200,'/barcode/printsheet.php?mainmenu=tools&leftmenu=barcodeprint','','BarCodePrintsheet','<span class=\"fas fa-barcode paddingright pictofixedwidth\" style=\"\"></span>','products',NULL,'barcodeprint','($conf->global->MAIN_USE_ADVANCED_PERMS && $user->rights->barcode->lire_advance) || (! $conf->global->MAIN_USE_ADVANCED_PERMS)','$conf->barcode->enabled',2,'2021-04-15 10:22:58'),(167054,'all',1,'barcode','left','home',-1,'admintools','home',300,'/barcode/codeinit.php?mainmenu=home&leftmenu=admintools','','MassBarcodeInit','','products',NULL,NULL,'($conf->global->MAIN_USE_ADVANCED_PERMS && $user->rights->barcode->creer_advance) || (! $conf->global->MAIN_USE_ADVANCED_PERMS)','$conf->barcode->enabled && preg_match(\'/^(admintools|all)/\',$leftmenu)',0,'2021-04-15 10:22:58'),(167055,'all',1,'cron','left','home',-1,'admintools','home',200,'/cron/list.php?leftmenu=admintools','','CronList','','cron',NULL,NULL,'$user->rights->cron->read','$conf->cron->enabled && preg_match(\'/^(admintools|all)/\', $leftmenu)',2,'2021-04-15 10:22:58'),(167056,'all',1,'blockedlog','left','tools',-1,NULL,'tools',200,'/blockedlog/admin/blockedlog_list.php?mainmenu=tools&leftmenu=blockedlogbrowser','','BrowseBlockedLog','<span class=\"fas fa-cogs em080 paddingright pictofixedwidth\" style=\" color: #999;\"></span>','blockedlog',NULL,'blockedlogbrowser','$user->rights->blockedlog->read','$conf->blockedlog->enabled',2,'2021-04-15 10:22:58'),(167057,'all',1,'ecm','top','ecm',0,NULL,NULL,82,'/ecm/index.php','','MenuECM','<span class=\"fas fa-folder-open paddingright pictofixedwidth\" style=\"\"></span>','ecm',NULL,NULL,'$user->rights->ecm->read || $user->rights->ecm->upload || $user->rights->ecm->setup','$conf->ecm->enabled',2,'2021-04-15 10:22:59'),(167058,'all',1,'ecm','left','ecm',-1,NULL,'ecm',101,'/ecm/index.php?mainmenu=ecm&leftmenu=ecm','','ECMArea','<span class=\"fas fa-folder-open paddingright pictofixedwidth\" style=\"\"></span>','ecm',NULL,'ecm','$user->rights->ecm->read || $user->rights->ecm->upload','$user->rights->ecm->read || $user->rights->ecm->upload',2,'2021-04-15 10:22:59'),(167059,'all',1,'ecm','left','ecm',-1,'ecm','ecm',102,'/ecm/index.php?action=file_manager&mainmenu=ecm&leftmenu=ecm','','ECMSectionsManual','','ecm',NULL,'ecm_manual','$user->rights->ecm->read || $user->rights->ecm->upload','$user->rights->ecm->read || $user->rights->ecm->upload',2,'2021-04-15 10:22:59'),(167060,'all',1,'ecm','left','ecm',-1,'ecm','ecm',103,'/ecm/index_auto.php?action=file_manager&mainmenu=ecm&leftmenu=ecm','','ECMSectionsAuto','','ecm',NULL,NULL,'$user->rights->ecm->read || $user->rights->ecm->upload','($user->rights->ecm->read || $user->rights->ecm->upload) && ! empty($conf->global->ECM_AUTO_TREE_ENABLED)',2,'2021-04-15 10:22:59'),(167061,'all',1,'margins','left','billing',-1,NULL,'billing',100,'/margin/index.php','','Margins','<span class=\"fas fa-calculator paddingright pictofixedwidth\" style=\"\"></span>','margins',NULL,'margins','$user->rights->margins->liretous','$conf->margin->enabled',2,'2021-04-15 10:23:00'),(167062,'all',1,'opensurvey','left','tools',-1,NULL,'tools',200,'/opensurvey/index.php?mainmenu=tools&leftmenu=opensurvey','','Survey','<span class=\"fas fa-check-double infobox-adherent paddingright pictofixedwidth\" style=\"\"></span>','opensurvey',NULL,'opensurvey','$user->rights->opensurvey->read','$conf->opensurvey->enabled',0,'2021-04-15 10:23:00'),(167063,'all',1,'opensurvey','left','tools',-1,'opensurvey','tools',210,'/opensurvey/wizard/index.php','','NewSurvey','','opensurvey',NULL,'opensurvey_new','$user->rights->opensurvey->write','$conf->opensurvey->enabled',0,'2021-04-15 10:23:00'),(167064,'all',1,'opensurvey','left','tools',-1,'opensurvey','tools',220,'/opensurvey/list.php','','List','','opensurvey',NULL,'opensurvey_list','$user->rights->opensurvey->read','$conf->opensurvey->enabled',0,'2021-04-15 10:23:00'),(167065,'all',1,'printing','left','home',-1,'admintools','home',300,'/printing/index.php?mainmenu=home&leftmenu=admintools','','MenuDirectPrinting','','printing',NULL,NULL,'$user->rights->printing->read','$conf->printing->enabled && preg_match(\'/^(admintools|all)/\', $leftmenu)',0,'2021-04-15 10:23:00'),(167066,'all',1,'recruitment','left','hrm',-1,NULL,'hrm',1001,'/recruitment/recruitmentindex.php','','Recruitment','<span class=\"fas fa-id-card-alt infobox-adherent paddingright pictofixedwidth\" style=\"\"></span>','recruitment',NULL,'recruitmentjobposition','$user->rights->recruitment->recruitmentjobposition->read','$conf->recruitment->enabled',2,'2021-04-15 10:23:00'),(167067,'all',1,'recruitment','left','hrm',-1,'recruitmentjobposition','hrm',1002,'/recruitment/recruitmentjobposition_card.php?action=create','','NewPositionToBeFilled','','recruitment',NULL,'recruitment_recruitmentjobposition_new','$user->rights->recruitment->recruitmentjobposition->write','$conf->recruitment->enabled',2,'2021-04-15 10:23:00'),(167068,'all',1,'recruitment','left','hrm',-1,'recruitmentjobposition','hrm',1003,'/recruitment/recruitmentjobposition_list.php','','ListOfPositionsToBeFilled','','recruitment',NULL,'recruitment_recruitmentjobposition_list','$user->rights->recruitment->recruitmentjobposition->read','$conf->recruitment->enabled',2,'2021-04-15 10:23:00'),(167069,'all',1,'recruitment','left','hrm',-1,'recruitmentjobposition','hrm',1004,'/recruitment/recruitmentcandidature_card.php?action=create','','NewCandidature','','recruitment',NULL,'recruitment_recruitmentcandidature_new','$user->rights->recruitment->recruitmentjobposition->write','$conf->recruitment->enabled',2,'2021-04-15 10:23:00'),(167070,'all',1,'recruitment','left','hrm',-1,'recruitmentjobposition','hrm',1005,'/recruitment/recruitmentcandidature_list.php','','ListOfCandidatures','','recruitment',NULL,'recruitment_recruitmentcandidature_list','$user->rights->recruitment->recruitmentjobposition->read','$conf->recruitment->enabled',2,'2021-04-15 10:23:00'),(167071,'all',1,'resource','left','tools',-1,NULL,'tools',100,'/resource/list.php','','MenuResourceIndex','<span class=\"fas fa-laptop-house em092 infobox-action paddingright pictofixedwidth em92\" style=\"\"></span>','resource',NULL,'resource','$user->rights->resource->read','1',0,'2021-04-15 10:23:00'),(167072,'all',1,'resource','left','tools',-1,'resource','tools',101,'/resource/card.php?action=create','','MenuResourceAdd','','resource',NULL,'resource_add','$user->rights->resource->write','1',0,'2021-04-15 10:23:00'),(167073,'all',1,'resource','left','tools',-1,'resource','tools',102,'/resource/list.php','','List','','resource',NULL,'resource_list','$user->rights->resource->read','1',0,'2021-04-15 10:23:00'),(167074,'all',1,'stripe','left','bank',-1,NULL,'bank',100,'','','StripeAccount','<span class=\"fab fa-stripe-s paddingright pictofixedwidth\" style=\"\"></span>','stripe',NULL,'stripe','$user->rights->banque->lire','$conf->stripe->enabled && $conf->banque->enabled && $conf->global->MAIN_FEATURES_LEVEL >= 1',0,'2021-04-15 10:23:01'),(167075,'all',1,'stripe','left','bank',-1,'stripe','bank',102,'/stripe/charge.php','','StripeChargeList','','stripe',NULL,NULL,'$user->rights->banque->lire','$conf->stripe->enabled && $conf->banque->enabled && $conf->global->MAIN_FEATURES_LEVEL >= 1',0,'2021-04-15 10:23:01'),(167076,'all',1,'stripe','left','bank',-1,'stripe','bank',102,'/stripe/transaction.php','','StripeTransactionList','','stripe',NULL,NULL,'$user->rights->banque->lire','$conf->stripe->enabled && $conf->banque->enabled && $conf->global->MAIN_FEATURES_LEVEL >= 1',0,'2021-04-15 10:23:01'),(167077,'all',1,'stripe','left','bank',-1,'stripe','bank',103,'/stripe/payout.php','','StripePayoutList','','stripe',NULL,NULL,'$user->rights->banque->lire','$conf->stripe->enabled && $conf->banque->enabled && $conf->global->MAIN_FEATURES_LEVEL >= 1',0,'2021-04-15 10:23:01'),(167078,'all',1,'ticket','top','ticket',0,NULL,NULL,88,'/ticket/index.php','','Ticket','<span class=\"fas fa-ticket-alt infobox-contrat paddingright pictofixedwidth em092\" style=\"\"></span>','ticket',NULL,'1','$user->rights->ticket->read','$conf->ticket->enabled',2,'2021-04-15 10:23:01'),(167079,'all',1,'ticket','left','ticket',-1,NULL,'ticket',101,'/ticket/index.php','','Ticket','<span class=\"fas fa-ticket-alt infobox-contrat paddingright pictofixedwidth em092\" style=\"\"></span>','ticket',NULL,'ticket','$user->rights->ticket->read','$conf->ticket->enabled',2,'2021-04-15 10:23:01'),(167080,'all',1,'ticket','left','ticket',-1,'ticket','ticket',102,'/ticket/card.php?action=create','','NewTicket','','ticket',NULL,NULL,'$user->rights->ticket->write','$conf->ticket->enabled',2,'2021-04-15 10:23:01'),(167081,'all',1,'ticket','left','ticket',-1,'ticket','ticket',103,'/ticket/list.php?search_fk_status=non_closed','','List','','ticket',NULL,'ticketlist','$user->rights->ticket->read','$conf->ticket->enabled',2,'2021-04-15 10:23:01'),(167082,'all',1,'ticket','left','ticket',-1,'ticket','ticket',105,'/ticket/list.php?mode=mine&search_fk_status=non_closed','','MenuTicketMyAssign','','ticket',NULL,'ticketmy','$user->rights->ticket->read','$conf->ticket->enabled',0,'2021-04-15 10:23:01'),(167083,'all',1,'ticket','left','ticket',-1,'ticket','ticket',107,'/ticket/stats/index.php','','Statistics','','ticket',NULL,NULL,'$user->rights->ticket->read','$conf->ticket->enabled',0,'2021-04-15 10:23:01'),(167084,'all',1,'takepos','top','takepos',0,NULL,NULL,1001,'/takepos/index.php','takepos','PointOfSaleShort','<span class=\"fas fa-cash-register infobox-bank_account paddingright pictofixedwidth\" style=\"\"></span>','cashdesk',NULL,NULL,'$user->rights->takepos->run','$conf->takepos->enabled',2,'2021-04-15 10:23:01'),(167085,'all',1,'website','top','website',0,NULL,NULL,100,'/website/index.php','','WebSites','<span class=\"fas fa-globe-americas paddingright pictofixedwidth em092\" style=\" color: #304;\"></span>','website',NULL,NULL,'$user->rights->website->read','$conf->website->enabled',2,'2021-04-15 10:23:02');
+INSERT INTO `llx_menu` VALUES (103094,'all',2,'agenda','top','agenda',0,NULL,NULL,100,'/comm/action/index.php','','Agenda',NULL,'agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103095,'all',2,'agenda','left','agenda',103094,NULL,NULL,100,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda','','Actions',NULL,'agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103096,'all',2,'agenda','left','agenda',103095,NULL,NULL,101,'/comm/action/card.php?mainmenu=agenda&amp;leftmenu=agenda&amp;action=create','','NewAction',NULL,'commercial',NULL,NULL,'($user->rights->agenda->myactions->create||$user->rights->agenda->allactions->create)','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103097,'all',2,'agenda','left','agenda',103095,NULL,NULL,102,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda','','Calendar',NULL,'agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103098,'all',2,'agenda','left','agenda',103097,NULL,NULL,103,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filter=mine','','MenuToDoMyActions',NULL,'agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103099,'all',2,'agenda','left','agenda',103097,NULL,NULL,104,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filter=mine','','MenuDoneMyActions',NULL,'agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103100,'all',2,'agenda','left','agenda',103097,NULL,NULL,105,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo','','MenuToDoActions',NULL,'agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2015-03-13 15:29:19'),(103101,'all',2,'agenda','left','agenda',103097,NULL,NULL,106,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done','','MenuDoneActions',NULL,'agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2015-03-13 15:29:19'),(103102,'all',2,'agenda','left','agenda',103095,NULL,NULL,112,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda','','List',NULL,'agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103103,'all',2,'agenda','left','agenda',103102,NULL,NULL,113,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filter=mine','','MenuToDoMyActions',NULL,'agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103104,'all',2,'agenda','left','agenda',103102,NULL,NULL,114,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filter=mine','','MenuDoneMyActions',NULL,'agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103105,'all',2,'agenda','left','agenda',103102,NULL,NULL,115,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo','','MenuToDoActions',NULL,'agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2015-03-13 15:29:19'),(103106,'all',2,'agenda','left','agenda',103102,NULL,NULL,116,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done','','MenuDoneActions',NULL,'agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2015-03-13 15:29:19'),(103107,'all',2,'agenda','left','agenda',103095,NULL,NULL,120,'/comm/action/rapport/index.php?mainmenu=agenda&amp;leftmenu=agenda','','Reportings',NULL,'agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103134,'all',2,'opensurvey','top','opensurvey',0,NULL,NULL,200,'/opensurvey/index.php','','Surveys',NULL,'opensurvey',NULL,NULL,'$user->rights->opensurvey->survey->read','$conf->opensurvey->enabled',0,'2015-03-13 20:33:42'),(103135,'all',2,'opensurvey','left','opensurvey',-1,NULL,'opensurvey',200,'/opensurvey/index.php?mainmenu=opensurvey&leftmenu=opensurvey','','Survey',NULL,'opensurvey@opensurvey',NULL,'opensurvey','','$conf->opensurvey->enabled',0,'2015-03-13 20:33:42'),(103136,'all',2,'opensurvey','left','opensurvey',-1,'opensurvey','opensurvey',210,'/opensurvey/public/index.php','_blank','NewSurvey',NULL,'opensurvey@opensurvey',NULL,'opensurvey_new','','$conf->opensurvey->enabled',0,'2015-03-13 20:33:42'),(103137,'all',2,'opensurvey','left','opensurvey',-1,'opensurvey','opensurvey',220,'/opensurvey/list.php','','List',NULL,'opensurvey@opensurvey',NULL,'opensurvey_list','','$conf->opensurvey->enabled',0,'2015-03-13 20:33:42'),(161088,'auguria',1,'','top','home',0,NULL,NULL,10,'/index.php?mainmenu=home&amp;leftmenu=','','Home',NULL,'',-1,'','','1',2,'2017-08-30 15:14:30'),(161089,'auguria',1,'societe|fournisseur','top','companies',0,NULL,NULL,20,'/societe/index.php?mainmenu=companies&amp;leftmenu=','','ThirdParties',NULL,'companies',-1,'','$user->rights->societe->lire || $user->rights->societe->contact->lire','( ! empty($conf->societe->enabled) && (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))) || ! empty($conf->fournisseur->enabled)',2,'2017-08-30 15:14:30'),(161090,'auguria',1,'product|service','top','products',0,NULL,NULL,30,'/product/index.php?mainmenu=products&amp;leftmenu=','','Products/Services',NULL,'products',-1,'','$user->rights->produit->lire||$user->rights->service->lire','$conf->product->enabled || $conf->service->enabled',0,'2017-08-30 15:14:30'),(161092,'auguria',1,'propal|commande|fournisseur|contrat|ficheinter','top','commercial',0,NULL,NULL,40,'/comm/index.php?mainmenu=commercial&amp;leftmenu=','','Commercial',NULL,'commercial',-1,'','$user->rights->societe->lire || $user->rights->societe->contact->lire','$conf->propal->enabled || $conf->commande->enabled || $conf->supplier_order->enabled || $conf->contrat->enabled || $conf->ficheinter->enabled',2,'2017-08-30 15:14:30'),(161093,'auguria',1,'comptabilite|accounting|facture|don|tax|salaries|loan','top','accountancy',0,NULL,NULL,50,'/compta/index.php?mainmenu=accountancy&amp;leftmenu=','','MenuFinancial',NULL,'compta',-1,'','$user->rights->compta->resultat->lire || $user->rights->accounting->plancompte->lire || $user->rights->facture->lire|| $user->rights->don->lire || $user->rights->tax->charges->lire || $user->rights->salaries->read || $user->rights->loan->read','$conf->comptabilite->enabled || $conf->accounting->enabled || $conf->facture->enabled || $conf->don->enabled  || $conf->tax->enabled || $conf->salaries->enabled || $conf->supplier_invoice->enabled || $conf->loan->enabled',2,'2017-08-30 15:14:30'),(161094,'auguria',1,'projet','top','project',0,NULL,NULL,70,'/projet/index.php?mainmenu=project&amp;leftmenu=','','Projects',NULL,'projects',-1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2017-08-30 15:14:30'),(161095,'auguria',1,'mailing|export|import|opensurvey|resource','top','tools',0,NULL,NULL,90,'/core/tools.php?mainmenu=tools&amp;leftmenu=','','Tools',NULL,'other',-1,'','$user->rights->mailing->lire || $user->rights->export->lire || $user->rights->import->run || $user->rights->opensurvey->read || $user->rights->resource->read','$conf->mailing->enabled || $conf->export->enabled || $conf->import->enabled || $conf->opensurvey->enabled || $conf->resource->enabled',2,'2017-08-30 15:14:30'),(161101,'auguria',1,'banque|prelevement','top','bank',0,NULL,NULL,60,'/compta/bank/index.php?mainmenu=bank&amp;leftmenu=bank','','MenuBankCash',NULL,'banks',-1,'','$user->rights->banque->lire || $user->rights->prelevement->bons->lire','$conf->banque->enabled || $conf->prelevement->enabled',0,'2017-08-30 15:14:30'),(161102,'auguria',1,'hrm|holiday|deplacement|expensereport','top','hrm',0,NULL,NULL,80,'/hrm/index.php?mainmenu=hrm&amp;leftmenu=','','HRM',NULL,'holiday',-1,'','$user->rights->hrm->employee->read || $user->rights->holiday->write || $user->rights->deplacement->lire || $user->rights->expensereport->lire','$conf->hrm->enabled || $conf->holiday->enabled || $conf->deplacement->enabled || $conf->expensereport->enabled',0,'2017-08-30 15:14:30'),(161177,'auguria',1,'','left','home',161088,NULL,NULL,0,'/index.php','','MyDashboard',NULL,'',0,'','','1',2,'2017-08-30 15:14:30'),(161187,'auguria',1,'','left','home',161088,NULL,NULL,1,'/admin/index.php?leftmenu=setup','','Setup',NULL,'admin',0,'setup','','$user->admin',2,'2017-08-30 15:14:30'),(161188,'auguria',1,'','left','home',161187,NULL,NULL,1,'/admin/company.php?leftmenu=setup','','MenuCompanySetup',NULL,'admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161189,'auguria',1,'','left','home',161187,NULL,NULL,4,'/admin/ihm.php?leftmenu=setup','','GUISetup',NULL,'admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161190,'auguria',1,'','left','home',161187,NULL,NULL,2,'/admin/modules.php?leftmenu=setup','','Modules',NULL,'admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161191,'auguria',1,'','left','home',161187,NULL,NULL,6,'/admin/boxes.php?leftmenu=setup','','Boxes',NULL,'admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161192,'auguria',1,'','left','home',161187,NULL,NULL,3,'/admin/menus.php?leftmenu=setup','','Menus',NULL,'admin',1,'','','$leftmenu==\'setup\'',2,'2017-09-06 08:29:47'),(161193,'auguria',1,'','left','home',161187,NULL,NULL,7,'/admin/delais.php?leftmenu=setup','','Alerts',NULL,'admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161194,'auguria',1,'','left','home',161187,NULL,NULL,10,'/admin/pdf.php?leftmenu=setup','','PDF',NULL,'admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161195,'auguria',1,'','left','home',161187,NULL,NULL,8,'/admin/security_other.php?leftmenu=setup','','Security',NULL,'admin',1,'','','$leftmenu==\'setup\'',2,'2017-09-06 08:29:36'),(161196,'auguria',1,'','left','home',161187,NULL,NULL,11,'/admin/mails.php?leftmenu=setup','','Emails',NULL,'admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161197,'auguria',1,'','left','home',161187,NULL,NULL,9,'/admin/limits.php?leftmenu=setup','','MenuLimits',NULL,'admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161198,'auguria',1,'','left','home',161187,NULL,NULL,13,'/admin/dict.php?leftmenu=setup','','Dictionary',NULL,'admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161199,'auguria',1,'','left','home',161187,NULL,NULL,14,'/admin/const.php?leftmenu=setup','','OtherSetup',NULL,'admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161200,'auguria',1,'','left','home',161187,NULL,NULL,12,'/admin/sms.php?leftmenu=setup','','SMS',NULL,'admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161201,'auguria',1,'','left','home',161187,NULL,NULL,4,'/admin/translation.php?leftmenu=setup','','Translation',NULL,'admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161288,'auguria',1,'','left','home',161387,NULL,NULL,0,'/admin/system/dolibarr.php?leftmenu=admintools','','InfoDolibarr',NULL,'admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161289,'auguria',1,'','left','home',161288,NULL,NULL,2,'/admin/system/modules.php?leftmenu=admintools','','Modules',NULL,'admin',2,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161290,'auguria',1,'','left','home',161288,NULL,NULL,3,'/admin/triggers.php?leftmenu=admintools','','Triggers',NULL,'admin',2,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161291,'auguria',1,'','left','home',161288,NULL,NULL,4,'/admin/system/filecheck.php?leftmenu=admintools','','FileCheck',NULL,'admin',2,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161292,'auguria',1,'','left','home',161387,NULL,NULL,1,'/admin/system/browser.php?leftmenu=admintools','','InfoBrowser',NULL,'admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161293,'auguria',1,'','left','home',161387,NULL,NULL,2,'/admin/system/os.php?leftmenu=admintools','','InfoOS',NULL,'admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161294,'auguria',1,'','left','home',161387,NULL,NULL,3,'/admin/system/web.php?leftmenu=admintools','','InfoWebServer',NULL,'admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161295,'auguria',1,'','left','home',161387,NULL,NULL,4,'/admin/system/phpinfo.php?leftmenu=admintools','','InfoPHP',NULL,'admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161297,'auguria',1,'','left','home',161387,NULL,NULL,5,'/admin/system/database.php?leftmenu=admintools','','InfoDatabase',NULL,'admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161387,'auguria',1,'','left','home',161088,NULL,NULL,2,'/admin/tools/index.php?leftmenu=admintools','','AdminTools',NULL,'admin',0,'admintools','','$user->admin',2,'2017-08-30 15:14:30'),(161388,'auguria',1,'','left','home',161387,NULL,NULL,6,'/admin/tools/dolibarr_export.php?leftmenu=admintools','','Backup',NULL,'admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161389,'auguria',1,'','left','home',161387,NULL,NULL,7,'/admin/tools/dolibarr_import.php?leftmenu=admintools','','Restore',NULL,'admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161392,'auguria',1,'','left','home',161387,NULL,NULL,8,'/admin/tools/update.php?leftmenu=admintools','','MenuUpgrade',NULL,'admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161393,'auguria',1,'','left','home',161387,NULL,NULL,9,'/admin/tools/eaccelerator.php?leftmenu=admintools','','EAccelerator',NULL,'admin',1,'','','$leftmenu==\"admintools\" && function_exists(\"eaccelerator_info\")',2,'2017-08-30 15:14:30'),(161394,'auguria',1,'','left','home',161387,NULL,NULL,10,'/admin/tools/listevents.php?leftmenu=admintools','','Audit',NULL,'admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161395,'auguria',1,'','left','home',161387,NULL,NULL,11,'/admin/tools/listsessions.php?leftmenu=admintools','','Sessions',NULL,'admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161396,'auguria',1,'','left','home',161387,NULL,NULL,12,'/admin/tools/purge.php?leftmenu=admintools','','Purge',NULL,'admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161398,'auguria',1,'','left','home',161387,NULL,NULL,14,'/admin/system/about.php?leftmenu=admintools','','ExternalResources',NULL,'admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161407,'auguria',1,'','left','home',161387,NULL,NULL,15,'/product/admin/product_tools.php?mainmenu=home&amp;leftmenu=admintools','','ProductVatMassChange',NULL,'products',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161487,'auguria',1,'','left','home',161088,NULL,NULL,4,'/user/home.php?leftmenu=users','','MenuUsersAndGroups',NULL,'users',0,'users','','1',2,'2017-08-30 15:14:30'),(161488,'auguria',1,'','left','home',161487,NULL,NULL,0,'/user/index.php?leftmenu=users','','Users',NULL,'users',1,'','$user->rights->user->user->lire || $user->admin','$leftmenu==\"users\"',2,'2017-08-30 15:14:30'),(161489,'auguria',1,'','left','home',161488,NULL,NULL,0,'/user/card.php?leftmenu=users&amp;action=create','','NewUser',NULL,'users',2,'','($user->rights->user->user->creer || $user->admin) && !(! empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE)','$leftmenu==\"users\"',2,'2017-08-30 15:14:30'),(161490,'auguria',1,'','left','home',161487,NULL,NULL,1,'/user/group/index.php?leftmenu=users','','Groups',NULL,'users',1,'','(($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->user->group_advance->read:$user->rights->user->user->lire) || $user->admin) && !(! empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE)','$leftmenu==\"users\"',2,'2017-08-30 15:14:30'),(161491,'auguria',1,'','left','home',161490,NULL,NULL,0,'/user/group/card.php?leftmenu=users&amp;action=create','','NewGroup',NULL,'users',2,'','(($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->user->group_advance->write:$user->rights->user->user->creer) || $user->admin) && !(! empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE)','$leftmenu==\"users\"',2,'2017-08-30 15:14:30'),(161587,'auguria',1,'','left','companies',161089,NULL,NULL,0,'/societe/index.php?leftmenu=thirdparties','','ThirdParty',NULL,'companies',0,'thirdparties','$user->rights->societe->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161588,'auguria',1,'','left','companies',161587,NULL,NULL,0,'/societe/card.php?action=create','','MenuNewThirdParty',NULL,'companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161589,'auguria',1,'','left','companies',161587,NULL,NULL,0,'/societe/list.php?action=create','','List',NULL,'companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161590,'auguria',1,'','left','companies',161587,NULL,NULL,5,'/societe/list.php?type=f&leftmenu=suppliers','','ListSuppliersShort',NULL,'suppliers',1,'','$user->rights->societe->lire && $user->rights->fournisseur->lire','$conf->societe->enabled && $conf->fournisseur->enabled',2,'2017-08-30 15:14:30'),(161591,'auguria',1,'','left','companies',161590,NULL,NULL,0,'/societe/card.php?leftmenu=supplier&amp;action=create&amp;type=f','','NewSupplier',NULL,'suppliers',2,'','$user->rights->societe->creer','$conf->societe->enabled && $conf->fournisseur->enabled',2,'2017-08-30 15:14:30'),(161593,'auguria',1,'','left','companies',161587,NULL,NULL,3,'/societe/list.php?type=p&leftmenu=prospects','','ListProspectsShort',NULL,'companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161594,'auguria',1,'','left','companies',161593,NULL,NULL,0,'/societe/card.php?leftmenu=prospects&amp;action=create&amp;type=p','','MenuNewProspect',NULL,'companies',2,'','$user->rights->societe->creer','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161596,'auguria',1,'','left','companies',161587,NULL,NULL,4,'/societe/list.php?type=c&leftmenu=customers','','ListCustomersShort',NULL,'companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161597,'auguria',1,'','left','companies',161596,NULL,NULL,0,'/societe/card.php?leftmenu=customers&amp;action=create&amp;type=c','','MenuNewCustomer',NULL,'companies',2,'','$user->rights->societe->creer','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161687,'auguria',1,'','left','companies',161089,NULL,NULL,1,'/contact/list.php?leftmenu=contacts','','ContactsAddresses',NULL,'companies',0,'contacts','$user->rights->societe->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161688,'auguria',1,'','left','companies',161687,NULL,NULL,0,'/contact/card.php?leftmenu=contacts&amp;action=create','','NewContactAddress',NULL,'companies',1,'','$user->rights->societe->creer','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161689,'auguria',1,'','left','companies',161687,NULL,NULL,1,'/contact/list.php?leftmenu=contacts','','List',NULL,'companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161691,'auguria',1,'','left','companies',161689,NULL,NULL,1,'/contact/list.php?leftmenu=contacts&amp;type=p','','ThirdPartyProspects',NULL,'companies',2,'','$user->rights->societe->contact->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161692,'auguria',1,'','left','companies',161689,NULL,NULL,2,'/contact/list.php?leftmenu=contacts&amp;type=c','','ThirdPartyCustomers',NULL,'companies',2,'','$user->rights->societe->contact->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161693,'auguria',1,'','left','companies',161689,NULL,NULL,3,'/contact/list.php?leftmenu=contacts&amp;type=f','','ThirdPartySuppliers',NULL,'companies',2,'','$user->rights->societe->contact->lire','$conf->societe->enabled && $conf->fournisseur->enabled',2,'2017-08-30 15:14:30'),(161694,'auguria',1,'','left','companies',161689,NULL,NULL,4,'/contact/list.php?leftmenu=contacts&amp;type=o','','Others',NULL,'companies',2,'','$user->rights->societe->contact->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161737,'auguria',1,'','left','companies',161089,NULL,NULL,3,'/categories/index.php?leftmenu=cat&amp;type=1','','SuppliersCategoriesShort',NULL,'categories',0,'cat','$user->rights->categorie->lire','$conf->societe->enabled && $conf->categorie->enabled',2,'2017-08-30 15:14:30'),(161738,'auguria',1,'','left','companies',161737,NULL,NULL,0,'/categories/card.php?action=create&amp;type=1','','NewCategory',NULL,'categories',1,'','$user->rights->categorie->creer','$conf->societe->enabled && $conf->categorie->enabled',2,'2017-08-30 15:14:30'),(161747,'auguria',1,'','left','companies',161089,NULL,NULL,4,'/categories/index.php?leftmenu=cat&amp;type=2','','CustomersProspectsCategoriesShort',NULL,'categories',0,'cat','$user->rights->categorie->lire','$conf->fournisseur->enabled && $conf->categorie->enabled',2,'2017-08-30 15:14:30'),(161748,'auguria',1,'','left','companies',161747,NULL,NULL,0,'/categories/card.php?action=create&amp;type=2','','NewCategory',NULL,'categories',1,'','$user->rights->categorie->creer','$conf->fournisseur->enabled && $conf->categorie->enabled',2,'2017-08-30 15:14:30'),(161757,'auguria',1,'','left','companies',161089,NULL,NULL,3,'/categories/index.php?leftmenu=cat&amp;type=4','','ContactCategoriesShort',NULL,'categories',0,'cat','$user->rights->categorie->lire','$conf->societe->enabled && $conf->categorie->enabled',2,'2017-08-30 15:14:30'),(161758,'auguria',1,'','left','companies',161757,NULL,NULL,0,'/categories/card.php?action=create&amp;type=4','','NewCategory',NULL,'categories',1,'','$user->rights->categorie->creer','$conf->societe->enabled && $conf->categorie->enabled',2,'2017-08-30 15:14:30'),(162187,'auguria',1,'','left','commercial',161092,NULL,NULL,4,'/comm/propal/index.php?leftmenu=propals','','Prop',NULL,'propal',0,'propals','$user->rights->propale->lire','$conf->propal->enabled',2,'2017-08-30 15:14:30'),(162188,'auguria',1,'','left','commercial',162187,NULL,NULL,0,'/comm/propal/card.php?action=create&amp;leftmenu=propals','','NewPropal',NULL,'propal',1,'','$user->rights->propale->creer','$conf->propal->enabled',2,'2017-08-30 15:14:30'),(162189,'auguria',1,'','left','commercial',162187,NULL,NULL,1,'/comm/propal/list.php?leftmenu=propals','','List',NULL,'propal',1,'','$user->rights->propale->lire','$conf->propal->enabled',2,'2017-08-30 15:14:30'),(162190,'auguria',1,'','left','commercial',162189,NULL,NULL,2,'/comm/propal/list.php?leftmenu=propals&amp;search_status=0','','PropalsDraft',NULL,'propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2017-08-30 15:14:30'),(162191,'auguria',1,'','left','commercial',162189,NULL,NULL,3,'/comm/propal/list.php?leftmenu=propals&amp;search_status=1','','PropalsOpened',NULL,'propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2017-08-30 15:14:30'),(162192,'auguria',1,'','left','commercial',162189,NULL,NULL,4,'/comm/propal/list.php?leftmenu=propals&amp;search_status=2','','PropalStatusSigned',NULL,'propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2017-08-30 15:14:30'),(162193,'auguria',1,'','left','commercial',162189,NULL,NULL,5,'/comm/propal/list.php?leftmenu=propals&amp;search_status=3','','PropalStatusNotSigned',NULL,'propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2017-08-30 15:14:30'),(162194,'auguria',1,'','left','commercial',162189,NULL,NULL,6,'/comm/propal/list.php?leftmenu=propals&amp;search_status=4','','PropalStatusBilled',NULL,'propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2017-08-30 15:14:30'),(162197,'auguria',1,'','left','commercial',162187,NULL,NULL,4,'/comm/propal/stats/index.php?leftmenu=propals','','Statistics',NULL,'propal',1,'','$user->rights->propale->lire','$conf->propal->enabled',2,'2017-08-30 15:14:30'),(162287,'auguria',1,'','left','commercial',161092,NULL,NULL,5,'/commande/index.php?leftmenu=orders','','CustomersOrders',NULL,'orders',0,'orders','$user->rights->commande->lire','$conf->commande->enabled',2,'2017-08-30 15:14:30'),(162288,'auguria',1,'','left','commercial',162287,NULL,NULL,0,'/commande/card.php?action=create&amp;leftmenu=orders','','NewOrder',NULL,'orders',1,'','$user->rights->commande->creer','$conf->commande->enabled',2,'2017-08-30 15:14:30'),(162289,'auguria',1,'','left','commercial',162287,NULL,NULL,1,'/commande/list.php?leftmenu=orders','','List',NULL,'orders',1,'','$user->rights->commande->lire','$conf->commande->enabled',2,'2017-08-30 15:14:30'),(162290,'auguria',1,'','left','commercial',162289,NULL,NULL,2,'/commande/list.php?leftmenu=orders&amp;search_status=0','','StatusOrderDraftShort',NULL,'orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2017-08-30 15:14:30'),(162291,'auguria',1,'','left','commercial',162289,NULL,NULL,3,'/commande/list.php?leftmenu=orders&amp;search_status=1','','StatusOrderValidated',NULL,'orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2017-08-30 15:14:30'),(162292,'auguria',1,'','left','commercial',162289,NULL,NULL,4,'/commande/list.php?leftmenu=orders&amp;search_status=2','','StatusOrderOnProcessShort',NULL,'orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2017-08-30 15:14:30'),(162293,'auguria',1,'','left','commercial',162289,NULL,NULL,5,'/commande/list.php?leftmenu=orders&amp;search_status=3','','StatusOrderToBill',NULL,'orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2017-08-30 15:14:30'),(162294,'auguria',1,'','left','commercial',162289,NULL,NULL,6,'/commande/list.php?leftmenu=orders&amp;search_status=4','','StatusOrderProcessed',NULL,'orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2017-08-30 15:14:30'),(162295,'auguria',1,'','left','commercial',162289,NULL,NULL,7,'/commande/list.php?leftmenu=orders&amp;search_status=-1','','StatusOrderCanceledShort',NULL,'orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2017-08-30 15:14:30'),(162296,'auguria',1,'','left','commercial',162287,NULL,NULL,4,'/commande/stats/index.php?leftmenu=orders','','Statistics',NULL,'orders',1,'','$user->rights->commande->lire','$conf->commande->enabled',2,'2017-08-30 15:14:30'),(162387,'auguria',1,'','left','commercial',161090,NULL,NULL,6,'/expedition/index.php?leftmenu=sendings','','Shipments',NULL,'sendings',0,'sendings','$user->rights->expedition->lire','$conf->expedition->enabled',2,'2017-08-30 15:14:30'),(162388,'auguria',1,'','left','commercial',162387,NULL,NULL,0,'/expedition/card.php?action=create2&leftmenu=sendings','','NewSending',NULL,'sendings',1,'','$user->rights->expedition->creer','$conf->expedition->enabled && $leftmenu==\"sendings\"',2,'2017-08-30 15:14:30'),(162389,'auguria',1,'','left','commercial',162387,NULL,NULL,1,'/expedition/list.php?leftmenu=sendings','','List',NULL,'sendings',1,'','$user->rights->expedition->lire','$conf->expedition->enabled && $leftmenu==\"sendings\"',2,'2017-08-30 15:14:30'),(162390,'auguria',1,'','left','commercial',162387,NULL,NULL,2,'/expedition/stats/index.php?leftmenu=sendings','','Statistics',NULL,'sendings',1,'','$user->rights->expedition->lire','$conf->expedition->enabled && $leftmenu==\"sendings\"',2,'2017-08-30 15:14:30'),(162487,'auguria',1,'','left','commercial',161092,NULL,NULL,7,'/contrat/index.php?leftmenu=contracts','','Contracts',NULL,'contracts',0,'contracts','$user->rights->contrat->lire','$conf->contrat->enabled',2,'2017-08-30 15:14:30'),(162488,'auguria',1,'','left','commercial',162487,NULL,NULL,0,'/contrat/card.php?&action=create&amp;leftmenu=contracts','','NewContract',NULL,'contracts',1,'','$user->rights->contrat->creer','$conf->contrat->enabled',2,'2017-08-30 15:14:30'),(162489,'auguria',1,'','left','commercial',162487,NULL,NULL,1,'/contrat/list.php?leftmenu=contracts','','List',NULL,'contracts',1,'','$user->rights->contrat->lire','$conf->contrat->enabled',2,'2017-08-30 15:14:30'),(162490,'auguria',1,'','left','commercial',162487,NULL,NULL,2,'/contrat/services.php?leftmenu=contracts','','MenuServices',NULL,'contracts',1,'','$user->rights->contrat->lire','$conf->contrat->enabled',2,'2017-08-30 15:14:30'),(162491,'auguria',1,'','left','commercial',162490,NULL,NULL,0,'/contrat/services.php?leftmenu=contracts&amp;mode=0','','MenuInactiveServices',NULL,'contracts',2,'','$user->rights->contrat->lire','$conf->contrat->enabled && $leftmenu==\"contracts\"',2,'2017-08-30 15:14:30'),(162492,'auguria',1,'','left','commercial',162490,NULL,NULL,1,'/contrat/services.php?leftmenu=contracts&amp;mode=4','','MenuRunningServices',NULL,'contracts',2,'','$user->rights->contrat->lire','$conf->contrat->enabled && $leftmenu==\"contracts\"',2,'2017-08-30 15:14:30'),(162493,'auguria',1,'','left','commercial',162490,NULL,NULL,2,'/contrat/services.php?leftmenu=contracts&amp;mode=4&amp;filter=expired','','MenuExpiredServices',NULL,'contracts',2,'','$user->rights->contrat->lire','$conf->contrat->enabled && $leftmenu==\"contracts\"',2,'2017-08-30 15:14:30'),(162494,'auguria',1,'','left','commercial',162490,NULL,NULL,3,'/contrat/services.php?leftmenu=contracts&amp;mode=5','','MenuClosedServices',NULL,'contracts',2,'','$user->rights->contrat->lire','$conf->contrat->enabled && $leftmenu==\"contracts\"',2,'2017-08-30 15:14:30'),(162587,'auguria',1,'','left','commercial',161092,NULL,NULL,8,'/fichinter/list.php?leftmenu=ficheinter','','Interventions',NULL,'interventions',0,'ficheinter','$user->rights->ficheinter->lire','$conf->ficheinter->enabled',2,'2017-08-30 15:14:30'),(162588,'auguria',1,'','left','commercial',162587,NULL,NULL,0,'/fichinter/card.php?action=create&amp;leftmenu=ficheinter','','NewIntervention',NULL,'interventions',1,'','$user->rights->ficheinter->creer','$conf->ficheinter->enabled',2,'2017-08-30 15:14:30'),(162589,'auguria',1,'','left','commercial',162587,NULL,NULL,1,'/fichinter/list.php?leftmenu=ficheinter','','List',NULL,'interventions',1,'','$user->rights->ficheinter->lire','$conf->ficheinter->enabled',2,'2017-08-30 15:14:30'),(162590,'auguria',1,'','left','commercial',162587,NULL,NULL,2,'/fichinter/stats/index.php?leftmenu=ficheinter','','Statistics',NULL,'interventions',1,'','$user->rights->ficheinter->lire','$conf->ficheinter->enabled',2,'2017-08-30 15:14:30'),(162687,'auguria',1,'','left','accountancy',161093,NULL,NULL,3,'/fourn/facture/list.php?leftmenu=suppliers_bills','','BillsSuppliers',NULL,'bills',0,'supplier_bills','$user->rights->fournisseur->facture->lire','$conf->supplier_invoice->enabled',2,'2017-08-30 15:14:30'),(162688,'auguria',1,'','left','accountancy',162687,NULL,NULL,0,'/fourn/facture/card.php?action=create&amp;leftmenu=suppliers_bills','','NewBill',NULL,'bills',1,'','$user->rights->fournisseur->facture->creer','$conf->supplier_invoice->enabled',2,'2017-08-30 15:14:30'),(162689,'auguria',1,'','left','accountancy',162687,NULL,NULL,1,'/fourn/facture/list.php?leftmenu=suppliers_bills','','List',NULL,'bills',1,'','$user->rights->fournisseur->facture->lire','$conf->supplier_invoice->enabled',2,'2017-08-30 15:14:30'),(162690,'auguria',1,'','left','accountancy',162687,NULL,NULL,2,'/fourn/facture/paiement.php?leftmenu=suppliers_bills','','Payments',NULL,'bills',1,'','$user->rights->fournisseur->facture->lire','$conf->supplier_invoice->enabled',2,'2017-08-30 15:14:30'),(162691,'auguria',1,'','left','accountancy',162687,NULL,NULL,8,'/compta/facture/stats/index.php?leftmenu=customers_bills&mode=supplier','','Statistics',NULL,'bills',1,'','$user->rights->fournisseur->facture->lire','$conf->supplier_invoice->enabled',2,'2017-08-30 15:14:30'),(162692,'auguria',1,'','left','accountancy',162690,NULL,NULL,1,'/fourn/facture/rapport.php?leftmenu=suppliers_bills','','Reporting',NULL,'bills',2,'','$user->rights->fournisseur->facture->lire','$conf->supplier_invoice->enabled',2,'2017-08-30 15:14:30'),(162787,'auguria',1,'','left','accountancy',161093,NULL,NULL,3,'/compta/facture/list.php?leftmenu=customers_bills','','BillsCustomers',NULL,'bills',0,'customer_bills','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162788,'auguria',1,'','left','accountancy',162787,NULL,NULL,3,'/compta/facture/card.php?action=create&amp;leftmenu=customers_bills','','NewBill',NULL,'bills',1,'','$user->rights->facture->creer','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162789,'auguria',1,'','left','accountancy',162787,NULL,NULL,5,'/compta/facture/fiche-rec.php?leftmenu=customers_bills','','ListOfTemplates',NULL,'bills',1,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162791,'auguria',1,'','left','accountancy',162787,NULL,NULL,6,'/compta/paiement/list.php?leftmenu=customers_bills','','Payments',NULL,'bills',1,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162792,'auguria',1,'','left','accountancy',162787,NULL,NULL,4,'/compta/facture/list.php?leftmenu=customers_bills','','List',NULL,'bills',1,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162797,'auguria',1,'','left','accountancy',162791,NULL,NULL,1,'/compta/paiement/rapport.php?leftmenu=customers_bills','','Reportings',NULL,'bills',2,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162798,'auguria',1,'','left','accountancy',161101,NULL,NULL,9,'/compta/paiement/cheque/index.php?leftmenu=checks&amp;mainmenu=bank','','MenuChequeDeposits',NULL,'bills',0,'checks','$user->rights->banque->lire','empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT) && ! empty($conf->banque->enabled) && (! empty($conf->facture->enabled) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON))',2,'2017-08-30 15:14:30'),(162799,'auguria',1,'','left','accountancy',162798,NULL,NULL,0,'/compta/paiement/cheque/card.php?leftmenu=checks&amp;action=new','','NewCheckDeposit',NULL,'compta',1,'','$user->rights->banque->lire','empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT) && ! empty($conf->banque->enabled) && (! empty($conf->facture->enabled) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON))',2,'2017-08-30 15:14:30'),(162800,'auguria',1,'','left','accountancy',162798,NULL,NULL,1,'/compta/paiement/cheque/list.php?leftmenu=checks','','List',NULL,'bills',1,'','$user->rights->banque->lire','empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT) && ! empty($conf->banque->enabled) && (! empty($conf->facture->enabled) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON))',2,'2017-08-30 15:14:30'),(162801,'auguria',1,'','left','accountancy',162787,NULL,NULL,8,'/compta/facture/stats/index.php?leftmenu=customers_bills','','Statistics',NULL,'bills',1,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162807,'auguria',1,'','left','accountancy',162792,NULL,NULL,1,'/compta/facture/list.php?leftmenu=customers_bills&amp;search_status=0','','BillShortStatusDraft',NULL,'bills',2,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162808,'auguria',1,'','left','accountancy',162792,NULL,NULL,2,'/compta/facture/list.php?leftmenu=customers_bills&amp;search_status=1','','BillShortStatusNotPaid',NULL,'bills',2,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162809,'auguria',1,'','left','accountancy',162792,NULL,NULL,3,'/compta/facture/list.php?leftmenu=customers_bills&amp;search_status=2','','BillShortStatusPaid',NULL,'bills',2,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162810,'auguria',1,'','left','accountancy',162792,NULL,NULL,4,'/compta/facture/list.php?leftmenu=customers_bills&amp;search_status=3','','BillShortStatusCanceled',NULL,'bills',2,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162987,'auguria',1,'','left','accountancy',161093,NULL,NULL,3,'/commande/list.php?leftmenu=orders&amp;search_status=3','','MenuOrdersToBill',NULL,'orders',0,'orders','$user->rights->commande->lire','$conf->commande->enabled',0,'2017-08-30 15:14:30'),(163087,'auguria',1,'','left','accountancy',161093,NULL,NULL,4,'/don/index.php?leftmenu=donations&amp;mainmenu=accountancy','','Donations',NULL,'donations',0,'donations','$user->rights->don->lire','$conf->don->enabled',2,'2017-08-30 15:14:30'),(163088,'auguria',1,'','left','accountancy',163087,NULL,NULL,0,'/don/card.php?leftmenu=donations&amp;mainmenu=accountancy&amp;action=create','','NewDonation',NULL,'donations',1,'','$user->rights->don->creer','$conf->don->enabled && $leftmenu==\"donations\"',2,'2017-08-30 15:14:30'),(163089,'auguria',1,'','left','accountancy',163087,NULL,NULL,1,'/don/list.php?leftmenu=donations&amp;mainmenu=accountancy','','List',NULL,'donations',1,'','$user->rights->don->lire','$conf->don->enabled && $leftmenu==\"donations\"',2,'2017-08-30 15:14:30'),(163187,'auguria',1,'','left','accountancy',161102,NULL,NULL,5,'/compta/deplacement/index.php?leftmenu=tripsandexpenses','','TripsAndExpenses',NULL,'trips',0,'tripsandexpenses','$user->rights->deplacement->lire','$conf->deplacement->enabled',0,'2017-08-30 15:14:30'),(163188,'auguria',1,'','left','accountancy',163187,NULL,NULL,1,'/compta/deplacement/card.php?action=create&amp;leftmenu=tripsandexpenses','','New',NULL,'trips',1,'','$user->rights->deplacement->creer','$conf->deplacement->enabled',0,'2017-08-30 15:14:30'),(163189,'auguria',1,'','left','accountancy',163187,NULL,NULL,2,'/compta/deplacement/list.php?leftmenu=tripsandexpenses','','List',NULL,'trips',1,'','$user->rights->deplacement->lire','$conf->deplacement->enabled',0,'2017-08-30 15:14:30'),(163190,'auguria',1,'','left','accountancy',163187,NULL,NULL,2,'/compta/deplacement/stats/index.php?leftmenu=tripsandexpenses','','Statistics',NULL,'trips',1,'','$user->rights->deplacement->lire','$conf->deplacement->enabled',0,'2017-08-30 15:14:30'),(163287,'auguria',1,'','left','accountancy',161093,NULL,NULL,6,'/compta/charges/index.php?leftmenu=tax&amp;mainmenu=accountancy','','MenuSpecialExpenses',NULL,'compta',0,'tax','(! empty($conf->tax->enabled) && $user->rights->tax->charges->lire) || (! empty($conf->salaries->enabled) && $user->rights->salaries->read)','$conf->tax->enabled || $conf->salaries->enabled',0,'2017-08-30 15:14:30'),(163297,'auguria',1,'','left','accountancy',163287,NULL,NULL,1,'/compta/salaries/index.php?leftmenu=tax_salary&amp;mainmenu=accountancy','','Salaries',NULL,'salaries',1,'tax_sal','$user->rights->salaries->payment->read','$conf->salaries->enabled',0,'2017-08-30 15:14:30'),(163298,'auguria',1,'','left','accountancy',163297,NULL,NULL,2,'/compta/salaries/card.php?leftmenu=tax_salary&amp;action=create','','NewPayment',NULL,'companies',2,'','$user->rights->salaries->payment->write','$conf->salaries->enabled && $leftmenu==\"tax_salary\"',0,'2017-08-30 15:14:30'),(163299,'auguria',1,'','left','accountancy',163297,NULL,NULL,3,'/compta/salaries/index.php?leftmenu=tax_salary','','Payments',NULL,'companies',2,'','$user->rights->salaries->payment->read','$conf->salaries->enabled && $leftmenu==\"tax_salary\"',0,'2017-08-30 15:14:30'),(163307,'auguria',1,'','left','accountancy',163287,NULL,NULL,1,'/loan/index.php?leftmenu=tax_loan&amp;mainmenu=accountancy','','Loans',NULL,'loan',1,'tax_loan','$user->rights->loan->read','$conf->loan->enabled',0,'2017-08-30 15:14:30'),(163308,'auguria',1,'','left','accountancy',163307,NULL,NULL,2,'/loan/card.php?leftmenu=tax_loan&amp;action=create','','NewLoan',NULL,'loan',2,'','$user->rights->loan->write','$conf->loan->enabled && $leftmenu==\"tax_loan\"',0,'2017-08-30 15:14:30'),(163310,'auguria',1,'','left','accountancy',163307,NULL,NULL,4,'/loan/calc.php?leftmenu=tax_loan','','Calculator',NULL,'companies',2,'','$user->rights->loan->calc','$conf->loan->enabled && $leftmenu==\"tax_loan\" && ! empty($conf->global->LOAN_SHOW_CALCULATOR)',0,'2017-08-30 15:14:30'),(163337,'auguria',1,'','left','accountancy',163287,NULL,NULL,1,'/compta/sociales/index.php?leftmenu=tax_social','','SocialContributions',NULL,'',1,'tax_social','$user->rights->tax->charges->lire','$conf->tax->enabled',0,'2017-08-30 15:14:30'),(163338,'auguria',1,'','left','accountancy',163337,NULL,NULL,2,'/compta/sociales/card.php?leftmenu=tax_social&amp;action=create','','MenuNewSocialContribution',NULL,'',2,'','$user->rights->tax->charges->creer','$conf->tax->enabled && $leftmenu==\"tax_social\"',0,'2017-08-30 15:14:30'),(163339,'auguria',1,'','left','accountancy',163337,NULL,NULL,3,'/compta/sociales/payments.php?leftmenu=tax_social&amp;mainmenu=accountancy&amp;mode=sconly','','Payments',NULL,'',2,'','$user->rights->tax->charges->lire','$conf->tax->enabled && $leftmenu==\"tax_social\"',0,'2017-08-30 15:14:30'),(163387,'auguria',1,'','left','accountancy',163287,NULL,NULL,7,'/compta/tva/index.php?leftmenu=tax_vat&amp;mainmenu=accountancy','','VAT',NULL,'companies',1,'tax_vat','$user->rights->tax->charges->lire','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS)',0,'2017-08-30 15:14:30'),(163388,'auguria',1,'','left','accountancy',163387,NULL,NULL,0,'/compta/tva/card.php?leftmenu=tax_vat&amp;action=create','','New',NULL,'companies',2,'','$user->rights->tax->charges->creer','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu==\"tax_vat\"',0,'2017-08-30 15:14:30'),(163389,'auguria',1,'','left','accountancy',163387,NULL,NULL,1,'/compta/tva/reglement.php?leftmenu=tax_vat','','List',NULL,'companies',2,'','$user->rights->tax->charges->lire','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu==\"tax_vat\"',0,'2017-08-30 15:14:30'),(163390,'auguria',1,'','left','accountancy',163387,NULL,NULL,2,'/compta/tva/clients.php?leftmenu=tax_vat','','ReportByCustomers',NULL,'companies',2,'','$user->rights->tax->charges->lire','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu==\"tax_vat\"',0,'2017-08-30 15:14:30'),(163391,'auguria',1,'','left','accountancy',163387,NULL,NULL,3,'/compta/tva/quadri_detail.php?leftmenu=tax_vat','','ReportByQuarter',NULL,'companies',2,'','$user->rights->tax->charges->lire','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu==\"tax_vat\"',0,'2017-08-30 15:14:30'),(163487,'auguria',1,'','left','accountancy',161093,NULL,NULL,7,'/accountancy/index.php?leftmenu=accountancy','','MenuAccountancy',NULL,'accountancy',0,'accounting','! empty($conf->accounting->enabled) || $user->rights->accounting->bind->write || $user->rights->accounting->bind->write || $user->rights->compta->resultat->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163488,'auguria',1,'','left','accountancy',163487,NULL,NULL,2,'/accountancy/customer/index.php?leftmenu=dispatch_customer','','CustomersVentilation',NULL,'accountancy',1,'dispatch_customer','$user->rights->accounting->bind->write','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163489,'auguria',1,'','left','accountancy',163488,NULL,NULL,3,'/accountancy/customer/list.php','','ToDispatch',NULL,'accountancy',2,'','$user->rights->accounting->bind->write','$conf->accounting->enabled && $leftmenu==\"dispatch_customer\"',0,'2017-08-30 15:14:30'),(163490,'auguria',1,'','left','accountancy',163488,NULL,NULL,4,'/accountancy/customer/lines.php','','Dispatched',NULL,'accountancy',2,'','$user->rights->accounting->bind->write','$conf->accounting->enabled && $leftmenu==\"dispatch_customer\"',0,'2017-08-30 15:14:30'),(163497,'auguria',1,'','left','accountancy',163487,NULL,NULL,5,'/accountancy/supplier/index.php?leftmenu=dispatch_supplier','','SuppliersVentilation',NULL,'accountancy',1,'ventil_supplier','$user->rights->accounting->bind->write','$conf->accounting->enabled && $conf->fournisseur->enabled',0,'2017-08-30 15:14:30'),(163498,'auguria',1,'','left','accountancy',163497,NULL,NULL,6,'/accountancy/supplier/list.php','','ToDispatch',NULL,'accountancy',2,'','$user->rights->accounting->bind->write','$conf->accounting->enabled && $conf->fournisseur->enabled && $leftmenu==\"dispatch_supplier\"',0,'2017-08-30 15:14:30'),(163499,'auguria',1,'','left','accountancy',163497,NULL,NULL,7,'/accountancy/supplier/lines.php','','Dispatched',NULL,'accountancy',2,'','$user->rights->accounting->bind->write','$conf->accounting->enabled && $conf->fournisseur->enabled && $leftmenu==\"dispatch_supplier\"',0,'2017-08-30 15:14:30'),(163507,'auguria',1,'','left','accountancy',163487,NULL,NULL,5,'/accountancy/expensereport/index.php?leftmenu=dispatch_expensereport','','ExpenseReportsVentilation',NULL,'accountancy',1,'ventil_expensereport','$user->rights->accounting->bind->write','$conf->accounting->enabled && $conf->expensereport->enabled',0,'2017-08-30 15:14:30'),(163508,'auguria',1,'','left','accountancy',163507,NULL,NULL,6,'/accountancy/expensereport/list.php','','ToDispatch',NULL,'accountancy',2,'','$user->rights->accounting->bind->write','$conf->accounting->enabled && $conf->expensereport->enabled && $leftmenu==\"dispatch_expensereport\"',0,'2017-08-30 15:14:30'),(163509,'auguria',1,'','left','accountancy',163507,NULL,NULL,7,'/accountancy/expensereport/lines.php','','Dispatched',NULL,'accountancy',2,'','$user->rights->accounting->bind->write','$conf->accounting->enabled && $conf->expensereport->enabled && $leftmenu==\"dispatch_expensereport\"',0,'2017-08-30 15:14:30'),(163517,'auguria',1,'','left','accountancy',163487,NULL,NULL,15,'/accountancy/bookkeeping/list.php','','Bookkeeping',NULL,'accountancy',1,'bookkeeping','$user->rights->accounting->mouvements->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163522,'auguria',1,'','left','accountancy',163487,NULL,NULL,16,'/accountancy/bookkeeping/balance.php','','AccountBalance',NULL,'accountancy',1,'balance','$user->rights->accounting->mouvements->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163527,'auguria',1,'','left','accountancy',163487,NULL,NULL,17,'/accountancy/report/result.php?mainmenu=accountancy&leftmenu=accountancy','','Reportings',NULL,'main',1,'report','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163528,'auguria',1,'','left','accountancy',163527,NULL,NULL,19,'/compta/resultat/index.php?mainmenu=accountancy&leftmenu=accountancy','','ReportInOut',NULL,'main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled && $leftmenu==\"accountancy\"',0,'2017-08-30 15:14:30'),(163529,'auguria',1,'','left','accountancy',163528,NULL,NULL,18,'/accountancy/report/result.php?mainmenu=accountancy&leftmenu=accountancy','','ByAccounts',NULL,'main',3,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled && $leftmenu==\"accountancy\"',0,'2017-08-30 15:14:30'),(163530,'auguria',1,'','left','accountancy',163528,NULL,NULL,20,'/compta/resultat/clientfourn.php?mainmenu=accountancy&leftmenu=accountancy','','ByCompanies',NULL,'main',3,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled && $leftmenu==\"accountancy\"',0,'2017-08-30 15:14:30'),(163531,'auguria',1,'','left','accountancy',163527,NULL,NULL,21,'/compta/stats/index.php?mainmenu=accountancy&leftmenu=accountancy','','ReportTurnover',NULL,'main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled && $leftmenu==\"accountancy\"',0,'2017-08-30 15:14:30'),(163532,'auguria',1,'','left','accountancy',163531,NULL,NULL,22,'/compta/stats/casoc.php?mainmenu=accountancy&leftmenu=accountancy','','ByCompanies',NULL,'main',3,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled && $leftmenu==\"accountancy\"',0,'2017-08-30 15:14:30'),(163533,'auguria',1,'','left','accountancy',163531,NULL,NULL,23,'/compta/stats/cabyuser.php?mainmenu=accountancy&leftmenu=accountancy','','ByUsers',NULL,'main',3,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled && $leftmenu==\"accountancy\"',0,'2017-08-30 15:14:30'),(163534,'auguria',1,'','left','accountancy',163531,NULL,NULL,24,'/compta/stats/cabyprodserv.php?mainmenu=accountancy&leftmenu=accountancy','','ByProductsAndServices',NULL,'main',3,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled && $leftmenu==\"accountancy\"',0,'2017-08-30 15:14:30'),(163537,'auguria',1,'','left','accountancy',163538,NULL,NULL,80,'/accountancy/admin/fiscalyear.php?mainmenu=accountancy&leftmenu=accountancy_admin','','FiscalPeriod',NULL,'admin',1,'accountancy_admin_period','','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\" && $conf->global->MAIN_FEATURES_LEVEL > 0',2,'2017-08-30 15:14:30'),(163538,'auguria',1,'','left','accountancy',163487,NULL,NULL,1,'/accountancy/index.php?mainmenu=accountancy&leftmenu=accountancy_admin','','Setup',NULL,'accountancy',1,'accountancy_admin','$user->rights->accounting->chartofaccount','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163541,'auguria',1,'','left','accountancy',163538,NULL,NULL,10,'/accountancy/admin/journals_list.php?id=35&mainmenu=accountancy&leftmenu=accountancy_admin','','AccountingJournals',NULL,'accountancy',2,'accountancy_admin_journal','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163542,'auguria',1,'','left','accountancy',163538,NULL,NULL,20,'/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin','','Pcg_version',NULL,'accountancy',2,'accountancy_admin_chartmodel','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163543,'auguria',1,'','left','accountancy',163538,NULL,NULL,30,'/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin','','Chartofaccounts',NULL,'accountancy',2,'accountancy_admin_chart','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163544,'auguria',1,'','left','accountancy',163538,NULL,NULL,40,'/accountancy/admin/categories_list.php?id=32&mainmenu=accountancy&leftmenu=accountancy_admin','','AccountingCategory',NULL,'accountancy',2,'accountancy_admin_chart_group','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163545,'auguria',1,'','left','accountancy',163538,NULL,NULL,50,'/accountancy/admin/defaultaccounts.php?mainmenu=accountancy&leftmenu=accountancy_admin','','MenuDefaultAccounts',NULL,'accountancy',2,'accountancy_admin_default','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163546,'auguria',1,'','left','accountancy',163538,NULL,NULL,60,'/admin/dict.php?id=10&from=accountancy&search_country_id=__MYCOUNTRYID__&mainmenu=accountancy&leftmenu=accountancy_admin','','MenuVatAccounts',NULL,'accountancy',2,'accountancy_admin_vat','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163547,'auguria',1,'','left','accountancy',163538,NULL,NULL,70,'/admin/dict.php?id=7&from=accountancy&search_country_id=__MYCOUNTRYID__&mainmenu=accountancy&leftmenu=accountancy_admin','','MenuTaxAccounts',NULL,'accountancy',2,'accountancy_admin_tax','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163548,'auguria',1,'','left','accountancy',163538,NULL,NULL,80,'/admin/dict.php?id=17&from=accountancy&mainmenu=accountancy&leftmenu=accountancy_admin','','MenuExpenseReportAccounts',NULL,'accountancy',2,'accountancy_admin_expensereport','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $conf->expensereport->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163549,'auguria',1,'','left','accountancy',163538,NULL,NULL,90,'/accountancy/admin/productaccount.php?mainmenu=accountancy&leftmenu=accountancy_admin','','MenuProductsAccounts',NULL,'accountancy',2,'accountancy_admin_product','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163587,'auguria',1,'','left','accountancy',161101,NULL,NULL,9,'/compta/prelevement/index.php?leftmenu=withdraw&amp;mainmenu=bank','','StandingOrders',NULL,'withdrawals',0,'withdraw','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled',2,'2017-08-30 15:14:30'),(163589,'auguria',1,'','left','accountancy',163587,NULL,NULL,0,'/compta/prelevement/create.php?leftmenu=withdraw','','NewStandingOrder',NULL,'withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2017-08-30 15:14:30'),(163590,'auguria',1,'','left','accountancy',163587,NULL,NULL,2,'/compta/prelevement/bons.php?leftmenu=withdraw','','WithdrawalsReceipts',NULL,'withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2017-08-30 15:14:30'),(163591,'auguria',1,'','left','accountancy',163587,NULL,NULL,3,'/compta/prelevement/list.php?leftmenu=withdraw','','WithdrawalsLines',NULL,'withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2017-08-30 15:14:30'),(163593,'auguria',1,'','left','accountancy',163587,NULL,NULL,5,'/compta/prelevement/rejets.php?leftmenu=withdraw','','Rejects',NULL,'withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2017-08-30 15:14:30'),(163594,'auguria',1,'','left','accountancy',163587,NULL,NULL,6,'/compta/prelevement/stats.php?leftmenu=withdraw','','Statistics',NULL,'withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2017-08-30 15:14:30'),(163687,'auguria',1,'','left','accountancy',161101,NULL,NULL,1,'/compta/bank/index.php?leftmenu=bank&amp;mainmenu=bank','','MenuBankCash',NULL,'banks',0,'bank','$user->rights->banque->lire','$conf->banque->enabled',0,'2017-08-30 15:14:30'),(163688,'auguria',1,'','left','accountancy',163687,NULL,NULL,0,'/compta/bank/card.php?action=create&amp;leftmenu=bank','','MenuNewFinancialAccount',NULL,'banks',1,'','$user->rights->banque->configurer','$conf->banque->enabled && ($leftmenu==\"bank\" || $leftmenu==\"checks\" || $leftmenu==\"withdraw\")',0,'2017-08-30 15:14:30'),(163690,'auguria',1,'','left','accountancy',163687,NULL,NULL,2,'/compta/bank/bankentries.php?leftmenu=bank','','ListTransactions',NULL,'banks',1,'','$user->rights->banque->lire','$conf->banque->enabled && ($leftmenu==\"bank\" || $leftmenu==\"checks\" || $leftmenu==\"withdraw\")',0,'2017-08-30 15:14:30'),(163691,'auguria',1,'','left','accountancy',163687,NULL,NULL,3,'/compta/bank/budget.php?leftmenu=bank','','ListTransactionsByCategory',NULL,'banks',1,'','$user->rights->banque->lire','$conf->banque->enabled && ($leftmenu==\"bank\" || $leftmenu==\"checks\" || $leftmenu==\"withdraw\")',0,'2017-08-30 15:14:30'),(163693,'auguria',1,'','left','accountancy',163687,NULL,NULL,5,'/compta/bank/transfer.php?leftmenu=bank','','BankTransfers',NULL,'banks',1,'','$user->rights->banque->transfer','$conf->banque->enabled && ($leftmenu==\"bank\" || $leftmenu==\"checks\" || $leftmenu==\"withdraw\")',0,'2017-08-30 15:14:30'),(163737,'auguria',1,'','left','accountancy',161101,NULL,NULL,4,'/categories/index.php?leftmenu=bank&amp;type=5','','Categories',NULL,'categories',0,'cat','$user->rights->categorie->lire','$conf->categorie->enabled',2,'2017-08-30 15:14:30'),(163738,'auguria',1,'','left','accountancy',163737,NULL,NULL,0,'/categories/card.php?leftmenu=bank&amp;action=create&amp;type=5','','NewCategory',NULL,'categories',1,'','$user->rights->categorie->creer','$conf->categorie->enabled',2,'2017-08-30 15:14:30'),(163787,'auguria',1,'','left','accountancy',161093,NULL,NULL,11,'/compta/resultat/index.php?leftmenu=ca&amp;mainmenu=accountancy','','Reportings',NULL,'main',0,'ca','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled',0,'2017-08-30 15:14:30'),(163792,'auguria',1,'','left','accountancy',163487,NULL,NULL,1,'','','Journalization',NULL,'main',1,'','$user->rights->accounting->comptarapport->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163793,'auguria',1,'','left','accountancy',163792,NULL,NULL,4,'/accountancy/journal/sellsjournal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal=1','','SellsJournal',NULL,'main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163794,'auguria',1,'','left','accountancy',163792,NULL,NULL,1,'/accountancy/journal/bankjournal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal=3','','BankJournal',NULL,'main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163795,'auguria',1,'','left','accountancy',163792,NULL,NULL,2,'/accountancy/journal/expensereportsjournal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal=6','','ExpenseReportJournal',NULL,'main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163796,'auguria',1,'','left','accountancy',163792,NULL,NULL,3,'/accountancy/journal/purchasesjournal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal=2','','PurchasesJournal',NULL,'main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163798,'auguria',1,'','left','accountancy',163787,NULL,NULL,0,'/compta/resultat/index.php?leftmenu=ca','','ReportInOut',NULL,'main',1,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled && $leftmenu==\"ca\"',0,'2017-08-30 15:14:30'),(163799,'auguria',1,'','left','accountancy',163788,NULL,NULL,0,'/compta/resultat/clientfourn.php?leftmenu=ca','','ByCompanies',NULL,'main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled && $leftmenu==\"ca\"',0,'2017-08-30 15:14:30'),(163800,'auguria',1,'','left','accountancy',163787,NULL,NULL,1,'/compta/stats/index.php?leftmenu=ca','','ReportTurnover',NULL,'main',1,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled && $leftmenu==\"ca\"',0,'2017-08-30 15:14:30'),(163801,'auguria',1,'','left','accountancy',163790,NULL,NULL,0,'/compta/stats/casoc.php?leftmenu=ca','','ByCompanies',NULL,'main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled && $leftmenu==\"ca\"',0,'2017-08-30 15:14:30'),(163802,'auguria',1,'','left','accountancy',163790,NULL,NULL,1,'/compta/stats/cabyuser.php?leftmenu=ca','','ByUsers',NULL,'main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled && $leftmenu==\"ca\"',0,'2017-08-30 15:14:30'),(163803,'auguria',1,'','left','accountancy',163790,NULL,NULL,1,'/compta/stats/cabyprodserv.php?leftmenu=ca','','ByProductsAndServices',NULL,'main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled && $leftmenu==\"ca\"',0,'2017-08-30 15:14:30'),(163887,'auguria',1,'','left','products',161090,NULL,NULL,0,'/product/index.php?leftmenu=product&amp;type=0','','Products',NULL,'products',0,'product','$user->rights->produit->lire','$conf->product->enabled',2,'2017-08-30 15:14:30'),(163888,'auguria',1,'','left','products',163887,NULL,NULL,0,'/product/card.php?leftmenu=product&amp;action=create&amp;type=0','','NewProduct',NULL,'products',1,'','$user->rights->produit->creer','$conf->product->enabled',2,'2017-08-30 15:14:30'),(163889,'auguria',1,'','left','products',163887,NULL,NULL,1,'/product/list.php?leftmenu=product&amp;type=0','','List',NULL,'products',1,'','$user->rights->produit->lire','$conf->product->enabled',2,'2017-08-30 15:14:30'),(163890,'auguria',1,'','left','products',163887,NULL,NULL,4,'/product/reassort.php?type=0','','Stocks',NULL,'products',1,'','$user->rights->produit->lire && $user->rights->stock->lire','$conf->product->enabled',2,'2017-08-30 15:14:30'),(163891,'auguria',1,'','left','products',163887,NULL,NULL,7,'/product/stats/card.php?id=all&amp;leftmenu=stats&amp;type=0','','Statistics',NULL,'main',1,'','$user->rights->produit->lire','$conf->propal->enabled',2,'2017-08-30 15:14:30'),(163892,'auguria',1,'','left','products',163887,NULL,NULL,5,'/product/reassortlot.php?type=0','','StocksByLotSerial',NULL,'products',1,'','$user->rights->produit->lire && $user->rights->stock->lire','$conf->productbatch->enabled',2,'2017-08-30 15:14:30'),(163893,'auguria',1,'','left','products',163887,NULL,NULL,6,'/product/stock/productlot_list.php','','LotSerial',NULL,'products',1,'','$user->rights->produit->lire && $user->rights->stock->lire','$conf->productbatch->enabled',2,'2017-08-30 15:14:30'),(163987,'auguria',1,'','left','products',161090,NULL,NULL,1,'/product/index.php?leftmenu=service&amp;type=1','','Services',NULL,'products',0,'service','$user->rights->service->lire','$conf->service->enabled',2,'2017-08-30 15:14:30'),(163988,'auguria',1,'','left','products',163987,NULL,NULL,0,'/product/card.php?leftmenu=service&amp;action=create&amp;type=1','','NewService',NULL,'products',1,'','$user->rights->service->creer','$conf->service->enabled',2,'2017-08-30 15:14:30'),(163989,'auguria',1,'','left','products',163987,NULL,NULL,1,'/product/list.php?leftmenu=service&amp;type=1','','List',NULL,'products',1,'','$user->rights->service->lire','$conf->service->enabled',2,'2017-08-30 15:14:30'),(163990,'auguria',1,'','left','products',163987,NULL,NULL,5,'/product/stats/card.php?id=all&amp;leftmenu=stats&amp;type=1','','Statistics',NULL,'main',1,'','$user->rights->service->lire','$conf->propal->enabled',2,'2017-08-30 15:14:30'),(164187,'auguria',1,'','left','products',161090,NULL,NULL,3,'/product/stock/index.php?leftmenu=stock','','Stock',NULL,'stocks',0,'stock','$user->rights->stock->lire','$conf->stock->enabled',2,'2017-08-30 15:14:30'),(164188,'auguria',1,'','left','products',164187,NULL,NULL,0,'/product/stock/card.php?action=create','','MenuNewWarehouse',NULL,'stocks',1,'','$user->rights->stock->creer','$conf->stock->enabled',2,'2017-08-30 15:14:30'),(164189,'auguria',1,'','left','products',164187,NULL,NULL,1,'/product/stock/list.php','','List',NULL,'stocks',1,'','$user->rights->stock->lire','$conf->stock->enabled',2,'2017-08-30 15:14:30'),(164191,'auguria',1,'','left','products',164187,NULL,NULL,3,'/product/stock/mouvement.php','','Movements',NULL,'stocks',1,'','$user->rights->stock->mouvement->lire','$conf->stock->enabled',2,'2017-08-30 15:14:30'),(164192,'auguria',1,'','left','products',164187,NULL,NULL,4,'/product/stock/replenish.php','','Replenishments',NULL,'stocks',1,'','$user->rights->stock->mouvement->creer && $user->rights->fournisseur->lire','$conf->stock->enabled && $conf->supplier_order->enabled',2,'2017-08-30 15:14:30'),(164193,'auguria',1,'','left','products',164187,NULL,NULL,5,'/product/stock/massstockmove.php','','MassStockTransferShort',NULL,'stocks',1,'','$user->rights->stock->mouvement->creer','$conf->stock->enabled',2,'2017-08-30 15:14:30'),(164287,'auguria',1,'','left','products',161090,NULL,NULL,4,'/categories/index.php?leftmenu=cat&amp;type=0','','Categories',NULL,'categories',0,'cat','$user->rights->categorie->lire','$conf->categorie->enabled',2,'2017-08-30 15:14:30'),(164288,'auguria',1,'','left','products',164287,NULL,NULL,0,'/categories/card.php?action=create&amp;type=0','','NewCategory',NULL,'categories',1,'','$user->rights->categorie->creer','$conf->categorie->enabled',2,'2017-08-30 15:14:30'),(164487,'auguria',1,'','left','project',161094,NULL,NULL,3,'/projet/activity/perweek.php?leftmenu=projects','','NewTimeSpent',NULL,'projects',0,'','$user->rights->projet->lire','$conf->projet->enabled && $conf->global->PROJECT_USE_TASKS',2,'2017-08-30 15:14:30'),(164687,'auguria',1,'','left','project',161094,NULL,NULL,0,'/projet/index.php?leftmenu=projects','','Projects',NULL,'projects',0,'projects','$user->rights->projet->lire','$conf->projet->enabled',2,'2017-08-30 15:14:30'),(164688,'auguria',1,'','left','project',164687,NULL,NULL,1,'/projet/card.php?leftmenu=projects&amp;action=create','','NewProject',NULL,'projects',1,'','$user->rights->projet->creer','$conf->projet->enabled',2,'2017-08-30 15:14:30'),(164689,'auguria',1,'','left','project',164687,NULL,NULL,2,'/projet/list.php?leftmenu=projects','','List',NULL,'projects',1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2017-08-30 15:14:30'),(164690,'auguria',1,'','left','project',164687,NULL,NULL,3,'/projet/stats/index.php?leftmenu=projects','','Statistics',NULL,'projects',1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2017-08-30 15:14:30'),(164787,'auguria',1,'','left','project',161094,NULL,NULL,0,'/projet/activity/index.php?leftmenu=projects','','Activities',NULL,'projects',0,'','$user->rights->projet->lire','$conf->projet->enabled && $conf->global->PROJECT_USE_TASKS',2,'2017-08-30 15:14:30'),(164788,'auguria',1,'','left','project',164787,NULL,NULL,1,'/projet/tasks.php?leftmenu=projects&amp;action=create','','NewTask',NULL,'projects',1,'','$user->rights->projet->creer','$conf->projet->enabled && $conf->global->PROJECT_USE_TASKS',2,'2017-08-30 15:14:30'),(164789,'auguria',1,'','left','project',164787,NULL,NULL,2,'/projet/tasks/list.php?leftmenu=projects','','List',NULL,'projects',1,'','$user->rights->projet->lire','$conf->projet->enabled && $conf->global->PROJECT_USE_TASKS',2,'2017-08-30 15:14:30'),(164791,'auguria',1,'','left','project',164787,NULL,NULL,4,'/projet/tasks/stats/index.php?leftmenu=projects','','Statistics',NULL,'projects',1,'','$user->rights->projet->lire','$conf->projet->enabled && $conf->global->PROJECT_USE_TASKS',2,'2017-08-30 15:14:30'),(164891,'auguria',1,'','left','project',161094,NULL,NULL,4,'/categories/index.php?leftmenu=cat&amp;type=6','','Categories',NULL,'categories',0,'cat','$user->rights->categorie->lire','$conf->categorie->enabled',2,'2017-08-30 15:14:30'),(164892,'auguria',1,'','left','project',164891,NULL,NULL,0,'/categories/card.php?action=create&amp;type=6','','NewCategory',NULL,'categories',1,'','$user->rights->categorie->creer','$conf->categorie->enabled',2,'2017-08-30 15:14:30'),(164987,'auguria',1,'','left','tools',161095,NULL,NULL,0,'/comm/mailing/index.php?leftmenu=mailing','','EMailings',NULL,'mails',0,'mailing','$user->rights->mailing->lire','$conf->mailing->enabled',0,'2017-08-30 15:14:30'),(164988,'auguria',1,'','left','tools',164987,NULL,NULL,0,'/comm/mailing/card.php?leftmenu=mailing&amp;action=create','','NewMailing',NULL,'mails',1,'','$user->rights->mailing->creer','$conf->mailing->enabled',0,'2017-08-30 15:14:30'),(164989,'auguria',1,'','left','tools',164987,NULL,NULL,1,'/comm/mailing/list.php?leftmenu=mailing','','List',NULL,'mails',1,'','$user->rights->mailing->lire','$conf->mailing->enabled',0,'2017-08-30 15:14:30'),(165187,'auguria',1,'','left','tools',161095,NULL,NULL,2,'/exports/index.php?leftmenu=export','','FormatedExport',NULL,'exports',0,'export','$user->rights->export->lire','$conf->export->enabled',2,'2017-08-30 15:14:30'),(165188,'auguria',1,'','left','tools',165187,NULL,NULL,0,'/exports/export.php?leftmenu=export','','NewExport',NULL,'exports',1,'','$user->rights->export->creer','$conf->export->enabled',2,'2017-08-30 15:14:30'),(165217,'auguria',1,'','left','tools',161095,NULL,NULL,2,'/imports/index.php?leftmenu=import','','FormatedImport',NULL,'exports',0,'import','$user->rights->import->run','$conf->import->enabled',2,'2017-08-30 15:14:30'),(165218,'auguria',1,'','left','tools',165217,NULL,NULL,0,'/imports/import.php?leftmenu=import','','NewImport',NULL,'exports',1,'','$user->rights->import->run','$conf->import->enabled',2,'2017-08-30 15:14:30'),(165287,'auguria',1,'','left','members',161100,NULL,NULL,0,'/adherents/index.php?leftmenu=members&amp;mainmenu=members','','Members',NULL,'members',0,'members','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165288,'auguria',1,'','left','members',165287,NULL,NULL,0,'/adherents/card.php?leftmenu=members&amp;action=create','','NewMember',NULL,'members',1,'','$user->rights->adherent->creer','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165289,'auguria',1,'','left','members',165287,NULL,NULL,1,'/adherents/list.php','','List',NULL,'members',1,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165290,'auguria',1,'','left','members',165289,NULL,NULL,2,'/adherents/list.php?leftmenu=members&amp;statut=-1','','MenuMembersToValidate',NULL,'members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165291,'auguria',1,'','left','members',165289,NULL,NULL,3,'/adherents/list.php?leftmenu=members&amp;statut=1','','MenuMembersValidated',NULL,'members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165292,'auguria',1,'','left','members',165289,NULL,NULL,4,'/adherents/list.php?leftmenu=members&amp;statut=1&amp;filter=outofdate','','MenuMembersNotUpToDate',NULL,'members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165293,'auguria',1,'','left','members',165289,NULL,NULL,5,'/adherents/list.php?leftmenu=members&amp;statut=1&amp;filter=uptodate','','MenuMembersUpToDate',NULL,'members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165294,'auguria',1,'','left','members',165289,NULL,NULL,6,'/adherents/list.php?leftmenu=members&amp;statut=0','','MenuMembersResiliated',NULL,'members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165295,'auguria',1,'','left','members',165287,NULL,NULL,7,'/adherents/stats/geo.php?leftmenu=members&amp;mode=memberbycountry','','MenuMembersStats',NULL,'members',1,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165387,'auguria',1,'','left','members',161100,NULL,NULL,1,'/adherents/index.php?leftmenu=members&amp;mainmenu=members','','Subscriptions',NULL,'compta',0,'','$user->rights->adherent->cotisation->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165388,'auguria',1,'','left','members',165387,NULL,NULL,0,'/adherents/list.php?statut=-1&amp;leftmenu=accountancy&amp;mainmenu=members','','NewSubscription',NULL,'compta',1,'','$user->rights->adherent->cotisation->creer','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165389,'auguria',1,'','left','members',165387,NULL,NULL,1,'/adherents/subscription/list.php?leftmenu=members','','List',NULL,'compta',1,'','$user->rights->adherent->cotisation->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165390,'auguria',1,'','left','members',165387,NULL,NULL,7,'/adherents/stats/index.php?leftmenu=members','','MenuMembersStats',NULL,'members',1,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165589,'auguria',1,'','left','members',165287,NULL,NULL,9,'/adherents/htpasswd.php?leftmenu=export','','Filehtpasswd',NULL,'members',1,'','$user->rights->adherent->export','! empty($conf->global->MEMBER_LINK_TO_HTPASSWDFILE) && $conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165590,'auguria',1,'','left','members',165287,NULL,NULL,10,'/adherents/cartes/carte.php?leftmenu=export','','MembersCards',NULL,'members',1,'','$user->rights->adherent->export','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165687,'auguria',1,'','left','hrm',161102,NULL,NULL,1,'/user/index.php?leftmenu=hrm&mode=employee','','Employees',NULL,'hrm',0,'hrm','$user->rights->hrm->employee->read','$conf->hrm->enabled',0,'2017-08-30 15:14:30'),(165688,'auguria',1,'','left','hrm',165687,NULL,NULL,1,'/user/card.php?action=create&employee=1','','NewEmployee',NULL,'hrm',1,'','$user->rights->hrm->employee->write','$conf->hrm->enabled',0,'2017-08-30 15:14:30'),(165689,'auguria',1,'','left','hrm',165687,NULL,NULL,2,'/user/index.php?$leftmenu=hrm&mode=employee&contextpage=employeelist','','List',NULL,'hrm',1,'','$user->rights->hrm->employee->read','$conf->hrm->enabled',0,'2017-08-30 15:14:30'),(165787,'auguria',1,'','left','members',161100,NULL,NULL,5,'/adherents/type.php?leftmenu=setup&amp;mainmenu=members','','MembersTypes',NULL,'members',0,'setup','$user->rights->adherent->configurer','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165788,'auguria',1,'','left','members',165787,NULL,NULL,0,'/adherents/type.php?leftmenu=setup&amp;mainmenu=members&amp;action=create','','New',NULL,'members',1,'','$user->rights->adherent->configurer','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165789,'auguria',1,'','left','members',165787,NULL,NULL,1,'/adherents/type.php?leftmenu=setup&amp;mainmenu=members','','List',NULL,'members',1,'','$user->rights->adherent->configurer','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(166087,'auguria',1,'','left','hrm',161102,NULL,NULL,1,'/holiday/list.php?&leftmenu=hrm','','CPTitreMenu',NULL,'holiday',0,'hrm','$user->rights->holiday->read','$conf->holiday->enabled',0,'2017-08-30 15:14:30'),(166088,'auguria',1,'','left','hrm',166087,NULL,NULL,1,'/holiday/card.php?&action=request','','MenuAddCP',NULL,'holiday',1,'','$user->rights->holiday->write','$conf->holiday->enabled',0,'2017-08-30 15:14:30'),(166089,'auguria',1,'','left','hrm',166087,NULL,NULL,1,'/holiday/list.php?&leftmenu=hrm','','List',NULL,'holiday',1,'','$user->rights->holiday->read','$conf->holiday->enabled',0,'2017-08-30 15:14:30'),(166090,'auguria',1,'','left','hrm',166089,NULL,NULL,1,'/holiday/list.php?select_statut=2&leftmenu=hrm','','ListToApprove',NULL,'trips',2,'','$user->rights->holiday->read','$conf->holiday->enabled',0,'2017-08-30 15:14:30'),(166091,'auguria',1,'','left','hrm',166087,NULL,NULL,2,'/holiday/define_holiday.php?&action=request','','MenuConfCP',NULL,'holiday',1,'','$user->rights->holiday->define_holiday','$conf->holiday->enabled',0,'2017-08-30 15:14:30'),(166092,'auguria',1,'','left','hrm',166087,NULL,NULL,3,'/holiday/view_log.php?&action=request','','MenuLogCP',NULL,'holiday',1,'','$user->rights->holiday->define_holiday','$conf->holiday->enabled',0,'2017-08-30 15:14:30'),(166187,'auguria',1,'','left','commercial',161092,NULL,NULL,6,'/fourn/commande/index.php?leftmenu=orders_suppliers','','SuppliersOrders',NULL,'orders',0,'orders_suppliers','$user->rights->fournisseur->commande->lire','$conf->supplier_order->enabled',2,'2017-08-30 15:14:30'),(166188,'auguria',1,'','left','commercial',166187,NULL,NULL,0,'/fourn/commande/card.php?action=create&amp;leftmenu=orders_suppliers','','NewOrder',NULL,'orders',1,'','$user->rights->fournisseur->commande->creer','$conf->supplier_order->enabled',2,'2017-08-30 15:14:30'),(166189,'auguria',1,'','left','commercial',166187,NULL,NULL,1,'/fourn/commande/list.php?leftmenu=orders_suppliers&amp;search_status=0','','List',NULL,'orders',1,'','$user->rights->fournisseur->commande->lire','$conf->supplier_order->enabled',2,'2017-08-30 15:14:30'),(166195,'auguria',1,'','left','commercial',166187,NULL,NULL,7,'/commande/stats/index.php?leftmenu=orders_suppliers&amp;mode=supplier','','Statistics',NULL,'orders',1,'','$user->rights->fournisseur->commande->lire','$conf->supplier_order->enabled',2,'2017-08-30 15:14:30'),(166287,'auguria',1,'','left','members',161100,NULL,NULL,3,'/categories/index.php?leftmenu=cat&amp;type=3','','MembersCategoriesShort',NULL,'categories',0,'cat','$user->rights->categorie->lire','$conf->adherent->enabled && $conf->categorie->enabled',2,'2017-08-30 15:14:30'),(166288,'auguria',1,'','left','members',166287,NULL,NULL,0,'/categories/card.php?action=create&amp;type=3','','NewCategory',NULL,'categories',1,'','$user->rights->categorie->creer','$conf->adherent->enabled && $conf->categorie->enabled',2,'2017-08-30 15:14:30'),(166387,'auguria',1,'','left','hrm',161102,NULL,NULL,5,'/expensereport/index.php?leftmenu=expensereport','','TripsAndExpenses',NULL,'trips',0,'expensereport','$user->rights->expensereport->lire','$conf->expensereport->enabled',0,'2017-08-30 15:14:30'),(166388,'auguria',1,'','left','hrm',166387,NULL,NULL,1,'/expensereport/card.php?action=create&amp;leftmenu=expensereport','','New',NULL,'trips',1,'','$user->rights->expensereport->creer','$conf->expensereport->enabled',0,'2017-08-30 15:14:30'),(166389,'auguria',1,'','left','hrm',166387,NULL,NULL,2,'/expensereport/list.php?leftmenu=expensereport','','List',NULL,'trips',1,'','$user->rights->expensereport->lire','$conf->expensereport->enabled',0,'2017-08-30 15:14:30'),(166390,'auguria',1,'','left','hrm',166389,NULL,NULL,2,'/expensereport/list.php?search_status=2&amp;leftmenu=expensereport','','ListToApprove',NULL,'trips',2,'','$user->rights->expensereport->approve','$conf->expensereport->enabled',0,'2017-08-30 15:14:30'),(166391,'auguria',1,'','left','hrm',166387,NULL,NULL,2,'/expensereport/stats/index.php?leftmenu=expensereport','','Statistics',NULL,'trips',1,'','$user->rights->expensereport->lire','$conf->expensereport->enabled',0,'2017-08-30 15:14:30'),(167087,'all',1,'agenda','top','agenda',0,NULL,NULL,86,'/comm/action/index.php','','TMenuAgenda','<span class=\"fas fa-calendar-alt infobox-action paddingright pictofixedwidth\" style=\"\"></span>','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2021-07-11 17:49:45'),(167088,'all',1,'agenda','left','agenda',167087,NULL,NULL,100,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda','','Actions','<span class=\"fas fa-calendar-alt infobox-action paddingright pictofixedwidth\" style=\"\"></span>','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2021-07-11 17:49:45'),(167089,'all',1,'agenda','left','agenda',167088,NULL,NULL,101,'/comm/action/card.php?mainmenu=agenda&amp;leftmenu=agenda&amp;action=create','','NewAction','','commercial',NULL,NULL,'($user->rights->agenda->myactions->create||$user->rights->agenda->allactions->create)','$conf->agenda->enabled',2,'2021-07-11 17:49:45'),(167090,'all',1,'agenda','left','agenda',167088,NULL,NULL,140,'/comm/action/index.php?action=default&amp;mainmenu=agenda&amp;leftmenu=agenda','','Calendar','','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2021-07-11 17:49:45'),(167091,'all',1,'agenda','left','agenda',167090,NULL,NULL,141,'/comm/action/index.php?action=default&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filter=mine','','MenuToDoMyActions','','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2021-07-11 17:49:45'),(167092,'all',1,'agenda','left','agenda',167090,NULL,NULL,142,'/comm/action/index.php?action=default&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filter=mine','','MenuDoneMyActions','','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2021-07-11 17:49:45'),(167093,'all',1,'agenda','left','agenda',167090,NULL,NULL,143,'/comm/action/index.php?action=default&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filtert=-1','','MenuToDoActions','','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2021-07-11 17:49:45'),(167094,'all',1,'agenda','left','agenda',167090,NULL,NULL,144,'/comm/action/index.php?action=default&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filtert=-1','','MenuDoneActions','','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2021-07-11 17:49:45'),(167095,'all',1,'agenda','left','agenda',167088,NULL,NULL,110,'/comm/action/list.php?action=show_list&amp;mainmenu=agenda&amp;leftmenu=agenda','','List','','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2021-07-11 17:49:45'),(167096,'all',1,'agenda','left','agenda',167095,NULL,NULL,111,'/comm/action/list.php?action=show_list&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filter=mine','','MenuToDoMyActions','','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2021-07-11 17:49:45'),(167097,'all',1,'agenda','left','agenda',167095,NULL,NULL,112,'/comm/action/list.php?action=show_list&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filter=mine','','MenuDoneMyActions','','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2021-07-11 17:49:45'),(167098,'all',1,'agenda','left','agenda',167095,NULL,NULL,113,'/comm/action/list.php?action=show_list&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filtert=-1','','MenuToDoActions','','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2021-07-11 17:49:45'),(167099,'all',1,'agenda','left','agenda',167095,NULL,NULL,114,'/comm/action/list.php?action=show_list&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filtert=-1','','MenuDoneActions','','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2021-07-11 17:49:45'),(167100,'all',1,'agenda','left','agenda',167088,NULL,NULL,160,'/comm/action/rapport/index.php?mainmenu=agenda&amp;leftmenu=agenda','','Reportings','','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$conf->agenda->enabled',2,'2021-07-11 17:49:45'),(167101,'all',1,'agenda','left','agenda',167088,NULL,NULL,170,'/categories/index.php?mainmenu=agenda&amp;leftmenu=agenda&type=10','','Categories','','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$conf->categorie->enabled',2,'2021-07-11 17:49:45'),(167102,'all',1,'barcode','left','tools',-1,NULL,'tools',200,'/barcode/printsheet.php?mainmenu=tools&leftmenu=barcodeprint','','BarCodePrintsheet','<span class=\"fas fa-barcode paddingright pictofixedwidth\" style=\"\"></span>','products',NULL,'barcodeprint','($conf->global->MAIN_USE_ADVANCED_PERMS && $user->rights->barcode->lire_advance) || (! $conf->global->MAIN_USE_ADVANCED_PERMS)','$conf->barcode->enabled',2,'2021-07-11 17:49:46'),(167103,'all',1,'barcode','left','home',-1,'admintools','home',300,'/barcode/codeinit.php?mainmenu=home&leftmenu=admintools','','MassBarcodeInit','','products',NULL,NULL,'($conf->global->MAIN_USE_ADVANCED_PERMS && $user->rights->barcode->creer_advance) || (! $conf->global->MAIN_USE_ADVANCED_PERMS)','$conf->barcode->enabled && preg_match(\'/^(admintools|all)/\',$leftmenu)',0,'2021-07-11 17:49:46'),(167104,'all',1,'cron','left','home',-1,'admintools','home',200,'/cron/list.php?leftmenu=admintools','','CronList','','cron',NULL,NULL,'$user->rights->cron->read','$conf->cron->enabled && preg_match(\'/^(admintools|all)/\', $leftmenu)',2,'2021-07-11 17:49:46'),(167105,'all',1,'blockedlog','left','tools',-1,NULL,'tools',200,'/blockedlog/admin/blockedlog_list.php?mainmenu=tools&leftmenu=blockedlogbrowser','','BrowseBlockedLog','<span class=\"fas fa-cogs  em080 paddingright pictofixedwidth\" style=\" color: #999;\"></span>','blockedlog',NULL,'blockedlogbrowser','$user->rights->blockedlog->read','$conf->blockedlog->enabled',2,'2021-07-11 17:49:46'),(167106,'all',1,'ecm','top','ecm',0,NULL,NULL,82,'/ecm/index.php','','MenuECM','<span class=\"fas fa-folder-open paddingright pictofixedwidth\" style=\"\"></span>','ecm',NULL,NULL,'$user->rights->ecm->read || $user->rights->ecm->upload || $user->rights->ecm->setup','$conf->ecm->enabled',2,'2021-07-11 17:49:46'),(167107,'all',1,'ecm','left','ecm',-1,NULL,'ecm',101,'/ecm/index.php?mainmenu=ecm&leftmenu=ecm','','ECMArea','<span class=\"fas fa-folder-open paddingright pictofixedwidth\" style=\"\"></span>','ecm',NULL,'ecm','$user->rights->ecm->read || $user->rights->ecm->upload','$user->rights->ecm->read || $user->rights->ecm->upload',2,'2021-07-11 17:49:46'),(167108,'all',1,'ecm','left','ecm',-1,'ecm','ecm',102,'/ecm/index.php?action=file_manager&mainmenu=ecm&leftmenu=ecm','','ECMSectionsManual','','ecm',NULL,'ecm_manual','$user->rights->ecm->read || $user->rights->ecm->upload','$user->rights->ecm->read || $user->rights->ecm->upload',2,'2021-07-11 17:49:46'),(167109,'all',1,'ecm','left','ecm',-1,'ecm','ecm',103,'/ecm/index_auto.php?action=file_manager&mainmenu=ecm&leftmenu=ecm','','ECMSectionsAuto','','ecm',NULL,NULL,'$user->rights->ecm->read || $user->rights->ecm->upload','($user->rights->ecm->read || $user->rights->ecm->upload) && ! empty($conf->global->ECM_AUTO_TREE_ENABLED)',2,'2021-07-11 17:49:46'),(167110,'all',1,'margins','left','billing',-1,NULL,'billing',100,'/margin/index.php','','Margins','<span class=\"fas fa-calculator paddingright pictofixedwidth\" style=\"\"></span>','margins',NULL,'margins','$user->rights->margins->liretous','$conf->margin->enabled',2,'2021-07-11 17:49:47'),(167111,'all',1,'opensurvey','left','tools',-1,NULL,'tools',200,'/opensurvey/index.php?mainmenu=tools&leftmenu=opensurvey','','Survey','<span class=\"fas fa-check-double infobox-adherent paddingright pictofixedwidth\" style=\"\"></span>','opensurvey',NULL,'opensurvey','$user->rights->opensurvey->read','$conf->opensurvey->enabled',0,'2021-07-11 17:49:47'),(167112,'all',1,'opensurvey','left','tools',-1,'opensurvey','tools',210,'/opensurvey/wizard/index.php','','NewSurvey','','opensurvey',NULL,'opensurvey_new','$user->rights->opensurvey->write','$conf->opensurvey->enabled',0,'2021-07-11 17:49:47'),(167113,'all',1,'opensurvey','left','tools',-1,'opensurvey','tools',220,'/opensurvey/list.php','','List','','opensurvey',NULL,'opensurvey_list','$user->rights->opensurvey->read','$conf->opensurvey->enabled',0,'2021-07-11 17:49:47'),(167114,'all',1,'printing','left','home',-1,'admintools','home',300,'/printing/index.php?mainmenu=home&leftmenu=admintools','','MenuDirectPrinting','','printing',NULL,NULL,'$user->rights->printing->read','$conf->printing->enabled && preg_match(\'/^(admintools|all)/\', $leftmenu)',0,'2021-07-11 17:49:47'),(167115,'all',1,'recruitment','left','hrm',-1,NULL,'hrm',1001,'/recruitment/recruitmentindex.php','','Recruitment','<span class=\"fas fa-id-card-alt infobox-adherent paddingright pictofixedwidth\" style=\"\"></span>','recruitment',NULL,'recruitmentjobposition','$user->rights->recruitment->recruitmentjobposition->read','$conf->recruitment->enabled',2,'2021-07-11 17:49:47'),(167116,'all',1,'recruitment','left','hrm',-1,'recruitmentjobposition','hrm',1002,'/recruitment/recruitmentjobposition_card.php?action=create','','NewPositionToBeFilled','','recruitment',NULL,'recruitment_recruitmentjobposition_new','$user->rights->recruitment->recruitmentjobposition->write','$conf->recruitment->enabled',2,'2021-07-11 17:49:47'),(167117,'all',1,'recruitment','left','hrm',-1,'recruitmentjobposition','hrm',1003,'/recruitment/recruitmentjobposition_list.php','','ListOfPositionsToBeFilled','','recruitment',NULL,'recruitment_recruitmentjobposition_list','$user->rights->recruitment->recruitmentjobposition->read','$conf->recruitment->enabled',2,'2021-07-11 17:49:47'),(167118,'all',1,'recruitment','left','hrm',-1,'recruitmentjobposition','hrm',1004,'/recruitment/recruitmentcandidature_card.php?action=create','','NewCandidature','','recruitment',NULL,'recruitment_recruitmentcandidature_new','$user->rights->recruitment->recruitmentjobposition->write','$conf->recruitment->enabled',2,'2021-07-11 17:49:47'),(167119,'all',1,'recruitment','left','hrm',-1,'recruitmentjobposition','hrm',1005,'/recruitment/recruitmentcandidature_list.php','','ListOfCandidatures','','recruitment',NULL,'recruitment_recruitmentcandidature_list','$user->rights->recruitment->recruitmentjobposition->read','$conf->recruitment->enabled',2,'2021-07-11 17:49:47'),(167120,'all',1,'resource','left','tools',-1,NULL,'tools',100,'/resource/list.php','','MenuResourceIndex','<span class=\"fas fa-laptop-house  em092 infobox-action paddingright pictofixedwidth em92\" style=\"\"></span>','resource',NULL,'resource','$user->rights->resource->read','1',0,'2021-07-11 17:49:47'),(167121,'all',1,'resource','left','tools',-1,'resource','tools',101,'/resource/card.php?action=create','','MenuResourceAdd','','resource',NULL,'resource_add','$user->rights->resource->write','1',0,'2021-07-11 17:49:47'),(167122,'all',1,'resource','left','tools',-1,'resource','tools',102,'/resource/list.php','','List','','resource',NULL,'resource_list','$user->rights->resource->read','1',0,'2021-07-11 17:49:47'),(167123,'all',1,'stripe','left','bank',-1,NULL,'bank',100,'','','StripeAccount','<span class=\"fab fa-stripe-s paddingright pictofixedwidth\" style=\"\"></span>','stripe',NULL,'stripe','$user->rights->banque->lire','$conf->stripe->enabled && $conf->banque->enabled && $conf->global->MAIN_FEATURES_LEVEL >= 1',0,'2021-07-11 17:49:47'),(167124,'all',1,'stripe','left','bank',-1,'stripe','bank',102,'/stripe/charge.php','','StripeChargeList','','stripe',NULL,NULL,'$user->rights->banque->lire','$conf->stripe->enabled && $conf->banque->enabled && $conf->global->MAIN_FEATURES_LEVEL >= 1',0,'2021-07-11 17:49:47'),(167125,'all',1,'stripe','left','bank',-1,'stripe','bank',102,'/stripe/transaction.php','','StripeTransactionList','','stripe',NULL,NULL,'$user->rights->banque->lire','$conf->stripe->enabled && $conf->banque->enabled && $conf->global->MAIN_FEATURES_LEVEL >= 1',0,'2021-07-11 17:49:47'),(167126,'all',1,'stripe','left','bank',-1,'stripe','bank',103,'/stripe/payout.php','','StripePayoutList','','stripe',NULL,NULL,'$user->rights->banque->lire','$conf->stripe->enabled && $conf->banque->enabled && $conf->global->MAIN_FEATURES_LEVEL >= 1',0,'2021-07-11 17:49:47'),(167127,'all',1,'ticket','left','ticket',-1,NULL,'ticket',101,'/ticket/index.php','','Ticket','<span class=\"fas fa-ticket-alt infobox-contrat paddingright pictofixedwidth em092\" style=\"\"></span>','ticket',NULL,'ticket','$user->rights->ticket->read','$conf->ticket->enabled',2,'2021-07-11 17:49:47'),(167128,'all',1,'ticket','left','ticket',-1,'ticket','ticket',102,'/ticket/card.php?action=create','','NewTicket','','ticket',NULL,NULL,'$user->rights->ticket->write','$conf->ticket->enabled',2,'2021-07-11 17:49:47'),(167129,'all',1,'ticket','left','ticket',-1,'ticket','ticket',103,'/ticket/list.php?search_fk_status=non_closed','','List','','ticket',NULL,'ticketlist','$user->rights->ticket->read','$conf->ticket->enabled',2,'2021-07-11 17:49:47'),(167130,'all',1,'ticket','left','ticket',-1,'ticket','ticket',105,'/ticket/list.php?mode=mine&search_fk_status=non_closed','','MenuTicketMyAssign','','ticket',NULL,'ticketmy','$user->rights->ticket->read','$conf->ticket->enabled',0,'2021-07-11 17:49:47'),(167131,'all',1,'ticket','left','ticket',-1,'ticket','ticket',107,'/ticket/stats/index.php','','Statistics','','ticket',NULL,NULL,'$user->rights->ticket->read','$conf->ticket->enabled',0,'2021-07-11 17:49:47'),(167132,'all',1,'takepos','top','takepos',0,NULL,NULL,1001,'/takepos/index.php','takepos','PointOfSaleShort','<span class=\"fas fa-cash-register infobox-bank_account paddingright pictofixedwidth\" style=\"\"></span>','cashdesk',NULL,NULL,'$user->rights->takepos->run','$conf->takepos->enabled',2,'2021-07-11 17:49:48'),(167133,'all',1,'website','top','website',0,NULL,NULL,100,'/website/index.php','','WebSites','<span class=\"fas fa-globe-americas paddingright pictofixedwidth em092\" style=\" color: #304;\"></span>','website',NULL,NULL,'$user->rights->website->read','$conf->website->enabled',2,'2021-07-11 17:49:48');
 /*!40000 ALTER TABLE `llx_menu` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -8065,29 +8485,6 @@ INSERT INTO `llx_opensurvey_user_studs` VALUES (1,'gfdgdf','om4e7azfiurnjtqe','0
 /*!40000 ALTER TABLE `llx_opensurvey_user_studs` ENABLE KEYS */;
 UNLOCK TABLES;
 
---
--- Table structure for table `llx_origines`
---
-
-DROP TABLE IF EXISTS `llx_origines`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_origines` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `source` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
-  PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_origines`
---
-
-LOCK TABLES `llx_origines` WRITE;
-/*!40000 ALTER TABLE `llx_origines` DISABLE KEYS */;
-/*!40000 ALTER TABLE `llx_origines` ENABLE KEYS */;
-UNLOCK TABLES;
-
 --
 -- Table structure for table `llx_overwrite_trans`
 --
@@ -8178,7 +8575,7 @@ CREATE TABLE `llx_paiement` (
 
 LOCK TABLES `llx_paiement` WRITE;
 /*!40000 ALTER TABLE `llx_paiement` DISABLE KEYS */;
-INSERT INTO `llx_paiement` VALUES (3,'',NULL,1,'2013-07-18 20:50:47','2020-12-10 12:24:22','2020-07-08 12:00:00',10.00000000,4,'','',6,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(5,'',NULL,1,'2013-08-01 03:34:11','2020-12-10 12:24:22','2020-08-01 03:34:11',5.63000000,6,'','Payment Invoice FA1108-0003',8,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(6,'',NULL,1,'2013-08-06 20:33:54','2020-12-10 12:24:22','2020-08-06 20:33:53',5.98000000,4,'','Payment Invoice FA1108-0004',13,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(8,'',NULL,1,'2013-08-08 02:53:40','2020-12-10 12:24:22','2020-08-08 12:00:00',26.10000000,4,'','',14,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(9,'',NULL,1,'2013-08-08 02:55:58','2020-12-10 12:24:23','2020-08-08 12:00:00',26.96000000,1,'','',15,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(17,'',NULL,1,'2014-12-09 15:28:44','2020-12-10 12:24:23','2020-12-09 12:00:00',2.00000000,4,'','',16,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(18,'',NULL,1,'2014-12-09 15:28:53','2020-12-10 12:24:23','2020-12-09 12:00:00',-2.00000000,4,'','',17,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(19,'',NULL,1,'2014-12-09 17:35:55','2020-12-10 12:24:23','2020-12-09 12:00:00',-2.00000000,4,'','',18,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(20,'',NULL,1,'2014-12-09 17:37:02','2020-12-10 12:24:23','2020-12-09 12:00:00',2.00000000,4,'','',19,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(21,'',NULL,1,'2014-12-09 18:35:07','2020-12-10 12:24:23','2020-12-09 12:00:00',-2.00000000,4,'','',20,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(23,'',NULL,1,'2014-12-12 18:54:33','2021-04-15 10:22:31','2020-12-12 12:00:00',1.00000000,1,'','',21,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(24,'',NULL,1,'2015-03-06 16:48:16','2021-04-15 10:22:31','2021-03-06 00:00:00',20.00000000,4,'','Adhésion/cotisation 2016',22,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(25,'',NULL,1,'2015-03-20 14:30:11','2021-04-15 10:22:31','2021-03-20 00:00:00',10.00000000,2,'','Adhésion/cotisation 2011',23,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(26,'',NULL,1,'2016-03-02 19:57:58','2020-12-10 12:24:23','2020-07-09 12:00:00',605.00000000,2,'','',24,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(29,'',NULL,1,'2016-03-02 20:01:39','2021-04-15 10:22:31','2021-03-19 12:00:00',500.00000000,4,'','',26,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(30,'',NULL,1,'2016-03-02 20:02:06','2021-04-15 10:22:31','2021-03-21 12:00:00',400.00000000,2,'','',27,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(32,'',NULL,1,'2016-03-03 19:22:32','2020-12-10 12:24:23','2020-10-03 12:00:00',-400.00000000,4,'','',28,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(33,'',NULL,1,'2016-03-03 19:23:16','2021-04-15 10:22:31','2021-03-10 12:00:00',-300.00000000,4,'','',29,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(34,'PAY1603-0001',NULL,1,'2017-02-06 08:10:24','2021-04-15 10:22:31','2021-03-22 12:00:00',150.00000000,7,'','',33,12,NULL,0,0,0.00000000,150.00000000,NULL,NULL),(35,'PAY1603-0002',NULL,1,'2017-02-06 08:10:50','2021-04-15 10:22:31','2021-03-25 12:00:00',140.00000000,3,'','',34,12,NULL,0,0,0.00000000,140.00000000,NULL,NULL),(36,'PAY1702-0003',NULL,1,'2017-02-21 16:07:43','2021-04-15 10:22:31','2021-02-21 12:00:00',50.00000000,3,'T170201','',37,12,NULL,0,0,0.00000000,50.00000000,NULL,NULL),(38,'PAY1803-0004',NULL,1,'2018-03-16 13:59:31','2021-04-15 10:22:31','2021-03-16 12:00:00',10.00000000,7,'','',39,12,NULL,0,0,0.00000000,10.00000000,NULL,NULL),(39,'PAY1801-0005',NULL,1,'2019-10-04 10:28:14','2021-04-15 10:22:31','2021-01-19 12:00:00',5.63000000,4,'','',41,12,NULL,0,0,0.00000000,5.63000000,NULL,NULL),(40,'PAY2001-0006',NULL,1,'2020-01-16 02:36:48','2021-04-15 10:22:31','2021-01-16 12:00:00',20.50000000,2,'','',50,12,NULL,0,0,0.00000000,20.50000000,NULL,NULL),(41,'PAY2001-0007',NULL,1,'2020-01-21 10:23:17','2021-04-15 10:22:31','2021-01-21 00:00:00',50.00000000,7,'','Subscription 2017',53,12,NULL,0,0,0.00000000,50.00000000,NULL,NULL),(42,'PAY2001-0008',NULL,1,'2020-01-21 10:23:28','2021-04-15 10:22:31','2021-01-21 00:00:00',50.00000000,7,'','Subscription 2018',54,12,NULL,0,0,0.00000000,50.00000000,NULL,NULL),(43,'PAY2001-0009',NULL,1,'2020-01-21 10:23:49','2021-04-15 10:22:31','2021-01-21 00:00:00',50.00000000,6,'','Subscription 2019',55,12,NULL,0,0,0.00000000,50.00000000,NULL,NULL);
+INSERT INTO `llx_paiement` VALUES (3,'',NULL,1,'2013-07-18 20:50:47','2021-07-11 17:49:28','2021-07-08 12:00:00',10.00000000,4,'','',6,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(5,'',NULL,1,'2013-08-01 03:34:11','2020-12-10 12:24:22','2020-08-01 03:34:11',5.63000000,6,'','Payment Invoice FA1108-0003',8,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(6,'',NULL,1,'2013-08-06 20:33:54','2020-12-10 12:24:22','2020-08-06 20:33:53',5.98000000,4,'','Payment Invoice FA1108-0004',13,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(8,'',NULL,1,'2013-08-08 02:53:40','2020-12-10 12:24:22','2020-08-08 12:00:00',26.10000000,4,'','',14,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(9,'',NULL,1,'2013-08-08 02:55:58','2020-12-10 12:24:23','2020-08-08 12:00:00',26.96000000,1,'','',15,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(17,'',NULL,1,'2014-12-09 15:28:44','2020-12-10 12:24:23','2020-12-09 12:00:00',2.00000000,4,'','',16,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(18,'',NULL,1,'2014-12-09 15:28:53','2020-12-10 12:24:23','2020-12-09 12:00:00',-2.00000000,4,'','',17,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(19,'',NULL,1,'2014-12-09 17:35:55','2020-12-10 12:24:23','2020-12-09 12:00:00',-2.00000000,4,'','',18,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(20,'',NULL,1,'2014-12-09 17:37:02','2020-12-10 12:24:23','2020-12-09 12:00:00',2.00000000,4,'','',19,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(21,'',NULL,1,'2014-12-09 18:35:07','2020-12-10 12:24:23','2020-12-09 12:00:00',-2.00000000,4,'','',20,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(23,'',NULL,1,'2014-12-12 18:54:33','2021-04-15 10:22:31','2020-12-12 12:00:00',1.00000000,1,'','',21,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(24,'',NULL,1,'2015-03-06 16:48:16','2021-04-15 10:22:31','2021-03-06 00:00:00',20.00000000,4,'','Adhésion/cotisation 2016',22,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(25,'',NULL,1,'2015-03-20 14:30:11','2021-04-15 10:22:31','2021-03-20 00:00:00',10.00000000,2,'','Adhésion/cotisation 2011',23,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(26,'',NULL,1,'2016-03-02 19:57:58','2021-07-11 17:49:28','2021-07-09 12:00:00',605.00000000,2,'','',24,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(29,'',NULL,1,'2016-03-02 20:01:39','2021-04-15 10:22:31','2021-03-19 12:00:00',500.00000000,4,'','',26,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(30,'',NULL,1,'2016-03-02 20:02:06','2021-04-15 10:22:31','2021-03-21 12:00:00',400.00000000,2,'','',27,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(32,'',NULL,1,'2016-03-03 19:22:32','2020-12-10 12:24:23','2020-10-03 12:00:00',-400.00000000,4,'','',28,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(33,'',NULL,1,'2016-03-03 19:23:16','2021-04-15 10:22:31','2021-03-10 12:00:00',-300.00000000,4,'','',29,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(34,'PAY1603-0001',NULL,1,'2017-02-06 08:10:24','2021-04-15 10:22:31','2021-03-22 12:00:00',150.00000000,7,'','',33,12,NULL,0,0,0.00000000,150.00000000,NULL,NULL),(35,'PAY1603-0002',NULL,1,'2017-02-06 08:10:50','2021-04-15 10:22:31','2021-03-25 12:00:00',140.00000000,3,'','',34,12,NULL,0,0,0.00000000,140.00000000,NULL,NULL),(36,'PAY1702-0003',NULL,1,'2017-02-21 16:07:43','2021-04-15 10:22:31','2021-02-21 12:00:00',50.00000000,3,'T170201','',37,12,NULL,0,0,0.00000000,50.00000000,NULL,NULL),(38,'PAY1803-0004',NULL,1,'2018-03-16 13:59:31','2021-04-15 10:22:31','2021-03-16 12:00:00',10.00000000,7,'','',39,12,NULL,0,0,0.00000000,10.00000000,NULL,NULL),(39,'PAY1801-0005',NULL,1,'2019-10-04 10:28:14','2021-04-15 10:22:31','2021-01-19 12:00:00',5.63000000,4,'','',41,12,NULL,0,0,0.00000000,5.63000000,NULL,NULL),(40,'PAY2001-0006',NULL,1,'2020-01-16 02:36:48','2021-04-15 10:22:31','2021-01-16 12:00:00',20.50000000,2,'','',50,12,NULL,0,0,0.00000000,20.50000000,NULL,NULL),(41,'PAY2001-0007',NULL,1,'2020-01-21 10:23:17','2021-04-15 10:22:31','2021-01-21 00:00:00',50.00000000,7,'','Subscription 2017',53,12,NULL,0,0,0.00000000,50.00000000,NULL,NULL),(42,'PAY2001-0008',NULL,1,'2020-01-21 10:23:28','2021-04-15 10:22:31','2021-01-21 00:00:00',50.00000000,7,'','Subscription 2018',54,12,NULL,0,0,0.00000000,50.00000000,NULL,NULL),(43,'PAY2001-0009',NULL,1,'2020-01-21 10:23:49','2021-04-15 10:22:31','2021-01-21 00:00:00',50.00000000,6,'','Subscription 2019',55,12,NULL,0,0,0.00000000,50.00000000,NULL,NULL);
 /*!40000 ALTER TABLE `llx_paiement` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -8343,6 +8740,7 @@ CREATE TABLE `llx_partnership` (
   `count_last_url_check_error` int(11) DEFAULT 0,
   `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
   `model_pdf` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `last_check_backlink` datetime DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_partnership_rowid` (`rowid`),
   KEY `idx_partnership_ref` (`ref`),
@@ -8406,6 +8804,8 @@ CREATE TABLE `llx_payment_donation` (
   `fk_typepayment` int(11) NOT NULL,
   `num_payment` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
   `note` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `ext_payment_id` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `ext_payment_site` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
   `fk_bank` int(11) NOT NULL,
   `fk_user_creat` int(11) DEFAULT NULL,
   `fk_user_modif` int(11) DEFAULT NULL,
@@ -8419,7 +8819,7 @@ CREATE TABLE `llx_payment_donation` (
 
 LOCK TABLES `llx_payment_donation` WRITE;
 /*!40000 ALTER TABLE `llx_payment_donation` DISABLE KEYS */;
-INSERT INTO `llx_payment_donation` VALUES (1,3,'2017-09-06 20:08:36','2017-09-06 16:08:36','2017-09-06 12:00:00',10.00000000,4,'','',38,12,NULL);
+INSERT INTO `llx_payment_donation` VALUES (1,3,'2017-09-06 20:08:36','2017-09-06 16:08:36','2017-09-06 12:00:00',10.00000000,4,'','',NULL,NULL,38,12,NULL);
 /*!40000 ALTER TABLE `llx_payment_donation` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -8971,6 +9371,8 @@ CREATE TABLE `llx_product` (
   `net_measure_units` tinyint(4) DEFAULT NULL,
   `fk_state` int(11) DEFAULT NULL,
   `batch_mask` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `lifetime` int(11) DEFAULT NULL,
+  `qc_frequency` int(11) DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_product_ref` (`ref`,`entity`),
   UNIQUE KEY `uk_product_barcode` (`barcode`,`fk_barcode_type`,`entity`),
@@ -8999,7 +9401,7 @@ CREATE TABLE `llx_product` (
 
 LOCK TABLES `llx_product` WRITE;
 /*!40000 ALTER TABLE `llx_product` DISABLE KEYS */;
-INSERT INTO `llx_product` VALUES (1,'2012-07-08 14:33:17','2020-01-18 19:17:03',0,0,'PINKDRESS',1,NULL,'Pink dress','A beatifull pink dress','','',NULL,9.00000000,10.12500000,0.00000000,0.00000000,'HT',12.500,0,0.000,'0',0.000,'0',1,12,1,1,0,1,0,'',NULL,NULL,'123456789066',2,'','','','',NULL,NULL,NULL,670,-3,NULL,0,NULL,0,NULL,0,2.8,0.00000000,NULL,NULL,NULL,1,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(2,'2012-07-09 00:30:01','2019-11-28 15:09:50',0,0,'PEARPIE',1,NULL,'Pear Pie','','','',NULL,10.00000000,12.00000000,8.33333000,10.00000000,'TTC',20.000,0,0.000,'0',0.000,'0',1,12,1,1,0,0,0,'',NULL,NULL,'123456789077',2,'','','','',NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,NULL,0,998,0.00000000,NULL,NULL,NULL,1,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(3,'2012-07-09 00:30:25','2018-01-16 16:40:03',0,0,'CAKECONTRIB',1,NULL,'Cake making contribution','','','',NULL,0.00000000,0.00000000,0.00000000,0.00000000,'HT',12.500,0,0.000,'0',0.000,'0',1,NULL,1,1,0,0,1,'1m',NULL,NULL,'123456789088',2,'701CAKEM',NULL,NULL,'601CAKEM',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,NULL,NULL,NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(4,'2012-07-10 14:44:06','2021-04-15 11:40:18',0,0,'APPLEPIE',1,NULL,'Apple Pie','Nice Bio Apple Pie.<br />\r\n&nbsp;','','',NULL,9.00000000,9.00000000,6.00000000,6.00000000,'HT',0.000,0,9.000,'1',9.000,'1',1,12,1,1,0,1,0,'',NULL,NULL,'123456789034',2,'701','','','601',NULL,NULL,NULL,500,-3,NULL,0,NULL,0,NULL,0,1021.2,10.00000000,NULL,NULL,NULL,1,0,NULL,NULL,NULL,NULL,NULL,'CGST+SGST',0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(5,'2013-07-20 23:11:38','2018-01-16 16:18:24',0,0,'DOLIDROID',1,NULL,'DoliDroid, Android app for Dolibarr','<strong><span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">DoliDroid is the Android front-end client for Dolibarr ERP &amp; CRM web software.</span><br />\r\n<span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">This application is not a standalone program. It is a front end to use a online hosted Dolibarr ERP &amp; CRM software (an Open-source web software to manage your business).</span></strong>\r\n<p><u>The advantage of DoliDroid are :</u><br />\r\n- DoliDroid is not a duplicate code of Dolibarr, but a front-end of a Dolibarr web installation, so all your online existing features are supported by this application. This is also true for external modules features.<br />\r\n- Upgrading Dolibarr will not break DoliDroid.<br />\r\n- DoliDroid use embedded image resources to reduce bandwidth usage.<br />\r\n- DoliDroid use internal cache for pages that should not change (like menu page)<br />\r\n- Connections parameters are saved. No need to enter them each time you use DoliDroid.<br />\r\n- Integration with your phone or other applications (Clicking on PDF open PDF reader, clicking onto email or phone launch your email application or launch Android dialer, ...)</p>\r\n\r\n<p><span style=\"color:#DAA520\"><strong>WARNING !&nbsp;</strong></span></p>\r\n\r\n<p>This application need Android 4.0+ and a hosted Dolibarr ERP &amp; CRM version 3.5 or newer accessible by internet<br />\r\n(For example, when hosted on any SaaS solution like DoliCloud -&nbsp;<a href=\"https://www.google.com/url?q=https://www.google.com/url?q%3Dhttp://www.dolicloud.com%26sa%3DD%26usg%3DAFQjCNGdd9htz4JDciiMtScpBwK83qIRkw&amp;sa=D&amp;usg=AFQjCNGMpCbxNnU5BiK59e368K5AR0l_pg\" style=\"text-decoration: none; color: rgb(51, 105, 30); cursor: pointer;\" target=\"_blank\">http://www.dolicloud.com</a>).</p>','','',NULL,10.00000000,11.96000000,0.00000000,0.00000000,'HT',19.600,0,0.000,'0',0.000,'0',1,NULL,1,1,0,0,0,'',NULL,'https://play.google.com/store/apps/details?id=com.nltechno.dolidroidpro','123456789023',2,'701',NULL,NULL,'601',NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,NULL,NULL,'',NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(10,'2011-12-31 00:00:00','2017-02-16 00:12:09',0,0,'COMP-XP4523',1,NULL,'Computer XP4523','A powerfull computer XP4523&nbsp;','This product is imported.<br />\r\nWarning: Delay to get it are not reliable.','USXP765',11,100.00000000,110.00000000,0.00000000,0.00000000,'HT',10.000,0,0.000,'0',0.000,'0',NULL,12,1,1,0,1,0,'',150,NULL,'123456789055',2,'701OLDC',NULL,NULL,'601OLDC',NULL,NULL,NULL,1.7,0,NULL,0,NULL,0,NULL,0,110,0.00000000,NULL,NULL,NULL,NULL,0,'20110729232310',200,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(11,'2015-01-13 20:24:42','2019-10-08 17:21:07',0,0,'ROLLUPABC',1,NULL,'Rollup Dolibarr','A nice rollup','','',NULL,0.00000000,0.00000000,0.00000000,0.00000000,'HT',0.000,0,0.000,'0',0.000,'0',1,12,1,1,0,0,0,'',NULL,NULL,'123456789044',2,'','','','',NULL,NULL,NULL,95,-3,NULL,0,2.34,-4,NULL,0,-1,0.00000000,NULL,NULL,'',1,0,NULL,NULL,NULL,NULL,12.00000000,NULL,0,NULL,'',NULL,8,NULL,8,NULL,NULL,NULL,NULL,NULL,NULL),(12,'2018-07-30 17:31:29','2018-07-30 13:35:02',0,0,'DOLICLOUD',1,NULL,'SaaS service of Dolibarr ERP CRM','Cloud hosting of Dolibarr ERP and CRM software','','',NULL,9.00000000,9.00000000,9.00000000,9.00000000,'HT',0.000,0,0.000,'0',0.000,'0',12,12,1,1,0,0,1,'',NULL,'http://www.dolicloud.com','123456789013',2,'',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,NULL,NULL,'',0,0,NULL,NULL,NULL,NULL,8.50000000,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(13,'2017-02-16 03:49:00','2017-02-15 23:49:27',0,0,'COMP-XP4548',1,NULL,'Computer XP4523','A powerfull computer XP4523&nbsp;','This product is imported.<br />\r\nWarning: Delay to get it are not reliable.','USXP765',11,100.00000000,110.00000000,0.00000000,0.00000000,'HT',10.000,0,0.000,'0',0.000,'0',12,12,1,1,0,1,0,'',150,NULL,NULL,2,'',NULL,NULL,'',NULL,NULL,NULL,1.7,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,NULL,NULL,'',NULL,0,NULL,200,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(23,'2019-10-07 00:00:00','2019-11-28 13:51:35',0,0,'PREF123456',1,NULL,'Product name in default language','Product description in default language','a private note (free text)','customs code',1,100.00000000,110.00000000,100.00000000,110.00000000,'HT',10.000,0,0.000,'0',0.000,'0',12,NULL,0,1,0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-3,1,-1,4,-4,5,-3,NULL,0.00000000,NULL,NULL,NULL,0,0,'20191007122224',NULL,NULL,NULL,NULL,NULL,0,'a public note (free text)','',2,-1,3,-1,NULL,NULL,NULL,NULL,NULL,NULL),(24,'2019-11-28 16:33:35','2019-11-28 15:02:01',0,0,'POS-CARROT',1,NULL,'Carrot','','','',NULL,0.83333000,1.00000000,0.00000000,0.00000000,'TTC',20.000,0,0.000,'0',0.000,'0',12,12,1,1,0,0,0,'',NULL,NULL,NULL,2,'','','','',NULL,NULL,NULL,1,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,NULL,NULL,'',NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(25,'2019-11-28 16:37:36','2020-01-13 11:13:19',0,0,'POS-APPLE',1,NULL,'Apple','','','',NULL,1.25000000,1.50000000,0.00000000,0.00000000,'TTC',20.000,0,0.000,'0',0.000,'0',12,12,1,1,0,0,0,'',NULL,NULL,NULL,2,'','','','',NULL,NULL,NULL,1,0,NULL,0,NULL,0,NULL,0,15.599999999999994,0.00000000,NULL,NULL,'',NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(26,'2019-11-28 16:38:44','2019-11-28 12:38:44',0,0,'POS-KIWI',1,NULL,'Kiwi','','','',NULL,1.08333000,1.30000000,0.00000000,0.00000000,'TTC',20.000,0,0.000,'0',0.000,'0',12,12,1,1,0,0,0,'',NULL,NULL,NULL,2,'','','','',NULL,NULL,NULL,1,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,NULL,NULL,'',NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(27,'2019-11-28 16:39:21','2019-11-28 14:57:44',0,0,'POS-PEACH',1,NULL,'Peach','','','',NULL,1.08333000,1.30000000,0.00000000,0.00000000,'TTC',20.000,0,0.000,'0',0.000,'0',12,12,1,1,0,0,0,'',NULL,NULL,NULL,2,'','','','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,NULL,NULL,'',0,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(28,'2019-11-28 16:39:58','2019-11-28 12:39:58',0,0,'POS-ORANGE',1,NULL,'Orange','','','',NULL,2.00000000,2.40000000,0.00000000,0.00000000,'HT',20.000,0,0.000,'0',0.000,'0',12,12,1,1,0,0,0,'',NULL,NULL,NULL,2,'','','','',NULL,NULL,NULL,1,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,NULL,NULL,'',NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(29,'2019-11-28 17:03:14','2019-11-28 13:03:14',0,0,'POS-Eggs',1,NULL,'Eggs','','','',NULL,1.66667000,2.00000000,0.00000000,0.00000000,'TTC',20.000,0,0.000,'0',0.000,'0',12,12,1,1,0,0,0,'',NULL,NULL,NULL,2,'','','','',NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,NULL,NULL,'',NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(30,'2019-11-28 17:09:14','2019-11-28 13:09:14',0,0,'POS-Chips',1,NULL,'Chips','','','',NULL,0.41667000,0.50000000,0.00000000,0.00000000,'TTC',20.000,0,0.000,'0',0.000,'0',12,12,1,1,0,0,0,'',NULL,NULL,NULL,2,'','','','',NULL,NULL,NULL,30,-3,NULL,0,NULL,0,NULL,0,NULL,0.00000000,NULL,NULL,'',NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(31,'2021-04-15 08:38:02','2021-04-15 11:38:02',0,0,'PRODSER',1,NULL,'Product NFC - Unique','','','',NULL,0.00000000,0.00000000,0.00000000,0.00000000,'HT',19.600,0,0.000,'0',0.000,'0',12,12,1,1,0,2,0,'',0,NULL,NULL,2,'','','','','','',NULL,NULL,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,NULL,NULL,'',NULL,0,NULL,0,NULL,NULL,NULL,NULL,0,NULL,'',NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL);
+INSERT INTO `llx_product` VALUES (1,'2012-07-08 14:33:17','2020-01-18 19:17:03',0,0,'PINKDRESS',1,NULL,'Pink dress','A beatifull pink dress','','',NULL,9.00000000,10.12500000,0.00000000,0.00000000,'HT',12.500,0,0.000,'0',0.000,'0',1,12,1,1,0,1,0,'',NULL,NULL,'123456789066',2,'','','','',NULL,NULL,NULL,670,-3,NULL,0,NULL,0,NULL,0,2.8,0.00000000,NULL,NULL,NULL,1,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(2,'2012-07-09 00:30:01','2019-11-28 15:09:50',0,0,'PEARPIE',1,NULL,'Pear Pie','','','',NULL,10.00000000,12.00000000,8.33333000,10.00000000,'TTC',20.000,0,0.000,'0',0.000,'0',1,12,1,1,0,0,0,'',NULL,NULL,'123456789077',2,'','','','',NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,NULL,0,998,0.00000000,NULL,NULL,NULL,1,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(3,'2012-07-09 00:30:25','2018-01-16 16:40:03',0,0,'CAKECONTRIB',1,NULL,'Cake making contribution','','','',NULL,0.00000000,0.00000000,0.00000000,0.00000000,'HT',12.500,0,0.000,'0',0.000,'0',1,NULL,1,1,0,0,1,'1m',NULL,NULL,'123456789088',2,'701CAKEM',NULL,NULL,'601CAKEM',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,NULL,NULL,NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(4,'2012-07-10 14:44:06','2021-04-15 11:40:18',0,0,'APPLEPIE',1,NULL,'Apple Pie','Nice Bio Apple Pie.<br />\r\n&nbsp;','','',NULL,9.00000000,9.00000000,6.00000000,6.00000000,'HT',0.000,0,9.000,'1',9.000,'1',1,12,1,1,0,1,0,'',NULL,NULL,'123456789034',2,'701','','','601',NULL,NULL,NULL,500,-3,NULL,0,NULL,0,NULL,0,1021.2,10.00000000,NULL,NULL,NULL,1,0,NULL,NULL,NULL,NULL,NULL,'CGST+SGST',0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(5,'2013-07-20 23:11:38','2018-01-16 16:18:24',0,0,'DOLIDROID',1,NULL,'DoliDroid, Android app for Dolibarr','<strong><span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">DoliDroid is the Android front-end client for Dolibarr ERP &amp; CRM web software.</span><br />\r\n<span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">This application is not a standalone program. It is a front end to use a online hosted Dolibarr ERP &amp; CRM software (an Open-source web software to manage your business).</span></strong>\r\n<p><u>The advantage of DoliDroid are :</u><br />\r\n- DoliDroid is not a duplicate code of Dolibarr, but a front-end of a Dolibarr web installation, so all your online existing features are supported by this application. This is also true for external modules features.<br />\r\n- Upgrading Dolibarr will not break DoliDroid.<br />\r\n- DoliDroid use embedded image resources to reduce bandwidth usage.<br />\r\n- DoliDroid use internal cache for pages that should not change (like menu page)<br />\r\n- Connections parameters are saved. No need to enter them each time you use DoliDroid.<br />\r\n- Integration with your phone or other applications (Clicking on PDF open PDF reader, clicking onto email or phone launch your email application or launch Android dialer, ...)</p>\r\n\r\n<p><span style=\"color:#DAA520\"><strong>WARNING !&nbsp;</strong></span></p>\r\n\r\n<p>This application need Android 4.0+ and a hosted Dolibarr ERP &amp; CRM version 3.5 or newer accessible by internet<br />\r\n(For example, when hosted on any SaaS solution like DoliCloud -&nbsp;<a href=\"https://www.google.com/url?q=https://www.google.com/url?q%3Dhttp://www.dolicloud.com%26sa%3DD%26usg%3DAFQjCNGdd9htz4JDciiMtScpBwK83qIRkw&amp;sa=D&amp;usg=AFQjCNGMpCbxNnU5BiK59e368K5AR0l_pg\" style=\"text-decoration: none; color: rgb(51, 105, 30); cursor: pointer;\" target=\"_blank\">http://www.dolicloud.com</a>).</p>','','',NULL,10.00000000,11.96000000,0.00000000,0.00000000,'HT',19.600,0,0.000,'0',0.000,'0',1,NULL,1,1,0,0,0,'',NULL,'https://play.google.com/store/apps/details?id=com.nltechno.dolidroidpro','123456789023',2,'701',NULL,NULL,'601',NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,NULL,NULL,'',NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(10,'2011-12-31 00:00:00','2017-02-16 00:12:09',0,0,'COMP-XP4523',1,NULL,'Computer XP4523','A powerfull computer XP4523&nbsp;','This product is imported.<br />\r\nWarning: Delay to get it are not reliable.','USXP765',11,100.00000000,110.00000000,0.00000000,0.00000000,'HT',10.000,0,0.000,'0',0.000,'0',NULL,12,1,1,0,1,0,'',150,NULL,'123456789055',2,'701OLDC',NULL,NULL,'601OLDC',NULL,NULL,NULL,1.7,0,NULL,0,NULL,0,NULL,0,110,0.00000000,NULL,NULL,NULL,NULL,0,'20110729232310',200,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(11,'2015-01-13 20:24:42','2019-10-08 17:21:07',0,0,'ROLLUPABC',1,NULL,'Rollup Dolibarr','A nice rollup','','',NULL,0.00000000,0.00000000,0.00000000,0.00000000,'HT',0.000,0,0.000,'0',0.000,'0',1,12,1,1,0,0,0,'',NULL,NULL,'123456789044',2,'','','','',NULL,NULL,NULL,95,-3,NULL,0,2.34,-4,NULL,0,-1,0.00000000,NULL,NULL,'',1,0,NULL,NULL,NULL,NULL,12.00000000,NULL,0,NULL,'',NULL,8,NULL,8,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(12,'2018-07-30 17:31:29','2018-07-30 13:35:02',0,0,'DOLICLOUD',1,NULL,'SaaS service of Dolibarr ERP CRM','Cloud hosting of Dolibarr ERP and CRM software','','',NULL,9.00000000,9.00000000,9.00000000,9.00000000,'HT',0.000,0,0.000,'0',0.000,'0',12,12,1,1,0,0,1,'',NULL,'http://www.dolicloud.com','123456789013',2,'',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,NULL,NULL,'',0,0,NULL,NULL,NULL,NULL,8.50000000,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(13,'2017-02-16 03:49:00','2017-02-15 23:49:27',0,0,'COMP-XP4548',1,NULL,'Computer XP4523','A powerfull computer XP4523&nbsp;','This product is imported.<br />\r\nWarning: Delay to get it are not reliable.','USXP765',11,100.00000000,110.00000000,0.00000000,0.00000000,'HT',10.000,0,0.000,'0',0.000,'0',12,12,1,1,0,1,0,'',150,NULL,NULL,2,'',NULL,NULL,'',NULL,NULL,NULL,1.7,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,NULL,NULL,'',NULL,0,NULL,200,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(23,'2019-10-07 00:00:00','2019-11-28 13:51:35',0,0,'PREF123456',1,NULL,'Product name in default language','Product description in default language','a private note (free text)','customs code',1,100.00000000,110.00000000,100.00000000,110.00000000,'HT',10.000,0,0.000,'0',0.000,'0',12,NULL,0,1,0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-3,1,-1,4,-4,5,-3,NULL,0.00000000,NULL,NULL,NULL,0,0,'20191007122224',NULL,NULL,NULL,NULL,NULL,0,'a public note (free text)','',2,-1,3,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(24,'2019-11-28 16:33:35','2019-11-28 15:02:01',0,0,'POS-CARROT',1,NULL,'Carrot','','','',NULL,0.83333000,1.00000000,0.00000000,0.00000000,'TTC',20.000,0,0.000,'0',0.000,'0',12,12,1,1,0,0,0,'',NULL,NULL,NULL,2,'','','','',NULL,NULL,NULL,1,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,NULL,NULL,'',NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(25,'2019-11-28 16:37:36','2020-01-13 11:13:19',0,0,'POS-APPLE',1,NULL,'Apple','','','',NULL,1.25000000,1.50000000,0.00000000,0.00000000,'TTC',20.000,0,0.000,'0',0.000,'0',12,12,1,1,0,0,0,'',NULL,NULL,NULL,2,'','','','',NULL,NULL,NULL,1,0,NULL,0,NULL,0,NULL,0,15.599999999999994,0.00000000,NULL,NULL,'',NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(26,'2019-11-28 16:38:44','2019-11-28 12:38:44',0,0,'POS-KIWI',1,NULL,'Kiwi','','','',NULL,1.08333000,1.30000000,0.00000000,0.00000000,'TTC',20.000,0,0.000,'0',0.000,'0',12,12,1,1,0,0,0,'',NULL,NULL,NULL,2,'','','','',NULL,NULL,NULL,1,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,NULL,NULL,'',NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(27,'2019-11-28 16:39:21','2019-11-28 14:57:44',0,0,'POS-PEACH',1,NULL,'Peach','','','',NULL,1.08333000,1.30000000,0.00000000,0.00000000,'TTC',20.000,0,0.000,'0',0.000,'0',12,12,1,1,0,0,0,'',NULL,NULL,NULL,2,'','','','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,NULL,NULL,'',0,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(28,'2019-11-28 16:39:58','2019-11-28 12:39:58',0,0,'POS-ORANGE',1,NULL,'Orange','','','',NULL,2.00000000,2.40000000,0.00000000,0.00000000,'HT',20.000,0,0.000,'0',0.000,'0',12,12,1,1,0,0,0,'',NULL,NULL,NULL,2,'','','','',NULL,NULL,NULL,1,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,NULL,NULL,'',NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(29,'2019-11-28 17:03:14','2019-11-28 13:03:14',0,0,'POS-Eggs',1,NULL,'Eggs','','','',NULL,1.66667000,2.00000000,0.00000000,0.00000000,'TTC',20.000,0,0.000,'0',0.000,'0',12,12,1,1,0,0,0,'',NULL,NULL,NULL,2,'','','','',NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,NULL,NULL,'',NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(30,'2019-11-28 17:09:14','2019-11-28 13:09:14',0,0,'POS-Chips',1,NULL,'Chips','','','',NULL,0.41667000,0.50000000,0.00000000,0.00000000,'TTC',20.000,0,0.000,'0',0.000,'0',12,12,1,1,0,0,0,'',NULL,NULL,NULL,2,'','','','',NULL,NULL,NULL,30,-3,NULL,0,NULL,0,NULL,0,NULL,0.00000000,NULL,NULL,'',NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(31,'2021-04-15 08:38:02','2021-04-15 11:38:02',0,0,'PRODSER',1,NULL,'Product NFC - Unique','','','',NULL,0.00000000,0.00000000,0.00000000,0.00000000,'HT',19.600,0,0.000,'0',0.000,'0',12,12,1,1,0,2,0,'',0,NULL,NULL,2,'','','','','','',NULL,NULL,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,NULL,NULL,'',NULL,0,NULL,0,NULL,NULL,NULL,NULL,0,NULL,'',NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 /*!40000 ALTER TABLE `llx_product` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -9554,6 +9956,9 @@ CREATE TABLE `llx_product_lot` (
   `fk_user_creat` int(11) DEFAULT NULL,
   `fk_user_modif` int(11) DEFAULT NULL,
   `import_key` int(11) DEFAULT NULL,
+  `eol_date` datetime DEFAULT NULL,
+  `manufacturing_date` datetime DEFAULT NULL,
+  `scrapping_date` datetime DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_product_lot` (`fk_product`,`batch`)
 ) ENGINE=InnoDB AUTO_INCREMENT=51 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
@@ -9565,7 +9970,7 @@ CREATE TABLE `llx_product_lot` (
 
 LOCK TABLES `llx_product_lot` WRITE;
 /*!40000 ALTER TABLE `llx_product_lot` DISABLE KEYS */;
-INSERT INTO `llx_product_lot` VALUES (1,1,2,'123456','2018-07-07',NULL,'2018-07-21 20:55:19','2018-12-12 10:53:58',NULL,NULL,NULL),(2,1,2,'2222','2018-07-08','2018-07-07','2018-07-21 21:00:42','2018-12-12 10:53:58',NULL,NULL,NULL),(3,1,10,'5599887766452',NULL,NULL,'2018-07-30 17:39:31','2018-12-12 10:53:58',NULL,NULL,NULL),(4,1,10,'4494487766452',NULL,NULL,'2018-07-30 17:40:12','2018-12-12 10:53:58',NULL,NULL,NULL),(39,1,1,'000000',NULL,NULL,'2020-01-08 20:41:18','2020-01-08 16:41:18',NULL,NULL,NULL),(40,1,4,'aaa','2020-01-01',NULL,'2020-01-08 20:41:18','2020-01-13 11:28:05',NULL,12,NULL),(46,1,1,'string',NULL,NULL,'2020-01-18 20:16:58','2020-01-18 19:16:58',NULL,NULL,NULL),(47,1,4,'000000',NULL,NULL,'2020-01-08 16:40:27','2020-01-21 10:30:15',1,1,NULL),(50,1,4,'Lot 2021-02',NULL,NULL,'2021-04-15 08:40:18','2021-04-15 11:40:18',NULL,NULL,NULL);
+INSERT INTO `llx_product_lot` VALUES (1,1,2,'123456','2018-07-07',NULL,'2018-07-21 20:55:19','2018-12-12 10:53:58',NULL,NULL,NULL,NULL,NULL,NULL),(2,1,2,'2222','2018-07-08','2018-07-07','2018-07-21 21:00:42','2018-12-12 10:53:58',NULL,NULL,NULL,NULL,NULL,NULL),(3,1,10,'5599887766452',NULL,NULL,'2018-07-30 17:39:31','2018-12-12 10:53:58',NULL,NULL,NULL,NULL,NULL,NULL),(4,1,10,'4494487766452',NULL,NULL,'2018-07-30 17:40:12','2018-12-12 10:53:58',NULL,NULL,NULL,NULL,NULL,NULL),(39,1,1,'000000',NULL,NULL,'2020-01-08 20:41:18','2020-01-08 16:41:18',NULL,NULL,NULL,NULL,NULL,NULL),(40,1,4,'aaa','2020-01-01',NULL,'2020-01-08 20:41:18','2020-01-13 11:28:05',NULL,12,NULL,NULL,NULL,NULL),(46,1,1,'string',NULL,NULL,'2020-01-18 20:16:58','2020-01-18 19:16:58',NULL,NULL,NULL,NULL,NULL,NULL),(47,1,4,'000000',NULL,NULL,'2020-01-08 16:40:27','2020-01-21 10:30:15',1,1,NULL,NULL,NULL,NULL),(50,1,4,'Lot 2021-02',NULL,NULL,'2021-04-15 08:40:18','2021-04-15 11:40:18',NULL,NULL,NULL,NULL,NULL,NULL);
 /*!40000 ALTER TABLE `llx_product_lot` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -10076,7 +10481,7 @@ CREATE TABLE `llx_propal` (
 
 LOCK TABLES `llx_propal` WRITE;
 /*!40000 ALTER TABLE `llx_propal` DISABLE KEYS */;
-INSERT INTO `llx_propal` VALUES (1,2,NULL,'2020-12-10 12:24:22','PR1007-0001',1,NULL,NULL,'','2012-07-09 01:33:49','2020-07-09','2020-07-24 12:00:00','2020-08-08 14:24:18',NULL,NULL,1,NULL,1,NULL,NULL,1,0,NULL,NULL,0,30.00000000,3.84000000,0.00000000,0.00000000,33.84000000,NULL,NULL,1,0,'','','azur',NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL),(2,1,NULL,'2021-04-15 10:22:55','PR1007-0002',1,NULL,NULL,'','2012-07-10 02:11:44','2020-07-10','2020-07-25 12:00:00','2020-07-10 02:12:55','2020-07-20 15:23:12','2020-07-20 15:23:12',1,NULL,1,1,1,2,0,NULL,NULL,0,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,NULL,NULL,1,1,'','','azur',NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL),(3,4,NULL,'2021-04-15 10:22:55','PR1007-0003',1,NULL,NULL,'','2012-07-18 11:35:11','2020-07-18','2020-08-02 12:00:00','2020-07-18 11:36:18','2020-07-20 15:21:15','2020-07-20 15:21:15',1,NULL,1,1,1,2,0,NULL,NULL,0,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,NULL,NULL,1,0,'','','azur',NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL),(5,19,NULL,'2021-04-15 10:22:31','PR1302-0005',1,NULL,NULL,'','2015-02-17 15:39:56','2021-02-17','2021-03-04 12:00:00','2020-11-15 23:27:10',NULL,NULL,1,NULL,12,NULL,NULL,1,0,NULL,NULL,0,10.00000000,2.00000000,0.00000000,0.00000000,12.00000000,NULL,NULL,1,0,'','','azur',NULL,NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL),(6,19,NULL,'2021-04-15 10:22:31','PR1302-0006',1,NULL,NULL,'','2015-02-17 15:40:12','2021-02-17','2021-03-04 12:00:00',NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,0,0,NULL,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,1,0,'','','azur',NULL,NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL),(7,19,NULL,'2021-04-15 10:22:31','PR1302-0007',1,NULL,NULL,'','2015-02-17 15:41:15','2021-02-17','2021-03-04 12:00:00','2020-01-29 21:49:33',NULL,NULL,1,NULL,12,NULL,NULL,1,0,NULL,NULL,0,400.00000000,0.00000000,0.00000000,0.00000000,400.00000000,NULL,NULL,1,0,'','','azur',NULL,NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,400.00000000,0.00000000,400.00000000,NULL),(8,19,NULL,'2021-04-15 10:22:31','PR1302-0008',1,NULL,NULL,'','2015-02-17 15:43:39','2021-02-17','2021-03-04 12:00:00',NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,0,0,NULL,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,1,0,'','','azur',NULL,NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL),(10,7,4,'2020-12-10 12:24:22','PR1909-0031',1,NULL,NULL,'','2017-11-15 23:37:08','2020-11-15','2020-11-30 12:00:00','2021-09-27 16:54:30',NULL,NULL,12,NULL,12,NULL,NULL,1,0,NULL,NULL,0,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,NULL,NULL,1,3,'','','azur',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',NULL,NULL,1.00000000,10.00000000,0.00000000,10.00000000,'propale/PR1909-0031/PR1909-0031.pdf'),(11,1,NULL,'2020-06-12 17:12:08','PR1702-0009',1,NULL,NULL,'','2017-02-16 01:44:58','2020-05-13','2020-05-28 12:00:00','2020-02-16 01:44:58',NULL,NULL,1,NULL,1,NULL,NULL,1,0,NULL,NULL,0,60.00000000,0.00000000,0.00000000,0.00000000,60.00000000,NULL,NULL,3,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,60.00000000,0.00000000,60.00000000,NULL),(12,7,NULL,'2020-12-10 12:24:22','PR1702-0010',1,NULL,NULL,'','2017-02-16 01:45:44','2020-06-24','2020-07-09 12:00:00','2020-02-16 01:45:44',NULL,NULL,2,NULL,2,NULL,NULL,1,0,NULL,NULL,0,832.00000000,0.00000000,0.00000000,0.00000000,832.00000000,NULL,NULL,3,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,832.00000000,0.00000000,832.00000000,NULL),(13,26,NULL,'2021-04-15 10:22:31','PR1702-0011',1,NULL,NULL,'','2017-02-16 01:46:15','2021-04-03','2020-04-18 12:00:00','2021-02-16 01:46:15',NULL,NULL,1,NULL,1,NULL,NULL,1,0,NULL,NULL,0,242.00000000,0.00000000,0.00000000,0.00000000,242.00000000,NULL,NULL,3,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,242.00000000,0.00000000,242.00000000,NULL),(14,3,NULL,'2020-12-10 12:24:22','PR1702-0012',1,NULL,NULL,'','2017-02-16 01:46:15','2020-06-19','2020-07-04 12:00:00','2020-02-16 01:46:15',NULL,NULL,2,NULL,2,NULL,NULL,1,0,NULL,NULL,0,245.00000000,0.00000000,0.00000000,0.00000000,245.00000000,NULL,NULL,3,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,245.00000000,0.00000000,245.00000000,NULL),(15,26,NULL,'2020-06-12 17:12:08','PR1702-0013',1,NULL,NULL,'','2017-02-16 01:46:15','2020-05-01','2020-05-16 12:00:00','2019-02-16 01:46:15',NULL,NULL,2,NULL,2,NULL,NULL,1,0,NULL,NULL,0,940.00000000,0.00000000,0.00000000,0.00000000,940.00000000,NULL,NULL,3,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,940.00000000,0.00000000,940.00000000,NULL),(16,1,NULL,'2020-06-12 17:12:08','PR1702-0014',1,NULL,NULL,'','2017-02-16 01:46:15','2020-05-13','2020-05-28 12:00:00','2020-02-16 01:46:15',NULL,NULL,2,NULL,2,NULL,NULL,1,0,NULL,NULL,0,125.00000000,0.00000000,0.00000000,0.00000000,125.00000000,NULL,NULL,3,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,125.00000000,0.00000000,125.00000000,NULL),(17,1,NULL,'2020-12-10 12:24:22','PR1702-0015',1,NULL,NULL,'','2017-02-16 01:46:15','2020-07-23','2020-08-07 12:00:00','2020-02-16 01:46:15',NULL,NULL,1,NULL,1,NULL,NULL,1,0,NULL,NULL,0,163.00000000,0.00000000,0.00000000,0.00000000,163.00000000,NULL,NULL,3,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,163.00000000,0.00000000,163.00000000,NULL),(18,26,NULL,'2021-04-15 10:22:31','PR1702-0016',1,NULL,NULL,'','2017-02-16 01:46:15','2021-02-13','2021-02-28 12:00:00','2021-02-16 01:46:15',NULL,NULL,2,NULL,2,NULL,NULL,1,0,NULL,NULL,0,900.00000000,0.00000000,0.00000000,0.00000000,900.00000000,NULL,NULL,3,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,900.00000000,0.00000000,900.00000000,NULL),(19,12,NULL,'2021-04-15 10:22:31','PR1702-0017',1,NULL,NULL,'','2017-02-16 01:46:15','2021-03-30','2021-04-14 12:00:00','2021-02-16 01:46:15',NULL,NULL,2,NULL,2,NULL,NULL,1,0,NULL,NULL,0,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,NULL,NULL,3,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,200.00000000,0.00000000,200.00000000,NULL),(20,26,NULL,'2020-12-10 12:24:22','PR1702-0018',1,NULL,NULL,'','2017-02-16 01:46:15','2020-11-13','2020-11-28 12:00:00','2020-02-16 01:46:15',NULL,NULL,1,NULL,1,NULL,NULL,1,0,NULL,NULL,0,830.00000000,0.00000000,0.00000000,0.00000000,830.00000000,NULL,NULL,3,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,830.00000000,0.00000000,830.00000000,NULL),(21,1,NULL,'2020-12-10 12:24:22','PR1702-0019',1,NULL,NULL,'','2017-02-16 01:46:15','2020-09-23','2020-10-08 12:00:00','2020-02-16 04:47:09',NULL,NULL,1,NULL,12,NULL,NULL,1,0,NULL,NULL,0,89.00000000,0.00000000,0.00000000,0.00000000,89.00000000,NULL,NULL,3,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,89.00000000,0.00000000,89.00000000,NULL),(22,26,NULL,'2020-12-10 12:24:22','PR1702-0020',1,NULL,NULL,'','2017-02-16 01:46:15','2020-11-13','2020-11-28 12:00:00','2020-02-16 01:46:15',NULL,NULL,1,NULL,1,NULL,NULL,0,0,NULL,NULL,0,70.00000000,0.00000000,0.00000000,0.00000000,70.00000000,NULL,NULL,3,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,70.00000000,0.00000000,70.00000000,'propale/PR1702-0020/PR1702-0020.pdf'),(23,12,NULL,'2021-04-15 10:22:31','PR1702-0021',1,NULL,NULL,'','2017-02-16 01:46:17','2021-04-03','2020-04-18 12:00:00','2020-02-17 16:07:18',NULL,NULL,2,NULL,12,NULL,NULL,1,0,NULL,NULL,0,715.00000000,0.00000000,0.00000000,0.00000000,715.00000000,NULL,NULL,3,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,715.00000000,0.00000000,715.00000000,NULL),(24,7,NULL,'2020-12-10 12:24:22','PR1702-0022',1,NULL,NULL,'','2017-02-16 01:46:17','2020-11-13','2020-11-28 12:00:00','2020-02-16 01:46:17',NULL,NULL,2,NULL,2,NULL,NULL,1,0,NULL,NULL,0,250.00000000,0.00000000,0.00000000,0.00000000,250.00000000,NULL,NULL,3,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,250.00000000,0.00000000,250.00000000,NULL),(25,3,NULL,'2021-04-15 10:22:55','PR1702-0023',1,NULL,NULL,'','2017-02-16 01:46:17','2020-07-09','2020-07-24 12:00:00','2020-02-16 01:46:17','2020-02-16 04:47:29','2020-02-16 04:47:29',1,NULL,1,12,12,4,0,NULL,NULL,0,1018.00000000,0.00000000,0.00000000,0.00000000,1018.00000000,NULL,NULL,3,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,1018.00000000,0.00000000,1018.00000000,NULL),(26,1,NULL,'2021-04-15 10:22:31','PR1702-0024',1,NULL,NULL,'','2017-02-16 01:46:17','2021-04-03','2020-04-18 12:00:00','2020-02-16 01:46:18',NULL,NULL,2,NULL,2,NULL,NULL,1,0,NULL,NULL,0,710.00000000,0.00000000,0.00000000,0.00000000,710.00000000,NULL,NULL,3,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,710.00000000,0.00000000,710.00000000,NULL),(27,6,NULL,'2020-12-10 12:24:22','PR1702-0025',1,NULL,NULL,'','2017-02-16 01:46:18','2020-11-12','2020-11-27 12:00:00','2020-02-16 01:46:18',NULL,NULL,1,NULL,1,NULL,NULL,1,0,NULL,NULL,0,300.00000000,0.00000000,0.00000000,0.00000000,300.00000000,NULL,NULL,3,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,300.00000000,0.00000000,300.00000000,NULL),(28,19,NULL,'2021-04-15 10:22:55','PR1702-0026',1,NULL,NULL,'','2017-02-16 01:46:18','2020-07-30','2020-08-14 12:00:00','2020-02-16 01:46:18','2020-02-16 04:46:31','2020-02-16 04:46:31',2,NULL,2,12,12,2,0,NULL,NULL,0,440.00000000,0.00000000,0.00000000,0.00000000,440.00000000,NULL,NULL,3,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,440.00000000,0.00000000,440.00000000,NULL),(29,1,NULL,'2021-04-15 10:22:55','PR1702-0027',1,NULL,NULL,'','2017-02-16 01:46:18','2020-07-23','2020-08-07 12:00:00','2020-02-16 01:46:18','2021-12-20 20:50:23','2021-12-20 20:50:23',2,NULL,2,12,12,2,0,NULL,NULL,0,1000.00000000,0.00000000,0.00000000,0.00000000,1000.00000000,NULL,NULL,3,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,1000.00000000,0.00000000,1000.00000000,'propale/PR1702-0027/PR1702-0027.pdf'),(30,1,NULL,'2021-04-15 10:22:55','PR1702-0028',1,NULL,NULL,'','2017-02-16 01:46:18','2020-05-01','2020-05-16 12:00:00','2019-02-16 01:46:18','2019-02-16 04:46:42','2019-02-16 04:46:42',2,NULL,2,12,12,3,0,NULL,NULL,0,1200.00000000,0.00000000,0.00000000,0.00000000,1200.00000000,NULL,NULL,3,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,1200.00000000,0.00000000,1200.00000000,NULL),(31,11,NULL,'2020-12-10 12:24:22','PR1702-0029',1,NULL,NULL,'','2017-02-16 01:46:18','2020-06-24','2020-07-09 12:00:00','2020-02-16 01:46:18',NULL,NULL,1,NULL,1,NULL,NULL,1,0,NULL,NULL,0,720.00000000,0.00000000,0.00000000,0.00000000,720.00000000,NULL,NULL,3,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,720.00000000,0.00000000,720.00000000,NULL),(32,19,NULL,'2020-12-10 12:24:22','PR1702-0030',1,NULL,NULL,'','2017-02-16 01:46:18','2020-11-12','2020-11-27 12:00:00','2020-02-16 01:46:18',NULL,NULL,2,NULL,2,NULL,NULL,1,0,NULL,NULL,0,608.00000000,0.00000000,0.00000000,0.00000000,608.00000000,NULL,NULL,3,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,608.00000000,0.00000000,608.00000000,NULL),(33,10,6,'2020-12-10 12:24:22','PR1909-0032',1,NULL,NULL,'','2019-09-27 17:07:40','2020-09-27','2020-10-12 12:00:00','2020-09-27 17:08:59',NULL,NULL,12,12,12,NULL,NULL,1,0,NULL,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL,'This is a private note','This is a public note','azur',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',1,'EUR',1.00000000,0.00000000,0.00000000,0.00000000,'propale/PR1909-0032/PR1909-0032.pdf'),(34,10,6,'2021-04-15 10:22:55','PR1909-0033',1,NULL,NULL,'','2019-09-27 17:11:21','2020-09-27','2020-10-12 12:00:00','2020-09-27 17:13:13','2020-01-07 23:43:06','2020-01-07 23:43:06',12,12,12,12,12,2,0,NULL,NULL,0,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,NULL,NULL,NULL,NULL,NULL,'a &amp; a<br />\r\nb &lt; r','azur',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',1,'EUR',1.00000000,10.00000000,0.00000000,10.00000000,'propale/PR1909-0033/PR1909-0033.pdf'),(35,10,NULL,'2020-12-10 12:24:22','(PROV35)',1,NULL,NULL,'','2019-09-27 17:53:44','2020-09-27','2020-10-12 12:00:00',NULL,NULL,NULL,12,NULL,NULL,NULL,NULL,0,0,NULL,NULL,0,5.00000000,0.00000000,0.00000000,0.00000000,5.00000000,NULL,NULL,NULL,NULL,'','','azur',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',1,'EUR',1.00000000,5.00000000,0.00000000,5.00000000,'propale/(PROV35)/(PROV35).pdf'),(36,1,NULL,'2021-04-15 10:22:55','PR2001-0034',1,NULL,NULL,'','2020-01-01 23:55:35','2021-01-01','2021-01-16 12:00:00','2021-01-19 14:24:22','2021-01-19 14:24:27','2021-01-19 14:24:27',12,NULL,12,12,12,2,0,NULL,NULL,0,4.00000000,0.24000000,0.00000000,0.00000000,4.24000000,NULL,NULL,NULL,NULL,'','','azur',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',1,'EUR',1.00000000,4.00000000,0.24000000,4.24000000,'propale/PR2001-0034/PR2001-0034.pdf'),(37,10,NULL,'2021-04-15 10:22:31','(PROV37)',1,NULL,NULL,'','2020-01-06 00:44:16','2021-01-05','2021-01-20 12:00:00',NULL,NULL,NULL,12,NULL,NULL,NULL,NULL,0,0,NULL,NULL,0,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,NULL,NULL,NULL,NULL,'','','azur',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',1,'EUR',1.00000000,10.00000000,0.00000000,10.00000000,'propale/(PROV37)/(PROV37).pdf'),(38,30,NULL,'2021-04-15 10:22:31','(PROV38)',1,NULL,NULL,'','2020-01-13 17:25:28','2021-01-13','2021-01-28 12:00:00',NULL,NULL,NULL,12,NULL,NULL,NULL,NULL,0,0,NULL,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL,'','','azur',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',1,'EUR',1.00000000,0.00000000,0.00000000,0.00000000,'propale/(PROV38)/(PROV38).pdf');
+INSERT INTO `llx_propal` VALUES (1,2,NULL,'2021-07-11 17:49:28','PR1007-0001',1,NULL,NULL,'','2012-07-09 01:33:49','2021-07-09','2020-07-24 12:00:00','2020-08-08 14:24:18',NULL,NULL,1,NULL,1,NULL,NULL,1,0,NULL,NULL,0,30.00000000,3.84000000,0.00000000,0.00000000,33.84000000,NULL,NULL,1,0,'','','azur',NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL),(2,1,NULL,'2021-07-11 17:49:28','PR1007-0002',1,NULL,NULL,'','2012-07-10 02:11:44','2021-07-10','2020-07-25 12:00:00','2021-07-10 02:12:55','2020-07-20 15:23:12','2020-07-20 15:23:12',1,NULL,1,1,1,2,0,NULL,NULL,0,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,NULL,NULL,1,1,'','','azur',NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL),(3,4,NULL,'2021-04-15 10:22:55','PR1007-0003',1,NULL,NULL,'','2012-07-18 11:35:11','2020-07-18','2020-08-02 12:00:00','2020-07-18 11:36:18','2020-07-20 15:21:15','2020-07-20 15:21:15',1,NULL,1,1,1,2,0,NULL,NULL,0,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,NULL,NULL,1,0,'','','azur',NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL),(5,19,NULL,'2021-04-15 10:22:31','PR1302-0005',1,NULL,NULL,'','2015-02-17 15:39:56','2021-02-17','2021-03-04 12:00:00','2020-11-15 23:27:10',NULL,NULL,1,NULL,12,NULL,NULL,1,0,NULL,NULL,0,10.00000000,2.00000000,0.00000000,0.00000000,12.00000000,NULL,NULL,1,0,'','','azur',NULL,NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL),(6,19,NULL,'2021-04-15 10:22:31','PR1302-0006',1,NULL,NULL,'','2015-02-17 15:40:12','2021-02-17','2021-03-04 12:00:00',NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,0,0,NULL,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,1,0,'','','azur',NULL,NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL),(7,19,NULL,'2021-04-15 10:22:31','PR1302-0007',1,NULL,NULL,'','2015-02-17 15:41:15','2021-02-17','2021-03-04 12:00:00','2020-01-29 21:49:33',NULL,NULL,1,NULL,12,NULL,NULL,1,0,NULL,NULL,0,400.00000000,0.00000000,0.00000000,0.00000000,400.00000000,NULL,NULL,1,0,'','','azur',NULL,NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,400.00000000,0.00000000,400.00000000,NULL),(8,19,NULL,'2021-04-15 10:22:31','PR1302-0008',1,NULL,NULL,'','2015-02-17 15:43:39','2021-02-17','2021-03-04 12:00:00',NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,0,0,NULL,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,1,0,'','','azur',NULL,NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL),(10,7,4,'2020-12-10 12:24:22','PR1909-0031',1,NULL,NULL,'','2017-11-15 23:37:08','2020-11-15','2020-11-30 12:00:00','2021-09-27 16:54:30',NULL,NULL,12,NULL,12,NULL,NULL,1,0,NULL,NULL,0,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,NULL,NULL,1,3,'','','azur',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',NULL,NULL,1.00000000,10.00000000,0.00000000,10.00000000,'propale/PR1909-0031/PR1909-0031.pdf'),(11,1,NULL,'2021-07-11 17:49:28','PR1702-0009',1,NULL,NULL,'','2017-02-16 01:44:58','2021-05-13','2021-05-28 12:00:00','2021-02-16 01:44:58',NULL,NULL,1,NULL,1,NULL,NULL,1,0,NULL,NULL,0,60.00000000,0.00000000,0.00000000,0.00000000,60.00000000,NULL,NULL,3,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,60.00000000,0.00000000,60.00000000,NULL),(12,7,NULL,'2021-07-11 17:49:28','PR1702-0010',1,NULL,NULL,'','2017-02-16 01:45:44','2021-06-24','2021-07-09 12:00:00','2021-02-16 01:45:44',NULL,NULL,2,NULL,2,NULL,NULL,1,0,NULL,NULL,0,832.00000000,0.00000000,0.00000000,0.00000000,832.00000000,NULL,NULL,3,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,832.00000000,0.00000000,832.00000000,NULL),(13,26,NULL,'2021-04-15 10:22:31','PR1702-0011',1,NULL,NULL,'','2017-02-16 01:46:15','2021-04-03','2020-04-18 12:00:00','2021-02-16 01:46:15',NULL,NULL,1,NULL,1,NULL,NULL,1,0,NULL,NULL,0,242.00000000,0.00000000,0.00000000,0.00000000,242.00000000,NULL,NULL,3,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,242.00000000,0.00000000,242.00000000,NULL),(14,3,NULL,'2021-07-11 17:49:28','PR1702-0012',1,NULL,NULL,'','2017-02-16 01:46:15','2021-06-19','2021-07-04 12:00:00','2021-02-16 01:46:15',NULL,NULL,2,NULL,2,NULL,NULL,1,0,NULL,NULL,0,245.00000000,0.00000000,0.00000000,0.00000000,245.00000000,NULL,NULL,3,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,245.00000000,0.00000000,245.00000000,NULL),(15,26,NULL,'2021-07-11 17:49:28','PR1702-0013',1,NULL,NULL,'','2017-02-16 01:46:15','2021-05-01','2021-05-16 12:00:00','2020-02-16 01:46:15',NULL,NULL,2,NULL,2,NULL,NULL,1,0,NULL,NULL,0,940.00000000,0.00000000,0.00000000,0.00000000,940.00000000,NULL,NULL,3,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,940.00000000,0.00000000,940.00000000,NULL),(16,1,NULL,'2021-07-11 17:49:28','PR1702-0014',1,NULL,NULL,'','2017-02-16 01:46:15','2021-05-13','2021-05-28 12:00:00','2021-02-16 01:46:15',NULL,NULL,2,NULL,2,NULL,NULL,1,0,NULL,NULL,0,125.00000000,0.00000000,0.00000000,0.00000000,125.00000000,NULL,NULL,3,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,125.00000000,0.00000000,125.00000000,NULL),(17,1,NULL,'2020-12-10 12:24:22','PR1702-0015',1,NULL,NULL,'','2017-02-16 01:46:15','2020-07-23','2020-08-07 12:00:00','2020-02-16 01:46:15',NULL,NULL,1,NULL,1,NULL,NULL,1,0,NULL,NULL,0,163.00000000,0.00000000,0.00000000,0.00000000,163.00000000,NULL,NULL,3,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,163.00000000,0.00000000,163.00000000,NULL),(18,26,NULL,'2021-04-15 10:22:31','PR1702-0016',1,NULL,NULL,'','2017-02-16 01:46:15','2021-02-13','2021-02-28 12:00:00','2021-02-16 01:46:15',NULL,NULL,2,NULL,2,NULL,NULL,1,0,NULL,NULL,0,900.00000000,0.00000000,0.00000000,0.00000000,900.00000000,NULL,NULL,3,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,900.00000000,0.00000000,900.00000000,NULL),(19,12,NULL,'2021-04-15 10:22:31','PR1702-0017',1,NULL,NULL,'','2017-02-16 01:46:15','2021-03-30','2021-04-14 12:00:00','2021-02-16 01:46:15',NULL,NULL,2,NULL,2,NULL,NULL,1,0,NULL,NULL,0,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,NULL,NULL,3,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,200.00000000,0.00000000,200.00000000,NULL),(20,26,NULL,'2020-12-10 12:24:22','PR1702-0018',1,NULL,NULL,'','2017-02-16 01:46:15','2020-11-13','2020-11-28 12:00:00','2020-02-16 01:46:15',NULL,NULL,1,NULL,1,NULL,NULL,1,0,NULL,NULL,0,830.00000000,0.00000000,0.00000000,0.00000000,830.00000000,NULL,NULL,3,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,830.00000000,0.00000000,830.00000000,NULL),(21,1,NULL,'2020-12-10 12:24:22','PR1702-0019',1,NULL,NULL,'','2017-02-16 01:46:15','2020-09-23','2020-10-08 12:00:00','2020-02-16 04:47:09',NULL,NULL,1,NULL,12,NULL,NULL,1,0,NULL,NULL,0,89.00000000,0.00000000,0.00000000,0.00000000,89.00000000,NULL,NULL,3,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,89.00000000,0.00000000,89.00000000,NULL),(22,26,NULL,'2020-12-10 12:24:22','PR1702-0020',1,NULL,NULL,'','2017-02-16 01:46:15','2020-11-13','2020-11-28 12:00:00','2020-02-16 01:46:15',NULL,NULL,1,NULL,1,NULL,NULL,0,0,NULL,NULL,0,70.00000000,0.00000000,0.00000000,0.00000000,70.00000000,NULL,NULL,3,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,70.00000000,0.00000000,70.00000000,'propale/PR1702-0020/PR1702-0020.pdf'),(23,12,NULL,'2021-04-15 10:22:31','PR1702-0021',1,NULL,NULL,'','2017-02-16 01:46:17','2021-04-03','2020-04-18 12:00:00','2020-02-17 16:07:18',NULL,NULL,2,NULL,12,NULL,NULL,1,0,NULL,NULL,0,715.00000000,0.00000000,0.00000000,0.00000000,715.00000000,NULL,NULL,3,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,715.00000000,0.00000000,715.00000000,NULL),(24,7,NULL,'2020-12-10 12:24:22','PR1702-0022',1,NULL,NULL,'','2017-02-16 01:46:17','2020-11-13','2020-11-28 12:00:00','2020-02-16 01:46:17',NULL,NULL,2,NULL,2,NULL,NULL,1,0,NULL,NULL,0,250.00000000,0.00000000,0.00000000,0.00000000,250.00000000,NULL,NULL,3,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,250.00000000,0.00000000,250.00000000,NULL),(25,3,NULL,'2021-07-11 17:49:28','PR1702-0023',1,NULL,NULL,'','2017-02-16 01:46:17','2021-07-09','2020-07-24 12:00:00','2021-02-16 01:46:17','2020-02-16 04:47:29','2021-02-16 04:47:29',1,NULL,1,12,12,4,0,NULL,NULL,0,1018.00000000,0.00000000,0.00000000,0.00000000,1018.00000000,NULL,NULL,3,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,1018.00000000,0.00000000,1018.00000000,NULL),(26,1,NULL,'2021-04-15 10:22:31','PR1702-0024',1,NULL,NULL,'','2017-02-16 01:46:17','2021-04-03','2020-04-18 12:00:00','2020-02-16 01:46:18',NULL,NULL,2,NULL,2,NULL,NULL,1,0,NULL,NULL,0,710.00000000,0.00000000,0.00000000,0.00000000,710.00000000,NULL,NULL,3,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,710.00000000,0.00000000,710.00000000,NULL),(27,6,NULL,'2020-12-10 12:24:22','PR1702-0025',1,NULL,NULL,'','2017-02-16 01:46:18','2020-11-12','2020-11-27 12:00:00','2020-02-16 01:46:18',NULL,NULL,1,NULL,1,NULL,NULL,1,0,NULL,NULL,0,300.00000000,0.00000000,0.00000000,0.00000000,300.00000000,NULL,NULL,3,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,300.00000000,0.00000000,300.00000000,NULL),(28,19,NULL,'2021-04-15 10:22:55','PR1702-0026',1,NULL,NULL,'','2017-02-16 01:46:18','2020-07-30','2020-08-14 12:00:00','2020-02-16 01:46:18','2020-02-16 04:46:31','2020-02-16 04:46:31',2,NULL,2,12,12,2,0,NULL,NULL,0,440.00000000,0.00000000,0.00000000,0.00000000,440.00000000,NULL,NULL,3,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,440.00000000,0.00000000,440.00000000,NULL),(29,1,NULL,'2021-04-15 10:22:55','PR1702-0027',1,NULL,NULL,'','2017-02-16 01:46:18','2020-07-23','2020-08-07 12:00:00','2020-02-16 01:46:18','2021-12-20 20:50:23','2021-12-20 20:50:23',2,NULL,2,12,12,2,0,NULL,NULL,0,1000.00000000,0.00000000,0.00000000,0.00000000,1000.00000000,NULL,NULL,3,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,1000.00000000,0.00000000,1000.00000000,'propale/PR1702-0027/PR1702-0027.pdf'),(30,1,NULL,'2021-07-11 17:49:28','PR1702-0028',1,NULL,NULL,'','2017-02-16 01:46:18','2021-05-01','2021-05-16 12:00:00','2020-02-16 01:46:18','2019-02-16 04:46:42','2020-02-16 04:46:42',2,NULL,2,12,12,3,0,NULL,NULL,0,1200.00000000,0.00000000,0.00000000,0.00000000,1200.00000000,NULL,NULL,3,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,1200.00000000,0.00000000,1200.00000000,NULL),(31,11,NULL,'2021-07-11 17:49:28','PR1702-0029',1,NULL,NULL,'','2017-02-16 01:46:18','2021-06-24','2021-07-09 12:00:00','2021-02-16 01:46:18',NULL,NULL,1,NULL,1,NULL,NULL,1,0,NULL,NULL,0,720.00000000,0.00000000,0.00000000,0.00000000,720.00000000,NULL,NULL,3,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,720.00000000,0.00000000,720.00000000,NULL),(32,19,NULL,'2020-12-10 12:24:22','PR1702-0030',1,NULL,NULL,'','2017-02-16 01:46:18','2020-11-12','2020-11-27 12:00:00','2020-02-16 01:46:18',NULL,NULL,2,NULL,2,NULL,NULL,1,0,NULL,NULL,0,608.00000000,0.00000000,0.00000000,0.00000000,608.00000000,NULL,NULL,3,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,608.00000000,0.00000000,608.00000000,NULL),(33,10,6,'2020-12-10 12:24:22','PR1909-0032',1,NULL,NULL,'','2019-09-27 17:07:40','2020-09-27','2020-10-12 12:00:00','2020-09-27 17:08:59',NULL,NULL,12,12,12,NULL,NULL,1,0,NULL,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL,'This is a private note','This is a public note','azur',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',1,'EUR',1.00000000,0.00000000,0.00000000,0.00000000,'propale/PR1909-0032/PR1909-0032.pdf'),(34,10,6,'2021-04-15 10:22:55','PR1909-0033',1,NULL,NULL,'','2019-09-27 17:11:21','2020-09-27','2020-10-12 12:00:00','2020-09-27 17:13:13','2020-01-07 23:43:06','2020-01-07 23:43:06',12,12,12,12,12,2,0,NULL,NULL,0,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,NULL,NULL,NULL,NULL,NULL,'a &amp; a<br />\r\nb &lt; r','azur',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',1,'EUR',1.00000000,10.00000000,0.00000000,10.00000000,'propale/PR1909-0033/PR1909-0033.pdf'),(35,10,NULL,'2020-12-10 12:24:22','(PROV35)',1,NULL,NULL,'','2019-09-27 17:53:44','2020-09-27','2020-10-12 12:00:00',NULL,NULL,NULL,12,NULL,NULL,NULL,NULL,0,0,NULL,NULL,0,5.00000000,0.00000000,0.00000000,0.00000000,5.00000000,NULL,NULL,NULL,NULL,'','','azur',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',1,'EUR',1.00000000,5.00000000,0.00000000,5.00000000,'propale/(PROV35)/(PROV35).pdf'),(36,1,NULL,'2021-04-15 10:22:55','PR2001-0034',1,NULL,NULL,'','2020-01-01 23:55:35','2021-01-01','2021-01-16 12:00:00','2021-01-19 14:24:22','2021-01-19 14:24:27','2021-01-19 14:24:27',12,NULL,12,12,12,2,0,NULL,NULL,0,4.00000000,0.24000000,0.00000000,0.00000000,4.24000000,NULL,NULL,NULL,NULL,'','','azur',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',1,'EUR',1.00000000,4.00000000,0.24000000,4.24000000,'propale/PR2001-0034/PR2001-0034.pdf'),(37,10,NULL,'2021-04-15 10:22:31','(PROV37)',1,NULL,NULL,'','2020-01-06 00:44:16','2021-01-05','2021-01-20 12:00:00',NULL,NULL,NULL,12,NULL,NULL,NULL,NULL,0,0,NULL,NULL,0,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,NULL,NULL,NULL,NULL,'','','azur',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',1,'EUR',1.00000000,10.00000000,0.00000000,10.00000000,'propale/(PROV37)/(PROV37).pdf'),(38,30,NULL,'2021-04-15 10:22:31','(PROV38)',1,NULL,NULL,'','2020-01-13 17:25:28','2021-01-13','2021-01-28 12:00:00',NULL,NULL,NULL,12,NULL,NULL,NULL,NULL,0,0,NULL,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL,'','','azur',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',1,'EUR',1.00000000,0.00000000,0.00000000,0.00000000,'propale/(PROV38)/(PROV38).pdf');
 /*!40000 ALTER TABLE `llx_propal` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -10345,7 +10750,7 @@ CREATE TABLE `llx_recruitment_recruitmentcandidature` (
   `remuneration_requested` int(11) DEFAULT NULL,
   `remuneration_proposed` int(11) DEFAULT NULL,
   `fk_recruitment_origin` int(11) DEFAULT NULL,
-  `email_msgid` varchar(175) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `email_msgid` varchar(175) COLLATE utf8_unicode_ci DEFAULT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
   `date_birth` date DEFAULT NULL,
   PRIMARY KEY (`rowid`),
@@ -10584,7 +10989,7 @@ CREATE TABLE `llx_rights_def` (
 
 LOCK TABLES `llx_rights_def` WRITE;
 /*!40000 ALTER TABLE `llx_rights_def` DISABLE KEYS */;
-INSERT INTO `llx_rights_def` VALUES (11,'Read invoices','facture',1,'lire',NULL,'a',0,11,0),(11,'Lire les factures','facture',2,'lire',NULL,'a',1,10,0),(12,'Create and update invoices','facture',1,'creer',NULL,'a',0,11,0),(12,'Creer/modifier les factures','facture',2,'creer',NULL,'a',0,10,0),(13,'Devalidate invoices','facture',1,'invoice_advance','unvalidate','a',0,11,0),(13,'Dévalider les factures','facture',2,'invoice_advance','unvalidate','a',0,10,0),(14,'Validate invoices','facture',1,'invoice_advance','validate','a',0,11,0),(14,'Valider les factures','facture',2,'valider',NULL,'a',0,10,0),(15,'Send invoices by email','facture',1,'invoice_advance','send','a',0,11,0),(15,'Envoyer les factures par mail','facture',2,'invoice_advance','send','a',0,10,0),(16,'Issue payments on invoices','facture',1,'paiement',NULL,'a',0,11,0),(16,'Emettre des paiements sur les factures','facture',2,'paiement',NULL,'a',0,10,0),(19,'Delete invoices','facture',1,'supprimer',NULL,'a',0,11,0),(19,'Supprimer les factures','facture',2,'supprimer',NULL,'a',0,10,0),(21,'Lire les propositions commerciales','propale',1,'lire',NULL,'r',1,22,0),(21,'Lire les propositions commerciales','propale',2,'lire',NULL,'r',1,22,0),(22,'Creer/modifier les propositions commerciales','propale',1,'creer',NULL,'w',0,22,0),(22,'Creer/modifier les propositions commerciales','propale',2,'creer',NULL,'w',0,22,0),(24,'Valider les propositions commerciales','propale',1,'propal_advance','validate','d',0,22,0),(24,'Valider les propositions commerciales','propale',2,'valider',NULL,'d',0,22,0),(25,'Envoyer les propositions commerciales aux clients','propale',1,'propal_advance','send','d',0,22,0),(25,'Envoyer les propositions commerciales aux clients','propale',2,'propal_advance','send','d',0,22,0),(26,'Cloturer les propositions commerciales','propale',1,'propal_advance','close','d',0,22,0),(26,'Cloturer les propositions commerciales','propale',2,'propal_advance','close','d',0,22,0),(27,'Supprimer les propositions commerciales','propale',1,'supprimer',NULL,'d',0,22,0),(27,'Supprimer les propositions commerciales','propale',2,'supprimer',NULL,'d',0,22,0),(28,'Exporter les propositions commerciales et attributs','propale',1,'export',NULL,'r',0,22,0),(28,'Exporter les propositions commerciales et attributs','propale',2,'export',NULL,'r',0,22,0),(31,'Lire les produits','produit',1,'lire',NULL,'r',1,25,0),(31,'Lire les produits','produit',2,'lire',NULL,'r',1,25,0),(32,'Creer/modifier les produits','produit',1,'creer',NULL,'w',0,25,0),(32,'Creer/modifier les produits','produit',2,'creer',NULL,'w',0,25,0),(34,'Supprimer les produits','produit',1,'supprimer',NULL,'d',0,25,0),(34,'Supprimer les produits','produit',2,'supprimer',NULL,'d',0,25,0),(38,'Exporter les produits','produit',1,'export',NULL,'r',0,25,0),(38,'Exporter les produits','produit',2,'export',NULL,'r',0,25,0),(39,'Ignore minimum price','produit',1,'ignore_price_min_advance',NULL,'r',0,25,0),(41,'Read projects and tasks (shared projects or projects I am contact for). Can also enter time consumed on assigned tasks (timesheet)','projet',1,'lire',NULL,'r',1,14,0),(42,'Create/modify projects and tasks (shared projects or projects I am contact for)','projet',1,'creer',NULL,'w',0,14,0),(44,'Delete project and tasks (shared projects or projects I am contact for)','projet',1,'supprimer',NULL,'d',0,14,0),(45,'Export projects','projet',1,'export',NULL,'d',0,14,0),(61,'Lire les fiches d\'intervention','ficheinter',1,'lire',NULL,'r',1,41,0),(62,'Creer/modifier les fiches d\'intervention','ficheinter',1,'creer',NULL,'w',0,41,0),(64,'Supprimer les fiches d\'intervention','ficheinter',1,'supprimer',NULL,'d',0,41,0),(67,'Exporter les fiches interventions','ficheinter',1,'export',NULL,'r',0,41,0),(68,'Envoyer les fiches d\'intervention par courriel','ficheinter',1,'ficheinter_advance','send','r',0,41,0),(69,'Valider les fiches d\'intervention ','ficheinter',1,'ficheinter_advance','validate','a',0,41,0),(70,'Dévalider les fiches d\'intervention','ficheinter',1,'ficheinter_advance','unvalidate','a',0,41,0),(71,'Read members\' card','adherent',1,'lire',NULL,'r',0,55,0),(72,'Create/modify members (need also user module permissions if member linked to a user)','adherent',1,'creer',NULL,'w',0,55,0),(74,'Remove members','adherent',1,'supprimer',NULL,'d',0,55,0),(75,'Setup types of membership','adherent',1,'configurer',NULL,'w',0,55,0),(76,'Export members','adherent',1,'export',NULL,'r',0,55,0),(78,'Read subscriptions','adherent',1,'cotisation','lire','r',0,55,0),(79,'Create/modify/remove subscriptions','adherent',1,'cotisation','creer','w',0,55,0),(81,'Read sales orders','commande',1,'lire',NULL,'r',0,11,0),(82,'Creeat/modify sales orders','commande',1,'creer',NULL,'w',0,11,0),(84,'Validate sales orders','commande',1,'order_advance','validate','d',0,11,0),(86,'Send sale orders by email','commande',1,'order_advance','send','d',0,11,0),(87,'Close sale orders','commande',1,'order_advance','close','d',0,11,0),(88,'Cancel sale orders','commande',1,'order_advance','annuler','d',0,11,0),(89,'Delete sales orders','commande',1,'supprimer',NULL,'d',0,11,0),(91,'Lire les charges','tax',1,'charges','lire','r',0,50,0),(91,'Lire les charges','tax',2,'charges','lire','r',1,50,0),(92,'Creer/modifier les charges','tax',1,'charges','creer','w',0,50,0),(92,'Creer/modifier les charges','tax',2,'charges','creer','w',0,50,0),(93,'Supprimer les charges','tax',1,'charges','supprimer','d',0,50,0),(93,'Supprimer les charges','tax',2,'charges','supprimer','d',0,50,0),(94,'Exporter les charges','tax',1,'charges','export','r',0,50,0),(94,'Exporter les charges','tax',2,'charges','export','r',0,50,0),(101,'Lire les expeditions','expedition',1,'lire',NULL,'r',0,40,0),(102,'Creer modifier les expeditions','expedition',1,'creer',NULL,'w',0,40,0),(104,'Valider les expeditions','expedition',1,'shipping_advance','validate','d',0,40,0),(105,'Envoyer les expeditions aux clients','expedition',1,'shipping_advance','send','d',0,40,0),(106,'Exporter les expeditions','expedition',1,'shipment','export','r',0,40,0),(109,'Supprimer les expeditions','expedition',1,'supprimer',NULL,'d',0,40,0),(111,'Read bank account and transactions','banque',1,'lire',NULL,'r',0,51,0),(111,'Lire les comptes bancaires','banque',2,'lire',NULL,'r',1,51,0),(112,'Creer/modifier montant/supprimer ecriture bancaire','banque',1,'modifier',NULL,'w',0,51,0),(112,'Creer/modifier montant/supprimer ecriture bancaire','banque',2,'modifier',NULL,'w',0,51,0),(113,'Configurer les comptes bancaires (creer, gerer categories)','banque',1,'configurer',NULL,'a',0,51,0),(113,'Configurer les comptes bancaires (creer, gerer categories)','banque',2,'configurer',NULL,'a',0,51,0),(114,'Rapprocher les ecritures bancaires','banque',1,'consolidate',NULL,'w',0,51,0),(114,'Rapprocher les ecritures bancaires','banque',2,'consolidate',NULL,'w',0,51,0),(115,'Exporter transactions et releves','banque',1,'export',NULL,'r',0,51,0),(115,'Exporter transactions et releves','banque',2,'export',NULL,'r',0,51,0),(116,'Virements entre comptes','banque',1,'transfer',NULL,'w',0,51,0),(116,'Virements entre comptes','banque',2,'transfer',NULL,'w',0,51,0),(117,'Gerer les envois de cheques','banque',1,'cheque',NULL,'w',0,51,0),(117,'Gerer les envois de cheques','banque',2,'cheque',NULL,'w',0,51,0),(121,'Read third parties','societe',1,'lire',NULL,'r',0,9,0),(121,'Lire les societes','societe',2,'lire',NULL,'r',1,9,0),(122,'Create and update third parties','societe',1,'creer',NULL,'w',0,9,0),(122,'Creer modifier les societes','societe',2,'creer',NULL,'w',0,9,0),(125,'Delete third parties','societe',1,'supprimer',NULL,'d',0,9,0),(125,'Supprimer les societes','societe',2,'supprimer',NULL,'d',0,9,0),(126,'Export third parties','societe',1,'export',NULL,'r',0,9,0),(126,'Exporter les societes','societe',2,'export',NULL,'r',0,9,0),(141,'Read all projects and tasks (also private projects I am not contact for)','projet',1,'all','lire','r',0,14,0),(142,'Create/modify all projects and tasks (also private projects I am not contact for)','projet',1,'all','creer','w',0,14,0),(144,'Delete all projects and tasks (also private projects I am not contact for)','projet',1,'all','supprimer','d',0,14,0),(151,'Read withdrawals','prelevement',1,'bons','lire','r',1,52,0),(152,'Create/modify a withdrawals','prelevement',1,'bons','creer','w',0,52,0),(153,'Send withdrawals to bank','prelevement',1,'bons','send','a',0,52,0),(154,'credit/refuse withdrawals','prelevement',1,'bons','credit','a',0,52,0),(161,'Lire les contrats','contrat',1,'lire',NULL,'r',1,35,0),(162,'Creer / modifier les contrats','contrat',1,'creer',NULL,'w',0,35,0),(163,'Activer un service d\'un contrat','contrat',1,'activer',NULL,'w',0,35,0),(164,'Desactiver un service d\'un contrat','contrat',1,'desactiver',NULL,'w',0,35,0),(165,'Supprimer un contrat','contrat',1,'supprimer',NULL,'d',0,35,0),(167,'Export contracts','contrat',1,'export',NULL,'r',0,35,0),(221,'Consulter les mailings','mailing',1,'lire',NULL,'r',1,11,0),(221,'Consulter les mailings','mailing',2,'lire',NULL,'r',1,11,0),(222,'Creer/modifier les mailings (sujet, destinataires...)','mailing',1,'creer',NULL,'w',0,11,0),(222,'Creer/modifier les mailings (sujet, destinataires...)','mailing',2,'creer',NULL,'w',0,11,0),(223,'Valider les mailings (permet leur envoi)','mailing',1,'valider',NULL,'w',0,11,0),(223,'Valider les mailings (permet leur envoi)','mailing',2,'valider',NULL,'w',0,11,0),(229,'Supprimer les mailings','mailing',1,'supprimer',NULL,'d',0,11,0),(229,'Supprimer les mailings','mailing',2,'supprimer',NULL,'d',0,11,0),(237,'View recipients and info','mailing',1,'mailing_advance','recipient','r',0,11,0),(237,'View recipients and info','mailing',2,'mailing_advance','recipient','r',0,11,0),(238,'Manually send mailings','mailing',1,'mailing_advance','send','w',0,11,0),(238,'Manually send mailings','mailing',2,'mailing_advance','send','w',0,11,0),(239,'Delete mailings after validation and/or sent','mailing',1,'mailing_advance','delete','d',0,11,0),(239,'Delete mailings after validation and/or sent','mailing',2,'mailing_advance','delete','d',0,11,0),(241,'Lire les categories','categorie',1,'lire',NULL,'r',1,20,0),(242,'Creer/modifier les categories','categorie',1,'creer',NULL,'w',0,20,0),(243,'Supprimer les categories','categorie',1,'supprimer',NULL,'d',0,20,0),(251,'Consulter les autres utilisateurs','user',1,'user','lire','r',0,5,0),(252,'Consulter les permissions des autres utilisateurs','user',1,'user_advance','readperms','r',0,5,0),(253,'Creer/modifier utilisateurs internes et externes','user',1,'user','creer','w',0,5,0),(254,'Creer/modifier utilisateurs externes seulement','user',1,'user_advance','write','w',0,5,0),(255,'Modifier le mot de passe des autres utilisateurs','user',1,'user','password','w',0,5,0),(256,'Supprimer ou desactiver les autres utilisateurs','user',1,'user','supprimer','d',0,5,0),(262,'Read all third parties (and their objects) by internal users (otherwise only if commercial contact). Not effective for external users (limited to themselves).','societe',1,'client','voir','r',0,9,0),(262,'Consulter tous les tiers par utilisateurs internes (sinon uniquement si contact commercial). Non effectif pour utilisateurs externes (tjs limités à eux-meme).','societe',2,'client','voir','r',1,9,0),(281,'Read contacts','societe',1,'contact','lire','r',0,9,0),(281,'Lire les contacts','societe',2,'contact','lire','r',1,9,0),(282,'Create and update contact','societe',1,'contact','creer','w',0,9,0),(282,'Creer modifier les contacts','societe',2,'contact','creer','w',0,9,0),(283,'Delete contacts','societe',1,'contact','supprimer','d',0,9,0),(283,'Supprimer les contacts','societe',2,'contact','supprimer','d',0,9,0),(286,'Export contacts','societe',1,'contact','export','d',0,9,0),(286,'Exporter les contacts','societe',2,'contact','export','d',0,9,0),(301,'Read barcodes','barcode',1,'lire_advance',NULL,'r',1,0,0),(302,'Create/modify barcodes','barcode',1,'creer_advance',NULL,'w',0,0,0),(331,'Lire les bookmarks','bookmark',1,'lire',NULL,'r',0,50,0),(332,'Creer/modifier les bookmarks','bookmark',1,'creer',NULL,'r',0,50,0),(333,'Supprimer les bookmarks','bookmark',1,'supprimer',NULL,'r',0,50,0),(341,'Consulter ses propres permissions','user',1,'self_advance','readperms','r',0,5,0),(342,'Creer/modifier ses propres infos utilisateur','user',1,'self','creer','w',0,5,0),(343,'Modifier son propre mot de passe','user',1,'self','password','w',0,5,0),(344,'Modifier ses propres permissions','user',1,'self_advance','writeperms','w',0,5,0),(351,'Consulter les groupes','user',1,'group_advance','read','r',0,5,0),(352,'Consulter les permissions des groupes','user',1,'group_advance','readperms','r',0,5,0),(353,'Creer/modifier les groupes et leurs permissions','user',1,'group_advance','write','w',0,5,0),(354,'Supprimer ou desactiver les groupes','user',1,'group_advance','delete','d',0,5,0),(358,'Exporter les utilisateurs','user',1,'user','export','r',0,5,0),(511,'Read payments of employee salaries (yours and your subordinates)','salaries',1,'read',NULL,'r',0,50,0),(512,'Create/modify payments of empoyee salaries','salaries',1,'write',NULL,'w',0,50,0),(514,'Delete payments of employee salary','salaries',1,'delete',NULL,'d',0,50,0),(517,'Read payments of salariests of every employee','salaries',1,'readall',NULL,'r',0,50,0),(519,'Export payments of employee salaries','salaries',1,'export',NULL,'r',0,50,0),(520,'Read loans','loan',1,'read',NULL,'r',0,50,0),(521,'Read loans','loan',1,'read',NULL,'r',0,50,0),(522,'Create/modify loans','loan',1,'write',NULL,'w',0,50,0),(524,'Delete loans','loan',1,'delete',NULL,'d',0,50,0),(525,'Access loan calculator','loan',1,'calc',NULL,'r',0,50,0),(527,'Export loans','loan',1,'export',NULL,'r',0,50,0),(531,'Read services','service',1,'lire',NULL,'r',0,29,0),(532,'Create/modify services','service',1,'creer',NULL,'w',0,29,0),(534,'Delete les services','service',1,'supprimer',NULL,'d',0,29,0),(538,'Export services','service',1,'export',NULL,'r',0,29,0),(561,'Read bank transfer payment orders','paymentbybanktransfer',1,'read',NULL,'r',0,52,0),(562,'Create/modify a bank transfer payment order','paymentbybanktransfer',1,'create',NULL,'w',0,52,0),(563,'Send/Transmit bank transfer payment order','paymentbybanktransfer',1,'send',NULL,'a',0,52,0),(564,'Record Debits/Rejects of bank transfer payment order','paymentbybanktransfer',1,'debit',NULL,'a',0,52,0),(651,'Read bom of Bom','bom',1,'read',NULL,'w',0,65,0),(652,'Create/Update bom of Bom','bom',1,'write',NULL,'w',0,65,0),(653,'Delete bom of Bom','bom',1,'delete',NULL,'w',0,65,0),(661,'Read Manufacturing Order','mrp',1,'read',NULL,'w',0,66,0),(662,'Create/Update Manufacturing Order','mrp',1,'write',NULL,'w',0,66,0),(663,'Delete Manufacturing Order','mrp',1,'delete',NULL,'w',0,66,0),(701,'Lire les dons','don',1,'lire',NULL,'r',1,50,0),(701,'Lire les dons','don',2,'lire',NULL,'r',1,50,0),(702,'Creer/modifier les dons','don',1,'creer',NULL,'w',0,50,0),(702,'Creer/modifier les dons','don',2,'creer',NULL,'w',0,50,0),(703,'Supprimer les dons','don',1,'supprimer',NULL,'d',0,50,0),(703,'Supprimer les dons','don',2,'supprimer',NULL,'d',0,50,0),(750,'Read job positions to fill and candidatures','recruitment',1,'recruitmentjobposition','read','w',0,44,0),(751,'Create/Update job positions to fill and candidatures','recruitment',1,'recruitmentjobposition','write','w',0,44,0),(752,'Delete Job positions to fill and candidatures','recruitment',1,'recruitmentjobposition','delete','w',0,44,0),(771,'Read expense reports (yours and your subordinates)','expensereport',1,'lire',NULL,'r',0,42,0),(772,'Create/modify expense reports','expensereport',1,'creer',NULL,'w',0,42,0),(773,'Delete expense reports','expensereport',1,'supprimer',NULL,'d',0,42,0),(775,'Approve expense reports','expensereport',1,'approve',NULL,'w',0,42,0),(776,'Pay expense reports','expensereport',1,'to_paid',NULL,'w',0,42,0),(777,'Read expense reports of everybody','expensereport',1,'readall',NULL,'r',0,42,0),(778,'Create expense reports for everybody','expensereport',1,'writeall_advance',NULL,'w',0,42,0),(779,'Export expense reports','expensereport',1,'export',NULL,'r',0,42,0),(1001,'Lire les stocks','stock',1,'lire',NULL,'r',1,40,0),(1002,'Creer/Modifier les stocks','stock',1,'creer',NULL,'w',0,40,0),(1003,'Supprimer les stocks','stock',1,'supprimer',NULL,'d',0,40,0),(1004,'Lire mouvements de stocks','stock',1,'mouvement','lire','r',1,40,0),(1005,'Creer/modifier mouvements de stocks','stock',1,'mouvement','creer','w',0,40,0),(1101,'Read delivery receipts','expedition',1,'delivery','lire','r',0,40,0),(1102,'Create/modify delivery receipts','expedition',1,'delivery','creer','w',0,40,0),(1104,'Validate delivery receipts','expedition',1,'delivery_advance','validate','d',0,40,0),(1109,'Delete delivery receipts','expedition',1,'delivery','supprimer','d',0,40,0),(1121,'Read supplier proposals','supplier_proposal',1,'lire',NULL,'w',0,35,0),(1122,'Create/modify supplier proposals','supplier_proposal',1,'creer',NULL,'w',0,35,0),(1123,'Validate supplier proposals','supplier_proposal',1,'validate_advance',NULL,'w',0,35,0),(1124,'Envoyer les demandes fournisseurs','supplier_proposal',1,'send_advance',NULL,'w',0,35,0),(1125,'Delete supplier proposals','supplier_proposal',1,'supprimer',NULL,'w',0,35,0),(1126,'Close supplier price requests','supplier_proposal',1,'cloturer',NULL,'w',0,35,0),(1181,'Consulter les fournisseurs','fournisseur',1,'lire',NULL,'r',0,12,0),(1182,'Consulter les commandes fournisseur','fournisseur',1,'commande','lire','r',0,12,0),(1183,'Creer une commande fournisseur','fournisseur',1,'commande','creer','w',0,12,0),(1184,'Valider une commande fournisseur','fournisseur',1,'supplier_order_advance','validate','w',0,12,0),(1185,'Approuver une commande fournisseur','fournisseur',1,'commande','approuver','w',0,12,0),(1186,'Commander une commande fournisseur','fournisseur',1,'commande','commander','w',0,12,0),(1187,'Receptionner une commande fournisseur','fournisseur',1,'commande','receptionner','d',0,12,0),(1188,'Supprimer une commande fournisseur','fournisseur',1,'commande','supprimer','d',0,12,0),(1189,'Check/Uncheck a supplier order reception','fournisseur',1,'commande_advance','check','w',0,12,0),(1191,'Exporter les commande fournisseurs, attributs','fournisseur',1,'commande','export','r',0,12,0),(1201,'Lire les exports','export',1,'lire',NULL,'r',1,72,0),(1202,'Creer/modifier un export','export',1,'creer',NULL,'w',0,72,0),(1231,'Consulter les factures fournisseur','fournisseur',1,'facture','lire','r',0,12,0),(1232,'Creer une facture fournisseur','fournisseur',1,'facture','creer','w',0,12,0),(1233,'Valider une facture fournisseur','fournisseur',1,'supplier_invoice_advance','validate','w',0,12,0),(1234,'Supprimer une facture fournisseur','fournisseur',1,'facture','supprimer','d',0,12,0),(1235,'Envoyer les factures par mail','fournisseur',1,'supplier_invoice_advance','send','a',0,12,0),(1236,'Exporter les factures fournisseurs, attributs et reglements','fournisseur',1,'facture','export','r',0,12,0),(1251,'Run mass imports of external data (data load)','import',1,'run',NULL,'r',0,70,0),(1321,'Export customer invoices, attributes and payments','facture',1,'facture','export','r',0,11,0),(1321,'Exporter les factures clients, attributs et reglements','facture',2,'facture','export','r',0,10,0),(1322,'Re-open a fully paid invoice','facture',1,'invoice_advance','reopen','r',0,11,0),(1421,'Export sales orders and attributes','commande',1,'commande','export','r',0,11,0),(2401,'Read actions/tasks linked to his account','agenda',1,'myactions','read','r',0,15,0),(2401,'Read actions/tasks linked to his account','agenda',2,'myactions','read','r',1,15,0),(2402,'Create/modify actions/tasks linked to his account','agenda',1,'myactions','create','w',0,15,0),(2402,'Create/modify actions/tasks linked to his account','agenda',2,'myactions','create','w',0,15,0),(2403,'Delete actions/tasks linked to his account','agenda',1,'myactions','delete','w',0,15,0),(2403,'Delete actions/tasks linked to his account','agenda',2,'myactions','delete','w',0,15,0),(2411,'Read actions/tasks of others','agenda',1,'allactions','read','r',0,15,0),(2411,'Read actions/tasks of others','agenda',2,'allactions','read','r',0,15,0),(2412,'Create/modify actions/tasks of others','agenda',1,'allactions','create','w',0,15,0),(2412,'Create/modify actions/tasks of others','agenda',2,'allactions','create','w',0,15,0),(2413,'Delete actions/tasks of others','agenda',1,'allactions','delete','w',0,15,0),(2413,'Delete actions/tasks of others','agenda',2,'allactions','delete','w',0,15,0),(2414,'Export actions/tasks of others','agenda',1,'export',NULL,'w',0,15,0),(2501,'Read or download documents','ecm',1,'read',NULL,'r',0,10,0),(2503,'Upload a document','ecm',1,'upload',NULL,'w',0,10,0),(2515,'Administer directories of documents','ecm',1,'setup',NULL,'w',0,10,0),(3200,'Read archived events and fingerprints','blockedlog',1,'read',NULL,'w',0,76,0),(3201,'Read archived events and fingerprints','blockedlog',1,'read',NULL,'w',0,76,0),(10001,'Read website content','website',1,'read',NULL,'w',0,50,0),(10002,'Create/modify website content (html and javascript content)','website',1,'write',NULL,'w',0,50,0),(10003,'Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.','website',1,'writephp',NULL,'w',0,50,0),(10005,'Delete website content','website',1,'delete',NULL,'w',0,50,0),(10008,'Export website content','website',1,'export',NULL,'w',0,50,0),(20001,'Read leave requests (yours and your subordinates)','holiday',1,'read',NULL,'w',0,42,0),(20001,'Créer / Modifier / Lire ses demandes de congés payés','holiday',2,'write',NULL,'w',1,42,0),(20002,'Create/modify leave requests','holiday',1,'write',NULL,'w',0,42,0),(20003,'Delete leave requests','holiday',1,'delete',NULL,'w',0,42,0),(20003,'Supprimer des demandes de congés payés','holiday',2,'delete',NULL,'w',0,42,0),(20004,'Read leave requests for everybody','holiday',1,'readall',NULL,'w',0,42,0),(20004,'Définir les congés payés des utilisateurs','holiday',2,'define_holiday',NULL,'w',0,42,0),(20005,'Create/modify leave requests for everybody','holiday',1,'writeall_advance',NULL,'w',0,42,0),(20005,'Voir les logs de modification des congés payés','holiday',2,'view_log',NULL,'w',0,42,0),(20006,'Setup leave requests of users (setup and update balance)','holiday',1,'define_holiday',NULL,'w',0,42,0),(20006,'Accéder au rapport mensuel des congés payés','holiday',2,'month_report',NULL,'w',0,42,0),(20007,'Approve leave requests','holiday',1,'approve',NULL,'w',0,42,0),(23001,'Read cron jobs','cron',1,'read',NULL,'w',0,50,0),(23002,'Create cron Jobs','cron',1,'create',NULL,'w',0,50,0),(23003,'Delete cron Jobs','cron',1,'delete',NULL,'w',0,50,0),(23004,'Execute cron Jobs','cron',1,'execute',NULL,'w',0,50,0),(50151,'Use Point Of Sale','takepos',1,'run',NULL,'a',0,60,0),(50401,'Bind products and invoices with accounting accounts','accounting',1,'bind','write','r',0,61,0),(50411,'Read operations in General Ledger','accounting',1,'mouvements','lire','r',0,61,0),(50412,'Write/Edit operations in General Ledger','accounting',1,'mouvements','creer','w',0,61,0),(50414,'Delete operations in Ledger','accounting',1,'mouvements','supprimer','d',0,61,0),(50415,'Delete all operations by year and journal in Ledger','accounting',1,'mouvements','supprimer_tous','d',0,61,0),(50418,'Export operations of the Ledger','accounting',1,'mouvements','export','r',0,61,0),(50420,'Report and export reports (turnover, balance, journals, general ledger)','accounting',1,'comptarapport','lire','r',0,61,0),(50430,'Define and close a fiscal year','accounting',1,'fiscalyear','write','r',0,61,0),(50440,'Manage chart of accounts, setup of accountancy','accounting',1,'chartofaccount',NULL,'r',0,61,0),(55001,'Read surveys','opensurvey',1,'read',NULL,'r',0,40,0),(55002,'Create/modify surveys','opensurvey',1,'write',NULL,'w',0,40,0),(56001,'Read ticket','ticket',1,'read',NULL,'r',0,60,0),(56002,'Create les tickets','ticket',1,'write',NULL,'w',0,60,0),(56003,'Delete les tickets','ticket',1,'delete',NULL,'d',0,60,0),(56004,'Manage tickets','ticket',1,'manage',NULL,'w',0,60,0),(59001,'Visualiser les marges','margins',1,'liretous',NULL,'r',0,55,0),(59002,'Définir les marges','margins',1,'creer',NULL,'w',0,55,0),(59003,'Read every user margin','margins',1,'read','all','r',0,55,0),(63001,'Read resources','resource',1,'read',NULL,'w',0,16,0),(63002,'Create/Modify resources','resource',1,'write',NULL,'w',0,16,0),(63003,'Delete resources','resource',1,'delete',NULL,'w',0,16,0),(63004,'Link resources to agenda events','resource',1,'link',NULL,'w',0,16,0),(64001,'DirectPrint','printing',1,'read',NULL,'r',0,52,0),(101250,'Read surveys','opensurvey',2,'survey','read','r',0,40,0),(101251,'Create/modify surveys','opensurvey',2,'survey','write','w',0,40,0),(941601,'Lire les receptions','reception',1,'lire',NULL,'r',0,40,0),(941602,'Creer modifier les receptions','reception',1,'creer',NULL,'w',0,40,0),(941603,'Valider les receptions','reception',1,'reception_advance','validate','d',0,40,0),(941604,'Envoyer les receptions aux clients','reception',1,'reception_advance','send','d',0,40,0),(941605,'Exporter les receptions','reception',1,'reception','export','r',0,40,0),(941606,'Supprimer les receptions','reception',1,'supprimer',NULL,'d',0,40,0);
+INSERT INTO `llx_rights_def` VALUES (11,'Read invoices','facture',1,'lire',NULL,'a',0,0,0),(11,'Lire les factures','facture',2,'lire',NULL,'a',1,10,0),(12,'Create and update invoices','facture',1,'creer',NULL,'a',0,0,0),(12,'Creer/modifier les factures','facture',2,'creer',NULL,'a',0,10,0),(13,'Devalidate invoices','facture',1,'invoice_advance','unvalidate','a',0,0,0),(13,'Dévalider les factures','facture',2,'invoice_advance','unvalidate','a',0,10,0),(14,'Validate invoices','facture',1,'invoice_advance','validate','a',0,0,0),(14,'Valider les factures','facture',2,'valider',NULL,'a',0,10,0),(15,'Send invoices by email','facture',1,'invoice_advance','send','a',0,0,0),(15,'Envoyer les factures par mail','facture',2,'invoice_advance','send','a',0,10,0),(16,'Issue payments on invoices','facture',1,'paiement',NULL,'a',0,0,0),(16,'Emettre des paiements sur les factures','facture',2,'paiement',NULL,'a',0,10,0),(19,'Delete invoices','facture',1,'supprimer',NULL,'a',0,0,0),(19,'Supprimer les factures','facture',2,'supprimer',NULL,'a',0,10,0),(21,'Lire les propositions commerciales','propale',1,'lire',NULL,'r',1,22,0),(21,'Lire les propositions commerciales','propale',2,'lire',NULL,'r',1,22,0),(22,'Creer/modifier les propositions commerciales','propale',1,'creer',NULL,'w',0,22,0),(22,'Creer/modifier les propositions commerciales','propale',2,'creer',NULL,'w',0,22,0),(24,'Valider les propositions commerciales','propale',1,'propal_advance','validate','d',0,22,0),(24,'Valider les propositions commerciales','propale',2,'valider',NULL,'d',0,22,0),(25,'Envoyer les propositions commerciales aux clients','propale',1,'propal_advance','send','d',0,22,0),(25,'Envoyer les propositions commerciales aux clients','propale',2,'propal_advance','send','d',0,22,0),(26,'Cloturer les propositions commerciales','propale',1,'propal_advance','close','d',0,22,0),(26,'Cloturer les propositions commerciales','propale',2,'propal_advance','close','d',0,22,0),(27,'Supprimer les propositions commerciales','propale',1,'supprimer',NULL,'d',0,22,0),(27,'Supprimer les propositions commerciales','propale',2,'supprimer',NULL,'d',0,22,0),(28,'Exporter les propositions commerciales et attributs','propale',1,'export',NULL,'r',0,22,0),(28,'Exporter les propositions commerciales et attributs','propale',2,'export',NULL,'r',0,22,0),(31,'Lire les produits','produit',1,'lire',NULL,'r',1,25,0),(31,'Lire les produits','produit',2,'lire',NULL,'r',1,25,0),(32,'Creer/modifier les produits','produit',1,'creer',NULL,'w',0,25,0),(32,'Creer/modifier les produits','produit',2,'creer',NULL,'w',0,25,0),(34,'Supprimer les produits','produit',1,'supprimer',NULL,'d',0,25,0),(34,'Supprimer les produits','produit',2,'supprimer',NULL,'d',0,25,0),(38,'Exporter les produits','produit',1,'export',NULL,'r',0,25,0),(38,'Exporter les produits','produit',2,'export',NULL,'r',0,25,0),(39,'Ignore minimum price','produit',1,'ignore_price_min_advance',NULL,'r',0,25,0),(41,'Read projects and tasks (shared projects or projects I am contact for). Can also enter time consumed on assigned tasks (timesheet)','projet',1,'lire',NULL,'r',1,14,0),(42,'Create/modify projects and tasks (shared projects or projects I am contact for)','projet',1,'creer',NULL,'w',0,14,0),(44,'Delete project and tasks (shared projects or projects I am contact for)','projet',1,'supprimer',NULL,'d',0,14,0),(45,'Export projects','projet',1,'export',NULL,'d',0,14,0),(61,'Lire les fiches d\'intervention','ficheinter',1,'lire',NULL,'r',1,41,0),(62,'Creer/modifier les fiches d\'intervention','ficheinter',1,'creer',NULL,'w',0,41,0),(64,'Supprimer les fiches d\'intervention','ficheinter',1,'supprimer',NULL,'d',0,41,0),(67,'Exporter les fiches interventions','ficheinter',1,'export',NULL,'r',0,41,0),(68,'Envoyer les fiches d\'intervention par courriel','ficheinter',1,'ficheinter_advance','send','r',0,41,0),(69,'Valider les fiches d\'intervention ','ficheinter',1,'ficheinter_advance','validate','a',0,41,0),(70,'Dévalider les fiches d\'intervention','ficheinter',1,'ficheinter_advance','unvalidate','a',0,41,0),(71,'Read members\' card','adherent',1,'lire',NULL,'r',0,55,0),(72,'Create/modify members (need also user module permissions if member linked to a user)','adherent',1,'creer',NULL,'w',0,55,0),(74,'Remove members','adherent',1,'supprimer',NULL,'d',0,55,0),(75,'Setup types of membership','adherent',1,'configurer',NULL,'w',0,55,0),(76,'Export members','adherent',1,'export',NULL,'r',0,55,0),(78,'Read subscriptions','adherent',1,'cotisation','lire','r',0,55,0),(79,'Create/modify/remove subscriptions','adherent',1,'cotisation','creer','w',0,55,0),(81,'Read sales orders','commande',1,'lire',NULL,'r',0,0,0),(82,'Creeat/modify sales orders','commande',1,'creer',NULL,'w',0,0,0),(84,'Validate sales orders','commande',1,'order_advance','validate','d',0,0,0),(86,'Send sale orders by email','commande',1,'order_advance','send','d',0,0,0),(87,'Close sale orders','commande',1,'order_advance','close','d',0,0,0),(88,'Cancel sale orders','commande',1,'order_advance','annuler','d',0,0,0),(89,'Delete sales orders','commande',1,'supprimer',NULL,'d',0,0,0),(91,'Lire les charges','tax',1,'charges','lire','r',0,50,0),(91,'Lire les charges','tax',2,'charges','lire','r',1,50,0),(92,'Creer/modifier les charges','tax',1,'charges','creer','w',0,50,0),(92,'Creer/modifier les charges','tax',2,'charges','creer','w',0,50,0),(93,'Supprimer les charges','tax',1,'charges','supprimer','d',0,50,0),(93,'Supprimer les charges','tax',2,'charges','supprimer','d',0,50,0),(94,'Exporter les charges','tax',1,'charges','export','r',0,50,0),(94,'Exporter les charges','tax',2,'charges','export','r',0,50,0),(101,'Lire les expeditions','expedition',1,'lire',NULL,'r',0,40,0),(102,'Creer modifier les expeditions','expedition',1,'creer',NULL,'w',0,40,0),(104,'Valider les expeditions','expedition',1,'shipping_advance','validate','d',0,40,0),(105,'Envoyer les expeditions aux clients','expedition',1,'shipping_advance','send','d',0,40,0),(106,'Exporter les expeditions','expedition',1,'shipment','export','r',0,40,0),(109,'Supprimer les expeditions','expedition',1,'supprimer',NULL,'d',0,40,0),(111,'Read bank account and transactions','banque',1,'lire',NULL,'r',0,0,0),(111,'Lire les comptes bancaires','banque',2,'lire',NULL,'r',1,51,0),(112,'Creer/modifier montant/supprimer ecriture bancaire','banque',1,'modifier',NULL,'w',0,0,0),(112,'Creer/modifier montant/supprimer ecriture bancaire','banque',2,'modifier',NULL,'w',0,51,0),(113,'Configurer les comptes bancaires (creer, gerer categories)','banque',1,'configurer',NULL,'a',0,0,0),(113,'Configurer les comptes bancaires (creer, gerer categories)','banque',2,'configurer',NULL,'a',0,51,0),(114,'Rapprocher les ecritures bancaires','banque',1,'consolidate',NULL,'w',0,0,0),(114,'Rapprocher les ecritures bancaires','banque',2,'consolidate',NULL,'w',0,51,0),(115,'Exporter transactions et releves','banque',1,'export',NULL,'r',0,0,0),(115,'Exporter transactions et releves','banque',2,'export',NULL,'r',0,51,0),(116,'Virements entre comptes','banque',1,'transfer',NULL,'w',0,0,0),(116,'Virements entre comptes','banque',2,'transfer',NULL,'w',0,51,0),(117,'Gerer les envois de cheques','banque',1,'cheque',NULL,'w',0,0,0),(117,'Gerer les envois de cheques','banque',2,'cheque',NULL,'w',0,51,0),(121,'Read third parties','societe',1,'lire',NULL,'r',0,0,0),(121,'Lire les societes','societe',2,'lire',NULL,'r',1,9,0),(122,'Create and update third parties','societe',1,'creer',NULL,'w',0,0,0),(122,'Creer modifier les societes','societe',2,'creer',NULL,'w',0,9,0),(125,'Delete third parties','societe',1,'supprimer',NULL,'d',0,0,0),(125,'Supprimer les societes','societe',2,'supprimer',NULL,'d',0,9,0),(126,'Export third parties','societe',1,'export',NULL,'r',0,0,0),(126,'Exporter les societes','societe',2,'export',NULL,'r',0,9,0),(141,'Read all projects and tasks (also private projects I am not contact for)','projet',1,'all','lire','r',0,14,0),(142,'Create/modify all projects and tasks (also private projects I am not contact for)','projet',1,'all','creer','w',0,14,0),(144,'Delete all projects and tasks (also private projects I am not contact for)','projet',1,'all','supprimer','d',0,14,0),(151,'Read withdrawals','prelevement',1,'bons','lire','r',1,52,0),(152,'Create/modify a withdrawals','prelevement',1,'bons','creer','w',0,52,0),(153,'Send withdrawals to bank','prelevement',1,'bons','send','a',0,52,0),(154,'credit/refuse withdrawals','prelevement',1,'bons','credit','a',0,52,0),(161,'Lire les contrats','contrat',1,'lire',NULL,'r',1,35,0),(162,'Creer / modifier les contrats','contrat',1,'creer',NULL,'w',0,35,0),(163,'Activer un service d\'un contrat','contrat',1,'activer',NULL,'w',0,35,0),(164,'Desactiver un service d\'un contrat','contrat',1,'desactiver',NULL,'w',0,35,0),(165,'Supprimer un contrat','contrat',1,'supprimer',NULL,'d',0,35,0),(167,'Export contracts','contrat',1,'export',NULL,'r',0,35,0),(221,'Consulter les mailings','mailing',1,'lire',NULL,'r',1,11,0),(221,'Consulter les mailings','mailing',2,'lire',NULL,'r',1,11,0),(222,'Creer/modifier les mailings (sujet, destinataires...)','mailing',1,'creer',NULL,'w',0,11,0),(222,'Creer/modifier les mailings (sujet, destinataires...)','mailing',2,'creer',NULL,'w',0,11,0),(223,'Valider les mailings (permet leur envoi)','mailing',1,'valider',NULL,'w',0,11,0),(223,'Valider les mailings (permet leur envoi)','mailing',2,'valider',NULL,'w',0,11,0),(229,'Supprimer les mailings','mailing',1,'supprimer',NULL,'d',0,11,0),(229,'Supprimer les mailings','mailing',2,'supprimer',NULL,'d',0,11,0),(237,'View recipients and info','mailing',1,'mailing_advance','recipient','r',0,11,0),(237,'View recipients and info','mailing',2,'mailing_advance','recipient','r',0,11,0),(238,'Manually send mailings','mailing',1,'mailing_advance','send','w',0,11,0),(238,'Manually send mailings','mailing',2,'mailing_advance','send','w',0,11,0),(239,'Delete mailings after validation and/or sent','mailing',1,'mailing_advance','delete','d',0,11,0),(239,'Delete mailings after validation and/or sent','mailing',2,'mailing_advance','delete','d',0,11,0),(241,'Lire les categories','categorie',1,'lire',NULL,'r',1,20,0),(242,'Creer/modifier les categories','categorie',1,'creer',NULL,'w',0,20,0),(243,'Supprimer les categories','categorie',1,'supprimer',NULL,'d',0,20,0),(251,'Consulter les autres utilisateurs','user',1,'user','lire','r',0,0,0),(252,'Consulter les permissions des autres utilisateurs','user',1,'user_advance','readperms','r',0,0,0),(253,'Creer/modifier utilisateurs internes et externes','user',1,'user','creer','w',0,0,0),(254,'Creer/modifier utilisateurs externes seulement','user',1,'user_advance','write','w',0,0,0),(255,'Modifier le mot de passe des autres utilisateurs','user',1,'user','password','w',0,0,0),(256,'Supprimer ou desactiver les autres utilisateurs','user',1,'user','supprimer','d',0,0,0),(262,'Read all third parties (and their objects) by internal users (otherwise only if commercial contact). Not effective for external users (limited to themselves).','societe',1,'client','voir','r',0,0,0),(262,'Consulter tous les tiers par utilisateurs internes (sinon uniquement si contact commercial). Non effectif pour utilisateurs externes (tjs limités à eux-meme).','societe',2,'client','voir','r',1,9,0),(281,'Read contacts','societe',1,'contact','lire','r',0,0,0),(281,'Lire les contacts','societe',2,'contact','lire','r',1,9,0),(282,'Create and update contact','societe',1,'contact','creer','w',0,0,0),(282,'Creer modifier les contacts','societe',2,'contact','creer','w',0,9,0),(283,'Delete contacts','societe',1,'contact','supprimer','d',0,0,0),(283,'Supprimer les contacts','societe',2,'contact','supprimer','d',0,9,0),(286,'Export contacts','societe',1,'contact','export','d',0,0,0),(286,'Exporter les contacts','societe',2,'contact','export','d',0,9,0),(301,'Read barcodes','barcode',1,'lire_advance',NULL,'r',1,0,0),(302,'Create/modify barcodes','barcode',1,'creer_advance',NULL,'w',0,0,0),(331,'Lire les bookmarks','bookmark',1,'lire',NULL,'r',0,50,0),(332,'Creer/modifier les bookmarks','bookmark',1,'creer',NULL,'r',0,50,0),(333,'Supprimer les bookmarks','bookmark',1,'supprimer',NULL,'r',0,50,0),(341,'Consulter ses propres permissions','user',1,'self_advance','readperms','r',0,0,0),(342,'Creer/modifier ses propres infos utilisateur','user',1,'self','creer','w',0,0,0),(343,'Modifier son propre mot de passe','user',1,'self','password','w',0,0,0),(344,'Modifier ses propres permissions','user',1,'self_advance','writeperms','w',0,0,0),(351,'Consulter les groupes','user',1,'group_advance','read','r',0,0,0),(352,'Consulter les permissions des groupes','user',1,'group_advance','readperms','r',0,0,0),(353,'Creer/modifier les groupes et leurs permissions','user',1,'group_advance','write','w',0,0,0),(354,'Supprimer ou desactiver les groupes','user',1,'group_advance','delete','d',0,0,0),(358,'Exporter les utilisateurs','user',1,'user','export','r',0,0,0),(511,'Read employee salaries and payments (yours and your subordinates)','salaries',1,'read',NULL,'r',0,0,0),(512,'Create/modify payments of empoyee salaries','salaries',1,'write',NULL,'w',0,0,0),(514,'Delete payments of employee salary','salaries',1,'delete',NULL,'d',0,0,0),(517,'Read salaries and payments of all employees','salaries',1,'readall',NULL,'r',0,0,0),(519,'Export payments of employee salaries','salaries',1,'export',NULL,'r',0,0,0),(520,'Read loans','loan',1,'read',NULL,'r',0,50,0),(521,'Read loans','loan',1,'read',NULL,'r',0,50,0),(522,'Create/modify loans','loan',1,'write',NULL,'w',0,50,0),(524,'Delete loans','loan',1,'delete',NULL,'d',0,50,0),(525,'Access loan calculator','loan',1,'calc',NULL,'r',0,50,0),(527,'Export loans','loan',1,'export',NULL,'r',0,50,0),(531,'Read services','service',1,'lire',NULL,'r',0,0,0),(532,'Create/modify services','service',1,'creer',NULL,'w',0,0,0),(534,'Delete les services','service',1,'supprimer',NULL,'d',0,0,0),(538,'Export services','service',1,'export',NULL,'r',0,0,0),(561,'Read bank transfer payment orders','paymentbybanktransfer',1,'read',NULL,'r',0,52,0),(562,'Create/modify a bank transfer payment order','paymentbybanktransfer',1,'create',NULL,'w',0,52,0),(563,'Send/Transmit bank transfer payment order','paymentbybanktransfer',1,'send',NULL,'a',0,52,0),(564,'Record Debits/Rejects of bank transfer payment order','paymentbybanktransfer',1,'debit',NULL,'a',0,52,0),(651,'Read bom of Bom','bom',1,'read',NULL,'w',0,0,0),(652,'Create/Update bom of Bom','bom',1,'write',NULL,'w',0,0,0),(653,'Delete bom of Bom','bom',1,'delete',NULL,'w',0,0,0),(661,'Read Manufacturing Order','mrp',1,'read',NULL,'w',0,0,0),(662,'Create/Update Manufacturing Order','mrp',1,'write',NULL,'w',0,0,0),(663,'Delete Manufacturing Order','mrp',1,'delete',NULL,'w',0,0,0),(701,'Lire les dons','don',1,'lire',NULL,'r',1,50,0),(701,'Lire les dons','don',2,'lire',NULL,'r',1,50,0),(702,'Creer/modifier les dons','don',1,'creer',NULL,'w',0,50,0),(702,'Creer/modifier les dons','don',2,'creer',NULL,'w',0,50,0),(703,'Supprimer les dons','don',1,'supprimer',NULL,'d',0,50,0),(703,'Supprimer les dons','don',2,'supprimer',NULL,'d',0,50,0),(750,'Read job positions to fill and candidatures','recruitment',1,'recruitmentjobposition','read','w',0,0,0),(751,'Create/Update job positions to fill and candidatures','recruitment',1,'recruitmentjobposition','write','w',0,0,0),(752,'Delete Job positions to fill and candidatures','recruitment',1,'recruitmentjobposition','delete','w',0,0,0),(771,'Read expense reports (yours and your subordinates)','expensereport',1,'lire',NULL,'r',0,0,0),(772,'Create/modify expense reports','expensereport',1,'creer',NULL,'w',0,0,0),(773,'Delete expense reports','expensereport',1,'supprimer',NULL,'d',0,0,0),(775,'Approve expense reports','expensereport',1,'approve',NULL,'w',0,0,0),(776,'Pay expense reports','expensereport',1,'to_paid',NULL,'w',0,0,0),(777,'Read expense reports of everybody','expensereport',1,'readall',NULL,'r',0,0,0),(778,'Create expense reports for everybody','expensereport',1,'writeall_advance',NULL,'w',0,0,0),(779,'Export expense reports','expensereport',1,'export',NULL,'r',0,0,0),(1001,'Lire les stocks','stock',1,'lire',NULL,'r',1,40,0),(1002,'Creer/Modifier les stocks','stock',1,'creer',NULL,'w',0,40,0),(1003,'Supprimer les stocks','stock',1,'supprimer',NULL,'d',0,40,0),(1004,'Lire mouvements de stocks','stock',1,'mouvement','lire','r',1,40,0),(1005,'Creer/modifier mouvements de stocks','stock',1,'mouvement','creer','w',0,40,0),(1101,'Read delivery receipts','expedition',1,'delivery','lire','r',0,40,0),(1102,'Create/modify delivery receipts','expedition',1,'delivery','creer','w',0,40,0),(1104,'Validate delivery receipts','expedition',1,'delivery_advance','validate','d',0,40,0),(1109,'Delete delivery receipts','expedition',1,'delivery','supprimer','d',0,40,0),(1121,'Read supplier proposals','supplier_proposal',1,'lire',NULL,'w',0,35,0),(1122,'Create/modify supplier proposals','supplier_proposal',1,'creer',NULL,'w',0,35,0),(1123,'Validate supplier proposals','supplier_proposal',1,'validate_advance',NULL,'w',0,35,0),(1124,'Envoyer les demandes fournisseurs','supplier_proposal',1,'send_advance',NULL,'w',0,35,0),(1125,'Delete supplier proposals','supplier_proposal',1,'supprimer',NULL,'w',0,35,0),(1126,'Close supplier price requests','supplier_proposal',1,'cloturer',NULL,'w',0,35,0),(1181,'Consulter les fournisseurs','fournisseur',1,'lire',NULL,'r',0,0,0),(1182,'Consulter les commandes fournisseur','fournisseur',1,'commande','lire','r',0,0,0),(1183,'Creer une commande fournisseur','fournisseur',1,'commande','creer','w',0,0,0),(1184,'Valider une commande fournisseur','fournisseur',1,'supplier_order_advance','validate','w',0,0,0),(1185,'Approuver une commande fournisseur','fournisseur',1,'commande','approuver','w',0,0,0),(1186,'Commander une commande fournisseur','fournisseur',1,'commande','commander','w',0,0,0),(1187,'Receptionner une commande fournisseur','fournisseur',1,'commande','receptionner','d',0,0,0),(1188,'Supprimer une commande fournisseur','fournisseur',1,'commande','supprimer','d',0,0,0),(1189,'Check/Uncheck a supplier order reception','fournisseur',1,'commande_advance','check','w',0,0,0),(1191,'Exporter les commande fournisseurs, attributs','fournisseur',1,'commande','export','r',0,0,0),(1201,'Lire les exports','export',1,'lire',NULL,'r',1,72,0),(1202,'Creer/modifier un export','export',1,'creer',NULL,'w',0,72,0),(1231,'Consulter les factures fournisseur','fournisseur',1,'facture','lire','r',0,0,0),(1232,'Creer une facture fournisseur','fournisseur',1,'facture','creer','w',0,0,0),(1233,'Valider une facture fournisseur','fournisseur',1,'supplier_invoice_advance','validate','w',0,0,0),(1234,'Supprimer une facture fournisseur','fournisseur',1,'facture','supprimer','d',0,0,0),(1235,'Envoyer les factures par mail','fournisseur',1,'supplier_invoice_advance','send','a',0,0,0),(1236,'Exporter les factures fournisseurs, attributs et reglements','fournisseur',1,'facture','export','r',0,0,0),(1251,'Run mass imports of external data (data load)','import',1,'run',NULL,'r',0,70,0),(1321,'Export customer invoices, attributes and payments','facture',1,'facture','export','r',0,0,0),(1321,'Exporter les factures clients, attributs et reglements','facture',2,'facture','export','r',0,10,0),(1322,'Re-open a fully paid invoice','facture',1,'invoice_advance','reopen','r',0,0,0),(1421,'Export sales orders and attributes','commande',1,'commande','export','r',0,0,0),(2401,'Read actions/tasks linked to his account','agenda',1,'myactions','read','r',0,0,0),(2401,'Read actions/tasks linked to his account','agenda',2,'myactions','read','r',1,15,0),(2402,'Create/modify actions/tasks linked to his account','agenda',1,'myactions','create','w',0,0,0),(2402,'Create/modify actions/tasks linked to his account','agenda',2,'myactions','create','w',0,15,0),(2403,'Delete actions/tasks linked to his account','agenda',1,'myactions','delete','w',0,0,0),(2403,'Delete actions/tasks linked to his account','agenda',2,'myactions','delete','w',0,15,0),(2411,'Read actions/tasks of others','agenda',1,'allactions','read','r',0,0,0),(2411,'Read actions/tasks of others','agenda',2,'allactions','read','r',0,15,0),(2412,'Create/modify actions/tasks of others','agenda',1,'allactions','create','w',0,0,0),(2412,'Create/modify actions/tasks of others','agenda',2,'allactions','create','w',0,15,0),(2413,'Delete actions/tasks of others','agenda',1,'allactions','delete','w',0,0,0),(2413,'Delete actions/tasks of others','agenda',2,'allactions','delete','w',0,15,0),(2414,'Export actions/tasks of others','agenda',1,'export',NULL,'w',0,0,0),(2501,'Read or download documents','ecm',1,'read',NULL,'r',0,0,0),(2503,'Upload a document','ecm',1,'upload',NULL,'w',0,0,0),(2515,'Administer directories of documents','ecm',1,'setup',NULL,'w',0,0,0),(3200,'Read archived events and fingerprints','blockedlog',1,'read',NULL,'w',0,76,0),(3201,'Read archived events and fingerprints','blockedlog',1,'read',NULL,'w',0,76,0),(10001,'Read website content','website',1,'read',NULL,'w',0,0,0),(10002,'Create/modify website content (html and javascript content)','website',1,'write',NULL,'w',0,0,0),(10003,'Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.','website',1,'writephp',NULL,'w',0,0,0),(10005,'Delete website content','website',1,'delete',NULL,'w',0,0,0),(10008,'Export website content','website',1,'export',NULL,'w',0,0,0),(20001,'Read leave requests (yours and your subordinates)','holiday',1,'read',NULL,'w',0,0,0),(20001,'Créer / Modifier / Lire ses demandes de congés payés','holiday',2,'write',NULL,'w',1,42,0),(20002,'Create/modify leave requests','holiday',1,'write',NULL,'w',0,0,0),(20003,'Delete leave requests','holiday',1,'delete',NULL,'w',0,0,0),(20003,'Supprimer des demandes de congés payés','holiday',2,'delete',NULL,'w',0,42,0),(20004,'Read leave requests for everybody','holiday',1,'readall',NULL,'w',0,0,0),(20004,'Définir les congés payés des utilisateurs','holiday',2,'define_holiday',NULL,'w',0,42,0),(20005,'Create/modify leave requests for everybody','holiday',1,'writeall_advance',NULL,'w',0,0,0),(20005,'Voir les logs de modification des congés payés','holiday',2,'view_log',NULL,'w',0,42,0),(20006,'Setup leave requests of users (setup and update balance)','holiday',1,'define_holiday',NULL,'w',0,0,0),(20006,'Accéder au rapport mensuel des congés payés','holiday',2,'month_report',NULL,'w',0,42,0),(20007,'Approve leave requests','holiday',1,'approve',NULL,'w',0,0,0),(23001,'Read cron jobs','cron',1,'read',NULL,'w',0,0,0),(23002,'Create cron Jobs','cron',1,'create',NULL,'w',0,0,0),(23003,'Delete cron Jobs','cron',1,'delete',NULL,'w',0,0,0),(23004,'Execute cron Jobs','cron',1,'execute',NULL,'w',0,0,0),(50151,'Use Point Of Sale (record a sale, add products, record payment)','takepos',1,'run',NULL,'a',0,0,0),(50152,'Can modify added sales lines (prices, discount)','takepos',1,'editlines',NULL,'a',0,0,0),(50153,'Edit ordered sales lines (useful only when option \"Order printers\" has been enabled). Allow to edit sales lines even after the order has been printed','takepos',1,'editorderedlines',NULL,'a',0,0,0),(50401,'Bind products and invoices with accounting accounts','accounting',1,'bind','write','r',0,61,0),(50411,'Read operations in General Ledger','accounting',1,'mouvements','lire','r',0,61,0),(50412,'Write/Edit operations in General Ledger','accounting',1,'mouvements','creer','w',0,61,0),(50414,'Delete operations in Ledger','accounting',1,'mouvements','supprimer','d',0,61,0),(50415,'Delete all operations by year and journal in Ledger','accounting',1,'mouvements','supprimer_tous','d',0,61,0),(50418,'Export operations of the Ledger','accounting',1,'mouvements','export','r',0,61,0),(50420,'Report and export reports (turnover, balance, journals, general ledger)','accounting',1,'comptarapport','lire','r',0,61,0),(50430,'Define and close a fiscal year','accounting',1,'fiscalyear','write','r',0,61,0),(50440,'Manage chart of accounts, setup of accountancy','accounting',1,'chartofaccount',NULL,'r',0,61,0),(55001,'Read surveys','opensurvey',1,'read',NULL,'r',0,0,0),(55002,'Create/modify surveys','opensurvey',1,'write',NULL,'w',0,0,0),(56001,'Read ticket','ticket',1,'read',NULL,'r',0,0,0),(56002,'Create les tickets','ticket',1,'write',NULL,'w',0,0,0),(56003,'Delete les tickets','ticket',1,'delete',NULL,'d',0,0,0),(56004,'Manage tickets','ticket',1,'manage',NULL,'w',0,0,0),(59001,'Visualiser les marges','margins',1,'liretous',NULL,'r',0,55,0),(59002,'Définir les marges','margins',1,'creer',NULL,'w',0,55,0),(59003,'Read every user margin','margins',1,'read','all','r',0,55,0),(63001,'Read resources','resource',1,'read',NULL,'w',0,16,0),(63002,'Create/Modify resources','resource',1,'write',NULL,'w',0,16,0),(63003,'Delete resources','resource',1,'delete',NULL,'w',0,16,0),(63004,'Link resources to agenda events','resource',1,'link',NULL,'w',0,16,0),(64001,'DirectPrint','printing',1,'read',NULL,'r',0,52,0),(101250,'Read surveys','opensurvey',2,'survey','read','r',0,40,0),(101251,'Create/modify surveys','opensurvey',2,'survey','write','w',0,40,0),(941601,'Lire les receptions','reception',1,'lire',NULL,'r',0,40,0),(941602,'Creer modifier les receptions','reception',1,'creer',NULL,'w',0,40,0),(941603,'Valider les receptions','reception',1,'reception_advance','validate','d',0,40,0),(941604,'Envoyer les receptions aux clients','reception',1,'reception_advance','send','d',0,40,0),(941605,'Exporter les receptions','reception',1,'reception','export','r',0,40,0),(941606,'Supprimer les receptions','reception',1,'supprimer',NULL,'d',0,40,0);
 /*!40000 ALTER TABLE `llx_rights_def` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -10640,14 +11045,14 @@ DROP TABLE IF EXISTS `llx_session`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_session` (
-  `session_id` varchar(50) NOT NULL,
-  `session_variable` text DEFAULT NULL,
+  `session_id` varchar(50) CHARACTER SET utf8mb4 NOT NULL,
+  `session_variable` text CHARACTER SET utf8mb4 DEFAULT NULL,
   `last_accessed` datetime NOT NULL,
   `fk_user` int(11) NOT NULL,
-  `remote_ip` varchar(64) DEFAULT NULL,
-  `user_agent` varchar(128) DEFAULT NULL,
+  `remote_ip` varchar(64) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `user_agent` varchar(128) CHARACTER SET utf8mb4 DEFAULT NULL,
   PRIMARY KEY (`session_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -12011,7 +12416,7 @@ CREATE TABLE `llx_user_rights` (
   UNIQUE KEY `uk_user_rights` (`entity`,`fk_user`,`fk_id`),
   KEY `fk_user_rights_fk_user_user` (`fk_user`),
   CONSTRAINT `fk_user_rights_fk_user_user` FOREIGN KEY (`fk_user`) REFERENCES `llx_user` (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=20342 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=20602 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -12020,7 +12425,7 @@ CREATE TABLE `llx_user_rights` (
 
 LOCK TABLES `llx_user_rights` WRITE;
 /*!40000 ALTER TABLE `llx_user_rights` DISABLE KEYS */;
-INSERT INTO `llx_user_rights` VALUES (12402,1,1,11),(12380,1,1,12),(12385,1,1,13),(12389,1,1,14),(12393,1,1,15),(12398,1,1,16),(12404,1,1,19),(9726,1,1,21),(9700,1,1,22),(9706,1,1,24),(9711,1,1,25),(9716,1,1,26),(9722,1,1,27),(9728,1,1,28),(9978,1,1,31),(9968,1,1,32),(9974,1,1,34),(1910,1,1,36),(9980,1,1,38),(11573,1,1,41),(11574,1,1,42),(11575,1,1,44),(11576,1,1,45),(7184,1,1,61),(7181,1,1,62),(7183,1,1,64),(7185,1,1,67),(7186,1,1,68),(1678,1,1,71),(1673,1,1,72),(1675,1,1,74),(1679,1,1,75),(1677,1,1,76),(1681,1,1,78),(1682,1,1,79),(12322,1,1,81),(12309,1,1,82),(12312,1,1,84),(12314,1,1,86),(12317,1,1,87),(12320,1,1,88),(12323,1,1,89),(11580,1,1,91),(11581,1,1,92),(11582,1,1,93),(11583,1,1,94),(10097,1,1,95),(10099,1,1,96),(10103,1,1,97),(10104,1,1,98),(7139,1,1,101),(7134,1,1,102),(7136,1,1,104),(7137,1,1,105),(7138,1,1,106),(7140,1,1,109),(10229,1,1,111),(10201,1,1,112),(10207,1,1,113),(10213,1,1,114),(10219,1,1,115),(10225,1,1,116),(10231,1,1,117),(12518,1,1,121),(12508,1,1,122),(12514,1,1,125),(12520,1,1,126),(11577,1,1,141),(11578,1,1,142),(11579,1,1,144),(2307,1,1,151),(2304,1,1,152),(2306,1,1,153),(2308,1,1,154),(10092,1,1,161),(10093,1,1,162),(10094,1,1,163),(10095,1,1,164),(10096,1,1,165),(1585,1,1,170),(12342,1,1,171),(12331,1,1,172),(12335,1,1,173),(12339,1,1,174),(12343,1,1,178),(10000,1,1,221),(9990,1,1,222),(9996,1,1,223),(10002,1,1,229),(10007,1,1,237),(10011,1,1,238),(10015,1,1,239),(1686,1,1,241),(1685,1,1,242),(1687,1,1,243),(12604,1,1,251),(12566,1,1,252),(12569,1,1,253),(12572,1,1,254),(12575,1,1,255),(12579,1,1,256),(1617,1,1,258),(12525,1,1,262),(12544,1,1,281),(12534,1,1,282),(12540,1,1,283),(12546,1,1,286),(12288,1,1,300),(12290,1,1,301),(11591,1,1,302),(1763,1,1,331),(1762,1,1,332),(1764,1,1,333),(12582,1,1,341),(12584,1,1,342),(12586,1,1,343),(12588,1,1,344),(12600,1,1,351),(12593,1,1,352),(12597,1,1,353),(12601,1,1,354),(12605,1,1,358),(12560,1,1,531),(12553,1,1,532),(12557,1,1,534),(1625,1,1,536),(12561,1,1,538),(12358,1,1,700),(12348,1,1,701),(12354,1,1,702),(12360,1,1,703),(1755,1,1,1001),(1754,1,1,1002),(1756,1,1,1003),(1758,1,1,1004),(1759,1,1,1005),(7146,1,1,1101),(7143,1,1,1102),(7145,1,1,1104),(7147,1,1,1109),(12412,1,1,1181),(12458,1,1,1182),(12417,1,1,1183),(12420,1,1,1184),(12423,1,1,1185),(12427,1,1,1186),(12431,1,1,1187),(12437,1,1,1188),(12434,1,1,1189),(1578,1,1,1201),(1579,1,1,1202),(12454,1,1,1231),(12443,1,1,1232),(12446,1,1,1233),(12449,1,1,1234),(12452,1,1,1235),(12455,1,1,1236),(12459,1,1,1237),(1736,1,1,1251),(12409,1,1,1321),(12326,1,1,1421),(8190,1,1,1791),(8187,1,1,1792),(8191,1,1,1793),(12264,1,1,2401),(12260,1,1,2402),(12266,1,1,2403),(12280,1,1,2411),(12276,1,1,2412),(12282,1,1,2413),(12286,1,1,2414),(1618,1,1,2500),(12370,1,1,2501),(12367,1,1,2503),(12371,1,1,2515),(9610,1,1,5001),(9611,1,1,5002),(12490,1,1,20001),(12474,1,1,20003),(12480,1,1,20004),(12486,1,1,20005),(12492,1,1,20006),(12302,1,1,23001),(12295,1,1,23002),(12299,1,1,23003),(12303,1,1,23004),(7701,1,1,50101),(4984,1,1,50401),(4983,1,1,50402),(4985,1,1,50403),(4987,1,1,50411),(4988,1,1,50412),(4989,1,1,50415),(12498,1,1,55001),(12499,1,1,55002),(3564,1,1,100700),(3565,1,1,100701),(9596,1,1,101051),(9598,1,1,101052),(9600,1,1,101053),(9604,1,1,101060),(9605,1,1,101061),(7177,1,1,101201),(7178,1,1,101202),(10353,1,1,101250),(10355,1,1,101251),(8980,1,1,101261),(8981,1,1,101262),(7616,1,1,101331),(10030,1,1,101701),(10031,1,1,101702),(3582,1,1,102000),(3583,1,1,102001),(9819,1,1,400051),(9823,1,1,400052),(9827,1,1,400053),(9831,1,1,400055),(132,1,2,11),(133,1,2,12),(134,1,2,13),(135,1,2,14),(136,1,2,16),(137,1,2,19),(138,1,2,21),(139,1,2,22),(140,1,2,24),(141,1,2,25),(142,1,2,26),(143,1,2,27),(10359,1,2,31),(145,1,2,32),(10361,1,2,34),(146,1,2,36),(147,1,2,41),(148,1,2,42),(149,1,2,44),(150,1,2,61),(151,1,2,62),(152,1,2,64),(153,1,2,71),(154,1,2,72),(155,1,2,74),(156,1,2,75),(157,1,2,78),(158,1,2,79),(159,1,2,81),(160,1,2,82),(161,1,2,84),(162,1,2,86),(163,1,2,87),(164,1,2,88),(165,1,2,89),(166,1,2,91),(167,1,2,92),(168,1,2,93),(2475,1,2,95),(2476,1,2,96),(2477,1,2,97),(2478,1,2,98),(169,1,2,101),(170,1,2,102),(171,1,2,104),(172,1,2,109),(173,1,2,111),(174,1,2,112),(175,1,2,113),(176,1,2,114),(177,1,2,116),(178,1,2,117),(179,1,2,121),(180,1,2,122),(181,1,2,125),(182,1,2,141),(183,1,2,142),(184,1,2,144),(2479,1,2,151),(2480,1,2,152),(2481,1,2,153),(2482,1,2,154),(185,1,2,161),(186,1,2,162),(187,1,2,163),(188,1,2,164),(189,1,2,165),(190,1,2,170),(2471,1,2,171),(192,1,2,172),(2472,1,2,173),(193,1,2,221),(194,1,2,222),(195,1,2,229),(196,1,2,241),(197,1,2,242),(198,1,2,243),(199,1,2,251),(201,1,2,262),(202,1,2,281),(203,1,2,282),(204,1,2,283),(205,1,2,331),(15072,1,2,510),(2483,1,2,531),(207,1,2,532),(2484,1,2,534),(208,1,2,536),(2473,1,2,700),(210,1,2,701),(211,1,2,702),(2474,1,2,703),(15064,1,2,771),(15057,1,2,772),(15059,1,2,773),(15061,1,2,774),(15063,1,2,775),(15065,1,2,776),(212,1,2,1001),(213,1,2,1002),(214,1,2,1003),(215,1,2,1004),(216,1,2,1005),(217,1,2,1101),(218,1,2,1102),(219,1,2,1104),(220,1,2,1109),(15073,1,2,1121),(15074,1,2,1122),(15075,1,2,1123),(15076,1,2,1124),(15077,1,2,1125),(15078,1,2,1126),(221,1,2,1181),(222,1,2,1182),(223,1,2,1183),(224,1,2,1184),(225,1,2,1185),(226,1,2,1186),(227,1,2,1187),(228,1,2,1188),(229,1,2,1201),(230,1,2,1202),(231,1,2,1231),(232,1,2,1232),(233,1,2,1233),(234,1,2,1234),(235,1,2,1421),(236,1,2,2401),(237,1,2,2402),(238,1,2,2403),(239,1,2,2411),(240,1,2,2412),(241,1,2,2413),(242,1,2,2500),(2470,1,2,2501),(243,1,2,2515),(10363,1,2,20001),(10365,1,2,20003),(10366,1,2,20004),(10367,1,2,20005),(10368,1,2,20006),(15054,1,2,23001),(10362,1,2,50101),(15067,1,2,55001),(15066,1,2,59001),(15068,1,2,63001),(15069,1,2,63002),(15070,1,2,63003),(15071,1,2,63004),(10372,1,2,101250),(1807,1,3,11),(1808,1,3,31),(1809,1,3,36),(1810,1,3,41),(1811,1,3,61),(1812,1,3,71),(1813,1,3,72),(1814,1,3,74),(1815,1,3,75),(1816,1,3,78),(1817,1,3,79),(1818,1,3,91),(1819,1,3,95),(1820,1,3,97),(1821,1,3,111),(1822,1,3,121),(1823,1,3,122),(1824,1,3,125),(1825,1,3,161),(1826,1,3,170),(1827,1,3,171),(1828,1,3,172),(1829,1,3,221),(1830,1,3,222),(1831,1,3,229),(1832,1,3,241),(1833,1,3,242),(1834,1,3,243),(1835,1,3,251),(1836,1,3,255),(1837,1,3,256),(1838,1,3,262),(1839,1,3,281),(1840,1,3,282),(1841,1,3,283),(1842,1,3,331),(1843,1,3,531),(1844,1,3,536),(1845,1,3,700),(1846,1,3,1001),(1847,1,3,1002),(1848,1,3,1003),(1849,1,3,1004),(1850,1,3,1005),(1851,1,3,1181),(1852,1,3,1182),(1853,1,3,1201),(1854,1,3,1202),(1855,1,3,1231),(1856,1,3,2401),(1857,1,3,2402),(1858,1,3,2403),(1859,1,3,2411),(1860,1,3,2412),(1861,1,3,2413),(1862,1,3,2500),(1863,1,3,2515),(8026,1,4,11),(8027,1,4,21),(8028,1,4,31),(8029,1,4,41),(8030,1,4,61),(8031,1,4,71),(8032,1,4,72),(8033,1,4,74),(8034,1,4,75),(8035,1,4,78),(8036,1,4,79),(8037,1,4,81),(8038,1,4,91),(8039,1,4,95),(8040,1,4,97),(8041,1,4,101),(8042,1,4,111),(8043,1,4,121),(8044,1,4,151),(8045,1,4,161),(8046,1,4,171),(8047,1,4,221),(8048,1,4,222),(8049,1,4,229),(8050,1,4,241),(8051,1,4,242),(8052,1,4,243),(8146,1,4,251),(8147,1,4,253),(8053,1,4,262),(8054,1,4,281),(8055,1,4,331),(8056,1,4,341),(8057,1,4,342),(8058,1,4,343),(8059,1,4,344),(8060,1,4,531),(8061,1,4,700),(8062,1,4,1001),(8063,1,4,1002),(8064,1,4,1003),(8065,1,4,1004),(8066,1,4,1005),(8067,1,4,1101),(8068,1,4,1181),(8069,1,4,1182),(8070,1,4,1201),(8071,1,4,1202),(8072,1,4,1231),(8073,1,4,2401),(8074,1,4,2501),(8075,1,4,2503),(8076,1,4,2515),(8077,1,4,20001),(8078,1,4,50101),(8079,1,4,101201),(8080,1,4,101261),(8081,1,4,102000),(8082,1,4,400051),(8083,1,4,400052),(8084,1,4,400053),(8085,1,4,400055),(12608,1,10,11),(12609,1,10,21),(12610,1,10,31),(12611,1,10,41),(12612,1,10,61),(12613,1,10,71),(12614,1,10,72),(12615,1,10,74),(12616,1,10,75),(12617,1,10,78),(12618,1,10,79),(12619,1,10,81),(12620,1,10,91),(12621,1,10,95),(12622,1,10,97),(12623,1,10,101),(12624,1,10,111),(12625,1,10,121),(12626,1,10,151),(12627,1,10,161),(12628,1,10,171),(12629,1,10,221),(12630,1,10,222),(12631,1,10,229),(12632,1,10,241),(12633,1,10,242),(12634,1,10,243),(12635,1,10,262),(12636,1,10,281),(12637,1,10,300),(12638,1,10,331),(12639,1,10,341),(12640,1,10,342),(12641,1,10,343),(12642,1,10,344),(12643,1,10,531),(12644,1,10,700),(12645,1,10,1001),(12646,1,10,1002),(12647,1,10,1003),(12648,1,10,1004),(12649,1,10,1005),(12650,1,10,1101),(12651,1,10,1181),(12652,1,10,1182),(12653,1,10,1201),(12654,1,10,1202),(12655,1,10,1231),(12656,1,10,2401),(12657,1,10,2501),(12658,1,10,2503),(12659,1,10,2515),(12660,1,10,20001),(12662,1,10,23001),(12663,1,10,50101),(12664,1,11,11),(12665,1,11,21),(12666,1,11,31),(12667,1,11,41),(12668,1,11,61),(12669,1,11,71),(12670,1,11,72),(12671,1,11,74),(12672,1,11,75),(12673,1,11,78),(12674,1,11,79),(12675,1,11,81),(12676,1,11,91),(12677,1,11,95),(12678,1,11,97),(12679,1,11,101),(12680,1,11,111),(12681,1,11,121),(12682,1,11,151),(12683,1,11,161),(12684,1,11,171),(12685,1,11,221),(12686,1,11,222),(12687,1,11,229),(12688,1,11,241),(12689,1,11,242),(12690,1,11,243),(12691,1,11,262),(12692,1,11,281),(12693,1,11,300),(12694,1,11,331),(12695,1,11,341),(12696,1,11,342),(12697,1,11,343),(12698,1,11,344),(12699,1,11,531),(12700,1,11,700),(12701,1,11,1001),(12702,1,11,1002),(12703,1,11,1003),(12704,1,11,1004),(12705,1,11,1005),(12706,1,11,1101),(12707,1,11,1181),(12708,1,11,1182),(12709,1,11,1201),(12710,1,11,1202),(12711,1,11,1231),(12712,1,11,2401),(12713,1,11,2501),(12714,1,11,2503),(12715,1,11,2515),(12716,1,11,20001),(12718,1,11,23001),(12719,1,11,50101),(20197,1,12,11),(20189,1,12,12),(20190,1,12,13),(20191,1,12,14),(20192,1,12,15),(20195,1,12,16),(20198,1,12,19),(14146,1,12,21),(14135,1,12,22),(14137,1,12,24),(14139,1,12,25),(14142,1,12,26),(14145,1,12,27),(14148,1,12,28),(14930,1,12,31),(14926,1,12,32),(14929,1,12,34),(14932,1,12,38),(13816,1,12,41),(13813,1,12,42),(13815,1,12,44),(13817,1,12,45),(14094,1,12,61),(14091,1,12,62),(14093,1,12,64),(14095,1,12,67),(14096,1,12,68),(16203,1,12,71),(16198,1,12,72),(16200,1,12,74),(16204,1,12,75),(16202,1,12,76),(16206,1,12,78),(16207,1,12,79),(20154,1,12,81),(20149,1,12,82),(20150,1,12,84),(20151,1,12,86),(20152,1,12,87),(20153,1,12,88),(20155,1,12,89),(15401,1,12,91),(15397,1,12,92),(15400,1,12,93),(15403,1,12,94),(13990,1,12,95),(12734,1,12,97),(19241,1,12,101),(19237,1,12,102),(19238,1,12,104),(19239,1,12,105),(19240,1,12,106),(19242,1,12,109),(20136,1,12,111),(20122,1,12,112),(20125,1,12,113),(20128,1,12,114),(20131,1,12,115),(20134,1,12,116),(20137,1,12,117),(20288,1,12,121),(20283,1,12,122),(20286,1,12,125),(20289,1,12,126),(13821,1,12,141),(13820,1,12,142),(13822,1,12,144),(13912,1,12,151),(13909,1,12,152),(13911,1,12,153),(13913,1,12,154),(14063,1,12,161),(14056,1,12,162),(14058,1,12,163),(14060,1,12,164),(14062,1,12,165),(14064,1,12,167),(13350,1,12,171),(13345,1,12,172),(13347,1,12,173),(13349,1,12,174),(13351,1,12,178),(13838,1,12,221),(13834,1,12,222),(13837,1,12,223),(13840,1,12,229),(13842,1,12,237),(13844,1,12,238),(13846,1,12,239),(13516,1,12,241),(13515,1,12,242),(13517,1,12,243),(20330,1,12,251),(20311,1,12,252),(20313,1,12,253),(20314,1,12,254),(20316,1,12,255),(20318,1,12,256),(20290,1,12,262),(20300,1,12,281),(20295,1,12,282),(20298,1,12,283),(20301,1,12,286),(19877,1,12,300),(20138,1,12,301),(20139,1,12,302),(16194,1,12,331),(16193,1,12,332),(16195,1,12,333),(20319,1,12,341),(20320,1,12,342),(20321,1,12,343),(20322,1,12,344),(20328,1,12,351),(20325,1,12,352),(20327,1,12,353),(20329,1,12,354),(20331,1,12,358),(19249,1,12,430),(16384,1,12,501),(16378,1,12,502),(13865,1,12,510),(20270,1,12,511),(20265,1,12,512),(20267,1,12,514),(20269,1,12,517),(20271,1,12,519),(15291,1,12,520),(15286,1,12,522),(15288,1,12,524),(15290,1,12,525),(15292,1,12,527),(20277,1,12,531),(20274,1,12,532),(20276,1,12,534),(20278,1,12,538),(20076,1,12,561),(20073,1,12,562),(20075,1,12,563),(20077,1,12,564),(16932,1,12,650),(20116,1,12,651),(20115,1,12,652),(20117,1,12,653),(17124,1,12,660),(20245,1,12,661),(20244,1,12,662),(20246,1,12,663),(13358,1,12,700),(20163,1,12,701),(20161,1,12,702),(20164,1,12,703),(20254,1,12,750),(20253,1,12,751),(20255,1,12,752),(20183,1,12,771),(20172,1,12,772),(20174,1,12,773),(15085,1,12,774),(20176,1,12,775),(20178,1,12,776),(20180,1,12,777),(20182,1,12,778),(20184,1,12,779),(14917,1,12,1001),(14916,1,12,1002),(14918,1,12,1003),(14920,1,12,1004),(14921,1,12,1005),(19247,1,12,1101),(19245,1,12,1102),(19246,1,12,1104),(19248,1,12,1109),(19233,1,12,1121),(19226,1,12,1122),(19228,1,12,1123),(19230,1,12,1124),(19232,1,12,1125),(19234,1,12,1126),(20201,1,12,1181),(20215,1,12,1182),(20204,1,12,1183),(20205,1,12,1184),(20207,1,12,1185),(20209,1,12,1186),(20211,1,12,1187),(20214,1,12,1188),(20212,1,12,1189),(20216,1,12,1191),(13827,1,12,1201),(13828,1,12,1202),(20224,1,12,1231),(20219,1,12,1232),(20220,1,12,1233),(20222,1,12,1234),(20223,1,12,1235),(20225,1,12,1236),(16302,1,12,1237),(13829,1,12,1251),(20199,1,12,1321),(20200,1,12,1322),(20156,1,12,1421),(20102,1,12,2401),(20100,1,12,2402),(20103,1,12,2403),(20110,1,12,2411),(20108,1,12,2412),(20111,1,12,2413),(20112,1,12,2414),(20168,1,12,2501),(20167,1,12,2503),(20169,1,12,2515),(20082,1,12,3200),(20341,1,12,3301),(15435,1,12,5001),(15436,1,12,5002),(20339,1,12,10001),(20334,1,12,10002),(20336,1,12,10003),(20338,1,12,10005),(20340,1,12,10008),(20237,1,12,20001),(20228,1,12,20002),(20230,1,12,20003),(20234,1,12,20004),(20236,1,12,20005),(20238,1,12,20006),(20232,1,12,20007),(20145,1,12,23001),(20142,1,12,23002),(20144,1,12,23003),(20146,1,12,23004),(19019,1,12,50101),(20309,1,12,50151),(20084,1,12,50401),(20092,1,12,50411),(20087,1,12,50412),(20089,1,12,50414),(20091,1,12,50415),(20093,1,12,50418),(20094,1,12,50420),(20095,1,12,50430),(20083,1,12,50440),(20248,1,12,55001),(20249,1,12,55002),(20307,1,12,56001),(20304,1,12,56002),(20306,1,12,56003),(20308,1,12,56004),(16742,1,12,56005),(20239,1,12,59001),(20240,1,12,59002),(20241,1,12,59003),(20261,1,12,63001),(20258,1,12,63002),(20260,1,12,63003),(20262,1,12,63004),(20250,1,12,64001),(17328,1,12,101130),(17327,1,12,101131),(17329,1,12,101132),(16009,1,12,101331),(16010,1,12,101332),(16011,1,12,101333),(19208,1,12,101701),(19209,1,12,101702),(20069,1,12,941601),(20065,1,12,941602),(20066,1,12,941603),(20067,1,12,941604),(20068,1,12,941605),(20070,1,12,941606),(12776,1,13,11),(12777,1,13,21),(12778,1,13,31),(12779,1,13,41),(12780,1,13,61),(12781,1,13,71),(12782,1,13,72),(12783,1,13,74),(12784,1,13,75),(12785,1,13,78),(12786,1,13,79),(12787,1,13,81),(12788,1,13,91),(12789,1,13,95),(12790,1,13,97),(12791,1,13,101),(12792,1,13,111),(12793,1,13,121),(12794,1,13,151),(12795,1,13,161),(12796,1,13,171),(12797,1,13,221),(12798,1,13,222),(12799,1,13,229),(12800,1,13,241),(12801,1,13,242),(12802,1,13,243),(12803,1,13,262),(12804,1,13,281),(12805,1,13,300),(12806,1,13,331),(12807,1,13,341),(12808,1,13,342),(12809,1,13,343),(12810,1,13,344),(12811,1,13,531),(12812,1,13,700),(12813,1,13,1001),(12814,1,13,1002),(12815,1,13,1003),(12816,1,13,1004),(12817,1,13,1005),(12818,1,13,1101),(12819,1,13,1181),(12820,1,13,1182),(12821,1,13,1201),(12822,1,13,1202),(12823,1,13,1231),(12824,1,13,2401),(12825,1,13,2501),(12826,1,13,2503),(12827,1,13,2515),(12828,1,13,20001),(12830,1,13,23001),(12831,1,13,50101),(12832,1,14,11),(12833,1,14,21),(12834,1,14,31),(12835,1,14,41),(12836,1,14,61),(12837,1,14,71),(12838,1,14,72),(12839,1,14,74),(12840,1,14,75),(12841,1,14,78),(12842,1,14,79),(12843,1,14,81),(12844,1,14,91),(12845,1,14,95),(12846,1,14,97),(12847,1,14,101),(12848,1,14,111),(12849,1,14,121),(12850,1,14,151),(12851,1,14,161),(12852,1,14,171),(12853,1,14,221),(12854,1,14,222),(12855,1,14,229),(12856,1,14,241),(12857,1,14,242),(12858,1,14,243),(12859,1,14,262),(12860,1,14,281),(12861,1,14,300),(12862,1,14,331),(12863,1,14,341),(12864,1,14,342),(12865,1,14,343),(12866,1,14,344),(12867,1,14,531),(12868,1,14,700),(12869,1,14,1001),(12870,1,14,1002),(12871,1,14,1003),(12872,1,14,1004),(12873,1,14,1005),(12874,1,14,1101),(12875,1,14,1181),(12876,1,14,1182),(12877,1,14,1201),(12878,1,14,1202),(12879,1,14,1231),(12880,1,14,2401),(12881,1,14,2501),(12882,1,14,2503),(12883,1,14,2515),(12884,1,14,20001),(12886,1,14,23001),(12887,1,14,50101),(12944,1,16,11),(12945,1,16,21),(12946,1,16,31),(13056,1,16,41),(13057,1,16,42),(13058,1,16,44),(13059,1,16,45),(12948,1,16,61),(12949,1,16,71),(12950,1,16,72),(12951,1,16,74),(12952,1,16,75),(12953,1,16,78),(12954,1,16,79),(12955,1,16,81),(12956,1,16,91),(12957,1,16,95),(12958,1,16,97),(12959,1,16,101),(12960,1,16,111),(12961,1,16,121),(13060,1,16,141),(13061,1,16,142),(13062,1,16,144),(12962,1,16,151),(12963,1,16,161),(12964,1,16,171),(12965,1,16,221),(12966,1,16,222),(12967,1,16,229),(12968,1,16,241),(12969,1,16,242),(12970,1,16,243),(13128,1,16,251),(13064,1,16,262),(12972,1,16,281),(12973,1,16,300),(12974,1,16,331),(12975,1,16,341),(12976,1,16,342),(12977,1,16,343),(12978,1,16,344),(12979,1,16,531),(12980,1,16,700),(12981,1,16,1001),(12982,1,16,1002),(12983,1,16,1003),(12984,1,16,1004),(12985,1,16,1005),(12986,1,16,1101),(12987,1,16,1181),(12988,1,16,1182),(12989,1,16,1201),(12990,1,16,1202),(12991,1,16,1231),(12992,1,16,2401),(12993,1,16,2501),(12994,1,16,2503),(12995,1,16,2515),(12996,1,16,20001),(12998,1,16,23001),(12999,1,16,50101),(13000,1,17,11),(13001,1,17,21),(13002,1,17,31),(13065,1,17,41),(13066,1,17,42),(13067,1,17,44),(13068,1,17,45),(13004,1,17,61),(13005,1,17,71),(13006,1,17,72),(13007,1,17,74),(13008,1,17,75),(13009,1,17,78),(13010,1,17,79),(13011,1,17,81),(13012,1,17,91),(13013,1,17,95),(13014,1,17,97),(13015,1,17,101),(13016,1,17,111),(13017,1,17,121),(13069,1,17,141),(13070,1,17,142),(13071,1,17,144),(13018,1,17,151),(13019,1,17,161),(13020,1,17,171),(13021,1,17,221),(13022,1,17,222),(13023,1,17,229),(13024,1,17,241),(13025,1,17,242),(13026,1,17,243),(13028,1,17,281),(13029,1,17,300),(13030,1,17,331),(13031,1,17,341),(13032,1,17,342),(13033,1,17,343),(13034,1,17,344),(13035,1,17,531),(13036,1,17,700),(13037,1,17,1001),(13038,1,17,1002),(13039,1,17,1003),(13040,1,17,1004),(13041,1,17,1005),(13042,1,17,1101),(13043,1,17,1181),(13044,1,17,1182),(13045,1,17,1201),(13046,1,17,1202),(13047,1,17,1231),(13048,1,17,2401),(13049,1,17,2501),(13050,1,17,2503),(13051,1,17,2515),(13052,1,17,20001),(13054,1,17,23001),(13055,1,17,50101),(14504,1,18,11),(14505,1,18,21),(14506,1,18,31),(14507,1,18,41),(14508,1,18,61),(14509,1,18,71),(14510,1,18,78),(14511,1,18,81),(14512,1,18,91),(14513,1,18,95),(14514,1,18,101),(14515,1,18,111),(14516,1,18,121),(14517,1,18,151),(14518,1,18,161),(14519,1,18,221),(14520,1,18,241),(14521,1,18,262),(14522,1,18,281),(14523,1,18,300),(14524,1,18,331),(14525,1,18,332),(14526,1,18,333),(14527,1,18,341),(14528,1,18,342),(14529,1,18,343),(14530,1,18,344),(14531,1,18,531),(14532,1,18,701),(14533,1,18,771),(14534,1,18,774),(14535,1,18,1001),(14536,1,18,1004),(14537,1,18,1101),(14538,1,18,1181),(14539,1,18,1182),(14540,1,18,1201),(14541,1,18,1231),(14542,1,18,2401),(14543,1,18,2501),(14544,1,18,2503),(14545,1,18,2515),(14546,1,18,20001),(14548,1,18,50101),(14549,1,18,59001),(15242,1,19,21),(15243,1,19,31),(15244,1,19,41),(15245,1,19,61),(15246,1,19,71),(15247,1,19,78),(15248,1,19,81),(15249,1,19,101),(15250,1,19,121),(15251,1,19,151),(15252,1,19,161),(15253,1,19,221),(15254,1,19,241),(15255,1,19,262),(15256,1,19,281),(15257,1,19,300),(15258,1,19,331),(15259,1,19,332),(15260,1,19,341),(15261,1,19,342),(15262,1,19,343),(15263,1,19,344),(15264,1,19,531),(15265,1,19,701),(15266,1,19,771),(15267,1,19,774),(15268,1,19,777),(15269,1,19,1001),(15270,1,19,1004),(15271,1,19,1101),(15272,1,19,1121),(15273,1,19,1181),(15274,1,19,1182),(15275,1,19,1201),(15276,1,19,1231),(15277,1,19,2401),(15278,1,19,2501),(15279,1,19,20001),(15281,1,19,50101),(15282,1,19,59001),(15283,1,19,63001);
+INSERT INTO `llx_user_rights` VALUES (12402,1,1,11),(12380,1,1,12),(12385,1,1,13),(12389,1,1,14),(12393,1,1,15),(12398,1,1,16),(12404,1,1,19),(9726,1,1,21),(9700,1,1,22),(9706,1,1,24),(9711,1,1,25),(9716,1,1,26),(9722,1,1,27),(9728,1,1,28),(9978,1,1,31),(9968,1,1,32),(9974,1,1,34),(1910,1,1,36),(9980,1,1,38),(11573,1,1,41),(11574,1,1,42),(11575,1,1,44),(11576,1,1,45),(7184,1,1,61),(7181,1,1,62),(7183,1,1,64),(7185,1,1,67),(7186,1,1,68),(1678,1,1,71),(1673,1,1,72),(1675,1,1,74),(1679,1,1,75),(1677,1,1,76),(1681,1,1,78),(1682,1,1,79),(12322,1,1,81),(12309,1,1,82),(12312,1,1,84),(12314,1,1,86),(12317,1,1,87),(12320,1,1,88),(12323,1,1,89),(11580,1,1,91),(11581,1,1,92),(11582,1,1,93),(11583,1,1,94),(10097,1,1,95),(10099,1,1,96),(10103,1,1,97),(10104,1,1,98),(7139,1,1,101),(7134,1,1,102),(7136,1,1,104),(7137,1,1,105),(7138,1,1,106),(7140,1,1,109),(10229,1,1,111),(10201,1,1,112),(10207,1,1,113),(10213,1,1,114),(10219,1,1,115),(10225,1,1,116),(10231,1,1,117),(12518,1,1,121),(12508,1,1,122),(12514,1,1,125),(12520,1,1,126),(11577,1,1,141),(11578,1,1,142),(11579,1,1,144),(2307,1,1,151),(2304,1,1,152),(2306,1,1,153),(2308,1,1,154),(10092,1,1,161),(10093,1,1,162),(10094,1,1,163),(10095,1,1,164),(10096,1,1,165),(1585,1,1,170),(12342,1,1,171),(12331,1,1,172),(12335,1,1,173),(12339,1,1,174),(12343,1,1,178),(10000,1,1,221),(9990,1,1,222),(9996,1,1,223),(10002,1,1,229),(10007,1,1,237),(10011,1,1,238),(10015,1,1,239),(1686,1,1,241),(1685,1,1,242),(1687,1,1,243),(12604,1,1,251),(12566,1,1,252),(12569,1,1,253),(12572,1,1,254),(12575,1,1,255),(12579,1,1,256),(1617,1,1,258),(12525,1,1,262),(12544,1,1,281),(12534,1,1,282),(12540,1,1,283),(12546,1,1,286),(12288,1,1,300),(12290,1,1,301),(11591,1,1,302),(1763,1,1,331),(1762,1,1,332),(1764,1,1,333),(12582,1,1,341),(12584,1,1,342),(12586,1,1,343),(12588,1,1,344),(12600,1,1,351),(12593,1,1,352),(12597,1,1,353),(12601,1,1,354),(12605,1,1,358),(12560,1,1,531),(12553,1,1,532),(12557,1,1,534),(1625,1,1,536),(12561,1,1,538),(12358,1,1,700),(12348,1,1,701),(12354,1,1,702),(12360,1,1,703),(1755,1,1,1001),(1754,1,1,1002),(1756,1,1,1003),(1758,1,1,1004),(1759,1,1,1005),(7146,1,1,1101),(7143,1,1,1102),(7145,1,1,1104),(7147,1,1,1109),(12412,1,1,1181),(12458,1,1,1182),(12417,1,1,1183),(12420,1,1,1184),(12423,1,1,1185),(12427,1,1,1186),(12431,1,1,1187),(12437,1,1,1188),(12434,1,1,1189),(1578,1,1,1201),(1579,1,1,1202),(12454,1,1,1231),(12443,1,1,1232),(12446,1,1,1233),(12449,1,1,1234),(12452,1,1,1235),(12455,1,1,1236),(12459,1,1,1237),(1736,1,1,1251),(12409,1,1,1321),(12326,1,1,1421),(8190,1,1,1791),(8187,1,1,1792),(8191,1,1,1793),(12264,1,1,2401),(12260,1,1,2402),(12266,1,1,2403),(12280,1,1,2411),(12276,1,1,2412),(12282,1,1,2413),(12286,1,1,2414),(1618,1,1,2500),(12370,1,1,2501),(12367,1,1,2503),(12371,1,1,2515),(9610,1,1,5001),(9611,1,1,5002),(12490,1,1,20001),(12474,1,1,20003),(12480,1,1,20004),(12486,1,1,20005),(12492,1,1,20006),(12302,1,1,23001),(12295,1,1,23002),(12299,1,1,23003),(12303,1,1,23004),(7701,1,1,50101),(4984,1,1,50401),(4983,1,1,50402),(4985,1,1,50403),(4987,1,1,50411),(4988,1,1,50412),(4989,1,1,50415),(12498,1,1,55001),(12499,1,1,55002),(3564,1,1,100700),(3565,1,1,100701),(9596,1,1,101051),(9598,1,1,101052),(9600,1,1,101053),(9604,1,1,101060),(9605,1,1,101061),(7177,1,1,101201),(7178,1,1,101202),(10353,1,1,101250),(10355,1,1,101251),(8980,1,1,101261),(8981,1,1,101262),(7616,1,1,101331),(10030,1,1,101701),(10031,1,1,101702),(3582,1,1,102000),(3583,1,1,102001),(9819,1,1,400051),(9823,1,1,400052),(9827,1,1,400053),(9831,1,1,400055),(132,1,2,11),(133,1,2,12),(134,1,2,13),(135,1,2,14),(136,1,2,16),(137,1,2,19),(138,1,2,21),(139,1,2,22),(140,1,2,24),(141,1,2,25),(142,1,2,26),(143,1,2,27),(10359,1,2,31),(145,1,2,32),(10361,1,2,34),(146,1,2,36),(147,1,2,41),(148,1,2,42),(149,1,2,44),(150,1,2,61),(151,1,2,62),(152,1,2,64),(153,1,2,71),(154,1,2,72),(155,1,2,74),(156,1,2,75),(157,1,2,78),(158,1,2,79),(159,1,2,81),(160,1,2,82),(161,1,2,84),(162,1,2,86),(163,1,2,87),(164,1,2,88),(165,1,2,89),(166,1,2,91),(167,1,2,92),(168,1,2,93),(2475,1,2,95),(2476,1,2,96),(2477,1,2,97),(2478,1,2,98),(169,1,2,101),(170,1,2,102),(171,1,2,104),(172,1,2,109),(173,1,2,111),(174,1,2,112),(175,1,2,113),(176,1,2,114),(177,1,2,116),(178,1,2,117),(179,1,2,121),(180,1,2,122),(181,1,2,125),(182,1,2,141),(183,1,2,142),(184,1,2,144),(2479,1,2,151),(2480,1,2,152),(2481,1,2,153),(2482,1,2,154),(185,1,2,161),(186,1,2,162),(187,1,2,163),(188,1,2,164),(189,1,2,165),(190,1,2,170),(2471,1,2,171),(192,1,2,172),(2472,1,2,173),(193,1,2,221),(194,1,2,222),(195,1,2,229),(196,1,2,241),(197,1,2,242),(198,1,2,243),(199,1,2,251),(201,1,2,262),(202,1,2,281),(203,1,2,282),(204,1,2,283),(205,1,2,331),(15072,1,2,510),(2483,1,2,531),(207,1,2,532),(2484,1,2,534),(208,1,2,536),(2473,1,2,700),(210,1,2,701),(211,1,2,702),(2474,1,2,703),(15064,1,2,771),(15057,1,2,772),(15059,1,2,773),(15061,1,2,774),(15063,1,2,775),(15065,1,2,776),(212,1,2,1001),(213,1,2,1002),(214,1,2,1003),(215,1,2,1004),(216,1,2,1005),(217,1,2,1101),(218,1,2,1102),(219,1,2,1104),(220,1,2,1109),(15073,1,2,1121),(15074,1,2,1122),(15075,1,2,1123),(15076,1,2,1124),(15077,1,2,1125),(15078,1,2,1126),(221,1,2,1181),(222,1,2,1182),(223,1,2,1183),(224,1,2,1184),(225,1,2,1185),(226,1,2,1186),(227,1,2,1187),(228,1,2,1188),(229,1,2,1201),(230,1,2,1202),(231,1,2,1231),(232,1,2,1232),(233,1,2,1233),(234,1,2,1234),(235,1,2,1421),(236,1,2,2401),(237,1,2,2402),(238,1,2,2403),(239,1,2,2411),(240,1,2,2412),(241,1,2,2413),(242,1,2,2500),(2470,1,2,2501),(243,1,2,2515),(10363,1,2,20001),(10365,1,2,20003),(10366,1,2,20004),(10367,1,2,20005),(10368,1,2,20006),(15054,1,2,23001),(10362,1,2,50101),(15067,1,2,55001),(15066,1,2,59001),(15068,1,2,63001),(15069,1,2,63002),(15070,1,2,63003),(15071,1,2,63004),(10372,1,2,101250),(1807,1,3,11),(1808,1,3,31),(1809,1,3,36),(1810,1,3,41),(1811,1,3,61),(1812,1,3,71),(1813,1,3,72),(1814,1,3,74),(1815,1,3,75),(1816,1,3,78),(1817,1,3,79),(1818,1,3,91),(1819,1,3,95),(1820,1,3,97),(1821,1,3,111),(1822,1,3,121),(1823,1,3,122),(1824,1,3,125),(1825,1,3,161),(1826,1,3,170),(1827,1,3,171),(1828,1,3,172),(1829,1,3,221),(1830,1,3,222),(1831,1,3,229),(1832,1,3,241),(1833,1,3,242),(1834,1,3,243),(1835,1,3,251),(1836,1,3,255),(1837,1,3,256),(1838,1,3,262),(1839,1,3,281),(1840,1,3,282),(1841,1,3,283),(1842,1,3,331),(1843,1,3,531),(1844,1,3,536),(1845,1,3,700),(1846,1,3,1001),(1847,1,3,1002),(1848,1,3,1003),(1849,1,3,1004),(1850,1,3,1005),(1851,1,3,1181),(1852,1,3,1182),(1853,1,3,1201),(1854,1,3,1202),(1855,1,3,1231),(1856,1,3,2401),(1857,1,3,2402),(1858,1,3,2403),(1859,1,3,2411),(1860,1,3,2412),(1861,1,3,2413),(1862,1,3,2500),(1863,1,3,2515),(8026,1,4,11),(8027,1,4,21),(8028,1,4,31),(8029,1,4,41),(8030,1,4,61),(8031,1,4,71),(8032,1,4,72),(8033,1,4,74),(8034,1,4,75),(8035,1,4,78),(8036,1,4,79),(8037,1,4,81),(8038,1,4,91),(8039,1,4,95),(8040,1,4,97),(8041,1,4,101),(8042,1,4,111),(8043,1,4,121),(8044,1,4,151),(8045,1,4,161),(8046,1,4,171),(8047,1,4,221),(8048,1,4,222),(8049,1,4,229),(8050,1,4,241),(8051,1,4,242),(8052,1,4,243),(8146,1,4,251),(8147,1,4,253),(8053,1,4,262),(8054,1,4,281),(8055,1,4,331),(8056,1,4,341),(8057,1,4,342),(8058,1,4,343),(8059,1,4,344),(8060,1,4,531),(8061,1,4,700),(8062,1,4,1001),(8063,1,4,1002),(8064,1,4,1003),(8065,1,4,1004),(8066,1,4,1005),(8067,1,4,1101),(8068,1,4,1181),(8069,1,4,1182),(8070,1,4,1201),(8071,1,4,1202),(8072,1,4,1231),(8073,1,4,2401),(8074,1,4,2501),(8075,1,4,2503),(8076,1,4,2515),(8077,1,4,20001),(8078,1,4,50101),(8079,1,4,101201),(8080,1,4,101261),(8081,1,4,102000),(8082,1,4,400051),(8083,1,4,400052),(8084,1,4,400053),(8085,1,4,400055),(12608,1,10,11),(12609,1,10,21),(12610,1,10,31),(12611,1,10,41),(12612,1,10,61),(12613,1,10,71),(12614,1,10,72),(12615,1,10,74),(12616,1,10,75),(12617,1,10,78),(12618,1,10,79),(12619,1,10,81),(12620,1,10,91),(12621,1,10,95),(12622,1,10,97),(12623,1,10,101),(12624,1,10,111),(12625,1,10,121),(12626,1,10,151),(12627,1,10,161),(12628,1,10,171),(12629,1,10,221),(12630,1,10,222),(12631,1,10,229),(12632,1,10,241),(12633,1,10,242),(12634,1,10,243),(12635,1,10,262),(12636,1,10,281),(12637,1,10,300),(12638,1,10,331),(12639,1,10,341),(12640,1,10,342),(12641,1,10,343),(12642,1,10,344),(12643,1,10,531),(12644,1,10,700),(12645,1,10,1001),(12646,1,10,1002),(12647,1,10,1003),(12648,1,10,1004),(12649,1,10,1005),(12650,1,10,1101),(12651,1,10,1181),(12652,1,10,1182),(12653,1,10,1201),(12654,1,10,1202),(12655,1,10,1231),(12656,1,10,2401),(12657,1,10,2501),(12658,1,10,2503),(12659,1,10,2515),(12660,1,10,20001),(12662,1,10,23001),(12663,1,10,50101),(12664,1,11,11),(12665,1,11,21),(12666,1,11,31),(12667,1,11,41),(12668,1,11,61),(12669,1,11,71),(12670,1,11,72),(12671,1,11,74),(12672,1,11,75),(12673,1,11,78),(12674,1,11,79),(12675,1,11,81),(12676,1,11,91),(12677,1,11,95),(12678,1,11,97),(12679,1,11,101),(12680,1,11,111),(12681,1,11,121),(12682,1,11,151),(12683,1,11,161),(12684,1,11,171),(12685,1,11,221),(12686,1,11,222),(12687,1,11,229),(12688,1,11,241),(12689,1,11,242),(12690,1,11,243),(12691,1,11,262),(12692,1,11,281),(12693,1,11,300),(12694,1,11,331),(12695,1,11,341),(12696,1,11,342),(12697,1,11,343),(12698,1,11,344),(12699,1,11,531),(12700,1,11,700),(12701,1,11,1001),(12702,1,11,1002),(12703,1,11,1003),(12704,1,11,1004),(12705,1,11,1005),(12706,1,11,1101),(12707,1,11,1181),(12708,1,11,1182),(12709,1,11,1201),(12710,1,11,1202),(12711,1,11,1231),(12712,1,11,2401),(12713,1,11,2501),(12714,1,11,2503),(12715,1,11,2515),(12716,1,11,20001),(12718,1,11,23001),(12719,1,11,50101),(20456,1,12,11),(20448,1,12,12),(20449,1,12,13),(20450,1,12,14),(20451,1,12,15),(20454,1,12,16),(20457,1,12,19),(14146,1,12,21),(14135,1,12,22),(14137,1,12,24),(14139,1,12,25),(14142,1,12,26),(14145,1,12,27),(14148,1,12,28),(14930,1,12,31),(14926,1,12,32),(14929,1,12,34),(14932,1,12,38),(13816,1,12,41),(13813,1,12,42),(13815,1,12,44),(13817,1,12,45),(14094,1,12,61),(14091,1,12,62),(14093,1,12,64),(14095,1,12,67),(14096,1,12,68),(16203,1,12,71),(16198,1,12,72),(16200,1,12,74),(16204,1,12,75),(16202,1,12,76),(16206,1,12,78),(16207,1,12,79),(20413,1,12,81),(20408,1,12,82),(20409,1,12,84),(20410,1,12,86),(20411,1,12,87),(20412,1,12,88),(20414,1,12,89),(15401,1,12,91),(15397,1,12,92),(15400,1,12,93),(15403,1,12,94),(13990,1,12,95),(12734,1,12,97),(19241,1,12,101),(19237,1,12,102),(19238,1,12,104),(19239,1,12,105),(19240,1,12,106),(19242,1,12,109),(20395,1,12,111),(20381,1,12,112),(20384,1,12,113),(20387,1,12,114),(20390,1,12,115),(20393,1,12,116),(20396,1,12,117),(20547,1,12,121),(20542,1,12,122),(20545,1,12,125),(20548,1,12,126),(13821,1,12,141),(13820,1,12,142),(13822,1,12,144),(13912,1,12,151),(13909,1,12,152),(13911,1,12,153),(13913,1,12,154),(14063,1,12,161),(14056,1,12,162),(14058,1,12,163),(14060,1,12,164),(14062,1,12,165),(14064,1,12,167),(13350,1,12,171),(13345,1,12,172),(13347,1,12,173),(13349,1,12,174),(13351,1,12,178),(13838,1,12,221),(13834,1,12,222),(13837,1,12,223),(13840,1,12,229),(13842,1,12,237),(13844,1,12,238),(13846,1,12,239),(13516,1,12,241),(13515,1,12,242),(13517,1,12,243),(20591,1,12,251),(20572,1,12,252),(20574,1,12,253),(20575,1,12,254),(20577,1,12,255),(20579,1,12,256),(20549,1,12,262),(20559,1,12,281),(20554,1,12,282),(20557,1,12,283),(20560,1,12,286),(19877,1,12,300),(20397,1,12,301),(20398,1,12,302),(16194,1,12,331),(16193,1,12,332),(16195,1,12,333),(20580,1,12,341),(20581,1,12,342),(20582,1,12,343),(20583,1,12,344),(20589,1,12,351),(20586,1,12,352),(20588,1,12,353),(20590,1,12,354),(20592,1,12,358),(19249,1,12,430),(16384,1,12,501),(16378,1,12,502),(13865,1,12,510),(20529,1,12,511),(20524,1,12,512),(20526,1,12,514),(20528,1,12,517),(20530,1,12,519),(15291,1,12,520),(15286,1,12,522),(15288,1,12,524),(15290,1,12,525),(15292,1,12,527),(20536,1,12,531),(20533,1,12,532),(20535,1,12,534),(20537,1,12,538),(20076,1,12,561),(20073,1,12,562),(20075,1,12,563),(20077,1,12,564),(16932,1,12,650),(20375,1,12,651),(20374,1,12,652),(20376,1,12,653),(17124,1,12,660),(20504,1,12,661),(20503,1,12,662),(20505,1,12,663),(13358,1,12,700),(20422,1,12,701),(20420,1,12,702),(20423,1,12,703),(20513,1,12,750),(20512,1,12,751),(20514,1,12,752),(20442,1,12,771),(20431,1,12,772),(20433,1,12,773),(15085,1,12,774),(20435,1,12,775),(20437,1,12,776),(20439,1,12,777),(20441,1,12,778),(20443,1,12,779),(14917,1,12,1001),(14916,1,12,1002),(14918,1,12,1003),(14920,1,12,1004),(14921,1,12,1005),(19247,1,12,1101),(19245,1,12,1102),(19246,1,12,1104),(19248,1,12,1109),(19233,1,12,1121),(19226,1,12,1122),(19228,1,12,1123),(19230,1,12,1124),(19232,1,12,1125),(19234,1,12,1126),(20460,1,12,1181),(20474,1,12,1182),(20463,1,12,1183),(20464,1,12,1184),(20466,1,12,1185),(20468,1,12,1186),(20470,1,12,1187),(20473,1,12,1188),(20471,1,12,1189),(20475,1,12,1191),(13827,1,12,1201),(13828,1,12,1202),(20483,1,12,1231),(20478,1,12,1232),(20479,1,12,1233),(20481,1,12,1234),(20482,1,12,1235),(20484,1,12,1236),(16302,1,12,1237),(13829,1,12,1251),(20458,1,12,1321),(20459,1,12,1322),(20415,1,12,1421),(20361,1,12,2401),(20359,1,12,2402),(20362,1,12,2403),(20369,1,12,2411),(20367,1,12,2412),(20370,1,12,2413),(20371,1,12,2414),(20427,1,12,2501),(20426,1,12,2503),(20428,1,12,2515),(20082,1,12,3200),(20341,1,12,3301),(15435,1,12,5001),(15436,1,12,5002),(20600,1,12,10001),(20595,1,12,10002),(20597,1,12,10003),(20599,1,12,10005),(20601,1,12,10008),(20496,1,12,20001),(20487,1,12,20002),(20489,1,12,20003),(20493,1,12,20004),(20495,1,12,20005),(20497,1,12,20006),(20491,1,12,20007),(20404,1,12,23001),(20401,1,12,23002),(20403,1,12,23003),(20405,1,12,23004),(19019,1,12,50101),(20568,1,12,50151),(20569,1,12,50152),(20570,1,12,50153),(20343,1,12,50401),(20351,1,12,50411),(20346,1,12,50412),(20348,1,12,50414),(20350,1,12,50415),(20352,1,12,50418),(20353,1,12,50420),(20354,1,12,50430),(20342,1,12,50440),(20507,1,12,55001),(20508,1,12,55002),(20566,1,12,56001),(20563,1,12,56002),(20565,1,12,56003),(20567,1,12,56004),(16742,1,12,56005),(20498,1,12,59001),(20499,1,12,59002),(20500,1,12,59003),(20520,1,12,63001),(20517,1,12,63002),(20519,1,12,63003),(20521,1,12,63004),(20509,1,12,64001),(17328,1,12,101130),(17327,1,12,101131),(17329,1,12,101132),(16009,1,12,101331),(16010,1,12,101332),(16011,1,12,101333),(19208,1,12,101701),(19209,1,12,101702),(20069,1,12,941601),(20065,1,12,941602),(20066,1,12,941603),(20067,1,12,941604),(20068,1,12,941605),(20070,1,12,941606),(12776,1,13,11),(12777,1,13,21),(12778,1,13,31),(12779,1,13,41),(12780,1,13,61),(12781,1,13,71),(12782,1,13,72),(12783,1,13,74),(12784,1,13,75),(12785,1,13,78),(12786,1,13,79),(12787,1,13,81),(12788,1,13,91),(12789,1,13,95),(12790,1,13,97),(12791,1,13,101),(12792,1,13,111),(12793,1,13,121),(12794,1,13,151),(12795,1,13,161),(12796,1,13,171),(12797,1,13,221),(12798,1,13,222),(12799,1,13,229),(12800,1,13,241),(12801,1,13,242),(12802,1,13,243),(12803,1,13,262),(12804,1,13,281),(12805,1,13,300),(12806,1,13,331),(12807,1,13,341),(12808,1,13,342),(12809,1,13,343),(12810,1,13,344),(12811,1,13,531),(12812,1,13,700),(12813,1,13,1001),(12814,1,13,1002),(12815,1,13,1003),(12816,1,13,1004),(12817,1,13,1005),(12818,1,13,1101),(12819,1,13,1181),(12820,1,13,1182),(12821,1,13,1201),(12822,1,13,1202),(12823,1,13,1231),(12824,1,13,2401),(12825,1,13,2501),(12826,1,13,2503),(12827,1,13,2515),(12828,1,13,20001),(12830,1,13,23001),(12831,1,13,50101),(12832,1,14,11),(12833,1,14,21),(12834,1,14,31),(12835,1,14,41),(12836,1,14,61),(12837,1,14,71),(12838,1,14,72),(12839,1,14,74),(12840,1,14,75),(12841,1,14,78),(12842,1,14,79),(12843,1,14,81),(12844,1,14,91),(12845,1,14,95),(12846,1,14,97),(12847,1,14,101),(12848,1,14,111),(12849,1,14,121),(12850,1,14,151),(12851,1,14,161),(12852,1,14,171),(12853,1,14,221),(12854,1,14,222),(12855,1,14,229),(12856,1,14,241),(12857,1,14,242),(12858,1,14,243),(12859,1,14,262),(12860,1,14,281),(12861,1,14,300),(12862,1,14,331),(12863,1,14,341),(12864,1,14,342),(12865,1,14,343),(12866,1,14,344),(12867,1,14,531),(12868,1,14,700),(12869,1,14,1001),(12870,1,14,1002),(12871,1,14,1003),(12872,1,14,1004),(12873,1,14,1005),(12874,1,14,1101),(12875,1,14,1181),(12876,1,14,1182),(12877,1,14,1201),(12878,1,14,1202),(12879,1,14,1231),(12880,1,14,2401),(12881,1,14,2501),(12882,1,14,2503),(12883,1,14,2515),(12884,1,14,20001),(12886,1,14,23001),(12887,1,14,50101),(12944,1,16,11),(12945,1,16,21),(12946,1,16,31),(13056,1,16,41),(13057,1,16,42),(13058,1,16,44),(13059,1,16,45),(12948,1,16,61),(12949,1,16,71),(12950,1,16,72),(12951,1,16,74),(12952,1,16,75),(12953,1,16,78),(12954,1,16,79),(12955,1,16,81),(12956,1,16,91),(12957,1,16,95),(12958,1,16,97),(12959,1,16,101),(12960,1,16,111),(12961,1,16,121),(13060,1,16,141),(13061,1,16,142),(13062,1,16,144),(12962,1,16,151),(12963,1,16,161),(12964,1,16,171),(12965,1,16,221),(12966,1,16,222),(12967,1,16,229),(12968,1,16,241),(12969,1,16,242),(12970,1,16,243),(13128,1,16,251),(13064,1,16,262),(12972,1,16,281),(12973,1,16,300),(12974,1,16,331),(12975,1,16,341),(12976,1,16,342),(12977,1,16,343),(12978,1,16,344),(12979,1,16,531),(12980,1,16,700),(12981,1,16,1001),(12982,1,16,1002),(12983,1,16,1003),(12984,1,16,1004),(12985,1,16,1005),(12986,1,16,1101),(12987,1,16,1181),(12988,1,16,1182),(12989,1,16,1201),(12990,1,16,1202),(12991,1,16,1231),(12992,1,16,2401),(12993,1,16,2501),(12994,1,16,2503),(12995,1,16,2515),(12996,1,16,20001),(12998,1,16,23001),(12999,1,16,50101),(13000,1,17,11),(13001,1,17,21),(13002,1,17,31),(13065,1,17,41),(13066,1,17,42),(13067,1,17,44),(13068,1,17,45),(13004,1,17,61),(13005,1,17,71),(13006,1,17,72),(13007,1,17,74),(13008,1,17,75),(13009,1,17,78),(13010,1,17,79),(13011,1,17,81),(13012,1,17,91),(13013,1,17,95),(13014,1,17,97),(13015,1,17,101),(13016,1,17,111),(13017,1,17,121),(13069,1,17,141),(13070,1,17,142),(13071,1,17,144),(13018,1,17,151),(13019,1,17,161),(13020,1,17,171),(13021,1,17,221),(13022,1,17,222),(13023,1,17,229),(13024,1,17,241),(13025,1,17,242),(13026,1,17,243),(13028,1,17,281),(13029,1,17,300),(13030,1,17,331),(13031,1,17,341),(13032,1,17,342),(13033,1,17,343),(13034,1,17,344),(13035,1,17,531),(13036,1,17,700),(13037,1,17,1001),(13038,1,17,1002),(13039,1,17,1003),(13040,1,17,1004),(13041,1,17,1005),(13042,1,17,1101),(13043,1,17,1181),(13044,1,17,1182),(13045,1,17,1201),(13046,1,17,1202),(13047,1,17,1231),(13048,1,17,2401),(13049,1,17,2501),(13050,1,17,2503),(13051,1,17,2515),(13052,1,17,20001),(13054,1,17,23001),(13055,1,17,50101),(14504,1,18,11),(14505,1,18,21),(14506,1,18,31),(14507,1,18,41),(14508,1,18,61),(14509,1,18,71),(14510,1,18,78),(14511,1,18,81),(14512,1,18,91),(14513,1,18,95),(14514,1,18,101),(14515,1,18,111),(14516,1,18,121),(14517,1,18,151),(14518,1,18,161),(14519,1,18,221),(14520,1,18,241),(14521,1,18,262),(14522,1,18,281),(14523,1,18,300),(14524,1,18,331),(14525,1,18,332),(14526,1,18,333),(14527,1,18,341),(14528,1,18,342),(14529,1,18,343),(14530,1,18,344),(14531,1,18,531),(14532,1,18,701),(14533,1,18,771),(14534,1,18,774),(14535,1,18,1001),(14536,1,18,1004),(14537,1,18,1101),(14538,1,18,1181),(14539,1,18,1182),(14540,1,18,1201),(14541,1,18,1231),(14542,1,18,2401),(14543,1,18,2501),(14544,1,18,2503),(14545,1,18,2515),(14546,1,18,20001),(14548,1,18,50101),(14549,1,18,59001),(15242,1,19,21),(15243,1,19,31),(15244,1,19,41),(15245,1,19,61),(15246,1,19,71),(15247,1,19,78),(15248,1,19,81),(15249,1,19,101),(15250,1,19,121),(15251,1,19,151),(15252,1,19,161),(15253,1,19,221),(15254,1,19,241),(15255,1,19,262),(15256,1,19,281),(15257,1,19,300),(15258,1,19,331),(15259,1,19,332),(15260,1,19,341),(15261,1,19,342),(15262,1,19,343),(15263,1,19,344),(15264,1,19,531),(15265,1,19,701),(15266,1,19,771),(15267,1,19,774),(15268,1,19,777),(15269,1,19,1001),(15270,1,19,1004),(15271,1,19,1101),(15272,1,19,1121),(15273,1,19,1181),(15274,1,19,1182),(15275,1,19,1201),(15276,1,19,1231),(15277,1,19,2401),(15278,1,19,2501),(15279,1,19,20001),(15281,1,19,50101),(15282,1,19,59001),(15283,1,19,63001);
 /*!40000 ALTER TABLE `llx_user_rights` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -12140,183 +12545,6 @@ INSERT INTO `llx_usergroup_user` VALUES (2,1,1,3),(12,1,2,4),(3,1,3,3),(4,1,11,2
 /*!40000 ALTER TABLE `llx_usergroup_user` ENABLE KEYS */;
 UNLOCK TABLES;
 
---
--- Table structure for table `llx_webmail_draft`
---
-
-DROP TABLE IF EXISTS `llx_webmail_draft`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_webmail_draft` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `entity` int(11) NOT NULL DEFAULT 1,
-  `fk_user` int(11) NOT NULL DEFAULT 0,
-  `fk_contact` int(11) NOT NULL DEFAULT 0,
-  `size` int(11) NOT NULL DEFAULT 0,
-  `subject` mediumtext COLLATE utf8_unicode_ci NOT NULL,
-  `body` longtext COLLATE utf8_unicode_ci NOT NULL,
-  `from` mediumtext COLLATE utf8_unicode_ci NOT NULL,
-  `to` mediumtext COLLATE utf8_unicode_ci NOT NULL,
-  `cc` mediumtext COLLATE utf8_unicode_ci NOT NULL,
-  `bcc` mediumtext COLLATE utf8_unicode_ci NOT NULL,
-  `files` int(11) NOT NULL DEFAULT 0,
-  `cron` datetime DEFAULT NULL,
-  PRIMARY KEY (`rowid`),
-  KEY `idx_webmail_draft_fk_user` (`fk_user`),
-  KEY `idx_webmail_draft_cron` (`cron`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_webmail_draft`
---
-
-LOCK TABLES `llx_webmail_draft` WRITE;
-/*!40000 ALTER TABLE `llx_webmail_draft` DISABLE KEYS */;
-/*!40000 ALTER TABLE `llx_webmail_draft` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `llx_webmail_files`
---
-
-DROP TABLE IF EXISTS `llx_webmail_files`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_webmail_files` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `fk_mail` int(11) NOT NULL DEFAULT 0,
-  `fk_user` int(11) NOT NULL DEFAULT 0,
-  `datetime` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-  `file_name` mediumtext COLLATE utf8_unicode_ci NOT NULL,
-  `file` mediumtext COLLATE utf8_unicode_ci NOT NULL,
-  `file_size` int(11) NOT NULL DEFAULT 0,
-  `file_type` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT '',
-  `search` longtext COLLATE utf8_unicode_ci NOT NULL,
-  PRIMARY KEY (`rowid`),
-  KEY `idx_webmail_files_fk_user` (`fk_user`),
-  KEY `idx_webmail_files_files` (`fk_mail`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_webmail_files`
---
-
-LOCK TABLES `llx_webmail_files` WRITE;
-/*!40000 ALTER TABLE `llx_webmail_files` DISABLE KEYS */;
-/*!40000 ALTER TABLE `llx_webmail_files` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `llx_webmail_mail`
---
-
-DROP TABLE IF EXISTS `llx_webmail_mail`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_webmail_mail` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `entity` int(11) NOT NULL DEFAULT 1,
-  `fk_user` int(11) NOT NULL DEFAULT 0,
-  `fk_soc` int(11) NOT NULL DEFAULT 0,
-  `fk_contact` int(11) NOT NULL DEFAULT 0,
-  `uidl` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT '',
-  `datetime` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-  `size` int(11) NOT NULL DEFAULT 0,
-  `subject` mediumtext COLLATE utf8_unicode_ci NOT NULL,
-  `body` longtext COLLATE utf8_unicode_ci NOT NULL,
-  `state_new` int(11) NOT NULL DEFAULT 0,
-  `state_reply` int(11) NOT NULL DEFAULT 0,
-  `state_forward` int(11) NOT NULL DEFAULT 0,
-  `state_wait` int(11) NOT NULL DEFAULT 0,
-  `state_spam` int(11) NOT NULL DEFAULT 0,
-  `id_correo` int(11) NOT NULL DEFAULT 0,
-  `is_outbox` int(11) NOT NULL DEFAULT 0,
-  `state_sent` int(11) NOT NULL DEFAULT 0,
-  `state_error` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT '',
-  `state_crt` int(11) NOT NULL DEFAULT 0,
-  `state_archiv` int(11) NOT NULL DEFAULT 0,
-  `priority` int(11) NOT NULL DEFAULT 0,
-  `sensitivity` int(11) NOT NULL DEFAULT 0,
-  `from` mediumtext COLLATE utf8_unicode_ci NOT NULL,
-  `to` mediumtext COLLATE utf8_unicode_ci NOT NULL,
-  `cc` mediumtext COLLATE utf8_unicode_ci NOT NULL,
-  `bcc` mediumtext COLLATE utf8_unicode_ci NOT NULL,
-  `files` int(11) NOT NULL DEFAULT 0,
-  `state_delete` int(11) NOT NULL DEFAULT 0,
-  PRIMARY KEY (`rowid`),
-  KEY `idx_webmail_mail_nospam` (`fk_user`,`state_spam`),
-  KEY `idx_webmail_mail_count` (`fk_user`,`state_new`),
-  KEY `idx_webmail_mail_sendmail` (`is_outbox`,`state_sent`),
-  KEY `idx_webmail_mail_fk_user` (`fk_user`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_webmail_mail`
---
-
-LOCK TABLES `llx_webmail_mail` WRITE;
-/*!40000 ALTER TABLE `llx_webmail_mail` DISABLE KEYS */;
-INSERT INTO `llx_webmail_mail` VALUES (1,1,1,27,0,'1452254519','2018-01-08 16:01:59',0,'Submission of invoice 16','You will find here the invoice 16<br />\r\n<br />\r\nSincerely',0,0,0,0,0,0,1,1,'0',0,0,0,0,'first last <fff@ff.com>','Aljoun Samira <contact@example.com>','','',1,0);
-/*!40000 ALTER TABLE `llx_webmail_mail` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `llx_webmail_users`
---
-
-DROP TABLE IF EXISTS `llx_webmail_users`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_webmail_users` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `entity` int(11) NOT NULL DEFAULT 1,
-  `fk_user` int(11) NOT NULL,
-  `login` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
-  `password` mediumtext COLLATE utf8_unicode_ci NOT NULL,
-  `safemail` tinyint(4) DEFAULT 1,
-  `dayssafe` int(11) DEFAULT 10,
-  PRIMARY KEY (`rowid`),
-  KEY `fk_webmail_users_fk_user` (`fk_user`),
-  CONSTRAINT `fk_webmail_users_fk_user` FOREIGN KEY (`fk_user`) REFERENCES `llx_user` (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_webmail_users`
---
-
-LOCK TABLES `llx_webmail_users` WRITE;
-/*!40000 ALTER TABLE `llx_webmail_users` DISABLE KEYS */;
-/*!40000 ALTER TABLE `llx_webmail_users` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `llx_webmail_users_view`
---
-
-DROP TABLE IF EXISTS `llx_webmail_users_view`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_webmail_users_view` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `fk_user` int(11) NOT NULL,
-  `fk_user_view` int(11) NOT NULL,
-  PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_webmail_users_view`
---
-
-LOCK TABLES `llx_webmail_users_view` WRITE;
-/*!40000 ALTER TABLE `llx_webmail_users_view` DISABLE KEYS */;
-/*!40000 ALTER TABLE `llx_webmail_users_view` ENABLE KEYS */;
-UNLOCK TABLES;
-
 --
 -- Table structure for table `llx_website`
 --
@@ -12535,7 +12763,7 @@ LOCK TABLES `llx_zapier_hook` WRITE;
 /*!40000 ALTER TABLE `llx_zapier_hook` DISABLE KEYS */;
 /*!40000 ALTER TABLE `llx_zapier_hook` ENABLE KEYS */;
 UNLOCK TABLES;
-
+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
 
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
 /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
@@ -12545,4 +12773,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2021-04-15 16:01:49
+-- Dump completed on 2021-07-11 19:54:10

From aeeb480f262b27729defe16861c56f168947f409 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 11 Jul 2021 20:04:16 +0200
Subject: [PATCH 1184/1497] Fix v14

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

diff --git a/htdocs/admin/mails_senderprofile_list.php b/htdocs/admin/mails_senderprofile_list.php
index 8ba5a990c33..d8c827337ad 100644
--- a/htdocs/admin/mails_senderprofile_list.php
+++ b/htdocs/admin/mails_senderprofile_list.php
@@ -413,8 +413,8 @@ if ($action != 'create') {
 	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 	*/
 	print '<table class="border centpercent tableforfield">';
-	print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td><input type="text" name="label" value="'.GETPOST('label', 'alphanohtml').'"></td></tr>';
-	print '<tr><td>'.$langs->trans("Email").'</td><td><input type="text" name="email" value="'.GETPOST('email', 'alphanohtml').'"></td></tr>';
+	print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td><input type="text" name="label" value="'.GETPOST('label', 'alphanohtml').'" autofocus></td></tr>';
+	print '<tr><td class="fieldrequired">'.$langs->trans("Email").'</td><td><input type="text" name="email" value="'.GETPOST('email', 'alphanohtml').'"></td></tr>';
 	print '<tr><td>'.$langs->trans("Signature").'</td><td>';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 	$doleditor = new DolEditor('signature', GETPOST('signature'), '', 138, 'dolibarr_notes', 'In', true, true, empty($conf->global->FCKEDITOR_ENABLE_USERSIGN) ? 0 : 1, ROWS_4, '90%');

From c9242d83ab92c5373e5ad5947d3e721549407033 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 11 Jul 2021 20:16:47 +0200
Subject: [PATCH 1185/1497] Clean code

---
 htdocs/core/lib/files.lib.php |  2 +-
 htdocs/install/upgrade2.php   | 13 -------------
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 45253d6a441..a1085c019a8 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1791,11 +1791,11 @@ function addFileIntoDatabaseIndex($dir, $file, $fullpathorig = '', $mode = 'uplo
 			$ecmfile->src_object_id = $object->id;
 			if (isset($object->table_element)) {
 				$ecmfile->src_object_type = $object->table_element;
-				if (isset($object->src_object_description)) $ecmfile->description = $object->src_object_description;
 			} else {
 				dol_syslog('Error: object ' . get_class($object) . ' has no table_element attribute.');
 				return -1;
 			}
+			if (isset($object->src_object_description)) $ecmfile->description = $object->src_object_description;
 			if (isset($object->src_object_keywords)) $ecmfile->keywords = $object->src_object_keywords;
 		}
 
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index b0f4d831473..a11de7c447e 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -3439,19 +3439,6 @@ function migrate_categorie_association($db, $langs, $conf)
 			}
 
 			if (!$error) {
-				// TODO DROP table in the next release
-				/*
-				$sqlDrop = "DROP TABLE ".MAIN_DB_PREFIX."categorie_association";
-				if ($db->query($sqlDrop))
-				{
-					$db->commit();
-				}
-				else
-				{
-					$db->rollback();
-				}
-				*/
-
 				$db->commit();
 			} else {
 				$db->rollback();

From 4b2bbd03645b6cfb2faaf08ecefcb4202772fc37 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 11 Jul 2021 20:27:03 +0200
Subject: [PATCH 1186/1497] Sync transifex

---
 htdocs/langs/am_ET/admin.lang               |   12 +-
 htdocs/langs/am_ET/banks.lang               |    2 +-
 htdocs/langs/am_ET/boxes.lang               |    4 +-
 htdocs/langs/am_ET/cashdesk.lang            |    2 +-
 htdocs/langs/am_ET/errors.lang              |    1 +
 htdocs/langs/am_ET/eventorganization.lang   |    4 +
 htdocs/langs/am_ET/install.lang             |    1 +
 htdocs/langs/am_ET/interventions.lang       |    2 +
 htdocs/langs/am_ET/productbatch.lang        |    8 +-
 htdocs/langs/am_ET/products.lang            |    3 +-
 htdocs/langs/am_ET/salaries.lang            |   11 +-
 htdocs/langs/am_ET/ticket.lang              |   11 +-
 htdocs/langs/am_ET/users.lang               |    4 +-
 htdocs/langs/am_ET/website.lang             |    2 +-
 htdocs/langs/ar_EG/admin.lang               |    1 +
 htdocs/langs/ar_EG/products.lang            |    2 -
 htdocs/langs/ar_EG/ticket.lang              |    1 -
 htdocs/langs/ar_EG/website.lang             |    1 -
 htdocs/langs/ar_IQ/admin.lang               |   12 +-
 htdocs/langs/ar_IQ/banks.lang               |    2 +-
 htdocs/langs/ar_IQ/boxes.lang               |    4 +-
 htdocs/langs/ar_IQ/cashdesk.lang            |    2 +-
 htdocs/langs/ar_IQ/errors.lang              |    1 +
 htdocs/langs/ar_IQ/eventorganization.lang   |    4 +
 htdocs/langs/ar_IQ/install.lang             |    1 +
 htdocs/langs/ar_IQ/productbatch.lang        |    8 +-
 htdocs/langs/ar_IQ/products.lang            |    3 +-
 htdocs/langs/ar_IQ/salaries.lang            |    6 +-
 htdocs/langs/ar_IQ/ticket.lang              |   11 +-
 htdocs/langs/ar_IQ/users.lang               |    4 +-
 htdocs/langs/ar_IQ/website.lang             |    2 +-
 htdocs/langs/ar_SA/admin.lang               |   12 +-
 htdocs/langs/ar_SA/banks.lang               |    2 +-
 htdocs/langs/ar_SA/boxes.lang               |    4 +-
 htdocs/langs/ar_SA/cashdesk.lang            |    2 +-
 htdocs/langs/ar_SA/errors.lang              |    1 +
 htdocs/langs/ar_SA/eventorganization.lang   |    4 +
 htdocs/langs/ar_SA/install.lang             |    1 +
 htdocs/langs/ar_SA/interventions.lang       |    2 +
 htdocs/langs/ar_SA/productbatch.lang        |    8 +-
 htdocs/langs/ar_SA/products.lang            |    3 +-
 htdocs/langs/ar_SA/salaries.lang            |   11 +-
 htdocs/langs/ar_SA/ticket.lang              |   11 +-
 htdocs/langs/ar_SA/users.lang               |    4 +-
 htdocs/langs/ar_SA/website.lang             |    2 +-
 htdocs/langs/az_AZ/admin.lang               |   12 +-
 htdocs/langs/az_AZ/banks.lang               |    2 +-
 htdocs/langs/az_AZ/boxes.lang               |    4 +-
 htdocs/langs/az_AZ/cashdesk.lang            |    2 +-
 htdocs/langs/az_AZ/errors.lang              |    1 +
 htdocs/langs/az_AZ/eventorganization.lang   |    4 +
 htdocs/langs/az_AZ/install.lang             |    1 +
 htdocs/langs/az_AZ/interventions.lang       |    2 +
 htdocs/langs/az_AZ/productbatch.lang        |    8 +-
 htdocs/langs/az_AZ/products.lang            |    3 +-
 htdocs/langs/az_AZ/salaries.lang            |   11 +-
 htdocs/langs/az_AZ/ticket.lang              |   11 +-
 htdocs/langs/az_AZ/users.lang               |    4 +-
 htdocs/langs/az_AZ/website.lang             |    2 +-
 htdocs/langs/bg_BG/admin.lang               |   12 +-
 htdocs/langs/bg_BG/banks.lang               |    2 +-
 htdocs/langs/bg_BG/boxes.lang               |    4 +-
 htdocs/langs/bg_BG/cashdesk.lang            |    2 +-
 htdocs/langs/bg_BG/errors.lang              |    1 +
 htdocs/langs/bg_BG/eventorganization.lang   |    4 +
 htdocs/langs/bg_BG/install.lang             |    1 +
 htdocs/langs/bg_BG/interventions.lang       |    2 +
 htdocs/langs/bg_BG/productbatch.lang        |    8 +-
 htdocs/langs/bg_BG/products.lang            |    3 +-
 htdocs/langs/bg_BG/salaries.lang            |   11 +-
 htdocs/langs/bg_BG/ticket.lang              |   11 +-
 htdocs/langs/bg_BG/users.lang               |    4 +-
 htdocs/langs/bg_BG/website.lang             |    2 +-
 htdocs/langs/bn_BD/admin.lang               |   12 +-
 htdocs/langs/bn_BD/banks.lang               |    2 +-
 htdocs/langs/bn_BD/boxes.lang               |    4 +-
 htdocs/langs/bn_BD/cashdesk.lang            |    2 +-
 htdocs/langs/bn_BD/errors.lang              |    1 +
 htdocs/langs/bn_BD/eventorganization.lang   |    4 +
 htdocs/langs/bn_BD/install.lang             |    1 +
 htdocs/langs/bn_BD/interventions.lang       |    2 +
 htdocs/langs/bn_BD/productbatch.lang        |    8 +-
 htdocs/langs/bn_BD/products.lang            |    3 +-
 htdocs/langs/bn_BD/salaries.lang            |   11 +-
 htdocs/langs/bn_BD/ticket.lang              |   11 +-
 htdocs/langs/bn_BD/users.lang               |    4 +-
 htdocs/langs/bn_BD/website.lang             |    2 +-
 htdocs/langs/bn_IN/admin.lang               |   12 +-
 htdocs/langs/bn_IN/banks.lang               |    2 +-
 htdocs/langs/bn_IN/boxes.lang               |    4 +-
 htdocs/langs/bn_IN/cashdesk.lang            |    2 +-
 htdocs/langs/bn_IN/errors.lang              |    1 +
 htdocs/langs/bn_IN/eventorganization.lang   |    4 +
 htdocs/langs/bn_IN/install.lang             |    1 +
 htdocs/langs/bn_IN/interventions.lang       |    2 +
 htdocs/langs/bn_IN/productbatch.lang        |    8 +-
 htdocs/langs/bn_IN/products.lang            |    3 +-
 htdocs/langs/bn_IN/salaries.lang            |   11 +-
 htdocs/langs/bn_IN/ticket.lang              |   11 +-
 htdocs/langs/bn_IN/users.lang               |    4 +-
 htdocs/langs/bn_IN/website.lang             |    2 +-
 htdocs/langs/bs_BA/admin.lang               |   12 +-
 htdocs/langs/bs_BA/banks.lang               |    2 +-
 htdocs/langs/bs_BA/boxes.lang               |    4 +-
 htdocs/langs/bs_BA/cashdesk.lang            |    2 +-
 htdocs/langs/bs_BA/errors.lang              |    1 +
 htdocs/langs/bs_BA/eventorganization.lang   |    4 +
 htdocs/langs/bs_BA/install.lang             |    1 +
 htdocs/langs/bs_BA/interventions.lang       |    2 +
 htdocs/langs/bs_BA/productbatch.lang        |    8 +-
 htdocs/langs/bs_BA/products.lang            |    3 +-
 htdocs/langs/bs_BA/salaries.lang            |   11 +-
 htdocs/langs/bs_BA/ticket.lang              |   11 +-
 htdocs/langs/bs_BA/users.lang               |    4 +-
 htdocs/langs/bs_BA/website.lang             |    2 +-
 htdocs/langs/ca_ES/admin.lang               |   12 +-
 htdocs/langs/ca_ES/banks.lang               |    2 +-
 htdocs/langs/ca_ES/boxes.lang               |    4 +-
 htdocs/langs/ca_ES/cashdesk.lang            |    2 +-
 htdocs/langs/ca_ES/errors.lang              |    1 +
 htdocs/langs/ca_ES/eventorganization.lang   |    4 +
 htdocs/langs/ca_ES/install.lang             |   15 +-
 htdocs/langs/ca_ES/interventions.lang       |    4 +-
 htdocs/langs/ca_ES/knowledgemanagement.lang |   12 +-
 htdocs/langs/ca_ES/productbatch.lang        |    8 +-
 htdocs/langs/ca_ES/products.lang            |    3 +-
 htdocs/langs/ca_ES/salaries.lang            |    6 +-
 htdocs/langs/ca_ES/ticket.lang              |   13 +-
 htdocs/langs/ca_ES/users.lang               |    4 +-
 htdocs/langs/ca_ES/website.lang             |    2 +-
 htdocs/langs/cs_CZ/admin.lang               |   12 +-
 htdocs/langs/cs_CZ/banks.lang               |    2 +-
 htdocs/langs/cs_CZ/boxes.lang               |    4 +-
 htdocs/langs/cs_CZ/cashdesk.lang            |    2 +-
 htdocs/langs/cs_CZ/errors.lang              |    1 +
 htdocs/langs/cs_CZ/eventorganization.lang   |    4 +
 htdocs/langs/cs_CZ/install.lang             |    1 +
 htdocs/langs/cs_CZ/interventions.lang       |    2 +
 htdocs/langs/cs_CZ/productbatch.lang        |    8 +-
 htdocs/langs/cs_CZ/products.lang            |    3 +-
 htdocs/langs/cs_CZ/salaries.lang            |   11 +-
 htdocs/langs/cs_CZ/ticket.lang              |   11 +-
 htdocs/langs/cs_CZ/users.lang               |    4 +-
 htdocs/langs/cs_CZ/website.lang             |    2 +-
 htdocs/langs/da_DK/admin.lang               |   11 +-
 htdocs/langs/da_DK/banks.lang               |    2 +-
 htdocs/langs/da_DK/boxes.lang               |    4 +-
 htdocs/langs/da_DK/cashdesk.lang            |    2 +-
 htdocs/langs/da_DK/errors.lang              |    1 +
 htdocs/langs/da_DK/eventorganization.lang   |    4 +
 htdocs/langs/da_DK/install.lang             |    1 +
 htdocs/langs/da_DK/interventions.lang       |    2 +
 htdocs/langs/da_DK/productbatch.lang        |    8 +-
 htdocs/langs/da_DK/products.lang            |    2 +-
 htdocs/langs/da_DK/salaries.lang            |   11 +-
 htdocs/langs/da_DK/ticket.lang              |    2 +-
 htdocs/langs/da_DK/website.lang             |    2 +-
 htdocs/langs/de_AT/admin.lang               |    1 -
 htdocs/langs/de_AT/products.lang            |    1 -
 htdocs/langs/de_AT/salaries.lang            |    3 -
 htdocs/langs/de_AT/ticket.lang              |    4 -
 htdocs/langs/de_AT/users.lang               |    2 -
 htdocs/langs/de_AT/website.lang             |    2 -
 htdocs/langs/de_CH/accountancy.lang         |   25 +-
 htdocs/langs/de_CH/interventions.lang       |    1 +
 htdocs/langs/de_CH/salaries.lang            |    1 -
 htdocs/langs/de_CH/ticket.lang              |    3 -
 htdocs/langs/de_CH/users.lang               |    1 -
 htdocs/langs/de_CH/website.lang             |    1 -
 htdocs/langs/de_DE/admin.lang               |   12 +-
 htdocs/langs/de_DE/banks.lang               |    2 +-
 htdocs/langs/de_DE/boxes.lang               |    4 +-
 htdocs/langs/de_DE/cashdesk.lang            |    2 +-
 htdocs/langs/de_DE/errors.lang              |    1 +
 htdocs/langs/de_DE/eventorganization.lang   |    4 +
 htdocs/langs/de_DE/install.lang             |    1 +
 htdocs/langs/de_DE/interventions.lang       |    4 +-
 htdocs/langs/de_DE/productbatch.lang        |    8 +-
 htdocs/langs/de_DE/products.lang            |    3 +-
 htdocs/langs/de_DE/salaries.lang            |    6 +-
 htdocs/langs/de_DE/ticket.lang              |   11 +-
 htdocs/langs/de_DE/users.lang               |    4 +-
 htdocs/langs/de_DE/website.lang             |    2 +-
 htdocs/langs/el_CY/admin.lang               |    1 -
 htdocs/langs/el_CY/products.lang            |    2 -
 htdocs/langs/el_CY/ticket.lang              |    5 -
 htdocs/langs/el_CY/users.lang               |    3 -
 htdocs/langs/el_CY/website.lang             |    2 -
 htdocs/langs/el_GR/admin.lang               |   12 +-
 htdocs/langs/el_GR/banks.lang               |    2 +-
 htdocs/langs/el_GR/boxes.lang               |    4 +-
 htdocs/langs/el_GR/cashdesk.lang            |    2 +-
 htdocs/langs/el_GR/errors.lang              |    1 +
 htdocs/langs/el_GR/eventorganization.lang   |    4 +
 htdocs/langs/el_GR/install.lang             |    1 +
 htdocs/langs/el_GR/interventions.lang       |    7 +-
 htdocs/langs/el_GR/productbatch.lang        |    8 +-
 htdocs/langs/el_GR/products.lang            |    5 +-
 htdocs/langs/el_GR/salaries.lang            |   31 +-
 htdocs/langs/el_GR/ticket.lang              |   11 +-
 htdocs/langs/el_GR/users.lang               |    4 +-
 htdocs/langs/el_GR/website.lang             |    2 +-
 htdocs/langs/en_AU/admin.lang               |    1 -
 htdocs/langs/en_AU/products.lang            |    2 -
 htdocs/langs/en_AU/salaries.lang            |    3 -
 htdocs/langs/en_AU/ticket.lang              |    5 -
 htdocs/langs/en_AU/users.lang               |    3 -
 htdocs/langs/en_AU/website.lang             |    2 -
 htdocs/langs/en_CA/admin.lang               |    1 -
 htdocs/langs/en_CA/products.lang            |    2 -
 htdocs/langs/en_CA/salaries.lang            |    3 -
 htdocs/langs/en_CA/ticket.lang              |    5 -
 htdocs/langs/en_CA/users.lang               |    3 -
 htdocs/langs/en_CA/website.lang             |    2 -
 htdocs/langs/en_GB/admin.lang               |    1 -
 htdocs/langs/en_GB/products.lang            |    1 -
 htdocs/langs/en_GB/ticket.lang              |    5 -
 htdocs/langs/en_IN/admin.lang               |    1 -
 htdocs/langs/en_IN/products.lang            |    2 -
 htdocs/langs/en_IN/salaries.lang            |    3 -
 htdocs/langs/en_IN/ticket.lang              |    5 -
 htdocs/langs/en_IN/users.lang               |    3 -
 htdocs/langs/en_IN/website.lang             |    2 -
 htdocs/langs/en_SG/admin.lang               |    1 -
 htdocs/langs/en_SG/products.lang            |    2 -
 htdocs/langs/en_SG/salaries.lang            |    3 -
 htdocs/langs/en_SG/ticket.lang              |    5 -
 htdocs/langs/en_SG/users.lang               |    3 -
 htdocs/langs/en_SG/website.lang             |    2 -
 htdocs/langs/es_AR/admin.lang               |    3 -
 htdocs/langs/es_AR/interventions.lang       |    1 +
 htdocs/langs/es_AR/products.lang            |    1 -
 htdocs/langs/es_AR/salaries.lang            |    3 -
 htdocs/langs/es_AR/ticket.lang              |    3 -
 htdocs/langs/es_AR/users.lang               |    2 -
 htdocs/langs/es_BO/admin.lang               |    1 -
 htdocs/langs/es_BO/products.lang            |    2 -
 htdocs/langs/es_BO/salaries.lang            |    3 -
 htdocs/langs/es_BO/ticket.lang              |    5 -
 htdocs/langs/es_BO/users.lang               |    3 -
 htdocs/langs/es_BO/website.lang             |    2 -
 htdocs/langs/es_CL/admin.lang               |    4 +-
 htdocs/langs/es_CL/products.lang            |    1 -
 htdocs/langs/es_CL/salaries.lang            |    1 -
 htdocs/langs/es_CL/ticket.lang              |    4 -
 htdocs/langs/es_CL/users.lang               |    2 -
 htdocs/langs/es_CL/website.lang             |    1 -
 htdocs/langs/es_CO/admin.lang               |    4 +-
 htdocs/langs/es_CO/banks.lang               |    1 -
 htdocs/langs/es_CO/productbatch.lang        |    2 -
 htdocs/langs/es_CO/products.lang            |    1 -
 htdocs/langs/es_CO/salaries.lang            |    4 +-
 htdocs/langs/es_CO/users.lang               |    2 -
 htdocs/langs/es_CO/website.lang             |    2 -
 htdocs/langs/es_DO/admin.lang               |    1 -
 htdocs/langs/es_DO/products.lang            |    2 -
 htdocs/langs/es_DO/salaries.lang            |    3 -
 htdocs/langs/es_DO/ticket.lang              |    5 -
 htdocs/langs/es_DO/users.lang               |    3 -
 htdocs/langs/es_DO/website.lang             |    2 -
 htdocs/langs/es_EC/admin.lang               |    4 +-
 htdocs/langs/es_EC/products.lang            |    2 -
 htdocs/langs/es_EC/salaries.lang            |    3 -
 htdocs/langs/es_EC/users.lang               |    2 -
 htdocs/langs/es_EC/website.lang             |    1 -
 htdocs/langs/es_ES/admin.lang               |   11 +-
 htdocs/langs/es_ES/banks.lang               |    2 +-
 htdocs/langs/es_ES/boxes.lang               |    4 +-
 htdocs/langs/es_ES/cashdesk.lang            |    2 +-
 htdocs/langs/es_ES/errors.lang              |    1 +
 htdocs/langs/es_ES/eventorganization.lang   |    4 +
 htdocs/langs/es_ES/install.lang             |    1 +
 htdocs/langs/es_ES/productbatch.lang        |    8 +-
 htdocs/langs/es_ES/salaries.lang            |   11 +-
 htdocs/langs/es_ES/ticket.lang              |    2 +-
 htdocs/langs/es_ES/users.lang               |    4 +-
 htdocs/langs/es_ES/website.lang             |    2 +-
 htdocs/langs/es_GT/admin.lang               |    1 -
 htdocs/langs/es_GT/products.lang            |    2 -
 htdocs/langs/es_GT/salaries.lang            |    3 -
 htdocs/langs/es_GT/ticket.lang              |    5 -
 htdocs/langs/es_GT/users.lang               |    3 -
 htdocs/langs/es_GT/website.lang             |    2 -
 htdocs/langs/es_HN/admin.lang               |    1 -
 htdocs/langs/es_HN/products.lang            |    2 -
 htdocs/langs/es_HN/salaries.lang            |    3 -
 htdocs/langs/es_HN/ticket.lang              |    5 -
 htdocs/langs/es_HN/users.lang               |    3 -
 htdocs/langs/es_HN/website.lang             |    2 -
 htdocs/langs/es_MX/products.lang            |    1 -
 htdocs/langs/es_MX/ticket.lang              |    3 -
 htdocs/langs/es_MX/users.lang               |    2 -
 htdocs/langs/es_PA/admin.lang               |    1 -
 htdocs/langs/es_PA/products.lang            |    2 -
 htdocs/langs/es_PA/salaries.lang            |    3 -
 htdocs/langs/es_PA/ticket.lang              |    5 -
 htdocs/langs/es_PA/users.lang               |    3 -
 htdocs/langs/es_PA/website.lang             |    2 -
 htdocs/langs/es_PE/admin.lang               |    1 -
 htdocs/langs/es_PE/products.lang            |    1 -
 htdocs/langs/es_PE/ticket.lang              |    4 -
 htdocs/langs/es_PE/users.lang               |    2 -
 htdocs/langs/es_PY/admin.lang               |    1 -
 htdocs/langs/es_PY/products.lang            |    2 -
 htdocs/langs/es_PY/salaries.lang            |    3 -
 htdocs/langs/es_PY/ticket.lang              |    5 -
 htdocs/langs/es_PY/users.lang               |    3 -
 htdocs/langs/es_PY/website.lang             |    2 -
 htdocs/langs/es_US/admin.lang               |    1 -
 htdocs/langs/es_US/products.lang            |    2 -
 htdocs/langs/es_US/salaries.lang            |    3 -
 htdocs/langs/es_US/ticket.lang              |    5 -
 htdocs/langs/es_US/users.lang               |    3 -
 htdocs/langs/es_US/website.lang             |    2 -
 htdocs/langs/es_UY/admin.lang               |    1 -
 htdocs/langs/es_UY/products.lang            |    2 -
 htdocs/langs/es_UY/salaries.lang            |    3 -
 htdocs/langs/es_UY/ticket.lang              |    5 -
 htdocs/langs/es_UY/users.lang               |    3 -
 htdocs/langs/es_UY/website.lang             |    2 -
 htdocs/langs/es_VE/admin.lang               |    1 -
 htdocs/langs/es_VE/products.lang            |    4 +
 htdocs/langs/es_VE/salaries.lang            |    3 -
 htdocs/langs/es_VE/ticket.lang              |    3 -
 htdocs/langs/es_VE/users.lang               |    3 -
 htdocs/langs/es_VE/website.lang             |    2 -
 htdocs/langs/et_EE/admin.lang               |   12 +-
 htdocs/langs/et_EE/banks.lang               |    2 +-
 htdocs/langs/et_EE/boxes.lang               |    4 +-
 htdocs/langs/et_EE/cashdesk.lang            |    2 +-
 htdocs/langs/et_EE/errors.lang              |    1 +
 htdocs/langs/et_EE/eventorganization.lang   |    4 +
 htdocs/langs/et_EE/install.lang             |    1 +
 htdocs/langs/et_EE/interventions.lang       |    2 +
 htdocs/langs/et_EE/productbatch.lang        |    8 +-
 htdocs/langs/et_EE/products.lang            |    3 +-
 htdocs/langs/et_EE/salaries.lang            |   11 +-
 htdocs/langs/et_EE/ticket.lang              |   11 +-
 htdocs/langs/et_EE/users.lang               |    4 +-
 htdocs/langs/et_EE/website.lang             |    2 +-
 htdocs/langs/eu_ES/admin.lang               |   12 +-
 htdocs/langs/eu_ES/banks.lang               |    2 +-
 htdocs/langs/eu_ES/boxes.lang               |    4 +-
 htdocs/langs/eu_ES/cashdesk.lang            |    2 +-
 htdocs/langs/eu_ES/errors.lang              |    1 +
 htdocs/langs/eu_ES/eventorganization.lang   |    4 +
 htdocs/langs/eu_ES/install.lang             |    1 +
 htdocs/langs/eu_ES/interventions.lang       |    2 +
 htdocs/langs/eu_ES/productbatch.lang        |    8 +-
 htdocs/langs/eu_ES/products.lang            |    3 +-
 htdocs/langs/eu_ES/salaries.lang            |   11 +-
 htdocs/langs/eu_ES/ticket.lang              |   11 +-
 htdocs/langs/eu_ES/users.lang               |    4 +-
 htdocs/langs/eu_ES/website.lang             |    2 +-
 htdocs/langs/fa_IR/admin.lang               |   12 +-
 htdocs/langs/fa_IR/banks.lang               |    2 +-
 htdocs/langs/fa_IR/boxes.lang               |    4 +-
 htdocs/langs/fa_IR/cashdesk.lang            |    2 +-
 htdocs/langs/fa_IR/errors.lang              |    1 +
 htdocs/langs/fa_IR/eventorganization.lang   |    4 +
 htdocs/langs/fa_IR/install.lang             |    1 +
 htdocs/langs/fa_IR/interventions.lang       |    2 +
 htdocs/langs/fa_IR/productbatch.lang        |    8 +-
 htdocs/langs/fa_IR/products.lang            |    3 +-
 htdocs/langs/fa_IR/salaries.lang            |   11 +-
 htdocs/langs/fa_IR/ticket.lang              |   11 +-
 htdocs/langs/fa_IR/users.lang               |    4 +-
 htdocs/langs/fa_IR/website.lang             |    2 +-
 htdocs/langs/fi_FI/admin.lang               |   12 +-
 htdocs/langs/fi_FI/banks.lang               |    2 +-
 htdocs/langs/fi_FI/boxes.lang               |    4 +-
 htdocs/langs/fi_FI/cashdesk.lang            |    2 +-
 htdocs/langs/fi_FI/errors.lang              |    1 +
 htdocs/langs/fi_FI/eventorganization.lang   |    4 +
 htdocs/langs/fi_FI/install.lang             |    1 +
 htdocs/langs/fi_FI/interventions.lang       |    2 +
 htdocs/langs/fi_FI/productbatch.lang        |    8 +-
 htdocs/langs/fi_FI/products.lang            |    3 +-
 htdocs/langs/fi_FI/salaries.lang            |   11 +-
 htdocs/langs/fi_FI/ticket.lang              |   11 +-
 htdocs/langs/fi_FI/users.lang               |    4 +-
 htdocs/langs/fi_FI/website.lang             |    2 +-
 htdocs/langs/fr_BE/admin.lang               |    2 +-
 htdocs/langs/fr_BE/products.lang            |    2 -
 htdocs/langs/fr_BE/salaries.lang            |    3 -
 htdocs/langs/fr_BE/ticket.lang              |    5 -
 htdocs/langs/fr_BE/users.lang               |    3 -
 htdocs/langs/fr_BE/website.lang             |    2 -
 htdocs/langs/fr_CA/admin.lang               |    1 -
 htdocs/langs/fr_CA/salaries.lang            |    3 -
 htdocs/langs/fr_CA/ticket.lang              |    3 -
 htdocs/langs/fr_CA/users.lang               |    2 -
 htdocs/langs/fr_CA/website.lang             |    1 -
 htdocs/langs/fr_CH/admin.lang               |    1 -
 htdocs/langs/fr_CH/products.lang            |    2 -
 htdocs/langs/fr_CH/salaries.lang            |    3 -
 htdocs/langs/fr_CH/ticket.lang              |    5 -
 htdocs/langs/fr_CH/users.lang               |    3 -
 htdocs/langs/fr_CH/website.lang             |    2 -
 htdocs/langs/fr_CI/admin.lang               |    1 -
 htdocs/langs/fr_CI/products.lang            |    2 -
 htdocs/langs/fr_CI/salaries.lang            |    3 -
 htdocs/langs/fr_CI/ticket.lang              |    5 -
 htdocs/langs/fr_CI/users.lang               |    3 -
 htdocs/langs/fr_CI/website.lang             |    2 -
 htdocs/langs/fr_CM/admin.lang               |    1 -
 htdocs/langs/fr_CM/products.lang            |    2 -
 htdocs/langs/fr_CM/salaries.lang            |    3 -
 htdocs/langs/fr_CM/ticket.lang              |    5 -
 htdocs/langs/fr_CM/users.lang               |    3 -
 htdocs/langs/fr_CM/website.lang             |    2 -
 htdocs/langs/fr_FR/accountancy.lang         |    9 +-
 htdocs/langs/fr_FR/admin.lang               |   34 +-
 htdocs/langs/fr_FR/banks.lang               |    6 +-
 htdocs/langs/fr_FR/bills.lang               |    2 +-
 htdocs/langs/fr_FR/boxes.lang               |    4 +-
 htdocs/langs/fr_FR/cashdesk.lang            |    6 +-
 htdocs/langs/fr_FR/deliveries.lang          |    2 +-
 htdocs/langs/fr_FR/ecm.lang                 |    2 +-
 htdocs/langs/fr_FR/errors.lang              |    3 +-
 htdocs/langs/fr_FR/eventorganization.lang   |   52 +-
 htdocs/langs/fr_FR/exports.lang             |    4 +-
 htdocs/langs/fr_FR/install.lang             |    1 +
 htdocs/langs/fr_FR/interventions.lang       |    2 +
 htdocs/langs/fr_FR/knowledgemanagement.lang |   14 +-
 htdocs/langs/fr_FR/languages.lang           |    4 +-
 htdocs/langs/fr_FR/main.lang                |    4 +-
 htdocs/langs/fr_FR/modulebuilder.lang       |    2 +-
 htdocs/langs/fr_FR/mrp.lang                 |    2 +-
 htdocs/langs/fr_FR/other.lang               |    2 +-
 htdocs/langs/fr_FR/partnership.lang         |   14 +-
 htdocs/langs/fr_FR/productbatch.lang        |    8 +-
 htdocs/langs/fr_FR/products.lang            |    3 +-
 htdocs/langs/fr_FR/projects.lang            |    2 +-
 htdocs/langs/fr_FR/salaries.lang            |    6 +-
 htdocs/langs/fr_FR/stocks.lang              |   15 +-
 htdocs/langs/fr_FR/ticket.lang              |   13 +-
 htdocs/langs/fr_FR/users.lang               |    2 +-
 htdocs/langs/fr_FR/website.lang             |    2 +-
 htdocs/langs/fr_GA/admin.lang               |    1 -
 htdocs/langs/fr_GA/products.lang            |    2 -
 htdocs/langs/fr_GA/salaries.lang            |    3 -
 htdocs/langs/fr_GA/ticket.lang              |    5 -
 htdocs/langs/fr_GA/users.lang               |    3 -
 htdocs/langs/fr_GA/website.lang             |    2 -
 htdocs/langs/gl_ES/admin.lang               |   12 +-
 htdocs/langs/gl_ES/banks.lang               |    2 +-
 htdocs/langs/gl_ES/boxes.lang               |    4 +-
 htdocs/langs/gl_ES/cashdesk.lang            |    2 +-
 htdocs/langs/gl_ES/errors.lang              |    1 +
 htdocs/langs/gl_ES/eventorganization.lang   |    4 +
 htdocs/langs/gl_ES/install.lang             |    5 +-
 htdocs/langs/gl_ES/productbatch.lang        |    8 +-
 htdocs/langs/gl_ES/products.lang            |    3 +-
 htdocs/langs/gl_ES/salaries.lang            |    6 +-
 htdocs/langs/gl_ES/ticket.lang              |   11 +-
 htdocs/langs/gl_ES/users.lang               |    4 +-
 htdocs/langs/gl_ES/website.lang             |    2 +-
 htdocs/langs/he_IL/admin.lang               |   12 +-
 htdocs/langs/he_IL/banks.lang               |    2 +-
 htdocs/langs/he_IL/boxes.lang               |    4 +-
 htdocs/langs/he_IL/cashdesk.lang            |    2 +-
 htdocs/langs/he_IL/errors.lang              |    1 +
 htdocs/langs/he_IL/eventorganization.lang   |    4 +
 htdocs/langs/he_IL/install.lang             |    1 +
 htdocs/langs/he_IL/interventions.lang       |    2 +
 htdocs/langs/he_IL/productbatch.lang        |    8 +-
 htdocs/langs/he_IL/products.lang            |    3 +-
 htdocs/langs/he_IL/salaries.lang            |   11 +-
 htdocs/langs/he_IL/ticket.lang              |   11 +-
 htdocs/langs/he_IL/users.lang               |    4 +-
 htdocs/langs/he_IL/website.lang             |    2 +-
 htdocs/langs/hi_IN/admin.lang               |   12 +-
 htdocs/langs/hi_IN/banks.lang               |    2 +-
 htdocs/langs/hi_IN/boxes.lang               |    4 +-
 htdocs/langs/hi_IN/cashdesk.lang            |    2 +-
 htdocs/langs/hi_IN/errors.lang              |    1 +
 htdocs/langs/hi_IN/eventorganization.lang   |    4 +
 htdocs/langs/hi_IN/install.lang             |    1 +
 htdocs/langs/hi_IN/interventions.lang       |    2 +
 htdocs/langs/hi_IN/productbatch.lang        |    8 +-
 htdocs/langs/hi_IN/products.lang            |    3 +-
 htdocs/langs/hi_IN/salaries.lang            |   11 +-
 htdocs/langs/hi_IN/ticket.lang              |   11 +-
 htdocs/langs/hi_IN/users.lang               |    4 +-
 htdocs/langs/hi_IN/website.lang             |    2 +-
 htdocs/langs/hr_HR/admin.lang               |   12 +-
 htdocs/langs/hr_HR/banks.lang               |    2 +-
 htdocs/langs/hr_HR/boxes.lang               |    4 +-
 htdocs/langs/hr_HR/cashdesk.lang            |    2 +-
 htdocs/langs/hr_HR/errors.lang              |    1 +
 htdocs/langs/hr_HR/eventorganization.lang   |    4 +
 htdocs/langs/hr_HR/install.lang             |    1 +
 htdocs/langs/hr_HR/productbatch.lang        |    8 +-
 htdocs/langs/hr_HR/products.lang            |    3 +-
 htdocs/langs/hr_HR/salaries.lang            |   11 +-
 htdocs/langs/hr_HR/ticket.lang              |   11 +-
 htdocs/langs/hr_HR/users.lang               |    4 +-
 htdocs/langs/hr_HR/website.lang             |    2 +-
 htdocs/langs/hu_HU/admin.lang               |   12 +-
 htdocs/langs/hu_HU/banks.lang               |    2 +-
 htdocs/langs/hu_HU/boxes.lang               |    4 +-
 htdocs/langs/hu_HU/cashdesk.lang            |    2 +-
 htdocs/langs/hu_HU/errors.lang              |    1 +
 htdocs/langs/hu_HU/eventorganization.lang   |    4 +
 htdocs/langs/hu_HU/install.lang             |    1 +
 htdocs/langs/hu_HU/interventions.lang       |    2 +
 htdocs/langs/hu_HU/productbatch.lang        |    8 +-
 htdocs/langs/hu_HU/products.lang            |    3 +-
 htdocs/langs/hu_HU/salaries.lang            |   11 +-
 htdocs/langs/hu_HU/ticket.lang              |   11 +-
 htdocs/langs/hu_HU/users.lang               |    4 +-
 htdocs/langs/hu_HU/website.lang             |    2 +-
 htdocs/langs/id_ID/admin.lang               |   12 +-
 htdocs/langs/id_ID/banks.lang               |    2 +-
 htdocs/langs/id_ID/boxes.lang               |    4 +-
 htdocs/langs/id_ID/cashdesk.lang            |    2 +-
 htdocs/langs/id_ID/errors.lang              |    1 +
 htdocs/langs/id_ID/eventorganization.lang   |    4 +
 htdocs/langs/id_ID/install.lang             |    1 +
 htdocs/langs/id_ID/interventions.lang       |    2 +
 htdocs/langs/id_ID/productbatch.lang        |    8 +-
 htdocs/langs/id_ID/products.lang            |    5 +-
 htdocs/langs/id_ID/salaries.lang            |   11 +-
 htdocs/langs/id_ID/ticket.lang              |   11 +-
 htdocs/langs/id_ID/users.lang               |    4 +-
 htdocs/langs/id_ID/website.lang             |    2 +-
 htdocs/langs/is_IS/admin.lang               |   12 +-
 htdocs/langs/is_IS/banks.lang               |    2 +-
 htdocs/langs/is_IS/boxes.lang               |    4 +-
 htdocs/langs/is_IS/cashdesk.lang            |    2 +-
 htdocs/langs/is_IS/errors.lang              |    1 +
 htdocs/langs/is_IS/eventorganization.lang   |    4 +
 htdocs/langs/is_IS/install.lang             |    1 +
 htdocs/langs/is_IS/interventions.lang       |    2 +
 htdocs/langs/is_IS/productbatch.lang        |    8 +-
 htdocs/langs/is_IS/products.lang            |    3 +-
 htdocs/langs/is_IS/salaries.lang            |   11 +-
 htdocs/langs/is_IS/ticket.lang              |   11 +-
 htdocs/langs/is_IS/users.lang               |    4 +-
 htdocs/langs/is_IS/website.lang             |    2 +-
 htdocs/langs/it_CH/products.lang            |    2 -
 htdocs/langs/it_CH/salaries.lang            |    3 -
 htdocs/langs/it_CH/ticket.lang              |    4 -
 htdocs/langs/it_CH/users.lang               |    3 -
 htdocs/langs/it_IT/admin.lang               |   12 +-
 htdocs/langs/it_IT/banks.lang               |    2 +-
 htdocs/langs/it_IT/boxes.lang               |    4 +-
 htdocs/langs/it_IT/cashdesk.lang            |    2 +-
 htdocs/langs/it_IT/errors.lang              |    3 +-
 htdocs/langs/it_IT/eventorganization.lang   |    4 +
 htdocs/langs/it_IT/install.lang             |    1 +
 htdocs/langs/it_IT/productbatch.lang        |    8 +-
 htdocs/langs/it_IT/products.lang            |    3 +-
 htdocs/langs/it_IT/salaries.lang            |   13 +-
 htdocs/langs/it_IT/ticket.lang              |   11 +-
 htdocs/langs/it_IT/users.lang               |    4 +-
 htdocs/langs/it_IT/website.lang             |    2 +-
 htdocs/langs/ja_JP/admin.lang               |   11 +-
 htdocs/langs/ja_JP/banks.lang               |    2 +-
 htdocs/langs/ja_JP/boxes.lang               |    4 +-
 htdocs/langs/ja_JP/cashdesk.lang            |    2 +-
 htdocs/langs/ja_JP/errors.lang              |    1 +
 htdocs/langs/ja_JP/eventorganization.lang   |    4 +
 htdocs/langs/ja_JP/install.lang             |    1 +
 htdocs/langs/ja_JP/interventions.lang       |    2 +-
 htdocs/langs/ja_JP/productbatch.lang        |    8 +-
 htdocs/langs/ja_JP/salaries.lang            |   11 +-
 htdocs/langs/ja_JP/ticket.lang              |    2 +-
 htdocs/langs/ja_JP/users.lang               |    2 +-
 htdocs/langs/ja_JP/website.lang             |    2 +-
 htdocs/langs/ka_GE/admin.lang               |   12 +-
 htdocs/langs/ka_GE/banks.lang               |    2 +-
 htdocs/langs/ka_GE/boxes.lang               |    4 +-
 htdocs/langs/ka_GE/cashdesk.lang            |    2 +-
 htdocs/langs/ka_GE/errors.lang              |    1 +
 htdocs/langs/ka_GE/eventorganization.lang   |    4 +
 htdocs/langs/ka_GE/install.lang             |    1 +
 htdocs/langs/ka_GE/interventions.lang       |    2 +
 htdocs/langs/ka_GE/productbatch.lang        |    8 +-
 htdocs/langs/ka_GE/products.lang            |    3 +-
 htdocs/langs/ka_GE/salaries.lang            |   11 +-
 htdocs/langs/ka_GE/ticket.lang              |   11 +-
 htdocs/langs/ka_GE/users.lang               |    4 +-
 htdocs/langs/ka_GE/website.lang             |    2 +-
 htdocs/langs/km_KH/admin.lang               |   12 +-
 htdocs/langs/km_KH/banks.lang               |    2 +-
 htdocs/langs/km_KH/boxes.lang               |    4 +-
 htdocs/langs/km_KH/cashdesk.lang            |    2 +-
 htdocs/langs/km_KH/errors.lang              |    1 +
 htdocs/langs/km_KH/eventorganization.lang   |    4 +
 htdocs/langs/km_KH/install.lang             |    1 +
 htdocs/langs/km_KH/interventions.lang       |    2 +
 htdocs/langs/km_KH/productbatch.lang        |    8 +-
 htdocs/langs/km_KH/products.lang            |    3 +-
 htdocs/langs/km_KH/salaries.lang            |   11 +-
 htdocs/langs/km_KH/ticket.lang              |   11 +-
 htdocs/langs/km_KH/users.lang               |    4 +-
 htdocs/langs/km_KH/website.lang             |    2 +-
 htdocs/langs/kn_IN/admin.lang               |   12 +-
 htdocs/langs/kn_IN/banks.lang               |    2 +-
 htdocs/langs/kn_IN/boxes.lang               |    4 +-
 htdocs/langs/kn_IN/cashdesk.lang            |    2 +-
 htdocs/langs/kn_IN/errors.lang              |    1 +
 htdocs/langs/kn_IN/eventorganization.lang   |    4 +
 htdocs/langs/kn_IN/install.lang             |    1 +
 htdocs/langs/kn_IN/interventions.lang       |    2 +
 htdocs/langs/kn_IN/productbatch.lang        |    8 +-
 htdocs/langs/kn_IN/products.lang            |    3 +-
 htdocs/langs/kn_IN/salaries.lang            |   11 +-
 htdocs/langs/kn_IN/ticket.lang              |   11 +-
 htdocs/langs/kn_IN/users.lang               |    4 +-
 htdocs/langs/kn_IN/website.lang             |    2 +-
 htdocs/langs/ko_KR/admin.lang               |   12 +-
 htdocs/langs/ko_KR/banks.lang               |    2 +-
 htdocs/langs/ko_KR/boxes.lang               |    4 +-
 htdocs/langs/ko_KR/cashdesk.lang            |    2 +-
 htdocs/langs/ko_KR/errors.lang              |    1 +
 htdocs/langs/ko_KR/eventorganization.lang   |    4 +
 htdocs/langs/ko_KR/install.lang             |    1 +
 htdocs/langs/ko_KR/interventions.lang       |    2 +
 htdocs/langs/ko_KR/productbatch.lang        |    8 +-
 htdocs/langs/ko_KR/products.lang            |    3 +-
 htdocs/langs/ko_KR/salaries.lang            |   11 +-
 htdocs/langs/ko_KR/ticket.lang              |   11 +-
 htdocs/langs/ko_KR/users.lang               |    4 +-
 htdocs/langs/ko_KR/website.lang             |    2 +-
 htdocs/langs/lo_LA/admin.lang               |   12 +-
 htdocs/langs/lo_LA/banks.lang               |    2 +-
 htdocs/langs/lo_LA/boxes.lang               |    4 +-
 htdocs/langs/lo_LA/cashdesk.lang            |    2 +-
 htdocs/langs/lo_LA/errors.lang              |    1 +
 htdocs/langs/lo_LA/eventorganization.lang   |    4 +
 htdocs/langs/lo_LA/install.lang             |    1 +
 htdocs/langs/lo_LA/interventions.lang       |    2 +
 htdocs/langs/lo_LA/productbatch.lang        |    8 +-
 htdocs/langs/lo_LA/products.lang            |    3 +-
 htdocs/langs/lo_LA/salaries.lang            |   11 +-
 htdocs/langs/lo_LA/ticket.lang              |   11 +-
 htdocs/langs/lo_LA/users.lang               |    4 +-
 htdocs/langs/lo_LA/website.lang             |    2 +-
 htdocs/langs/lt_LT/admin.lang               |   12 +-
 htdocs/langs/lt_LT/banks.lang               |    2 +-
 htdocs/langs/lt_LT/boxes.lang               |    4 +-
 htdocs/langs/lt_LT/cashdesk.lang            |    2 +-
 htdocs/langs/lt_LT/errors.lang              |    1 +
 htdocs/langs/lt_LT/eventorganization.lang   |    4 +
 htdocs/langs/lt_LT/install.lang             |    1 +
 htdocs/langs/lt_LT/interventions.lang       |    2 +
 htdocs/langs/lt_LT/productbatch.lang        |    8 +-
 htdocs/langs/lt_LT/products.lang            |    3 +-
 htdocs/langs/lt_LT/salaries.lang            |   11 +-
 htdocs/langs/lt_LT/ticket.lang              |   11 +-
 htdocs/langs/lt_LT/users.lang               |    4 +-
 htdocs/langs/lt_LT/website.lang             |    2 +-
 htdocs/langs/lv_LV/admin.lang               |   17 +-
 htdocs/langs/lv_LV/banks.lang               |    2 +-
 htdocs/langs/lv_LV/bills.lang               |    4 +-
 htdocs/langs/lv_LV/boxes.lang               |    4 +-
 htdocs/langs/lv_LV/cashdesk.lang            |    2 +-
 htdocs/langs/lv_LV/categories.lang          |    2 +-
 htdocs/langs/lv_LV/companies.lang           |    2 +-
 htdocs/langs/lv_LV/compta.lang              |    2 +-
 htdocs/langs/lv_LV/contracts.lang           |    2 +-
 htdocs/langs/lv_LV/errors.lang              |    7 +-
 htdocs/langs/lv_LV/eventorganization.lang   |    4 +
 htdocs/langs/lv_LV/install.lang             |    1 +
 htdocs/langs/lv_LV/interventions.lang       |    2 +
 htdocs/langs/lv_LV/other.lang               |    2 +-
 htdocs/langs/lv_LV/printing.lang            |    4 +-
 htdocs/langs/lv_LV/productbatch.lang        |   10 +-
 htdocs/langs/lv_LV/products.lang            |    4 +-
 htdocs/langs/lv_LV/projects.lang            |    2 +-
 htdocs/langs/lv_LV/salaries.lang            |    6 +-
 htdocs/langs/lv_LV/supplier_proposal.lang   |    2 +-
 htdocs/langs/lv_LV/suppliers.lang           |    2 +-
 htdocs/langs/lv_LV/ticket.lang              |    2 +-
 htdocs/langs/lv_LV/trips.lang               |    2 +-
 htdocs/langs/lv_LV/website.lang             |    2 +-
 htdocs/langs/lv_LV/withdrawals.lang         |    2 +-
 htdocs/langs/mk_MK/admin.lang               |   12 +-
 htdocs/langs/mk_MK/banks.lang               |    2 +-
 htdocs/langs/mk_MK/boxes.lang               |    4 +-
 htdocs/langs/mk_MK/cashdesk.lang            |    2 +-
 htdocs/langs/mk_MK/errors.lang              |    1 +
 htdocs/langs/mk_MK/eventorganization.lang   |    4 +
 htdocs/langs/mk_MK/install.lang             |    1 +
 htdocs/langs/mk_MK/interventions.lang       |    2 +
 htdocs/langs/mk_MK/productbatch.lang        |    8 +-
 htdocs/langs/mk_MK/products.lang            |    3 +-
 htdocs/langs/mk_MK/salaries.lang            |   11 +-
 htdocs/langs/mk_MK/ticket.lang              |   11 +-
 htdocs/langs/mk_MK/users.lang               |    4 +-
 htdocs/langs/mk_MK/website.lang             |    2 +-
 htdocs/langs/mn_MN/admin.lang               |   12 +-
 htdocs/langs/mn_MN/banks.lang               |    2 +-
 htdocs/langs/mn_MN/boxes.lang               |    4 +-
 htdocs/langs/mn_MN/cashdesk.lang            |    2 +-
 htdocs/langs/mn_MN/errors.lang              |    1 +
 htdocs/langs/mn_MN/eventorganization.lang   |    4 +
 htdocs/langs/mn_MN/install.lang             |    1 +
 htdocs/langs/mn_MN/interventions.lang       |    2 +
 htdocs/langs/mn_MN/productbatch.lang        |    8 +-
 htdocs/langs/mn_MN/products.lang            |    3 +-
 htdocs/langs/mn_MN/salaries.lang            |   11 +-
 htdocs/langs/mn_MN/ticket.lang              |   11 +-
 htdocs/langs/mn_MN/users.lang               |    4 +-
 htdocs/langs/mn_MN/website.lang             |    2 +-
 htdocs/langs/nb_NO/admin.lang               |   12 +-
 htdocs/langs/nb_NO/banks.lang               |    2 +-
 htdocs/langs/nb_NO/boxes.lang               |    4 +-
 htdocs/langs/nb_NO/cashdesk.lang            |    2 +-
 htdocs/langs/nb_NO/errors.lang              |    1 +
 htdocs/langs/nb_NO/eventorganization.lang   |    4 +
 htdocs/langs/nb_NO/install.lang             |    1 +
 htdocs/langs/nb_NO/interventions.lang       |    7 +-
 htdocs/langs/nb_NO/productbatch.lang        |    8 +-
 htdocs/langs/nb_NO/products.lang            |    3 +-
 htdocs/langs/nb_NO/salaries.lang            |    6 +-
 htdocs/langs/nb_NO/ticket.lang              |   11 +-
 htdocs/langs/nb_NO/users.lang               |    4 +-
 htdocs/langs/nb_NO/website.lang             |    2 +-
 htdocs/langs/ne_NP/admin.lang               |   12 +-
 htdocs/langs/ne_NP/banks.lang               |    2 +-
 htdocs/langs/ne_NP/boxes.lang               |    4 +-
 htdocs/langs/ne_NP/cashdesk.lang            |    2 +-
 htdocs/langs/ne_NP/errors.lang              |    1 +
 htdocs/langs/ne_NP/eventorganization.lang   |    4 +
 htdocs/langs/ne_NP/install.lang             |    1 +
 htdocs/langs/ne_NP/interventions.lang       |    2 +
 htdocs/langs/ne_NP/productbatch.lang        |    8 +-
 htdocs/langs/ne_NP/products.lang            |    3 +-
 htdocs/langs/ne_NP/salaries.lang            |   11 +-
 htdocs/langs/ne_NP/ticket.lang              |   11 +-
 htdocs/langs/ne_NP/users.lang               |    4 +-
 htdocs/langs/ne_NP/website.lang             |    2 +-
 htdocs/langs/nl_BE/admin.lang               |    1 -
 htdocs/langs/nl_BE/interventions.lang       |    8 +
 htdocs/langs/nl_BE/salaries.lang            |    1 +
 htdocs/langs/nl_BE/users.lang               |    1 -
 htdocs/langs/nl_BE/website.lang             |    1 -
 htdocs/langs/nl_NL/admin.lang               |   12 +-
 htdocs/langs/nl_NL/banks.lang               |    2 +-
 htdocs/langs/nl_NL/boxes.lang               |    4 +-
 htdocs/langs/nl_NL/cashdesk.lang            |    2 +-
 htdocs/langs/nl_NL/errors.lang              |    1 +
 htdocs/langs/nl_NL/eventorganization.lang   |    4 +
 htdocs/langs/nl_NL/install.lang             |    1 +
 htdocs/langs/nl_NL/productbatch.lang        |    8 +-
 htdocs/langs/nl_NL/products.lang            |    5 +-
 htdocs/langs/nl_NL/salaries.lang            |    6 +-
 htdocs/langs/nl_NL/ticket.lang              |   11 +-
 htdocs/langs/nl_NL/users.lang               |    4 +-
 htdocs/langs/nl_NL/website.lang             |    2 +-
 htdocs/langs/pl_PL/accountancy.lang         |    9 +-
 htdocs/langs/pl_PL/admin.lang               |   30 +-
 htdocs/langs/pl_PL/banks.lang               |    2 +-
 htdocs/langs/pl_PL/bills.lang               |    2 +-
 htdocs/langs/pl_PL/boxes.lang               |    4 +-
 htdocs/langs/pl_PL/cashdesk.lang            |    2 +-
 htdocs/langs/pl_PL/deliveries.lang          |    2 +-
 htdocs/langs/pl_PL/errors.lang              |    3 +-
 htdocs/langs/pl_PL/eventorganization.lang   |    4 +
 htdocs/langs/pl_PL/exports.lang             |    4 +-
 htdocs/langs/pl_PL/install.lang             |  157 +--
 htdocs/langs/pl_PL/interventions.lang       |   18 +-
 htdocs/langs/pl_PL/knowledgemanagement.lang |   10 +-
 htdocs/langs/pl_PL/languages.lang           |    4 +-
 htdocs/langs/pl_PL/main.lang                |    4 +-
 htdocs/langs/pl_PL/partnership.lang         |    8 +-
 htdocs/langs/pl_PL/productbatch.lang        |    8 +-
 htdocs/langs/pl_PL/products.lang            |    5 +-
 htdocs/langs/pl_PL/salaries.lang            |   17 +-
 htdocs/langs/pl_PL/stocks.lang              |    6 +-
 htdocs/langs/pl_PL/ticket.lang              |   13 +-
 htdocs/langs/pl_PL/users.lang               |    2 +-
 htdocs/langs/pl_PL/website.lang             |    2 +-
 htdocs/langs/pt_AO/admin.lang               |    2 -
 htdocs/langs/pt_AO/products.lang            |    2 -
 htdocs/langs/pt_AO/salaries.lang            |    3 -
 htdocs/langs/pt_AO/ticket.lang              |    3 -
 htdocs/langs/pt_AO/website.lang             |    2 -
 htdocs/langs/pt_BR/admin.lang               |    3 +-
 htdocs/langs/pt_BR/boxes.lang               |    2 -
 htdocs/langs/pt_BR/interventions.lang       |    4 +
 htdocs/langs/pt_BR/productbatch.lang        |    5 -
 htdocs/langs/pt_BR/salaries.lang            |    4 +-
 htdocs/langs/pt_BR/users.lang               |    2 -
 htdocs/langs/pt_BR/website.lang             |    1 -
 htdocs/langs/pt_PT/admin.lang               |   12 +-
 htdocs/langs/pt_PT/banks.lang               |    2 +-
 htdocs/langs/pt_PT/boxes.lang               |    4 +-
 htdocs/langs/pt_PT/cashdesk.lang            |    2 +-
 htdocs/langs/pt_PT/errors.lang              |    1 +
 htdocs/langs/pt_PT/eventorganization.lang   |    4 +
 htdocs/langs/pt_PT/install.lang             |    1 +
 htdocs/langs/pt_PT/main.lang                |    8 +-
 htdocs/langs/pt_PT/productbatch.lang        |    8 +-
 htdocs/langs/pt_PT/products.lang            |    3 +-
 htdocs/langs/pt_PT/salaries.lang            |   11 +-
 htdocs/langs/pt_PT/ticket.lang              |   11 +-
 htdocs/langs/pt_PT/users.lang               |    4 +-
 htdocs/langs/pt_PT/website.lang             |    2 +-
 htdocs/langs/ro_RO/admin.lang               |   10 +-
 htdocs/langs/ro_RO/banks.lang               |    2 +-
 htdocs/langs/ro_RO/boxes.lang               |    4 +-
 htdocs/langs/ro_RO/cashdesk.lang            |    2 +-
 htdocs/langs/ro_RO/errors.lang              |    1 +
 htdocs/langs/ro_RO/eventorganization.lang   |    4 +
 htdocs/langs/ro_RO/install.lang             |  295 +++---
 htdocs/langs/ro_RO/interventions.lang       |   70 +-
 htdocs/langs/ro_RO/productbatch.lang        |    8 +-
 htdocs/langs/ro_RO/products.lang            |    3 +-
 htdocs/langs/ro_RO/salaries.lang            |   29 +-
 htdocs/langs/ro_RO/ticket.lang              |   11 +-
 htdocs/langs/ro_RO/users.lang               |    4 +-
 htdocs/langs/ro_RO/website.lang             |    2 +-
 htdocs/langs/ru_RU/accountancy.lang         |    9 +-
 htdocs/langs/ru_RU/admin.lang               |   28 +-
 htdocs/langs/ru_RU/banks.lang               |    2 +-
 htdocs/langs/ru_RU/bills.lang               |    2 +-
 htdocs/langs/ru_RU/boxes.lang               |    4 +-
 htdocs/langs/ru_RU/cashdesk.lang            |    2 +-
 htdocs/langs/ru_RU/deliveries.lang          |    1 +
 htdocs/langs/ru_RU/errors.lang              |    3 +-
 htdocs/langs/ru_RU/eventorganization.lang   |    4 +
 htdocs/langs/ru_RU/exports.lang             |    3 +-
 htdocs/langs/ru_RU/install.lang             |    1 +
 htdocs/langs/ru_RU/knowledgemanagement.lang |   10 +-
 htdocs/langs/ru_RU/languages.lang           |    4 +-
 htdocs/langs/ru_RU/main.lang                |    4 +-
 htdocs/langs/ru_RU/partnership.lang         |    8 +-
 htdocs/langs/ru_RU/productbatch.lang        |    8 +-
 htdocs/langs/ru_RU/products.lang            |    5 +-
 htdocs/langs/ru_RU/salaries.lang            |    6 +-
 htdocs/langs/ru_RU/stocks.lang              |    6 +-
 htdocs/langs/ru_RU/ticket.lang              |   13 +-
 htdocs/langs/ru_RU/users.lang               |    4 +-
 htdocs/langs/ru_RU/website.lang             |    2 +-
 htdocs/langs/ru_UA/products.lang            |    2 -
 htdocs/langs/ru_UA/salaries.lang            |    3 -
 htdocs/langs/ru_UA/ticket.lang              |    5 -
 htdocs/langs/ru_UA/users.lang               |    3 -
 htdocs/langs/ru_UA/website.lang             |    2 -
 htdocs/langs/sk_SK/admin.lang               |   12 +-
 htdocs/langs/sk_SK/banks.lang               |    2 +-
 htdocs/langs/sk_SK/boxes.lang               |    4 +-
 htdocs/langs/sk_SK/cashdesk.lang            |    2 +-
 htdocs/langs/sk_SK/errors.lang              |    1 +
 htdocs/langs/sk_SK/eventorganization.lang   |    4 +
 htdocs/langs/sk_SK/install.lang             |    1 +
 htdocs/langs/sk_SK/interventions.lang       |    2 +
 htdocs/langs/sk_SK/productbatch.lang        |    8 +-
 htdocs/langs/sk_SK/products.lang            |    3 +-
 htdocs/langs/sk_SK/salaries.lang            |   11 +-
 htdocs/langs/sk_SK/ticket.lang              |   11 +-
 htdocs/langs/sk_SK/users.lang               |    4 +-
 htdocs/langs/sk_SK/website.lang             |    2 +-
 htdocs/langs/sl_SI/admin.lang               |   12 +-
 htdocs/langs/sl_SI/banks.lang               |    2 +-
 htdocs/langs/sl_SI/boxes.lang               |    4 +-
 htdocs/langs/sl_SI/cashdesk.lang            |    2 +-
 htdocs/langs/sl_SI/errors.lang              |    1 +
 htdocs/langs/sl_SI/eventorganization.lang   |    4 +
 htdocs/langs/sl_SI/install.lang             |    1 +
 htdocs/langs/sl_SI/interventions.lang       |    2 +
 htdocs/langs/sl_SI/productbatch.lang        |    8 +-
 htdocs/langs/sl_SI/products.lang            |    3 +-
 htdocs/langs/sl_SI/salaries.lang            |   11 +-
 htdocs/langs/sl_SI/ticket.lang              |   11 +-
 htdocs/langs/sl_SI/users.lang               |    4 +-
 htdocs/langs/sl_SI/website.lang             |    2 +-
 htdocs/langs/sq_AL/admin.lang               |   12 +-
 htdocs/langs/sq_AL/banks.lang               |    2 +-
 htdocs/langs/sq_AL/boxes.lang               |    4 +-
 htdocs/langs/sq_AL/cashdesk.lang            |    2 +-
 htdocs/langs/sq_AL/errors.lang              |    1 +
 htdocs/langs/sq_AL/eventorganization.lang   |    4 +
 htdocs/langs/sq_AL/install.lang             |    1 +
 htdocs/langs/sq_AL/interventions.lang       |    2 +
 htdocs/langs/sq_AL/productbatch.lang        |    8 +-
 htdocs/langs/sq_AL/products.lang            |    3 +-
 htdocs/langs/sq_AL/salaries.lang            |   11 +-
 htdocs/langs/sq_AL/ticket.lang              |   11 +-
 htdocs/langs/sq_AL/users.lang               |    4 +-
 htdocs/langs/sq_AL/website.lang             |    2 +-
 htdocs/langs/sr_RS/admin.lang               |   12 +-
 htdocs/langs/sr_RS/banks.lang               |    2 +-
 htdocs/langs/sr_RS/boxes.lang               |    4 +-
 htdocs/langs/sr_RS/cashdesk.lang            |    2 +-
 htdocs/langs/sr_RS/errors.lang              |    1 +
 htdocs/langs/sr_RS/eventorganization.lang   |    4 +
 htdocs/langs/sr_RS/install.lang             |    1 +
 htdocs/langs/sr_RS/interventions.lang       |    2 +
 htdocs/langs/sr_RS/productbatch.lang        |    8 +-
 htdocs/langs/sr_RS/products.lang            |    3 +-
 htdocs/langs/sr_RS/salaries.lang            |   11 +-
 htdocs/langs/sr_RS/ticket.lang              |   11 +-
 htdocs/langs/sr_RS/users.lang               |    4 +-
 htdocs/langs/sr_RS/website.lang             |    2 +-
 htdocs/langs/sv_SE/accountancy.lang         |    5 +-
 htdocs/langs/sv_SE/admin.lang               |   36 +-
 htdocs/langs/sv_SE/agenda.lang              |   48 +-
 htdocs/langs/sv_SE/assets.lang              |    2 +
 htdocs/langs/sv_SE/banks.lang               |   28 +-
 htdocs/langs/sv_SE/bills.lang               |   16 +-
 htdocs/langs/sv_SE/boxes.lang               |   36 +-
 htdocs/langs/sv_SE/cashdesk.lang            |    2 +-
 htdocs/langs/sv_SE/categories.lang          |   54 +-
 htdocs/langs/sv_SE/contracts.lang           |   18 +-
 htdocs/langs/sv_SE/cron.lang                |   18 +-
 htdocs/langs/sv_SE/ecm.lang                 |   26 +-
 htdocs/langs/sv_SE/errors.lang              |    3 +-
 htdocs/langs/sv_SE/eventorganization.lang   |    4 +
 htdocs/langs/sv_SE/exports.lang             |    3 +-
 htdocs/langs/sv_SE/install.lang             |    1 +
 htdocs/langs/sv_SE/interventions.lang       |    2 +
 htdocs/langs/sv_SE/link.lang                |    2 +-
 htdocs/langs/sv_SE/main.lang                |    2 +-
 htdocs/langs/sv_SE/multicurrency.lang       |   24 +-
 htdocs/langs/sv_SE/orders.lang              |   20 +-
 htdocs/langs/sv_SE/other.lang               |   54 +-
 htdocs/langs/sv_SE/partnership.lang         |   66 +-
 htdocs/langs/sv_SE/paypal.lang              |    6 +-
 htdocs/langs/sv_SE/productbatch.lang        |   36 +-
 htdocs/langs/sv_SE/products.lang            |    7 +-
 htdocs/langs/sv_SE/projects.lang            |   60 +-
 htdocs/langs/sv_SE/receiptprinter.lang      |   70 +-
 htdocs/langs/sv_SE/resource.lang            |   13 +-
 htdocs/langs/sv_SE/salaries.lang            |   11 +-
 htdocs/langs/sv_SE/ticket.lang              |   11 +-
 htdocs/langs/sv_SE/users.lang               |    4 +-
 htdocs/langs/sv_SE/website.lang             |    2 +-
 htdocs/langs/sw_SW/admin.lang               |   12 +-
 htdocs/langs/sw_SW/banks.lang               |    2 +-
 htdocs/langs/sw_SW/boxes.lang               |    4 +-
 htdocs/langs/sw_SW/cashdesk.lang            |    2 +-
 htdocs/langs/sw_SW/errors.lang              |    1 +
 htdocs/langs/sw_SW/eventorganization.lang   |    4 +
 htdocs/langs/sw_SW/install.lang             |    1 +
 htdocs/langs/sw_SW/interventions.lang       |    2 +
 htdocs/langs/sw_SW/productbatch.lang        |    8 +-
 htdocs/langs/sw_SW/products.lang            |    3 +-
 htdocs/langs/sw_SW/salaries.lang            |   11 +-
 htdocs/langs/sw_SW/ticket.lang              |   11 +-
 htdocs/langs/sw_SW/users.lang               |    4 +-
 htdocs/langs/sw_SW/website.lang             |    2 +-
 htdocs/langs/th_TH/admin.lang               |   12 +-
 htdocs/langs/th_TH/banks.lang               |    2 +-
 htdocs/langs/th_TH/boxes.lang               |    4 +-
 htdocs/langs/th_TH/cashdesk.lang            |    2 +-
 htdocs/langs/th_TH/errors.lang              |    1 +
 htdocs/langs/th_TH/eventorganization.lang   |    4 +
 htdocs/langs/th_TH/install.lang             |    1 +
 htdocs/langs/th_TH/interventions.lang       |    2 +
 htdocs/langs/th_TH/productbatch.lang        |    8 +-
 htdocs/langs/th_TH/products.lang            |    3 +-
 htdocs/langs/th_TH/salaries.lang            |   11 +-
 htdocs/langs/th_TH/ticket.lang              |   11 +-
 htdocs/langs/th_TH/users.lang               |    4 +-
 htdocs/langs/th_TH/website.lang             |    2 +-
 htdocs/langs/tr_TR/admin.lang               |   12 +-
 htdocs/langs/tr_TR/banks.lang               |    2 +-
 htdocs/langs/tr_TR/boxes.lang               |    4 +-
 htdocs/langs/tr_TR/cashdesk.lang            |    2 +-
 htdocs/langs/tr_TR/errors.lang              |    1 +
 htdocs/langs/tr_TR/eventorganization.lang   |    4 +
 htdocs/langs/tr_TR/install.lang             |    1 +
 htdocs/langs/tr_TR/interventions.lang       |    2 +
 htdocs/langs/tr_TR/productbatch.lang        |    8 +-
 htdocs/langs/tr_TR/products.lang            |    3 +-
 htdocs/langs/tr_TR/salaries.lang            |   11 +-
 htdocs/langs/tr_TR/ticket.lang              |   11 +-
 htdocs/langs/tr_TR/users.lang               |    4 +-
 htdocs/langs/tr_TR/website.lang             |    2 +-
 htdocs/langs/uk_UA/admin.lang               |   12 +-
 htdocs/langs/uk_UA/banks.lang               |    2 +-
 htdocs/langs/uk_UA/boxes.lang               |    4 +-
 htdocs/langs/uk_UA/cashdesk.lang            |    2 +-
 htdocs/langs/uk_UA/errors.lang              |    1 +
 htdocs/langs/uk_UA/eventorganization.lang   |    4 +
 htdocs/langs/uk_UA/install.lang             |    1 +
 htdocs/langs/uk_UA/interventions.lang       |    2 +
 htdocs/langs/uk_UA/productbatch.lang        |    8 +-
 htdocs/langs/uk_UA/products.lang            |    3 +-
 htdocs/langs/uk_UA/salaries.lang            |   11 +-
 htdocs/langs/uk_UA/ticket.lang              |   11 +-
 htdocs/langs/uk_UA/users.lang               |    4 +-
 htdocs/langs/uk_UA/website.lang             |    2 +-
 htdocs/langs/uz_UZ/accountancy.lang         |  373 +++----
 htdocs/langs/uz_UZ/admin.lang               | 1034 ++++++++++---------
 htdocs/langs/uz_UZ/agenda.lang              |  124 +--
 htdocs/langs/uz_UZ/assets.lang              |   66 +-
 htdocs/langs/uz_UZ/banks.lang               |   66 +-
 htdocs/langs/uz_UZ/bills.lang               |  194 ++--
 htdocs/langs/uz_UZ/blockedlog.lang          |  108 +-
 htdocs/langs/uz_UZ/bookmarks.lang           |    4 +-
 htdocs/langs/uz_UZ/boxes.lang               |   72 +-
 htdocs/langs/uz_UZ/cashdesk.lang            |  186 ++--
 htdocs/langs/uz_UZ/categories.lang          |   42 +-
 htdocs/langs/uz_UZ/commercial.lang          |   20 +-
 htdocs/langs/uz_UZ/companies.lang           |  102 +-
 htdocs/langs/uz_UZ/compta.lang              |  196 ++--
 htdocs/langs/uz_UZ/contracts.lang           |   28 +-
 htdocs/langs/uz_UZ/cron.lang                |   22 +-
 htdocs/langs/uz_UZ/deliveries.lang          |    5 +-
 htdocs/langs/uz_UZ/dict.lang                |   42 +-
 htdocs/langs/uz_UZ/donations.lang           |    6 +-
 htdocs/langs/uz_UZ/ecm.lang                 |   28 +-
 htdocs/langs/uz_UZ/errors.lang              |  193 ++--
 htdocs/langs/uz_UZ/eventorganization.lang   |  174 ++--
 htdocs/langs/uz_UZ/exports.lang             |   21 +-
 htdocs/langs/uz_UZ/holiday.lang             |   64 +-
 htdocs/langs/uz_UZ/hrm.lang                 |    4 +-
 htdocs/langs/uz_UZ/install.lang             |   47 +-
 htdocs/langs/uz_UZ/interventions.lang       |   18 +-
 htdocs/langs/uz_UZ/intracommreport.lang     |   46 +-
 htdocs/langs/uz_UZ/knowledgemanagement.lang |   42 +-
 htdocs/langs/uz_UZ/languages.lang           |   44 +-
 htdocs/langs/uz_UZ/ldap.lang                |    6 +-
 htdocs/langs/uz_UZ/link.lang                |    2 +-
 htdocs/langs/uz_UZ/loan.lang                |   18 +-
 htdocs/langs/uz_UZ/mails.lang               |   54 +-
 htdocs/langs/uz_UZ/main.lang                |  626 +++++------
 htdocs/langs/uz_UZ/margins.lang             |    2 +-
 htdocs/langs/uz_UZ/members.lang             |  422 ++++----
 htdocs/langs/uz_UZ/modulebuilder.lang       |  290 +++---
 htdocs/langs/uz_UZ/mrp.lang                 |  206 ++--
 htdocs/langs/uz_UZ/multicurrency.lang       |   56 +-
 htdocs/langs/uz_UZ/oauth.lang               |    2 +-
 htdocs/langs/uz_UZ/opensurvey.lang          |    4 +-
 htdocs/langs/uz_UZ/orders.lang              |   82 +-
 htdocs/langs/uz_UZ/other.lang               |  162 +--
 htdocs/langs/uz_UZ/partnership.lang         |   92 +-
 htdocs/langs/uz_UZ/paybox.lang              |    2 +-
 htdocs/langs/uz_UZ/paypal.lang              |   28 +-
 htdocs/langs/uz_UZ/printing.lang            |    6 +-
 htdocs/langs/uz_UZ/productbatch.lang        |   38 +-
 htdocs/langs/uz_UZ/products.lang            |  249 ++---
 htdocs/langs/uz_UZ/projects.lang            |  176 ++--
 htdocs/langs/uz_UZ/propal.lang              |   24 +-
 htdocs/langs/uz_UZ/receiptprinter.lang      |   76 +-
 htdocs/langs/uz_UZ/receptions.lang          |   92 +-
 htdocs/langs/uz_UZ/recruitment.lang         |   92 +-
 htdocs/langs/uz_UZ/resource.lang            |   14 +-
 htdocs/langs/uz_UZ/salaries.lang            |   20 +-
 htdocs/langs/uz_UZ/sendings.lang            |   12 +-
 htdocs/langs/uz_UZ/sms.lang                 |    2 +-
 htdocs/langs/uz_UZ/stocks.lang              |  240 ++---
 htdocs/langs/uz_UZ/stripe.lang              |  137 ++-
 htdocs/langs/uz_UZ/supplier_proposal.lang   |   10 +-
 htdocs/langs/uz_UZ/suppliers.lang           |   12 +-
 htdocs/langs/uz_UZ/ticket.lang              |  513 ++++-----
 htdocs/langs/uz_UZ/trips.lang               |  136 +--
 htdocs/langs/uz_UZ/users.lang               |   40 +-
 htdocs/langs/uz_UZ/website.lang             |  232 ++---
 htdocs/langs/uz_UZ/withdrawals.lang         |  102 +-
 htdocs/langs/uz_UZ/workflow.lang            |   10 +-
 htdocs/langs/uz_UZ/zapier.lang              |   12 +-
 htdocs/langs/vi_VN/admin.lang               |   12 +-
 htdocs/langs/vi_VN/banks.lang               |    2 +-
 htdocs/langs/vi_VN/boxes.lang               |    4 +-
 htdocs/langs/vi_VN/cashdesk.lang            |    2 +-
 htdocs/langs/vi_VN/errors.lang              |    1 +
 htdocs/langs/vi_VN/eventorganization.lang   |    4 +
 htdocs/langs/vi_VN/install.lang             |    1 +
 htdocs/langs/vi_VN/interventions.lang       |    7 +-
 htdocs/langs/vi_VN/productbatch.lang        |    8 +-
 htdocs/langs/vi_VN/products.lang            |    3 +-
 htdocs/langs/vi_VN/salaries.lang            |   11 +-
 htdocs/langs/vi_VN/ticket.lang              |   11 +-
 htdocs/langs/vi_VN/users.lang               |    4 +-
 htdocs/langs/vi_VN/website.lang             |    2 +-
 htdocs/langs/zh_CN/admin.lang               |   12 +-
 htdocs/langs/zh_CN/banks.lang               |    2 +-
 htdocs/langs/zh_CN/boxes.lang               |    4 +-
 htdocs/langs/zh_CN/cashdesk.lang            |    2 +-
 htdocs/langs/zh_CN/errors.lang              |    1 +
 htdocs/langs/zh_CN/eventorganization.lang   |    4 +
 htdocs/langs/zh_CN/install.lang             |    1 +
 htdocs/langs/zh_CN/interventions.lang       |    2 +
 htdocs/langs/zh_CN/productbatch.lang        |    8 +-
 htdocs/langs/zh_CN/products.lang            |    3 +-
 htdocs/langs/zh_CN/salaries.lang            |   11 +-
 htdocs/langs/zh_CN/ticket.lang              |   11 +-
 htdocs/langs/zh_CN/users.lang               |    4 +-
 htdocs/langs/zh_CN/website.lang             |    2 +-
 htdocs/langs/zh_HK/admin.lang               |   12 +-
 htdocs/langs/zh_HK/banks.lang               |    2 +-
 htdocs/langs/zh_HK/boxes.lang               |    4 +-
 htdocs/langs/zh_HK/cashdesk.lang            |    2 +-
 htdocs/langs/zh_HK/errors.lang              |    1 +
 htdocs/langs/zh_HK/eventorganization.lang   |    4 +
 htdocs/langs/zh_HK/install.lang             |    1 +
 htdocs/langs/zh_HK/interventions.lang       |    2 +
 htdocs/langs/zh_HK/productbatch.lang        |    8 +-
 htdocs/langs/zh_HK/products.lang            |    3 +-
 htdocs/langs/zh_HK/salaries.lang            |   11 +-
 htdocs/langs/zh_HK/ticket.lang              |   11 +-
 htdocs/langs/zh_HK/users.lang               |    4 +-
 htdocs/langs/zh_HK/website.lang             |    2 +-
 htdocs/langs/zh_TW/admin.lang               |   73 +-
 htdocs/langs/zh_TW/banks.lang               |    4 +-
 htdocs/langs/zh_TW/bills.lang               |   16 +-
 htdocs/langs/zh_TW/boxes.lang               |    4 +-
 htdocs/langs/zh_TW/cashdesk.lang            |    2 +-
 htdocs/langs/zh_TW/commercial.lang          |    9 +-
 htdocs/langs/zh_TW/companies.lang           |    8 +-
 htdocs/langs/zh_TW/errors.lang              |    1 +
 htdocs/langs/zh_TW/eventorganization.lang   |    4 +
 htdocs/langs/zh_TW/holiday.lang             |   12 +-
 htdocs/langs/zh_TW/install.lang             |    1 +
 htdocs/langs/zh_TW/interventions.lang       |   13 +-
 htdocs/langs/zh_TW/productbatch.lang        |    8 +-
 htdocs/langs/zh_TW/salaries.lang            |    6 +-
 htdocs/langs/zh_TW/ticket.lang              |    2 +-
 htdocs/langs/zh_TW/users.lang               |    4 +-
 htdocs/langs/zh_TW/website.lang             |    2 +-
 htdocs/theme/eldy/global.inc.php            |    3 +
 htdocs/theme/md/style.css.php               |    3 +
 1120 files changed, 7062 insertions(+), 6535 deletions(-)
 delete mode 100644 htdocs/langs/ar_EG/products.lang
 delete mode 100644 htdocs/langs/de_AT/salaries.lang
 delete mode 100644 htdocs/langs/de_AT/website.lang
 delete mode 100644 htdocs/langs/el_CY/products.lang
 delete mode 100644 htdocs/langs/el_CY/ticket.lang
 delete mode 100644 htdocs/langs/el_CY/users.lang
 delete mode 100644 htdocs/langs/el_CY/website.lang
 delete mode 100644 htdocs/langs/en_AU/products.lang
 delete mode 100644 htdocs/langs/en_AU/salaries.lang
 delete mode 100644 htdocs/langs/en_AU/ticket.lang
 delete mode 100644 htdocs/langs/en_AU/users.lang
 delete mode 100644 htdocs/langs/en_AU/website.lang
 delete mode 100644 htdocs/langs/en_CA/products.lang
 delete mode 100644 htdocs/langs/en_CA/salaries.lang
 delete mode 100644 htdocs/langs/en_CA/ticket.lang
 delete mode 100644 htdocs/langs/en_CA/users.lang
 delete mode 100644 htdocs/langs/en_CA/website.lang
 delete mode 100644 htdocs/langs/en_GB/ticket.lang
 delete mode 100644 htdocs/langs/en_IN/products.lang
 delete mode 100644 htdocs/langs/en_IN/salaries.lang
 delete mode 100644 htdocs/langs/en_IN/ticket.lang
 delete mode 100644 htdocs/langs/en_IN/users.lang
 delete mode 100644 htdocs/langs/en_IN/website.lang
 delete mode 100644 htdocs/langs/en_SG/products.lang
 delete mode 100644 htdocs/langs/en_SG/salaries.lang
 delete mode 100644 htdocs/langs/en_SG/ticket.lang
 delete mode 100644 htdocs/langs/en_SG/users.lang
 delete mode 100644 htdocs/langs/en_SG/website.lang
 delete mode 100644 htdocs/langs/es_BO/products.lang
 delete mode 100644 htdocs/langs/es_BO/salaries.lang
 delete mode 100644 htdocs/langs/es_BO/ticket.lang
 delete mode 100644 htdocs/langs/es_BO/users.lang
 delete mode 100644 htdocs/langs/es_BO/website.lang
 delete mode 100644 htdocs/langs/es_CO/website.lang
 delete mode 100644 htdocs/langs/es_DO/products.lang
 delete mode 100644 htdocs/langs/es_DO/salaries.lang
 delete mode 100644 htdocs/langs/es_DO/ticket.lang
 delete mode 100644 htdocs/langs/es_DO/users.lang
 delete mode 100644 htdocs/langs/es_DO/website.lang
 delete mode 100644 htdocs/langs/es_GT/products.lang
 delete mode 100644 htdocs/langs/es_GT/salaries.lang
 delete mode 100644 htdocs/langs/es_GT/ticket.lang
 delete mode 100644 htdocs/langs/es_GT/users.lang
 delete mode 100644 htdocs/langs/es_GT/website.lang
 delete mode 100644 htdocs/langs/es_HN/products.lang
 delete mode 100644 htdocs/langs/es_HN/salaries.lang
 delete mode 100644 htdocs/langs/es_HN/ticket.lang
 delete mode 100644 htdocs/langs/es_HN/users.lang
 delete mode 100644 htdocs/langs/es_HN/website.lang
 delete mode 100644 htdocs/langs/es_PA/products.lang
 delete mode 100644 htdocs/langs/es_PA/salaries.lang
 delete mode 100644 htdocs/langs/es_PA/ticket.lang
 delete mode 100644 htdocs/langs/es_PA/users.lang
 delete mode 100644 htdocs/langs/es_PA/website.lang
 delete mode 100644 htdocs/langs/es_PY/products.lang
 delete mode 100644 htdocs/langs/es_PY/salaries.lang
 delete mode 100644 htdocs/langs/es_PY/ticket.lang
 delete mode 100644 htdocs/langs/es_PY/users.lang
 delete mode 100644 htdocs/langs/es_PY/website.lang
 delete mode 100644 htdocs/langs/es_US/products.lang
 delete mode 100644 htdocs/langs/es_US/salaries.lang
 delete mode 100644 htdocs/langs/es_US/ticket.lang
 delete mode 100644 htdocs/langs/es_US/users.lang
 delete mode 100644 htdocs/langs/es_US/website.lang
 delete mode 100644 htdocs/langs/es_UY/products.lang
 delete mode 100644 htdocs/langs/es_UY/salaries.lang
 delete mode 100644 htdocs/langs/es_UY/ticket.lang
 delete mode 100644 htdocs/langs/es_UY/users.lang
 delete mode 100644 htdocs/langs/es_UY/website.lang
 delete mode 100644 htdocs/langs/es_VE/salaries.lang
 delete mode 100644 htdocs/langs/es_VE/users.lang
 delete mode 100644 htdocs/langs/es_VE/website.lang
 delete mode 100644 htdocs/langs/fr_BE/products.lang
 delete mode 100644 htdocs/langs/fr_BE/salaries.lang
 delete mode 100644 htdocs/langs/fr_BE/ticket.lang
 delete mode 100644 htdocs/langs/fr_BE/users.lang
 delete mode 100644 htdocs/langs/fr_BE/website.lang
 delete mode 100644 htdocs/langs/fr_CH/products.lang
 delete mode 100644 htdocs/langs/fr_CH/salaries.lang
 delete mode 100644 htdocs/langs/fr_CH/ticket.lang
 delete mode 100644 htdocs/langs/fr_CH/users.lang
 delete mode 100644 htdocs/langs/fr_CH/website.lang
 delete mode 100644 htdocs/langs/fr_CI/products.lang
 delete mode 100644 htdocs/langs/fr_CI/salaries.lang
 delete mode 100644 htdocs/langs/fr_CI/ticket.lang
 delete mode 100644 htdocs/langs/fr_CI/users.lang
 delete mode 100644 htdocs/langs/fr_CI/website.lang
 delete mode 100644 htdocs/langs/fr_CM/products.lang
 delete mode 100644 htdocs/langs/fr_CM/salaries.lang
 delete mode 100644 htdocs/langs/fr_CM/ticket.lang
 delete mode 100644 htdocs/langs/fr_CM/users.lang
 delete mode 100644 htdocs/langs/fr_CM/website.lang
 delete mode 100644 htdocs/langs/fr_GA/products.lang
 delete mode 100644 htdocs/langs/fr_GA/salaries.lang
 delete mode 100644 htdocs/langs/fr_GA/ticket.lang
 delete mode 100644 htdocs/langs/fr_GA/users.lang
 delete mode 100644 htdocs/langs/fr_GA/website.lang
 delete mode 100644 htdocs/langs/it_CH/products.lang
 delete mode 100644 htdocs/langs/it_CH/salaries.lang
 delete mode 100644 htdocs/langs/it_CH/ticket.lang
 delete mode 100644 htdocs/langs/it_CH/users.lang
 delete mode 100644 htdocs/langs/pt_AO/admin.lang
 delete mode 100644 htdocs/langs/pt_AO/products.lang
 delete mode 100644 htdocs/langs/pt_AO/salaries.lang
 delete mode 100644 htdocs/langs/pt_AO/ticket.lang
 delete mode 100644 htdocs/langs/pt_AO/website.lang
 delete mode 100644 htdocs/langs/ru_UA/products.lang
 delete mode 100644 htdocs/langs/ru_UA/salaries.lang
 delete mode 100644 htdocs/langs/ru_UA/ticket.lang
 delete mode 100644 htdocs/langs/ru_UA/users.lang
 delete mode 100644 htdocs/langs/ru_UA/website.lang

diff --git a/htdocs/langs/am_ET/admin.lang b/htdocs/langs/am_ET/admin.lang
index be9aca94599..73004a3c8b1 100644
--- a/htdocs/langs/am_ET/admin.lang
+++ b/htdocs/langs/am_ET/admin.lang
@@ -53,6 +53,7 @@ InternalUser=Internal user
 ExternalUser=External user
 InternalUsers=Internal users
 ExternalUsers=External users
+UserInterface=User interface
 GUISetup=Display
 SetupArea=Setup
 UploadNewTemplate=Upload new template(s)
@@ -1260,8 +1261,8 @@ YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP
 DownloadMoreSkins=More skins to download
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
-ShowProfIdInAddress=Show professional id with addresses
-ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
+ShowProfIdInAddress=Show professional ID with addresses
+ShowVATIntaInAddress=Hide intra-Community VAT number
 TranslationUncomplete=Partial translation
 MAIN_DISABLE_METEO=Disable meteorological view
 MeteoStdMod=Standard mode
@@ -1778,7 +1779,7 @@ ClickToDialSetup=Click To Dial module setup
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
 ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface, installed on the same computer as the browser, and called when you click on a link starting with "tel:" in your browser. If you need link that start with "sip:" or a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Point of Sale
 CashDeskSetup=Point of Sales module setup
@@ -2133,7 +2134,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
-NotRecommended=Not recommanded
+Recommended=Recommended
+NotRecommended=Not recommended
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
@@ -2144,3 +2146,5 @@ YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You s
 RandomlySelectedIfSeveral=Randomly selected if several pictures are available
 DatabasePasswordObfuscated=Database password is obfuscated in conf file
 DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
+APIsAreNotEnabled=APIs modules are not enabled
+YouShouldSetThisToOff=You should set this to 0 or off
diff --git a/htdocs/langs/am_ET/banks.lang b/htdocs/langs/am_ET/banks.lang
index df7192bee25..a0b7942d446 100644
--- a/htdocs/langs/am_ET/banks.lang
+++ b/htdocs/langs/am_ET/banks.lang
@@ -115,7 +115,7 @@ TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
 CheckTransmitter=Sender
 ValidateCheckReceipt=Validate this check receipt?
-ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes will be possible once validated.
 DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
diff --git a/htdocs/langs/am_ET/boxes.lang b/htdocs/langs/am_ET/boxes.lang
index 0c9ea302fb8..710d49bfab6 100644
--- a/htdocs/langs/am_ET/boxes.lang
+++ b/htdocs/langs/am_ET/boxes.lang
@@ -91,8 +91,8 @@ BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
 BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
 BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
 BoxTitleLastModifiedPropals=Latest %s modified proposals
-BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
-BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
+BoxTitleLatestModifiedJobPositions=Latest %s modified job positions
+BoxTitleLatestModifiedCandidatures=Latest %s modified job applications
 ForCustomersInvoices=Customers invoices
 ForCustomersOrders=Customers orders
 ForProposals=Proposals
diff --git a/htdocs/langs/am_ET/cashdesk.lang b/htdocs/langs/am_ET/cashdesk.lang
index aea1f02f834..c9d0f7fcd0a 100644
--- a/htdocs/langs/am_ET/cashdesk.lang
+++ b/htdocs/langs/am_ET/cashdesk.lang
@@ -127,4 +127,4 @@ AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
 ShowPriceHT = Display the column with the price excluding tax (on screen)
-ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on the receipt)
diff --git a/htdocs/langs/am_ET/errors.lang b/htdocs/langs/am_ET/errors.lang
index 670f8c7a6bc..85b90ca4991 100644
--- a/htdocs/langs/am_ET/errors.lang
+++ b/htdocs/langs/am_ET/errors.lang
@@ -301,3 +301,4 @@ ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
 ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
+ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
diff --git a/htdocs/langs/am_ET/eventorganization.lang b/htdocs/langs/am_ET/eventorganization.lang
index 335c257b224..f361e6bc192 100644
--- a/htdocs/langs/am_ET/eventorganization.lang
+++ b/htdocs/langs/am_ET/eventorganization.lang
@@ -86,6 +86,7 @@ DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
 SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
 SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
+NbVotes=Number of votes
 #
 # Status
 #
@@ -115,6 +116,9 @@ EvntOrgDuration = This conference starts on %s and ends on %s.
 ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
 BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
 EventType = Event type
+LabelOfBooth=Booth label
+LabelOfconference=Conference label
+ConferenceIsNotConfirmed=Subcription not available, conference is not confirmed yet
 
 #
 # Vote page
diff --git a/htdocs/langs/am_ET/install.lang b/htdocs/langs/am_ET/install.lang
index 63947dad154..c1ffee936d7 100644
--- a/htdocs/langs/am_ET/install.lang
+++ b/htdocs/langs/am_ET/install.lang
@@ -206,6 +206,7 @@ MigrationUserPhotoPath=Migration of photo paths for users
 MigrationFieldsSocialNetworks=Migration of users fields social networks (%s)
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
+MigrationImportOrExportProfiles=Migration of import or export profiles (%s)
 ShowNotAvailableOptions=Show unavailable options
 HideNotAvailableOptions=Hide unavailable options
 ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
diff --git a/htdocs/langs/am_ET/interventions.lang b/htdocs/langs/am_ET/interventions.lang
index e5936f8246e..51079fca278 100644
--- a/htdocs/langs/am_ET/interventions.lang
+++ b/htdocs/langs/am_ET/interventions.lang
@@ -64,3 +64,5 @@ InterLineDuration=Line duration intervention
 InterLineDesc=Line description intervention
 RepeatableIntervention=Template of intervention
 ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
+Reopen=Reopen
+ConfirmReopenIntervention=Are you sure you want to open back the intervention <b>%s</b>?
diff --git a/htdocs/langs/am_ET/productbatch.lang b/htdocs/langs/am_ET/productbatch.lang
index 450d0285819..763af20c6b4 100644
--- a/htdocs/langs/am_ET/productbatch.lang
+++ b/htdocs/langs/am_ET/productbatch.lang
@@ -26,12 +26,10 @@ ShowLogOfMovementIfLot=Show log of movements for couple product/lot
 StockDetailPerBatch=Stock detail per lot
 SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
-BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
-BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
 ManageLotMask=Custom mask
-CustomMasks=Adds an option to define mask in the product card
-LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
-SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+CustomMasks=Option to define a different numbering mask for each product
+BatchLotNumberingModules=Numbering rule for automatic generation of lot number
+BatchSerialNumberingModules=Numbering rule for automatic generation of serial number (for products with property 1 unique lot/serial for each product)
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
diff --git a/htdocs/langs/am_ET/products.lang b/htdocs/langs/am_ET/products.lang
index 9638dfe5a25..fecbe7450c2 100644
--- a/htdocs/langs/am_ET/products.lang
+++ b/htdocs/langs/am_ET/products.lang
@@ -277,7 +277,7 @@ PriceByCustomer=Different prices for each customer
 PriceCatalogue=A single sell price per product/service
 PricingRule=Rules for selling prices
 AddCustomerPrice=Add price by customer
-ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
+ForceUpdateChildPriceSoc=Set same price on customer's subsidiaries
 PriceByCustomerLog=Log of previous customer prices
 MinimumPriceLimit=Minimum price can't be lower then %s
 MinimumRecommendedPrice=Minimum recommended price is: %s
@@ -296,6 +296,7 @@ ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Child products
 MinSupplierPrice=Minimum buying price
 MinCustomerPrice=Minimum selling price
+NoDynamicPrice=No dynamic price
 DynamicPriceConfiguration=Dynamic price configuration
 DynamicPriceDesc=You may define mathematical formulae to calculate Customer or Vendor prices. Such formulas can use all mathematical operators, some constants and variables. You can define here the variables you wish to use. If the variable needs an automatic update, you may define the external URL to allow Dolibarr to update the value automatically.
 AddVariable=Add Variable
diff --git a/htdocs/langs/am_ET/salaries.lang b/htdocs/langs/am_ET/salaries.lang
index 7c3c08a65bd..12905040b1a 100644
--- a/htdocs/langs/am_ET/salaries.lang
+++ b/htdocs/langs/am_ET/salaries.lang
@@ -2,20 +2,23 @@
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=By default, leave empty the option "Automatically create a total payment" when creating a Salary
 Salary=Salary
 Salaries=Salaries
-NewSalaryPayment=New salary payment
+NewSalary=New salary
+NewSalaryPayment=New salary card
 AddSalaryPayment=Add salary payment
 SalaryPayment=Salary payment
 SalariesPayments=Salaries payments
+SalariesPaymentsOf=Salaries payments of %s
 ShowSalaryPayment=Show salary payment
 THM=Average hourly rate
 TJM=Average daily rate
 CurrentSalary=Current salary
 THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
 TJMDescription=This value is currently for information only and is not used for any calculation
-LastSalaries=Latest %s salary payments
-AllSalaries=All salary payments
+LastSalaries=Latest %s salaries
+AllSalaries=All salaries
 SalariesStatistics=Salary statistics
-# Export
 SalariesAndPayments=Salaries and payments
+ConfirmDeleteSalaryPayment=Do you want to delete this salary payment ?
diff --git a/htdocs/langs/am_ET/ticket.lang b/htdocs/langs/am_ET/ticket.lang
index 1da32a5a99e..a1bed39c21d 100644
--- a/htdocs/langs/am_ET/ticket.lang
+++ b/htdocs/langs/am_ET/ticket.lang
@@ -34,7 +34,8 @@ TicketDictResolution=Ticket - Resolution
 
 TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
-TicketTypeShortISSUE=Issue, bug or problem
+TicketTypeShortISSUE=Issue or bug
+TicketTypeShortPROBLEM=Problem
 TicketTypeShortREQUEST=Change or enhancement request
 TicketTypeShortPROJET=Project
 TicketTypeShortOTHER=Other
@@ -54,14 +55,15 @@ TypeContact_ticket_internal_SUPPORTTEC=Assigned user
 TypeContact_ticket_external_SUPPORTCLI=Customer contact / incident tracking
 TypeContact_ticket_external_CONTRIBUTOR=External contributor
 
-OriginEmail=Email source
+OriginEmail=Reporter Email
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
 Read=Read
 Assigned=Assigned
 InProgress=In progress
-NeedMoreInformation=Waiting for information
+NeedMoreInformation=Waiting for reporter feedback
+NeedMoreInformationShort=Waiting for feedback
 Answered=Answered
 Waiting=Waiting
 Closed=Closed
@@ -160,7 +162,7 @@ CreatedBy=Created by
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Group
+TicketCategory=Ticket categorization
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
@@ -211,6 +213,7 @@ TicketMessageHelp=Only this text will be saved in the message list on ticket car
 TicketMessageSubstitutionReplacedByGenericValues=Substitutions variables are replaced by generic values.
 TimeElapsedSince=Time elapsed since
 TicketTimeToRead=Time elapsed before read
+TicketTimeElapsedBeforeSince=Time elapsed before / since
 TicketContacts=Contacts ticket
 TicketDocumentsLinked=Documents linked to ticket
 ConfirmReOpenTicket=Confirm reopen this ticket ?
diff --git a/htdocs/langs/am_ET/users.lang b/htdocs/langs/am_ET/users.lang
index 372090ea5ad..6aeaf128838 100644
--- a/htdocs/langs/am_ET/users.lang
+++ b/htdocs/langs/am_ET/users.lang
@@ -97,8 +97,8 @@ LoginToCreate=Login to create
 NameToCreate=Name of third party to create
 YourRole=Your roles
 YourQuotaOfUsersIsReached=Your quota of active users is reached !
-NbOfUsers=No. of users
-NbOfPermissions=No. of permissions
+NbOfUsers=Number of users
+NbOfPermissions=Number of permissions
 DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin
 HierarchicalResponsible=Supervisor
 HierarchicView=Hierarchical view
diff --git a/htdocs/langs/am_ET/website.lang b/htdocs/langs/am_ET/website.lang
index 1e727415ec2..dc2ec2c0b3d 100644
--- a/htdocs/langs/am_ET/website.lang
+++ b/htdocs/langs/am_ET/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 PageContainer=Page
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
+PreviewOfSiteNotYetAvailable=The preview of your website <strong>%s</strong> is not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
diff --git a/htdocs/langs/ar_EG/admin.lang b/htdocs/langs/ar_EG/admin.lang
index f426e787f85..46608a162b0 100644
--- a/htdocs/langs/ar_EG/admin.lang
+++ b/htdocs/langs/ar_EG/admin.lang
@@ -49,3 +49,4 @@ Permission81=قراءة أوامر الشراء
 MailToSendInvoice=فواتير العميل
 MailToSendSupplierOrder=أوامر الشراء
 MailToSendSupplierInvoice=فواتير المورد
+Recommended=موصى به
diff --git a/htdocs/langs/ar_EG/products.lang b/htdocs/langs/ar_EG/products.lang
deleted file mode 100644
index e0628dbec00..00000000000
--- a/htdocs/langs/ar_EG/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
diff --git a/htdocs/langs/ar_EG/ticket.lang b/htdocs/langs/ar_EG/ticket.lang
index 41152eed334..9aadaa6918b 100644
--- a/htdocs/langs/ar_EG/ticket.lang
+++ b/htdocs/langs/ar_EG/ticket.lang
@@ -1,4 +1,3 @@
 # Dolibarr language file - Source file is en_US - ticket
 Closed=مقفول
 TicketSettings=الإعدادات
-TicketCategory=Group
diff --git a/htdocs/langs/ar_EG/website.lang b/htdocs/langs/ar_EG/website.lang
index 5bc16ab4864..4f2ff392475 100644
--- a/htdocs/langs/ar_EG/website.lang
+++ b/htdocs/langs/ar_EG/website.lang
@@ -9,4 +9,3 @@ WEBSITE_ALIASALT=أسماء الصفحات / الأسماء المستعارة 
 WEBSITE_ALIASALTDesc=استخدم هنا قائمة بأسماء / أسماء مستعارة أخرى بحيث يمكن الوصول إلى الصفحة أيضًا باستخدام هذه الأسماء / الأسماء المستعارة الأخرى (على سبيل المثال ، الاسم القديم بعد إعادة تسمية الاسم المستعار للحفاظ على الرابط الخلفي في عمل الرابط / الاسم القديم). النحو هو: <br> Alternativename1 ، و Alternativename2 ، ...
 WEBSITE_CSS_URL=عنوان URL لملف CSS الخارجي
 WEBSITE_CSS_INLINE=محتوى ملف CSS (مشترك لجميع الصفحات)
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
diff --git a/htdocs/langs/ar_IQ/admin.lang b/htdocs/langs/ar_IQ/admin.lang
index be9aca94599..73004a3c8b1 100644
--- a/htdocs/langs/ar_IQ/admin.lang
+++ b/htdocs/langs/ar_IQ/admin.lang
@@ -53,6 +53,7 @@ InternalUser=Internal user
 ExternalUser=External user
 InternalUsers=Internal users
 ExternalUsers=External users
+UserInterface=User interface
 GUISetup=Display
 SetupArea=Setup
 UploadNewTemplate=Upload new template(s)
@@ -1260,8 +1261,8 @@ YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP
 DownloadMoreSkins=More skins to download
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
-ShowProfIdInAddress=Show professional id with addresses
-ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
+ShowProfIdInAddress=Show professional ID with addresses
+ShowVATIntaInAddress=Hide intra-Community VAT number
 TranslationUncomplete=Partial translation
 MAIN_DISABLE_METEO=Disable meteorological view
 MeteoStdMod=Standard mode
@@ -1778,7 +1779,7 @@ ClickToDialSetup=Click To Dial module setup
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
 ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface, installed on the same computer as the browser, and called when you click on a link starting with "tel:" in your browser. If you need link that start with "sip:" or a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Point of Sale
 CashDeskSetup=Point of Sales module setup
@@ -2133,7 +2134,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
-NotRecommended=Not recommanded
+Recommended=Recommended
+NotRecommended=Not recommended
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
@@ -2144,3 +2146,5 @@ YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You s
 RandomlySelectedIfSeveral=Randomly selected if several pictures are available
 DatabasePasswordObfuscated=Database password is obfuscated in conf file
 DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
+APIsAreNotEnabled=APIs modules are not enabled
+YouShouldSetThisToOff=You should set this to 0 or off
diff --git a/htdocs/langs/ar_IQ/banks.lang b/htdocs/langs/ar_IQ/banks.lang
index df7192bee25..a0b7942d446 100644
--- a/htdocs/langs/ar_IQ/banks.lang
+++ b/htdocs/langs/ar_IQ/banks.lang
@@ -115,7 +115,7 @@ TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
 CheckTransmitter=Sender
 ValidateCheckReceipt=Validate this check receipt?
-ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes will be possible once validated.
 DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
diff --git a/htdocs/langs/ar_IQ/boxes.lang b/htdocs/langs/ar_IQ/boxes.lang
index 0c9ea302fb8..710d49bfab6 100644
--- a/htdocs/langs/ar_IQ/boxes.lang
+++ b/htdocs/langs/ar_IQ/boxes.lang
@@ -91,8 +91,8 @@ BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
 BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
 BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
 BoxTitleLastModifiedPropals=Latest %s modified proposals
-BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
-BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
+BoxTitleLatestModifiedJobPositions=Latest %s modified job positions
+BoxTitleLatestModifiedCandidatures=Latest %s modified job applications
 ForCustomersInvoices=Customers invoices
 ForCustomersOrders=Customers orders
 ForProposals=Proposals
diff --git a/htdocs/langs/ar_IQ/cashdesk.lang b/htdocs/langs/ar_IQ/cashdesk.lang
index aea1f02f834..c9d0f7fcd0a 100644
--- a/htdocs/langs/ar_IQ/cashdesk.lang
+++ b/htdocs/langs/ar_IQ/cashdesk.lang
@@ -127,4 +127,4 @@ AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
 ShowPriceHT = Display the column with the price excluding tax (on screen)
-ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on the receipt)
diff --git a/htdocs/langs/ar_IQ/errors.lang b/htdocs/langs/ar_IQ/errors.lang
index 670f8c7a6bc..85b90ca4991 100644
--- a/htdocs/langs/ar_IQ/errors.lang
+++ b/htdocs/langs/ar_IQ/errors.lang
@@ -301,3 +301,4 @@ ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
 ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
+ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
diff --git a/htdocs/langs/ar_IQ/eventorganization.lang b/htdocs/langs/ar_IQ/eventorganization.lang
index 335c257b224..f361e6bc192 100644
--- a/htdocs/langs/ar_IQ/eventorganization.lang
+++ b/htdocs/langs/ar_IQ/eventorganization.lang
@@ -86,6 +86,7 @@ DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
 SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
 SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
+NbVotes=Number of votes
 #
 # Status
 #
@@ -115,6 +116,9 @@ EvntOrgDuration = This conference starts on %s and ends on %s.
 ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
 BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
 EventType = Event type
+LabelOfBooth=Booth label
+LabelOfconference=Conference label
+ConferenceIsNotConfirmed=Subcription not available, conference is not confirmed yet
 
 #
 # Vote page
diff --git a/htdocs/langs/ar_IQ/install.lang b/htdocs/langs/ar_IQ/install.lang
index 63947dad154..c1ffee936d7 100644
--- a/htdocs/langs/ar_IQ/install.lang
+++ b/htdocs/langs/ar_IQ/install.lang
@@ -206,6 +206,7 @@ MigrationUserPhotoPath=Migration of photo paths for users
 MigrationFieldsSocialNetworks=Migration of users fields social networks (%s)
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
+MigrationImportOrExportProfiles=Migration of import or export profiles (%s)
 ShowNotAvailableOptions=Show unavailable options
 HideNotAvailableOptions=Hide unavailable options
 ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
diff --git a/htdocs/langs/ar_IQ/productbatch.lang b/htdocs/langs/ar_IQ/productbatch.lang
index 450d0285819..763af20c6b4 100644
--- a/htdocs/langs/ar_IQ/productbatch.lang
+++ b/htdocs/langs/ar_IQ/productbatch.lang
@@ -26,12 +26,10 @@ ShowLogOfMovementIfLot=Show log of movements for couple product/lot
 StockDetailPerBatch=Stock detail per lot
 SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
-BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
-BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
 ManageLotMask=Custom mask
-CustomMasks=Adds an option to define mask in the product card
-LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
-SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+CustomMasks=Option to define a different numbering mask for each product
+BatchLotNumberingModules=Numbering rule for automatic generation of lot number
+BatchSerialNumberingModules=Numbering rule for automatic generation of serial number (for products with property 1 unique lot/serial for each product)
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
diff --git a/htdocs/langs/ar_IQ/products.lang b/htdocs/langs/ar_IQ/products.lang
index 9638dfe5a25..fecbe7450c2 100644
--- a/htdocs/langs/ar_IQ/products.lang
+++ b/htdocs/langs/ar_IQ/products.lang
@@ -277,7 +277,7 @@ PriceByCustomer=Different prices for each customer
 PriceCatalogue=A single sell price per product/service
 PricingRule=Rules for selling prices
 AddCustomerPrice=Add price by customer
-ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
+ForceUpdateChildPriceSoc=Set same price on customer's subsidiaries
 PriceByCustomerLog=Log of previous customer prices
 MinimumPriceLimit=Minimum price can't be lower then %s
 MinimumRecommendedPrice=Minimum recommended price is: %s
@@ -296,6 +296,7 @@ ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Child products
 MinSupplierPrice=Minimum buying price
 MinCustomerPrice=Minimum selling price
+NoDynamicPrice=No dynamic price
 DynamicPriceConfiguration=Dynamic price configuration
 DynamicPriceDesc=You may define mathematical formulae to calculate Customer or Vendor prices. Such formulas can use all mathematical operators, some constants and variables. You can define here the variables you wish to use. If the variable needs an automatic update, you may define the external URL to allow Dolibarr to update the value automatically.
 AddVariable=Add Variable
diff --git a/htdocs/langs/ar_IQ/salaries.lang b/htdocs/langs/ar_IQ/salaries.lang
index 6b4fdc94163..12905040b1a 100644
--- a/htdocs/langs/ar_IQ/salaries.lang
+++ b/htdocs/langs/ar_IQ/salaries.lang
@@ -17,8 +17,8 @@ TJM=Average daily rate
 CurrentSalary=Current salary
 THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
 TJMDescription=This value is currently for information only and is not used for any calculation
-LastSalaries=Latest %s salary payments
-AllSalaries=All salary payments
+LastSalaries=Latest %s salaries
+AllSalaries=All salaries
 SalariesStatistics=Salary statistics
-# Export
 SalariesAndPayments=Salaries and payments
+ConfirmDeleteSalaryPayment=Do you want to delete this salary payment ?
diff --git a/htdocs/langs/ar_IQ/ticket.lang b/htdocs/langs/ar_IQ/ticket.lang
index 1da32a5a99e..a1bed39c21d 100644
--- a/htdocs/langs/ar_IQ/ticket.lang
+++ b/htdocs/langs/ar_IQ/ticket.lang
@@ -34,7 +34,8 @@ TicketDictResolution=Ticket - Resolution
 
 TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
-TicketTypeShortISSUE=Issue, bug or problem
+TicketTypeShortISSUE=Issue or bug
+TicketTypeShortPROBLEM=Problem
 TicketTypeShortREQUEST=Change or enhancement request
 TicketTypeShortPROJET=Project
 TicketTypeShortOTHER=Other
@@ -54,14 +55,15 @@ TypeContact_ticket_internal_SUPPORTTEC=Assigned user
 TypeContact_ticket_external_SUPPORTCLI=Customer contact / incident tracking
 TypeContact_ticket_external_CONTRIBUTOR=External contributor
 
-OriginEmail=Email source
+OriginEmail=Reporter Email
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
 Read=Read
 Assigned=Assigned
 InProgress=In progress
-NeedMoreInformation=Waiting for information
+NeedMoreInformation=Waiting for reporter feedback
+NeedMoreInformationShort=Waiting for feedback
 Answered=Answered
 Waiting=Waiting
 Closed=Closed
@@ -160,7 +162,7 @@ CreatedBy=Created by
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Group
+TicketCategory=Ticket categorization
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
@@ -211,6 +213,7 @@ TicketMessageHelp=Only this text will be saved in the message list on ticket car
 TicketMessageSubstitutionReplacedByGenericValues=Substitutions variables are replaced by generic values.
 TimeElapsedSince=Time elapsed since
 TicketTimeToRead=Time elapsed before read
+TicketTimeElapsedBeforeSince=Time elapsed before / since
 TicketContacts=Contacts ticket
 TicketDocumentsLinked=Documents linked to ticket
 ConfirmReOpenTicket=Confirm reopen this ticket ?
diff --git a/htdocs/langs/ar_IQ/users.lang b/htdocs/langs/ar_IQ/users.lang
index 372090ea5ad..6aeaf128838 100644
--- a/htdocs/langs/ar_IQ/users.lang
+++ b/htdocs/langs/ar_IQ/users.lang
@@ -97,8 +97,8 @@ LoginToCreate=Login to create
 NameToCreate=Name of third party to create
 YourRole=Your roles
 YourQuotaOfUsersIsReached=Your quota of active users is reached !
-NbOfUsers=No. of users
-NbOfPermissions=No. of permissions
+NbOfUsers=Number of users
+NbOfPermissions=Number of permissions
 DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin
 HierarchicalResponsible=Supervisor
 HierarchicView=Hierarchical view
diff --git a/htdocs/langs/ar_IQ/website.lang b/htdocs/langs/ar_IQ/website.lang
index 1e727415ec2..dc2ec2c0b3d 100644
--- a/htdocs/langs/ar_IQ/website.lang
+++ b/htdocs/langs/ar_IQ/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 PageContainer=Page
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
+PreviewOfSiteNotYetAvailable=The preview of your website <strong>%s</strong> is not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
diff --git a/htdocs/langs/ar_SA/admin.lang b/htdocs/langs/ar_SA/admin.lang
index 9db36b039d7..eb996d30b78 100644
--- a/htdocs/langs/ar_SA/admin.lang
+++ b/htdocs/langs/ar_SA/admin.lang
@@ -53,6 +53,7 @@ InternalUser=مستخدم داخلي
 ExternalUser=مستخدم خارجي
 InternalUsers=مستخدمين داخليين
 ExternalUsers=مستخدمين خارجيين
+UserInterface=User interface
 GUISetup=العرض
 SetupArea=التثبيت
 UploadNewTemplate=تحميل قالب جديد
@@ -1260,8 +1261,8 @@ YourPHPDoesNotHaveSSLSupport=وظائف خدمة تصميم المواقع لا
 DownloadMoreSkins=مزيد من جلود بتحميل
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
-ShowProfIdInAddress=Show professional id with addresses
-ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
+ShowProfIdInAddress=Show professional ID with addresses
+ShowVATIntaInAddress=Hide intra-Community VAT number
 TranslationUncomplete=ترجمة جزئية
 MAIN_DISABLE_METEO=Disable meteorological view
 MeteoStdMod=Standard mode
@@ -1778,7 +1779,7 @@ ClickToDialSetup=انقر لإعداد وحدة الاتصال الهاتفي
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
 ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=مجرد استخدام الرابط "الهاتف:" على أرقام الهواتف
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface, installed on the same computer as the browser, and called when you click on a link starting with "tel:" in your browser. If you need link that start with "sip:" or a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Point of Sale
 CashDeskSetup=Point of Sales module setup
@@ -2133,7 +2134,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
-NotRecommended=Not recommanded
+Recommended=موصى بها
+NotRecommended=Not recommended
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
@@ -2144,3 +2146,5 @@ YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You s
 RandomlySelectedIfSeveral=Randomly selected if several pictures are available
 DatabasePasswordObfuscated=Database password is obfuscated in conf file
 DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
+APIsAreNotEnabled=APIs modules are not enabled
+YouShouldSetThisToOff=You should set this to 0 or off
diff --git a/htdocs/langs/ar_SA/banks.lang b/htdocs/langs/ar_SA/banks.lang
index d5e01691731..0d1b849661e 100644
--- a/htdocs/langs/ar_SA/banks.lang
+++ b/htdocs/langs/ar_SA/banks.lang
@@ -115,7 +115,7 @@ TransferTo=إلى
 TransferFromToDone=التحويل من <b>%s</b>إلى <b>%s</b>من <b>%s</b>%s قد تم تسجيلة.
 CheckTransmitter=مرسل
 ValidateCheckReceipt=تأكيد صحة الشيك المستلم؟
-ConfirmValidateCheckReceipt=هل انت متأكد من رغبتك بإرسال إيصال هذا الشيك للتأكيد ؟ لا تغيير ممكن بعد الاكمال.
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes will be possible once validated.
 DeleteCheckReceipt=حذف هذا الشيك ؟
 ConfirmDeleteCheckReceipt=هل انت متأكد أنك تريد حذف هذا الشيك؟
 BankChecks=الشيكات المصرفية
diff --git a/htdocs/langs/ar_SA/boxes.lang b/htdocs/langs/ar_SA/boxes.lang
index bb7d024ab37..bd8f4e9266b 100644
--- a/htdocs/langs/ar_SA/boxes.lang
+++ b/htdocs/langs/ar_SA/boxes.lang
@@ -91,8 +91,8 @@ BoxTitleLatestModifiedSupplierOrders=أوامر الموردين: آخر %s تع
 BoxTitleLastModifiedCustomerBills=فواتير العميل: آخر %s تعديل 
 BoxTitleLastModifiedCustomerOrders=أوامر المبيعات: آخر %s تعديل 
 BoxTitleLastModifiedPropals=أحدث %s العروض المعدلة 
-BoxTitleLatestModifiedJobPositions=أحدث %s وظائف  المعدلة
-BoxTitleLatestModifiedCandidatures=أحدث %s الترشيحات المعدلة 
+BoxTitleLatestModifiedJobPositions=Latest %s modified job positions
+BoxTitleLatestModifiedCandidatures=Latest %s modified job applications
 ForCustomersInvoices=فواتير العملاء
 ForCustomersOrders=أوامر العملاء
 ForProposals=عروض
diff --git a/htdocs/langs/ar_SA/cashdesk.lang b/htdocs/langs/ar_SA/cashdesk.lang
index 0590fbb5aab..dcd981dcd3e 100644
--- a/htdocs/langs/ar_SA/cashdesk.lang
+++ b/htdocs/langs/ar_SA/cashdesk.lang
@@ -127,4 +127,4 @@ AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
 ShowPriceHT = Display the column with the price excluding tax (on screen)
-ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on the receipt)
diff --git a/htdocs/langs/ar_SA/errors.lang b/htdocs/langs/ar_SA/errors.lang
index dbc501cf54e..d962819af12 100644
--- a/htdocs/langs/ar_SA/errors.lang
+++ b/htdocs/langs/ar_SA/errors.lang
@@ -301,3 +301,4 @@ ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
 ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
+ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
diff --git a/htdocs/langs/ar_SA/eventorganization.lang b/htdocs/langs/ar_SA/eventorganization.lang
index 701d28ece6b..baecd63a8b0 100644
--- a/htdocs/langs/ar_SA/eventorganization.lang
+++ b/htdocs/langs/ar_SA/eventorganization.lang
@@ -86,6 +86,7 @@ DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
 SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
 SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
+NbVotes=Number of votes
 #
 # Status
 #
@@ -115,6 +116,9 @@ EvntOrgDuration = This conference starts on %s and ends on %s.
 ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
 BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
 EventType = نوع الحدث
+LabelOfBooth=Booth label
+LabelOfconference=Conference label
+ConferenceIsNotConfirmed=Subcription not available, conference is not confirmed yet
 
 #
 # Vote page
diff --git a/htdocs/langs/ar_SA/install.lang b/htdocs/langs/ar_SA/install.lang
index 3eadf6f4ba7..676b11d3a5d 100644
--- a/htdocs/langs/ar_SA/install.lang
+++ b/htdocs/langs/ar_SA/install.lang
@@ -206,6 +206,7 @@ MigrationUserPhotoPath=Migration of photo paths for users
 MigrationFieldsSocialNetworks=Migration of users fields social networks (%s)
 MigrationReloadModule=إعادة تحديث الوحدات %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
+MigrationImportOrExportProfiles=Migration of import or export profiles (%s)
 ShowNotAvailableOptions=Show unavailable options
 HideNotAvailableOptions=Hide unavailable options
 ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
diff --git a/htdocs/langs/ar_SA/interventions.lang b/htdocs/langs/ar_SA/interventions.lang
index 06c3d23854e..29d2ccb839a 100644
--- a/htdocs/langs/ar_SA/interventions.lang
+++ b/htdocs/langs/ar_SA/interventions.lang
@@ -64,3 +64,5 @@ InterLineDuration=تدخل مدة خط
 InterLineDesc=خط وصف التدخل
 RepeatableIntervention=Template of intervention
 ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
+Reopen=إعادة فتح
+ConfirmReopenIntervention=Are you sure you want to open back the intervention <b>%s</b>?
diff --git a/htdocs/langs/ar_SA/productbatch.lang b/htdocs/langs/ar_SA/productbatch.lang
index 5e8039205d3..de1b46bd672 100644
--- a/htdocs/langs/ar_SA/productbatch.lang
+++ b/htdocs/langs/ar_SA/productbatch.lang
@@ -26,12 +26,10 @@ ShowLogOfMovementIfLot=Show log of movements for couple product/lot
 StockDetailPerBatch=Stock detail per lot
 SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
-BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
-BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
 ManageLotMask=Custom mask
-CustomMasks=Adds an option to define mask in the product card
-LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
-SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+CustomMasks=Option to define a different numbering mask for each product
+BatchLotNumberingModules=Numbering rule for automatic generation of lot number
+BatchSerialNumberingModules=Numbering rule for automatic generation of serial number (for products with property 1 unique lot/serial for each product)
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
diff --git a/htdocs/langs/ar_SA/products.lang b/htdocs/langs/ar_SA/products.lang
index 75ced2b4df0..2a5a6c2feff 100644
--- a/htdocs/langs/ar_SA/products.lang
+++ b/htdocs/langs/ar_SA/products.lang
@@ -277,7 +277,7 @@ PriceByCustomer=Different prices for each customer
 PriceCatalogue=A single sell price per product/service
 PricingRule=Rules for selling prices
 AddCustomerPrice=إضافة السعر من قبل العملاء
-ForceUpdateChildPriceSoc=تعيين نفس السعر على الشركات التابعة العملاء
+ForceUpdateChildPriceSoc=Set same price on customer's subsidiaries
 PriceByCustomerLog=سجل الأسعار العملاء السابقة
 MinimumPriceLimit=سعر الحد الأدنى لا يمكن أن يكون أقل ثم٪ الصورة
 MinimumRecommendedPrice=Minimum recommended price is: %s
@@ -296,6 +296,7 @@ ComposedProductIncDecStock=زيادة / نقصان الأسهم على التغ
 ComposedProduct=Child products
 MinSupplierPrice=الحد الأدنى من سعر الشراء
 MinCustomerPrice=Minimum selling price
+NoDynamicPrice=No dynamic price
 DynamicPriceConfiguration=التكوين سعر ديناميكي
 DynamicPriceDesc=You may define mathematical formulae to calculate Customer or Vendor prices. Such formulas can use all mathematical operators, some constants and variables. You can define here the variables you wish to use. If the variable needs an automatic update, you may define the external URL to allow Dolibarr to update the value automatically.
 AddVariable=Add Variable
diff --git a/htdocs/langs/ar_SA/salaries.lang b/htdocs/langs/ar_SA/salaries.lang
index 5a0fcdda6bd..87dfead9a33 100644
--- a/htdocs/langs/ar_SA/salaries.lang
+++ b/htdocs/langs/ar_SA/salaries.lang
@@ -2,20 +2,23 @@
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=By default, leave empty the option "Automatically create a total payment" when creating a Salary
 Salary=الراتب
 Salaries=الرواتب
-NewSalaryPayment=دفع الرواتب جديد
+NewSalary=New salary
+NewSalaryPayment=New salary card
 AddSalaryPayment=Add salary payment
 SalaryPayment=دفع الرواتب
 SalariesPayments=مدفوعات الرواتب
+SalariesPaymentsOf=Salaries payments of %s
 ShowSalaryPayment=مشاهدة دفع الرواتب
 THM=Average hourly rate
 TJM=Average daily rate
 CurrentSalary=الراتب الحالي
 THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
 TJMDescription=This value is currently for information only and is not used for any calculation
-LastSalaries=Latest %s salary payments
-AllSalaries=All salary payments
+LastSalaries=Latest %s salaries
+AllSalaries=All salaries
 SalariesStatistics=Salary statistics
-# Export
 SalariesAndPayments=Salaries and payments
+ConfirmDeleteSalaryPayment=Do you want to delete this salary payment ?
diff --git a/htdocs/langs/ar_SA/ticket.lang b/htdocs/langs/ar_SA/ticket.lang
index 0c32265c100..970f7bef887 100644
--- a/htdocs/langs/ar_SA/ticket.lang
+++ b/htdocs/langs/ar_SA/ticket.lang
@@ -34,7 +34,8 @@ TicketDictResolution=Ticket - Resolution
 
 TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
-TicketTypeShortISSUE=Issue, bug or problem
+TicketTypeShortISSUE=Issue or bug
+TicketTypeShortPROBLEM=Problem
 TicketTypeShortREQUEST=Change or enhancement request
 TicketTypeShortPROJET=المشروع
 TicketTypeShortOTHER=الآخر
@@ -54,14 +55,15 @@ TypeContact_ticket_internal_SUPPORTTEC=Assigned user
 TypeContact_ticket_external_SUPPORTCLI=Customer contact / incident tracking
 TypeContact_ticket_external_CONTRIBUTOR=External contributor
 
-OriginEmail=Email source
+OriginEmail=Reporter Email
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
 Read=قرأ
 Assigned=Assigned
 InProgress=في تقدم
-NeedMoreInformation=Waiting for information
+NeedMoreInformation=Waiting for reporter feedback
+NeedMoreInformationShort=Waiting for feedback
 Answered=Answered
 Waiting=انتظار
 Closed=مغلق
@@ -160,7 +162,7 @@ CreatedBy=Created by
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=مجموعة
+TicketCategory=Ticket categorization
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
@@ -211,6 +213,7 @@ TicketMessageHelp=Only this text will be saved in the message list on ticket car
 TicketMessageSubstitutionReplacedByGenericValues=Substitutions variables are replaced by generic values.
 TimeElapsedSince=Time elapsed since
 TicketTimeToRead=Time elapsed before read
+TicketTimeElapsedBeforeSince=Time elapsed before / since
 TicketContacts=Contacts ticket
 TicketDocumentsLinked=Documents linked to ticket
 ConfirmReOpenTicket=Confirm reopen this ticket ?
diff --git a/htdocs/langs/ar_SA/users.lang b/htdocs/langs/ar_SA/users.lang
index bf5dfb8c425..cf6f3cf8762 100644
--- a/htdocs/langs/ar_SA/users.lang
+++ b/htdocs/langs/ar_SA/users.lang
@@ -97,8 +97,8 @@ LoginToCreate=ادخل لخلق
 NameToCreate=اسم طرف ثالث لخلق
 YourRole=الأدوار الخاص
 YourQuotaOfUsersIsReached=يتم التوصل إلى حصة الخاص بك من المستخدمين النشطين!
-NbOfUsers=No. of users
-NbOfPermissions=No. of permissions
+NbOfUsers=Number of users
+NbOfPermissions=Number of permissions
 DontDowngradeSuperAdmin=يمكن فقط superadmin تقليله a superadmin
 HierarchicalResponsible=المشرف
 HierarchicView=الهرمي
diff --git a/htdocs/langs/ar_SA/website.lang b/htdocs/langs/ar_SA/website.lang
index 980b532e823..79ed8803b26 100644
--- a/htdocs/langs/ar_SA/website.lang
+++ b/htdocs/langs/ar_SA/website.lang
@@ -31,7 +31,7 @@ AddWebsite=إضافة موقع إلكتروني
 Webpage=الصفحة\\الحاوية
 AddPage=إضافة صفحة\\حاوية
 PageContainer=صفحة
-PreviewOfSiteNotYetAvailable=إستعراض موقعك الإلكتروني <strong>%s</strong> غير متاح الان . عليك اولاً  "<strong>إستيراد قالب موقع إلكتروني </strong>"  او فقط  "<strong>إضافة صفحة\\حاوية</strong>".
+PreviewOfSiteNotYetAvailable=The preview of your website <strong>%s</strong> is not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=الصفحة المطلوبة بالمعرف  %s لاتحتوي بعد على محتوى ، او ان ملف القالب الخاص بها قد تم حذفه. قم بتعديل محتويات الصفحة لحل ذلك
 SiteDeleted= الموقع "%s" تم حذهف
 PageContent=الصفحة\\الحاوية
diff --git a/htdocs/langs/az_AZ/admin.lang b/htdocs/langs/az_AZ/admin.lang
index be9aca94599..73004a3c8b1 100644
--- a/htdocs/langs/az_AZ/admin.lang
+++ b/htdocs/langs/az_AZ/admin.lang
@@ -53,6 +53,7 @@ InternalUser=Internal user
 ExternalUser=External user
 InternalUsers=Internal users
 ExternalUsers=External users
+UserInterface=User interface
 GUISetup=Display
 SetupArea=Setup
 UploadNewTemplate=Upload new template(s)
@@ -1260,8 +1261,8 @@ YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP
 DownloadMoreSkins=More skins to download
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
-ShowProfIdInAddress=Show professional id with addresses
-ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
+ShowProfIdInAddress=Show professional ID with addresses
+ShowVATIntaInAddress=Hide intra-Community VAT number
 TranslationUncomplete=Partial translation
 MAIN_DISABLE_METEO=Disable meteorological view
 MeteoStdMod=Standard mode
@@ -1778,7 +1779,7 @@ ClickToDialSetup=Click To Dial module setup
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
 ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface, installed on the same computer as the browser, and called when you click on a link starting with "tel:" in your browser. If you need link that start with "sip:" or a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Point of Sale
 CashDeskSetup=Point of Sales module setup
@@ -2133,7 +2134,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
-NotRecommended=Not recommanded
+Recommended=Recommended
+NotRecommended=Not recommended
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
@@ -2144,3 +2146,5 @@ YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You s
 RandomlySelectedIfSeveral=Randomly selected if several pictures are available
 DatabasePasswordObfuscated=Database password is obfuscated in conf file
 DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
+APIsAreNotEnabled=APIs modules are not enabled
+YouShouldSetThisToOff=You should set this to 0 or off
diff --git a/htdocs/langs/az_AZ/banks.lang b/htdocs/langs/az_AZ/banks.lang
index df7192bee25..a0b7942d446 100644
--- a/htdocs/langs/az_AZ/banks.lang
+++ b/htdocs/langs/az_AZ/banks.lang
@@ -115,7 +115,7 @@ TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
 CheckTransmitter=Sender
 ValidateCheckReceipt=Validate this check receipt?
-ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes will be possible once validated.
 DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
diff --git a/htdocs/langs/az_AZ/boxes.lang b/htdocs/langs/az_AZ/boxes.lang
index 0c9ea302fb8..710d49bfab6 100644
--- a/htdocs/langs/az_AZ/boxes.lang
+++ b/htdocs/langs/az_AZ/boxes.lang
@@ -91,8 +91,8 @@ BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
 BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
 BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
 BoxTitleLastModifiedPropals=Latest %s modified proposals
-BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
-BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
+BoxTitleLatestModifiedJobPositions=Latest %s modified job positions
+BoxTitleLatestModifiedCandidatures=Latest %s modified job applications
 ForCustomersInvoices=Customers invoices
 ForCustomersOrders=Customers orders
 ForProposals=Proposals
diff --git a/htdocs/langs/az_AZ/cashdesk.lang b/htdocs/langs/az_AZ/cashdesk.lang
index aea1f02f834..c9d0f7fcd0a 100644
--- a/htdocs/langs/az_AZ/cashdesk.lang
+++ b/htdocs/langs/az_AZ/cashdesk.lang
@@ -127,4 +127,4 @@ AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
 ShowPriceHT = Display the column with the price excluding tax (on screen)
-ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on the receipt)
diff --git a/htdocs/langs/az_AZ/errors.lang b/htdocs/langs/az_AZ/errors.lang
index 670f8c7a6bc..85b90ca4991 100644
--- a/htdocs/langs/az_AZ/errors.lang
+++ b/htdocs/langs/az_AZ/errors.lang
@@ -301,3 +301,4 @@ ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
 ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
+ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
diff --git a/htdocs/langs/az_AZ/eventorganization.lang b/htdocs/langs/az_AZ/eventorganization.lang
index 335c257b224..f361e6bc192 100644
--- a/htdocs/langs/az_AZ/eventorganization.lang
+++ b/htdocs/langs/az_AZ/eventorganization.lang
@@ -86,6 +86,7 @@ DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
 SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
 SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
+NbVotes=Number of votes
 #
 # Status
 #
@@ -115,6 +116,9 @@ EvntOrgDuration = This conference starts on %s and ends on %s.
 ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
 BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
 EventType = Event type
+LabelOfBooth=Booth label
+LabelOfconference=Conference label
+ConferenceIsNotConfirmed=Subcription not available, conference is not confirmed yet
 
 #
 # Vote page
diff --git a/htdocs/langs/az_AZ/install.lang b/htdocs/langs/az_AZ/install.lang
index 63947dad154..c1ffee936d7 100644
--- a/htdocs/langs/az_AZ/install.lang
+++ b/htdocs/langs/az_AZ/install.lang
@@ -206,6 +206,7 @@ MigrationUserPhotoPath=Migration of photo paths for users
 MigrationFieldsSocialNetworks=Migration of users fields social networks (%s)
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
+MigrationImportOrExportProfiles=Migration of import or export profiles (%s)
 ShowNotAvailableOptions=Show unavailable options
 HideNotAvailableOptions=Hide unavailable options
 ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
diff --git a/htdocs/langs/az_AZ/interventions.lang b/htdocs/langs/az_AZ/interventions.lang
index e5936f8246e..51079fca278 100644
--- a/htdocs/langs/az_AZ/interventions.lang
+++ b/htdocs/langs/az_AZ/interventions.lang
@@ -64,3 +64,5 @@ InterLineDuration=Line duration intervention
 InterLineDesc=Line description intervention
 RepeatableIntervention=Template of intervention
 ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
+Reopen=Reopen
+ConfirmReopenIntervention=Are you sure you want to open back the intervention <b>%s</b>?
diff --git a/htdocs/langs/az_AZ/productbatch.lang b/htdocs/langs/az_AZ/productbatch.lang
index 450d0285819..763af20c6b4 100644
--- a/htdocs/langs/az_AZ/productbatch.lang
+++ b/htdocs/langs/az_AZ/productbatch.lang
@@ -26,12 +26,10 @@ ShowLogOfMovementIfLot=Show log of movements for couple product/lot
 StockDetailPerBatch=Stock detail per lot
 SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
-BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
-BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
 ManageLotMask=Custom mask
-CustomMasks=Adds an option to define mask in the product card
-LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
-SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+CustomMasks=Option to define a different numbering mask for each product
+BatchLotNumberingModules=Numbering rule for automatic generation of lot number
+BatchSerialNumberingModules=Numbering rule for automatic generation of serial number (for products with property 1 unique lot/serial for each product)
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
diff --git a/htdocs/langs/az_AZ/products.lang b/htdocs/langs/az_AZ/products.lang
index 9638dfe5a25..fecbe7450c2 100644
--- a/htdocs/langs/az_AZ/products.lang
+++ b/htdocs/langs/az_AZ/products.lang
@@ -277,7 +277,7 @@ PriceByCustomer=Different prices for each customer
 PriceCatalogue=A single sell price per product/service
 PricingRule=Rules for selling prices
 AddCustomerPrice=Add price by customer
-ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
+ForceUpdateChildPriceSoc=Set same price on customer's subsidiaries
 PriceByCustomerLog=Log of previous customer prices
 MinimumPriceLimit=Minimum price can't be lower then %s
 MinimumRecommendedPrice=Minimum recommended price is: %s
@@ -296,6 +296,7 @@ ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Child products
 MinSupplierPrice=Minimum buying price
 MinCustomerPrice=Minimum selling price
+NoDynamicPrice=No dynamic price
 DynamicPriceConfiguration=Dynamic price configuration
 DynamicPriceDesc=You may define mathematical formulae to calculate Customer or Vendor prices. Such formulas can use all mathematical operators, some constants and variables. You can define here the variables you wish to use. If the variable needs an automatic update, you may define the external URL to allow Dolibarr to update the value automatically.
 AddVariable=Add Variable
diff --git a/htdocs/langs/az_AZ/salaries.lang b/htdocs/langs/az_AZ/salaries.lang
index 7c3c08a65bd..12905040b1a 100644
--- a/htdocs/langs/az_AZ/salaries.lang
+++ b/htdocs/langs/az_AZ/salaries.lang
@@ -2,20 +2,23 @@
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=By default, leave empty the option "Automatically create a total payment" when creating a Salary
 Salary=Salary
 Salaries=Salaries
-NewSalaryPayment=New salary payment
+NewSalary=New salary
+NewSalaryPayment=New salary card
 AddSalaryPayment=Add salary payment
 SalaryPayment=Salary payment
 SalariesPayments=Salaries payments
+SalariesPaymentsOf=Salaries payments of %s
 ShowSalaryPayment=Show salary payment
 THM=Average hourly rate
 TJM=Average daily rate
 CurrentSalary=Current salary
 THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
 TJMDescription=This value is currently for information only and is not used for any calculation
-LastSalaries=Latest %s salary payments
-AllSalaries=All salary payments
+LastSalaries=Latest %s salaries
+AllSalaries=All salaries
 SalariesStatistics=Salary statistics
-# Export
 SalariesAndPayments=Salaries and payments
+ConfirmDeleteSalaryPayment=Do you want to delete this salary payment ?
diff --git a/htdocs/langs/az_AZ/ticket.lang b/htdocs/langs/az_AZ/ticket.lang
index 1da32a5a99e..a1bed39c21d 100644
--- a/htdocs/langs/az_AZ/ticket.lang
+++ b/htdocs/langs/az_AZ/ticket.lang
@@ -34,7 +34,8 @@ TicketDictResolution=Ticket - Resolution
 
 TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
-TicketTypeShortISSUE=Issue, bug or problem
+TicketTypeShortISSUE=Issue or bug
+TicketTypeShortPROBLEM=Problem
 TicketTypeShortREQUEST=Change or enhancement request
 TicketTypeShortPROJET=Project
 TicketTypeShortOTHER=Other
@@ -54,14 +55,15 @@ TypeContact_ticket_internal_SUPPORTTEC=Assigned user
 TypeContact_ticket_external_SUPPORTCLI=Customer contact / incident tracking
 TypeContact_ticket_external_CONTRIBUTOR=External contributor
 
-OriginEmail=Email source
+OriginEmail=Reporter Email
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
 Read=Read
 Assigned=Assigned
 InProgress=In progress
-NeedMoreInformation=Waiting for information
+NeedMoreInformation=Waiting for reporter feedback
+NeedMoreInformationShort=Waiting for feedback
 Answered=Answered
 Waiting=Waiting
 Closed=Closed
@@ -160,7 +162,7 @@ CreatedBy=Created by
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Group
+TicketCategory=Ticket categorization
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
@@ -211,6 +213,7 @@ TicketMessageHelp=Only this text will be saved in the message list on ticket car
 TicketMessageSubstitutionReplacedByGenericValues=Substitutions variables are replaced by generic values.
 TimeElapsedSince=Time elapsed since
 TicketTimeToRead=Time elapsed before read
+TicketTimeElapsedBeforeSince=Time elapsed before / since
 TicketContacts=Contacts ticket
 TicketDocumentsLinked=Documents linked to ticket
 ConfirmReOpenTicket=Confirm reopen this ticket ?
diff --git a/htdocs/langs/az_AZ/users.lang b/htdocs/langs/az_AZ/users.lang
index 372090ea5ad..6aeaf128838 100644
--- a/htdocs/langs/az_AZ/users.lang
+++ b/htdocs/langs/az_AZ/users.lang
@@ -97,8 +97,8 @@ LoginToCreate=Login to create
 NameToCreate=Name of third party to create
 YourRole=Your roles
 YourQuotaOfUsersIsReached=Your quota of active users is reached !
-NbOfUsers=No. of users
-NbOfPermissions=No. of permissions
+NbOfUsers=Number of users
+NbOfPermissions=Number of permissions
 DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin
 HierarchicalResponsible=Supervisor
 HierarchicView=Hierarchical view
diff --git a/htdocs/langs/az_AZ/website.lang b/htdocs/langs/az_AZ/website.lang
index 1e727415ec2..dc2ec2c0b3d 100644
--- a/htdocs/langs/az_AZ/website.lang
+++ b/htdocs/langs/az_AZ/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 PageContainer=Page
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
+PreviewOfSiteNotYetAvailable=The preview of your website <strong>%s</strong> is not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
diff --git a/htdocs/langs/bg_BG/admin.lang b/htdocs/langs/bg_BG/admin.lang
index 94427c860b1..f1cdcc5ab95 100644
--- a/htdocs/langs/bg_BG/admin.lang
+++ b/htdocs/langs/bg_BG/admin.lang
@@ -53,6 +53,7 @@ InternalUser=Вътрешен потребител
 ExternalUser=Външен потребител
 InternalUsers=Вътрешни потребители
 ExternalUsers=Външни потребители
+UserInterface=User interface
 GUISetup=Интерфейс
 SetupArea=Настройки
 UploadNewTemplate=Качване на нов(и) шаблон(и)
@@ -1260,8 +1261,8 @@ YourPHPDoesNotHaveSSLSupport=SSL функциите не са налични в
 DownloadMoreSkins=Изтегляне на повече теми
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
-ShowProfIdInAddress=Показване на идентификационни данни в полетата с адреси
-ShowVATIntaInAddress=Скриване на вътрешнообщностния номер по ДДС в полетата с адреси
+ShowProfIdInAddress=Show professional ID with addresses
+ShowVATIntaInAddress=Hide intra-Community VAT number
 TranslationUncomplete=Частичен превод
 MAIN_DISABLE_METEO=Деактивиране на метеорологичния изглед
 MeteoStdMod=Стандартен режим
@@ -1778,7 +1779,7 @@ ClickToDialSetup=Настройка на модула за набиране (Cli
 ClickToDialUrlDesc=URL, който се извиква при кликване върху телефонен номер. В URL адреса може да използвате маркери <br> <b>__PHONETO__</b>, който ще бъде заменен с телефонния номер на лицето, на което ще се обаждате <br> <b>__PHONEFROM__</b>, който ще бъде заменен с телефонния номер на обаждащия се (вашият) <br> <b>__LOGIN__</b>, който ще бъде заменен с clicktodial потребителско име (дефиниран в картата на потребителя) <br> <b>__PASS__</b>, който ще бъде заменен с clicktodial парола (дефинирана в картата на потребителя).
 ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Просто използвайте връзката "tel:" за телефонни номера
-ClickToDialUseTelLinkDesc=Използвайте този метод, ако вашите потребители имат softphone или софтуерен интерфейс, инсталиран на същия компютър заедно с браузъра и се обаждат, когато кликнете върху връзка във вашия браузър, която започва "tel:". Ако имате нужда от пълно сървърно решение (няма нужда от локална софтуерна инсталация), трябва да изберете стойност "Не" и да попълните следващото поле.
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface, installed on the same computer as the browser, and called when you click on a link starting with "tel:" in your browser. If you need link that start with "sip:" or a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Точка за продажба
 CashDeskSetup=Настройка на модул Точка за продажби
@@ -2133,7 +2134,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
-NotRecommended=Not recommanded
+Recommended=Препоръчителна
+NotRecommended=Not recommended
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
@@ -2144,3 +2146,5 @@ YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You s
 RandomlySelectedIfSeveral=Randomly selected if several pictures are available
 DatabasePasswordObfuscated=Database password is obfuscated in conf file
 DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
+APIsAreNotEnabled=APIs modules are not enabled
+YouShouldSetThisToOff=You should set this to 0 or off
diff --git a/htdocs/langs/bg_BG/banks.lang b/htdocs/langs/bg_BG/banks.lang
index e6676b540bb..1aabf46415c 100644
--- a/htdocs/langs/bg_BG/banks.lang
+++ b/htdocs/langs/bg_BG/banks.lang
@@ -115,7 +115,7 @@ TransferTo=За
 TransferFromToDone=Прехвърлянето от <b>%s</b> към <b>%s</b> на <b>%s</b> %s беше записано.
 CheckTransmitter=Подател
 ValidateCheckReceipt=Валидиране на тази чекова разписка?
-ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes will be possible once validated.
 DeleteCheckReceipt=Изтриване на тази чекова разписка?
 ConfirmDeleteCheckReceipt=Сигурни ли сте, че искате да изтриете тази чекова разписка?
 BankChecks=Банкови чекове
diff --git a/htdocs/langs/bg_BG/boxes.lang b/htdocs/langs/bg_BG/boxes.lang
index 0d3c7068949..12ab7aaafa6 100644
--- a/htdocs/langs/bg_BG/boxes.lang
+++ b/htdocs/langs/bg_BG/boxes.lang
@@ -91,8 +91,8 @@ BoxTitleLatestModifiedSupplierOrders=Поръчки за покупка: %s по
 BoxTitleLastModifiedCustomerBills=Фактури за продажба: %s последно променени
 BoxTitleLastModifiedCustomerOrders=Поръчки за продажба: %s последно променени
 BoxTitleLastModifiedPropals=Търговски предложения: %s последно променени
-BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
-BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
+BoxTitleLatestModifiedJobPositions=Latest %s modified job positions
+BoxTitleLatestModifiedCandidatures=Latest %s modified job applications
 ForCustomersInvoices=Фактури за продажба
 ForCustomersOrders=Поръчки на продажба
 ForProposals=Предложения
diff --git a/htdocs/langs/bg_BG/cashdesk.lang b/htdocs/langs/bg_BG/cashdesk.lang
index c5033d79e12..a838c1ce385 100644
--- a/htdocs/langs/bg_BG/cashdesk.lang
+++ b/htdocs/langs/bg_BG/cashdesk.lang
@@ -127,4 +127,4 @@ AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
 ShowPriceHT = Display the column with the price excluding tax (on screen)
-ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on the receipt)
diff --git a/htdocs/langs/bg_BG/errors.lang b/htdocs/langs/bg_BG/errors.lang
index a081e492b2e..71d9682f0f2 100644
--- a/htdocs/langs/bg_BG/errors.lang
+++ b/htdocs/langs/bg_BG/errors.lang
@@ -301,3 +301,4 @@ ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
 ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
+ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
diff --git a/htdocs/langs/bg_BG/eventorganization.lang b/htdocs/langs/bg_BG/eventorganization.lang
index 01691dec9e3..ccbae792a36 100644
--- a/htdocs/langs/bg_BG/eventorganization.lang
+++ b/htdocs/langs/bg_BG/eventorganization.lang
@@ -86,6 +86,7 @@ DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
 SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
 SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
+NbVotes=Number of votes
 #
 # Status
 #
@@ -115,6 +116,9 @@ EvntOrgDuration = This conference starts on %s and ends on %s.
 ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
 BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
 EventType = Тип събитие
+LabelOfBooth=Booth label
+LabelOfconference=Conference label
+ConferenceIsNotConfirmed=Subcription not available, conference is not confirmed yet
 
 #
 # Vote page
diff --git a/htdocs/langs/bg_BG/install.lang b/htdocs/langs/bg_BG/install.lang
index d493acb7829..36b35d11a51 100644
--- a/htdocs/langs/bg_BG/install.lang
+++ b/htdocs/langs/bg_BG/install.lang
@@ -206,6 +206,7 @@ MigrationUserPhotoPath=Миграция на пътя до снимки на п
 MigrationFieldsSocialNetworks=Миграция на потребителски полета за социални мрежи (%s)
 MigrationReloadModule=Презареждане на модул %s
 MigrationResetBlockedLog=Нулиране на модула BlockedLog за алгоритъм v7
+MigrationImportOrExportProfiles=Migration of import or export profiles (%s)
 ShowNotAvailableOptions=Показване на недостъпни опции
 HideNotAvailableOptions=Скриване на недостъпни опции
 ErrorFoundDuringMigration=По време на процеса на миграция са докладвани грешки, така че следващата стъпка не е възможна. За да игнорирате грешките, може да <a href="%s"> кликнете тук </a>, но приложението или някои функции може да не работят правилно, докато грешките не бъдат отстранени.
diff --git a/htdocs/langs/bg_BG/interventions.lang b/htdocs/langs/bg_BG/interventions.lang
index 83824a59f4e..beb459423df 100644
--- a/htdocs/langs/bg_BG/interventions.lang
+++ b/htdocs/langs/bg_BG/interventions.lang
@@ -64,3 +64,5 @@ InterLineDuration=Продължителност на реда в интерве
 InterLineDesc=Описание на реда в интервенцията
 RepeatableIntervention=Шаблон на интервенция
 ToCreateAPredefinedIntervention=За да създадете предварително определена или повтаряща се интервенция, създайте интервенция и я превърнете в шаблон за интервенция.
+Reopen=Повторно отваряне
+ConfirmReopenIntervention=Are you sure you want to open back the intervention <b>%s</b>?
diff --git a/htdocs/langs/bg_BG/productbatch.lang b/htdocs/langs/bg_BG/productbatch.lang
index 1c2d8a20d4f..c20ff568d2f 100644
--- a/htdocs/langs/bg_BG/productbatch.lang
+++ b/htdocs/langs/bg_BG/productbatch.lang
@@ -26,12 +26,10 @@ ShowLogOfMovementIfLot=Показване на движения за проду
 StockDetailPerBatch=Наличност по партида
 SerialNumberAlreadyInUse=Сериен номер %s е вече използван от друг продукт %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
-BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
-BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
 ManageLotMask=Custom mask
-CustomMasks=Adds an option to define mask in the product card
-LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
-SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+CustomMasks=Option to define a different numbering mask for each product
+BatchLotNumberingModules=Numbering rule for automatic generation of lot number
+BatchSerialNumberingModules=Numbering rule for automatic generation of serial number (for products with property 1 unique lot/serial for each product)
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
diff --git a/htdocs/langs/bg_BG/products.lang b/htdocs/langs/bg_BG/products.lang
index 5b920f757db..dfca8e63815 100644
--- a/htdocs/langs/bg_BG/products.lang
+++ b/htdocs/langs/bg_BG/products.lang
@@ -277,7 +277,7 @@ PriceByCustomer=Различни цени за всеки клиент
 PriceCatalogue=Една продажна цена за продукт / услуга
 PricingRule=Правила за продажни цени
 AddCustomerPrice=Добавяне на цена за клиент
-ForceUpdateChildPriceSoc=Определяне на една и съща цена за филиали на клиента
+ForceUpdateChildPriceSoc=Set same price on customer's subsidiaries
 PriceByCustomerLog=История на предишни цени за клиент
 MinimumPriceLimit=Минималната цена не може да бъде по-ниска от %s
 MinimumRecommendedPrice=Минималната препоръчителна цена е: %s
@@ -296,6 +296,7 @@ ComposedProductIncDecStock=Увеличаване / намаляване на н
 ComposedProduct=Съставни продукти
 MinSupplierPrice=Минимална покупната цена
 MinCustomerPrice=Минимална продажна цена
+NoDynamicPrice=No dynamic price
 DynamicPriceConfiguration=Динамична ценова конфигурация
 DynamicPriceDesc=Можете да дефинирате математически формули за изчисляване на клиентски или доставни цени. Тези формули могат да използват всички математически оператори, някои константи и променливи. Тук можете да определите променливите, които искате да използвате. Ако променливата се нуждае от автоматична актуализация, можете да дефинирате външен URL адрес, за да позволите на Dolibarr да актуализира стойността автоматично.
 AddVariable=Добавяне на променлива
diff --git a/htdocs/langs/bg_BG/salaries.lang b/htdocs/langs/bg_BG/salaries.lang
index 0aab1f9011c..bb767dae875 100644
--- a/htdocs/langs/bg_BG/salaries.lang
+++ b/htdocs/langs/bg_BG/salaries.lang
@@ -2,20 +2,23 @@
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Счетоводна сметка, използвана за служители на контрагенти
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=Специализираната счетоводна сметка, дефинирана в картата на потребителя, ще се използва само за вторично счетоводно отчитане. Тя ще бъде използвана в регистъра на главната счетоводна книга и като стойност по подразбиране за вторично счетоводно отчитане, ако не е дефинирана специализирана потребителска счетоводна сметка за потребителя.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Счетоводна сметка по подразбиране за плащане на заплати
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=By default, leave empty the option "Automatically create a total payment" when creating a Salary
 Salary=Заплата
 Salaries=Заплати
-NewSalaryPayment=Ново плащане на заплата
+NewSalary=New salary
+NewSalaryPayment=New salary card
 AddSalaryPayment=Добавяне на плащане на заплата
 SalaryPayment=Плащане на заплата
 SalariesPayments=Плащания на заплати
+SalariesPaymentsOf=Salaries payments of %s
 ShowSalaryPayment=Показване на плащане на заплата
 THM=Средна почасова ставка
 TJM=Средна дневна ставка
 CurrentSalary=Текуща заплата
 THMDescription=Тази стойност може да се използва за изчисляване на разходите за времето, което е отделено по проект, ако модула проекти се използва.
 TJMDescription=Тази стойност понастоящем е информативна и  не се използва за изчисления
-LastSalaries=Плащания на заплати: %s последни
-AllSalaries=Всички плащания на заплати
+LastSalaries=Latest %s salaries
+AllSalaries=All salaries
 SalariesStatistics=Статистика на заплати
-# Export
 SalariesAndPayments=Заплати и плащания
+ConfirmDeleteSalaryPayment=Do you want to delete this salary payment ?
diff --git a/htdocs/langs/bg_BG/ticket.lang b/htdocs/langs/bg_BG/ticket.lang
index e7c6cfffe12..a9c3d96b21c 100644
--- a/htdocs/langs/bg_BG/ticket.lang
+++ b/htdocs/langs/bg_BG/ticket.lang
@@ -34,7 +34,8 @@ TicketDictResolution=Тикет - Решения
 
 TicketTypeShortCOM=Търговски въпрос
 TicketTypeShortHELP=Молба за асистенция
-TicketTypeShortISSUE=Въпрос, грешка или проблем
+TicketTypeShortISSUE=Issue or bug
+TicketTypeShortPROBLEM=Problem
 TicketTypeShortREQUEST=Заявка за подобрение
 TicketTypeShortPROJET=Проект
 TicketTypeShortOTHER=Друго
@@ -54,14 +55,15 @@ TypeContact_ticket_internal_SUPPORTTEC=Отговорен служител
 TypeContact_ticket_external_SUPPORTCLI=Контакт на контрагента проследяващ тикета
 TypeContact_ticket_external_CONTRIBUTOR=Сътрудник от страна на контрагента
 
-OriginEmail=Имейл източник
+OriginEmail=Reporter Email
 Notify_TICKET_SENTBYMAIL=Изпращане на тикет съобщението по имейл
 
 # Status
 Read=Прочетен
 Assigned=Възложен
 InProgress=В изпълнение
-NeedMoreInformation=В очакване на подробности
+NeedMoreInformation=Waiting for reporter feedback
+NeedMoreInformationShort=Waiting for feedback
 Answered=Отговорен
 Waiting=В изчакване
 Closed=Приключен
@@ -160,7 +162,7 @@ CreatedBy=Създаден от
 NewTicket=Нов тикет
 SubjectAnswerToTicket=Отговор на тикет
 TicketTypeRequest=Вид на тикета
-TicketCategory=Група
+TicketCategory=Ticket categorization
 SeeTicket=Преглед на тикет
 TicketMarkedAsRead=Тикетът е маркиран като прочетен
 TicketReadOn=Прочетен на
@@ -211,6 +213,7 @@ TicketMessageHelp=Само този текст ще бъде запазен в 
 TicketMessageSubstitutionReplacedByGenericValues=Заместващите променливи се заменят с общи стойности.
 TimeElapsedSince=Изминало време
 TicketTimeToRead=Изминало време преди прочитане
+TicketTimeElapsedBeforeSince=Time elapsed before / since
 TicketContacts=Контакти
 TicketDocumentsLinked=Документи свързани с тикета
 ConfirmReOpenTicket=Потвърдете повторното отваряне на този тикет?
diff --git a/htdocs/langs/bg_BG/users.lang b/htdocs/langs/bg_BG/users.lang
index ae4e7e517ea..7a9ea0ab360 100644
--- a/htdocs/langs/bg_BG/users.lang
+++ b/htdocs/langs/bg_BG/users.lang
@@ -97,8 +97,8 @@ LoginToCreate=Потребителско име
 NameToCreate=Име на контрагент за създаване
 YourRole=Вашите роли
 YourQuotaOfUsersIsReached=Вашата квота за активни потребители е достигната!
-NbOfUsers=Брой потребители
-NbOfPermissions=Брой права
+NbOfUsers=Number of users
+NbOfPermissions=Number of permissions
 DontDowngradeSuperAdmin=Само супер администратор може да понижи супер администратор
 HierarchicalResponsible=Ръководител
 HierarchicView=Йерархичен изглед
diff --git a/htdocs/langs/bg_BG/website.lang b/htdocs/langs/bg_BG/website.lang
index 2f341b2b6c9..63fc67e371d 100644
--- a/htdocs/langs/bg_BG/website.lang
+++ b/htdocs/langs/bg_BG/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Добавяне на уебсайт
 Webpage=Уеб страница / контейнер
 AddPage=Добавяне на страница / контейнер
 PageContainer=Страница
-PreviewOfSiteNotYetAvailable=Преглед на вашия уебсайт <strong>%s</strong> все още не е наличен. Първо трябва да '<strong>Импортирате пълен шаблон за уебсайт</strong>' или просто да '<strong>Добавите страница / контейнер</strong>'.
+PreviewOfSiteNotYetAvailable=The preview of your website <strong>%s</strong> is not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Заявената страница с id %s все още няма съдържание или кеш файлът .tpl.php е бил премахнат. Редактирайте съдържанието на страницата, за да коригирате това.
 SiteDeleted=Уебсайта '%s' е изтрит
 PageContent=Страница / контейнер
diff --git a/htdocs/langs/bn_BD/admin.lang b/htdocs/langs/bn_BD/admin.lang
index be9aca94599..73004a3c8b1 100644
--- a/htdocs/langs/bn_BD/admin.lang
+++ b/htdocs/langs/bn_BD/admin.lang
@@ -53,6 +53,7 @@ InternalUser=Internal user
 ExternalUser=External user
 InternalUsers=Internal users
 ExternalUsers=External users
+UserInterface=User interface
 GUISetup=Display
 SetupArea=Setup
 UploadNewTemplate=Upload new template(s)
@@ -1260,8 +1261,8 @@ YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP
 DownloadMoreSkins=More skins to download
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
-ShowProfIdInAddress=Show professional id with addresses
-ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
+ShowProfIdInAddress=Show professional ID with addresses
+ShowVATIntaInAddress=Hide intra-Community VAT number
 TranslationUncomplete=Partial translation
 MAIN_DISABLE_METEO=Disable meteorological view
 MeteoStdMod=Standard mode
@@ -1778,7 +1779,7 @@ ClickToDialSetup=Click To Dial module setup
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
 ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface, installed on the same computer as the browser, and called when you click on a link starting with "tel:" in your browser. If you need link that start with "sip:" or a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Point of Sale
 CashDeskSetup=Point of Sales module setup
@@ -2133,7 +2134,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
-NotRecommended=Not recommanded
+Recommended=Recommended
+NotRecommended=Not recommended
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
@@ -2144,3 +2146,5 @@ YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You s
 RandomlySelectedIfSeveral=Randomly selected if several pictures are available
 DatabasePasswordObfuscated=Database password is obfuscated in conf file
 DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
+APIsAreNotEnabled=APIs modules are not enabled
+YouShouldSetThisToOff=You should set this to 0 or off
diff --git a/htdocs/langs/bn_BD/banks.lang b/htdocs/langs/bn_BD/banks.lang
index 3430961c71b..f7225e6f4f5 100644
--- a/htdocs/langs/bn_BD/banks.lang
+++ b/htdocs/langs/bn_BD/banks.lang
@@ -115,7 +115,7 @@ TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
 CheckTransmitter=Sender
 ValidateCheckReceipt=Validate this check receipt?
-ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes will be possible once validated.
 DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
diff --git a/htdocs/langs/bn_BD/boxes.lang b/htdocs/langs/bn_BD/boxes.lang
index 0c9ea302fb8..710d49bfab6 100644
--- a/htdocs/langs/bn_BD/boxes.lang
+++ b/htdocs/langs/bn_BD/boxes.lang
@@ -91,8 +91,8 @@ BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
 BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
 BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
 BoxTitleLastModifiedPropals=Latest %s modified proposals
-BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
-BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
+BoxTitleLatestModifiedJobPositions=Latest %s modified job positions
+BoxTitleLatestModifiedCandidatures=Latest %s modified job applications
 ForCustomersInvoices=Customers invoices
 ForCustomersOrders=Customers orders
 ForProposals=Proposals
diff --git a/htdocs/langs/bn_BD/cashdesk.lang b/htdocs/langs/bn_BD/cashdesk.lang
index aea1f02f834..c9d0f7fcd0a 100644
--- a/htdocs/langs/bn_BD/cashdesk.lang
+++ b/htdocs/langs/bn_BD/cashdesk.lang
@@ -127,4 +127,4 @@ AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
 ShowPriceHT = Display the column with the price excluding tax (on screen)
-ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on the receipt)
diff --git a/htdocs/langs/bn_BD/errors.lang b/htdocs/langs/bn_BD/errors.lang
index 670f8c7a6bc..85b90ca4991 100644
--- a/htdocs/langs/bn_BD/errors.lang
+++ b/htdocs/langs/bn_BD/errors.lang
@@ -301,3 +301,4 @@ ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
 ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
+ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
diff --git a/htdocs/langs/bn_BD/eventorganization.lang b/htdocs/langs/bn_BD/eventorganization.lang
index 335c257b224..f361e6bc192 100644
--- a/htdocs/langs/bn_BD/eventorganization.lang
+++ b/htdocs/langs/bn_BD/eventorganization.lang
@@ -86,6 +86,7 @@ DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
 SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
 SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
+NbVotes=Number of votes
 #
 # Status
 #
@@ -115,6 +116,9 @@ EvntOrgDuration = This conference starts on %s and ends on %s.
 ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
 BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
 EventType = Event type
+LabelOfBooth=Booth label
+LabelOfconference=Conference label
+ConferenceIsNotConfirmed=Subcription not available, conference is not confirmed yet
 
 #
 # Vote page
diff --git a/htdocs/langs/bn_BD/install.lang b/htdocs/langs/bn_BD/install.lang
index 63947dad154..c1ffee936d7 100644
--- a/htdocs/langs/bn_BD/install.lang
+++ b/htdocs/langs/bn_BD/install.lang
@@ -206,6 +206,7 @@ MigrationUserPhotoPath=Migration of photo paths for users
 MigrationFieldsSocialNetworks=Migration of users fields social networks (%s)
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
+MigrationImportOrExportProfiles=Migration of import or export profiles (%s)
 ShowNotAvailableOptions=Show unavailable options
 HideNotAvailableOptions=Hide unavailable options
 ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
diff --git a/htdocs/langs/bn_BD/interventions.lang b/htdocs/langs/bn_BD/interventions.lang
index e5936f8246e..51079fca278 100644
--- a/htdocs/langs/bn_BD/interventions.lang
+++ b/htdocs/langs/bn_BD/interventions.lang
@@ -64,3 +64,5 @@ InterLineDuration=Line duration intervention
 InterLineDesc=Line description intervention
 RepeatableIntervention=Template of intervention
 ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
+Reopen=Reopen
+ConfirmReopenIntervention=Are you sure you want to open back the intervention <b>%s</b>?
diff --git a/htdocs/langs/bn_BD/productbatch.lang b/htdocs/langs/bn_BD/productbatch.lang
index 450d0285819..763af20c6b4 100644
--- a/htdocs/langs/bn_BD/productbatch.lang
+++ b/htdocs/langs/bn_BD/productbatch.lang
@@ -26,12 +26,10 @@ ShowLogOfMovementIfLot=Show log of movements for couple product/lot
 StockDetailPerBatch=Stock detail per lot
 SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
-BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
-BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
 ManageLotMask=Custom mask
-CustomMasks=Adds an option to define mask in the product card
-LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
-SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+CustomMasks=Option to define a different numbering mask for each product
+BatchLotNumberingModules=Numbering rule for automatic generation of lot number
+BatchSerialNumberingModules=Numbering rule for automatic generation of serial number (for products with property 1 unique lot/serial for each product)
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
diff --git a/htdocs/langs/bn_BD/products.lang b/htdocs/langs/bn_BD/products.lang
index 9638dfe5a25..fecbe7450c2 100644
--- a/htdocs/langs/bn_BD/products.lang
+++ b/htdocs/langs/bn_BD/products.lang
@@ -277,7 +277,7 @@ PriceByCustomer=Different prices for each customer
 PriceCatalogue=A single sell price per product/service
 PricingRule=Rules for selling prices
 AddCustomerPrice=Add price by customer
-ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
+ForceUpdateChildPriceSoc=Set same price on customer's subsidiaries
 PriceByCustomerLog=Log of previous customer prices
 MinimumPriceLimit=Minimum price can't be lower then %s
 MinimumRecommendedPrice=Minimum recommended price is: %s
@@ -296,6 +296,7 @@ ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Child products
 MinSupplierPrice=Minimum buying price
 MinCustomerPrice=Minimum selling price
+NoDynamicPrice=No dynamic price
 DynamicPriceConfiguration=Dynamic price configuration
 DynamicPriceDesc=You may define mathematical formulae to calculate Customer or Vendor prices. Such formulas can use all mathematical operators, some constants and variables. You can define here the variables you wish to use. If the variable needs an automatic update, you may define the external URL to allow Dolibarr to update the value automatically.
 AddVariable=Add Variable
diff --git a/htdocs/langs/bn_BD/salaries.lang b/htdocs/langs/bn_BD/salaries.lang
index 7c3c08a65bd..12905040b1a 100644
--- a/htdocs/langs/bn_BD/salaries.lang
+++ b/htdocs/langs/bn_BD/salaries.lang
@@ -2,20 +2,23 @@
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=By default, leave empty the option "Automatically create a total payment" when creating a Salary
 Salary=Salary
 Salaries=Salaries
-NewSalaryPayment=New salary payment
+NewSalary=New salary
+NewSalaryPayment=New salary card
 AddSalaryPayment=Add salary payment
 SalaryPayment=Salary payment
 SalariesPayments=Salaries payments
+SalariesPaymentsOf=Salaries payments of %s
 ShowSalaryPayment=Show salary payment
 THM=Average hourly rate
 TJM=Average daily rate
 CurrentSalary=Current salary
 THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
 TJMDescription=This value is currently for information only and is not used for any calculation
-LastSalaries=Latest %s salary payments
-AllSalaries=All salary payments
+LastSalaries=Latest %s salaries
+AllSalaries=All salaries
 SalariesStatistics=Salary statistics
-# Export
 SalariesAndPayments=Salaries and payments
+ConfirmDeleteSalaryPayment=Do you want to delete this salary payment ?
diff --git a/htdocs/langs/bn_BD/ticket.lang b/htdocs/langs/bn_BD/ticket.lang
index 1da32a5a99e..a1bed39c21d 100644
--- a/htdocs/langs/bn_BD/ticket.lang
+++ b/htdocs/langs/bn_BD/ticket.lang
@@ -34,7 +34,8 @@ TicketDictResolution=Ticket - Resolution
 
 TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
-TicketTypeShortISSUE=Issue, bug or problem
+TicketTypeShortISSUE=Issue or bug
+TicketTypeShortPROBLEM=Problem
 TicketTypeShortREQUEST=Change or enhancement request
 TicketTypeShortPROJET=Project
 TicketTypeShortOTHER=Other
@@ -54,14 +55,15 @@ TypeContact_ticket_internal_SUPPORTTEC=Assigned user
 TypeContact_ticket_external_SUPPORTCLI=Customer contact / incident tracking
 TypeContact_ticket_external_CONTRIBUTOR=External contributor
 
-OriginEmail=Email source
+OriginEmail=Reporter Email
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
 Read=Read
 Assigned=Assigned
 InProgress=In progress
-NeedMoreInformation=Waiting for information
+NeedMoreInformation=Waiting for reporter feedback
+NeedMoreInformationShort=Waiting for feedback
 Answered=Answered
 Waiting=Waiting
 Closed=Closed
@@ -160,7 +162,7 @@ CreatedBy=Created by
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Group
+TicketCategory=Ticket categorization
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
@@ -211,6 +213,7 @@ TicketMessageHelp=Only this text will be saved in the message list on ticket car
 TicketMessageSubstitutionReplacedByGenericValues=Substitutions variables are replaced by generic values.
 TimeElapsedSince=Time elapsed since
 TicketTimeToRead=Time elapsed before read
+TicketTimeElapsedBeforeSince=Time elapsed before / since
 TicketContacts=Contacts ticket
 TicketDocumentsLinked=Documents linked to ticket
 ConfirmReOpenTicket=Confirm reopen this ticket ?
diff --git a/htdocs/langs/bn_BD/users.lang b/htdocs/langs/bn_BD/users.lang
index 372090ea5ad..6aeaf128838 100644
--- a/htdocs/langs/bn_BD/users.lang
+++ b/htdocs/langs/bn_BD/users.lang
@@ -97,8 +97,8 @@ LoginToCreate=Login to create
 NameToCreate=Name of third party to create
 YourRole=Your roles
 YourQuotaOfUsersIsReached=Your quota of active users is reached !
-NbOfUsers=No. of users
-NbOfPermissions=No. of permissions
+NbOfUsers=Number of users
+NbOfPermissions=Number of permissions
 DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin
 HierarchicalResponsible=Supervisor
 HierarchicView=Hierarchical view
diff --git a/htdocs/langs/bn_BD/website.lang b/htdocs/langs/bn_BD/website.lang
index 1e727415ec2..dc2ec2c0b3d 100644
--- a/htdocs/langs/bn_BD/website.lang
+++ b/htdocs/langs/bn_BD/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 PageContainer=Page
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
+PreviewOfSiteNotYetAvailable=The preview of your website <strong>%s</strong> is not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
diff --git a/htdocs/langs/bn_IN/admin.lang b/htdocs/langs/bn_IN/admin.lang
index be9aca94599..73004a3c8b1 100644
--- a/htdocs/langs/bn_IN/admin.lang
+++ b/htdocs/langs/bn_IN/admin.lang
@@ -53,6 +53,7 @@ InternalUser=Internal user
 ExternalUser=External user
 InternalUsers=Internal users
 ExternalUsers=External users
+UserInterface=User interface
 GUISetup=Display
 SetupArea=Setup
 UploadNewTemplate=Upload new template(s)
@@ -1260,8 +1261,8 @@ YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP
 DownloadMoreSkins=More skins to download
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
-ShowProfIdInAddress=Show professional id with addresses
-ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
+ShowProfIdInAddress=Show professional ID with addresses
+ShowVATIntaInAddress=Hide intra-Community VAT number
 TranslationUncomplete=Partial translation
 MAIN_DISABLE_METEO=Disable meteorological view
 MeteoStdMod=Standard mode
@@ -1778,7 +1779,7 @@ ClickToDialSetup=Click To Dial module setup
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
 ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface, installed on the same computer as the browser, and called when you click on a link starting with "tel:" in your browser. If you need link that start with "sip:" or a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Point of Sale
 CashDeskSetup=Point of Sales module setup
@@ -2133,7 +2134,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
-NotRecommended=Not recommanded
+Recommended=Recommended
+NotRecommended=Not recommended
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
@@ -2144,3 +2146,5 @@ YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You s
 RandomlySelectedIfSeveral=Randomly selected if several pictures are available
 DatabasePasswordObfuscated=Database password is obfuscated in conf file
 DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
+APIsAreNotEnabled=APIs modules are not enabled
+YouShouldSetThisToOff=You should set this to 0 or off
diff --git a/htdocs/langs/bn_IN/banks.lang b/htdocs/langs/bn_IN/banks.lang
index df7192bee25..a0b7942d446 100644
--- a/htdocs/langs/bn_IN/banks.lang
+++ b/htdocs/langs/bn_IN/banks.lang
@@ -115,7 +115,7 @@ TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
 CheckTransmitter=Sender
 ValidateCheckReceipt=Validate this check receipt?
-ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes will be possible once validated.
 DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
diff --git a/htdocs/langs/bn_IN/boxes.lang b/htdocs/langs/bn_IN/boxes.lang
index 0c9ea302fb8..710d49bfab6 100644
--- a/htdocs/langs/bn_IN/boxes.lang
+++ b/htdocs/langs/bn_IN/boxes.lang
@@ -91,8 +91,8 @@ BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
 BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
 BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
 BoxTitleLastModifiedPropals=Latest %s modified proposals
-BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
-BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
+BoxTitleLatestModifiedJobPositions=Latest %s modified job positions
+BoxTitleLatestModifiedCandidatures=Latest %s modified job applications
 ForCustomersInvoices=Customers invoices
 ForCustomersOrders=Customers orders
 ForProposals=Proposals
diff --git a/htdocs/langs/bn_IN/cashdesk.lang b/htdocs/langs/bn_IN/cashdesk.lang
index aea1f02f834..c9d0f7fcd0a 100644
--- a/htdocs/langs/bn_IN/cashdesk.lang
+++ b/htdocs/langs/bn_IN/cashdesk.lang
@@ -127,4 +127,4 @@ AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
 ShowPriceHT = Display the column with the price excluding tax (on screen)
-ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on the receipt)
diff --git a/htdocs/langs/bn_IN/errors.lang b/htdocs/langs/bn_IN/errors.lang
index 670f8c7a6bc..85b90ca4991 100644
--- a/htdocs/langs/bn_IN/errors.lang
+++ b/htdocs/langs/bn_IN/errors.lang
@@ -301,3 +301,4 @@ ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
 ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
+ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
diff --git a/htdocs/langs/bn_IN/eventorganization.lang b/htdocs/langs/bn_IN/eventorganization.lang
index 335c257b224..f361e6bc192 100644
--- a/htdocs/langs/bn_IN/eventorganization.lang
+++ b/htdocs/langs/bn_IN/eventorganization.lang
@@ -86,6 +86,7 @@ DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
 SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
 SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
+NbVotes=Number of votes
 #
 # Status
 #
@@ -115,6 +116,9 @@ EvntOrgDuration = This conference starts on %s and ends on %s.
 ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
 BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
 EventType = Event type
+LabelOfBooth=Booth label
+LabelOfconference=Conference label
+ConferenceIsNotConfirmed=Subcription not available, conference is not confirmed yet
 
 #
 # Vote page
diff --git a/htdocs/langs/bn_IN/install.lang b/htdocs/langs/bn_IN/install.lang
index 63947dad154..c1ffee936d7 100644
--- a/htdocs/langs/bn_IN/install.lang
+++ b/htdocs/langs/bn_IN/install.lang
@@ -206,6 +206,7 @@ MigrationUserPhotoPath=Migration of photo paths for users
 MigrationFieldsSocialNetworks=Migration of users fields social networks (%s)
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
+MigrationImportOrExportProfiles=Migration of import or export profiles (%s)
 ShowNotAvailableOptions=Show unavailable options
 HideNotAvailableOptions=Hide unavailable options
 ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
diff --git a/htdocs/langs/bn_IN/interventions.lang b/htdocs/langs/bn_IN/interventions.lang
index e5936f8246e..51079fca278 100644
--- a/htdocs/langs/bn_IN/interventions.lang
+++ b/htdocs/langs/bn_IN/interventions.lang
@@ -64,3 +64,5 @@ InterLineDuration=Line duration intervention
 InterLineDesc=Line description intervention
 RepeatableIntervention=Template of intervention
 ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
+Reopen=Reopen
+ConfirmReopenIntervention=Are you sure you want to open back the intervention <b>%s</b>?
diff --git a/htdocs/langs/bn_IN/productbatch.lang b/htdocs/langs/bn_IN/productbatch.lang
index 450d0285819..763af20c6b4 100644
--- a/htdocs/langs/bn_IN/productbatch.lang
+++ b/htdocs/langs/bn_IN/productbatch.lang
@@ -26,12 +26,10 @@ ShowLogOfMovementIfLot=Show log of movements for couple product/lot
 StockDetailPerBatch=Stock detail per lot
 SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
-BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
-BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
 ManageLotMask=Custom mask
-CustomMasks=Adds an option to define mask in the product card
-LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
-SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+CustomMasks=Option to define a different numbering mask for each product
+BatchLotNumberingModules=Numbering rule for automatic generation of lot number
+BatchSerialNumberingModules=Numbering rule for automatic generation of serial number (for products with property 1 unique lot/serial for each product)
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
diff --git a/htdocs/langs/bn_IN/products.lang b/htdocs/langs/bn_IN/products.lang
index 9638dfe5a25..fecbe7450c2 100644
--- a/htdocs/langs/bn_IN/products.lang
+++ b/htdocs/langs/bn_IN/products.lang
@@ -277,7 +277,7 @@ PriceByCustomer=Different prices for each customer
 PriceCatalogue=A single sell price per product/service
 PricingRule=Rules for selling prices
 AddCustomerPrice=Add price by customer
-ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
+ForceUpdateChildPriceSoc=Set same price on customer's subsidiaries
 PriceByCustomerLog=Log of previous customer prices
 MinimumPriceLimit=Minimum price can't be lower then %s
 MinimumRecommendedPrice=Minimum recommended price is: %s
@@ -296,6 +296,7 @@ ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Child products
 MinSupplierPrice=Minimum buying price
 MinCustomerPrice=Minimum selling price
+NoDynamicPrice=No dynamic price
 DynamicPriceConfiguration=Dynamic price configuration
 DynamicPriceDesc=You may define mathematical formulae to calculate Customer or Vendor prices. Such formulas can use all mathematical operators, some constants and variables. You can define here the variables you wish to use. If the variable needs an automatic update, you may define the external URL to allow Dolibarr to update the value automatically.
 AddVariable=Add Variable
diff --git a/htdocs/langs/bn_IN/salaries.lang b/htdocs/langs/bn_IN/salaries.lang
index 7c3c08a65bd..12905040b1a 100644
--- a/htdocs/langs/bn_IN/salaries.lang
+++ b/htdocs/langs/bn_IN/salaries.lang
@@ -2,20 +2,23 @@
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=By default, leave empty the option "Automatically create a total payment" when creating a Salary
 Salary=Salary
 Salaries=Salaries
-NewSalaryPayment=New salary payment
+NewSalary=New salary
+NewSalaryPayment=New salary card
 AddSalaryPayment=Add salary payment
 SalaryPayment=Salary payment
 SalariesPayments=Salaries payments
+SalariesPaymentsOf=Salaries payments of %s
 ShowSalaryPayment=Show salary payment
 THM=Average hourly rate
 TJM=Average daily rate
 CurrentSalary=Current salary
 THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
 TJMDescription=This value is currently for information only and is not used for any calculation
-LastSalaries=Latest %s salary payments
-AllSalaries=All salary payments
+LastSalaries=Latest %s salaries
+AllSalaries=All salaries
 SalariesStatistics=Salary statistics
-# Export
 SalariesAndPayments=Salaries and payments
+ConfirmDeleteSalaryPayment=Do you want to delete this salary payment ?
diff --git a/htdocs/langs/bn_IN/ticket.lang b/htdocs/langs/bn_IN/ticket.lang
index 1da32a5a99e..a1bed39c21d 100644
--- a/htdocs/langs/bn_IN/ticket.lang
+++ b/htdocs/langs/bn_IN/ticket.lang
@@ -34,7 +34,8 @@ TicketDictResolution=Ticket - Resolution
 
 TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
-TicketTypeShortISSUE=Issue, bug or problem
+TicketTypeShortISSUE=Issue or bug
+TicketTypeShortPROBLEM=Problem
 TicketTypeShortREQUEST=Change or enhancement request
 TicketTypeShortPROJET=Project
 TicketTypeShortOTHER=Other
@@ -54,14 +55,15 @@ TypeContact_ticket_internal_SUPPORTTEC=Assigned user
 TypeContact_ticket_external_SUPPORTCLI=Customer contact / incident tracking
 TypeContact_ticket_external_CONTRIBUTOR=External contributor
 
-OriginEmail=Email source
+OriginEmail=Reporter Email
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
 Read=Read
 Assigned=Assigned
 InProgress=In progress
-NeedMoreInformation=Waiting for information
+NeedMoreInformation=Waiting for reporter feedback
+NeedMoreInformationShort=Waiting for feedback
 Answered=Answered
 Waiting=Waiting
 Closed=Closed
@@ -160,7 +162,7 @@ CreatedBy=Created by
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Group
+TicketCategory=Ticket categorization
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
@@ -211,6 +213,7 @@ TicketMessageHelp=Only this text will be saved in the message list on ticket car
 TicketMessageSubstitutionReplacedByGenericValues=Substitutions variables are replaced by generic values.
 TimeElapsedSince=Time elapsed since
 TicketTimeToRead=Time elapsed before read
+TicketTimeElapsedBeforeSince=Time elapsed before / since
 TicketContacts=Contacts ticket
 TicketDocumentsLinked=Documents linked to ticket
 ConfirmReOpenTicket=Confirm reopen this ticket ?
diff --git a/htdocs/langs/bn_IN/users.lang b/htdocs/langs/bn_IN/users.lang
index 372090ea5ad..6aeaf128838 100644
--- a/htdocs/langs/bn_IN/users.lang
+++ b/htdocs/langs/bn_IN/users.lang
@@ -97,8 +97,8 @@ LoginToCreate=Login to create
 NameToCreate=Name of third party to create
 YourRole=Your roles
 YourQuotaOfUsersIsReached=Your quota of active users is reached !
-NbOfUsers=No. of users
-NbOfPermissions=No. of permissions
+NbOfUsers=Number of users
+NbOfPermissions=Number of permissions
 DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin
 HierarchicalResponsible=Supervisor
 HierarchicView=Hierarchical view
diff --git a/htdocs/langs/bn_IN/website.lang b/htdocs/langs/bn_IN/website.lang
index 1e727415ec2..dc2ec2c0b3d 100644
--- a/htdocs/langs/bn_IN/website.lang
+++ b/htdocs/langs/bn_IN/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 PageContainer=Page
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
+PreviewOfSiteNotYetAvailable=The preview of your website <strong>%s</strong> is not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
diff --git a/htdocs/langs/bs_BA/admin.lang b/htdocs/langs/bs_BA/admin.lang
index ed5b59577b2..1a7ee492870 100644
--- a/htdocs/langs/bs_BA/admin.lang
+++ b/htdocs/langs/bs_BA/admin.lang
@@ -53,6 +53,7 @@ InternalUser=Interni korisnik
 ExternalUser=Vanjski korisnik
 InternalUsers=Interni korisnici
 ExternalUsers=Vanjski korisnici
+UserInterface=User interface
 GUISetup=Prikaz
 SetupArea=Postavke
 UploadNewTemplate=Upload new template(s)
@@ -1260,8 +1261,8 @@ YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP
 DownloadMoreSkins=More skins to download
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
-ShowProfIdInAddress=Show professional id with addresses
-ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
+ShowProfIdInAddress=Show professional ID with addresses
+ShowVATIntaInAddress=Hide intra-Community VAT number
 TranslationUncomplete=Partial translation
 MAIN_DISABLE_METEO=Disable meteorological view
 MeteoStdMod=Standard mode
@@ -1778,7 +1779,7 @@ ClickToDialSetup=Click To Dial module setup
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
 ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface, installed on the same computer as the browser, and called when you click on a link starting with "tel:" in your browser. If you need link that start with "sip:" or a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Point of Sale
 CashDeskSetup=Point of Sales module setup
@@ -2133,7 +2134,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
-NotRecommended=Not recommanded
+Recommended=Preporučeno
+NotRecommended=Not recommended
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
@@ -2144,3 +2146,5 @@ YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You s
 RandomlySelectedIfSeveral=Randomly selected if several pictures are available
 DatabasePasswordObfuscated=Database password is obfuscated in conf file
 DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
+APIsAreNotEnabled=APIs modules are not enabled
+YouShouldSetThisToOff=You should set this to 0 or off
diff --git a/htdocs/langs/bs_BA/banks.lang b/htdocs/langs/bs_BA/banks.lang
index 978d9be60ec..3a245ded3ed 100644
--- a/htdocs/langs/bs_BA/banks.lang
+++ b/htdocs/langs/bs_BA/banks.lang
@@ -115,7 +115,7 @@ TransferTo=Prema
 TransferFromToDone=Transfer sa <b>%s</b> na <b>%s</b> u iznosu od <b>%s</b> %s je zapisan.
 CheckTransmitter=Od
 ValidateCheckReceipt=Odobrite ovaj ispis čeka?
-ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes will be possible once validated.
 DeleteCheckReceipt=Obrišite ovaj izvod čeka?
 ConfirmDeleteCheckReceipt=Da li ste sigurni da želite obrisati ovaj izvod od čeka?
 BankChecks=Bankovni ček
diff --git a/htdocs/langs/bs_BA/boxes.lang b/htdocs/langs/bs_BA/boxes.lang
index a491680b1f7..f8f76e0afed 100644
--- a/htdocs/langs/bs_BA/boxes.lang
+++ b/htdocs/langs/bs_BA/boxes.lang
@@ -91,8 +91,8 @@ BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
 BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
 BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
 BoxTitleLastModifiedPropals=Posljednjih %s izmijenjenih ponuda
-BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
-BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
+BoxTitleLatestModifiedJobPositions=Latest %s modified job positions
+BoxTitleLatestModifiedCandidatures=Latest %s modified job applications
 ForCustomersInvoices=Fakture kupaca
 ForCustomersOrders=Narudžbe kupaca
 ForProposals=Prijedlozi
diff --git a/htdocs/langs/bs_BA/cashdesk.lang b/htdocs/langs/bs_BA/cashdesk.lang
index 42ed6775627..b06c19dd478 100644
--- a/htdocs/langs/bs_BA/cashdesk.lang
+++ b/htdocs/langs/bs_BA/cashdesk.lang
@@ -127,4 +127,4 @@ AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
 ShowPriceHT = Display the column with the price excluding tax (on screen)
-ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on the receipt)
diff --git a/htdocs/langs/bs_BA/errors.lang b/htdocs/langs/bs_BA/errors.lang
index 7c60c959313..608b3e3a4e6 100644
--- a/htdocs/langs/bs_BA/errors.lang
+++ b/htdocs/langs/bs_BA/errors.lang
@@ -301,3 +301,4 @@ ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
 ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
+ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
diff --git a/htdocs/langs/bs_BA/eventorganization.lang b/htdocs/langs/bs_BA/eventorganization.lang
index da6aff77b91..0c98795cac1 100644
--- a/htdocs/langs/bs_BA/eventorganization.lang
+++ b/htdocs/langs/bs_BA/eventorganization.lang
@@ -86,6 +86,7 @@ DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
 SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
 SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
+NbVotes=Number of votes
 #
 # Status
 #
@@ -115,6 +116,9 @@ EvntOrgDuration = This conference starts on %s and ends on %s.
 ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
 BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
 EventType = Vrsta događaja
+LabelOfBooth=Booth label
+LabelOfconference=Conference label
+ConferenceIsNotConfirmed=Subcription not available, conference is not confirmed yet
 
 #
 # Vote page
diff --git a/htdocs/langs/bs_BA/install.lang b/htdocs/langs/bs_BA/install.lang
index e8f358a7aab..8a5391734e0 100644
--- a/htdocs/langs/bs_BA/install.lang
+++ b/htdocs/langs/bs_BA/install.lang
@@ -206,6 +206,7 @@ MigrationUserPhotoPath=Migration of photo paths for users
 MigrationFieldsSocialNetworks=Migration of users fields social networks (%s)
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
+MigrationImportOrExportProfiles=Migration of import or export profiles (%s)
 ShowNotAvailableOptions=Show unavailable options
 HideNotAvailableOptions=Hide unavailable options
 ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
diff --git a/htdocs/langs/bs_BA/interventions.lang b/htdocs/langs/bs_BA/interventions.lang
index fef8e77ea6b..e5117f053f0 100644
--- a/htdocs/langs/bs_BA/interventions.lang
+++ b/htdocs/langs/bs_BA/interventions.lang
@@ -64,3 +64,5 @@ InterLineDuration=Line duration intervention
 InterLineDesc=Line description intervention
 RepeatableIntervention=Template of intervention
 ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
+Reopen=Reopen
+ConfirmReopenIntervention=Are you sure you want to open back the intervention <b>%s</b>?
diff --git a/htdocs/langs/bs_BA/productbatch.lang b/htdocs/langs/bs_BA/productbatch.lang
index ed69e7c1517..e283afa1e64 100644
--- a/htdocs/langs/bs_BA/productbatch.lang
+++ b/htdocs/langs/bs_BA/productbatch.lang
@@ -26,12 +26,10 @@ ShowLogOfMovementIfLot=Show log of movements for couple product/lot
 StockDetailPerBatch=Stock detail per lot
 SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
-BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
-BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
 ManageLotMask=Custom mask
-CustomMasks=Adds an option to define mask in the product card
-LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
-SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+CustomMasks=Option to define a different numbering mask for each product
+BatchLotNumberingModules=Numbering rule for automatic generation of lot number
+BatchSerialNumberingModules=Numbering rule for automatic generation of serial number (for products with property 1 unique lot/serial for each product)
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
diff --git a/htdocs/langs/bs_BA/products.lang b/htdocs/langs/bs_BA/products.lang
index 1da68418142..8c2e39f7547 100644
--- a/htdocs/langs/bs_BA/products.lang
+++ b/htdocs/langs/bs_BA/products.lang
@@ -277,7 +277,7 @@ PriceByCustomer=Different prices for each customer
 PriceCatalogue=A single sell price per product/service
 PricingRule=Rules for selling prices
 AddCustomerPrice=Add price by customer
-ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
+ForceUpdateChildPriceSoc=Set same price on customer's subsidiaries
 PriceByCustomerLog=Log of previous customer prices
 MinimumPriceLimit=Minimum price can't be lower then %s
 MinimumRecommendedPrice=Minimum recommended price is: %s
@@ -296,6 +296,7 @@ ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Child products
 MinSupplierPrice=Minimalna kupovna cijena
 MinCustomerPrice=Minimum selling price
+NoDynamicPrice=No dynamic price
 DynamicPriceConfiguration=Dynamic price configuration
 DynamicPriceDesc=You may define mathematical formulae to calculate Customer or Vendor prices. Such formulas can use all mathematical operators, some constants and variables. You can define here the variables you wish to use. If the variable needs an automatic update, you may define the external URL to allow Dolibarr to update the value automatically.
 AddVariable=Add Variable
diff --git a/htdocs/langs/bs_BA/salaries.lang b/htdocs/langs/bs_BA/salaries.lang
index 7c3c08a65bd..12905040b1a 100644
--- a/htdocs/langs/bs_BA/salaries.lang
+++ b/htdocs/langs/bs_BA/salaries.lang
@@ -2,20 +2,23 @@
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=By default, leave empty the option "Automatically create a total payment" when creating a Salary
 Salary=Salary
 Salaries=Salaries
-NewSalaryPayment=New salary payment
+NewSalary=New salary
+NewSalaryPayment=New salary card
 AddSalaryPayment=Add salary payment
 SalaryPayment=Salary payment
 SalariesPayments=Salaries payments
+SalariesPaymentsOf=Salaries payments of %s
 ShowSalaryPayment=Show salary payment
 THM=Average hourly rate
 TJM=Average daily rate
 CurrentSalary=Current salary
 THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
 TJMDescription=This value is currently for information only and is not used for any calculation
-LastSalaries=Latest %s salary payments
-AllSalaries=All salary payments
+LastSalaries=Latest %s salaries
+AllSalaries=All salaries
 SalariesStatistics=Salary statistics
-# Export
 SalariesAndPayments=Salaries and payments
+ConfirmDeleteSalaryPayment=Do you want to delete this salary payment ?
diff --git a/htdocs/langs/bs_BA/ticket.lang b/htdocs/langs/bs_BA/ticket.lang
index 156fe5a1c75..acc22788781 100644
--- a/htdocs/langs/bs_BA/ticket.lang
+++ b/htdocs/langs/bs_BA/ticket.lang
@@ -34,7 +34,8 @@ TicketDictResolution=Ticket - Resolution
 
 TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
-TicketTypeShortISSUE=Issue, bug or problem
+TicketTypeShortISSUE=Issue or bug
+TicketTypeShortPROBLEM=Problem
 TicketTypeShortREQUEST=Change or enhancement request
 TicketTypeShortPROJET=Projekt
 TicketTypeShortOTHER=Ostalo
@@ -54,14 +55,15 @@ TypeContact_ticket_internal_SUPPORTTEC=Assigned user
 TypeContact_ticket_external_SUPPORTCLI=Customer contact / incident tracking
 TypeContact_ticket_external_CONTRIBUTOR=External contributor
 
-OriginEmail=Email source
+OriginEmail=Reporter Email
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
 Read=Pročitaj
 Assigned=Assigned
 InProgress=U toku
-NeedMoreInformation=Waiting for information
+NeedMoreInformation=Waiting for reporter feedback
+NeedMoreInformationShort=Waiting for feedback
 Answered=Answered
 Waiting=Čekanje
 Closed=Zatvoren
@@ -160,7 +162,7 @@ CreatedBy=Created by
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Grupa
+TicketCategory=Ticket categorization
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
@@ -211,6 +213,7 @@ TicketMessageHelp=Only this text will be saved in the message list on ticket car
 TicketMessageSubstitutionReplacedByGenericValues=Substitutions variables are replaced by generic values.
 TimeElapsedSince=Time elapsed since
 TicketTimeToRead=Time elapsed before read
+TicketTimeElapsedBeforeSince=Time elapsed before / since
 TicketContacts=Contacts ticket
 TicketDocumentsLinked=Documents linked to ticket
 ConfirmReOpenTicket=Confirm reopen this ticket ?
diff --git a/htdocs/langs/bs_BA/users.lang b/htdocs/langs/bs_BA/users.lang
index 7b4cd013b64..f8e3310227f 100644
--- a/htdocs/langs/bs_BA/users.lang
+++ b/htdocs/langs/bs_BA/users.lang
@@ -97,8 +97,8 @@ LoginToCreate=Kreirati login
 NameToCreate=Naziv subjekta za kreiranje
 YourRole=Vaše uloge
 YourQuotaOfUsersIsReached=Vaša kvota aktivnih korisnika je postignuta!
-NbOfUsers=No. of users
-NbOfPermissions=No. of permissions
+NbOfUsers=Number of users
+NbOfPermissions=Number of permissions
 DontDowngradeSuperAdmin=Samo superadmin može unazaditi superadmina
 HierarchicalResponsible=Nadzornik
 HierarchicView=Hijerarhijski prikaz
diff --git a/htdocs/langs/bs_BA/website.lang b/htdocs/langs/bs_BA/website.lang
index 265e8e7584a..062783a4534 100644
--- a/htdocs/langs/bs_BA/website.lang
+++ b/htdocs/langs/bs_BA/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 PageContainer=Stranica
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
+PreviewOfSiteNotYetAvailable=The preview of your website <strong>%s</strong> is not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang
index d69f11ae766..527d2c0450e 100644
--- a/htdocs/langs/ca_ES/admin.lang
+++ b/htdocs/langs/ca_ES/admin.lang
@@ -53,6 +53,7 @@ InternalUser=Usuari intern
 ExternalUser=Usuari extern
 InternalUsers=Usuaris interns
 ExternalUsers=Usuaris externs
+UserInterface=User interface
 GUISetup=Entorn
 SetupArea=Configuració
 UploadNewTemplate=Carrega plantilles noves
@@ -1260,8 +1261,8 @@ YourPHPDoesNotHaveSSLSupport=Funcions SSL no disponibles al vostre PHP
 DownloadMoreSkins=Més temes per a descarregar
 SimpleNumRefModelDesc=Retorna el número de referència en el format %syymm-nnnn on yy és l'any, mm és el mes i nnnn és un número d'increment automàtic seqüencial sense restablir
 SimpleNumRefNoDateModelDesc=Retorna el número de referència en el format %s-nnnn on nnnn és un número d’increment automàtic seqüencial sense restablir
-ShowProfIdInAddress=Mostra l'identificador professional amb adreces
-ShowVATIntaInAddress=Amaga el número d'IVA intracomunitari amb adreces
+ShowProfIdInAddress=Show professional ID with addresses
+ShowVATIntaInAddress=Hide intra-Community VAT number
 TranslationUncomplete=Traducció parcial
 MAIN_DISABLE_METEO=Desactiva la visualització meteorològica
 MeteoStdMod=Mode estàndard
@@ -1778,7 +1779,7 @@ ClickToDialSetup=Configuració del mòdul Click To Dial
 ClickToDialUrlDesc=Es crida l'URL quan es fa un clic a la imatge miniatura de telèfon. A l'URL, pots utilitzar les etiquetes <br><b>__PHONETO__</b> que serà reemplaçada pel número de telèfon de la persona a trucar <br><b>__PHONEFROM__</b> que serà reemplaçada pel número de telèfon de la persona que truca (el vostre)  <br><b>__LOGIN__</b> que serà reemplaçada pel teu usuari d'inici de clicktodial (definit a la fitxa d'usuari)  <br><b>__PASS__</b> que serà reemplaçada per la contrasenya de clicktodial (definida a la fitxa d'usuari).
 ClickToDialDesc=Aquest mòdul canvia els números de telèfon, en utilitzar un ordinador de sobretaula, a enllaços on es pot fer clic. Un clic trucarà al número. Es pot utilitzar per a iniciar la trucada quan s'utilitza un telèfon suau a l'escriptori o, per exemple, quan s'utilitza un sistema CTI basat en el protocol SIP. Nota: Quan feu servir un telèfon intel·ligent, sempre es pot fer clic als números de telèfon.
 ClickToDialUseTelLink=Utilitzar sols l'enllaç "tel:" als números de telèfon
-ClickToDialUseTelLinkDesc=Utilitzeu aquest mètode si els vostres usuaris tenen un softphone o una interfície de programari instal·lada a la mateixa computadora que el navegador, i us demani quan feu clic a un enllaç al vostre navegador que comença per "tel:". Si necessiteu una solució completa de servidor (no cal instal·lar programari local), heu d'establir això a "No" i omplir el camp següent.
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface, installed on the same computer as the browser, and called when you click on a link starting with "tel:" in your browser. If you need link that start with "sip:" or a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Punt de venda
 CashDeskSetup=Configuració del mòdul de Punt de venda
@@ -2133,7 +2134,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Excepte si heu d'executar ordres de
 PHPFunctionsRequiredForCLI=Per al propòsit de l'intèrpret d'ordres (com fer còpies de seguretat programades o executar un programa anitivurs), heu de mantenir les funcions PHP
 NoWritableFilesFoundIntoRootDir=No s'ha trobat cap fitxer ni directori d'escriptura dels programes comuns al directori arrel (Bo)
 RecommendedValueIs=Recomanat: %s
-NotRecommended=No recomanat
+Recommended=Recomanada
+NotRecommended=Not recommended
 ARestrictedPath=Un camí restringit
 CheckForModuleUpdate=Comproveu si hi ha actualitzacions de mòduls externs
 CheckForModuleUpdateHelp=Aquesta acció es connectarà als editors de mòduls externs per comprovar si hi ha disponible una nova versió.
@@ -2144,3 +2146,5 @@ YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=Heu activat l'API WS obsoleta. Haure
 RandomlySelectedIfSeveral=Randomly selected if several pictures are available
 DatabasePasswordObfuscated=Database password is obfuscated in conf file
 DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
+APIsAreNotEnabled=APIs modules are not enabled
+YouShouldSetThisToOff=You should set this to 0 or off
diff --git a/htdocs/langs/ca_ES/banks.lang b/htdocs/langs/ca_ES/banks.lang
index 4f92c6bf2b7..fb4fd80a002 100644
--- a/htdocs/langs/ca_ES/banks.lang
+++ b/htdocs/langs/ca_ES/banks.lang
@@ -115,7 +115,7 @@ TransferTo=Cap a
 TransferFromToDone=La transferència de <b>%s</b> cap a <b>%s</b> de <b>%s</b> %s s'ha creat.
 CheckTransmitter=Remitent
 ValidateCheckReceipt=Vols validar aquesta remesa de xec?
-ConfirmValidateCheckReceipt=Esteu segur que voleu enviar aquest rebut de xec per validar-lo? No es poden fer canvis.
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes will be possible once validated.
 DeleteCheckReceipt=Vols suprimir aquesta remesa de xec?
 ConfirmDeleteCheckReceipt=Vols eliminar aquesta remesa de xec?
 BankChecks=Xec bancari
diff --git a/htdocs/langs/ca_ES/boxes.lang b/htdocs/langs/ca_ES/boxes.lang
index bda2c645372..2c696e3353a 100644
--- a/htdocs/langs/ca_ES/boxes.lang
+++ b/htdocs/langs/ca_ES/boxes.lang
@@ -91,8 +91,8 @@ BoxTitleLatestModifiedSupplierOrders=Comandes a Proveïdor: últimes %s modifica
 BoxTitleLastModifiedCustomerBills=Factures del client: últimes %s modificades
 BoxTitleLastModifiedCustomerOrders=Comandes de venda: últimes %s modificades
 BoxTitleLastModifiedPropals=Últims %s pressupostos modificats
-BoxTitleLatestModifiedJobPositions=Els darrers %s treballs modificats
-BoxTitleLatestModifiedCandidatures=Darreres candidatures modificades %s
+BoxTitleLatestModifiedJobPositions=Latest %s modified job positions
+BoxTitleLatestModifiedCandidatures=Latest %s modified job applications
 ForCustomersInvoices=Factures a clients
 ForCustomersOrders=Comandes de clients
 ForProposals=Pressupostos
diff --git a/htdocs/langs/ca_ES/cashdesk.lang b/htdocs/langs/ca_ES/cashdesk.lang
index f00c5018ac0..b3e90a478d1 100644
--- a/htdocs/langs/ca_ES/cashdesk.lang
+++ b/htdocs/langs/ca_ES/cashdesk.lang
@@ -127,4 +127,4 @@ AllowDelayedPayment=Permet un pagament retardat
 PrintPaymentMethodOnReceipts=Imprimeix el mètode de pagament en els tiquets/rebuts
 WeighingScale=Balança de pesatge
 ShowPriceHT = Mostra la columna amb el preu sense impostos (a la pantalla)
-ShowPriceHTOnReceipt = Mostra la columna amb el preu sense impostos (al rebut)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on the receipt)
diff --git a/htdocs/langs/ca_ES/errors.lang b/htdocs/langs/ca_ES/errors.lang
index c93e096dd96..55600b5fe64 100644
--- a/htdocs/langs/ca_ES/errors.lang
+++ b/htdocs/langs/ca_ES/errors.lang
@@ -301,3 +301,4 @@ ErrorActionCommPropertyUserowneridNotDefined=El propietari de l'usuari és oblig
 ErrorActionCommBadType=El tipus d'esdeveniment seleccionat (identificador: %n, codi: %s) no existeix al diccionari del tipus d'esdeveniment
 CheckVersionFail=Error de comprovació de versió
 ErrorWrongFileName=El nom del fitxer no pot contenir __COSA__
+ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
diff --git a/htdocs/langs/ca_ES/eventorganization.lang b/htdocs/langs/ca_ES/eventorganization.lang
index 2a2511c5b65..a2e1c0b648f 100644
--- a/htdocs/langs/ca_ES/eventorganization.lang
+++ b/htdocs/langs/ca_ES/eventorganization.lang
@@ -86,6 +86,7 @@ DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Clau segura de l'enllaç de registre públic a una conferència
 SERVICE_BOOTH_LOCATION = Servei que s'utilitza per a la fila de factures sobre una ubicació de l'estand
 SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Servei que s'utilitza per a la fila de factures sobre una subscripció d'assistent a una conferència
+NbVotes=Number of votes
 #
 # Status
 #
@@ -115,6 +116,9 @@ EvntOrgDuration = Aquesta conferència comença el dia %s i finalitza el dia %s.
 ConferenceAttendeeFee = Tarifa de l'assistent a la conferència per a l'esdeveniment: "%s" que passa de %s a %s.
 BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
 EventType = Tipus d'esdeveniment
+LabelOfBooth=Booth label
+LabelOfconference=Conference label
+ConferenceIsNotConfirmed=Subcription not available, conference is not confirmed yet
 
 #
 # Vote page
diff --git a/htdocs/langs/ca_ES/install.lang b/htdocs/langs/ca_ES/install.lang
index 485ed64c1c8..d640061d928 100644
--- a/htdocs/langs/ca_ES/install.lang
+++ b/htdocs/langs/ca_ES/install.lang
@@ -15,7 +15,7 @@ PHPSupport=Aquest PHP admet les funcions %s.
 PHPMemoryOK=La seva memòria màxima de sessió PHP està definida a <b>%s</b>. Això hauria de ser suficient.
 PHPMemoryTooLow=La seva memòria màxima de sessió PHP està definida a <b>%s</b> bytes. Això és molt poc. Es recomana modificar el paràmetre <b>memory_limit</b> del seu arxiu <b> php.ini</b> a almenys <b>%s</b> octets.
 Recheck=Faci clic aquí per realitzar un test més exhaustiu
-ErrorPHPDoesNotSupportSessions=La vostra instal·lació de PHP no suporta sessions. Aquesta característica és necessària per permetre que Dolibarr funcioni. Comproveu la configuració de PHP i els permisos del directori de sessions.
+ErrorPHPDoesNotSupportSessions=La vostra instal·lació de PHP no admet sessions. Aquesta funció és necessària per a permetre que Dolibarr funcioni. Comproveu la configuració de PHP i els permisos del directori de sessions.
 ErrorPHPDoesNotSupportGD=La vostra instal·lació de PHP no és compatible amb les funcions gràfiques de GD. No hi haurà gràfics disponibles.
 ErrorPHPDoesNotSupportCurl=La vostra instal·lació de PHP no admet Curl.
 ErrorPHPDoesNotSupportCalendar=La vostra instal·lació de PHP no admet extensions de calendari php.
@@ -61,7 +61,7 @@ CreateUser=Crea un compte d'usuari o concedeix el permís del compte d'usuari a
 DatabaseSuperUserAccess=Base de dades - Accés super usuari
 CheckToCreateDatabase=Marqueu la casella si la base de dades encara no existeix i cal crear-la. <br> En aquest cas, també heu d'omplir el nom d'usuari i la contrasenya del compte de superusuari al final d'aquesta pàgina.
 CheckToCreateUser=Marqueu la casella si: el compte d'usuari de la base de dades <br> encara no existeix, per la qual cosa s'ha de crear o <br> si el compte d'usuari existeix, però la base de dades no existeix i els permisos s'han de concedir. <br>En aquest cas, heu d'introduir el compte d'usuari i la contrasenya i <b> també </b> el nom del compte superusuari i la contrasenya al final d'aquesta pàgina. Si aquesta casella no està activada, el propietari i la contrasenya de la base de dades ja han d'existir.
-DatabaseRootLoginDescription=Nom del compte de superusuari (per crear noves bases de dades o usuaris nous), obligatori si la base de dades o el seu propietari ja no existeixen.
+DatabaseRootLoginDescription=Nom del compte del superusuari (per a crear bases de dades noves o usuaris nous), obligatori si la base de dades o el seu propietari encara no existeixen.
 KeepEmptyIfNoPassword=Deixeu-lo buit si el superusuari no té contrasenya (NO es recomana)
 SaveConfigurationFile=S'estan desant els paràmetres a
 ServerConnection=Connexió al servidor
@@ -82,10 +82,10 @@ SystemIsInstalled=La instal·lació s'ha finalitzat.
 SystemIsUpgraded=S'ha actualitzat Dolibarr correctament.
 YouNeedToPersonalizeSetup=Ara ha de configurar Dolibarr segons les seves necessitats (Elecció de l'aparença, de les funcionalitats, etc). Per això, feu clic en el següent link:
 AdminLoginCreatedSuccessfuly=El codi d'usuari administrador de Dolibar '<b>%s</b>' s'ha creat correctament.
-GoToDolibarr=Ves a Dolibarr
-GoToSetupArea=Ves a Dolibarr (àrea de configuració)
+GoToDolibarr=Aneu a Dolibarr
+GoToSetupArea=Aneu a Dolibarr (àrea de configuració)
 MigrationNotFinished=La versió de la base de dades no està completament actualitzada: torneu a executar el procés d'actualització.
-GoToUpgradePage=Ves de nou a la pàgina d'actualització
+GoToUpgradePage=Aneu de nou a la pàgina d'actualització
 WithNoSlashAtTheEnd=Sense el signe "/" al final
 DirectoryRecommendation= <span class="warning"> IMPORTANT </span>: Heu d'utilitzar un directori que es troba fora de les pàgines web (no utilitzeu un subdirector del paràmetre anterior).
 LoginAlreadyExists=Ja existeix
@@ -136,10 +136,10 @@ MigrationFinished=S'ha acabat la migració
 LastStepDesc=<strong> Darrer pas </strong>: definiu aquí l'inici de sessió i la contrasenya que voleu utilitzar per connectar-se a Dolibarr. <b> No perdis això, ja que és el compte mestre per administrar tots els altres / comptes d'usuari addicionals.</b>
 ActivateModule=Activació del mòdul %s
 ShowEditTechnicalParameters=Premi aquí per veure/editar els paràmetres tècnics (mode expert)
-WarningUpgrade=Advertència:\nHas realitzat una còpia de seguretat de la base de dades primer?\nAixò és molt recomanable. La pèrdua de dades (per exemple, errors en mysql versió 5.5.40 / 41/42/43) pot ser possible durant aquest procés, per la qual cosa és essencial fer un abocament complet de la vostra base de dades abans de començar qualsevol migració.\n\nFeu clic a Accepta per iniciar el procés de migració ...
+WarningUpgrade=Advertència:\nPrimer heu executat una còpia de seguretat de la base de dades?\nAixò és molt recomanable. La pèrdua de dades (a causa, per exemple, d'errors a la versió 5.5.40/41/42/43 de mysql) pot ser possible durant aquest procés, de manera que és essencial fer un buidatge complet de la vostra base de dades abans d'iniciar qualsevol migració.\n\nFeu clic a D'acord per a iniciar el procés de migració...
 ErrorDatabaseVersionForbiddenForMigration=La versió de la vostra base de dades és %s. Té un error crític, que fa possible la pèrdua de dades si feu canvis estructurals a la base de dades, tals com requereix el procés de migració. Per la seva raó, la migració no es permetrà fins que no actualitzeu la base de dades a una versió actualitzada (llista de versions conegudes amb errors: %s)
 KeepDefaultValuesWamp=Heu utilitzat l'assistent de configuració Dolibarr de DoliWamp, de manera que els valors proposats aquí ja estan optimitzats. Canvieu-los només si saps el que estàs fent.
-KeepDefaultValuesDeb=Heu utilitzat l'assistent de configuració Dolibarr des d'un paquet Linux (Ubuntu, Debian, Fedora ...), de manera que els valors proposats aquí ja estan optimitzats. Només s'ha d'introduir la contrasenya del propietari de la base de dades per crear. Canvieu altres paràmetres només si saps el que estàs fent.
+KeepDefaultValuesDeb=Heu utilitzat l'assistent de configuració Dolibarr des d'un paquet Linux (Ubuntu, Debian, Fedora ...), de manera que els valors proposats aquí ja estan optimitzats. Només cal introduir la contrasenya del propietari de la base de dades a crear. Canvieu altres paràmetres només si sabeu què feu.
 KeepDefaultValuesMamp=Heu utilitzat l'assistent de configuració Dolibarr de DoliMamp, de manera que els valors proposats aquí ja estan optimitzats. Canvieu-los només si saps el que estàs fent.
 KeepDefaultValuesProxmox=Heu utilitzat l'assistent de configuració de Dolibarr des d'un dispositiu virtual Proxmox, de manera que els valors proposats aquí ja estan optimitzats. Canvieu-los només si saps el que estàs fent.
 UpgradeExternalModule=Execució del procés d'actualització dedicat de mòdul extern
@@ -206,6 +206,7 @@ MigrationUserPhotoPath=Migració de rutes per les fotos dels usuaris
 MigrationFieldsSocialNetworks=Migració de camps de xarxes socials d'usuaris (%s)
 MigrationReloadModule=Recarrega el mòdul %s
 MigrationResetBlockedLog=Restablir el mòdul BlockedLog per l'algoritme v7
+MigrationImportOrExportProfiles=Migration of import or export profiles (%s)
 ShowNotAvailableOptions=Mostra les opcions no disponibles
 HideNotAvailableOptions=Amaga les opcions no disponibles
 ErrorFoundDuringMigration=S'han reportat error(s) durant el procés de migració, de manera que el següent pas no està disponible. Per ignorar els errors, podeu <a href="%s"> fer clic aquí </a>, però l'aplicació o algunes funcions no funcionen correctament fins que es resolen els errors.
diff --git a/htdocs/langs/ca_ES/interventions.lang b/htdocs/langs/ca_ES/interventions.lang
index 242a537dcc8..53f60c17df9 100644
--- a/htdocs/langs/ca_ES/interventions.lang
+++ b/htdocs/langs/ca_ES/interventions.lang
@@ -50,7 +50,7 @@ UseDateWithoutHourOnFichinter=Oculta hores i minuts del camp de dates dels regis
 InterventionStatistics=Estadístiques de intervencions
 NbOfinterventions=Nombre de fitxers d’intervenció
 NumberOfInterventionsByMonth=Nombre de fitxes d'intervenció per mes (data de validació)
-AmountOfInteventionNotIncludedByDefault=La quantitat d'intervenció no s'inclou de manera predeterminada en els beneficis (en la majoria dels casos, els fulls de temps s'utilitzen per comptar el temps dedicat). Per incloure'ls, afegiu la opció  PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT amb el valor 1 a Configuració &rarr; Varis.
+AmountOfInteventionNotIncludedByDefault=La quantitat d'intervenció no s'inclou de manera predeterminada en els beneficis (en la majoria dels casos, els fulls de temps s'utilitzen per a comptar el temps dedicat). Per incloure'ls, afegiu l'opció  PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT amb el valor 1 a Inici-Configuració-Altres.
 InterId=Id. d'intervenció
 InterRef=Ref. d'intervenció
 InterDateCreation=Data de creació de la intervenció
@@ -63,6 +63,6 @@ InterLineDate=Data de la línia de intervenció
 InterLineDuration=Durada de la línia de la intervenció
 InterLineDesc=Descripció de la línia de la intervenció
 RepeatableIntervention=Plantilla d’intervenció
-ToCreateAPredefinedIntervention=Per crear una intervenció predefinida o recurrent, creeu una intervenció comuna i convertiu-la en plantilla d'intervenció
+ToCreateAPredefinedIntervention=Per a crear una intervenció predefinida o recurrent, creeu una intervenció comuna i convertiu-la en plantilla d'intervenció
 Reopen=Reobrir
 ConfirmReopenIntervention=Esteu segur que voleu tornar a obrir la intervenció <b> %s </b>?
diff --git a/htdocs/langs/ca_ES/knowledgemanagement.lang b/htdocs/langs/ca_ES/knowledgemanagement.lang
index 2cc3f34e892..12bd3627d66 100644
--- a/htdocs/langs/ca_ES/knowledgemanagement.lang
+++ b/htdocs/langs/ca_ES/knowledgemanagement.lang
@@ -37,19 +37,13 @@ About = Quant a
 KnowledgeManagementAbout = Sobre la gestió del coneixement
 KnowledgeManagementAboutPage = Gestió del coneixement sobre la pàgina
 
-#
-# Sample page
-#
 KnowledgeManagementArea = Gestió del coneixement
-
-
-#
-# Menu
-#
 MenuKnowledgeRecord = Base de coneixements
-ListKnowledgeRecord = List of articles
+ListKnowledgeRecord = Llista d'articles
 NewKnowledgeRecord = Nou article
 ValidateReply = Validar la solució
 KnowledgeRecords = Articles
 KnowledgeRecord = Article
 KnowledgeRecordExtraFields = Camps extra per a l'article
+GroupOfTicket=Grup de tiquets
+YouCanLinkArticleToATicketCategory=Podeu adjuntar un article a un grup de tiquets (per tant, l'article es suggerirà durant la qualificació dels nous tiquets)
diff --git a/htdocs/langs/ca_ES/productbatch.lang b/htdocs/langs/ca_ES/productbatch.lang
index 4ae913e4918..7677d827ca7 100644
--- a/htdocs/langs/ca_ES/productbatch.lang
+++ b/htdocs/langs/ca_ES/productbatch.lang
@@ -26,12 +26,10 @@ ShowLogOfMovementIfLot=Mostra el registre de moviments de la parella producte/lo
 StockDetailPerBatch=Detall d’estoc per lot
 SerialNumberAlreadyInUse=El número de sèrie %s ja s’utilitza per al producte %s
 TooManyQtyForSerialNumber=Només podeu tenir un producte %s per al número de sèrie %s
-BatchLotNumberingModules=Opcions per a la generació automàtica de productes per lots gestionats per lots
-BatchSerialNumberingModules=Opcions per a la generació automàtica de productes per lots gestionats per números de sèrie
 ManageLotMask=Màscara personalitzada
-CustomMasks=Afegeix una opció per definir la màscara a la targeta del producte
-LotProductTooltip=Afegeix una opció a la targeta de producte per definir una màscara de número de lot dedicada
-SNProductTooltip=Afegeix una opció a la targeta del producte per definir una màscara de número de sèrie dedicada
+CustomMasks=Option to define a different numbering mask for each product
+BatchLotNumberingModules=Numbering rule for automatic generation of lot number
+BatchSerialNumberingModules=Numbering rule for automatic generation of serial number (for products with property 1 unique lot/serial for each product)
 QtyToAddAfterBarcodeScan=Quantitat per afegir per a cada codi de barres / lot / sèrie escanejat
 LifeTime=Vida útil (en dies)
 EndOfLife=Final de la vida
diff --git a/htdocs/langs/ca_ES/products.lang b/htdocs/langs/ca_ES/products.lang
index f979f5c076a..8c795d2e6eb 100644
--- a/htdocs/langs/ca_ES/products.lang
+++ b/htdocs/langs/ca_ES/products.lang
@@ -277,7 +277,7 @@ PriceByCustomer=Preus diferents per cada client
 PriceCatalogue=Un preu de venda simple per producte/servei
 PricingRule=Regles per preus de venda
 AddCustomerPrice=Afegir preus per client
-ForceUpdateChildPriceSoc=Indica el mateix preu a les filials dels clients
+ForceUpdateChildPriceSoc=Set same price on customer's subsidiaries
 PriceByCustomerLog=Registre de preus de clients anteriors
 MinimumPriceLimit=El preu mínim no pot ser inferior a %s
 MinimumRecommendedPrice=El preu mínim recomanat és: %s
@@ -296,6 +296,7 @@ ComposedProductIncDecStock=Incrementar/Disminueix estoc en canviar el seu pare
 ComposedProduct=Productes Fills
 MinSupplierPrice=Preu mínim de compra
 MinCustomerPrice=Preu mínim de venda
+NoDynamicPrice=No dynamic price
 DynamicPriceConfiguration=Configuració de preu dinàmic
 DynamicPriceDesc=Podeu definir fórmules matemàtiques per a calcular els preus del client o del proveïdor. Aquestes fórmules poden utilitzar tots els operadors matemàtics, algunes constants i variables. Aquí podeu definir les variables que voleu utilitzar. Si la variable necessita una actualització automàtica, podeu definir l'URL extern per a permetre que Dolibarr actualitzi el valor automàticament.
 AddVariable=Afegeix variable
diff --git a/htdocs/langs/ca_ES/salaries.lang b/htdocs/langs/ca_ES/salaries.lang
index 9a3529562d5..3934d30651c 100644
--- a/htdocs/langs/ca_ES/salaries.lang
+++ b/htdocs/langs/ca_ES/salaries.lang
@@ -17,8 +17,8 @@ TJM=Tarifa mitjana diària
 CurrentSalary=Salari actual
 THMDescription=Aquest valor es pot utilitzar per a calcular el cost del temps consumit en un projecte introduït pels usuaris si s'utilitza el mòdul de projecte
 TJMDescription=Aquest valor només és informatiu i no s'utilitza en cap càlcul
-LastSalaries=Últims %s pagaments de salari
-AllSalaries=Tots els pagaments de salari
+LastSalaries=Latest %s salaries
+AllSalaries=All salaries
 SalariesStatistics=Estadístiques de salaris
-# Export
 SalariesAndPayments=Salaris i pagaments
+ConfirmDeleteSalaryPayment=Do you want to delete this salary payment ?
diff --git a/htdocs/langs/ca_ES/ticket.lang b/htdocs/langs/ca_ES/ticket.lang
index 5628db3f806..89936f1b6eb 100644
--- a/htdocs/langs/ca_ES/ticket.lang
+++ b/htdocs/langs/ca_ES/ticket.lang
@@ -34,7 +34,8 @@ TicketDictResolution=Tiquet - Resolució
 
 TicketTypeShortCOM=Qüestió comercial
 TicketTypeShortHELP=Sol·licitud d'ajuda funcional
-TicketTypeShortISSUE=Incidència, error o problema
+TicketTypeShortISSUE=Incidència o error
+TicketTypeShortPROBLEM=Problema
 TicketTypeShortREQUEST=Sol·licitud de canvi o millora
 TicketTypeShortPROJET=Projecte
 TicketTypeShortOTHER=Altres
@@ -54,14 +55,15 @@ TypeContact_ticket_internal_SUPPORTTEC=Usuari assignat
 TypeContact_ticket_external_SUPPORTCLI=Contacte de clients / seguiment d'incidents
 TypeContact_ticket_external_CONTRIBUTOR=Col·laborador extern
 
-OriginEmail=Origen de correu electrònic
+OriginEmail=Reporter Email
 Notify_TICKET_SENTBYMAIL=Envia el missatge del tiquet per correu electrònic
 
 # Status
 Read=Llegit
 Assigned=Assignat
 InProgress=En progrés
-NeedMoreInformation=Esperant informació
+NeedMoreInformation=Esperant els comentaris del informador
+NeedMoreInformationShort=Esperant comentaris
 Answered=Respost
 Waiting=En espera
 Closed=Tancat
@@ -160,7 +162,7 @@ CreatedBy=Creat per
 NewTicket=Tiquet nou
 SubjectAnswerToTicket=Resposta de tiquet
 TicketTypeRequest=Tipus de sol·licitud
-TicketCategory=Grup
+TicketCategory=Categorització del tiquet
 SeeTicket=Consultar tiquet
 TicketMarkedAsRead=Tiquet ha estat marcat com llegit
 TicketReadOn=Segueix llegint
@@ -211,6 +213,7 @@ TicketMessageHelp=Només aquest text es guardarà a la llista de missatges de la
 TicketMessageSubstitutionReplacedByGenericValues=Les variables de substitució es reemplacen per valors genèrics.
 TimeElapsedSince=Temps transcorregut des de 
 TicketTimeToRead=Temps transcorregut abans de llegir
+TicketTimeElapsedBeforeSince=Temps transcorregut abans / després 
 TicketContacts=Tiquet de contactes
 TicketDocumentsLinked=Documents vinculats al tiquet
 ConfirmReOpenTicket=Confirmeu la reobertura d'aquest tiquet?
@@ -304,7 +307,7 @@ BoxLastModifiedTicket=Últims tiquets modificats
 BoxLastModifiedTicketDescription=Últimes entrades modificades %s
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No hi ha tiquets modificats recentment
-BoxTicketType=Distribution of open tickets by type
+BoxTicketType=Distribució dels tiquets oberts per tipus
 BoxTicketSeverity=Nombre de bitllets oberts per gravetat
 BoxNoTicketSeverity=No s’ha obert cap entrada
 BoxTicketLastXDays=Nombre de bitllets nous per dies els darrers %s dies
diff --git a/htdocs/langs/ca_ES/users.lang b/htdocs/langs/ca_ES/users.lang
index a1cd4e26424..f1317373260 100644
--- a/htdocs/langs/ca_ES/users.lang
+++ b/htdocs/langs/ca_ES/users.lang
@@ -97,8 +97,8 @@ LoginToCreate=Nom d'usuari a crear
 NameToCreate=Nom del tercer a crear
 YourRole=Els seus rols
 YourQuotaOfUsersIsReached=Ha arribat a la seva quota d'usuaris actius!
-NbOfUsers=Nombre d'usuaris
-NbOfPermissions=Nombre de permisos
+NbOfUsers=Number of users
+NbOfPermissions=Number of permissions
 DontDowngradeSuperAdmin=Només un superadmin pot degradar un superadmin
 HierarchicalResponsible=Supervisor
 HierarchicView=Vista jeràrquica
diff --git a/htdocs/langs/ca_ES/website.lang b/htdocs/langs/ca_ES/website.lang
index 3a67863d70f..77423217fc5 100644
--- a/htdocs/langs/ca_ES/website.lang
+++ b/htdocs/langs/ca_ES/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Afegir lloc web
 Webpage=Pàgina/contenidor web
 AddPage=Afegeix pàgina/contenidor
 PageContainer=Pàgina
-PreviewOfSiteNotYetAvailable=Vista prèvia del seu lloc web <strong>%s</strong> encara no està disponible. Primer ha de '<strong>Importar plantilla web</strong>' o sols '<strong>Afegir pàgina/contenidor</strong>'.
+PreviewOfSiteNotYetAvailable=The preview of your website <strong>%s</strong> is not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=La pàgina sol·licitada amb l'identificador %s encara no té contingut, o el fitxer de memòria cau .tpl.php s'ha eliminat. Edita el contingut de la pàgina per solucionar-ho.
 SiteDeleted=Lloc web '%s' eliminat
 PageContent=Pàgina/Contenidor
diff --git a/htdocs/langs/cs_CZ/admin.lang b/htdocs/langs/cs_CZ/admin.lang
index 600c2134442..705459f3449 100644
--- a/htdocs/langs/cs_CZ/admin.lang
+++ b/htdocs/langs/cs_CZ/admin.lang
@@ -53,6 +53,7 @@ InternalUser=Interní uživatel
 ExternalUser=Externí uživatel
 InternalUsers=Interní uživatelé
 ExternalUsers=Externí uživatelé
+UserInterface=User interface
 GUISetup=Zobrazení
 SetupArea=Nastavení
 UploadNewTemplate=Nahrát novou šablonu(y)
@@ -1260,8 +1261,8 @@ YourPHPDoesNotHaveSSLSupport=SSL funkce není k dispozici ve vašem PHP
 DownloadMoreSkins=Další skiny ke stažení
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
-ShowProfIdInAddress=Zobrazit profesionální id s adresami
-ShowVATIntaInAddress=Skrýt číslo DPH uvnitř Společenství s adresami
+ShowProfIdInAddress=Show professional ID with addresses
+ShowVATIntaInAddress=Hide intra-Community VAT number
 TranslationUncomplete=Částečný překlad
 MAIN_DISABLE_METEO=Zakázat meteorologický pohled
 MeteoStdMod=Standardní režim
@@ -1778,7 +1779,7 @@ ClickToDialSetup=Klepněte na tlačítko Nastavení vytáčení modulu
 ClickToDialUrlDesc=Url volal po kliknutí na telefonní pikto. V URL, můžete použít tagy <br> <b> __PHONETO__ </b> který bude nahrazen s telefonním číslem osoby volat <br> <b> __PHONEFROM__ </b>, které budou nahrazeny telefonní číslo volajícího (vy) <br> <b> __LOGIN__ </b>, které budou nahrazeny clicktodial přihlášení (definováno na uživatelské kartě) <br> <b> __PASS__ </b>, který bude nahrazen heslem pro heslo (definováno na kartě uživatele).
 ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Na telefonních číslech použijte pouze odkaz "tel:"
-ClickToDialUseTelLinkDesc=Tuto metodu použijte, pokud mají uživatelé softwarové rozhraní nebo softwarové rozhraní nainstalované ve stejném počítači jako prohlížeč a volaly po kliknutí na odkaz v prohlížeči, který začíná na "tel:". Pokud potřebujete úplné řešení serveru (není potřeba lokální instalace softwaru), musíte jej nastavit na "Ne" a vyplnit další pole.
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface, installed on the same computer as the browser, and called when you click on a link starting with "tel:" in your browser. If you need link that start with "sip:" or a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Prodejní místa
 CashDeskSetup=Nastavení modulu Prodejní místo
@@ -2133,7 +2134,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
-NotRecommended=Not recommanded
+Recommended=Doporučené
+NotRecommended=Not recommended
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
@@ -2144,3 +2146,5 @@ YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You s
 RandomlySelectedIfSeveral=Randomly selected if several pictures are available
 DatabasePasswordObfuscated=Database password is obfuscated in conf file
 DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
+APIsAreNotEnabled=APIs modules are not enabled
+YouShouldSetThisToOff=You should set this to 0 or off
diff --git a/htdocs/langs/cs_CZ/banks.lang b/htdocs/langs/cs_CZ/banks.lang
index c252b7c5891..e4f8f823384 100644
--- a/htdocs/langs/cs_CZ/banks.lang
+++ b/htdocs/langs/cs_CZ/banks.lang
@@ -115,7 +115,7 @@ TransferTo=Na
 TransferFromToDone=Převod z <b>%s</b> na <b>%s</b> %s <b>%s</b> byl zaznamenán.
 CheckTransmitter=Odesílatel
 ValidateCheckReceipt=Ověřit potvrzení o kontrole?
-ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes will be possible once validated.
 DeleteCheckReceipt=Chcete smazat potvrzení o kontrole?
 ConfirmDeleteCheckReceipt=Opravdu chcete tuto potvrzení o potvrzení vymazat?
 BankChecks=Bankovní šeky
diff --git a/htdocs/langs/cs_CZ/boxes.lang b/htdocs/langs/cs_CZ/boxes.lang
index dda43454d4b..c5606e7012a 100644
--- a/htdocs/langs/cs_CZ/boxes.lang
+++ b/htdocs/langs/cs_CZ/boxes.lang
@@ -91,8 +91,8 @@ BoxTitleLatestModifiedSupplierOrders=Objednávky dodavatele: poslední %s změn
 BoxTitleLastModifiedCustomerBills=Zákaznické faktury: poslední změna %s
 BoxTitleLastModifiedCustomerOrders=Prodejní objednávky: poslední %s změny
 BoxTitleLastModifiedPropals=Poslední modifikované návrhy %s
-BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
-BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
+BoxTitleLatestModifiedJobPositions=Latest %s modified job positions
+BoxTitleLatestModifiedCandidatures=Latest %s modified job applications
 ForCustomersInvoices=Zákaznické faktury
 ForCustomersOrders=Zákaznické objednávky
 ForProposals=Nabídky
diff --git a/htdocs/langs/cs_CZ/cashdesk.lang b/htdocs/langs/cs_CZ/cashdesk.lang
index 75c5d6e7806..9b1678106d2 100644
--- a/htdocs/langs/cs_CZ/cashdesk.lang
+++ b/htdocs/langs/cs_CZ/cashdesk.lang
@@ -127,4 +127,4 @@ AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
 ShowPriceHT = Display the column with the price excluding tax (on screen)
-ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on the receipt)
diff --git a/htdocs/langs/cs_CZ/errors.lang b/htdocs/langs/cs_CZ/errors.lang
index ea6b6c3ebb9..315df28cd99 100644
--- a/htdocs/langs/cs_CZ/errors.lang
+++ b/htdocs/langs/cs_CZ/errors.lang
@@ -301,3 +301,4 @@ ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
 ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
+ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
diff --git a/htdocs/langs/cs_CZ/eventorganization.lang b/htdocs/langs/cs_CZ/eventorganization.lang
index e1e7aade295..6b4eacb533e 100644
--- a/htdocs/langs/cs_CZ/eventorganization.lang
+++ b/htdocs/langs/cs_CZ/eventorganization.lang
@@ -86,6 +86,7 @@ DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
 SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
 SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
+NbVotes=Number of votes
 #
 # Status
 #
@@ -115,6 +116,9 @@ EvntOrgDuration = This conference starts on %s and ends on %s.
 ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
 BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
 EventType = Typ události
+LabelOfBooth=Booth label
+LabelOfconference=Conference label
+ConferenceIsNotConfirmed=Subcription not available, conference is not confirmed yet
 
 #
 # Vote page
diff --git a/htdocs/langs/cs_CZ/install.lang b/htdocs/langs/cs_CZ/install.lang
index 0c9f0d9bff9..598d086878f 100644
--- a/htdocs/langs/cs_CZ/install.lang
+++ b/htdocs/langs/cs_CZ/install.lang
@@ -206,6 +206,7 @@ MigrationUserPhotoPath=Migrace fotografických cest pro uživatele
 MigrationFieldsSocialNetworks=Migrace uživatelů v sociálních sítích (%s)
 MigrationReloadModule=Načíst modul %s
 MigrationResetBlockedLog=Resetovat modul BlockedLog pro algoritmus v7
+MigrationImportOrExportProfiles=Migration of import or export profiles (%s)
 ShowNotAvailableOptions=Zobrazit nedostupné volby
 HideNotAvailableOptions=Skrýt nedostupné možnosti
 ErrorFoundDuringMigration=Byly hlášeny chyb(a)y během procesu migrace, takže další krok není k dispozici. Chcete-li ignorovat chyby, můžete <a href="%s"> kliknout zde </a>, ale aplikace nebo některé funkce nemusí pracovat správně, dokud nejsou chyby vyřešeny.
diff --git a/htdocs/langs/cs_CZ/interventions.lang b/htdocs/langs/cs_CZ/interventions.lang
index f9dc01287b0..44e1d44bfa5 100644
--- a/htdocs/langs/cs_CZ/interventions.lang
+++ b/htdocs/langs/cs_CZ/interventions.lang
@@ -64,3 +64,5 @@ InterLineDuration=Linka trvání intervence
 InterLineDesc=Linka popis intervence
 RepeatableIntervention=Šablona intervence
 ToCreateAPredefinedIntervention=Chcete-li vytvořit předdefinovaný nebo opakující se zásah, vytvořte společný zásah a převeďte jej na intervenční šablonu
+Reopen=Znovu otevřeno
+ConfirmReopenIntervention=Are you sure you want to open back the intervention <b>%s</b>?
diff --git a/htdocs/langs/cs_CZ/productbatch.lang b/htdocs/langs/cs_CZ/productbatch.lang
index 4c8a725536a..845886c1365 100644
--- a/htdocs/langs/cs_CZ/productbatch.lang
+++ b/htdocs/langs/cs_CZ/productbatch.lang
@@ -26,12 +26,10 @@ ShowLogOfMovementIfLot=Zobrazit log pohybů šarží produktu
 StockDetailPerBatch=Zásoby dané šarže
 SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
-BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
-BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
 ManageLotMask=Custom mask
-CustomMasks=Adds an option to define mask in the product card
-LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
-SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+CustomMasks=Option to define a different numbering mask for each product
+BatchLotNumberingModules=Numbering rule for automatic generation of lot number
+BatchSerialNumberingModules=Numbering rule for automatic generation of serial number (for products with property 1 unique lot/serial for each product)
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
diff --git a/htdocs/langs/cs_CZ/products.lang b/htdocs/langs/cs_CZ/products.lang
index 89184f2e345..4629fa9065d 100644
--- a/htdocs/langs/cs_CZ/products.lang
+++ b/htdocs/langs/cs_CZ/products.lang
@@ -277,7 +277,7 @@ PriceByCustomer=Různé ceny pro každého zákazníka
 PriceCatalogue=Unikátní cena pro produkt/službu
 PricingRule=Pravidla pro prodejní ceny
 AddCustomerPrice=Přidejte cenu pro zákazníka
-ForceUpdateChildPriceSoc=Nastavit stejné ceny pro dceřiné společnosti zákazníka
+ForceUpdateChildPriceSoc=Set same price on customer's subsidiaries
 PriceByCustomerLog=Protokol o cenách předchozího zákazníka
 MinimumPriceLimit=Minimální cena nesmí být nižší než %s
 MinimumRecommendedPrice=Minimální doporučená cena je: %s
@@ -296,6 +296,7 @@ ComposedProductIncDecStock=Zvýšit/snížit zásoby na výchozí změny
 ComposedProduct=Subprodukt
 MinSupplierPrice=Minimální nákupní cena
 MinCustomerPrice=Minimální prodejní cena
+NoDynamicPrice=No dynamic price
 DynamicPriceConfiguration=Dynamická konfigurace cen
 DynamicPriceDesc=Můžete definovat matematické vzorce pro výpočet cen zákazníků nebo prodejců. Takové vzorce mohou používat všechny matematické operátory, některé konstanty a proměnné. Zde můžete definovat proměnné, které chcete použít. Pokud proměnná potřebuje automatickou aktualizaci, můžete definovat externí URL, aby Dolibarr umožnil automatickou aktualizaci hodnoty.
 AddVariable=Přidat proměnnou
diff --git a/htdocs/langs/cs_CZ/salaries.lang b/htdocs/langs/cs_CZ/salaries.lang
index 3e5a2453e89..1e6e5c2d90c 100644
--- a/htdocs/langs/cs_CZ/salaries.lang
+++ b/htdocs/langs/cs_CZ/salaries.lang
@@ -2,20 +2,23 @@
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Účtovací účet používaný pro třetí strany
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=Účelový účet určený na uživatelské kartě bude použit pouze pro účetnictví společnosti Subledger. Ten bude použit pro hlavní knihu a jako výchozí hodnota účtování společnosti Subledger, pokud není určen uživatelský účtovací účet pro uživatele.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Účtovací účet je výchozí pro mzdové platby
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=By default, leave empty the option "Automatically create a total payment" when creating a Salary
 Salary=Mzda
 Salaries=Mzdy
-NewSalaryPayment=Nová platba mzdy
+NewSalary=New salary
+NewSalaryPayment=New salary card
 AddSalaryPayment=Přidat platbu
 SalaryPayment=Platba mzdy
 SalariesPayments=Platby mezd
+SalariesPaymentsOf=Salaries payments of %s
 ShowSalaryPayment=Ukázat platbu mzdy
 THM=Průměrná hodinová sazba
 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ů na čas strávený na projektu zadaný uživateli, pokud je použit modul projektu
 TJMDescription=Tato hodnota je momentálně pouze informativní a nepoužívá se pro výpočet
-LastSalaries=Posledních %s plateb
-AllSalaries=Všechny mzdové platby
+LastSalaries=Latest %s salaries
+AllSalaries=All salaries
 SalariesStatistics=Statistika platů
-# Export
 SalariesAndPayments=Platy a platby
+ConfirmDeleteSalaryPayment=Do you want to delete this salary payment ?
diff --git a/htdocs/langs/cs_CZ/ticket.lang b/htdocs/langs/cs_CZ/ticket.lang
index 69f40d1c0ac..5469bfa567a 100644
--- a/htdocs/langs/cs_CZ/ticket.lang
+++ b/htdocs/langs/cs_CZ/ticket.lang
@@ -34,7 +34,8 @@ TicketDictResolution=Vstupenka - rozlišení
 
 TicketTypeShortCOM=Obchodní otázka
 TicketTypeShortHELP=Žádost o funkční pomoc
-TicketTypeShortISSUE=Problém, chyba nebo problém
+TicketTypeShortISSUE=Issue or bug
+TicketTypeShortPROBLEM=Problem
 TicketTypeShortREQUEST=Žádost o změnu nebo vylepšení
 TicketTypeShortPROJET=Projekt
 TicketTypeShortOTHER=Jiný
@@ -54,14 +55,15 @@ TypeContact_ticket_internal_SUPPORTTEC=Přiřazený uživatel
 TypeContact_ticket_external_SUPPORTCLI=Kontakt zákazníka / sledování incidentů
 TypeContact_ticket_external_CONTRIBUTOR=Externí přispěvatel
 
-OriginEmail=Zdroj e-mailu
+OriginEmail=Reporter Email
 Notify_TICKET_SENTBYMAIL=Odeslat e-mailem zprávu o lince
 
 # Status
 Read=Číst
 Assigned=Přidělené
 InProgress=probíhá
-NeedMoreInformation=Čekání na informace
+NeedMoreInformation=Waiting for reporter feedback
+NeedMoreInformationShort=Waiting for feedback
 Answered=Odpovězeno
 Waiting=Čekání
 Closed=Zavřeno
@@ -160,7 +162,7 @@ CreatedBy=Vytvořil
 NewTicket=Nová vstupenka
 SubjectAnswerToTicket=Odpověď na lístek
 TicketTypeRequest=Typ požadavku
-TicketCategory=Skupina
+TicketCategory=Ticket categorization
 SeeTicket=Viz lístek
 TicketMarkedAsRead=Lístek byl označen jako přečtený
 TicketReadOn=Číst dál
@@ -211,6 +213,7 @@ TicketMessageHelp=Pouze tento text bude uložen do seznamu zpráv na kartě lís
 TicketMessageSubstitutionReplacedByGenericValues=Substituční proměnné jsou nahrazeny obecnými hodnotami.
 TimeElapsedSince=Čas uplynul od
 TicketTimeToRead=Čas uplynul před čtením
+TicketTimeElapsedBeforeSince=Time elapsed before / since
 TicketContacts=Kontaktní lístek
 TicketDocumentsLinked=Dokumenty spojené s lístkem
 ConfirmReOpenTicket=Potvrďte znovutevření tento lístek?
diff --git a/htdocs/langs/cs_CZ/users.lang b/htdocs/langs/cs_CZ/users.lang
index 0c355b7432e..0c8f9bcfb33 100644
--- a/htdocs/langs/cs_CZ/users.lang
+++ b/htdocs/langs/cs_CZ/users.lang
@@ -97,8 +97,8 @@ LoginToCreate=K vytvoření je potřeba se přihlásit
 NameToCreate=Název třetí strany k vytvoření
 YourRole=Vaše role
 YourQuotaOfUsersIsReached=Vaše kvóta aktivních uživatelů je dosažena!
-NbOfUsers=Počet uživatelů
-NbOfPermissions=Počet oprávnění
+NbOfUsers=Number of users
+NbOfPermissions=Number of permissions
 DontDowngradeSuperAdmin=Pouze superadmin může ponížit superadmina
 HierarchicalResponsible=Supervizor
 HierarchicView=Hierarchické zobrazení
diff --git a/htdocs/langs/cs_CZ/website.lang b/htdocs/langs/cs_CZ/website.lang
index fdd8e7b9a79..a5c50c6b52a 100644
--- a/htdocs/langs/cs_CZ/website.lang
+++ b/htdocs/langs/cs_CZ/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Přidat webovou stránku
 Webpage=Webová stránka / kontejner
 AddPage=Přidat stránku / kontejner
 PageContainer=Strana
-PreviewOfSiteNotYetAvailable=Náhled vašeho webu <strong> %s </strong> zatím není k dispozici. Nejprve musíte '<strong> Importovat celou šablonu webových stránek </strong>' nebo jen '<strong> Přidat stránku / kontejner </strong>'.
+PreviewOfSiteNotYetAvailable=The preview of your website <strong>%s</strong> is not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Požadovaná stránka s ID %s nemá dosud žádný obsah nebo byl odstraněn soubor cache .tpl.php. Upravte obsah stránky pro vyřešení tohoto problému.
 SiteDeleted=Webová stránka '%s' byla smazána
 PageContent=Stránka / Contenair
diff --git a/htdocs/langs/da_DK/admin.lang b/htdocs/langs/da_DK/admin.lang
index 25c27871bd5..aab902e6f74 100644
--- a/htdocs/langs/da_DK/admin.lang
+++ b/htdocs/langs/da_DK/admin.lang
@@ -53,6 +53,7 @@ InternalUser=Intern bruger
 ExternalUser=Ekstern bruger
 InternalUsers=Interne brugere
 ExternalUsers=Eksterne brugere
+UserInterface=User interface
 GUISetup=Udseende
 SetupArea=Indstillinger
 UploadNewTemplate=Upload nye skabelon(er)
@@ -1260,8 +1261,8 @@ YourPHPDoesNotHaveSSLSupport=SSL-funktioner ikke er tilgængelige i dit PHP
 DownloadMoreSkins=Find flere skind på Dolistore.com
 SimpleNumRefModelDesc=Returnerer referencenummeret i formatet %syymm-nnnn hvor yy er året, mm er måneden og nnnn er et sekventielt auto-stigende nummer uden nulstilling
 SimpleNumRefNoDateModelDesc=Returnerer referencenummeret i formatet %s-nnnn hvor nnnn er et sekventielt automatisk stigende nummer uden nulstilling
-ShowProfIdInAddress=Vis professionelt id med adresser
-ShowVATIntaInAddress=Skjul momsregistreringsnummer i Fællesskabet med adresser
+ShowProfIdInAddress=Show professional ID with addresses
+ShowVATIntaInAddress=Hide intra-Community VAT number
 TranslationUncomplete=Delvis oversættelse
 MAIN_DISABLE_METEO=Deaktiver meteorologisk visning
 MeteoStdMod=Standard-tilstand aktiveret
@@ -1778,7 +1779,7 @@ ClickToDialSetup=Opsætning af Klik-for-at-ringe-modulet
 ClickToDialUrlDesc=Url kaldes, når man klikke på telefon billed. I URL kan du bruge tags <br> <b> __ PHONETO __ </b>, der vil blive erstattet med telefonnummeret til den person, der skal ringe <br> <b> __ PHONEFROM __ </b>, der vil blive erstattet med telefonnummeret til opkaldet person (din) <br> <b> __ LOGIN __ </b>, der vil blive erstattet med clicktodial login (defineret på brugerkort) <br> <b> __ PASS __ </b>, der vil blive erstattet med clicktodial adgangskode (defineret på bruger kort).
 ClickToDialDesc=Dette modul ændrer telefonnumre, når du bruger en stationær computer, til klikbare links. Et klik ringer op til nummeret. Dette kan bruges til at starte telefonopkaldet, når du bruger en blød telefon på skrivebordet eller når du f.eks. Bruger et CTI-system baseret på SIP-protokol. Bemærk: Når du bruger en smartphone, er telefonnumre altid klikbare.
 ClickToDialUseTelLink=Brug kun et link "tel:" på telefonnumre
-ClickToDialUseTelLinkDesc=Brug denne metode, hvis dine brugere har en softphone eller en software-grænseflade installeret på samme computer som browseren, og kaldes, når du klikker på et link i din browser, der starter med "tel:". Hvis du har brug for en fuld serverløsning (uden brug af lokal softwareinstallation), skal du indstille dette til "Nej" og udfylde næste felt.
+ClickToDialUseTelLinkDesc=Brug denne metode, hvis dine brugere har en softphone eller et softwaregrænseflade, installeret på den samme computer som browseren og kaldes, når du klikker på et link, der starter med "tel:" i din browser. Hvis du har brug for et link, der starter med "sip:" eller en komplet serverløsning (intet behov for lokal softwareinstallation), skal du indstille dette til "Nej" og udfylde næste felt.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Point of Sale
 CashDeskSetup=Opsætning af Point of Sales-modul
@@ -2133,7 +2134,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Bortset fra hvis du har brug for at
 PHPFunctionsRequiredForCLI=Til shell-formål (som planlagt jobbackup eller kørsel af et anitivurs-program) skal du beholde PHP-funktioner
 NoWritableFilesFoundIntoRootDir=Ingen skrivbare filer eller mapper til de almindelige programmer blev fundet i din rodkatalog (God)
 RecommendedValueIs=Anbefalet: %s
-NotRecommended=Ikke anbefalet
+Recommended=Anbefalet
+NotRecommended=Not recommended
 ARestrictedPath=En begrænset sti
 CheckForModuleUpdate=Se efter opdateringer til eksterne moduler
 CheckForModuleUpdateHelp=Denne handling opretter forbindelse til redaktører for eksterne moduler for at kontrollere, om en ny version er tilgængelig.
@@ -2145,3 +2147,4 @@ RandomlySelectedIfSeveral=Valgt tilfældigt, hvis der er flere billeder tilgæng
 DatabasePasswordObfuscated=Databaseadgangskode er tilsløret i conf-fil
 DatabasePasswordNotObfuscated=Databaseadgangskode er IKKE tilsløret i conf-fil
 APIsAreNotEnabled=API-moduler er ikke aktiveret
+YouShouldSetThisToOff=Du skal indstille dette til 0 eller fra
diff --git a/htdocs/langs/da_DK/banks.lang b/htdocs/langs/da_DK/banks.lang
index f40da8a80f3..66976d5916c 100644
--- a/htdocs/langs/da_DK/banks.lang
+++ b/htdocs/langs/da_DK/banks.lang
@@ -115,7 +115,7 @@ TransferTo=Til
 TransferFromToDone=En overførsel fra <b> %s </b> til <b> %s </b> af <b> %s </b> %s er blevet optaget.
 CheckTransmitter=Sender
 ValidateCheckReceipt=Bekræft denne kvitteringskvittering?
-ConfirmValidateCheckReceipt=Er du sikker på, at du vil indsende denne checkkvittering til validering? Ingen ændringer er mulige, det er gjort.
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes will be possible once validated.
 DeleteCheckReceipt=Slet denne kvittering for kvittering?
 ConfirmDeleteCheckReceipt=Er du sikker på, at du vil slette denne kvittering for kvittering?
 BankChecks=Bankcheck
diff --git a/htdocs/langs/da_DK/boxes.lang b/htdocs/langs/da_DK/boxes.lang
index 7d3af76778e..f5948e8f72d 100644
--- a/htdocs/langs/da_DK/boxes.lang
+++ b/htdocs/langs/da_DK/boxes.lang
@@ -91,8 +91,8 @@ BoxTitleLatestModifiedSupplierOrders=Leverandør Ordrer: senest %s ændret
 BoxTitleLastModifiedCustomerBills=Kundefakturaer: sidst %s ændret
 BoxTitleLastModifiedCustomerOrders=Salgsordrer: sidst %s ændret
 BoxTitleLastModifiedPropals=Seneste %s tilrettede tilbud
-BoxTitleLatestModifiedJobPositions=Seneste %s ændrede job
-BoxTitleLatestModifiedCandidatures=Seneste %s ændrede kandidaturer
+BoxTitleLatestModifiedJobPositions=Latest %s modified job positions
+BoxTitleLatestModifiedCandidatures=Latest %s modified job applications
 ForCustomersInvoices=Kundernes fakturaer
 ForCustomersOrders=Customers orders
 ForProposals=Tilbud
diff --git a/htdocs/langs/da_DK/cashdesk.lang b/htdocs/langs/da_DK/cashdesk.lang
index d8b9c57f74d..11448c5488a 100644
--- a/htdocs/langs/da_DK/cashdesk.lang
+++ b/htdocs/langs/da_DK/cashdesk.lang
@@ -127,4 +127,4 @@ AllowDelayedPayment=Tillad forsinket betaling
 PrintPaymentMethodOnReceipts=Udskriv betalingsmetode på billetter | kvitteringer
 WeighingScale=Vægt skala 
 ShowPriceHT = Vis kolonnen med prisen ekskl. Moms (på skærmen)
-ShowPriceHTOnReceipt = Vis kolonnen med prisen ekskl. Moms (ved modtagelse)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on the receipt)
diff --git a/htdocs/langs/da_DK/errors.lang b/htdocs/langs/da_DK/errors.lang
index e91ac6ea87f..b5b51ba5676 100644
--- a/htdocs/langs/da_DK/errors.lang
+++ b/htdocs/langs/da_DK/errors.lang
@@ -301,3 +301,4 @@ ErrorActionCommPropertyUserowneridNotDefined=Brugerens ejer kræves
 ErrorActionCommBadType=Den valgte hændelsestype (id: %n, kode: %s) findes ikke i begivenhedstypeordbogen
 CheckVersionFail=Versionskontrol mislykkedes
 ErrorWrongFileName=Filens navn kan ikke indeholde __SOMETHING__
+ErrorNotInDictionaryPaymentConditions=Ikke i ordbogen om betalingsbetingelser, bedes du ændre.
diff --git a/htdocs/langs/da_DK/eventorganization.lang b/htdocs/langs/da_DK/eventorganization.lang
index c3c40ad2289..0829cb87e9c 100644
--- a/htdocs/langs/da_DK/eventorganization.lang
+++ b/htdocs/langs/da_DK/eventorganization.lang
@@ -86,6 +86,7 @@ DownloadICSLink = Download ICS-link
 EVENTORGANIZATION_SECUREKEY = Sikker nøgle til linket til offentlig registrering til en konference
 SERVICE_BOOTH_LOCATION = Service, der bruges til fakturarække om en standplacering
 SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service, der bruges til fakturarække om et deltagerabonnement på en konference
+NbVotes=Number of votes
 #
 # Status
 #
@@ -115,6 +116,9 @@ EvntOrgDuration = Denne konference starter på %s og slutter på %s.
 ConferenceAttendeeFee = Konferencedeltagergebyr for begivenheden: '%s', der forekommer fra %s til %s.
 BoothLocationFee = Standplacering for begivenheden: '%s' der forekommer fra %s til %s
 EventType = Begivenhedstype
+LabelOfBooth=Booth label
+LabelOfconference=Conference label
+ConferenceIsNotConfirmed=Subcription not available, conference is not confirmed yet
 
 #
 # Vote page
diff --git a/htdocs/langs/da_DK/install.lang b/htdocs/langs/da_DK/install.lang
index 202e7f17fc7..3814996ecda 100644
--- a/htdocs/langs/da_DK/install.lang
+++ b/htdocs/langs/da_DK/install.lang
@@ -206,6 +206,7 @@ MigrationUserPhotoPath=Migration af foto stier til brugere
 MigrationFieldsSocialNetworks=Migration af brugerfelter sociale netværk (%s)
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Nulstil modul BlockedLog for v7 algoritme
+MigrationImportOrExportProfiles=Migration of import or export profiles (%s)
 ShowNotAvailableOptions=Vis utilgængelige muligheder
 HideNotAvailableOptions=Skjul utilgængelige muligheder
 ErrorFoundDuringMigration=Fejl (er) blev rapporteret under migrationsprocessen, så næste trin er ikke tilgængeligt. For at ignorere fejl kan du <a href="%s"> klikke her </a>, men programmet eller nogle funktioner fungerer muligvis ikke korrekt, før fejlene er løst.
diff --git a/htdocs/langs/da_DK/interventions.lang b/htdocs/langs/da_DK/interventions.lang
index af56ebe197c..fbb71445739 100644
--- a/htdocs/langs/da_DK/interventions.lang
+++ b/htdocs/langs/da_DK/interventions.lang
@@ -64,3 +64,5 @@ InterLineDuration=Linje varighed indgreb
 InterLineDesc=Line beskrivelse af ingreb
 RepeatableIntervention=Skabelon for intervention
 ToCreateAPredefinedIntervention=For at oprette en foruddefineret eller tilbagevendende intervention skal du oprette en fælles intervention og konvertere den til interventionsskabelon
+Reopen=Genåben 
+ConfirmReopenIntervention=Er du sikker på, at du vil åbne interventionen <b> %s </b>?
diff --git a/htdocs/langs/da_DK/productbatch.lang b/htdocs/langs/da_DK/productbatch.lang
index 2e7ce5d269b..247a697d078 100644
--- a/htdocs/langs/da_DK/productbatch.lang
+++ b/htdocs/langs/da_DK/productbatch.lang
@@ -26,12 +26,10 @@ ShowLogOfMovementIfLot=Vis log af bevægelser for par produkt / partiSerie
 StockDetailPerBatch=Lager detaljer pr. Parti Serie
 SerialNumberAlreadyInUse=Serienummer %s bruges allerede til produkt %s
 TooManyQtyForSerialNumber=Du kan kun have et produkt %s til serienummer %s
-BatchLotNumberingModules=Valgmuligheder til automatisk generering af batchprodukter, der administreres af partier
-BatchSerialNumberingModules=Valgmuligheder til automatisk generering af batchprodukter styret af serienumre
 ManageLotMask=Brugerdefineret maske
-CustomMasks=Tilføjer en mulighed for at definere maske på produktkortet
-LotProductTooltip=Tilføjer en mulighed på produktkortet for at definere en dedikeret batchnummermaske
-SNProductTooltip=Tilføjer en mulighed på produktkortet for at definere en dedikeret serienummermaske
+CustomMasks=Option to define a different numbering mask for each product
+BatchLotNumberingModules=Numbering rule for automatic generation of lot number
+BatchSerialNumberingModules=Numbering rule for automatic generation of serial number (for products with property 1 unique lot/serial for each product)
 QtyToAddAfterBarcodeScan=Mængde, der skal tilføjes for hver stregkode / parti / seriel scannet
 LifeTime=Levetid (i dage)
 EndOfLife=udløbet på dato
diff --git a/htdocs/langs/da_DK/products.lang b/htdocs/langs/da_DK/products.lang
index 8c90dd9aa44..d1400e80b09 100644
--- a/htdocs/langs/da_DK/products.lang
+++ b/htdocs/langs/da_DK/products.lang
@@ -341,7 +341,7 @@ ProductSheet=Vareside
 ServiceSheet=Serviceblad
 PossibleValues=Mulige værdier
 GoOnMenuToCreateVairants=Gå på menu %s - %s for at forberede attributvarianter (som farver, størrelse, ...)
-UseProductFournDesc=Tilføj en funktion til at definere beskrivelser af produkter, der er defineret af leverandørerne, ud over beskrivelser til kunder
+UseProductFournDesc=Add a feature to define the descriptions of products defined by the vendors in addition to descriptions for customers
 ProductSupplierDescription=Leverandørbeskrivelse for produktet
 UseProductSupplierPackaging=Brug emballage til leverandørpriser (genberegn mængder i henhold til emballage, der er angivet på leverandørpris, når du tilføjer / opdaterer linje i leverandørdokumenter)
 PackagingForThisProduct=Emballage
diff --git a/htdocs/langs/da_DK/salaries.lang b/htdocs/langs/da_DK/salaries.lang
index e1a7521bd8b..a947dfee1a3 100644
--- a/htdocs/langs/da_DK/salaries.lang
+++ b/htdocs/langs/da_DK/salaries.lang
@@ -2,20 +2,23 @@
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Regnskabskonto bruges til tredjepart
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=Den dedikerede regnskabskonto, der er defineret på brugerkort, vil kun blive anvendt til underledere. Denne vil blive brugt til General Ledger og som standardværdi for Subledger regnskab, hvis dedikeret brugerregnskabskonto på bruger ikke er defineret.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Regnskabskonto som standard for lønudbetalinger
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=Lad som standard tomt være indstillingen "Opret automatisk en samlet betaling", når du opretter en løn
 Salary=Løn
 Salaries=Løn
-NewSalaryPayment=Ny lønbetaling
+NewSalary=Ny løn
+NewSalaryPayment=Nyt lønkort
 AddSalaryPayment=Tilføj lønbetaling
 SalaryPayment=Løn betaling
 SalariesPayments=Lønudbetalinger
+SalariesPaymentsOf=Lønudbetalinger på %s
 ShowSalaryPayment=Vis lønbetaling
 THM=Gennemsnitlig timepris
 TJM=Gennemsnitlig dagspris
 CurrentSalary=Nuværende løn
 THMDescription=Denne værdi kan bruges til at beregne omkostningerne til den tid, der er forbrugt på et projekt, der er indtastet af brugere, hvis modulprojektet bruges
 TJMDescription=Denne værdi er i øjeblikket kun til information og bruges ikke til nogen beregning
-LastSalaries=Seneste %s lønbetalinger
-AllSalaries=Alle lønudbetalinger
+LastSalaries=Seneste %s lønninger
+AllSalaries=Alle lønninger
 SalariesStatistics=Lønstatistik
-# Export
 SalariesAndPayments=Løn og betalinger
+ConfirmDeleteSalaryPayment=Vil du slette denne lønudbetaling?
diff --git a/htdocs/langs/da_DK/ticket.lang b/htdocs/langs/da_DK/ticket.lang
index ef63445750d..059ca7abeb4 100644
--- a/htdocs/langs/da_DK/ticket.lang
+++ b/htdocs/langs/da_DK/ticket.lang
@@ -55,7 +55,7 @@ TypeContact_ticket_internal_SUPPORTTEC=Tildelt bruger
 TypeContact_ticket_external_SUPPORTCLI=Kundekontakt / hændelsesporing
 TypeContact_ticket_external_CONTRIBUTOR=Ekstern bidragyder
 
-OriginEmail=E-mail reporter
+OriginEmail=Reporter Email
 Notify_TICKET_SENTBYMAIL=Send opgaver besked via Email
 
 # Status
diff --git a/htdocs/langs/da_DK/website.lang b/htdocs/langs/da_DK/website.lang
index 2d3cc4092de..0b117152cc5 100644
--- a/htdocs/langs/da_DK/website.lang
+++ b/htdocs/langs/da_DK/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Tilføj hjemmeside
 Webpage=Webside / container
 AddPage=Tilføj side / container
 PageContainer=Side
-PreviewOfSiteNotYetAvailable=Forhåndsvisning af dit websted <strong> %s </ strong> endnu ikke tilgængeligt. Du skal først <strong> Importer en fuld hjemmeside skabelon </ strong> 'eller bare <strong> Tilføj en side / container </ strong>'.
+PreviewOfSiteNotYetAvailable=Eksempelvisningen af dit websted <strong> %s </strong> er endnu ikke tilgængelig. Du skal først '<strong> Importere en komplet webstedsskabelon </strong>' eller bare '<strong> Tilføj en side / container </strong>'.
 RequestedPageHasNoContentYet=Den ønskede side med id %s har intet indhold endnu, eller cache-filen .tpl.php blev fjernet. Rediger indholdet på siden for at løse dette.
 SiteDeleted=Webstedet '%s' slettet
 PageContent=Side / Indhold
diff --git a/htdocs/langs/de_AT/admin.lang b/htdocs/langs/de_AT/admin.lang
index 084f4086695..34368689cf1 100644
--- a/htdocs/langs/de_AT/admin.lang
+++ b/htdocs/langs/de_AT/admin.lang
@@ -148,7 +148,6 @@ LDAPSynchronization=LDAP Synchronisierung
 LDAPFunctionsNotAvailableOnPHP=LDAP Funktionen nicht verfügbar in Deinem PHP
 LDAPFieldFullname=vollständiger Name
 ClickToDialSetup=Click-to-Dial-Moduleinstellungen
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 MailToSendShipment=Sendungen
 MailToSendIntervention=Eingriffe
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
diff --git a/htdocs/langs/de_AT/products.lang b/htdocs/langs/de_AT/products.lang
index 2be4012b705..b1d6d08721c 100644
--- a/htdocs/langs/de_AT/products.lang
+++ b/htdocs/langs/de_AT/products.lang
@@ -30,5 +30,4 @@ ListProductByPopularity=Liste der Produkte/Services nach Beliebtheit
 ListServiceByPopularity=Liste der Services nach Beliebtheit
 Finished=Eigenerzeugung
 NewRefForClone=Artikel Nr. des neuen Produkts/Services
-ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PMPValue=Warenwert
diff --git a/htdocs/langs/de_AT/salaries.lang b/htdocs/langs/de_AT/salaries.lang
deleted file mode 100644
index c9bd3bec17b..00000000000
--- a/htdocs/langs/de_AT/salaries.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - salaries
-LastSalaries=Latest %s salary payments
-AllSalaries=All salary payments
diff --git a/htdocs/langs/de_AT/ticket.lang b/htdocs/langs/de_AT/ticket.lang
index cdbb16efe30..05da15d6036 100644
--- a/htdocs/langs/de_AT/ticket.lang
+++ b/htdocs/langs/de_AT/ticket.lang
@@ -1,7 +1,3 @@
 # Dolibarr language file - Source file is en_US - ticket
-TicketTypeShortISSUE=Issue, bug or problem
-OriginEmail=Email source
-NeedMoreInformation=Waiting for information
 Waiting=Wartestellung
 Closed=geschlossen
-TicketCategory=Group
diff --git a/htdocs/langs/de_AT/users.lang b/htdocs/langs/de_AT/users.lang
index 80a15bddaf3..271a945e1f3 100644
--- a/htdocs/langs/de_AT/users.lang
+++ b/htdocs/langs/de_AT/users.lang
@@ -5,5 +5,3 @@ PasswordChangedAndSentTo=Passwort geändert und an <b>%s</b> gesandt.
 PasswordChangeRequestSent=Antrag auf eine Änderung das Passworts für <b>%s</b> an <b>%s</b> gesandt.
 LinkedToDolibarrUser=Mit Systembenutzer verknüpfen
 LinkedToDolibarrThirdParty=Mit Partner verknüpfen
-NbOfUsers=No. of users
-NbOfPermissions=No. of permissions
diff --git a/htdocs/langs/de_AT/website.lang b/htdocs/langs/de_AT/website.lang
deleted file mode 100644
index 910cff6b702..00000000000
--- a/htdocs/langs/de_AT/website.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - website
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
diff --git a/htdocs/langs/de_CH/accountancy.lang b/htdocs/langs/de_CH/accountancy.lang
index 54d62648afc..1252de13360 100644
--- a/htdocs/langs/de_CH/accountancy.lang
+++ b/htdocs/langs/de_CH/accountancy.lang
@@ -1,6 +1,5 @@
 # Dolibarr language file - Source file is en_US - accountancy
 Accountancy=Rechnungswesen
-ACCOUNTING_EXPORT_SEPARATORCSV=Spaltentrennzeichen
 ACCOUNTING_EXPORT_DATE=Datumsformat für Exportdatei
 ACCOUNTING_EXPORT_PIECE=Exportiere die Anzahl Teile
 ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Exportiere mit Globalkonto
@@ -13,8 +12,11 @@ ACCOUNTING_EXPORT_ENDLINE=Wähle das Steuerzeichen für den Wagenrücklauf (Carr
 ACCOUNTING_EXPORT_PREFIX_SPEC=Wähle dein Präfix für den Dateinamen
 DefaultForService=Standard für Leistungen
 DefaultForProduct=Standard für Produkte
+ProductForThisThirdparty=Produkt für diesen Geschäftspartner
+ServiceForThisThirdparty=Dienstleistung für diesen Geschäftspartner
 CantSuggest=Ich habe keinen Vorschlag
 AccountancySetupDoneFromAccountancyMenu=Die meisten Einstellungen der Buchhaltung setzt du im Menu %s
+ConfigAccountingExpert=Einstellungen für das Modul Buchhaltung (Doppelte Buchhaltung)
 Journalization=Journalisierung
 JournalFinancial=Finanzjournal
 BackToChartofaccounts=Zeige Kontenrahmen
@@ -34,7 +36,10 @@ CountriesInEEC=EWR - Staaten
 CountriesNotInEEC=Nicht EWR - Staaten
 CountriesInEECExceptMe=Länder im EWR ausser %s
 CountriesExceptMe=Alle Staaten, ausser %s
-ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
+AccountantFiles=Geschäftsvorgänge exportieren
+ExportAccountingSourceDocHelp=Hier kannst du die zu deinen Buchungen gehörenden Geschäftsfälle als Liste exportieren. Du hast die Wahl zwischen den Dateiformaten CSV und PDF.
+VueByAccountAccounting=Anzeigen nach Buchhaltungskonto
+VueBySubAccountAccounting=Anzeigen nach Nebenbuchkonto
 MainAccountForCustomersNotDefined=Es ist kein kein Buchhaltungskonto für Kunden eingerichtet.
 MainAccountForSuppliersNotDefined=Es ist kein kein Buchhaltungskonto für Anbieter eingerichtet.
 MainAccountForUsersNotDefined=Es ist kein kein Buchhaltungskonto für Kontakte eingerichtet.
@@ -46,6 +51,8 @@ AccountancyAreaDescActionOnce=Folgende Aufgaben erledigst du normalerweise einma
 AccountancyAreaDescActionOnceBis=Die folgenden Einstellungen helfen dir, die Aufzeichnungen einfacher an Buchhaltungskonten zuzuweisen.
 AccountancyAreaDescActionFreq=Die Folgenden arbeiten erfolgen - je nach Unternehmensgrösse - monatlich, wöchentlich oder gar täglich.
 AccountancyAreaDescJournalSetup=Schritt %s: Prüfe die vorhandenen Journale im Menu %s und ergänze Sie bei Bedarf mit eigenen.
+AccountancyAreaDescChartModel=Schritt %s: Stelle sicher, dass ein Kontenplan angelegt ist oder erstelle einen via Menu %s.
+AccountancyAreaDescChart=Schritt %s: Wähle und / oder ergänze deinen Kontenplan via Menu %s.
 AccountancyAreaDescVat=Schritt %s: Hinterlege die verschiedenen MWST Sätze im Menu%s.
 AccountancyAreaDescDefault=STEP %s: Hinterlege weitere Standard - Buchhaltungskonten im Menu %s.
 AccountancyAreaDescExpenseReport=Schritt %s: Hinterlege Buchhaltungskonten für alle Arten von Ausgaben in Spesenabrechnungen im Menu %s.
@@ -61,12 +68,15 @@ AccountancyAreaDescBind=Schritt %s: Prüfe die Verknüpfungen von %s mit passend
 AccountancyAreaDescWriteRecords=Schritt %s: Lass alle Transaktionen ins Hauptbuch übertragen. Wechsle dazu in das Menu <strong>%s</strong>, und Klicke auf <strong>%s</strong>.
 AccountancyAreaDescAnalyze=Schritt %s: Erzeuge oder ergänze Transaktionen für Berichte und Exporte.
 AccountancyAreaDescClosePeriod=Schritt %s: Schliesse eine Geschäftsperiode ab, damit Sie nicht mehr abgeändert werden kann.
+TheJournalCodeIsNotDefinedOnSomeBankAccount=Eine zwingende Einstellung ist noch nicht gemacht - nicht alle Bankkonten sind einem Journal zugeordnet.
 Selectchartofaccounts=Wähle deinen Kontenrahmen.
 ChangeAndLoad=Lade und ersetze
 Addanaccount=Buchhaltungskonto hinzüfügen
 SubledgerAccountLabel=Bezeichnung Nebenbuchkonto
 ShowAccountingAccount=Zeige Buchhaltungskonto
 ShowAccountingJournal=Zeige Buchhaltungssjournal
+ShowAccountingAccountInLedger=Zeige dieses Buchhaltungskonto im Hauptbuch.
+ShowAccountingAccountInJournals=Zeige dieses Buchhaltungskonto in den Journalen
 AccountAccountingSuggest=Vorgeschlagenes Buchhaltungskonto
 MenuVatAccounts=MWST - Konten
 MenuTaxAccounts=Steuerkonten
@@ -84,6 +94,7 @@ ExpenseReportsVentilation=Verknüpfung für Spesenabrechnungen
 CreateMvts=Neue Transaktion
 UpdateMvts=Transaktion bearbeiten
 ValidTransaction=Transaktion freigeben
+WriteBookKeeping=Verbuche diese Transaktionen
 AccountBalance=Saldo
 ObjectsRef=Referenz des Quellobjektes
 CAHTF=Einkaufsaufwand von Steuern
@@ -93,6 +104,7 @@ InvoiceLinesDone=Verknüpfte Rechnungspositionen
 ExpenseReportLines=Spesenabrechnungspositionen zum Verknüpfen
 ExpenseReportLinesDone=Verknüpfte Spesenabrechnungen
 IntoAccount=Position mit Buchhaltungskonto verknüpfen
+TotalForAccount=Total Buchhaltungskonto
 Ventilate=Verknüpfen
 LineId=Position
 Processing=Verarbeite...
@@ -105,6 +117,7 @@ VentilatedinAccount=Erfolgreich mit dem Buchhaltungskonto verknüpft!
 NotVentilatedinAccount=Nicht mit einem Buchhaltungskonto verknüpft
 XLineSuccessfullyBinded=%s Produkte / Leistungen erfolgreich mit einem Buchhaltungskonto verknüpft.
 XLineFailedToBeBinded=%s Produkte / Leistungen konnten nicht mit einem Buchhaltungskonto verknüpft werden.
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximale Anzahl Einträge in Listen und pro Seite (empfohlen: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Sortiere nach den neuesten zu verknüpfenden Positionen
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Sortiere nach den neuesten zu verknüpften Positionen
 ACCOUNTING_LENGTH_DESCRIPTION=Produkt- und Dienstleistungsbeschreibungen abkürzen (Wir empfehlen nach 50 Zeichen)
@@ -114,6 +127,9 @@ ACCOUNTING_LENGTH_AACCOUNT=Anzahl Stellen der Partner - Kontonummern (die Konton
 ACCOUNTING_MANAGE_ZERO=Unterschiedliche Anzahl Stellen für Kontonummern erlauben (bei einigen Ländern nötig, zum Beispiel in der Schweiz). Wenn das aus ist, kann man unten die Stellen für Kontonummern fix vorgeben.
 BANK_DISABLE_DIRECT_INPUT=Direktbuchung der Transaktion auf dem Bankkonto unterbinden
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Entwurfsexport des Journales erlauben
+ACCOUNTANCY_COMBO_FOR_AUX=Kombinierte Liste für Nebenbuchkonten aktivieren (das kann bei vielen Geschäftspartnern langsam gehen. Weiter kannst du so nicht nach Teilwerten suchen.
+ACCOUNTING_DATE_START_BINDING=Eröffnungsdatum der Buchhaltung festlegen. Alle Vorgänge davor werden in der Buchhaltung nicht berücksichtigt.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Standard - Zeitraum auf den Journalisierungsseiten
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Nebenjournal
 ACCOUNTING_SOCIAL_JOURNAL=Personaljournal
 ACCOUNTING_HAS_NEW_JOURNAL=Hat neuen Journaleintrag
@@ -124,11 +140,16 @@ ACCOUNTING_ACCOUNT_TRANSFER_CASH=Transferkonto Banktransaktionen
 TransitionalAccount=Durchlaufkonto Bank
 ACCOUNTING_ACCOUNT_SUSPENSE=Sperrkonto
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Buchhaltungskonto für Abonnemente
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Standardkonto für Kunden - Anzahlungen
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Standard - Buchhaltungskonto für gekaufte Produkte\n(Wird verwendet, wenn kein Konto in der Produktdefinition hinterlegt ist)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Standardkonto für importierte Produkte aus der EU (wird benutzt, wenn kein Konto im Produkteblatt hinterlegt ist)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Standardkonto für importierte Produkte ausserhalb der EU (wird benutzt, wenn kein Konto im Produkteblatt hinterlegt ist)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Standard - Buchhaltungskonto für verkaufte Produkte\n(Wird verwendet, wenn kein Konto in der Produktdefinition hinterlegt ist)
 ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Standard - Buchhaltungskonto für Produktverkäufe in EWR - Staaten\n(Wird verwendet, wenn kein Konto in der Produktdefinition hinterlegt ist).
 ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Standardkonto für Verkäufe an nicht EWR - Staaten (sofern nicht anders im Produkt hinterlegt)
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Standard - Buchhaltungskonto für gekaufte Leistungen\n(Wird verwendet, wenn kein Konto in der Leistungsdefinition  hinterlegt ist)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Standardkonto für importierte Dienstleistungen aus der EU (wird benutzt, wenn kein Konto im Produkteblatt hinterlegt ist)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Standardkonto für importierte Dienstleistungen ausserhalb der EU (wird benutzt, wenn kein Konto im Produkteblatt hinterlegt ist)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Standard - Buchhaltungskonto für verkaufte Leistungen\n(Wird verwendet, wenn kein Konto in der Leistungsdefinition hinterlegt ist)
 ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Standard - Buchhaltungskonto für verkaufte Leistungen in den EWR\n(Wird verwendet, wenn kein Konto in der Leistungsdefinition hinterlegt ist).
 ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Standardkonto für verkaufte Leistungen an nicht EWR - Staaten (sofern nicht anders im Produkt hinterlegt)
diff --git a/htdocs/langs/de_CH/interventions.lang b/htdocs/langs/de_CH/interventions.lang
index 4daf054e896..0d019fe62b8 100644
--- a/htdocs/langs/de_CH/interventions.lang
+++ b/htdocs/langs/de_CH/interventions.lang
@@ -60,3 +60,4 @@ InterLineId=ID der Einsatzposition
 InterLineDate=Datum der Einsatzposition
 InterLineDuration=Dauer der Einsatzposition
 InterLineDesc=Beschreibung der Einsatzposition
+Reopen=entwerfen
diff --git a/htdocs/langs/de_CH/salaries.lang b/htdocs/langs/de_CH/salaries.lang
index bd6035c66c6..c749d0d0234 100644
--- a/htdocs/langs/de_CH/salaries.lang
+++ b/htdocs/langs/de_CH/salaries.lang
@@ -7,6 +7,5 @@ THM=Durchschnittlicher Stundenlohn
 TJM=Durchschnittlicher Tageslohn
 THMDescription=Wenn das Modul Projektmanagement aktiv ist, dient dieser Wert zum Berechnen der aktuellen Projektzeitkosten.
 TJMDescription=Dieser Wert ist im Moment rein informativ und fliesst in keinerlei Berechnungen ein.
-LastSalaries=Die neuesten %s Lohnzahlungen
 SalariesStatistics=Lohnstatistik
 SalariesAndPayments=Löhne und Lohnzahlungen
diff --git a/htdocs/langs/de_CH/ticket.lang b/htdocs/langs/de_CH/ticket.lang
index 5cbcf19bea7..18ff7a30fab 100644
--- a/htdocs/langs/de_CH/ticket.lang
+++ b/htdocs/langs/de_CH/ticket.lang
@@ -1,8 +1,5 @@
 # Dolibarr language file - Source file is en_US - ticket
-TicketTypeShortISSUE=Issue, bug or problem
 TypeContact_ticket_external_SUPPORTCLI=Kundenkontakt / Störfallverfolgung
-OriginEmail=Email source
 InProgress=In Bearbeitung
-NeedMoreInformation=Waiting for information
 TicketCloseOn=Schliessungsdatum
 TicketAddIntervention=Einsatz erstellen
diff --git a/htdocs/langs/de_CH/users.lang b/htdocs/langs/de_CH/users.lang
index 02a05cfdc2c..94bc17d43e8 100644
--- a/htdocs/langs/de_CH/users.lang
+++ b/htdocs/langs/de_CH/users.lang
@@ -31,7 +31,6 @@ ConfirmCreateContact=Willst du wirklich ein Benutzerkonto für diesen Kontakt er
 ConfirmCreateLogin=Willst du wirklich ein Benutzerkonto für dieses Mitglied erstellen?
 ConfirmCreateThirdParty=Willst du wirklich für dieses Mitglied einen Partner erzeugen?
 NameToCreate=Name des neuen Geschäftspartners
-NbOfUsers=Anz. Benutzer
 UseTypeFieldToChange=Nutzen sie das Feld "Typ" zum ändern
 WeeklyHours=Geleistete Stunden pro Woche
 DisabledInMonoUserMode=Im Wartungsmodus deaktiviert
diff --git a/htdocs/langs/de_CH/website.lang b/htdocs/langs/de_CH/website.lang
index 687f5a43d7d..8504c7c5535 100644
--- a/htdocs/langs/de_CH/website.lang
+++ b/htdocs/langs/de_CH/website.lang
@@ -5,7 +5,6 @@ WEBSITE_TYPE_CONTAINER=Seiten - / Containertyp
 WEBSITE_PAGE_EXAMPLE=Webseite als Vorlage benutzen
 WEBSITE_ALIASALT=Zusätzliche Seitennamen / Aliase
 WEBSITE_CSS_URL=URL zu externer CSS Datei
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 ViewSiteInNewTab=Webauftritt in neuem Tab anzeigen
 SetAsHomePage=Als Startseite definieren
 WebsiteAccounts=Webseitenkonten
diff --git a/htdocs/langs/de_DE/admin.lang b/htdocs/langs/de_DE/admin.lang
index 77a3d519e21..6ae42df9c91 100644
--- a/htdocs/langs/de_DE/admin.lang
+++ b/htdocs/langs/de_DE/admin.lang
@@ -53,6 +53,7 @@ InternalUser=Interner Benutzer
 ExternalUser=Externer Benutzer
 InternalUsers=Interne Benutzer
 ExternalUsers=Externe Benutzer
+UserInterface=User interface
 GUISetup=Benutzeroberfläche
 SetupArea=Einstellungen
 UploadNewTemplate=Neue Druckvorlage(n) hochladen
@@ -1260,8 +1261,8 @@ YourPHPDoesNotHaveSSLSupport=Ihre PHP-Konfiguration unterstützt keine SSL-Versc
 DownloadMoreSkins=Weitere grafische Oberflächen herunterladen
 SimpleNumRefModelDesc=Gibt die Referenznummer im Format %syymm-nnnn zurück, wobei yy das Jahr, mm der Monat und nnnn eine fortlaufende automatisch inkrementierende Nummer ohne Zurücksetzen ist
 SimpleNumRefNoDateModelDesc=Gibt die Referenznummer im Format %s-nnnn zurück, wobei nnnn eine fortlaufende automatisch inkrementierende Nummer ohne Zurücksetzen ist
-ShowProfIdInAddress=Erweiterte Kundendaten im Adressfeld anzeigen
-ShowVATIntaInAddress=Umsatzsteuer-ID im Adressfeld ausblenden
+ShowProfIdInAddress=Show professional ID with addresses
+ShowVATIntaInAddress=Hide intra-Community VAT number
 TranslationUncomplete=Teilweise Übersetzung
 MAIN_DISABLE_METEO=Wetteransicht deaktivieren
 MeteoStdMod=Standart Modus
@@ -1778,7 +1779,7 @@ ClickToDialSetup=Click-to-Dial Moduleinstellungen
 ClickToDialUrlDesc=URL, die bei einem Klick auf das Telefonsymbol aufgerufen werden soll. In dieser URL können die folgenden Tags verwendet werden: <br><b>__PHONETO__</b> Telefonnummer des Angerufenen<br><b>__PHONEFROM__</b> Telefonnummer des Anrufers (Ihre)<br><b>__LOGIN__</b> Ihren Benutzernamen für Click-to-Dial (siehe Benutzerdaten)<br><b>__PASS__</b> Ihr Click-to-Dial-Passwort (siehe Benutzerdaten).
 ClickToDialDesc=Dieses Modul formatiert Telefonnummern als direkt anklickbare Links auf Desktop-PCs. Ein Klick wählt die Nummer. Damit kann ein Telefonanruf direkt gestartet werden, wenn Softphones oder SIP-Telefone verwendet werden. Hinweis: Auf Smartphones sind Telefonnummern immer anklickbar.
 ClickToDialUseTelLink=Nur einen Link "Tel:" bei Telefonnummern verwenden
-ClickToDialUseTelLinkDesc=Benutzen Sie diese Methode, wenn Ihre Benutzer ein Software-Telefon oder ein Interface für ein Telefon auf demselben Computer wie der Browser installiert haben. Dieses Telefon/Interface wird aufgerufen, wenn Sie auf einen Link klicken, der mit "tel:" beginnt. Wenn Sie eine vollständige Server-Lösung nutzen wollen (ohne lokale Software-Installation), wählen Sie hier "Nein" und füllen das nächste Feld.
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface, installed on the same computer as the browser, and called when you click on a link starting with "tel:" in your browser. If you need link that start with "sip:" or a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Kasse
 CashDeskSetup=Kassenmoduleinstellungen
@@ -2133,7 +2134,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=In Ihrem Stammverzeichnis wurden keine beschreibbaren Dateien oder Verzeichnisse der gängigen Programme gefunden (gut).
 RecommendedValueIs=Empfohlen: %s
-NotRecommended=Nicht empfohlen
+Recommended=Empfohlen
+NotRecommended=Not recommended
 ARestrictedPath=Ein eingeschränkter Pfad
 CheckForModuleUpdate=Suchen Sie nach Updates für externe Module
 CheckForModuleUpdateHelp=Diese Aktion stellt eine Verbindung zu Editoren externer Module her, um zu überprüfen, ob eine neue Version verfügbar ist.
@@ -2144,3 +2146,5 @@ YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You s
 RandomlySelectedIfSeveral=Randomly selected if several pictures are available
 DatabasePasswordObfuscated=Database password is obfuscated in conf file
 DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
+APIsAreNotEnabled=APIs modules are not enabled
+YouShouldSetThisToOff=You should set this to 0 or off
diff --git a/htdocs/langs/de_DE/banks.lang b/htdocs/langs/de_DE/banks.lang
index a50b175a723..33a989f0409 100644
--- a/htdocs/langs/de_DE/banks.lang
+++ b/htdocs/langs/de_DE/banks.lang
@@ -115,7 +115,7 @@ TransferTo=bis
 TransferFromToDone=Eine Überweisung <b>von %s nach %s iHv %s %s</b> wurde verbucht.
 CheckTransmitter=Absenderadresse
 ValidateCheckReceipt=Rechnungseingang gültig?
-ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes will be possible once validated.
 DeleteCheckReceipt=Wollen Sie diesen Rechnungseingang löschen?
 ConfirmDeleteCheckReceipt=Sind Sie sicher, dass Sie diesen Rechnungseingang löschen wollen?
 BankChecks=Bankschecks
diff --git a/htdocs/langs/de_DE/boxes.lang b/htdocs/langs/de_DE/boxes.lang
index 642ab786f41..090225768c2 100644
--- a/htdocs/langs/de_DE/boxes.lang
+++ b/htdocs/langs/de_DE/boxes.lang
@@ -91,8 +91,8 @@ BoxTitleLatestModifiedSupplierOrders=zuletzt bearbeitete Lieferantenbestellungen
 BoxTitleLastModifiedCustomerBills=Zuletzt bearbeitete Kundenrechnungen (maximal %s)
 BoxTitleLastModifiedCustomerOrders=Zuletzt bearbeitete Kundenaufträge (maximal %s)
 BoxTitleLastModifiedPropals=Zuletzt bearbeitete Angebote (maximal %s)
-BoxTitleLatestModifiedJobPositions=Neueste %s geänderte Jobs
-BoxTitleLatestModifiedCandidatures=Neueste %s modifizierte Kandidaturen
+BoxTitleLatestModifiedJobPositions=Latest %s modified job positions
+BoxTitleLatestModifiedCandidatures=Latest %s modified job applications
 ForCustomersInvoices=Kundenrechnungen
 ForCustomersOrders=Kundenaufträge
 ForProposals=Angebote
diff --git a/htdocs/langs/de_DE/cashdesk.lang b/htdocs/langs/de_DE/cashdesk.lang
index 0a9f317661b..cbb62861688 100644
--- a/htdocs/langs/de_DE/cashdesk.lang
+++ b/htdocs/langs/de_DE/cashdesk.lang
@@ -127,4 +127,4 @@ AllowDelayedPayment=Verzögerte Zahlung zulassen
 PrintPaymentMethodOnReceipts=Zahlungsmethode auf Tickets | Quittungen drucken
 WeighingScale=Waage
 ShowPriceHT = Display the column with the price excluding tax (on screen)
-ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on the receipt)
diff --git a/htdocs/langs/de_DE/errors.lang b/htdocs/langs/de_DE/errors.lang
index c3aebb6bf76..c48032ccb9c 100644
--- a/htdocs/langs/de_DE/errors.lang
+++ b/htdocs/langs/de_DE/errors.lang
@@ -301,3 +301,4 @@ ErrorActionCommPropertyUserowneridNotDefined=Der Besitzer des Benutzers ist erfo
 ErrorActionCommBadType=Der ausgewählte Ereignistyp (ID: %n, Code: %s) ist im Wörterbuch für den Ereignistyp nicht vorhanden
 CheckVersionFail=Versionsprüfung fehlgeschlagen
 ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
+ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
diff --git a/htdocs/langs/de_DE/eventorganization.lang b/htdocs/langs/de_DE/eventorganization.lang
index f7f265a2e8b..1475e171e88 100644
--- a/htdocs/langs/de_DE/eventorganization.lang
+++ b/htdocs/langs/de_DE/eventorganization.lang
@@ -86,6 +86,7 @@ DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Sicherer Schlüssel des öffentlichen Registrierungslinks zu einer Konferenz
 SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
 SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
+NbVotes=Number of votes
 #
 # Status
 #
@@ -115,6 +116,9 @@ EvntOrgDuration = This conference starts on %s and ends on %s.
 ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
 BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
 EventType = Ereignistyp
+LabelOfBooth=Booth label
+LabelOfconference=Conference label
+ConferenceIsNotConfirmed=Subcription not available, conference is not confirmed yet
 
 #
 # Vote page
diff --git a/htdocs/langs/de_DE/install.lang b/htdocs/langs/de_DE/install.lang
index 3c46aa0f189..4cdd7a6f0d5 100644
--- a/htdocs/langs/de_DE/install.lang
+++ b/htdocs/langs/de_DE/install.lang
@@ -206,6 +206,7 @@ MigrationUserPhotoPath=Migration der Foto-Verzeichnispfade für Benutzer
 MigrationFieldsSocialNetworks=Migration von Benutzerfeldern in sozialen Netzwerken (%s)
 MigrationReloadModule=Neu Laden von Modul %s
 MigrationResetBlockedLog=Modul BlockedLog für v7 Algorithmus zurücksetzen
+MigrationImportOrExportProfiles=Migration of import or export profiles (%s)
 ShowNotAvailableOptions=Nicht verfügbare Optionen anzeigen
 HideNotAvailableOptions=Nicht verfügbare Optionen ausblenden
 ErrorFoundDuringMigration=Während des Migrationsprozesses wurden Fehler gemeldet. Der nächste Schritt ist nicht verfügbar. Um Fehler zu ignorieren, können Sie <a href="%s"> hier klicken </a>, aber die Anwendung oder einige Funktionen funktionieren möglicherweise nicht richtig, bis die Fehler behoben sind.
diff --git a/htdocs/langs/de_DE/interventions.lang b/htdocs/langs/de_DE/interventions.lang
index 0822f3dda20..b380841532e 100644
--- a/htdocs/langs/de_DE/interventions.lang
+++ b/htdocs/langs/de_DE/interventions.lang
@@ -6,7 +6,7 @@ NewIntervention=Neuer Serviceauftrag
 AddIntervention=Serviceauftrag erstellen
 ChangeIntoRepeatableIntervention=Wechseln Sie zu wiederholbaren Serviceauftrag
 ListOfInterventions=Liste der Serviceaufträge
-ActionsOnFicheInter=Aktionen zum Serviceauftrag
+ActionsOnFicheInter=Ereignisse zu diesem Serviceauftrag
 LastInterventions=%s neueste Serviceaufträge
 AllInterventions=Alle Serviceaufträge
 CreateDraftIntervention=Entwurf erstellen
@@ -64,5 +64,5 @@ InterLineDuration=Serviceauftragsposition Dauer
 InterLineDesc=Serviceauftragsposition Beschreibung
 RepeatableIntervention=Vorlage der Intervention
 ToCreateAPredefinedIntervention=Für eine vordefinierte oder wiederkehrende Intervention erstellen Sie zunächst eine gemeinsame Intervention und konvertieren diese dann in eine Vorlage
-Reopen=entwerfen
+Reopen=wiedereröffnen
 ConfirmReopenIntervention=Möchten Sie den Serviceauftrag <b> %s </b> wieder öffnen?
diff --git a/htdocs/langs/de_DE/productbatch.lang b/htdocs/langs/de_DE/productbatch.lang
index 3e635883447..97ae8d794df 100644
--- a/htdocs/langs/de_DE/productbatch.lang
+++ b/htdocs/langs/de_DE/productbatch.lang
@@ -26,12 +26,10 @@ ShowLogOfMovementIfLot=Bewegungen für diese Chargen-/Seriennummer anzeigen
 StockDetailPerBatch=Lagerdetail nach Chargen
 SerialNumberAlreadyInUse=Die Seriennummer %s wird bereits für das Produkt %s verwendet
 TooManyQtyForSerialNumber=Sie können nur ein Produkt %s für die Seriennummer %s haben
-BatchLotNumberingModules=Optionen für die automatische Generierung von Chargenprodukten, die über Lose verwaltet werden
-BatchSerialNumberingModules=Optionen für die automatische Generierung von Chargenprodukten, die über Seriennummern verwaltet werden
 ManageLotMask=Benutzerdefinierte Maske
-CustomMasks=Fügt eine Option zum Definieren der Maske in der Produktkarte hinzu
-LotProductTooltip=Fügt der Produktkarte eine Option zum Definieren einer dedizierten Chargennummernmaske hinzu
-SNProductTooltip=Fügt der Produktkarte eine Option zum Definieren einer dedizierten Seriennummernmaske hinzu
+CustomMasks=Option to define a different numbering mask for each product
+BatchLotNumberingModules=Numbering rule for automatic generation of lot number
+BatchSerialNumberingModules=Numbering rule for automatic generation of serial number (for products with property 1 unique lot/serial for each product)
 QtyToAddAfterBarcodeScan=Menge, die für jeden gescannten Barcode / jedes Los / jede Serienummer hinzugefügt werden muss
 LifeTime=Life span (in days)
 EndOfLife=End of life
diff --git a/htdocs/langs/de_DE/products.lang b/htdocs/langs/de_DE/products.lang
index 2d21211cc54..9901646fce5 100644
--- a/htdocs/langs/de_DE/products.lang
+++ b/htdocs/langs/de_DE/products.lang
@@ -277,7 +277,7 @@ PriceByCustomer=unterschiedliche Preise für jeden Kunden
 PriceCatalogue=Ein einziger Preis pro Produkt/Leistung
 PricingRule=Regeln für die Verkaufspreise
 AddCustomerPrice=Preis je Kunde hinzufügen
-ForceUpdateChildPriceSoc=Lege den gleichen Preis für Kunden-Tochtergesellschaften fest
+ForceUpdateChildPriceSoc=Set same price on customer's subsidiaries
 PriceByCustomerLog=Protokoll der vorangegangenen Kundenpreise
 MinimumPriceLimit=Mindestpreis darf nicht kleiner als %s sein
 MinimumRecommendedPrice=minimal empfohlener Preis: %s
@@ -296,6 +296,7 @@ ComposedProductIncDecStock=Erhöhen/Verringern des Lagerbestands bei verknüpfte
 ComposedProduct=Unterprodukte
 MinSupplierPrice=Minimaler Kaufpreis
 MinCustomerPrice=Minimaler Verkaufspreis
+NoDynamicPrice=No dynamic price
 DynamicPriceConfiguration=Dynamische Preis Konfiguration
 DynamicPriceDesc=Sie können mathematische Formeln definieren, um Kunden- oder Lieferantenpreise zu berechnen. Solche Formeln können alle mathematischen Operatoren, einige Konstanten und Variablen verwenden. Hier können Sie die Variablen definieren, die Sie verwenden möchten. Wenn die Variable automatisch aktualisiert werden muss, können Sie die externe URL definieren, damit Dolibarr den Wert automatisch aktualisiert.
 AddVariable=Variable hinzufügen
diff --git a/htdocs/langs/de_DE/salaries.lang b/htdocs/langs/de_DE/salaries.lang
index 412c815f3e1..6cf12b5cf41 100644
--- a/htdocs/langs/de_DE/salaries.lang
+++ b/htdocs/langs/de_DE/salaries.lang
@@ -17,8 +17,8 @@ TJM=Durchschnittlicher Tagessatz
 CurrentSalary=aktueller  Lohn
 THMDescription=Dieser Wert kann verwendet werden, um die Kosten für die verwendete 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=Letzte %s Lohnzahlungen
-AllSalaries=Alle Gehaltszahlungen
+LastSalaries=Latest %s salaries
+AllSalaries=All salaries
 SalariesStatistics=Statistik Gehälter
-# Export
 SalariesAndPayments=Gehälter und Gehaltszahlungen
+ConfirmDeleteSalaryPayment=Do you want to delete this salary payment ?
diff --git a/htdocs/langs/de_DE/ticket.lang b/htdocs/langs/de_DE/ticket.lang
index 8743885fcf1..ca9ae4de706 100644
--- a/htdocs/langs/de_DE/ticket.lang
+++ b/htdocs/langs/de_DE/ticket.lang
@@ -34,7 +34,8 @@ TicketDictResolution=Ticket-Auflösung
 
 TicketTypeShortCOM=Anfrage an Verkauf
 TicketTypeShortHELP=Erbitte funktionale Hilfestellung
-TicketTypeShortISSUE=Aspekt, Fehler oder Problem
+TicketTypeShortISSUE=Issue or bug
+TicketTypeShortPROBLEM=Problem
 TicketTypeShortREQUEST=Änderungs- oder Erweiterungsanforderung
 TicketTypeShortPROJET=Projekt
 TicketTypeShortOTHER=Sonstige
@@ -54,14 +55,15 @@ TypeContact_ticket_internal_SUPPORTTEC=Zugewiesener Benutzer
 TypeContact_ticket_external_SUPPORTCLI=Kundenkontakt / Tracking
 TypeContact_ticket_external_CONTRIBUTOR=Externer Mitarbeiter
 
-OriginEmail=E-Mail Absender
+OriginEmail=Reporter Email
 Notify_TICKET_SENTBYMAIL=Ticket Nachricht per E-Mail versenden
 
 # Status
 Read=Lesen
 Assigned=Zugewiesen
 InProgress=in Bearbeitung
-NeedMoreInformation=Auf Information warten
+NeedMoreInformation=Waiting for reporter feedback
+NeedMoreInformationShort=Waiting for feedback
 Answered=Beantwortet
 Waiting=Wartend
 Closed=Geschlossen
@@ -160,7 +162,7 @@ CreatedBy=Erstellt durch
 NewTicket=Ticket erstellen
 SubjectAnswerToTicket=Ticketantwort
 TicketTypeRequest=Anfrageart
-TicketCategory=Gruppe
+TicketCategory=Ticket categorization
 SeeTicket=Ticket zeigen
 TicketMarkedAsRead=Ticket als gelesen markiert
 TicketReadOn=Gelesen um
@@ -211,6 +213,7 @@ TicketMessageHelp=Nur dieser Text wird in der Mitteilungsliste auf der Ticketkar
 TicketMessageSubstitutionReplacedByGenericValues=Ersetzungsvariablen werden durch generische Werte ersetzt.
 TimeElapsedSince=Seit
 TicketTimeToRead=Zeit bis das Ticket gelesen wurde
+TicketTimeElapsedBeforeSince=Time elapsed before / since
 TicketContacts=Kontakte zum Ticket
 TicketDocumentsLinked=Dokumente zum Ticket
 ConfirmReOpenTicket=Dieses Ticket wirklich wieder öffnen?
diff --git a/htdocs/langs/de_DE/users.lang b/htdocs/langs/de_DE/users.lang
index 09aafd48c95..4c76a0511c8 100644
--- a/htdocs/langs/de_DE/users.lang
+++ b/htdocs/langs/de_DE/users.lang
@@ -97,8 +97,8 @@ LoginToCreate=Zu erstellende Anmeldung
 NameToCreate=Name des neuen Partners
 YourRole=Ihre Rolle
 YourQuotaOfUsersIsReached=Ihr Kontingent aktiver Benutzer ist erreicht
-NbOfUsers=Anzahl Benutzer
-NbOfPermissions=Anzahl Berechtigungen
+NbOfUsers=Number of users
+NbOfPermissions=Number of permissions
 DontDowngradeSuperAdmin=Nur ein SuperAdmin kann einen SuperAdmin downgraden
 HierarchicalResponsible=Vorgesetzter
 HierarchicView=Hierarchische Ansicht
diff --git a/htdocs/langs/de_DE/website.lang b/htdocs/langs/de_DE/website.lang
index d0d0c79f4b2..815aa445fc6 100644
--- a/htdocs/langs/de_DE/website.lang
+++ b/htdocs/langs/de_DE/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Website hinzufügen
 Webpage=Webseite / Container
 AddPage=Seite / Container hinzufügen
 PageContainer=Seite
-PreviewOfSiteNotYetAvailable=Vorschau ihrer Webseite <strong>%s</strong> noch nicht verfügbar. Zuerst muss eine '<strong>Webseiten-Vorlage importiert</strong>' oder '<strong>Seite / Container hinzugefügt</strong>' werden.
+PreviewOfSiteNotYetAvailable=The preview of your website <strong>%s</strong> is not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Die Seite mit id %s hat keinen Inhalt oder die Cachedatei .tpl.php wurde gelöscht. Editieren Sie den Inhalt der Seite um das Problem zu lösen.
 SiteDeleted=Website '%s' gelöscht
 PageContent=Seite / Container 
diff --git a/htdocs/langs/el_CY/admin.lang b/htdocs/langs/el_CY/admin.lang
index e2d4c78a52e..74ee870f906 100644
--- a/htdocs/langs/el_CY/admin.lang
+++ b/htdocs/langs/el_CY/admin.lang
@@ -1,3 +1,2 @@
 # Dolibarr language file - Source file is en_US - admin
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/el_CY/products.lang b/htdocs/langs/el_CY/products.lang
deleted file mode 100644
index e0628dbec00..00000000000
--- a/htdocs/langs/el_CY/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
diff --git a/htdocs/langs/el_CY/ticket.lang b/htdocs/langs/el_CY/ticket.lang
deleted file mode 100644
index 82e110b1ca4..00000000000
--- a/htdocs/langs/el_CY/ticket.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - ticket
-TicketTypeShortISSUE=Issue, bug or problem
-OriginEmail=Email source
-NeedMoreInformation=Waiting for information
-TicketCategory=Group
diff --git a/htdocs/langs/el_CY/users.lang b/htdocs/langs/el_CY/users.lang
deleted file mode 100644
index 4a412122b08..00000000000
--- a/htdocs/langs/el_CY/users.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - users
-NbOfUsers=No. of users
-NbOfPermissions=No. of permissions
diff --git a/htdocs/langs/el_CY/website.lang b/htdocs/langs/el_CY/website.lang
deleted file mode 100644
index 910cff6b702..00000000000
--- a/htdocs/langs/el_CY/website.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - website
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
diff --git a/htdocs/langs/el_GR/admin.lang b/htdocs/langs/el_GR/admin.lang
index ce655c6f539..c2cdca932cc 100644
--- a/htdocs/langs/el_GR/admin.lang
+++ b/htdocs/langs/el_GR/admin.lang
@@ -53,6 +53,7 @@ InternalUser=Εσωτερικός χρήστης
 ExternalUser=Εξωτερικός χρήστης
 InternalUsers=Εσωτερικοί χρήστες
 ExternalUsers=Εξωτερικοί χρήστες
+UserInterface=User interface
 GUISetup=Εμφάνιση
 SetupArea=Ρύθμιση
 UploadNewTemplate=Μεταφόρτωση νέου(-ων) προτύπου(-ων)
@@ -1260,8 +1261,8 @@ YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP
 DownloadMoreSkins=More skins to download
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
-ShowProfIdInAddress=Εμφάνιση επαγγελματικής ταυτότητας με διευθύνσεις
-ShowVATIntaInAddress=Απόκρυψη ενδοκοινοτικού αριθμού ΦΠΑ με διευθύνσεις
+ShowProfIdInAddress=Show professional ID with addresses
+ShowVATIntaInAddress=Hide intra-Community VAT number
 TranslationUncomplete=Ημιτελής μεταγλώττιση
 MAIN_DISABLE_METEO=Απενεργοποιήστε τη μετεωρολογική άποψη
 MeteoStdMod=Τυπική λειτουργία
@@ -1778,7 +1779,7 @@ ClickToDialSetup=Click To Dial module setup
 ClickToDialUrlDesc=Η διεύθυνση URL ονομάζεται όταν γίνεται κλικ στο τηλέφωνο picto. Στη διεύθυνση URL, μπορείτε να χρησιμοποιήσετε ετικέτες <br> <b>__PHONETO__</b> που θα αντικατασταθεί με τον αριθμό τηλεφώνου του ατόμου που καλεί <br> <b>__PHONEFROM__</b> που θα αντικατασταθεί με τον αριθμό τηλεφώνου του καλούντος (του δικού σας) <br> <b>__LOGIN__</b> που θα αντικατασταθεί με σύνδεση με κλικ (καθορισμένη στην κάρτα χρήστη) <br> <b>__PASS__</b> που θα αντικατασταθεί με κωδικό πρόσβασης (που ορίζεται στην κάρτα χρήστη).
 ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Χρησιμοποιήστε μόνο έναν σύνδεσμο &quot;τηλ::&quot; σε αριθμούς τηλεφώνου
-ClickToDialUseTelLinkDesc=Χρησιμοποιήστε αυτή τη μέθοδο εάν οι χρήστες σας έχουν ένα λογισμικό softphone ή μια διασύνδεση λογισμικού που είναι εγκατεστημένος στον ίδιο υπολογιστή με το πρόγραμμα περιήγησης και καλούνται όταν κάνετε κλικ σε ένα σύνδεσμο στο πρόγραμμα περιήγησης που ξεκινάει με &quot;tel:&quot;. Αν χρειάζεστε μια λύση πλήρους διακομιστή (δεν χρειάζεται τοπική εγκατάσταση λογισμικού), πρέπει να το ορίσετε σε &quot;Όχι&quot; και να συμπληρώσετε το επόμενο πεδίο.
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface, installed on the same computer as the browser, and called when you click on a link starting with "tel:" in your browser. If you need link that start with "sip:" or a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Σημείο πώλησης
 CashDeskSetup=Λειτουργία μονάδας σημείου πώλησης
@@ -2133,7 +2134,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
-NotRecommended=Not recommanded
+Recommended=Προτεινόμενη
+NotRecommended=Not recommended
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
@@ -2144,3 +2146,5 @@ YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You s
 RandomlySelectedIfSeveral=Randomly selected if several pictures are available
 DatabasePasswordObfuscated=Database password is obfuscated in conf file
 DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
+APIsAreNotEnabled=APIs modules are not enabled
+YouShouldSetThisToOff=You should set this to 0 or off
diff --git a/htdocs/langs/el_GR/banks.lang b/htdocs/langs/el_GR/banks.lang
index ba2203efda7..c86cc9b45a9 100644
--- a/htdocs/langs/el_GR/banks.lang
+++ b/htdocs/langs/el_GR/banks.lang
@@ -115,7 +115,7 @@ TransferTo=Προς
 TransferFromToDone=Η μεταφορά από <b>%s</b> στον <b>%s</b> του <b>%s</b> %s έχει καταγραφεί.
 CheckTransmitter=Αποστολέας
 ValidateCheckReceipt=Επικύρωση αυτής της απόδειξης παραλαβής επιταγής;
-ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes will be possible once validated.
 DeleteCheckReceipt=Διαγραφή απόδειξης παραλαβής επιταγής;
 ConfirmDeleteCheckReceipt=Είστε σίγουροι πως θέλετε να διαγράψετε αυτή την απόδειξη παραλαβής επιταγής;
 BankChecks=Τραπεζικές Επιταγές
diff --git a/htdocs/langs/el_GR/boxes.lang b/htdocs/langs/el_GR/boxes.lang
index 500ad99dc8d..e9b326ddb64 100644
--- a/htdocs/langs/el_GR/boxes.lang
+++ b/htdocs/langs/el_GR/boxes.lang
@@ -91,8 +91,8 @@ BoxTitleLatestModifiedSupplierOrders=Παραγγελίες προμηθευτή
 BoxTitleLastModifiedCustomerBills=Τιμολόγια πελατών: τροποποιήθηκε τελευταία %s
 BoxTitleLastModifiedCustomerOrders=Παραγγελίες πώλησης: τελευταία τροποποίηση %s
 BoxTitleLastModifiedPropals=Τελευταίες τροποποιημένες προτάσεις %s
-BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
-BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
+BoxTitleLatestModifiedJobPositions=Latest %s modified job positions
+BoxTitleLatestModifiedCandidatures=Latest %s modified job applications
 ForCustomersInvoices=Τιμολόγια Πελάτη
 ForCustomersOrders=Παραγγελίες πελατών
 ForProposals=Προσφορές
diff --git a/htdocs/langs/el_GR/cashdesk.lang b/htdocs/langs/el_GR/cashdesk.lang
index 1e52c279281..489d7f18694 100644
--- a/htdocs/langs/el_GR/cashdesk.lang
+++ b/htdocs/langs/el_GR/cashdesk.lang
@@ -127,4 +127,4 @@ AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
 ShowPriceHT = Display the column with the price excluding tax (on screen)
-ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on the receipt)
diff --git a/htdocs/langs/el_GR/errors.lang b/htdocs/langs/el_GR/errors.lang
index 4829ed170db..9ccbe17002b 100644
--- a/htdocs/langs/el_GR/errors.lang
+++ b/htdocs/langs/el_GR/errors.lang
@@ -301,3 +301,4 @@ ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
 ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
+ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
diff --git a/htdocs/langs/el_GR/eventorganization.lang b/htdocs/langs/el_GR/eventorganization.lang
index f107314a831..29dc08af904 100644
--- a/htdocs/langs/el_GR/eventorganization.lang
+++ b/htdocs/langs/el_GR/eventorganization.lang
@@ -86,6 +86,7 @@ DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
 SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
 SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
+NbVotes=Number of votes
 #
 # Status
 #
@@ -115,6 +116,9 @@ EvntOrgDuration = This conference starts on %s and ends on %s.
 ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
 BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
 EventType = Τύπος συμβάντος
+LabelOfBooth=Booth label
+LabelOfconference=Conference label
+ConferenceIsNotConfirmed=Subcription not available, conference is not confirmed yet
 
 #
 # Vote page
diff --git a/htdocs/langs/el_GR/install.lang b/htdocs/langs/el_GR/install.lang
index c08d1890daa..d9799c7d351 100644
--- a/htdocs/langs/el_GR/install.lang
+++ b/htdocs/langs/el_GR/install.lang
@@ -206,6 +206,7 @@ MigrationUserPhotoPath=Μετανάστευση φωτογραφικών δια
 MigrationFieldsSocialNetworks=Μετεγκατάσταση χρηστών πεδίων κοινωνικών δικτύων (%s)
 MigrationReloadModule=Επαναφόρτωση ενθεμάτων %s
 MigrationResetBlockedLog=Επαναφορά της μονάδας BlockedLog για τον αλγόριθμο v7
+MigrationImportOrExportProfiles=Migration of import or export profiles (%s)
 ShowNotAvailableOptions=Εμφάνιση μη διαθέσιμων επιλογών
 HideNotAvailableOptions=Απόκρυψη μη διαθέσιμων επιλογών
 ErrorFoundDuringMigration=Παρουσιάστηκε σφάλμα κατά τη διάρκεια της διαδικασίας μετάβασης, επομένως το επόμενο βήμα δεν είναι διαθέσιμο. Για να αγνοήσετε τα σφάλματα, μπορείτε να <a href="%s">κάνετε κλικ εδώ</a> , αλλά η εφαρμογή ή ορισμένες λειτουργίες ενδέχεται να μην λειτουργούν σωστά μέχρι να επιλυθούν τα σφάλματα.
diff --git a/htdocs/langs/el_GR/interventions.lang b/htdocs/langs/el_GR/interventions.lang
index f0b5807ab17..a354f293fd4 100644
--- a/htdocs/langs/el_GR/interventions.lang
+++ b/htdocs/langs/el_GR/interventions.lang
@@ -41,9 +41,7 @@ InterventionsArea=Περιοχή παρεμβάσεων
 DraftFichinter=Πρόχειρες παρεμβάσεις
 LastModifiedInterventions=Latest %s modified interventions
 FichinterToProcess=Interventions to process
-##### Types de contacts #####
 TypeContact_fichinter_external_CUSTOMER=Σε συνέχεια επαφή με τον πελάτη
-# Modele numérotation
 PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
 PrintProductsOnFichinterDetails=παρεμβάσεις που προέρχονται από παραγγελίες
 UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
@@ -53,7 +51,6 @@ InterventionStatistics=Στατιστικά παρεμβάσεων
 NbOfinterventions=Αριθ. Καρτών παρέμβασης
 NumberOfInterventionsByMonth=Αριθμός καρτών παρέμβασης ανά μήνα (ημερομηνία επικύρωσης)
 AmountOfInteventionNotIncludedByDefault=Το ποσό της παρέμβασης δεν συμπεριλαμβάνεται εξ ορισμού στο κέρδος (στις περισσότερες περιπτώσεις, τα φύλλα εργασίας χρησιμοποιούνται για τον υπολογισμό του χρόνου που δαπανάται). Προσθέστε την επιλογή PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT σε 1 στο σπίτι-setup-άλλη για να τις συμπεριλάβετε.
-##### Exports #####
 InterId=Κωδ παρέμβασης
 InterRef=Αναφ παρέμβασης
 InterDateCreation=Ημερομηνία δημιουργίας παρέμβασης
@@ -65,3 +62,7 @@ InterLineId=Κωδ γραμμής παρέμβασης
 InterLineDate=Ημερομηνία γραμμής παρέμβασης
 InterLineDuration=Διάρκεια γραμμής παρέμβασης
 InterLineDesc=Περιγραφή γραμμής παρέμβασης
+RepeatableIntervention=Πρότυπο παρέμβασης
+ToCreateAPredefinedIntervention=Για να δημιουργήσετε μια προκαθορισμένη ή επαναλαμβανόμενη παρέμβαση, δημιουργήστε μια κοινή παρέμβαση και μετατρέψτε την σε πρότυπο παρέμβασης
+Reopen=Reopen
+ConfirmReopenIntervention=Are you sure you want to open back the intervention <b>%s</b>?
diff --git a/htdocs/langs/el_GR/productbatch.lang b/htdocs/langs/el_GR/productbatch.lang
index b48a31dacba..476209b3162 100644
--- a/htdocs/langs/el_GR/productbatch.lang
+++ b/htdocs/langs/el_GR/productbatch.lang
@@ -26,12 +26,10 @@ ShowLogOfMovementIfLot=Εμφάνιση αρχείου κινήσεων για 
 StockDetailPerBatch=Ανάλυση αποθέματος ανά παρτίδα
 SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
-BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
-BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
 ManageLotMask=Custom mask
-CustomMasks=Adds an option to define mask in the product card
-LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
-SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+CustomMasks=Option to define a different numbering mask for each product
+BatchLotNumberingModules=Numbering rule for automatic generation of lot number
+BatchSerialNumberingModules=Numbering rule for automatic generation of serial number (for products with property 1 unique lot/serial for each product)
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
diff --git a/htdocs/langs/el_GR/products.lang b/htdocs/langs/el_GR/products.lang
index 9c45dbfb912..0d3ad72b956 100644
--- a/htdocs/langs/el_GR/products.lang
+++ b/htdocs/langs/el_GR/products.lang
@@ -277,7 +277,7 @@ PriceByCustomer=Διαφορετικές τιμές για κάθε πελάτη
 PriceCatalogue=Μια ενιαία τιμή πώλησης ανά προϊόν / υπηρεσία
 PricingRule=Κανόνες για τις τιμές πώλησης
 AddCustomerPrice=Προσθήκη τιμής ανά πελάτη
-ForceUpdateChildPriceSoc=Ορισμός ίδιας τιμής για τις θυγατρικές του πελάτη
+ForceUpdateChildPriceSoc=Set same price on customer's subsidiaries
 PriceByCustomerLog=Καταγραφή προηγούμενων τιμών πελατών
 MinimumPriceLimit=Η ελάχιστη τιμή δεν μπορεί να είναι χαμηλότερη από %s
 MinimumRecommendedPrice=Η ελάχιστη συνιστώμενη τιμή είναι: %s
@@ -296,6 +296,7 @@ ComposedProductIncDecStock=Αύξηση/Μείωση αποθεμάτων στη
 ComposedProduct=Παιδικά προϊόντα
 MinSupplierPrice=Ελάχιστη τιμή αγοράς
 MinCustomerPrice=Ελάχιστη τιμή πώλησης
+NoDynamicPrice=No dynamic price
 DynamicPriceConfiguration=Διαμόρφωση δυναμικών τιμών
 DynamicPriceDesc=Μπορείτε να ορίσετε μαθηματικούς τύπους για τον υπολογισμό των τιμών των πελατών ή των προμηθευτών. Τέτοιοι τύποι μπορούν να χρησιμοποιήσουν όλους τους μαθηματικούς χειριστές, κάποιες σταθερές και μεταβλητές. Μπορείτε να ορίσετε εδώ τις μεταβλητές που θέλετε να χρησιμοποιήσετε. Αν η μεταβλητή χρειάζεται αυτόματη ενημέρωση, μπορείτε να ορίσετε την εξωτερική διεύθυνση URL ώστε να επιτρέψει στο Dolibarr να ενημερώσει αυτόματα την τιμή.
 AddVariable=Προσθήκη μεταβλητής
@@ -340,7 +341,7 @@ ProductSheet=Φύλλο προϊόντος
 ServiceSheet=Φύλλο εξυπηρέτησης
 PossibleValues=Πιθανές τιμές
 GoOnMenuToCreateVairants=Πηγαίνετε στο μενού %s - %s για να προετοιμάσετε παραλλαγές χαρακτηριστικών (όπως χρώματα, μέγεθος, ...)
-UseProductFournDesc=Προσθέστε μια δυνατότητα για να ορίσετε τις περιγραφές των προϊόντων που ορίζονται από τους προμηθευτές εκτός από τις περιγραφές για τους πελάτες
+UseProductFournDesc=Add a feature to define the descriptions of products defined by the vendors in addition to descriptions for customers
 ProductSupplierDescription=Περιγραφή του πωλητή για το προϊόν
 UseProductSupplierPackaging=Χρησιμοποιήστε τη συσκευασία στις τιμές προμηθευτή (επανυπολογίστε τις ποσότητες σύμφωνα με τη συσκευασία που καθορίζεται στην τιμή προμηθευτή κατά την προσθήκη / ενημέρωση της γραμμής στα έγγραφα προμηθευτών)
 PackagingForThisProduct=Συσκευασία
diff --git a/htdocs/langs/el_GR/salaries.lang b/htdocs/langs/el_GR/salaries.lang
index d9c0fcbfd87..793e68f2826 100644
--- a/htdocs/langs/el_GR/salaries.lang
+++ b/htdocs/langs/el_GR/salaries.lang
@@ -1,21 +1,24 @@
 # Dolibarr language file - Source file is en_US - salaries
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
-SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Λογαριασμός λογιστικής που χρησιμοποιείται για τρίτους χρήστες
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=Ο αποκλειστικός λογαριασμός λογιστικής που ορίζεται στην κάρτα χρήστη θα χρησιμοποιηθεί μόνο για τη λογιστική της Subledger. Αυτός θα χρησιμοποιηθεί για το γενικό βιβλίο και ως προεπιλεγμένη τιμή της λογιστικής Subledger εάν δεν έχει καθοριστεί ο λογαριασμός λογιστικής για τον χρήστη.
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Λογαριασμός λογαριασμού από προεπιλογή για πληρωμές μισθών
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=By default, leave empty the option "Automatically create a total payment" when creating a Salary
 Salary=Mισθός
 Salaries=Μισθοί
-NewSalaryPayment=Νέα μισθοδοσία
-AddSalaryPayment=Add salary payment
+NewSalary=New salary
+NewSalaryPayment=New salary card
+AddSalaryPayment=Προσθήκη πληρωμής μισθοδοσίας
 SalaryPayment=Μισθός
 SalariesPayments=Πληρωμές μισθών
+SalariesPaymentsOf=Salaries payments of %s
 ShowSalaryPayment=Εμφάνιση μισθοδοσίας
-THM=Average hourly rate
-TJM=Average daily rate
+THM=Μέση ωριαία τιμή
+TJM=Μέση ημερήσια τιμή
 CurrentSalary=Τρέχον μισθός
-THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
-TJMDescription=This value is currently for information only and is not used for any calculation
-LastSalaries=Latest %s salary payments
-AllSalaries=All salary payments
-SalariesStatistics=Salary statistics
-# Export
-SalariesAndPayments=Salaries and payments
+THMDescription=Αυτή η τιμή μπορεί να χρησιμοποιηθεί για τον υπολογισμό του κόστους του χρόνου που καταναλώνεται σε ένα έργο που εισήχθησαν από τους χρήστες, εάν χρησιμοποιείται το project module
+TJMDescription=Αυτή η τιμή είναι προς ενημέρωση μόνο και δεν χρησιμοποιείται για υπολογισμό
+LastSalaries=Latest %s salaries
+AllSalaries=All salaries
+SalariesStatistics=Στατιστικά στοιχεία μισθών
+SalariesAndPayments=Μισθοί και πληρωμές
+ConfirmDeleteSalaryPayment=Do you want to delete this salary payment ?
diff --git a/htdocs/langs/el_GR/ticket.lang b/htdocs/langs/el_GR/ticket.lang
index ee794f77717..c9df30418ee 100644
--- a/htdocs/langs/el_GR/ticket.lang
+++ b/htdocs/langs/el_GR/ticket.lang
@@ -34,7 +34,8 @@ TicketDictResolution=Εισιτήριο - Ανάλυση
 
 TicketTypeShortCOM=Εμπορική ερώτηση
 TicketTypeShortHELP=Αίτημα για λειτουργική βοήθεια
-TicketTypeShortISSUE=Θέμα, σφάλμα ή πρόβλημα
+TicketTypeShortISSUE=Issue or bug
+TicketTypeShortPROBLEM=Problem
 TicketTypeShortREQUEST=Αίτημα αλλαγής ή βελτίωσης
 TicketTypeShortPROJET=Έργο
 TicketTypeShortOTHER=Άλλο
@@ -54,14 +55,15 @@ TypeContact_ticket_internal_SUPPORTTEC=Εκχωρημένος χρήστης
 TypeContact_ticket_external_SUPPORTCLI=Παρακολούθηση επαφών πελατών / συμβάντων
 TypeContact_ticket_external_CONTRIBUTOR=Εξωτερικός συνεργάτης
 
-OriginEmail=Πηγή ηλεκτρονικού ταχυδρομείου
+OriginEmail=Reporter Email
 Notify_TICKET_SENTBYMAIL=Στείλτε μήνυμα εισιτηρίου μέσω ηλεκτρονικού ταχυδρομείου
 
 # Status
 Read=Ανάγνωση
 Assigned=Ανατεθεί
 InProgress=Σε εξέλιξη
-NeedMoreInformation=Αναμονή για πληροφορίες
+NeedMoreInformation=Waiting for reporter feedback
+NeedMoreInformationShort=Waiting for feedback
 Answered=Απαντήθηκε
 Waiting=Αναμονή
 Closed=Έκλεισε
@@ -160,7 +162,7 @@ CreatedBy=Δημιουργήθηκε από
 NewTicket=Νέο εισιτήριο
 SubjectAnswerToTicket=Απάντηση εισιτηρίου
 TicketTypeRequest=Τύπος αιτήματος
-TicketCategory=Ομάδα
+TicketCategory=Ticket categorization
 SeeTicket=Δείτε εισιτήριο
 TicketMarkedAsRead=Το εισιτήριο έχει επισημανθεί ως αναγνωσμένο
 TicketReadOn=Συνέχισε να διαβάζεις
@@ -211,6 +213,7 @@ TicketMessageHelp=Μόνο αυτό το κείμενο θα αποθηκευτ
 TicketMessageSubstitutionReplacedByGenericValues=Οι μεταβλητές αντικατάστασης αντικαθίστανται από γενικές τιμές.
 TimeElapsedSince=Χρόνος που πέρασε από τότε
 TicketTimeToRead=Ο χρόνος που παρέμενε πριν διαβάσετε
+TicketTimeElapsedBeforeSince=Time elapsed before / since
 TicketContacts=Επαφές εισιτήριο
 TicketDocumentsLinked=Έγγραφα που συνδέονται με το εισιτήριο
 ConfirmReOpenTicket=Επιβεβαιώστε ξανανοίξτε αυτό το εισιτήριο;
diff --git a/htdocs/langs/el_GR/users.lang b/htdocs/langs/el_GR/users.lang
index 2591f46a45a..fead1a510bb 100644
--- a/htdocs/langs/el_GR/users.lang
+++ b/htdocs/langs/el_GR/users.lang
@@ -97,8 +97,8 @@ LoginToCreate=Login to create
 NameToCreate=Name of third party to create
 YourRole=Your roles
 YourQuotaOfUsersIsReached=Your quota of active users is reached !
-NbOfUsers=Αριθμός χρηστών
-NbOfPermissions=Αριθμός αδειών
+NbOfUsers=Number of users
+NbOfPermissions=Number of permissions
 DontDowngradeSuperAdmin=Μόνο μια superadmin μπορεί να προβεί στην ανακατάταξη ενός superadmin
 HierarchicalResponsible=Επόπτης
 HierarchicView=Ιεραρχική προβολή
diff --git a/htdocs/langs/el_GR/website.lang b/htdocs/langs/el_GR/website.lang
index 616aedcc45e..ad1a84479f3 100644
--- a/htdocs/langs/el_GR/website.lang
+++ b/htdocs/langs/el_GR/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Προσθήκη ιστοτόπου
 Webpage=Ιστοσελίδα / δοχείο
 AddPage=Προσθήκη σελίδας / δοχείου
 PageContainer=Σελίδα
-PreviewOfSiteNotYetAvailable=<strong>Δεν</strong> είναι ακόμα διαθέσιμη η προεπισκόπηση του ιστοτόπου σας <strong>%s</strong> . Πρέπει πρώτα να <strong>εισαγάγετε ένα πλήρες πρότυπο ιστότοπου</strong> ή απλά να <strong>προσθέσετε μια σελίδα / κοντέινερ</strong> .
+PreviewOfSiteNotYetAvailable=The preview of your website <strong>%s</strong> is not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Η σελίδα που ζητήθηκε με id %s δεν έχει ακόμα περιεχόμενο, ή το αρχείο cache .tpl.php καταργήθηκε. Επεξεργαστείτε το περιεχόμενο της σελίδας για να το επιλύσετε.
 SiteDeleted=Ο ιστότοπος &quot;%s&quot; διαγράφηκε
 PageContent=Σελίδα / Contenair
diff --git a/htdocs/langs/en_AU/admin.lang b/htdocs/langs/en_AU/admin.lang
index 7cac2619318..0980facb414 100644
--- a/htdocs/langs/en_AU/admin.lang
+++ b/htdocs/langs/en_AU/admin.lang
@@ -3,7 +3,6 @@ OldVATRates=Old GST rate
 NewVATRates=New GST rate
 DictionaryVAT=GST Rates or Sales Tax Rates
 OptionVatMode=GST due
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 LinkColor=Colour of links
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/en_AU/products.lang b/htdocs/langs/en_AU/products.lang
deleted file mode 100644
index e0628dbec00..00000000000
--- a/htdocs/langs/en_AU/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
diff --git a/htdocs/langs/en_AU/salaries.lang b/htdocs/langs/en_AU/salaries.lang
deleted file mode 100644
index c9bd3bec17b..00000000000
--- a/htdocs/langs/en_AU/salaries.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - salaries
-LastSalaries=Latest %s salary payments
-AllSalaries=All salary payments
diff --git a/htdocs/langs/en_AU/ticket.lang b/htdocs/langs/en_AU/ticket.lang
deleted file mode 100644
index 82e110b1ca4..00000000000
--- a/htdocs/langs/en_AU/ticket.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - ticket
-TicketTypeShortISSUE=Issue, bug or problem
-OriginEmail=Email source
-NeedMoreInformation=Waiting for information
-TicketCategory=Group
diff --git a/htdocs/langs/en_AU/users.lang b/htdocs/langs/en_AU/users.lang
deleted file mode 100644
index 4a412122b08..00000000000
--- a/htdocs/langs/en_AU/users.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - users
-NbOfUsers=No. of users
-NbOfPermissions=No. of permissions
diff --git a/htdocs/langs/en_AU/website.lang b/htdocs/langs/en_AU/website.lang
deleted file mode 100644
index 910cff6b702..00000000000
--- a/htdocs/langs/en_AU/website.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - website
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
diff --git a/htdocs/langs/en_CA/admin.lang b/htdocs/langs/en_CA/admin.lang
index 4f26613c7ae..62dd510c5e0 100644
--- a/htdocs/langs/en_CA/admin.lang
+++ b/htdocs/langs/en_CA/admin.lang
@@ -2,7 +2,6 @@
 LocalTax1Management=PST Management
 CompanyZip=Postal code
 LDAPFieldZip=Postal code
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 FormatZip=Postal code
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/en_CA/products.lang b/htdocs/langs/en_CA/products.lang
deleted file mode 100644
index e0628dbec00..00000000000
--- a/htdocs/langs/en_CA/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
diff --git a/htdocs/langs/en_CA/salaries.lang b/htdocs/langs/en_CA/salaries.lang
deleted file mode 100644
index c9bd3bec17b..00000000000
--- a/htdocs/langs/en_CA/salaries.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - salaries
-LastSalaries=Latest %s salary payments
-AllSalaries=All salary payments
diff --git a/htdocs/langs/en_CA/ticket.lang b/htdocs/langs/en_CA/ticket.lang
deleted file mode 100644
index 82e110b1ca4..00000000000
--- a/htdocs/langs/en_CA/ticket.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - ticket
-TicketTypeShortISSUE=Issue, bug or problem
-OriginEmail=Email source
-NeedMoreInformation=Waiting for information
-TicketCategory=Group
diff --git a/htdocs/langs/en_CA/users.lang b/htdocs/langs/en_CA/users.lang
deleted file mode 100644
index 4a412122b08..00000000000
--- a/htdocs/langs/en_CA/users.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - users
-NbOfUsers=No. of users
-NbOfPermissions=No. of permissions
diff --git a/htdocs/langs/en_CA/website.lang b/htdocs/langs/en_CA/website.lang
deleted file mode 100644
index 910cff6b702..00000000000
--- a/htdocs/langs/en_CA/website.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - website
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
diff --git a/htdocs/langs/en_GB/admin.lang b/htdocs/langs/en_GB/admin.lang
index fd5b1c3f7df..0ed13e41f0f 100644
--- a/htdocs/langs/en_GB/admin.lang
+++ b/htdocs/langs/en_GB/admin.lang
@@ -44,7 +44,6 @@ DictionaryAccountancyJournal=Finance journals
 CompanyZip=Postcode
 LDAPFieldZip=Postcode
 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
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 FormatZip=Postcode
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/en_GB/products.lang b/htdocs/langs/en_GB/products.lang
index 566871a575a..e707e316257 100644
--- a/htdocs/langs/en_GB/products.lang
+++ b/htdocs/langs/en_GB/products.lang
@@ -1,3 +1,2 @@
 # Dolibarr language file - Source file is en_US - products
 PrintsheetForOneBarCode=Print several labels for one barcode
-ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
diff --git a/htdocs/langs/en_GB/ticket.lang b/htdocs/langs/en_GB/ticket.lang
deleted file mode 100644
index 82e110b1ca4..00000000000
--- a/htdocs/langs/en_GB/ticket.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - ticket
-TicketTypeShortISSUE=Issue, bug or problem
-OriginEmail=Email source
-NeedMoreInformation=Waiting for information
-TicketCategory=Group
diff --git a/htdocs/langs/en_IN/admin.lang b/htdocs/langs/en_IN/admin.lang
index dd7034100a9..4b3c42b80b1 100644
--- a/htdocs/langs/en_IN/admin.lang
+++ b/htdocs/langs/en_IN/admin.lang
@@ -13,7 +13,6 @@ ProposalsNumberingModules=Quotation numbering models
 ProposalsPDFModules=Quotation documents models
 FreeLegalTextOnProposal=Free text on quotations
 WatermarkOnDraftProposal=Watermark on draft quotations (none if empty)
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 MailToSendProposal=Customer quotations
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/en_IN/products.lang b/htdocs/langs/en_IN/products.lang
deleted file mode 100644
index e0628dbec00..00000000000
--- a/htdocs/langs/en_IN/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
diff --git a/htdocs/langs/en_IN/salaries.lang b/htdocs/langs/en_IN/salaries.lang
deleted file mode 100644
index c9bd3bec17b..00000000000
--- a/htdocs/langs/en_IN/salaries.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - salaries
-LastSalaries=Latest %s salary payments
-AllSalaries=All salary payments
diff --git a/htdocs/langs/en_IN/ticket.lang b/htdocs/langs/en_IN/ticket.lang
deleted file mode 100644
index 82e110b1ca4..00000000000
--- a/htdocs/langs/en_IN/ticket.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - ticket
-TicketTypeShortISSUE=Issue, bug or problem
-OriginEmail=Email source
-NeedMoreInformation=Waiting for information
-TicketCategory=Group
diff --git a/htdocs/langs/en_IN/users.lang b/htdocs/langs/en_IN/users.lang
deleted file mode 100644
index 4a412122b08..00000000000
--- a/htdocs/langs/en_IN/users.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - users
-NbOfUsers=No. of users
-NbOfPermissions=No. of permissions
diff --git a/htdocs/langs/en_IN/website.lang b/htdocs/langs/en_IN/website.lang
deleted file mode 100644
index 910cff6b702..00000000000
--- a/htdocs/langs/en_IN/website.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - website
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
diff --git a/htdocs/langs/en_SG/admin.lang b/htdocs/langs/en_SG/admin.lang
index 25265594de5..c1d306ec390 100644
--- a/htdocs/langs/en_SG/admin.lang
+++ b/htdocs/langs/en_SG/admin.lang
@@ -1,4 +1,3 @@
 # Dolibarr language file - Source file is en_US - admin
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/en_SG/products.lang b/htdocs/langs/en_SG/products.lang
deleted file mode 100644
index e0628dbec00..00000000000
--- a/htdocs/langs/en_SG/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
diff --git a/htdocs/langs/en_SG/salaries.lang b/htdocs/langs/en_SG/salaries.lang
deleted file mode 100644
index c9bd3bec17b..00000000000
--- a/htdocs/langs/en_SG/salaries.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - salaries
-LastSalaries=Latest %s salary payments
-AllSalaries=All salary payments
diff --git a/htdocs/langs/en_SG/ticket.lang b/htdocs/langs/en_SG/ticket.lang
deleted file mode 100644
index 82e110b1ca4..00000000000
--- a/htdocs/langs/en_SG/ticket.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - ticket
-TicketTypeShortISSUE=Issue, bug or problem
-OriginEmail=Email source
-NeedMoreInformation=Waiting for information
-TicketCategory=Group
diff --git a/htdocs/langs/en_SG/users.lang b/htdocs/langs/en_SG/users.lang
deleted file mode 100644
index 4a412122b08..00000000000
--- a/htdocs/langs/en_SG/users.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - users
-NbOfUsers=No. of users
-NbOfPermissions=No. of permissions
diff --git a/htdocs/langs/en_SG/website.lang b/htdocs/langs/en_SG/website.lang
deleted file mode 100644
index 910cff6b702..00000000000
--- a/htdocs/langs/en_SG/website.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - website
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
diff --git a/htdocs/langs/es_AR/admin.lang b/htdocs/langs/es_AR/admin.lang
index 2c3e48b8ff6..628a46dcd9c 100644
--- a/htdocs/langs/es_AR/admin.lang
+++ b/htdocs/langs/es_AR/admin.lang
@@ -351,8 +351,6 @@ RunningUpdateProcessMayBeRequired=Parece que es necesario ejecutar el proceso de
 YouMustRunCommandFromCommandLineAfterLoginToUser=Debe ejecutar este comando desde la línea de comandos después de iniciar sesión en un shell con el usuario <b> %s </b> o debe agregar la opción -W al final de la línea de comandos para proporcionar la contraseña de <b> %s </b>.
 YourPHPDoesNotHaveSSLSupport=Funciones SSL no disponibles en tu PHP
 DownloadMoreSkins=Más skins para descargar
-ShowProfIdInAddress=Mostrar identificación profesional con direcciones
-ShowVATIntaInAddress=Ocultar número de IVA intracomunitario con direcciones
 MeteoStdMod=Modo estandar
 MeteoPercentageModEnabled=Modo porcentual habilitado
 MeteoUseMod=Haga clic para utilizar %s
@@ -523,7 +521,6 @@ LDAPFieldCompany=Compañía
 ViewProductDescInFormAbility=Mostrar descripción de productos en formularios (de otro forma es mostrado en una venta emergente tooltip popup)
 Target=Destino
 Sell=Vender
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 PositionIntoComboList=Posición de la línea en las listas de combo
 SellTaxRate=Tasa de impuesto de venta
 RecuperableOnly=Sí, para el IVA "No percibido pero recuperable" dedicado a algún estado de Francia. Mantenga el valor en "No" en todos los demás casos.
diff --git a/htdocs/langs/es_AR/interventions.lang b/htdocs/langs/es_AR/interventions.lang
index 9a42329ecd2..d2a6549e94a 100644
--- a/htdocs/langs/es_AR/interventions.lang
+++ b/htdocs/langs/es_AR/interventions.lang
@@ -45,3 +45,4 @@ InterLineId=ID de línea de la intervención
 InterLineDate=Fecha de línea de la intervención
 InterLineDuration=Duración de la línea de la intervención
 InterLineDesc=Descripción de la línea de la intervención
+Reopen=Reabierto
diff --git a/htdocs/langs/es_AR/products.lang b/htdocs/langs/es_AR/products.lang
index a0a6201897f..c06b4d9f528 100644
--- a/htdocs/langs/es_AR/products.lang
+++ b/htdocs/langs/es_AR/products.lang
@@ -72,4 +72,3 @@ PriceQtyMin=Precio para cantidad mín.
 PriceQtyMinCurrency=Precio (moneda) para esta cant. (sin descuento)
 PredefinedProductsToSell=Producto Predefinido
 SuppliersPrices=Precio de Proveedor
-ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
diff --git a/htdocs/langs/es_AR/salaries.lang b/htdocs/langs/es_AR/salaries.lang
index 4b2e3729400..249c6815c03 100644
--- a/htdocs/langs/es_AR/salaries.lang
+++ b/htdocs/langs/es_AR/salaries.lang
@@ -4,7 +4,6 @@ SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=La cuenta contable definida en la ficha
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Cuenta contable por defecto para pago de sueldos
 Salary=Sueldo
 Salaries=Sueldos
-NewSalaryPayment=Nuevo pago de sueldo
 AddSalaryPayment=Agregar pago de sueldo
 SalaryPayment=Pago de sueldo
 SalariesPayments=Pagos de sueldos
@@ -14,7 +13,5 @@ TJM=Valor promedio por día
 CurrentSalary=Sueldo actual
 THMDescription=Este valor podría ser usado para calcular el costo de tiempo insumido en un proyecto ingresado por los usuarios si se usa el Módulo de Proyectos
 TJMDescription=Este valor es sólo informativo y no será utilizado para cálculo alguno
-LastSalaries=Ultimos %s pagos de sueldos
-AllSalaries=Todos los pagos de sueldo
 SalariesStatistics=Estadísticas de sueldos
 SalariesAndPayments=Sueldos y pagos
diff --git a/htdocs/langs/es_AR/ticket.lang b/htdocs/langs/es_AR/ticket.lang
index 09070e70818..c608fa6569c 100644
--- a/htdocs/langs/es_AR/ticket.lang
+++ b/htdocs/langs/es_AR/ticket.lang
@@ -1,9 +1,6 @@
 # Dolibarr language file - Source file is en_US - ticket
-TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortPROJET=Projecto
-OriginEmail=Email source
 Read=Leído
-NeedMoreInformation=Waiting for information
 Waiting=Esperando
 Type=Tipo
 TicketSettings=Ajustes
diff --git a/htdocs/langs/es_AR/users.lang b/htdocs/langs/es_AR/users.lang
index a558a71df39..336ae22183a 100644
--- a/htdocs/langs/es_AR/users.lang
+++ b/htdocs/langs/es_AR/users.lang
@@ -63,8 +63,6 @@ LoginToCreate=Usuario a crear
 NameToCreate=Nombre del tercero para crear
 YourRole=Tus roles
 YourQuotaOfUsersIsReached=¡Se ha alcanzado su cuota de usuarios activos!
-NbOfUsers=Cantidad de usuarios
-NbOfPermissions=Cantidad de permisos
 DontDowngradeSuperAdmin=Solo un superadministrador puede degradar a un superadministrador
 UseTypeFieldToChange=Use el campo Tipo para cambiar
 OpenIDURL=URL de OpenID
diff --git a/htdocs/langs/es_BO/admin.lang b/htdocs/langs/es_BO/admin.lang
index 25265594de5..c1d306ec390 100644
--- a/htdocs/langs/es_BO/admin.lang
+++ b/htdocs/langs/es_BO/admin.lang
@@ -1,4 +1,3 @@
 # Dolibarr language file - Source file is en_US - admin
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/es_BO/products.lang b/htdocs/langs/es_BO/products.lang
deleted file mode 100644
index e0628dbec00..00000000000
--- a/htdocs/langs/es_BO/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
diff --git a/htdocs/langs/es_BO/salaries.lang b/htdocs/langs/es_BO/salaries.lang
deleted file mode 100644
index c9bd3bec17b..00000000000
--- a/htdocs/langs/es_BO/salaries.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - salaries
-LastSalaries=Latest %s salary payments
-AllSalaries=All salary payments
diff --git a/htdocs/langs/es_BO/ticket.lang b/htdocs/langs/es_BO/ticket.lang
deleted file mode 100644
index 82e110b1ca4..00000000000
--- a/htdocs/langs/es_BO/ticket.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - ticket
-TicketTypeShortISSUE=Issue, bug or problem
-OriginEmail=Email source
-NeedMoreInformation=Waiting for information
-TicketCategory=Group
diff --git a/htdocs/langs/es_BO/users.lang b/htdocs/langs/es_BO/users.lang
deleted file mode 100644
index 4a412122b08..00000000000
--- a/htdocs/langs/es_BO/users.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - users
-NbOfUsers=No. of users
-NbOfPermissions=No. of permissions
diff --git a/htdocs/langs/es_BO/website.lang b/htdocs/langs/es_BO/website.lang
deleted file mode 100644
index 910cff6b702..00000000000
--- a/htdocs/langs/es_BO/website.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - website
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
diff --git a/htdocs/langs/es_CL/admin.lang b/htdocs/langs/es_CL/admin.lang
index 48489440e57..d62aad94c5a 100644
--- a/htdocs/langs/es_CL/admin.lang
+++ b/htdocs/langs/es_CL/admin.lang
@@ -846,8 +846,6 @@ ForcedToByAModule=Esta regla es forzada a <b>%s</b> por un módulo activado
 RunningUpdateProcessMayBeRequired=Parece que se requiere ejecutar el proceso de actualización (la versión del programa %s difiere de la versión de la base de datos %s)
 YouMustRunCommandFromCommandLineAfterLoginToUser=Debe ejecutar este comando desde la línea de comando después de iniciar sesión en un shell con el usuario <b>%s</b> o debe agregar la opción -W al final de la línea de comandos para proporcionar una contraseña de <b>%s</b>.
 DownloadMoreSkins=Más pieles para descargar
-ShowProfIdInAddress=Mostrar identificación profesional con direcciones
-ShowVATIntaInAddress=Ocultar número de IVA intracomunitario con direcciones
 MeteoStdMod=Modo estandar
 MeteoUseMod=Haz clic para usar %s
 TestLoginToAPI=Prueba de inicio de sesión a la API
@@ -1204,7 +1202,6 @@ AGENDA_REMINDER_BROWSER_SOUND=Habilitar notificación de sonido
 AGENDA_SHOW_LINKED_OBJECT=Mostrar objeto vinculado en la vista de agenda
 ClickToDialUrlDesc=Se llama a Url cuando se hace clic en el picto de un teléfono. En la URL, puede usar etiquetas <br> <b> __ PHONETO __ </ b> que se reemplazarán por el número de teléfono de la persona a quien llamar <br> <b> __ PHONEFROM __ </ b> que se reemplazará por el número de teléfono de la llamada persona (suya) <br> <b> __ LOGIN __ </ b> que se reemplazará con clicktodial de inicio de sesión (definido en la tarjeta de usuario) <br> <b> __ PASS __ </ b> que se reemplazará con clicktodial contraseña (definida en usuario tarjeta).
 ClickToDialUseTelLink=Use solo un enlace "tel:" en los números de teléfono
-ClickToDialUseTelLinkDesc=Use este método si sus usuarios tienen un softphone o una interfaz de software instalada en la misma computadora que el navegador y se le llama cuando hace clic en un enlace de su navegador que comienza con &quot;tel:&quot;. Si necesita una solución de servidor completa (sin necesidad de instalación de software local), debe configurar esto en &quot;No&quot; y completar el siguiente campo.
 CashDeskSetup=Configuración del módulo de punto de venta
 CashDeskThirdPartyForSell=Tercero genérico predeterminado para usar en ventas
 CashDeskBankAccountForSell=Cuenta predeterminada para usar para recibir pagos en efectivo
@@ -1409,3 +1406,4 @@ RESTRICT_ON_IP=Permitir el acceso a alguna IP de host solamente (comodín no per
 MakeAnonymousPing=Realice un Ping anónimo &#39;+1&#39; al servidor de la base Dolibarr (hecho 1 vez solo después de la instalación) para permitir que la base cuente la cantidad de instalación de Dolibarr.
 FeatureNotAvailableWithReceptionModule=Función no disponible cuando la recepción del módulo está habilitada
 EmailTemplate=Plantila para email
+Recommended=Recomendado
diff --git a/htdocs/langs/es_CL/products.lang b/htdocs/langs/es_CL/products.lang
index f09d02e994c..5b07f63f3a5 100644
--- a/htdocs/langs/es_CL/products.lang
+++ b/htdocs/langs/es_CL/products.lang
@@ -166,7 +166,6 @@ SurfaceUnits=Unidad de superficie
 SizeUnits=Unidad de tamaño
 ConfirmDeleteProductBuyPrice=¿Estás seguro de que deseas eliminar este precio de compra?
 SubProduct=Sub producto
-UseProductFournDesc=Agregue una función para definir las descripciones de los productos definidos por los proveedores además de las descripciones para los clientes.
 ProductSupplierDescription=Descripción del vendedor para el producto.
 ProductAttributeName=Atributo de variante %s
 ProductAttributeDeleteDialog=¿Estás seguro de que deseas eliminar este atributo? Todos los valores serán eliminados
diff --git a/htdocs/langs/es_CL/salaries.lang b/htdocs/langs/es_CL/salaries.lang
index 074abf0685a..e0d10e61542 100644
--- a/htdocs/langs/es_CL/salaries.lang
+++ b/htdocs/langs/es_CL/salaries.lang
@@ -2,7 +2,6 @@
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Cuenta de contabilidad utilizada para terceros usuarios
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=La cuenta de contabilidad dedicada definida en la tarjeta de usuario se usará solo para la contabilidad de Libro mayor auxiliar. Este se usará para el Libro mayor y como valor predeterminado de la contabilidad del Libro mayor auxiliar si no se define una cuenta de usuario dedicada en el usuario.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Cuenta de contabilidad por defecto para pagos de salarios
-NewSalaryPayment=Nuevo pago de salario
 SalariesPayments=Sueldos pagos
 ShowSalaryPayment=Mostrar pago de sueldo
 THM=Promedio de tarifa por hora
diff --git a/htdocs/langs/es_CL/ticket.lang b/htdocs/langs/es_CL/ticket.lang
index c3b90781239..1a82967bc5b 100644
--- a/htdocs/langs/es_CL/ticket.lang
+++ b/htdocs/langs/es_CL/ticket.lang
@@ -4,7 +4,6 @@ Permission56005=Ver ticket de todos los terceros (no es efectivo para usuarios e
 TicketDictType=Ticket - Tipos
 TicketDictCategory=Ticket - Grupos
 TicketDictSeverity=Ticket - Severidades
-TicketTypeShortISSUE=Incidencia, error o problema
 TicketTypeShortREQUEST=Cambio o requerimiento de mejora
 ErrorBadEmailAddress=Campo '%s' incorrecto
 MenuTicketMyAssign=Mis ticket
@@ -12,10 +11,8 @@ MenuTicketMyAssignNonClosed=Mis Ticket abiertos
 MenuListNonClosed=Ticket abiertos
 TypeContact_ticket_internal_CONTRIBUTOR=Colaborador
 TypeContact_ticket_external_SUPPORTCLI=Contacto con el cliente / seguimiento de incidentes
-OriginEmail=Fuente de correo electrónico
 Notify_TICKET_SENTBYMAIL=Enviar mensaje de Ticket por correo electrónico
 Read=Leer
-NeedMoreInformation=Esperando informacion
 Waiting=Esperando
 Type=Tipo
 MailToSendTicketMessage=Para enviar un correo electrónico desde un mensaje de ticket
@@ -60,7 +57,6 @@ CreateTicket=Crear boleto
 TicketsManagement=Gestión de Tickets
 NewTicket=Nuevo Ticket
 SubjectAnswerToTicket=Respuesta del Ticket
-TicketCategory=Group
 SeeTicket=Ver Ticket
 TicketReadOn=Sigue leyendo
 TicketHistory=Historial de Tickets
diff --git a/htdocs/langs/es_CL/users.lang b/htdocs/langs/es_CL/users.lang
index fcdfa4649ab..49f2284ef2f 100644
--- a/htdocs/langs/es_CL/users.lang
+++ b/htdocs/langs/es_CL/users.lang
@@ -68,8 +68,6 @@ LoginToCreate=Inicia sesión para crear
 NameToCreate=Nombre de tercero a crear
 YourRole=Tus roles
 YourQuotaOfUsersIsReached=¡Su cuota de usuarios activos se alcanza!
-NbOfUsers=No. de usuarios
-NbOfPermissions=No. de permisos
 DontDowngradeSuperAdmin=Solo una superadmina puede degradar una superadmina
 HierarchicView=Vista Jerárquica
 UseTypeFieldToChange=Use el campo Tipo para cambiar
diff --git a/htdocs/langs/es_CL/website.lang b/htdocs/langs/es_CL/website.lang
index 24e649063d2..796e128aba2 100644
--- a/htdocs/langs/es_CL/website.lang
+++ b/htdocs/langs/es_CL/website.lang
@@ -16,7 +16,6 @@ EditMedias=Editar medios
 EditPageMeta=Edita prop pag/contenedor
 Webpage=Página web / contenedor
 AddPage=Añadir página / contenedor
-PreviewOfSiteNotYetAvailable=Vista previa de su sitio web <strong>%s</strong> aún no está disponible. Primero debe &#39; <strong>Importar una plantilla de sitio web completa</strong> &#39; o simplemente &#39; <strong>Agregar una página / contenedor</strong> &#39;.
 RequestedPageHasNoContentYet=La página solicitada con el id. %s aún no tiene contenido o el archivo de caché .tpl.php fue eliminado. Edita el contenido de la página para resolver esto.
 SiteDeleted=Sitio web &#39;%s&#39; eliminado
 PageContent=Página / Contenair
diff --git a/htdocs/langs/es_CO/admin.lang b/htdocs/langs/es_CO/admin.lang
index edd6927deae..b61704a9436 100644
--- a/htdocs/langs/es_CO/admin.lang
+++ b/htdocs/langs/es_CO/admin.lang
@@ -954,8 +954,6 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=Debe ejecutar este comando desd
 YourPHPDoesNotHaveSSLSupport=Funciones SSL no disponibles en tu PHP
 DownloadMoreSkins=Más skins para descargar
 SimpleNumRefModelDesc=Devuelve el número de referencia en el formato %syymm-nnnn donde yy es el año, mm es el mes y nnnn es un número secuencial que se incrementa automáticamente sin reinicio.
-ShowProfIdInAddress=Mostrar identificación profesional con direcciones
-ShowVATIntaInAddress=Ocultar el número de IVA intracomunitario con direcciones
 MeteoStdMod=Modo estandar
 MeteoPercentageModEnabled=Modo porcentual habilitado
 MeteoUseMod=Haga clic para utilizar %s
@@ -1355,7 +1353,6 @@ ClickToDialSetup=Haga clic para configurar el módulo de marcado.
 ClickToDialUrlDesc=Url llamado cuando se hace un clic en el teléfono picto. En la URL, puede usar las etiquetas <br> <b> __PHONETO__ </b> que se reemplazarán con el número de teléfono de la persona a la que llamará <br> <b> __PHONEFROM__ </b> que se reemplazará con el número de teléfono de la llamada persona (la suya) <br> <b> __LOGIN__ </b> que será reemplazada por el inicio de sesión de clicktodial (definido en la tarjeta de usuario) <br> <b> __PASS__ </b> que será reemplazada por la contraseña de clicktodial (definida por el usuario tarjeta).
 ClickToDialDesc=Este módulo cambia los números de teléfono, cuando se usa una computadora de escritorio, en enlaces en los que se puede hacer clic. Un clic llamará al número. Esto se puede usar para iniciar la llamada telefónica cuando usa un softphone en su escritorio o cuando usa un sistema CTI basado en el protocolo SIP, por ejemplo. Nota: cuando se usa un teléfono inteligente, siempre se puede hacer clic en los números de teléfono.
 ClickToDialUseTelLink=Use solo un enlace "tel:" en los números de teléfono
-ClickToDialUseTelLinkDesc=Use este método si sus usuarios tienen un softphone o una interfaz de software instalada en la misma computadora que el navegador y se le llama cuando hace clic en un enlace en su navegador que comienza con "tel:". Si necesita una solución de servidor completa (sin necesidad de instalación de software local), debe configurar esto en "No" y completar el siguiente campo.
 CashDeskSetup=Configuración del módulo de punto de venta
 CashDeskThirdPartyForSell=Tercero genérico predeterminado para usar en ventas
 CashDeskBankAccountForSell=Cuenta predeterminada para usar para recibir pagos en efectivo
@@ -1624,4 +1621,5 @@ ConfFileIsReadableOrWritableByAnyUsers=El archivo conf. puede ser leido y escrit
 MailToSendEventOrganization=Organización del evento
 YouShouldDisablePHPFunctions=Debería deshabilitar las funciones de PHP
 NoWritableFilesFoundIntoRootDir=No se encontraron archivos o directorios grabables de los programas comunes en su directorio raíz (Perfect!)
+Recommended=Recomendado
 ARestrictedPath=Un camino restringido
diff --git a/htdocs/langs/es_CO/banks.lang b/htdocs/langs/es_CO/banks.lang
index 57fe931f374..3cbffbadf4e 100644
--- a/htdocs/langs/es_CO/banks.lang
+++ b/htdocs/langs/es_CO/banks.lang
@@ -79,7 +79,6 @@ TransferTo=A
 TransferFromToDone=La transferencia de <b> %s </b> a <b> %s </b> de <b>%s</b> %s ha sido grabada
 CheckTransmitter=Remitente
 ValidateCheckReceipt=¿Validar este recibo de cheque?
-ConfirmValidateCheckReceipt=¿Está seguro de que desea enviar este recibo de cheque para su validación? Despues no es posible realizar cambios.
 DeleteCheckReceipt=¿Eliminar este recibo de cheque?
 ConfirmDeleteCheckReceipt=¿Está seguro de que desea eliminar este recibo de cheque?
 BankChecks=Cheques bancarios
diff --git a/htdocs/langs/es_CO/productbatch.lang b/htdocs/langs/es_CO/productbatch.lang
index 6099d17f0a1..8efcc487e80 100644
--- a/htdocs/langs/es_CO/productbatch.lang
+++ b/htdocs/langs/es_CO/productbatch.lang
@@ -20,5 +20,3 @@ ShowCurrentStockOfLot=Mostrar valores actuales por pareja producto/lote
 ShowLogOfMovementIfLot=Mostrar registro de movimientos por pareja producto/lote
 StockDetailPerBatch=Valores detallados por lote
 SerialNumberAlreadyInUse=El número de serie %s ya se usa para el producto %s
-BatchLotNumberingModules=Opciones para generación automática en masa de productos gestionados por lotes
-BatchSerialNumberingModules=Opciones para generación automática en masa de productos gestionados por números de serie
diff --git a/htdocs/langs/es_CO/products.lang b/htdocs/langs/es_CO/products.lang
index e1656957afe..0947f215b3b 100644
--- a/htdocs/langs/es_CO/products.lang
+++ b/htdocs/langs/es_CO/products.lang
@@ -117,7 +117,6 @@ PriceByCustomer=Diferentes precios para cada cliente.
 PriceCatalogue=Un solo precio de venta por producto / servicio.
 PricingRule=Reglas para los precios de venta.
 AddCustomerPrice=Añadir precio por cliente
-ForceUpdateChildPriceSoc=Establecer el mismo precio en las filiales de los clientes.
 PriceByCustomerLog=Registro de precios de clientes anteriores
 MinimumPriceLimit=El precio mínimo no puede ser más bajo que %s
 PriceExpressionSelected=Expresión de precio seleccionado
diff --git a/htdocs/langs/es_CO/salaries.lang b/htdocs/langs/es_CO/salaries.lang
index 32462fd0221..515c3871e58 100644
--- a/htdocs/langs/es_CO/salaries.lang
+++ b/htdocs/langs/es_CO/salaries.lang
@@ -1,11 +1,9 @@
 # Dolibarr language file - Source file is en_US - salaries
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Cuenta contable utilizada para usuarios de terceros
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=La cuenta de contabilidad dedicada definida en la tarjeta de usuario se usará solo para la contabilidad del libro auxiliar. Este se usará para el Libro mayor y como valor predeterminado de la contabilidad del libro auxiliar si la cuenta de contabilidad del usuario dedicada no está definida.
-NewSalaryPayment=Nueva tarjeta de salario
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=Por defecto, deje vacía la opción "Crear automáticamente un pago total" al crear un salario.
 AddSalaryPayment=Agregar pago de salario
 THM=Tarifa por hora promedio
 TJM=Tarifa diaria promedio
 THMDescription=Este valor puede usarse para calcular el costo de tiempo consumido en un proyecto ingresado por los usuarios si se usa el módulo proyecto
 TJMDescription=Este valor es actualmente solo para información y no se usa para ningún cálculo.
-LastSalaries=Últimos pagos de salario %s
-AllSalaries=Todos los pagos de salario
diff --git a/htdocs/langs/es_CO/users.lang b/htdocs/langs/es_CO/users.lang
index f0ab77f3da1..b6c1a01ffe9 100644
--- a/htdocs/langs/es_CO/users.lang
+++ b/htdocs/langs/es_CO/users.lang
@@ -1,4 +1,2 @@
 # Dolibarr language file - Source file is en_US - users
 MenuUsersAndGroups=Usuarios y Grupos
-NbOfUsers=No. of users
-NbOfPermissions=No. of permissions
diff --git a/htdocs/langs/es_CO/website.lang b/htdocs/langs/es_CO/website.lang
deleted file mode 100644
index 910cff6b702..00000000000
--- a/htdocs/langs/es_CO/website.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - website
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
diff --git a/htdocs/langs/es_DO/admin.lang b/htdocs/langs/es_DO/admin.lang
index 81c0cd3e1a0..6dbaf311a2a 100644
--- a/htdocs/langs/es_DO/admin.lang
+++ b/htdocs/langs/es_DO/admin.lang
@@ -7,6 +7,5 @@ Permission93=Eliminar impuestos e ITBIS
 DictionaryVAT=Tasa de ITBIS (Impuesto sobre ventas en EEUU)
 UnitPriceOfProduct=Precio unitario sin ITBIS de un producto
 OptionVatMode=Opción de carga de ITBIS
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/es_DO/products.lang b/htdocs/langs/es_DO/products.lang
deleted file mode 100644
index e0628dbec00..00000000000
--- a/htdocs/langs/es_DO/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
diff --git a/htdocs/langs/es_DO/salaries.lang b/htdocs/langs/es_DO/salaries.lang
deleted file mode 100644
index c9bd3bec17b..00000000000
--- a/htdocs/langs/es_DO/salaries.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - salaries
-LastSalaries=Latest %s salary payments
-AllSalaries=All salary payments
diff --git a/htdocs/langs/es_DO/ticket.lang b/htdocs/langs/es_DO/ticket.lang
deleted file mode 100644
index 82e110b1ca4..00000000000
--- a/htdocs/langs/es_DO/ticket.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - ticket
-TicketTypeShortISSUE=Issue, bug or problem
-OriginEmail=Email source
-NeedMoreInformation=Waiting for information
-TicketCategory=Group
diff --git a/htdocs/langs/es_DO/users.lang b/htdocs/langs/es_DO/users.lang
deleted file mode 100644
index 4a412122b08..00000000000
--- a/htdocs/langs/es_DO/users.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - users
-NbOfUsers=No. of users
-NbOfPermissions=No. of permissions
diff --git a/htdocs/langs/es_DO/website.lang b/htdocs/langs/es_DO/website.lang
deleted file mode 100644
index 910cff6b702..00000000000
--- a/htdocs/langs/es_DO/website.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - website
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
diff --git a/htdocs/langs/es_EC/admin.lang b/htdocs/langs/es_EC/admin.lang
index f54fc336cb0..d8e4e2dbe9c 100644
--- a/htdocs/langs/es_EC/admin.lang
+++ b/htdocs/langs/es_EC/admin.lang
@@ -874,8 +874,6 @@ RestoreMySQL=Importación de MySQL
 ForcedToByAModule= Esta regla se ha forzado a <b>%s</b> por un módulo activado
 RunningUpdateProcessMayBeRequired=Parece que es necesario ejecutar el proceso de actualización (la versión del programa %s difiere de la versión de la base de datos %s)
 YouMustRunCommandFromCommandLineAfterLoginToUser=Debe ejecutar este comando desde la línea de comandos después de iniciar sesión en un shell con el usuario <b>%s</b> o debe agregar la opción -Al final de la línea de comandos para proporcionar la contraseña <b>%s</b>.
-ShowProfIdInAddress=Mostrar identificación profesional con direcciones
-ShowVATIntaInAddress=Ocultar número de IVA intracomunitario con direcciones
 MeteoPercentageMod=Modo porcentual
 MeteoPercentageModEnabled=Modo de porcentaje habilitado
 MeteoUseMod=Haga clic para usar %s
@@ -1250,7 +1248,6 @@ AGENDA_SHOW_LINKED_OBJECT=Mostrar objeto relacionado en la vista de la agenda
 ClickToDialSetup=Configuración del módulo - Haga clic para marcar
 ClickToDialUrlDesc=URL llamada cuando se hace clic en el icono de teléfono. En URL, puede usar las etiquetas <br> <b> __PHONETO__ </b> que se reemplazarán con el número de teléfono de la persona a quien llamar <br> <b> __PHONEFROM__ </b> que será reemplazado por el número de teléfono de la persona que llama (suyo) <br> <b> __LOGIN__ </b> que se reemplazará con el inicio de sesión de "hacer clic para marcar" (definido en la tarjeta de usuario) <br> <b> __PASS __ < / b> que se reemplazará con la contraseña de "haga clic para marcar" (definida en el usuario tarjeta).
 ClickToDialUseTelLink=Utilizar sólo un enlace "tel:" en los números de teléfono
-ClickToDialUseTelLinkDesc=Use este método si sus usuarios tienen un softphone o una interfaz de software instalada en la misma computadora que el navegador y se le llama cuando hace clic en un enlace de su navegador que comienza con "tel:". Si necesita una solución de servidor completa (sin necesidad de instalación de software local), debe configurar esto en "No" y completar el siguiente campo.
 CashDeskSetup=Configuración del módulo de punto de venta
 CashDeskThirdPartyForSell=Tercero genérico predeterminado para usar en ventas
 CashDeskBankAccountForSell=Cuenta predeterminada para recibir pagos en efectivo
@@ -1475,3 +1472,4 @@ FeatureNotAvailableWithReceptionModule=Función no disponible cuando la recepci
 EmailTemplate=Plantilla para correo electrónico
 EMailsWillHaveMessageID=Los correos electrónicos tendrán una etiqueta 'Referencias' que coincida con esta sintaxis
 JumpToBoxes=Vaya a Configuración -> Widgets
+Recommended=Recomendado
diff --git a/htdocs/langs/es_EC/products.lang b/htdocs/langs/es_EC/products.lang
index 89db10fa719..9ab59f975ea 100644
--- a/htdocs/langs/es_EC/products.lang
+++ b/htdocs/langs/es_EC/products.lang
@@ -135,7 +135,6 @@ PriceByCustomer=Diferentes precios para cada cliente
 PriceCatalogue=Un precio de venta único por producto/servicio
 PricingRule=Reglas para los precios de venta.
 AddCustomerPrice=Añadir precio por cliente
-ForceUpdateChildPriceSoc=Establecer el mismo precio en las filiales de clientes
 PriceByCustomerLog=Registro de precios anteriores del cliente
 MinimumPriceLimit=El precio mínimo no puede ser inferior a %s
 PriceExpressionEditor=Editor de expresiones de precios
@@ -176,7 +175,6 @@ HeightUnits=Unidad de altura
 SurfaceUnits=Unidad de superficie
 SizeUnits=Unidad de tamaño
 ConfirmDeleteProductBuyPrice=¿Seguro que quieres eliminar este precio de compra?
-UseProductFournDesc=Agregue una función para definir las descripciones de los productos definidos por los proveedores, además de las descripciones para los clientes.
 ProductSupplierDescription=Descripción del vendedor del producto
 VariantAttributes=Atributos variantes
 ProductAttributes=Atributos variantes para los productos
diff --git a/htdocs/langs/es_EC/salaries.lang b/htdocs/langs/es_EC/salaries.lang
index 0f639c609c2..ac9132ea254 100644
--- a/htdocs/langs/es_EC/salaries.lang
+++ b/htdocs/langs/es_EC/salaries.lang
@@ -4,7 +4,6 @@ SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=La cuenta de contabilidad dedicada defi
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Cuenta de contabilidad por defecto para pagos de sueldos
 Salary=Sueldo
 Salaries=Sueldos
-NewSalaryPayment=Nuevo pago de sueldo
 SalaryPayment=Pago de sueldo
 SalariesPayments=Pagos de sueldos
 ShowSalaryPayment=Mostrar pago de sueldo
@@ -13,5 +12,3 @@ TJM=Tarifa diaria promedio
 CurrentSalary=Sueldo actual
 THMDescription=Este valor puede usarse para calcular el costo del tiempo consumido en un proyecto ingresado por los usuarios si se usa el proyecto del módulo
 TJMDescription=Actualmente, este valor es solo informativo y no se utiliza para ningún cálculo
-LastSalaries=Últimos %s pagos de sueldos
-AllSalaries=Todos los pagos de sueldos
diff --git a/htdocs/langs/es_EC/users.lang b/htdocs/langs/es_EC/users.lang
index 338829dfa75..91468ade27f 100644
--- a/htdocs/langs/es_EC/users.lang
+++ b/htdocs/langs/es_EC/users.lang
@@ -67,8 +67,6 @@ LoginToCreate=Ingresar para crear
 NameToCreate=Nombre del tercero para crear
 YourRole=Sus funciones
 YourQuotaOfUsersIsReached=¡Se alcanza su cuota de usuarios activos!
-NbOfUsers=No. de usuarios
-NbOfPermissions=No. de permisos
 DontDowngradeSuperAdmin=Sólo una superadmin puede degradar una superadmin
 UseTypeFieldToChange=Utilice el campo Tipo para cambiar
 OpenIDURL=URL de OpenID
diff --git a/htdocs/langs/es_EC/website.lang b/htdocs/langs/es_EC/website.lang
index 6aa45d5656f..957ff56551c 100644
--- a/htdocs/langs/es_EC/website.lang
+++ b/htdocs/langs/es_EC/website.lang
@@ -14,7 +14,6 @@ EditCss=Editar propiedades web
 EditMenu=Editar menú
 EditPageMeta=Editar propiedades
 Webpage=Página web/contenedor
-PreviewOfSiteNotYetAvailable=Vista previa de su sitio web <strong>%s</strong> aún no disponible. Primero debe '<strong>Importar una plantilla de sitio web completa</strong>' o simplemente '<strong>Agregar una página / contenedor</strong>'.
 RequestedPageHasNoContentYet=La página solicitada con id %s todavía no tiene contenido o el archivo de caché .tpl.php fue eliminado. Editar el contenido de la página para resolver esto.
 PageContent=Página/Contenair
 PageDeleted=Página/Contenair '%s' del sitio web %s eliminado
diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang
index 9dcd8620ca1..dc8459672b8 100644
--- a/htdocs/langs/es_ES/admin.lang
+++ b/htdocs/langs/es_ES/admin.lang
@@ -53,6 +53,7 @@ InternalUser=Usuario interno
 ExternalUser=Usuario externo
 InternalUsers=Usuarios internos
 ExternalUsers=Usuarios externos
+UserInterface=User interface
 GUISetup=Entorno
 SetupArea=Configuración
 UploadNewTemplate=Nueva(s) plantilla(s) actualizada(s)
@@ -1260,8 +1261,8 @@ YourPHPDoesNotHaveSSLSupport=Funciones SSL no disponibles en su PHP
 DownloadMoreSkins=Más temas para descargar
 SimpleNumRefModelDesc=Devuelve el número de referencia en el formato %syymm-nnnn donde aa es el año, mm es el mes y nnnn es un número secuencial que se incrementa automáticamente sin reinicio.
 SimpleNumRefNoDateModelDesc=Devuelve el número de referencia en el formato %s-nnnn donde nnnn es un número secuencial que se incrementa automáticamente sin reinicio
-ShowProfIdInAddress=Mostrar el identificador profesional en las direcciones
-ShowVATIntaInAddress=Ocultar el identificador IVA Intracomunitario en las direcciones
+ShowProfIdInAddress=Show professional ID with addresses
+ShowVATIntaInAddress=Hide intra-Community VAT number
 TranslationUncomplete=Traducción parcial
 MAIN_DISABLE_METEO=Deshabilitar la vista meteorológica
 MeteoStdMod=Modo estándar
@@ -1778,7 +1779,7 @@ ClickToDialSetup=Configuración del módulo Click To Dial
 ClickToDialUrlDesc=Url llamada cuando se hace clic en el icono de teléfono. En la URL, puede usar los tags <br><b>__PHONETO__</b> que se reemplazará con el número de teléfono de la persona a llamar  <br><b>__PHONEFROM__</b>  que será reemplazado por el número de teléfono de la persona que llama (suyo)<br><b>__LOGIN__</b> que se reemplazará con el login clicktodial (definido en la tarjeta de usuario)<br><b>__PASS__</b> que será Sustituido por la contraseña clicktodial (definida en la ficha de usuario).
 ClickToDialDesc=Este módulo cambia los números de teléfono, cuando se usa una computadora de escritorio, en enlaces en los que se puede hacer clic. Un clic llamará al número. Esto se puede usar para iniciar una llamada telefónica cuando usa un softphone en su escritorio o cuando usa un sistema CTI basado en el protocolo SIP, por ejemplo. Nota: cuando se usa un teléfono inteligente, siempre se puede hacer clic en los números de teléfono.
 ClickToDialUseTelLink=Utilice el enlace "tel:" que aparece en los números de teléfono
-ClickToDialUseTelLinkDesc=Utilice este método si los usuarios tienen un softphone o una interfaz de software instalado en mismo equipo que el navegador, y se llama al hacer clic en un enlace en el navegador que comienza con "tel:". Si necesita una solución de servidor completa (sin necesidad de instalación de software local), debe establecer este en "No" y rellenar siguiente campo.
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface, installed on the same computer as the browser, and called when you click on a link starting with "tel:" in your browser. If you need link that start with "sip:" or a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=TPV
 CashDeskSetup=Configuración del módulo Terminal Punto de Venta
@@ -2133,7 +2134,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Excepto si necesita ejecutar comand
 PHPFunctionsRequiredForCLI=Para fines de shell (como una copia de seguridad programada de trabajos o ejecutar un programa anitivurs), debe mantener las funciones de PHP
 NoWritableFilesFoundIntoRootDir=No se encontraron archivos o directorios grabables de los programas comunes en su directorio raíz (Bueno)
 RecommendedValueIs=Recomendado: %s
-NotRecommended=No recomendado
+Recommended=Recomendada
+NotRecommended=Not recommended
 ARestrictedPath=Una ruta restringida
 CheckForModuleUpdate=Compruebe si hay actualizaciones de módulos externos
 CheckForModuleUpdateHelp=Esta acción se conectará a los editores de módulos externos para comprobar si hay una nueva versión disponible.
@@ -2145,3 +2147,4 @@ RandomlySelectedIfSeveral=Seleccionado aleatoriamente si hay varias imágenes di
 DatabasePasswordObfuscated=La contraseña de la base de datos está oculta en el archivo conf
 DatabasePasswordNotObfuscated=La contraseña de la base de datos NO está oculta en el archivo conf
 APIsAreNotEnabled=Los módulos de API no están habilitados
+YouShouldSetThisToOff=You should set this to 0 or off
diff --git a/htdocs/langs/es_ES/banks.lang b/htdocs/langs/es_ES/banks.lang
index 337f6d2063d..d9615d65255 100644
--- a/htdocs/langs/es_ES/banks.lang
+++ b/htdocs/langs/es_ES/banks.lang
@@ -115,7 +115,7 @@ TransferTo=Hacia
 TransferFromToDone=La transferencia de <b>%s</b> hacia <b>%s</b> de <b>%s</b> %s se ha creado.
 CheckTransmitter=Emisor
 ValidateCheckReceipt=¿Validar esta remesa?
-ConfirmValidateCheckReceipt=¿Está seguro de que desea enviar este recibo de cheque para su validación? No es posible realizar cambios, está hecho.
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes will be possible once validated.
 DeleteCheckReceipt=¿Eliminar esta remesa?
 ConfirmDeleteCheckReceipt=¿Está seguro de querer eliminar esta remesa?
 BankChecks=Cheques
diff --git a/htdocs/langs/es_ES/boxes.lang b/htdocs/langs/es_ES/boxes.lang
index fc3e239692d..4039b93773a 100644
--- a/htdocs/langs/es_ES/boxes.lang
+++ b/htdocs/langs/es_ES/boxes.lang
@@ -91,8 +91,8 @@ BoxTitleLatestModifiedSupplierOrders=Últimos %s pedidos de clientes modificados
 BoxTitleLastModifiedCustomerBills=Últimas %s  facturas a clientes modificadas
 BoxTitleLastModifiedCustomerOrders=Últimos %s pedidos de clientes modificados
 BoxTitleLastModifiedPropals=Últimos %s presupuestos modificados
-BoxTitleLatestModifiedJobPositions=Últimos %s trabajos modificados 
-BoxTitleLatestModifiedCandidatures=Últimas %s candidaturas modificadas 
+BoxTitleLatestModifiedJobPositions=Latest %s modified job positions
+BoxTitleLatestModifiedCandidatures=Latest %s modified job applications
 ForCustomersInvoices=Facturas a clientes
 ForCustomersOrders=Pedidos de clientes
 ForProposals=Presupuestos
diff --git a/htdocs/langs/es_ES/cashdesk.lang b/htdocs/langs/es_ES/cashdesk.lang
index 25e2599ee74..1021bbdebb0 100644
--- a/htdocs/langs/es_ES/cashdesk.lang
+++ b/htdocs/langs/es_ES/cashdesk.lang
@@ -127,4 +127,4 @@ AllowDelayedPayment=Permitir pago aplazado
 PrintPaymentMethodOnReceipts=Imprimir método de pago en tickets|recibos
 WeighingScale=Balanza
 ShowPriceHT = Mostrar la columna con el precio sin impuestos (en pantalla)
-ShowPriceHTOnReceipt = Mostrar la columna con el precio sin impuestos (al recibirlo)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on the receipt)
diff --git a/htdocs/langs/es_ES/errors.lang b/htdocs/langs/es_ES/errors.lang
index 2f59947aba4..1475f7b8dc9 100644
--- a/htdocs/langs/es_ES/errors.lang
+++ b/htdocs/langs/es_ES/errors.lang
@@ -301,3 +301,4 @@ ErrorActionCommPropertyUserowneridNotDefined=Se requiere el propietario del usua
 ErrorActionCommBadType=El tipo de evento seleccionado (id: %n, código: %s) no existe en el diccionario de tipo de evento
 CheckVersionFail=Error de verificación de versión
 ErrorWrongFileName=El nombre del archivo no puede contener __SOMETHING__
+ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
diff --git a/htdocs/langs/es_ES/eventorganization.lang b/htdocs/langs/es_ES/eventorganization.lang
index ead090b21f5..d2e90e2a51b 100644
--- a/htdocs/langs/es_ES/eventorganization.lang
+++ b/htdocs/langs/es_ES/eventorganization.lang
@@ -86,6 +86,7 @@ DownloadICSLink = Descargar enlace ICS
 EVENTORGANIZATION_SECUREKEY = Secure Key del enlace de registro público a una conferencia
 SERVICE_BOOTH_LOCATION = Servicio utilizado para la fila de facturas sobre la ubicación de un stand
 SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Servicio utilizado para la fila de la factura sobre la suscripción de un asistente a una conferencia
+NbVotes=Number of votes
 #
 # Status
 #
@@ -115,6 +116,9 @@ EvntOrgDuration = Esta conferencia comienza el %s y termina el %s.
 ConferenceAttendeeFee = Cuota de asistente a la conferencia para el evento: '%s' que ocurre desde %s a %s.
 BoothLocationFee = Ubicación del stand para el evento: '%s' que ocurre desde %s a %s
 EventType = Tipo de evento
+LabelOfBooth=Booth label
+LabelOfconference=Conference label
+ConferenceIsNotConfirmed=Subcription not available, conference is not confirmed yet
 
 #
 # Vote page
diff --git a/htdocs/langs/es_ES/install.lang b/htdocs/langs/es_ES/install.lang
index db506fac1b6..d755ce26ba3 100644
--- a/htdocs/langs/es_ES/install.lang
+++ b/htdocs/langs/es_ES/install.lang
@@ -206,6 +206,7 @@ MigrationUserPhotoPath=Migración de la ruta de las fotos para los usuarios
 MigrationFieldsSocialNetworks=Migración de campos de redes sociales de usuarios (%s)
 MigrationReloadModule=Recargar módulo %s
 MigrationResetBlockedLog=Restablecer el módulo BlockedLog para el algoritmo v7
+MigrationImportOrExportProfiles=Migration of import or export profiles (%s)
 ShowNotAvailableOptions=Mostrar opciones no disponibles
 HideNotAvailableOptions=Ocultar opciones no disponibles
 ErrorFoundDuringMigration=Se ha producido un error durante el proceso de migración, por lo que el siguiente paso no está disponible. Para ignorar errores puede <a href="%s">hacer clic aquí</a>, pero la aplicación a algunas funcionalidades pueden no funcionar correctamente mientras no se arregle el problema.
diff --git a/htdocs/langs/es_ES/productbatch.lang b/htdocs/langs/es_ES/productbatch.lang
index 0e2eb06ece1..550e18de2cb 100644
--- a/htdocs/langs/es_ES/productbatch.lang
+++ b/htdocs/langs/es_ES/productbatch.lang
@@ -26,12 +26,10 @@ ShowLogOfMovementIfLot=Ver los movimientos de stock de este producto/lote
 StockDetailPerBatch=Detalle de stock por lote
 SerialNumberAlreadyInUse=El número de serie %s ya se utiliza para el producto %s
 TooManyQtyForSerialNumber=Solo puede tener un producto %s para el número de serie %s
-BatchLotNumberingModules=Opciones para la generación automática de productos por lotes gestionados por lotes
-BatchSerialNumberingModules=Opciones para la generación automática de productos por lotes gestionados por números de serie
 ManageLotMask=Máscara personalizada
-CustomMasks=Agrega una opción para definir la máscara en la ficha del producto.
-LotProductTooltip=Agrega una opción en la tarjeta del producto para definir una máscara de número de lote dedicada
-SNProductTooltip=Agrega una opción en la tarjeta del producto para definir una máscara de número de serie dedicada
+CustomMasks=Option to define a different numbering mask for each product
+BatchLotNumberingModules=Numbering rule for automatic generation of lot number
+BatchSerialNumberingModules=Numbering rule for automatic generation of serial number (for products with property 1 unique lot/serial for each product)
 QtyToAddAfterBarcodeScan=Cantidad a agregar para cada código de barras / lote / serie escaneado
 LifeTime=Vida útil (en días)
 EndOfLife=Fin de vida
diff --git a/htdocs/langs/es_ES/salaries.lang b/htdocs/langs/es_ES/salaries.lang
index 48215b71f6e..6c2643634c3 100644
--- a/htdocs/langs/es_ES/salaries.lang
+++ b/htdocs/langs/es_ES/salaries.lang
@@ -2,20 +2,23 @@
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Cuenta contable usada para los usuarios
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=Se utilizará una cuenta contable dedicada definida en la ficha de usuario para el relleno del Libro Mayor, o como valor predeterminado de la contabilidad del Libro Mayor si no se define una cuenta contable en la ficha del usuario
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Cuenta contable por defecto para pagos de salarios
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=De forma predeterminada, deje vacía la opción "Crear automáticamente un pago total" al crear un Salario.
 Salary=Salario
 Salaries=Salarios
-NewSalaryPayment=Nuevo pago
+NewSalary=Nuevo salario
+NewSalaryPayment=Nueva tarjeta de salario
 AddSalaryPayment=Añadir pago de salario
 SalaryPayment=Pago de salario
 SalariesPayments=Pagos de salarios
+SalariesPaymentsOf=Pagos de sueldos de %s
 ShowSalaryPayment=Ver pago
 THM=Tasa media por hora
 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=Últimos %s pagos salariales
-AllSalaries=Todos los pagos salariales
+LastSalaries=Latest %s salaries
+AllSalaries=All salaries
 SalariesStatistics=Estadísticas salariales
-# Export
 SalariesAndPayments=Salarios y pagos
+ConfirmDeleteSalaryPayment=Do you want to delete this salary payment ?
diff --git a/htdocs/langs/es_ES/ticket.lang b/htdocs/langs/es_ES/ticket.lang
index 9385e5cf360..5e4eb704085 100644
--- a/htdocs/langs/es_ES/ticket.lang
+++ b/htdocs/langs/es_ES/ticket.lang
@@ -55,7 +55,7 @@ TypeContact_ticket_internal_SUPPORTTEC=Usuario asignado
 TypeContact_ticket_external_SUPPORTCLI=Contacto cliente / seguimiento de incidentes
 TypeContact_ticket_external_CONTRIBUTOR=Contribuidor externo
 
-OriginEmail=Remitente de correo electrónico
+OriginEmail=Reporter Email
 Notify_TICKET_SENTBYMAIL=Enviar mensaje de ticket por e-mail
 
 # Status
diff --git a/htdocs/langs/es_ES/users.lang b/htdocs/langs/es_ES/users.lang
index f0727893f02..9294f70a515 100644
--- a/htdocs/langs/es_ES/users.lang
+++ b/htdocs/langs/es_ES/users.lang
@@ -97,8 +97,8 @@ LoginToCreate=Login a crear
 NameToCreate=Nombre del tercero a crear
 YourRole=Sus roles
 YourQuotaOfUsersIsReached=¡Ha llegado a su cuota de usuarios activos!
-NbOfUsers=Nº de usuarios
-NbOfPermissions=Nº de permisos
+NbOfUsers=Number of users
+NbOfPermissions=Number of permissions
 DontDowngradeSuperAdmin=Sólo un superadmin puede degradar un superadmin
 HierarchicalResponsible=Supervisor
 HierarchicView=Vista jerárquica
diff --git a/htdocs/langs/es_ES/website.lang b/htdocs/langs/es_ES/website.lang
index b8d6f149b3f..6beb32ced39 100644
--- a/htdocs/langs/es_ES/website.lang
+++ b/htdocs/langs/es_ES/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Añadir sitio web
 Webpage=Página web/Contenedor
 AddPage=Añadir página/contenedor
 PageContainer=Página
-PreviewOfSiteNotYetAvailable=La vista previa de su sitio web <strong>%s</strong> aún no está disponible. Primero debe '<strong>Importar una plantilla de sitio web completa</strong>' o simplemente '<strong>Agregar una página/contenedor</strong>'.
+PreviewOfSiteNotYetAvailable=The preview of your website <strong>%s</strong> is not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=La página pedida con id %s todavía no tiene contenido, o cache file.tpl.php ha sido eliminado. Editar el contenido de la página para resolverlo.
 SiteDeleted=Sitio web '%s' eliminado
 PageContent=Página/Contenedor
diff --git a/htdocs/langs/es_GT/admin.lang b/htdocs/langs/es_GT/admin.lang
index 25265594de5..c1d306ec390 100644
--- a/htdocs/langs/es_GT/admin.lang
+++ b/htdocs/langs/es_GT/admin.lang
@@ -1,4 +1,3 @@
 # Dolibarr language file - Source file is en_US - admin
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/es_GT/products.lang b/htdocs/langs/es_GT/products.lang
deleted file mode 100644
index e0628dbec00..00000000000
--- a/htdocs/langs/es_GT/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
diff --git a/htdocs/langs/es_GT/salaries.lang b/htdocs/langs/es_GT/salaries.lang
deleted file mode 100644
index c9bd3bec17b..00000000000
--- a/htdocs/langs/es_GT/salaries.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - salaries
-LastSalaries=Latest %s salary payments
-AllSalaries=All salary payments
diff --git a/htdocs/langs/es_GT/ticket.lang b/htdocs/langs/es_GT/ticket.lang
deleted file mode 100644
index 82e110b1ca4..00000000000
--- a/htdocs/langs/es_GT/ticket.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - ticket
-TicketTypeShortISSUE=Issue, bug or problem
-OriginEmail=Email source
-NeedMoreInformation=Waiting for information
-TicketCategory=Group
diff --git a/htdocs/langs/es_GT/users.lang b/htdocs/langs/es_GT/users.lang
deleted file mode 100644
index 4a412122b08..00000000000
--- a/htdocs/langs/es_GT/users.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - users
-NbOfUsers=No. of users
-NbOfPermissions=No. of permissions
diff --git a/htdocs/langs/es_GT/website.lang b/htdocs/langs/es_GT/website.lang
deleted file mode 100644
index 910cff6b702..00000000000
--- a/htdocs/langs/es_GT/website.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - website
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
diff --git a/htdocs/langs/es_HN/admin.lang b/htdocs/langs/es_HN/admin.lang
index 25265594de5..c1d306ec390 100644
--- a/htdocs/langs/es_HN/admin.lang
+++ b/htdocs/langs/es_HN/admin.lang
@@ -1,4 +1,3 @@
 # Dolibarr language file - Source file is en_US - admin
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/es_HN/products.lang b/htdocs/langs/es_HN/products.lang
deleted file mode 100644
index e0628dbec00..00000000000
--- a/htdocs/langs/es_HN/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
diff --git a/htdocs/langs/es_HN/salaries.lang b/htdocs/langs/es_HN/salaries.lang
deleted file mode 100644
index c9bd3bec17b..00000000000
--- a/htdocs/langs/es_HN/salaries.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - salaries
-LastSalaries=Latest %s salary payments
-AllSalaries=All salary payments
diff --git a/htdocs/langs/es_HN/ticket.lang b/htdocs/langs/es_HN/ticket.lang
deleted file mode 100644
index 82e110b1ca4..00000000000
--- a/htdocs/langs/es_HN/ticket.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - ticket
-TicketTypeShortISSUE=Issue, bug or problem
-OriginEmail=Email source
-NeedMoreInformation=Waiting for information
-TicketCategory=Group
diff --git a/htdocs/langs/es_HN/users.lang b/htdocs/langs/es_HN/users.lang
deleted file mode 100644
index 4a412122b08..00000000000
--- a/htdocs/langs/es_HN/users.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - users
-NbOfUsers=No. of users
-NbOfPermissions=No. of permissions
diff --git a/htdocs/langs/es_HN/website.lang b/htdocs/langs/es_HN/website.lang
deleted file mode 100644
index 910cff6b702..00000000000
--- a/htdocs/langs/es_HN/website.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - website
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
diff --git a/htdocs/langs/es_MX/products.lang b/htdocs/langs/es_MX/products.lang
index 1759470aab4..8ade985e293 100644
--- a/htdocs/langs/es_MX/products.lang
+++ b/htdocs/langs/es_MX/products.lang
@@ -11,7 +11,6 @@ DeleteProduct=Eliminar un producto / servicio
 ExportDataset_produit_1=Productos
 ImportDataset_produit_1=productos
 BarCodePrintsheet=Imprimir código de barras
-ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 GlobalVariableUpdaterType0=Datos JSON
 GlobalVariableUpdaterHelp0=Analiza los datos JSON de la URL especificada, VALUE especifica la ubicación del valor relevante,
 GlobalVariableUpdaterHelpFormat0=Formato de la solicitud {"URL": "http://example.com/urlofjson", "VALUE": "array1, array2, targetvalue"}
diff --git a/htdocs/langs/es_MX/ticket.lang b/htdocs/langs/es_MX/ticket.lang
index f49d39d3a5b..59745fa1759 100644
--- a/htdocs/langs/es_MX/ticket.lang
+++ b/htdocs/langs/es_MX/ticket.lang
@@ -1,7 +1,4 @@
 # Dolibarr language file - Source file is en_US - ticket
-TicketTypeShortISSUE=Issue, bug or problem
-OriginEmail=Email source
-NeedMoreInformation=Waiting for information
 Closed=Cerrada
 TicketSettings=Configuraciónes
 TicketMessageMailIntroText=Hola, <br> Se envió una nueva respuesta en un ticket con el que se comunicó. Aquí está el mensaje: <br>
diff --git a/htdocs/langs/es_MX/users.lang b/htdocs/langs/es_MX/users.lang
index 217c37db5fe..ddd9b610db2 100644
--- a/htdocs/langs/es_MX/users.lang
+++ b/htdocs/langs/es_MX/users.lang
@@ -11,5 +11,3 @@ DisableAUser=Deshabilitar un usuario
 EnableAUser=Habilitar un usuario
 LastName=Apellido
 FirstName=Nombre(s)
-NbOfUsers=No. of users
-NbOfPermissions=No. of permissions
diff --git a/htdocs/langs/es_PA/admin.lang b/htdocs/langs/es_PA/admin.lang
index 01d1912f886..f0c05a924c9 100644
--- a/htdocs/langs/es_PA/admin.lang
+++ b/htdocs/langs/es_PA/admin.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - admin
 VersionUnknown=Desconocido
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/es_PA/products.lang b/htdocs/langs/es_PA/products.lang
deleted file mode 100644
index e0628dbec00..00000000000
--- a/htdocs/langs/es_PA/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
diff --git a/htdocs/langs/es_PA/salaries.lang b/htdocs/langs/es_PA/salaries.lang
deleted file mode 100644
index c9bd3bec17b..00000000000
--- a/htdocs/langs/es_PA/salaries.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - salaries
-LastSalaries=Latest %s salary payments
-AllSalaries=All salary payments
diff --git a/htdocs/langs/es_PA/ticket.lang b/htdocs/langs/es_PA/ticket.lang
deleted file mode 100644
index 82e110b1ca4..00000000000
--- a/htdocs/langs/es_PA/ticket.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - ticket
-TicketTypeShortISSUE=Issue, bug or problem
-OriginEmail=Email source
-NeedMoreInformation=Waiting for information
-TicketCategory=Group
diff --git a/htdocs/langs/es_PA/users.lang b/htdocs/langs/es_PA/users.lang
deleted file mode 100644
index 4a412122b08..00000000000
--- a/htdocs/langs/es_PA/users.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - users
-NbOfUsers=No. of users
-NbOfPermissions=No. of permissions
diff --git a/htdocs/langs/es_PA/website.lang b/htdocs/langs/es_PA/website.lang
deleted file mode 100644
index 910cff6b702..00000000000
--- a/htdocs/langs/es_PA/website.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - website
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
diff --git a/htdocs/langs/es_PE/admin.lang b/htdocs/langs/es_PE/admin.lang
index 80e43a5bb33..6ab8ad59b97 100644
--- a/htdocs/langs/es_PE/admin.lang
+++ b/htdocs/langs/es_PE/admin.lang
@@ -8,7 +8,6 @@ Permission93=Eliminar impuestos e IGV
 DictionaryVAT=Tasa de IGV o tasa de impuesto a las ventas
 UnitPriceOfProduct=Precio unitario sin IGV de un producto
 OptionVatMode=IGV adeudado
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 MailToSendInvoice=Facturas de Clientes
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/es_PE/products.lang b/htdocs/langs/es_PE/products.lang
index 878b4c23757..e682fe300a6 100644
--- a/htdocs/langs/es_PE/products.lang
+++ b/htdocs/langs/es_PE/products.lang
@@ -5,4 +5,3 @@ ProductServiceCard=Ficha Productos/Servicios
 ProductOrService=Producto o Servicio
 ListOfStockMovements=Lista de movimientos de stock
 ExportDataset_produit_1=Productos
-ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
diff --git a/htdocs/langs/es_PE/ticket.lang b/htdocs/langs/es_PE/ticket.lang
index 316ed01752a..1f39a627933 100644
--- a/htdocs/langs/es_PE/ticket.lang
+++ b/htdocs/langs/es_PE/ticket.lang
@@ -1,9 +1,5 @@
 # Dolibarr language file - Source file is en_US - ticket
-TicketTypeShortISSUE=Issue, bug or problem
-OriginEmail=Email source
 Read=Leer
-NeedMoreInformation=Waiting for information
 Type=Tipo
 TicketSettings=Configuración
-TicketCategory=Group
 TicketNewEmailBodyInfosTrackUrl=Puedes ver la progresión del ticket haciendo click sobre el seguimiento del ticket.
diff --git a/htdocs/langs/es_PE/users.lang b/htdocs/langs/es_PE/users.lang
index c25a9be3f4e..185c0f9f101 100644
--- a/htdocs/langs/es_PE/users.lang
+++ b/htdocs/langs/es_PE/users.lang
@@ -2,5 +2,3 @@
 DisableUser=Inhabilitar
 DeleteUser=Borrar
 DeleteGroup=Borrar
-NbOfUsers=No. of users
-NbOfPermissions=No. of permissions
diff --git a/htdocs/langs/es_PY/admin.lang b/htdocs/langs/es_PY/admin.lang
index 25265594de5..c1d306ec390 100644
--- a/htdocs/langs/es_PY/admin.lang
+++ b/htdocs/langs/es_PY/admin.lang
@@ -1,4 +1,3 @@
 # Dolibarr language file - Source file is en_US - admin
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/es_PY/products.lang b/htdocs/langs/es_PY/products.lang
deleted file mode 100644
index e0628dbec00..00000000000
--- a/htdocs/langs/es_PY/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
diff --git a/htdocs/langs/es_PY/salaries.lang b/htdocs/langs/es_PY/salaries.lang
deleted file mode 100644
index c9bd3bec17b..00000000000
--- a/htdocs/langs/es_PY/salaries.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - salaries
-LastSalaries=Latest %s salary payments
-AllSalaries=All salary payments
diff --git a/htdocs/langs/es_PY/ticket.lang b/htdocs/langs/es_PY/ticket.lang
deleted file mode 100644
index 82e110b1ca4..00000000000
--- a/htdocs/langs/es_PY/ticket.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - ticket
-TicketTypeShortISSUE=Issue, bug or problem
-OriginEmail=Email source
-NeedMoreInformation=Waiting for information
-TicketCategory=Group
diff --git a/htdocs/langs/es_PY/users.lang b/htdocs/langs/es_PY/users.lang
deleted file mode 100644
index 4a412122b08..00000000000
--- a/htdocs/langs/es_PY/users.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - users
-NbOfUsers=No. of users
-NbOfPermissions=No. of permissions
diff --git a/htdocs/langs/es_PY/website.lang b/htdocs/langs/es_PY/website.lang
deleted file mode 100644
index 910cff6b702..00000000000
--- a/htdocs/langs/es_PY/website.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - website
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
diff --git a/htdocs/langs/es_US/admin.lang b/htdocs/langs/es_US/admin.lang
index 25265594de5..c1d306ec390 100644
--- a/htdocs/langs/es_US/admin.lang
+++ b/htdocs/langs/es_US/admin.lang
@@ -1,4 +1,3 @@
 # Dolibarr language file - Source file is en_US - admin
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/es_US/products.lang b/htdocs/langs/es_US/products.lang
deleted file mode 100644
index e0628dbec00..00000000000
--- a/htdocs/langs/es_US/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
diff --git a/htdocs/langs/es_US/salaries.lang b/htdocs/langs/es_US/salaries.lang
deleted file mode 100644
index c9bd3bec17b..00000000000
--- a/htdocs/langs/es_US/salaries.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - salaries
-LastSalaries=Latest %s salary payments
-AllSalaries=All salary payments
diff --git a/htdocs/langs/es_US/ticket.lang b/htdocs/langs/es_US/ticket.lang
deleted file mode 100644
index 82e110b1ca4..00000000000
--- a/htdocs/langs/es_US/ticket.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - ticket
-TicketTypeShortISSUE=Issue, bug or problem
-OriginEmail=Email source
-NeedMoreInformation=Waiting for information
-TicketCategory=Group
diff --git a/htdocs/langs/es_US/users.lang b/htdocs/langs/es_US/users.lang
deleted file mode 100644
index 4a412122b08..00000000000
--- a/htdocs/langs/es_US/users.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - users
-NbOfUsers=No. of users
-NbOfPermissions=No. of permissions
diff --git a/htdocs/langs/es_US/website.lang b/htdocs/langs/es_US/website.lang
deleted file mode 100644
index 910cff6b702..00000000000
--- a/htdocs/langs/es_US/website.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - website
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
diff --git a/htdocs/langs/es_UY/admin.lang b/htdocs/langs/es_UY/admin.lang
index 25265594de5..c1d306ec390 100644
--- a/htdocs/langs/es_UY/admin.lang
+++ b/htdocs/langs/es_UY/admin.lang
@@ -1,4 +1,3 @@
 # Dolibarr language file - Source file is en_US - admin
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/es_UY/products.lang b/htdocs/langs/es_UY/products.lang
deleted file mode 100644
index e0628dbec00..00000000000
--- a/htdocs/langs/es_UY/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
diff --git a/htdocs/langs/es_UY/salaries.lang b/htdocs/langs/es_UY/salaries.lang
deleted file mode 100644
index c9bd3bec17b..00000000000
--- a/htdocs/langs/es_UY/salaries.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - salaries
-LastSalaries=Latest %s salary payments
-AllSalaries=All salary payments
diff --git a/htdocs/langs/es_UY/ticket.lang b/htdocs/langs/es_UY/ticket.lang
deleted file mode 100644
index 82e110b1ca4..00000000000
--- a/htdocs/langs/es_UY/ticket.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - ticket
-TicketTypeShortISSUE=Issue, bug or problem
-OriginEmail=Email source
-NeedMoreInformation=Waiting for information
-TicketCategory=Group
diff --git a/htdocs/langs/es_UY/users.lang b/htdocs/langs/es_UY/users.lang
deleted file mode 100644
index 4a412122b08..00000000000
--- a/htdocs/langs/es_UY/users.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - users
-NbOfUsers=No. of users
-NbOfPermissions=No. of permissions
diff --git a/htdocs/langs/es_UY/website.lang b/htdocs/langs/es_UY/website.lang
deleted file mode 100644
index 910cff6b702..00000000000
--- a/htdocs/langs/es_UY/website.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - website
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
diff --git a/htdocs/langs/es_VE/admin.lang b/htdocs/langs/es_VE/admin.lang
index 3eaf5ae876c..271cb2be3a5 100644
--- a/htdocs/langs/es_VE/admin.lang
+++ b/htdocs/langs/es_VE/admin.lang
@@ -30,6 +30,5 @@ WatermarkOnDraftSupplierProposal=Marca de agua en solicitudes de precios a prove
 LDAPMemberObjectClassListExample=Lista de ObjectClass que definen los atributos de un registro (ej: top,inetOrgPerson o top,user for active directory)
 LDAPUserObjectClassListExample=Lista de ObjectClass que definen los atributos de un registro (ej: top,inetOrgPerson o top,user for active directory)
 LDAPContactObjectClassListExample=Lista de objectClass que definen los atributos de un registro (ej: top,inetOrgPerson o top,user for active directory)
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/es_VE/products.lang b/htdocs/langs/es_VE/products.lang
index 890163bca26..1b3375e9970 100644
--- a/htdocs/langs/es_VE/products.lang
+++ b/htdocs/langs/es_VE/products.lang
@@ -1,4 +1,8 @@
 # Dolibarr language file - Source file is en_US - products
+ProductDescription=Descripción del Producto
+ProductVatMassChange=Actualización global del IVA
+MassBarcodeInit=Inicialización masiva de código de barra
+MassBarcodeInitDesc=Esta página se puede utilizar para inicializar un código de barras en objetos que no tienen un código de barras definido. Verifique antes de que se complete la configuración del código de barras del módulo.
 ProductsOnSaleOnly=Productos solo a para venta
 ProductsOnPurchaseOnly=Productos solo para compra
 ProductStatusNotOnBuyShort=Fuera compra
diff --git a/htdocs/langs/es_VE/salaries.lang b/htdocs/langs/es_VE/salaries.lang
deleted file mode 100644
index e08b06e4b39..00000000000
--- a/htdocs/langs/es_VE/salaries.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - salaries
-THMDescription=Este valor puede ser utilizado para calcular el costo de tiempo consumido en un proyecto que ponen los usuarios si se utiliza el proyecto de módulo
-TJMDescription=Este valor es actualmente como única información y no se utiliza para cualquier cálculo
diff --git a/htdocs/langs/es_VE/ticket.lang b/htdocs/langs/es_VE/ticket.lang
index bf1d98261e2..29893df37f8 100644
--- a/htdocs/langs/es_VE/ticket.lang
+++ b/htdocs/langs/es_VE/ticket.lang
@@ -1,7 +1,4 @@
 # Dolibarr language file - Source file is en_US - ticket
-TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortOTHER=Otra
-OriginEmail=Email source
-NeedMoreInformation=Waiting for information
 Closed=Cerrada
 Type=Tipo
diff --git a/htdocs/langs/es_VE/users.lang b/htdocs/langs/es_VE/users.lang
deleted file mode 100644
index 4a412122b08..00000000000
--- a/htdocs/langs/es_VE/users.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - users
-NbOfUsers=No. of users
-NbOfPermissions=No. of permissions
diff --git a/htdocs/langs/es_VE/website.lang b/htdocs/langs/es_VE/website.lang
deleted file mode 100644
index 910cff6b702..00000000000
--- a/htdocs/langs/es_VE/website.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - website
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
diff --git a/htdocs/langs/et_EE/admin.lang b/htdocs/langs/et_EE/admin.lang
index 7601ac71601..c8c4421b14c 100644
--- a/htdocs/langs/et_EE/admin.lang
+++ b/htdocs/langs/et_EE/admin.lang
@@ -53,6 +53,7 @@ InternalUser=Sisemine kasutaja
 ExternalUser=Väline kasutaja
 InternalUsers=Sisemised kasutajad
 ExternalUsers=Välised kasutajad
+UserInterface=User interface
 GUISetup=Kuva
 SetupArea=Seadistamine
 UploadNewTemplate=Upload new template(s)
@@ -1260,8 +1261,8 @@ YourPHPDoesNotHaveSSLSupport=Antud PHP ei võimalda SSL funktsioone
 DownloadMoreSkins=Veel alla laetavaid kujundusi
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
-ShowProfIdInAddress=Show professional id with addresses
-ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
+ShowProfIdInAddress=Show professional ID with addresses
+ShowVATIntaInAddress=Hide intra-Community VAT number
 TranslationUncomplete=Osaline tõlge
 MAIN_DISABLE_METEO=Disable meteorological view
 MeteoStdMod=Standard mode
@@ -1778,7 +1779,7 @@ ClickToDialSetup=Click To Dial mooduli seadistamine
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
 ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface, installed on the same computer as the browser, and called when you click on a link starting with "tel:" in your browser. If you need link that start with "sip:" or a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Point of Sale
 CashDeskSetup=Point of Sales module setup
@@ -2133,7 +2134,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
-NotRecommended=Not recommanded
+Recommended=Soovitatav
+NotRecommended=Not recommended
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
@@ -2144,3 +2146,5 @@ YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You s
 RandomlySelectedIfSeveral=Randomly selected if several pictures are available
 DatabasePasswordObfuscated=Database password is obfuscated in conf file
 DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
+APIsAreNotEnabled=APIs modules are not enabled
+YouShouldSetThisToOff=You should set this to 0 or off
diff --git a/htdocs/langs/et_EE/banks.lang b/htdocs/langs/et_EE/banks.lang
index b3b113ab55c..81d8f592967 100644
--- a/htdocs/langs/et_EE/banks.lang
+++ b/htdocs/langs/et_EE/banks.lang
@@ -115,7 +115,7 @@ TransferTo=Kuhu
 TransferFromToDone=Kanne kontolt <b>%s</b> kontole <b>%s</b> väärtuses <b>%s</b> %s on registreeritud.
 CheckTransmitter=Saatja
 ValidateCheckReceipt=Validate this check receipt?
-ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes will be possible once validated.
 DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Pangatšekid
diff --git a/htdocs/langs/et_EE/boxes.lang b/htdocs/langs/et_EE/boxes.lang
index d86d56d95db..4e4b82aa999 100644
--- a/htdocs/langs/et_EE/boxes.lang
+++ b/htdocs/langs/et_EE/boxes.lang
@@ -91,8 +91,8 @@ BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
 BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
 BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
 BoxTitleLastModifiedPropals=Latest %s modified proposals
-BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
-BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
+BoxTitleLatestModifiedJobPositions=Latest %s modified job positions
+BoxTitleLatestModifiedCandidatures=Latest %s modified job applications
 ForCustomersInvoices=Müügiarved
 ForCustomersOrders=Müügiarved
 ForProposals=Pakkumised
diff --git a/htdocs/langs/et_EE/cashdesk.lang b/htdocs/langs/et_EE/cashdesk.lang
index 4138051e489..67ddee7d5ec 100644
--- a/htdocs/langs/et_EE/cashdesk.lang
+++ b/htdocs/langs/et_EE/cashdesk.lang
@@ -127,4 +127,4 @@ AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
 ShowPriceHT = Display the column with the price excluding tax (on screen)
-ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on the receipt)
diff --git a/htdocs/langs/et_EE/errors.lang b/htdocs/langs/et_EE/errors.lang
index 729c1768fc6..fd7764916c3 100644
--- a/htdocs/langs/et_EE/errors.lang
+++ b/htdocs/langs/et_EE/errors.lang
@@ -301,3 +301,4 @@ ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
 ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
+ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
diff --git a/htdocs/langs/et_EE/eventorganization.lang b/htdocs/langs/et_EE/eventorganization.lang
index 2aeb7c22d4d..a293099c81f 100644
--- a/htdocs/langs/et_EE/eventorganization.lang
+++ b/htdocs/langs/et_EE/eventorganization.lang
@@ -86,6 +86,7 @@ DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
 SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
 SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
+NbVotes=Number of votes
 #
 # Status
 #
@@ -115,6 +116,9 @@ EvntOrgDuration = This conference starts on %s and ends on %s.
 ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
 BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
 EventType = Sündmuse tüüp
+LabelOfBooth=Booth label
+LabelOfconference=Conference label
+ConferenceIsNotConfirmed=Subcription not available, conference is not confirmed yet
 
 #
 # Vote page
diff --git a/htdocs/langs/et_EE/install.lang b/htdocs/langs/et_EE/install.lang
index f89a2c5d868..05bb80c548f 100644
--- a/htdocs/langs/et_EE/install.lang
+++ b/htdocs/langs/et_EE/install.lang
@@ -206,6 +206,7 @@ MigrationUserPhotoPath=Migration of photo paths for users
 MigrationFieldsSocialNetworks=Migration of users fields social networks (%s)
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
+MigrationImportOrExportProfiles=Migration of import or export profiles (%s)
 ShowNotAvailableOptions=Show unavailable options
 HideNotAvailableOptions=Hide unavailable options
 ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
diff --git a/htdocs/langs/et_EE/interventions.lang b/htdocs/langs/et_EE/interventions.lang
index 9f2db49e62c..c169cb3abb6 100644
--- a/htdocs/langs/et_EE/interventions.lang
+++ b/htdocs/langs/et_EE/interventions.lang
@@ -64,3 +64,5 @@ InterLineDuration=Line duration intervention
 InterLineDesc=Line description intervention
 RepeatableIntervention=Template of intervention
 ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
+Reopen=Reopen
+ConfirmReopenIntervention=Are you sure you want to open back the intervention <b>%s</b>?
diff --git a/htdocs/langs/et_EE/productbatch.lang b/htdocs/langs/et_EE/productbatch.lang
index fc918eb815e..6faf773f01c 100644
--- a/htdocs/langs/et_EE/productbatch.lang
+++ b/htdocs/langs/et_EE/productbatch.lang
@@ -26,12 +26,10 @@ ShowLogOfMovementIfLot=Show log of movements for couple product/lot
 StockDetailPerBatch=Stock detail per lot
 SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
-BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
-BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
 ManageLotMask=Custom mask
-CustomMasks=Adds an option to define mask in the product card
-LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
-SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+CustomMasks=Option to define a different numbering mask for each product
+BatchLotNumberingModules=Numbering rule for automatic generation of lot number
+BatchSerialNumberingModules=Numbering rule for automatic generation of serial number (for products with property 1 unique lot/serial for each product)
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
diff --git a/htdocs/langs/et_EE/products.lang b/htdocs/langs/et_EE/products.lang
index 9e8e3e907ef..204a655a913 100644
--- a/htdocs/langs/et_EE/products.lang
+++ b/htdocs/langs/et_EE/products.lang
@@ -277,7 +277,7 @@ PriceByCustomer=Different prices for each customer
 PriceCatalogue=A single sell price per product/service
 PricingRule=Rules for selling prices
 AddCustomerPrice=Add price by customer
-ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
+ForceUpdateChildPriceSoc=Set same price on customer's subsidiaries
 PriceByCustomerLog=Log of previous customer prices
 MinimumPriceLimit=Minimum price can't be lower then %s
 MinimumRecommendedPrice=Minimum recommended price is: %s
@@ -296,6 +296,7 @@ ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Child products
 MinSupplierPrice=Minimaalne ostuhind
 MinCustomerPrice=Minimum selling price
+NoDynamicPrice=No dynamic price
 DynamicPriceConfiguration=Dynamic price configuration
 DynamicPriceDesc=You may define mathematical formulae to calculate Customer or Vendor prices. Such formulas can use all mathematical operators, some constants and variables. You can define here the variables you wish to use. If the variable needs an automatic update, you may define the external URL to allow Dolibarr to update the value automatically.
 AddVariable=Add Variable
diff --git a/htdocs/langs/et_EE/salaries.lang b/htdocs/langs/et_EE/salaries.lang
index d3ee991fc6e..2b0d9e69b4d 100644
--- a/htdocs/langs/et_EE/salaries.lang
+++ b/htdocs/langs/et_EE/salaries.lang
@@ -2,20 +2,23 @@
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=By default, leave empty the option "Automatically create a total payment" when creating a Salary
 Salary=Palk
 Salaries=Palgad
-NewSalaryPayment=Uus palga makse
+NewSalary=New salary
+NewSalaryPayment=New salary card
 AddSalaryPayment=Add salary payment
 SalaryPayment=Palga makse
 SalariesPayments=Palkade maksed
+SalariesPaymentsOf=Salaries payments of %s
 ShowSalaryPayment=Näita palga makset
 THM=Average hourly rate
 TJM=Average daily rate
 CurrentSalary=Current salary
 THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
 TJMDescription=This value is currently for information only and is not used for any calculation
-LastSalaries=Latest %s salary payments
-AllSalaries=All salary payments
+LastSalaries=Latest %s salaries
+AllSalaries=All salaries
 SalariesStatistics=Salary statistics
-# Export
 SalariesAndPayments=Salaries and payments
+ConfirmDeleteSalaryPayment=Do you want to delete this salary payment ?
diff --git a/htdocs/langs/et_EE/ticket.lang b/htdocs/langs/et_EE/ticket.lang
index d2750a58d9d..0c5db5afc31 100644
--- a/htdocs/langs/et_EE/ticket.lang
+++ b/htdocs/langs/et_EE/ticket.lang
@@ -34,7 +34,8 @@ TicketDictResolution=Ticket - Resolution
 
 TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
-TicketTypeShortISSUE=Issue, bug or problem
+TicketTypeShortISSUE=Issue or bug
+TicketTypeShortPROBLEM=Problem
 TicketTypeShortREQUEST=Change or enhancement request
 TicketTypeShortPROJET=Projekt
 TicketTypeShortOTHER=Muu
@@ -54,14 +55,15 @@ TypeContact_ticket_internal_SUPPORTTEC=Assigned user
 TypeContact_ticket_external_SUPPORTCLI=Customer contact / incident tracking
 TypeContact_ticket_external_CONTRIBUTOR=External contributor
 
-OriginEmail=Email source
+OriginEmail=Reporter Email
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
 Read=Loe
 Assigned=Assigned
 InProgress=In progress
-NeedMoreInformation=Waiting for information
+NeedMoreInformation=Waiting for reporter feedback
+NeedMoreInformationShort=Waiting for feedback
 Answered=Answered
 Waiting=Ootel
 Closed=Suletud
@@ -160,7 +162,7 @@ CreatedBy=Created by
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Rühm
+TicketCategory=Ticket categorization
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
@@ -211,6 +213,7 @@ TicketMessageHelp=Only this text will be saved in the message list on ticket car
 TicketMessageSubstitutionReplacedByGenericValues=Substitutions variables are replaced by generic values.
 TimeElapsedSince=Time elapsed since
 TicketTimeToRead=Time elapsed before read
+TicketTimeElapsedBeforeSince=Time elapsed before / since
 TicketContacts=Contacts ticket
 TicketDocumentsLinked=Documents linked to ticket
 ConfirmReOpenTicket=Confirm reopen this ticket ?
diff --git a/htdocs/langs/et_EE/users.lang b/htdocs/langs/et_EE/users.lang
index 9898bac8b6d..16e4557ac3d 100644
--- a/htdocs/langs/et_EE/users.lang
+++ b/htdocs/langs/et_EE/users.lang
@@ -97,8 +97,8 @@ LoginToCreate=Loodav kasutajanimi
 NameToCreate=Loodava kolmanda isiku nimi
 YourRole=Sinu rollid
 YourQuotaOfUsersIsReached=Sinu aktiivsete kasutajate kvoot on täis!
-NbOfUsers=No. of users
-NbOfPermissions=No. of permissions
+NbOfUsers=Number of users
+NbOfPermissions=Number of permissions
 DontDowngradeSuperAdmin=Ainult superadministraator saab ära võtta superadministraatori õigusi
 HierarchicalResponsible=Supervisor
 HierarchicView=Struktuuri vaade
diff --git a/htdocs/langs/et_EE/website.lang b/htdocs/langs/et_EE/website.lang
index ba5d90f597c..6c4c9ab817c 100644
--- a/htdocs/langs/et_EE/website.lang
+++ b/htdocs/langs/et_EE/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 PageContainer=Lehekülg
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
+PreviewOfSiteNotYetAvailable=The preview of your website <strong>%s</strong> is not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
diff --git a/htdocs/langs/eu_ES/admin.lang b/htdocs/langs/eu_ES/admin.lang
index 997c5d55f17..b6f5b58e0b6 100644
--- a/htdocs/langs/eu_ES/admin.lang
+++ b/htdocs/langs/eu_ES/admin.lang
@@ -53,6 +53,7 @@ InternalUser=Barneko erabiltzailea
 ExternalUser=Kanpoko erabiltzailea
 InternalUsers=Barneko erabiltzaileak
 ExternalUsers=Kanpoko erabiltzaileak
+UserInterface=User interface
 GUISetup=Itxura
 SetupArea=Konfigurazioa
 UploadNewTemplate=Upload new template(s)
@@ -1260,8 +1261,8 @@ YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP
 DownloadMoreSkins=More skins to download
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
-ShowProfIdInAddress=Show professional id with addresses
-ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
+ShowProfIdInAddress=Show professional ID with addresses
+ShowVATIntaInAddress=Hide intra-Community VAT number
 TranslationUncomplete=Partial translation
 MAIN_DISABLE_METEO=Disable meteorological view
 MeteoStdMod=Standard mode
@@ -1778,7 +1779,7 @@ ClickToDialSetup=Click To Dial module setup
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
 ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface, installed on the same computer as the browser, and called when you click on a link starting with "tel:" in your browser. If you need link that start with "sip:" or a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Point of Sale
 CashDeskSetup=Point of Sales module setup
@@ -2133,7 +2134,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
-NotRecommended=Not recommanded
+Recommended=Gomendatua
+NotRecommended=Not recommended
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
@@ -2144,3 +2146,5 @@ YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You s
 RandomlySelectedIfSeveral=Randomly selected if several pictures are available
 DatabasePasswordObfuscated=Database password is obfuscated in conf file
 DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
+APIsAreNotEnabled=APIs modules are not enabled
+YouShouldSetThisToOff=You should set this to 0 or off
diff --git a/htdocs/langs/eu_ES/banks.lang b/htdocs/langs/eu_ES/banks.lang
index 222600a6f21..0ba2263650a 100644
--- a/htdocs/langs/eu_ES/banks.lang
+++ b/htdocs/langs/eu_ES/banks.lang
@@ -115,7 +115,7 @@ TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
 CheckTransmitter=Sender
 ValidateCheckReceipt=Validate this check receipt?
-ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes will be possible once validated.
 DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
diff --git a/htdocs/langs/eu_ES/boxes.lang b/htdocs/langs/eu_ES/boxes.lang
index 1b6d9981dcb..140d3e05df1 100644
--- a/htdocs/langs/eu_ES/boxes.lang
+++ b/htdocs/langs/eu_ES/boxes.lang
@@ -91,8 +91,8 @@ BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
 BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
 BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
 BoxTitleLastModifiedPropals=Latest %s modified proposals
-BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
-BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
+BoxTitleLatestModifiedJobPositions=Latest %s modified job positions
+BoxTitleLatestModifiedCandidatures=Latest %s modified job applications
 ForCustomersInvoices=Customers invoices
 ForCustomersOrders=Customers orders
 ForProposals=Proposamenak
diff --git a/htdocs/langs/eu_ES/cashdesk.lang b/htdocs/langs/eu_ES/cashdesk.lang
index d44d0f51a27..02924b9aeb5 100644
--- a/htdocs/langs/eu_ES/cashdesk.lang
+++ b/htdocs/langs/eu_ES/cashdesk.lang
@@ -127,4 +127,4 @@ AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
 ShowPriceHT = Display the column with the price excluding tax (on screen)
-ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on the receipt)
diff --git a/htdocs/langs/eu_ES/errors.lang b/htdocs/langs/eu_ES/errors.lang
index 670f8c7a6bc..85b90ca4991 100644
--- a/htdocs/langs/eu_ES/errors.lang
+++ b/htdocs/langs/eu_ES/errors.lang
@@ -301,3 +301,4 @@ ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
 ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
+ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
diff --git a/htdocs/langs/eu_ES/eventorganization.lang b/htdocs/langs/eu_ES/eventorganization.lang
index 335c257b224..f361e6bc192 100644
--- a/htdocs/langs/eu_ES/eventorganization.lang
+++ b/htdocs/langs/eu_ES/eventorganization.lang
@@ -86,6 +86,7 @@ DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
 SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
 SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
+NbVotes=Number of votes
 #
 # Status
 #
@@ -115,6 +116,9 @@ EvntOrgDuration = This conference starts on %s and ends on %s.
 ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
 BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
 EventType = Event type
+LabelOfBooth=Booth label
+LabelOfconference=Conference label
+ConferenceIsNotConfirmed=Subcription not available, conference is not confirmed yet
 
 #
 # Vote page
diff --git a/htdocs/langs/eu_ES/install.lang b/htdocs/langs/eu_ES/install.lang
index 63947dad154..c1ffee936d7 100644
--- a/htdocs/langs/eu_ES/install.lang
+++ b/htdocs/langs/eu_ES/install.lang
@@ -206,6 +206,7 @@ MigrationUserPhotoPath=Migration of photo paths for users
 MigrationFieldsSocialNetworks=Migration of users fields social networks (%s)
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
+MigrationImportOrExportProfiles=Migration of import or export profiles (%s)
 ShowNotAvailableOptions=Show unavailable options
 HideNotAvailableOptions=Hide unavailable options
 ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
diff --git a/htdocs/langs/eu_ES/interventions.lang b/htdocs/langs/eu_ES/interventions.lang
index e5936f8246e..51079fca278 100644
--- a/htdocs/langs/eu_ES/interventions.lang
+++ b/htdocs/langs/eu_ES/interventions.lang
@@ -64,3 +64,5 @@ InterLineDuration=Line duration intervention
 InterLineDesc=Line description intervention
 RepeatableIntervention=Template of intervention
 ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
+Reopen=Reopen
+ConfirmReopenIntervention=Are you sure you want to open back the intervention <b>%s</b>?
diff --git a/htdocs/langs/eu_ES/productbatch.lang b/htdocs/langs/eu_ES/productbatch.lang
index 1c7a90fb6a0..9763bc18081 100644
--- a/htdocs/langs/eu_ES/productbatch.lang
+++ b/htdocs/langs/eu_ES/productbatch.lang
@@ -26,12 +26,10 @@ ShowLogOfMovementIfLot=Show log of movements for couple product/lot
 StockDetailPerBatch=Stock detail per lot
 SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
-BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
-BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
 ManageLotMask=Custom mask
-CustomMasks=Adds an option to define mask in the product card
-LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
-SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+CustomMasks=Option to define a different numbering mask for each product
+BatchLotNumberingModules=Numbering rule for automatic generation of lot number
+BatchSerialNumberingModules=Numbering rule for automatic generation of serial number (for products with property 1 unique lot/serial for each product)
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
diff --git a/htdocs/langs/eu_ES/products.lang b/htdocs/langs/eu_ES/products.lang
index 5b433015be3..9e79be7d962 100644
--- a/htdocs/langs/eu_ES/products.lang
+++ b/htdocs/langs/eu_ES/products.lang
@@ -277,7 +277,7 @@ PriceByCustomer=Different prices for each customer
 PriceCatalogue=A single sell price per product/service
 PricingRule=Rules for selling prices
 AddCustomerPrice=Add price by customer
-ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
+ForceUpdateChildPriceSoc=Set same price on customer's subsidiaries
 PriceByCustomerLog=Log of previous customer prices
 MinimumPriceLimit=Minimum price can't be lower then %s
 MinimumRecommendedPrice=Minimum recommended price is: %s
@@ -296,6 +296,7 @@ ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Child products
 MinSupplierPrice=Minimum buying price
 MinCustomerPrice=Minimum selling price
+NoDynamicPrice=No dynamic price
 DynamicPriceConfiguration=Dynamic price configuration
 DynamicPriceDesc=You may define mathematical formulae to calculate Customer or Vendor prices. Such formulas can use all mathematical operators, some constants and variables. You can define here the variables you wish to use. If the variable needs an automatic update, you may define the external URL to allow Dolibarr to update the value automatically.
 AddVariable=Add Variable
diff --git a/htdocs/langs/eu_ES/salaries.lang b/htdocs/langs/eu_ES/salaries.lang
index f73ea288346..76bd89a54f6 100644
--- a/htdocs/langs/eu_ES/salaries.lang
+++ b/htdocs/langs/eu_ES/salaries.lang
@@ -2,20 +2,23 @@
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=By default, leave empty the option "Automatically create a total payment" when creating a Salary
 Salary=Soldata
 Salaries=Soldatak
-NewSalaryPayment=Soldata ordainketa berria
+NewSalary=New salary
+NewSalaryPayment=New salary card
 AddSalaryPayment=Add salary payment
 SalaryPayment=Soldata ordainketa
 SalariesPayments=Soldaten ordainketak
+SalariesPaymentsOf=Salaries payments of %s
 ShowSalaryPayment=Soldataren ordainketa erakutsi
 THM=Average hourly rate
 TJM=Average daily rate
 CurrentSalary=Current salary
 THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
 TJMDescription=This value is currently for information only and is not used for any calculation
-LastSalaries=Latest %s salary payments
-AllSalaries=All salary payments
+LastSalaries=Latest %s salaries
+AllSalaries=All salaries
 SalariesStatistics=Salary statistics
-# Export
 SalariesAndPayments=Salaries and payments
+ConfirmDeleteSalaryPayment=Do you want to delete this salary payment ?
diff --git a/htdocs/langs/eu_ES/ticket.lang b/htdocs/langs/eu_ES/ticket.lang
index 36e88ee96aa..2f412bce3e3 100644
--- a/htdocs/langs/eu_ES/ticket.lang
+++ b/htdocs/langs/eu_ES/ticket.lang
@@ -34,7 +34,8 @@ TicketDictResolution=Ticket - Resolution
 
 TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
-TicketTypeShortISSUE=Issue, bug or problem
+TicketTypeShortISSUE=Issue or bug
+TicketTypeShortPROBLEM=Problem
 TicketTypeShortREQUEST=Change or enhancement request
 TicketTypeShortPROJET=Project
 TicketTypeShortOTHER=Besteak
@@ -54,14 +55,15 @@ TypeContact_ticket_internal_SUPPORTTEC=Assigned user
 TypeContact_ticket_external_SUPPORTCLI=Customer contact / incident tracking
 TypeContact_ticket_external_CONTRIBUTOR=External contributor
 
-OriginEmail=Email source
+OriginEmail=Reporter Email
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
 Read=Read
 Assigned=Assigned
 InProgress=In progress
-NeedMoreInformation=Waiting for information
+NeedMoreInformation=Waiting for reporter feedback
+NeedMoreInformationShort=Waiting for feedback
 Answered=Answered
 Waiting=Waiting
 Closed=Closed
@@ -160,7 +162,7 @@ CreatedBy=Created by
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Taldea
+TicketCategory=Ticket categorization
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
@@ -211,6 +213,7 @@ TicketMessageHelp=Only this text will be saved in the message list on ticket car
 TicketMessageSubstitutionReplacedByGenericValues=Substitutions variables are replaced by generic values.
 TimeElapsedSince=Time elapsed since
 TicketTimeToRead=Time elapsed before read
+TicketTimeElapsedBeforeSince=Time elapsed before / since
 TicketContacts=Contacts ticket
 TicketDocumentsLinked=Documents linked to ticket
 ConfirmReOpenTicket=Confirm reopen this ticket ?
diff --git a/htdocs/langs/eu_ES/users.lang b/htdocs/langs/eu_ES/users.lang
index c9a8003ee87..c7b66cbf637 100644
--- a/htdocs/langs/eu_ES/users.lang
+++ b/htdocs/langs/eu_ES/users.lang
@@ -97,8 +97,8 @@ LoginToCreate=Login to create
 NameToCreate=Name of third party to create
 YourRole=Your roles
 YourQuotaOfUsersIsReached=Your quota of active users is reached !
-NbOfUsers=No. of users
-NbOfPermissions=No. of permissions
+NbOfUsers=Number of users
+NbOfPermissions=Number of permissions
 DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin
 HierarchicalResponsible=Supervisor
 HierarchicView=Hierarchical view
diff --git a/htdocs/langs/eu_ES/website.lang b/htdocs/langs/eu_ES/website.lang
index 5a23a52885b..301b65b4efa 100644
--- a/htdocs/langs/eu_ES/website.lang
+++ b/htdocs/langs/eu_ES/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 PageContainer=Page
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
+PreviewOfSiteNotYetAvailable=The preview of your website <strong>%s</strong> is not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
diff --git a/htdocs/langs/fa_IR/admin.lang b/htdocs/langs/fa_IR/admin.lang
index 8d77e7206b5..a7154469d98 100644
--- a/htdocs/langs/fa_IR/admin.lang
+++ b/htdocs/langs/fa_IR/admin.lang
@@ -53,6 +53,7 @@ InternalUser=کاربر داخلی
 ExternalUser=کاربر خارجی
 InternalUsers=کاربران داخلی
 ExternalUsers=کاربران خارجی
+UserInterface=User interface
 GUISetup=نمایش
 SetupArea=برپاسازی
 UploadNewTemplate=بارگذاری قالب‌(های) جدید
@@ -1260,8 +1261,8 @@ YourPHPDoesNotHaveSSLSupport=توابع SSL در PHP شما موجود نیست
 DownloadMoreSkins=پوسته‌های بیشتر برای دریافت
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
-ShowProfIdInAddress=نمایش شناسۀ حرفه‌ای و نشانی 
-ShowVATIntaInAddress=پنهان کردن شمارۀ م‌ب‌اا داخل‌جامعه‌ای-اروپا به‌همراه نشانی‌ها
+ShowProfIdInAddress=Show professional ID with addresses
+ShowVATIntaInAddress=Hide intra-Community VAT number
 TranslationUncomplete=ترجمه جزئی
 MAIN_DISABLE_METEO=غیرفعال‌کردن نمای هواشناسانه
 MeteoStdMod=حالت استاندارد
@@ -1778,7 +1779,7 @@ ClickToDialSetup=برپاسازی واحد کلیک برای شماره‌گیر
 ClickToDialUrlDesc=یک نشانی‌اینترنتی در هنگام کلیک بر روی نماد تلفن فراخوان می‌شود. در نشانی‌اینترنتی شما می‌توانید از برچسب‌های <br><b>__PHONETO__</b> که با شمارۀ یک شخص برای تماس است تعویض خواهد شد، <br><b>__PHONEFROM__</b> که با شمارۀ شخص تماس گیرنده (شما) تعویض خواهد شد <br><b>__LOGIN__</b> که با شناسۀ ورود clicktodial (تعریف شده در کارت کاربر) تعویض خواهد شد، <br><b>__PASS__</b> که با گذرواژۀ clicktodial (تعریف شده در کارت کاربر) تعویض خواهد شد.
 ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=فقط یک عبارت "tel:" به پیوند شماره‌تلفن‌ها اضافه شود
-ClickToDialUseTelLinkDesc=این گزینه را برای حالتی اضافه کنید که کاربران شما یک تلفن‌مجازی یا یک رابط نرم‌افزاری روی رایانۀ خود و یا مرورگر خود نصب دارند، این نرم‌افزارها در هنگامی فراخوان خواهند شد که پیوندی با پیشوند "tel:" کلیک شود. در صورتی که شما به یک سرور تمام عیار احتیاج دارید (که نیازی به نصب نرم افزار محلی ندارد)، شما باید گزینۀ "خیر" را انتخاب کرده و بخش بعدی را پر کنید.
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface, installed on the same computer as the browser, and called when you click on a link starting with "tel:" in your browser. If you need link that start with "sip:" or a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=صندوق
 CashDeskSetup=برپاسازی واحد صندوق
@@ -2133,7 +2134,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
-NotRecommended=Not recommanded
+Recommended=توصیه شده
+NotRecommended=Not recommended
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
@@ -2144,3 +2146,5 @@ YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You s
 RandomlySelectedIfSeveral=Randomly selected if several pictures are available
 DatabasePasswordObfuscated=Database password is obfuscated in conf file
 DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
+APIsAreNotEnabled=APIs modules are not enabled
+YouShouldSetThisToOff=You should set this to 0 or off
diff --git a/htdocs/langs/fa_IR/banks.lang b/htdocs/langs/fa_IR/banks.lang
index 29ea11ddce1..90530ed6f4d 100644
--- a/htdocs/langs/fa_IR/banks.lang
+++ b/htdocs/langs/fa_IR/banks.lang
@@ -115,7 +115,7 @@ TransferTo=به
 TransferFromToDone=یک انتقال از <b>%s</b> به <b>%s</b> مربوط به <b>%s</b>%s ثبت شد.
 CheckTransmitter=فرستنده
 ValidateCheckReceipt=اعتباردهی به این رسید چک؟
-ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes will be possible once validated.
 DeleteCheckReceipt=حذف این رسید چک
 ConfirmDeleteCheckReceipt=آیا مطمئنید می‌خواهید این رسیدچک را حذف کنید؟
 BankChecks=چک‌های بانکی
diff --git a/htdocs/langs/fa_IR/boxes.lang b/htdocs/langs/fa_IR/boxes.lang
index 96776de5b0b..9d14606e660 100644
--- a/htdocs/langs/fa_IR/boxes.lang
+++ b/htdocs/langs/fa_IR/boxes.lang
@@ -91,8 +91,8 @@ BoxTitleLatestModifiedSupplierOrders=سفارشات به فروشنده: آخر
 BoxTitleLastModifiedCustomerBills=صورت‌حساب‌های مشتری: آخرین %s تغییریافته
 BoxTitleLastModifiedCustomerOrders=سفارشات فروش: آخرین %s تغییریافته
 BoxTitleLastModifiedPropals=آخرین %s پیشنهاد تغییریافته
-BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
-BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
+BoxTitleLatestModifiedJobPositions=Latest %s modified job positions
+BoxTitleLatestModifiedCandidatures=Latest %s modified job applications
 ForCustomersInvoices=صورت‌حساب‌های مشتریان
 ForCustomersOrders=سفارشات مشتریان
 ForProposals=پیشنهادات
diff --git a/htdocs/langs/fa_IR/cashdesk.lang b/htdocs/langs/fa_IR/cashdesk.lang
index c512095ac7e..dd9bdac7a46 100644
--- a/htdocs/langs/fa_IR/cashdesk.lang
+++ b/htdocs/langs/fa_IR/cashdesk.lang
@@ -127,4 +127,4 @@ AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
 ShowPriceHT = Display the column with the price excluding tax (on screen)
-ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on the receipt)
diff --git a/htdocs/langs/fa_IR/errors.lang b/htdocs/langs/fa_IR/errors.lang
index 2267961f825..744448668ab 100644
--- a/htdocs/langs/fa_IR/errors.lang
+++ b/htdocs/langs/fa_IR/errors.lang
@@ -301,3 +301,4 @@ ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
 ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
+ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
diff --git a/htdocs/langs/fa_IR/eventorganization.lang b/htdocs/langs/fa_IR/eventorganization.lang
index 56db47c070e..7f259e7eb7c 100644
--- a/htdocs/langs/fa_IR/eventorganization.lang
+++ b/htdocs/langs/fa_IR/eventorganization.lang
@@ -86,6 +86,7 @@ DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
 SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
 SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
+NbVotes=Number of votes
 #
 # Status
 #
@@ -115,6 +116,9 @@ EvntOrgDuration = This conference starts on %s and ends on %s.
 ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
 BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
 EventType = نوع روی‌دا
+LabelOfBooth=Booth label
+LabelOfconference=Conference label
+ConferenceIsNotConfirmed=Subcription not available, conference is not confirmed yet
 
 #
 # Vote page
diff --git a/htdocs/langs/fa_IR/install.lang b/htdocs/langs/fa_IR/install.lang
index 88f93c2c2b8..442890c4649 100644
--- a/htdocs/langs/fa_IR/install.lang
+++ b/htdocs/langs/fa_IR/install.lang
@@ -206,6 +206,7 @@ MigrationUserPhotoPath=انتقال مسیرهای تصاویر مربوط به
 MigrationFieldsSocialNetworks=Migration of users fields social networks (%s)
 MigrationReloadModule=بارگذاری دوبارۀ واحد %s
 MigrationResetBlockedLog=بازنشانی واحد BlockedLog  برای الگوریتم نسخۀ 7
+MigrationImportOrExportProfiles=Migration of import or export profiles (%s)
 ShowNotAvailableOptions=نمایش گزینه‌های خارج‌ازدسترس
 HideNotAvailableOptions=پنهان کردن گزینه‌های خارج از دسترس
 ErrorFoundDuringMigration=خطا(ها)ئی که در طول انجام انتقال گزارش می‌شوند و منجر به این می‌شوند گام بعدی فعال نباشد. برای نادیده گرفتن خطاها شما باید <a href="%s">اینجا کلیک کنید</a>، اما ممکن است برنامه یا برخی قابلیت‌ها تا زمانی که خطاها رفع نشود، کار نکند.
diff --git a/htdocs/langs/fa_IR/interventions.lang b/htdocs/langs/fa_IR/interventions.lang
index 546e61e10b5..37f539fb6eb 100644
--- a/htdocs/langs/fa_IR/interventions.lang
+++ b/htdocs/langs/fa_IR/interventions.lang
@@ -64,3 +64,5 @@ InterLineDuration=طول‌مدت سطر پادرمیانی
 InterLineDesc=توضیحات سطر پادرمیانی
 RepeatableIntervention=Template of intervention
 ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
+Reopen=Reopen
+ConfirmReopenIntervention=Are you sure you want to open back the intervention <b>%s</b>?
diff --git a/htdocs/langs/fa_IR/productbatch.lang b/htdocs/langs/fa_IR/productbatch.lang
index 8b91d0b6960..bd0b4efd04d 100644
--- a/htdocs/langs/fa_IR/productbatch.lang
+++ b/htdocs/langs/fa_IR/productbatch.lang
@@ -26,12 +26,10 @@ ShowLogOfMovementIfLot=نمایش گزارش‌کار جابجائی‌های م
 StockDetailPerBatch=جزئیات موجودی هر سری‌ساخت
 SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
-BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
-BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
 ManageLotMask=Custom mask
-CustomMasks=Adds an option to define mask in the product card
-LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
-SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+CustomMasks=Option to define a different numbering mask for each product
+BatchLotNumberingModules=Numbering rule for automatic generation of lot number
+BatchSerialNumberingModules=Numbering rule for automatic generation of serial number (for products with property 1 unique lot/serial for each product)
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
diff --git a/htdocs/langs/fa_IR/products.lang b/htdocs/langs/fa_IR/products.lang
index a199ff418ed..be681f79ce0 100644
--- a/htdocs/langs/fa_IR/products.lang
+++ b/htdocs/langs/fa_IR/products.lang
@@ -277,7 +277,7 @@ PriceByCustomer=قیمت متفاوت برای هر مشتری
 PriceCatalogue=یک قیمت واحد برای هر محصول/خدمات
 PricingRule=مقررات قیمت‌های فروش
 AddCustomerPrice=افزودن قیمت برحسب مشتری
-ForceUpdateChildPriceSoc=تنظیم قیمت تعیین شده برای مشتری برای زیرمجموعه‌های آن
+ForceUpdateChildPriceSoc=Set same price on customer's subsidiaries
 PriceByCustomerLog=ثبت‌گزارش همۀ قیمت‌های قبلی مربوط به مشتری
 MinimumPriceLimit=حداقل قیمت نمی‌تواند کمتر از %s باشد
 MinimumRecommendedPrice=حداقل قیمت پیشنهادی برابر است با: %s
@@ -296,6 +296,7 @@ ComposedProductIncDecStock=کم/زیاد کردن موجودی در هنگام 
 ComposedProduct=محصولات فرزند
 MinSupplierPrice=حداقل قیمت خرید
 MinCustomerPrice=حداقل قیمت فروش
+NoDynamicPrice=No dynamic price
 DynamicPriceConfiguration=پیکربندی قیمت پویا
 DynamicPriceDesc=شما می‌توانید فرمول ریاضی برای محاسبۀ قیمت‌های مشتری یا فروشنده تعریف کنید. چنین فرمول‌هائی امکان استفاده از عمل‌گرهای ریاضی را بعلاوۀ تعداد مقدارثابت و متغیر دارند. شما می‌توانید در اینجا متغیرهائی که برای استفاده نیاز دارید تعریف کنید. در صورتی که متغیر نیازمند به‌روز‌رسانی خودکار باشد، شما باید نشانی خارجی متعلق به آن را برای به‌روز‌رسانی خودکار مقدار آن به Dolibarr بدهید
 AddVariable=افزودن متغیر
diff --git a/htdocs/langs/fa_IR/salaries.lang b/htdocs/langs/fa_IR/salaries.lang
index 30a8abd15d1..800337b1103 100644
--- a/htdocs/langs/fa_IR/salaries.lang
+++ b/htdocs/langs/fa_IR/salaries.lang
@@ -2,20 +2,23 @@
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=By default, leave empty the option "Automatically create a total payment" when creating a Salary
 Salary=حقوق
 Salaries=حقوق
-NewSalaryPayment=پرداخت حقوق و دستمزد جدید
+NewSalary=New salary
+NewSalaryPayment=New salary card
 AddSalaryPayment=Add salary payment
 SalaryPayment=پرداخت حقوق و دستمزد
 SalariesPayments=حقوق پرداخت
+SalariesPaymentsOf=Salaries payments of %s
 ShowSalaryPayment=نمایش پرداخت حقوق و دستمزد
 THM=Average hourly rate
 TJM=Average daily rate
 CurrentSalary=Current salary
 THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
 TJMDescription=This value is currently for information only and is not used for any calculation
-LastSalaries=Latest %s salary payments
-AllSalaries=All salary payments
+LastSalaries=Latest %s salaries
+AllSalaries=All salaries
 SalariesStatistics=Salary statistics
-# Export
 SalariesAndPayments=Salaries and payments
+ConfirmDeleteSalaryPayment=Do you want to delete this salary payment ?
diff --git a/htdocs/langs/fa_IR/ticket.lang b/htdocs/langs/fa_IR/ticket.lang
index 3fbcff25590..08f79aa9074 100644
--- a/htdocs/langs/fa_IR/ticket.lang
+++ b/htdocs/langs/fa_IR/ticket.lang
@@ -34,7 +34,8 @@ TicketDictResolution=Ticket - Resolution
 
 TicketTypeShortCOM=سوال تجاری
 TicketTypeShortHELP=Request for functionnal help
-TicketTypeShortISSUE=Issue, bug or problem
+TicketTypeShortISSUE=Issue or bug
+TicketTypeShortPROBLEM=Problem
 TicketTypeShortREQUEST=Change or enhancement request
 TicketTypeShortPROJET=طرح
 TicketTypeShortOTHER=سایر
@@ -54,14 +55,15 @@ TypeContact_ticket_internal_SUPPORTTEC=کاربر نسبت داده شده
 TypeContact_ticket_external_SUPPORTCLI=طرف‌تماس‌مشتری / ره‌گیری حادثه
 TypeContact_ticket_external_CONTRIBUTOR=مشارکت‌کنندۀ بیرونی
 
-OriginEmail=منبع رایانامه
+OriginEmail=Reporter Email
 Notify_TICKET_SENTBYMAIL=ارسال پیام برگه با رایانامه
 
 # Status
 Read=خوانده‌شده
 Assigned=نسبت‌داده شده
 InProgress=در حال انجام
-NeedMoreInformation=در انتظار اطلاعات
+NeedMoreInformation=Waiting for reporter feedback
+NeedMoreInformationShort=Waiting for feedback
 Answered=پاسخ داده شده
 Waiting=در انتظار
 Closed=بسته
@@ -160,7 +162,7 @@ CreatedBy=ساخته‌شده توسط
 NewTicket=برگۀ جدید
 SubjectAnswerToTicket=پاسخ برگه
 TicketTypeRequest=نوع درخواست
-TicketCategory=گروه
+TicketCategory=Ticket categorization
 SeeTicket=نمایش برگه
 TicketMarkedAsRead=برگه به صورت خوانده شده علامت‌گذاری شد
 TicketReadOn=خواندن
@@ -211,6 +213,7 @@ TicketMessageHelp=تنها این نوشته در فهرست پیام در کا
 TicketMessageSubstitutionReplacedByGenericValues=متغیرهای جایگزین با مقادیر عمومی جایگزین خواهند شد
 TimeElapsedSince=زمان سپری شده از
 TicketTimeToRead=زمان سپری شد قبل از خوانده‌شدن
+TicketTimeElapsedBeforeSince=Time elapsed before / since
 TicketContacts=برگۀ طرف‌های تماس
 TicketDocumentsLinked=مستندات پیوند شده با برگۀ‌تماس
 ConfirmReOpenTicket=تائید بازگشائی این برگه؟
diff --git a/htdocs/langs/fa_IR/users.lang b/htdocs/langs/fa_IR/users.lang
index 3c3e52aaea5..cabc87573d0 100644
--- a/htdocs/langs/fa_IR/users.lang
+++ b/htdocs/langs/fa_IR/users.lang
@@ -97,8 +97,8 @@ LoginToCreate=شناسۀ‌کاربری برای ایجاد
 NameToCreate=نام شخص‌سوم برای ایجاد
 YourRole=roleهای شما
 YourQuotaOfUsersIsReached=سهمیه شما از کاربران فعال پر شده است!
-NbOfUsers=تعداد کاربران
-NbOfPermissions=تعداد مجوزها
+NbOfUsers=Number of users
+NbOfPermissions=Number of permissions
 DontDowngradeSuperAdmin=فقط یک مدیرکل می‌تواند یک مدیرکل‌دیگر را کاهش‌رتبه بدهد
 HierarchicalResponsible=سرپرست
 HierarchicView=نمای درختی
diff --git a/htdocs/langs/fa_IR/website.lang b/htdocs/langs/fa_IR/website.lang
index 373034849ee..8f29c0be3c2 100644
--- a/htdocs/langs/fa_IR/website.lang
+++ b/htdocs/langs/fa_IR/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 PageContainer=صفحه
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
+PreviewOfSiteNotYetAvailable=The preview of your website <strong>%s</strong> is not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
diff --git a/htdocs/langs/fi_FI/admin.lang b/htdocs/langs/fi_FI/admin.lang
index 00058ce7a2c..ddd31505c47 100644
--- a/htdocs/langs/fi_FI/admin.lang
+++ b/htdocs/langs/fi_FI/admin.lang
@@ -53,6 +53,7 @@ InternalUser=Sisäinen käyttäjä
 ExternalUser=Ulkoinen käyttäjä
 InternalUsers=Sisäiset käyttäjät
 ExternalUsers=Ulkopuoliset käyttäjät
+UserInterface=User interface
 GUISetup=Näyttö
 SetupArea=Asetukset
 UploadNewTemplate=Päivitä uusi pohja(t)
@@ -1260,8 +1261,8 @@ YourPHPDoesNotHaveSSLSupport=SSL toimintoja ei saatavilla PHP
 DownloadMoreSkins=Lisää nahat ladata
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
-ShowProfIdInAddress=Show professional id with addresses
-ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
+ShowProfIdInAddress=Show professional ID with addresses
+ShowVATIntaInAddress=Hide intra-Community VAT number
 TranslationUncomplete=Osittainen käännös
 MAIN_DISABLE_METEO=Poista meteorologinen näkymä käytöstä
 MeteoStdMod=Standardi tila
@@ -1778,7 +1779,7 @@ ClickToDialSetup='Click To Dial'-moduulin asetukset
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
 ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Käytä vain linkkiä "tel:" puhelinnumeroihin
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface, installed on the same computer as the browser, and called when you click on a link starting with "tel:" in your browser. If you need link that start with "sip:" or a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Kassapääte
 CashDeskSetup='Kassapääte' - moduulin asetukset
@@ -2133,7 +2134,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
-NotRecommended=Not recommanded
+Recommended=Suositeltava
+NotRecommended=Not recommended
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
@@ -2144,3 +2146,5 @@ YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You s
 RandomlySelectedIfSeveral=Randomly selected if several pictures are available
 DatabasePasswordObfuscated=Database password is obfuscated in conf file
 DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
+APIsAreNotEnabled=APIs modules are not enabled
+YouShouldSetThisToOff=You should set this to 0 or off
diff --git a/htdocs/langs/fi_FI/banks.lang b/htdocs/langs/fi_FI/banks.lang
index 79be56e9bb7..469aa752443 100644
--- a/htdocs/langs/fi_FI/banks.lang
+++ b/htdocs/langs/fi_FI/banks.lang
@@ -115,7 +115,7 @@ TransferTo=mihin
 TransferFromToDone=A <b>siirtää %s %s %s%</b> s on tallennettu.
 CheckTransmitter=Lähettäjä
 ValidateCheckReceipt=Vahvista tämä sekkikuitti?
-ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes will be possible once validated.
 DeleteCheckReceipt=Poista tämä shekkikuitti?
 ConfirmDeleteCheckReceipt=Haluatko varmasti poistaa tämän sekkikuitin?
 BankChecks=Pankkisekit
diff --git a/htdocs/langs/fi_FI/boxes.lang b/htdocs/langs/fi_FI/boxes.lang
index a42893fc247..f8b52d40e4a 100644
--- a/htdocs/langs/fi_FI/boxes.lang
+++ b/htdocs/langs/fi_FI/boxes.lang
@@ -91,8 +91,8 @@ BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
 BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
 BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
 BoxTitleLastModifiedPropals=Viimeisimmät %s muokatut tarjoukset
-BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
-BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
+BoxTitleLatestModifiedJobPositions=Latest %s modified job positions
+BoxTitleLatestModifiedCandidatures=Latest %s modified job applications
 ForCustomersInvoices=Asiakkaiden laskut
 ForCustomersOrders=Asiakkaiden tilaukset
 ForProposals=Ehdotukset
diff --git a/htdocs/langs/fi_FI/cashdesk.lang b/htdocs/langs/fi_FI/cashdesk.lang
index 1fdcb14821d..47f70123ff5 100644
--- a/htdocs/langs/fi_FI/cashdesk.lang
+++ b/htdocs/langs/fi_FI/cashdesk.lang
@@ -127,4 +127,4 @@ AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
 ShowPriceHT = Display the column with the price excluding tax (on screen)
-ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on the receipt)
diff --git a/htdocs/langs/fi_FI/errors.lang b/htdocs/langs/fi_FI/errors.lang
index 4766611b848..4cf1c05a6d5 100644
--- a/htdocs/langs/fi_FI/errors.lang
+++ b/htdocs/langs/fi_FI/errors.lang
@@ -301,3 +301,4 @@ ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
 ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
+ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
diff --git a/htdocs/langs/fi_FI/eventorganization.lang b/htdocs/langs/fi_FI/eventorganization.lang
index 5ced2914415..b9c36060776 100644
--- a/htdocs/langs/fi_FI/eventorganization.lang
+++ b/htdocs/langs/fi_FI/eventorganization.lang
@@ -86,6 +86,7 @@ DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
 SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
 SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
+NbVotes=Number of votes
 #
 # Status
 #
@@ -115,6 +116,9 @@ EvntOrgDuration = This conference starts on %s and ends on %s.
 ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
 BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
 EventType = Event type
+LabelOfBooth=Booth label
+LabelOfconference=Conference label
+ConferenceIsNotConfirmed=Subcription not available, conference is not confirmed yet
 
 #
 # Vote page
diff --git a/htdocs/langs/fi_FI/install.lang b/htdocs/langs/fi_FI/install.lang
index bc79f570b30..3429db56d18 100644
--- a/htdocs/langs/fi_FI/install.lang
+++ b/htdocs/langs/fi_FI/install.lang
@@ -206,6 +206,7 @@ MigrationUserPhotoPath=Migration of photo paths for users
 MigrationFieldsSocialNetworks=Migration of users fields social networks (%s)
 MigrationReloadModule=Lataa uudelleen moduuli %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
+MigrationImportOrExportProfiles=Migration of import or export profiles (%s)
 ShowNotAvailableOptions=Show unavailable options
 HideNotAvailableOptions=Hide unavailable options
 ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
diff --git a/htdocs/langs/fi_FI/interventions.lang b/htdocs/langs/fi_FI/interventions.lang
index d01ef905476..9206afe7673 100644
--- a/htdocs/langs/fi_FI/interventions.lang
+++ b/htdocs/langs/fi_FI/interventions.lang
@@ -64,3 +64,5 @@ InterLineDuration=Line duration intervention
 InterLineDesc=Line description intervention
 RepeatableIntervention=Template of intervention
 ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
+Reopen=Uudelleenavaa
+ConfirmReopenIntervention=Are you sure you want to open back the intervention <b>%s</b>?
diff --git a/htdocs/langs/fi_FI/productbatch.lang b/htdocs/langs/fi_FI/productbatch.lang
index bad118ad377..ae9933f11e7 100644
--- a/htdocs/langs/fi_FI/productbatch.lang
+++ b/htdocs/langs/fi_FI/productbatch.lang
@@ -26,12 +26,10 @@ ShowLogOfMovementIfLot=Näytä siirto lokit pari tuotetta / erää kohti
 StockDetailPerBatch=Varastotiedot erää kohden
 SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
-BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
-BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
 ManageLotMask=Custom mask
-CustomMasks=Adds an option to define mask in the product card
-LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
-SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+CustomMasks=Option to define a different numbering mask for each product
+BatchLotNumberingModules=Numbering rule for automatic generation of lot number
+BatchSerialNumberingModules=Numbering rule for automatic generation of serial number (for products with property 1 unique lot/serial for each product)
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
diff --git a/htdocs/langs/fi_FI/products.lang b/htdocs/langs/fi_FI/products.lang
index 9ba1ec01f7b..e0ec5a0a2e3 100644
--- a/htdocs/langs/fi_FI/products.lang
+++ b/htdocs/langs/fi_FI/products.lang
@@ -277,7 +277,7 @@ PriceByCustomer=Different prices for each customer
 PriceCatalogue=A single sell price per product/service
 PricingRule=Rules for selling prices
 AddCustomerPrice=Lisää hinta asiakaskohtaisesti
-ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
+ForceUpdateChildPriceSoc=Set same price on customer's subsidiaries
 PriceByCustomerLog=Logi viimeisimmistä asiakashinnoista
 MinimumPriceLimit=Minimum price can't be lower then %s
 MinimumRecommendedPrice=Minimum recommended price is: %s
@@ -296,6 +296,7 @@ ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Child products
 MinSupplierPrice=Minimi ostohinta
 MinCustomerPrice=Minimum selling price
+NoDynamicPrice=No dynamic price
 DynamicPriceConfiguration=Dynamic price configuration
 DynamicPriceDesc=You may define mathematical formulae to calculate Customer or Vendor prices. Such formulas can use all mathematical operators, some constants and variables. You can define here the variables you wish to use. If the variable needs an automatic update, you may define the external URL to allow Dolibarr to update the value automatically.
 AddVariable=Add Variable
diff --git a/htdocs/langs/fi_FI/salaries.lang b/htdocs/langs/fi_FI/salaries.lang
index b587227ee0a..7024aa1f0d1 100644
--- a/htdocs/langs/fi_FI/salaries.lang
+++ b/htdocs/langs/fi_FI/salaries.lang
@@ -2,20 +2,23 @@
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Käytetty kirjanpitotili käyttäjän sidosryhmille
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Oletus kirjanpitotili palkkamaksuille
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=By default, leave empty the option "Automatically create a total payment" when creating a Salary
 Salary=Palkka
 Salaries=Palkat
-NewSalaryPayment=Uusi palkanmaksu
+NewSalary=New salary
+NewSalaryPayment=New salary card
 AddSalaryPayment=Add salary payment
 SalaryPayment=Palkanmaksu
 SalariesPayments=Palkkojen maksut
+SalariesPaymentsOf=Salaries payments of %s
 ShowSalaryPayment=Näytä palkanmaksu
 THM=Keskimääräinen tuntipalkka
 TJM=Keskimääräinen päiväpalkka
 CurrentSalary=Nykyinen palkka
 THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
 TJMDescription=This value is currently for information only and is not used for any calculation
-LastSalaries=Viimeisimmät %s palkkamaksut
-AllSalaries=Kaikki Palkkamaksut
+LastSalaries=Latest %s salaries
+AllSalaries=All salaries
 SalariesStatistics=Salary statistics
-# Export
 SalariesAndPayments=Salaries and payments
+ConfirmDeleteSalaryPayment=Do you want to delete this salary payment ?
diff --git a/htdocs/langs/fi_FI/ticket.lang b/htdocs/langs/fi_FI/ticket.lang
index ec492accd64..3c186fb364e 100644
--- a/htdocs/langs/fi_FI/ticket.lang
+++ b/htdocs/langs/fi_FI/ticket.lang
@@ -34,7 +34,8 @@ TicketDictResolution=Ticket - Resolution
 
 TicketTypeShortCOM=Kaupallinen kysymys
 TicketTypeShortHELP=Request for functionnal help
-TicketTypeShortISSUE=Issue, bug or problem
+TicketTypeShortISSUE=Issue or bug
+TicketTypeShortPROBLEM=Problem
 TicketTypeShortREQUEST=Change or enhancement request
 TicketTypeShortPROJET=Hanke
 TicketTypeShortOTHER=Muu
@@ -54,14 +55,15 @@ TypeContact_ticket_internal_SUPPORTTEC=Assigned user
 TypeContact_ticket_external_SUPPORTCLI=Customer contact / incident tracking
 TypeContact_ticket_external_CONTRIBUTOR=External contributor
 
-OriginEmail=Email source
+OriginEmail=Reporter Email
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
 Read=Luettu
 Assigned=Assigned
 InProgress=Käsittelyssä
-NeedMoreInformation=Waiting for information
+NeedMoreInformation=Waiting for reporter feedback
+NeedMoreInformationShort=Waiting for feedback
 Answered=Answered
 Waiting=Odotus
 Closed=Suljettu
@@ -160,7 +162,7 @@ CreatedBy=Luonut
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Ryhmä
+TicketCategory=Ticket categorization
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Jatka lukemista
@@ -211,6 +213,7 @@ TicketMessageHelp=Only this text will be saved in the message list on ticket car
 TicketMessageSubstitutionReplacedByGenericValues=Substitutions variables are replaced by generic values.
 TimeElapsedSince=Time elapsed since
 TicketTimeToRead=Time elapsed before read
+TicketTimeElapsedBeforeSince=Time elapsed before / since
 TicketContacts=Contacts ticket
 TicketDocumentsLinked=Lippuun liitetyt dokumentit
 ConfirmReOpenTicket=Vahvista tämän lipun avaaminen uudelleen?
diff --git a/htdocs/langs/fi_FI/users.lang b/htdocs/langs/fi_FI/users.lang
index 45c8c06dfb0..d6f454d7357 100644
--- a/htdocs/langs/fi_FI/users.lang
+++ b/htdocs/langs/fi_FI/users.lang
@@ -97,8 +97,8 @@ LoginToCreate=Kirjaudu luoda
 NameToCreate=Nimi kolmannen osapuolen luoda
 YourRole=Omat roolit
 YourQuotaOfUsersIsReached=Tilakiintiösi aktiivisia käyttäjiä on saavutettu!
-NbOfUsers=No. of users
-NbOfPermissions=No. of permissions
+NbOfUsers=Number of users
+NbOfPermissions=Number of permissions
 DontDowngradeSuperAdmin=Vain superadmin voi downgrade superadmin
 HierarchicalResponsible=Supervisor
 HierarchicView=Hierarchical view
diff --git a/htdocs/langs/fi_FI/website.lang b/htdocs/langs/fi_FI/website.lang
index 49d16596839..79681c98cce 100644
--- a/htdocs/langs/fi_FI/website.lang
+++ b/htdocs/langs/fi_FI/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Lisää sivusto
 Webpage=Web page/container
 AddPage=Add page/container
 PageContainer=Sivu
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
+PreviewOfSiteNotYetAvailable=The preview of your website <strong>%s</strong> is not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
diff --git a/htdocs/langs/fr_BE/admin.lang b/htdocs/langs/fr_BE/admin.lang
index 96140bd1362..de19e1379f8 100644
--- a/htdocs/langs/fr_BE/admin.lang
+++ b/htdocs/langs/fr_BE/admin.lang
@@ -17,6 +17,6 @@ IfModuleEnabled=Note: oui ne fonctionne que si le module <b>%s</b> est activé
 Module20Name=Propales
 Module30Name=Factures
 Target=Objectif
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
+Recommended=Recommandée
diff --git a/htdocs/langs/fr_BE/products.lang b/htdocs/langs/fr_BE/products.lang
deleted file mode 100644
index e0628dbec00..00000000000
--- a/htdocs/langs/fr_BE/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
diff --git a/htdocs/langs/fr_BE/salaries.lang b/htdocs/langs/fr_BE/salaries.lang
deleted file mode 100644
index c9bd3bec17b..00000000000
--- a/htdocs/langs/fr_BE/salaries.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - salaries
-LastSalaries=Latest %s salary payments
-AllSalaries=All salary payments
diff --git a/htdocs/langs/fr_BE/ticket.lang b/htdocs/langs/fr_BE/ticket.lang
deleted file mode 100644
index 82e110b1ca4..00000000000
--- a/htdocs/langs/fr_BE/ticket.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - ticket
-TicketTypeShortISSUE=Issue, bug or problem
-OriginEmail=Email source
-NeedMoreInformation=Waiting for information
-TicketCategory=Group
diff --git a/htdocs/langs/fr_BE/users.lang b/htdocs/langs/fr_BE/users.lang
deleted file mode 100644
index 4a412122b08..00000000000
--- a/htdocs/langs/fr_BE/users.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - users
-NbOfUsers=No. of users
-NbOfPermissions=No. of permissions
diff --git a/htdocs/langs/fr_BE/website.lang b/htdocs/langs/fr_BE/website.lang
deleted file mode 100644
index 910cff6b702..00000000000
--- a/htdocs/langs/fr_BE/website.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - website
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
diff --git a/htdocs/langs/fr_CA/admin.lang b/htdocs/langs/fr_CA/admin.lang
index 98e4baf170d..61a863bf5a2 100644
--- a/htdocs/langs/fr_CA/admin.lang
+++ b/htdocs/langs/fr_CA/admin.lang
@@ -177,7 +177,6 @@ OptionVatMode=TPS/TVH due
 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).
 ClickToDialUseTelLink=Utilisez juste un lien "tel: " sur les numéros de téléphone
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 EndPointIs=Les clients SOAP doivent envoyer leurs demandes au point d'extrémité Dolibarr disponible à l'URL
 ApiSetup=Configuration du module API
 ApiDesc=En activant ce module , Dolibarr devenir un serveur REST pour fournir des services Web divers .
diff --git a/htdocs/langs/fr_CA/salaries.lang b/htdocs/langs/fr_CA/salaries.lang
index 8b380dd75f2..f7868851069 100644
--- a/htdocs/langs/fr_CA/salaries.lang
+++ b/htdocs/langs/fr_CA/salaries.lang
@@ -1,10 +1,7 @@
 # Dolibarr language file - Source file is en_US - salaries
 Salary=Salaires
-NewSalaryPayment=Nouveau paiement de salaire
 SalaryPayment=Paiement Salaire
 SalariesPayments=Paiements salaires
 ShowSalaryPayment=Afficher paiement de salaires
 THM=Taux horaire moyen
 TJM=Taux journalier moyen
-THMDescription=Cette valeur peut être utilisée pour calculer le coût du temps consommé sur un projet entré par les utilisateurs si le projet de module est utilisé
-TJMDescription=Cette valeur est actuellement à titre d'information seulement et ne sert pas à tout calcul
diff --git a/htdocs/langs/fr_CA/ticket.lang b/htdocs/langs/fr_CA/ticket.lang
index a5d2eccc9f0..5e7204f3438 100644
--- a/htdocs/langs/fr_CA/ticket.lang
+++ b/htdocs/langs/fr_CA/ticket.lang
@@ -1,7 +1,4 @@
 # Dolibarr language file - Source file is en_US - ticket
-TicketTypeShortISSUE=Issue, bug or problem
 TypeContact_ticket_internal_CONTRIBUTOR=Donateur
-OriginEmail=Email source
-NeedMoreInformation=Waiting for information
 Closed=Fermée
 TicketMailExchanges=Messages courriels
diff --git a/htdocs/langs/fr_CA/users.lang b/htdocs/langs/fr_CA/users.lang
index e38af3483dc..81db7ef3370 100644
--- a/htdocs/langs/fr_CA/users.lang
+++ b/htdocs/langs/fr_CA/users.lang
@@ -10,5 +10,3 @@ LastUsersCreated=Derniers %s utilisateurs créés
 ConfirmCreateContact=Êtes-vous sûr de vouloir créer un compte Dolibarr pour ce contact?
 ConfirmCreateLogin=Êtes-vous sûr de vouloir créer un compte Dolibarr pour ce membre?
 ConfirmCreateThirdParty=Êtes-vous sûr de vouloir créer un tiers pour ce membre?
-NbOfUsers=No. of users
-NbOfPermissions=No. of permissions
diff --git a/htdocs/langs/fr_CA/website.lang b/htdocs/langs/fr_CA/website.lang
index f37354f9d32..5255b2f9da5 100644
--- a/htdocs/langs/fr_CA/website.lang
+++ b/htdocs/langs/fr_CA/website.lang
@@ -4,7 +4,6 @@ WEBSITE_PAGENAME=Nom / alias de la page
 WEBSITE_CSS_URL=URL du fichier CSS externe
 MediaFiles=Médiathèque
 EditMenu=Menu Edition
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 ViewSiteInNewTab=Afficher le site dans un nouvel onglet
 ViewPageInNewTab=Afficher la page dans un nouvel onglet
 ViewWebsiteInProduction=Afficher le site Web à l'aide d'URL d'accueil
diff --git a/htdocs/langs/fr_CH/admin.lang b/htdocs/langs/fr_CH/admin.lang
index 25265594de5..c1d306ec390 100644
--- a/htdocs/langs/fr_CH/admin.lang
+++ b/htdocs/langs/fr_CH/admin.lang
@@ -1,4 +1,3 @@
 # Dolibarr language file - Source file is en_US - admin
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/fr_CH/products.lang b/htdocs/langs/fr_CH/products.lang
deleted file mode 100644
index e0628dbec00..00000000000
--- a/htdocs/langs/fr_CH/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
diff --git a/htdocs/langs/fr_CH/salaries.lang b/htdocs/langs/fr_CH/salaries.lang
deleted file mode 100644
index c9bd3bec17b..00000000000
--- a/htdocs/langs/fr_CH/salaries.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - salaries
-LastSalaries=Latest %s salary payments
-AllSalaries=All salary payments
diff --git a/htdocs/langs/fr_CH/ticket.lang b/htdocs/langs/fr_CH/ticket.lang
deleted file mode 100644
index 82e110b1ca4..00000000000
--- a/htdocs/langs/fr_CH/ticket.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - ticket
-TicketTypeShortISSUE=Issue, bug or problem
-OriginEmail=Email source
-NeedMoreInformation=Waiting for information
-TicketCategory=Group
diff --git a/htdocs/langs/fr_CH/users.lang b/htdocs/langs/fr_CH/users.lang
deleted file mode 100644
index 4a412122b08..00000000000
--- a/htdocs/langs/fr_CH/users.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - users
-NbOfUsers=No. of users
-NbOfPermissions=No. of permissions
diff --git a/htdocs/langs/fr_CH/website.lang b/htdocs/langs/fr_CH/website.lang
deleted file mode 100644
index 910cff6b702..00000000000
--- a/htdocs/langs/fr_CH/website.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - website
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
diff --git a/htdocs/langs/fr_CI/admin.lang b/htdocs/langs/fr_CI/admin.lang
index 25265594de5..c1d306ec390 100644
--- a/htdocs/langs/fr_CI/admin.lang
+++ b/htdocs/langs/fr_CI/admin.lang
@@ -1,4 +1,3 @@
 # Dolibarr language file - Source file is en_US - admin
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/fr_CI/products.lang b/htdocs/langs/fr_CI/products.lang
deleted file mode 100644
index e0628dbec00..00000000000
--- a/htdocs/langs/fr_CI/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
diff --git a/htdocs/langs/fr_CI/salaries.lang b/htdocs/langs/fr_CI/salaries.lang
deleted file mode 100644
index c9bd3bec17b..00000000000
--- a/htdocs/langs/fr_CI/salaries.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - salaries
-LastSalaries=Latest %s salary payments
-AllSalaries=All salary payments
diff --git a/htdocs/langs/fr_CI/ticket.lang b/htdocs/langs/fr_CI/ticket.lang
deleted file mode 100644
index 82e110b1ca4..00000000000
--- a/htdocs/langs/fr_CI/ticket.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - ticket
-TicketTypeShortISSUE=Issue, bug or problem
-OriginEmail=Email source
-NeedMoreInformation=Waiting for information
-TicketCategory=Group
diff --git a/htdocs/langs/fr_CI/users.lang b/htdocs/langs/fr_CI/users.lang
deleted file mode 100644
index 4a412122b08..00000000000
--- a/htdocs/langs/fr_CI/users.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - users
-NbOfUsers=No. of users
-NbOfPermissions=No. of permissions
diff --git a/htdocs/langs/fr_CI/website.lang b/htdocs/langs/fr_CI/website.lang
deleted file mode 100644
index 910cff6b702..00000000000
--- a/htdocs/langs/fr_CI/website.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - website
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
diff --git a/htdocs/langs/fr_CM/admin.lang b/htdocs/langs/fr_CM/admin.lang
index 25265594de5..c1d306ec390 100644
--- a/htdocs/langs/fr_CM/admin.lang
+++ b/htdocs/langs/fr_CM/admin.lang
@@ -1,4 +1,3 @@
 # Dolibarr language file - Source file is en_US - admin
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/fr_CM/products.lang b/htdocs/langs/fr_CM/products.lang
deleted file mode 100644
index e0628dbec00..00000000000
--- a/htdocs/langs/fr_CM/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
diff --git a/htdocs/langs/fr_CM/salaries.lang b/htdocs/langs/fr_CM/salaries.lang
deleted file mode 100644
index c9bd3bec17b..00000000000
--- a/htdocs/langs/fr_CM/salaries.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - salaries
-LastSalaries=Latest %s salary payments
-AllSalaries=All salary payments
diff --git a/htdocs/langs/fr_CM/ticket.lang b/htdocs/langs/fr_CM/ticket.lang
deleted file mode 100644
index 82e110b1ca4..00000000000
--- a/htdocs/langs/fr_CM/ticket.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - ticket
-TicketTypeShortISSUE=Issue, bug or problem
-OriginEmail=Email source
-NeedMoreInformation=Waiting for information
-TicketCategory=Group
diff --git a/htdocs/langs/fr_CM/users.lang b/htdocs/langs/fr_CM/users.lang
deleted file mode 100644
index 4a412122b08..00000000000
--- a/htdocs/langs/fr_CM/users.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - users
-NbOfUsers=No. of users
-NbOfPermissions=No. of permissions
diff --git a/htdocs/langs/fr_CM/website.lang b/htdocs/langs/fr_CM/website.lang
deleted file mode 100644
index 910cff6b702..00000000000
--- a/htdocs/langs/fr_CM/website.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - website
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
diff --git a/htdocs/langs/fr_FR/accountancy.lang b/htdocs/langs/fr_FR/accountancy.lang
index 36210463025..62f66554214 100644
--- a/htdocs/langs/fr_FR/accountancy.lang
+++ b/htdocs/langs/fr_FR/accountancy.lang
@@ -48,7 +48,8 @@ CountriesNotInEEC=Pays hors CEE
 CountriesInEECExceptMe=Pays de la CEE sauf %s
 CountriesExceptMe=Tous les pays sauf %s
 AccountantFiles=Exporter les documents sources
-ExportAccountingSourceDocHelp=Avec cet outil, vous pouvez exporter les événements sources (liste et PDF) qui ont été utilisés pour générer votre comptabilité. Pour exporter vos journaux, utilisez l'entrée de menu %s - %s.
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list in CSV and PDFs) that were used to generate your accountancy.
+ExportAccountingSourceDocHelp2=Pour exporter vos journaux, utilisez l'entrée de menu %s - %s.
 VueByAccountAccounting=Vue par comptes comptables
 VueBySubAccountAccounting=Affichage par compte auxiliaire
 
@@ -328,9 +329,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Désactiver la liaison et le transfert e
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Désactiver la liaison et le transfert en comptabilité des notes de frais (les notes de frais ne seront pas prises en compte en comptabilité).
 
 ## Export
-NotifiedExportDate=Notified export date (modification of the entries will not be possible)
-NotifiedValidationDate=Validation of the entries (modification or deletion of the entries will not be possible)
-ConfirmExportFile=Confirmation of the generation of the accounting export file ?
+NotifiedExportDate=Date d'exportation notifiée (la modification des enregistrements ne sera pas possible)
+NotifiedValidationDate=Validation des enregistrements (la modification ou la suppression des enregistrements ne sera pas possible)
+ConfirmExportFile=Confirmation de la génération du fichier d'export comptable ?
 ExportDraftJournal=Exporter le journal brouillon
 Modelcsv=Modèle d'export
 Selectmodelcsv=Sélectionner un modèle d'export
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 57a50388a4f..b7a10c62ba2 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -53,6 +53,7 @@ InternalUser=Utilisateur interne
 ExternalUser=Utilisateur externe
 InternalUsers=Utilisateurs internes
 ExternalUsers=Utilisateurs externes
+UserInterface=User interface
 GUISetup=Affichage
 SetupArea=Configuration
 UploadNewTemplate=Téléverser un / des nouveau(x) modèle(s)
@@ -221,7 +222,7 @@ NotCompatible=Ce module n'est pas compatible avec votre version %s de Dolibarr (
 CompatibleAfterUpdate=Ce module nécessite une mise à jour de Dolibarr %s (Version min. %s - Version max. %s).
 SeeInMarkerPlace=Voir dans la boutique
 SeeSetupOfModule=Voir la configuration du module %s
-SetOptionTo=Set option <b>%s</b> to %s
+SetOptionTo=Définir l'option <b> %s </b> à %s
 Updated=Mise à jour effectuée
 AchatTelechargement=Acheter/télécharger
 GoModuleSetupArea=Pour déployer/installer un nouveau module, rendez vous dans la zone de configuration des modules : <a href="%s">%s</a>
@@ -562,7 +563,7 @@ Module53Desc=Gestion des services
 Module54Name=Contrats/Abonnements
 Module54Desc=Gestion des contrats (services ou abonnements récurrents)
 Module55Name=Codes-barres
-Module55Desc=Barcode or QR code management
+Module55Desc=Code-barre ou QR Code
 Module56Name=Paiement par virement bancaire
 Module56Desc=Gestion des paiements de fournisseurs par virement bancaire. Est incluse la génération des fichiers SEPA pour les pays européens.
 Module57Name=Règlement par Prélèvement
@@ -849,10 +850,10 @@ Permission402=Créer/modifier les avoirs
 Permission403=Valider les avoirs
 Permission404=Supprimer les avoirs
 Permission430=Utilisez la barre de débogage
-Permission511=Read salaries and payments (yours and subordinates)
-Permission512=Create/modify salaries and payments
-Permission514=Delete salaries and payments
-Permission517=Read salaries and payments everybody
+Permission511=Lire les salaires et leur paiement (les vôtres et ceux de vos subordonnées)
+Permission512=Créer/modifier les salaires et leur paiement
+Permission514=Supprimer les salaires et leur paiement
+Permission517=Lire les salaires et leur paiement de tout le monde
 Permission519=Exporter les salaires
 Permission520=Consulter les emprunts
 Permission522=Créer/Modifier les emprunts
@@ -1191,7 +1192,7 @@ SetupDescription4=<a href="%s"> %s -> %s </a><br> <br>Ce logiciel est un ensembl
 SetupDescription5=Les autres entrées de configuration gèrent des paramètres facultatifs.
 AuditedSecurityEvents=Événements de sécurité audités
 NoSecurityEventsAreAduited=Aucun événement de sécurité n'est audité. Vous pouvez les activer à partir du menu %s
-Audit=Security events
+Audit=Événements de sécurité
 InfoDolibarr=Infos Dolibarr
 InfoBrowser=Infos navigateur
 InfoOS=Infos OS
@@ -1260,8 +1261,8 @@ YourPHPDoesNotHaveSSLSupport=Fonctions SSL non présentes dans votre PHP
 DownloadMoreSkins=Plus de thèmes à télécharger
 SimpleNumRefModelDesc=Renvoie le numéro sous la forme %syymm-nnnn où yy est l'année, mm le mois et nnnn un compteur séquentiel sans rupture et sans remise à 0.
 SimpleNumRefNoDateModelDesc=Renvoie le numéro de référence au format %s-nnnn où nnnn est un nombre séquentiel autoincrémenté sans réinitialisation
-ShowProfIdInAddress=Afficher l'identifiant professionnel dans les adresses sur les documents
-ShowVATIntaInAddress=Cacher le numéro de TVA Intracommunautaire dans les adresses sur les documents.
+ShowProfIdInAddress=Show professional ID with addresses
+ShowVATIntaInAddress=Hide intra-Community VAT number
 TranslationUncomplete=Traduction partielle
 MAIN_DISABLE_METEO=Désactiver la vue météo
 MeteoStdMod=Mode standard
@@ -1323,9 +1324,9 @@ ConditionIsCurrently=La condition est actuellement %s
 YouUseBestDriver=Vous utilisez le driver %s qui est le driver recommandé actuellement.
 YouDoNotUseBestDriver=Vous utilisez le pilote %s mais le pilote %s est recommandé.
 NbOfObjectIsLowerThanNoPb=Vous avez seulement %s %s dans la base de données. Cela ne nécessite aucune optimisation particulière.
-ComboListOptim=Combo list loading optimization
+ComboListOptim=Optimisation du chargement des listes déroulantes
 SearchOptim=Optimisation des recherches
-YouHaveXObjectUseComboOptim=You have %s %s in the database. You can go into setup of module to enable loading of combo list on key pressed event.
+YouHaveXObjectUseComboOptim=Vous avez %s %s dans la base de données. Vous pouvez accéder à la configuration du module pour activer le chargement de la liste déroulante par une touche du clavier.
 YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other.
 YouHaveXObjectUseSearchOptimDesc=This limits the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
 YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to %s in Home-Setup-Other.
@@ -1778,7 +1779,7 @@ ClickToDialSetup=Configuration du module Click To Dial
 ClickToDialUrlDesc=URL appelée quand un clic sur l'icône téléphone est fait. Dans l'URL, vous pouvez utiliser les tags<br><b>__PHONETO__</b> qui sera remplacée par le numéro de téléphone de la personne à appeler<br><b>__PHONEFROM__</b> qui sera remplacée par le numéro de l'appelant (vous)<br><b>__LOGIN__</b> qui sera remplacée par l'identifiant d'accès de l'utilisateur à l'application d'appel (à définir sur la fiche utilisateur) et <br><b>__PASS__</b> qui sera remplacée par le mot de passe d'accès de l'utilisateur à l'application d'appel (également à définir sur la fiche utilisateur).
 ClickToDialDesc=Ce module permet de rendre les numéros de téléphone cliquables lorsque vous utilisez l'application sur un ordinateur de bureau. Un clic sur cette icône composera le numéro de téléphone. Cela peut être utilisé pour commencer une conversation avec un soft phone sur votre bureau ou lorsque vous utilisez un système basé sur le protocole SIP par exemple. Note: Sur un smartphone, les numéros de téléphones sont toujours clicables.
 ClickToDialUseTelLink=Utiliser un lien "tel:" sur les numéros de téléphone
-ClickToDialUseTelLinkDesc=Utilisez cette méthode si vos utilisateurs ont un softphone ou une interface de logiciel installé sur un même ordinateur que le navigateur, et a appelé lorsque vous cliquez sur un lien dans votre navigateur qui commencent par "tel:". Si vous avez besoin d'une solution de serveur complet (pas besoin d'installation locale du logiciel), vous devez définir ceci à  "Non" et remplir le champ suivant.
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface, installed on the same computer as the browser, and called when you click on a link starting with "tel:" in your browser. If you need link that start with "sip:" or a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Point de Vente
 CashDeskSetup=Configuration du module Point de vente/caisse enregistreuse
@@ -2133,7 +2134,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Sauf si vous avez besoin de lancer
 PHPFunctionsRequiredForCLI=Pour un interfaçage (comme des tâches de sauvegarde planifiée ou pour lancer un programme antivirus), vous devez garder les fonctions PHP
 NoWritableFilesFoundIntoRootDir=Aucun fichier ou répertoire des programmes courants n’a été trouvé en écriture dans votre répertoire racine (Bon)
 RecommendedValueIs=Recommandé : %s
-NotRecommended=Non recommandé
+Recommended=Recommandé
+NotRecommended=Not recommended
 ARestrictedPath=Un chemin restreint
 CheckForModuleUpdate=Vérifier les mises à jour des modules externes
 CheckForModuleUpdateHelp=Cette action se connecte aux éditeurs des modules externes pour vérifier si une nouvelle version est disponible.
@@ -2142,5 +2144,7 @@ NoExternalModuleWithUpdate=Aucune mise à jour trouvée pour les modules externe
 SwaggerDescriptionFile=Fichier de description de l’API Swagger (à utiliser avec redoc par exemple)
 YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=Vous avez activé l'API WS qui est désapprouvée. Vous devriez utiliser l'API REST à la place.
 RandomlySelectedIfSeveral=Randomly selected if several pictures are available
-DatabasePasswordObfuscated=Database password is obfuscated in conf file
-DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
+DatabasePasswordObfuscated=Le mot de passe de la base de données est masqué dans le fichier de configuration
+DatabasePasswordNotObfuscated=Le mot de passe de la base de données n'est PAS masqué dans le fichier de configuration
+APIsAreNotEnabled=Les modules API ne sont pas activés
+YouShouldSetThisToOff=Vous devriez mettre ceci à 0 ou off
diff --git a/htdocs/langs/fr_FR/banks.lang b/htdocs/langs/fr_FR/banks.lang
index 9bb0dc6223e..ab93348faaf 100644
--- a/htdocs/langs/fr_FR/banks.lang
+++ b/htdocs/langs/fr_FR/banks.lang
@@ -109,13 +109,13 @@ SocialContributionPayment=Paiement de charge fiscale/sociale
 BankTransfer=Virement bancaire
 BankTransfers=Virements bancaire
 MenuBankInternalTransfer=Virement interne
-TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
+TransferDesc=Utilisez le virement interne pour effectuer un transfert d'un compte à un autre, l'application écrira deux enregistrements : un débit sur le compte source et un crédit sur le compte cible. Le même montant, le même libellé et la même date seront utilisés pour cette transaction.
 TransferFrom=De
 TransferTo=Vers
 TransferFromToDone=Le virement depuis <b>%s</b> vers <b>%s</b> de <b>%s</b> %s a été créé.
 CheckTransmitter=Émetteur
 ValidateCheckReceipt=Valider ce bordereau de remise de chèques ?
-ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes will be possible once validated.
 DeleteCheckReceipt=Supprimer ce bordereau de remise ?
 ConfirmDeleteCheckReceipt=Êtes-vous sûr de vouloir supprimer ce bordereau ?
 BankChecks=Chèques
@@ -142,7 +142,7 @@ AllAccounts=Tous les comptes bancaires et caisses
 BackToAccount=Retour au compte
 ShowAllAccounts=Afficher pour tous les comptes
 FutureTransaction=Transaction future. Pas moyen de rapprocher.
-SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
+SelectChequeTransactionAndGenerate=Sélectionner/filtrer les chèques à inclure dans le bordereau de remise de chèque et cliquer sur "Créer".
 InputReceiptNumber=Choisissez le relevé bancaire liés au rapprochement. Utilisez une valeur numérique triable: AAAAMM ou AAAAMMJJ
 EventualyAddCategory=Eventuellement, saisissez une catégorie dans laquelle classer les écritures
 ToConciliate=A rapprocher ?
diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang
index 4cbe88c93fb..1a825e09792 100644
--- a/htdocs/langs/fr_FR/bills.lang
+++ b/htdocs/langs/fr_FR/bills.lang
@@ -259,7 +259,7 @@ DateMaxPayment=Date limite règlement
 DateInvoice=Date facturation
 DatePointOfTax=Date elligibilitée taxe
 NoInvoice=Aucune facture
-NoOpenInvoice=No open invoice
+NoOpenInvoice=Pas de facture ouverte
 ClassifyBill=Classer la facture
 SupplierBillsToPay=Factures fournisseurs impayées
 CustomerBillsUnpaid=Factures clients impayées
diff --git a/htdocs/langs/fr_FR/boxes.lang b/htdocs/langs/fr_FR/boxes.lang
index c3f43e4bab1..9589b94d080 100644
--- a/htdocs/langs/fr_FR/boxes.lang
+++ b/htdocs/langs/fr_FR/boxes.lang
@@ -91,8 +91,8 @@ BoxTitleLatestModifiedSupplierOrders=Les %s dernières commandes fournisseurs mo
 BoxTitleLastModifiedCustomerBills=Les %s dernières factures clients modifiées
 BoxTitleLastModifiedCustomerOrders=Les %s dernières commandes clients modifiées
 BoxTitleLastModifiedPropals=Les %s dernières propositions commerciales modifiées
-BoxTitleLatestModifiedJobPositions=Les %s dernières offres d'emploi modifiées
-BoxTitleLatestModifiedCandidatures=Les %s dernières candidatures modifiées
+BoxTitleLatestModifiedJobPositions=Latest %s modified job positions
+BoxTitleLatestModifiedCandidatures=Latest %s modified job applications
 ForCustomersInvoices=Factures clients
 ForCustomersOrders=Commandes clients
 ForProposals=Propositions commerciales
diff --git a/htdocs/langs/fr_FR/cashdesk.lang b/htdocs/langs/fr_FR/cashdesk.lang
index 050ae29cd53..b8e0b6198eb 100644
--- a/htdocs/langs/fr_FR/cashdesk.lang
+++ b/htdocs/langs/fr_FR/cashdesk.lang
@@ -84,7 +84,7 @@ InvoiceIsAlreadyValidated=La facture est déjà validée
 NoLinesToBill=Aucune ligne à facturer
 CustomReceipt=Reçu personnalisé
 ReceiptName=Nom du reçu
-ProductSupplements=Manage supplements of products
+ProductSupplements=Gérer les suppléments de produits
 SupplementCategory=Catégorie des suppléments
 ColorTheme=Couleur du thème
 Colorful=Coloré
@@ -102,7 +102,7 @@ CashDeskGenericMaskCodes6 = <br>La balise <b> {TN} </b> est utilisée pour ajout
 TakeposGroupSameProduct=Regrouper les mêmes lignes de produits
 StartAParallelSale=Lancer une nouvelle vente en parallèle
 SaleStartedAt=Ventes démarrées à %s
-ControlCashOpening=Open the "Control cash" popup when opening the POS
+ControlCashOpening=Ouvre la fenêtre "Contôle de caisse" lors de l'ouverture du TPV
 CloseCashFence=Clôturer la caisse
 CashReport=Rapport de caisse
 MainPrinterToUse=Imprimante principale à utiliser
@@ -127,4 +127,4 @@ AllowDelayedPayment=Autoriser le paiement différé
 PrintPaymentMethodOnReceipts=Imprimer le mode de paiement sur les tickets | reçus
 WeighingScale=échelle de poids
 ShowPriceHT = Afficher la colonne du prix HT (à l'écran)
-ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on the receipt)
diff --git a/htdocs/langs/fr_FR/deliveries.lang b/htdocs/langs/fr_FR/deliveries.lang
index 6af98a54d4f..0837b157a9a 100644
--- a/htdocs/langs/fr_FR/deliveries.lang
+++ b/htdocs/langs/fr_FR/deliveries.lang
@@ -30,4 +30,4 @@ NonShippable=Non expédiable
 ShowShippableStatus=Afficher le statut Expédiable
 ShowReceiving=Afficher le bon de réception
 NonExistentOrder=Commande inexistante
-StockQuantitiesAlreadyAllocatedOnPreviousLines = Qtés de stock déja attribuées sur une ou des lignes précédentes
+StockQuantitiesAlreadyAllocatedOnPreviousLines = Quantités de stock déjà allouées sur les lignes précédentes
diff --git a/htdocs/langs/fr_FR/ecm.lang b/htdocs/langs/fr_FR/ecm.lang
index 23ac6fd869b..605cc97625d 100644
--- a/htdocs/langs/fr_FR/ecm.lang
+++ b/htdocs/langs/fr_FR/ecm.lang
@@ -42,6 +42,6 @@ ExtraFieldsEcmFiles=Attributs supplémentaires des fichiers de la GED
 ExtraFieldsEcmDirectories=Attributs supplémentaires des dossiers de la GED
 ECMSetup=Configuration du module de gestion de documents (GED)
 GenerateImgWebp=Dupliquer toutes les images avec une autre version au format .webp
-ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
+ConfirmGenerateImgWebp=Si vous confirmez, vous générerez une image au format .webp pour toutes les images actuellement dans ce dossier (les sous-dossiers ne sont pas inclus)...
 ConfirmImgWebpCreation=Confirmer la duplication de toutes les images
 SucessConvertImgWebp=Images dupliquées avec succès
diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang
index f437a3d3a41..f1153e44ae5 100644
--- a/htdocs/langs/fr_FR/errors.lang
+++ b/htdocs/langs/fr_FR/errors.lang
@@ -11,7 +11,7 @@ ErrorBadValueForParamNotAString=Mauvaise valeur de paramètre. Ceci arrive lors
 ErrorRefAlreadyExists=Le référence <b>%s</b> existe déjà.
 ErrorLoginAlreadyExists=L'identifiant %s existe déjà.
 ErrorGroupAlreadyExists=Le groupe %s existe déjà.
-ErrorEmailAlreadyExists=Email %s already exists.
+ErrorEmailAlreadyExists=L'e-mail %s existe déjà.
 ErrorRecordNotFound=Enregistrement non trouvé.
 ErrorFailToCopyFile=Echec de la copie du fichier '<b>%s</b>' en '<b>%s</b>'.
 ErrorFailToCopyDir=Echec de copie du répertoire '<b>%s</b>' vers '<b>%s</b>'.
@@ -301,3 +301,4 @@ ErrorActionCommPropertyUserowneridNotDefined=Le propriétaire de l'utilisateur e
 ErrorActionCommBadType=Le type d'événement sélectionné (id: %n, code: %s) n'existe pas dans le dictionnaire des types d'événement
 CheckVersionFail=Échec de la vérification de version
 ErrorWrongFileName=Le nom du fichier ne peut pas contenir __SOMETHING__
+ErrorNotInDictionaryPaymentConditions=Pas dans le dictionnaire des conditions de paiement, veuillez modifier.
diff --git a/htdocs/langs/fr_FR/eventorganization.lang b/htdocs/langs/fr_FR/eventorganization.lang
index fe4a556bcde..7ef2977adc3 100644
--- a/htdocs/langs/fr_FR/eventorganization.lang
+++ b/htdocs/langs/fr_FR/eventorganization.lang
@@ -82,10 +82,11 @@ PriceOfBoothHelp=Prix d’inscription pour un stand
 EventOrganizationICSLink=Lien ICS des événements
 ConferenceOrBoothInformation=Renseignements sur la conférence ou le stand
 Attendees = Participants
-DownloadICSLink = Download ICS link
+DownloadICSLink = Télécharger le lien ICS
 EVENTORGANIZATION_SECUREKEY = Clé sécurisée pour le lien d’inscription public à une conférence
-SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
+SERVICE_BOOTH_LOCATION = Service utilisé pour la ligne de facture concernant l'emplacement d'un stand
 SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
+NbVotes=Number of votes
 #
 # Status
 #
@@ -98,39 +99,42 @@ EvntOrgCancelled = Annulé
 #
 # Public page
 #
-SuggestForm = Suggestion page
-RegisterPage = Page for conferences or booth
-EvntOrgRegistrationHelpMessage = Here, you can vote for an event, or suggest a new conference or booth for the project
-EvntOrgRegistrationConfHelpMessage = Here, you can suggest a new conference for the project
+SuggestForm = Page de suggestions
+RegisterPage = Page pour conférences ou stands
+EvntOrgRegistrationHelpMessage = Ici, vous pouvez voter pour un événement, ou suggérer une nouvelle conférence ou un nouveau stand pour le projet
+EvntOrgRegistrationConfHelpMessage = Ici, vous pouvez suggérer une nouvelle conférence pour le projet
 EvntOrgRegistrationBoothHelpMessage = Here, you can suggest a new booth for the project
-ListOfSuggestedConferences = List of suggested conferences
-ListOfSuggestedBooths = List of suggested booths
-SuggestConference = Suggest a new conference
-SuggestBooth = Suggest a booth
-ViewAndVote = View and vote for suggested events
+ListOfSuggestedConferences = Liste des conférences suggérées
+ListOfSuggestedBooths = Liste des stands suggérés
+SuggestConference = Proposer une nouvelle conférence
+SuggestBooth = Proposer un stand
+ViewAndVote = Voir et voter pour les événements suggérés
 PublicAttendeeSubscriptionPage = Lien d’inscription public à une conférence
 MissingOrBadSecureKey = La clé de sécurité est invalide ou manquante
-EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference : '%s'
-EvntOrgDuration = This conference starts on %s and ends on %s.
-ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
-BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
+EvntOrgWelcomeMessage = Ce formulaire vous permet de vous inscrire en tant que nouveau participant à la conférence : '%s'
+EvntOrgDuration = Cette conférence commence le %s et se termine le %s.
+ConferenceAttendeeFee = Frais de participation à la conférence pour l'événement : '%s' se produisant du %s au %s.
+BoothLocationFee = Frais de participation à l'événement : '%s' se produisant du %s au %s.
 EventType = Type événement
+LabelOfBooth=Booth label
+LabelOfconference=Conference label
+ConferenceIsNotConfirmed=Subcription not available, conference is not confirmed yet
 
 #
 # Vote page
 #
-EvntOrgRegistrationWelcomeMessage = Welcome on the conference or booth suggestion page.
-EvntOrgRegistrationConfWelcomeMessage = Welcome on the conference suggestion page.
-EvntOrgRegistrationBoothWelcomeMessage = Welcome on the booth suggestion page.
+EvntOrgRegistrationWelcomeMessage = Bienvenue sur la page de suggestion de conférence ou de stand.
+EvntOrgRegistrationConfWelcomeMessage = Bienvenue sur la page de suggestions de conférences.
+EvntOrgRegistrationBoothWelcomeMessage = Bienvenue sur la page de suggestion de stand.
 EvntOrgVoteHelpMessage = Here, you can view and vote for the suggested events for the project
-VoteOk = Your vote has been accepted.
-AlreadyVoted = You have already voted for this event.
-VoteError = An error has occurred during the vote, please try again.
+VoteOk = Votre vote a été accepté.
+AlreadyVoted = Vous avez déjà voté pour cet événement.
+VoteError = Une erreur s'est produite lors du vote, veuillez réessayer.
 
 #
 # SubscriptionOk page
 #
-SubscriptionOk = Your subscription to this conference has been validated
+SubscriptionOk = Votre inscription à cette conférence a été validée
 #
 # Subscription validation mail
 #
@@ -139,5 +143,5 @@ ConfAttendeeSubscriptionConfirmation = Confirmation de votre inscription à une
 # Payment page
 #
 Attendee = Participant
-PaymentConferenceAttendee = Conference attendee payment
-PaymentBoothLocation = Booth location payment
+PaymentConferenceAttendee = Paiement de participation à la conférence
+PaymentBoothLocation = Paiement de l'emplacement du stand
diff --git a/htdocs/langs/fr_FR/exports.lang b/htdocs/langs/fr_FR/exports.lang
index 8f9c38a45dd..5bed116241b 100644
--- a/htdocs/langs/fr_FR/exports.lang
+++ b/htdocs/langs/fr_FR/exports.lang
@@ -53,8 +53,8 @@ TypeOfLineServiceOrProduct=Type de ligne (0=produit, 1=service)
 FileWithDataToImport=Fichier contenant les données à importer
 FileToImport=Fichier source à importer
 FileMustHaveOneOfFollowingFormat=Le fichier à importer doit avoir un des formats suivants
-DownloadEmptyExample=Download template file with field content information
-StarAreMandatory=* are mandatory fields
+DownloadEmptyExample=Télécharger fichier vierge exemple
+StarAreMandatory=* sont des champs obligatoires
 ChooseFormatOfFileToImport=Choisissez le format de fichier à importer en cliquant sur le pictogramme %s pour le sélectionner…
 ChooseFileToImport=Ajoutez le fichier à importer puis cliquez sur le pictogramme %s pour le sélectionner comme fichier source d'import…
 SourceFileFormat=Format du fichier source
diff --git a/htdocs/langs/fr_FR/install.lang b/htdocs/langs/fr_FR/install.lang
index f696c06c241..ae42f4c552a 100644
--- a/htdocs/langs/fr_FR/install.lang
+++ b/htdocs/langs/fr_FR/install.lang
@@ -206,6 +206,7 @@ MigrationUserPhotoPath=Migration des chemins de photos pour les utilisateurs
 MigrationFieldsSocialNetworks=Migration des champs de réseaux sociaux utilisateurs (%s)
 MigrationReloadModule=Rechargement du module %s
 MigrationResetBlockedLog=Réinitialiser le module BlockedLog pour l'algorithme v7
+MigrationImportOrExportProfiles=Migration of import or export profiles (%s)
 ShowNotAvailableOptions=Afficher les choix non disponibles
 HideNotAvailableOptions=Cacher les choix non disponibles
 ErrorFoundDuringMigration=Une erreur est survenu lors du processus de migration, aussi l'étape suivante ne peut pas être réalisée. Pour ignorer les erreurs, vous pouvez <a href="%s">cliquer ici</a>, mais l'application ou certaines fonctionnalités risquent de présenter des dysfonctionnements jusqu'à la résolution de la ou des erreurs
diff --git a/htdocs/langs/fr_FR/interventions.lang b/htdocs/langs/fr_FR/interventions.lang
index 43722fe2bfd..d0296c9ebdb 100644
--- a/htdocs/langs/fr_FR/interventions.lang
+++ b/htdocs/langs/fr_FR/interventions.lang
@@ -64,3 +64,5 @@ InterLineDuration=Durée ligne intervention
 InterLineDesc=Description ligne intervention
 RepeatableIntervention=Modèle d'intervention
 ToCreateAPredefinedIntervention=Pour créer une intervention prédéfinie ou récurrente, créez une intervention standard et convertissez-la en modèle d'intervention
+Reopen=Réouvrir
+ConfirmReopenIntervention=Êtes-vous sur de vouloir ré-ouvrir l'intervention <b>%s</b> ?
diff --git a/htdocs/langs/fr_FR/knowledgemanagement.lang b/htdocs/langs/fr_FR/knowledgemanagement.lang
index 5caceba1b2f..cd987dcae16 100644
--- a/htdocs/langs/fr_FR/knowledgemanagement.lang
+++ b/htdocs/langs/fr_FR/knowledgemanagement.lang
@@ -20,12 +20,12 @@
 # Module label 'ModuleKnowledgeManagementName'
 ModuleKnowledgeManagementName = Gestion d'une base de connaissance
 # Module description 'ModuleKnowledgeManagementDesc'
-ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+ModuleKnowledgeManagementDesc=Gérer une base de connaissance ou d'assistance (KM)
 
 #
 # Admin page
 #
-KnowledgeManagementSetup = Knowledge Management System setup
+KnowledgeManagementSetup = Configuration du système de gestion des connaissances
 Settings = Paramètres
 KnowledgeManagementSetupPage = Paramétrages du module de base de connaissance
 
@@ -37,15 +37,7 @@ About = À propos
 KnowledgeManagementAbout = A propos de la base de connaissances
 KnowledgeManagementAboutPage = A propos de la base de connaissances
 
-#
-# Sample page
-#
 KnowledgeManagementArea = Base de connaissances
-
-
-#
-# Menu
-#
 MenuKnowledgeRecord = Base de connaissance
 ListKnowledgeRecord = Liste des articles
 NewKnowledgeRecord = Nouvel article
@@ -53,3 +45,5 @@ ValidateReply = Valider la réponse
 KnowledgeRecords = Articles
 KnowledgeRecord = Article
 KnowledgeRecordExtraFields = Atribut supplémentaires (articles)
+GroupOfTicket=Groupe de tickets
+YouCanLinkArticleToATicketCategory=You can link an article to a ticket group (so the article will be suggested during qualification of new tickets)
diff --git a/htdocs/langs/fr_FR/languages.lang b/htdocs/langs/fr_FR/languages.lang
index a9629a2fd96..ec2bc8e261b 100644
--- a/htdocs/langs/fr_FR/languages.lang
+++ b/htdocs/langs/fr_FR/languages.lang
@@ -3,7 +3,8 @@ Language_am_ET=Ethiopien
 Language_ar_AR=Arabe
 Language_ar_EG=Arabe (Egypte)
 Language_ar_SA=Arabe
-Language_ar_TN=Arabic (Tunisia)
+Language_ar_TN=Arabe (Tunisie)
+Language_ar_IQ=Arabe (Irak)
 Language_az_AZ=Azerbaïdjanais
 Language_bn_BD=Bengalais
 Language_bn_IN=Bengali (Inde)
@@ -83,6 +84,7 @@ Language_ne_NP=Népalais
 Language_nl_BE=Néerlandais (Belgique)
 Language_nl_NL=Néerlandais
 Language_pl_PL=Polonais
+Language_pt_AO=Portugais (Angola)
 Language_pt_BR=Portugais (Brésil)
 Language_pt_PT=Portugais
 Language_ro_MD=Roumain (Moldavie)
diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index a7ce6dc769c..bf49ccccf54 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -730,7 +730,7 @@ MenuMembers=Adhérents
 MenuAgendaGoogle=Agenda Google
 MenuTaxesAndSpecialExpenses=Charges | Dépenses spéciales
 ThisLimitIsDefinedInSetup=Limite Dolibarr (Menu accueil-configuration-sécurité): %s Ko, Limite PHP: %s Ko
-ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
+ThisLimitIsDefinedInSetupAt=Limite Dolibarr (Menu %s) : %s Ko, limite PHP (Param %s) : %s Ko
 NoFileFound=Pas de documents téléversés
 CurrentUserLanguage=Langue utilisateur actuelle
 CurrentTheme=Thème courant
@@ -1136,4 +1136,4 @@ CategTypeNotFound=Aucun type de tag trouvé pour ce type d'enregistrements
 CopiedToClipboard=Copié dans le presse-papier
 InformationOnLinkToContract=Ce montant n’est que le total de toutes les lignes du contrat. Aucune notion de temps n’est prise en considération.
 ConfirmCancel=Êtes-vous sûr de vous annuler
-EmailMsgID=Email MsgID
+EmailMsgID=E-mail MsgID
diff --git a/htdocs/langs/fr_FR/modulebuilder.lang b/htdocs/langs/fr_FR/modulebuilder.lang
index 9b9e93bebe7..d2b4a28902a 100644
--- a/htdocs/langs/fr_FR/modulebuilder.lang
+++ b/htdocs/langs/fr_FR/modulebuilder.lang
@@ -143,4 +143,4 @@ AsciiToHtmlConverter=Convertisseur Ascii en HTML
 AsciiToPdfConverter=Convertisseur Ascii en PDF
 TableNotEmptyDropCanceled=La table n’est pas vide. La suppression a été annulée.
 ModuleBuilderNotAllowed=Le module builder est activé mais son accès n'est pas autorisé pour votre utilisateur
-ImportExportProfiles=Import and export profiles
+ImportExportProfiles=Importer et exporter des profils
diff --git a/htdocs/langs/fr_FR/mrp.lang b/htdocs/langs/fr_FR/mrp.lang
index 00f0fc18b99..e0a2e73365e 100644
--- a/htdocs/langs/fr_FR/mrp.lang
+++ b/htdocs/langs/fr_FR/mrp.lang
@@ -63,7 +63,7 @@ ConsumeAndProduceAll=Consommer et Produire tout
 Manufactured=Fabriqué
 TheProductXIsAlreadyTheProductToProduce=Le produit à ajouter est déjà le produit à produire.
 ForAQuantityOf=Pour une quantité à produire de %s
-ForAQuantityToConsumeOf=For a quantity to disassemble of %s
+ForAQuantityToConsumeOf=Pour une quantité à désassembler de %s
 ConfirmValidateMo=Voulez-vous vraiment valider cet ordre de fabrication?
 ConfirmProductionDesc=En cliquant sur '%s', vous validerez la consommation et / ou la production pour les quantités définies. Cela mettra également à jour le stock et enregistrera les mouvements de stock.
 ProductionForRef=Production de %s
diff --git a/htdocs/langs/fr_FR/other.lang b/htdocs/langs/fr_FR/other.lang
index 05af1498cb6..c080bd80cf1 100644
--- a/htdocs/langs/fr_FR/other.lang
+++ b/htdocs/langs/fr_FR/other.lang
@@ -264,7 +264,7 @@ ContactCreatedByEmailCollector=Contact/adresse créé par le collecteur de courr
 ProjectCreatedByEmailCollector=Projet créé par le collecteur de courrier électronique à partir du courrier électronique MSGID %s
 TicketCreatedByEmailCollector=Ticket créé par le collecteur de courrier électronique à partir du courrier électronique MSGID %s
 OpeningHoursFormatDesc=Utilisez un - pour séparer les heures d'ouverture et de fermeture. <br> Utilisez un espace pour entrer différentes plages. <br> Exemple: 8-12 14-18
-SuffixSessionName=Suffix for session name
+SuffixSessionName=Suffixe pour le nom de la session
 
 ##### Export #####
 ExportsArea=Espace exports
diff --git a/htdocs/langs/fr_FR/partnership.lang b/htdocs/langs/fr_FR/partnership.lang
index cb51eece63a..7949339a150 100644
--- a/htdocs/langs/fr_FR/partnership.lang
+++ b/htdocs/langs/fr_FR/partnership.lang
@@ -20,9 +20,9 @@ ModulePartnershipName=Gestion des partenariats
 PartnershipDescription=Module de gestion des partenariats
 PartnershipDescriptionLong= Module de gestion des partenariats
 
-AddPartnership=Add partnership
-CancelPartnershipForExpiredMembers=Partnership: Cancel partnership of members with expired subscriptions
-PartnershipCheckBacklink=Partnership: Check referring backlink
+AddPartnership=Ajouter un partenariat
+CancelPartnershipForExpiredMembers=Partenariat : annuler le partenariat des adhérents dont les cotisations ont expirés
+PartnershipCheckBacklink=Partenariat : Vérifiez le backlink référent
 
 #
 # Menu
@@ -37,10 +37,10 @@ PartnershipSetup=Page de configuration du module Partenariat
 PartnershipAbout=À propos de Partenariat
 PartnershipAboutPage=Page d'informations du module Partenariat
 partnershipforthirdpartyormember=Partner status must be set on a 'thirdparty' or a 'member'
-PARTNERSHIP_IS_MANAGED_FOR=Partnership managed for
+PARTNERSHIP_IS_MANAGED_FOR=Partenariat géré pour
 PARTNERSHIP_BACKLINKS_TO_CHECK=Liens de retour à vérifier
 PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb of days before cancelling status of a partnership when a subscription has expired
-ReferingWebsiteCheck=Check of website referring
+ReferingWebsiteCheck=Vérification du site référent
 ReferingWebsiteCheckDesc=You can enable a feature to check that your partners has added a backlink to your website domains on their own website.
 
 #
@@ -54,10 +54,10 @@ DatePartnershipEnd=Date de fin
 ReasonDecline=Raison du refus
 ReasonDeclineOrCancel=Raison du refus
 PartnershipAlreadyExist=Partenariat déjà existant
-ManagePartnership=Manage partnership
+ManagePartnership=Gestion de partenariat
 BacklinkNotFoundOnPartnerWebsite=Lien de retour non trouvé sur le site web partenaire
 ConfirmClosePartnershipAsk=Êtes-vous sûr de vouloir annuler ce partenariat ?
-PartnershipType=Partnership type
+PartnershipType=Type de partenariat
 
 #
 # Template Mail
diff --git a/htdocs/langs/fr_FR/productbatch.lang b/htdocs/langs/fr_FR/productbatch.lang
index ac0ec602eac..193ecb503e1 100644
--- a/htdocs/langs/fr_FR/productbatch.lang
+++ b/htdocs/langs/fr_FR/productbatch.lang
@@ -26,12 +26,10 @@ ShowLogOfMovementIfLot=Afficher l'historique des mouvements de couple produit /
 StockDetailPerBatch=Stock détaillé par lot
 SerialNumberAlreadyInUse=Le numéro de série %s est déjà utilisé pour le produit %s
 TooManyQtyForSerialNumber=Vous ne pouvez avoir qu'un seul produit %s pour le numéro de série %s
-BatchLotNumberingModules=Options pour la génération automatique de produits en lots gérés par lots
-BatchSerialNumberingModules=Options pour la génération automatique de produits en lots gérés par numéros de série
 ManageLotMask=Masque personnalisé
-CustomMasks=Ajoute une option pour définir le masque dans la fiche produit
-LotProductTooltip=Ajoute une option dans la fiche produit pour définir un masque de numéro de lot dédié
-SNProductTooltip=Ajoute une option dans la fiche produit pour définir un masque de numéro de série dédié
+CustomMasks=Option to define a different numbering mask for each product
+BatchLotNumberingModules=Numbering rule for automatic generation of lot number
+BatchSerialNumberingModules=Numbering rule for automatic generation of serial number (for products with property 1 unique lot/serial for each product)
 QtyToAddAfterBarcodeScan=Quantité à ajouter pour chaque code à barres/lot/série scanné
 LifeTime=Durée de vie (en jours)
 EndOfLife=Fin d'utilisation
diff --git a/htdocs/langs/fr_FR/products.lang b/htdocs/langs/fr_FR/products.lang
index d7390c38ba8..dc308c95af2 100644
--- a/htdocs/langs/fr_FR/products.lang
+++ b/htdocs/langs/fr_FR/products.lang
@@ -277,7 +277,7 @@ PriceByCustomer=Prix différents pour chaque client
 PriceCatalogue=Un seul prix de vente par produit/service
 PricingRule=Règles pour les prix clients
 AddCustomerPrice=Ajouter prix par client
-ForceUpdateChildPriceSoc=Définir le même prix sur les filiales des clients
+ForceUpdateChildPriceSoc=Fixer le même prix sur les filiales du client
 PriceByCustomerLog=Historique des prix clients précédents
 MinimumPriceLimit=Le prix ​​minimum ne peut pas être inférieure à %s
 MinimumRecommendedPrice=Prix minimum recommandé : %s
@@ -296,6 +296,7 @@ ComposedProductIncDecStock=Augmenter/Réduire le stock sur changement du stock d
 ComposedProduct=Produits fils
 MinSupplierPrice=Prix d'achat minimum
 MinCustomerPrice=Prix de vente minimum
+NoDynamicPrice=Pas de prix dynamique
 DynamicPriceConfiguration=Configuration du prix dynamique
 DynamicPriceDesc=L'activation de ce module ajoute au fiches des produits une fonction d'enregistrement de formules de calcul des prix sur les prix de vente et d'achat. Ces formules supportent tous les opérateurs mathématiques, quelques constantes et variables. Définissez ici les variables que que vous voulez pouvoir utiliser, et si la variable nécessite d'être actualisée, l'URL externe ou Dolibarr ira chercher la nouvelle valeur
 AddVariable=Ajouter une Variable
diff --git a/htdocs/langs/fr_FR/projects.lang b/htdocs/langs/fr_FR/projects.lang
index 6b342e4eb88..ee7bd31bfa2 100644
--- a/htdocs/langs/fr_FR/projects.lang
+++ b/htdocs/langs/fr_FR/projects.lang
@@ -267,7 +267,7 @@ InvoiceToUse=Facture brouillon à utiliser
 NewInvoice=Nouvelle facture
 OneLinePerTask=Une ligne par tâche
 OneLinePerPeriod=Une ligne par période
-OneLinePerTimeSpentLine=One line for each time spent declaration
+OneLinePerTimeSpentLine=Une ligne pour chaque déclaration de temps passé
 RefTaskParent=Réf. Tâche parent
 ProfitIsCalculatedWith=Le bénéfice est calculé sur la base de
 AddPersonToTask=Ajouter également aux tâches
diff --git a/htdocs/langs/fr_FR/salaries.lang b/htdocs/langs/fr_FR/salaries.lang
index 848ec9b039d..cdabb1c9f35 100644
--- a/htdocs/langs/fr_FR/salaries.lang
+++ b/htdocs/langs/fr_FR/salaries.lang
@@ -17,8 +17,8 @@ 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=Les %s derniers règlements de salaires
-AllSalaries=Tous les règlements de salaires
+LastSalaries=Les %s derniers salaires
+AllSalaries=Tous les salaires
 SalariesStatistics=Statistiques
-# Export
 SalariesAndPayments=Salaires et paiements
+ConfirmDeleteSalaryPayment=Voulez-vous supprimer ce paiement de salaire ?
diff --git a/htdocs/langs/fr_FR/stocks.lang b/htdocs/langs/fr_FR/stocks.lang
index 9db98593448..f0fe7235a77 100644
--- a/htdocs/langs/fr_FR/stocks.lang
+++ b/htdocs/langs/fr_FR/stocks.lang
@@ -56,13 +56,11 @@ UnitPurchaseValue=Prix d'achat unitaire
 StockTooLow=Stock insuffisant
 StockLowerThanLimit=Stock inférieur au stock d'alerte (%s)
 EnhancedValue=Valorisation
-PMPValue=Valorisation (PMP)
-PMPValueShort=PMP
 EnhancedValueOfWarehouses=Valorisation des stocks
 UserWarehouseAutoCreate=Créer automatiquement un stock/entrepôt propre à l'utilisateur lors de sa création
 AllowAddLimitStockByWarehouse=Gérez également les valeurs des stocks minimums et souhaités par paire (produit-entrepôt) en plus des valeurs de minimums et souhaités par produit
 RuleForWarehouse=Règle pour les entrepôts
-WarehouseAskWarehouseOnThirparty=Définir un entrepôt sur un tiers
+WarehouseAskWarehouseOnThirparty=Définir un entrepôt sur les tiers
 WarehouseAskWarehouseDuringPropal=Définir un entrepôt sur les propositions commerciales
 WarehouseAskWarehouseDuringOrder=Définir un entrepôt sur les commandes
 UserDefaultWarehouse=Définir un entrepôt sur les utilisateurs
@@ -91,7 +89,7 @@ NoPredefinedProductToDispatch=Pas de produits prédéfinis dans cet objet. Aucun
 DispatchVerb=Ventiler
 StockLimitShort=Limite pour alerte
 StockLimit=Limite stock pour alerte
-StockLimitDesc=(vide) n'affichera aucune icone d'alerte. <br>0 peut être saisi pour afficher une alerte en cas de stock nul.
+StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
 PhysicalStock=Stock physique
 RealStock=Stock réel
 RealStockDesc=Le stock physique ou réel est le stock présent dans les entrepôts.
@@ -170,7 +168,7 @@ InventoryCodeShort=Code Inv./Mouv.
 NoPendingReceptionOnSupplierOrder=Pas de réception en attente consécutive à des commandes fournisseurs
 ThisSerialAlreadyExistWithDifferentDate=Ce lot/numéro de série (<strong>%s</strong>) existe déjà mais avec des dates de consommation ou péremption différente (trouvé <strong>%s</strong> mais vous avez entré <strong>%s</strong>).
 OpenAnyMovement=Ouvert (tous les mouvements)
-OpenInternal=Ouvert (limité aux mouvements internes)
+OpenInternal=Open (only internal movement)
 UseDispatchStatus=Utiliser un statut de contrôle (approuvé / refusé) pour les lignes de produits lors de la réception de la commande
 OptionMULTIPRICESIsOn=L'option "plusieurs prix par tranches" est activée. Cela signifie qu'un produit à plusieurs prix de vente donc sa valeur de vente ne peut être calculée.
 ProductStockWarehouseCreated=Alerte de limite de stock et de stock désiré ajoutée
@@ -251,9 +249,10 @@ SelectAStockMovementFileToImport=sélectionnez un fichier de mouvement de stock
 InfoTemplateImport=Le fichier téléchargé doit avoir ce format (* champs obligatoires):<br>Entrepôt source* | Entrepôt cible* | Produit* | Quantité* | Numéro de lot/série<br>Le caractère de séparation CSV doit être "<b>%s</b>"
 LabelOfInventoryMovemement=Inventaire %s
 ReOpen=Réouvrir
-ConfirmFinish=Confirmez-vous la clôture de l’inventaire? Ceci générera tous les mouvements de stock pour mettre à jour votre stock.
+ConfirmFinish=Confirmez-vous la clôture de l'inventaire ? Cela générera tous les mouvements de stock pour mettre à jour votre stock à la quantité réelle que vous avez entrée dans l'inventaire.
 ObjectNotFound=%s introuvable
 MakeMovementsAndClose=Générer les mouvements et fermer
 AutofillWithExpected=Remplir la quantité réelle avec la quantité prévue
-ShowAllBatchByDefault=Dérouler par défaut le détail des lots dans l'onglet "stock"
-CollapseBatchDetailHelp=Vous pouvez définir l'affichage par défaut du détail des lots dans la configuration du module stocks
+ShowAllBatchByDefault=Par défaut, afficher les détails des lots sur l'onglet "stock" du produit
+CollapseBatchDetailHelp=You can set batch detail default display in stocks module configuration
+FieldCannotBeNegative=Le champ "%s" ne peut pas être négatif
diff --git a/htdocs/langs/fr_FR/ticket.lang b/htdocs/langs/fr_FR/ticket.lang
index 11e68479e5c..38db6632f00 100644
--- a/htdocs/langs/fr_FR/ticket.lang
+++ b/htdocs/langs/fr_FR/ticket.lang
@@ -34,7 +34,8 @@ TicketDictResolution=Ticket - Résolution
 
 TicketTypeShortCOM=Question commerciale
 TicketTypeShortHELP=Demande d'aide fonctionnelle
-TicketTypeShortISSUE=Problème ou bogue
+TicketTypeShortISSUE=Question ou bug
+TicketTypeShortPROBLEM=Problème
 TicketTypeShortREQUEST=Demande de changement ou d'amélioration
 TicketTypeShortPROJET=Projet
 TicketTypeShortOTHER=Autre
@@ -54,14 +55,15 @@ TypeContact_ticket_internal_SUPPORTTEC=Utilisateur assigné
 TypeContact_ticket_external_SUPPORTCLI=Contact client / suivi des tickets
 TypeContact_ticket_external_CONTRIBUTOR=Contributeur externe
 
-OriginEmail=E-mail source
+OriginEmail=Reporter Email
 Notify_TICKET_SENTBYMAIL=Envoi d'un message du ticket par e-mail
 
 # Status
 Read=Lu
 Assigned=Assigné
 InProgress=En cours
-NeedMoreInformation=Attente retour client
+NeedMoreInformation=Waiting for reporter feedback
+NeedMoreInformationShort=En attente de retour
 Answered=Répondu
 Waiting=En attente
 Closed=Fermé
@@ -160,7 +162,7 @@ CreatedBy=Créé par
 NewTicket=Nouveau ticket
 SubjectAnswerToTicket=Réponse ticket
 TicketTypeRequest=Type de demande
-TicketCategory=Groupe
+TicketCategory=Catégorisation du ticket
 SeeTicket=Voir le ticket
 TicketMarkedAsRead=Le ticket a été marqué comme lu
 TicketReadOn=Lu
@@ -211,6 +213,7 @@ TicketMessageHelp=Seul ce texte sera sauvegardé dans la liste des messages sur
 TicketMessageSubstitutionReplacedByGenericValues=Les variables de substitution sont remplacées par des valeurs génériques.
 TimeElapsedSince=Temps écoulé depuis
 TicketTimeToRead=Temps écoulé avant la lecture
+TicketTimeElapsedBeforeSince=Temps écoulé avant / depuis
 TicketContacts=Contacts ticket
 TicketDocumentsLinked=Documents liés
 ConfirmReOpenTicket=Voulez-vous ré-ouvrir ce ticket ?
@@ -304,7 +307,7 @@ BoxLastModifiedTicket=Derniers tickets modifiés
 BoxLastModifiedTicketDescription=Les %s derniers tickets modifiés
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=Pas de tickets modifiés récemment
-BoxTicketType=Distribution of open tickets by type
+BoxTicketType=Répartition des tickets ouverts par type
 BoxTicketSeverity=Nombre de tickets ouverts par sévérité
 BoxNoTicketSeverity=Aucun ticket ouvert
 BoxTicketLastXDays=Nombre de nouveaux tickets par jour ces %s derniers jours
diff --git a/htdocs/langs/fr_FR/users.lang b/htdocs/langs/fr_FR/users.lang
index 942a1d9fe87..baa7463f999 100644
--- a/htdocs/langs/fr_FR/users.lang
+++ b/htdocs/langs/fr_FR/users.lang
@@ -12,7 +12,7 @@ PasswordChangedTo=Mot de passe modifié en: %s
 SubjectNewPassword=Votre mot de passe pour %s
 GroupRights=Permissions groupe
 UserRights=Permissions utilisateur
-Credentials=Qualifications
+Credentials=Identifiants
 UserGUISetup=Interface utilisateur
 DisableUser=Désactiver
 DisableAUser=Désactiver un utilisateur
diff --git a/htdocs/langs/fr_FR/website.lang b/htdocs/langs/fr_FR/website.lang
index 6f19dab9109..1d8b29b97e8 100644
--- a/htdocs/langs/fr_FR/website.lang
+++ b/htdocs/langs/fr_FR/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Ajouter site web
 Webpage=Page/container Web
 AddPage=Ajouter une page/container
 PageContainer=Page
-PreviewOfSiteNotYetAvailable=La prévisualisation de votre site web <strong>%s</strong> n'est pas disponible actuellement. Vous devez d'abord '<strong>Importer un modèle de site web complet</strong>' ou juste '<strong>Ajouter une page/container</strong>.
+PreviewOfSiteNotYetAvailable=The preview of your website <strong>%s</strong> is not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=La page demandée avec l'id=%s ne présente encore aucun contenu ou le fichier cache .tpl.php a été supprimé. Ajoutez du contenu à la page pour résoudre cela.
 SiteDeleted=Site Web '%s' supprimé
 PageContent=Page/Container
diff --git a/htdocs/langs/fr_GA/admin.lang b/htdocs/langs/fr_GA/admin.lang
index 6455856627f..8c6135dc874 100644
--- a/htdocs/langs/fr_GA/admin.lang
+++ b/htdocs/langs/fr_GA/admin.lang
@@ -1,6 +1,5 @@
 # Dolibarr language file - Source file is en_US - admin
 Module20Name=Devis
 Module30Name=Factures
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/fr_GA/products.lang b/htdocs/langs/fr_GA/products.lang
deleted file mode 100644
index e0628dbec00..00000000000
--- a/htdocs/langs/fr_GA/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
diff --git a/htdocs/langs/fr_GA/salaries.lang b/htdocs/langs/fr_GA/salaries.lang
deleted file mode 100644
index c9bd3bec17b..00000000000
--- a/htdocs/langs/fr_GA/salaries.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - salaries
-LastSalaries=Latest %s salary payments
-AllSalaries=All salary payments
diff --git a/htdocs/langs/fr_GA/ticket.lang b/htdocs/langs/fr_GA/ticket.lang
deleted file mode 100644
index 82e110b1ca4..00000000000
--- a/htdocs/langs/fr_GA/ticket.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - ticket
-TicketTypeShortISSUE=Issue, bug or problem
-OriginEmail=Email source
-NeedMoreInformation=Waiting for information
-TicketCategory=Group
diff --git a/htdocs/langs/fr_GA/users.lang b/htdocs/langs/fr_GA/users.lang
deleted file mode 100644
index 4a412122b08..00000000000
--- a/htdocs/langs/fr_GA/users.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - users
-NbOfUsers=No. of users
-NbOfPermissions=No. of permissions
diff --git a/htdocs/langs/fr_GA/website.lang b/htdocs/langs/fr_GA/website.lang
deleted file mode 100644
index 910cff6b702..00000000000
--- a/htdocs/langs/fr_GA/website.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - website
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
diff --git a/htdocs/langs/gl_ES/admin.lang b/htdocs/langs/gl_ES/admin.lang
index 12fec2a786f..15a325dcd28 100644
--- a/htdocs/langs/gl_ES/admin.lang
+++ b/htdocs/langs/gl_ES/admin.lang
@@ -53,6 +53,7 @@ InternalUser=Usuario interno
 ExternalUser=Usuario externo
 InternalUsers=Usuarios internos
 ExternalUsers=Usuarios externos
+UserInterface=User interface
 GUISetup=Entorno
 SetupArea=Configuración
 UploadNewTemplate=Novo(s) padrón(s) actualizado(s)
@@ -1260,8 +1261,8 @@ YourPHPDoesNotHaveSSLSupport=Funcións SSL non dispoñibles no seu PHP
 DownloadMoreSkins=Mais temas para descargar
 SimpleNumRefModelDesc=Devolve o número de referencia no formato %s yymm-nnnn onde yy é o ano, mm é o mes e nnnn é un número secuencial de incremento automático sen restablecer
 SimpleNumRefNoDateModelDesc=Devolve o número de referencia no formato %s-nnnn onde nnnn é un número con incremento automático secuencial sen restablecemento
-ShowProfIdInAddress=Amosa o identificador profisional nos enderezos dos documentos
-ShowVATIntaInAddress=Ocultar o CIF intracomunitario nos enderezos dos documentos
+ShowProfIdInAddress=Show professional ID with addresses
+ShowVATIntaInAddress=Hide intra-Community VAT number
 TranslationUncomplete=Tradución parcial
 MAIN_DISABLE_METEO=Deshabilitar a vista meteorolóxica
 MeteoStdMod=Modo estándar
@@ -1778,7 +1779,7 @@ ClickToDialSetup=Prema para marcar a configuración do módulo
 ClickToDialUrlDesc=Url chamada cando se fai un clic na imaxe do teléfono. En URL, pode usar etiquetas <br> <b> __PHONETO__ </b> que se substituirán polo número de teléfono da persoa á que chamar <br> <b> __PHONEFROM__ </b> que se substituirá polo número de teléfono persoa (túa) <br> <b> __LOGIN__ </b> que se substituirá por inicio de sesión clicktodial (definido na tarxeta de usuario) <br> <b> __PASS__ </b> que se substituirá por contrasinal clicktodial (definido na tarxeta de usuario).
 ClickToDialDesc=Este módulo cambia os números de teléfono cando se usa un ordenador de escritorio por ligazóns onde se pode facer clic. Un clic chamará ao número. Isto pódese empregar para iniciar a chamada cando se usa un teléfono por software no seu escritorio ou cando se usa un sistema CTI baseado no protocolo SIP por exemplo. Nota: Cando se usa un teléfono intelixente, sempre se pode facer clic nos números de teléfono.
 ClickToDialUseTelLink=Use só unha ligazón "tel:" nos números de teléfono
-ClickToDialUseTelLinkDesc=Utilice este método se os seus usuarios teñen instalado no mesmo ordenador  que o do navegador un software de teléfono ou unha interface telefónica, chamando cando fan clic nunha ligazón do seu navegador que comeza con "tel:". Se precisa unha solución de servidor completa (sen necesidade de instalación de software local), debe establecer isto en "Non" e encher o seguinte campo.
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface, installed on the same computer as the browser, and called when you click on a link starting with "tel:" in your browser. If you need link that start with "sip:" or a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Terminales Punto de Venda
 CashDeskSetup=Configuración do módulo Punto de venda
@@ -2133,7 +2134,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Agás se precisa executar comandos
 PHPFunctionsRequiredForCLI=Para o obxectico do shell (como a copia de seguridade programada do traballo ou a execución dun programa anitivurs), debe manter as funcións PHP 
 NoWritableFilesFoundIntoRootDir=Non se atoparon ficheiros ou directorios con permisos de escritura dos programas comúns no directorio raíz (Bo)
 RecommendedValueIs=Recomendado %s
-NotRecommended=Non recomendado
+Recommended=Recomendada
+NotRecommended=Not recommended
 ARestrictedPath=Un path restrinxido
 CheckForModuleUpdate=Comprobar actualizacións para os módulos externos
 CheckForModuleUpdateHelp=Esta acción conectara cos editores de módulos externos para comprobar se hai unha nova versión dispoñible. 
@@ -2144,3 +2146,5 @@ YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=Activada a API WS obsoleta. No seu l
 RandomlySelectedIfSeveral=Selección aleatoria se hai varias imaxes dispoñibles
 DatabasePasswordObfuscated=O contrasinal da base de datos está oculto no ficheiro conf
 DatabasePasswordNotObfuscated=O contrasinal da base de datos NON está oculto no ficheiro conf 
+APIsAreNotEnabled=Os módulos API non están activos
+YouShouldSetThisToOff=You should set this to 0 or off
diff --git a/htdocs/langs/gl_ES/banks.lang b/htdocs/langs/gl_ES/banks.lang
index f4dfdd68a3b..1cf5a9ac58d 100644
--- a/htdocs/langs/gl_ES/banks.lang
+++ b/htdocs/langs/gl_ES/banks.lang
@@ -115,7 +115,7 @@ TransferTo=A
 TransferFromToDone=A transferencia de <b>%s</b> hacia <b>%s</b> de <b>%s</b> %s foi rexistrada.
 CheckTransmitter=Orixe
 ValidateCheckReceipt=¿Validar este talón recibido?
-ConfirmValidateCheckReceipt=Está certo de querer enviar este xustificante de talón para validalo? Non e posible cambialo despois
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes will be possible once validated.
 DeleteCheckReceipt=¿Eliminar esta remesa?
 ConfirmDeleteCheckReceipt=¿Está certo de querer eliminar esta remesa?
 BankChecks=Talóns bancarios
diff --git a/htdocs/langs/gl_ES/boxes.lang b/htdocs/langs/gl_ES/boxes.lang
index 341c78a4a22..dae7540ab47 100644
--- a/htdocs/langs/gl_ES/boxes.lang
+++ b/htdocs/langs/gl_ES/boxes.lang
@@ -91,8 +91,8 @@ BoxTitleLatestModifiedSupplierOrders=Pedimentos Provedor: últimos %s modificado
 BoxTitleLastModifiedCustomerBills=Facturas Clientes: últimas %s modificadas
 BoxTitleLastModifiedCustomerOrders=Pedimentos Clientes: últimos %s pedimentos modificados
 BoxTitleLastModifiedPropals=Últimos %s orzamentos modificados
-BoxTitleLatestModifiedJobPositions=Últimos %s traballos modificados
-BoxTitleLatestModifiedCandidatures=Últimas %s candidaturas modificadas
+BoxTitleLatestModifiedJobPositions=Latest %s modified job positions
+BoxTitleLatestModifiedCandidatures=Latest %s modified job applications
 ForCustomersInvoices=Facturas a clientes
 ForCustomersOrders=Pedimentos de clientes
 ForProposals=Orzamentos
diff --git a/htdocs/langs/gl_ES/cashdesk.lang b/htdocs/langs/gl_ES/cashdesk.lang
index d752f71f1e6..2b5328219cb 100644
--- a/htdocs/langs/gl_ES/cashdesk.lang
+++ b/htdocs/langs/gl_ES/cashdesk.lang
@@ -127,4 +127,4 @@ AllowDelayedPayment=Permitir o pago en débeda
 PrintPaymentMethodOnReceipts=Imprimir método de pago en tickets/recibos
 WeighingScale=Pesaxe
 ShowPriceHT = Amosar a columna co prezo sen impostos (na pantalla)
-ShowPriceHTOnReceipt = Amosar a columna co prezo sen impostos (no recibo)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on the receipt)
diff --git a/htdocs/langs/gl_ES/errors.lang b/htdocs/langs/gl_ES/errors.lang
index a3436542779..a2567c0672e 100644
--- a/htdocs/langs/gl_ES/errors.lang
+++ b/htdocs/langs/gl_ES/errors.lang
@@ -301,3 +301,4 @@ ErrorActionCommPropertyUserowneridNotDefined=É preciso o supervisor do usuario
 ErrorActionCommBadType=O tipo de evento seleccionado (id: %n, código: %s) non existe no diccionario Tipo de Evento
 CheckVersionFail=Fallou a comprobación da versión
 ErrorWrongFileName=O nome do ficheiro non pode conte  __SOMETHING__ nel
+ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
diff --git a/htdocs/langs/gl_ES/eventorganization.lang b/htdocs/langs/gl_ES/eventorganization.lang
index bd8526c2db6..356afda5e24 100644
--- a/htdocs/langs/gl_ES/eventorganization.lang
+++ b/htdocs/langs/gl_ES/eventorganization.lang
@@ -86,6 +86,7 @@ DownloadICSLink = Descargar ligazón ICS
 EVENTORGANIZATION_SECUREKEY = Clave segura da ligazón de rexistro público a unha conferencia 
 SERVICE_BOOTH_LOCATION = Servizo empregado para a fila de facturas sobre a situación do stand
 SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Servizo usado para a fila de facturas sobre unha subscrición de asistente a unha conferencia 
+NbVotes=Number of votes
 #
 # Status
 #
@@ -115,6 +116,9 @@ EvntOrgDuration = Esta conferencia comeza en %s e remata en %s.
 ConferenceAttendeeFee = Importe de asistente á conferencia para o evento:' %s ' acontece de %s a %s
 BoothLocationFee = Localización do stand para o evento: "%s" que acontece do %s ao %s
 EventType = Tipo de evento
+LabelOfBooth=Booth label
+LabelOfconference=Conference label
+ConferenceIsNotConfirmed=Subcription not available, conference is not confirmed yet
 
 #
 # Vote page
diff --git a/htdocs/langs/gl_ES/install.lang b/htdocs/langs/gl_ES/install.lang
index 6c5340991c7..762d483828b 100644
--- a/htdocs/langs/gl_ES/install.lang
+++ b/htdocs/langs/gl_ES/install.lang
@@ -149,8 +149,8 @@ NothingToDo=Nothing to do
 #########
 # upgrade
 MigrationFixData=Corrección de datos desnormalizados
-MigrationOrder=Migración de datos para os pedimentos a cliente
-MigrationSupplierOrder=Migración de datos para os pedimentos de provedor
+MigrationOrder=Migración de datos para os pedimentos de cliente
+MigrationSupplierOrder=Migración de datos para os pedimentos a provedor
 MigrationProposal=Migración de datos para propostas comerciais
 MigrationInvoice=Migración de datos para as facturas do cliente
 MigrationContract=Migración de datos para contratos
@@ -206,6 +206,7 @@ MigrationUserPhotoPath=Migración de enderezos de fotos para usuarios
 MigrationFieldsSocialNetworks=Migración de redes sociais dos campos dos usuarios (%s)
 MigrationReloadModule=Recargar o módulo %s
 MigrationResetBlockedLog=Restablecer o módulo BlockedLog para o algoritmo v7
+MigrationImportOrExportProfiles=Migration of import or export profiles (%s)
 ShowNotAvailableOptions=Amosar as opcións non dispoñibles
 HideNotAvailableOptions=Ocultar opcións non dispoñibles
 ErrorFoundDuringMigration=Informáronse erros durante o proceso de migración polo que o seguinte paso non está dispoñible. Para ignorar os erros, pode <a href="%s"> facer clic aquí </a>, pero é posible que a aplicación ou algunhas funcións non funcionen correctamente ata que non se resolvan os erros.
diff --git a/htdocs/langs/gl_ES/productbatch.lang b/htdocs/langs/gl_ES/productbatch.lang
index d52d0e031e6..03495c2d642 100644
--- a/htdocs/langs/gl_ES/productbatch.lang
+++ b/htdocs/langs/gl_ES/productbatch.lang
@@ -26,12 +26,10 @@ ShowLogOfMovementIfLot=Consultar os movemeentos de stock deste produto/lote
 StockDetailPerBatch=Detalle de stock por lote
 SerialNumberAlreadyInUse=O número de serie %s xa é usado para o produto %s
 TooManyQtyForSerialNumber=Só pode ter un produto %s para o número de serie %s
-BatchLotNumberingModules=Opcións para a xeración automática de lotes de produtos  xestionados por lotes
-BatchSerialNumberingModules=Opcións para a xeración automática de lotes de produtos xestionados por números de serie 
 ManageLotMask=Máscara personalizada
-CustomMasks=Engada unha opción para definir a máscara na tarxeta do produto 
-LotProductTooltip=Engada unha opción na tarxeta do produto para definir unha máscara de número de lote dedicada 
-SNProductTooltip=Engada unha opción na tarxeta do produto para definir unha máscara de número de serie dedicada 
+CustomMasks=Option to define a different numbering mask for each product
+BatchLotNumberingModules=Numbering rule for automatic generation of lot number
+BatchSerialNumberingModules=Numbering rule for automatic generation of serial number (for products with property 1 unique lot/serial for each product)
 QtyToAddAfterBarcodeScan=Cant. a engadir por cada código de barras/lote/serie escaneado
 LifeTime=Duración da vida útil (en días) 
 EndOfLife=Fin da vida útil
diff --git a/htdocs/langs/gl_ES/products.lang b/htdocs/langs/gl_ES/products.lang
index ddd97ea5344..ca75d74bb38 100644
--- a/htdocs/langs/gl_ES/products.lang
+++ b/htdocs/langs/gl_ES/products.lang
@@ -277,7 +277,7 @@ PriceByCustomer=Diferentes prezos para cada cliente
 PriceCatalogue=Un prezo único de venda por produto/servizo
 PricingRule=Regras para prezos de venda
 AddCustomerPrice=Configurar prezo po cliente
-ForceUpdateChildPriceSoc=Establecer o mesmo prezo nas filiais dos clientes
+ForceUpdateChildPriceSoc=Establece o mesmo prezo nas filiais do cliente 
 PriceByCustomerLog=Historial de prezos previos a clientes
 MinimumPriceLimit=O prezo mínimo non pode ser menor que %s
 MinimumRecommendedPrice=O prezo mínimo recomendado é: %s
@@ -296,6 +296,7 @@ ComposedProductIncDecStock=Incrementar/Diminuir stock ao mudar o pai
 ComposedProduct=Subproduto
 MinSupplierPrice=Prezo mínimo de compra
 MinCustomerPrice=Prezo mínimo de venda
+NoDynamicPrice=Sen prezo dinámico 
 DynamicPriceConfiguration=Configuración de prezo dinámico
 DynamicPriceDesc=Pode definir fórmulas matemáticas para calcular os prezos do cliente ou do provedor. Tales fórmulas poden empregar todos os operadores matemáticos, algunhas constantes e variables. Pode definir aquí as variables que desexa empregar. Se a variable precisa unha actualización automática, pode definir a URL externa para permitir a Dolibarr actualizar o valor automaticamente.
 AddVariable=Engadir variable
diff --git a/htdocs/langs/gl_ES/salaries.lang b/htdocs/langs/gl_ES/salaries.lang
index 577ba84d964..6567eb6151d 100644
--- a/htdocs/langs/gl_ES/salaries.lang
+++ b/htdocs/langs/gl_ES/salaries.lang
@@ -17,8 +17,8 @@ TJM=Taxa media por día
 CurrentSalary=Salario actual
 THMDescription=Este valor pode ser utilizado para calcular os custos de tempo consumido nun proxecto indicados polos usuarios se utiliza o módulo proxectos
 TJMDescription=Este valor actualmente é informativo e non é utilizado para realizar calquera tipo de cálculo
-LastSalaries=Últimos %s pagamentos salariais
-AllSalaries=Todos os pagamentos salariais
+LastSalaries=Latest %s salaries
+AllSalaries=All salaries
 SalariesStatistics=Estatísticas salariais
-# Export
 SalariesAndPayments=Salarios e pagamentos
+ConfirmDeleteSalaryPayment=Do you want to delete this salary payment ?
diff --git a/htdocs/langs/gl_ES/ticket.lang b/htdocs/langs/gl_ES/ticket.lang
index 2f456f65b86..81c2c548f1b 100644
--- a/htdocs/langs/gl_ES/ticket.lang
+++ b/htdocs/langs/gl_ES/ticket.lang
@@ -34,7 +34,8 @@ TicketDictResolution=Resolución dos tickets
 
 TicketTypeShortCOM=Pregunta comercial
 TicketTypeShortHELP=Solicitar axuda sobre funcións
-TicketTypeShortISSUE=Erro, bug ou problema
+TicketTypeShortISSUE=Problema ou erro 
+TicketTypeShortPROBLEM=Problema
 TicketTypeShortREQUEST=Solicitude de cambio ou mellora
 TicketTypeShortPROJET=Proxecto
 TicketTypeShortOTHER=Outro
@@ -54,14 +55,15 @@ TypeContact_ticket_internal_SUPPORTTEC=Usuario asignado
 TypeContact_ticket_external_SUPPORTCLI=Contacto seguemento cliente/incidente
 TypeContact_ticket_external_CONTRIBUTOR=Contribuidor externo
 
-OriginEmail=Orixe E-Mail
+OriginEmail=Reporter Email
 Notify_TICKET_SENTBYMAIL=Enviar mensaxe de ticket por e-mail
 
 # Status
 Read=Lido
 Assigned=Asignado
 InProgress=En progreso
-NeedMoreInformation=Agardando información
+NeedMoreInformation=Agardando os comentarios do redactor
+NeedMoreInformationShort=Agardando os comentarios
 Answered=Contestado
 Waiting=Agardando
 Closed=Pechado
@@ -160,7 +162,7 @@ CreatedBy=Creado por
 NewTicket=Novo ticket
 SubjectAnswerToTicket=Resposta
 TicketTypeRequest=Tipo de solicitude
-TicketCategory=Grúpo
+TicketCategory=Categorización de tickets
 SeeTicket=Ver ticket
 TicketMarkedAsRead=O ticket foi marcado como lido
 TicketReadOn=Lido o
@@ -211,6 +213,7 @@ TicketMessageHelp=Só este texto será gardado na listaxe de mensaxes na ficha d
 TicketMessageSubstitutionReplacedByGenericValues=As variables de substitución son reemplazadas por valores xenéricos.
 TimeElapsedSince=Tempo transcurrido dende
 TicketTimeToRead=Tempo transcurrido antes de ler o ticket
+TicketTimeElapsedBeforeSince=Tempo transcorrido antes / despois 
 TicketContacts=Contactos do ticket
 TicketDocumentsLinked=Documentos ligados ao ticket
 ConfirmReOpenTicket=¿Está certo de querer reabrir este ticket?
diff --git a/htdocs/langs/gl_ES/users.lang b/htdocs/langs/gl_ES/users.lang
index e36d65af255..b101e4a9df4 100644
--- a/htdocs/langs/gl_ES/users.lang
+++ b/htdocs/langs/gl_ES/users.lang
@@ -97,8 +97,8 @@ LoginToCreate=Login a crear
 NameToCreate=Nome do terceiro a crear
 YourRole=Os seus roles
 YourQuotaOfUsersIsReached=¡Máximo de cota de usuarios activos!
-NbOfUsers=Nº de usuarios
-NbOfPermissions=Nº de permisos
+NbOfUsers=Number of users
+NbOfPermissions=Number of permissions
 DontDowngradeSuperAdmin=Sólo un superadmin pode degradar un superadmin
 HierarchicalResponsible=Supervisor
 HierarchicView=Vista xerárquica
diff --git a/htdocs/langs/gl_ES/website.lang b/htdocs/langs/gl_ES/website.lang
index e88f134bdd8..4f5044de2f3 100644
--- a/htdocs/langs/gl_ES/website.lang
+++ b/htdocs/langs/gl_ES/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Engadir sitio web
 Webpage=Páxina web/contedor
 AddPage=Engadir páxina/contedor
 PageContainer=Páxina
-PreviewOfSiteNotYetAvailable=A vista previa do seu sitio web <strong>%s </strong> aínda non está dispoñible. Primeiro debe "<strong> Importar un modelo de sitio web completo </strong>" ou simplemente "<strong> Engadir unha páxina/contedor </strong>".
+PreviewOfSiteNotYetAvailable=The preview of your website <strong>%s</strong> is not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=A páxina solicitada co id %s aínda non ten contido ou a caché file.tpl.php foi eliminada. Edite o contido da páxina para solucionar isto.
 SiteDeleted=Eliminouse o sitio web '%s'
 PageContent=Páxina/Contedor
diff --git a/htdocs/langs/he_IL/admin.lang b/htdocs/langs/he_IL/admin.lang
index c14a7d92f8a..effdc93b52d 100644
--- a/htdocs/langs/he_IL/admin.lang
+++ b/htdocs/langs/he_IL/admin.lang
@@ -53,6 +53,7 @@ InternalUser=פנימית המשתמש
 ExternalUser=משתמש חיצוני
 InternalUsers=משתמשים פנימיים
 ExternalUsers=משתמשים חיצוניים
+UserInterface=User interface
 GUISetup=להציג
 SetupArea=הגדרת
 UploadNewTemplate=Upload new template(s)
@@ -1260,8 +1261,8 @@ YourPHPDoesNotHaveSSLSupport=פונקציות שאינן זמינות ב-SSL-PHP
 DownloadMoreSkins=עוד סקינים להורדה
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
-ShowProfIdInAddress=Show professional id with addresses
-ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
+ShowProfIdInAddress=Show professional ID with addresses
+ShowVATIntaInAddress=Hide intra-Community VAT number
 TranslationUncomplete=תרגום חלקי
 MAIN_DISABLE_METEO=Disable meteorological view
 MeteoStdMod=Standard mode
@@ -1778,7 +1779,7 @@ ClickToDialSetup=לחץ כדי לחייג ההתקנה מודול
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
 ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface, installed on the same computer as the browser, and called when you click on a link starting with "tel:" in your browser. If you need link that start with "sip:" or a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Point of Sale
 CashDeskSetup=Point of Sales module setup
@@ -2133,7 +2134,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
-NotRecommended=Not recommanded
+Recommended=מומלץ
+NotRecommended=Not recommended
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
@@ -2144,3 +2146,5 @@ YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You s
 RandomlySelectedIfSeveral=Randomly selected if several pictures are available
 DatabasePasswordObfuscated=Database password is obfuscated in conf file
 DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
+APIsAreNotEnabled=APIs modules are not enabled
+YouShouldSetThisToOff=You should set this to 0 or off
diff --git a/htdocs/langs/he_IL/banks.lang b/htdocs/langs/he_IL/banks.lang
index df7192bee25..a0b7942d446 100644
--- a/htdocs/langs/he_IL/banks.lang
+++ b/htdocs/langs/he_IL/banks.lang
@@ -115,7 +115,7 @@ TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
 CheckTransmitter=Sender
 ValidateCheckReceipt=Validate this check receipt?
-ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes will be possible once validated.
 DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
diff --git a/htdocs/langs/he_IL/boxes.lang b/htdocs/langs/he_IL/boxes.lang
index 2b95bd27634..8d1a73464bb 100644
--- a/htdocs/langs/he_IL/boxes.lang
+++ b/htdocs/langs/he_IL/boxes.lang
@@ -91,8 +91,8 @@ BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
 BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
 BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
 BoxTitleLastModifiedPropals=Latest %s modified proposals
-BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
-BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
+BoxTitleLatestModifiedJobPositions=Latest %s modified job positions
+BoxTitleLatestModifiedCandidatures=Latest %s modified job applications
 ForCustomersInvoices=Customers invoices
 ForCustomersOrders=Customers orders
 ForProposals=הצעות
diff --git a/htdocs/langs/he_IL/cashdesk.lang b/htdocs/langs/he_IL/cashdesk.lang
index 72b2d4d5e6a..e4463601da5 100644
--- a/htdocs/langs/he_IL/cashdesk.lang
+++ b/htdocs/langs/he_IL/cashdesk.lang
@@ -127,4 +127,4 @@ AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
 ShowPriceHT = Display the column with the price excluding tax (on screen)
-ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on the receipt)
diff --git a/htdocs/langs/he_IL/errors.lang b/htdocs/langs/he_IL/errors.lang
index 670f8c7a6bc..85b90ca4991 100644
--- a/htdocs/langs/he_IL/errors.lang
+++ b/htdocs/langs/he_IL/errors.lang
@@ -301,3 +301,4 @@ ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
 ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
+ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
diff --git a/htdocs/langs/he_IL/eventorganization.lang b/htdocs/langs/he_IL/eventorganization.lang
index 335c257b224..f361e6bc192 100644
--- a/htdocs/langs/he_IL/eventorganization.lang
+++ b/htdocs/langs/he_IL/eventorganization.lang
@@ -86,6 +86,7 @@ DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
 SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
 SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
+NbVotes=Number of votes
 #
 # Status
 #
@@ -115,6 +116,9 @@ EvntOrgDuration = This conference starts on %s and ends on %s.
 ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
 BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
 EventType = Event type
+LabelOfBooth=Booth label
+LabelOfconference=Conference label
+ConferenceIsNotConfirmed=Subcription not available, conference is not confirmed yet
 
 #
 # Vote page
diff --git a/htdocs/langs/he_IL/install.lang b/htdocs/langs/he_IL/install.lang
index 9c06c5e26ed..804488856d4 100644
--- a/htdocs/langs/he_IL/install.lang
+++ b/htdocs/langs/he_IL/install.lang
@@ -206,6 +206,7 @@ MigrationUserPhotoPath=Migration of photo paths for users
 MigrationFieldsSocialNetworks=Migration of users fields social networks (%s)
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
+MigrationImportOrExportProfiles=Migration of import or export profiles (%s)
 ShowNotAvailableOptions=Show unavailable options
 HideNotAvailableOptions=Hide unavailable options
 ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
diff --git a/htdocs/langs/he_IL/interventions.lang b/htdocs/langs/he_IL/interventions.lang
index f09d69912e1..73e80027902 100644
--- a/htdocs/langs/he_IL/interventions.lang
+++ b/htdocs/langs/he_IL/interventions.lang
@@ -64,3 +64,5 @@ InterLineDuration=Line duration intervention
 InterLineDesc=Line description intervention
 RepeatableIntervention=Template of intervention
 ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
+Reopen=Reopen
+ConfirmReopenIntervention=Are you sure you want to open back the intervention <b>%s</b>?
diff --git a/htdocs/langs/he_IL/productbatch.lang b/htdocs/langs/he_IL/productbatch.lang
index d4e69c4df42..da47bb3690d 100644
--- a/htdocs/langs/he_IL/productbatch.lang
+++ b/htdocs/langs/he_IL/productbatch.lang
@@ -26,12 +26,10 @@ ShowLogOfMovementIfLot=Show log of movements for couple product/lot
 StockDetailPerBatch=Stock detail per lot
 SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
-BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
-BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
 ManageLotMask=Custom mask
-CustomMasks=Adds an option to define mask in the product card
-LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
-SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+CustomMasks=Option to define a different numbering mask for each product
+BatchLotNumberingModules=Numbering rule for automatic generation of lot number
+BatchSerialNumberingModules=Numbering rule for automatic generation of serial number (for products with property 1 unique lot/serial for each product)
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
diff --git a/htdocs/langs/he_IL/products.lang b/htdocs/langs/he_IL/products.lang
index 10dcff359e1..860c7aa775a 100644
--- a/htdocs/langs/he_IL/products.lang
+++ b/htdocs/langs/he_IL/products.lang
@@ -277,7 +277,7 @@ PriceByCustomer=Different prices for each customer
 PriceCatalogue=A single sell price per product/service
 PricingRule=Rules for selling prices
 AddCustomerPrice=Add price by customer
-ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
+ForceUpdateChildPriceSoc=Set same price on customer's subsidiaries
 PriceByCustomerLog=Log of previous customer prices
 MinimumPriceLimit=Minimum price can't be lower then %s
 MinimumRecommendedPrice=Minimum recommended price is: %s
@@ -296,6 +296,7 @@ ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Child products
 MinSupplierPrice=Minimum buying price
 MinCustomerPrice=Minimum selling price
+NoDynamicPrice=No dynamic price
 DynamicPriceConfiguration=Dynamic price configuration
 DynamicPriceDesc=You may define mathematical formulae to calculate Customer or Vendor prices. Such formulas can use all mathematical operators, some constants and variables. You can define here the variables you wish to use. If the variable needs an automatic update, you may define the external URL to allow Dolibarr to update the value automatically.
 AddVariable=Add Variable
diff --git a/htdocs/langs/he_IL/salaries.lang b/htdocs/langs/he_IL/salaries.lang
index 7c3c08a65bd..12905040b1a 100644
--- a/htdocs/langs/he_IL/salaries.lang
+++ b/htdocs/langs/he_IL/salaries.lang
@@ -2,20 +2,23 @@
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=By default, leave empty the option "Automatically create a total payment" when creating a Salary
 Salary=Salary
 Salaries=Salaries
-NewSalaryPayment=New salary payment
+NewSalary=New salary
+NewSalaryPayment=New salary card
 AddSalaryPayment=Add salary payment
 SalaryPayment=Salary payment
 SalariesPayments=Salaries payments
+SalariesPaymentsOf=Salaries payments of %s
 ShowSalaryPayment=Show salary payment
 THM=Average hourly rate
 TJM=Average daily rate
 CurrentSalary=Current salary
 THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
 TJMDescription=This value is currently for information only and is not used for any calculation
-LastSalaries=Latest %s salary payments
-AllSalaries=All salary payments
+LastSalaries=Latest %s salaries
+AllSalaries=All salaries
 SalariesStatistics=Salary statistics
-# Export
 SalariesAndPayments=Salaries and payments
+ConfirmDeleteSalaryPayment=Do you want to delete this salary payment ?
diff --git a/htdocs/langs/he_IL/ticket.lang b/htdocs/langs/he_IL/ticket.lang
index e9178cf173e..27ac33e1490 100644
--- a/htdocs/langs/he_IL/ticket.lang
+++ b/htdocs/langs/he_IL/ticket.lang
@@ -34,7 +34,8 @@ TicketDictResolution=Ticket - Resolution
 
 TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
-TicketTypeShortISSUE=Issue, bug or problem
+TicketTypeShortISSUE=Issue or bug
+TicketTypeShortPROBLEM=Problem
 TicketTypeShortREQUEST=Change or enhancement request
 TicketTypeShortPROJET=Project
 TicketTypeShortOTHER=אחר
@@ -54,14 +55,15 @@ TypeContact_ticket_internal_SUPPORTTEC=Assigned user
 TypeContact_ticket_external_SUPPORTCLI=Customer contact / incident tracking
 TypeContact_ticket_external_CONTRIBUTOR=External contributor
 
-OriginEmail=Email source
+OriginEmail=Reporter Email
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
 Read=Read
 Assigned=Assigned
 InProgress=In progress
-NeedMoreInformation=Waiting for information
+NeedMoreInformation=Waiting for reporter feedback
+NeedMoreInformationShort=Waiting for feedback
 Answered=Answered
 Waiting=Waiting
 Closed=Closed
@@ -160,7 +162,7 @@ CreatedBy=Created by
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Group
+TicketCategory=Ticket categorization
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
@@ -211,6 +213,7 @@ TicketMessageHelp=Only this text will be saved in the message list on ticket car
 TicketMessageSubstitutionReplacedByGenericValues=Substitutions variables are replaced by generic values.
 TimeElapsedSince=Time elapsed since
 TicketTimeToRead=Time elapsed before read
+TicketTimeElapsedBeforeSince=Time elapsed before / since
 TicketContacts=Contacts ticket
 TicketDocumentsLinked=Documents linked to ticket
 ConfirmReOpenTicket=Confirm reopen this ticket ?
diff --git a/htdocs/langs/he_IL/users.lang b/htdocs/langs/he_IL/users.lang
index 9507cb1b919..5fea8efa207 100644
--- a/htdocs/langs/he_IL/users.lang
+++ b/htdocs/langs/he_IL/users.lang
@@ -97,8 +97,8 @@ LoginToCreate=Login to create
 NameToCreate=Name of third party to create
 YourRole=Your roles
 YourQuotaOfUsersIsReached=Your quota of active users is reached !
-NbOfUsers=No. of users
-NbOfPermissions=No. of permissions
+NbOfUsers=Number of users
+NbOfPermissions=Number of permissions
 DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin
 HierarchicalResponsible=Supervisor
 HierarchicView=Hierarchical view
diff --git a/htdocs/langs/he_IL/website.lang b/htdocs/langs/he_IL/website.lang
index 62a37b65b60..3d4c70f99e7 100644
--- a/htdocs/langs/he_IL/website.lang
+++ b/htdocs/langs/he_IL/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 PageContainer=Page
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
+PreviewOfSiteNotYetAvailable=The preview of your website <strong>%s</strong> is not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
diff --git a/htdocs/langs/hi_IN/admin.lang b/htdocs/langs/hi_IN/admin.lang
index 6fe157bc675..210a577f939 100644
--- a/htdocs/langs/hi_IN/admin.lang
+++ b/htdocs/langs/hi_IN/admin.lang
@@ -53,6 +53,7 @@ InternalUser=Internal user
 ExternalUser=External user
 InternalUsers=Internal users
 ExternalUsers=External users
+UserInterface=User interface
 GUISetup=Display
 SetupArea=Setup
 UploadNewTemplate=Upload new template(s)
@@ -1260,8 +1261,8 @@ YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP
 DownloadMoreSkins=More skins to download
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
-ShowProfIdInAddress=Show professional id with addresses
-ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
+ShowProfIdInAddress=Show professional ID with addresses
+ShowVATIntaInAddress=Hide intra-Community VAT number
 TranslationUncomplete=Partial translation
 MAIN_DISABLE_METEO=Disable meteorological view
 MeteoStdMod=Standard mode
@@ -1778,7 +1779,7 @@ ClickToDialSetup=Click To Dial module setup
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
 ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface, installed on the same computer as the browser, and called when you click on a link starting with "tel:" in your browser. If you need link that start with "sip:" or a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Point of Sale
 CashDeskSetup=Point of Sales module setup
@@ -2133,7 +2134,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
-NotRecommended=Not recommanded
+Recommended=संस्तुत
+NotRecommended=Not recommended
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
@@ -2144,3 +2146,5 @@ YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You s
 RandomlySelectedIfSeveral=Randomly selected if several pictures are available
 DatabasePasswordObfuscated=Database password is obfuscated in conf file
 DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
+APIsAreNotEnabled=APIs modules are not enabled
+YouShouldSetThisToOff=You should set this to 0 or off
diff --git a/htdocs/langs/hi_IN/banks.lang b/htdocs/langs/hi_IN/banks.lang
index df7192bee25..a0b7942d446 100644
--- a/htdocs/langs/hi_IN/banks.lang
+++ b/htdocs/langs/hi_IN/banks.lang
@@ -115,7 +115,7 @@ TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
 CheckTransmitter=Sender
 ValidateCheckReceipt=Validate this check receipt?
-ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes will be possible once validated.
 DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
diff --git a/htdocs/langs/hi_IN/boxes.lang b/htdocs/langs/hi_IN/boxes.lang
index 0c9ea302fb8..710d49bfab6 100644
--- a/htdocs/langs/hi_IN/boxes.lang
+++ b/htdocs/langs/hi_IN/boxes.lang
@@ -91,8 +91,8 @@ BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
 BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
 BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
 BoxTitleLastModifiedPropals=Latest %s modified proposals
-BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
-BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
+BoxTitleLatestModifiedJobPositions=Latest %s modified job positions
+BoxTitleLatestModifiedCandidatures=Latest %s modified job applications
 ForCustomersInvoices=Customers invoices
 ForCustomersOrders=Customers orders
 ForProposals=Proposals
diff --git a/htdocs/langs/hi_IN/cashdesk.lang b/htdocs/langs/hi_IN/cashdesk.lang
index aea1f02f834..c9d0f7fcd0a 100644
--- a/htdocs/langs/hi_IN/cashdesk.lang
+++ b/htdocs/langs/hi_IN/cashdesk.lang
@@ -127,4 +127,4 @@ AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
 ShowPriceHT = Display the column with the price excluding tax (on screen)
-ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on the receipt)
diff --git a/htdocs/langs/hi_IN/errors.lang b/htdocs/langs/hi_IN/errors.lang
index 670f8c7a6bc..85b90ca4991 100644
--- a/htdocs/langs/hi_IN/errors.lang
+++ b/htdocs/langs/hi_IN/errors.lang
@@ -301,3 +301,4 @@ ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
 ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
+ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
diff --git a/htdocs/langs/hi_IN/eventorganization.lang b/htdocs/langs/hi_IN/eventorganization.lang
index 335c257b224..f361e6bc192 100644
--- a/htdocs/langs/hi_IN/eventorganization.lang
+++ b/htdocs/langs/hi_IN/eventorganization.lang
@@ -86,6 +86,7 @@ DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
 SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
 SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
+NbVotes=Number of votes
 #
 # Status
 #
@@ -115,6 +116,9 @@ EvntOrgDuration = This conference starts on %s and ends on %s.
 ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
 BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
 EventType = Event type
+LabelOfBooth=Booth label
+LabelOfconference=Conference label
+ConferenceIsNotConfirmed=Subcription not available, conference is not confirmed yet
 
 #
 # Vote page
diff --git a/htdocs/langs/hi_IN/install.lang b/htdocs/langs/hi_IN/install.lang
index 63947dad154..c1ffee936d7 100644
--- a/htdocs/langs/hi_IN/install.lang
+++ b/htdocs/langs/hi_IN/install.lang
@@ -206,6 +206,7 @@ MigrationUserPhotoPath=Migration of photo paths for users
 MigrationFieldsSocialNetworks=Migration of users fields social networks (%s)
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
+MigrationImportOrExportProfiles=Migration of import or export profiles (%s)
 ShowNotAvailableOptions=Show unavailable options
 HideNotAvailableOptions=Hide unavailable options
 ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
diff --git a/htdocs/langs/hi_IN/interventions.lang b/htdocs/langs/hi_IN/interventions.lang
index e5936f8246e..51079fca278 100644
--- a/htdocs/langs/hi_IN/interventions.lang
+++ b/htdocs/langs/hi_IN/interventions.lang
@@ -64,3 +64,5 @@ InterLineDuration=Line duration intervention
 InterLineDesc=Line description intervention
 RepeatableIntervention=Template of intervention
 ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
+Reopen=Reopen
+ConfirmReopenIntervention=Are you sure you want to open back the intervention <b>%s</b>?
diff --git a/htdocs/langs/hi_IN/productbatch.lang b/htdocs/langs/hi_IN/productbatch.lang
index 450d0285819..763af20c6b4 100644
--- a/htdocs/langs/hi_IN/productbatch.lang
+++ b/htdocs/langs/hi_IN/productbatch.lang
@@ -26,12 +26,10 @@ ShowLogOfMovementIfLot=Show log of movements for couple product/lot
 StockDetailPerBatch=Stock detail per lot
 SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
-BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
-BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
 ManageLotMask=Custom mask
-CustomMasks=Adds an option to define mask in the product card
-LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
-SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+CustomMasks=Option to define a different numbering mask for each product
+BatchLotNumberingModules=Numbering rule for automatic generation of lot number
+BatchSerialNumberingModules=Numbering rule for automatic generation of serial number (for products with property 1 unique lot/serial for each product)
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
diff --git a/htdocs/langs/hi_IN/products.lang b/htdocs/langs/hi_IN/products.lang
index 9638dfe5a25..fecbe7450c2 100644
--- a/htdocs/langs/hi_IN/products.lang
+++ b/htdocs/langs/hi_IN/products.lang
@@ -277,7 +277,7 @@ PriceByCustomer=Different prices for each customer
 PriceCatalogue=A single sell price per product/service
 PricingRule=Rules for selling prices
 AddCustomerPrice=Add price by customer
-ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
+ForceUpdateChildPriceSoc=Set same price on customer's subsidiaries
 PriceByCustomerLog=Log of previous customer prices
 MinimumPriceLimit=Minimum price can't be lower then %s
 MinimumRecommendedPrice=Minimum recommended price is: %s
@@ -296,6 +296,7 @@ ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Child products
 MinSupplierPrice=Minimum buying price
 MinCustomerPrice=Minimum selling price
+NoDynamicPrice=No dynamic price
 DynamicPriceConfiguration=Dynamic price configuration
 DynamicPriceDesc=You may define mathematical formulae to calculate Customer or Vendor prices. Such formulas can use all mathematical operators, some constants and variables. You can define here the variables you wish to use. If the variable needs an automatic update, you may define the external URL to allow Dolibarr to update the value automatically.
 AddVariable=Add Variable
diff --git a/htdocs/langs/hi_IN/salaries.lang b/htdocs/langs/hi_IN/salaries.lang
index 7c3c08a65bd..12905040b1a 100644
--- a/htdocs/langs/hi_IN/salaries.lang
+++ b/htdocs/langs/hi_IN/salaries.lang
@@ -2,20 +2,23 @@
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=By default, leave empty the option "Automatically create a total payment" when creating a Salary
 Salary=Salary
 Salaries=Salaries
-NewSalaryPayment=New salary payment
+NewSalary=New salary
+NewSalaryPayment=New salary card
 AddSalaryPayment=Add salary payment
 SalaryPayment=Salary payment
 SalariesPayments=Salaries payments
+SalariesPaymentsOf=Salaries payments of %s
 ShowSalaryPayment=Show salary payment
 THM=Average hourly rate
 TJM=Average daily rate
 CurrentSalary=Current salary
 THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
 TJMDescription=This value is currently for information only and is not used for any calculation
-LastSalaries=Latest %s salary payments
-AllSalaries=All salary payments
+LastSalaries=Latest %s salaries
+AllSalaries=All salaries
 SalariesStatistics=Salary statistics
-# Export
 SalariesAndPayments=Salaries and payments
+ConfirmDeleteSalaryPayment=Do you want to delete this salary payment ?
diff --git a/htdocs/langs/hi_IN/ticket.lang b/htdocs/langs/hi_IN/ticket.lang
index 1da32a5a99e..a1bed39c21d 100644
--- a/htdocs/langs/hi_IN/ticket.lang
+++ b/htdocs/langs/hi_IN/ticket.lang
@@ -34,7 +34,8 @@ TicketDictResolution=Ticket - Resolution
 
 TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
-TicketTypeShortISSUE=Issue, bug or problem
+TicketTypeShortISSUE=Issue or bug
+TicketTypeShortPROBLEM=Problem
 TicketTypeShortREQUEST=Change or enhancement request
 TicketTypeShortPROJET=Project
 TicketTypeShortOTHER=Other
@@ -54,14 +55,15 @@ TypeContact_ticket_internal_SUPPORTTEC=Assigned user
 TypeContact_ticket_external_SUPPORTCLI=Customer contact / incident tracking
 TypeContact_ticket_external_CONTRIBUTOR=External contributor
 
-OriginEmail=Email source
+OriginEmail=Reporter Email
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
 Read=Read
 Assigned=Assigned
 InProgress=In progress
-NeedMoreInformation=Waiting for information
+NeedMoreInformation=Waiting for reporter feedback
+NeedMoreInformationShort=Waiting for feedback
 Answered=Answered
 Waiting=Waiting
 Closed=Closed
@@ -160,7 +162,7 @@ CreatedBy=Created by
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Group
+TicketCategory=Ticket categorization
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
@@ -211,6 +213,7 @@ TicketMessageHelp=Only this text will be saved in the message list on ticket car
 TicketMessageSubstitutionReplacedByGenericValues=Substitutions variables are replaced by generic values.
 TimeElapsedSince=Time elapsed since
 TicketTimeToRead=Time elapsed before read
+TicketTimeElapsedBeforeSince=Time elapsed before / since
 TicketContacts=Contacts ticket
 TicketDocumentsLinked=Documents linked to ticket
 ConfirmReOpenTicket=Confirm reopen this ticket ?
diff --git a/htdocs/langs/hi_IN/users.lang b/htdocs/langs/hi_IN/users.lang
index 372090ea5ad..6aeaf128838 100644
--- a/htdocs/langs/hi_IN/users.lang
+++ b/htdocs/langs/hi_IN/users.lang
@@ -97,8 +97,8 @@ LoginToCreate=Login to create
 NameToCreate=Name of third party to create
 YourRole=Your roles
 YourQuotaOfUsersIsReached=Your quota of active users is reached !
-NbOfUsers=No. of users
-NbOfPermissions=No. of permissions
+NbOfUsers=Number of users
+NbOfPermissions=Number of permissions
 DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin
 HierarchicalResponsible=Supervisor
 HierarchicView=Hierarchical view
diff --git a/htdocs/langs/hi_IN/website.lang b/htdocs/langs/hi_IN/website.lang
index 1e727415ec2..dc2ec2c0b3d 100644
--- a/htdocs/langs/hi_IN/website.lang
+++ b/htdocs/langs/hi_IN/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 PageContainer=Page
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
+PreviewOfSiteNotYetAvailable=The preview of your website <strong>%s</strong> is not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
diff --git a/htdocs/langs/hr_HR/admin.lang b/htdocs/langs/hr_HR/admin.lang
index c1373c79e36..936bd0d90fe 100644
--- a/htdocs/langs/hr_HR/admin.lang
+++ b/htdocs/langs/hr_HR/admin.lang
@@ -53,6 +53,7 @@ InternalUser=Interni korisnik
 ExternalUser=Vanjski korisnik
 InternalUsers=Interni korisnici
 ExternalUsers=Vanjski korisnici
+UserInterface=User interface
 GUISetup=Prikaz
 SetupArea=Postavke
 UploadNewTemplate=Upload new template(s)
@@ -1260,8 +1261,8 @@ YourPHPDoesNotHaveSSLSupport=SSL funkcije nisu dostupne u vašem PHP
 DownloadMoreSkins=Više skinova za skinuti
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
-ShowProfIdInAddress=Show professional id with addresses
-ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
+ShowProfIdInAddress=Show professional ID with addresses
+ShowVATIntaInAddress=Hide intra-Community VAT number
 TranslationUncomplete=Parcijalni prijevod
 MAIN_DISABLE_METEO=Disable meteorological view
 MeteoStdMod=Standard mode
@@ -1778,7 +1779,7 @@ ClickToDialSetup=Podešavanje modula ClickToDial
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
 ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Koristi samo "tel:" kod telefona
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface, installed on the same computer as the browser, and called when you click on a link starting with "tel:" in your browser. If you need link that start with "sip:" or a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Point of Sale
 CashDeskSetup=Point of Sales module setup
@@ -2133,7 +2134,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
-NotRecommended=Not recommanded
+Recommended=Preporučeno
+NotRecommended=Not recommended
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
@@ -2144,3 +2146,5 @@ YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You s
 RandomlySelectedIfSeveral=Randomly selected if several pictures are available
 DatabasePasswordObfuscated=Database password is obfuscated in conf file
 DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
+APIsAreNotEnabled=APIs modules are not enabled
+YouShouldSetThisToOff=You should set this to 0 or off
diff --git a/htdocs/langs/hr_HR/banks.lang b/htdocs/langs/hr_HR/banks.lang
index 385eba1a7d7..908d31d1bb9 100644
--- a/htdocs/langs/hr_HR/banks.lang
+++ b/htdocs/langs/hr_HR/banks.lang
@@ -115,7 +115,7 @@ TransferTo=Za
 TransferFromToDone=Prijenos sa <b>%s</b> na <b>%s</b> od <b>%s</b> %s je pohranjen.
 CheckTransmitter=Pošiljatelj
 ValidateCheckReceipt=Validate this check receipt?
-ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes will be possible once validated.
 DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bankovni čekovi
diff --git a/htdocs/langs/hr_HR/boxes.lang b/htdocs/langs/hr_HR/boxes.lang
index 9f1f6135994..2ea4998e4d0 100644
--- a/htdocs/langs/hr_HR/boxes.lang
+++ b/htdocs/langs/hr_HR/boxes.lang
@@ -91,8 +91,8 @@ BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
 BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
 BoxTitleLastModifiedCustomerOrders=Narudžbenice: zadnje %s izmjene
 BoxTitleLastModifiedPropals=Zadnje %s izmijenjene ponude
-BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
-BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
+BoxTitleLatestModifiedJobPositions=Latest %s modified job positions
+BoxTitleLatestModifiedCandidatures=Latest %s modified job applications
 ForCustomersInvoices=Izlazni računi
 ForCustomersOrders=Narudžbe kupaca
 ForProposals=Prijedlozi
diff --git a/htdocs/langs/hr_HR/cashdesk.lang b/htdocs/langs/hr_HR/cashdesk.lang
index 2fe6518b7f1..89775856378 100644
--- a/htdocs/langs/hr_HR/cashdesk.lang
+++ b/htdocs/langs/hr_HR/cashdesk.lang
@@ -127,4 +127,4 @@ AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
 ShowPriceHT = Display the column with the price excluding tax (on screen)
-ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on the receipt)
diff --git a/htdocs/langs/hr_HR/errors.lang b/htdocs/langs/hr_HR/errors.lang
index 7694f6884b7..a7c2118c171 100644
--- a/htdocs/langs/hr_HR/errors.lang
+++ b/htdocs/langs/hr_HR/errors.lang
@@ -301,3 +301,4 @@ ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
 ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
+ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
diff --git a/htdocs/langs/hr_HR/eventorganization.lang b/htdocs/langs/hr_HR/eventorganization.lang
index 505fe0faa62..c356c508877 100644
--- a/htdocs/langs/hr_HR/eventorganization.lang
+++ b/htdocs/langs/hr_HR/eventorganization.lang
@@ -86,6 +86,7 @@ DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
 SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
 SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
+NbVotes=Number of votes
 #
 # Status
 #
@@ -115,6 +116,9 @@ EvntOrgDuration = This conference starts on %s and ends on %s.
 ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
 BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
 EventType = Vrsta događaja
+LabelOfBooth=Booth label
+LabelOfconference=Conference label
+ConferenceIsNotConfirmed=Subcription not available, conference is not confirmed yet
 
 #
 # Vote page
diff --git a/htdocs/langs/hr_HR/install.lang b/htdocs/langs/hr_HR/install.lang
index 78c882aec80..6378b154691 100644
--- a/htdocs/langs/hr_HR/install.lang
+++ b/htdocs/langs/hr_HR/install.lang
@@ -206,6 +206,7 @@ MigrationUserPhotoPath=Migration of photo paths for users
 MigrationFieldsSocialNetworks=Migration of users fields social networks (%s)
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
+MigrationImportOrExportProfiles=Migration of import or export profiles (%s)
 ShowNotAvailableOptions=Show unavailable options
 HideNotAvailableOptions=Hide unavailable options
 ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
diff --git a/htdocs/langs/hr_HR/productbatch.lang b/htdocs/langs/hr_HR/productbatch.lang
index 99758559299..c71f7b3be5d 100644
--- a/htdocs/langs/hr_HR/productbatch.lang
+++ b/htdocs/langs/hr_HR/productbatch.lang
@@ -26,12 +26,10 @@ ShowLogOfMovementIfLot=Prikaži dnevnik kretanja za par proizvod/serija
 StockDetailPerBatch=Detalji zaliha po serijama
 SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
-BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
-BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
 ManageLotMask=Custom mask
-CustomMasks=Adds an option to define mask in the product card
-LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
-SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+CustomMasks=Option to define a different numbering mask for each product
+BatchLotNumberingModules=Numbering rule for automatic generation of lot number
+BatchSerialNumberingModules=Numbering rule for automatic generation of serial number (for products with property 1 unique lot/serial for each product)
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
diff --git a/htdocs/langs/hr_HR/products.lang b/htdocs/langs/hr_HR/products.lang
index 51a3b6a6888..d18bd384c25 100644
--- a/htdocs/langs/hr_HR/products.lang
+++ b/htdocs/langs/hr_HR/products.lang
@@ -277,7 +277,7 @@ PriceByCustomer=Različite cijene za svakog kupca
 PriceCatalogue=Jedinstvena prodajna cijena po proizvodu/usluzi
 PricingRule=Rules for selling prices
 AddCustomerPrice=Dodaj cijenu po kupcu
-ForceUpdateChildPriceSoc=Postavi istu cijenu za sve poslovnice kupca
+ForceUpdateChildPriceSoc=Set same price on customer's subsidiaries
 PriceByCustomerLog=Zabilježi prijašnje cijene kupca
 MinimumPriceLimit=Minimalna cijena ne može biti niža od %s.
 MinimumRecommendedPrice=Minimum recommended price is: %s
@@ -296,6 +296,7 @@ ComposedProductIncDecStock=Povečaj/smanji zalihu po promjeni matičnog proizvod
 ComposedProduct=Child products
 MinSupplierPrice=Minimum buying price
 MinCustomerPrice=Minimum selling price
+NoDynamicPrice=No dynamic price
 DynamicPriceConfiguration=Dinamična konfiguracija cijene
 DynamicPriceDesc=You may define mathematical formulae to calculate Customer or Vendor prices. Such formulas can use all mathematical operators, some constants and variables. You can define here the variables you wish to use. If the variable needs an automatic update, you may define the external URL to allow Dolibarr to update the value automatically.
 AddVariable=Dodaj varijablu
diff --git a/htdocs/langs/hr_HR/salaries.lang b/htdocs/langs/hr_HR/salaries.lang
index f80c2d8ace4..95eaa6fa9d7 100644
--- a/htdocs/langs/hr_HR/salaries.lang
+++ b/htdocs/langs/hr_HR/salaries.lang
@@ -2,20 +2,23 @@
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=By default, leave empty the option "Automatically create a total payment" when creating a Salary
 Salary=Plaća
 Salaries=Plaće
-NewSalaryPayment=Nova isplata plaće
+NewSalary=New salary
+NewSalaryPayment=New salary card
 AddSalaryPayment=Add salary payment
 SalaryPayment=Isplata plaće
 SalariesPayments=Isplate plaća
+SalariesPaymentsOf=Salaries payments of %s
 ShowSalaryPayment=Prikaži isplatu plaće
 THM=Prosječna satnica
 TJM=Prosječna dnevnica
 CurrentSalary=Trenutna plaća
 THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
 TJMDescription=This value is currently for information only and is not used for any calculation
-LastSalaries=Latest %s salary payments
-AllSalaries=All salary payments
+LastSalaries=Latest %s salaries
+AllSalaries=All salaries
 SalariesStatistics=Salary statistics
-# Export
 SalariesAndPayments=Salaries and payments
+ConfirmDeleteSalaryPayment=Do you want to delete this salary payment ?
diff --git a/htdocs/langs/hr_HR/ticket.lang b/htdocs/langs/hr_HR/ticket.lang
index 5d4b66f493b..334210d37ae 100644
--- a/htdocs/langs/hr_HR/ticket.lang
+++ b/htdocs/langs/hr_HR/ticket.lang
@@ -34,7 +34,8 @@ TicketDictResolution=Ticket - Resolution
 
 TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
-TicketTypeShortISSUE=Issue, bug or problem
+TicketTypeShortISSUE=Issue or bug
+TicketTypeShortPROBLEM=Problem
 TicketTypeShortREQUEST=Change or enhancement request
 TicketTypeShortPROJET=Projekt
 TicketTypeShortOTHER=Ostalo
@@ -54,14 +55,15 @@ TypeContact_ticket_internal_SUPPORTTEC=Assigned user
 TypeContact_ticket_external_SUPPORTCLI=Customer contact / incident tracking
 TypeContact_ticket_external_CONTRIBUTOR=External contributor
 
-OriginEmail=Email source
+OriginEmail=Reporter Email
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
 Read=Read
 Assigned=Assigned
 InProgress=U postupku
-NeedMoreInformation=Waiting for information
+NeedMoreInformation=Waiting for reporter feedback
+NeedMoreInformationShort=Waiting for feedback
 Answered=Answered
 Waiting=Čeka
 Closed=Zatvoreno
@@ -160,7 +162,7 @@ CreatedBy=Izradio
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Grupa
+TicketCategory=Ticket categorization
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
@@ -211,6 +213,7 @@ TicketMessageHelp=Only this text will be saved in the message list on ticket car
 TicketMessageSubstitutionReplacedByGenericValues=Substitutions variables are replaced by generic values.
 TimeElapsedSince=Time elapsed since
 TicketTimeToRead=Time elapsed before read
+TicketTimeElapsedBeforeSince=Time elapsed before / since
 TicketContacts=Contacts ticket
 TicketDocumentsLinked=Documents linked to ticket
 ConfirmReOpenTicket=Confirm reopen this ticket ?
diff --git a/htdocs/langs/hr_HR/users.lang b/htdocs/langs/hr_HR/users.lang
index e3922741024..d0f806c6b6a 100644
--- a/htdocs/langs/hr_HR/users.lang
+++ b/htdocs/langs/hr_HR/users.lang
@@ -97,8 +97,8 @@ LoginToCreate=Prijavite se za stvaranje
 NameToCreate=Naziv komitenta za kreiranje
 YourRole=Vaše uloge
 YourQuotaOfUsersIsReached=Vaša kvota aktivnih korisnika je dostignuta !
-NbOfUsers=No. of users
-NbOfPermissions=No. of permissions
+NbOfUsers=Number of users
+NbOfPermissions=Number of permissions
 DontDowngradeSuperAdmin=Samo superadmin može unazaditi superadmina
 HierarchicalResponsible=Nadglednik
 HierarchicView=Hijerarhijski prikaz
diff --git a/htdocs/langs/hr_HR/website.lang b/htdocs/langs/hr_HR/website.lang
index 9be434c3c81..29831210fb6 100644
--- a/htdocs/langs/hr_HR/website.lang
+++ b/htdocs/langs/hr_HR/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 PageContainer=Strana
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
+PreviewOfSiteNotYetAvailable=The preview of your website <strong>%s</strong> is not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
diff --git a/htdocs/langs/hu_HU/admin.lang b/htdocs/langs/hu_HU/admin.lang
index 59e645d548c..6ce2f4839ca 100644
--- a/htdocs/langs/hu_HU/admin.lang
+++ b/htdocs/langs/hu_HU/admin.lang
@@ -53,6 +53,7 @@ InternalUser=Belső felhasználó
 ExternalUser=Külső felhasználó
 InternalUsers=Belső felhasználók
 ExternalUsers=Külső felhasználók
+UserInterface=User interface
 GUISetup=Kijelző
 SetupArea=Beállítás
 UploadNewTemplate=Új sablon(ok) feltöltése
@@ -1260,8 +1261,8 @@ YourPHPDoesNotHaveSSLSupport=SSL funkció nem áll rendelkezésre a PHP
 DownloadMoreSkins=További bőrök letöltése
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
-ShowProfIdInAddress=Show professional id with addresses
-ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
+ShowProfIdInAddress=Show professional ID with addresses
+ShowVATIntaInAddress=Hide intra-Community VAT number
 TranslationUncomplete=Részleges fordítás
 MAIN_DISABLE_METEO=A meteorológiai nézet letiltása
 MeteoStdMod=Normál mód
@@ -1778,7 +1779,7 @@ ClickToDialSetup=Kattintson a Tárcsázás modul beállítása
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
 ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface, installed on the same computer as the browser, and called when you click on a link starting with "tel:" in your browser. If you need link that start with "sip:" or a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Point of Sale
 CashDeskSetup=Point of Sales module setup
@@ -2133,7 +2134,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
-NotRecommended=Not recommanded
+Recommended=Ajánlott
+NotRecommended=Not recommended
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
@@ -2144,3 +2146,5 @@ YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You s
 RandomlySelectedIfSeveral=Randomly selected if several pictures are available
 DatabasePasswordObfuscated=Database password is obfuscated in conf file
 DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
+APIsAreNotEnabled=APIs modules are not enabled
+YouShouldSetThisToOff=You should set this to 0 or off
diff --git a/htdocs/langs/hu_HU/banks.lang b/htdocs/langs/hu_HU/banks.lang
index b9ec7356a11..091018a0e25 100644
--- a/htdocs/langs/hu_HU/banks.lang
+++ b/htdocs/langs/hu_HU/banks.lang
@@ -115,7 +115,7 @@ TransferTo=Címzett
 TransferFromToDone=A transzfer <b>%s</b> a <b>%s</b> a <b>%s</b> %s lett felvéve.
 CheckTransmitter=Küldő
 ValidateCheckReceipt=Validate this check receipt?
-ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes will be possible once validated.
 DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Banki csekkek
diff --git a/htdocs/langs/hu_HU/boxes.lang b/htdocs/langs/hu_HU/boxes.lang
index 3a23f75e080..e4494db996f 100644
--- a/htdocs/langs/hu_HU/boxes.lang
+++ b/htdocs/langs/hu_HU/boxes.lang
@@ -91,8 +91,8 @@ BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
 BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
 BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
 BoxTitleLastModifiedPropals=Latest %s modified proposals
-BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
-BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
+BoxTitleLatestModifiedJobPositions=Latest %s modified job positions
+BoxTitleLatestModifiedCandidatures=Latest %s modified job applications
 ForCustomersInvoices=Ügyfél számlák
 ForCustomersOrders=Ügyfél megrendelések
 ForProposals=Javaslatok
diff --git a/htdocs/langs/hu_HU/cashdesk.lang b/htdocs/langs/hu_HU/cashdesk.lang
index 3f593a27d4d..43c44a2dd95 100644
--- a/htdocs/langs/hu_HU/cashdesk.lang
+++ b/htdocs/langs/hu_HU/cashdesk.lang
@@ -127,4 +127,4 @@ AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
 ShowPriceHT = Display the column with the price excluding tax (on screen)
-ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on the receipt)
diff --git a/htdocs/langs/hu_HU/errors.lang b/htdocs/langs/hu_HU/errors.lang
index d06fc6e5773..172d52e6908 100644
--- a/htdocs/langs/hu_HU/errors.lang
+++ b/htdocs/langs/hu_HU/errors.lang
@@ -301,3 +301,4 @@ ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
 ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
+ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
diff --git a/htdocs/langs/hu_HU/eventorganization.lang b/htdocs/langs/hu_HU/eventorganization.lang
index 4840d6b0819..05c7d92875c 100644
--- a/htdocs/langs/hu_HU/eventorganization.lang
+++ b/htdocs/langs/hu_HU/eventorganization.lang
@@ -86,6 +86,7 @@ DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
 SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
 SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
+NbVotes=Number of votes
 #
 # Status
 #
@@ -115,6 +116,9 @@ EvntOrgDuration = This conference starts on %s and ends on %s.
 ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
 BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
 EventType = Event type
+LabelOfBooth=Booth label
+LabelOfconference=Conference label
+ConferenceIsNotConfirmed=Subcription not available, conference is not confirmed yet
 
 #
 # Vote page
diff --git a/htdocs/langs/hu_HU/install.lang b/htdocs/langs/hu_HU/install.lang
index f576818e1d1..0c9cef51237 100644
--- a/htdocs/langs/hu_HU/install.lang
+++ b/htdocs/langs/hu_HU/install.lang
@@ -206,6 +206,7 @@ MigrationUserPhotoPath=Képek útvonalainak áttelepítése a felhasználók sz
 MigrationFieldsSocialNetworks=A felhasználói fiókok migrációja a közösségi hálózatokon (%s)
 MigrationReloadModule=Modul újratöltése %s
 MigrationResetBlockedLog=Alaphelyzetbe állítja a BlockedLog modult a v7 algoritmushoz
+MigrationImportOrExportProfiles=Migration of import or export profiles (%s)
 ShowNotAvailableOptions=Nem elérhető lehetőségek megjelenítése
 HideNotAvailableOptions=Nem elérhető lehetőségek elrejtése
 ErrorFoundDuringMigration=Hibá(k) fordulhattak elő a migrálási folyamat során, így a következő lépés nem érhető el. A hibák figyelmen kívül hagyásához <a href="%s">kattintson ide</a>, de lehet, hogy az alkalmazás vagy egyes szolgáltatások nem működnek addig helyesen, amíg a hibákat ki nem javítja (valaki).
diff --git a/htdocs/langs/hu_HU/interventions.lang b/htdocs/langs/hu_HU/interventions.lang
index 40f2ec4977c..7e84765eb37 100644
--- a/htdocs/langs/hu_HU/interventions.lang
+++ b/htdocs/langs/hu_HU/interventions.lang
@@ -64,3 +64,5 @@ InterLineDuration=Line duration intervention
 InterLineDesc=Line description intervention
 RepeatableIntervention=Template of intervention
 ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
+Reopen=Reopen
+ConfirmReopenIntervention=Are you sure you want to open back the intervention <b>%s</b>?
diff --git a/htdocs/langs/hu_HU/productbatch.lang b/htdocs/langs/hu_HU/productbatch.lang
index 59f47f89a79..848386e6c50 100644
--- a/htdocs/langs/hu_HU/productbatch.lang
+++ b/htdocs/langs/hu_HU/productbatch.lang
@@ -26,12 +26,10 @@ ShowLogOfMovementIfLot=Show log of movements for couple product/lot
 StockDetailPerBatch=Stock detail per lot
 SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
-BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
-BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
 ManageLotMask=Custom mask
-CustomMasks=Adds an option to define mask in the product card
-LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
-SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+CustomMasks=Option to define a different numbering mask for each product
+BatchLotNumberingModules=Numbering rule for automatic generation of lot number
+BatchSerialNumberingModules=Numbering rule for automatic generation of serial number (for products with property 1 unique lot/serial for each product)
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
diff --git a/htdocs/langs/hu_HU/products.lang b/htdocs/langs/hu_HU/products.lang
index ee12f3ea4a5..26b5bdf7f2c 100644
--- a/htdocs/langs/hu_HU/products.lang
+++ b/htdocs/langs/hu_HU/products.lang
@@ -277,7 +277,7 @@ PriceByCustomer=Egyedi ár minden vevő számára
 PriceCatalogue=Egyetlen eladási ár termékenként/szolgáltatásonként
 PricingRule=Az eladási árak szabályai
 AddCustomerPrice=Ár hozzáadása ügyfelek szerint
-ForceUpdateChildPriceSoc=Állítsa be ugyanazt az árat az ügyfél leányvállalatokra
+ForceUpdateChildPriceSoc=Set same price on customer's subsidiaries
 PriceByCustomerLog=A korábbi vevői árak naplója
 MinimumPriceLimit=A minimális ár nem lehet kisebb mint %s
 MinimumRecommendedPrice=Ajánlott minimális ár: %s
@@ -296,6 +296,7 @@ ComposedProductIncDecStock=Növelje/csökkentse a készletet a szülő termék v
 ComposedProduct=Gyermek termékek
 MinSupplierPrice=Minimális vételár
 MinCustomerPrice=Minimális eladási ár
+NoDynamicPrice=No dynamic price
 DynamicPriceConfiguration=Dinamikus árkonfiguráció
 DynamicPriceDesc=Megadhat matematikai képleteket a vevői vagy a szállítói árak kiszámításához. Az ilyen képletek felhasználhatják az összes matematikai operátort, néhány állandót és változót. Itt meghatározhatja azokat a változókat, amelyeket használni kíván. Ha a változónak automatikus frissítésre van szüksége, megadhatja a külső URL-t, hogy a Dolibarr automatikusan frissítse az értéket.
 AddVariable=Változó hozzáadása
diff --git a/htdocs/langs/hu_HU/salaries.lang b/htdocs/langs/hu_HU/salaries.lang
index 3ab2c9f6d4d..fffafe44485 100644
--- a/htdocs/langs/hu_HU/salaries.lang
+++ b/htdocs/langs/hu_HU/salaries.lang
@@ -2,20 +2,23 @@
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=By default, leave empty the option "Automatically create a total payment" when creating a Salary
 Salary=Salary
 Salaries=Bérek
-NewSalaryPayment=New salary payment
+NewSalary=New salary
+NewSalaryPayment=New salary card
 AddSalaryPayment=Add salary payment
 SalaryPayment=Salary payment
 SalariesPayments=Salaries payments
+SalariesPaymentsOf=Salaries payments of %s
 ShowSalaryPayment=Show salary payment
 THM=Average hourly rate
 TJM=Average daily rate
 CurrentSalary=Current salary
 THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
 TJMDescription=This value is currently for information only and is not used for any calculation
-LastSalaries=Latest %s salary payments
-AllSalaries=All salary payments
+LastSalaries=Latest %s salaries
+AllSalaries=All salaries
 SalariesStatistics=Salary statistics
-# Export
 SalariesAndPayments=Salaries and payments
+ConfirmDeleteSalaryPayment=Do you want to delete this salary payment ?
diff --git a/htdocs/langs/hu_HU/ticket.lang b/htdocs/langs/hu_HU/ticket.lang
index 940875e54b8..72748adb113 100644
--- a/htdocs/langs/hu_HU/ticket.lang
+++ b/htdocs/langs/hu_HU/ticket.lang
@@ -34,7 +34,8 @@ TicketDictResolution=Ticket - Resolution
 
 TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
-TicketTypeShortISSUE=Issue, bug or problem
+TicketTypeShortISSUE=Issue or bug
+TicketTypeShortPROBLEM=Problem
 TicketTypeShortREQUEST=Change or enhancement request
 TicketTypeShortPROJET=Projekt
 TicketTypeShortOTHER=Egyéb
@@ -54,14 +55,15 @@ TypeContact_ticket_internal_SUPPORTTEC=Assigned user
 TypeContact_ticket_external_SUPPORTCLI=Customer contact / incident tracking
 TypeContact_ticket_external_CONTRIBUTOR=External contributor
 
-OriginEmail=Email source
+OriginEmail=Reporter Email
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
 Read=Olvas
 Assigned=Assigned
 InProgress=Folyamatban
-NeedMoreInformation=Waiting for information
+NeedMoreInformation=Waiting for reporter feedback
+NeedMoreInformationShort=Waiting for feedback
 Answered=Answered
 Waiting=Várakozás
 Closed=Lezárt
@@ -160,7 +162,7 @@ CreatedBy=Created by
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Csoport
+TicketCategory=Ticket categorization
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
@@ -211,6 +213,7 @@ TicketMessageHelp=Only this text will be saved in the message list on ticket car
 TicketMessageSubstitutionReplacedByGenericValues=Substitutions variables are replaced by generic values.
 TimeElapsedSince=Time elapsed since
 TicketTimeToRead=Time elapsed before read
+TicketTimeElapsedBeforeSince=Time elapsed before / since
 TicketContacts=Contacts ticket
 TicketDocumentsLinked=Documents linked to ticket
 ConfirmReOpenTicket=Confirm reopen this ticket ?
diff --git a/htdocs/langs/hu_HU/users.lang b/htdocs/langs/hu_HU/users.lang
index 1c115aac06a..f10f7b62924 100644
--- a/htdocs/langs/hu_HU/users.lang
+++ b/htdocs/langs/hu_HU/users.lang
@@ -97,8 +97,8 @@ LoginToCreate=Létrehozandó bejelentkezés
 NameToCreate=Létrehozandó harmadik fél neve
 YourRole=Szerepkörei
 YourQuotaOfUsersIsReached=Aktív felhasználói kvóta elérve!
-NbOfUsers=Felhasználók száma
-NbOfPermissions=Engedélyek száma
+NbOfUsers=Number of users
+NbOfPermissions=Number of permissions
 DontDowngradeSuperAdmin=Csak egy superadmin lehet downgrade 1 superadmin
 HierarchicalResponsible=Felettes
 HierarchicView=Hierachia nézet
diff --git a/htdocs/langs/hu_HU/website.lang b/htdocs/langs/hu_HU/website.lang
index 0d0b576b87e..4f3fc5bc963 100644
--- a/htdocs/langs/hu_HU/website.lang
+++ b/htdocs/langs/hu_HU/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Webhely hozzáadása
 Webpage=Weblap / tároló
 AddPage=Oldal / tároló hozzáadása
 PageContainer=Oldal
-PreviewOfSiteNotYetAvailable=A weboldal előnézete <strong>%s</strong> még nem érhető el. Először &#39; <strong>Teljes weboldal-sablont</strong> kell <strong>importálnia</strong> &#39; vagy csak &#39; <strong>Oldal / tároló hozzáadása</strong> &#39; <strong>elemet</strong> .
+PreviewOfSiteNotYetAvailable=The preview of your website <strong>%s</strong> is not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Az %s azonosítóval kért oldalnak még nincs tartalma, vagy a .tpl.php gyorsítótár fájlt eltávolították. Szerkessze az oldal tartalmát ennek megoldásához.
 SiteDeleted=&#39;%s&#39; webhely törölve
 PageContent=Oldal / Konténer
diff --git a/htdocs/langs/id_ID/admin.lang b/htdocs/langs/id_ID/admin.lang
index b653844ce89..0d8796aa98b 100644
--- a/htdocs/langs/id_ID/admin.lang
+++ b/htdocs/langs/id_ID/admin.lang
@@ -53,6 +53,7 @@ InternalUser=Pengguna internal
 ExternalUser=Pengguna eksternal
 InternalUsers=Pengguna internal
 ExternalUsers=Pengguna eksternal
+UserInterface=User interface
 GUISetup=Tampakan Display
 SetupArea=Pengaturan
 UploadNewTemplate=Unggah templat baru(s)
@@ -1260,8 +1261,8 @@ YourPHPDoesNotHaveSSLSupport=Fungsi SSL tidak tersedia di PHP Anda
 DownloadMoreSkins=Lebih banyak skin untuk diunduh
 SimpleNumRefModelDesc=Mengembalikan nomor referensi dalam format %syymm-nnnn di mana yy adalah tahun, mm adalah bulan dan nnnn adalah nomor auto-incrementing berurutan tanpa reset
 SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
-ShowProfIdInAddress=Tampilkan id profesional dengan alamat
-ShowVATIntaInAddress=Sembunyikan nomor PPN intra-Komunitas dengan alamat
+ShowProfIdInAddress=Show professional ID with addresses
+ShowVATIntaInAddress=Hide intra-Community VAT number
 TranslationUncomplete=Terjemahan sebagian
 MAIN_DISABLE_METEO=Nonaktifkan tampilan meteorologi
 MeteoStdMod=Mode standar
@@ -1778,7 +1779,7 @@ ClickToDialSetup=Klik Untuk Memanggil pengaturan modul
 ClickToDialUrlDesc=Url dipanggil ketika klik pada telepon picto dilakukan. Di URL, Anda dapat menggunakan tag <br><b>__PHONETO__</b>yang akan diganti dengan nomor telepon orang untuk memanggil <br><b>__PHONEFROM__</b>yang akan diganti dengan nomor telepon memanggil orang (Anda) <br><b>__LOGIN__</b>yang akan diganti dengan clicktodial login (didefinisikan pada kartu pengguna) <br><b>__PASS__</b>yang akan diganti dengan password clicktodial (didefinisikan pada kartu pengguna).
 ClickToDialDesc=Modul ini mengubah nomor telepon, saat menggunakan komputer desktop, menjadi tautan yang dapat diklik. Satu klik akan memanggil nomor tersebut. Ini dapat digunakan untuk memulai panggilan telepon saat menggunakan telepon lunak di desktop Anda atau saat menggunakan sistem CTI berdasarkan protokol SIP misalnya. Catatan: Saat menggunakan ponsel cerdas, nomor telepon selalu dapat diklik.
 ClickToDialUseTelLink=Gunakan hanya tautan "tel:" pada nomor telepon
-ClickToDialUseTelLinkDesc=Gunakan metode ini jika pengguna Anda memiliki softphone atau antarmuka perangkat lunak yang diinstal pada komputer yang sama dengan browser, dan dipanggil ketika Anda mengklik tautan di browser Anda yang dimulai dengan "tel:". Jika Anda memerlukan solusi server lengkap (tidak perlu instalasi perangkat lunak lokal), Anda harus mengatur ini ke "Tidak" dan isi kolom selanjutnya.
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface, installed on the same computer as the browser, and called when you click on a link starting with "tel:" in your browser. If you need link that start with "sip:" or a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Titik penjualan POS
 CashDeskSetup=Pengaturan modul Point of Sales
@@ -2133,7 +2134,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
-NotRecommended=Not recommanded
+Recommended=Direkomendasikan
+NotRecommended=Not recommended
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
@@ -2144,3 +2146,5 @@ YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You s
 RandomlySelectedIfSeveral=Randomly selected if several pictures are available
 DatabasePasswordObfuscated=Database password is obfuscated in conf file
 DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
+APIsAreNotEnabled=APIs modules are not enabled
+YouShouldSetThisToOff=You should set this to 0 or off
diff --git a/htdocs/langs/id_ID/banks.lang b/htdocs/langs/id_ID/banks.lang
index 84e3aecbc0f..07792b4e882 100644
--- a/htdocs/langs/id_ID/banks.lang
+++ b/htdocs/langs/id_ID/banks.lang
@@ -115,7 +115,7 @@ TransferTo=Kepada
 TransferFromToDone=Transfer dari <b>%s</b> ke <b>%s</b> dari <b>%s</b> %s telah dicatat.
 CheckTransmitter=Sender
 ValidateCheckReceipt=Validasi tanda terima cek ini?
-ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes will be possible once validated.
 DeleteCheckReceipt=Hapus tanda terima cek ini?
 ConfirmDeleteCheckReceipt=Anda yakin ingin menghapus tanda terima cek ini?
 BankChecks=Cek bank
diff --git a/htdocs/langs/id_ID/boxes.lang b/htdocs/langs/id_ID/boxes.lang
index 849a43fd146..7205c7341c0 100644
--- a/htdocs/langs/id_ID/boxes.lang
+++ b/htdocs/langs/id_ID/boxes.lang
@@ -91,8 +91,8 @@ BoxTitleLatestModifiedSupplierOrders=Pesanan Vendor: %s terakhir dimodifikasi
 BoxTitleLastModifiedCustomerBills=Faktur Pelanggan: %s terakhir dimodifikasi
 BoxTitleLastModifiedCustomerOrders=Pesanan Penjualan: %s terakhir dimodifikasi
 BoxTitleLastModifiedPropals=Proposal dimodifikasi %s terbaru
-BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
-BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
+BoxTitleLatestModifiedJobPositions=Latest %s modified job positions
+BoxTitleLatestModifiedCandidatures=Latest %s modified job applications
 ForCustomersInvoices=Tagihan pelanggan
 ForCustomersOrders=Pesanan pelanggan
 ForProposals=Proposal
diff --git a/htdocs/langs/id_ID/cashdesk.lang b/htdocs/langs/id_ID/cashdesk.lang
index 02c10810ce5..42060d0374c 100644
--- a/htdocs/langs/id_ID/cashdesk.lang
+++ b/htdocs/langs/id_ID/cashdesk.lang
@@ -127,4 +127,4 @@ AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
 ShowPriceHT = Display the column with the price excluding tax (on screen)
-ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on the receipt)
diff --git a/htdocs/langs/id_ID/errors.lang b/htdocs/langs/id_ID/errors.lang
index 8777126de3c..4e3f5eb1569 100644
--- a/htdocs/langs/id_ID/errors.lang
+++ b/htdocs/langs/id_ID/errors.lang
@@ -301,3 +301,4 @@ ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
 ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
+ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
diff --git a/htdocs/langs/id_ID/eventorganization.lang b/htdocs/langs/id_ID/eventorganization.lang
index c335ed8a7ff..03090c1a352 100644
--- a/htdocs/langs/id_ID/eventorganization.lang
+++ b/htdocs/langs/id_ID/eventorganization.lang
@@ -86,6 +86,7 @@ DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
 SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
 SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
+NbVotes=Number of votes
 #
 # Status
 #
@@ -115,6 +116,9 @@ EvntOrgDuration = This conference starts on %s and ends on %s.
 ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
 BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
 EventType = Jenis agenda
+LabelOfBooth=Booth label
+LabelOfconference=Conference label
+ConferenceIsNotConfirmed=Subcription not available, conference is not confirmed yet
 
 #
 # Vote page
diff --git a/htdocs/langs/id_ID/install.lang b/htdocs/langs/id_ID/install.lang
index ec85aa3eaf9..dd5406e81e4 100644
--- a/htdocs/langs/id_ID/install.lang
+++ b/htdocs/langs/id_ID/install.lang
@@ -206,6 +206,7 @@ MigrationUserPhotoPath=Migrasi jalur foto untuk pengguna
 MigrationFieldsSocialNetworks=Migrasi pengguna memasukkan jejaring sosial (%s)
 MigrationReloadModule=Muat ulang modul %s
 MigrationResetBlockedLog=Atur ulang modul BlockedLog untuk algoritma v7
+MigrationImportOrExportProfiles=Migration of import or export profiles (%s)
 ShowNotAvailableOptions=Tampilkan opsi yang tidak tersedia
 HideNotAvailableOptions=Sembunyikan opsi yang tidak tersedia
 ErrorFoundDuringMigration=Kesalahan dilaporkan selama proses migrasi sehingga langkah selanjutnya tidak tersedia. Untuk mengabaikan kesalahan, Anda dapat <a href="%s"> klik di sini </a>, tetapi aplikasi atau beberapa fitur mungkin tidak berfungsi dengan benar sampai kesalahan diselesaikan.
diff --git a/htdocs/langs/id_ID/interventions.lang b/htdocs/langs/id_ID/interventions.lang
index a6094a79f2e..69ce7ee3ad0 100644
--- a/htdocs/langs/id_ID/interventions.lang
+++ b/htdocs/langs/id_ID/interventions.lang
@@ -64,3 +64,5 @@ InterLineDuration=Intervensi durasi garis
 InterLineDesc=Intervensi deskripsi garis
 RepeatableIntervention=Template intervensi
 ToCreateAPredefinedIntervention=Untuk membuat intervensi yang telah ditetapkan atau berulang, buat intervensi umum dan ubah menjadi template intervensi
+Reopen=Reopen
+ConfirmReopenIntervention=Are you sure you want to open back the intervention <b>%s</b>?
diff --git a/htdocs/langs/id_ID/productbatch.lang b/htdocs/langs/id_ID/productbatch.lang
index a9c155c25ec..2940f77b782 100644
--- a/htdocs/langs/id_ID/productbatch.lang
+++ b/htdocs/langs/id_ID/productbatch.lang
@@ -26,12 +26,10 @@ ShowLogOfMovementIfLot=Tampilkan log pergerakan untuk produk / lot pasangan
 StockDetailPerBatch=Detail stok per lot
 SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
-BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
-BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
 ManageLotMask=Custom mask
-CustomMasks=Adds an option to define mask in the product card
-LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
-SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+CustomMasks=Option to define a different numbering mask for each product
+BatchLotNumberingModules=Numbering rule for automatic generation of lot number
+BatchSerialNumberingModules=Numbering rule for automatic generation of serial number (for products with property 1 unique lot/serial for each product)
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
diff --git a/htdocs/langs/id_ID/products.lang b/htdocs/langs/id_ID/products.lang
index fd9f3020017..4a4304c8636 100644
--- a/htdocs/langs/id_ID/products.lang
+++ b/htdocs/langs/id_ID/products.lang
@@ -277,7 +277,7 @@ PriceByCustomer=Harga berbeda untuk setiap pelanggan
 PriceCatalogue=Harga jual tunggal per produk / layanan
 PricingRule=Aturan untuk harga jual
 AddCustomerPrice=Tambahkan harga oleh pelanggan
-ForceUpdateChildPriceSoc=Tetapkan harga yang sama pada anak perusahaan pelanggan
+ForceUpdateChildPriceSoc=Set same price on customer's subsidiaries
 PriceByCustomerLog=Log harga pelanggan sebelumnya
 MinimumPriceLimit=Harga minimum tidak bisa lebih rendah dari %s
 MinimumRecommendedPrice=Harga minimum yang disarankan adalah: %s
@@ -296,6 +296,7 @@ ComposedProductIncDecStock=Tambah / Kurangi stok karena perubahan induk
 ComposedProduct=Produk anak-anak
 MinSupplierPrice=Harga beli minimal
 MinCustomerPrice=Harga jual minimum
+NoDynamicPrice=No dynamic price
 DynamicPriceConfiguration=Konfigurasi harga dinamis
 DynamicPriceDesc=Anda dapat menentukan rumus matematika untuk menghitung harga Pelanggan atau Vendor. Rumus tersebut dapat menggunakan semua operator matematika, beberapa konstanta dan variabel. Anda dapat mendefinisikan di sini variabel yang ingin Anda gunakan. Jika variabel memerlukan pembaruan otomatis, Anda dapat menentukan URL eksternal untuk memungkinkan Dolibarr memperbarui nilai secara otomatis.
 AddVariable=Tambahkan Variabel
@@ -340,7 +341,7 @@ ProductSheet=Lembar produk
 ServiceSheet=Lembar layanan
 PossibleValues=Nilai yang mungkin
 GoOnMenuToCreateVairants=Buka menu %s - %s untuk menyiapkan varian atribut (seperti warna, ukuran, ...)
-UseProductFournDesc=Tambahkan fitur untuk mendefinisikan deskripsi produk yang ditentukan oleh vendor di samping deskripsi untuk pelanggan
+UseProductFournDesc=Add a feature to define the descriptions of products defined by the vendors in addition to descriptions for customers
 ProductSupplierDescription=Deskripsi vendor untuk produk
 UseProductSupplierPackaging=Gunakan kemasan pada harga pemasok (jumlah ulang sesuai dengan kemasan yang ditetapkan pada harga pemasok saat menambahkan / memperbarui baris dalam dokumen pemasok)
 PackagingForThisProduct=Pengemasan
diff --git a/htdocs/langs/id_ID/salaries.lang b/htdocs/langs/id_ID/salaries.lang
index 6e28aadb81e..cf4350c8e30 100644
--- a/htdocs/langs/id_ID/salaries.lang
+++ b/htdocs/langs/id_ID/salaries.lang
@@ -2,20 +2,23 @@
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Akun akuntansi digunakan untuk pihak ketiga pengguna
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=Akun akuntansi khusus yang ditentukan pada kartu pengguna akan digunakan hanya untuk akuntansi Subledger. Yang ini akan digunakan untuk Buku Besar Umum dan sebagai nilai default dari akuntansi Subledger jika akun akuntansi pengguna khusus pada pengguna tidak didefinisikan.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Akun akuntansi secara default untuk pembayaran upah
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=By default, leave empty the option "Automatically create a total payment" when creating a Salary
 Salary=Gaji
 Salaries=Gaji
-NewSalaryPayment=Pembayaran Gaji Baru
+NewSalary=New salary
+NewSalaryPayment=New salary card
 AddSalaryPayment=Tambahkan pembayaran gaji
 SalaryPayment=Pembayaran Gaji
 SalariesPayments=Pembayaran Gaji
+SalariesPaymentsOf=Salaries payments of %s
 ShowSalaryPayment=Menampilkan Pembayaran Gaji
 THM=Tarif rata-rata per jam
 TJM=Tarif harian rata-rata
 CurrentSalary=Gaji saat ini
 THMDescription=Nilai ini dapat digunakan untuk menghitung biaya waktu yang dihabiskan pada proyek yang dimasukkan oleh pengguna jika proyek modul digunakan
 TJMDescription=Nilai ini saat ini hanya untuk informasi dan tidak digunakan untuk perhitungan apa pun
-LastSalaries=Pembayaran gaji %s terbaru
-AllSalaries=Semua pembayaran gaji
+LastSalaries=Latest %s salaries
+AllSalaries=All salaries
 SalariesStatistics=Statistik gaji
-# Export
 SalariesAndPayments=Gaji dan pembayaran
+ConfirmDeleteSalaryPayment=Do you want to delete this salary payment ?
diff --git a/htdocs/langs/id_ID/ticket.lang b/htdocs/langs/id_ID/ticket.lang
index 5418ab6d174..4c5a19bc707 100644
--- a/htdocs/langs/id_ID/ticket.lang
+++ b/htdocs/langs/id_ID/ticket.lang
@@ -34,7 +34,8 @@ TicketDictResolution=Tiket - Resolusi
 
 TicketTypeShortCOM=Pertanyaan komersial
 TicketTypeShortHELP=Permintaan bantuan fungsional
-TicketTypeShortISSUE=Masalah, bug, atau masalah
+TicketTypeShortISSUE=Issue or bug
+TicketTypeShortPROBLEM=Problem
 TicketTypeShortREQUEST=Ubah atau tingkatkan permintaan
 TicketTypeShortPROJET=Proyek
 TicketTypeShortOTHER=Lainnya
@@ -54,14 +55,15 @@ TypeContact_ticket_internal_SUPPORTTEC=Pengguna yang ditugaskan
 TypeContact_ticket_external_SUPPORTCLI=Kontak pelanggan/pelacakan kejadian
 TypeContact_ticket_external_CONTRIBUTOR=Kontributor eksternal
 
-OriginEmail=Sumber email
+OriginEmail=Reporter Email
 Notify_TICKET_SENTBYMAIL=Kirim pesan tiket melalui email
 
 # Status
 Read=Baca
 Assigned=Ditugaskan
 InProgress=Sedang berlangsung
-NeedMoreInformation=Menunggu informasi
+NeedMoreInformation=Waiting for reporter feedback
+NeedMoreInformationShort=Waiting for feedback
 Answered=Dijawab
 Waiting=Menunggu
 Closed=Ditutup
@@ -160,7 +162,7 @@ CreatedBy=Dibuat oleh
 NewTicket=Tiket Baru
 SubjectAnswerToTicket=Jawaban tiket
 TicketTypeRequest=Jenis permintaan
-TicketCategory=Group
+TicketCategory=Ticket categorization
 SeeTicket=Lihat tiket
 TicketMarkedAsRead=Tiket telah ditandai sebagai sudah dibaca
 TicketReadOn=Baca terus
@@ -211,6 +213,7 @@ TicketMessageHelp=Hanya teks ini yang akan disimpan dalam daftar pesan di kartu
 TicketMessageSubstitutionReplacedByGenericValues=Variabel substitusi digantikan oleh nilai generik.
 TimeElapsedSince=Waktu berlalu sejak itu
 TicketTimeToRead=Waktu berlalu sebelum membaca
+TicketTimeElapsedBeforeSince=Time elapsed before / since
 TicketContacts=Tiket kontak
 TicketDocumentsLinked=Dokumen terkait dengan tiket
 ConfirmReOpenTicket=Konfirmasikan kembali tiket ini?
diff --git a/htdocs/langs/id_ID/users.lang b/htdocs/langs/id_ID/users.lang
index fe2487f1754..d6badd4a416 100644
--- a/htdocs/langs/id_ID/users.lang
+++ b/htdocs/langs/id_ID/users.lang
@@ -97,8 +97,8 @@ LoginToCreate=Login untuk membuat
 NameToCreate=Nama pihak ketiga yang akan dibuat
 YourRole=Peran Anda
 YourQuotaOfUsersIsReached=Kuota pengguna aktif Anda tercapai!
-NbOfUsers=Jumlah pengguna
-NbOfPermissions=Jumlah izin
+NbOfUsers=Number of users
+NbOfPermissions=Number of permissions
 DontDowngradeSuperAdmin=Hanya superadmin yang dapat menurunkan versi superadmin
 HierarchicalResponsible=Pengawas
 HierarchicView=Pandangan hierarkis
diff --git a/htdocs/langs/id_ID/website.lang b/htdocs/langs/id_ID/website.lang
index dc29ed1ccc1..f2bd4154b4e 100644
--- a/htdocs/langs/id_ID/website.lang
+++ b/htdocs/langs/id_ID/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Tambahkan situs web
 Webpage=Halaman web / wadah
 AddPage=Tambahkan halaman / wadah
 PageContainer=Page
-PreviewOfSiteNotYetAvailable=Pratinjau situs web Anda<strong>%s </strong> belum tersedia. Anda harus terlebih dahulu '<strong> Impor template situs web lengkap </strong>' atau hanya '<strong> Tambahkan halaman / wadah </strong>'.
+PreviewOfSiteNotYetAvailable=The preview of your website <strong>%s</strong> is not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Halaman yang diminta dengan id %s belum memiliki konten, atau file cache .tpl.php telah dihapus. Edit konten halaman untuk menyelesaikan ini.
 SiteDeleted=Situs web '%s' dihapus
 PageContent=Halaman / Contenair
diff --git a/htdocs/langs/is_IS/admin.lang b/htdocs/langs/is_IS/admin.lang
index f6a0c3aa85e..2ba8adabcd1 100644
--- a/htdocs/langs/is_IS/admin.lang
+++ b/htdocs/langs/is_IS/admin.lang
@@ -53,6 +53,7 @@ InternalUser=Innri notandi
 ExternalUser=Ytri notandi
 InternalUsers=Innri notendur
 ExternalUsers=Ytri notendur
+UserInterface=User interface
 GUISetup=Skoða
 SetupArea=Skipulag
 UploadNewTemplate=Upload new template(s)
@@ -1260,8 +1261,8 @@ YourPHPDoesNotHaveSSLSupport=SSL virka ekki í boði í PHP þinn
 DownloadMoreSkins=Fleiri skinn til að sækja
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
-ShowProfIdInAddress=Show professional id with addresses
-ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
+ShowProfIdInAddress=Show professional ID with addresses
+ShowVATIntaInAddress=Hide intra-Community VAT number
 TranslationUncomplete=Algjör þýðing
 MAIN_DISABLE_METEO=Disable meteorological view
 MeteoStdMod=Standard mode
@@ -1778,7 +1779,7 @@ ClickToDialSetup=Smelltu til að hringja mát skipulag
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
 ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface, installed on the same computer as the browser, and called when you click on a link starting with "tel:" in your browser. If you need link that start with "sip:" or a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Point of Sale
 CashDeskSetup=Point of Sales module setup
@@ -2133,7 +2134,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
-NotRecommended=Not recommanded
+Recommended=Mælt
+NotRecommended=Not recommended
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
@@ -2144,3 +2146,5 @@ YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You s
 RandomlySelectedIfSeveral=Randomly selected if several pictures are available
 DatabasePasswordObfuscated=Database password is obfuscated in conf file
 DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
+APIsAreNotEnabled=APIs modules are not enabled
+YouShouldSetThisToOff=You should set this to 0 or off
diff --git a/htdocs/langs/is_IS/banks.lang b/htdocs/langs/is_IS/banks.lang
index 90e03269443..c522a6e7362 100644
--- a/htdocs/langs/is_IS/banks.lang
+++ b/htdocs/langs/is_IS/banks.lang
@@ -115,7 +115,7 @@ TransferTo=Til að
 TransferFromToDone=A flytja <b>úr %s  í %s  af %s %</b> s hefur verið skráð.
 CheckTransmitter=Sendandi
 ValidateCheckReceipt=Validate this check receipt?
-ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes will be possible once validated.
 DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank eftirlit
diff --git a/htdocs/langs/is_IS/boxes.lang b/htdocs/langs/is_IS/boxes.lang
index 6b4abf9314a..c1f5071d2a4 100644
--- a/htdocs/langs/is_IS/boxes.lang
+++ b/htdocs/langs/is_IS/boxes.lang
@@ -91,8 +91,8 @@ BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
 BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
 BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
 BoxTitleLastModifiedPropals=Latest %s modified proposals
-BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
-BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
+BoxTitleLatestModifiedJobPositions=Latest %s modified job positions
+BoxTitleLatestModifiedCandidatures=Latest %s modified job applications
 ForCustomersInvoices=reikninga viðskiptavinar
 ForCustomersOrders=Customers orders
 ForProposals=Tillögur
diff --git a/htdocs/langs/is_IS/cashdesk.lang b/htdocs/langs/is_IS/cashdesk.lang
index be94117f8ba..a6bd6d77fbc 100644
--- a/htdocs/langs/is_IS/cashdesk.lang
+++ b/htdocs/langs/is_IS/cashdesk.lang
@@ -127,4 +127,4 @@ AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
 ShowPriceHT = Display the column with the price excluding tax (on screen)
-ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on the receipt)
diff --git a/htdocs/langs/is_IS/errors.lang b/htdocs/langs/is_IS/errors.lang
index 5884cd5c268..92c1651421f 100644
--- a/htdocs/langs/is_IS/errors.lang
+++ b/htdocs/langs/is_IS/errors.lang
@@ -301,3 +301,4 @@ ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
 ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
+ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
diff --git a/htdocs/langs/is_IS/eventorganization.lang b/htdocs/langs/is_IS/eventorganization.lang
index fc7781e4aff..eb551ffb55f 100644
--- a/htdocs/langs/is_IS/eventorganization.lang
+++ b/htdocs/langs/is_IS/eventorganization.lang
@@ -86,6 +86,7 @@ DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
 SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
 SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
+NbVotes=Number of votes
 #
 # Status
 #
@@ -115,6 +116,9 @@ EvntOrgDuration = This conference starts on %s and ends on %s.
 ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
 BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
 EventType = Event type
+LabelOfBooth=Booth label
+LabelOfconference=Conference label
+ConferenceIsNotConfirmed=Subcription not available, conference is not confirmed yet
 
 #
 # Vote page
diff --git a/htdocs/langs/is_IS/install.lang b/htdocs/langs/is_IS/install.lang
index 3913cf7e458..01616ccad0f 100644
--- a/htdocs/langs/is_IS/install.lang
+++ b/htdocs/langs/is_IS/install.lang
@@ -206,6 +206,7 @@ MigrationUserPhotoPath=Migration of photo paths for users
 MigrationFieldsSocialNetworks=Migration of users fields social networks (%s)
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
+MigrationImportOrExportProfiles=Migration of import or export profiles (%s)
 ShowNotAvailableOptions=Show unavailable options
 HideNotAvailableOptions=Hide unavailable options
 ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
diff --git a/htdocs/langs/is_IS/interventions.lang b/htdocs/langs/is_IS/interventions.lang
index 97a9f4d2785..f69b56e4b43 100644
--- a/htdocs/langs/is_IS/interventions.lang
+++ b/htdocs/langs/is_IS/interventions.lang
@@ -64,3 +64,5 @@ InterLineDuration=Line duration intervention
 InterLineDesc=Line description intervention
 RepeatableIntervention=Template of intervention
 ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
+Reopen=Reopen
+ConfirmReopenIntervention=Are you sure you want to open back the intervention <b>%s</b>?
diff --git a/htdocs/langs/is_IS/productbatch.lang b/htdocs/langs/is_IS/productbatch.lang
index bdb2fbe77c1..0feef294394 100644
--- a/htdocs/langs/is_IS/productbatch.lang
+++ b/htdocs/langs/is_IS/productbatch.lang
@@ -26,12 +26,10 @@ ShowLogOfMovementIfLot=Show log of movements for couple product/lot
 StockDetailPerBatch=Stock detail per lot
 SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
-BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
-BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
 ManageLotMask=Custom mask
-CustomMasks=Adds an option to define mask in the product card
-LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
-SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+CustomMasks=Option to define a different numbering mask for each product
+BatchLotNumberingModules=Numbering rule for automatic generation of lot number
+BatchSerialNumberingModules=Numbering rule for automatic generation of serial number (for products with property 1 unique lot/serial for each product)
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
diff --git a/htdocs/langs/is_IS/products.lang b/htdocs/langs/is_IS/products.lang
index 92e7d485513..d1a84068eca 100644
--- a/htdocs/langs/is_IS/products.lang
+++ b/htdocs/langs/is_IS/products.lang
@@ -277,7 +277,7 @@ PriceByCustomer=Different prices for each customer
 PriceCatalogue=A single sell price per product/service
 PricingRule=Rules for selling prices
 AddCustomerPrice=Add price by customer
-ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
+ForceUpdateChildPriceSoc=Set same price on customer's subsidiaries
 PriceByCustomerLog=Log of previous customer prices
 MinimumPriceLimit=Minimum price can't be lower then %s
 MinimumRecommendedPrice=Minimum recommended price is: %s
@@ -296,6 +296,7 @@ ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Child products
 MinSupplierPrice=Lágmark Kaupverð
 MinCustomerPrice=Minimum selling price
+NoDynamicPrice=No dynamic price
 DynamicPriceConfiguration=Dynamic price configuration
 DynamicPriceDesc=You may define mathematical formulae to calculate Customer or Vendor prices. Such formulas can use all mathematical operators, some constants and variables. You can define here the variables you wish to use. If the variable needs an automatic update, you may define the external URL to allow Dolibarr to update the value automatically.
 AddVariable=Add Variable
diff --git a/htdocs/langs/is_IS/salaries.lang b/htdocs/langs/is_IS/salaries.lang
index 7c3c08a65bd..12905040b1a 100644
--- a/htdocs/langs/is_IS/salaries.lang
+++ b/htdocs/langs/is_IS/salaries.lang
@@ -2,20 +2,23 @@
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=By default, leave empty the option "Automatically create a total payment" when creating a Salary
 Salary=Salary
 Salaries=Salaries
-NewSalaryPayment=New salary payment
+NewSalary=New salary
+NewSalaryPayment=New salary card
 AddSalaryPayment=Add salary payment
 SalaryPayment=Salary payment
 SalariesPayments=Salaries payments
+SalariesPaymentsOf=Salaries payments of %s
 ShowSalaryPayment=Show salary payment
 THM=Average hourly rate
 TJM=Average daily rate
 CurrentSalary=Current salary
 THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
 TJMDescription=This value is currently for information only and is not used for any calculation
-LastSalaries=Latest %s salary payments
-AllSalaries=All salary payments
+LastSalaries=Latest %s salaries
+AllSalaries=All salaries
 SalariesStatistics=Salary statistics
-# Export
 SalariesAndPayments=Salaries and payments
+ConfirmDeleteSalaryPayment=Do you want to delete this salary payment ?
diff --git a/htdocs/langs/is_IS/ticket.lang b/htdocs/langs/is_IS/ticket.lang
index 7c7369d1b16..9fa8d12155d 100644
--- a/htdocs/langs/is_IS/ticket.lang
+++ b/htdocs/langs/is_IS/ticket.lang
@@ -34,7 +34,8 @@ TicketDictResolution=Ticket - Resolution
 
 TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
-TicketTypeShortISSUE=Issue, bug or problem
+TicketTypeShortISSUE=Issue or bug
+TicketTypeShortPROBLEM=Problem
 TicketTypeShortREQUEST=Change or enhancement request
 TicketTypeShortPROJET=Project
 TicketTypeShortOTHER=Önnur
@@ -54,14 +55,15 @@ TypeContact_ticket_internal_SUPPORTTEC=Assigned user
 TypeContact_ticket_external_SUPPORTCLI=Customer contact / incident tracking
 TypeContact_ticket_external_CONTRIBUTOR=External contributor
 
-OriginEmail=Email source
+OriginEmail=Reporter Email
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
 Read=Lesa
 Assigned=Assigned
 InProgress=In progress
-NeedMoreInformation=Waiting for information
+NeedMoreInformation=Waiting for reporter feedback
+NeedMoreInformationShort=Waiting for feedback
 Answered=Answered
 Waiting=Bíð
 Closed=Loka
@@ -160,7 +162,7 @@ CreatedBy=Created by
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Group
+TicketCategory=Ticket categorization
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
@@ -211,6 +213,7 @@ TicketMessageHelp=Only this text will be saved in the message list on ticket car
 TicketMessageSubstitutionReplacedByGenericValues=Substitutions variables are replaced by generic values.
 TimeElapsedSince=Time elapsed since
 TicketTimeToRead=Time elapsed before read
+TicketTimeElapsedBeforeSince=Time elapsed before / since
 TicketContacts=Contacts ticket
 TicketDocumentsLinked=Documents linked to ticket
 ConfirmReOpenTicket=Confirm reopen this ticket ?
diff --git a/htdocs/langs/is_IS/users.lang b/htdocs/langs/is_IS/users.lang
index ae276fcf4a9..dba252ee3ed 100644
--- a/htdocs/langs/is_IS/users.lang
+++ b/htdocs/langs/is_IS/users.lang
@@ -97,8 +97,8 @@ LoginToCreate=Innskráning til að búa til
 NameToCreate=Nafn þriðja aðila til að stofna
 YourRole=hlutverk þín
 YourQuotaOfUsersIsReached=kvóta þinn af virkum notendum er náð!
-NbOfUsers=No. of users
-NbOfPermissions=No. of permissions
+NbOfUsers=Number of users
+NbOfPermissions=Number of permissions
 DontDowngradeSuperAdmin=Aðeins superadmin getur lækkunar a superadmin
 HierarchicalResponsible=Supervisor
 HierarchicView=Hierarchical view
diff --git a/htdocs/langs/is_IS/website.lang b/htdocs/langs/is_IS/website.lang
index a1dbad88c58..5d8ab14e630 100644
--- a/htdocs/langs/is_IS/website.lang
+++ b/htdocs/langs/is_IS/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 PageContainer=Page
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
+PreviewOfSiteNotYetAvailable=The preview of your website <strong>%s</strong> is not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
diff --git a/htdocs/langs/it_CH/products.lang b/htdocs/langs/it_CH/products.lang
deleted file mode 100644
index e0628dbec00..00000000000
--- a/htdocs/langs/it_CH/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
diff --git a/htdocs/langs/it_CH/salaries.lang b/htdocs/langs/it_CH/salaries.lang
deleted file mode 100644
index c9bd3bec17b..00000000000
--- a/htdocs/langs/it_CH/salaries.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - salaries
-LastSalaries=Latest %s salary payments
-AllSalaries=All salary payments
diff --git a/htdocs/langs/it_CH/ticket.lang b/htdocs/langs/it_CH/ticket.lang
deleted file mode 100644
index 7245956e6bd..00000000000
--- a/htdocs/langs/it_CH/ticket.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - ticket
-TicketTypeShortISSUE=Issue, bug or problem
-NeedMoreInformation=Waiting for information
-TicketCategory=Group
diff --git a/htdocs/langs/it_CH/users.lang b/htdocs/langs/it_CH/users.lang
deleted file mode 100644
index 4a412122b08..00000000000
--- a/htdocs/langs/it_CH/users.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - users
-NbOfUsers=No. of users
-NbOfPermissions=No. of permissions
diff --git a/htdocs/langs/it_IT/admin.lang b/htdocs/langs/it_IT/admin.lang
index 736eafddfa3..512da68ab00 100644
--- a/htdocs/langs/it_IT/admin.lang
+++ b/htdocs/langs/it_IT/admin.lang
@@ -53,6 +53,7 @@ InternalUser=Utente interno
 ExternalUser=Utente esterno
 InternalUsers=Utenti interni
 ExternalUsers=Utenti esterni
+UserInterface=User interface
 GUISetup=Aspetto grafico e lingua
 SetupArea=Impostazioni
 UploadNewTemplate=Carica nuovi modelli
@@ -1260,8 +1261,8 @@ YourPHPDoesNotHaveSSLSupport=Il PHP del server non supporta SSL
 DownloadMoreSkins=Scarica altre skin
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
-ShowProfIdInAddress=Nei documenti mostra identità professionale completa di:
-ShowVATIntaInAddress=Nascondi il numero di partita IVA intracomunitaria negli indirizzi
+ShowProfIdInAddress=Show professional ID with addresses
+ShowVATIntaInAddress=Hide intra-Community VAT number
 TranslationUncomplete=Traduzione incompleta
 MAIN_DISABLE_METEO=Disabilita visualizzazione meteo
 MeteoStdMod=Standard mode
@@ -1778,7 +1779,7 @@ ClickToDialSetup=Impostazioni modulo ClickToDial (telefonate con un clic)
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
 ClickToDialDesc=Questo modulo modifica i numeri di telefono, quando si utilizza un computer desktop, in collegamenti selezionabili. Un clic chiamerà il numero. Questo può essere usato per iniziare la telefonata quando si utilizza un softphone sul desktop o, ad esempio, quando si utilizza un sistema CTI basato sul protocollo SIP. Nota: quando si utilizza uno smartphone, i numeri di telefono sono sempre selezionabili.
 ClickToDialUseTelLink=Peri numeri di telefono basta usare un link di tipo "tel:"
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface, installed on the same computer as the browser, and called when you click on a link starting with "tel:" in your browser. If you need link that start with "sip:" or a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Point of Sale
 CashDeskSetup=Point of Sales module setup
@@ -2133,7 +2134,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
-NotRecommended=Not recommanded
+Recommended=Raccomandata
+NotRecommended=Not recommended
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
@@ -2144,3 +2146,5 @@ YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You s
 RandomlySelectedIfSeveral=Randomly selected if several pictures are available
 DatabasePasswordObfuscated=Database password is obfuscated in conf file
 DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
+APIsAreNotEnabled=APIs modules are not enabled
+YouShouldSetThisToOff=You should set this to 0 or off
diff --git a/htdocs/langs/it_IT/banks.lang b/htdocs/langs/it_IT/banks.lang
index 5be72019d50..3b817e5cae8 100644
--- a/htdocs/langs/it_IT/banks.lang
+++ b/htdocs/langs/it_IT/banks.lang
@@ -115,7 +115,7 @@ TransferTo=A
 TransferFromToDone=È stato registrato un trasferimento da <b> %s </b> a <b> %s </b> di <b> %s </b> %s.
 CheckTransmitter=Mittente
 ValidateCheckReceipt=Convalidare questa ricevuta ?
-ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes will be possible once validated.
 DeleteCheckReceipt=Eliminare questa ricevuta?
 ConfirmDeleteCheckReceipt=Vuoi davvero eliminare questa ricevuta?
 BankChecks=Assegni bancari
diff --git a/htdocs/langs/it_IT/boxes.lang b/htdocs/langs/it_IT/boxes.lang
index 7ebe2e30d74..61bf843e5d0 100644
--- a/htdocs/langs/it_IT/boxes.lang
+++ b/htdocs/langs/it_IT/boxes.lang
@@ -91,8 +91,8 @@ BoxTitleLatestModifiedSupplierOrders=Ordini fornitore: ultimi %s modificati
 BoxTitleLastModifiedCustomerBills=Fatture attive: ultime %s modificate
 BoxTitleLastModifiedCustomerOrders=Ordini: ultimi %s modificati
 BoxTitleLastModifiedPropals=Ultime %s proposte modificate
-BoxTitleLatestModifiedJobPositions=Ultimi %s jobs modificati
-BoxTitleLatestModifiedCandidatures=Ultime candidature modificate %s
+BoxTitleLatestModifiedJobPositions=Latest %s modified job positions
+BoxTitleLatestModifiedCandidatures=Latest %s modified job applications
 ForCustomersInvoices=Fatture attive
 ForCustomersOrders=Ordini cliente
 ForProposals=Proposte
diff --git a/htdocs/langs/it_IT/cashdesk.lang b/htdocs/langs/it_IT/cashdesk.lang
index b1b6ea1b553..f5c74234f31 100644
--- a/htdocs/langs/it_IT/cashdesk.lang
+++ b/htdocs/langs/it_IT/cashdesk.lang
@@ -127,4 +127,4 @@ AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
 ShowPriceHT = Display the column with the price excluding tax (on screen)
-ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on the receipt)
diff --git a/htdocs/langs/it_IT/errors.lang b/htdocs/langs/it_IT/errors.lang
index c4c42e08a23..9c24d7c3146 100644
--- a/htdocs/langs/it_IT/errors.lang
+++ b/htdocs/langs/it_IT/errors.lang
@@ -289,7 +289,7 @@ WarningYourLoginWasModifiedPleaseLogin=La tua login è stata modificata. Per rag
 WarningAnEntryAlreadyExistForTransKey=Esiste già una voce tradotta per la chiave di traduzione per questa lingua
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the mass actions on lists
 WarningDateOfLineMustBeInExpenseReportRange=Attenzione, la data della riga non è compresa nel periodo della nota spese\n
-WarningProjectDraft=Project is still in draft mode. Don't forget to validate it if you plan to use tasks.
+WarningProjectDraft=Il progetto è ancora in stato bozza. Non dimenticare di convalidarlo per utilizzare i compiti.
 WarningProjectClosed=Il progetto è chiuso. È necessario prima aprirlo nuovamente.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Alcune transazioni bancarie sono state rimosse dopo che è stata generata la ricevuta che le includeva. Quindi il numero di assegni e il totale dello scontrino possono differire dal numero e dal totale nell'elenco.
 WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into ECM database index table
@@ -301,3 +301,4 @@ ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
 ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
+ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
diff --git a/htdocs/langs/it_IT/eventorganization.lang b/htdocs/langs/it_IT/eventorganization.lang
index d6729e7b123..483c9796968 100644
--- a/htdocs/langs/it_IT/eventorganization.lang
+++ b/htdocs/langs/it_IT/eventorganization.lang
@@ -86,6 +86,7 @@ DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
 SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
 SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
+NbVotes=Number of votes
 #
 # Status
 #
@@ -115,6 +116,9 @@ EvntOrgDuration = This conference starts on %s and ends on %s.
 ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
 BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
 EventType = Tipo di evento
+LabelOfBooth=Booth label
+LabelOfconference=Conference label
+ConferenceIsNotConfirmed=Subcription not available, conference is not confirmed yet
 
 #
 # Vote page
diff --git a/htdocs/langs/it_IT/install.lang b/htdocs/langs/it_IT/install.lang
index eafe366a91e..2ef78f40953 100644
--- a/htdocs/langs/it_IT/install.lang
+++ b/htdocs/langs/it_IT/install.lang
@@ -206,6 +206,7 @@ MigrationUserPhotoPath=Migration of photo paths for users
 MigrationFieldsSocialNetworks=Migrazione dei social network dei campi utenti (%s)
 MigrationReloadModule=Ricarica modulo %s
 MigrationResetBlockedLog=Reset del modulo BlockedLog per l'algoritmo v7
+MigrationImportOrExportProfiles=Migration of import or export profiles (%s)
 ShowNotAvailableOptions=Mostra opzioni non disponibili
 HideNotAvailableOptions=Nascondi opzioni non disponibili
 ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
diff --git a/htdocs/langs/it_IT/productbatch.lang b/htdocs/langs/it_IT/productbatch.lang
index 48814147203..5b3ede1c57c 100644
--- a/htdocs/langs/it_IT/productbatch.lang
+++ b/htdocs/langs/it_IT/productbatch.lang
@@ -26,12 +26,10 @@ ShowLogOfMovementIfLot=Mostra il log dei movimenti per la coppia prodotto/lotto
 StockDetailPerBatch=Dettagli magazzino per lotto
 SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
-BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
-BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
 ManageLotMask=Custom mask
-CustomMasks=Adds an option to define mask in the product card
-LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
-SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+CustomMasks=Option to define a different numbering mask for each product
+BatchLotNumberingModules=Numbering rule for automatic generation of lot number
+BatchSerialNumberingModules=Numbering rule for automatic generation of serial number (for products with property 1 unique lot/serial for each product)
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
diff --git a/htdocs/langs/it_IT/products.lang b/htdocs/langs/it_IT/products.lang
index 0e535ab901c..d812c247433 100644
--- a/htdocs/langs/it_IT/products.lang
+++ b/htdocs/langs/it_IT/products.lang
@@ -277,7 +277,7 @@ PriceByCustomer=Prezzi diversi in base al cliente
 PriceCatalogue=Prezzo singolo di vendita per prodotto/servizio
 PricingRule=Reogle dei prezzi di vendita
 AddCustomerPrice=Aggiungere prezzo dal cliente
-ForceUpdateChildPriceSoc=Imposta lo stesso prezzo per i clienti sussidiari
+ForceUpdateChildPriceSoc=Set same price on customer's subsidiaries
 PriceByCustomerLog=Log di precedenti prezzi clienti
 MinimumPriceLimit=Prezzo minimo non può essere inferiore a % s
 MinimumRecommendedPrice=Minimum recommended price is: %s
@@ -296,6 +296,7 @@ ComposedProductIncDecStock=Aumenta e Diminuisci le scorte alla modifica del prod
 ComposedProduct=Sottoprodotto
 MinSupplierPrice=Prezzo d'acquisto minimo
 MinCustomerPrice=Prezzo minimo di vendita
+NoDynamicPrice=No dynamic price
 DynamicPriceConfiguration=Configurazione dinamica dei prezzi
 DynamicPriceDesc=You may define mathematical formulae to calculate Customer or Vendor prices. Such formulas can use all mathematical operators, some constants and variables. You can define here the variables you wish to use. If the variable needs an automatic update, you may define the external URL to allow Dolibarr to update the value automatically.
 AddVariable=Aggiungi variabile
diff --git a/htdocs/langs/it_IT/salaries.lang b/htdocs/langs/it_IT/salaries.lang
index 3edffce5b0d..7fa6558b6fd 100644
--- a/htdocs/langs/it_IT/salaries.lang
+++ b/htdocs/langs/it_IT/salaries.lang
@@ -2,20 +2,23 @@
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Piano dei conti usato per utenti di soggetti terzi
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Codice contabile predefinito per i pagamenti degli stipendi
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=By default, leave empty the option "Automatically create a total payment" when creating a Salary
 Salary=Stipendio
 Salaries=Stipendi
-NewSalaryPayment=Nuovo pagamento stipendio
+NewSalary=New salary
+NewSalaryPayment=New salary card
 AddSalaryPayment=Aggiungi pagamento stipendio
 SalaryPayment=Pagamento stipendio
 SalariesPayments=Pagamento stipendi
+SalariesPaymentsOf=Salaries payments of %s
 ShowSalaryPayment=Mostra i pagamenti stipendio
 THM=€/h
 TJM=€/g
 CurrentSalary=Stipendio attuale
 THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
 TJMDescription=This value is currently for information only and is not used for any calculation
-LastSalaries=Ultimo %s pagamento dello stipendio
-AllSalaries=Tutti i pagamenti degli stipendi
+LastSalaries=Latest %s salaries
+AllSalaries=All salaries
 SalariesStatistics=Salary statistics
-# Export
-SalariesAndPayments=Salaries and payments
+SalariesAndPayments=Stipendi e pagamenti
+ConfirmDeleteSalaryPayment=Do you want to delete this salary payment ?
diff --git a/htdocs/langs/it_IT/ticket.lang b/htdocs/langs/it_IT/ticket.lang
index 04c0c42bdc7..60dbbbc7101 100644
--- a/htdocs/langs/it_IT/ticket.lang
+++ b/htdocs/langs/it_IT/ticket.lang
@@ -34,7 +34,8 @@ TicketDictResolution=Ticket - Risoluzione
 
 TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Richiesta di aiuto funzionale
-TicketTypeShortISSUE=Issue, bug o problemi
+TicketTypeShortISSUE=Issue or bug
+TicketTypeShortPROBLEM=Problem
 TicketTypeShortREQUEST=Richiesta di modifica o miglioramento
 TicketTypeShortPROJET=Progetto
 TicketTypeShortOTHER=Altro
@@ -54,14 +55,15 @@ TypeContact_ticket_internal_SUPPORTTEC=Assegnato a
 TypeContact_ticket_external_SUPPORTCLI=Contatto cliente / tracciamento incidente
 TypeContact_ticket_external_CONTRIBUTOR=External contributor
 
-OriginEmail=Email source
+OriginEmail=Reporter Email
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
 Read=Da leggere
 Assigned=Assegnato
 InProgress=Avviato
-NeedMoreInformation=In attesa di informazioni
+NeedMoreInformation=Waiting for reporter feedback
+NeedMoreInformationShort=Waiting for feedback
 Answered=Answered
 Waiting=In attesa
 Closed=Chiuso
@@ -160,7 +162,7 @@ CreatedBy=Creato da
 NewTicket=Nuovo Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Gruppo
+TicketCategory=Ticket categorization
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
@@ -211,6 +213,7 @@ TicketMessageHelp=Only this text will be saved in the message list on ticket car
 TicketMessageSubstitutionReplacedByGenericValues=Substitutions variables are replaced by generic values.
 TimeElapsedSince=Time elapsed since
 TicketTimeToRead=Time elapsed before read
+TicketTimeElapsedBeforeSince=Time elapsed before / since
 TicketContacts=Contacts ticket
 TicketDocumentsLinked=Documenti collegati al ticket
 ConfirmReOpenTicket=Confermi la riapertura di questo ticket?
diff --git a/htdocs/langs/it_IT/users.lang b/htdocs/langs/it_IT/users.lang
index 4bf6fa34a41..903682d8a17 100644
--- a/htdocs/langs/it_IT/users.lang
+++ b/htdocs/langs/it_IT/users.lang
@@ -97,8 +97,8 @@ LoginToCreate=Accedi per creare
 NameToCreate=Nome del soggetto terzo da creare
 YourRole=Il tuo ruolo
 YourQuotaOfUsersIsReached=Hai raggiunto la tua quota di utenti attivi!
-NbOfUsers=Numero di utenti
-NbOfPermissions=Numero di autorizzazioni
+NbOfUsers=Number of users
+NbOfPermissions=Number of permissions
 DontDowngradeSuperAdmin=Solo un superadmin può declassare un superadmin
 HierarchicalResponsible=Supervisore
 HierarchicView=Vista gerarchica
diff --git a/htdocs/langs/it_IT/website.lang b/htdocs/langs/it_IT/website.lang
index ac41f055411..edf226d0df8 100644
--- a/htdocs/langs/it_IT/website.lang
+++ b/htdocs/langs/it_IT/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Aggiungi sito web
 Webpage=Web page/container
 AddPage=Aggiungi pagina/contenitore
 PageContainer=Pagina
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
+PreviewOfSiteNotYetAvailable=The preview of your website <strong>%s</strong> is not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
diff --git a/htdocs/langs/ja_JP/admin.lang b/htdocs/langs/ja_JP/admin.lang
index 09c80dc7550..00fc4a5ecc1 100644
--- a/htdocs/langs/ja_JP/admin.lang
+++ b/htdocs/langs/ja_JP/admin.lang
@@ -53,6 +53,7 @@ InternalUser=内部ユーザ
 ExternalUser=外部ユーザ
 InternalUsers=内部ユーザ
 ExternalUsers=外部ユーザ
+UserInterface=User interface
 GUISetup=表示
 SetupArea=設定
 UploadNewTemplate=新規テンプレート(s)をアップロード
@@ -1260,8 +1261,8 @@ YourPHPDoesNotHaveSSLSupport=あなたのPHPでのSSLの機能は使用できな
 DownloadMoreSkins=ダウンロードするには多くのスキン
 SimpleNumRefModelDesc=参照番号を%syymm-nnnnの形式で返す。ここで、yyは年、mmは月、nnnnはリセットなしの順次自動インクリメント番号。
 SimpleNumRefNoDateModelDesc=参照番号を%s-nnnnの形式で返する。nnnnはリセットなしの順次自動インクリメント番号 。
-ShowProfIdInAddress=住所とともにプロのIDを表示する
-ShowVATIntaInAddress=コミュニティ内のVAT番号を住所で非表示にする
+ShowProfIdInAddress=Show professional ID with addresses
+ShowVATIntaInAddress=Hide intra-Community VAT number
 TranslationUncomplete=部分的な翻訳
 MAIN_DISABLE_METEO=気象ビューを無効にする
 MeteoStdMod=標準モード
@@ -1778,7 +1779,7 @@ ClickToDialSetup=モジュールの設定をダイヤルする】をクリック
 ClickToDialUrlDesc=電話のpictoをクリックすると、URLが呼び出される。 URLには、使用することができるタグ<br> <b> __PHONETO__ </b>その<br> <b> __PHONEFROM__ </b> clicktodialに置き換えられる人 ( あなた ) を呼び出すの電話番号<br> <b> __LOGIN__ </b>に置き換えられるそれを呼び出すために人の電話番号に置き換えられるログイン ( ユーザカードで定義 ) <br> <b> __PASS__ </b>これはクリックダイヤルパスワード ( ユーザカードで定義 ) に置き換えられる。
 ClickToDialDesc=このモジュールは、デスクトップコンピュータを使用している場合、電話番号をクリック可能なリンクに変更する。クリックするとその番号に電話がかかる。これは、デスクトップでソフトフォンを使用している場合や、SIPプロトコルに基づくCTIシステムを使用している場合などに、通話を開始するために使用できる。注：スマートフォンを使用する場合、電話番号は常にクリック可能。
 ClickToDialUseTelLink=電話番号にリンク「tel：」を使用する
-ClickToDialUseTelLinkDesc=ユーザがブラウザと同じコンピュータにソフトフォンまたはソフトウェアインターフェイスをインストールしていて、ブラウザで「tel：」で始まるリンクをクリックすると呼び出される場合は、この方法を使用する。完全なサーバーソリューションが必要な場合 ( ローカルソフトウェアをインストールする必要がない場合 ) 、これを「いいえ」に設定して、次のフィールドに入力する必要がある。
+ClickToDialUseTelLinkDesc=ユーザがソフトフォンまたはソフトウェアインターフェイスを使用していて、ブラウザと同じコンピュータにインストールされており、ブラウザで「tel:」で始まるリンクをクリックすると呼び出される場合は、この方法を使用する。 「sip:」で始まるリンクまたは完全なサーバーソリューション（ローカルソフトウェアのインストールは不要）が必要な場合は、これを「いいえ」に設定して、次のフィールドに入力する必要がある。
 ##### Point Of Sale (CashDesk) #####
 CashDesk=POS
 CashDeskSetup=POSモジュールの設定
@@ -2133,7 +2134,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=カスタムコードでシステ
 PHPFunctionsRequiredForCLI=シェルの目的（スケジュールされたジョブのバックアップやanitivursプログラムの実行など）では、PHP関数を保持する必要がある
 NoWritableFilesFoundIntoRootDir=共通プログラムの書き込み可能なファイルまたはディレクトリがルートディレクトリに見つからない（良好）
 RecommendedValueIs=推奨：%s
-NotRecommended=推奨されない
+Recommended=推奨される
+NotRecommended=Not recommended
 ARestrictedPath=制限されたパス
 CheckForModuleUpdate=外部モジュールの更新を確認する
 CheckForModuleUpdateHelp=このアクションは、外部モジュールのエディターに接続して、新しいバージョンが利用可能かどうかを確認する。
@@ -2145,3 +2147,4 @@ RandomlySelectedIfSeveral=画像が複数ある場合はランダムに選択
 DatabasePasswordObfuscated=データベースのパスワードは conf ファイルで難読化されている
 DatabasePasswordNotObfuscated=データベースのパスワードは conf ファイルで難読化されていない
 APIsAreNotEnabled=APIモジュールが有効になっていない
+YouShouldSetThisToOff=これを0またはオフに設定する必要がある
diff --git a/htdocs/langs/ja_JP/banks.lang b/htdocs/langs/ja_JP/banks.lang
index 4595a3b774f..cc505e44633 100644
--- a/htdocs/langs/ja_JP/banks.lang
+++ b/htdocs/langs/ja_JP/banks.lang
@@ -115,7 +115,7 @@ TransferTo=期末
 TransferFromToDone=<b>%s %s</b> %sからの<b>%s</b>への転送が記録されている。
 CheckTransmitter=差出人
 ValidateCheckReceipt=この小切手領収書を検証するか？
-ConfirmValidateCheckReceipt=本当に、この検証用確認領収書を発行したいか？実行後の変更は不可。
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes will be possible once validated.
 DeleteCheckReceipt=この小切手領収書を削除か？
 ConfirmDeleteCheckReceipt=この小切手領収書を削除してもよいか？
 BankChecks=銀行小切手
diff --git a/htdocs/langs/ja_JP/boxes.lang b/htdocs/langs/ja_JP/boxes.lang
index 769ad20c9a9..9abfe10bc10 100644
--- a/htdocs/langs/ja_JP/boxes.lang
+++ b/htdocs/langs/ja_JP/boxes.lang
@@ -91,8 +91,8 @@ BoxTitleLatestModifiedSupplierOrders=仕入先の注文：最後に変更され
 BoxTitleLastModifiedCustomerBills=最近変更された請求書：%s件
 BoxTitleLastModifiedCustomerOrders=最近変更された受注：%s件
 BoxTitleLastModifiedPropals=最新の%s変更された提案
-BoxTitleLatestModifiedJobPositions=最新の%s変更されたジョブ
-BoxTitleLatestModifiedCandidatures=最新の%s修正候補
+BoxTitleLatestModifiedJobPositions=Latest %s modified job positions
+BoxTitleLatestModifiedCandidatures=Latest %s modified job applications
 ForCustomersInvoices=顧客の請求書
 ForCustomersOrders=顧客の注文
 ForProposals=提案
diff --git a/htdocs/langs/ja_JP/cashdesk.lang b/htdocs/langs/ja_JP/cashdesk.lang
index fcdf89fe787..7130c0be246 100644
--- a/htdocs/langs/ja_JP/cashdesk.lang
+++ b/htdocs/langs/ja_JP/cashdesk.lang
@@ -127,4 +127,4 @@ AllowDelayedPayment=支払いの遅延を許可する
 PrintPaymentMethodOnReceipts=チケットに支払い方法を印刷する|領収書
 WeighingScale=体重計
 ShowPriceHT = 税抜き価格の列を表示する（画面上）
-ShowPriceHTOnReceipt = 税抜き価格（領収書）の列を表示する
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on the receipt)
diff --git a/htdocs/langs/ja_JP/errors.lang b/htdocs/langs/ja_JP/errors.lang
index d68c7aeac32..294d8111084 100644
--- a/htdocs/langs/ja_JP/errors.lang
+++ b/htdocs/langs/ja_JP/errors.lang
@@ -301,3 +301,4 @@ ErrorActionCommPropertyUserowneridNotDefined=ユーザの所有者が必要
 ErrorActionCommBadType=選択したイベント種別 (id: %n, code: %s) がイベント種別辞書に存在しない
 CheckVersionFail=バージョンチェックに失敗する
 ErrorWrongFileName=ファイル名に__SOMETHING__を含めることはできない
+ErrorNotInDictionaryPaymentConditions=支払条件辞書にないので、変更すること。
diff --git a/htdocs/langs/ja_JP/eventorganization.lang b/htdocs/langs/ja_JP/eventorganization.lang
index 1f46c7eac4d..c445d75ae62 100644
--- a/htdocs/langs/ja_JP/eventorganization.lang
+++ b/htdocs/langs/ja_JP/eventorganization.lang
@@ -86,6 +86,7 @@ DownloadICSLink = ICS リンクをダウンロード
 EVENTORGANIZATION_SECUREKEY = 会議への公開登録リンクのセキュアキー
 SERVICE_BOOTH_LOCATION = ブースの場所に関する請求書の行に使用されるサービス
 SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = 会議への参加者のサブスクリプションに関する請求書の行に使用されるサービス
+NbVotes=Number of votes
 #
 # Status
 #
@@ -115,6 +116,9 @@ EvntOrgDuration = この会議は%sで始まり、%sで終わる。
 ConferenceAttendeeFee = イベント:「 '%s' 開催は%sから%sまで」への会議参加料金。
 BoothLocationFee = イベントのブース位置: '%s' で %s から %s まで
 EventType = イベント種別
+LabelOfBooth=Booth label
+LabelOfconference=Conference label
+ConferenceIsNotConfirmed=Subcription not available, conference is not confirmed yet
 
 #
 # Vote page
diff --git a/htdocs/langs/ja_JP/install.lang b/htdocs/langs/ja_JP/install.lang
index 99f3b9e23c4..0f99648515f 100644
--- a/htdocs/langs/ja_JP/install.lang
+++ b/htdocs/langs/ja_JP/install.lang
@@ -206,6 +206,7 @@ MigrationUserPhotoPath=ユーザの写真パスの移行
 MigrationFieldsSocialNetworks=ユーザフィールドソーシャルネットワークの移行(%s)
 MigrationReloadModule=モジュール %s を再読み込み
 MigrationResetBlockedLog=v7アルゴリズムのモジュールBlockedLogをリセット
+MigrationImportOrExportProfiles=Migration of import or export profiles (%s)
 ShowNotAvailableOptions=利用できないオプションを表示する
 HideNotAvailableOptions=利用できないオプションを非表示にする
 ErrorFoundDuringMigration=移行プロセス中にエラーが報告されたため、次のステップは利用できない。エラーを無視するには、<a href="%s">ここをクリック</a>できるが、エラーが解決されるまで、アプリケーションまたは一部の機能が正しく動作しない場合がある。
diff --git a/htdocs/langs/ja_JP/interventions.lang b/htdocs/langs/ja_JP/interventions.lang
index 07cf1cb44c7..bf33aa48b1f 100644
--- a/htdocs/langs/ja_JP/interventions.lang
+++ b/htdocs/langs/ja_JP/interventions.lang
@@ -33,7 +33,7 @@ SendInterventionByMail=電子メールで出張を送信
 InterventionCreatedInDolibarr=出張%sが作成された
 InterventionValidatedInDolibarr=出張%sは、検証
 InterventionModifiedInDolibarr=出張%sが変更された
-InterventionClassifiedBilledInDolibarr=請求済みとして設定された出張%s
+InterventionClassifiedBilledInDolibarr=請求済として設定された出張%s
 InterventionClassifiedUnbilledInDolibarr=出張%sが未請求として設定
 InterventionSentByEMail=電子メールで送信された出張%s
 InterventionDeletedInDolibarr=出張%sが削除された
diff --git a/htdocs/langs/ja_JP/productbatch.lang b/htdocs/langs/ja_JP/productbatch.lang
index feceac71405..6cd92093a30 100644
--- a/htdocs/langs/ja_JP/productbatch.lang
+++ b/htdocs/langs/ja_JP/productbatch.lang
@@ -26,12 +26,10 @@ ShowLogOfMovementIfLot=組合せ 製品/ロットの移動ログを表示
 StockDetailPerBatch=ロットごとの在庫詳細
 SerialNumberAlreadyInUse=シリアル番号%sはすでに製品%sに使用されている
 TooManyQtyForSerialNumber=シリアル番号%sに対して使用できる製品%sは1つだけ。
-BatchLotNumberingModules=ロット管理のバッチ製品の自動生成のオプション
-BatchSerialNumberingModules=シリアル番号で管理されるバッチ製品の自動生成のオプション
 ManageLotMask=カスタムマスク
-CustomMasks=製品カードにマスクを定義するオプションを追加する
-LotProductTooltip=製品カードにオプションを追加して、専用のバッチ番号マスクを定義する
-SNProductTooltip=製品カードに専用のシリアル番号マスクを定義するオプションを追加する
+CustomMasks=Option to define a different numbering mask for each product
+BatchLotNumberingModules=Numbering rule for automatic generation of lot number
+BatchSerialNumberingModules=Numbering rule for automatic generation of serial number (for products with property 1 unique lot/serial for each product)
 QtyToAddAfterBarcodeScan=スキャンされたバーコード/ロット/シリアルごとに追加する数量
 LifeTime=寿命（日数）
 EndOfLife=製品寿命
diff --git a/htdocs/langs/ja_JP/salaries.lang b/htdocs/langs/ja_JP/salaries.lang
index 0ae2ac35e9f..1dde2055628 100644
--- a/htdocs/langs/ja_JP/salaries.lang
+++ b/htdocs/langs/ja_JP/salaries.lang
@@ -2,20 +2,23 @@
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=ユーザの取引先に使用される会計科目
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=ユーザカードで定義された専用の会計科目は、補助元帳の会計にのみ使用される。これは総勘定元帳に使用され、ユーザの専用ユーザ会計勘定が定義されていない場合は補助元帳会計のデフォルト値として使用される。
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=賃金支払いのデフォルトの会計科目
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=デフォルトでは、給与を作成するときに ”支払合計を自動的に作成" オプションを空のままにする
 Salary=給料
 Salaries=給与
-NewSalaryPayment=新規給与の支払い
+NewSalary=新規給与
+NewSalaryPayment=新規給与カード
 AddSalaryPayment=給与支払いを追加する
 SalaryPayment=給与の支払い
 SalariesPayments=給与の支払い
+SalariesPaymentsOf=%sの給与支払
 ShowSalaryPayment=給与の支払いを表示する
 THM=平均時給
 TJM=1日あたりの平均料金
 CurrentSalary=現在の給与
 THMDescription=この値は、プロジェクトモジュールが使用されている場合に、ユーザが入力したプロジェクトで消費された時間のコストを計算するために使用できる。
 TJMDescription=この値は現在情報提供のみを目的としており、計算には使用されない。
-LastSalaries=最新の%s給与支払い
-AllSalaries=すべての給与支払い
+LastSalaries=最新%s給与
+AllSalaries=全給与
 SalariesStatistics=給与統計
-# Export
 SalariesAndPayments=給与と支払い
+ConfirmDeleteSalaryPayment=この給与支払いを削除するか？
diff --git a/htdocs/langs/ja_JP/ticket.lang b/htdocs/langs/ja_JP/ticket.lang
index d128c8c37bc..568fab41669 100644
--- a/htdocs/langs/ja_JP/ticket.lang
+++ b/htdocs/langs/ja_JP/ticket.lang
@@ -55,7 +55,7 @@ TypeContact_ticket_internal_SUPPORTTEC=割り当てられたユーザー
 TypeContact_ticket_external_SUPPORTCLI=顧客連絡/インシデント追跡
 TypeContact_ticket_external_CONTRIBUTOR=外部寄稿者
 
-OriginEmail=メールレポーター
+OriginEmail=Reporter Email
 Notify_TICKET_SENTBYMAIL=メールでチケットメッセージを送信する
 
 # Status
diff --git a/htdocs/langs/ja_JP/users.lang b/htdocs/langs/ja_JP/users.lang
index a6c0870ebff..41f2ff6d36e 100644
--- a/htdocs/langs/ja_JP/users.lang
+++ b/htdocs/langs/ja_JP/users.lang
@@ -98,7 +98,7 @@ NameToCreate=作成するには、取引先の名前
 YourRole=あなたの役割
 YourQuotaOfUsersIsReached=アクティブなユーザのあなたのクォータに達している！
 NbOfUsers=ユーザ数
-NbOfPermissions=権限の数
+NbOfPermissions=許可数
 DontDowngradeSuperAdmin=唯一superadminはダウングレードは、superAdminできる
 HierarchicalResponsible=スーパーバイザー
 HierarchicView=階層ビュー
diff --git a/htdocs/langs/ja_JP/website.lang b/htdocs/langs/ja_JP/website.lang
index 046ddf3315c..184bf4f6dbb 100644
--- a/htdocs/langs/ja_JP/website.lang
+++ b/htdocs/langs/ja_JP/website.lang
@@ -31,7 +31,7 @@ AddWebsite=ウェブサイトを追加
 Webpage=Webページ/コンテナ
 AddPage=ページ/コンテナを追加
 PageContainer=ページ
-PreviewOfSiteNotYetAvailable=あなたのウェブサイトのプレビュー<strong>%s</strong>はまだ利用できません。最初に「<strong>完全なWebサイトテンプレート</strong>」をインポートするか、「<strong>ページ/コンテナ</strong>」を追加する必要がある。
+PreviewOfSiteNotYetAvailable=あなたのウェブサイト<strong>%s</strong>のプレビューはまだ利用不可。最初に「<strong>完全なウェブサイトテンプレート</strong>」をインポートするか、単に「<strong>ページ/コンテナ</strong>」を追加する必要がある。
 RequestedPageHasNoContentYet=ID %sの要求されたページにまだコンテンツがないか、キャッシュファイル.tpl.phpが削除された。これを解決するには、ページのコンテンツを編集すること。
 SiteDeleted=Webサイト '%s'が削除された
 PageContent=ページ/コンテネア
diff --git a/htdocs/langs/ka_GE/admin.lang b/htdocs/langs/ka_GE/admin.lang
index be9aca94599..73004a3c8b1 100644
--- a/htdocs/langs/ka_GE/admin.lang
+++ b/htdocs/langs/ka_GE/admin.lang
@@ -53,6 +53,7 @@ InternalUser=Internal user
 ExternalUser=External user
 InternalUsers=Internal users
 ExternalUsers=External users
+UserInterface=User interface
 GUISetup=Display
 SetupArea=Setup
 UploadNewTemplate=Upload new template(s)
@@ -1260,8 +1261,8 @@ YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP
 DownloadMoreSkins=More skins to download
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
-ShowProfIdInAddress=Show professional id with addresses
-ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
+ShowProfIdInAddress=Show professional ID with addresses
+ShowVATIntaInAddress=Hide intra-Community VAT number
 TranslationUncomplete=Partial translation
 MAIN_DISABLE_METEO=Disable meteorological view
 MeteoStdMod=Standard mode
@@ -1778,7 +1779,7 @@ ClickToDialSetup=Click To Dial module setup
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
 ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface, installed on the same computer as the browser, and called when you click on a link starting with "tel:" in your browser. If you need link that start with "sip:" or a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Point of Sale
 CashDeskSetup=Point of Sales module setup
@@ -2133,7 +2134,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
-NotRecommended=Not recommanded
+Recommended=Recommended
+NotRecommended=Not recommended
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
@@ -2144,3 +2146,5 @@ YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You s
 RandomlySelectedIfSeveral=Randomly selected if several pictures are available
 DatabasePasswordObfuscated=Database password is obfuscated in conf file
 DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
+APIsAreNotEnabled=APIs modules are not enabled
+YouShouldSetThisToOff=You should set this to 0 or off
diff --git a/htdocs/langs/ka_GE/banks.lang b/htdocs/langs/ka_GE/banks.lang
index df7192bee25..a0b7942d446 100644
--- a/htdocs/langs/ka_GE/banks.lang
+++ b/htdocs/langs/ka_GE/banks.lang
@@ -115,7 +115,7 @@ TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
 CheckTransmitter=Sender
 ValidateCheckReceipt=Validate this check receipt?
-ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes will be possible once validated.
 DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
diff --git a/htdocs/langs/ka_GE/boxes.lang b/htdocs/langs/ka_GE/boxes.lang
index 0c9ea302fb8..710d49bfab6 100644
--- a/htdocs/langs/ka_GE/boxes.lang
+++ b/htdocs/langs/ka_GE/boxes.lang
@@ -91,8 +91,8 @@ BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
 BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
 BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
 BoxTitleLastModifiedPropals=Latest %s modified proposals
-BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
-BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
+BoxTitleLatestModifiedJobPositions=Latest %s modified job positions
+BoxTitleLatestModifiedCandidatures=Latest %s modified job applications
 ForCustomersInvoices=Customers invoices
 ForCustomersOrders=Customers orders
 ForProposals=Proposals
diff --git a/htdocs/langs/ka_GE/cashdesk.lang b/htdocs/langs/ka_GE/cashdesk.lang
index aea1f02f834..c9d0f7fcd0a 100644
--- a/htdocs/langs/ka_GE/cashdesk.lang
+++ b/htdocs/langs/ka_GE/cashdesk.lang
@@ -127,4 +127,4 @@ AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
 ShowPriceHT = Display the column with the price excluding tax (on screen)
-ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on the receipt)
diff --git a/htdocs/langs/ka_GE/errors.lang b/htdocs/langs/ka_GE/errors.lang
index 670f8c7a6bc..85b90ca4991 100644
--- a/htdocs/langs/ka_GE/errors.lang
+++ b/htdocs/langs/ka_GE/errors.lang
@@ -301,3 +301,4 @@ ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
 ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
+ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
diff --git a/htdocs/langs/ka_GE/eventorganization.lang b/htdocs/langs/ka_GE/eventorganization.lang
index 335c257b224..f361e6bc192 100644
--- a/htdocs/langs/ka_GE/eventorganization.lang
+++ b/htdocs/langs/ka_GE/eventorganization.lang
@@ -86,6 +86,7 @@ DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
 SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
 SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
+NbVotes=Number of votes
 #
 # Status
 #
@@ -115,6 +116,9 @@ EvntOrgDuration = This conference starts on %s and ends on %s.
 ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
 BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
 EventType = Event type
+LabelOfBooth=Booth label
+LabelOfconference=Conference label
+ConferenceIsNotConfirmed=Subcription not available, conference is not confirmed yet
 
 #
 # Vote page
diff --git a/htdocs/langs/ka_GE/install.lang b/htdocs/langs/ka_GE/install.lang
index 63947dad154..c1ffee936d7 100644
--- a/htdocs/langs/ka_GE/install.lang
+++ b/htdocs/langs/ka_GE/install.lang
@@ -206,6 +206,7 @@ MigrationUserPhotoPath=Migration of photo paths for users
 MigrationFieldsSocialNetworks=Migration of users fields social networks (%s)
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
+MigrationImportOrExportProfiles=Migration of import or export profiles (%s)
 ShowNotAvailableOptions=Show unavailable options
 HideNotAvailableOptions=Hide unavailable options
 ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
diff --git a/htdocs/langs/ka_GE/interventions.lang b/htdocs/langs/ka_GE/interventions.lang
index e5936f8246e..51079fca278 100644
--- a/htdocs/langs/ka_GE/interventions.lang
+++ b/htdocs/langs/ka_GE/interventions.lang
@@ -64,3 +64,5 @@ InterLineDuration=Line duration intervention
 InterLineDesc=Line description intervention
 RepeatableIntervention=Template of intervention
 ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
+Reopen=Reopen
+ConfirmReopenIntervention=Are you sure you want to open back the intervention <b>%s</b>?
diff --git a/htdocs/langs/ka_GE/productbatch.lang b/htdocs/langs/ka_GE/productbatch.lang
index 450d0285819..763af20c6b4 100644
--- a/htdocs/langs/ka_GE/productbatch.lang
+++ b/htdocs/langs/ka_GE/productbatch.lang
@@ -26,12 +26,10 @@ ShowLogOfMovementIfLot=Show log of movements for couple product/lot
 StockDetailPerBatch=Stock detail per lot
 SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
-BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
-BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
 ManageLotMask=Custom mask
-CustomMasks=Adds an option to define mask in the product card
-LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
-SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+CustomMasks=Option to define a different numbering mask for each product
+BatchLotNumberingModules=Numbering rule for automatic generation of lot number
+BatchSerialNumberingModules=Numbering rule for automatic generation of serial number (for products with property 1 unique lot/serial for each product)
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
diff --git a/htdocs/langs/ka_GE/products.lang b/htdocs/langs/ka_GE/products.lang
index 9638dfe5a25..fecbe7450c2 100644
--- a/htdocs/langs/ka_GE/products.lang
+++ b/htdocs/langs/ka_GE/products.lang
@@ -277,7 +277,7 @@ PriceByCustomer=Different prices for each customer
 PriceCatalogue=A single sell price per product/service
 PricingRule=Rules for selling prices
 AddCustomerPrice=Add price by customer
-ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
+ForceUpdateChildPriceSoc=Set same price on customer's subsidiaries
 PriceByCustomerLog=Log of previous customer prices
 MinimumPriceLimit=Minimum price can't be lower then %s
 MinimumRecommendedPrice=Minimum recommended price is: %s
@@ -296,6 +296,7 @@ ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Child products
 MinSupplierPrice=Minimum buying price
 MinCustomerPrice=Minimum selling price
+NoDynamicPrice=No dynamic price
 DynamicPriceConfiguration=Dynamic price configuration
 DynamicPriceDesc=You may define mathematical formulae to calculate Customer or Vendor prices. Such formulas can use all mathematical operators, some constants and variables. You can define here the variables you wish to use. If the variable needs an automatic update, you may define the external URL to allow Dolibarr to update the value automatically.
 AddVariable=Add Variable
diff --git a/htdocs/langs/ka_GE/salaries.lang b/htdocs/langs/ka_GE/salaries.lang
index 7c3c08a65bd..12905040b1a 100644
--- a/htdocs/langs/ka_GE/salaries.lang
+++ b/htdocs/langs/ka_GE/salaries.lang
@@ -2,20 +2,23 @@
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=By default, leave empty the option "Automatically create a total payment" when creating a Salary
 Salary=Salary
 Salaries=Salaries
-NewSalaryPayment=New salary payment
+NewSalary=New salary
+NewSalaryPayment=New salary card
 AddSalaryPayment=Add salary payment
 SalaryPayment=Salary payment
 SalariesPayments=Salaries payments
+SalariesPaymentsOf=Salaries payments of %s
 ShowSalaryPayment=Show salary payment
 THM=Average hourly rate
 TJM=Average daily rate
 CurrentSalary=Current salary
 THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
 TJMDescription=This value is currently for information only and is not used for any calculation
-LastSalaries=Latest %s salary payments
-AllSalaries=All salary payments
+LastSalaries=Latest %s salaries
+AllSalaries=All salaries
 SalariesStatistics=Salary statistics
-# Export
 SalariesAndPayments=Salaries and payments
+ConfirmDeleteSalaryPayment=Do you want to delete this salary payment ?
diff --git a/htdocs/langs/ka_GE/ticket.lang b/htdocs/langs/ka_GE/ticket.lang
index 1da32a5a99e..a1bed39c21d 100644
--- a/htdocs/langs/ka_GE/ticket.lang
+++ b/htdocs/langs/ka_GE/ticket.lang
@@ -34,7 +34,8 @@ TicketDictResolution=Ticket - Resolution
 
 TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
-TicketTypeShortISSUE=Issue, bug or problem
+TicketTypeShortISSUE=Issue or bug
+TicketTypeShortPROBLEM=Problem
 TicketTypeShortREQUEST=Change or enhancement request
 TicketTypeShortPROJET=Project
 TicketTypeShortOTHER=Other
@@ -54,14 +55,15 @@ TypeContact_ticket_internal_SUPPORTTEC=Assigned user
 TypeContact_ticket_external_SUPPORTCLI=Customer contact / incident tracking
 TypeContact_ticket_external_CONTRIBUTOR=External contributor
 
-OriginEmail=Email source
+OriginEmail=Reporter Email
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
 Read=Read
 Assigned=Assigned
 InProgress=In progress
-NeedMoreInformation=Waiting for information
+NeedMoreInformation=Waiting for reporter feedback
+NeedMoreInformationShort=Waiting for feedback
 Answered=Answered
 Waiting=Waiting
 Closed=Closed
@@ -160,7 +162,7 @@ CreatedBy=Created by
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Group
+TicketCategory=Ticket categorization
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
@@ -211,6 +213,7 @@ TicketMessageHelp=Only this text will be saved in the message list on ticket car
 TicketMessageSubstitutionReplacedByGenericValues=Substitutions variables are replaced by generic values.
 TimeElapsedSince=Time elapsed since
 TicketTimeToRead=Time elapsed before read
+TicketTimeElapsedBeforeSince=Time elapsed before / since
 TicketContacts=Contacts ticket
 TicketDocumentsLinked=Documents linked to ticket
 ConfirmReOpenTicket=Confirm reopen this ticket ?
diff --git a/htdocs/langs/ka_GE/users.lang b/htdocs/langs/ka_GE/users.lang
index 372090ea5ad..6aeaf128838 100644
--- a/htdocs/langs/ka_GE/users.lang
+++ b/htdocs/langs/ka_GE/users.lang
@@ -97,8 +97,8 @@ LoginToCreate=Login to create
 NameToCreate=Name of third party to create
 YourRole=Your roles
 YourQuotaOfUsersIsReached=Your quota of active users is reached !
-NbOfUsers=No. of users
-NbOfPermissions=No. of permissions
+NbOfUsers=Number of users
+NbOfPermissions=Number of permissions
 DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin
 HierarchicalResponsible=Supervisor
 HierarchicView=Hierarchical view
diff --git a/htdocs/langs/ka_GE/website.lang b/htdocs/langs/ka_GE/website.lang
index 1e727415ec2..dc2ec2c0b3d 100644
--- a/htdocs/langs/ka_GE/website.lang
+++ b/htdocs/langs/ka_GE/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 PageContainer=Page
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
+PreviewOfSiteNotYetAvailable=The preview of your website <strong>%s</strong> is not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
diff --git a/htdocs/langs/km_KH/admin.lang b/htdocs/langs/km_KH/admin.lang
index be9aca94599..73004a3c8b1 100644
--- a/htdocs/langs/km_KH/admin.lang
+++ b/htdocs/langs/km_KH/admin.lang
@@ -53,6 +53,7 @@ InternalUser=Internal user
 ExternalUser=External user
 InternalUsers=Internal users
 ExternalUsers=External users
+UserInterface=User interface
 GUISetup=Display
 SetupArea=Setup
 UploadNewTemplate=Upload new template(s)
@@ -1260,8 +1261,8 @@ YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP
 DownloadMoreSkins=More skins to download
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
-ShowProfIdInAddress=Show professional id with addresses
-ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
+ShowProfIdInAddress=Show professional ID with addresses
+ShowVATIntaInAddress=Hide intra-Community VAT number
 TranslationUncomplete=Partial translation
 MAIN_DISABLE_METEO=Disable meteorological view
 MeteoStdMod=Standard mode
@@ -1778,7 +1779,7 @@ ClickToDialSetup=Click To Dial module setup
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
 ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface, installed on the same computer as the browser, and called when you click on a link starting with "tel:" in your browser. If you need link that start with "sip:" or a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Point of Sale
 CashDeskSetup=Point of Sales module setup
@@ -2133,7 +2134,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
-NotRecommended=Not recommanded
+Recommended=Recommended
+NotRecommended=Not recommended
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
@@ -2144,3 +2146,5 @@ YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You s
 RandomlySelectedIfSeveral=Randomly selected if several pictures are available
 DatabasePasswordObfuscated=Database password is obfuscated in conf file
 DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
+APIsAreNotEnabled=APIs modules are not enabled
+YouShouldSetThisToOff=You should set this to 0 or off
diff --git a/htdocs/langs/km_KH/banks.lang b/htdocs/langs/km_KH/banks.lang
index df7192bee25..a0b7942d446 100644
--- a/htdocs/langs/km_KH/banks.lang
+++ b/htdocs/langs/km_KH/banks.lang
@@ -115,7 +115,7 @@ TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
 CheckTransmitter=Sender
 ValidateCheckReceipt=Validate this check receipt?
-ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes will be possible once validated.
 DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
diff --git a/htdocs/langs/km_KH/boxes.lang b/htdocs/langs/km_KH/boxes.lang
index 0c9ea302fb8..710d49bfab6 100644
--- a/htdocs/langs/km_KH/boxes.lang
+++ b/htdocs/langs/km_KH/boxes.lang
@@ -91,8 +91,8 @@ BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
 BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
 BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
 BoxTitleLastModifiedPropals=Latest %s modified proposals
-BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
-BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
+BoxTitleLatestModifiedJobPositions=Latest %s modified job positions
+BoxTitleLatestModifiedCandidatures=Latest %s modified job applications
 ForCustomersInvoices=Customers invoices
 ForCustomersOrders=Customers orders
 ForProposals=Proposals
diff --git a/htdocs/langs/km_KH/cashdesk.lang b/htdocs/langs/km_KH/cashdesk.lang
index aea1f02f834..c9d0f7fcd0a 100644
--- a/htdocs/langs/km_KH/cashdesk.lang
+++ b/htdocs/langs/km_KH/cashdesk.lang
@@ -127,4 +127,4 @@ AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
 ShowPriceHT = Display the column with the price excluding tax (on screen)
-ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on the receipt)
diff --git a/htdocs/langs/km_KH/errors.lang b/htdocs/langs/km_KH/errors.lang
index 670f8c7a6bc..85b90ca4991 100644
--- a/htdocs/langs/km_KH/errors.lang
+++ b/htdocs/langs/km_KH/errors.lang
@@ -301,3 +301,4 @@ ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
 ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
+ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
diff --git a/htdocs/langs/km_KH/eventorganization.lang b/htdocs/langs/km_KH/eventorganization.lang
index 335c257b224..f361e6bc192 100644
--- a/htdocs/langs/km_KH/eventorganization.lang
+++ b/htdocs/langs/km_KH/eventorganization.lang
@@ -86,6 +86,7 @@ DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
 SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
 SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
+NbVotes=Number of votes
 #
 # Status
 #
@@ -115,6 +116,9 @@ EvntOrgDuration = This conference starts on %s and ends on %s.
 ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
 BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
 EventType = Event type
+LabelOfBooth=Booth label
+LabelOfconference=Conference label
+ConferenceIsNotConfirmed=Subcription not available, conference is not confirmed yet
 
 #
 # Vote page
diff --git a/htdocs/langs/km_KH/install.lang b/htdocs/langs/km_KH/install.lang
index 63947dad154..c1ffee936d7 100644
--- a/htdocs/langs/km_KH/install.lang
+++ b/htdocs/langs/km_KH/install.lang
@@ -206,6 +206,7 @@ MigrationUserPhotoPath=Migration of photo paths for users
 MigrationFieldsSocialNetworks=Migration of users fields social networks (%s)
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
+MigrationImportOrExportProfiles=Migration of import or export profiles (%s)
 ShowNotAvailableOptions=Show unavailable options
 HideNotAvailableOptions=Hide unavailable options
 ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
diff --git a/htdocs/langs/km_KH/interventions.lang b/htdocs/langs/km_KH/interventions.lang
index e5936f8246e..51079fca278 100644
--- a/htdocs/langs/km_KH/interventions.lang
+++ b/htdocs/langs/km_KH/interventions.lang
@@ -64,3 +64,5 @@ InterLineDuration=Line duration intervention
 InterLineDesc=Line description intervention
 RepeatableIntervention=Template of intervention
 ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
+Reopen=Reopen
+ConfirmReopenIntervention=Are you sure you want to open back the intervention <b>%s</b>?
diff --git a/htdocs/langs/km_KH/productbatch.lang b/htdocs/langs/km_KH/productbatch.lang
index 450d0285819..763af20c6b4 100644
--- a/htdocs/langs/km_KH/productbatch.lang
+++ b/htdocs/langs/km_KH/productbatch.lang
@@ -26,12 +26,10 @@ ShowLogOfMovementIfLot=Show log of movements for couple product/lot
 StockDetailPerBatch=Stock detail per lot
 SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
-BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
-BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
 ManageLotMask=Custom mask
-CustomMasks=Adds an option to define mask in the product card
-LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
-SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+CustomMasks=Option to define a different numbering mask for each product
+BatchLotNumberingModules=Numbering rule for automatic generation of lot number
+BatchSerialNumberingModules=Numbering rule for automatic generation of serial number (for products with property 1 unique lot/serial for each product)
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
diff --git a/htdocs/langs/km_KH/products.lang b/htdocs/langs/km_KH/products.lang
index 9638dfe5a25..fecbe7450c2 100644
--- a/htdocs/langs/km_KH/products.lang
+++ b/htdocs/langs/km_KH/products.lang
@@ -277,7 +277,7 @@ PriceByCustomer=Different prices for each customer
 PriceCatalogue=A single sell price per product/service
 PricingRule=Rules for selling prices
 AddCustomerPrice=Add price by customer
-ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
+ForceUpdateChildPriceSoc=Set same price on customer's subsidiaries
 PriceByCustomerLog=Log of previous customer prices
 MinimumPriceLimit=Minimum price can't be lower then %s
 MinimumRecommendedPrice=Minimum recommended price is: %s
@@ -296,6 +296,7 @@ ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Child products
 MinSupplierPrice=Minimum buying price
 MinCustomerPrice=Minimum selling price
+NoDynamicPrice=No dynamic price
 DynamicPriceConfiguration=Dynamic price configuration
 DynamicPriceDesc=You may define mathematical formulae to calculate Customer or Vendor prices. Such formulas can use all mathematical operators, some constants and variables. You can define here the variables you wish to use. If the variable needs an automatic update, you may define the external URL to allow Dolibarr to update the value automatically.
 AddVariable=Add Variable
diff --git a/htdocs/langs/km_KH/salaries.lang b/htdocs/langs/km_KH/salaries.lang
index 7c3c08a65bd..12905040b1a 100644
--- a/htdocs/langs/km_KH/salaries.lang
+++ b/htdocs/langs/km_KH/salaries.lang
@@ -2,20 +2,23 @@
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=By default, leave empty the option "Automatically create a total payment" when creating a Salary
 Salary=Salary
 Salaries=Salaries
-NewSalaryPayment=New salary payment
+NewSalary=New salary
+NewSalaryPayment=New salary card
 AddSalaryPayment=Add salary payment
 SalaryPayment=Salary payment
 SalariesPayments=Salaries payments
+SalariesPaymentsOf=Salaries payments of %s
 ShowSalaryPayment=Show salary payment
 THM=Average hourly rate
 TJM=Average daily rate
 CurrentSalary=Current salary
 THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
 TJMDescription=This value is currently for information only and is not used for any calculation
-LastSalaries=Latest %s salary payments
-AllSalaries=All salary payments
+LastSalaries=Latest %s salaries
+AllSalaries=All salaries
 SalariesStatistics=Salary statistics
-# Export
 SalariesAndPayments=Salaries and payments
+ConfirmDeleteSalaryPayment=Do you want to delete this salary payment ?
diff --git a/htdocs/langs/km_KH/ticket.lang b/htdocs/langs/km_KH/ticket.lang
index 1da32a5a99e..a1bed39c21d 100644
--- a/htdocs/langs/km_KH/ticket.lang
+++ b/htdocs/langs/km_KH/ticket.lang
@@ -34,7 +34,8 @@ TicketDictResolution=Ticket - Resolution
 
 TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
-TicketTypeShortISSUE=Issue, bug or problem
+TicketTypeShortISSUE=Issue or bug
+TicketTypeShortPROBLEM=Problem
 TicketTypeShortREQUEST=Change or enhancement request
 TicketTypeShortPROJET=Project
 TicketTypeShortOTHER=Other
@@ -54,14 +55,15 @@ TypeContact_ticket_internal_SUPPORTTEC=Assigned user
 TypeContact_ticket_external_SUPPORTCLI=Customer contact / incident tracking
 TypeContact_ticket_external_CONTRIBUTOR=External contributor
 
-OriginEmail=Email source
+OriginEmail=Reporter Email
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
 Read=Read
 Assigned=Assigned
 InProgress=In progress
-NeedMoreInformation=Waiting for information
+NeedMoreInformation=Waiting for reporter feedback
+NeedMoreInformationShort=Waiting for feedback
 Answered=Answered
 Waiting=Waiting
 Closed=Closed
@@ -160,7 +162,7 @@ CreatedBy=Created by
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Group
+TicketCategory=Ticket categorization
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
@@ -211,6 +213,7 @@ TicketMessageHelp=Only this text will be saved in the message list on ticket car
 TicketMessageSubstitutionReplacedByGenericValues=Substitutions variables are replaced by generic values.
 TimeElapsedSince=Time elapsed since
 TicketTimeToRead=Time elapsed before read
+TicketTimeElapsedBeforeSince=Time elapsed before / since
 TicketContacts=Contacts ticket
 TicketDocumentsLinked=Documents linked to ticket
 ConfirmReOpenTicket=Confirm reopen this ticket ?
diff --git a/htdocs/langs/km_KH/users.lang b/htdocs/langs/km_KH/users.lang
index 372090ea5ad..6aeaf128838 100644
--- a/htdocs/langs/km_KH/users.lang
+++ b/htdocs/langs/km_KH/users.lang
@@ -97,8 +97,8 @@ LoginToCreate=Login to create
 NameToCreate=Name of third party to create
 YourRole=Your roles
 YourQuotaOfUsersIsReached=Your quota of active users is reached !
-NbOfUsers=No. of users
-NbOfPermissions=No. of permissions
+NbOfUsers=Number of users
+NbOfPermissions=Number of permissions
 DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin
 HierarchicalResponsible=Supervisor
 HierarchicView=Hierarchical view
diff --git a/htdocs/langs/km_KH/website.lang b/htdocs/langs/km_KH/website.lang
index 1e727415ec2..dc2ec2c0b3d 100644
--- a/htdocs/langs/km_KH/website.lang
+++ b/htdocs/langs/km_KH/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 PageContainer=Page
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
+PreviewOfSiteNotYetAvailable=The preview of your website <strong>%s</strong> is not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
diff --git a/htdocs/langs/kn_IN/admin.lang b/htdocs/langs/kn_IN/admin.lang
index 69b889487af..362c233625b 100644
--- a/htdocs/langs/kn_IN/admin.lang
+++ b/htdocs/langs/kn_IN/admin.lang
@@ -53,6 +53,7 @@ InternalUser=Internal user
 ExternalUser=External user
 InternalUsers=Internal users
 ExternalUsers=External users
+UserInterface=User interface
 GUISetup=Display
 SetupArea=Setup
 UploadNewTemplate=Upload new template(s)
@@ -1260,8 +1261,8 @@ YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP
 DownloadMoreSkins=More skins to download
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
-ShowProfIdInAddress=Show professional id with addresses
-ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
+ShowProfIdInAddress=Show professional ID with addresses
+ShowVATIntaInAddress=Hide intra-Community VAT number
 TranslationUncomplete=Partial translation
 MAIN_DISABLE_METEO=Disable meteorological view
 MeteoStdMod=Standard mode
@@ -1778,7 +1779,7 @@ ClickToDialSetup=Click To Dial module setup
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
 ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface, installed on the same computer as the browser, and called when you click on a link starting with "tel:" in your browser. If you need link that start with "sip:" or a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Point of Sale
 CashDeskSetup=Point of Sales module setup
@@ -2133,7 +2134,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
-NotRecommended=Not recommanded
+Recommended=Recommended
+NotRecommended=Not recommended
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
@@ -2144,3 +2146,5 @@ YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You s
 RandomlySelectedIfSeveral=Randomly selected if several pictures are available
 DatabasePasswordObfuscated=Database password is obfuscated in conf file
 DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
+APIsAreNotEnabled=APIs modules are not enabled
+YouShouldSetThisToOff=You should set this to 0 or off
diff --git a/htdocs/langs/kn_IN/banks.lang b/htdocs/langs/kn_IN/banks.lang
index 26a8b041e45..2e211c58a17 100644
--- a/htdocs/langs/kn_IN/banks.lang
+++ b/htdocs/langs/kn_IN/banks.lang
@@ -115,7 +115,7 @@ TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
 CheckTransmitter=Sender
 ValidateCheckReceipt=Validate this check receipt?
-ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes will be possible once validated.
 DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
diff --git a/htdocs/langs/kn_IN/boxes.lang b/htdocs/langs/kn_IN/boxes.lang
index 0c9ea302fb8..710d49bfab6 100644
--- a/htdocs/langs/kn_IN/boxes.lang
+++ b/htdocs/langs/kn_IN/boxes.lang
@@ -91,8 +91,8 @@ BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
 BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
 BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
 BoxTitleLastModifiedPropals=Latest %s modified proposals
-BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
-BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
+BoxTitleLatestModifiedJobPositions=Latest %s modified job positions
+BoxTitleLatestModifiedCandidatures=Latest %s modified job applications
 ForCustomersInvoices=Customers invoices
 ForCustomersOrders=Customers orders
 ForProposals=Proposals
diff --git a/htdocs/langs/kn_IN/cashdesk.lang b/htdocs/langs/kn_IN/cashdesk.lang
index db38f5c8915..a443847482d 100644
--- a/htdocs/langs/kn_IN/cashdesk.lang
+++ b/htdocs/langs/kn_IN/cashdesk.lang
@@ -127,4 +127,4 @@ AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
 ShowPriceHT = Display the column with the price excluding tax (on screen)
-ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on the receipt)
diff --git a/htdocs/langs/kn_IN/errors.lang b/htdocs/langs/kn_IN/errors.lang
index 670f8c7a6bc..85b90ca4991 100644
--- a/htdocs/langs/kn_IN/errors.lang
+++ b/htdocs/langs/kn_IN/errors.lang
@@ -301,3 +301,4 @@ ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
 ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
+ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
diff --git a/htdocs/langs/kn_IN/eventorganization.lang b/htdocs/langs/kn_IN/eventorganization.lang
index 335c257b224..f361e6bc192 100644
--- a/htdocs/langs/kn_IN/eventorganization.lang
+++ b/htdocs/langs/kn_IN/eventorganization.lang
@@ -86,6 +86,7 @@ DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
 SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
 SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
+NbVotes=Number of votes
 #
 # Status
 #
@@ -115,6 +116,9 @@ EvntOrgDuration = This conference starts on %s and ends on %s.
 ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
 BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
 EventType = Event type
+LabelOfBooth=Booth label
+LabelOfconference=Conference label
+ConferenceIsNotConfirmed=Subcription not available, conference is not confirmed yet
 
 #
 # Vote page
diff --git a/htdocs/langs/kn_IN/install.lang b/htdocs/langs/kn_IN/install.lang
index 63947dad154..c1ffee936d7 100644
--- a/htdocs/langs/kn_IN/install.lang
+++ b/htdocs/langs/kn_IN/install.lang
@@ -206,6 +206,7 @@ MigrationUserPhotoPath=Migration of photo paths for users
 MigrationFieldsSocialNetworks=Migration of users fields social networks (%s)
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
+MigrationImportOrExportProfiles=Migration of import or export profiles (%s)
 ShowNotAvailableOptions=Show unavailable options
 HideNotAvailableOptions=Hide unavailable options
 ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
diff --git a/htdocs/langs/kn_IN/interventions.lang b/htdocs/langs/kn_IN/interventions.lang
index e5936f8246e..51079fca278 100644
--- a/htdocs/langs/kn_IN/interventions.lang
+++ b/htdocs/langs/kn_IN/interventions.lang
@@ -64,3 +64,5 @@ InterLineDuration=Line duration intervention
 InterLineDesc=Line description intervention
 RepeatableIntervention=Template of intervention
 ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
+Reopen=Reopen
+ConfirmReopenIntervention=Are you sure you want to open back the intervention <b>%s</b>?
diff --git a/htdocs/langs/kn_IN/productbatch.lang b/htdocs/langs/kn_IN/productbatch.lang
index 450d0285819..763af20c6b4 100644
--- a/htdocs/langs/kn_IN/productbatch.lang
+++ b/htdocs/langs/kn_IN/productbatch.lang
@@ -26,12 +26,10 @@ ShowLogOfMovementIfLot=Show log of movements for couple product/lot
 StockDetailPerBatch=Stock detail per lot
 SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
-BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
-BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
 ManageLotMask=Custom mask
-CustomMasks=Adds an option to define mask in the product card
-LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
-SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+CustomMasks=Option to define a different numbering mask for each product
+BatchLotNumberingModules=Numbering rule for automatic generation of lot number
+BatchSerialNumberingModules=Numbering rule for automatic generation of serial number (for products with property 1 unique lot/serial for each product)
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
diff --git a/htdocs/langs/kn_IN/products.lang b/htdocs/langs/kn_IN/products.lang
index 325549987df..068d777df47 100644
--- a/htdocs/langs/kn_IN/products.lang
+++ b/htdocs/langs/kn_IN/products.lang
@@ -277,7 +277,7 @@ PriceByCustomer=Different prices for each customer
 PriceCatalogue=A single sell price per product/service
 PricingRule=Rules for selling prices
 AddCustomerPrice=Add price by customer
-ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
+ForceUpdateChildPriceSoc=Set same price on customer's subsidiaries
 PriceByCustomerLog=Log of previous customer prices
 MinimumPriceLimit=Minimum price can't be lower then %s
 MinimumRecommendedPrice=Minimum recommended price is: %s
@@ -296,6 +296,7 @@ ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Child products
 MinSupplierPrice=Minimum buying price
 MinCustomerPrice=Minimum selling price
+NoDynamicPrice=No dynamic price
 DynamicPriceConfiguration=Dynamic price configuration
 DynamicPriceDesc=You may define mathematical formulae to calculate Customer or Vendor prices. Such formulas can use all mathematical operators, some constants and variables. You can define here the variables you wish to use. If the variable needs an automatic update, you may define the external URL to allow Dolibarr to update the value automatically.
 AddVariable=Add Variable
diff --git a/htdocs/langs/kn_IN/salaries.lang b/htdocs/langs/kn_IN/salaries.lang
index 7c3c08a65bd..12905040b1a 100644
--- a/htdocs/langs/kn_IN/salaries.lang
+++ b/htdocs/langs/kn_IN/salaries.lang
@@ -2,20 +2,23 @@
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=By default, leave empty the option "Automatically create a total payment" when creating a Salary
 Salary=Salary
 Salaries=Salaries
-NewSalaryPayment=New salary payment
+NewSalary=New salary
+NewSalaryPayment=New salary card
 AddSalaryPayment=Add salary payment
 SalaryPayment=Salary payment
 SalariesPayments=Salaries payments
+SalariesPaymentsOf=Salaries payments of %s
 ShowSalaryPayment=Show salary payment
 THM=Average hourly rate
 TJM=Average daily rate
 CurrentSalary=Current salary
 THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
 TJMDescription=This value is currently for information only and is not used for any calculation
-LastSalaries=Latest %s salary payments
-AllSalaries=All salary payments
+LastSalaries=Latest %s salaries
+AllSalaries=All salaries
 SalariesStatistics=Salary statistics
-# Export
 SalariesAndPayments=Salaries and payments
+ConfirmDeleteSalaryPayment=Do you want to delete this salary payment ?
diff --git a/htdocs/langs/kn_IN/ticket.lang b/htdocs/langs/kn_IN/ticket.lang
index 15d79d284fc..ec51eff2cf9 100644
--- a/htdocs/langs/kn_IN/ticket.lang
+++ b/htdocs/langs/kn_IN/ticket.lang
@@ -34,7 +34,8 @@ TicketDictResolution=Ticket - Resolution
 
 TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
-TicketTypeShortISSUE=Issue, bug or problem
+TicketTypeShortISSUE=Issue or bug
+TicketTypeShortPROBLEM=Problem
 TicketTypeShortREQUEST=Change or enhancement request
 TicketTypeShortPROJET=Project
 TicketTypeShortOTHER=ಇತರ
@@ -54,14 +55,15 @@ TypeContact_ticket_internal_SUPPORTTEC=Assigned user
 TypeContact_ticket_external_SUPPORTCLI=Customer contact / incident tracking
 TypeContact_ticket_external_CONTRIBUTOR=External contributor
 
-OriginEmail=Email source
+OriginEmail=Reporter Email
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
 Read=Read
 Assigned=Assigned
 InProgress=In progress
-NeedMoreInformation=Waiting for information
+NeedMoreInformation=Waiting for reporter feedback
+NeedMoreInformationShort=Waiting for feedback
 Answered=Answered
 Waiting=Waiting
 Closed=ಮುಚ್ಚಲಾಗಿದೆ
@@ -160,7 +162,7 @@ CreatedBy=Created by
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Group
+TicketCategory=Ticket categorization
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
@@ -211,6 +213,7 @@ TicketMessageHelp=Only this text will be saved in the message list on ticket car
 TicketMessageSubstitutionReplacedByGenericValues=Substitutions variables are replaced by generic values.
 TimeElapsedSince=Time elapsed since
 TicketTimeToRead=Time elapsed before read
+TicketTimeElapsedBeforeSince=Time elapsed before / since
 TicketContacts=Contacts ticket
 TicketDocumentsLinked=Documents linked to ticket
 ConfirmReOpenTicket=Confirm reopen this ticket ?
diff --git a/htdocs/langs/kn_IN/users.lang b/htdocs/langs/kn_IN/users.lang
index effac97d337..8bedecb9218 100644
--- a/htdocs/langs/kn_IN/users.lang
+++ b/htdocs/langs/kn_IN/users.lang
@@ -97,8 +97,8 @@ LoginToCreate=Login to create
 NameToCreate=Name of third party to create
 YourRole=Your roles
 YourQuotaOfUsersIsReached=Your quota of active users is reached !
-NbOfUsers=No. of users
-NbOfPermissions=No. of permissions
+NbOfUsers=Number of users
+NbOfPermissions=Number of permissions
 DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin
 HierarchicalResponsible=Supervisor
 HierarchicView=Hierarchical view
diff --git a/htdocs/langs/kn_IN/website.lang b/htdocs/langs/kn_IN/website.lang
index 1e727415ec2..dc2ec2c0b3d 100644
--- a/htdocs/langs/kn_IN/website.lang
+++ b/htdocs/langs/kn_IN/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 PageContainer=Page
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
+PreviewOfSiteNotYetAvailable=The preview of your website <strong>%s</strong> is not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
diff --git a/htdocs/langs/ko_KR/admin.lang b/htdocs/langs/ko_KR/admin.lang
index be3e5096bf1..828491ab252 100644
--- a/htdocs/langs/ko_KR/admin.lang
+++ b/htdocs/langs/ko_KR/admin.lang
@@ -53,6 +53,7 @@ InternalUser=Internal user
 ExternalUser=외부사용자
 InternalUsers=내부사용자\n
 ExternalUsers=외부사용자
+UserInterface=User interface
 GUISetup=화면
 SetupArea=설정
 UploadNewTemplate=Upload new template(s)
@@ -1260,8 +1261,8 @@ YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP
 DownloadMoreSkins=More skins to download
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
-ShowProfIdInAddress=Show professional id with addresses
-ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
+ShowProfIdInAddress=Show professional ID with addresses
+ShowVATIntaInAddress=Hide intra-Community VAT number
 TranslationUncomplete=Partial translation
 MAIN_DISABLE_METEO=Disable meteorological view
 MeteoStdMod=Standard mode
@@ -1778,7 +1779,7 @@ ClickToDialSetup=Click To Dial module setup
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
 ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface, installed on the same computer as the browser, and called when you click on a link starting with "tel:" in your browser. If you need link that start with "sip:" or a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Point of Sale
 CashDeskSetup=Point of Sales module setup
@@ -2133,7 +2134,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
-NotRecommended=Not recommanded
+Recommended=권장
+NotRecommended=Not recommended
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
@@ -2144,3 +2146,5 @@ YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You s
 RandomlySelectedIfSeveral=Randomly selected if several pictures are available
 DatabasePasswordObfuscated=Database password is obfuscated in conf file
 DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
+APIsAreNotEnabled=APIs modules are not enabled
+YouShouldSetThisToOff=You should set this to 0 or off
diff --git a/htdocs/langs/ko_KR/banks.lang b/htdocs/langs/ko_KR/banks.lang
index 76102f7a731..d10df617541 100644
--- a/htdocs/langs/ko_KR/banks.lang
+++ b/htdocs/langs/ko_KR/banks.lang
@@ -115,7 +115,7 @@ TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
 CheckTransmitter=Sender
 ValidateCheckReceipt=Validate this check receipt?
-ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes will be possible once validated.
 DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
diff --git a/htdocs/langs/ko_KR/boxes.lang b/htdocs/langs/ko_KR/boxes.lang
index a65fcc0e16b..1f786818946 100644
--- a/htdocs/langs/ko_KR/boxes.lang
+++ b/htdocs/langs/ko_KR/boxes.lang
@@ -91,8 +91,8 @@ BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
 BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
 BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
 BoxTitleLastModifiedPropals=Latest %s modified proposals
-BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
-BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
+BoxTitleLatestModifiedJobPositions=Latest %s modified job positions
+BoxTitleLatestModifiedCandidatures=Latest %s modified job applications
 ForCustomersInvoices=고객 송장
 ForCustomersOrders=고객 주문
 ForProposals=제안
diff --git a/htdocs/langs/ko_KR/cashdesk.lang b/htdocs/langs/ko_KR/cashdesk.lang
index 4ba4c81a4d8..9e556a30cc0 100644
--- a/htdocs/langs/ko_KR/cashdesk.lang
+++ b/htdocs/langs/ko_KR/cashdesk.lang
@@ -127,4 +127,4 @@ AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
 ShowPriceHT = Display the column with the price excluding tax (on screen)
-ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on the receipt)
diff --git a/htdocs/langs/ko_KR/errors.lang b/htdocs/langs/ko_KR/errors.lang
index 670f8c7a6bc..85b90ca4991 100644
--- a/htdocs/langs/ko_KR/errors.lang
+++ b/htdocs/langs/ko_KR/errors.lang
@@ -301,3 +301,4 @@ ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
 ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
+ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
diff --git a/htdocs/langs/ko_KR/eventorganization.lang b/htdocs/langs/ko_KR/eventorganization.lang
index 7f96bbd2542..0fb7b6a26c8 100644
--- a/htdocs/langs/ko_KR/eventorganization.lang
+++ b/htdocs/langs/ko_KR/eventorganization.lang
@@ -86,6 +86,7 @@ DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
 SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
 SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
+NbVotes=Number of votes
 #
 # Status
 #
@@ -115,6 +116,9 @@ EvntOrgDuration = This conference starts on %s and ends on %s.
 ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
 BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
 EventType = Event type
+LabelOfBooth=Booth label
+LabelOfconference=Conference label
+ConferenceIsNotConfirmed=Subcription not available, conference is not confirmed yet
 
 #
 # Vote page
diff --git a/htdocs/langs/ko_KR/install.lang b/htdocs/langs/ko_KR/install.lang
index b528753cdc6..37c88031d49 100644
--- a/htdocs/langs/ko_KR/install.lang
+++ b/htdocs/langs/ko_KR/install.lang
@@ -206,6 +206,7 @@ MigrationUserPhotoPath=Migration of photo paths for users
 MigrationFieldsSocialNetworks=Migration of users fields social networks (%s)
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
+MigrationImportOrExportProfiles=Migration of import or export profiles (%s)
 ShowNotAvailableOptions=Show unavailable options
 HideNotAvailableOptions=Hide unavailable options
 ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
diff --git a/htdocs/langs/ko_KR/interventions.lang b/htdocs/langs/ko_KR/interventions.lang
index 3be481c3ddf..a41680b9002 100644
--- a/htdocs/langs/ko_KR/interventions.lang
+++ b/htdocs/langs/ko_KR/interventions.lang
@@ -64,3 +64,5 @@ InterLineDuration=Line duration intervention
 InterLineDesc=Line description intervention
 RepeatableIntervention=Template of intervention
 ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
+Reopen=Reopen
+ConfirmReopenIntervention=Are you sure you want to open back the intervention <b>%s</b>?
diff --git a/htdocs/langs/ko_KR/productbatch.lang b/htdocs/langs/ko_KR/productbatch.lang
index 1164079f0b3..94f4785c348 100644
--- a/htdocs/langs/ko_KR/productbatch.lang
+++ b/htdocs/langs/ko_KR/productbatch.lang
@@ -26,12 +26,10 @@ ShowLogOfMovementIfLot=묶음제품 또는 일련번호별제품 이동기록 
 StockDetailPerBatch=일련번호별 재고내역
 SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
-BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
-BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
 ManageLotMask=Custom mask
-CustomMasks=Adds an option to define mask in the product card
-LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
-SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+CustomMasks=Option to define a different numbering mask for each product
+BatchLotNumberingModules=Numbering rule for automatic generation of lot number
+BatchSerialNumberingModules=Numbering rule for automatic generation of serial number (for products with property 1 unique lot/serial for each product)
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
diff --git a/htdocs/langs/ko_KR/products.lang b/htdocs/langs/ko_KR/products.lang
index cfe0f78e7b9..cd41dface7e 100644
--- a/htdocs/langs/ko_KR/products.lang
+++ b/htdocs/langs/ko_KR/products.lang
@@ -277,7 +277,7 @@ PriceByCustomer=Different prices for each customer
 PriceCatalogue=A single sell price per product/service
 PricingRule=Rules for selling prices
 AddCustomerPrice=Add price by customer
-ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
+ForceUpdateChildPriceSoc=Set same price on customer's subsidiaries
 PriceByCustomerLog=Log of previous customer prices
 MinimumPriceLimit=Minimum price can't be lower then %s
 MinimumRecommendedPrice=Minimum recommended price is: %s
@@ -296,6 +296,7 @@ ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Child products
 MinSupplierPrice=Minimum buying price
 MinCustomerPrice=Minimum selling price
+NoDynamicPrice=No dynamic price
 DynamicPriceConfiguration=Dynamic price configuration
 DynamicPriceDesc=You may define mathematical formulae to calculate Customer or Vendor prices. Such formulas can use all mathematical operators, some constants and variables. You can define here the variables you wish to use. If the variable needs an automatic update, you may define the external URL to allow Dolibarr to update the value automatically.
 AddVariable=Add Variable
diff --git a/htdocs/langs/ko_KR/salaries.lang b/htdocs/langs/ko_KR/salaries.lang
index 7c3c08a65bd..12905040b1a 100644
--- a/htdocs/langs/ko_KR/salaries.lang
+++ b/htdocs/langs/ko_KR/salaries.lang
@@ -2,20 +2,23 @@
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=By default, leave empty the option "Automatically create a total payment" when creating a Salary
 Salary=Salary
 Salaries=Salaries
-NewSalaryPayment=New salary payment
+NewSalary=New salary
+NewSalaryPayment=New salary card
 AddSalaryPayment=Add salary payment
 SalaryPayment=Salary payment
 SalariesPayments=Salaries payments
+SalariesPaymentsOf=Salaries payments of %s
 ShowSalaryPayment=Show salary payment
 THM=Average hourly rate
 TJM=Average daily rate
 CurrentSalary=Current salary
 THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
 TJMDescription=This value is currently for information only and is not used for any calculation
-LastSalaries=Latest %s salary payments
-AllSalaries=All salary payments
+LastSalaries=Latest %s salaries
+AllSalaries=All salaries
 SalariesStatistics=Salary statistics
-# Export
 SalariesAndPayments=Salaries and payments
+ConfirmDeleteSalaryPayment=Do you want to delete this salary payment ?
diff --git a/htdocs/langs/ko_KR/ticket.lang b/htdocs/langs/ko_KR/ticket.lang
index c528ed9805f..02637bdb122 100644
--- a/htdocs/langs/ko_KR/ticket.lang
+++ b/htdocs/langs/ko_KR/ticket.lang
@@ -34,7 +34,8 @@ TicketDictResolution=Ticket - Resolution
 
 TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
-TicketTypeShortISSUE=Issue, bug or problem
+TicketTypeShortISSUE=Issue or bug
+TicketTypeShortPROBLEM=Problem
 TicketTypeShortREQUEST=Change or enhancement request
 TicketTypeShortPROJET=Project
 TicketTypeShortOTHER=기타
@@ -54,14 +55,15 @@ TypeContact_ticket_internal_SUPPORTTEC=Assigned user
 TypeContact_ticket_external_SUPPORTCLI=Customer contact / incident tracking
 TypeContact_ticket_external_CONTRIBUTOR=External contributor
 
-OriginEmail=Email source
+OriginEmail=Reporter Email
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
 Read=Read
 Assigned=Assigned
 InProgress=In progress
-NeedMoreInformation=Waiting for information
+NeedMoreInformation=Waiting for reporter feedback
+NeedMoreInformationShort=Waiting for feedback
 Answered=Answered
 Waiting=Waiting
 Closed=닫혔음
@@ -160,7 +162,7 @@ CreatedBy=Created by
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Group
+TicketCategory=Ticket categorization
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
@@ -211,6 +213,7 @@ TicketMessageHelp=Only this text will be saved in the message list on ticket car
 TicketMessageSubstitutionReplacedByGenericValues=Substitutions variables are replaced by generic values.
 TimeElapsedSince=Time elapsed since
 TicketTimeToRead=Time elapsed before read
+TicketTimeElapsedBeforeSince=Time elapsed before / since
 TicketContacts=Contacts ticket
 TicketDocumentsLinked=Documents linked to ticket
 ConfirmReOpenTicket=Confirm reopen this ticket ?
diff --git a/htdocs/langs/ko_KR/users.lang b/htdocs/langs/ko_KR/users.lang
index 34e93843c41..14ca6524035 100644
--- a/htdocs/langs/ko_KR/users.lang
+++ b/htdocs/langs/ko_KR/users.lang
@@ -97,8 +97,8 @@ LoginToCreate=Login to create
 NameToCreate=Name of third party to create
 YourRole=Your roles
 YourQuotaOfUsersIsReached=Your quota of active users is reached !
-NbOfUsers=No. of users
-NbOfPermissions=No. of permissions
+NbOfUsers=Number of users
+NbOfPermissions=Number of permissions
 DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin
 HierarchicalResponsible=Supervisor
 HierarchicView=Hierarchical view
diff --git a/htdocs/langs/ko_KR/website.lang b/htdocs/langs/ko_KR/website.lang
index c5fbd107065..0045ce25f8f 100644
--- a/htdocs/langs/ko_KR/website.lang
+++ b/htdocs/langs/ko_KR/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 PageContainer=Page
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
+PreviewOfSiteNotYetAvailable=The preview of your website <strong>%s</strong> is not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
diff --git a/htdocs/langs/lo_LA/admin.lang b/htdocs/langs/lo_LA/admin.lang
index 2e8805572bd..ec67ebe2221 100644
--- a/htdocs/langs/lo_LA/admin.lang
+++ b/htdocs/langs/lo_LA/admin.lang
@@ -53,6 +53,7 @@ InternalUser=Internal user
 ExternalUser=External user
 InternalUsers=Internal users
 ExternalUsers=External users
+UserInterface=User interface
 GUISetup=Display
 SetupArea=Setup
 UploadNewTemplate=Upload new template(s)
@@ -1260,8 +1261,8 @@ YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP
 DownloadMoreSkins=More skins to download
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
-ShowProfIdInAddress=Show professional id with addresses
-ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
+ShowProfIdInAddress=Show professional ID with addresses
+ShowVATIntaInAddress=Hide intra-Community VAT number
 TranslationUncomplete=Partial translation
 MAIN_DISABLE_METEO=Disable meteorological view
 MeteoStdMod=Standard mode
@@ -1778,7 +1779,7 @@ ClickToDialSetup=Click To Dial module setup
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
 ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface, installed on the same computer as the browser, and called when you click on a link starting with "tel:" in your browser. If you need link that start with "sip:" or a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Point of Sale
 CashDeskSetup=Point of Sales module setup
@@ -2133,7 +2134,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
-NotRecommended=Not recommanded
+Recommended=Recommended
+NotRecommended=Not recommended
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
@@ -2144,3 +2146,5 @@ YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You s
 RandomlySelectedIfSeveral=Randomly selected if several pictures are available
 DatabasePasswordObfuscated=Database password is obfuscated in conf file
 DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
+APIsAreNotEnabled=APIs modules are not enabled
+YouShouldSetThisToOff=You should set this to 0 or off
diff --git a/htdocs/langs/lo_LA/banks.lang b/htdocs/langs/lo_LA/banks.lang
index 3884496ab64..83763cb7e8d 100644
--- a/htdocs/langs/lo_LA/banks.lang
+++ b/htdocs/langs/lo_LA/banks.lang
@@ -115,7 +115,7 @@ TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
 CheckTransmitter=Sender
 ValidateCheckReceipt=Validate this check receipt?
-ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes will be possible once validated.
 DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
diff --git a/htdocs/langs/lo_LA/boxes.lang b/htdocs/langs/lo_LA/boxes.lang
index 0c9ea302fb8..710d49bfab6 100644
--- a/htdocs/langs/lo_LA/boxes.lang
+++ b/htdocs/langs/lo_LA/boxes.lang
@@ -91,8 +91,8 @@ BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
 BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
 BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
 BoxTitleLastModifiedPropals=Latest %s modified proposals
-BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
-BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
+BoxTitleLatestModifiedJobPositions=Latest %s modified job positions
+BoxTitleLatestModifiedCandidatures=Latest %s modified job applications
 ForCustomersInvoices=Customers invoices
 ForCustomersOrders=Customers orders
 ForProposals=Proposals
diff --git a/htdocs/langs/lo_LA/cashdesk.lang b/htdocs/langs/lo_LA/cashdesk.lang
index aea1f02f834..c9d0f7fcd0a 100644
--- a/htdocs/langs/lo_LA/cashdesk.lang
+++ b/htdocs/langs/lo_LA/cashdesk.lang
@@ -127,4 +127,4 @@ AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
 ShowPriceHT = Display the column with the price excluding tax (on screen)
-ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on the receipt)
diff --git a/htdocs/langs/lo_LA/errors.lang b/htdocs/langs/lo_LA/errors.lang
index 670f8c7a6bc..85b90ca4991 100644
--- a/htdocs/langs/lo_LA/errors.lang
+++ b/htdocs/langs/lo_LA/errors.lang
@@ -301,3 +301,4 @@ ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
 ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
+ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
diff --git a/htdocs/langs/lo_LA/eventorganization.lang b/htdocs/langs/lo_LA/eventorganization.lang
index 335c257b224..f361e6bc192 100644
--- a/htdocs/langs/lo_LA/eventorganization.lang
+++ b/htdocs/langs/lo_LA/eventorganization.lang
@@ -86,6 +86,7 @@ DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
 SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
 SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
+NbVotes=Number of votes
 #
 # Status
 #
@@ -115,6 +116,9 @@ EvntOrgDuration = This conference starts on %s and ends on %s.
 ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
 BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
 EventType = Event type
+LabelOfBooth=Booth label
+LabelOfconference=Conference label
+ConferenceIsNotConfirmed=Subcription not available, conference is not confirmed yet
 
 #
 # Vote page
diff --git a/htdocs/langs/lo_LA/install.lang b/htdocs/langs/lo_LA/install.lang
index 63947dad154..c1ffee936d7 100644
--- a/htdocs/langs/lo_LA/install.lang
+++ b/htdocs/langs/lo_LA/install.lang
@@ -206,6 +206,7 @@ MigrationUserPhotoPath=Migration of photo paths for users
 MigrationFieldsSocialNetworks=Migration of users fields social networks (%s)
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
+MigrationImportOrExportProfiles=Migration of import or export profiles (%s)
 ShowNotAvailableOptions=Show unavailable options
 HideNotAvailableOptions=Hide unavailable options
 ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
diff --git a/htdocs/langs/lo_LA/interventions.lang b/htdocs/langs/lo_LA/interventions.lang
index e5936f8246e..51079fca278 100644
--- a/htdocs/langs/lo_LA/interventions.lang
+++ b/htdocs/langs/lo_LA/interventions.lang
@@ -64,3 +64,5 @@ InterLineDuration=Line duration intervention
 InterLineDesc=Line description intervention
 RepeatableIntervention=Template of intervention
 ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
+Reopen=Reopen
+ConfirmReopenIntervention=Are you sure you want to open back the intervention <b>%s</b>?
diff --git a/htdocs/langs/lo_LA/productbatch.lang b/htdocs/langs/lo_LA/productbatch.lang
index 450d0285819..763af20c6b4 100644
--- a/htdocs/langs/lo_LA/productbatch.lang
+++ b/htdocs/langs/lo_LA/productbatch.lang
@@ -26,12 +26,10 @@ ShowLogOfMovementIfLot=Show log of movements for couple product/lot
 StockDetailPerBatch=Stock detail per lot
 SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
-BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
-BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
 ManageLotMask=Custom mask
-CustomMasks=Adds an option to define mask in the product card
-LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
-SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+CustomMasks=Option to define a different numbering mask for each product
+BatchLotNumberingModules=Numbering rule for automatic generation of lot number
+BatchSerialNumberingModules=Numbering rule for automatic generation of serial number (for products with property 1 unique lot/serial for each product)
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
diff --git a/htdocs/langs/lo_LA/products.lang b/htdocs/langs/lo_LA/products.lang
index a0a7ee2e634..98aa7f88569 100644
--- a/htdocs/langs/lo_LA/products.lang
+++ b/htdocs/langs/lo_LA/products.lang
@@ -277,7 +277,7 @@ PriceByCustomer=Different prices for each customer
 PriceCatalogue=A single sell price per product/service
 PricingRule=Rules for selling prices
 AddCustomerPrice=Add price by customer
-ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
+ForceUpdateChildPriceSoc=Set same price on customer's subsidiaries
 PriceByCustomerLog=Log of previous customer prices
 MinimumPriceLimit=Minimum price can't be lower then %s
 MinimumRecommendedPrice=Minimum recommended price is: %s
@@ -296,6 +296,7 @@ ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Child products
 MinSupplierPrice=Minimum buying price
 MinCustomerPrice=Minimum selling price
+NoDynamicPrice=No dynamic price
 DynamicPriceConfiguration=Dynamic price configuration
 DynamicPriceDesc=You may define mathematical formulae to calculate Customer or Vendor prices. Such formulas can use all mathematical operators, some constants and variables. You can define here the variables you wish to use. If the variable needs an automatic update, you may define the external URL to allow Dolibarr to update the value automatically.
 AddVariable=Add Variable
diff --git a/htdocs/langs/lo_LA/salaries.lang b/htdocs/langs/lo_LA/salaries.lang
index 7c3c08a65bd..12905040b1a 100644
--- a/htdocs/langs/lo_LA/salaries.lang
+++ b/htdocs/langs/lo_LA/salaries.lang
@@ -2,20 +2,23 @@
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=By default, leave empty the option "Automatically create a total payment" when creating a Salary
 Salary=Salary
 Salaries=Salaries
-NewSalaryPayment=New salary payment
+NewSalary=New salary
+NewSalaryPayment=New salary card
 AddSalaryPayment=Add salary payment
 SalaryPayment=Salary payment
 SalariesPayments=Salaries payments
+SalariesPaymentsOf=Salaries payments of %s
 ShowSalaryPayment=Show salary payment
 THM=Average hourly rate
 TJM=Average daily rate
 CurrentSalary=Current salary
 THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
 TJMDescription=This value is currently for information only and is not used for any calculation
-LastSalaries=Latest %s salary payments
-AllSalaries=All salary payments
+LastSalaries=Latest %s salaries
+AllSalaries=All salaries
 SalariesStatistics=Salary statistics
-# Export
 SalariesAndPayments=Salaries and payments
+ConfirmDeleteSalaryPayment=Do you want to delete this salary payment ?
diff --git a/htdocs/langs/lo_LA/ticket.lang b/htdocs/langs/lo_LA/ticket.lang
index 75d3ce1feca..6e7c0e19ebd 100644
--- a/htdocs/langs/lo_LA/ticket.lang
+++ b/htdocs/langs/lo_LA/ticket.lang
@@ -34,7 +34,8 @@ TicketDictResolution=Ticket - Resolution
 
 TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
-TicketTypeShortISSUE=Issue, bug or problem
+TicketTypeShortISSUE=Issue or bug
+TicketTypeShortPROBLEM=Problem
 TicketTypeShortREQUEST=Change or enhancement request
 TicketTypeShortPROJET=Project
 TicketTypeShortOTHER=Other
@@ -54,14 +55,15 @@ TypeContact_ticket_internal_SUPPORTTEC=Assigned user
 TypeContact_ticket_external_SUPPORTCLI=Customer contact / incident tracking
 TypeContact_ticket_external_CONTRIBUTOR=External contributor
 
-OriginEmail=Email source
+OriginEmail=Reporter Email
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
 Read=Read
 Assigned=Assigned
 InProgress=In progress
-NeedMoreInformation=Waiting for information
+NeedMoreInformation=Waiting for reporter feedback
+NeedMoreInformationShort=Waiting for feedback
 Answered=Answered
 Waiting=Waiting
 Closed=Closed
@@ -160,7 +162,7 @@ CreatedBy=Created by
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Group
+TicketCategory=Ticket categorization
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
@@ -211,6 +213,7 @@ TicketMessageHelp=Only this text will be saved in the message list on ticket car
 TicketMessageSubstitutionReplacedByGenericValues=Substitutions variables are replaced by generic values.
 TimeElapsedSince=Time elapsed since
 TicketTimeToRead=Time elapsed before read
+TicketTimeElapsedBeforeSince=Time elapsed before / since
 TicketContacts=Contacts ticket
 TicketDocumentsLinked=Documents linked to ticket
 ConfirmReOpenTicket=Confirm reopen this ticket ?
diff --git a/htdocs/langs/lo_LA/users.lang b/htdocs/langs/lo_LA/users.lang
index dd400e54715..7be0f7488c5 100644
--- a/htdocs/langs/lo_LA/users.lang
+++ b/htdocs/langs/lo_LA/users.lang
@@ -97,8 +97,8 @@ LoginToCreate=Login to create
 NameToCreate=Name of third party to create
 YourRole=Your roles
 YourQuotaOfUsersIsReached=Your quota of active users is reached !
-NbOfUsers=No. of users
-NbOfPermissions=No. of permissions
+NbOfUsers=Number of users
+NbOfPermissions=Number of permissions
 DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin
 HierarchicalResponsible=Supervisor
 HierarchicView=Hierarchical view
diff --git a/htdocs/langs/lo_LA/website.lang b/htdocs/langs/lo_LA/website.lang
index 1e727415ec2..dc2ec2c0b3d 100644
--- a/htdocs/langs/lo_LA/website.lang
+++ b/htdocs/langs/lo_LA/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 PageContainer=Page
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
+PreviewOfSiteNotYetAvailable=The preview of your website <strong>%s</strong> is not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
diff --git a/htdocs/langs/lt_LT/admin.lang b/htdocs/langs/lt_LT/admin.lang
index 8c4ded88ed4..03342e97273 100644
--- a/htdocs/langs/lt_LT/admin.lang
+++ b/htdocs/langs/lt_LT/admin.lang
@@ -53,6 +53,7 @@ InternalUser=Vidinis naudotojas
 ExternalUser=Išorinis naudotojas
 InternalUsers=Vidiniai naudotojai
 ExternalUsers=Išoriniai naudotojai
+UserInterface=User interface
 GUISetup=Atvaizdavimas
 SetupArea=Nustatymai
 UploadNewTemplate=Upload new template(s)
@@ -1260,8 +1261,8 @@ YourPHPDoesNotHaveSSLSupport=SSL funkcijos negalimos Jūsų PHP
 DownloadMoreSkins=Parsisiųsti daugiau grafinių vaizdų (skins)
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
-ShowProfIdInAddress=Show professional id with addresses
-ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
+ShowProfIdInAddress=Show professional ID with addresses
+ShowVATIntaInAddress=Hide intra-Community VAT number
 TranslationUncomplete=Dalinis vertimas
 MAIN_DISABLE_METEO=Disable meteorological view
 MeteoStdMod=Standard mode
@@ -1778,7 +1779,7 @@ ClickToDialSetup=Click To Dial modulio nuostatos
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
 ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface, installed on the same computer as the browser, and called when you click on a link starting with "tel:" in your browser. If you need link that start with "sip:" or a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Point of Sale
 CashDeskSetup=Point of Sales module setup
@@ -2133,7 +2134,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
-NotRecommended=Not recommanded
+Recommended=Rekomenduojamas
+NotRecommended=Not recommended
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
@@ -2144,3 +2146,5 @@ YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You s
 RandomlySelectedIfSeveral=Randomly selected if several pictures are available
 DatabasePasswordObfuscated=Database password is obfuscated in conf file
 DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
+APIsAreNotEnabled=APIs modules are not enabled
+YouShouldSetThisToOff=You should set this to 0 or off
diff --git a/htdocs/langs/lt_LT/banks.lang b/htdocs/langs/lt_LT/banks.lang
index a48924c160f..4f2d3b13a4d 100644
--- a/htdocs/langs/lt_LT/banks.lang
+++ b/htdocs/langs/lt_LT/banks.lang
@@ -115,7 +115,7 @@ TransferTo=Į
 TransferFromToDone=Pervedimas <b>%s</b> iš <b>%s</b> į <b>%s</b> užregistruotas.
 CheckTransmitter=Siuntėjas
 ValidateCheckReceipt=Validate this check receipt?
-ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes will be possible once validated.
 DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Banko čekiai
diff --git a/htdocs/langs/lt_LT/boxes.lang b/htdocs/langs/lt_LT/boxes.lang
index eba996dc6ec..b56b86ef602 100644
--- a/htdocs/langs/lt_LT/boxes.lang
+++ b/htdocs/langs/lt_LT/boxes.lang
@@ -91,8 +91,8 @@ BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
 BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
 BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
 BoxTitleLastModifiedPropals=Latest %s modified proposals
-BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
-BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
+BoxTitleLatestModifiedJobPositions=Latest %s modified job positions
+BoxTitleLatestModifiedCandidatures=Latest %s modified job applications
 ForCustomersInvoices=Klientų sąskaitos-faktūros
 ForCustomersOrders=Klientų užsakymai
 ForProposals=Pasiūlymai
diff --git a/htdocs/langs/lt_LT/cashdesk.lang b/htdocs/langs/lt_LT/cashdesk.lang
index 51a5af0bc8f..215fd06bcb8 100644
--- a/htdocs/langs/lt_LT/cashdesk.lang
+++ b/htdocs/langs/lt_LT/cashdesk.lang
@@ -127,4 +127,4 @@ AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
 ShowPriceHT = Display the column with the price excluding tax (on screen)
-ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on the receipt)
diff --git a/htdocs/langs/lt_LT/errors.lang b/htdocs/langs/lt_LT/errors.lang
index be103056350..320cda8cd58 100644
--- a/htdocs/langs/lt_LT/errors.lang
+++ b/htdocs/langs/lt_LT/errors.lang
@@ -301,3 +301,4 @@ ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
 ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
+ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
diff --git a/htdocs/langs/lt_LT/eventorganization.lang b/htdocs/langs/lt_LT/eventorganization.lang
index 5e4c78c71a0..725226759da 100644
--- a/htdocs/langs/lt_LT/eventorganization.lang
+++ b/htdocs/langs/lt_LT/eventorganization.lang
@@ -86,6 +86,7 @@ DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
 SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
 SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
+NbVotes=Number of votes
 #
 # Status
 #
@@ -115,6 +116,9 @@ EvntOrgDuration = This conference starts on %s and ends on %s.
 ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
 BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
 EventType = Įvykio tipas
+LabelOfBooth=Booth label
+LabelOfconference=Conference label
+ConferenceIsNotConfirmed=Subcription not available, conference is not confirmed yet
 
 #
 # Vote page
diff --git a/htdocs/langs/lt_LT/install.lang b/htdocs/langs/lt_LT/install.lang
index fd22666afd2..ce06a09c488 100644
--- a/htdocs/langs/lt_LT/install.lang
+++ b/htdocs/langs/lt_LT/install.lang
@@ -206,6 +206,7 @@ MigrationUserPhotoPath=Migration of photo paths for users
 MigrationFieldsSocialNetworks=Migration of users fields social networks (%s)
 MigrationReloadModule=Perkrauti modulį %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
+MigrationImportOrExportProfiles=Migration of import or export profiles (%s)
 ShowNotAvailableOptions=Show unavailable options
 HideNotAvailableOptions=Hide unavailable options
 ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
diff --git a/htdocs/langs/lt_LT/interventions.lang b/htdocs/langs/lt_LT/interventions.lang
index 12016151c84..4624de1d09f 100644
--- a/htdocs/langs/lt_LT/interventions.lang
+++ b/htdocs/langs/lt_LT/interventions.lang
@@ -64,3 +64,5 @@ InterLineDuration=Line duration intervention
 InterLineDesc=Line description intervention
 RepeatableIntervention=Template of intervention
 ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
+Reopen=Atidaryti iš naujo
+ConfirmReopenIntervention=Are you sure you want to open back the intervention <b>%s</b>?
diff --git a/htdocs/langs/lt_LT/productbatch.lang b/htdocs/langs/lt_LT/productbatch.lang
index 52d1433c357..732ece731e1 100644
--- a/htdocs/langs/lt_LT/productbatch.lang
+++ b/htdocs/langs/lt_LT/productbatch.lang
@@ -26,12 +26,10 @@ ShowLogOfMovementIfLot=Show log of movements for couple product/lot
 StockDetailPerBatch=Stock detail per lot
 SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
-BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
-BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
 ManageLotMask=Custom mask
-CustomMasks=Adds an option to define mask in the product card
-LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
-SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+CustomMasks=Option to define a different numbering mask for each product
+BatchLotNumberingModules=Numbering rule for automatic generation of lot number
+BatchSerialNumberingModules=Numbering rule for automatic generation of serial number (for products with property 1 unique lot/serial for each product)
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
diff --git a/htdocs/langs/lt_LT/products.lang b/htdocs/langs/lt_LT/products.lang
index 6554c34fc25..a1dcba5f9dc 100644
--- a/htdocs/langs/lt_LT/products.lang
+++ b/htdocs/langs/lt_LT/products.lang
@@ -277,7 +277,7 @@ PriceByCustomer=Different prices for each customer
 PriceCatalogue=A single sell price per product/service
 PricingRule=Rules for selling prices
 AddCustomerPrice=Add price by customer
-ForceUpdateChildPriceSoc=Nustatykite tą pačią kainą ir kliento dukterinėms įmonėms
+ForceUpdateChildPriceSoc=Set same price on customer's subsidiaries
 PriceByCustomerLog=Log of previous customer prices
 MinimumPriceLimit=Minimum price can't be lower then %s
 MinimumRecommendedPrice=Minimum recommended price is: %s
@@ -296,6 +296,7 @@ ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Child products
 MinSupplierPrice=Minimali pirkimo kaina
 MinCustomerPrice=Minimum selling price
+NoDynamicPrice=No dynamic price
 DynamicPriceConfiguration=Dynamic price configuration
 DynamicPriceDesc=You may define mathematical formulae to calculate Customer or Vendor prices. Such formulas can use all mathematical operators, some constants and variables. You can define here the variables you wish to use. If the variable needs an automatic update, you may define the external URL to allow Dolibarr to update the value automatically.
 AddVariable=Add Variable
diff --git a/htdocs/langs/lt_LT/salaries.lang b/htdocs/langs/lt_LT/salaries.lang
index 3d689e4bc7c..c217f2f6b0b 100644
--- a/htdocs/langs/lt_LT/salaries.lang
+++ b/htdocs/langs/lt_LT/salaries.lang
@@ -2,20 +2,23 @@
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=By default, leave empty the option "Automatically create a total payment" when creating a Salary
 Salary=Atlyginimas
 Salaries=Atlyginimai
-NewSalaryPayment=Naujas atlyginimo mokėjimas
+NewSalary=New salary
+NewSalaryPayment=New salary card
 AddSalaryPayment=Add salary payment
 SalaryPayment=Atlyginimo mokėjimas
 SalariesPayments=Atlyginimų mokėjimai
+SalariesPaymentsOf=Salaries payments of %s
 ShowSalaryPayment=Rodyti atlyginimo mokėjimą
 THM=Average hourly rate
 TJM=Average daily rate
 CurrentSalary=Current salary
 THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
 TJMDescription=This value is currently for information only and is not used for any calculation
-LastSalaries=Latest %s salary payments
-AllSalaries=All salary payments
+LastSalaries=Latest %s salaries
+AllSalaries=All salaries
 SalariesStatistics=Salary statistics
-# Export
 SalariesAndPayments=Salaries and payments
+ConfirmDeleteSalaryPayment=Do you want to delete this salary payment ?
diff --git a/htdocs/langs/lt_LT/ticket.lang b/htdocs/langs/lt_LT/ticket.lang
index f1913615bad..5b9ac853c48 100644
--- a/htdocs/langs/lt_LT/ticket.lang
+++ b/htdocs/langs/lt_LT/ticket.lang
@@ -34,7 +34,8 @@ TicketDictResolution=Ticket - Resolution
 
 TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
-TicketTypeShortISSUE=Issue, bug or problem
+TicketTypeShortISSUE=Issue or bug
+TicketTypeShortPROBLEM=Problem
 TicketTypeShortREQUEST=Change or enhancement request
 TicketTypeShortPROJET=Projektas
 TicketTypeShortOTHER=Kiti
@@ -54,14 +55,15 @@ TypeContact_ticket_internal_SUPPORTTEC=Assigned user
 TypeContact_ticket_external_SUPPORTCLI=Customer contact / incident tracking
 TypeContact_ticket_external_CONTRIBUTOR=External contributor
 
-OriginEmail=Email source
+OriginEmail=Reporter Email
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
 Read=Skaityti
 Assigned=Assigned
 InProgress=In progress
-NeedMoreInformation=Waiting for information
+NeedMoreInformation=Waiting for reporter feedback
+NeedMoreInformationShort=Waiting for feedback
 Answered=Answered
 Waiting=Laukiama
 Closed=Uždaryta
@@ -160,7 +162,7 @@ CreatedBy=Created by
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Grupė
+TicketCategory=Ticket categorization
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
@@ -211,6 +213,7 @@ TicketMessageHelp=Only this text will be saved in the message list on ticket car
 TicketMessageSubstitutionReplacedByGenericValues=Substitutions variables are replaced by generic values.
 TimeElapsedSince=Time elapsed since
 TicketTimeToRead=Time elapsed before read
+TicketTimeElapsedBeforeSince=Time elapsed before / since
 TicketContacts=Contacts ticket
 TicketDocumentsLinked=Documents linked to ticket
 ConfirmReOpenTicket=Confirm reopen this ticket ?
diff --git a/htdocs/langs/lt_LT/users.lang b/htdocs/langs/lt_LT/users.lang
index 3365d6e7c05..00b696fd3a2 100644
--- a/htdocs/langs/lt_LT/users.lang
+++ b/htdocs/langs/lt_LT/users.lang
@@ -97,8 +97,8 @@ LoginToCreate=Prisijunkite, kad galėtumet sukurti
 NameToCreate=Pavadinimas kuriamai trečiąjai šaliai
 YourRole=Jūsų vaidmenys
 YourQuotaOfUsersIsReached=Jūsų aktyvių vartotojų kvota išnaudota !
-NbOfUsers=No. of users
-NbOfPermissions=No. of permissions
+NbOfUsers=Number of users
+NbOfPermissions=Number of permissions
 DontDowngradeSuperAdmin=Tik superadministratorius gali sumažinti kito superadministratoriaus teises
 HierarchicalResponsible=Prižiūrėtojas
 HierarchicView=Hierarchinis vaizdas
diff --git a/htdocs/langs/lt_LT/website.lang b/htdocs/langs/lt_LT/website.lang
index 6b8c389ace1..0e627d937b9 100644
--- a/htdocs/langs/lt_LT/website.lang
+++ b/htdocs/langs/lt_LT/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 PageContainer=Puslapis
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
+PreviewOfSiteNotYetAvailable=The preview of your website <strong>%s</strong> is not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
diff --git a/htdocs/langs/lv_LV/admin.lang b/htdocs/langs/lv_LV/admin.lang
index ae71ef1b18c..df61d51ac4e 100644
--- a/htdocs/langs/lv_LV/admin.lang
+++ b/htdocs/langs/lv_LV/admin.lang
@@ -53,6 +53,7 @@ InternalUser=Iekšējais lietotājs
 ExternalUser=Ārējais lietotājs
 InternalUsers=Iekšējie lietotāji
 ExternalUsers=Ārējie lietotāji
+UserInterface=User interface
 GUISetup=Attēlojums
 SetupArea=Iestatījumi
 UploadNewTemplate=Augšupielādēt jaunu veidni (-es)
@@ -881,7 +882,7 @@ Permission701=Lasīt ziedojumus
 Permission702=Izveidot/mainīt ziedojumus
 Permission703=Dzēst ziedojumus
 Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
+Permission772=Izveidojiet/labojiet izdevumu pārskatus
 Permission773=Dzēst izdevumu pārskatus
 Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Apstiprināt izdevumu pārskatus
@@ -1260,8 +1261,8 @@ YourPHPDoesNotHaveSSLSupport=SSL funkcijas, kas nav pieejama jūsu PHP
 DownloadMoreSkins=Vairāki izskati lejupielādei
 SimpleNumRefModelDesc=Atgriež atsauces numuru formātā %syymm-nnnn, kur yy ir gads, mm ir mēnesis un nnnn ir secīgs automātiski palielināms skaitlis bez atiestatīšanas
 SimpleNumRefNoDateModelDesc=Atgriež atsauces numuru formātā %s-nnnn, kur nnnn ir secīgs automātiski pieaugošs skaitlis bez atiestatīšanas
-ShowProfIdInAddress=Rādīt profesionālo ID ar adresēm
-ShowVATIntaInAddress=Slēpt Kopienas iekšējo PVN numuru ar adresēm
+ShowProfIdInAddress=Show professional ID with addresses
+ShowVATIntaInAddress=Hide intra-Community VAT number
 TranslationUncomplete=Daļējs tulkojums
 MAIN_DISABLE_METEO=Atspējot meteoroloģisko skatu
 MeteoStdMod=Standarta režīms
@@ -1587,10 +1588,10 @@ LDAPDescValues=Piemērs vērtības ir paredzētas <b>OpenLDAP</b> ar šādām ie
 ForANonAnonymousAccess=Par apstiprinātu piekļuvi (par rakstīšanas piekļuvi piemēram)
 PerfDolibarr=Performance uzstādīšana / optimizēt ziņojums
 YouMayFindPerfAdviceHere=Šajā lapā ir sniegtas dažas pārbaudes vai ieteikumi saistībā ar veiktspēju.
-NotInstalled=Nav ieinstalets.
+NotInstalled=Nav instalēts.
 NotSlowedDownByThis=Tas nav palēnināts.
 NotRiskOfLeakWithThis=Ar to nav noplūdes riska.
-ApplicativeCache=Applicative kešatmiņa
+ApplicativeCache=Piemērojamā kešatmiņa
 MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
 MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
 MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled.
@@ -1778,7 +1779,7 @@ ClickToDialSetup=Klikšķiniet lai  Dial moduļa uzstādīšanas
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
 ClickToDialDesc=Šis modulis maina tālruņu numurus, izmantojot galddatoru, uz noklikšķināmām saitēm. Klikšķis piezvanīs uz numuru. To var izmantot, lai sāktu tālruņa zvanu, kad, izmantojot darbvirsmu, izmantojat mīksto tālruni vai, piemēram, izmantojot CTI sistēmu, kuras pamatā ir SIP protokols. Piezīme. Izmantojot viedtālruni, uz tālruņu numuriem vienmēr var noklikšķināt.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
-ClickToDialUseTelLinkDesc=Izmantojiet šo metodi, ja jūsu lietotājiem ir programmatūras tālrunis vai programmatūras interfeiss, kas uzstādīts uz tā paša datora kā pārlūks, un tiek izsaukts, kad jūs noklikšķināt uz savas pārlūkprogrammas saites, kas sākas ar "tel:". Ja jums ir nepieciešams pilnīgs servera risinājums (nav nepieciešama lokālā programmatūras instalēšana), jums tas jādara, lai tas būtu "nē" un aizpildītu nākamo lauku.
+ClickToDialUseTelLinkDesc=Izmantojiet šo metodi, ja jūsu lietotājiem ir programmatūra vai programmatūras saskarne, kas instalēta tajā pašā datorā, kurā atrodas pārlūkprogramma, un tiek izsaukti, kad pārlūkprogrammā noklikšķiniet uz saites, kas sākas ar “tel:”. Ja jums ir nepieciešama saite, kas sākas ar “sip:” vai pilnu servera risinājumu (nav nepieciešama vietējas programmatūras instalēšana), jums tas jāiestata uz “Nē” un jāaizpilda nākamais lauks.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Tirdzniecības vieta
 CashDeskSetup=Tirdzniecības moduļa punkts
@@ -2133,7 +2134,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=PHP funkcijas ir jāatspējo, izņe
 PHPFunctionsRequiredForCLI=Apvalka vajadzībām (piemēram, ieplānota darba dublēšana vai anitivurs programmas palaišana) jums ir jāsaglabā PHP funkcijas
 NoWritableFilesFoundIntoRootDir=Jūsu saknes direktorijā netika atrasti ierasto failu vai direktoriju kopējās programmas (labi)
 RecommendedValueIs=Ieteicams: %s
-NotRecommended=Nav ieteikts
+Recommended=Ieteicams
+NotRecommended=Not recommended
 ARestrictedPath=Ierobežots ceļš
 CheckForModuleUpdate=Pārbaudiet, vai nav atjaunināti ārējie moduļi
 CheckForModuleUpdateHelp=Šī darbība izveidos savienojumu ar ārējo moduļu redaktoriem, lai pārbaudītu, vai ir pieejama jauna versija.
@@ -2145,3 +2147,4 @@ RandomlySelectedIfSeveral=Nejauši izvēlēts, ja ir pieejami vairāki attēli
 DatabasePasswordObfuscated=Datu bāzes parole ir neskaidra konf failā
 DatabasePasswordNotObfuscated=Datu bāzes parole NAV apmulsināta conf failā
 APIsAreNotEnabled=API moduļi nav iespējoti
+YouShouldSetThisToOff=Jums to vajadzētu iestatīt uz 0 vai izslēgtu
diff --git a/htdocs/langs/lv_LV/banks.lang b/htdocs/langs/lv_LV/banks.lang
index ca4bcbbb463..fc0608811f9 100644
--- a/htdocs/langs/lv_LV/banks.lang
+++ b/htdocs/langs/lv_LV/banks.lang
@@ -115,7 +115,7 @@ TransferTo=Kam
 TransferFromToDone=No <b>%s</b> nodošana <b>%s</b> par <b>%s</b> %s ir ierakstīta.
 CheckTransmitter=Nosūtītājs
 ValidateCheckReceipt=Vai apstiprināt šo čeku?
-ConfirmValidateCheckReceipt=Vai tiešām vēlaties iesniegt šo čeku apstiprināšanai? Tas nav izdarīts.
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes will be possible once validated.
 DeleteCheckReceipt=Dzēst šo čeku?
 ConfirmDeleteCheckReceipt=Vai tiešām vēlaties dzēst šo čeka kvīti?
 BankChecks=Bankas čeki
diff --git a/htdocs/langs/lv_LV/bills.lang b/htdocs/langs/lv_LV/bills.lang
index e5220e44b61..014417b451d 100644
--- a/htdocs/langs/lv_LV/bills.lang
+++ b/htdocs/langs/lv_LV/bills.lang
@@ -29,8 +29,8 @@ InvoiceReplacementDesc=<b>Rezerves rēķinu</b> izmanto, lai pilnībā aizstātu
 InvoiceAvoir=Kredīta piezīme
 InvoiceAvoirAsk=Kredīta piezīme, lai koriģētu rēķinu
 InvoiceAvoirDesc=<b> Kredīta piezīme </b> ir negatīvs rēķins, ko izmanto, lai izlabotu faktu, ka rēķinā parādīta summa, kas atšķiras no faktiski samaksātās summas (piemēram, klients kļūdaini samaksājis pārāk daudz vai nemaksās pilno summu kopš daži produkti tika atgriezti).
-invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
-invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
+invoiceAvoirWithLines=Izveidojiet kredītzīmi ar rindiņām no rēķina
+invoiceAvoirWithPaymentRestAmount=Izveidojiet kredītzīmi ar atlikušo neapmaksāto rēķinu
 invoiceAvoirLineWithPaymentRestAmount=Kredīta piezīme par atlikušo neapmaksāto summu
 ReplaceInvoice=Aizstāt rēķinu %s
 ReplacementInvoice=Nomaiņas rēķins
diff --git a/htdocs/langs/lv_LV/boxes.lang b/htdocs/langs/lv_LV/boxes.lang
index bc76a9b79d3..7415887249c 100644
--- a/htdocs/langs/lv_LV/boxes.lang
+++ b/htdocs/langs/lv_LV/boxes.lang
@@ -91,8 +91,8 @@ BoxTitleLatestModifiedSupplierOrders=Pārdevēja pasūtījumi: pēdējais %s mod
 BoxTitleLastModifiedCustomerBills=Klienta rēķini: pēdējie %s modificēti
 BoxTitleLastModifiedCustomerOrders=Pārdošanas pasūtījumi: pēdējais %s modificēts
 BoxTitleLastModifiedPropals=Pēdējie %s labotie priekšlikumi
-BoxTitleLatestModifiedJobPositions=Jaunākie %s pārveidotie darbi
-BoxTitleLatestModifiedCandidatures=Jaunākās %s modificētās kandidatūras
+BoxTitleLatestModifiedJobPositions=Latest %s modified job positions
+BoxTitleLatestModifiedCandidatures=Latest %s modified job applications
 ForCustomersInvoices=Klientu rēķini
 ForCustomersOrders=Klientu pasūtījumi
 ForProposals=Priekšlikumi
diff --git a/htdocs/langs/lv_LV/cashdesk.lang b/htdocs/langs/lv_LV/cashdesk.lang
index fa44b524a1d..9609dfcf49e 100644
--- a/htdocs/langs/lv_LV/cashdesk.lang
+++ b/htdocs/langs/lv_LV/cashdesk.lang
@@ -127,4 +127,4 @@ AllowDelayedPayment=Atļaut kavētu maksājumu
 PrintPaymentMethodOnReceipts=Izdrukājiet maksājuma veidu uz biļetēm |
 WeighingScale=Svari
 ShowPriceHT = Parādīt kolonnu ar cenu bez nodokļiem (ekrānā)
-ShowPriceHTOnReceipt = Parādīt kolonnu ar cenu bez nodokļiem (saņemot)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on the receipt)
diff --git a/htdocs/langs/lv_LV/categories.lang b/htdocs/langs/lv_LV/categories.lang
index 17b9a57000f..d82b650c712 100644
--- a/htdocs/langs/lv_LV/categories.lang
+++ b/htdocs/langs/lv_LV/categories.lang
@@ -83,7 +83,7 @@ CatMembersLinks=Links between members and tags/categories
 CatProjectsLinks=Saikne starp projektiem un tagiem / kategorijām
 CatUsersLinks=Saites starp lietotājiem un tagiem / kategorijām
 DeleteFromCat=Noņemt no tagiem / kategorijas
-ExtraFieldsCategories=Complementary attributes
+ExtraFieldsCategories=Papildus atribūti
 CategoriesSetup=Tagu / kategoriju iestatīšana
 CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=Ja opcija ir ieslēgta, pievienojot produktu apakškategorijai, produkts tiks pievienots arī vecākajai kategorijai.
diff --git a/htdocs/langs/lv_LV/companies.lang b/htdocs/langs/lv_LV/companies.lang
index 046527ed90e..d0f7317eb2d 100644
--- a/htdocs/langs/lv_LV/companies.lang
+++ b/htdocs/langs/lv_LV/companies.lang
@@ -445,7 +445,7 @@ InActivity=Atvērts
 ActivityCeased=Slēgts
 ThirdPartyIsClosed=Trešā persona ir slēgta
 ProductsIntoElements=Produktu / pakalpojumu saraksts, kas kartēti ar %s
-CurrentOutstandingBill=Current outstanding bill
+CurrentOutstandingBill=Pašreizējais nesamaksātais rēķins
 OutstandingBill=Maks. par izcilu rēķinu
 OutstandingBillReached=Maks. par izcilu rēķinu
 OrderMinAmount=Minimālā pasūtījuma summa
diff --git a/htdocs/langs/lv_LV/compta.lang b/htdocs/langs/lv_LV/compta.lang
index 28483b81d2f..d99b893f240 100644
--- a/htdocs/langs/lv_LV/compta.lang
+++ b/htdocs/langs/lv_LV/compta.lang
@@ -24,7 +24,7 @@ ReportTurnoverCollected=Savākto apgrozījumu
 PaymentsNotLinkedToInvoice=Maksājumi, kas nav saistīti ar kādu rēķinu, tāpēc nav saistīts ar trešajām personām
 PaymentsNotLinkedToUser=Maksājumi, kas nav saistīti ar jebkuru lietotāju
 Profit=Peļņa
-AccountingResult=Accounting result
+AccountingResult=Grāmatvedības rezultāts
 BalanceBefore=Bilance (pirms)
 Balance=Bilance
 Debit=Debets
diff --git a/htdocs/langs/lv_LV/contracts.lang b/htdocs/langs/lv_LV/contracts.lang
index df3f4b80956..099de7d45cb 100644
--- a/htdocs/langs/lv_LV/contracts.lang
+++ b/htdocs/langs/lv_LV/contracts.lang
@@ -17,7 +17,7 @@ ServiceStatusClosed=Slēgts
 ShowContractOfService=Rādīt pakalpojuma līgumu
 Contracts=Līgumi
 ContractsSubscriptions=Contracts/Subscriptions
-ContractsAndLine=Contracts and line of contracts
+ContractsAndLine=Līgumi un līgumu līnija
 Contract=Līgums
 ContractLine=Līguma līnija
 Closing=Slēgšana
diff --git a/htdocs/langs/lv_LV/errors.lang b/htdocs/langs/lv_LV/errors.lang
index d90bd6c508b..1319cef0cc5 100644
--- a/htdocs/langs/lv_LV/errors.lang
+++ b/htdocs/langs/lv_LV/errors.lang
@@ -159,9 +159,9 @@ ErrorPriceExpression4=Neatļauts simbols '%s'
 ErrorPriceExpression5=Negaidīts '%s'
 ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
 ErrorPriceExpression8=Unexpected operator '%s'
-ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression9=Radās neparedzēta kļūda
 ErrorPriceExpression10=Operatoram '%s' nav operandes
-ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression11=Gaidāms '%s'
 ErrorPriceExpression14=Dalīts ar nulli
 ErrorPriceExpression17=Nedefinēta vērtība '%s'
 ErrorPriceExpression19=Izteiksme nav atrasta
@@ -172,7 +172,7 @@ ErrorPriceExpression23=Nezināms vai nenoteikts mainīgais "%s" %s
 ErrorPriceExpression24=Mainīgais '%s' pastāv, bet tam nav vērtības
 ErrorPriceExpressionInternal=Iekšēja kļūda '%s' 
 ErrorPriceExpressionUnknown=Nezināma kļūda '%s'
-ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
+ErrorSrcAndTargetWarehouseMustDiffers=Avota un mērķa noliktavām jābūt atšķirīgām
 ErrorTryToMakeMoveOnProductRequiringBatchData=Kļūda, cenšoties veikt krājumu kustību bez partijas / sērijas informācijas, produktam '%s', kas prasa daudz / sērijas informāciju
 ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified (approved or denied) before being allowed to do this action
 ErrorCantSetReceptionToTotalDoneWithReceptionDenied=All recorded receptions must first be verified (approved) before being allowed to do this action
@@ -301,3 +301,4 @@ ErrorActionCommPropertyUserowneridNotDefined=Nepieciešams lietotāja īpašniek
 ErrorActionCommBadType=Atlasītais notikuma veids (id: %n, kods: %s) nepastāv notikuma veida vārdnīcā
 CheckVersionFail=Versijas pārbaude neizdevās
 ErrorWrongFileName=Faila nosaukumā nedrīkst būt __SOMETHING__
+ErrorNotInDictionaryPaymentConditions=Nav Maksājumu nosacījumu vārdnīcā, lūdzu, modificējiet.
diff --git a/htdocs/langs/lv_LV/eventorganization.lang b/htdocs/langs/lv_LV/eventorganization.lang
index d28955ce942..d285336f070 100644
--- a/htdocs/langs/lv_LV/eventorganization.lang
+++ b/htdocs/langs/lv_LV/eventorganization.lang
@@ -86,6 +86,7 @@ DownloadICSLink = Lejupielādēt ICS saiti
 EVENTORGANIZATION_SECUREKEY = Konferences publiskās reģistrācijas saites drošā atslēga
 SERVICE_BOOTH_LOCATION = Pakalpojums, kas izmantots rēķinu rindai par kabīnes atrašanās vietu
 SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Pakalpojums, kas tiek izmantots rēķina rindā par konferences dalībnieka abonementu
+NbVotes=Number of votes
 #
 # Status
 #
@@ -115,6 +116,9 @@ EvntOrgDuration = Šī konference sākas ar %s un beidzas ar %s.
 ConferenceAttendeeFee = Konferences dalībnieka maksa par pasākumu: '%s', kas notiek no %s līdz %s.
 BoothLocationFee = Pasākuma stenda atrašanās vieta: '%s', kas notiek no %s līdz %s
 EventType = Pasākuma veids
+LabelOfBooth=Booth label
+LabelOfconference=Conference label
+ConferenceIsNotConfirmed=Subcription not available, conference is not confirmed yet
 
 #
 # Vote page
diff --git a/htdocs/langs/lv_LV/install.lang b/htdocs/langs/lv_LV/install.lang
index 67c9a428d18..cbbc91bd704 100644
--- a/htdocs/langs/lv_LV/install.lang
+++ b/htdocs/langs/lv_LV/install.lang
@@ -206,6 +206,7 @@ MigrationUserPhotoPath=Lietotāju fotoattēlu migrēšana
 MigrationFieldsSocialNetworks=Lietotāju lauku migrācija sociālajos tīklos (%s)
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Atjaunot moduli BlockedLog par v7 algoritmu
+MigrationImportOrExportProfiles=Migration of import or export profiles (%s)
 ShowNotAvailableOptions=Parādīt nepieejamās iespējas
 HideNotAvailableOptions=Slēpt nepieejamās iespējas
 ErrorFoundDuringMigration=Migrēšanas laikā tika ziņots par kļūdu (-ēm), tāpēc nākamais solis nav pieejams. Lai ignorētu kļūdas, varat <a href="%s"> noklikšķināt šeit </a>, bet lietojumprogramma vai dažas funkcijas var nedarboties pareizi, līdz kļūdas nav atrisinātas.
diff --git a/htdocs/langs/lv_LV/interventions.lang b/htdocs/langs/lv_LV/interventions.lang
index d58806a19e5..b3e547d1129 100644
--- a/htdocs/langs/lv_LV/interventions.lang
+++ b/htdocs/langs/lv_LV/interventions.lang
@@ -64,3 +64,5 @@ InterLineDuration=Line duration intervention
 InterLineDesc=Line description intervention
 RepeatableIntervention=Intervences paraugs
 ToCreateAPredefinedIntervention=Lai izveidotu iepriekš noteiktu vai atkārtotu intervenci, izveidojiet kopēju intervenci un pārveidojiet to par intervences veidni
+Reopen=Atvērt pa jaunu
+ConfirmReopenIntervention=Vai tiešām vēlaties atvērt iejaukšanos <b> %s </b>?
diff --git a/htdocs/langs/lv_LV/other.lang b/htdocs/langs/lv_LV/other.lang
index 64cae5e5bc6..67543e6a3aa 100644
--- a/htdocs/langs/lv_LV/other.lang
+++ b/htdocs/langs/lv_LV/other.lang
@@ -195,7 +195,7 @@ NumberOfContracts=Līgumu skaits
 NumberOfMos=Ražošanas pasūtījumu skaits
 NumberOfUnitsProposals=Vienību skaits priekšlikumos
 NumberOfUnitsCustomerOrders=Vienību skaits pārdošanas pasūtījumos
-NumberOfUnitsCustomerInvoices=Number of units on customer invoices
+NumberOfUnitsCustomerInvoices=Vienību skaits klienta rēķinos
 NumberOfUnitsSupplierProposals=Vienību skaits pārdevēja priekšlikumos
 NumberOfUnitsSupplierOrders=Vienību skaits pirkuma pasūtījumos
 NumberOfUnitsSupplierInvoices=Vienību skaits pārdevēja rēķinos
diff --git a/htdocs/langs/lv_LV/printing.lang b/htdocs/langs/lv_LV/printing.lang
index ca4b5a4eda7..11a53f656fe 100644
--- a/htdocs/langs/lv_LV/printing.lang
+++ b/htdocs/langs/lv_LV/printing.lang
@@ -5,12 +5,12 @@ PrintingSetup=Tiešās drukāšanas sistēmas iestatīšana
 PrintingDesc=Šis modulis pievieno pogai Print (Drukāt) dažādiem moduļiem, lai ļautu dokumentus iespiest tieši uz printeri, neizmantojot dokumentu citā lietojumprogrammā.
 MenuDirectPrinting=Tiešās drukāšanas darbi
 DirectPrint=Tiešā druka
-PrintingDriverDesc=Configuration variables for printing driver.
+PrintingDriverDesc=Konfigurācijas mainīgie drukāšanas draiverim.
 ListDrivers=Draiveru saraksts
 PrintTestDesc=Printeru saraksts.
 FileWasSentToPrinter=Fails %s nosūtīts uz printeri
 ViaModule=izmantojot moduli
-NoActivePrintingModuleFound=No active driver to print document. Check setup of module %s.
+NoActivePrintingModuleFound=Nav aktīva draivera, lai drukātu dokumentu. Pārbaudiet moduļa %s iestatīšanu.
 PleaseSelectaDriverfromList=Lūdzu izvēlies draiveri no saraksta.
 PleaseConfigureDriverfromList=Please configure the selected driver from list.
 SetupDriver=Draivera iestatījumi
diff --git a/htdocs/langs/lv_LV/productbatch.lang b/htdocs/langs/lv_LV/productbatch.lang
index 7e54bf7debd..a321d1eb6f3 100644
--- a/htdocs/langs/lv_LV/productbatch.lang
+++ b/htdocs/langs/lv_LV/productbatch.lang
@@ -19,19 +19,17 @@ printSellby=Pārdeva: %s
 printQty=Daudz.: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
 WhenProductBatchModuleOnOptionAreForced=Kad modulis Lot / Serial ir ieslēgts, automātiskais krājumu samazinājums ir spiests "Samazināt reālo krājumus kuģošanas apstiprinājumā", un automātiskais palielināšanas režīms ir spiests "Palielināt reālos krājumus, manuāli nosūtīt uz noliktavām" un tos nevar rediģēt. Citas iespējas var definēt pēc vajadzības.
-ProductDoesNotUseBatchSerial=This product does not use lot/serial number
+ProductDoesNotUseBatchSerial=Šis produkts neizmanto partijas/sērijas numuru
 ProductLotSetup=Moduļu partijas / sērijas uzstādīšana
 ShowCurrentStockOfLot=Parādīt pašreizējo krājumu par pāris produktu / partiju
 ShowLogOfMovementIfLot=Rādīt žurnālu par kustību pāriem produktam / partijai
 StockDetailPerBatch=Krājumu dati par partiju
 SerialNumberAlreadyInUse=Sērijas numurs %s jau tiek izmantots produktam %s
 TooManyQtyForSerialNumber=Jums var būt tikai viens produkts %s sērijas numuram %s
-BatchLotNumberingModules=Iespējas automātiskai sērijveida produktu ģenerēšanai, ko pārvalda partijas
-BatchSerialNumberingModules=Iespējas automātiskai sērijveida produktu ģenerēšanai, kurus pārvalda sērijas numuri
 ManageLotMask=Pielāgota maska
-CustomMasks=Produkta kartē tiek pievienota iespēja definēt masku
-LotProductTooltip=Produkta kartē tiek pievienota opcija, lai noteiktu īpašu partijas numura masku
-SNProductTooltip=Produkta kartē tiek pievienota opcija, lai noteiktu īpašu sērijas numura masku
+CustomMasks=Option to define a different numbering mask for each product
+BatchLotNumberingModules=Numbering rule for automatic generation of lot number
+BatchSerialNumberingModules=Numbering rule for automatic generation of serial number (for products with property 1 unique lot/serial for each product)
 QtyToAddAfterBarcodeScan=Katram skenētajam svītrkodam / partijai / sērijai jāpievieno daudzums
 LifeTime=Mūža ilgums (dienās)
 EndOfLife=Dzīves beigas
diff --git a/htdocs/langs/lv_LV/products.lang b/htdocs/langs/lv_LV/products.lang
index e5a50f0a6ca..8e9255b5192 100644
--- a/htdocs/langs/lv_LV/products.lang
+++ b/htdocs/langs/lv_LV/products.lang
@@ -278,7 +278,7 @@ PriceCatalogue=Viena produkta/pakalpojuma pārdošanas cena
 PricingRule=Noteikumi par pārdošanas cenām
 AddCustomerPrice=Pievienot cenu katram klientam
 ForceUpdateChildPriceSoc=Nosakiet to pašu cenu klienta meitasuzņēmumiem
-PriceByCustomerLog=Log of previous customer prices
+PriceByCustomerLog=Iepriekšējo klientu cenu žurnāls
 MinimumPriceLimit=Minimum price can't be lower then %s
 MinimumRecommendedPrice=Minimālā ieteicamā cena ir: %s
 PriceExpressionEditor=Cenas izteiksmes redaktors
@@ -341,7 +341,7 @@ ProductSheet=Produkta lapa
 ServiceSheet=Servisa lapa
 PossibleValues=Iespējamās vērtības
 GoOnMenuToCreateVairants=Iet uz izvēlni %s - %s, lai sagatavotu atribūtu variantus (piemēram, krāsas, izmērs, ...)
-UseProductFournDesc=Pievienojiet funkciju, lai definētu pārdevēju definētos produktu aprakstus papildus aprakstiem klientiem
+UseProductFournDesc=Add a feature to define the descriptions of products defined by the vendors in addition to descriptions for customers
 ProductSupplierDescription=Produkta pārdevēja apraksts
 UseProductSupplierPackaging=Izmantojiet iepakojumu uz piegādātāju cenām (pārrēķiniet daudzumus atbilstoši iepakojumam, kas noteikts pēc piegādātāja cenas, pievienojot / atjauninot rindiņu piegādātāja dokumentos)
 PackagingForThisProduct=Iepakojums
diff --git a/htdocs/langs/lv_LV/projects.lang b/htdocs/langs/lv_LV/projects.lang
index 0391b4e8434..3ff332173e7 100644
--- a/htdocs/langs/lv_LV/projects.lang
+++ b/htdocs/langs/lv_LV/projects.lang
@@ -197,7 +197,7 @@ InputDetail=Ievades dati
 TimeAlreadyRecorded=Šis laiks ir jau ierakstīts šim uzdevumam / dienā un lietotājam %s
 ProjectsWithThisUserAsContact=Projects with this user as contact
 TasksWithThisUserAsContact=Tasks assigned to this user
-ResourceNotAssignedToProject=Not assigned to project
+ResourceNotAssignedToProject=Nav piešķirts projektam
 ResourceNotAssignedToTheTask=Uzdevumam nav piešķirts
 NoUserAssignedToTheProject=Neviens lietotājs nav piešķirts šim projektam
 TimeSpentBy=Pavadītais laiks
diff --git a/htdocs/langs/lv_LV/salaries.lang b/htdocs/langs/lv_LV/salaries.lang
index 711751a30b5..a3dba2545d9 100644
--- a/htdocs/langs/lv_LV/salaries.lang
+++ b/htdocs/langs/lv_LV/salaries.lang
@@ -17,8 +17,8 @@ TJM=Vidējā dienas likme
 CurrentSalary=Pašreizējā alga
 THMDescription=Šo vērtību var izmantot, lai aprēķinātu laiku, kas patērēts projektā, ko ievadījuši lietotāji, ja tiek izmantots modulis projekts
 TJMDescription=Šī vērtībai ir tikai informatīva un netiek izmantota aprēķiniem
-LastSalaries=Jaunākie %s algu maksājumi
-AllSalaries=Visi algu maksājumi
+LastSalaries=Jaunākās %s algas
+AllSalaries=Visas algas
 SalariesStatistics=Algas statistika
-# Export
 SalariesAndPayments=Algas un maksājumi
+ConfirmDeleteSalaryPayment=Vai vēlaties dzēst šo algas maksājumu?
diff --git a/htdocs/langs/lv_LV/supplier_proposal.lang b/htdocs/langs/lv_LV/supplier_proposal.lang
index cffb1a4b837..3c0f48cf394 100644
--- a/htdocs/langs/lv_LV/supplier_proposal.lang
+++ b/htdocs/langs/lv_LV/supplier_proposal.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
 SupplierProposal=Pārdevēja komerciālie priekšlikumi
-supplier_proposalDESC=Manage price requests to suppliers
+supplier_proposalDESC=Pārvaldiet cenu pieprasījumus piegādātājiem
 SupplierProposalNew=Jauns cenas pieprasījums
 CommRequest=Cenas pieprasījums
 CommRequests=Cenas pieprasījumi
diff --git a/htdocs/langs/lv_LV/suppliers.lang b/htdocs/langs/lv_LV/suppliers.lang
index e4a2d1ba3df..1282d01fc9a 100644
--- a/htdocs/langs/lv_LV/suppliers.lang
+++ b/htdocs/langs/lv_LV/suppliers.lang
@@ -36,7 +36,7 @@ ListOfSupplierProductForSupplier=Pārdevējs <b> %s </b> produktu un cenu saraks
 SentToSuppliers=Nosūtīts pārdevējiem
 ListOfSupplierOrders=Pirkumu pasūtījumu saraksts
 MenuOrdersSupplierToBill=Pirkuma pasūtījumi rēķinam
-NbDaysToDelivery=Piegādes termiņš (dienas)
+NbDaysToDelivery=Piegādes kavēšanās (dienas)
 DescNbDaysToDelivery=Šī pasūtījuma produktu ilgākais piegādes termiņš
 SupplierReputation=Pārdevēja reputācija
 ReferenceReputation=Atsauces reputācija
diff --git a/htdocs/langs/lv_LV/ticket.lang b/htdocs/langs/lv_LV/ticket.lang
index 72e4141fcde..bf5db8c3714 100644
--- a/htdocs/langs/lv_LV/ticket.lang
+++ b/htdocs/langs/lv_LV/ticket.lang
@@ -55,7 +55,7 @@ TypeContact_ticket_internal_SUPPORTTEC=Piešķirtais lietotājs
 TypeContact_ticket_external_SUPPORTCLI=Klientu kontaktu / incidentu izsekošana
 TypeContact_ticket_external_CONTRIBUTOR=Ārējais ieguldītājs
 
-OriginEmail=E-pasta reportieris
+OriginEmail=Reporter Email
 Notify_TICKET_SENTBYMAIL=Sūtīt biļeti pa e-pastu
 
 # Status
diff --git a/htdocs/langs/lv_LV/trips.lang b/htdocs/langs/lv_LV/trips.lang
index b6825952b39..98bbe5f7b42 100644
--- a/htdocs/langs/lv_LV/trips.lang
+++ b/htdocs/langs/lv_LV/trips.lang
@@ -103,7 +103,7 @@ ConfirmPaidTrip=Vai tiešām vēlaties mainīt šī izdevumu pārskata statusu u
 ConfirmCancelTrip=Vai tiešām vēlaties atcelt šo izdevumu pārskatu?
 BrouillonnerTrip=Move back expense report to status "Draft"
 ConfirmBrouillonnerTrip=Vai tiešām vēlaties pārvietot šo izdevumu pārskatu uz statusu "Melnraksts"?
-SaveTrip=Validate expense report
+SaveTrip=Apstiprināt izdevumu pārskatu
 ConfirmSaveTrip=Vai tiešām vēlaties apstiprināt šo izdevumu pārskatu?
 NoTripsToExportCSV=No expense report to export for this period.
 ExpenseReportPayment=Izdevumu pārskata maksājums
diff --git a/htdocs/langs/lv_LV/website.lang b/htdocs/langs/lv_LV/website.lang
index e70ddb84bac..d6dafec86f5 100644
--- a/htdocs/langs/lv_LV/website.lang
+++ b/htdocs/langs/lv_LV/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Pievienot vietni
 Webpage=Web lapa / konteiners
 AddPage=Pievienot lapu / konteineru
 PageContainer=Lappuse
-PreviewOfSiteNotYetAvailable=Jūsu vietnes <strong> %s </strong>priekšskatījums vēl nav pieejams. Vispirms jums ir <strong> Jāimportē pilnu vietnes veidni</strong> vai vienkārši <strong>Pievienot lapu/konteineru</strong>".
+PreviewOfSiteNotYetAvailable=Jūsu vietnes priekšskatījums <strong> %s </strong> vēl nav pieejams. Vispirms jums ir jāimportē '<strong> pilna vietnes veidne </strong>' vai vienkārši '<strong>. Pievienojiet lapu / konteineru </strong>'.
 RequestedPageHasNoContentYet=Pieprasītā lapa ar id %s vēl nav ievietota, vai kešatmiņas fails .tpl.php tika noņemts. Rediģējiet lapas saturu, lai to atrisinātu.
 SiteDeleted=Tīmekļa vietne '%s' dzēsta
 PageContent=Lapa / Konteiners
diff --git a/htdocs/langs/lv_LV/withdrawals.lang b/htdocs/langs/lv_LV/withdrawals.lang
index 1e31473dc70..a3f0468211a 100644
--- a/htdocs/langs/lv_LV/withdrawals.lang
+++ b/htdocs/langs/lv_LV/withdrawals.lang
@@ -103,7 +103,7 @@ WithdrawalFile=Debeta pasūtījuma fails
 CreditTransferFile=Kredīta pārveduma fails
 SetToStatusSent=Nomainīt uz statusu "Fails nosūtīts"
 ThisWillAlsoAddPaymentOnInvoice=Tas arī reģistrēs maksājumus rēķinos un klasificēs tos kā “Apmaksāts”, ja atlikušais maksājums būs spēkā neesošs
-StatisticsByLineStatus=Statistics by status of lines
+StatisticsByLineStatus=Statistika pēc līniju statusa
 RUM=RUM
 DateRUM=Pilnvaras parakstīšanas datums
 RUMLong=Unikāla pilnvaru atsauce
diff --git a/htdocs/langs/mk_MK/admin.lang b/htdocs/langs/mk_MK/admin.lang
index 29a97f8c307..bc4bcd92c5b 100644
--- a/htdocs/langs/mk_MK/admin.lang
+++ b/htdocs/langs/mk_MK/admin.lang
@@ -53,6 +53,7 @@ InternalUser=Internal user
 ExternalUser=External user
 InternalUsers=Internal users
 ExternalUsers=External users
+UserInterface=User interface
 GUISetup=Display
 SetupArea=Setup
 UploadNewTemplate=Upload new template(s)
@@ -1260,8 +1261,8 @@ YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP
 DownloadMoreSkins=More skins to download
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
-ShowProfIdInAddress=Show professional id with addresses
-ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
+ShowProfIdInAddress=Show professional ID with addresses
+ShowVATIntaInAddress=Hide intra-Community VAT number
 TranslationUncomplete=Partial translation
 MAIN_DISABLE_METEO=Disable meteorological view
 MeteoStdMod=Standard mode
@@ -1778,7 +1779,7 @@ ClickToDialSetup=Click To Dial module setup
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
 ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface, installed on the same computer as the browser, and called when you click on a link starting with "tel:" in your browser. If you need link that start with "sip:" or a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Point of Sale
 CashDeskSetup=Point of Sales module setup
@@ -2133,7 +2134,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
-NotRecommended=Not recommanded
+Recommended=Препорачано
+NotRecommended=Not recommended
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
@@ -2144,3 +2146,5 @@ YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You s
 RandomlySelectedIfSeveral=Randomly selected if several pictures are available
 DatabasePasswordObfuscated=Database password is obfuscated in conf file
 DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
+APIsAreNotEnabled=APIs modules are not enabled
+YouShouldSetThisToOff=You should set this to 0 or off
diff --git a/htdocs/langs/mk_MK/banks.lang b/htdocs/langs/mk_MK/banks.lang
index 6fafa0aeeb0..958aba13a6c 100644
--- a/htdocs/langs/mk_MK/banks.lang
+++ b/htdocs/langs/mk_MK/banks.lang
@@ -115,7 +115,7 @@ TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
 CheckTransmitter=Sender
 ValidateCheckReceipt=Validate this check receipt?
-ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes will be possible once validated.
 DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
diff --git a/htdocs/langs/mk_MK/boxes.lang b/htdocs/langs/mk_MK/boxes.lang
index e409bf6180a..a07e2f22528 100644
--- a/htdocs/langs/mk_MK/boxes.lang
+++ b/htdocs/langs/mk_MK/boxes.lang
@@ -91,8 +91,8 @@ BoxTitleLatestModifiedSupplierOrders=Нарачки на добавувачи: 
 BoxTitleLastModifiedCustomerBills=Фактури на клиенти: најнови %s измени
 BoxTitleLastModifiedCustomerOrders=Нарачки за продажба: најнови %s изменети
 BoxTitleLastModifiedPropals=Најнови %sизменети понуди
-BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
-BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
+BoxTitleLatestModifiedJobPositions=Latest %s modified job positions
+BoxTitleLatestModifiedCandidatures=Latest %s modified job applications
 ForCustomersInvoices=Фактури на клиенти
 ForCustomersOrders=Нарачки на клиенти
 ForProposals=Понуди
diff --git a/htdocs/langs/mk_MK/cashdesk.lang b/htdocs/langs/mk_MK/cashdesk.lang
index aea1f02f834..c9d0f7fcd0a 100644
--- a/htdocs/langs/mk_MK/cashdesk.lang
+++ b/htdocs/langs/mk_MK/cashdesk.lang
@@ -127,4 +127,4 @@ AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
 ShowPriceHT = Display the column with the price excluding tax (on screen)
-ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on the receipt)
diff --git a/htdocs/langs/mk_MK/errors.lang b/htdocs/langs/mk_MK/errors.lang
index 670f8c7a6bc..85b90ca4991 100644
--- a/htdocs/langs/mk_MK/errors.lang
+++ b/htdocs/langs/mk_MK/errors.lang
@@ -301,3 +301,4 @@ ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
 ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
+ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
diff --git a/htdocs/langs/mk_MK/eventorganization.lang b/htdocs/langs/mk_MK/eventorganization.lang
index d730e862879..cff9f3dbd41 100644
--- a/htdocs/langs/mk_MK/eventorganization.lang
+++ b/htdocs/langs/mk_MK/eventorganization.lang
@@ -86,6 +86,7 @@ DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
 SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
 SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
+NbVotes=Number of votes
 #
 # Status
 #
@@ -115,6 +116,9 @@ EvntOrgDuration = This conference starts on %s and ends on %s.
 ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
 BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
 EventType = Event type
+LabelOfBooth=Booth label
+LabelOfconference=Conference label
+ConferenceIsNotConfirmed=Subcription not available, conference is not confirmed yet
 
 #
 # Vote page
diff --git a/htdocs/langs/mk_MK/install.lang b/htdocs/langs/mk_MK/install.lang
index 3cd58c00c22..03a34b0fbca 100644
--- a/htdocs/langs/mk_MK/install.lang
+++ b/htdocs/langs/mk_MK/install.lang
@@ -206,6 +206,7 @@ MigrationUserPhotoPath=Migration of photo paths for users
 MigrationFieldsSocialNetworks=Migration of users fields social networks (%s)
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
+MigrationImportOrExportProfiles=Migration of import or export profiles (%s)
 ShowNotAvailableOptions=Show unavailable options
 HideNotAvailableOptions=Hide unavailable options
 ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
diff --git a/htdocs/langs/mk_MK/interventions.lang b/htdocs/langs/mk_MK/interventions.lang
index e5936f8246e..51079fca278 100644
--- a/htdocs/langs/mk_MK/interventions.lang
+++ b/htdocs/langs/mk_MK/interventions.lang
@@ -64,3 +64,5 @@ InterLineDuration=Line duration intervention
 InterLineDesc=Line description intervention
 RepeatableIntervention=Template of intervention
 ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
+Reopen=Reopen
+ConfirmReopenIntervention=Are you sure you want to open back the intervention <b>%s</b>?
diff --git a/htdocs/langs/mk_MK/productbatch.lang b/htdocs/langs/mk_MK/productbatch.lang
index 450d0285819..763af20c6b4 100644
--- a/htdocs/langs/mk_MK/productbatch.lang
+++ b/htdocs/langs/mk_MK/productbatch.lang
@@ -26,12 +26,10 @@ ShowLogOfMovementIfLot=Show log of movements for couple product/lot
 StockDetailPerBatch=Stock detail per lot
 SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
-BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
-BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
 ManageLotMask=Custom mask
-CustomMasks=Adds an option to define mask in the product card
-LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
-SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+CustomMasks=Option to define a different numbering mask for each product
+BatchLotNumberingModules=Numbering rule for automatic generation of lot number
+BatchSerialNumberingModules=Numbering rule for automatic generation of serial number (for products with property 1 unique lot/serial for each product)
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
diff --git a/htdocs/langs/mk_MK/products.lang b/htdocs/langs/mk_MK/products.lang
index 9836dd67f46..8c30e7fe98c 100644
--- a/htdocs/langs/mk_MK/products.lang
+++ b/htdocs/langs/mk_MK/products.lang
@@ -277,7 +277,7 @@ PriceByCustomer=Different prices for each customer
 PriceCatalogue=A single sell price per product/service
 PricingRule=Rules for selling prices
 AddCustomerPrice=Add price by customer
-ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
+ForceUpdateChildPriceSoc=Set same price on customer's subsidiaries
 PriceByCustomerLog=Log of previous customer prices
 MinimumPriceLimit=Minimum price can't be lower then %s
 MinimumRecommendedPrice=Minimum recommended price is: %s
@@ -296,6 +296,7 @@ ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Child products
 MinSupplierPrice=Minimum buying price
 MinCustomerPrice=Minimum selling price
+NoDynamicPrice=No dynamic price
 DynamicPriceConfiguration=Dynamic price configuration
 DynamicPriceDesc=You may define mathematical formulae to calculate Customer or Vendor prices. Such formulas can use all mathematical operators, some constants and variables. You can define here the variables you wish to use. If the variable needs an automatic update, you may define the external URL to allow Dolibarr to update the value automatically.
 AddVariable=Add Variable
diff --git a/htdocs/langs/mk_MK/salaries.lang b/htdocs/langs/mk_MK/salaries.lang
index 7c3c08a65bd..12905040b1a 100644
--- a/htdocs/langs/mk_MK/salaries.lang
+++ b/htdocs/langs/mk_MK/salaries.lang
@@ -2,20 +2,23 @@
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=By default, leave empty the option "Automatically create a total payment" when creating a Salary
 Salary=Salary
 Salaries=Salaries
-NewSalaryPayment=New salary payment
+NewSalary=New salary
+NewSalaryPayment=New salary card
 AddSalaryPayment=Add salary payment
 SalaryPayment=Salary payment
 SalariesPayments=Salaries payments
+SalariesPaymentsOf=Salaries payments of %s
 ShowSalaryPayment=Show salary payment
 THM=Average hourly rate
 TJM=Average daily rate
 CurrentSalary=Current salary
 THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
 TJMDescription=This value is currently for information only and is not used for any calculation
-LastSalaries=Latest %s salary payments
-AllSalaries=All salary payments
+LastSalaries=Latest %s salaries
+AllSalaries=All salaries
 SalariesStatistics=Salary statistics
-# Export
 SalariesAndPayments=Salaries and payments
+ConfirmDeleteSalaryPayment=Do you want to delete this salary payment ?
diff --git a/htdocs/langs/mk_MK/ticket.lang b/htdocs/langs/mk_MK/ticket.lang
index e440e748388..318e3eeaa00 100644
--- a/htdocs/langs/mk_MK/ticket.lang
+++ b/htdocs/langs/mk_MK/ticket.lang
@@ -34,7 +34,8 @@ TicketDictResolution=Ticket - Resolution
 
 TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
-TicketTypeShortISSUE=Issue, bug or problem
+TicketTypeShortISSUE=Issue or bug
+TicketTypeShortPROBLEM=Problem
 TicketTypeShortREQUEST=Change or enhancement request
 TicketTypeShortPROJET=Project
 TicketTypeShortOTHER=Other
@@ -54,14 +55,15 @@ TypeContact_ticket_internal_SUPPORTTEC=Assigned user
 TypeContact_ticket_external_SUPPORTCLI=Customer contact / incident tracking
 TypeContact_ticket_external_CONTRIBUTOR=External contributor
 
-OriginEmail=Email source
+OriginEmail=Reporter Email
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
 Read=Read
 Assigned=Assigned
 InProgress=In progress
-NeedMoreInformation=Waiting for information
+NeedMoreInformation=Waiting for reporter feedback
+NeedMoreInformationShort=Waiting for feedback
 Answered=Answered
 Waiting=Waiting
 Closed=Затворено
@@ -160,7 +162,7 @@ CreatedBy=Created by
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Group
+TicketCategory=Ticket categorization
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
@@ -211,6 +213,7 @@ TicketMessageHelp=Only this text will be saved in the message list on ticket car
 TicketMessageSubstitutionReplacedByGenericValues=Substitutions variables are replaced by generic values.
 TimeElapsedSince=Time elapsed since
 TicketTimeToRead=Time elapsed before read
+TicketTimeElapsedBeforeSince=Time elapsed before / since
 TicketContacts=Contacts ticket
 TicketDocumentsLinked=Documents linked to ticket
 ConfirmReOpenTicket=Confirm reopen this ticket ?
diff --git a/htdocs/langs/mk_MK/users.lang b/htdocs/langs/mk_MK/users.lang
index 372090ea5ad..6aeaf128838 100644
--- a/htdocs/langs/mk_MK/users.lang
+++ b/htdocs/langs/mk_MK/users.lang
@@ -97,8 +97,8 @@ LoginToCreate=Login to create
 NameToCreate=Name of third party to create
 YourRole=Your roles
 YourQuotaOfUsersIsReached=Your quota of active users is reached !
-NbOfUsers=No. of users
-NbOfPermissions=No. of permissions
+NbOfUsers=Number of users
+NbOfPermissions=Number of permissions
 DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin
 HierarchicalResponsible=Supervisor
 HierarchicView=Hierarchical view
diff --git a/htdocs/langs/mk_MK/website.lang b/htdocs/langs/mk_MK/website.lang
index 1e727415ec2..dc2ec2c0b3d 100644
--- a/htdocs/langs/mk_MK/website.lang
+++ b/htdocs/langs/mk_MK/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 PageContainer=Page
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
+PreviewOfSiteNotYetAvailable=The preview of your website <strong>%s</strong> is not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
diff --git a/htdocs/langs/mn_MN/admin.lang b/htdocs/langs/mn_MN/admin.lang
index be9aca94599..73004a3c8b1 100644
--- a/htdocs/langs/mn_MN/admin.lang
+++ b/htdocs/langs/mn_MN/admin.lang
@@ -53,6 +53,7 @@ InternalUser=Internal user
 ExternalUser=External user
 InternalUsers=Internal users
 ExternalUsers=External users
+UserInterface=User interface
 GUISetup=Display
 SetupArea=Setup
 UploadNewTemplate=Upload new template(s)
@@ -1260,8 +1261,8 @@ YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP
 DownloadMoreSkins=More skins to download
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
-ShowProfIdInAddress=Show professional id with addresses
-ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
+ShowProfIdInAddress=Show professional ID with addresses
+ShowVATIntaInAddress=Hide intra-Community VAT number
 TranslationUncomplete=Partial translation
 MAIN_DISABLE_METEO=Disable meteorological view
 MeteoStdMod=Standard mode
@@ -1778,7 +1779,7 @@ ClickToDialSetup=Click To Dial module setup
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
 ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface, installed on the same computer as the browser, and called when you click on a link starting with "tel:" in your browser. If you need link that start with "sip:" or a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Point of Sale
 CashDeskSetup=Point of Sales module setup
@@ -2133,7 +2134,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
-NotRecommended=Not recommanded
+Recommended=Recommended
+NotRecommended=Not recommended
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
@@ -2144,3 +2146,5 @@ YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You s
 RandomlySelectedIfSeveral=Randomly selected if several pictures are available
 DatabasePasswordObfuscated=Database password is obfuscated in conf file
 DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
+APIsAreNotEnabled=APIs modules are not enabled
+YouShouldSetThisToOff=You should set this to 0 or off
diff --git a/htdocs/langs/mn_MN/banks.lang b/htdocs/langs/mn_MN/banks.lang
index df7192bee25..a0b7942d446 100644
--- a/htdocs/langs/mn_MN/banks.lang
+++ b/htdocs/langs/mn_MN/banks.lang
@@ -115,7 +115,7 @@ TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
 CheckTransmitter=Sender
 ValidateCheckReceipt=Validate this check receipt?
-ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes will be possible once validated.
 DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
diff --git a/htdocs/langs/mn_MN/boxes.lang b/htdocs/langs/mn_MN/boxes.lang
index 0c9ea302fb8..710d49bfab6 100644
--- a/htdocs/langs/mn_MN/boxes.lang
+++ b/htdocs/langs/mn_MN/boxes.lang
@@ -91,8 +91,8 @@ BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
 BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
 BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
 BoxTitleLastModifiedPropals=Latest %s modified proposals
-BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
-BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
+BoxTitleLatestModifiedJobPositions=Latest %s modified job positions
+BoxTitleLatestModifiedCandidatures=Latest %s modified job applications
 ForCustomersInvoices=Customers invoices
 ForCustomersOrders=Customers orders
 ForProposals=Proposals
diff --git a/htdocs/langs/mn_MN/cashdesk.lang b/htdocs/langs/mn_MN/cashdesk.lang
index aea1f02f834..c9d0f7fcd0a 100644
--- a/htdocs/langs/mn_MN/cashdesk.lang
+++ b/htdocs/langs/mn_MN/cashdesk.lang
@@ -127,4 +127,4 @@ AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
 ShowPriceHT = Display the column with the price excluding tax (on screen)
-ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on the receipt)
diff --git a/htdocs/langs/mn_MN/errors.lang b/htdocs/langs/mn_MN/errors.lang
index 670f8c7a6bc..85b90ca4991 100644
--- a/htdocs/langs/mn_MN/errors.lang
+++ b/htdocs/langs/mn_MN/errors.lang
@@ -301,3 +301,4 @@ ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
 ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
+ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
diff --git a/htdocs/langs/mn_MN/eventorganization.lang b/htdocs/langs/mn_MN/eventorganization.lang
index 335c257b224..f361e6bc192 100644
--- a/htdocs/langs/mn_MN/eventorganization.lang
+++ b/htdocs/langs/mn_MN/eventorganization.lang
@@ -86,6 +86,7 @@ DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
 SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
 SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
+NbVotes=Number of votes
 #
 # Status
 #
@@ -115,6 +116,9 @@ EvntOrgDuration = This conference starts on %s and ends on %s.
 ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
 BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
 EventType = Event type
+LabelOfBooth=Booth label
+LabelOfconference=Conference label
+ConferenceIsNotConfirmed=Subcription not available, conference is not confirmed yet
 
 #
 # Vote page
diff --git a/htdocs/langs/mn_MN/install.lang b/htdocs/langs/mn_MN/install.lang
index 63947dad154..c1ffee936d7 100644
--- a/htdocs/langs/mn_MN/install.lang
+++ b/htdocs/langs/mn_MN/install.lang
@@ -206,6 +206,7 @@ MigrationUserPhotoPath=Migration of photo paths for users
 MigrationFieldsSocialNetworks=Migration of users fields social networks (%s)
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
+MigrationImportOrExportProfiles=Migration of import or export profiles (%s)
 ShowNotAvailableOptions=Show unavailable options
 HideNotAvailableOptions=Hide unavailable options
 ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
diff --git a/htdocs/langs/mn_MN/interventions.lang b/htdocs/langs/mn_MN/interventions.lang
index e5936f8246e..51079fca278 100644
--- a/htdocs/langs/mn_MN/interventions.lang
+++ b/htdocs/langs/mn_MN/interventions.lang
@@ -64,3 +64,5 @@ InterLineDuration=Line duration intervention
 InterLineDesc=Line description intervention
 RepeatableIntervention=Template of intervention
 ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
+Reopen=Reopen
+ConfirmReopenIntervention=Are you sure you want to open back the intervention <b>%s</b>?
diff --git a/htdocs/langs/mn_MN/productbatch.lang b/htdocs/langs/mn_MN/productbatch.lang
index 450d0285819..763af20c6b4 100644
--- a/htdocs/langs/mn_MN/productbatch.lang
+++ b/htdocs/langs/mn_MN/productbatch.lang
@@ -26,12 +26,10 @@ ShowLogOfMovementIfLot=Show log of movements for couple product/lot
 StockDetailPerBatch=Stock detail per lot
 SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
-BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
-BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
 ManageLotMask=Custom mask
-CustomMasks=Adds an option to define mask in the product card
-LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
-SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+CustomMasks=Option to define a different numbering mask for each product
+BatchLotNumberingModules=Numbering rule for automatic generation of lot number
+BatchSerialNumberingModules=Numbering rule for automatic generation of serial number (for products with property 1 unique lot/serial for each product)
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
diff --git a/htdocs/langs/mn_MN/products.lang b/htdocs/langs/mn_MN/products.lang
index 9638dfe5a25..fecbe7450c2 100644
--- a/htdocs/langs/mn_MN/products.lang
+++ b/htdocs/langs/mn_MN/products.lang
@@ -277,7 +277,7 @@ PriceByCustomer=Different prices for each customer
 PriceCatalogue=A single sell price per product/service
 PricingRule=Rules for selling prices
 AddCustomerPrice=Add price by customer
-ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
+ForceUpdateChildPriceSoc=Set same price on customer's subsidiaries
 PriceByCustomerLog=Log of previous customer prices
 MinimumPriceLimit=Minimum price can't be lower then %s
 MinimumRecommendedPrice=Minimum recommended price is: %s
@@ -296,6 +296,7 @@ ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Child products
 MinSupplierPrice=Minimum buying price
 MinCustomerPrice=Minimum selling price
+NoDynamicPrice=No dynamic price
 DynamicPriceConfiguration=Dynamic price configuration
 DynamicPriceDesc=You may define mathematical formulae to calculate Customer or Vendor prices. Such formulas can use all mathematical operators, some constants and variables. You can define here the variables you wish to use. If the variable needs an automatic update, you may define the external URL to allow Dolibarr to update the value automatically.
 AddVariable=Add Variable
diff --git a/htdocs/langs/mn_MN/salaries.lang b/htdocs/langs/mn_MN/salaries.lang
index 7c3c08a65bd..12905040b1a 100644
--- a/htdocs/langs/mn_MN/salaries.lang
+++ b/htdocs/langs/mn_MN/salaries.lang
@@ -2,20 +2,23 @@
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=By default, leave empty the option "Automatically create a total payment" when creating a Salary
 Salary=Salary
 Salaries=Salaries
-NewSalaryPayment=New salary payment
+NewSalary=New salary
+NewSalaryPayment=New salary card
 AddSalaryPayment=Add salary payment
 SalaryPayment=Salary payment
 SalariesPayments=Salaries payments
+SalariesPaymentsOf=Salaries payments of %s
 ShowSalaryPayment=Show salary payment
 THM=Average hourly rate
 TJM=Average daily rate
 CurrentSalary=Current salary
 THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
 TJMDescription=This value is currently for information only and is not used for any calculation
-LastSalaries=Latest %s salary payments
-AllSalaries=All salary payments
+LastSalaries=Latest %s salaries
+AllSalaries=All salaries
 SalariesStatistics=Salary statistics
-# Export
 SalariesAndPayments=Salaries and payments
+ConfirmDeleteSalaryPayment=Do you want to delete this salary payment ?
diff --git a/htdocs/langs/mn_MN/ticket.lang b/htdocs/langs/mn_MN/ticket.lang
index 1da32a5a99e..a1bed39c21d 100644
--- a/htdocs/langs/mn_MN/ticket.lang
+++ b/htdocs/langs/mn_MN/ticket.lang
@@ -34,7 +34,8 @@ TicketDictResolution=Ticket - Resolution
 
 TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
-TicketTypeShortISSUE=Issue, bug or problem
+TicketTypeShortISSUE=Issue or bug
+TicketTypeShortPROBLEM=Problem
 TicketTypeShortREQUEST=Change or enhancement request
 TicketTypeShortPROJET=Project
 TicketTypeShortOTHER=Other
@@ -54,14 +55,15 @@ TypeContact_ticket_internal_SUPPORTTEC=Assigned user
 TypeContact_ticket_external_SUPPORTCLI=Customer contact / incident tracking
 TypeContact_ticket_external_CONTRIBUTOR=External contributor
 
-OriginEmail=Email source
+OriginEmail=Reporter Email
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
 Read=Read
 Assigned=Assigned
 InProgress=In progress
-NeedMoreInformation=Waiting for information
+NeedMoreInformation=Waiting for reporter feedback
+NeedMoreInformationShort=Waiting for feedback
 Answered=Answered
 Waiting=Waiting
 Closed=Closed
@@ -160,7 +162,7 @@ CreatedBy=Created by
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Group
+TicketCategory=Ticket categorization
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
@@ -211,6 +213,7 @@ TicketMessageHelp=Only this text will be saved in the message list on ticket car
 TicketMessageSubstitutionReplacedByGenericValues=Substitutions variables are replaced by generic values.
 TimeElapsedSince=Time elapsed since
 TicketTimeToRead=Time elapsed before read
+TicketTimeElapsedBeforeSince=Time elapsed before / since
 TicketContacts=Contacts ticket
 TicketDocumentsLinked=Documents linked to ticket
 ConfirmReOpenTicket=Confirm reopen this ticket ?
diff --git a/htdocs/langs/mn_MN/users.lang b/htdocs/langs/mn_MN/users.lang
index 372090ea5ad..6aeaf128838 100644
--- a/htdocs/langs/mn_MN/users.lang
+++ b/htdocs/langs/mn_MN/users.lang
@@ -97,8 +97,8 @@ LoginToCreate=Login to create
 NameToCreate=Name of third party to create
 YourRole=Your roles
 YourQuotaOfUsersIsReached=Your quota of active users is reached !
-NbOfUsers=No. of users
-NbOfPermissions=No. of permissions
+NbOfUsers=Number of users
+NbOfPermissions=Number of permissions
 DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin
 HierarchicalResponsible=Supervisor
 HierarchicView=Hierarchical view
diff --git a/htdocs/langs/mn_MN/website.lang b/htdocs/langs/mn_MN/website.lang
index 1e727415ec2..dc2ec2c0b3d 100644
--- a/htdocs/langs/mn_MN/website.lang
+++ b/htdocs/langs/mn_MN/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 PageContainer=Page
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
+PreviewOfSiteNotYetAvailable=The preview of your website <strong>%s</strong> is not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
diff --git a/htdocs/langs/nb_NO/admin.lang b/htdocs/langs/nb_NO/admin.lang
index e8e50b9211d..1a58115e455 100644
--- a/htdocs/langs/nb_NO/admin.lang
+++ b/htdocs/langs/nb_NO/admin.lang
@@ -53,6 +53,7 @@ InternalUser=Intern bruker
 ExternalUser=Ekstern bruker
 InternalUsers=Interne brukere
 ExternalUsers=Eksterne brukere
+UserInterface=User interface
 GUISetup=Visning
 SetupArea=Oppsett
 UploadNewTemplate=Last opp ny mal(er)
@@ -1260,8 +1261,8 @@ YourPHPDoesNotHaveSSLSupport=SSL funksjoner ikke tilgjengelige i din PHP
 DownloadMoreSkins=Flere skins å laste ned
 SimpleNumRefModelDesc=Returnerer referansenummeret i formatet %syymm-nnnn der yy er året, mm er måneden og nnnn er et sekvensielt automatisk økende nummer uten nullstilling
 SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
-ShowProfIdInAddress=Vis Profesjonell ID med adresser
-ShowVATIntaInAddress=Skjul intra-Community MVA-numre med adresse
+ShowProfIdInAddress=Show professional ID with addresses
+ShowVATIntaInAddress=Hide intra-Community VAT number
 TranslationUncomplete=Delvis oversettelse
 MAIN_DISABLE_METEO=Deaktiver meteorologisk visning
 MeteoStdMod=Standardmodus
@@ -1778,7 +1779,7 @@ ClickToDialSetup='Click To Dial' modul
 ClickToDialUrlDesc=Url som kalles når man klikker på telefonpiktogrammet. I URL kan du bruke koder <br> <b> __ PHONETO __ </b> som blir erstattet med telefonnummeret til personen som skal ringes <br> <b> __ PHONEFROM __ </b> som blir erstattet med telefonnummeret til den som ringer(din) <br> <b> __ LOGIN __ </b> som vil bli erstattet med clicktodial login (definert på brukerkort) <br> <b> __ PASS __ </b> som vil bli erstattet med clicktodial passord (definert på brukerkort).
 ClickToDialDesc=Denne modulen endrer telefonnumre, når du bruker en datamaskin, til klikkbare lenker. Et klikk vil ringe nummeret. Dette kan brukes til å starte telefonsamtalen når du har en telefon på skrivebordet eller når du for eksempel bruker et CTI-system basert på SIP-protokoll. Merk: Når du bruker en smarttelefon, er telefonnumre alltid klikkbare.
 ClickToDialUseTelLink=Bruk kun en lenke "tlf:" for telefonnumre
-ClickToDialUseTelLinkDesc=Bruk denne metoden hvis brukerne har en softphone eller et programvaregrensesnitt installert på samme datamaskin som nettleseren, og kalles når du klikker på en link i nettleseren din som starter med "tel:". Hvis du trenger en full server-løsning (uten behov for lokal installasjon av programvare), må du sette denne på "Nei" og fylle neste felt.
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface, installed on the same computer as the browser, and called when you click on a link starting with "tel:" in your browser. If you need link that start with "sip:" or a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Utsalgssted
 CashDeskSetup=Oppsett av modulen Salgssted
@@ -2133,7 +2134,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=Ingen skrivbare filer eller kataloger for de vanlige programmene ble funnet i rotkatalogen din (Bra)
 RecommendedValueIs=Anbefalt: %s
-NotRecommended=Not recommanded
+Recommended=Anbefalt
+NotRecommended=Not recommended
 ARestrictedPath=En begrenset sti
 CheckForModuleUpdate=Se etter oppdateringer for eksterne moduler
 CheckForModuleUpdateHelp=Denne handlingen kobles til editorer for eksterne moduler for å sjekke om en ny versjon er tilgjengelig.
@@ -2144,3 +2146,5 @@ YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You s
 RandomlySelectedIfSeveral=Randomly selected if several pictures are available
 DatabasePasswordObfuscated=Database password is obfuscated in conf file
 DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
+APIsAreNotEnabled=APIs modules are not enabled
+YouShouldSetThisToOff=You should set this to 0 or off
diff --git a/htdocs/langs/nb_NO/banks.lang b/htdocs/langs/nb_NO/banks.lang
index 029b2ec2c07..418ae40856b 100644
--- a/htdocs/langs/nb_NO/banks.lang
+++ b/htdocs/langs/nb_NO/banks.lang
@@ -115,7 +115,7 @@ TransferTo=Til
 TransferFromToDone=En overføring fra <b>%s</b> til <b>%s</b> på <b>%s</b> %s er registrert.
 CheckTransmitter=Avsender
 ValidateCheckReceipt=Valider sjekkvittering?
-ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes will be possible once validated.
 DeleteCheckReceipt=Slett denne sjekkvitteringen?
 ConfirmDeleteCheckReceipt=Er du sikker på at du vil slette denne sjekkvitteringen?
 BankChecks=Banksjekker
diff --git a/htdocs/langs/nb_NO/boxes.lang b/htdocs/langs/nb_NO/boxes.lang
index 603a4696a2a..7e5fcadac57 100644
--- a/htdocs/langs/nb_NO/boxes.lang
+++ b/htdocs/langs/nb_NO/boxes.lang
@@ -91,8 +91,8 @@ BoxTitleLatestModifiedSupplierOrders=Leverandørordre: siste %s endret
 BoxTitleLastModifiedCustomerBills=Kundefakturaer: siste %s endret
 BoxTitleLastModifiedCustomerOrders=Salgsordre: siste %s endret
 BoxTitleLastModifiedPropals=Siste %s endrede tilbud
-BoxTitleLatestModifiedJobPositions=Siste %s endrede jobber
-BoxTitleLatestModifiedCandidatures=Siste %s endrede kandidaturer
+BoxTitleLatestModifiedJobPositions=Latest %s modified job positions
+BoxTitleLatestModifiedCandidatures=Latest %s modified job applications
 ForCustomersInvoices=Kundefakturaer
 ForCustomersOrders=Kundeordrer
 ForProposals=Tilbud
diff --git a/htdocs/langs/nb_NO/cashdesk.lang b/htdocs/langs/nb_NO/cashdesk.lang
index 1abc49531f6..93ba2e673cc 100644
--- a/htdocs/langs/nb_NO/cashdesk.lang
+++ b/htdocs/langs/nb_NO/cashdesk.lang
@@ -127,4 +127,4 @@ AllowDelayedPayment=Tillat forsinket betaling
 PrintPaymentMethodOnReceipts=Skriv ut betalingsmåte på billetter/kvitteringer
 WeighingScale=Vektskala
 ShowPriceHT = Display the column with the price excluding tax (on screen)
-ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on the receipt)
diff --git a/htdocs/langs/nb_NO/errors.lang b/htdocs/langs/nb_NO/errors.lang
index 6e4e212865c..042cf8687de 100644
--- a/htdocs/langs/nb_NO/errors.lang
+++ b/htdocs/langs/nb_NO/errors.lang
@@ -301,3 +301,4 @@ ErrorActionCommPropertyUserowneridNotDefined=Brukerens eier kreves
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Versjonskontroll mislyktes
 ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
+ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
diff --git a/htdocs/langs/nb_NO/eventorganization.lang b/htdocs/langs/nb_NO/eventorganization.lang
index dd108fff257..b0fa38fb7f7 100644
--- a/htdocs/langs/nb_NO/eventorganization.lang
+++ b/htdocs/langs/nb_NO/eventorganization.lang
@@ -86,6 +86,7 @@ DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
 SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
 SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
+NbVotes=Number of votes
 #
 # Status
 #
@@ -115,6 +116,9 @@ EvntOrgDuration = This conference starts on %s and ends on %s.
 ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
 BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
 EventType = Hendelsestype
+LabelOfBooth=Booth label
+LabelOfconference=Conference label
+ConferenceIsNotConfirmed=Subcription not available, conference is not confirmed yet
 
 #
 # Vote page
diff --git a/htdocs/langs/nb_NO/install.lang b/htdocs/langs/nb_NO/install.lang
index d47d9658a94..ac378cd1115 100644
--- a/htdocs/langs/nb_NO/install.lang
+++ b/htdocs/langs/nb_NO/install.lang
@@ -206,6 +206,7 @@ MigrationUserPhotoPath=Migrering av foto-stier for brukere
 MigrationFieldsSocialNetworks=Migrering av felt med brukeres sosiale nettverk (%s)
 MigrationReloadModule=Last inn modulen %s på nytt
 MigrationResetBlockedLog=Tilbakestill modul BlockedLog for v7 algoritme
+MigrationImportOrExportProfiles=Migration of import or export profiles (%s)
 ShowNotAvailableOptions=Vis utilgjengelige alternativer
 HideNotAvailableOptions=Skjul utilgjengelige alternativer
 ErrorFoundDuringMigration=Feil ble rapportert under migreringsprosessen, slik at neste trinn ikke er tilgjengelig. For å ignorere feil kan du <a href="%s"> klikke her </a>, men programmet eller noen funksjoner fungerer kanskje ikke riktig før feilene er løst.
diff --git a/htdocs/langs/nb_NO/interventions.lang b/htdocs/langs/nb_NO/interventions.lang
index 58aea37b932..a4a259f3f85 100644
--- a/htdocs/langs/nb_NO/interventions.lang
+++ b/htdocs/langs/nb_NO/interventions.lang
@@ -41,9 +41,7 @@ InterventionsArea=Område for intervensjoner
 DraftFichinter=Intervensjonskladder
 LastModifiedInterventions=Siste %s endrede intervensjoner
 FichinterToProcess=Intervensjoner å prosessere
-##### Types de contacts #####
 TypeContact_fichinter_external_CUSTOMER=Ansvarlig for kundeoppfølging
-# Modele numérotation
 PrintProductsOnFichinter=Skriv også ut linjer med type "produkt" (ikke bare tjenester) på intervensjonskort
 PrintProductsOnFichinterDetails=intervensjoner generert fra ordre
 UseServicesDurationOnFichinter=Bruk tjenestevarighet for intervensjoner som genereres fra bestillinger
@@ -53,7 +51,6 @@ InterventionStatistics=Statistikk over intervensjoner
 NbOfinterventions=Antall intervensjonskort
 NumberOfInterventionsByMonth=Antall intervensjonskort etter måned (dato for validering)
 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.
 InterDateCreation=Dato for opprettelse av intervensjon
@@ -65,3 +62,7 @@ InterLineId=Intervensjon Linje-ID
 InterLineDate=Intervensjonsdato-linje
 InterLineDuration=Intervensjonsvarighet-linje
 InterLineDesc=Intervensjonsbeskrivelse-linje
+RepeatableIntervention=Intervensjon-mal
+ToCreateAPredefinedIntervention=Hvis du vil lage et forhåndsdefinert eller tilbakevendende intervensjon, oppretter du en vanlig intervensjon og konverterer den til intervensjonsmal
+Reopen=Gjenåpne
+ConfirmReopenIntervention=Er du sikker på at du vil gjenåpne intervensjonen <b> %s </b>?
diff --git a/htdocs/langs/nb_NO/productbatch.lang b/htdocs/langs/nb_NO/productbatch.lang
index 9647a6779ef..df65b288a00 100644
--- a/htdocs/langs/nb_NO/productbatch.lang
+++ b/htdocs/langs/nb_NO/productbatch.lang
@@ -26,12 +26,10 @@ ShowLogOfMovementIfLot=Vis logg over bevegelser for vare/lot
 StockDetailPerBatch=Varedetaljer pr. lot
 SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
-BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
-BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
 ManageLotMask=Custom mask
-CustomMasks=Adds an option to define mask in the product card
-LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
-SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+CustomMasks=Option to define a different numbering mask for each product
+BatchLotNumberingModules=Numbering rule for automatic generation of lot number
+BatchSerialNumberingModules=Numbering rule for automatic generation of serial number (for products with property 1 unique lot/serial for each product)
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
diff --git a/htdocs/langs/nb_NO/products.lang b/htdocs/langs/nb_NO/products.lang
index e024907be49..d42402c3ca4 100644
--- a/htdocs/langs/nb_NO/products.lang
+++ b/htdocs/langs/nb_NO/products.lang
@@ -277,7 +277,7 @@ PriceByCustomer=Ulike priser for hver kunde
 PriceCatalogue=En enkelt salgspris for hver vare/tjeneste
 PricingRule=Regler for utsalgspriser
 AddCustomerPrice=Legg til pris for kunde
-ForceUpdateChildPriceSoc=Sett samme pris for kundens datterselskaper
+ForceUpdateChildPriceSoc=Set same price on customer's subsidiaries
 PriceByCustomerLog=Logg over tidligere kundepriser
 MinimumPriceLimit=Minstepris kan ikke være lavere enn %s
 MinimumRecommendedPrice=Minimum anbefalt pris er: %s
@@ -296,6 +296,7 @@ ComposedProductIncDecStock=Øk/minsk beholdning ved overordnet endring
 ComposedProduct=Sub-varer
 MinSupplierPrice=Laveste innkjøpspris
 MinCustomerPrice=Minste salgspris
+NoDynamicPrice=No dynamic price
 DynamicPriceConfiguration=Dynamisk pris-konfigurering
 DynamicPriceDesc=Du kan definere matematiske formler for å beregne kunde- eller leverandørpriser. Slike formler kan bruke alle matematiske operatører, noen konstanter og variabler. Du kan definere variablene du vil bruke. Hvis variabelen trenger en automatisk oppdatering, kan du definere den eksterne nettadressen for å tillate Dolibarr å oppdatere verdien automatisk.
 AddVariable=Legg til variabel
diff --git a/htdocs/langs/nb_NO/salaries.lang b/htdocs/langs/nb_NO/salaries.lang
index 7563b5dfa81..aac94b25cf6 100644
--- a/htdocs/langs/nb_NO/salaries.lang
+++ b/htdocs/langs/nb_NO/salaries.lang
@@ -17,8 +17,8 @@ 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
+LastSalaries=Latest %s salaries
+AllSalaries=All salaries
 SalariesStatistics=Lønnsstatistikk
-# Export
 SalariesAndPayments=Lønn og utbetalinger
+ConfirmDeleteSalaryPayment=Do you want to delete this salary payment ?
diff --git a/htdocs/langs/nb_NO/ticket.lang b/htdocs/langs/nb_NO/ticket.lang
index 109831e3f93..1141b9b3bd0 100644
--- a/htdocs/langs/nb_NO/ticket.lang
+++ b/htdocs/langs/nb_NO/ticket.lang
@@ -34,7 +34,8 @@ TicketDictResolution=Billett - Løsning
 
 TicketTypeShortCOM=Prisforespørsel
 TicketTypeShortHELP=Be om funksjonell hjelp
-TicketTypeShortISSUE=Problem eller feil
+TicketTypeShortISSUE=Issue or bug
+TicketTypeShortPROBLEM=Problem
 TicketTypeShortREQUEST=Endring- eller forbedringsforespørsel
 TicketTypeShortPROJET=Prosjekt
 TicketTypeShortOTHER=Annet
@@ -54,14 +55,15 @@ TypeContact_ticket_internal_SUPPORTTEC=Tilordnet bruker
 TypeContact_ticket_external_SUPPORTCLI=Kundekontakt / hendelsessporing
 TypeContact_ticket_external_CONTRIBUTOR=Ekstern bidragsyter
 
-OriginEmail=Epostkilde
+OriginEmail=Reporter Email
 Notify_TICKET_SENTBYMAIL=Send billettmelding via e-post
 
 # Status
 Read=Les
 Assigned=Tildelt
 InProgress=Pågår
-NeedMoreInformation=Venter på informasjon
+NeedMoreInformation=Waiting for reporter feedback
+NeedMoreInformationShort=Waiting for feedback
 Answered=Besvarte
 Waiting=Venter
 Closed=Lukket
@@ -160,7 +162,7 @@ CreatedBy=Laget av
 NewTicket=Ny supportseddel
 SubjectAnswerToTicket=Supportseddel-svar
 TicketTypeRequest=Forespørselstype
-TicketCategory=Gruppe
+TicketCategory=Ticket categorization
 SeeTicket=Se supportseddel
 TicketMarkedAsRead=Supportseddel merket som lest
 TicketReadOn=Les videre
@@ -211,6 +213,7 @@ TicketMessageHelp=Kun denne teksten blir lagret i meldingslisten på supportsedd
 TicketMessageSubstitutionReplacedByGenericValues=Substitusjonsvariabler erstattes av generiske verdier.
 TimeElapsedSince=Tid forløpt siden
 TicketTimeToRead=Tid forløpt før lesing
+TicketTimeElapsedBeforeSince=Time elapsed before / since
 TicketContacts=Kontakter supportseddel
 TicketDocumentsLinked=Dokumenter knyttet til supportseddel 
 ConfirmReOpenTicket=Bekreft gjenåpning av denne supportseddelen?
diff --git a/htdocs/langs/nb_NO/users.lang b/htdocs/langs/nb_NO/users.lang
index 8ecf4d171cc..228e1b15c28 100644
--- a/htdocs/langs/nb_NO/users.lang
+++ b/htdocs/langs/nb_NO/users.lang
@@ -97,8 +97,8 @@ LoginToCreate=Brukernavn å opprette
 NameToCreate=Navn på tredjepart til å lage
 YourRole=Dine roller
 YourQuotaOfUsersIsReached=Din kvote på aktive brukere er nådd!
-NbOfUsers=Antall brukere
-NbOfPermissions=Antall tillatelser
+NbOfUsers=Number of users
+NbOfPermissions=Number of permissions
 DontDowngradeSuperAdmin=Bare en superadmin kan nedgradere en superadmin
 HierarchicalResponsible=Veileder
 HierarchicView=Hierarkisk visning
diff --git a/htdocs/langs/nb_NO/website.lang b/htdocs/langs/nb_NO/website.lang
index ab69847b14d..4003a18b648 100644
--- a/htdocs/langs/nb_NO/website.lang
+++ b/htdocs/langs/nb_NO/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Legg til nettside
 Webpage=Nettsted/container
 AddPage=Legg til side/container
 PageContainer=Side
-PreviewOfSiteNotYetAvailable=Forhåndsvisning av nettstedet ditt <strong> %s </strong> ennå ikke tilgjengelig. Du må først '<strong> Importer en full nettsidemal </strong>' eller bare '<strong> Legg til en side/container </strong>'.
+PreviewOfSiteNotYetAvailable=The preview of your website <strong>%s</strong> is not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Forespurt side med id %s har ikke noe innhold enda, eller cachefilen .tpl.php ble fjernet. Rediger innhold på siden for å løse dette.
 SiteDeleted=Nettstedet '%s' slettet
 PageContent=Side/Container
diff --git a/htdocs/langs/ne_NP/admin.lang b/htdocs/langs/ne_NP/admin.lang
index be9aca94599..73004a3c8b1 100644
--- a/htdocs/langs/ne_NP/admin.lang
+++ b/htdocs/langs/ne_NP/admin.lang
@@ -53,6 +53,7 @@ InternalUser=Internal user
 ExternalUser=External user
 InternalUsers=Internal users
 ExternalUsers=External users
+UserInterface=User interface
 GUISetup=Display
 SetupArea=Setup
 UploadNewTemplate=Upload new template(s)
@@ -1260,8 +1261,8 @@ YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP
 DownloadMoreSkins=More skins to download
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
-ShowProfIdInAddress=Show professional id with addresses
-ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
+ShowProfIdInAddress=Show professional ID with addresses
+ShowVATIntaInAddress=Hide intra-Community VAT number
 TranslationUncomplete=Partial translation
 MAIN_DISABLE_METEO=Disable meteorological view
 MeteoStdMod=Standard mode
@@ -1778,7 +1779,7 @@ ClickToDialSetup=Click To Dial module setup
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
 ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface, installed on the same computer as the browser, and called when you click on a link starting with "tel:" in your browser. If you need link that start with "sip:" or a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Point of Sale
 CashDeskSetup=Point of Sales module setup
@@ -2133,7 +2134,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
-NotRecommended=Not recommanded
+Recommended=Recommended
+NotRecommended=Not recommended
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
@@ -2144,3 +2146,5 @@ YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You s
 RandomlySelectedIfSeveral=Randomly selected if several pictures are available
 DatabasePasswordObfuscated=Database password is obfuscated in conf file
 DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
+APIsAreNotEnabled=APIs modules are not enabled
+YouShouldSetThisToOff=You should set this to 0 or off
diff --git a/htdocs/langs/ne_NP/banks.lang b/htdocs/langs/ne_NP/banks.lang
index df7192bee25..a0b7942d446 100644
--- a/htdocs/langs/ne_NP/banks.lang
+++ b/htdocs/langs/ne_NP/banks.lang
@@ -115,7 +115,7 @@ TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
 CheckTransmitter=Sender
 ValidateCheckReceipt=Validate this check receipt?
-ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes will be possible once validated.
 DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
diff --git a/htdocs/langs/ne_NP/boxes.lang b/htdocs/langs/ne_NP/boxes.lang
index 0c9ea302fb8..710d49bfab6 100644
--- a/htdocs/langs/ne_NP/boxes.lang
+++ b/htdocs/langs/ne_NP/boxes.lang
@@ -91,8 +91,8 @@ BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
 BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
 BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
 BoxTitleLastModifiedPropals=Latest %s modified proposals
-BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
-BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
+BoxTitleLatestModifiedJobPositions=Latest %s modified job positions
+BoxTitleLatestModifiedCandidatures=Latest %s modified job applications
 ForCustomersInvoices=Customers invoices
 ForCustomersOrders=Customers orders
 ForProposals=Proposals
diff --git a/htdocs/langs/ne_NP/cashdesk.lang b/htdocs/langs/ne_NP/cashdesk.lang
index aea1f02f834..c9d0f7fcd0a 100644
--- a/htdocs/langs/ne_NP/cashdesk.lang
+++ b/htdocs/langs/ne_NP/cashdesk.lang
@@ -127,4 +127,4 @@ AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
 ShowPriceHT = Display the column with the price excluding tax (on screen)
-ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on the receipt)
diff --git a/htdocs/langs/ne_NP/errors.lang b/htdocs/langs/ne_NP/errors.lang
index 670f8c7a6bc..85b90ca4991 100644
--- a/htdocs/langs/ne_NP/errors.lang
+++ b/htdocs/langs/ne_NP/errors.lang
@@ -301,3 +301,4 @@ ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
 ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
+ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
diff --git a/htdocs/langs/ne_NP/eventorganization.lang b/htdocs/langs/ne_NP/eventorganization.lang
index 335c257b224..f361e6bc192 100644
--- a/htdocs/langs/ne_NP/eventorganization.lang
+++ b/htdocs/langs/ne_NP/eventorganization.lang
@@ -86,6 +86,7 @@ DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
 SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
 SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
+NbVotes=Number of votes
 #
 # Status
 #
@@ -115,6 +116,9 @@ EvntOrgDuration = This conference starts on %s and ends on %s.
 ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
 BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
 EventType = Event type
+LabelOfBooth=Booth label
+LabelOfconference=Conference label
+ConferenceIsNotConfirmed=Subcription not available, conference is not confirmed yet
 
 #
 # Vote page
diff --git a/htdocs/langs/ne_NP/install.lang b/htdocs/langs/ne_NP/install.lang
index 63947dad154..c1ffee936d7 100644
--- a/htdocs/langs/ne_NP/install.lang
+++ b/htdocs/langs/ne_NP/install.lang
@@ -206,6 +206,7 @@ MigrationUserPhotoPath=Migration of photo paths for users
 MigrationFieldsSocialNetworks=Migration of users fields social networks (%s)
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
+MigrationImportOrExportProfiles=Migration of import or export profiles (%s)
 ShowNotAvailableOptions=Show unavailable options
 HideNotAvailableOptions=Hide unavailable options
 ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
diff --git a/htdocs/langs/ne_NP/interventions.lang b/htdocs/langs/ne_NP/interventions.lang
index e5936f8246e..51079fca278 100644
--- a/htdocs/langs/ne_NP/interventions.lang
+++ b/htdocs/langs/ne_NP/interventions.lang
@@ -64,3 +64,5 @@ InterLineDuration=Line duration intervention
 InterLineDesc=Line description intervention
 RepeatableIntervention=Template of intervention
 ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
+Reopen=Reopen
+ConfirmReopenIntervention=Are you sure you want to open back the intervention <b>%s</b>?
diff --git a/htdocs/langs/ne_NP/productbatch.lang b/htdocs/langs/ne_NP/productbatch.lang
index 450d0285819..763af20c6b4 100644
--- a/htdocs/langs/ne_NP/productbatch.lang
+++ b/htdocs/langs/ne_NP/productbatch.lang
@@ -26,12 +26,10 @@ ShowLogOfMovementIfLot=Show log of movements for couple product/lot
 StockDetailPerBatch=Stock detail per lot
 SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
-BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
-BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
 ManageLotMask=Custom mask
-CustomMasks=Adds an option to define mask in the product card
-LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
-SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+CustomMasks=Option to define a different numbering mask for each product
+BatchLotNumberingModules=Numbering rule for automatic generation of lot number
+BatchSerialNumberingModules=Numbering rule for automatic generation of serial number (for products with property 1 unique lot/serial for each product)
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
diff --git a/htdocs/langs/ne_NP/products.lang b/htdocs/langs/ne_NP/products.lang
index 9638dfe5a25..fecbe7450c2 100644
--- a/htdocs/langs/ne_NP/products.lang
+++ b/htdocs/langs/ne_NP/products.lang
@@ -277,7 +277,7 @@ PriceByCustomer=Different prices for each customer
 PriceCatalogue=A single sell price per product/service
 PricingRule=Rules for selling prices
 AddCustomerPrice=Add price by customer
-ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
+ForceUpdateChildPriceSoc=Set same price on customer's subsidiaries
 PriceByCustomerLog=Log of previous customer prices
 MinimumPriceLimit=Minimum price can't be lower then %s
 MinimumRecommendedPrice=Minimum recommended price is: %s
@@ -296,6 +296,7 @@ ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Child products
 MinSupplierPrice=Minimum buying price
 MinCustomerPrice=Minimum selling price
+NoDynamicPrice=No dynamic price
 DynamicPriceConfiguration=Dynamic price configuration
 DynamicPriceDesc=You may define mathematical formulae to calculate Customer or Vendor prices. Such formulas can use all mathematical operators, some constants and variables. You can define here the variables you wish to use. If the variable needs an automatic update, you may define the external URL to allow Dolibarr to update the value automatically.
 AddVariable=Add Variable
diff --git a/htdocs/langs/ne_NP/salaries.lang b/htdocs/langs/ne_NP/salaries.lang
index 7c3c08a65bd..12905040b1a 100644
--- a/htdocs/langs/ne_NP/salaries.lang
+++ b/htdocs/langs/ne_NP/salaries.lang
@@ -2,20 +2,23 @@
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=By default, leave empty the option "Automatically create a total payment" when creating a Salary
 Salary=Salary
 Salaries=Salaries
-NewSalaryPayment=New salary payment
+NewSalary=New salary
+NewSalaryPayment=New salary card
 AddSalaryPayment=Add salary payment
 SalaryPayment=Salary payment
 SalariesPayments=Salaries payments
+SalariesPaymentsOf=Salaries payments of %s
 ShowSalaryPayment=Show salary payment
 THM=Average hourly rate
 TJM=Average daily rate
 CurrentSalary=Current salary
 THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
 TJMDescription=This value is currently for information only and is not used for any calculation
-LastSalaries=Latest %s salary payments
-AllSalaries=All salary payments
+LastSalaries=Latest %s salaries
+AllSalaries=All salaries
 SalariesStatistics=Salary statistics
-# Export
 SalariesAndPayments=Salaries and payments
+ConfirmDeleteSalaryPayment=Do you want to delete this salary payment ?
diff --git a/htdocs/langs/ne_NP/ticket.lang b/htdocs/langs/ne_NP/ticket.lang
index 1da32a5a99e..a1bed39c21d 100644
--- a/htdocs/langs/ne_NP/ticket.lang
+++ b/htdocs/langs/ne_NP/ticket.lang
@@ -34,7 +34,8 @@ TicketDictResolution=Ticket - Resolution
 
 TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
-TicketTypeShortISSUE=Issue, bug or problem
+TicketTypeShortISSUE=Issue or bug
+TicketTypeShortPROBLEM=Problem
 TicketTypeShortREQUEST=Change or enhancement request
 TicketTypeShortPROJET=Project
 TicketTypeShortOTHER=Other
@@ -54,14 +55,15 @@ TypeContact_ticket_internal_SUPPORTTEC=Assigned user
 TypeContact_ticket_external_SUPPORTCLI=Customer contact / incident tracking
 TypeContact_ticket_external_CONTRIBUTOR=External contributor
 
-OriginEmail=Email source
+OriginEmail=Reporter Email
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
 Read=Read
 Assigned=Assigned
 InProgress=In progress
-NeedMoreInformation=Waiting for information
+NeedMoreInformation=Waiting for reporter feedback
+NeedMoreInformationShort=Waiting for feedback
 Answered=Answered
 Waiting=Waiting
 Closed=Closed
@@ -160,7 +162,7 @@ CreatedBy=Created by
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Group
+TicketCategory=Ticket categorization
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
@@ -211,6 +213,7 @@ TicketMessageHelp=Only this text will be saved in the message list on ticket car
 TicketMessageSubstitutionReplacedByGenericValues=Substitutions variables are replaced by generic values.
 TimeElapsedSince=Time elapsed since
 TicketTimeToRead=Time elapsed before read
+TicketTimeElapsedBeforeSince=Time elapsed before / since
 TicketContacts=Contacts ticket
 TicketDocumentsLinked=Documents linked to ticket
 ConfirmReOpenTicket=Confirm reopen this ticket ?
diff --git a/htdocs/langs/ne_NP/users.lang b/htdocs/langs/ne_NP/users.lang
index 372090ea5ad..6aeaf128838 100644
--- a/htdocs/langs/ne_NP/users.lang
+++ b/htdocs/langs/ne_NP/users.lang
@@ -97,8 +97,8 @@ LoginToCreate=Login to create
 NameToCreate=Name of third party to create
 YourRole=Your roles
 YourQuotaOfUsersIsReached=Your quota of active users is reached !
-NbOfUsers=No. of users
-NbOfPermissions=No. of permissions
+NbOfUsers=Number of users
+NbOfPermissions=Number of permissions
 DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin
 HierarchicalResponsible=Supervisor
 HierarchicView=Hierarchical view
diff --git a/htdocs/langs/ne_NP/website.lang b/htdocs/langs/ne_NP/website.lang
index 1e727415ec2..dc2ec2c0b3d 100644
--- a/htdocs/langs/ne_NP/website.lang
+++ b/htdocs/langs/ne_NP/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 PageContainer=Page
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
+PreviewOfSiteNotYetAvailable=The preview of your website <strong>%s</strong> is not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
diff --git a/htdocs/langs/nl_BE/admin.lang b/htdocs/langs/nl_BE/admin.lang
index 3755e870c31..d13852849fd 100644
--- a/htdocs/langs/nl_BE/admin.lang
+++ b/htdocs/langs/nl_BE/admin.lang
@@ -234,7 +234,6 @@ YouMustEnableOneModule=Je moet minstens 1 module aktiveren
 BillsPDFModules=Factuur documentsjablonen
 LDAPGlobalParameters=Globale instellingen
 LDAPPassword=Beheerderswachtwoord
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 SalariesSetup=Setup van module salarissen
 MailToSendProposal=Klant voorstellen
 MailToSendInvoice=Klantfacturen
diff --git a/htdocs/langs/nl_BE/interventions.lang b/htdocs/langs/nl_BE/interventions.lang
index e1ec9e29b85..5a614f96b76 100644
--- a/htdocs/langs/nl_BE/interventions.lang
+++ b/htdocs/langs/nl_BE/interventions.lang
@@ -1,8 +1,16 @@
 # Dolibarr language file - Source file is en_US - interventions
+InterventionCard=Interventiedetails
+AddIntervention=Nieuwe interventie
+InterventionContact=Interventiecontactpersoon
+ValidateIntervention=Inteverntie valideren
+DocumentModelStandard=Standaard modeldocument voor interventies
+InterventionCardsAndInterventionLines=Inteventiebladen en -regels
+SendInterventionRef=Indiening van de interventie %s
 InterventionSentByEMail=Interventie %s per e-mail verzonden
 InterventionsArea=Interventieruimte
 DraftFichinter=Concept interventie
 LastModifiedInterventions=Laatste %s gemodificeerde interventies
+TypeContact_fichinter_external_CUSTOMER=Nabehandeling afnemerscontact
 InterventionStatistics=Statistieken van de interventies
 InterId=Interventie id
 InterDateCreation=Datum aanmaak interventie
diff --git a/htdocs/langs/nl_BE/salaries.lang b/htdocs/langs/nl_BE/salaries.lang
index 722cad7b40d..ed5f4c7cb01 100644
--- a/htdocs/langs/nl_BE/salaries.lang
+++ b/htdocs/langs/nl_BE/salaries.lang
@@ -1,3 +1,4 @@
 # Dolibarr language file - Source file is en_US - salaries
+SalariesPayments=Salarissen betalingen
 THM=Gemiddelde uurprijs
 TJM=Gemiddelde dagprijs
diff --git a/htdocs/langs/nl_BE/users.lang b/htdocs/langs/nl_BE/users.lang
index 161657b3cc9..cee6a39dbbc 100644
--- a/htdocs/langs/nl_BE/users.lang
+++ b/htdocs/langs/nl_BE/users.lang
@@ -14,7 +14,6 @@ CreateDolibarrThirdParty=Maak Derden
 CreateInternalUserDesc=Met dit formulier kunt u een interne gebruiker in uw bedrijf / organisatie maken. Om een externe gebruiker (klant, leverancier enz.) Aan te maken, gebruikt u de knop 'Maak Dolibarr Gebruiker aan' van de contactkaart van die partij.
 ConfirmCreateContact=Weet u zeker dat u een Dolibarr account wilt maken voor deze contactpersoon?
 ConfirmCreateThirdParty=Weet u zeker dat u een 'derde' wilt maken voor dit lid?
-NbOfPermissions=Aantal toestemmingen
 UserAccountancyCode=Gebruikers boekhoudingscode
 UserLogoff=Gebruiker logout
 DateEmploymentEnd=Einddatum tewerkstelling
diff --git a/htdocs/langs/nl_BE/website.lang b/htdocs/langs/nl_BE/website.lang
index 96584adea66..e8f0a2d4af0 100644
--- a/htdocs/langs/nl_BE/website.lang
+++ b/htdocs/langs/nl_BE/website.lang
@@ -3,7 +3,6 @@ DeleteWebsite=Verwijder website
 WEBSITE_CSS_URL=URL van extern CSS bestand
 MediaFiles=Mediabibliotheek
 EditMenu=Bewerk menu
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 ViewSiteInNewTab=Bekijk de site in een nieuwe tab
 ViewPageInNewTab=Bekijk de pagina in een nieuwe tab
 SetAsHomePage=Zet als Homepagina
diff --git a/htdocs/langs/nl_NL/admin.lang b/htdocs/langs/nl_NL/admin.lang
index 6175d311b9f..121da907a00 100644
--- a/htdocs/langs/nl_NL/admin.lang
+++ b/htdocs/langs/nl_NL/admin.lang
@@ -53,6 +53,7 @@ InternalUser=Interne gebruiker
 ExternalUser=Externe gebruiker
 InternalUsers=Interne gebruikers
 ExternalUsers=Externe gebruikers
+UserInterface=User interface
 GUISetup=Weergave
 SetupArea=Instellingen
 UploadNewTemplate=Nieuwe template(s) uploaden
@@ -1260,8 +1261,8 @@ YourPHPDoesNotHaveSSLSupport=SSL functies niet beschikbaar in uw PHP installatie
 DownloadMoreSkins=Meer uiterlijkthema's om te downloaden
 SimpleNumRefModelDesc=Retourneert het referentienummer in de notatie %syymm-nnnn waarbij yy het jaar is, mm de maand en nnnn een opeenvolgend automatisch oplopend getal is zonder reset
 SimpleNumRefNoDateModelDesc=Retourneert het referentienummer in de notatie %s-nnnn waarbij nnnn een opeenvolgend automatisch oplopend getal is zonder reset
-ShowProfIdInAddress=Toon professionele id met adressen
-ShowVATIntaInAddress=Verberg intracommunautair btw-nummer met adressen
+ShowProfIdInAddress=Show professional ID with addresses
+ShowVATIntaInAddress=Hide intra-Community VAT number
 TranslationUncomplete=Onvolledige vertaling
 MAIN_DISABLE_METEO=Schakel meteorologische weergave uit
 MeteoStdMod=Standaard mode
@@ -1778,7 +1779,7 @@ ClickToDialSetup='Click-To-Dial' moduleinstellingen
 ClickToDialUrlDesc=URL gebeld wanneer een klik op het telefoonpictogram is voltooid. In URL kunt u tags gebruiken <br> <b>__PHONETO__</b> die wordt vervangen door het telefoonnummer van de persoon die moet worden gebeld <br> <b>__PHONEFROM__</b> die wordt vervangen door het telefoonnummer van de bellende persoon (die van u) <br> <b>__LOGIN__</b> die wordt vervangen door clicktodial login (gedefinieerd op gebruikerskaart) <br> <b>__PASS__</b> die wordt vervangen door clicktodial wachtwoord (gedefinieerd op gebruikerskaart).
 ClickToDialDesc=Deze module verandert telefoonnummers bij gebruik van een desktopcomputer in klikbare links. Bij een klik zal het nummer gebeld worden. Dit kan worden gebruikt om het telefoongesprek te starten wanneer u een softphone op uw bureaublad gebruikt of wanneer u bijvoorbeeld een CTI-systeem op basis van het SIP-protocol gebruikt. Let op: Bij het gebruik van een smartphone zijn telefoonnummers altijd klikbaar.
 ClickToDialUseTelLink=Gebruik alleen de link "tel:" bij telefoonnummers
-ClickToDialUseTelLinkDesc=Gebruik deze methode als uw gebruikers een softphone of een software-interface op dezelfde computer als de browser hebben geïnstalleerd en deze oproepen wanneer u op een link in uw browser klikt die begint met "tel:". Als u een volledige serveroplossing nodig hebt (geen lokale software-installatie vereist), moet u dit instellen op "Nee" en het volgende veld invullen.
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface, installed on the same computer as the browser, and called when you click on a link starting with "tel:" in your browser. If you need link that start with "sip:" or a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Verkooppunt
 CashDeskSetup=Instelling verkooppuntmodule
@@ -2133,7 +2134,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Behalve als u systeemopdrachten in
 PHPFunctionsRequiredForCLI=Voor shell-doeleinden (zoals geplande back-up van taken of het uitvoeren van een anitivurs-programma), moet u PHP-functies behouden
 NoWritableFilesFoundIntoRootDir=Er zijn geen beschrijfbare bestanden of mappen van de gebruikelijke programma's gevonden in uw hoofdmap (Goed)
 RecommendedValueIs=Aanbevolen: %s
-NotRecommended=Niet aanbevolen
+Recommended=Aanbevolen
+NotRecommended=Not recommended
 ARestrictedPath=Een beperkt pad
 CheckForModuleUpdate=Controleren op updates van externe modules
 CheckForModuleUpdateHelp=Deze actie maakt verbinding met editors van externe modules om te controleren of er een nieuwe versie beschikbaar is.
@@ -2144,3 +2146,5 @@ YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=U hebt de verouderde WS API ingescha
 RandomlySelectedIfSeveral=Willekeurig geselecteerd als er meerdere foto's beschikbaar zijn
 DatabasePasswordObfuscated=Databasewachtwoord is versleuteld in conf-bestand
 DatabasePasswordNotObfuscated=Databasewachtwoord is NIET versleuteld in conf-bestand
+APIsAreNotEnabled=APIs modules are not enabled
+YouShouldSetThisToOff=You should set this to 0 or off
diff --git a/htdocs/langs/nl_NL/banks.lang b/htdocs/langs/nl_NL/banks.lang
index 494554bbf82..bad59082531 100644
--- a/htdocs/langs/nl_NL/banks.lang
+++ b/htdocs/langs/nl_NL/banks.lang
@@ -115,7 +115,7 @@ TransferTo=T/m
 TransferFromToDone=Een overboeking van <b>%s</b> naar <b>%s</b> van <b>%s</b> is geregistreerd.
 CheckTransmitter=Verzender
 ValidateCheckReceipt=Betaling met cheque goedkeuren?
-ConfirmValidateCheckReceipt=Weet u zeker dat u deze cheque ter validatie wilt indienen? Er zijn geen wijzigingen mogelijk, het is klaar.
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes will be possible once validated.
 DeleteCheckReceipt=Deze cheque ontvangst verwijderen?
 ConfirmDeleteCheckReceipt=Weet u zeker dat u deze betaling via cheque wilt verwijderen?
 BankChecks=Bankcheque
diff --git a/htdocs/langs/nl_NL/boxes.lang b/htdocs/langs/nl_NL/boxes.lang
index 47006dfac87..8cb5b51883b 100644
--- a/htdocs/langs/nl_NL/boxes.lang
+++ b/htdocs/langs/nl_NL/boxes.lang
@@ -91,8 +91,8 @@ BoxTitleLatestModifiedSupplierOrders=Orders van leveranciers: laatste %s gewijzi
 BoxTitleLastModifiedCustomerBills=Klantfacturen: laatste %s gewijzigd
 BoxTitleLastModifiedCustomerOrders=Klantorders: laatste %s gewijzigd
 BoxTitleLastModifiedPropals=Laatste %s aangepaste offertes
-BoxTitleLatestModifiedJobPositions=Laatste %s gewijzigde taken
-BoxTitleLatestModifiedCandidatures=Laatste %s gewijzigde kandidaturen
+BoxTitleLatestModifiedJobPositions=Latest %s modified job positions
+BoxTitleLatestModifiedCandidatures=Latest %s modified job applications
 ForCustomersInvoices=Afnemersfacturen
 ForCustomersOrders=Klantenbestellingen
 ForProposals=Zakelijke voorstellen / Offertes
diff --git a/htdocs/langs/nl_NL/cashdesk.lang b/htdocs/langs/nl_NL/cashdesk.lang
index d7351d8d538..2e94594cf6a 100644
--- a/htdocs/langs/nl_NL/cashdesk.lang
+++ b/htdocs/langs/nl_NL/cashdesk.lang
@@ -127,4 +127,4 @@ AllowDelayedPayment=Laat uitgestelde betaling toe
 PrintPaymentMethodOnReceipts=Betaalmethode afdrukken op tickets | bonnen
 WeighingScale=Weegschaal
 ShowPriceHT = Toon de kolom met de prijs exclusief btw (op het scherm)
-ShowPriceHTOnReceipt = Toon de kolom met de prijs exclusief btw (bij ontvangst)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on the receipt)
diff --git a/htdocs/langs/nl_NL/errors.lang b/htdocs/langs/nl_NL/errors.lang
index 9ad71f8483c..feeb243f0c1 100644
--- a/htdocs/langs/nl_NL/errors.lang
+++ b/htdocs/langs/nl_NL/errors.lang
@@ -301,3 +301,4 @@ ErrorActionCommPropertyUserowneridNotDefined=Eigenaar van gebruiker is vereist
 ErrorActionCommBadType=Het geselecteerde gebeurtenistype (id: %n, code: %s) bestaat niet in het woordenboek voor gebeurtenistypes
 CheckVersionFail=Versiecontrole mislukt
 ErrorWrongFileName=De naam van het bestand mag niet __SOMETHING__ bevatten
+ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
diff --git a/htdocs/langs/nl_NL/eventorganization.lang b/htdocs/langs/nl_NL/eventorganization.lang
index c5879ac5147..1b3efd8a048 100644
--- a/htdocs/langs/nl_NL/eventorganization.lang
+++ b/htdocs/langs/nl_NL/eventorganization.lang
@@ -86,6 +86,7 @@ DownloadICSLink = ICS-link downloaden
 EVENTORGANIZATION_SECUREKEY = Beveiligde sleutel van de openbare registratielink naar een conferentie
 SERVICE_BOOTH_LOCATION = Service gebruikt voor de factuurregel over een standlocatie
 SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service die wordt gebruikt voor de factuurrij over een deelnemersabonnement op een conferentie
+NbVotes=Number of votes
 #
 # Status
 #
@@ -115,6 +116,9 @@ EvntOrgDuration = Deze conferentie begint op %s en eindigt op %s.
 ConferenceAttendeeFee = Conferentiebezoekerstarief voor het evenement: '%s' variërend van %s tot %s.
 BoothLocationFee = Standplaats voor het evenement : '%s' van %s tot %s
 EventType = Taak type
+LabelOfBooth=Booth label
+LabelOfconference=Conference label
+ConferenceIsNotConfirmed=Subcription not available, conference is not confirmed yet
 
 #
 # Vote page
diff --git a/htdocs/langs/nl_NL/install.lang b/htdocs/langs/nl_NL/install.lang
index a14f8833530..f3b7c547189 100644
--- a/htdocs/langs/nl_NL/install.lang
+++ b/htdocs/langs/nl_NL/install.lang
@@ -206,6 +206,7 @@ MigrationUserPhotoPath=Migratie van fotopaden voor gebruikers
 MigrationFieldsSocialNetworks=Migratie van gebruikersvelden sociale netwerken (%s)
 MigrationReloadModule=Herlaad module %s
 MigrationResetBlockedLog=Reset BlockedLog module voor v7 algoritme
+MigrationImportOrExportProfiles=Migration of import or export profiles (%s)
 ShowNotAvailableOptions=Toon niet beschikbare opties
 HideNotAvailableOptions=Niet-beschikbare opties verbergen
 ErrorFoundDuringMigration=Er zijn fouten gemeld tijdens het migratieproces, dus de volgende stap is niet beschikbaar. Om fouten te negeren, kunt u <a href="%s">hier klikken</a> , maar de toepassing of sommige functies werken mogelijk niet correct totdat de fouten zijn opgelost.
diff --git a/htdocs/langs/nl_NL/productbatch.lang b/htdocs/langs/nl_NL/productbatch.lang
index 102ba7bda6a..c8930700393 100644
--- a/htdocs/langs/nl_NL/productbatch.lang
+++ b/htdocs/langs/nl_NL/productbatch.lang
@@ -26,12 +26,10 @@ ShowLogOfMovementIfLot=Toon bewegingslogboek voor product/lot paar
 StockDetailPerBatch=Voorraad details per lot
 SerialNumberAlreadyInUse=Serienummer %s wordt al gebruikt voor product %s
 TooManyQtyForSerialNumber=U kunt slechts één product %s hebben voor serienummer %s
-BatchLotNumberingModules=Opties voor het automatisch genereren van batchproducten beheerd door partijen
-BatchSerialNumberingModules=Opties voor het automatisch genereren van batchproducten beheerd door serienummers
 ManageLotMask=Aangepast masker
-CustomMasks=Voegt een optie toe om masker te definiëren in de productkaart
-LotProductTooltip=Voegt een optie toe aan de productkaart om een speciaal batchnummermasker te definiëren
-SNProductTooltip=Voegt een optie toe aan de productkaart om een speciaal serienummermasker te definiëren
+CustomMasks=Option to define a different numbering mask for each product
+BatchLotNumberingModules=Numbering rule for automatic generation of lot number
+BatchSerialNumberingModules=Numbering rule for automatic generation of serial number (for products with property 1 unique lot/serial for each product)
 QtyToAddAfterBarcodeScan=Aantal toe te voegen voor elke gescande barcode/lot/serie
 LifeTime=Levensduur (in dagen)
 EndOfLife=Einde van het leven
diff --git a/htdocs/langs/nl_NL/products.lang b/htdocs/langs/nl_NL/products.lang
index 6fa53cf624a..b1fd7b414f1 100644
--- a/htdocs/langs/nl_NL/products.lang
+++ b/htdocs/langs/nl_NL/products.lang
@@ -277,7 +277,7 @@ PriceByCustomer=Verschillende prijzen voor elke klant
 PriceCatalogue=Enkele verkoopprijs per product/dienst
 PricingRule=Regels voor verkoopprijzen
 AddCustomerPrice=Koppel verkoopprijs aan klant
-ForceUpdateChildPriceSoc=Stel dezelfde prijs in dochterondernemingen klant
+ForceUpdateChildPriceSoc=Set same price on customer's subsidiaries
 PriceByCustomerLog=Prijshistorie klant
 MinimumPriceLimit=Minimumprijs kan niet onder %s
 MinimumRecommendedPrice=Aanbevolen minimumprijs is: %s
@@ -296,6 +296,7 @@ ComposedProductIncDecStock=Verhogen/verlagen voorraad bij de ouder verandering
 ComposedProduct=Producten voor kinderen
 MinSupplierPrice=Minimum aankoopprijs
 MinCustomerPrice=Minimum verkoopprijs
+NoDynamicPrice=No dynamic price
 DynamicPriceConfiguration=Dynamische prijs configuratie
 DynamicPriceDesc=U kunt wiskundige formules definiëren om klant- of leveranciersprijzen te berekenen. Dergelijke formules kunnen alle wiskundige operatoren, sommige constanten en variabelen gebruiken. U kunt hier de variabelen definiëren die u wilt gebruiken. Als de variabele een automatische update nodig heeft, kunt u de externe URL definiëren zodat Dolibarr de waarde automatisch kan bijwerken.
 AddVariable=Variabele toevoegen
@@ -340,7 +341,7 @@ ProductSheet=Productblad
 ServiceSheet=Service blad
 PossibleValues=Mogelijke waarden
 GoOnMenuToCreateVairants=Ga naar menu %s-%s om attributenvarianten voor te bereiden (zoals kleuren, grootte, ...)
-UseProductFournDesc=Voeg een functie toe om de beschrijvingen van producten te definiëren die door de leveranciers zijn gedefinieerd, naast beschrijvingen voor klanten
+UseProductFournDesc=Add a feature to define the descriptions of products defined by the vendors in addition to descriptions for customers
 ProductSupplierDescription=Leveranciersbeschrijving voor het product
 UseProductSupplierPackaging=Gebruik verpakkingen op leveranciersprijzen (herbereken hoeveelheden volgens verpakking ingesteld op leveranciersprijs bij toevoegen / bijwerken van regel in leveranciersdocumenten)
 PackagingForThisProduct=Verpakking
diff --git a/htdocs/langs/nl_NL/salaries.lang b/htdocs/langs/nl_NL/salaries.lang
index 830cbac4c19..961622858d5 100644
--- a/htdocs/langs/nl_NL/salaries.lang
+++ b/htdocs/langs/nl_NL/salaries.lang
@@ -17,8 +17,8 @@ TJM=Gemiddeld dagtarief
 CurrentSalary=Huidig salaris
 THMDescription=Deze waarde kan worden gebruikt om de kosten te berekenen van de tijd die wordt besteed aan een project dat door gebruikers is ingevoerd als de module Project wordt gebruikt
 TJMDescription=Deze waarde is momenteel alleen ter informatie en wordt niet gebruikt voor enige berekening
-LastSalaries=Laatste %s salarisbetalingen
-AllSalaries=Alle salarisbetalingen
+LastSalaries=Latest %s salaries
+AllSalaries=All salaries
 SalariesStatistics=Salaris statistieken
-# Export
 SalariesAndPayments=Salarissen en betalingen
+ConfirmDeleteSalaryPayment=Do you want to delete this salary payment ?
diff --git a/htdocs/langs/nl_NL/ticket.lang b/htdocs/langs/nl_NL/ticket.lang
index 255921e1700..182a8f47ae1 100644
--- a/htdocs/langs/nl_NL/ticket.lang
+++ b/htdocs/langs/nl_NL/ticket.lang
@@ -34,7 +34,8 @@ TicketDictResolution=Ticket - resolutie
 
 TicketTypeShortCOM=Commerciële vraag
 TicketTypeShortHELP=Verzoek om functionele hulp
-TicketTypeShortISSUE=Probleem of bug
+TicketTypeShortISSUE=Issue or bug
+TicketTypeShortPROBLEM=Problem
 TicketTypeShortREQUEST=Verander-  of verbeteringsverzoek
 TicketTypeShortPROJET=Project
 TicketTypeShortOTHER=Overig
@@ -54,14 +55,15 @@ TypeContact_ticket_internal_SUPPORTTEC=Toegewezen gebruiker
 TypeContact_ticket_external_SUPPORTCLI=Klanten contact / opvolging
 TypeContact_ticket_external_CONTRIBUTOR=Externe bijdrage
 
-OriginEmail=E-mail bron
+OriginEmail=Reporter Email
 Notify_TICKET_SENTBYMAIL=Verzend ticketbericht per e-mail
 
 # Status
 Read=Gelezen
 Assigned=Toegekend
 InProgress=Reeds bezig
-NeedMoreInformation=Wachten op informatie
+NeedMoreInformation=Waiting for reporter feedback
+NeedMoreInformationShort=Waiting for feedback
 Answered=Beantwoord
 Waiting=Wachtend
 Closed=Gesloten
@@ -160,7 +162,7 @@ CreatedBy=Aangemaakt door
 NewTicket=Nieuw Ticket
 SubjectAnswerToTicket=Ticket antwoord
 TicketTypeRequest=Aanvraag type
-TicketCategory=Groep
+TicketCategory=Ticket categorization
 SeeTicket=Bekijk ticket
 TicketMarkedAsRead=Ticket is gemarkeerd als gelezen
 TicketReadOn=Lees verder
@@ -211,6 +213,7 @@ TicketMessageHelp=Alleen deze tekst zal worden bewaard in de berichtenlijst op d
 TicketMessageSubstitutionReplacedByGenericValues=Vervangingsvariabelen worden vervangen door generieke waarden.
 TimeElapsedSince=Verstreken tijd sinds
 TicketTimeToRead=Tijd verstreken voordat gelezen
+TicketTimeElapsedBeforeSince=Time elapsed before / since
 TicketContacts=Contact ticket
 TicketDocumentsLinked=Documenten gekoppeld aan ticket
 ConfirmReOpenTicket=Ticket heropenen?
diff --git a/htdocs/langs/nl_NL/users.lang b/htdocs/langs/nl_NL/users.lang
index 9329e0735fb..98bfc63d5b7 100644
--- a/htdocs/langs/nl_NL/users.lang
+++ b/htdocs/langs/nl_NL/users.lang
@@ -97,8 +97,8 @@ LoginToCreate=Te creëren gebruikersnaam
 NameToCreate=Naam van derden maken
 YourRole=Uw rollen
 YourQuotaOfUsersIsReached=Uw quotum van actieve gebruikers is bereikt!
-NbOfUsers=Aantal gebruikers
-NbOfPermissions=Aantal rechten
+NbOfUsers=Number of users
+NbOfPermissions=Number of permissions
 DontDowngradeSuperAdmin=Alleen een superadmin kan downgrade een superadmin
 HierarchicalResponsible=Opzichter
 HierarchicView=Hiërarchisch schema
diff --git a/htdocs/langs/nl_NL/website.lang b/htdocs/langs/nl_NL/website.lang
index 226ccb1818b..bd195b5960d 100644
--- a/htdocs/langs/nl_NL/website.lang
+++ b/htdocs/langs/nl_NL/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Website toevoegen
 Webpage=Webpagina/container
 AddPage=Voeg pagina/container toe
 PageContainer=Pagina
-PreviewOfSiteNotYetAvailable=Voorbeeld van uw website <strong>%s</strong> is nog niet beschikbaar. U moet eerst '<strong>Een volledige websitesjabloon importeren</strong>' of alleen '<strong>Een pagina / container toevoegen</strong>'.
+PreviewOfSiteNotYetAvailable=The preview of your website <strong>%s</strong> is not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Gevraagde pagina met id %s heeft nog geen inhoud of cachebestand .tpl.php is verwijderd. Bewerk de inhoud van de pagina om dit op te lossen.
 SiteDeleted=Website '%s' verwijderd
 PageContent=Pagina/Container
diff --git a/htdocs/langs/pl_PL/accountancy.lang b/htdocs/langs/pl_PL/accountancy.lang
index 3e69399d034..cf17a9fff7b 100644
--- a/htdocs/langs/pl_PL/accountancy.lang
+++ b/htdocs/langs/pl_PL/accountancy.lang
@@ -48,7 +48,8 @@ CountriesNotInEEC=Kraje spoza UE
 CountriesInEECExceptMe=Kraje UE oprócz %s
 CountriesExceptMe=Wszystkie kraje oprócz %s
 AccountantFiles=Eksportuj dokumenty źródłowe
-ExportAccountingSourceDocHelp=Za pomocą tego narzędzia możesz wyeksportować zdarzenia źródłowe (listy i pliki PDF), które zostały użyte do wygenerowania Twojej księgowości. Aby wyeksportować swoje dzienniki, użyj pozycji menu %s - %s.
+ExportAccountingSourceDocHelp=Za pomocą tego narzędzia możesz wyeksportować zdarzenia źródłowe (listę w formacie CSV i PDF), które zostały użyte do wygenerowania Twojej księgowości.
+ExportAccountingSourceDocHelp2=Aby wyeksportować swoje dzienniki, użyj pozycji menu %s - %s.
 VueByAccountAccounting=Wyświetl według konta księgowego
 VueBySubAccountAccounting=Wyświetl według subkonta księgowego
 
@@ -328,9 +329,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Wyłącz powiązanie i przeniesienie w k
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Wyłącz powiązanie i przeniesienie w księgowości na zestawieniach wydatków (zestawienia wydatków nie będą brane pod uwagę w księgowości)
 
 ## Export
-NotifiedExportDate=Notified export date (modification of the entries will not be possible)
-NotifiedValidationDate=Validation of the entries (modification or deletion of the entries will not be possible)
-ConfirmExportFile=Confirmation of the generation of the accounting export file ?
+NotifiedExportDate=Zgłoszona data eksportu (modyfikacja wpisów nie będzie możliwa)
+NotifiedValidationDate=Walidacja wpisów (modyfikacja lub usunięcie wpisów nie będzie możliwe)
+ConfirmExportFile=Potwierdzenie wygenerowania pliku eksportu księgowości ?
 ExportDraftJournal=Export dziennika projektu
 Modelcsv=Model eksportu
 Selectmodelcsv=Wybierz model eksportu
diff --git a/htdocs/langs/pl_PL/admin.lang b/htdocs/langs/pl_PL/admin.lang
index 21261a39914..bc85e18b2b9 100644
--- a/htdocs/langs/pl_PL/admin.lang
+++ b/htdocs/langs/pl_PL/admin.lang
@@ -53,6 +53,7 @@ InternalUser=Wewnętrzny użytkownik
 ExternalUser=Zewnętrzny użytkownik
 InternalUsers=Wewnętrzni użytkownicy
 ExternalUsers=Zewnetrzni użytkownicy
+UserInterface=User interface
 GUISetup=Wyświetlanie
 SetupArea=Konfiguracja
 UploadNewTemplate=Załaduj nowy szablon(y)
@@ -221,7 +222,7 @@ NotCompatible=ten moduł nie jest kompatybilny z twoją wersją Dolibarr %s (Min
 CompatibleAfterUpdate=Ten moduł wymaga aktualizacji Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=Zobacz w miejscu zakupów
 SeeSetupOfModule=Zobacz konfigurację modułu %s
-SetOptionTo=Set option <b>%s</b> to %s
+SetOptionTo=Ustaw opcję <b> %s </b> na %s
 Updated=Zaktualizowane
 AchatTelechargement=Kup / Pobierz
 GoModuleSetupArea=Aby wdrożyć/zainstalować nowy moduł, przejdź do obszaru konfiguracji modułów: <a href="%s">%s</a>.
@@ -562,7 +563,7 @@ Module53Desc=Zarządzanie usługami
 Module54Name=Kontrakty/Subskrypcje
 Module54Desc=Zarządzanie umowami (usługi lub cykliczne subskrypcje)
 Module55Name=Kody kreskowe
-Module55Desc=Barcode or QR code management
+Module55Desc=Zarządzanie kodami kreskowymi lub kodami QR
 Module56Name=Płatność przelewem
 Module56Desc=Zarządzanie płatnościami dostawców za pomocą poleceń przelewu. Obejmuje generowanie pliku SEPA dla krajów europejskich.
 Module57Name=Płatności poleceniem zapłaty
@@ -849,10 +850,10 @@ Permission402=Tworzenie / modyfikacja zniżek
 Permission403=Walidacja zniżek
 Permission404=Usuwanie zniżek
 Permission430=Użyj paska debugowania
-Permission511=Read salaries and payments (yours and subordinates)
-Permission512=Create/modify salaries and payments
-Permission514=Delete salaries and payments
-Permission517=Read salaries and payments everybody
+Permission511=Przeczytaj pensje i płatności (swoje i podwładni)
+Permission512=Twórz/modyfikuj pensje i płatności
+Permission514=Usuń pensje i płatności
+Permission517=Przeczytaj wszystkim pensje i płatności
 Permission519=Wynagrodzenia eksport
 Permission520=Czytaj Kredyty
 Permission522=Tworzenie / modyfikacja kredytów
@@ -1191,7 +1192,7 @@ SetupDescription4= <a href="%s"> %s -> %s </a> <br> <br> To oprogramowanie jest
 SetupDescription5=Pozycje w menu Inne Ustawienia zarządzają parametrami opcjonalnymi.
 AuditedSecurityEvents=Zdarzenia dotyczące bezpieczeństwa poddawane inspekcji
 NoSecurityEventsAreAduited=Żadne zdarzenia dotyczące bezpieczeństwa nie są poddawane inspekcji. Możesz je włączyć z menu %s
-Audit=Security events
+Audit=Wydarzenia związane z bezpieczeństwem
 InfoDolibarr=O Dolibarr
 InfoBrowser=O przeglądarce
 InfoOS=O systemie
@@ -1260,8 +1261,8 @@ YourPHPDoesNotHaveSSLSupport=funkcji SSL nie są dostępne w PHP
 DownloadMoreSkins=Więcej skórek do pobrania
 SimpleNumRefModelDesc=Zwraca numer referencyjny w formacie %syymm-nnnn, gdzie rr to rok, mm to miesiąc, a nnnn to sekwencyjna liczba automatycznie zwiększająca się bez resetowania
 SimpleNumRefNoDateModelDesc=Zwraca numer referencyjny w formacie %s-nnnn, gdzie nnnn jest sekwencyjną liczbą, automatycznie zwiększającą się bez resetowania
-ShowProfIdInAddress=Pokaż identyfikator zawodowy z adresami
-ShowVATIntaInAddress=Ukryj wewnątrzwspólnotowy numer VAT wraz z adresami
+ShowProfIdInAddress=Show professional ID with addresses
+ShowVATIntaInAddress=Hide intra-Community VAT number
 TranslationUncomplete=Częściowe tłumaczenie
 MAIN_DISABLE_METEO=Wyłącz widok meteorologiczny
 MeteoStdMod=Tryb standardowy
@@ -1778,7 +1779,7 @@ ClickToDialSetup=Kliknij, aby Dial konfiguracji modułu
 ClickToDialUrlDesc=Adres URL wywoływany po wykonaniu kliknięcia na picto telefonu. W adresie URL, można użyć znaczników <br> <b> __PHONETO__ </b> który zostanie zastąpiony numerem telefonu osoby zadzwonić <br> <b> __PHONEFROM__ </b> który zostanie zastąpiony numerem telefonu dzwoniąc osobę (swoje) <br> <b> __LOGIN__ </b> które zostaną zastąpione clicktodial login (zdefiniowany na karcie użytkownika) <br> <b> __PASS__ </b>, który zostanie zastąpiony hasłem clicktodial (zdefiniowanym na karcie użytkownika).
 ClickToDialDesc=Ten moduł zamienia numery telefonów, gdy używasz komputera stacjonarnego, w klikalne linki. Kliknięcie wywoła numer. Można to wykorzystać do nawiązania połączenia telefonicznego podczas korzystania z telefonu programowego na pulpicie lub podczas korzystania na przykład z systemu CTI opartego na protokole SIP. Uwaga: podczas korzystania ze smartfona numery telefonów są zawsze klikalne.
 ClickToDialUseTelLink=Używaj tylko łącza "tel:" na numery telefonów
-ClickToDialUseTelLinkDesc=Użyj tej metody, jeśli Twoi użytkownicy mają telefon programowy lub interfejs oprogramowania zainstalowany na tym samym komputerze co przeglądarka i wywoływany po kliknięciu łącza w przeglądarce zaczynającego się od „tel:”. Jeśli potrzebujesz pełnego rozwiązania serwerowego (nie ma potrzeby lokalnej instalacji oprogramowania), musisz ustawić to na „Nie” i wypełnić następne pole.
+ClickToDialUseTelLinkDesc=Użyj tej metody, jeśli Twoi użytkownicy mają telefon programowy lub interfejs oprogramowania zainstalowany na tym samym komputerze co przeglądarka i wywoływany po kliknięciu łącza zaczynającego się od „tel:” w przeglądarce. Jeśli potrzebujesz linku zaczynającego się od "sip:" lub pełnego rozwiązania serwerowego (nie ma potrzeby instalowania lokalnego oprogramowania), musisz ustawić to na "Nie" i wypełnić następne pole.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Punkt sprzedaży
 CashDeskSetup=Konfiguracja modułu Point of Sales
@@ -2133,7 +2134,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Z wyjątkiem sytuacji, gdy musisz u
 PHPFunctionsRequiredForCLI=Do celów powłoki (takich jak zaplanowane tworzenie kopii zapasowych zadań lub uruchamianie programu anitivurs), musisz zachować funkcje PHP
 NoWritableFilesFoundIntoRootDir=W katalogu głównym nie znaleziono zapisywalnych plików ani katalogów dla powszechnych programów (Dobrze)
 RecommendedValueIs=Zalecane: %s
-NotRecommended=Niezalecane
+Recommended=Zalecana
+NotRecommended=Not recommended
 ARestrictedPath=Ograniczona ścieżka
 CheckForModuleUpdate=Sprawdź aktualizacje modułów zewnętrznych
 CheckForModuleUpdateHelp=Ta akcja połączy się z edytorami zewnętrznych modułów, by sprawdzić dostępność ich nowych wersji.
@@ -2142,5 +2144,7 @@ NoExternalModuleWithUpdate=Nie znaleziono aktualizacji dla modułów zewnętrzny
 SwaggerDescriptionFile=Plik opisu Swagger API (na przykład, do użytku z redoc)
 YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=Włączono przestarzały interfejs API WS. Zamiast tego powinieneś użyć REST API.
 RandomlySelectedIfSeveral=Wybierane losowo, jeśli dostępnych jest kilka zdjęć
-DatabasePasswordObfuscated=Database password is obfuscated in conf file
-DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
+DatabasePasswordObfuscated=Hasło do bazy danych jest zaciemnione w pliku konfiguracyjnym
+DatabasePasswordNotObfuscated=Hasło do bazy danych NIE jest zaciemnione w pliku konfiguracyjnym
+APIsAreNotEnabled=Moduły API nie są włączone
+YouShouldSetThisToOff=Powinieneś ustawić to na 0 lub wyłączone
diff --git a/htdocs/langs/pl_PL/banks.lang b/htdocs/langs/pl_PL/banks.lang
index ce486c13d06..49e819d9a6f 100644
--- a/htdocs/langs/pl_PL/banks.lang
+++ b/htdocs/langs/pl_PL/banks.lang
@@ -115,7 +115,7 @@ TransferTo=Do
 TransferFromToDone=Transfer z <b>%s</b> do <b>%s</b> <b>%s</b> %s został zapisany.
 CheckTransmitter=Nadawca
 ValidateCheckReceipt=Potwierdzić potwierdzenie tego czeku?
-ConfirmValidateCheckReceipt=Czy na pewno chcesz przesłać to pokwitowanie czeku do weryfikacji? Jeśli to zrobisz, żadne zmiany nie będą możliwe.
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes will be possible once validated.
 DeleteCheckReceipt=Usunąć to pokwitowanie czeku?
 ConfirmDeleteCheckReceipt=Czy na pewno chcesz usunąć to pokwitowanie czeku?
 BankChecks=Czeki bankowe
diff --git a/htdocs/langs/pl_PL/bills.lang b/htdocs/langs/pl_PL/bills.lang
index e3def345984..c7915bc6a13 100644
--- a/htdocs/langs/pl_PL/bills.lang
+++ b/htdocs/langs/pl_PL/bills.lang
@@ -259,7 +259,7 @@ DateMaxPayment=Termin płatności:
 DateInvoice=Daty wystawienia faktury
 DatePointOfTax=Punkt podatkowy
 NoInvoice=Nr faktury
-NoOpenInvoice=No open invoice
+NoOpenInvoice=Brak otwartej faktury
 ClassifyBill=Klasyfikacja faktury
 SupplierBillsToPay=Niezapłacone faktury od dostawcy
 CustomerBillsUnpaid=Niezapłacone faktury klienta
diff --git a/htdocs/langs/pl_PL/boxes.lang b/htdocs/langs/pl_PL/boxes.lang
index c262324e417..7c69c75fa06 100644
--- a/htdocs/langs/pl_PL/boxes.lang
+++ b/htdocs/langs/pl_PL/boxes.lang
@@ -91,8 +91,8 @@ BoxTitleLatestModifiedSupplierOrders=Zamówienia dostawców: ostatnio zmodyfikow
 BoxTitleLastModifiedCustomerBills=Faktury klienta: ostatnio zmodyfikowano %s
 BoxTitleLastModifiedCustomerOrders=Zamówienia sprzedaży: ostatnio zmodyfikowano %s
 BoxTitleLastModifiedPropals=Ostatnie %s zmodyfikowane oferty
-BoxTitleLatestModifiedJobPositions=Najnowsze zmodyfikowane oferty pracy %s
-BoxTitleLatestModifiedCandidatures=Najnowsze zmodyfikowane kandydatury %s
+BoxTitleLatestModifiedJobPositions=Latest %s modified job positions
+BoxTitleLatestModifiedCandidatures=Latest %s modified job applications
 ForCustomersInvoices=Faktury Klientów
 ForCustomersOrders=Zamówienia klientów
 ForProposals=Oferty
diff --git a/htdocs/langs/pl_PL/cashdesk.lang b/htdocs/langs/pl_PL/cashdesk.lang
index b5b04e9fb5b..a4f42429e38 100644
--- a/htdocs/langs/pl_PL/cashdesk.lang
+++ b/htdocs/langs/pl_PL/cashdesk.lang
@@ -127,4 +127,4 @@ AllowDelayedPayment=Zezwalaj na opóźnioną płatność
 PrintPaymentMethodOnReceipts=Wydrukuj metodę płatności na biletach | paragonach
 WeighingScale=Skalę ważenia
 ShowPriceHT = Wyświetl kolumnę z ceną bez podatku (na ekranie)
-ShowPriceHTOnReceipt = Wyświetl kolumnę z ceną bez podatku (na paragonie)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on the receipt)
diff --git a/htdocs/langs/pl_PL/deliveries.lang b/htdocs/langs/pl_PL/deliveries.lang
index 8d0ea676b8d..a4bd16123c3 100644
--- a/htdocs/langs/pl_PL/deliveries.lang
+++ b/htdocs/langs/pl_PL/deliveries.lang
@@ -30,4 +30,4 @@ NonShippable=Nie do wysyłki
 ShowShippableStatus=Pokaż status do wysyłki
 ShowReceiving=Pokaż przyjęte dostawy
 NonExistentOrder=Nieistniejący porządek
-StockQuantitiesAlreadyAllocatedOnPreviousLines = Stock quantities already allocated on previous lines
+StockQuantitiesAlreadyAllocatedOnPreviousLines = Ilości magazynowe już przydzielone na poprzednich liniach
diff --git a/htdocs/langs/pl_PL/errors.lang b/htdocs/langs/pl_PL/errors.lang
index c6ff3448b97..4c32a1fe15e 100644
--- a/htdocs/langs/pl_PL/errors.lang
+++ b/htdocs/langs/pl_PL/errors.lang
@@ -11,7 +11,7 @@ ErrorBadValueForParamNotAString=Zła wartość parametru. Zazwyczaj dołącza si
 ErrorRefAlreadyExists=Odniesienie <b> %s </b> już istnieje.
 ErrorLoginAlreadyExists=Zaloguj %s już istnieje.
 ErrorGroupAlreadyExists=Grupa %s już istnieje.
-ErrorEmailAlreadyExists=Email %s already exists.
+ErrorEmailAlreadyExists=E-mail %s już istnieje.
 ErrorRecordNotFound=Rekord nie został znaleziony.
 ErrorFailToCopyFile=Nie udało się skopiować pliku '<b>%s</b>' do '<b>%s</b>'.
 ErrorFailToCopyDir=Nie udało się skopiować katalogu „<b> %s </b>” do „<b> %s </b>”.
@@ -301,3 +301,4 @@ ErrorActionCommPropertyUserowneridNotDefined=Właściciel użytkownika jest wyma
 ErrorActionCommBadType=Wybrany typ zdarzenia (id: %n, kod: %s) nie istnieje w słowniku typów zdarzeń
 CheckVersionFail=Sprawdzanie wersji nie powiodło się
 ErrorWrongFileName=Nazwa pliku nie może zawierać __COŚ__
+ErrorNotInDictionaryPaymentConditions=Nie w Słowniku terminów płatności, zmień.
diff --git a/htdocs/langs/pl_PL/eventorganization.lang b/htdocs/langs/pl_PL/eventorganization.lang
index ec130e69dfa..e79061069d1 100644
--- a/htdocs/langs/pl_PL/eventorganization.lang
+++ b/htdocs/langs/pl_PL/eventorganization.lang
@@ -86,6 +86,7 @@ DownloadICSLink = Pobierz link do ICS
 EVENTORGANIZATION_SECUREKEY = Klucz bezpieczeństwa dla publicznego łącza do rejestracji na konferencję
 SERVICE_BOOTH_LOCATION = Usługa używana do wiersza faktury o lokalizacji stoiska
 SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Usługa używana w wierszu faktury za subskrypcję uczestnika na konferencję
+NbVotes=Number of votes
 #
 # Status
 #
@@ -115,6 +116,9 @@ EvntOrgDuration = Ta konferencja zaczyna się %s i kończy się %s.
 ConferenceAttendeeFee = Opłata uczestnika konferencji za wydarzenie: '%s' występujące od %s do %s.
 BoothLocationFee = Lokalizacja stoiska dla wydarzenia: „%s” występujące od %s do %s
 EventType = Typ wydarzenia
+LabelOfBooth=Booth label
+LabelOfconference=Conference label
+ConferenceIsNotConfirmed=Subcription not available, conference is not confirmed yet
 
 #
 # Vote page
diff --git a/htdocs/langs/pl_PL/exports.lang b/htdocs/langs/pl_PL/exports.lang
index d30ec56438b..10f8a70cba4 100644
--- a/htdocs/langs/pl_PL/exports.lang
+++ b/htdocs/langs/pl_PL/exports.lang
@@ -53,8 +53,8 @@ TypeOfLineServiceOrProduct=Rodzaj pozycji (0=produkt, 1=usługa)
 FileWithDataToImport=Plik z danymi do importu
 FileToImport=Plik źródłowy do zaimportowania
 FileMustHaveOneOfFollowingFormat=Plik do zaimportowania musi mieć jeden z następujących formatów
-DownloadEmptyExample=Download template file with field content information
-StarAreMandatory=* are mandatory fields
+DownloadEmptyExample=Pobierz plik szablonu z informacjami o zawartości pola
+StarAreMandatory=* są polami obowiązkowymi
 ChooseFormatOfFileToImport=Wybierz format pliku, który ma być używany jako format pliku importu, klikając ikonę %s, aby go wybrać ...
 ChooseFileToImport=Prześlij plik, a następnie kliknij ikonę %s, aby wybrać plik jako źródłowy plik importu ...
 SourceFileFormat=Format pliku źródłowego
diff --git a/htdocs/langs/pl_PL/install.lang b/htdocs/langs/pl_PL/install.lang
index 985c7543b7e..9be56a92a49 100644
--- a/htdocs/langs/pl_PL/install.lang
+++ b/htdocs/langs/pl_PL/install.lang
@@ -2,39 +2,39 @@
 InstallEasy=Postępuj według instrukcji krok po kroku.
 MiscellaneousChecks=Sprawdzenie wymagań
 ConfFileExists=Plik konfiguracyjny <b>%s</b> istnieje.
-ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created!
+ConfFileDoesNotExistsAndCouldNotBeCreated=Plik konfiguracyjny <b> %s </b> nie istnieje i nie można go utworzyć!
 ConfFileCouldBeCreated=Plik konfiguracyjny <b>%s</b> został lub mógł zostać utworzony.
-ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
+ConfFileIsNotWritable=Plik konfiguracyjny <b> %s </b> nie jest zapisywalny. Sprawdź uprawnienia. Podczas pierwszej instalacji serwer WWW musi mieć możliwość zapisu do tego pliku podczas procesu konfiguracji (na przykład „chmod 666” w systemie operacyjnym Unix).
 ConfFileIsWritable=Plik konfiguracyjny <b>%s</b> ma uprawnienia do zapisu.
-ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
-ConfFileReload=Reloading parameters from configuration file.
+ConfFileMustBeAFileNotADir=Plik konfiguracyjny <b> %s </b> musi być plikiem, a nie katalogiem.
+ConfFileReload=Ponowne ładowanie parametrów z pliku konfiguracyjnego.
 PHPSupportPOSTGETOk=PHP obsługuje zmienne POST i GET.
-PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
+PHPSupportPOSTGETKo=Możliwe, że Twoja konfiguracja PHP nie obsługuje zmiennych POST i / lub GET. Sprawdź parametr <b> variable_order </b> w php.ini.
 PHPSupportSessions=PHP obsługuje sesje.
-PHPSupport=This PHP supports %s functions.
+PHPSupport=To PHP obsługuje funkcje %s.
 PHPMemoryOK=Maksymalna ilość pamięci sesji PHP ustawiona jest na <b>%s</b>. Powinno wystarczyć.
-PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
-Recheck=Click here for a more detailed test
-ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to allow Dolibarr to work. Check your PHP setup and permissions of the sessions directory.
-ErrorPHPDoesNotSupportGD=Your PHP installation does not support GD graphical functions. No graphs will be available.
+PHPMemoryTooLow=Twoja maksymalna pamięć sesji PHP jest ustawiona na <b> %s </b> bajtów. To jest za niskie. Zmień parametr <b> php.ini </b>, aby ustawić <b> memory_limit </b> na co najmniej <b> %s a09a4b739 bajtów.
+Recheck=Kliknij tutaj, aby uzyskać bardziej szczegółowy test
+ErrorPHPDoesNotSupportSessions=Twoja instalacja PHP nie obsługuje sesji. Ta funkcja jest wymagana, aby umożliwić działanie Dolibarr. Sprawdź ustawienia PHP i uprawnienia do katalogu sesji.
+ErrorPHPDoesNotSupportGD=Twoja instalacja PHP nie obsługuje funkcji graficznych GD. Żadne wykresy nie będą dostępne.
 ErrorPHPDoesNotSupportCurl=Twoja instalacja PHP nie wspiera Curl.
-ErrorPHPDoesNotSupportCalendar=Your PHP installation does not support php calendar extensions.
-ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
-ErrorPHPDoesNotSupportIntl=Your PHP installation does not support Intl functions.
-ErrorPHPDoesNotSupportxDebug=Your PHP installation does not support extend debug functions.
-ErrorPHPDoesNotSupport=Your PHP installation does not support %s functions.
+ErrorPHPDoesNotSupportCalendar=Twoja instalacja PHP nie obsługuje rozszerzeń kalendarza php.
+ErrorPHPDoesNotSupportUTF8=Twoja instalacja PHP nie obsługuje funkcji UTF8. Dolibarr nie działa poprawnie. Rozwiąż ten problem przed zainstalowaniem Dolibarr.
+ErrorPHPDoesNotSupportIntl=Twoja instalacja PHP nie obsługuje funkcji Intl.
+ErrorPHPDoesNotSupportxDebug=Twoja instalacja PHP nie obsługuje rozszerzonych funkcji debugowania.
+ErrorPHPDoesNotSupport=Twoja instalacja PHP nie obsługuje funkcji %s.
 ErrorDirDoesNotExists=Katalog %s nie istnieje.
-ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
+ErrorGoBackAndCorrectParameters=Wróć i sprawdź / popraw parametry.
 ErrorWrongValueForParameter=Możliwe, że wprowadzono nieprawidłową wartość dla parametru '%s'.
 ErrorFailedToCreateDatabase=Utworzenie bazy danych '%s' nie powiodło się.
 ErrorFailedToConnectToDatabase=Połączenie z bazą danych '%s' nie powiodło się.
 ErrorDatabaseVersionTooLow=Wersja (%s) bazy danych jest zbyt stara. Wymagana jest wersja %s lub wyższa.
 ErrorPHPVersionTooLow=Wersja PHP zbyt stara. Wymagana wersja to przynajmniej %s.
-ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
+ErrorConnectedButDatabaseNotFound=Połączenie z serwerem powiodło się, ale nie znaleziono bazy danych „%s”.
 ErrorDatabaseAlreadyExists=Baza danych '%s' już istnieje.
-IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
+IfDatabaseNotExistsGoBackAndUncheckCreate=Jeśli baza danych nie istnieje, wróć i zaznacz opcję „Utwórz bazę danych”.
 IfDatabaseExistsGoBackAndCheckCreate=Jeśli baza danych istnieje, w poprzednim kroku odznacz opcję "Utwórz bazę danych".
-WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
+WarningBrowserTooOld=Wersja przeglądarki jest zbyt stara. Zdecydowanie zalecamy uaktualnienie przeglądarki do najnowszej wersji Firefox, Chrome lub Opera.
 PHPVersion=Wersja PHP
 License=Użyta licencja
 ConfigurationFile=Plik konfiguracyjny
@@ -47,23 +47,23 @@ DolibarrDatabase=Baza danych Dolibarr'a
 DatabaseType=Rodzaj bazy danych
 DriverType=Rodzaj sterownika
 Server=Serwer
-ServerAddressDescription=Name or ip address for the database server. Usually 'localhost' when the database server is hosted on the same server as the web server.
+ServerAddressDescription=Nazwa lub adres IP serwera bazy danych. Zwykle „localhost”, gdy serwer bazy danych znajduje się na tym samym serwerze co serwer WWW.
 ServerPortDescription=Port serwera baz danych. Zostaw puste jeśli nie znasz.
 DatabaseServer=Serwer baz danych
 DatabaseName=Nazwa bazy danych
-DatabasePrefix=Database table prefix
-DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
-AdminLogin=User account for the Dolibarr database owner.
-PasswordAgain=Retype password confirmation
+DatabasePrefix=Prefiks tabeli bazy danych
+DatabasePrefixDescription=Prefiks tabeli bazy danych. Jeśli pusty, domyślnie llx_.
+AdminLogin=Konto użytkownika właściciela bazy danych Dolibarr.
+PasswordAgain=Potwierdź hasło ponownie
 AdminPassword=Hasło do bazy danych
 CreateDatabase=Utwórz bazę danych
-CreateUser=Create user account or grant user account permission on the Dolibarr database
+CreateUser=Utwórz konto użytkownika lub przyznaj uprawnienia kontu użytkownika w bazie danych Dolibarr
 DatabaseSuperUserAccess=Baza danych z dostępem na prawach superużytkownika
-CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.<br>In this case, you must also fill in the user name and password for the superuser account at the bottom of this page.
-CheckToCreateUser=Check the box if:<br>the database user account does not yet exist and so must be created, or<br>if the user account exists but the database does not exist and permissions must be granted.<br>In this case, you must enter the user account and password and <b>also</b> the superuser account name and password at the bottom of this page. If this box is unchecked, database owner and password must already exist.
-DatabaseRootLoginDescription=Superuser account name (to create new databases or new users), mandatory if the database or its owner does not already exist.
-KeepEmptyIfNoPassword=Leave empty if superuser has no password (NOT recommended)
-SaveConfigurationFile=Saving parameters to
+CheckToCreateDatabase=Zaznacz to pole, jeśli baza danych jeszcze nie istnieje i dlatego musi zostać utworzona. <br> W takim przypadku musisz również podać nazwę użytkownika i hasło do konta superużytkownika na dole tej strony.
+CheckToCreateUser=Zaznacz to pole, jeśli: <br> konto użytkownika bazy danych jeszcze nie istnieje i dlatego musi zostać utworzone, lub <br>, jeśli konto użytkownika istnieje, ale baza danych nie istnieje i należy nadać uprawnienia. <br> W takim przypadku należy wprowadzić konto użytkownika i hasło oraz <b> również </b> nazwę konta administratora i hasło na dole tej strony. Jeśli to pole nie jest zaznaczone, właściciel bazy danych i hasło muszą już istnieć.
+DatabaseRootLoginDescription=Nazwa konta superużytkownika (do tworzenia nowych baz danych lub nowych użytkowników), obowiązkowa, jeśli baza danych lub jej właściciel jeszcze nie istnieje.
+KeepEmptyIfNoPassword=Pozostaw puste, jeśli superużytkownik nie ma hasła (NIE zalecane)
+SaveConfigurationFile=Zapisywanie parametrów do
 ServerConnection=Połączenie z serwerem
 DatabaseCreation=Utworzenie bazy danych
 CreateDatabaseObjects=Tworzenie obiektów w bazie danych
@@ -74,9 +74,9 @@ CreateOtherKeysForTable=Tworzenie kluczy obcych oraz indeksów dla tabeli %s
 OtherKeysCreation=Tworzenie kluczy obcych oraz indeksów
 FunctionsCreation=Tworzenie funkcji
 AdminAccountCreation=Tworzenie użytkownika
-PleaseTypePassword=Please type a password, empty passwords are not allowed!
-PleaseTypeALogin=Please type a login!
-PasswordsMismatch=Passwords differs, please try again!
+PleaseTypePassword=Wpisz hasło, puste hasła są niedozwolone!
+PleaseTypeALogin=Wpisz login!
+PasswordsMismatch=Hasła się różnią, spróbuj ponownie!
 SetupEnd=Koniec ustawień
 SystemIsInstalled=Instalacja zakończona.
 SystemIsUpgraded=Dolibarr został zaktualizowany pomyślnie.
@@ -84,65 +84,65 @@ YouNeedToPersonalizeSetup=Teraz należy ustawić Dolibarra tak by spełniał Two
 AdminLoginCreatedSuccessfuly=Login administratora Dolibarr '<b>%s</b>' utworzony pomyślnie.
 GoToDolibarr=Idź do Dolibarr'a
 GoToSetupArea=Przejdź do ustawień Dolibarra
-MigrationNotFinished=The database version is not completely up to date: run the upgrade process again.
+MigrationNotFinished=Wersja bazy danych nie jest w pełni aktualna: ponownie uruchom proces aktualizacji.
 GoToUpgradePage=Wejdź na stronę aktualizacji ponownie
 WithNoSlashAtTheEnd=Bez znaku ukośnika "/" na końcu
-DirectoryRecommendation=<span class="warning">IMPORTANT</span>: You must use a directory that is outside of the web pages (so do not use a subdirectory of previous parameter).
+DirectoryRecommendation= <span class="warning"> WAŻNE </span>: Musisz użyć katalogu, który znajduje się poza stronami internetowymi (więc nie używaj podkatalogu poprzedniego parametru).
 LoginAlreadyExists=Już istnieje
 DolibarrAdminLogin=Użytkownik administracyjny Dolibarra
-AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
+AdminLoginAlreadyExists=Konto administratora Dolibarr „<b> %s </b>” już istnieje. Wróć, jeśli chcesz utworzyć kolejny.
 FailedToCreateAdminLogin=Utworzenie konta administratora Dolibarr nie powiodło się.
-WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, you should add a file called <b>install.lock</b> into the Dolibarr document directory in order to prevent the accidental/malicious use of the install tools again.
-FunctionNotAvailableInThisPHP=Not available in this PHP
+WarningRemoveInstallDir=Ostrzeżenie, ze względów bezpieczeństwa, po zakończeniu instalacji lub aktualizacji należy dodać plik o nazwie <b> install.lock </b> do katalogu dokumentów Dolibarr, aby zapobiec przypadkowemu / złośliwemu użyciu narzędzi instalacyjnych.
+FunctionNotAvailableInThisPHP=Niedostępne w tym PHP
 ChoosedMigrateScript=Wybierz skrypt migracyjny
 DataMigration=Migracja bazy danych (dane)
 DatabaseMigration=Migracja bazy danych (struktura i niektóre dane)
 ProcessMigrateScript=Przetwarzanie skryptów
 ChooseYourSetupMode=Wybierz tryb instalacji i potwierdź przyciskiem "Start"...
 FreshInstall=Nowa instalacja
-FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode.
+FreshInstallDesc=Użyj tego trybu, jeśli jest to Twoja pierwsza instalacja. Jeśli nie, ten tryb może naprawić niekompletną poprzednią instalację. Jeśli chcesz zaktualizować swoją wersję, wybierz tryb „Uaktualnij”.
 Upgrade=Aktualizacja
 UpgradeDesc=Użyj tego trybu jeśli podmieniono stare pliki Dolibarra plikami z nowszej wersji. Ten tryb uaktualni bazę danych i poprzednie dane.
 Start=Start
 InstallNotAllowed=Ustawienie niedostępne przez uprawnienia <b>conf.php</b>
 YouMustCreateWithPermission=Musisz utworzyć plik %s i ustawić mu prawa zapisu dla serwera WWW podczas procesu instalacyjnego.
-CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload the page.
+CorrectProblemAndReloadPage=Rozwiąż problem i naciśnij klawisz F5, aby ponownie załadować stronę.
 AlreadyDone=Migracja już przeprowadzona.
 DatabaseVersion=Wersja bazy danych
 ServerVersion=Wersja serwera baz danych
 YouMustCreateItAndAllowServerToWrite=Musisz utworzyć ten katalog i zezwolić serwerowi WWW na zapis w nim.
 DBSortingCollation=Sposób sortowania znaków
-YouAskDatabaseCreationSoDolibarrNeedToConnect=You selected create database <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
-YouAskLoginCreationSoDolibarrNeedToConnect=You selected create database user <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
-BecauseConnectionFailedParametersMayBeWrong=The database connection failed: the host or super user parameters must be wrong.
+YouAskDatabaseCreationSoDolibarrNeedToConnect=Wybrałeś tworzenie bazy danych <b> %s </b>, ale w tym celu Dolibarr musi połączyć się z serwerem <b> %s </b> z superprawami użytkownika <b>%s</b>uprawnieniami.
+YouAskLoginCreationSoDolibarrNeedToConnect=Wybrałeś opcję tworzenia użytkownika bazy danych <b> %s </b>, ale w tym celu Dolibarr musi połączyć się z serwerem <b> %s </b> z uprawnieniami użytkownika <b>%s</b>uprawnieniami.
+BecauseConnectionFailedParametersMayBeWrong=Połączenie z bazą danych nie powiodło się: parametry hosta lub superużytkownika muszą być nieprawidłowe.
 OrphelinsPaymentsDetectedByMethod=Osierocona płatność wykryta przez metodę %s
 RemoveItManuallyAndPressF5ToContinue=Usuń go ręcznie i odśwież stronę (domyślnie F5) by kontynuować.
 FieldRenamed=Nazwa pola zmieniona
-IfLoginDoesNotExistsCheckCreateUser=If the user does not exist yet, you must check option "Create user"
-ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or the PHP client version may be too old compared to the database version.
+IfLoginDoesNotExistsCheckCreateUser=Jeśli użytkownik jeszcze nie istnieje, należy zaznaczyć opcję „Utwórz użytkownika”
+ErrorConnection=Serwer "<b> %s </b>", nazwa bazy danych "<b> %s </b>", login" <b> %s </b> lub hasło do bazy danych może być nieprawidłowe lub wersja klienta PHP może być zbyt stara w porównaniu z wersją bazy danych.
 InstallChoiceRecommanded=Zalecany wybór: zainstalować <b>wersję %s</b> od aktualnej <b>wersji %s</b>
 InstallChoiceSuggested=<b>Wybór sugerowany przez instalator.</b>
-MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions. The install wizard will come back to suggest a further migration once this one is complete.
-CheckThatDatabasenameIsCorrect=Check that the database name "<b>%s</b>" is correct.
+MigrateIsDoneStepByStep=Wersja docelowa (%s) ma lukę w kilku wersjach. Kreator instalacji powróci, aby zasugerować dalszą migrację po jej zakończeniu.
+CheckThatDatabasenameIsCorrect=Sprawdź, czy nazwa bazy danych „<b> %s </b>” jest poprawna.
 IfAlreadyExistsCheckOption=Jeśli ta nazwa jest poprawna i baza danych jeszcze nie istnieje, sprawdz opcję "utwórz bazę danych"
 OpenBaseDir=PHP parametr otwarcia katalogu bazy danych
-YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
-YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form).
-NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing.
-MigrationCustomerOrderShipping=Migrate shipping for sales orders storage
+YouAskToCreateDatabaseSoRootRequired=Zaznaczono pole „Utwórz bazę danych”. W tym celu musisz podać login / hasło superużytkownika (na dole formularza).
+YouAskToCreateDatabaseUserSoRootRequired=Zaznaczono pole „Utwórz właściciela bazy danych”. W tym celu musisz podać login / hasło superużytkownika (na dole formularza).
+NextStepMightLastALongTime=Bieżący krok może zająć kilka minut. Przed kontynuowaniem poczekaj, aż następny ekran zostanie wyświetlony w całości.
+MigrationCustomerOrderShipping=Przenieś wysyłkę w celu przechowywania zamówień sprzedaży
 MigrationShippingDelivery=Aktualizacja stanu do wysyłki
 MigrationShippingDelivery2=Aktualizacja stanu do wysyłki 2
 MigrationFinished=Migracja zakończona
-LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the master account to administer all other/additional user accounts.</b>
+LastStepDesc= <strong> Ostatni krok </strong>: Określ tutaj login i hasło, których chcesz używać do łączenia się z Dolibarr. <b> Nie trać tego, ponieważ jest to konto główne do administrowania wszystkimi innymi / dodatkowymi kontami użytkowników. </b>
 ActivateModule=Aktywuj moduł %s
 ShowEditTechnicalParameters=Kliknij tutaj, aby pokazać / edytować zaawansowane parametry (tryb ekspert)
-WarningUpgrade=Warning:\nDid you run a database backup first?\nThis is highly recommended. Loss of data (due to for example bugs in mysql version 5.5.40/41/42/43) may be possible during this process, so it is essential to take a complete dump of your database before starting any migration.\n\nClick OK to start migration process...
-ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug, making data loss possible if you make structural changes in your database, such as is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a layer (patched) version (list of known buggy versions: %s)
-KeepDefaultValuesWamp=You used the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you are doing.
-KeepDefaultValuesDeb=You used the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so the values proposed here are already optimized. Only the password of the database owner to create must be entered. Change other parameters only if you know what you are doing.
-KeepDefaultValuesMamp=You used the Dolibarr setup wizard from DoliMamp, so the values proposed here are already optimized. Change them only if you know what you are doing.
-KeepDefaultValuesProxmox=You used the Dolibarr setup wizard from a Proxmox virtual appliance, so the values proposed here are already optimized. Change them only if you know what you are doing.
-UpgradeExternalModule=Run dedicated upgrade process of external module
+WarningUpgrade=Ostrzeżenie:\nCzy najpierw wykonałeś kopię zapasową bazy danych?\nJest to wysoce zalecane. Utrata danych (np. Z powodu błędów w mysql w wersji 5.5.40 / 41/42/43) może być możliwa podczas tego procesu, dlatego przed rozpoczęciem migracji konieczne jest wykonanie pełnego zrzutu bazy danych.\n\nKliknij OK, aby rozpocząć proces migracji ...
+ErrorDatabaseVersionForbiddenForMigration=Twoja wersja bazy danych to %s. Zawiera krytyczny błąd, który umożliwia utratę danych w przypadku wprowadzenia zmian strukturalnych w bazie danych, takich jak wymagane przez proces migracji. Z tego powodu migracja nie będzie dozwolona, dopóki nie zaktualizujesz bazy danych do wersji warstwowej (poprawionej) (lista znanych błędnych wersji: %s)
+KeepDefaultValuesWamp=Użyłeś kreatora instalacji Dolibarr firmy DoliWamp, więc proponowane tutaj wartości są już zoptymalizowane. Zmień je tylko wtedy, gdy wiesz, co robisz.
+KeepDefaultValuesDeb=Użyłeś kreatora instalacji Dolibarr z pakietu Linux (Ubuntu, Debian, Fedora ...), więc proponowane tutaj wartości są już zoptymalizowane. Należy wprowadzić tylko hasło właściciela bazy danych, który ma zostać utworzony. Zmień inne parametry tylko wtedy, gdy wiesz, co robisz.
+KeepDefaultValuesMamp=Użyłeś kreatora instalacji Dolibarr firmy DoliMamp, więc proponowane tutaj wartości są już zoptymalizowane. Zmień je tylko wtedy, gdy wiesz, co robisz.
+KeepDefaultValuesProxmox=Użyłeś kreatora instalacji Dolibarr z urządzenia wirtualnego Proxmox, więc proponowane tutaj wartości są już zoptymalizowane. Zmień je tylko wtedy, gdy wiesz, co robisz.
+UpgradeExternalModule=Uruchom dedykowany proces aktualizacji modułu zewnętrznego
 SetAtLeastOneOptionAsUrlParameter=Ustaw przynajmniej jedną opcję jako parametr w adresie URL. Na przykład: '...repair.php?standard=confirmed'
 NothingToDelete=Nic do wyczyszczenia/usunięcia
 NothingToDo=Nic do zrobienia
@@ -166,9 +166,9 @@ MigrationContractsUpdate=Korekta danych kontraktowych
 MigrationContractsNumberToUpdate=%s kontraktów do zaktualizowania
 MigrationContractsLineCreation=Utwórz linię kontraktową dla kontraktu %s
 MigrationContractsNothingToUpdate=Nic więcej do zrobienia
-MigrationContractsFieldDontExist=Field fk_facture does not exist anymore. Nothing to do.
+MigrationContractsFieldDontExist=Pole fk_facture już nie istnieje. Nic do roboty.
 MigrationContractsEmptyDatesUpdate=Korekta pustych dat kontraktów
-MigrationContractsEmptyDatesUpdateSuccess=Contract empty date correction done successfully
+MigrationContractsEmptyDatesUpdateSuccess=Korekta daty pustej umowy została wykonana pomyślnie
 MigrationContractsEmptyDatesNothingToUpdate=Brak pustych dat kontraktów do korekty
 MigrationContractsEmptyCreationDatesNothingToUpdate=Brak dat utworzenia kontraktów do korekty
 MigrationContractsInvalidDatesUpdate=Nieprawidłowa wartość przy korekcie daty kontraktu
@@ -190,28 +190,29 @@ MigrationDeliveryDetail=Aktualizacja dostawy
 MigrationStockDetail=Aktualizacja wartości zapasów produktów
 MigrationMenusDetail=Aktualizacja dynamicznego meni tabeli
 MigrationDeliveryAddress=Aktualizacja adresu dostarczenia przesyłki
-MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
+MigrationProjectTaskActors=Migracja danych dla tabeli llx_projet_task_actors
 MigrationProjectUserResp=Migracja danych pola fk_user_resp z llx_projet do llx_element_contact
 MigrationProjectTaskTime=Pokonany czas uaktualnienia w sekundach
 MigrationActioncommElement=Aktualizacja danych na temat działań
-MigrationPaymentMode=Data migration for payment type
+MigrationPaymentMode=Migracja danych dla rodzaju płatności
 MigrationCategorieAssociation=Migracja kategorii
-MigrationEvents=Migration of events to add event owner into assignment table
-MigrationEventsContact=Migration of events to add event contact into assignment table
+MigrationEvents=Migracja wydarzeń w celu dodania właściciela wydarzenia do tabeli przydziałów
+MigrationEventsContact=Migracja wydarzeń w celu dodania kontaktu związanego z wydarzeniem do tabeli przydziałów
 MigrationRemiseEntity=Zaktualizuj wartość pola podmiotu llx_societe_remise
 MigrationRemiseExceptEntity=Zaktualizuj wartość pola podmiotu llx_societe_remise_except
-MigrationUserRightsEntity=Update entity field value of llx_user_rights
-MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
-MigrationUserPhotoPath=Migration of photo paths for users
-MigrationFieldsSocialNetworks=Migration of users fields social networks (%s)
+MigrationUserRightsEntity=Zaktualizuj wartość pola encji llx_user_rights
+MigrationUserGroupRightsEntity=Zaktualizuj wartość pola encji llx_usergroup_rights
+MigrationUserPhotoPath=Migracja ścieżek do zdjęć dla użytkowników
+MigrationFieldsSocialNetworks=Migracja pól użytkowników sieci społecznościowe (%s)
 MigrationReloadModule=Odśwież moduł %s
 MigrationResetBlockedLog=Zresetuj moduł BlockedLog dla algorytmu v7
-ShowNotAvailableOptions=Show unavailable options
-HideNotAvailableOptions=Hide unavailable options
-ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
-YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (directory renamed with .lock suffix).<br>
-YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
-ClickHereToGoToApp=Click here to go to your application
-ClickOnLinkOrRemoveManualy=If an upgrade is in progress, please wait. If not, click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
-Loaded=Loaded
-FunctionTest=Function test
+MigrationImportOrExportProfiles=Migration of import or export profiles (%s)
+ShowNotAvailableOptions=Pokaż niedostępne opcje
+HideNotAvailableOptions=Ukryj niedostępne opcje
+ErrorFoundDuringMigration=Błędy zostały zgłoszone podczas procesu migracji, więc następny krok nie jest dostępny. Aby zignorować błędy, możesz <a href="%s"> kliknąć tutaj </a>, ale aplikacja lub niektóre funkcje mogą nie działać poprawnie, dopóki błędy nie zostaną rozwiązane.
+YouTryInstallDisabledByDirLock=Aplikacja próbowała przeprowadzić samodzielną aktualizację, ale strony instalacji / aktualizacji zostały wyłączone ze względów bezpieczeństwa (nazwa katalogu została zmieniona z przyrostkiem .lock). <br>
+YouTryInstallDisabledByFileLock=Aplikacja próbowała przeprowadzić samodzielną aktualizację, ale strony instalacji / aktualizacji zostały wyłączone ze względów bezpieczeństwa (ze względu na istnienie pliku blokady <strong> install.lock </strong> w katalogu dokumentów dolibarr). <br>
+ClickHereToGoToApp=Kliknij tutaj, aby przejść do swojej aplikacji
+ClickOnLinkOrRemoveManualy=Jeśli trwa aktualizacja, poczekaj. Jeśli nie, kliknij poniższe łącze. Jeśli zawsze widzisz tę samą stronę, musisz usunąć / zmienić nazwę pliku install.lock w katalogu dokumentów.
+Loaded=Załadowany
+FunctionTest=Test działania
diff --git a/htdocs/langs/pl_PL/interventions.lang b/htdocs/langs/pl_PL/interventions.lang
index 130ddc8c964..b810b395223 100644
--- a/htdocs/langs/pl_PL/interventions.lang
+++ b/htdocs/langs/pl_PL/interventions.lang
@@ -4,7 +4,7 @@ Interventions=Interwencje
 InterventionCard=Karta interwencji
 NewIntervention=Nowa interwencja
 AddIntervention=Tworzenie interwencji
-ChangeIntoRepeatableIntervention=Change to repeatable intervention
+ChangeIntoRepeatableIntervention=Zmień na powtarzalną interwencję
 ListOfInterventions=Wykaz interwencji
 ActionsOnFicheInter=Działania w zakresie interwencji
 LastInterventions=Ostatnie %s interwencje
@@ -20,8 +20,8 @@ ConfirmValidateIntervention=Jesteś pewien, że chcesz potwierdzić tę interwen
 ConfirmModifyIntervention=Jesteś pewien, że chcesz zmodyfikować tę interwencję?
 ConfirmDeleteInterventionLine=Jesteś pewien, że chcesz usunąć tę linię interwencji?
 ConfirmCloneIntervention=Jesteś pewien, że chcesz zduplikować tę interwencję?
-NameAndSignatureOfInternalContact=Name and signature of intervening:
-NameAndSignatureOfExternalContact=Name and signature of customer:
+NameAndSignatureOfInternalContact=Nazwisko i podpis interwenienta:
+NameAndSignatureOfExternalContact=Imię i nazwisko oraz podpis klienta:
 DocumentModelStandard=Standardowy model dokumentu dla interwencji
 InterventionCardsAndInterventionLines=Interwencje i kierunki interwencji
 InterventionClassifyBilled=Sklasyfikować "Rozlicz"
@@ -29,13 +29,13 @@ InterventionClassifyUnBilled=Sklasyfikować "Unbilled"
 InterventionClassifyDone=Sklasyfikuj "Gotowe"
 StatusInterInvoiced=Zapowiadane
 SendInterventionRef=Złożenie interwencyjnego% s
-SendInterventionByMail=Send intervention by email
+SendInterventionByMail=Wyślij interwencję e-mailem
 InterventionCreatedInDolibarr=Interwencja %s stworzona
 InterventionValidatedInDolibarr=Interwencja %s zatwierdzona
 InterventionModifiedInDolibarr=Interwencja %s zmodyfikowana
 InterventionClassifiedBilledInDolibarr=% Interwencyjnej s zestaw jako rozliczane
 InterventionClassifiedUnbilledInDolibarr=% Interwencyjnej s zestaw jako weryfikowane
-InterventionSentByEMail=Intervention %s sent by email
+InterventionSentByEMail=Interwencja %s wysłana pocztą elektroniczną
 InterventionDeletedInDolibarr=Interwencja %s usunięta
 InterventionsArea=Obszar interwencji
 DraftFichinter=Szkic interwencji
@@ -57,10 +57,12 @@ InterDateCreation=Data stworzenia interwencji
 InterDuration=Czas trwania interwencji
 InterStatus=Status interwencji
 InterNote=Nota interwencji
-InterLine=Line of intervention
+InterLine=Linia interwencji
 InterLineId=Linia ID interwencji
 InterLineDate=Linia daty interwencji
 InterLineDuration=Linia czasu trwania interwencji
 InterLineDesc=Lini aopisu interwencji
-RepeatableIntervention=Template of intervention
-ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
+RepeatableIntervention=Szablon interwencji
+ToCreateAPredefinedIntervention=Aby utworzyć predefiniowaną lub powtarzającą się interwencję, utwórz wspólną interwencję i przekształć ją w szablon interwencji
+Reopen=Otworzyć na nowo
+ConfirmReopenIntervention=Czy na pewno chcesz ponownie otworzyć interwencję <b> %s </b>?
diff --git a/htdocs/langs/pl_PL/knowledgemanagement.lang b/htdocs/langs/pl_PL/knowledgemanagement.lang
index 0809ae52139..ab699718169 100644
--- a/htdocs/langs/pl_PL/knowledgemanagement.lang
+++ b/htdocs/langs/pl_PL/knowledgemanagement.lang
@@ -37,15 +37,7 @@ About = O
 KnowledgeManagementAbout = O Zarządzaniu wiedzą
 KnowledgeManagementAboutPage = Strona informacyjna Zarządzania wiedzą
 
-#
-# Sample page
-#
 KnowledgeManagementArea = Zarządzanie wiedzą
-
-
-#
-# Menu
-#
 MenuKnowledgeRecord = Baza wiedzy
 ListKnowledgeRecord = Lista artykułów
 NewKnowledgeRecord = Nowy artykuł
@@ -53,3 +45,5 @@ ValidateReply = Sprawdź poprawność rozwiązania
 KnowledgeRecords = Artykuły
 KnowledgeRecord = Artykuł
 KnowledgeRecordExtraFields = Extrapola dla artykułu
+GroupOfTicket=Grupa biletów
+YouCanLinkArticleToATicketCategory=Możesz powiązać artykuł z grupą biletów (aby artykuł był sugerowany podczas kwalifikacji nowych biletów)
diff --git a/htdocs/langs/pl_PL/languages.lang b/htdocs/langs/pl_PL/languages.lang
index 9ec8f75f555..52958a6c343 100644
--- a/htdocs/langs/pl_PL/languages.lang
+++ b/htdocs/langs/pl_PL/languages.lang
@@ -3,7 +3,8 @@ Language_am_ET=Etiopski
 Language_ar_AR=Arabski
 Language_ar_EG=Arabski (Egipt)
 Language_ar_SA=Arabski
-Language_ar_TN=Arabic (Tunisia)
+Language_ar_TN=arabski (Tunezja)
+Language_ar_IQ=arabski (Irak)
 Language_az_AZ=Azerbejdżański
 Language_bn_BD=Bengalski
 Language_bn_IN=Bengalski (Indie)
@@ -83,6 +84,7 @@ Language_ne_NP=Nepalski
 Language_nl_BE=Holenderski (Belgia)
 Language_nl_NL=Holenderski
 Language_pl_PL=Polski
+Language_pt_AO=portugalski (Angola)
 Language_pt_BR=Portugalski (Brazylia)
 Language_pt_PT=Portugalski
 Language_ro_MD=rumuński (Mołdawia)
diff --git a/htdocs/langs/pl_PL/main.lang b/htdocs/langs/pl_PL/main.lang
index 9c20cd523b8..d3adaedc21f 100644
--- a/htdocs/langs/pl_PL/main.lang
+++ b/htdocs/langs/pl_PL/main.lang
@@ -730,7 +730,7 @@ MenuMembers=Członkowie
 MenuAgendaGoogle=Google agenda
 MenuTaxesAndSpecialExpenses=Podatki | Wydatki specjalne
 ThisLimitIsDefinedInSetup=Limit Dollibara (Menu główne-setup-bezpieczeństwo): %s KB, PHP, limit: %s KB
-ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
+ThisLimitIsDefinedInSetupAt=Limit Dolibarra (Menu %s): %s Kb, limit PHP (Param %s): %s Kb
 NoFileFound=Brak wgranych dokumentów
 CurrentUserLanguage=Język bieżący
 CurrentTheme=Aktualny temat
@@ -1136,4 +1136,4 @@ CategTypeNotFound=Nie znaleziono typu tagu dla typu rekordów
 CopiedToClipboard=Skopiowane do schowka
 InformationOnLinkToContract=Kwota ta to tylko suma wszystkich pozycji zamówienia. Nie bierze się pod uwagę żadnego pojęcia czasu.
 ConfirmCancel=Czy na pewno chcesz zrezygnować
-EmailMsgID=Email MsgID
+EmailMsgID=E-mail MsgID
diff --git a/htdocs/langs/pl_PL/partnership.lang b/htdocs/langs/pl_PL/partnership.lang
index 7bcca8845b5..278612c4f96 100644
--- a/htdocs/langs/pl_PL/partnership.lang
+++ b/htdocs/langs/pl_PL/partnership.lang
@@ -20,9 +20,9 @@ ModulePartnershipName=Zarządzanie partnerstwem
 PartnershipDescription=Moduł Zarządzania partnerstwem
 PartnershipDescriptionLong= Moduł Zarządzania partnerstwem
 
-AddPartnership=Add partnership
-CancelPartnershipForExpiredMembers=Partnership: Cancel partnership of members with expired subscriptions
-PartnershipCheckBacklink=Partnership: Check referring backlink
+AddPartnership=Dodaj partnerstwo
+CancelPartnershipForExpiredMembers=Partnerstwo: Anuluj partnerstwo członków z wygasłymi subskrypcjami
+PartnershipCheckBacklink=Partnerstwo: Sprawdź odsyłający link zwrotny
 
 #
 # Menu
@@ -57,7 +57,7 @@ PartnershipAlreadyExist=Partnerstwo już istnieje
 ManagePartnership=Zarządzaj partnerstwem
 BacklinkNotFoundOnPartnerWebsite=Nie znaleziono linku zwrotnego w witrynie partnera
 ConfirmClosePartnershipAsk=Czy na pewno chcesz anulować to partnerstwo?
-PartnershipType=Partnership type
+PartnershipType=Rodzaj partnerstwa
 
 #
 # Template Mail
diff --git a/htdocs/langs/pl_PL/productbatch.lang b/htdocs/langs/pl_PL/productbatch.lang
index f48ad28814f..2f15cd9dfe1 100644
--- a/htdocs/langs/pl_PL/productbatch.lang
+++ b/htdocs/langs/pl_PL/productbatch.lang
@@ -26,12 +26,10 @@ ShowLogOfMovementIfLot=Pokaż historię przesunięć dla pary produkt/lot
 StockDetailPerBatch=Szczegóły zapasu po locie
 SerialNumberAlreadyInUse=Numer seryjny %s jest już używany dla produktu %s
 TooManyQtyForSerialNumber=Możesz mieć tylko jeden produkt %s dla numeru seryjnego %s
-BatchLotNumberingModules=Opcje automatycznego generowania produktów wsadowych zarządzanych partiami
-BatchSerialNumberingModules=Opcje automatycznego generowania produktów wsadowych zarządzanych według numerów seryjnych
 ManageLotMask=Maska niestandardowa
-CustomMasks=Dodaje opcję definiowania maski na karcie produktu
-LotProductTooltip=Dodaje opcję na karcie produktu, aby zdefiniować dedykowaną maskę numeru partii
-SNProductTooltip=Dodaje opcję na karcie produktu, aby zdefiniować dedykowaną maskę numeru seryjnego
+CustomMasks=Option to define a different numbering mask for each product
+BatchLotNumberingModules=Numbering rule for automatic generation of lot number
+BatchSerialNumberingModules=Numbering rule for automatic generation of serial number (for products with property 1 unique lot/serial for each product)
 QtyToAddAfterBarcodeScan=Ilość do dodania dla każdego zeskanowanego kodu kreskowego/partii/numeru seryjnego
 LifeTime=Żywotność (w dniach)
 EndOfLife=Koniec życia
diff --git a/htdocs/langs/pl_PL/products.lang b/htdocs/langs/pl_PL/products.lang
index a21dc1817f3..ed647809525 100644
--- a/htdocs/langs/pl_PL/products.lang
+++ b/htdocs/langs/pl_PL/products.lang
@@ -277,7 +277,7 @@ PriceByCustomer=Różne ceny dla każdego klienta
 PriceCatalogue=Pojedyncza cena sprzedaży za produkt / usługę
 PricingRule=Zasady dotyczące cen sprzedaży
 AddCustomerPrice=Dodaj cenę dla klienta
-ForceUpdateChildPriceSoc=Ustaw sama cena na zależnych klientów
+ForceUpdateChildPriceSoc=Ustaw tę samą cenę w spółkach zależnych klienta
 PriceByCustomerLog=Stwórz log z wcześniejszymi cenami dla klienta
 MinimumPriceLimit=Cena minimalna nie może być niższa niż %s
 MinimumRecommendedPrice=Minimalna zalecana cena to: %s
@@ -296,6 +296,7 @@ ComposedProductIncDecStock=Wzrost / spadek akcji na zmiany dominującej
 ComposedProduct=Produkty dla dzieci
 MinSupplierPrice=Minimalna cena zakupu
 MinCustomerPrice=Minimalna cena sprzedaży
+NoDynamicPrice=Brak ceny dynamicznej
 DynamicPriceConfiguration=Konfiguracja dynamicznych cen
 DynamicPriceDesc=Możesz zdefiniować formuły matematyczne do obliczania cen klientów lub dostawców. Takie formuły mogą wykorzystywać wszystkie operatory matematyczne, niektóre stałe i zmienne. Możesz tutaj zdefiniować zmienne, których chcesz użyć. Jeśli zmienna wymaga automatycznej aktualizacji, możesz zdefiniować zewnętrzny adres URL, aby umożliwić firmie Dolibarr automatyczną aktualizację wartości.
 AddVariable=Dodaj zmienną
@@ -340,7 +341,7 @@ ProductSheet=Arkusz produktu
 ServiceSheet=Arkusz usługi
 PossibleValues=Możliwa wartość
 GoOnMenuToCreateVairants=Przejdź do menu %s - %s, aby przygotować warianty atrybutów (takie jak kolory, rozmiar, ...)
-UseProductFournDesc=Dodaj funkcję definiowania opisów produktów zdefiniowanych przez dostawców oprócz opisów dla klientów
+UseProductFournDesc=Add a feature to define the descriptions of products defined by the vendors in addition to descriptions for customers
 ProductSupplierDescription=Opis dostawcy produktu
 UseProductSupplierPackaging=Użyj opakowania w cenach dostawcy (przelicz ilości zgodnie z opakowaniem ustawionym na cenie dostawcy podczas dodawania / aktualizowania linii w dokumentach dostawcy)
 PackagingForThisProduct=Opakowanie
diff --git a/htdocs/langs/pl_PL/salaries.lang b/htdocs/langs/pl_PL/salaries.lang
index 977baae0642..fe9b8e54360 100644
--- a/htdocs/langs/pl_PL/salaries.lang
+++ b/htdocs/langs/pl_PL/salaries.lang
@@ -2,20 +2,23 @@
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Konto rachunkowe użyte dla użytkownika kontrahentów
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=Dedykowane konto księgowe zdefiniowane na karcie użytkownika będzie używane wyłącznie do księgowania Subledger. Ten zostanie użyty w General Ledger i jako wartość domyślna księgowania Subledger, jeśli dedykowane konto rachunkowe użytkownika dla użytkownika nie zostanie zdefiniowane.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Domyślne konto rachunkowe dla płatności wynagrodzenia
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=Domyślnie pozostaw pustą opcję „Automatycznie utwórz całkowitą płatność” podczas tworzenia wynagrodzenia
 Salary=Wypłata
 Salaries=Wypłaty
-NewSalaryPayment=Nowa wypłata
+NewSalary=Nowa pensja
+NewSalaryPayment=Nowa karta wynagrodzeń
 AddSalaryPayment=Dodaj płatność wynagrodzenia
 SalaryPayment=Wypłata wynagrodzenia
 SalariesPayments=Wypłaty wynagordzeń
+SalariesPaymentsOf=Wypłaty wynagrodzeń w wysokości %s
 ShowSalaryPayment=Pokaż wypłaty wynagrodzeń
 THM=Średnia stawka godzinowa
 TJM=Średnia stawka dzienna
 CurrentSalary=Aktualne wynagrodzenie
-THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
-TJMDescription=This value is currently for information only and is not used for any calculation
-LastSalaries=Ostatnie %s płatności wynagrodzeń
-AllSalaries=Wszystkie płatności wynagrodzeń
+THMDescription=Wartość ta może służyć do obliczenia kosztu czasu poświęconego na projekt wprowadzony przez użytkowników, jeśli używany jest projekt modułu
+TJMDescription=Ta wartość ma obecnie charakter wyłącznie informacyjny i nie jest używana do żadnych obliczeń
+LastSalaries=Najnowsze pensje %s
+AllSalaries=Wszystkie pensje
 SalariesStatistics=Statystyki wynagrodzeń
-# Export
-SalariesAndPayments=Salaries and payments
+SalariesAndPayments=Wynagrodzenia i płatności
+ConfirmDeleteSalaryPayment=Czy chcesz usunąć tę wypłatę wynagrodzenia?
diff --git a/htdocs/langs/pl_PL/stocks.lang b/htdocs/langs/pl_PL/stocks.lang
index 421f5c72709..456538eef13 100644
--- a/htdocs/langs/pl_PL/stocks.lang
+++ b/htdocs/langs/pl_PL/stocks.lang
@@ -60,7 +60,7 @@ EnhancedValueOfWarehouses=Magazyny wartości
 UserWarehouseAutoCreate=Utwórz użytkownika dla magazynu kiedy tworzysz użytkownika
 AllowAddLimitStockByWarehouse=Zarządzaj również wartością minimalnego i pożądanego zapasu na parę (magazyn produktów) oprócz wartości minimalnego i pożądanego zapasu na produkt
 RuleForWarehouse=Reguła dla magazynów
-WarehouseAskWarehouseOnThirparty=Ustaw magazyn na kontrahenta
+WarehouseAskWarehouseOnThirparty=Ustaw magazyn na osoby trzecie
 WarehouseAskWarehouseDuringPropal=Ustaw magazyn na ofertach handlowych
 WarehouseAskWarehouseDuringOrder=Ustaw magazyn dla zamówień sprzedaży
 UserDefaultWarehouse=Ustaw magazyn dla użytkowników
@@ -167,8 +167,8 @@ MovementTransferStock=Transferuj zapas artykułu %s do innego magazynu
 InventoryCodeShort=Kod Fv/ Przesunięcia
 NoPendingReceptionOnSupplierOrder=Brak oczekującego odbioru z powodu otwartego zamówienia
 ThisSerialAlreadyExistWithDifferentDate=Ten lot/numer seryjny (<strong>%s</strong>) już istnieje ale z inna data do wykorzystania lub sprzedania (znaleziono  <strong>%s</strong> a wszedłeś w <strong>%s</strong>)
-OpenAll=Otwórz dla wszystkich działań
-OpenInternal=Otwórz tylko dla wewnętrznych działań
+OpenAnyMovement=Otwarte (cały ruch)
+OpenInternal=Otwarty (tylko ruch wewnętrzny)
 UseDispatchStatus=Użyj statusu wysyłki (Zatwierdź / Odrzuć) dla linii produktów podczas przyjmowania zamówienia
 OptionMULTIPRICESIsOn=Włączona jest opcja „kilka cen za segment”. Oznacza to, że produkt ma kilka cen sprzedaży, więc nie można obliczyć wartości sprzedaży
 ProductStockWarehouseCreated=Limit zapasu dla ostrzeżenia i pożądany optymalny zapas prawidłowo utworzony
diff --git a/htdocs/langs/pl_PL/ticket.lang b/htdocs/langs/pl_PL/ticket.lang
index e8f995f6274..814d95ab825 100644
--- a/htdocs/langs/pl_PL/ticket.lang
+++ b/htdocs/langs/pl_PL/ticket.lang
@@ -34,7 +34,8 @@ TicketDictResolution=Bilet - rozwiązanie
 
 TicketTypeShortCOM=Pytanie handlowe
 TicketTypeShortHELP=Prośba o pomoc funkcjonalną
-TicketTypeShortISSUE=Problem, błąd lub problem
+TicketTypeShortISSUE=Problem lub błąd
+TicketTypeShortPROBLEM=Problem
 TicketTypeShortREQUEST=Prośba o zmianę lub ulepszenie
 TicketTypeShortPROJET=Projekt
 TicketTypeShortOTHER=Inne
@@ -54,14 +55,15 @@ TypeContact_ticket_internal_SUPPORTTEC=Przypisany użytkownik
 TypeContact_ticket_external_SUPPORTCLI=Kontakt z klientem / śledzenie incydentów
 TypeContact_ticket_external_CONTRIBUTOR=Współpracownik zewnętrzny
 
-OriginEmail=Źródło wiadomości e-mail
+OriginEmail=Reporter Email
 Notify_TICKET_SENTBYMAIL=Wyślij wiadomość e-mail z biletem
 
 # Status
 Read=Czytać
 Assigned=Przydzielony
 InProgress=W trakcie
-NeedMoreInformation=Czekam na informacje
+NeedMoreInformation=Czekam na opinię reportera
+NeedMoreInformationShort=Czekam na informację zwrotną
 Answered=Odpowiedział
 Waiting=Czekanie
 Closed=Zamknięte
@@ -160,7 +162,7 @@ CreatedBy=Stworzone przez
 NewTicket=Nowy bilet
 SubjectAnswerToTicket=Odpowiedź na bilet
 TicketTypeRequest=Rodzaj żądania
-TicketCategory=Grupa
+TicketCategory=Kategoryzacja biletów
 SeeTicket=Zobacz bilet
 TicketMarkedAsRead=Bilet został oznaczony jako przeczytany
 TicketReadOn=Czytaj
@@ -211,6 +213,7 @@ TicketMessageHelp=Tylko ten tekst zostanie zapisany na liście wiadomości na ka
 TicketMessageSubstitutionReplacedByGenericValues=Zmienne podstawienia są zastępowane wartościami ogólnymi.
 TimeElapsedSince=Czas, który upłynął od
 TicketTimeToRead=Upłynął czas przed przeczytaniem
+TicketTimeElapsedBeforeSince=Czas, jaki upłynął przed / od
 TicketContacts=Bilet kontaktów
 TicketDocumentsLinked=Dokumenty powiązane z biletem
 ConfirmReOpenTicket=Potwierdzić ponowne otwarcie tego biletu?
@@ -304,7 +307,7 @@ BoxLastModifiedTicket=Najnowsze zmodyfikowane bilety
 BoxLastModifiedTicketDescription=Najnowsze zmodyfikowane bilety %s
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=Brak ostatnio zmodyfikowanych biletów
-BoxTicketType=Distribution of open tickets by type
+BoxTicketType=Dystrybucja biletów otwartych według rodzaju
 BoxTicketSeverity=Liczba otwartych zgłoszeń według ważności
 BoxNoTicketSeverity=Nie otwarto żadnych biletów
 BoxTicketLastXDays=Liczba nowych biletów według dni w ostatnich dniach %s
diff --git a/htdocs/langs/pl_PL/users.lang b/htdocs/langs/pl_PL/users.lang
index 5b90f788d94..1b279bb0802 100644
--- a/htdocs/langs/pl_PL/users.lang
+++ b/htdocs/langs/pl_PL/users.lang
@@ -97,7 +97,7 @@ LoginToCreate=Login do utworzenia
 NameToCreate=Nazwa kontrahenta do utworzenia
 YourRole=Twoje role
 YourQuotaOfUsersIsReached=Limitu aktywnych użytkowników został osiągnięty!
-NbOfUsers=Ilość użytkowników
+NbOfUsers=Liczba użytkowników
 NbOfPermissions=Liczba uprawnień
 DontDowngradeSuperAdmin=Tylko superadmin niższej wersji superadmin
 HierarchicalResponsible=Kierownik
diff --git a/htdocs/langs/pl_PL/website.lang b/htdocs/langs/pl_PL/website.lang
index 8d0cceb3e47..e2741fb1e0b 100644
--- a/htdocs/langs/pl_PL/website.lang
+++ b/htdocs/langs/pl_PL/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Dodaj witrynę
 Webpage=Strona/pojemnik
 AddPage=Dodaj stronę
 PageContainer=Strona
-PreviewOfSiteNotYetAvailable=Podgląd Twej witryny <strong>%s</strong> nie jest jeszcze dostępny. Użyj wpierw '<strong>Załaduj szablon witryny</strong>' lub '<strong>Dodaj stronę/pojemnik</strong>'.
+PreviewOfSiteNotYetAvailable=Podgląd Twojej witryny <strong> %s </strong> nie jest jeszcze dostępny. Musisz najpierw ' <strong> Zaimportuj pełny szablon witryny </strong> ' lub po prostu ' <strong> Dodaj stronę/kontener </strong> '.
 RequestedPageHasNoContentYet=Żądana strona o identyfikatorze %s nie ma jeszcze treści lub plik pamięci podręcznej .tpl.php został usunięty. Edytuj zawartość strony, aby to rozwiązać.
 SiteDeleted=Witryna '%s' usunięta
 PageContent=Strona/pojemnik
diff --git a/htdocs/langs/pt_AO/admin.lang b/htdocs/langs/pt_AO/admin.lang
deleted file mode 100644
index 4b09f74acdb..00000000000
--- a/htdocs/langs/pt_AO/admin.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - admin
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
diff --git a/htdocs/langs/pt_AO/products.lang b/htdocs/langs/pt_AO/products.lang
deleted file mode 100644
index e0628dbec00..00000000000
--- a/htdocs/langs/pt_AO/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
diff --git a/htdocs/langs/pt_AO/salaries.lang b/htdocs/langs/pt_AO/salaries.lang
deleted file mode 100644
index c9bd3bec17b..00000000000
--- a/htdocs/langs/pt_AO/salaries.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - salaries
-LastSalaries=Latest %s salary payments
-AllSalaries=All salary payments
diff --git a/htdocs/langs/pt_AO/ticket.lang b/htdocs/langs/pt_AO/ticket.lang
deleted file mode 100644
index 92d813e1638..00000000000
--- a/htdocs/langs/pt_AO/ticket.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - ticket
-OriginEmail=Email source
-TicketCategory=Group
diff --git a/htdocs/langs/pt_AO/website.lang b/htdocs/langs/pt_AO/website.lang
deleted file mode 100644
index 910cff6b702..00000000000
--- a/htdocs/langs/pt_AO/website.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - website
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
diff --git a/htdocs/langs/pt_BR/admin.lang b/htdocs/langs/pt_BR/admin.lang
index 27285bad626..36914011a28 100644
--- a/htdocs/langs/pt_BR/admin.lang
+++ b/htdocs/langs/pt_BR/admin.lang
@@ -954,8 +954,6 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=Você deve rodar esse comando n
 YourPHPDoesNotHaveSSLSupport=Função SSL functions não está disponível no seu PHP
 DownloadMoreSkins=Mais skins para baixar
 SimpleNumRefModelDesc=Retorna o número de referência no formato %s yymm-nnnn onde yy é o ano, mm é o mês e nnnn é um número de incremento automático sequencial sem redefinição
-ShowProfIdInAddress=Mostrar ID profissional com endereços
-ShowVATIntaInAddress=Ocultar o número de IVA intracomunitário com endereços
 MeteoStdModEnabled=Modo padrão habilitado
 MeteoPercentageMod=Modo porcentagem
 MeteoPercentageModEnabled=Modo de porcentagem habilitado
@@ -1574,6 +1572,7 @@ AGENDA_EVENT_DEFAULT_STATUS=Status de evento padrão ao criar um evento a partir
 YouShouldDisablePHPFunctions=Você deve desabilitar funções PHP
 NoWritableFilesFoundIntoRootDir=Nenhum arquivo gravável ou diretório de programas comuns foi encontrado em seu diretório raiz (bom)
 RecommendedValueIs=Recomendado: %s
+Recommended=Versão Recomendada
 ARestrictedPath=Caminho restrito
 CheckForModuleUpdate=Verificar se há atualizações para módulos externos
 CheckForModuleUpdateHelp=Esta ação se conectará a editores de módulos externos para verificar se uma nova versão está disponível.
diff --git a/htdocs/langs/pt_BR/boxes.lang b/htdocs/langs/pt_BR/boxes.lang
index 754400bc9cb..c885132ee70 100644
--- a/htdocs/langs/pt_BR/boxes.lang
+++ b/htdocs/langs/pt_BR/boxes.lang
@@ -67,8 +67,6 @@ BoxTitleLatestModifiedSupplierOrders=Ordens do Vendedor: último %s modificado
 BoxTitleLastModifiedCustomerBills=Faturas do cliente: último %s modificado
 BoxTitleLastModifiedCustomerOrders=Pedidos de Vendas: último %s modificado
 BoxTitleLastModifiedPropals=Últimas %s propostas modificadas
-BoxTitleLatestModifiedJobPositions=Últimos %s trabalhos alterados
-BoxTitleLatestModifiedCandidatures=Últimas %s candidaturas alteradas
 ForCustomersInvoices=Faturas de clientes
 ForCustomersOrders=Pedidos de clientes
 LastXMonthRolling=Ultima %s mensal
diff --git a/htdocs/langs/pt_BR/interventions.lang b/htdocs/langs/pt_BR/interventions.lang
index 278d3168e9e..b9ec79fa37e 100644
--- a/htdocs/langs/pt_BR/interventions.lang
+++ b/htdocs/langs/pt_BR/interventions.lang
@@ -43,7 +43,11 @@ InterRef=Intervenção ref.
 InterDateCreation=Intervenção data de criação
 InterDuration=Duração intervenção
 InterStatus=Status de intervenção
+InterLine=Linha de intervenção
 InterLineId=Linha id de intervenção
 InterLineDate=Linha da data de intervenção
 InterLineDuration=Linha de duração de intervenção
 InterLineDesc=Linha de descrição de intervenção
+RepeatableIntervention=Modelo de intervenção
+ToCreateAPredefinedIntervention=Para criar uma intervenção predefinida ou recorrente, crie uma intervenção comum e converta-a em modelo de intervenção
+ConfirmReopenIntervention=Deseja abrir novamente a intervenção <b> %s </b>?
diff --git a/htdocs/langs/pt_BR/productbatch.lang b/htdocs/langs/pt_BR/productbatch.lang
index 45766536b7e..de94cb1f0cf 100644
--- a/htdocs/langs/pt_BR/productbatch.lang
+++ b/htdocs/langs/pt_BR/productbatch.lang
@@ -22,10 +22,5 @@ ShowCurrentStockOfLot=Exibir o estoque atual para o produto/lote
 ShowLogOfMovementIfLot=Exibir o registro de movimentações para o produto/lote
 SerialNumberAlreadyInUse=O número de série %s já é usado para o produto %s
 TooManyQtyForSerialNumber=Você só pode ter um produto %s para o número de série %s
-BatchLotNumberingModules=Opções para geração automática de produtos em lote gerenciados por lotes
-BatchSerialNumberingModules=Opções para geração automática de produtos em lote gerenciados por números de série
 ManageLotMask=Máscara personalizada
-CustomMasks=Adiciona uma opção para definir máscara no cartão do produto
-LotProductTooltip=Adiciona opção ao cartão do produto para definir uma máscara de número de lote dedicado
-SNProductTooltip=Adiciona opção ao cartão do produto para definir uma máscara de número de série dedicada
 QtyToAddAfterBarcodeScan=Quantidade a adicionar para cada código de barras / lote / série digitalizada
diff --git a/htdocs/langs/pt_BR/salaries.lang b/htdocs/langs/pt_BR/salaries.lang
index 28c7dfdb337..0ac1be4f306 100644
--- a/htdocs/langs/pt_BR/salaries.lang
+++ b/htdocs/langs/pt_BR/salaries.lang
@@ -2,14 +2,16 @@
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Conta contábil usada para terceiros usuários
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=A conta contábil dedicada definida no cartão de usuário será usada somente para a contabilidade da Subconta. Este será usado para Contabilidade Geral e como valor padrão da contabilidade do Contador, se a conta contábil do usuário dedicada no usuário não estiver definida.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Conta da Contabilidade padrão para pagamentos de salário
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=Por padrão, deixe em branco a opção "Criar automaticamente um pagamento total" ao criar um Salário
+NewSalary=Novo salário
 NewSalaryPayment=Novo cartão de salário
 AddSalaryPayment=Adicionar pagamento de salário
 SalaryPayment=Pagamento de salário
 SalariesPayments=Pagamentos de salários
+SalariesPaymentsOf=Pagamentos de salários de %s
 THM=Taxa média horária
 TJM=Taxa média diária
 THMDescription=Este valor pode ser usado para calcular o custo de tempo consumido em um projeto entrado pelos usuários se o módulo projeto for usado
 TJMDescription=Este valor é usado apenas como informação e não será usado em nenhum cálculo
-LastSalaries=Últimos pagamentos de salário %s
 SalariesStatistics=Estatísticas salariais
 SalariesAndPayments=Salários e pagamentos
diff --git a/htdocs/langs/pt_BR/users.lang b/htdocs/langs/pt_BR/users.lang
index 2c5afbce683..bdf5802dfe9 100644
--- a/htdocs/langs/pt_BR/users.lang
+++ b/htdocs/langs/pt_BR/users.lang
@@ -80,8 +80,6 @@ LoginToCreate=Login a Criar
 NameToCreate=Nome do Fornecedor a Criar
 YourRole=Suas funções
 YourQuotaOfUsersIsReached=Sua cota de usuarios ativos atingida !
-NbOfUsers=N°. de usuários
-NbOfPermissions=N°. de permissões
 DontDowngradeSuperAdmin=Somente um Super Administrador pode rebaixar um Super Administrador
 HierarchicView=Visão hierárquica
 UseTypeFieldToChange=Use campo Tipo para mudar
diff --git a/htdocs/langs/pt_BR/website.lang b/htdocs/langs/pt_BR/website.lang
index b7439263c5b..a5781ea5a75 100644
--- a/htdocs/langs/pt_BR/website.lang
+++ b/htdocs/langs/pt_BR/website.lang
@@ -18,7 +18,6 @@ MediaFiles=Biblioteca de mídias
 AddWebsite=Adicionar site
 Webpage=Página WEB / container
 AddPage=Adicionar página / recipiente
-PreviewOfSiteNotYetAvailable=Pré-visualização do seu site <strong>%s</strong> ainda não estão disponíveis. Você deve primeiro <strong>Importar um modelo de site completo</strong> ou apenas <strong>Adicionar uma página / contêiner</strong>
 RequestedPageHasNoContentYet=A página solicitada com id %s ainda não possui conteúdo ou o arquivo de cache .tpl.php foi removido. Edite o conteúdo da página para resolver isso.
 PageContent=Página / Contenair
 PageDeleted=Página / Contenair '%s' do site %s excluído
diff --git a/htdocs/langs/pt_PT/admin.lang b/htdocs/langs/pt_PT/admin.lang
index bf2343c7c7c..f72525c7626 100644
--- a/htdocs/langs/pt_PT/admin.lang
+++ b/htdocs/langs/pt_PT/admin.lang
@@ -53,6 +53,7 @@ InternalUser=Utilizador interno
 ExternalUser=Utilizador externo
 InternalUsers=Utilizadores internos
 ExternalUsers=Utilizadores externos
+UserInterface=User interface
 GUISetup=Aparência
 SetupArea=Configuração
 UploadNewTemplate=Carregar novo(s) modelo(s)
@@ -1260,8 +1261,8 @@ YourPHPDoesNotHaveSSLSupport=Funções SSL não estão disponíveis no seu PHP
 DownloadMoreSkins=Mais temas para descarregar
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
-ShowProfIdInAddress=Mostrar id profissional com endereços
-ShowVATIntaInAddress=Ocultar número de IVA intracomunitário com endereços
+ShowProfIdInAddress=Show professional ID with addresses
+ShowVATIntaInAddress=Hide intra-Community VAT number
 TranslationUncomplete=Tradução parcial
 MAIN_DISABLE_METEO=Desativar vista meteorológica
 MeteoStdMod=Modo padrão
@@ -1778,7 +1779,7 @@ ClickToDialSetup=Configuração do módulo "Click To Dial"
 ClickToDialUrlDesc=Uma chamada é efetuada quando o icon é clicado. No URL pode usar as tags:<br><b>__PHONETO__</b> que será substituída pelo número do destinatário<br><b>__PHONEFROM__</b> que será substituída pelo número do remetente<br><b>__LOGIN__</b> que será substituída pelo nome de utilizador da sua conta ClickToDial (definido no seu cartão de utilizador)<br><b>__PASS__</b>  que será substituída pela palavra-passe da sua conta ClickToDial (definida no seu cartão de utilizador).
 ClickToDialDesc=Este módulo altera os números de telefone, ao usar um computador desktop, em links clicáveis. Um clique ligará para o número. Isso pode ser usado para iniciar a chamada telefônica ao usar um softphone em sua área de trabalho ou ao usar um sistema CTI baseado no protocolo SIP, por exemplo. Nota: Ao usar um smartphone, os números de telefone são sempre clicáveis.
 ClickToDialUseTelLink=Usar apenas um link "tel:" em números de telefone
-ClickToDialUseTelLinkDesc=Use esse método se os usuários tiverem um softphone ou uma interface de software instalada no mesmo computador que o navegador e chamados quando você clicar em um link em seu navegador que comece com "tel:". Se você precisar de uma solução de servidor completa (sem necessidade de instalação de software local), deverá definir isso como "Não" e preencher o próximo campo.
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface, installed on the same computer as the browser, and called when you click on a link starting with "tel:" in your browser. If you need link that start with "sip:" or a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Ponto de venda
 CashDeskSetup=Configuração do módulo de ponto de vendas
@@ -2133,7 +2134,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
-NotRecommended=Not recommanded
+Recommended=Recomendada
+NotRecommended=Not recommended
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
@@ -2144,3 +2146,5 @@ YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You s
 RandomlySelectedIfSeveral=Randomly selected if several pictures are available
 DatabasePasswordObfuscated=Database password is obfuscated in conf file
 DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
+APIsAreNotEnabled=APIs modules are not enabled
+YouShouldSetThisToOff=You should set this to 0 or off
diff --git a/htdocs/langs/pt_PT/banks.lang b/htdocs/langs/pt_PT/banks.lang
index 85603fd0468..1d0e8eb31e6 100644
--- a/htdocs/langs/pt_PT/banks.lang
+++ b/htdocs/langs/pt_PT/banks.lang
@@ -115,7 +115,7 @@ TransferTo=Para
 TransferFromToDone=A transferência de <b>%s</b> para <b>%s</b> de <b>%s</b> %s foi criado.
 CheckTransmitter=Remetente
 ValidateCheckReceipt=Validar este recibo do cheque?
-ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes will be possible once validated.
 DeleteCheckReceipt=Eliminar este recibo do cheque?
 ConfirmDeleteCheckReceipt=Tem a certeza que deseja eliminar este recibo do cheque?
 BankChecks=Cheques
diff --git a/htdocs/langs/pt_PT/boxes.lang b/htdocs/langs/pt_PT/boxes.lang
index ee2cd22129a..853020046bd 100644
--- a/htdocs/langs/pt_PT/boxes.lang
+++ b/htdocs/langs/pt_PT/boxes.lang
@@ -91,8 +91,8 @@ BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
 BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
 BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
 BoxTitleLastModifiedPropals=Últimos %s orçamentos modificados
-BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
-BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
+BoxTitleLatestModifiedJobPositions=Latest %s modified job positions
+BoxTitleLatestModifiedCandidatures=Latest %s modified job applications
 ForCustomersInvoices=Faturas a clientes
 ForCustomersOrders=Encomendas de clientes
 ForProposals=Orçamentos
diff --git a/htdocs/langs/pt_PT/cashdesk.lang b/htdocs/langs/pt_PT/cashdesk.lang
index a059b6468ae..eadcfcae193 100644
--- a/htdocs/langs/pt_PT/cashdesk.lang
+++ b/htdocs/langs/pt_PT/cashdesk.lang
@@ -127,4 +127,4 @@ AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
 ShowPriceHT = Display the column with the price excluding tax (on screen)
-ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on the receipt)
diff --git a/htdocs/langs/pt_PT/errors.lang b/htdocs/langs/pt_PT/errors.lang
index 7d316d41ca5..0f42a4312d1 100644
--- a/htdocs/langs/pt_PT/errors.lang
+++ b/htdocs/langs/pt_PT/errors.lang
@@ -301,3 +301,4 @@ ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
 ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
+ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
diff --git a/htdocs/langs/pt_PT/eventorganization.lang b/htdocs/langs/pt_PT/eventorganization.lang
index eb73e2c1707..0ddb14901dd 100644
--- a/htdocs/langs/pt_PT/eventorganization.lang
+++ b/htdocs/langs/pt_PT/eventorganization.lang
@@ -86,6 +86,7 @@ DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
 SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
 SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
+NbVotes=Number of votes
 #
 # Status
 #
@@ -115,6 +116,9 @@ EvntOrgDuration = This conference starts on %s and ends on %s.
 ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
 BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
 EventType = Tipo de evento
+LabelOfBooth=Booth label
+LabelOfconference=Conference label
+ConferenceIsNotConfirmed=Subcription not available, conference is not confirmed yet
 
 #
 # Vote page
diff --git a/htdocs/langs/pt_PT/install.lang b/htdocs/langs/pt_PT/install.lang
index af06712e5be..5d2e091ca1b 100644
--- a/htdocs/langs/pt_PT/install.lang
+++ b/htdocs/langs/pt_PT/install.lang
@@ -206,6 +206,7 @@ MigrationUserPhotoPath=Migration of photo paths for users
 MigrationFieldsSocialNetworks=Migration of users fields social networks (%s)
 MigrationReloadModule=Recarregar módulo %s
 MigrationResetBlockedLog=Restabelecer o módulo BlockedLog para o algoritmo v7
+MigrationImportOrExportProfiles=Migration of import or export profiles (%s)
 ShowNotAvailableOptions=Mostrar opções indisponíveis
 HideNotAvailableOptions=Ocultar opções indisponíveis
 ErrorFoundDuringMigration=Erro (s) foram relatados durante o processo de migração, portanto, a próxima etapa não está disponível. Para ignorar erros, você pode <a href="%s"> clicar aqui </a>, mas o aplicativo ou alguns recursos podem não funcionar corretamente até que os erros sejam resolvidos.
diff --git a/htdocs/langs/pt_PT/main.lang b/htdocs/langs/pt_PT/main.lang
index 95ae942396c..18e05d7c5c8 100644
--- a/htdocs/langs/pt_PT/main.lang
+++ b/htdocs/langs/pt_PT/main.lang
@@ -934,13 +934,13 @@ EMailTemplates=Modelos de e-mail
 FileNotShared=Ficheiro não partilhado para o público exterior.
 Project=Projeto
 Projects=Projetos
-LeadOrProject=Pista | Projecto
-LeadsOrProjects=Pistas | Projectos
+LeadOrProject=Oportunidade | Projecto
+LeadsOrProjects=Oportunidades | Projectos
 Lead=Pista
 Leads=Pistas
-ListOpenLeads=Listar pistas em aberto
+ListOpenLeads=Listar Oportunidade(s) aberta(s)
 ListOpenProjects=Listar projectos em aberto
-NewLeadOrProject=Nova pista ou projecto
+NewLeadOrProject=Nova(o) Oportunidade ou projecto
 Rights=Permissões
 LineNb=Linha número
 IncotermLabel=Incoterms
diff --git a/htdocs/langs/pt_PT/productbatch.lang b/htdocs/langs/pt_PT/productbatch.lang
index 508a22b0668..660b82a8081 100644
--- a/htdocs/langs/pt_PT/productbatch.lang
+++ b/htdocs/langs/pt_PT/productbatch.lang
@@ -26,12 +26,10 @@ ShowLogOfMovementIfLot=Mostrar registo de movimentos para cada par produto/lote
 StockDetailPerBatch=Detalhes do estoque por lote
 SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
-BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
-BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
 ManageLotMask=Custom mask
-CustomMasks=Adds an option to define mask in the product card
-LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
-SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+CustomMasks=Option to define a different numbering mask for each product
+BatchLotNumberingModules=Numbering rule for automatic generation of lot number
+BatchSerialNumberingModules=Numbering rule for automatic generation of serial number (for products with property 1 unique lot/serial for each product)
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
diff --git a/htdocs/langs/pt_PT/products.lang b/htdocs/langs/pt_PT/products.lang
index 0d6f2756144..46c01b483b5 100644
--- a/htdocs/langs/pt_PT/products.lang
+++ b/htdocs/langs/pt_PT/products.lang
@@ -277,7 +277,7 @@ PriceByCustomer=Preços diferentes para cada cliente
 PriceCatalogue=Um único preço de venda por produto / serviço
 PricingRule=Regras para preços de venda
 AddCustomerPrice=Adicionar preço por produto
-ForceUpdateChildPriceSoc=Definir o mesmo preço em subsidiárias de clientes
+ForceUpdateChildPriceSoc=Set same price on customer's subsidiaries
 PriceByCustomerLog=Log dos preços anteriores do cliente
 MinimumPriceLimit=O preço mínimo não pode ser menor que %s
 MinimumRecommendedPrice=Minimum recommended price is: %s
@@ -296,6 +296,7 @@ ComposedProductIncDecStock=Aumentar / Diminuir o estoque na mudança pai
 ComposedProduct=Child products
 MinSupplierPrice=Preço de compra mínimo
 MinCustomerPrice=Preço mínimo de venda
+NoDynamicPrice=No dynamic price
 DynamicPriceConfiguration=Configuração dinâmica de preços
 DynamicPriceDesc=You may define mathematical formulae to calculate Customer or Vendor prices. Such formulas can use all mathematical operators, some constants and variables. You can define here the variables you wish to use. If the variable needs an automatic update, you may define the external URL to allow Dolibarr to update the value automatically.
 AddVariable=Adicionar Variável
diff --git a/htdocs/langs/pt_PT/salaries.lang b/htdocs/langs/pt_PT/salaries.lang
index 317b98ad927..a3830a5441d 100644
--- a/htdocs/langs/pt_PT/salaries.lang
+++ b/htdocs/langs/pt_PT/salaries.lang
@@ -2,20 +2,23 @@
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Conta contabilística utilizada para utilizadores de terceiros
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Conta contabilística usada por defeito para pagamentos de salários
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=By default, leave empty the option "Automatically create a total payment" when creating a Salary
 Salary=Salário
 Salaries=Salários
-NewSalaryPayment=Novo Pagamento de Salário
+NewSalary=New salary
+NewSalaryPayment=New salary card
 AddSalaryPayment=Add salary payment
 SalaryPayment=Pagamento de Salário
 SalariesPayments=Pagamentos de Salários
+SalariesPaymentsOf=Salaries payments of %s
 ShowSalaryPayment=Mostrar pagamento de salário
 THM=Taxa horária média
 TJM=Taxa diária média
 CurrentSalary=Salário atual
 THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
 TJMDescription=This value is currently for information only and is not used for any calculation
-LastSalaries=Últimos %s pagamentos salariais
-AllSalaries=Todos os pagamentos salariais
+LastSalaries=Latest %s salaries
+AllSalaries=All salaries
 SalariesStatistics=Salary statistics
-# Export
 SalariesAndPayments=Salaries and payments
+ConfirmDeleteSalaryPayment=Do you want to delete this salary payment ?
diff --git a/htdocs/langs/pt_PT/ticket.lang b/htdocs/langs/pt_PT/ticket.lang
index 841f949a4e8..d76ea1eaf46 100644
--- a/htdocs/langs/pt_PT/ticket.lang
+++ b/htdocs/langs/pt_PT/ticket.lang
@@ -34,7 +34,8 @@ TicketDictResolution=Ticket - Resolution
 
 TicketTypeShortCOM=Questão comercial
 TicketTypeShortHELP=Request for functionnal help
-TicketTypeShortISSUE=Issue, bug or problem
+TicketTypeShortISSUE=Issue or bug
+TicketTypeShortPROBLEM=Problem
 TicketTypeShortREQUEST=Change or enhancement request
 TicketTypeShortPROJET=Projeto
 TicketTypeShortOTHER=Outro
@@ -54,14 +55,15 @@ TypeContact_ticket_internal_SUPPORTTEC=Usuário atribuído
 TypeContact_ticket_external_SUPPORTCLI=Contato com o cliente / acompanhamento de incidentes
 TypeContact_ticket_external_CONTRIBUTOR=Colaborador externo
 
-OriginEmail=Fonte de e-mail
+OriginEmail=Reporter Email
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
 Read=Ler
 Assigned=Atribuído
 InProgress=Em progresso
-NeedMoreInformation=Waiting for information
+NeedMoreInformation=Waiting for reporter feedback
+NeedMoreInformationShort=Waiting for feedback
 Answered=Respondidas
 Waiting=Em espera
 Closed=Fechado
@@ -160,7 +162,7 @@ CreatedBy=Criado por
 NewTicket=Novo ticket
 SubjectAnswerToTicket=Bilhete de resposta
 TicketTypeRequest=Tipo de solicitação
-TicketCategory=Grupo
+TicketCategory=Ticket categorization
 SeeTicket=Ver ticket
 TicketMarkedAsRead=O ticket foi marcado como lido
 TicketReadOn=Lido a
@@ -211,6 +213,7 @@ TicketMessageHelp=Apenas este texto será salvo na lista de mensagens no cartão
 TicketMessageSubstitutionReplacedByGenericValues=As variáveis ​​de substituição são substituídas por valores genéricos.
 TimeElapsedSince=Tempo decorrido desde
 TicketTimeToRead=Tempo decorrido antes de ler
+TicketTimeElapsedBeforeSince=Time elapsed before / since
 TicketContacts=Ticket dos contactos
 TicketDocumentsLinked=Documentos ligados ao ticket
 ConfirmReOpenTicket=Confirmar reabertura deste ticket?
diff --git a/htdocs/langs/pt_PT/users.lang b/htdocs/langs/pt_PT/users.lang
index 89ff0bb9258..e3e157a101c 100644
--- a/htdocs/langs/pt_PT/users.lang
+++ b/htdocs/langs/pt_PT/users.lang
@@ -97,8 +97,8 @@ LoginToCreate=Iniciar a sessão para criar
 NameToCreate=Nome do Terceiro a Criar
 YourRole=As suas funções
 YourQuotaOfUsersIsReached=A sua quota de utilizadores ativos foi atingida!
-NbOfUsers=No. of users
-NbOfPermissions=No. of permissions
+NbOfUsers=Number of users
+NbOfPermissions=Number of permissions
 DontDowngradeSuperAdmin=Apenas um superadmin pode desclassificar um superadmin
 HierarchicalResponsible=Supervisor
 HierarchicView=Visualização Hierárquica
diff --git a/htdocs/langs/pt_PT/website.lang b/htdocs/langs/pt_PT/website.lang
index 9666ec3700a..8b21f3f8ce4 100644
--- a/htdocs/langs/pt_PT/website.lang
+++ b/htdocs/langs/pt_PT/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Adicionar site da Web
 Webpage=Página/recipiente da Web
 AddPage=Adicionar página/recipiente
 PageContainer=Página
-PreviewOfSiteNotYetAvailable=Pré-visualização do seu site <strong> %s </ strong> ainda não disponível. Você deve primeiro '<strong> Importar um modelo de site completo </ strong>' ou apenas '<strong> Adicionar uma página / contêiner </ strong>'.
+PreviewOfSiteNotYetAvailable=The preview of your website <strong>%s</strong> is not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Página solicitada com o ID %s ainda não tem conteúdo, ou o arquivo de cache .tpl.php foi removido. Edite o conteúdo da página para resolver isso.
 SiteDeleted=Web site '%s' excluído
 PageContent=Página / Recipiente
diff --git a/htdocs/langs/ro_RO/admin.lang b/htdocs/langs/ro_RO/admin.lang
index a04fad974ea..d559fac6ed8 100644
--- a/htdocs/langs/ro_RO/admin.lang
+++ b/htdocs/langs/ro_RO/admin.lang
@@ -53,6 +53,7 @@ InternalUser=Utilizator intern
 ExternalUser=Utilizator extern
 InternalUsers=Utilizatori interni
 ExternalUsers=Utilizatori externi
+UserInterface=Interfaţă utilizator
 GUISetup=Afişare
 SetupArea=Setări
 UploadNewTemplate=Încărcați șabloan(e) noi
@@ -1260,8 +1261,8 @@ YourPHPDoesNotHaveSSLSupport=Funcţiile SSL funcţii nu sunt disponibile în PHP
 DownloadMoreSkins=Mai multe teme de descărcat
 SimpleNumRefModelDesc=Returnează numărul de referință în formatul %s yymm-nnnn unde yy este anul, mm este luna și nnnn este un număr secvențial cu incrementare automată fără resetare
 SimpleNumRefNoDateModelDesc=Returnează numărul de referință în formatul %s-nnnn unde nnnn este un număr de incrementare automată secvențial fără resetare
-ShowProfIdInAddress=Afișare id profesional cu adrese
-ShowVATIntaInAddress=Ascunde cota de TVA intracomunitar cu adrese
+ShowProfIdInAddress=Afişează Id-ul profesional cu adresele
+ShowVATIntaInAddress=Ascunde codul de TVA intracomunitar
 TranslationUncomplete=Traducere parţială
 MAIN_DISABLE_METEO=Dezactivare vizualizarea meteorologică
 MeteoStdMod=Mod standard
@@ -1778,7 +1779,7 @@ ClickToDialSetup=Configurare modul Click To Dial
 ClickToDialUrlDesc=URL-ul se apelează când se face clic pe pictograma telefon. În URL, poţi utiliza etichete <br> <b> __PHONETO__ </b> care vor fi înlocuite cu numărul de telefon al persoanei de apelat <br><b>__PHONEFROM__</b> care va fi înlocuit cu numărul de telefon al apelantului (al tău) <br> <b>__LOGIN__</b> , care va fi înlocuit cu numele de autentificare clicktodial (definită pe fişa utilizator) <br><b>__PASS__</b> care va fi înlocuit cu parola clicktodial (definită pe fişa utilizator).
 ClickToDialDesc=Acest modul schimbă numerele de telefon, atunci când utilizați un computer desktop, în linkuri cu clic. Un clic va apela numărul. Acest lucru poate fi folosit pentru a porni apelul telefonic atunci când utilizați un telefon smart sau când utilizați un sistem CTI bazat pe protocolul SIP, de exemplu. Notă: Când utilizați un smartphone, numerele de telefon sunt întotdeauna făcute clic.
 ClickToDialUseTelLink=Utilizează doar link "tel:" pe numerele de telefon
-ClickToDialUseTelLinkDesc=Utilizați această metodă dacă utilizatorii dvs. au un smartphone sau o interfață software instalată pe același computer ca browserul și poţi apela când faci clic pe un link din browser care începe cu "tel:". Dacă aveți nevoie de o soluție completă de server (fără instalarea software locală), trebuie să setați această opțiune la "Nu" și să completați câmpul următor.
+ClickToDialUseTelLinkDesc=Utilizează această metodă dacă utilizatorii au un smartphone sau o interfață software, instalată pe același computer cu browserul și se poate apela când faceți clic pe un link care începe cu "tel:" direct din browser. Dacă aveți nevoie de un link care începe cu "sip:" sau o soluție completă de server (nu este nevoie de instalarea software-ului local), trebuie să setați la „"Nu" și să completați câmpul următor.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=POS
 CashDeskSetup=Configurare modul POS
@@ -2133,6 +2134,7 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Cu excepția cazului în care trebu
 PHPFunctionsRequiredForCLI=Pentru shell (cum ar fi jobul programat de backup sau rularea unui program antivirus), trebuie să păstrați funcțiile PHP 
 NoWritableFilesFoundIntoRootDir=Nu au fost găsite în directorul rădăcină fișiere sau directoare scriptibile ale programelor comune (OK) 
 RecommendedValueIs=Recomandat: %s
+Recommended=Recomandat
 NotRecommended=Nerecomandat
 ARestrictedPath=O cale restricţionată
 CheckForModuleUpdate=Verificare actualizări module externe
@@ -2144,3 +2146,5 @@ YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=Ai activat WS API care este învechi
 RandomlySelectedIfSeveral=Selectat aleatoriu dacă sunt disponibile mai multe imagini
 DatabasePasswordObfuscated=Parola bazei de date este eclipsată în fişierul conf
 DatabasePasswordNotObfuscated=Parola bazei de date NU este eclipsată în fişierul conf
+APIsAreNotEnabled=Modulele API nu sunt activate
+YouShouldSetThisToOff=Ar trebui să setezi la 0 sau dezactivat
diff --git a/htdocs/langs/ro_RO/banks.lang b/htdocs/langs/ro_RO/banks.lang
index c2c4abffe0c..f5f697dc0d3 100644
--- a/htdocs/langs/ro_RO/banks.lang
+++ b/htdocs/langs/ro_RO/banks.lang
@@ -115,7 +115,7 @@ TransferTo=La
 TransferFromToDone=Un transfer de la  <b>%s</b> la <b> %s </b>  de<b>%s</b> %s a fost înregistrat.
 CheckTransmitter=Expeditor
 ValidateCheckReceipt=Validați această chitanță cec?
-ConfirmValidateCheckReceipt=Sigur vrei să trimiteți spre validare această filă cec? Nu sunt posibile modificări ulterioare.
+ConfirmValidateCheckReceipt=Sigur vrei să trimiți această filă cec pentru validare? Nu vor fi posibile modificări după validare.
 DeleteCheckReceipt=Ștergeți această chitanță cec? 
 ConfirmDeleteCheckReceipt=Sigur stergeți această chitanță cec?
 BankChecks=Cecuri bancare
diff --git a/htdocs/langs/ro_RO/boxes.lang b/htdocs/langs/ro_RO/boxes.lang
index b487e847d65..c88b68e89db 100644
--- a/htdocs/langs/ro_RO/boxes.lang
+++ b/htdocs/langs/ro_RO/boxes.lang
@@ -91,8 +91,8 @@ BoxTitleLatestModifiedSupplierOrders=Comenzi furnizor: ultimele %s modificate
 BoxTitleLastModifiedCustomerBills=Facturi clienți: ultimele %s modificate
 BoxTitleLastModifiedCustomerOrders=Comenzi de vânzări: ultimele %s modificate
 BoxTitleLastModifiedPropals=Ultimele %s oferte modificate
-BoxTitleLatestModifiedJobPositions=Ultimile %s joburi modificate
-BoxTitleLatestModifiedCandidatures=Ultimile %s candidaturi job modificate
+BoxTitleLatestModifiedJobPositions=Ultimele %s joburi modificate
+BoxTitleLatestModifiedCandidatures=Ultimele %s aplicări la joburi modificate
 ForCustomersInvoices=Facturi clienţi
 ForCustomersOrders=Comenzi clienți
 ForProposals=Oferte
diff --git a/htdocs/langs/ro_RO/cashdesk.lang b/htdocs/langs/ro_RO/cashdesk.lang
index 917fa1d9320..5449d7aeb44 100644
--- a/htdocs/langs/ro_RO/cashdesk.lang
+++ b/htdocs/langs/ro_RO/cashdesk.lang
@@ -127,4 +127,4 @@ AllowDelayedPayment= Permite plata cu întârziere
 PrintPaymentMethodOnReceipts=Tipăriți metoda de plată pe bonuri|chitanțe 
 WeighingScale=Cântar
 ShowPriceHT = Afișare coloană preț fără taxe (pe ecran)
-ShowPriceHTOnReceipt = Afișare coloană preț fără taxe (pe bon)
+ShowPriceHTOnReceipt = Afișare coloană cu prețul fără taxe (pe chitanță/bon) 
diff --git a/htdocs/langs/ro_RO/errors.lang b/htdocs/langs/ro_RO/errors.lang
index ad6f11fd140..705f1d3ad97 100644
--- a/htdocs/langs/ro_RO/errors.lang
+++ b/htdocs/langs/ro_RO/errors.lang
@@ -301,3 +301,4 @@ ErrorActionCommPropertyUserowneridNotDefined=Utilizatorul deţinător este oblig
 ErrorActionCommBadType=Tipul evenimentului selectat (id: %n, cod: %s) nu există în dicţionarul Tipuri evenimente
 CheckVersionFail=Verificarea versiunii a eşuat
 ErrorWrongFileName=Numele fișierului nu poate să conțină _SOMETHING_ în el
+ErrorNotInDictionaryPaymentConditions=Nu se află în dicționarul Condiții de plată, vă rugăm să modificați.
diff --git a/htdocs/langs/ro_RO/eventorganization.lang b/htdocs/langs/ro_RO/eventorganization.lang
index d8703b49e48..5ec65a8c195 100644
--- a/htdocs/langs/ro_RO/eventorganization.lang
+++ b/htdocs/langs/ro_RO/eventorganization.lang
@@ -86,6 +86,7 @@ DownloadICSLink = Link descărcare ICS
 EVENTORGANIZATION_SECUREKEY = Cheie securizată link public de înregistrare la o conferință
 SERVICE_BOOTH_LOCATION = Serviciu utilizat pentru linia de facturare privind locaţia standului
 SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Serviciu utilizat pentru linia de facturare pentru o taxă de participare la o conferință
+NbVotes=Număr de voturi
 #
 # Status
 #
@@ -115,6 +116,9 @@ EvntOrgDuration = Această conferinţă începe pe %s şi se termină pe %s.
 ConferenceAttendeeFee = Taxă de participare la conferință pentru evenimentul: '%s' care are loc de pe %s până la %s.
 BoothLocationFee = Locaţie stand pentru evenimentul: '%s' care se desfăşoară între %s şi %s
 EventType = Tip eveniment
+LabelOfBooth=Etichetă stand
+LabelOfconference=Etichetă conferinţă
+ConferenceIsNotConfirmed=Înscrierea nu este disponibilă, conferinţa nu este confirmată încă
 
 #
 # Vote page
diff --git a/htdocs/langs/ro_RO/install.lang b/htdocs/langs/ro_RO/install.lang
index 9393f0ff547..88073532227 100644
--- a/htdocs/langs/ro_RO/install.lang
+++ b/htdocs/langs/ro_RO/install.lang
@@ -1,217 +1,218 @@
 # Dolibarr language file - Source file is en_US - install
 InstallEasy=Doar urmaţi instrucţiunile pas cu pas.
-MiscellaneousChecks=Verificare Cerinţe preliminare 
-ConfFileExists=<b>%s</b> fişierul de configurare există.
-ConfFileDoesNotExistsAndCouldNotBeCreated=Fișierul de configurare <b> %s </b> nu există și nu a putut fi creat!
-ConfFileCouldBeCreated=Fişier de configurare <b>%s</b> ar putea fi creat.
-ConfFileIsNotWritable=Fișierul de configurare <b> %s </b> nu poate fi scris. Verificați permisiunile. Pentru prima instalare, serverul dvs. web trebuie să poată scrie în acest fișier în timpul procesului de configurare ("chmod 666", de exemplu, pe un sistem de operare Unix).
-ConfFileIsWritable=<b>%s</b> fişier de configurare este de scriere.
-ConfFileMustBeAFileNotADir=Fișierul de configurare <b> %s </b> trebuie să fie un fișier, nu un director.
+MiscellaneousChecks=Verificare cerinţe preliminare 
+ConfFileExists=Fişierul de configurare <b>%s</b> există.
+ConfFileDoesNotExistsAndCouldNotBeCreated=Fișierul de configurare <b>%s</b> nu există și nu a putut fi creat!
+ConfFileCouldBeCreated=Fişierul de configurare <b>%s</b> ar putea fi creat.
+ConfFileIsNotWritable=Fișierul de configurare <b> %s </b> nu poate fi scris. Verificați permisiunile. Pentru prima instalare, serverul tău web trebuie să poată scrie în acest fișier în timpul procesului de configurare ("chmod 666", de exemplu, pe un sistem de operare Unix).
+ConfFileIsWritable=Fişierul de configurare <b>%s</b> se poate scrie.
+ConfFileMustBeAFileNotADir=Fișierul de configurare <b>%s</b> trebuie să fie un fișier, nu un director.
 ConfFileReload=Reîncărcarea parametrilor din fișierul de configurare.
-PHPSupportPOSTGETOk=Acest PHP suportă variabile POST si GET.
-PHPSupportPOSTGETKo=Este posibil ca configurarea dvs. PHP să nu accepte variabilele POST și/sau GET. Verificați parametrul <b> variables_order </b> în php.ini.
+PHPSupportPOSTGETOk=Acest PHP suportă variabile POST şi GET.
+PHPSupportPOSTGETKo=Este posibil ca configurarea PHP să nu accepte variabilele POST și/sau GET. Verificați parametrul <b>variables_order</b> în php.ini.
 PHPSupportSessions=Acest PHP susţine sesiuni.
 PHPSupport=Această versiune de PHP suportă funcţii %s.
-PHPMemoryOK=PHP max memorie sesiune este setată la <b>%s.</b> Acest lucru ar trebui să fie suficient.
-PHPMemoryTooLow=Memoria sesiunii PHP max este setată la <b> %s </b> octeți. Această valoare este prea mică. Schimbați-vă <b> php.ini </b> pentru a seta parametrul <b> memory_limit </b> la cel puțin <b> %s </b> octeți.
+PHPMemoryOK=Memoria max de sesiune din PHP este setată la <b>%s</b>. Acest lucru ar trebui să fie suficient.
+PHPMemoryTooLow=Memoria maximă a sesiunii PHP este setată la <b>%s </b> octeți. Această valoare este prea mică. Schimbați în <b>php.ini </b> pentru a seta parametrul <b> memory_limit</b> la cel puțin <b>%s</b> octeți.
 Recheck=Faceți clic aici pentru un test mai detaliat
-ErrorPHPDoesNotSupportSessions=Instalarea dvs. de PHP nu acceptă sesiuni. Această caracteristică este necesară pentru a permite Dolibarr să funcționeze. Verificați configurarea PHP și permisiunile directorului sesiunilor.
-ErrorPHPDoesNotSupportGD=Instalarea dvs. PHP nu suportă funcții grafice GD. Nu vor fi disponibile grafice.
-ErrorPHPDoesNotSupportCurl=Instalarea dvs. PHP nu suportă Curl.
+ErrorPHPDoesNotSupportSessions=Instalarea ta PHP nu acceptă sesiuni. Această caracteristică este necesară pentru a permite sistemului să funcționeze. Verificați configurarea PHP și permisiunile directorului sesiunilor.
+ErrorPHPDoesNotSupportGD=Instalarea PHP nu suportă funcții grafice GD. Nu vor fi disponibile grafice.
+ErrorPHPDoesNotSupportCurl=Instalarea ta PHP nu suportă Curl.
 ErrorPHPDoesNotSupportCalendar=Versiunea ta de PHP nu suportă extensii calendar.
-ErrorPHPDoesNotSupportUTF8=Instalarea dvs. de PHP nu suportă funcții UTF8. Dolibarr nu poate funcționa corect. Rezolvați acest lucru înainte de a instala Dolibarr.
+ErrorPHPDoesNotSupportUTF8=Instalarea ta PHP nu suportă funcții UTF8. Sistemul nu poate funcționa corect. Rezolvați acest lucru înainte de a instala.
 ErrorPHPDoesNotSupportIntl=Versiunea ta de PHP nu suportă funcţii Intl.
 ErrorPHPDoesNotSupportxDebug=Versiunea ta de PHP nu suportă funcţii de depanare extinse.
 ErrorPHPDoesNotSupport=Versiunea ta de PHP nu suportă funcţii %s.
-ErrorDirDoesNotExists=Directorul  %s  nu există.
+ErrorDirDoesNotExists=Directorul %s nu există.
 ErrorGoBackAndCorrectParameters=Întoarceți-vă și verificați/corectați parametrii.
-ErrorWrongValueForParameter=Este posibil să fi tastat greşit o valoare pentru parametrul &quot;%s&quot;.
+ErrorWrongValueForParameter=Este posibil să fi tastat greşit o valoare pentru parametrul '%s'.
 ErrorFailedToCreateDatabase=Eşec la crearea bazei de date '%s'.
 ErrorFailedToConnectToDatabase=Eşec la conectarea la baza de date '%s'.
-ErrorDatabaseVersionTooLow=Versiunea bazei de date (%s) prea veche. Versiunea %s este necesară.
-ErrorPHPVersionTooLow=PHP versiune prea veche. %s versiune este necesar.
-ErrorConnectedButDatabaseNotFound=Conectarea la server a reușit, dar baza de date "%s" nu a fost găsită.
+ErrorDatabaseVersionTooLow=Versiunea bazei de date (%s) este prea veche. Versiunea %s sau mai mare este necesară.
+ErrorPHPVersionTooLow=Versiune PHP prea veche. Versiunea %s este necesară.
+ErrorConnectedButDatabaseNotFound=Conectarea la server a reușit, dar baza de date '%s' nu a fost găsită.
 ErrorDatabaseAlreadyExists=Baza de date  '%s' există deja.
 IfDatabaseNotExistsGoBackAndUncheckCreate=Dacă baza de date nu există, reveniți și bifați opțiunea "Creare bază de date".
-IfDatabaseExistsGoBackAndCheckCreate=Dacă baza de date există deja, du-te înapoi şi debifaţi &quot;Crearea bazei de date&quot; opţiune.
+IfDatabaseExistsGoBackAndCheckCreate=Dacă baza de date există deja, du-te înapoi şi debifează opţiunea "Creare bază de date".
 WarningBrowserTooOld=Versiunea browserului este prea veche. Este recomandat să vă actualizați browserul la o versiune recentă de Firefox, Chrome sau Opera.
 PHPVersion=Versiunea PHP
 License=Utilizarea de licenţă
 ConfigurationFile=Fişier de configurare
-WebPagesDirectory=Director în cazul în care paginile web sunt stocate
-DocumentsDirectory=Director pentru a stoca documentele încărcate şi a generat
+WebPagesDirectory=Directorul în care paginile web sunt stocate
+DocumentsDirectory=Director de stocare documente încărcate şi documente generate
 URLRoot=URL Rădăcină 
-ForceHttps=Forţarea conexiuni securizate (HTTPS)
+ForceHttps=Forţează conexiuni securizate (HTTPS)
 CheckToForceHttps=Bifaţi această opţiune pentru a forţa conexiuni securizate (HTTPS). <br> Acest lucru presupune faptul că serverul de web este configurat cu un certificat SSL.
-DolibarrDatabase=Baza de date Dolibarr
-DatabaseType=Tip Baza de date 
+DolibarrDatabase=Baza de date
+DatabaseType=Tip bază de date 
 DriverType=Tip driver
 Server=Server
 ServerAddressDescription=Nume sau adresă IP pentru serverul de bază de date. De obicei, "localhost" când serverul bazei de date este găzduit pe același server ca serverul web.
-ServerPortDescription=Port-ul serverului de baze de date. Păstraţi gol, dacă necunoscut.
-DatabaseServer=Server  baze de date
+ServerPortDescription=Port-ul serverului de baze de date. Păstraţi gol, dacă este necunoscut.
+DatabaseServer=Server baze de date
 DatabaseName=Nume bază de date
-DatabasePrefix=Prefixul tabelului de bibliotecă
-DatabasePrefixDescription=Prefixul tabelului de bibliotecă. Dacă este gol, implicit este llx_.
-AdminLogin=Cont utilizator pentru proprietarul bazei de date Dolibarr.
+DatabasePrefix=Prefixul tabel bază de date
+DatabasePrefixDescription=Prefixul tabelului din baza de date. Dacă este gol, implicit este llx_.
+AdminLogin=Cont utilizator pentru proprietarul bazei de date a sistemului.
 PasswordAgain=Rescrieți confirmarea parolei
-AdminPassword=Parola pentru proprietarul bazei de date Dolibarr.
-CreateDatabase=Crearea bazei de date
-CreateUser=Creați un cont de utilizator sau acordați permisiunea unui cont de utilizator în baza de date Dolibarr
-DatabaseSuperUserAccess=Serverul de baze de date - superuser de acces
-CheckToCreateDatabase=Bifați caseta dacă baza de date nu există încă și trebuie să fie creată. <br> În acest caz, trebuie să completați și numele de utilizator și parola pentru contul superuser din partea de jos a acestei pagini.
-CheckToCreateUser=Bifați caseta dacă: <br> contul de utilizator al bazei de date nu există încă și astfel trebuie să fie creat sau <br> dacă există un cont de utilizator, dar baza de date nu există și permisiunile trebuie să fie acordate. <br> În acest caz, trebuie să introduceți contul de utilizator și parola și <b> și </b> numele și parola contului de superuser în partea de jos a acestei pagini. Dacă această casetă nu este bifată, proprietarul bazei de date și parola trebuie să existe deja.
-DatabaseRootLoginDescription=Nume de cont Superuser (pentru a crea noi baze de date sau noi utilizatori), obligatorie dacă baza de date sau proprietarul acesteia nu există deja.
+AdminPassword=Parola pentru proprietarul bazei de date a sistemului.
+CreateDatabase=Creare bază de date
+CreateUser=Creați un cont de utilizator sau acordați permisiunea unui cont de utilizator în baza de date a sistemului
+DatabaseSuperUserAccess=Server baze de date - Acces Superuser
+CheckToCreateDatabase=Bifează caseta dacă baza de date nu există încă și trebuie să fie creată. <br> În acest caz, trebuie să completați și numele de utilizator și parola pentru contul superuser din partea de jos a acestei pagini.
+CheckToCreateUser=Bifați dacă: <br> contul de utilizator al bazei de date nu există încă și astfel trebuie să fie creat sau <br> dacă există un cont de utilizator, dar baza de date nu există și permisiunile trebuie să fie acordate. <br> În acest caz, trebuie să introduceți contul de utilizator și parola și <b> și </b> numele și parola contului de superuser în partea de jos a acestei pagini. Dacă această casetă nu este bifată, proprietarul bazei de date și parola trebuie să existe deja.
+DatabaseRootLoginDescription=Nume de cont Superuser (pentru a crea noi baze de date sau noi utilizatori), obligatoriu dacă baza de date sau proprietarul acesteia nu există deja.
 KeepEmptyIfNoPassword=Lăsați gol dacă superuserul nu are parolă (NU se recomandă)
 SaveConfigurationFile=Salvează parametri la
 ServerConnection=Conexiune server
-DatabaseCreation=Baza de date crearea de
-CreateDatabaseObjects=Baza de date crearea de obiecte
-ReferenceDataLoading=Date de referinta de încărcare
-TablesAndPrimaryKeysCreation=Mese si primar cheile de creare
+DatabaseCreation=Creare bază de date
+CreateDatabaseObjects=Creare obiecte bază de date
+ReferenceDataLoading=Datele de referinţă se încarcă
+TablesAndPrimaryKeysCreation=Creare tabele şi chei primare
 CreateTableAndPrimaryKey=Creare tabel %s
-CreateOtherKeysForTable=Crearea cheile străine şi indicii pentru %s de masă
-OtherKeysCreation=Cheile străine şi crearea de indici
-FunctionsCreation=Creare Funcţii
-AdminAccountCreation=Administrator crearea de autentificare
+CreateOtherKeysForTable=Creare chei străine şi indecşi pentru tabelul %s
+OtherKeysCreation=Creare chei străine şi indecşi
+FunctionsCreation=Creare funcţii
+AdminAccountCreation=Creare autentificare Administrator
 PleaseTypePassword=Introduceți o parolă, parolele goale nu sunt permise!
 PleaseTypeALogin=Introduceți un nume de utilizator!
 PasswordsMismatch=Parolele diferă, încercați din nou!
-SetupEnd=Sfârşitul de configurare
-SystemIsInstalled=Această instalare este completă.
-SystemIsUpgraded=Dolibarr a fost actualizat cu succes.
-YouNeedToPersonalizeSetup=Trebuie să vă configuraţi Dolibarr pentru a se potrivi nevoilor dumneavoastră (aspect, caracteristici, ...). Pentru a face acest lucru, va rugam sa urmati link-ul de mai jos:
-AdminLoginCreatedSuccessfuly=Cont Dolibarr administrator '<b> %s </b>' creat cu succes.
-GoToDolibarr=Du-te la Dolibarr
-GoToSetupArea=Du-te la Dolibarr (zona de configurare)
+SetupEnd=Configurare finalizată
+SystemIsInstalled=Această instalare este finalizată.
+SystemIsUpgraded=Sistemul a fost actualizat cu succes.
+YouNeedToPersonalizeSetup=Trebuie să vă configuraţi sistemul pentru a se potrivi nevoilor dumneavoastră (aspect, caracteristici, ...). Pentru a face acest lucru, urmaţi link-ul de mai jos:
+AdminLoginCreatedSuccessfuly=Cont administrator sistem '<b>%s</b>' creat cu succes.
+GoToDolibarr=Du-te la sistem
+GoToSetupArea=Du-te în sistem (zona de configurare)
 MigrationNotFinished=Versiunea bazei de date nu este complet actualizată: executați din nou procesul de actualizare.
-GoToUpgradePage=Du-te la pagina din nou upgrade
-WithNoSlashAtTheEnd=Fără a slash &quot;/&quot; de la sfârşitul
+GoToUpgradePage=Mergi la pagina de upgrade din nou
+WithNoSlashAtTheEnd=Fără slash "/" la sfârşit
 DirectoryRecommendation=<span class="warning">IMPORTANT</span>:Trebuie să utilizați un director care se află în afara paginilor web (deci nu folosiți un subdirector al parametrului anterior).
 LoginAlreadyExists=Există deja
-DolibarrAdminLogin=Dolibarr admin autentificare
-AdminLoginAlreadyExists=Contul de administrator Dolibarr "<b> %s </b>" există deja. Întoarce-te dacă vrei să creezi altul.
-FailedToCreateAdminLogin=Nu ați reușit să creați contul de administrator Dolibarr.
-WarningRemoveInstallDir=Avertisment, din motive de securitate, odată ce instalarea sau actualizarea este completă, trebuie să adăugați un fișier numit <b> install.lock </b> în directorul de documente Dolibarr pentru a preveni utilizarea accidentală / rău intenționată a instrumentelor de instalare din nou .
+DolibarrAdminLogin=Sistem admin autentificare
+AdminLoginAlreadyExists=Contul de administrator sistem '<b>%s</b>' există deja. Întoarce-te dacă vrei să creezi altul.
+FailedToCreateAdminLogin=Eşec la crearea contului de administrator sistem.
+WarningRemoveInstallDir=Avertisment, din motive de securitate, odată ce instalarea sau actualizarea este completă, trebuie să adăugați un fișier numit <b>install.lock</b> în directorul de documente sistem pentru a preveni utilizarea accidentală/rău intenționată a instrumentelor de instalare din nou .
 FunctionNotAvailableInThisPHP=Nu este disponibil în acest PHP
 ChoosedMigrateScript=Alegeţi script-ul de migraţie
 DataMigration=Migrarea bazei de date (date)
-DatabaseMigration=Migrarea bazei de date (structura + unele date)
-ProcessMigrateScript=Script de prelucrare
-ChooseYourSetupMode=Alegeţi modul de configurare şi faceţi clic pe &quot;Start&quot; ...
+DatabaseMigration=Migrarea bazei de date (structură + unele date)
+ProcessMigrateScript=Scriptul procesează
+ChooseYourSetupMode=Alegeţi modul de configurare şi faceţi clic pe "Start"...
 FreshInstall=Instalare proaspătă
-FreshInstallDesc=Utilizați acest mod dacă aceasta este prima instalare. Dacă nu, acest mod poate repara o instalare anterioară incompletă. Dacă doriți să actualizați versiunea dvs., alegeți modul "Actualizare".
-Upgrade=Uaktualnij
-UpgradeDesc=Utilizaţi acest mod, dacă aţi înlocuit fişierele vechi Dolibarr cu fişiere dintr-o versiune mai nouă. Acest lucru se va actualiza baza de date şi de date.
+FreshInstallDesc=Utilizați acest mod dacă aceasta este prima instalare. Dacă nu, acest mod poate repara o instalare anterioară incompletă. Dacă doreşti să actualizezi versiunea ta, alege modul "Actualizare".
+Upgrade=Actualizare
+UpgradeDesc=Utilizaţi acest mod, dacă aţi înlocuit fişierele vechi Dolibarr cu fişiere dintr-o versiune mai nouă. Acest lucru va actualiza baza de date şi datele.
 Start=Începe
-InstallNotAllowed=Setup nu este permis de permisiuni <b>conf.php</b>
-YouMustCreateWithPermission=Trebuie să creaţi %s de fişiere şi setaţi permisiuni de scriere pe el pentru serverul de web în timpul procesului de instalare.
+InstallNotAllowed=Configurarea nu este permisă de permisiunile din <b>conf.php</b>
+YouMustCreateWithPermission=Trebuie să creaţi %s de fişiere şi setaţi permisiuni de scriere pe ele în timpul procesului de instalare.
 CorrectProblemAndReloadPage=Remediați problema și apăsați F5 pentru a reîncărca pagina.
 AlreadyDone=Migrat deja
 DatabaseVersion=Versiunea bazei de date
-ServerVersion=Baza de date server de versiune
-YouMustCreateItAndAllowServerToWrite=Trebuie să creaţi acest director şi pentru a permite serverului de web pentru a scrie în ea.
-DBSortingCollation=Caracter de sortare pentru
-YouAskDatabaseCreationSoDolibarrNeedToConnect=Ați selectat crearea bazei de date <b> %s </b>, dar pentru aceasta, Dolibarr trebuie să se conecteze la serverul <b> %s </b> cu permisiunile <b> %s </b>super-utilizatorului.
-YouAskLoginCreationSoDolibarrNeedToConnect=Ați selectat crearea bazei de date utilizator <b> %s </b>, dar pentru aceasta, Dolibarr trebuie să se conecteze la server<b> %s </b> cu permisiunile <b> %s </b>super-utilizatorului.
-BecauseConnectionFailedParametersMayBeWrong=Conectarea la baza de date a eșuat: parametrii gazdă sau ai super-utilizatorului trebuie să fie greșiți.
-OrphelinsPaymentsDetectedByMethod=Plata orfani detectat de %s metoda
+ServerVersion=Versiune bază de date server
+YouMustCreateItAndAllowServerToWrite=Trebuie să creaţi acest director şi să permite serverului web să scrie în el.
+DBSortingCollation=Ordine sortare caractere
+YouAskDatabaseCreationSoDolibarrNeedToConnect=Ați selectat crearea bazei de date <b> %s </b>, dar pentru aceasta, sistemul trebuie să se conecteze la serverul <b>%s</b> cu permisiunile <b>%s</b> de superutilizator.
+YouAskLoginCreationSoDolibarrNeedToConnect=Ați selectat crearea bazei de date utilizator <b>%s</b>, dar pentru aceasta, sistemul trebuie să se conecteze la server<b>%s</b> cu permisiunile <b>%s</b> de super-utilizator.
+BecauseConnectionFailedParametersMayBeWrong=Conectarea la baza de date a eșuat: parametrii gazdă sau ai super-utilizatorului ar putea să fie greșiți.
+OrphelinsPaymentsDetectedByMethod=Plăţi orfane au fost detectate de metoda %s
 RemoveItManuallyAndPressF5ToContinue=Scoateţi-l manual şi apăsaţi F5 pentru a continua.
 FieldRenamed=Câmp redenumit
 IfLoginDoesNotExistsCheckCreateUser=Dacă utilizatorul nu există încă, trebuie să bifați opțiunea "Creare utilizator"
-ErrorConnection=Server "<b> %s </b>", numele de bază de date "<b> %s </b>", conectați "<b> %s </b>" sau parola bazei de date poate fi greșită sau versiunea client PHP poate fi prea veche în comparație cu versiunea bazei de date.
-InstallChoiceRecommanded=Alegerea recomandate pentru a instala versiunea din <b>%s %s</b> versiunea sistemului de operare actuale
-InstallChoiceSuggested=<b>Instalaţi alegere sugerat de instalator.</b>
+ErrorConnection=Server "<b>%s</b>", nume bază de date "<b>%s </b>", cont autentificare "<b>%s</b>" sau parola poate fi greșită sau versiunea client PHP poate fi prea veche în comparație cu versiunea bazei de date.
+InstallChoiceRecommanded=Alegerea recomandată este pentru a instala versiunea <b>%s</b>pentru versiunea curentă <b>%s</b>
+InstallChoiceSuggested=<b>Instalează versiunea recomandată de installer</b>.
 MigrateIsDoneStepByStep=Versiunea vizată (%s) are un decalaj de mai multe versiuni. Expertul de instalare va reveni pentru a sugera o migrare ulterioară odată ce aceasta este completă.
-CheckThatDatabasenameIsCorrect=Verificați dacă numele de bază de date "<b> %s </b>" este corect.
-IfAlreadyExistsCheckOption=În cazul în care acest nume este corectă şi că baza de date nu există încă, trebuie să verificaţi opţiunea &quot;Creare bază de date&quot;.
-OpenBaseDir= Parametru openbasedir PHP 
-YouAskToCreateDatabaseSoRootRequired=Ați bifat caseta "Creare bază de date". Pentru aceasta, trebuie să furnizați login-ul/parola super-utilizatorului (partea de jos a formularului).
-YouAskToCreateDatabaseUserSoRootRequired=Ați bifat caseta "Crearea proprietarului bazei de date". Pentru aceasta, trebuie să furnizați login-ul / parola super-utilizatorului (partea de jos a formularului).
+CheckThatDatabasenameIsCorrect=Verificăi dacă numele de bază de date "<b>%s</b>" este corect.
+IfAlreadyExistsCheckOption=În cazul în care acest nume este corectă şi baza de date nu există încă, trebuie să bifaţi opţiunea "Creare bază de date".
+OpenBaseDir= Parametru PHP openbasedir 
+YouAskToCreateDatabaseSoRootRequired=Ați bifat caseta "Creare bază de date". Pentru aceasta, trebuie să furnizați nume utilizator/parola super-utilizatorului (partea de jos a formularului).
+YouAskToCreateDatabaseUserSoRootRequired=Ați bifat caseta "Creare proprietar bază de date". Pentru aceasta, trebuie să furnizați login/ parola super-utilizator (partea de jos a formularului).
 NextStepMightLastALongTime=Pasul curent poate dura câteva minute. Așteptați până când următorul ecran este afișat complet înainte de a continua.
-MigrationCustomerOrderShipping=Migrați transportul maritim pentru stocarea comenzilor de vânzări
-MigrationShippingDelivery=Upgrade de depozitare de transport maritim
-MigrationShippingDelivery2=Upgrade de depozitare de transport 2
-MigrationFinished=Migraţia terminată
-LastStepDesc=<strong> Ultimul pas </strong>: Definiți aici datele de autentificare și parola pe care doriți să le utilizați pentru a vă conecta la Dolibarr. <b> Nu pierdeți acest lucru deoarece este contul principal pentru a administra toate celelalte / conturi de utilizator suplimentare. </b>
-ActivateModule=Activaţi modul %s
-ShowEditTechnicalParameters=Click aici pentru a vedea / edita  parametrii avansaţi (mod expert)
-WarningUpgrade=Avertizare:\nAți executat mai întâi o copie de siguranță a bazei de date?\nAcest lucru este foarte recomandat. Pierderea de date (datorată, de exemplu, erorilor din versiunea mysql 5.5.40 / 41/42/43) poate fi posibilă în timpul acestui proces, deci este esențial să faceți o descărcare completă a bazei de date înainte de a începe orice migrare.\n\nFaceți clic pe OK pentru a începe procesul de migrare ...
-ErrorDatabaseVersionForbiddenForMigration=Versiunea bazei de date este %s. Are o eroare critică, ceea ce face posibilă pierderea datelor dacă efectuați modificări structurale în baza de date, cum este cazul procesului de migrare. Din acest motiv, migrarea nu va fi permisă până când nu actualizați baza de date la o versiune cu strat (patched) (lista versiunilor buggy cunoscute: %s)
+MigrationCustomerOrderShipping=Migrare livrări din comenzile de vânzare stocate
+MigrationShippingDelivery=Actualizare depozit de livrare
+MigrationShippingDelivery2=Actualizare depozit de livrare 2
+MigrationFinished=Migrarea a fost finalizată
+LastStepDesc=<strong>Ultimul pas</strong>: Definiți aici datele de autentificare și parola pe care doriți să le utilizați pentru a vă conecta la sistem. <b> Nu pierdeți aceste credenţiale deoarece este contul principal pentru a administra toate celelalte conturi de utilizator suplimentare. </b>
+ActivateModule=Activare modul %s
+ShowEditTechnicalParameters=Click aici pentru a vedea/edita parametrii avansaţi (mod expert)
+WarningUpgrade=Atenţie:\nAți executat mai întâi o copie de siguranță a bazei de date?\nAcest lucru este foarte recomandat. Pierderea de date (datorată, de exemplu, erorilor din versiunea mysql 5.5.40 / 41/42/43) poate fi posibilă în timpul acestui proces, deci este esențial să faceți un backup complet al bazei de date înainte de a începe orice migrare.\n\nClic pe OK pentru a începe procesul de migrare...
+ErrorDatabaseVersionForbiddenForMigration=Versiunea bazei de date este %s. Are o eroare critică, ceea ce face posibilă pierderea datelor dacă efectuați modificări structurale în baza de date, cum este cazul procesului de migrare. Din acest motiv, migrarea nu va fi permisă până când nu actualizați baza de date la o versiune cu strat (patched) (lista versiunilor defectuoase cunoscute: %s)
 KeepDefaultValuesWamp=Ați folosit expertul de configurare Dolibarr de la DoliWamp, deci valorile propuse aici sunt deja optimizate. Modificați-le numai dacă știți ce faceți.
 KeepDefaultValuesDeb=Ați folosit expertul de configurare Dolibarr dintr-un pachet Linux (Ubuntu, Debian, Fedora ...), deci valorile propuse aici sunt deja optimizate. Este necesar să introduceți numai parola proprietarului bazei de date. Modificați alți parametri numai dacă știți ce faceți.
 KeepDefaultValuesMamp=Ați folosit expertul de configurare Dolibarr de la DoliMamp, deci valorile propuse aici sunt deja optimizate. Modificați-le numai dacă știți ce faceți.
-KeepDefaultValuesProxmox=Ați folosit expertul de configurare Dolibarr de la un dispozitiv virtual Proxmox, deci valorile propuse aici sunt deja optimizate. Modificați-le numai dacă știți ce faceți.
+KeepDefaultValuesProxmox=Ați folosit expertul de configurare Dolibarr pentru o maşină virtuală Proxmox, deci valorile propuse aici sunt deja optimizate. Modificați-le numai dacă știți ce faceți.
 UpgradeExternalModule=Rulați procesul de actualizare specializat al modulului extern
-SetAtLeastOneOptionAsUrlParameter=Setați cel puțin o opțiune ca parametru în adresa URL. De exemplu: "... repair.php? Standard = confirmat"
+SetAtLeastOneOptionAsUrlParameter=Setează cel puțin o opțiune ca parametru în adresa URL. De exemplu: "...repair.php?standard=confirmed"
 NothingToDelete=Nimic de curățat/șters
 NothingToDo=Nimic de făcut
 #########
 # upgrade
-MigrationFixData=Fix pentru date denormalized
-MigrationOrder=Migrare a datelor pentru comenzile clienţilor
-MigrationSupplierOrder=Migrarea datelor pentru comenzile vânzătorului
+MigrationFixData=Reparare date denormalizate
+MigrationOrder=Migrarea datelor pentru comenzile clienţilor
+MigrationSupplierOrder=Migrarea datelor pentru comenzile furnizor
 MigrationProposal=Migrare de date pentru oferte comerciale
-MigrationInvoice=Migrare de date pentru facturile clienţilor
+MigrationInvoice=Migrarea datelor pentru facturi clienţi
 MigrationContract=Migrarea datelor pentru contracte
-MigrationSuccessfullUpdate=Upgrade de succes
+MigrationSuccessfullUpdate=Actualizare cu succes
 MigrationUpdateFailed=Procesul de actualizare a eşuat
-MigrationRelationshipTables=Migrare a datelor pentru tabelele relaţie (%s)
+MigrationRelationshipTables=Migrarea datelor pentru tabelele de relaţie (%s)
 MigrationPaymentsUpdate=Corecţie dată de plată 
-MigrationPaymentsNumberToUpdate=De plată %s (e) pentru a actualiza
-MigrationProcessPaymentUpdate=Actualizaţi plată (e) %s
-MigrationPaymentsNothingToUpdate=Nu există mai multe lucruri de făcut
-MigrationPaymentsNothingUpdatable=Nu mai multe plăţi, care pot fi corectate
-MigrationContractsUpdate=Contract de date de corecţie
-MigrationContractsNumberToUpdate=Contract de %s (e) pentru a actualiza
-MigrationContractsLineCreation=Creeze o linie contract pentru %s ref contract
-MigrationContractsNothingToUpdate=Nu există mai multe lucruri de făcut
-MigrationContractsFieldDontExist=Domeniul fk_facture nu mai există. Nimic de făcut.
-MigrationContractsEmptyDatesUpdate=Corecţie contract de gol data
-MigrationContractsEmptyDatesUpdateSuccess=Golirea datei goale a contractului a fost efectuată cu succes
-MigrationContractsEmptyDatesNothingToUpdate=Nici data contractului gol pentru a corecta
-MigrationContractsEmptyCreationDatesNothingToUpdate=Nici o creaţie data contractului pentru a corecta
-MigrationContractsInvalidDatesUpdate=Bad data valoarea contractului de corecţie
-MigrationContractsInvalidDateFix=%s incorect contractului (data contractului = %s, Incepand cu data de serviciu min = %s)
-MigrationContractsInvalidDatesNumber=Contracte de %s modificate
-MigrationContractsInvalidDatesNothingToUpdate=Nici o data cu valoarea rău pentru a corecta
-MigrationContractsIncoherentCreationDateUpdate=Bad contract de crearea de valoare data de corecţie
-MigrationContractsIncoherentCreationDateUpdateSuccess=Realizarea corecției datei de creare a contractelor cu valoarea greşită a reușit
-MigrationContractsIncoherentCreationDateNothingToUpdate=Nici o valoare rău pentru data de creare contractului pentru a corecta
-MigrationReopeningContracts=Contract de deschis închis de eroare
-MigrationReopenThisContract=Redeschide  contract %s 
-MigrationReopenedContractsNumber=%s Contracte modificate
-MigrationReopeningContractsNothingToUpdate=Nici un contract închis pentru a deschide
-MigrationBankTransfertsUpdate=Actualizați legăturile dintre înregistrarea bancară și un transfer bancar
-MigrationBankTransfertsNothingToUpdate=Toate link-uri sunt de până la zi
-MigrationShipmentOrderMatching=Trimiteri la data primirii de actualizare
-MigrationDeliveryOrderMatching=Livrare la primirea de actualizare
+MigrationPaymentsNumberToUpdate=%s plată(ţi) de actualizat
+MigrationProcessPaymentUpdate=Actualizare plată(ţi) %s
+MigrationPaymentsNothingToUpdate=Nu mai există nimic de făcut
+MigrationPaymentsNothingUpdatable=Nu mai sunt plăţi care pot fi corectate
+MigrationContractsUpdate=Corecţie date contract
+MigrationContractsNumberToUpdate= %s contract(e) de actualizat
+MigrationContractsLineCreation=Crează o linie de contract pentru contractul cu ref %s
+MigrationContractsNothingToUpdate=Nu mai există nimic de făcut
+MigrationContractsFieldDontExist=Câmpul fk_facture nu mai există. Nimic de făcut.
+MigrationContractsEmptyDatesUpdate=Corecţie dată necompletată contract
+MigrationContractsEmptyDatesUpdateSuccess=Corectarea contractului cu dată necompletată a fost efectuată cu succes
+MigrationContractsEmptyDatesNothingToUpdate=Niciun contract cu dată necompletată de corectat
+MigrationContractsEmptyCreationDatesNothingToUpdate=Nicio dată de creare a contractului de corectat
+MigrationContractsInvalidDatesUpdate=Valoarea eronată a contractului de corecţie
+MigrationContractsInvalidDateFix=Corecţie contract %s (data contractului = %s, data de începere a prestării serviciului min = %s)
+MigrationContractsInvalidDatesNumber=%s contracte modificate
+MigrationContractsInvalidDatesNothingToUpdate=Nicio dată cu valoare eronată de corectat
+MigrationContractsIncoherentCreationDateUpdate=Valoare eronată la corecţia datei contractului
+MigrationContractsIncoherentCreationDateUpdateSuccess=Corecţia datei de creare eronate a contractelor a fost efectuată cu succes
+MigrationContractsIncoherentCreationDateNothingToUpdate=Nicio valoare eronată pentru corecţia datei de creare a contractului
+MigrationReopeningContracts=Contract deschis dar închis din greşeală
+MigrationReopenThisContract=Redeschide contractul %s 
+MigrationReopenedContractsNumber=%s contracte modificate
+MigrationReopeningContractsNothingToUpdate=Niciun contract închis pentru deschidere
+MigrationBankTransfertsUpdate=Actualizare legături dintre înregistrarea bancară și un transfer bancar
+MigrationBankTransfertsNothingToUpdate=Toate legăturile sunt actualizate
+MigrationShipmentOrderMatching=Actualizare note livrări
+MigrationDeliveryOrderMatching=Actualizare notă de recepţie
 MigrationDeliveryDetail=Actualizare Livrare 
-MigrationStockDetail=Actualizarea valoarea stocului de produse
-MigrationMenusDetail=Actualizaţi tabelele de meniuri dinamice
-MigrationDeliveryAddress=Actualizaţi adresa de livrare în transporturi
+MigrationStockDetail=Actualizare valoare stoc produse
+MigrationMenusDetail=Actualizare tabele meniuri dinamice
+MigrationDeliveryAddress=Actualizare adresă în livrări
 MigrationProjectTaskActors=Migrarea datelor pentru tabelul llx_projet_task_actors
-MigrationProjectUserResp=Migrarea datelor domeniul fk_user_resp de llx_projet la llx_element_contact
-MigrationProjectTaskTime=Actualizare de timp petrecut în secunde
+MigrationProjectUserResp=Migrarea datelor pentru câmpul fk_user_resp din llx_projet către llx_element_contact
+MigrationProjectTaskTime=Durata actualizării în secunde
 MigrationActioncommElement=Actualizare date pe acţiuni
 MigrationPaymentMode=Migrarea datelor pentru tipul de plată
 MigrationCategorieAssociation=Migrarea categoriilor
-MigrationEvents=Migrarea evenimentelor pentru a adăuga proprietarul evenimentului în tabelul de atribuire
-MigrationEventsContact=Migrarea evenimentelor pentru a adăuga contactul evenimentului în tabelul de atribuire
-MigrationRemiseEntity=Actualizați valoarea câmpului entității din llx_societe_remise
-MigrationRemiseExceptEntity=Actualizați valoarea câmpului entității din llx_societe_remise_except
-MigrationUserRightsEntity=Actualizați valoarea câmpului entității pentru llx_user_rights
-MigrationUserGroupRightsEntity=Actualizați valoarea câmpului entității din llx_usergroup_rights
+MigrationEvents=Migrare evenimente pentru adăugare deţinător eveniment în tabela de atribuire
+MigrationEventsContact=Migrare evenimente pentru adăugare contact eveniment în tabela de atribuire
+MigrationRemiseEntity=Actualizare valoare câmp entitate în llx_societe_remise
+MigrationRemiseExceptEntity=Actualizare valoare câmp entitate în llx_societe_remise_except
+MigrationUserRightsEntity=Actualizare valoare câmp entitate în llx_user_rights
+MigrationUserGroupRightsEntity=Actualizare valoare câmp entitate în llx_usergroup_rights
 MigrationUserPhotoPath=Migrarea căilor foto pentru utilizatori
 MigrationFieldsSocialNetworks=Migrarea câmpurilor de reţele sociale ale utilizatorilor(%s)
-MigrationReloadModule=Reîncarcă modul %s
-MigrationResetBlockedLog=Resetați modulul BlockedLog pentru algoritmul v7
-ShowNotAvailableOptions=Afișați opțiunile nedisponibile
-HideNotAvailableOptions=Ascundeți opțiunile nedisponibile
-ErrorFoundDuringMigration=Eroarea (erorile) au fost raportate în timpul procesului de migrare, astfel încât următorul pas nu este disponibil. Pentru a ignora erorile, puteți <a href="%s"> apăsa aici </a>, dar este posibil ca aplicația sau unele caracteristici să nu funcționeze corect până când erorile nu sunt rezolvate.
-YouTryInstallDisabledByDirLock=Aplicația a încercat să se autoactualizeze, însă paginile de instalare/upgrade au fost dezactivate pentru securitate (directorul redenumit cu sufixul .lock). <br>
-YouTryInstallDisabledByFileLock=Aplicația a încercat să se autoactualizeze, însă paginile de instalare / upgrade au fost dezactivate pentru securitate (prin existența unui fișier de blocare <strong> install.lock </strong> în directorul de documente Dolibarr). <br>
-ClickHereToGoToApp=Faceți clic aici pentru a merge la aplicația dvs.
+MigrationReloadModule=Reîncărcare modul %s
+MigrationResetBlockedLog=Resetare modul BlockedLog pentru algoritmul v7
+MigrationImportOrExportProfiles=Migrarea profilelor de import sau export (%s)
+ShowNotAvailableOptions=Afișează opțiunile indisponibile
+HideNotAvailableOptions=Ascunde opțiunile indisponibile
+ErrorFoundDuringMigration=Au fost raportate eroare(ri) în timpul procesului de migrare, astfel încât următorul pas nu este disponibil. Pentru a ignora erorile, puteți <a href="%s">apăsa aici</a>, dar este posibil ca aplicația sau unele caracteristici să nu funcționeze corect până când erorile nu sunt rezolvate.
+YouTryInstallDisabledByDirLock=Sistemul a încercat să se autoactualizeze, însă paginile de instalare/upgrade au fost dezactivate din motive de securitate (directorul este redenumit cu sufixul .lock).<br>
+YouTryInstallDisabledByFileLock=Aplicația a încercat să se autoactualizeze, însă paginile de instalare/upgrade au fost dezactivate din motive de securitate (există un fișier de blocare <strong>install.lock</strong> în directorul de documente al sistemului). <br>
+ClickHereToGoToApp=Faceți clic aici pentru a merge la aplicația ta.
 ClickOnLinkOrRemoveManualy=Dacă o actualizare este în curs, așteptați. Dacă nu, faceți clic pe următorul link. Dacă vedeți întotdeauna aceeași pagină, trebuie să eliminați/să redenumiți fișierul install.lock din directorul documentelor.
-Loaded=Incărcat
+Loaded=Încărcat
 FunctionTest=Test de funcţionare
diff --git a/htdocs/langs/ro_RO/interventions.lang b/htdocs/langs/ro_RO/interventions.lang
index 60dec3c350e..d4c1b9f823d 100644
--- a/htdocs/langs/ro_RO/interventions.lang
+++ b/htdocs/langs/ro_RO/interventions.lang
@@ -4,63 +4,65 @@ Interventions=Intervenţii
 InterventionCard=Fişă intervenţie
 NewIntervention=Intervenţie nouă
 AddIntervention=Crează intervenţie
-ChangeIntoRepeatableIntervention=Schimbați la intervenția repetabilă
-ListOfInterventions=Lista  intervenţii
-ActionsOnFicheInter=Acţiuni privind intervenţia
+ChangeIntoRepeatableIntervention=Schimbați în intervenție repetabilă
+ListOfInterventions=Listă intervenţii
+ActionsOnFicheInter=Acţiuni pe intervenţie
 LastInterventions=Ultimele %s intervenţii
 AllInterventions=Toate intervenţiile
-CreateDraftIntervention=Crează schiţă
+CreateDraftIntervention=Creare schiţă
 InterventionContact=Contact Intervenţie
 DeleteIntervention=Şterge intervenţie
-ValidateIntervention=Validează  intervenţie
+ValidateIntervention=Validează intervenţie
 ModifyIntervention=Modifică intervenţie
 DeleteInterventionLine=Şterge intervenţie
 ConfirmDeleteIntervention=Sigur doriți să ștergeți această intervenție?
-ConfirmValidateIntervention=Sigur doriți să validați această intervenție sub numele <b>%s </b>?
+ConfirmValidateIntervention=Sigur doriți să validați această intervenție sub numele <b>%s</b>?
 ConfirmModifyIntervention=Sigur doriți să modificați această intervenție?
 ConfirmDeleteInterventionLine=Sigur doriți să ștergeți această linie de intervenție?
 ConfirmCloneIntervention=Sigur doriți să clonați această intervenție?
 NameAndSignatureOfInternalContact=Numele și semnătura persoanei care a intervenit:
 NameAndSignatureOfExternalContact=Numele și semnătura clientului:
-DocumentModelStandard=Model standard document de intervenţii
+DocumentModelStandard=Şablon standard document de intervenţii
 InterventionCardsAndInterventionLines=Intervenţii şi linii ale intervenţiilor
 InterventionClassifyBilled=Clasează Facturat
 InterventionClassifyUnBilled=Clasează Nefacturat
-InterventionClassifyDone=Clasificați "Efectuat"
+InterventionClassifyDone=Clasează "Finalizat"
 StatusInterInvoiced=Facturat
-SendInterventionRef=Trimiterea intervenţiei %s
-SendInterventionByMail=Trimiteți intervenția prin e-mail
-InterventionCreatedInDolibarr=Intervenţia %s creată
-InterventionValidatedInDolibarr=Intervenţia %s validată
-InterventionModifiedInDolibarr=Intervenţia %s modificată
-InterventionClassifiedBilledInDolibarr=Intervenţia %s setată ca facturată
-InterventionClassifiedUnbilledInDolibarr=Intervenţia %s setată ca nefacturată
-InterventionSentByEMail=Intervenția %s trimisă prin e-mail
-InterventionDeletedInDolibarr=Intervenţia %s ştearsă
+SendInterventionRef=Ref. intervenţie %s
+SendInterventionByMail=Trimite intervenția pe email
+InterventionCreatedInDolibarr=Intervenţia %s a fost creată
+InterventionValidatedInDolibarr=Intervenţia %s a fost validată
+InterventionModifiedInDolibarr=Intervenţia %s a fost modificată
+InterventionClassifiedBilledInDolibarr=Intervenţia %s a fost setată ca facturată
+InterventionClassifiedUnbilledInDolibarr=Intervenţia %s a fost setată ca nefacturată
+InterventionSentByEMail=Intervenția %s a fost trimisă pe email
+InterventionDeletedInDolibarr=Intervenţia %s a fost ştearsă
 InterventionsArea=Intervenţii
-DraftFichinter=Intervenții schita
+DraftFichinter=Intervenții schiţă
 LastModifiedInterventions=Ultimele %s intervenţii modificate
-FichinterToProcess=Intervenții la proces
+FichinterToProcess=Intervenții de procesat
 TypeContact_fichinter_external_CUSTOMER=Contact client urmărire intervenţie
-PrintProductsOnFichinter=Printează si liniile de tip ''produs''( nu numai serviciile) pe fişa intervenţiei
+PrintProductsOnFichinter=Printează şi liniile de tip ''produs''( nu numai serviciile) pe fişa intervenţiei
 PrintProductsOnFichinterDetails=intervenții generate din comenzi
 UseServicesDurationOnFichinter=Utilizați durata serviciilor pentru intervențiile generate din comenzi
 UseDurationOnFichinter=Ascunde câmpul durată pentru înregistrările de intervenție
-UseDateWithoutHourOnFichinter=Ascunde orele și minutele din câmpul de date pentru înregistrările de intervenție
+UseDateWithoutHourOnFichinter=Ascunde orele și minutele din câmpul de dată pentru înregistrările de intervenție
 InterventionStatistics=Statistici intervenţii
-NbOfinterventions=Numărul cardurilor de intervenție
-NumberOfInterventionsByMonth=Numărul cardurilor de intervenție pe lună (data validării)
-AmountOfInteventionNotIncludedByDefault=Suma de intervenție nu este inclusă implicit în profit (în majoritatea cazurilor, foile de pontaj sunt utilizate pentru a calcula timpul petrecut). Adăugați opțiunea PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT la 1 în acasa-gestionare-altul pentru a-l include.
-InterId=Id Intervenţie
-InterRef=Ref. Intervenţie
-InterDateCreation=Data crearea Intervenție
-InterDuration=Durată Intervenție
-InterStatus=Status Intervenție 
-InterNote=Nota interventie
+NbOfinterventions=Număr intervenții
+NumberOfInterventionsByMonth=Nr. intervenții pe lună (după data de validare)
+AmountOfInteventionNotIncludedByDefault=Suma de intervenție nu este inclusă implicit în profit (în majoritatea cazurilor, foile de pontaj sunt utilizate pentru a calcula timpul consumat). Adăugați opțiunea PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT la 1 în Acasă-Setări-Alte setări pentru a-l include.
+InterId=ID intervenţie
+InterRef=Ref. intervenţie
+InterDateCreation=Dată creare intervenție
+InterDuration=Durată intervenție
+InterStatus=Status intervenție 
+InterNote=Notă intervenţie
 InterLine=Linie intervenţie
-InterLineId=Id linie Intervenţie
-InterLineDate=Data linie interventie
-InterLineDuration=Durată linie  Intervenție
-InterLineDesc=Descriere linie Intervenţie
+InterLineId=ID linie intervenţie
+InterLineDate=Dată linie intervenţie
+InterLineDuration=Durată linie intervenție
+InterLineDesc=Descriere linie intervenţie
 RepeatableIntervention=Şablon intervenţie
 ToCreateAPredefinedIntervention=Pentru a crea o intervenţie predefinită sau recurentă, creează o intervenţie obişnuită şi converteşte-o într-un şablon
+Reopen=Redeschide
+ConfirmReopenIntervention=Eşti sigur că vrei să re-deschizi intervenţia <b>%s</b>?
diff --git a/htdocs/langs/ro_RO/productbatch.lang b/htdocs/langs/ro_RO/productbatch.lang
index ae2c31ba05d..2beed3a3a93 100644
--- a/htdocs/langs/ro_RO/productbatch.lang
+++ b/htdocs/langs/ro_RO/productbatch.lang
@@ -26,12 +26,10 @@ ShowLogOfMovementIfLot=Afișați jurnalul mișcărilor pentru cuplu de produs/lo
 StockDetailPerBatch=Detaliu stoc pe lot
 SerialNumberAlreadyInUse=Seria %s este deja utilizată pentru produsul %s
 TooManyQtyForSerialNumber=Poți avea un singur produs %s pentru numărul de serie %s
-BatchLotNumberingModules=Opțiuni pentru generarea automată de produse lot gestionate pe loturi
-BatchSerialNumberingModules=Opțiuni pentru generarea automată de produse lot gestionate prin numere de serie
 ManageLotMask=Mască personalizată
-CustomMasks=Adaugă o opţiune pentru definire mască în fişa produsului
-LotProductTooltip=Adaugă o opțiune în fişa de produs pentru a defini o mască dedicată numărului de lot
-SNProductTooltip=Adaugă o opțiune în fişa de produs pentru a defini o mască dedicată numărului de serie
+CustomMasks=Opţiunea de definire a unei măşti de numerotare diferite pentru fiecare produs
+BatchLotNumberingModules=Regulă de numerotare pentru generarea automată a numărului de lot
+BatchSerialNumberingModules=Regula de numerotare pentru generarea automată a numărului de serie (pentru produsele cu proprietatea 1 lot/serie unică pentru fiecare produs)
 QtyToAddAfterBarcodeScan=Cantitate de adăugat pentru fiecare cod de bare/lot/serie scanată
 LifeTime=Durata de viață (în zile)
 EndOfLife=Sfârşitul duratei de viaţă
diff --git a/htdocs/langs/ro_RO/products.lang b/htdocs/langs/ro_RO/products.lang
index cf419fa65f5..2a4034031d4 100644
--- a/htdocs/langs/ro_RO/products.lang
+++ b/htdocs/langs/ro_RO/products.lang
@@ -277,7 +277,7 @@ PriceByCustomer=Prețuri diferite pentru fiecare client
 PriceCatalogue=Un singur preț de vânzare pentru fiecare produs/serviciu
 PricingRule=Reguli privind prețurile de vânzare
 AddCustomerPrice=Adaugă preţ pe client
-ForceUpdateChildPriceSoc=Setează acelasi preţ pe subsidiarele clientului
+ForceUpdateChildPriceSoc=Setare același preț pentru filialele clientului
 PriceByCustomerLog=Jurnalul prețurilor anterioare ale clienților
 MinimumPriceLimit=Prețul minim nu poate fi mai mic decât %s
 MinimumRecommendedPrice=Prețul minim recomandat este: %s
@@ -296,6 +296,7 @@ ComposedProductIncDecStock=Mărire/micșorare de stoc la modificarea produselor
 ComposedProduct=Produse copil
 MinSupplierPrice=Preţ minim de achiziţie
 MinCustomerPrice=Preț minim de vânzare
+NoDynamicPrice=Fără preț dinamic
 DynamicPriceConfiguration=Setarea dinamică a prețului
 DynamicPriceDesc=Puteți defini formule matematice pentru a calcula prețurile clienților sau furnizorilor. Astfel de formule pot folosi toți operatorii matematici, unele constante și variabile. Puteți defini aici variabilele pe care doriți să le utilizați. Dacă variabila are nevoie de o actualizare automată, puteți defini adresa URL externă pentru a permite Dolibarr să actualizeze automat valoarea.
 AddVariable=Adăugare variabilă
diff --git a/htdocs/langs/ro_RO/salaries.lang b/htdocs/langs/ro_RO/salaries.lang
index 84d4c512aed..e3730147523 100644
--- a/htdocs/langs/ro_RO/salaries.lang
+++ b/htdocs/langs/ro_RO/salaries.lang
@@ -1,21 +1,24 @@
 # Dolibarr language file - Source file is en_US - salaries
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Contul contabil utilizat pentru terț utilizator
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Contul contabil folosit pentru terți utilizatori
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=Contul contabil dedicat definit pe cardul de utilizator va fi utilizat doar pentru contabilitatea subregistru. Aceasta va fi utilizată pentru Registrul general și ca valoare implicită a contabilității suregistru dacă nu este definită contul de contabilitate dedicat pentru utilizatori.
-SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Contul de contabilitate implicit pentru plata salariilor
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Contul contabil implicit pentru plata salariilor
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=În mod implicit, lăsați necompletată opțiunea "Creați automat o plată totală” la crearea unui salariu 
 Salary=Salariu
 Salaries=Salarii
-NewSalaryPayment=Plata noua salariu
-AddSalaryPayment=Adăugați plata salarială
-SalaryPayment=Plata salariu
-SalariesPayments=Plati salarii
-ShowSalaryPayment=Arata plata salariu
-THM=Rata orară medie
-TJM=Rata medie zilnică
+NewSalary=Salariu nou
+NewSalaryPayment=Card de salariu nou
+AddSalaryPayment=Adăugare plată salariu
+SalaryPayment=Plată salariu
+SalariesPayments=Plăţi salarii
+SalariesPaymentsOf=Plăţi salarii pentru %s
+ShowSalaryPayment=Arată plată salariu
+THM=Tarif orar mediu
+TJM=Tarif zilnic mediu
 CurrentSalary=Salariu curent
-THMDescription=Această valoare poate fi utilizată pentru a calcula costul timpului consumat pe un proiect introdus de utilizatori dacă se utilizează un proiect de modul
+THMDescription=Această valoare poate fi utilizată pentru a calcula costul timpului consumat pe un proiect introdus de utilizatori dacă se utilizează modulul Proiecte
 TJMDescription=Această valoare este în prezent doar informativă și nu este utilizată pentru niciun calcul
-LastSalaries=Cele mai recente %splăți salariale
-AllSalaries=Toate plățile salariale
+LastSalaries=Ultimele %s salarii
+AllSalaries=Toate salariile
 SalariesStatistics=Statistici salariale
-# Export
 SalariesAndPayments=Salarii și plăți
+ConfirmDeleteSalaryPayment=Vrei să ştergi această plată salarială ?
diff --git a/htdocs/langs/ro_RO/ticket.lang b/htdocs/langs/ro_RO/ticket.lang
index 09ac2c0152c..1a66e7d5094 100644
--- a/htdocs/langs/ro_RO/ticket.lang
+++ b/htdocs/langs/ro_RO/ticket.lang
@@ -34,7 +34,8 @@ TicketDictResolution=Tichet - Rezoluție
 
 TicketTypeShortCOM=Întrebare comercială
 TicketTypeShortHELP=Solicitare funcţionalitate
-TicketTypeShortISSUE=Solicitare, eroare sau problemă
+TicketTypeShortISSUE=Problemă sau bug
+TicketTypeShortPROBLEM=Problemă
 TicketTypeShortREQUEST=Solicitare de modificare sau îmbunătăţire
 TicketTypeShortPROJET=Proiect
 TicketTypeShortOTHER=Altele
@@ -54,14 +55,15 @@ TypeContact_ticket_internal_SUPPORTTEC=Utilizator atribuit
 TypeContact_ticket_external_SUPPORTCLI=Contact client urmărire incidente
 TypeContact_ticket_external_CONTRIBUTOR=Contributor extern
 
-OriginEmail=Email sursă
+OriginEmail=Email raportor
 Notify_TICKET_SENTBYMAIL=Trimite mesaj tichet pe email
 
 # Status
 Read=Citit
 Assigned=Atribuit
 InProgress=În curs
-NeedMoreInformation=În aşteptarea de informaţii
+NeedMoreInformation=În aşteptare feedback de la raportor
+NeedMoreInformationShort=În aşteptare feedback
 Answered=S-a răspuns
 Waiting=În aşteptare
 Closed=Închis
@@ -160,7 +162,7 @@ CreatedBy=Creat de
 NewTicket=Tichet nou
 SubjectAnswerToTicket=Răspuns la tichet
 TicketTypeRequest=Tip de solicitare
-TicketCategory=Grup
+TicketCategory=Categorizare tichet
 SeeTicket=Vezi tichetul
 TicketMarkedAsRead=Tichetul a fost marcat ca citit
 TicketReadOn=Citește mai departe
@@ -211,6 +213,7 @@ TicketMessageHelp=Numai acest text va fi salvat în lista de mesaje de pe fişa
 TicketMessageSubstitutionReplacedByGenericValues=Variabilele de substituție sunt înlocuite cu valori generice.
 TimeElapsedSince=Timpul trecut de atunci
 TicketTimeToRead=Timpul trecut înainte de citire
+TicketTimeElapsedBeforeSince=Timpul scurs înainte de / de atunci
 TicketContacts=Contacte tichet
 TicketDocumentsLinked=Documente legate de tichet
 ConfirmReOpenTicket=Confirmați redeschiderea acestui tichet?
diff --git a/htdocs/langs/ro_RO/users.lang b/htdocs/langs/ro_RO/users.lang
index de16abf5ceb..fa6a4c5d83e 100644
--- a/htdocs/langs/ro_RO/users.lang
+++ b/htdocs/langs/ro_RO/users.lang
@@ -97,8 +97,8 @@ LoginToCreate=Nume de utilizator de creat
 NameToCreate=Nume terţ de creat
 YourRole=Rolurile tale
 YourQuotaOfUsersIsReached=Cota ta de utilizatori activi a fost atinsă !
-NbOfUsers=Nr. de utilizatori
-NbOfPermissions=Nr. de permisiuni
+NbOfUsers=Număr de utilizatori
+NbOfPermissions=Număr de permisiuni
 DontDowngradeSuperAdmin=Numai un superadmin poate declasa un superadmin
 HierarchicalResponsible=Supervizor
 HierarchicView=Vedere ierarhică
diff --git a/htdocs/langs/ro_RO/website.lang b/htdocs/langs/ro_RO/website.lang
index e90a63aee32..0dbac3d2d34 100644
--- a/htdocs/langs/ro_RO/website.lang
+++ b/htdocs/langs/ro_RO/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Adaugă site web
 Webpage=Pagină/container web
 AddPage=Adaugă o pagină/container
 PageContainer=Pagina
-PreviewOfSiteNotYetAvailable=Previzualizarea site-ului dvs. web <strong> %s </strong> nu este încă disponibilă. Mai întâi trebuie să '<strong> Importați un șablon complet de site </strong>' sau doar să '<strong>Adăugați o pagină/container </strong>'.
+PreviewOfSiteNotYetAvailable=Previzualizarea site-ului web <strong>%s</strong> nu este încă disponibilă. Mai întâi trebuie să '<strong>Importați un șablon de site web complet</strong>' sau doar să '<strong>Adăugați o pagină/container</strong>'.
 RequestedPageHasNoContentYet=Pagina solicitată cu id %s nu are încă conținut, sau fișierul cache .tpl.php a fost eliminat. Editați conținutul paginii pentru a rezolva această problemă.
 SiteDeleted=Site-ul web "%s" a fost șters
 PageContent=Pagină/Container
diff --git a/htdocs/langs/ru_RU/accountancy.lang b/htdocs/langs/ru_RU/accountancy.lang
index 01820557ec7..faeacdbdabf 100644
--- a/htdocs/langs/ru_RU/accountancy.lang
+++ b/htdocs/langs/ru_RU/accountancy.lang
@@ -48,7 +48,8 @@ CountriesNotInEEC=Страны, не входящие в ЕЭС
 CountriesInEECExceptMe=Страны ЕЭС, кроме %s
 CountriesExceptMe=Все страны кроме %s
 AccountantFiles=Экспорт исходных документов
-ExportAccountingSourceDocHelp=С помощью этого инструмента вы можете экспортировать исходные события (список и PDF-файлы), которые использовались для создания вашей бухгалтерской отчетности. Чтобы экспортировать журналы, используйте пункт меню %s - %s.
+ExportAccountingSourceDocHelp=С помощью этого инструмента вы можете экспортировать исходные события (список в CSV и PDF), которые использовались для создания вашей бухгалтерской отчетности.
+ExportAccountingSourceDocHelp2=Чтобы экспортировать журналы, используйте пункт меню %s - %s.
 VueByAccountAccounting=Просмотр по учетной записи
 VueBySubAccountAccounting=Просмотр по субсчету бухгалтерского учета
 
@@ -328,9 +329,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Отключить привязку и 
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Отключить привязку и перенос в бухгалтерском учете в отчетах о расходах (отчеты о расходах не будут учитываться в бухгалтерском учете)
 
 ## Export
-NotifiedExportDate=Notified export date (modification of the entries will not be possible)
-NotifiedValidationDate=Validation of the entries (modification or deletion of the entries will not be possible)
-ConfirmExportFile=Confirmation of the generation of the accounting export file ?
+NotifiedExportDate=Уведомленная дата экспорта (изменение записей невозможно)
+NotifiedValidationDate=Проверка записей (изменение или удаление записей невозможно)
+ConfirmExportFile=Подтверждение генерации файла экспорта бухгалтерского учета?
 ExportDraftJournal=Экспорт черновика журнала
 Modelcsv=Модель экспорта
 Selectmodelcsv=Выбрать модель экспорта
diff --git a/htdocs/langs/ru_RU/admin.lang b/htdocs/langs/ru_RU/admin.lang
index f4f00215f51..e87ab0d8efd 100644
--- a/htdocs/langs/ru_RU/admin.lang
+++ b/htdocs/langs/ru_RU/admin.lang
@@ -53,6 +53,7 @@ InternalUser=Внутренний пользователь
 ExternalUser=Внешний пользователь
 InternalUsers=Внутренние пользователи
 ExternalUsers=Внешние пользователи
+UserInterface=User interface
 GUISetup=Внешний вид
 SetupArea=Настройка
 UploadNewTemplate=Загрузить новый шаблон(ы)
@@ -221,7 +222,7 @@ NotCompatible=Этот модуль не совместим с вашим Doliba
 CompatibleAfterUpdate=Этот модуль требует обновления вашего Dolibarr%s (Min%s - Max%s).
 SeeInMarkerPlace=См. На рынке
 SeeSetupOfModule=Посмотреть настройку модуля  %s
-SetOptionTo=Set option <b>%s</b> to %s
+SetOptionTo=Установите параметр <b> %s </b> на %s
 Updated=Обновлено
 AchatTelechargement=Купить/Скачать
 GoModuleSetupArea=Чтобы развернуть/установить новый модуль, перейдите в область настройки модуля: <a href="%s">%s</a> .
@@ -562,7 +563,7 @@ Module53Desc=Управление Услугами
 Module54Name=Контакты/Подписки
 Module54Desc=Управление контрактами (услуги или периодические подписки)
 Module55Name=Штрих-коды
-Module55Desc=Barcode or QR code management
+Module55Desc=Управление штрих-кодом или QR-кодом
 Module56Name=Оплата кредитным переводом
 Module56Desc=Управление оплатой поставщиков по кредитным переводам. Он включает создание файла SEPA для европейских стран.
 Module57Name=Платежи прямым дебетом
@@ -849,10 +850,10 @@ Permission402=Создать / изменить скидки
 Permission403=Проверить скидки
 Permission404=Удалить скидки
 Permission430=Использовать панель отладки
-Permission511=Read salaries and payments (yours and subordinates)
-Permission512=Create/modify salaries and payments
-Permission514=Delete salaries and payments
-Permission517=Read salaries and payments everybody
+Permission511=Читайте зарплаты и выплаты (ваши и подчиненные)
+Permission512=Создавать / изменять зарплаты и выплаты
+Permission514=Удалить зарплаты и выплаты
+Permission517=Всем читать зарплаты и выплаты
 Permission519=Экспорт зарплат
 Permission520=Открыть ссуды
 Permission522=Создать/изменить ссуды
@@ -1260,8 +1261,8 @@ YourPHPDoesNotHaveSSLSupport=SSL функций, не доступных в PHP
 DownloadMoreSkins=Дополнительные шкуры для загрузки
 SimpleNumRefModelDesc=Возвращает ссылочный номер в формате %syymm-nnnn, где yy - год, mm - месяц, а nnnn - последовательное автоматически увеличивающееся число без сброса.
 SimpleNumRefNoDateModelDesc=Возвращает ссылочный номер в формате %s-nnnn, где nnnn - это последовательный номер с автоинкрементом без сброса.
-ShowProfIdInAddress=Показать профессиональный идентификатор с адресами
-ShowVATIntaInAddress=Скрыть номер НДС внутри Сообщества с адресами
+ShowProfIdInAddress=Show professional ID with addresses
+ShowVATIntaInAddress=Hide intra-Community VAT number
 TranslationUncomplete=Частичный перевод
 MAIN_DISABLE_METEO=Отключить просмотр погоды
 MeteoStdMod=Стандартный режим
@@ -1778,7 +1779,7 @@ ClickToDialSetup=Настройка модуля Click To Dial
 ClickToDialUrlDesc=Url звонившего, когда клик по пиктограмме телефона сделан. В URL-адресе вы можете использовать теги<br><b>__PHONETO__</b>, которые будут заменены на номер телефона человека для вызова<br><b>__PHONEFROM__</b>, который будет заменен номером телефона вызывающего абонента (вашего) <br><b>__LOGIN__</b>, который будет заменен на clicktodial login (определенном на карточке пользователя) <br><b>__PASS__</b>, который будет заменен кликтодиальным паролем (определяется на карточке пользователя).
 ClickToDialDesc=Этот модуль преобразует телефонные номера при использовании настольного компьютера в интерактивные ссылки. Щелчок вызовет номер. Его можно использовать для начала телефонного звонка при использовании программного телефона на рабочем столе или, например, при использовании системы CTI, основанной на протоколе SIP. Примечание. При использовании смартфона телефонные номера всегда доступны для нажатия.
 ClickToDialUseTelLink=Используйте только ссылку «tel:» на номера телефонов
-ClickToDialUseTelLinkDesc=Используйте этот метод, если у ваших пользователей программный телефон или программный интерфейс установлен на том же компьютере, что и браузер, и вызывается при нажатии на ссылку в браузере, которая начинается с «tel:». Если вам нужно полноценное серверное решение (нет необходимости в локальной установке программного обеспечения), вы должны установить для него значение «Нет» и заполнить следующее поле.
+ClickToDialUseTelLinkDesc=Используйте этот метод, если у ваших пользователей есть программный телефон или программный интерфейс, установленный на том же компьютере, что и браузер, и который вызывается при нажатии на ссылку, начинающуюся с «tel:», в вашем браузере. Если вам нужна ссылка, которая начинается с «sip:» или полное серверное решение (нет необходимости в локальной установке программного обеспечения), вы должны установить для нее значение «Нет» и заполнить следующее поле.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Торговая точка
 CashDeskSetup=Настройка модуля «Точка продаж»
@@ -2133,7 +2134,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=За исключением слу
 PHPFunctionsRequiredForCLI=Для целей оболочки (например, резервного копирования заданий по расписанию или запуска антивирусной программы) вы должны сохранить функции PHP
 NoWritableFilesFoundIntoRootDir=В корневом каталоге не обнаружены доступные для записи файлы или каталоги распространенных программ (Хорошо)
 RecommendedValueIs=Рекомендуется: %s
-NotRecommended=Не рекомендуется
+Recommended=Рекомендуемые
+NotRecommended=Not recommended
 ARestrictedPath=Ограниченный путь
 CheckForModuleUpdate=Проверить обновления внешних модулей
 CheckForModuleUpdateHelp=Это действие подключится к редакторам внешних модулей, чтобы проверить, доступна ли новая версия.
@@ -2142,5 +2144,7 @@ NoExternalModuleWithUpdate=Обновлений для внешних модул
 SwaggerDescriptionFile=Файл описания Swagger API (например, для использования с redoc)
 YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=Вы включили устаревший WS API. Вместо этого вам следует использовать REST API.
 RandomlySelectedIfSeveral=Выбирается случайным образом, если доступно несколько изображений
-DatabasePasswordObfuscated=Database password is obfuscated in conf file
-DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
+DatabasePasswordObfuscated=Пароль базы данных зашифрован в файле conf
+DatabasePasswordNotObfuscated=Пароль базы данных НЕ запутывается в файле conf
+APIsAreNotEnabled=Модули API не включены
+YouShouldSetThisToOff=Вы должны установить это на 0 или выключить
diff --git a/htdocs/langs/ru_RU/banks.lang b/htdocs/langs/ru_RU/banks.lang
index 26af71315c2..451297fa8af 100644
--- a/htdocs/langs/ru_RU/banks.lang
+++ b/htdocs/langs/ru_RU/banks.lang
@@ -115,7 +115,7 @@ TransferTo=К
 TransferFromToDone=<b>Передача%</b> от <b>S в% х %s%</b> S был записан.
 CheckTransmitter=Отправитель
 ValidateCheckReceipt=Подтвердить получение чека?
-ConfirmValidateCheckReceipt=Вы уверены, что хотите отправить этот чек на проверку? Никаких изменений не может быть сделано.
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes will be possible once validated.
 DeleteCheckReceipt=Удалить эту квитанцию?
 ConfirmDeleteCheckReceipt=Вы действительно хотите удалить эту квитанцию?
 BankChecks=Банковские чеки
diff --git a/htdocs/langs/ru_RU/bills.lang b/htdocs/langs/ru_RU/bills.lang
index e183dd196e2..825c2cda16e 100644
--- a/htdocs/langs/ru_RU/bills.lang
+++ b/htdocs/langs/ru_RU/bills.lang
@@ -259,7 +259,7 @@ DateMaxPayment=Платеж должен быть произведен
 DateInvoice=Дата счета-фактуры
 DatePointOfTax=Пункт налогообложения
 NoInvoice=Нет счетов-фактур
-NoOpenInvoice=No open invoice
+NoOpenInvoice=Нет открытого счета
 ClassifyBill=Классифицировать счет-фактуру
 SupplierBillsToPay=Неоплаченные счета поставщика
 CustomerBillsUnpaid=Неоплаченные счета клиента
diff --git a/htdocs/langs/ru_RU/boxes.lang b/htdocs/langs/ru_RU/boxes.lang
index 263aad5ae29..9046b0d2c5e 100644
--- a/htdocs/langs/ru_RU/boxes.lang
+++ b/htdocs/langs/ru_RU/boxes.lang
@@ -91,8 +91,8 @@ BoxTitleLatestModifiedSupplierOrders=Заказы поставщиков: пос
 BoxTitleLastModifiedCustomerBills=Счета клиентов: последнее %s изменений
 BoxTitleLastModifiedCustomerOrders=Заказы на продажу: последнее изменение %s
 BoxTitleLastModifiedPropals=Последние измененные предложения %s
-BoxTitleLatestModifiedJobPositions=Последние измененные вакансии %s
-BoxTitleLatestModifiedCandidatures=Последние измененные кандидатуры %s
+BoxTitleLatestModifiedJobPositions=Latest %s modified job positions
+BoxTitleLatestModifiedCandidatures=Latest %s modified job applications
 ForCustomersInvoices=Счета-фактуры Покупателей
 ForCustomersOrders=Заказы клиентов
 ForProposals=Предложения
diff --git a/htdocs/langs/ru_RU/cashdesk.lang b/htdocs/langs/ru_RU/cashdesk.lang
index 13bfeac8a00..dd8491c766b 100644
--- a/htdocs/langs/ru_RU/cashdesk.lang
+++ b/htdocs/langs/ru_RU/cashdesk.lang
@@ -127,4 +127,4 @@ AllowDelayedPayment=Разрешить отсроченный платеж
 PrintPaymentMethodOnReceipts=Распечатать способ оплаты на билетах | квитанциях
 WeighingScale=Весы
 ShowPriceHT = Отобразить столбец с ценой без налога (на экране)
-ShowPriceHTOnReceipt = Вывести столбец с ценой без налога (при получении)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on the receipt)
diff --git a/htdocs/langs/ru_RU/deliveries.lang b/htdocs/langs/ru_RU/deliveries.lang
index 11f941a0f22..11a4d806ebe 100644
--- a/htdocs/langs/ru_RU/deliveries.lang
+++ b/htdocs/langs/ru_RU/deliveries.lang
@@ -30,3 +30,4 @@ NonShippable=Не возможно к отправке
 ShowShippableStatus=Показать статус доставки
 ShowReceiving=Показать квитанцию о доставке
 NonExistentOrder=Несуществующий заказ
+StockQuantitiesAlreadyAllocatedOnPreviousLines = Объемы запасов, уже распределенные по предыдущим строкам
diff --git a/htdocs/langs/ru_RU/errors.lang b/htdocs/langs/ru_RU/errors.lang
index 5d9c38a42ba..5e90b971a39 100644
--- a/htdocs/langs/ru_RU/errors.lang
+++ b/htdocs/langs/ru_RU/errors.lang
@@ -11,7 +11,7 @@ ErrorBadValueForParamNotAString=Плохое значение для вашег
 ErrorRefAlreadyExists=Ссылка <b> %s </b> уже существует.
 ErrorLoginAlreadyExists=Логин %s уже существует.
 ErrorGroupAlreadyExists=Группа %s уже существует.
-ErrorEmailAlreadyExists=Email %s already exists.
+ErrorEmailAlreadyExists=Электронная почта %s уже существует.
 ErrorRecordNotFound=Запись не найдена.
 ErrorFailToCopyFile=Не удалось скопировать файл '<b>%s</b>' в '<b>%s</b>'.
 ErrorFailToCopyDir=Не удалось скопировать каталог <b> %s </b> в <b> %s </b>.
@@ -301,3 +301,4 @@ ErrorActionCommPropertyUserowneridNotDefined=Требуется владелец
 ErrorActionCommBadType=Выбранный тип события (идентификатор: %n, код: %s) не существует в словаре типов событий
 CheckVersionFail=Ошибка проверки версии
 ErrorWrongFileName=Имя файла не может содержать __SOMETHING__
+ErrorNotInDictionaryPaymentConditions=Нет в Словаре условий оплаты, пожалуйста, измените.
diff --git a/htdocs/langs/ru_RU/eventorganization.lang b/htdocs/langs/ru_RU/eventorganization.lang
index 9c56b96eedc..7bf086963be 100644
--- a/htdocs/langs/ru_RU/eventorganization.lang
+++ b/htdocs/langs/ru_RU/eventorganization.lang
@@ -86,6 +86,7 @@ DownloadICSLink = Ссылка для скачивания ICS
 EVENTORGANIZATION_SECUREKEY = Защищенный ключ общедоступной регистрационной ссылки на конференцию
 SERVICE_BOOTH_LOCATION = Услуга, используемая для строки счета-фактуры о местонахождении стенда
 SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Служба, используемая для строки счета-фактуры о подписке участника на конференцию
+NbVotes=Number of votes
 #
 # Status
 #
@@ -115,6 +116,9 @@ EvntOrgDuration = Конференция начинается %s и заканч
 ConferenceAttendeeFee = Плата за участие в конференции: «%s», происходящая от %s до %s.
 BoothLocationFee = Место расположения стенда для события : '%s' происходящего с %s до %s
 EventType = Тип события
+LabelOfBooth=Booth label
+LabelOfconference=Conference label
+ConferenceIsNotConfirmed=Subcription not available, conference is not confirmed yet
 
 #
 # Vote page
diff --git a/htdocs/langs/ru_RU/exports.lang b/htdocs/langs/ru_RU/exports.lang
index 144e97bd0bc..53b8a706a43 100644
--- a/htdocs/langs/ru_RU/exports.lang
+++ b/htdocs/langs/ru_RU/exports.lang
@@ -53,7 +53,8 @@ TypeOfLineServiceOrProduct=Тип линии (0= продукт, услуга 1=
 FileWithDataToImport=Файл с данными для импорта
 FileToImport=Исходный файл для импорта
 FileMustHaveOneOfFollowingFormat=Файл для импорта должен иметь один из следующих форматов
-DownloadEmptyExample=Скачать файл шаблона с информацией о содержимом поля (* обязательные поля)
+DownloadEmptyExample=Скачать файл шаблона с информацией о содержимом поля
+StarAreMandatory=* обязательные поля
 ChooseFormatOfFileToImport=Выберите формат файла для использования в качестве формата файла импорта, щелкнув значок %s, чтобы выбрать его ...
 ChooseFileToImport=Загрузите файл, затем щелкните значок %s, чтобы выбрать файл в качестве исходного файла импорта ...
 SourceFileFormat=Формат исходного файла
diff --git a/htdocs/langs/ru_RU/install.lang b/htdocs/langs/ru_RU/install.lang
index 03474ea62f0..477e6247d4d 100644
--- a/htdocs/langs/ru_RU/install.lang
+++ b/htdocs/langs/ru_RU/install.lang
@@ -206,6 +206,7 @@ MigrationUserPhotoPath=Перенос фото-путей для пользов
 MigrationFieldsSocialNetworks=Миграция пользовательских полей социальных сетей (%s)
 MigrationReloadModule=Перегрузите модуль %s
 MigrationResetBlockedLog=Сбросить модуль BlockedLog для алгоритма v7
+MigrationImportOrExportProfiles=Migration of import or export profiles (%s)
 ShowNotAvailableOptions=Показать недоступные параметры
 HideNotAvailableOptions=Скрыть недоступные параметры
 ErrorFoundDuringMigration=В процессе миграции были зарегистрированы ошибки, поэтому следующий шаг недоступен. Чтобы игнорировать ошибки, вы можете <a href="%s"> щелкнуть здесь </a>, но приложение или некоторые функции могут работать некорректно, пока ошибки не будут устранены.
diff --git a/htdocs/langs/ru_RU/knowledgemanagement.lang b/htdocs/langs/ru_RU/knowledgemanagement.lang
index 24207d372c8..bcadca051bf 100644
--- a/htdocs/langs/ru_RU/knowledgemanagement.lang
+++ b/htdocs/langs/ru_RU/knowledgemanagement.lang
@@ -37,15 +37,7 @@ About = О
 KnowledgeManagementAbout = Об управлении знаниями
 KnowledgeManagementAboutPage = Управление знаниями о странице
 
-#
-# Sample page
-#
 KnowledgeManagementArea = Управление знаниями
-
-
-#
-# Menu
-#
 MenuKnowledgeRecord = База знаний
 ListKnowledgeRecord = Список статей
 NewKnowledgeRecord = Новая статья
@@ -53,3 +45,5 @@ ValidateReply = Проверить решение
 KnowledgeRecords = Статьи
 KnowledgeRecord = Статья
 KnowledgeRecordExtraFields = Дополнительные поля для статьи
+GroupOfTicket=Группа билетов
+YouCanLinkArticleToATicketCategory=Вы можете привязать статью к группе заявок (чтобы статья предлагалась во время квалификации новых билетов)
diff --git a/htdocs/langs/ru_RU/languages.lang b/htdocs/langs/ru_RU/languages.lang
index d66a0ce2e5f..2bb7da4baf8 100644
--- a/htdocs/langs/ru_RU/languages.lang
+++ b/htdocs/langs/ru_RU/languages.lang
@@ -3,7 +3,8 @@ Language_am_ET=Эфиопский
 Language_ar_AR=Арабский
 Language_ar_EG=Арабский (Египет)
 Language_ar_SA=Арабский
-Language_ar_TN=Arabic (Tunisia)
+Language_ar_TN=Арабский (Тунис)
+Language_ar_IQ=Арабский (Ирак)
 Language_az_AZ=Азербайджанский
 Language_bn_BD=Бенгальский
 Language_bn_IN=Бенгальский (Индия)
@@ -83,6 +84,7 @@ Language_ne_NP=Непальский
 Language_nl_BE=Голландский (Бельгия)
 Language_nl_NL=нидерландский язык
 Language_pl_PL=Польский
+Language_pt_AO=Португальский (Ангола)
 Language_pt_BR=Португальский (Бразилия)
 Language_pt_PT=Португальский
 Language_ro_MD=Румынский (Молдавия)
diff --git a/htdocs/langs/ru_RU/main.lang b/htdocs/langs/ru_RU/main.lang
index dbb85c167f4..945c84596b3 100644
--- a/htdocs/langs/ru_RU/main.lang
+++ b/htdocs/langs/ru_RU/main.lang
@@ -730,7 +730,7 @@ MenuMembers=Участники
 MenuAgendaGoogle=Google agenda
 MenuTaxesAndSpecialExpenses=Налоги | Особые расходы
 ThisLimitIsDefinedInSetup=Лимит Dolibarr (Меню Главная-Настройки-Безопасность): %s Кб, лимит PHP: %s Кб
-ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
+ThisLimitIsDefinedInSetupAt=Лимит долибарра (меню %s): %s Kb, лимит PHP (параметр %s): %s Kb
 NoFileFound=Документы не загружены
 CurrentUserLanguage=Текущий язык
 CurrentTheme=Текущая тема
@@ -1136,4 +1136,4 @@ CategTypeNotFound=Тип тега для типа записей не найде
 CopiedToClipboard=Скопировано в буфер обмена
 InformationOnLinkToContract=Эта сумма представляет собой только сумму всех строк контракта. Время не принимается во внимание.
 ConfirmCancel=Вы уверены, что хотите отменить
-EmailMsgID=Email MsgID
+EmailMsgID=Электронная почта MsgID
diff --git a/htdocs/langs/ru_RU/partnership.lang b/htdocs/langs/ru_RU/partnership.lang
index 6b70af53766..e6e5f23a67c 100644
--- a/htdocs/langs/ru_RU/partnership.lang
+++ b/htdocs/langs/ru_RU/partnership.lang
@@ -20,9 +20,9 @@ ModulePartnershipName=Управление партнерством
 PartnershipDescription=Модуль Управление партнерством
 PartnershipDescriptionLong= Модуль Управление партнерством
 
-AddPartnership=Add partnership
-CancelPartnershipForExpiredMembers=Partnership: Cancel partnership of members with expired subscriptions
-PartnershipCheckBacklink=Partnership: Check referring backlink
+AddPartnership=Добавить партнерство
+CancelPartnershipForExpiredMembers=Партнерство: отмените партнерство участников с истекшими подписками
+PartnershipCheckBacklink=Партнерство: проверьте ссылающуюся обратную ссылку
 
 #
 # Menu
@@ -57,7 +57,7 @@ PartnershipAlreadyExist=Партнерство уже существует
 ManagePartnership=Управление партнерством
 BacklinkNotFoundOnPartnerWebsite=Обратная ссылка не найдена на партнерском сайте
 ConfirmClosePartnershipAsk=Вы уверены, что хотите отменить это партнерство?
-PartnershipType=Partnership type
+PartnershipType=Тип партнерства
 
 #
 # Template Mail
diff --git a/htdocs/langs/ru_RU/productbatch.lang b/htdocs/langs/ru_RU/productbatch.lang
index c805563062d..7a0646ff1a6 100644
--- a/htdocs/langs/ru_RU/productbatch.lang
+++ b/htdocs/langs/ru_RU/productbatch.lang
@@ -26,12 +26,10 @@ ShowLogOfMovementIfLot=Показать журнал движений для п
 StockDetailPerBatch=Детальная информация о лоте
 SerialNumberAlreadyInUse=Серийный номер %s уже используется для продукта %s
 TooManyQtyForSerialNumber=У вас может быть только один продукт %s для серийного номера %s
-BatchLotNumberingModules=Опции для автоматического создания серийной продукции по партиям 
-BatchSerialNumberingModules=Опции для автоматического создания серийной продукции по серийным номерам 
 ManageLotMask=Пользовательская маска
-CustomMasks=Добавляет возможность определения маски в карточке товара
-LotProductTooltip=Добавляет параметр в карточку продукта для определения специальной маски номера партии
-SNProductTooltip=Добавляет параметр в карточку продукта для определения специальной маски серийного номера
+CustomMasks=Option to define a different numbering mask for each product
+BatchLotNumberingModules=Numbering rule for automatic generation of lot number
+BatchSerialNumberingModules=Numbering rule for automatic generation of serial number (for products with property 1 unique lot/serial for each product)
 QtyToAddAfterBarcodeScan=Кол-во для добавления для каждого отсканированного штрих-кода / партии / серийного номера 
 LifeTime=Продолжительность жизни (в днях)
 EndOfLife=Конец жизни
diff --git a/htdocs/langs/ru_RU/products.lang b/htdocs/langs/ru_RU/products.lang
index cc494727689..8a631064c05 100644
--- a/htdocs/langs/ru_RU/products.lang
+++ b/htdocs/langs/ru_RU/products.lang
@@ -277,7 +277,7 @@ PriceByCustomer=Различные цены для каждого клиента
 PriceCatalogue=Одна продажная цена за продукт/услугу
 PricingRule=Правила отпускных цен
 AddCustomerPrice=Добавить цену по клиенту
-ForceUpdateChildPriceSoc=Установить такую же цену для дочерних клиентов
+ForceUpdateChildPriceSoc=Установите такую же цену для дочерних компаний клиента
 PriceByCustomerLog=Журнал предыдущих цен клиента
 MinimumPriceLimit=Минимальная цена не может быть ниже %s
 MinimumRecommendedPrice=Минимальная рекомендованная цена: %s
@@ -296,6 +296,7 @@ ComposedProductIncDecStock=Увеличение / уменьшение запа
 ComposedProduct=Детские товары
 MinSupplierPrice=Минимальная закупочная цена
 MinCustomerPrice=Минимальная цена продажи
+NoDynamicPrice=Нет динамической цены
 DynamicPriceConfiguration=Настройка динамического ценообразования
 DynamicPriceDesc=Вы можете определить математические формулы для расчета цен Клиента или Продавца. В таких формулах могут использоваться все математические операторы, некоторые константы и переменные. Вы можете определить здесь переменные, которые хотите использовать. Если переменная нуждается в автоматическом обновлении, вы можете определить внешний URL-адрес, чтобы позволить Dolibarr автоматически обновлять значение.
 AddVariable=Добавить переменную
@@ -340,7 +341,7 @@ ProductSheet=Лист продукта
 ServiceSheet=Сервисный лист
 PossibleValues=Возможные значения
 GoOnMenuToCreateVairants=Перейдите в меню %s - %s, чтобы подготовить варианты атрибутов (например, цвета, размер, ...)
-UseProductFournDesc=Добавьте функцию для определения описаний продуктов, определенных поставщиками, в дополнение к описаниям для клиентов.
+UseProductFournDesc=Add a feature to define the descriptions of products defined by the vendors in addition to descriptions for customers
 ProductSupplierDescription=Описание продавца продукта
 UseProductSupplierPackaging=Использовать упаковку по ценам поставщика (пересчитать количества в соответствии с упаковкой, указанной в цене поставщика, при добавлении / обновлении строки в документах поставщика)
 PackagingForThisProduct=Упаковка
diff --git a/htdocs/langs/ru_RU/salaries.lang b/htdocs/langs/ru_RU/salaries.lang
index 742e9a385d1..8351f178b75 100644
--- a/htdocs/langs/ru_RU/salaries.lang
+++ b/htdocs/langs/ru_RU/salaries.lang
@@ -17,8 +17,8 @@ TJM=Среднесуточная ставка
 CurrentSalary=Текущая зарплата
 THMDescription=Это значение может использоваться для расчета затрат времени, затраченного на проект, введенный пользователями, если используется модуль Проектов
 TJMDescription=Это значение в настоящее время только для информации и не используется для каких-либо расчетов
-LastSalaries=Последние%s выплат зарплаты 
-AllSalaries=Все выплаты зарплаты
+LastSalaries=Последние зарплаты %s
+AllSalaries=Все зарплаты
 SalariesStatistics=Статистика зарплаты
-# Export
 SalariesAndPayments=Заработная плата и выплаты
+ConfirmDeleteSalaryPayment=Вы хотите удалить эту зарплату?
diff --git a/htdocs/langs/ru_RU/stocks.lang b/htdocs/langs/ru_RU/stocks.lang
index 8336111fb6a..853a02eff70 100644
--- a/htdocs/langs/ru_RU/stocks.lang
+++ b/htdocs/langs/ru_RU/stocks.lang
@@ -60,7 +60,7 @@ EnhancedValueOfWarehouses=Склады стоимости
 UserWarehouseAutoCreate=Автоматическое создание хранилища пользователей при создании пользователя
 AllowAddLimitStockByWarehouse=Управляйте также стоимостью минимального и желаемого запаса для каждой пары (продукт-склад) в дополнение к стоимости минимального и желаемого запаса для каждого продукта.
 RuleForWarehouse=Правило для складов
-WarehouseAskWarehouseOnThirparty=Установить склад на сторонний
+WarehouseAskWarehouseOnThirparty=Настроить склад на Сторонних
 WarehouseAskWarehouseDuringPropal=Установить склад по коммерческим предложениям
 WarehouseAskWarehouseDuringOrder=Настроить склад на Распродажу заказов
 UserDefaultWarehouse=Настроить склад для пользователей
@@ -167,8 +167,8 @@ MovementTransferStock=Перевозка товара %s на другой ск
 InventoryCodeShort=Инв. / Мов. код
 NoPendingReceptionOnSupplierOrder=Нет ожидающих приема из-за открытого заказа на поставку
 ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
-OpenAll=Открыт для всех действий
-OpenInternal=Открыт только для внутренних действий
+OpenAnyMovement=Открытый (все движения)
+OpenInternal=Открытый (только внутреннее движение)
 UseDispatchStatus=Используйте статус отправки (одобрение / отказ) для линейки продуктов при приеме заказа на поставку.
 OptionMULTIPRICESIsOn=Включена опция «несколько цен на сегмент». Это означает, что товар имеет несколько продажных цен, поэтому стоимость продажи не может быть рассчитана.
 ProductStockWarehouseCreated=Правильно установлен лимит запаса для предупреждения и желаемый оптимальный запас
diff --git a/htdocs/langs/ru_RU/ticket.lang b/htdocs/langs/ru_RU/ticket.lang
index 17febc2ff1f..b5d33b03b5f 100644
--- a/htdocs/langs/ru_RU/ticket.lang
+++ b/htdocs/langs/ru_RU/ticket.lang
@@ -34,7 +34,8 @@ TicketDictResolution=Тикет - Разрешение
 
 TicketTypeShortCOM=Коммерческий вопрос
 TicketTypeShortHELP=Запрос на функциональную помощь
-TicketTypeShortISSUE=Проблема, ошибка или проблема
+TicketTypeShortISSUE=Проблема или ошибка
+TicketTypeShortPROBLEM=Проблема
 TicketTypeShortREQUEST=Запрос на изменение или расширение
 TicketTypeShortPROJET=Проект
 TicketTypeShortOTHER=Другое
@@ -54,14 +55,15 @@ TypeContact_ticket_internal_SUPPORTTEC=Назначенный пользоват
 TypeContact_ticket_external_SUPPORTCLI=Контакты с клиентами / отслеживание инцидентов
 TypeContact_ticket_external_CONTRIBUTOR=Внешний участник
 
-OriginEmail=Источник электронной почты
+OriginEmail=Reporter Email
 Notify_TICKET_SENTBYMAIL=Отправить билетное сообщение по электронной почте
 
 # Status
 Read=Читать
 Assigned=Назначенный
 InProgress=Выполняется
-NeedMoreInformation=Жду информации
+NeedMoreInformation=Жду отзывов репортера
+NeedMoreInformationShort=Жду отзывов
 Answered=Ответил
 Waiting=Ожидание
 Closed=Закрыты
@@ -160,7 +162,7 @@ CreatedBy=Создано
 NewTicket=Новый тикет
 SubjectAnswerToTicket=Тикет ответ
 TicketTypeRequest=Тип запроса
-TicketCategory=Группа
+TicketCategory=Категоризация тикетов
 SeeTicket=Посмотреть тикет
 TicketMarkedAsRead=Тикет отмечен как прочитанный
 TicketReadOn=Читать дальше
@@ -211,6 +213,7 @@ TicketMessageHelp=Только этот текст будет сохранен 
 TicketMessageSubstitutionReplacedByGenericValues=Подстановки переменных заменяются общими значениями.
 TimeElapsedSince=Прошло время с
 TicketTimeToRead=Время, прошедшее до прочтения
+TicketTimeElapsedBeforeSince=Время, прошедшее до / с
 TicketContacts=Контакты тикет
 TicketDocumentsLinked=Документы, привязанные к билету
 ConfirmReOpenTicket=Подтвердить повторное открытие этого билета?
@@ -304,7 +307,7 @@ BoxLastModifiedTicket=Последние измененные тикеты
 BoxLastModifiedTicketDescription=Последние измененные тикеты %s
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=Нет недавно измененных тикетов
-BoxTicketType=Distribution of open tickets by type
+BoxTicketType=Распределение открытых билетов по типам
 BoxTicketSeverity=Количество открытых заявок по серьезности
 BoxNoTicketSeverity=Тикеты не открыты
 BoxTicketLastXDays=Количество новых тикетов по дням последние %s дней
diff --git a/htdocs/langs/ru_RU/users.lang b/htdocs/langs/ru_RU/users.lang
index 5f9ca80336c..2ef9df3aa0b 100644
--- a/htdocs/langs/ru_RU/users.lang
+++ b/htdocs/langs/ru_RU/users.lang
@@ -97,8 +97,8 @@ LoginToCreate=Логин для создания
 NameToCreate=Имя третьей стороной для создания
 YourRole=Ваша роль
 YourQuotaOfUsersIsReached=Квота активных пользователей будет достигнута!
-NbOfUsers=Кол-во пользователей
-NbOfPermissions=Кол-во разрешений
+NbOfUsers=Количество пользователей
+NbOfPermissions=Количество разрешений
 DontDowngradeSuperAdmin=Только суперамин может понизить суперамин
 HierarchicalResponsible=Руководитель
 HierarchicView=Иерархический вид
diff --git a/htdocs/langs/ru_RU/website.lang b/htdocs/langs/ru_RU/website.lang
index f0b4f5cc7c0..825f1b801b2 100644
--- a/htdocs/langs/ru_RU/website.lang
+++ b/htdocs/langs/ru_RU/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Добавить сайт
 Webpage=Веб-страница / контейнер
 AddPage=Добавить страницу / контейнер
 PageContainer=Страница
-PreviewOfSiteNotYetAvailable=Предварительный просмотр вашего сайта <strong> %s </strong> пока недоступен. Сначала необходимо «<strong> Импортировать полный шаблон веб-сайта </strong>» или просто «<strong> Добавить страницу / контейнер </strong>».
+PreviewOfSiteNotYetAvailable=Предварительный просмотр вашего веб-сайта <strong> %s </strong> пока недоступен. Сначала необходимо «<strong> Импортировать полный шаблон веб-сайта </strong>» или просто «<strong> Добавить страницу / контейнер </strong>».
 RequestedPageHasNoContentYet=Запрошенная страница с идентификатором %s еще не имеет содержимого, либо файл кеша .tpl.php был удален. Отредактируйте содержимое страницы, чтобы решить эту проблему.
 SiteDeleted=Веб-сайт "%s" удален.
 PageContent=Страница / Contenair
diff --git a/htdocs/langs/ru_UA/products.lang b/htdocs/langs/ru_UA/products.lang
deleted file mode 100644
index e0628dbec00..00000000000
--- a/htdocs/langs/ru_UA/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
diff --git a/htdocs/langs/ru_UA/salaries.lang b/htdocs/langs/ru_UA/salaries.lang
deleted file mode 100644
index c9bd3bec17b..00000000000
--- a/htdocs/langs/ru_UA/salaries.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - salaries
-LastSalaries=Latest %s salary payments
-AllSalaries=All salary payments
diff --git a/htdocs/langs/ru_UA/ticket.lang b/htdocs/langs/ru_UA/ticket.lang
deleted file mode 100644
index 82e110b1ca4..00000000000
--- a/htdocs/langs/ru_UA/ticket.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - ticket
-TicketTypeShortISSUE=Issue, bug or problem
-OriginEmail=Email source
-NeedMoreInformation=Waiting for information
-TicketCategory=Group
diff --git a/htdocs/langs/ru_UA/users.lang b/htdocs/langs/ru_UA/users.lang
deleted file mode 100644
index 4a412122b08..00000000000
--- a/htdocs/langs/ru_UA/users.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - users
-NbOfUsers=No. of users
-NbOfPermissions=No. of permissions
diff --git a/htdocs/langs/ru_UA/website.lang b/htdocs/langs/ru_UA/website.lang
deleted file mode 100644
index 910cff6b702..00000000000
--- a/htdocs/langs/ru_UA/website.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - website
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
diff --git a/htdocs/langs/sk_SK/admin.lang b/htdocs/langs/sk_SK/admin.lang
index 365778f4fe8..54deb191bbc 100644
--- a/htdocs/langs/sk_SK/admin.lang
+++ b/htdocs/langs/sk_SK/admin.lang
@@ -53,6 +53,7 @@ InternalUser=Interný užívateľ
 ExternalUser=Externý užívateľ
 InternalUsers=Interní používatelia
 ExternalUsers=Externí používatelia
+UserInterface=User interface
 GUISetup=Zobraziť
 SetupArea=Setup
 UploadNewTemplate=Upload new template(s)
@@ -1260,8 +1261,8 @@ YourPHPDoesNotHaveSSLSupport=SSL funkcia nie je k dispozícii vo vašom PHP
 DownloadMoreSkins=Ďalšie skiny k stiahnutiu
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
-ShowProfIdInAddress=Show professional id with addresses
-ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
+ShowProfIdInAddress=Show professional ID with addresses
+ShowVATIntaInAddress=Hide intra-Community VAT number
 TranslationUncomplete=Čiastočný preklad
 MAIN_DISABLE_METEO=Disable meteorological view
 MeteoStdMod=Standard mode
@@ -1778,7 +1779,7 @@ ClickToDialSetup=Kliknite pre Dial Nastavenie modulu
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
 ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface, installed on the same computer as the browser, and called when you click on a link starting with "tel:" in your browser. If you need link that start with "sip:" or a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Point of Sale
 CashDeskSetup=Point of Sales module setup
@@ -2133,7 +2134,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
-NotRecommended=Not recommanded
+Recommended=Odporúčaná
+NotRecommended=Not recommended
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
@@ -2144,3 +2146,5 @@ YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You s
 RandomlySelectedIfSeveral=Randomly selected if several pictures are available
 DatabasePasswordObfuscated=Database password is obfuscated in conf file
 DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
+APIsAreNotEnabled=APIs modules are not enabled
+YouShouldSetThisToOff=You should set this to 0 or off
diff --git a/htdocs/langs/sk_SK/banks.lang b/htdocs/langs/sk_SK/banks.lang
index dcc321b5360..5a89e6b8681 100644
--- a/htdocs/langs/sk_SK/banks.lang
+++ b/htdocs/langs/sk_SK/banks.lang
@@ -115,7 +115,7 @@ TransferTo=Na
 TransferFromToDone=Transfer z <b>%s</b> na <b>%s</b> %s <b>%s</b> zo bol zaznamenaný.
 CheckTransmitter=Odosielateľ
 ValidateCheckReceipt=Overiť túto potvrdenku ?
-ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes will be possible once validated.
 DeleteCheckReceipt=Zmazať túto potvrdenku ?
 ConfirmDeleteCheckReceipt=Určite chcete zmazať túto potvrdenku ?
 BankChecks=Bankové šeky
diff --git a/htdocs/langs/sk_SK/boxes.lang b/htdocs/langs/sk_SK/boxes.lang
index dc27e1a08ea..4ec7f5cfa9a 100644
--- a/htdocs/langs/sk_SK/boxes.lang
+++ b/htdocs/langs/sk_SK/boxes.lang
@@ -91,8 +91,8 @@ BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
 BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
 BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
 BoxTitleLastModifiedPropals=Nedávno %s upravené ponuky
-BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
-BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
+BoxTitleLatestModifiedJobPositions=Latest %s modified job positions
+BoxTitleLatestModifiedCandidatures=Latest %s modified job applications
 ForCustomersInvoices=Zákazníci faktúry
 ForCustomersOrders=Zákazníci objednávky
 ForProposals=Návrhy
diff --git a/htdocs/langs/sk_SK/cashdesk.lang b/htdocs/langs/sk_SK/cashdesk.lang
index 2743926c0b0..580c98028b2 100644
--- a/htdocs/langs/sk_SK/cashdesk.lang
+++ b/htdocs/langs/sk_SK/cashdesk.lang
@@ -127,4 +127,4 @@ AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
 ShowPriceHT = Display the column with the price excluding tax (on screen)
-ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on the receipt)
diff --git a/htdocs/langs/sk_SK/errors.lang b/htdocs/langs/sk_SK/errors.lang
index 8dca2fd1384..3d62319d0d9 100644
--- a/htdocs/langs/sk_SK/errors.lang
+++ b/htdocs/langs/sk_SK/errors.lang
@@ -301,3 +301,4 @@ ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
 ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
+ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
diff --git a/htdocs/langs/sk_SK/eventorganization.lang b/htdocs/langs/sk_SK/eventorganization.lang
index 08cb79e8b00..a2a69d44cae 100644
--- a/htdocs/langs/sk_SK/eventorganization.lang
+++ b/htdocs/langs/sk_SK/eventorganization.lang
@@ -86,6 +86,7 @@ DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
 SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
 SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
+NbVotes=Number of votes
 #
 # Status
 #
@@ -115,6 +116,9 @@ EvntOrgDuration = This conference starts on %s and ends on %s.
 ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
 BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
 EventType = Typ udalosti
+LabelOfBooth=Booth label
+LabelOfconference=Conference label
+ConferenceIsNotConfirmed=Subcription not available, conference is not confirmed yet
 
 #
 # Vote page
diff --git a/htdocs/langs/sk_SK/install.lang b/htdocs/langs/sk_SK/install.lang
index 92b82af0604..9988cb88e73 100644
--- a/htdocs/langs/sk_SK/install.lang
+++ b/htdocs/langs/sk_SK/install.lang
@@ -206,6 +206,7 @@ MigrationUserPhotoPath=Migration of photo paths for users
 MigrationFieldsSocialNetworks=Migration of users fields social networks (%s)
 MigrationReloadModule=Znovu načítať modul %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
+MigrationImportOrExportProfiles=Migration of import or export profiles (%s)
 ShowNotAvailableOptions=Show unavailable options
 HideNotAvailableOptions=Hide unavailable options
 ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
diff --git a/htdocs/langs/sk_SK/interventions.lang b/htdocs/langs/sk_SK/interventions.lang
index 24b6496bfaa..17c0d2077f6 100644
--- a/htdocs/langs/sk_SK/interventions.lang
+++ b/htdocs/langs/sk_SK/interventions.lang
@@ -64,3 +64,5 @@ InterLineDuration=Line duration intervention
 InterLineDesc=Line description intervention
 RepeatableIntervention=Template of intervention
 ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
+Reopen=Reopen
+ConfirmReopenIntervention=Are you sure you want to open back the intervention <b>%s</b>?
diff --git a/htdocs/langs/sk_SK/productbatch.lang b/htdocs/langs/sk_SK/productbatch.lang
index 52833dc2011..189c4cef7c0 100644
--- a/htdocs/langs/sk_SK/productbatch.lang
+++ b/htdocs/langs/sk_SK/productbatch.lang
@@ -26,12 +26,10 @@ ShowLogOfMovementIfLot=Show log of movements for couple product/lot
 StockDetailPerBatch=Stock detail per lot
 SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
-BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
-BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
 ManageLotMask=Custom mask
-CustomMasks=Adds an option to define mask in the product card
-LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
-SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+CustomMasks=Option to define a different numbering mask for each product
+BatchLotNumberingModules=Numbering rule for automatic generation of lot number
+BatchSerialNumberingModules=Numbering rule for automatic generation of serial number (for products with property 1 unique lot/serial for each product)
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
diff --git a/htdocs/langs/sk_SK/products.lang b/htdocs/langs/sk_SK/products.lang
index dc7d5754a66..2342249013d 100644
--- a/htdocs/langs/sk_SK/products.lang
+++ b/htdocs/langs/sk_SK/products.lang
@@ -277,7 +277,7 @@ PriceByCustomer=Rozdielné ceny pre každého zákazníka
 PriceCatalogue=Rovnaká predajná cena pre produkt/službu
 PricingRule=Rules for selling prices
 AddCustomerPrice=Pridať cenu podľa zákazníka
-ForceUpdateChildPriceSoc=Nastaviť rovnakú cenu pre dcerske spoločnosti zákazníka
+ForceUpdateChildPriceSoc=Set same price on customer's subsidiaries
 PriceByCustomerLog=Vypis historických cien zákazníka
 MinimumPriceLimit=Minimálna cena nemôže byť nižšia ako %s
 MinimumRecommendedPrice=Minimum recommended price is: %s
@@ -296,6 +296,7 @@ ComposedProductIncDecStock=Pridať/Odobrať pri zmene rodičovského
 ComposedProduct=Child products
 MinSupplierPrice=Minimálna nákupná cena
 MinCustomerPrice=Minimum selling price
+NoDynamicPrice=No dynamic price
 DynamicPriceConfiguration=Nastavenie dynamickej ceny
 DynamicPriceDesc=You may define mathematical formulae to calculate Customer or Vendor prices. Such formulas can use all mathematical operators, some constants and variables. You can define here the variables you wish to use. If the variable needs an automatic update, you may define the external URL to allow Dolibarr to update the value automatically.
 AddVariable=Pridať premennú
diff --git a/htdocs/langs/sk_SK/salaries.lang b/htdocs/langs/sk_SK/salaries.lang
index d1bc2feb8c7..9e344782ee3 100644
--- a/htdocs/langs/sk_SK/salaries.lang
+++ b/htdocs/langs/sk_SK/salaries.lang
@@ -2,20 +2,23 @@
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=By default, leave empty the option "Automatically create a total payment" when creating a Salary
 Salary=Mzda
 Salaries=Mzdy
-NewSalaryPayment=Nová výplata mzdy
+NewSalary=New salary
+NewSalaryPayment=New salary card
 AddSalaryPayment=Add salary payment
 SalaryPayment=Výplata mzdy
 SalariesPayments=Výplaty miezd
+SalariesPaymentsOf=Salaries payments of %s
 ShowSalaryPayment=Ukázať výplatu mzdy
 THM=Priemerná hodinová mzda
 TJM=priemerná denná mzda
 CurrentSalary=Súčasná mzda
 THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
 TJMDescription=This value is currently for information only and is not used for any calculation
-LastSalaries=Latest %s salary payments
-AllSalaries=All salary payments
+LastSalaries=Latest %s salaries
+AllSalaries=All salaries
 SalariesStatistics=Salary statistics
-# Export
 SalariesAndPayments=Salaries and payments
+ConfirmDeleteSalaryPayment=Do you want to delete this salary payment ?
diff --git a/htdocs/langs/sk_SK/ticket.lang b/htdocs/langs/sk_SK/ticket.lang
index 486a593108c..aae27645fb5 100644
--- a/htdocs/langs/sk_SK/ticket.lang
+++ b/htdocs/langs/sk_SK/ticket.lang
@@ -34,7 +34,8 @@ TicketDictResolution=Ticket - Resolution
 
 TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
-TicketTypeShortISSUE=Issue, bug or problem
+TicketTypeShortISSUE=Issue or bug
+TicketTypeShortPROBLEM=Problem
 TicketTypeShortREQUEST=Change or enhancement request
 TicketTypeShortPROJET=Projekt
 TicketTypeShortOTHER=Ostatné
@@ -54,14 +55,15 @@ TypeContact_ticket_internal_SUPPORTTEC=Assigned user
 TypeContact_ticket_external_SUPPORTCLI=Customer contact / incident tracking
 TypeContact_ticket_external_CONTRIBUTOR=External contributor
 
-OriginEmail=Email source
+OriginEmail=Reporter Email
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
 Read=Čítať
 Assigned=Assigned
 InProgress=In progress
-NeedMoreInformation=Waiting for information
+NeedMoreInformation=Waiting for reporter feedback
+NeedMoreInformationShort=Waiting for feedback
 Answered=Answered
 Waiting=Čakanie
 Closed=Zatvorené
@@ -160,7 +162,7 @@ CreatedBy=Created by
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Skupina
+TicketCategory=Ticket categorization
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
@@ -211,6 +213,7 @@ TicketMessageHelp=Only this text will be saved in the message list on ticket car
 TicketMessageSubstitutionReplacedByGenericValues=Substitutions variables are replaced by generic values.
 TimeElapsedSince=Time elapsed since
 TicketTimeToRead=Time elapsed before read
+TicketTimeElapsedBeforeSince=Time elapsed before / since
 TicketContacts=Contacts ticket
 TicketDocumentsLinked=Documents linked to ticket
 ConfirmReOpenTicket=Confirm reopen this ticket ?
diff --git a/htdocs/langs/sk_SK/users.lang b/htdocs/langs/sk_SK/users.lang
index 77cc52980da..1cc5dc38477 100644
--- a/htdocs/langs/sk_SK/users.lang
+++ b/htdocs/langs/sk_SK/users.lang
@@ -97,8 +97,8 @@ LoginToCreate=Prihlásiť sa ak chcete vytvoriť
 NameToCreate=Názov vytváranej tretej strany
 YourRole=Vaše roly
 YourQuotaOfUsersIsReached=Vaša kvóta aktívnych používateľov bola dosiahnutá!
-NbOfUsers=No. of users
-NbOfPermissions=No. of permissions
+NbOfUsers=Number of users
+NbOfPermissions=Number of permissions
 DontDowngradeSuperAdmin=Iba superadmin môže degradovať superadmina
 HierarchicalResponsible=Supervízor
 HierarchicView=Hierarchické zobrazenie
diff --git a/htdocs/langs/sk_SK/website.lang b/htdocs/langs/sk_SK/website.lang
index 8612aecf711..9dc8034d7e0 100644
--- a/htdocs/langs/sk_SK/website.lang
+++ b/htdocs/langs/sk_SK/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 PageContainer=Strana
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
+PreviewOfSiteNotYetAvailable=The preview of your website <strong>%s</strong> is not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
diff --git a/htdocs/langs/sl_SI/admin.lang b/htdocs/langs/sl_SI/admin.lang
index 23aed3e8644..2e033872a7c 100644
--- a/htdocs/langs/sl_SI/admin.lang
+++ b/htdocs/langs/sl_SI/admin.lang
@@ -53,6 +53,7 @@ InternalUser=Interni uporabnik
 ExternalUser=Zunanji uporabnik
 InternalUsers=Interni uporabniki
 ExternalUsers=Zunanji uporabniki
+UserInterface=User interface
 GUISetup=Prikaz
 SetupArea=Nastavitve
 UploadNewTemplate=Upload new template(s)
@@ -1260,8 +1261,8 @@ YourPHPDoesNotHaveSSLSupport=SSL funkcije niso na voljo v vašem PHP
 DownloadMoreSkins=Prenos dodatnih preoblek
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
-ShowProfIdInAddress=Show professional id with addresses
-ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
+ShowProfIdInAddress=Show professional ID with addresses
+ShowVATIntaInAddress=Hide intra-Community VAT number
 TranslationUncomplete=Delni prevod
 MAIN_DISABLE_METEO=Disable meteorological view
 MeteoStdMod=Standard mode
@@ -1778,7 +1779,7 @@ ClickToDialSetup=Nastavitve modula za klicanje s klikom
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
 ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface, installed on the same computer as the browser, and called when you click on a link starting with "tel:" in your browser. If you need link that start with "sip:" or a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Point of Sale
 CashDeskSetup=Point of Sales module setup
@@ -2133,7 +2134,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
-NotRecommended=Not recommanded
+Recommended=Priporočena
+NotRecommended=Not recommended
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
@@ -2144,3 +2146,5 @@ YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You s
 RandomlySelectedIfSeveral=Randomly selected if several pictures are available
 DatabasePasswordObfuscated=Database password is obfuscated in conf file
 DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
+APIsAreNotEnabled=APIs modules are not enabled
+YouShouldSetThisToOff=You should set this to 0 or off
diff --git a/htdocs/langs/sl_SI/banks.lang b/htdocs/langs/sl_SI/banks.lang
index 6bf993564d0..8212dc05e67 100644
--- a/htdocs/langs/sl_SI/banks.lang
+++ b/htdocs/langs/sl_SI/banks.lang
@@ -115,7 +115,7 @@ TransferTo=Na
 TransferFromToDone=Zabeležen je bil transfer od <b>%s</b> na <b>%s</b> v znesku <b>%s</b> %s.
 CheckTransmitter=Od
 ValidateCheckReceipt=Validate this check receipt?
-ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes will be possible once validated.
 DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bančni čeki
diff --git a/htdocs/langs/sl_SI/boxes.lang b/htdocs/langs/sl_SI/boxes.lang
index 2b07e2fe81f..b2cbbc50e6a 100644
--- a/htdocs/langs/sl_SI/boxes.lang
+++ b/htdocs/langs/sl_SI/boxes.lang
@@ -91,8 +91,8 @@ BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
 BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
 BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
 BoxTitleLastModifiedPropals=Latest %s modified proposals
-BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
-BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
+BoxTitleLatestModifiedJobPositions=Latest %s modified job positions
+BoxTitleLatestModifiedCandidatures=Latest %s modified job applications
 ForCustomersInvoices=Računi za kupce
 ForCustomersOrders=Naročila kupcev
 ForProposals=Ponudbe
diff --git a/htdocs/langs/sl_SI/cashdesk.lang b/htdocs/langs/sl_SI/cashdesk.lang
index 3f773ece1c7..5f7f0c2feae 100644
--- a/htdocs/langs/sl_SI/cashdesk.lang
+++ b/htdocs/langs/sl_SI/cashdesk.lang
@@ -127,4 +127,4 @@ AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
 ShowPriceHT = Display the column with the price excluding tax (on screen)
-ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on the receipt)
diff --git a/htdocs/langs/sl_SI/errors.lang b/htdocs/langs/sl_SI/errors.lang
index 53beda3ad60..990d2498216 100644
--- a/htdocs/langs/sl_SI/errors.lang
+++ b/htdocs/langs/sl_SI/errors.lang
@@ -301,3 +301,4 @@ ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
 ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
+ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
diff --git a/htdocs/langs/sl_SI/eventorganization.lang b/htdocs/langs/sl_SI/eventorganization.lang
index 56623bf07f6..8cd7028c7ab 100644
--- a/htdocs/langs/sl_SI/eventorganization.lang
+++ b/htdocs/langs/sl_SI/eventorganization.lang
@@ -86,6 +86,7 @@ DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
 SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
 SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
+NbVotes=Number of votes
 #
 # Status
 #
@@ -115,6 +116,9 @@ EvntOrgDuration = This conference starts on %s and ends on %s.
 ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
 BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
 EventType = Tip dogodka
+LabelOfBooth=Booth label
+LabelOfconference=Conference label
+ConferenceIsNotConfirmed=Subcription not available, conference is not confirmed yet
 
 #
 # Vote page
diff --git a/htdocs/langs/sl_SI/install.lang b/htdocs/langs/sl_SI/install.lang
index 92bb6ebc95a..36ec526e467 100644
--- a/htdocs/langs/sl_SI/install.lang
+++ b/htdocs/langs/sl_SI/install.lang
@@ -206,6 +206,7 @@ MigrationUserPhotoPath=Migration of photo paths for users
 MigrationFieldsSocialNetworks=Migration of users fields social networks (%s)
 MigrationReloadModule=Ponovno naložite modul %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
+MigrationImportOrExportProfiles=Migration of import or export profiles (%s)
 ShowNotAvailableOptions=Show unavailable options
 HideNotAvailableOptions=Hide unavailable options
 ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
diff --git a/htdocs/langs/sl_SI/interventions.lang b/htdocs/langs/sl_SI/interventions.lang
index 5690b096a51..89945facf35 100644
--- a/htdocs/langs/sl_SI/interventions.lang
+++ b/htdocs/langs/sl_SI/interventions.lang
@@ -64,3 +64,5 @@ InterLineDuration=Line duration intervention
 InterLineDesc=Line description intervention
 RepeatableIntervention=Template of intervention
 ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
+Reopen=Reopen
+ConfirmReopenIntervention=Are you sure you want to open back the intervention <b>%s</b>?
diff --git a/htdocs/langs/sl_SI/productbatch.lang b/htdocs/langs/sl_SI/productbatch.lang
index 8a60dfb1f62..ec16883ae2b 100644
--- a/htdocs/langs/sl_SI/productbatch.lang
+++ b/htdocs/langs/sl_SI/productbatch.lang
@@ -26,12 +26,10 @@ ShowLogOfMovementIfLot=Show log of movements for couple product/lot
 StockDetailPerBatch=Stock detail per lot
 SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
-BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
-BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
 ManageLotMask=Custom mask
-CustomMasks=Adds an option to define mask in the product card
-LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
-SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+CustomMasks=Option to define a different numbering mask for each product
+BatchLotNumberingModules=Numbering rule for automatic generation of lot number
+BatchSerialNumberingModules=Numbering rule for automatic generation of serial number (for products with property 1 unique lot/serial for each product)
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
diff --git a/htdocs/langs/sl_SI/products.lang b/htdocs/langs/sl_SI/products.lang
index d126bc23073..2eef30f0448 100644
--- a/htdocs/langs/sl_SI/products.lang
+++ b/htdocs/langs/sl_SI/products.lang
@@ -277,7 +277,7 @@ PriceByCustomer=Different prices for each customer
 PriceCatalogue=A single sell price per product/service
 PricingRule=Rules for selling prices
 AddCustomerPrice=Dodaj ceno po kupcu
-ForceUpdateChildPriceSoc=Določi enako ceno za podružnice stranke
+ForceUpdateChildPriceSoc=Set same price on customer's subsidiaries
 PriceByCustomerLog=Pregled prejšnjih cen za kupce
 MinimumPriceLimit=Minimalna cena ne more biti nižja kot %s
 MinimumRecommendedPrice=Minimum recommended price is: %s
@@ -296,6 +296,7 @@ ComposedProductIncDecStock=Povečanje/znmanjšanje zaloge pri spremembi nadrejen
 ComposedProduct=Child products
 MinSupplierPrice=Najnižjo odkupno ceno
 MinCustomerPrice=Minimum selling price
+NoDynamicPrice=No dynamic price
 DynamicPriceConfiguration=Dimnamična konfiguracija cene
 DynamicPriceDesc=You may define mathematical formulae to calculate Customer or Vendor prices. Such formulas can use all mathematical operators, some constants and variables. You can define here the variables you wish to use. If the variable needs an automatic update, you may define the external URL to allow Dolibarr to update the value automatically.
 AddVariable=Add Variable
diff --git a/htdocs/langs/sl_SI/salaries.lang b/htdocs/langs/sl_SI/salaries.lang
index c9e828f84a3..197d00ba457 100644
--- a/htdocs/langs/sl_SI/salaries.lang
+++ b/htdocs/langs/sl_SI/salaries.lang
@@ -2,20 +2,23 @@
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=By default, leave empty the option "Automatically create a total payment" when creating a Salary
 Salary=Plača
 Salaries=Plače
-NewSalaryPayment=Novo izplačilo plače
+NewSalary=New salary
+NewSalaryPayment=New salary card
 AddSalaryPayment=Add salary payment
 SalaryPayment=Izplačilo plače
 SalariesPayments=Izplačila plač
+SalariesPaymentsOf=Salaries payments of %s
 ShowSalaryPayment=Prikaži izplačilo plač
 THM=Average hourly rate
 TJM=Average daily rate
 CurrentSalary=Trenutna plača
 THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
 TJMDescription=This value is currently for information only and is not used for any calculation
-LastSalaries=Latest %s salary payments
-AllSalaries=All salary payments
+LastSalaries=Latest %s salaries
+AllSalaries=All salaries
 SalariesStatistics=Salary statistics
-# Export
 SalariesAndPayments=Salaries and payments
+ConfirmDeleteSalaryPayment=Do you want to delete this salary payment ?
diff --git a/htdocs/langs/sl_SI/ticket.lang b/htdocs/langs/sl_SI/ticket.lang
index 8666613d0f0..26c63218879 100644
--- a/htdocs/langs/sl_SI/ticket.lang
+++ b/htdocs/langs/sl_SI/ticket.lang
@@ -34,7 +34,8 @@ TicketDictResolution=Ticket - Resolution
 
 TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
-TicketTypeShortISSUE=Issue, bug or problem
+TicketTypeShortISSUE=Issue or bug
+TicketTypeShortPROBLEM=Problem
 TicketTypeShortREQUEST=Change or enhancement request
 TicketTypeShortPROJET=Projekt
 TicketTypeShortOTHER=Ostalo
@@ -54,14 +55,15 @@ TypeContact_ticket_internal_SUPPORTTEC=Assigned user
 TypeContact_ticket_external_SUPPORTCLI=Customer contact / incident tracking
 TypeContact_ticket_external_CONTRIBUTOR=External contributor
 
-OriginEmail=Email source
+OriginEmail=Reporter Email
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
 Read=Preberite
 Assigned=Assigned
 InProgress=In progress
-NeedMoreInformation=Waiting for information
+NeedMoreInformation=Waiting for reporter feedback
+NeedMoreInformationShort=Waiting for feedback
 Answered=Answered
 Waiting=Na čakanju
 Closed=Zaključeno
@@ -160,7 +162,7 @@ CreatedBy=Created by
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Skupina
+TicketCategory=Ticket categorization
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
@@ -211,6 +213,7 @@ TicketMessageHelp=Only this text will be saved in the message list on ticket car
 TicketMessageSubstitutionReplacedByGenericValues=Substitutions variables are replaced by generic values.
 TimeElapsedSince=Time elapsed since
 TicketTimeToRead=Time elapsed before read
+TicketTimeElapsedBeforeSince=Time elapsed before / since
 TicketContacts=Contacts ticket
 TicketDocumentsLinked=Documents linked to ticket
 ConfirmReOpenTicket=Confirm reopen this ticket ?
diff --git a/htdocs/langs/sl_SI/users.lang b/htdocs/langs/sl_SI/users.lang
index e911348ef47..e48bfb63b82 100644
--- a/htdocs/langs/sl_SI/users.lang
+++ b/htdocs/langs/sl_SI/users.lang
@@ -97,8 +97,8 @@ LoginToCreate=Kreiranje uporabniškega imena
 NameToCreate=Kreiranje imena partnerja
 YourRole=Vaše vloge
 YourQuotaOfUsersIsReached=Dosežena je vaša kvota aktivnih uporabnikov !
-NbOfUsers=No. of users
-NbOfPermissions=No. of permissions
+NbOfUsers=Number of users
+NbOfPermissions=Number of permissions
 DontDowngradeSuperAdmin=Samo superadmin lahko degradira samo superadmin
 HierarchicalResponsible=Nadzornik
 HierarchicView=Hierarhični pogled
diff --git a/htdocs/langs/sl_SI/website.lang b/htdocs/langs/sl_SI/website.lang
index 9d3d0faab74..f0e2a16cf8c 100644
--- a/htdocs/langs/sl_SI/website.lang
+++ b/htdocs/langs/sl_SI/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 PageContainer=Stran
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
+PreviewOfSiteNotYetAvailable=The preview of your website <strong>%s</strong> is not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
diff --git a/htdocs/langs/sq_AL/admin.lang b/htdocs/langs/sq_AL/admin.lang
index a6643921c94..5ca16ac9515 100644
--- a/htdocs/langs/sq_AL/admin.lang
+++ b/htdocs/langs/sq_AL/admin.lang
@@ -53,6 +53,7 @@ InternalUser=Përdorues i brendshëm
 ExternalUser=Përdorues i jashtëm
 InternalUsers=Përdorues të brendshëm
 ExternalUsers=Përdorues të jashtëm
+UserInterface=User interface
 GUISetup=Shfaq
 SetupArea=Konfiguro
 UploadNewTemplate=Upload new template(s)
@@ -1260,8 +1261,8 @@ YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP
 DownloadMoreSkins=More skins to download
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
-ShowProfIdInAddress=Show professional id with addresses
-ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
+ShowProfIdInAddress=Show professional ID with addresses
+ShowVATIntaInAddress=Hide intra-Community VAT number
 TranslationUncomplete=Partial translation
 MAIN_DISABLE_METEO=Disable meteorological view
 MeteoStdMod=Standard mode
@@ -1778,7 +1779,7 @@ ClickToDialSetup=Click To Dial module setup
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
 ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface, installed on the same computer as the browser, and called when you click on a link starting with "tel:" in your browser. If you need link that start with "sip:" or a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Point of Sale
 CashDeskSetup=Point of Sales module setup
@@ -2133,7 +2134,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
-NotRecommended=Not recommanded
+Recommended=Recommended
+NotRecommended=Not recommended
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
@@ -2144,3 +2146,5 @@ YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You s
 RandomlySelectedIfSeveral=Randomly selected if several pictures are available
 DatabasePasswordObfuscated=Database password is obfuscated in conf file
 DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
+APIsAreNotEnabled=APIs modules are not enabled
+YouShouldSetThisToOff=You should set this to 0 or off
diff --git a/htdocs/langs/sq_AL/banks.lang b/htdocs/langs/sq_AL/banks.lang
index dd5f1ca63b1..83629ccc746 100644
--- a/htdocs/langs/sq_AL/banks.lang
+++ b/htdocs/langs/sq_AL/banks.lang
@@ -115,7 +115,7 @@ TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
 CheckTransmitter=Dërguesi
 ValidateCheckReceipt=Validate this check receipt?
-ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes will be possible once validated.
 DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
diff --git a/htdocs/langs/sq_AL/boxes.lang b/htdocs/langs/sq_AL/boxes.lang
index ce0cd6dc236..1a9e009e49c 100644
--- a/htdocs/langs/sq_AL/boxes.lang
+++ b/htdocs/langs/sq_AL/boxes.lang
@@ -91,8 +91,8 @@ BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
 BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
 BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
 BoxTitleLastModifiedPropals=Latest %s modified proposals
-BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
-BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
+BoxTitleLatestModifiedJobPositions=Latest %s modified job positions
+BoxTitleLatestModifiedCandidatures=Latest %s modified job applications
 ForCustomersInvoices=Customers invoices
 ForCustomersOrders=Customers orders
 ForProposals=Proposals
diff --git a/htdocs/langs/sq_AL/cashdesk.lang b/htdocs/langs/sq_AL/cashdesk.lang
index c9b3c0bf188..d21d2b762f9 100644
--- a/htdocs/langs/sq_AL/cashdesk.lang
+++ b/htdocs/langs/sq_AL/cashdesk.lang
@@ -127,4 +127,4 @@ AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
 ShowPriceHT = Display the column with the price excluding tax (on screen)
-ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on the receipt)
diff --git a/htdocs/langs/sq_AL/errors.lang b/htdocs/langs/sq_AL/errors.lang
index 670f8c7a6bc..85b90ca4991 100644
--- a/htdocs/langs/sq_AL/errors.lang
+++ b/htdocs/langs/sq_AL/errors.lang
@@ -301,3 +301,4 @@ ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
 ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
+ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
diff --git a/htdocs/langs/sq_AL/eventorganization.lang b/htdocs/langs/sq_AL/eventorganization.lang
index 335c257b224..f361e6bc192 100644
--- a/htdocs/langs/sq_AL/eventorganization.lang
+++ b/htdocs/langs/sq_AL/eventorganization.lang
@@ -86,6 +86,7 @@ DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
 SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
 SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
+NbVotes=Number of votes
 #
 # Status
 #
@@ -115,6 +116,9 @@ EvntOrgDuration = This conference starts on %s and ends on %s.
 ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
 BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
 EventType = Event type
+LabelOfBooth=Booth label
+LabelOfconference=Conference label
+ConferenceIsNotConfirmed=Subcription not available, conference is not confirmed yet
 
 #
 # Vote page
diff --git a/htdocs/langs/sq_AL/install.lang b/htdocs/langs/sq_AL/install.lang
index dbb8be357e7..08a9f949f86 100644
--- a/htdocs/langs/sq_AL/install.lang
+++ b/htdocs/langs/sq_AL/install.lang
@@ -206,6 +206,7 @@ MigrationUserPhotoPath=Migration of photo paths for users
 MigrationFieldsSocialNetworks=Migration of users fields social networks (%s)
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
+MigrationImportOrExportProfiles=Migration of import or export profiles (%s)
 ShowNotAvailableOptions=Show unavailable options
 HideNotAvailableOptions=Hide unavailable options
 ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
diff --git a/htdocs/langs/sq_AL/interventions.lang b/htdocs/langs/sq_AL/interventions.lang
index e5936f8246e..51079fca278 100644
--- a/htdocs/langs/sq_AL/interventions.lang
+++ b/htdocs/langs/sq_AL/interventions.lang
@@ -64,3 +64,5 @@ InterLineDuration=Line duration intervention
 InterLineDesc=Line description intervention
 RepeatableIntervention=Template of intervention
 ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
+Reopen=Reopen
+ConfirmReopenIntervention=Are you sure you want to open back the intervention <b>%s</b>?
diff --git a/htdocs/langs/sq_AL/productbatch.lang b/htdocs/langs/sq_AL/productbatch.lang
index 450d0285819..763af20c6b4 100644
--- a/htdocs/langs/sq_AL/productbatch.lang
+++ b/htdocs/langs/sq_AL/productbatch.lang
@@ -26,12 +26,10 @@ ShowLogOfMovementIfLot=Show log of movements for couple product/lot
 StockDetailPerBatch=Stock detail per lot
 SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
-BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
-BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
 ManageLotMask=Custom mask
-CustomMasks=Adds an option to define mask in the product card
-LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
-SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+CustomMasks=Option to define a different numbering mask for each product
+BatchLotNumberingModules=Numbering rule for automatic generation of lot number
+BatchSerialNumberingModules=Numbering rule for automatic generation of serial number (for products with property 1 unique lot/serial for each product)
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
diff --git a/htdocs/langs/sq_AL/products.lang b/htdocs/langs/sq_AL/products.lang
index 3ef089f359a..5fd4916c8f2 100644
--- a/htdocs/langs/sq_AL/products.lang
+++ b/htdocs/langs/sq_AL/products.lang
@@ -277,7 +277,7 @@ PriceByCustomer=Different prices for each customer
 PriceCatalogue=A single sell price per product/service
 PricingRule=Rules for selling prices
 AddCustomerPrice=Add price by customer
-ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
+ForceUpdateChildPriceSoc=Set same price on customer's subsidiaries
 PriceByCustomerLog=Log of previous customer prices
 MinimumPriceLimit=Minimum price can't be lower then %s
 MinimumRecommendedPrice=Minimum recommended price is: %s
@@ -296,6 +296,7 @@ ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Child products
 MinSupplierPrice=Minimum buying price
 MinCustomerPrice=Minimum selling price
+NoDynamicPrice=No dynamic price
 DynamicPriceConfiguration=Dynamic price configuration
 DynamicPriceDesc=You may define mathematical formulae to calculate Customer or Vendor prices. Such formulas can use all mathematical operators, some constants and variables. You can define here the variables you wish to use. If the variable needs an automatic update, you may define the external URL to allow Dolibarr to update the value automatically.
 AddVariable=Add Variable
diff --git a/htdocs/langs/sq_AL/salaries.lang b/htdocs/langs/sq_AL/salaries.lang
index 3539d05cb2e..6f5391f3da3 100644
--- a/htdocs/langs/sq_AL/salaries.lang
+++ b/htdocs/langs/sq_AL/salaries.lang
@@ -2,20 +2,23 @@
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=By default, leave empty the option "Automatically create a total payment" when creating a Salary
 Salary=Rrogë
 Salaries=Rrogat
-NewSalaryPayment=Pagesë e re rroge
+NewSalary=New salary
+NewSalaryPayment=New salary card
 AddSalaryPayment=Add salary payment
 SalaryPayment=Pagesë rroge
 SalariesPayments=Pagesat e rrogave
+SalariesPaymentsOf=Salaries payments of %s
 ShowSalaryPayment=Trego pagesën e rrogës
 THM=Average hourly rate
 TJM=Average daily rate
 CurrentSalary=Current salary
 THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
 TJMDescription=This value is currently for information only and is not used for any calculation
-LastSalaries=Latest %s salary payments
-AllSalaries=All salary payments
+LastSalaries=Latest %s salaries
+AllSalaries=All salaries
 SalariesStatistics=Salary statistics
-# Export
 SalariesAndPayments=Salaries and payments
+ConfirmDeleteSalaryPayment=Do you want to delete this salary payment ?
diff --git a/htdocs/langs/sq_AL/ticket.lang b/htdocs/langs/sq_AL/ticket.lang
index 624d7985dbd..eb1fe6d0063 100644
--- a/htdocs/langs/sq_AL/ticket.lang
+++ b/htdocs/langs/sq_AL/ticket.lang
@@ -34,7 +34,8 @@ TicketDictResolution=Ticket - Resolution
 
 TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
-TicketTypeShortISSUE=Issue, bug or problem
+TicketTypeShortISSUE=Issue or bug
+TicketTypeShortPROBLEM=Problem
 TicketTypeShortREQUEST=Change or enhancement request
 TicketTypeShortPROJET=Project
 TicketTypeShortOTHER=Tjetër
@@ -54,14 +55,15 @@ TypeContact_ticket_internal_SUPPORTTEC=Assigned user
 TypeContact_ticket_external_SUPPORTCLI=Customer contact / incident tracking
 TypeContact_ticket_external_CONTRIBUTOR=External contributor
 
-OriginEmail=Email source
+OriginEmail=Reporter Email
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
 Read=Read
 Assigned=Assigned
 InProgress=In progress
-NeedMoreInformation=Waiting for information
+NeedMoreInformation=Waiting for reporter feedback
+NeedMoreInformationShort=Waiting for feedback
 Answered=Answered
 Waiting=Waiting
 Closed=Mbyllur
@@ -160,7 +162,7 @@ CreatedBy=Created by
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Group
+TicketCategory=Ticket categorization
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
@@ -211,6 +213,7 @@ TicketMessageHelp=Only this text will be saved in the message list on ticket car
 TicketMessageSubstitutionReplacedByGenericValues=Substitutions variables are replaced by generic values.
 TimeElapsedSince=Time elapsed since
 TicketTimeToRead=Time elapsed before read
+TicketTimeElapsedBeforeSince=Time elapsed before / since
 TicketContacts=Contacts ticket
 TicketDocumentsLinked=Documents linked to ticket
 ConfirmReOpenTicket=Confirm reopen this ticket ?
diff --git a/htdocs/langs/sq_AL/users.lang b/htdocs/langs/sq_AL/users.lang
index f0310710974..fbd264fa0a1 100644
--- a/htdocs/langs/sq_AL/users.lang
+++ b/htdocs/langs/sq_AL/users.lang
@@ -97,8 +97,8 @@ LoginToCreate=Login to create
 NameToCreate=Name of third party to create
 YourRole=Your roles
 YourQuotaOfUsersIsReached=Your quota of active users is reached !
-NbOfUsers=No. of users
-NbOfPermissions=No. of permissions
+NbOfUsers=Number of users
+NbOfPermissions=Number of permissions
 DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin
 HierarchicalResponsible=Supervisor
 HierarchicView=Hierarchical view
diff --git a/htdocs/langs/sq_AL/website.lang b/htdocs/langs/sq_AL/website.lang
index 1e727415ec2..dc2ec2c0b3d 100644
--- a/htdocs/langs/sq_AL/website.lang
+++ b/htdocs/langs/sq_AL/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 PageContainer=Page
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
+PreviewOfSiteNotYetAvailable=The preview of your website <strong>%s</strong> is not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
diff --git a/htdocs/langs/sr_RS/admin.lang b/htdocs/langs/sr_RS/admin.lang
index 7c246b5d190..31f7c89590b 100644
--- a/htdocs/langs/sr_RS/admin.lang
+++ b/htdocs/langs/sr_RS/admin.lang
@@ -53,6 +53,7 @@ InternalUser=Internal user
 ExternalUser=External user
 InternalUsers=Internal users
 ExternalUsers=External users
+UserInterface=User interface
 GUISetup=Display
 SetupArea=Podešavanja
 UploadNewTemplate=Upload new template(s)
@@ -1260,8 +1261,8 @@ YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP
 DownloadMoreSkins=More skins to download
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
-ShowProfIdInAddress=Show professional id with addresses
-ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
+ShowProfIdInAddress=Show professional ID with addresses
+ShowVATIntaInAddress=Hide intra-Community VAT number
 TranslationUncomplete=Partial translation
 MAIN_DISABLE_METEO=Disable meteorological view
 MeteoStdMod=Standard mode
@@ -1778,7 +1779,7 @@ ClickToDialSetup=Click To Dial module setup
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
 ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Samo koristi link "tel:" na telefonskim brojevima
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface, installed on the same computer as the browser, and called when you click on a link starting with "tel:" in your browser. If you need link that start with "sip:" or a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Point of Sale
 CashDeskSetup=Point of Sales module setup
@@ -2133,7 +2134,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
-NotRecommended=Not recommanded
+Recommended=Preporučeno
+NotRecommended=Not recommended
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
@@ -2144,3 +2146,5 @@ YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You s
 RandomlySelectedIfSeveral=Randomly selected if several pictures are available
 DatabasePasswordObfuscated=Database password is obfuscated in conf file
 DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
+APIsAreNotEnabled=APIs modules are not enabled
+YouShouldSetThisToOff=You should set this to 0 or off
diff --git a/htdocs/langs/sr_RS/banks.lang b/htdocs/langs/sr_RS/banks.lang
index e1d59217844..4bccdc11cb4 100644
--- a/htdocs/langs/sr_RS/banks.lang
+++ b/htdocs/langs/sr_RS/banks.lang
@@ -115,7 +115,7 @@ TransferTo=Za
 TransferFromToDone=Prenos od  <b>%s</b> to <b>%s</b> of <b>%s</b> %s je zabeležen.
 CheckTransmitter=Pošiljalac
 ValidateCheckReceipt=Validate this check receipt?
-ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes will be possible once validated.
 DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bankovni ček
diff --git a/htdocs/langs/sr_RS/boxes.lang b/htdocs/langs/sr_RS/boxes.lang
index e593f6e30fc..c65406c025b 100644
--- a/htdocs/langs/sr_RS/boxes.lang
+++ b/htdocs/langs/sr_RS/boxes.lang
@@ -91,8 +91,8 @@ BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
 BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
 BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
 BoxTitleLastModifiedPropals=Latest %s modified proposals
-BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
-BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
+BoxTitleLatestModifiedJobPositions=Latest %s modified job positions
+BoxTitleLatestModifiedCandidatures=Latest %s modified job applications
 ForCustomersInvoices=Fakture klijenata
 ForCustomersOrders=Narudžbine klijenata
 ForProposals=Ponude
diff --git a/htdocs/langs/sr_RS/cashdesk.lang b/htdocs/langs/sr_RS/cashdesk.lang
index 76a74df3a33..50c461f5015 100644
--- a/htdocs/langs/sr_RS/cashdesk.lang
+++ b/htdocs/langs/sr_RS/cashdesk.lang
@@ -127,4 +127,4 @@ AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
 ShowPriceHT = Display the column with the price excluding tax (on screen)
-ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on the receipt)
diff --git a/htdocs/langs/sr_RS/errors.lang b/htdocs/langs/sr_RS/errors.lang
index cfcb3ff5f9f..5469001ad78 100644
--- a/htdocs/langs/sr_RS/errors.lang
+++ b/htdocs/langs/sr_RS/errors.lang
@@ -301,3 +301,4 @@ ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
 ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
+ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
diff --git a/htdocs/langs/sr_RS/eventorganization.lang b/htdocs/langs/sr_RS/eventorganization.lang
index f2e1ea2d7e3..8c27a39641b 100644
--- a/htdocs/langs/sr_RS/eventorganization.lang
+++ b/htdocs/langs/sr_RS/eventorganization.lang
@@ -86,6 +86,7 @@ DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
 SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
 SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
+NbVotes=Number of votes
 #
 # Status
 #
@@ -115,6 +116,9 @@ EvntOrgDuration = This conference starts on %s and ends on %s.
 ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
 BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
 EventType = Tip događaja
+LabelOfBooth=Booth label
+LabelOfconference=Conference label
+ConferenceIsNotConfirmed=Subcription not available, conference is not confirmed yet
 
 #
 # Vote page
diff --git a/htdocs/langs/sr_RS/install.lang b/htdocs/langs/sr_RS/install.lang
index 3a09cc9669d..e5f60b91b6b 100644
--- a/htdocs/langs/sr_RS/install.lang
+++ b/htdocs/langs/sr_RS/install.lang
@@ -206,6 +206,7 @@ MigrationUserPhotoPath=Migration of photo paths for users
 MigrationFieldsSocialNetworks=Migration of users fields social networks (%s)
 MigrationReloadModule=Ponovo učitavanje modula %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
+MigrationImportOrExportProfiles=Migration of import or export profiles (%s)
 ShowNotAvailableOptions=Show unavailable options
 HideNotAvailableOptions=Hide unavailable options
 ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
diff --git a/htdocs/langs/sr_RS/interventions.lang b/htdocs/langs/sr_RS/interventions.lang
index b1bc27aa9e7..11aeb4fe0de 100644
--- a/htdocs/langs/sr_RS/interventions.lang
+++ b/htdocs/langs/sr_RS/interventions.lang
@@ -64,3 +64,5 @@ InterLineDuration=Trajanje linije intervencije
 InterLineDesc=Opis linije intervencije
 RepeatableIntervention=Template of intervention
 ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
+Reopen=Ponovo Otvoreno
+ConfirmReopenIntervention=Are you sure you want to open back the intervention <b>%s</b>?
diff --git a/htdocs/langs/sr_RS/productbatch.lang b/htdocs/langs/sr_RS/productbatch.lang
index 1df8b47c1c2..6b4c2e2f343 100644
--- a/htdocs/langs/sr_RS/productbatch.lang
+++ b/htdocs/langs/sr_RS/productbatch.lang
@@ -26,12 +26,10 @@ ShowLogOfMovementIfLot=Show log of movements for couple product/lot
 StockDetailPerBatch=Stock detail per lot
 SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
-BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
-BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
 ManageLotMask=Custom mask
-CustomMasks=Adds an option to define mask in the product card
-LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
-SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+CustomMasks=Option to define a different numbering mask for each product
+BatchLotNumberingModules=Numbering rule for automatic generation of lot number
+BatchSerialNumberingModules=Numbering rule for automatic generation of serial number (for products with property 1 unique lot/serial for each product)
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
diff --git a/htdocs/langs/sr_RS/products.lang b/htdocs/langs/sr_RS/products.lang
index 15e51a7abfe..2bfcef67ddf 100644
--- a/htdocs/langs/sr_RS/products.lang
+++ b/htdocs/langs/sr_RS/products.lang
@@ -277,7 +277,7 @@ PriceByCustomer=Different prices for each customer
 PriceCatalogue=A single sell price per product/service
 PricingRule=Rules for selling prices
 AddCustomerPrice=Dodaj cenu po klijentu
-ForceUpdateChildPriceSoc=Podesi istu cenu za ogranke klijenta
+ForceUpdateChildPriceSoc=Set same price on customer's subsidiaries
 PriceByCustomerLog=Istorija prethodnih cena klijenata
 MinimumPriceLimit=Minimalna cena ne može biti manja od %s
 MinimumRecommendedPrice=Minimum recommended price is: %s
@@ -296,6 +296,7 @@ ComposedProductIncDecStock=Povećaj/Smanji zalihu na matičnoj promeni
 ComposedProduct=Child products
 MinSupplierPrice=Minimalna kupovna cena
 MinCustomerPrice=Minimum selling price
+NoDynamicPrice=No dynamic price
 DynamicPriceConfiguration=Dinamička konfiguracija cene
 DynamicPriceDesc=You may define mathematical formulae to calculate Customer or Vendor prices. Such formulas can use all mathematical operators, some constants and variables. You can define here the variables you wish to use. If the variable needs an automatic update, you may define the external URL to allow Dolibarr to update the value automatically.
 AddVariable=Dodaj promenljivu
diff --git a/htdocs/langs/sr_RS/salaries.lang b/htdocs/langs/sr_RS/salaries.lang
index 43def73622c..ca05a64c7fa 100644
--- a/htdocs/langs/sr_RS/salaries.lang
+++ b/htdocs/langs/sr_RS/salaries.lang
@@ -2,20 +2,23 @@
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Konto koji se koristi za korisnike trećih lica
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=By default, leave empty the option "Automatically create a total payment" when creating a Salary
 Salary=Plata
 Salaries=Plate
-NewSalaryPayment=Nova isplata zarade
+NewSalary=New salary
+NewSalaryPayment=New salary card
 AddSalaryPayment=Add salary payment
 SalaryPayment=Isplata zarade
 SalariesPayments=Isplate zarada
+SalariesPaymentsOf=Salaries payments of %s
 ShowSalaryPayment=Prikaži isplatu zarade
 THM=Prosečna cena sata
 TJM=Prosečna cena dana
 CurrentSalary=Trenutna plata
 THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
 TJMDescription=This value is currently for information only and is not used for any calculation
-LastSalaries=Latest %s salary payments
-AllSalaries=All salary payments
+LastSalaries=Latest %s salaries
+AllSalaries=All salaries
 SalariesStatistics=Salary statistics
-# Export
 SalariesAndPayments=Salaries and payments
+ConfirmDeleteSalaryPayment=Do you want to delete this salary payment ?
diff --git a/htdocs/langs/sr_RS/ticket.lang b/htdocs/langs/sr_RS/ticket.lang
index 9bd7de5b1d3..d001d02171f 100644
--- a/htdocs/langs/sr_RS/ticket.lang
+++ b/htdocs/langs/sr_RS/ticket.lang
@@ -34,7 +34,8 @@ TicketDictResolution=Ticket - Resolution
 
 TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
-TicketTypeShortISSUE=Issue, bug or problem
+TicketTypeShortISSUE=Issue or bug
+TicketTypeShortPROBLEM=Problem
 TicketTypeShortREQUEST=Change or enhancement request
 TicketTypeShortPROJET=Projekat
 TicketTypeShortOTHER=Drugo
@@ -54,14 +55,15 @@ TypeContact_ticket_internal_SUPPORTTEC=Assigned user
 TypeContact_ticket_external_SUPPORTCLI=Customer contact / incident tracking
 TypeContact_ticket_external_CONTRIBUTOR=External contributor
 
-OriginEmail=Email source
+OriginEmail=Reporter Email
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
 Read=Pročitaj
 Assigned=Assigned
 InProgress=In progress
-NeedMoreInformation=Waiting for information
+NeedMoreInformation=Waiting for reporter feedback
+NeedMoreInformationShort=Waiting for feedback
 Answered=Answered
 Waiting=Na čekanju
 Closed=Zatvoreno
@@ -160,7 +162,7 @@ CreatedBy=Created by
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Grupa
+TicketCategory=Ticket categorization
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
@@ -211,6 +213,7 @@ TicketMessageHelp=Only this text will be saved in the message list on ticket car
 TicketMessageSubstitutionReplacedByGenericValues=Substitutions variables are replaced by generic values.
 TimeElapsedSince=Time elapsed since
 TicketTimeToRead=Time elapsed before read
+TicketTimeElapsedBeforeSince=Time elapsed before / since
 TicketContacts=Contacts ticket
 TicketDocumentsLinked=Documents linked to ticket
 ConfirmReOpenTicket=Confirm reopen this ticket ?
diff --git a/htdocs/langs/sr_RS/users.lang b/htdocs/langs/sr_RS/users.lang
index 3f49f99fdb0..ee428e59980 100644
--- a/htdocs/langs/sr_RS/users.lang
+++ b/htdocs/langs/sr_RS/users.lang
@@ -97,8 +97,8 @@ LoginToCreate=Login za kreiranje
 NameToCreate=Ime subjekta za kreiranje
 YourRole=Vaši profili
 YourQuotaOfUsersIsReached=Vaša kvota aktivnih korisnika je dostignuta !
-NbOfUsers=No. of users
-NbOfPermissions=No. of permissions
+NbOfUsers=Number of users
+NbOfPermissions=Number of permissions
 DontDowngradeSuperAdmin=Samo superadmin može downgrade-ovati superadmina
 HierarchicalResponsible=Supervizor
 HierarchicView=Hijerarhijski prikaz
diff --git a/htdocs/langs/sr_RS/website.lang b/htdocs/langs/sr_RS/website.lang
index a51d5cffc41..f953e2c2725 100644
--- a/htdocs/langs/sr_RS/website.lang
+++ b/htdocs/langs/sr_RS/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 PageContainer=Strana
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
+PreviewOfSiteNotYetAvailable=The preview of your website <strong>%s</strong> is not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
diff --git a/htdocs/langs/sv_SE/accountancy.lang b/htdocs/langs/sv_SE/accountancy.lang
index ae73d14f744..f70887b5ec9 100644
--- a/htdocs/langs/sv_SE/accountancy.lang
+++ b/htdocs/langs/sv_SE/accountancy.lang
@@ -48,7 +48,8 @@ CountriesNotInEEC=Länder inte i EEG
 CountriesInEECExceptMe=Länder i EEG förutom %s
 CountriesExceptMe=Alla länder utom %s
 AccountantFiles=Exportera källdokument
-ExportAccountingSourceDocHelp=Med det här verktyget kan du exportera de källhändelser (lista och PDF-filer) som användes för att generera din bokföring. För att exportera dina tidskrifter, använd menyposten %s - %s.
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list in CSV and PDFs) that were used to generate your accountancy.
+ExportAccountingSourceDocHelp2=För att exportera verifikationer, använd menyn %s - %s
 VueByAccountAccounting=Visa baserat på redovisningskonto
 VueBySubAccountAccounting=Visa efter redovisning av underkonto
 
@@ -328,7 +329,7 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Inaktivera bindning och överföring av
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Inaktivera bindning och överföring i bokföring på kostnadsrapporter (kostnadsrapporter kommer inte att beaktas vid redovisning)
 
 ## Export
-NotifiedExportDate=Notified export date (modification of the entries will not be possible)
+NotifiedExportDate=Exporteringsdatum (ändringar kan ej göras)
 NotifiedValidationDate=Validation of the entries (modification or deletion of the entries will not be possible)
 ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=Exportera utkast till loggbok
diff --git a/htdocs/langs/sv_SE/admin.lang b/htdocs/langs/sv_SE/admin.lang
index 438eda62f9f..73fe7295128 100644
--- a/htdocs/langs/sv_SE/admin.lang
+++ b/htdocs/langs/sv_SE/admin.lang
@@ -53,6 +53,7 @@ InternalUser=Intern användare
 ExternalUser=Extern användare
 InternalUsers=Interna användare
 ExternalUsers=Externa användare
+UserInterface=User interface
 GUISetup=Visa
 SetupArea=Inställning
 UploadNewTemplate=Ladda upp ny mall (er)
@@ -221,7 +222,7 @@ NotCompatible=Den här modulen verkar inte vara kompatibel med din Dolibarr %s (
 CompatibleAfterUpdate=Den här modulen kräver en uppdatering av din Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=Se på marknaden
 SeeSetupOfModule=Se installation av modul %s
-SetOptionTo=Set option <b>%s</b> to %s
+SetOptionTo=Sätt alternativ %s till %s
 Updated=Uppdaterad
 AchatTelechargement=Köp / Hämta
 GoModuleSetupArea=För att distribuera / installera en ny modul, gå till modulens inställningsområde: <a href="%s"> %s </a>.
@@ -562,7 +563,7 @@ Module53Desc=Förvaltning av tjänster
 Module54Name=Avtal / Prenumerationer
 Module54Desc=Förvaltning av kontrakt (tjänster eller återkommande abonnemang)
 Module55Name=Streckkoder
-Module55Desc=Barcode or QR code management
+Module55Desc=Streckkod eller QRkods hantering
 Module56Name=Betalning med kreditöverföring
 Module56Desc=Hantering av betalning av leverantörer med kreditöverföringsorder. Den inkluderar generering av SEPA-filer för europeiska länder.
 Module57Name=Betalningar med autogiro
@@ -849,10 +850,10 @@ Permission402=Skapa / ändra rabatter
 Permission403=Bekräfta rabatter
 Permission404=Ta bort rabatter
 Permission430=Använd felsökningsfältet
-Permission511=Read salaries and payments (yours and subordinates)
-Permission512=Create/modify salaries and payments
-Permission514=Delete salaries and payments
-Permission517=Read salaries and payments everybody
+Permission511=Visa löner och utbetalningar (dina och anställdas)
+Permission512=Skapa/ändra löner och utbetalningar
+Permission514=Ta bort löner och utbetalningar
+Permission517=Visa löner och utbetalningar för alla
 Permission519=Export löner
 Permission520=Läs Lån
 Permission522=Skapa / ändra lån
@@ -1191,7 +1192,7 @@ SetupDescription4= <a href="%s"> %s -> %s </a> <br> <br> Denna programvara är e
 SetupDescription5=Andra inställningsmenyposter hanterar valfria parametrar.
 AuditedSecurityEvents=Säkerhetshändelser som granskas
 NoSecurityEventsAreAduited=Inga säkerhetshändelser granskas. Du kan aktivera dem från meny %s
-Audit=Security events
+Audit=Säkerhetshändelser
 InfoDolibarr=Om Dolibarr
 InfoBrowser=Om Browser
 InfoOS=Om OS
@@ -1216,7 +1217,7 @@ AvailableModules=Tillgängliga app / moduler
 ToActivateModule=För att aktivera moduler, gå på Setup-menyn (Hem-> Inställningar-> Modules).
 SessionTimeOut=Time out för session
 SessionExplanation=Detta nummer garanterar att sessionen aldrig upphör att gälla före denna fördröjning, om sessionen rengöringsmedel görs av Internal PHP-rengöringsmedel (och inget annat). Intern rengöringsprogram för PHP-session garanterar inte att sessionen upphör att gälla efter denna fördröjning. Det kommer att löpa ut efter denna fördröjning och när sessionen renare körs, så varje <b> %s / %s </b> åtkomst, men endast under åtkomst av andra sessioner (om värdet är 0, betyder det att rensning av session endast sker av en extern bearbeta). <br> Obs! På vissa servrar med en extern sessionrensningsmekanism (cron under debian, ubuntu ...) kan sessionerna förstöras efter en period som definieras av en extern inställning, oavsett vad värdet som anges här är.
-SessionsPurgedByExternalSystem=Sessions on this server seems to be cleaned by an external mechanism (cron under debian, ubuntu ...), probably every <b>%s</b> seconds (= value of parameter <b>session.gc_maxlifetime</b>), so changing the value here has no effect. You must ask the server administrator to change session delay.
+SessionsPurgedByExternalSystem=Sessionerna på denna server verkar ha blivit rensade av extern händelse (cron under debian, ubuntu...), var <b>%s</b> sekund ( Värdet är <b>session.gc_maxlifetime</b>), så att ändra värdet här har ingen effekt. Du måste be serveradministratören att ändra sessionstiden
 TriggersAvailable=Tillgängliga triggers
 TriggersDesc=Utlösare är filer som ändrar beteendet hos Dolibarr-arbetsflödet en gång kopierat till katalogen <b> htdocs / core / triggers </b>. De inser nya åtgärder, aktiverade på Dolibarr-evenemang (ny företagsskapande, fakturabekräftande, ...).
 TriggerDisabledByName=Triggers i denna fil är inaktiverade <b>av-NORUN</b> suffixet i deras namn.
@@ -1260,8 +1261,8 @@ YourPHPDoesNotHaveSSLSupport=SSL-funktioner inte är tillgängliga i din PHP
 DownloadMoreSkins=Mer skinn att ladda ner
 SimpleNumRefModelDesc=Returnerar referensnumret i formatet %syymm-nnnn där yy är året, mm är månaden och nnnn är ett sekventiellt automatiskt ökande nummer utan återställning
 SimpleNumRefNoDateModelDesc=Returnerar referensnumret i formatet %s-nnnn där nnnn är ett sekventiellt automatiskt inkrementeringsnummer utan återställning
-ShowProfIdInAddress=Visa professionellt id med adresser
-ShowVATIntaInAddress=Dölj momsnumret inom gemenskapen med adresser
+ShowProfIdInAddress=Show professional ID with addresses
+ShowVATIntaInAddress=Hide intra-Community VAT number
 TranslationUncomplete=Partiell översättning
 MAIN_DISABLE_METEO=Inaktivera meteorologisk syn
 MeteoStdMod=Standardläge
@@ -1327,7 +1328,7 @@ ComboListOptim=Combo list loading optimization
 SearchOptim=Sökoptimering
 YouHaveXObjectUseComboOptim=You have %s %s in the database. You can go into setup of module to enable loading of combo list on key pressed event.
 YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other.
-YouHaveXObjectUseSearchOptimDesc=This limits the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectUseSearchOptimDesc=Detta begränsar sökningar till början av rader för att förenkla databasens användning av indexering, vilket resulterar i snabbare respons.
 YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to %s in Home-Setup-Other.
 BrowserIsOK=Du använder %s webbläsaren. Den här webbläsaren är ok för säkerhet och prestanda.
 BrowserIsKO=Du använder %s webbläsaren. Den här webbläsaren är känd för att vara ett dåligt val för säkerhet, prestanda och tillförlitlighet. Vi rekommenderar att du använder Firefox, Chrome, Opera eller Safari.
@@ -1778,7 +1779,7 @@ ClickToDialSetup=Klicka för att Dial modul inställning
 ClickToDialUrlDesc=Url ringde när ett klick på telefon picto är gjort. I URL kan du använda taggar <br> <b> __PHONETO__ </b> som kommer att ersättas med telefonnumret person att ringa <br> <b> __PHONEFROM__ </b> som kommer att ersättas med telefonnummer att ringa person (er) <br> <b> __LOGIN__ </b> som kommer att ersättas med clicktodial inloggning (definierad på användarkort) <br> <b> __PASS__ </b> som kommer att ersättas med clicktodial lösenord (definierat på användarkort).
 ClickToDialDesc=Denna modul ändrar telefonnummer när du använder en stationär dator till klickbara länkar. Ett klick ringer upp numret. Detta kan användas för att starta telefonsamtalet när du använder en mjuk telefon på skrivbordet eller när du t.ex. använder ett CTI-system baserat på SIP-protokoll. Obs! När du använder en smartphone är telefonnummer alltid klickbara.
 ClickToDialUseTelLink=Använd bara en länk "tel:" på telefonnummer
-ClickToDialUseTelLinkDesc=Använd den här metoden om användarna har en mjukvara eller ett programgränssnitt installerat på samma dator som webbläsaren och ringde när du klickar på en länk i din webbläsare som börjar med "tel:". Om du behöver en fullständig serverlösning (inget behov av lokal programinstallation) måste du ange detta till "Nej" och fylla i nästa fält.
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface, installed on the same computer as the browser, and called when you click on a link starting with "tel:" in your browser. If you need link that start with "sip:" or a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Försäljningsstället
 CashDeskSetup=Inställning av försäljningsmodul
@@ -2133,14 +2134,17 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=Inga skrivbara filer eller kataloger för de vanliga programmen hittades i din rotkatalog (Bra)
 RecommendedValueIs=Rekommenderas: %s
-NotRecommended=Rekommenderas inte
+Recommended=Rekommenderad
+NotRecommended=Not recommended
 ARestrictedPath=En begränsad väg
 CheckForModuleUpdate=Sök efter uppdateringar av externa moduler
 CheckForModuleUpdateHelp=Denna åtgärd kommer att ansluta till redaktörer för externa moduler för att kontrollera om en ny version är tillgänglig.
 ModuleUpdateAvailable=En uppdatering är tillgänglig
 NoExternalModuleWithUpdate=Inga uppdateringar hittades för externa moduler
 SwaggerDescriptionFile=Swagger API beskrivningsfil (för exempelvis användning med redoc)
-YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=Du har aktiverat utfasade WS-API. Du borde använda REST API istället.
 RandomlySelectedIfSeveral=Randomly selected if several pictures are available
-DatabasePasswordObfuscated=Database password is obfuscated in conf file
-DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
+DatabasePasswordObfuscated=Databasens lösenord är dolt i konfigurationsfilen
+DatabasePasswordNotObfuscated=Databasens lösenord är INTE dolt i konfigurationsfilen
+APIsAreNotEnabled=API-moduler är inte aktiverade
+YouShouldSetThisToOff=Du borde sätta detta till 0 eller av
diff --git a/htdocs/langs/sv_SE/agenda.lang b/htdocs/langs/sv_SE/agenda.lang
index 0bb80bd3e67..54be87fdd37 100644
--- a/htdocs/langs/sv_SE/agenda.lang
+++ b/htdocs/langs/sv_SE/agenda.lang
@@ -4,7 +4,7 @@ Actions=Åtgärder
 Agenda=Agenda
 TMenuAgenda=Agenda
 Agendas=Dagordningar
-LocalAgenda=Default calendar
+LocalAgenda=Standardkalender
 ActionsOwnedBy=Händelse som ägs av
 ActionsOwnedByShort=Ägare
 AffectedTo=Påverkas i
@@ -14,13 +14,13 @@ EventsNb=Antal händelser
 ListOfActions=Lista över evenemang
 EventReports=Händelsesrapporter
 Location=Läge
-ToUserOfGroup=Event assigned to any user in the group
+ToUserOfGroup=Händelse tilldelad till alla användare i gruppen
 EventOnFullDay=Händelse heldag
 MenuToDoActions=Alla ofullständiga handlingar
 MenuDoneActions=Alla avslutade åtgärder
 MenuToDoMyActions=Min ofullständiga handlingar
 MenuDoneMyActions=Min avslutas åtgärder
-ListOfEvents=List of events (default calendar)
+ListOfEvents=Händelselista (standardkalender)
 ActionsAskedBy=Åtgärder som registrerats av
 ActionsToDoBy=Åtgärder påverkas
 ActionsDoneBy=Åtgärder som utförs av
@@ -78,7 +78,7 @@ ContractSentByEMail=Kontrakt %s skickat av email
 OrderSentByEMail=Försäljning order %s skickad av email
 InvoiceSentByEMail=Kund invoice %s skickad av email
 SupplierOrderSentByEMail=Purchase order %s skickad av email
-ORDER_SUPPLIER_DELETEInDolibarr=Purchase order %s deleted
+ORDER_SUPPLIER_DELETEInDolibarr=Inköpsorder %s borttagen
 SupplierInvoiceSentByEMail=Vendor invoice %s skickad av email
 ShippingSentByEMail=Leverans %s skickad av email
 ShippingValidated= Leverans %s bekräftat
@@ -86,18 +86,18 @@ InterventionSentByEMail=Intervention %s skickad av email
 ProposalDeleted=Förslag raderad
 OrderDeleted=Order raderad
 InvoiceDeleted=Faktura raderad
-DraftInvoiceDeleted=Draft invoice deleted
-CONTACT_CREATEInDolibarr=Contact %s created
-CONTACT_MODIFYInDolibarr=Contact %s modified
-CONTACT_DELETEInDolibarr=Contact %s deleted
+DraftInvoiceDeleted=Utkastsfaktura borttagen
+CONTACT_CREATEInDolibarr=Kontakt %s skapat
+CONTACT_MODIFYInDolibarr=Kontakt %s ändrad
+CONTACT_DELETEInDolibarr=Kontakt %s borttagen
 PRODUCT_CREATEInDolibarr=Produkt %s skapad
 PRODUCT_MODIFYInDolibarr=Produkt %s modified
 PRODUCT_DELETEInDolibarr=Produkt %s raderad
-HOLIDAY_CREATEInDolibarr=Request for leave %s created
-HOLIDAY_MODIFYInDolibarr=Request for leave %s modified
-HOLIDAY_APPROVEInDolibarr=Request for leave %s approved
-HOLIDAY_VALIDATEInDolibarr=Request for leave %s validated
-HOLIDAY_DELETEInDolibarr=Request for leave %s deleted
+HOLIDAY_CREATEInDolibarr=Begäran om ledighet %s skapad
+HOLIDAY_MODIFYInDolibarr=Begäran om ledighet %s ändrad
+HOLIDAY_APPROVEInDolibarr=Begäran om ledighet %s godkänd
+HOLIDAY_VALIDATEInDolibarr=Begäran om ledighet %s bekräftad
+HOLIDAY_DELETEInDolibarr=Begäran om ledighet %s borttagen
 EXPENSE_REPORT_CREATEInDolibarr=Kostnadsrapport %s skapad
 EXPENSE_REPORT_VALIDATEInDolibarr=Kostnadsrapport %s bekräftat
 EXPENSE_REPORT_APPROVEInDolibarr=Kostnadsrapport %s godkänd
@@ -108,7 +108,7 @@ PROJECT_MODIFYInDolibarr=Projekt %s modified
 PROJECT_DELETEInDolibarr=Projekt %s raderad
 TICKET_CREATEInDolibarr=Biljett %s skapad
 TICKET_MODIFYInDolibarr=Biljett %s modified
-TICKET_ASSIGNEDInDolibarr=Ticket %s assigned
+TICKET_ASSIGNEDInDolibarr=Ärende %s tilldelat
 TICKET_CLOSEInDolibarr=Biljett %s stängt
 TICKET_DELETEInDolibarr=Biljett %s raderad
 BOM_VALIDATEInDolibarr=BOM validated
@@ -121,7 +121,7 @@ MRP_MO_UNVALIDATEInDolibarr=MO set to draft status
 MRP_MO_PRODUCEDInDolibarr=MO produced
 MRP_MO_DELETEInDolibarr=MO deleted
 MRP_MO_CANCELInDolibarr=MO canceled
-PAIDInDolibarr=%s paid
+PAIDInDolibarr=%s betald
 ##### End agenda events #####
 AgendaModelModule=Dokumentmallar för event
 DateActionStart=Startdatum
@@ -132,8 +132,8 @@ AgendaUrlOptionsNotAdmin= <b> logina =! %s </b> för att begränsa produktionen
 AgendaUrlOptions4= <b> logint = %s </b> för att begränsa utdata till åtgärder som tilldelats user <b> %s </b> (ägare and andra).
 AgendaUrlOptionsProject= <b> project = __ PROJECT_ID__ </b> för att begränsa utsignalen till åtgärder linked till project <b> __PROJECT_ID__ </b>.
 AgendaUrlOptionsNotAutoEvent= <b> notactiontype = systemauto </b> för att utesluta automatisk events.
-AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> to include events of holidays.
-AgendaShowBirthdayEvents=Birthdays of contacts
+AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> ta med helgdagar
+AgendaShowBirthdayEvents=Kontakters födelsedagar
 AgendaHideBirthdayEvents=Dölj födelsedagar av contacts
 Busy=Upptagen
 ExportDataset_event1=Lista över dagordningen händelser
@@ -155,18 +155,18 @@ ActionType=Typ av händelse
 DateActionBegin=Startdatum för händelse
 ConfirmCloneEvent=Är du säker på att du vill klona event <b> %s </b>?
 RepeatEvent=Repetera händelsen
-OnceOnly=Once only
+OnceOnly=Endast en gång
 EveryWeek=Varje vecka
 EveryMonth=Varje månad
 DayOfMonth=Dag i månaden
 DayOfWeek=Dag i veckan
 DateStartPlusOne=Startdatum +1 timma
-SetAllEventsToTodo=Set all events to todo
-SetAllEventsToInProgress=Set all events to in progress
-SetAllEventsToFinished=Set all events to finished
-ReminderTime=Reminder period before the event
+SetAllEventsToTodo=Sätt alla händelser "att göra"
+SetAllEventsToInProgress=Sätt alla händelser under behandling
+SetAllEventsToFinished=Sätt alla händelser som utförda
+ReminderTime=Påminnelseperiod innan händelse
 TimeType=Duration type
 ReminderType=Callback type
-AddReminder=Create an automatic reminder notification for this event
-ErrorReminderActionCommCreation=Error creating the reminder notification for this event
+AddReminder=Skapa en automatisk påminnelsenotifiering för denna händelse
+ErrorReminderActionCommCreation=Fel vid skapande av påminnelsenotifiering för denna händelse
 BrowserPush=Browser Popup Notification
diff --git a/htdocs/langs/sv_SE/assets.lang b/htdocs/langs/sv_SE/assets.lang
index 1d0fe632703..003cf538258 100644
--- a/htdocs/langs/sv_SE/assets.lang
+++ b/htdocs/langs/sv_SE/assets.lang
@@ -61,5 +61,7 @@ MenuListTypeAssets = Lista
 #
 # Module
 #
+Asset=Tillgång
 NewAssetType=Ny tillgångstyp
 NewAsset=Ny tillgång
+ConfirmDeleteAsset=Är du säker på att du vill ta bort denna tillgång?
diff --git a/htdocs/langs/sv_SE/banks.lang b/htdocs/langs/sv_SE/banks.lang
index d77b1f8f068..ce8e8339182 100644
--- a/htdocs/langs/sv_SE/banks.lang
+++ b/htdocs/langs/sv_SE/banks.lang
@@ -37,7 +37,7 @@ IbanValid=BAN giltig
 IbanNotValid=BAN är ej giltigt
 StandingOrders=Direkt debiteringsorder
 StandingOrder=Direkt debitering
-PaymentByDirectDebit=Payment by direct debit
+PaymentByDirectDebit=Direktbetalning
 PaymentByBankTransfers=Payments by credit transfer
 PaymentByBankTransfer=Payment by credit transfer
 AccountStatement=Kontoutdrag
@@ -76,7 +76,7 @@ BankTransaction=Bankpost
 ListTransactions=Lista poster
 ListTransactionsByCategory=Lista poster / kategori
 TransactionsToConciliate=Inlägg för att förena
-TransactionsToConciliateShort=To reconcile
+TransactionsToConciliateShort=Att förlika
 Conciliable=Kan förenas
 Conciliate=Reconcile
 Conciliation=Avstämning
@@ -109,13 +109,13 @@ SocialContributionPayment=Sociala och skattemässiga betalningar
 BankTransfer=Credit transfer
 BankTransfers=Credit transfers
 MenuBankInternalTransfer=Intern överföring
-TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
+TransferDesc=Använd intern överföring för att överföra från ett konto till ett annat. Systemet kommer skapa två poster: en debit och en kredit, samma summa, benämning och datum kommer bli använt för transaktionen.
 TransferFrom=Från
 TransferTo=För att
 TransferFromToDone=En överföring från <b>%s</b> till <b>%s</b> av <b>%s</b> %s har registrerats.
 CheckTransmitter=Avsändare
 ValidateCheckReceipt=Bekräfta detta check-kvitto?
-ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes will be possible once validated.
 DeleteCheckReceipt=Ta bort detta kvitto?
 ConfirmDeleteCheckReceipt=Är du säker på att du vill radera detta kvitto?
 BankChecks=Bankcheckar
@@ -128,7 +128,7 @@ ConfirmDeleteTransaction=Är du säker på att du vill radera den här posten?
 ThisWillAlsoDeleteBankRecord=Detta kommer även att ta bort genererad bankpost
 BankMovements=Rörelser
 PlannedTransactions=Planerade poster
-Graph=Graphs
+Graph=Grafer/historik
 ExportDataset_banque_1=Bankposter och kontoutdrag
 ExportDataset_banque_2=Insättningsblankett
 TransactionOnTheOtherAccount=Transaktionen på det andra kontot
@@ -161,14 +161,14 @@ CheckRejectedAndInvoicesReopened=Check returned and invoices re-open
 BankAccountModelModule=Dokumentmallar för bankkonton
 DocumentModelSepaMandate=Mall för SEPA-mandat. Användbar endast för europeiska länder i EEG.
 DocumentModelBan=Mall för att skriva ut en sida med BAN-information.
-NewVariousPayment=New miscellaneous payment
-VariousPayment=Miscellaneous payment
+NewVariousPayment=Ny "övrig" betalning
+VariousPayment=Övriga betalningar
 VariousPayments=Diverse betalningar
-ShowVariousPayment=Show miscellaneous payment
-AddVariousPayment=Add miscellaneous payment
-VariousPaymentId=Miscellaneous payment ID
-VariousPaymentLabel=Miscellaneous payment label
-ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment
+ShowVariousPayment=Visa övriga betalningar
+AddVariousPayment=Lägg till övrig betalning
+VariousPaymentId=Övrigt betalnings-id
+VariousPaymentLabel=Övrig betalningsbenämning
+ConfirmCloneVariousPayment=Bekräfta kopiering av övrig betalning
 SEPAMandate=SEPA-mandatet
 YourSEPAMandate=Ditt SEPA-mandat
 FindYourSEPAMandate=Detta är ditt SEPA-mandat för att bemyndiga vårt företag att göra direkt debitering till din bank. Returnera det undertecknat (skanna av det signerade dokumentet) eller skicka det via post till
@@ -179,6 +179,6 @@ BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
-IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
-NoBankAccountDefined=No bank account defined
+IfYouDontReconcileDisableProperty=Om du inte gör någon bankavstämning på vissa bankkonton, inaktivera "%s" på dem för att ta bort denna varning
+NoBankAccountDefined=Inget bankkonto definerat
 NoRecordFoundIBankcAccount=No record found in bank account. Commonly, this occurs when a record has been deleted manually from the list of transaction in the bank account (for example during a reconciliation of the bank account). Another reason is that the payment was recorded when the module "%s" was disabled.
diff --git a/htdocs/langs/sv_SE/bills.lang b/htdocs/langs/sv_SE/bills.lang
index d1e4e404564..8fcb92772a8 100644
--- a/htdocs/langs/sv_SE/bills.lang
+++ b/htdocs/langs/sv_SE/bills.lang
@@ -130,10 +130,10 @@ BillStatusConverted=Betald (redo för konsumtion i slutfaktura)
 BillStatusCanceled=Övergiven
 BillStatusValidated=Bekräftat (måste betalas)
 BillStatusStarted=Påbörjad
-BillStatusNotPaid=Inte betalas
+BillStatusNotPaid=Ej betald
 BillStatusNotRefunded=Icke återbetalad
 BillStatusClosedUnpaid=Stängd (obetald)
-BillStatusClosedPaidPartially=Betald (delvis)
+BillStatusClosedPaidPartially=Delvis betald
 BillShortStatusDraft=Utkast
 BillShortStatusPaid=Betald
 BillShortStatusPaidBackOrConverted=Återbetalas eller konverteras
@@ -142,10 +142,10 @@ BillShortStatusConverted=Betald
 BillShortStatusCanceled=Övergiven
 BillShortStatusValidated=Bekräftat
 BillShortStatusStarted=Började
-BillShortStatusNotPaid=Inte betalas
+BillShortStatusNotPaid=Ej betald
 BillShortStatusNotRefunded=Icke återbetalad
 BillShortStatusClosedUnpaid=Stängt
-BillShortStatusClosedPaidPartially=Betald (delvis)
+BillShortStatusClosedPaidPartially=Delvis betald
 PaymentStatusToValidShort=Att bekräfta
 ErrorVATIntraNotConfigured=Inom gemenskapen momsnummer ej definierat ännu
 ErrorNoPaiementModeConfigured=Ingen standardbetaltyp definierad. Gå till Inställningar för fakturamodul för att åtgärda detta.
@@ -231,7 +231,7 @@ RetainedWarrantyDateLimit=Gräns för bibehållen garantidatum
 RetainedWarrantyNeed100Percent=Situationsfakturan måste vara på 100%%-framsteg för att kunna visas på PDF
 AlreadyPaid=Redan betalats ut
 AlreadyPaidBack=Redan återbetald
-AlreadyPaidNoCreditNotesNoDeposits=Redan betalad (utan kreditnoteringar och nedbetalningar)
+AlreadyPaidNoCreditNotesNoDeposits=Redan betalat (utan kreditnoteringar och handpenning)
 Abandoned=Övergiven
 RemainderToPay=Återstående obetalt
 RemainderToTake=Återstående belopp att ta
@@ -259,7 +259,7 @@ DateMaxPayment=Betalning på grund av
 DateInvoice=Fakturadatum
 DatePointOfTax=Skattpunkt
 NoInvoice=Ingen faktura
-NoOpenInvoice=No open invoice
+NoOpenInvoice=Ingen obetald faktura
 ClassifyBill=Märk faktura
 SupplierBillsToPay=Obetalda leverantörsfakturor
 CustomerBillsUnpaid=Obetalda kundfakturor
@@ -281,9 +281,9 @@ CustomersInvoicesAndPayments=Kund fakturor och betalningar
 ExportDataset_invoice_1=Kundfaktura och fakturadata
 ExportDataset_invoice_2=Kund fakturor och betalningar
 ProformaBill=Proforma faktura:
-Reduction=Minskning
+Reduction=Rabatt
 ReductionShort=Skiva.
-Reductions=Minskningar
+Reductions=Rabatter
 ReductionsShort=Skiva.
 Discounts=Rabatter
 AddDiscount=Lägg rabatt
diff --git a/htdocs/langs/sv_SE/boxes.lang b/htdocs/langs/sv_SE/boxes.lang
index 69369c2cd7f..63e4f480440 100644
--- a/htdocs/langs/sv_SE/boxes.lang
+++ b/htdocs/langs/sv_SE/boxes.lang
@@ -32,26 +32,26 @@ BoxTitleLastSuppliers=Senaste %s inspelade leverantörerna
 BoxTitleLastModifiedSuppliers=Leverantörer: senaste %s modifierad
 BoxTitleLastModifiedCustomers=Kunder: senaste %s modifierad
 BoxTitleLastCustomersOrProspects=Senaste %s kunder eller framtidsutsikter
-BoxTitleLastCustomerBills=Latest %s modified Customer invoices
-BoxTitleLastSupplierBills=Latest %s modified Vendor invoices
+BoxTitleLastCustomerBills=Senaste %s ändrade kundfakturor
+BoxTitleLastSupplierBills=Senaste %s ändrade leverantörsfakturor
 BoxTitleLastModifiedProspects=Utsikter: senaste %s modifierad
 BoxTitleLastModifiedMembers=Senaste %s medlemmarna
 BoxTitleLastFicheInter=Senaste %s modifierade interventioner
 BoxTitleOldestUnpaidCustomerBills=Kundfaktura: äldsta %s obetald
 BoxTitleOldestUnpaidSupplierBills=Leverantörsfakturor: äldsta %s obetald
 BoxTitleCurrentAccounts=Öppna konton: saldon
-BoxTitleSupplierOrdersAwaitingReception=Supplier orders awaiting reception
+BoxTitleSupplierOrdersAwaitingReception=Ej mottagna leverantörsordrar
 BoxTitleLastModifiedContacts=Kontakter / Adresser: senaste %s modifierad
 BoxMyLastBookmarks=Bokmärken: senaste %s
 BoxOldestExpiredServices=Äldsta aktiva passerat tjänster
 BoxLastExpiredServices=Senaste %s äldsta kontakterna med aktiva utgåttjänster
 BoxTitleLastActionsToDo=Senaste %s åtgärderna att göra
-BoxTitleLastContracts=Latest %s contracts which were modified
-BoxTitleLastModifiedDonations=Latest %s donations which were modified
-BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
-BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
-BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
-BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
+BoxTitleLastContracts=Senaste %s avtal som blivit ändrade
+BoxTitleLastModifiedDonations=Senaste %s donationer som har blivit ändrade
+BoxTitleLastModifiedExpenses=Senaste %s utläggsrapporter som blivit modifierade
+BoxTitleLatestModifiedBoms=Senaste %s BOM som blivit modifierade
+BoxTitleLatestModifiedMos=Senaste %s tillverkningsbeställningar som blivit modifierade
+BoxTitleLastOutstandingBillReached=Kunder med högst skuld
 BoxGlobalActivity=Global aktivitet (fakturor, förslag, order)
 BoxGoodCustomers=Bra kunder
 BoxTitleGoodCustomers=%s Bra kunder
@@ -76,7 +76,7 @@ NoContractedProducts=Inga produkter / tjänster avtalade
 NoRecordedContracts=Inga registrerade kontrakt
 NoRecordedInterventions=Inga inspelade interventioner
 BoxLatestSupplierOrders=Senaste inköpsorder
-BoxLatestSupplierOrdersAwaitingReception=Latest Purchase Orders (with a pending reception)
+BoxLatestSupplierOrdersAwaitingReception=Senaste inköpsordrar (som ej anlänt)
 NoSupplierOrder=Ingen registrerad köporder
 BoxCustomersInvoicesPerMonth=Kundfakturor per månad
 BoxSuppliersInvoicesPerMonth=Leverantörsfakturor per månad
@@ -91,26 +91,26 @@ BoxTitleLatestModifiedSupplierOrders=Leverantörsorder: senaste %s modifierad
 BoxTitleLastModifiedCustomerBills=Kundfaktura: senaste %s modifierad
 BoxTitleLastModifiedCustomerOrders=Försäljningsorder: senaste %s modifierad
 BoxTitleLastModifiedPropals=Senaste %s ändrade förslag
-BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
-BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
+BoxTitleLatestModifiedJobPositions=Latest %s modified job positions
+BoxTitleLatestModifiedCandidatures=Latest %s modified job applications
 ForCustomersInvoices=Kundens fakturor
 ForCustomersOrders=Kund beställningar
 ForProposals=Förslag
 LastXMonthRolling=Den senaste %s månaden rullande
 ChooseBoxToAdd=Lägg till widget i din instrumentpanel
 BoxAdded=Widget har lagts till i din instrumentpanel
-BoxTitleUserBirthdaysOfMonth=Birthdays of this month (users)
+BoxTitleUserBirthdaysOfMonth=Födelsedagar denna månad (användare)
 BoxLastManualEntries=Latest record in accountancy entered manually or without source document
 BoxTitleLastManualEntries=%s latest record entered manually or without source document
 NoRecordedManualEntries=No manual entries record in accountancy
 BoxSuspenseAccount=Count accountancy operation with suspense account
-BoxTitleSuspenseAccount=Number of unallocated lines
+BoxTitleSuspenseAccount=Antal oallokerade rader
 NumberOfLinesInSuspenseAccount=Number of line in suspense account
 SuspenseAccountNotDefined=Suspense account isn't defined
-BoxLastCustomerShipments=Last customer shipments
-BoxTitleLastCustomerShipments=Latest %s customer shipments
-NoRecordedShipments=No recorded customer shipment
-BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
+BoxLastCustomerShipments=Senaste kundleveranser
+BoxTitleLastCustomerShipments=Senaste %s kundleveranser
+NoRecordedShipments=Inga registrerade kundleveranser
+BoxCustomersOutstandingBillReached=Kunds kreditgräns uppnådd
 # Pages
 UsersHome=Home users and groups
 MembersHome=Home Membership
diff --git a/htdocs/langs/sv_SE/cashdesk.lang b/htdocs/langs/sv_SE/cashdesk.lang
index 0b2be869956..a04a413fb50 100644
--- a/htdocs/langs/sv_SE/cashdesk.lang
+++ b/htdocs/langs/sv_SE/cashdesk.lang
@@ -127,4 +127,4 @@ AllowDelayedPayment=Tillåt försenad betalning
 PrintPaymentMethodOnReceipts=Skriv ut betalningsmetod på biljetter | kvitton
 WeighingScale=Våg
 ShowPriceHT = Visa kolumnen med priset exklusive moms (på skärmen)
-ShowPriceHTOnReceipt = Visa kolumnen med pris exklusive moms (vid mottagande)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on the receipt)
diff --git a/htdocs/langs/sv_SE/categories.lang b/htdocs/langs/sv_SE/categories.lang
index b4d7278f0e6..5e831cff3c6 100644
--- a/htdocs/langs/sv_SE/categories.lang
+++ b/htdocs/langs/sv_SE/categories.lang
@@ -3,23 +3,23 @@ Rubrique=Tag / Kategori
 Rubriques=Taggar/Kategorier
 RubriquesTransactions=Taggar / Kategorier av transaktioner
 categories=taggar / kategorier
-NoCategoryYet=No tag/category of this type has been created
+NoCategoryYet=Ingen tagg/katergori för denna typen har skapats
 In=I
 AddIn=Lägg till i
 modify=modifiera
 Classify=Märk
 CategoriesArea=Taggar / kategorier område
-ProductsCategoriesArea=Product/Service tags/categories area
-SuppliersCategoriesArea=Vendor tags/categories area
-CustomersCategoriesArea=Customer tags/categories area
+ProductsCategoriesArea=Produkt/Servicetagg/Kategoriområde
+SuppliersCategoriesArea=Tillverkarens tagg/kategori
+CustomersCategoriesArea=Kundens tagg/kategori
 MembersCategoriesArea=Member tags/categories area
-ContactsCategoriesArea=Contact tags/categories area
-AccountsCategoriesArea=Bank account tags/categories area
-ProjectsCategoriesArea=Project tags/categories area
-UsersCategoriesArea=User tags/categories area
+ContactsCategoriesArea=Kontaktens tagg/kategori
+AccountsCategoriesArea=Bankkontots tagg/kategori
+ProjectsCategoriesArea=Projektets tagg/kategori
+UsersCategoriesArea=Anvädnarens tagg/kategori
 SubCats=Underkategorier
 CatList=Lista med taggar / kategorier
-CatListAll=List of tags/categories (all types)
+CatListAll=Visa alla taggar/kategorier
 NewCategory=Ny tagg / kategori
 ModifCat=Ändra tagg / kategori
 CatCreated=Tagg / kategori skapad
@@ -63,37 +63,37 @@ ContactCategoriesShort=Kontakter taggar / kategorier
 AccountsCategoriesShort=Kontokoder / kategorier
 ProjectsCategoriesShort=Projekt taggar / kategorier
 UsersCategoriesShort=Användare taggar / kategorier
-StockCategoriesShort=Warehouse tags/categories
-ThisCategoryHasNoItems=This category does not contain any items.
+StockCategoriesShort=Lagrets taggar/kategorier
+ThisCategoryHasNoItems=Denna kategori innehåller inga produkter.
 CategId=Tagg / kategori id
-ParentCategory=Parent tag/category
-ParentCategoryLabel=Label of parent tag/category
-CatSupList=List of vendors tags/categories
-CatCusList=List of customers/prospects tags/categories
+ParentCategory=Överordnad tagg/kategori
+ParentCategoryLabel=Benämning av överordnad tagg/kategori
+CatSupList=Lista tillverkarens taggar/kategorier
+CatCusList=Lista (eventuella) kunders taggar/kategorier
 CatProdList=Lista över produkter taggar / kategorier
 CatMemberList=Lista över medlemmar taggar / kategorier
-CatContactList=List of contacts tags/categories
-CatProjectsList=List of projects tags/categories
-CatUsersList=List of users tags/categories
-CatSupLinks=Links between vendors and tags/categories
+CatContactList=Lista kontakters taggar/kategorier
+CatProjectsList=Lista projektens taggar/kategorier
+CatUsersList=Lista användarnas taggar/kategorier
+CatSupLinks=Länkar mellan leverantörer och taggar/kategorier
 CatCusLinks=Länkar mellan kunder / utsikter och taggar / kategorier
-CatContactsLinks=Links between contacts/addresses and tags/categories
+CatContactsLinks=Länkar mellan kontakter/adresser och taggar/kategorier
 CatProdLinks=Länkar mellan produkter / tjänster och taggar / kategorier
 CatMembersLinks=Links between members and tags/categories
-CatProjectsLinks=Links between projects and tags/categories
-CatUsersLinks=Links between users and tags/categories
+CatProjectsLinks=Länkar mellan projekt och taggar/kategorier
+CatUsersLinks=Länkar mellan användare och taggar/kategorier
 DeleteFromCat=Ta bort från taggar / kategori
 ExtraFieldsCategories=Extra attibut
 CategoriesSetup=Taggar / kategorier inställning
 CategorieRecursiv=Länk med moderkort / kategori automatiskt
 CategorieRecursivHelp=Om alternativet är på, när du lägger till en produkt i en underkategori kommer produkten också att läggas till i kategorin förälder.
 AddProductServiceIntoCategory=Lägg till följande produkt / tjänst
-AddCustomerIntoCategory=Assign category to customer
-AddSupplierIntoCategory=Assign category to supplier
+AddCustomerIntoCategory=Tilldela kategori till kund
+AddSupplierIntoCategory=Tilldela kategori till leverantör
 ShowCategory=Visa tagg / kategori
 ByDefaultInList=Som standard i listan
 ChooseCategory=Välj kategori
-StocksCategoriesArea=Warehouse Categories
-ActionCommCategoriesArea=Event Categories
-WebsitePagesCategoriesArea=Page-Container Categories
+StocksCategoriesArea=Lagrets kategorier
+ActionCommCategoriesArea=Händelsekategori
+WebsitePagesCategoriesArea=Innehållskategorier
 UseOrOperatorForCategories=Use 'OR' operator for categories
diff --git a/htdocs/langs/sv_SE/contracts.lang b/htdocs/langs/sv_SE/contracts.lang
index eee5cd0c1f1..a164c73f7f8 100644
--- a/htdocs/langs/sv_SE/contracts.lang
+++ b/htdocs/langs/sv_SE/contracts.lang
@@ -28,7 +28,7 @@ MenuRunningServices=Löpande tjänster
 MenuExpiredServices=Utlöpta tjänster
 MenuClosedServices=Stängda tjänster
 NewContract=Nytt kontrakt
-NewContractSubscription=New contract or subscription
+NewContractSubscription=Nytt avtal eller abonnemang
 AddContract=Skapa kontrakt
 DeleteAContract=Ta bort ett kontrakt
 ActivateAllOnContract=Aktivera alla tjänster
@@ -51,7 +51,7 @@ ListOfClosedServices=Lista över stängda tjänster
 ListOfRunningServices=Förteckning över löpande tjänster
 NotActivatedServices=Inaktiva tjänster (bland bekräftades kontrakt)
 BoardNotActivatedServices=Tjänster att aktivera bland bekräftades kontrakt
-BoardNotActivatedServicesShort=Services to activate
+BoardNotActivatedServicesShort=Tjänster att aktivera
 LastContracts=Senaste %s kontrakten
 LastModifiedServices=Senaste %s modifierade tjänster
 ContractStartDate=Startdatum
@@ -65,10 +65,10 @@ DateStartRealShort=Verkligt startdatum
 DateEndReal=Verkligt slutdatum
 DateEndRealShort=Verkligt slutdatum
 CloseService=Stäng tjänst
-BoardRunningServices=Services running
-BoardRunningServicesShort=Services running
-BoardExpiredServices=Services expired
-BoardExpiredServicesShort=Services expired
+BoardRunningServices=Aktiva tjänster
+BoardRunningServicesShort=Aktiva tjänster
+BoardExpiredServices=Avslutade tjänster
+BoardExpiredServicesShort=Avslutade tjänster
 ServiceStatus=Status för tjänst
 DraftContracts=Utkast avtal
 CloseRefusedBecauseOneServiceActive=Kontraktet kan inte stängas eftersom det finns minst en öppen tjänst på den
@@ -99,6 +99,6 @@ TypeContact_contrat_internal_SALESREPFOLL=Säljare som följer upp avtal
 TypeContact_contrat_external_BILLING=Fakturering kundkontakt
 TypeContact_contrat_external_CUSTOMER=Uppföljning kundkontakt
 TypeContact_contrat_external_SALESREPSIGN=Undertecknande kontrakt kundkontakt
-HideClosedServiceByDefault=Hide closed services by default
-ShowClosedServices=Show Closed Services
-HideClosedServices=Hide Closed Services
+HideClosedServiceByDefault=Dölj avslutade tjänster som standard
+ShowClosedServices=Visa avslutade tjänster
+HideClosedServices=Dölj avslutade tjänster
diff --git a/htdocs/langs/sv_SE/cron.lang b/htdocs/langs/sv_SE/cron.lang
index 0ed0dfbe866..df24f32fc75 100644
--- a/htdocs/langs/sv_SE/cron.lang
+++ b/htdocs/langs/sv_SE/cron.lang
@@ -43,11 +43,11 @@ CronModule=Modul
 CronNoJobs=Inga jobb registrerade
 CronPriority=Prioritet
 CronLabel=Etikett
-CronNbRun=Number of launches
+CronNbRun=Antal körningar
 CronMaxRun=Maximalt antal lanseringar
 CronEach=Varje
 JobFinished=Job lanserad och klar
-Scheduled=Scheduled
+Scheduled=Schemalagd
 #Page card
 CronAdd= Lägg till jobb
 CronEvery=Utför jobbet vardera
@@ -58,9 +58,9 @@ CronNote=Kommentar
 CronFieldMandatory=Fält %s är obligatoriskt
 CronErrEndDateStartDt=Slutdatum kan inte vara före startdatum
 StatusAtInstall=Status vid modulinstallation
-CronStatusActiveBtn=Schedule
+CronStatusActiveBtn=Schemalägg
 CronStatusInactiveBtn=Inaktivera
-CronTaskInactive=This job is disabled (not scheduled)
+CronTaskInactive=Detta arbete är inaktiverat (ej schemalagt)
 CronId=Id
 CronClassFile=Filnamn med klass
 CronModuleHelp=Namn på Dolibarr-modulkatalogen (fungerar även med extern Dolibarr-modul). <BR> Till exempel att ringa hämtningsmetoden för Dolibarr Produktobjekt / htdocs / <u> produkt </u> /class/product.class.php, värdet för modulen är <br> <i> produkt </i>
@@ -78,14 +78,14 @@ CronType_method=Samtalsmetod för en PHP-klass
 CronType_command=Skalkommando
 CronCannotLoadClass=Kan inte ladda klassfilen %s (för att använda klass %s)
 CronCannotLoadObject=Klassfilen %s laddades, men objektet %s kunde inte hittas i det
-UseMenuModuleToolsToAddCronJobs=Go into menu "<a href="%s">Home - Admin tools - Scheduled jobs</a>" to see and edit scheduled jobs.
+UseMenuModuleToolsToAddCronJobs=Gå till menyn "<a href="%s">Hem - Adminverktyg - Schemalagda jobb</a>" för att se och redigera schemalagda jobb.
 JobDisabled=Jobb inaktiverat
 MakeLocalDatabaseDumpShort=Lokal databas säkerhetskopia
 MakeLocalDatabaseDump=Skapa en lokal databasdump. Parametrarna är: komprimering ('gz' eller 'bz' eller 'none'), säkerhetskopieringstyp ('mysql', 'pgsql', 'auto'), 1, 'auto' eller filnamn att bygga, antal backupfiler för att hålla
 WarningCronDelayed=Uppmärksamhet, för prestationsändamål, vad som än är nästa datum för utförande av aktiverade jobb, kan dina jobb försenas till högst %s timmar innan de körs.
-DATAPOLICYJob=Data cleaner and anonymizer
+DATAPOLICYJob=Resning och anonymisering av data
 JobXMustBeEnabled=Job %s must be enabled
 # Cron Boxes
-LastExecutedScheduledJob=Last executed scheduled job
-NextScheduledJobExecute=Next scheduled job to execute
-NumberScheduledJobError=Number of scheduled jobs in error
+LastExecutedScheduledJob=Senast utfört schemalagda arbete
+NextScheduledJobExecute=Nästa schemalagda arbete att köra
+NumberScheduledJobError=Antal schemalagda arbete med fel
diff --git a/htdocs/langs/sv_SE/ecm.lang b/htdocs/langs/sv_SE/ecm.lang
index 3882a163842..4f1af157567 100644
--- a/htdocs/langs/sv_SE/ecm.lang
+++ b/htdocs/langs/sv_SE/ecm.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - ecm
 ECMNbOfDocs=Antal dokument i katalogen
-ECMSection=Directory
+ECMSection=Katalog
 ECMSectionManual=Manuell katalog
 ECMSectionAuto=Automatisk katalog
-ECMSectionsManual=Manuell träd
-ECMSectionsAuto=Automatisk träd
+ECMSectionsManual=Manuell struktur
+ECMSectionsAuto=Automatisk struktur
 ECMSections=Kataloger
 ECMRoot=ECM Root
 ECMNewSection=Ny katalog
@@ -13,26 +13,26 @@ ECMCreationDate=Datum för skapande
 ECMNbOfFilesInDir=Antalet filer i katalogen
 ECMNbOfSubDir=Antal underkataloger
 ECMNbOfFilesInSubDir=Antalet filer i underkataloger
-ECMCreationUser=Creator
+ECMCreationUser=Skapare
 ECMArea=DMS/ECM yta
 ECMAreaDesc=Med DMS / ECM-området (Document Management System / Electronic Content Management) kan du spara, dela och söka snabbt alla typer av dokument i Dolibarr.
 ECMAreaDesc2=* Automatisk kataloger fylls automatiskt när man lägger till dokument från kort av ett element. <br> * Manuell kataloger kan användas för att spara dokument inte är knutna till ett visst element.
-ECMSectionWasRemoved=Nummer <b>%s</b> har tagits bort.
+ECMSectionWasRemoved=Mapp <b>%s</b> har tagits bort.
 ECMSectionWasCreated=Mapp <b>%s</b> har skapats.
 ECMSearchByKeywords=Sök på nyckelord
 ECMSearchByEntity=Sök på objektet
 ECMSectionOfDocuments=Register över handlingar
 ECMTypeAuto=Automatisk
-ECMDocsBy=Documents linked to %s
+ECMDocsBy=Dokument länkade till %s
 ECMNoDirectoryYet=Ingen katalog skapas
 ShowECMSection=Visa katalog
 DeleteSection=Ta bort katalog
-ConfirmDeleteSection=Kan du bekräfta att du vill ta bort mappen <b>%s</b>?
+ConfirmDeleteSection=Vänligen bekräfta att du vill ta bort mappen <b>%s</b>?
 ECMDirectoryForFiles=Relativ katalog för filer
-CannotRemoveDirectoryContainsFilesOrDirs=Avlägsnandet är inte möjligt eftersom det innehåller några filer eller underkataloger
-CannotRemoveDirectoryContainsFiles=Avlägsnandet är inte möjligt eftersom det innehåller några filer
+CannotRemoveDirectoryContainsFilesOrDirs=Borttagning är inte möjlig eftersom det innehåller några filer eller underkataloger
+CannotRemoveDirectoryContainsFiles=Borttagning är inte möjlig eftersom det innehåller några filer
 ECMFileManager=Filhanteraren
-ECMSelectASection=Välj en mapp i trädet...
+ECMSelectASection=Välj en mapp i strukturen...
 DirNotSynchronizedSyncFirst=Den här katalogen verkar vara skapad eller modifierad utanför ECM-modulen. Du måste klicka på "Resync" -knappen först för att synkronisera skivan och databasen för att hämta innehåll i den här katalogen.
 ReSyncListOfDir=Uppdatera lista med mappar
 HashOfFileContent=Hash av filinnehåll
@@ -42,6 +42,6 @@ ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
 GenerateImgWebp=Duplicate all images with another version with .webp format
-ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
-ConfirmImgWebpCreation=Confirm all images duplication
-SucessConvertImgWebp=Images successfully duplicated
+ConfirmGenerateImgWebp=Om du bekräftar kommer du generera en bild i .webp format för alla bilder som finns i denna mapp (undermappar är inte inkluderade)
+ConfirmImgWebpCreation=Bekräfta kloning av alla bilder
+SucessConvertImgWebp=Bilder blev klonade
diff --git a/htdocs/langs/sv_SE/errors.lang b/htdocs/langs/sv_SE/errors.lang
index 94a0422b8d0..40225d7e894 100644
--- a/htdocs/langs/sv_SE/errors.lang
+++ b/htdocs/langs/sv_SE/errors.lang
@@ -11,7 +11,7 @@ ErrorBadValueForParamNotAString=Dåligt värde för din parameter. Det lägger t
 ErrorRefAlreadyExists=Referens <b> %s </b> finns redan.
 ErrorLoginAlreadyExists=Logga %s finns redan.
 ErrorGroupAlreadyExists=Grupp %s finns redan.
-ErrorEmailAlreadyExists=Email %s already exists.
+ErrorEmailAlreadyExists=E-post %s finns redan.
 ErrorRecordNotFound=Spela in hittades inte.
 ErrorFailToCopyFile=Det gick inte att kopiera filen <b>&quot;%s&quot;</b> till <b>&quot;%s&quot;.</b>
 ErrorFailToCopyDir=Misslyckades att kopiera katalogen '<b> %s </b>' i '<b> %s </b>'.
@@ -301,3 +301,4 @@ ErrorActionCommPropertyUserowneridNotDefined=Användarens ägare krävs
 ErrorActionCommBadType=Vald händelsetyp (id: %n, kod: %s) finns inte i ordlistan för händelsetyp
 CheckVersionFail=Versionskontroll misslyckades
 ErrorWrongFileName=Filens namn kan inte innehålla __SOMETHING__
+ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
diff --git a/htdocs/langs/sv_SE/eventorganization.lang b/htdocs/langs/sv_SE/eventorganization.lang
index d1aa3ba4a16..e7053b5f355 100644
--- a/htdocs/langs/sv_SE/eventorganization.lang
+++ b/htdocs/langs/sv_SE/eventorganization.lang
@@ -86,6 +86,7 @@ DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Säker nyckel till länken till offentlig registrering till en konferens
 SERVICE_BOOTH_LOCATION = Tjänst som används för fakturaraden om en monterplats
 SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Tjänst som används för fakturaraden om en deltagarprenumeration på en konferens
+NbVotes=Number of votes
 #
 # Status
 #
@@ -115,6 +116,9 @@ EvntOrgDuration = Denna konferens börjar på %s och slutar på %s.
 ConferenceAttendeeFee = Konferensdeltagaravgift för evenemanget: '%s' som inträffar från %s till %s.
 BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
 EventType = Typ av händelse
+LabelOfBooth=Booth label
+LabelOfconference=Conference label
+ConferenceIsNotConfirmed=Subcription not available, conference is not confirmed yet
 
 #
 # Vote page
diff --git a/htdocs/langs/sv_SE/exports.lang b/htdocs/langs/sv_SE/exports.lang
index 23d65892815..f5ee218134f 100644
--- a/htdocs/langs/sv_SE/exports.lang
+++ b/htdocs/langs/sv_SE/exports.lang
@@ -53,7 +53,8 @@ TypeOfLineServiceOrProduct=Typ av linje (0 = produkt, 1 = tjänst)
 FileWithDataToImport=Fil med data för att importera
 FileToImport=Källa fil du vill importera
 FileMustHaveOneOfFollowingFormat=Fil som ska importeras måste ha ett av följande format
-DownloadEmptyExample=Hämta mallfil med fältinnehållsinformation (* är obligatoriska fält)
+DownloadEmptyExample=Ladda ner mall med fält för innehållsinformation
+StarAreMandatory=* alla fält krävs
 ChooseFormatOfFileToImport=Välj det filformat som ska användas som importfilformat genom att klicka på ikonen %s för att välja den ...
 ChooseFileToImport=Ladda upp filen och klicka sedan på %s ikonen för att välja fil som källa importfil ...
 SourceFileFormat=Källa filformat
diff --git a/htdocs/langs/sv_SE/install.lang b/htdocs/langs/sv_SE/install.lang
index a69b7c328d0..39be597af33 100644
--- a/htdocs/langs/sv_SE/install.lang
+++ b/htdocs/langs/sv_SE/install.lang
@@ -206,6 +206,7 @@ MigrationUserPhotoPath=Migrering av bildvägar för användare
 MigrationFieldsSocialNetworks=Migrering av användarnas fält sociala nätverk (%s)
 MigrationReloadModule=Ladda om modulen %s
 MigrationResetBlockedLog=Återställningsmodul BlockedLog för v7-algoritmen
+MigrationImportOrExportProfiles=Migration of import or export profiles (%s)
 ShowNotAvailableOptions=Visa otillgängliga alternativ
 HideNotAvailableOptions=Dölj otillgängliga alternativ
 ErrorFoundDuringMigration=Fel (er) rapporterades under migreringsprocessen så nästa steg är inte tillgängligt. För att ignorera fel kan du <a href="%s"> klicka här </a>, men programmet eller vissa funktioner kanske inte fungerar korrekt tills felen har lösts.
diff --git a/htdocs/langs/sv_SE/interventions.lang b/htdocs/langs/sv_SE/interventions.lang
index 82dedf51bb9..4851b32f611 100644
--- a/htdocs/langs/sv_SE/interventions.lang
+++ b/htdocs/langs/sv_SE/interventions.lang
@@ -64,3 +64,5 @@ InterLineDuration=Linjens längdintervention
 InterLineDesc=Linjebeskrivningsintervention
 RepeatableIntervention=Template of intervention
 ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
+Reopen=Reopen
+ConfirmReopenIntervention=Are you sure you want to open back the intervention <b>%s</b>?
diff --git a/htdocs/langs/sv_SE/link.lang b/htdocs/langs/sv_SE/link.lang
index 123ec53d089..dbe9db244dc 100644
--- a/htdocs/langs/sv_SE/link.lang
+++ b/htdocs/langs/sv_SE/link.lang
@@ -8,4 +8,4 @@ LinkRemoved=Länken %s har tagits bort
 ErrorFailedToDeleteLink= Det gick inte att ta bort länk '<b>%s</b>'
 ErrorFailedToUpdateLink= Det gick inte att uppdatera länken '<b>%s</b>'
 URLToLink=URL för länk
-OverwriteIfExists=Overwrite file if exists
+OverwriteIfExists=Skriv över fil om den existerar
diff --git a/htdocs/langs/sv_SE/main.lang b/htdocs/langs/sv_SE/main.lang
index 14575a4a7cd..adf56e59a59 100644
--- a/htdocs/langs/sv_SE/main.lang
+++ b/htdocs/langs/sv_SE/main.lang
@@ -1136,4 +1136,4 @@ CategTypeNotFound=Ingen taggtyp hittades för typ av poster
 CopiedToClipboard=Kopieras till Urklipp
 InformationOnLinkToContract=Detta belopp är endast summan av alla rader i kontraktet. Ingen tidsbegrepp tas med i beräkningen.
 ConfirmCancel=Är du säker på att du vill avbryta
-EmailMsgID=Email MsgID
+EmailMsgID=E-post meddelande-id
diff --git a/htdocs/langs/sv_SE/multicurrency.lang b/htdocs/langs/sv_SE/multicurrency.lang
index 979b14693c6..8ca639a6ed5 100644
--- a/htdocs/langs/sv_SE/multicurrency.lang
+++ b/htdocs/langs/sv_SE/multicurrency.lang
@@ -9,8 +9,8 @@ multicurrency_useOriginTx=När ett objekt skapas från en annan, behåll origina
 CurrencyLayerAccount=CurrencyLayer API
 CurrencyLayerAccount_help_to_synchronize=You must create an account on website %s to use this functionality.<br>Get your <b>API key</b>.<br>If you use a free account, you can't change the <b>source currency</b> (USD by default).<br>If your main currency is not USD, the application will automatically recalculate it.<br><br>You are limited to 1000 synchronizations per month.
 multicurrency_appId=API-nyckel
-multicurrency_appCurrencySource=Source currency
-multicurrency_alternateCurrencySource=Alternate source currency
+multicurrency_appCurrencySource=Grundvaluta
+multicurrency_alternateCurrencySource=Alternativ grundvaluta
 CurrenciesUsed=Valutor som används
 CurrenciesUsed_help_to_add=Lägg till de olika valutorna och priserna du behöver använda på dina <b> förslag </b>, <b> beställer </b> etc.
 rate=Betygsätta
@@ -18,5 +18,21 @@ MulticurrencyReceived=Mottagen, ursprunglig valuta
 MulticurrencyRemainderToTake=Återstående belopp, ursprunglig valuta
 MulticurrencyPaymentAmount=Betalningsbelopp, ursprunglig valuta
 AmountToOthercurrency=Belopp till (i valuta för mottagande konto)
-CurrencyRateSyncSucceed=Currency rate synchronization done successfuly
-MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Use the currency of the document for online payments
+CurrencyRateSyncSucceed=Växlingskurssynkronisering klar.
+MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Använd dokumentets valuta för onlinebetalningar
+TabTitleMulticurrencyRate=Kurslista
+ListCurrencyRate=List of exchange rates for the currency
+CreateRate=Create a rate
+FormCreateRate=Rate creation
+FormUpdateRate=Rate modification
+successRateCreate=Rate for currency %s has been added to the database
+ConfirmDeleteLineRate=Are you sure you want to remove the %s rate for currency %s on %s date?
+DeleteLineRate=Rensa kurs
+successRateDelete=Kurs borttagen
+errorRateDelete=Fel vid borttagning av kurs
+successUpdateRate=Ändring gjord
+ErrorUpdateRate=Fel vid ändring av kurs
+Codemulticurrency=Valutakod
+UpdateRate=Ändra kursen
+CancelUpdate=Avbryt
+NoEmptyRate=Fältet "kurs" kan inte vara tomt
diff --git a/htdocs/langs/sv_SE/orders.lang b/htdocs/langs/sv_SE/orders.lang
index d0c400199d4..3f7f99fd4b0 100644
--- a/htdocs/langs/sv_SE/orders.lang
+++ b/htdocs/langs/sv_SE/orders.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - orders
-OrdersArea=Kunder order område
-SuppliersOrdersArea=Inköpsområde
+OrdersArea=Kunders ordrar
+SuppliersOrdersArea=Inköpsordrar
 OrderCard=Beställ kort
 OrderId=Order Id
 Order=Beställ
@@ -12,13 +12,13 @@ OrderDateShort=Beställ datum
 OrderToProcess=Att kunna bearbeta
 NewOrder=Ny order
 NewSupplierOrderShort=Ny order
-NewOrderSupplier=New Purchase Order
+NewOrderSupplier=Ny inköpsorder
 ToOrder=Gör så
 MakeOrder=Gör så
 SupplierOrder=Inköpsorder
 SuppliersOrders=Beställning
-SaleOrderLines=Sale order lines
-PurchaseOrderLines=Puchase order lines
+SaleOrderLines=Försäljningsorderrader
+PurchaseOrderLines=Inköpsorderrader
 SuppliersOrdersRunning=Nuvarande köporder
 CustomerOrder=Kundorder
 CustomersOrders=Försäljningsorder
@@ -72,10 +72,10 @@ ValidateOrder=Verifiera att
 UnvalidateOrder=Märka ordrar från bekräftat->utkast 
 DeleteOrder=Radera order
 CancelOrder=Avbryt för
-OrderReopened= Order %s re-open
+OrderReopened= Order %s återöppnad
 AddOrder=Skapa order
 AddSupplierOrderShort=Skapa order
-AddPurchaseOrder=Create purchase order
+AddPurchaseOrder=Skapa inköpsorder
 AddToDraftOrders=Lägg till förlags order
 ShowOrder=Visa att
 OrdersOpened=Beställer att bearbeta
@@ -148,7 +148,7 @@ OrderByPhone=Telefonen
 PDFEinsteinDescription=A complete order model (old implementation of Eratosthene template)
 PDFEratostheneDescription=A complete order model
 PDFEdisonDescription=En enkel ordermodell
-PDFProformaDescription=A complete Proforma invoice template
+PDFProformaDescription=Fullständig Proforma fakturaamll
 CreateInvoiceForThisCustomer=Faktura order
 CreateInvoiceForThisSupplier=Faktura order
 NoOrdersToInvoice=Inga order fakturerbar
@@ -161,7 +161,7 @@ CreateOrders=Skapa order
 ToBillSeveralOrderSelectCustomer=För att skapa en faktura för flera ordrar, klicka först på kunden och välj sedan "%s".
 OptionToSetOrderBilledNotEnabled=Option from module Workflow, to set order to 'Billed' automatically when invoice is validated, is not enabled, so you will have to set the status of orders to 'Billed' manually after the invoice has been generated.
 IfValidateInvoiceIsNoOrderStayUnbilled=Om fakturatbekräftande är 'Nej', fortsätter ordern till status 'Unbilled' tills fakturan är bekräftat.
-CloseReceivedSupplierOrdersAutomatically=Close order to status "%s" automatically if all products are received.
+CloseReceivedSupplierOrdersAutomatically=Stäng orderstatus "%s" automatiskt om alla produkter var mottagna.
 SetShippingMode=Ställ in fraktläge
 WithReceptionFinished=With reception finished
 #### supplier orders status
@@ -179,7 +179,7 @@ StatusSupplierOrderApprovedShort=Godkänd
 StatusSupplierOrderRefusedShort=Refused
 StatusSupplierOrderToProcessShort=För att kunna behandla
 StatusSupplierOrderReceivedPartiallyShort=Delvis fått
-StatusSupplierOrderReceivedAllShort=Products received
+StatusSupplierOrderReceivedAllShort=Produkter mottagna
 StatusSupplierOrderCanceled=Annullerad
 StatusSupplierOrderDraft=Utkast (måste bekräftas)
 StatusSupplierOrderValidated=Bekräftade
diff --git a/htdocs/langs/sv_SE/other.lang b/htdocs/langs/sv_SE/other.lang
index df7242b07ec..e53b4c8d0aa 100644
--- a/htdocs/langs/sv_SE/other.lang
+++ b/htdocs/langs/sv_SE/other.lang
@@ -14,8 +14,8 @@ PreviousMonthOfInvoice=Föregående månad (nummer 1-12) på fakturadatum
 TextPreviousMonthOfInvoice=Föregående månad (text) på fakturadatum
 NextMonthOfInvoice=Följande månad (nummer 1-12) på fakturadatum
 TextNextMonthOfInvoice=Följande månad (text) på fakturadatum
-PreviousMonth=Previous month
-CurrentMonth=Current month
+PreviousMonth=Föregående månad
+CurrentMonth=Nuvarande månad
 ZipFileGeneratedInto=Zip-fil genererad till <b> %s </b>.
 DocFileGeneratedInto=Doc-filen genereras till <b> %s </b>.
 JumpToLogin=Förbindelse förlorad. Gå till inloggningssidan ...
@@ -24,17 +24,17 @@ MessageOK=Meddelande på retursidan för en bekräftat betalning
 MessageKO=Meddelande på retursidan för en avbokad betalning
 ContentOfDirectoryIsNotEmpty=Innehållet i den här katalogen är inte tomt.
 DeleteAlsoContentRecursively=Kontrollera att allt innehåll rekursivt raderas
-PoweredBy=Powered by
+PoweredBy=Körs av
 YearOfInvoice=År för fakturadatum
 PreviousYearOfInvoice=Föregående år av fakturadatum
 NextYearOfInvoice=Följande år med fakturadatum
 DateNextInvoiceBeforeGen=Datum för nästa faktura (före generationen)
 DateNextInvoiceAfterGen=Datum för nästa faktura (efter generation)
 GraphInBarsAreLimitedToNMeasures=Grapics are limited to %s measures in 'Bars' mode. The mode 'Lines' was automatically selected instead.
-OnlyOneFieldForXAxisIsPossible=Only 1 field is currently possible as X-Axis. Only the first selected field has been selected.
-AtLeastOneMeasureIsRequired=At least 1 field for measure is required
-AtLeastOneXAxisIsRequired=At least 1 field for X-Axis is required
-LatestBlogPosts=Latest Blog Posts
+OnlyOneFieldForXAxisIsPossible=Enbart 1 fält är möjligt i X-axeln. Bara det första markerade fältet har valts.
+AtLeastOneMeasureIsRequired=Minst 1 fält är obligatiskt
+AtLeastOneXAxisIsRequired=Minst 1 fält för X-axeln är obligatirskt
+LatestBlogPosts=Senaste blogginlägg
 Notify_ORDER_VALIDATE=Försäljningsorder bekräftat
 Notify_ORDER_SENTBYMAIL=Försäljningsorder skickad via post
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Beställningsorder skickad via e-post
@@ -78,7 +78,7 @@ Notify_EXPENSE_REPORT_VALIDATE=Utläggsrapport bekräftat (godkännande krävs)
 Notify_EXPENSE_REPORT_APPROVE=Kostnadsrapport godkänd
 Notify_HOLIDAY_VALIDATE=Lämna förfrågan bekräftat (godkännande krävs)
 Notify_HOLIDAY_APPROVE=Lämna förfrågan godkänd
-Notify_ACTION_CREATE=Added action to Agenda
+Notify_ACTION_CREATE=Tillagd till agenda
 SeeModuleSetup=Se inställning av modul %s
 NbOfAttachedFiles=Antal bifogade filer / dokument
 TotalSizeOfAttachedFiles=Total storlek på bifogade filer / dokument
@@ -86,8 +86,8 @@ MaxSize=Maximal storlek
 AttachANewFile=Bifoga en ny fil / dokument
 LinkedObject=Länkat objekt
 NbOfActiveNotifications=Antal anmälningar (antal mottagarens e-postmeddelanden)
-PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe lines are separated by a carriage return.\n\n__USER_SIGNATURE__
-PredefinedMailTestHtml=__(Hello)__<br>This is a <b>test</b> mail sent to __EMAIL__ (the word test must be in bold).<br>The lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
+PredefinedMailTest=__(Hello)__\nDetta är ett testmail skickat till __EMAIL__.\nDessa rader är separerade med radbrytning.\n\n__USER_SIGNATURE__
+PredefinedMailTestHtml=__(Hello)__<br>Detta är ett <b>testmail</b>skickat till __EMAIL__ (ordet testmail ska vara i fet text).<br>Linjerna är separerade med radbrytning.<br><br>__USER_SIGNATURE__
 PredefinedMailContentContract=__(Hej)__\n\n\n__(Vänliga hälsningar)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hej)__\n\nVänligen hitta faktura __REF__ bifogad\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Vänliga hälsningar)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hej)__\n\nVi vill påminna dig om att fakturan __REF__ verkar inte ha betalats. En kopia av fakturan är bifogad som en påminnelse.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Vänliga hälsningar)__\n\n__USER_SIGNATURE__
@@ -100,7 +100,7 @@ PredefinedMailContentSendShipping=__(Hej)__\n\nVänligen hitta frakt __REF__ bif
 PredefinedMailContentSendFichInter=__(Hej)__\n\nVänligen hitta intervention __REF__ bifogad\n\n\n__(Vänliga hälsningar)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=Du kan klicka på länken nedan för att göra din betalning om den inte redan är klar.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Hej)__\n\n\n__(Vänliga hälsningar)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendActionComm=Event reminder "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>This is an automatic message, please do not reply.
+PredefinedMailContentSendActionComm=Händelsepåminnelse "__EVENT_LABEL__" den __EVENT_DATE__ kl __EVENT_TIME__<br><br>Detta är ett automatiskt meddelande, det går inte att besvara.
 DemoDesc=Dolibarr är en kompakt ERP / CRM som stöder flera affärsmoduler. En demo som visar alla moduler ger ingen mening eftersom detta scenario aldrig uppstår (flera hundra tillgängliga). Det finns därför flera demoprofiler tillgängliga.
 ChooseYourDemoProfil=Välj den demoprofil som bäst passar dina behov ...
 ChooseYourDemoProfilMore=... eller bygg din egen profil <br> (manuellt modulval)
@@ -109,12 +109,12 @@ DemoFundation2=Hantera medlemmar och bankkonto i en stiftelse
 DemoCompanyServiceOnly=Endast företag eller frilansförsäljning
 DemoCompanyShopWithCashDesk=Hantera en butik med en kassa
 DemoCompanyProductAndStocks=Shop selling products with Point Of Sales
-DemoCompanyManufacturing=Company manufacturing products
+DemoCompanyManufacturing=Företag som tillverkar produkter
 DemoCompanyAll=Företag med flera aktiviteter (alla huvudmoduler)
 CreatedBy=Skapad av %s
 ModifiedBy=Uppdaterad av %s
 ValidatedBy=Bekräftad av %s
-SignedBy=Signed by %s
+SignedBy=Signerat av %s
 ClosedBy=Stängt av %s
 CreatedById=Användarkod som skapade
 ModifiedById=Användar-ID som gjorde senaste ändringen
@@ -129,7 +129,7 @@ ClosedByLogin=Användarinloggning som stängde
 FileWasRemoved=Arkiv %s togs bort
 DirWasRemoved=Nummer %s togs bort
 FeatureNotYetAvailable=Funktionen är ännu inte tillgänglig i den nuvarande versionen
-FeatureNotAvailableOnDevicesWithoutMouse=Feature not available on devices without mouse
+FeatureNotAvailableOnDevicesWithoutMouse=Funktionen är inte tillgänglig på enheter utan pekdon.
 FeaturesSupported=Stödda funktioner
 Width=Bredd
 Height=Höjd
@@ -184,23 +184,23 @@ EnableGDLibraryDesc=Installera eller aktivera GD-biblioteket på din PHP-install
 ProfIdShortDesc=<b>Prof Id %s</b> är en information är beroende av tredje part land. <br> Till exempel för landets <b>%s,</b> det är kod <b>%s.</b>
 DolibarrDemo=Dolibarr ERP / CRM-demo
 StatsByNumberOfUnits=Statistik för summan av produkter / tjänster
-StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
+StatsByNumberOfEntities=Statistik för antalet valda typer (antal fakturor eller ordrar...)
 NumberOfProposals=Antal förslag
 NumberOfCustomerOrders=Antal försäljningsorder
 NumberOfCustomerInvoices=Antal kundfakturor
 NumberOfSupplierProposals=Antal leverantörsförslag
 NumberOfSupplierOrders=Antal inköpsorder
 NumberOfSupplierInvoices=Antal leverantörsfakturor
-NumberOfContracts=Number of contracts
-NumberOfMos=Number of manufacturing orders
+NumberOfContracts=Antal avtal
+NumberOfMos=Antal tillverkningsordrar
 NumberOfUnitsProposals=Antal enheter på förslag
 NumberOfUnitsCustomerOrders=Antal enheter på försäljningsorder
 NumberOfUnitsCustomerInvoices=Antal enheter på kundfakturor
 NumberOfUnitsSupplierProposals=Antal enheter på leverantörsförslag
 NumberOfUnitsSupplierOrders=Antal enheter på inköpsorder
 NumberOfUnitsSupplierInvoices=Antal enheter på leverantörsfakturor
-NumberOfUnitsContracts=Number of units on contracts
-NumberOfUnitsMos=Number of units to produce in manufacturing orders
+NumberOfUnitsContracts=Antal produkter på avtal
+NumberOfUnitsMos=Antal produkter i tillverkningsordrar
 EMailTextInterventionAddedContact=Ett nytt ingripande %s har tilldelats dig.
 EMailTextInterventionValidated=Interventionen %s har bekräftats.
 EMailTextInvoiceValidated=Faktura %s har bekräftats.
@@ -246,7 +246,7 @@ NewKeyIs=Det här är din nya nycklar för att logga in
 NewKeyWillBe=Din nya knappen för att logga in på programvaran kommer att vara
 ClickHereToGoTo=Klicka här för att gå till %s
 YouMustClickToChange=Du måste dock först klicka på följande länk för att bekräfta detta lösenord förändring
-ConfirmPasswordChange=Confirm password change
+ConfirmPasswordChange=Bekräfta lösenordsbyte
 ForgetIfNothing=Om du inte har begärt denna förändring, bara glömma detta mail. Dina referenser förvaras säkert.
 IfAmountHigherThan=Om mängden högre än <strong> %s </strong>
 SourcesRepository=Förvaring för källor
@@ -263,7 +263,7 @@ ThirdPartyCreatedByEmailCollector=Tredje part skapad av e-post samlare från e-p
 ContactCreatedByEmailCollector=Kontakt / adress skapad via e-post samlare från email MSGID %s
 ProjectCreatedByEmailCollector=Projekt skapat av e-post samlare från email MSGID %s
 TicketCreatedByEmailCollector=Biljett skapad av e-post samlare från email MSGID %s
-OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+OpeningHoursFormatDesc=Använd "-" för att separera öppettider.<br>Använd mellanslag för flera tidpunkter.<br>Exempel: 8-12 14-18
 SuffixSessionName=Suffix for session name
 
 ##### Export #####
@@ -285,9 +285,9 @@ LinesToImport=Rader att importera
 
 MemoryUsage=Minnesanvändning
 RequestDuration=Varaktighet för förfrågan
-ProductsPerPopularity=Products/Services by popularity
-PopuProp=Products/Services by popularity in Proposals
-PopuCom=Products/Services by popularity in Orders
-ProductStatistics=Products/Services Statistics
-NbOfQtyInOrders=Qty in orders
-SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
+ProductsPerPopularity=Produkter/tjänster baserat på populäritet
+PopuProp=Produkter/tjänster baserat på populäritet i förslag
+PopuCom=Produkter/tjänster baserat på populäritet i ordrar
+ProductStatistics=Produkter/tjänster statistik
+NbOfQtyInOrders=Antal i ordrar
+SelectTheTypeOfObjectToAnalyze=Välj ett objekt för att visa statistik...
diff --git a/htdocs/langs/sv_SE/partnership.lang b/htdocs/langs/sv_SE/partnership.lang
index 59c885f7832..e7d295c58d8 100644
--- a/htdocs/langs/sv_SE/partnership.lang
+++ b/htdocs/langs/sv_SE/partnership.lang
@@ -16,66 +16,66 @@
 #
 # Generic
 #
-ModulePartnershipName=Partnership management
-PartnershipDescription=Module Partnership management
-PartnershipDescriptionLong= Module Partnership management
+ModulePartnershipName=Partnerskapshantering
+PartnershipDescription=Partnerskapshanteringsmodul
+PartnershipDescriptionLong= Partnerskapshanteringsmodul
 
-AddPartnership=Add partnership
-CancelPartnershipForExpiredMembers=Partnership: Cancel partnership of members with expired subscriptions
+AddPartnership=Lägg till partnerskap
+CancelPartnershipForExpiredMembers=Partnerskap: Avbryt partnerskap med inaktiva abonnemang
 PartnershipCheckBacklink=Partnership: Check referring backlink
 
 #
 # Menu
 #
-NewPartnership=New Partnership
-ListOfPartnerships=List of partnership
+NewPartnership=Nytt partnerskap
+ListOfPartnerships=Lista över partnerskap
 
 #
 # Admin page
 #
-PartnershipSetup=Partnership setup
-PartnershipAbout=About Partnership
-PartnershipAboutPage=Partnership about page
+PartnershipSetup=Partnerskapsupplägg
+PartnershipAbout=Om partnerskap
+PartnershipAboutPage=Om partnerskapssidan
 partnershipforthirdpartyormember=Partner status must be set on a 'thirdparty' or a 'member'
-PARTNERSHIP_IS_MANAGED_FOR=Partnership managed for
+PARTNERSHIP_IS_MANAGED_FOR=Partnerskap hanterad för
 PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks to check
-PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb of days before cancelling status of a partnership when a subscription has expired
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Antal dagar innan partnerskap avbryts när ett abonnemang har löpt ut
 ReferingWebsiteCheck=Check of website referring
-ReferingWebsiteCheckDesc=You can enable a feature to check that your partners has added a backlink to your website domains on their own website.
+ReferingWebsiteCheckDesc=Du kan aktivera en funktion för att kontrollera om din partner har länkat tillbaka till er hemsida via deras egen hemsida.
 
 #
 # Object
 #
-DeletePartnership=Delete a partnership
-PartnershipDedicatedToThisThirdParty=Partnership dedicated to this third party
+DeletePartnership=Ta bort partnerskap
+PartnershipDedicatedToThisThirdParty=Partnerskap dedikerat till denna kund/leverantör
 PartnershipDedicatedToThisMember=Partnership dedicated to this member
 DatePartnershipStart=Startdatum
 DatePartnershipEnd=Slutdatum
-ReasonDecline=Decline reason
-ReasonDeclineOrCancel=Decline reason
-PartnershipAlreadyExist=Partnership already exist
-ManagePartnership=Manage partnership
+ReasonDecline=Avslagsanledning
+ReasonDeclineOrCancel=Avslagsanledning
+PartnershipAlreadyExist=Partnerskap finns redan
+ManagePartnership=Hantera partnerskap
 BacklinkNotFoundOnPartnerWebsite=Backlink not found on partner website
-ConfirmClosePartnershipAsk=Are you sure you want to cancel this partnership?
-PartnershipType=Partnership type
+ConfirmClosePartnershipAsk=Är du säker på att du vill avbryta detta partnerskap?
+PartnershipType=Partnerskapstyp
 
 #
 # Template Mail
 #
-SendingEmailOnPartnershipWillSoonBeCanceled=Partnership will soon be canceled
-SendingEmailOnPartnershipRefused=Partnership refused
-SendingEmailOnPartnershipAccepted=Partnership accepted
-SendingEmailOnPartnershipCanceled=Partnership canceled
+SendingEmailOnPartnershipWillSoonBeCanceled=Partnerskap kommer snart att avbrytas
+SendingEmailOnPartnershipRefused=Partnerskap nekat
+SendingEmailOnPartnershipAccepted=Partnerskap accepterat
+SendingEmailOnPartnershipCanceled=Partnerskap avbrutet
 
-YourPartnershipWillSoonBeCanceledTopic=Partnership will soon be canceled
-YourPartnershipRefusedTopic=Partnership refused
-YourPartnershipAcceptedTopic=Partnership accepted
-YourPartnershipCanceledTopic=Partnership canceled
+YourPartnershipWillSoonBeCanceledTopic=Partnerskap kommer snart att avbrytas
+YourPartnershipRefusedTopic=Partnerskap nekat
+YourPartnershipAcceptedTopic=Partnerskap accepterat
+YourPartnershipCanceledTopic=Partnerskap avbrutet
 
 YourPartnershipWillSoonBeCanceledContent=We inform you that your partnership will soon be canceled (Backlink not found)
-YourPartnershipRefusedContent=We inform you that your partnership request has been refused.
-YourPartnershipAcceptedContent=We inform you that your partnership request has been accepted.
-YourPartnershipCanceledContent=We inform you that your partnership has been canceled.
+YourPartnershipRefusedContent=Vi vill informera dig om att parnterskapsförfrågan har blivit nekad.
+YourPartnershipAcceptedContent=Vi vill informera dig om att partnerskapsförfrågan har blivit accepterad
+YourPartnershipCanceledContent=Vi vill informera dig om att partnerskapsförfrågan har blivit avbruten
 
 #
 # Status
@@ -84,4 +84,4 @@ PartnershipDraft=Utkast
 PartnershipAccepted=Accepted
 PartnershipRefused=Refused
 PartnershipCanceled=Annullerad
-PartnershipManagedFor=Partners are
+PartnershipManagedFor=Partnerutrymme
diff --git a/htdocs/langs/sv_SE/paypal.lang b/htdocs/langs/sv_SE/paypal.lang
index 7371edf5798..907c1cff4d3 100644
--- a/htdocs/langs/sv_SE/paypal.lang
+++ b/htdocs/langs/sv_SE/paypal.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=PayPal-modul installation
 PaypalDesc=Denna modul tillåter betalning av kunder via <a href="http://www.paypal.com" target="_blank"> PayPal </a>. Detta kan användas för en ad hoc-betalning eller för en betalning relaterad till ett Dolibarr-objekt (faktura, order, ...)
-PaypalOrCBDoPayment=Pay with PayPal (Card or PayPal)
+PaypalOrCBDoPayment=Betala med PayPal (kort eler PayPal)
 PaypalDoPayment=Betala med PayPal
 PAYPAL_API_SANDBOX=Läge test / sandlåda
 PAYPAL_API_USER=API användarnamn
@@ -32,5 +32,5 @@ PaypalImportPayment=Importera PayPal-betalningar
 PostActionAfterPayment=Posta åtgärder efter betalningar
 ARollbackWasPerformedOnPostActions=En återuppringning utfördes på alla Post-åtgärder. Du måste fylla i posthandlingar manuellt om det behövs.
 ValidationOfPaymentFailed=Bekräftandet av betalningen har misslyckats
-CardOwner=Card holder
-PayPalBalance=Paypal credit
+CardOwner=Kortinnehavare
+PayPalBalance=PayPal Kredit
diff --git a/htdocs/langs/sv_SE/productbatch.lang b/htdocs/langs/sv_SE/productbatch.lang
index f429a077474..ab6660447ce 100644
--- a/htdocs/langs/sv_SE/productbatch.lang
+++ b/htdocs/langs/sv_SE/productbatch.lang
@@ -1,10 +1,10 @@
 # ProductBATCH language file - Source file is en_US - ProductBATCH
 ManageLotSerial=Använd batch/serie-nummer
-ProductStatusOnBatch=Yes (lot required)
-ProductStatusOnSerial=Yes (unique serial number required)
+ProductStatusOnBatch=Ja (tillverkning/serienummer krävs)
+ProductStatusOnSerial=Ja (Unikt serienummer krävs)
 ProductStatusNotOnBatch=Nej (batch/serie-nummer används ej)
-ProductStatusOnBatchShort=Lot
-ProductStatusOnSerialShort=Serial
+ProductStatusOnBatchShort=Parti
+ProductStatusOnSerialShort=Serie
 ProductStatusNotOnBatchShort=Nej
 Batch=Batch/Serie
 atleast1batchfield=Bäst före-datum eller Batch/Serie-nummer
@@ -24,22 +24,20 @@ ProductLotSetup=Inställning av batch/serie modul
 ShowCurrentStockOfLot=Visa aktuellt lager för sammansatt produkt/parti
 ShowLogOfMovementIfLot=Visa statestik för sammansatt produkt/parti
 StockDetailPerBatch=Detaljlager för parti
-SerialNumberAlreadyInUse=Serial number %s is already used for product %s
-TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
-BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
-BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+SerialNumberAlreadyInUse=Serienummer %s är redan använt för produkt %s
+TooManyQtyForSerialNumber=Du kan bara ha en produkt %s för serienummer %s
 ManageLotMask=Custom mask
-CustomMasks=Adds an option to define mask in the product card
-LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
-SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
-QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
-LifeTime=Life span (in days)
-EndOfLife=End of life
-ManufacturingDate=Manufacturing date
-DestructionDate=Destruction date
-FirstUseDate=First use date
-QCFrequency=Quality control frequency (in days)
+CustomMasks=Option to define a different numbering mask for each product
+BatchLotNumberingModules=Numbering rule for automatic generation of lot number
+BatchSerialNumberingModules=Numbering rule for automatic generation of serial number (for products with property 1 unique lot/serial for each product)
+QtyToAddAfterBarcodeScan=Antal att lägga till för varje streckkod/parti/serienummer skannat
+LifeTime=Livslängd (i dagar)
+EndOfLife=Livslängd
+ManufacturingDate=Tillverkningsdatum
+DestructionDate=Raseringsdatum
+FirstUseDate=Första användningsdatum
+QCFrequency=Kvalitetskontrollsperiod (i dagar)
 
 #Traceability - qc status
-OutOfOrder=Out of order
+OutOfOrder=Ej tillgänglig
 InWorkingOrder=In working order
diff --git a/htdocs/langs/sv_SE/products.lang b/htdocs/langs/sv_SE/products.lang
index 4aaa22c4b42..c9258cb5af8 100644
--- a/htdocs/langs/sv_SE/products.lang
+++ b/htdocs/langs/sv_SE/products.lang
@@ -72,7 +72,7 @@ AppliedPricesFrom=Tillämpad från
 SellingPrice=Försäljningspris
 SellingPriceHT=Försäljningspris (exkl. Moms)
 SellingPriceTTC=Försäljningspris (inkl. moms)
-SellingMinPriceTTC=Minsta försäljningspris (inkl. Skatt)
+SellingMinPriceTTC=Minsta försäljningspris (inkl. moms)
 CostPriceDescription=Detta prisfält (exkl. Moms) kan användas för att fånga det genomsnittliga belopp som denna produkt kostar för ditt företag. Det kan vara vilket pris du själv beräknar, till exempel från det genomsnittliga inköpspriset plus genomsnittlig produktions- och distributionskostnad.
 CostPriceUsage=Detta värde kan användas för marginalberäkning.
 SoldAmount=Sålt belopp
@@ -277,7 +277,7 @@ PriceByCustomer=Olika priser för varje kund
 PriceCatalogue=Ett enda försäljningspris per produkt / tjänst
 PricingRule=Regler för försäljningspriser
 AddCustomerPrice=Lägg till pris per kund
-ForceUpdateChildPriceSoc=Sätt samma pris på kunds filialer
+ForceUpdateChildPriceSoc=Set same price on customer's subsidiaries
 PriceByCustomerLog=Logga på tidigare kundpriser
 MinimumPriceLimit=Lägsta pris kan inte vara lägre än %s
 MinimumRecommendedPrice=Lägsta rekommenderade pris är: %s
@@ -296,6 +296,7 @@ ComposedProductIncDecStock=Öka / minska lagerposten vid föräldraändring
 ComposedProduct=Barnprodukter
 MinSupplierPrice=Lägsta köpkurs
 MinCustomerPrice=Lägsta försäljningspris
+NoDynamicPrice=No dynamic price
 DynamicPriceConfiguration=Dynamisk priskonfiguration
 DynamicPriceDesc=Du kan definiera matematiska formler för att beräkna kund- eller leverantörspriser. Sådana formler kan använda alla matematiska operatörer, vissa konstanter och variabler. Du kan här definiera variablerna du vill använda. Om variabeln behöver en automatisk uppdatering kan du definiera den externa adressen så att Dolibarr kan uppdatera värdet automatiskt.
 AddVariable=Lägg till variabel
@@ -340,7 +341,7 @@ ProductSheet=Produktblad
 ServiceSheet=Serviceblad
 PossibleValues=Möjliga värden
 GoOnMenuToCreateVairants=Gå på menyn %s - %s för att förbereda attributvarianter (som färger, storlek, ...)
-UseProductFournDesc=Lägg till en funktion för att definiera beskrivningar av produkter som definieras av leverantörerna utöver beskrivningar för kunder
+UseProductFournDesc=Add a feature to define the descriptions of products defined by the vendors in addition to descriptions for customers
 ProductSupplierDescription=Leverantörsbeskrivning för produkten
 UseProductSupplierPackaging=Använd förpackning till leverantörspriser (beräkna kvantiteter enligt förpackning som anges på leverantörspris när du lägger till / uppdaterar rad i leverantörsdokument)
 PackagingForThisProduct=Förpackning
diff --git a/htdocs/langs/sv_SE/projects.lang b/htdocs/langs/sv_SE/projects.lang
index b77f6547887..56ce0898ffe 100644
--- a/htdocs/langs/sv_SE/projects.lang
+++ b/htdocs/langs/sv_SE/projects.lang
@@ -7,22 +7,22 @@ ProjectsArea=Projektområde
 ProjectStatus=Projektstatus
 SharedProject=Alla
 PrivateProject=Projekt kontakter
-ProjectsImContactFor=Projects for which I am explicitly a contact
+ProjectsImContactFor=Projekt där jag är kontaktperson
 AllAllowedProjects=Allt projekt jag kan läsa (min + offentliga)
 AllProjects=Alla projekt
-MyProjectsDesc=This view is limited to the projects that you are a contact for
+MyProjectsDesc=Denna vy är begränsad till projekt du är kontaktperson för
 ProjectsPublicDesc=Denna uppfattning presenterar alla projekt du har rätt att läsa.
 TasksOnProjectsPublicDesc=Denna vy presenterar alla uppgifter på projekt som du får läsa.
 ProjectsPublicTaskDesc=Denna uppfattning presenterar alla projekt och uppgifter som du får läsa.
 ProjectsDesc=Denna uppfattning presenterar alla projekt (din användarbehörighet tillåta dig att visa allt).
 TasksOnProjectsDesc=Denna vy presenterar alla uppgifter på alla projekt (dina användarbehörigheter ger dig tillstånd att se allt).
-MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
+MyTasksDesc=Denna vy är begränsad till projekt eller uppgifter du är kontaktperson för
 OnlyOpenedProject=Endast öppna projekt är synliga (projekt i utkast eller stängt status är inte synliga).
 ClosedProjectsAreHidden=Avslutade projekt är inte synliga.
 TasksPublicDesc=Denna uppfattning presenterar alla projekt och uppgifter som du får läsa.
 TasksDesc=Denna uppfattning presenterar alla projekt och uppgifter (din användarbehörighet tillåta dig att visa allt).
 AllTaskVisibleButEditIfYouAreAssigned=Alla uppgifter för kvalificerade projekt är synliga, men du kan bara ange tid för uppgift som är tilldelad till vald användare. Tilldela uppgiften om du behöver ange tid på den.
-OnlyYourTaskAreVisible=Only tasks assigned to you are visible. If you need to enter time on a task and if the task is not visible here, then you need to assign the task to yourself.
+OnlyYourTaskAreVisible=Enbart uppgifter som du är tilldelad är synliga. Om du behöver rapportera tid på en uppgift och uppgiften inte är synlig här, måste du tilldela den till dig själv.
 ImportDatasetTasks=Uppgifter av projekt
 ProjectCategories=Projektetiketter / kategorier
 NewProject=Nytt projekt
@@ -47,7 +47,7 @@ TimeSpentByUser=Tid spenderad av användaren
 TimesSpent=Tid
 TaskId=UppgiftsID
 RefTask=Uppgiftsreferens
-LabelTask=Task label
+LabelTask=Uppgiftsbenämning
 TaskTimeSpent=Tid som ägnas åt uppgifter
 TaskTimeUser=Användare
 TaskTimeNote=Anmärkning
@@ -69,27 +69,27 @@ NewTask=Ny uppgift
 AddTask=Skapa uppgift
 AddTimeSpent=Skapa tid spenderad
 AddHereTimeSpentForDay=Lägg till här tid för denna dag / uppgift
-AddHereTimeSpentForWeek=Add here time spent for this week/task
+AddHereTimeSpentForWeek=Registrera tid spenderat på denna vecka/uppgift
 Activity=Aktivitet
 Activities=Uppgifter / aktiviteter
 MyActivities=Mina uppgifter / aktiviteter
 MyProjects=Mina projekt
 MyProjectsArea=Mina projektområde
 DurationEffective=Effektiv längd
-ProgressDeclared=Declared real progress
-TaskProgressSummary=Task progress
-CurentlyOpenedTasks=Curently open tasks
+ProgressDeclared=Deklarera framgång
+TaskProgressSummary=Uppgiftsframsteg
+CurentlyOpenedTasks=Just nu aktiva uppgifter
 TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared real progress is less %s than the progress on consumption
 TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared real progress is more %s than the progress on consumption
 ProgressCalculated=Progress on consumption
-WhichIamLinkedTo=which I'm linked to
-WhichIamLinkedToProject=which I'm linked to project
+WhichIamLinkedTo=vilka jag är länkade till
+WhichIamLinkedToProject=vilka projekt jag är länkade till
 Time=Tid
-TimeConsumed=Consumed
+TimeConsumed=Konsumerat
 ListOfTasks=Lista över uppgifter
 GoToListOfTimeConsumed=Gå till listan över tidskrävt
 GanttView=Gantt-vy
-ListWarehouseAssociatedProject=List of warehouses associated to the project
+ListWarehouseAssociatedProject=Lista lager associerade till detta projekt
 ListProposalsAssociatedProject=Förteckning över de kommersiella förslagen relaterade till projektet
 ListOrdersAssociatedProject=Förteckning över försäljningsorder relaterade till projektet
 ListInvoicesAssociatedProject=Förteckning över kundfakturor relaterade till projektet
@@ -104,7 +104,7 @@ ListDonationsAssociatedProject=Förteckning över donationer relaterade till pro
 ListVariousPaymentsAssociatedProject=Förteckning över diverse betalningar relaterade till projektet
 ListSalariesAssociatedProject=Förteckning över betalningar av löner relaterade till projektet
 ListActionsAssociatedProject=Förteckning över händelser relaterade till projektet
-ListMOAssociatedProject=List of manufacturing orders related to the project
+ListMOAssociatedProject=Lista tillverkningsordrar relaterade till detta projekt
 ListTaskTimeUserProject=Förteckning över tid som konsumeras på projektets uppgifter
 ListTaskTimeForTask=Lista över tid förbrukad på uppgift
 ActivityOnProjectToday=Aktivitet på projektet idag
@@ -117,7 +117,7 @@ ChildOfTask=Barn av uppgift
 TaskHasChild=Uppgiften har barn
 NotOwnerOfProject=Inte ägaren av denna privata projekt
 AffectedTo=Påverkas i
-CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See tab '%s'.
+CantRemoveProject=Detta projekt kan inte tas bort, eftersom det är refererat i något annat föremål (faktura, order etc.). Se i flik "%s"
 ValidateProject=Bekräfta projet
 ConfirmValidateProject=Är du säker på att du vill bekräfta detta projekt?
 CloseAProject=Stäng projekt
@@ -180,7 +180,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Bidragsgivare
 TypeContact_project_task_external_TASKCONTRIBUTOR=Bidragsgivare
 SelectElement=Välj elementet
 AddElement=Länk till inslag
-LinkToElementShort=Link to
+LinkToElementShort=Länkad til
 # Documents models
 DocumentModelBeluga=Projektdokumentmall för översikt över länkade objekt
 DocumentModelBaleine=Projektdokumentmall för uppgifter
@@ -189,7 +189,7 @@ PlannedWorkload=Planerad arbetsbelastning
 PlannedWorkloadShort=Arbetsbelastning
 ProjectReferers=Relaterade saker
 ProjectMustBeValidatedFirst=Projekt måste bekräftas först
-FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
+FirstAddRessourceToAllocateTime=Tilldela en användarresurs som kontaktperson för projekt att rapportera tid
 InputPerDay=Ingång per dag
 InputPerWeek=Ingång per vecka
 InputPerMonth=Input per month
@@ -202,7 +202,7 @@ ResourceNotAssignedToTheTask=Ej tilldelad uppgiften
 NoUserAssignedToTheProject=Inga användare tilldelade detta projekt
 TimeSpentBy=Tid spenderad av
 TasksAssignedTo=Uppgifter som är tilldelade till
-AssignTaskToMe=Assign task to myself
+AssignTaskToMe=Tilldela till mig själv
 AssignTaskToUser=Tilldela uppgiften till %s
 SelectTaskToAssign=Välj uppgift att tilldela ...
 AssignTask=Tilldela
@@ -241,7 +241,7 @@ LatestModifiedProjects=Senaste %s modifierade projekten
 OtherFilteredTasks=Andra filtrerade uppgifter
 NoAssignedTasks=Inga tilldelade uppgifter hittades (tilldela projekt / uppgifter till den nuvarande användaren från den övre väljrutan för att ange tid på det)
 ThirdPartyRequiredToGenerateInvoice=En tredje part måste definieras på projekt för att kunna fakturera det.
-ChooseANotYetAssignedTask=Choose a task not yet assigned to you
+ChooseANotYetAssignedTask=Denna uppgift har inte tilldelats till dig ännu
 # Comments trans
 AllowCommentOnTask=Tillåt användar kommentarer på uppgifter
 AllowCommentOnProject=Tillåt användar kommentarer på projekt
@@ -258,19 +258,19 @@ ServiceToUseOnLines=Service att använda på linjer
 InvoiceGeneratedFromTimeSpent=Faktura %s har genererats från tid till projekt
 ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
 ProjectFollowOpportunity=Follow opportunity
-ProjectFollowTasks=Follow tasks or time spent
-Usage=Usage
+ProjectFollowTasks=Följ uppgift eller tid spenderad
+Usage=Användande
 UsageOpportunity=Usage: Opportunity
-UsageTasks=Usage: Tasks
-UsageBillTimeShort=Usage: Bill time
-InvoiceToUse=Draft invoice to use
+UsageTasks=Användande: Uppgift
+UsageBillTimeShort=Användande: Fakturerbar tid
+InvoiceToUse=Utkastsfaktura att använda
 NewInvoice=Ny faktura
-OneLinePerTask=One line per task
-OneLinePerPeriod=One line per period
-OneLinePerTimeSpentLine=One line for each time spent declaration
-RefTaskParent=Ref. Parent Task
-ProfitIsCalculatedWith=Profit is calculated using
-AddPersonToTask=Add also to tasks
+OneLinePerTask=En rad per uppgift
+OneLinePerPeriod=En rad per period
+OneLinePerTimeSpentLine=En rad för varje tidrapport
+RefTaskParent=Refererad överordnad uppgift
+ProfitIsCalculatedWith=Vinst är beräknad av
+AddPersonToTask=Lägg också till i uppgift
 UsageOrganizeEvent=Usage: Event Organization
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
diff --git a/htdocs/langs/sv_SE/receiptprinter.lang b/htdocs/langs/sv_SE/receiptprinter.lang
index 4ae00f6560c..d581716a79d 100644
--- a/htdocs/langs/sv_SE/receiptprinter.lang
+++ b/htdocs/langs/sv_SE/receiptprinter.lang
@@ -31,7 +31,7 @@ PROFILE_SIMPLE_HELP=Enkel profil Ingen grafik
 PROFILE_EPOSTEP_HELP=Epos Tep Profile
 PROFILE_P822D_HELP=P822D Profil Nr Grafik
 PROFILE_STAR_HELP=Stjärnprofil
-DOL_LINE_FEED=Skip line
+DOL_LINE_FEED=Hoppa över rad
 DOL_ALIGN_LEFT=Vänsterjustera texten
 DOL_ALIGN_CENTER=Centrera text
 DOL_ALIGN_RIGHT=Högerjustera texten
@@ -45,38 +45,38 @@ DOL_CUT_PAPER_PARTIAL=Klipp biljetten delvis
 DOL_OPEN_DRAWER=Öppna kassalådan
 DOL_ACTIVATE_BUZZER=Aktivera summer
 DOL_PRINT_QRCODE=Skriv ut QR-kod
-DOL_PRINT_LOGO=Print logo of my company
-DOL_PRINT_LOGO_OLD=Print logo of my company (old printers)
-DOL_BOLD=Bold
-DOL_BOLD_DISABLED=Disable bold
-DOL_DOUBLE_HEIGHT=Double height size
-DOL_DOUBLE_WIDTH=Double width size
-DOL_DEFAULT_HEIGHT_WIDTH=Default height and width size
-DOL_UNDERLINE=Enable underline
-DOL_UNDERLINE_DISABLED=Disable underline
-DOL_BEEP=Beed sound
-DOL_PRINT_TEXT=Print text
-DateInvoiceWithTime=Invoice date and time
-YearInvoice=Invoice year
-DOL_VALUE_MONTH_LETTERS=Invoice month in letters
-DOL_VALUE_MONTH=Invoice month
-DOL_VALUE_DAY=Invoice day
-DOL_VALUE_DAY_LETTERS=Inovice day in letters
-DOL_LINE_FEED_REVERSE=Line feed reverse
-InvoiceID=Invoice ID
+DOL_PRINT_LOGO=Skriv ut logotyp
+DOL_PRINT_LOGO_OLD=Skriv ut logotyp (gamla skrivare)
+DOL_BOLD=Fet text
+DOL_BOLD_DISABLED=Inaktivera fet text
+DOL_DOUBLE_HEIGHT=Dubbla höjden
+DOL_DOUBLE_WIDTH=Dubbla bredden
+DOL_DEFAULT_HEIGHT_WIDTH=Standard höjd och bredd
+DOL_UNDERLINE=Aktivera understrykning
+DOL_UNDERLINE_DISABLED=Inaktivera understrykning
+DOL_BEEP=Summer
+DOL_PRINT_TEXT=Skriv text
+DateInvoiceWithTime=Fakturadatum och ti
+YearInvoice=Fakturaår
+DOL_VALUE_MONTH_LETTERS=Fakturamånad i text
+DOL_VALUE_MONTH=Fakturamånad
+DOL_VALUE_DAY=Fakturadag
+DOL_VALUE_DAY_LETTERS=Fakturadag i bokstäver
+DOL_LINE_FEED_REVERSE=Omvänd radmatning
+InvoiceID=Faktura-id
 InvoiceRef=Faktura ref
-DOL_PRINT_OBJECT_LINES=Invoice lines
-DOL_VALUE_CUSTOMER_FIRSTNAME=Customer first name
-DOL_VALUE_CUSTOMER_LASTNAME=Customer last name
-DOL_VALUE_CUSTOMER_MAIL=Customer mail
-DOL_VALUE_CUSTOMER_PHONE=Customer phone
-DOL_VALUE_CUSTOMER_MOBILE=Customer mobile
-DOL_VALUE_CUSTOMER_SKYPE=Customer Skype
-DOL_VALUE_CUSTOMER_TAX_NUMBER=Customer tax number
-DOL_VALUE_CUSTOMER_ACCOUNT_BALANCE=Customer account balance
-DOL_VALUE_MYSOC_NAME=Your company name
-VendorLastname=Vendor last name
-VendorFirstname=Vendor first name
-VendorEmail=Vendor email
-DOL_VALUE_CUSTOMER_POINTS=Customer points
-DOL_VALUE_OBJECT_POINTS=Object points
+DOL_PRINT_OBJECT_LINES=Fakturarader
+DOL_VALUE_CUSTOMER_FIRSTNAME=Kundens förnamn
+DOL_VALUE_CUSTOMER_LASTNAME=Kundens efternamn
+DOL_VALUE_CUSTOMER_MAIL=Kundens e-post
+DOL_VALUE_CUSTOMER_PHONE=Kundens telefonnummer
+DOL_VALUE_CUSTOMER_MOBILE=Kundens mobilnummer
+DOL_VALUE_CUSTOMER_SKYPE=Kunden Skype
+DOL_VALUE_CUSTOMER_TAX_NUMBER=Kundens momsregistreringsnummer
+DOL_VALUE_CUSTOMER_ACCOUNT_BALANCE=Kundens kreditgräns
+DOL_VALUE_MYSOC_NAME=Ditt företagsnamn
+VendorLastname=Tillverkarens efternamn
+VendorFirstname=Tillverkarens förnam
+VendorEmail=Tillverkarens e-post
+DOL_VALUE_CUSTOMER_POINTS=Kundpoäng
+DOL_VALUE_OBJECT_POINTS=Objektpoäng
diff --git a/htdocs/langs/sv_SE/resource.lang b/htdocs/langs/sv_SE/resource.lang
index e12be95b42d..16ec7c66e6c 100644
--- a/htdocs/langs/sv_SE/resource.lang
+++ b/htdocs/langs/sv_SE/resource.lang
@@ -5,7 +5,7 @@ DeleteResource=Radera resurs
 ConfirmDeleteResourceElement=Bekräfta radera resurs för detta element
 NoResourceInDatabase=Ingen resurs i databasen.
 NoResourceLinked=Ingen resurs kopplad
-
+ActionsOnResource=Händelser om den här resursen
 ResourcePageIndex=Listan över resurser
 ResourceSingular=Resurs
 ResourceCard=Resurs kort
@@ -16,7 +16,7 @@ ResourceFormLabel_description=Resursbeskrivning
 
 ResourcesLinkedToElement=Resurser kopplade till elementet
 
-ShowResource=Show resource
+ShowResource=Visa resurs
 
 ResourceElementPage=Element resurser
 ResourceCreatedWithSuccess=Resursen har skapats
@@ -30,7 +30,10 @@ DictionaryResourceType=Typ av resurser
 
 SelectResource=Välj resurs
 
-IdResource=Id resource
-AssetNumber=Serial number
-ResourceTypeCode=Resource type code
+IdResource=ID-resurs
+AssetNumber=Serienummer
+ResourceTypeCode=Typ av resurs typ
 ImportDataset_resource_1=Resurser
+
+ErrorResourcesAlreadyInUse=Vissa resurser är använda
+ErrorResourceUseInEvent=%s använt i %s
diff --git a/htdocs/langs/sv_SE/salaries.lang b/htdocs/langs/sv_SE/salaries.lang
index 73cef33a5e8..e2bb80343c1 100644
--- a/htdocs/langs/sv_SE/salaries.lang
+++ b/htdocs/langs/sv_SE/salaries.lang
@@ -2,20 +2,23 @@
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Redovisningskonto som används för tredje part
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=Det dedikerade bokföringskontot som definieras på användarkortet kommer endast att användas för Subledger-bokföring. Den här kommer att användas för huvudboken och som standardvärde för Subledger-bokföring om ett dedikerat användarkonto på användare inte är definierat.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Redovisningskonto som standard för lönebetalningar
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=By default, leave empty the option "Automatically create a total payment" when creating a Salary
 Salary=Lön
 Salaries=Löner
-NewSalaryPayment=Ny löneutbetalning
+NewSalary=New salary
+NewSalaryPayment=New salary card
 AddSalaryPayment=Lägg till lönbetalning
 SalaryPayment=Lönebetalning
 SalariesPayments=Löneutbetalningar
+SalariesPaymentsOf=Salaries payments of %s
 ShowSalaryPayment=Visa löneutbetalning
 THM=Genomsnittlig timpris
 TJM=Genomsnittlig dagskurs
 CurrentSalary=Nuvarande lön
 THMDescription=Det här värdet kan användas för att beräkna kostnaden för tidskrävande på ett projekt som användaren har infört om modulprojekt används
 TJMDescription=Detta värde är för närvarande endast för information och används inte för någon beräkning
-LastSalaries=Senaste %s lönebetalningar
-AllSalaries=Alla lönebetalningar
+LastSalaries=Latest %s salaries
+AllSalaries=All salaries
 SalariesStatistics=Lönestatistik
-# Export
 SalariesAndPayments=Salaries and payments
+ConfirmDeleteSalaryPayment=Do you want to delete this salary payment ?
diff --git a/htdocs/langs/sv_SE/ticket.lang b/htdocs/langs/sv_SE/ticket.lang
index baa6c0eb49f..a69c8afe3f1 100644
--- a/htdocs/langs/sv_SE/ticket.lang
+++ b/htdocs/langs/sv_SE/ticket.lang
@@ -34,7 +34,8 @@ TicketDictResolution=Ticket - Resolution
 
 TicketTypeShortCOM=Kommersiell fråga
 TicketTypeShortHELP=Begäran om funktionell hjälp
-TicketTypeShortISSUE=Problem, fel eller problem
+TicketTypeShortISSUE=Issue or bug
+TicketTypeShortPROBLEM=Problem
 TicketTypeShortREQUEST=Ändrings- eller förbättringsbegäran
 TicketTypeShortPROJET=Projekt
 TicketTypeShortOTHER=Andra
@@ -54,14 +55,15 @@ TypeContact_ticket_internal_SUPPORTTEC=Tilldelad användare
 TypeContact_ticket_external_SUPPORTCLI=Kundkontakt / incidentspårning
 TypeContact_ticket_external_CONTRIBUTOR=Extern bidragsyter
 
-OriginEmail=E-postkälla
+OriginEmail=Reporter Email
 Notify_TICKET_SENTBYMAIL=Skicka biljettmeddelande via e-post
 
 # Status
 Read=Läsa
 Assigned=Tilldelad
 InProgress=Pågående
-NeedMoreInformation=Väntar på information
+NeedMoreInformation=Waiting for reporter feedback
+NeedMoreInformationShort=Waiting for feedback
 Answered=Besvarade
 Waiting=Väntar
 Closed=Stängt
@@ -160,7 +162,7 @@ CreatedBy=Skapad av
 NewTicket=Ny biljett
 SubjectAnswerToTicket=Biljettsvar
 TicketTypeRequest=Förfrågan typ
-TicketCategory=Grupp
+TicketCategory=Ticket categorization
 SeeTicket=Se biljett
 TicketMarkedAsRead=Biljett har markerats som läst
 TicketReadOn=Läs vidare
@@ -211,6 +213,7 @@ TicketMessageHelp=Endast den här texten sparas i meddelandelistan på biljettko
 TicketMessageSubstitutionReplacedByGenericValues=Substitutionsvariabler ersätts av generiska värden.
 TimeElapsedSince=Tid förflutit sedan
 TicketTimeToRead=Tid förfluten innan den läste
+TicketTimeElapsedBeforeSince=Time elapsed before / since
 TicketContacts=Kontakter biljett
 TicketDocumentsLinked=Dokument kopplade till biljett
 ConfirmReOpenTicket=Bekräfta återuppta denna biljett?
diff --git a/htdocs/langs/sv_SE/users.lang b/htdocs/langs/sv_SE/users.lang
index 7cc52b333bf..8d9cfed0737 100644
--- a/htdocs/langs/sv_SE/users.lang
+++ b/htdocs/langs/sv_SE/users.lang
@@ -97,8 +97,8 @@ LoginToCreate=Logga in för att skapa
 NameToCreate=Namn på tredje part för att skapa
 YourRole=Din roller
 YourQuotaOfUsersIsReached=Din kvot på aktiva användare är nådd!
-NbOfUsers=Antal användare
-NbOfPermissions=Antal behörigheter
+NbOfUsers=Number of users
+NbOfPermissions=Number of permissions
 DontDowngradeSuperAdmin=Endast en SuperAdmin kan nedgradera en SuperAdmin
 HierarchicalResponsible=Handledare
 HierarchicView=Hierarkisk vy
diff --git a/htdocs/langs/sv_SE/website.lang b/htdocs/langs/sv_SE/website.lang
index 1b7afa6e64e..a8ef9b50f76 100644
--- a/htdocs/langs/sv_SE/website.lang
+++ b/htdocs/langs/sv_SE/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Lägg till webbplats
 Webpage=Webbsida / container
 AddPage=Lägg till sida / behållare
 PageContainer=Sida
-PreviewOfSiteNotYetAvailable=Förhandsgranskning av din webbplats <strong> %s </strong> ej tillgänglig än. Du måste först '<strong> Importera en fullständig webbplatsmall </strong>' eller bara '<strong> Lägg till en sida / behållare </strong>'.
+PreviewOfSiteNotYetAvailable=The preview of your website <strong>%s</strong> is not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Den begärda sidan med id %s har inget innehåll ännu, eller cachefilen .tpl.php har tagits bort. Redigera innehållet på sidan för att lösa detta.
 SiteDeleted=Webbplatsen '%s' raderas
 PageContent=Page / Contenair
diff --git a/htdocs/langs/sw_SW/admin.lang b/htdocs/langs/sw_SW/admin.lang
index be9aca94599..73004a3c8b1 100644
--- a/htdocs/langs/sw_SW/admin.lang
+++ b/htdocs/langs/sw_SW/admin.lang
@@ -53,6 +53,7 @@ InternalUser=Internal user
 ExternalUser=External user
 InternalUsers=Internal users
 ExternalUsers=External users
+UserInterface=User interface
 GUISetup=Display
 SetupArea=Setup
 UploadNewTemplate=Upload new template(s)
@@ -1260,8 +1261,8 @@ YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP
 DownloadMoreSkins=More skins to download
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
-ShowProfIdInAddress=Show professional id with addresses
-ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
+ShowProfIdInAddress=Show professional ID with addresses
+ShowVATIntaInAddress=Hide intra-Community VAT number
 TranslationUncomplete=Partial translation
 MAIN_DISABLE_METEO=Disable meteorological view
 MeteoStdMod=Standard mode
@@ -1778,7 +1779,7 @@ ClickToDialSetup=Click To Dial module setup
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
 ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface, installed on the same computer as the browser, and called when you click on a link starting with "tel:" in your browser. If you need link that start with "sip:" or a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Point of Sale
 CashDeskSetup=Point of Sales module setup
@@ -2133,7 +2134,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
-NotRecommended=Not recommanded
+Recommended=Recommended
+NotRecommended=Not recommended
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
@@ -2144,3 +2146,5 @@ YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You s
 RandomlySelectedIfSeveral=Randomly selected if several pictures are available
 DatabasePasswordObfuscated=Database password is obfuscated in conf file
 DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
+APIsAreNotEnabled=APIs modules are not enabled
+YouShouldSetThisToOff=You should set this to 0 or off
diff --git a/htdocs/langs/sw_SW/banks.lang b/htdocs/langs/sw_SW/banks.lang
index df7192bee25..a0b7942d446 100644
--- a/htdocs/langs/sw_SW/banks.lang
+++ b/htdocs/langs/sw_SW/banks.lang
@@ -115,7 +115,7 @@ TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
 CheckTransmitter=Sender
 ValidateCheckReceipt=Validate this check receipt?
-ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes will be possible once validated.
 DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
diff --git a/htdocs/langs/sw_SW/boxes.lang b/htdocs/langs/sw_SW/boxes.lang
index 0c9ea302fb8..710d49bfab6 100644
--- a/htdocs/langs/sw_SW/boxes.lang
+++ b/htdocs/langs/sw_SW/boxes.lang
@@ -91,8 +91,8 @@ BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
 BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
 BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
 BoxTitleLastModifiedPropals=Latest %s modified proposals
-BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
-BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
+BoxTitleLatestModifiedJobPositions=Latest %s modified job positions
+BoxTitleLatestModifiedCandidatures=Latest %s modified job applications
 ForCustomersInvoices=Customers invoices
 ForCustomersOrders=Customers orders
 ForProposals=Proposals
diff --git a/htdocs/langs/sw_SW/cashdesk.lang b/htdocs/langs/sw_SW/cashdesk.lang
index aea1f02f834..c9d0f7fcd0a 100644
--- a/htdocs/langs/sw_SW/cashdesk.lang
+++ b/htdocs/langs/sw_SW/cashdesk.lang
@@ -127,4 +127,4 @@ AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
 ShowPriceHT = Display the column with the price excluding tax (on screen)
-ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on the receipt)
diff --git a/htdocs/langs/sw_SW/errors.lang b/htdocs/langs/sw_SW/errors.lang
index 670f8c7a6bc..85b90ca4991 100644
--- a/htdocs/langs/sw_SW/errors.lang
+++ b/htdocs/langs/sw_SW/errors.lang
@@ -301,3 +301,4 @@ ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
 ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
+ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
diff --git a/htdocs/langs/sw_SW/eventorganization.lang b/htdocs/langs/sw_SW/eventorganization.lang
index 335c257b224..f361e6bc192 100644
--- a/htdocs/langs/sw_SW/eventorganization.lang
+++ b/htdocs/langs/sw_SW/eventorganization.lang
@@ -86,6 +86,7 @@ DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
 SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
 SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
+NbVotes=Number of votes
 #
 # Status
 #
@@ -115,6 +116,9 @@ EvntOrgDuration = This conference starts on %s and ends on %s.
 ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
 BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
 EventType = Event type
+LabelOfBooth=Booth label
+LabelOfconference=Conference label
+ConferenceIsNotConfirmed=Subcription not available, conference is not confirmed yet
 
 #
 # Vote page
diff --git a/htdocs/langs/sw_SW/install.lang b/htdocs/langs/sw_SW/install.lang
index 63947dad154..c1ffee936d7 100644
--- a/htdocs/langs/sw_SW/install.lang
+++ b/htdocs/langs/sw_SW/install.lang
@@ -206,6 +206,7 @@ MigrationUserPhotoPath=Migration of photo paths for users
 MigrationFieldsSocialNetworks=Migration of users fields social networks (%s)
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
+MigrationImportOrExportProfiles=Migration of import or export profiles (%s)
 ShowNotAvailableOptions=Show unavailable options
 HideNotAvailableOptions=Hide unavailable options
 ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
diff --git a/htdocs/langs/sw_SW/interventions.lang b/htdocs/langs/sw_SW/interventions.lang
index e5936f8246e..51079fca278 100644
--- a/htdocs/langs/sw_SW/interventions.lang
+++ b/htdocs/langs/sw_SW/interventions.lang
@@ -64,3 +64,5 @@ InterLineDuration=Line duration intervention
 InterLineDesc=Line description intervention
 RepeatableIntervention=Template of intervention
 ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
+Reopen=Reopen
+ConfirmReopenIntervention=Are you sure you want to open back the intervention <b>%s</b>?
diff --git a/htdocs/langs/sw_SW/productbatch.lang b/htdocs/langs/sw_SW/productbatch.lang
index 450d0285819..763af20c6b4 100644
--- a/htdocs/langs/sw_SW/productbatch.lang
+++ b/htdocs/langs/sw_SW/productbatch.lang
@@ -26,12 +26,10 @@ ShowLogOfMovementIfLot=Show log of movements for couple product/lot
 StockDetailPerBatch=Stock detail per lot
 SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
-BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
-BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
 ManageLotMask=Custom mask
-CustomMasks=Adds an option to define mask in the product card
-LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
-SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+CustomMasks=Option to define a different numbering mask for each product
+BatchLotNumberingModules=Numbering rule for automatic generation of lot number
+BatchSerialNumberingModules=Numbering rule for automatic generation of serial number (for products with property 1 unique lot/serial for each product)
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
diff --git a/htdocs/langs/sw_SW/products.lang b/htdocs/langs/sw_SW/products.lang
index 9638dfe5a25..fecbe7450c2 100644
--- a/htdocs/langs/sw_SW/products.lang
+++ b/htdocs/langs/sw_SW/products.lang
@@ -277,7 +277,7 @@ PriceByCustomer=Different prices for each customer
 PriceCatalogue=A single sell price per product/service
 PricingRule=Rules for selling prices
 AddCustomerPrice=Add price by customer
-ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
+ForceUpdateChildPriceSoc=Set same price on customer's subsidiaries
 PriceByCustomerLog=Log of previous customer prices
 MinimumPriceLimit=Minimum price can't be lower then %s
 MinimumRecommendedPrice=Minimum recommended price is: %s
@@ -296,6 +296,7 @@ ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Child products
 MinSupplierPrice=Minimum buying price
 MinCustomerPrice=Minimum selling price
+NoDynamicPrice=No dynamic price
 DynamicPriceConfiguration=Dynamic price configuration
 DynamicPriceDesc=You may define mathematical formulae to calculate Customer or Vendor prices. Such formulas can use all mathematical operators, some constants and variables. You can define here the variables you wish to use. If the variable needs an automatic update, you may define the external URL to allow Dolibarr to update the value automatically.
 AddVariable=Add Variable
diff --git a/htdocs/langs/sw_SW/salaries.lang b/htdocs/langs/sw_SW/salaries.lang
index 7c3c08a65bd..12905040b1a 100644
--- a/htdocs/langs/sw_SW/salaries.lang
+++ b/htdocs/langs/sw_SW/salaries.lang
@@ -2,20 +2,23 @@
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=By default, leave empty the option "Automatically create a total payment" when creating a Salary
 Salary=Salary
 Salaries=Salaries
-NewSalaryPayment=New salary payment
+NewSalary=New salary
+NewSalaryPayment=New salary card
 AddSalaryPayment=Add salary payment
 SalaryPayment=Salary payment
 SalariesPayments=Salaries payments
+SalariesPaymentsOf=Salaries payments of %s
 ShowSalaryPayment=Show salary payment
 THM=Average hourly rate
 TJM=Average daily rate
 CurrentSalary=Current salary
 THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
 TJMDescription=This value is currently for information only and is not used for any calculation
-LastSalaries=Latest %s salary payments
-AllSalaries=All salary payments
+LastSalaries=Latest %s salaries
+AllSalaries=All salaries
 SalariesStatistics=Salary statistics
-# Export
 SalariesAndPayments=Salaries and payments
+ConfirmDeleteSalaryPayment=Do you want to delete this salary payment ?
diff --git a/htdocs/langs/sw_SW/ticket.lang b/htdocs/langs/sw_SW/ticket.lang
index 1da32a5a99e..a1bed39c21d 100644
--- a/htdocs/langs/sw_SW/ticket.lang
+++ b/htdocs/langs/sw_SW/ticket.lang
@@ -34,7 +34,8 @@ TicketDictResolution=Ticket - Resolution
 
 TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
-TicketTypeShortISSUE=Issue, bug or problem
+TicketTypeShortISSUE=Issue or bug
+TicketTypeShortPROBLEM=Problem
 TicketTypeShortREQUEST=Change or enhancement request
 TicketTypeShortPROJET=Project
 TicketTypeShortOTHER=Other
@@ -54,14 +55,15 @@ TypeContact_ticket_internal_SUPPORTTEC=Assigned user
 TypeContact_ticket_external_SUPPORTCLI=Customer contact / incident tracking
 TypeContact_ticket_external_CONTRIBUTOR=External contributor
 
-OriginEmail=Email source
+OriginEmail=Reporter Email
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
 Read=Read
 Assigned=Assigned
 InProgress=In progress
-NeedMoreInformation=Waiting for information
+NeedMoreInformation=Waiting for reporter feedback
+NeedMoreInformationShort=Waiting for feedback
 Answered=Answered
 Waiting=Waiting
 Closed=Closed
@@ -160,7 +162,7 @@ CreatedBy=Created by
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Group
+TicketCategory=Ticket categorization
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
@@ -211,6 +213,7 @@ TicketMessageHelp=Only this text will be saved in the message list on ticket car
 TicketMessageSubstitutionReplacedByGenericValues=Substitutions variables are replaced by generic values.
 TimeElapsedSince=Time elapsed since
 TicketTimeToRead=Time elapsed before read
+TicketTimeElapsedBeforeSince=Time elapsed before / since
 TicketContacts=Contacts ticket
 TicketDocumentsLinked=Documents linked to ticket
 ConfirmReOpenTicket=Confirm reopen this ticket ?
diff --git a/htdocs/langs/sw_SW/users.lang b/htdocs/langs/sw_SW/users.lang
index 372090ea5ad..6aeaf128838 100644
--- a/htdocs/langs/sw_SW/users.lang
+++ b/htdocs/langs/sw_SW/users.lang
@@ -97,8 +97,8 @@ LoginToCreate=Login to create
 NameToCreate=Name of third party to create
 YourRole=Your roles
 YourQuotaOfUsersIsReached=Your quota of active users is reached !
-NbOfUsers=No. of users
-NbOfPermissions=No. of permissions
+NbOfUsers=Number of users
+NbOfPermissions=Number of permissions
 DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin
 HierarchicalResponsible=Supervisor
 HierarchicView=Hierarchical view
diff --git a/htdocs/langs/sw_SW/website.lang b/htdocs/langs/sw_SW/website.lang
index 1e727415ec2..dc2ec2c0b3d 100644
--- a/htdocs/langs/sw_SW/website.lang
+++ b/htdocs/langs/sw_SW/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 PageContainer=Page
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
+PreviewOfSiteNotYetAvailable=The preview of your website <strong>%s</strong> is not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
diff --git a/htdocs/langs/th_TH/admin.lang b/htdocs/langs/th_TH/admin.lang
index 7ccdbdef6d6..9fdd0e3090a 100644
--- a/htdocs/langs/th_TH/admin.lang
+++ b/htdocs/langs/th_TH/admin.lang
@@ -53,6 +53,7 @@ InternalUser=ผู้ใช้งานภายใน
 ExternalUser=ผู้ใช้ภายนอก
 InternalUsers=ผู้ใช้ภายใน
 ExternalUsers=ผู้ใช้ภายนอก
+UserInterface=User interface
 GUISetup=แสดง
 SetupArea=การติดตั้ง
 UploadNewTemplate=Upload new template(s)
@@ -1260,8 +1261,8 @@ YourPHPDoesNotHaveSSLSupport=ฟังก์ชั่น SSL ไม่สาม
 DownloadMoreSkins=กินมากขึ้นในการดาวน์โหลด
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
-ShowProfIdInAddress=Show professional id with addresses
-ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
+ShowProfIdInAddress=Show professional ID with addresses
+ShowVATIntaInAddress=Hide intra-Community VAT number
 TranslationUncomplete=แปลบางส่วน
 MAIN_DISABLE_METEO=Disable meteorological view
 MeteoStdMod=Standard mode
@@ -1778,7 +1779,7 @@ ClickToDialSetup=คลิกเพื่อกดติดตั้งโมด
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
 ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface, installed on the same computer as the browser, and called when you click on a link starting with "tel:" in your browser. If you need link that start with "sip:" or a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Point of Sale
 CashDeskSetup=Point of Sales module setup
@@ -2133,7 +2134,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
-NotRecommended=Not recommanded
+Recommended=แนะนำ
+NotRecommended=Not recommended
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
@@ -2144,3 +2146,5 @@ YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You s
 RandomlySelectedIfSeveral=Randomly selected if several pictures are available
 DatabasePasswordObfuscated=Database password is obfuscated in conf file
 DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
+APIsAreNotEnabled=APIs modules are not enabled
+YouShouldSetThisToOff=You should set this to 0 or off
diff --git a/htdocs/langs/th_TH/banks.lang b/htdocs/langs/th_TH/banks.lang
index 9cc2fcbf33a..b21e70fecce 100644
--- a/htdocs/langs/th_TH/banks.lang
+++ b/htdocs/langs/th_TH/banks.lang
@@ -115,7 +115,7 @@ TransferTo=ไปยัง
 TransferFromToDone=<b>การถ่ายโอนจาก% s% s% s%</b> s ได้รับการบันทึก
 CheckTransmitter=ผู้ส่ง
 ValidateCheckReceipt=Validate this check receipt?
-ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes will be possible once validated.
 DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=เช็คธนาคาร
diff --git a/htdocs/langs/th_TH/boxes.lang b/htdocs/langs/th_TH/boxes.lang
index cb54d2fbf5d..5cd196d0233 100644
--- a/htdocs/langs/th_TH/boxes.lang
+++ b/htdocs/langs/th_TH/boxes.lang
@@ -91,8 +91,8 @@ BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
 BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
 BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
 BoxTitleLastModifiedPropals=Latest %s modified proposals
-BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
-BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
+BoxTitleLatestModifiedJobPositions=Latest %s modified job positions
+BoxTitleLatestModifiedCandidatures=Latest %s modified job applications
 ForCustomersInvoices=ใบแจ้งหนี้ลูกค้า
 ForCustomersOrders=คำสั่งซื้อของลูกค้า
 ForProposals=ข้อเสนอ
diff --git a/htdocs/langs/th_TH/cashdesk.lang b/htdocs/langs/th_TH/cashdesk.lang
index d8717b96ff0..461f60e430f 100644
--- a/htdocs/langs/th_TH/cashdesk.lang
+++ b/htdocs/langs/th_TH/cashdesk.lang
@@ -127,4 +127,4 @@ AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
 ShowPriceHT = Display the column with the price excluding tax (on screen)
-ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on the receipt)
diff --git a/htdocs/langs/th_TH/errors.lang b/htdocs/langs/th_TH/errors.lang
index 090c30a1615..337c107080e 100644
--- a/htdocs/langs/th_TH/errors.lang
+++ b/htdocs/langs/th_TH/errors.lang
@@ -301,3 +301,4 @@ ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
 ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
+ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
diff --git a/htdocs/langs/th_TH/eventorganization.lang b/htdocs/langs/th_TH/eventorganization.lang
index ca7b7131745..8e53798586d 100644
--- a/htdocs/langs/th_TH/eventorganization.lang
+++ b/htdocs/langs/th_TH/eventorganization.lang
@@ -86,6 +86,7 @@ DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
 SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
 SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
+NbVotes=Number of votes
 #
 # Status
 #
@@ -115,6 +116,9 @@ EvntOrgDuration = This conference starts on %s and ends on %s.
 ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
 BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
 EventType = ประเภทเหตุการณ์
+LabelOfBooth=Booth label
+LabelOfconference=Conference label
+ConferenceIsNotConfirmed=Subcription not available, conference is not confirmed yet
 
 #
 # Vote page
diff --git a/htdocs/langs/th_TH/install.lang b/htdocs/langs/th_TH/install.lang
index 1f0b347ade6..cf01cdc0adf 100644
--- a/htdocs/langs/th_TH/install.lang
+++ b/htdocs/langs/th_TH/install.lang
@@ -206,6 +206,7 @@ MigrationUserPhotoPath=Migration of photo paths for users
 MigrationFieldsSocialNetworks=Migration of users fields social networks (%s)
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
+MigrationImportOrExportProfiles=Migration of import or export profiles (%s)
 ShowNotAvailableOptions=Show unavailable options
 HideNotAvailableOptions=Hide unavailable options
 ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
diff --git a/htdocs/langs/th_TH/interventions.lang b/htdocs/langs/th_TH/interventions.lang
index dd10bf804e4..d93029a85ec 100644
--- a/htdocs/langs/th_TH/interventions.lang
+++ b/htdocs/langs/th_TH/interventions.lang
@@ -64,3 +64,5 @@ InterLineDuration=Line duration intervention
 InterLineDesc=Line description intervention
 RepeatableIntervention=Template of intervention
 ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
+Reopen=เปิดใหม่
+ConfirmReopenIntervention=Are you sure you want to open back the intervention <b>%s</b>?
diff --git a/htdocs/langs/th_TH/productbatch.lang b/htdocs/langs/th_TH/productbatch.lang
index d6e80c1675b..c9c1e8aa345 100644
--- a/htdocs/langs/th_TH/productbatch.lang
+++ b/htdocs/langs/th_TH/productbatch.lang
@@ -26,12 +26,10 @@ ShowLogOfMovementIfLot=Show log of movements for couple product/lot
 StockDetailPerBatch=Stock detail per lot
 SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
-BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
-BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
 ManageLotMask=Custom mask
-CustomMasks=Adds an option to define mask in the product card
-LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
-SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+CustomMasks=Option to define a different numbering mask for each product
+BatchLotNumberingModules=Numbering rule for automatic generation of lot number
+BatchSerialNumberingModules=Numbering rule for automatic generation of serial number (for products with property 1 unique lot/serial for each product)
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
diff --git a/htdocs/langs/th_TH/products.lang b/htdocs/langs/th_TH/products.lang
index e0c9a34bc0d..feb1e200dde 100644
--- a/htdocs/langs/th_TH/products.lang
+++ b/htdocs/langs/th_TH/products.lang
@@ -277,7 +277,7 @@ PriceByCustomer=Different prices for each customer
 PriceCatalogue=A single sell price per product/service
 PricingRule=Rules for selling prices
 AddCustomerPrice=เพิ่มราคาโดยลูกค้า
-ForceUpdateChildPriceSoc=ตั้งราคาเดียวกันกับ บริษัท ย่อยของลูกค้า
+ForceUpdateChildPriceSoc=Set same price on customer's subsidiaries
 PriceByCustomerLog=Log of previous customer prices
 MinimumPriceLimit=ราคาขั้นต่ำไม่สามารถจะลดลงแล้ว% s
 MinimumRecommendedPrice=Minimum recommended price is: %s
@@ -296,6 +296,7 @@ ComposedProductIncDecStock=เพิ่มขึ้น / ลดลงหุ้
 ComposedProduct=Child products
 MinSupplierPrice=ราคารับซื้อขั้นต่ำ
 MinCustomerPrice=Minimum selling price
+NoDynamicPrice=No dynamic price
 DynamicPriceConfiguration=การกำหนดค่าราคาแบบไดนามิก
 DynamicPriceDesc=You may define mathematical formulae to calculate Customer or Vendor prices. Such formulas can use all mathematical operators, some constants and variables. You can define here the variables you wish to use. If the variable needs an automatic update, you may define the external URL to allow Dolibarr to update the value automatically.
 AddVariable=Add Variable
diff --git a/htdocs/langs/th_TH/salaries.lang b/htdocs/langs/th_TH/salaries.lang
index c9e3d27c545..751ac6ec2c0 100644
--- a/htdocs/langs/th_TH/salaries.lang
+++ b/htdocs/langs/th_TH/salaries.lang
@@ -2,20 +2,23 @@
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=By default, leave empty the option "Automatically create a total payment" when creating a Salary
 Salary=เงินเดือน
 Salaries=เงินเดือน
-NewSalaryPayment=การชำระเงินเงินเดือนใหม่
+NewSalary=New salary
+NewSalaryPayment=New salary card
 AddSalaryPayment=Add salary payment
 SalaryPayment=การชำระเงินเงินเดือน
 SalariesPayments=การชำระเงินเงินเดือน
+SalariesPaymentsOf=Salaries payments of %s
 ShowSalaryPayment=แสดงการชำระเงินเงินเดือน
 THM=Average hourly rate
 TJM=Average daily rate
 CurrentSalary=เงินเดือนปัจจุบัน
 THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
 TJMDescription=This value is currently for information only and is not used for any calculation
-LastSalaries=Latest %s salary payments
-AllSalaries=All salary payments
+LastSalaries=Latest %s salaries
+AllSalaries=All salaries
 SalariesStatistics=Salary statistics
-# Export
 SalariesAndPayments=Salaries and payments
+ConfirmDeleteSalaryPayment=Do you want to delete this salary payment ?
diff --git a/htdocs/langs/th_TH/ticket.lang b/htdocs/langs/th_TH/ticket.lang
index 88d644556fd..9e48df55a19 100644
--- a/htdocs/langs/th_TH/ticket.lang
+++ b/htdocs/langs/th_TH/ticket.lang
@@ -34,7 +34,8 @@ TicketDictResolution=Ticket - Resolution
 
 TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
-TicketTypeShortISSUE=Issue, bug or problem
+TicketTypeShortISSUE=Issue or bug
+TicketTypeShortPROBLEM=Problem
 TicketTypeShortREQUEST=Change or enhancement request
 TicketTypeShortPROJET=โครงการ
 TicketTypeShortOTHER=อื่น ๆ
@@ -54,14 +55,15 @@ TypeContact_ticket_internal_SUPPORTTEC=Assigned user
 TypeContact_ticket_external_SUPPORTCLI=Customer contact / incident tracking
 TypeContact_ticket_external_CONTRIBUTOR=External contributor
 
-OriginEmail=Email source
+OriginEmail=Reporter Email
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
 Read=อ่าน
 Assigned=Assigned
 InProgress=In progress
-NeedMoreInformation=Waiting for information
+NeedMoreInformation=Waiting for reporter feedback
+NeedMoreInformationShort=Waiting for feedback
 Answered=Answered
 Waiting=ที่รอ
 Closed=ปิด
@@ -160,7 +162,7 @@ CreatedBy=Created by
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=กลุ่ม
+TicketCategory=Ticket categorization
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
@@ -211,6 +213,7 @@ TicketMessageHelp=Only this text will be saved in the message list on ticket car
 TicketMessageSubstitutionReplacedByGenericValues=Substitutions variables are replaced by generic values.
 TimeElapsedSince=Time elapsed since
 TicketTimeToRead=Time elapsed before read
+TicketTimeElapsedBeforeSince=Time elapsed before / since
 TicketContacts=Contacts ticket
 TicketDocumentsLinked=Documents linked to ticket
 ConfirmReOpenTicket=Confirm reopen this ticket ?
diff --git a/htdocs/langs/th_TH/users.lang b/htdocs/langs/th_TH/users.lang
index d67563b1b1c..a74e78828a5 100644
--- a/htdocs/langs/th_TH/users.lang
+++ b/htdocs/langs/th_TH/users.lang
@@ -97,8 +97,8 @@ LoginToCreate=เข้าสู่ระบบที่จะสร้าง
 NameToCreate=ชื่อของบุคคลที่สามในการสร้าง
 YourRole=บทบาทของคุณ
 YourQuotaOfUsersIsReached=โควต้าของคุณของผู้ใช้ที่ใช้งานถึง!
-NbOfUsers=No. of users
-NbOfPermissions=No. of permissions
+NbOfUsers=Number of users
+NbOfPermissions=Number of permissions
 DontDowngradeSuperAdmin=เพียง superadmin สามารถปรับลด superadmin
 HierarchicalResponsible=ผู้ดูแล
 HierarchicView=มุมมองลำดับชั้น
diff --git a/htdocs/langs/th_TH/website.lang b/htdocs/langs/th_TH/website.lang
index a33a6c95dca..ac753fb4c7b 100644
--- a/htdocs/langs/th_TH/website.lang
+++ b/htdocs/langs/th_TH/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 PageContainer=หน้า
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
+PreviewOfSiteNotYetAvailable=The preview of your website <strong>%s</strong> is not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
diff --git a/htdocs/langs/tr_TR/admin.lang b/htdocs/langs/tr_TR/admin.lang
index 66a16a06ae5..9b954487839 100644
--- a/htdocs/langs/tr_TR/admin.lang
+++ b/htdocs/langs/tr_TR/admin.lang
@@ -53,6 +53,7 @@ InternalUser=İç kullanıcı
 ExternalUser=Dış kullanıcı
 InternalUsers=İç kullanıcılar
 ExternalUsers=Dış kullanıcılar
+UserInterface=User interface
 GUISetup=Ekran
 SetupArea=Ayarlar
 UploadNewTemplate=Yeni şablon(lar) yükleyin
@@ -1260,8 +1261,8 @@ YourPHPDoesNotHaveSSLSupport=SSL fonksiyonları PHP nizde mevcut değildir
 DownloadMoreSkins=Daha fazla kaplama indirin
 SimpleNumRefModelDesc=Referans numarasını% yyyyaa-nnnn biçiminde döndürür; burada yy yıl, aa ay ve nnnn sıfırlama olmadan sıralı otomatik artan bir sayıdır
 SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
-ShowProfIdInAddress=Adreslerle profesyonel kimliği göster
-ShowVATIntaInAddress=Adreslerde Vergi numarasını gizle
+ShowProfIdInAddress=Show professional ID with addresses
+ShowVATIntaInAddress=Hide intra-Community VAT number
 TranslationUncomplete=Kısmi çeviri
 MAIN_DISABLE_METEO=Meteorolojik görünümü devre dışı bırak
 MeteoStdMod=Standart mod
@@ -1778,7 +1779,7 @@ ClickToDialSetup=TıklaAra modülü kurulumu
 ClickToDialUrlDesc=Telefon picto tıklandığında URL aranır. URL’de, aranacak kişinin telefon numarasıyla değiştirilecek<br><b>__PHONETO__</b> etiketleri kullanabilirsiniz<br><b>__PHONEFROM__</b> bu aramanın telefon numarasıyla değiştirilir kişi (sizinki)<br><b>__LOGIN__</b> tuşla arama ile değiştirilecek (kullanıcı kartında tanımlı)<br><b>__PASS__</b> tıklama-çevirme şifresiyle değiştirilecek (kullanıcıda tanımlı kartı).
 ClickToDialDesc=Bu modül, bir masaüstü bilgisayar kullanırken telefon numaralarını tıklanabilir bağlantılara dönüştürür. Bir tıklama numarayı arayacaktır. Bu, masaüstünüzde yazılım telefonu kullanırken veya SIP protokolüne dayalı bir CTI sistemi kullanırken telefon görüşmesini başlatmak için kullanılabilir. Not: Akıllı telefon kullanırken telefon numaraları her zaman tıklanabilir.
 ClickToDialUseTelLink=Telefon numaraları üzerinde yalnızca bir "tel:" linki kullan
-ClickToDialUseTelLinkDesc=Kullanıcılarınızın tarayıcıyla aynı bilgisayarda bir yazılım telefonu veya yazılım arayüzü kuruluysa ve tarayıcınızda "tel:" ile başlayan bir bağlantıya tıkladığınızda arandığında bu yöntemi kullanın. Tam bir sunucu çözümüne ihtiyacınız varsa (yerel yazılım kurulumuna gerek yoktur), bunu "Hayır" olarak ayarlamanız ve sonraki alanı doldurmanız gerekir.
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface, installed on the same computer as the browser, and called when you click on a link starting with "tel:" in your browser. If you need link that start with "sip:" or a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Satış Noktası
 CashDeskSetup=Satış Noktası modülü kurulumu
@@ -2133,7 +2134,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=Kök dizininizde ortak programların yazılabilir dosyaları veya dizinleri bulunamadı (İyi)
 RecommendedValueIs=Önerilen: %s
-NotRecommended=Not recommanded
+Recommended=Önerilen
+NotRecommended=Not recommended
 ARestrictedPath=Kısıtlı bir yol
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
@@ -2144,3 +2146,5 @@ YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You s
 RandomlySelectedIfSeveral=Randomly selected if several pictures are available
 DatabasePasswordObfuscated=Database password is obfuscated in conf file
 DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
+APIsAreNotEnabled=APIs modules are not enabled
+YouShouldSetThisToOff=You should set this to 0 or off
diff --git a/htdocs/langs/tr_TR/banks.lang b/htdocs/langs/tr_TR/banks.lang
index 33392145699..579e901c913 100644
--- a/htdocs/langs/tr_TR/banks.lang
+++ b/htdocs/langs/tr_TR/banks.lang
@@ -115,7 +115,7 @@ TransferTo=Kime
 TransferFromToDone=<b>%s</b> den <b>%s</b> nin <b>%s</b> %s ne bir transfer kaydedildi.
 CheckTransmitter=Gönderen
 ValidateCheckReceipt=Bu çek makbuzu doğrulansın mı?
-ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes will be possible once validated.
 DeleteCheckReceipt=Bu çek makbuzu silinsin mi?
 ConfirmDeleteCheckReceipt=Bu çek makbuzunu silmek istediğinizden emin misiniz?
 BankChecks=Banka çekleri
diff --git a/htdocs/langs/tr_TR/boxes.lang b/htdocs/langs/tr_TR/boxes.lang
index 54f28af256e..7be1e8540f5 100644
--- a/htdocs/langs/tr_TR/boxes.lang
+++ b/htdocs/langs/tr_TR/boxes.lang
@@ -91,8 +91,8 @@ BoxTitleLatestModifiedSupplierOrders=Tedarikçi Siparişleri: değiştirilen son
 BoxTitleLastModifiedCustomerBills=Müşteri Faturaları: değiştirilen son %s
 BoxTitleLastModifiedCustomerOrders=Müşteri Siparişleri: son değiştirilen %s
 BoxTitleLastModifiedPropals=Değiştirilen son %s teklif
-BoxTitleLatestModifiedJobPositions=En son %s değiştirilmiş iş
-BoxTitleLatestModifiedCandidatures=En son %s değiştirilmiş aday
+BoxTitleLatestModifiedJobPositions=Latest %s modified job positions
+BoxTitleLatestModifiedCandidatures=Latest %s modified job applications
 ForCustomersInvoices=Müşteri faturaları
 ForCustomersOrders=Müşteri siparişleri
 ForProposals=Teklifler
diff --git a/htdocs/langs/tr_TR/cashdesk.lang b/htdocs/langs/tr_TR/cashdesk.lang
index 1f99e1ee669..8987db08445 100644
--- a/htdocs/langs/tr_TR/cashdesk.lang
+++ b/htdocs/langs/tr_TR/cashdesk.lang
@@ -127,4 +127,4 @@ AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
 ShowPriceHT = Display the column with the price excluding tax (on screen)
-ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on the receipt)
diff --git a/htdocs/langs/tr_TR/errors.lang b/htdocs/langs/tr_TR/errors.lang
index 2364028dd00..3c5f5780afe 100644
--- a/htdocs/langs/tr_TR/errors.lang
+++ b/htdocs/langs/tr_TR/errors.lang
@@ -301,3 +301,4 @@ ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
 ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
+ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
diff --git a/htdocs/langs/tr_TR/eventorganization.lang b/htdocs/langs/tr_TR/eventorganization.lang
index a295bf90631..a11ed713d9f 100644
--- a/htdocs/langs/tr_TR/eventorganization.lang
+++ b/htdocs/langs/tr_TR/eventorganization.lang
@@ -86,6 +86,7 @@ DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
 SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
 SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
+NbVotes=Number of votes
 #
 # Status
 #
@@ -115,6 +116,9 @@ EvntOrgDuration = This conference starts on %s and ends on %s.
 ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
 BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
 EventType = Etkinlik türü
+LabelOfBooth=Booth label
+LabelOfconference=Conference label
+ConferenceIsNotConfirmed=Subcription not available, conference is not confirmed yet
 
 #
 # Vote page
diff --git a/htdocs/langs/tr_TR/install.lang b/htdocs/langs/tr_TR/install.lang
index b7b2c338f16..0456df5b134 100644
--- a/htdocs/langs/tr_TR/install.lang
+++ b/htdocs/langs/tr_TR/install.lang
@@ -206,6 +206,7 @@ MigrationUserPhotoPath=Migration of photo paths for users
 MigrationFieldsSocialNetworks=Migration of users fields social networks (%s)
 MigrationReloadModule=Modülü yeniden yükle %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
+MigrationImportOrExportProfiles=Migration of import or export profiles (%s)
 ShowNotAvailableOptions=Kullanılamayan seçenekleri göster
 HideNotAvailableOptions=Kullanılamayan seçenekleri gizle
 ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
diff --git a/htdocs/langs/tr_TR/interventions.lang b/htdocs/langs/tr_TR/interventions.lang
index f29757a0b21..0ef4a245b2c 100644
--- a/htdocs/langs/tr_TR/interventions.lang
+++ b/htdocs/langs/tr_TR/interventions.lang
@@ -64,3 +64,5 @@ InterLineDuration=Müdahele satır süresi
 InterLineDesc=Müdahele satır açıklaması
 RepeatableIntervention=Template of intervention
 ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
+Reopen=Yeniden aç
+ConfirmReopenIntervention=Are you sure you want to open back the intervention <b>%s</b>?
diff --git a/htdocs/langs/tr_TR/productbatch.lang b/htdocs/langs/tr_TR/productbatch.lang
index e59b4b50a32..33b40f9dd5b 100644
--- a/htdocs/langs/tr_TR/productbatch.lang
+++ b/htdocs/langs/tr_TR/productbatch.lang
@@ -26,12 +26,10 @@ ShowLogOfMovementIfLot=Çift ürün/parti için hareket günlüğünü göster
 StockDetailPerBatch=Parti başına stok detayı
 SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
-BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
-BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
 ManageLotMask=Custom mask
-CustomMasks=Adds an option to define mask in the product card
-LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
-SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+CustomMasks=Option to define a different numbering mask for each product
+BatchLotNumberingModules=Numbering rule for automatic generation of lot number
+BatchSerialNumberingModules=Numbering rule for automatic generation of serial number (for products with property 1 unique lot/serial for each product)
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
diff --git a/htdocs/langs/tr_TR/products.lang b/htdocs/langs/tr_TR/products.lang
index d8b6348e453..8fc25d0e9ab 100644
--- a/htdocs/langs/tr_TR/products.lang
+++ b/htdocs/langs/tr_TR/products.lang
@@ -277,7 +277,7 @@ PriceByCustomer=Her müşteri için farklı fiyatlar
 PriceCatalogue=Her ürün/hizmet için tek bir satış fiyatı
 PricingRule=Satış fiyatları için kurallar
 AddCustomerPrice=Müşteriye göre fiyat ekle
-ForceUpdateChildPriceSoc=Müşterinin ortaklılarına aynı fiyatı uygula
+ForceUpdateChildPriceSoc=Set same price on customer's subsidiaries
 PriceByCustomerLog=Önceki müşteri fiyatlarının kaydı
 MinimumPriceLimit=En düşük fiyat bundan düşük olamaz %s
 MinimumRecommendedPrice=Önerilen en düşük fiyat: %s
@@ -296,6 +296,7 @@ ComposedProductIncDecStock=Ana değişimde stok Arttır/Eksilt
 ComposedProduct=Alt ürün
 MinSupplierPrice=Minimum alış fiyatı
 MinCustomerPrice=Minimum satış fiyatı
+NoDynamicPrice=No dynamic price
 DynamicPriceConfiguration=Dinamik fiyat yapılandırması
 DynamicPriceDesc=Müşteri veya Tedarikçi fiyatlarını hesaplamak için matematiksel formüller tanımlayabilirsiniz. Bu formüller tüm matematiksel operatörleri, bazı sabitleri ve değişkenleri kullanabilir. Burada kullanmak istediğiniz değişkenleri tanımayabilirsiniz. Eğer değişkenin otomatik olarak güncellenmesi gerekiyorsa, Dolibarr'ın bu değeri otomatik olarak güncellemesini sağlamak için harici URL tanımlayabilirsiniz.
 AddVariable=Değişken ekle
diff --git a/htdocs/langs/tr_TR/salaries.lang b/htdocs/langs/tr_TR/salaries.lang
index 59da3ded507..38d2580a787 100644
--- a/htdocs/langs/tr_TR/salaries.lang
+++ b/htdocs/langs/tr_TR/salaries.lang
@@ -2,20 +2,23 @@
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Kullanıcı üçüncü tarafları için kullanılan muhasebe hesabı
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Ücret ödemeleri için varsayılan muhasebe hesabı
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=By default, leave empty the option "Automatically create a total payment" when creating a Salary
 Salary=Ücret
 Salaries=Ücretler
-NewSalaryPayment=Yeni ücret ödemesi
+NewSalary=New salary
+NewSalaryPayment=New salary card
 AddSalaryPayment=Maaş ödemesi ekle
 SalaryPayment=Ücret ödemesi
 SalariesPayments=Ücret ödemeleri
+SalariesPaymentsOf=Salaries payments of %s
 ShowSalaryPayment=Ücret ödemesi göster
 THM=Ortalama saat ücreti
 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 harcanan zamanın maliyetini hesaplamak için kullanılabilir
 TJMDescription=Bu değer şu anda yalnızca bilgi amaçlıdır ve herhangi bir hesaplama için kullanılmaz
-LastSalaries=Son %s maaş ödemeleri
-AllSalaries=Tüm maaş ödemeleri
+LastSalaries=Latest %s salaries
+AllSalaries=All salaries
 SalariesStatistics=Maaş istatistikleri
-# Export
 SalariesAndPayments=Maaşlar ve ödemeler
+ConfirmDeleteSalaryPayment=Do you want to delete this salary payment ?
diff --git a/htdocs/langs/tr_TR/ticket.lang b/htdocs/langs/tr_TR/ticket.lang
index e2535207a54..051e4afd181 100644
--- a/htdocs/langs/tr_TR/ticket.lang
+++ b/htdocs/langs/tr_TR/ticket.lang
@@ -34,7 +34,8 @@ TicketDictResolution=Destek Bildirimi - Çözüm
 
 TicketTypeShortCOM=Ticari soru
 TicketTypeShortHELP=Request for functionnal help
-TicketTypeShortISSUE=Issue, bug or problem
+TicketTypeShortISSUE=Issue or bug
+TicketTypeShortPROBLEM=Problem
 TicketTypeShortREQUEST=Change or enhancement request
 TicketTypeShortPROJET=Proje
 TicketTypeShortOTHER=Diğer
@@ -54,14 +55,15 @@ TypeContact_ticket_internal_SUPPORTTEC=Atanan kullanıcı
 TypeContact_ticket_external_SUPPORTCLI=Customer contact / incident tracking
 TypeContact_ticket_external_CONTRIBUTOR=Dış iştirakçi
 
-OriginEmail=E-posta kaynağı
+OriginEmail=Reporter Email
 Notify_TICKET_SENTBYMAIL=Destek bildirimini e-posta ile gönderil
 
 # Status
 Read=Okundu
 Assigned=Atanan
 InProgress=Devam etmekte
-NeedMoreInformation=Bilgi bekleniyor
+NeedMoreInformation=Waiting for reporter feedback
+NeedMoreInformationShort=Waiting for feedback
 Answered=Cevaplandı
 Waiting=Bekliyor
 Closed=Kapalı
@@ -160,7 +162,7 @@ CreatedBy=Oluşturan
 NewTicket=Yeni destek bildirimi
 SubjectAnswerToTicket=Destek bildirimi cevabı
 TicketTypeRequest=İstek türü
-TicketCategory=Grup
+TicketCategory=Ticket categorization
 SeeTicket=Destek bildirimini gör
 TicketMarkedAsRead=Destek bildirimi okundu olarak işaretlendi
 TicketReadOn=Okumaya devam et
@@ -211,6 +213,7 @@ TicketMessageHelp=Destek bildirimi kartı üzerindeki mesaj listesinde sadece bu
 TicketMessageSubstitutionReplacedByGenericValues=Substitutions variables are replaced by generic values.
 TimeElapsedSince=Time elapsed since
 TicketTimeToRead=Time elapsed before read
+TicketTimeElapsedBeforeSince=Time elapsed before / since
 TicketContacts=Kişilerin destek bildirimleri
 TicketDocumentsLinked=Destek bildirimine bağlı dokümanlar
 ConfirmReOpenTicket=Bu destek bildirimini yeniden açmayı onaylıyor musunuz?
diff --git a/htdocs/langs/tr_TR/users.lang b/htdocs/langs/tr_TR/users.lang
index c7f0e909b21..87b11dccf85 100644
--- a/htdocs/langs/tr_TR/users.lang
+++ b/htdocs/langs/tr_TR/users.lang
@@ -97,8 +97,8 @@ LoginToCreate=Oluşturulacak kullanıcı adı
 NameToCreate=Oluşturulacak Üçüncü Parti Adı
 YourRole=Sizin rolünüz
 YourQuotaOfUsersIsReached=Aktif kullanıcı kotanıza ulaşıldı!
-NbOfUsers=Kullanıcı sayısı
-NbOfPermissions=İzinlerin sayısı
+NbOfUsers=Number of users
+NbOfPermissions=Number of permissions
 DontDowngradeSuperAdmin=Yalnızca bir SuperAdmin, bir SuperAdmin’inin derecesini düşürebilir
 HierarchicalResponsible=Yönetici
 HierarchicView=Sıradüzeni Görünümü
diff --git a/htdocs/langs/tr_TR/website.lang b/htdocs/langs/tr_TR/website.lang
index 91241e7e615..a5f17ffa5b5 100644
--- a/htdocs/langs/tr_TR/website.lang
+++ b/htdocs/langs/tr_TR/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Web sitesi ekle
 Webpage=Web sayfası/kapsayıcı
 AddPage=Sayfa/kapsayıcı ekle
 PageContainer=Sayfa
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
+PreviewOfSiteNotYetAvailable=The preview of your website <strong>%s</strong> is not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=İstenen %s kimlik numaralı sayfa henüz bir içeriğe sahip değil, önbellek dosyası .tpl.php kaldırıldı. Bu sorunu çözmek için sayfa içeriğini düzenleyin.
 SiteDeleted='%s' web sitesi silindi
 PageContent=Sayfa/Kapsayıcı
diff --git a/htdocs/langs/uk_UA/admin.lang b/htdocs/langs/uk_UA/admin.lang
index 4489f4f66a8..79742de6191 100644
--- a/htdocs/langs/uk_UA/admin.lang
+++ b/htdocs/langs/uk_UA/admin.lang
@@ -53,6 +53,7 @@ InternalUser=Внутрішній користувач
 ExternalUser=Зовнішній користувач
 InternalUsers=Внутрішні користувачі
 ExternalUsers=Зовнішні користувачі
+UserInterface=User interface
 GUISetup=Зовнішній вигляд
 SetupArea=Налаштування
 UploadNewTemplate=Завантажити новий шаблон(и)
@@ -1260,8 +1261,8 @@ YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP
 DownloadMoreSkins=More skins to download
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
-ShowProfIdInAddress=Show professional id with addresses
-ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
+ShowProfIdInAddress=Show professional ID with addresses
+ShowVATIntaInAddress=Hide intra-Community VAT number
 TranslationUncomplete=Partial translation
 MAIN_DISABLE_METEO=Disable meteorological view
 MeteoStdMod=Standard mode
@@ -1778,7 +1779,7 @@ ClickToDialSetup=Click To Dial module setup
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
 ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface, installed on the same computer as the browser, and called when you click on a link starting with "tel:" in your browser. If you need link that start with "sip:" or a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Point of Sale
 CashDeskSetup=Point of Sales module setup
@@ -2133,7 +2134,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
-NotRecommended=Not recommanded
+Recommended=Рекомендована
+NotRecommended=Not recommended
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
@@ -2144,3 +2146,5 @@ YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You s
 RandomlySelectedIfSeveral=Randomly selected if several pictures are available
 DatabasePasswordObfuscated=Database password is obfuscated in conf file
 DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
+APIsAreNotEnabled=APIs modules are not enabled
+YouShouldSetThisToOff=You should set this to 0 or off
diff --git a/htdocs/langs/uk_UA/banks.lang b/htdocs/langs/uk_UA/banks.lang
index 40801051935..98a3d502087 100644
--- a/htdocs/langs/uk_UA/banks.lang
+++ b/htdocs/langs/uk_UA/banks.lang
@@ -115,7 +115,7 @@ TransferTo=Покупець
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
 CheckTransmitter=Відправник
 ValidateCheckReceipt=Validate this check receipt?
-ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes will be possible once validated.
 DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
diff --git a/htdocs/langs/uk_UA/boxes.lang b/htdocs/langs/uk_UA/boxes.lang
index d61c1c309f0..f89b0b60395 100644
--- a/htdocs/langs/uk_UA/boxes.lang
+++ b/htdocs/langs/uk_UA/boxes.lang
@@ -91,8 +91,8 @@ BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
 BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
 BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
 BoxTitleLastModifiedPropals=Latest %s modified proposals
-BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
-BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
+BoxTitleLatestModifiedJobPositions=Latest %s modified job positions
+BoxTitleLatestModifiedCandidatures=Latest %s modified job applications
 ForCustomersInvoices=Рахунки-фактури покупців
 ForCustomersOrders=Замовлення клієнтів
 ForProposals=Пропозиції
diff --git a/htdocs/langs/uk_UA/cashdesk.lang b/htdocs/langs/uk_UA/cashdesk.lang
index e6fad46fd10..8630dee62ee 100644
--- a/htdocs/langs/uk_UA/cashdesk.lang
+++ b/htdocs/langs/uk_UA/cashdesk.lang
@@ -127,4 +127,4 @@ AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
 ShowPriceHT = Display the column with the price excluding tax (on screen)
-ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on the receipt)
diff --git a/htdocs/langs/uk_UA/errors.lang b/htdocs/langs/uk_UA/errors.lang
index 670f8c7a6bc..85b90ca4991 100644
--- a/htdocs/langs/uk_UA/errors.lang
+++ b/htdocs/langs/uk_UA/errors.lang
@@ -301,3 +301,4 @@ ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
 ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
+ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
diff --git a/htdocs/langs/uk_UA/eventorganization.lang b/htdocs/langs/uk_UA/eventorganization.lang
index 1164a61e175..fa5536fe20a 100644
--- a/htdocs/langs/uk_UA/eventorganization.lang
+++ b/htdocs/langs/uk_UA/eventorganization.lang
@@ -86,6 +86,7 @@ DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
 SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
 SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
+NbVotes=Number of votes
 #
 # Status
 #
@@ -115,6 +116,9 @@ EvntOrgDuration = This conference starts on %s and ends on %s.
 ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
 BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
 EventType = Event type
+LabelOfBooth=Booth label
+LabelOfconference=Conference label
+ConferenceIsNotConfirmed=Subcription not available, conference is not confirmed yet
 
 #
 # Vote page
diff --git a/htdocs/langs/uk_UA/install.lang b/htdocs/langs/uk_UA/install.lang
index 63947dad154..c1ffee936d7 100644
--- a/htdocs/langs/uk_UA/install.lang
+++ b/htdocs/langs/uk_UA/install.lang
@@ -206,6 +206,7 @@ MigrationUserPhotoPath=Migration of photo paths for users
 MigrationFieldsSocialNetworks=Migration of users fields social networks (%s)
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
+MigrationImportOrExportProfiles=Migration of import or export profiles (%s)
 ShowNotAvailableOptions=Show unavailable options
 HideNotAvailableOptions=Hide unavailable options
 ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
diff --git a/htdocs/langs/uk_UA/interventions.lang b/htdocs/langs/uk_UA/interventions.lang
index 69872dae7de..3f9dd22d33d 100644
--- a/htdocs/langs/uk_UA/interventions.lang
+++ b/htdocs/langs/uk_UA/interventions.lang
@@ -64,3 +64,5 @@ InterLineDuration=Line duration intervention
 InterLineDesc=Line description intervention
 RepeatableIntervention=Template of intervention
 ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
+Reopen=Reopen
+ConfirmReopenIntervention=Are you sure you want to open back the intervention <b>%s</b>?
diff --git a/htdocs/langs/uk_UA/productbatch.lang b/htdocs/langs/uk_UA/productbatch.lang
index 57dcb3fe2ff..4a0eb78d026 100644
--- a/htdocs/langs/uk_UA/productbatch.lang
+++ b/htdocs/langs/uk_UA/productbatch.lang
@@ -26,12 +26,10 @@ ShowLogOfMovementIfLot=Show log of movements for couple product/lot
 StockDetailPerBatch=Stock detail per lot
 SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
-BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
-BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
 ManageLotMask=Custom mask
-CustomMasks=Adds an option to define mask in the product card
-LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
-SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+CustomMasks=Option to define a different numbering mask for each product
+BatchLotNumberingModules=Numbering rule for automatic generation of lot number
+BatchSerialNumberingModules=Numbering rule for automatic generation of serial number (for products with property 1 unique lot/serial for each product)
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
diff --git a/htdocs/langs/uk_UA/products.lang b/htdocs/langs/uk_UA/products.lang
index fab11e7d273..7977dd1f9bd 100644
--- a/htdocs/langs/uk_UA/products.lang
+++ b/htdocs/langs/uk_UA/products.lang
@@ -277,7 +277,7 @@ PriceByCustomer=Different prices for each customer
 PriceCatalogue=A single sell price per product/service
 PricingRule=Rules for selling prices
 AddCustomerPrice=Add price by customer
-ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
+ForceUpdateChildPriceSoc=Set same price on customer's subsidiaries
 PriceByCustomerLog=Log of previous customer prices
 MinimumPriceLimit=Minimum price can't be lower then %s
 MinimumRecommendedPrice=Minimum recommended price is: %s
@@ -296,6 +296,7 @@ ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Child products
 MinSupplierPrice=Minimum buying price
 MinCustomerPrice=Minimum selling price
+NoDynamicPrice=No dynamic price
 DynamicPriceConfiguration=Dynamic price configuration
 DynamicPriceDesc=You may define mathematical formulae to calculate Customer or Vendor prices. Such formulas can use all mathematical operators, some constants and variables. You can define here the variables you wish to use. If the variable needs an automatic update, you may define the external URL to allow Dolibarr to update the value automatically.
 AddVariable=Add Variable
diff --git a/htdocs/langs/uk_UA/salaries.lang b/htdocs/langs/uk_UA/salaries.lang
index 7c3c08a65bd..12905040b1a 100644
--- a/htdocs/langs/uk_UA/salaries.lang
+++ b/htdocs/langs/uk_UA/salaries.lang
@@ -2,20 +2,23 @@
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=By default, leave empty the option "Automatically create a total payment" when creating a Salary
 Salary=Salary
 Salaries=Salaries
-NewSalaryPayment=New salary payment
+NewSalary=New salary
+NewSalaryPayment=New salary card
 AddSalaryPayment=Add salary payment
 SalaryPayment=Salary payment
 SalariesPayments=Salaries payments
+SalariesPaymentsOf=Salaries payments of %s
 ShowSalaryPayment=Show salary payment
 THM=Average hourly rate
 TJM=Average daily rate
 CurrentSalary=Current salary
 THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
 TJMDescription=This value is currently for information only and is not used for any calculation
-LastSalaries=Latest %s salary payments
-AllSalaries=All salary payments
+LastSalaries=Latest %s salaries
+AllSalaries=All salaries
 SalariesStatistics=Salary statistics
-# Export
 SalariesAndPayments=Salaries and payments
+ConfirmDeleteSalaryPayment=Do you want to delete this salary payment ?
diff --git a/htdocs/langs/uk_UA/ticket.lang b/htdocs/langs/uk_UA/ticket.lang
index 6c7acc8f632..e6c26245057 100644
--- a/htdocs/langs/uk_UA/ticket.lang
+++ b/htdocs/langs/uk_UA/ticket.lang
@@ -34,7 +34,8 @@ TicketDictResolution=Ticket - Resolution
 
 TicketTypeShortCOM=Комерційне питання
 TicketTypeShortHELP=Request for functionnal help
-TicketTypeShortISSUE=Issue, bug or problem
+TicketTypeShortISSUE=Issue or bug
+TicketTypeShortPROBLEM=Problem
 TicketTypeShortREQUEST=Change or enhancement request
 TicketTypeShortPROJET=Project
 TicketTypeShortOTHER=Інший
@@ -54,14 +55,15 @@ TypeContact_ticket_internal_SUPPORTTEC=Assigned user
 TypeContact_ticket_external_SUPPORTCLI=Customer contact / incident tracking
 TypeContact_ticket_external_CONTRIBUTOR=External contributor
 
-OriginEmail=Email source
+OriginEmail=Reporter Email
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
 Read=Прочитані
 Assigned=Assigned
 InProgress=In progress
-NeedMoreInformation=Waiting for information
+NeedMoreInformation=Waiting for reporter feedback
+NeedMoreInformationShort=Waiting for feedback
 Answered=Answered
 Waiting=Waiting
 Closed=Зачинено
@@ -160,7 +162,7 @@ CreatedBy=Створено
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Group
+TicketCategory=Ticket categorization
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
@@ -211,6 +213,7 @@ TicketMessageHelp=Only this text will be saved in the message list on ticket car
 TicketMessageSubstitutionReplacedByGenericValues=Substitutions variables are replaced by generic values.
 TimeElapsedSince=Time elapsed since
 TicketTimeToRead=Time elapsed before read
+TicketTimeElapsedBeforeSince=Time elapsed before / since
 TicketContacts=Contacts ticket
 TicketDocumentsLinked=Documents linked to ticket
 ConfirmReOpenTicket=Confirm reopen this ticket ?
diff --git a/htdocs/langs/uk_UA/users.lang b/htdocs/langs/uk_UA/users.lang
index 0a4004b0e10..3100ad97798 100644
--- a/htdocs/langs/uk_UA/users.lang
+++ b/htdocs/langs/uk_UA/users.lang
@@ -97,8 +97,8 @@ LoginToCreate=Login to create
 NameToCreate=Name of third party to create
 YourRole=Your roles
 YourQuotaOfUsersIsReached=Your quota of active users is reached !
-NbOfUsers=No. of users
-NbOfPermissions=No. of permissions
+NbOfUsers=Number of users
+NbOfPermissions=Number of permissions
 DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin
 HierarchicalResponsible=Supervisor
 HierarchicView=Hierarchical view
diff --git a/htdocs/langs/uk_UA/website.lang b/htdocs/langs/uk_UA/website.lang
index bfd4eccde1e..e4240d8f2ff 100644
--- a/htdocs/langs/uk_UA/website.lang
+++ b/htdocs/langs/uk_UA/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 PageContainer=Page
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
+PreviewOfSiteNotYetAvailable=The preview of your website <strong>%s</strong> is not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
diff --git a/htdocs/langs/uz_UZ/accountancy.lang b/htdocs/langs/uz_UZ/accountancy.lang
index 50b67af85d2..dfe94e2a6a4 100644
--- a/htdocs/langs/uz_UZ/accountancy.lang
+++ b/htdocs/langs/uz_UZ/accountancy.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - en_US - Accountancy (Double entries)
-Accountancy=Accountancy
+Accountancy=Buxgalteriya
 Accounting=Accounting
 ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
 ACCOUNTING_EXPORT_DATE=Date format for export file
@@ -10,14 +10,14 @@ ACCOUNTING_EXPORT_AMOUNT=Eksport miqdori
 ACCOUNTING_EXPORT_DEVISE=Valyutani eksport qilish
 Selectformat=Select the format for the file
 ACCOUNTING_EXPORT_FORMAT=Select the format for the file
-ACCOUNTING_EXPORT_ENDLINE=Select the carriage return type
+ACCOUNTING_EXPORT_ENDLINE=Vagonni qaytarish turini tanlang
 ACCOUNTING_EXPORT_PREFIX_SPEC=Specify the prefix for the file name
 ThisService=Ushbu xizmat
 ThisProduct=Ushbu mahsulot
 DefaultForService=Xizmat uchun standart
 DefaultForProduct=Mahsulot uchun standart
-ProductForThisThirdparty=Product for this thirdparty
-ServiceForThisThirdparty=Service for this thirdparty
+ProductForThisThirdparty=Ushbu uchinchi tomon uchun mahsulot
+ServiceForThisThirdparty=Ushbu uchinchi tomon uchun xizmat
 CantSuggest=Taklif qila olmayman
 AccountancySetupDoneFromAccountancyMenu=Buxgalteriya hisobining ko'pgina sozlamalari %s menyusida amalga oshiriladi
 ConfigAccountingExpert=Modulni hisobga olish konfiguratsiyasi (ikki martalik yozuv)
@@ -26,37 +26,38 @@ Journals=Journals
 JournalFinancial=Financial journals
 BackToChartofaccounts=Return chart of accounts
 Chartofaccounts=Hisob-kitoblar rejasi
-ChartOfSubaccounts=Chart of individual accounts
-ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
+ChartOfSubaccounts=Shaxsiy hisobvaraqlar rejasi
+ChartOfIndividualAccountsOfSubsidiaryLedger=Yordamchi daftarning individual hisobvaraqlar rejasi
 CurrentDedicatedAccountingAccount=Joriy ajratilgan hisob
 AssignDedicatedAccountingAccount=Tayinlash uchun yangi hisob
 InvoiceLabel=Hisob-faktura yorlig'i
 OverviewOfAmountOfLinesNotBound=Buxgalteriya hisobi bilan bog'liq bo'lmagan satrlar miqdoriga umumiy nuqtai
 OverviewOfAmountOfLinesBound=Buxgalteriya hisobi bilan bog'langan chiziqlar miqdoriga umumiy nuqtai
 OtherInfo=Boshqa ma'lumotlar
-DeleteCptCategory=Remove accounting account from group
-ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group?
-JournalizationInLedgerStatus=Status of journalization
-AlreadyInGeneralLedger=Already transferred in accounting journals and ledger
-NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger
-GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group
-DetailByAccount=Show detail by account
-AccountWithNonZeroValues=Accounts with non-zero values
-ListOfAccounts=List of accounts
-CountriesInEEC=Countries in EEC
-CountriesNotInEEC=Countries not in EEC
-CountriesInEECExceptMe=Countries in EEC except %s
-CountriesExceptMe=All countries except %s
-AccountantFiles=Export source documents
-ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
-VueByAccountAccounting=View by accounting account
-VueBySubAccountAccounting=View by accounting subaccount
+DeleteCptCategory=Buxgalteriya hisobini guruhdan olib tashlang
+ConfirmDeleteCptCategory=Ushbu buxgalteriya hisobini buxgalteriya hisobi guruhidan olib tashlamoqchimisiz?
+JournalizationInLedgerStatus=Jurnalizatsiya holati
+AlreadyInGeneralLedger=Buxgalteriya jurnallarida va daftarchada allaqachon topshirilgan
+NotYetInGeneralLedger=Hisoblash jurnallari va daftarchasiga hali topshirilmagan
+GroupIsEmptyCheckSetup=Guruh bo'sh, shaxsiylashtirilgan buxgalteriya guruhini sozlashni tekshiring
+DetailByAccount=Hisob bo'yicha tafsilotlarni ko'rsatish
+AccountWithNonZeroValues=Nolga teng bo'lmagan qiymatlar bilan hisob-kitoblar
+ListOfAccounts=Hisob-kitoblar ro'yxati
+CountriesInEEC=EEC tarkibidagi mamlakatlar
+CountriesNotInEEC=EEC tarkibiga kirmagan mamlakatlar
+CountriesInEECExceptMe=%s dan tashqari EECdagi mamlakatlar
+CountriesExceptMe=%s dan tashqari barcha mamlakatlar
+AccountantFiles=Dastlabki hujjatlarni eksport qilish
+ExportAccountingSourceDocHelp=Ushbu vosita yordamida siz buxgalteriya hisobini yaratish uchun foydalanilgan manba hodisalarini (CSV va PDF-lardagi ro'yxat) eksport qilishingiz mumkin.
+ExportAccountingSourceDocHelp2=Jurnallaringizni eksport qilish uchun %s - %s menyu yozuvidan foydalaning.
+VueByAccountAccounting=Buxgalteriya hisobi bo'yicha ko'rish
+VueBySubAccountAccounting=Buxgalteriya subkontaji bo'yicha ko'rish
 
-MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
-MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
-MainAccountForUsersNotDefined=Main accounting account for users not defined in setup
-MainAccountForVatPaymentNotDefined=Main accounting account for VAT payment not defined in setup
-MainAccountForSubscriptionPaymentNotDefined=Main accounting account for subscription payment not defined in setup
+MainAccountForCustomersNotDefined=O'rnatishda aniqlanmagan mijozlar uchun asosiy buxgalteriya hisobi
+MainAccountForSuppliersNotDefined=O'rnatishda aniqlanmagan sotuvchilar uchun asosiy buxgalteriya hisobi
+MainAccountForUsersNotDefined=O'rnatishda aniqlanmagan foydalanuvchilar uchun asosiy buxgalteriya hisobi
+MainAccountForVatPaymentNotDefined=O'rnatishda aniqlanmagan QQSni to'lash uchun asosiy buxgalteriya hisobi
+MainAccountForSubscriptionPaymentNotDefined=O'rnatishda aniqlanmagan obuna to'lovining asosiy buxgalteriya hisobi
 
 AccountancyArea=Buxgalteriya hisobi maydoni
 AccountancyAreaDescIntro=Buxgalteriya modulidan foydalanish bir necha bosqichda amalga oshiriladi:
@@ -64,66 +65,66 @@ AccountancyAreaDescActionOnce=Quyidagi harakatlar odatda faqat bir marta yoki yi
 AccountancyAreaDescActionOnceBis=Kelgusida sizning vaqtingizni tejash uchun jurnalistikani rasmiylashtirishda to'g'ri sukut bo'yicha buxgalteriya hisobini taklif qilish orqali (Jurnallarda va Bosh daftarda yozuvlarni yozish) taklif qilish kerak.
 AccountancyAreaDescActionFreq=Quyidagi harakatlar odatda har oyda, haftada yoki kunda juda katta kompaniyalar uchun amalga oshiriladi ...
 
-AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
+AccountancyAreaDescJournalSetup=QADAM %s: %s menyusidan jurnallar ro'yxatining tarkibini yarating yoki tekshiring.
 AccountancyAreaDescChartModel=QADAM %s: hisob jadvalining modeli mavjudligini tekshiring yoki menyudan %s yarating.
 AccountancyAreaDescChart=QADAM %s: tanlang va | yoki hisob qaydnomangizni %s menyusidan to'ldiring.
 
 AccountancyAreaDescVat=QADAM %s: har bir QQS stavkasi bo'yicha buxgalteriya hisobini belgilang. Buning uchun %s menyu yozuvidan foydalaning.
-AccountancyAreaDescDefault=STEP %s: Define default accounting accounts. For this, use the menu entry %s.
+AccountancyAreaDescDefault=QADAM %s: sukut bo'yicha buxgalteriya hisoblarini belgilang. Buning uchun %s menyu yozuvidan foydalaning.
 AccountancyAreaDescExpenseReport=QADAM %s: har bir hisobot turi bo'yicha buxgalteriya hisobini belgilang. Buning uchun %s menyu yozuvidan foydalaning.
 AccountancyAreaDescSal=QADAM %s: Ish haqini to'lash bo'yicha buxgalteriya hisobini belgilang. Buning uchun %s menyu yozuvidan foydalaning.
 AccountancyAreaDescContrib=QADAM %s: Maxsus xarajatlar (turli xil soliqlar) bo'yicha buxgalteriya hisobini belgilang. Buning uchun %s menyu yozuvidan foydalaning.
 AccountancyAreaDescDonation=QADAM %s: xayr-ehson uchun buxgalteriya hisobini belgilang. Buning uchun %s menyu yozuvidan foydalaning.
-AccountancyAreaDescSubscription=STEP %s: Define default accounting accounts for member subscription. For this, use the menu entry %s.
+AccountancyAreaDescSubscription=QADAM %s: a'zo obuna uchun buxgalteriya hisobini belgilang. Buning uchun %s menyu yozuvidan foydalaning.
 AccountancyAreaDescMisc=QADAM %s: Turli xil operatsiyalar uchun majburiy sukut qaydnomasi va buxgalteriya hisobini belgilang. Buning uchun %s menyu yozuvidan foydalaning.
 AccountancyAreaDescLoan=QADAM %s: ssudalar bo'yicha ssudalarning buxgalteriya hisobini belgilang. Buning uchun %s menyu yozuvidan foydalaning.
 AccountancyAreaDescBank=QADAM %s: har bir bank va moliyaviy hisob uchun buxgalteriya hisobi va jurnal kodini aniqlang. Buning uchun %s menyu yozuvidan foydalaning.
 AccountancyAreaDescProd=QADAM %s: Mahsulotlaringiz / xizmatlaringiz bo'yicha buxgalteriya hisoblarini aniqlang. Buning uchun %s menyu yozuvidan foydalaning.
 
-AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
+AccountancyAreaDescBind=QADAM %s: mavjud %s satrlari bilan buxgalteriya hisobi o'rtasidagi bog'lanishni tekshiring, shuning uchun dastur bir marta bosish bilan Ledger-dagi operatsiyalarni jurnalga yozib olish imkoniyatiga ega bo'ladi. To'liq etishmayotgan birikmalar. Buning uchun %s menyu yozuvidan foydalaning.
 AccountancyAreaDescWriteRecords=QADAM %s: operatsiyalarni kitobga yozing. Buning uchun <strong> %s </strong> menyusiga o'ting va <strong> %s </strong> tugmachasini bosing.
 AccountancyAreaDescAnalyze=QADAM %s: Mavjud operatsiyalarni qo'shish yoki tahrirlash, hisobotlar va eksportlarni yaratish.
 
 AccountancyAreaDescClosePeriod=QADAM %s: Yopish davri, shuning uchun kelajakda o'zgartirishlar kiritolmaymiz.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=O'rnatishning majburiy bosqichi tugallanmagan (buxgalteriya kodlari jurnali barcha bank hisoblari uchun aniqlanmagan)
 Selectchartofaccounts=Faol hisobvaraqlar rejasini tanlang
 ChangeAndLoad=O'zgartirish va yuklash
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
 AccountAccountingShort=Account
-SubledgerAccount=Subledger account
-SubledgerAccountLabel=Subledger account label
-ShowAccountingAccount=Show accounting account
-ShowAccountingJournal=Show accounting journal
-ShowAccountingAccountInLedger=Show accounting account in ledger
-ShowAccountingAccountInJournals=Show accounting account in journals
+SubledgerAccount=Subledger hisobi
+SubledgerAccountLabel=Subledger hisobvarag'ining yorlig'i
+ShowAccountingAccount=Buxgalteriya hisobini ko'rsatish
+ShowAccountingJournal=Buxgalteriya jurnalini ko'rsatish
+ShowAccountingAccountInLedger=Buxgalteriya hisobini daftarda ko'rsatish
+ShowAccountingAccountInJournals=Buxgalteriya hisobini jurnallarda ko'rsatish
 AccountAccountingSuggest=Buxgalteriya hisobi tavsiya etildi
 MenuDefaultAccounts=Standart hisoblar
-MenuBankAccounts=Bank accounts
+MenuBankAccounts=Bank hisobvaraqlari
 MenuVatAccounts=QQS hisob-kitoblari
 MenuTaxAccounts=Soliq hisobvaraqlari
 MenuExpenseReportAccounts=Xarajatlar bo'yicha hisobotlar
 MenuLoanAccounts=Kredit hisobvaraqlari
 MenuProductsAccounts=Mahsulot hisoblari
-MenuClosureAccounts=Closure accounts
-MenuAccountancyClosure=Closure
-MenuAccountancyValidationMovements=Validate movements
+MenuClosureAccounts=Yopish hisoblari
+MenuAccountancyClosure=Yopish
+MenuAccountancyValidationMovements=Harakatlarni tasdiqlang
 ProductsBinding=Mahsulotlar hisoblari
-TransferInAccounting=Transfer in accounting
-RegistrationInAccounting=Registration in accounting
-Binding=Binding to accounts
+TransferInAccounting=Buxgalteriya hisobiga o'tkazish
+RegistrationInAccounting=Buxgalteriyada ro'yxatdan o'tish
+Binding=Hisobvaraqlar uchun majburiy
 CustomersVentilation=Xaridorlarning hisob-fakturasi majburiy
 SuppliersVentilation=Sotuvchi hisob-fakturasini majburiy ravishda to'ldirish
 ExpenseReportsVentilation=Xarajatlar to'g'risidagi hisobotni majburiy ravishda bajarish
 CreateMvts=Yangi tranzaksiya yarating
 UpdateMvts=Bitimni o'zgartirish
-ValidTransaction=Validate transaction
+ValidTransaction=Bitimni tasdiqlash
 WriteBookKeeping=Buxgalteriya hisobidagi operatsiyalarni ro'yxatdan o'tkazing
 Bookkeeping=Kitob
 BookkeepingSubAccount=Subledger
 AccountBalance=Hisob balansi
-ObjectsRef=Source object ref
+ObjectsRef=Manba ob'ekti ref
 CAHTF=Soliqqa qadar jami sotib olish sotuvchisi
 TotalExpenseReport=Jami xarajatlar hisoboti
 InvoiceLines=Yopish uchun schyot-fakturalar
@@ -131,7 +132,7 @@ InvoiceLinesDone=Hisob-fakturalarning chegaralangan chiziqlari
 ExpenseReportLines=Bog'lanish uchun xarajatlar hisobotlari qatorlari
 ExpenseReportLinesDone=Xarajatlar to'g'risidagi hisobotlarning chegaralangan chiziqlari
 IntoAccount=Buxgalteriya hisobi bilan bog'lanish
-TotalForAccount=Total accounting account
+TotalForAccount=Jami buxgalteriya hisobi
 
 
 Ventilate=Bog'lash
@@ -157,69 +158,69 @@ ACCOUNTING_LENGTH_GACCOUNT=Umumiy buxgalteriya hisoblarining uzunligi (Agar siz
 ACCOUNTING_LENGTH_AACCOUNT=Uchinchi tomon buxgalteriya hisoblarining uzunligi (Agar siz bu erda 6 qiymatini belgilasangiz, '401' qaydnomasi ekranda '401000' kabi ko'rinadi)
 ACCOUNTING_MANAGE_ZERO=Buxgalteriya hisobi oxirida turli xil nollarni boshqarishga ruxsat bering. Ba'zi mamlakatlar tomonidan kerak (masalan, Shveytsariya). Agar o'chirilgan (standart) bo'lsa, siz dasturdan virtual nollarni qo'shishni so'rash uchun quyidagi ikkita parametrni o'rnatishingiz mumkin.
 BANK_DISABLE_DIRECT_INPUT=Bank hisobvarag'idagi operatsiyani to'g'ridan-to'g'ri yozib olishni o'chirib qo'ying
-ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties, break ability to search on a part of value)
-ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
-ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
+ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Jurnalda qoralama eksportni yoqish
+ACCOUNTANCY_COMBO_FOR_AUX=Yordamchi hisob uchun kombinatsiyalangan ro'yxatni yoqish (agar sizda uchinchi shaxslar ko'p bo'lsa, sekin bo'lishi mumkin, qiymatning bir qismini qidirish qobiliyati buziladi)
+ACCOUNTING_DATE_START_BINDING=Buxgalteriyada majburiy va o'tkazishni boshlash uchun sanani aniqlang. Ushbu sana ostida operatsiyalar buxgalteriya hisobiga o'tkazilmaydi.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Buxgalteriya o'tkazmalarida sukut bo'yicha davr ko'rsatilishini tanlang
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Social journal
-ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
+ACCOUNTING_HAS_NEW_JOURNAL=Yangi jurnal mavjud
 
-ACCOUNTING_RESULT_PROFIT=Result accounting account (Profit)
-ACCOUNTING_RESULT_LOSS=Result accounting account (Loss)
-ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Journal of closure
+ACCOUNTING_RESULT_PROFIT=Natija buxgalteriya hisobi (foyda)
+ACCOUNTING_RESULT_LOSS=Natija buxgalteriya hisobi (Zarar)
+ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Yopish jurnali
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=O'tish davri o'tkazmalarining buxgalteriya hisobi
-TransitionalAccount=Transitional bank transfer account
+TransitionalAccount=O'tkazma hisobvarag'i
 
 ACCOUNTING_ACCOUNT_SUSPENSE=Kutishning buxgalteriya hisobi
 DONATION_ACCOUNTINGACCOUNT=Xayriya mablag'larini ro'yxatdan o'tkazish uchun buxgalteriya hisobi
-ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
+ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Obunalarni ro'yxatdan o'tkazish uchun buxgalteriya hisobi
 
-ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Mijozlar depozitini ro'yxatdan o'tkazish uchun sukut bo'yicha buxgalteriya hisobi
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Xarid qilingan mahsulotlar uchun sukut bo'yicha buxgalteriya hisobi (agar mahsulot varag'ida belgilanmagan bo'lsa foydalaniladi)
-ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=EECda sotib olingan mahsulotlar uchun sukut bo'yicha buxgalteriya hisobi (agar mahsulot varag'ida belgilanmagan bo'lsa foydalaniladi)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Sotib olingan va EECdan tashqariga olib kirilgan mahsulotlar uchun sukut bo'yicha buxgalteriya hisobi (agar mahsulot varag'ida belgilanmagan bo'lsa)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Sotilgan mahsulotlar uchun sukut bo'yicha buxgalteriya hisobi (agar mahsulot varag'ida belgilanmagan bo'lsa foydalaniladi)
-ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Accounting account by default for the products sold in EEC (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Accounting account by default for the products sold and exported out of EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=EECda sotilgan mahsulotlar uchun sukut bo'yicha buxgalteriya hisobi (agar mahsulot varag'ida belgilanmagan bo'lsa foydalaniladi)
+ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=EECdan tashqarida sotilgan va eksport qilingan mahsulotlar uchun sukut bo'yicha buxgalteriya hisobi (agar mahsulot varag'ida belgilanmagan bo'lsa)
 
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Sotib olingan xizmatlar uchun sukut bo'yicha buxgalteriya hisobi (agar xizmat varag'ida belgilanmagan bo'lsa foydalaniladi)
-ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Accounting account by default for the bought services in EEC (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought services and imported out of EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=EECda sotib olingan xizmatlar uchun sukut bo'yicha buxgalteriya hisobi (agar xizmat varag'ida belgilanmagan bo'lsa foydalaniladi)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Sotib olingan va EECdan tashqariga olib kirilgan xizmatlar uchun sukut bo'yicha buxgalteriya hisobi (agar xizmat varag'ida ko'rsatilmagan bo'lsa)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Sotilgan xizmatlar uchun sukut bo'yicha buxgalteriya hisobi (agar xizmat varag'ida belgilanmagan bo'lsa foydalaniladi)
-ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Accounting account by default for the services sold in EEC (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Accounting account by default for the services sold and exported out of EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=EECda sotilgan xizmatlar uchun sukut bo'yicha buxgalteriya hisobi (agar xizmat varag'ida belgilanmagan bo'lsa foydalaniladi)
+ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=EECdan tashqarida sotilgan va eksport qilingan xizmatlar uchun sukut bo'yicha buxgalteriya hisobi (agar xizmat varag'ida belgilanmagan bo'lsa)
 
 Doctype=Type of document
 Docdate=Date
 Docref=Reference
 LabelAccount=Label account
-LabelOperation=Label operation
+LabelOperation=Yorliq bilan ishlash
 Sens=Yo'nalish
-AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you have received<br>For an accounting account of a supplier, use Debit to record a payment you made
-LetteringCode=Lettering code
-Lettering=Lettering
+AccountingDirectionHelp=Mijozning buxgalteriya hisobi uchun siz olgan to'lovni yozish uchun Kreditdan foydalaning.
+LetteringCode=Harf kodi
+Lettering=Xat
 Codejournal=Journal
-JournalLabel=Journal label
+JournalLabel=Jurnal yorlig'i
 NumPiece=Parcha raqami
 TransactionNumShort=Raqam bitim
 AccountingCategory=Maxsus guruh
 GroupByAccountAccounting=Bosh kitob schyoti bo'yicha guruhlash
-GroupBySubAccountAccounting=Group by subledger account
-AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
-ByAccounts=By accounts
-ByPredefinedAccountGroups=By predefined groups
-ByPersonalizedAccountGroups=By personalized groups
-ByYear=By year
+GroupBySubAccountAccounting=Subledger schyoti bo'yicha guruhlash
+AccountingAccountGroupsDesc=Siz bu erda buxgalteriya hisobining ayrim guruhlarini belgilashingiz mumkin. Ular shaxsiylashtirilgan buxgalteriya hisobotlari uchun ishlatiladi.
+ByAccounts=Hisob-kitoblar bo'yicha
+ByPredefinedAccountGroups=Oldindan belgilangan guruhlar bo'yicha
+ByPersonalizedAccountGroups=Shaxsiylashtirilgan guruhlar bo'yicha
+ByYear=Yil bo'yicha
 NotMatch=O'rnatilmagan
 DeleteMvt=Buxgalteriya hisobidan ba'zi operatsion liniyalarni o'chirib tashlang
-DelMonth=Month to delete
+DelMonth=O'chirish uchun oy
 DelYear=O'chirish yili
 DelJournal=O'chirish uchun jurnal
 ConfirmDeleteMvt=Bu yil / oy va / yoki ma'lum bir jurnal uchun buxgalteriya hisobining barcha operatsion yo'nalishlarini o'chirib tashlaydi (kamida bitta mezon talab qilinadi). O'chirilgan yozuvni daftarga qaytarish uchun '%s' xususiyatidan qayta foydalanishingiz kerak bo'ladi.
@@ -239,26 +240,26 @@ NewAccountingMvt=Yangi bitim
 NumMvts=Bitim soni
 ListeMvts=Harakatlar ro'yxati
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
-AddCompteFromBK=Add accounting accounts to the group
+AddCompteFromBK=Guruhga buxgalteriya hisoblarini qo'shing
 ReportThirdParty=Uchinchi tomon hisoblarini ro'yxatlash
 DescThirdPartyReport=Uchinchi tomon mijozlari va sotuvchilari ro'yxati va ularning buxgalteriya hisoblari bilan bu erda maslahatlashing
 ListAccounts=List of the accounting accounts
-UnknownAccountForThirdparty=Unknown third-party account. We will use %s
-UnknownAccountForThirdpartyBlocking=Unknown third-party account. Blocking error
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. We will use %s
-ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Third-party unknown and subledger not defined on the payment. We will keep the subledger account value empty.
-ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
-UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
-PaymentsNotLinkedToProduct=Payment not linked to any product / service
-OpeningBalance=Opening balance
-ShowOpeningBalance=Show opening balance
-HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by level
+UnknownAccountForThirdparty=Uchinchi tomon hisobi noma'lum. Biz %s dan foydalanamiz
+UnknownAccountForThirdpartyBlocking=Uchinchi tomon hisobi noma'lum. Bloklash xatosi
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Uchinchi tomon hisobi aniqlanmagan yoki uchinchi tomon noma'lum. Biz %s dan foydalanamiz
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=To'lovda aniqlanmagan uchinchi shaxs noma'lum va subledger. Biz subledger hisob qiymatini bo'sh holda saqlaymiz.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Uchinchi tomon hisobi aniqlanmagan yoki uchinchi tomon noma'lum. Bloklash xatosi.
+UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Noma'lum uchinchi tomon hisobi va kutish hisobi aniqlanmagan. Bloklash xatosi
+PaymentsNotLinkedToProduct=To'lov hech qanday mahsulot / xizmatga bog'liq emas
+OpeningBalance=Balansni ochish
+ShowOpeningBalance=Dastlabki qoldiqni ko'rsating
+HideOpeningBalance=Dastlabki qoldiqni yashirish
+ShowSubtotalByGroup=Subtotalni daraja bo'yicha ko'rsatish
 
 Pcgtype=Hisob guruhi
-PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
+PcgtypeDesc=Hisob-kitoblar guruhi ba'zi buxgalteriya hisobotlari uchun oldindan belgilangan "filtr" va "guruhlash" mezonlari sifatida ishlatiladi. Masalan, "KIRISh" yoki "XARAJATLAR" xarajatlar / daromadlar to'g'risidagi hisobotni tuzish uchun mahsulotlarning buxgalteriya hisobi guruhlari sifatida ishlatiladi.
 
-Reconcilable=Reconcilable
+Reconcilable=Yarashtiriladigan
 
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
@@ -276,62 +277,62 @@ DescVentilExpenseReport=To'lovlarni hisobga olish hisobvarag'iga bog'langan (yok
 DescVentilExpenseReportMore=Agar siz buxgalteriya hisobini xarajatlar to'g'risidagi hisobot satrlari turiga o'rnatgan bo'lsangiz, ilova sizning hisob-kitoblar jadvalingizdagi buxgalteriya hisobi o'rtasidagi majburiylikni amalga oshirishi mumkin, faqat bir marta bosish orqali <strong> "%s" </strong>. Agar to'lovlar lug'atiga hisob o'rnatilmagan bo'lsa yoki sizda hali ham biron bir qayd bilan bog'lanmagan qatorlar mavjud bo'lsa, "<strong> %s </strong>" menyusidan majburiy ravishda majburiy amal qilishingiz kerak bo'ladi.
 DescVentilDoneExpenseReport=Xarajatlar hisobotlari ro'yxati va ularning to'lovlarini hisobga olish hisobi bilan bu erda maslahatlashing
 
-Closure=Annual closure
-DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
-OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
-AllMovementsWereRecordedAsValidated=All movements were recorded as validated
-NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
-ValidateMovements=Validate movements
-DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
+Closure=Yillik yopilish
+DescClosure=Tasdiqlanmagan oylar bo'yicha harakatlarning soni va allaqachon ochilgan moliya yillari bilan bu erda maslahatlashing
+OverviewOfMovementsNotValidated=1-qadam / harakatlarning umumiy ko'rinishi tasdiqlanmagan. (Moliyaviy yilni yopish uchun zarur)
+AllMovementsWereRecordedAsValidated=Barcha harakatlar tasdiqlangan deb qayd etildi
+NotAllMovementsCouldBeRecordedAsValidated=Barcha harakatlarni tasdiqlangan deb yozib bo'lmaydi
+ValidateMovements=Harakatlarni tasdiqlang
+DescValidateMovements=Yozishni, xatlarni va o'chirishni har qanday o'zgartirish yoki o'chirish taqiqlanadi. Jismoniy mashqlar uchun barcha yozuvlar tasdiqlanishi kerak, aks holda yopish mumkin bo'lmaydi
 
 ValidateHistory=Avtomatik bog'lash
 AutomaticBindingDone=Avtomatik ulanish amalga oshirildi
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 MvtNotCorrectlyBalanced=Harakat to'g'ri muvozanatlashtirilmagan. Debit = %s | Kredit = %s
-Balancing=Balancing
+Balancing=Balanslash
 FicheVentilation=Majburiy karta
 GeneralLedgerIsWritten=Bitimlar kitobda yozilgan
 GeneralLedgerSomeRecordWasNotRecorded=Ba'zi operatsiyalarni jurnalga yozib bo'lmaydi. Agar boshqa xato xabari bo'lmasa, bu ular allaqachon jurnalga yozilganligi sababli bo'lishi mumkin.
 NoNewRecordSaved=Jurnalizatsiya qilish uchun boshqa yozuv yo'q
 ListOfProductsWithoutAccountingAccount=Hech qanday buxgalteriya hisobiga bog'lanmagan mahsulotlar ro'yxati
 ChangeBinding=Majburiylikni o'zgartiring
-Accounted=Accounted in ledger
-NotYetAccounted=Not yet accounted in the ledger
-ShowTutorial=Show Tutorial
-NotReconciled=Not reconciled
-WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
+Accounted=Hisob kitobida hisobga olingan
+NotYetAccounted=Hisob kitobida hali hisobga olinmagan
+ShowTutorial=Qo'llanmani ko'rsatish
+NotReconciled=Yarashtirilmagan
+WarningRecordWithoutSubledgerAreExcluded=Ogohlantirish, subledger hisobi aniqlanmagan barcha operatsiyalar filtrlanadi va ushbu ko'rinishdan chiqarib tashlanadi
 
 ## Admin
-BindingOptions=Binding options
+BindingOptions=Majburiy variantlar
 ApplyMassCategories=Ommaviy toifalarni qo'llang
 AddAccountFromBookKeepingWithNoCategories=Mavjud hisob hali moslashtirilgan guruhda emas
 CategoryDeleted=Buxgalteriya hisobi toifasi olib tashlandi
-AccountingJournals=Accounting journals
-AccountingJournal=Accounting journal
-NewAccountingJournal=New accounting journal
-ShowAccountingJournal=Show accounting journal
-NatureOfJournal=Nature of Journal
-AccountingJournalType1=Miscellaneous operations
-AccountingJournalType2=Sales
-AccountingJournalType3=Purchases
+AccountingJournals=Buxgalteriya jurnallari
+AccountingJournal=Buxgalteriya jurnali
+NewAccountingJournal=Yangi buxgalteriya jurnali
+ShowAccountingJournal=Buxgalteriya jurnalini ko'rsatish
+NatureOfJournal=Jurnalning tabiati
+AccountingJournalType1=Turli xil operatsiyalar
+AccountingJournalType2=Sotish
+AccountingJournalType3=Xaridlar
 AccountingJournalType4=Bank
-AccountingJournalType5=Expenses report
-AccountingJournalType8=Inventory
-AccountingJournalType9=Has-new
-ErrorAccountingJournalIsAlreadyUse=This journal is already use
-AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
-NumberOfAccountancyEntries=Number of entries
-NumberOfAccountancyMovements=Number of movements
-ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting)
-ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting)
-ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
+AccountingJournalType5=Xarajatlar to'g'risida hisobot
+AccountingJournalType8=Inventarizatsiya
+AccountingJournalType9=Yangi-yangi
+ErrorAccountingJournalIsAlreadyUse=Ushbu jurnal allaqachon ishlatilgan
+AccountingAccountForSalesTaxAreDefinedInto=Izoh: Sotish solig'i bo'yicha buxgalteriya hisobi <b> %s </b> - <b> %s </b> menyusida aniqlanadi
+NumberOfAccountancyEntries=Yozuvlar soni
+NumberOfAccountancyMovements=Harakatlar soni
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Sotish bo'yicha buxgalteriyada majburiy va o'tkazishni o'chirib qo'ying (mijozlar hisob-kitoblari buxgalteriya hisobida hisobga olinmaydi)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Xaridlar bo'yicha buxgalteriyada majburiy va o'tkazishni o'chirib qo'ying (sotuvchi hisob-kitoblari buxgalteriya hisobida hisobga olinmaydi)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Xarajatlar hisobotlari bo'yicha buxgalteriyada majburiy va o'tkazishni o'chirib qo'ying (xarajatlar hisoboti buxgalteriya hisobida hisobga olinmaydi)
 
 ## Export
-NotifiedExportDate=Notified export date (modification of the entries will not be possible)
-NotifiedValidationDate=Validation of the entries (modification or deletion of the entries will not be possible)
-ConfirmExportFile=Confirmation of the generation of the accounting export file ?
-ExportDraftJournal=Export draft journal
+NotifiedExportDate=Xabar qilingan eksport sanasi (yozuvlarni o'zgartirish mumkin bo'lmaydi)
+NotifiedValidationDate=Yozuvlarni tasdiqlash (yozuvlarni o'zgartirish yoki o'chirish mumkin bo'lmaydi)
+ConfirmExportFile=Buxgalteriya eksporti faylini yaratishni tasdiqlashmi?
+ExportDraftJournal=Jurnal jurnalini eksport qiling
 Modelcsv=Model of export
 Selectmodelcsv=Select a model of export
 Modelcsv_normal=Classic export
@@ -342,49 +343,49 @@ Modelcsv_ciel=Sage Ciel Compta yoki Compta Evolution uchun eksport
 Modelcsv_quadratus=Quadratus QuadraCompta uchun eksport
 Modelcsv_ebp=EBP uchun eksport
 Modelcsv_cogilog=Cogilog uchun eksport
-Modelcsv_agiris=Export for Agiris
-Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
-Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
-Modelcsv_openconcerto=Export for OpenConcerto (Test)
-Modelcsv_configurable=Export CSV Configurable
-Modelcsv_FEC=Export FEC
-Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
-Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
-Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
-Modelcsv_Gestinumv3=Export for Gestinum (v3)
-Modelcsv_Gestinumv5Export for Gestinum (v5)
+Modelcsv_agiris=Agiris uchun eksport
+Modelcsv_LDCompta=LD Compta (v9) uchun eksport (sinov)
+Modelcsv_LDCompta10=LD Compta uchun eksport (v10 va undan yuqori)
+Modelcsv_openconcerto=OpenConcerto uchun eksport (Test)
+Modelcsv_configurable=CSV konfiguratsiyasini eksport qilish
+Modelcsv_FEC=FECni eksport qilish
+Modelcsv_FEC2=FEC-ni eksport qilish (sanalarni yozish / hujjatni o'zgartirish bilan)
+Modelcsv_Sage50_Swiss=Sage 50 uchun Shveytsariya uchun eksport
+Modelcsv_winfic=Winfic - eWinfic - WinSis Compta-ni eksport qiling
+Modelcsv_Gestinumv3=Gestinum uchun eksport (v3)
+Modelcsv_Gestinumv5Export Gestinum uchun (v5)
 ChartofaccountsId=Hisob-kitoblar rejasi
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Buxgalteriya hisobi
 InitAccountancyDesc=Ushbu sahifada sotish va sotib olish uchun aniqlangan buxgalteriya hisobi bo'lmagan mahsulotlar va xizmatlar bo'yicha buxgalteriya hisobini boshlash uchun foydalanish mumkin.
 DefaultBindingDesc=Ushbu sahifada oldindan hisob-kitob hisobvarag'i o'rnatilmagan taqdirda, ish haqi, xayriya mablag'lari, soliqlar va QQS bo'yicha operatsiyalar yozuvlarini bog'lash uchun standart hisobni o'rnatish uchun foydalanish mumkin.
-DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
+DefaultClosureDesc=Ushbu sahifadan buxgalteriya hisobini yopish uchun ishlatiladigan parametrlarni o'rnatish uchun foydalanish mumkin.
 Options=Variantlar
 OptionModeProductSell=Sotish rejimi
-OptionModeProductSellIntra=Mode sales exported in EEC
-OptionModeProductSellExport=Mode sales exported in other countries
+OptionModeProductSellIntra=Tartibni sotish EECda eksport qilinadi
+OptionModeProductSellExport=Boshqa mamlakatlarga eksport qilingan tartibli sotuvlar
 OptionModeProductBuy=Sotib olish tartibi
-OptionModeProductBuyIntra=Mode purchases imported in EEC
-OptionModeProductBuyExport=Mode purchased imported from other countries
+OptionModeProductBuyIntra=EECga import qilingan rejimdagi xaridlar
+OptionModeProductBuyExport=Boshqa mamlakatlardan sotib olingan rejim sotib olingan
 OptionModeProductSellDesc=Sotish bo'yicha buxgalteriya hisobi bilan barcha mahsulotlarni ko'rsating.
-OptionModeProductSellIntraDesc=Show all products with accounting account for sales in EEC.
-OptionModeProductSellExportDesc=Show all products with accounting account for other foreign sales.
+OptionModeProductSellIntraDesc=EECda sotish uchun buxgalteriya hisobi bilan barcha mahsulotlarni ko'rsating.
+OptionModeProductSellExportDesc=Boshqa mahsulotlarni hisobga olish hisobi bilan barcha mahsulotlarni ko'rsating.
 OptionModeProductBuyDesc=Xaridlar uchun buxgalteriya hisobi bilan barcha mahsulotlarni ko'rsating.
-OptionModeProductBuyIntraDesc=Show all products with accounting account for purchases in EEC.
-OptionModeProductBuyExportDesc=Show all products with accounting account for other foreign purchases.
+OptionModeProductBuyIntraDesc=EECda sotib olish uchun buxgalteriya hisobi bilan barcha mahsulotlarni ko'rsating.
+OptionModeProductBuyExportDesc=Boshqa mahsulotlarni buxgalteriya hisobi bilan namoyish eting.
 CleanFixHistory=Hisob jadvallarida mavjud bo'lmagan chiziqlardan buxgalteriya kodini olib tashlang
 CleanHistory=Tanlangan yil uchun barcha bog'lanishlarni tiklang
-PredefinedGroups=Predefined groups
+PredefinedGroups=Oldindan belgilangan guruhlar
 WithoutValidAccount=Yaratilgan maxsus hisobsiz
 WithValidAccount=Yaratilgan maxsus hisob bilan
 ValueNotIntoChartOfAccount=Buxgalteriya hisobining bu qiymati hisob rejasida mavjud emas
-AccountRemovedFromGroup=Account removed from group
-SaleLocal=Local sale
-SaleExport=Export sale
-SaleEEC=Sale in EEC
-SaleEECWithVAT=Sale in EEC with a VAT not null, so we suppose this is NOT an intracommunautary sale and the suggested account is the standard product account.
-SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fallback on the product account for standard sales. You can fix the VAT ID of thirdparty or the product account if needed.
+AccountRemovedFromGroup=Hisob guruhdan olib tashlandi
+SaleLocal=Mahalliy sotuv
+SaleExport=Eksportni sotish
+SaleEEC=EECda sotish
+SaleEECWithVAT=EECda QQS bilan sotish bekor bo'lmaydi, shuning uchun bu kommunal ichki savdo emas va taklif qilingan hisob standart mahsulot hisobvarag'i.
+SaleEECWithoutVATNumber=EECda QQSsiz sotish, lekin uchinchi tomonning QQS identifikatori aniqlanmagan. Biz standart sotuvlar uchun mahsulot hisobiga tushamiz. Agar kerak bo'lsa, siz uchinchi tomonning QQS identifikatorini yoki mahsulot hisobini tuzatishingiz mumkin.
 
 ## Dictionary
 Range=Buxgalteriya hisobi doirasi
@@ -392,42 +393,42 @@ Calculated=Hisoblangan
 Formula=Formula
 
 ## Error
-SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
+SomeMandatoryStepsOfSetupWereNotDone=O'rnatishning ba'zi majburiy bosqichlari bajarilmadi, iltimos, ularni to'ldiring
 ErrorNoAccountingCategoryForThisCountry=%s mamlakati uchun buxgalteriya hisobi guruhi mavjud emas (Uyga qarang - O'rnatish - Lug'atlar)
-ErrorInvoiceContainsLinesNotYetBounded=You try to journalize some lines of the invoice <strong>%s</strong>, but some other lines are not yet bounded to accounting account. Journalization of all invoice lines for this invoice are refused.
-ErrorInvoiceContainsLinesNotYetBoundedShort=Some lines on invoice are not bound to accounting account.
+ErrorInvoiceContainsLinesNotYetBounded=Siz hisob-fakturaning ba'zi satrlarini jurnalga yozishga harakat qilyapsiz <strong> %s </strong>, ammo boshqa qatorlar hali buxgalteriya hisobi bilan chegaralanmagan. Ushbu hisob-faktura uchun barcha hisob-fakturalarni jurnalizatsiya qilish rad etiladi.
+ErrorInvoiceContainsLinesNotYetBoundedShort=Hisob-fakturadagi ba'zi satrlar buxgalteriya hisobi bilan bog'liq emas.
 ExportNotSupported=Ushbu sahifada eksport formati o'rnatilmagan
 BookeppingLineAlreayExists=Buxgalteriya hisobida mavjud bo'lgan chiziqlar
-NoJournalDefined=No journal defined
+NoJournalDefined=Hech qanday jurnal aniqlanmagan
 Binded=Chiziqlar bog'langan
 ToBind=Bog'lash uchun chiziqlar
-UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to make the binding manually
+UseMenuToSetBindindManualy=Chiziqlar hali bog'lanmagan, bog'lanishni qo'lda bajarish uchun <a href="%s"> %s </a> menyusidan foydalaning
 
 ## Import
-ImportAccountingEntries=Accounting entries
-ImportAccountingEntriesFECFormat=Accounting entries - FEC format
-FECFormatJournalCode=Code journal (JournalCode)
-FECFormatJournalLabel=Label journal (JournalLib)
-FECFormatEntryNum=Piece number (EcritureNum)
-FECFormatEntryDate=Piece date (EcritureDate)
-FECFormatGeneralAccountNumber=General account number (CompteNum)
-FECFormatGeneralAccountLabel=General account label (CompteLib)
-FECFormatSubledgerAccountNumber=Subledger account number (CompAuxNum)
-FECFormatSubledgerAccountLabel=Subledger account number (CompAuxLib)
-FECFormatPieceRef=Piece ref (PieceRef)
-FECFormatPieceDate=Piece date creation (PieceDate)
-FECFormatLabelOperation=Label operation (EcritureLib)
-FECFormatDebit=Debit (Debit)
-FECFormatCredit=Credit (Credit)
-FECFormatReconcilableCode=Reconcilable code (EcritureLet)
-FECFormatReconcilableDate=Reconcilable date (DateLet)
-FECFormatValidateDate=Piece date validated (ValidDate)
-FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
-FECFormatMulticurrencyCode=Multicurrency code (Idevise)
+ImportAccountingEntries=Buxgalteriya yozuvlari
+ImportAccountingEntriesFECFormat=Buxgalteriya yozuvlari - FEC formati
+FECFormatJournalCode=Kod jurnali (JournalCode)
+FECFormatJournalLabel=Yorliq jurnali (JournalLib)
+FECFormatEntryNum=Parcha raqami (EcritureNum)
+FECFormatEntryDate=Parcha sanasi (EcritureDate)
+FECFormatGeneralAccountNumber=Umumiy hisob raqami (CompteNum)
+FECFormatGeneralAccountLabel=Umumiy hisob yorlig'i (CompteLib)
+FECFormatSubledgerAccountNumber=Subledger hisob raqami (CompAuxNum)
+FECFormatSubledgerAccountLabel=Subledger hisob raqami (CompAuxLib)
+FECFormatPieceRef=Parcha ref (PieceRef)
+FECFormatPieceDate=Parcha sanasini yaratish (PieceDate)
+FECFormatLabelOperation=Yorliq bilan ishlash (EcritureLib)
+FECFormatDebit=Debet (Debet)
+FECFormatCredit=Kredit (Kredit)
+FECFormatReconcilableCode=Yarashtiriladigan kod (EcritureLet)
+FECFormatReconcilableDate=Yarashtiriladigan sana (DateLet)
+FECFormatValidateDate=Parcha sanasi tasdiqlangan (ValidDate)
+FECFormatMulticurrencyAmount=Ko'p valyuta miqdori (Montantdevise)
+FECFormatMulticurrencyCode=Ko'p valyuta kodi (Idevise)
 
-DateExport=Date export
+DateExport=Sana eksporti
 WarningReportNotReliable=Diqqat, ushbu hisobot daftarga asoslanmagan, shuning uchun daftarda qo'lda o'zgartirilgan bitimni o'z ichiga olmaydi. Agar sizning jurnalizatsiya dolzarb bo'lsa, buxgalteriya hisobi yanada aniqroq bo'ladi.
-ExpenseReportJournal=Expense Report Journal
-InventoryJournal=Inventory Journal
+ExpenseReportJournal=Xarajatlar bo'yicha hisobot jurnali
+InventoryJournal=Inventarizatsiya jurnali
 
-NAccounts=%s accounts
+NAccounts=%s hisob qaydnomalari
diff --git a/htdocs/langs/uz_UZ/admin.lang b/htdocs/langs/uz_UZ/admin.lang
index 323c5555826..becc16f45ca 100644
--- a/htdocs/langs/uz_UZ/admin.lang
+++ b/htdocs/langs/uz_UZ/admin.lang
@@ -37,15 +37,15 @@ UnlockNewSessions=Ulanish qulfini olib tashlang
 YourSession=Sizning sessiyangiz
 Sessions=Foydalanuvchilar sessiyalari
 WebUserGroup=Veb-server foydalanuvchisi / guruhi
-PermissionsOnFiles=Permissions on files
-PermissionsOnFilesInWebRoot=Permissions on files in web root directory
-PermissionsOnFile=Permissions on file %s
+PermissionsOnFiles=Fayllarga ruxsat
+PermissionsOnFilesInWebRoot=Veb-ildiz katalogidagi fayllarga ruxsat
+PermissionsOnFile=%s faylidagi ruxsatnomalar
 NoSessionFound=Sizning PHP konfiguratsiyangiz faol seanslar ro'yxatiga ruxsat berilmaganga o'xshaydi. Seanslarni saqlash uchun ishlatiladigan katalog (<b> %s </b>) himoyalangan bo'lishi mumkin (masalan, OS ruxsatnomalari yoki open_basedir PHP direktivasi bilan).
 DBStoringCharset=Ma'lumotlarni saqlash uchun ma'lumotlar bazasi belgisi
 DBSortingCharset=Ma'lumotlarni saralash uchun ma'lumotlar bazasi belgisi
-HostCharset=Host charset
-ClientCharset=Client charset
-ClientSortingCharset=Client collation
+HostCharset=Xost to'plami
+ClientCharset=Mijozlar to'plami
+ClientSortingCharset=Mijozlarni taqqoslash
 WarningModuleNotActive=<b> %s </b> moduli yoqilgan bo'lishi kerak
 WarningOnlyPermissionOfActivatedModules=Bu erda faqat faollashtirilgan modullarga tegishli ruxsatlar ko'rsatilgan. Boshqa modullarni Home-> Setup-> Modules sahifasida faollashtirishingiz mumkin.
 DolibarrSetup=Dolibarr-ni o'rnating yoki yangilang
@@ -53,18 +53,19 @@ InternalUser=Ichki foydalanuvchi
 ExternalUser=Tashqi foydalanuvchi
 InternalUsers=Ichki foydalanuvchilar
 ExternalUsers=Tashqi foydalanuvchilar
+UserInterface=User interface
 GUISetup=Displey
 SetupArea=Sozlash; o'rnatish
-UploadNewTemplate=Upload new template(s)
+UploadNewTemplate=Yangi shablon (lar) ni yuklash
 FormToTestFileUploadForm=Faylni yuklashni sinab ko'rish uchun shakl (sozlash bo'yicha)
-ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
-ModuleIsEnabled=The module/application <b>%s</b> has been enabled
+ModuleMustBeEnabled=<b> %s </b> moduli / ilovasi yoqilgan bo'lishi kerak
+ModuleIsEnabled=<b> %s </b> moduli / ilovasi yoqilgan
 IfModuleEnabled=Eslatma: ha faqat <b> %s </b> moduli yoqilgan taqdirda samarali bo'ladi.
 RemoveLock=Yangilash / O'rnatish vositasidan foydalanishga ruxsat berish uchun fayl mavjud bo'lsa, uni o'chirish / qayta nomlash <b> %s </b>.
 RestoreLock=Yangilash / O'rnatish vositasidan boshqa foydalanishni o'chirish uchun faqat o'qish uchun ruxsat berilgan holda <b> %s </b> faylini tiklang.
 SecuritySetup=Xavfsizlikni sozlash
-PHPSetup=PHP setup
-OSSetup=OS setup
+PHPSetup=PHP-ni sozlash
+OSSetup=OS sozlamalari
 SecurityFilesDesc=Fayllarni yuklash bilan bog'liq xavfsizlik bilan bog'liq variantlarni bu erda aniqlang.
 ErrorModuleRequirePHPVersion=Xato, ushbu modulda PHP-ning %s yoki undan yuqori versiyasi talab qilinadi
 ErrorModuleRequireDolibarrVersion=Xato, ushbu modulda Dolibarr %s yoki undan yuqori versiyasi talab qilinadi
@@ -74,20 +75,20 @@ Dictionary=Lug'atlar
 ErrorReservedTypeSystemSystemAuto="System" va "systemauto" qiymati saqlanib qolgan. O'zingizning yozuvingizni qo'shish uchun "foydalanuvchi" dan qiymat sifatida foydalanishingiz mumkin
 ErrorCodeCantContainZero=Kod 0 qiymatini o'z ichiga olmaydi
 DisableJavascript=JavaScript va Ajax funktsiyalarini o'chirib qo'ying
-DisableJavascriptNote=Note: For test or debug purpose. For optimization for blind person or text browsers, you may prefer to use the setup on the profile of user
+DisableJavascriptNote=Izoh: Sinov yoki disk raskadrovka maqsadida. Ko'zi ojizlar yoki matnli brauzerlar uchun optimallashtirish uchun siz foydalanuvchi profilidagi sozlamalardan foydalanishni afzal ko'rishingiz mumkin
 UseSearchToSelectCompanyTooltip=Agar sizda uchinchi tomonlar soni ko'p bo'lsa (> 100 000), tezlikni COMPANY_DONOTSEARCH_ANYWHERE-ni Setup-> Other-da 1-ga o'rnatish orqali oshirishingiz mumkin. Keyin qidirish satr boshlanishi bilan cheklanadi.
 UseSearchToSelectContactTooltip=Agar sizda uchinchi tomonlar soni juda katta bo'lsa (> 100 000), siz CONTACT_DONOTSEARCH_ANYWHERE doimiyligini O'rnatish -> Boshqalar-da 1 ga o'rnatish orqali tezlikni oshirishingiz mumkin. Keyin qidirish satr boshlanishi bilan cheklanadi.
 DelaiedFullListToSelectCompany=Uchinchi tomonlarning birlashtirilgan ro'yxati tarkibini yuklashdan oldin tugma bosilguncha kuting. <br> Agar sizda uchinchi tomonlar ko'p bo'lsa, bu unumdorlikni oshirishi mumkin, ammo bu unchalik qulay emas.
 DelaiedFullListToSelectContact=Kontaktlar ro'yxati tarkibini yuklashdan oldin tugma bosilguncha kuting. <br> Agar sizda ko'plab kontaktlar mavjud bo'lsa, bu ishlashni oshirishi mumkin, ammo bu unchalik qulay emas.
 NumberOfKeyToSearch=Qidiruvni boshlash uchun belgilar soni: %s
-NumberOfBytes=Number of Bytes
-SearchString=Search string
+NumberOfBytes=Baytlar soni
+SearchString=Qidiruv qatori
 NotAvailableWhenAjaxDisabled=Ajax o'chirib qo'yilganda mavjud emas
 AllowToSelectProjectFromOtherCompany=Uchinchi shaxsning hujjatida boshqa uchinchi tomon bilan bog'langan loyihani tanlashi mumkin
 JavascriptDisabled=JavaScript o'chirilgan
 UsePreviewTabs=Oldindan ko'rish yorliqlaridan foydalaning
 ShowPreview=Oldindan ko'rishni ko'rsatish
-ShowHideDetails=Show-Hide details
+ShowHideDetails=Tafsilotlarni ko'rsatish-yashirish
 PreviewNotAvailable=Oldindan ko‘rib chiqish imkoniyati mavjud emas
 ThemeCurrentlyActive=Mavzu hozirda faol
 MySQLTimeZone=TimeZone MySql (ma'lumotlar bazasi)
@@ -138,18 +139,18 @@ DaylingSavingTime=Yozgi vaqt
 CurrentHour=PHP vaqti (server)
 CurrentSessionTimeOut=Joriy mashg'ulotning tanaffusi
 YouCanEditPHPTZ=Boshqa PHP vaqt zonasini o'rnatish uchun (shart emas), siz "SetEnv TZ Europe / Paris" kabi qator bilan .htaccess faylini qo'shishga urinib ko'rishingiz mumkin.
-HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but of the timezone of the server.
+HoursOnThisPageAreOnServerTZ=Ogohlantirish, boshqa ekranlardan farqli o'laroq, ushbu sahifadagi soatlar sizning mahalliy vaqt mintaqangizda emas, balki serverning vaqt zonasida.
 Box=Vidjet
 Boxes=Vidjetlar
 MaxNbOfLinesForBoxes=Maks. vidjetlar uchun qatorlar soni
-AllWidgetsWereEnabled=All available widgets are enabled
+AllWidgetsWereEnabled=Barcha mavjud vidjetlar yoqilgan
 PositionByDefault=Standart buyurtma
 Position=Lavozim
 MenusDesc=Menyu menejerlari ikkita menyu satrining tarkibini belgilaydilar (gorizontal va vertikal).
 MenusEditorDesc=Menyu muharriri maxsus menyu yozuvlarini aniqlashga imkon beradi. Beqarorlik va menyuga doimiy ravishda kirib bo'lmaydigan yozuvlarni oldini olish uchun uni diqqat bilan ishlating. <br> Ba'zi modullar menyu yozuvlarini qo'shadilar (menyuda <b> Hammasi asosan </b>). Agar siz ushbu yozuvlarning bir qismini xato bilan olib tashlasangiz, ularni o'chirib qo'yish va modulni qayta tiklashni tiklashingiz mumkin.
 MenuForUsers=Foydalanuvchilar uchun menyu
 LangFile=.lang fayli
-Language_en_US_es_MX_etc=Language (en_US, es_MX, ...)
+Language_en_US_es_MX_etc=Til (en_US, es_MX, ...)
 System=Tizim
 SystemInfo=Tizim haqida ma'lumot
 SystemToolsArea=Tizim asboblari maydoni
@@ -163,7 +164,7 @@ PurgeDeleteAllFilesInDocumentsDir=Katalogdagi barcha fayllarni o'chirib tashlang
 PurgeRunNow=Hozir tozalang
 PurgeNothingToDelete=O'chirish uchun katalog yoki fayl yo'q.
 PurgeNDirectoriesDeleted= <b> %s </b> fayllari yoki kataloglari o'chirildi.
-PurgeNDirectoriesFailed=Failed to delete <b>%s</b> files or directories.
+PurgeNDirectoriesFailed=<b> %s </b> fayllari yoki kataloglari o'chirilmadi.
 PurgeAuditEvents=Barcha xavfsizlik tadbirlarini tozalang
 ConfirmPurgeAuditEvents=Barcha xavfsizlik tadbirlarini tozalamoqchimisiz? Barcha xavfsizlik jurnallari o'chiriladi, boshqa ma'lumotlar o'chirilmaydi.
 GenerateBackup=Zaxira nusxasini yarating
@@ -186,8 +187,8 @@ Compression=Siqish
 CommandsToDisableForeignKeysForImport=Import paytida chet el kalitlarini o'chirib qo'yish buyrug'i
 CommandsToDisableForeignKeysForImportWarning=SQL dump-ni keyinroq tiklashni xohlasangiz, majburiydir
 ExportCompatibility=Yaratilgan eksport faylining mosligi
-ExportUseMySQLQuickParameter=Use the --quick parameter
-ExportUseMySQLQuickParameterHelp=The '--quick' parameter helps limit RAM consumption for large tables.
+ExportUseMySQLQuickParameter=--Quick parametridan foydalaning
+ExportUseMySQLQuickParameterHelp='--Quick' parametri katta jadvallar uchun RAM sarfini cheklashga yordam beradi.
 MySqlExportParameters=MySQL eksport parametrlari
 PostgreSqlExportParameters= PostgreSQL eksport parametrlari
 UseTransactionnalMode=Tranzaksiya rejimidan foydalaning
@@ -211,31 +212,31 @@ ModulesDesc=Modullar / dasturlar dasturiy ta'minotda qaysi funktsiyalar mavjudli
 ModulesMarketPlaceDesc=Internetda tashqi veb-saytlarda yuklab olish uchun ko'proq modullarni topishingiz mumkin ...
 ModulesDeployDesc=Agar sizning fayl tizimingizdagi ruxsatnomalar bunga yo'l qo'ysa, siz ushbu vositadan tashqi modulni joylashtirish uchun foydalanishingiz mumkin. Keyin modul <strong> %s </strong> yorlig'ida ko'rinadi.
 ModulesMarketPlaces=Tashqi ilova / modullarni toping
-ModulesDevelopYourModule=Develop your own app/modules
-ModulesDevelopDesc=You may also develop your own module or find a partner to develop one for you.
-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 perform the search on the external market place for you (may be slow, need an internet access)...
-NewModule=New module
-FreeModule=Free
-CompatibleUpTo=Compatible with version %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
-SeeSetupOfModule=See setup of module %s
-SetOptionTo=Set option <b>%s</b> to %s
-Updated=Updated
-AchatTelechargement=Buy / Download
+ModulesDevelopYourModule=O'zingizning ilova / modullaringizni ishlab chiqing
+ModulesDevelopDesc=Shuningdek, siz o'zingizning modulingizni ishlab chiqishingiz yoki o'zingiz uchun ishlab chiqadigan sherik topishingiz mumkin.
+DOLISTOREdescriptionLong=Tashqi modulni topish uchun <a href="https://www.dolistore.com"> www.dolistore.com </a> veb-saytini yoqish o'rniga siz o'zingiz uchun tashqi bozorda qidiruvni amalga oshiradigan ushbu ichki vositadan foydalanishingiz mumkin (sekin bo'lishi mumkin, Internetga kirish kerak) ...
+NewModule=Yangi modul
+FreeModule=Ozod
+CompatibleUpTo=%s versiyasi bilan mos keladi
+NotCompatible=Ushbu modul sizning Dolibarr %s (Min %s - Max %s) bilan mos kelmaydi.
+CompatibleAfterUpdate=Ushbu modul sizning Dolibarr %s (Min %s - Max %s) uchun yangilanishni talab qiladi.
+SeeInMarkerPlace=Bozor joyida ko'ring
+SeeSetupOfModule=%s modulini o'rnatishga qarang
+SetOptionTo=<b> %s </b> ni %s ga sozlang
+Updated=Yangilandi
+AchatTelechargement=Sotib olish / yuklab olish
 GoModuleSetupArea=Yangi modulni joylashtirish / o'rnatish uchun Modulni sozlash maydoniga o'ting: <a href="%s"> %s </a>.
 DoliStoreDesc=DoliStore, Dolibarr ERP / CRM tashqi modullari uchun rasmiy bozor
 DoliPartnersDesc=Maxsus ishlab chiqilgan modullar yoki xususiyatlarni taqdim etadigan kompaniyalar ro'yxati. <br> Eslatma: Dolibarr ochiq kodli dastur bo'lgani uchun, <i> PHP dasturlashda tajribali </i> kimdir modul ishlab chiqishi kerak.
 WebSiteDesc=Qo'shimcha (yadroli bo'lmagan) modullar uchun tashqi veb-saytlar ...
-DevelopYourModuleDesc=Some solutions to develop your own module...
+DevelopYourModuleDesc=O'zingizning modulingizni ishlab chiqish uchun ba'zi echimlar ...
 URL=URL manzili
-RelativeURL=Relative URL
+RelativeURL=Nisbiy URL
 BoxesAvailable=Vidjetlar mavjud
 BoxesActivated=Vidjetlar faollashtirildi
 ActivateOn=Yoqish
 ActiveOn=Yoqilgan
-ActivatableOn=Activatable on
+ActivatableOn=Faollashtirilishi mumkin
 SourceFile=Manba fayli
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Faqatgina JavaScript o'chirib qo'yilmagan bo'lsa mavjud
 Required=Majburiy
@@ -259,9 +260,9 @@ OfficialMarketPlace=Tashqi modullar / qo'shimchalar uchun rasmiy bozor joyi
 OfficialWebHostingService=Yuborilgan veb-xosting xizmatlari (Cloud hosting)
 ReferencedPreferredPartners=Afzal sheriklar
 OtherResources=Boshqa manbalar
-ExternalResources=External Resources
-SocialNetworks=Social Networks
-SocialNetworkId=Social Network ID
+ExternalResources=Tashqi manbalar
+SocialNetworks=Ijtimoiy tarmoqlar
+SocialNetworkId=Ijtimoiy tarmoq identifikatori
 ForDocumentationSeeWiki=<br> foydalanuvchi yoki ishlab chiquvchi hujjatlari uchun (Dolib, Savol-javoblar ...) Dolibarr Wiki-ga qarang: <br> <b> <a href="%s" target="_blank"> %s a0e40dc079cf87
 ForAnswersSeeForum=Boshqa savollar / yordam uchun siz Dolibarr forumidan foydalanishingiz mumkin: <br> <b> <a href="%s" target="_blank"> %s </a> </b>
 HelpCenterDesc1=Dolibarr bilan yordam va yordam olish uchun ba'zi manbalar.
@@ -281,8 +282,8 @@ NewByMonth=Oyga yangi
 Emails=Elektron pochta xabarlari
 EMailsSetup=Elektron pochta xabarlarini sozlash
 EMailsDesc=Ushbu sahifa sizga elektron pochta xabarlarini yuborish parametrlari yoki parametrlarini o'rnatishga imkon beradi.
-EmailSenderProfiles=Emails sender profiles
-EMailsSenderProfileDesc=You can keep this section empty. If you enter some emails here, they will be added to the list of possible senders into the combobox when your write a new email.
+EmailSenderProfiles=Elektron pochta xabarlarini yuboruvchi profillari
+EMailsSenderProfileDesc=Siz ushbu bo'limni bo'sh qoldirishingiz mumkin. Agar siz bu erga ba'zi elektron pochta xabarlarini kiritsangiz, ular yangi elektron pochta xabarini yozganingizda, ularni qutilarga yuborish mumkin bo'lganlar ro'yxatiga qo'shiladi.
 MAIN_MAIL_SMTP_PORT=SMTP / SMTPS porti (php.ini-da standart qiymat: <b> %s </b>)
 MAIN_MAIL_SMTP_SERVER=SMTP / SMTPS Host (php.ini-da standart qiymat: <b> %s </b>)
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP / SMTPS porti (Unix-ga o'xshash tizimlarda PHP-da aniqlanmagan)
@@ -291,18 +292,18 @@ MAIN_MAIL_EMAIL_FROM=Avtomatik elektron pochta xabarlari uchun jo'natuvchi elekt
 MAIN_MAIL_ERRORS_TO=Xato uchun foydalanilgan elektron pochta xabarlarini qaytaradi (elektron pochtalarda "Xatolar" maydonlari)
 MAIN_MAIL_AUTOCOPY_TO= Barcha elektron pochta xabarlarini nusxa ko'chiring (Bcc)
 MAIN_DISABLE_ALL_MAILS=Barcha elektron pochta xabarlarini yuborishni o'chirib qo'ying (sinov maqsadida yoki namoyish uchun)
-MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
-MAIN_MAIL_ENABLED_USER_DEST_SELECT=Suggest emails of employees (if defined) into the list of predefined recipient when writing a new email
+MAIN_MAIL_FORCE_SENDTO=Barcha elektron pochta xabarlarini yuboring (haqiqiy qabul qiluvchilar o'rniga, sinov maqsadida)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Yangi elektron pochta xabarini yozishda oldindan aniqlangan qabul qiluvchilar ro'yxatiga xodimlarning elektron pochta xabarlarini (agar aniqlangan bo'lsa) taklif eting
 MAIN_MAIL_SENDMODE=Elektron pochta xabarlarini yuborish usuli
 MAIN_MAIL_SMTPS_ID=SMTP identifikatori (agar serverni yuborish autentifikatsiyani talab qilsa)
 MAIN_MAIL_SMTPS_PW=SMTP paroli (agar serverni yuborish autentifikatsiyani talab qilsa)
 MAIN_MAIL_EMAIL_TLS=TLS (SSL) shifrlashdan foydalaning
 MAIN_MAIL_EMAIL_STARTTLS=TLS (STARTTLS) shifrlashdan foydalaning
-MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
-MAIN_MAIL_EMAIL_DKIM_ENABLED=Use DKIM to generate email signature
-MAIN_MAIL_EMAIL_DKIM_DOMAIN=Email Domain for use with dkim
-MAIN_MAIL_EMAIL_DKIM_SELECTOR=Name of dkim selector
-MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY=Private key for dkim signing
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Les sertifikatlariga avtomatik imzo qo'yishga ruxsat berish
+MAIN_MAIL_EMAIL_DKIM_ENABLED=Elektron pochta imzosini yaratish uchun DKIM-dan foydalaning
+MAIN_MAIL_EMAIL_DKIM_DOMAIN=Dkim bilan ishlatish uchun elektron pochta domeniga
+MAIN_MAIL_EMAIL_DKIM_SELECTOR=Dkim selektorining nomi
+MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY=Dkim imzosi uchun shaxsiy kalit
 MAIN_DISABLE_ALL_SMS=Barcha SMS-xabarlarni yuborishni o'chirib qo'ying (sinov maqsadida yoki namoyish uchun)
 MAIN_SMS_SENDMODE=SMS yuborishda foydalanish usuli
 MAIN_MAIL_SMS_FROM=SMS yuborish uchun standart yuboruvchi telefon raqami
@@ -310,7 +311,7 @@ MAIN_MAIL_DEFAULT_FROMTYPE=Qo'lda yuborish uchun standart yuboruvchi elektron po
 UserEmail=Foydalanuvchi elektron pochtasi
 CompanyEmail=Kompaniyaning elektron pochtasi
 FeatureNotAvailableOnLinux=Xususiyat Unix tizimlarida mavjud emas. Sendmail dasturini mahalliy darajada sinab ko'ring.
-FixOnTransifex=Fix the translation on the online translation platform of project
+FixOnTransifex=Tarjimani loyihaning onlayn tarjima platformasida tuzating
 SubmitTranslation=Agar ushbu til uchun tarjima tugallanmagan bo'lsa yoki siz xatolarni topsangiz, buni <b> langs / %s </b> katalogidagi fayllarni tahrirlash orqali o'zgartirishingiz va o'zgartirishingizni www.transifex.com/dolibarr-association/dolibarr/ ga yuborishingiz mumkin.
 SubmitTranslationENUS=Agar ushbu til uchun tarjima tugallanmagan bo'lsa yoki xatolarni topsangiz, uni fayllarni <b> langs / %s </b> katalogiga tahrirlash va o'zgartirilgan fayllarni dolibarr.org/forum saytiga yuborish yoki agar ishlab chiquvchi bo'lsangiz, github-da PR bilan tuzatish orqali tuzatishingiz mumkin. .com / Dolibarr / dolibarr
 ModuleSetup=Modulni sozlash
@@ -347,14 +348,14 @@ CurrentVersion=Dolibarrning joriy versiyasi
 CallUpdatePage=Ma'lumotlar bazasi tuzilishi va ma'lumotlarini yangilaydigan sahifani ko'rib chiqing: %s.
 LastStableVersion=Oxirgi barqaror versiya
 LastActivationDate=So'nggi faollashtirilgan sana
-LastActivationAuthor=Latest activation author
-LastActivationIP=Latest activation IP
+LastActivationAuthor=Eng so'nggi faollashtirish muallifi
+LastActivationIP=So'nggi faollashtirilgan IP
 UpdateServerOffline=Serverni oflayn rejimda yangilang
-WithCounter=Manage a counter
+WithCounter=Hisoblagichni boshqarish
 GenericMaskCodes=Siz istalgan raqamlash maskasini kiritishingiz mumkin. Ushbu niqobda quyidagi teglardan foydalanish mumkin: <br> <b> {000000} </b> har bir %s bo'yicha ko'paytiriladigan raqamga mos keladi. Hisoblagichning istalgan uzunligidagi nollarni kiriting. Niqob kabi shuncha nolga ega bo'lish uchun hisoblagich chap tomondan nollar bilan to'ldiriladi. <br> <b> {000000 + 000} </b> oldingi bilan bir xil, lekin + belgisining o'ng tomonidagi raqamga mos keladigan ofset birinchi %s dan boshlab qo'llaniladi. <br> <b> {000000 @ x} </b> oldingisiga o'xshash, ammo x oyiga yetganda hisoblagich nolga o'rnatiladi (x 1 dan 12 gacha yoki 0 sizning konfiguratsiyangizda aniqlangan moliya yilining dastlabki oylaridan foydalanish uchun, yoki 99 dan har oy nolga qaytarish). Agar ushbu parametr ishlatilsa va x 2 yoki undan yuqori bo'lsa, unda {yy} {mm} yoki {yyyy} {mm} ketma-ketligi ham talab qilinadi. <br> <b> {dd} </b> kun (01 dan 31 gacha). <br> <b> {mm} </b> oy (01 dan 12 gacha). <br> <b> {yy} </b>, <b> {yyyy} </b> yoki <b> {y} af90, y0 a79 <br>
 GenericMaskCodes2= <b> {cccc} </b> n kodidagi mijoz kodi <br> <b> {cccc000} a09a4b8 client Xaridorga bag'ishlangan ushbu hisoblagich global hisoblagich bilan bir vaqtning o'zida tiklanadi. <br> <b> {tttt} </b> n belgidagi uchinchi tomon kodining kodi (Uy - O'rnatish - Lug'at - Uchinchi tomon turlari menyusiga qarang). Agar siz ushbu yorliqni qo'shsangiz, hisoblagich har bir uchinchi tomon turi uchun farq qiladi. <br>
 GenericMaskCodes3=Maskadagi barcha boshqa belgilar buzilmasdan qoladi. <br> bo'sh joylarga ruxsat berilmaydi. <br>
-GenericMaskCodes3EAN=All other characters in the mask will remain intact (except * or ? in 13th position in EAN13).<br>Spaces are not allowed.<br>In EAN13, the last character after the last } in 13th position should be * or ? . It will be replaced by the calculated key.<br>
+GenericMaskCodes3EAN=Maskadagi barcha boshqa belgilar buzilmasdan qoladi (* yoki "EAN13" ning 13-pozitsiyasidan tashqari). <br> bo'sh joylarga ruxsat berilmaydi. <br> EAN13 da 13-o'rinda oxirgi} dan keyin oxirgi belgi * yoki bo'lishi kerak? . U hisoblangan kalit bilan almashtiriladi. <br>
 GenericMaskCodes4a= <u> uchinchi tomon TheCompany kompaniyasining 99-chi %s-dagi misoli, 2007-01-31 sanasi bilan: </u> <br>
 GenericMaskCodes4b= <u> 2007-03-01 da yaratilgan uchinchi tomonga misol: </u> <br>
 GenericMaskCodes4c= <u> 2007-03-01 da yaratilgan mahsulotga misol: </u> <br>
@@ -377,7 +378,7 @@ AddCRIfTooLong=Matnni avtomatik o'rash mavjud emas, juda uzun bo'lgan matn hujja
 ConfirmPurge=Ushbu tozalashni amalga oshirishni xohlaysizmi? <br> bu sizning barcha ma'lumotlar fayllaringizni qayta tiklashning imkoni bo'lmagan holda butunlay yo'q qiladi (ECM fayllari, biriktirilgan fayllar ...).
 MinLength=Minimal uzunlik
 LanguageFilesCachedIntoShmopSharedMemory=Fayllar .lang umumiy xotiraga yuklandi
-LanguageFile=Language file
+LanguageFile=Til fayli
 ExamplesWithCurrentSetup=Joriy konfiguratsiyaga misollar
 ListOfDirectories=OpenDocument shablonlari kataloglari ro'yxati
 ListOfDirectoriesForModelGenODT=OpenDocument formatidagi shablon fayllarini o'z ichiga olgan kataloglar ro'yxati. <br> <br> kataloglarning to'liq yo'lini qo'ying. <br> eah katalogi orasida karetka qaytishini qo'shing. <br> GED moduli katalogini qo'shish uchun bu erga <b> DOL_DATA_ROOT / ecm / yourdirectoryname </b> qo'shing. <br> <br> Ushbu kataloglardagi fayllar <b> .odt </b> yoki <b> .ods </b> bilan tugashi kerak.
@@ -399,12 +400,12 @@ SecurityToken=Xavfsiz URL manzillari uchun kalit
 NoSmsEngine=SMS yuboruvchi menejeri mavjud emas. SMS yuboruvchisi menejeri standart tarqatish bilan o'rnatilmagan, chunki ular tashqi sotuvchiga bog'liq, ammo siz ularni %s da topishingiz mumkin.
 PDF=PDF
 PDFDesc=PDF yaratish uchun global imkoniyatlar
-PDFOtherDesc=PDF Option specific to some modules
+PDFOtherDesc=Ba'zi bir modullarga xos bo'lgan PDF-variant
 PDFAddressForging=Manzil bo'limi qoidalari
 HideAnyVATInformationOnPDF=Savdo solig'i / QQS bilan bog'liq barcha ma'lumotlarni yashirish
-PDFRulesForSalesTax=Rules for Sales Tax / VAT
-PDFLocaltax=Rules for %s
-HideLocalTaxOnPDF=Hide %s rate in column Sale Tax / VAT
+PDFRulesForSalesTax=Savdo solig'i / QQS bo'yicha qoidalar
+PDFLocaltax=%s uchun qoidalar
+HideLocalTaxOnPDF=%s stavkasini sotish bo'yicha soliq / QQS ustunida yashiring
 HideDescOnPDF=Mahsulotlar tavsifini yashirish
 HideRefOnPDF=Mahsulotlarni yashirish ref.
 HideDetailsOnPDF=Mahsulot liniyalari tafsilotlarini yashirish
@@ -419,12 +420,12 @@ OldVATRates=Eski QQS stavkasi
 NewVATRates=QQSning yangi stavkasi
 PriceBaseTypeToChange=Belgilangan asosiy mos yozuvlar qiymati bilan narxlarni o'zgartiring
 MassConvert=Ommaviy konversiyani ishga tushiring
-PriceFormatInCurrentLanguage=Price Format In Current Language
+PriceFormatInCurrentLanguage=Joriy tilda narxlar formati
 String=Ip
-String1Line=String (1 line)
+String1Line=Ip (1 qator)
 TextLong=Uzoq matn
-TextLongNLines=Long text (n lines)
-HtmlText=Html text
+TextLongNLines=Uzoq matn (n satr)
+HtmlText=HTML matni
 Int=Butun son
 Float=Float
 DateAndTime=Sana va soat
@@ -442,18 +443,18 @@ ExtrafieldRadio=Radio tugmalari (faqat bitta tanlov)
 ExtrafieldCheckBox=Belgilash katakchalari
 ExtrafieldCheckBoxFromList=Jadvaldagi katakchalar
 ExtrafieldLink=Ob'ektga havola
-ComputedFormula=Computed field
-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->fetchNoCompute($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->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
-Computedpersistent=Store computed field
-ComputedpersistentDesc=Computed extra fields will be stored in the database, however, the value will only be recalculated when the object of this field is changed. If the computed field depends on other objects or global data this value might be wrong!!
-ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored without encryption (field must be only hidden with star on screen).<br>Set  'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retrieve original value)
+ComputedFormula=Hisoblangan maydon
+ComputedFormulaDesc=Siz bu erda ob'ektning boshqa xususiyatlaridan foydalangan holda formulani yoki har qanday PHP kodlashni dinamik hisoblash qiymatini olish uchun kiritishingiz mumkin. Siz har qanday PHP-ga mos formulalardan foydalanishingiz mumkin, "?" shart operatori va quyidagi global ob'ekt: <strong> $ db, $ conf, $ langs, $ mysoc, $ user, $ object </strong>. <br> <strong> OGOHLANTIRISH </strong>: $ ob'ektining faqat ba'zi xususiyatlari mavjud bo'lishi mumkin. Agar sizga yuklanmagan xususiyatlar kerak bo'lsa, faqat ikkinchi misolda bo'lgani kabi o'zingizning formulangizga o'zingizning ob'ektingizni kiriting. <br> Hisoblangan maydondan foydalanish o'zingizga interfeysdan hech qanday qiymat kiritib bo'lmasligingizni anglatadi. Bundan tashqari, agar sintaksis xatosi bo'lsa, formuladan hech narsa qaytmasligi mumkin. <br> <br> Formulaga misol: <br> $ object-> id < 10 ? round($object-> id / 2, 2): ($ object-> id + 2 * $ user-> id) * (int) substr ($ mysoc-> zip, 1, <br> <br> Ob'ektni qayta yuklash uchun misol <br> (($ reloadedobj = new Societe ($ db))) && ($ reloadedobj-> fetchNoCompute ($ obj-> id? $ obj-> id: $ obj > rowid: $ object-> id))> 0))? $ reloadedobj-> array_options ['options_extrafieldkey'] * $ reloadedobj-> capital / 5: '-1' <br> <br> Ob'ektni va uning asosiy ob'ektini majburlash uchun boshqa formulaga misol: <br> (($ Task yangi = )) && ($ reloadedobj-> fetchNoCompute ($ object-> id)> 0) && ($ secondloadedobj = new Project ($ db)) && ($ secondloadedobj-> fetchNoCompute ($ reloadedobj-> fk_project)> 0))? $ secondloadedobj-> ref: 'Asosiy loyiha topilmadi'
+Computedpersistent=Hisoblangan maydonni saqlash
+ComputedpersistentDesc=Hisoblangan qo'shimcha maydonlar ma'lumotlar bazasida saqlanadi, ammo qiymat faqat ushbu maydon ob'ekti o'zgartirilganda qayta hisoblanadi. Agar hisoblangan maydon boshqa ob'ektlarga yoki global ma'lumotlarga bog'liq bo'lsa, bu qiymat noto'g'ri bo'lishi mumkin !!
+ExtrafieldParamHelpPassword=Ushbu maydonni bo'sh qoldirish bu qiymat shifrlashsiz saqlanishini anglatadi (maydon faqat ekrandagi yulduz bilan yashirilgan bo'lishi kerak). <br> parolni ma'lumotlar bazasiga saqlash uchun standart shifrlash qoidasidan foydalanish uchun "avtomatik" ni o'rnating (u holda o'qilgan qiymat faqat xash bo'ladi, asl qiymatini olishning imkoni yo'q)
 ExtrafieldParamHelpselect=Qadriyatlar ro'yxati format bo'lishi kerak, bu erda kalit '0' bo'lishi mumkin emas <br> masalan: <br> 2, value2 <br> boshqa to'ldiruvchi xususiyati ro'yxatida qarab ro'yxati: <br> 1, VALUE1 | options_ <i> parent_list_code </i>: parent_key <br> 2, değer2 | options_ <i> parent_list_code </i>: maqsadida parent_key <br> <br> boshqa ro'yxatiga qarab ro'yxatini ega bo'lishi: <br> 1, VALUE1 | <i> parent_list_code </i>: parent_key <br> 2, value2 | <i> parent_list_code </i>: parent_key
 ExtrafieldParamHelpcheckbox=Qadriyatlar ro'yxati format kaliti bo'lgan satrlardan iborat bo'lishi kerak, (agar bu erda '0' bo'lishi mumkin emas) <br> <br> masalan: <br> 1, value1 <br> 2, value2 <br> 3 ,03f03f
 ExtrafieldParamHelpradio=Qadriyatlar ro'yxati format kaliti bo'lgan satrlardan iborat bo'lishi kerak, (agar bu erda '0' bo'lishi mumkin emas) <br> <br> masalan: <br> 1, value1 <br> 2, value2 <br> 3 ,03f03f
 ExtrafieldParamHelpsellist=Qadriyatlar ro'yxati <br> jadvalidan kelib chiqadi Sintaksis: table_name: label_field: id_field :: filtersql <br> Masalan: c_typent: libelle: id :: filtersql <br> <br> aqqf - 194 <br> faol qiymatini ko'rsatish uchun oddiy sinov bo'lishi mumkin (masalan, faol = 1) Siz shuningdek, joriy ob'ekt <br> ning joriy identifikatori bo'lgan filtrda $ ID $ dan foydalanishingiz mumkin, SELECTni filtrga ishlatish uchun $ SEL $ kalit so'zidan foydalaning in'ektsiyaga qarshi himoya qilishni chetlab o'tish. <br>, agar siz ekstra maydonlarda filtrlashni xohlasangiz, sintaksisidan foydalaning extra.fieldcode = ... (bu erda maydon kodi ekstrafildagi koddir) <br> <br> Boshqa qo'shimcha xususiyatlar ro'yxatiga qarab ro'yxatga ega bo'lish uchun: <br> cty: <i> parent_list_code </i> | parent_column: filter <br> <br> Boshqa ro'yxatga qarab ro'yxatga ega bo'lish uchun: <br> c_typent: libelle: parent0 :000800_0_0_0_0_n_06_b_n_06
 ExtrafieldParamHelpchkbxlst=Qadriyatlar ro'yxati <br> jadvalidan olingan Sintaksis: table_name: label_field: id_field :: filtersql <br> Misol: c_typent: libelle: id :: filtersql <br> <br> filter faqat oddiy bo'lishi mumkin jodugarda $ ID $ ni ishlatishi mumkin, bu joriy ob'ektning identifikatori <br> Filtrda SELECT qilish uchun $ SEL $ <br> dan foydalaning, agar ekstra maydonlarda filtrlashni xohlasangiz, sintaksisidan foydalaning. extra.fieldcode = ... (bu erda maydon kodi extrafield kodi) <br> <br> boshqa to'ldiruvchi xususiyati ro'yxatida qarab ro'yxatini bo'lishi uchun: <br> c_typent: libelle: id: options_ <i> parent_list_code </i> | parent_column: filtri <br> <br> boshqa ro'yxatiga qarab ro'yxatini ega bo'lish uchun: <br> c_typent: libelle: id: <i> parent_list_code </i> | parent_column: filter
 ExtrafieldParamHelplink=Parametrlar ObjectName: Classpath <br> sintaksis: ObjectName: Classpath bo'lishi kerak
-ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
+ExtrafieldParamHelpSeparator=<br> oddiy ajratuvchisi uchun bo'sh joyni saqlang holat har bir foydalanuvchi seansida saqlanadi)
 LibraryToBuildPDF=PDF yaratish uchun foydalaniladigan kutubxona
 LocalTaxDesc=Ba'zi mamlakatlar har bir faktura satrida ikki yoki uchta soliqni qo'llashlari mumkin. Agar shunday bo'lsa, ikkinchi va uchinchi soliq turini va uning stavkasini tanlang. Mumkin bo'lgan turlari: <br> 1: Mahsulotlar va xizmatlarga mahalliy soliq QQSsiz qo'llaniladi (mahalliy soliq soliqsiz miqdorda hisoblab chiqiladi) <br> 2: Mahsulotlar va xizmatlarga mahalliy soliq, shu jumladan QQS (localtax summa + asosiy soliq bo'yicha hisoblanadi) <br> 3: Mahalliy soliq QQSsiz mahsulotlarga qo'llaniladi (localtax soliqsiz miqdor bo'yicha hisoblanadi) <br> 4: mahalliy soliq, shu jumladan, QQS bo'lgan mahsulotlarga qo'llaniladi (localtax summa + asosiy so'm bo'yicha hisoblanadi) <br> 5: QQSsiz xizmatlarga mahalliy soliq (localtax hisoblanadi <br> 6: QQS, shu jumladan xizmatlarga mahalliy soliq qo'llaniladi (mahalliy soliq soliq + soliq bo'yicha hisoblanadi)
 SMS=SMS
@@ -461,13 +462,13 @@ LinkToTestClickToDial=<strong> %s </strong> foydalanuvchisi uchun ClickToDial ur
 RefreshPhoneLink=Havolani yangilang
 LinkToTest=<strong> %s </strong> foydalanuvchisi uchun yaratilgan bosish havolasi (sinov uchun telefon raqamini bosing)
 KeepEmptyToUseDefault=Standart qiymatdan foydalanish uchun bo'sh joyni saqlang
-KeepThisEmptyInMostCases=In most cases, you can keep this field empy.
+KeepThisEmptyInMostCases=Ko'pgina hollarda, siz ushbu maydonni empiyani saqlashingiz mumkin.
 DefaultLink=Standart havola
 SetAsDefault=Odatiy sifatida o'rnating
 ValueOverwrittenByUserSetup=Diqqat, ushbu qiymat foydalanuvchi tomonidan o'rnatilishi bilan yozilishi mumkin (har bir foydalanuvchi o'z klikktodial urlini o'rnatishi mumkin)
 ExternalModule=Tashqi modul
-InstalledInto=Installed into directory %s
-BarcodeInitForThirdparties=Mass barcode init for third-parties
+InstalledInto=%s katalogiga o'rnatilgan
+BarcodeInitForThirdparties=Uchinchi tomonlar uchun ommaviy shtrix-kod
 BarcodeInitForProductsOrServices=Mahsulotlar yoki xizmatlar uchun ommaviy shtrix kodni qayta tiklash yoki tiklash
 CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
 InitEmptyBarCode=Keyingi %s bo'sh yozuvlar uchun boshlang'ich qiymati
@@ -482,48 +483,48 @@ DisplayCompanyInfo=Kompaniyaning manzilini ko'rsatish
 DisplayCompanyManagers=Displey menejeri nomlari
 DisplayCompanyInfoAndManagers=Kompaniya manzili va menejer nomlarini ko'rsatish
 EnableAndSetupModuleCron=Agar siz ushbu takrorlanadigan hisob-fakturani avtomatik ravishda yaratishni istasangiz, * %s * moduli yoqilgan va to'g'ri sozlanishi kerak. Aks holda, hisob-fakturalarni yaratish * Yaratish * tugmasi yordamida ushbu shablondan qo'lda bajarilishi kerak. Shuni esda tutingki, siz avtomatik ishlab chiqarishni yoqsangiz ham, siz qo'lda ishlab chiqarishni xavfsiz ravishda boshlashingiz mumkin. Xuddi shu davr uchun nusxalarini yaratish mumkin emas.
-ModuleCompanyCodeCustomerAquarium=%s followed by customer code for a customer accounting code
-ModuleCompanyCodeSupplierAquarium=%s followed by vendor code for a vendor accounting code
+ModuleCompanyCodeCustomerAquarium=%s va undan keyin mijozning buxgalteriya kodi uchun mijoz kodi
+ModuleCompanyCodeSupplierAquarium=%s va undan keyin sotuvchining buxgalteriya kodi uchun sotuvchi kodi
 ModuleCompanyCodePanicum=Bo'sh buxgalteriya kodini qaytaring.
 ModuleCompanyCodeDigitaria=Uchinchi shaxsning nomiga ko'ra murakkab buxgalteriya kodini qaytaradi. Kod birinchi pozitsiyada aniqlanishi mumkin bo'lgan prefiksdan, keyin uchinchi tomon kodida belgilangan belgilar sonidan iborat.
-ModuleCompanyCodeCustomerDigitaria=%s followed by the truncated customer name by the number of characters: %s for the customer accounting code.
-ModuleCompanyCodeSupplierDigitaria=%s followed by the truncated supplier name by the number of characters: %s for the supplier accounting code.
+ModuleCompanyCodeCustomerDigitaria=%s, keyin qisqartirilgan mijoz nomi, belgilar soni bo'yicha: %s, mijozning buxgalteriya kodi uchun.
+ModuleCompanyCodeSupplierDigitaria=%s, keyin esa etkazib beruvchining qisqartirilgan nomi, belgilar soni bo'yicha: etkazib beruvchining buxgalteriya kodi uchun %s.
 Use3StepsApproval=Odatiy bo'lib, Sotib olish to'g'risida buyurtmalarni 2 xil foydalanuvchi yaratishi va tasdiqlashi kerak (bitta qadam / foydalanuvchi yaratishi va bitta qadam / foydalanuvchi tasdiqlashi kerak. E'tibor bering, agar foydalanuvchi yaratish va tasdiqlash huquqiga ega bo'lsa, bitta qadam / foydalanuvchi etarli bo'ladi) . Ushbu parametr bilan siz uchinchi bosqichni / foydalanuvchi tomonidan tasdiqlanishini so'rashingiz mumkin, agar miqdori ajratilgan qiymatdan yuqori bo'lsa (shuning uchun 3 ta qadam kerak bo'ladi: 1 = tasdiqlash, 2 = birinchi tasdiqlash va 3 = ikkinchi tasdiqlash miqdori etarli bo'lsa). <br> Agar bitta tasdiqlash (2 ta qadam) etarli bo'lsa, buni bo'sh qilib qo'ying, agar har doim ikkinchi ma'qullash (3 bosqich) kerak bo'lsa, uni juda past qiymatga (0,1) o'rnating.
 UseDoubleApproval=Miqdor (soliqsiz) ... dan yuqori bo'lsa, 3 bosqichli tasdiqdan foydalaning.
 WarningPHPMail=OGOHLANTIRISH: Ilovadan elektron pochta xabarlarini yuborish uchun sozlash odatiy umumiy sozlamalardan foydalanmoqda. Odatda, bir nechta sabablarga ko'ra standart o'rnatish o'rniga elektron pochta xizmati provayderingiz elektron pochta serveridan foydalanish uchun chiquvchi elektron pochta xabarlarini sozlash yaxshiroqdir:
-WarningPHPMailA=- Using the server of the Email Service Provider increases the trustability of your email, so it increases the deliverablity without being flagged as SPAM
-WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota).
-WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
-WarningPHPMailD=If the method 'PHP Mail' is really the method you would like to use, you can remove this warning by adding the constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP to 1 in Home - Setup - Other.
-WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
-WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+WarningPHPMailA=- Elektron pochta xizmati provayderining serveridan foydalanish elektron pochtangizning ishonchliligini oshiradi, shuning uchun SPAM sifatida belgilanmasdan etkazib berish qobiliyatini oshiradi.
+WarningPHPMailB=- Ba'zi elektron pochta xizmatlarini ko'rsatuvchi provayderlar (Yahoo singari) sizga o'z serverlaridan tashqari boshqa serverlardan elektron pochta xabarlarini yuborishga ruxsat bermaydilar. Sizning joriy sozlamangiz dastur serveridan sizning elektron pochta provayderingiz serverini emas, balki elektron pochta xabarlarini yuborish uchun foydalanadi, shuning uchun ba'zi qabul qiluvchilar (cheklovchi DMARC protokoli bilan mos keladigan) sizning elektron pochta provayderingizdan sizning elektron pochtangizni va ba'zi elektron pochta provayderlarini qabul qila oladimi deb so'rashadi. (Yahoo singari) "yo'q" deb javob berishi mumkin, chunki server ularga tegishli emas, shuning uchun yuborilgan elektron pochtangizning oz qismi etkazib berishga qabul qilinmasligi mumkin (elektron pochta provayderingiz yuborish kvotasidan ham ehtiyot bo'ling).
+WarningPHPMailC=- Elektron pochta xabarlarini yuborish uchun o'zingizning elektron pochta xizmati provayderingizning SMTP-serveridan foydalanish ham qiziq, shuning uchun dasturdan yuborilgan barcha elektron pochta xabarlari sizning pochta qutingizdagi "Yuborilgan" katalogga saqlanadi.
+WarningPHPMailD=Agar "PHP pochta" usuli siz foydalanmoqchi bo'lgan usul bo'lsa, ushbu ogohlantirishni MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP doimiyligini qo'shib, Uydagi - O'rnatish - Boshqalar qatoriga qo'shishingiz mumkin.
+WarningPHPMail2=Agar sizning SMTP elektron pochta provayderingiz elektron pochta mijozini ba'zi bir IP-manzillar bilan cheklashi kerak bo'lsa (juda kam), bu sizning ERP CRM-ilovangiz uchun pochta foydalanuvchisi agentining (MUA) IP-manzili: <strong> %s </strong>.
+WarningPHPMailSPF=Agar sizning elektron pochta manzilingizdagi domen nomi SPF yozuvi bilan himoyalangan bo'lsa (sizdan domen nomlarini ro'yxatdan o'tkazuvchidan so'rang), siz domeningizning DNS-ning SPF yozuviga quyidagi IP-larni qo'shishingiz kerak: <strong> %s </strong>.
 ClickToShowDescription=Tavsifni ko'rsatish uchun bosing
-DependsOn=This module needs the module(s)
-RequiredBy=This module is required by module(s)
-TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
-PageUrlForDefaultValues=You must enter the relative path of the page URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
-PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new third party, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-PageUrlForDefaultValuesList=<br>Example:<br>For the page that lists third parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use a path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-AlsoDefaultValuesAreEffectiveForActionCreate=Also note that overwritting default values for form creation works only for pages that were correctly designed (so with parameter action=create or presend...)
-EnableDefaultValues=Enable customization of default values
-EnableOverwriteTranslation=Enable usage of overwritten translation
-GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
-WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
-Field=Field
-ProductDocumentTemplates=Document templates to generate product document
-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
-davDescription=Setup a WebDAV server
-DAVSetup=Setup of module DAV
-DAV_ALLOW_PRIVATE_DIR=Enable the generic private directory (WebDAV dedicated directory named "private" - login required)
-DAV_ALLOW_PRIVATE_DIRTooltip=The generic private directory is a WebDAV directory anybody can access with its application login/pass.
-DAV_ALLOW_PUBLIC_DIR=Enable the generic public directory (WebDAV dedicated directory named "public" - no login required)
-DAV_ALLOW_PUBLIC_DIRTooltip=The generic public directory is a WebDAV directory anybody can access (in read and write mode), with no authorization required (login/password account).
-DAV_ALLOW_ECM_DIR=Enable the DMS/ECM private directory (root directory of the DMS/ECM module - login required)
-DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploaded when using the DMS/ECM module. Similarly as access from the web interface, you will need a valid login/password with adecuate permissions to access it.
+DependsOn=Ushbu modulga modul (lar) kerak
+RequiredBy=Ushbu modul modul (lar) tomonidan talab qilinadi
+TheKeyIsTheNameOfHtmlField=Bu HTML maydonining nomi. Maydonning kalit nomini olish uchun HTML-sahifaning tarkibini o'qish uchun texnik bilim talab qilinadi.
+PageUrlForDefaultValues=Siz sahifa URL manzilining nisbiy yo'lini kiritishingiz kerak. Agar siz URL-ga parametrlarni qo'shsangiz, barcha parametrlar bir xil qiymatga o'rnatilsa, standart qiymatlar samarali bo'ladi.
+PageUrlForDefaultValuesCreate= <br> Masalan: <br> forma yangi uchinchi tomonni yaratishi uchun <strong> %s </strong>. <br> Maxsus katalogga o'rnatilgan tashqi modullarning URL manzili uchun "custom /" ni qo'shmang, shuning uchun <strong> mymodule / mypage.php </strong> va custom / mymodule / mypage.php kabi yo'ldan foydalaning. <br> Agar url parametrlari bo'lsa, standart qiymatni xohlasangiz, siz <strong> %s </strong> dan foydalanishingiz mumkin
+PageUrlForDefaultValuesList= <br> Masalan: <br> uchinchi shaxslar ro'yxati berilgan sahifa uchun <strong> %s </strong>. <br> Maxsus katalogga o'rnatilgan tashqi modullarning URL manzili uchun "custom /" ni qo'shmang, shuning uchun <strong> mymodule / mypagelist.php </strong> va custom / mymodule / mypagelist.php kabi yo'ldan foydalaning. <br> Agar url parametrlari bo'lsa, standart qiymatni xohlasangiz, siz <strong> %s </strong> dan foydalanishingiz mumkin
+AlsoDefaultValuesAreEffectiveForActionCreate=Shuni ham yodda tutingki, forma yaratish uchun standart qiymatlarning ustiga yozish faqat to'g'ri ishlab chiqilgan sahifalar uchun ishlaydi (shuning uchun parametr action = create or presend ... bilan)
+EnableDefaultValues=Standart qiymatlarni sozlashni yoqish
+EnableOverwriteTranslation=Qayta yozilgan tarjimadan foydalanishni yoqish
+GoIntoTranslationMenuToChangeThis=Ushbu kod bilan kalit uchun tarjima topildi. Ushbu qiymatni o'zgartirish uchun uni Home-Setup-translation-dan tahrirlashingiz kerak.
+WarningSettingSortOrder=Ogohlantirish, standart tartiblash tartibini o'rnatish, agar maydon noma'lum maydon bo'lsa, ro'yxat sahifasiga o'tishda texnik xatolarga olib kelishi mumkin. Agar siz bunday xatoga duch kelsangiz, standart saralash tartibini olib tashlash va odatiy xatti-harakatlarni tiklash uchun ushbu sahifaga qayting.
+Field=Maydon
+ProductDocumentTemplates=Mahsulot hujjatini yaratish uchun hujjat shablonlari
+FreeLegalTextOnExpenseReports=Xarajatlar to'g'risidagi hisobotlar bo'yicha bepul huquqiy matn
+WatermarkOnDraftExpenseReports=Xarajatlar hisobotlari bo'yicha suv belgisi
+AttachMainDocByDefault=Agar sukut bo'yicha elektron pochtaga asosiy hujjatni qo'shmoqchi bo'lsangiz, buni 1 ga qo'ying (agar kerak bo'lsa)
+FilesAttachedToEmail=Faylni biriktiring
+SendEmailsReminders=Elektron pochta orqali kun tartibidagi eslatmalarni yuboring
+davDescription=WebDAV serverini o'rnating
+DAVSetup=DAV modulini sozlash
+DAV_ALLOW_PRIVATE_DIR=Umumiy shaxsiy katalogni yoqing ("xususiy" deb nomlangan WebDAV katalogi - kirish zarur)
+DAV_ALLOW_PRIVATE_DIRTooltip=Umumiy shaxsiy katalog - bu WebDAV katalogidir, unga kirish uchun kirish / kirish orqali har kim kirish huquqiga ega.
+DAV_ALLOW_PUBLIC_DIR=Umumiy umumiy katalogni yoqing ("public" deb nomlangan WebDAV katalogi - kirish shart emas)
+DAV_ALLOW_PUBLIC_DIRTooltip=Umumiy umumiy katalog - bu WebDAV katalogi bo'lib, unga kirish uchun hech kim kira olmaydi (o'qish va yozish rejimida), hech qanday avtorizatsiya talab qilinmaydi (kirish / parol qayd yozuvi).
+DAV_ALLOW_ECM_DIR=DMS / ECM shaxsiy katalogini yoqing (DMS / ECM modulining ildiz katalogi - kirish zarur)
+DAV_ALLOW_ECM_DIRTooltip=DMS / ECM modulidan foydalanganda barcha fayllar qo'lda yuklanadigan ildiz katalogi. Xuddi shu tarzda veb-interfeysdan kirish kabi sizga kirish uchun ruxsatnomalar bilan tegishli login / parol kerak bo'ladi.
 # Modules
 Module0Name=Foydalanuvchilar va guruhlar
 Module0Desc=Foydalanuvchilar / xodimlar va guruhlarni boshqarish
@@ -547,8 +548,8 @@ Module40Name=Sotuvchilar
 Module40Desc=Sotuvchilar va sotib olishni boshqarish (sotib olish buyurtmalari va etkazib beruvchilarning hisob-fakturalari)
 Module42Name=Xatolarni tuzatish jurnallari
 Module42Desc=Kundaliklarni ro'yxatga olish vositalari (fayl, syslog, ...). Bunday jurnallar texnik / disk raskadrovka uchun mo'ljallangan.
-Module43Name=Debug Bar
-Module43Desc=A tool for developper adding a debug bar in your browser.
+Module43Name=Tuzatish paneli
+Module43Desc=Brauzeringizda disk raskadrovka satrini qo'shadigan developper vositasi.
 Module49Name=Tahrirlovchilar
 Module49Desc=Muharrirlarni boshqarish
 Module50Name=Mahsulotlar
@@ -562,15 +563,15 @@ Module53Desc=Xizmatlarni boshqarish
 Module54Name=Shartnomalar / Obunalar
 Module54Desc=Shartnomalarni boshqarish (xizmatlar yoki takroriy obunalar)
 Module55Name=Shtrixli kodlar
-Module55Desc=Barcode or QR code management
+Module55Desc=Shtrixli kod yoki QR kodini boshqarish
 Module56Name=Kredit o'tkazish yo'li bilan to'lov
 Module56Desc=Kredit o'tkazmalari buyurtmalari bo'yicha etkazib beruvchilarning to'lovlarini boshqarish. U Evropa mamlakatlari uchun SEPA faylini yaratishni o'z ichiga oladi.
 Module57Name=To'g'ridan-to'g'ri debet orqali to'lovlar
 Module57Desc=To'g'ridan-to'g'ri debet buyurtmalarini boshqarish. U Evropa mamlakatlari uchun SEPA faylini yaratishni o'z ichiga oladi.
 Module58Name=ClickToDial
 Module58Desc=ClickToDial tizimining integratsiyasi (Asterisk, ...)
-Module60Name=Stickers
-Module60Desc=Management of stickers
+Module60Name=Stikerlar
+Module60Desc=Stikerlarni boshqarish
 Module70Name=Aralashuvlar
 Module70Desc=Intervensiyani boshqarish
 Module75Name=Xarajatlar va sayohat yozuvlari
@@ -609,9 +610,9 @@ Module520Name=Kreditlar
 Module520Desc=Kreditlarni boshqarish
 Module600Name=Tadbir to'g'risida bildirishnomalar
 Module600Desc=Ishbilarmonlik hodisasi bilan bog'liq elektron pochta xabarlarini yuboring: har bir foydalanuvchi uchun (har bir foydalanuvchi uchun sozlash belgilanadi), har bir uchinchi tomon aloqasi uchun (har bir uchinchi tomon uchun belgilanadi) yoki ma'lum elektron pochta orqali.
-Module600Long=Note that this module sends emails in real-time when a specific business event occurs. If you are looking for a feature to send email reminders for agenda events, go into the setup of module Agenda.
-Module610Name=Product Variants
-Module610Desc=Creation of product variants (color, size etc.)
+Module600Long=Shuni esda tutingki, ushbu modul ma'lum bir ish hodisasi yuz berganda elektron pochta xabarlarini real vaqtda yuboradi. Agar kun tartibidagi voqealar uchun elektron pochta orqali eslatmalar yuborish xususiyatini qidirsangiz, kun tartibi modulini sozlang.
+Module610Name=Mahsulot variantlari
+Module610Desc=Mahsulot variantlarini yaratish (rang, o'lcham va boshqalar).
 Module700Name=Xayriyalar
 Module700Desc=Xayriya mablag'larini boshqarish
 Module770Name=Xarajatlar bo'yicha hisobotlar
@@ -645,10 +646,10 @@ Module2700Desc=Foydalanuvchilar / a'zolarning fotosuratlarini ko'rsatish uchun e
 Module2800Desc=FTP mijozi
 Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind konversiyalari imkoniyatlari
-Module3200Name=Unalterable Archives
-Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries.
-Module3400Name=Social Networks
-Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
+Module3200Name=O'zgarmas arxivlar
+Module3200Desc=O'zgarmas ishbilarmonlik voqealari jurnalini yoqing. Voqealar real vaqtda arxivlanadi. Jurnal eksport qilinishi mumkin bo'lgan zanjirli voqealar uchun faqat o'qish uchun mo'ljallangan jadvaldir. Ushbu modul ba'zi mamlakatlar uchun majburiy bo'lishi mumkin.
+Module3400Name=Ijtimoiy tarmoqlar
+Module3400Desc=Ijtimoiy tarmoqlarni uchinchi shaxslarga va manzillarga (skype, twitter, facebook, ...) qo'shish.
 Module4000Name=HRM
 Module4000Desc=Inson resurslarini boshqarish (bo'limni boshqarish, xodimlarning shartnomalari va hissiyotlari)
 Module5000Name=Ko'p kompaniya
@@ -661,18 +662,18 @@ Module20000Name=So'rovni boshqarishni tark eting
 Module20000Desc=Xodimlarning ta'tilga chiqishlarini aniqlash va kuzatib borish
 Module39000Name=Mahsulotlar juda ko'p
 Module39000Desc=Mahsulotlar uchun lotlar, seriya raqamlari, ovqatlanish / sotish sanasini boshqarish
-Module40000Name=Multicurrency
-Module40000Desc=Use alternative currencies in prices and documents
+Module40000Name=Ko'p valyuta
+Module40000Desc=Narxlar va hujjatlarda muqobil valyutalardan foydalaning
 Module50000Name=PayBox
 Module50000Desc=Mijozlarga PayBox onlayn to'lov sahifasini (kredit / debet kartalari) taklif eting. Bu sizning mijozlaringizga vaqtinchalik to'lovlarni yoki ma'lum bir Dolibarr ob'ekti bilan bog'liq to'lovlarni amalga oshirishga ruxsat berish uchun ishlatilishi mumkin (hisob-faktura, buyurtma va hk ...)
 Module50100Name=POS SimplePOS
 Module50100Desc=Sotish nuqtasi SimplePOS (oddiy POS) moduli.
 Module50150Name=POS TakePOS
-Module50150Desc=Point of Sale module TakePOS (touchscreen POS, for shops, bars or restaurants).
+Module50150Desc=Sotish nuqtasi TakePOS moduli (do'konlar, barlar yoki restoranlar uchun sensorli ekranli POS).
 Module50200Name=Paypal
 Module50200Desc=Mijozlarga PayPal onlayn to'lov sahifasini taklif eting (PayPal hisob qaydnomasi yoki kredit / debet kartalari). Bu sizning mijozlaringizga vaqtinchalik to'lovlarni yoki ma'lum bir Dolibarr ob'ekti bilan bog'liq to'lovlarni amalga oshirishga ruxsat berish uchun ishlatilishi mumkin (hisob-faktura, buyurtma va hk ...)
-Module50300Name=Stripe
-Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
+Module50300Name=Ip
+Module50300Desc=Mijozlarga Stripe onlayn to'lov sahifasini taklif eting (kredit / debet kartalar). Bu sizning mijozlaringizga vaqtinchalik to'lovlarni yoki ma'lum bir Dolibarr ob'ekti bilan bog'liq to'lovlarni amalga oshirishga ruxsat berish uchun ishlatilishi mumkin (hisob-faktura, buyurtma va hk ...)
 Module50400Name=Buxgalteriya hisobi (ikki martalik yozuv)
 Module50400Desc=Buxgalteriya hisobini boshqarish (ikki tomonlama yozuvlar, Bosh va yordamchi kitoblarni qo'llab-quvvatlash). Buxgalteriya dasturini boshqa bir qancha buxgalteriya dasturlari formatida eksport qiling.
 Module54000Name=PrintIPP
@@ -683,8 +684,8 @@ Module59000Name=Chegaralar
 Module59000Desc=Chegaralarni kuzatib borish uchun modul
 Module60000Name=Komissiyalar
 Module60000Desc=Komissiyalarni boshqarish moduli
-Module62000Name=Incoterms
-Module62000Desc=Add features to manage Incoterms
+Module62000Name=Inkoermalar
+Module62000Desc=Incoterms-ni boshqarish uchun funktsiyalarni qo'shing
 Module63000Name=Resurslar
 Module63000Desc=Tadbirlarga ajratish uchun resurslarni (printerlar, mashinalar, xonalar, ...) boshqaring
 Permission11=Mijozlarning hisob-fakturalarini o'qing
@@ -706,7 +707,7 @@ Permission32=Mahsulotlarni yaratish / o'zgartirish
 Permission34=Mahsulotlarni o'chirish
 Permission36=Yashirin mahsulotlarni ko'ring / boshqaring
 Permission38=Mahsulotlarni eksport qilish
-Permission39=Ignore minimum price
+Permission39=Minimal narxga e'tibor bermang
 Permission41=Loyihalar va vazifalarni o'qing (umumiy loyiha va men aloqada bo'lgan loyihalar). Belgilangan vazifalar bo'yicha men uchun yoki mening ierarxiyam uchun sarflangan vaqtni ham kiritish mumkin (Timesheet)
 Permission42=Loyihalarni yaratish / o'zgartirish (umumiy loyiha va men aloqada bo'lgan loyihalar). Vazifalar yaratishi va foydalanuvchilarni loyiha va vazifalarga tayinlashi mumkin
 Permission44=Loyihalarni o'chirish (umumiy loyiha va men bog'langan loyihalar)
@@ -715,9 +716,9 @@ Permission61=Ta'sirlarni o'qing
 Permission62=Interventsiyalarni yaratish / o'zgartirish
 Permission64=Ta'sirlarni o'chirib tashlang
 Permission67=Eksport tadbirlari
-Permission68=Send interventions by email
-Permission69=Validate interventions
-Permission70=Invalidate interventions
+Permission68=Interventsiyalarni elektron pochta orqali yuboring
+Permission69=Ta'sirlarni tasdiqlang
+Permission70=Ta'sirlarni bekor qilish
 Permission71=A'zolarni o'qing
 Permission72=A'zolarni yaratish / o'zgartirish
 Permission74=A'zolarni o'chirish
@@ -740,7 +741,7 @@ Permission95=Hisobotlarni o'qing
 Permission101=Yuborishlarni o'qing
 Permission102=Yuborishlarni yaratish / o'zgartirish
 Permission104=Yuborishlarni tasdiqlash
-Permission105=Send sendings by email
+Permission105=Yuborishlarni elektron pochta orqali yuboring
 Permission106=Eksport jo'natmalari
 Permission109=Yuborishlarni o'chirish
 Permission111=Moliyaviy hisoblarni o'qing
@@ -816,7 +817,7 @@ Permission254=Faqat tashqi foydalanuvchilarni yarating / o'zgartiring
 Permission255=Boshqa foydalanuvchilarning parolini o'zgartiring
 Permission256=Boshqa foydalanuvchilarni o'chirish yoki o'chirish
 Permission262=Barcha uchinchi shaxslarga va ularning ob'ektlariga kirishni kengaytiring (nafaqat foydalanuvchi savdo vakili bo'lgan uchinchi shaxslar). <br> tashqi foydalanuvchilar uchun samarali emas (takliflar, buyurtmalar, hisob-fakturalar, shartnomalar va boshqalar uchun har doim o'zlari bilan cheklangan). <br> Loyihalar uchun samarali emas (faqat loyiha ruxsatnomalari qoidalari, ko'rinishi va tayinlash masalalari).
-Permission263=Extend access to all third parties WITHOUT their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission263=Ob'ektlarisiz barcha uchinchi shaxslarga kirishni kengaytiring (nafaqat foydalanuvchi savdo vakili bo'lgan uchinchi shaxslar). <br> tashqi foydalanuvchilar uchun samarali emas (takliflar, buyurtmalar, hisob-fakturalar, shartnomalar va boshqalar uchun har doim o'zlari bilan cheklangan). <br> Loyihalar uchun samarali emas (faqat loyiha ruxsatnomalari qoidalari, ko'rinishi va tayinlash masalalari).
 Permission271=CA ni o'qing
 Permission272=Hisob-fakturalarni o'qing
 Permission273=Hisob-fakturalarni chiqarish
@@ -848,12 +849,12 @@ Permission401=Chegirmalarni o'qing
 Permission402=Chegirmalar yaratish / o'zgartirish
 Permission403=Chegirmalarni tasdiqlang
 Permission404=Chegirmalarni o'chirib tashlang
-Permission430=Use Debug Bar
-Permission511=Read salaries and payments (yours and subordinates)
-Permission512=Create/modify salaries and payments
-Permission514=Delete salaries and payments
-Permission517=Read salaries and payments everybody
-Permission519=Export salaries
+Permission430=Debug Bar-dan foydalaning
+Permission511=Ish haqi va to'lovlarni o'qing (o'zingizniki va bo'ysunuvchilaringiz)
+Permission512=Ish haqi va to'lovlarni yaratish / o'zgartirish
+Permission514=Ish haqi va to'lovlarni o'chirib tashlang
+Permission517=Barchani ish haqi va to'lovlarini o'qing
+Permission519=Eksport ish haqi
 Permission520=Kreditlarni o'qing
 Permission522=Kreditlarni yaratish / o'zgartirish
 Permission524=Kreditlarni o'chirish
@@ -864,19 +865,19 @@ Permission532=Xizmatlarni yaratish / o'zgartirish
 Permission534=Xizmatlarni o'chirish
 Permission536=Yashirin xizmatlarni ko'rish / boshqarish
 Permission538=Eksport xizmatlari
-Permission561=Read payment orders by credit transfer
-Permission562=Create/modify payment order by credit transfer
-Permission563=Send/Transmit payment order by credit transfer
-Permission564=Record Debits/Rejections of credit transfer
-Permission601=Read stickers
-Permission602=Create/modify stickers
-Permission609=Delete stickers
-Permission650=Read Bills of Materials
-Permission651=Create/Update Bills of Materials
-Permission652=Delete Bills of Materials
-Permission660=Read Manufacturing Order (MO)
-Permission661=Create/Update Manufacturing Order (MO)
-Permission662=Delete Manufacturing Order (MO)
+Permission561=Kredit o'tkazmasi orqali to'lov topshiriqlarini o'qing
+Permission562=Kredit o'tkazish yo'li bilan to'lov topshirig'ini yaratish / o'zgartirish
+Permission563=To'lov topshirig'ini kredit o'tkazish yo'li bilan yuborish / uzatish
+Permission564=Debetlarni yozing / kredit o'tkazishni rad etish
+Permission601=Stikerlarni o'qing
+Permission602=Stikerlarni yarating / o'zgartiring
+Permission609=Stikerlarni o'chirish
+Permission650=Materiallar varaqalarini o'qing
+Permission651=Materiallar hujjatlarini yarating / yangilang
+Permission652=Materiallar varaqalarini o'chirish
+Permission660=Ishlab chiqarish buyurtmasini o'qing (MO)
+Permission661=Ishlab chiqarish buyurtmasini yaratish (yangilash)
+Permission662=Ishlab chiqarish buyurtmasini o'chirish (MO)
 Permission701=Xayr-ehsonlarni o'qing
 Permission702=Xayriya mablag'larini yaratish / o'zgartirish
 Permission703=Xayriyalarni o'chirib tashlang
@@ -886,8 +887,8 @@ Permission773=Xarajatlar to'g'risidagi hisobotlarni o'chirish
 Permission774=Barcha xarajatlar hisobotlarini o'qing (hatto bo'ysunuvchi bo'lmagan foydalanuvchi uchun ham)
 Permission775=Xarajatlar to'g'risidagi hisobotlarni tasdiqlash
 Permission776=Xarajatlar bo'yicha hisobotlarni to'lash
-Permission777=Read expense reports of everybody
-Permission778=Create/modify expense reports of everybody
+Permission777=Hammaning hisobot hisobotini o'qing
+Permission778=Hammaning xarajatlar hisobotini yarating / o'zgartiring
 Permission779=Eksport xarajatlari to'g'risidagi hisobotlar
 Permission1001=Qimmatli qog'ozlarni o'qing
 Permission1002=Omborlarni yaratish / o'zgartirish
@@ -898,12 +899,12 @@ Permission1101=Yetkazib berish kvitansiyasini o'qing
 Permission1102=Yetkazib berish kvitansiyasini yarating / o'zgartiring
 Permission1104=Yetkazib berish kvitansiyasini tasdiqlang
 Permission1109=Yetkazib berish kvitansiyasini o'chirib tashlang
-Permission1121=Read supplier proposals
-Permission1122=Create/modify supplier proposals
-Permission1123=Validate supplier proposals
-Permission1124=Send supplier proposals
-Permission1125=Delete supplier proposals
-Permission1126=Close supplier price requests
+Permission1121=Yetkazib beruvchilarning takliflarini o'qing
+Permission1122=Yetkazib beruvchilar takliflarini yaratish / o'zgartirish
+Permission1123=Yetkazib beruvchilarning takliflarini tasdiqlash
+Permission1124=Yetkazib beruvchilarga takliflarni yuboring
+Permission1125=Yetkazib beruvchilarning takliflarini o'chirib tashlang
+Permission1126=Yetkazib beruvchilar narxlari bo'yicha so'rovlarni yoping
 Permission1181=Ta'minlovchilarni o'qing
 Permission1182=Xarid qilish buyurtmalarini o'qing
 Permission1183=Sotib olish to'g'risida buyurtmalarni yaratish / o'zgartirish
@@ -912,9 +913,9 @@ Permission1185=Xarid qilish buyurtmalarini tasdiqlash
 Permission1186=Xarid buyurtmalariga buyurtma bering
 Permission1187=Sotib olish to'g'risida buyurtmalar olinganligini tasdiqlang
 Permission1188=Xarid buyurtmalarini o'chirib tashlang
-Permission1189=Check/Uncheck a purchase order reception
+Permission1189=Xarid qilish buyurtmasini qabul qilishni belgilang / belgini olib tashlang
 Permission1190=Sotib olish buyurtmalarini tasdiqlash (ikkinchi tasdiqlash)
-Permission1191=Export supplier orders and their attributes
+Permission1191=Eksport etkazib beruvchilarning buyurtmalari va ularning atributlari
 Permission1201=Eksport natijasini oling
 Permission1202=Eksportni yaratish / o'zgartirish
 Permission1231=Sotuvchi fakturalarini o'qing
@@ -928,8 +929,8 @@ Permission1251=Ma'lumotlar bazasiga tashqi ma'lumotlarning ommaviy importini oli
 Permission1321=Xaridorlarning hisob-fakturalarini, atributlarini va to'lovlarini eksport qiling
 Permission1322=To'langan hisobni qayta oching
 Permission1421=Sotish bo'yicha buyurtmalar va atributlarni eksport qiling
-Permission1521=Read documents
-Permission1522=Delete documents
+Permission1521=Hujjatlarni o'qing
+Permission1522=Hujjatlarni o'chirish
 Permission2401=Uning foydalanuvchi akkauntiga bog'langan amallarni (voqealar yoki vazifalarni) o'qing (agar tadbir egasi yoki unga tayinlangan bo'lsa)
 Permission2402=Uning foydalanuvchi akkauntiga bog'langan amallarni (voqealar yoki vazifalarni) yaratish / o'zgartirish (agar tadbir egasi bo'lsa)
 Permission2403=Uning foydalanuvchi akkauntiga bog'langan amallarni (voqealar yoki vazifalarni) o'chirish (agar tadbir egasi bo'lsa)
@@ -943,49 +944,49 @@ Permission2503=Hujjatlarni yuborish yoki o'chirish
 Permission2515=Hujjatlar kataloglarini sozlash
 Permission2801=FTP mijozidan o'qish rejimida foydalaning (faqat ko'rib chiqing va yuklab oling)
 Permission2802=Yozish rejimida FTP mijozidan foydalaning (fayllarni o'chirish yoki yuklash)
-Permission3200=Read archived events and fingerprints
-Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission10001=Read website content
-Permission10002=Create/modify website content (html and javascript content)
-Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
-Permission10005=Delete website content
+Permission3200=Arxivlangan voqealar va barmoq izlarini o'qing
+Permission3301=Yangi modullarni yarating
+Permission4001=Xodimlarni ko'rish
+Permission4002=Xodimlarni yarating
+Permission4003=Xodimlarni o'chirish
+Permission4004=Xodimlarni eksport qilish
+Permission10001=Veb-sayt tarkibini o'qing
+Permission10002=Veb-sayt tarkibini yaratish / o'zgartirish (HTML va javascript tarkibi)
+Permission10003=Veb-sayt tarkibini yaratish / o'zgartirish (dinamik php-kod). Xavfli, cheklangan ishlab chiquvchilarga tegishli bo'lishi kerak.
+Permission10005=Veb-sayt tarkibini o'chirish
 Permission20001=Ta'tilga bo'lgan talablarni o'qing (sizning va sizning bo'ysunuvchilaringizning ta'tillari)
 Permission20002=Ta'tilga oid so'rovlarni yaratish (o'zgartirish va o'zingizning bo'ysunuvchilaringiz)
 Permission20003=Dam olish uchun so'rovlarni o'chirib tashlang
 Permission20004=Barcha ta'tilga oid so'rovlarni o'qing (hatto foydalanuvchi unga bo'ysunmagan)
 Permission20005=Barchaga (hattoki tobe bo'lmagan foydalanuvchi uchun ham) ta'tilga chiqish so'rovlarini yaratish / o'zgartirish
 Permission20006=Administrator so'rovlarni qoldiradi (sozlash va balansni yangilash)
-Permission20007=Approve leave requests
+Permission20007=Ta'til bo'yicha so'rovlarni tasdiqlash
 Permission23001=Rejalashtirilgan ishni o'qing
 Permission23002=Rejalashtirilgan ishni yaratish / yangilash
 Permission23003=Rejalashtirilgan ishni o'chirish
 Permission23004=Rejalashtirilgan ishni bajaring
 Permission50101=Savdo punktidan foydalaning (SimplePOS)
-Permission50151=Use Point of Sale (TakePOS)
-Permission50152=Edit sales lines
-Permission50153=Edit ordered sales lines
+Permission50151=Savdo punktidan foydalaning (TakePOS)
+Permission50152=Savdo yo'nalishlarini tahrirlash
+Permission50153=Buyurtma qilingan savdo yo'nalishlarini tahrirlash
 Permission50201=Tranzaksiyalarni o'qing
 Permission50202=Import operatsiyalari
-Permission50330=Read objects of Zapier
-Permission50331=Create/Update objects of Zapier
-Permission50332=Delete objects of Zapier
-Permission50401=Bind products and invoices with accounting accounts
-Permission50411=Read operations in ledger
-Permission50412=Write/Edit operations in ledger
-Permission50414=Delete operations in ledger
-Permission50415=Delete all operations by year and journal in ledger
-Permission50418=Export operations of the ledger
-Permission50420=Report and export reports (turnover, balance, journals, ledger)
-Permission50430=Define fiscal periods. Validate transactions and close fiscal periods.
-Permission50440=Manage chart of accounts, setup of accountancy
-Permission51001=Read assets
-Permission51002=Create/Update assets
-Permission51003=Delete assets
-Permission51005=Setup types of asset
+Permission50330=Zapier ob'ektlarini o'qing
+Permission50331=Zapier ob'ektlarini yaratish / yangilash
+Permission50332=Zapier ob'ektlarini o'chirish
+Permission50401=Mahsulotlar va hisob-fakturalarni buxgalteriya hisobvaraqlari bilan bog'lash
+Permission50411=Amallarni daftarda o'qing
+Permission50412=Daftarda operatsiyalarni yozish / tahrirlash
+Permission50414=Hisob kitobidagi operatsiyalarni o'chirish
+Permission50415=Barcha operatsiyalarni yil bo'yicha o'chiring va daftarda qayd qiling
+Permission50418=Buxgalteriya kitobining eksport operatsiyalari
+Permission50420=Hisobot va eksport bo'yicha hisobotlar (tovar aylanmasi, balans, jurnallar, daftar)
+Permission50430=Fiskal davrlarni aniqlang. Tranzaktsiyalarni tasdiqlang va soliq davrlarini yoping.
+Permission50440=Hisob-kitoblar rejasini boshqarish, buxgalteriya hisobini sozlash
+Permission51001=Aktivlarni o'qing
+Permission51002=Obyektlarni yaratish / yangilash
+Permission51003=Obyektlarni o‘chirish
+Permission51005=Aktiv turlarini sozlash
 Permission54001=Chop etish
 Permission55001=So'rovnomalarni o'qing
 Permission55002=So'rovlarni yaratish / o'zgartirish
@@ -996,21 +997,21 @@ Permission63001=Resurslarni o'qing
 Permission63002=Resurslarni yaratish / o'zgartirish
 Permission63003=Resurslarni o'chirish
 Permission63004=Resurslarni kun tartibidagi voqealar bilan bog'lang
-Permission64001=Allow direct printing
-Permission67000=Allow printing of receipts
-Permission68001=Read intracomm report
-Permission68002=Create/modify intracomm report
-Permission68004=Delete intracomm report
-Permission941601=Read receipts
-Permission941602=Create and modify receipts
-Permission941603=Validate receipts
-Permission941604=Send receipts by email
-Permission941605=Export receipts
-Permission941606=Delete receipts
+Permission64001=To'g'ridan-to'g'ri bosib chiqarishga ruxsat berish
+Permission67000=Kvitansiyalarni bosib chiqarishga ruxsat berish
+Permission68001=Ichki hisobotni o'qing
+Permission68002=Ichki hisobotni yaratish / o'zgartirish
+Permission68004=Ichki hisobotni o'chirib tashlang
+Permission941601=Kvitansiyalarni o'qing
+Permission941602=Kvitansiyalarni yarating va o'zgartiring
+Permission941603=Kvitansiyalarni tasdiqlash
+Permission941604=Qabullarni elektron pochta orqali yuboring
+Permission941605=Tovarlarni eksport qilish
+Permission941606=Kvitansiyalarni o'chirish
 DictionaryCompanyType=Uchinchi tomon turlari
 DictionaryCompanyJuridicalType=Uchinchi tomon yuridik shaxslari
 DictionaryProspectLevel=Kompaniyalar uchun istiqbolli potentsial darajasi
-DictionaryProspectContactLevel=Prospect potential level for contacts
+DictionaryProspectContactLevel=Kontaktlar uchun istiqbolli potentsial darajasi
 DictionaryCanton=Shtatlar / viloyatlar
 DictionaryRegion=Mintaqalar
 DictionaryCountry=Mamlakatlar
@@ -1023,7 +1024,7 @@ DictionaryRevenueStamp=Soliq markalari miqdori
 DictionaryPaymentConditions=To'lov shartlari
 DictionaryPaymentModes=To'lov usullari
 DictionaryTypeContact=Aloqa / manzil turlari
-DictionaryTypeOfContainer=Website - Type of website pages/containers
+DictionaryTypeOfContainer=Veb-sayt - veb-sayt sahifalarining turi / konteynerlari
 DictionaryEcotaxe=Ekotaks (WEEE)
 DictionaryPaperFormat=Qog'oz formatlari
 DictionaryFormatCards=Karta formatlari
@@ -1035,32 +1036,32 @@ DictionaryOrderMethods=Buyurtma usullari
 DictionarySource=Takliflarning / buyurtmalarning kelib chiqishi
 DictionaryAccountancyCategory=Hisobotlar uchun moslashtirilgan guruhlar
 DictionaryAccountancysystem=Hisob-kitoblar rejasi uchun modellar
-DictionaryAccountancyJournal=Accounting journals
+DictionaryAccountancyJournal=Buxgalteriya jurnallari
 DictionaryEMailTemplates=Elektron pochta shablonlari
 DictionaryUnits=Birlik
-DictionaryMeasuringUnits=Measuring Units
-DictionarySocialNetworks=Social Networks
+DictionaryMeasuringUnits=O'lchov birliklari
+DictionarySocialNetworks=Ijtimoiy tarmoqlar
 DictionaryProspectStatus=Kompaniyalarning istiqbolli holati
-DictionaryProspectContactStatus=Prospect status for contacts
+DictionaryProspectContactStatus=Kontaktlar uchun istiqbol holati
 DictionaryHolidayTypes=Dam olish - ta'til turlari
 DictionaryOpportunityStatus=Loyiha / qo'rg'oshin uchun etakchi holat
-DictionaryExpenseTaxCat=Expense report - Transportation categories
-DictionaryExpenseTaxRange=Expense report - Range by transportation category
-DictionaryTransportMode=Intracomm report - Transport mode
-DictionaryBatchStatus=Product lot/serial Quality Control status
-TypeOfUnit=Type of unit
+DictionaryExpenseTaxCat=Xarajatlar to'g'risidagi hisobot - transport toifalari
+DictionaryExpenseTaxRange=Xarajatlar to'g'risidagi hisobot - transport kategoriyasi bo'yicha oraliq
+DictionaryTransportMode=Ichki hisobot - Transport rejimi
+DictionaryBatchStatus=Mahsulot partiyasi / ketma-ket sifat nazorati holati
+TypeOfUnit=Birlikning turi
 SetupSaved=O'rnatish saqlandi
-SetupNotSaved=Setup not saved
+SetupNotSaved=Sozlash saqlanmadi
 BackToModuleList=Modullar ro'yxatiga qaytish
 BackToDictionaryList=Lug'atlar ro'yxatiga qaytish
-TypeOfRevenueStamp=Type of tax stamp
+TypeOfRevenueStamp=Soliq markasining turi
 VATManagement=Sotish bo'yicha soliqni boshqarish
 VATIsUsedDesc=Sukut bo'yicha istiqbollarni, schyot-fakturalarni, buyurtmalarni va boshqalarni yaratishda Soliq stavkasi amaldagi standart qoidaga amal qiladi: <br> Agar sotuvchiga Sotuv solig'i olinmasa, u holda Soliq solig'i sukut bo'yicha 0 ga teng bo'ladi. Qoida oxiri. <br> ((sotuvchining mamlakati = xaridorning mamlakati) bo'lsa, u holda sotuvlar bo'yicha soliq sukut bo'yicha sotuvchining mamlakatidagi sotish solig'iga teng bo'ladi. Qoidaning tugashi. <br> Agar sotuvchi va xaridor ikkalasi ham Evropa hamjamiyatida bo'lsa va tovarlar transport bilan bog'liq mahsulotlar (yuk tashish, yuk tashish, aviakompaniya) bo'lsa, standart QQS 0. Bu qoida sotuvchining mamlakatiga bog'liq - iltimos, buxgalteringiz bilan maslahatlashing. QQSni xaridor sotuvchiga emas, balki o'z mamlakatlaridagi bojxona idoralariga to'lashi kerak. Qoidaning tugashi. <br> Agar sotuvchi va xaridor ikkalasi ham Evropa hamjamiyatida bo'lsa va xaridor kompaniya bo'lmasa (ro'yxatdan o'tgan QQS raqami bilan), u holda QQS sotuvchi mamlakatining QQS stavkasiga mos kelmaydi. Qoidaning tugashi. <br> Agar sotuvchi va xaridor ikkalasi ham Evropa hamjamiyatida bo'lsa va xaridor shirkat bo'lsa (ro'yxatdan o'tgan jamiyat ichidagi QQS raqami bilan), unda QQS sukut bo'yicha 0 ga teng. Qoidaning tugashi. <br> Boshqa har qanday holatda, taklif qilingan sukut sotish solig'i = 0. Qoidaning tugashi.
 VATIsNotUsedDesc=Sukut bo'yicha taklif qilinadigan Soliq solig'i 0 ga teng bo'lib, u assotsiatsiyalar, jismoniy shaxslar yoki kichik kompaniyalar kabi hollarda ishlatilishi mumkin.
 VATIsUsedExampleFR=Frantsiyada bu haqiqiy fiskal tizimga ega bo'lgan kompaniyalar yoki tashkilotlarni anglatadi (Soddalashtirilgan real yoki normal real). QQS e'lon qilingan tizim.
 VATIsNotUsedExampleFR=Frantsiyada bu Sotishdan tashqari deklaratsiyalangan assotsiatsiyalarni yoki mikrofirma fiskal tizimini tanlagan (franchayzadagi savdo solig'i) va franchayzing savdo soliqlarini hech qanday savdo deklaratsiyasisiz to'lagan kompaniyalar, tashkilotlar yoki liberal kasblarni anglatadi. Ushbu tanlovda hisobvaraq-fakturalarda "Amalga oshirilmaydigan savdo solig'i - CGI san'ati-293B" ma'lumotnomasi ko'rsatiladi.
 ##### Local Taxes #####
-TypeOfSaleTaxes=Type of sales tax
+TypeOfSaleTaxes=Sotishdan olinadigan soliq turi
 LTRate=Tezlik
 LocalTax1IsNotUsed=Ikkinchi soliqdan foydalanmang
 LocalTax1IsUsedDesc=Soliqning ikkinchi turidan foydalaning (birinchisidan tashqari)
@@ -1084,9 +1085,9 @@ LocalTax2IsUsedDescES=Istiqbollar, hisob-fakturalar, buyurtmalar va boshqalarni
 LocalTax2IsNotUsedDescES=Odatiy bo'lib, taklif qilingan IRPF 0. Qoidalarning oxiri.
 LocalTax2IsUsedExampleES=Ispaniyada xizmat ko'rsatuvchi frilanserlar va mustaqil mutaxassislar va modullarning soliq tizimini tanlagan kompaniyalar.
 LocalTax2IsNotUsedExampleES=Ispaniyada ular modul soliq tizimiga bo'ysunmaydigan korxonalardir.
-RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
-UseRevenueStamp=Use a tax stamp
-UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
+RevenueStampDesc="Soliq shtampi" yoki "daromad shtampi" - har bir faktura bo'yicha qat'iy belgilangan soliq (Bu schyot-faktura miqdoriga bog'liq emas). Shuningdek, bu foizli soliq bo'lishi mumkin, ammo soliqning ikkinchi yoki uchinchi turidan foydalanish foizli soliqlar uchun yaxshiroqdir, chunki soliq markalarida hech qanday hisobot berilmaydi. Ushbu turdagi soliqlardan faqat ozgina mamlakatlar foydalanadi.
+UseRevenueStamp=Soliq markasidan foydalaning
+UseRevenueStampExample=Soliq markasining qiymati sukut bo'yicha lug'atlarni o'rnatishda aniqlanadi (%s - %s - %s)
 CalcLocaltax=Mahalliy soliqlar bo'yicha hisobotlar
 CalcLocaltax1=Sotish - sotib olish
 CalcLocaltax1Desc=Mahalliy soliqlar bo'yicha hisobotlar mahalliy soliqlarni sotish va mahalliy soliqlarni sotib olish o'rtasidagi farq bilan hisoblanadi
@@ -1094,12 +1095,12 @@ CalcLocaltax2=Xaridlar
 CalcLocaltax2Desc=Mahalliy soliqlar bo'yicha hisobotlar - bu mahalliy soliqlarni sotib olishning umumiy miqdori
 CalcLocaltax3=Sotish
 CalcLocaltax3Desc=Mahalliy soliqlar bo'yicha hisobotlar - bu mahalliy soliqlar bo'yicha sotuvlar yig'indisi
-NoLocalTaxXForThisCountry=According to the setup of taxes (See %s - %s - %s), your country does not need to use such type of tax
+NoLocalTaxXForThisCountry=Soliqlarni o'rnatishga muvofiq (Qarang: %s - %s - %s), sizning mamlakatingizda bunday turdagi soliqlardan foydalanishning hojati yo'q
 LabelUsedByDefault=Agar kod uchun tarjima topilmasa, sukut bo'yicha ishlatiladigan yorliq
 LabelOnDocuments=Hujjatlardagi yorliq
-LabelOrTranslationKey=Label or translation key
-ValueOfConstantKey=Value of a configuration constant
-ConstantIsOn=Option %s is on
+LabelOrTranslationKey=Yorliq yoki tarjima kaliti
+ValueOfConstantKey=Konfiguratsiya doimiyligining qiymati
+ConstantIsOn=%s variant yoniq
 NbOfDays=Kunlar soni
 AtEndOfMonth=Oy oxirida
 CurrentNext=Joriy / keyingi
@@ -1140,8 +1141,8 @@ DefaultMaxSizeList=Ro'yxatlar uchun standart maksimal uzunlik
 DefaultMaxSizeShortList=Qisqa ro'yxatlar uchun standart maksimal uzunlik (ya'ni mijozlar kartasida)
 MessageOfDay=Kunning xabari
 MessageLogin=Kirish sahifasidagi xabar
-LoginPage=Login page
-BackgroundImageLogin=Background image
+LoginPage=Kirish sahifasi
+BackgroundImageLogin=Orqa fon rasmi
 PermanentLeftSearchForm=Chap menyuda doimiy qidiruv shakli
 DefaultLanguage=Standart til
 EnableMultilangInterface=Xaridor yoki sotuvchi munosabatlari uchun ko'p tilli yordamni yoqing
@@ -1155,11 +1156,11 @@ CompanyTown=Shahar
 CompanyCountry=Mamlakat
 CompanyCurrency=Asosiy valyuta
 CompanyObject=Kompaniya ob'ekti
-IDCountry=ID country
+IDCountry=ID mamlakat
 Logo=Logotip
-LogoDesc=Main logo of company. Will be used into generated documents (PDF, ...)
-LogoSquarred=Logo (squarred)
-LogoSquarredDesc=Must be a squarred icon (width = height). This logo will be used as the favorite icon or other need like for the top menu bar (if not disabled into display setup).
+LogoDesc=Kompaniyaning asosiy logotipi. Yaratilgan hujjatlarda ishlatiladi (PDF, ...)
+LogoSquarred=Logotip (kvadrat shaklida)
+LogoSquarredDesc=Kvadratik belgi bo'lishi kerak (kenglik = balandlik). Ushbu logotip eng yaxshi belgi yoki yuqori menyu satridagi boshqa ehtiyojlar sifatida ishlatiladi (agar displey sozlamalarida o'chirilmagan bo'lsa).
 DoNotSuggestPaymentMode=Taklif qilmang
 NoActiveBankAccountDefined=Faol bank hisob raqami aniqlanmadi
 OwnerOfBankAccount=%s bank hisobvarag'ining egasi
@@ -1183,15 +1184,15 @@ Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Bank bilan kelishuv kutilmoqda
 Delays_MAIN_DELAY_MEMBERS=Kechiktirilgan a'zolik badali
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Depozitni tekshirish amalga oshirilmagan
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tasdiqlash uchun xarajatlar to'g'risidagi hisobot
-Delays_MAIN_DELAY_HOLIDAYS=Leave requests to approve
+Delays_MAIN_DELAY_HOLIDAYS=Tasdiqlash uchun so'rovlarni qoldiring
 SetupDescription1=Dolibarr-dan foydalanishni boshlashdan oldin ba'zi bir boshlang'ich parametrlarni aniqlash va modullarni yoqish / sozlash kerak.
 SetupDescription2=Quyidagi ikkita bo'lim majburiydir (O'rnatish menyusidagi ikkita birinchi yozuv):
 SetupDescription3= <a href="%s"> %s -> %s </a> <br> <br> Ilovangizning standart xatti-harakatlarini sozlash uchun ishlatiladigan asosiy parametrlar (masalan, mamlakat bilan bog'liq).
 SetupDescription4= <a href="%s"> %s -> %s </a> <br> <br> Ushbu dastur ko'plab modullar / ilovalar to'plamidir. Sizning ehtiyojlaringiz bilan bog'liq modullarni yoqish va sozlash kerak. Ushbu modullar yoqilganda menyu yozuvlari paydo bo'ladi.
 SetupDescription5=Boshqa O'rnatish menyusi yozuvlari ixtiyoriy parametrlarni boshqaradi.
-AuditedSecurityEvents=Security events that are audited
-NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
-Audit=Security events
+AuditedSecurityEvents=Tekshiriladigan xavfsizlik hodisalari
+NoSecurityEventsAreAduited=Hech qanday xavfsizlik hodisalari tekshirilmaydi. Siz ularni %s menyusidan faollashtirishingiz mumkin
+Audit=Xavfsizlik tadbirlari
 InfoDolibarr=Dolibarr haqida
 InfoBrowser=Brauzer haqida
 InfoOS=OS haqida
@@ -1199,7 +1200,7 @@ InfoWebServer=Veb-server haqida
 InfoDatabase=Ma'lumotlar bazasi haqida
 InfoPHP=PHP haqida
 InfoPerf=Ijrolar haqida
-InfoSecurity=About Security
+InfoSecurity=Xavfsizlik to'g'risida
 BrowserName=Brauzer nomi
 BrowserOS=Brauzer OS
 ListOfSecurityEvents=Dolibarr xavfsizlik tadbirlari ro'yxati
@@ -1209,14 +1210,14 @@ AreaForAdminOnly=O'rnatish parametrlarini faqat <b> administrator foydalanuvchil
 SystemInfoDesc=Tizim ma'lumotlari faqat o'qish rejimida olinadigan va faqat administratorlar uchun ko'rinadigan turli xil texnik ma'lumotlardir.
 SystemAreaForAdminOnly=Ushbu maydon faqat administrator foydalanuvchilari uchun mavjud. Dolibarr foydalanuvchi ruxsatnomalari ushbu cheklovni o'zgartira olmaydi.
 CompanyFundationDesc=Kompaniyangiz / tashkilotingiz ma'lumotlarini tahrirlash. Ish tugagandan so'ng sahifaning pastki qismidagi "%s" tugmasini bosing.
-AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
-AccountantFileNumber=Accountant code
+AccountantDesc=Agar sizda tashqi buxgalter / buxgalter bo'lsa, bu erda uning ma'lumotlarini tahrirlashingiz mumkin.
+AccountantFileNumber=Buxgalter kodi
 DisplayDesc=Dolibarr tashqi ko'rinishiga va xatti-harakatlariga ta'sir qiladigan parametrlarni bu erda o'zgartirish mumkin.
 AvailableModules=Mavjud ilova / modullar
 ToActivateModule=Modullarni faollashtirish uchun o'rnatish maydoniga o'ting (Uy-> O'rnatish-> Modullar).
 SessionTimeOut=Mashg'ulot uchun vaqt tugadi
 SessionExplanation=This number guarantees that the session will never expire before this delay, if the session cleaner is done by Internal PHP session cleaner (and nothing else). Internal PHP session cleaner does not guarantee that the session will expire after this delay. It will expire, after this delay, and when the session cleaner is run, so every <b>%s/%s</b> access, but only during access made by other sessions (if value is 0, it means clearing of session is done only by an external process).<br>Note: on some servers with an external session cleaning mechanism (cron under debian, ubuntu ...), the sessions can be destroyed after a period defined by an external setup, no matter what the value entered here is.
-SessionsPurgedByExternalSystem=Sessions on this server seems to be cleaned by an external mechanism (cron under debian, ubuntu ...), probably every <b>%s</b> seconds (= value of parameter <b>session.gc_maxlifetime</b>), so changing the value here has no effect. You must ask the server administrator to change session delay.
+SessionsPurgedByExternalSystem=Ushbu serverdagi sessiyalar tashqi mexanizm (cron, debian, ubuntu ...) bilan tozalanadigandek tuyuladi, ehtimol har bir <b> %s </b> soniya (= <b> session.gc9f88 Server ma'muridan sessiyaning kechikishini o'zgartirishni so'rashingiz kerak.
 TriggersAvailable=Mavjud triggerlar
 TriggersDesc=Triggerlar - bu <b> htdocs / core / triggers </b> katalogiga ko'chirilgandan so'ng, Dolibarr ish oqimini o'zgartiradigan fayllar. Ular Dolibarr tadbirlarida faollashtirilgan yangi harakatlarni amalga oshiradilar (yangi kompaniya yaratish, hisob-fakturani tasdiqlash, ...).
 TriggerDisabledByName=Ushbu fayldagi triggerlar o'z nomidagi <b> -NORUN </b> qo'shimchasi tomonidan o'chirib qo'yilgan.
@@ -1250,25 +1251,25 @@ RestoreDesc2="Hujjatlar" katalogining zaxira faylini (masalan, zip fayli) yangi
 RestoreDesc3=Ma'lumotlar bazasi tuzilishini va zaxira dump faylidan yangi Dolibarr o'rnatilishi ma'lumotlar bazasiga yoki ushbu joriy o'rnatish bazasiga tiklang (<b> %s </b>). Ogohlantirish, tiklash tugallangandan so'ng, qayta ulanish uchun zaxira vaqti / o'rnatilishidan oldin mavjud bo'lgan login / paroldan foydalanishingiz kerak. <br> zaxira ma'lumotlar bazasini ushbu joriy o'rnatishga qaytarish uchun ushbu yordamchiga ergashishingiz mumkin.
 RestoreMySQL=MySQL-ni import qilish
 ForcedToByAModule=Ushbu qoida majburiy ravishda faollashtirilgan modul tomonidan <b> %s </b>
-ValueIsForcedBySystem=This value is forced by the system. You can't change it.
+ValueIsForcedBySystem=Ushbu qiymat tizim tomonidan majburlanadi. Siz uni o'zgartira olmaysiz.
 PreviousDumpFiles=Mavjud zaxira fayllari
-PreviousArchiveFiles=Existing archive files
+PreviousArchiveFiles=Mavjud arxiv fayllari
 WeekStartOnDay=Haftaning birinchi kuni
 RunningUpdateProcessMayBeRequired=Yangilash jarayonini bajarish talab etilgandek tuyuladi (%s dastur versiyasi %s ma'lumotlar bazasidan farq qiladi)
 YouMustRunCommandFromCommandLineAfterLoginToUser=You must run this command from command line after login to a shell with user <b>%s</b> or you must add -W option at end of command line to provide <b>%s</b> password.
 YourPHPDoesNotHaveSSLSupport=Sizning PHP-da SSL funktsiyalari mavjud emas
 DownloadMoreSkins=Yuklab olish uchun ko'proq terilar
 SimpleNumRefModelDesc=%syymm-nnnn formatidagi mos yozuvlar raqamini qaytaradi, bu erda yy yil, mm oy va nnnn ketma-ket avtomatik ortib boruvchi raqam
-SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
-ShowProfIdInAddress=Professional identifikatorni manzillari bilan ko'rsating
-ShowVATIntaInAddress=Hamjamiyat ichidagi QQS raqamini manzillari bilan yashirish
+SimpleNumRefNoDateModelDesc=%s-nnnn formatidagi mos yozuvlar raqamini qaytaradi, bu erda nnnn qayta tiklanmagan ketma-ket avtomatik ko'paytiruvchi raqam
+ShowProfIdInAddress=Show professional ID with addresses
+ShowVATIntaInAddress=Hide intra-Community VAT number
 TranslationUncomplete=Qisman tarjima
 MAIN_DISABLE_METEO=Meteorologik ko'rinishni o'chirib qo'ying
-MeteoStdMod=Standard mode
-MeteoStdModEnabled=Standard mode enabled
-MeteoPercentageMod=Percentage mode
-MeteoPercentageModEnabled=Percentage mode enabled
-MeteoUseMod=Click to use %s
+MeteoStdMod=Standart rejim
+MeteoStdModEnabled=Standart rejim yoqilgan
+MeteoPercentageMod=Foiz rejimi
+MeteoPercentageModEnabled=Foiz rejimi yoqilgan
+MeteoUseMod=%s dan foydalanish uchun bosing
 TestLoginToAPI=API-ga kirishni sinab ko'ring
 ProxyDesc=Dolibarr-ning ba'zi xususiyatlari Internetga kirishni talab qiladi. Agar kerak bo'lsa, proksi-server orqali kirish kabi Internetga ulanish parametrlarini bu erda aniqlang.
 ExternalAccess=Tashqi / Internetga kirish
@@ -1280,7 +1281,7 @@ MAIN_PROXY_PASS=Proksi-server: parol
 DefineHereComplementaryAttributes=Qo'shilishi kerak bo'lgan har qanday qo'shimcha / maxsus atributlarni aniqlang: %s
 ExtraFields=Bir-birini to'ldiruvchi atributlar
 ExtraFieldsLines=Qo'shimcha atributlar (chiziqlar)
-ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
+ExtraFieldsLinesRec=Qo'shimcha atributlar (shablonlar fakturalar satrlari)
 ExtraFieldsSupplierOrdersLines=Qo'shimcha atributlar (buyurtma satrlari)
 ExtraFieldsSupplierInvoicesLines=Qo'shimcha atributlar (hisob-faktura satrlari)
 ExtraFieldsThirdParties=Qo'shimcha atributlar (uchinchi tomon)
@@ -1288,12 +1289,12 @@ ExtraFieldsContacts=Qo'shimcha atributlar (kontaktlar / manzil)
 ExtraFieldsMember=Qo'shimcha atributlar (a'zo)
 ExtraFieldsMemberType=Qo'shimcha atributlar (a'zo turi)
 ExtraFieldsCustomerInvoices=Qo'shimcha atributlar (hisob-fakturalar)
-ExtraFieldsCustomerInvoicesRec=Complementary attributes (templates invoices)
+ExtraFieldsCustomerInvoicesRec=Qo'shimcha atributlar (shablonlar hisob-fakturalari)
 ExtraFieldsSupplierOrders=Qo'shimcha atributlar (buyurtmalar)
 ExtraFieldsSupplierInvoices=Qo'shimcha atributlar (hisob-fakturalar)
 ExtraFieldsProject=Qo'shimcha atributlar (loyihalar)
 ExtraFieldsProjectTask=Qo'shimcha atributlar (vazifalar)
-ExtraFieldsSalaries=Complementary attributes (salaries)
+ExtraFieldsSalaries=Qo'shimcha atributlar (ish haqi)
 ExtraFieldHasWrongValue=%s atributi noto'g'ri qiymatga ega.
 AlphaNumOnlyLowerCharsAndNoSpace=bo'sh joysiz faqat alfasayısal va kichik harflar
 SendmailOptionNotComplete=E'tibor bering, ba'zi bir Linux tizimlarida elektron pochtangizdan elektron pochta xabarlarini yuborish uchun sendmail-ning bajarilishini o'rnatish -ba parametrini o'z ichiga olishi kerak (sizning php.ini faylingizga mail.force_extra_parameters parametri). Agar ba'zi bir qabul qiluvchilar hech qachon elektron pochta xabarlarini olmasalar, ushbu PHP parametrini mail.force_extra_parameters = -ba) bilan tahrir qilib ko'ring.
@@ -1311,8 +1312,8 @@ CurrentTranslationString=Joriy tarjima qatori
 WarningAtLeastKeyOrTranslationRequired=Hech bo'lmaganda kalit yoki tarjima satri uchun qidiruv mezonlari talab qilinadi
 NewTranslationStringToShow=Ko'rsatiladigan yangi tarjima qatori
 OriginalValueWas=Asl tarjima ustiga yozilgan. Asl qiymati: <br> <br> %s
-TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exist in any language files
-TitleNumberOfActivatedModules=Activated modules
+TransKeyWithoutOriginalValue=Siz "<strong> %s </strong>" tarjima kaliti uchun hech qanday til fayllarida mavjud bo'lmagan yangi tarjimani majbur qildingiz
+TitleNumberOfActivatedModules=Faollashtirilgan modullar
 TotalNumberOfActivatedModules=Faollashtirilgan modullar: <b> %s </b> / <b> %s </b>
 YouMustEnableOneModule=Siz kamida 1 ta modulni yoqishingiz kerak
 ClassNotFoundIntoPathWarning=%s sinfi PHP yo'lida topilmadi
@@ -1322,26 +1323,26 @@ SuhosinSessionEncrypt=Suxsin tomonidan shifrlangan sessiyani saqlash
 ConditionIsCurrently=Vaziyat hozirda %s
 YouUseBestDriver=Siz hozirda mavjud bo'lgan eng yaxshi haydovchi bo'lgan %s drayveridan foydalanasiz.
 YouDoNotUseBestDriver=Siz haydovchi %s dan foydalanasiz, lekin %s drayveri tavsiya etiladi.
-NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
-ComboListOptim=Combo list loading optimization
+NbOfObjectIsLowerThanNoPb=Sizda ma'lumotlar bazasida faqat %s %s mavjud. Bu aniq bir optimallashtirishni talab qilmaydi.
+ComboListOptim=Kombinatsiyalangan ro'yxatni yuklashni optimallashtirish
 SearchOptim=Qidiruvni optimallashtirish
-YouHaveXObjectUseComboOptim=You have %s %s in the database. You can go into setup of module to enable loading of combo list on key pressed event.
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other.
-YouHaveXObjectUseSearchOptimDesc=This limits the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
-YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to %s in Home-Setup-Other.
+YouHaveXObjectUseComboOptim=Sizda ma'lumotlar bazasida %s %s mavjud. Siz tugmachani bosilgan hodisada kombinatsiyalangan ro'yxatni yuklash uchun modulni o'rnatishingiz mumkin.
+YouHaveXObjectUseSearchOptim=Sizda ma'lumotlar bazasida %s %s mavjud. Home-Setup-Other-da %s doimiyligini 1 ga qo'shishingiz mumkin.
+YouHaveXObjectUseSearchOptimDesc=Bu qidiruvni satrlarning boshida cheklaydi, bu ma'lumotlar bazasiga indekslardan foydalanishga imkon beradi va siz darhol javob olishingiz kerak.
+YouHaveXObjectAndSearchOptimOn=Sizda ma'lumotlar bazasida %s %s mavjud va doimiy %s %s ga Home-Setup-Other-da o'rnatilgan.
 BrowserIsOK=Siz %s veb-brauzeridan foydalanmoqdasiz. Ushbu brauzer xavfsizlik va ishlash uchun yaxshi.
 BrowserIsKO=Siz %s veb-brauzeridan foydalanmoqdasiz. Ushbu brauzer xavfsizlik, ishlash va ishonchlilik uchun yomon tanlov ekanligi ma'lum. Firefox, Chrome, Opera yoki Safari-dan foydalanishni tavsiya etamiz.
-PHPModuleLoaded=PHP component %s is loaded
-PreloadOPCode=Preloaded OPCode is used
+PHPModuleLoaded=PH0 komponenti %s yuklandi
+PreloadOPCode=Oldindan yuklangan OPCode ishlatiladi
 AddRefInList=Mijoz / sotuvchini ko'rsatish. ma'lumot ro'yxati (ro'yxat yoki kombinatsion qutini tanlang) va ko'prikning ko'pligi. <br> Uchinchi tomonlar "CC12345 - SC45678 - Katta kompaniya korpusi" nom formatida paydo bo'ladi. "Katta kompaniya korpusi" o'rniga.
-AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
-AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
+AddAdressInList=<br> uchinchi tomonlar "Buyuk Kompaniya korpusi" o'rniga "Katta kompaniya korpusi. - 21 o'tish ko'chasi 123456 Katta shahar - AQSh" formatidagi "Uchinchi tomonlar" paydo bo'ladi.
+AddEmailPhoneTownInContactList=<br> Aloqa uchun elektron pochta manzilini (yoki aniqlanmagan telefonlar bilan) va shahar haqida ma'lumot ro'yxatini (tanlang ro'yxati yoki kombinat qutisi) ko'rsating "Dupond Durand - dupond.durand@email.com - Parij" yoki "Dyupond Durand - 06 07 59 65 66 - "Dyupond Dyurand" o'rniga "Parij".
 AskForPreferredShippingMethod=Uchinchi shaxslar uchun jo'natilgan transport usulini so'rang.
 FieldEdition=%s maydonining nashri
 FillThisOnlyIfRequired=Misol: +2 (faqat vaqt mintaqasini ofset bilan bog'liq muammolar yuzaga kelganda to'ldiring)
 GetBarCode=Shtrixli kodni oling
-NumberingModules=Numbering models
-DocumentModules=Document models
+NumberingModules=Nomerlash modellari
+DocumentModules=Hujjat modellari
 ##### Module password generation
 PasswordGenerationStandard=Ichki Dolibarr algoritmiga binoan yaratilgan parolni qaytaring: %s belgilarida umumiy raqamlar va kichik harflardagi belgilar mavjud.
 PasswordGenerationNone=Yaratilgan parolni taklif qilmang. Parolni qo'lda kiritish kerak.
@@ -1353,9 +1354,9 @@ RuleForGeneratedPasswords=Parollarni yaratish va tasdiqlash qoidalari
 DisableForgetPasswordLinkOnLogonPage=Kirish sahifasida "Parol unutilgan" havolasini ko'rsatmang
 UsersSetup=Foydalanuvchilar modulini sozlash
 UserMailRequired=Yangi foydalanuvchi yaratish uchun elektron pochta kerak
-UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
-UsersDocModules=Document templates for documents generated from user record
-GroupsDocModules=Document templates for documents generated from a group record
+UserHideInactive=Faol bo'lmagan foydalanuvchilarni barcha foydalanuvchilar ro'yxatidan yashirish (Tavsiya etilmaydi: bu ba'zi sahifalarda eski foydalanuvchilarni filtrlay olmaysiz yoki qidira olmaysiz degan ma'noni anglatadi)
+UsersDocModules=Foydalanuvchi yozuvidan hosil bo'lgan hujjatlar uchun hujjat shablonlari
+GroupsDocModules=Guruh yozuvidan hosil qilingan hujjatlar uchun hujjat shablonlari
 ##### HRM setup #####
 HRMSetup=HRM modulini sozlash
 ##### Company setup #####
@@ -1374,18 +1375,18 @@ CompanyIdProfChecker=Professional guvohnomalar uchun qoidalar
 MustBeUnique=Noyob bo'lishi kerakmi?
 MustBeMandatory=Uchinchi shaxslarni yaratish majburiymi (agar QQS raqami yoki kompaniya turi aniqlangan bo'lsa)?
 MustBeInvoiceMandatory=Hisob-fakturalarni tasdiqlash majburiymi?
-TechnicalServicesProvided=Technical services provided
+TechnicalServicesProvided=Ko'rsatilgan texnik xizmatlar
 #####DAV #####
-WebDAVSetupDesc=This is the link to access the WebDAV directory. It contains a "public" dir open to any user knowing the URL (if public directory access allowed) and a "private" directory that needs an existing login account/password for access.
-WebDavServer=Root URL of %s server: %s
+WebDAVSetupDesc=Bu WebDAV katalogiga kirish uchun havola. Unda URLni biladigan har qanday foydalanuvchi uchun ochiq bo'lgan "umumiy" dir (agar katalogga kirish uchun ruxsat berilgan bo'lsa) va kirish uchun mavjud bo'lgan kirish qayd yozuvi / parol kerak bo'lgan "shaxsiy" katalog mavjud.
+WebDavServer=%s serverining ildiz URL manzili: %s
 ##### Webcal setup #####
 WebCalUrlForVCalExport=<b> %s </b> formatiga eksport havolasi quyidagi havolada mavjud: %s
 ##### Invoices #####
 BillsSetup=Hisob-fakturalar modulini sozlash
 BillsNumberingModule=Hisob-fakturalar va kredit yozuvlarini raqamlash modeli
 BillsPDFModules=Hisob-faktura hujjatlari modellari
-BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
-PaymentsPDFModules=Payment documents models
+BillsPDFModulesAccordindToInvoiceType=Hisob-faktura turiga ko'ra hisob-faktura hujjatlari modellari
+PaymentsPDFModules=To'lov hujjatlari modellari
 ForceInvoiceDate=Hisob-fakturani tasdiqlash sanasiga majburlang
 SuggestedPaymentModesIfNotDefinedInInvoice=Hisob-fakturada belgilanmagan bo'lsa, sukut bo'yicha hisob-kitob bo'yicha tavsiya etilgan to'lovlar rejimi
 SuggestPaymentByRIBOnAccount=Hisobga pul tushirish orqali to'lovni taklif eting
@@ -1399,7 +1400,7 @@ SupplierPaymentSetup=Sotuvchi to'lovlarini sozlash
 PropalSetup=Tijorat takliflari modulini sozlash
 ProposalsNumberingModules=Tijorat takliflarini raqamlash modellari
 ProposalsPDFModules=Tijorat takliflari hujjatlari modellari
-SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined on the proposal
+SuggestedPaymentModesIfNotDefinedInProposal=Taklif bo'yicha aniqlanmagan bo'lsa, sukut bo'yicha taklif bo'yicha tavsiya etilgan to'lovlar rejimi
 FreeLegalTextOnProposal=Tijorat takliflari bo'yicha bepul matn
 WatermarkOnDraftProposal=Tijorat takliflari loyihasidagi suv belgisi (bo'sh bo'lmasa)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Bank hisobvarag'i bo'yicha taklifni so'rang
@@ -1414,7 +1415,7 @@ WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Buyurtma uchun Ombor manbasini so'rang
 ##### Suppliers Orders #####
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Xarid qilish buyurtmasi bo'yicha bank hisob raqamini so'rang
 ##### Orders #####
-SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sale order by default if not defined on the order
+SuggestedPaymentModesIfNotDefinedInOrder=Agar buyurtmada aniqlanmagan bo'lsa, sukut bo'yicha sotish buyurtmasi bo'yicha tavsiya etilgan to'lovlar rejimi
 OrdersSetup=Savdo buyurtmalarini boshqarishni sozlash
 OrdersNumberingModules=Buyurtmalarni raqamlash modellari
 OrdersModelModule=Hujjatlar modellarini buyurtma qilish
@@ -1440,10 +1441,10 @@ MemberMainOptions=Asosiy variantlar
 AdherentLoginRequired= Har bir a'zo uchun tizimga kirishni boshqaring
 AdherentMailRequired=Yangi a'zo yaratish uchun elektron pochta kerak
 MemberSendInformationByMailByDefault=Odatiy ravishda a'zolarga pochta orqali tasdiqlash (tasdiqlash yoki yangi obuna) yuborish uchun tasdiqlash qutisi yoqilgan
-MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
-VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
-MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
-MembersDocModules=Document templates for documents generated from member record
+MemberCreateAnExternalUserForSubscriptionValidated=Tasdiqlangan har bir yangi a'zo obuna uchun tashqi foydalanuvchi loginini yarating
+VisitorCanChooseItsPaymentMode=Mehmon mavjud to'lov usullarini tanlashi mumkin
+MEMBER_REMINDER_EMAIL=Muddati o'tgan obunalarni </b> elektron pochta orqali <b> avtomatik eslatib turishni yoqing. Eslatma: <strong> %s </strong> moduli yoqilgan va eslatmalarni yuborish uchun to'g'ri sozlangan bo'lishi kerak.
+MembersDocModules=Ro'yxatdan yozuvlaridan hosil bo'lgan hujjatlar uchun hujjat shablonlari
 ##### LDAP setup #####
 LDAPSetup=LDAP-ni sozlash
 LDAPGlobalParameters=Global parameters
@@ -1451,7 +1452,7 @@ LDAPUsersSynchro=Foydalanuvchilar
 LDAPGroupsSynchro=Guruhlar
 LDAPContactsSynchro=Kontaktlar
 LDAPMembersSynchro=A'zolar
-LDAPMembersTypesSynchro=Members types
+LDAPMembersTypesSynchro=A'zolar turlari
 LDAPSynchronization=LDAP sinxronizatsiyasi
 LDAPFunctionsNotAvailableOnPHP=PHP-da LDAP funktsiyalari mavjud emas
 LDAPToDolibarr=LDAP -> Dolibarr
@@ -1461,7 +1462,7 @@ LDAPSynchronizeUsers=LDAP-da foydalanuvchilarni tashkil etish
 LDAPSynchronizeGroups=LDAP da guruhlarni tashkil etish
 LDAPSynchronizeContacts=LDAP-da aloqalarni tashkil etish
 LDAPSynchronizeMembers=LDAPda fond a'zolarini tashkil etish
-LDAPSynchronizeMembersTypes=Organization of foundation's members types in LDAP
+LDAPSynchronizeMembersTypes=LDAPda fond a'zolarining turlarini tashkil etish
 LDAPPrimaryServer=Asosiy server
 LDAPSecondaryServer=Ikkilamchi server
 LDAPServerPort=Server porti
@@ -1485,18 +1486,18 @@ LDAPDnContactActive=Kontaktlarni sinxronlashtirish
 LDAPDnContactActiveExample=Faollashtirilgan / yoqilmagan sinxronizatsiya
 LDAPDnMemberActive=A'zolarni sinxronlashtirish
 LDAPDnMemberActiveExample=Faollashtirilgan / yoqilmagan sinxronizatsiya
-LDAPDnMemberTypeActive=Members types' synchronization
-LDAPDnMemberTypeActiveExample=Activated/Unactivated synchronization
+LDAPDnMemberTypeActive=A'zolar turlarini sinxronlashtirish
+LDAPDnMemberTypeActiveExample=Faollashtirilgan / yoqilmagan sinxronizatsiya
 LDAPContactDn=Dolibarr kontaktlarining DN
 LDAPContactDnExample=To'liq DN (masalan: ou = kontaktlar, dc = misol, dc = com)
 LDAPMemberDn=Dolibarr a'zolari DN
 LDAPMemberDnExample=To'liq DN (masalan: ou = a'zolar, dc = misol, dc = com)
 LDAPMemberObjectClassList=ObjectClass ro'yxati
 LDAPMemberObjectClassListExample=Reklama atributlarini belgilaydigan objectClass ro'yxati (masalan: top, inetOrgPerson yoki top, faol katalog uchun foydalanuvchi)
-LDAPMemberTypeDn=Dolibarr members types DN
-LDAPMemberTypepDnExample=Complete DN (ex: ou=memberstypes,dc=example,dc=com)
-LDAPMemberTypeObjectClassList=List of objectClass
-LDAPMemberTypeObjectClassListExample=List of objectClass defining record attributes (ex: top,groupOfUniqueNames)
+LDAPMemberTypeDn=Dolibarr a'zolari DN ni yozadilar
+LDAPMemberTypepDnExample=To'liq DN (masalan: ou = a'zo tiplari, dc = misol, dc = com)
+LDAPMemberTypeObjectClassList=ObjectClass ro'yxati
+LDAPMemberTypeObjectClassListExample=Reklama atributlarini belgilaydigan objectClass ro'yxati (masalan: top, groupOfUniqueNames)
 LDAPUserObjectClassList=ObjectClass ro'yxati
 LDAPUserObjectClassListExample=Reklama atributlarini belgilaydigan objectClass ro'yxati (masalan: top, inetOrgPerson yoki top, faol katalog uchun foydalanuvchi)
 LDAPGroupObjectClassList=ObjectClass ro'yxati
@@ -1508,7 +1509,7 @@ LDAPTestSynchroContact=Kontaktlar sinxronizatsiyasini sinab ko'ring
 LDAPTestSynchroUser=Foydalanuvchi bilan sinxronlashni sinab ko'ring
 LDAPTestSynchroGroup=Sinov guruhini sinxronlashtirish
 LDAPTestSynchroMember=Sinov a'zolarini sinxronlashtirish
-LDAPTestSynchroMemberType=Test member type synchronization
+LDAPTestSynchroMemberType=Sinov a'zolarining turini sinxronlashtirish
 LDAPTestSearch= LDAP qidiruvini sinab ko'ring
 LDAPSynchroOK=Sinxronizatsiya testi muvaffaqiyatli o'tdi
 LDAPSynchroKO=Sinxronizatsiya sinovi muvaffaqiyatsiz tugadi
@@ -1525,7 +1526,7 @@ LDAPFieldLoginUnix=Kirish (unix)
 LDAPFieldLoginExample=Misol: uid
 LDAPFilterConnection=Qidiruv filtri
 LDAPFilterConnectionExample=Misol: & (objectClass = inetOrgPerson)
-LDAPGroupFilterExample=Example: &(objectClass=groupOfUsers)
+LDAPGroupFilterExample=Misol: & (objectClass = groupOfUsers)
 LDAPFieldLoginSamba=Kirish (samba, activedirectory)
 LDAPFieldLoginSambaExample=Misol: samaccountname
 LDAPFieldFullname=To'liq ism
@@ -1569,27 +1570,27 @@ LDAPFieldSidExample=Misol: objectid
 LDAPFieldEndLastSubscription=Obuna tugagan sana
 LDAPFieldTitle=Ish joyi
 LDAPFieldTitleExample=Misol: sarlavha
-LDAPFieldGroupid=Group id
-LDAPFieldGroupidExample=Exemple : gidnumber
-LDAPFieldUserid=User id
-LDAPFieldUseridExample=Exemple : uidnumber
-LDAPFieldHomedirectory=Home directory
-LDAPFieldHomedirectoryExample=Exemple : homedirectory
-LDAPFieldHomedirectoryprefix=Home directory prefix
+LDAPFieldGroupid=Guruh identifikatori
+LDAPFieldGroupidExample=Misol: gidnumber
+LDAPFieldUserid=Foydalanuvchi IDsi
+LDAPFieldUseridExample=Misol: uidnumber
+LDAPFieldHomedirectory=Uy katalogi
+LDAPFieldHomedirectoryExample=Misol: homedirectory
+LDAPFieldHomedirectoryprefix=Uy katalogi prefiksi
 LDAPSetupNotComplete=LDAP-ni sozlash tugallanmagan (boshqalarga o'tish)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Hech qanday administrator yoki parol taqdim etilmagan. LDAP-ga kirish noma'lum va faqat o'qish rejimida bo'ladi.
 LDAPDescContact=Ushbu sahifa Dolibarr kontaktlarida topilgan har bir ma'lumot uchun LDAP daraxtidagi LDAP atributlari nomini aniqlashga imkon beradi.
 LDAPDescUsers=Ushbu sahifa Dolibarr foydalanuvchilarida topilgan har bir ma'lumot uchun LDAP daraxtidagi LDAP atributlari nomini aniqlashga imkon beradi.
 LDAPDescGroups=Ushbu sahifa Dolibarr guruhlarida topilgan har bir ma'lumot uchun LDAP daraxtidagi LDAP atributlari nomini aniqlashga imkon beradi.
 LDAPDescMembers=Ushbu sahifa Dolibarr a'zolari modulida topilgan har bir ma'lumot uchun LDAP daraxtidagi LDAP atributlari nomini aniqlashga imkon beradi.
-LDAPDescMembersTypes=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members types.
+LDAPDescMembersTypes=Ushbu sahifa Dolibarr a'zolari turlarida topilgan har bir ma'lumot uchun LDAP daraxtidagi LDAP atributlari nomini aniqlashga imkon beradi.
 LDAPDescValues=Misol qiymatlari <b> OpenLDAP </b> uchun quyidagi yuklangan sxemalar bilan yaratilgan: <b> core.schema, cosine.schema, inetorgperson.schema </b>). Agar siz qadriyatlar va OpenLDAP-dan foydalansangiz, LDAP konfiguratsiya faylini <b> slapd.conf </b>-ga o'zgartiring.
 ForANonAnonymousAccess=Tasdiqlangan kirish uchun (masalan, yozishga kirish uchun)
 PerfDolibarr=Ishlashni sozlash / optimallashtirish hisoboti
 YouMayFindPerfAdviceHere=Ushbu sahifada ishlash bilan bog'liq ba'zi tekshirishlar yoki tavsiyalar berilgan.
 NotInstalled=O'rnatilmagan
-NotSlowedDownByThis=Not slowed down by this.
-NotRiskOfLeakWithThis=Not risk of leak with this.
+NotSlowedDownByThis=Bu bilan sekinlashmadi.
+NotRiskOfLeakWithThis=Bu bilan sizib chiqish xavfi yo'q.
 ApplicativeCache=Amaliy kesh
 MemcachedNotAvailable=Amaliy kesh topilmadi. Siz Memcached kesh-serverini va ushbu kesh-serverdan foydalanishga qodir bo'lgan modulni o'rnatish orqali ish faoliyatini oshirishingiz mumkin. <br> Qo'shimcha ma'lumot bu erda <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN"> http://wiki.dolibarr.org/index.php/Module_MemCached_EN </a>. <br> E'tibor bering, ko'plab veb-xosting provayderlari bunday kesh-serverni ta'minlamaydilar.
 MemcachedModuleAvailableButNotSetup=Amaliy kesh uchun memcached moduli topildi, ammo modulni sozlash tugallanmagan.
@@ -1602,28 +1603,28 @@ FilesOfTypeNotCached=%s turidagi fayllar HTTP server tomonidan keshlanmagan
 FilesOfTypeCompressed=%s tipidagi fayllar HTTP server tomonidan siqiladi
 FilesOfTypeNotCompressed=%s turidagi fayllar HTTP-server tomonidan siqilmagan
 CacheByServer=Server tomonidan keshlash
-CacheByServerDesc=For example using the Apache directive "ExpiresByType image/gif A2592000"
+CacheByServerDesc=Masalan, "ExpiresByType image / gif A2592000" Apache ko'rsatmasidan foydalanish
 CacheByClient=Brauzer orqali keshlash
 CompressionOfResources=HTTP javoblarini siqish
-CompressionOfResourcesDesc=For example using the Apache directive "AddOutputFilterByType DEFLATE"
+CompressionOfResourcesDesc=Masalan, "AddOutputFilterByType DEFLATE" Apache ko'rsatmasidan foydalanish
 TestNotPossibleWithCurrentBrowsers=Hozirgi brauzerlarda bunday avtomatik aniqlash mumkin emas
-DefaultValuesDesc=Here you may define the default value you wish to use when creating a new record, and/or default filters or the sort order when you list records.
-DefaultCreateForm=Default values (to use on forms)
-DefaultSearchFilters=Default search filters
-DefaultSortOrder=Default sort orders
-DefaultFocus=Default focus fields
-DefaultMandatory=Mandatory form fields
+DefaultValuesDesc=Bu erda siz yangi yozuv yaratishda foydalanmoqchi bo'lgan birlamchi qiymatni va / yoki standart filtrlarni yoki yozuvlarni ro'yxatlashda tartiblashtirish tartibini belgilashingiz mumkin.
+DefaultCreateForm=Standart qiymatlar (shakllarda foydalanish uchun)
+DefaultSearchFilters=Standart qidiruv filtrlari
+DefaultSortOrder=Standart tartiblash buyurtmalari
+DefaultFocus=Standart fokus maydonlari
+DefaultMandatory=Majburiy shakl maydonlari
 ##### Products #####
 ProductSetup=Mahsulotlar modulini sozlash
 ServiceSetup=Xizmatlar modulini sozlash
 ProductServiceSetup=Mahsulotlar va xizmatlar modullarini sozlash
 NumberOfProductShowInSelect=Kombinatsiyalangan ro'yxatlarda ko'rsatiladigan mahsulotlarning maksimal soni (0 = chegara yo'q)
 ViewProductDescInFormAbility=Shakllarda mahsulot tavsiflarini aks ettiring (aks holda ko'rsatmalar oynasi oynasida ko'rsatiladi)
-DoNotAddProductDescAtAddLines=Do not add product description (from product card) on submit add lines on forms
-OnProductSelectAddProductDesc=How to use the description of the products when adding a product as a line of a document
-AutoFillFormFieldBeforeSubmit=Auto fill the description input field with the description of product
-DoNotAutofillButAutoConcat=Do not autofill the input field with description of product. Description of the product will be concatenated to the entered description automatically.
-DoNotUseDescriptionOfProdut=Description of the product will never be included into the description of lines of documents
+DoNotAddProductDescAtAddLines=Shakllarga satrlarni qo'shish uchun mahsulot tavsifini (mahsulot kartasidan) qo'shmang
+OnProductSelectAddProductDesc=Mahsulotni hujjat qatori sifatida qo'shganda mahsulotlarning tavsifidan qanday foydalanish
+AutoFillFormFieldBeforeSubmit=Tavsifni kiritish maydonini mahsulot tavsifi bilan avtomatik to'ldirish
+DoNotAutofillButAutoConcat=Kirish maydonini mahsulot tavsifi bilan avtomatik to'ldirmang. Mahsulotning tavsifi kiritilgan tavsif bilan avtomatik ravishda birlashtiriladi.
+DoNotUseDescriptionOfProdut=Mahsulot tavsifi hech qachon hujjatlar satrining tavsifiga kiritilmaydi
 MergePropalProductCard=Agar mahsulot / xizmat taklifda bo'lsa, mahsulotning PDF-hujjati bilan mahsulotning PDF-hujjatini birlashtirish uchun mahsulot / xizmatda biriktirilgan fayllar yorlig'ini faollashtiring.
 ViewProductDescInThirdpartyLanguageAbility=Mahsulot tavsiflarini uchinchi tomon tilida (aks holda foydalanuvchi tilida) shakllarda ko'rsatish
 UseSearchToSelectProductTooltip=Agar sizda ko'p miqdordagi mahsulotlar (> 100 000) bo'lsa, doimiy ravishda PRODUCT_DONOTSEARCH_ANYWHERE-ni Setup-> Other-da 1 ga o'rnatib tezlikni oshirishingiz mumkin. Keyin qidirish satr boshlanishi bilan cheklanadi.
@@ -1643,9 +1644,9 @@ SyslogFilename=Fayl nomi va yo'li
 YouCanUseDOL_DATA_ROOT=Dolibarr "hujjatlar" katalogidagi jurnal fayli uchun DOL_DATA_ROOT / dolibarr.log dan foydalanishingiz mumkin. Ushbu faylni saqlash uchun boshqa yo'lni belgilashingiz mumkin.
 ErrorUnknownSyslogConstant=Doimiy %s ma'lum Syslog doimiysi emas
 OnlyWindowsLOG_USER=Windows-da faqat LOG_USER moslamasi qo'llab-quvvatlanadi
-CompressSyslogs=Compression and backup of debug log files (generated by module Log for debug)
-SyslogFileNumberOfSaves=Number of backup logs to keep
-ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
+CompressSyslogs=Sozlash va disk raskadrovka jurnal fayllarini zaxiralash (disk raskadrovka uchun Log moduli tomonidan yaratilgan)
+SyslogFileNumberOfSaves=Saqlanadigan jurnallar soni
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Jurnalning zaxira chastotasini o'rnatish uchun rejalashtirilgan ishni tozalashni sozlang
 ##### Donations #####
 DonationsSetup=Xayriya modulini sozlash
 DonationsReceiptModel=Xayr-ehson olish to'g'risidagi shablon
@@ -1704,7 +1705,7 @@ FCKeditorForProductDetails=WYSIWIG mahsulotlarini yaratish / nashr qilish barcha
 FCKeditorForMailing= Ommaviy elektron pochta xabarlari uchun WYSIWIG yaratish / nashr (Asboblar -> Elektron pochta)
 FCKeditorForUserSignature=WYSIWIG yaratish / foydalanuvchi imzosini nashr etish
 FCKeditorForMail=Barcha pochta uchun WYSIWIG yaratish / nashr (Asboblar -> elektron pochtadan tashqari)
-FCKeditorForTicket=WYSIWIG creation/edition for tickets
+FCKeditorForTicket=WYSIWIG yaratish / chiptalar uchun nashr
 ##### Stock #####
 StockSetup=Birja modulini sozlash
 IfYouUsePointOfSaleCheckModule=Agar siz sukut bo'yicha taqdim etilgan Sotish nuqtasi moduli (POS) yoki tashqi moduldan foydalansangiz, ushbu sozlash POS modulingiz tomonidan e'tiborsiz qoldirilishi mumkin. Ko'pgina POS-modullar sukut bo'yicha darhol hisob-fakturani yaratish va bu erdagi variantlardan qat'iy nazar zaxiralarni kamaytirish uchun ishlab chiqilgan. Shunday qilib, sizning POS-dan savdo-sotiqni ro'yxatdan o'tkazishda sizda aktsiyalar kamayishi kerak bo'lsa yoki kerak bo'lmasa, shuningdek POS modul sozlamalarini tekshiring.
@@ -1742,8 +1743,8 @@ OptionVATDefault=Standart asos
 OptionVATDebitOption=Hisoblash usuli
 OptionVatDefaultDesc=QQS muddati: <br> - tovarlarni etkazib berish bo'yicha (hisob-kitob sana asosida) <br> - xizmatlar uchun to'lovlar bo'yicha
 OptionVatDebitOptionDesc=QQS muddati: <br> - tovarlarni etkazib berish bo'yicha (hisob-kitob sana asosida) <br> - xizmatlar uchun hisob-kitob (debet) bo'yicha
-OptionPaymentForProductAndServices=Cash basis for products and services
-OptionPaymentForProductAndServicesDesc=VAT is due:<br>- on payment for goods<br>- on payments for services
+OptionPaymentForProductAndServices=Mahsulotlar va xizmatlar uchun naqd poydevor
+OptionPaymentForProductAndServicesDesc=QQS to'lashi kerak: <br> - tovarlarga to'lov bo'yicha <br> - xizmatlar uchun to'lovlarga
 SummaryOfVatExigibilityUsedByDefault=Tanlangan variant bo'yicha sukut bo'yicha QQS olish vaqti:
 OnDelivery=Yetkazib berish paytida
 OnPayment=To'lov bo'yicha
@@ -1757,28 +1758,28 @@ YourCompanyDoesNotUseVAT=Sizning kompaniyangiz QQSdan foydalanmasligi aniqlandi
 AccountancyCode=Buxgalteriya kodi
 AccountancyCodeSell=Sotish hisobi. kod
 AccountancyCodeBuy=Hisobni sotib olish. kod
-CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Keep the checkbox “Automatically create the payment” empty by default when creating a new tax
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Yangi soliqni yaratishda sukut bo'yicha "To'lovni avtomatik ravishda yaratish" katagiga bo'sh joy qo'ying
 ##### Agenda #####
 AgendaSetup=Voqealar va kun tartibi modulini o'rnatish
 PasswordTogetVCalExport=Eksport havolasini tasdiqlash uchun kalit
-SecurityKey = Security Key
+SecurityKey = Elektron kalit
 PastDelayVCalExport=Eskiroq voqeani eksport qilmang
 AGENDA_USE_EVENT_TYPE=Voqealar turlaridan foydalaning (O'rnatish menyusi -> Lug'atlar -> Kun tartibidagi tadbirlar turi)
 AGENDA_USE_EVENT_TYPE_DEFAULT=Voqeani yaratish shaklida voqea turi uchun ushbu standart qiymatni avtomatik ravishda sozlash
 AGENDA_DEFAULT_FILTER_TYPE=Ushbu turdagi tadbirlarni kun tartibi ko'rinishidagi qidiruv filtrida avtomatik ravishda o'rnating
 AGENDA_DEFAULT_FILTER_STATUS=Ushbu holatni kun tartibi ko'rinishidagi qidiruv filtridagi voqealar uchun avtomatik ravishda o'rnating
 AGENDA_DEFAULT_VIEW=Kun tartibi menyusini tanlashda qaysi ko'rinishni sukut bo'yicha ochishni xohlaysiz
-AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
-AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
-AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
-AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the scheduled job %s must be enough to be sure that the remind are sent at the correct moment.
-AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
+AGENDA_REMINDER_BROWSER=<b> foydalanuvchi brauzerida voqea eslatmasini yoqish
+AGENDA_REMINDER_BROWSER_SOUND=Ovozli bildirishnomani yoqish
+AGENDA_REMINDER_EMAIL=<b> hodisasini eslatishni </b> elektron pochta orqali yoqing (har bir tadbirda eslatish opsiyasi / kechikishi aniqlanishi mumkin).
+AGENDA_REMINDER_EMAIL_NOTE=Eslatma: %s ishining chastotasi eslatmaning to'g'ri vaqtda yuborilganligiga ishonch hosil qilish uchun etarli bo'lishi kerak.
+AGENDA_SHOW_LINKED_OBJECT=Bog'langan ob'ektni kun tartibidagi ko'rinishga ko'rsatish
 ##### Clicktodial #####
 ClickToDialSetup=To Dial modulini o'rnatish uchun bosing
 ClickToDialUrlDesc=Telefon piktogrammasi bosilganda url chaqirdi. URL, siz foydalanishingiz mumkin tags <br> <b> __PHONETO__ </b> deb <br> <b> __PHONEFROM__ </b> ClickToDial bilan almashtiriladi shaxs (seniki) qo'ng'iroq telefon raqamini <br> <b> __LOGIN__ </b> bilan almashtiriladi, deb qo'ng'iroq qilish shaxsning telefon raqami bilan almashtiriladi kirish (foydalanuvchi kartasida belgilangan) <br> <b> __PASS__ </b>, bu klikktodial parol bilan almashtiriladi (foydalanuvchi kartasida aniqlangan).
 ClickToDialDesc=Ushbu modul statsionar kompyuterdan foydalanilganda telefon raqamlarini bosish mumkin bo'lgan havolalarga o'zgartiradi. Bir marta bosish raqamga qo'ng'iroq qiladi. Bu ish stolida yumshoq telefondan foydalanilganda yoki masalan, SIP protokoliga asoslangan CTI tizimidan foydalanilganda telefon qo'ng'irog'ini boshlash uchun ishlatilishi mumkin. Eslatma: Smartfondan foydalanganda telefon raqamlari doim bosilishi mumkin.
 ClickToDialUseTelLink=Telefon raqamlarida faqat "tel:" havolasidan foydalaning
-ClickToDialUseTelLinkDesc=Agar sizning foydalanuvchilaringizda dasturiy ta'minot interfeysi o'rnatilgan bo'lsa yoki brauzer bilan bir xil kompyuterda o'rnatilgan bo'lsa va brauzeringizda "tel:" bilan boshlanadigan havolani bosganingizda ushbu usuldan foydalaning. Agar sizga to'liq server echimi kerak bo'lsa (mahalliy dasturiy ta'minotni o'rnatishga hojat yo'q), uni "Yo'q" ga o'rnatishingiz va keyingi maydonni to'ldirishingiz kerak.
+ClickToDialUseTelLinkDesc=Agar sizning foydalanuvchilaringizda softphone yoki dastur interfeysi bo'lsa, brauzer bilan bitta kompyuterda o'rnatilgan bo'lsa va brauzeringizda "tel:" bilan boshlangan havolani bosganingizda qo'ng'iroq qilsa, ushbu usuldan foydalaning. Agar sizga "sip:" bilan boshlanadigan havola yoki to'liq server echimi kerak bo'lsa (mahalliy dasturiy ta'minotni o'rnatishga hojat yo'q), uni "Yo'q" ga o'rnatishingiz va keyingi maydonni to'ldirishingiz kerak.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Sotish punkti
 CashDeskSetup=Savdo modulini o'rnatish nuqtasi
@@ -1786,15 +1787,15 @@ CashDeskThirdPartyForSell=Sotish uchun foydalaniladigan odatiy umumiy uchinchi s
 CashDeskBankAccountForSell=Naqd to'lovlarni qabul qilish uchun foydalaniladigan standart hisob
 CashDeskBankAccountForCheque=To'lovlarni chek orqali qabul qilish uchun foydalaniladigan standart hisob
 CashDeskBankAccountForCB=Kredit kartalar orqali to'lovlarni qabul qilish uchun foydalaniladigan standart hisob
-CashDeskBankAccountForSumup=Default bank account to use to receive payments by SumUp
+CashDeskBankAccountForSumup=SumUp tomonidan to'lovlarni qabul qilish uchun ishlatiladigan standart bank hisobvarag'i
 CashDeskDoNotDecreaseStock=Sotish nuqtasi Savdo punktidan amalga oshirilganda aktsiyalarni pasaytirishni o'chirib qo'ying (agar "yo'q" bo'lsa, aktsiyalarni pasaytirish har bir POS-dan amalga oshiriladi, ushbu modulda o'rnatilgan variantdan qat'i nazar).
 CashDeskIdWareHouse=Omborni kamaytirish uchun omborni majburan cheklang va cheklang
 StockDecreaseForPointOfSaleDisabled=Savdo punktida aksiyalarning pasayishi o'chirilgan
 StockDecreaseForPointOfSaleDisabledbyBatch=POS-da aktsiyalarning pasayishi Serial / Lot moduli bilan mos kelmaydi (hozirda faol), shuning uchun aktsiyalarni pasaytirish o'chirilgan.
 CashDeskYouDidNotDisableStockDecease=Sale of Sale-dan savdo-sotiqni amalga oshirayotganda siz aktsiyalarning pasayishini o'chirib qo'ymadingiz. Shuning uchun ombor kerak.
-CashDeskForceDecreaseStockLabel=Stock decrease for batch products was forced.
-CashDeskForceDecreaseStockDesc=Decrease first by the oldest eatby and sellby dates.
-CashDeskReaderKeyCodeForEnter=Key code for "Enter" defined in barcode reader (Example: 13)
+CashDeskForceDecreaseStockLabel=Partiya mahsulotlari uchun zaxiralarni pasaytirish majbur bo'ldi.
+CashDeskForceDecreaseStockDesc=Avvaliga eng qadimgi ovqatlanish va sotish sanalari bo'yicha kamaytiring.
+CashDeskReaderKeyCodeForEnter=Shtrixli o'quvchida aniqlangan "Enter" uchun kalit kod (Misol: 13)
 ##### Bookmark #####
 BookmarkSetup=Xatcho'plar modulini sozlash
 BookmarkDesc=Ushbu modul sizga xatcho'plarni boshqarish imkonini beradi. Shuningdek, chap menyuda joylashgan har qanday Dolibarr sahifalariga yoki tashqi veb-saytlarga yorliq qo'shishingiz mumkin.
@@ -1826,7 +1827,7 @@ MultiCompanySetup=Ko'p kompaniyalar uchun modulni sozlash
 ##### Suppliers #####
 SuppliersSetup=Sotuvchi modulini sozlash
 SuppliersCommandModel=Xarid qilish buyurtmasining to'liq shablonlari
-SuppliersCommandModelMuscadet=Complete template of Purchase Order (old implementation of cornas template)
+SuppliersCommandModelMuscadet=Sotib olish buyurtmasining to'liq shablonlari (kornalar shablonining eski versiyasi)
 SuppliersInvoiceModel=Sotuvchi fakturasining to'liq shabloni
 SuppliersInvoiceNumberingModel=Sotuvchi fakturalarni raqamlash modellari
 IfSetToYesDontForgetPermission=Agar nol qiymatga o'rnatilgan bo'lsa, ikkinchi tasdiqlash uchun ruxsat berilgan guruhlarga yoki foydalanuvchilarga ruxsat berishni unutmang
@@ -1868,8 +1869,8 @@ TypePaymentDesc=0: mijozning to'lov turi, 1: sotuvchining to'lov turi, 2: mijozl
 IncludePath=Yo'lni qo'shing (%s o'zgaruvchisiga belgilangan)
 ExpenseReportsSetup=Moddiy xarajatlar to'g'risidagi hisobotni sozlash
 TemplatePDFExpenseReports=Xarajatlar to'g'risidagi hujjatni yaratish uchun hujjat shablonlari
-ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
-ExpenseReportNumberingModules=Expense reports numbering module
+ExpenseReportsRulesSetup=Xarajatlar bo'yicha hisobotlar modulini sozlash - qoidalar
+ExpenseReportNumberingModules=Xarajatlar bo'yicha hisobotlarni raqamlash moduli
 NoModueToManageStockIncrease=Zaxiralarni avtomatik ravishda oshirishni boshqaradigan biron bir modul faollashtirilmagan. Aksiyalarni ko'paytirish faqat qo'lda kiritish orqali amalga oshiriladi.
 YouMayFindNotificationsFeaturesIntoModuleNotification="Bildirishnoma" modulini yoqish va sozlash orqali elektron pochta xabarlari uchun variantlarni topishingiz mumkin.
 ListOfNotificationsPerUser=Har bir foydalanuvchi uchun avtomatik bildirishnomalar ro'yxati *
@@ -1879,14 +1880,14 @@ GoOntoUserCardToAddMore=Foydalanuvchilar uchun bildirishnomalarni qo'shish yoki
 GoOntoContactCardToAddMore=Kontaktlar / manzillar uchun bildirishnomalarni qo'shish yoki o'chirish uchun uchinchi tomonning "Bildirishnomalar" yorlig'iga o'ting
 Threshold=Eshik
 BackupDumpWizard=Ma'lumotlar bazasi dump faylini yaratish ustasi
-BackupZipWizard=Wizard to build the archive of documents directory
+BackupZipWizard=Hujjatlar katalogini yaratish uchun sehrgar
 SomethingMakeInstallFromWebNotPossible=Tashqi modulni o'rnatish quyidagi sabablarga ko'ra veb-interfeysdan mumkin emas:
 SomethingMakeInstallFromWebNotPossible2=Shu sababli, bu erda tavsiflangan yangilash jarayoni faqat imtiyozli foydalanuvchi amalga oshirishi mumkin bo'lgan qo'lda bajariladigan jarayondir.
 InstallModuleFromWebHasBeenDisabledByFile=Ilovadan tashqi modulni o'rnatishni administratoringiz o'chirib qo'ydi. Ushbu funktsiyaga ruxsat berish uchun siz undan <strong> %s </strong> faylini olib tashlashini so'rashingiz kerak.
-ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+ConfFileMustContainCustom=Tashqi modulni dasturdan o'rnatish yoki yaratish uchun modul fayllarini <strong> %s </strong> katalogiga saqlash kerak. Ushbu katalogni Dolibarr tomonidan qayta ishlash uchun siz ikkita direktiv qatorini qo'shish uchun <strong> conf / conf.php </strong>-ni o'rnatishingiz kerak: <br> <strong> $ dolibarr_main_url_root_; </strong> <br> <strong> $ dolibarr_main_document_root_alt = '%s / custom'; </strong>
 HighlightLinesOnMouseHover=Sichqoncha harakati o'tib ketganda jadval satrlarini ajratib ko'rsatish
 HighlightLinesColor=Sichqoncha o'tib ketganda chiziq rangini belgilang (ajratish uchun 'ffffff' dan foydalaning)
-HighlightLinesChecked=Highlight color of the line when it is checked (use 'ffffff' for no highlight)
+HighlightLinesChecked=Tekshirilganda chiziq rangini ajratib ko'rsatish (ajratish uchun 'ffffff' dan foydalaning)
 TextTitleColor=Sahifa sarlavhasining matni rangi
 LinkColor=Havolalarning rangi
 PressF5AfterChangingThis=Klaviaturada CTRL + F5 tugmachalarini bosing yoki ushbu qiymatni o'zgartirgandan so'ng brauzer keshini tozalang
@@ -1896,17 +1897,17 @@ TopMenuBackgroundColor=Yuqori menyu uchun fon rangi
 TopMenuDisableImages=Yuqori menyuda rasmlarni yashirish
 LeftMenuBackgroundColor=Chap menyu uchun fon rangi
 BackgroundTableTitleColor=Jadval sarlavhasi uchun fon rangi
-BackgroundTableTitleTextColor=Text color for Table title line
-BackgroundTableTitleTextlinkColor=Text color for Table title link line
+BackgroundTableTitleTextColor=Jadval sarlavhasi uchun matn rangi
+BackgroundTableTitleTextlinkColor=Jadval sarlavhasi liniyasi uchun matn rangi
 BackgroundTableLineOddColor=Toq jadval chiziqlari uchun fon rangi
 BackgroundTableLineEvenColor=Jadvalning tekis chiziqlari uchun fon rangi
 MinimumNoticePeriod=Minimal ogohlantirish davri (ta'tilga chiqish so'rovingiz ushbu kechiktirishdan oldin amalga oshirilishi kerak)
 NbAddedAutomatically=Foydalanuvchilarning hisoblagichlariga har oy qo'shilgan kunlar soni (avtomatik ravishda)
 EnterAnyCode=Ushbu maydonda chiziqni aniqlash uchun ma'lumotnoma mavjud. Siz tanlagan har qanday qiymatni kiriting, lekin maxsus belgilarsiz.
-Enter0or1=Enter 0 or 1
+Enter0or1=0 yoki 1 kiriting
 UnicodeCurrency=Qavslar oralig'iga bu erga kiriting, valyuta belgisini ko'rsatadigan bayt raqamlari ro'yxati. Masalan: $ uchun, [36] kiriting - Braziliya uchun haqiqiy R $ [82,36] - € uchun, [8364] kiriting
-ColorFormat=The RGB color is in HEX format, eg: FF0000
-PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
+ColorFormat=RGB rangi HEX formatida, masalan: FF0000
+PictoHelp=Dolibarr formatidagi piktogramma nomi (agar 'Mavzu katalogida' image.png ', agar modulning / img / katalogida bo'lsa' image.png@nom_du_module '
 PositionIntoComboList=Chiziqning kombinatsion ro'yxatlarga joylashishi
 SellTaxRate=Sotish uchun soliq stavkasi
 RecuperableOnly=Frantsiyaning biron bir shtati uchun ajratilgan "Qabul qilinmagan, ammo tiklanadigan" QQS uchun ha. Boshqa barcha holatlarda "Yo'q" qiymatini saqlang.
@@ -1915,14 +1916,14 @@ OpportunityPercent=Qo'rg'oshin yaratishda siz taxminiy loyiha / qo'rg'oshin miqd
 TemplateForElement=Ushbu shablon yozuvi qaysi elementga bag'ishlangan
 TypeOfTemplate=Shablon turi
 TemplateIsVisibleByOwnerOnly=Andoza faqat egasiga ko'rinadi
-VisibleEverywhere=Visible everywhere
-VisibleNowhere=Visible nowhere
+VisibleEverywhere=Hamma joyda ko'rinadi
+VisibleNowhere=Hech qaerda ko'rinmaydi
 FixTZ=TimeZone-ni tuzatish
 FillFixTZOnlyIfRequired=Misol: +2 (faqat muammo yuzaga kelganda to'ldiring)
 ExpectedChecksum=Kutilayotgan summa
 CurrentChecksum=Joriy summa
-ExpectedSize=Expected size
-CurrentSize=Current size
+ExpectedSize=Kutilayotgan o'lcham
+CurrentSize=Joriy o'lcham
 ForcedConstants=Kerakli doimiy qiymatlar
 MailToSendProposal=Mijozlarning takliflari
 MailToSendOrder=Savdo buyurtmalari
@@ -1933,12 +1934,12 @@ MailToSendSupplierRequestForQuotation=Kotirovka so'rovi
 MailToSendSupplierOrder=Sotib olish uchun buyurtmalar
 MailToSendSupplierInvoice=Sotuvchi hisob-fakturalari
 MailToSendContract=Shartnomalar
-MailToSendReception=Receptions
+MailToSendReception=Qabullar
 MailToThirdparty=Uchinchi shaxslar
-MailToMember=Members
-MailToUser=Users
-MailToProject=Projects
-MailToTicket=Tickets
+MailToMember=A'zolar
+MailToUser=Foydalanuvchilar
+MailToProject=Loyihalar
+MailToTicket=Chiptalar
 ByDefaultInList=Ro'yxat ko'rinishida sukut bo'yicha ko'rsatish
 YouUseLastStableVersion=Siz eng so'nggi barqaror versiyadan foydalanasiz
 TitleExampleForMajorRelease=Ushbu yirik nashrni e'lon qilish uchun foydalanishingiz mumkin bo'lgan xabarning namunasi (uni o'zingizning veb-saytingizda ishlating)
@@ -1947,16 +1948,16 @@ ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s mavjud. %s versiyasi f
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s mavjud. %s versiyasi parvarishlash versiyasidir, shuning uchun faqat xatolarni tuzatishni o'z ichiga oladi. Barcha foydalanuvchilarga ushbu versiyaga o'tishni tavsiya etamiz. Ta'minot versiyasi ma'lumotlar bazasiga yangi xususiyatlar yoki o'zgarishlar kiritmaydi. Siz uni https://www.dolibarr.org portalining yuklab olish joyidan yuklab olishingiz mumkin (katalogning barqaror versiyalari). O'zgarishlarning to'liq ro'yxati uchun <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog"> ChangeLog </a> ni o'qishingiz mumkin.
 MultiPriceRuleDesc="Mahsulot / xizmat uchun narxlarning bir necha darajalari" opsiyasi yoqilganda, har bir mahsulot uchun har xil narxlarni (narx darajasiga bitta) belgilashingiz mumkin. Vaqtingizni tejash uchun bu erda siz har bir darajadagi narxni birinchi darajadagi narxga qarab avtokalkulyatsiya qilish qoidasini kiritishingiz mumkin, shuning uchun har bir mahsulot uchun faqat birinchi darajadagi narxni kiritishingiz kerak bo'ladi. Ushbu sahifa sizning vaqtingizni tejashga mo'ljallangan, ammo har bir darajadagi narxlaringiz birinchi darajaga nisbatan foydali bo'lgan taqdirdagina foydali bo'ladi. Ko'p hollarda ushbu sahifani e'tiborsiz qoldirishingiz mumkin.
 ModelModulesProduct=Mahsulot hujjatlari uchun shablonlar
-WarehouseModelModules=Templates for documents of warehouses
+WarehouseModelModules=Omborlar hujjatlari uchun shablonlar
 ToGenerateCodeDefineAutomaticRuleFirst=Kodlarni avtomatik ravishda yaratish uchun avval shtrix raqamini avtomatik aniqlash uchun menejerni belgilashingiz kerak.
 SeeSubstitutionVars=Mumkin bo'lgan o'zgaruvchan o'zgaruvchilar ro'yxati uchun * eslatmani ko'ring
-SeeChangeLog=See ChangeLog file (english only)
+SeeChangeLog=ChangeLog faylini ko'ring (faqat ingliz tilida)
 AllPublishers=Barcha noshirlar
 UnknownPublishers=Noma'lum noshirlar
 AddRemoveTabs=Yorliqlarni qo'shing yoki olib tashlang
-AddDataTables=Add object tables
+AddDataTables=Ob'ekt jadvallarini qo'shing
 AddDictionaries=Lug'at jadvallarini qo'shing
-AddData=Add objects or dictionaries data
+AddData=Ob'ektlar yoki lug'atlar ma'lumotlarini qo'shing
 AddBoxes=Vidjetlarni qo'shing
 AddSheduledJobs=Rejalashtirilgan ish joylarini qo'shing
 AddHooks=Kancalar qo'shing
@@ -1978,169 +1979,172 @@ SamePriceAlsoForSharedCompanies=Agar siz "Yagona narx" tanlovi bilan ko'pkompani
 ModuleEnabledAdminMustCheckRights=Modul faollashtirildi. Faollashtirilgan modul (lar) ga ruxsat faqat administrator foydalanuvchilariga berilgan. Agar kerak bo'lsa, boshqa foydalanuvchilarga yoki guruhlarga ruxsatnomalarni qo'lda berishingiz kerak bo'lishi mumkin.
 UserHasNoPermissions=Ushbu foydalanuvchi uchun ruxsatlar aniqlanmagan
 TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "%s")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "%s" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month after delta (delta is field "%s", N is stored into field "%s")
-BaseCurrency=Reference currency of the company (go into setup of company to change this)
-WarningNoteModuleInvoiceForFrenchLaw=This module %s is compliant with French laws (Loi Finance 2016).
-WarningNoteModulePOSForFrenchLaw=This module %s is compliant with French laws (Loi Finance 2016) because module Non Reversible Logs is automatically activated.
-WarningInstallationMayBecomeNotCompliantWithLaw=You are trying to install module %s that is an external module. Activating an external module means you trust the publisher of that module and that you are sure that this module does not adversely impact the behavior of your application, and is compliant with laws of your country (%s). If the module introduces an illegal feature, you become responsible for the use of illegal 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_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
-MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add picture on proposal line
-MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add electronic sign in PDF
-NothingToSetup=There is no specific setup required for this module.
-SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
-EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
-SeveralLangugeVariatFound=Several language variants found
-RemoveSpecialChars=Remove special characters
-COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
-COMPANY_DIGITARIA_CLEAN_REGEX=Regex filter to clean value (COMPANY_DIGITARIA_CLEAN_REGEX)
-COMPANY_DIGITARIA_UNIQUE_CODE=Duplicate not allowed
-GDPRContact=Data Protection Officer (DPO, Data Privacy or GDPR contact)
-GDPRContactDesc=If you store data about European companies/citizens, you can name the contact who is responsible for the General Data Protection Regulation here
-HelpOnTooltip=Help text to show on tooltip
-HelpOnTooltipDesc=Put text or a translation key here for the text to show in a tooltip when this field appears in a form
-YouCanDeleteFileOnServerWith=You can delete this file on the server with Command Line:<br>%s
-ChartLoaded=Chart of account loaded
-SocialNetworkSetup=Setup of module Social Networks
-EnableFeatureFor=Enable features for <strong>%s</strong>
+BaseCurrency=Kompaniyaning ma'lumotnoma valyutasi (buni o'zgartirish uchun kompaniyani tashkil etishga kiring)
+WarningNoteModuleInvoiceForFrenchLaw=Ushbu modul %s Frantsiya qonunlariga mos keladi (Loi Finance 2016).
+WarningNoteModulePOSForFrenchLaw=Ushbu modul %s Frantsiya qonunlariga javob beradi (Loi Finance 2016), chunki "Qaytarib bo'lmaydigan jurnallar" moduli avtomatik ravishda yoqiladi.
+WarningInstallationMayBecomeNotCompliantWithLaw=Siz tashqi modul bo'lgan %s modulini o'rnatmoqchisiz. Tashqi modulni faollashtirish ushbu modul noshiriga ishonishingizni va ushbu modul sizning arizangizning xatti-harakatlariga salbiy ta'sir ko'rsatmasligiga va mamlakatingiz qonunlariga (%s) mos kelishiga ishonch hosil qilishingizni anglatadi. Agar modul noqonuniy xususiyatni taqdim etsa, siz noqonuniy dasturlardan foydalanish uchun javobgar bo'lasiz.
+MAIN_PDF_MARGIN_LEFT=PDF-dagi chap chekka
+MAIN_PDF_MARGIN_RIGHT=PDF-dagi o'ng chekka
+MAIN_PDF_MARGIN_TOP=PDF-dagi eng yaxshi margin
+MAIN_PDF_MARGIN_BOTTOM=PDF-dagi pastki hoshiya
+MAIN_DOCUMENTS_LOGO_HEIGHT=PDF-dagi logotip uchun balandlik
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Taklif qatoriga rasm qo'shing
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=PDF-ga elektron belgini qo'shing
+NothingToSetup=Ushbu modul uchun maxsus sozlash talab qilinmaydi.
+SetToYesIfGroupIsComputationOfOtherGroups=Agar bu guruh boshqa guruhlarning hisob-kitobi bo'lsa, buni "ha" ga sozlang
+EnterCalculationRuleIfPreviousFieldIsYes=Agar oldingi maydon "Ha" ga o'rnatilgan bo'lsa, hisoblash qoidasini kiriting. <br> Masalan: <br> CODEGRP1 + CODEGRP2
+SeveralLangugeVariatFound=Bir nechta til variantlari topildi
+RemoveSpecialChars=Maxsus belgilarni olib tashlang
+COMPANY_AQUARIUM_CLEAN_REGEX=Regex filtri toza qiymatga (COMPANY_AQUARIUM_CLEAN_REGEX)
+COMPANY_DIGITARIA_CLEAN_REGEX=Regex filtri toza qiymatga (COMPANY_DIGITARIA_CLEAN_REGEX)
+COMPANY_DIGITARIA_UNIQUE_CODE=Uni nusxalashga ruxsat berilmagan
+GDPRContact=Ma'lumotlarni himoya qilish bo'yicha mutaxassis (DPO, ma'lumotlarning maxfiyligi yoki GDPR aloqasi)
+GDPRContactDesc=Agar siz Evropa kompaniyalari / fuqarolari to'g'risidagi ma'lumotlarni saqlasangiz, bu erda ma'lumotlarni himoya qilishning umumiy qoidalari uchun javobgar bo'lgan shaxsni nomlashingiz mumkin
+HelpOnTooltip=Matnni ko'rsatmalar panelida ko'rsatish uchun yordam bering
+HelpOnTooltipDesc=Matn yoki tarjima kalitini bu erga qo'ying, bu maydon formada paydo bo'lganda matn asboblar panelida ko'rsatilsin
+YouCanDeleteFileOnServerWith=Bu faylni serverda buyruq satri bilan o'chirib tashlashingiz mumkin: <br> %s
+ChartLoaded=Hisob jadvali yuklandi
+SocialNetworkSetup=Ijtimoiy tarmoqlar modulini sozlash
+EnableFeatureFor=<strong> %s </strong> uchun xususiyatlarni yoqish
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
-SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
-FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields and combo lists only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
-EmailCollector=Email collector
-EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
-NewEmailCollector=New Email Collector
-EMailHost=Host of email IMAP server
-MailboxSourceDirectory=Mailbox source directory
-MailboxTargetDirectory=Mailbox target directory
-EmailcollectorOperations=Operations to do by collector
-EmailcollectorOperationsDesc=Operations are executed from top to bottom order
-MaxEmailCollectPerCollect=Max number of emails collected per collect
-CollectNow=Collect now
-ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
-DateLastCollectResult=Date of latest collect try
-DateLastcollectResultOk=Date of latest collect success
-LastResult=Latest result
-EmailCollectorConfirmCollectTitle=Email collect confirmation
-EmailCollectorConfirmCollect=Do you want to run the collection for this collector now ?
-NoNewEmailToProcess=No new email (matching filters) to process
-NothingProcessed=Nothing done
-XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
-RecordEvent=Record email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
-CodeLastResult=Latest result code
-NbOfEmailsInInbox=Number of emails in source directory
-LoadThirdPartyFromName=Load third party searching on %s (load only)
-LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
-WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
-WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
-WithDolTrackingIDInMsgId=Message sent from Dolibarr
-WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create job application
+SwapSenderAndRecipientOnPDF=PDF hujjatlaridagi jo'natuvchi va qabul qiluvchining manzilini almashtirish
+FeatureSupportedOnTextFieldsOnly=Ogohlantirish, faqat matn maydonlarida va kombinatsion ro'yxatlarda qo'llab-quvvatlanadigan xususiyat. Shuningdek, URL parametri action = create yoki action = edit o'rnatilishi kerak yoki ushbu funktsiyani ishga tushirish uchun sahifa nomi 'new.php' bilan tugashi kerak.
+EmailCollector=Elektron pochta yig'uvchisi
+EmailCollectorDescription=Muntazam ravishda elektron pochta qutilarini (IMAP protokoli yordamida) skanerlash va arizangizga kelgan elektron pochta xabarlarini kerakli joyda yozib olish va / yoki ba'zi yozuvlarni avtomatik ravishda yaratish (masalan, qo'rg'oshinlar) uchun rejalashtirilgan ishni va sozlash sahifasini qo'shing.
+NewEmailCollector=Yangi elektron pochta yig'uvchisi
+EMailHost=IMAP-server elektron pochta manzili
+MailboxSourceDirectory=Pochta qutisi manbalari katalogi
+MailboxTargetDirectory=Pochta qutisi maqsad katalogi
+EmailcollectorOperations=Kollektor tomonidan bajariladigan operatsiyalar
+EmailcollectorOperationsDesc=Amallar yuqoridan pastgacha tartibda bajariladi
+MaxEmailCollectPerCollect=Har bir to'plam uchun to'plangan elektron pochta xabarlarining maksimal soni
+CollectNow=Hozir yig'ing
+ConfirmCloneEmailCollector=Elektron pochta kollektorini %s klonlamoqchimisiz?
+DateLastCollectResult=So'nggi marta sinab ko'ring
+DateLastcollectResultOk=So'nggi yutuqlar sanasi
+LastResult=Oxirgi natija
+EmailCollectorConfirmCollectTitle=Elektron pochta orqali to'plamni tasdiqlash
+EmailCollectorConfirmCollect=Hozir ushbu kollektsioner uchun to'plamni boshqarishni xohlaysizmi?
+NoNewEmailToProcess=Ishlash uchun yangi elektron pochta xabarlari (mos keladigan filtrlar) yo'q
+NothingProcessed=Hech narsa qilinmadi
+XEmailsDoneYActionsDone=%s elektron pochta xabarlari malakali, %s elektron pochta xabarlari muvaffaqiyatli qayta ishlandi (%s yozuvi / bajarilgan harakatlar uchun)
+RecordEvent=Elektron pochta hodisasini yozib oling
+CreateLeadAndThirdParty=Qo'rg'oshin yarating (va agar kerak bo'lsa, uchinchi tomon)
+CreateTicketAndThirdParty=Chiptani yarating (va oldingi operatsiya yuklangan bo'lsa, uchinchi tomon bilan bog'laning)
+CodeLastResult=Oxirgi natija kodi
+NbOfEmailsInInbox=Manba katalogidagi elektron pochta xabarlari soni
+LoadThirdPartyFromName=%s-da qidiruvni uchinchi tomonga yuklang (faqat yuklash uchun)
+LoadThirdPartyFromNameOrCreate=%s-da qidiruvni uchinchi tomonga yuklash (agar topilmasa yaratish)
+WithDolTrackingID=Dolibarr-dan yuborilgan birinchi elektron pochta orqali boshlangan suhbatdan xabar
+WithoutDolTrackingID=Dolibarr-dan birinchi elektron pochta orqali yuborilgan suhbatdan xabar
+WithDolTrackingIDInMsgId=Dolibarr-dan xabar yuborildi
+WithoutDolTrackingIDInMsgId=Xabar Dolibarr-dan yuborilmadi
+CreateCandidature=Ishga ariza yarating
 FormatZip=Zip
-MainMenuCode=Menu entry code (mainmenu)
-ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
-OpeningHours=Opening hours
-OpeningHoursDesc=Enter here the regular opening hours of your company.
+MainMenuCode=Menyu kirish kodi (asosiy menyu)
+ECMAutoTree=Avtomatik ECM daraxtini ko'rsating
+OperationParamDesc=Harakat ob'ekti uchun ishlatiladigan qiymatlarni yoki qiymatlarni qanday chiqarishni aniqlang. Masalan: <br> objproperty1 = SET: <br> objproperty2 = SET: __objproperty1__ o'rnini bosuvchi qiymat <br> objproperty3 = SETIFEMPTY: agar ishlatilgan bo'lsa objproT0: ([^ \\ s] *) <br> options_myextrafield1 = EXTRACT: SUBJECT: ([^ & # 92; n] *) <br> object.objproperty5 = EXTRACT: BODY: Mening kompaniyamning nomi \\ s ([^ \\ s] *ffz19) <br> dan foydalaning; ajratish sifatida char bir nechta xususiyatlarni ajratish yoki o'rnatish.
+OpeningHours=Ish vaqti
+OpeningHoursDesc=Bu erga kompaniyangizning muntazam ish vaqtiga kiring.
 ResourceSetup=Resurs modulining konfiguratsiyasi
 UseSearchToSelectResource=Resursni tanlash uchun qidiruv shaklidan foydalaning (ochiladigan ro'yxat o'rniga).
 DisabledResourceLinkUser=Resursni foydalanuvchilar bilan bog'lash xususiyatini o'chirib qo'ying
 DisabledResourceLinkContact=Resursni kontaktlarga bog'lash xususiyatini o'chirib qo'ying
-EnableResourceUsedInEventCheck=Enable feature to check if a resource is in use in an event
-ConfirmUnactivation=Confirm module reset
-OnMobileOnly=On small screen (smartphone) only
-DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
-MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
-MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or Links.
-MAIN_OPTIMIZEFORCOLORBLIND=Change  interface's color for color blind person
-MAIN_OPTIMIZEFORCOLORBLINDDesc=Enable this option if you are a color blind person, in some case interface will change color setup to increase contrast.
-Protanopia=Protanopia
-Deuteranopes=Deuteranopes
-Tritanopes=Tritanopes
-ThisValueCanOverwrittenOnUserLevel=This value can be overwritten by each user from its user page - tab '%s'
-DefaultCustomerType=Default thirdparty type for "New customer" creation form
-ABankAccountMustBeDefinedOnPaymentModeSetup=Note: The bank account must be defined on the module of each payment mode (Paypal, Stripe, ...) to have this feature working.
-RootCategoryForProductsToSell=Root category of products to sell
-RootCategoryForProductsToSellDesc=If defined, only products inside this category or childs of this category will be available in the Point Of Sale
-DebugBar=Debug Bar
-DebugBarDesc=Toolbar that comes with a plenty of tools to simplify debugging
-DebugBarSetup=DebugBar Setup
-GeneralOptions=General Options
-LogsLinesNumber=Number of lines to show on logs tab
-UseDebugBar=Use the debug bar
-DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
-WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
-ModuleActivated=Module %s is activated and slows the interface
-ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances and security)
-ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
-IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
-AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
-SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
-EXPORTS_SHARE_MODELS=Export models are share with everybody
-ExportSetup=Setup of module Export
-ImportSetup=Setup of module Import
-InstanceUniqueID=Unique ID of the instance
-SmallerThan=Smaller than
-LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
-WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
-EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
-EndPointFor=End point for %s : %s
-DeleteEmailCollector=Delete email collector
-ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
-RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
-AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
-RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
+EnableResourceUsedInEventCheck=Resursning tadbirda ishlatilishini tekshirish xususiyatini yoqing
+ConfirmUnactivation=Modulni tiklashni tasdiqlang
+OnMobileOnly=Faqat kichik ekranda (smartfon)
+DisableProspectCustomerType="Prospect + Customer" uchinchi tomon turini o'chirib qo'ying (shuning uchun uchinchi tomon "Prospect" yoki "Customer" bo'lishi kerak, lekin ikkalasi ham bo'lishi mumkin emas)
+MAIN_OPTIMIZEFORTEXTBROWSER=Ko'zi ojiz odam uchun interfeysni soddalashtiring
+MAIN_OPTIMIZEFORTEXTBROWSERDesc=Agar siz ko'zi ojiz bo'lsangiz yoki dasturni Lynx yoki Links kabi matnli brauzerdan foydalansangiz, ushbu parametrni yoqing.
+MAIN_OPTIMIZEFORCOLORBLIND=Rangli ko'r odam uchun interfeys rangini o'zgartiring
+MAIN_OPTIMIZEFORCOLORBLINDDesc=Agar siz rang ko'r odam bo'lsangiz, ushbu parametrni yoqing, ba'zi hollarda interfeys kontrastni oshirish uchun ranglarni sozlashni o'zgartiradi.
+Protanopia=Protanopiya
+Deuteranopes=Deuteranoplar
+Tritanopes=Tritanoplar
+ThisValueCanOverwrittenOnUserLevel=Ushbu qiymat har bir foydalanuvchi tomonidan foydalanuvchi sahifasidan yozilishi mumkin - '%s' yorlig'i
+DefaultCustomerType="Yangi mijoz" yaratish shakli uchun standart uchinchi tomon turi
+ABankAccountMustBeDefinedOnPaymentModeSetup=Izoh: Ushbu xususiyat ishlashi uchun bank hisobvarag'i har bir to'lov rejimining modulida (Paypal, Stripe, ...) aniqlanishi kerak.
+RootCategoryForProductsToSell=Sotiladigan mahsulotlarning asosiy toifasi
+RootCategoryForProductsToSellDesc=Belgilangan bo'lsa, faqat ushbu toifadagi mahsulotlar yoki ushbu toifadagi bolalar ishlab chiqarilishi mumkin
+DebugBar=Tuzatish paneli
+DebugBarDesc=Nosozliklarni tuzatishni soddalashtirish uchun ko'plab vositalar bilan ta'minlangan asboblar paneli
+DebugBarSetup=DebugBar-ni sozlash
+GeneralOptions=Umumiy parametrlar
+LogsLinesNumber=Jurnallar ko'rinishida ko'rsatiladigan qatorlar soni
+UseDebugBar=Tuzatish panelidan foydalaning
+DEBUGBAR_LOGS_LINES_NUMBER=Konsolda saqlanadigan oxirgi jurnal satrlari soni
+WarningValueHigherSlowsDramaticalyOutput=Ogohlantirish, yuqori qiymatlar dramatik chiqishni sekinlashtiradi
+ModuleActivated=%s moduli yoqilgan va interfeysni sekinlashtiradi
+ModuleActivatedWithTooHighLogLevel=%s moduli juda yuqori jurnal darajasida faollashtirilgan (yaxshi ishlash va xavfsizlik uchun past darajadan foydalanishga harakat qiling)
+ModuleSyslogActivatedButLevelNotTooVerbose=%s moduli faollashtirilgan va jurnal darajasi (%s) to'g'ri (juda aniq emas)
+IfYouAreOnAProductionSetThis=Agar siz ishlab chiqarish muhitida bo'lsangiz, ushbu xususiyatni %s ga o'rnatishingiz kerak.
+AntivirusEnabledOnUpload=Yuklangan fayllarda antivirus yoqilgan
+SomeFilesOrDirInRootAreWritable=Ba'zi fayllar yoki kataloglar faqat o'qish rejimida emas
+EXPORTS_SHARE_MODELS=Eksport modellari hammaga ma'lum
+ExportSetup=Eksport modulini sozlash
+ImportSetup=Import modulini o'rnatish
+InstanceUniqueID=Namunaning noyob identifikatori
+SmallerThan=Undan kichikroq
+LargerThan=Undan kattaroq
+IfTrackingIDFoundEventWillBeLinked=E'tibor bering, agar elektron pochtada ob'ektning kuzatuv identifikatori topilgan bo'lsa yoki elektron pochta manzili to'plangan va ob'ekt bilan bog'langan elektron pochta xabarining javobi bo'lsa, yaratilgan voqea avtomatik ravishda ma'lum tegishli ob'ektga bog'lanadi.
+WithGMailYouCanCreateADedicatedPassword=GMail hisob qaydnomasi yordamida, agar siz 2 bosqichli tekshiruvni yoqsangiz, https://myaccount.google.com/ manzilidagi o'zingizning shaxsiy parol so'zingiz o'rniga dastur uchun maxsus ikkinchi parolni yaratish tavsiya etiladi.
+EmailCollectorTargetDir=Muvaffaqiyatli ishlov berilganda elektron pochtani boshqa yorliq / katalogga ko'chirish istalgan xatti-harakatlar bo'lishi mumkin. Ushbu xususiyatdan foydalanish uchun faqat katalog nomini o'rnating (Ismda maxsus belgilarni ishlatmang). E'tibor bering, siz o'qish / yozish uchun kirish qayd yozuvidan foydalanishingiz kerak.
+EmailCollectorLoadThirdPartyHelp=Ma'lumotlar bazangizda mavjud bo'lgan uchinchi tomonni topish va yuklash uchun elektron pochta manzilidan foydalanish uchun ushbu amaldan foydalanishingiz mumkin. Topilgan (yoki yaratilgan) uchinchi tomon unga kerak bo'lgan quyidagi harakatlar uchun ishlatiladi. Parametrlar maydonida, masalan, uchinchi tomon nomini 'Name: name to find' qatoridan ajratib olishni istasangiz, 'EXTRACT: BODY: Name: \\ s ([^ \\ s] *)' dan foydalanishingiz mumkin. tanasi.
+EndPointFor=%s uchun yakuniy nuqta: %s
+DeleteEmailCollector=Elektron pochta kollektorini o'chirish
+ConfirmDeleteEmailCollector=Ushbu elektron pochta kollektorini o'chirishni xohlaysizmi?
+RecipientEmailsWillBeReplacedWithThisValue=Qabul qiluvchilarning elektron pochtalari har doim ushbu qiymat bilan almashtiriladi
+AtLeastOneDefaultBankAccountMandatory=Kamida 1 ta sukut bo'yicha bank hisobvarag'i aniqlanishi kerak
+RESTRICT_ON_IP=Faqat ba'zi bir xost IP-lariga kirishga ruxsat bering (joker belgilarga yo'l qo'yilmaydi, qiymatlar oralig'idan foydalaning). Bo'sh degani har bir xost kirish imkoniyatiga ega.
 IPListExample=127.0.0.1 192.168.0.2 [::1]
-BaseOnSabeDavVersion=Based on the library SabreDAV version
-NotAPublicIp=Not a public IP
-MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
-FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
-EmailTemplate=Template for email
-EMailsWillHaveMessageID=Emails will have a tag 'References' matching this syntax
-PDF_SHOW_PROJECT=Show project on document
-ShowProjectLabel=Project Label
-PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
-FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
-RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
-JumpToBoxes=Jump to Setup -> Widgets
-MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
-MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
-TemplateAdded=Template added
-TemplateUpdated=Template updated
-TemplateDeleted=Template deleted
-MailToSendEventPush=Event reminder email
-SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
-DictionaryProductNature= Nature of product
-CountryIfSpecificToOneCountry=Country (if specific to a given country)
-YouMayFindSecurityAdviceHere=You may find security advisory here
-ModuleActivatedMayExposeInformation=This PHP extension may expose sensitive data. If you don't need it, disable it.
-ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
-CombinationsSeparator=Separator character for product combinations
-SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
-SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
-AskThisIDToYourBank=Contact your bank to get this ID
-AdvancedModeOnly=Permision available in Advanced permission mode only
-ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
-MailToSendEventOrganization=Event Organization
-AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
-YouShouldDisablePHPFunctions=You should disable PHP functions
-IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands in custom code, you shoud disable PHP functions
-PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
-NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
-RecommendedValueIs=Recommended: %s
-NotRecommended=Not recommanded
-ARestrictedPath=A restricted path
-CheckForModuleUpdate=Check for external modules updates
-CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
-ModuleUpdateAvailable=An update is available
-NoExternalModuleWithUpdate=No updates found for external modules
-SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
-YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
-RandomlySelectedIfSeveral=Randomly selected if several pictures are available
-DatabasePasswordObfuscated=Database password is obfuscated in conf file
-DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
+BaseOnSabeDavVersion=SabreDAV versiyasi kutubxonasi asosida
+NotAPublicIp=Ommaviy IP emas
+MakeAnonymousPing=Dolibarr poydevor serveriga anonim Ping '+1' qo'ying (faqat o'rnatilgandan so'ng 1 marta bajariladi) poydevorga Dolibarr o'rnatish sonini hisoblashi uchun ruxsat bering.
+FeatureNotAvailableWithReceptionModule=Modulni qabul qilish yoqilganda, bu xususiyat mavjud emas
+EmailTemplate=Elektron pochta uchun shablon
+EMailsWillHaveMessageID=Elektron pochta xabarlarida ushbu sintaksisga mos keladigan 'Adabiyotlar' yorlig'i bo'ladi
+PDF_SHOW_PROJECT=Loyihani hujjatda ko'rsatish
+ShowProjectLabel=Loyiha yorlig'i
+PDF_USE_ALSO_LANGUAGE_CODE=Agar siz o'zingizning PDF-dagi ba'zi matnlarni bir xil hosil qilingan PDF-da 2 xil tilda nusxalashni xohlasangiz, siz ushbu ikkinchi tilni o'rnatishingiz kerak, shuning uchun yaratilgan PDF bir xil sahifada 2 xil tilni o'z ichiga oladi, bu PDF yaratishda tanlangan va shu ( faqat bir nechta PDF shablonlari buni qo'llab-quvvatlaydi). PDF uchun 1 ta til uchun bo'sh qoldiring.
+FafaIconSocialNetworksDesc=Bu erga FontAwesome ikonkasining kodini kiriting. Agar siz FontAwesome nima ekanligini bilmasangiz, umumiy qiymatdan foydalanishingiz mumkin.
+RssNote=Izoh: Har bir RSS tasmali ta'rifi vidjetni taqdim etadi, uni boshqarish panelida bo'lishini ta'minlash kerak
+JumpToBoxes=O'rnatish -> Vidjetlarga o'tish
+MeasuringUnitTypeDesc=Bu erda "o'lcham", "sirt", "hajm", "vazn", "vaqt" kabi qiymatdan foydalaning
+MeasuringScaleDesc=O'lchov - bu odatiy mos yozuvlar birligiga mos keladigan o'nlik qismini ko'chirishingiz kerak bo'lgan joylar soni. "Vaqt" birlik turi uchun bu soniyalar soni. 80 dan 99 gacha bo'lgan qiymatlar saqlangan qiymatlardir.
+TemplateAdded=Andoza qo'shildi
+TemplateUpdated=Andoza yangilandi
+TemplateDeleted=Andoza o'chirildi
+MailToSendEventPush=Voqeani eslatuvchi elektron pochta
+SwitchThisForABetterSecurity=Xavfsizlikni ta'minlash uchun ushbu qiymatni %s ga almashtirish tavsiya etiladi
+DictionaryProductNature= Mahsulotning tabiati
+CountryIfSpecificToOneCountry=Mamlakat (agar ma'lum bir mamlakatga tegishli bo'lsa)
+YouMayFindSecurityAdviceHere=Siz bu erda xavfsizlik bo'yicha maslahatni topishingiz mumkin
+ModuleActivatedMayExposeInformation=Ushbu PHP kengaytmasi maxfiy ma'lumotlarni oshkor qilishi mumkin. Agar sizga kerak bo'lmasa, uni o'chirib qo'ying.
+ModuleActivatedDoNotUseInProduction=Rivojlanish uchun mo'ljallangan modul yoqilgan. Uni ishlab chiqarish muhitida yoqmang.
+CombinationsSeparator=Mahsulot birikmalari uchun ajratuvchi belgi
+SeeLinkToOnlineDocumentation=Misollar uchun yuqori menyuda onlayn hujjatlarga havolani ko'ring
+SHOW_SUBPRODUCT_REF_IN_PDF=Agar <b> %s </b> modulining "%s" xususiyati ishlatilgan bo'lsa, to'plamning pastki mahsulotlarini tafsilotlarini PDF-da ko'rsating.
+AskThisIDToYourBank=Ushbu identifikatorni olish uchun bankingizga murojaat qiling
+AdvancedModeOnly=Ruxsat faqat kengaytirilgan ruxsat rejimida mavjud
+ConfFileIsReadableOrWritableByAnyUsers=Conf fayli har qanday foydalanuvchilar tomonidan o'qilishi yoki yozilishi mumkin. Faqat veb-server foydalanuvchisi va guruhiga ruxsat bering.
+MailToSendEventOrganization=Tadbirni tashkil etish
+AGENDA_EVENT_DEFAULT_STATUS=Shakldan voqea yaratishda odatiy hodisa holati
+YouShouldDisablePHPFunctions=PHP funktsiyalarini o'chirib qo'yishingiz kerak
+IfCLINotRequiredYouShouldDisablePHPFunctions=Agar siz tizim buyruqlarini maxsus kodda ishlatishingiz kerak bo'lsa, siz PHP funktsiyalarini o'chirib qo'yasiz
+PHPFunctionsRequiredForCLI=Qobiq maqsadi uchun (masalan, rejalashtirilgan ishni zaxiralash yoki anitivurs dasturini ishga tushirish), siz PHP funktsiyalarini saqlashingiz kerak
+NoWritableFilesFoundIntoRootDir=Ildiz katalogingizda yoziladigan fayllar yoki umumiy dasturlarning kataloglari topilmadi (Yaxshi)
+RecommendedValueIs=Tavsiya etiladi: %s
+Recommended=Recommended
+NotRecommended=Not recommended
+ARestrictedPath=Cheklangan yo'l
+CheckForModuleUpdate=Tashqi modullarning yangilanishlarini tekshiring
+CheckForModuleUpdateHelp=Ushbu amal tashqi modullar tahrirlovchilariga yangi versiya mavjudligini tekshirish uchun ulanadi.
+ModuleUpdateAvailable=Yangilanish mavjud
+NoExternalModuleWithUpdate=Tashqi modullar uchun hech qanday yangilanish topilmadi
+SwaggerDescriptionFile=Swagger API tavsif fayli (masalan, redoc bilan ishlatish uchun)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=Siz bekor qilingan WS API-ni yoqdingiz. Buning o'rniga REST API-dan foydalanishingiz kerak.
+RandomlySelectedIfSeveral=Agar bir nechta rasm mavjud bo'lsa, tasodifiy tanlanadi
+DatabasePasswordObfuscated=Ma'lumotlar bazasi paroli conf faylida buzilgan
+DatabasePasswordNotObfuscated=Ma'lumotlar bazasi paroli conf faylida buzilmaydi
+APIsAreNotEnabled=API modullari yoqilmagan
+YouShouldSetThisToOff=Buni 0 ga yoki o'chirib qo'yishingiz kerak
diff --git a/htdocs/langs/uz_UZ/agenda.lang b/htdocs/langs/uz_UZ/agenda.lang
index 253224d4263..f3bfa035449 100644
--- a/htdocs/langs/uz_UZ/agenda.lang
+++ b/htdocs/langs/uz_UZ/agenda.lang
@@ -12,7 +12,7 @@ Event=Tadbir
 Events=Tadbirlar
 EventsNb=Tadbirlar soni
 ListOfActions=Tadbirlar ro'yxati
-EventReports=Event reports
+EventReports=Voqealar haqida hisobotlar
 Location=Manzil
 ToUserOfGroup=Tadbir guruhdagi har qanday foydalanuvchiga tayinlangan
 EventOnFullDay=Barcha kun (lar) da tadbir
@@ -35,13 +35,13 @@ AgendaAutoActionDesc= Bu erda siz Dolibarr-ning kun tartibida avtomatik ravishda
 AgendaSetupOtherDesc= Ushbu sahifada Dolibarr tadbirlarini tashqi taqvimga (Thunderbird, Google Calendar va boshqalar) eksport qilishga ruxsat berish imkoniyatlari berilgan.
 AgendaExtSitesDesc=Ushbu sahifa o'z voqealarini Dolibarr kun tartibiga kiritish uchun taqvimlarning tashqi manbalarini e'lon qilishga imkon beradi.
 ActionsEvents=Dolibarr avtomatik ravishda kun tartibida harakat yaratadigan tadbirlar
-EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
+EventRemindersByEmailNotEnabled=%s modulini sozlashda elektron pochta orqali voqea eslatmalari yoqilmagan.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Uchinchi tomon %s yaratildi
-COMPANY_MODIFYInDolibarr=Third party %s modified
-COMPANY_DELETEInDolibarr=Third party %s deleted
+COMPANY_MODIFYInDolibarr=Uchinchi tomon %s o'zgartirilgan
+COMPANY_DELETEInDolibarr=Uchinchi tomon %s o'chirildi
 ContractValidatedInDolibarr=%s shartnomasi tasdiqlangan
-CONTRACT_DELETEInDolibarr=Contract %s deleted
+CONTRACT_DELETEInDolibarr=%s shartnomasi o'chirildi
 PropalClosedSignedInDolibarr=%s taklifi imzolandi
 PropalClosedRefusedInDolibarr=%s taklifi rad etildi
 PropalValidatedInDolibarr=%s taklifi tasdiqlangan
@@ -53,18 +53,18 @@ InvoiceDeleteDolibarr=%s hisob-fakturasi o'chirildi
 InvoicePaidInDolibarr=%s hisob-fakturasi to'langanga o'zgartirildi
 InvoiceCanceledInDolibarr=%s hisob-fakturasi bekor qilindi
 MemberValidatedInDolibarr=%s a'zosi tasdiqlangan
-MemberModifiedInDolibarr=Member %s modified
+MemberModifiedInDolibarr=%s a'zosi o'zgartirildi
 MemberResiliatedInDolibarr=%s a'zosi tugatildi
 MemberDeletedInDolibarr=%s a'zosi o'chirildi
 MemberSubscriptionAddedInDolibarr=%s a'zosi uchun %s obunasi qo'shildi
-MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified
-MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted
+MemberSubscriptionModifiedInDolibarr=%s a'zosi uchun obuna %s o'zgartirildi
+MemberSubscriptionDeletedInDolibarr=%s a'zosi uchun %s obunasi o'chirildi
 ShipmentValidatedInDolibarr=%s jo'natmasi tasdiqlangan
 ShipmentClassifyClosedInDolibarr=%s jo'natmasi tasniflangan
 ShipmentUnClassifyCloseddInDolibarr=%s jo'natmasi qayta ochilgan
-ShipmentBackToDraftInDolibarr=Shipment %s go back to draft status
+ShipmentBackToDraftInDolibarr=%s jo'natmasi qoralama holatiga qaytadi
 ShipmentDeletedInDolibarr=%s jo'natmasi o'chirildi
-ReceptionValidatedInDolibarr=Reception %s validated
+ReceptionValidatedInDolibarr=%s qabul qilish tasdiqlangan
 OrderCreatedInDolibarr=%s buyurtmasi yaratildi
 OrderValidatedInDolibarr=%s buyurtmasi tasdiqlangan
 OrderDeliveredInDolibarr=Buyurtma tasniflangan tasniflangan %s
@@ -74,11 +74,11 @@ OrderApprovedInDolibarr=%s buyurtmasi tasdiqlandi
 OrderRefusedInDolibarr=%s buyurtmasi rad etildi
 OrderBackToDraftInDolibarr=%s buyurtmasi qoralama holatiga qaytadi
 ProposalSentByEMail=Elektron pochta orqali yuborilgan %s tijorat taklifi
-ContractSentByEMail=Contract %s sent by email
+ContractSentByEMail=Elektron pochta orqali yuborilgan %s shartnoma
 OrderSentByEMail=%s savdo buyurtmasi elektron pochta orqali yuborilgan
 InvoiceSentByEMail=Mijozlarning hisob-fakturasi %s elektron pochta orqali yuborilgan
 SupplierOrderSentByEMail=Elektron pochta orqali yuborilgan %s buyurtmasini sotib oling
-ORDER_SUPPLIER_DELETEInDolibarr=Purchase order %s deleted
+ORDER_SUPPLIER_DELETEInDolibarr=%s sotib olish buyurtmasi o'chirildi
 SupplierInvoiceSentByEMail=Sotuvchi hisob-fakturasi %s elektron pochta orqali yuborilgan
 ShippingSentByEMail=%s jo'natmasi elektron pochta orqali yuborilgan
 ShippingValidated= %s jo'natmasi tasdiqlangan
@@ -86,53 +86,53 @@ InterventionSentByEMail=Elektron pochta orqali yuborilgan aralashuv %s
 ProposalDeleted=Taklif o'chirildi
 OrderDeleted=Buyurtma o'chirildi
 InvoiceDeleted=Hisob-faktura o'chirildi
-DraftInvoiceDeleted=Draft invoice deleted
-CONTACT_CREATEInDolibarr=Contact %s created
-CONTACT_MODIFYInDolibarr=Contact %s modified
-CONTACT_DELETEInDolibarr=Contact %s deleted
-PRODUCT_CREATEInDolibarr=Product %s created
-PRODUCT_MODIFYInDolibarr=Product %s modified
-PRODUCT_DELETEInDolibarr=Product %s deleted
-HOLIDAY_CREATEInDolibarr=Request for leave %s created
-HOLIDAY_MODIFYInDolibarr=Request for leave %s modified
-HOLIDAY_APPROVEInDolibarr=Request for leave %s approved
-HOLIDAY_VALIDATEInDolibarr=Request for leave %s validated
-HOLIDAY_DELETEInDolibarr=Request for leave %s deleted
-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
-PROJECT_CREATEInDolibarr=Project %s created
-PROJECT_MODIFYInDolibarr=Project %s modified
-PROJECT_DELETEInDolibarr=Project %s deleted
-TICKET_CREATEInDolibarr=Ticket %s created
-TICKET_MODIFYInDolibarr=Ticket %s modified
-TICKET_ASSIGNEDInDolibarr=Ticket %s assigned
-TICKET_CLOSEInDolibarr=Ticket %s closed
-TICKET_DELETEInDolibarr=Ticket %s deleted
-BOM_VALIDATEInDolibarr=BOM validated
-BOM_UNVALIDATEInDolibarr=BOM unvalidated
-BOM_CLOSEInDolibarr=BOM disabled
-BOM_REOPENInDolibarr=BOM reopen
-BOM_DELETEInDolibarr=BOM deleted
-MRP_MO_VALIDATEInDolibarr=MO validated
-MRP_MO_UNVALIDATEInDolibarr=MO set to draft status
-MRP_MO_PRODUCEDInDolibarr=MO produced
-MRP_MO_DELETEInDolibarr=MO deleted
-MRP_MO_CANCELInDolibarr=MO canceled
-PAIDInDolibarr=%s paid
+DraftInvoiceDeleted=Hisob-faktura loyihasi o'chirildi
+CONTACT_CREATEInDolibarr=%s bilan bog'laning
+CONTACT_MODIFYInDolibarr=%s bilan bog'lanish o'zgartirildi
+CONTACT_DELETEInDolibarr=%s bilan aloqa o'chirildi
+PRODUCT_CREATEInDolibarr=%s mahsuloti yaratildi
+PRODUCT_MODIFYInDolibarr=Mahsulot %s o'zgartirilgan
+PRODUCT_DELETEInDolibarr=%s mahsuloti o'chirildi
+HOLIDAY_CREATEInDolibarr=%s ta'til uchun so'rov yaratildi
+HOLIDAY_MODIFYInDolibarr=%s ta'tilga talab o'zgartirildi
+HOLIDAY_APPROVEInDolibarr=%s ta'tilga chiqish so'rovi tasdiqlandi
+HOLIDAY_VALIDATEInDolibarr=%s ta'til uchun so'rov tasdiqlangan
+HOLIDAY_DELETEInDolibarr=%s ta'til uchun so'rov o'chirildi
+EXPENSE_REPORT_CREATEInDolibarr=%s xarajatlar hisoboti tuzildi
+EXPENSE_REPORT_VALIDATEInDolibarr=%s xarajatlar hisoboti tasdiqlangan
+EXPENSE_REPORT_APPROVEInDolibarr=%s xarajatlar hisoboti tasdiqlandi
+EXPENSE_REPORT_DELETEInDolibarr=%s xarajatlar hisoboti o'chirildi
+EXPENSE_REPORT_REFUSEDInDolibarr=%s xarajatlar hisoboti rad etildi
+PROJECT_CREATEInDolibarr=%s loyihasi yaratildi
+PROJECT_MODIFYInDolibarr=%s loyihasi o'zgartirildi
+PROJECT_DELETEInDolibarr=%s loyihasi o'chirildi
+TICKET_CREATEInDolibarr=%s chiptasi yaratildi
+TICKET_MODIFYInDolibarr=%s chiptasi o'zgartirildi
+TICKET_ASSIGNEDInDolibarr=%s chiptasi tayinlandi
+TICKET_CLOSEInDolibarr=%s chiptasi yopiq
+TICKET_DELETEInDolibarr=%s chiptasi o'chirildi
+BOM_VALIDATEInDolibarr=BOM tasdiqlangan
+BOM_UNVALIDATEInDolibarr=BOM baholanmagan
+BOM_CLOSEInDolibarr=BOM o'chirilgan
+BOM_REOPENInDolibarr=BOM qayta ochiladi
+BOM_DELETEInDolibarr=BOM o'chirildi
+MRP_MO_VALIDATEInDolibarr=MO tasdiqlangan
+MRP_MO_UNVALIDATEInDolibarr=MO holatni tuzishga tayyor
+MRP_MO_PRODUCEDInDolibarr=MO ishlab chiqarilgan
+MRP_MO_DELETEInDolibarr=MO o'chirildi
+MRP_MO_CANCELInDolibarr=MO bekor qilindi
+PAIDInDolibarr=%s to'langan
 ##### End agenda events #####
-AgendaModelModule=Document templates for event
+AgendaModelModule=Hodisa uchun hujjat shablonlari
 DateActionStart=Boshlanish vaqti
 DateActionEnd=Tugash sanasi
 AgendaUrlOptions1=Chiqishni filtrlash uchun siz quyidagi parametrlarni qo'shishingiz mumkin:
 AgendaUrlOptions3= <b> logina = %s </b> <b> %s </b> foydalanuvchisiga tegishli harakatlar bilan chiqishni cheklash.
-AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> to restrict output to actions not owned by user <b>%s</b>.
+AgendaUrlOptionsNotAdmin= <b> logina =! %s </b> foydalanuvchi <b> %s </b> foydalanuvchiga tegishli bo'lmagan harakatlarga cheklash uchun.
 AgendaUrlOptions4= <b> logint = %s </b> foydalanuvchi <b> %s </b> (egasi va boshqalar) ga tayinlangan harakatlar bilan chiqishni cheklash uchun.
 AgendaUrlOptionsProject= <b> project = __ PROJECT_ID__ </b> loyihani <b> __PROJECT_ID__ </b> loyihasi bilan bog'liq harakatlar bilan cheklash.
-AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic events.
-AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> to include events of holidays.
+AgendaUrlOptionsNotAutoEvent= <b> notactiontype = avtomatik hodisalarni istisno qilish uchun systemauto </b>.
+AgendaUrlOptionsIncludeHolidays= <b> dam olish kunlarini o'z ichiga oladi = 1 </b> ta'til tadbirlarini o'z ichiga oladi.
 AgendaShowBirthdayEvents=Kontaktlarning tug'ilgan kunlari
 AgendaHideBirthdayEvents=Kontaktlarning tug'ilgan kunlarini yashirish
 Busy=Band
@@ -155,18 +155,18 @@ ActionType=Tadbir turi
 DateActionBegin=Tadbirni boshlash sanasi
 ConfirmCloneEvent=Hodisani <b> %s </b> klonlashni xohlaysizmi?
 RepeatEvent=Voqeani takrorlang
-OnceOnly=Once only
+OnceOnly=Faqat bir marta
 EveryWeek=Har hafta
 EveryMonth=Har oy
 DayOfMonth=Oy kuni
 DayOfWeek=Haftaning kuni
 DateStartPlusOne=Sana boshlanishi + 1 soat
-SetAllEventsToTodo=Set all events to todo
-SetAllEventsToInProgress=Set all events to in progress
-SetAllEventsToFinished=Set all events to finished
-ReminderTime=Reminder period before the event
-TimeType=Duration type
-ReminderType=Callback type
-AddReminder=Create an automatic reminder notification for this event
-ErrorReminderActionCommCreation=Error creating the reminder notification for this event
-BrowserPush=Browser Popup Notification
+SetAllEventsToTodo=Barcha tadbirlarni todo qilish uchun sozlang
+SetAllEventsToInProgress=Barcha tadbirlarni davom etadigan qilib sozlang
+SetAllEventsToFinished=Barcha tadbirlarni tugallangan deb belgilang
+ReminderTime=Tadbirgacha eslatish davri
+TimeType=Muddati turi
+ReminderType=Qayta qo'ng'iroq turi
+AddReminder=Ushbu tadbir uchun avtomatik eslatma xabarnomasini yarating
+ErrorReminderActionCommCreation=Ushbu voqea uchun eslatma bildirishnomasini yaratishda xatolik yuz berdi
+BrowserPush=Brauzerning popup-xabarnomasi
diff --git a/htdocs/langs/uz_UZ/assets.lang b/htdocs/langs/uz_UZ/assets.lang
index ef04723c6c2..eed37191c99 100644
--- a/htdocs/langs/uz_UZ/assets.lang
+++ b/htdocs/langs/uz_UZ/assets.lang
@@ -16,50 +16,52 @@
 #
 # Generic
 #
-Assets = Assets
-NewAsset = New asset
-AccountancyCodeAsset = Accounting code (asset)
-AccountancyCodeDepreciationAsset = Accounting code (depreciation asset account)
-AccountancyCodeDepreciationExpense = Accounting code (depreciation expense account)
-NewAssetType=New asset type
-AssetsTypeSetup=Asset type setup
-AssetTypeModified=Asset type modified
-AssetType=Asset type
-AssetsLines=Assets
-DeleteType=Delete
-DeleteAnAssetType=Delete an asset type
-ConfirmDeleteAssetType=Are you sure you want to delete this asset type?
-ShowTypeCard=Show type '%s'
+Assets = Aktivlar
+NewAsset = Yangi aktiv
+AccountancyCodeAsset = Buxgalteriya kodi (aktiv)
+AccountancyCodeDepreciationAsset = Buxgalteriya kodi (amortizatsiya aktivlari hisobi)
+AccountancyCodeDepreciationExpense = Buxgalteriya kodi (amortizatsiya xarajatlari hisobi)
+NewAssetType=Yangi aktiv turi
+AssetsTypeSetup=Obyekt turini sozlash
+AssetTypeModified=Obyekt turi o'zgartirildi
+AssetType=Obyekt turi
+AssetsLines=Aktivlar
+DeleteType=O'chirish
+DeleteAnAssetType=Obyekt turini o'chirib tashlang
+ConfirmDeleteAssetType=Ushbu aktiv turini o'chirishni xohlaysizmi?
+ShowTypeCard="%s" turini ko'rsatish
 
 # Module label 'ModuleAssetsName'
-ModuleAssetsName = Assets
+ModuleAssetsName = Aktivlar
 # Module description 'ModuleAssetsDesc'
-ModuleAssetsDesc = Assets description
+ModuleAssetsDesc = Aktivlarning tavsifi
 
 #
 # Admin page
 #
-AssetsSetup = Assets setup
-Settings = Settings
-AssetsSetupPage = Assets setup page
-ExtraFieldsAssetsType = Complementary attributes (Asset type)
-AssetsType=Asset type
-AssetsTypeId=Asset type id
-AssetsTypeLabel=Asset type label
-AssetsTypes=Assets types
+AssetsSetup = Aktivlarni sozlash
+Settings = Sozlamalar
+AssetsSetupPage = Aktivlarni sozlash sahifasi
+ExtraFieldsAssetsType = Qo'shimcha atributlar (aktiv turi)
+AssetsType=Obyekt turi
+AssetsTypeId=Obyekt turi identifikatori
+AssetsTypeLabel=Obyekt turi yorlig'i
+AssetsTypes=Aktiv turlari
 
 #
 # Menu
 #
-MenuAssets = Assets
-MenuNewAsset = New asset
-MenuTypeAssets = Type assets
-MenuListAssets = List
-MenuNewTypeAssets = New
-MenuListTypeAssets = List
+MenuAssets = Aktivlar
+MenuNewAsset = Yangi aktiv
+MenuTypeAssets = Aktivlarni kiriting
+MenuListAssets = Ro'yxat
+MenuNewTypeAssets = Yangi
+MenuListTypeAssets = Ro'yxat
 
 #
 # Module
 #
-NewAssetType=New asset type
-NewAsset=New asset
+Asset=Aktiv
+NewAssetType=Yangi aktiv turi
+NewAsset=Yangi aktiv
+ConfirmDeleteAsset=Haqiqatan ham ushbu aktivni o'chirishni xohlaysizmi?
diff --git a/htdocs/langs/uz_UZ/banks.lang b/htdocs/langs/uz_UZ/banks.lang
index e8b924ef2d7..4d5eefc6257 100644
--- a/htdocs/langs/uz_UZ/banks.lang
+++ b/htdocs/langs/uz_UZ/banks.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - banks
 Bank=Bank
 MenuBankCash=Banklar | Naqd pul
-MenuVariousPayment=Miscellaneous payments
-MenuNewVariousPayment=New Miscellaneous payment
+MenuVariousPayment=Turli xil to'lovlar
+MenuNewVariousPayment=Yangi turli xil to'lovlar
 BankName=Bank nomi
 FinancialAccount=Account
 BankAccount=bank hisob raqami
 BankAccounts=Bank hisobvaraqlari
-BankAccountsAndGateways=Bank accounts | Gateways
+BankAccountsAndGateways=Bank hisobvaraqlari | Shlyuzlar
 ShowAccount=Hisobni ko'rsatish
 AccountRef=Moliyaviy hisob
 AccountLabel=Moliyaviy hisob yorlig'i
@@ -37,9 +37,9 @@ IbanValid=BAN amal qiladi
 IbanNotValid=BAN haqiqiy emas
 StandingOrders=To'g'ridan-to'g'ri debet buyurtmalari
 StandingOrder=To'g'ridan-to'g'ri debet buyurtmasi
-PaymentByDirectDebit=Payment by direct debit
-PaymentByBankTransfers=Payments by credit transfer
-PaymentByBankTransfer=Payment by credit transfer
+PaymentByDirectDebit=To'g'ridan-to'g'ri debet orqali to'lov
+PaymentByBankTransfers=Kredit o'tkazish yo'li bilan to'lovlar
+PaymentByBankTransfer=Kredit o'tkazish yo'li bilan to'lov
 AccountStatement=Hisob-kitob varaqasi
 AccountStatementShort=Bayonot
 AccountStatements=Hisob-kitob varaqalari
@@ -72,15 +72,15 @@ RemoveFromRubriqueConfirm=Kirish va toifadagi aloqani olib tashlamoqchimisiz?
 ListBankTransactions=Bank yozuvlari ro'yxati
 IdTransaction=Tranzaksiya identifikatori
 BankTransactions=Bank yozuvlari
-BankTransaction=Bank entry
+BankTransaction=Bank yozuvlari
 ListTransactions=Yozuvlar ro'yxati
 ListTransactionsByCategory=Ro'yxat yozuvlari / toifasi
 TransactionsToConciliate=Yarashtirish uchun yozuvlar
-TransactionsToConciliateShort=To reconcile
+TransactionsToConciliateShort=Yarashtirmoq
 Conciliable=Yarashtirilishi mumkin
 Conciliate=Yarashish
 Conciliation=Yarashish
-SaveStatementOnly=Save statement only
+SaveStatementOnly=Faqat bayonotni saqlash
 ReconciliationLate=Yarashuv kech
 IncludeClosedAccount=Yopiq hisoblarni qo'shing
 OnlyOpenedAccount=Faqat hisoblarni oching
@@ -95,7 +95,7 @@ AccountIdShort=Raqam
 LineRecord=Tranzaksiya
 AddBankRecord=Kirish kiritish
 AddBankRecordLong=Kiritishni qo'lda qo'shing
-Conciliated=Reconciled
+Conciliated=Yarashtirildi
 ConciliatedBy=Tomonidan yarashtirildi
 DateConciliating=Sana yarashtirildi
 BankLineConciliated=Kirish bank kvitansiyasi bilan taqqoslangan
@@ -115,12 +115,12 @@ TransferTo=Kimga
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
 CheckTransmitter=Yuboruvchi
 ValidateCheckReceipt=Ushbu chek kvitansiyasi tasdiqlansinmi?
-ConfirmValidateCheckReceipt=Ushbu chek kvitansiyasini tasdiqlash uchun topshirmoqchi ekanligingizga aminmisiz? Hech qanday o'zgartirish mumkin emas.
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes will be possible once validated.
 DeleteCheckReceipt=Ushbu chek kvitansiyasi o'chirilsinmi?
 ConfirmDeleteCheckReceipt=Ushbu chek kvitansiyasini o'chirishni xohlaysizmi?
 BankChecks=Bank cheklari
 BankChecksToReceipt=Depozitni kutayotgan cheklar
-BankChecksToReceiptShort=Checks awaiting deposit
+BankChecksToReceiptShort=Depozitni kutayotgan cheklar
 ShowCheckReceipt=Chek depozit kvitansiyasini ko'rsating
 NumberOfCheques=Chek raqami
 DeleteTransaction=Kirishni o'chirish
@@ -161,24 +161,24 @@ CheckRejectedAndInvoicesReopened=Qaytganligini tekshiring va hisob-fakturalarni
 BankAccountModelModule=Bank hisobvaraqlari uchun hujjatlar shablonlari
 DocumentModelSepaMandate=SEPA mandatining shabloni. Faqatgina Evropa Ittifoqidagi Evropa mamlakatlari uchun foydalidir.
 DocumentModelBan=BAN ma'lumotlari bilan sahifani chop etish uchun shablon.
-NewVariousPayment=New miscellaneous payment
-VariousPayment=Miscellaneous payment
-VariousPayments=Miscellaneous payments
-ShowVariousPayment=Show miscellaneous payment
-AddVariousPayment=Add miscellaneous payment
-VariousPaymentId=Miscellaneous payment ID
-VariousPaymentLabel=Miscellaneous payment label
-ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment
-SEPAMandate=SEPA mandate
-YourSEPAMandate=Your SEPA mandate
-FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
-AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
-CashControl=POS cash desk control
-NewCashFence=New cash desk opening or closing
-BankColorizeMovement=Colorize movements
-BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
-BankColorizeMovementName1=Background color for debit movement
-BankColorizeMovementName2=Background color for credit movement
-IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
-NoBankAccountDefined=No bank account defined
-NoRecordFoundIBankcAccount=No record found in bank account. Commonly, this occurs when a record has been deleted manually from the list of transaction in the bank account (for example during a reconciliation of the bank account). Another reason is that the payment was recorded when the module "%s" was disabled.
+NewVariousPayment=Yangi har xil to'lov
+VariousPayment=Turli xil to'lovlar
+VariousPayments=Turli xil to'lovlar
+ShowVariousPayment=Turli xil to'lovlarni ko'rsating
+AddVariousPayment=Turli xil to'lovlarni qo'shing
+VariousPaymentId=Boshqa to'lov identifikatori
+VariousPaymentLabel=Turli xil to'lov yorlig'i
+ConfirmCloneVariousPayment=Turli xil to'lovlar klonini tasdiqlang
+SEPAMandate=SEPA vakolati
+YourSEPAMandate=Sizning SEPA vakolatingiz
+FindYourSEPAMandate=Bu sizning kompaniyangizga sizning bankingizda to'g'ridan-to'g'ri debet buyurtma berish huquqini berish uchun sizning SEPA vakolatingiz. Uni imzolangan holda qaytaring (imzolangan hujjatni skanerlash) yoki pochta orqali yuboring
+AutoReportLastAccountStatement=Taqqoslash paytida avtomatik ravishda 'bank ko'chirma raqami' maydonini oxirgi ko'chirma raqami bilan to'ldiring
+CashControl=POS kassasini boshqarish
+NewCashFence=Yangi kassa ochilishi yoki yopilishi
+BankColorizeMovement=Harakatlarni ranglang
+BankColorizeMovementDesc=Agar bu funktsiya yoqilgan bo'lsa, siz debet yoki kredit harakatlari uchun aniq fon rangini tanlashingiz mumkin
+BankColorizeMovementName1=Debet harakati uchun fon rangi
+BankColorizeMovementName2=Kredit harakati uchun fon rangi
+IfYouDontReconcileDisableProperty=Agar siz ba'zi bir bank hisobvaraqlari bo'yicha banklarni yarashtirmasangiz, ushbu ogohlantirishni olib tashlash uchun ulardagi "%s" xususiyatini o'chirib qo'ying.
+NoBankAccountDefined=Bank hisob raqami aniqlanmagan
+NoRecordFoundIBankcAccount=Bank hisob raqamida yozuv topilmadi. Odatda, bu yozuv bank hisobvarag'idagi operatsiyalar ro'yxatidan qo'lda o'chirilganda sodir bo'ladi (masalan, bank hisobvarag'ini taqqoslash paytida). Yana bir sabab shundaki, to'lov "%s" moduli o'chirilganda qayd etilgan.
diff --git a/htdocs/langs/uz_UZ/bills.lang b/htdocs/langs/uz_UZ/bills.lang
index a7d1da66661..cd391c74a65 100644
--- a/htdocs/langs/uz_UZ/bills.lang
+++ b/htdocs/langs/uz_UZ/bills.lang
@@ -11,8 +11,8 @@ BillsSuppliersUnpaidForCompany=%s uchun to'lanmagan sotuvchilarning hisob-faktur
 BillsLate=Kechiktirilgan to'lovlar
 BillsStatistics=Mijozlar hisob-fakturalari statistikasi
 BillsStatisticsSuppliers=Sotuvchilarning hisob-fakturalari statistikasi
-DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping
-DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter.
+DisabledBecauseDispatchedInBookkeeping=Faktura buxgalteriya hisobiga yuborilganligi sababli o'chirib qo'yildi
+DisabledBecauseNotLastInvoice=Fakturani o'chirib bo'lmaydiganligi sababli o'chirib qo'yilgan. Shundan so'ng ba'zi hisob-fakturalar yozilgan va bu hisoblagichda teshiklar hosil qiladi.
 DisabledBecauseNotErasable=O'chirilganligi sababli o'chirib qo'yilgan
 InvoiceStandard=Standart hisob-faktura
 InvoiceStandardAsk=Standart hisob-faktura
@@ -47,7 +47,7 @@ InvoiceHasAvoir=Bir yoki bir nechta kredit yozuvlari manbai bo'lgan
 CardBill=Hisob-faktura kartasi
 PredefinedInvoices=Oldindan belgilangan hisob-fakturalar
 Invoice=Hisob-faktura
-PdfInvoiceTitle=Invoice
+PdfInvoiceTitle=Hisob-faktura
 Invoices=Hisob-fakturalar
 InvoiceLine=Hisob-faktura chizig'i
 InvoiceCustomer=Mijozlarning hisob-fakturasi
@@ -55,7 +55,7 @@ CustomerInvoice=Mijozlarning hisob-fakturasi
 CustomersInvoices=Mijozlarning hisob-fakturalari
 SupplierInvoice=Sotuvchi hisob-fakturasi
 SuppliersInvoices=Sotuvchi hisob-fakturalari
-SupplierInvoiceLines=Vendor invoice lines
+SupplierInvoiceLines=Sotuvchi faktura satrlari
 SupplierBill=Sotuvchi hisob-fakturasi
 SupplierBills=Sotuvchi hisob-fakturalari
 Payment=To'lov
@@ -68,9 +68,9 @@ PaidBack=Qaytib to'langan
 DeletePayment=To'lovni o'chirib tashlang
 ConfirmDeletePayment=Haqiqatan ham ushbu to'lovni o'chirishni xohlaysizmi?
 ConfirmConvertToReduc=Ushbu %s-ni mavjud kreditga aylantirmoqchimisiz?
-ConfirmConvertToReduc2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an available credit?
-ConfirmConvertToReducSupplier2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
+ConfirmConvertToReduc2=Miqdor barcha chegirmalar orasida saqlanib qoladi va ushbu mijoz uchun joriy yoki kelajakdagi hisob-faktura uchun chegirma sifatida ishlatilishi mumkin.
+ConfirmConvertToReducSupplier=Ushbu %s-ni mavjud kreditga aylantirmoqchimisiz?
+ConfirmConvertToReducSupplier2=Miqdor barcha chegirmalar orasida saqlanib qoladi va ushbu sotuvchi uchun joriy yoki kelajakdagi hisob-faktura uchun chegirma sifatida ishlatilishi mumkin.
 SupplierPayments=Sotuvchi uchun to'lovlar
 ReceivedPayments=Qabul qilingan to'lovlar
 ReceivedCustomersPayments=Mijozlardan olingan to'lovlar
@@ -82,8 +82,8 @@ PaymentsAlreadyDone=To'lovlar allaqachon amalga oshirilgan
 PaymentsBackAlreadyDone=Pulni qaytarish allaqachon amalga oshirilgan
 PaymentRule=To'lov qoidasi
 PaymentMode=To'lov turi
-DefaultPaymentMode=Default Payment Type
-DefaultBankAccount=Default Bank Account
+DefaultPaymentMode=Standart to'lov turi
+DefaultBankAccount=Standart bank hisobvarag'i
 PaymentTypeDC=Debet / kredit karta
 PaymentTypePP=PayPal
 IdPaymentMode=To'lov turi (id)
@@ -98,7 +98,7 @@ PaymentHigherThanReminderToPay=To'lov to'lashni eslatgandan yuqori
 HelpPaymentHigherThanReminderToPay=E'tibor bering, bir yoki bir nechta veksellarni to'lash miqdori to'lash kerak bo'lgan miqdoridan yuqori. <br> yozuvingizni tahrirlang, aks holda har bir ortiqcha to'langan hisob-faktura uchun olingan ortiqcha uchun kredit yozuvini yaratishni tasdiqlang va ko'rib chiqing.
 HelpPaymentHigherThanReminderToPaySupplier=E'tibor bering, bir yoki bir nechta veksellarni to'lash miqdori to'lash kerak bo'lgan miqdoridan yuqori. <br> yozuvingizni tahrirlang, aks holda har bir ortiqcha to'langan hisob-faktura uchun to'langan ortiqcha uchun kredit yozuvini yaratishni tasdiqlang va ko'rib chiqing.
 ClassifyPaid="Pulli" deb tasniflang
-ClassifyUnPaid=Classify 'Unpaid'
+ClassifyUnPaid="To'lanmagan" toifasini tasniflash
 ClassifyPaidPartially="Qisman to'langan" deb tasniflang
 ClassifyCanceled="Tashlab ketilgan" deb tasniflang
 ClassifyClosed="Yopiq" deb tasniflash
@@ -116,7 +116,7 @@ DoPayment=To'lovni kiriting
 DoPaymentBack=Qaytarishni kiriting
 ConvertToReduc=Kredit mavjud deb belgilang
 ConvertExcessReceivedToReduc=Qabul qilingan ortiqcha miqdorni mavjud kreditga aylantiring
-ConvertExcessPaidToReduc=Convert excess paid into available discount
+ConvertExcessPaidToReduc=To'langan ortiqcha miqdorni mavjud chegirmaga aylantiring
 EnterPaymentReceivedFromCustomer=Mijozdan olingan to'lovni kiriting
 EnterPaymentDueToCustomer=Mijozga tegishli to'lovni amalga oshiring
 DisabledBecauseRemainderToPayIsZero=O'chirilgan, chunki to'lovsiz qolgan nolga teng
@@ -137,7 +137,7 @@ BillStatusClosedPaidPartially=Pulli (qisman)
 BillShortStatusDraft=Qoralama
 BillShortStatusPaid=To'langan
 BillShortStatusPaidBackOrConverted=Qaytarilgan yoki konvertatsiya qilingan
-Refunded=Refunded
+Refunded=Qaytarildi
 BillShortStatusConverted=To'langan
 BillShortStatusCanceled=Tashlab ketilgan
 BillShortStatusValidated=Tasdiqlangan
@@ -156,7 +156,7 @@ ErrorDiscountAlreadyUsed=Xato, chegirma allaqachon ishlatilgan
 ErrorInvoiceAvoirMustBeNegative=Xato, to'g'ri hisob-fakturada salbiy miqdor bo'lishi kerak
 ErrorInvoiceOfThisTypeMustBePositive=Xato, ushbu turdagi hisob-fakturada soliqdan tashqari (yoki bekor qilingan) soliq miqdori bo'lmagan miqdor bo'lishi kerak
 ErrorCantCancelIfReplacementInvoiceNotValidated=Xato, boshqa hisob-faktura bilan almashtirilgan fakturani bekor qilish mumkin emas
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=Ushbu yoki boshqa qism allaqachon ishlatilgan, shuning uchun chegirmalarni o'chirib bo'lmaydi.
 BillFrom=Kimdan
 BillTo=Kimga
 ActionsOnBill=Hisob-fakturadagi harakatlar
@@ -166,19 +166,19 @@ FoundXQualifiedRecurringInvoiceTemplate=%s takrorlanadigan shablon hisob-faktura
 NotARecurringInvoiceTemplate=Takrorlanadigan shablon hisob-fakturasi emas
 NewBill=Yangi hisob-faktura
 LastBills=Oxirgi %s hisob-fakturalari
-LatestTemplateInvoices=Latest %s template invoices
-LatestCustomerTemplateInvoices=Latest %s customer template invoices
-LatestSupplierTemplateInvoices=Latest %s vendor template invoices
+LatestTemplateInvoices=Eng so'nggi %s shablon hisob-fakturalari
+LatestCustomerTemplateInvoices=Eng so'nggi %s mijozlar shablonlari hisob-fakturalari
+LatestSupplierTemplateInvoices=So'nggi %s sotuvchisi shablon hisob-fakturalari
 LastCustomersBills=%s mijozlarining so'nggi hisob-fakturalari
 LastSuppliersBills=Oxirgi %s sotuvchisi hisob-fakturalari
 AllBills=Barcha hisob-fakturalar
-AllCustomerTemplateInvoices=All template invoices
+AllCustomerTemplateInvoices=Barcha shablon hisob-fakturalar
 OtherBills=Boshqa hisob-fakturalar
 DraftBills=Hisob-fakturalar
 CustomersDraftInvoices=Xaridorlarning hisob-fakturalari
 SuppliersDraftInvoices=Xaridor hisob-fakturalari
 Unpaid=To'lanmagan
-ErrorNoPaymentDefined=Error No payment defined
+ErrorNoPaymentDefined=Xato To'lov aniqlanmadi
 ConfirmDeleteBill=Ushbu hisob-fakturani o'chirishni xohlaysizmi?
 ConfirmValidateBill=Ushbu fakturani <b> %s </b> ma'lumotnomasi bilan tasdiqlamoqchimisiz?
 ConfirmUnvalidateBill=Hisob-fakturani <b> %s </b> holatini qoralama holatiga o'zgartirishni xohlaysizmi?
@@ -188,7 +188,7 @@ ConfirmCancelBillQuestion=Nima uchun ushbu hisob-fakturani "tashlab qo'yilgan" d
 ConfirmClassifyPaidPartially=Hisob-fakturani <b> %s </b> ni to'langan holatga o'zgartirishni xohlaysizmi?
 ConfirmClassifyPaidPartiallyQuestion=Ushbu hisob-faktura to'liq to'lanmagan. Ushbu hisob-fakturani yopish sababi nima?
 ConfirmClassifyPaidPartiallyReasonAvoir=Qolgan to'lanmagan <b> (%s %s) </b> - bu chegirma, chunki to'lov muddatidan oldin amalga oshirilgan. Men QQSni kredit yozuvlari bilan tartibga solaman.
-ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
+ConfirmClassifyPaidPartiallyReasonDiscount=Qolgan to'lanmagan <b> (%s %s) </b> - bu chegirma, chunki to'lov muddatidan oldin amalga oshirilgan.
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Qolgan to'lanmagan <b> (%s %s) </b> - bu chegirma, chunki to'lov muddatidan oldin amalga oshirilgan. Ushbu chegirmada QQSni yo'qotishni qabul qilaman.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Qolgan to'lanmagan <b> (%s %s) </b> - bu chegirma, chunki to'lov muddatidan oldin amalga oshirilgan. Men ushbu chegirma bo'yicha QQSni kredit yozuvisiz qaytarib olaman.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Yomon mijoz
@@ -210,25 +210,25 @@ UnvalidateBill=Hisob-faktura yaroqsiz
 NumberOfBills=Hisob-fakturalar soni
 NumberOfBillsByMonth=Oyiga hisob-fakturalar soni
 AmountOfBills=Hisob-fakturalar miqdori
-AmountOfBillsHT=Amount of invoices (net of tax)
+AmountOfBillsHT=Hisob-fakturalar miqdori (soliqdan tashqari)
 AmountOfBillsByMonthHT=Hisob-fakturalarning oy bo'yicha miqdori (soliqni hisobga olmaganda)
-UseSituationInvoices=Allow situation invoice
-UseSituationInvoicesCreditNote=Allow situation invoice credit note
-Retainedwarranty=Retained warranty
-AllowedInvoiceForRetainedWarranty=Retained warranty usable on the following types of invoices
-RetainedwarrantyDefaultPercent=Retained warranty default percent
-RetainedwarrantyOnlyForSituation=Make "retained warranty" available only for situation invoices
-RetainedwarrantyOnlyForSituationFinal=On situation invoices the global "retained warranty" deduction is applied only on the final situation
-ToPayOn=To pay on %s
-toPayOn=to pay on %s
-RetainedWarranty=Retained Warranty
-PaymentConditionsShortRetainedWarranty=Retained warranty payment terms
-DefaultPaymentConditionsRetainedWarranty=Default retained warranty payment terms
-setPaymentConditionsShortRetainedWarranty=Set retained warranty payment terms
-setretainedwarranty=Set retained warranty
-setretainedwarrantyDateLimit=Set retained warranty date limit
-RetainedWarrantyDateLimit=Retained warranty date limit
-RetainedWarrantyNeed100Percent=The situation invoice need to be at 100%% progress to be displayed on PDF
+UseSituationInvoices=Vaziyat fakturasiga ruxsat berish
+UseSituationInvoicesCreditNote=Vaziyatni taqdim etgan kredit yozuviga ruxsat berish
+Retainedwarranty=Kafolat saqlanib qoldi
+AllowedInvoiceForRetainedWarranty=Hisob-fakturalarning quyidagi turlari bo'yicha ishlatilishi mumkin bo'lgan kafolat
+RetainedwarrantyDefaultPercent=Kafolat sukut saqlanib qoldi
+RetainedwarrantyOnlyForSituation="Saqlanib qolgan kafolat" ni faqat vaziyat bo'yicha hisob-fakturalar uchun taqdim eting
+RetainedwarrantyOnlyForSituationFinal=Vaziyat fakturalarida global "saqlanib qolgan kafolat" chegirmasi faqat oxirgi holat bo'yicha qo'llaniladi
+ToPayOn=%s orqali to'lash uchun
+toPayOn=%s da to'lash
+RetainedWarranty=Kafolatni saqlab qolish
+PaymentConditionsShortRetainedWarranty=Kafolatni to'lash shartlari saqlanib qoldi
+DefaultPaymentConditionsRetainedWarranty=Odatiy saqlanib qolgan kafolatli to'lov shartlari
+setPaymentConditionsShortRetainedWarranty=Kafolatni to'lashning saqlanib qolgan shartlarini o'rnating
+setretainedwarranty=Saqlangan kafolatni o'rnating
+setretainedwarrantyDateLimit=Saqlanib qolgan kafolat muddatini belgilang
+RetainedWarrantyDateLimit=Kafolat muddati saqlanib qoldi
+RetainedWarrantyNeed100Percent=Vaziyat fakturasi 100%% darajasida bo'lishi kerak, bu PDF-da ko'rsatilishi kerak
 AlreadyPaid=Allaqachon to'langan
 AlreadyPaidBack=Qaytib to'langan
 AlreadyPaidNoCreditNotesNoDeposits=Oldindan to'langan (kredit yozuvlari va dastlabki to'lovlarsiz)
@@ -239,7 +239,7 @@ RemainderToPayBack=Pulni qaytarish uchun qolgan mablag '
 Rest=Kutilmoqda
 AmountExpected=Da'vo qilingan miqdor
 ExcessReceived=Ortiqcha olingan
-ExcessPaid=Excess paid
+ExcessPaid=Ortiqcha to'langan
 EscompteOffered=Taklif qilingan chegirma (muddatidan oldin to'lov)
 EscompteOfferedShort=Chegirma
 SendBillRef=%s hisob-fakturasini taqdim etish
@@ -259,7 +259,7 @@ DateMaxPayment=To'lov muddati
 DateInvoice=Hisob-faktura sanasi
 DatePointOfTax=Soliq punkti
 NoInvoice=Hisob-faktura yo‘q
-NoOpenInvoice=No open invoice
+NoOpenInvoice=Ochiq hisob-fakturasi yo‘q
 ClassifyBill=Hisob-fakturani tasniflang
 SupplierBillsToPay=To'lovsiz sotuvchi hisob-fakturalari
 CustomerBillsUnpaid=To'lovsiz mijozlar uchun hisob-fakturalar
@@ -294,30 +294,30 @@ EditGlobalDiscounts=Mutlaq chegirmalarni tahrirlash
 AddCreditNote=Kredit yozuvini yarating
 ShowDiscount=Chegirmani ko'rsating
 ShowReduc=Chegirmani ko'rsating
-ShowSourceInvoice=Show the source invoice
+ShowSourceInvoice=Manba-fakturani ko'rsating
 RelativeDiscount=Nisbatan chegirma
 GlobalDiscount=Global chegirma
 CreditNote=Kredit eslatma
 CreditNotes=Kredit yozuvlari
-CreditNotesOrExcessReceived=Credit notes or excess received
+CreditNotesOrExcessReceived=Kredit yozuvlari yoki ortiqcha olingan
 Deposit=Ilk to'lov
 Deposits=Dastlabki to'lovlar
 DiscountFromCreditNote=%s kredit notasidan chegirma
 DiscountFromDeposit=Hisob-fakturadan dastlabki to'lovlar %s
 DiscountFromExcessReceived=Hisob-fakturadan ortiqcha to'lovlar %s
-DiscountFromExcessPaid=Payments in excess of invoice %s
+DiscountFromExcessPaid=Hisob-fakturadan ortiqcha to'lovlar %s
 AbsoluteDiscountUse=Ushbu turdagi kreditni tasdiqlashdan oldin hisob-fakturada ishlatish mumkin
 CreditNoteDepositUse=Ushbu turdagi kreditlardan foydalanish uchun hisob-fakturani tasdiqlash kerak
 NewGlobalDiscount=Yangi mutlaq chegirma
 NewRelativeDiscount=Yangi nisbiy chegirma
-DiscountType=Discount type
+DiscountType=Chegirma turi
 NoteReason=Izoh / sabab
 ReasonDiscount=Sabab
 DiscountOfferedBy=Tomonidan berilgan
 DiscountStillRemaining=Chegirmalar yoki kreditlar mavjud
 DiscountAlreadyCounted=Oldindan iste'mol qilingan chegirmalar yoki kreditlar
-CustomerDiscounts=Customer discounts
-SupplierDiscounts=Vendors discounts
+CustomerDiscounts=Mijozlarga chegirmalar
+SupplierDiscounts=Sotuvchilarga chegirmalar
 BillAddress=Hisob-kitob manzili
 HelpEscompte=Ushbu chegirma mijozga berilgan chegirmadir, chunki to'lov muddatidan oldin amalga oshirilgan.
 HelpAbandonBadCustomer=Ushbu miqdordan voz kechildi (mijoz yomon mijoz deb aytdi) va bu juda katta zarar deb hisoblanadi.
@@ -331,10 +331,10 @@ InvoiceDateCreation=Hisob-fakturani yaratish sanasi
 InvoiceStatus=Hisob-faktura holati
 InvoiceNote=Hisob-faktura yozuvi
 InvoicePaid=Hisob-faktura to'landi
-InvoicePaidCompletely=Paid completely
-InvoicePaidCompletelyHelp=Invoice that are paid completely. This excludes invoices that are paid partially. To get list of all 'Closed' or non 'Closed' invoices, prefer to use a filter on the invoice status.
-OrderBilled=Order billed
-DonationPaid=Donation paid
+InvoicePaidCompletely=To'liq to'langan
+InvoicePaidCompletelyHelp=To'liq to'langan hisob-faktura. Bu qisman to'lanadigan hisob-fakturalarni hisobga olmaydi. Barcha "Yopiq" yoki "Yopiq" bo'lmagan schyot-fakturalar ro'yxatini olish uchun faktura holatida filtrdan foydalanishni afzal biling.
+OrderBilled=Buyurtma uchun to'lov
+DonationPaid=Xayriya to'landi
 PaymentNumber=To'lov raqami
 RemoveDiscount=Chegirmani olib tashlang
 WatermarkOnDraftBill=Hisob-fakturalardagi suv belgisi (bo'sh bo'lsa, hech narsa yo'q)
@@ -360,35 +360,35 @@ PaymentOnDifferentThirdBills=Turli xil uchinchi shaxslarning veksellari bo'yicha
 PaymentNote=To'lov uchun eslatma
 ListOfPreviousSituationInvoices=Avvalgi vaziyat bo'yicha hisob-fakturalar ro'yxati
 ListOfNextSituationInvoices=Keyingi vaziyat bo'yicha hisob-fakturalar ro'yxati
-ListOfSituationInvoices=List of situation invoices
-CurrentSituationTotal=Total current situation
-DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
-RemoveSituationFromCycle=Remove this invoice from cycle
-ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
-ConfirmOuting=Confirm outing
+ListOfSituationInvoices=Vaziyat fakturalari ro'yxati
+CurrentSituationTotal=Jami hozirgi holat
+DisabledBecauseNotEnouthCreditNote=Vaziyat schyotini tsikldan olib tashlash uchun ushbu schyotning ssuda summasi ushbu schyotning umumiy miqdorini qoplashi kerak
+RemoveSituationFromCycle=Ushbu hisob-fakturani tsikldan olib tashlang
+ConfirmRemoveSituationFromCycle=Ushbu fakturani %s tsikldan olib tashlaysizmi?
+ConfirmOuting=Tashqariga chiqishni tasdiqlang
 FrequencyPer_d=Har bir %s kun ichida
 FrequencyPer_m=Har %s oy
 FrequencyPer_y=Har %s yilda
-FrequencyUnit=Frequency unit
+FrequencyUnit=Chastota birligi
 toolTipFrequency=Misollar: <br> <b> 7-to'plam, kun </b>: har 7 kunda yangi hisob-faktura bering <br> <b> 3-to'plam, oy a09a4b739f17fz
 NextDateToExecution=Keyingi hisob-fakturani yaratish sanasi
-NextDateToExecutionShort=Date next gen.
+NextDateToExecutionShort=Sana keyingi nasl.
 DateLastGeneration=Oxirgi avlod sanasi
-DateLastGenerationShort=Date latest gen.
+DateLastGenerationShort=Sana so'nggi gen.
 MaxPeriodNumber=Maks. hisob-fakturani yaratish soni
 NbOfGenerationDone=Hisob-fakturani yaratish soni allaqachon bajarilgan
-NbOfGenerationOfRecordDone=Number of record generation already done
-NbOfGenerationDoneShort=Number of generation done
+NbOfGenerationOfRecordDone=Bajarilgan yozuvlar soni
+NbOfGenerationDoneShort=Ishlab chiqarilgan avlod soni
 MaxGenerationReached=Yetib kelgan avlodlarning maksimal soni
 InvoiceAutoValidate=Hisob-fakturalarni avtomatik ravishda tasdiqlang
 GeneratedFromRecurringInvoice=%s shablonidan takrorlanadigan hisob-fakturadan yaratilgan
 DateIsNotEnough=Sana hali aniqlanmagan
 InvoiceGeneratedFromTemplate=%s shablonidan takrorlanadigan shablondan hosil qilingan %s schyoti
-GeneratedFromTemplate=Generated from template invoice %s
+GeneratedFromTemplate=%s shablon hisob-fakturasidan yaratilgan
 WarningInvoiceDateInFuture=Ogohlantirish, faktura sanasi joriy sanadan yuqori
 WarningInvoiceDateTooFarInFuture=Diqqat! Hisob-faktura sanasi joriy sanadan juda uzoq
-ViewAvailableGlobalDiscounts=View available discounts
-GroupPaymentsByModOnReports=Group payments by mode on reports
+ViewAvailableGlobalDiscounts=Mavjud chegirmalarni ko'ring
+GroupPaymentsByModOnReports=Hisobotlar bo'yicha to'lovlarni tartib bo'yicha guruhlash
 # PaymentConditions
 Statut=Holat
 PaymentConditionShortRECEP=Qabul qilingandan keyin
@@ -417,8 +417,8 @@ PaymentConditionShort14DENDMONTH=Oy tugashining 14 kuni
 PaymentCondition14DENDMONTH=Oy tugaganidan keyingi 14 kun ichida
 FixAmount=Ruxsat etilgan miqdor - '%s' yorlig'i bilan 1 qator
 VarAmount=O'zgaruvchan miqdor (%% tot.)
-VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
-VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
+VarAmountOneLine=O'zgaruvchan miqdor (%% tot.) - '%s' yorlig'i bilan 1 qator
+VarAmountAllLines=O'zgaruvchan miqdor (%% tot.) - kelib chiqadigan barcha satrlar
 # PaymentType
 PaymentTypeVIR=Bank o'tkazmasi
 PaymentTypeShortVIR=Bank o'tkazmasi
@@ -446,8 +446,8 @@ BankAccountNumberKey=Tekshirish summasi
 Residence=Manzil
 IBANNumber=IBAN hisob raqami
 IBAN=IBAN
-CustomerIBAN=IBAN of customer
-SupplierIBAN=IBAN of vendor
+CustomerIBAN=Mijozning IBAN
+SupplierIBAN=Sotuvchisi IBAN
 BIC=BIC / SWIFT
 BICNumber=BIC / SWIFT kodi
 ExtraInfos=Qo'shimcha ma'lumotlar
@@ -499,16 +499,16 @@ Cash=Naqd pul
 Reported=Kechiktirildi
 DisabledBecausePayments=Mumkin emas, chunki ba'zi to'lovlar mavjud
 CantRemovePaymentWithOneInvoicePaid=To'lovni olib tashlab bo'lmaydi, chunki kamida bitta to'langan hisob-faktura mavjud
-CantRemovePaymentVATPaid=Can't remove payment since VAT declaration is classified paid
-CantRemovePaymentSalaryPaid=Can't remove payment since salary is classified paid
+CantRemovePaymentVATPaid=QQS deklaratsiyasi to'langan deb e'lon qilinganligi sababli to'lovni olib tashlab bo'lmaydi
+CantRemovePaymentSalaryPaid=To'lovni olib tashlab bo'lmaydi, chunki ish haqi to'langan deb tasniflanadi
 ExpectedToPay=Kutilayotgan to'lov
 CantRemoveConciliatedPayment=Taqqoslangan to'lovni olib tashlab bo'lmaydi
 PayedByThisPayment=Ushbu to'lov orqali to'lanadi
 ClosePaidInvoicesAutomatically=To'lov to'liq amalga oshirilgandan so'ng barcha standart, dastlabki to'lovlar yoki almashtirish hisob-fakturalarini avtomatik ravishda "To'langan" deb tasniflang.
 ClosePaidCreditNotesAutomatically=To'liq qaytarib berilgandan so'ng barcha kredit yozuvlarini avtomatik ravishda "To'langan" deb tasniflang.
 ClosePaidContributionsAutomatically=To'lov to'liq amalga oshirilganda barcha ijtimoiy yoki soliq to'lovlarini avtomatik ravishda "To'langan" deb tasniflang.
-ClosePaidVATAutomatically=Classify automatically VAT declaration as "Paid" when payment is done entirely.
-ClosePaidSalaryAutomatically=Classify automatically salary as "Paid" when payment is done entirely.
+ClosePaidVATAutomatically=To'lov to'liq amalga oshirilganda avtomatik ravishda QQS deklaratsiyasini "To'langan" deb tasniflang.
+ClosePaidSalaryAutomatically=To'lov to'liq amalga oshirilganda avtomatik ravishda ish haqini "To'langan" deb tasniflang.
 AllCompletelyPayedInvoiceWillBeClosed=To'lash uchun qoldiq bo'lmagan barcha hisob-fakturalar "To'langan" holati bilan avtomatik ravishda yopiladi.
 ToMakePayment=To'lash
 ToMakePaymentBack=To'lovni qaytaring
@@ -519,14 +519,14 @@ YouMustCreateInvoiceFromThird=Ushbu parametr faqat uchinchi tomonning "Mijoz" yo
 YouMustCreateInvoiceFromSupplierThird=Ushbu parametr faqat uchinchi tomonning "Sotuvchi" yorlig'idan hisob-fakturani yaratishda mavjud bo'ladi
 YouMustCreateStandardInvoiceFirstDesc=Avval siz standart hisob-fakturani yaratishingiz va yangi shablon hisob-fakturasini yaratish uchun uni "shablonga" o'tkazishingiz kerak
 PDFCrabeDescription=Hisob-fakturaning PDF shabloni Crabe. To'liq hisob-faktura shablonini (shimgichni shablonini eski versiyasi)
-PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
+PDFSpongeDescription=Hisob-faktura PDF shablonini shimgich. To'liq hisob-faktura shabloni
 PDFCrevetteDescription=Hisob-fakturaning PDF shablonini Crevette. Vaziyat-fakturalar uchun to'liq hisob-faktura shabloni
 TerreNumRefModelDesc1=Standart hisob-fakturalar uchun %syymm-nnnn formatidagi qaytarish raqami va kredit yozuvlari uchun %syymm-nnnn, yy yil, mm oy va nnnn ketma-ket avtomatik ko'paytiriladigan raqam bo'lib, tanaffussiz va 0 ga qaytish mumkin emas.
 MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=$ Syymm bilan boshlangan qonun loyihasi allaqachon mavjud va ushbu ketma-ketlik modeliga mos kelmaydi. Ushbu modulni faollashtirish uchun uni olib tashlang yoki nomini o'zgartiring.
 CactusNumRefModelDesc1=Standart hisob-fakturalar uchun %syymm-nnnn formatidagi, kredit yozuvlari uchun %syymm-nnnn va %syymm-nnnn formatidagi qaytarish raqami, yy yil, mm-raqam o'sish va raqamlar 0
-EarlyClosingReason=Early closing reason
-EarlyClosingComment=Early closing note
+EarlyClosingReason=Erta yopilish sababi
+EarlyClosingComment=Erta yopilish eslatmasi
 ##### Types de contacts #####
 TypeContact_facture_internal_SALESREPFOLL=Vakilni kuzatib boradigan mijozlarning hisob-fakturasi
 TypeContact_facture_external_BILLING=Mijozlarning hisob-fakturasi bilan aloqa qilish
@@ -540,16 +540,16 @@ TypeContact_invoice_supplier_external_SERVICE=Sotuvchi xizmatiga murojaat qilish
 InvoiceFirstSituationAsk=Birinchi vaziyat uchun hisob-faktura
 InvoiceFirstSituationDesc=<b> vaziyat schyotlari </b> progressiya bilan bog'liq vaziyatlarga bog'langan, masalan qurilishning rivojlanishi. Har bir vaziyat hisob-fakturaga bog'langan.
 InvoiceSituation=Vaziyat bo'yicha hisob-faktura
-PDFInvoiceSituation=Situation invoice
+PDFInvoiceSituation=Vaziyat bo'yicha hisob-faktura
 InvoiceSituationAsk=Vaziyatdan keyin hisob-faktura
 InvoiceSituationDesc=Mavjud vaziyatdan so'ng yangi vaziyat yarating
 SituationAmount=Vaziyat bo'yicha hisob-faktura summasi (aniq)
 SituationDeduction=Vaziyatni ayirish
 ModifyAllLines=Barcha qatorlarni o'zgartiring
 CreateNextSituationInvoice=Keyingi vaziyatni yarating
-ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
-ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
-ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
+ErrorFindNextSituationInvoice=Keyingi vaziyat tsiklini topib bo'lmadi
+ErrorOutingSituationInvoiceOnUpdate=Ushbu hisob-fakturani o'chirib bo'lmaydi.
+ErrorOutingSituationInvoiceCreditNote=Bog'langan kredit yozuvini o'chirib bo'lmaydi.
 NotLastInCycle=Ushbu hisob-faktura tsiklning so'nggi versiyasi emas va o'zgartirilmasligi kerak.
 DisabledBecauseNotLastInCycle=Keyingi vaziyat allaqachon mavjud.
 DisabledBecauseFinal=Bu holat yakuniy.
@@ -572,22 +572,22 @@ DeleteRepeatableInvoice=Shablon hisob-fakturasini o'chirish
 ConfirmDeleteRepeatableInvoice=Shablon hisob-fakturasini o'chirishni xohlaysizmi?
 CreateOneBillByThird=Uchinchi tomon uchun bitta hisob-faktura yarating (aks holda, buyurtma uchun bitta hisob-faktura)
 BillCreated=%s hisob-fakturasi (lar) yaratilgan
-BillXCreated=Invoice %s generated
-StatusOfGeneratedDocuments=Status of document generation
-DoNotGenerateDoc=Do not generate document file
-AutogenerateDoc=Auto generate document file
-AutoFillDateFrom=Set start date for service line with invoice date
-AutoFillDateFromShort=Set start date
-AutoFillDateTo=Set end date for service line with next invoice date
-AutoFillDateToShort=Set end date
-MaxNumberOfGenerationReached=Max number of gen. reached
-BILL_DELETEInDolibarr=Invoice deleted
-BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
-UnitPriceXQtyLessDiscount=Unit price x Qty - Discount
-CustomersInvoicesArea=Customer billing area
-SupplierInvoicesArea=Supplier billing area
-FacParentLine=Invoice Line Parent
-SituationTotalRayToRest=Remainder to pay without taxe
-PDFSituationTitle=Situation n° %d
-SituationTotalProgress=Total progress %d %%
-SearchUnpaidInvoicesWithDueDate=Search unpaid invoices with a due date = %s
+BillXCreated=%s hisob-fakturasi tuzildi
+StatusOfGeneratedDocuments=Hujjat yaratish holati
+DoNotGenerateDoc=Hujjat faylini yaratmang
+AutogenerateDoc=Hujjat faylini avtomatik yaratish
+AutoFillDateFrom=Hisob-faktura sanasi bilan xizmat ko'rsatish liniyasining boshlanish sanasini belgilang
+AutoFillDateFromShort=Boshlanish sanasini belgilang
+AutoFillDateTo=Xizmat liniyasining tugash sanasini keyingi hisob-kitob sanasi bilan belgilang
+AutoFillDateToShort=Tugash sanasini belgilang
+MaxNumberOfGenerationReached=Maksimum gen soni. yetdi
+BILL_DELETEInDolibarr=Hisob-faktura o'chirildi
+BILL_SUPPLIER_DELETEInDolibarr=Ta'minlovchining hisob-fakturasi o'chirildi
+UnitPriceXQtyLessDiscount=Birlik narxi x Miqdor - chegirma
+CustomersInvoicesArea=Mijozlarning hisob-kitob maydoni
+SupplierInvoicesArea=Ta'minlovchining hisob-kitob maydoni
+FacParentLine=Hisob-faktura satrining ota-onasi
+SituationTotalRayToRest=Soliqsiz to'lash uchun qoldiq
+PDFSituationTitle=Vaziyat n ° %d
+SituationTotalProgress=Jami taraqqiyot %d %%
+SearchUnpaidInvoicesWithDueDate=Belgilangan sana = %s bilan to'lanmagan hisob-fakturalarni qidiring
diff --git a/htdocs/langs/uz_UZ/blockedlog.lang b/htdocs/langs/uz_UZ/blockedlog.lang
index 0bba5605d0f..478a7fdc873 100644
--- a/htdocs/langs/uz_UZ/blockedlog.lang
+++ b/htdocs/langs/uz_UZ/blockedlog.lang
@@ -1,54 +1,54 @@
-BlockedLog=Unalterable Logs
-Field=Field
-BlockedLogDesc=This module tracks some events into an unalterable log (that you can't modify once recorded) into a block chain, in real time. This module provides compatibility with requirements of laws of some countries (like France with the law Finance 2016 - Norme NF525).
-Fingerprints=Archived events and fingerprints
-FingerprintsDesc=This is the tool to browse or extract the unalterable logs. Unalterable logs are generated and archived locally into a dedicated table, in real time when you record a business event. You can use this tool to export this archive and save it into an external support (some countries, like France, ask that you do it every year). Note that, there is no feature to purge this log and every change tried to be done directly into this log (by a hacker for example) will be reported with a non-valid fingerprint. If you really need to purge this table because you used your application for a demo/test purpose and want to clean your data to start your production, you can ask your reseller or integrator to reset your database (all your data will be removed).
-CompanyInitialKey=Company initial key (hash of genesis block)
-BrowseBlockedLog=Unalterable logs
-ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
-ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
-DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
-OkCheckFingerprintValidity=Archived log record is valid. The data on this line was not modified and the entry follows the previous one.
-OkCheckFingerprintValidityButChainIsKo=Archived log seems valid compared to previous one but the chain was corrupted previously.
-AddedByAuthority=Stored into remote authority
-NotAddedByAuthorityYet=Not yet stored into remote authority
-ShowDetails=Show stored details
-logPAYMENT_VARIOUS_CREATE=Payment (not assigned to an invoice) created
-logPAYMENT_VARIOUS_MODIFY=Payment (not assigned to an invoice) modified
-logPAYMENT_VARIOUS_DELETE=Payment (not assigned to an invoice) logical deletion
-logPAYMENT_ADD_TO_BANK=Payment added to bank
-logPAYMENT_CUSTOMER_CREATE=Customer payment created
-logPAYMENT_CUSTOMER_DELETE=Customer payment logical deletion
-logDONATION_PAYMENT_CREATE=Donation payment created
-logDONATION_PAYMENT_DELETE=Donation payment logical deletion
-logBILL_PAYED=Customer invoice paid
-logBILL_UNPAYED=Customer invoice set unpaid
-logBILL_VALIDATE=Customer invoice validated
-logBILL_SENTBYMAIL=Customer invoice send by mail
-logBILL_DELETE=Customer invoice logically deleted
-logMODULE_RESET=Module BlockedLog was disabled
-logMODULE_SET=Module BlockedLog was enabled
-logDON_VALIDATE=Donation validated
-logDON_MODIFY=Donation modified
-logDON_DELETE=Donation logical deletion
-logMEMBER_SUBSCRIPTION_CREATE=Member subscription created
-logMEMBER_SUBSCRIPTION_MODIFY=Member subscription modified
-logMEMBER_SUBSCRIPTION_DELETE=Member subscription logical deletion
-logCASHCONTROL_VALIDATE=Cash desk closing recording
-BlockedLogBillDownload=Customer invoice download
-BlockedLogBillPreview=Customer invoice preview
-BlockedlogInfoDialog=Log Details
-ListOfTrackedEvents=List of tracked events
-Fingerprint=Fingerprint
-DownloadLogCSV=Export archived logs (CSV)
-logDOC_PREVIEW=Preview of a validated document in order to print or download
-logDOC_DOWNLOAD=Download of a validated document in order to print or send
-DataOfArchivedEvent=Full datas of archived event
-ImpossibleToReloadObject=Original object (type %s, id %s) not linked (see 'Full datas' column to get unalterable saved data)
-BlockedLogAreRequiredByYourCountryLegislation=Unalterable Logs module may be required by the legislation of your country. Disabling this module may render any future transactions invalid with respect to the law and the use of legal software as they can not be validated by a tax audit.
-BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Unalterable Logs module was activated because of the legislation of your country. Disabling this module may render any future transactions invalid with respect to the law and the use of legal software as they cannot be validated by a tax audit.
-BlockedLogDisableNotAllowedForCountry=List of countries where usage of this module is mandatory (just to prevent to disable the module by error, if your country is in this list, disable of module is not possible without editing this list first. Note also that enabling/disabling this module will keep a track into the unalterable log).
-OnlyNonValid=Non-valid
-TooManyRecordToScanRestrictFilters=Too many records to scan/analyze. Please restrict list with more restrictive filters.
-RestrictYearToExport=Restrict month / year to export
+BlockedLog=O'zgarishsiz jurnallar
+Field=Maydon
+BlockedLogDesc=Ushbu modul ba'zi voqealarni o'zgartirilishi mumkin bo'lmagan jurnalga (yozib olingandan keyin o'zgartirish mumkin emas) blok zanjiriga real vaqt rejimida olib boradi. Ushbu modul ba'zi mamlakatlarning qonunlari talablariga muvofiqligini ta'minlaydi (masalan, Frantsiya Finance 2016 - Norme NF525 qonuni bilan).
+Fingerprints=Arxivlangan voqealar va barmoq izlari
+FingerprintsDesc=Bu o'zgarmas jurnallarni ko'rib chiqish yoki chiqarib olish uchun vosita. O'zgarmas jurnallar ishlab chiqarilgan va arxivlangan bo'lib, maxsus jadvalga, ishbilarmonlik voqeasini yozib olganingizda real vaqtda. Ushbu vositadan ushbu arxivni eksport qilish va tashqi yordamga saqlash uchun foydalanishingiz mumkin (ba'zi mamlakatlar, masalan Frantsiya, buni har yili qilishingizni so'raydi). Shuni esda tutingki, ushbu jurnalni tozalash xususiyati yo'q va to'g'ridan-to'g'ri ushbu jurnalga kiritishga urinilgan har qanday o'zgarish (masalan, xaker tomonidan) yaroqsiz barmoq izi bilan xabar qilinadi. Agar siz ushbu dasturni demo / test maqsadida ishlatganingiz va ishlab chiqarishni boshlash uchun ma'lumotlaringizni tozalashni xohlaganingiz uchun ushbu jadvalni tozalashingiz kerak bo'lsa, sotuvchingiz yoki integratoringizdan ma'lumotlar bazasini qayta tiklashini so'rashingiz mumkin (barcha ma'lumotlar o'chiriladi).
+CompanyInitialKey=Kompaniyaning boshlang'ich kaliti (genez blokining xeshi)
+BrowseBlockedLog=O'zgarishsiz jurnallar
+ShowAllFingerPrintsMightBeTooLong=Barcha arxivlangan jurnallarni ko'rsatish (uzoq bo'lishi mumkin)
+ShowAllFingerPrintsErrorsMightBeTooLong=Barcha yaroqsiz arxiv jurnallarini ko'rsatish (uzoq bo'lishi mumkin)
+DownloadBlockChain=Barmoq izlarini yuklab oling
+KoCheckFingerprintValidity=Arxivlangan jurnal yozuvi haqiqiy emas. Bu shuni anglatadiki, kimdir (xaker?) Ushbu yozuvning ba'zi ma'lumotlarini yozib olingandan keyin o'zgartirgan yoki oldingi arxivlangan yozuvni o'chirib tashlagan (ushbu satrni oldingi # mavjudligini tekshiring) yoki oldingi yozuvning chegara summasini o'zgartirgan.
+OkCheckFingerprintValidity=Arxivlangan jurnal qaydlari haqiqiydir. Ushbu satrdagi ma'lumotlar o'zgartirilmadi va yozuv avvalgisiga amal qiladi.
+OkCheckFingerprintValidityButChainIsKo=Arxivlangan jurnal avvalgisiga nisbatan haqiqiy ko'rinadi, ammo ilgari zanjir buzilgan.
+AddedByAuthority=Masofaviy hokimiyatda saqlanadi
+NotAddedByAuthorityYet=Hali ham uzoqdan saqlanadigan joyda saqlanmagan
+ShowDetails=Saqlangan ma'lumotlarni ko'rsatish
+logPAYMENT_VARIOUS_CREATE=To'lov (hisob-fakturaga tayinlanmagan) yaratilgan
+logPAYMENT_VARIOUS_MODIFY=To'lov o'zgartirildi (hisob-fakturaga tayinlanmagan)
+logPAYMENT_VARIOUS_DELETE=To'lov (hisob-fakturaga tayinlanmagan) mantiqiy o'chirish
+logPAYMENT_ADD_TO_BANK=To'lov bankka qo'shildi
+logPAYMENT_CUSTOMER_CREATE=Mijozlar to'lovi yaratildi
+logPAYMENT_CUSTOMER_DELETE=Mijozlar to'lovlarini mantiqiy o'chirish
+logDONATION_PAYMENT_CREATE=Xayriya to'lovi yaratildi
+logDONATION_PAYMENT_DELETE=Xayriya to'lovini mantiqiy o'chirish
+logBILL_PAYED=Mijozlarning hisob-fakturasi to'landi
+logBILL_UNPAYED=Mijozlarning hisob-fakturasi to'lanmagan
+logBILL_VALIDATE=Mijozlarning hisob-fakturasi tasdiqlangan
+logBILL_SENTBYMAIL=Mijozlarning hisob-fakturasini pochta orqali yuborish
+logBILL_DELETE=Mijozlarning hisob-kitobi mantiqan o'chirildi
+logMODULE_RESET=BlockedLog moduli o'chirilgan
+logMODULE_SET=BlockedLog moduli yoqildi
+logDON_VALIDATE=Xayriya tasdiqlandi
+logDON_MODIFY=Xayriya tahrirlangan
+logDON_DELETE=Xayriyani mantiqiy o'chirish
+logMEMBER_SUBSCRIPTION_CREATE=Ro'yxatdan obuna yaratildi
+logMEMBER_SUBSCRIPTION_MODIFY=A'zo obunasi o'zgartirildi
+logMEMBER_SUBSCRIPTION_DELETE=Ro'yxatdan obuna mantiqiy o'chirish
+logCASHCONTROL_VALIDATE=Yopiq kassa yozuvlari
+BlockedLogBillDownload=Mijozlarning hisob-fakturasini yuklab olish
+BlockedLogBillPreview=Xaridorlarning hisob-fakturasini oldindan ko'rish
+BlockedlogInfoDialog=Jurnal ma'lumotlari
+ListOfTrackedEvents=Kuzatilgan voqealar ro'yxati
+Fingerprint=Barmoq izi
+DownloadLogCSV=Arxivlangan jurnallarni eksport qilish (CSV)
+logDOC_PREVIEW=Bosib chiqarish yoki yuklab olish uchun tasdiqlangan hujjatni oldindan ko'rish
+logDOC_DOWNLOAD=Bosib chiqarish yoki yuborish uchun tasdiqlangan hujjatni yuklab olish
+DataOfArchivedEvent=Arxivlangan tadbirning to'liq ma'lumotlari
+ImpossibleToReloadObject=Asl ob'ekt (%s yozing, id %s) bog'lanmagan (o'zgartirilmaydigan saqlangan ma'lumotlarni olish uchun 'To'liq ma'lumotlar' ustuniga qarang)
+BlockedLogAreRequiredByYourCountryLegislation=O'zgarmas jurnallar moduli mamlakatingiz qonunchiligida talab qilinishi mumkin. Ushbu modulni o'chirib qo'yish kelajakdagi har qanday operatsiyalarni qonun va huquqiy dasturiy ta'minotdan foydalanishga yaroqsiz holga keltirishi mumkin, chunki ularni soliq tekshiruvi tasdiqlashi mumkin emas.
+BlockedLogActivatedBecauseRequiredByYourCountryLegislation=O'zgarmas jurnallar moduli sizning mamlakatingiz qonunchiligi tufayli faollashtirildi. Ushbu modulni o'chirib qo'yish kelajakdagi har qanday operatsiyalarni qonunchilikka va huquqiy dasturiy ta'minotdan foydalanishga yaroqsiz holga keltirishi mumkin, chunki ular soliq tekshiruvi tomonidan tasdiqlanishi mumkin emas.
+BlockedLogDisableNotAllowedForCountry=Ushbu moduldan foydalanish majburiy bo'lgan mamlakatlar ro'yxati (modulni xato bilan o'chirib qo'ymaslik uchun, agar sizning mamlakatingiz ushbu ro'yxatda bo'lsa, avval ushbu ro'yxatni tahrir qilmasdan modulni o'chirib qo'yish mumkin emas. Shuni ham unutmangki, ushbu modulni yoqish / o'chirish o'zgarmas jurnalga kuzatib boring).
+OnlyNonValid=Yaroqsiz
+TooManyRecordToScanRestrictFilters=Skanerlash / tahlil qilish uchun juda ko'p yozuvlar. Iltimos, cheklovli filtrlar bilan ro'yxatni cheklang.
+RestrictYearToExport=Eksport qilish uchun oyni / yilni cheklang
diff --git a/htdocs/langs/uz_UZ/bookmarks.lang b/htdocs/langs/uz_UZ/bookmarks.lang
index ee1ba4fb8e3..bf4c65210ff 100644
--- a/htdocs/langs/uz_UZ/bookmarks.lang
+++ b/htdocs/langs/uz_UZ/bookmarks.lang
@@ -2,8 +2,8 @@
 AddThisPageToBookmarks=Xatcho'plarga joriy sahifani qo'shing
 Bookmark=Xatcho'p
 Bookmarks=Xatcho'plar
-ListOfBookmarks=List of bookmarks
-EditBookmarks=List/edit bookmarks
+ListOfBookmarks=Xatcho'plar ro'yxati
+EditBookmarks=Xatcho'plarni ro'yxatlash / tahrirlash
 NewBookmark=Yangi xatcho'p
 ShowBookmark=Xatcho'pni ko'rsatish
 OpenANewWindow=Yangi yorliqni oching
diff --git a/htdocs/langs/uz_UZ/boxes.lang b/htdocs/langs/uz_UZ/boxes.lang
index b17d8c0b18e..7e4ed8cbf8a 100644
--- a/htdocs/langs/uz_UZ/boxes.lang
+++ b/htdocs/langs/uz_UZ/boxes.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - boxes
-BoxDolibarrStateBoard=Statistics on main business objects in database
-BoxLoginInformation=Login Information
+BoxDolibarrStateBoard=Ma'lumotlar bazasidagi asosiy biznes ob'ektlari bo'yicha statistika
+BoxLoginInformation=Kirish haqida ma'lumot
 BoxLastRssInfos=RSS haqida ma'lumot
 BoxLastProducts=Eng so'nggi %s mahsulotlari / xizmatlari
 BoxProductsAlertStock=Mahsulotlar uchun birja ogohlantirishlari
@@ -18,13 +18,13 @@ BoxLastActions=Oxirgi harakatlar
 BoxLastContracts=Oxirgi shartnomalar
 BoxLastContacts=So'nggi kontaktlar / manzillar
 BoxLastMembers=Oxirgi a'zolar
-BoxLastModifiedMembers=Latest modified members
-BoxLastMembersSubscriptions=Latest member subscriptions
+BoxLastModifiedMembers=Oxirgi o'zgartirilgan a'zolar
+BoxLastMembersSubscriptions=Eng so'nggi obuna obunalari
 BoxFicheInter=Oxirgi tadbirlar
 BoxCurrentAccounts=Hisob balansini oching
-BoxTitleMemberNextBirthdays=Birthdays of this month (members)
-BoxTitleMembersByType=Members by type
-BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
+BoxTitleMemberNextBirthdays=Ushbu oyning tug'ilgan kunlari (a'zolar)
+BoxTitleMembersByType=A'zolar turlari bo'yicha
+BoxTitleMembersSubscriptionsByYear=A'zolar obunalari yil bo'yicha
 BoxTitleLastRssInfos=Latest %s news from %s
 BoxTitleLastProducts=Mahsulotlar / xizmatlar: oxirgi %s o'zgartirilgan
 BoxTitleProductsAlertStock=Mahsulotlar: aktsiyalar to'g'risida ogohlantirish
@@ -40,7 +40,7 @@ BoxTitleLastFicheInter=Oxirgi %s o'zgartirilgan aralashuvlar
 BoxTitleOldestUnpaidCustomerBills=Mijozlarning hisob-fakturalari: eng qadimgi %s to'lanmagan
 BoxTitleOldestUnpaidSupplierBills=Sotuvchi fakturalari: eng qadimgi %s to'lanmagan
 BoxTitleCurrentAccounts=Ochiq hisoblar: qoldiqlar
-BoxTitleSupplierOrdersAwaitingReception=Supplier orders awaiting reception
+BoxTitleSupplierOrdersAwaitingReception=Qabul qilishni kutayotgan etkazib beruvchilar buyurtmalari
 BoxTitleLastModifiedContacts=Aloqa / manzillar: oxirgi marta o'zgartirilgan %s
 BoxMyLastBookmarks=Xatcho'plar: so'nggi %s
 BoxOldestExpiredServices=Muddati tugagan eng qadimgi faol xizmatlar
@@ -49,14 +49,14 @@ BoxTitleLastActionsToDo=Oxirgi %s amallari
 BoxTitleLastContracts=O'zgartirilgan so'nggi %s shartnomalari
 BoxTitleLastModifiedDonations=O'zgartirilgan so'nggi %s xayriya mablag'lari
 BoxTitleLastModifiedExpenses=Oxirgi %s xarajatlar hisoboti o'zgartirildi
-BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
-BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
-BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
+BoxTitleLatestModifiedBoms=O'zgartirilgan so'nggi %s BOM-lar
+BoxTitleLatestModifiedMos=O'zgartirilgan so'nggi %s ishlab chiqarish buyurtmalari
+BoxTitleLastOutstandingBillReached=Eng yuqori darajadagi mijozlar oshib ketdi
 BoxGlobalActivity=Global faoliyat (hisob-fakturalar, takliflar, buyurtmalar)
 BoxGoodCustomers=Yaxshi mijozlar
 BoxTitleGoodCustomers=%s Yaxshi mijozlar
-BoxScheduledJobs=Scheduled jobs
-BoxTitleFunnelOfProspection=Lead funnel
+BoxScheduledJobs=Rejalashtirilgan ish joylari
+BoxTitleFunnelOfProspection=Qo'rg'oshin huni
 FailedToRefreshDataInfoNotUpToDate=RSS oqimini yangilab bo'lmadi. Oxirgi muvaffaqiyatli yangilanish sanasi: %s
 LastRefreshDate=Oxirgi yangilanish sanasi
 NoRecordedBookmarks=Xatcho'plar aniqlanmagan.
@@ -76,7 +76,7 @@ NoContractedProducts=Hech qanday mahsulot / xizmat bilan shartnoma tuzilmagan
 NoRecordedContracts=Yozilgan shartnomalar yo'q
 NoRecordedInterventions=Yozilgan aralashuvlar yo'q
 BoxLatestSupplierOrders=Oxirgi sotib olish buyurtmalari
-BoxLatestSupplierOrdersAwaitingReception=Latest Purchase Orders (with a pending reception)
+BoxLatestSupplierOrdersAwaitingReception=Sotib olish bo'yicha so'nggi buyurtmalar (kutish kutilayotgan holda)
 NoSupplierOrder=Sotib olish to'g'risida yozilgan buyurtma yo'q
 BoxCustomersInvoicesPerMonth=Mijozlarning oyiga hisob-fakturalari
 BoxSuppliersInvoicesPerMonth=Oyiga sotuvchi fakturalar
@@ -85,36 +85,36 @@ BoxSuppliersOrdersPerMonth=Oyiga sotuvchi buyurtmalari
 BoxProposalsPerMonth=Oyiga takliflar
 NoTooLowStockProducts=Hech qanday mahsulot past stok cheklovida emas
 BoxProductDistribution=Mahsulotlar / xizmatlarni tarqatish
-ForObject=On %s
+ForObject=%s da
 BoxTitleLastModifiedSupplierBills=Sotuvchi hisob-fakturalari: oxirgi %s o'zgartirilgan
 BoxTitleLatestModifiedSupplierOrders=Sotuvchi buyurtmalari: oxirgi %s o'zgartirilgan
 BoxTitleLastModifiedCustomerBills=Mijozlarning hisob-fakturalari: oxirgi %s o'zgartirilgan
 BoxTitleLastModifiedCustomerOrders=Sotish bo'yicha buyurtmalar: oxirgi %s o'zgartirilgan
 BoxTitleLastModifiedPropals=Oxirgi %s o'zgartirilgan takliflar
-BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
-BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
+BoxTitleLatestModifiedJobPositions=Latest %s modified job positions
+BoxTitleLatestModifiedCandidatures=Latest %s modified job applications
 ForCustomersInvoices=Mijozlarning hisob-fakturalari
 ForCustomersOrders=Mijozlar buyurtma berishadi
 ForProposals=Takliflar
 LastXMonthRolling=%s oylik eng so'nggi oylik
 ChooseBoxToAdd=Vidjetni boshqaruv panelingizga qo'shing
-BoxAdded=Widget was added in your dashboard
-BoxTitleUserBirthdaysOfMonth=Birthdays of this month (users)
-BoxLastManualEntries=Latest record in accountancy entered manually or without source document
-BoxTitleLastManualEntries=%s latest record entered manually or without source document
-NoRecordedManualEntries=No manual entries record in accountancy
-BoxSuspenseAccount=Count accountancy operation with suspense account
-BoxTitleSuspenseAccount=Number of unallocated lines
-NumberOfLinesInSuspenseAccount=Number of line in suspense account
-SuspenseAccountNotDefined=Suspense account isn't defined
-BoxLastCustomerShipments=Last customer shipments
-BoxTitleLastCustomerShipments=Latest %s customer shipments
-NoRecordedShipments=No recorded customer shipment
-BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
+BoxAdded=Vidjet sizning boshqaruv panelingizga qo'shildi
+BoxTitleUserBirthdaysOfMonth=Ushbu oyning tug'ilgan kunlari (foydalanuvchilar)
+BoxLastManualEntries=Buxgalteriya hisobidagi so'nggi yozuv qo'lda yoki dastlabki hujjatsiz kiritilgan
+BoxTitleLastManualEntries=%s eng so'nggi yozuv qo'lda yoki manba hujjatsiz kiritilgan
+NoRecordedManualEntries=Buxgalteriyada qo'lda yozuvlar yozilmagan
+BoxSuspenseAccount=Buxgalteriya hisobini to'xtatib qo'yilgan hisob bilan hisoblash
+BoxTitleSuspenseAccount=Ajratilmagan chiziqlar soni
+NumberOfLinesInSuspenseAccount=To'xtatilgan hisobdagi satr soni
+SuspenseAccountNotDefined=To'xtatilgan hisob qaydnomasi aniqlanmadi
+BoxLastCustomerShipments=Mijozlarning so'nggi jo'natmalari
+BoxTitleLastCustomerShipments=%s mijozlarining so'nggi jo'natmalari
+NoRecordedShipments=Mijozlarni ro'yxatdan o'tkazish bo'yicha ro'yxatdan o'tkazilmagan
+BoxCustomersOutstandingBillReached=Ostanding limitiga ega mijozlar yetib kelishdi
 # Pages
-UsersHome=Home users and groups
-MembersHome=Home Membership
-ThirdpartiesHome=Home Thirdparties
-TicketsHome=Home Tickets
-AccountancyHome=Home Accountancy
-ValidatedProjects=Validated projects
+UsersHome=Uy foydalanuvchilari va guruhlari
+MembersHome=Uyga a'zolik
+ThirdpartiesHome=Uyning uchinchi tomonlari
+TicketsHome=Uy chiptalari
+AccountancyHome=Uy hisobi
+ValidatedProjects=Tasdiqlangan loyihalar
diff --git a/htdocs/langs/uz_UZ/cashdesk.lang b/htdocs/langs/uz_UZ/cashdesk.lang
index d162830a17d..1a12e00f821 100644
--- a/htdocs/langs/uz_UZ/cashdesk.lang
+++ b/htdocs/langs/uz_UZ/cashdesk.lang
@@ -16,7 +16,7 @@ AddThisArticle=Ushbu maqolani qo'shing
 RestartSelling=Sotishga qaytib boring
 SellFinished=Sotish yakunlandi
 PrintTicket=Chiptani chop eting
-SendTicket=Send ticket
+SendTicket=Chipta yuboring
 NoProductFound=Maqola topilmadi
 ProductFound=mahsulot topildi
 NoArticle=Maqola yo'q
@@ -33,98 +33,98 @@ DeleteArticle=Ushbu maqolani olib tashlash uchun bosing
 FilterRefOrLabelOrBC=Qidiruv (Ref / Yorliq)
 UserNeedPermissionToEditStockToUsePos=Hisob-fakturani yaratishda zaxiralarni kamaytirishni so'raysiz, shuning uchun POS-dan foydalanuvchi aktsiyalarni tahrirlash uchun ruxsatga ega bo'lishi kerak.
 DolibarrReceiptPrinter=Dolibarr qabul qilish printeri
-PointOfSale=Point of Sale
+PointOfSale=Savdo punkti
 PointOfSaleShort=POS
-CloseBill=Close Bill
-Floors=Floors
-Floor=Floor
-AddTable=Add table
-Place=Place
-TakeposConnectorNecesary='TakePOS Connector' required
-OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
-NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser:
-SearchProduct=Search product
-Receipt=Receipt
-Header=Header
-Footer=Footer
-AmountAtEndOfPeriod=Amount at end of period (day, month or year)
-TheoricalAmount=Theorical amount
-RealAmount=Real amount
-CashFence=Cash desk closing
-CashFenceDone=Cash desk closing done for the period
-NbOfInvoices=Nb of invoices
-Paymentnumpad=Type of Pad to enter payment
+CloseBill=Billni yoping
+Floors=Qavatlar
+Floor=Qavat
+AddTable=Jadval qo'shish
+Place=Joy
+TakeposConnectorNecesary='TakePOS ulagichi' talab qilinadi
+OrderPrinters=Buyurtmani ba'zi bir printerlarga to'lashsiz yuborish uchun tugmani qo'shing (masalan, buyurtmani oshxonaga yuborish uchun)
+NotAvailableWithBrowserPrinter=Qabul qilish uchun printer brauzerga o'rnatilganda mavjud emas:
+SearchProduct=Mahsulotni qidirish
+Receipt=Qabul qilish
+Header=Sarlavha
+Footer=Altbilgi
+AmountAtEndOfPeriod=Davr oxiridagi summa (kun, oy yoki yil)
+TheoricalAmount=Nazariy miqdor
+RealAmount=Haqiqiy miqdor
+CashFence=Kassa yopilmoqda
+CashFenceDone=Ushbu davr uchun kassa yopilishi amalga oshirildi
+NbOfInvoices=Nb-fakturalar
+Paymentnumpad=To'lovni kiritish uchun maydonchaning turi
 Numberspad=Numbers Pad
-BillsCoinsPad=Coins and banknotes Pad
-DolistorePosCategory=TakePOS modules and other POS solutions for Dolibarr
-TakeposNeedsCategories=TakePOS needs at least one product categorie to work
-TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS needs at least 1 product category under the category <b>%s</b> to work
-OrderNotes=Can add some notes to each ordered items
-CashDeskBankAccountFor=Default account to use for payments in
-NoPaimementModesDefined=No paiment mode defined in TakePOS configuration
-TicketVatGrouped=Group VAT by rate in tickets|receipts
-AutoPrintTickets=Automatically print tickets|receipts
-PrintCustomerOnReceipts=Print customer on tickets|receipts
-EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
-ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
-ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ?
-History=History
-ValidateAndClose=Validate and close
+BillsCoinsPad=Tangalar va banknotalar Pad
+DolistorePosCategory=Dolibarr uchun TakePOS modullari va boshqa POS echimlari
+TakeposNeedsCategories=TakePOS-da ishlash uchun kamida bitta mahsulot turkumi kerak
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS-ga <b> %s </b> toifasida kamida 1 ta mahsulot toifasi kerak.
+OrderNotes=Har bir buyurtma qilingan narsalarga bir nechta eslatmalarni qo'shishi mumkin
+CashDeskBankAccountFor=To'lovlar uchun foydalaniladigan standart hisob
+NoPaimementModesDefined=TakePOS konfiguratsiyasida paiment rejimi aniqlanmagan
+TicketVatGrouped=QQS chiptalar bo'yicha stavkalar bo'yicha guruhlangan | tushumlar
+AutoPrintTickets=Chiptalarni avtomatik ravishda bosib chiqarish | kvitansiyalar
+PrintCustomerOnReceipts=Mijozni chiptalarga chop etish | kvitansiyalar
+EnableBarOrRestaurantFeatures=Bar yoki restoran uchun xususiyatlarni yoqish
+ConfirmDeletionOfThisPOSSale=Ushbu joriy savdo o'chirilishini tasdiqlaysizmi?
+ConfirmDiscardOfThisPOSSale=Ushbu sotuvni bekor qilmoqchimisiz?
+History=Tarix
+ValidateAndClose=Tasdiqlang va yoping
 Terminal=Terminal
-NumberOfTerminals=Number of Terminals
-TerminalSelect=Select terminal you want to use:
-POSTicket=POS Ticket
-POSTerminal=POS Terminal
-POSModule=POS Module
-BasicPhoneLayout=Use basic layout for phones
-SetupOfTerminalNotComplete=Setup of terminal %s is not complete
-DirectPayment=Direct payment
-DirectPaymentButton=Add a "Direct cash payment" button
-InvoiceIsAlreadyValidated=Invoice is already validated
-NoLinesToBill=No lines to bill
-CustomReceipt=Custom Receipt
-ReceiptName=Receipt Name
-ProductSupplements=Manage supplements of products
-SupplementCategory=Supplement category
-ColorTheme=Color theme
-Colorful=Colorful
-HeadBar=Head Bar
-SortProductField=Field for sorting products
-Browser=Browser
-BrowserMethodDescription=Simple and easy receipt printing. Only a few parameters to configure the receipt. Print via browser.
-TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud.
-PrintMethod=Print method
-ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. The server hosting the application can't be in the Cloud (must be able to reach the printers in your network).
-ByTerminal=By terminal
-TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
-CashDeskRefNumberingModules=Numbering module for POS sales
-CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
-TakeposGroupSameProduct=Group same products lines
-StartAParallelSale=Start a new parallel sale
-SaleStartedAt=Sale started at %s
-ControlCashOpening=Open the "Control cash" popup when opening the POS
-CloseCashFence=Close cash desk control
-CashReport=Cash report
-MainPrinterToUse=Main printer to use
-OrderPrinterToUse=Order printer to use
-MainTemplateToUse=Main template to use
-OrderTemplateToUse=Order template to use
-BarRestaurant=Bar Restaurant
-AutoOrder=Order by the customer himself
-RestaurantMenu=Menu
-CustomerMenu=Customer menu
-ScanToMenu=Scan QR code to see the menu
-ScanToOrder=Scan QR code to order
-Appearance=Appearance
-HideCategoryImages=Hide Category Images
-HideProductImages=Hide Product Images
-NumberOfLinesToShow=Number of lines of images to show
-DefineTablePlan=Define tables plan
-GiftReceiptButton=Add a "Gift receipt" button
-GiftReceipt=Gift receipt
-ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
-AllowDelayedPayment=Allow delayed payment
-PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
-WeighingScale=Weighing scale
-ShowPriceHT = Display the column with the price excluding tax (on screen)
-ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
+NumberOfTerminals=Terminallar soni
+TerminalSelect=Siz foydalanmoqchi bo'lgan terminalni tanlang:
+POSTicket=POS chiptasi
+POSTerminal=POS terminali
+POSModule=POS moduli
+BasicPhoneLayout=Telefonlar uchun asosiy tartibdan foydalaning
+SetupOfTerminalNotComplete=%s terminalini sozlash tugallanmagan
+DirectPayment=To'g'ridan-to'g'ri to'lov
+DirectPaymentButton="To'g'ridan-to'g'ri naqd to'lov" tugmachasini qo'shing
+InvoiceIsAlreadyValidated=Hisob-faktura allaqachon tasdiqlangan
+NoLinesToBill=Hisob-kitob qilish uchun chiziqlar yo'q
+CustomReceipt=Maxsus kvitansiya
+ReceiptName=Kvitansiya nomi
+ProductSupplements=Mahsulot qo'shimchalarini boshqaring
+SupplementCategory=Qo'shimcha toifasi
+ColorTheme=Rang mavzusi
+Colorful=Rangli
+HeadBar=Bosh bar
+SortProductField=Mahsulotlarni saralash uchun maydon
+Browser=Brauzer
+BrowserMethodDescription=Oddiy va oson kvitansiyani bosib chiqarish. Kvitansiyani sozlash uchun faqat bir nechta parametrlar. Brauzer orqali chop etish.
+TakeposConnectorMethodDescription=Qo'shimcha funktsiyalarga ega tashqi modul. Bulutdan chop etish uchun qulaylik.
+PrintMethod=Bosib chiqarish usuli
+ReceiptPrinterMethodDescription=Ko'p parametrlarga ega kuchli usul. Shablonlar bilan to'liq moslashtiriladi. Ilovani joylashtiruvchi server Bulutda bo'lishi mumkin emas (tarmoqdagi printerlarga etib borishi kerak).
+ByTerminal=Terminal orqali
+TakeposNumpadUsePaymentIcon=Numpad-ning to'lov tugmachalarida matn o'rniga belgini ishlating
+CashDeskRefNumberingModules=POS sotish uchun raqamlash moduli
+CashDeskGenericMaskCodes6 =  <br> <b> {TN} </b> yorlig'i terminal raqamini qo'shish uchun ishlatiladi
+TakeposGroupSameProduct=Bir xil mahsulot qatorlarini guruhlang
+StartAParallelSale=Yangi parallel sotuvni boshlang
+SaleStartedAt=Savdo %s da boshlandi
+ControlCashOpening=POS-ni ochishda "Naqd pulni boshqarish" popupini oching
+CloseCashFence=Kassa boshqaruvini yoping
+CashReport=Naqd hisobot
+MainPrinterToUse=Foydalanadigan asosiy printer
+OrderPrinterToUse=Printerdan foydalanishga buyurtma bering
+MainTemplateToUse=Foydalanish uchun asosiy shablon
+OrderTemplateToUse=Foydalanish uchun shablonni buyurtma qiling
+BarRestaurant=Bar restorani
+AutoOrder=Buyurtmachining o'zi buyurtma qiladi
+RestaurantMenu=Menyu
+CustomerMenu=Mijozlar menyusi
+ScanToMenu=Menyuni ko'rish uchun QR kodini skanerlang
+ScanToOrder=Buyurtma uchun QR kodni skanerlang
+Appearance=Tashqi ko'rinishi
+HideCategoryImages=Turkum rasmlarini yashirish
+HideProductImages=Mahsulot rasmlarini yashirish
+NumberOfLinesToShow=Ko'rsatiladigan rasmlarning soni
+DefineTablePlan=Jadvallar rejasini aniqlang
+GiftReceiptButton="Sovg'a kvitansiyasi" tugmachasini qo'shing
+GiftReceipt=Sovg'a kvitansiyasi
+ModuleReceiptPrinterMustBeEnabled=Avval modulni qabul qilish printeri yoqilgan bo'lishi kerak
+AllowDelayedPayment=Kechiktirilgan to'lovga ruxsat berish
+PrintPaymentMethodOnReceipts=To'lov usulini chiptalarga chop eting | kvitansiyalar
+WeighingScale=Tarozi o'lchovi
+ShowPriceHT = Ustunni narxni soliqsiz hisobga olgan holda ko'rsatish (ekranda)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on the receipt)
diff --git a/htdocs/langs/uz_UZ/categories.lang b/htdocs/langs/uz_UZ/categories.lang
index 5a0d2180920..b6640ad20fb 100644
--- a/htdocs/langs/uz_UZ/categories.lang
+++ b/htdocs/langs/uz_UZ/categories.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - categories
 Rubrique=Tag / toifali
 Rubriques=Teglar / toifalar
-RubriquesTransactions=Tags/Categories of transactions
+RubriquesTransactions=Bitimlar teglari / toifalari
 categories=teglar / toifalar
 NoCategoryYet=Ushbu turdagi yorliq / toifalar yaratilmagan
 In=Yilda
@@ -16,10 +16,10 @@ MembersCategoriesArea=Ro'yxatdan teglar / toifalar maydoni
 ContactsCategoriesArea=Aloqa teglari / toifalari maydoni
 AccountsCategoriesArea=Bank hisobvarag'i teglari / toifalari maydoni
 ProjectsCategoriesArea=Loyiha teglari / toifalari maydoni
-UsersCategoriesArea=User tags/categories area
+UsersCategoriesArea=Foydalanuvchi teglari / toifalari maydoni
 SubCats=Kichik toifalar
 CatList=Teglar / toifalar ro'yxati
-CatListAll=List of tags/categories (all types)
+CatListAll=Teglar / toifalar ro'yxati (barcha turlari)
 NewCategory=Yangi teg / turkum
 ModifCat=Teg / toifani o'zgartiring
 CatCreated=Tag / kategoriya yaratildi
@@ -62,38 +62,38 @@ MembersCategoriesShort=A'zolar teglari / toifalari
 ContactCategoriesShort=Aloqa teglari / toifalari
 AccountsCategoriesShort=Hisob teglari / toifalari
 ProjectsCategoriesShort=Loyihalar teglari / toifalari
-UsersCategoriesShort=Users tags/categories
-StockCategoriesShort=Warehouse tags/categories
-ThisCategoryHasNoItems=This category does not contain any items.
+UsersCategoriesShort=Foydalanuvchilar teglari / toifalari
+StockCategoriesShort=Ombor teglari / toifalari
+ThisCategoryHasNoItems=Ushbu turkumda biron bir narsa mavjud emas.
 CategId=Tag / kategoriya identifikatori
-ParentCategory=Parent tag/category
-ParentCategoryLabel=Label of parent tag/category
+ParentCategory=Ota-ona yorlig'i / toifasi
+ParentCategoryLabel=Ota-ona yorlig'i / toifasi yorlig'i
 CatSupList=Sotuvchilar teglari / toifalari ro'yxati
 CatCusList=Mijozlar ro'yxati / istiqbollari teglari / toifalari
 CatProdList=Mahsulot teglari / toifalari ro'yxati
 CatMemberList=A'zolar teglari / toifalari ro'yxati
 CatContactList=Kontakt teglari / toifalari ro'yxati
-CatProjectsList=List of projects tags/categories
-CatUsersList=List of users tags/categories
+CatProjectsList=Loyihalar teglari / toifalari ro'yxati
+CatUsersList=Foydalanuvchilar teglari / toifalari ro'yxati
 CatSupLinks=Sotuvchilar va teglar / toifalar o'rtasidagi aloqalar
 CatCusLinks=Mijozlar / istiqbollar va teglar / toifalar o'rtasidagi aloqalar
-CatContactsLinks=Links between contacts/addresses and tags/categories
+CatContactsLinks=Kontaktlar / manzillar va teglar / toifalar o'rtasidagi aloqalar
 CatProdLinks=Mahsulotlar / xizmatlar va teglar / toifalar o'rtasidagi aloqalar
-CatMembersLinks=Links between members and tags/categories
-CatProjectsLinks=Links between projects and tags/categories
-CatUsersLinks=Links between users and tags/categories
+CatMembersLinks=A'zolar va teglar / toifalar o'rtasidagi aloqalar
+CatProjectsLinks=Loyihalar va teglar / toifalar o'rtasidagi aloqalar
+CatUsersLinks=Foydalanuvchilar va teglar / toifalar o'rtasidagi aloqalar
 DeleteFromCat=Teglardan / toifadan olib tashlash
 ExtraFieldsCategories=Bir-birini to'ldiruvchi atributlar
 CategoriesSetup=Teglar / toifalarni sozlash
 CategorieRecursiv=Ota-ona yorlig'i / toifasi bilan avtomatik ravishda bog'lanish
 CategorieRecursivHelp=Agar parametr yoniq bo'lsa, mahsulotni pastki toifaga qo'shganda, mahsulot ota-onalar toifasiga qo'shiladi.
 AddProductServiceIntoCategory=Quyidagi mahsulot / xizmatni qo'shing
-AddCustomerIntoCategory=Assign category to customer
-AddSupplierIntoCategory=Assign category to supplier
+AddCustomerIntoCategory=Mijozga toifani tayinlang
+AddSupplierIntoCategory=Yetkazib beruvchiga toifani tayinlang
 ShowCategory=Teg / toifani ko'rsatish
 ByDefaultInList=Odatiy bo'lib, ro'yxatda
-ChooseCategory=Choose category
-StocksCategoriesArea=Warehouse Categories
-ActionCommCategoriesArea=Event Categories
-WebsitePagesCategoriesArea=Page-Container Categories
-UseOrOperatorForCategories=Use 'OR' operator for categories
+ChooseCategory=Toifani tanlang
+StocksCategoriesArea=Ombor toifalari
+ActionCommCategoriesArea=Voqealar toifalari
+WebsitePagesCategoriesArea=Sahifa konteynerlari toifalari
+UseOrOperatorForCategories=Kategoriyalar uchun 'OR' operatoridan foydalaning
diff --git a/htdocs/langs/uz_UZ/commercial.lang b/htdocs/langs/uz_UZ/commercial.lang
index edefeaf6e95..f5a79674ddc 100644
--- a/htdocs/langs/uz_UZ/commercial.lang
+++ b/htdocs/langs/uz_UZ/commercial.lang
@@ -19,7 +19,7 @@ ShowTask=Vazifani ko'rsatish
 ShowAction=Tadbirni ko'rsatish
 ActionsReport=Voqealar to'g'risida hisobot
 ThirdPartiesOfSaleRepresentative=Savdo vakili bilan uchinchi shaxslar
-SaleRepresentativesOfThirdParty=Sales representatives of third party
+SaleRepresentativesOfThirdParty=Uchinchi tomonning savdo vakillari
 SalesRepresentative=Savdo bo'yicha menejer
 SalesRepresentatives=Savdo vakillari
 SalesRepresentativeFollowUp=Savdo vakili (kuzatuv)
@@ -52,7 +52,7 @@ ActionAC_TEL=Telefon qo'ng'irog'i
 ActionAC_FAX=Faks yuboring
 ActionAC_PROP=Taklifni pochta orqali yuboring
 ActionAC_EMAIL=Elektron pochta xabarini yuboring
-ActionAC_EMAIL_IN=Reception of Email
+ActionAC_EMAIL_IN=Elektron pochta xabarlarini qabul qilish
 ActionAC_RDV=Uchrashuvlar
 ActionAC_INT=Saytdagi aralashuv
 ActionAC_FAC=Mijozlarning hisob-fakturasini pochta orqali yuboring
@@ -67,15 +67,15 @@ ActionAC_OTH=Boshqalar
 ActionAC_OTH_AUTO=Boshqa avtoulov
 ActionAC_MANUAL=Qo'lda kiritilgan voqealar
 ActionAC_AUTO=Avtomatik ravishda kiritilgan hodisalar
-ActionAC_OTH_AUTOShort=Other
-ActionAC_EVENTORGANIZATION=Event organization events
+ActionAC_OTH_AUTOShort=Boshqalar
+ActionAC_EVENTORGANIZATION=Tadbirlarni tashkil qilish tadbirlari
 Stats=Savdo statistikasi
 StatusProsp=Istiqbol holati
 DraftPropals=Tijorat takliflari loyihasi
 NoLimit=Cheklov yo'q
-ToOfferALinkForOnlineSignature=Link for online signature
-WelcomeOnOnlineSignaturePage=Welcome to the page to accept commercial 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/commercial proposal %s
-FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
+ToOfferALinkForOnlineSignature=Onlayn imzo uchun havola
+WelcomeOnOnlineSignaturePage=%s dan tijorat takliflarini qabul qilish uchun sahifaga xush kelibsiz
+ThisScreenAllowsYouToSignDocFrom=Ushbu ekran sizga takliflarni / tijorat takliflarini qabul qilish va imzolashga yoki rad etishga imkon beradi
+ThisIsInformationOnDocumentToSign=Bu qabul qilish yoki rad etish to'g'risidagi hujjatdagi ma'lumot
+SignatureProposalRef=%s taklifi / tijorat taklifining imzosi
+FeatureOnlineSignDisabled=Onlayn imzo chekish xususiyati o'chirilgan yoki ushbu xususiyat yoqilmaguncha yaratilgan hujjat
diff --git a/htdocs/langs/uz_UZ/companies.lang b/htdocs/langs/uz_UZ/companies.lang
index 0574c3b6c03..81e6549488d 100644
--- a/htdocs/langs/uz_UZ/companies.lang
+++ b/htdocs/langs/uz_UZ/companies.lang
@@ -27,9 +27,9 @@ AliasNames=Taxallus nomi (savdo, savdo belgisi, ...)
 AliasNameShort=Taxallus nomi
 Companies=Kompaniyalar
 CountryIsInEEC=Mamlakat Evropa iqtisodiy hamjamiyatiga kiradi
-PriceFormatInCurrentLanguage=Price display format in the current language and currency
+PriceFormatInCurrentLanguage=Joriy til va valyutada narxlarni ko'rsatish formati
 ThirdPartyName=Uchinchi tomon nomi
-ThirdPartyEmail=Third-party email
+ThirdPartyEmail=Uchinchi tomon elektron pochtasi
 ThirdParty=Uchinchi tomon
 ThirdParties=Uchinchi tomonlar
 ThirdPartyProspects=Istiqbollari
@@ -43,9 +43,9 @@ Individual=Xususiy shaxs
 ToCreateContactWithSameName=Uchinchi shaxs ostida uchinchi shaxs bilan bir xil ma'lumotlarga ega bo'lgan kontakt / manzilni avtomatik ravishda yaratadi. Ko'pgina hollarda, sizning uchinchi shaxsingiz jismoniy shaxs bo'lsa ham, uchinchi shaxsni o'zi yaratish kifoya.
 ParentCompany=Bosh kompaniya
 Subsidiaries=Filiallar
-ReportByMonth=Report per month
+ReportByMonth=Oyiga hisobot
 ReportByCustomers=Xaridor uchun hisobot
-ReportByThirdparties=Report per thirdparty
+ReportByThirdparties=Uchinchi tomon uchun hisobot
 ReportByQuarter=Har bir stavka bo'yicha hisobot
 CivilityCode=Fuqarolik kodi
 RegisteredOffice=Ro'yxatdan o'tgan ofis
@@ -53,14 +53,14 @@ Lastname=Familiya
 Firstname=Ism
 PostOrFunction=Ish joyi
 UserTitle=Sarlavha
-NatureOfThirdParty=Nature of Third party
-NatureOfContact=Nature of Contact
+NatureOfThirdParty=Uchinchi shaxsning tabiati
+NatureOfContact=Aloqa xususiyati
 Address=Manzil
 State=Shtat / viloyat
-StateCode=State/Province code
+StateCode=Shtat / viloyat kodi
 StateShort=Shtat
 Region=Mintaqa
-Region-State=Region - State
+Region-State=Hudud - shtat
 Country=Mamlakat
 CountryCode=Mamlakat kodi
 CountryId=Mamlakat identifikatori
@@ -80,11 +80,11 @@ Web=Internet
 Poste= Lavozim
 DefaultLang=Standart til
 VATIsUsed=Sotishdan foydalanilgan soliq
-VATIsUsedWhenSelling=This defines if this third party includes a sale tax or not when it makes an invoice to its own customers
+VATIsUsedWhenSelling=Bu shuni anglatadiki, ushbu uchinchi tomon o'z mijozlariga hisob-fakturani rasmiylashtirganda sotish solig'ini o'z ichiga oladimi yoki yo'qmi
 VATIsNotUsed=Savdo solig'i ishlatilmaydi
 CopyAddressFromSoc=Uchinchi tomon tafsilotlaridan manzilni nusxalash
 ThirdpartyNotCustomerNotSupplierSoNoRef=Uchinchi tomon na mijoz, na sotuvchi, mavjud mos yozuvlar ob'ekti yo'q
-ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor vendor, discounts are not available
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Uchinchi tomon na mijoz, na sotuvchi, chegirmalar mavjud emas
 PaymentBankAccount=To'lov bank hisobvarag'i
 OverAllProposals=Takliflar
 OverAllOrders=Buyurtmalar
@@ -209,7 +209,7 @@ ProfId1IT=-
 ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
-ProfId5IT=EORI number
+ProfId5IT=EORI raqami
 ProfId6IT=-
 ProfId1LU=Id. prof. 1 (R.C.S. Lyuksemburg)
 ProfId2LU=Id. prof. 2 (biznes uchun ruxsatnoma)
@@ -260,10 +260,10 @@ ProfId4US=-
 ProfId5US=-
 ProfId6US=-
 ProfId1RO=Prof Id 1 (CUI)
-ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
+ProfId2RO=Prof Id 2 (nr. Nmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
 ProfId4RO=Prof Id 5 (EUID)
-ProfId5RO=Prof Id 5 (EORI number)
+ProfId5RO=Prof Id 5 (EORI raqami)
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -278,34 +278,34 @@ ProfId4DZ=NIS
 VATIntra=QQS identifikatori
 VATIntraShort=QQS identifikatori
 VATIntraSyntaxIsValid=Sintaksis haqiqiydir
-VATReturn=VAT return
+VATReturn=QQS deklaratsiyasi
 ProspectCustomer=Prospekt / mijoz
 Prospect=Istiqbol
 CustomerCard=Mijozlar kartasi
 Customer=Mijoz
 CustomerRelativeDiscount=Mijozlarga nisbatan chegirma
-SupplierRelativeDiscount=Relative vendor discount
+SupplierRelativeDiscount=Sotuvchilarga nisbatan chegirma
 CustomerRelativeDiscountShort=Nisbatan chegirma
 CustomerAbsoluteDiscountShort=Mutlaq chegirma
 CompanyHasRelativeDiscount=Ushbu mijozda standart chegirma mavjud: <b> %s%% </b>
 CompanyHasNoRelativeDiscount=Ushbu mijozda sukut bo'yicha nisbatan chegirma mavjud emas
-HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this vendor
-HasNoRelativeDiscountFromSupplier=You have no default relative discount from this vendor
+HasRelativeDiscountFromSupplier=Sizda ushbu sotuvchidan <b> %s%% </b> chegirmasi mavjud
+HasNoRelativeDiscountFromSupplier=Sizda ushbu sotuvchidan standart chegirma yo'q
 CompanyHasAbsoluteDiscount=Ushbu mijozda <b> %s </b> %s uchun chegirmalar mavjud (kredit yozuvlari yoki dastlabki to'lovlar).
-CompanyHasDownPaymentOrCommercialDiscount=This customer has discounts available (commercial, down payments) for <b>%s</b> %s
+CompanyHasDownPaymentOrCommercialDiscount=Ushbu mijozda <b> %s </b> %s uchun chegirmalar mavjud (tijorat, dastlabki to'lovlar).
 CompanyHasCreditNote=Ushbu mijozda hali ham <b> %s </b> %s uchun kredit yozuvlari mavjud
-HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this vendor
-HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this vendor
-HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this vendor
-HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this vendor
+HasNoAbsoluteDiscountFromSupplier=Ushbu sotuvchida chegirmali kreditingiz yo'q
+HasAbsoluteDiscountFromSupplier=Sizda ushbu sotuvchidan <b> %s </b> %s uchun chegirmalar mavjud (kredit yozuvlari yoki dastlabki to'lovlar).
+HasDownPaymentOrCommercialDiscountFromSupplier=Ushbu sotuvchidan <b> %s </b> %s uchun chegirmalar mavjud (tijorat, dastlabki to'lovlar)
+HasCreditNoteFromSupplier=Sizda ushbu sotuvchidan <b> %s </b> %s uchun kredit yozuvlari mavjud
 CompanyHasNoAbsoluteDiscount=Ushbu mijozda chegirmali kredit mavjud emas
 CustomerAbsoluteDiscountAllUsers=Mijozlarga mutlaqo chegirmalar (barcha foydalanuvchilar tomonidan beriladi)
 CustomerAbsoluteDiscountMy=Mijozlarga mutlaqo chegirmalar (o'zingiz berasiz)
-SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (entered by all users)
-SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself)
+SupplierAbsoluteDiscountAllUsers=Sotuvchiga mutlaq chegirmalar (barcha foydalanuvchilar tomonidan kiritiladi)
+SupplierAbsoluteDiscountMy=Sotuvchiga mutlaq chegirmalar (o'zingiz kiritgansiz)
 DiscountNone=None
-Vendor=Vendor
-Supplier=Vendor
+Vendor=Sotuvchi
+Supplier=Sotuvchi
 AddContact=Kontakt yarating
 AddContactAddress=Kontakt / manzil yarating
 EditContact=Kontaktni tahrirlash
@@ -318,7 +318,7 @@ FromContactName=Ism:
 NoContactDefinedForThirdParty=Ushbu uchinchi tomon uchun hech qanday aloqa aniqlanmagan
 NoContactDefined=Hech qanday aloqa aniqlanmadi
 DefaultContact=Odatiy aloqa / manzil
-ContactByDefaultFor=Default contact/address for
+ContactByDefaultFor=Standart aloqa / manzil
 AddThirdParty=Uchinchi tomonni yarating
 DeleteACompany=Kompaniyani o'chirib tashlang
 PersonalInformations=Shaxsiy malumot
@@ -338,7 +338,7 @@ CompanyDeleted="%s" kompaniyasi ma'lumotlar bazasidan o'chirildi.
 ListOfContacts=Kontaktlar / manzillar ro'yxati
 ListOfContactsAddresses=Kontaktlar / manzillar ro'yxati
 ListOfThirdParties=Uchinchi tomonlarning ro'yxati
-ShowCompany=Third Party
+ShowCompany=Uchinchi tomon
 ShowContact=Aloqa manzili
 ContactsAllShort=Hammasi (filtrsiz)
 ContactType=Aloqa turi
@@ -367,7 +367,7 @@ VATIntraManualCheck=Shuningdek, siz Evropa Komissiyasining veb-saytida <a href="
 ErrorVATCheckMS_UNAVAILABLE=Tekshirib bo'lmaydi. Chek xizmati a'zo davlat tomonidan taqdim etilmaydi (%s).
 NorProspectNorCustomer=Istiqbolli ham, mijoz ham emas
 JuridicalStatus=Xo'jalik yurituvchi sub'ekt turi
-Workforce=Workforce
+Workforce=Ishchi kuchi
 Staff=Xodimlar
 ProspectLevelShort=Potentsial
 ProspectLevel=Istiqbolli salohiyat
@@ -415,7 +415,7 @@ ImportDataset_company_2=Uchinchi tomonlar qo'shimcha kontaktlar / manzillar va a
 ImportDataset_company_3=Uchinchi tomonlarning bank hisobvaraqlari
 ImportDataset_company_4=Uchinchi tomon savdo vakillari (savdo vakillarini / foydalanuvchilarni kompaniyalarga tayinlash)
 PriceLevel=Narx darajasi
-PriceLevelLabels=Price Level Labels
+PriceLevelLabels=Narx darajasi yorliqlari
 DeliveryAddress=Etkazib berish manzili
 AddAddress=Manzil qo'shing
 SupplierCategory=Sotuvchi toifasi
@@ -426,13 +426,13 @@ AllocateCommercial=Savdo vakiliga tayinlangan
 Organization=Tashkilot
 FiscalYearInformation=Moliyaviy yil
 FiscalMonthStart=Moliya yilidan boshlab
-SocialNetworksInformation=Social networks
-SocialNetworksFacebookURL=Facebook URL
-SocialNetworksTwitterURL=Twitter URL
-SocialNetworksLinkedinURL=Linkedin URL
-SocialNetworksInstagramURL=Instagram URL
-SocialNetworksYoutubeURL=Youtube URL
-SocialNetworksGithubURL=Github URL
+SocialNetworksInformation=Ijtimoiy tarmoqlar
+SocialNetworksFacebookURL=Facebook manzili
+SocialNetworksTwitterURL=Twitter manzili
+SocialNetworksLinkedinURL=Bog'langan URL
+SocialNetworksInstagramURL=Instagram manzili
+SocialNetworksYoutubeURL=Youtube URL manzili
+SocialNetworksGithubURL=Github URL manzili
 YouMustAssignUserMailFirst=Elektron pochta xabarnomasini qo'shishdan oldin siz ushbu foydalanuvchi uchun elektron pochta xabarini yaratishingiz kerak.
 YouMustCreateContactFirst=Elektron pochta xabarnomalarini qo'shish uchun avval uchinchi tomon uchun tegishli elektron pochta xabarlari bilan aloqa o'rnatishingiz kerak
 ListSuppliersShort=Sotuvchilar ro'yxati
@@ -448,7 +448,7 @@ ProductsIntoElements=%s-ga bog'langan mahsulot / xizmatlarning ro'yxati
 CurrentOutstandingBill=Amaldagi hisob-kitob
 OutstandingBill=Maks. qarzdorlik uchun
 OutstandingBillReached=Maks. qarzdorlik uchun
-OrderMinAmount=Minimum amount for order
+OrderMinAmount=Buyurtma uchun minimal miqdor
 MonkeyNumRefModelDesc=Mijoz kodi uchun %syymm-nnnn formatidagi raqamni va sotuvchi kodi uchun %syymm-nnnn ni qaytaring, bu erda yy yil, mm oy va nnnn ketma-ket avtomatik ortib boruvchi raqam va 0 ga qaytmaydi.
 LeopardNumRefModelDesc=Kod bepul. Ushbu kodni istalgan vaqtda o'zgartirish mumkin.
 ManagingDirectors=Menejer (lar) ning ismi (bosh direktor, direktor, prezident ...)
@@ -461,17 +461,17 @@ SaleRepresentativeFirstname=Savdo vakilining ismi
 SaleRepresentativeLastname=Savdo vakilining familiyasi
 ErrorThirdpartiesMerge=Uchinchi tomonlarni o'chirishda xatolik yuz berdi. Iltimos, jurnalni tekshiring. O'zgarishlar qaytarildi.
 NewCustomerSupplierCodeProposed=Mijoz yoki sotuvchi kodi allaqachon ishlatilgan, yangi kod taklif etiladi
-KeepEmptyIfGenericAddress=Keep this field empty if this address is a generic address
+KeepEmptyIfGenericAddress=Ushbu manzil umumiy manzil bo'lsa, ushbu maydonni bo'sh qoldiring
 #Imports
-PaymentTypeCustomer=Payment Type - Customer
-PaymentTermsCustomer=Payment Terms - Customer
-PaymentTypeSupplier=Payment Type - Vendor
-PaymentTermsSupplier=Payment Term - Vendor
-PaymentTypeBoth=Payment Type - Customer and Vendor
-MulticurrencyUsed=Use Multicurrency
-MulticurrencyCurrency=Currency
-InEEC=Europe (EEC)
-RestOfEurope=Rest of Europe (EEC)
-OutOfEurope=Out of Europe (EEC)
-CurrentOutstandingBillLate=Current outstanding bill late
-BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
+PaymentTypeCustomer=To'lov turi - mijoz
+PaymentTermsCustomer=To'lov shartlari - mijoz
+PaymentTypeSupplier=To'lov turi - sotuvchi
+PaymentTermsSupplier=To'lov muddati - sotuvchi
+PaymentTypeBoth=To'lov turi - mijoz va sotuvchi
+MulticurrencyUsed=Ko'p valyutadan foydalaning
+MulticurrencyCurrency=Valyuta
+InEEC=Evropa (EEC)
+RestOfEurope=Evropaning qolgan qismi (EEC)
+OutOfEurope=Evropadan tashqarida (EEC)
+CurrentOutstandingBillLate=Amaldagi qonun loyihasi kechiktirildi
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Ehtiyot bo'ling, mahsulot narxlari sozlamalariga qarab, mahsulotni POS-ga qo'shishdan oldin uchinchi tomonni o'zgartirishingiz kerak.
diff --git a/htdocs/langs/uz_UZ/compta.lang b/htdocs/langs/uz_UZ/compta.lang
index a3910f04a4e..47ab608b1bb 100644
--- a/htdocs/langs/uz_UZ/compta.lang
+++ b/htdocs/langs/uz_UZ/compta.lang
@@ -17,15 +17,15 @@ Accountparent=Ota-ona hisobi
 Accountsparent=Ota-onalar hisoblari
 Income=Daromad
 Outcome=Xarajatlar
-MenuReportInOut=Income / Expense
+MenuReportInOut=Daromad / xarajatlar
 ReportInOut=Daromadlar va xarajatlar balansi
 ReportTurnover=Tovar-faktura
-ReportTurnoverCollected=Turnover collected
+ReportTurnoverCollected=Tovar yig'ildi
 PaymentsNotLinkedToInvoice=To'lovlar hech qanday hisob-fakturaga bog'lanmagan, shuning uchun hech qanday uchinchi tomon bilan bog'lanmagan
 PaymentsNotLinkedToUser=Hech qanday foydalanuvchi bilan bog'lanmagan to'lovlar
 Profit=Foyda
 AccountingResult=Buxgalteriya natijasi
-BalanceBefore=Balance (before)
+BalanceBefore=Balans (oldin)
 Balance=Balans
 Debit=Debet
 Credit=Kredit
@@ -36,41 +36,41 @@ VATToPay=Soliqni sotish
 VATReceived=Soliq olingan
 VATToCollect=Soliq xaridlari
 VATSummary=Soliq har oy
-VATBalance=Tax Balance
+VATBalance=Soliq balansi
 VATPaid=To'langan soliq
-LT1Summary=Tax 2 summary
-LT2Summary=Tax 3 summary
+LT1Summary=Soliq 2 xulosasi
+LT2Summary=Soliq 3 xulosasi
 LT1SummaryES=RE balansi
 LT2SummaryES=IRPF balansi
-LT1SummaryIN=CGST Balance
-LT2SummaryIN=SGST Balance
-LT1Paid=Tax 2 paid
-LT2Paid=Tax 3 paid
+LT1SummaryIN=CGST balansi
+LT2SummaryIN=SGST balansi
+LT1Paid=Soliq 2 to'langan
+LT2Paid=Soliq 3 to'langan
 LT1PaidES=RE to'langan
 LT2PaidES=IRPF pullik
-LT1PaidIN=CGST Paid
-LT2PaidIN=SGST Paid
-LT1Customer=Tax 2 sales
-LT1Supplier=Tax 2 purchases
+LT1PaidIN=CGST pullik
+LT2PaidIN=SGST pullik
+LT1Customer=Soliq 2 sotuvi
+LT1Supplier=Soliq 2 ta xarid
 LT1CustomerES=RE savdolari
 LT1SupplierES=RE xaridlari
-LT1CustomerIN=CGST sales
-LT1SupplierIN=CGST purchases
-LT2Customer=Tax 3 sales
-LT2Supplier=Tax 3 purchases
+LT1CustomerIN=CGST sotuvi
+LT1SupplierIN=CGST xaridlari
+LT2Customer=Soliq 3 sotuvi
+LT2Supplier=Sotib olish 3 soliq
 LT2CustomerES=IRPF sotuvi
 LT2SupplierES=IRPF xaridlari
-LT2CustomerIN=SGST sales
-LT2SupplierIN=SGST purchases
+LT2CustomerIN=SGST sotuvi
+LT2SupplierIN=SGST xaridlari
 VATCollected=QQS yig'ildi
-StatusToPay=To pay
+StatusToPay=To'lash uchun
 SpecialExpensesArea=Barcha maxsus to'lovlar uchun maydon
-VATExpensesArea=Area for all TVA payments
+VATExpensesArea=Barcha TVA to'lovlari uchun maydon
 SocialContribution=Ijtimoiy yoki fiskal soliq
 SocialContributions=Ijtimoiy yoki soliq soliqlari
 SocialContributionsDeductibles=Chegiriladigan ijtimoiy yoki soliq soliqlari
 SocialContributionsNondeductibles=Chegirilmaydigan ijtimoiy yoki soliq soliqlari
-DateOfSocialContribution=Date of social or fiscal tax
+DateOfSocialContribution=Ijtimoiy yoki soliq soliqlarining sanasi
 LabelContrib=Yorliq hissasi
 TypeContrib=Hissa turi
 MenuSpecialExpenses=Maxsus xarajatlar
@@ -78,15 +78,15 @@ MenuTaxAndDividends=Soliqlar va dividendlar
 MenuSocialContributions=Ijtimoiy / soliq soliqlari
 MenuNewSocialContribution=Yangi ijtimoiy / fiskal soliq
 NewSocialContribution=Yangi ijtimoiy / fiskal soliq
-AddSocialContribution=Add social/fiscal tax
+AddSocialContribution=Ijtimoiy / soliq soliqlarini qo'shing
 ContributionsToPay=To'lanadigan ijtimoiy / soliq soliqlari
 AccountancyTreasuryArea=Hisob-kitob va to'lov maydoni
 NewPayment=Yangi to'lov
 PaymentCustomerInvoice=Mijozlar uchun hisob-fakturani to'lash
-PaymentSupplierInvoice=vendor invoice payment
+PaymentSupplierInvoice=sotuvchiga hisob-fakturani to'lash
 PaymentSocialContribution=Ijtimoiy / soliq soliq to'lovi
 PaymentVat=QQS to'lovi
-AutomaticCreationPayment=Automatically record the payment
+AutomaticCreationPayment=To'lovni avtomatik ravishda yozib oling
 ListPayment=To'lovlar ro'yxati
 ListOfCustomerPayments=Mijozlar uchun to'lovlar ro'yxati
 ListOfSupplierPayments=Sotuvchilarning to'lovlari ro'yxati
@@ -106,11 +106,11 @@ LT2PaymentES=IRPF to'lovi
 LT2PaymentsES=IRPF to'lovlari
 VATPayment=Savdo uchun soliq to'lash
 VATPayments=Sotish bo'yicha soliq to'lovlari
-VATDeclarations=VAT declarations
-VATDeclaration=VAT declaration
+VATDeclarations=QQS deklaratsiyalari
+VATDeclaration=QQS deklaratsiyasi
 VATRefund=Savdo solig'ini qaytarish
-NewVATPayment=New sales tax payment
-NewLocalTaxPayment=New tax %s payment
+NewVATPayment=Yangi savdo solig'i to'lovi
+NewLocalTaxPayment=Yangi soliq %s to'lovi
 Refund=Pulni qaytarish
 SocialContributionsPayments=Ijtimoiy / soliq soliqlari bo'yicha to'lovlar
 ShowVatPayment=QQS to'lovini ko'rsatish
@@ -122,8 +122,8 @@ CustomerAccountancyCodeShort=Himoyalash. hisob qaydnomasi. kod
 SupplierAccountancyCodeShort=Sup. hisob qaydnomasi. kod
 AccountNumber=Hisob raqami
 NewAccountingAccount=Yangi hisob
-Turnover=Turnover invoiced
-TurnoverCollected=Turnover collected
+Turnover=Tovar-faktura
+TurnoverCollected=Tovar yig'ildi
 SalesTurnoverMinimum=Minimal oborot
 ByExpenseIncome=Xarajatlar va daromadlar bo'yicha
 ByThirdParties=Uchinchi shaxslar tomonidan
@@ -138,23 +138,23 @@ NoWaitingChecks=Depozitni kutayotgan cheklar yo'q.
 DateChequeReceived=Qabul qilingan kunni tekshiring
 NbOfCheques=Chexlar soni
 PaySocialContribution=Ijtimoiy / soliq soliqlarini to'lang
-PayVAT=Pay a VAT declaration
-PaySalary=Pay a salary card
+PayVAT=QQS deklaratsiyasini to'lash
+PaySalary=Ish haqi kartasini to'lang
 ConfirmPaySocialContribution=Haqiqatan ham ushbu ijtimoiy yoki soliq soliqlarini to'langan deb tasniflashni xohlaysizmi?
-ConfirmPayVAT=Are you sure you want to classify this VAT declaration as paid ?
-ConfirmPaySalary=Are you sure you want to classify this salary card as paid?
+ConfirmPayVAT=Haqiqatan ham ushbu QQS deklaratsiyasini to'langan deb tasniflashni xohlaysizmi?
+ConfirmPaySalary=Ushbu ish haqi kartasini to'langan deb tasniflashni xohlaysizmi?
 DeleteSocialContribution=Ijtimoiy yoki soliq soliq to'lovini o'chirib tashlang
-DeleteVAT=Delete a VAT declaration
-DeleteSalary=Delete a salary card
+DeleteVAT=QQS deklaratsiyasini o'chirib tashlang
+DeleteSalary=Ish haqi kartasini o'chirib tashlang
 ConfirmDeleteSocialContribution=Ushbu ijtimoiy / soliq soliq to'lovini o'chirishni xohlaysizmi?
-ConfirmDeleteVAT=Are you sure you want to delete this VAT declaration ?
-ConfirmDeleteSalary=Are you sure you want to delete this salary?
+ConfirmDeleteVAT=Ushbu QQS deklaratsiyasini o'chirishni xohlaysizmi?
+ConfirmDeleteSalary=Ushbu ish haqini o'chirishni xohlaysizmi?
 ExportDataset_tax_1=Ijtimoiy va soliq soliqlari va to'lovlari
 CalcModeVATDebt=Modda <b> %s majburiyatlarni hisobga olish bo'yicha QQS %s </b>.
 CalcModeVATEngagement=<b> %s daromad-xarajatlar bo'yicha QQS %s </b>.
 CalcModeDebt=Hali ham daftarda hisobga olinmagan bo'lsa ham, ma'lum qayd qilingan hujjatlarni tahlil qilish.
 CalcModeEngagement=Hali Ledjerda hisobga olinmagan bo'lsa ham, ma'lum yozilgan to'lovlarni tahlil qilish.
-CalcModeBookkeeping=Analysis of data journalized in Bookkeeping Ledger table.
+CalcModeBookkeeping=Buxgalteriya hisobi jadvalida qayd etilgan ma'lumotlarni tahlil qilish.
 CalcModeLT1= Xaridorlarning hisob-fakturalarida <b> %sRE rejimi - etkazib beruvchilar invoices%s </b>
 CalcModeLT1Debt=<b> %sRE rejimi xaridorlarning invoyslarida %s </b>
 CalcModeLT1Rec= <b> %sRE rejimi etkazib beruvchilar bo'yicha invoices%s </b>
@@ -163,44 +163,44 @@ CalcModeLT2Debt=<b> %sIRPF rejimi mijozning hisob-fakturalarida %s </b>
 CalcModeLT2Rec= <b> %sIRPF etkazib beruvchilar bo'yicha invoices%s </b>
 AnnualSummaryDueDebtMode=Daromadlar va xarajatlar balansi, yillik xulosa
 AnnualSummaryInputOutputMode=Daromadlar va xarajatlar balansi, yillik xulosa
-AnnualByCompanies=Balance of income and expenses, by predefined groups of account
+AnnualByCompanies=Oldindan belgilangan hisob guruhlari bo'yicha daromadlar va xarajatlar balansi
 AnnualByCompaniesDueDebtMode=Daromadlar va xarajatlar balansi, oldindan aniqlangan guruhlar bo'yicha batafsil ma'lumot, <b> %sClaims-Debts%s </b> <b> majburiyatlarni hisobga olish a098
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
 SeeReportInInputOutputMode=<b> %s to'lovni tahlil qilishs%s </b> ga asoslanib, <b> asosida yozilgan to'lovlarni ko'ring </b>, agar ular amalga oshirilmagan bo'lsa ham
 SeeReportInDueDebtMode=<b> %s yozilgan hujjatlarni tahlil qilish %s </b> ga asoslanib, ma'lum <b> yozilgan hujjatlar </b> even ifed
-SeeReportInBookkeepingMode=See <b>%sanalysis of bookeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
+SeeReportInBookkeepingMode=<b> %s buxgalteriya hisobi jadvalini tahlil qilish table%s </b> ga asoslangan hisobot uchun <b> buxgalteriya hisobi jadvali a09f89
 RulesAmountWithTaxIncluded=- Ko'rsatilgan summalar barcha soliqlarni hisobga olgan holda
 RulesResultDue=- Unda to'lamagan-to'lanmagan hisob-fakturalar, xarajatlar, QQS, xayr-ehsonlar mavjud. Shuningdek, unga to'langan ish haqi kiradi. <br> - Bu schyot-fakturalarni taqdim etish sanasiga va xarajatlar yoki soliq to'lovlarini to'lash sanasiga asoslanadi. Ish haqi moduli bilan belgilangan ish haqi uchun to'lovning sanasi qo'llaniladi.
 RulesResultInOut=- Unda fakturalar, xarajatlar, QQS va ish haqi bo'yicha amalga oshirilgan real to'lovlar mavjud. <br> - Bu hisob-fakturalar, xarajatlar, QQS va ish haqlarini to'lash sanalariga asoslanadi. Xayriya uchun xayr-ehson sanasi.
 RulesCADue=- U mijozning to'lash yoki to'lamasligidan kelib chiqadigan hisob-fakturalarini o'z ichiga oladi. <br> - Ushbu hisob-fakturalarning hisob-kitob sanasiga asoslanadi. <br>
 RulesCAIn=- Bu mijozlardan olingan hisob-fakturalarning barcha samarali to'lovlarini o'z ichiga oladi. <br> - u ushbu hisob-fakturalarni to'lash sanasiga asoslanadi <br>
-RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
-RulesSalesTurnoverOfIncomeAccounts=It includes (credit - debit) of lines for product accounts in group INCOME
-RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
-RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
-RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
-SeePageForSetup=See menu <a href="%s">%s</a> for setup
+RulesCATotalSaleJournal=U Sotish jurnalidagi barcha kredit liniyalarini o'z ichiga oladi.
+RulesSalesTurnoverOfIncomeAccounts=Unga INCOME guruhidagi mahsulot hisobvaraqlari uchun chiziqlar (kredit - debet) kiradi
+RulesAmountOnInOutBookkeepingRecord=Unda "XARAJATLAR" yoki "KIRISh" guruhiga ega bo'lgan buxgalteriya hisobvarag'i bilan sizning daftaringizdagi yozuv mavjud.
+RulesResultBookkeepingPredefined=Unda "XARAJATLAR" yoki "KIRISh" guruhiga ega bo'lgan buxgalteriya hisobvarag'i bilan sizning daftaringizdagi yozuv mavjud.
+RulesResultBookkeepingPersonalized=</b> shaxsiylashtirilgan guruhlar bo'yicha guruhlangan buxgalteriya hisobi bilan <b> sizning daftaringizdagi yozuvni ko'rsatadi.
+SeePageForSetup=O'rnatish uchun <a href="%s"> %s </a> menyusiga qarang
 DepositsAreNotIncluded=- Dastlabki to'lovlar bo'yicha hisob-kitoblar kiritilmagan
 DepositsAreIncluded=- Dastlabki hisob-fakturalar kiritilgan
-LT1ReportByMonth=Tax 2 report by month
-LT2ReportByMonth=Tax 3 report by month
-LT1ReportByCustomers=Report tax 2 by third party
-LT2ReportByCustomers=Report tax 3 by third party
-LT1ReportByCustomersES=Report by third party RE
-LT2ReportByCustomersES=Report by third party IRPF
+LT1ReportByMonth=Oy bo'yicha soliq 2 hisoboti
+LT2ReportByMonth=Oy bo'yicha soliq 3 hisoboti
+LT1ReportByCustomers=Uchinchi shaxslar tomonidan soliq 2 haqida hisobot berish
+LT2ReportByCustomers=Uchinchi shaxslar tomonidan soliq bo'yicha hisobot 3
+LT1ReportByCustomersES=Uchinchi tomon RE tomonidan hisobot
+LT2ReportByCustomersES=Uchinchi tomon IRPF hisoboti
 VATReport=Sotish bo'yicha soliq hisoboti
-VATReportByPeriods=Sale tax report by period
-VATReportByMonth=Sale tax report by month
-VATReportByRates=Sale tax report by rates
-VATReportByThirdParties=Sale tax report by third parties
-VATReportByCustomers=Sale tax report by customer
+VATReportByPeriods=Sotish bo'yicha soliq hisoboti davrlar bo'yicha
+VATReportByMonth=Sotish bo'yicha soliq hisoboti oylar bo'yicha
+VATReportByRates=Sotish bo'yicha soliq hisoboti stavkalar bo'yicha
+VATReportByThirdParties=Uchinchi shaxslarning sotish bo'yicha soliq hisoboti
+VATReportByCustomers=Xaridor tomonidan sotilgan soliq hisoboti
 VATReportByCustomersInInputOutputMode=Mijoz tomonidan yig'ilgan va to'langan QQS bo'yicha hisobot
 VATReportByQuartersInInputOutputMode=Sotish bo'yicha hisobot, yig'ilgan va to'langan soliqning soliq stavkasi
-VATReportShowByRateDetails=Show details of this rate
-LT1ReportByQuarters=Report tax 2 by rate
-LT2ReportByQuarters=Report tax 3 by rate
-LT1ReportByQuartersES=Report by RE rate
-LT2ReportByQuartersES=Report by IRPF rate
+VATReportShowByRateDetails=Ushbu stavka tafsilotlarini ko'rsating
+LT1ReportByQuarters=2 stavkasi bo'yicha soliq to'g'risida hisobot bering
+LT2ReportByQuarters=3 stavkasi bo'yicha soliqni hisobot qiling
+LT1ReportByQuartersES=RE stavkasi bo'yicha hisobot
+LT2ReportByQuartersES=IRPF stavkasi bo'yicha hisobot
 SeeVATReportInInputOutputMode=Standart hisob-kitob uchun <b> %sVAT encasement%s </b> hisobotiga qarang
 SeeVATReportInDueDebtMode=Flow%s </b> bo'yicha <b> %sVAT hisobotiga qarang
 RulesVATInServices=- Xizmatlar uchun hisobotda to'lov sanasi asosida olingan yoki chiqarilgan QQS bo'yicha qoidalar mavjud.
@@ -208,7 +208,7 @@ RulesVATInProducts=- Moddiy boyliklar uchun hisobotga to'lov sanasi asosida olin
 RulesVATDueServices=- Xizmatlar uchun hisobotda hisob-kitob sanasi asosida to'lanadigan yoki to'lanmagan QQS hisob-fakturalari mavjud.
 RulesVATDueProducts=- Moddiy boyliklar uchun hisobotda sana asosida QQS bo'yicha hisob-kitoblar mavjud.
 OptionVatInfoModuleComptabilite=Izoh: Moddiy boyliklar uchun etkazib berish sanasidan ko'proq adolatli bo'lishi kerak.
-ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
+ThisIsAnEstimatedValue=Bu oxirgi daftar jadvalidan emas, balki biznes voqealaridan kelib chiqqan holda oldindan ko'rish, shuning uchun yakuniy natijalar ushbu oldindan ko'rish qiymatlaridan farq qilishi mumkin
 PercentOfInvoice=%% / hisob-faktura
 NotUsedForGoods=Tovarlarda ishlatilmaydi
 ProposalStats=Takliflar bo'yicha statistika
@@ -238,19 +238,19 @@ Mode2=2-usul
 CalculationRuleDesc=Jami QQSni hisoblash uchun ikkita usul mavjud: <br> 1-usul har bir satrda QQSni yaxlitlash, so'ngra ularni yig'ish. <br> 2-usul har bir satrda barcha QQSni yig'ib, so'ngra yaxlitlash natijasini beradi. <br> yakuniy natija bir necha sentdan farq qilishi mumkin. Standart rejim - bu <b> %s </b> rejimi.
 CalculationRuleDescSupplier=Sotuvchiga ko'ra, xuddi shu hisoblash qoidasini qo'llash uchun tegishli usulni tanlang va sotuvchingiz kutgan natijani oling.
 TurnoverPerProductInCommitmentAccountingNotRelevant=Har bir mahsulot uchun to'plangan tovar aylanmasi to'g'risida hisobot mavjud emas. Ushbu hisobot faqat tovar aylanmasi uchun taqdim etiladi.
-TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=The report of Turnover collected per sale tax rate is not available. This report is only available for turnover invoiced.
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=Sotish uchun soliq stavkasi bo'yicha yig'ilgan tovar aylanmasi to'g'risidagi hisobot mavjud emas. Ushbu hisobot faqat tovar aylanmasi uchun taqdim etiladi.
 CalculationMode=Hisoblash rejimi
 AccountancyJournal=Buxgalteriya kodlari jurnali
 ACCOUNTING_VAT_SOLD_ACCOUNT=Sotish bo'yicha QQS uchun sukut bo'yicha buxgalteriya hisobi (agar QQS lug'atida o'rnatilmagan bo'lsa ishlatiladi)
 ACCOUNTING_VAT_BUY_ACCOUNT=Xaridlarda QQS uchun sukut bo'yicha buxgalteriya hisobi (agar QQS lug'atida o'rnatilmagan bo'lsa ishlatiladi)
 ACCOUNTING_VAT_PAY_ACCOUNT=QQS to'lash uchun sukut bo'yicha buxgalteriya hisobi
 ACCOUNTING_ACCOUNT_CUSTOMER=Mijozlarning uchinchi shaxslari uchun foydalaniladigan buxgalteriya hisobi
-ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accounting account on third party is not defined.
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Uchinchi tomon kartasida belgilangan buxgalteriya hisobi faqat Subledger buxgalteriyasi uchun ishlatiladi. Ushbu mablag 'Bosh daftar uchun ishlatiladi va Subledger buxgalteriya hisobining standart qiymati sifatida, agar uchinchi tomonning maxsus mijozlar hisobi aniqlanmagan bo'lsa.
 ACCOUNTING_ACCOUNT_SUPPLIER=Sotuvchi uchinchi shaxslar uchun foydalaniladigan buxgalteriya hisobi
-ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated vendor accounting account on third party is not defined.
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Uchinchi tomon kartasida belgilangan buxgalteriya hisobi faqat Subledger buxgalteriyasi uchun ishlatiladi. Ushbu mablag 'Bosh daftar uchun va Subledger buxgalteriya hisobining standart qiymati sifatida ishlatiladi, agar uchinchi tomonning maxsus sotuvchisi buxgalteriya hisobi aniqlanmasa.
 ConfirmCloneTax=Ijtimoiy / soliq soliqlarining klonini tasdiqlang
-ConfirmCloneVAT=Confirm the clone of a VAT declaration
-ConfirmCloneSalary=Confirm the clone of a salary
+ConfirmCloneVAT=QQS deklaratsiyasining klonini tasdiqlang
+ConfirmCloneSalary=Ish haqi klonini tasdiqlang
 CloneTaxForNextMonth=Uni keyingi oyga klonlang
 SimpleReport=Oddiy hisobot
 AddExtraReport=Qo'shimcha hisobotlar (xorijiy va milliy mijozlar hisobotini qo'shing)
@@ -263,32 +263,32 @@ ImportDataset_tax_contrib=Ijtimoiy / soliq soliqlari
 ImportDataset_tax_vat=QQS bo'yicha to'lovlar
 ErrorBankAccountNotFound=Xato: bank hisobi topilmadi
 FiscalPeriod=Hisob davri
-ListSocialContributionAssociatedProject=List of social contributions associated with the project
-DeleteFromCat=Remove from accounting group
-AccountingAffectation=Accounting assignment
-LastDayTaxIsRelatedTo=Last day of period the tax is related to
-VATDue=Sale tax claimed
-ClaimedForThisPeriod=Claimed for the period
-PaidDuringThisPeriod=Paid for this period
-PaidDuringThisPeriodDesc=This is the sum of all payments linked to VAT declarations which have an end-of-period date in the selected date range
-ByVatRate=By sale tax rate
-TurnoverbyVatrate=Turnover invoiced by sale tax rate
-TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
-PurchasebyVatrate=Purchase by sale tax rate
-LabelToShow=Short label
-PurchaseTurnover=Purchase turnover
-PurchaseTurnoverCollected=Purchase turnover collected
-RulesPurchaseTurnoverDue=- It includes the supplier's due invoices whether they are paid or not. <br>- It is based on the invoice date of these invoices.<br>
-RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices done to suppliers.<br>- It is based on the payment date of these invoices<br>
-RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
-RulesPurchaseTurnoverOfExpenseAccounts=It includes (debit - credit) of lines for product accounts in group EXPENSE
-ReportPurchaseTurnover=Purchase turnover invoiced
-ReportPurchaseTurnoverCollected=Purchase turnover collected
-IncludeVarpaysInResults = Include various payments in reports
-IncludeLoansInResults = Include loans in reports
+ListSocialContributionAssociatedProject=Loyiha bilan bog'liq ijtimoiy to'lovlar ro'yxati
+DeleteFromCat=Buxgalteriya guruhidan chiqarib tashlash
+AccountingAffectation=Buxgalteriya hisobi
+LastDayTaxIsRelatedTo=Soliq davrning oxirgi kuni bilan bog'liq
+VATDue=Sotish solig'i talab qilinadi
+ClaimedForThisPeriod=Davr uchun da'vo qilingan
+PaidDuringThisPeriod=Ushbu davr uchun to'langan
+PaidDuringThisPeriodDesc=Bu tanlangan sana oralig'ida muddati tugagan QQS deklaratsiyalariga bog'langan barcha to'lovlarning yig'indisi
+ByVatRate=Sotish bo'yicha soliq stavkasi bo'yicha
+TurnoverbyVatrate=Sotish bo'yicha soliq stavkasi bo'yicha hisob-kitob qilingan tovar aylanmasi
+TurnoverCollectedbyVatrate=Sotish soliq stavkasi bo'yicha yig'ilgan tovar aylanmasi
+PurchasebyVatrate=Sotish bo'yicha soliq stavkasi bo'yicha sotib olish
+LabelToShow=Qisqa yorliq
+PurchaseTurnover=Xaridlar aylanmasi
+PurchaseTurnoverCollected=Xarid qilish oboroti yig'ildi
+RulesPurchaseTurnoverDue=- Bu etkazib beruvchining to'langan yoki to'lanmagan hisob-fakturalarini o'z ichiga oladi. <br> - Ushbu hisob-fakturalarning hisob-kitob sanasiga asoslanadi. <br>
+RulesPurchaseTurnoverIn=- Bu etkazib beruvchilarga hisob-fakturalarning barcha samarali to'lovlarini o'z ichiga oladi. <br> - u ushbu hisob-fakturalarni to'lash sanasiga asoslanadi <br>
+RulesPurchaseTurnoverTotalPurchaseJournal=U sotib olish jurnalidagi barcha debet yo'nalishlarini o'z ichiga oladi.
+RulesPurchaseTurnoverOfExpenseAccounts=U XARAJATLAR guruhidagi mahsulot schyotlari uchun yo'nalishlarni (debet - kredit) o'z ichiga oladi
+ReportPurchaseTurnover=Xarid qilish oboroti schyot-fakturada
+ReportPurchaseTurnoverCollected=Xarid qilish oboroti yig'ildi
+IncludeVarpaysInResults = Hisobotlarga turli xil to'lovlarni kiriting
+IncludeLoansInResults = Hisobotlarga kreditlarni kiriting
 InvoiceLate30Days = Invoices late > 30 days
 InvoiceLate15Days = Invoices late > 15 days
-InvoiceLateMinus15Days = Invoices late
-InvoiceNotLate = To be collected < 15 days
-InvoiceNotLate15Days = To be collected in 15 days
-InvoiceNotLate30Days = To be collected in 30 days
+InvoiceLateMinus15Days = Hisob-kitoblar kechiktirildi
+InvoiceNotLate = To'plash uchun <15 kun
+InvoiceNotLate15Days = 15 kun ichida yig'ib olinadi
+InvoiceNotLate30Days = 30 kun ichida yig'ib olinadi
diff --git a/htdocs/langs/uz_UZ/contracts.lang b/htdocs/langs/uz_UZ/contracts.lang
index 7f29c707c1f..9898cd58cf4 100644
--- a/htdocs/langs/uz_UZ/contracts.lang
+++ b/htdocs/langs/uz_UZ/contracts.lang
@@ -31,11 +31,11 @@ NewContract=Yangi shartnoma
 NewContractSubscription=Yangi shartnoma yoki obuna
 AddContract=Shartnoma tuzing
 DeleteAContract=Shartnomani o'chirib tashlang
-ActivateAllOnContract=Activate all services
+ActivateAllOnContract=Barcha xizmatlarni faollashtiring
 CloseAContract=Shartnomani yoping
 ConfirmDeleteAContract=Ushbu shartnomani va uning barcha xizmatlarini o'chirishni xohlaysizmi?
 ConfirmValidateContract=Ushbu shartnomani <b> %s </b> nomi bilan tasdiqlamoqchimisiz?
-ConfirmActivateAllOnContract=This will open all services (not yet active). Are you sure you want to open all services?
+ConfirmActivateAllOnContract=Bu barcha xizmatlarni ochadi (hali faol emas). Barcha xizmatlarni ochishni xohlaysizmi?
 ConfirmCloseContract=Bu barcha xizmatlarni yopadi (faol yoki yo'q). Ushbu shartnomani yopmoqchi ekanligingizga aminmisiz?
 ConfirmCloseService=Ushbu xizmatni <b> %s </b> sanasi bilan yopishni xohlaysizmi?
 ValidateAContract=Shartnomani tasdiqlang
@@ -51,7 +51,7 @@ ListOfClosedServices=Yopiq xizmatlarning ro'yxati
 ListOfRunningServices=Amaldagi xizmatlarning ro'yxati
 NotActivatedServices=Faol bo'lmagan xizmatlar (tasdiqlangan shartnomalar orasida)
 BoardNotActivatedServices=Tasdiqlangan shartnomalar orasida faollashtirish uchun xizmatlar
-BoardNotActivatedServicesShort=Services to activate
+BoardNotActivatedServicesShort=Faollashtirish uchun xizmatlar
 LastContracts=Oxirgi %s shartnomalari
 LastModifiedServices=Oxirgi %s o'zgartirilgan xizmatlari
 ContractStartDate=Boshlanish vaqti
@@ -66,13 +66,13 @@ DateEndReal=Haqiqiy tugash sanasi
 DateEndRealShort=Haqiqiy tugash sanasi
 CloseService=Xizmatni yoping
 BoardRunningServices=Xizmatlar ishlaydi
-BoardRunningServicesShort=Services running
-BoardExpiredServices=Services expired
-BoardExpiredServicesShort=Services expired
+BoardRunningServicesShort=Xizmatlar ishlaydi
+BoardExpiredServices=Xizmatlar muddati tugagan
+BoardExpiredServicesShort=Xizmatlar muddati tugagan
 ServiceStatus=Xizmat holati
 DraftContracts=Shartnomalar
 CloseRefusedBecauseOneServiceActive=Shartnomani yopish mumkin emas, chunki unda kamida bitta ochiq xizmat mavjud
-ActivateAllContracts=Activate all contract lines
+ActivateAllContracts=Barcha kontrakt liniyalarini faollashtiring
 CloseAllContracts=Barcha shartnoma satrlarini yoping
 DeleteContractLine=Shartnoma satrini o'chirib tashlang
 ConfirmDeleteContractLine=Ushbu shartnoma qatorini o'chirishni xohlaysizmi?
@@ -89,16 +89,16 @@ NoteListOfYourExpiredServices=Ushbu ro'yxatda faqat savdo vakili sifatida bog'la
 StandardContractsTemplate=Standart shartnomalar shabloni
 ContactNameAndSignature=%s uchun ism va imzo:
 OnlyLinesWithTypeServiceAreUsed=Faqat "Xizmat" turidagi liniyalar klonlanadi.
-ConfirmCloneContract=Are you sure you want to clone the contract <b>%s</b>?
-LowerDateEndPlannedShort=Lower planned end date of active services
-SendContractRef=Contract information __REF__
-OtherContracts=Other contracts
+ConfirmCloneContract=<b> %s </b> shartnomasini klonlashni xohlaysizmi?
+LowerDateEndPlannedShort=Faol xizmatlarning quyi rejalashtirilgan tugash sanasi
+SendContractRef=Shartnoma to'g'risidagi ma'lumotlar __REF__
+OtherContracts=Boshqa shartnomalar
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Savdo vakili shartnomani imzolash
 TypeContact_contrat_internal_SALESREPFOLL=Savdo vakili keyingi shartnoma
 TypeContact_contrat_external_BILLING=Xaridor bilan hisob-kitob qilish
 TypeContact_contrat_external_CUSTOMER=Keyingi mijozlar bilan aloqa
 TypeContact_contrat_external_SALESREPSIGN=Mijozlar bilan aloqa shartnomasini imzolash
-HideClosedServiceByDefault=Hide closed services by default
-ShowClosedServices=Show Closed Services
-HideClosedServices=Hide Closed Services
+HideClosedServiceByDefault=Sukut bo'yicha yopiq xizmatlarni yashirish
+ShowClosedServices=Yopiq xizmatlarni ko'rsatish
+HideClosedServices=Yopiq xizmatlarni yashirish
diff --git a/htdocs/langs/uz_UZ/cron.lang b/htdocs/langs/uz_UZ/cron.lang
index 5e77e8a66e2..77e3b554a54 100644
--- a/htdocs/langs/uz_UZ/cron.lang
+++ b/htdocs/langs/uz_UZ/cron.lang
@@ -14,9 +14,9 @@ FileToLaunchCronJobs=Malakali cron ishlarini tekshirish va ishga tushirish uchun
 CronExplainHowToRunUnix=Unix muhitida buyruq satrini har 5 daqiqada bajarish uchun quyidagi crontab yozuvidan foydalanishingiz kerak
 CronExplainHowToRunWin=Microsoft (tm) Windows muhitida har 5 daqiqada buyruq satrini bajarish uchun Rejalashtirilgan Vazifa vositalaridan foydalanishingiz mumkin
 CronMethodDoesNotExists=%s sinfida %s usuli mavjud emas
-CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
-CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
-CronJobProfiles=List of predefined cron job profiles
+CronMethodNotAllowed=%s sinfidagi %s usuli taqiqlangan usullarning qora ro'yxatiga kiritilgan
+CronJobDefDesc=Cron ishi profillari modul identifikatori faylida aniqlanadi. Modul faollashtirilganda, ular yuklanadi va mavjud bo'ladi, shuning uchun siz ishlarni administrator vositalari menyusidan %s boshqarishingiz mumkin.
+CronJobProfiles=Oldindan belgilangan cron ish profillari ro'yxati
 # Menu
 EnabledAndDisabled=Yoqilgan va o'chirilgan
 # Page list
@@ -47,7 +47,7 @@ CronNbRun=Ishga tushirilganlar soni
 CronMaxRun=Ishga tushirishning maksimal soni
 CronEach=Har bir
 JobFinished=Ish ishga tushirildi va tugadi
-Scheduled=Scheduled
+Scheduled=Rejalashtirilgan
 #Page card
 CronAdd= Ish joylarini qo'shing
 CronEvery=Har bir ishni bajaring
@@ -57,7 +57,7 @@ CronSaveSucess=Muvaffaqiyatli saqlang
 CronNote=Izoh
 CronFieldMandatory=%s maydonlari majburiydir
 CronErrEndDateStartDt=Tugash sanasi boshlanish sanasidan oldin bo'lishi mumkin emas
-StatusAtInstall=Status at module installation
+StatusAtInstall=Modulni o'rnatish holati
 CronStatusActiveBtn=Jadval
 CronStatusInactiveBtn=O'chirish
 CronTaskInactive=Bu ish o'chirilgan (rejalashtirilgan emas)
@@ -77,15 +77,15 @@ CronType=Ish turi
 CronType_method=PHP sinfining qo'ng'iroq usuli
 CronType_command=Shell buyrug'i
 CronCannotLoadClass=%s sinf fayli yuklanmadi (%s sinfidan foydalanish uchun)
-CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
+CronCannotLoadObject=%s sinf fayli yuklandi, lekin %s ob'ekti topilmadi
 UseMenuModuleToolsToAddCronJobs=Rejalashtirilgan ishlarni ko'rish va tahrirlash uchun "<a href="%s"> Bosh sahifa - Administrator vositalari - Rejalashtirilgan ish o'rinlari </a>" menyusiga o'ting.
 JobDisabled=Ish o'chirilgan
 MakeLocalDatabaseDumpShort=Mahalliy ma'lumotlar bazasini zaxiralash
 MakeLocalDatabaseDump=Mahalliy ma'lumotlar bazasi axlatxonasini yarating. Parametrlar quyidagilardir: siqish ('gz' yoki 'bz' yoki 'yo'q'), zaxira turi ('mysql', 'pgsql', 'auto'), 1, 'auto' yoki fayl nomi yaratish, saqlash uchun zaxira fayllar soni
 WarningCronDelayed=E'tibor bering, ishga tushirilgan ish kunining keyingi sanasi qanday bo'lishidan qat'i nazar, sizning ishingiz bajarilishidan oldin maksimal %s soatga kechiktirilishi mumkin.
-DATAPOLICYJob=Data cleaner and anonymizer
-JobXMustBeEnabled=Job %s must be enabled
+DATAPOLICYJob=Ma'lumotlarni tozalovchi va anonimayzer
+JobXMustBeEnabled=%s ishi yoqilgan bo'lishi kerak
 # Cron Boxes
-LastExecutedScheduledJob=Last executed scheduled job
-NextScheduledJobExecute=Next scheduled job to execute
-NumberScheduledJobError=Number of scheduled jobs in error
+LastExecutedScheduledJob=Oxirgi marta rejalashtirilgan ish
+NextScheduledJobExecute=Keyingi rejalashtirilgan ish
+NumberScheduledJobError=Xatoda rejalashtirilgan ishlarning soni
diff --git a/htdocs/langs/uz_UZ/deliveries.lang b/htdocs/langs/uz_UZ/deliveries.lang
index c178879f73c..cc3495c42bc 100644
--- a/htdocs/langs/uz_UZ/deliveries.lang
+++ b/htdocs/langs/uz_UZ/deliveries.lang
@@ -27,6 +27,7 @@ Recipient=Qabul qiluvchi
 ErrorStockIsNotEnough=Aktsiyalar yetarli emas
 Shippable=Yuk tashish mumkin
 NonShippable=Yuk tashish mumkin emas
-ShowShippableStatus=Show shippable status
+ShowShippableStatus=Yuk tashish holatini ko'rsatish
 ShowReceiving=Yetkazib berish kvitansiyasini ko'rsating
-NonExistentOrder=Nonexistent order
+NonExistentOrder=Mavjud bo'lmagan buyurtma
+StockQuantitiesAlreadyAllocatedOnPreviousLines = Oldingi qatorlarda allaqachon ajratilgan aktsiyalar miqdori
diff --git a/htdocs/langs/uz_UZ/dict.lang b/htdocs/langs/uz_UZ/dict.lang
index af1ec8973bd..886c37b0b64 100644
--- a/htdocs/langs/uz_UZ/dict.lang
+++ b/htdocs/langs/uz_UZ/dict.lang
@@ -290,7 +290,7 @@ CurrencyXOF=CFA Frantsiyalari BCEAO
 CurrencySingXOF=CFA Frantsiyasi BCEAO
 CurrencyXPF=CFP Frants
 CurrencySingXPF=CFP franki
-CurrencyCentEUR=cents
+CurrencyCentEUR=sent
 CurrencyCentSingEUR=sent
 CurrencyCentINR=paisa
 CurrencyCentSingINR=paise
@@ -307,7 +307,7 @@ DemandReasonTypeSRC_WOM=Og'zaki so'z
 DemandReasonTypeSRC_PARTNER=Hamkor
 DemandReasonTypeSRC_EMPLOYEE=Xodim
 DemandReasonTypeSRC_SPONSORING=Homiylik
-DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
+DemandReasonTypeSRC_SRC_CUSTOMER=Mijozning kiruvchi aloqasi
 #### Paper formats ####
 PaperFormatEU4A0=4A0 formati
 PaperFormatEU2A0=Format 2A0
@@ -329,9 +329,9 @@ PaperFormatCAP4=P4 formatidagi Kanada
 PaperFormatCAP5=P5 formatidagi Kanada
 PaperFormatCAP6=P6 formatidagi Kanada
 #### Expense report categories ####
-ExpAutoCat=Car
+ExpAutoCat=Avtomobil
 ExpCycloCat=Moped
-ExpMotoCat=Motorbike
+ExpMotoCat=Mototsikl
 ExpAuto3CV=3 CV
 ExpAuto4CV=4 CV
 ExpAuto5CV=5 CV
@@ -339,21 +339,21 @@ ExpAuto6CV=6 CV
 ExpAuto7CV=7 CV
 ExpAuto8CV=8 CV
 ExpAuto9CV=9 CV
-ExpAuto10CV=10 CV
+ExpAuto10CV=10 ta tarjimai hol
 ExpAuto11CV=11 CV
-ExpAuto12CV=12 CV
-ExpAuto3PCV=3 CV and more
-ExpAuto4PCV=4 CV and more
-ExpAuto5PCV=5 CV and more
-ExpAuto6PCV=6 CV and more
-ExpAuto7PCV=7 CV and more
-ExpAuto8PCV=8 CV and more
-ExpAuto9PCV=9 CV and more
-ExpAuto10PCV=10 CV and more
-ExpAuto11PCV=11 CV and more
-ExpAuto12PCV=12 CV and more
-ExpAuto13PCV=13 CV and more
-ExpCyclo=Capacity lower to 50cm3
-ExpMoto12CV=Motorbike 1 or 2 CV
-ExpMoto345CV=Motorbike 3, 4 or 5 CV
-ExpMoto5PCV=Motorbike 5 CV and more
+ExpAuto12CV=12 ta tarjimai hol
+ExpAuto3PCV=3 ta tarjimai hol va boshqalar
+ExpAuto4PCV=4 ta tarjimai hol va boshqalar
+ExpAuto5PCV=5 ta tarjimai hol va boshqalar
+ExpAuto6PCV=6 ta tarjimai hol va boshqalar
+ExpAuto7PCV=7 ta tarjimai hol va boshqalar
+ExpAuto8PCV=8 ta tarjimai hol va boshqalar
+ExpAuto9PCV=9 ta tarjimai hol va boshqalar
+ExpAuto10PCV=10 ta tarjimai hol va boshqalar
+ExpAuto11PCV=11 CV va boshqalar
+ExpAuto12PCV=12 ta tarjimai hol va boshqalar
+ExpAuto13PCV=13 ta tarjimai hol va boshqalar
+ExpCyclo=Imkoniyatlar 50 sm3 gacha
+ExpMoto12CV=1 yoki 2 CV mototsikl
+ExpMoto345CV=Mototsikl 3, 4 yoki 5 CV
+ExpMoto5PCV=Motorbike 5 CV va boshqalar
diff --git a/htdocs/langs/uz_UZ/donations.lang b/htdocs/langs/uz_UZ/donations.lang
index 42324ddd6c2..fb6783acf4f 100644
--- a/htdocs/langs/uz_UZ/donations.lang
+++ b/htdocs/langs/uz_UZ/donations.lang
@@ -16,7 +16,7 @@ DonationStatusPromiseNotValidatedShort=Qoralama
 DonationStatusPromiseValidatedShort=Tasdiqlangan
 DonationStatusPaidShort=Qabul qildi
 DonationTitle=Xayriya kvitansiyasi
-DonationDate=Donation date
+DonationDate=Xayr-ehson qilingan sana
 DonationDatePayment=To'lov sanasi
 ValidPromess=Va'dani tasdiqlang
 DonationReceipt=Xayriya kvitansiyasi
@@ -31,5 +31,5 @@ DONATION_ART200=Agar xavotirda bo'lsangiz, CGI-dan 200-maqolani ko'rsating
 DONATION_ART238=Agar xavotirda bo'lsangiz, CGI-dan 238-maqolani ko'rsating
 DONATION_ART885=Agar xavotirda bo'lsangiz, CGI-dan 885-maqolani ko'rsating
 DonationPayment=Xayriya to'lovi
-DonationValidated=Donation %s validated
-DonationUseThirdparties=Use an existing thirdparty as coordinates of donators
+DonationValidated=%s ehsoni tasdiqlandi
+DonationUseThirdparties=Donorlarning koordinatalari sifatida mavjud uchinchi tomondan foydalaning
diff --git a/htdocs/langs/uz_UZ/ecm.lang b/htdocs/langs/uz_UZ/ecm.lang
index c4064174d8c..d0789289854 100644
--- a/htdocs/langs/uz_UZ/ecm.lang
+++ b/htdocs/langs/uz_UZ/ecm.lang
@@ -18,30 +18,30 @@ ECMArea=DMS / ECM maydoni
 ECMAreaDesc=DMS / ECM (Hujjatlarni boshqarish tizimi / Elektron kontentni boshqarish) maydoni Dolibarrdagi barcha turdagi hujjatlarni saqlash, almashish va tezkor qidirish imkonini beradi.
 ECMAreaDesc2=* Element kartasidan hujjatlar qo'shilganda avtomatik kataloglar avtomatik ravishda to'ldiriladi. <br> * qo'llanma kataloglaridan ma'lum bir elementga bog'lanmagan hujjatlarni saqlash uchun foydalanish mumkin.
 ECMSectionWasRemoved=<b> %s </b> katalog o'chirildi.
-ECMSectionWasCreated=Directory <b>%s</b> has been created.
+ECMSectionWasCreated=<b> %s </b> katalogi yaratildi.
 ECMSearchByKeywords=Kalit so'zlar bo'yicha qidirish
 ECMSearchByEntity=Ob'ekt bo'yicha qidirish
 ECMSectionOfDocuments=Hujjatlar kataloglari
 ECMTypeAuto=Avtomatik
-ECMDocsBy=Documents linked to %s
+ECMDocsBy=%s ga bog'langan hujjatlar
 ECMNoDirectoryYet=Hech qanday katalog yaratilmagan
 ShowECMSection=Katalogni ko'rsatish
 DeleteSection=Katalogni olib tashlash
 ConfirmDeleteSection=<b> %s </b> katalogini o'chirishni xohlayotganingizni tasdiqlay olasizmi?
 ECMDirectoryForFiles=Fayllar uchun nisbiy katalog
-CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
+CannotRemoveDirectoryContainsFilesOrDirs=Olib tashlashning iloji yo'q, chunki u ba'zi fayllar yoki pastki kataloglarni o'z ichiga oladi
 CannotRemoveDirectoryContainsFiles=O'chirish mumkin emas, chunki unda ba'zi fayllar mavjud
 ECMFileManager=Fayl menejeri
 ECMSelectASection=Daraxtdagi katalogni tanlang ...
 DirNotSynchronizedSyncFirst=Ushbu katalog ECM modulidan tashqarida yaratilgan yoki o'zgartirilganga o'xshaydi. Ushbu katalog tarkibini olish uchun disk va ma'lumotlar bazasini sinxronlashtirish uchun avval "Qayta sinxronlashtirish" tugmachasini bosishingiz kerak.
-ReSyncListOfDir=Resync list of directories
-HashOfFileContent=Hash of file content
-NoDirectoriesFound=No directories found
-FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
-ExtraFieldsEcmFiles=Extrafields Ecm Files
-ExtraFieldsEcmDirectories=Extrafields Ecm Directories
-ECMSetup=ECM Setup
-GenerateImgWebp=Duplicate all images with another version with .webp format
-ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
-ConfirmImgWebpCreation=Confirm all images duplication
-SucessConvertImgWebp=Images successfully duplicated
+ReSyncListOfDir=Kataloglar ro'yxatini qayta sinxronlashtirish
+HashOfFileContent=Fayl tarkibidagi xash
+NoDirectoriesFound=Hech qanday katalog topilmadi
+FileNotYetIndexedInDatabase=Fayl hali ma'lumotlar bazasiga indekslanmagan (qayta yuklashga harakat qiling)
+ExtraFieldsEcmFiles=Extrafields Ecm fayllari
+ExtraFieldsEcmDirectories=Extrafields Ecm kataloglari
+ECMSetup=ECM-ni sozlash
+GenerateImgWebp=Barcha rasmlarni .webp formatidagi boshqa versiyasi bilan takrorlang
+ConfirmGenerateImgWebp=Agar tasdiqlasangiz, ushbu papkada joylashgan barcha rasmlar uchun .webp formatida rasm hosil qilasiz (pastki papkalar kiritilmagan) ...
+ConfirmImgWebpCreation=Barcha rasmlarning takrorlanishini tasdiqlang
+SucessConvertImgWebp=Rasmlar muvaffaqiyatli takrorlandi
diff --git a/htdocs/langs/uz_UZ/errors.lang b/htdocs/langs/uz_UZ/errors.lang
index 074d27652d8..8f68f2242be 100644
--- a/htdocs/langs/uz_UZ/errors.lang
+++ b/htdocs/langs/uz_UZ/errors.lang
@@ -5,13 +5,13 @@ NoErrorCommitIsDone=Biz xato qilamiz
 # Errors
 ErrorButCommitIsDone=Xatolar topildi, ammo shunga qaramay biz tasdiqlaymiz
 ErrorBadEMail=%s elektron pochtasi noto'g'ri
-ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
+ErrorBadMXDomain=%s elektron pochtasi noto'g'ri ko'rinadi (domenda MX yozuvi mavjud emas)
 ErrorBadUrl=Url %s noto'g'ri
 ErrorBadValueForParamNotAString=Parametringiz uchun yomon qiymat. Odatda tarjima etishmayotganida qo'shiladi.
 ErrorRefAlreadyExists=<b> %s </b> ma'lumotnomasi allaqachon mavjud.
 ErrorLoginAlreadyExists=%s-ga kirish allaqachon mavjud.
 ErrorGroupAlreadyExists=%s guruhi allaqachon mavjud.
-ErrorEmailAlreadyExists=Email %s already exists.
+ErrorEmailAlreadyExists=%s elektron pochtasi allaqachon mavjud.
 ErrorRecordNotFound=Yozuv topilmadi.
 ErrorFailToCopyFile='<b> %s </b>' faylini '<b> %s </b>' ga ko'chirib bo'lmadi.
 ErrorFailToCopyDir='<b> %s </b>' katalogini '<b> %s </b>' ga ko'chirib bo'lmadi.
@@ -21,8 +21,8 @@ ErrorFailToCreateFile='<b> %s </b>' fayli yaratilmadi.
 ErrorFailToRenameDir='<b> %s </b>' katalogini '<b> %s </b>' deb o'zgartirib bo'lmadi.
 ErrorFailToCreateDir='<b> %s </b>' katalogini yaratib bo'lmadi.
 ErrorFailToDeleteDir='<b> %s </b>' katalogini o'chirib bo'lmadi.
-ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
-ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
+ErrorFailToMakeReplacementInto='<b> %s </b>' fayliga almashtirish amalga oshirilmadi.
+ErrorFailToGenerateFile='<b> %s </b>' faylini yaratib bo'lmadi.
 ErrorThisContactIsAlreadyDefinedAsThisType=Ushbu kontakt allaqachon ushbu turdagi aloqa sifatida aniqlangan.
 ErrorCashAccountAcceptsOnlyCashMoney=Ushbu bank hisobvarag'i kassa hisobvarag'i hisoblanadi, shuning uchun u faqat naqd turdagi to'lovlarni qabul qiladi.
 ErrorFromToAccountsMustDiffers=Bank hisob raqamlarining manbalari va maqsadlari boshqacha bo'lishi kerak.
@@ -39,7 +39,7 @@ ErrorBadSupplierCodeSyntax=Sotuvchi kodi uchun noto'g'ri sintaksis
 ErrorSupplierCodeRequired=Sotuvchi kodi talab qilinadi
 ErrorSupplierCodeAlreadyUsed=Sotuvchi kodi allaqachon ishlatilgan
 ErrorBadParameters=Yomon parametrlar
-ErrorWrongParameters=Wrong or missing parameters
+ErrorWrongParameters=Parametrlar noto'g'ri yoki etishmayapti
 ErrorBadValueForParameter="%s" parametri uchun noto'g'ri qiymat '%s'
 ErrorBadImageFormat=Rasm fayli qo'llab-quvvatlanadigan formatga ega emas (sizning PHP-da ushbu formatdagi rasmlarni o'zgartirish funktsiyalari mavjud emas)
 ErrorBadDateFormat="%s" qiymati noto'g'ri sana formatiga ega
@@ -48,10 +48,10 @@ ErrorFailedToWriteInDir=%s katalogiga yozib bo'lmadi
 ErrorFoundBadEmailInFile=Faylda %s satrlari uchun noto'g'ri elektron pochta sintaksisini topdi (masalan, %s qatori elektron pochta bilan = %s)
 ErrorUserCannotBeDelete=Foydalanuvchini o'chirib bo'lmaydi. Ehtimol, bu Dolibarr sub'ektlari bilan bog'liq.
 ErrorFieldsRequired=Ba'zi majburiy maydonlar bo'sh qoldirildi.
-ErrorSubjectIsRequired=The email subject is required
+ErrorSubjectIsRequired=Elektron pochta mavzusi talab qilinadi
 ErrorFailedToCreateDir=Katalog yaratilmadi. Veb-server foydalanuvchisida Dolibarr hujjatlar katalogiga yozish uchun ruxsat borligini tekshiring. Agar ushbu PHP-da <b> safe_mode </b> parametri yoqilgan bo'lsa, Dolibarr php fayllari veb-server foydalanuvchisiga (yoki guruhiga) tegishli ekanligini tekshiring.
 ErrorNoMailDefinedForThisUser=Ushbu foydalanuvchi uchun hech qanday pochta belgilanmagan
-ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
+ErrorSetupOfEmailsNotComplete=Elektron pochta xabarlarini sozlash tugallanmagan
 ErrorFeatureNeedJavascript=Ushbu xususiyatni ishga tushirish uchun javascript kerak. Buni sozlash - displeyda o'zgartiring.
 ErrorTopMenuMustHaveAParentWithId0="Top" turidagi menyuda asosiy menyu bo'lishi mumkin emas. Bosh menyuga 0 qo'ying yoki "Chap" turidagi menyuni tanlang.
 ErrorLeftMenuMustHaveAParentId="Chap" turidagi menyuda ota-ona identifikatori bo'lishi kerak.
@@ -60,12 +60,12 @@ ErrorDirNotFound=<b> %s </b> katalog topilmadi (Yomon yo'l, noto'g'ri ruxsat yok
 ErrorFunctionNotAvailableInPHP=Ushbu funktsiya uchun <b> %s </b> funktsiyasi talab qilinadi, ammo PHP-ning ushbu versiyasida / sozlamalarida mavjud emas.
 ErrorDirAlreadyExists=Ushbu nomdagi katalog allaqachon mavjud.
 ErrorFileAlreadyExists=Bunday nomdagi fayl allaqachon mavjud.
-ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exists.
+ErrorDestinationAlreadyExists=<b> %s </b> ismli boshqa fayl allaqachon mavjud.
 ErrorPartialFile=Fayl server tomonidan to'liq qabul qilinmadi.
 ErrorNoTmpDir=Vaqtinchalik to'g'ridan-to'g'ri %s mavjud emas.
 ErrorUploadBlockedByAddon=Yuklash PHP / Apache plaginlari tomonidan bloklangan.
 ErrorFileSizeTooLarge=Fayl hajmi juda katta.
-ErrorFieldTooLong=Field %s is too long.
+ErrorFieldTooLong=%s maydoni juda uzun.
 ErrorSizeTooLongForIntType=Int turi uchun juda uzun (maksimal %s raqam)
 ErrorSizeTooLongForVarcharType=Ip turi uchun o'lcham juda uzun (%s belgilar maksimal)
 ErrorNoValueForSelectType=Iltimos, tanlangan ro'yxat uchun qiymatni to'ldiring
@@ -74,7 +74,7 @@ ErrorNoValueForRadioType=Iltimos, radio ro'yxati uchun qiymatni to'ldiring
 ErrorBadFormatValueList=Ro'yxat qiymati bitta verguldan iborat bo'lishi mumkin emas: <u> %s </u>, lekin kamida bittasi kerak: key, value
 ErrorFieldCanNotContainSpecialCharacters=<b> %s </b> maydonida maxsus belgilar bo'lmasligi kerak.
 ErrorFieldCanNotContainSpecialNorUpperCharacters=<b> %s </b> maydonida maxsus belgilar, shuningdek katta harflar bo'lmasligi va faqat raqamlardan iborat bo'lishi kerak.
-ErrorFieldMustHaveXChar=The field <b>%s</b> must have at least %s characters.
+ErrorFieldMustHaveXChar=<b> %s </b> maydonida kamida %s belgilar bo'lishi kerak.
 ErrorNoAccountancyModuleLoaded=Buxgalteriya moduli faollashtirilmagan
 ErrorExportDuplicateProfil=Ushbu eksport to'plami uchun ushbu profil nomi allaqachon mavjud.
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP mos kelmadi.
@@ -83,7 +83,7 @@ ErrorCantSaveADoneUserWithZeroPercentage=Agar "bajarilgan" maydoni ham to'ldiril
 ErrorRefAlreadyExists=<b> %s </b> ma'lumotnomasi allaqachon mavjud.
 ErrorPleaseTypeBankTransactionReportName=Iltimos, yozuv haqida xabar berish kerak bo'lgan bank ma'lumotnomasining nomini kiriting (YYYYMM yoki YYYYMMDD formati)
 ErrorRecordHasChildren=Yozuv o'chirilmadi, chunki ba'zi bir bolalar yozuvlari mavjud.
-ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
+ErrorRecordHasAtLeastOneChildOfType=Ob'ektda %s tipidagi kamida bitta bola mavjud
 ErrorRecordIsUsedCantDelete=Yozuvni o‘chirib bo‘lmadi. U allaqachon ishlatilgan yoki boshqa ob'ektga kiritilgan.
 ErrorModuleRequireJavascript=Ushbu xususiyat ishlashi uchun Javascript o'chirib qo'yilmasligi kerak. Javascriptni yoqish / o'chirish uchun Home-> Setup-> Display menyusiga o'ting.
 ErrorPasswordsMustMatch=Yozilgan har ikkala parol bir-biriga mos kelishi kerak
@@ -96,7 +96,7 @@ ErrorFileIsInfectedWithAVirus=Antivirus dasturi faylni tekshira olmadi (faylga v
 ErrorSpecialCharNotAllowedForField="%s" maydoni uchun maxsus belgilarga ruxsat berilmaydi
 ErrorNumRefModel=Ma'lumotlar bazasida (%s) ma'lumotlar bazasi mavjud va bu raqamlash qoidalariga mos kelmaydi. Ushbu modulni faollashtirish uchun yozuvni o'chirib tashlang yoki nomini o'zgartiring.
 ErrorQtyTooLowForThisSupplier=Ushbu sotuvchi uchun juda kam miqdor yoki ushbu sotuvchida ushbu mahsulot uchun narx belgilanmagan
-ErrorOrdersNotCreatedQtyTooLow=Some orders haven't been created because of too-low quantities
+ErrorOrdersNotCreatedQtyTooLow=Kam miqdordagi buyurtma tufayli ba'zi buyurtmalar yaratilmagan
 ErrorModuleSetupNotComplete=%s modulini sozlash tugallanmaganga o'xshaydi. Tugatish uchun Home - Setup - Modullarga o'ting.
 ErrorBadMask=Maskada xato
 ErrorBadMaskFailedToLocatePosOfSequence=Xato, tartib raqami bo'lmagan niqob
@@ -113,7 +113,7 @@ ErrorForbidden2=Ushbu kirish uchun ruxsat sizning Dolibarr administratoringiz to
 ErrorForbidden3=Dolibarr autentifikatsiya qilingan seans orqali ishlatilmaydi. Autentifikatsiyani qanday boshqarishni bilish uchun Dolibarrni sozlash bo'yicha hujjatlarni ko'rib chiqing (htaccess, mod_auth yoki boshqa ...).
 ErrorNoImagickReadimage=Imagick sinfi ushbu PHP-da mavjud emas. Hech qanday oldindan ko'rish mumkin emas. Administrator ushbu yorliqni O'rnatish - Displey menyusidan o'chirib qo'yishi mumkin.
 ErrorRecordAlreadyExists=Yozuv allaqachon mavjud
-ErrorLabelAlreadyExists=This label already exists
+ErrorLabelAlreadyExists=Ushbu yorliq allaqachon mavjud
 ErrorCantReadFile='%s' faylini o'qib bo'lmadi
 ErrorCantReadDir='%s' katalogini o'qib bo'lmadi
 ErrorBadLoginPassword=Kirish yoki parol uchun noto'g'ri qiymat
@@ -124,9 +124,9 @@ ErrorLoginDoesNotExists=<b> %s </b> tizimiga kirgan foydalanuvchi topilmadi.
 ErrorLoginHasNoEmail=Ushbu foydalanuvchi elektron pochta manziliga ega emas. Jarayon bekor qilindi.
 ErrorBadValueForCode=Xavfsizlik kodi noto'g'ri. Yangi qiymat bilan qayta urinib ko'ring ...
 ErrorBothFieldCantBeNegative=%s va %s maydonlari ikkalasi ham salbiy bo'lishi mumkin emas
-ErrorFieldCantBeNegativeOnInvoice=Field <strong>%s</strong> cannot be negative on this type of invoice. If you need to add a discount line, just create the discount first (from field '%s' in thirdparty card) and apply it to the invoice.
-ErrorLinesCantBeNegativeForOneVATRate=Total of lines (net of tax) can't be negative for a given not null VAT rate (Found a negative total for VAT rate <b>%s</b>%%).
-ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a deposit. You will face problems when you will need to consume the deposit in final invoice if you do so.
+ErrorFieldCantBeNegativeOnInvoice=<strong> %s </strong> maydonchasi ushbu schyot-fakturada salbiy bo'lishi mumkin emas. Agar sizga chegirma chizig'ini qo'shishingiz kerak bo'lsa, avval chegirmani yarating (uchinchi tomon kartasidagi '%s' maydonidan) va uni hisob-fakturaga qo'llang.
+ErrorLinesCantBeNegativeForOneVATRate=Qatorlar yig'indisi (soliqni olib tashlagan holda) QQSning nol bo'lmagan stavkasi uchun salbiy bo'lishi mumkin emas (QQS stavkasi uchun <b> %s </b> %% uchun salbiy jami topildi).
+ErrorLinesCantBeNegativeOnDeposits=Depozitda chiziqlar salbiy bo'lishi mumkin emas. Agar shunday qilsangiz, siz oxirgi hisob-fakturada depozitni iste'mol qilishingiz kerak bo'lganda siz muammolarga duch kelasiz.
 ErrorQtyForCustomerInvoiceCantBeNegative=Xaridorlarning schyot-fakturalari qatori salbiy bo'lishi mumkin emas
 ErrorWebServerUserHasNotPermission=Veb-serverni amalga oshirish uchun foydalanilgan <b> %s </b> foydalanuvchi qayd yozuvida bunga ruxsat yo'q
 ErrorNoActivatedBarcode=Shtrixli kod yoqilmagan
@@ -142,7 +142,7 @@ ErrorFailedToValidatePasswordReset=Parolni qayta tiklab bo'lmadi. Qayta tiklash
 ErrorToConnectToMysqlCheckInstance=Ma'lumotlar bazasiga ulanish muvaffaqiyatsiz tugadi. Ma'lumotlar bazasi serveri ishlayotganligini tekshiring (masalan,
 ErrorFailedToAddContact=Kontakt qo'shilmadi
 ErrorDateMustBeBeforeToday=Sana bugundan pastroq bo'lishi kerak
-ErrorDateMustBeInFuture=The date must be greater than today
+ErrorDateMustBeInFuture=Sana bugundan kattaroq bo'lishi kerak
 ErrorPaymentModeDefinedToWithoutSetup=%s yozish uchun to'lov rejimi o'rnatildi, ammo ushbu to'lov rejimi uchun ma'lumotni aniqlash uchun fakturani moduli o'rnatilmagan.
 ErrorPHPNeedModule=Xato, PHP-da ushbu funktsiyadan foydalanish uchun <b> %s </b> moduli o'rnatilgan bo'lishi kerak.
 ErrorOpenIDSetupNotComplete=OpenID autentifikatsiyasiga ruxsat berish uchun Dolibarr konfiguratsiya faylini o'rnatdingiz, ammo OpenID xizmatining URL manzili doimiy ravishda %s shaklida aniqlanmagan
@@ -168,8 +168,8 @@ ErrorPriceExpression19=Ifoda topilmadi
 ErrorPriceExpression20=Bo'sh ifoda
 ErrorPriceExpression21=Bo'sh natija '%s'
 ErrorPriceExpression22=Salbiy natija '%s'
-ErrorPriceExpression23=Unknown or non set variable '%s' in %s
-ErrorPriceExpression24=Variable '%s' exists but has no value
+ErrorPriceExpression23=%s da noma'lum yoki o'rnatilmagan '%s' o'zgaruvchisi.
+ErrorPriceExpression24='%s' o'zgaruvchisi mavjud, ammo qiymati yo'q
 ErrorPriceExpressionInternal=Ichki xato '%s'
 ErrorPriceExpressionUnknown=Noma'lum xato '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Manba va maqsadli omborlar farq qilishi kerak
@@ -185,12 +185,12 @@ ErrorGlobalVariableUpdater5=Hech qanday global o'zgaruvchi tanlanmagan
 ErrorFieldMustBeANumeric=<b> %s </b> maydon raqamli qiymat bo'lishi kerak
 ErrorMandatoryParametersNotProvided=Majburiy parametr (lar) taqdim etilmagan
 ErrorOppStatusRequiredIfAmount=Siz ushbu tanlov uchun taxminiy miqdorni belgiladingiz. Shunday qilib, siz uning holatini ham kiritishingiz kerak.
-ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
+ErrorFailedToLoadModuleDescriptorForXXX=%s uchun modul identifikatori sinfini yuklab bo'lmadi
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Modul tavsiflovchisidagi menyu qatorining noto'g'ri ta'rifi (fk_menu tugmasi uchun yomon qiymat)
 ErrorSavingChanges=O'zgarishlarni saqlashda xatolik yuz berdi
 ErrorWarehouseRequiredIntoShipmentLine=Yuk tashish uchun omborxonada talab qilinadi
 ErrorFileMustHaveFormat=Fayl %s formatiga ega bo'lishi kerak
-ErrorFilenameCantStartWithDot=Filename can't start with a '.'
+ErrorFilenameCantStartWithDot=Fayl nomini '' bilan boshlash mumkin emas.
 ErrorSupplierCountryIsNotDefined=Ushbu sotuvchi uchun mamlakat aniqlanmagan. Avval buni tuzating.
 ErrorsThirdpartyMerge=Ikki yozuv birlashtirilmadi. So'rov bekor qilindi.
 ErrorStockIsNotEnoughToAddProductOnOrder=%s mahsuloti uchun uni yangi tartibga qo'shish uchun stok etarli emas.
@@ -200,76 +200,76 @@ ErrorStockIsNotEnoughToAddProductOnProposal=%s mahsuloti uchun uni yangi taklifg
 ErrorFailedToLoadLoginFileForMode="%s" rejimi uchun kirish tugmachasini olmadi.
 ErrorModuleNotFound=Modul fayli topilmadi.
 ErrorFieldAccountNotDefinedForBankLine=Buxgalteriya hisobi qiymati %s (%s) manba qatori uchun aniqlanmagan
-ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
-ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Buxgalteriya hisobi qiymati %s (%s) hisob-fakturasi uchun aniqlanmagan
+ErrorFieldAccountNotDefinedForLine=Buxgalteriya hisobi qiymati chiziq uchun aniqlanmagan (%s)
 ErrorBankStatementNameMustFollowRegex=Xato, bank ko'chirma nomi quyidagi sintaksis qoidasiga amal qilishi kerak %s
 ErrorPhpMailDelivery=Qabul qiluvchilarning juda ko'p sonini ishlatmasligingizni va elektron pochta manzilingiz Spamga o'xshamasligini tekshiring. To'liqroq ma'lumot olish uchun administratoringizdan xavfsizlik devori va server jurnallari fayllarini tekshirishni so'rang.
 ErrorUserNotAssignedToTask=Vaqtni sarflashni kiritish uchun foydalanuvchiga topshiriq berilishi kerak.
 ErrorTaskAlreadyAssigned=Vazifa allaqachon foydalanuvchiga berilgan
 ErrorModuleFileSeemsToHaveAWrongFormat=Modul to'plami noto'g'ri formatga o'xshaydi.
-ErrorModuleFileSeemsToHaveAWrongFormat2=At least one mandatory directory must exists into zip of module: <strong>%s</strong> or <strong>%s</strong>
+ErrorModuleFileSeemsToHaveAWrongFormat2=Modul zip-da kamida bitta majburiy katalog mavjud bo'lishi kerak: <strong> %s </strong> yoki <strong> %s </strong>
 ErrorFilenameDosNotMatchDolibarrPackageRules=Modul paketining nomi (<strong> %s </strong>) kutilgan nom sintaksisiga mos kelmaydi: <strong> %s a0a65d071f6fcz
-ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
-ErrorNoWarehouseDefined=Error, no warehouses defined.
-ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
-ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
-ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=Mass validation is not possible when option to increase/decrease stock is set on this action (you must validate one by one so you can define the warehouse to increase/decrease)
-ErrorObjectMustHaveStatusDraftToBeValidated=Object %s must have status 'Draft' to be validated.
-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.
-ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
-ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
-ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
-ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
-ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
-ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
-ErrorURLMustEndWith=URL %s must end %s
-ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
-ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
-ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
-ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
-ErrorSearchCriteriaTooSmall=Search criteria too small.
-ErrorObjectMustHaveStatusActiveToBeDisabled=Objects must have status 'Active' to be disabled
-ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Objects must have status 'Draft' or 'Disabled' to be enabled
-ErrorNoFieldWithAttributeShowoncombobox=No fields has property 'showoncombobox' into definition of object '%s'. No way to show the combolist.
-ErrorFieldRequiredForProduct=Field '%s' is required for product %s
-ProblemIsInSetupOfTerminal=Problem is in setup of terminal %s.
-ErrorAddAtLeastOneLineFirst=Add at least one line first
-ErrorRecordAlreadyInAccountingDeletionNotPossible=Error, record is already transferred in accounting, deletion is not possible.
-ErrorLanguageMandatoryIfPageSetAsTranslationOfAnother=Error, language is mandatory if you set the page as a translation of another one.
-ErrorLanguageOfTranslatedPageIsSameThanThisPage=Error, language of translated page is same than this one.
-ErrorBatchNoFoundForProductInWarehouse=No lot/serial found for product "%s" in warehouse "%s".
-ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=No enough quantity for this lot/serial for product "%s" in warehouse "%s".
-ErrorOnlyOneFieldForGroupByIsPossible=Only 1 field for the 'Group by' is possible (others are discarded)
-ErrorTooManyDifferentValueForSelectedGroupBy=Found too many different value (more than <b>%s</b>) for the field '<b>%s</b>', so we can't use it as a 'Group by' for graphics. The field 'Group By' has been removed. May be you wanted to use it as an X-Axis ?
-ErrorReplaceStringEmpty=Error, the string to replace into is empty
-ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
-ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
-ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
-ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<b> to allow use of Command Line Interface by the internal job scheduler
-ErrorLoginDateValidity=Error, this login is outside the validity date range
-ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
-ErrorReservedKeyword=The word '<b>%s</b>' is a reserved keyword
-ErrorNotAvailableWithThisDistribution=Not available with this distribution
-ErrorPublicInterfaceNotEnabled=Public interface was not enabled
-ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
-ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
-ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
-ErrorDateIsInFuture=Error, the date can't be in the future
-ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
-ErrorAPercentIsRequired=Error, please fill in the percentage correctly
-ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
-ErrorFailedToFindEmailTemplate=Failed to find template with code name %s
+ErrorDuplicateTrigger=Xato, %s trigger nomini takrorlang. %s dan allaqachon yuklangan.
+ErrorNoWarehouseDefined=Xato, omborlar aniqlanmadi.
+ErrorBadLinkSourceSetButBadValueForRef=Siz foydalanadigan havola yaroqsiz. To'lov uchun "manba" aniqlangan, ammo "ref" qiymati haqiqiy emas.
+ErrorTooManyErrorsProcessStopped=Juda ko'p xatolar. Jarayon to'xtatildi.
+ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=Ushbu aksiyada zaxirani ko'paytirish / kamaytirish variantini o'rnatilganda ommaviy tekshirish mumkin emas (siz birma-bir tasdiqlashingiz kerak, shunda siz omborni oshirish / kamaytirish uchun)
+ErrorObjectMustHaveStatusDraftToBeValidated=%s ob'ekti tasdiqlanishi uchun "Qoralama" holatiga ega bo'lishi kerak.
+ErrorObjectMustHaveLinesToBeValidated=%s ob'ekti tasdiqlanishi uchun satrlarga ega bo'lishi kerak.
+ErrorOnlyInvoiceValidatedCanBeSentInMassAction=Faqat tasdiqlangan hisob-fakturalarni "Elektron pochta orqali yuborish" ommaviy aksiyasi yordamida yuborish mumkin.
+ErrorChooseBetweenFreeEntryOrPredefinedProduct=Maqola oldindan belgilangan mahsulotmi yoki yo'qligini tanlashingiz kerak
+ErrorDiscountLargerThanRemainToPaySplitItBefore=Siz qo'llamoqchi bo'lgan chegirma to'lashdan ko'ra kattaroqdir. Oldinroq chegirmani 2 ta kichik chegirmaga bo'ling.
+ErrorFileNotFoundWithSharedLink=Fayl topilmadi. Ehtimol, ulashish kaliti o'zgartirilgan yoki fayl yaqinda olib tashlangan bo'lishi mumkin.
+ErrorProductBarCodeAlreadyExists=%s mahsulotining shtrix-kodi boshqa mahsulot ma'lumotnomasida mavjud.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Shuni ham unutmangki, hech bo'lmaganda bitta subproduct (yoki subproduct) seriya / lot raqami kerak bo'lganda subproductlarni avtomatik ravishda oshirish / kamaytirish uchun to'plamlardan foydalanish mumkin emas.
+ErrorDescRequiredForFreeProductLines=Tavsif bepul mahsulotga ega chiziqlar uchun majburiydir
+ErrorAPageWithThisNameOrAliasAlreadyExists=Sahifa / konteyner <strong> %s </strong> siz foydalanmoqchi bo'lganingiz bir xil nom yoki muqobil taxallusga ega
+ErrorDuringChartLoad=Hisob rejasini yuklashda xatolik yuz berdi. Agar bir nechta hisob yuklanmagan bo'lsa, ularni qo'lda kiritishingiz mumkin.
+ErrorBadSyntaxForParamKeyForContent=Param keyforcontent uchun noto'g'ri sintaksis. %s yoki %s bilan boshlanadigan qiymat bo'lishi kerak
+ErrorVariableKeyForContentMustBeSet=Xato, %s (matnli tarkib ko'rsatilishi kerak) yoki %s (tashqi url ko'rsatilishi kerak) bilan doimiy o'rnatilishi kerak.
+ErrorURLMustEndWith=URL %s tugashi kerak %s
+ErrorURLMustStartWithHttp=%s URL manzili http: // yoki https: // bilan boshlanishi kerak.
+ErrorHostMustNotStartWithHttp=%s xost nomi http: // yoki https: // bilan boshlanmasligi kerak.
+ErrorNewRefIsAlreadyUsed=Xato, yangi ma'lumotnoma allaqachon ishlatilgan
+ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Xatolik yuz berdi, yopiq hisob-fakturaga ulangan to'lovni o'chirib bo'lmaydi.
+ErrorSearchCriteriaTooSmall=Qidiruv mezonlari juda kichik.
+ErrorObjectMustHaveStatusActiveToBeDisabled=O'chirish uchun ob'ektlar "Faol" holatiga ega bo'lishi kerak
+ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Ob'ektlarni yoqish uchun "Qoralama" yoki "O'chirilgan" holati bo'lishi kerak
+ErrorNoFieldWithAttributeShowoncombobox=Hech bir maydonda '%s' ob'ekti ta'rifida 'showoncombobox' xususiyati mavjud emas. Kombolistni ko'rsatishning imkoni yo'q.
+ErrorFieldRequiredForProduct=%s mahsuloti uchun '%s' maydoni talab qilinadi
+ProblemIsInSetupOfTerminal=Muammo %s terminalini o'rnatishda.
+ErrorAddAtLeastOneLineFirst=Avval kamida bitta satr qo'shing
+ErrorRecordAlreadyInAccountingDeletionNotPossible=Xato, yozuv allaqachon buxgalteriya hisobiga o'tkazilgan, yo'q qilish mumkin emas.
+ErrorLanguageMandatoryIfPageSetAsTranslationOfAnother=Xato, agar siz sahifani boshqasining tarjimasi sifatida o'rnatgan bo'lsangiz, til majburiydir.
+ErrorLanguageOfTranslatedPageIsSameThanThisPage=Xato, tarjima qilingan sahifaning tili shu bilan bir xil.
+ErrorBatchNoFoundForProductInWarehouse="%s" mahsuloti uchun "%s" omborida lot / seriya topilmadi.
+ErrorBatchNoFoundEnoughQuantityForProductInWarehouse="%s" mahsuloti uchun "%s" omborida ushbu lot / seriya uchun etarli miqdor yo'q.
+ErrorOnlyOneFieldForGroupByIsPossible="Guruh guruhi" uchun faqat bitta maydon bo'lishi mumkin (boshqalar bekor qilinadi)
+ErrorTooManyDifferentValueForSelectedGroupBy='<b> %s </b>' uchun maydon juda ko'p turli xil qiymatlarni (<b> %s </b> dan ortiq) topdi, shunday qilib we 'we can'. "Guruh guruhi" maydoni olib tashlandi. Siz uni X o'qi sifatida ishlatishni xohlaysizmi?
+ErrorReplaceStringEmpty=Xato, o'rnini bosadigan satr bo'sh
+ErrorProductNeedBatchNumber=Xato, '<b> %s </b>' mahsulotiga juda ko'p / seriya raqami kerak
+ErrorProductDoesNotNeedBatchNumber=Xato, '<b> %s </b>' mahsuloti ko'p / seriya raqamini qabul qilmaydi
+ErrorFailedToReadObject=Xato, <b> %s </b> turidagi ob'ekt o'qilmadi
+ErrorParameterMustBeEnabledToAllwoThisFeature=Xato, <b> %s </b> parametri <b> conf / conf.php <b> ga o'rnatilgan bo'lishi kerak.
+ErrorLoginDateValidity=Xato, ushbu kirish amal qilish muddati oralig'ida emas
+ErrorValueLength='<b> %s </b>' maydonining uzunligi '<b> %s </b>' dan yuqori bo'lishi kerak
+ErrorReservedKeyword='<b> %s </b>' so'zi zaxiralangan kalit so'z
+ErrorNotAvailableWithThisDistribution=Ushbu tarqatish bilan mavjud emas
+ErrorPublicInterfaceNotEnabled=Umumiy interfeys yoqilmagan
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=Yangi sahifaning tili boshqa sahifaning tarjimasi sifatida o'rnatilgan bo'lsa aniqlanishi kerak
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=Yangi sahifaning tili boshqa sahifaning tarjimasi sifatida o'rnatilgan bo'lsa, manba tili bo'lmasligi kerak
+ErrorAParameterIsRequiredForThisOperation=Ushbu operatsiyani bajarish uchun parametr majburiydir
+ErrorDateIsInFuture=Xato, sana kelajakda bo'lishi mumkin emas
+ErrorAnAmountWithoutTaxIsRequired=Xato, miqdor majburiydir
+ErrorAPercentIsRequired=Xato, foizni to'g'ri to'ldiring
+ErrorYouMustFirstSetupYourChartOfAccount=Avval hisob qaydnomangizni o'rnatishingiz kerak
+ErrorFailedToFindEmailTemplate=%s kodli shablonni topib bo'lmadi
 
 # Warnings
-WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
+WarningParamUploadMaxFileSizeHigherThanPostMaxSize=PHP parametringiz upload_max_filesize (%s) PHP post_max_size (%s) parametridan yuqori. Bu izchil o'rnatish emas.
 WarningPasswordSetWithNoAccount=Ushbu a'zo uchun parol o'rnatildi. Biroq, foydalanuvchi hisobi yaratilmagan. Shunday qilib, ushbu parol saqlanadi, ammo Dolibarr-ga kirish uchun foydalanib bo'lmaydi. U tashqi modul / interfeys tomonidan ishlatilishi mumkin, ammo agar siz a'zo uchun hech qanday login va parolni belgilashga hojat bo'lmasa, siz "har bir a'zo uchun kirishni boshqarish" parametrini a'zo modulidan o'chirib qo'yishingiz mumkin. Agar sizga loginni boshqarish kerak bo'lsa, lekin hech qanday parol kerak bo'lmasa, ushbu ogohlantirishni oldini olish uchun ushbu maydonni bo'sh qoldirishingiz mumkin. Izoh: Agar foydalanuvchi bilan bog'langan bo'lsa, elektron pochta orqali kirish sifatida ham foydalanish mumkin.
 WarningMandatorySetupNotComplete=Majburiy parametrlarni o'rnatish uchun shu erni bosing
-WarningEnableYourModulesApplications=Click here to enable your modules and applications
+WarningEnableYourModulesApplications=Modul va dasturlarni yoqish uchun shu erni bosing
 WarningSafeModeOnCheckExecDir=Ogohlantirish, PHP opsiyasi <b> </b> yoniq, shuning uchun buyruq php parametri <b> safe_mode_exec_dir </b> php parametri bilan e'lon qilingan katalog ichida saqlanishi kerak.
 WarningBookmarkAlreadyExists=Ushbu nom yoki ushbu maqsad (URL) bilan xatcho'p allaqachon mavjud.
 WarningPassIsEmpty=Ogohlantirish, ma'lumotlar bazasi paroli bo'sh. Bu xavfsizlik teshigi. Ma'lumotlar bazasiga parol qo'shishingiz va conf.php faylini o'zgartirishingiz kerak.
@@ -286,18 +286,19 @@ WarningPaymentDateLowerThanInvoiceDate=To'lov sanasi (%s) %s hisob-fakturasi uch
 WarningTooManyDataPleaseUseMoreFilters=Ma'lumot juda ko'p (%s qatorlaridan ko'p). Iltimos, ko'proq filtrlardan foydalaning yoki %s doimiyligini yuqori chegaraga o'rnating.
 WarningSomeLinesWithNullHourlyRate=Ba'zi foydalanuvchilar ba'zi soatlarda soatlik stavkasi aniqlanmagan holda qayd etishgan. Soatiga 0 %s qiymati ishlatilgan, ammo bu sarflangan vaqtni noto'g'ri baholashga olib kelishi mumkin.
 WarningYourLoginWasModifiedPleaseLogin=Kirishingiz o'zgartirildi. Xavfsizlik maqsadida keyingi harakatlar oldidan yangi tizimga kirishingiz kerak bo'ladi.
-WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
-WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the mass actions on lists
-WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
-WarningProjectDraft=Project is still in draft mode. Don't forget to validate it if you plan to use tasks.
-WarningProjectClosed=Project is closed. You must re-open it first.
-WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were removed after that the receipt including them were generated. So nb of cheques and total of receipt may differ from number and total in list.
-WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into ECM database index table
-WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
-WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
-WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
-WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
-ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
-ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
-CheckVersionFail=Version check fail
-ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
+WarningAnEntryAlreadyExistForTransKey=Ushbu til uchun tarjima kaliti uchun yozuv allaqachon mavjud
+WarningNumberOfRecipientIsRestrictedInMassAction=Ogohlantirish, turli xil qabul qiluvchilar soni <b> %s </b> bilan ro'yxatdagi ommaviy harakatlardan foydalanishda cheklangan
+WarningDateOfLineMustBeInExpenseReportRange=Ogohlantirish, satr sanasi xarajatlar hisoboti doirasiga kirmaydi
+WarningProjectDraft=Loyiha hali ham qoralama rejimida. Vazifalardan foydalanishni rejalashtirmoqchi bo'lsangiz, uni tasdiqlashni unutmang.
+WarningProjectClosed=Loyiha yopiq. Avval uni qayta ochishingiz kerak.
+WarningSomeBankTransactionByChequeWereRemovedAfter=Ba'zi bir bank operatsiyalari olib qo'yilgandan so'ng olib tashlandi, shu jumladan kvitansiya tuzildi. Shunday qilib, cheklarning nb-si va tushumning umumiy miqdori ro'yxatdagi son va jamidan farq qilishi mumkin.
+WarningFailedToAddFileIntoDatabaseIndex=Ogohlantirish, ECM ma'lumotlar bazasi indekslari jadvaliga fayllar kiritilmadi
+WarningTheHiddenOptionIsOn=Ogohlantirish, <b> %s </b> yashirin variant yoniq.
+WarningCreateSubAccounts=Ogohlantirish, siz to'g'ridan-to'g'ri sub-qayd yozuvini yaratolmaysiz, uchinchi tomon yoki foydalanuvchini yaratishingiz va ularni ushbu ro'yxatda topish uchun ularga buxgalteriya kodini tayinlashingiz kerak.
+WarningAvailableOnlyForHTTPSServers=Faqat HTTPS xavfsiz ulanishidan foydalanish mumkin.
+WarningModuleXDisabledSoYouMayMissEventHere=%s moduli yoqilmagan. Shunday qilib, siz bu erda ko'plab tadbirlarni o'tkazib yuborishingiz mumkin.
+ErrorActionCommPropertyUserowneridNotDefined=Foydalanuvchi egasi talab qilinadi
+ErrorActionCommBadType=Tanlangan voqea turi (id: %n, kod: %s) Voqealar turi lug'atida mavjud emas
+CheckVersionFail=Versiyani tekshirib bo'lmadi
+ErrorWrongFileName=Fayl nomida __SOMETHING__ bo'lishi mumkin emas
+ErrorNotInDictionaryPaymentConditions=To'lov shartlari lug'atida yo'q, iltimos o'zgartiring.
diff --git a/htdocs/langs/uz_UZ/eventorganization.lang b/htdocs/langs/uz_UZ/eventorganization.lang
index 335c257b224..24143ece722 100644
--- a/htdocs/langs/uz_UZ/eventorganization.lang
+++ b/htdocs/langs/uz_UZ/eventorganization.lang
@@ -17,127 +17,131 @@
 #
 # Generic
 #
-ModuleEventOrganizationName = Event Organization
-EventOrganizationDescription = Event Organization through Module Project
-EventOrganizationDescriptionLong= Manage Event organization for conference, attendees, speaker, and attendees, with public subcription page
+ModuleEventOrganizationName = Tadbirni tashkil etish
+EventOrganizationDescription = Modul loyihasi orqali tadbirlarni tashkil etish
+EventOrganizationDescriptionLong= Konferentsiya, ishtirokchilar, ma'ruzachilar va ishtirokchilar uchun tadbirlarni tashkil qilishni ommaviy pastki sahifasi bilan boshqaring
 #
 # Menu
 #
-EventOrganizationMenuLeft = Organized events
-EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
+EventOrganizationMenuLeft = Tashkil etilgan tadbirlar
+EventOrganizationConferenceOrBoothMenuLeft = Konferentsiya yoki stend
 
 #
 # Admin page
 #
-EventOrganizationSetup = Event Organization setup
-Settings = Settings
-EventOrganizationSetupPage = Event Organization setup page
-EVENTORGANIZATION_TASK_LABEL = Label of tasks to create automatically when project is validated
-EVENTORGANIZATION_TASK_LABELTooltip = When you validate an organized event, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conference<br>Send Call for Booth<br>Receive call for conferences<br>Receive call for Booth<br>Open subscriptions to events for attendees<br>Send remind of event to speakers<br>Send remind of event to Booth hoster<br>Send remind of event to attendees
-EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties automatically created when someone suggests a conference
-EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Category to add to third-parties automatically created when they suggests a booth
-EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Template of email to send after receiving a suggestion of a conference.
-EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Template of email to send after receiving a suggestion of a booth.
-EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Template of email to send  after a subscription to a booth has been paid.
-EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Template of email to send after a subscription to an event has been paid.
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Template of email of massaction to attendes
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
-EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+EventOrganizationSetup = Tadbirni tashkil qilishni sozlash
+Settings = Sozlamalar
+EventOrganizationSetupPage = Tadbirni tashkil etish sahifasi
+EVENTORGANIZATION_TASK_LABEL = Loyiha tasdiqlanganda avtomatik ravishda yaratiladigan vazifalar yorlig'i
+EVENTORGANIZATION_TASK_LABELTooltip = Agar tashkil etilgan tadbirda tasdiqlashimiz bo'lsa, ba'zi vazifalar avtomatik ravishda Masalan loyiha <br> <br> yaratilgan bo'lishi mumkin: konferensiyasi uchun <br> Send qo'ng'iroq <br> tashrif buyurganlar uchun voqealarga ochiq obuna <br> But uchun qo'ng'iroq olish <br> konferentsiyalar uchun qo'ng'iroq olish <br> But chaqiraman yuborish <br> Tadbirni ma'ruzachilarga eslatib turish
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Kimdir konferentsiya taklif qilganda avtomatik ravishda tuziladigan uchinchi tomonlarga qo'shiladigan toifadir
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Uchinchi shaxslarga qo'shiladigan toifani, ular stendni taklif qilganda avtomatik ravishda yaratiladi
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Konferentsiya taklifini olgandan so'ng yuborish uchun elektron pochta shablonini.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Stend taklifini olgandan keyin yuborish uchun elektron pochta shablonini.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Stendga obuna bo'lgandan keyin yuborish uchun elektron pochta shablonini.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Tadbirga obuna bo'lgandan keyin yuborish uchun elektron pochta shablonini.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Ishtirokchilarga ommaviy massaj elektron pochta shablonini
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Spikerlarga ommaviy elektron pochta orqali yuborilgan shablon
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Uchinchi tomonning tanlangan ro'yxatini ishtirokchilarni yaratish kartasida / toifadagi katakchasida filtrlang
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Uchinchi tomonning tanlangan ro'yxatini ishtirokchilarni yaratish kartasida / mijozning turiga qarab shaklda filtrlang
 
 #
 # Object
 #
-EventOrganizationConfOrBooth= Conference Or Booth
-ManageOrganizeEvent = Manage event organisation
-ConferenceOrBooth = Conference Or Booth
-ConferenceOrBoothTab = Conference Or Booth
-AmountOfSubscriptionPaid = Amount of subscription paid
-DateSubscription = Date of subscription
-ConferenceOrBoothAttendee = Conference Or Booth Attendee
+EventOrganizationConfOrBooth= Konferentsiya yoki stend
+ManageOrganizeEvent = Tadbirni tashkil qilishni boshqaring
+ConferenceOrBooth = Konferentsiya yoki stend
+ConferenceOrBoothTab = Konferentsiya yoki stend
+AmountOfSubscriptionPaid = To'langan obuna miqdori
+DateSubscription = Obuna sanasi
+ConferenceOrBoothAttendee = Konferentsiya yoki stend ishtirokchisi
 
 #
 # Template Mail
 #
-YourOrganizationEventConfRequestWasReceived = Your request for conference was received
-YourOrganizationEventBoothRequestWasReceived = Your request for booth was received
-EventOrganizationEmailAskConf = Request for conference
-EventOrganizationEmailAskBooth = Request for booth
-EventOrganizationEmailSubsBooth = Subscription for booth
-EventOrganizationEmailSubsEvent = Subscription for an event
-EventOrganizationMassEmailAttendees = Communication to attendees
-EventOrganizationMassEmailSpeakers = Communication to speakers
+YourOrganizationEventConfRequestWasReceived = Konferentsiya uchun so'rovingiz qabul qilindi
+YourOrganizationEventBoothRequestWasReceived = Sizning kabinangizga bo'lgan talabingiz qabul qilindi
+EventOrganizationEmailAskConf = Konferentsiya uchun so'rov
+EventOrganizationEmailAskBooth = Stendga buyurtma
+EventOrganizationEmailSubsBooth = Stend uchun obuna
+EventOrganizationEmailSubsEvent = Hodisa uchun obuna
+EventOrganizationMassEmailAttendees = Ishtirokchilar bilan aloqa
+EventOrganizationMassEmailSpeakers = Spikerlar bilan aloqa
 
 #
 # Event
 #
-AllowUnknownPeopleSuggestConf=Allow unknown people to suggest conferences
-AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest conferences
-AllowUnknownPeopleSuggestBooth=Allow unknown people to suggest booth
-AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to suggest booth
-PriceOfRegistration=Price of registration
-PriceOfRegistrationHelp=Price of registration
-PriceOfBooth=Subscription price to stand a booth
-PriceOfBoothHelp=Subscription price to stand a booth
-EventOrganizationICSLink=Link ICS for events
-ConferenceOrBoothInformation=Conference Or Booth informations
-Attendees = Attendees
-DownloadICSLink = Download ICS link
-EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
-SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
-SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
+AllowUnknownPeopleSuggestConf=Noma'lum odamlarga konferentsiyalarni o'tkazishga ruxsat bering
+AllowUnknownPeopleSuggestConfHelp=Noma'lum odamlarga konferentsiyalarni o'tkazishga ruxsat bering
+AllowUnknownPeopleSuggestBooth=Noma'lum odamlarga stendni taklif qilishga ruxsat bering
+AllowUnknownPeopleSuggestBoothHelp=Noma'lum odamlarga stendni taklif qilishga ruxsat bering
+PriceOfRegistration=Ro'yxatdan o'tish narxi
+PriceOfRegistrationHelp=Ro'yxatdan o'tish narxi
+PriceOfBooth=Stendda turish uchun obuna narxi
+PriceOfBoothHelp=Stendda turish uchun obuna narxi
+EventOrganizationICSLink=Voqealar uchun ICS-ni bog'lang
+ConferenceOrBoothInformation=Konferentsiya yoki stend ma'lumotlari
+Attendees = Ishtirokchilar
+DownloadICSLink = ICS havolasini yuklab oling
+EVENTORGANIZATION_SECUREKEY = Konferentsiyaga ochiq ro'yxatdan o'tishning havfli kaliti
+SERVICE_BOOTH_LOCATION = Stend joylashgan joy haqida hisob-faktura qatori uchun ishlatiladigan xizmat
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Konferentsiyaga qatnashuvchi obuna haqida hisob-faktura satrida ishlatiladigan xizmat
+NbVotes=Number of votes
 #
 # Status
 #
-EvntOrgDraft = Draft
-EvntOrgSuggested = Suggested
-EvntOrgConfirmed = Confirmed
-EvntOrgNotQualified = Not Qualified
-EvntOrgDone = Done
-EvntOrgCancelled = Cancelled
+EvntOrgDraft = Qoralama
+EvntOrgSuggested = Tavsiya etilgan
+EvntOrgConfirmed = Tasdiqlandi
+EvntOrgNotQualified = Malakali emas
+EvntOrgDone = Bajarildi
+EvntOrgCancelled = Bekor qilindi
 #
 # Public page
 #
-SuggestForm = Suggestion page
-RegisterPage = Page for conferences or booth
-EvntOrgRegistrationHelpMessage = Here, you can vote for an event, or suggest a new conference or booth for the project
-EvntOrgRegistrationConfHelpMessage = Here, you can suggest a new conference for the project
-EvntOrgRegistrationBoothHelpMessage = Here, you can suggest a new booth for the project
-ListOfSuggestedConferences = List of suggested conferences
-ListOfSuggestedBooths = List of suggested booths
-SuggestConference = Suggest a new conference
-SuggestBooth = Suggest a booth
-ViewAndVote = View and vote for suggested events
-PublicAttendeeSubscriptionPage = Public link of registration to a conference
-MissingOrBadSecureKey = The security key is invalid or missing
-EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference : '%s'
-EvntOrgDuration = This conference starts on %s and ends on %s.
-ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
-BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
-EventType = Event type
+SuggestForm = Takliflar sahifasi
+RegisterPage = Konferentsiyalar yoki stendlar uchun sahifa
+EvntOrgRegistrationHelpMessage = Bu erda siz tadbir uchun ovoz berishingiz yoki loyiha uchun yangi konferentsiya yoki stendni taklif qilishingiz mumkin
+EvntOrgRegistrationConfHelpMessage = Bu erda siz loyiha uchun yangi konferentsiya taklif qilishingiz mumkin
+EvntOrgRegistrationBoothHelpMessage = Bu erda siz loyiha uchun yangi stendni taklif qilishingiz mumkin
+ListOfSuggestedConferences = Tavsiya etilgan konferentsiyalar ro'yxati
+ListOfSuggestedBooths = Tavsiya etilgan kabinalar ro'yxati
+SuggestConference = Yangi konferentsiyani taklif eting
+SuggestBooth = Stendni taklif qiling
+ViewAndVote = Taklif etilgan tadbirlarni ko'ring va ovoz bering
+PublicAttendeeSubscriptionPage = Konferentsiyaga ro'yxatdan o'tishning ommaviy havolasi
+MissingOrBadSecureKey = Elektron kalit yaroqsiz yoki yo'q
+EvntOrgWelcomeMessage = Ushbu shakl sizga konferentsiyaning yangi ishtirokchisi sifatida ro'yxatdan o'tishga imkon beradi: '%s'
+EvntOrgDuration = Ushbu anjuman %s da boshlanadi va %s da tugaydi.
+ConferenceAttendeeFee = Tadbir uchun konferentsiya qatnashchilari uchun to'lov: '%s' %s dan %s gacha.
+BoothLocationFee = Hodisa uchun stend joylashuvi: %s dan %s gacha bo'lgan '%s'.
+EventType = Tadbir turi
+LabelOfBooth=Booth label
+LabelOfconference=Conference label
+ConferenceIsNotConfirmed=Subcription not available, conference is not confirmed yet
 
 #
 # Vote page
 #
-EvntOrgRegistrationWelcomeMessage = Welcome on the conference or booth suggestion page.
-EvntOrgRegistrationConfWelcomeMessage = Welcome on the conference suggestion page.
-EvntOrgRegistrationBoothWelcomeMessage = Welcome on the booth suggestion page.
-EvntOrgVoteHelpMessage = Here, you can view and vote for the suggested events for the project
-VoteOk = Your vote has been accepted.
-AlreadyVoted = You have already voted for this event.
-VoteError = An error has occurred during the vote, please try again.
+EvntOrgRegistrationWelcomeMessage = Konferentsiyada yoki kabinet takliflari sahifasida xush kelibsiz.
+EvntOrgRegistrationConfWelcomeMessage = Konferentsiya takliflari sahifasida xush kelibsiz.
+EvntOrgRegistrationBoothWelcomeMessage = Stend takliflari sahifasida xush kelibsiz.
+EvntOrgVoteHelpMessage = Bu erda siz loyiha uchun taklif qilingan tadbirlarni ko'rishingiz va ularga ovoz berishingiz mumkin
+VoteOk = Sizning ovozingiz qabul qilindi.
+AlreadyVoted = Siz ushbu tadbir uchun allaqachon ovoz bergansiz.
+VoteError = Ovoz berish paytida xatolik yuz berdi, qayta urinib ko'ring.
 
 #
 # SubscriptionOk page
 #
-SubscriptionOk = Your subscription to this conference has been validated
+SubscriptionOk = Ushbu konferentsiyaga obunangiz tasdiqlandi
 #
 # Subscription validation mail
 #
-ConfAttendeeSubscriptionConfirmation = Confirmation of your subscription to a conference
+ConfAttendeeSubscriptionConfirmation = Konferentsiyaga obuna bo'lganligingizni tasdiqlash
 #
 # Payment page
 #
-Attendee = Attendee
-PaymentConferenceAttendee = Conference attendee payment
-PaymentBoothLocation = Booth location payment
+Attendee = Ishtirokchi
+PaymentConferenceAttendee = Konferentsiya qatnashchilarining to'lovlari
+PaymentBoothLocation = Stend joylashgan joy uchun to'lov
diff --git a/htdocs/langs/uz_UZ/exports.lang b/htdocs/langs/uz_UZ/exports.lang
index 516ca7a2214..a38dd574a31 100644
--- a/htdocs/langs/uz_UZ/exports.lang
+++ b/htdocs/langs/uz_UZ/exports.lang
@@ -26,8 +26,8 @@ FieldTitle=Maydon nomi
 NowClickToGenerateToBuildExportFile=Endi, ochilgan maydonda fayl formatini tanlang va eksport faylini yaratish uchun "Yaratish" tugmasini bosing ...
 AvailableFormats=Mavjud formatlar
 LibraryShort=Kutubxona
-ExportCsvSeparator=Csv caracter separator
-ImportCsvSeparator=Csv caracter separator
+ExportCsvSeparator=CSV karakterlarni ajratuvchi
+ImportCsvSeparator=CSV karakterlarni ajratuvchi
 Step=Qadam
 FormatedImport=Import yordamchisi
 FormatedImportDesc1=Ushbu modul yordamchi yordamida texnik ma'lumotlarga ega bo'lmagan fayldan mavjud ma'lumotlarni yangilash yoki ma'lumotlar bazasiga yangi moslamalarni qo'shish imkonini beradi.
@@ -53,7 +53,8 @@ TypeOfLineServiceOrProduct=Qator turi (0 = mahsulot, 1 = xizmat)
 FileWithDataToImport=Import qilish uchun ma'lumotlar bilan fayl
 FileToImport=Import qilish uchun manba fayl
 FileMustHaveOneOfFollowingFormat=Import qilish uchun fayl quyidagi formatlardan biriga ega bo'lishi kerak
-DownloadEmptyExample=Shablon faylini maydon tarkibidagi ma'lumotlar bilan yuklab oling (* majburiy maydonlar)
+DownloadEmptyExample=Shablon faylini maydon tarkibidagi ma'lumotlar bilan yuklab oling
+StarAreMandatory=* majburiy maydonlar
 ChooseFormatOfFileToImport=Faylni import qilish formati sifatida tanlang, uni tanlash uchun %s belgisini bosing ...
 ChooseFileToImport=Faylni yuklang, so'ngra faylni manba import fayli sifatida tanlash uchun %s belgisini bosing ...
 SourceFileFormat=Manba fayl formati
@@ -115,14 +116,14 @@ ExportDateFilter=YYYY, YYYYMM, YYYYMMDD: filtrlar bir yil / oy / kunga <br> YYYY
 ExportNumericFilter=NNNNN bitta qiymat bo'yicha filtrlaydi <br> NNNNN + NNNNN <br> <NNNNN pastki qiymatlari bo'yicha filtrlaydi <br>> NNNNN yuqori qiymatlarga ko'ra filtrlaydi
 ImportFromLine=Qator raqamidan boshlab import qilish
 EndAtLineNb=Satr raqamida tugatish
-ImportFromToLine=Limit range (From - To). Eg. to omit header line(s).
+ImportFromToLine=Cheklov diapazoni (dan - ga). Masalan. sarlavha satrlarini (larini) chiqarib tashlash.
 SetThisValueTo2ToExcludeFirstLine=Masalan, 2 ta birinchi qatorni chiqarib tashlash uchun ushbu qiymatni 3 ga o'rnating. <br> Agar sarlavha satrlari chiqarib tashlanmasa, bu Import Simulyatsiyasida bir nechta xatolarga olib keladi.
 KeepEmptyToGoToEndOfFile=Fayl oxirigacha barcha satrlarni qayta ishlash uchun ushbu maydonni bo'sh qoldiring.
-SelectPrimaryColumnsForUpdateAttempt=Select column(s) to use as primary key for an UPDATE import
-UpdateNotYetSupportedForThisImport=Update is not supported for this type of import (only insert)
-NoUpdateAttempt=No update attempt was performed, only insert
-ImportDataset_user_1=Users (employees or not) and properties
-ComputedField=Computed field
+SelectPrimaryColumnsForUpdateAttempt=UPDATE importi uchun asosiy kalit sifatida foydalanish uchun ustun (lar) ni tanlang
+UpdateNotYetSupportedForThisImport=Ushbu turdagi import uchun yangilanish mavjud emas (faqat qo'shish)
+NoUpdateAttempt=Yangilashga urinish amalga oshirilmadi, faqat qo'shib qo'ying
+ImportDataset_user_1=Foydalanuvchilar (xodimlar yoki yo'q) va xususiyatlari
+ComputedField=Hisoblangan maydon
 ## filters
 SelectFilterFields=Agar siz ba'zi bir qiymatlar bo'yicha filtrlashni xohlasangiz, bu erda faqat qiymatlarni kiriting.
 FilteredFields=Filtrlangan maydonlar
@@ -133,4 +134,4 @@ KeysToUseForUpdates=Mavjud ma'lumotlarni </b> yangilash uchun <b> uchun ishlatil
 NbInsert=Kiritilgan qatorlar soni: %s
 NbUpdate=Yangilangan qatorlar soni: %s
 MultipleRecordFoundWithTheseFilters=Ushbu filtrlar yordamida bir nechta yozuvlar topildi: %s
-StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
+StocksWithBatch=Partiya / seriya raqami bo'lgan mahsulot zaxiralari va joylashuvi (ombor)
diff --git a/htdocs/langs/uz_UZ/holiday.lang b/htdocs/langs/uz_UZ/holiday.lang
index 0abdc9dc374..588515a37cd 100644
--- a/htdocs/langs/uz_UZ/holiday.lang
+++ b/htdocs/langs/uz_UZ/holiday.lang
@@ -15,14 +15,14 @@ CancelCP=Bekor qilindi
 RefuseCP=Rad etildi
 ValidatorCP=Tasdiqlovchi
 ListeCP=Ta'til ro'yxati
-Leave=Leave request
-LeaveId=Leave ID
+Leave=So'rovni qoldiring
+LeaveId=IDni qoldiring
 ReviewedByCP=Tomonidan tasdiqlanadi
-UserID=User ID
-UserForApprovalID=User for approval ID
-UserForApprovalFirstname=First name of approval user
-UserForApprovalLastname=Last name of approval user
-UserForApprovalLogin=Login of approval user
+UserID=foydalanuvchi IDsi
+UserForApprovalID=Tasdiqlash identifikatori uchun foydalanuvchi
+UserForApprovalFirstname=Tasdiqlovchi foydalanuvchining ismi
+UserForApprovalLastname=Tasdiqlovchi foydalanuvchining familiyasi
+UserForApprovalLogin=Tasdiqlash foydalanuvchisining kirishi
 DescCP=Tavsif
 SendRequestCP=Dam olish uchun so'rov yarating
 DelayToRequestCP=Dam olish uchun so'rovlar kamida <b> %s kun (lar) dan oldin </b> amalga oshirilishi kerak.
@@ -36,16 +36,16 @@ ErrorUserViewCP=Ushbu ta'tilga oid talabni o'qishga vakolatingiz yo'q.
 InfosWorkflowCP=Axborotning ishlash jarayoni
 RequestByCP=Tomonidan so'ralgan
 TitreRequestCP=So'rovni qoldiring
-TypeOfLeaveId=Type of leave ID
-TypeOfLeaveCode=Type of leave code
-TypeOfLeaveLabel=Type of leave label
+TypeOfLeaveId=Ta'til guvohnomasi turi
+TypeOfLeaveCode=Dam olish kodining turi
+TypeOfLeaveLabel=Ta'til yorlig'i turi
 NbUseDaysCP=Ishlatilgan ta'til kunlari soni
-NbUseDaysCPHelp=The calculation takes into account the non-working days and the holidays defined in the dictionary.
-NbUseDaysCPShort=Days of leave
-NbUseDaysCPShortInMonth=Days of leave in month
-DayIsANonWorkingDay=%s is a non-working day
-DateStartInMonth=Start date in month
-DateEndInMonth=End date in month
+NbUseDaysCPHelp=Hisoblashda lug'atda belgilangan ish kunlari va ta'til kunlari hisobga olinadi.
+NbUseDaysCPShort=Dam olish kunlari
+NbUseDaysCPShortInMonth=Bir oy ichida ta'til kunlari
+DayIsANonWorkingDay=%s - bu ishlamaydigan kun
+DateStartInMonth=Boshlanish sanasi oyda
+DateEndInMonth=Tugash sanasi oyda
 EditCP=Tahrirlash
 DeleteCP=O'chirish
 ActionRefuseCP=Rad etish
@@ -74,7 +74,7 @@ DateRefusCP=Rad etish sanasi
 DateCancelCP=Bekor qilingan sana
 DefineEventUserCP=Foydalanuvchiga alohida ta'tilni tayinlang
 addEventToUserCP=Ta'tilni tayinlang
-NotTheAssignedApprover=You are not the assigned approver
+NotTheAssignedApprover=Siz tayinlangan tasdiqlovchi emassiz
 MotifCP=Sabab
 UserCP=Foydalanuvchi
 ErrorAddEventToUserCP=Istisno ta'tilini qo'shishda xatolik yuz berdi.
@@ -95,14 +95,14 @@ HolidaysCancelation=So'rovni bekor qilishni qoldiring
 EmployeeLastname=Xodimning familiyasi
 EmployeeFirstname=Xodimning ismi
 TypeWasDisabledOrRemoved=Dam olish turi (id %s) o'chirilgan yoki olib tashlangan
-LastHolidays=Latest %s leave requests
-AllHolidays=All leave requests
-HalfDay=Half day
-NotTheAssignedApprover=You are not the assigned approver
-LEAVE_PAID=Paid vacation
-LEAVE_SICK=Sick leave
-LEAVE_OTHER=Other leave
-LEAVE_PAID_FR=Paid vacation
+LastHolidays=Oxirgi %s ta'til so'rovlari
+AllHolidays=Barcha ta'til bo'yicha so'rovlar
+HalfDay=Yarim kun
+NotTheAssignedApprover=Siz tayinlangan tasdiqlovchi emassiz
+LEAVE_PAID=Pullik ta'til
+LEAVE_SICK=Kasallik ta'tili
+LEAVE_OTHER=Boshqa ta'til
+LEAVE_PAID_FR=Pullik ta'til
 ## Configuration du Module ##
 LastUpdateCP=Ta'tilni ajratishni oxirgi avtomatik yangilash
 MonthOfLastMonthlyUpdate=Ta'tilni oxirgi avtomatik yangilash oyi
@@ -125,10 +125,10 @@ HolidaysCanceledBody=%s dan %s uchun ta'til so'rovingiz bekor qilindi.
 FollowedByACounter=1: ushbu ta'tilni hisoblagich bilan kuzatib borish kerak. Hisoblagich qo'lda yoki avtomatik ravishda oshiriladi va ta'til so'rovi tasdiqlanganda hisoblagich kamayadi. <br> 0: Hisoblagich kuzatilmaydi.
 NoLeaveWithCounterDefined=Hisoblagich bilan ta'qib qilinishi kerak bo'lgan ta'til turlari mavjud emas
 GoIntoDictionaryHolidayTypes=<strong> ga kiring Bosh sahifa - O'rnatish - Lug'atlar - Har xil turdagi barglarni sozlash uchun ta'til turi </strong>.
-HolidaySetup=Setup of module Leave
-HolidaysNumberingModules=Numbering models for leave requests
-TemplatePDFHolidays=Template for leave requests PDF
-FreeLegalTextOnHolidays=Free text on PDF
-WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
-HolidaysToApprove=Holidays to approve
-NobodyHasPermissionToValidateHolidays=Nobody has permission to validate holidays
+HolidaySetup=Modulni tark etish sozlamalari
+HolidaysNumberingModules=Ta'til so'rovlari uchun raqamlarni raqamlash
+TemplatePDFHolidays=PDF ta'tilga chiqish so'rovlari uchun shablon
+FreeLegalTextOnHolidays=PDF-dagi bepul matn
+WatermarkOnDraftHolidayCards=Dam olish ta'tiliga yuborilgan so'rovlar bo'yicha moybo'yoqli belgilar
+HolidaysToApprove=Bayramlarni tasdiqlash
+NobodyHasPermissionToValidateHolidays=Bayramlarni tasdiqlash uchun hech kimning ruxsati yo'q
diff --git a/htdocs/langs/uz_UZ/hrm.lang b/htdocs/langs/uz_UZ/hrm.lang
index f836bf9d263..d638ebe3039 100644
--- a/htdocs/langs/uz_UZ/hrm.lang
+++ b/htdocs/langs/uz_UZ/hrm.lang
@@ -9,11 +9,11 @@ ConfirmDeleteEstablishment=Ushbu muassasa o'chirilishini xohlaysizmi?
 OpenEtablishment=Ochiq muassasa
 CloseEtablishment=Yaqin muassasasi
 # Dictionary
-DictionaryPublicHolidays=Leave - Public holidays
+DictionaryPublicHolidays=Ta'til - rasmiy bayramlar
 DictionaryDepartment=HRM - bo'limlar ro'yxati
 DictionaryFunction=HRM - ish joylari
 # Module
 Employees=Xodimlar
 Employee=Xodim
 NewEmployee=Yangi ishchi
-ListOfEmployees=List of employees
+ListOfEmployees=Xodimlar ro'yxati
diff --git a/htdocs/langs/uz_UZ/install.lang b/htdocs/langs/uz_UZ/install.lang
index 4c78e696d98..0bb3ed8d3c4 100644
--- a/htdocs/langs/uz_UZ/install.lang
+++ b/htdocs/langs/uz_UZ/install.lang
@@ -6,23 +6,23 @@ ConfFileDoesNotExistsAndCouldNotBeCreated=<b> %s </b> konfiguratsiya fayli mavju
 ConfFileCouldBeCreated=<b> %s </b> konfiguratsiya fayli yaratilishi mumkin.
 ConfFileIsNotWritable=<b> %s </b> konfiguratsiya fayli yozib bo'lmaydi. Ruxsatlarni tekshiring. Birinchi o'rnatish uchun veb-serveringiz ushbu faylga konfiguratsiya jarayonida yozish imkoniyatiga ega bo'lishi kerak ("chmod 666", masalan OS kabi Unix-da).
 ConfFileIsWritable=<b> %s </b> konfiguratsiya fayli yozilishi mumkin.
-ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
+ConfFileMustBeAFileNotADir=Konfiguratsiya fayli <b> %s </b> fayl bo'lishi kerak, katalog emas.
 ConfFileReload=Parametrlarni konfiguratsiya faylidan qayta yuklash.
 PHPSupportPOSTGETOk=Ushbu PHP POST va GET o'zgaruvchilarini qo'llab-quvvatlaydi.
 PHPSupportPOSTGETKo=PHP sozlamangiz POST va / yoki GET o'zgaruvchilarini qo'llab-quvvatlamasligi mumkin. Php.ini da <b> variables_order </b> parametrini tekshiring.
 PHPSupportSessions=Ushbu PHP sessiyalarni qo'llab-quvvatlaydi.
-PHPSupport=This PHP supports %s functions.
+PHPSupport=Ushbu PHP %s funktsiyalarini qo'llab-quvvatlaydi.
 PHPMemoryOK=Sizning PHP maksimal sessiya xotirangiz <b> %s </b> ga o'rnatildi. Bu etarli bo'lishi kerak.
 PHPMemoryTooLow=PHP max sessiya xotirasi <b> %s </b> baytga o'rnatilgan. Bu juda past. <b> php.ini </b> ni o'zgartiring <b> memory_limit </b> parametrini kamida <b> %s
 Recheck=Batafsil sinov uchun bu erni bosing
 ErrorPHPDoesNotSupportSessions=PHP o'rnatishingiz seanslarni qo'llab-quvvatlamaydi. Ushbu xususiyat Dolibarr ishlashiga ruxsat berish uchun talab qilinadi. PHP-ni sozlashni va sessiyalar katalogining ruxsatlarini tekshiring.
 ErrorPHPDoesNotSupportGD=PHP o'rnatishingiz GD grafik funktsiyalarini qo'llab-quvvatlamaydi. Hech qanday grafik mavjud bo'lmaydi.
 ErrorPHPDoesNotSupportCurl=PHP o'rnatishingiz Curl-ni qo'llab-quvvatlamaydi.
-ErrorPHPDoesNotSupportCalendar=Your PHP installation does not support php calendar extensions.
+ErrorPHPDoesNotSupportCalendar=PHP o'rnatishingiz PHP kalendar kengaytmalarini qo'llab-quvvatlamaydi.
 ErrorPHPDoesNotSupportUTF8=PHP o'rnatishingiz UTF8 funktsiyalarini qo'llab-quvvatlamaydi. Dolibarr to'g'ri ishlay olmaydi. Dolibarr dasturini o'rnatishdan oldin buni hal qiling.
-ErrorPHPDoesNotSupportIntl=Your PHP installation does not support Intl functions.
-ErrorPHPDoesNotSupportxDebug=Your PHP installation does not support extend debug functions.
-ErrorPHPDoesNotSupport=Your PHP installation does not support %s functions.
+ErrorPHPDoesNotSupportIntl=PHP o'rnatishingiz Intl funktsiyalarini qo'llab-quvvatlamaydi.
+ErrorPHPDoesNotSupportxDebug=PHP o'rnatishingiz kengaytirilgan disk raskadrovka funktsiyalarini qo'llab-quvvatlamaydi.
+ErrorPHPDoesNotSupport=PHP o'rnatishingiz %s funktsiyalarini qo'llab-quvvatlamaydi.
 ErrorDirDoesNotExists=%s katalogi mavjud emas.
 ErrorGoBackAndCorrectParameters=Orqaga qayting va parametrlarni tekshiring / to'g'rilang.
 ErrorWrongValueForParameter=Siz '%s' parametri uchun noto'g'ri qiymat yozgan bo'lishingiz mumkin.
@@ -52,7 +52,7 @@ ServerPortDescription=Ma'lumotlar bazasi server porti. Agar noma'lum bo'lsa, bo'
 DatabaseServer=Ma'lumotlar bazasi serveri
 DatabaseName=Ma'lumotlar bazasi nomi
 DatabasePrefix=Ma'lumotlar bazasi jadvali prefiksi
-DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
+DatabasePrefixDescription=Ma'lumotlar bazasi jadvali prefiksi. Bo'sh bo'lsa, sukut bo'yicha llx_.
 AdminLogin=Dolibarr ma'lumotlar bazasi egasi uchun foydalanuvchi qayd yozuvi.
 PasswordAgain=Parolni tasdiqlashni qayta kiriting
 AdminPassword=Dolibarr ma'lumotlar bazasi egasi uchun parol.
@@ -142,10 +142,10 @@ KeepDefaultValuesWamp=Siz DoliWamp-dan Dolibarrni sozlash ustasini ishlatdingiz,
 KeepDefaultValuesDeb=Siz Dolibarrni o'rnatish ustasini Linux paketidan ishlatdingiz (Ubuntu, Debian, Fedora ...), shuning uchun bu erda tavsiya etilgan qiymatlar allaqachon optimallashtirilgan. Yaratish uchun faqat ma'lumotlar bazasi egasining parolini kiritish kerak. Faqat nima qilayotganingizni bilsangizgina boshqa parametrlarni o'zgartiring.
 KeepDefaultValuesMamp=Siz DoliMamp-dan Dolibarrni sozlash ustasini ishlatdingiz, shuning uchun bu erda tavsiya etilgan qiymatlar allaqachon optimallashtirilgan. Siz nima qilayotganingizni bilsangizgina ularni o'zgartiring.
 KeepDefaultValuesProxmox=Siz Dolibarrni sozlash ustasini Proxmox virtual uskunasidan foydalandingiz, shuning uchun bu erda tavsiya etilgan qiymatlar allaqachon optimallashtirilgan. Siz nima qilayotganingizni bilsangizgina ularni o'zgartiring.
-UpgradeExternalModule=Run dedicated upgrade process of external module
-SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example:  '...repair.php?standard=confirmed'
-NothingToDelete=Nothing to clean/delete
-NothingToDo=Nothing to do
+UpgradeExternalModule=Tashqi modulni maxsus yangilash jarayonini boshqaring
+SetAtLeastOneOptionAsUrlParameter=URL-da parametr sifatida kamida bitta variantni o'rnating. Masalan: '... repair.php? Standart = tasdiqlangan'
+NothingToDelete=Tozalash / o'chirish uchun hech narsa yo'q
+NothingToDo=Qiladigan ish yo'q
 #########
 # upgrade
 MigrationFixData=Normalizatsiya qilingan ma'lumotlar uchun tuzatish
@@ -197,21 +197,22 @@ MigrationActioncommElement=Amallar to'g'risidagi ma'lumotlarni yangilang
 MigrationPaymentMode=To'lov turi bo'yicha ma'lumotlar migratsiyasi
 MigrationCategorieAssociation=Kategoriyalar migratsiyasi
 MigrationEvents=Voqealar egasini tayinlash jadvaliga qo'shish uchun hodisalarning ko'chishi
-MigrationEventsContact=Migration of events to add event contact into assignment table
+MigrationEventsContact=Voqealar aloqasini tayinlash jadvaliga qo'shish uchun voqealarning ko'chishi
 MigrationRemiseEntity=Llx_societe_remise ob'ekti maydon qiymatini yangilang
 MigrationRemiseExceptEntity=Llx_societe_remise_except mavjudlik maydon qiymatini yangilang
-MigrationUserRightsEntity=Update entity field value of llx_user_rights
-MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
-MigrationUserPhotoPath=Migration of photo paths for users
-MigrationFieldsSocialNetworks=Migration of users fields social networks (%s)
+MigrationUserRightsEntity=Llx_user_rights sub'ektining maydon qiymatini yangilang
+MigrationUserGroupRightsEntity=Llx_usergroup_rights sub'ektining maydon qiymatini yangilang
+MigrationUserPhotoPath=Foydalanuvchilar uchun fotosurat yo'llarining ko'chishi
+MigrationFieldsSocialNetworks=Ijtimoiy tarmoqlarda foydalanuvchilarning migratsiyasi (%s)
 MigrationReloadModule=%s modulini qayta yuklang
-MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
+MigrationResetBlockedLog=V7 algoritmi uchun BlockedLog modulini tiklash
+MigrationImportOrExportProfiles=Migration of import or export profiles (%s)
 ShowNotAvailableOptions=Mavjud bo'lmagan variantlarni ko'rsating
 HideNotAvailableOptions=Mavjud bo'lmagan variantlarni yashirish
 ErrorFoundDuringMigration=Migratsiya jarayonida xato (lar) haqida xabar berilgan, shuning uchun keyingi qadam mavjud emas. Xatolarni e'tiborsiz qoldirish uchun siz <a href="%s"> </a> tugmachasini bosishingiz mumkin, ammo xatolar echilmaguncha dastur yoki ba'zi funktsiyalar to'g'ri ishlamasligi mumkin.
-YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (directory renamed with .lock suffix).<br>
-YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
-ClickHereToGoToApp=Click here to go to your application
-ClickOnLinkOrRemoveManualy=If an upgrade is in progress, please wait. If not, click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
-Loaded=Loaded
-FunctionTest=Function test
+YouTryInstallDisabledByDirLock=Ilova o'z-o'zini yangilashga harakat qildi, lekin xavfsizlik / o'rnatish uchun sahifalar o'chirildi (katalog nomi .lock qo'shimchasi bilan o'zgartirildi). <br>
+YouTryInstallDisabledByFileLock=Ilova o'zini o'zi yangilashga harakat qildi, lekin xavfsizlik / o'rnatish uchun sahifalar o'chirilgan (dolibarr hujjatlar katalogida <strong> install.lock </strong> blokirovka fayli mavjudligi sababli). <br>
+ClickHereToGoToApp=Arizangizga o'tish uchun shu erni bosing
+ClickOnLinkOrRemoveManualy=Agar yangilanish davom etayotgan bo'lsa, iltimos, kuting. Agar yo'q bo'lsa, quyidagi havolani bosing. Agar siz doimo shu sahifani ko'rsangiz, hujjatlar katalogidagi install.lock faylini olib tashlashingiz yoki nomini o'zgartirishingiz kerak.
+Loaded=Yuklandi
+FunctionTest=Funktsiya sinovi
diff --git a/htdocs/langs/uz_UZ/interventions.lang b/htdocs/langs/uz_UZ/interventions.lang
index 93cef2c595c..073442f5831 100644
--- a/htdocs/langs/uz_UZ/interventions.lang
+++ b/htdocs/langs/uz_UZ/interventions.lang
@@ -4,7 +4,7 @@ Interventions=Aralashuvlar
 InterventionCard=Interventsiya kartasi
 NewIntervention=Yangi aralashuv
 AddIntervention=Aralashuvni yarating
-ChangeIntoRepeatableIntervention=Change to repeatable intervention
+ChangeIntoRepeatableIntervention=Takrorlanadigan aralashuvga o'ting
 ListOfInterventions=Tadbirlar ro'yxati
 ActionsOnFicheInter=Aralashish bo'yicha harakatlar
 LastInterventions=Oxirgi %s aralashuvlari
@@ -45,24 +45,24 @@ TypeContact_fichinter_external_CUSTOMER=Keyingi mijozlar bilan aloqa
 PrintProductsOnFichinter=Interventsiya kartasida "mahsulot" (nafaqat xizmatlar) turidagi qatorlarni chop eting
 PrintProductsOnFichinterDetails=buyurtmalardan kelib chiqadigan aralashuvlar
 UseServicesDurationOnFichinter=Buyurtmalar natijasida yuzaga keladigan aralashuvlar uchun xizmatlarning davomiyligidan foydalaning
-UseDurationOnFichinter=Hides the duration field for intervention records
-UseDateWithoutHourOnFichinter=Hides hours and minutes off the date field for intervention records
+UseDurationOnFichinter=Interventsiya yozuvlari davomiyligini yashiradi
+UseDateWithoutHourOnFichinter=Interventsiya yozuvlari uchun sana maydonidan tashqarida soat va daqiqalarni yashiradi
 InterventionStatistics=Ta'sirlarning statistikasi
 NbOfinterventions=Interventsiya kartalari soni
 NumberOfInterventionsByMonth=Oy bo'yicha aralashuv kartalarining soni (tasdiqlangan sana)
-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=Interventsiya miqdori sukut bo'yicha foydaga qo'shilmaydi (ko'p hollarda ish vaqt jadvallari sarflangan vaqtni hisoblash uchun ishlatiladi). 1-ga PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT variantini qo'shib qo'yish uchun ularni uyga o'rnatish-ga qo'shing.
 InterId=Interferentsiya id
 InterRef=Aralashish ref.
 InterDateCreation=Sana yaratishga aralashish
 InterDuration=Davomiylik aralashuvi
 InterStatus=Holat aralashuvi
 InterNote=Aralashuvga e'tibor bering
-InterLine=Line of intervention
+InterLine=Aralashish liniyasi
 InterLineId=Chiziq identifikatori aralashuvi
 InterLineDate=Qator sana aralashuvi
 InterLineDuration=Chiziq davomiyligi aralashuvi
 InterLineDesc=Chiziq ta'rifi aralashuvi
-RepeatableIntervention=Template of intervention
-ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
-Reopen=Reopen
-ConfirmReopenIntervention=Are you sure you want to open back the intervention <b>%s</b>?
+RepeatableIntervention=Interventsiya shabloni
+ToCreateAPredefinedIntervention=Oldindan belgilangan yoki takrorlanadigan aralashuvni yaratish uchun umumiy aralashuvni yarating va uni aralashuv shabloniga o'zgartiring
+Reopen=Qayta oching
+ConfirmReopenIntervention=Siz aralashuvni qayta ochishni xohlaysizmi <b> %s </b>?
diff --git a/htdocs/langs/uz_UZ/intracommreport.lang b/htdocs/langs/uz_UZ/intracommreport.lang
index 3060300b974..dbdcf74a7fb 100644
--- a/htdocs/langs/uz_UZ/intracommreport.lang
+++ b/htdocs/langs/uz_UZ/intracommreport.lang
@@ -1,40 +1,40 @@
-Module68000Name = Intracomm report
-Module68000Desc = Intracomm report management (Support for French DEB/DES format)
-IntracommReportSetup = Intracommreport module setup
-IntracommReportAbout = About intracommreport
+Module68000Name = Ichki hisobot
+Module68000Desc = Ichki hisobotlarni boshqarish (Frantsiyaning DEB / DES formatini qo'llab-quvvatlash)
+IntracommReportSetup = Hisobot ichidagi modulni sozlash
+IntracommReportAbout = Intracommreport haqida
 
 # Setup
 INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
-INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
+INTRACOMMREPORT_TYPE_ACTEUR=D'acteur yozing
 INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
-INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les kirishlari
 INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
-INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+INTRACOMMREPORT_CATEG_FRAISDEPORT="Frais de port" turidagi xizmatlar
 
 INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
 
 # Menu
-MenuIntracommReport=Intracomm report
-MenuIntracommReportNew=New declaration
-MenuIntracommReportList=List
+MenuIntracommReport=Ichki hisobot
+MenuIntracommReportNew=Yangi deklaratsiya
+MenuIntracommReportList=Ro'yxat
 
 # View
-NewDeclaration=New declaration
-Declaration=Declaration
-AnalysisPeriod=Analysis period
-TypeOfDeclaration=Type of declaration
-DEB=Goods exchange declaration (DEB)
-DES=Services exchange declaration (DES)
+NewDeclaration=Yangi deklaratsiya
+Declaration=Deklaratsiya
+AnalysisPeriod=Tahlil davri
+TypeOfDeclaration=Deklaratsiya turi
+DEB=Tovarlar almashinuvi to'g'risidagi deklaratsiya (DEB)
+DES=Xizmatlar almashinuvi to'g'risidagi deklaratsiya (DES)
 
 # Export page
-IntracommReportTitle=Preparation of an XML file in ProDouane format
+IntracommReportTitle=ProDouane formatida XML faylini tayyorlash
 
 # List
-IntracommReportList=List of generated declarations
-IntracommReportNumber=Numero of declaration
-IntracommReportPeriod=Period of nalysis
-IntracommReportTypeDeclaration=Type of declaration
-IntracommReportDownload=download XML file
+IntracommReportList=Yaratilgan deklaratsiyalar ro'yxati
+IntracommReportNumber=Deklaratsiya raqami
+IntracommReportPeriod=Tahlil davri
+IntracommReportTypeDeclaration=Deklaratsiya turi
+IntracommReportDownload=XML faylini yuklab oling
 
 # Invoice
-IntracommReportTransportMode=Transport mode
+IntracommReportTransportMode=Transport rejimi
diff --git a/htdocs/langs/uz_UZ/knowledgemanagement.lang b/htdocs/langs/uz_UZ/knowledgemanagement.lang
index 68f5cced76c..c8b544971f9 100644
--- a/htdocs/langs/uz_UZ/knowledgemanagement.lang
+++ b/htdocs/langs/uz_UZ/knowledgemanagement.lang
@@ -18,38 +18,32 @@
 #
 
 # Module label 'ModuleKnowledgeManagementName'
-ModuleKnowledgeManagementName = Knowledge Management System
+ModuleKnowledgeManagementName = Bilimlarni boshqarish tizimi
 # Module description 'ModuleKnowledgeManagementDesc'
-ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+ModuleKnowledgeManagementDesc=Bilimlarni boshqarish (KM) yoki Help-Desk bazasini boshqarish
 
 #
 # Admin page
 #
-KnowledgeManagementSetup = Knowledge Management System setup
-Settings = Settings
-KnowledgeManagementSetupPage = Knowledge Management System setup page
+KnowledgeManagementSetup = Bilimlarni boshqarish tizimini sozlash
+Settings = Sozlamalar
+KnowledgeManagementSetupPage = Bilimlarni boshqarish tizimini sozlash sahifasi
 
 
 #
 # About page
 #
-About = About
-KnowledgeManagementAbout = About Knowledge Management
-KnowledgeManagementAboutPage = Knowledge Management about page
+About = Haqida
+KnowledgeManagementAbout = Bilimlarni boshqarish to'g'risida
+KnowledgeManagementAboutPage = Sahifadagi bilimlarni boshqarish
 
-#
-# Sample page
-#
-KnowledgeManagementArea = Knowledge Management
-
-
-#
-# Menu
-#
-MenuKnowledgeRecord = Knowledge base
-ListKnowledgeRecord = List of articles
-NewKnowledgeRecord = New article
-ValidateReply = Validate solution
-KnowledgeRecords = Articles
-KnowledgeRecord = Article
-KnowledgeRecordExtraFields = Extrafields for Article
+KnowledgeManagementArea = Bilimlarni boshqarish
+MenuKnowledgeRecord = Bilimlar bazasi
+ListKnowledgeRecord = Maqolalar ro'yxati
+NewKnowledgeRecord = Yangi maqola
+ValidateReply = Eritmani tasdiqlang
+KnowledgeRecords = Maqolalar
+KnowledgeRecord = Maqola
+KnowledgeRecordExtraFields = Maqola uchun qo'shimcha joylar
+GroupOfTicket=Chiptalar guruhi
+YouCanLinkArticleToATicketCategory=Siz maqolani chiptalar guruhiga bog'lashingiz mumkin (shuning uchun maqola yangi chiptalarni saralash paytida taklif qilinadi)
diff --git a/htdocs/langs/uz_UZ/languages.lang b/htdocs/langs/uz_UZ/languages.lang
index 01fe39dec43..e9108eee59b 100644
--- a/htdocs/langs/uz_UZ/languages.lang
+++ b/htdocs/langs/uz_UZ/languages.lang
@@ -1,12 +1,13 @@
 # Dolibarr language file - Source file is en_US - languages
-Language_am_ET=Ethiopian
+Language_am_ET=Efiopiya
 Language_ar_AR=Arabcha
-Language_ar_EG=Arabic (Egypt)
+Language_ar_EG=Arab (Misr)
 Language_ar_SA=Arabcha
-Language_ar_TN=Arabic (Tunisia)
-Language_az_AZ=Azerbaijani
+Language_ar_TN=Arab (Tunis)
+Language_ar_IQ=Arab (Iroq)
+Language_az_AZ=Ozarbayjon
 Language_bn_BD=Bengal tili
-Language_bn_IN=Bengali (India)
+Language_bn_IN=Bengal (Hindiston)
 Language_bg_BG=Bolgar
 Language_bs_BA=Bosniya
 Language_ca_ES=Kataloniya
@@ -24,7 +25,7 @@ Language_en_GB=Ingliz (Buyuk Britaniya)
 Language_en_IN=Ingliz (Hindiston)
 Language_en_NZ=Ingliz (Yangi Zelandiya)
 Language_en_SA=Ingliz tili (Saudiya Arabistoni)
-Language_en_SG=English (Singapore)
+Language_en_SG=Ingliz (Singapur)
 Language_en_US=Ingliz (Amerika Qo'shma Shtatlari)
 Language_en_ZA=Ingliz (Janubiy Afrika)
 Language_es_ES=Ispaniya
@@ -34,16 +35,16 @@ Language_es_CL=Ispan (Chili)
 Language_es_CO=Ispan (Kolumbiya)
 Language_es_DO=Ispaniya (Dominik Respublikasi)
 Language_es_EC=Ispan (Ekvador)
-Language_es_GT=Spanish (Guatemala)
+Language_es_GT=Ispan (Gvatemala)
 Language_es_HN=Ispan (Gonduras)
 Language_es_MX=Ispan (Meksika)
 Language_es_PA=Ispan (Panama)
 Language_es_PY=Ispan (Paragvay)
 Language_es_PE=Ispan (Peru)
 Language_es_PR=Ispan (Puerto-Riko)
-Language_es_US=Spanish (USA)
-Language_es_UY=Spanish (Uruguay)
-Language_es_GT=Spanish (Guatemala)
+Language_es_US=Ispan (AQSh)
+Language_es_UY=Ispan (Urugvay)
+Language_es_GT=Ispan (Gvatemala)
 Language_es_VE=Ispan (Venesuela)
 Language_et_EE=Estoniya
 Language_eu_ES=Bask
@@ -52,22 +53,22 @@ Language_fi_FI=Finlyandiya
 Language_fr_BE=Frantsuz (Belgiya)
 Language_fr_CA=Frantsuz (Kanada)
 Language_fr_CH=Frantsuz (Shveytsariya)
-Language_fr_CI=French (Cost Ivory)
-Language_fr_CM=French (Cameroun)
+Language_fr_CI=Frantsuz (Fil suyagi)
+Language_fr_CM=Frantsuz (Kamerun)
 Language_fr_FR=Frantsuzcha
-Language_fr_GA=French (Gabon)
+Language_fr_GA=Frantsuz (Gabon)
 Language_fr_NC=Frantsuz (Yangi Kaledoniya)
-Language_fr_SN=French (Senegal)
+Language_fr_SN=Frantsuz (Senegal)
 Language_fy_NL=Friz
-Language_gl_ES=Galician
+Language_gl_ES=Galisiya
 Language_he_IL=Ibroniycha
-Language_hi_IN=Hindi (India)
+Language_hi_IN=Hind (Hindiston)
 Language_hr_HR=Xorvat
 Language_hu_HU=Venger
 Language_id_ID=Indoneziyalik
 Language_is_IS=Islandcha
 Language_it_IT=Italyancha
-Language_it_CH=Italian (Switzerland)
+Language_it_CH=Italiya (Shveytsariya)
 Language_ja_JP=Yapon
 Language_ka_GE=Gruzin
 Language_km_KH=Kxmer
@@ -79,13 +80,14 @@ Language_lv_LV=Latviya
 Language_mk_MK=Makedoniya
 Language_mn_MN=Mo'g'ul
 Language_nb_NO=Norvegiya (Bokmal)
-Language_ne_NP=Nepali
+Language_ne_NP=Nepal
 Language_nl_BE=Golland (Belgiya)
 Language_nl_NL=Golland
 Language_pl_PL=Polsha
+Language_pt_AO=Portugal (Angola)
 Language_pt_BR=Portugal (Braziliya)
 Language_pt_PT=Portugal
-Language_ro_MD=Romanian (Moldavia)
+Language_ro_MD=Rumin (Moldaviya)
 Language_ro_RO=Rumin
 Language_ru_RU=Ruscha
 Language_ru_UA=Rus (Ukraina)
@@ -103,5 +105,5 @@ Language_uz_UZ=O'zbek
 Language_vi_VN=Vetnam
 Language_zh_CN=Xitoy
 Language_zh_TW=Xitoy (an'anaviy)
-Language_zh_HK=Chinese (Hong Kong)
-Language_bh_MY=Malay
+Language_zh_HK=Xitoy (Gonkong)
+Language_bh_MY=Malaycha
diff --git a/htdocs/langs/uz_UZ/ldap.lang b/htdocs/langs/uz_UZ/ldap.lang
index 62eeae4b2e0..4ec26b1662a 100644
--- a/htdocs/langs/uz_UZ/ldap.lang
+++ b/htdocs/langs/uz_UZ/ldap.lang
@@ -5,7 +5,7 @@ LDAPInformationsForThisContact=Ushbu aloqa uchun LDAP ma'lumotlar bazasidagi ma'
 LDAPInformationsForThisUser=Ushbu foydalanuvchi uchun LDAP ma'lumotlar bazasidagi ma'lumotlar
 LDAPInformationsForThisGroup=Ushbu guruh uchun LDAP ma'lumotlar bazasidagi ma'lumotlar
 LDAPInformationsForThisMember=Ushbu a'zo uchun LDAP ma'lumotlar bazasidagi ma'lumotlar
-LDAPInformationsForThisMemberType=Information in LDAP database for this member type
+LDAPInformationsForThisMemberType=Ushbu a'zoning turi uchun LDAP ma'lumotlar bazasidagi ma'lumotlar
 LDAPAttributes=LDAP atributlari
 LDAPCard=LDAP karta
 LDAPRecordNotFound=Yozuv LDAP ma'lumotlar bazasida topilmadi
@@ -20,8 +20,8 @@ LDAPFieldSkypeExample=Misol: skypeName
 UserSynchronized=Foydalanuvchi sinxronlashtirildi
 GroupSynchronized=Guruh sinxronlashtirildi
 MemberSynchronized=A'zo sinxronlashtirildi
-MemberTypeSynchronized=Member type synchronized
+MemberTypeSynchronized=Ro'yxatdan turi sinxronlashtirildi
 ContactSynchronized=Aloqa sinxronlashtirildi
 ForceSynchronize=Dolibarr -> LDAP-ni sinxronlashtirishni majburlash
 ErrorFailedToReadLDAP=LDAP ma'lumotlar bazasini o'qib bo'lmadi. LDAP modulini sozlashni va ma'lumotlar bazasiga kirishni tekshiring.
-PasswordOfUserInLDAP=Password of user in LDAP
+PasswordOfUserInLDAP=LDAP-dagi foydalanuvchi paroli
diff --git a/htdocs/langs/uz_UZ/link.lang b/htdocs/langs/uz_UZ/link.lang
index a77848aedd1..e37e7f0be18 100644
--- a/htdocs/langs/uz_UZ/link.lang
+++ b/htdocs/langs/uz_UZ/link.lang
@@ -8,4 +8,4 @@ LinkRemoved=%s havolasi o'chirildi
 ErrorFailedToDeleteLink= '<b> %s </b>' havolasi o'chirilmadi
 ErrorFailedToUpdateLink= '<b> %s </b>' havolasi yangilanmadi
 URLToLink=Ulanish uchun URL
-OverwriteIfExists=Overwrite file if exists
+OverwriteIfExists=Agar mavjud bo'lsa, faylni qayta yozing
diff --git a/htdocs/langs/uz_UZ/loan.lang b/htdocs/langs/uz_UZ/loan.lang
index 208c1cd040b..204de3d76eb 100644
--- a/htdocs/langs/uz_UZ/loan.lang
+++ b/htdocs/langs/uz_UZ/loan.lang
@@ -10,7 +10,7 @@ LoanCapital=Poytaxt
 Insurance=Sug'urta
 Interest=Qiziqish
 Nbterms=Shartlar soni
-Term=Term
+Term=Muddat
 LoanAccountancyCapitalCode=Buxgalteriya hisobi kapitali
 LoanAccountancyInsuranceCode=Buxgalteriya hisobini sug'urtalash
 LoanAccountancyInterestCode=Buxgalteriya hisobining foizlari
@@ -19,16 +19,16 @@ LoanDeleted=Kredit muvaffaqiyatli o'chirildi
 ConfirmPayLoan=Ushbu kreditni to'langanligini tasdiqlang
 LoanPaid=Kredit to'langan
 ListLoanAssociatedProject=Loyiha bilan bog'liq kreditlar ro'yxati
-AddLoan=Create loan
-FinancialCommitment=Financial commitment
-InterestAmount=Interest
-CapitalRemain=Capital remain
-TermPaidAllreadyPaid = This term is allready paid
-CantUseScheduleWithLoanStartedToPaid = Can't use scheduler for a loan with payment started
-CantModifyInterestIfScheduleIsUsed = You can't modify interest if you use schedule
+AddLoan=Kredit yaratish
+FinancialCommitment=Moliyaviy majburiyat
+InterestAmount=Qiziqish
+CapitalRemain=Kapital qoladi
+TermPaidAllreadyPaid = Ushbu muddat allaqachon to'langan
+CantUseScheduleWithLoanStartedToPaid = To'lov boshlangan kredit uchun rejalashtiruvchidan foydalanib bo'lmaydi
+CantModifyInterestIfScheduleIsUsed = Agar jadvaldan foydalansangiz, foizlarni o'zgartira olmaysiz
 # Admin
 ConfigLoan=Modulli kreditni sozlash
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Sukut bo'yicha buxgalteriya hisobi kapitali
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Sukut bo'yicha buxgalteriya hisobi foizlari
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Sukut bo'yicha buxgalteriya hisobini sug'urtalash
-CreateCalcSchedule=Edit financial commitment
+CreateCalcSchedule=Moliyaviy majburiyatni tahrirlash
diff --git a/htdocs/langs/uz_UZ/mails.lang b/htdocs/langs/uz_UZ/mails.lang
index dc1f71e7cb8..da80f446e87 100644
--- a/htdocs/langs/uz_UZ/mails.lang
+++ b/htdocs/langs/uz_UZ/mails.lang
@@ -11,16 +11,16 @@ MailFrom=Yuboruvchi
 MailErrorsTo=Xatolar
 MailReply=Ga javob
 MailTo=Qabul qiluvchilar (lar)
-MailToUsers=To user(s)
+MailToUsers=Foydalanuvchi (lar) ga
 MailCC=Nusxalash
-MailToCCUsers=Copy to users(s)
+MailToCCUsers=Foydalanuvchilar (lar) ga nusxalash
 MailCCC=Keshlangan nusxa
 MailTopic=Elektron pochta mavzusi
 MailText=Xabar
 MailFile=Biriktirilgan fayllar
 MailMessage=Elektron pochta qutisi
-SubjectNotIn=Not in Subject
-BodyNotIn=Not in Body
+SubjectNotIn=Mavzuda emas
+BodyNotIn=Tanada emas
 ShowEMailing=Elektron pochta xabarlarini ko'rsatish
 ListOfEMailings=Elektron pochta xabarlari ro'yxati
 NewMailing=Yangi elektron pochta xabarlari
@@ -53,7 +53,7 @@ NbOfUniqueEMails=Noyob elektron pochta xabarlari soni
 NbOfEMails=Elektron pochta xabarlari soni
 TotalNbOfDistinctRecipients=Alohida qabul qiluvchilar soni
 NoTargetYet=Qabul qiluvchilar aniqlanmagan ("Qabul qiluvchilar" yorlig'iga o'ting)
-NoRecipientEmail=No recipient email for %s
+NoRecipientEmail=%s uchun qabul qiluvchi elektron pochtasi yo'q
 RemoveRecipient=Qabul qiluvchini olib tashlash
 YouCanAddYourOwnPredefindedListHere=Elektron pochta tanlov modulini yaratish uchun htdocs / core / modules / mailings / README-ga qarang.
 EMailTestSubstitutionReplacedByGenericValues=Sinov rejimidan foydalanganda almashtirish o'zgaruvchilari umumiy qiymatlar bilan almashtiriladi
@@ -74,25 +74,25 @@ EMailSentForNElements=%s elementlari uchun elektron pochta xabarlari yuborildi.
 XTargetsAdded= <b> %s </b> oluvchilar maqsadlar ro'yxatiga qo'shildi
 OnlyPDFattachmentSupported=Agar PDF hujjatlari ob'ektlarni yuborish uchun allaqachon yaratilgan bo'lsa, ular elektron pochtaga biriktiriladi. Agar bunday bo'lmasa, hech qanday elektron pochta xabarlari yuborilmaydi (shuningdek, ushbu versiyada faqat pdf hujjatlarni ommaviy yuborishda qo'shimcha sifatida qo'llab-quvvatlanishini unutmang).
 AllRecipientSelected=%s yozuvining oluvchilari tanlangan (agar ularning elektron pochtalari ma'lum bo'lsa).
-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.
+GroupEmails=Guruh elektron pochta xabarlari
+OneEmailPerRecipient=Qabul qiluvchiga bitta elektron pochta (sukut bo'yicha, bitta yozuv uchun bitta elektron pochta tanlangan)
+WarningIfYouCheckOneRecipientPerEmail=Ogohlantirish, agar siz ushbu katakchani belgilasangiz, demak, tanlangan bir nechta turli xil yozuvlar uchun faqat bitta elektron pochta xabar yuboriladi, shuning uchun agar sizning xabaringizda yozuv ma'lumotlariga tegishli bo'lgan almashtirish o'zgaruvchilari bo'lsa, ularni almashtirish imkonsiz bo'lib qoladi.
 ResultOfMailSending=Ommaviy elektron pochta xabarlarini yuborish natijasi
 NbSelected=Raqam tanlandi
 NbIgnored=Raqam hisobga olinmadi
 NbSent=Raqam yuborildi
-SentXXXmessages=%s message(s) sent.
+SentXXXmessages=%s xabar (lar) yuborildi.
 ConfirmUnvalidateEmailing=<b> %s </b> elektron pochtasini qoralama holatiga o'zgartirishni xohlaysizmi?
 MailingModuleDescContactsWithThirdpartyFilter=Mijozlar filtrlari bilan bog'laning
 MailingModuleDescContactsByCompanyCategory=Uchinchi tomon toifalari bo'yicha aloqalar
 MailingModuleDescContactsByCategory=Kategoriyalar bo'yicha aloqalar
 MailingModuleDescContactsByFunction=Kontaktlar joylashuvi bo'yicha
-MailingModuleDescEmailsFromFile=Emails from file
-MailingModuleDescEmailsFromUser=Emails input by user
-MailingModuleDescDolibarrUsers=Users with Emails
-MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
-SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
-EmailCollectorFilterDesc=All filters must match to have an email being collected
+MailingModuleDescEmailsFromFile=Fayldan elektron pochta xabarlari
+MailingModuleDescEmailsFromUser=Foydalanuvchi tomonidan kiritilgan elektron pochta xabarlari
+MailingModuleDescDolibarrUsers=Elektron pochta xabarlari bo'lgan foydalanuvchilar
+MailingModuleDescThirdPartiesByCategories=Uchinchi shaxslar (toifalar bo'yicha)
+SendingFromWebInterfaceIsNotAllowed=Veb-interfeysdan yuborishga yo'l qo'yilmaydi.
+EmailCollectorFilterDesc=Elektron pochta to'planishi uchun barcha filtrlar mos kelishi kerak
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Faylda %s qatori
@@ -126,7 +126,7 @@ TagMailtoEmail=Qabul qiluvchining elektron pochtasi (shu jumladan HTML "mailto:"
 NoEmailSentBadSenderOrRecipientEmail=Elektron pochta xabarlari yuborilmadi. Yuboruvchi yoki qabul qiluvchi elektron pochtasi noto'g'ri. Foydalanuvchi profilini tasdiqlang.
 # Module Notifications
 Notifications=Bildirishnomalar
-NotificationsAuto=Notifications Auto.
+NotificationsAuto=Bildirishnomalar avtomatik.
 NoNotificationsWillBeSent=Ushbu tadbir turi va kompaniya uchun avtomatik elektron pochta xabarlari rejalashtirilmagan
 ANotificationsWillBeSent=1 ta avtomatik bildirishnoma elektron pochta orqali yuboriladi
 SomeNotificationsWillBeSent=%s avtomatik xabarnomalari elektron pochta orqali yuboriladi
@@ -166,14 +166,14 @@ NoContactWithCategoryFound=Kategoriya bilan aloqa / manzil topilmadi
 NoContactLinkedToThirdpartieWithCategoryFound=Kategoriya bilan aloqa / manzil topilmadi
 OutGoingEmailSetup=Chiquvchi elektron pochta xabarlari
 InGoingEmailSetup=Kiruvchi elektron pochta xabarlari
-OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
-DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
-Information=Information
-ContactsWithThirdpartyFilter=Contacts with third-party filter
-Unanswered=Unanswered
-Answered=Answered
-IsNotAnAnswer=Is not answer (initial email)
-IsAnAnswer=Is an answer of an initial email
-RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
-DefaultBlacklistMailingStatus=Default contact status for refuse bulk emailing
-DefaultStatusEmptyMandatory=Empty but mandatory
+OutGoingEmailSetupForEmailing=Chiquvchi elektron pochta xabarlari (%s moduli uchun)
+DefaultOutgoingEmailSetup=Global chiquvchi elektron pochta sozlamalariga qaraganda bir xil konfiguratsiya
+Information=Ma `lumot
+ContactsWithThirdpartyFilter=Uchinchi tomon filtri bilan aloqalar
+Unanswered=Javob berilmagan
+Answered=Javob berdi
+IsNotAnAnswer=Javob berilmadi (dastlabki elektron pochta)
+IsAnAnswer=Dastlabki elektron pochtaning javobi
+RecordCreatedByEmailCollector=%s elektron pochtasidan elektron pochta yig'uvchisi %s tomonidan yaratilgan yozuv
+DefaultBlacklistMailingStatus=Ommaviy elektron pochta xabarlarini rad etish uchun standart aloqa holati
+DefaultStatusEmptyMandatory=Bo'sh, ammo majburiy
diff --git a/htdocs/langs/uz_UZ/main.lang b/htdocs/langs/uz_UZ/main.lang
index f241d33aa61..210dcffff78 100644
--- a/htdocs/langs/uz_UZ/main.lang
+++ b/htdocs/langs/uz_UZ/main.lang
@@ -27,10 +27,10 @@ DatabaseConnection=Ma'lumotlar bazasiga ulanish
 NoTemplateDefined=Ushbu elektron pochta turi uchun shablon mavjud emas
 AvailableVariables=Mavjud almashtirish o'zgaruvchilari
 NoTranslation=Tarjima yo'q
-Translation=Translation
+Translation=Tarjima
 CurrentTimeZone=TimeZone PHP (server)
-EmptySearchString=Enter non empty search criterias
-EnterADateCriteria=Enter a date criteria
+EmptySearchString=Bo'sh bo'lmagan qidiruv mezonlarini kiriting
+EnterADateCriteria=Sana mezonlarini kiriting
 NoRecordFound=Hech qanday yozuv topilmadi
 NoRecordDeleted=Hech qanday yozuv o'chirilmagan
 NotEnoughDataYet=Ma'lumot etarli emas
@@ -74,31 +74,31 @@ SelectDate=Sana tanlang
 SeeAlso=Shuningdek qarang: %s
 SeeHere=Bu erga qarang
 ClickHere=bu yerni bosing
-Here=Here
+Here=Bu yerda
 Apply=Qo'llash
 BackgroundColorByDefault=Standart fon rangi
 FileRenamed=Fayl qayta nomlandi
 FileGenerated=Fayl muvaffaqiyatli yaratildi
-FileSaved=The file was successfully saved
+FileSaved=Fayl muvaffaqiyatli saqlandi
 FileUploaded=Fayl yuklandi
 FileTransferComplete=Fayl (lar) muvaffaqiyatli yuklandi
-FilesDeleted=File(s) successfully deleted
+FilesDeleted=Fayl (lar) muvaffaqiyatli o'chirildi
 FileWasNotUploaded=Fayl biriktirish uchun tanlangan, ammo hali yuklanmagan. Buning uchun "Faylni biriktirish" tugmasini bosing.
 NbOfEntries=Yozuvlar soni
 GoToWikiHelpPage=Onlayn yordamni o'qing (Internetga kirish kerak)
 GoToHelpPage=Yordamni o'qing
-DedicatedPageAvailable=There is a dedicated help page related to your current screen
-HomePage=Home Page
+DedicatedPageAvailable=Joriy ekraningiz bilan bog'liq maxsus yordam sahifasi mavjud
+HomePage=Bosh sahifa
 RecordSaved=Yozuv saqlandi
 RecordDeleted=Yozuv o'chirildi
-RecordGenerated=Record generated
+RecordGenerated=Yozuv yaratildi
 LevelOfFeature=Xususiyatlar darajasi
 NotDefined=Belgilanmagan
 DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr autentifikatsiya qilish rejimi <b> conf.php </b> konfiguratsiya faylida <b> %s </b> ga o'rnatildi. <br> bu shuni anglatadiki, parol ma'lumotlar bazasi Dolibarr uchun tashqi, shuning uchun bu maydonni o'zgartirish hech qanday ta'sir ko'rsatmasligi mumkin.
 Administrator=Ma'mur
 Undefined=Aniqlanmagan
 PasswordForgotten=Parol unutdingizmi?
-NoAccount=No account?
+NoAccount=Hisob yo'qmi?
 SeeAbove=Yuqoriga qarang
 HomeArea=Uy
 LastConnexion=Oxirgi kirish
@@ -113,12 +113,12 @@ RequestLastAccessInError=Ma'lumotlar bazasiga kirish uchun so'nggi so'rov xatosi
 ReturnCodeLastAccessInError=So'nggi ma'lumotlar bazasiga kirish uchun so'rov xatosi uchun qaytarish kodi
 InformationLastAccessInError=So'nggi ma'lumotlar bazasiga kirish so'rovining xatosi haqida ma'lumot
 DolibarrHasDetectedError=Dolibarr texnik xatolikni aniqladi
-YouCanSetOptionDolibarrMainProdToZero=You can read log file or set option $dolibarr_main_prod to '0' in your config file to get more information.
+YouCanSetOptionDolibarrMainProdToZero=Qo'shimcha ma'lumot olish uchun log faylini o'qishingiz yoki konfiguratsiya faylingizda $ dolibarr_main_prod parametrini '0' ga o'rnatishingiz mumkin.
 InformationToHelpDiagnose=Ushbu ma'lumot diagnostika maqsadida foydali bo'lishi mumkin (bunday xabarnomalarni olib tashlash uchun $ dolibarr_main_prod parametrini '1' ga o'rnatishingiz mumkin)
 MoreInformation=Qo'shimcha ma'lumot
 TechnicalInformation=Texnik ma'lumotlar
 TechnicalID=Texnik guvohnoma
-LineID=Line ID
+LineID=Qator identifikatori
 NotePublic=Izoh (ommaviy)
 NotePrivate=Izoh (xususiy)
 PrecisionUnitIsLimitedToXDecimals=Dolibarr birlik narxlarining aniqligini <b> %s </b> o'nliklariga cheklash uchun o'rnatildi.
@@ -141,15 +141,15 @@ Never=Hech qachon
 Under=ostida
 Period=Davr
 PeriodEndDate=Davr uchun tugash sanasi
-SelectedPeriod=Selected period
-PreviousPeriod=Previous period
+SelectedPeriod=Tanlangan davr
+PreviousPeriod=Oldingi davr
 Activate=Faollashtirish
 Activated=Faollashtirildi
 Closed=Yopiq
 Closed2=Yopiq
 NotClosed=Yopiq emas
 Enabled=Yoqilgan
-Enable=Enable
+Enable=Yoqish
 Deprecated=Eskirgan
 Disable=O'chirish
 Disabled=Nogiron
@@ -159,7 +159,7 @@ RemoveLink=Havolani olib tashlash
 AddToDraft=Qoralamaga qo'shing
 Update=Yangilash
 Close=Yoping
-CloseAs=Set status to
+CloseAs=Maqomni belgilang
 CloseBox=Vidjetni boshqaruv panelidan olib tashlang
 Confirm=Tasdiqlang
 ConfirmSendCardByMail=Siz haqiqatan ham ushbu karta tarkibini <b> %s </b> manziliga pochta orqali yuborishni xohlaysizmi?
@@ -172,14 +172,14 @@ Edit=Tahrirlash
 Validate=Tasdiqlash
 ValidateAndApprove=Tasdiqlang va tasdiqlang
 ToValidate=Tasdiqlash uchun
-NotValidated=Not validated
+NotValidated=Tasdiqlanmagan
 Save=Saqlash
 SaveAs=Saqlash
-SaveAndStay=Save and stay
-SaveAndNew=Save and new
+SaveAndStay=Saqlang va qoling
+SaveAndNew=Saqlang va yangi
 TestConnection=Sinov aloqasi
 ToClone=Klon
-ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
+ConfirmCloneAsk=<b> %s </b> ob'ektini klonlashni xohlaysizmi?
 ConfirmClone=Klonlash uchun kerakli ma'lumotlarni tanlang:
 NoCloneOptionsSpecified=Klonlash uchun ma'lumot yo'q.
 Of=ning
@@ -192,7 +192,7 @@ ShowCardHere=Kartani ko'rsatish
 Search=Qidirmoq
 SearchOf=Qidirmoq
 SearchMenuShortCut=Ctrl + shift + f
-QuickAdd=Quick add
+QuickAdd=Tez qo'shish
 QuickAddMenuShortCut=Ctrl + shift + l
 Valid=Yaroqli
 Approve=Tasdiqlash
@@ -201,10 +201,10 @@ ReOpen=Qayta oching
 Upload=Yuklash
 ToLink=Havola
 Select=Tanlang
-SelectAll=Select all
+SelectAll=Hammasini belgilash
 Choose=Tanlang
 Resize=O'lchamini o'zgartirish
-ResizeOrCrop=Resize or Crop
+ResizeOrCrop=O'lchamini o'zgartirish yoki kesish
 Recenter=Keyingi
 Author=Muallif
 User=Foydalanuvchi
@@ -216,15 +216,15 @@ Password=Parol
 PasswordRetype=Parolingizni qayta kiriting
 NoteSomeFeaturesAreDisabled=Ushbu namoyishda ko'plab funktsiyalar / modullar o'chirilganligini unutmang.
 Name=Ism
-NameSlashCompany=Name / Company
+NameSlashCompany=Ism / kompaniya
 Person=Shaxs
 Parameter=Parametr
 Parameters=Parametrlar
 Value=Qiymat
 PersonalValue=Shaxsiy qiymat
-NewObject=New %s
+NewObject=Yangi %s
 NewValue=Yangi qiymat
-OldValue=Old value %s
+OldValue=Eski qiymat %s
 CurrentValue=Joriy qiymat
 Code=Kod
 Type=Turi
@@ -238,9 +238,9 @@ Info=Kirish
 Family=Oila
 Description=Tavsif
 Designation=Tavsif
-DescriptionOfLine=Description of line
-DateOfLine=Date of line
-DurationOfLine=Duration of line
+DescriptionOfLine=Chiziq tavsifi
+DateOfLine=Qator sana
+DurationOfLine=Qator davomiyligi
 Model=Hujjat shabloni
 DefaultModel=Standart hujjat shabloni
 Action=Tadbir
@@ -256,14 +256,14 @@ NoLogoutProcessWithAuthMode=<b> %s </b> autentifikatsiya qilish rejimida qo'llan
 Connection=Kirish
 Setup=Sozlash; o'rnatish
 Alert=Ogohlantirish
-MenuWarnings=Alerts
+MenuWarnings=Ogohlantirishlar
 Previous=Oldingi
 Next=Keyingi
 Cards=Kartalar
 Card=Karta
 Now=Endi
 HourStart=Boshlanish soati
-Deadline=Deadline
+Deadline=Topshirish muddati; tugatish muddati
 Date=Date
 DateAndHour=Sana va soat
 DateToday=Bugungi sana
@@ -272,13 +272,13 @@ DateStart=Boshlanish vaqti
 DateEnd=Tugash sanasi
 DateCreation=Yaratilish sanasi
 DateCreationShort=Yaratuvchi. sana
-IPCreation=Creation IP
+IPCreation=IP yaratish
 DateModification=O'zgartirish sanasi
 DateModificationShort=Modif. sana
-IPModification=Modification IP
+IPModification=O'zgartirish IP
 DateLastModification=Oxirgi o'zgartirish sanasi
 DateValidation=Tasdiqlash sanasi
-DateSigning=Signing date
+DateSigning=Imzolangan sana
 DateClosing=Tugatish sanasi
 DateDue=Muddati
 DateValue=Qiymat sanasi
@@ -292,13 +292,13 @@ DateBuild=Hisobotni tuzish sanasi
 DatePayment=To'lov sanasi
 DateApprove=Tasdiqlangan sana
 DateApprove2=Tasdiqlangan sana (ikkinchi tasdiqlash)
-RegistrationDate=Registration date
+RegistrationDate=Ro'yxatdan o'tish sanasi
 UserCreation=Yaratilish foydalanuvchisi
 UserModification=O'zgartirish foydalanuvchisi
-UserValidation=Validation user
+UserValidation=Tasdiqlash foydalanuvchisi
 UserCreationShort=Yaratuvchi. foydalanuvchi
 UserModificationShort=Modif. foydalanuvchi
-UserValidationShort=Valid. user
+UserValidationShort=Yaroqli. foydalanuvchi
 DurationYear=yil
 DurationMonth=oy
 DurationWeek=hafta
@@ -330,7 +330,7 @@ Morning=Tong
 Afternoon=Peshindan keyin
 Quadri=Quadri
 MonthOfDay=Kunning oyi
-DaysOfWeek=Days of week
+DaysOfWeek=Haftaning kunlari
 HourShort=H
 MinuteShort=mn
 Rate=Tezlik
@@ -341,8 +341,8 @@ KiloBytes=Kilobayt
 MegaBytes=Megabayt
 GigaBytes=Gigabayt
 TeraBytes=Terabayt
-UserAuthor=Ceated by
-UserModif=Updated by
+UserAuthor=Tomonidan belgilangan
+UserModif=Tomonidan yangilangan
 b=b.
 Kb=Kb
 Mb=Mb
@@ -353,12 +353,12 @@ Copy=Nusxalash
 Paste=Yapıştır
 Default=Odatiy
 DefaultValue=Standart qiymat
-DefaultValues=Default values/filters/sorting
+DefaultValues=Standart qiymatlar / filtrlar / saralash
 Price=Narx
-PriceCurrency=Price (currency)
+PriceCurrency=Narx (valyuta)
 UnitPrice=Donasining narxi
 UnitPriceHT=Birlik narxi (bundan mustasno)
-UnitPriceHTCurrency=Unit price (excl.) (currency)
+UnitPriceHTCurrency=Birlik narxi (bundan mustasno) (valyuta)
 UnitPriceTTC=Donasining narxi
 PriceU=U.P.
 PriceUHT=U.P. (aniq)
@@ -366,9 +366,9 @@ PriceUHTCurrency=U.P (aniq) (valyuta)
 PriceUTTC=U.P. (soliq bilan birga)
 Amount=Miqdor
 AmountInvoice=Hisob-faktura miqdori
-AmountInvoiced=Amount invoiced
-AmountInvoicedHT=Amount invoiced (excl. tax)
-AmountInvoicedTTC=Amount invoiced (inc. tax)
+AmountInvoiced=Hisob-kitob qilingan summa
+AmountInvoicedHT=Hisob-faktura miqdori (soliqdan tashqari)
+AmountInvoicedTTC=Hisob-faktura miqdori (soliq bilan birga)
 AmountPayment=To'lov miqdori
 AmountHTShort=Miqdor (bundan mustasno)
 AmountTTCShort=Miqdor (soliq bilan birga)
@@ -381,7 +381,7 @@ MulticurrencyPaymentAmount=To'lov miqdori, asl valyuta
 MulticurrencyAmountHT=Miqdor (soliqdan tashqari), asl valyuta
 MulticurrencyAmountTTC=Miqdor (soliq inc.), Asl valyuta
 MulticurrencyAmountVAT=Miqdor solig'i, asl valyuta
-MulticurrencySubPrice=Amount sub price multi currency
+MulticurrencySubPrice=Miqdor sub-narx ko'p valyuta
 AmountLT1=Miqdor solig'i 2
 AmountLT2=Miqdor solig'i 3
 AmountLT1ES=RE miqdori
@@ -389,14 +389,14 @@ AmountLT2ES=IRPF miqdori
 AmountTotal=Umumiy hisob
 AmountAverage=O'rtacha miqdor
 PriceQtyMinHT=Narx miqdori min. (soliqdan tashqari)
-PriceQtyMinHTCurrency=Price quantity min. (excl. tax) (currency)
-PercentOfOriginalObject=Percent of original object
-AmountOrPercent=Amount or percent
+PriceQtyMinHTCurrency=Narx miqdori min. (soliqdan tashqari) (valyuta)
+PercentOfOriginalObject=Asl ob'ektning ulushi
+AmountOrPercent=Miqdor yoki foiz
 Percentage=Foiz
 Total=Jami
 SubTotal=Jami
 TotalHTShort=Jami (bundan mustasno)
-TotalHT100Short=Total 100%% (excl.)
+TotalHT100Short=Jami 100%% (bundan mustasno)
 TotalHTShortCurrency=Jami (valyutadan tashqari)
 TotalTTCShort=Jami (soliq bilan birga)
 TotalHT=Jami (soliqdan tashqari)
@@ -405,47 +405,47 @@ Totalforthispage=Ushbu sahifa uchun jami
 TotalTTC=Jami (soliq bilan birga)
 TotalTTCToYourCredit=Sizning kreditingiz uchun jami (soliq)
 TotalVAT=Jami soliq
-TotalVATIN=Total IGST
+TotalVATIN=Jami IGST
 TotalLT1=Jami soliq 2
 TotalLT2=Jami soliq 3
 TotalLT1ES=Jami RE
 TotalLT2ES=Jami IRPF
-TotalLT1IN=Total CGST
-TotalLT2IN=Total SGST
+TotalLT1IN=Jami CGST
+TotalLT2IN=Jami SGST
 HT=Istisno. soliq
 TTC=Inc soliq
-INCVATONLY=Inc. VAT
-INCT=Inc. all taxes
+INCVATONLY=QQS
+INCT=Inc barcha soliqlar
 VAT=Savdo solig'i
 VATIN=IGST
 VATs=Savdo soliqlari
-VATINs=IGST taxes
-LT1=Sales tax 2
-LT1Type=Sales tax 2 type
-LT2=Sales tax 3
-LT2Type=Sales tax 3 type
+VATINs=IGST soliqlari
+LT1=Sotishdan olinadigan soliq 2
+LT1Type=Sotishdan olinadigan soliq 2 turi
+LT2=Sotishdan olinadigan soliq 3
+LT2Type=Sotishdan olinadigan soliq 3 turi
 LT1ES=RE
 LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
-LT1GC=Additionnal cents
+LT1GC=Qo'shimcha sentlar
 VATRate=Soliq stavkasi
-RateOfTaxN=Rate of tax %s
-VATCode=Tax Rate code
-VATNPR=Tax Rate NPR
-DefaultTaxRate=Default tax rate
+RateOfTaxN=%s soliq stavkasi
+VATCode=Soliq stavkasi kodi
+VATNPR=Soliq stavkasi NPR
+DefaultTaxRate=Standart soliq stavkasi
 Average=O'rtacha
 Sum=Jami
 Delta=Delta
-StatusToPay=To pay
-RemainToPay=Remain to pay
+StatusToPay=To'lash uchun
+RemainToPay=To'lashni davom eting
 Module=Modul / dastur
-Modules=Modules/Applications
+Modules=Modullar / dasturlar
 Option=Variant
-Filters=Filters
+Filters=Filtrlar
 List=Ro'yxat
 FullList=To'liq ro'yxat
-FullConversation=Full conversation
+FullConversation=To'liq suhbat
 Statistics=Statistika
 OtherStatistics=Boshqa statistika
 Status=Holat
@@ -466,21 +466,21 @@ ActionRunningNotStarted=Boshlamoq
 ActionRunningShort=Jarayonda
 ActionDoneShort=Tugadi
 ActionUncomplete=Tugallanmagan
-LatestLinkedEvents=Latest %s linked events
+LatestLinkedEvents=%s bilan bog'liq so'nggi voqealar
 CompanyFoundation=Kompaniya / tashkilot
-Accountant=Accountant
+Accountant=Buxgalter
 ContactsForCompany=Ushbu uchinchi tomon uchun aloqalar
 ContactsAddressesForCompany=Ushbu uchinchi tomon uchun aloqa / manzillar
 AddressesForCompany=Ushbu uchinchi tomon uchun manzillar
 ActionsOnCompany=Ushbu uchinchi tomon uchun tadbirlar
-ActionsOnContact=Events for this contact/address
-ActionsOnContract=Events for this contract
+ActionsOnContact=Ushbu aloqa / manzil uchun tadbirlar
+ActionsOnContract=Ushbu shartnoma bo'yicha tadbirlar
 ActionsOnMember=Ushbu a'zo haqidagi tadbirlar
-ActionsOnProduct=Events about this product
+ActionsOnProduct=Ushbu mahsulot haqidagi tadbirlar
 NActionsLate=%s kech
-ToDo=To do
-Completed=Completed
-Running=In progress
+ToDo=Qilmoq
+Completed=Bajarildi
+Running=Jarayonda
 RequestAlreadyDone=So'rov allaqachon yozib olingan
 Filter=Filtr
 FilterOnInto=%s maydonlariga '<strong> %s </strong>' mezonlari
@@ -494,7 +494,7 @@ TotalDuration=Jami davomiyligi
 Summary=Xulosa
 DolibarrStateBoard=Ma'lumotlar bazasi statistikasi
 DolibarrWorkBoard=Ochiq narsalar
-NoOpenedElementToProcess=No open element to process
+NoOpenedElementToProcess=Qayta ishlash uchun ochiq element yo'q
 Available=Mavjud
 NotYetAvailable=Hali mavjud emas
 NotAvailable=Mavjud emas
@@ -502,13 +502,13 @@ Categories=Teglar / toifalar
 Category=Tag / kategoriya
 By=By
 From=Kimdan
-FromDate=From
-FromLocation=From
+FromDate=Kimdan
+FromLocation=Kimdan
 to=ga
-To=to
-ToDate=to
-ToLocation=to
-at=at
+To=ga
+ToDate=ga
+ToLocation=ga
+at=da
 and=va
 or=yoki
 Other=Boshqalar
@@ -527,18 +527,18 @@ Reporting=Hisobot berish
 Reportings=Hisobot berish
 Draft=Qoralama
 Drafts=Qoralamalar
-StatusInterInvoiced=Invoiced
+StatusInterInvoiced=Hisob-faktura
 Validated=Tasdiqlangan
-ValidatedToProduce=Validated (To produce)
+ValidatedToProduce=Tasdiqlangan (ishlab chiqarish uchun)
 Opened=Ochiq
-OpenAll=Open (All)
-ClosedAll=Closed (All)
+OpenAll=Ochish (barchasi)
+ClosedAll=Yopiq (barchasi)
 New=Yangi
 Discount=Chegirma
 Unknown=Noma'lum
 General=Umumiy
 Size=Hajmi
-OriginalSize=Original size
+OriginalSize=Asl o'lcham
 Received=Qabul qildi
 Paid=To'langan
 Topic=Mavzu
@@ -552,18 +552,18 @@ NextStep=Keyingi qadam
 Datas=Ma'lumotlar
 None=None
 NoneF=None
-NoneOrSeveral=None or several
+NoneOrSeveral=Hech kim yoki bir nechtasi
 Late=Kech
 LateDesc=Bosh sahifa - O'rnatish - Ogohlantirishlar menyusidagi tizim konfiguratsiyasi bo'yicha element "Kechiktirilgan" deb belgilanadi.
-NoItemLate=No late item
+NoItemLate=Kechiktirilgan narsa yo‘q
 Photo=Rasm
 Photos=Rasmlar
 AddPhoto=Rasm qo'shish
 DeletePicture=Rasmni o'chirish
 ConfirmDeletePicture=Rasm o'chirilganligini tasdiqlaysizmi?
 Login=Kirish
-LoginEmail=Login (email)
-LoginOrEmail=Login or Email
+LoginEmail=Kirish (elektron pochta)
+LoginOrEmail=Kirish yoki elektron pochta
 CurrentLogin=Joriy kirish
 EnterLoginDetail=Kirish tafsilotlarini kiriting
 January=Yanvar
@@ -613,9 +613,9 @@ MonthVeryShort08=A
 MonthVeryShort09=S
 MonthVeryShort10=O
 MonthVeryShort11=N
-MonthVeryShort12=D
+MonthVeryShort12=D.
 AttachedFiles=Biriktirilgan fayllar va hujjatlar
-JoinMainDoc=Join main document
+JoinMainDoc=Asosiy hujjatga qo'shiling
 DateFormatYYYYMM=YYYY-MM
 DateFormatYYYYMMDD=YYYY-MM-DD
 DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH: SS
@@ -662,14 +662,14 @@ SupplierPreview=Sotuvchini oldindan ko'rish
 ShowCustomerPreview=Mijozni oldindan ko'rishni ko'rsatish
 ShowSupplierPreview=Sotuvchini oldindan ko'rishni ko'rsatish
 RefCustomer=Ref. mijoz
-InternalRef=Internal ref.
+InternalRef=Ichki ref.
 Currency=Valyuta
 InfoAdmin=Ma'murlar uchun ma'lumot
 Undo=Bekor qilish
 Redo=Qayta qilish
 ExpandAll=Barchasini kengaytiring
 UndoExpandAll=Kengaytirishni bekor qilish
-SeeAll=See all
+SeeAll=Barchasini ko'ring
 Reason=Sabab
 FeatureNotYetSupported=Xususiyat hali qo'llab-quvvatlanmaydi
 CloseWindow=Oynani yopish
@@ -677,20 +677,20 @@ Response=Javob
 Priority=Afzallik
 SendByMail=Elektron pochta orqali yuboring
 MailSentBy=Elektron pochta orqali yuborilgan
-NotSent=Not sent
+NotSent=Yuborilmadi
 TextUsedInTheMessageBody=Elektron pochta qutisi
 SendAcknowledgementByMail=Tasdiqlovchi elektron pochta xabarini yuboring
-SendMail=Send email
+SendMail=Elektron pochta xabarini yuboring
 Email=Elektron pochta
 NoEMail=Elektron pochta yo'q
-AlreadyRead=Already read
-NotRead=Unread
+AlreadyRead=O'qilgan
+NotRead=O'qilmagan
 NoMobilePhone=Mobil telefon yo'q
 Owner=Egasi
 FollowingConstantsWillBeSubstituted=Quyidagi doimiylar tegishli qiymat bilan almashtiriladi.
 Refresh=Yangilang
 BackToList=Ro'yxatga qaytish
-BackToTree=Back to tree
+BackToTree=Daraxtga qaytish
 GoBack=Ortga qaytish
 CanBeModifiedIfOk=Agar haqiqiy bo'lsa o'zgartirilishi mumkin
 CanBeModifiedIfKo=Agar yaroqsiz bo'lsa o'zgartirilishi mumkin
@@ -700,7 +700,7 @@ RecordCreatedSuccessfully=Yozuv muvaffaqiyatli yaratildi
 RecordModifiedSuccessfully=Yozuv muvaffaqiyatli o'zgartirildi
 RecordsModified=%s yozuvlari o'zgartirildi
 RecordsDeleted=%s yozuvlari o'chirildi
-RecordsGenerated=%s record(s) generated
+RecordsGenerated=%s yozuvlari yaratildi
 AutomaticCode=Avtomatik kod
 FeatureDisabled=Funktsiya o'chirilgan
 MoveBox=Vidjetni ko'chirish
@@ -711,13 +711,13 @@ Method=Usul
 Receive=Qabul qiling
 CompleteOrNoMoreReceptionExpected=To'liq yoki boshqa hech narsa kutilmaydi
 ExpectedValue=Kutilayotgan qiymat
-ExpectedQty=Expected Qty
+ExpectedQty=Kutilayotgan son
 PartialWoman=Qisman
 TotalWoman=Jami
 NeverReceived=Hech qachon qabul qilinmagan
 Canceled=Bekor qilindi
 YouCanChangeValuesForThisListFromDictionarySetup=Sozlamalar - Lug'atlar menyusidan ushbu ro'yxat uchun qiymatlarni o'zgartirishingiz mumkin
-YouCanChangeValuesForThisListFrom=You can change values for this list from menu %s
+YouCanChangeValuesForThisListFrom=Siz ushbu ro'yxat uchun qiymatlarni %s menyusidan o'zgartirishingiz mumkin
 YouCanSetDefaultValueInModuleSetup=Modulni o'rnatishda yangi yozuv yaratishda foydalaniladigan standart qiymatni belgilashingiz mumkin
 Color=Rang
 Documents=Bog'langan fayllar
@@ -728,9 +728,9 @@ MenuECM=Hujjatlar
 MenuAWStats=AWStats
 MenuMembers=A'zolar
 MenuAgendaGoogle=Google kun tartibi
-MenuTaxesAndSpecialExpenses=Taxes | Special expenses
+MenuTaxesAndSpecialExpenses=Soliqlar | Maxsus xarajatlar
 ThisLimitIsDefinedInSetup=Dolibarr limiti (menyuda uyni sozlash-xavfsizlik): %s Kb, PHP limit: %s Kb
-ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
+ThisLimitIsDefinedInSetupAt=Dolibarr limiti (Menyu %s): %s Kb, PHP limit (Param %s): %s Kb
 NoFileFound=Hech qanday hujjat yuklanmadi
 CurrentUserLanguage=Joriy til
 CurrentTheme=Joriy mavzu
@@ -746,7 +746,7 @@ DateOfSignature=Imzo qo'yilgan sana
 HidePassword=Parolni yashirgan holda buyruqni ko'rsatish
 UnHidePassword=Haqiqiy buyruqni aniq parol bilan ko'rsating
 Root=Ildiz
-RootOfMedias=Root of public medias (/medias)
+RootOfMedias=Ommaviy medianing ildizi (/ medias)
 Informations=Ma `lumot
 Page=Sahifa
 Notes=Izohlar
@@ -755,18 +755,18 @@ AddFile=Fayl qo'shish
 FreeZone=Bepul matnli mahsulot
 FreeLineOfType=Bepul matnli element, turi:
 CloneMainAttributes=Ob'ektni asosiy atributlari bilan klonlash
-ReGeneratePDF=Re-generate PDF
+ReGeneratePDF=PDF-ni qayta yarating
 PDFMerge=PDF-ni birlashtirish
 Merge=Birlashtirish
-DocumentModelStandardPDF=Standard PDF template
+DocumentModelStandardPDF=Standart PDF shablon
 PrintContentArea=Asosiy tarkib maydonini chop etish uchun sahifani ko'rsatish
 MenuManager=Menyu menejeri
 WarningYouAreInMaintenanceMode=Ogohlantirish, siz parvarishlash rejimidasiz: dasturdan faqat ushbu rejimda kirish uchun <b> %s </b> ruxsat etiladi.
 CoreErrorTitle=Tizim xatosi
 CoreErrorMessage=Kechirasiz, xato yuz berdi. Kundaliklarni tekshirish uchun tizim ma'muringizga murojaat qiling yoki qo'shimcha ma'lumot olish uchun $ dolibarr_main_prod = 1-ni o'chirib qo'ying.
 CreditCard=Kredit kartasi
-ValidatePayment=Validate payment
-CreditOrDebitCard=Credit or debit card
+ValidatePayment=To'lovni tasdiqlang
+CreditOrDebitCard=Kredit yoki debet karta
 FieldsWithAreMandatory=<b> %s </b> bo'lgan maydonlar majburiydir
 FieldsWithIsForPublic=<b> %s </b> bo'lgan maydonlar a'zolarning ochiq ro'yxatida ko'rsatilgan. Agar buni xohlamasangiz, "umumiy" katakchasini olib tashlang.
 AccordingToGeoIPDatabase=(GeoIP konversiyasiga muvofiq)
@@ -777,8 +777,8 @@ Result=Natija
 ToTest=Sinov
 ValidateBefore=Ushbu xususiyatni ishlatishdan oldin mahsulot tasdiqlanishi kerak
 Visibility=Ko'rinish
-Totalizable=Totalizable
-TotalizableDesc=This field is totalizable in list
+Totalizable=Umumlashtirilishi mumkin
+TotalizableDesc=Ushbu maydon ro'yxatda umumlashtirilishi mumkin
 Private=Xususiy
 Hidden=Yashirin
 Resources=Resurslar
@@ -797,20 +797,20 @@ LinkTo=Ga havola
 LinkToProposal=Taklifga havola
 LinkToOrder=Buyurtma uchun havola
 LinkToInvoice=Hisob-fakturaga havola
-LinkToTemplateInvoice=Link to template invoice
+LinkToTemplateInvoice=Shablon hisob-fakturasiga havola
 LinkToSupplierOrder=Xarid qilish buyurtmasiga havola
 LinkToSupplierProposal=Yetkazib beruvchining taklifiga havola
 LinkToSupplierInvoice=Sotuvchi fakturasiga havola
 LinkToContract=Shartnomaga havola
 LinkToIntervention=Aralashuvga havola
-LinkToTicket=Link to ticket
+LinkToTicket=Chiptaga havola
 CreateDraft=Qoralama yarating
 SetToDraft=Qoralamaga qaytish
 ClickToEdit=Tahrirlash uchun bosing
-ClickToRefresh=Click to refresh
-EditWithEditor=Edit with CKEditor
-EditWithTextEditor=Edit with Text editor
-EditHTMLSource=Edit HTML Source
+ClickToRefresh=Yangilash uchun bosing
+EditWithEditor=CKEditor bilan tahrirlash
+EditWithTextEditor=Matn muharriri bilan tahrirlash
+EditHTMLSource=HTML manbasini tahrirlash
 ObjectDeleted=%s ob'ekti o'chirildi
 ByCountry=Mamlakatlar bo'yicha
 ByTown=Shahar bo'yicha
@@ -835,7 +835,7 @@ from=dan
 toward=tomonga
 Access=Kirish
 SelectAction=Amalni tanlang
-SelectTargetUser=Select target user/employee
+SelectTargetUser=Maqsadli foydalanuvchini / xodimni tanlang
 HelpCopyToClipboard=Buferga nusxalash uchun Ctrl + C tugmalaridan foydalaning
 SaveUploadedFileWithMask=Faylni "<strong> %s </strong>" nomi bilan saqlang (aks holda "%s")
 OriginFileName=Asl fayl nomi
@@ -844,108 +844,108 @@ SetBankAccount=Bank hisobini aniqlang
 AccountCurrency=Hisob-kitob valyutasi
 ViewPrivateNote=Eslatmalarni ko'rish
 XMoreLines=%s qatorlari yashiringan
-ShowMoreLines=Show more/less lines
+ShowMoreLines=Ko'proq / kamroq qatorlarni ko'rsatish
 PublicUrl=Ochiq URL
 AddBox=Qutini qo'shish
-SelectElementAndClick=Select an element and click on %s
+SelectElementAndClick=Elementni tanlang va %s tugmachasini bosing
 PrintFile=Faylni chop etish %s
 ShowTransaction=Bank hisobidagi yozuvni ko'rsatish
-ShowIntervention=Show intervention
-ShowContract=Show contract
+ShowIntervention=Aralashuvni ko'rsating
+ShowContract=Shartnomani ko'rsatish
 GoIntoSetupToChangeLogo=Logotipni o'zgartirish uchun Home - Setup - Company-ga o'ting yoki yashirish uchun Home - Setup - Display-ga o'ting.
 Deny=Rad et
 Denied=Rad etilgan
-ListOf=List of %s
+ListOf=%s ro'yxati
 ListOfTemplates=Shablonlar ro'yxati
 Gender=Jins
 Genderman=Erkak
 Genderwoman=Ayol
-Genderother=Other
+Genderother=Boshqalar
 ViewList=Ro'yxat ko'rinishi
-ViewGantt=Gantt view
-ViewKanban=Kanban view
+ViewGantt=Gantt ko'rinishi
+ViewKanban=Kanban ko'rinishi
 Mandatory=Majburiy
 Hello=Salom
-GoodBye=GoodBye
+GoodBye=Xayr. Salomat bo'ling
 Sincerely=Hurmat bilan
-ConfirmDeleteObject=Are you sure you want to delete this object?
+ConfirmDeleteObject=Haqiqatan ham ushbu ob'ektni o'chirishni xohlaysizmi?
 DeleteLine=Chiziqni o'chirish
 ConfirmDeleteLine=Ushbu qatorni o'chirishni xohlaysizmi?
-ErrorPDFTkOutputFileNotFound=Error: the file was not generated. Please check that the 'pdftk' command is installed in a directory included in the $PATH environment variable (linux/unix only) or contact your system administrator.
+ErrorPDFTkOutputFileNotFound=Xato: fayl yaratilmadi. Iltimos, 'pdftk' buyrug'i $ PATH muhit o'zgaruvchisiga kiritilgan katalogga o'rnatilganligini tekshiring (faqat linux / unix) yoki tizim administratoriga murojaat qiling.
 NoPDFAvailableForDocGenAmongChecked=Tekshirilgan yozuvlar orasida hujjat yaratish uchun PDF mavjud emas
 TooManyRecordForMassAction=Ommaviy harakatlar uchun tanlangan yozuvlar juda ko'p. Amal %s yozuvlari ro'yxati bilan cheklangan.
 NoRecordSelected=Hech qanday yozuv tanlanmadi
 MassFilesArea=Ommaviy harakatlar bilan qurilgan fayllar maydoni
 ShowTempMassFilesArea=Ommaviy harakatlar bilan qurilgan fayllar maydonini ko'rsating
-ConfirmMassDeletion=Bulk Delete confirmation
-ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record(s)?
+ConfirmMassDeletion=Ommaviy o'chirishni tasdiqlash
+ConfirmMassDeletionQuestion=Siz tanlagan %s yozuvlarini o'chirishni xohlaysizmi?
 RelatedObjects=Tegishli ob'ektlar
 ClassifyBilled=Hisob-kitoblarni tasniflang
-ClassifyUnbilled=Classify unbilled
+ClassifyUnbilled=Hisob-kitob qilinmaganlarni tasniflang
 Progress=Taraqqiyot
 ProgressShort=Progr.
 FrontOffice=Old ofis
 BackOffice=Orqa ofis
-Submit=Submit
+Submit=Yuborish
 View=Ko'rinish
 Export=Export
 Exports=Exports
 ExportFilteredList=Filtrlangan ro'yxatni eksport qilish
 ExportList=Eksport ro'yxati
-ExportOptions=Export Options
-IncludeDocsAlreadyExported=Include docs already exported
-ExportOfPiecesAlreadyExportedIsEnable=Export of pieces already exported is enable
-ExportOfPiecesAlreadyExportedIsDisable=Export of pieces already exported is disable
-AllExportedMovementsWereRecordedAsExported=All exported movements were recorded as exported
-NotAllExportedMovementsCouldBeRecordedAsExported=Not all exported movements could be recorded as exported
+ExportOptions=Eksport parametrlari
+IncludeDocsAlreadyExported=Allaqachon eksport qilingan hujjatlarni qo'shib qo'ying
+ExportOfPiecesAlreadyExportedIsEnable=Oldindan eksport qilingan qismlarni eksport qilish imkoniyati mavjud
+ExportOfPiecesAlreadyExportedIsDisable=Oldindan eksport qilingan qismlarni eksport qilish o'chirilgan
+AllExportedMovementsWereRecordedAsExported=Eksport qilingan barcha harakatlar eksport sifatida qayd etildi
+NotAllExportedMovementsCouldBeRecordedAsExported=Barcha eksport qilingan harakatlarni eksport sifatida qayd etish mumkin emas
 Miscellaneous=Turli xil
 Calendar=Taqvim
 GroupBy=Guruh bo'yicha ...
 ViewFlatList=Yassi ro'yxatni ko'rish
-ViewAccountList=View ledger
-ViewSubAccountList=View subaccount ledger
+ViewAccountList=Hisob kitobini ko'rish
+ViewSubAccountList=Hisob osti daftarini ko'rish
 RemoveString='%s' qatorini olib tashlash
 SomeTranslationAreUncomplete=Taklif qilinadigan ba'zi tillar qisman tarjima qilinishi yoki xatolarga yo'l qo'yishi mumkin. Iltimos, yaxshilangan narsalaringizni qo'shish uchun <a href="https://transifex.com/projects/p/dolibarr/" target="_blank"> https://transifex.com/projects/p/dolibarr/ </a> ro'yxatdan o'tib, tilingizni to'g'rilashga yordam bering.
 DirectDownloadLink=Umumiy yuklab olish havolasi
-PublicDownloadLinkDesc=Only the link is required to download the file
-DirectDownloadInternalLink=Private download link
-PrivateDownloadLinkDesc=You need to be logged and you need permissions to view or download the file
+PublicDownloadLinkDesc=Faylni yuklab olish uchun faqat havola kerak
+DirectDownloadInternalLink=Shaxsiy yuklab olish havolasi
+PrivateDownloadLinkDesc=Siz tizimga kirishingiz kerak va faylni ko'rish yoki yuklab olish uchun sizga ruxsat kerak
 Download=Yuklash
-DownloadDocument=Download document
+DownloadDocument=Hujjatni yuklab oling
 ActualizeCurrency=Valyuta kursini yangilang
 Fiscalyear=Moliyaviy yil
-ModuleBuilder=Module and Application Builder
-SetMultiCurrencyCode=Set currency
+ModuleBuilder=Modul va dastur yaratuvchisi
+SetMultiCurrencyCode=Valyutani o'rnating
 BulkActions=Ommaviy harakatlar
-ClickToShowHelp=Click to show tooltip help
-WebSite=Website
-WebSites=Websites
-WebSiteAccounts=Website accounts
-ExpenseReport=Expense report
-ExpenseReports=Expense reports
-HR=HR
-HRAndBank=HR and Bank
-AutomaticallyCalculated=Automatically calculated
-TitleSetToDraft=Go back to draft
-ConfirmSetToDraft=Are you sure you want to go back to Draft status?
+ClickToShowHelp=Maslahatlar bo'yicha yordamni ko'rsatish uchun bosing
+WebSite=Veb-sayt
+WebSites=Veb-saytlar
+WebSiteAccounts=Veb-sayt qayd yozuvlari
+ExpenseReport=Xarajatlar to'g'risida hisobot
+ExpenseReports=Xarajatlar bo'yicha hisobotlar
+HR=Kadrlar
+HRAndBank=Xodimlar va bank
+AutomaticallyCalculated=Avtomatik ravishda hisoblab chiqilgan
+TitleSetToDraft=Qoralamaga qaytish
+ConfirmSetToDraft=Haqiqatan ham Qoralama holatiga qaytmoqchimisiz?
 ImportId=Import id
-Events=Events
-EMailTemplates=Email templates
-FileNotShared=File not shared to external public
-Project=Project
-Projects=Projects
-LeadOrProject=Lead | Project
-LeadsOrProjects=Leads | Projects
-Lead=Lead
-Leads=Leads
-ListOpenLeads=List open leads
-ListOpenProjects=List open projects
-NewLeadOrProject=New lead or project
-Rights=Permissions
-LineNb=Line no.
-IncotermLabel=Incoterms
-TabLetteringCustomer=Customer lettering
-TabLetteringSupplier=Vendor lettering
+Events=Tadbirlar
+EMailTemplates=Elektron pochta shablonlari
+FileNotShared=Fayl tashqi hammaga tarqatilmaydi
+Project=Loyiha
+Projects=Loyihalar
+LeadOrProject=Qo'rg'oshin | Loyiha
+LeadsOrProjects=Yetakchilar | Loyihalar
+Lead=Qo'rg'oshin
+Leads=Yetakchilar
+ListOpenLeads=Ochiq yo'nalishlarni ro'yxatlash
+ListOpenProjects=Ochiq loyihalarni ro'yxati
+NewLeadOrProject=Yangi etakchi yoki loyiha
+Rights=Ruxsatlar
+LineNb=Qator №.
+IncotermLabel=Inkoermalar
+TabLetteringCustomer=Mijozlarning xatlari
+TabLetteringSupplier=Sotuvchi xatlari
 Monday=Dushanba
 Tuesday=Seshanba
 Wednesday=Chorshanba
@@ -974,39 +974,39 @@ ShortThursday=T
 ShortFriday=F
 ShortSaturday=S
 ShortSunday=S
-one=one
-two=two
-three=three
-four=four
-five=five
-six=six
-seven=seven
-eight=eight
-nine=nine
-ten=ten
-eleven=eleven
-twelve=twelve
-thirteen=thirdteen
-fourteen=fourteen
-fifteen=fifteen
-sixteen=sixteen
-seventeen=seventeen
-eighteen=eighteen
-nineteen=nineteen
-twenty=twenty
-thirty=thirty
-forty=forty
-fifty=fifty
-sixty=sixty
-seventy=seventy
-eighty=eighty
-ninety=ninety
-hundred=hundred
-thousand=thousand
+one=bitta
+two=ikkitasi
+three=uchta
+four=to'rt
+five=besh
+six=olti
+seven=Yetti
+eight=sakkiz
+nine=to'qqiz
+ten=o'n
+eleven=o'n bir
+twelve=o'n ikki
+thirteen=uchinchi
+fourteen=o'n to'rt
+fifteen=o'n besh
+sixteen=o'n olti
+seventeen=o'n etti
+eighteen=o'n sakkiz
+nineteen=o'n to'qqiz
+twenty=yigirma
+thirty=o'ttiz
+forty=qirq
+fifty=ellik
+sixty=oltmish
+seventy=etmish
+eighty=sakson
+ninety=to'qson
+hundred=yuz
+thousand=ming
 million=million
-billion=billion
+billion=milliard
 trillion=trillion
-quadrillion=quadrillion
+quadrillion=kvadrillion
 SelectMailModel=Elektron pochta shablonini tanlang
 SetRef=Referani o'rnating
 Select2ResultFoundUseArrows=Ba'zi natijalar topildi. Tanlash uchun strelkalardan foydalaning.
@@ -1014,7 +1014,7 @@ Select2NotFound=Hech qanday natija topilmadi
 Select2Enter=Kirish
 Select2MoreCharacter=yoki undan ko'p belgi
 Select2MoreCharacters=yoki undan ko'p belgilar
-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> Qidiruv sintaksis: </strong> <br> <kbd> <strong> | </strong> </kbd> <kbd> YOKI </kbd> (a | b) <br> <kbd> <strong> * </strong> </kbd> <kbd> Har qanday belgi </kbd> (a * b) <br> <kbd> <strong> ^ </strong> </kbd> <kbd> Start </kbd> bilan </kbd> (^ ab) <br> <kbd> <strong> $ </strong> </kbd> <kbd> End bilan ( ab $) <br>
 Select2LoadingMoreResults=Boshqa natijalar yuklanmoqda ...
 Select2SearchInProgress=Qidiruv davom etmoqda ...
 SearchIntoThirdparties=Uchinchi shaxslar
@@ -1022,9 +1022,9 @@ SearchIntoContacts=Kontaktlar
 SearchIntoMembers=A'zolar
 SearchIntoUsers=Foydalanuvchilar
 SearchIntoProductsOrServices=Mahsulotlar yoki xizmatlar
-SearchIntoBatch=Lots / Serials
+SearchIntoBatch=Ko'p / seriyalar
 SearchIntoProjects=Loyihalar
-SearchIntoMO=Manufacturing Orders
+SearchIntoMO=Ishlab chiqarish buyurtmalari
 SearchIntoTasks=Vazifalar
 SearchIntoCustomerInvoices=Mijozlarning hisob-fakturalari
 SearchIntoSupplierInvoices=Sotuvchi hisob-fakturalari
@@ -1037,103 +1037,103 @@ SearchIntoContracts=Shartnomalar
 SearchIntoCustomerShipments=Mijozlar jo'natmalari
 SearchIntoExpenseReports=Xarajatlar bo'yicha hisobotlar
 SearchIntoLeaves=Keting
-SearchIntoTickets=Tickets
-SearchIntoCustomerPayments=Customer payments
-SearchIntoVendorPayments=Vendor payments
-SearchIntoMiscPayments=Miscellaneous payments
-CommentLink=Comments
-NbComments=Number of comments
-CommentPage=Comments space
-CommentAdded=Comment added
-CommentDeleted=Comment deleted
-Everybody=Everybody
-PayedBy=Paid by
-PayedTo=Paid to
-Monthly=Monthly
-Quarterly=Quarterly
-Annual=Annual
-Local=Local
-Remote=Remote
-LocalAndRemote=Local and Remote
-KeyboardShortcut=Keyboard shortcut
-AssignedTo=Assigned to
-Deletedraft=Delete draft
-ConfirmMassDraftDeletion=Draft mass delete confirmation
-FileSharedViaALink=File shared with a public link
-SelectAThirdPartyFirst=Select a third party first...
-YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
-Inventory=Inventory
-AnalyticCode=Analytic code
+SearchIntoTickets=Chiptalar
+SearchIntoCustomerPayments=Mijozlar uchun to'lovlar
+SearchIntoVendorPayments=Sotuvchi uchun to'lovlar
+SearchIntoMiscPayments=Turli xil to'lovlar
+CommentLink=Izohlar
+NbComments=Izohlar soni
+CommentPage=Fikrlar maydoni
+CommentAdded=Fikr qo'shildi
+CommentDeleted=Fikr o'chirildi
+Everybody=Hamma
+PayedBy=To'langan
+PayedTo=To'langan
+Monthly=Oylik
+Quarterly=Har chorakda
+Annual=Yillik
+Local=Mahalliy
+Remote=Masofadan boshqarish pulti
+LocalAndRemote=Mahalliy va masofadan turib
+KeyboardShortcut=Klaviatura yorlig'i
+AssignedTo=Tayinlangan
+Deletedraft=Qoralamani o'chirish
+ConfirmMassDraftDeletion=Ommaviy o'chirishni tasdiqlash loyihasi
+FileSharedViaALink=Fayl umumiy havola bilan baham ko'rildi
+SelectAThirdPartyFirst=Avval uchinchi tomonni tanlang ...
+YouAreCurrentlyInSandboxMode=Siz hozirda %s "sandbox" rejimidasiz
+Inventory=Inventarizatsiya
+AnalyticCode=Analitik kod
 TMenuMRP=MRP
-ShowCompanyInfos=Show company infos
-ShowMoreInfos=Show More Infos
-NoFilesUploadedYet=Please upload a document first
-SeePrivateNote=See private note
-PaymentInformation=Payment information
-ValidFrom=Valid from
-ValidUntil=Valid until
-NoRecordedUsers=No users
-ToClose=To close
-ToRefuse=To refuse
-ToProcess=To process
-ToApprove=To approve
-GlobalOpenedElemView=Global view
-NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
-NoArticlesFoundForTheCategory=No article found for the category
-ToAcceptRefuse=To accept | refuse
-ContactDefault_agenda=Event
-ContactDefault_commande=Order
-ContactDefault_contrat=Contract
-ContactDefault_facture=Invoice
-ContactDefault_fichinter=Intervention
-ContactDefault_invoice_supplier=Supplier Invoice
-ContactDefault_order_supplier=Purchase Order
-ContactDefault_project=Project
-ContactDefault_project_task=Task
-ContactDefault_propal=Proposal
-ContactDefault_supplier_proposal=Supplier Proposal
-ContactDefault_ticket=Ticket
-ContactAddedAutomatically=Contact added from contact thirdparty roles
-More=More
-ShowDetails=Show details
-CustomReports=Custom reports
-StatisticsOn=Statistics on
-SelectYourGraphOptionsFirst=Select your graph options to build a graph
-Measures=Measures
-XAxis=X-Axis
-YAxis=Y-Axis
-StatusOfRefMustBe=Status of %s must be %s
-DeleteFileHeader=Confirm file delete
-DeleteFileText=Do you really want delete this file?
-ShowOtherLanguages=Show other languages
-SwitchInEditModeToAddTranslation=Switch in edit mode to add translations for this language
-NotUsedForThisCustomer=Not used for this customer
-AmountMustBePositive=Amount must be positive
-ByStatus=By status
-InformationMessage=Information
-Used=Used
-ASAP=As Soon As Possible
-CREATEInDolibarr=Record %s created
-MODIFYInDolibarr=Record %s modified
-DELETEInDolibarr=Record %s deleted
-VALIDATEInDolibarr=Record %s validated
-APPROVEDInDolibarr=Record %s approved
-DefaultMailModel=Default Mail Model
-PublicVendorName=Public name of vendor
-DateOfBirth=Date of birth
-SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again.
-UpToDate=Up-to-date
-OutOfDate=Out-of-date
-EventReminder=Event Reminder
-UpdateForAllLines=Update for all lines
-OnHold=On hold
-Civility=Civility
-AffectTag=Affect Tag
-CreateExternalUser=Create external user
-ConfirmAffectTag=Bulk Tag Affect
-ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
-CategTypeNotFound=No tag type found for type of records
-CopiedToClipboard=Copied to clipboard
-InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
-ConfirmCancel=Are you sure you want to cancel
-EmailMsgID=Email MsgID
+ShowCompanyInfos=Kompaniya ma'lumotlarini ko'rsatish
+ShowMoreInfos=Qo'shimcha ma'lumotni ko'rsatish
+NoFilesUploadedYet=Iltimos, avval hujjatni yuklang
+SeePrivateNote=Shaxsiy eslatmani ko'ring
+PaymentInformation=To'lov haqida ma'lumot
+ValidFrom=Yaroqliligi
+ValidUntil=Yaroqlilik muddati
+NoRecordedUsers=Foydalanuvchilar yo'q
+ToClose=Yopmoq
+ToRefuse=Rad etish
+ToProcess=Qayta ishlash uchun
+ToApprove=Tasdiqlash uchun
+GlobalOpenedElemView=Global ko'rinish
+NoArticlesFoundForTheKeyword='<strong> %s </strong>' kalit so'zi uchun maqola topilmadi.
+NoArticlesFoundForTheCategory=Ushbu turkum uchun maqola topilmadi
+ToAcceptRefuse=Qabul qilish | rad etish
+ContactDefault_agenda=Tadbir
+ContactDefault_commande=Buyurtma
+ContactDefault_contrat=Shartnoma
+ContactDefault_facture=Hisob-faktura
+ContactDefault_fichinter=Aralashish
+ContactDefault_invoice_supplier=Ta'minlovchining hisob-fakturasi
+ContactDefault_order_supplier=Xarid buyurtmasi
+ContactDefault_project=Loyiha
+ContactDefault_project_task=Vazifa
+ContactDefault_propal=Taklif
+ContactDefault_supplier_proposal=Ta'minlovchining taklifi
+ContactDefault_ticket=Chipta
+ContactAddedAutomatically=Kontakt uchinchi tomon rollaridan qo'shilgan aloqa
+More=Ko'proq
+ShowDetails=Tafsilotlarni ko'rsatish
+CustomReports=Maxsus hisobotlar
+StatisticsOn=Statistika
+SelectYourGraphOptionsFirst=Grafik yaratish uchun grafik variantlaringizni tanlang
+Measures=Tadbirlar
+XAxis=X o'qi
+YAxis=Y o'qi
+StatusOfRefMustBe=%s holati %s bo'lishi kerak
+DeleteFileHeader=Faylni o'chirishni tasdiqlang
+DeleteFileText=Haqiqatan ham ushbu faylni o'chirishni xohlaysizmi?
+ShowOtherLanguages=Boshqa tillarni ko'rsatish
+SwitchInEditModeToAddTranslation=Ushbu til uchun tarjimalarni qo'shish uchun tahrirlash rejimiga o'ting
+NotUsedForThisCustomer=Ushbu mijoz uchun ishlatilmaydi
+AmountMustBePositive=Miqdor ijobiy bo'lishi kerak
+ByStatus=Holati bo'yicha
+InformationMessage=Ma `lumot
+Used=Ishlatilgan
+ASAP=Imkoni boricha tezda
+CREATEInDolibarr=Yaratilgan %s yozuvi
+MODIFYInDolibarr=%s yozuvi o'zgartirildi
+DELETEInDolibarr=%s yozuv o'chirildi
+VALIDATEInDolibarr=%s yozuvi tasdiqlangan
+APPROVEDInDolibarr=%s yozuvi tasdiqlandi
+DefaultMailModel=Standart pochta modeli
+PublicVendorName=Sotuvchining ommaviy nomi
+DateOfBirth=Tug'ilgan sana
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Xavfsizlik belgisi muddati tugagan, shuning uchun harakatlar bekor qilindi. Iltimos, yana bir bor urinib ko'ring.
+UpToDate=Hozirgi kungacha
+OutOfDate=Eskirgan
+EventReminder=Voqealar to'g'risida eslatma
+UpdateForAllLines=Barcha satrlar uchun yangilash
+OnHold=Ushlab qolingan
+Civility=Fuqarolik
+AffectTag=Tegga ta'sir qilish
+CreateExternalUser=Tashqi foydalanuvchini yarating
+ConfirmAffectTag=Ommaviy teg ta'sir qiladi
+ConfirmAffectTagQuestion=Siz tanlangan %s yozuvlariga teglar ta'sir qilishni xohlaysizmi?
+CategTypeNotFound=Yozuvlar turi uchun yorliq turi topilmadi
+CopiedToClipboard=Buferga nusxa olindi
+InformationOnLinkToContract=Ushbu miqdor faqat shartnomadagi barcha satrlarning jami hisoblanadi. Vaqt tushunchasi hisobga olinmaydi.
+ConfirmCancel=Bekor qilishni xohlaysizmi?
+EmailMsgID=MsgID-ga elektron pochta orqali yuboring
diff --git a/htdocs/langs/uz_UZ/margins.lang b/htdocs/langs/uz_UZ/margins.lang
index 1741f81bdb3..451130886f4 100644
--- a/htdocs/langs/uz_UZ/margins.lang
+++ b/htdocs/langs/uz_UZ/margins.lang
@@ -16,7 +16,7 @@ MarginDetails=Marj tafsilotlari
 ProductMargins=Mahsulot chegaralari
 CustomerMargins=Mijozlar marjlari
 SalesRepresentativeMargins=Savdo vakili marjlari
-ContactOfInvoice=Contact of invoice
+ContactOfInvoice=Hisob-fakturaning aloqasi
 UserMargins=Foydalanuvchi chekkalari
 ProductService=Mahsulot yoki xizmat
 AllProducts=Barcha mahsulotlar va xizmatlar
diff --git a/htdocs/langs/uz_UZ/members.lang b/htdocs/langs/uz_UZ/members.lang
index d8b9c2f59f3..31a3657d0b7 100644
--- a/htdocs/langs/uz_UZ/members.lang
+++ b/htdocs/langs/uz_UZ/members.lang
@@ -1,217 +1,217 @@
 # Dolibarr language file - Source file is en_US - members
-MembersArea=Members area
-MemberCard=Member card
-SubscriptionCard=Subscription card
-Member=Member
-Members=Members
-ShowMember=Show member card
-UserNotLinkedToMember=User not linked to a member
-ThirdpartyNotLinkedToMember=Third party not linked to a member
-MembersTickets=Members Tickets
-FundationMembers=Foundation members
-ListOfValidatedPublicMembers=List of validated public members
-ErrorThisMemberIsNotPublic=This member is not public
+MembersArea=A'zolar maydoni
+MemberCard=A'zo kartasi
+SubscriptionCard=Obuna kartasi
+Member=A'zo
+Members=A'zolar
+ShowMember=A'zo kartasini ko'rsatish
+UserNotLinkedToMember=Foydalanuvchi a'zo bilan bog'lanmagan
+ThirdpartyNotLinkedToMember=Uchinchi tomon a'zo bilan bog'lanmagan
+MembersTickets=A'zolar chiptalari
+FundationMembers=Jamg'arma a'zolari
+ListOfValidatedPublicMembers=Tasdiqlangan jamoat a'zolari ro'yxati
+ErrorThisMemberIsNotPublic=Ushbu a'zo ochiq emas
 ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. Remove this link first because a third party can't be linked to only a member (and vice versa).
-ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
-SetLinkToUser=Link to a Dolibarr user
-SetLinkToThirdParty=Link to a Dolibarr third party
-MembersCards=Business cards for members
-MembersList=List of members
-MembersListToValid=List of draft members (to be validated)
-MembersListValid=List of valid members
-MembersListUpToDate=List of valid members with up-to-date subscription
-MembersListNotUpToDate=List of valid members with out-of-date subscription
-MembersListExcluded=List of excluded members
-MembersListResiliated=List of terminated members
-MembersListQualified=List of qualified members
-MenuMembersToValidate=Draft members
-MenuMembersValidated=Validated members
-MenuMembersExcluded=Excluded members
-MenuMembersResiliated=Terminated members
-MembersWithSubscriptionToReceive=Members with subscription to receive
-MembersWithSubscriptionToReceiveShort=Subscription to receive
-DateSubscription=Subscription date
-DateEndSubscription=Subscription end date
-EndSubscription=Subscription Ends
-SubscriptionId=Subscription id
-WithoutSubscription=Without subscription
-MemberId=Member id
-NewMember=New member
-MemberType=Member type
-MemberTypeId=Member type id
-MemberTypeLabel=Member type label
-MembersTypes=Members types
-MemberStatusDraft=Draft (needs to be validated)
-MemberStatusDraftShort=Draft
-MemberStatusActive=Validated (waiting subscription)
-MemberStatusActiveShort=Validated
-MemberStatusActiveLate=Subscription expired
-MemberStatusActiveLateShort=Expired
-MemberStatusPaid=Subscription up to date
-MemberStatusPaidShort=Up to date
-MemberStatusExcluded=Excluded member
-MemberStatusExcludedShort=Excluded
-MemberStatusResiliated=Terminated member
-MemberStatusResiliatedShort=Terminated
-MembersStatusToValid=Draft members
-MembersStatusExcluded=Excluded members
-MembersStatusResiliated=Terminated members
-MemberStatusNoSubscription=Validated (no subscription needed)
-MemberStatusNoSubscriptionShort=Validated
-SubscriptionNotNeeded=No subscription needed
-NewCotisation=New contribution
-PaymentSubscription=New contribution payment
-SubscriptionEndDate=Subscription's end date
-MembersTypeSetup=Members type setup
-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
-NewSubscription=New subscription
-NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s.
-Subscription=Subscription
-Subscriptions=Subscriptions
-SubscriptionLate=Late
-SubscriptionNotReceived=Subscription never received
-ListOfSubscriptions=List of subscriptions
-SendCardByMail=Send card by email
-AddMember=Create member
-NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
-NewMemberType=New member type
-WelcomeEMail=Welcome email
-SubscriptionRequired=Subscription required
-DeleteType=Delete
-VoteAllowed=Vote allowed
-Physical=Individual
-Moral=Corporation
-MorAndPhy=Corporation and Individual
-Reenable=Re-Enable
-ExcludeMember=Exclude a member
-ConfirmExcludeMember=Are you sure you want to exclude this member ?
-ResiliateMember=Terminate a member
-ConfirmResiliateMember=Are you sure you want to terminate this member?
-DeleteMember=Delete a member
-ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions)?
-DeleteSubscription=Delete a subscription
-ConfirmDeleteSubscription=Are you sure you want to delete this subscription?
-Filehtpasswd=htpasswd file
-ValidateMember=Validate a member
-ConfirmValidateMember=Are you sure you want to validate this member?
-FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formatted pages, provided as example to show how to list members database.
-PublicMemberList=Public member list
-BlankSubscriptionForm=Public self-subscription form
-BlankSubscriptionFormDesc=Dolibarr can provide you a public URL/website to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form may also be automatically provided.
-EnablePublicSubscriptionForm=Enable the public website with self-subscription form
-ForceMemberType=Force the member type
-ExportDataset_member_1=Members and subscriptions
-ImportDataset_member_1=Members
-LastMembersModified=Latest %s modified members
-LastSubscriptionsModified=Latest %s modified subscriptions
-String=String
-Text=Text
+ErrorUserPermissionAllowsToLinksToItselfOnly=Xavfsizlik nuqtai nazaridan, barcha foydalanuvchilarni tahrirlash uchun sizga o'zingizga tegishli bo'lmagan foydalanuvchi bilan bog'lanish uchun ruxsat berilishi kerak.
+SetLinkToUser=Dolibarr foydalanuvchisiga havola
+SetLinkToThirdParty=Dolibarr uchinchi tomoniga havola
+MembersCards=A'zolar uchun tashrif qog'ozlar
+MembersList=A'zolar ro'yxati
+MembersListToValid=Loyiha a'zolari ro'yxati (tasdiqlanishi kerak)
+MembersListValid=Haqiqiy a'zolar ro'yxati
+MembersListUpToDate=Zamonaviy obuna bo'lgan haqiqiy a'zolar ro'yxati
+MembersListNotUpToDate=Eskirgan obuna bo'lgan haqiqiy a'zolar ro'yxati
+MembersListExcluded=Chetlatilgan a'zolarning ro'yxati
+MembersListResiliated=Tugatilgan a'zolar ro'yxati
+MembersListQualified=Malakali a'zolar ro'yxati
+MenuMembersToValidate=Loyiha a'zolari
+MenuMembersValidated=Tasdiqlangan a'zolar
+MenuMembersExcluded=Chetlatilgan a'zolar
+MenuMembersResiliated=Tugatilgan a'zolar
+MembersWithSubscriptionToReceive=Qabul qilish uchun obuna bo'lgan a'zolar
+MembersWithSubscriptionToReceiveShort=Qabul qilish uchun obuna
+DateSubscription=Obuna sanasi
+DateEndSubscription=Obunaning tugash sanasi
+EndSubscription=Obuna tugaydi
+SubscriptionId=Obuna identifikatori
+WithoutSubscription=Obunasiz
+MemberId=A'zo identifikatori
+NewMember=Yangi a'zo
+MemberType=Ro'yxatdan turi
+MemberTypeId=Ro'yxatdan turi identifikatori
+MemberTypeLabel=Ro'yxatdan turi yorlig'i
+MembersTypes=A'zolar turlari
+MemberStatusDraft=Qoralama (tasdiqlanishi kerak)
+MemberStatusDraftShort=Qoralama
+MemberStatusActive=Tasdiqlangan (kutilayotgan obuna)
+MemberStatusActiveShort=Tasdiqlangan
+MemberStatusActiveLate=Obuna muddati tugagan
+MemberStatusActiveLateShort=Muddati tugagan
+MemberStatusPaid=Obuna dolzarb
+MemberStatusPaidShort=Hozirgi kungacha
+MemberStatusExcluded=Chetlatilgan a'zo
+MemberStatusExcludedShort=Chetlatildi
+MemberStatusResiliated=Tugatilgan a'zo
+MemberStatusResiliatedShort=Tugatilgan
+MembersStatusToValid=Loyiha a'zolari
+MembersStatusExcluded=Chetlatilgan a'zolar
+MembersStatusResiliated=Tugatilgan a'zolar
+MemberStatusNoSubscription=Tasdiqlangan (obuna kerak emas)
+MemberStatusNoSubscriptionShort=Tasdiqlangan
+SubscriptionNotNeeded=Obuna kerak emas
+NewCotisation=Yangi hissa
+PaymentSubscription=Yangi badal to'lovi
+SubscriptionEndDate=Obunaning tugash sanasi
+MembersTypeSetup=A'zolar turi sozlamalari
+MemberTypeModified=Ro'yxatdan turi o'zgartirildi
+DeleteAMemberType=A'zo turini o'chirish
+ConfirmDeleteMemberType=Ushbu a'zo turini o'chirishni xohlaysizmi?
+MemberTypeDeleted=Ro'yxatdan turi o'chirildi
+MemberTypeCanNotBeDeleted=Ro'yxatdan turini o'chirib bo'lmaydi
+NewSubscription=Yangi obuna
+NewSubscriptionDesc=Ushbu shakl sizga obunangizni fondning yangi a'zosi sifatida qayd etish imkonini beradi. Agar siz obunangizni yangilamoqchi bo'lsangiz (agar u allaqachon a'zo bo'lsa), %s elektron pochta orqali poydevor kengashiga murojaat qiling.
+Subscription=Obuna
+Subscriptions=Obunalar
+SubscriptionLate=Kech
+SubscriptionNotReceived=Obuna hech qachon olinmadi
+ListOfSubscriptions=Obunalar ro'yxati
+SendCardByMail=Elektron pochta orqali kartani yuboring
+AddMember=A'zo yaratish
+NoTypeDefinedGoToSetup=Hech qanday a'zo turi aniqlanmagan. "A'zolar turlari" menyusiga o'ting
+NewMemberType=Yangi a'zo turi
+WelcomeEMail=Xush kelibsiz elektron pochta
+SubscriptionRequired=Obuna talab qilinadi
+DeleteType=O'chirish
+VoteAllowed=Ovoz berishga ruxsat berildi
+Physical=Shaxsiy
+Moral=Korporatsiya
+MorAndPhy=Korporatsiya va individual
+Reenable=Qayta yoqish
+ExcludeMember=A'zoni chiqarib tashlang
+ConfirmExcludeMember=Haqiqatan ham ushbu a'zoni chiqarib tashlamoqchimisiz?
+ResiliateMember=A'zoni tugatish
+ConfirmResiliateMember=Ushbu a'zoni tugatishni xohlaysizmi?
+DeleteMember=A'zoni o'chirish
+ConfirmDeleteMember=Haqiqatan ham ushbu a'zoni o'chirishni xohlaysizmi (Agar a'zo o'chirilsa, uning barcha obunalari o'chiriladi)?
+DeleteSubscription=Obunani o'chirib tashlang
+ConfirmDeleteSubscription=Haqiqatan ham ushbu obunani o'chirishni xohlaysizmi?
+Filehtpasswd=htpasswd fayli
+ValidateMember=A'zoni tasdiqlash
+ConfirmValidateMember=Ushbu a'zoni tasdiqlamoqchimisiz?
+FollowingLinksArePublic=Quyidagi havolalar Dolibarr ruxsati bilan himoyalanmagan ochiq sahifalardir. Ular formatlangan sahifalar emas, balki ma'lumotlar bazasini ro'yxatga olishni ko'rsatadigan misol sifatida keltirilgan.
+PublicMemberList=Ochiq a'zolar ro'yxati
+BlankSubscriptionForm=Ommaviy obuna shakli
+BlankSubscriptionFormDesc=Dolibarr tashqi tashrif buyuruvchilarga fondga obuna bo'lishni so'rashlari uchun sizga ochiq URL / veb-sayt taqdim etishi mumkin. Agar onlayn to'lov moduli yoqilgan bo'lsa, to'lov shakli ham avtomatik ravishda taqdim etilishi mumkin.
+EnablePublicSubscriptionForm=O'z-o'ziga obuna bo'lish uchun ochiq veb-saytni yoqing
+ForceMemberType=Ro'yxatdan turini majburlang
+ExportDataset_member_1=A'zolar va obunalar
+ImportDataset_member_1=A'zolar
+LastMembersModified=Oxirgi %s o'zgartirilgan a'zolari
+LastSubscriptionsModified=Oxirgi %s o'zgartirilgan obunalari
+String=Ip
+Text=Matn
 Int=Int
-DateAndTime=Date and time
-PublicMemberCard=Member public card
-SubscriptionNotRecorded=Subscription not recorded
-AddSubscription=Create subscription
-ShowSubscription=Show subscription
+DateAndTime=Sana va vaqt
+PublicMemberCard=A'zolarning ommaviy kartasi
+SubscriptionNotRecorded=Obuna yozib olinmadi
+AddSubscription=Obuna yaratish
+ShowSubscription=Obunani ko'rsatish
 # Label of email templates
-SendingAnEMailToMember=Sending information email to member
-SendingEmailOnAutoSubscription=Sending email on auto registration
-SendingEmailOnMemberValidation=Sending email on new member validation
-SendingEmailOnNewSubscription=Sending email on new subscription
-SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
-SendingEmailOnCancelation=Sending email on cancelation
-SendingReminderActionComm=Sending reminder for agenda event
+SendingAnEMailToMember=Ro'yxatdanga elektron pochta xabarini yuborish
+SendingEmailOnAutoSubscription=Avtomatik ro'yxatdan o'tishda elektron pochta xabarlarini yuborish
+SendingEmailOnMemberValidation=Yangi a'zoni tasdiqlash to'g'risida elektron pochta xabarini yuborish
+SendingEmailOnNewSubscription=Yangi obuna bo'yicha elektron pochta xabarlarini yuborish
+SendingReminderForExpiredSubscription=Muddati o'tgan obunalar uchun eslatma yuborilmoqda
+SendingEmailOnCancelation=Bekor qilish to'g'risida elektron pochta xabarini yuborish
+SendingReminderActionComm=Kun tartibidagi tadbir uchun eslatma yuborish
 # Topic of email templates
-YourMembershipRequestWasReceived=Your membership was received.
-YourMembershipWasValidated=Your membership was validated
-YourSubscriptionWasRecorded=Your new subscription was recorded
-SubscriptionReminderEmail=Subscription reminder
-YourMembershipWasCanceled=Your membership was canceled
-CardContent=Content of your member card
+YourMembershipRequestWasReceived=Sizning a'zoligingiz qabul qilindi.
+YourMembershipWasValidated=Sizning a'zoligingiz tasdiqlandi
+YourSubscriptionWasRecorded=Sizning yangi obunangiz yozib olindi
+SubscriptionReminderEmail=Obuna haqida eslatma
+YourMembershipWasCanceled=Sizning a'zoligingiz bekor qilindi
+CardContent=A'zo kartangizning tarkibi
 # Text of email templates
-ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
-ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
-ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
-ThisIsContentOfSubscriptionReminderEmail=We want to let you know that your subscription is about to expire or has already expired (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). We hope you will renew it.<br><br>
-ThisIsContentOfYourCard=This is a summary of the information we have about you. Please contact us if anything is incorrect.<br><br>
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the notification email received in case of auto-inscription of a guest
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Content of the notification email received in case of auto-inscription of a guest
-DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Email template to use to send email to a member on member autosubscription
-DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send email to a member on member validation
-DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
-DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
-DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
-DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
-DescADHERENT_MAIL_FROM=Sender Email for automatic emails
-DescADHERENT_ETIQUETTE_TYPE=Format of labels page
-DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
-DescADHERENT_CARD_TYPE=Format of cards page
-DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards
-DescADHERENT_CARD_TEXT=Text printed on member cards (align on left)
-DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right)
-DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards
-ShowTypeCard=Show type '%s'
-HTPasswordExport=htpassword file generation
-NoThirdPartyAssociatedToMember=No third party associated to this member
-MembersAndSubscriptions= Members and Subscriptions
-MoreActions=Complementary action on recording
-MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
-MoreActionBankDirect=Create a direct entry on bank account
-MoreActionBankViaInvoice=Create an invoice, and a payment on bank account
-MoreActionInvoiceOnly=Create an invoice with no payment
-LinkToGeneratedPages=Generate visit cards
-LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member.
-DocForAllMembersCards=Generate business cards for all members
-DocForOneMemberCards=Generate business cards for a particular member
-DocForLabels=Generate address sheets
-SubscriptionPayment=Subscription payment
-LastSubscriptionDate=Date of latest subscription payment
-LastSubscriptionAmount=Amount of latest subscription
-LastMemberType=Last Member type
-MembersStatisticsByCountries=Members statistics by country
-MembersStatisticsByState=Members statistics by state/province
-MembersStatisticsByTown=Members statistics by town
-MembersStatisticsByRegion=Members statistics by region
-NbOfMembers=Total number of members
-NbOfActiveMembers=Total number of current active members
-NoValidatedMemberYet=No validated members found
-MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
-MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
-MembersByTownDesc=This screen show you statistics of members by town.
-MembersByNature=This screen show you statistics of members by nature.
-MembersByRegion=This screen show you statistics of members by region.
-MembersStatisticsDesc=Choose statistics you want to read...
-MenuMembersStats=Statistics
-LastMemberDate=Latest membership date
-LatestSubscriptionDate=Latest subscription date
-MemberNature=Nature of the member
-MembersNature=Nature of the members
-Public=Information is public
-NewMemberbyWeb=New member added. Awaiting approval
-NewMemberForm=New member form
-SubscriptionsStatistics=Subscriptions statistics
-NbOfSubscriptions=Number of subscriptions
-AmountOfSubscriptions=Amount collected from subscriptions
-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 nature
-MembersStatisticsByProperties=Members statistics by nature
-VATToUseForSubscriptions=VAT rate to use for subscriptions
-NoVatOnSubscription=No VAT for subscriptions
-ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
-NameOrCompany=Name or company
-SubscriptionRecorded=Subscription recorded
-NoEmailSentToMember=No email sent to member
-EmailSentToMember=Email sent to member at %s
-SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
-SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind. It can be a list of days separated by a semicolon, for example '10;5;0;-5')
-MembershipPaid=Membership paid for current period (until %s)
-YouMayFindYourInvoiceInThisEmail=You may find your invoice attached to this email
-XMembersClosed=%s member(s) closed
-XExternalUserCreated=%s external user(s) created
-ForceMemberNature=Force member nature (Individual or Corporation)
+ThisIsContentOfYourMembershipRequestWasReceived=A'zolik so'rovi olinganligini sizga xabar qilmoqchimiz. <br> <br>
+ThisIsContentOfYourMembershipWasValidated=Sizning a'zoligingiz quyidagi ma'lumotlar bilan tasdiqlanganligini sizga xabar qilmoqchimiz: <br> <br>
+ThisIsContentOfYourSubscriptionWasRecorded=Sizga yangi obunangiz yozib olingani haqida xabar bermoqchimiz. <br> <br>
+ThisIsContentOfSubscriptionReminderEmail=Obunangiz muddati tugashini yoki allaqachon tugaganligini sizga xabar qilmoqchimiz (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). Siz uni yangilaysiz degan umiddamiz. <br> <br>
+ThisIsContentOfYourCard=Bu siz haqingizda mavjud bo'lgan ma'lumotlarning qisqacha mazmuni. Iltimos, biron bir narsa noto'g'ri bo'lsa, biz bilan bog'laning. <br> <br>
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Agar mehmon avtomatik ravishda yozgan bo'lsa, elektron pochta xabarining mavzusi
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Mehmon avtomatik ravishda yozilgan taqdirda olingan elektron pochta xabarining mazmuni
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=E-pochta shablonini a'zoning avtomatik obunasida a'zoga elektron pochta xabarini yuborish uchun ishlatish
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=E-pochta shablonini a'zolarni tasdiqlash bo'yicha a'zolarga elektron pochta xabarlarini yuborish uchun ishlatish
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Yangi obuna yozuvida a'zoga elektron pochta xabarini yuborish uchun elektron pochta shablonini ishlatish
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Obuna muddati tugashiga yaqin bo'lganida elektron pochta orqali eslatmani yuborish uchun ishlatiladigan elektron pochta shabloni
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=A'zo bekor qilinganida a'zoga elektron pochta xabarini yuborish uchun elektron pochta shablonini
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=E-pochta shablonini a'zolardan chetlatish bo'yicha a'zolarga elektron pochta xabarlarini yuborish uchun ishlatish
+DescADHERENT_MAIL_FROM=Avtomatik elektron pochta xabarlari uchun yuboruvchi elektron pochta
+DescADHERENT_ETIQUETTE_TYPE=Yorliqlar sahifasining formati
+DescADHERENT_ETIQUETTE_TEXT=Ro'yxatdan manzil varaqalarida bosilgan matn
+DescADHERENT_CARD_TYPE=Kartalar formati sahifasi
+DescADHERENT_CARD_HEADER_TEXT=A'zo kartalari ustiga bosilgan matn
+DescADHERENT_CARD_TEXT=A'zo kartalarida bosilgan matn (chap tomonda tekislang)
+DescADHERENT_CARD_TEXT_RIGHT=A'zo kartalarida bosilgan matn (o'ng tomonga tekislang)
+DescADHERENT_CARD_FOOTER_TEXT=Ro'yxatdan kartalarining pastki qismida bosilgan matn
+ShowTypeCard="%s" turini ko'rsatish
+HTPasswordExport=htpassword faylini yaratish
+NoThirdPartyAssociatedToMember=Ushbu a'zoga aloqador uchinchi tomon yo'q
+MembersAndSubscriptions= A'zolar va obunalar
+MoreActions=Yozib olish bo'yicha qo'shimcha harakatlar
+MoreActionsOnSubscription=Obunani yozishda sukut bo'yicha tavsiya etilgan qo'shimcha harakatlar
+MoreActionBankDirect=Bank hisobvarag'ida to'g'ridan-to'g'ri yozuvni yarating
+MoreActionBankViaInvoice=Hisob-fakturani va bank hisobvarag'ida to'lovni yarating
+MoreActionInvoiceOnly=To'lovsiz hisob-fakturani yarating
+LinkToGeneratedPages=Tashrif kartalarini yarating
+LinkToGeneratedPagesDesc=Ushbu ekran barcha a'zolaringiz yoki ma'lum bir a'zolaringiz uchun tashrif qog'ozlari bilan PDF-fayllarni yaratishga imkon beradi.
+DocForAllMembersCards=Barcha a'zolar uchun tashrif qog'ozlarini yarating
+DocForOneMemberCards=Muayyan a'zoning tashrif qog'ozlarini yarating
+DocForLabels=Manzil varaqalarini yarating
+SubscriptionPayment=Obuna to'lovi
+LastSubscriptionDate=Oxirgi obuna to'lovi sanasi
+LastSubscriptionAmount=Oxirgi obuna miqdori
+LastMemberType=Oxirgi a'zo turi
+MembersStatisticsByCountries=A'zolar statistikasi mamlakatlar bo'yicha
+MembersStatisticsByState=A'zolar statistikasi viloyat / viloyat bo'yicha
+MembersStatisticsByTown=A'zolar statistikasi shahar bo'yicha
+MembersStatisticsByRegion=A'zolar statistikasi mintaqalar bo'yicha
+NbOfMembers=A'zolarning umumiy soni
+NbOfActiveMembers=Hozirgi faol a'zolarning umumiy soni
+NoValidatedMemberYet=Tasdiqlangan a'zolar topilmadi
+MembersByCountryDesc=Ushbu ekran sizga mamlakatlar bo'yicha a'zolarning statistikasini ko'rsatadi. Grafik va jadvallar Google-ning onlayn grafik xizmati hamda ishlaydigan internet aloqasi mavjudligiga bog'liq.
+MembersByStateDesc=Ushbu ekran sizga shtatlar / viloyatlar / kantonlar bo'yicha a'zolarning statistikasini ko'rsatadi.
+MembersByTownDesc=Ushbu ekran sizga shaharlar bo'yicha a'zolarning statistikasini ko'rsatadi.
+MembersByNature=Ushbu ekran sizga a'zolarning statistikasini tabiatan ko'rsatadi.
+MembersByRegion=Ushbu ekran sizga mintaqalar bo'yicha a'zolarning statistikasini ko'rsatadi.
+MembersStatisticsDesc=O'qishni istagan statistikani tanlang ...
+MenuMembersStats=Statistika
+LastMemberDate=Oxirgi a'zolik sanasi
+LatestSubscriptionDate=Oxirgi obuna sanasi
+MemberNature=A'zoning tabiati
+MembersNature=A'zolarning tabiati
+Public=Ma'lumot ochiq
+NewMemberbyWeb=Yangi a'zo qo'shildi. Tasdiqlash kutilmoqda
+NewMemberForm=Yangi a'zo shakli
+SubscriptionsStatistics=Obunalar statistikasi
+NbOfSubscriptions=Obuna soni
+AmountOfSubscriptions=Obunalardan yig'ilgan mablag '
+TurnoverOrBudget=Tovar aylanmasi (kompaniya uchun) yoki byudjet (fond uchun)
+DefaultAmount=Standart obuna miqdori
+CanEditAmount=Mehmon o'z obunasining miqdorini tanlashi / tahrirlashi mumkin
+MEMBER_NEWFORM_PAYONLINE=Onlayn to'lovlar sahifasiga o'ting
+ByProperties=Tabiatan
+MembersStatisticsByProperties=A'zolar statistikasi tabiatan
+VATToUseForSubscriptions=Obuna uchun ishlatiladigan QQS stavkasi
+NoVatOnSubscription=Obuna uchun QQS yo'q
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Hisob-fakturaga obuna liniyasi uchun ishlatiladigan mahsulot: %s
+NameOrCompany=Ism yoki kompaniya
+SubscriptionRecorded=Obuna yozib olindi
+NoEmailSentToMember=Ro'yxatdanga elektron pochta xabarlari yuborilmadi
+EmailSentToMember=%s orqali a'zoga elektron pochta xabarlari yuborildi
+SendReminderForExpiredSubscriptionTitle=Muddati o'tgan obuna uchun elektron pochta orqali eslatma yuboring
+SendReminderForExpiredSubscription=Obuna tugashi arafasida a'zolarga elektron pochta orqali eslatma yuboring (parametr - eslatmani yuborish uchun obuna tugashidan bir necha kun oldin. Bu nuqta-vergul bilan ajratilgan kunlar ro'yxati bo'lishi mumkin, masalan '10; 5; 0; -5 ')
+MembershipPaid=Joriy davr uchun to'langan a'zolik (%s gacha)
+YouMayFindYourInvoiceInThisEmail=Sizning hisob-fakturangizni ushbu elektron pochtaga biriktirilgan holda topishingiz mumkin
+XMembersClosed=%s a'zo (lar) yopildi
+XExternalUserCreated=%s tashqi foydalanuvchi (lar) yaratildi
+ForceMemberNature=Majburiy a'zoning tabiati (Individual yoki Corporation)
diff --git a/htdocs/langs/uz_UZ/modulebuilder.lang b/htdocs/langs/uz_UZ/modulebuilder.lang
index 23a098be2e5..82ce5cf2b8a 100644
--- a/htdocs/langs/uz_UZ/modulebuilder.lang
+++ b/htdocs/langs/uz_UZ/modulebuilder.lang
@@ -1,146 +1,146 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
-EnterNameOfModuleDesc=Enter name of the module/application to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
-EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...). The CRUD class file, but also API file, pages to list/add/edit/delete object and SQL files will be generated.
-ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %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
-NewModule=New module
-NewObjectInModulebuilder=New object
-ModuleKey=Module key
-ObjectKey=Object key
-ModuleInitialized=Module initialized
-FilesForObjectInitialized=Files for new object '%s' initialized
-FilesForObjectUpdated=Files for object '%s' updated (.sql files and .class.php file)
-ModuleBuilderDescdescription=Enter here all general information that describe your module.
-ModuleBuilderDescspecifications=You can enter here a detailed description of the specifications of your module that is not already structured into other tabs. So you have within easy reach all the rules to develop. Also this text content will be included into the generated documentation (see last tab). You can use Markdown format, but it is recommended to use Asciidoc format (comparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown).
-ModuleBuilderDescobjects=Define here the objects you want to manage with your module. A CRUD DAO class, SQL files, page to list record of objects, to create/edit/view a record and an API will be generated.
-ModuleBuilderDescmenus=This tab is dedicated to define menu entries provided by your module.
-ModuleBuilderDescpermissions=This tab is dedicated to define the new permissions you want to provide with your module.
-ModuleBuilderDesctriggers=This is the view of triggers provided by your module. To include code executed when a triggered business event is launched, just edit this file.
-ModuleBuilderDeschooks=This tab is dedicated to hooks.
-ModuleBuilderDescwidgets=This tab is dedicated to manage/build widgets.
-ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module and a "ready to distribute" documentation file. Just click on button to build the package or documentation file.
-EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: All coding files of module (generated or created manually) AND structured data and documentation will be deleted!
-EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to object will be deleted!
-DangerZone=Danger zone
-BuildPackage=Build package
-BuildPackageDesc=You can generate a zip package of your application so your are ready to distribute it on any Dolibarr. You can also distribute it or sell it on marketplace like <a href="https://www.dolistore.com">DoliStore.com</a>.
-BuildDocumentation=Build documentation
-ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here
-ModuleIsLive=This module has been activated. Any change may break a current live feature.
-DescriptionLong=Long description
-EditorName=Name of editor
-EditorUrl=URL of editor
-DescriptorFile=Descriptor file of module
-ClassFile=File for PHP DAO CRUD class
-ApiClassFile=File for PHP API class
-PageForList=PHP page for list of record
-PageForCreateEditView=PHP page to create/edit/view a record
-PageForAgendaTab=PHP page for event tab
-PageForDocumentTab=PHP page for document tab
-PageForNoteTab=PHP page for note tab
-PageForContactTab=PHP page for contact tab
-PathToModulePackage=Path to zip of module/application package
-PathToModuleDocumentation=Path to file of module/application documentation (%s)
-SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
-FileNotYetGenerated=File not yet generated
-RegenerateClassAndSql=Force update of .class and .sql files
-RegenerateMissingFiles=Generate missing files
-SpecificationFile=File of documentation
-LanguageFile=File for language
-ObjectProperties=Object Properties
-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
-TriggersFile=File for triggers code
-HooksFile=File for hooks code
-ArrayOfKeyValues=Array of key-val
-ArrayOfKeyValuesDesc=Array of keys and values if field is a combo list with fixed values
-WidgetFile=Widget file
-CSSFile=CSS file
-JSFile=Javascript file
-ReadmeFile=Readme file
-ChangeLog=ChangeLog file
-TestClassFile=File for PHP Unit Test class
-SqlFile=Sql file
-PageForLib=File for the common PHP library
-PageForObjLib=File for the PHP library dedicated to object
-SqlFileExtraFields=Sql file for complementary attributes
-SqlFileKey=Sql file for keys
-SqlFileKeyExtraFields=Sql file for keys of complementary attributes
-AnObjectAlreadyExistWithThisNameAndDiffCase=An object already exists with this name and a different case
-UseAsciiDocFormat=You can use Markdown format, but it is recommended to use Asciidoc format (omparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
-IsAMeasure=Is a measure
-DirScanned=Directory scanned
-NoTrigger=No trigger
-NoWidget=No widget
-GoToApiExplorer=API explorer
-ListOfMenusEntries=List of menu entries
-ListOfDictionariesEntries=List of dictionaries entries
-ListOfPermissionsDefined=List of defined permissions
-SeeExamples=See examples here
-EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br><br><strong>For document :</strong><br>0 = not displayed <br>1 = display<br>2 = display only if not empty<br><br><strong>For document lines :</strong><br>0 = not displayed <br>1 = displayed in a column<br>3 = display in line description column after the description<br>4 = display in description column after the description only if not empty
-DisplayOnPdf=Display on PDF
-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
-DictionariesDefDesc=Define here the dictionaries provided by your module
-PermissionsDefDesc=Define here the new permissions provided by your module
-MenusDefDescTooltip=The menus provided by your module/application are defined into the array <strong>$this->menus</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), menus are also visible into the menu editor available to administrator users on %s.
-DictionariesDefDescTooltip=The dictionaries provided by your module/application are defined into the array <strong>$this->dictionaries</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), dictionaries are also visible into the setup area to administrator users on %s.
-PermissionsDefDescTooltip=The permissions provided by your module/application are defined into the array <strong>$this->rights</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), permissions 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
-TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the native module builder wizard.<br>Enable the module <strong>%s</strong> and use the wizard by clicking the <span class="fa fa-bug"></span> on the top right menu.<br>Warning: This is an advanced developer feature, do <b>not</b> experiment on your production site!
-SeeTopRightMenu=See <span class="fa fa-bug"></span> on the top right menu
-AddLanguageFile=Add language file
-YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages")
-DropTableIfEmpty=(Destroy table if empty)
-TableDoesNotExists=The table %s does not exists
-TableDropped=Table %s deleted
-InitStructureFromExistingTable=Build the structure array string of an existing table
-UseAboutPage=Disable the about page
-UseDocFolder=Disable the documentation folder
-UseSpecificReadme=Use a specific ReadMe
-ContentOfREADMECustomized=Note: The content of the README.md file has been replaced with the specific value defined into setup of ModuleBuilder.
-RealPathOfModule=Real path of module
-ContentCantBeEmpty=Content of file can't be empty
-WidgetDesc=You can generate and edit here the widgets that will be embedded with your module.
-CSSDesc=You can generate and edit here a file with personalized CSS embedded with your module.
-JSDesc=You can generate and edit here a file with personalized Javascript embedded with your module.
-CLIDesc=You can generate here some command line scripts you want to provide with your module.
-CLIFile=CLI File
-NoCLIFile=No CLI files
-UseSpecificEditorName = Use a specific editor name
-UseSpecificEditorURL = Use a specific editor URL
-UseSpecificFamily = Use a specific family
-UseSpecificAuthor = Use a specific author
-UseSpecificVersion = Use a specific initial version
-IncludeRefGeneration=The reference of object must be generated automatically
-IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
-IncludeDocGeneration=I want to generate some documents from the object
-IncludeDocGenerationHelp=If you check this, some code will be generated to add a "Generate document" box on the record.
-ShowOnCombobox=Show value into combobox
-KeyForTooltip=Key for tooltip
-CSSClass=CSS for edit/create form
-CSSViewClass=CSS for read form
-CSSListClass=CSS for list
-NotEditable=Not editable
-ForeignKey=Foreign key
-TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
-AsciiToHtmlConverter=Ascii to HTML converter
-AsciiToPdfConverter=Ascii to PDF converter
-TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
-ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
-ImportExportProfiles=Import and export profiles
+ModuleBuilderDesc=Ushbu vositadan faqat tajribali foydalanuvchilar yoki ishlab chiquvchilar foydalanishi kerak. O'zingizning modulingizni yaratish yoki tahrirlash uchun yordam dasturlarini taqdim etadi. Muqobil <a href="%s" target="_blank"> qo'lda ishlab chiqish uchun hujjatlar bu erda </a>.
+EnterNameOfModuleDesc=Bo'sh joysiz yaratish uchun modul / dastur nomini kiriting. So'zlarni ajratish uchun katta harflardan foydalaning (Masalan: MyModule, EcommerceForShop, SyncWithMySystem ...)
+EnterNameOfObjectDesc=Bo'sh joysiz yaratish uchun ob'ekt nomini kiriting. So'zlarni ajratish uchun katta harflardan foydalaning (Masalan: MyObject, Student, Teacher ...). CRUD sinf fayli, shuningdek API fayli, ro'yxat / qo'shish / tahrirlash / o'chirish sahifalari va SQL fayllari yaratiladi.
+ModuleBuilderDesc2=Modullar ishlab chiqarilgan / tahrirlangan yo'l (tashqi modullar uchun birinchi katalog %s da belgilangan): <strong> %s </strong>
+ModuleBuilderDesc3=Yaratilgan / tahrirlanadigan modullar topildi: <strong> %s </strong>
+ModuleBuilderDesc4=<strong> %s </strong> fayli modul katalogining ildizida mavjud bo'lganda modul "tahrirlanadigan" deb topildi
+NewModule=Yangi modul
+NewObjectInModulebuilder=Yangi ob'ekt
+ModuleKey=Modul kaliti
+ObjectKey=Ob'ekt kaliti
+ModuleInitialized=Modul ishga tushirildi
+FilesForObjectInitialized=Yangi ob'ekt uchun fayllar '%s' ishga tushirildi
+FilesForObjectUpdated='%s' ob'ekti uchun fayllar yangilandi (.sql fayllari va .class.php fayli)
+ModuleBuilderDescdescription=Bu erga modulingizni tavsiflovchi barcha umumiy ma'lumotlarni kiriting.
+ModuleBuilderDescspecifications=Siz bu erga boshqa yorliqlarda tuzilmagan modulingizning batafsil tavsifini kiritishingiz mumkin. Shunday qilib, siz rivojlantirish uchun barcha qoidalarga osonlikcha erishasiz. Ushbu matn tarkibi yaratilgan hujjatlarga kiritiladi (oxirgi yorliqni ko'ring). Siz Markdown formatidan foydalanishingiz mumkin, ammo Asciidoc formatidan foydalanish tavsiya etiladi (.md va .asciidoc bilan taqqoslash: http://asciidoctor.org/docs/user-manual/#compared-to-markdown).
+ModuleBuilderDescobjects=O'zingizning modulingiz bilan boshqarmoqchi bo'lgan ob'ektlarni aniqlang. CRUD DAO klassi, SQL fayllari, ob'ektlar ro'yxati ro'yxati, yozuvni yaratish / tahrirlash / ko'rish uchun API va API yaratiladi.
+ModuleBuilderDescmenus=Ushbu yorliq sizning modulingiz tomonidan taqdim etilgan menyu yozuvlarini aniqlashga bag'ishlangan.
+ModuleBuilderDescpermissions=Ushbu yorliq sizning modulingiz bilan ta'minlamoqchi bo'lgan yangi ruxsatlarni aniqlashga bag'ishlangan.
+ModuleBuilderDesctriggers=Bu sizning modulingiz tomonidan taqdim etilgan triggerlarning ko'rinishi. Tijorat tadbirlari boshlanganda bajarilgan kodni kiritish uchun ushbu faylni tahrirlash kifoya.
+ModuleBuilderDeschooks=Ushbu yorliq kancalarga bag'ishlangan.
+ModuleBuilderDescwidgets=Ushbu yorliq vidjetlarni boshqarish / qurishga bag'ishlangan.
+ModuleBuilderDescbuildpackage=Siz bu erda modulingizning "tarqatishga tayyor" paketli faylini (normalizatsiya qilingan .zip fayli) va "tarqatishga tayyor" hujjat faylini yaratishingiz mumkin. Paket yoki hujjatlar faylini yaratish uchun tugmani bosing.
+EnterNameOfModuleToDeleteDesc=Siz modulingizni o'chirib tashlashingiz mumkin. OGOHLANTIRISH: Modulning barcha kodlash fayllari (qo'lda yaratilgan yoki yaratilgan) VA tuzilgan ma'lumotlar va hujjatlar o'chiriladi!
+EnterNameOfObjectToDeleteDesc=Ob'ektni o'chirishingiz mumkin. OGOHLANTIRISH: Ob'ektga tegishli bo'lgan barcha kodlash fayllari (qo'lda yaratilgan yoki yaratilgan) o'chiriladi!
+DangerZone=Xavfli hudud
+BuildPackage=Paket yaratish
+BuildPackageDesc=Siz o'zingizning arizangizning zip paketini yaratishingiz mumkin, shunda siz uni har qanday Dolibarr-da tarqatishga tayyor bo'lasiz. Siz uni tarqatishingiz yoki <a href="https://www.dolistore.com"> kabi bozorda sotishingiz mumkin DoliStore.com </a>.
+BuildDocumentation=Hujjatlarni yaratish
+ModuleIsNotActive=Ushbu modul hali faollashtirilmagan. Uni jonli qilish uchun %s-ga o'ting yoki shu yerni bosing
+ModuleIsLive=Ushbu modul faollashtirildi. Har qanday o'zgarish joriy jonli xususiyatni buzishi mumkin.
+DescriptionLong=Uzoq tavsif
+EditorName=Muharrir nomi
+EditorUrl=Tahrirlovchining URL manzili
+DescriptorFile=Modulning tavsiflovchi fayli
+ClassFile=PHP DAO CRUD klassi uchun fayl
+ApiClassFile=PHP API klassi uchun fayl
+PageForList=Rekordlar ro'yxati uchun PHP sahifasi
+PageForCreateEditView=Yozuvni yaratish / tahrirlash / ko'rish uchun PHP sahifasi
+PageForAgendaTab=Voqealar yorlig'i uchun PHP sahifasi
+PageForDocumentTab=Hujjatlar yorlig'i uchun PHP sahifasi
+PageForNoteTab=Eslatma yorlig'i uchun PHP sahifasi
+PageForContactTab=Kontakt yorlig'i uchun PHP sahifasi
+PathToModulePackage=Modul / dastur paketini zipga yo'naltirish
+PathToModuleDocumentation=Modul / dastur hujjatlari fayliga yo'l (%s)
+SpaceOrSpecialCharAreNotAllowed=Bo'sh joy yoki maxsus belgilarga ruxsat berilmaydi.
+FileNotYetGenerated=Fayl hali yaratilmagan
+RegenerateClassAndSql=.Class va .sql fayllarini majburiy yangilash
+RegenerateMissingFiles=Yo'qotilgan fayllarni yaratish
+SpecificationFile=Hujjatlar fayli
+LanguageFile=Til uchun fayl
+ObjectProperties=Ob'ekt xususiyatlari
+ConfirmDeleteProperty=<strong> %s </strong> xususiyatini o'chirishni xohlaysizmi? Bu PHP sinfidagi kodni o'zgartiradi, shuningdek ob'ektni jadval ta'rifidan ustunni olib tashlaydi.
+NotNull=NULL emas
+NotNullDesc=1 = Ma'lumotlar bazasini NOT NULL-ga sozlang. -1 = bo'sh ('' yoki 0) bo'lsa, null qiymatlarga va majburiy qiymatga NULL-ga ruxsat bering.
+SearchAll="Hammasini qidirish" uchun ishlatiladi
+DatabaseIndex=Ma'lumotlar bazasi indeksi
+FileAlreadyExists=%s fayli allaqachon mavjud
+TriggersFile=Trigger kodi uchun fayl
+HooksFile=Kancalar kodi uchun fayl
+ArrayOfKeyValues=Key-val qatori
+ArrayOfKeyValuesDesc=Agar maydon belgilangan qiymatlarga ega bo'lgan kombinatsion ro'yxat bo'lsa, kalitlar va qiymatlar qatori
+WidgetFile=Vidjet fayli
+CSSFile=CSS fayli
+JSFile=Javascript fayli
+ReadmeFile=Readme fayli
+ChangeLog=ChangeLog fayli
+TestClassFile=PHP birligi testi uchun fayl
+SqlFile=SQL fayli
+PageForLib=Umumiy PHP kutubxonasi uchun fayl
+PageForObjLib=Ob'ektga bag'ishlangan PHP kutubxonasi uchun fayl
+SqlFileExtraFields=Qo'shimcha atributlar uchun SQL fayli
+SqlFileKey=Kalitlar uchun SQL fayli
+SqlFileKeyExtraFields=Qo'shimcha atributlarning kalitlari uchun SQL fayli
+AnObjectAlreadyExistWithThisNameAndDiffCase=Ob'ekt allaqachon ushbu nom va boshqa holat bilan mavjud
+UseAsciiDocFormat=Siz Markdown formatidan foydalanishingiz mumkin, ammo Asciidoc formatidan foydalanish tavsiya etiladi (.md va .asciidoc o'rtasidagi omparison: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
+IsAMeasure=Bu o'lchovdir
+DirScanned=Katalog skanerdan o'tkazildi
+NoTrigger=Trigger yo'q
+NoWidget=Vidjet yo‘q
+GoToApiExplorer=API Explorer
+ListOfMenusEntries=Menyu yozuvlari ro'yxati
+ListOfDictionariesEntries=Lug'at yozuvlari ro'yxati
+ListOfPermissionsDefined=Belgilangan ruxsatnomalar ro'yxati
+SeeExamples=Bu erda misollarni ko'ring
+EnabledDesc=Ushbu maydon faol bo'lishi sharti (Masalan: 1 yoki $ conf-> global-> MYMODULE_MYOPTION)
+VisibleDesc=Maydon ko'rinadimi? (Masalan: 0 = Hech qachon ko'rinmaydi, 1 = Ro'yxatda ko'rinadi va shakllarni yaratadi / yangilaydi / ko'radi, 2 = Faqat ro'yxatda ko'rinadi, 3 = Faqat shaklni yaratadi / yangilaydi / ko'radi (ro'yxatda emas), 4 = Ro'yxatda ko'rinadigan va faqat yangilash / ko'rish formasi (yaratilmaydi), 5 = Faqat ro'yxat ko'rinishida ko'rinadigan shakl (yaratilmaydi, yangilanmaydi). <br> <br> manfiy qiymatdan foydalanish maydon sukut bo'yicha ro'yxatda ko'rsatilmaydi, lekin ko'rish uchun tanlanishi mumkin). <br> <br> Bu ibora bo'lishi mumkin, masalan: <br> preg_match ('/ public /', $ _SERVER ['PHP_SELF'])? 0: 1 <br> ($ user-> Rights_day>
+DisplayOnPdfDesc=Ushbu maydonni mos keladigan PDF hujjatlarida ko'rsating, siz "Pozitsiya" maydonida pozitsiyani boshqarishingiz mumkin. <br> Bugungi kunda ma'lum compatibles PDF modellari: eratosthene (tartibi), espadon (kema), shimgichni (Xarajatlarni), ko'k (propal / narx), cornas (etkazib beruvchi tartib) <br> <br> <strong> hujjat uchun: </strong> <br> 0 = <br> 1 ko'rsatilmaydi = ko'rsatish <br> 2 = ko'rsatishi faqat bo'sh emas, agar <br> <br> <strong> uchun hujjat bosqichlari: </strong> <br> 0 = emas <br> 1 = keyin Tavsif ustun 4 = namoyish <br> ta'rifi keyin liniyasi Tavsif ustun 3 = namoyish <br> bir ustun ko'rsatiladi ko'rsatilgan faqat bo'sh bo'lmasa tavsif
+DisplayOnPdf=PDF-da ko'rsatish
+IsAMeasureDesc=Jami ro'yxatga kiritish uchun maydon qiymatini yig'ish mumkinmi? (Masalan: 1 yoki 0)
+SearchAllDesc=Ushbu maydon tezkor qidiruv vositasidan qidirish uchun foydalaniladimi? (Masalan: 1 yoki 0)
+SpecDefDesc=O'zingizning modulingiz bilan ta'minlamoqchi bo'lgan barcha boshqa hujjatlarni bu erga kiriting. Siz .md yoki undan yaxshiroq, boy .asciidoc sintaksisidan foydalanishingiz mumkin.
+LanguageDefDesc=Ushbu fayllarga barcha kalitlarni va har bir til fayli uchun tarjimasini kiriting.
+MenusDefDesc=Modulingiz tomonidan taqdim etilgan menyularni aniqlang
+DictionariesDefDesc=Modulingiz tomonidan taqdim etilgan lug'atlarni aniqlang
+PermissionsDefDesc=Sizning modulingiz tomonidan taqdim etilgan yangi ruxsatlarni aniqlang
+MenusDefDescTooltip=Sizning modulingiz / ilovangiz tomonidan taqdim etilgan menyular <strong> $ this-> menyular </strong> massivida modul tavsiflovchi faylida aniqlangan. Siz ushbu faylni qo'lda tahrirlashingiz yoki o'rnatilgan muharrirdan foydalanishingiz mumkin. <br> <br> Izoh: Belgilanganidan keyin (va modul qayta yoqilganda) menyu muharriri %s-da administrator foydalanuvchilari uchun mavjud.
+DictionariesDefDescTooltip=Sizning modulingiz / ilovangiz tomonidan taqdim etilgan lug'atlar <strong> $ this-> lug'atlar </strong> massivida modul tavsiflovchi faylida aniqlangan. Siz ushbu faylni qo'lda tahrirlashingiz yoki o'rnatilgan muharrirdan foydalanishingiz mumkin. <br> <br> Eslatma: Belgilanganidan keyin (va modul qayta yoqilganda), lug'atlar administrator foydalanuvchilariga %s-da o'rnatish maydonchasida ham ko'rinadi.
+PermissionsDefDescTooltip=Sizning modulingiz / ilovangiz tomonidan berilgan ruxsatlar <strong> $ this-> huquqlari </strong> qatorida modul identifikatori faylida aniqlangan. Siz ushbu faylni qo'lda tahrirlashingiz yoki o'rnatilgan muharrirdan foydalanishingiz mumkin. <br> <br> Izoh: Belgilanganidan keyin (va modul qayta yoqilganda), ruxsatnomalar standart ruxsatlar %s-da ko'rinadi.
+HooksDefDesc=<b> module_parts ['ilgaklar'] </b> xususiyatida, modul identifikatorida siz boshqarmoqchi bo'lgan ilgaklar kontekstini aniqlang (kontekstlar ro'yxati '<b> initHooks (a09c094) kodlari) sizning bog'langan funktsiyalaringizning kodini qo'shish uchun kanca fayli (kanca funktsiyalarini '<b> executeHooks </b>' dan qidirish orqali topishingiz mumkin).
+TriggerDefDesc=Trigger faylida bajarilgan har bir ishbilarmonlik hodisasi uchun siz bajarmoqchi bo'lgan kodni aniqlang.
+SeeIDsInUse=O'rnatishda foydalanilayotgan identifikatorlarni ko'ring
+SeeReservedIDsRangeHere=Saqlangan identifikatorlar qatorini ko'ring
+ToolkitForDevelopers=Dolibarr dasturchilari uchun qo'llanma
+TryToUseTheModuleBuilder=Agar siz SQL va PHP haqida ma'lumotga ega bo'lsangiz, mahalliy modul yaratuvchisi sehrgaridan foydalanishingiz mumkin. <br> <strong> %s </strong> modulini yoqing va ustadan <span class="fa fa-bug"> </span> o'ng menyusida bosing. <br> Ogohlantirish: Bu ishlab chiquvchining rivojlangan xususiyati, ishlab chiqarish saytida </b> emas, balki <b> tajribasini bajaring!
+SeeTopRightMenu=Yuqoridagi o'ng menyuda <span class="fa fa-bug"> </span> ga qarang.
+AddLanguageFile=Til faylini qo'shing
+YouCanUseTranslationKey=Siz bu erda til faylida joylashgan tarjima kaliti bo'lgan kalitdan foydalanishingiz mumkin ("Tillar" yorlig'iga qarang)
+DropTableIfEmpty=(Bo'sh bo'lsa jadvalni yo'q qilish)
+TableDoesNotExists=%s jadvali mavjud emas
+TableDropped=%s-jadval o'chirildi
+InitStructureFromExistingTable=Mavjud jadvalning struktura qatorlari qatorini yarating
+UseAboutPage=Haqida sahifani o'chirib qo'ying
+UseDocFolder=Hujjatlar papkasini o'chirib qo'ying
+UseSpecificReadme=Muayyan ReadMe-dan foydalaning
+ContentOfREADMECustomized=Eslatma: README.md faylining tarkibi ModuleBuilder-ni o'rnatishda aniqlangan qiymat bilan almashtirildi.
+RealPathOfModule=Modulning haqiqiy yo'li
+ContentCantBeEmpty=Fayl tarkibi bo'sh bo'lishi mumkin emas
+WidgetDesc=Siz o'zingizning modulingizga o'rnatilgan vidjetlarni yaratishingiz va tahrirlashingiz mumkin.
+CSSDesc=Siz o'zingizning modulingizga kiritilgan shaxsiy CSS-ga ega faylni yaratishingiz va tahrirlashingiz mumkin.
+JSDesc=Siz o'zingizning modulingizga kiritilgan shaxsiylashtirilgan Javascript bilan fayl yaratishingiz va tahrirlashingiz mumkin.
+CLIDesc=Siz o'zingizning modulingiz bilan ta'minlamoqchi bo'lgan ba'zi buyruq satri skriptlarini yaratishingiz mumkin.
+CLIFile=CLI fayli
+NoCLIFile=CLI fayllari yo'q
+UseSpecificEditorName = Muayyan muharrir nomidan foydalaning
+UseSpecificEditorURL = Muayyan tahrirlovchining URL manzilidan foydalaning
+UseSpecificFamily = Muayyan oiladan foydalaning
+UseSpecificAuthor = Muayyan muallifdan foydalaning
+UseSpecificVersion = Muayyan dastlabki versiyadan foydalaning
+IncludeRefGeneration=Ob'ektning ma'lumotnomasi avtomatik ravishda yaratilishi kerak
+IncludeRefGenerationHelp=Malumotni avtomatik ravishda ishlab chiqarishni boshqarish uchun kod qo'shishni xohlasangiz, buni tekshiring
+IncludeDocGeneration=Ob'ektdan bir nechta hujjatlar yaratmoqchiman
+IncludeDocGenerationHelp=Agar buni belgilasangiz, yozuvga "Hujjat yaratish" katagini qo'shish uchun ba'zi kodlar hosil bo'ladi.
+ShowOnCombobox=Kombay qutisiga qiymatni ko'rsating
+KeyForTooltip=Maslahatlar uchun kalit
+CSSClass=Formani tahrirlash / yaratish uchun CSS
+CSSViewClass=O'qish shakli uchun CSS
+CSSListClass=Ro'yxat uchun CSS
+NotEditable=Tahrirlash mumkin emas
+ForeignKey=Chet el kaliti
+TypeOfFieldsHelp=Maydonlar turi: <br> varchar (99), double (24,8), real, text, html, datetime, timestamp, integer, integer: ClassName: relatpath / to / classfile.class.php [: 1 [: filter]] ('1' biz yozuvni yaratish uchun kombinatsiyadan keyin + tugmachasini qo'shamiz degani, 'filtr' 'status = 1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' bo'lishi mumkin).
+AsciiToHtmlConverter=Ascii-dan HTML-ga o'zgartiruvchi
+AsciiToPdfConverter=Ascii-dan PDF-ga o'tkazuvchi
+TableNotEmptyDropCanceled=Stol bo'sh emas Drop bekor qilindi.
+ModuleBuilderNotAllowed=Modul yaratuvchisi mavjud, ammo sizning foydalanuvchingizga ruxsat berilmagan.
+ImportExportProfiles=Import va eksport rejimlari
diff --git a/htdocs/langs/uz_UZ/mrp.lang b/htdocs/langs/uz_UZ/mrp.lang
index 2414a92cefb..682005e864f 100644
--- a/htdocs/langs/uz_UZ/mrp.lang
+++ b/htdocs/langs/uz_UZ/mrp.lang
@@ -1,103 +1,103 @@
-Mrp=Manufacturing Orders
-MOs=Manufacturing orders
-ManufacturingOrder=Manufacturing Order
-MRPDescription=Module to manage production and Manufacturing Orders (MO).
-MRPArea=MRP Area
-MrpSetupPage=Setup of module MRP
-MenuBOM=Bills of material
-LatestBOMModified=Latest %s Bills of materials modified
-LatestMOModified=Latest %s Manufacturing Orders modified
-Bom=Bills of Material
-BillOfMaterials=Bill of Materials
-BOMsSetup=Setup of module BOM
-ListOfBOMs=List of bills of material - BOM
-ListOfManufacturingOrders=List of Manufacturing Orders
-NewBOM=New bill of materials
-ProductBOMHelp=Product to create (or disassemble) with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
-BOMsNumberingModules=BOM numbering templates
-BOMsModelModule=BOM document templates
-MOsNumberingModules=MO numbering templates
-MOsModelModule=MO document templates
-FreeLegalTextOnBOMs=Free text on document of BOM
-WatermarkOnDraftBOMs=Watermark on draft BOM
-FreeLegalTextOnMOs=Free text on document of MO
-WatermarkOnDraftMOs=Watermark on draft MO
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials %s ?
-ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
-ManufacturingEfficiency=Manufacturing efficiency
-ConsumptionEfficiency=Consumption efficiency
-ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the production
-ValueOfMeansLossForProductProduced=Value of 0.95 means an average of 5%% of loss of produced product
-DeleteBillOfMaterials=Delete Bill Of Materials
-DeleteMo=Delete Manufacturing Order
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Materials?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Materials?
-MenuMRP=Manufacturing Orders
-NewMO=New Manufacturing Order
-QtyToProduce=Qty to produce
-DateStartPlannedMo=Date start planned
-DateEndPlannedMo=Date end planned
-KeepEmptyForAsap=Empty means 'As Soon As Possible'
-EstimatedDuration=Estimated duration
-EstimatedDurationDesc=Estimated duration to manufacture (or disassemble) this product using this BOM
-ConfirmValidateBom=Are you sure you want to validate the BOM with the reference <strong>%s</strong> (you will be able to use it to build new Manufacturing Orders)
-ConfirmCloseBom=Are you sure you want to cancel this BOM (you won't be able to use it to build new Manufacturing Orders anymore) ?
-ConfirmReopenBom=Are you sure you want to re-open this BOM (you will be able to use it to build new Manufacturing Orders)
-StatusMOProduced=Produced
-QtyFrozen=Frozen Qty
-QuantityFrozen=Frozen Quantity
-QuantityConsumedInvariable=When this flag is set, the quantity consumed is always the value defined and is not relative to the quantity produced.
-DisableStockChange=Stock change disabled
-DisableStockChangeHelp=When this flag is set, there is no stock change on this product, whatever is the quantity consumed
-BomAndBomLines=Bills Of Material and lines
-BOMLine=Line of BOM
-WarehouseForProduction=Warehouse for production
-CreateMO=Create MO
-ToConsume=To consume
-ToProduce=To produce
-QtyAlreadyConsumed=Qty already consumed
-QtyAlreadyProduced=Qty already produced
-QtyRequiredIfNoLoss=Qty required if there is no loss (Manufacturing efficiency is 100%%)
-ConsumeOrProduce=Consume or Produce
-ConsumeAndProduceAll=Consume and Produce All
-Manufactured=Manufactured
-TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
-ForAQuantityOf=For a quantity to produce of %s
-ForAQuantityToConsumeOf=For a quantity to disassemble of %s
-ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
-ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
-ProductionForRef=Production of %s
-AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
-NoStockChangeOnServices=No stock change on services
-ProductQtyToConsumeByMO=Product quantity still to consume by open MO
-ProductQtyToProduceByMO=Product quantity still to produce by open MO
-AddNewConsumeLines=Add new line to consume
-ProductsToConsume=Products to consume
-ProductsToProduce=Products to produce
-UnitCost=Unit cost
-TotalCost=Total cost
-BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
-GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.
-ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
-Workstation=Workstation
-Workstations=Workstations
-WorkstationsDescription=Workstations management
-WorkstationSetup = Workstations setup
-WorkstationSetupPage = Workstations setup page
-WorkstationList=Workstation list
-WorkstationCreate=Add new workstation
-ConfirmEnableWorkstation=Are you sure you want to enable workstation <b>%s</b> ?
-EnableAWorkstation=Enable a workstation
-ConfirmDisableWorkstation=Are you sure you want to disable workstation <b>%s</b> ?
-DisableAWorkstation=Disable a workstation
-DeleteWorkstation=Delete
-NbOperatorsRequired=Number of operators required
-THMOperatorEstimated=Estimated operator THM
-THMMachineEstimated=Estimated machine THM
-WorkstationType=Workstation type
-Human=Human
-Machine=Machine
-HumanMachine=Human / Machine
-WorkstationArea=Workstation area
-Machines=Machines
-THMEstimatedHelp=This rate makes it possible to define a forecast cost of the item
+Mrp=Ishlab chiqarish buyurtmalari
+MOs=Ishlab chiqarish buyurtmalari
+ManufacturingOrder=Ishlab chiqarish tartibi
+MRPDescription=Ishlab chiqarish va ishlab chiqarish buyurtmalarini boshqarish uchun modul (MO).
+MRPArea=MRP maydoni
+MrpSetupPage=MRP modulini sozlash
+MenuBOM=Materiallar
+LatestBOMModified=Oxirgi %s O'zgartirilgan materiallar hisob-kitoblari
+LatestMOModified=Oxirgi %s ishlab chiqarish buyurtmalari o'zgartirildi
+Bom=Materiallar veksellari
+BillOfMaterials=Materiallar hujjati
+BOMsSetup=BOM modulini sozlash
+ListOfBOMs=Materiallar ro'yxati - BOM
+ListOfManufacturingOrders=Ishlab chiqarish buyurtmalarining ro'yxati
+NewBOM=Yangi hisobot materiallari
+ProductBOMHelp=Ushbu BOM bilan yaratish (yoki qismlarga ajratish) uchun mahsulot. <br> Izoh: 'Mahsulotning tabiati' = 'Xomashyo' xususiyatiga ega mahsulotlar ushbu ro'yxatda ko'rinmaydi.
+BOMsNumberingModules=BOM raqamlash shablonlari
+BOMsModelModule=BOM hujjatlari shablonlari
+MOsNumberingModules=MO raqamlash shablonlari
+MOsModelModule=MO hujjatlari shablonlari
+FreeLegalTextOnBOMs=BOM hujjatidagi bepul matn
+WatermarkOnDraftBOMs=BOM loyihasidagi suv belgisi
+FreeLegalTextOnMOs=MO hujjatidagi bepul matn
+WatermarkOnDraftMOs=MO loyihasidagi suv belgisi
+ConfirmCloneBillOfMaterials=%s materiallar hisobini klonlamoqchimisiz?
+ConfirmCloneMo=%s ishlab chiqarish buyurtmasini klonlamoqchimisiz?
+ManufacturingEfficiency=Ishlab chiqarish samaradorligi
+ConsumptionEfficiency=Iste'mol samaradorligi
+ValueOfMeansLoss=0,95 qiymati ishlab chiqarish jarayonida o'rtacha 5%% yo'qotishlarni anglatadi
+ValueOfMeansLossForProductProduced=0,95 qiymati ishlab chiqarilgan mahsulotning o'rtacha 5%% yo'qolishini anglatadi
+DeleteBillOfMaterials=Materiallar varaqasini o'chirish
+DeleteMo=Ishlab chiqarish buyurtmasini o'chirib tashlang
+ConfirmDeleteBillOfMaterials=Ushbu Bill Of Materialni o'chirishni xohlaysizmi?
+ConfirmDeleteMo=Ushbu Bill Of Materialni o'chirishni xohlaysizmi?
+MenuMRP=Ishlab chiqarish buyurtmalari
+NewMO=Yangi ishlab chiqarish tartibi
+QtyToProduce=Miqdor ishlab chiqarish
+DateStartPlannedMo=Sana boshlanishi rejalashtirilgan
+DateEndPlannedMo=Sana tugashi rejalashtirilgan
+KeepEmptyForAsap=Bo'sh "iloji boricha tezroq" degan ma'noni anglatadi
+EstimatedDuration=Taxminiy davomiyligi
+EstimatedDurationDesc=Ushbu BOM yordamida ushbu mahsulotni ishlab chiqarish (yoki demontaj qilish) uchun taxminiy muddat
+ConfirmValidateBom=BOM-ni <strong> %s </strong> ma'lumotnomasi bilan tasdiqlashni xohlaysizmi (siz undan yangi ishlab chiqarish buyurtmalarini yaratish uchun foydalanishingiz mumkin)
+ConfirmCloseBom=Ushbu BOM-ni bekor qilishni xohlaganingizga ishonchingiz komilmi (endi siz uni yangi ishlab chiqarish buyurtmalarini yaratish uchun ishlata olmaysiz)?
+ConfirmReopenBom=Ushbu BOM-ni qayta ochmoqchi ekanligingizga aminmisiz (siz undan yangi ishlab chiqarish buyurtmalarini yaratish uchun foydalanishingiz mumkin)
+StatusMOProduced=Ishlab chiqarilgan
+QtyFrozen=Muzlatilgan miqdor
+QuantityFrozen=Muzlatilgan miqdor
+QuantityConsumedInvariable=Ushbu bayroq o'rnatilganida, iste'mol qilingan miqdor har doim belgilangan qiymat bo'lib, ishlab chiqarilgan miqdorga nisbatan emas.
+DisableStockChange=Qimmatli qog'ozlar almashinuvi o'chirilgan
+DisableStockChangeHelp=Ushbu bayroq o'rnatilganida, iste'mol qilingan miqdordan qat'i nazar, ushbu mahsulotda birja o'zgarishi bo'lmaydi
+BomAndBomLines=Materiallar va chiziqlar
+BOMLine=BOM liniyasi
+WarehouseForProduction=Ishlab chiqarish uchun ombor
+CreateMO=MO yaratish
+ToConsume=Iste'mol qilish
+ToProduce=Ishlab chiqarish
+QtyAlreadyConsumed=Miqdor allaqachon iste'mol qilingan
+QtyAlreadyProduced=Miqdor allaqachon ishlab chiqarilgan
+QtyRequiredIfNoLoss=Zarar bo'lmasa, miqdor talab qilinadi (ishlab chiqarish samaradorligi 100%%)
+ConsumeOrProduce=Iste'mol qiling yoki ishlab chiqaring
+ConsumeAndProduceAll=Hammasini iste'mol qiling va ishlab chiqaring
+Manufactured=Ishlab chiqarilgan
+TheProductXIsAlreadyTheProductToProduce=Qo'shiladigan mahsulot allaqachon ishlab chiqariladigan mahsulotdir.
+ForAQuantityOf=%s hosil qiladigan miqdor uchun
+ForAQuantityToConsumeOf=%s qismini ajratish uchun miqdor uchun
+ConfirmValidateMo=Ushbu ishlab chiqarish buyurtmasini tasdiqlamoqchimisiz?
+ConfirmProductionDesc="%s" tugmachasini bosish orqali siz iste'mol qilingan miqdorni va / yoki ishlab chiqarishni belgilangan miqdorlarga tasdiqlaysiz. Bu shuningdek aktsiyalarni yangilaydi va aktsiyalarning harakatini qayd etadi.
+ProductionForRef=%s ishlab chiqarish
+AutoCloseMO=Iste'mol qilinadigan va ishlab chiqariladigan miqdorlarga erishilgan bo'lsa, ishlab chiqarish buyurtmasini avtomatik ravishda yoping
+NoStockChangeOnServices=Xizmatlarda birja o'zgarishi yo'q
+ProductQtyToConsumeByMO=Hali ham ochiq MO tomonidan iste'mol qilinadigan mahsulot miqdori
+ProductQtyToProduceByMO=Hali ham ochiq MO tomonidan ishlab chiqariladigan mahsulot miqdori
+AddNewConsumeLines=Iste'mol qilish uchun yangi qator qo'shing
+ProductsToConsume=Iste'mol qilinadigan mahsulotlar
+ProductsToProduce=Ishlab chiqarish uchun mahsulotlar
+UnitCost=Birlik narxi
+TotalCost=Umumiy qiymati
+BOMTotalCost=Ushbu BOMni ishlab chiqarish uchun har bir miqdor va iste'mol qilinadigan mahsulot narxiga qarab xarajatlar (agar belgilangan bo'lsa, Narx narxidan foydalaning, boshqasi aniqlangan bo'lsa, o'rtacha og'irlik narxidan, eng yaxshi sotib olish narxidan)
+GoOnTabProductionToProduceFirst=Ishlab chiqarish buyurtmasini yopish uchun siz avval ishlab chiqarishni boshlashingiz kerak ('%s' yorlig'iga qarang). Ammo siz buni bekor qilishingiz mumkin.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=Kitni BOM yoki MOda ishlatib bo'lmaydi
+Workstation=Ish stantsiyasi
+Workstations=Ish stantsiyalari
+WorkstationsDescription=Ish stantsiyalarini boshqarish
+WorkstationSetup = Ish stantsiyalarini sozlash
+WorkstationSetupPage = Ish stantsiyalarini sozlash sahifasi
+WorkstationList=Ish stantsiyalari ro'yxati
+WorkstationCreate=Yangi ish stantsiyasini qo'shing
+ConfirmEnableWorkstation=<b> %s </b> ish stantsiyasini yoqishni xohlaysizmi?
+EnableAWorkstation=Ish stantsiyasini yoqing
+ConfirmDisableWorkstation=Ish stantsiyasini o'chirishni xohlaysizmi <b> %s </b>?
+DisableAWorkstation=Ish stantsiyasini o'chirib qo'ying
+DeleteWorkstation=O'chirish
+NbOperatorsRequired=Kerakli operatorlar soni
+THMOperatorEstimated=Taxminiy operator THM
+THMMachineEstimated=Taxminiy mashina THM
+WorkstationType=Ish stantsiyasining turi
+Human=Inson
+Machine=Mashina
+HumanMachine=Inson / mashina
+WorkstationArea=Ish stantsiyasi maydoni
+Machines=Mashinalar
+THMEstimatedHelp=Ushbu stavka buyumning taxminiy narxini aniqlashga imkon beradi
diff --git a/htdocs/langs/uz_UZ/multicurrency.lang b/htdocs/langs/uz_UZ/multicurrency.lang
index bfcbd11fb7c..41bb4630ee0 100644
--- a/htdocs/langs/uz_UZ/multicurrency.lang
+++ b/htdocs/langs/uz_UZ/multicurrency.lang
@@ -1,22 +1,38 @@
 # Dolibarr language file - Source file is en_US - multicurrency
-MultiCurrency=Multi currency
-ErrorAddRateFail=Error in added rate
-ErrorAddCurrencyFail=Error in added currency
-ErrorDeleteCurrencyFail=Error delete fail
-multicurrency_syncronize_error=Synchronization error: %s
-MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Use the date of the document to find the currency rate, instead of using the latest known rate
-multicurrency_useOriginTx=When an object is created from another, keep the original rate from the source object (otherwise use the latest known rate)
+MultiCurrency=Ko'p valyuta
+ErrorAddRateFail=Qo'shilgan stavkada xato
+ErrorAddCurrencyFail=Qo'shilgan valyutada xatolik yuz berdi
+ErrorDeleteCurrencyFail=Xato o'chirilmadi
+multicurrency_syncronize_error=Sinxronizatsiya xatosi: %s
+MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Valyuta kursini topish uchun hujjat sanasidan foydalaning, o'rniga ma'lum bo'lgan so'nggi kursdan foydalaning
+multicurrency_useOriginTx=Ob'ekt boshqasidan yaratilganda, dastlabki tezlikni manba ob'ektidan saqlang (aks holda eng so'nggi ma'lum stavkadan foydalaning)
 CurrencyLayerAccount=CurrencyLayer API
-CurrencyLayerAccount_help_to_synchronize=You must create an account on website %s to use this functionality.<br>Get your <b>API key</b>.<br>If you use a free account, you can't change the <b>source currency</b> (USD by default).<br>If your main currency is not USD, the application will automatically recalculate it.<br><br>You are limited to 1000 synchronizations per month.
-multicurrency_appId=API key
-multicurrency_appCurrencySource=Source currency
-multicurrency_alternateCurrencySource=Alternate source currency
-CurrenciesUsed=Currencies used
-CurrenciesUsed_help_to_add=Add the different currencies and rates you need to use on your <b>proposals</b>, <b>orders</b> etc.
-rate=rate
-MulticurrencyReceived=Received, original currency
-MulticurrencyRemainderToTake=Remaining amount, original currency
-MulticurrencyPaymentAmount=Payment amount, original currency
-AmountToOthercurrency=Amount To (in currency of receiving account)
-CurrencyRateSyncSucceed=Currency rate synchronization done successfuly
-MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Use the currency of the document for online payments
+CurrencyLayerAccount_help_to_synchronize=Ushbu funksiyadan foydalanish uchun siz %s veb-saytida qayd yozuvini yaratishingiz kerak. <br> <b> API kalitini oling </b>. <br> Agar siz bepul hisob qaydnomasidan foydalansangiz, <b> manba </b> (sukut bo'yicha AQSh dollarini) o'zgartira olmaysiz. <br> Agar sizning asosiy valyutangiz AQSh dollari bo'lmasa, dastur avtomatik ravishda uni qayta hisoblab chiqadi. <br> <br> Siz oyiga 1000 ta sinxronizatsiya bilan cheklangansiz.
+multicurrency_appId=API kaliti
+multicurrency_appCurrencySource=Manba valyutasi
+multicurrency_alternateCurrencySource=Muqobil manba valyutasi
+CurrenciesUsed=Amaldagi valyutalar
+CurrenciesUsed_help_to_add=<b> </b>, <b> buyurtmalariga </b> va boshqalar bo'yicha foydalanishingiz kerak bo'lgan turli xil valyutalar va kurslarni qo'shing.
+rate=stavka
+MulticurrencyReceived=Qabul qilingan, asl valyuta
+MulticurrencyRemainderToTake=Qolgan summa, asl valyuta
+MulticurrencyPaymentAmount=To'lov miqdori, asl valyuta
+AmountToOthercurrency=Miqdor (qabul qiluvchi hisob raqamida)
+CurrencyRateSyncSucceed=Valyuta kurslarini sinxronlashtirish muvaffaqiyatli amalga oshirildi
+MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Onlayn to'lovlar uchun hujjat valyutasidan foydalaning
+TabTitleMulticurrencyRate=Narxlar ro'yxati
+ListCurrencyRate=Valyuta kurslarining ro'yxati
+CreateRate=Narx yarating
+FormCreateRate=Tezlik yaratish
+FormUpdateRate=Narxlarni o'zgartirish
+successRateCreate=Ma'lumotlar bazasiga %s valyuta kursi qo'shildi
+ConfirmDeleteLineRate=%s sanasida %s valyuta %s kursini olib tashlamoqchimisiz?
+DeleteLineRate=Ochiq stavka
+successRateDelete=Baho o'chirildi
+errorRateDelete=Tarifni o'chirishda xato
+successUpdateRate=O'zgartirish amalga oshirildi
+ErrorUpdateRate=Tarifni o'zgartirishda xato
+Codemulticurrency=valyuta kodi
+UpdateRate=stavkani o'zgartirish
+CancelUpdate=bekor qilish
+NoEmptyRate=Stavka maydoni bo'sh bo'lmasligi kerak
diff --git a/htdocs/langs/uz_UZ/oauth.lang b/htdocs/langs/uz_UZ/oauth.lang
index da2af8c7758..a8e5efd79d0 100644
--- a/htdocs/langs/uz_UZ/oauth.lang
+++ b/htdocs/langs/uz_UZ/oauth.lang
@@ -28,5 +28,5 @@ OAUTH_GITHUB_NAME=OAuth GitHub xizmati
 OAUTH_GITHUB_ID=OAuth GitHub Id
 OAUTH_GITHUB_SECRET=OAuth GitHub Secret
 OAUTH_GITHUB_DESC=Ushbu sahifaga <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">-ga o'ting </a>, keyin OAuth hisob ma'lumotlarini yaratish uchun "yangi dasturni ro'yxatdan o'tkazing".
-OAUTH_STRIPE_TEST_NAME=OAuth Stripe Test
+OAUTH_STRIPE_TEST_NAME=OAuth Stripe testi
 OAUTH_STRIPE_LIVE_NAME=OAuth Stripe Live
diff --git a/htdocs/langs/uz_UZ/opensurvey.lang b/htdocs/langs/uz_UZ/opensurvey.lang
index 2a18ce951aa..87d8745b6da 100644
--- a/htdocs/langs/uz_UZ/opensurvey.lang
+++ b/htdocs/langs/uz_UZ/opensurvey.lang
@@ -57,5 +57,5 @@ ErrorInsertingComment=Fikringizni kiritishda xatolik yuz berdi
 MoreChoices=Saylovchilar uchun ko'proq tanlovlarni kiriting
 SurveyExpiredInfo=Ovoz berish yopildi yoki ovoz berishni kechiktirish muddati tugadi.
 EmailSomeoneVoted=%s qatorni to'ldirdi.\nSo'rovnomangizni havoladan topishingiz mumkin:\n%s
-ShowSurvey=Show survey
-UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
+ShowSurvey=So'rovnomani ko'rsatish
+UserMustBeSameThanUserUsedToVote=Siz ovoz bergan bo'lishingiz kerak va sharh yuborish uchun foydalanuvchi ovoz bergan foydalanuvchi nomidan foydalaning
diff --git a/htdocs/langs/uz_UZ/orders.lang b/htdocs/langs/uz_UZ/orders.lang
index 3dda0fbca6c..59d1f7d65a2 100644
--- a/htdocs/langs/uz_UZ/orders.lang
+++ b/htdocs/langs/uz_UZ/orders.lang
@@ -4,21 +4,21 @@ SuppliersOrdersArea=Sotib olish buyurtmalari maydoni
 OrderCard=Buyurtma kartasi
 OrderId=Buyurtma identifikatori
 Order=Buyurtma
-PdfOrderTitle=Order
+PdfOrderTitle=Buyurtma
 Orders=Buyurtmalar
 OrderLine=Buyurtma qatori
 OrderDate=Buyurtma sanasi
 OrderDateShort=Buyurtma sanasi
 OrderToProcess=Qayta ishlash uchun buyurtma
 NewOrder=Yangi buyurtma
-NewSupplierOrderShort=New order
-NewOrderSupplier=New Purchase Order
+NewSupplierOrderShort=Yangi buyurtma
+NewOrderSupplier=Xarid qilish bo'yicha yangi buyurtma
 ToOrder=Buyurtma qiling
 MakeOrder=Buyurtma qiling
 SupplierOrder=Xarid buyurtmasi
 SuppliersOrders=Sotib olish uchun buyurtmalar
-SaleOrderLines=Sale order lines
-PurchaseOrderLines=Puchase order lines
+SaleOrderLines=Sotish buyurtmalarining yo'nalishlari
+PurchaseOrderLines=Puchase buyurtma satrlari
 SuppliersOrdersRunning=Amaldagi buyurtmalar
 CustomerOrder=Sotish tartibi
 CustomersOrders=Sotish bo'yicha buyurtmalar
@@ -29,8 +29,8 @@ OrdersToBill=Savdo buyurtmalari etkazib berildi
 OrdersInProcess=Savdo buyurtmalari amalga oshirilmoqda
 OrdersToProcess=Savdo buyurtmalarini qayta ishlash
 SuppliersOrdersToProcess=Qayta ishlash uchun buyurtmalarni sotib oling
-SuppliersOrdersAwaitingReception=Purchase orders awaiting reception
-AwaitingReception=Awaiting reception
+SuppliersOrdersAwaitingReception=Qabul qilishni kutayotgan sotib olish buyurtmalari
+AwaitingReception=Qabul kutilmoqda
 StatusOrderCanceledShort=Bekor qilindi
 StatusOrderDraftShort=Qoralama
 StatusOrderValidatedShort=Tasdiqlangan
@@ -74,8 +74,8 @@ DeleteOrder=Buyurtmani o'chirish
 CancelOrder=Buyurtmani bekor qilish
 OrderReopened= %s buyurtmasini qayta oching
 AddOrder=Buyurtma yaratish
-AddSupplierOrderShort=Create order
-AddPurchaseOrder=Create purchase order
+AddSupplierOrderShort=Buyurtma yaratish
+AddPurchaseOrder=Xarid qilish uchun buyurtma yarating
 AddToDraftOrders=Chizma buyurtmasiga qo'shing
 ShowOrder=Buyurtmani ko'rsatish
 OrdersOpened=Qayta ishlash uchun buyurtmalar
@@ -123,7 +123,7 @@ SecondApprovalAlreadyDone=Ikkinchi tasdiqlash allaqachon amalga oshirilgan
 SupplierOrderReceivedInDolibarr=%s sotib olish buyurtmasi %s qabul qilindi
 SupplierOrderSubmitedInDolibarr=%s sotib olish buyurtmasi taqdim etildi
 SupplierOrderClassifiedBilled=Xarid qilish buyurtmasi %s to'plami taqdim etiladi
-OtherOrders=Other orders
+OtherOrders=Boshqa buyurtmalar
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Vakilni kuzatib borish bo'yicha buyurtma
 TypeContact_commande_internal_SHIPPING=Vakilni etkazib berish
@@ -146,11 +146,11 @@ OrderByWWW=Onlayn
 OrderByPhone=Telefon
 # Documents models
 PDFEinsteinDescription=Buyurtmaning to'liq modeli (Eratosthene shablonining eski qo'llanilishi)
-PDFEratostheneDescription=A complete order model
+PDFEratostheneDescription=To'liq buyurtma modeli
 PDFEdisonDescription=Oddiy buyurtma modeli
 PDFProformaDescription=Proforma hisob-fakturasining to'liq shabloni
 CreateInvoiceForThisCustomer=Bill buyurtmalari
-CreateInvoiceForThisSupplier=Bill orders
+CreateInvoiceForThisSupplier=Bill buyurtmalari
 NoOrdersToInvoice=Hech qanday buyurtma berilmaydi
 CloseProcessedOrdersAutomatically=Barcha tanlangan buyurtmalarni "Qayta ishlangan" deb tasniflang.
 OrderCreation=Buyurtmani yaratish
@@ -159,35 +159,35 @@ OrderCreated=Sizning buyurtmalaringiz yaratilgan
 OrderFail=Sizning buyurtmalarni yaratishda xato yuz berdi
 CreateOrders=Buyurtma yarating
 ToBillSeveralOrderSelectCustomer=Bir nechta buyurtmalar uchun hisob-fakturani yaratish uchun avval mijozga bosing, so'ngra "%s" -ni tanlang.
-OptionToSetOrderBilledNotEnabled=Option from module Workflow, to set order to 'Billed' automatically when invoice is validated, is not enabled, so you will have to set the status of orders to 'Billed' manually after the invoice has been generated.
-IfValidateInvoiceIsNoOrderStayUnbilled=If invoice validation is 'No', the order will remain to status 'Unbilled' until the invoice is validated.
+OptionToSetOrderBilledNotEnabled=Hisob-faktura tasdiqlanganda buyurtmani avtomatik ravishda "Billing" qilib belgilash uchun Workflow moduli opsiyasi yoqilmagan, shuning uchun siz hisob-faktura tuzilgandan so'ng buyurtmalar holatini qo'lda "Billing" ga o'rnatishingiz kerak bo'ladi.
+IfValidateInvoiceIsNoOrderStayUnbilled=Agar hisob-fakturani tasdiqlash "Yo'q" bo'lsa, hisob-kitob tasdiqlangunga qadar buyurtma "Hisob-kitob qilinmagan" holatida qoladi.
 CloseReceivedSupplierOrdersAutomatically=Agar barcha mahsulotlar olingan bo'lsa, buyurtmani avtomatik ravishda "%s" holatiga qadar yoping.
 SetShippingMode=Yuk tashish rejimini o'rnating
-WithReceptionFinished=With reception finished
+WithReceptionFinished=Qabul tugadi
 #### supplier orders status
-StatusSupplierOrderCanceledShort=Canceled
-StatusSupplierOrderDraftShort=Draft
-StatusSupplierOrderValidatedShort=Validated
-StatusSupplierOrderSentShort=In process
-StatusSupplierOrderSent=Shipment in process
-StatusSupplierOrderOnProcessShort=Ordered
-StatusSupplierOrderProcessedShort=Processed
-StatusSupplierOrderDelivered=Delivered
-StatusSupplierOrderDeliveredShort=Delivered
-StatusSupplierOrderToBillShort=Delivered
-StatusSupplierOrderApprovedShort=Approved
-StatusSupplierOrderRefusedShort=Refused
-StatusSupplierOrderToProcessShort=To process
-StatusSupplierOrderReceivedPartiallyShort=Partially received
-StatusSupplierOrderReceivedAllShort=Products received
-StatusSupplierOrderCanceled=Canceled
-StatusSupplierOrderDraft=Draft (needs to be validated)
-StatusSupplierOrderValidated=Validated
-StatusSupplierOrderOnProcess=Ordered - Standby reception
-StatusSupplierOrderOnProcessWithValidation=Ordered - Standby reception or validation
-StatusSupplierOrderProcessed=Processed
-StatusSupplierOrderToBill=Delivered
-StatusSupplierOrderApproved=Approved
-StatusSupplierOrderRefused=Refused
-StatusSupplierOrderReceivedPartially=Partially received
-StatusSupplierOrderReceivedAll=All products received
+StatusSupplierOrderCanceledShort=Bekor qilindi
+StatusSupplierOrderDraftShort=Qoralama
+StatusSupplierOrderValidatedShort=Tasdiqlangan
+StatusSupplierOrderSentShort=Jarayonida
+StatusSupplierOrderSent=Yuk tashish jarayoni
+StatusSupplierOrderOnProcessShort=Buyurtma berildi
+StatusSupplierOrderProcessedShort=Qayta ishlangan
+StatusSupplierOrderDelivered=Yetkazib berildi
+StatusSupplierOrderDeliveredShort=Yetkazib berildi
+StatusSupplierOrderToBillShort=Yetkazib berildi
+StatusSupplierOrderApprovedShort=Tasdiqlangan
+StatusSupplierOrderRefusedShort=Rad etildi
+StatusSupplierOrderToProcessShort=Qayta ishlash uchun
+StatusSupplierOrderReceivedPartiallyShort=Qisman qabul qilindi
+StatusSupplierOrderReceivedAllShort=Qabul qilingan mahsulotlar
+StatusSupplierOrderCanceled=Bekor qilindi
+StatusSupplierOrderDraft=Qoralama (tasdiqlanishi kerak)
+StatusSupplierOrderValidated=Tasdiqlangan
+StatusSupplierOrderOnProcess=Buyurtma qilingan - kutish holatida qabul qilish
+StatusSupplierOrderOnProcessWithValidation=Buyurtma qilingan - kutish holatida qabul qilish yoki tasdiqlash
+StatusSupplierOrderProcessed=Qayta ishlangan
+StatusSupplierOrderToBill=Yetkazib berildi
+StatusSupplierOrderApproved=Tasdiqlangan
+StatusSupplierOrderRefused=Rad etildi
+StatusSupplierOrderReceivedPartially=Qisman qabul qilindi
+StatusSupplierOrderReceivedAll=Qabul qilingan barcha mahsulotlar
diff --git a/htdocs/langs/uz_UZ/other.lang b/htdocs/langs/uz_UZ/other.lang
index 10246a90522..4674d6d348b 100644
--- a/htdocs/langs/uz_UZ/other.lang
+++ b/htdocs/langs/uz_UZ/other.lang
@@ -7,34 +7,34 @@ ToolsDesc=Boshqa menyu yozuvlariga kiritilmagan barcha vositalar bu erda to'plan
 Birthday=Tug'ilgan kun
 BirthdayAlertOn=tug'ilgan kun haqida ogohlantirish faol
 BirthdayAlertOff=tug'ilgan kun haqida ogohlantirish faol emas
-TransKey=Translation of the key TransKey
-MonthOfInvoice=Month (number 1-12) 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
-TextNextMonthOfInvoice=Following month (text) of invoice date
-PreviousMonth=Previous month
-CurrentMonth=Current month
-ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
-DocFileGeneratedInto=Doc file generated into <b>%s</b>.
-JumpToLogin=Disconnected. Go to login page...
-MessageForm=Message on online payment form
-MessageOK=Message on the return page for a validated payment
-MessageKO=Message on the return page for a canceled payment
-ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
-DeleteAlsoContentRecursively=Check to delete all content recursively
-PoweredBy=Powered by
-YearOfInvoice=Year of invoice date
-PreviousYearOfInvoice=Previous year of invoice date
-NextYearOfInvoice=Following year of invoice date
-DateNextInvoiceBeforeGen=Date of next invoice (before generation)
-DateNextInvoiceAfterGen=Date of next invoice (after generation)
-GraphInBarsAreLimitedToNMeasures=Grapics are limited to %s measures in 'Bars' mode. The mode 'Lines' was automatically selected instead.
-OnlyOneFieldForXAxisIsPossible=Only 1 field is currently possible as X-Axis. Only the first selected field has been selected.
-AtLeastOneMeasureIsRequired=At least 1 field for measure is required
-AtLeastOneXAxisIsRequired=At least 1 field for X-Axis is required
-LatestBlogPosts=Latest Blog Posts
+TransKey=TransKey kalitining tarjimasi
+MonthOfInvoice=Hisob-faktura sanasi oyi (1-12-raqam)
+TextMonthOfInvoice=Hisob-faktura sanasi oyi (matni)
+PreviousMonthOfInvoice=Hisob-fakturaning oldingi oyi (raqam 1-12)
+TextPreviousMonthOfInvoice=Hisob-fakturaning oldingi oyi (matni)
+NextMonthOfInvoice=Keyingi oy (1-12-raqam) hisob-faktura sanasi
+TextNextMonthOfInvoice=Hisob-fakturaning keyingi oyi (matni)
+PreviousMonth=Oldingi oy
+CurrentMonth=Joriy oy
+ZipFileGeneratedInto=<b> %s </b> formatida yaratilgan zip fayl.
+DocFileGeneratedInto=<b> %s </b> formatida yaratilgan hujjat fayli.
+JumpToLogin=Uzildi. Kirish sahifasiga o'tish ...
+MessageForm=Onlayn to'lov shaklidagi xabar
+MessageOK=Tasdiqlangan to'lov uchun qaytarish sahifasidagi xabar
+MessageKO=Bekor qilingan to'lov uchun qaytarish sahifasidagi xabar
+ContentOfDirectoryIsNotEmpty=Ushbu katalog tarkibi bo'sh emas.
+DeleteAlsoContentRecursively=Barcha tarkibni rekursiv ravishda o'chirishni tekshiring
+PoweredBy=Tomonidan qo'llab-quvvatlanadi
+YearOfInvoice=Hisob-faktura sanasi yili
+PreviousYearOfInvoice=Hisob-fakturaning oldingi yili
+NextYearOfInvoice=Keyingi hisob-faktura sanasi
+DateNextInvoiceBeforeGen=Keyingi hisob-fakturaning sanasi (ishlab chiqarishdan oldin)
+DateNextInvoiceAfterGen=Keyingi hisob-fakturaning sanasi (avloddan keyin)
+GraphInBarsAreLimitedToNMeasures=Grapics %s o'lchovlari bilan "Bars" rejimida cheklangan. Buning o'rniga "Lines" rejimi avtomatik ravishda tanlandi.
+OnlyOneFieldForXAxisIsPossible=X o'qi sifatida hozirda faqat bitta maydon mavjud. Faqat birinchi tanlangan maydon tanlangan.
+AtLeastOneMeasureIsRequired=O'lchov uchun kamida 1 ta maydon kerak
+AtLeastOneXAxisIsRequired=X o'qi uchun kamida 1 maydon kerak
+LatestBlogPosts=Blogdagi so'nggi xabarlar
 Notify_ORDER_VALIDATE=Savdo buyurtmasi tasdiqlangan
 Notify_ORDER_SENTBYMAIL=Savdo buyurtmasi pochta orqali yuborilgan
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Xarid qilish buyurtmasi elektron pochta orqali yuborilgan
@@ -60,7 +60,7 @@ Notify_BILL_SUPPLIER_PAYED=Sotuvchi hisob-fakturasi to'langan
 Notify_BILL_SUPPLIER_SENTBYMAIL=Sotuvchi hisob-fakturasi pochta orqali yuborilgan
 Notify_BILL_SUPPLIER_CANCELED=Sotuvchi fakturasi bekor qilindi
 Notify_CONTRACT_VALIDATE=Shartnoma tasdiqlangan
-Notify_FICHINTER_VALIDATE=Intervention validated
+Notify_FICHINTER_VALIDATE=Interventsiya tasdiqlandi
 Notify_FICHINTER_ADD_CONTACT=Interventsiyaga kontakt qo'shildi
 Notify_FICHINTER_SENTBYMAIL=Pochta orqali yuborilgan aralashuv
 Notify_SHIPPING_VALIDATE=Yuk tashish tasdiqlangan
@@ -74,11 +74,11 @@ Notify_PROJECT_CREATE=Loyihani yaratish
 Notify_TASK_CREATE=Vazifa yaratildi
 Notify_TASK_MODIFY=Vazifa o'zgartirildi
 Notify_TASK_DELETE=Vazifa o'chirildi
-Notify_EXPENSE_REPORT_VALIDATE=Expense report validated (approval required)
-Notify_EXPENSE_REPORT_APPROVE=Expense report approved
-Notify_HOLIDAY_VALIDATE=Leave request validated (approval required)
-Notify_HOLIDAY_APPROVE=Leave request approved
-Notify_ACTION_CREATE=Added action to Agenda
+Notify_EXPENSE_REPORT_VALIDATE=Xarajatlar to'g'risidagi hisobot tasdiqlandi (tasdiqlash talab qilinadi)
+Notify_EXPENSE_REPORT_APPROVE=Xarajatlar to'g'risidagi hisobot tasdiqlandi
+Notify_HOLIDAY_VALIDATE=Dam olish so'rovi tasdiqlangan (tasdiqlash kerak)
+Notify_HOLIDAY_APPROVE=Dam olish to'g'risidagi so'rov tasdiqlandi
+Notify_ACTION_CREATE=Kun tartibiga harakat qo'shildi
 SeeModuleSetup=%s modulini o'rnatishga qarang
 NbOfAttachedFiles=Biriktirilgan fayllar / hujjatlar soni
 TotalSizeOfAttachedFiles=Biriktirilgan fayllar / hujjatlarning umumiy hajmi
@@ -88,7 +88,7 @@ LinkedObject=Bog'langan ob'ekt
 NbOfActiveNotifications=Bildirishnomalar soni (oluvchilarning elektron pochtalari yo'q)
 PredefinedMailTest=__(Salom)__\nBu __EMAIL__ manziliga yuborilgan sinov xati.\nChiziqlar vagonni qaytarish bilan ajralib turadi.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__ (Salom) __ <br> Bu __EMAIL__ manziliga yuborilgan <b> test </b> xati (test so'zi qalin bo'lishi kerak). <br> Chiziqlar aravachaning qaytishi bilan ajralib turadi. <br> <br> __USER_SIGNATURE__
-PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentContract=__(Salom)__\n\n\n__ (samimiyat bilan) __\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Salom)__\n\nIltimos, __REF__ hisob-fakturasini ilova qiling\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__ (samimiyat bilan) __\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Salom)__\n\nSizga shuni eslatib qo'ymoqchimizki, __REF__ schyoti to'lanmaganga o'xshaydi. Hisob-fakturaning nusxasi eslatma sifatida ilova qilinadi.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__ (samimiyat bilan) __\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Salom)__\n\nIltimos, __REF__ tijorat taklifini ilova qiling\n\n\n__ (samimiyat bilan) __\n\n__USER_SIGNATURE__
@@ -98,9 +98,9 @@ PredefinedMailContentSendSupplierOrder=__(Salom)__\n\nIltimos, bizning __REF__ b
 PredefinedMailContentSendSupplierInvoice=__(Salom)__\n\nIltimos, __REF__ hisob-fakturasini ilova qiling\n\n\n__ (samimiyat bilan) __\n\n__USER_SIGNATURE__
 PredefinedMailContentSendShipping=__(Salom)__\n\nIltimos, __REF__ jo'natilishini biriktirilgan holda toping\n\n\n__ (samimiyat bilan) __\n\n__USER_SIGNATURE__
 PredefinedMailContentSendFichInter=__(Salom)__\n\nIltimos, __REF__ aralashuvini biriktirilgan holda toping\n\n\n__ (samimiyat bilan) __\n\n__USER_SIGNATURE__
-PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
-PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendActionComm=Event reminder "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>This is an automatic message, please do not reply.
+PredefinedMailContentLink=Agar siz hali to'lamagan bo'lsangiz, to'lovni amalga oshirish uchun quyidagi havolani bosishingiz mumkin.\n\n%s\n\n
+PredefinedMailContentGeneric=__(Salom)__\n\n\n__ (samimiyat bilan) __\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=__EVENT_DATE__ soat __EVENT_TIME__ da "__EVENT_LABEL__" voqea eslatmasi <br> <br> Bu avtomatik xabar, iltimos javob bermang.
 DemoDesc=Dolibarr - bu bir nechta biznes modullarini qo'llab-quvvatlovchi ixcham ERP / CRM. Barcha modullarni namoyish etadigan demo hech qanday ma'noga ega emas, chunki bu stsenariy hech qachon ro'y bermaydi (bir necha yuzta mavjud). Shunday qilib, bir nechta demo profillari mavjud.
 ChooseYourDemoProfil=Sizning ehtiyojlaringizga mos keladigan demo profilini tanlang ...
 ChooseYourDemoProfilMore=... yoki o'zingizning profilingizni yarating <br> (modulni qo'lda tanlash)
@@ -109,12 +109,12 @@ DemoFundation2=Jamg'arma a'zolari va bankdagi hisob raqamlarini boshqarish
 DemoCompanyServiceOnly=Faqat kompaniya yoki erkin sotish xizmati
 DemoCompanyShopWithCashDesk=Kassa bilan do'konni boshqaring
 DemoCompanyProductAndStocks=Savdo nuqtasi bilan mahsulot sotadigan do'kon
-DemoCompanyManufacturing=Company manufacturing products
+DemoCompanyManufacturing=Kompaniya mahsulot ishlab chiqaradi
 DemoCompanyAll=Faoliyati ko'p bo'lgan kompaniya (barcha asosiy modullar)
 CreatedBy=%s tomonidan yaratilgan
 ModifiedBy=%s tomonidan o'zgartirilgan
 ValidatedBy=%s tomonidan tasdiqlangan
-SignedBy=Signed by %s
+SignedBy=%s tomonidan imzolangan
 ClosedBy=%s tomonidan yopilgan
 CreatedById=Yaratgan foydalanuvchi identifikatori
 ModifiedById=Oxirgi o'zgarishlarni amalga oshirgan foydalanuvchi identifikatori
@@ -129,7 +129,7 @@ ClosedByLogin=Yopilgan foydalanuvchi login
 FileWasRemoved=%s fayli olib tashlandi
 DirWasRemoved=%s katalogi olib tashlandi
 FeatureNotYetAvailable=Xususiyat hozirgi versiyada hali mavjud emas
-FeatureNotAvailableOnDevicesWithoutMouse=Feature not available on devices without mouse
+FeatureNotAvailableOnDevicesWithoutMouse=Sichqoncha bo'lmagan qurilmalarda bu xususiyat mavjud emas
 FeaturesSupported=Qo'llab-quvvatlanadigan xususiyatlar
 Width=Kengligi
 Height=Balandligi
@@ -146,7 +146,7 @@ WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
 WeightUnitpound=funt
-WeightUnitounce=ounce
+WeightUnitounce=untsiya
 Length=Uzunlik
 LengthUnitm=m
 LengthUnitdm=dm
@@ -191,22 +191,22 @@ NumberOfCustomerInvoices=Mijozlarning hisob-fakturalari soni
 NumberOfSupplierProposals=Yetkazib beruvchilarning takliflari soni
 NumberOfSupplierOrders=Sotib olish uchun buyurtmalar soni
 NumberOfSupplierInvoices=Sotuvchi hisob-fakturalari soni
-NumberOfContracts=Number of contracts
-NumberOfMos=Number of manufacturing orders
+NumberOfContracts=Shartnomalar soni
+NumberOfMos=Ishlab chiqarish buyurtmalari soni
 NumberOfUnitsProposals=Takliflar bo'yicha birliklar soni
 NumberOfUnitsCustomerOrders=Savdo buyurtmalaridagi birliklar soni
 NumberOfUnitsCustomerInvoices=Xaridorlarning hisob-fakturalaridagi birliklar soni
 NumberOfUnitsSupplierProposals=Sotuvchilarning takliflari bo'yicha birliklar soni
 NumberOfUnitsSupplierOrders=Xarid qilish buyurtmalaridagi birliklar soni
 NumberOfUnitsSupplierInvoices=Sotuvchi fakturalaridagi birliklar soni
-NumberOfUnitsContracts=Number of units on contracts
-NumberOfUnitsMos=Number of units to produce in manufacturing orders
+NumberOfUnitsContracts=Shartnomalar bo'yicha birliklar soni
+NumberOfUnitsMos=Ishlab chiqarish buyurtmalarida ishlab chiqariladigan birliklar soni
 EMailTextInterventionAddedContact=Sizga %s yangi aralashuvi tayinlandi.
 EMailTextInterventionValidated=%s aralashuvi tasdiqlandi.
 EMailTextInvoiceValidated=%s hisob-fakturasi tasdiqlangan.
-EMailTextInvoicePayed=Invoice %s has been paid.
+EMailTextInvoicePayed=%s hisob-fakturasi to'landi.
 EMailTextProposalValidated=%s taklifi tasdiqlandi.
-EMailTextProposalClosedSigned=Proposal %s has been closed signed.
+EMailTextProposalClosedSigned=%s taklifi imzolandi.
 EMailTextOrderValidated=%s buyurtmasi tasdiqlangan.
 EMailTextOrderApproved=%s buyurtmasi tasdiqlandi.
 EMailTextOrderValidatedBy=%s buyurtmasi %s tomonidan qayd etilgan.
@@ -214,11 +214,11 @@ EMailTextOrderApprovedBy=%s buyurtmasi %s tomonidan tasdiqlangan.
 EMailTextOrderRefused=%s buyurtmasi rad etildi.
 EMailTextOrderRefusedBy=%s buyurtmasi %s tomonidan rad etildi.
 EMailTextExpeditionValidated=%s jo'natmasi tasdiqlangan.
-EMailTextExpenseReportValidated=Expense report %s has been validated.
-EMailTextExpenseReportApproved=Expense report %s has been approved.
-EMailTextHolidayValidated=Leave request %s has been validated.
-EMailTextHolidayApproved=Leave request %s has been approved.
-EMailTextActionAdded=The action %s has been added to the Agenda.
+EMailTextExpenseReportValidated=%s xarajatlar hisoboti tasdiqlandi.
+EMailTextExpenseReportApproved=%s xarajatlar hisoboti tasdiqlandi.
+EMailTextHolidayValidated=%s qoldirish so'rovi tasdiqlangan.
+EMailTextHolidayApproved=%s ta'tilga chiqish so'rovi tasdiqlandi.
+EMailTextActionAdded=%s harakati kun tartibiga qo'shildi.
 ImportedWithSet=Import ma'lumotlari to'plami
 DolibarrNotification=Avtomatik bildirishnoma
 ResizeDesc=Yangi kenglikni kiriting <b> YOKI </b> yangi balandlik. O'lchamini o'zgartirish paytida nisbat saqlanib qoladi ...
@@ -239,32 +239,32 @@ StartUpload=Yuklashni boshlang
 CancelUpload=Yuklashni bekor qilish
 FileIsTooBig=Fayllar juda katta
 PleaseBePatient=Iltimos, sabr qiling ...
-NewPassword=New password
-ResetPassword=Reset password
+NewPassword=Yangi Parol
+ResetPassword=Parolni tiklash
 RequestToResetPasswordReceived=Parolingizni o'zgartirish to'g'risida so'rov kelib tushdi.
 NewKeyIs=Bu sizning kirish uchun yangi kalitlaringiz
 NewKeyWillBe=Dasturiy ta'minotga kirish uchun yangi kalitingiz bo'ladi
 ClickHereToGoTo=%s ga o'tish uchun shu erni bosing
 YouMustClickToChange=Ushbu parol o'zgarishini tasdiqlash uchun avval siz quyidagi havolani bosishingiz kerak
-ConfirmPasswordChange=Confirm password change
+ConfirmPasswordChange=Parolni o'zgartirishni tasdiqlang
 ForgetIfNothing=Agar siz ushbu o'zgarishni talab qilmagan bo'lsangiz, ushbu elektron pochtani unutishingiz kifoya. Ma'lumotlaringiz xavfsiz saqlanadi.
 IfAmountHigherThan=Agar miqdori <strong> %s </strong> dan yuqori bo'lsa
 SourcesRepository=Manbalar ombori
 Chart=Diagramma
-PassEncoding=Password encoding
-PermissionsAdd=Permissions added
-PermissionsDelete=Permissions removed
-YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
-YourPasswordHasBeenReset=Your password has been reset successfully
-ApplicantIpAddress=IP address of applicant
-SMSSentTo=SMS sent to %s
-MissingIds=Missing ids
-ThirdPartyCreatedByEmailCollector=Third party created by email collector from email MSGID %s
-ContactCreatedByEmailCollector=Contact/address created by email collector from email MSGID %s
-ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
-TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
-OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
-SuffixSessionName=Suffix for session name
+PassEncoding=Parolni kodlash
+PermissionsAdd=Ruxsatnomalar qo'shildi
+PermissionsDelete=Ruxsatlar olib tashlandi
+YourPasswordMustHaveAtLeastXChars=Parolingizda kamida <strong> %s </strong> belgilar bo'lishi kerak
+YourPasswordHasBeenReset=Parolingiz qayta tiklandi
+ApplicantIpAddress=Ariza beruvchining IP-manzili
+SMSSentTo=%s raqamiga SMS yuborildi
+MissingIds=Yo'qolgan identifikatorlar
+ThirdPartyCreatedByEmailCollector=MSGID %s elektron pochtasidan elektron pochta yig'uvchisi tomonidan yaratilgan uchinchi tomon
+ContactCreatedByEmailCollector=MSGID %s elektron pochtasidan elektron pochta yig'uvchisi tomonidan yaratilgan aloqa / manzil
+ProjectCreatedByEmailCollector=MSGID %s elektron pochtasidan elektron pochta yig'uvchisi tomonidan yaratilgan loyiha
+TicketCreatedByEmailCollector=MSGID %s elektron pochtasidan elektron pochta yig'uvchisi tomonidan yaratilgan chipta
+OpeningHoursFormatDesc=Ochilish va yopilish soatlarini ajratish uchun a - dan foydalaning. <br> Turli xil intervallarni kiritish uchun bo'sh joydan foydalaning. <br> Misol: 8-12 14-18
+SuffixSessionName=Sessiya nomi uchun qo'shimchalar
 
 ##### Export #####
 ExportsArea=Eksport maydoni
@@ -278,16 +278,16 @@ WebsiteSetup=Modul veb-saytini sozlash
 WEBSITE_PAGEURL=Sahifaning URL manzili
 WEBSITE_TITLE=Sarlavha
 WEBSITE_DESCRIPTION=Tavsif
-WEBSITE_IMAGE=Image
-WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a thumbnail in a list of blog posts). Use __WEBSITE_KEY__ in the path if path depends on website name (for example: image/__WEBSITE_KEY__/stories/myimage.png).
+WEBSITE_IMAGE=Rasm
+WEBSITE_IMAGEDesc=Tasvir vositalarining nisbiy yo'li. Siz buni bo'sh holatda saqlashingiz mumkin, chunki bu kamdan-kam hollarda qo'llaniladi (uni blogdagi yozuvlar ro'yxatida eskizni ko'rsatish uchun dinamik tarkib yordamida ishlatish mumkin). Yo'l veb-sayt nomiga bog'liq bo'lsa, yo'lda __WEBSITE_KEY__ dan foydalaning (masalan: image / __ WEBSITE_KEY __ / stories / myimage.png).
 WEBSITE_KEYWORDS=Kalit so'zlar
-LinesToImport=Lines to import
+LinesToImport=Import qilish uchun chiziqlar
 
-MemoryUsage=Memory usage
-RequestDuration=Duration of request
-ProductsPerPopularity=Products/Services by popularity
-PopuProp=Products/Services by popularity in Proposals
-PopuCom=Products/Services by popularity in Orders
-ProductStatistics=Products/Services Statistics
-NbOfQtyInOrders=Qty in orders
-SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
+MemoryUsage=Xotiradan foydalanish
+RequestDuration=So'rov muddati
+ProductsPerPopularity=Ommabopligi bo'yicha mahsulotlar / xizmatlar
+PopuProp=Takliflarda mashhurligi bo'yicha mahsulotlar / xizmatlar
+PopuCom=Buyurtmalardagi mashhurligi bo'yicha mahsulotlar / xizmatlar
+ProductStatistics=Mahsulotlar / xizmatlar statistikasi
+NbOfQtyInOrders=Buyurtmalar soni
+SelectTheTypeOfObjectToAnalyze=Uning statistikasini ko'rish uchun ob'ektni tanlang ...
diff --git a/htdocs/langs/uz_UZ/partnership.lang b/htdocs/langs/uz_UZ/partnership.lang
index 2fb10e8159e..30202792dbc 100644
--- a/htdocs/langs/uz_UZ/partnership.lang
+++ b/htdocs/langs/uz_UZ/partnership.lang
@@ -16,72 +16,72 @@
 #
 # Generic
 #
-ModulePartnershipName=Partnership management
-PartnershipDescription=Module Partnership management
-PartnershipDescriptionLong= Module Partnership management
+ModulePartnershipName=Hamkorlikni boshqarish
+PartnershipDescription=Modul sherikligini boshqarish
+PartnershipDescriptionLong= Modul sherikligini boshqarish
 
-AddPartnership=Add partnership
-CancelPartnershipForExpiredMembers=Partnership: Cancel partnership of members with expired subscriptions
-PartnershipCheckBacklink=Partnership: Check referring backlink
+AddPartnership=Hamkorlik qo'shing
+CancelPartnershipForExpiredMembers=Hamkorlik: muddati o'tgan obunalari bo'lgan a'zolarning sherikligini bekor qiling
+PartnershipCheckBacklink=Hamkorlik: teskari bog'lanishni tekshiring
 
 #
 # Menu
 #
-NewPartnership=New Partnership
-ListOfPartnerships=List of partnership
+NewPartnership=Yangi hamkorlik
+ListOfPartnerships=Hamkorlik ro'yxati
 
 #
 # Admin page
 #
-PartnershipSetup=Partnership setup
-PartnershipAbout=About Partnership
-PartnershipAboutPage=Partnership about page
-partnershipforthirdpartyormember=Partner status must be set on a 'thirdparty' or a 'member'
-PARTNERSHIP_IS_MANAGED_FOR=Partnership managed for
-PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks to check
-PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb of days before cancelling status of a partnership when a subscription has expired
-ReferingWebsiteCheck=Check of website referring
-ReferingWebsiteCheckDesc=You can enable a feature to check that your partners has added a backlink to your website domains on their own website.
+PartnershipSetup=Hamkorlikni o'rnatish
+PartnershipAbout=Hamkorlik haqida
+PartnershipAboutPage=Sahifa haqida hamkorlik
+partnershipforthirdpartyormember=Hamkor maqomi "uchinchi tomon" yoki "a'zo" da o'rnatilishi kerak
+PARTNERSHIP_IS_MANAGED_FOR=Hamkorlik boshqarildi
+PARTNERSHIP_BACKLINKS_TO_CHECK=Tekshirish uchun qayta bog'lanishlar
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Obuna muddati tugaganidan keyin hamkorlik maqomini bekor qilishdan bir necha kun oldin
+ReferingWebsiteCheck=Veb-saytga yo'naltirilganligini tekshiring
+ReferingWebsiteCheckDesc=Siz o'zingizning veb-saytingizda sheriklaringizning veb-sayt domenlariga orqa bog'lanishni qo'shganligini tekshirish uchun xususiyatni yoqishingiz mumkin.
 
 #
 # Object
 #
-DeletePartnership=Delete a partnership
-PartnershipDedicatedToThisThirdParty=Partnership dedicated to this third party
-PartnershipDedicatedToThisMember=Partnership dedicated to this member
-DatePartnershipStart=Start date
-DatePartnershipEnd=End date
-ReasonDecline=Decline reason
-ReasonDeclineOrCancel=Decline reason
-PartnershipAlreadyExist=Partnership already exist
-ManagePartnership=Manage partnership
-BacklinkNotFoundOnPartnerWebsite=Backlink not found on partner website
-ConfirmClosePartnershipAsk=Are you sure you want to cancel this partnership?
-PartnershipType=Partnership type
+DeletePartnership=Hamkorlikni o'chirib tashlang
+PartnershipDedicatedToThisThirdParty=Ushbu uchinchi tomonga bag'ishlangan hamkorlik
+PartnershipDedicatedToThisMember=Ushbu a'zoga bag'ishlangan hamkorlik
+DatePartnershipStart=Boshlanish vaqti
+DatePartnershipEnd=Tugash sanasi
+ReasonDecline=Rad etish sababi
+ReasonDeclineOrCancel=Rad etish sababi
+PartnershipAlreadyExist=Hamkorlik allaqachon mavjud
+ManagePartnership=Hamkorlikni boshqarish
+BacklinkNotFoundOnPartnerWebsite=Backlink sherik veb-saytida topilmadi
+ConfirmClosePartnershipAsk=Haqiqatan ham ushbu hamkorlikni bekor qilmoqchimisiz?
+PartnershipType=Hamkorlik turi
 
 #
 # Template Mail
 #
-SendingEmailOnPartnershipWillSoonBeCanceled=Partnership will soon be canceled
-SendingEmailOnPartnershipRefused=Partnership refused
-SendingEmailOnPartnershipAccepted=Partnership accepted
-SendingEmailOnPartnershipCanceled=Partnership canceled
+SendingEmailOnPartnershipWillSoonBeCanceled=Yaqinda hamkorlik bekor qilinadi
+SendingEmailOnPartnershipRefused=Hamkorlik rad etildi
+SendingEmailOnPartnershipAccepted=Hamkorlik qabul qilindi
+SendingEmailOnPartnershipCanceled=Hamkorlik bekor qilindi
 
-YourPartnershipWillSoonBeCanceledTopic=Partnership will soon be canceled
-YourPartnershipRefusedTopic=Partnership refused
-YourPartnershipAcceptedTopic=Partnership accepted
-YourPartnershipCanceledTopic=Partnership canceled
+YourPartnershipWillSoonBeCanceledTopic=Yaqinda hamkorlik bekor qilinadi
+YourPartnershipRefusedTopic=Hamkorlik rad etildi
+YourPartnershipAcceptedTopic=Hamkorlik qabul qilindi
+YourPartnershipCanceledTopic=Hamkorlik bekor qilindi
 
-YourPartnershipWillSoonBeCanceledContent=We inform you that your partnership will soon be canceled (Backlink not found)
-YourPartnershipRefusedContent=We inform you that your partnership request has been refused.
-YourPartnershipAcceptedContent=We inform you that your partnership request has been accepted.
-YourPartnershipCanceledContent=We inform you that your partnership has been canceled.
+YourPartnershipWillSoonBeCanceledContent=Sizning hamkorligingiz yaqinda bekor qilinishini xabar qilamiz (Backlink topilmadi)
+YourPartnershipRefusedContent=Sizning sheriklik so'rovingiz rad etilganligi haqida xabar beramiz.
+YourPartnershipAcceptedContent=Sizga sheriklik so'rovingiz qabul qilinganligi to'g'risida xabar beramiz.
+YourPartnershipCanceledContent=Sizning hamkorligingiz bekor qilinganligi haqida xabar beramiz.
 
 #
 # Status
 #
-PartnershipDraft=Draft
-PartnershipAccepted=Accepted
-PartnershipRefused=Refused
-PartnershipCanceled=Canceled
-PartnershipManagedFor=Partners are
+PartnershipDraft=Qoralama
+PartnershipAccepted=Qabul qilindi
+PartnershipRefused=Rad etildi
+PartnershipCanceled=Bekor qilindi
+PartnershipManagedFor=Hamkorlar
diff --git a/htdocs/langs/uz_UZ/paybox.lang b/htdocs/langs/uz_UZ/paybox.lang
index 7dcdbde4a46..9064f9948a3 100644
--- a/htdocs/langs/uz_UZ/paybox.lang
+++ b/htdocs/langs/uz_UZ/paybox.lang
@@ -27,4 +27,4 @@ PAYBOX_PAYONLINE_SENDEMAIL=To'lov amalga oshirilgandan so'ng elektron pochta xab
 PAYBOX_PBX_SITE=PBX SITE qiymati
 PAYBOX_PBX_RANG=PBX oralig'i uchun qiymat
 PAYBOX_PBX_IDENTIFIANT=PBX identifikatorining qiymati
-PAYBOX_HMAC_KEY=HMAC key
+PAYBOX_HMAC_KEY=HMAC kaliti
diff --git a/htdocs/langs/uz_UZ/paypal.lang b/htdocs/langs/uz_UZ/paypal.lang
index 70f36596519..d3d4e8a508e 100644
--- a/htdocs/langs/uz_UZ/paypal.lang
+++ b/htdocs/langs/uz_UZ/paypal.lang
@@ -11,26 +11,26 @@ PAYPAL_SSLVERSION=Curl SSL versiyasi
 PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Faqat "ajralmas" to'lovni taklif eting (Kredit karta + PayPal) yoki faqat "PayPal"
 PaypalModeIntegral=Ajralmas
 PaypalModeOnlyPaypal=Faqat PayPal
-ONLINE_PAYMENT_CSS_URL=Optional URL of CSS stylesheet on online payment page
+ONLINE_PAYMENT_CSS_URL=Onlayn to'lovlar sahifasida CSS uslublar jadvalining ixtiyoriy URL manzili
 ThisIsTransactionId=Bu tranzaksiya identifikatori: <b> %s </b>
 PAYPAL_ADD_PAYMENT_URL=Hujjatni elektron pochta orqali yuborganingizda PayPal to'lov urlini qo'shing
-NewOnlinePaymentReceived=New online payment received
-NewOnlinePaymentFailed=New online payment tried but failed
-ONLINE_PAYMENT_SENDEMAIL=Email address for notifications after each payment attempt (for success and fail)
+NewOnlinePaymentReceived=Yangi onlayn to'lov qabul qilindi
+NewOnlinePaymentFailed=Yangi onlayn to'lov amalga oshirildi, ammo muvaffaqiyatsiz tugadi
+ONLINE_PAYMENT_SENDEMAIL=Har bir to'lov urinishidan so'ng bildirishnomalar uchun elektron pochta manzili (muvaffaqiyatli va muvaffaqiyatsiz bo'lganligi uchun)
 ReturnURLAfterPayment=To'lovdan so'ng URL manzilini qaytaring
-ValidationOfOnlinePaymentFailed=Validation of online payment failed
-PaymentSystemConfirmPaymentPageWasCalledButFailed=Payment confirmation page was called by payment system returned an error
+ValidationOfOnlinePaymentFailed=Onlayn to'lovni tasdiqlash amalga oshmadi
+PaymentSystemConfirmPaymentPageWasCalledButFailed=To'lov tizimi tomonidan to'lovni tasdiqlash sahifasi chaqirildi, xato yuz berdi
 SetExpressCheckoutAPICallFailed=SetExpressCheckout API chaqiruvi amalga oshmadi.
 DoExpressCheckoutPaymentAPICallFailed=DoExpressCheckoutPayment API chaqiruvi amalga oshmadi.
 DetailedErrorMessage=Batafsil xato xabari
 ShortErrorMessage=Qisqa xato xabari
 ErrorCode=Xato kodi
 ErrorSeverityCode=Xatolik darajasi kodi
-OnlinePaymentSystem=Online payment system
-PaypalLiveEnabled=PayPal "live" mode enabled (otherwise test/sandbox mode)
-PaypalImportPayment=Import PayPal payments
-PostActionAfterPayment=Post actions after payments
-ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
-ValidationOfPaymentFailed=Validation of payment has failed
-CardOwner=Card holder
-PayPalBalance=Paypal credit
+OnlinePaymentSystem=Onlayn to'lov tizimi
+PaypalLiveEnabled=PayPal "jonli" rejimi yoqilgan (aks holda sinov / sandbox rejimi)
+PaypalImportPayment=PayPal to'lovlarini import qilish
+PostActionAfterPayment=To'lovlardan so'ng harakatlarni joylashtiring
+ARollbackWasPerformedOnPostActions=Postning barcha harakatlarida orqaga qaytarish amalga oshirildi. Agar kerak bo'lsa, post harakatlarini qo'lda bajarishingiz kerak.
+ValidationOfPaymentFailed=To'lov tasdiqlanmadi
+CardOwner=Karta egasi
+PayPalBalance=Paypal krediti
diff --git a/htdocs/langs/uz_UZ/printing.lang b/htdocs/langs/uz_UZ/printing.lang
index 4809218456c..d614e645371 100644
--- a/htdocs/langs/uz_UZ/printing.lang
+++ b/htdocs/langs/uz_UZ/printing.lang
@@ -9,7 +9,7 @@ PrintingDriverDesc=Drayverni bosib chiqarish uchun konfiguratsiya o'zgaruvchilar
 ListDrivers=Haydovchilar ro'yxati
 PrintTestDesc=Printerlar ro'yxati.
 FileWasSentToPrinter=%s fayli printerga yuborildi
-ViaModule=via the module
+ViaModule=modul orqali
 NoActivePrintingModuleFound=Hujjatni chop etish uchun faol haydovchi yo'q. %s modulini sozlashni tekshiring.
 PleaseSelectaDriverfromList=Ro'yxatdan drayverni tanlang.
 PleaseConfigureDriverfromList=Iltimos, tanlangan drayverni ro'yxatdan sozlang.
@@ -49,6 +49,6 @@ DirectPrintingJobsDesc=Ushbu sahifada mavjud printerlar uchun topilgan chop etis
 GoogleAuthNotConfigured=Google OAuth o'rnatilmagan. OAuth modulini yoqing va Google ID / Secretni o'rnating.
 GoogleAuthConfigured=Google OAuth hisob ma'lumotlari OAuth modulini o'rnatishda topildi.
 PrintingDriverDescprintgcp=Google Cloud Print drayverini chop etish uchun konfiguratsiya o'zgaruvchilari.
-PrintingDriverDescprintipp=Configuration variables for printing driver Cups.
+PrintingDriverDescprintipp=Drayv kuboglarini bosib chiqarish uchun konfiguratsiya o'zgaruvchilari.
 PrintTestDescprintgcp=Google Cloud Print uchun printerlar ro'yxati.
-PrintTestDescprintipp=List of Printers for Cups.
+PrintTestDescprintipp=Kuboklar uchun printerlar ro'yxati.
diff --git a/htdocs/langs/uz_UZ/productbatch.lang b/htdocs/langs/uz_UZ/productbatch.lang
index 9e342c12790..d96d95c511c 100644
--- a/htdocs/langs/uz_UZ/productbatch.lang
+++ b/htdocs/langs/uz_UZ/productbatch.lang
@@ -1,10 +1,10 @@
 # ProductBATCH language file - Source file is en_US - ProductBATCH
 ManageLotSerial=Lot / seriya raqamidan foydalaning
 ProductStatusOnBatch=Ha (lot talab qilinadi)
-ProductStatusOnSerial=Yes (unique serial number required)
+ProductStatusOnSerial=Ha (noyob seriya raqami talab qilinadi)
 ProductStatusNotOnBatch=Yo'q (lot / seriya ishlatilmadi)
 ProductStatusOnBatchShort=Lot
-ProductStatusOnSerialShort=Serial
+ProductStatusOnSerialShort=Ketma-ket
 ProductStatusNotOnBatchShort=Yo'q
 Batch=Lot / ketma-ket
 atleast1batchfield=Ovqatlanish sanasi yoki Sotish sanasi yoki Lot / Seriya raqami
@@ -23,23 +23,21 @@ ProductDoesNotUseBatchSerial=Ushbu mahsulotda lot / seriya raqami ishlatilmaydi
 ProductLotSetup=Modul partiyasini o'rnatish / ketma-ketlik
 ShowCurrentStockOfLot=Er-xotin mahsulot / lot uchun joriy zaxiralarni ko'rsating
 ShowLogOfMovementIfLot=Er-xotin mahsulot / lot uchun harakatlar jurnalini ko'rsating
-StockDetailPerBatch=Stock detail per lot
-SerialNumberAlreadyInUse=Serial number %s is already used for product %s
-TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
-BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
-BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
-ManageLotMask=Custom mask
-CustomMasks=Adds an option to define mask in the product card
-LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
-SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
-QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
-LifeTime=Life span (in days)
-EndOfLife=End of life
-ManufacturingDate=Manufacturing date
-DestructionDate=Destruction date
-FirstUseDate=First use date
-QCFrequency=Quality control frequency (in days)
+StockDetailPerBatch=Har bir lot uchun birja tafsilotlari
+SerialNumberAlreadyInUse=%s mahsuloti uchun seriya raqami %s allaqachon ishlatilgan
+TooManyQtyForSerialNumber=Sizda seriya raqami %s uchun faqat bitta mahsulot mavjud bo'lishi mumkin %s
+ManageLotMask=Maxsus niqob
+CustomMasks=Option to define a different numbering mask for each product
+BatchLotNumberingModules=Numbering rule for automatic generation of lot number
+BatchSerialNumberingModules=Numbering rule for automatic generation of serial number (for products with property 1 unique lot/serial for each product)
+QtyToAddAfterBarcodeScan=Har bir shtrix / lot / ketma-ket skanerlash uchun qo'shish uchun miqdor
+LifeTime=Hayot davomiyligi (kunlar ichida)
+EndOfLife=Hayotning oxiri
+ManufacturingDate=Ishlab chiqarilgan sana
+DestructionDate=Yo'q qilish sanasi
+FirstUseDate=Birinchi foydalanish sanasi
+QCFrequency=Sifatni nazorat qilish chastotasi (kunlar ichida)
 
 #Traceability - qc status
-OutOfOrder=Out of order
-InWorkingOrder=In working order
+OutOfOrder=Ishdan chiqdi
+InWorkingOrder=Ish tartibida
diff --git a/htdocs/langs/uz_UZ/products.lang b/htdocs/langs/uz_UZ/products.lang
index c3866f55c51..eb578f78fee 100644
--- a/htdocs/langs/uz_UZ/products.lang
+++ b/htdocs/langs/uz_UZ/products.lang
@@ -22,25 +22,25 @@ ProductVatMassChangeDesc=Ushbu vosita <b> <u> ALL </u> </b> mahsulotlarida aniql
 MassBarcodeInit=Ommaviy shtrix kod
 MassBarcodeInitDesc=Ushbu sahifadan shtrix-kod aniqlanmagan ob'ektlarda shtrix-kodni boshlash uchun foydalanish mumkin. Modul shtrix-kodini o'rnatish tugamasdan oldin tekshiring.
 ProductAccountancyBuyCode=Buxgalteriya kodi (sotib olish)
-ProductAccountancyBuyIntraCode=Accounting code (purchase intra-community)
-ProductAccountancyBuyExportCode=Accounting code (purchase import)
+ProductAccountancyBuyIntraCode=Buxgalteriya kodi (jamiyat ichidagi sotib olish)
+ProductAccountancyBuyExportCode=Buxgalteriya kodi (sotib olish importi)
 ProductAccountancySellCode=Buxgalteriya kodi (sotish)
-ProductAccountancySellIntraCode=Accounting code (sale intra-Community)
-ProductAccountancySellExportCode=Accounting code (sale export)
+ProductAccountancySellIntraCode=Buxgalteriya kodi (hamjamiyat ichida sotish)
+ProductAccountancySellExportCode=Buxgalteriya kodi (sotish eksporti)
 ProductOrService=Mahsulot yoki xizmat
 ProductsAndServices=Mahsulotlar va xizmatlar
 ProductsOrServices=Mahsulotlar yoki xizmatlar
-ProductsPipeServices=Products | Services
-ProductsOnSale=Products for sale
-ProductsOnPurchase=Products for purchase
-ProductsOnSaleOnly=Products for sale only
-ProductsOnPurchaseOnly=Products for purchase only
+ProductsPipeServices=Mahsulotlar | Xizmatlar
+ProductsOnSale=Sotish uchun mahsulotlar
+ProductsOnPurchase=Sotib olish uchun mahsulotlar
+ProductsOnSaleOnly=Faqat sotiladigan mahsulotlar
+ProductsOnPurchaseOnly=Faqat sotib olish uchun mahsulotlar
 ProductsNotOnSell=Mahsulotlar sotilmaydi va sotib olinmaydi
 ProductsOnSellAndOnBuy=Sotish va sotib olish uchun mahsulotlar
-ServicesOnSale=Services for sale
-ServicesOnPurchase=Services for purchase
-ServicesOnSaleOnly=Services for sale only
-ServicesOnPurchaseOnly=Services for purchase only
+ServicesOnSale=Sotish bo'yicha xizmatlar
+ServicesOnPurchase=Sotib olish uchun xizmatlar
+ServicesOnSaleOnly=Faqat sotiladigan xizmatlar
+ServicesOnPurchaseOnly=Faqat sotib olish uchun xizmatlar
 ServicesNotOnSell=Xizmatlar sotilmaydi va sotib olinmaydi
 ServicesOnSellAndOnBuy=Sotish va sotib olish uchun xizmatlar
 LastModifiedProductsAndServices=O'zgartirilgan so'nggi %s mahsulot / xizmatlari
@@ -49,7 +49,7 @@ LastRecordedServices=Oxirgi %s yozilgan xizmatlari
 CardProduct0=Mahsulot
 CardProduct1=Xizmat
 Stock=Aksiya
-MenuStocks=Stocks
+MenuStocks=Qimmatli qog'ozlar
 Stocks=Mahsulotlarning zaxiralari va joylashishi (ombori)
 Movements=Harakatlar
 Sell=Sotish
@@ -72,14 +72,14 @@ AppliedPricesFrom=Ilova qilingan
 SellingPrice=Sotish narxi
 SellingPriceHT=Sotish narxi (soliqdan tashqari)
 SellingPriceTTC=Sotish narxi (soliq bilan)
-SellingMinPriceTTC=Minimum Selling price (inc. tax)
+SellingMinPriceTTC=Sotishning minimal narxi (soliq bilan)
 CostPriceDescription=Ushbu narx sohasi (soliqdan tashqari) ushbu mahsulot kompaniyangizga o'rtacha xarajatlarni qoplash uchun ishlatilishi mumkin. Siz o'zingiz hisoblagan har qanday narx bo'lishi mumkin, masalan, o'rtacha sotib olish narxidan ortiqcha ishlab chiqarish va tarqatish narxidan.
 CostPriceUsage=Ushbu qiymat marjni hisoblash uchun ishlatilishi mumkin.
 SoldAmount=Sotilgan summa
 PurchasedAmount=Xarid qilingan summa
 NewPrice=Yangi narx
 MinPrice=Min. sotish narxi
-EditSellingPriceLabel=Edit selling price label
+EditSellingPriceLabel=Sotish narxlari yorlig'ini tahrirlash
 CantBeLessThanMinPrice=Sotish narxi ushbu mahsulot uchun ruxsat etilgan minimal qiymatdan past bo'lishi mumkin emas (%s soliqsiz). Agar siz juda muhim chegirma yozsangiz, bu xabar ham paydo bo'lishi mumkin.
 ContractStatusClosed=Yopiq
 ErrorProductAlreadyExists=%s mos yozuvli mahsulot allaqachon mavjud.
@@ -104,12 +104,12 @@ SetDefaultBarcodeType=Shtrixli turini o'rnating
 BarcodeValue=Shtrixli qiymat
 NoteNotVisibleOnBill=Izoh (hisob-fakturalarda, takliflarda ko'rinmaydi ...)
 ServiceLimitedDuration=Agar mahsulot cheklangan muddati bo'lgan xizmat bo'lsa:
-FillWithLastServiceDates=Fill with last service line dates
+FillWithLastServiceDates=So'nggi xizmat ko'rsatish sanalari bilan to'ldiring
 MultiPricesAbility=Bir mahsulot / xizmat uchun bir nechta narx segmentlari (har bir mijoz bitta narx segmentida)
 MultiPricesNumPrices=Narxlar soni
-DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
+DefaultPriceType=Yangi sotish narxlarini qo'shganda, sukut bo'yicha narxlar bazasi (soliqsiz)
 AssociatedProductsAbility=To'plamlarni yoqing (bir nechta mahsulot to'plami)
-VariantsAbility=Enable Variants (variations of products, for example color, size)
+VariantsAbility=Variantlarni yoqish (mahsulotlarning xilma-xilligi, masalan, rang, o'lcham)
 AssociatedProducts=To'plamlar
 AssociatedProductsNumber=Ushbu to'plamni tashkil etadigan mahsulotlar soni
 ParentProductsNumber=Ota-ona mahsuloti soni
@@ -136,12 +136,12 @@ ConfirmDeleteProductLine=Ushbu mahsulot qatorini o'chirishni xohlaysizmi?
 ProductSpecial=Maxsus
 QtyMin=Min. sotib olish miqdori
 PriceQtyMin=Narx miqdori min.
-PriceQtyMinCurrency=Price (currency) for this qty. (no discount)
+PriceQtyMinCurrency=Ushbu miqdor uchun narx (valyuta). (chegirma yo'q)
 VATRateForSupplierProduct=QQS stavkasi (ushbu sotuvchi / mahsulot uchun)
 DiscountQtyMin=Ushbu miqdor uchun chegirma.
 NoPriceDefinedForThisSupplier=Ushbu sotuvchi / mahsulot uchun narx / miqdor aniqlanmagan
 NoSupplierPriceDefinedForThisProduct=Ushbu mahsulot uchun sotuvchi narxi / miqdori aniqlanmagan
-PredefinedItem=Predefined item
+PredefinedItem=Oldindan belgilangan element
 PredefinedProductsToSell=Oldindan belgilangan mahsulot
 PredefinedServicesToSell=Oldindan belgilangan xizmat
 PredefinedProductsAndServicesToSell=Sotish uchun oldindan belgilangan mahsulotlar / xizmatlar
@@ -159,7 +159,7 @@ RowMaterial=Xom ashyo
 ConfirmCloneProduct=<b> %s </b> mahsulotini yoki xizmatini klonlamoqchimisiz?
 CloneContentProduct=Mahsulot / xizmatning barcha asosiy ma'lumotlarini klonlash
 ClonePricesProduct=Klon narxlari
-CloneCategoriesProduct=Clone linked tags/categories
+CloneCategoriesProduct=Bog'langan teglar / toifalarni klonlash
 CloneCompositionProduct=Virtual mahsulotlar / xizmatlarni klonlash
 CloneCombinationsProduct=Mahsulot variantlarini klonlash
 ProductIsUsed=Ushbu mahsulot ishlatilgan
@@ -171,11 +171,11 @@ SuppliersPrices=Sotuvchi narxlari
 SuppliersPricesOfProductsOrServices=Sotuvchi narxlari (mahsulotlar yoki xizmatlar)
 CustomCode=Bojxona | Tovar | HS kodi
 CountryOrigin=Ishlab chiqaruvchi mamlakat; ta'minotchi mamlakat
-RegionStateOrigin=Region of origin
-StateOrigin=State|Province of origin
+RegionStateOrigin=Kelib chiqish mintaqasi
+StateOrigin=Shtat | kelib chiqishi viloyati
 Nature=Mahsulotning tabiati (xom / ishlab chiqarilgan)
-NatureOfProductShort=Nature of product
-NatureOfProductDesc=Raw material or manufactured product
+NatureOfProductShort=Mahsulotning tabiati
+NatureOfProductDesc=Xom ashyo yoki ishlab chiqarilgan mahsulot
 ShortLabel=Qisqa yorliq
 Unit=Birlik
 p=siz.
@@ -198,58 +198,58 @@ m2=m²
 m3=m³
 liter=litr
 l=L
-unitP=Piece
-unitSET=Set
-unitS=Second
-unitH=Hour
-unitD=Day
+unitP=Parcha
+unitSET=O'rnatish
+unitS=Ikkinchi
+unitH=Soat
+unitD=Kun
 unitG=Gram
-unitM=Meter
-unitLM=Linear meter
-unitM2=Square meter
-unitM3=Cubic meter
-unitL=Liter
-unitT=ton
+unitM=Taymer
+unitLM=Lineer metr
+unitM2=Kvadrat metr
+unitM3=Kub metr
+unitL=Litr
+unitT=tonna
 unitKG=kg
 unitG=Gram
 unitMG=mg
-unitLB=pound
-unitOZ=ounce
-unitM=Meter
+unitLB=funt
+unitOZ=untsiya
+unitM=Taymer
 unitDM=dm
-unitCM=cm
+unitCM=sm
 unitMM=mm
 unitFT=ft
-unitIN=in
-unitM2=Square meter
+unitIN=yilda
+unitM2=Kvadrat metr
 unitDM2=dm²
-unitCM2=cm²
+unitCM2=sm²
 unitMM2=mm²
 unitFT2=ft²
-unitIN2=in²
-unitM3=Cubic meter
+unitIN2=m2
+unitM3=Kub metr
 unitDM3=dm³
-unitCM3=cm³
+unitCM3=sm³
 unitMM3=mm³
 unitFT3=ft³
 unitIN3=in³
-unitOZ3=ounce
-unitgallon=gallon
+unitOZ3=untsiya
+unitgallon=galon
 ProductCodeModel=Mahsulot ref shabloni
 ServiceCodeModel=Xizmat ko'rsatuvchi shablon
 CurrentProductPrice=Joriy narx
 AlwaysUseNewPrice=Har doim mahsulot / xizmatning joriy narxidan foydalaning
 AlwaysUseFixedPrice=Belgilangan narxdan foydalaning
 PriceByQuantity=Miqdoriga ko'ra har xil narxlar
-DisablePriceByQty=Disable prices by quantity
+DisablePriceByQty=Narxlarni miqdori bo'yicha o'chirib qo'ying
 PriceByQuantityRange=Miqdor oralig'i
 MultipriceRules=Segment uchun avtomatik narxlar
 UseMultipriceRules=Boshqa segmentlarning narxlarini birinchi segmentga muvofiq avtomatik hisoblash uchun narx segmenti qoidalaridan foydalaning (mahsulot moduli sozlamalarida belgilangan)
 PercentVariationOver=%% ning %s orqali o'zgarishi
 PercentDiscountOver=%% %s orqali chegirma
-KeepEmptyForAutoCalculation=Keep empty to have this calculated automatically from weight or volume of products
-VariantRefExample=Examples: COL, SIZE
-VariantLabelExample=Examples: Color, Size
+KeepEmptyForAutoCalculation=Buni mahsulotning og'irligi yoki hajmidan avtomatik ravishda hisoblash uchun bo'sh qoldiring
+VariantRefExample=Misollar: COL, SIZE
+VariantLabelExample=Misollar: Rang, o'lchov
 ### composition fabrication
 Build=Mahsulot
 ProductsMultiPrice=Har bir narx segmenti uchun mahsulotlar va narxlar
@@ -277,7 +277,7 @@ PriceByCustomer=Har bir mijoz uchun har xil narxlar
 PriceCatalogue=Mahsulot / xizmat uchun bitta sotish narxi
 PricingRule=Narxlarni sotish qoidalari
 AddCustomerPrice=Xaridor tomonidan narx qo'shing
-ForceUpdateChildPriceSoc=Mijozlarning sho'ba korxonalarida bir xil narxni belgilang
+ForceUpdateChildPriceSoc=Mijozning sho'ba korxonalarida bir xil narxni belgilang
 PriceByCustomerLog=Avvalgi mijozlar narxlari jurnali
 MinimumPriceLimit=Minimal narx %s dan past bo'lishi mumkin emas
 MinimumRecommendedPrice=Minimal tavsiya etilgan narx: %s
@@ -291,11 +291,12 @@ PriceExpressionEditorHelp5=Mavjud global qadriyatlar:
 PriceMode=Narx rejimi
 PriceNumeric=Raqam
 DefaultPrice=Standart narx
-DefaultPriceLog=Log of previous default prices
+DefaultPriceLog=Oldingi narxlarning jurnali
 ComposedProductIncDecStock=Ota-onalarni almashtirishda zaxiralarni ko'paytirish / kamaytirish
 ComposedProduct=Bolalar uchun mo'ljallangan mahsulotlar
 MinSupplierPrice=Minimal sotib olish narxi
 MinCustomerPrice=Minimal sotish narxi
+NoDynamicPrice=Dinamik narx yo'q
 DynamicPriceConfiguration=Dinamik narx konfiguratsiyasi
 DynamicPriceDesc=Siz xaridor yoki sotuvchi narxlarini hisoblash uchun matematik formulalarni belgilashingiz mumkin. Bunday formulalar barcha matematik operatorlardan, ba'zi bir doimiy va o'zgaruvchilardan foydalanishi mumkin. Siz bu erda foydalanmoqchi bo'lgan o'zgaruvchilarni belgilashingiz mumkin. Agar o'zgaruvchiga avtomatik yangilanish kerak bo'lsa, siz Dolibarr-ga qiymatni avtomatik ravishda yangilashiga ruxsat berish uchun tashqi URL manzilini belgilashingiz mumkin.
 AddVariable=O'zgaruvchini qo'shish
@@ -303,12 +304,12 @@ AddUpdater=Updater-ni qo'shing
 GlobalVariables=Global o'zgaruvchilar
 VariableToUpdate=Yangilanadigan o'zgaruvchi
 GlobalVariableUpdaters=O'zgaruvchilar uchun tashqi yangilanuvchilar
-GlobalVariableUpdaterType0=JSON data
-GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
-GlobalVariableUpdaterHelpFormat0=Format for request {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
-GlobalVariableUpdaterType1=WebService data
-GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
-GlobalVariableUpdaterHelpFormat1=Format for request is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data", "to": "send"}}
+GlobalVariableUpdaterType0=JSON ma'lumotlari
+GlobalVariableUpdaterHelp0=Belgilangan URL-dan JSON ma'lumotlarini ajratadi, VALUE tegishli qiymatning joylashishini belgilaydi,
+GlobalVariableUpdaterHelpFormat0=So'rov uchun format {"URL": "http://example.com/urlofjson", "VALUE": "array1, array2, targetvalue"}
+GlobalVariableUpdaterType1=WebService ma'lumotlari
+GlobalVariableUpdaterHelp1=Belgilangan URL-dan WebService ma'lumotlarini ajratadi, NS nomlar maydonini, VALUE tegishli qiymatning joylashishini belgilaydi, DATA jo'natiladigan ma'lumotlarni o'z ichiga olishi kerak va METHOD chaqiruvchi WS usuli
+GlobalVariableUpdaterHelpFormat1=So'rov formati: {"URL": "http://example.com/urlofws", "VALUE": "array, targetvalue", "NS": "http://example.com/urlofns", "METHOD" : "myWSMethod", "DATA": {"your": "data", "to": "send"}}
 UpdateInterval=Yangilash oralig'i (daqiqa)
 LastUpdated=Oxirgi yangilanish
 CorrectlyUpdated=To'g'ri yangilangan
@@ -320,7 +321,7 @@ WarningSelectOneDocument=Iltimos, kamida bitta hujjatni tanlang
 DefaultUnitToShow=Birlik
 NbOfQtyInProposals=Takliflar soni
 ClinkOnALinkOfColumn=Batafsil ko'rinishni olish uchun %s ustunining havolasini bosing ...
-ProductsOrServicesTranslations=Products/Services translations
+ProductsOrServicesTranslations=Mahsulotlar / xizmatlarning tarjimalari
 TranslatedLabel=Tarjima qilingan yorliq
 TranslatedDescription=Tarjima qilingan tavsif
 TranslatedNote=Tarjima qilingan yozuvlar
@@ -328,73 +329,73 @@ ProductWeight=1 mahsulot uchun vazn
 ProductVolume=1 ta mahsulot uchun hajm
 WeightUnits=Og'irlik birligi
 VolumeUnits=Tovush birligi
-WidthUnits=Width unit
-LengthUnits=Length unit
-HeightUnits=Height unit
-SurfaceUnits=Surface unit
+WidthUnits=Kenglik birligi
+LengthUnits=Uzunlik birligi
+HeightUnits=Balandlik birligi
+SurfaceUnits=Yuzaki birlik
 SizeUnits=Hajmi birligi
 DeleteProductBuyPrice=Xarid narxini o'chirish
 ConfirmDeleteProductBuyPrice=Ushbu xarid narxini o'chirishni xohlaysizmi?
-SubProduct=Sub product
-ProductSheet=Product sheet
-ServiceSheet=Service sheet
-PossibleValues=Possible values
-GoOnMenuToCreateVairants=Go on menu %s - %s to prepare attribute variants (like colors, size, ...)
+SubProduct=Sub mahsulot
+ProductSheet=Mahsulot varag'i
+ServiceSheet=Xizmat varaqasi
+PossibleValues=Mumkin bo'lgan qiymatlar
+GoOnMenuToCreateVairants=Atribut variantlarini tayyorlash uchun (ranglar, o'lchamlar, ... kabi) %s - %s menyusiga o'ting.
 UseProductFournDesc=Add a feature to define the descriptions of products defined by the vendors in addition to descriptions for customers
-ProductSupplierDescription=Vendor description for the product
-UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
-PackagingForThisProduct=Packaging
-PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
-QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
+ProductSupplierDescription=Mahsulot uchun sotuvchining tavsifi
+UseProductSupplierPackaging=Paketni etkazib beruvchilar narxlarida ishlating (etkazib beruvchilar hujjatlaridagi qatorni qo'shish / yangilashda etkazib beruvchining narxida belgilangan qadoqlarga muvofiq miqdorlarni qayta hisoblang)
+PackagingForThisProduct=Paket
+PackagingForThisProductDesc=Yetkazib beruvchining buyurtmasiga binoan siz ushbu miqdorni (yoki ushbu miqdorning ko'pligini) avtomatik ravishda buyurtma qilasiz. Minimal sotib olish miqdoridan kam bo'lishi mumkin emas
+QtyRecalculatedWithPackaging=Chiziq miqdori etkazib beruvchilarning qadoqlariga muvofiq qayta hisoblab chiqilgan
 
 #Attributes
-VariantAttributes=Variant attributes
-ProductAttributes=Variant attributes for products
-ProductAttributeName=Variant attribute %s
-ProductAttribute=Variant attribute
-ProductAttributeDeleteDialog=Are you sure you want to delete this attribute? All values will be deleted
-ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s" with reference "%s" of this attribute?
-ProductCombinationDeleteDialog=Are you sure want to delete the variant of the product "<strong>%s</strong>"?
-ProductCombinationAlreadyUsed=There was an error while deleting the variant. Please check it is not being used in any object
-ProductCombinations=Variants
-PropagateVariant=Propagate variants
-HideProductCombinations=Hide products variant in the products selector
+VariantAttributes=Variant atributlari
+ProductAttributes=Mahsulotlar uchun turli xil atributlar
+ProductAttributeName=Variant atributi %s
+ProductAttribute=Variant atributi
+ProductAttributeDeleteDialog=Ushbu xususiyatni o'chirishni xohlaysizmi? Barcha qiymatlar o'chiriladi
+ProductAttributeValueDeleteDialog=Ushbu atributning "%s" mos yozuvlar bilan "%s" qiymatini o'chirishni xohlaysizmi?
+ProductCombinationDeleteDialog=Haqiqatan ham mahsulotning "<strong> %s </strong>" variantini o'chirishni xohlaysizmi?
+ProductCombinationAlreadyUsed=Variantni o'chirishda xatolik yuz berdi. Iltimos, u hech qanday ob'ektda ishlatilmayotganligini tekshiring
+ProductCombinations=Variantlar
+PropagateVariant=Variantlarni targ'ib qiling
+HideProductCombinations=Mahsulot tanlovchisida mahsulot variantini yashirish
 ProductCombination=Variant
-NewProductCombination=New variant
-EditProductCombination=Editing variant
-NewProductCombinations=New variants
-EditProductCombinations=Editing variants
-SelectCombination=Select combination
-ProductCombinationGenerator=Variants generator
-Features=Features
-PriceImpact=Price impact
-ImpactOnPriceLevel=Impact on price level %s
-ApplyToAllPriceImpactLevel= Apply to all levels
-ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
-WeightImpact=Weight impact
-NewProductAttribute=New attribute
-NewProductAttributeValue=New attribute value
-ErrorCreatingProductAttributeValue=There was an error while creating the attribute value. It could be because there is already an existing value with that reference
-ProductCombinationGeneratorWarning=If you continue, before generating new variants, all previous ones will be DELETED. Already existing ones will be updated with the new values
-TooMuchCombinationsWarning=Generating lots of variants may result in high CPU, memory usage and Dolibarr not able to create them. Enabling the option "%s" may help reduce memory usage.
-DoNotRemovePreviousCombinations=Do not remove previous variants
-UsePercentageVariations=Use percentage variations
-PercentageVariation=Percentage variation
-ErrorDeletingGeneratedProducts=There was an error while trying to delete existing product variants
-NbOfDifferentValues=No. of different values
-NbProducts=Number of products
-ParentProduct=Parent product
-HideChildProducts=Hide variant products
-ShowChildProducts=Show variant products
-NoEditVariants=Go to Parent product card and edit variants price impact in the variants tab
-ConfirmCloneProductCombinations=Would you like to copy all the product variants to the other parent product with the given reference?
-CloneDestinationReference=Destination product reference
-ErrorCopyProductCombinations=There was an error while copying the product variants
-ErrorDestinationProductNotFound=Destination product not found
-ErrorProductCombinationNotFound=Product variant not found
-ActionAvailableOnVariantProductOnly=Action only available on the variant of product
-ProductsPricePerCustomer=Product prices per customers
-ProductSupplierExtraFields=Additional Attributes (Supplier Prices)
-DeleteLinkedProduct=Delete the child product linked to the combination
-PMPValue=Weighted average price
+NewProductCombination=Yangi variant
+EditProductCombination=Variantni tahrirlash
+NewProductCombinations=Yangi variantlar
+EditProductCombinations=Variantlarni tahrirlash
+SelectCombination=Kombinatsiyani tanlang
+ProductCombinationGenerator=Variantlar generatori
+Features=Xususiyatlari
+PriceImpact=Narx ta'siri
+ImpactOnPriceLevel=%s narx darajasiga ta'siri
+ApplyToAllPriceImpactLevel= Barcha darajalarga murojaat qiling
+ApplyToAllPriceImpactLevelHelp=Bu erni bosish orqali siz barcha darajalarda bir xil narx ta'sirini o'rnatdingiz
+WeightImpact=Og'irlikka ta'siri
+NewProductAttribute=Yangi atribut
+NewProductAttributeValue=Yangi atribut qiymati
+ErrorCreatingProductAttributeValue=Atribut qiymatini yaratishda xatolik yuz berdi. Ehtimol, ushbu ma'lumotnomada allaqachon mavjud qiymat mavjud
+ProductCombinationGeneratorWarning=Agar davom ettirsangiz, yangi variantlarni yaratishdan oldin, avvalgi barcha ma'lumotlar O'chiriladi. Allaqachon mavjud bo'lganlar yangi qadriyatlar bilan yangilanadi
+TooMuchCombinationsWarning=Ko'pgina variantlarni yaratish yuqori protsessorga, xotiradan foydalanishga va Dolibarr ularni yaratishga olib kelmasligi mumkin. "%s" parametrini yoqish xotira hajmini kamaytirishga yordam beradi.
+DoNotRemovePreviousCombinations=Oldingi variantlarni olib tashlamang
+UsePercentageVariations=Foizli o'zgarishlardan foydalaning
+PercentageVariation=Foizning o'zgarishi
+ErrorDeletingGeneratedProducts=Mavjud mahsulot variantlarini o'chirishda xatolik yuz berdi
+NbOfDifferentValues=Turli xil qiymatlar soni
+NbProducts=Mahsulotlar soni
+ParentProduct=Asosiy mahsulot
+HideChildProducts=Variant mahsulotlarini yashirish
+ShowChildProducts=Variant mahsulotlarini ko'rsating
+NoEditVariants=Ota-ona mahsulot kartasiga o'ting va variantlar ko'rinishida variantlar narxiga ta'sirini tahrir qiling
+ConfirmCloneProductCombinations=Berilgan ma'lumot bilan mahsulotning barcha variantlarini boshqa asosiy mahsulotga nusxalashni xohlaysizmi?
+CloneDestinationReference=Belgilangan mahsulot haqida ma'lumot
+ErrorCopyProductCombinations=Mahsulot variantlarini nusxalashda xatolik yuz berdi
+ErrorDestinationProductNotFound=Belgilangan mahsulot topilmadi
+ErrorProductCombinationNotFound=Mahsulot varianti topilmadi
+ActionAvailableOnVariantProductOnly=Aksiya faqat mahsulotning variantida mavjud
+ProductsPricePerCustomer=Xaridorlar uchun mahsulot narxi
+ProductSupplierExtraFields=Qo'shimcha atributlar (etkazib beruvchilar narxi)
+DeleteLinkedProduct=Kombinatsiyaga bog'langan bolalar mahsulotini o'chirib tashlang
+PMPValue=O'rtacha narx
 PMPValueShort=WAP
diff --git a/htdocs/langs/uz_UZ/projects.lang b/htdocs/langs/uz_UZ/projects.lang
index 3f82199372e..7557a0e4f79 100644
--- a/htdocs/langs/uz_UZ/projects.lang
+++ b/htdocs/langs/uz_UZ/projects.lang
@@ -7,9 +7,9 @@ ProjectsArea=Loyihalar maydoni
 ProjectStatus=Loyiha holati
 SharedProject=Hamma
 PrivateProject=Loyiha bo'yicha aloqalar
-ProjectsImContactFor=Projects for which I am explicitly a contact
-AllAllowedProjects=All project I can read (mine + public)
-AllProjects=All projects
+ProjectsImContactFor=Men aniq aloqada bo'lgan loyihalar
+AllAllowedProjects=Men o'qiy oladigan barcha loyihalar (meniki + jamoat)
+AllProjects=Barcha loyihalar
 MyProjectsDesc=Ushbu ko'rinish faqat siz aloqada bo'lgan loyihalar bilan cheklangan
 ProjectsPublicDesc=Ushbu ko'rinish sizga o'qishga ruxsat berilgan barcha loyihalarni taqdim etadi.
 TasksOnProjectsPublicDesc=Ushbu ko'rinish sizga o'qishga ruxsat berilgan loyihalar bo'yicha barcha vazifalarni taqdim etadi.
@@ -24,7 +24,7 @@ TasksDesc=Ushbu ko'rinish barcha loyihalar va vazifalarni taqdim etadi (foydalan
 AllTaskVisibleButEditIfYouAreAssigned=Malakali loyihalar uchun barcha vazifalar ko'rinib turadi, ammo siz faqat tanlangan foydalanuvchiga berilgan topshiriq uchun vaqt kiritishingiz mumkin. Agar unga vaqt kiritishingiz kerak bo'lsa, vazifani tayinlang.
 OnlyYourTaskAreVisible=Faqat sizga yuklangan vazifalar ko'rinadi. Agar topshiriq bo'yicha vaqtni kiritishingiz kerak bo'lsa va agar bu erda vazifa ko'rinmasa, unda siz o'zingiz uchun vazifani tayinlashingiz kerak.
 ImportDatasetTasks=Loyihalarning vazifalari
-ProjectCategories=Project tags/categories
+ProjectCategories=Loyiha teglari / toifalari
 NewProject=Yangi loyiha
 AddProject=Loyiha yaratish
 DeleteAProject=Loyihani o'chirish
@@ -36,16 +36,16 @@ OpenedTasks=Ochiq vazifalar
 OpportunitiesStatusForOpenedProjects=Status bo'yicha ochiq loyihalarning etakchisi
 OpportunitiesStatusForProjects=Loyihalar miqdori bo'yicha maqomi bo'yicha etakchilik qiladi
 ShowProject=Loyihani namoyish etish
-ShowTask=Show task
+ShowTask=Vazifani ko'rsatish
 SetProject=Loyihani o'rnating
 NoProject=Hech qanday loyiha aniqlanmagan yoki tegishli emas
 NbOfProjects=Loyihalar soni
-NbOfTasks=Number of tasks
+NbOfTasks=Vazifalar soni
 TimeSpent=O'tkazilgan vaqt
 TimeSpentByYou=Siz sarflagan vaqt
 TimeSpentByUser=Foydalanuvchi sarflagan vaqt
 TimesSpent=O'tkazilgan vaqt
-TaskId=Task ID
+TaskId=Vazifa identifikatori
 RefTask=Vazifa ref.
 LabelTask=Vazifa yorlig'i
 TaskTimeSpent=Vazifalarga sarflangan vaqt
@@ -56,10 +56,10 @@ TasksOnOpenedProject=Ochiq loyihalar bo'yicha vazifalar
 WorkloadNotDefined=Ish hajmi aniqlanmagan
 NewTimeSpent=O'tkazilgan vaqt
 MyTimeSpent=Mening vaqtim o'tgan
-BillTime=Bill the time spent
-BillTimeShort=Bill time
-TimeToBill=Time not billed
-TimeBilled=Time billed
+BillTime=Vaqt sarflang
+BillTimeShort=Hisob-kitob vaqti
+TimeToBill=Vaqt hisoblanmaydi
+TimeBilled=Hisob-kitob vaqti
 Tasks=Vazifalar
 Task=Vazifa
 TaskDateStart=Vazifaning boshlanish sanasi
@@ -68,8 +68,8 @@ TaskDescription=Vazifaning tavsifi
 NewTask=Yangi vazifa
 AddTask=Vazifa yaratish
 AddTimeSpent=O'tkazilgan vaqtni yarating
-AddHereTimeSpentForDay=Add here time spent for this day/task
-AddHereTimeSpentForWeek=Add here time spent for this week/task
+AddHereTimeSpentForDay=Bu kunga / vazifaga sarflangan vaqtni qo'shing
+AddHereTimeSpentForWeek=Bu erga ushbu hafta / topshiriq uchun sarflangan vaqtni qo'shing
 Activity=Faoliyat
 Activities=Vazifalar / tadbirlar
 MyActivities=Mening vazifalarim / faoliyatim
@@ -77,19 +77,19 @@ MyProjects=Mening loyihalarim
 MyProjectsArea=Mening loyihalarim
 DurationEffective=Amal qilish muddati
 ProgressDeclared=Haqiqiy taraqqiyot e'lon qilindi
-TaskProgressSummary=Task progress
-CurentlyOpenedTasks=Curently open tasks
-TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared real progress is less %s than the progress on consumption
-TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared real progress is more %s than the progress on consumption
+TaskProgressSummary=Vazifaning bajarilishi
+CurentlyOpenedTasks=Ochiq vazifalar
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=E'lon qilingan haqiqiy taraqqiyot iste'molga nisbatan kamroq %s
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=E'lon qilingan haqiqiy taraqqiyot iste'molning rivojlanishiga qaraganda ko'proq %s
 ProgressCalculated=Iste'mol bo'yicha taraqqiyot
-WhichIamLinkedTo=which I'm linked to
-WhichIamLinkedToProject=which I'm linked to project
+WhichIamLinkedTo=Men bilan bog'langan
+WhichIamLinkedToProject=Men loyihaga bog'langanman
 Time=Vaqt
-TimeConsumed=Consumed
+TimeConsumed=Iste'mol qilingan
 ListOfTasks=Vazifalar ro'yxati
 GoToListOfTimeConsumed=Vaqt sarflanganlar ro'yxatiga o'ting
-GanttView=Gantt View
-ListWarehouseAssociatedProject=List of warehouses associated to the project
+GanttView=Gantt Vyu
+ListWarehouseAssociatedProject=Loyiha bilan bog'liq omborlar ro'yxati
 ListProposalsAssociatedProject=Loyiha bilan bog'liq tijorat takliflari ro'yxati
 ListOrdersAssociatedProject=Loyiha bilan bog'liq savdo buyurtmalar ro'yxati
 ListInvoicesAssociatedProject=Loyiha bilan bog'liq mijozlarning hisob-fakturalari ro'yxati
@@ -97,24 +97,24 @@ ListPredefinedInvoicesAssociatedProject=Loyiha bilan bog'liq mijozlar shablonlar
 ListSupplierOrdersAssociatedProject=Loyiha bilan bog'liq bo'lgan buyurtmalar ro'yxati
 ListSupplierInvoicesAssociatedProject=Loyiha bilan bog'liq sotuvchilarning hisob-fakturalari ro'yxati
 ListContractAssociatedProject=Loyiha bilan bog'liq shartnomalar ro'yxati
-ListShippingAssociatedProject=List of shippings related to the project
+ListShippingAssociatedProject=Loyiha bilan bog'liq jo'natmalar ro'yxati
 ListFichinterAssociatedProject=Loyiha bilan bog'liq tadbirlar ro'yxati
 ListExpenseReportsAssociatedProject=Loyiha bilan bog'liq xarajatlar hisobotlari ro'yxati
 ListDonationsAssociatedProject=Loyiha bilan bog'liq xayr-ehsonlar ro'yxati
-ListVariousPaymentsAssociatedProject=List of miscellaneous payments related to the project
-ListSalariesAssociatedProject=List of payments of salaries related to the project
+ListVariousPaymentsAssociatedProject=Loyiha bilan bog'liq turli xil to'lovlar ro'yxati
+ListSalariesAssociatedProject=Loyiha bilan bog'liq ish haqi to'lovlari ro'yxati
 ListActionsAssociatedProject=Loyiha bilan bog'liq tadbirlar ro'yxati
-ListMOAssociatedProject=List of manufacturing orders related to the project
+ListMOAssociatedProject=Loyiha bilan bog'liq ishlab chiqarish buyurtmalari ro'yxati
 ListTaskTimeUserProject=Loyiha vazifalari bo'yicha sarflanadigan vaqt ro'yxati
-ListTaskTimeForTask=List of time consumed on task
+ListTaskTimeForTask=Vazifa bo'yicha sarflangan vaqt ro'yxati
 ActivityOnProjectToday=Bugungi loyihadagi faoliyat
 ActivityOnProjectYesterday=Kecha loyihadagi faoliyat
 ActivityOnProjectThisWeek=Ushbu haftadagi loyihadagi faollik
 ActivityOnProjectThisMonth=Ushbu oydagi loyihadagi faoliyat
 ActivityOnProjectThisYear=Bu yilgi loyihadagi faoliyat
-ChildOfProjectTask=Child of project/task
+ChildOfProjectTask=Loyiha / vazifa farzandi
 ChildOfTask=Vazifa farzandi
-TaskHasChild=Task has child
+TaskHasChild=Vazifada bola bor
 NotOwnerOfProject=Ushbu xususiy loyihaning egasi emas
 AffectedTo=Ajratilgan
 CantRemoveProject=Ushbu loyihani olib tashlash mumkin emas, chunki u boshqa ob'ektlar (faktura, buyurtma yoki boshqa) tomonidan havola qilinadi. '%s' yorlig'iga qarang.
@@ -122,14 +122,14 @@ ValidateProject=Proyektorni tasdiqlang
 ConfirmValidateProject=Ushbu loyihani tasdiqlamoqchimisiz?
 CloseAProject=Loyihani yoping
 ConfirmCloseAProject=Ushbu loyihani yopmoqchi ekanligingizga aminmisiz?
-AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
+AlsoCloseAProject=Loyihani yoping (agar siz hali ham ishlab chiqarish vazifalarini bajarishingiz kerak bo'lsa, uni ochiq holda saqlang)
 ReOpenAProject=Ochiq loyiha
 ConfirmReOpenAProject=Ushbu loyihani qayta ochishni xohlaysizmi?
 ProjectContact=Loyiha aloqalari
-TaskContact=Task contacts
+TaskContact=Vazifa aloqalari
 ActionsOnProject=Loyiha bo'yicha tadbirlar
 YouAreNotContactOfProject=Siz ushbu xususiy loyihaning aloqasi emassiz
-UserIsNotContactOfProject=User is not a contact of this private project
+UserIsNotContactOfProject=Foydalanuvchi ushbu xususiy loyihaning aloqasi emas
 DeleteATimeSpent=O'tkazilgan vaqtni o'chirib tashlang
 ConfirmDeleteATimeSpent=Ushbu sarflangan vaqtni o'chirishni xohlaysizmi?
 DoNotShowMyTasksOnly=Menga yuklanmagan vazifalarni ham ko'ring
@@ -138,10 +138,10 @@ TaskRessourceLinks=Vazifa aloqalari
 ProjectsDedicatedToThisThirdParty=Ushbu uchinchi tomonga bag'ishlangan loyihalar
 NoTasks=Ushbu loyiha uchun hech qanday vazifa yo'q
 LinkedToAnotherCompany=Boshqa uchinchi tomon bilan bog'langan
-TaskIsNotAssignedToUser=Task not assigned to user. Use button '<strong>%s</strong>' to assign task now.
+TaskIsNotAssignedToUser=Vazifa foydalanuvchiga berilmagan. Vazifani hozir tayinlash uchun '<strong> %s </strong>' tugmachasidan foydalaning.
 ErrorTimeSpentIsEmpty=O'tkazilgan vaqt bo'sh
 ThisWillAlsoRemoveTasks=Ushbu amal shuningdek, loyihaning barcha vazifalarini (<b> %s </b> vazifalari) va sarf qilingan barcha vaqtlarni o'chirib tashlaydi.
-IfNeedToUseOtherObjectKeepEmpty=If some objects (invoice, order, ...), belonging to another third party, must be linked to the project to create, keep this empty to have the project being multi third parties.
+IfNeedToUseOtherObjectKeepEmpty=Agar boshqa uchinchi tomonga tegishli bo'lgan ba'zi bir ob'ektlar (hisob-faktura, buyurtma, ...) loyihani yaratish uchun bog'langan bo'lishi kerak bo'lsa, loyihani ko'p uchinchi shaxslar bo'lishini ta'minlash uchun uni bo'sh qoldiring.
 CloneTasks=Klon vazifalari
 CloneContacts=Kontaktlarni klonlash
 CloneNotes=Klon yozuvlari
@@ -153,7 +153,7 @@ ProjectReportDate=Loyihaning yangi boshlanish sanasiga ko'ra topshiriq sanalarin
 ErrorShiftTaskDate=Loyihaning yangi boshlanish sanasiga ko'ra topshiriq sanasini almashtirish mumkin emas
 ProjectsAndTasksLines=Loyihalar va vazifalar
 ProjectCreatedInDolibarr=%s loyihasi yaratildi
-ProjectValidatedInDolibarr=Project %s validated
+ProjectValidatedInDolibarr=%s loyihasi tasdiqlangan
 ProjectModifiedInDolibarr=%s loyihasi o'zgartirildi
 TaskCreatedInDolibarr=%s vazifasi yaratildi
 TaskModifiedInDolibarr=Vazifa %s o'zgartirildi
@@ -164,8 +164,8 @@ OpportunityProbability=Qo'rg'oshin ehtimoli
 OpportunityProbabilityShort=Qo'rg'oshin probab.
 OpportunityAmount=Qo'rg'oshin miqdori
 OpportunityAmountShort=Qo'rg'oshin miqdori
-OpportunityWeightedAmount=Opportunity weighted amount
-OpportunityWeightedAmountShort=Opp. weighted amount
+OpportunityWeightedAmount=Imkoniyatni hisobga olgan holda miqdori
+OpportunityWeightedAmountShort=Opp. tortilgan miqdor
 OpportunityAmountAverageShort=O'rtacha qo'rg'oshin miqdori
 OpportunityAmountWeigthedShort=Qo'rg'oshin miqdori
 WonLostExcluded=Yutdi / Yo'qotildi chiqarib tashlandi
@@ -180,11 +180,11 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Xissador
 TypeContact_project_task_external_TASKCONTRIBUTOR=Xissador
 SelectElement=Elementni tanlang
 AddElement=Elementga havola
-LinkToElementShort=Link to
+LinkToElementShort=Ga havola
 # Documents models
 DocumentModelBeluga=Bog'langan ob'ektlarga umumiy nuqtai uchun loyiha hujjati shabloni
 DocumentModelBaleine=Vazifalar uchun loyiha hujjati shabloni
-DocumentModelTimeSpent=Project report template for time spent
+DocumentModelTimeSpent=O'tkazilgan vaqt uchun loyiha hisoboti shabloni
 PlannedWorkload=Rejalashtirilgan ish hajmi
 PlannedWorkloadShort=Ish hajmi
 ProjectReferers=Tegishli narsalar
@@ -192,37 +192,37 @@ ProjectMustBeValidatedFirst=Avval loyiha tasdiqlanishi kerak
 FirstAddRessourceToAllocateTime=Vaqt ajratish uchun foydalanuvchi resursini loyihaning aloqasi sifatida tayinlang
 InputPerDay=Kuniga kiritish
 InputPerWeek=Haftada kiritish
-InputPerMonth=Input per month
-InputDetail=Input detail
+InputPerMonth=Oyiga kiritish
+InputDetail=Kirish tafsiloti
 TimeAlreadyRecorded=Bu allaqachon ushbu vazifa uchun yozilgan vaqt va foydalanuvchi %s
 ProjectsWithThisUserAsContact=Ushbu foydalanuvchi bilan aloqa sifatida loyihalar
 TasksWithThisUserAsContact=Ushbu foydalanuvchiga berilgan vazifalar
 ResourceNotAssignedToProject=Loyihaga tayinlanmagan
 ResourceNotAssignedToTheTask=Vazifaga tayinlanmagan
-NoUserAssignedToTheProject=No users assigned to this project
-TimeSpentBy=Time spent by
-TasksAssignedTo=Tasks assigned to
+NoUserAssignedToTheProject=Ushbu loyihaga tayinlangan foydalanuvchilar yo'q
+TimeSpentBy=O'tkazilgan vaqt
+TasksAssignedTo=Belgilangan vazifalar
 AssignTaskToMe=O'zimga vazifa bering
-AssignTaskToUser=Assign task to %s
-SelectTaskToAssign=Select task to assign...
+AssignTaskToUser=%s ga topshiriq bering
+SelectTaskToAssign=Topshiriqni tanlang ...
 AssignTask=Tayinlang
 ProjectOverview=Umumiy nuqtai
 ManageTasks=Vazifalarni bajarish va / yoki sarflangan vaqt (vaqt jadvallari) haqida xabar berish uchun loyihalardan foydalaning
 ManageOpportunitiesStatus=Loyihalarni / imkoniyatlarni kuzatib borish uchun foydalaning
 ProjectNbProjectByMonth=Oy davomida yaratilgan loyihalar soni
-ProjectNbTaskByMonth=No. of created tasks by month
+ProjectNbTaskByMonth=Oylar davomida yaratilgan topshiriqlar soni
 ProjectOppAmountOfProjectsByMonth=Oylar bo'yicha etakchilar miqdori
 ProjectWeightedOppAmountOfProjectsByMonth=Qo'rg'oshinlarning oylik miqdori
 ProjectOpenedProjectByOppStatus=Ochiq loyiha | etakchi maqomi bo'yicha etakchi
 ProjectsStatistics=Loyihalar yoki etakchilar bo'yicha statistika
-TasksStatistics=Statistics on tasks of projects or leads
+TasksStatistics=Loyihalar yoki rahbarlarning vazifalari bo'yicha statistika
 TaskAssignedToEnterTime=Vazifa tayinlandi. Ushbu topshiriq bo'yicha vaqtni kiritish mumkin bo'lishi kerak.
 IdTaskTime=Id vazifasi vaqti
 YouCanCompleteRef=Agar siz ba'zi bir qo'shimchalar bilan refni to'ldirishni istasangiz, uni ajratish uchun belgi qo'shishingiz tavsiya etiladi, shuning uchun avtomatik raqamlash keyingi loyihalar uchun to'g'ri ishlaydi. Masalan %s-MYSUFFIX
 OpenedProjectsByThirdparties=Uchinchi tomonlarning ochiq loyihalari
 OnlyOpportunitiesShort=Faqat rahbarlik qiladi
 OpenedOpportunitiesShort=Ochiq chiziqlar
-NotOpenedOpportunitiesShort=Not an open lead
+NotOpenedOpportunitiesShort=Ochiq etakchi emas
 NotAnOpportunityShort=Qo'rg'oshin emas
 OpportunityTotalAmount=Qo'rg'oshinlarning umumiy miqdori
 OpportunityPonderatedAmount=Qo'rg'oshinlarning og'irligi
@@ -235,43 +235,43 @@ OppStatusPENDING=Kutilmoqda
 OppStatusWON=Yutuq
 OppStatusLOST=Yo'qotilgan
 Budget=Byudjet
-AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>Supported values:</u><br>- Keep empty: Can link any project of the company (default)<br>- "all": Can link any projects, even projects of other companies<br>- A list of third-party ids separated by commas: can link all projects of these third partys (Example: 123,4795,53)<br>
-LatestProjects=Latest %s projects
-LatestModifiedProjects=Latest %s modified projects
-OtherFilteredTasks=Other filtered tasks
-NoAssignedTasks=No assigned tasks found (assign project/tasks to the current user from the top select box to enter time on it)
-ThirdPartyRequiredToGenerateInvoice=A third party must be defined on project to be able to invoice it.
-ChooseANotYetAssignedTask=Choose a task not yet assigned to you
+AllowToLinkFromOtherCompany=Loyihani boshqa kompaniyadan bog'lashga ruxsat bering <br> <br> <u> Qo'llab-quvvatlanadigan qiymatlar: </u> <br> - Bo'sh tuting: kompaniyaning istalgan loyihasini bog'lashi mumkin (default) a0342fccfdab " vergul bilan ajratilgan uchinchi tomon identifikatorlari: ushbu uchinchi tomonlarning barcha loyihalarini bog'lashi mumkin (Masalan: 123,4795,53) <br>
+LatestProjects=Oxirgi %s loyihalari
+LatestModifiedProjects=Oxirgi %s o'zgartirilgan loyihalar
+OtherFilteredTasks=Boshqa filtrlangan vazifalar
+NoAssignedTasks=Belgilangan vazifalar topilmadi (loyihani / vazifalarni joriy foydalanuvchiga vaqtni belgilash uchun yuqori tanlangan maydonchadan belgilang)
+ThirdPartyRequiredToGenerateInvoice=Hisob-kitob qilish imkoniyatiga ega bo'lish uchun loyihada uchinchi shaxs aniqlanishi kerak.
+ChooseANotYetAssignedTask=Sizga hali tayinlanmagan vazifani tanlang
 # Comments trans
-AllowCommentOnTask=Allow user comments on tasks
-AllowCommentOnProject=Allow user comments on projects
-DontHavePermissionForCloseProject=You do not have permissions to close the project %s
-DontHaveTheValidateStatus=The project %s must be open to be closed
-RecordsClosed=%s project(s) closed
-SendProjectRef=Information project %s
-ModuleSalaryToDefineHourlyRateMustBeEnabled=Module 'Salaries' must be enabled to define employee hourly rate to have time spent valorized
-NewTaskRefSuggested=Task ref already used, a new task ref is required
-TimeSpentInvoiced=Time spent billed
-TimeSpentForInvoice=Time spent
-OneLinePerUser=One line per user
-ServiceToUseOnLines=Service to use on lines
-InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
-ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
-ProjectFollowOpportunity=Follow opportunity
-ProjectFollowTasks=Follow tasks or time spent
-Usage=Usage
-UsageOpportunity=Usage: Opportunity
-UsageTasks=Usage: Tasks
-UsageBillTimeShort=Usage: Bill time
-InvoiceToUse=Draft invoice to use
-NewInvoice=New invoice
-OneLinePerTask=One line per task
-OneLinePerPeriod=One line per period
-OneLinePerTimeSpentLine=One line for each time spent declaration
-RefTaskParent=Ref. Parent Task
-ProfitIsCalculatedWith=Profit is calculated using
-AddPersonToTask=Add also to tasks
-UsageOrganizeEvent=Usage: Event Organization
-PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
-PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
-SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
+AllowCommentOnTask=Vazifalar bo'yicha foydalanuvchi sharhlariga ruxsat berish
+AllowCommentOnProject=Foydalanuvchilarning loyihalar bo'yicha sharhlariga ruxsat berish
+DontHavePermissionForCloseProject=%s loyihasini yopish uchun sizda ruxsat yo'q
+DontHaveTheValidateStatus=%s loyihasi yopilishi uchun ochiq bo'lishi kerak
+RecordsClosed=%s loyihasi yopildi
+SendProjectRef=Axborot loyihasi %s
+ModuleSalaryToDefineHourlyRateMustBeEnabled="Ish haqi" moduli ishchilarning soatlik stavkasini aniqlash uchun sarflangan vaqtni aniqlash uchun yoqilishi kerak
+NewTaskRefSuggested=Vazifa allaqachon ishlatilgan, yangi vazifa talab qilinadi
+TimeSpentInvoiced=Hisob-kitob qilingan vaqt
+TimeSpentForInvoice=O'tkazilgan vaqt
+OneLinePerUser=Har bir foydalanuvchi uchun bitta qator
+ServiceToUseOnLines=Qatorlarda foydalanish uchun xizmat
+InvoiceGeneratedFromTimeSpent=%s hisob-fakturasi loyihaga sarf qilingan vaqtdan boshlab tuzildi
+ProjectBillTimeDescription=Loyiha vazifalari bo'yicha ish jadvalini kiritganingizni tekshiring va loyiha buyurtmachisiga hisob-kitob qilish uchun hisob varag'idan hisob-kitob (lar) yaratishni rejalashtiryapsiz (kiritilgan ish jadvallariga asoslanmagan hisob-faktura yaratishni rejalashtirayotganingizni tekshirmang). Izoh: Hisob-fakturani yaratish uchun loyihaning "sarflangan vaqt" yorlig'iga o'ting va qo'shiladigan qatorlarni tanlang.
+ProjectFollowOpportunity=Imkoniyatni kuzatib boring
+ProjectFollowTasks=Vazifalarni yoki sarflangan vaqtni kuzatib boring
+Usage=Foydalanish
+UsageOpportunity=Foydalanish: imkoniyat
+UsageTasks=Foydalanish: Vazifalar
+UsageBillTimeShort=Foydalanish: hisob-kitob vaqti
+InvoiceToUse=Hisob-fakturani ishlating
+NewInvoice=Yangi hisob-faktura
+OneLinePerTask=Har bir topshiriq uchun bitta qator
+OneLinePerPeriod=Har bir davr uchun bitta qator
+OneLinePerTimeSpentLine=Har safar o'tkazilgan deklaratsiya uchun bitta satr
+RefTaskParent=Ref. Ota-onalarning vazifasi
+ProfitIsCalculatedWith=Foyda yordamida hisoblanadi
+AddPersonToTask=Vazifalarga qo'shimcha ravishda qo'shing
+UsageOrganizeEvent=Foydalanish: tadbirlarni tashkil etish
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Barcha vazifalar bajarilgandan so'ng loyihani yopiq deb tasniflang (100%% taraqqiyoti)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Izoh: 100%% da barcha vazifalar mavjud loyihalar ta'sir qilmaydi: ularni qo'lda yopishingiz kerak bo'ladi. Ushbu parametr faqat ochiq loyihalarga ta'sir qiladi.
+SelectLinesOfTimeSpentToInvoice=Hisob-kitob qilinmagan sarflangan vaqtni tanlang, so'ngra hisob-kitob qilish uchun "Hisob-fakturani yaratish" ommaviy harakati
diff --git a/htdocs/langs/uz_UZ/propal.lang b/htdocs/langs/uz_UZ/propal.lang
index 12c6f691d68..3af849ea661 100644
--- a/htdocs/langs/uz_UZ/propal.lang
+++ b/htdocs/langs/uz_UZ/propal.lang
@@ -5,7 +5,7 @@ ProposalShort=Taklif
 ProposalsDraft=Tijorat takliflari loyihasi
 ProposalsOpened=Tijorat takliflarini oching
 CommercialProposal=Tijorat taklifi
-PdfCommercialProposalTitle=Commercial proposal
+PdfCommercialProposalTitle=Tijorat taklifi
 ProposalCard=Taklif kartasi
 NewProp=Yangi tijorat taklifi
 NewPropal=Yangi taklif
@@ -33,7 +33,7 @@ PropalStatusSigned=Imzolangan (hisob-kitob kerak)
 PropalStatusNotSigned=Imzo qo'yilmagan (yopiq)
 PropalStatusBilled=Hisob-kitob
 PropalStatusDraftShort=Qoralama
-PropalStatusValidatedShort=Validated (open)
+PropalStatusValidatedShort=Tasdiqlangan (ochiq)
 PropalStatusClosedShort=Yopiq
 PropalStatusSignedShort=Imzolangan
 PropalStatusNotSignedShort=Imzo qo'yilmagan
@@ -59,11 +59,11 @@ ConfirmClonePropal=<b> %s </b> tijorat taklifini klonlamoqchimisiz?
 ConfirmReOpenProp=<b> %s </b> tijorat taklifini ochmoqchi ekanligingizga aminmisiz?
 ProposalsAndProposalsLines=Tijorat takliflari va yo'nalishlari
 ProposalLine=Taklif liniyasi
-ProposalLines=Proposal lines
+ProposalLines=Taklif satrlari
 AvailabilityPeriod=Mavjudligini kechiktirish
 SetAvailability=Mavjudligini kechiktirishni o'rnating
 AfterOrder=buyurtmadan keyin
-OtherProposals=Other proposals
+OtherProposals=Boshqa takliflar
 ##### Availability #####
 AvailabilityTypeAV_NOW=Darhol
 AvailabilityTypeAV_1W=1 hafta
@@ -74,19 +74,19 @@ AvailabilityTypeAV_1M=1 oy
 TypeContact_propal_internal_SALESREPFOLL=Vakilning keyingi taklifi
 TypeContact_propal_external_BILLING=Mijozlarning hisob-fakturasi bilan aloqa qilish
 TypeContact_propal_external_CUSTOMER=Keyingi taklif bilan mijozlar bilan bog'lanish
-TypeContact_propal_external_SHIPPING=Customer contact for delivery
+TypeContact_propal_external_SHIPPING=Yetkazib berish uchun mijozlar bilan bog'lanish
 # Document models
 DocModelAzurDescription=Taklifning to'liq modeli (Cyan shablonining eski tatbiqi)
-DocModelCyanDescription=A complete proposal model
+DocModelCyanDescription=To'liq taklif modeli
 DefaultModelPropalCreate=Standart model yaratish
 DefaultModelPropalToBill=Tijorat taklifini yopish paytida standart shablon (hisob-faktura)
 DefaultModelPropalClosed=Tijorat taklifini yopish paytida standart shablon (taqdim etilmagan)
 ProposalCustomerSignature=Yozma qabul, kompaniya muhri, sanasi va imzosi
 ProposalsStatisticsSuppliers=Sotuvchi takliflari statistikasi
-CaseFollowedBy=Case followed by
-SignedOnly=Signed only
-IdProposal=Proposal ID
-IdProduct=Product ID
-PrParentLine=Proposal Parent Line
-LineBuyPriceHT=Buy Price Amount net of tax for line
+CaseFollowedBy=Keyingi ish
+SignedOnly=Faqat imzolangan
+IdProposal=Taklif identifikatori
+IdProduct=Mahsulot identifikatori
+PrParentLine=Ota-onalar qatori
+LineBuyPriceHT=Sotib olish narxlari qatori uchun soliqni olib tashlagan holda
 
diff --git a/htdocs/langs/uz_UZ/receiptprinter.lang b/htdocs/langs/uz_UZ/receiptprinter.lang
index 2b9e1367331..b328df42d5b 100644
--- a/htdocs/langs/uz_UZ/receiptprinter.lang
+++ b/htdocs/langs/uz_UZ/receiptprinter.lang
@@ -15,12 +15,12 @@ CONNECTOR_DUMMY=Dummy printer
 CONNECTOR_NETWORK_PRINT=Tarmoq printeri
 CONNECTOR_FILE_PRINT=Mahalliy printer
 CONNECTOR_WINDOWS_PRINT=Mahalliy Windows printeri
-CONNECTOR_CUPS_PRINT=Cups Printer
+CONNECTOR_CUPS_PRINT=Kubok printeri
 CONNECTOR_DUMMY_HELP=Sinov uchun soxta printer, hech narsa qilmaydi
 CONNECTOR_NETWORK_PRINT_HELP=10.x.x.x: 9100
 CONNECTOR_FILE_PRINT_HELP=/ dev / usb / lp0, / dev / usb / lp1
 CONNECTOR_WINDOWS_PRINT_HELP=LPT1, COM1, smb: // FooUser: secret @ computername / workgroup / Qabul qilish printeri
-CONNECTOR_CUPS_PRINT_HELP=CUPS printer name, example: HPRT_TP805L
+CONNECTOR_CUPS_PRINT_HELP=CUPS printer nomi, masalan: HPRT_TP805L
 PROFILE_DEFAULT=Standart profil
 PROFILE_SIMPLE=Oddiy profil
 PROFILE_EPOSTEP=Epos Tep profili
@@ -31,7 +31,7 @@ PROFILE_SIMPLE_HELP=Grafika yo'q oddiy profil
 PROFILE_EPOSTEP_HELP=Epos Tep profili
 PROFILE_P822D_HELP=P822D profili Grafika yo'q
 PROFILE_STAR_HELP=Yulduzli profil
-DOL_LINE_FEED=Skip line
+DOL_LINE_FEED=Chiziqni o‘tkazib yuborish
 DOL_ALIGN_LEFT=Matnni chapga tekislang
 DOL_ALIGN_CENTER=Markaziy matn
 DOL_ALIGN_RIGHT=Matnni o'ngga tekislang
@@ -45,38 +45,38 @@ DOL_CUT_PAPER_PARTIAL=Chiptani qisman kesib oling
 DOL_OPEN_DRAWER=Ochiq kassa
 DOL_ACTIVATE_BUZZER=Zilni yoqing
 DOL_PRINT_QRCODE=QR kodini chop eting
-DOL_PRINT_LOGO=Print logo of my company
-DOL_PRINT_LOGO_OLD=Print logo of my company (old printers)
-DOL_BOLD=Bold
-DOL_BOLD_DISABLED=Disable bold
-DOL_DOUBLE_HEIGHT=Double height size
-DOL_DOUBLE_WIDTH=Double width size
-DOL_DEFAULT_HEIGHT_WIDTH=Default height and width size
-DOL_UNDERLINE=Enable underline
-DOL_UNDERLINE_DISABLED=Disable underline
-DOL_BEEP=Beep sound
-DOL_PRINT_TEXT=Print text
-DateInvoiceWithTime=Invoice date and time
-YearInvoice=Invoice year
-DOL_VALUE_MONTH_LETTERS=Invoice month in letters
-DOL_VALUE_MONTH=Invoice month
-DOL_VALUE_DAY=Invoice day
-DOL_VALUE_DAY_LETTERS=Inovice day in letters
-DOL_LINE_FEED_REVERSE=Line feed reverse
-InvoiceID=Invoice ID
-InvoiceRef=Invoice ref
-DOL_PRINT_OBJECT_LINES=Invoice lines
-DOL_VALUE_CUSTOMER_FIRSTNAME=Customer first name
-DOL_VALUE_CUSTOMER_LASTNAME=Customer last name
-DOL_VALUE_CUSTOMER_MAIL=Customer mail
-DOL_VALUE_CUSTOMER_PHONE=Customer phone
-DOL_VALUE_CUSTOMER_MOBILE=Customer mobile
-DOL_VALUE_CUSTOMER_SKYPE=Customer Skype
-DOL_VALUE_CUSTOMER_TAX_NUMBER=Customer tax number
-DOL_VALUE_CUSTOMER_ACCOUNT_BALANCE=Customer account balance
-DOL_VALUE_MYSOC_NAME=Your company name
-VendorLastname=Vendor last name
-VendorFirstname=Vendor first name
-VendorEmail=Vendor email
-DOL_VALUE_CUSTOMER_POINTS=Customer points
-DOL_VALUE_OBJECT_POINTS=Object points
+DOL_PRINT_LOGO=Kompaniyamning logotipini chop eting
+DOL_PRINT_LOGO_OLD=Kompaniyamning logotipini chop etish (eski printerlar)
+DOL_BOLD=Qalin
+DOL_BOLD_DISABLED=Qalin harfni o'chirib qo'ying
+DOL_DOUBLE_HEIGHT=Ikki baravar balandlik
+DOL_DOUBLE_WIDTH=Ikki baravar kenglik
+DOL_DEFAULT_HEIGHT_WIDTH=Standart balandlik va kenglik o'lchami
+DOL_UNDERLINE=Chiziqni yoqish
+DOL_UNDERLINE_DISABLED=Chiziqni o‘chirish
+DOL_BEEP=Ovozli signal
+DOL_PRINT_TEXT=Matnni chop etish
+DateInvoiceWithTime=Hisob-fakturaning sanasi va vaqti
+YearInvoice=Hisob-faktura yili
+DOL_VALUE_MONTH_LETTERS=Hisob-faktura oyi harflar bilan
+DOL_VALUE_MONTH=Hisob-faktura oyi
+DOL_VALUE_DAY=Hisob-faktura kuni
+DOL_VALUE_DAY_LETTERS=Inovice kuni xatlarda
+DOL_LINE_FEED_REVERSE=Qatorli uzatma teskari
+InvoiceID=Hisob-faktura identifikatori
+InvoiceRef=Hisob-faktura
+DOL_PRINT_OBJECT_LINES=Hisob-faktura satrlari
+DOL_VALUE_CUSTOMER_FIRSTNAME=Mijozning ismi
+DOL_VALUE_CUSTOMER_LASTNAME=Mijozning familiyasi
+DOL_VALUE_CUSTOMER_MAIL=Mijozlar pochtasi
+DOL_VALUE_CUSTOMER_PHONE=Mijoz telefoni
+DOL_VALUE_CUSTOMER_MOBILE=Mijoz mobil
+DOL_VALUE_CUSTOMER_SKYPE=Mijozlar Skype
+DOL_VALUE_CUSTOMER_TAX_NUMBER=Mijozlarning soliq raqami
+DOL_VALUE_CUSTOMER_ACCOUNT_BALANCE=Mijozlar hisobidagi qoldiq
+DOL_VALUE_MYSOC_NAME=Sizning kompaniyangiz nomi
+VendorLastname=Sotuvchi familiyasi
+VendorFirstname=Sotuvchining nomi
+VendorEmail=Sotuvchi elektron pochta
+DOL_VALUE_CUSTOMER_POINTS=Mijozlar ochkolari
+DOL_VALUE_OBJECT_POINTS=Ob'ekt nuqtalari
diff --git a/htdocs/langs/uz_UZ/receptions.lang b/htdocs/langs/uz_UZ/receptions.lang
index 338602e722e..9cdcd708342 100644
--- a/htdocs/langs/uz_UZ/receptions.lang
+++ b/htdocs/langs/uz_UZ/receptions.lang
@@ -1,47 +1,47 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=Product Reception setup
-RefReception=Ref. reception
-Reception=Reception
-Receptions=Receptions
-AllReceptions=All Receptions
-Reception=Reception
-Receptions=Receptions
-ShowReception=Show Receptions
-ReceptionsArea=Receptions area
-ListOfReceptions=List of receptions
-ReceptionMethod=Reception method
-LastReceptions=Latest %s receptions
-StatisticsOfReceptions=Statistics for receptions
-NbOfReceptions=Number of receptions
-NumberOfReceptionsByMonth=Number of receptions by month
-ReceptionCard=Reception card
-NewReception=New reception
-CreateReception=Create reception
-QtyInOtherReceptions=Qty in other receptions
-OtherReceptionsForSameOrder=Other receptions for this order
-ReceptionsAndReceivingForSameOrder=Receptions and receipts for this order
-ReceptionsToValidate=Receptions to validate
-StatusReceptionCanceled=Canceled
-StatusReceptionDraft=Draft
-StatusReceptionValidated=Validated (products to ship or already shipped)
-StatusReceptionProcessed=Processed
-StatusReceptionDraftShort=Draft
-StatusReceptionValidatedShort=Validated
-StatusReceptionProcessedShort=Processed
-ReceptionSheet=Reception sheet
-ConfirmDeleteReception=Are you sure you want to delete this reception?
-ConfirmValidateReception=Are you sure you want to validate this reception with reference <b>%s</b>?
-ConfirmCancelReception=Are you sure you want to cancel this reception?
-StatsOnReceptionsOnlyValidated=Statistics conducted on receptions only validated. Date used is date of validation of reception (planed delivery date is not always known).
-SendReceptionByEMail=Send reception by email
-SendReceptionRef=Submission of reception %s
-ActionsOnReception=Events on reception
-ReceptionCreationIsDoneFromOrder=For the moment, creation of a new reception is done from the order card.
-ReceptionLine=Reception line
-ProductQtyInReceptionAlreadySent=Product quantity from open sales order already sent
-ProductQtyInSuppliersReceptionAlreadyRecevied=Product quantity from open supplier order already received
-ValidateOrderFirstBeforeReception=You must first validate the order before being able to make receptions.
-ReceptionsNumberingModules=Numbering module for receptions
-ReceptionsReceiptModel=Document templates for receptions
-NoMorePredefinedProductToDispatch=No more predefined products to dispatch
-ReceptionExist=A reception exists
+ReceptionsSetup=Mahsulotni qabul qilishni sozlash
+RefReception=Ref. ziyofat
+Reception=Qabul qilish
+Receptions=Qabullar
+AllReceptions=Barcha qabullar
+Reception=Qabul qilish
+Receptions=Qabullar
+ShowReception=Qabullarni ko'rsatish
+ReceptionsArea=Qabullar maydoni
+ListOfReceptions=Qabullar ro'yxati
+ReceptionMethod=Qabul qilish usuli
+LastReceptions=Oxirgi %s qabulxonalari
+StatisticsOfReceptions=Qabul qilish uchun statistika
+NbOfReceptions=Qabullar soni
+NumberOfReceptionsByMonth=Oylar bo'yicha qabullar soni
+ReceptionCard=Qabul qilish kartasi
+NewReception=Yangi qabulxona
+CreateReception=Qabulxona yaratish
+QtyInOtherReceptions=Boshqa qabulxonalarda soni
+OtherReceptionsForSameOrder=Ushbu buyurtma bo'yicha boshqa qabulxonalar
+ReceptionsAndReceivingForSameOrder=Ushbu buyurtma uchun qabul va tushum
+ReceptionsToValidate=Tasdiqlash uchun qabullar
+StatusReceptionCanceled=Bekor qilindi
+StatusReceptionDraft=Qoralama
+StatusReceptionValidated=Tasdiqlangan (jo'natiladigan yoki allaqachon jo'natilgan mahsulotlar)
+StatusReceptionProcessed=Qayta ishlangan
+StatusReceptionDraftShort=Qoralama
+StatusReceptionValidatedShort=Tasdiqlangan
+StatusReceptionProcessedShort=Qayta ishlangan
+ReceptionSheet=Qabul qilish varaqasi
+ConfirmDeleteReception=Ushbu qabulxonani o'chirishni xohlaysizmi?
+ConfirmValidateReception=Ushbu qabulxonani <b> %s </b> ma'lumotnomasi bilan tasdiqlamoqchimisiz?
+ConfirmCancelReception=Haqiqatan ham ushbu ziyofatni bekor qilmoqchimisiz?
+StatsOnReceptionsOnlyValidated=Qabullarda o'tkazilgan statistika faqat tasdiqlangan. Amaldagi sana - qabul qilishning tasdiqlangan sanasi (etkazib berishning rejalashtirilgan sanasi har doim ham ma'lum emas).
+SendReceptionByEMail=Qabulni elektron pochta orqali yuboring
+SendReceptionRef=Qabulni yuborish %s
+ActionsOnReception=Qabul qilish tadbirlari
+ReceptionCreationIsDoneFromOrder=Hozirda yangi qabulxonani yaratish buyurtma kartasidan amalga oshiriladi.
+ReceptionLine=Qabul qilish liniyasi
+ProductQtyInReceptionAlreadySent=Ochiq savdo buyurtmasidan mahsulot miqdori allaqachon yuborilgan
+ProductQtyInSuppliersReceptionAlreadyRecevied=Ochiq etkazib beruvchilar buyurtmasidan olingan mahsulot miqdori allaqachon qabul qilingan
+ValidateOrderFirstBeforeReception=Qabul qilishdan oldin avval buyurtmani tasdiqlashingiz kerak.
+ReceptionsNumberingModules=Qabul qilish uchun raqamlash moduli
+ReceptionsReceiptModel=Qabul qilish uchun hujjat shablonlari
+NoMorePredefinedProductToDispatch=Yuborish uchun oldindan belgilangan mahsulotlar yo'q
+ReceptionExist=Qabulxona mavjud
diff --git a/htdocs/langs/uz_UZ/recruitment.lang b/htdocs/langs/uz_UZ/recruitment.lang
index 6b0e8117254..dd3c47f2a26 100644
--- a/htdocs/langs/uz_UZ/recruitment.lang
+++ b/htdocs/langs/uz_UZ/recruitment.lang
@@ -18,59 +18,59 @@
 #
 
 # Module label 'ModuleRecruitmentName'
-ModuleRecruitmentName = Recruitment
+ModuleRecruitmentName = Ishga qabul qilish
 # Module description 'ModuleRecruitmentDesc'
-ModuleRecruitmentDesc = Manage and follow recruitment campaigns for new job positions
+ModuleRecruitmentDesc = Yangi ish joylariga ishga qabul qilish kampaniyalarini boshqaring va kuzatib boring
 
 #
 # Admin page
 #
-RecruitmentSetup = Recruitment setup
-Settings = Settings
-RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
-RecruitmentArea=Recruitement area
-PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
-EnablePublicRecruitmentPages=Enable public pages of open jobs
+RecruitmentSetup = Ishga qabul qilishni sozlash
+Settings = Sozlamalar
+RecruitmentSetupPage = Ishga qabul qilish moduli uchun asosiy variantlarni sozlashni kiriting
+RecruitmentArea=Ishga qabul qilish maydoni
+PublicInterfaceRecruitmentDesc=Ishlarning ochiq sahifalari - bu ochiq ish joylarini ko'rsatish va ularga javob berish uchun ochiq URL manzillar. Har bir ochiq ish uchun har bir ish yozuvida bir xil havola mavjud.
+EnablePublicRecruitmentPages=Ochiq ish joylarining ommaviy sahifalarini yoqing
 
 #
 # About page
 #
-About = About
-RecruitmentAbout = About Recruitment
-RecruitmentAboutPage = Recruitment about page
-NbOfEmployeesExpected=Expected nb of employees
-JobLabel=Label of job position
-WorkPlace=Work place
-DateExpected=Expected date
-FutureManager=Future manager
-ResponsibleOfRecruitement=Responsible of recruitment
-IfJobIsLocatedAtAPartner=If job is located at a partner place
-PositionToBeFilled=Job position
-PositionsToBeFilled=Job positions
-ListOfPositionsToBeFilled=List of job positions
-NewPositionToBeFilled=New job positions
+About = Haqida
+RecruitmentAbout = Ishga qabul qilish to'g'risida
+RecruitmentAboutPage = Sahifa haqida yollash
+NbOfEmployeesExpected=Kutilayotgan ishchilar soni
+JobLabel=Ish joyining yorlig'i
+WorkPlace=Ish joyi
+DateExpected=Kutilayotgan sana
+FutureManager=Kelajak menejeri
+ResponsibleOfRecruitement=Ishga qabul qilish uchun mas'uldir
+IfJobIsLocatedAtAPartner=Agar ish sherik joyda joylashgan bo'lsa
+PositionToBeFilled=Ish joyi
+PositionsToBeFilled=Ish joylari
+ListOfPositionsToBeFilled=Ish joylari ro'yxati
+NewPositionToBeFilled=Yangi ish joylari
 
-JobOfferToBeFilled=Job position to be filled
-ThisIsInformationOnJobPosition=Information of the job position to be filled
-ContactForRecruitment=Contact for recruitment
-EmailRecruiter=Email recruiter
-ToUseAGenericEmail=To use a generic email. If not defined, the email of the responsible of recruitment will be used
-NewCandidature=New application
-ListOfCandidatures=List of applications
-RequestedRemuneration=Requested remuneration
-ProposedRemuneration=Proposed remuneration
-ContractProposed=Contract proposed
-ContractSigned=Contract signed
-ContractRefused=Contract refused
-RecruitmentCandidature=Application
-JobPositions=Job positions
-RecruitmentCandidatures=Applications
-InterviewToDo=Interview to do
-AnswerCandidature=Application answer
-YourCandidature=Your application
-YourCandidatureAnswerMessage=Thanks you for your application.<br>...
-JobClosedTextCandidateFound=The job position is closed. The position has been filled.
-JobClosedTextCanceled=The job position is closed.
-ExtrafieldsJobPosition=Complementary attributes (job positions)
-ExtrafieldsApplication=Complementary attributes (job applications)
-MakeOffer=Make an offer
+JobOfferToBeFilled=To'ldirilishi kerak bo'lgan ish joyi
+ThisIsInformationOnJobPosition=To'ldirilishi kerak bo'lgan lavozim to'g'risida ma'lumot
+ContactForRecruitment=Ishga qabul qilish uchun murojaat qiling
+EmailRecruiter=Elektron pochta orqali yollovchi
+ToUseAGenericEmail=Umumiy elektron pochtadan foydalanish uchun. Agar aniqlanmagan bo'lsa, ishga qabul qilish uchun mas'ul bo'lgan elektron pochtadan foydalaniladi
+NewCandidature=Yangi dastur
+ListOfCandidatures=Arizalar ro'yxati
+RequestedRemuneration=Talab qilingan to'lov
+ProposedRemuneration=Taklif qilingan ish haqi
+ContractProposed=Shartnoma taklif qilingan
+ContractSigned=Shartnoma imzolandi
+ContractRefused=Shartnoma rad etildi
+RecruitmentCandidature=Ilova
+JobPositions=Ish joylari
+RecruitmentCandidatures=Ilovalar
+InterviewToDo=Intervyu qilish kerak
+AnswerCandidature=Ariza javobi
+YourCandidature=Sizning arizangiz
+YourCandidatureAnswerMessage=Arizangiz uchun tashakkur. <br> ...
+JobClosedTextCandidateFound=Ish joyi yopiq. Lavozim to'ldirildi.
+JobClosedTextCanceled=Ish joyi yopiq.
+ExtrafieldsJobPosition=Qo'shimcha xususiyatlar (ish joylari)
+ExtrafieldsApplication=Qo'shimcha atributlar (ish uchun arizalar)
+MakeOffer=Taklif qiling
diff --git a/htdocs/langs/uz_UZ/resource.lang b/htdocs/langs/uz_UZ/resource.lang
index b74c921472e..802c5fc9a5d 100644
--- a/htdocs/langs/uz_UZ/resource.lang
+++ b/htdocs/langs/uz_UZ/resource.lang
@@ -5,7 +5,7 @@ DeleteResource=Resursni o'chirish
 ConfirmDeleteResourceElement=Ushbu element uchun manbani o'chirishni tasdiqlang
 NoResourceInDatabase=Ma'lumotlar bazasida manba yo'q.
 NoResourceLinked=Hech qanday manbaga ulanmagan
-ActionsOnResource=Events about this resource
+ActionsOnResource=Ushbu manbaga oid tadbirlar
 ResourcePageIndex=Resurslar ro'yxati
 ResourceSingular=Manba
 ResourceCard=Resurs kartasi
@@ -30,10 +30,10 @@ DictionaryResourceType=Resurslar turi
 
 SelectResource=Resursni tanlang
 
-IdResource=Id resource
-AssetNumber=Serial number
-ResourceTypeCode=Resource type code
-ImportDataset_resource_1=Resources
+IdResource=Id resursi
+AssetNumber=Ishlab chiqarish raqami
+ResourceTypeCode=Resurs turi kodi
+ImportDataset_resource_1=Resurslar
 
-ErrorResourcesAlreadyInUse=Some resources are in use
-ErrorResourceUseInEvent=%s used in %s event
+ErrorResourcesAlreadyInUse=Ba'zi manbalardan foydalanilmoqda
+ErrorResourceUseInEvent=%s tadbirida ishlatiladigan %s
diff --git a/htdocs/langs/uz_UZ/salaries.lang b/htdocs/langs/uz_UZ/salaries.lang
index 57f46f48e75..5307e820557 100644
--- a/htdocs/langs/uz_UZ/salaries.lang
+++ b/htdocs/langs/uz_UZ/salaries.lang
@@ -1,24 +1,24 @@
 # Dolibarr language file - Source file is en_US - salaries
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Foydalanuvchi uchinchi shaxslar uchun foydalaniladigan buxgalteriya hisobi
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=Foydalanuvchi kartasida belgilangan buxgalteriya hisobi faqat Subledger buxgalteriyasi uchun ishlatiladi. Ushbu foydalanuvchi Bosh daftar uchun va Subledger buxgalteriyasining standart qiymati sifatida foydalanuvchida maxsus foydalanuvchi hisob qaydnomasi aniqlanmagan taqdirda foydalaniladi.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Ish haqi to'lovlari bo'yicha sukut bo'yicha buxgalteriya hisobi
-CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=By default, leave empty the option "Automatically create a total payment" when creating a Salary
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=Odatiy bo'lib, Ish haqini yaratishda "Umumiy to'lovni avtomatik ravishda yaratish" parametrini bo'sh qoldiring
 Salary=Ish haqi
 Salaries=Ish haqi
-NewSalary=New salary
+NewSalary=Yangi ish haqi
 NewSalaryPayment=Yangi ish haqi kartasi
-AddSalaryPayment=Add salary payment
+AddSalaryPayment=Ish haqini to'lashni qo'shing
 SalaryPayment=Ish haqi to'lash
 SalariesPayments=Ish haqi bo'yicha to'lovlar
-SalariesPaymentsOf=Salaries payments of %s
+SalariesPaymentsOf=%s ish haqi to'lovlari
 ShowSalaryPayment=Ish haqini to'lashni ko'rsating
 THM=O'rtacha soatlik stavka
 TJM=O'rtacha kunlik stavka
 CurrentSalary=Amaldagi ish haqi
 THMDescription=Ushbu qiymat, agar modul loyihasi ishlatilgan bo'lsa, foydalanuvchilar tomonidan kiritilgan loyihaga sarf qilingan vaqt xarajatlarini hisoblash uchun ishlatilishi mumkin
 TJMDescription=Ushbu qiymat hozircha faqat ma'lumot uchun mo'ljallangan va hisoblash uchun ishlatilmaydi
-LastSalaries=Latest %s salary payments
-AllSalaries=All salary payments
-SalariesStatistics=Salary statistics
-# Export
-SalariesAndPayments=Salaries and payments
+LastSalaries=Oxirgi %s ish haqi
+AllSalaries=Barcha ish haqi
+SalariesStatistics=Ish haqi statistikasi
+SalariesAndPayments=Ish haqi va to'lovlar
+ConfirmDeleteSalaryPayment=Ushbu ish haqi to'lovini o'chirmoqchimisiz?
diff --git a/htdocs/langs/uz_UZ/sendings.lang b/htdocs/langs/uz_UZ/sendings.lang
index fb3344d921e..cc5684f0730 100644
--- a/htdocs/langs/uz_UZ/sendings.lang
+++ b/htdocs/langs/uz_UZ/sendings.lang
@@ -18,19 +18,19 @@ SendingCard=Jo'natma kartasi
 NewSending=Yangi yuk
 CreateShipment=Yuklarni yarating
 QtyShipped=Miqdor jo'natildi
-QtyShippedShort=Qty ship.
+QtyShippedShort=Miqdor kema.
 QtyPreparedOrShipped=Miqdor tayyorlangan yoki jo'natilgan
 QtyToShip=Yetkazib berish uchun miqdor
-QtyToReceive=Qty to receive
+QtyToReceive=Qabul qilish uchun miqdor
 QtyReceived=Miqdor olingan
 QtyInOtherShipments=Miqdor boshqa jo'natmalarda
 KeepToShip=Yuk tashishda qoling
-KeepToShipShort=Remain
+KeepToShipShort=Qolmoq
 OtherSendingsForSameOrder=Ushbu buyurtma uchun boshqa jo'natmalar
 SendingsAndReceivingForSameOrder=Ushbu buyurtma uchun jo'natmalar va kvitansiyalar
 SendingsToValidate=Tasdiqlash uchun jo'natmalar
 StatusSendingCanceled=Bekor qilindi
-StatusSendingCanceledShort=Canceled
+StatusSendingCanceledShort=Bekor qilindi
 StatusSendingDraft=Qoralama
 StatusSendingValidated=Tasdiqlangan (jo'natiladigan yoki allaqachon jo'natilgan mahsulotlar)
 StatusSendingProcessed=Qayta ishlangan
@@ -48,7 +48,7 @@ DateDeliveryPlanned=Rejalashtirilgan etkazib berish sanasi
 RefDeliveryReceipt=Yetkazib berish kvitansiyasi
 StatusReceipt=Vaziyatni etkazib berish kvitansiyasi
 DateReceived=Qabul qilingan sana qabul qilindi
-ClassifyReception=Classify reception
+ClassifyReception=Qabul qilishni tasniflang
 SendShippingByEMail=Yukni elektron pochta orqali yuboring
 SendShippingRef=%s jo'natmasini yuborish
 ActionsOnShipping=Yuk tashish bo'yicha tadbirlar
@@ -66,7 +66,7 @@ ValidateOrderFirstBeforeShipment=Yuklarni jo'natishdan oldin avval buyurtmani ta
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=Yetkazib berish kvitansiyalari uchun to'liq hujjat modeli (logotip ...)
-DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
+DocumentModelStorm=Yetkazib berish kvitansiyalari va ekstraditsiyalarning muvofiqligi uchun to'liqroq hujjat modeli (logotip ...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Doimiy EXPEDITION_ADDON_NUMBER aniqlanmagan
 SumOfProductVolumes=Mahsulot hajmi
 SumOfProductWeights=Mahsulot og'irliklari yig'indisi
diff --git a/htdocs/langs/uz_UZ/sms.lang b/htdocs/langs/uz_UZ/sms.lang
index 49229886551..84b2e40cf5d 100644
--- a/htdocs/langs/uz_UZ/sms.lang
+++ b/htdocs/langs/uz_UZ/sms.lang
@@ -48,4 +48,4 @@ SmsInfoNumero= (xalqaro format, ya'ni: +33899701761)
 DelayBeforeSending=Yuborishdan oldin kechikish (daqiqa)
 SmsNoPossibleSenderFound=Yuboruvchi topilmadi. SMS-provayderingiz sozlamalarini tekshiring.
 SmsNoPossibleRecipientFound=Maqsad mavjud emas. SMS-provayderingiz sozlamalarini tekshiring.
-DisableStopIfSupported=Disable STOP message (if supported)
+DisableStopIfSupported=STOP xabarini o'chirib qo'ying (agar qo'llab-quvvatlansa)
diff --git a/htdocs/langs/uz_UZ/stocks.lang b/htdocs/langs/uz_UZ/stocks.lang
index 1b6b7ba760d..be37586c73a 100644
--- a/htdocs/langs/uz_UZ/stocks.lang
+++ b/htdocs/langs/uz_UZ/stocks.lang
@@ -8,19 +8,19 @@ WarehouseEdit=Omborni o'zgartirish
 MenuNewWarehouse=Yangi ombor
 WarehouseSource=Manba ombori
 WarehouseSourceNotDefined=Hech qanday ombor aniqlanmagan,
-AddWarehouse=Create warehouse
+AddWarehouse=Ombor yaratish
 AddOne=Bittasini qo'shing
-DefaultWarehouse=Default warehouse
+DefaultWarehouse=Standart ombor
 WarehouseTarget=Maqsadli ombor
 ValidateSending=Yuborishni o'chirish
 CancelSending=Yuborishni bekor qilish
 DeleteSending=Yuborishni o'chirish
 Stock=Aksiya
 Stocks=Qimmatli qog'ozlar
-MissingStocks=Missing stocks
-StockAtDate=Stocks at date
-StockAtDateInPast=Date in the past
-StockAtDateInFuture=Date in the future
+MissingStocks=Yo'qolgan aktsiyalar
+StockAtDate=Sana bo'yicha aktsiyalar
+StockAtDateInPast=O'tmishdagi sana
+StockAtDateInFuture=Kelajakdagi sana
 StocksByLotSerial=Qurilma / seriya bo'yicha aktsiyalar
 LotSerial=Ko'p / seriyalar
 LotSerialList=Lot / seriyalar ro'yxati
@@ -28,14 +28,14 @@ Movements=Harakatlar
 ErrorWarehouseRefRequired=Omborga mos yozuvlar nomi talab qilinadi
 ListOfWarehouses=Omborlar ro'yxati
 ListOfStockMovements=Birja harakatlari ro'yxati
-ListOfInventories=List of inventories
-MovementId=Movement ID
-StockMovementForId=Movement ID %d
-ListMouvementStockProject=List of stock movements associated to project
+ListOfInventories=Zaxiralarning ro'yxati
+MovementId=Harakat identifikatori
+StockMovementForId=Harakat identifikatori %d
+ListMouvementStockProject=Loyiha bilan bog'liq bo'lgan aktsiyalar harakati ro'yxati
 StocksArea=Omborlar maydoni
-AllWarehouses=All warehouses
-IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
-IncludeAlsoDraftOrders=Include also draft orders
+AllWarehouses=Barcha omborlar
+IncludeEmptyDesiredStock=Belgilanmagan kerakli aktsiyalar bilan salbiy zaxiralarni ham qo'shing
+IncludeAlsoDraftOrders=Shuningdek, buyurtmalar loyihasini ham qo'shing
 Location=Manzil
 LocationSummary=Joylashuvning qisqacha nomi
 NumberOfDifferentProducts=Noyob mahsulotlar soni
@@ -45,9 +45,9 @@ LastMovements=Oxirgi harakatlar
 Units=Birlik
 Unit=Birlik
 StockCorrection=Qimmatli qog'ozlarni tuzatish
-CorrectStock=Correct stock
+CorrectStock=To'g'ri aktsiyalar
 StockTransfer=Qimmatli qog'ozlarni o'tkazish
-TransferStock=Transfer stock
+TransferStock=O'tkazma zaxiralari
 MassStockTransferShort=Ommaviy aktsiyalarni o'tkazish
 StockMovement=Birja harakati
 StockMovements=Birja harakatlari
@@ -59,14 +59,14 @@ EnhancedValue=Qiymat
 EnhancedValueOfWarehouses=Omborlarning qiymati
 UserWarehouseAutoCreate=Foydalanuvchini yaratishda avtomatik ravishda foydalanuvchi omborini yarating
 AllowAddLimitStockByWarehouse=Shuningdek, har bir mahsulot uchun minimal va kerakli zaxira qiymatidan tashqari, har bir juftlik uchun minimal va kerakli stok qiymatini (mahsulot ombori) boshqaring
-RuleForWarehouse=Rule for warehouses
-WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
-WarehouseAskWarehouseDuringPropal=Set a warehouse on Commercial proposals
-WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
-UserDefaultWarehouse=Set a warehouse on Users
-MainDefaultWarehouse=Default warehouse
-MainDefaultWarehouseUser=Use a default warehouse for each user
-MainDefaultWarehouseUserDesc=By activating this option, during creation of a product, the warehouse assigned to the product will be defined on this one. If no warehouse is defined on the user, the default warehouse is defined.
+RuleForWarehouse=Omborlar uchun qoida
+WarehouseAskWarehouseOnThirparty=Uchinchi shaxslarga omborni o'rnating
+WarehouseAskWarehouseDuringPropal=Tijorat takliflari bo'yicha omborni o'rnating
+WarehouseAskWarehouseDuringOrder=Sotish buyurtmalariga binoan omborni o'rnating
+UserDefaultWarehouse=Foydalanuvchilarga omborni o'rnating
+MainDefaultWarehouse=Standart ombor
+MainDefaultWarehouseUser=Har bir foydalanuvchi uchun odatiy ombordan foydalaning
+MainDefaultWarehouseUserDesc=Ushbu parametrni faollashtirgan holda, mahsulotni yaratish paytida mahsulot uchun mo'ljallangan ombor aniqlanadi. Agar foydalanuvchida ombor aniqlanmagan bo'lsa, standart ombor aniqlanadi.
 IndependantSubProductStock=Mahsulot zaxiralari va subproduct zaxiralari mustaqil
 QtyDispatched=Miqdor yuborildi
 QtyDispatchedShort=Miqdor jo'natildi
@@ -81,31 +81,31 @@ DeStockOnShipmentOnClosing=Yuk tashish yopiq bo'lsa, haqiqiy zaxiralarni kamayti
 ReStockOnBill=Sotuvchi fakturasini / kredit yozuvini tasdiqlash bo'yicha real zaxiralarni ko'paytiring
 ReStockOnValidateOrder=Xarid buyurtmalarini tasdiqlash bo'yicha haqiqiy zaxiralarni ko'paytiring
 ReStockOnDispatchOrder=Tovarlarni sotib olish buyurtmasi olinganidan keyin omborga qo'lda jo'natish uchun real zaxiralarni ko'paytiring
-StockOnReception=Increase real stocks on validation of reception
-StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
+StockOnReception=Qabul qilishni tasdiqlash bo'yicha haqiqiy zaxiralarni ko'paytiring
+StockOnReceptionOnClosing=Qabul qilish yopiq bo'lsa, haqiqiy zaxiralarni ko'paytiring
 OrderStatusNotReadyToDispatch=Buyurtma hali omborlarda mahsulotlarni jo'natishga imkon beradigan maqomga ega emas yoki yo'q.
 StockDiffPhysicTeoric=Jismoniy va virtual zaxiralar o'rtasidagi farqni tushuntirish
 NoPredefinedProductToDispatch=Ushbu ob'ekt uchun oldindan belgilangan mahsulotlar yo'q. Shuning uchun stokda dispetcherlik talab qilinmaydi.
 DispatchVerb=Jo'natish
 StockLimitShort=Ogohlantirish chegarasi
 StockLimit=Ogohlantirish uchun stok cheklovi
-StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
+StockLimitDesc=(bo'sh) ogohlantirish yo'q degan ma'noni anglatadi. <br> 0 zaxira bo'sh bo'lishi bilanoq ogohlantirishni boshlash uchun ishlatilishi mumkin.
 PhysicalStock=Jismoniy aktsiyalar
 RealStock=Haqiqiy aktsiya
-RealStockDesc=Physical/real stock is the stock currently in the warehouses.
-RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
+RealStockDesc=Jismoniy / haqiqiy zaxira - bu omborlarda mavjud bo'lgan zaxira.
+RealStockWillAutomaticallyWhen=Haqiqiy zaxira ushbu qoidaga muvofiq o'zgartiriladi (Stok modulida belgilanganidek):
 VirtualStock=Virtual zaxira
-VirtualStockAtDate=Virtual stock at date
-VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen date will be finished
-VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
-AtDate=At date
+VirtualStockAtDate=Bugungi kunda virtual zaxira
+VirtualStockAtDateDesc=Tanlangan sanadan oldin qayta ishlashni rejalashtirgan barcha kutilayotgan buyurtmalar tugagandan so'ng, virtual zaxiralar
+VirtualStockDesc=Virtual aktsiya - bu barcha ochiq / kutilayotgan harakatlar (aktsiyalarga ta'sir ko'rsatadigan) yopilgandan so'ng mavjud bo'lgan hisoblangan zaxira (sotib olish buyurtmalari kelib tushdi, sotish buyurtmalari jo'natildi, ishlab chiqarish buyurtmalari ishlab chiqarildi va hk).
+AtDate=Hozirgi kunda
 IdWarehouse=Idish ombori
 DescWareHouse=Tavsif ombori
 LieuWareHouse=Mahalliylashtirish ombori
 WarehousesAndProducts=Omborlar va mahsulotlar
 WarehousesAndProductsBatchDetail=Omborlar va mahsulotlar (lot / seriya bo'yicha batafsil ma'lumot bilan)
 AverageUnitPricePMPShort=O'rtacha narx
-AverageUnitPricePMPDesc=The input average unit price we had to expense to get 1 unit of product into our stock.
+AverageUnitPricePMPDesc=Bizning mahsulotimizga 1 dona mahsulotni kiritish uchun sarflangan o'rtacha birlik narxi.
 SellPriceMin=Sotish birligi narxi
 EstimatedStockValueSellShort=Sotish uchun qiymati
 EstimatedStockValueSell=Sotish uchun qiymati
@@ -124,8 +124,8 @@ StockToBuy=Buyurtma qilish
 Replenishment=To'ldirish
 ReplenishmentOrders=To'ldirish buyurtmalari
 VirtualDiffersFromPhysical=Aksiyalarning ko'payishi / kamayishi bo'yicha jismoniy aktsiyalar va virtual aktsiyalar (jismoniy aktsiyalar + ochiq buyurtmalar) farq qilishi mumkin
-UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
-ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
+UseRealStockByDefault=To'ldirish xususiyati uchun virtual aktsiyalar o'rniga haqiqiy aktsiyalardan foydalaning
+ReplenishmentCalculation=Buyurtma miqdori (kerakli miqdor - virtual zaxira) o'rniga (kerakli miqdor - haqiqiy zaxira) bo'ladi
 UseVirtualStock=Virtual zaxiradan foydalaning
 UsePhysicalStock=Jismoniy zaxiradan foydalaning
 CurentSelectionMode=Joriy tanlov rejimi
@@ -134,12 +134,12 @@ CurentlyUsingPhysicalStock=Jismoniy zaxiralar
 RuleForStockReplenishment=Qimmatli qog'ozlarni to'ldirish qoidasi
 SelectProductWithNotNullQty=Miqdor null bo'lmagan va sotuvchisi bo'lgan kamida bitta mahsulotni tanlang
 AlertOnly= Faqat ogohlantirishlar
-IncludeProductWithUndefinedAlerts = Include also negative stock for products with no desired quantity defined, to restore them to 0
+IncludeProductWithUndefinedAlerts = Istalgan miqdori aniqlanmagan mahsulotlar uchun salbiy zaxiralarni ham qo'shing, ularni 0 ga qaytaring
 WarehouseForStockDecrease=<b> %s </b> ombori zaxiralarni kamaytirish uchun ishlatiladi
 WarehouseForStockIncrease=<b> %s </b> ombori zaxiralarni ko'paytirish uchun ishlatiladi
 ForThisWarehouse=Ushbu ombor uchun
 ReplenishmentStatusDesc=Bu kerakli zaxiradan past bo'lgan (yoki "faqat ogohlantirish" katagiga belgi qo'yilgan bo'lsa, ogohlantirish qiymatidan past bo'lgan) barcha mahsulotlarning ro'yxati. Belgilash katagidan foydalanib, siz farqni to'ldirish uchun sotib olish buyurtmalarini yaratishingiz mumkin.
-ReplenishmentStatusDescPerWarehouse=If you want a replenishment based on desired quantity defined per warehouse, you must add a filter on the warehouse.
+ReplenishmentStatusDescPerWarehouse=Agar siz ombor uchun kerakli miqdordagi miqdor bo'yicha to'ldirishni xohlasangiz, omborga filtr qo'shishingiz kerak.
 ReplenishmentOrdersDesc=Bu oldindan belgilangan mahsulotlarni o'z ichiga olgan barcha ochiq sotib olish buyurtmalarining ro'yxati. Bu erda faqat oldindan belgilangan mahsulotlarga ega bo'lgan ochiq buyurtmalar, shu sababli aktsiyalarga ta'sir qilishi mumkin bo'lgan buyurtmalar ko'rinadi.
 Replenishments=To'ldirish
 NbOfProductBeforePeriod=%s mahsulotining tanlangan muddatgacha zaxiradagi miqdori (<%s)
@@ -154,21 +154,21 @@ StockMustBeEnoughForInvoice=Hisob-fakturaga mahsulot / xizmatni qo'shish uchun b
 StockMustBeEnoughForOrder=Qimmatbaho qog'ozlar darajasi buyurtma berish uchun mahsulot / xizmatni qo'shish uchun etarli bo'lishi kerak (tekshirish avtomatik ravishda o'zgartirish qoidalari qanday bo'lishidan qat'i nazar, qatorni qo'shganda joriy real zaxirada amalga oshiriladi)
 StockMustBeEnoughForShipment= Qimmatbaho qog'ozlar darajasi mahsulotni / xizmatni jo'natishga qo'shish uchun etarli bo'lishi kerak (tekshirish avtomatik ravishda o'zgarishi uchun qanday qoidaga rioya qilinsa, etkazib berishga chiziq qo'shilganda joriy real zaxirada tekshiriladi)
 MovementLabel=Harakat yorlig'i
-TypeMovement=Direction of movement
-DateMovement=Date of movement
+TypeMovement=Harakat yo'nalishi
+DateMovement=Harakat sanasi
 InventoryCode=Harakat yoki inventarizatsiya kodi
 IsInPackage=Paket ichida mavjud
 WarehouseAllowNegativeTransfer=Qimmatli qog'ozlar salbiy bo'lishi mumkin
 qtyToTranferIsNotEnough=Sizda manba omboridan etarli miqdordagi zaxira yo'q va sizning sozlamangiz salbiy zaxiralarga yo'l qo'ymaydi.
-qtyToTranferLotIsNotEnough=You don't have enough stock, for this lot number, from your source warehouse and your setup does not allow negative stocks (Qty for product '%s' with lot '%s' is %s in warehouse '%s').
+qtyToTranferLotIsNotEnough=Sizda ushbu zaxira ombori uchun etarli miqdordagi zaxira yo'q va sizning sozlamangiz salbiy zaxiralarga yo'l qo'ymaydi ("%s" lot bilan "%s" mahsuloti uchun miqdori "%s" omborida %s ').
 ShowWarehouse=Omborni ko'rsatish
 MovementCorrectStock=%s mahsuloti uchun aktsiyalarni tuzatish
 MovementTransferStock=%s mahsulotini boshqa omborga zaxirada o'tkazish
 InventoryCodeShort=Inv. / Mov. kod
 NoPendingReceptionOnSupplierOrder=Ochiq sotib olish buyurtmasi tufayli kutish kutilmagan
 ThisSerialAlreadyExistWithDifferentDate=Bu ko'p / seriya raqami (<strong> %s </strong>) allaqachon mavjud, lekin har xil eatby yoki sellby sana (<strong> %s </strong> topildi lekin siz <strong> %s </strong> kiriting).
-OpenAll=Barcha harakatlar uchun ochiq
-OpenInternal=Faqat ichki harakatlar uchun oching
+OpenAnyMovement=Ochiq (barcha harakatlar)
+OpenInternal=Ochiq (faqat ichki harakat)
 UseDispatchStatus=Xarid buyurtmalarini qabul qilishda mahsulot yo'nalishlari uchun jo'natish holatidan foydalaning (tasdiqlash / rad etish)
 OptionMULTIPRICESIsOn="Bir segment uchun bir nechta narxlar" opsiyasi yoqilgan. Bu shuni anglatadiki, mahsulot bir necha sotish narxiga ega, shuning uchun sotish qiymatini hisoblab bo'lmaydi
 ProductStockWarehouseCreated=Ogohlantirish uchun stok chegarasi va kerakli optimal stok to'g'ri yaratilgan
@@ -176,83 +176,83 @@ ProductStockWarehouseUpdated=Ogohlantirish uchun kerakli limit va kerakli optima
 ProductStockWarehouseDeleted=Ogohlantirish uchun kerakli limit va kerakli optimal stok to'g'ri o'chirildi
 AddNewProductStockWarehouse=Ogohlantirish va kerakli optimal stok uchun yangi chegara o'rnating
 AddStockLocationLine=Miqdorni kamaytiring, so'ngra ushbu mahsulot uchun boshqa omborni qo'shish uchun bosing
-InventoryDate=Inventory date
-NewInventory=New inventory
-inventorySetup = Inventory Setup
-inventoryCreatePermission=Create new inventory
-inventoryReadPermission=View inventories
-inventoryWritePermission=Update inventories
-inventoryValidatePermission=Validate inventory
-inventoryDeletePermission=Delete inventory
-inventoryTitle=Inventory
-inventoryListTitle=Inventories
-inventoryListEmpty=No inventory in progress
-inventoryCreateDelete=Create/Delete inventory
-inventoryCreate=Create new
-inventoryEdit=Edit
-inventoryValidate=Validated
-inventoryDraft=Running
-inventorySelectWarehouse=Warehouse choice
+InventoryDate=Inventarizatsiya sanasi
+NewInventory=Yangi inventarizatsiya
+inventorySetup = Inventarizatsiyani sozlash
+inventoryCreatePermission=Yangi inventarizatsiya yarating
+inventoryReadPermission=Zaxiralarni ko'rish
+inventoryWritePermission=Zaxiralarni yangilang
+inventoryValidatePermission=Inventarizatsiyani tasdiqlash
+inventoryDeletePermission=Inventarizatsiyani o'chirish
+inventoryTitle=Inventarizatsiya
+inventoryListTitle=Zaxiralar
+inventoryListEmpty=Inventarizatsiya qilinmayapti
+inventoryCreateDelete=Inventarizatsiya yaratish / o'chirish
+inventoryCreate=Yangisini yarating
+inventoryEdit=Tahrirlash
+inventoryValidate=Tasdiqlangan
+inventoryDraft=Yugurish
+inventorySelectWarehouse=Omborni tanlash
 inventoryConfirmCreate=Create
-inventoryOfWarehouse=Inventory for warehouse: %s
-inventoryErrorQtyAdd=Error: one quantity is less than zero
-inventoryMvtStock=By inventory
-inventoryWarningProductAlreadyExists=This product is already into list
-SelectCategory=Category filter
-SelectFournisseur=Vendor filter
-inventoryOnDate=Inventory
-INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date of inventory (instead of the date of inventory validation)
-inventoryChangePMPPermission=Allow to change PMP value for a product
-ColumnNewPMP=New unit PMP
-OnlyProdsInStock=Do not add product without stock
-TheoricalQty=Theorique qty
-TheoricalValue=Theorique qty
-LastPA=Last BP
+inventoryOfWarehouse=Ombor uchun inventarizatsiya: %s
+inventoryErrorQtyAdd=Xato: bitta miqdor noldan kam
+inventoryMvtStock=Inventarizatsiya bo'yicha
+inventoryWarningProductAlreadyExists=Ushbu mahsulot allaqachon ro'yxatga kiritilgan
+SelectCategory=Turkum filtri
+SelectFournisseur=Sotuvchi filtri
+inventoryOnDate=Inventarizatsiya
+INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Qimmatli qog'ozlar harakati inventarizatsiya sanasiga ega bo'ladi (inventarizatsiya tasdiqlangan sana o'rniga)
+inventoryChangePMPPermission=Mahsulot uchun PMP qiymatini o'zgartirishga ruxsat bering
+ColumnNewPMP=Yangi birlik PMP
+OnlyProdsInStock=Mahsulotni zaxirasiz qo'shmang
+TheoricalQty=Nazariy son
+TheoricalValue=Nazariy son
+LastPA=Oxirgi BP
 CurrentPA=Curent BP
-RecordedQty=Recorded Qty
-RealQty=Real Qty
-RealValue=Real Value
-RegulatedQty=Regulated Qty
-AddInventoryProduct=Add product to inventory
-AddProduct=Add
-ApplyPMP=Apply PMP
-FlushInventory=Flush inventory
-ConfirmFlushInventory=Do you confirm this action?
-InventoryFlushed=Inventory flushed
-ExitEditMode=Exit edition
-inventoryDeleteLine=Delete line
-RegulateStock=Regulate Stock
-ListInventory=List
-StockSupportServices=Stock management supports Services
-StockSupportServicesDesc=By default, you can stock only products of type "product". You may also stock a product of type "service" if both module Services and this option are enabled.
-ReceiveProducts=Receive items
-StockIncreaseAfterCorrectTransfer=Increase by correction/transfer
-StockDecreaseAfterCorrectTransfer=Decrease by correction/transfer
-StockIncrease=Stock increase
-StockDecrease=Stock decrease
-InventoryForASpecificWarehouse=Inventory for a specific warehouse
-InventoryForASpecificProduct=Inventory for a specific product
-StockIsRequiredToChooseWhichLotToUse=Stock is required to choose which lot to use
-ForceTo=Force to
-AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (Warning: This may decrease dramatically performances)
-StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
-StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
-CurrentStock=Current stock
-InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Fill real qty by scaning
-UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|serial barcode)
-DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
-ImportFromCSV=Import CSV list of movement
-ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
-SelectAStockMovementFileToImport=select a stock movement file to import
-InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
-LabelOfInventoryMovemement=Inventory %s
-ReOpen=Reopen
-ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock to the real qty you entered into the inventory.
-ObjectNotFound=%s not found
-MakeMovementsAndClose=Generate movements and close
-AutofillWithExpected=Fill real quantity with expected quantity
-ShowAllBatchByDefault=By default, show batch details on product "stock" tab
-CollapseBatchDetailHelp=You can set batch detail default display in stocks module configuration
-FieldCannotBeNegative=Field "%s" cannot be negative
+RecordedQty=Yozilgan Miqdor
+RealQty=Haqiqiy miqdor
+RealValue=Haqiqiy qiymat
+RegulatedQty=Tartibga solinadigan miqdor
+AddInventoryProduct=Mahsulotni inventarizatsiyaga qo'shing
+AddProduct=Qo'shish
+ApplyPMP=PMP-ni qo'llang
+FlushInventory=Tozalash moslamalari
+ConfirmFlushInventory=Siz ushbu amalni tasdiqlaysizmi?
+InventoryFlushed=Inventarizatsiya qizarib ketdi
+ExitEditMode=Nashrdan chiqish
+inventoryDeleteLine=Chiziqni o'chirish
+RegulateStock=Qimmatli qog'ozlarni tartibga solish
+ListInventory=Ro'yxat
+StockSupportServices=Aktsiyalarni boshqarish xizmatlarni qo'llab-quvvatlaydi
+StockSupportServicesDesc=Odatiy bo'lib, siz faqat "mahsulot" turidagi mahsulotlarni to'ldirishingiz mumkin. Ikkala modul xizmatlari va ushbu parametr yoqilgan bo'lsa, siz "xizmat" turidagi mahsulotni sotib olishingiz mumkin.
+ReceiveProducts=Ob'ektlarni qabul qiling
+StockIncreaseAfterCorrectTransfer=Tuzatish / o'tkazish yo'li bilan oshirish
+StockDecreaseAfterCorrectTransfer=Tuzatish / o'tkazish yo'li bilan kamaytiring
+StockIncrease=Qimmatli qog'ozlarning ko'payishi
+StockDecrease=Qimmatli qog'ozlar kamayadi
+InventoryForASpecificWarehouse=Muayyan ombor uchun inventarizatsiya
+InventoryForASpecificProduct=Muayyan mahsulot uchun inventarizatsiya
+StockIsRequiredToChooseWhichLotToUse=Qaysi lotdan foydalanishni tanlash uchun stok talab qilinadi
+ForceTo=Majburlash
+AlwaysShowFullArbo=Qalqib chiqadigan omborxonada to'liq ombor daraxtini ko'rsating (Ogohlantirish: Bu ko'rsatkichlar keskin pasayishi mumkin)
+StockAtDatePastDesc=Siz bu erda o'tmishda berilgan sanada aktsiyalarni (haqiqiy aktsiyalar) ko'rishingiz mumkin
+StockAtDateFutureDesc=Kelajakda ushbu sanada aktsiyalarni (virtual aktsiyalar) ma'lum bir sanada ko'rishingiz mumkin
+CurrentStock=Joriy aktsiyalar
+InventoryRealQtyHelp=<br> miqdorini qayta tiklash uchun 0 qiymatini o'rnating
+UpdateByScaning=Haqiqiy sonni skanerlash bilan to'ldiring
+UpdateByScaningProductBarcode=Skanerlash orqali yangilash (mahsulot shtrix-kodi)
+UpdateByScaningLot=Skanerlash orqali yangilash (lot | ketma-ket shtrix-kod)
+DisableStockChangeOfSubProduct=Ushbu harakat paytida ushbu to'plamning barcha subproductlari uchun birja o'zgarishini o'chirib qo'ying.
+ImportFromCSV=CSV harakatlar ro'yxatini import qilish
+ChooseFileToImport=Faylni yuklang, so'ngra faylni manba import fayli sifatida tanlash uchun %s belgisini bosing ...
+SelectAStockMovementFileToImport=import qilish uchun aktsiyalar harakati faylini tanlang
+InfoTemplateImport=Yuklangan fayl quyidagi formatga ega bo'lishi kerak (* majburiy maydonlar): <br> Manba ombori * | Maqsadli ombor * * Mahsulot * | Miqdor * | Lot / seriya raqami <br> CSV belgilarni ajratuvchi "<b> %s </b>" bo'lishi kerak
+LabelOfInventoryMovemement=Inventarizatsiya %s
+ReOpen=Qayta oching
+ConfirmFinish=Inventarizatsiya yopilishini tasdiqlaysizmi? Bu sizning zaxirangizni inventarizatsiyaga kiritgan haqiqiy miqdordagi yangilash uchun barcha aktsiyalar harakatlarini keltirib chiqaradi.
+ObjectNotFound=%s topilmadi
+MakeMovementsAndClose=Harakatlarni yarating va yoping
+AutofillWithExpected=Haqiqiy miqdorni kutilgan miqdor bilan to'ldiring
+ShowAllBatchByDefault=Odatiy bo'lib, mahsulot "stok" yorlig'ida partiyaning tafsilotlarini ko'rsating
+CollapseBatchDetailHelp=Qimmatbaho qog'ozlar moduli konfiguratsiyasida partiyaning tafsilotlari bo'yicha standart displeyni o'rnatishingiz mumkin
+FieldCannotBeNegative="%s" maydoni salbiy bo'lishi mumkin emas
diff --git a/htdocs/langs/uz_UZ/stripe.lang b/htdocs/langs/uz_UZ/stripe.lang
index 844762040af..95a3ce10828 100644
--- a/htdocs/langs/uz_UZ/stripe.lang
+++ b/htdocs/langs/uz_UZ/stripe.lang
@@ -1,72 +1,71 @@
 # Dolibarr language file - Source file is en_US - stripe
-StripeSetup=Stripe module setup
-StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make ad-hoc payments or for payments related to 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
-WelcomeOnPaymentPage=Welcome to our online payment service
-ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
-ThisIsInformationOnPayment=This is information on payment to do
-ToComplete=To complete
-YourEMail=Email to receive payment confirmation
-STRIPE_PAYONLINE_SENDEMAIL=Email notification after a payment attempt (success or fail)
-Creditor=Creditor
-PaymentCode=Payment code
-StripeDoPayment=Pay with Stripe
-YouWillBeRedirectedOnStripe=You will be redirected on secured Stripe page to input you credit card information
-Continue=Next
-ToOfferALinkForOnlinePayment=URL for %s payment
-ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment page for a sales order
-ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment page for a customer invoice
-ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment page for a contract line
-ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment page of any amount with no existing object
-ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment page for a member subscription
-ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment page for payment of a donation
-YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (mandatory only for payment not linked to an object) to add your own payment comment tag.<br>For the URL of payments with no existing object, you may also add the parameter <strong>&noidempotency=1</strong> so the same link with same tag can be used several times (some payment mode may limit the payment to 1 for each different link without this parameter)
-SetupStripeToHavePaymentCreatedAutomatically=Setup your Stripe with url <b>%s</b> to have payment created automatically when validated by Stripe.
-AccountParameter=Account parameters
-UsageParameter=Usage parameters
-InformationToFindParameters=Help to find your %s account information
-STRIPE_CGI_URL_V2=Url of Stripe CGI module for payment
-VendorName=Name of vendor
-CSSUrlForPaymentForm=CSS style sheet url for payment form
-NewStripePaymentReceived=New Stripe payment received
-NewStripePaymentFailed=New Stripe payment tried but failed
-FailedToChargeCard=Failed to charge card
-STRIPE_TEST_SECRET_KEY=Secret test key
-STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
-STRIPE_TEST_WEBHOOK_KEY=Webhook test key
-STRIPE_LIVE_SECRET_KEY=Secret live key
-STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
-STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
-ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
-StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
-StripeImportPayment=Import Stripe payments
-ExampleOfTestCreditCard=Example of credit card for test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
-StripeGateways=Stripe gateways
-OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
-OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
-BankAccountForBankTransfer=Bank account for fund payouts
-StripeAccount=Stripe account
-StripeChargeList=List of Stripe charges
-StripeTransactionList=List of Stripe transactions
-StripeCustomerId=Stripe customer id
-StripePaymentModes=Stripe payment modes
-LocalID=Local ID
+StripeSetup=Stripe modulini sozlash
+StripeDesc=<a href="http://www.stripe.com" target="_blank"> Stripe </a> orqali mijozlarga kredit / cebit kartalar bilan to'lovlarni amalga oshirish uchun Stripe onlayn to'lov sahifasini taklif eting. Bu sizning mijozlaringizga vaqtinchalik to'lovlarni amalga oshirishda yoki ma'lum bir Dolibarr ob'ekti bilan bog'liq to'lovlarda (faktura, buyurtma, ...) ruxsat berish uchun ishlatilishi mumkin.
+StripeOrCBDoPayment=Kredit karta yoki Stripe orqali to'lash
+FollowingUrlAreAvailableToMakePayments=Dolibarr ob'ektlarida to'lovni amalga oshirish uchun xaridorga sahifani taklif qilish uchun quyidagi URL manzillar mavjud
+PaymentForm=To'lov shakli
+WelcomeOnPaymentPage=Onlayn to'lov xizmatimizga xush kelibsiz
+ThisScreenAllowsYouToPay=Ushbu ekran sizga %s raqamiga onlayn to'lovni amalga oshirishga imkon beradi.
+ThisIsInformationOnPayment=Bu to'lash to'g'risida ma'lumot
+ToComplete=Tugatish uchun
+YourEMail=To'lovni tasdiqlash uchun elektron pochta xabarini yuboring
+STRIPE_PAYONLINE_SENDEMAIL=To'lov amalga oshirilgandan so'ng elektron pochta xabarnomasi (muvaffaqiyatli yoki muvaffaqiyatsiz)
+Creditor=Kreditor
+PaymentCode=To'lov kodi
+StripeDoPayment=Stripe bilan to‘lang
+YouWillBeRedirectedOnStripe=Siz kredit karta ma'lumotlarini kiritish uchun xavfsiz Stripe sahifasida yo'naltirilasiz
+Continue=Keyingi
+ToOfferALinkForOnlinePayment=%s to'lovi uchun URL
+ToOfferALinkForOnlinePaymentOnOrder=Savdo buyurtmasi uchun %s onlayn to'lov sahifasini taqdim etish uchun URL
+ToOfferALinkForOnlinePaymentOnInvoice=Mijozlarning hisob-fakturasi uchun %s onlayn to'lov sahifasini taqdim etish uchun URL
+ToOfferALinkForOnlinePaymentOnContractLine=Shartnoma liniyasi uchun %s onlayn to'lov sahifasini taqdim etish uchun URL
+ToOfferALinkForOnlinePaymentOnFreeAmount=Mavjud ob'ekti bo'lmagan har qanday miqdordagi %s onlayn to'lov sahifasini taqdim etish uchun URL
+ToOfferALinkForOnlinePaymentOnMemberSubscription=Ro'yxatdan obuna uchun %s onlayn to'lov sahifasini taqdim etish uchun URL
+ToOfferALinkForOnlinePaymentOnDonation=Xayr-ehson to'lash uchun %s onlayn to'lov sahifasini taqdim etadigan URL
+YouCanAddTagOnUrl=O'zingizning to'lov izoh yorlig'ingizni qo'shish uchun url parametrini <b> & tag = <i> </i> </b> URL-ni qo'shishingiz mumkin (faqat ob'ekt bilan bog'lanmagan to'lov uchun majburiy). <br> Mavjud ob'ekti bo'lmagan to'lovlar URL manzili uchun siz <strong> & noidempotency = 1 </strong> parametrini qo'shishingiz mumkin, shuning uchun bir xil teg bilan bir xil havoladan bir necha marta foydalanish mumkin (ba'zi to'lov rejimi har bir boshqa havola uchun to'lovni 1 ga cheklashi mumkin) parametr)
+SetupStripeToHavePaymentCreatedAutomatically=Stripe-ni url bilan sozlang <b> %s </b> Stripe tomonidan tasdiqlanganda to'lov avtomatik ravishda yaratiladi.
+AccountParameter=Hisob parametrlari
+UsageParameter=Foydalanish parametrlari
+InformationToFindParameters=%s hisob qaydnomangiz ma'lumotlarini topishga yordam bering
+STRIPE_CGI_URL_V2=To'lov uchun Url of Stripe CGI moduli
+CSSUrlForPaymentForm=To'lov shakli uchun CSS uslublar varag'i url
+NewStripePaymentReceived=Yangi Stripe to'lovi qabul qilindi
+NewStripePaymentFailed=Yangi Stripe to'lovi amalga oshirildi, ammo muvaffaqiyatsiz tugadi
+FailedToChargeCard=Kartadan zaryad olinmadi
+STRIPE_TEST_SECRET_KEY=Yashirin sinov kaliti
+STRIPE_TEST_PUBLISHABLE_KEY=Nashr etiladigan test kaliti
+STRIPE_TEST_WEBHOOK_KEY=Webhook sinov kaliti
+STRIPE_LIVE_SECRET_KEY=Yashirin kalit
+STRIPE_LIVE_PUBLISHABLE_KEY=Nashr qilinadigan jonli kalit
+STRIPE_LIVE_WEBHOOK_KEY=Webhook jonli kaliti
+ONLINE_PAYMENT_WAREHOUSE=Onlayn to'lov amalga oshirilganda aktsiyalarni pasaytirish uchun foydalaniladigan zaxiralar
+StripeLiveEnabled=Stripe jonli yoqilgan (aks holda sinov / sandbox rejimi)
+StripeImportPayment=Stripe to'lovlarini import qilish
+ExampleOfTestCreditCard=Sinov uchun kredit karta misoli: %s => valid, %s => error CVC, %s => muddati o'tgan, %s => zaryad ishlamayapti
+StripeGateways=Stripe shlyuzlari
+OAUTH_STRIPE_TEST_ID=Stripe Connect mijoz identifikatori (taxminan _...)
+OAUTH_STRIPE_LIVE_ID=Stripe Connect mijoz identifikatori (taxminan _...)
+BankAccountForBankTransfer=Jamg'arma to'lovlari uchun bank hisobvarag'i
+StripeAccount=Stripe hisob qaydnomasi
+StripeChargeList=Stripe to'lovlari ro'yxati
+StripeTransactionList=Stripe operatsiyalari ro'yxati
+StripeCustomerId=Stripe mijoz identifikatori
+StripePaymentModes=Stripe to'lov rejimlari
+LocalID=Mahalliy identifikator
 StripeID=Stripe ID
-NameOnCard=Name on card
-CardNumber=Card Number
-ExpiryDate=Expiry Date
+NameOnCard=kartadagi nom
+CardNumber=Karta raqami
+ExpiryDate=Quyidagi sanagacha foydalanilsin
 CVN=CVN
-DeleteACard=Delete Card
-ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
-CreateCustomerOnStripe=Create customer on Stripe
-CreateCardOnStripe=Create card on Stripe
-ShowInStripe=Show in Stripe
-StripeUserAccountForActions=User account to use for email notification of some Stripe events (Stripe payouts)
-StripePayoutList=List of Stripe payouts
-ToOfferALinkForTestWebhook=Link to setup Stripe WebHook to call the IPN (test mode)
-ToOfferALinkForLiveWebhook=Link to setup Stripe WebHook to call the IPN (live mode)
-PaymentWillBeRecordedForNextPeriod=Payment will be recorded for the next period.
-ClickHereToTryAgain=<a href="%s">Click here to try again...</a>
-CreationOfPaymentModeMustBeDoneFromStripeInterface=Due to Strong Customer Authentication rules, creation of a card must be done from Stripe backoffice. You can click here to switch on Stripe customer record: %s
+DeleteACard=Kartani o'chirish
+ConfirmDeleteCard=Ushbu Kredit yoki Debet kartani o'chirishni xohlaysizmi?
+CreateCustomerOnStripe=Stripe-da mijoz yarating
+CreateCardOnStripe=Stripe-da karta yarating
+ShowInStripe=Stripe-da ko'rsatish
+StripeUserAccountForActions=Stripe voqealari (Stripe to'lovlari) haqida elektron pochta orqali xabar berish uchun foydalanuvchi hisob qaydnomasi
+StripePayoutList=Stripe to'lovlari ro'yxati
+ToOfferALinkForTestWebhook=IPH-ga qo'ng'iroq qilish uchun Stripe WebHook-ni o'rnatish uchun havola (sinov rejimi)
+ToOfferALinkForLiveWebhook=IPH-ga qo'ng'iroq qilish uchun Stripe WebHook-ni sozlash uchun havola (jonli rejim)
+PaymentWillBeRecordedForNextPeriod=To'lov keyingi davr uchun qayd etiladi.
+ClickHereToTryAgain= <a href="%s"> Qayta urinish uchun shu erni bosing ... </a>
+CreationOfPaymentModeMustBeDoneFromStripeInterface=Mijozlarni kuchli autentifikatsiya qilish qoidalari tufayli kartani yaratish Stripe backoffice-da amalga oshirilishi kerak. Stripe mijozlar yozuvini yoqish uchun bu erni bosishingiz mumkin: %s
diff --git a/htdocs/langs/uz_UZ/supplier_proposal.lang b/htdocs/langs/uz_UZ/supplier_proposal.lang
index 76e2dea549e..a3798afd3b0 100644
--- a/htdocs/langs/uz_UZ/supplier_proposal.lang
+++ b/htdocs/langs/uz_UZ/supplier_proposal.lang
@@ -13,7 +13,7 @@ SupplierProposalArea=Sotuvchi takliflari maydoni
 SupplierProposalShort=Sotuvchi taklifi
 SupplierProposals=Sotuvchi takliflari
 SupplierProposalsShort=Sotuvchi takliflari
-AskPrice=Price request
+AskPrice=Narx so'rovi
 NewAskPrice=Yangi narx bo'yicha so'rov
 ShowSupplierProposal=Narx so'rovini ko'rsatish
 AddSupplierProposal=Narx so'rovini yarating
@@ -47,12 +47,12 @@ CommercialAsk=Narx so'rovi
 DefaultModelSupplierProposalCreate=Standart model yaratish
 DefaultModelSupplierProposalToBill=Narx so'rovini yopishda standart shablon (qabul qilinadi)
 DefaultModelSupplierProposalClosed=Narx so'rovini yopishda standart shablon (rad etilgan)
-ListOfSupplierProposals=List of vendor proposal requests
+ListOfSupplierProposals=Sotuvchiga takliflar so'rovlari ro'yxati
 ListSupplierProposalsAssociatedProject=Loyiha bilan bog'liq sotuvchilar takliflari ro'yxati
 SupplierProposalsToClose=Yopish uchun sotuvchilarning takliflari
 SupplierProposalsToProcess=Ishlab chiqaruvchilarning takliflarini qayta ishlash
 LastSupplierProposals=%s narxlari bo'yicha so'nggi so'rovlar
 AllPriceRequests=Barcha so'rovlar
-TypeContact_supplier_proposal_external_SHIPPING=Vendor contact for delivery
-TypeContact_supplier_proposal_external_BILLING=Vendor contact for billing
-TypeContact_supplier_proposal_external_SERVICE=Representative following-up proposal
+TypeContact_supplier_proposal_external_SHIPPING=Yetkazib berish uchun sotuvchiga murojaat qiling
+TypeContact_supplier_proposal_external_BILLING=Hisob-kitob qilish uchun sotuvchi bilan bog'lanish
+TypeContact_supplier_proposal_external_SERVICE=Vakilning keyingi taklifi
diff --git a/htdocs/langs/uz_UZ/suppliers.lang b/htdocs/langs/uz_UZ/suppliers.lang
index 47500b9b9b2..df1ef567d59 100644
--- a/htdocs/langs/uz_UZ/suppliers.lang
+++ b/htdocs/langs/uz_UZ/suppliers.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - vendors
 Suppliers=Sotuvchilar
 SuppliersInvoice=Sotuvchi hisob-fakturasi
-SupplierInvoices=Vendor invoices
+SupplierInvoices=Sotuvchi hisob-fakturalari
 ShowSupplierInvoice=Sotuvchi fakturasini ko'rsating
 NewSupplier=Yangi sotuvchi
 History=Tarix
@@ -15,7 +15,7 @@ TotalSellingPriceMinShort=Sotish narxlarining subproductlari jami
 SomeSubProductHaveNoPrices=Ba'zi bir kichik mahsulotlarda narx belgilanmagan
 AddSupplierPrice=Xarid qilish narxini qo'shing
 ChangeSupplierPrice=Xarid narxini o'zgartiring
-SupplierPrices=Vendor prices
+SupplierPrices=Sotuvchi narxlari
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Ushbu sotuvchi ma'lumotnomasi allaqachon mahsulot bilan bog'langan: %s
 NoRecordedSuppliers=Hech qanday sotuvchi yozilmagan
 SupplierPayment=Sotuvchining to'lovi
@@ -39,11 +39,11 @@ MenuOrdersSupplierToBill=Hisob-fakturaga buyurtma sotib oling
 NbDaysToDelivery=Yetkazib berishning kechikishi (kunlar)
 DescNbDaysToDelivery=Ushbu buyurtma bo'yicha mahsulotlarni etkazib berishning eng uzoq kechikishi
 SupplierReputation=Sotuvchining obro'si
-ReferenceReputation=Reference reputation
+ReferenceReputation=Yo'naltiruvchi obro'si
 DoNotOrderThisProductToThisSupplier=Buyurtma bermang
 NotTheGoodQualitySupplier=Past sifatli
 ReputationForThisProduct=Obro'-e'tibor
 BuyerName=Xaridor nomi
-AllProductServicePrices=All product / service prices
-AllProductReferencesOfSupplier=All references of vendor
-BuyingPriceNumShort=Vendor prices
+AllProductServicePrices=Barcha mahsulot / xizmat narxlari
+AllProductReferencesOfSupplier=Sotuvchining barcha ma'lumotnomalari
+BuyingPriceNumShort=Sotuvchi narxlari
diff --git a/htdocs/langs/uz_UZ/ticket.lang b/htdocs/langs/uz_UZ/ticket.lang
index 1da32a5a99e..44910075d82 100644
--- a/htdocs/langs/uz_UZ/ticket.lang
+++ b/htdocs/langs/uz_UZ/ticket.lang
@@ -18,299 +18,302 @@
 # Generic
 #
 
-Module56000Name=Tickets
-Module56000Desc=Ticket system for issue or request management
+Module56000Name=Chiptalar
+Module56000Desc=Chiqarish yoki so'rovlarni boshqarish uchun chiptalar tizimi
 
-Permission56001=See tickets
-Permission56002=Modify tickets
-Permission56003=Delete tickets
-Permission56004=Manage tickets
-Permission56005=See tickets of all third parties (not effective for external users, always be limited to the third party they depend on)
+Permission56001=Chiptalarni ko'ring
+Permission56002=Chiptalarni o'zgartirish
+Permission56003=Chiptalarni o'chirish
+Permission56004=Chiptalarni boshqarish
+Permission56005=Uchinchi tomonlarning chiptalarini ko'ring (tashqi foydalanuvchilar uchun samarali emas, har doim ular bog'liq bo'lgan uchinchi tomon bilan cheklaning)
 
-TicketDictType=Ticket - Types
-TicketDictCategory=Ticket - Groupes
-TicketDictSeverity=Ticket - Severities
-TicketDictResolution=Ticket - Resolution
+TicketDictType=Chipta - turlari
+TicketDictCategory=Chipta - guruhlar
+TicketDictSeverity=Chipta - jiddiyliklar
+TicketDictResolution=Chipta - Qaror
 
-TicketTypeShortCOM=Commercial question
-TicketTypeShortHELP=Request for functionnal help
-TicketTypeShortISSUE=Issue, bug or problem
-TicketTypeShortREQUEST=Change or enhancement request
-TicketTypeShortPROJET=Project
-TicketTypeShortOTHER=Other
+TicketTypeShortCOM=Tijorat savoli
+TicketTypeShortHELP=Funktsional yordam uchun so'rov
+TicketTypeShortISSUE=Muammo yoki xato
+TicketTypeShortPROBLEM=Muammo
+TicketTypeShortREQUEST=O'zgartirish yoki takomillashtirish bo'yicha so'rov
+TicketTypeShortPROJET=Loyiha
+TicketTypeShortOTHER=Boshqalar
 
-TicketSeverityShortLOW=Low
-TicketSeverityShortNORMAL=Normal
-TicketSeverityShortHIGH=High
-TicketSeverityShortBLOCKING=Critical, Blocking
+TicketSeverityShortLOW=Kam
+TicketSeverityShortNORMAL=Oddiy
+TicketSeverityShortHIGH=Yuqori
+TicketSeverityShortBLOCKING=Muhim, blokirovka qilish
 
-ErrorBadEmailAddress=Field '%s' incorrect
-MenuTicketMyAssign=My tickets
-MenuTicketMyAssignNonClosed=My open tickets
-MenuListNonClosed=Open tickets
+ErrorBadEmailAddress='%s' maydoni noto'g'ri
+MenuTicketMyAssign=Mening chiptalarim
+MenuTicketMyAssignNonClosed=Mening ochiq chiptalarim
+MenuListNonClosed=Ochiq chiptalar
 
-TypeContact_ticket_internal_CONTRIBUTOR=Contributor
-TypeContact_ticket_internal_SUPPORTTEC=Assigned user
-TypeContact_ticket_external_SUPPORTCLI=Customer contact / incident tracking
-TypeContact_ticket_external_CONTRIBUTOR=External contributor
+TypeContact_ticket_internal_CONTRIBUTOR=Xissador
+TypeContact_ticket_internal_SUPPORTTEC=Tayinlangan foydalanuvchi
+TypeContact_ticket_external_SUPPORTCLI=Mijozlar bilan aloqa / hodisalarni kuzatish
+TypeContact_ticket_external_CONTRIBUTOR=Tashqi yordamchi
 
-OriginEmail=Email source
-Notify_TICKET_SENTBYMAIL=Send ticket message by email
+OriginEmail=Reporter Email
+Notify_TICKET_SENTBYMAIL=Elektron pochta orqali chiptani yuboring
 
 # Status
-Read=Read
-Assigned=Assigned
-InProgress=In progress
-NeedMoreInformation=Waiting for information
-Answered=Answered
-Waiting=Waiting
-Closed=Closed
-Deleted=Deleted
+Read=O'qing
+Assigned=Tayinlangan
+InProgress=Jarayonda
+NeedMoreInformation=Muxbirlarning fikri kutilmoqda
+NeedMoreInformationShort=Fikr-mulohaza kutilmoqda
+Answered=Javob berdi
+Waiting=Kutish
+Closed=Yopiq
+Deleted=O'chirildi
 
 # Dict
-Type=Type
-Severity=Severity
-TicketGroupIsPublic=Group is public
-TicketGroupIsPublicDesc=If a ticket group is public, it will be visible in the form when creating a ticket from the public interface
+Type=Turi
+Severity=Jiddiylik
+TicketGroupIsPublic=Guruh hammaga ochiq
+TicketGroupIsPublicDesc=Agar chiptalar guruhi ommaviy bo'lsa, u umumiy interfeysdan chipta yaratishda shaklda ko'rinadi
 
 # Email templates
-MailToSendTicketMessage=To send email from ticket message
+MailToSendTicketMessage=Chipta xabaridan elektron pochta xabarini yuborish
 
 #
 # Admin page
 #
-TicketSetup=Ticket module setup
-TicketSettings=Settings
+TicketSetup=Chipta modulini sozlash
+TicketSettings=Sozlamalar
 TicketSetupPage=
-TicketPublicAccess=A public interface requiring no identification is available at the following url
-TicketSetupDictionaries=The type of ticket, severity and analytic codes are configurable from dictionaries
-TicketParamModule=Module variable setup
-TicketParamMail=Email setup
-TicketEmailNotificationFrom=Notification email from
-TicketEmailNotificationFromHelp=Used into ticket message answer by example
-TicketEmailNotificationTo=Notifications email to
-TicketEmailNotificationToHelp=Send email notifications to this address.
-TicketNewEmailBodyLabel=Text message sent after creating a ticket
-TicketNewEmailBodyHelp=The text specified here will be inserted into the email confirming the creation of a new ticket from the public interface. Information on the consultation of the ticket are automatically added.
-TicketParamPublicInterface=Public interface setup
-TicketsEmailMustExist=Require an existing email address to create a ticket
-TicketsEmailMustExistHelp=In the public interface, the email address should already be filled in the database to create a new ticket.
-PublicInterface=Public interface
-TicketUrlPublicInterfaceLabelAdmin=Alternative URL for public interface
-TicketUrlPublicInterfaceHelpAdmin=It is possible to define an alias to the web server and thus make available the public interface with another URL (the server must act as a proxy on this new URL)
-TicketPublicInterfaceTextHomeLabelAdmin=Welcome text of the public interface
-TicketPublicInterfaceTextHome=You can create a support ticket or view existing from its identifier tracking ticket.
-TicketPublicInterfaceTextHomeHelpAdmin=The text defined here will appear on the home page of the public interface.
-TicketPublicInterfaceTopicLabelAdmin=Interface title
-TicketPublicInterfaceTopicHelp=This text will appear as the title of the public interface.
-TicketPublicInterfaceTextHelpMessageLabelAdmin=Help text to the message entry
-TicketPublicInterfaceTextHelpMessageHelpAdmin=This text will appear above the message input area of the user.
-ExtraFieldsTicket=Extra attributes
-TicketCkEditorEmailNotActivated=HTML editor is not activated. Please put FCKEDITOR_ENABLE_MAIL content to 1 to get it.
-TicketsDisableEmail=Do not send emails for ticket creation or message recording
-TicketsDisableEmailHelp=By default, emails are sent when new tickets or messages created. Enable this option to disable *all* email notifications
-TicketsLogEnableEmail=Enable log by email
-TicketsLogEnableEmailHelp=At each change, an email will be sent **to each contact** associated with the ticket.
-TicketParams=Params
-TicketsShowModuleLogo=Display the logo of the module in the public interface
-TicketsShowModuleLogoHelp=Enable this option to hide the logo module in the pages of the public interface
-TicketsShowCompanyLogo=Display the logo of the company in the public interface
-TicketsShowCompanyLogoHelp=Enable this option to hide the logo of the main company in the pages of the public interface
-TicketsEmailAlsoSendToMainAddress=Also send a notification to the main email address
-TicketsEmailAlsoSendToMainAddressHelp=Enable this option to also send an email to the address defined into setup "%s" (see tab "%s")
-TicketsLimitViewAssignedOnly=Restrict the display to tickets assigned to the current user (not effective for external users, always be limited to the third party they depend on)
-TicketsLimitViewAssignedOnlyHelp=Only tickets assigned to the current user will be visible. Does not apply to a user with tickets management rights.
-TicketsActivatePublicInterface=Activate public interface
-TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create tickets.
-TicketsAutoAssignTicket=Automatically assign the user who created the ticket
-TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
-TicketNumberingModules=Tickets numbering module
-TicketsModelModule=Document templates for tickets
-TicketNotifyTiersAtCreation=Notify third party at creation
-TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
-TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is added to a ticket
-TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
-TicketPublicNotificationNewMessageDefaultEmail=Notifications email to (update)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Send an email to this address for each new message notifications if the ticket doesn't have a user assigned to it or if the user doesn't have any known email.
+TicketPublicAccess=Identifikatsiyani talab qilmaydigan umumiy interfeys quyidagi urlda mavjud
+TicketSetupDictionaries=Chipta turi, jiddiyligi va analitik kodlari lug'atlarda sozlanishi mumkin
+TicketParamModule=Modulning o'zgaruvchini sozlash
+TicketParamMail=Elektron pochtani sozlash
+TicketEmailNotificationFrom=Bildirishnoma elektron pochtasi
+TicketEmailNotificationFromHelp=Misol uchun chipta xabarining javobiga ishlatilgan
+TicketEmailNotificationTo=Bildirishnomalar elektron pochta manziliga
+TicketEmailNotificationToHelp=Ushbu manzilga elektron pochta xabarnomalarini yuboring.
+TicketNewEmailBodyLabel=Chipta yaratilgandan so'ng yuborilgan matnli xabar
+TicketNewEmailBodyHelp=Bu erda ko'rsatilgan matn ommaviy interfeysdan yangi chipta yaratilganligini tasdiqlovchi elektron pochtaga kiritiladi. Chipta maslahati to'g'risidagi ma'lumotlar avtomatik ravishda qo'shiladi.
+TicketParamPublicInterface=Umumiy interfeysni sozlash
+TicketsEmailMustExist=Chipta yaratish uchun mavjud elektron pochta manzilini talab qiling
+TicketsEmailMustExistHelp=Umumiy interfeysda elektron pochta manzili yangi chipta yaratish uchun ma'lumotlar bazasida to'ldirilgan bo'lishi kerak.
+PublicInterface=Ommaviy interfeys
+TicketUrlPublicInterfaceLabelAdmin=Umumiy interfeys uchun muqobil URL
+TicketUrlPublicInterfaceHelpAdmin=Veb-server uchun taxallusni aniqlash va shu bilan umumiy interfeysni boshqa URL bilan ta'minlash mumkin (server ushbu yangi URL-da proksi sifatida ishlashi kerak)
+TicketPublicInterfaceTextHomeLabelAdmin=Umumiy interfeysning xush kelibsiz matni
+TicketPublicInterfaceTextHome=Siz qo'llab-quvvatlash chiptasini yaratishingiz yoki uning identifikatorini kuzatish chiptasidan mavjud narsalarni ko'rishingiz mumkin.
+TicketPublicInterfaceTextHomeHelpAdmin=Bu erda belgilangan matn umumiy interfeysning asosiy sahifasida paydo bo'ladi.
+TicketPublicInterfaceTopicLabelAdmin=Interfeys nomi
+TicketPublicInterfaceTopicHelp=Ushbu matn umumiy interfeys nomi sifatida paydo bo'ladi.
+TicketPublicInterfaceTextHelpMessageLabelAdmin=Xabarni kiritish uchun matnga yordam bering
+TicketPublicInterfaceTextHelpMessageHelpAdmin=Ushbu matn foydalanuvchining xabarlarni kiritish maydonchasi ustida paydo bo'ladi.
+ExtraFieldsTicket=Qo'shimcha atributlar
+TicketCkEditorEmailNotActivated=HTML muharriri faollashtirilmagan. Iltimos, FCKEDITOR_ENABLE_MAIL tarkibini olish uchun uni 1 tagacha joylashtiring.
+TicketsDisableEmail=Chipta yaratish yoki xabar yozish uchun elektron pochta xabarlarini yubormang
+TicketsDisableEmailHelp=Odatiy bo'lib, elektron pochta xabarlari yangi chiptalar yoki xabarlar yaratilganda yuboriladi. * Barcha * elektron pochta xabarlarini o'chirib qo'yish uchun ushbu parametrni yoqing
+TicketsLogEnableEmail=Elektron pochta orqali jurnalni yoqish
+TicketsLogEnableEmailHelp=Har bir o'zgarganda, chiptaga aloqador ** har bir kontaktga ** elektron pochta orqali xabar yuboriladi.
+TicketParams=Paramlar
+TicketsShowModuleLogo=Modul logotipini umumiy interfeysda ko'rsatish
+TicketsShowModuleLogoHelp=Logotip modulini umumiy interfeys sahifalarida yashirish uchun ushbu parametrni yoqing
+TicketsShowCompanyLogo=Kompaniya logotipini ommaviy interfeysda namoyish eting
+TicketsShowCompanyLogoHelp=Asosiy kompaniyaning logotipini umumiy interfeys sahifalarida yashirish uchun ushbu parametrni yoqing
+TicketsEmailAlsoSendToMainAddress=Asosiy elektron pochta manziliga xabarnoma yuboring
+TicketsEmailAlsoSendToMainAddressHelp="%s" sozlamalarida belgilangan manzilga elektron pochta xabarlarini yuborish uchun ushbu parametrni yoqing ("%s" yorlig'iga qarang)
+TicketsLimitViewAssignedOnly=Displeyni joriy foydalanuvchiga tayinlangan chiptalar bilan cheklang (tashqi foydalanuvchilar uchun samarali emas, har doim ular bog'liq bo'lgan uchinchi shaxs bilan cheklaning)
+TicketsLimitViewAssignedOnlyHelp=Faqat joriy foydalanuvchiga tayinlangan chiptalar ko'rinadi. Chiptalarni boshqarish huquqiga ega foydalanuvchiga taalluqli emas.
+TicketsActivatePublicInterface=Umumiy interfeysni faollashtiring
+TicketsActivatePublicInterfaceHelp=Umumiy interfeys har qanday tashrif buyuruvchilarga chiptalarni yaratishga imkon beradi.
+TicketsAutoAssignTicket=Chiptani yaratgan foydalanuvchini avtomatik ravishda tayinlash
+TicketsAutoAssignTicketHelp=Chiptani yaratishda foydalanuvchiga avtomatik ravishda chiptani tayinlash mumkin.
+TicketNumberingModules=Chiptalarni raqamlash moduli
+TicketsModelModule=Chiptalar uchun hujjatlar shablonlari
+TicketNotifyTiersAtCreation=Yaratilganda uchinchi tomonga xabar bering
+TicketsDisableCustomerEmail=Ochiq interfeysdan chipta yaratilganda har doim elektron pochta xabarlarini o'chirib qo'ying
+TicketsPublicNotificationNewMessage=Chipta yangi xabar / sharh qo'shilganda elektron pochta xabarlarini yuboring
+TicketsPublicNotificationNewMessageHelp=Umumiy interfeysdan yangi xabar qo'shilganda elektron pochta xabarlarini yuboring (tayinlangan foydalanuvchiga yoki bildirishnomalar elektron pochtasiga (yangilash) va / yoki elektron pochta xabarlariga)
+TicketPublicNotificationNewMessageDefaultEmail=Bildirishnomalar elektron pochtasi (yangilash)
+TicketPublicNotificationNewMessageDefaultEmailHelp=Agar chiptada foydalanuvchi tayinlanmagan bo'lsa yoki foydalanuvchi ma'lum bir elektron pochta xabariga ega bo'lmasa, har bir yangi xabar xabarnomasi uchun ushbu manzilga elektron pochta xabarini yuboring.
 #
 # Index & list page
 #
-TicketsIndex=Tickets area
-TicketList=List of tickets
-TicketAssignedToMeInfos=This page display ticket list created by or assigned to current user
-NoTicketsFound=No ticket found
-NoUnreadTicketsFound=No unread ticket found
-TicketViewAllTickets=View all tickets
-TicketViewNonClosedOnly=View only open tickets
-TicketStatByStatus=Tickets by status
-OrderByDateAsc=Sort by ascending date
-OrderByDateDesc=Sort by descending date
-ShowAsConversation=Show as conversation list
-MessageListViewType=Show as table list
+TicketsIndex=Chiptalar maydoni
+TicketList=Chiptalar ro'yxati
+TicketAssignedToMeInfos=Ushbu sahifada joriy foydalanuvchi tomonidan yaratilgan yoki unga tayinlangan chiptalar ro'yxati ko'rsatilgan
+NoTicketsFound=Hech qanday chipta topilmadi
+NoUnreadTicketsFound=O'qilmagan chipta topilmadi
+TicketViewAllTickets=Barcha chiptalarni ko'ring
+TicketViewNonClosedOnly=Faqat ochiq chiptalarni ko'ring
+TicketStatByStatus=Status bo'yicha chiptalar
+OrderByDateAsc=Sana bo'yicha o'sish sanasi bo'yicha saralash
+OrderByDateDesc=Kamayish sanasi bo'yicha saralash
+ShowAsConversation=Suhbat ro'yxati sifatida ko'rsatish
+MessageListViewType=Jadval ro'yxati sifatida ko'rsatish
 
 #
 # Ticket card
 #
-Ticket=Ticket
-TicketCard=Ticket card
-CreateTicket=Create ticket
-EditTicket=Edit ticket
-TicketsManagement=Tickets Management
-CreatedBy=Created by
-NewTicket=New Ticket
-SubjectAnswerToTicket=Ticket answer
-TicketTypeRequest=Request type
-TicketCategory=Group
-SeeTicket=See ticket
-TicketMarkedAsRead=Ticket has been marked as read
-TicketReadOn=Read on
-TicketCloseOn=Closing date
-MarkAsRead=Mark ticket as read
-TicketHistory=Ticket history
-AssignUser=Assign to user
-TicketAssigned=Ticket is now assigned
-TicketChangeType=Change type
-TicketChangeCategory=Change analytic code
-TicketChangeSeverity=Change severity
-TicketAddMessage=Add a message
-AddMessage=Add a message
-MessageSuccessfullyAdded=Ticket added
-TicketMessageSuccessfullyAdded=Message successfully added
-TicketMessagesList=Message list
-NoMsgForThisTicket=No message for this ticket
-Properties=Classification
-LatestNewTickets=Latest %s newest tickets (not read)
-TicketSeverity=Severity
-ShowTicket=See ticket
-RelatedTickets=Related tickets
-TicketAddIntervention=Create intervention
-CloseTicket=Close ticket
-CloseATicket=Close a ticket
-ConfirmCloseAticket=Confirm ticket closing
-ConfirmDeleteTicket=Please confirm ticket deleting
-TicketDeletedSuccess=Ticket deleted with success
-TicketMarkedAsClosed=Ticket marked as closed
-TicketDurationAuto=Calculated duration
-TicketDurationAutoInfos=Duration calculated automatically from intervention related
-TicketUpdated=Ticket updated
-SendMessageByEmail=Send message by email
-TicketNewMessage=New message
-ErrorMailRecipientIsEmptyForSendTicketMessage=Recipient is empty. No email send
-TicketGoIntoContactTab=Please go into "Contacts" tab to select them
-TicketMessageMailIntro=Introduction
-TicketMessageMailIntroHelp=This text is added only at the beginning of the email and will not be saved.
-TicketMessageMailIntroLabelAdmin=Introduction to the message when sending email
-TicketMessageMailIntroText=Hello,<br>A new response was sent on a ticket that you contact. Here is the message:<br>
-TicketMessageMailIntroHelpAdmin=This text will be inserted before the text of the response to a ticket.
-TicketMessageMailSignature=Signature
-TicketMessageMailSignatureHelp=This text is added only at the end of the email and will not be saved.
-TicketMessageMailSignatureText=<p>Sincerely,</p><p>--</p>
-TicketMessageMailSignatureLabelAdmin=Signature of response email
-TicketMessageMailSignatureHelpAdmin=This text will be inserted after the response message.
-TicketMessageHelp=Only this text will be saved in the message list on ticket card.
-TicketMessageSubstitutionReplacedByGenericValues=Substitutions variables are replaced by generic values.
-TimeElapsedSince=Time elapsed since
-TicketTimeToRead=Time elapsed before read
-TicketContacts=Contacts ticket
-TicketDocumentsLinked=Documents linked to ticket
-ConfirmReOpenTicket=Confirm reopen this ticket ?
-TicketMessageMailIntroAutoNewPublicMessage=A new message was posted on the ticket with the subject %s:
-TicketAssignedToYou=Ticket assigned
-TicketAssignedEmailBody=You have been assigned the ticket #%s by %s
-MarkMessageAsPrivate=Mark message as private
-TicketMessagePrivateHelp=This message will not display to external users
-TicketEmailOriginIssuer=Issuer at origin of the tickets
-InitialMessage=Initial Message
-LinkToAContract=Link to a contract
-TicketPleaseSelectAContract=Select a contract
-UnableToCreateInterIfNoSocid=Can not create an intervention when no third party is defined
-TicketMailExchanges=Mail exchanges
-TicketInitialMessageModified=Initial message modified
-TicketMessageSuccesfullyUpdated=Message successfully updated
-TicketChangeStatus=Change status
-TicketConfirmChangeStatus=Confirm the status change: %s ?
-TicketLogStatusChanged=Status changed: %s to %s
-TicketNotNotifyTiersAtCreate=Not notify company at create
-Unread=Unread
-TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
-ErrorTicketRefRequired=Ticket reference name is required
+Ticket=Chipta
+TicketCard=Chipta kartasi
+CreateTicket=Chipta yarating
+EditTicket=Chiptani tahrirlash
+TicketsManagement=Chiptalarni boshqarish
+CreatedBy=Tomonidan yaratilgan
+NewTicket=Yangi chipta
+SubjectAnswerToTicket=Chipta javobi
+TicketTypeRequest=So'rov turi
+TicketCategory=Chiptalarni turkumlash
+SeeTicket=Chiptani ko'ring
+TicketMarkedAsRead=Chipta o'qilgan deb belgilandi
+TicketReadOn=O'qing
+TicketCloseOn=Tugatish sanasi
+MarkAsRead=Chiptani o'qilgan deb belgilang
+TicketHistory=Chipta tarixi
+AssignUser=Foydalanuvchiga tayinlash
+TicketAssigned=Endi chipta tayinlandi
+TicketChangeType=Turini o'zgartirish
+TicketChangeCategory=Analitik kodni o'zgartiring
+TicketChangeSeverity=Zo'ravonlikni o'zgartiring
+TicketAddMessage=Xabar qo'shing
+AddMessage=Xabar qo'shing
+MessageSuccessfullyAdded=Chipta qo'shildi
+TicketMessageSuccessfullyAdded=Xabar muvaffaqiyatli qo'shildi
+TicketMessagesList=Xatlar ro'yxati
+NoMsgForThisTicket=Ushbu chipta uchun xabar yo'q
+Properties=Tasnifi
+LatestNewTickets=Eng so'nggi %s eng yangi chiptalar (o'qilmaydi)
+TicketSeverity=Jiddiylik
+ShowTicket=Chiptani ko'ring
+RelatedTickets=Tegishli chiptalar
+TicketAddIntervention=Aralashuvni yarating
+CloseTicket=Chiptani yoping
+CloseATicket=Chiptani yoping
+ConfirmCloseAticket=Chipta yopilishini tasdiqlang
+ConfirmDeleteTicket=Iltimos, chipta o'chirilishini tasdiqlang
+TicketDeletedSuccess=Muvaffaqiyat bilan chipta o'chirildi
+TicketMarkedAsClosed=Chipta yopiq deb belgilangan
+TicketDurationAuto=Hisoblangan muddat
+TicketDurationAutoInfos=Davomiylik bilan bog'liq bo'lgan muddat avtomatik ravishda hisoblab chiqiladi
+TicketUpdated=Chipta yangilandi
+SendMessageByEmail=Elektron pochta orqali xabar yuboring
+TicketNewMessage=Yangi xabar
+ErrorMailRecipientIsEmptyForSendTicketMessage=Qabul qiluvchi bo'sh. Elektron pochta xabarlari yo'q
+TicketGoIntoContactTab=Ularni tanlash uchun "Kontaktlar" yorlig'iga o'ting
+TicketMessageMailIntro=Kirish
+TicketMessageMailIntroHelp=Ushbu matn faqat elektron pochta boshida qo'shiladi va saqlanmaydi.
+TicketMessageMailIntroLabelAdmin=Elektron pochta xabarlarini yuborishda xabar bilan tanishish
+TicketMessageMailIntroText=Salom, <br> Siz bog'langan chiptaga yangi javob yuborildi. Mana xabar: <br>
+TicketMessageMailIntroHelpAdmin=Ushbu matn chiptaga javob matnidan oldin kiritiladi.
+TicketMessageMailSignature=Imzo
+TicketMessageMailSignatureHelp=Ushbu matn faqat elektron pochta oxirida qo'shiladi va saqlanmaydi.
+TicketMessageMailSignatureText= <p> Hurmat bilan, </p> <p> - </p>
+TicketMessageMailSignatureLabelAdmin=Javob elektron pochtasining imzosi
+TicketMessageMailSignatureHelpAdmin=Ushbu matn javob xabaridan keyin kiritiladi.
+TicketMessageHelp=Faqat ushbu matn chipta kartasidagi xabarlar ro'yxatida saqlanadi.
+TicketMessageSubstitutionReplacedByGenericValues=O'zgartirish o'zgaruvchilari umumiy qiymatlar bilan almashtiriladi.
+TimeElapsedSince=O'shandan beri vaqt o'tgan
+TicketTimeToRead=O'qishdan oldin o'tgan vaqt
+TicketTimeElapsedBeforeSince=Oldin / keyin o'tgan vaqt
+TicketContacts=Aloqa chiptasi
+TicketDocumentsLinked=Chipta bilan bog'langan hujjatlar
+ConfirmReOpenTicket=Ushbu chipta qayta ochilganligini tasdiqlaysizmi?
+TicketMessageMailIntroAutoNewPublicMessage=%s mavzusida chiptada yangi xabar joylashtirildi:
+TicketAssignedToYou=Chipta tayinlandi
+TicketAssignedEmailBody=Sizga %s tomonidan # %s chiptasi tayinlangan
+MarkMessageAsPrivate=Xabarni shaxsiy sifatida belgilash
+TicketMessagePrivateHelp=Ushbu xabar tashqi foydalanuvchilarga ko'rsatilmaydi
+TicketEmailOriginIssuer=Chiptalarning kelib chiqishi bo'yicha emitent
+InitialMessage=Dastlabki xabar
+LinkToAContract=Shartnomaga havola
+TicketPleaseSelectAContract=Shartnomani tanlang
+UnableToCreateInterIfNoSocid=Uchinchi tomon aniqlanmaganida aralashuvni yaratib bo'lmaydi
+TicketMailExchanges=Pochta almashinuvi
+TicketInitialMessageModified=Dastlabki xabar o'zgartirildi
+TicketMessageSuccesfullyUpdated=Xabar muvaffaqiyatli yangilandi
+TicketChangeStatus=Vaziyatni o'zgartirish
+TicketConfirmChangeStatus=Vaziyat o'zgarishini tasdiqlang: %s?
+TicketLogStatusChanged=Holat o'zgartirildi: %s dan %s ga
+TicketNotNotifyTiersAtCreate=Yaratganda kompaniyani xabardor qilmang
+Unread=O'qilmagan
+TicketNotCreatedFromPublicInterface=Mavjud emas. Chipta umumiy interfeysdan yaratilmagan.
+ErrorTicketRefRequired=Chipta ma'lumotnomasining nomi talab qilinadi
 
 #
 # Logs
 #
-TicketLogMesgReadBy=Ticket %s read by %s
-NoLogForThisTicket=No log for this ticket yet
-TicketLogAssignedTo=Ticket %s assigned to %s
-TicketLogPropertyChanged=Ticket %s modified: classification from %s to %s
-TicketLogClosedBy=Ticket %s closed by %s
-TicketLogReopen=Ticket %s re-open
+TicketLogMesgReadBy=%s o'qigan %s chiptasi
+NoLogForThisTicket=Ushbu chipta uchun jurnal yo'q
+TicketLogAssignedTo=%s ga tayinlangan %s chiptasi
+TicketLogPropertyChanged=%s chiptasi o'zgartirildi: %s dan %s gacha tasnif
+TicketLogClosedBy=%s chiptasi %s tomonidan yopilgan
+TicketLogReopen=%s chiptasi qayta ochiladi
 
 #
 # Public pages
 #
-TicketSystem=Ticket system
-ShowListTicketWithTrackId=Display ticket list from track ID
-ShowTicketWithTrackId=Display ticket from track ID
-TicketPublicDesc=You can create a support ticket or check from an existing ID.
-YourTicketSuccessfullySaved=Ticket has been successfully saved!
-MesgInfosPublicTicketCreatedWithTrackId=A new ticket has been created with ID %s and Ref %s.
-PleaseRememberThisId=Please keep the tracking number that we might ask you later.
-TicketNewEmailSubject=Ticket creation confirmation - Ref %s (public ticket ID %s)
-TicketNewEmailSubjectCustomer=New support ticket
-TicketNewEmailBody=This is an automatic email to confirm you have registered a new ticket.
-TicketNewEmailBodyCustomer=This is an automatic email to confirm a new ticket has just been created into your account.
-TicketNewEmailBodyInfosTicket=Information for monitoring the ticket
-TicketNewEmailBodyInfosTrackId=Ticket tracking number: %s
-TicketNewEmailBodyInfosTrackUrl=You can view the progress of the ticket by clicking the link above.
-TicketNewEmailBodyInfosTrackUrlCustomer=You can view the progress of the ticket in the specific interface by clicking the following link
-TicketEmailPleaseDoNotReplyToThisEmail=Please do not reply directly to this email! Use the link to reply into the interface.
-TicketPublicInfoCreateTicket=This form allows you to record a support ticket in our management system.
-TicketPublicPleaseBeAccuratelyDescribe=Please accurately describe the problem. Provide the most information possible to allow us to correctly identify your request.
-TicketPublicMsgViewLogIn=Please enter ticket tracking ID
-TicketTrackId=Public Tracking ID
-OneOfTicketTrackId=One of your tracking ID
-ErrorTicketNotFound=Ticket with tracking ID %s not found!
-Subject=Subject
-ViewTicket=View ticket
-ViewMyTicketList=View my ticket list
-ErrorEmailMustExistToCreateTicket=Error: email address not found in our database
-TicketNewEmailSubjectAdmin=New ticket created - Ref %s (public ticket ID %s)
-TicketNewEmailBodyAdmin=<p>Ticket has just been created with ID #%s, see information:</p>
-SeeThisTicketIntomanagementInterface=See ticket in management interface
-TicketPublicInterfaceForbidden=The public interface for the tickets was not enabled
-ErrorEmailOrTrackingInvalid=Bad value for tracking ID or email
-OldUser=Old user
-NewUser=New user
-NumberOfTicketsByMonth=Number of tickets per month
-NbOfTickets=Number of tickets
+TicketSystem=Chipta tizimi
+ShowListTicketWithTrackId=Track ID-dan chiptalar ro'yxatini ko'rsatish
+ShowTicketWithTrackId=Track ID-dan chiptani ko'rsatish
+TicketPublicDesc=Siz qo'llab-quvvatlash chiptasini yaratishingiz yoki mavjud bo'lgan identifikatordan tekshirishingiz mumkin.
+YourTicketSuccessfullySaved=Chipta muvaffaqiyatli saqlanib qoldi!
+MesgInfosPublicTicketCreatedWithTrackId=%s va Ref %s identifikatorlari bilan yangi chipta yaratildi.
+PleaseRememberThisId=Iltimos, keyinroq so'rashimiz mumkin bo'lgan kuzatuv raqamini saqlang.
+TicketNewEmailSubject=Chiptani yaratishni tasdiqlash - Ref %s (%s jamoat chiptasi identifikatori)
+TicketNewEmailSubjectCustomer=Yangi qo'llab-quvvatlash chiptasi
+TicketNewEmailBody=Bu yangi chiptani ro'yxatdan o'tkazganingizni tasdiqlovchi avtomatik elektron pochta xabaridir.
+TicketNewEmailBodyCustomer=Bu sizning hisobingizda yangi chipta yaratilganligini tasdiqlovchi avtomatik elektron pochta xabaridir.
+TicketNewEmailBodyInfosTicket=Chiptani kuzatish uchun ma'lumot
+TicketNewEmailBodyInfosTrackId=Chiptalarni kuzatish raqami: %s
+TicketNewEmailBodyInfosTrackUrl=Yuqoridagi havolani bosish orqali chipta borishi bilan tanishishingiz mumkin.
+TicketNewEmailBodyInfosTrackUrlCustomer=Siz quyidagi havolani bosish orqali ma'lum bir interfeysda chipta borishini ko'rishingiz mumkin
+TicketEmailPleaseDoNotReplyToThisEmail=Iltimos, ushbu elektron pochtaga to'g'ridan-to'g'ri javob bermang! Interfeysga javob berish uchun havoladan foydalaning.
+TicketPublicInfoCreateTicket=Ushbu shakl sizning boshqaruv tizimimizda qo'llab-quvvatlash chiptasini yozib olishga imkon beradi.
+TicketPublicPleaseBeAccuratelyDescribe=Iltimos, muammoni aniq tasvirlab bering. Sizning so'rovingizni to'g'ri aniqlab olishimiz uchun imkon qadar ko'proq ma'lumotlarni taqdim eting.
+TicketPublicMsgViewLogIn=Iltimos, chiptani kuzatish guvohnomasini kiriting
+TicketTrackId=Ommaviy kuzatuv identifikatori
+OneOfTicketTrackId=Kuzatuv identifikatoringizdan biri
+ErrorTicketNotFound=%s kuzatuv identifikatori bo'lgan chipta topilmadi!
+Subject=Mavzu
+ViewTicket=Chiptani ko'rish
+ViewMyTicketList=Mening chiptalarim ro'yxatini ko'rish
+ErrorEmailMustExistToCreateTicket=Xato: ma'lumotlar bazasida elektron pochta manzili topilmadi
+TicketNewEmailSubjectAdmin=Yangi chipta yaratildi - Ref %s (%s jamoat chiptasi identifikatori)
+TicketNewEmailBodyAdmin= <p> chiptasi # %s ID bilan yaratilgan, ma'lumotga qarang: </p>
+SeeThisTicketIntomanagementInterface=Boshqaruv interfeysida chiptani ko'ring
+TicketPublicInterfaceForbidden=Chiptalar uchun umumiy interfeys yoqilmagan
+ErrorEmailOrTrackingInvalid=ID yoki elektron pochtani kuzatish uchun yomon qiymat
+OldUser=Eski foydalanuvchi
+NewUser=Yangi foydalanuvchi
+NumberOfTicketsByMonth=Oyiga chiptalar soni
+NbOfTickets=Chiptalar soni
 # notifications
-TicketNotificationEmailSubject=Ticket %s updated
-TicketNotificationEmailBody=This is an automatic message to notify you that ticket %s has just been updated
-TicketNotificationRecipient=Notification recipient
-TicketNotificationLogMessage=Log message
-TicketNotificationEmailBodyInfosTrackUrlinternal=View ticket into interface
-TicketNotificationNumberEmailSent=Notification email sent: %s
+TicketNotificationEmailSubject=%s chiptasi yangilandi
+TicketNotificationEmailBody=Bu sizga %s chiptasi yangilanganligi haqida xabar berish uchun avtomatik xabar
+TicketNotificationRecipient=Bildirishnoma oluvchi
+TicketNotificationLogMessage=Xabar jurnali
+TicketNotificationEmailBodyInfosTrackUrlinternal=Interfeysda chiptani ko'rish
+TicketNotificationNumberEmailSent=Bildirish xati yuborildi: %s
 
-ActionsOnTicket=Events on ticket
+ActionsOnTicket=Chiptadagi tadbirlar
 
 #
 # Boxes
 #
-BoxLastTicket=Latest created tickets
-BoxLastTicketDescription=Latest %s created tickets
+BoxLastTicket=Oxirgi yaratilgan chiptalar
+BoxLastTicketDescription=Oxirgi %s chiptalari yaratildi
 BoxLastTicketContent=
-BoxLastTicketNoRecordedTickets=No recent unread tickets
-BoxLastModifiedTicket=Latest modified tickets
-BoxLastModifiedTicketDescription=Latest %s modified tickets
+BoxLastTicketNoRecordedTickets=Yaqinda o'qilmagan chiptalar yo'q
+BoxLastModifiedTicket=Eng so'nggi o'zgartirilgan chiptalar
+BoxLastModifiedTicketDescription=Eng so'nggi o'zgartirilgan chiptalar %s
 BoxLastModifiedTicketContent=
-BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
-BoxTicketType=Distribution of open tickets by type
-BoxTicketSeverity=Number of open tickets by severity
-BoxNoTicketSeverity=No tickets opened
-BoxTicketLastXDays=Number of new tickets by days the last %s days
-BoxTicketLastXDayswidget = Number of new tickets by days the last X days
-BoxNoTicketLastXDays=No new tickets the last %s days
-BoxNumberOfTicketByDay=Number of new tickets by day
-BoxNewTicketVSClose=Number of today's new tickets versus today's closed tickets
-TicketCreatedToday=Ticket created today
-TicketClosedToday=Ticket closed today
+BoxLastModifiedTicketNoRecordedTickets=Yaqinda o'zgartirilgan chiptalar yo'q
+BoxTicketType=Ochiq chiptalarni turlari bo'yicha taqsimlash
+BoxTicketSeverity=Og'irligi bo'yicha ochiq chiptalar soni
+BoxNoTicketSeverity=Hech qanday chiptalar ochilmagan
+BoxTicketLastXDays=Oxirgi %s kunlar ichida yangi chiptalar soni
+BoxTicketLastXDayswidget = Oxirgi X kunlardagi kunlar bo'yicha yangi chiptalar soni
+BoxNoTicketLastXDays=Oxirgi %s kunida yangi chiptalar yo'q
+BoxNumberOfTicketByDay=Kuniga yangi chiptalar soni
+BoxNewTicketVSClose=Bugungi yangi chiptalar soni va bugungi yopiq chiptalarga nisbatan
+TicketCreatedToday=Bugun yaratilgan chipta
+TicketClosedToday=Bugun chipta yopildi
diff --git a/htdocs/langs/uz_UZ/trips.lang b/htdocs/langs/uz_UZ/trips.lang
index c4d47ce0867..6fb2b804578 100644
--- a/htdocs/langs/uz_UZ/trips.lang
+++ b/htdocs/langs/uz_UZ/trips.lang
@@ -10,8 +10,8 @@ ListOfFees=To'lovlar ro'yxati
 TypeFees=To'lov turlari
 ShowTrip=Xarajatlar hisobotini ko'rsatish
 NewTrip=Yangi xarajatlar hisoboti
-LastExpenseReports=Latest %s expense reports
-AllExpenseReports=All expense reports
+LastExpenseReports=Oxirgi %s xarajatlar hisoboti
+AllExpenseReports=Barcha xarajatlar to'g'risidagi hisobotlar
 CompanyVisited=Kompaniya / tashkilot tashrif buyurdi
 FeesKilometersOrAmout=Miqdor yoki kilometr
 DeleteTrip=Xarajatlar to'g'risidagi hisobotni o'chirish
@@ -49,32 +49,32 @@ TF_PEAGE=Yo'l uchun haq
 TF_ESSENCE=Yoqilg'i
 TF_HOTEL=Mehmonxona
 TF_TAXI=Taksi
-EX_KME=Mileage costs
-EX_FUE=Fuel CV
-EX_HOT=Hotel
-EX_PAR=Parking CV
-EX_TOL=Toll CV
-EX_TAX=Various Taxes
-EX_IND=Indemnity transportation subscription
-EX_SUM=Maintenance supply
-EX_SUO=Office supplies
-EX_CAR=Car rental
-EX_DOC=Documentation
-EX_CUR=Customers receiving
-EX_OTR=Other receiving
-EX_POS=Postage
-EX_CAM=CV maintenance and repair
-EX_EMM=Employees meal
-EX_GUM=Guests meal
-EX_BRE=Breakfast
-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
-UploadANewFileNow=Upload a new document now
-Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
+EX_KME=Kilometr narxi
+EX_FUE=Yoqilg'i CV
+EX_HOT=Mehmonxona
+EX_PAR=Avtoturargohning qisqacha bayoni
+EX_TOL=Pulli tarjimai hol
+EX_TAX=Turli xil soliqlar
+EX_IND=Kompensatsiya transportiga obuna bo'lish
+EX_SUM=Ta'minot ta'minoti
+EX_SUO=Ofis materiallari
+EX_CAR=Avtomobil ijarasi
+EX_DOC=Hujjatlar
+EX_CUR=Mijozlarni qabul qilish
+EX_OTR=Boshqa qabul qilish
+EX_POS=Pochta aloqasi
+EX_CAM=CV-ga texnik xizmat ko'rsatish va ta'mirlash
+EX_EMM=Xodimlarning ovqatlanishi
+EX_GUM=Mehmonlar ovqat
+EX_BRE=Nonushta
+EX_FUE_VP=Yoqilg'i PV
+EX_TOL_VP=To'lov PV
+EX_PAR_VP=Park PV
+EX_CAM_VP=PVga texnik xizmat ko'rsatish va ta'mirlash
+DefaultCategoryCar=Standart transport rejimi
+DefaultRangeNumber=Standart oraliq raqami
+UploadANewFileNow=Hozir yangi hujjatni yuklang
+Error_EXPENSEREPORT_ADDON_NotDefined=Xatoliklar, "xarajatlar hisoboti" modulini o'rnatishda xarajatlar hisobotini raqamlash qoidasi aniqlanmadi
 ErrorDoubleDeclaration=Shunga o'xshash sana oralig'ida boshqa xarajatlar hisobotini e'lon qildingiz.
 AucuneLigne=Hozircha xarajatlar to'g'risida hisobot e'lon qilinmagan
 ModePaiement=To'lov rejimi
@@ -91,7 +91,7 @@ DATE_SAVE=Tasdiqlash sanasi
 DATE_CANCEL=Bekor qilish sanasi
 DATE_PAIEMENT=To'lov sanasi
 BROUILLONNER=Qayta oching
-ExpenseReportRef=Ref. expense report
+ExpenseReportRef=Ref. xarajatlar to'g'risidagi hisobot
 ValidateAndSubmit=Tasdiqlang va tasdiqlash uchun topshiring
 ValidatedWaitingApproval=Tasdiqlangan (tasdiqlashni kutmoqda)
 NOT_AUTHOR=Siz ushbu xarajatlar hisobotining muallifi emassiz. Amal bekor qilindi.
@@ -110,42 +110,42 @@ ExpenseReportPayment=Xarajatlar bo'yicha hisobotni to'lash
 ExpenseReportsToApprove=Tasdiqlash uchun xarajatlar hisobotlari
 ExpenseReportsToPay=To'lov uchun hisobot
 ConfirmCloneExpenseReport=Ushbu xarajatlar hisobotini klonlamoqchimisiz?
-ExpenseReportsIk=Configuration of mileage charges
-ExpenseReportsRules=Expense report rules
-ExpenseReportIkDesc=You can modify the calculation of kilometers expense by category and range who they are previously defined. <b>d</b> is the distance in kilometers
-ExpenseReportRulesDesc=You can create or update any rules of calculation. This part will be used when user will create a new expense report
-expenseReportOffset=Offset
-expenseReportCoef=Coefficient
-expenseReportTotalForFive=Example with <u>d</u> = 5
-expenseReportRangeFromTo=from %d to %d
-expenseReportRangeMoreThan=more than %d
-expenseReportCoefUndefined=(value not defined)
-expenseReportCatDisabled=Category disabled - see the c_exp_tax_cat dictionary
-expenseReportRangeDisabled=Range disabled - see the c_exp_tax_range dictionay
-expenseReportPrintExample=offset + (d x coef) = %s
-ExpenseReportApplyTo=Apply to
-ExpenseReportDomain=Domain to apply
-ExpenseReportLimitOn=Limit on
-ExpenseReportDateStart=Date start
-ExpenseReportDateEnd=Date end
-ExpenseReportLimitAmount=Limite amount
-ExpenseReportRestrictive=Restrictive
-AllExpenseReport=All type of expense report
-OnExpense=Expense line
-ExpenseReportRuleSave=Expense report rule saved
-ExpenseReportRuleErrorOnSave=Error: %s
-RangeNum=Range %d
-ExpenseReportConstraintViolationError=Constraint violation id [%s]: %s  is superior to %s %s
-byEX_DAY=by day (limitation to %s)
-byEX_MON=by month (limitation to %s)
-byEX_YEA=by year (limitation to %s)
-byEX_EXP=by line (limitation to %s)
-ExpenseReportConstraintViolationWarning=Constraint violation id [%s]: %s  is superior to %s %s
-nolimitbyEX_DAY=by day (no limitation)
-nolimitbyEX_MON=by month (no limitation)
-nolimitbyEX_YEA=by year (no limitation)
-nolimitbyEX_EXP=by line (no limitation)
-CarCategory=Vehicle category
-ExpenseRangeOffset=Offset amount: %s
-RangeIk=Mileage range
-AttachTheNewLineToTheDocument=Attach the line to an uploaded document
+ExpenseReportsIk=Kilometr uchun to'lovlarni sozlash
+ExpenseReportsRules=Xarajatlarni hisobot qilish qoidalari
+ExpenseReportIkDesc=Kilometr sarfini hisob-kitobini toifasi va diapazoni bo'yicha o'zgartirishingiz mumkin. <b> d </b> - kilometrdagi masofa
+ExpenseReportRulesDesc=Siz har qanday hisoblash qoidalarini yaratishingiz yoki yangilashingiz mumkin. Ushbu qism foydalanuvchi yangi xarajatlar hisobotini tuzganda ishlatiladi
+expenseReportOffset=Ofset
+expenseReportCoef=Koeffitsient
+expenseReportTotalForFive=<u> d </u> = 5 bilan misol
+expenseReportRangeFromTo=%d dan %d gacha
+expenseReportRangeMoreThan=%d dan ko'proq
+expenseReportCoefUndefined=(qiymat aniqlanmagan)
+expenseReportCatDisabled=Kategoriya o'chirilgan - c_exp_tax_cat lug'atiga qarang
+expenseReportRangeDisabled=Diapazon o'chirilgan - c_exp_tax_range lug'atiga qarang
+expenseReportPrintExample=ofset + (d x koef) = %s
+ExpenseReportApplyTo=Murojaat qiling
+ExpenseReportDomain=Qo'llash uchun domen
+ExpenseReportLimitOn=Cheklov
+ExpenseReportDateStart=Sana boshlanishi
+ExpenseReportDateEnd=Sana tugashi
+ExpenseReportLimitAmount=Cheklangan miqdor
+ExpenseReportRestrictive=Cheklovchi
+AllExpenseReport=Xarajatlar bo'yicha hisobotning barcha turlari
+OnExpense=Xarajatlar liniyasi
+ExpenseReportRuleSave=Xarajatlar bo'yicha hisobot qoidalari saqlandi
+ExpenseReportRuleErrorOnSave=Xato: %s
+RangeNum=%d oralig'i
+ExpenseReportConstraintViolationError=Cheklov buzilishi identifikatori [%s]: %s %s %s
+byEX_DAY=kun bilan (%s chegarasi)
+byEX_MON=oy bo'yicha (%s chegarasi)
+byEX_YEA=yil bo'yicha (%s chegarasi)
+byEX_EXP=satr bo'yicha (%s chegarasi)
+ExpenseReportConstraintViolationWarning=Cheklov buzilishi identifikatori [%s]: %s %s %s
+nolimitbyEX_DAY=kunga (cheklovsiz)
+nolimitbyEX_MON=oy bo'yicha (cheklovsiz)
+nolimitbyEX_YEA=yil bo'yicha (cheklovsiz)
+nolimitbyEX_EXP=chiziq bo'yicha (cheklovsiz)
+CarCategory=Avtomobillar toifasi
+ExpenseRangeOffset=Ofset miqdori: %s
+RangeIk=Kilometr oralig'i
+AttachTheNewLineToTheDocument=Yuklangan hujjatga qatorni biriktiring
diff --git a/htdocs/langs/uz_UZ/users.lang b/htdocs/langs/uz_UZ/users.lang
index b285c074000..0ec452f94ac 100644
--- a/htdocs/langs/uz_UZ/users.lang
+++ b/htdocs/langs/uz_UZ/users.lang
@@ -12,7 +12,7 @@ PasswordChangedTo=Parol o'zgartirildi: %s
 SubjectNewPassword=%s uchun yangi parolingiz
 GroupRights=Guruh ruxsatnomalari
 UserRights=Foydalanuvchi ruxsatlari
-Credentials=Credentials
+Credentials=Ishonch yorliqlari
 UserGUISetup=Foydalanuvchining displeyini sozlash
 DisableUser=O'chirish
 DisableAUser=Foydalanuvchini o'chirib qo'ying
@@ -45,11 +45,11 @@ NewGroup=Yangi guruh
 CreateGroup=Guruh yarating
 RemoveFromGroup=Guruhdan olib tashlash
 PasswordChangedAndSentTo=Parol o'zgartirildi va <b> %s </b> raqamiga yuborildi.
-PasswordChangeRequest=Request to change password for <b>%s</b>
+PasswordChangeRequest=<b> %s </b> uchun parolni o'zgartirish haqida so'rov
 PasswordChangeRequestSent=<b> %s </b> uchun <b> %s </b> uchun parolni o'zgartirish uchun so'rov.
-IfLoginExistPasswordRequestSent=If this login is a valid account, an email to reset password has been sent.
-IfEmailExistPasswordRequestSent=If this email is a valid account, an email to reset password has been sent.
-ConfirmPasswordReset=Confirm password reset
+IfLoginExistPasswordRequestSent=Agar ushbu kirish to'g'ri hisob bo'lsa, parolni tiklash uchun elektron pochta xabarini yuborgan.
+IfEmailExistPasswordRequestSent=Agar ushbu elektron pochta manzili haqiqiy hisob bo'lsa, parolni tiklash uchun elektron pochta xabarlari yuborilgan.
+ConfirmPasswordReset=Parolni tiklashni tasdiqlang
 MenuUsersAndGroups=Foydalanuvchilar va guruhlar
 LastGroupsCreated=Eng so'nggi %s guruhlari yaratildi
 LastUsersCreated=Oxirgi %s foydalanuvchilari yaratildi
@@ -76,13 +76,13 @@ CreateInternalUserDesc=Ushbu shakl sizning kompaniyangiz / tashkilotingizda ichk
 InternalExternalDesc=<b> ichki </b> foydalanuvchisi - bu sizning kompaniyangiz / tashkilotingiz tarkibiga kiradigan foydalanuvchi yoki sizning kompaniyangiz bilan bog'liq ma'lumotlardan ko'ra ko'proq ma'lumotlarni ko'rishingiz kerak bo'lishi mumkin bo'lgan tashkilotingiz tashqarisidagi sherik foydalanuvchidir (ruxsat berish tizimi u nimani yoki nimani aniqlay oladi ko'rmayapman yoki qilmayman). <br> <b> tashqi </b> foydalanuvchisi faqat o'zi bilan bog'liq ma'lumotlarni ko'rishi kerak bo'lgan mijoz, sotuvchi yoki boshqa narsadir (Uchinchi tomon uchun tashqi foydalanuvchini yaratish uchinchi tomonning aloqa yozuvlaridan amalga oshirilishi mumkin). <br> <br> Ikkala holatda ham foydalanuvchi uchun zarur bo'lgan xususiyatlarga ruxsat berishingiz kerak.
 PermissionInheritedFromAGroup=Ruxsat berilgan, chunki foydalanuvchi guruhlaridan biridan meros bo'lib qolgan.
 Inherited=Meros
-UserWillBe=Created user will be
+UserWillBe=Yaratilgan foydalanuvchi bo'ladi
 UserWillBeInternalUser=Yaratilgan foydalanuvchi ichki foydalanuvchi bo'ladi (chunki ma'lum bir uchinchi tomon bilan bog'lanmagan)
 UserWillBeExternalUser=Yaratilgan foydalanuvchi tashqi foydalanuvchi bo'ladi (chunki ma'lum bir uchinchi tomon bilan bog'langan)
 IdPhoneCaller=Telefon raqamini qidiruvchi
 NewUserCreated=%s foydalanuvchisi yaratildi
 NewUserPassword=%s uchun parolni o'zgartirish
-NewPasswordValidated=Your new password have been validated and must be used now to login.
+NewPasswordValidated=Sizning yangi parolingiz tasdiqlandi va kirish uchun hozir foydalanish kerak.
 EventUserModified=Foydalanuvchi %s o'zgartirilgan
 UserDisabled=Foydalanuvchi %s o'chirilgan
 UserEnabled=Foydalanuvchi %s faollashtirildi
@@ -98,7 +98,7 @@ NameToCreate=Yaratish uchun uchinchi tomon nomi
 YourRole=Sizning rollaringiz
 YourQuotaOfUsersIsReached=Faol foydalanuvchilar kvotangizga erishildi!
 NbOfUsers=Foydalanuvchilar soni
-NbOfPermissions=No. of permissions
+NbOfPermissions=Ruxsatnomalar soni
 DontDowngradeSuperAdmin=Faqat superadmin faqat superadminni pasaytirishi mumkin
 HierarchicalResponsible=Nazoratchi
 HierarchicView=Ierarxik ko'rinish
@@ -106,21 +106,21 @@ UseTypeFieldToChange=O'zgartirish uchun maydon turidan foydalaning
 OpenIDURL=OpenID URL manzili
 LoginUsingOpenID=Kirish uchun OpenID-dan foydalaning
 WeeklyHours=Ishlagan soatlari (haftasiga)
-ExpectedWorkedHours=Expected hours worked per week
+ExpectedWorkedHours=Kutilgan haftada ishlagan soatlari
 ColorUser=Foydalanuvchining rangi
 DisabledInMonoUserMode=Xizmat ko'rsatish rejimida o'chirilgan
 UserAccountancyCode=Foydalanuvchining hisobga olish kodi
 UserLogoff=Foydalanuvchidan chiqish
 UserLogged=Foydalanuvchi tizimga kirdi
-DateOfEmployment=Employment date
+DateOfEmployment=Ishga joylashish sanasi
 DateEmployment=Bandlik
-DateEmploymentstart=Employment Start Date
-DateEmploymentEnd=Employment End Date
-RangeOfLoginValidity=Access validity date range
-CantDisableYourself=You can't disable your own user record
-ForceUserExpenseValidator=Force expense report validator
-ForceUserHolidayValidator=Force leave request validator
-ValidatorIsSupervisorByDefault=By default, the validator is the supervisor of the user. Keep empty to keep this behaviour.
-UserPersonalEmail=Personal email
-UserPersonalMobile=Personal mobile phone
-WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
+DateEmploymentstart=Ishga kirishish sanasi
+DateEmploymentEnd=Ishni tugatish sanasi
+RangeOfLoginValidity=Kirishning amal qilish muddati
+CantDisableYourself=O'zingizning foydalanuvchi yozuvingizni o'chirib qo'yolmaysiz
+ForceUserExpenseValidator=Majburiy xarajatlar to'g'risidagi hisobotni tasdiqlovchi
+ForceUserHolidayValidator=Majburiy ta'til so'rovini tasdiqlovchi
+ValidatorIsSupervisorByDefault=Odatiy bo'lib, tasdiqlovchi foydalanuvchi nazoratchisi hisoblanadi. Ushbu xatti-harakatni saqlash uchun bo'sh joyni saqlang.
+UserPersonalEmail=Shaxsiy elektron pochta
+UserPersonalMobile=Shaxsiy mobil telefon
+WarningNotLangOfInterface=Ogohlantirish, bu foydalanuvchi foydalanadigan asosiy til, u tanlagan interfeys tili emas. Ushbu foydalanuvchi tomonidan ko'rinadigan interfeys tilini o'zgartirish uchun %s yorlig'iga o'ting
diff --git a/htdocs/langs/uz_UZ/website.lang b/htdocs/langs/uz_UZ/website.lang
index f90fe1b8122..70776346c53 100644
--- a/htdocs/langs/uz_UZ/website.lang
+++ b/htdocs/langs/uz_UZ/website.lang
@@ -3,38 +3,38 @@ Shortname=Kod
 WebsiteSetupDesc=Bu erda siz foydalanmoqchi bo'lgan veb-saytlarni yarating. Keyin ularni tahrirlash uchun veb-saytlar menyusiga o'ting.
 DeleteWebsite=Veb-saytni o'chirish
 ConfirmDeleteWebsite=Ushbu veb-saytni o'chirishni xohlaysizmi? Uning barcha sahifalari va tarkibi ham o'chiriladi. Yuklangan fayllar (masalan, Medlar katalogiga, ECM moduliga, ...) qoladi.
-WEBSITE_TYPE_CONTAINER=Type of page/container
-WEBSITE_PAGE_EXAMPLE=Web page to use as example
+WEBSITE_TYPE_CONTAINER=Sahifa / konteyner turi
+WEBSITE_PAGE_EXAMPLE=Misol sifatida foydalanish uchun veb-sahifa
 WEBSITE_PAGENAME=Sahifa nomi / taxallusi
-WEBSITE_ALIASALT=Alternative page names/aliases
-WEBSITE_ALIASALTDesc=Use here list of other name/aliases so the page can also be accessed using this other names/aliases (for example the old name after renaming the alias to keep backlink on old link/name working). Syntax is:<br>alternativename1, alternativename2, ...
+WEBSITE_ALIASALT=Muqobil sahifa nomlari / taxalluslari
+WEBSITE_ALIASALTDesc=Bu erda boshqa ism / taxalluslar ro'yxatidan foydalaning, shunda sahifaga ushbu boshqa ismlar / taxalluslar yordamida kirish mumkin (masalan, eski havola / ismning ishlashida orqa bog'lanishni saqlab qolish uchun taxallusni o'zgartirgandan keyin eski nom). Sintaksis quyidagicha: <br> alternativename1, alternativename2, ...
 WEBSITE_CSS_URL=Tashqi CSS-faylning URL manzili
 WEBSITE_CSS_INLINE=CSS fayli tarkibi (barcha sahifalar uchun umumiy)
-WEBSITE_JS_INLINE=Javascript file content (common to all pages)
-WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
-WEBSITE_ROBOT=Robot file (robots.txt)
-WEBSITE_HTACCESS=Website .htaccess file
-WEBSITE_MANIFEST_JSON=Website manifest.json file
-WEBSITE_README=README.md file
-WEBSITE_KEYWORDSDesc=Use a comma to separate values
-EnterHereLicenseInformation=Enter here meta data or license information to fille a README.md file. if you distribute your website as a template, the file will be included into the temptate package.
-HtmlHeaderPage=HTML header (specific to this page only)
-PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
-EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
+WEBSITE_JS_INLINE=Javascript fayl tarkibi (barcha sahifalar uchun umumiy)
+WEBSITE_HTML_HEADER=HTML sarlavhasi ostidagi qo'shimchalar (barcha sahifalar uchun umumiy)
+WEBSITE_ROBOT=Robot fayli (robots.txt)
+WEBSITE_HTACCESS=Veb-sayt .htaccess fayli
+WEBSITE_MANIFEST_JSON=Veb-sayt manifest.json fayli
+WEBSITE_README=README.md fayli
+WEBSITE_KEYWORDSDesc=Qiymatlarni ajratish uchun verguldan foydalaning
+EnterHereLicenseInformation=README.md faylini to'ldirish uchun bu erga meta ma'lumotlar yoki litsenziya ma'lumotlarini kiriting. agar siz veb-saytingizni shablon sifatida tarqatsangiz, fayl vasvasaga solingan paketga kiritiladi.
+HtmlHeaderPage=HTML sarlavhasi (faqat ushbu sahifaga xos)
+PageNameAliasHelp=Sahifaning nomi yoki taxallusi. <br> Ushbu taxallus, shuningdek veb-serverning Virtual xostidan (Apacke, Nginx, ... kabi) veb-sayt ishga tushirilganda, SEO URL-ni yaratish uchun ishlatiladi. Ushbu taxallusni tahrirlash uchun "<strong> %s </strong>" tugmachasidan foydalaning.
+EditTheWebSiteForACommonHeader=Izoh: Agar siz barcha sahifalar uchun moslashtirilgan sarlavhani belgilamoqchi bo'lsangiz, sarlavhani sahifa / konteyner o'rniga sayt darajasida tahrirlang.
 MediaFiles=Media kutubxonasi
 EditCss=Veb-sayt xususiyatlarini tahrirlash
 EditMenu=Tartibga solish menyusi
-EditMedias=Edit medias
+EditMedias=Medialarni tahrirlash
 EditPageMeta=Sahifa / konteyner xususiyatlarini tahrirlash
-EditInLine=Edit inline
-AddWebsite=Add website
+EditInLine=Inline-ni tahrirlash
+AddWebsite=Veb-sayt qo'shish
 Webpage=Veb-sahifa / konteyner
 AddPage=Sahifa / konteyner qo'shing
-PageContainer=Page
+PageContainer=Sahifa
 PreviewOfSiteNotYetAvailable=Veb-saytingizni oldindan ko'rib chiqish <strong> %s </strong> hali mavjud emas. Avval siz '<strong> </strong> veb-sayt shablonini to'liq import qilishingiz kerak' yoki shunchaki '<strong> sahifa / konteyner qo'shing </strong>'.
 RequestedPageHasNoContentYet=%s id bilan so'ralgan sahifada hali tarkib yo'q yoki .tpl.php kesh fayli o'chirildi. Buni hal qilish uchun sahifaning tarkibini tahrirlash.
-SiteDeleted=Web site '%s' deleted
-PageContent=Page/Contenair
+SiteDeleted='%s' veb-sayti o'chirildi
+PageContent=Sahifa / Contenair
 PageDeleted=%s veb-saytining sahifasi / Contenair '%s' o'chirildi.
 PageAdded=Sahifa / Contenair '%s' qo'shildi
 ViewSiteInNewTab=Saytni yangi varaqda ko'ring
@@ -43,105 +43,105 @@ SetAsHomePage=Uy sahifasi sifatida o'rnating
 RealURL=Haqiqiy URL
 ViewWebsiteInProduction=Uy manzillaridan foydalangan holda veb-saytni ko'ring
 SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server (Apache, Nginx, ...) a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong>
-ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
+ExampleToUseInApacheVirtualHostConfig=Apache virtual xostini o'rnatishda foydalanish uchun misol:
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
-YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
+YouCanAlsoDeployToAnotherWHP= <u> Veb-saytingizni boshqa Dolibarr Hosting provayderi bilan boshqaring </u> <br> Agar Internetda mavjud bo'lgan Apache yoki NGinx kabi veb-serveringiz bo'lmasa, veb-saytingizni boshqa Dolibarr xost-provayderi tomonidan taqdim etilgan boshqa Dolibarr nusxasi orqali eksport qilishingiz va import qilishingiz mumkin. veb-sayt moduli bilan integratsiya. <a href="https://saas.dolibarr.org" target="_blank"> saytida ba'zi Dolibarr hosting provayderlari ro'yxatini topishingiz mumkin https://saas.dolibarr.org </a>
 CheckVirtualHostPerms=Check also that the virtual host user (for example www-data) has <strong>%s</strong> permissions on files into<br><strong>%s</strong>
-ReadPerm=Read
-WritePerm=Write
-TestDeployOnWeb=Test/deploy on web
+ReadPerm=O'qing
+WritePerm=Yozing
+TestDeployOnWeb=Internetda sinov / tarqatish
 PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
 PreviewSiteServedByDolibarr= <u> %s-ni yangi varoqda oldindan ko'rib chiqing. </u> <br> <br> %s-ga Dolibarr server tomonidan xizmat ko'rsatiladi, shuning uchun qo'shimcha veb-server (Apache, Nginx, IIS kabi) o'rnatilishi shart emas. <br> Noqulay narsa shundaki, sahifalarning URL manzillari foydalanuvchilar uchun qulay emas va Dolibarr-ning yo'lidan boshlanadi. <br> URL Dolibarr tomonidan xizmat: <br> <strong> %s </strong> <br> <br>, bu veb-sayt xizmat veb-serverda bir virtual mezbon yaratish uchun o'z tashqi veb-server foydalanish uchun, bu katalog ball <br> <strong> %s </strong> <br> keyin bu virtual server nomini kiriting ushbu veb-saytning xususiyatlarida va "Internetda sinash / tarqatish" havolasini bosing.
-VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
-NoPageYet=No pages yet
-YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
-SyntaxHelp=Help on specific syntax tips
-YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-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, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<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 includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&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 a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&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/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+VirtualHostUrlNotDefined=Tashqi veb-server tomonidan xizmat ko'rsatiladigan virtual xost manzili aniqlanmagan
+NoPageYet=Hali sahifalar yo'q
+YouCanCreatePageOrImportTemplate=Siz yangi sahifa yaratishingiz yoki to'liq veb-sayt shablonini import qilishingiz mumkin
+SyntaxHelp=Sintaksis bo'yicha aniq maslahatlar bo'yicha yordam bering
+YouCanEditHtmlSourceckeditor=HTML manba kodini tahrirlashdagi "Manba" tugmasi yordamida tahrirlashingiz mumkin.
+YouCanEditHtmlSource= <br> <span class="fa fa-bug"> </span> <strong> &lt;? php? &gt; a0a65d teglari yordamida ushbu manbaga PHP kodini qo'shishingiz mumkin. Quyidagi global o'zgaruvchilar mavjud: $ conf, $ db, $ mysoc, $ user, $ website, $ websitepage, $ weblangs, $ pagelangs. <br> <br> <span class="fa fa-bug"> </span> Siz shuningdek boshqa sahifa / konteyner tarkibini quyidagi sintaksis bilan qo'shishingiz mumkin: <br> <strong> a_31c_to_of_0_0_b_0_b_0_b_b_0_b_b_0_b_0_b_0_0_b_0_0_06_c46c6c6c6c6c6cb6cbbc0bbc0cbbbc0f3cbbbc0fdbbc0cbbc0cbbbc9cbbbc9cbbc9cbbc0cbbnc ' ? &gt; </strong> <br> <br> <span class="fa fa-bug"> </span> quyidagi sintaksisi rang bilan boshqa sahifa / konteyner uchun yo'naltirishni qilish mumkin (Eslatma: ishlab chiqarish yo'riq oldin, har qanday mazmun, albatta):? <br> <strong> &lt; php redirectToContainer ( 'alias_of_container_to_redirect_to'); ? <strong> hujjatlar ichiga saqlangan fayl </strong> yuklab uchun <strong> link o'z ichiga uchun <br> <strong> &lt;a href = "alias_of_page_to_link_to.php" &gt;mylink&lt;a&gt; </strong> <br> <br> <span class="fa fa-download"> </span>: &gt; </strong> <br> <br> <span class="fa fa-link"> </span> sintaksisi foydalanishingiz, boshqa sahifaga bilan bog'lanish qo'shish uchun </strong> katalog, <strong> document.php </strong> jild foydalanish: hujjatlar / ECM'de bir fayl uchun, <br> misol (ehtiyoj identifikatsiyadan kerak), sintaksisi:? <br> <strong> &lt;a href = "/ document.php modulepart = ecm & fayl = [relative_dir / ] filename.ext "&gt; </strong> <br> Hujjatlar / mediyadagi fayl (umumiy foydalanish uchun ochiq katalog) uchun sintaksis: <br> <strong> a039zd7 "/document.php?modulepart=medias&file=(relative_dir/ assignedfilename.ext"&gt; </strong> <br> Sharing havolasi bilan birgalikda foydalaniladigan fayl uchun (ochiq fayl kirish h0904f097). /document.php?hashp=publicsharekeyoffile"&gt; </strong> <br> <br> <span class="fa fa-picture-o"> </span> Direktoriyaning </strong> <strong> hujjatlar ichiga saqlangan bir <strong> tasvir </strong>, <strong> viewimage.php </strong> jild foydalanishni o'z ichiga oladi: ochiq hujjatlar / medias yuzasidan tasvir uchun, <br> misoli ( umumiy foydalanish uchun sintaksis: <br> <strong> &lt;img src = "/ viewimage.php? modulepart = medias&amp;file = [relat_dir / ]00f07006"
 #YouCanEditHtmlSource2=<br><span class="fa fa-picture-o"></span> To include a <strong>image</strong> shared publicaly, use the <strong>viewimage.php</strong> wrapper:<br>Example with a shared key 123456789, syntax is:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
-YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
-YouCanEditHtmlSourceMore=<br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
-ClonePage=Clone page/container
-CloneSite=Clone site
-SiteAdded=Website 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.
-ParentPageId=Parent page ID
-WebsiteId=Website ID
-CreateByFetchingExternalPage=Create page/container by fetching page from external URL...
-OrEnterPageInfoManually=Or create page from scratch or from a page template...
-FetchAndCreate=Fetch and Create
-ExportSite=Export website
-ImportSite=Import website template
-IDOfPage=Id of page
+YouCanEditHtmlSource2=Almashish havolasi bilan birgalikda foydalaniladigan rasm uchun (faylning umumiy xesh tugmachasidan foydalangan holda ochiq kirish) sintaksis quyidagicha: <br> <strong> &lt;img src = "/ viewimage.php? Hashp = 12345679012 ..." a0012c7dff0a0z0z00090f0f08a0f09a0f09a09a09cb08a0a09a03c09a03c09c9c9c9c9c9c08f96f96f9f08f08f0f9fdf9fdfdfdfc7fd
+YouCanEditHtmlSourceMore= <br> <a href="%s" target="_blank">-da mavjud bo'lgan HTML yoki dinamik kodlarning boshqa misollari, </a> <br>.
+ClonePage=Sahifani / konteynerni klonlash
+CloneSite=Klon sayti
+SiteAdded=Veb-sayt qo'shildi
+ConfirmClonePage=Iltimos, yangi sahifaning kodini / taxallusini kiriting va agar u klonlangan sahifaning tarjimasi bo'lsa.
+PageIsANewTranslation=Yangi sahifa joriy sahifaning tarjimasimi?
+LanguageMustNotBeSameThanClonedPage=Siz sahifani tarjima sifatida klonlashtirasiz. Yangi sahifaning tili manba sahifasidan farq qilishi kerak.
+ParentPageId=Asosiy sahifa identifikatori
+WebsiteId=Veb-sayt identifikatori
+CreateByFetchingExternalPage=Tashqi URL manzilidan sahifani olib, sahifa / konteyner yarating ...
+OrEnterPageInfoManually=Yoki sahifani noldan yoki sahifa shablonidan yarating ...
+FetchAndCreate=Olish va yaratish
+ExportSite=Veb-saytni eksport qilish
+ImportSite=Veb-sayt shablonini import qilish
+IDOfPage=Sahifaning identifikatori
 Banner=Banner
 BlogPost=Blog post
-WebsiteAccount=Website account
-WebsiteAccounts=Website accounts
-AddWebsiteAccount=Create web site account
-BackToListForThirdParty=Back to list for the third-party
-DisableSiteFirst=Disable website first
-MyContainerTitle=My web site title
-AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
-SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
-WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party
-YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting javascript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor may not works correclty when used on a grabbed external page.
-OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
-GrabImagesInto=Grab also images found into css and page.
-ImagesShouldBeSavedInto=Images should be saved into directory
-WebsiteRootOfImages=Root directory for website images
-SubdirOfPage=Sub-directory dedicated to page
-AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
-CorporateHomePage=Corporate Home page
-EmptyPage=Empty page
-ExternalURLMustStartWithHttp=External URL must start with http:// or https://
-ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
-ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
-ShowSubcontainers=Show dynamic content
-InternalURLOfPage=Internal URL of page
-ThisPageIsTranslationOf=This page/container is a translation of
-ThisPageHasTranslationPages=This page/container has translation
-NoWebSiteCreateOneFirst=No website has been created yet. Create one first.
-GoTo=Go to
-DynamicPHPCodeContainsAForbiddenInstruction=You add dynamic PHP code that contains the PHP instruction '<strong>%s</strong>' that is forbidden by default as dynamic content (see hidden options WEBSITE_PHP_ALLOW_xxx to increase list of allowed commands).
-NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynamic content in websites. Ask permission or just keep code into php tags unmodified.
-ReplaceWebsiteContent=Search or Replace website content
-DeleteAlsoJs=Delete also all javascript files specific to this website?
-DeleteAlsoMedias=Delete also all medias files specific to this website?
-MyWebsitePages=My website pages
-SearchReplaceInto=Search | Replace into
-ReplaceString=New string
-CSSContentTooltipHelp=Enter here CSS content. To avoid any conflict with the CSS of the application, be sure to prepend all declaration with the .bodywebsite class. For example:<br><br>#mycssselector, input.myclass:hover { ... }<br>must be<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>Note: If you have a large file without this prefix, you can use 'lessc' to convert it to append the .bodywebsite prefix everywhere.
-LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page.
-Dynamiccontent=Sample of a page with dynamic content
-ImportSite=Import website template
-EditInLineOnOff=Mode 'Edit inline' is %s
-ShowSubContainersOnOff=Mode to execute 'dynamic content' is %s
-GlobalCSSorJS=Global CSS/JS/Header file of web site
-BackToHomePage=Back to home page...
-TranslationLinks=Translation links
-YouTryToAccessToAFileThatIsNotAWebsitePage=You try to access to a page that is not available.<br>(ref=%s, type=%s, status=%s)
-UseTextBetween5And70Chars=For good SEO practices, use a text between 5 and 70 characters
-MainLanguage=Main language
-OtherLanguages=Other languages
-UseManifest=Provide a manifest.json file
-PublicAuthorAlias=Public author alias
-AvailableLanguagesAreDefinedIntoWebsiteProperties=Available languages are defined into website properties
-ReplacementDoneInXPages=Replacement done in %s pages or containers
-RSSFeed=RSS Feed
-RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL
-PagesRegenerated=%s page(s)/container(s) regenerated
-RegenerateWebsiteContent=Regenerate web site cache files
-AllowedInFrames=Allowed in Frames
-DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
-GenerateSitemaps=Generate website sitemap file
-ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
-ConfirmSitemapsCreation=Confirm sitemap generation
-SitemapGenerated=Sitemap file <b>%s</b> generated
-ImportFavicon=Favicon
-ErrorFaviconType=Favicon must be png
-ErrorFaviconSize=Favicon must be sized 16x16, 32x32 or 64x64
-FaviconTooltip=Upload an image which needs to be a png (16x16, 32x32 or 64x64)
+WebsiteAccount=Veb-sayt qayd yozuvi
+WebsiteAccounts=Veb-sayt qayd yozuvlari
+AddWebsiteAccount=Veb-sayt qayd yozuvini yarating
+BackToListForThirdParty=Uchinchi tomon ro'yxatiga qaytish
+DisableSiteFirst=Avval veb-saytni o'chirib qo'ying
+MyContainerTitle=Mening veb-saytim nomi
+AnotherContainer=Boshqa sahifa / konteyner tarkibini qanday kiritish kerak (agar siz ichki kodni yoqsangiz, dinamik kodni yoqsangiz, bu erda sizda xato bo'lishi mumkin)
+SorryWebsiteIsCurrentlyOffLine=Kechirasiz, ushbu veb-sayt hozirda o'chirilgan. Iltimos, keyinroq qaytib keling ...
+WEBSITE_USE_WEBSITE_ACCOUNTS=Veb-sayt hisob jadvalini yoqing
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Har bir veb-sayt / uchinchi tomon uchun veb-sayt qayd yozuvlarini (kirish / o'tish) saqlash uchun jadvalni yoqing
+YouMustDefineTheHomePage=Avval standart uy sahifasini belgilashingiz kerak
+OnlyEditionOfSourceForGrabbedContentFuture=Ogohlantirish: Tashqi veb-sahifani import qilish orqali veb-sahifa yaratish tajribali foydalanuvchilar uchun saqlanadi. Manba sahifasining murakkabligiga qarab, import natijasi asl nusxadan farq qilishi mumkin. Shuningdek, agar manba sahifasida odatiy CSS uslublari yoki ziddiyatli javascriptlardan foydalanilsa, u ushbu sahifada ishlash paytida veb-sayt muharriri ko'rinishini yoki xususiyatlarini buzishi mumkin. Ushbu usul sahifani yaratishning tezroq usuli hisoblanadi, ammo yangi sahifangizni noldan yoki tavsiya etilgan sahifa shablonidan yaratish tavsiya etiladi. <br> Shuni ham ta'kidlash kerakki, ichki muharrir olingan tashqi sahifada ishlatilganda to'g'rilanishi mumkin emas.
+OnlyEditionOfSourceForGrabbedContent=Tashqi saytdan tarkib topilganda faqat HTML manbasini nashr qilish mumkin
+GrabImagesInto=CSS va sahifada joylashgan rasmlarni ham oling.
+ImagesShouldBeSavedInto=Rasmlar katalogga saqlanishi kerak
+WebsiteRootOfImages=Veb-sayt rasmlari uchun ildiz katalogi
+SubdirOfPage=Sahifaga bag'ishlangan pastki katalog
+AliasPageAlreadyExists=Taxalluslar sahifasi <strong> %s </strong> allaqachon mavjud
+CorporateHomePage=Korporativ uy sahifasi
+EmptyPage=Sahifa bo'sh
+ExternalURLMustStartWithHttp=Tashqi URL http: // yoki https: // bilan boshlanishi kerak.
+ZipOfWebsitePackageToImport=Veb-sayt shablonlari to'plamining Zip faylini yuklang
+ZipOfWebsitePackageToLoad=yoki mavjud veb-sayt shablonini tanlang
+ShowSubcontainers=Dinamik tarkibni ko'rsatish
+InternalURLOfPage=Sahifaning ichki URL manzili
+ThisPageIsTranslationOf=Ushbu sahifa / konteynerning tarjimasi
+ThisPageHasTranslationPages=Ushbu sahifa / konteynerning tarjimasi mavjud
+NoWebSiteCreateOneFirst=Hech qanday veb-sayt yaratilmagan. Avval yarating.
+GoTo=Boring
+DynamicPHPCodeContainsAForbiddenInstruction=Siz sukut bo'yicha dinamik tarkib sifatida taqiqlangan '<strong> %s </strong>' PHP yo'riqnomasini o'z ichiga olgan dinamik PHP kodini qo'shasiz (ruxsat berilgan buyruqlar ro'yxatini oshirish uchun WEBSITE_PHP_ALLOW_xxx yashirin variantlarini ko'ring).
+NotAllowedToAddDynamicContent=Veb-saytlarga PHP dinamik tarkibini qo'shish yoki tahrirlash huquqiga ega emassiz. Ruxsat so'rang yoki kodni php teglariga o'zgartirmasdan saqlang.
+ReplaceWebsiteContent=Veb-sayt tarkibini qidirish yoki almashtirish
+DeleteAlsoJs=Ushbu veb-saytga tegishli barcha javascript fayllari o'chirilsinmi?
+DeleteAlsoMedias=Ushbu veb-saytga tegishli barcha media fayllari ham o'chirilsinmi?
+MyWebsitePages=Mening veb-sahifalarim
+SearchReplaceInto=Qidiruv | Ichiga almashtiring
+ReplaceString=Yangi mag'lubiyat
+CSSContentTooltipHelp=Bu erga CSS tarkibini kiriting. Ilovaning CSS bilan ziddiyatni oldini olish uchun barcha deklaratsiyani .bodywebsite sinfi bilan oldindan belgilab qo'ying. Masalan: <br> <br> #mycssselector, input.myclass: hover {...} <br> <br> bo'lishi kerak .bodywebsite #mycssselector, .bodywebsite input.mf190: hoff000 ushbu prefiksni .bodywebsite prefiksini hamma joyda qo'shish uchun "lessc" dan foydalanishingiz mumkin.
+LinkAndScriptsHereAreNotLoadedInEditor=Ogohlantirish: Ushbu tarkib faqat saytga serverdan kirganda chiqariladi. U tahrirlash rejimida ishlatilmaydi, shuning uchun javascript fayllarini tahrirlash rejimida yuklashingiz kerak bo'lsa, sahifangizga 'script src = ...' tegini qo'shishingiz kifoya.
+Dynamiccontent=Dinamik tarkibga ega sahifaning namunasi
+ImportSite=Veb-sayt shablonini import qilish
+EditInLineOnOff="Inline-ni tahrirlash" rejimi %s
+ShowSubContainersOnOff="Dinamik tarkib" ni bajarish tartibi %s
+GlobalCSSorJS=Veb-saytning global CSS / JS / Header fayli
+BackToHomePage=Uy sahifasiga qaytish ...
+TranslationLinks=Tarjima havolalari
+YouTryToAccessToAFileThatIsNotAWebsitePage=Siz mavjud bo'lmagan sahifaga kirishga harakat qilasiz. <br> (ref = %s, type = %s, status = %s)
+UseTextBetween5And70Chars=Yaxshi SEO amaliyoti uchun 5 dan 70 gacha belgidan foydalaning
+MainLanguage=Asosiy til
+OtherLanguages=Boshqa tillar
+UseManifest=Manifest.json faylini taqdim eting
+PublicAuthorAlias=Ommaviy muallif taxallusi
+AvailableLanguagesAreDefinedIntoWebsiteProperties=Mavjud tillar veb-sayt xususiyatlariga qarab belgilanadi
+ReplacementDoneInXPages=%s sahifalarida yoki konteynerlarda almashtirish
+RSSFeed=RSS tasmasi
+RSSFeedDesc=Siz ushbu blog yordamida "blogpost" turidagi so'nggi maqolalarning RSS tasmasini olishingiz mumkin
+PagesRegenerated=%s sahifa / lar / qayta tiklangan konteyner (lar)
+RegenerateWebsiteContent=Veb-sayt kesh fayllarini qayta yarating
+AllowedInFrames=Kadrlarda ruxsat berilgan
+DefineListOfAltLanguagesInWebsiteProperties=Barcha mavjud tillarning ro'yxatini veb-sayt xususiyatlariga aniqlang.
+GenerateSitemaps=Veb-sayt sayt xaritasi faylini yarating
+ConfirmGenerateSitemaps=Agar siz tasdiqlasangiz, mavjud sayt xaritasi faylini o'chirib tashlaysiz ...
+ConfirmSitemapsCreation=Sayt xaritasini yaratishni tasdiqlang
+SitemapGenerated=Sayt xaritasi fayli <b> %s </b>
+ImportFavicon=Favikon
+ErrorFaviconType=Favicon png bo'lishi kerak
+ErrorFaviconSize=Favikon hajmi 16x16, 32x32 yoki 64x64 bo'lishi kerak
+FaviconTooltip=Png (16x16, 32x32 yoki 64x64) bo'lishi kerak bo'lgan rasmni yuklang
diff --git a/htdocs/langs/uz_UZ/withdrawals.lang b/htdocs/langs/uz_UZ/withdrawals.lang
index a87fad457ff..7ecbde76347 100644
--- a/htdocs/langs/uz_UZ/withdrawals.lang
+++ b/htdocs/langs/uz_UZ/withdrawals.lang
@@ -1,51 +1,51 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 CustomersStandingOrdersArea=To'g'ridan-to'g'ri debet buyurtmalari bo'yicha to'lovlar
 SuppliersStandingOrdersArea=Kredit o'tkazish yo'li bilan to'lovlar
-StandingOrdersPayment=Direct debit payment orders
-StandingOrderPayment=Direct debit payment order
+StandingOrdersPayment=To'g'ridan-to'g'ri debet bo'yicha to'lov topshiriqlari
+StandingOrderPayment=To'g'ridan-to'g'ri debet to'lovi buyurtmasi
 NewStandingOrder=To'g'ridan-to'g'ri debet bo'yicha yangi buyurtma
-NewPaymentByBankTransfer=New payment by credit transfer
+NewPaymentByBankTransfer=Kredit o'tkazish yo'li bilan yangi to'lov
 StandingOrderToProcess=Qayta ishlash uchun
-PaymentByBankTransferReceipts=Credit transfer orders
-PaymentByBankTransferLines=Credit transfer order lines
+PaymentByBankTransferReceipts=Kredit o'tkazish bo'yicha buyurtmalar
+PaymentByBankTransferLines=Kredit o'tkazish bo'yicha buyurtma liniyalari
 WithdrawalsReceipts=To'g'ridan-to'g'ri debet buyurtmalari
 WithdrawalReceipt=To'g'ridan-to'g'ri debet buyurtmasi
-BankTransferReceipts=Credit transfer orders
-BankTransferReceipt=Credit transfer order
-LatestBankTransferReceipts=Latest %s credit transfer orders
+BankTransferReceipts=Kredit o'tkazish bo'yicha buyurtmalar
+BankTransferReceipt=Kredit o'tkazish tartibi
+LatestBankTransferReceipts=Kredit o'tkazish bo'yicha so'nggi buyurtmalar %s
 LastWithdrawalReceipts=Oxirgi %s to'g'ridan-to'g'ri debet fayllari
-WithdrawalsLine=Direct debit order line
-CreditTransferLine=Credit transfer line
+WithdrawalsLine=To'g'ridan-to'g'ri debet buyurtmasi liniyasi
+CreditTransferLine=Kredit o'tkazish liniyasi
 WithdrawalsLines=To'g'ridan-to'g'ri debet buyurtma liniyalari
-CreditTransferLines=Credit transfer lines
+CreditTransferLines=Kredit o'tkazish liniyalari
 RequestStandingOrderToTreat=To'g'ridan-to'g'ri debet to'lovlarini qayta ishlash uchun buyurtmalar
 RequestStandingOrderTreated=To'g'ridan-to'g'ri debet to'lovi bo'yicha so'rovlar ko'rib chiqildi
-RequestPaymentsByBankTransferToTreat=Requests for credit transfer to process
-RequestPaymentsByBankTransferTreated=Requests for credit transfer processed
+RequestPaymentsByBankTransferToTreat=Kreditni qayta ishlashga o'tkazish to'g'risida so'rovlar
+RequestPaymentsByBankTransferTreated=Kredit o'tkazish bo'yicha so'rovlar ko'rib chiqildi
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Hozircha mumkin emas. Muayyan qatorlarda rad etish to'g'risida e'lon qilishdan oldin pulni qaytarib olish holati "hisobga olingan" deb belgilanishi kerak.
 NbOfInvoiceToWithdraw=To'g'ridan-to'g'ri debet buyurtmasini kutayotgan malakali mijozlarning hisob-fakturalari soni
 NbOfInvoiceToWithdrawWithInfo=Bank hisobvarag'i to'g'risidagi ma'lumotlarga ega bo'lgan to'g'ridan-to'g'ri debetli to'lov topshiriqlari bilan mijozlar hisobvarag'ining raqami
-NbOfInvoiceToPayByBankTransfer=No. of qualified supplier invoices waiting for a payment by credit transfer
-SupplierInvoiceWaitingWithdraw=Vendor invoice waiting for payment by credit transfer
+NbOfInvoiceToPayByBankTransfer=Kredit o'tkazmasi orqali to'lovni kutayotgan malakali etkazib beruvchilarning hisob-fakturalari soni
+SupplierInvoiceWaitingWithdraw=Kredit o'tkazmasi orqali to'lovni kutayotgan sotuvchi hisob-fakturasi
 InvoiceWaitingWithdraw=To'lov debetini kutayotgan hisob-faktura
-InvoiceWaitingPaymentByBankTransfer=Invoice waiting for credit transfer
+InvoiceWaitingPaymentByBankTransfer=Kredit o'tkazilishini kutayotgan hisob-faktura
 AmountToWithdraw=Chiqish uchun mablag '
 NoInvoiceToWithdraw="%s" uchun hech qanday hisob-faktura kutilmaydi. So'rov yuborish uchun faktura kartasidagi '%s' yorlig'iga o'ting.
-NoSupplierInvoiceToWithdraw=No supplier invoice with open 'Direct credit requests' is waiting. Go on tab '%s' on invoice card to make a request.
+NoSupplierInvoiceToWithdraw="To'g'ridan-to'g'ri kredit so'rovlari" bo'lgan etkazib beruvchilarning hech qanday schyoti kutilmaydi. So'rov yuborish uchun faktura kartasidagi '%s' yorlig'iga o'ting.
 ResponsibleUser=Foydalanuvchi uchun javobgar
 WithdrawalsSetup=To'g'ridan-to'g'ri debet to'lovini sozlash
-CreditTransferSetup=Credit transfer setup
+CreditTransferSetup=Kredit o'tkazmalarini sozlash
 WithdrawStatistics=To'g'ridan-to'g'ri debet to'lovlari statistikasi
-CreditTransferStatistics=Credit transfer statistics
-Rejects=Rejects
+CreditTransferStatistics=Kredit o'tkazmalari statistikasi
+Rejects=Rad etadi
 LastWithdrawalReceipt=Oxirgi %s to'g'ridan-to'g'ri debet tushumlari
 MakeWithdrawRequest=To'g'ridan-to'g'ri debetni to'lash to'g'risida so'rov yuboring
-MakeBankTransferOrder=Make a credit transfer request
-WithdrawRequestsDone=%s direct debit payment requests recorded
-BankTransferRequestsDone=%s credit transfer requests recorded
+MakeBankTransferOrder=Kredit o'tkazish to'g'risida so'rov yuboring
+WithdrawRequestsDone=%s to'g'ridan-to'g'ri debet to'lovi bo'yicha so'rovlar yozib olindi
+BankTransferRequestsDone=%s kredit o'tkazish bo'yicha so'rovlar yozib olindi
 ThirdPartyBankCode=Uchinchi tomonning bank kodi
 NoInvoiceCouldBeWithdrawed=Hech qanday schyot-faktura muvaffaqiyatli hisobdan chiqarilmagan. Hisob-kitoblarning amaldagi IBANga ega kompaniyalarda ekanligini va IBAN-da <strong> %s </strong> rejimida UMR (noyob mandat ma'lumotnomasi) mavjudligini tekshiring.
-WithdrawalCantBeCreditedTwice=This withdrawal receipt is already marked as credited; this can't be done twice, as this would potentially create duplicate payments and bank entries.
+WithdrawalCantBeCreditedTwice=Ushbu pulni qaytarib olish kvitansiyasi allaqachon kreditlangan deb belgilangan; buni ikki marta bajarish mumkin emas, chunki bu takroriy to'lovlar va bank yozuvlarini yaratishi mumkin.
 ClassCredited=Tasniflangan kredit
 ClassCreditedConfirm=Ushbu olib qo'yilgan kvitansiyani sizning bank hisob raqamingizga kiritilgan deb tasniflashni xohlaganingizga ishonchingiz komilmi?
 TransData=Etkazish sanasi
@@ -55,19 +55,19 @@ Lines=Chiziqlar
 StandingOrderReject=Rad etish to'g'risida xabar bering
 WithdrawsRefused=To'g'ridan-to'g'ri debet rad etildi
 WithdrawalRefused=Cheklov rad etildi
-CreditTransfersRefused=Credit transfers refused
+CreditTransfersRefused=Kredit o'tkazmalari rad etildi
 WithdrawalRefusedConfirm=Jamiyat uchun pulni rad etishni xohlaganingizga aminmisiz
 RefusedData=Rad etilgan sana
 RefusedReason=Rad etish sababi
 RefusedInvoicing=Rad etish uchun hisob-kitob
 NoInvoiceRefused=Rad etishni talab qilmang
 InvoiceRefused=Hisob-faktura rad etildi (rad etish mijozga etkaziladi)
-StatusDebitCredit=Status debit/credit
+StatusDebitCredit=Holati debet / kredit
 StatusWaiting=Kutish
 StatusTrans=Yuborildi
-StatusDebited=Debited
+StatusDebited=Debet qilingan
 StatusCredited=Kreditlangan
-StatusPaid=Paid
+StatusPaid=To'langan
 StatusRefused=Rad etildi
 StatusMotif0=Belgilanmagan
 StatusMotif1=Mablag'lar etishmayapti
@@ -78,11 +78,11 @@ StatusMotif5=RIB yaroqsiz
 StatusMotif6=Balanssiz hisob
 StatusMotif7=Sud qarori
 StatusMotif8=Boshqa sabab
-CreateForSepaFRST=Create direct debit file (SEPA FRST)
-CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
+CreateForSepaFRST=To'g'ridan-to'g'ri debet faylini yaratish (SEPA FRST)
+CreateForSepaRCUR=To'g'ridan-to'g'ri debet faylini yaratish (SEPA RCUR)
 CreateAll=To'g'ridan-to'g'ri debet faylini yaratish (barchasi)
-CreateFileForPaymentByBankTransfer=Create file for credit transfer
-CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
+CreateFileForPaymentByBankTransfer=Kredit o'tkazish uchun fayl yarating
+CreateSepaFileForPaymentByBankTransfer=Kredit o'tkazish faylini yarating (SEPA)
 CreateGuichet=Faqat ofis
 CreateBanque=Faqat bank
 OrderWaiting=Davolashni kutish
@@ -92,25 +92,25 @@ NumeroNationalEmetter=Milliy transmitter raqami
 WithBankUsingRIB=RIB-dan foydalangan holda bank hisobvaraqlari uchun
 WithBankUsingBANBIC=IBAN / BIC / SWIFT-dan foydalangan holda bank hisobvaraqlari uchun
 BankToReceiveWithdraw=Bank hisobvarag'ini olish
-BankToPayCreditTransfer=Bank Account used as source of payments
+BankToPayCreditTransfer=To'lov manbai sifatida foydalaniladigan bank hisobvarag'i
 CreditDate=Kredit bo'yicha
 WithdrawalFileNotCapable=%s mamlakatingiz uchun pul olish kvitansiyasini yaratib bo'lmadi (Sizning mamlakatingiz qo'llab-quvvatlanmaydi)
 ShowWithdraw=To'g'ridan-to'g'ri debet buyurtmasini ko'rsatish
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Biroq, agar hisob-fakturada hali kamida bitta to'g'ridan-to'g'ri debet to'lovi buyurtmasi qayta ishlanmagan bo'lsa, uni oldindan olib qo'yishni boshqarish uchun to'lov sifatida o'rnatilmaydi.
 DoStandingOrdersBeforePayments=Ushbu yorliq to'g'ridan-to'g'ri debet to'lovi buyurtmasini talab qilishga imkon beradi. Amalga oshirilgandan so'ng to'g'ridan-to'g'ri debet buyurtmasini yaratish va boshqarish uchun Bank-> To'g'ridan-to'g'ri debet orqali to'lov menyusiga o'ting. To'g'ridan-to'g'ri debet buyurtmasi yopilganda, hisob-fakturalar bo'yicha to'lov avtomatik ravishda qayd etiladi va qolgan to'lovlar bekor qilingan taqdirda hisob-kitoblar yopiladi.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Payment by credit transfer to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoCreditTransferBeforePayments=Ushbu yorliq sizga kredit o'tkazish tartibini so'rashga imkon beradi. Amalga oshirilgandan so'ng, kredit o'tkazish tartibini yaratish va boshqarish uchun Bank-> Kredit o'tkazmasi orqali to'lov menyusiga o'ting. Kredit o'tkazish bo'yicha buyurtma yopilganda, hisob-fakturalar bo'yicha to'lov avtomatik ravishda qayd etiladi va qolgan to'lovlar bekor qilingan taqdirda hisob-kitoblar yopiladi.
 WithdrawalFile=Debet buyurtma fayli
-CreditTransferFile=Credit transfer file
+CreditTransferFile=Kredit o'tkazish fayli
 SetToStatusSent="Fayl yuborildi" holatiga o'rnating
 ThisWillAlsoAddPaymentOnInvoice=Bunda hisob-fakturalar bo'yicha to'lovlar qayd etiladi va agar ular to'lash muddati bekor bo'lsa, ularni "To'langan" deb tasniflanadi
 StatisticsByLineStatus=Chiziqlar holati bo'yicha statistika
 RUM=UMR
-DateRUM=Mandate signature date
+DateRUM=Mandat imzosi sanasi
 RUMLong=Noyob mandat ma'lumotnomasi
 RUMWillBeGenerated=Agar bo'sh bo'lsa, UMR (noyob mandat ma'lumotnomasi) bank hisobvarag'i ma'lumotlari saqlangandan so'ng hosil bo'ladi.
 WithdrawMode=To'g'ridan-to'g'ri debet rejimi (FRST yoki RECUR)
 WithdrawRequestAmount=To'g'ridan-to'g'ri debetga so'rov miqdori:
-BankTransferAmount=Amount of Credit Transfer request:
+BankTransferAmount=Kredit o'tkazish bo'yicha so'rov miqdori:
 WithdrawRequestErrorNilAmount=Bo'sh miqdor uchun to'g'ridan-to'g'ri debet so'rovi yaratib bo'lmadi.
 SepaMandate=SEPA to'g'ridan-to'g'ri debet mandati
 SepaMandateShort=SEPA mandati
@@ -126,19 +126,19 @@ SEPAFrstOrRecur=To'lov turi
 ModeRECUR=Takroriy to'lov
 ModeFRST=Bir martalik to'lov
 PleaseCheckOne=Iltimos, bittasini tekshiring
-CreditTransferOrderCreated=Credit transfer order %s created
-DirectDebitOrderCreated=Direct debit order %s created
-AmountRequested=Amount requested
+CreditTransferOrderCreated=%s kredit o'tkazish bo'yicha buyurtma yaratildi
+DirectDebitOrderCreated=To'g'ridan-to'g'ri debet buyurtmasi %s yaratildi
+AmountRequested=Miqdor so‘raldi
 SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
-ExecutionDate=Execution date
-CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI for direct debit
-ICSTransfer=Creditor Identifier CI for bank transfer
-END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
-USTRD="Unstructured" SEPA XML tag
-ADDDAYS=Add days to Execution Date
-NoDefaultIBANFound=No default IBAN found for this third party
+ExecutionDate=Ijro sanasi
+CreateForSepa=To'g'ridan-to'g'ri debet faylini yarating
+ICS=To'g'ridan-to'g'ri debet uchun kreditor identifikatori CI
+ICSTransfer=Bank o'tkazmasi uchun kreditor identifikatori CI
+END_TO_END="EndToEndId" SEPA XML yorlig'i - bitim uchun yagona identifikator
+USTRD="Strukturasiz" SEPA XML yorlig'i
+ADDDAYS=Ijro sanasiga kunlarni qo'shing
+NoDefaultIBANFound=Ushbu uchinchi tomon uchun standart IBAN topilmadi
 ### Notifications
 InfoCreditSubject=%s to'g'ridan-to'g'ri debet to'lov topshirig'ini bank tomonidan to'lash
 InfoCreditMessage=%s to'g'ridan-to'g'ri debet to'lov topshirig'ini bank tomonidan to'langan <br> To'lov ma'lumotlari: %s
@@ -148,6 +148,6 @@ InfoTransData=Miqdor: %s <br> usuli: %s <br> Sana: %s
 InfoRejectSubject=To'g'ridan-to'g'ri debet to'lovi buyurtmasi rad etildi
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Haqiqiy rejim uchun parametr o'rnatilmagan, biz ushbu simulyatsiyadan so'ng to'xtaymiz
-ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
-ErrorICSmissing=Missing ICS in Bank account %s
-TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Total amount of direct debit order differs from sum of lines
+ErrorCompanyHasDuplicateDefaultBAN=%s id raqamiga ega kompaniya bir nechta standart bank hisobvarag'iga ega. Qaysi birini ishlatishni bilishning imkoni yo'q.
+ErrorICSmissing=Bank hisobidagi %s yo'qolgan ICS
+TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=To'g'ridan-to'g'ri debet buyurtmasining umumiy miqdori satrlar yig'indisidan farq qiladi
diff --git a/htdocs/langs/uz_UZ/workflow.lang b/htdocs/langs/uz_UZ/workflow.lang
index 976d0e62426..5c089e446b0 100644
--- a/htdocs/langs/uz_UZ/workflow.lang
+++ b/htdocs/langs/uz_UZ/workflow.lang
@@ -14,12 +14,12 @@ descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Mijozlarning hisob-fakturasi t
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Mijozlarning hisob-fakturasi to'lash uchun o'rnatilganda (va agar schyot-faktura miqdori bog'langan buyurtmaning umumiy miqdori bilan bir xil bo'lsa) bog'langan manbalarni sotish buyurtmasini billing sifatida tasniflang.
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Bog'langan manbalarni sotish buyurtmasini jo'natma tasdiqlanganda jo'natilgan deb tasniflang (va agar barcha jo'natmalar tomonidan jo'natilgan miqdor yangilanish uchun buyurtma bilan bir xil bo'lsa)
 # Autoclassify purchase order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked proposal)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
-descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Bog'langan manba etkazib beruvchisi taklifini sotuvchi hisob-fakturasi tasdiqlangandan keyin hisob-kitob sifatida tasniflang (va agar faktura miqdori bog'langan taklifning umumiy miqdori bilan bir xil bo'lsa)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Sotib oluvchi hisob-fakturasi tasdiqlanganda bog'langan manbadan sotib olish buyurtmasini billing sifatida tasniflang (va agar schyot-fakturaning miqdori bog'langan buyurtmaning umumiy miqdori bilan bir xil bo'lsa)
+descWORKFLOW_BILL_ON_RECEPTION=Bog'langan etkazib beruvchining buyurtmasi tasdiqlanganda qabullarni "hisob-kitob" ga tasniflang
 # Autoclose intervention
-descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Chipta yopilganda chipta bilan bog'liq barcha aralashuvlarni yoping
 AutomaticCreation=Avtomatik yaratish
 AutomaticClassification=Avtomatik tasnif
 # Autoclassify shipment
-descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when customer invoice is validated
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Mijozlarning hisob-fakturasi tasdiqlanganda bog'langan manbalarni etkazib berishni yopiq deb tasniflang
diff --git a/htdocs/langs/uz_UZ/zapier.lang b/htdocs/langs/uz_UZ/zapier.lang
index b4cc4ccba4a..caa4ebfb810 100644
--- a/htdocs/langs/uz_UZ/zapier.lang
+++ b/htdocs/langs/uz_UZ/zapier.lang
@@ -13,9 +13,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-ModuleZapierForDolibarrName = Zapier for Dolibarr
-ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
-ZapierForDolibarrSetup=Setup of Zapier for Dolibarr
-ZapierDescription=Interface with Zapier
-ZapierAbout=About the module Zapier
-ZapierSetupPage=There is no need for a setup on Dolibarr side to use Zapier. However, you must generate and publish a package on zapier to be able to use Zapier with Dolibarr. See documentation on <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">this wiki page</a>.
+ModuleZapierForDolibarrName = Dolibarr uchun Zapier
+ModuleZapierForDolibarrDesc = Dolibarr moduli uchun zapier
+ZapierForDolibarrSetup=Dolibarr uchun Zapier-ni sozlash
+ZapierDescription=Zapier bilan interfeys
+ZapierAbout=Zapier moduli haqida
+ZapierSetupPage=Zapier-dan foydalanish uchun Dolibarr tomonida o'rnatishga hojat yo'q. Biroq, Zapier-dan Dolibarr bilan foydalanish uchun siz zapier-da paket yaratishingiz va nashr qilishingiz kerak. <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">-dagi ushbu viki-sahifadagi </a>-dagi hujjatlarni ko'ring.
diff --git a/htdocs/langs/vi_VN/admin.lang b/htdocs/langs/vi_VN/admin.lang
index 1472187c65c..a61b7477d58 100644
--- a/htdocs/langs/vi_VN/admin.lang
+++ b/htdocs/langs/vi_VN/admin.lang
@@ -53,6 +53,7 @@ InternalUser=Người dùng bên trong
 ExternalUser=Người dùng bên ngoài
 InternalUsers=Người dùng bên trong
 ExternalUsers=Người dùng bên ngoài
+UserInterface=User interface
 GUISetup=Hiển thị
 SetupArea=Thiết lập
 UploadNewTemplate=Tải lên (các) mẫu mới
@@ -1260,8 +1261,8 @@ YourPHPDoesNotHaveSSLSupport=Chức năng SSL không có sẵn trong chương tr
 DownloadMoreSkins=Nhiều giao diện để tải về
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
-ShowProfIdInAddress=Hiển thị id chuyên nghiệp với địa chỉ
-ShowVATIntaInAddress=Ẩn số VAT Cộng Đồng nội bộ với địa chỉ
+ShowProfIdInAddress=Show professional ID with addresses
+ShowVATIntaInAddress=Hide intra-Community VAT number
 TranslationUncomplete=Partial translation
 MAIN_DISABLE_METEO=Vô hiệu hóa chế độ xem khí tượng
 MeteoStdMod=Chế độ tiêu chuẩn
@@ -1778,7 +1779,7 @@ ClickToDialSetup=Click To Dial module setup
 ClickToDialUrlDesc=Url được gọi khi nhấp chuột vào hình ảnh điện thoại được thực hiện. Trong URL, bạn có thể sử dụng thẻ <br> <b>__PHONETO__</b> sẽ được thay thế bằng số điện thoại của người cần gọi <br> <b>__PHONEFROM__</b> sẽ được thay thế bằng số điện thoại của người gọi (của bạn) <br> <b>__LOGIN__</b> sẽ được thay thế bằng đăng nhập clicktodial (được xác định trên thẻ người dùng) <br> <b>__PASS__</b> sẽ được thay thế bằng mật khẩu clicktodial (được xác định trên thẻ người dùng).
 ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Chỉ sử dụng một liên kết "tel:" trên các số điện thoại
-ClickToDialUseTelLinkDesc=Sử dụng phương pháp này nếu người dùng của bạn có điện thoại phần mềm hoặc giao diện phần mềm được cài đặt trên cùng một máy tính với trình duyệt và được gọi khi bạn nhấp vào liên kết trong trình duyệt bắt đầu bằng "tel:". Nếu bạn cần một giải pháp máy chủ đầy đủ (không cần cài đặt phần mềm cục bộ), bạn phải đặt giải pháp này thành "Không" và điền vào trường tiếp theo.
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface, installed on the same computer as the browser, and called when you click on a link starting with "tel:" in your browser. If you need link that start with "sip:" or a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Điểm bán hàng
 CashDeskSetup=Thiết lập mô-đun Điểm bán hàng
@@ -2133,7 +2134,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
-NotRecommended=Not recommanded
+Recommended=Khuyên dùng
+NotRecommended=Not recommended
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
@@ -2144,3 +2146,5 @@ YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You s
 RandomlySelectedIfSeveral=Randomly selected if several pictures are available
 DatabasePasswordObfuscated=Database password is obfuscated in conf file
 DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
+APIsAreNotEnabled=APIs modules are not enabled
+YouShouldSetThisToOff=You should set this to 0 or off
diff --git a/htdocs/langs/vi_VN/banks.lang b/htdocs/langs/vi_VN/banks.lang
index 49d8b63b362..bd56f7bb41e 100644
--- a/htdocs/langs/vi_VN/banks.lang
+++ b/htdocs/langs/vi_VN/banks.lang
@@ -115,7 +115,7 @@ TransferTo=Đến
 TransferFromToDone=Một chuyển khoản từ <b>%s</b> đến <b>%s</b> của <b>%s</b> %s đã được ghi lại.
 CheckTransmitter=Người gửi
 ValidateCheckReceipt=Kiểm tra chứng từ séc này?
-ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes will be possible once validated.
 DeleteCheckReceipt=Xóa biên nhận séc này?
 ConfirmDeleteCheckReceipt=Bạn có muốn xóa biên nhận séc này?
 BankChecks=Séc ngân hàng
diff --git a/htdocs/langs/vi_VN/boxes.lang b/htdocs/langs/vi_VN/boxes.lang
index 8a9692b7254..d648b2fe6c3 100644
--- a/htdocs/langs/vi_VN/boxes.lang
+++ b/htdocs/langs/vi_VN/boxes.lang
@@ -91,8 +91,8 @@ BoxTitleLatestModifiedSupplierOrders=Đơn đặt hàng của nhà cung cấp: %
 BoxTitleLastModifiedCustomerBills=Hóa đơn khách hàng: %s được sửa đổi lần cuối
 BoxTitleLastModifiedCustomerOrders=Đơn đặt hàng bán: %s được sửa đổi lần cuối
 BoxTitleLastModifiedPropals=Đề xuất sửa đổi %s mới nhất
-BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
-BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
+BoxTitleLatestModifiedJobPositions=Latest %s modified job positions
+BoxTitleLatestModifiedCandidatures=Latest %s modified job applications
 ForCustomersInvoices=Khách hàng hoá đơn
 ForCustomersOrders=Khách hàng đặt hàng
 ForProposals=Đề xuất
diff --git a/htdocs/langs/vi_VN/cashdesk.lang b/htdocs/langs/vi_VN/cashdesk.lang
index ebe9f02e17d..100cd049586 100644
--- a/htdocs/langs/vi_VN/cashdesk.lang
+++ b/htdocs/langs/vi_VN/cashdesk.lang
@@ -127,4 +127,4 @@ AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
 ShowPriceHT = Display the column with the price excluding tax (on screen)
-ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on the receipt)
diff --git a/htdocs/langs/vi_VN/errors.lang b/htdocs/langs/vi_VN/errors.lang
index 6b10871a692..0eb21183959 100644
--- a/htdocs/langs/vi_VN/errors.lang
+++ b/htdocs/langs/vi_VN/errors.lang
@@ -301,3 +301,4 @@ ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
 ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
+ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
diff --git a/htdocs/langs/vi_VN/eventorganization.lang b/htdocs/langs/vi_VN/eventorganization.lang
index 2732b9eda3b..53b30dbd5d6 100644
--- a/htdocs/langs/vi_VN/eventorganization.lang
+++ b/htdocs/langs/vi_VN/eventorganization.lang
@@ -86,6 +86,7 @@ DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
 SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
 SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
+NbVotes=Number of votes
 #
 # Status
 #
@@ -115,6 +116,9 @@ EvntOrgDuration = This conference starts on %s and ends on %s.
 ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
 BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
 EventType = Loại sự kiện
+LabelOfBooth=Booth label
+LabelOfconference=Conference label
+ConferenceIsNotConfirmed=Subcription not available, conference is not confirmed yet
 
 #
 # Vote page
diff --git a/htdocs/langs/vi_VN/install.lang b/htdocs/langs/vi_VN/install.lang
index d11a96b5d67..ca906feef39 100644
--- a/htdocs/langs/vi_VN/install.lang
+++ b/htdocs/langs/vi_VN/install.lang
@@ -206,6 +206,7 @@ MigrationUserPhotoPath=Di chuyển đường dẫn ảnh cho người dùng
 MigrationFieldsSocialNetworks=Di chuyển các trường người dùng mạng xã hội (%s)
 MigrationReloadModule=Tải lại mô-đun %s
 MigrationResetBlockedLog=Đặt lại mô-đun BlockedLog cho thuật toán v7
+MigrationImportOrExportProfiles=Migration of import or export profiles (%s)
 ShowNotAvailableOptions=Hiển thị các tùy chọn không khả dụng
 HideNotAvailableOptions=Ẩn các tùy chọn không khả dụng
 ErrorFoundDuringMigration=(Các) lỗi đã được báo cáo trong quá trình di chuyển nên bước tiếp theo không khả dụng. Để bỏ qua lỗi, bạn có thể <a href="%s">nhấp vào đây</a> , nhưng ứng dụng hoặc một số tính năng có thể không hoạt động chính xác cho đến khi lỗi được giải quyết.
diff --git a/htdocs/langs/vi_VN/interventions.lang b/htdocs/langs/vi_VN/interventions.lang
index a926870eaa4..282ab4f63ff 100644
--- a/htdocs/langs/vi_VN/interventions.lang
+++ b/htdocs/langs/vi_VN/interventions.lang
@@ -41,9 +41,7 @@ InterventionsArea=Khu vực can thiệp
 DraftFichinter=Dự thảo can thiệp
 LastModifiedInterventions=Can thiệp sửa đổi mới nhất %s
 FichinterToProcess=Can thiệp để xử lý
-##### Types de contacts #####
 TypeContact_fichinter_external_CUSTOMER=Theo dõi liên lạc của khách hàng
-# Modele numérotation
 PrintProductsOnFichinter=Đồng thời in các dòng loại "sản phẩm" (không chỉ dịch vụ) trên thẻ can thiệp
 PrintProductsOnFichinterDetails=can thiệp được tạo ra từ các đơn đặt hàng
 UseServicesDurationOnFichinter=Sử dụng thời hạn dịch vụ cho các can thiệp được tạo ra từ các đơn đặt hàng
@@ -53,7 +51,6 @@ InterventionStatistics=Thống kê các can thiệp
 NbOfinterventions=Số lượng thẻ can thiệp
 NumberOfInterventionsByMonth=Số thẻ can thiệp theo tháng (ngày xác nhận)
 AmountOfInteventionNotIncludedByDefault=Số tiền can thiệp không được tính theo mặc định vào lợi nhuận (trong hầu hết các trường hợp, bảng chấm công được sử dụng để tính thời gian tiêu thụ). Thêm tùy chọn gồm PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT thành 1 vào Nhà - Thiết lập - Khác
-##### Exports #####
 InterId=Id Can thiệp
 InterRef=Tham chiếu Can thiệp.
 InterDateCreation=Ngày tạo Can thiệp
@@ -65,3 +62,7 @@ InterLineId=ID dòng Can thiệp
 InterLineDate=Ngày của dòng Can thiệp
 InterLineDuration=Thời hạn dòng Can thiệp
 InterLineDesc=Mô tả dòng Can thiệp
+RepeatableIntervention=Mẫu can thiệp
+ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
+Reopen=Mở lại
+ConfirmReopenIntervention=Are you sure you want to open back the intervention <b>%s</b>?
diff --git a/htdocs/langs/vi_VN/productbatch.lang b/htdocs/langs/vi_VN/productbatch.lang
index 8d7e76e7b7c..7201a8fb3bf 100644
--- a/htdocs/langs/vi_VN/productbatch.lang
+++ b/htdocs/langs/vi_VN/productbatch.lang
@@ -26,12 +26,10 @@ ShowLogOfMovementIfLot=Hiển thị nhật ký biến động kho cho cặp sả
 StockDetailPerBatch=Chi tiết tồn kho trên mỗi lô
 SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
-BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
-BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
 ManageLotMask=Custom mask
-CustomMasks=Adds an option to define mask in the product card
-LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
-SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+CustomMasks=Option to define a different numbering mask for each product
+BatchLotNumberingModules=Numbering rule for automatic generation of lot number
+BatchSerialNumberingModules=Numbering rule for automatic generation of serial number (for products with property 1 unique lot/serial for each product)
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
diff --git a/htdocs/langs/vi_VN/products.lang b/htdocs/langs/vi_VN/products.lang
index c0d647c8ee7..fe2daf23a60 100644
--- a/htdocs/langs/vi_VN/products.lang
+++ b/htdocs/langs/vi_VN/products.lang
@@ -277,7 +277,7 @@ PriceByCustomer=Giá khác nhau cho mỗi khách hàng
 PriceCatalogue=Giá bán lẻ cho từng sản phẩm/dịch vụ
 PricingRule=Quy tắc cho giá bán
 AddCustomerPrice=Thêm giá theo khách hàng
-ForceUpdateChildPriceSoc=Đặt giá giống nhau trên nhóm khách hàng phụ thuộc
+ForceUpdateChildPriceSoc=Set same price on customer's subsidiaries
 PriceByCustomerLog=Nhật ký giá trước đây của khách hàng
 MinimumPriceLimit=Giá tối thiểu không thể thấp hơn %s
 MinimumRecommendedPrice=Giá đề xuất tối thiểu là: %s
@@ -296,6 +296,7 @@ ComposedProductIncDecStock=Tăng/Giảm tồn kho trên thay đổi gốc
 ComposedProduct=Các sản phẩm con
 MinSupplierPrice=Giá mua tối thiểu
 MinCustomerPrice=Giá bán tối thiểu
+NoDynamicPrice=No dynamic price
 DynamicPriceConfiguration=Cấu hình giá linh hoạt
 DynamicPriceDesc=Bạn có thể định nghĩa các công thức toán học để tính giá cho Khách hàng hoặc của Nhà cung cấp. Các công thức như vậy có thể sử dụng tất cả các toán tử, hằng số và biến. Ở đây, bạn có thể định nghĩa các biến bạn muốn sử dụng. Nếu biến cần cập nhật tự động, bạn có thể định rõ URL bên ngoài để cho phép Dolibarr tự động cập nhật giá trị.
 AddVariable=Thêm biến
diff --git a/htdocs/langs/vi_VN/salaries.lang b/htdocs/langs/vi_VN/salaries.lang
index b553a9fde51..e0bbab568a9 100644
--- a/htdocs/langs/vi_VN/salaries.lang
+++ b/htdocs/langs/vi_VN/salaries.lang
@@ -2,20 +2,23 @@
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Tài khoản kế toán được sử dụng cho bên thứ ba của người dùng
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=Tài khoản kế toán chuyên dụng được xác định trên thẻ người dùng sẽ chỉ được sử dụng cho kế toán Sổ phụ. Tài khoản này sẽ được sử dụng cho Sổ cái chung và là giá trị mặc định của kế toán Sổ phụ nếu tài khoản kế toán chuyên dụng trên người dùng không được xác định.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Tài khoản kế toán theo mặc định cho các khoản thanh toán tiền lương
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=By default, leave empty the option "Automatically create a total payment" when creating a Salary
 Salary=Mức lương
 Salaries=Tiền lương
-NewSalaryPayment=Thanh toán tiền lương mới
+NewSalary=New salary
+NewSalaryPayment=New salary card
 AddSalaryPayment=Thêm thanh toán tiền lương
 SalaryPayment=Thanh toán tiền lương
 SalariesPayments=Lương thanh toán
+SalariesPaymentsOf=Salaries payments of %s
 ShowSalaryPayment=Hiện thanh toán tiền lương
 THM=Tỷ lệ trung bình mỗi giờ
 TJM=Tỷ lệ trung bình hàng ngày
 CurrentSalary=Mức lương hiện tại
 THMDescription=Giá trị này có thể được sử dụng để tính chi phí thời gian tiêu thụ cho một dự án được nhập bởi người dùng nếu mô-đun dự án được sử dụng
 TJMDescription=Giá trị này hiện chỉ là thông tin và không được sử dụng cho bất kỳ phép tính nào
-LastSalaries=Thanh toán tiền lương %s mới nhất
-AllSalaries=Tất cả các khoản thanh toán tiền lương
+LastSalaries=Latest %s salaries
+AllSalaries=All salaries
 SalariesStatistics=Thống kê lương
-# Export
 SalariesAndPayments=Lương và thanh toán
+ConfirmDeleteSalaryPayment=Do you want to delete this salary payment ?
diff --git a/htdocs/langs/vi_VN/ticket.lang b/htdocs/langs/vi_VN/ticket.lang
index eb59437398d..a5be7d8cb6a 100644
--- a/htdocs/langs/vi_VN/ticket.lang
+++ b/htdocs/langs/vi_VN/ticket.lang
@@ -34,7 +34,8 @@ TicketDictResolution=Ticket - Resolution
 
 TicketTypeShortCOM=Câu hỏi thương mại
 TicketTypeShortHELP=Yêu cầu trợ giúp chức năng
-TicketTypeShortISSUE=Sự cố, lỗi hoặc vấn đề
+TicketTypeShortISSUE=Issue or bug
+TicketTypeShortPROBLEM=Problem
 TicketTypeShortREQUEST=Yêu cầu thay đổi hoặc nâng cao
 TicketTypeShortPROJET=Dự án
 TicketTypeShortOTHER=Khác
@@ -54,14 +55,15 @@ TypeContact_ticket_internal_SUPPORTTEC=Người dùng được chỉ định
 TypeContact_ticket_external_SUPPORTCLI=Theo dõi liên lạc / sự cố khách hàng 
 TypeContact_ticket_external_CONTRIBUTOR=Người cộng tác bên ngoài
 
-OriginEmail=Nguồn email
+OriginEmail=Reporter Email
 Notify_TICKET_SENTBYMAIL=Gửi tin nhắn vé qua email
 
 # Status
 Read=Đọc
 Assigned=Phân công
 InProgress=Trong tiến trình xử lý
-NeedMoreInformation=Đang chờ thông tin
+NeedMoreInformation=Waiting for reporter feedback
+NeedMoreInformationShort=Waiting for feedback
 Answered=Đã trả lời
 Waiting=Đang chờ
 Closed=Đã đóng
@@ -160,7 +162,7 @@ CreatedBy=Được tạo bởi
 NewTicket=Vé mới
 SubjectAnswerToTicket=Trả lời vé
 TicketTypeRequest=Loại yêu cầu
-TicketCategory=Nhóm
+TicketCategory=Ticket categorization
 SeeTicket=Xem vé
 TicketMarkedAsRead=Vé đã được đánh dấu là đã đọc
 TicketReadOn=Đọc tiếp
@@ -211,6 +213,7 @@ TicketMessageHelp=Chỉ văn bản này sẽ được lưu trong danh sách tin
 TicketMessageSubstitutionReplacedByGenericValues=Các biến thay thế được thay thế bằng các giá trị chung.
 TimeElapsedSince=Thời gian trôi qua kể từ khi
 TicketTimeToRead=Thời gian trôi qua trước khi đọc
+TicketTimeElapsedBeforeSince=Time elapsed before / since
 TicketContacts=Liên hệ vé
 TicketDocumentsLinked=Tài liệu liên kết với vé
 ConfirmReOpenTicket=Xác nhận mở lại vé này?
diff --git a/htdocs/langs/vi_VN/users.lang b/htdocs/langs/vi_VN/users.lang
index 73fbed5392e..6c34f21df6c 100644
--- a/htdocs/langs/vi_VN/users.lang
+++ b/htdocs/langs/vi_VN/users.lang
@@ -97,8 +97,8 @@ LoginToCreate=Đăng nhập để tạo
 NameToCreate=Tên của bên thứ ba để tạo
 YourRole=Vai trò của bạn
 YourQuotaOfUsersIsReached=Hạn ngạch của người dùng hoạt động đã hết!
-NbOfUsers=Số lượng người dùng
-NbOfPermissions=Số lượng phân quyền
+NbOfUsers=Number of users
+NbOfPermissions=Number of permissions
 DontDowngradeSuperAdmin=Chỉ có một superadmin có thể hạ bậc một superadmin
 HierarchicalResponsible=Giám sát
 HierarchicView=Xem tính kế thừa
diff --git a/htdocs/langs/vi_VN/website.lang b/htdocs/langs/vi_VN/website.lang
index c88a35daf86..def041bf053 100644
--- a/htdocs/langs/vi_VN/website.lang
+++ b/htdocs/langs/vi_VN/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Thêm trang web
 Webpage=Trang web / vùng chứa
 AddPage=Thêm trang / vùng chứa
 PageContainer=Trang
-PreviewOfSiteNotYetAvailable=Xem trước trang web của bạn <strong>%s</strong> chưa có sẵn. Trước tiên, bạn phải ' <strong>Nhập mẫu trang web đầy đủ</strong> ' hoặc chỉ ' <strong>Thêm trang / vùng chứa</strong> '.
+PreviewOfSiteNotYetAvailable=The preview of your website <strong>%s</strong> is not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Trang được yêu cầu có id %s chưa có nội dung hoặc tệp bộ đệm .tpl.php đã bị xóa. Chỉnh sửa nội dung của trang để giải quyết điều này.
 SiteDeleted=Trang web '%s' đã bị xóa
 PageContent=Trang / Vùng chứa
diff --git a/htdocs/langs/zh_CN/admin.lang b/htdocs/langs/zh_CN/admin.lang
index be986a707fe..01242313797 100644
--- a/htdocs/langs/zh_CN/admin.lang
+++ b/htdocs/langs/zh_CN/admin.lang
@@ -53,6 +53,7 @@ InternalUser=内部员工用户
 ExternalUser=外部用户
 InternalUsers=内部员工用户
 ExternalUsers=外部用户
+UserInterface=User interface
 GUISetup=主题
 SetupArea=设置
 UploadNewTemplate=上传新模板
@@ -1260,8 +1261,8 @@ YourPHPDoesNotHaveSSLSupport=SSL 在您的 PHP 中不可用
 DownloadMoreSkins=下载更多外观主题
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
-ShowProfIdInAddress=Show professional id with addresses
-ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
+ShowProfIdInAddress=Show professional ID with addresses
+ShowVATIntaInAddress=Hide intra-Community VAT number
 TranslationUncomplete=部分翻译
 MAIN_DISABLE_METEO=Disable meteorological view
 MeteoStdMod=标准模式
@@ -1778,7 +1779,7 @@ ClickToDialSetup=点击拨号模块设置
 ClickToDialUrlDesc=当点击手机图片完成时，网址会被呼叫。在网址中，您可以使用标记为<br> <b> __ PHONETO __ </b>，这些标记将替换为要拨打电话号码的人员的电话号码<br><b> __ PHONEFROM __ </b>将替换为通话电话号码person（你的）<br> <b> __ LOGIN __</b>将替换为clicktodial登录（在用户卡上定义）<br> <b> __ PASS __ </b>将替换为clicktodial密码（在用户上定义）卡）。
 ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=在电话号码上链接 "tel:"
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface, installed on the same computer as the browser, and called when you click on a link starting with "tel:" in your browser. If you need link that start with "sip:" or a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Point of Sale
 CashDeskSetup=Point of Sales module setup
@@ -2133,7 +2134,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
-NotRecommended=Not recommanded
+Recommended=推荐
+NotRecommended=Not recommended
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
@@ -2144,3 +2146,5 @@ YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You s
 RandomlySelectedIfSeveral=Randomly selected if several pictures are available
 DatabasePasswordObfuscated=Database password is obfuscated in conf file
 DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
+APIsAreNotEnabled=APIs modules are not enabled
+YouShouldSetThisToOff=You should set this to 0 or off
diff --git a/htdocs/langs/zh_CN/banks.lang b/htdocs/langs/zh_CN/banks.lang
index 958757ffeda..63419453329 100644
--- a/htdocs/langs/zh_CN/banks.lang
+++ b/htdocs/langs/zh_CN/banks.lang
@@ -115,7 +115,7 @@ TransferTo=至
 TransferFromToDone=从<b>%s</b>向<b>%s</b>转帐<b>%s</b>已被记录。
 CheckTransmitter=发送方
 ValidateCheckReceipt=验证此支票收据？
-ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes will be possible once validated.
 DeleteCheckReceipt=删除此支票收据？
 ConfirmDeleteCheckReceipt=您确定要删除此支票收据吗？
 BankChecks=银行支票
diff --git a/htdocs/langs/zh_CN/boxes.lang b/htdocs/langs/zh_CN/boxes.lang
index 0f72cb46cb6..d2b765df1c0 100644
--- a/htdocs/langs/zh_CN/boxes.lang
+++ b/htdocs/langs/zh_CN/boxes.lang
@@ -91,8 +91,8 @@ BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
 BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
 BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
 BoxTitleLastModifiedPropals=最近变更的 %s 份报价
-BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
-BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
+BoxTitleLatestModifiedJobPositions=Latest %s modified job positions
+BoxTitleLatestModifiedCandidatures=Latest %s modified job applications
 ForCustomersInvoices=客户发票
 ForCustomersOrders=客户订单
 ForProposals=报价
diff --git a/htdocs/langs/zh_CN/cashdesk.lang b/htdocs/langs/zh_CN/cashdesk.lang
index a3f2b9b5b87..068b5c083ca 100644
--- a/htdocs/langs/zh_CN/cashdesk.lang
+++ b/htdocs/langs/zh_CN/cashdesk.lang
@@ -127,4 +127,4 @@ AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
 ShowPriceHT = Display the column with the price excluding tax (on screen)
-ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on the receipt)
diff --git a/htdocs/langs/zh_CN/errors.lang b/htdocs/langs/zh_CN/errors.lang
index 8938226cf7c..6104b84e4fd 100644
--- a/htdocs/langs/zh_CN/errors.lang
+++ b/htdocs/langs/zh_CN/errors.lang
@@ -301,3 +301,4 @@ ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
 ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
+ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
diff --git a/htdocs/langs/zh_CN/eventorganization.lang b/htdocs/langs/zh_CN/eventorganization.lang
index 783f3173661..46e13a3af84 100644
--- a/htdocs/langs/zh_CN/eventorganization.lang
+++ b/htdocs/langs/zh_CN/eventorganization.lang
@@ -86,6 +86,7 @@ DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
 SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
 SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
+NbVotes=Number of votes
 #
 # Status
 #
@@ -115,6 +116,9 @@ EvntOrgDuration = This conference starts on %s and ends on %s.
 ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
 BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
 EventType = 活动类型
+LabelOfBooth=Booth label
+LabelOfconference=Conference label
+ConferenceIsNotConfirmed=Subcription not available, conference is not confirmed yet
 
 #
 # Vote page
diff --git a/htdocs/langs/zh_CN/install.lang b/htdocs/langs/zh_CN/install.lang
index f1b8ca9dec4..a065602c849 100644
--- a/htdocs/langs/zh_CN/install.lang
+++ b/htdocs/langs/zh_CN/install.lang
@@ -206,6 +206,7 @@ MigrationUserPhotoPath=Migration of photo paths for users
 MigrationFieldsSocialNetworks=Migration of users fields social networks (%s)
 MigrationReloadModule=重载模块%s
 MigrationResetBlockedLog=重置模块BlockedLog for v7算法
+MigrationImportOrExportProfiles=Migration of import or export profiles (%s)
 ShowNotAvailableOptions=Show unavailable options
 HideNotAvailableOptions=Hide unavailable options
 ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
diff --git a/htdocs/langs/zh_CN/interventions.lang b/htdocs/langs/zh_CN/interventions.lang
index cdeaceb4571..dc11371f4cc 100644
--- a/htdocs/langs/zh_CN/interventions.lang
+++ b/htdocs/langs/zh_CN/interventions.lang
@@ -64,3 +64,5 @@ InterLineDuration=线路持续时间干预
 InterLineDesc=线描述干预
 RepeatableIntervention=Template of intervention
 ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
+Reopen=重新打开
+ConfirmReopenIntervention=Are you sure you want to open back the intervention <b>%s</b>?
diff --git a/htdocs/langs/zh_CN/productbatch.lang b/htdocs/langs/zh_CN/productbatch.lang
index 2f2ebf5f722..306ab09c547 100644
--- a/htdocs/langs/zh_CN/productbatch.lang
+++ b/htdocs/langs/zh_CN/productbatch.lang
@@ -26,12 +26,10 @@ ShowLogOfMovementIfLot=显示成对产品/批次的动作日志
 StockDetailPerBatch=每批库存详细信息
 SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
-BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
-BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
 ManageLotMask=Custom mask
-CustomMasks=Adds an option to define mask in the product card
-LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
-SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+CustomMasks=Option to define a different numbering mask for each product
+BatchLotNumberingModules=Numbering rule for automatic generation of lot number
+BatchSerialNumberingModules=Numbering rule for automatic generation of serial number (for products with property 1 unique lot/serial for each product)
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
diff --git a/htdocs/langs/zh_CN/products.lang b/htdocs/langs/zh_CN/products.lang
index 1ae64001f22..ea8d0a935c5 100644
--- a/htdocs/langs/zh_CN/products.lang
+++ b/htdocs/langs/zh_CN/products.lang
@@ -277,7 +277,7 @@ PriceByCustomer=每位客户不同价格
 PriceCatalogue=每产品/服务单独销售价
 PricingRule=Rules for selling prices
 AddCustomerPrice=为客户添加价格
-ForceUpdateChildPriceSoc=在客户子公司设置相同的价格
+ForceUpdateChildPriceSoc=Set same price on customer's subsidiaries
 PriceByCustomerLog=记录以前的客户价格
 MinimumPriceLimit=最低价格不允许低于 %s
 MinimumRecommendedPrice=Minimum recommended price is: %s
@@ -296,6 +296,7 @@ ComposedProductIncDecStock=增加/减少父库存变化
 ComposedProduct=Child products
 MinSupplierPrice=最低购买价格
 MinCustomerPrice=最低售价
+NoDynamicPrice=No dynamic price
 DynamicPriceConfiguration=动态价格配置
 DynamicPriceDesc=You may define mathematical formulae to calculate Customer or Vendor prices. Such formulas can use all mathematical operators, some constants and variables. You can define here the variables you wish to use. If the variable needs an automatic update, you may define the external URL to allow Dolibarr to update the value automatically.
 AddVariable=添加变量
diff --git a/htdocs/langs/zh_CN/salaries.lang b/htdocs/langs/zh_CN/salaries.lang
index 93c3171f3cd..1641f6b30d3 100644
--- a/htdocs/langs/zh_CN/salaries.lang
+++ b/htdocs/langs/zh_CN/salaries.lang
@@ -2,20 +2,23 @@
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=用于合伙人的会计帐户
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=财务记账科目代码
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=By default, leave empty the option "Automatically create a total payment" when creating a Salary
 Salary=工资
 Salaries=工资
-NewSalaryPayment=新建工资支付
+NewSalary=New salary
+NewSalaryPayment=New salary card
 AddSalaryPayment=Add salary payment
 SalaryPayment=工资支付
 SalariesPayments=工资支付
+SalariesPaymentsOf=Salaries payments of %s
 ShowSalaryPayment=显示工资支付
 THM=平均时薪
 TJM=平均日薪
 CurrentSalary=当前薪资
 THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
 TJMDescription=This value is currently for information only and is not used for any calculation
-LastSalaries=最新的%s工资支付
-AllSalaries=所有工资支付
+LastSalaries=Latest %s salaries
+AllSalaries=All salaries
 SalariesStatistics=Salary statistics
-# Export
 SalariesAndPayments=Salaries and payments
+ConfirmDeleteSalaryPayment=Do you want to delete this salary payment ?
diff --git a/htdocs/langs/zh_CN/ticket.lang b/htdocs/langs/zh_CN/ticket.lang
index c203431c156..72ecda956a0 100644
--- a/htdocs/langs/zh_CN/ticket.lang
+++ b/htdocs/langs/zh_CN/ticket.lang
@@ -34,7 +34,8 @@ TicketDictResolution=Ticket - Resolution
 
 TicketTypeShortCOM=商业问题
 TicketTypeShortHELP=Request for functionnal help
-TicketTypeShortISSUE=Issue, bug or problem
+TicketTypeShortISSUE=Issue or bug
+TicketTypeShortPROBLEM=Problem
 TicketTypeShortREQUEST=Change or enhancement request
 TicketTypeShortPROJET=项目
 TicketTypeShortOTHER=其他
@@ -54,14 +55,15 @@ TypeContact_ticket_internal_SUPPORTTEC=指定用户
 TypeContact_ticket_external_SUPPORTCLI=客户联系/事件跟踪
 TypeContact_ticket_external_CONTRIBUTOR=外部贡献者
 
-OriginEmail=电邮来源
+OriginEmail=Reporter Email
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
 Read=阅读
 Assigned=分配
 InProgress=进行中
-NeedMoreInformation=Waiting for information
+NeedMoreInformation=Waiting for reporter feedback
+NeedMoreInformationShort=Waiting for feedback
 Answered=回答
 Waiting=等候
 Closed=关闭
@@ -160,7 +162,7 @@ CreatedBy=制作：
 NewTicket=新票据
 SubjectAnswerToTicket=票据应答
 TicketTypeRequest=请求类型
-TicketCategory=组
+TicketCategory=Ticket categorization
 SeeTicket=查看票据
 TicketMarkedAsRead=票据已标记为已读
 TicketReadOn=请继续阅读
@@ -211,6 +213,7 @@ TicketMessageHelp=只有此文本将保存在故障单卡的消息列表中。
 TicketMessageSubstitutionReplacedByGenericValues=替换变量由通用值替换。
 TimeElapsedSince=Time elapsed since
 TicketTimeToRead=Time elapsed before read
+TicketTimeElapsedBeforeSince=Time elapsed before / since
 TicketContacts=联系票
 TicketDocumentsLinked=与票证相关的文件
 ConfirmReOpenTicket=确认重新打开此票？
diff --git a/htdocs/langs/zh_CN/users.lang b/htdocs/langs/zh_CN/users.lang
index 849601aab96..d86f4e2bb6b 100644
--- a/htdocs/langs/zh_CN/users.lang
+++ b/htdocs/langs/zh_CN/users.lang
@@ -97,8 +97,8 @@ LoginToCreate=登陆创建
 NameToCreate=创建合伙人名称
 YourRole=您的角色
 YourQuotaOfUsersIsReached=你的活跃用户达到配额！
-NbOfUsers=用户数量
-NbOfPermissions=权限数量
+NbOfUsers=Number of users
+NbOfPermissions=Number of permissions
 DontDowngradeSuperAdmin=只有超级管理员可以降级超级管理员
 HierarchicalResponsible=超级管理员
 HierarchicView=分层视图
diff --git a/htdocs/langs/zh_CN/website.lang b/htdocs/langs/zh_CN/website.lang
index b5b6277ab25..7e6f598ca4f 100644
--- a/htdocs/langs/zh_CN/website.lang
+++ b/htdocs/langs/zh_CN/website.lang
@@ -31,7 +31,7 @@ AddWebsite=添加网站
 Webpage=网页/容器
 AddPage=添加页面/容器
 PageContainer=页面
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
+PreviewOfSiteNotYetAvailable=The preview of your website <strong>%s</strong> is not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=ID为%s的请求页面尚无内容，或者删除了缓存文件.tpl.php。编辑页面内容以解决此问题。
 SiteDeleted=Web site '%s' deleted
 PageContent=页/ Contenair
diff --git a/htdocs/langs/zh_HK/admin.lang b/htdocs/langs/zh_HK/admin.lang
index be9aca94599..73004a3c8b1 100644
--- a/htdocs/langs/zh_HK/admin.lang
+++ b/htdocs/langs/zh_HK/admin.lang
@@ -53,6 +53,7 @@ InternalUser=Internal user
 ExternalUser=External user
 InternalUsers=Internal users
 ExternalUsers=External users
+UserInterface=User interface
 GUISetup=Display
 SetupArea=Setup
 UploadNewTemplate=Upload new template(s)
@@ -1260,8 +1261,8 @@ YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP
 DownloadMoreSkins=More skins to download
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
-ShowProfIdInAddress=Show professional id with addresses
-ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
+ShowProfIdInAddress=Show professional ID with addresses
+ShowVATIntaInAddress=Hide intra-Community VAT number
 TranslationUncomplete=Partial translation
 MAIN_DISABLE_METEO=Disable meteorological view
 MeteoStdMod=Standard mode
@@ -1778,7 +1779,7 @@ ClickToDialSetup=Click To Dial module setup
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
 ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface, installed on the same computer as the browser, and called when you click on a link starting with "tel:" in your browser. If you need link that start with "sip:" or a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Point of Sale
 CashDeskSetup=Point of Sales module setup
@@ -2133,7 +2134,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
-NotRecommended=Not recommanded
+Recommended=Recommended
+NotRecommended=Not recommended
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
@@ -2144,3 +2146,5 @@ YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You s
 RandomlySelectedIfSeveral=Randomly selected if several pictures are available
 DatabasePasswordObfuscated=Database password is obfuscated in conf file
 DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
+APIsAreNotEnabled=APIs modules are not enabled
+YouShouldSetThisToOff=You should set this to 0 or off
diff --git a/htdocs/langs/zh_HK/banks.lang b/htdocs/langs/zh_HK/banks.lang
index df7192bee25..a0b7942d446 100644
--- a/htdocs/langs/zh_HK/banks.lang
+++ b/htdocs/langs/zh_HK/banks.lang
@@ -115,7 +115,7 @@ TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
 CheckTransmitter=Sender
 ValidateCheckReceipt=Validate this check receipt?
-ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes will be possible once validated.
 DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
diff --git a/htdocs/langs/zh_HK/boxes.lang b/htdocs/langs/zh_HK/boxes.lang
index 0c9ea302fb8..710d49bfab6 100644
--- a/htdocs/langs/zh_HK/boxes.lang
+++ b/htdocs/langs/zh_HK/boxes.lang
@@ -91,8 +91,8 @@ BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
 BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
 BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
 BoxTitleLastModifiedPropals=Latest %s modified proposals
-BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
-BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
+BoxTitleLatestModifiedJobPositions=Latest %s modified job positions
+BoxTitleLatestModifiedCandidatures=Latest %s modified job applications
 ForCustomersInvoices=Customers invoices
 ForCustomersOrders=Customers orders
 ForProposals=Proposals
diff --git a/htdocs/langs/zh_HK/cashdesk.lang b/htdocs/langs/zh_HK/cashdesk.lang
index aea1f02f834..c9d0f7fcd0a 100644
--- a/htdocs/langs/zh_HK/cashdesk.lang
+++ b/htdocs/langs/zh_HK/cashdesk.lang
@@ -127,4 +127,4 @@ AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
 ShowPriceHT = Display the column with the price excluding tax (on screen)
-ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on the receipt)
diff --git a/htdocs/langs/zh_HK/errors.lang b/htdocs/langs/zh_HK/errors.lang
index 670f8c7a6bc..85b90ca4991 100644
--- a/htdocs/langs/zh_HK/errors.lang
+++ b/htdocs/langs/zh_HK/errors.lang
@@ -301,3 +301,4 @@ ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
 ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
+ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
diff --git a/htdocs/langs/zh_HK/eventorganization.lang b/htdocs/langs/zh_HK/eventorganization.lang
index 335c257b224..f361e6bc192 100644
--- a/htdocs/langs/zh_HK/eventorganization.lang
+++ b/htdocs/langs/zh_HK/eventorganization.lang
@@ -86,6 +86,7 @@ DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
 SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
 SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
+NbVotes=Number of votes
 #
 # Status
 #
@@ -115,6 +116,9 @@ EvntOrgDuration = This conference starts on %s and ends on %s.
 ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
 BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
 EventType = Event type
+LabelOfBooth=Booth label
+LabelOfconference=Conference label
+ConferenceIsNotConfirmed=Subcription not available, conference is not confirmed yet
 
 #
 # Vote page
diff --git a/htdocs/langs/zh_HK/install.lang b/htdocs/langs/zh_HK/install.lang
index 63947dad154..c1ffee936d7 100644
--- a/htdocs/langs/zh_HK/install.lang
+++ b/htdocs/langs/zh_HK/install.lang
@@ -206,6 +206,7 @@ MigrationUserPhotoPath=Migration of photo paths for users
 MigrationFieldsSocialNetworks=Migration of users fields social networks (%s)
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
+MigrationImportOrExportProfiles=Migration of import or export profiles (%s)
 ShowNotAvailableOptions=Show unavailable options
 HideNotAvailableOptions=Hide unavailable options
 ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
diff --git a/htdocs/langs/zh_HK/interventions.lang b/htdocs/langs/zh_HK/interventions.lang
index e5936f8246e..51079fca278 100644
--- a/htdocs/langs/zh_HK/interventions.lang
+++ b/htdocs/langs/zh_HK/interventions.lang
@@ -64,3 +64,5 @@ InterLineDuration=Line duration intervention
 InterLineDesc=Line description intervention
 RepeatableIntervention=Template of intervention
 ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
+Reopen=Reopen
+ConfirmReopenIntervention=Are you sure you want to open back the intervention <b>%s</b>?
diff --git a/htdocs/langs/zh_HK/productbatch.lang b/htdocs/langs/zh_HK/productbatch.lang
index 450d0285819..763af20c6b4 100644
--- a/htdocs/langs/zh_HK/productbatch.lang
+++ b/htdocs/langs/zh_HK/productbatch.lang
@@ -26,12 +26,10 @@ ShowLogOfMovementIfLot=Show log of movements for couple product/lot
 StockDetailPerBatch=Stock detail per lot
 SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
-BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
-BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
 ManageLotMask=Custom mask
-CustomMasks=Adds an option to define mask in the product card
-LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
-SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+CustomMasks=Option to define a different numbering mask for each product
+BatchLotNumberingModules=Numbering rule for automatic generation of lot number
+BatchSerialNumberingModules=Numbering rule for automatic generation of serial number (for products with property 1 unique lot/serial for each product)
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
diff --git a/htdocs/langs/zh_HK/products.lang b/htdocs/langs/zh_HK/products.lang
index 9638dfe5a25..fecbe7450c2 100644
--- a/htdocs/langs/zh_HK/products.lang
+++ b/htdocs/langs/zh_HK/products.lang
@@ -277,7 +277,7 @@ PriceByCustomer=Different prices for each customer
 PriceCatalogue=A single sell price per product/service
 PricingRule=Rules for selling prices
 AddCustomerPrice=Add price by customer
-ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
+ForceUpdateChildPriceSoc=Set same price on customer's subsidiaries
 PriceByCustomerLog=Log of previous customer prices
 MinimumPriceLimit=Minimum price can't be lower then %s
 MinimumRecommendedPrice=Minimum recommended price is: %s
@@ -296,6 +296,7 @@ ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Child products
 MinSupplierPrice=Minimum buying price
 MinCustomerPrice=Minimum selling price
+NoDynamicPrice=No dynamic price
 DynamicPriceConfiguration=Dynamic price configuration
 DynamicPriceDesc=You may define mathematical formulae to calculate Customer or Vendor prices. Such formulas can use all mathematical operators, some constants and variables. You can define here the variables you wish to use. If the variable needs an automatic update, you may define the external URL to allow Dolibarr to update the value automatically.
 AddVariable=Add Variable
diff --git a/htdocs/langs/zh_HK/salaries.lang b/htdocs/langs/zh_HK/salaries.lang
index 7c3c08a65bd..12905040b1a 100644
--- a/htdocs/langs/zh_HK/salaries.lang
+++ b/htdocs/langs/zh_HK/salaries.lang
@@ -2,20 +2,23 @@
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=By default, leave empty the option "Automatically create a total payment" when creating a Salary
 Salary=Salary
 Salaries=Salaries
-NewSalaryPayment=New salary payment
+NewSalary=New salary
+NewSalaryPayment=New salary card
 AddSalaryPayment=Add salary payment
 SalaryPayment=Salary payment
 SalariesPayments=Salaries payments
+SalariesPaymentsOf=Salaries payments of %s
 ShowSalaryPayment=Show salary payment
 THM=Average hourly rate
 TJM=Average daily rate
 CurrentSalary=Current salary
 THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
 TJMDescription=This value is currently for information only and is not used for any calculation
-LastSalaries=Latest %s salary payments
-AllSalaries=All salary payments
+LastSalaries=Latest %s salaries
+AllSalaries=All salaries
 SalariesStatistics=Salary statistics
-# Export
 SalariesAndPayments=Salaries and payments
+ConfirmDeleteSalaryPayment=Do you want to delete this salary payment ?
diff --git a/htdocs/langs/zh_HK/ticket.lang b/htdocs/langs/zh_HK/ticket.lang
index 1da32a5a99e..a1bed39c21d 100644
--- a/htdocs/langs/zh_HK/ticket.lang
+++ b/htdocs/langs/zh_HK/ticket.lang
@@ -34,7 +34,8 @@ TicketDictResolution=Ticket - Resolution
 
 TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
-TicketTypeShortISSUE=Issue, bug or problem
+TicketTypeShortISSUE=Issue or bug
+TicketTypeShortPROBLEM=Problem
 TicketTypeShortREQUEST=Change or enhancement request
 TicketTypeShortPROJET=Project
 TicketTypeShortOTHER=Other
@@ -54,14 +55,15 @@ TypeContact_ticket_internal_SUPPORTTEC=Assigned user
 TypeContact_ticket_external_SUPPORTCLI=Customer contact / incident tracking
 TypeContact_ticket_external_CONTRIBUTOR=External contributor
 
-OriginEmail=Email source
+OriginEmail=Reporter Email
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
 Read=Read
 Assigned=Assigned
 InProgress=In progress
-NeedMoreInformation=Waiting for information
+NeedMoreInformation=Waiting for reporter feedback
+NeedMoreInformationShort=Waiting for feedback
 Answered=Answered
 Waiting=Waiting
 Closed=Closed
@@ -160,7 +162,7 @@ CreatedBy=Created by
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Group
+TicketCategory=Ticket categorization
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
@@ -211,6 +213,7 @@ TicketMessageHelp=Only this text will be saved in the message list on ticket car
 TicketMessageSubstitutionReplacedByGenericValues=Substitutions variables are replaced by generic values.
 TimeElapsedSince=Time elapsed since
 TicketTimeToRead=Time elapsed before read
+TicketTimeElapsedBeforeSince=Time elapsed before / since
 TicketContacts=Contacts ticket
 TicketDocumentsLinked=Documents linked to ticket
 ConfirmReOpenTicket=Confirm reopen this ticket ?
diff --git a/htdocs/langs/zh_HK/users.lang b/htdocs/langs/zh_HK/users.lang
index 372090ea5ad..6aeaf128838 100644
--- a/htdocs/langs/zh_HK/users.lang
+++ b/htdocs/langs/zh_HK/users.lang
@@ -97,8 +97,8 @@ LoginToCreate=Login to create
 NameToCreate=Name of third party to create
 YourRole=Your roles
 YourQuotaOfUsersIsReached=Your quota of active users is reached !
-NbOfUsers=No. of users
-NbOfPermissions=No. of permissions
+NbOfUsers=Number of users
+NbOfPermissions=Number of permissions
 DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin
 HierarchicalResponsible=Supervisor
 HierarchicView=Hierarchical view
diff --git a/htdocs/langs/zh_HK/website.lang b/htdocs/langs/zh_HK/website.lang
index 1e727415ec2..dc2ec2c0b3d 100644
--- a/htdocs/langs/zh_HK/website.lang
+++ b/htdocs/langs/zh_HK/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 PageContainer=Page
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
+PreviewOfSiteNotYetAvailable=The preview of your website <strong>%s</strong> is not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
diff --git a/htdocs/langs/zh_TW/admin.lang b/htdocs/langs/zh_TW/admin.lang
index 365ca72b6e7..6b38f18be42 100644
--- a/htdocs/langs/zh_TW/admin.lang
+++ b/htdocs/langs/zh_TW/admin.lang
@@ -53,6 +53,7 @@ InternalUser=內部用戶
 ExternalUser=外部用戶
 InternalUsers=內部用戶
 ExternalUsers=外部用戶
+UserInterface=User interface
 GUISetup=顯示設定
 SetupArea=設定
 UploadNewTemplate=上傳新的範本
@@ -452,7 +453,7 @@ ExtrafieldParamHelpcheckbox=數值清單必須為含有關鍵字的行,數值 (
 ExtrafieldParamHelpradio=數值清單必須為含有關鍵字的行,數值 (關鍵字不能為 '0')<br><br>範例:<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::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarly a primary int key<br>- filtersql is a SQL condition. It can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<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::filtersql<br>Example: c_typent:libelle:id::filtersql<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=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
+ExtrafieldParamHelplink=參數必須為ObjectName:Classpath<br>語法 ObjectName:Classpath
 ExtrafieldParamHelpSeparator=保持空白以使用簡單的分隔符號<br>對於折疊分隔符號，將此值設定為1（預設情況下，對於新程序打開，然後為每個用戶程序保留狀態） <br>將其設定為2可折疊分隔符號（預設情況下，新程序已折疊，然後在每個用戶程序中保持狀態）
 LibraryToBuildPDF=PDF產生器程式庫
 LocalTaxDesc=某些國家/地區可能會對每個發票行使用兩到三種稅收。在這種情況下，請選擇第二種和第三種稅率的類型及其稅率。可能的類型是： <br> 1：不含營業稅的產品和服務應繳納地方稅（地方稅是根據不含稅的金額計算的） <br> 2：適用於包括營業稅在內的產品和服務的地方稅（地方稅按金額+主稅計算） <br> 3：不含營業稅的產品應繳納地方稅（地方稅是按不含稅的金額計算的） <br> 4：包括營業稅在內的產品均需繳納地方稅（地方稅是按金額+主營業稅計算的） <br> 5：不加營業稅的服務應繳納地方稅（地方稅是按不含稅的金額計算的） <br> 6：包括營業稅在內的服務需要繳納地方稅（地方稅是按金額+稅額計算的）
@@ -548,7 +549,7 @@ Module40Desc=供應商和採購管理（採購訂單和供應商發票開票）
 Module42Name=除錯日誌
 Module42Desc=日誌記錄 (file, syslog, ...)。這些日誌是針對技術性以及除錯用途。
 Module43Name=除錯列
-Module43Desc=A tool for developper adding a debug bar in your browser.
+Module43Desc=開發人員用來增加瀏覽器除錯欄的工具。
 Module49Name=編輯器
 Module49Desc=編輯器管理
 Module50Name=產品
@@ -562,7 +563,7 @@ Module53Desc=服務管理
 Module54Name=合約/訂閱
 Module54Desc=合約管理（服務或定期訂閱）
 Module55Name=條碼
-Module55Desc=Barcode or QR code management
+Module55Desc=條碼或QR code管理
 Module56Name=信用轉帳付款
 Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
 Module57Name=銀行直接轉帳付款
@@ -849,10 +850,10 @@ Permission402=建立/修改折扣
 Permission403=驗證折扣
 Permission404=刪除折扣
 Permission430=使用除錯欄
-Permission511=Read salaries and payments (yours and subordinates)
-Permission512=Create/modify salaries and payments
-Permission514=Delete salaries and payments
-Permission517=Read salaries and payments everybody
+Permission511=讀取薪資支付（您和您的下屬）
+Permission512=建立/修改薪資資和付款
+Permission514=刪除薪資和付款
+Permission517=讀取每個人的薪資支付
 Permission519=匯出薪水
 Permission520=讀取借款
 Permission522=建立/修改借款
@@ -1047,7 +1048,7 @@ DictionaryOpportunityStatus=專案/潛在的潛在狀態
 DictionaryExpenseTaxCat=費用報表 -交通類別
 DictionaryExpenseTaxRange=費用報表 - 依交通類別劃分範圍
 DictionaryTransportMode=通訊報告-傳送模式
-DictionaryBatchStatus=Product lot/serial Quality Control status
+DictionaryBatchStatus=產品批號/序號品質控制狀態
 TypeOfUnit=單位類型
 SetupSaved=設定已儲存
 SetupNotSaved=設定未儲存
@@ -1191,7 +1192,7 @@ SetupDescription4= <a href="%s"> %s-> %s </a> <br> <br>此軟體是許多模組
 SetupDescription5=其他設定選單項目管理可選參數。
 AuditedSecurityEvents=已審計的安全性事件
 NoSecurityEventsAreAduited=無已審計的安全性事件。您可以啟用從選單 %s
-Audit=Security events
+Audit=安全事件
 InfoDolibarr=關於 Dolibarr
 InfoBrowser=關於瀏覽器
 InfoOS=關於作業系統
@@ -1260,8 +1261,8 @@ YourPHPDoesNotHaveSSLSupport=您的PHP中無法使用SSL功能
 DownloadMoreSkins=更多佈景主題下載
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
-ShowProfIdInAddress=顯示帶有地址的專業ID
-ShowVATIntaInAddress=隱藏帶有地址的歐盟營業稅號
+ShowProfIdInAddress=Show professional ID with addresses
+ShowVATIntaInAddress=Hide intra-Community VAT number
 TranslationUncomplete=部分翻譯
 MAIN_DISABLE_METEO=停用氣象顯示
 MeteoStdMod=標準模式
@@ -1326,9 +1327,9 @@ NbOfObjectIsLowerThanNoPb=您的資料庫中有%s %s。這不需要任何特定
 ComboListOptim=組合清單載入優化
 SearchOptim=搜尋最佳化
 YouHaveXObjectUseComboOptim=您有 %s %s 在資料庫內。您可以進入模組設定以啟用在按鍵事件上加載組合清單。
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other.
+YouHaveXObjectUseSearchOptim=您的資料庫中有%s %s。您應該在首頁-設定-其他中的%s增加常數1。
 YouHaveXObjectUseSearchOptimDesc=This limits the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
-YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to %s in Home-Setup-Other.
+YouHaveXObjectAndSearchOptimOn=您在資料庫中有%s %s，並且在首頁-設定-其他中，常數%s設定為%s。
 BrowserIsOK=您正在使用%s 網頁瀏覽器。此瀏覽器可以確保安全性和性能。
 BrowserIsKO=您正在使用%s 網頁瀏覽器。眾所周知，此瀏覽器是安全性，性能和可靠性的錯誤選擇。我們建議使用Firefox，Chrome，Opera或Safari。
 PHPModuleLoaded=PHP組件%s已載入
@@ -1440,10 +1441,10 @@ MemberMainOptions=主要選項
 AdherentLoginRequired= 管理每位會員登入
 AdherentMailRequired=建立新會員需要電子郵件
 MemberSendInformationByMailByDefault=已勾選預設傳送電子郵件驗證成員（驗證或新訂閲）
-MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
+MemberCreateAnExternalUserForSubscriptionValidated=為每個經過驗證的新會員訂閱建立一個外部用戶帳號
 VisitorCanChooseItsPaymentMode=訪客可以選擇可用的付款方式
 MEMBER_REMINDER_EMAIL=以<b>電子郵件</b>啟動自動提醒過期的訂閱。注意：必須啟用模組<strong>%s</strong>並正確設定才能發送提醒。
-MembersDocModules=Document templates for documents generated from member record
+MembersDocModules=從會員記錄產生文件的文件模板
 ##### LDAP setup #####
 LDAPSetup=LDAP 設定
 LDAPGlobalParameters=全域參數
@@ -1525,7 +1526,7 @@ LDAPFieldLoginUnix=登入（Unix系統）
 LDAPFieldLoginExample=範例: uid
 LDAPFilterConnection=搜尋過濾器
 LDAPFilterConnectionExample=範例: &(objectClass=inetOrgPerson)
-LDAPGroupFilterExample=Example: &(objectClass=groupOfUsers)
+LDAPGroupFilterExample=範例: &(objectClass=groupOfUsers)
 LDAPFieldLoginSamba=登入 (samba, activedirectory)
 LDAPFieldLoginSambaExample=範例: samaccountname
 LDAPFieldFullname=全名
@@ -1619,9 +1620,9 @@ ServiceSetup=服務模組設定
 ProductServiceSetup=產品和服務模組設定
 NumberOfProductShowInSelect=組合選擇清單中可顯示的最大產品數量（0 =無限制）
 ViewProductDescInFormAbility=在表格中顯示產品描述（否則在工具提示彈出窗口中顯示）
-DoNotAddProductDescAtAddLines=Do not add product description (from product card) on submit add lines on forms
-OnProductSelectAddProductDesc=How to use the description of the products when adding a product as a line of a document
-AutoFillFormFieldBeforeSubmit=Auto fill the description input field with the description of product
+DoNotAddProductDescAtAddLines=不要在表單上增加行時加入產品描述（從產品卡中）
+OnProductSelectAddProductDesc=從文件當中增加一個產品行時如何使用產品描述
+AutoFillFormFieldBeforeSubmit=自動將產品描述填入描述輸入欄位
 DoNotAutofillButAutoConcat=Do not autofill the input field with description of product. Description of the product will be concatenated to the entered description automatically.
 DoNotUseDescriptionOfProdut=Description of the product will never be included into the description of lines of documents
 MergePropalProductCard=若產品/服務在提案/建議書內，啟動產品/服務中附件檔分頁選項以將產品 PDF 文件整合成報價/建議書/提案的 azur 格式 PDF
@@ -1778,7 +1779,7 @@ ClickToDialSetup=點擊撥號模組設定
 ClickToDialUrlDesc=當點選電話圖示時則呼叫網址。在網址中，你可使用標籤<br><b>__PHONETO__</b>，他可取代個人撥打的電話號碼<br><b>__PHONEFROM__</b>，他可以取代個人的電話號碼(您自己的)<br><b>__LOGIN__</b>，他可以取代點選撥打登錄(在用戶卡中定義)<br><b>__PASS__</b>，他可以取代點選撥打密碼(在用戶卡中定義)。
 ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=在電話號碼中使用 "tel:" 連線
-ClickToDialUseTelLinkDesc=若您的用戶有智慧型手機或是在同一台電腦上已有通訊軟體時使用此方法，則當您在瀏覽器上點選時將連線到 "tel:" 進行呼叫。若您需要完整服務的解決方案(不需要安裝軟體到本機中)，您必須設定為 "否" 及填寫下一欄位。
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface, installed on the same computer as the browser, and called when you click on a link starting with "tel:" in your browser. If you need link that start with "sip:" or a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=銷售點
 CashDeskSetup=銷售點模組設定
@@ -2035,7 +2036,7 @@ NbOfEmailsInInbox=來源資料夾中的電子郵件數量
 LoadThirdPartyFromName=在%s載入合作方搜尋 (僅載入)
 LoadThirdPartyFromNameOrCreate= 在%s載入合作方搜尋 (如果找不到就建立)
 WithDolTrackingID=來自Dolibarr寄送的第一封電子郵件發起的對話訊息
-WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+WithoutDolTrackingID=來自第一封電子郵件發起的對話的訊息不是從 Dolibarr 發送的
 WithDolTrackingIDInMsgId=來自Dolibarr的訊息
 WithoutDolTrackingIDInMsgId=未從Dolibarr傳送訊息
 CreateCandidature=建立工作應用程式
@@ -2052,7 +2053,7 @@ DisabledResourceLinkContact=停用資源連結到通訊錄的功能
 EnableResourceUsedInEventCheck=啟用功能以檢查事件中是否正在使用資源
 ConfirmUnactivation=確認重設模組
 OnMobileOnly=只在小螢幕(智慧型手機)
-DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
+DisableProspectCustomerType=禁用“潛在+客戶”合作方類型（因此合作方必須是“潛在”或“客戶”，但不能同時使用兩種類型）
 MAIN_OPTIMIZEFORTEXTBROWSER=盲人簡化界面
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=如果您是盲人，或者通過Lynx或Links等文字瀏覽器使用此應用程式，請啟用此選項。
 MAIN_OPTIMIZEFORCOLORBLIND=為色盲更改界面顏色
@@ -2074,11 +2075,11 @@ UseDebugBar=使用debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=控制台中可保留的日誌行數
 WarningValueHigherSlowsDramaticalyOutput=警告，較高的值會嚴重降低輸出速度
 ModuleActivated=模組%s已啟動並顯示於界面上
-ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances and security)
-ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
+ModuleActivatedWithTooHighLogLevel=模組 %s 使用過高的日誌記錄等級啟用（嘗試使用較低的等級以獲得更好的性能和安全性）
+ModuleSyslogActivatedButLevelNotTooVerbose=模組%s已啟用並且日誌等級(%s)正確(不會太冗長)
 IfYouAreOnAProductionSetThis=如果您在生產環境中，則應將此屬性設定為%s。
 AntivirusEnabledOnUpload=在上傳的檔案已啟用了防病毒功能
-SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
+SomeFilesOrDirInRootAreWritable=某些檔案或目錄不是唯讀模式
 EXPORTS_SHARE_MODELS=匯出模組功能可分享此模組給所有人
 ExportSetup=模組匯出設定
 ImportSetup=模組匯入設定
@@ -2122,26 +2123,28 @@ ModuleActivatedMayExposeInformation=這個 PHP外掛可能會暴露敏感資料
 ModuleActivatedDoNotUseInProduction=為研發所設計的一個模組已經啟用。請不要在正式生產環境中使用。
 CombinationsSeparator=產品組合的分隔符號
 SeeLinkToOnlineDocumentation=有關範例，請參見選單上的線上文件連結。
-SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
+SHOW_SUBPRODUCT_REF_IN_PDF=如果使用模組<b>%s</b>中的"%s"功能,在PDF中顯示kit的子產品詳細資料
 AskThisIDToYourBank=請聯絡您的銀行以獲取此ID
-AdvancedModeOnly=Permision available in Advanced permission mode only
-ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
+AdvancedModeOnly=僅在進階權限模式下可用的權限
+ConfFileIsReadableOrWritableByAnyUsers=conf 檔案可由任何用戶讀取或寫入。請變更為Web伺服器用戶和群組擁有權限。
 MailToSendEventOrganization=事件組織
-AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
+AGENDA_EVENT_DEFAULT_STATUS=從表單建立事件時預設的事件狀態
 YouShouldDisablePHPFunctions=您應該停用 PHP 功能
-IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands in custom code, you shoud disable PHP functions
-PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=除非您需要在自定義代碼中執行系統命令，否則您應該停用 PHP 功能
+PHPFunctionsRequiredForCLI=對於 shell 目的（如計劃備份工作或執行掃毒程式），您必須保留 PHP 功能
 NoWritableFilesFoundIntoRootDir=在您的根目錄中找不到一般程式可寫入的檔案或目錄（好）
 RecommendedValueIs=建議：%s
-NotRecommended=不建議
+Recommended=推薦的
+NotRecommended=Not recommended
 ARestrictedPath=受限路徑
 CheckForModuleUpdate=檢查外部模組更新
-CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
+CheckForModuleUpdateHelp=此操作將連接到外部模組的編輯器以檢查是否有新版本。
 ModuleUpdateAvailable=有可用的更新
 NoExternalModuleWithUpdate=未找到外部模組的更新
-SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
-YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
+SwaggerDescriptionFile=Swagger API 描述檔案（例如用於 redoc）
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=您啟用了已棄用的 WS API。您應該改用 REST API。
 RandomlySelectedIfSeveral=有多張圖片時隨機選擇
 DatabasePasswordObfuscated=資料庫密碼在conf檔案中為加密
 DatabasePasswordNotObfuscated=資料庫密碼在conf檔案中不是加密
 APIsAreNotEnabled=未啟用 API 模組
+YouShouldSetThisToOff=您應該將此設定為 0 或off
diff --git a/htdocs/langs/zh_TW/banks.lang b/htdocs/langs/zh_TW/banks.lang
index 6465e10a452..28729c4b7e7 100644
--- a/htdocs/langs/zh_TW/banks.lang
+++ b/htdocs/langs/zh_TW/banks.lang
@@ -115,7 +115,7 @@ TransferTo=至
 TransferFromToDone=從<b>%s</b>到<b>%s</b>的<b>%s</b>%s轉帳已記錄。
 CheckTransmitter=寄件人
 ValidateCheckReceipt=驗證此支票收據
-ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes will be possible once validated.
 DeleteCheckReceipt=刪除支票收據？
 ConfirmDeleteCheckReceipt=您確認定您要刪除此張支票收據？
 BankChecks=銀行支票
@@ -128,7 +128,7 @@ ConfirmDeleteTransaction=您確定要刪除此筆條目
 ThisWillAlsoDeleteBankRecord=同樣也會刪除已產生的銀行條目
 BankMovements=動作
 PlannedTransactions=已計畫的條目
-Graph=Graphs
+Graph=圖表
 ExportDataset_banque_1=銀行條目和帳戶對帳單
 ExportDataset_banque_2=存款單
 TransactionOnTheOtherAccount=在其他帳戶的交易
diff --git a/htdocs/langs/zh_TW/bills.lang b/htdocs/langs/zh_TW/bills.lang
index a3478b05742..eba5290bb5f 100644
--- a/htdocs/langs/zh_TW/bills.lang
+++ b/htdocs/langs/zh_TW/bills.lang
@@ -82,8 +82,8 @@ PaymentsAlreadyDone=付款已完成
 PaymentsBackAlreadyDone=退款已完成
 PaymentRule=付款條件
 PaymentMode=付款類型
-DefaultPaymentMode=Default Payment Type
-DefaultBankAccount=Default Bank Account
+DefaultPaymentMode=預設付款類型
+DefaultBankAccount=預設銀行帳戶
 PaymentTypeDC=借/貸卡片
 PaymentTypePP=PayPal
 IdPaymentMode=付款類型 (id)
@@ -120,7 +120,7 @@ ConvertExcessPaidToReduc=將超額付款轉換為可用折扣
 EnterPaymentReceivedFromCustomer=輸入從客戶收到的付款
 EnterPaymentDueToCustomer=應付客戶款項
 DisabledBecauseRemainderToPayIsZero=已關閉,因為剩餘的未付餘額為零
-PriceBase=Base price
+PriceBase=基本價格
 BillStatus=發票狀態
 StatusOfGeneratedInvoices=已產生發票的狀態
 BillStatusDraft=草稿（等待驗證）
@@ -259,7 +259,7 @@ DateMaxPayment=付款到期日
 DateInvoice=發票日期
 DatePointOfTax=稅點
 NoInvoice=沒有發票
-NoOpenInvoice=No open invoice
+NoOpenInvoice=沒有未開發票
 ClassifyBill=分類發票
 SupplierBillsToPay=未付款的供應商發票
 CustomerBillsUnpaid=尚未付款的客戶發票
@@ -377,7 +377,7 @@ DateLastGeneration=最新的產生日期
 DateLastGenerationShort=最新的產生日期
 MaxPeriodNumber=產生發票的最大數量
 NbOfGenerationDone=已經產生完成的發票數量
-NbOfGenerationOfRecordDone=Number of record generation already done
+NbOfGenerationOfRecordDone=已經完成的產生記錄數量
 NbOfGenerationDoneShort=已產生完成發票數
 MaxGenerationReached=已達到最大產生數量
 InvoiceAutoValidate=自動驗證發票
@@ -455,7 +455,7 @@ RegulatedOn=規範於
 ChequeNumber=支票編號
 ChequeOrTransferNumber=支票/轉移編號
 ChequeBordereau=支票行事曆
-ChequeMaker=Check/Transfer sender
+ChequeMaker=支票/轉帳發件人
 ChequeBank=支票銀行
 CheckBank=支票
 NetToBePaid=要支付的淨額
@@ -521,7 +521,7 @@ YouMustCreateStandardInvoiceFirstDesc=您必須先建立標準發票，然後將
 PDFCrabeDescription=發票PDF範本Crabe。完整的發票範本（Sponge範本的舊範本）
 PDFSpongeDescription=發票PDF範本Sponge。完整的發票範本
 PDFCrevetteDescription=發票PDF範本Crevette。狀況發票的完整發票範本
-TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+TerreNumRefModelDesc1=標準發票在格式%syymm-nnnn的退回編號和信用票據格式%syymm-nnnn中yy為年,mm為月,nnnn是一個連續自動遞增沒有中斷的數字而且不為0
 MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=以$ syymm開頭的帳單已經存在，並且與該序列模型不符合。將其刪除或重新命名以啟動此模組。
 CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
@@ -590,4 +590,4 @@ FacParentLine=發票的母行
 SituationTotalRayToRest=剩下的不含稅
 PDFSituationTitle=情況n°%d
 SituationTotalProgress=總進度%d %%
-SearchUnpaidInvoicesWithDueDate=Search unpaid invoices with a due date = %s
+SearchUnpaidInvoicesWithDueDate=搜尋到期日 = %s 的未付款發票
diff --git a/htdocs/langs/zh_TW/boxes.lang b/htdocs/langs/zh_TW/boxes.lang
index 2d7399e21f9..7d7b10a0714 100644
--- a/htdocs/langs/zh_TW/boxes.lang
+++ b/htdocs/langs/zh_TW/boxes.lang
@@ -91,8 +91,8 @@ BoxTitleLatestModifiedSupplierOrders=供應商訂單：最後修改的%s筆
 BoxTitleLastModifiedCustomerBills=客戶發票：最後修改的%s張
 BoxTitleLastModifiedCustomerOrders=銷售訂單：最後修改的%s筆
 BoxTitleLastModifiedPropals=最新%s筆修改的提案/建議書
-BoxTitleLatestModifiedJobPositions=最新已修改的工作%s
-BoxTitleLatestModifiedCandidatures=最新已修改的候選人%s
+BoxTitleLatestModifiedJobPositions=最新%s筆已修改的工作職位
+BoxTitleLatestModifiedCandidatures=最新%s筆已修改的工作申請
 ForCustomersInvoices=客戶發票
 ForCustomersOrders=客戶訂單
 ForProposals=提案/建議書
diff --git a/htdocs/langs/zh_TW/cashdesk.lang b/htdocs/langs/zh_TW/cashdesk.lang
index 62c009bf199..9aff2e91dae 100644
--- a/htdocs/langs/zh_TW/cashdesk.lang
+++ b/htdocs/langs/zh_TW/cashdesk.lang
@@ -127,4 +127,4 @@ AllowDelayedPayment=允許延遲付款
 PrintPaymentMethodOnReceipts=在收據上列印付款方式
 WeighingScale=秤重
 ShowPriceHT = 顯示不包含稅金的欄位(在畫面中)
-ShowPriceHTOnReceipt = 顯示不包含稅金的欄位(在發票/收據中)
+ShowPriceHTOnReceipt = 顯示不含稅價格的欄位（在收據上）
diff --git a/htdocs/langs/zh_TW/commercial.lang b/htdocs/langs/zh_TW/commercial.lang
index 52b15faf976..23b593d727a 100644
--- a/htdocs/langs/zh_TW/commercial.lang
+++ b/htdocs/langs/zh_TW/commercial.lang
@@ -29,8 +29,8 @@ ShowCustomer=顯示客戶
 ShowProspect=顯示潛在方
 ListOfProspects=潛在方清單
 ListOfCustomers=客戶清單
-LastDoneTasks=最新%s完成的行動
-LastActionsToDo=最舊%s未完成的行動
+LastDoneTasks=最新%s筆完成的行動
+LastActionsToDo=最舊%s筆未完成的行動
 DoneAndToDoActions=完成與執行事件
 DoneActions=已完成的事件
 ToDoActions=未完成事件
@@ -64,10 +64,11 @@ ActionAC_SHIP=以郵件發送裝運
 ActionAC_SUP_ORD=以郵件發送採購訂單
 ActionAC_SUP_INV=以郵件發送供應商發票
 ActionAC_OTH=其他
-ActionAC_OTH_AUTO=自動插入事件
+ActionAC_OTH_AUTO=其他自動項目
 ActionAC_MANUAL=手動插入的事件
 ActionAC_AUTO=自動插入事件
-ActionAC_OTH_AUTOShort=自動
+ActionAC_OTH_AUTOShort=其他
+ActionAC_EVENTORGANIZATION=事件組織的事件
 Stats=銷售統計
 StatusProsp=潛在方狀態
 DraftPropals=商業提案/建議書草稿
diff --git a/htdocs/langs/zh_TW/companies.lang b/htdocs/langs/zh_TW/companies.lang
index 4fa44fbc166..1242c63a563 100644
--- a/htdocs/langs/zh_TW/companies.lang
+++ b/htdocs/langs/zh_TW/companies.lang
@@ -440,21 +440,21 @@ ListProspectsShort=潛在方清單
 ListCustomersShort=客戶清單
 ThirdPartiesArea=合作方/通訊錄
 LastModifiedThirdParties=最新已修改合作方%s
-UniqueThirdParties=Total number of Third Parties
+UniqueThirdParties=合作方總數
 InActivity=開放
 ActivityCeased=關閉
 ThirdPartyIsClosed=合作方已關閉
-ProductsIntoElements=List of products/services mapped to %s
+ProductsIntoElements=映射到 %s 的產品/服務清單
 CurrentOutstandingBill=目前未付款帳單
 OutstandingBill=未付款帳單的最大金額
 OutstandingBillReached=已達最大金額的未付款帳單
 OrderMinAmount=最小訂購量
-MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
+MonkeyNumRefModelDesc=為客戶代號返回格式為 %syymm-nnnn 的數字，為供應商代號返回格式為 %syymm-nnnn 的數字，其中 yy 是年，mm 是月，nnnn 是一個連續的自動遞增沒有中斷也不為0的數字，。
 LeopardNumRefModelDesc=客戶/供應商編號規則不受限制，此編碼可以隨時修改。(可開啟Elephant or Monkey模組來設定編碼規則)
 ManagingDirectors=主管(們)姓名 (執行長, 部門主管, 總裁...)
 MergeOriginThirdparty=重複的客戶/供應商 (你想刪除的客戶/供應商)
 MergeThirdparties=合併客戶/供應商
-ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
+ConfirmMergeThirdparties=您確定要合併此合作方到目前的合作方？所有已連結的項目( 發票、訂單...)將會移到目前的合作方，並刪除被合併的合作方。
 ThirdpartiesMergeSuccess=合作方已合併
 SaleRepresentativeLogin=業務代表的登入
 SaleRepresentativeFirstname=業務代表的名字
diff --git a/htdocs/langs/zh_TW/errors.lang b/htdocs/langs/zh_TW/errors.lang
index 2448ae31222..ae1a3d5e0f9 100644
--- a/htdocs/langs/zh_TW/errors.lang
+++ b/htdocs/langs/zh_TW/errors.lang
@@ -301,3 +301,4 @@ ErrorActionCommPropertyUserowneridNotDefined=需要用戶的擁有者
 ErrorActionCommBadType=選擇的事件類型（id：%n，代碼：%s）在事件類型分類中不存在
 CheckVersionFail=版本檢查失敗
 ErrorWrongFileName=檔案名稱中不可以有__SOMETHING__
+ErrorNotInDictionaryPaymentConditions=不在支付條款類別中，請修改。
diff --git a/htdocs/langs/zh_TW/eventorganization.lang b/htdocs/langs/zh_TW/eventorganization.lang
index 603424ac9b2..9861ca188a2 100644
--- a/htdocs/langs/zh_TW/eventorganization.lang
+++ b/htdocs/langs/zh_TW/eventorganization.lang
@@ -86,6 +86,7 @@ DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
 SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
 SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
+NbVotes=Number of votes
 #
 # Status
 #
@@ -115,6 +116,9 @@ EvntOrgDuration = This conference starts on %s and ends on %s.
 ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
 BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
 EventType = 事件類別
+LabelOfBooth=Booth label
+LabelOfconference=Conference label
+ConferenceIsNotConfirmed=Subcription not available, conference is not confirmed yet
 
 #
 # Vote page
diff --git a/htdocs/langs/zh_TW/holiday.lang b/htdocs/langs/zh_TW/holiday.lang
index 2fcd554e4f3..e091d0dd7c4 100644
--- a/htdocs/langs/zh_TW/holiday.lang
+++ b/htdocs/langs/zh_TW/holiday.lang
@@ -13,7 +13,7 @@ ToReviewCP=等待批准
 ApprovedCP=已批准
 CancelCP=已取消
 RefuseCP=已拒絕
-ValidatorCP=Approver
+ValidatorCP=批准人
 ListeCP=休假清單
 Leave=休假申請
 LeaveId=休假編號
@@ -39,11 +39,11 @@ TitreRequestCP=休假申請
 TypeOfLeaveId=休假ID類型
 TypeOfLeaveCode=休假代碼類型
 TypeOfLeaveLabel=休假標籤類型
-NbUseDaysCP=Number of days of leave used
+NbUseDaysCP=已休假天數
 NbUseDaysCPHelp=The calculation takes into account the non-working days and the holidays defined in the dictionary.
-NbUseDaysCPShort=Days of leave
-NbUseDaysCPShortInMonth=Days of leave in month
-DayIsANonWorkingDay=%s is a non-working day
+NbUseDaysCPShort=休假天數
+NbUseDaysCPShortInMonth=月休假天數
+DayIsANonWorkingDay=%s 是非工作日
 DateStartInMonth=開始日期（月份）
 DateEndInMonth=結束日期（月份）
 EditCP=編輯
@@ -55,7 +55,7 @@ TitleDeleteCP=刪除休假申請
 ConfirmDeleteCP=確認刪除此休假申請嗎？
 ErrorCantDeleteCP=錯誤，您無權刪除此休假申請。
 CantCreateCP=您無權提出休假申請。
-InvalidValidatorCP=You must choose the approver for your leave request.
+InvalidValidatorCP=您必須為休假申請選擇批准人。
 NoDateDebut=您必須選擇開始日期。
 NoDateFin=您必須選擇結束日期。
 ErrorDureeCP=您的休假申請不包含工作日。
diff --git a/htdocs/langs/zh_TW/install.lang b/htdocs/langs/zh_TW/install.lang
index a717552589b..af06bbdb7c7 100644
--- a/htdocs/langs/zh_TW/install.lang
+++ b/htdocs/langs/zh_TW/install.lang
@@ -206,6 +206,7 @@ MigrationUserPhotoPath=移轉用戶照片路徑
 MigrationFieldsSocialNetworks=移轉用戶領域社交網絡（%s）
 MigrationReloadModule=重新載入模組%s
 MigrationResetBlockedLog=為v7 algorithm重置模組"被阻止的日誌(Blocked log)"
+MigrationImportOrExportProfiles=Migration of import or export profiles (%s)
 ShowNotAvailableOptions=顯示不可用的選項
 HideNotAvailableOptions=隱藏不可用的選項
 ErrorFoundDuringMigration=在移轉過程中出現了錯誤，因此無法進行下一步。要忽略錯誤，可以<a href="%s">點擊此處</a> ，但是在解決錯誤之前，該應用程序或某些功能可能無法正常運行。
diff --git a/htdocs/langs/zh_TW/interventions.lang b/htdocs/langs/zh_TW/interventions.lang
index 7b6e8857505..873f2fa1afd 100644
--- a/htdocs/langs/zh_TW/interventions.lang
+++ b/htdocs/langs/zh_TW/interventions.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - interventions
-Intervention=干預措施
-Interventions=干預措施
+Intervention=干預
+Interventions=干預
 InterventionCard=干預卡
 NewIntervention=新干預
 AddIntervention=建立干預
@@ -41,9 +41,7 @@ InterventionsArea=干預區
 DraftFichinter=干預草案
 LastModifiedInterventions=最新%s已修改干預
 FichinterToProcess=進行干預
-##### Types de contacts #####
 TypeContact_fichinter_external_CUSTOMER=後續追蹤客戶聯絡人
-# Modele numérotation
 PrintProductsOnFichinter=在干預卡上也列印“產品”類型的行（不僅是服務）
 PrintProductsOnFichinterDetails=訂單產生的干預
 UseServicesDurationOnFichinter=將服務期限用於訂單產生的干預
@@ -52,8 +50,7 @@ UseDateWithoutHourOnFichinter=為干預記錄隱藏日期中的小時和分鐘
 InterventionStatistics=干預統計
 NbOfinterventions=干預卡數量
 NumberOfInterventionsByMonth=每月干預卡的數量（驗證日期）
-AmountOfInteventionNotIncludedByDefault=預設情況下，干預金額不包括在利潤中（在大多數情況下，時間表用於計算花費的時間）。將選項PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT to 1加 到首頁- 設定- 其他中以包括它們。
-##### Exports #####
+AmountOfInteventionNotIncludedByDefault=預設情況下，干預金額不包括在利潤中（在大多數情況下，時間表用於計算花費的時間）。將選項PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT加到首頁- 設定- 其他中並設定為1以包括它們。
 InterId=干預ID
 InterRef=干預參考
 InterDateCreation=干預的建立日期
@@ -65,3 +62,7 @@ InterLineId=干預行ID
 InterLineDate=干預行日期
 InterLineDuration=週期干預行
 InterLineDesc=干預行描述
+RepeatableIntervention=干預模板
+ToCreateAPredefinedIntervention=要創建預定義或定期干預，請創建一個通用乾預並將其轉換為乾預模板
+Reopen=重新打開
+ConfirmReopenIntervention=您確定要打開干預<b> %s </b>嗎？
diff --git a/htdocs/langs/zh_TW/productbatch.lang b/htdocs/langs/zh_TW/productbatch.lang
index e97a9eb8d05..31fa9757e65 100644
--- a/htdocs/langs/zh_TW/productbatch.lang
+++ b/htdocs/langs/zh_TW/productbatch.lang
@@ -26,12 +26,10 @@ ShowLogOfMovementIfLot=顯示產品/批次的移動記錄
 StockDetailPerBatch=每批次的庫存詳細資料
 SerialNumberAlreadyInUse= 序號%s已經被產品%s使用
 TooManyQtyForSerialNumber=序號%s只能使用在產品%s上
-BatchLotNumberingModules=依批號自動產生批次產品的選項
-BatchSerialNumberingModules=依序號自動產生批次產品的選項
 ManageLotMask=自定義遮罩
-CustomMasks=在產品卡中增加一個定義遮罩的選項
-LotProductTooltip=在產品卡中增加一個定義專用批號遮罩的選項
-SNProductTooltip=在產品卡中增加一個定義專用序號遮罩的選項
+CustomMasks=為每個產品定義不同編號遮罩的選項
+BatchLotNumberingModules=自動產生批號的編號規則
+BatchSerialNumberingModules=自動產生序號的編號規則（對每一個具有 1 個唯一批號/序號的產品）
 QtyToAddAfterBarcodeScan=每一個已掃描的條碼/批號/序號要增加的數量
 LifeTime=有效期（天）
 EndOfLife=已到期
diff --git a/htdocs/langs/zh_TW/salaries.lang b/htdocs/langs/zh_TW/salaries.lang
index d3fc9900a41..8770b38b150 100644
--- a/htdocs/langs/zh_TW/salaries.lang
+++ b/htdocs/langs/zh_TW/salaries.lang
@@ -17,8 +17,8 @@ TJM=平均日薪
 CurrentSalary=目前薪資
 THMDescription=如果使用此模組項目，則此值可用於計算用戶輸入的項目所花費的時間成本
 TJMDescription=目前數值僅用於提供信息，不用於任何計算
-LastSalaries=最新的%s支付薪資
-AllSalaries=所有支付薪資
+LastSalaries=Latest %s salaries
+AllSalaries=All salaries
 SalariesStatistics=薪資統計
-# Export
 SalariesAndPayments=薪資與支付
+ConfirmDeleteSalaryPayment=Do you want to delete this salary payment ?
diff --git a/htdocs/langs/zh_TW/ticket.lang b/htdocs/langs/zh_TW/ticket.lang
index b4dfb98e9a6..ccc31d1e214 100644
--- a/htdocs/langs/zh_TW/ticket.lang
+++ b/htdocs/langs/zh_TW/ticket.lang
@@ -55,7 +55,7 @@ TypeContact_ticket_internal_SUPPORTTEC=已分配用戶
 TypeContact_ticket_external_SUPPORTCLI=客戶聯絡人/事件追踪
 TypeContact_ticket_external_CONTRIBUTOR=外部合作者
 
-OriginEmail=電子郵件作者
+OriginEmail=Reporter Email
 Notify_TICKET_SENTBYMAIL=以電子郵件發送服務單訊息
 
 # Status
diff --git a/htdocs/langs/zh_TW/users.lang b/htdocs/langs/zh_TW/users.lang
index 9e1e3162a55..5c1503adeb5 100644
--- a/htdocs/langs/zh_TW/users.lang
+++ b/htdocs/langs/zh_TW/users.lang
@@ -97,8 +97,8 @@ LoginToCreate=登入建立
 NameToCreate=合作方的名稱建立
 YourRole=您的角色
 YourQuotaOfUsersIsReached=你的活躍用戶達到配額！
-NbOfUsers=用戶數
-NbOfPermissions=權限數
+NbOfUsers=Number of users
+NbOfPermissions=Number of permissions
 DontDowngradeSuperAdmin=只有超級管理員可以降級超級管理員
 HierarchicalResponsible=主管
 HierarchicView=分層視圖
diff --git a/htdocs/langs/zh_TW/website.lang b/htdocs/langs/zh_TW/website.lang
index cb7499b7303..196b4e91773 100644
--- a/htdocs/langs/zh_TW/website.lang
+++ b/htdocs/langs/zh_TW/website.lang
@@ -31,7 +31,7 @@ AddWebsite=新增網站
 Webpage=網頁/容器
 AddPage=新增 頁面/容器
 PageContainer=頁面
-PreviewOfSiteNotYetAvailable=您的網站<strong>%s</strong>預覽尚不可用。您必須先“ <strong>導入完整的網站模板</strong> ”或僅“ <strong>新增頁面/容器</strong> ”。
+PreviewOfSiteNotYetAvailable=The preview of your website <strong>%s</strong> is not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=要求ID為%s的頁面尚無內容，或暫存檔案.tpl.php被刪除。編輯頁面內容以解決此問題。
 SiteDeleted=網站'%s'已刪除
 PageContent=頁面/內容
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index bffc0e17e04..ab9ab624801 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -644,6 +644,9 @@ textarea.centpercent {
 .small, small {
 	font-size: 85%;
 }
+.large {
+	font-size: 125%;
+}
 
 .h1 .small, .h1 small, .h2 .small, .h2 small, .h3 .small, .h3 small, h1 .small, h1 small, h2 .small, h2 small, h3 .small, h3 small {
 	font-size: 65%;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index de04a9e08ea..8e679e754f2 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -789,6 +789,9 @@ textarea.centpercent {
 .small, small {
 	font-size: 85%;
 }
+.large {
+	font-size: 125%;
+}
 
 .h1 .small, .h1 small, .h2 .small, .h2 small, .h3 .small, .h3 small, h1 .small, h1 small, h2 .small, h2 small, h3 .small, h3 small {
 	font-size: 65%;

From ce9bd51cb203a249763b3078bdd0f4d80bbff236 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Mon, 12 Jul 2021 07:17:08 +0000
Subject: [PATCH 1187/1497] Fixing style errors.

---
 htdocs/categories/viewcat.php | 18 ++++++------------
 htdocs/ticket/card.php        |  2 +-
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index 12263d8df2c..fb7e34fb9a0 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -1034,19 +1034,16 @@ if ($type == Categorie::TYPE_WAREHOUSE) {
 	}
 }
 
-if ($type == Categorie::TYPE_TICKET)
-{
+if ($type == Categorie::TYPE_TICKET) {
 	$permission = ($user->rights->categorie->creer || $user->rights->categorie->creer);
 
 	$tickets = $object->getObjectsInCateg($type, 0, $limit, $offset);
-	if ($tickets < 0)
-	{
+	if ($tickets < 0) {
 		dol_print_error($db, $object->error, $object->errors);
 	} else {
 		// Form to add record into a category
 		$showclassifyform = 1;
-		if ($showclassifyform)
-		{
+		if ($showclassifyform) {
 			print '<br>';
 			print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -1079,11 +1076,9 @@ if ($type == Categorie::TYPE_TICKET)
 		print '<table class="noborder centpercent">'."\n";
 		print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Ref").'</td></tr>'."\n";
 
-		if (count($tickets) > 0)
-		{
+		if (count($tickets) > 0) {
 			$i = 0;
-			foreach ($tickets as $ticket)
-			{
+			foreach ($tickets as $ticket) {
 				$i++;
 				if ($i > $limit) break;
 
@@ -1094,8 +1089,7 @@ if ($type == Categorie::TYPE_TICKET)
 				print '<td class="tdtop">'.$ticket->label."</td>\n";
 				// Link to delete from category
 				print '<td class="right">';
-				if ($permission)
-				{
+				if ($permission) {
 					print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&amp;type=".$typeid."&amp;removeelem=".$ticket->id."'>";
 					print $langs->trans("DeleteFromCat");
 					print img_picto($langs->trans("DeleteFromCat"), 'unlink', '', false, 0, 0, '', 'paddingleft');
diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index 9be858fd795..be53c46b051 100644
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -1069,7 +1069,7 @@ if ($action == 'create' || $action == 'presend') {
 			print $form->showCategories($object->id, Categorie::TYPE_TICKET, 1);
 			print "</td></tr>";
 		}
-		
+
 		// Other attributes
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 

From 642d84a844db1666e6d8102f897aae43ef2100cd Mon Sep 17 00:00:00 2001
From: David <theo.david@evarisk.com>
Date: Mon, 12 Jul 2021 09:26:18 +0200
Subject: [PATCH 1188/1497] fix: code syntax

---
 htdocs/core/class/html.form.class.php | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index a569785863c..5ef8d804a6b 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -6588,6 +6588,7 @@ class Form
 	 *
 	 *  @param		int			$selected				Preselected tickets
 	 *  @param		string		$htmlname				Name of HTML select field (must be unique in page).
+	 *  @param  	string		$filtertype     		To add a filter
 	 *  @param		int			$limit					Limit on number of returned lines
 	 *  @param		int			$status					Ticket status
 	 *  @param		string		$selected_input_value	Value of preselected input text (for use with ajax)
@@ -6611,12 +6612,10 @@ class Form
 		// check parameters
 		if (is_null($ajaxoptions)) $ajaxoptions = array();
 
-		if (!empty($conf->use_javascript_ajax) && !empty($conf->global->TICKET_USE_SEARCH_TO_SELECT))
-		{
+		if (!empty($conf->use_javascript_ajax) && !empty($conf->global->TICKET_USE_SEARCH_TO_SELECT)) {
 			$placeholder = '';
 
-			if ($selected && empty($selected_input_value))
-			{
+			if ($selected && empty($selected_input_value)) {
 				require_once DOL_DOCUMENT_ROOT.'/ticket/class/ticket.class.php';
 				$tickettmpselect = new Ticket($this->db);
 				$tickettmpselect->fetch($selected);
@@ -6679,16 +6678,14 @@ class Form
 		$sql .= ' WHERE p.entity IN ('.getEntity('ticket').')';
 
 		// Add criteria on ref/label
-		if ($filterkey != '')
-		{
+		if ($filterkey != '') {
 			$sql .= ' AND (';
 			$prefix = empty($conf->global->TICKET_DONOTSEARCH_ANYWHERE) ? '%' : ''; // Can use index if PRODUCT_DONOTSEARCH_ANYWHERE is on
 			// For natural search
 			$scrit = explode(' ', $filterkey);
 			$i = 0;
 			if (count($scrit) > 1) $sql .= "(";
-			foreach ($scrit as $crit)
-			{
+			foreach ($scrit as $crit) {
 				if ($i > 0) $sql .= " AND ";
 				$sql .= "(p.ref LIKE '".$this->db->escape($prefix.$crit)."%' OR p.label LIKE '".$this->db->escape($prefix.$crit)."%'";
 				$sql .= ")";
@@ -6703,8 +6700,7 @@ class Form
 		// Build output string
 		dol_syslog(get_class($this)."::select_tickets_list search tickets", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			require_once DOL_DOCUMENT_ROOT.'/ticket/class/ticket.class.php';
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/ticket.lib.php';
 
@@ -6712,8 +6708,7 @@ class Form
 
 			$events = null;
 
-			if (!$forcecombo)
-			{
+			if (!$forcecombo) {
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 				$out .= ajax_combobox($htmlname, $events, $conf->global->TICKET_USE_SEARCH_TO_SELECT);
 			}
@@ -6723,8 +6718,7 @@ class Form
 			$textifempty = '';
 			// Do not use textifempty = ' ' or '&nbsp;' here, or search on key will search on ' key'.
 			//if (! empty($conf->use_javascript_ajax) || $forcecombo) $textifempty='';
-			if (!empty($conf->global->TICKET_USE_SEARCH_TO_SELECT))
-			{
+			if (!empty($conf->global->TICKET_USE_SEARCH_TO_SELECT)) {
 				if ($showempty && !is_numeric($showempty)) $textifempty = $langs->trans($showempty);
 				else $textifempty .= $langs->trans("All");
 			} else {
@@ -6733,8 +6727,7 @@ class Form
 			if ($showempty) $out .= '<option value="0" selected>'.$textifempty.'</option>';
 
 			$i = 0;
-			while ($num && $i < $num)
-			{
+			while ($num && $i < $num) {
 				$opt = '';
 				$optJson = array();
 				$objp = $this->db->fetch_object($result);

From aece3844c6ac7c11779e6c86162739af438cf97f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 12 Jul 2021 10:35:25 +0200
Subject: [PATCH 1189/1497] Fix better error message if password is empty

---
 htdocs/install/step1.php | 55 +++++++++++++++++++++++-----------------
 1 file changed, 32 insertions(+), 23 deletions(-)

diff --git a/htdocs/install/step1.php b/htdocs/install/step1.php
index a8bd9a4d3b6..63b8d66539b 100644
--- a/htdocs/install/step1.php
+++ b/htdocs/install/step1.php
@@ -531,39 +531,48 @@ if (!$error && $db->connected && $action == "set") {
 				if ($db->connected) {
 					$resultbis = 1;
 
-					// Create user
-					$result = $db->DDLCreateUser($dolibarr_main_db_host, $dolibarr_main_db_user, $dolibarr_main_db_pass, $dolibarr_main_db_name);
-
-					// Create user bis
-					if ($databasefortest == 'mysql') {
-						if (!in_array($dolibarr_main_db_host, array('127.0.0.1', '::1', 'localhost', 'localhost.local'))) {
-							$resultbis = $db->DDLCreateUser('%', $dolibarr_main_db_user, $dolibarr_main_db_pass, $dolibarr_main_db_name);
-						}
-					}
-
-					if ($result > 0 && $resultbis > 0) {
+					if (empty($dolibarr_main_db_pass)) {
+						dolibarr_install_syslog("step1: failed to create user, password is empty", LOG_ERR);
 						print '<tr><td>';
 						print $langs->trans("UserCreation").' : ';
 						print $dolibarr_main_db_user;
 						print '</td>';
-						print '<td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
+						print '<td>'.$langs->trans("Error").": A password for database user is mandatory.</td></tr>";
 					} else {
-						if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS'
-						|| $db->errno() == 'DB_ERROR_KEY_NAME_ALREADY_EXISTS'
-						|| $db->errno() == 'DB_ERROR_USER_ALREADY_EXISTS') {
-							dolibarr_install_syslog("step1: user already exists");
+						// Create user
+						$result = $db->DDLCreateUser($dolibarr_main_db_host, $dolibarr_main_db_user, $dolibarr_main_db_pass, $dolibarr_main_db_name);
+
+						// Create user bis
+						if ($databasefortest == 'mysql') {
+							if (!in_array($dolibarr_main_db_host, array('127.0.0.1', '::1', 'localhost', 'localhost.local'))) {
+								$resultbis = $db->DDLCreateUser('%', $dolibarr_main_db_user, $dolibarr_main_db_pass, $dolibarr_main_db_name);
+							}
+						}
+
+						if ($result > 0 && $resultbis > 0) {
 							print '<tr><td>';
 							print $langs->trans("UserCreation").' : ';
 							print $dolibarr_main_db_user;
 							print '</td>';
-							print '<td>'.$langs->trans("LoginAlreadyExists").'</td></tr>';
+							print '<td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
 						} else {
-							dolibarr_install_syslog("step1: failed to create user", LOG_ERR);
-							print '<tr><td>';
-							print $langs->trans("UserCreation").' : ';
-							print $dolibarr_main_db_user;
-							print '</td>';
-							print '<td>'.$langs->trans("Error").': '.$db->errno().' '.$db->error().($db->error ? '. '.$db->error : '')."</td></tr>";
+							if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS'
+							|| $db->errno() == 'DB_ERROR_KEY_NAME_ALREADY_EXISTS'
+							|| $db->errno() == 'DB_ERROR_USER_ALREADY_EXISTS') {
+								dolibarr_install_syslog("step1: user already exists");
+								print '<tr><td>';
+								print $langs->trans("UserCreation").' : ';
+								print $dolibarr_main_db_user;
+								print '</td>';
+								print '<td>'.$langs->trans("LoginAlreadyExists").'</td></tr>';
+							} else {
+								dolibarr_install_syslog("step1: failed to create user", LOG_ERR);
+								print '<tr><td>';
+								print $langs->trans("UserCreation").' : ';
+								print $dolibarr_main_db_user;
+								print '</td>';
+								print '<td>'.$langs->trans("Error").': '.$db->errno().' '.$db->error().($db->error ? '. '.$db->error : '')."</td></tr>";
+							}
 						}
 					}
 

From aa8fc6ba831304a0f46c1276ee8b25bb199e3b28 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 12 Jul 2021 10:45:18 +0200
Subject: [PATCH 1190/1497] css

---
 htdocs/admin/company.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index b33c0adde29..0ca1ae7d98e 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -400,7 +400,7 @@ print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="update">';
 
 print '<table class="noborder centpercent editmode">';
-print '<tr class="liste_titre"><th class="titlefield wordbreak">'.$langs->trans("CompanyInfo").'</th><th>'.$langs->trans("Value").'</th></tr>'."\n";
+print '<tr class="liste_titre"><th class="titlefieldcreate wordbreak">'.$langs->trans("CompanyInfo").'</th><th>'.$langs->trans("Value").'</th></tr>'."\n";
 
 // Name
 print '<tr class="oddeven"><td class="fieldrequired wordbreak"><label for="name">'.$langs->trans("CompanyName").'</label></td><td>';
@@ -559,7 +559,7 @@ print '<br>';
 // IDs of the company (country-specific)
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent editmode">';
-print '<tr class="liste_titre"><td class="titlefield wordbreak">'.$langs->trans("CompanyIds").'</td><td>'.$langs->trans("Value").'</td></tr>';
+print '<tr class="liste_titre"><td class="titlefieldcreate wordbreak">'.$langs->trans("CompanyIds").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
 $langs->load("companies");
 
@@ -670,7 +670,7 @@ print '</div>';
 print '<br>';
 print '<table class="noborder centpercent editmode">';
 print '<tr class="liste_titre">';
-print '<td class="titlefield">'.$langs->trans("FiscalYearInformation").'</td><td>'.$langs->trans("Value").'</td>';
+print '<td class="titlefieldcreate">'.$langs->trans("FiscalYearInformation").'</td><td>'.$langs->trans("Value").'</td>';
 print "</tr>\n";
 
 print '<tr class="oddeven"><td><label for="SOCIETE_FISCAL_MONTH_START">'.$langs->trans("FiscalMonthStart").'</label></td><td>';
@@ -685,12 +685,12 @@ print load_fiche_titre($langs->trans("TypeOfSaleTaxes"), '', 'object_payment');
 
 print '<table class="noborder centpercent editmode">';
 print '<tr class="liste_titre">';
-print '<td width="25%">'.$langs->trans("VATManagement").'</td><td>'.$langs->trans("Description").'</td>';
+print '<td class="titlefieldcreate">'.$langs->trans("VATManagement").'</td><td>'.$langs->trans("Description").'</td>';
 print '<td class="right">&nbsp;</td>';
 print "</tr>\n";
 
 // Main tax
-print '<tr class="oddeven"><td width="140"><label><input type="radio" name="optiontva" id="use_vat" value="1"'.(empty($conf->global->FACTURE_TVAOPTION) ? "" : " checked")."> ".$langs->trans("VATIsUsed")."</label></td>";
+print '<tr class="oddeven"><td><label><input type="radio" name="optiontva" id="use_vat" value="1"'.(empty($conf->global->FACTURE_TVAOPTION) ? "" : " checked")."> ".$langs->trans("VATIsUsed")."</label></td>";
 print '<td colspan="2">';
 $tooltiphelp = '';
 if ($mysoc->country_code == 'FR') {
@@ -715,7 +715,7 @@ print "</table>";
 print '<br>';
 print '<table class="noborder centpercent editmode">';
 print '<tr class="liste_titre">';
-print '<td width="25%">'.$form->textwithpicto($langs->transcountry("LocalTax1Management", $mysoc->country_code), $langs->transcountry("LocalTax1IsUsedDesc", $mysoc->country_code)).'</td><td>'.$langs->trans("Description").'</td>';
+print '<td class="titlefieldcreate">'.$form->textwithpicto($langs->transcountry("LocalTax1Management", $mysoc->country_code), $langs->transcountry("LocalTax1IsUsedDesc", $mysoc->country_code)).'</td><td>'.$langs->trans("Description").'</td>';
 print '<td class="right">&nbsp;</td>';
 print "</tr>\n";
 
@@ -749,7 +749,7 @@ if ($mysoc->useLocalTax(1)) {
 	if (empty($mysoc->country_code)) {
 		print '<tr class="oddeven nohover"><td class="">'.$countrynotdefined.'</td><td></td><td></td></tr>';
 	} else {
-		print '<tr class="oddeven nohover"><td class="" colspan="3">'.$langs->trans("NoLocalTaxXForThisCountry", $langs->transnoentitiesnoconv("Setup"), $langs->transnoentitiesnoconv("Dictionaries"), $langs->transnoentitiesnoconv("DictionaryVAT"), $langs->transnoentitiesnoconv("LocalTax1Management")).'</td></tr>';
+		print '<tr class="oddeven nohover"><td class="" colspan="3"><span class="opacitymedium">'.$langs->trans("NoLocalTaxXForThisCountry", $langs->transnoentitiesnoconv("Setup"), $langs->transnoentitiesnoconv("Dictionaries"), $langs->transnoentitiesnoconv("DictionaryVAT"), $langs->transnoentitiesnoconv("LocalTax1Management")).'</span></td></tr>';
 	}
 }
 
@@ -759,7 +759,7 @@ print "</table>";
 print '<br>';
 print '<table class="noborder centpercent editmode">';
 print '<tr class="liste_titre">';
-print '<td width="25%">'.$form->textwithpicto($langs->transcountry("LocalTax2Management", $mysoc->country_code), $langs->transcountry("LocalTax2IsUsedDesc", $mysoc->country_code)).'</td><td>'.$langs->trans("Description").'</td>';
+print '<td class="titlefieldcreate">'.$form->textwithpicto($langs->transcountry("LocalTax2Management", $mysoc->country_code), $langs->transcountry("LocalTax2IsUsedDesc", $mysoc->country_code)).'</td><td>'.$langs->trans("Description").'</td>';
 print '<td class="right">&nbsp;</td>';
 print "</tr>\n";
 
@@ -792,7 +792,7 @@ if ($mysoc->useLocalTax(2)) {
 	if (empty($mysoc->country_code)) {
 		print '<tr class="oddeven nohover"><td class="">'.$countrynotdefined.'</td><td></td><td></td></tr>';
 	} else {
-		print '<tr class="oddeven nohover"><td class="" colspan="3">'.$langs->trans("NoLocalTaxXForThisCountry", $langs->transnoentitiesnoconv("Setup"), $langs->transnoentitiesnoconv("Dictionaries"), $langs->transnoentitiesnoconv("DictionaryVAT"), $langs->transnoentitiesnoconv("LocalTax2Management")).'</td></tr>';
+		print '<tr class="oddeven nohover"><td class="" colspan="3"><span class="opacitymedium">'.$langs->trans("NoLocalTaxXForThisCountry", $langs->transnoentitiesnoconv("Setup"), $langs->transnoentitiesnoconv("Dictionaries"), $langs->transnoentitiesnoconv("DictionaryVAT"), $langs->transnoentitiesnoconv("LocalTax2Management")).'</span></td></tr>';
 	}
 }
 
@@ -818,7 +818,7 @@ if ($mysoc->useRevenueStamp()) {
 	if (empty($mysoc->country_code)) {
 		print '<tr class="oddeven nohover"><td class="">'.$countrynotdefined.'</td><td></td><td></td></tr>';
 	} else {
-		print '<tr class="oddeven nohover"><td class="" colspan="3">'.$langs->trans("NoLocalTaxXForThisCountry", $langs->transnoentitiesnoconv("Setup"), $langs->transnoentitiesnoconv("Dictionaries"), $langs->transnoentitiesnoconv("DictionaryRevenueStamp"), $langs->transnoentitiesnoconv("RevenueStamp")).'</td></tr>';
+		print '<tr class="oddeven nohover"><td class="" colspan="3"><span class="opacitymedium">'.$langs->trans("NoLocalTaxXForThisCountry", $langs->transnoentitiesnoconv("Setup"), $langs->transnoentitiesnoconv("Dictionaries"), $langs->transnoentitiesnoconv("DictionaryRevenueStamp"), $langs->transnoentitiesnoconv("RevenueStamp")).'</span></td></tr>';
 	}
 }
 

From e989284f14668f0068795e4e40555cc85cd38036 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 12 Jul 2021 10:50:37 +0200
Subject: [PATCH 1191/1497] Fix setup help

---
 htdocs/admin/modules.php      | 2 ++
 htdocs/langs/en_US/admin.lang | 1 +
 2 files changed, 3 insertions(+)

diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index f60e011f41c..d5566016c98 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -481,7 +481,9 @@ print load_fiche_titre($langs->trans("ModulesSetup"), '', 'title_setup');
 $deschelp  = '';
 if ($mode == 'common' || $mode == 'commonkanban') {
 	$desc = $langs->trans("ModulesDesc", '{picto}');
+	$desc .= ' '.$langs->trans("ModulesDesc2", '{picto2}');
 	$desc = str_replace('{picto}', img_picto('', 'switch_off'), $desc);
+	$desc = str_replace('{picto2}', img_picto('', 'setup'), $desc);
 	if (count($conf->modules) <= (empty($conf->global->MAIN_MIN_NB_ENABLED_MODULE_FOR_WARNING) ? 1 : $conf->global->MAIN_MIN_NB_ENABLED_MODULE_FOR_WARNING)) {	// If only minimal initial modules enabled
 		$deschelp = '<div class="info hideonsmartphone">'.$desc."<br></div><br>\n";
 	}
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 0c15369a0a9..7af07369759 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -209,6 +209,7 @@ FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 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 trashcan to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
 ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button <span class="small valignmiddle">%s</span> of each module to enable or disable a module/application.
+ModulesDesc2=Click the wheel button <span class="small valignmiddle">%s</span> to configure the module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external app/modules

From 5319e1d26695c35868277390021f24a0a343878c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 12 Jul 2021 10:56:01 +0200
Subject: [PATCH 1192/1497] Fix help

---
 htdocs/admin/modules.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index d5566016c98..77c070ad573 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -1249,7 +1249,13 @@ if ($mode == 'develop') {
 	print '<div class="imgmaxheight50 logo_setup"></div>';
 	print '</td>';
 	print '<td>'.$langs->trans("TryToUseTheModuleBuilder", $langs->transnoentitiesnoconv("ModuleBuilder")).'</td>';
-	print '<td>'.$langs->trans("SeeTopRightMenu").'</td>';
+	print '<td class="maxwidth300">';
+	if (!empty($conf->modulebuilder->enabled)) {
+		print $langs->trans("SeeTopRightMenu");
+	} else {
+		print '<span class="opacitymedium">'.$langs->trans("ModuleMustBeEnabledFirst", $langs->transnoentitiesnoconv("ModuleBuilder")).'</span>';
+	}
+	print '</td>';
 	print '</tr>';
 
 	print '<tr class="oddeven" height="80">'."\n";

From ac1999f59d0b5ace75cc56cc03a80c5fc8e4d3d6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 12 Jul 2021 11:08:32 +0200
Subject: [PATCH 1193/1497] FIX #18130

---
 htdocs/don/admin/donation.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/htdocs/don/admin/donation.php b/htdocs/don/admin/donation.php
index 9fd6f176c7a..f14fae538ab 100644
--- a/htdocs/don/admin/donation.php
+++ b/htdocs/don/admin/donation.php
@@ -116,8 +116,10 @@ if ($action == 'set_DONATION_ACCOUNTINGACCOUNT') {
 
 	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+		$action = '';	// To avoid to execute next actions
 	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
+		$action = '';	// To avoid to execute next actions
 	}
 }
 
@@ -132,14 +134,15 @@ if ($action == 'set_DONATION_MESSAGE') {
 
 	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+		$action = '';	// To avoid to execute next actions
 	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
+		$action = '';	// To avoid to execute next actions
 	}
 }
 
-/*
- * Action
- */
+// Other cases
+$reg = array();
 if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg)) {
 	$code = $reg[1];
 	if (dolibarr_set_const($db, $code, 1, 'chaine', 0, '', $conf->entity) > 0) {

From 977600e3a56c98ae30e1030f3d151ef3afe03438 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 12 Jul 2021 11:55:30 +0200
Subject: [PATCH 1194/1497] v15

---
 .../install/mysql/migration/14.0.0-15.0.0.sql | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 htdocs/install/mysql/migration/14.0.0-15.0.0.sql

diff --git a/htdocs/install/mysql/migration/14.0.0-15.0.0.sql b/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
new file mode 100644
index 00000000000..95de2ab7ba6
--- /dev/null
+++ b/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
@@ -0,0 +1,39 @@
+--
+-- Be carefull to requests order.
+-- This file must be loaded by calling /install/index.php page
+-- when current version is 14.0.0 or higher.
+--
+-- To restrict request to Mysql version x.y minimum use -- VMYSQLx.y
+-- To restrict request to Pgsql version x.y minimum use -- VPGSQLx.y
+-- To rename a table:       ALTER TABLE llx_table RENAME TO llx_table_new;
+-- To add a column:         ALTER TABLE llx_table ADD COLUMN newcol varchar(60) NOT NULL DEFAULT '0' AFTER existingcol;
+-- To rename a column:      ALTER TABLE llx_table CHANGE COLUMN oldname newname varchar(60);
+-- To drop a column:        ALTER TABLE llx_table DROP COLUMN oldname;
+-- To change type of field: ALTER TABLE llx_table MODIFY COLUMN name varchar(60);
+-- To drop a foreign key:   ALTER TABLE llx_table DROP FOREIGN KEY fk_name;
+-- To create a unique index ALTER TABLE llx_table ADD UNIQUE INDEX uk_table_field (field);
+-- To drop an index:        -- VMYSQL4.1 DROP INDEX nomindex on llx_table
+-- To drop an index:        -- VPGSQL8.2 DROP INDEX nomindex
+-- To make pk to be auto increment (mysql):    -- VMYSQL4.3 ALTER TABLE llx_table CHANGE COLUMN rowid rowid INTEGER NOT NULL AUTO_INCREMENT;
+-- To make pk to be auto increment (postgres):
+-- -- VPGSQL8.2 CREATE SEQUENCE llx_table_rowid_seq OWNED BY llx_table.rowid;
+-- -- VPGSQL8.2 ALTER TABLE llx_table ADD PRIMARY KEY (rowid);
+-- -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN rowid SET DEFAULT nextval('llx_table_rowid_seq');
+-- -- VPGSQL8.2 SELECT setval('llx_table_rowid_seq', MAX(rowid)) FROM llx_table;
+-- To set a field as NULL:                     -- VMYSQL4.3 ALTER TABLE llx_table MODIFY COLUMN name varchar(60) NULL;
+-- To set a field as NULL:                     -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name DROP NOT NULL;
+-- To set a field as NOT NULL:                 -- VMYSQL4.3 ALTER TABLE llx_table MODIFY COLUMN name varchar(60) NOT NULL;
+-- To set a field as NOT NULL:                 -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name SET NOT NULL;
+-- To set a field as default NULL:             -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name SET DEFAULT NULL;
+-- Note: fields with type BLOB/TEXT can't have default value.
+-- To rebuild sequence for postgresql after insert by forcing id autoincrement fields: 
+-- -- VPGSQL8.2 SELECT dol_util_rebuild_sequences();
+
+
+-- Missing in v14 or lower
+
+
+
+
+-- v15
+

From a2de6c00a00940a0edc76c32f4400f689141f54f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 12 Jul 2021 12:26:21 +0200
Subject: [PATCH 1195/1497] Prepare 13.0.4

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

diff --git a/ChangeLog b/ChangeLog
index d3cc6da9b9c..281c8733ce6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,27 @@
 English Dolibarr ChangeLog
 --------------------------------------------------------------
 
+***** ChangeLog for 13.0.4 compared to 13.0.2 *****
+
+FIX: Allow disabling of a module (not a dangerous action) even if there is problem with token (due to bugged modules).
+FIX: 13.0 - fatal - missing inclusion of ajax.lib.php for calling `ajax_autocompleter()`
+FIX: #17919 pictures in docs.
+FIX: #18006
+FIX: Accountancy - if we define a date start, automatic binding try to continue to solve old binding
+FIX: Accoutancy Limit date payment not registered on purchases operations
+FIX: Can't edit replacement invoice
+FIX: deposit can create credit note in payment conf
+FIX: division by zero on create
+FIX: holiday: balances not updated correctly with pgsql because of case sensitivity field
+FIX: holiday: status filter parameter has been renamed but not in links it was used
+FIX: List and Create Companies Left Menus
+FIX: method exists
+FIX: need to add payment sum to getlibstatus function in object linked block
+FIX: permission to close a proposal when using advanced permissions
+FIX: Problem of z-index with popup and top menu
+FIX: same thing on supplier orders
+FIX: Status of invoice when making a replacement invoice
+FIX: update contact birthday alert
 
 ***** ChangeLog for 13.0.3 compared to 13.0.2 *****
 

From deb9a374f3589325d817f7dce4a125824bd1356a Mon Sep 17 00:00:00 2001
From: John BOTELLA <john.botella@atm-consulting.fr>
Date: Mon, 12 Jul 2021 12:28:21 +0200
Subject: [PATCH 1196/1497] Fix ui event badge status

---
 htdocs/core/lib/company.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 21b6f9a68e4..cb710c19875 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -1899,7 +1899,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 			}
 
 			// Status
-			$out .= '<td class="nowrap center">'.$actionstatic->LibStatut($histo[$key]['percent'], 3, 0, $histo[$key]['datestart']).'</td>';
+			$out .= '<td class="nowrap center">'.$actionstatic->LibStatut($histo[$key]['percent'], 2, 0, $histo[$key]['datestart']).'</td>';
 
 			// Actions
 			$out .= '<td></td>';

From 91d27a556c7cf489a154eb113f8d38d888eb3cf3 Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe@altairis.fr>
Date: Mon, 12 Jul 2021 14:09:16 +0200
Subject: [PATCH 1197/1497] fix badge status bgcolor

---
 htdocs/theme/eldy/badges.inc.php | 8 ++++----
 htdocs/theme/md/badges.inc.php   | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/theme/eldy/badges.inc.php b/htdocs/theme/eldy/badges.inc.php
index dcb61499b63..58317deba15 100644
--- a/htdocs/theme/eldy/badges.inc.php
+++ b/htdocs/theme/eldy/badges.inc.php
@@ -258,9 +258,9 @@ function _createStatusBadgeCss($statusName, $statusVarNamePrefix = '', $commentL
 		print $cssPrefix.".badge-status".$statusName." {\n";
 		print "        color: ".$thisBadgeTextColor." !important;\n";
 		if (in_array((string) $statusName, $TBadgeBorderOnly)) {
-			print "        border-color: ".$thisBadgeBorderColor.";\n";
+			print "        border-color: ".$thisBadgeBorderColor." !important;\n";
 		}
-		print "        background-color: ".$thisBadgeBackgroundColor.";\n";
+		print "        background-color: ".$thisBadgeBackgroundColor." !important;\n";
 		print "}\n";
 
 		print $cssPrefix.".font-status".$statusName." {\n";
@@ -269,14 +269,14 @@ function _createStatusBadgeCss($statusName, $statusVarNamePrefix = '', $commentL
 
 		print $cssPrefix.".badge-status".$statusName.".focus, ".$cssPrefix.".badge-status".$statusName.":focus {\n";
 		print "    outline: 0;\n";
-		print "    box-shadow: 0 0 0 0.2rem ".colorHexToRgb($thisBadgeBackgroundColor, 0.5).";\n";
+		print "    box-shadow: 0 0 0 0.2rem ".colorHexToRgb($thisBadgeBackgroundColor, 0.5)." !important;\n";
 		print "}\n";
 
 		print $cssPrefix.".badge-status".$statusName.":focus, ".$cssPrefix.".badge-status".$statusName.":hover {\n";
 		print "    color: ".$thisBadgeTextColor." !important;\n";
 		//print "    background-color: " . colorDarker($thisBadgeBackgroundColor, 10) . ";\n";
 		if (in_array((string) $statusName, $TBadgeBorderOnly)) {
-			print "        border-color: ".colorDarker($thisBadgeBorderColor, 10).";\n";
+			print "        border-color: ".colorDarker($thisBadgeBorderColor, 10)." !important;\n";
 		}
 		print "}\n";
 	}
diff --git a/htdocs/theme/md/badges.inc.php b/htdocs/theme/md/badges.inc.php
index fd1b1122a17..4a36177e852 100644
--- a/htdocs/theme/md/badges.inc.php
+++ b/htdocs/theme/md/badges.inc.php
@@ -261,9 +261,9 @@ function _createStatusBadgeCss($statusName, $statusVarNamePrefix = '', $commentL
 		print $cssPrefix.".badge-status".$statusName." {\n";
 		print "        color: ".$thisBadgeTextColor." !important;\n";
 		if (in_array((string) $statusName, $TBadgeBorderOnly)) {
-			print "        border-color: ".$thisBadgeBorderColor.";\n";
+			print "        border-color: ".$thisBadgeBorderColor." !important;\n";
 		}
-		print "        background-color: ".$thisBadgeBackgroundColor.";\n";
+		print "        background-color: ".$thisBadgeBackgroundColor." !important;\n";
 		print "}\n";
 
 		print $cssPrefix.".font-status".$statusName." {\n";
@@ -272,14 +272,14 @@ function _createStatusBadgeCss($statusName, $statusVarNamePrefix = '', $commentL
 
 		print $cssPrefix.".badge-status".$statusName.".focus, ".$cssPrefix.".badge-status".$statusName.":focus {\n";
 		print "    outline: 0;\n";
-		print "    box-shadow: 0 0 0 0.2rem ".colorHexToRgb($thisBadgeBackgroundColor, 0.5).";\n";
+		print "    box-shadow: 0 0 0 0.2rem ".colorHexToRgb($thisBadgeBackgroundColor, 0.5)." !important;\n";
 		print "}\n";
 
 		print $cssPrefix.".badge-status".$statusName.":focus, ".$cssPrefix.".badge-status".$statusName.":hover {\n";
 		print "    color: ".$thisBadgeTextColor." !important;\n";
 		//print "    background-color: ".colorDarker($thisBadgeBackgroundColor, 10).";\n";
 		if (in_array((string) $statusName, $TBadgeBorderOnly)) {
-			print "        border-color: ".colorDarker($thisBadgeBorderColor, 10).";\n";
+			print "        border-color: ".colorDarker($thisBadgeBorderColor, 10)." !important;\n";
 		}
 		print "}\n";
 	}

From d8db447112ef4b4fa688d551f6e0308435c62f63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20David?= <theo.david@evarisk.com>
Date: Mon, 12 Jul 2021 14:12:20 +0200
Subject: [PATCH 1198/1497] fix: rename select_tickets into selectTickets

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

diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index fb7e34fb9a0..8ebb9f43b1e 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -1054,7 +1054,7 @@ if ($type == Categorie::TYPE_TICKET) {
 			print '<table class="noborder centpercent">';
 			print '<tr class="liste_titre"><td>';
 			print $langs->trans("AddTicketIntoCategory").' &nbsp;';
-			$form->select_tickets('', 'elemid');
+			$form->selectTickets('', 'elemid');
 			print '<input type="submit" class="button buttongen" value="'.$langs->trans("ClassifyInCategory").'"></td>';
 			print '</tr>';
 			print '</table>';

From b59c1f1a3487fb334c824802b69c5a6d5736752f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20David?= <theo.david@evarisk.com>
Date: Mon, 12 Jul 2021 14:17:30 +0200
Subject: [PATCH 1199/1497] fix: rename select_tickets into selectTickets

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 5ef8d804a6b..23a6b724d14 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -6582,7 +6582,6 @@ class Form
 		return;
 	}
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return list of tickets in Ajax if Ajax activated or go to select_tickets_list
 	 *
@@ -6602,7 +6601,7 @@ class Form
 	 *  @param		string		$nooutput				No print, return the output into a string
 	 *  @return		void|string
 	 */
-	public function select_tickets($selected = '', $htmlname = 'ticketid', $filtertype = '', $limit = 0, $status = 1, $selected_input_value = '', $hidelabel = 0, $ajaxoptions = array(), $socid = 0, $showempty = '1', $forcecombo = 0, $morecss = '', $selected_combinations = null, $nooutput = 0)
+	public function selectTickets($selected = '', $htmlname = 'ticketid', $filtertype = '', $limit = 0, $status = 1, $selected_input_value = '', $hidelabel = 0, $ajaxoptions = array(), $socid = 0, $showempty = '1', $forcecombo = 0, $morecss = '', $selected_combinations = null, $nooutput = 0)
 	{
 		// phpcs:enable
 		global $langs, $conf;
@@ -6648,7 +6647,7 @@ class Form
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Return list of tickets.
-	 *  Called by select_tickets.
+	 *  Called by selectTickets.
 	 *
 	 *	@param      int		$selected           Preselected ticket
 	 *	@param      string	$htmlname           Name of select html

From 12e327d6b4055711ef667999059d0aa27f02809e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20David?= <theo.david@evarisk.com>
Date: Mon, 12 Jul 2021 14:37:07 +0200
Subject: [PATCH 1200/1497] fix: remove phpcs:enable tag

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 23a6b724d14..cbb1f09f3d8 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -6663,7 +6663,6 @@ class Form
 	 */
 	public function select_tickets_list($selected = '', $htmlname = 'ticketid', $filtertype = '', $limit = 20, $filterkey = '', $status = 1, $outputmode = 0, $showempty = '1', $forcecombo = 0, $morecss = '')
 	{
-		// phpcs:enable
 		global $langs, $conf, $user, $db;
 
 		$out = '';
@@ -6738,7 +6737,6 @@ class Form
 				$out .= $opt;
 				array_push($outarray, $optJson);
 
-
 				$i++;
 			}
 

From cfb03f065c0307dc061552f610c45d14c51641f8 Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Mon, 12 Jul 2021 16:12:28 +0200
Subject: [PATCH 1201/1497] Fix #18110 : update of formticket.class.php

---
 htdocs/core/class/html.formticket.class.php | 58 +++++++++++++++++----
 1 file changed, 48 insertions(+), 10 deletions(-)

diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index 0a4a622f4a8..4724c57e885 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -656,11 +656,11 @@ class FormTicket
 			print ajax_combobox('select'.$htmlname);
 		} elseif ($htmlname!='') {
 			$groupticket=GETPOST($htmlname, 'aZ09');
-			$groupticketchild=GETPOST($htmlname.'_child', 'aZ09');
+			$child_id=GETPOST($htmlname.'_child_id', 'aZ09')?GETPOST($htmlname.'_child_id', 'aZ09'):0;
 			$arraycodenotparent[] = "";
 			$arrayidused = array();
 			$stringtoprint = '<span class="supportemailfield bold">'.$langs->trans("GroupOfTicket").'</span> ';
-			$stringtoprint .= '<select name="'.$htmlname.'" id ="'.$htmlname.'" class="maxwidth500 minwidth400" child_id="0">';
+			$stringtoprint .= '<select id ="'.$htmlname.'" class="maxwidth500 minwidth400" child_id="0">';
 			$stringtoprint .= '<option value="">&nbsp;</option>';
 
 			$sql = "SELECT ctc.rowid, ctc.code, ctc.label, ctc.fk_parent, ";
@@ -697,13 +697,17 @@ class FormTicket
 			}
 			if ($num_rows_level0 == 1) {
 				return '<input type="hidden" name="'.$htmlname.'" id="'.$htmlname.'" value="'.dol_escape_htmltag($groupvalue).'">';
+			}else{
+				$stringtoprint .= '<input type="hidden" name="'.$htmlname.'" id="'.$htmlname.'_select" class="maxwidth500 minwidth400">';
+				$stringtoprint .= '<input type="hidden" name="'.$htmlname.'_child_id" id="'.$htmlname.'_select_child_id" class="maxwidth500 minwidth400">';
 			}
+			$stringtoprint .= '<input type="submit" value="Envoyer le formulaire">';
 			$stringtoprint .= '</select>&nbsp;';
 
 			$levelid = 1;
 			while ($levelid <= $use_multilevel) {
 				$tabscript = array();
-				$stringtoprint .= '<select name="'.$htmlname.'_child_'.$levelid.'" id ="'.$htmlname.'_child_'.$levelid.'" class="maxwidth500 minwidth400 groupticketchild" child_id="'.$levelid.'">';
+				$stringtoprint .= '<select id ="'.$htmlname.'_child_'.$levelid.'" class="maxwidth500 minwidth400 groupticketchild" child_id="'.$levelid.'">';
 				$stringtoprint .= '<option value="">&nbsp;</option>';
 
 				$sql = "SELECT ctc.rowid, ctc.code, ctc.label, ctc.fk_parent, ctcjoin.code as codefather, ";
@@ -742,7 +746,7 @@ class FormTicket
 							if ($isparent == 'NOTPARENT') {
 								$arraycodenotparent[] = $groupvalue;
 							}
-							$iselected = $groupticketchild == $obj->code ?'selected':'';
+							$iselected = $groupticket == $obj->code ?'selected':'';
 							$stringtoprint .= '<option '.$iselected.' class="'.$htmlname.'_'.dol_escape_htmltag($fatherid).'_child_'.$levelid.'" value="'.dol_escape_htmltag($groupvalue).'" data-html="'.dol_escape_htmltag($grouplabel).'">'.dol_escape_htmltag($grouplabel).'</option>';
 							if (empty($tabscript[$groupcodefather])) {
 								$tabscript[$groupcodefather] = 'if ($("#'.$htmlname.($levelid > 1 ?'_child_'.$levelid-1:'').'")[0].value == "'.dol_escape_js($groupcodefather).'"){
@@ -760,15 +764,43 @@ class FormTicket
 					dol_print_error($this->db);
 				}
 				$stringtoprint .='</select>';
-				//$stringtoprint .= ajax_combobox($htmlname.'_child_'.$levelid);
 
 				$stringtoprint .='<script>';
 				$stringtoprint .='arraynotparents = '.json_encode($arraycodenotparent).';';
-				$stringtoprint .='if (arraynotparents.includes($("#'.$htmlname.($levelid > 1 ?'_child_'.$levelid-1:'').'")[0].value)){$("#'.$htmlname.'_child_'.$levelid.'").hide()}
-
+				$stringtoprint .='if (arraynotparents.includes($("#'.$htmlname.($levelid > 1 ?'_child_'.$levelid-1:'').'")[0].value)){
+					console.log("'.$htmlname.'_child_'.$levelid.'")
+					if($("#'.$htmlname.'_child_'.$levelid.'")[0].value == "" && ($("#'.$htmlname.'_child_'.$levelid.'").attr("child_id")>'.$child_id.')){
+						$("#'.$htmlname.'_child_'.$levelid.'").hide();
+						console.log("We hide '.$htmlname.'_child_'.$levelid.' input")
+					}else if(($("#'.$htmlname.'_child_'.$levelid.'").attr("child_id")!=0) && ($("#'.$htmlname.'_child_'.$levelid.'").attr("child_id")<'.$child_id.')){
+						$("#'.$htmlname.'_child_'.$levelid.'").attr("disabled",true);
+						console.log("We disable '.$htmlname.'_child_'.$levelid.' input");
+					}else{
+						$("#'.$htmlname.'_child_'.$levelid.'").attr("disabled",true);
+						$("#ticketcategory_select_child_id")[0].value = $("#'.$htmlname.'_child_'.$levelid.'").attr("child_id")
+						$("#ticketcategory_select")[0].value = $("#'.$htmlname.'_child_'.$levelid.'")[0].value;
+						console.log("We disable '.$htmlname.'_child_'.$levelid.' input and reload hidden input");
+					}
+					if(arraynotparents.includes("'.$groupticket.'") && '.$child_id.' == 0){
+						$("#ticketcategory_select_child_id")[0].value = $("#'.$htmlname.'").attr("child_id")
+						$("#ticketcategory_select")[0].value = $("#'.$htmlname.'")[0].value;
+						console.log("We choose '.$htmlname.' input and reload hidden input");
+					}
+				}
 				$("#'.$htmlname.($levelid > 1 ?'_child_'.$levelid-1:'').'").change(function() {
-					child_id = $("#'.$htmlname.($levelid > 1 ?'_child_'.$levelid-1:'').'").attr("child_id");
-				    console.log("We select a new value into combo child_id="+child_id);
+					child_id = $("#'.$htmlname.($levelid > 1 ?'_child_'.$levelid:'').'").attr("child_id");
+
+					/* Change of value to select this value*/
+					if (arraynotparents.includes(this.value) || $(this).attr("child_id") == '.$use_multilevel.') {
+						$("#ticketcategory_select")[0].value = this.value;
+						$("#ticketcategory_select_child_id")[0].value = $(this).attr("child_id");
+						console.log("We choose to select "+ $("#ticketcategory_select")[0].value );
+					}else{
+						$("#ticketcategory_select")[0].value = "";
+						$("#ticketcategory_select_child_id")[0].value = "";
+					}
+
+					console.log("We select a new value into combo child_id="+child_id);
 
 					/* Hide all selected box that are child of the one modified */
 					$(".groupticketchild").each(function(){
@@ -794,7 +826,13 @@ class FormTicket
 				$stringtoprint .='})';
 				$stringtoprint .='</script>';
 			}
-
+			$stringtoprint .='<script>';
+			$stringtoprint .='$("#'.$htmlname.'_child_'.$use_multilevel.'").change(function() {
+				$("#ticketcategory_select")[0].value = this.value;
+				$("#ticketcategory_select_child_id")[0].value = $(this).attr("child_id");
+				console.log($("#ticketcategory_select")[0].value);
+			})';
+			$stringtoprint .='</script>';
 			$stringtoprint .= ajax_combobox($htmlname);
 
 			return $stringtoprint;

From 5b1525e77c1941dc6e282ecc26bb6ab3ea576d51 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Mon, 12 Jul 2021 14:15:28 +0000
Subject: [PATCH 1202/1497] Fixing style errors.

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

diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index 4724c57e885..48c861fdd95 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -697,7 +697,7 @@ class FormTicket
 			}
 			if ($num_rows_level0 == 1) {
 				return '<input type="hidden" name="'.$htmlname.'" id="'.$htmlname.'" value="'.dol_escape_htmltag($groupvalue).'">';
-			}else{
+			} else {
 				$stringtoprint .= '<input type="hidden" name="'.$htmlname.'" id="'.$htmlname.'_select" class="maxwidth500 minwidth400">';
 				$stringtoprint .= '<input type="hidden" name="'.$htmlname.'_child_id" id="'.$htmlname.'_select_child_id" class="maxwidth500 minwidth400">';
 			}

From d3f324c2d4267ab27c7cc127d238f8b563891889 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 12 Jul 2021 16:55:16 +0200
Subject: [PATCH 1203/1497] Try a better fix for #18105

---
 htdocs/core/class/hookmanager.class.php | 23 ++++++++++++++++++-----
 htdocs/core/lib/functions.lib.php       |  7 ++++---
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index d610203b3ad..8384886e50c 100644
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -254,16 +254,29 @@ class HookManager
 					// Hooks that must return int (hooks with type 'addreplace')
 					if ($hooktype == 'addreplace')
 					{
-						$resaction += $actionclassinstance->$method($parameters, $object, $action, $this); // $object and $action can be changed by method ($object->id during creation for example or $action to go back to other action for example)
-						if ($resaction < 0 || !empty($actionclassinstance->error) || (!empty($actionclassinstance->errors) && count($actionclassinstance->errors) > 0))
-						{
+						$resactiontmp = $actionclassinstance->$method($parameters, $object, $action, $this); // $object and $action can be changed by method ($object->id during creation for example or $action to go back to other action for example)
+						$resaction += $resactiontmp;
+
+						if ($resactiontmp < 0 || !empty($actionclassinstance->error) || (!empty($actionclassinstance->errors) && count($actionclassinstance->errors) > 0)) {
 							$error++;
 							$this->error = $actionclassinstance->error; $this->errors = array_merge($this->errors, (array) $actionclassinstance->errors);
 							dol_syslog("Error on hook module=".$module.", method ".$method.", class ".get_class($actionclassinstance).", hooktype=".$hooktype.(empty($this->error) ? '' : " ".$this->error).(empty($this->errors) ? '' : " ".join(",", $this->errors)), LOG_ERR);
 						}
 
-						if (isset($actionclassinstance->results) && is_array($actionclassinstance->results))  $this->resArray = array_merge($this->resArray, $actionclassinstance->results);
-						if (!empty($actionclassinstance->resprints)) $this->resPrint .= $actionclassinstance->resprints;
+						if (isset($actionclassinstance->results) && is_array($actionclassinstance->results)) {
+							if ($resactiontmp > 0) {
+								$this->resArray = $actionclassinstance->results;
+							} else {
+								$this->resArray = array_merge($this->resArray, $actionclassinstance->results);
+							}
+						}
+						if (!empty($actionclassinstance->resprints)) {
+							if ($resactiontmp > 0) {
+								$this->resPrint = $actionclassinstance->resprints;
+							} else {
+								$this->resPrint .= $actionclassinstance->resprints;
+							}
+						}
 					}
 					// Generic hooks that return a string or array (printLeftBlock, formAddObjectLine, formBuilddocOptions, ...)
 					else {
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 884b5ece6f7..54ef73f19d6 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -7754,11 +7754,12 @@ function complete_head_from_modules($conf, $langs, $object, &$head, &$h, $type,
 	{
 		$parameters = array('object' => $object, 'mode' => $mode, 'head' => $head);
 		$reshook = $hookmanager->executeHooks('completeTabsHead', $parameters);
-		if ($reshook > 0)
-		{
+		if ($reshook > 0) {		// Hook ask to replace completely the array
 			$head = $hookmanager->resArray;
-			$h = count($head);
+		} else {				// Hook
+			$head = array_merge($head, $hookmanager->resArray);
 		}
+		$h = count($head);
 	}
 }
 

From a15d895b4ba16fe8c86b52f54b0eecf8d8dedd64 Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe@altairis.fr>
Date: Mon, 12 Jul 2021 14:09:16 +0200
Subject: [PATCH 1204/1497] fix badge status bgcolor

---
 htdocs/theme/eldy/badges.inc.php | 8 ++++----
 htdocs/theme/md/badges.inc.php   | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/theme/eldy/badges.inc.php b/htdocs/theme/eldy/badges.inc.php
index dcb61499b63..58317deba15 100644
--- a/htdocs/theme/eldy/badges.inc.php
+++ b/htdocs/theme/eldy/badges.inc.php
@@ -258,9 +258,9 @@ function _createStatusBadgeCss($statusName, $statusVarNamePrefix = '', $commentL
 		print $cssPrefix.".badge-status".$statusName." {\n";
 		print "        color: ".$thisBadgeTextColor." !important;\n";
 		if (in_array((string) $statusName, $TBadgeBorderOnly)) {
-			print "        border-color: ".$thisBadgeBorderColor.";\n";
+			print "        border-color: ".$thisBadgeBorderColor." !important;\n";
 		}
-		print "        background-color: ".$thisBadgeBackgroundColor.";\n";
+		print "        background-color: ".$thisBadgeBackgroundColor." !important;\n";
 		print "}\n";
 
 		print $cssPrefix.".font-status".$statusName." {\n";
@@ -269,14 +269,14 @@ function _createStatusBadgeCss($statusName, $statusVarNamePrefix = '', $commentL
 
 		print $cssPrefix.".badge-status".$statusName.".focus, ".$cssPrefix.".badge-status".$statusName.":focus {\n";
 		print "    outline: 0;\n";
-		print "    box-shadow: 0 0 0 0.2rem ".colorHexToRgb($thisBadgeBackgroundColor, 0.5).";\n";
+		print "    box-shadow: 0 0 0 0.2rem ".colorHexToRgb($thisBadgeBackgroundColor, 0.5)." !important;\n";
 		print "}\n";
 
 		print $cssPrefix.".badge-status".$statusName.":focus, ".$cssPrefix.".badge-status".$statusName.":hover {\n";
 		print "    color: ".$thisBadgeTextColor." !important;\n";
 		//print "    background-color: " . colorDarker($thisBadgeBackgroundColor, 10) . ";\n";
 		if (in_array((string) $statusName, $TBadgeBorderOnly)) {
-			print "        border-color: ".colorDarker($thisBadgeBorderColor, 10).";\n";
+			print "        border-color: ".colorDarker($thisBadgeBorderColor, 10)." !important;\n";
 		}
 		print "}\n";
 	}
diff --git a/htdocs/theme/md/badges.inc.php b/htdocs/theme/md/badges.inc.php
index fd1b1122a17..4a36177e852 100644
--- a/htdocs/theme/md/badges.inc.php
+++ b/htdocs/theme/md/badges.inc.php
@@ -261,9 +261,9 @@ function _createStatusBadgeCss($statusName, $statusVarNamePrefix = '', $commentL
 		print $cssPrefix.".badge-status".$statusName." {\n";
 		print "        color: ".$thisBadgeTextColor." !important;\n";
 		if (in_array((string) $statusName, $TBadgeBorderOnly)) {
-			print "        border-color: ".$thisBadgeBorderColor.";\n";
+			print "        border-color: ".$thisBadgeBorderColor." !important;\n";
 		}
-		print "        background-color: ".$thisBadgeBackgroundColor.";\n";
+		print "        background-color: ".$thisBadgeBackgroundColor." !important;\n";
 		print "}\n";
 
 		print $cssPrefix.".font-status".$statusName." {\n";
@@ -272,14 +272,14 @@ function _createStatusBadgeCss($statusName, $statusVarNamePrefix = '', $commentL
 
 		print $cssPrefix.".badge-status".$statusName.".focus, ".$cssPrefix.".badge-status".$statusName.":focus {\n";
 		print "    outline: 0;\n";
-		print "    box-shadow: 0 0 0 0.2rem ".colorHexToRgb($thisBadgeBackgroundColor, 0.5).";\n";
+		print "    box-shadow: 0 0 0 0.2rem ".colorHexToRgb($thisBadgeBackgroundColor, 0.5)." !important;\n";
 		print "}\n";
 
 		print $cssPrefix.".badge-status".$statusName.":focus, ".$cssPrefix.".badge-status".$statusName.":hover {\n";
 		print "    color: ".$thisBadgeTextColor." !important;\n";
 		//print "    background-color: ".colorDarker($thisBadgeBackgroundColor, 10).";\n";
 		if (in_array((string) $statusName, $TBadgeBorderOnly)) {
-			print "        border-color: ".colorDarker($thisBadgeBorderColor, 10).";\n";
+			print "        border-color: ".colorDarker($thisBadgeBorderColor, 10)." !important;\n";
 		}
 		print "}\n";
 	}

From 202ee8340a4dafd6a17a066781bffdff729f0d7b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 12 Jul 2021 23:01:34 +0200
Subject: [PATCH 1205/1497] FIX #18091

---
 htdocs/langs/en_US/errors.lang                |  1 +
 htdocs/product/card.php                       |  2 +-
 .../product/class/html.formproduct.class.php  |  4 +-
 htdocs/projet/class/task.class.php            | 24 +++++-
 htdocs/projet/tasks/time.php                  | 75 ++++++++++++++-----
 5 files changed, 81 insertions(+), 25 deletions(-)

diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index 3ed7441afa5..cb97af5c183 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -264,6 +264,7 @@ ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
 ErrorAPercentIsRequired=Error, please fill in the percentage correctly
 ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
 ErrorFailedToFindEmailTemplate=Failed to find template with code name %s
+ErrorDurationForServiceNotDefinedCantCalculateHourlyPrice=Duration not defined on service. No way to calculate the hourly price.
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 01a2d9acfdd..2472c764d7e 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1234,7 +1234,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		if ($type == 1) {
 			print '<tr><td>'.$langs->trans("Duration").'</td><td>';
 			print '<input name="duration_value" size="4" value="'.GETPOST('duration_value', 'int').'">';
-			print $formproduct->selectMeasuringUnits("duration_unit", "time", GETPOST('duration_value', 'alpha'), 0, 1);
+			print $formproduct->selectMeasuringUnits("duration_unit", "time", (GETPOSTISSET('duration_value') ? GETPOSTISSET('duration_value', 'alpha') : 'h'), 0, 1);
 			print '</td></tr>';
 		}
 
diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index 5be93a9b9d1..555bc08d03e 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -414,7 +414,7 @@ class FormProduct
 			dol_print_error($db);
 			return -1;
 		} else {
-			$return .= '<select class="flat'.($morecss ? ' '.$morecss : '').'" name="'.$name.'">';
+			$return .= '<select class="flat'.($morecss ? ' '.$morecss : '').'" name="'.$name.'" id="'.$name.'">';
 			if ($adddefault || $adddefault === '') {
 				$return .= '<option value="0">'.($adddefault ? $langs->trans("Default") : '').'</option>';
 			}
@@ -447,6 +447,8 @@ class FormProduct
 			$return .= '</select>';
 		}
 
+		$return .= ajax_combobox($name);
+
 		return $return;
 	}
 
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index 5e17c92c562..02c045e2ce1 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -116,6 +116,7 @@ class Task extends CommonObject
 	public $timespent_datehour; // More accurate start date (same than timespent_date but includes hours, minutes and seconds)
 	public $timespent_withhour; // 1 = we entered also start hours for timesheet line
 	public $timespent_fk_user;
+	public $timespent_thm;
 	public $timespent_note;
 
 	public $comments = array();
@@ -1212,6 +1213,7 @@ class Task extends CommonObject
 				$ret = -2;
 			}
 
+			// Update hourly rate of this time spent entry
 			$sql = "UPDATE ".MAIN_DB_PREFIX."projet_task_time";
 			$sql .= " SET thm = (SELECT thm FROM ".MAIN_DB_PREFIX."user WHERE rowid = ".((int) $this->timespent_fk_user).")"; // set average hour rate of user
 			$sql .= " WHERE rowid = ".((int) $tasktime_id);
@@ -1425,6 +1427,7 @@ class Task extends CommonObject
 		$sql .= " ptt.task_duration,";
 		$sql .= " ptt.fk_user,";
 		$sql .= " ptt.note,";
+		$sql .= " ptt.thm,";
 		$sql .= " pt.rowid as task_id,";
 		$sql .= " pt.ref as task_ref,";
 		$sql .= " pt.label as task_label,";
@@ -1435,7 +1438,7 @@ class Task extends CommonObject
 		$sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as ptt, ".MAIN_DB_PREFIX."projet_task as pt, ".MAIN_DB_PREFIX."projet as p";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON p.fk_soc = s.rowid";
 		$sql .= " WHERE ptt.fk_task = pt.rowid AND pt.fk_projet = p.rowid";
-		$sql .= " AND ptt.fk_user = ".$userobj->id;
+		$sql .= " AND ptt.fk_user = ".((int) $userobj->id);
 		$sql .= " AND pt.entity IN (".getEntity('project').")";
 		if ($morewherefilter) {
 			$sql .= $morewherefilter;
@@ -1471,6 +1474,7 @@ class Task extends CommonObject
 				$newobj->timespent_withhour = $obj->task_date_withhour;
 				$newobj->timespent_duration = $obj->task_duration;
 				$newobj->timespent_fk_user = $obj->fk_user;
+				$newobj->timespent_thm = $obj->thm;	// hourly rate
 				$newobj->timespent_note = $obj->note;
 
 				$arrayres[] = $newobj;
@@ -1552,10 +1556,12 @@ class Task extends CommonObject
 		}
 
 		if ($ret == 1 && ($this->timespent_old_duration != $this->timespent_duration)) {
-			$newDuration = $this->timespent_duration - $this->timespent_old_duration;
-
+			// Recalculate amount of time spent for task and update denormalized field
 			$sql = "UPDATE ".MAIN_DB_PREFIX."projet_task";
 			$sql .= " SET duration_effective = (SELECT SUM(task_duration) FROM ".MAIN_DB_PREFIX."projet_task_time as ptt where ptt.fk_task = ".((int) $this->id).")";
+			if (isset($this->progress)) {
+				$sql .= ", progress = ".((float) $this->progress); // Do not overwrite value if not provided
+			}
 			$sql .= " WHERE rowid = ".((int) $this->id);
 
 			dol_syslog(get_class($this)."::updateTimeSpent", LOG_DEBUG);
@@ -1564,6 +1570,18 @@ class Task extends CommonObject
 				$this->db->rollback();
 				$ret = -2;
 			}
+
+			// Update hourly rate of this time spent entry, but only if it was not set initialy
+			$sql = "UPDATE ".MAIN_DB_PREFIX."projet_task_time";
+			$sql .= " SET thm = (SELECT thm FROM ".MAIN_DB_PREFIX."user WHERE rowid = ".((int) $this->timespent_fk_user).")"; // set average hour rate of user
+			$sql .= " WHERE (thm IS NULL OR thm = 0) AND rowid = ".((int) $this->timespent_id);
+
+			dol_syslog(get_class($this)."::addTimeSpent", LOG_DEBUG);
+			if (!$this->db->query($sql)) {
+				$this->error = $this->db->lasterror();
+				$ret = -2;
+			}
+
 		}
 
 		if ($ret >= 0) {
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index bbe9671faf3..f04b53c3d1e 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -261,10 +261,10 @@ if (($action == 'updateline' || $action == 'updatesplitline') && !$cancel && $us
 			$object->timespent_duration = GETPOSTINT("new_durationhour") * 60 * 60; // We store duration in seconds
 			$object->timespent_duration += (GETPOSTINT("new_durationmin") ? GETPOSTINT('new_durationmin') : 0) * 60; // We store duration in seconds
 			if (GETPOST("timelinehour") != '' && GETPOST("timelinehour") >= 0) {	// If hour was entered
-				$object->timespent_date = dol_mktime(GETPOST("timelinehour"), GETPOST("timelinemin"), 0, GETPOST("timelinemonth"), GETPOST("timelineday"), GETPOST("timelineyear"));
+				$object->timespent_date = dol_mktime(GETPOST("timelinehour", 'int'), GETPOST("timelinemin", 'int'), 0, GETPOST("timelinemonth", 'int'), GETPOST("timelineday", 'int'), GETPOST("timelineyear", 'int'));
 				$object->timespent_withhour = 1;
 			} else {
-				$object->timespent_date = dol_mktime(12, 0, 0, GETPOST("timelinemonth"), GETPOST("timelineday"), GETPOST("timelineyear"));
+				$object->timespent_date = dol_mktime(12, 0, 0, GETPOST("timelinemonth", 'int'), GETPOST("timelineday", 'int'), GETPOST("timelineyear", 'int'));
 			}
 			$object->timespent_fk_user = GETPOST("userid_line", 'int');
 
@@ -353,6 +353,13 @@ if ($action == 'confirm_generateinvoice') {
 		$prodDurationHours = 1.0;
 		if ($idprod > 0) {
 			$tmpproduct->fetch($idprod);
+
+			if (empty($tmpproduct->duration_value)) {
+				$error++;
+				$langs->load("errors");
+				setEventMessages($langs->trans("ErrorDurationForServiceNotDefinedCantCalculateHourlyPrice"), null, 'errors');
+			}
+
 			if ($tmpproduct->duration_unit == 'i') {
 				$prodDurationHours = 1. / 60;
 			}
@@ -380,6 +387,8 @@ if ($action == 'confirm_generateinvoice') {
 			$localtax1 = $dataforprice['localtax1'];
 			$localtax2 = $dataforprice['localtax2'];
 		} else {
+			$prodDurationHours = 1;
+
 			$pu_ht = 0;
 			$txtva = get_default_tva($mysoc, $projectstatic->thirdparty);
 			$localtax1 = get_default_localtax($mysoc, $projectstatic->thirdparty, 1);
@@ -482,14 +491,14 @@ if ($action == 'confirm_generateinvoice') {
 						break;
 					}
 				}
-			} elseif ($generateinvoicemode == 'onelinepertask') {
+			} elseif ($generateinvoicemode == 'onelinepertask') {	// One line for each different task
 				$arrayoftasks = array();
 				foreach ($toselect as $key => $value) {
 					// Get userid, timepent
-					$object->fetchTimeSpent($value);
-					// $object->id is the task id
+					$object->fetchTimeSpent($value);		// Call method to get list of timespent for a timespent line id (We use the utiliy method found into Task object)
+					// $object->id is now the task id
 					$arrayoftasks[$object->id]['timespent'] += $object->timespent_duration;
-					$arrayoftasks[$object->id]['totalvaluetodivideby3600'] += $object->timespent_duration * $object->timespent_thm;
+					$arrayoftasks[$object->id]['totalvaluetodivideby3600'] += ($object->timespent_duration * $object->timespent_thm);
 				}
 
 				foreach ($arrayoftasks as $task_id => $value) {
@@ -499,24 +508,46 @@ if ($action == 'confirm_generateinvoice') {
 					$qtyhour = $value['timespent'] / 3600;
 					$qtyhourtext = convertSecondToTime($value['timespent'], 'all', $conf->global->MAIN_DURATION_OF_WORKDAY);
 
-					// If no unit price known
-					if (empty($pu_ht)) {
-						$pu_ht = price2num($value['totalvaluetodivideby3600'] / 3600, 'MU');
+					if ($idprod > 0) {
+						// If a product is defined, we msut use the $prodDurationHours and $pu_ht of product (already set previously).
+						$pu_ht_for_task = $pu_ht;
+						// If we want to reuse the value of timespent (so use same price than cost price)
+						if (!empty($conf->global->PROJECT_TIME_SPENT_INTO_INVOICE_USE_VALUE)) {
+							$pu_ht_for_task = price2num($value['totalvaluetodivideby3600'] / $value['timespent'], 'MU') * $prodDurationHours;
+						}
+						$pa_ht = price2num($value['totalvaluetodivideby3600'] / $value['timespent'], 'MU') * $prodDurationHours;
+					} else {
+						// If not product used, we use the hour unit for duration and unit price.
+						$pu_ht_for_task = 0;
+						// If we want to reuse the value of timespent (so use same price than cost price)
+						if (!empty($conf->global->PROJECT_TIME_SPENT_INTO_INVOICE_USE_VALUE)) {
+							$pu_ht_for_task = price2num($value['totalvaluetodivideby3600'] / $value['timespent'], 'MU');
+						}
+						$pa_ht = price2num($value['totalvaluetodivideby3600'] / $value['timespent'], 'MU');
 					}
 
 					// Add lines
+					$date_start = '';
+					$date_end = '';
 					$lineName = $ftask->ref.' - '.$ftask->label;
-					$lineid = $tmpinvoice->addline($lineName, $pu_ht, round($qtyhour / $prodDurationHours, 2), $txtva, $localtax1, $localtax2, ($idprod > 0 ? $idprod : 0));
-
-					// Update lineid into line of timespent
-					$sql = 'UPDATE '.MAIN_DB_PREFIX.'projet_task_time SET invoice_line_id = '.((int) $lineid).', invoice_id = '.((int) $tmpinvoice->id);
-					$sql .= ' WHERE rowid IN ('.$db->sanitize(join(',', $toselect)).')';
-					$result = $db->query($sql);
-					if (!$result) {
+					$lineid = $tmpinvoice->addline($lineName, $pu_ht_for_task, price2num($qtyhour / $prodDurationHours, 'MS'), $txtva, $localtax1, $localtax2, ($idprod > 0 ? $idprod : 0), 0, $date_start, $date_end, 0, 0, '', 'HT', 0, 1, -1, 0, '', 0, 0, null, $pa_ht);
+					if ($lineid < 0) {
 						$error++;
-						setEventMessages($db->lasterror(), null, 'errors');
+						setEventMessages($tmpinvoice->error, $tmpinvoice->errors, 'errors');
 						break;
 					}
+
+					if (!$error) {
+						// Update lineid into line of timespent
+						$sql = 'UPDATE '.MAIN_DB_PREFIX.'projet_task_time SET invoice_line_id = '.((int) $lineid).', invoice_id = '.((int) $tmpinvoice->id);
+						$sql .= ' WHERE rowid IN ('.$db->sanitize(join(',', $toselect)).')';
+						$result = $db->query($sql);
+						if (!$result) {
+							$error++;
+							setEventMessages($db->lasterror(), null, 'errors');
+							break;
+						}
+					}
 				}
 			}
 		}
@@ -960,7 +991,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0) {
 			print '<input type="hidden" name="massaction" value="confirm_createbills">';
 
 			if ($projectstatic->thirdparty->id > 0) {
-				print '<table class="noborder" width="100%" >';
+				print '<table class="noborder centerpercent">';
 				print '<tr>';
 				print '<td class="titlefield">';
 				print $langs->trans('DateInvoice');
@@ -1352,11 +1383,11 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0) {
 				break;
 			}
 
-			print '<tr class="oddeven">';
-
 			$date1 = $db->jdate($task_time->task_date);
 			$date2 = $db->jdate($task_time->task_datehour);
 
+			print '<tr class="oddeven">';
+
 			// Date
 			if (!empty($arrayfields['t.task_date']['checked'])) {
 				print '<td class="nowrap">';
@@ -1480,9 +1511,13 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0) {
 
 			// Value spent
 			if (!empty($arrayfields['value']['checked'])) {
+				$langs->load("salaries");
+
 				print '<td class="nowraponall right">';
 				$value = price2num($task_time->thm * $task_time->task_duration / 3600, 'MT', 1);
+				print '<span class="amount" title="'.$langs->trans("THM").': '.price($task_time->thm).'">';
 				print price($value, 1, $langs, 1, -1, -1, $conf->currency);
+				print '</span>';
 				print '</td>';
 				if (!$i) {
 					$totalarray['nbfield']++;

From f9d60b15d956cac3e4bd14eacf1b0f1a30f4a159 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 12 Jul 2021 23:56:42 +0200
Subject: [PATCH 1206/1497] Fix phpcs

---
 htdocs/projet/class/task.class.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index 02c045e2ce1..574fb534b2c 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -1581,7 +1581,6 @@ class Task extends CommonObject
 				$this->error = $this->db->lasterror();
 				$ret = -2;
 			}
-
 		}
 
 		if ($ret >= 0) {

From 35b29481c786f2ea091160ad4d8550d8f9f26e74 Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Tue, 13 Jul 2021 10:05:38 +0200
Subject: [PATCH 1207/1497] Close #18131 : new massaction for thirdparty

---
 htdocs/core/actions_massactions.inc.php | 74 +++++++++++++++++++++++++
 htdocs/core/tpl/massactions_pre.tpl.php |  8 +++
 htdocs/langs/en_US/main.lang            | 10 ++++
 htdocs/langs/fr_FR/main.lang            | 10 ++++
 htdocs/societe/list.php                 |  8 ++-
 5 files changed, 109 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index cd8a3817602..30433004f95 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -1470,6 +1470,80 @@ if (!$error && ($action == 'affecttag' && $confirm == 'yes') && $permissiontoadd
 	}
 }
 
+if (!$error && ($massaction == 'enable' || ($action == 'enable' && $confirm == 'yes')) && $permissiontoadd) {
+	$db->begin();
+
+	$objecttmp = new $objectclass($db);
+	$nbok = 0;
+	foreach ($toselect as $toselectid) {
+		$result = $objecttmp->fetch($toselectid);
+		if($result>0){
+			if (in_array($objecttmp->element,array('societe'))) {
+				$result =$objecttmp->setStatut(1);
+			}
+			if ($result <= 0) {
+				setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
+				$error++;
+				break;
+			} else {
+				$nbok++;
+			}
+		}else {
+			setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
+			$error++;
+			break;
+		}
+	}
+
+	if (!$error) {
+		if ($nbok > 1) {
+			setEventMessages($langs->trans("RecordsEnabled", $nbok), null, 'mesgs');
+		} else {
+			setEventMessages($langs->trans("RecordEnabled"), null, 'mesgs');
+		}
+		$db->commit();
+	} else {
+		$db->rollback();
+	}
+}
+
+if (!$error && ($massaction == 'disable' || ($action == 'disable' && $confirm == 'yes')) && $permissiontoadd) {
+	$db->begin();
+
+	$objecttmp = new $objectclass($db);
+	$nbok = 0;
+	foreach ($toselect as $toselectid) {
+		$result = $objecttmp->fetch($toselectid);
+		if($result>0){
+			if (in_array($objecttmp->element,array('societe'))) {
+				$result =$objecttmp->setStatut(0);
+			}
+			if ($result <= 0) {
+				setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
+				$error++;
+				break;
+			} else {
+				$nbok++;
+			}
+		}else {
+			setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
+			$error++;
+			break;
+		}
+	}
+
+	if (!$error) {
+		if ($nbok > 1) {
+			setEventMessages($langs->trans("RecordsDisabled", $nbok), null, 'mesgs');
+		} else {
+			setEventMessages($langs->trans("RecordDisabled"), null, 'mesgs');
+		}
+		$db->commit();
+	} else {
+		$db->rollback();
+	}
+}
+
 $parameters['toselect'] = $toselect;
 $parameters['uploaddir'] = $uploaddir;
 $parameters['massaction'] = $massaction;
diff --git a/htdocs/core/tpl/massactions_pre.tpl.php b/htdocs/core/tpl/massactions_pre.tpl.php
index 4b8680e11bb..c40f896e702 100644
--- a/htdocs/core/tpl/massactions_pre.tpl.php
+++ b/htdocs/core/tpl/massactions_pre.tpl.php
@@ -194,6 +194,14 @@ if ($massaction == 'presend') {
 
 	print dol_get_fiche_end();
 }
+
+if ($massaction == 'preenable') {
+	print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmMassEnabling"), $langs->trans("ConfirmMassEnablingQuestion", count($toselect)), "enable", null, '', 0, 200, 500, 1);
+}
+if ($massaction == 'predisable') {
+	print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmMassDisabling"), $langs->trans("ConfirmMassDisablingQuestion", count($toselect)), "disable", null, '', 0, 200, 500, 1);
+}
+
 // Allow Pre-Mass-Action hook (eg for confirmation dialog)
 $parameters = array(
 	'toselect' => $toselect,
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 863b94af564..44cdafdda09 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -1137,3 +1137,13 @@ CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
 ConfirmCancel=Are you sure you want to cancel
 EmailMsgID=Email MsgID
+SetToEnabled=Set to enabled
+SetToDisabled=Set to disabled
+ConfirmMassEnabling=mass enabling confirmation
+ConfirmMassEnablingQuestion=Are you sure you want to enable the %s selected record(s)?
+ConfirmMassDisabling=mass disabling confirmation
+ConfirmMassDisablingQuestion=Are you sure you want to disable the %s selected record(s)?
+RecordsEnabled=%s record(s) enabled
+RecordsDisabled=%s record(s) disabled
+RecordEnabled=Record enabled
+RecordDisabled=Record disabled
diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index bf49ccccf54..2453fab1e16 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -1137,3 +1137,13 @@ CopiedToClipboard=Copié dans le presse-papier
 InformationOnLinkToContract=Ce montant n’est que le total de toutes les lignes du contrat. Aucune notion de temps n’est prise en considération.
 ConfirmCancel=Êtes-vous sûr de vous annuler
 EmailMsgID=E-mail MsgID
+SetToEnabled=Activer
+SetToDisabled=Désactiver
+ConfirmMassEnabling=Confirmation d'activation en masse
+ConfirmMassEnablingQuestion=Êtes-vous sur de vouloir activer les %s enregistrement(s) sélectionné(s) ?
+ConfirmMassDisabling=Confirmation de desactivation en masse
+ConfirmMassDisablingQuestion=Êtes-vous sur de vouloir desactiver les %s enregistrement(s) sélectionné(s) ?
+RecordsEnabled=%s enregistrement(s) activé(s)
+RecordsDisabled=%s enregistrement(s) désactivé(s)
+RecordEnabled=Enregistrement activé
+RecordDisabled=Enregistrement désactivé
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 5935ac43b70..6835794e916 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -865,7 +865,13 @@ if ($user->rights->societe->supprimer) {
 if ($user->rights->societe->creer) {
 	$arrayofmassactions['preaffecttag'] = img_picto('', 'category', 'class="pictofixedwidth"').$langs->trans("AffectTag");
 }
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete', 'preaffecttag'))) {
+if ($user->rights->societe->creer) {
+	$arrayofmassactions['preenable'] = img_picto('', '', 'class="pictofixedwidth"').$langs->trans("SetToEnabled");
+}
+if ($user->rights->societe->creer) {
+	$arrayofmassactions['predisable'] = img_picto('', '', 'class="pictofixedwidth"').$langs->trans("SetToDisabled");
+}
+if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete', 'preaffecttag', 'preenable', 'preclose'))) {
 	$arrayofmassactions = array();
 }
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);

From 85adefe721b9f5c49e357942602cd852f4512279 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Tue, 13 Jul 2021 08:08:01 +0000
Subject: [PATCH 1208/1497] Fixing style errors.

---
 htdocs/core/actions_massactions.inc.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index 30433004f95..e5d4de26278 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -1477,8 +1477,8 @@ if (!$error && ($massaction == 'enable' || ($action == 'enable' && $confirm == '
 	$nbok = 0;
 	foreach ($toselect as $toselectid) {
 		$result = $objecttmp->fetch($toselectid);
-		if($result>0){
-			if (in_array($objecttmp->element,array('societe'))) {
+		if ($result>0) {
+			if (in_array($objecttmp->element, array('societe'))) {
 				$result =$objecttmp->setStatut(1);
 			}
 			if ($result <= 0) {
@@ -1488,7 +1488,7 @@ if (!$error && ($massaction == 'enable' || ($action == 'enable' && $confirm == '
 			} else {
 				$nbok++;
 			}
-		}else {
+		} else {
 			setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
 			$error++;
 			break;
@@ -1514,8 +1514,8 @@ if (!$error && ($massaction == 'disable' || ($action == 'disable' && $confirm ==
 	$nbok = 0;
 	foreach ($toselect as $toselectid) {
 		$result = $objecttmp->fetch($toselectid);
-		if($result>0){
-			if (in_array($objecttmp->element,array('societe'))) {
+		if ($result>0) {
+			if (in_array($objecttmp->element, array('societe'))) {
 				$result =$objecttmp->setStatut(0);
 			}
 			if ($result <= 0) {
@@ -1525,7 +1525,7 @@ if (!$error && ($massaction == 'disable' || ($action == 'disable' && $confirm ==
 			} else {
 				$nbok++;
 			}
-		}else {
+		} else {
 			setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
 			$error++;
 			break;

From df3d88570c4527f7da70d526a77154f86c567324 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 13 Jul 2021 11:39:08 +0200
Subject: [PATCH 1209/1497] Fix missing column in migration

---
 htdocs/install/mysql/migration/12.0.0-13.0.0.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
index da4d0fd0a42..cb466f94b10 100644
--- a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
+++ b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
@@ -368,7 +368,7 @@ ALTER TABLE llx_actioncomm_reminder ADD UNIQUE uk_actioncomm_reminder_unique (fk
 
 ALTER TABLE llx_actioncomm_reminder ADD INDEX idx_actioncomm_reminder_status (status);
 
-
+ALTER TABLE llx_inventorydet ADD COLUMN fk_warehouse integer DEFAULT 0;
 ALTER TABLE llx_inventorydet ADD UNIQUE uk_inventorydet(fk_inventory, fk_warehouse, fk_product, batch);
 
 ALTER TABLE llx_commandedet ADD COLUMN ref_ext varchar(255) AFTER label;

From bbce0f9c1bd89fda1c3774599d141d2a6e4a2bfc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 13 Jul 2021 13:01:34 +0200
Subject: [PATCH 1210/1497] Update html.form.class.php

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index cbb1f09f3d8..8c588cfb2e4 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4454,7 +4454,6 @@ class Form
 	 */
 	public function selectEstablishments($selected = '', $htmlname = 'entity', $status = 0, $filtre = '', $useempty = 0, $moreattrib = '')
 	{
-		// phpcs:enable
 		global $langs, $conf;
 
 		$langs->load("admin");
@@ -6603,7 +6602,6 @@ class Form
 	 */
 	public function selectTickets($selected = '', $htmlname = 'ticketid', $filtertype = '', $limit = 0, $status = 1, $selected_input_value = '', $hidelabel = 0, $ajaxoptions = array(), $socid = 0, $showempty = '1', $forcecombo = 0, $morecss = '', $selected_combinations = null, $nooutput = 0)
 	{
-		// phpcs:enable
 		global $langs, $conf;
 
 		$out = '';

From 4c29a3ad994b9d9f43fbebdf33ccb1fe08ca7803 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 13 Jul 2021 13:06:28 +0200
Subject: [PATCH 1211/1497] Fix migration

---
 htdocs/install/mysql/migration/12.0.0-13.0.0.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
index 1ebb8e380a7..29c2aad9bd4 100644
--- a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
+++ b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
@@ -367,7 +367,7 @@ ALTER TABLE llx_actioncomm_reminder ADD UNIQUE uk_actioncomm_reminder_unique (fk
 
 ALTER TABLE llx_actioncomm_reminder ADD INDEX idx_actioncomm_reminder_status (status);
 
-
+ALTER TABLE llx_inventorydet ADD COLUMN fk_warehouse integer DEFAULT 0;
 ALTER TABLE llx_inventorydet ADD UNIQUE uk_inventorydet(fk_inventory, fk_warehouse, fk_product, batch);
 
 ALTER TABLE llx_commandedet ADD COLUMN ref_ext varchar(255) AFTER label;

From 7a589921fe3d6cd902bff136b5047d8811bd80ec Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 13 Jul 2021 13:10:19 +0200
Subject: [PATCH 1212/1497] Fix #18142

---
 htdocs/install/mysql/tables/llx_facture.sql       | 2 +-
 htdocs/install/mysql/tables/llx_facture_fourn.sql | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/install/mysql/tables/llx_facture.sql b/htdocs/install/mysql/tables/llx_facture.sql
index 010cf1c1573..ee98752e5f3 100644
--- a/htdocs/install/mysql/tables/llx_facture.sql
+++ b/htdocs/install/mysql/tables/llx_facture.sql
@@ -86,7 +86,7 @@ create table llx_facture
   fk_incoterms          integer,								-- for incoterms
   location_incoterms    varchar(255),							-- for incoterms
 
-  fk_mode_transport     integer,								-- for intracomm report
+  fk_transport_mode     integer,								-- for intracomm report
 
   situation_cycle_ref smallint,  -- situation cycle reference
   situation_counter   smallint,  -- situation counter
diff --git a/htdocs/install/mysql/tables/llx_facture_fourn.sql b/htdocs/install/mysql/tables/llx_facture_fourn.sql
index ef7e980b8aa..906125d0679 100644
--- a/htdocs/install/mysql/tables/llx_facture_fourn.sql
+++ b/htdocs/install/mysql/tables/llx_facture_fourn.sql
@@ -71,7 +71,7 @@ create table llx_facture_fourn
   fk_incoterms          integer,						-- for incoterms
   location_incoterms    varchar(255),					-- for incoterms
 
-  fk_mode_transport     integer,						-- for intracomm report
+  fk_transport_mode     integer,						-- for intracomm report
 
   model_pdf				varchar(255),
   last_main_doc			varchar(255),					-- relative filepath+filename of last main generated document

From e755d68b068dd1008b90ab62156fa7e606570969 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 13 Jul 2021 13:22:20 +0200
Subject: [PATCH 1213/1497] Merge branch '14.0' of
 git@github.com:Dolibarr/dolibarr.git into develop

---
 htdocs/core/class/hookmanager.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index b22caf17f04..5e24ee03fa4 100644
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -296,9 +296,9 @@ class HookManager
 								$this->resPrint .= $actionclassinstance->resprints;
 							}
 						}
-					}
-					// Generic hooks that return a string or array (printLeftBlock, formAddObjectLine, formBuilddocOptions, ...)
-					else {
+					} else {
+						// Generic hooks that return a string or array (printLeftBlock, formAddObjectLine, formBuilddocOptions, ...)
+
 						// TODO. this test should be done into the method of hook by returning nothing
 						if (is_array($parameters) && !empty($parameters['special_code']) && $parameters['special_code'] > 3 && $parameters['special_code'] != $actionclassinstance->module_number) {
 							continue;

From af99cab839eeb185b2e40503b25476184b60a976 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 13 Jul 2021 13:46:20 +0200
Subject: [PATCH 1214/1497] CSS

---
 htdocs/compta/index.php                | 2 +-
 htdocs/core/boxes/box_factures.php     | 2 +-
 htdocs/core/boxes/box_factures_imp.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index 8db217747ef..b1ad18e6461 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -226,7 +226,7 @@ if (!empty($conf->facture->enabled) && !empty($user->rights->facture->lire)) {
 				print $thirdpartystatic->getNomUrl(1, 'customer', 44);
 				print '</td>';
 				if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) {
-					print '<td class="nowrap right">'.price($obj->total_ht).'</td>';
+					print '<td class="nowrap right"><span class="amount">'.price($obj->total_ht).'</span></td>';
 				}
 				print '<td class="nowrap right"><span class="amount">'.price($obj->total_ttc).'</span></td>';
 				print '<td class="right">'.dol_print_date($db->jdate($obj->tms), 'day').'</td>';
diff --git a/htdocs/core/boxes/box_factures.php b/htdocs/core/boxes/box_factures.php
index 2a97d738cd8..12382ccb583 100644
--- a/htdocs/core/boxes/box_factures.php
+++ b/htdocs/core/boxes/box_factures.php
@@ -180,7 +180,7 @@ class box_factures extends ModeleBoxes
 					);
 
 					$this->info_box_contents[$line][] = array(
-						'td' => 'class="right nowraponall"',
+						'td' => 'class="right nowraponall amount"',
 						'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
 					);
 
diff --git a/htdocs/core/boxes/box_factures_imp.php b/htdocs/core/boxes/box_factures_imp.php
index 391fc2e7cd0..400ae910749 100644
--- a/htdocs/core/boxes/box_factures_imp.php
+++ b/htdocs/core/boxes/box_factures_imp.php
@@ -182,7 +182,7 @@ class box_factures_imp extends ModeleBoxes
 					);
 
 					$this->info_box_contents[$line][] = array(
-						'td' => 'class="nowraponall right"',
+						'td' => 'class="nowraponall right amount"',
 						'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
 					);
 

From 66f38d001265fa8441fdd7c51ca6f4fbbc5fb495 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20David?= <theo.david@evarisk.com>
Date: Tue, 13 Jul 2021 14:00:16 +0200
Subject: [PATCH 1215/1497] fix: rename select_tickets_list into
 selectTicketsList

---
 htdocs/core/class/html.form.class.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 8c588cfb2e4..482b1672d51 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -6582,7 +6582,7 @@ class Form
 	}
 
 	/**
-	 *  Return list of tickets in Ajax if Ajax activated or go to select_tickets_list
+	 *  Return list of tickets in Ajax if Ajax activated or go to selectTicketsList
 	 *
 	 *  @param		int			$selected				Preselected tickets
 	 *  @param		string		$htmlname				Name of HTML select field (must be unique in page).
@@ -6634,7 +6634,7 @@ class Form
 				$out .= img_picto($langs->trans("Search"), 'search');
 			}
 		} else {
-			$out .= $this->select_tickets_list($selected, $htmlname, $filtertype, $limit, $status, 0, $socid, $showempty, $forcecombo, $morecss);
+			$out .= $this->selectTicketsList($selected, $htmlname, $filtertype, $limit, $status, 0, $socid, $showempty, $forcecombo, $morecss);
 		}
 
 		if (empty($nooutput)) print $out;
@@ -6642,7 +6642,6 @@ class Form
 	}
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Return list of tickets.
 	 *  Called by selectTickets.
@@ -6659,7 +6658,7 @@ class Form
 	 *  @param      string  $morecss            Add more css on select
 	 *  @return     array    				    Array of keys for json
 	 */
-	public function select_tickets_list($selected = '', $htmlname = 'ticketid', $filtertype = '', $limit = 20, $filterkey = '', $status = 1, $outputmode = 0, $showempty = '1', $forcecombo = 0, $morecss = '')
+	public function selectTicketsList($selected = '', $htmlname = 'ticketid', $filtertype = '', $limit = 20, $filterkey = '', $status = 1, $outputmode = 0, $showempty = '1', $forcecombo = 0, $morecss = '')
 	{
 		global $langs, $conf, $user, $db;
 
@@ -6694,7 +6693,7 @@ class Form
 		$sql .= $this->db->plimit($limit, 0);
 
 		// Build output string
-		dol_syslog(get_class($this)."::select_tickets_list search tickets", LOG_DEBUG);
+		dol_syslog(get_class($this)."::selectTicketsList search tickets", LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result) {
 			require_once DOL_DOCUMENT_ROOT.'/ticket/class/ticket.class.php';

From 0d9cf07035708afe950967d2d62e0fe687a8b2ac Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 13 Jul 2021 14:07:35 +0200
Subject: [PATCH 1216/1497] Show ref of invoice into tooltip

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

diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index 8cef291c2d7..721a7b92ae8 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -1095,7 +1095,7 @@ $( document ).ready(function() {
 		$max_sale = 0;
 		while ($obj = $db->fetch_object($resql)) {
 			echo '$("#customerandsales").append(\'';
-			echo '<a class="valignmiddle" title="'.dol_escape_js($langs->trans("SaleStartedAt", dol_print_date($db->jdate($obj->datec), '%H:%M', 'tzuser'))).'" onclick="place=\\\'';
+			echo '<a class="valignmiddle" title="'.dol_escape_js($langs->trans("SaleStartedAt", dol_print_date($db->jdate($obj->datec), '%H:%M', 'tzuser')).' - '.$obj->ref).'" onclick="place=\\\'';
 			$num_sale = str_replace(")", "", str_replace("(PROV-POS".$_SESSION["takeposterminal"]."-", "", $obj->ref));
 			echo $num_sale;
 			if (str_replace("-", "", $num_sale) > $max_sale) {

From b12aae4a99459193e93d710cfc242e94fdd02afd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 13 Jul 2021 14:26:32 +0200
Subject: [PATCH 1217/1497] FIX amount of payment deleted in unalterable log
 (for old record must look the log of creation to know amount).

---
 .../interface_50_modBlockedlog_ActionsBlockedLog.class.php      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
index cab0702c5c1..741cc4d09bc 100644
--- a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
+++ b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
@@ -118,6 +118,8 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers
 				foreach ($object->amounts as $amount) {
 					$amounts += price2num($amount);
 				}
+			} elseif (!empty($object->amount)) {
+				$amounts = $object->amount;
 			}
 		} elseif (strpos($action, 'PAYMENT') !== false && !in_array($action, array('PAYMENT_ADD_TO_BANK'))) {
 			$qualified++;

From ba8d60f4d4b62b1cd1bda6d5faaeb995b600055d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 13 Jul 2021 14:48:05 +0200
Subject: [PATCH 1218/1497] FIX amount of payment deleted in unalterable log
 (for old record must look the log of creation to know amount).

---
 htdocs/blockedlog/class/blockedlog.class.php | 175 ++++++++++---------
 1 file changed, 88 insertions(+), 87 deletions(-)

diff --git a/htdocs/blockedlog/class/blockedlog.class.php b/htdocs/blockedlog/class/blockedlog.class.php
index 112456480e1..a7be2fb3630 100644
--- a/htdocs/blockedlog/class/blockedlog.class.php
+++ b/htdocs/blockedlog/class/blockedlog.class.php
@@ -549,110 +549,111 @@ class BlockedLog
 
 			$totalamount = 0;
 
-			if (!is_array($object->amounts) && $object->amount) {
-				$object->amounts = array($object->id => $object->amount);
-			}
+			// Loop on each invoice payment amount
+			if (is_array($object->amounts) && !empty($object->amounts)) {
+				$paymentpartnumber = 0;
+				foreach ($object->amounts as $objid => $amount) {
+					if (empty($amount)) {
+						continue;
+					}
 
-			$paymentpartnumber = 0;
-			foreach ($object->amounts as $objid => $amount) {
-				if (empty($amount)) {
-					continue;
-				}
+					$totalamount += $amount;
 
-				$totalamount += $amount;
+					$tmpobject = null;
+					if ($this->element == 'payment_supplier') {
+						include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+						$tmpobject = new FactureFournisseur($this->db);
+					} elseif ($this->element == 'payment') {
+						include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+						$tmpobject = new Facture($this->db);
+					} elseif ($this->element == 'payment_donation') {
+						include_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
+						$tmpobject = new Don($this->db);
+					} elseif ($this->element == 'payment_various') {
+						include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/paymentvarious.class.php';
+						$tmpobject = new PaymentVarious($this->db);
+					}
 
-				$tmpobject = null;
-				if ($this->element == 'payment_supplier') {
-					include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
-					$tmpobject = new FactureFournisseur($this->db);
-				} elseif ($this->element == 'payment') {
-					include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-					$tmpobject = new Facture($this->db);
-				} elseif ($this->element == 'payment_donation') {
-					include_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
-					$tmpobject = new Don($this->db);
-				} elseif ($this->element == 'payment_various') {
-					include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/paymentvarious.class.php';
-					$tmpobject = new PaymentVarious($this->db);
-				}
+					if (!is_object($tmpobject)) {
+						continue;
+					}
 
-				if (!is_object($tmpobject)) {
-					continue;
-				}
+					$result = $tmpobject->fetch($objid);
 
-				$result = $tmpobject->fetch($objid);
-
-				if ($result <= 0) {
-					$this->error = $tmpobject->error;
-					$this->errors = $tmpobject->errors;
-					dol_syslog("Failed to fetch object with id ".$objid, LOG_ERR);
-					return -1;
-				}
-
-				$paymentpart = new stdClass();
-				$paymentpart->amount = $amount;
-
-				if (!in_array($this->element, array('payment_donation', 'payment_various'))) {
-					$result = $tmpobject->fetch_thirdparty();
-					if ($result == 0) {
-						$this->error = 'Failed to fetch thirdparty for object with id '.$tmpobject->id;
-						$this->errors[] = $this->error;
-						dol_syslog("Failed to fetch thirdparty for object with id ".$tmpobject->id, LOG_ERR);
-						return -1;
-					} elseif ($result < 0) {
+					if ($result <= 0) {
 						$this->error = $tmpobject->error;
 						$this->errors = $tmpobject->errors;
+						dol_syslog("Failed to fetch object with id ".$objid, LOG_ERR);
 						return -1;
 					}
 
-					$paymentpart->thirdparty = new stdClass();
-					foreach ($tmpobject->thirdparty as $key => $value) {
-						if (in_array($key, $arrayoffieldstoexclude)) {
-							continue; // Discard some properties
-						}
-						if (!in_array($key, array(
-						'name', 'name_alias', 'ref_ext', 'address', 'zip', 'town', 'state_code', 'country_code', 'idprof1', 'idprof2', 'idprof3', 'idprof4', 'idprof5', 'idprof6', 'phone', 'fax', 'email', 'barcode',
-						'tva_intra', 'localtax1_assuj', 'localtax1_value', 'localtax2_assuj', 'localtax2_value', 'managers', 'capital', 'typent_code', 'forme_juridique_code', 'code_client', 'code_fournisseur'
-						))) {
-							continue; // Discard if not into a dedicated list
-						}
-						if (!is_object($value) && !is_null($value) && $value !== '') {
-							$paymentpart->thirdparty->{$key} = $value;
-						}
-					}
-				}
+					$paymentpart = new stdClass();
+					$paymentpart->amount = $amount;
 
-				// Init object to avoid warnings
-				if ($this->element == 'payment_donation') {
-					$paymentpart->donation = new stdClass();
-				} else {
-					$paymentpart->invoice = new stdClass();
-				}
+					if (!in_array($this->element, array('payment_donation', 'payment_various'))) {
+						$result = $tmpobject->fetch_thirdparty();
+						if ($result == 0) {
+							$this->error = 'Failed to fetch thirdparty for object with id '.$tmpobject->id;
+							$this->errors[] = $this->error;
+							dol_syslog("Failed to fetch thirdparty for object with id ".$tmpobject->id, LOG_ERR);
+							return -1;
+						} elseif ($result < 0) {
+							$this->error = $tmpobject->error;
+							$this->errors = $tmpobject->errors;
+							return -1;
+						}
 
-				if ($this->element != 'payment_various') {
-					foreach ($tmpobject as $key => $value) {
-						if (in_array($key, $arrayoffieldstoexclude)) {
-							continue; // Discard some properties
-						}
-						if (!in_array($key, array(
-						'ref', 'ref_client', 'ref_supplier', 'date', 'datef', 'type', 'total_ht', 'total_tva', 'total_ttc', 'localtax1', 'localtax2', 'revenuestamp', 'datepointoftax', 'note_public'
-						))) {
-							continue; // Discard if not into a dedicated list
-						}
-						if (!is_object($value) && !is_null($value) && $value !== '') {
-							if ($this->element == 'payment_donation') {
-								$paymentpart->donation->{$key} = $value;
-							} elseif ($this->element == 'payment_various') {
-								$paymentpart->various->{$key} = $value;
-							} else {
-								$paymentpart->invoice->{$key} = $value;
+						$paymentpart->thirdparty = new stdClass();
+						foreach ($tmpobject->thirdparty as $key => $value) {
+							if (in_array($key, $arrayoffieldstoexclude)) {
+								continue; // Discard some properties
+							}
+							if (!in_array($key, array(
+							'name', 'name_alias', 'ref_ext', 'address', 'zip', 'town', 'state_code', 'country_code', 'idprof1', 'idprof2', 'idprof3', 'idprof4', 'idprof5', 'idprof6', 'phone', 'fax', 'email', 'barcode',
+							'tva_intra', 'localtax1_assuj', 'localtax1_value', 'localtax2_assuj', 'localtax2_value', 'managers', 'capital', 'typent_code', 'forme_juridique_code', 'code_client', 'code_fournisseur'
+							))) {
+								continue; // Discard if not into a dedicated list
+							}
+							if (!is_object($value) && !is_null($value) && $value !== '') {
+								$paymentpart->thirdparty->{$key} = $value;
 							}
 						}
 					}
 
-					$paymentpartnumber++; // first payment will be 1
-					$this->object_data->payment_part[$paymentpartnumber] = $paymentpart;
+					// Init object to avoid warnings
+					if ($this->element == 'payment_donation') {
+						$paymentpart->donation = new stdClass();
+					} else {
+						$paymentpart->invoice = new stdClass();
+					}
+
+					if ($this->element != 'payment_various') {
+						foreach ($tmpobject as $key => $value) {
+							if (in_array($key, $arrayoffieldstoexclude)) {
+								continue; // Discard some properties
+							}
+							if (!in_array($key, array(
+							'ref', 'ref_client', 'ref_supplier', 'date', 'datef', 'type', 'total_ht', 'total_tva', 'total_ttc', 'localtax1', 'localtax2', 'revenuestamp', 'datepointoftax', 'note_public'
+							))) {
+								continue; // Discard if not into a dedicated list
+							}
+							if (!is_object($value) && !is_null($value) && $value !== '') {
+								if ($this->element == 'payment_donation') {
+									$paymentpart->donation->{$key} = $value;
+								} elseif ($this->element == 'payment_various') {
+									$paymentpart->various->{$key} = $value;
+								} else {
+									$paymentpart->invoice->{$key} = $value;
+								}
+							}
+						}
+
+						$paymentpartnumber++; // first payment will be 1
+						$this->object_data->payment_part[$paymentpartnumber] = $paymentpart;
+					}
 				}
+			} elseif (!empty($object->amount)) {
+				$totalamount = $object->amount;
 			}
 
 			$this->object_data->amount = $totalamount;

From 9a12b5e424fb061d3650f7be2352ccb92037e5e1 Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Tue, 13 Jul 2021 15:17:01 +0200
Subject: [PATCH 1219/1497] Fix : remove of a button which was forgotten

---
 htdocs/core/class/html.formticket.class.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index 48c861fdd95..9383c0a6e78 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -701,7 +701,6 @@ class FormTicket
 				$stringtoprint .= '<input type="hidden" name="'.$htmlname.'" id="'.$htmlname.'_select" class="maxwidth500 minwidth400">';
 				$stringtoprint .= '<input type="hidden" name="'.$htmlname.'_child_id" id="'.$htmlname.'_select_child_id" class="maxwidth500 minwidth400">';
 			}
-			$stringtoprint .= '<input type="submit" value="Envoyer le formulaire">';
 			$stringtoprint .= '</select>&nbsp;';
 
 			$levelid = 1;

From 0fe46b53d855ac0cfb56ab8c1fdff70195456ff2 Mon Sep 17 00:00:00 2001
From: Gauthier PC portable 024 <gauthier.verdol@atm-consulting.fr>
Date: Tue, 13 Jul 2021 15:18:40 +0200
Subject: [PATCH 1220/1497] FIX : method_exists needs object at first param

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

diff --git a/htdocs/core/actions_addupdatedelete.inc.php b/htdocs/core/actions_addupdatedelete.inc.php
index bb648a71625..f0bf57485a9 100644
--- a/htdocs/core/actions_addupdatedelete.inc.php
+++ b/htdocs/core/actions_addupdatedelete.inc.php
@@ -262,7 +262,7 @@ if ($action == 'confirm_delete' && !empty($permissiontodelete))
 // Remove a line
 if ($action == 'confirm_deleteline' && $confirm == 'yes' && !empty($permissiontoadd))
 {
-	if (method_exists('deleteline', $object)) {
+	if (method_exists($object, 'deleteline')) {
 		$result = $object->deleteline($user, $lineid);		// For backward compatibility
 	} else {
 		$result = $object->deleteLine($user, $lineid);

From 1a330e0b887657c4d9a1596b84979c2508d52c01 Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Wed, 14 Jul 2021 00:02:55 +0200
Subject: [PATCH 1221/1497] Fix dialog BTN and add doc

---
 htdocs/core/js/lib_foot.js.php    |  13 +-
 htdocs/core/lib/functions.lib.php |   5 +-
 htdocs/public/test/badges.php     |  21 +---
 htdocs/public/test/buttons.php    | 196 ++++++++++++++++++++++++++++++
 4 files changed, 214 insertions(+), 21 deletions(-)
 create mode 100644 htdocs/public/test/buttons.php

diff --git a/htdocs/core/js/lib_foot.js.php b/htdocs/core/js/lib_foot.js.php
index beb2788ca24..00f161a31ef 100644
--- a/htdocs/core/js/lib_foot.js.php
+++ b/htdocs/core/js/lib_foot.js.php
@@ -263,6 +263,8 @@ print '$( document ).ready(function() {
 		var confirmContent 			= $(this).attr(\'data-confirm-content\');
 		var confirmActionBtnLabel 	= $(this).attr(\'data-confirm-action-btn-label\');
 		var confirmCancelBtnLabel 	= $(this).attr(\'data-confirm-cancel-btn-label\');
+		var confirmModal	= $(this).attr(\'data-confirm-modal\');
+		if(confirmModal == undefined){ confirmModal = false; }
 
 		var confirmId = \'confirm-dialog-box\';
 		if($(this).attr(\'id\') != undefined){ var confirmId = confirmId + "-" + $(this).attr(\'id\'); }
@@ -277,8 +279,9 @@ print '$( document ).ready(function() {
 
 		$confirmBox.dialog({
 			autoOpen: true,
-			modal: false,
+			modal: confirmModal,
 			//width: Math.min($( window ).width() - 50, 1700),
+			width: \'auto\',
 			dialogClass: \'confirm-dialog-box\',
 			buttons: [
 				{
@@ -297,11 +300,11 @@ print '$( document ).ready(function() {
 				}
 			],
 			close: function( event, ui ) {
-	$(\'#\'+confirmBox).remove();
-},
+				$(\'#\'+confirmBox).remove();
+			},
 			open: function( event, ui ) {
-	$confirmBox.html(confirmContent);
-}
+				$confirmBox.html(confirmContent);
+			}
 		});
 	});
 });
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 7f69dfb8609..9107f9514e4 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -9818,7 +9818,7 @@ function dolGetButtonAction($label, $html = '', $actionType = 'default', $url =
 	}
 
 	// Js Confirm button
-	if (!empty($params['confirm'])) {
+	if ($userRight && !empty($params['confirm'])) {
 		if (!is_array($params['confirm'])) {
 			$params['confirm'] = array(
 				'url' => $url . (strpos($url, '?') > 0 ? '&' : '?') . 'confirm=yes'
@@ -9829,8 +9829,11 @@ function dolGetButtonAction($label, $html = '', $actionType = 'default', $url =
 		$attr['data-confirm-url'] = $params['confirm']['url'];
 		$attr['data-confirm-title'] = !empty($params['confirm']['title']) ? $params['confirm']['title'] : $langs->trans('ConfirmBtnCommonTitle', $label);
 		$attr['data-confirm-content'] = !empty($params['confirm']['content']) ? $params['confirm']['content'] : $langs->trans('ConfirmBtnCommonContent', $label);
+		$attr['data-confirm-content'] = preg_replace("/\r|\n/", "", $attr['data-confirm-content']);
 		$attr['data-confirm-action-btn-label'] = !empty($params['confirm']['action-btn-label']) ? $params['confirm']['action-btn-label'] : $langs->trans('Confirm');
 		$attr['data-confirm-cancel-btn-label'] = !empty($params['confirm']['cancel-btn-label']) ? $params['confirm']['cancel-btn-label'] : $langs->trans('CloseDialog');
+		$attr['data-confirm-modal'] = !empty($params['confirm']['modal']) ? $params['confirm']['modal'] : true;
+
 		$attr['class'].= ' butActionConfirm';
 	}
 
diff --git a/htdocs/public/test/badges.php b/htdocs/public/test/badges.php
index fd0add00af1..2190b96db7e 100644
--- a/htdocs/public/test/badges.php
+++ b/htdocs/public/test/badges.php
@@ -20,7 +20,9 @@ if (!defined('NOREQUIREAJAX')) {
 if (!defined('NOSESSION')) {
 	define('NOSESSION', '1');
 }
-
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1');
+}
 session_cache_limiter('public');
 
 require_once '../../main.inc.php';
@@ -30,19 +32,9 @@ if ($dolibarr_main_prod) {
 	accessforbidden();
 }
 
+
+llxHeader('', 'Documentation and examples for theme');
 ?>
-<!doctype html>
-<html lang="en">
-  <head>
-	<meta charset="utf-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-	<meta name="description" content="Documentation and examples for theme.">
-
-	<link href="<?php echo DOL_URL_ROOT ?>/theme/eldy/style.css.php" rel="stylesheet">
-  </head>
-  <body class="docpage" style="padding: 20px;">
-
-  <main  role="main"  >
 		  <h1 class="bd-title" id="content">Badges</h1>
 		  <p class="bd-lead">Documentation and examples for badges, our small count and labeling component.</p>
 
@@ -342,5 +334,4 @@ if ($dolibarr_main_prod) {
 
 		</main>
 
-  </body>
-</html>
\ No newline at end of file
+<?php llxFooter();
diff --git a/htdocs/public/test/buttons.php b/htdocs/public/test/buttons.php
new file mode 100644
index 00000000000..9e0335e2913
--- /dev/null
+++ b/htdocs/public/test/buttons.php
@@ -0,0 +1,196 @@
+<?php
+if (!defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', '1');
+}
+if (!defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK', 1);
+}
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', 1);
+}
+if (!defined('NOLOGIN')) {
+	define('NOLOGIN', 1); // File must be accessed by logon page so without login
+}
+if (!defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', 1);
+}
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
+if (!defined('NOSESSION')) {
+	define('NOSESSION', '1');
+}
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1');
+}
+session_cache_limiter('public');
+
+require_once '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
+
+if ($dolibarr_main_prod) {
+	accessforbidden();
+}
+
+
+llxHeader('', 'Documentation and examples for theme');
+?>
+<main  role="main"  >
+	<h1 class="bd-title" id="content">Button for action</h1>
+	<p class="bd-lead">Documentation and examples for buttons.</p>
+
+	<h2 id="example01">Example of simple usage</h2>
+
+	<p>Buttons for user allowed to click.</p>
+
+	<div class="bd-example">
+	<?php
+		$n = 1;
+		$label = 'My action label used for accessibility visually for impaired people';
+		$html = '<span class="fa fa-clone" ></span> My default action';
+		$actionType = 'default';
+		$n++;
+		$id = 'mybuttonid'.$n;
+		$url = '#'.$id;
+		$userRight = 1;
+		$params = array();
+
+		print dolGetButtonAction($label, $html, $actionType, $url, $id, $userRight);
+
+
+		$html = '<span class="fa fa-clone" ></span> My delete action';
+		$actionType = 'delete';
+		$n++;
+		$id = 'mybuttonid'.$n;
+		$url = $_SERVER['PHP_SELF'] . '?token='.newToken().'#'.$id;
+		print dolGetButtonAction($label, $html, $actionType, $url, $id, $userRight);
+
+
+		$html = '<span class="fa fa-clone" ></span> My danger action';
+		$actionType = 'danger';
+		$n++;
+		$id = 'mybuttonid'.$n;
+		$url = $_SERVER['PHP_SELF'] . '?token='.newToken().'#'.$id;
+		print dolGetButtonAction($label, $html, $actionType, $url, $id, $userRight);
+
+	?>
+	</div>
+
+	<p>Buttons for user <strong>NOT</strong> allowed to click.</p>
+
+	<div class="bd-example">
+	<?php
+		$label = 'My action label used for accessibility visually for impaired people';
+		$html = '<span class="fa fa-clone" ></span> My default action';
+		$actionType = 'default';
+		$n++;
+		$id = 'mybuttonid'.$n;
+		$url = '#'.$id;
+		$userRight = 0;
+
+		print dolGetButtonAction($label, $html, $actionType, $url, $id, $userRight);
+
+
+		$html = '<span class="fa fa-clone" ></span> My delete action';
+		$actionType = 'delete';
+		$n++;
+		$id = 'mybuttonid'.$n;
+		$url = $_SERVER['PHP_SELF'] . '?token='.newToken().'#'.$id;
+		print dolGetButtonAction($label, $html, $actionType, $url, $id, $userRight);
+
+
+		$html = '<span class="fa fa-clone" ></span> My danger action';
+		$actionType = 'danger';
+		$n++;
+		$id = 'mybuttonid'.$n;
+		$url = $_SERVER['PHP_SELF'] . '?token='.newToken().'#'.$id;
+		print dolGetButtonAction($label, $html, $actionType, $url, $id, $userRight);
+
+	?>
+	</div>
+
+
+	<h2 id="example01">Example of confirm dialog</h2>
+
+	<p>Buttons for user allowed to click.</p>
+
+	<div class="bd-example">
+		<?php
+		$label = 'My action label used for accessibility visually for impaired people';
+		$html = '<span class="fa fa-clone" ></span> My default action';
+		$actionType = 'default';
+		$n++;
+		$id = 'mybuttonid'.$n;
+		$url = '#'.$id;
+		$userRight = 1;
+		$params = array(
+			'confirm' => true
+		);
+
+		print dolGetButtonAction($label, $html, $actionType, $url, $id, $userRight, $params);
+
+
+		$html = '<span class="fa fa-clone" ></span> My delete action';
+		$actionType = 'delete';
+		$n++;
+		$id = 'mybuttonid'.$n;
+		$url = $_SERVER['PHP_SELF'] . '?token='.newToken().'#'.$id;
+
+		$params = array(
+			'confirm' => array(
+				'url' => 'your confirm action url',
+				'title' => 'Your title to display',
+				'action-btn-label' => 'Your confirm label',
+				'cancel-btn-label' => 'Your cancel label',
+				'content' => 'Content to display  with <strong>HTML</strong> compatible <ul><li>test 01</li><li>test 02</li><li>test 03</li></ul>'
+			)
+		);
+
+		print dolGetButtonAction($label, $html, $actionType, $url, $id, $userRight, $params);
+
+		?>
+	</div>
+
+	<p>Buttons for user <strong>NOT</strong> allowed to click.</p>
+
+	<div class="bd-example">
+		<?php
+		$label = 'My action label used for accessibility visually for impaired people';
+		$html = '<span class="fa fa-clone" ></span> My default action';
+		$actionType = 'default';
+		$n++;
+		$id = 'mybuttonid'.$n;
+		$url = '#'.$id;
+		$userRight = 0;
+		$params = array(
+			'confirm' => true
+		);
+
+		print dolGetButtonAction($label, $html, $actionType, $url, $id, $userRight, $params);
+
+
+		$html = '<span class="fa fa-clone" ></span> My delete action';
+		$actionType = 'delete';
+		$n++;
+		$id = 'mybuttonid'.$n;
+		$url = $_SERVER['PHP_SELF'] . '?token='.newToken().'#'.$id;
+
+		$params = array(
+			'confirm' => array(
+				'url' => 'your confirm action url',
+				'title' => 'Your title to display',
+				'action-btn-label' => 'Your confirm label',
+				'cancel-btn-label' => 'Your cancel label',
+				'content' => 'Content to display  with <strong>HTML</strong> compatible <ul><li>test 01</li><li>test 02</li><li>test 03</li></ul>'
+			)
+		);
+
+		print dolGetButtonAction($label, $html, $actionType, $url, $id, $userRight, $params);
+
+		?>
+	</div>
+
+
+</main>
+
+<?php llxFooter();

From 724d00fc6cd114f57a73bdaef86e8b2b0a8f7994 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 14 Jul 2021 02:20:15 +0200
Subject: [PATCH 1222/1497] Fix phpcs

---
 htdocs/core/class/hookmanager.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index b22caf17f04..5e24ee03fa4 100644
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -296,9 +296,9 @@ class HookManager
 								$this->resPrint .= $actionclassinstance->resprints;
 							}
 						}
-					}
-					// Generic hooks that return a string or array (printLeftBlock, formAddObjectLine, formBuilddocOptions, ...)
-					else {
+					} else {
+						// Generic hooks that return a string or array (printLeftBlock, formAddObjectLine, formBuilddocOptions, ...)
+
 						// TODO. this test should be done into the method of hook by returning nothing
 						if (is_array($parameters) && !empty($parameters['special_code']) && $parameters['special_code'] > 3 && $parameters['special_code'] != $actionclassinstance->module_number) {
 							continue;

From 87c26ae0e2e28a658589e1445f72e748d3e96090 Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Wed, 14 Jul 2021 10:07:03 +0200
Subject: [PATCH 1223/1497] Add php doc

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 9107f9514e4..26da9ee3d21 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -9770,7 +9770,23 @@ function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $st
  * @param string    $url        the url for link
  * @param string    $id         attribute id of button
  * @param int       $userRight  user action right
- * @param array     $params     various params for future : recommended rather than adding more function arguments
+ * // phpcs:disable
+ * @param array 	$params = [ // Various params for future : recommended rather than adding more function arguments
+ *                          	'attr' => [ // to add or override button attributes
+ *                          		'xxxxx' => '', // your xxxxx attribute you want
+ *                          		'class' => '', // to add more css class to the button class attribute
+ *                          		'classOverride' => '' // to replace class attribute of the button
+ *                          	],
+ *                          	'confirm' => [
+ *                          		'url' => 'http://', // Overide Url to go when user click on action btn, if empty default url is $url.?confirm=yes, for no js compatibility use $url for fallback confirm.
+ *                          		'title' => '', // Overide title of modal,  if empty default title use "ConfirmBtnCommonTitle" lang key
+ *                          		'action-btn-label' => '', // Overide label of action button,  if empty default label use "Confirm" lang key
+ *                          		'cancel-btn-label' => '', // Overide label of cancel button,  if empty default label use "CloseDialog" lang key
+ *                          		'content' => '', // Overide text of content,  if empty default content use "ConfirmBtnCommonContent" lang key
+ *                          		'modal' => true, // true|false to display dialog as a modal (with dark background)
+ *                      		],
+ *                          ]
+ * // phpcs:enable
  * @return string               html button
  */
 function dolGetButtonAction($label, $html = '', $actionType = 'default', $url = '', $id = '', $userRight = 1, $params = array())

From cd5e1d603e8dc26e312dc1d186298749537a847f Mon Sep 17 00:00:00 2001
From: Alexis LAURIER <a.laurier@kreactive.com>
Date: Wed, 14 Jul 2021 12:02:03 +0200
Subject: [PATCH 1224/1497] fix showInputField checkbox and radio type

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 9e6204bd364..a726987c607 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -5898,7 +5898,10 @@ abstract class CommonObject
 			$type = 'varchar';
 		} elseif (is_array($this->fields[$key]['arrayofkeyval'])) {
 			$param['options'] = $this->fields[$key]['arrayofkeyval'];
-			$type = 'select';
+			$type = $this->fields[$key]['type'];
+			if(!in_array($type, array('select', 'checkbox', 'radio'))) {
+				$type = 'select';
+			}
 		} else {
 			$param['options'] = array();
 			$type = $this->fields[$key]['type'];

From 7406f2cc85a109e875bf2f81c45ab6f14032cdf2 Mon Sep 17 00:00:00 2001
From: BENKE Charlene <1179011+defrance@users.noreply.github.com>
Date: Wed, 14 Jul 2021 12:55:33 +0200
Subject: [PATCH 1225/1497] a interventional drafts on commercial index

---
 htdocs/comm/index.php | 44 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index 9d0d9f1befc..609e43ff765 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -497,6 +497,50 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 	}
 }
 
+
+/*
+ * Draft interventionals
+ */
+if (!empty($conf->ficheinter->enabled)) {
+	$sql = "SELECT f.rowid, f.ref, s.nom as name, s.rowid as socid";
+	$sql .= " FROM ".MAIN_DB_PREFIX."fichinter as f";
+	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	}
+	$sql .= " WHERE f.entity IN (".getEntity('intervention').")";
+	$sql .= " AND f.fk_soc = s.rowid";
+	$sql .= " AND f.fk_statut = 0";
+	if ($socid) {
+		$sql .= " AND f.fk_soc = ".$socid;
+	}
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	}
+
+	$resql = $db->query($sql);
+	if ($resql) {
+		print '<div class="div-table-responsive-no-min">';
+		print '<table class="noborder centpercent">';
+		print '<tr class="liste_titre">';
+		print '<th colspan="2">'.$langs->trans("DraftFichinter").'</th></tr>';
+		$langs->load("fichinter");
+		$num = $db->num_rows($resql);
+		if ($num) {
+			$i = 0;
+			while ($i < $num) {
+				$obj = $db->fetch_object($resql);
+				print '<tr class="oddeven">';
+				print '<td class="nowrap">';
+				print "<a href=\"card.php?id=".$obj->rowid."\">".img_object($langs->trans("ShowFichinter"), "intervention").' '.$obj->ref."</a></td>";
+				print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"), "company").' '.dol_trunc($obj->name, 24).'</a></td></tr>';
+				$i++;
+			}
+		}
+		print "</table></div>";
+	}
+}
+
 print '</div><div class="fichetwothirdright">';
 print '<div class="ficheaddleft">';
 

From 0fd980b00593d1dacf234545e9cbbb44c0a15258 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 14 Jul 2021 13:57:17 +0200
Subject: [PATCH 1226/1497] Update index.php

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

diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index 609e43ff765..11accdb3f0a 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -512,10 +512,10 @@ if (!empty($conf->ficheinter->enabled)) {
 	$sql .= " AND f.fk_soc = s.rowid";
 	$sql .= " AND f.fk_statut = 0";
 	if ($socid) {
-		$sql .= " AND f.fk_soc = ".$socid;
+		$sql .= " AND f.fk_soc = ".((int) $socid);
 	}
 	if (!$user->rights->societe->client->voir && !$socid) {
-		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 	}
 
 	$resql = $db->query($sql);

From b2425c2a9d2d91ffa0e796e11920c7257a7b367e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 14 Jul 2021 14:04:44 +0200
Subject: [PATCH 1227/1497] Update paymentok.php

---
 htdocs/public/payment/paymentok.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 5bb3f4de0fc..f5d1e60a3fc 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -833,7 +833,7 @@ if ($ispaymentok) {
 			$currencyCodeType = $_SESSION['currencyCodeType'];
 
 			// Do action only if $FinalPaymentAmt is set (session variable is cleaned after this page to avoid duplicate actions when page is POST a second time)
-			if (!empty($conf->banque->enabled)) {
+			if (!empty($conf->facture->enabled)) {
 				if (!empty($FinalPaymentAmt) && $paymentTypeId > 0 ) {
 					include_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
 					$invoice = new Facture($db);

From b552c6b4fe012d64511875795c837e8e9eda707d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 14 Jul 2021 14:32:05 +0200
Subject: [PATCH 1228/1497] Fix status color

---
 htdocs/compta/facture/list.php         | 2 +-
 htdocs/holiday/class/holiday.class.php | 8 ++++++--
 htdocs/holiday/list.php                | 3 ++-
 htdocs/langs/en_US/main.lang           | 1 +
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index cc52984d6d4..f25b2b05975 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -1043,7 +1043,7 @@ if ($resql) {
 		$moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$form->select_dolusers($search_user, 'search_user', $tmptitle, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth250');
 		$moreforfilter .= '</div>';
 	}
-	// If the user can view prospects other than his'
+	// Filter on product tags
 	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire && ($user->rights->produit->lire || $user->rights->service->lire)) {
 		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index 2b0641ff9ae..82229198185 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -1251,6 +1251,8 @@ class Holiday extends CommonObject
 	public function LibStatut($status, $mode = 0, $startdate = '')
 	{
 		// phpcs:enable
+		global $langs;
+
 		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
 			global $langs;
 			//$langs->load("mymodule");
@@ -1266,9 +1268,11 @@ class Holiday extends CommonObject
 			$this->labelStatusShort[self::STATUS_REFUSED] = $langs->trans('RefuseCP');
 		}
 
+		$params = array();
 		$statusType = 'status6';
-		if (!empty($startdate) && $startdate > dol_now()) {
+		if (!empty($startdate) && $startdate >= dol_now()) {		// If not yet passed, we use a green "in live" color
 			$statusType = 'status4';
+			$params = array('tooltip'=>$this->labelStatus[$status].' - '.$langs->trans("Forthcoming"));
 		}
 		if ($status == self::STATUS_DRAFT) {
 			$statusType = 'status0';
@@ -1283,7 +1287,7 @@ class Holiday extends CommonObject
 			$statusType = 'status5';
 		}
 
-		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
+		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode, '', $params);
 	}
 
 
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index ece1f9c9ec7..ab57a497e8e 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -730,6 +730,7 @@ if ($resql) {
 			$holidaystatic->id = $obj->rowid;
 			$holidaystatic->ref = ($obj->ref ? $obj->ref : $obj->rowid);
 			$holidaystatic->statut = $obj->status;
+			$holidaystatic->date_debut = $db->jdate($obj->date_debut);
 
 			// User
 			$userstatic->id = $obj->fk_user;
@@ -790,7 +791,7 @@ if ($resql) {
 			}
 			if (!empty($arrayfields['duration']['checked'])) {
 				print '<td class="right">';
-				$nbopenedday = num_open_day($db->jdate($obj->date_debut, 1), $db->jdate($obj->date_fin, 1), 0, 1, $obj->halfday);
+				$nbopenedday = num_open_day($db->jdate($obj->date_debut, 1), $db->jdate($obj->date_fin, 1), 0, 1, $obj->halfday);	// user jdate(..., 1) because num_open_day need UTC dates
 				print $nbopenedday.' '.$langs->trans('DurationDays');
 				print '</td>';
 				if (!$i) {
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 863b94af564..94c851bf346 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -1137,3 +1137,4 @@ CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
 ConfirmCancel=Are you sure you want to cancel
 EmailMsgID=Email MsgID
+Forthcoming=Forthcoming
\ No newline at end of file

From a773652c04e4158ab9661e48db7fac0b97106dcd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 14 Jul 2021 14:37:07 +0200
Subject: [PATCH 1229/1497] Fix phpcs

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 51254bede5d..d050af4883a 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -5918,8 +5918,10 @@ abstract class CommonObject
 		} elseif (is_array($this->fields[$key]['arrayofkeyval'])) {
 			$param['options'] = $this->fields[$key]['arrayofkeyval'];
 			$type = $this->fields[$key]['type'];
-			if(!in_array($type, array('select', 'checkbox', 'radio'))) {
+			if (!in_array($type, array('select', 'checkbox', 'radio'))) {
 				$type = 'select';
+			} else {
+				$type = $this->fields[$key]['type'];
 			}
 		} else {
 			$param['options'] = array();

From 901a158238d9e7071f1981f3ea77596eaa743894 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 14 Jul 2021 17:19:43 +0200
Subject: [PATCH 1230/1497] Fix backward compatibility

---
 htdocs/societe/class/societe.class.php | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index eff2ba39c21..422a3f118d8 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1280,7 +1280,8 @@ class Societe extends CommonObject
 			$this->get_codefournisseur($this, 1);
 		}
 
-		$this->code_compta = trim($this->code_compta);
+		$this->code_compta_client = trim(empty($this->code_compta) ? $this->code_compta_client : $this->code_compta);
+		$this->code_compta = $this->code_compta_client;		// for backward compatbility
 		$this->code_compta_fournisseur = trim($this->code_compta_fournisseur);
 
 		// Check parameters. More tests are done later in the ->verify()
@@ -1292,8 +1293,8 @@ class Societe extends CommonObject
 
 		$customer = false;
 		if (!empty($allowmodcodeclient) && !empty($this->client)) {
-			// Attention get_codecompta peut modifier le code suivant le module utilise
-			if (empty($this->code_compta)) {
+			// If $allowmodcodeclient is set and value is not set, we generate it
+			if (empty($this->code_compta_client)) {
 				$ret = $this->get_codecompta('customer');
 				if ($ret < 0) {
 					return -1;
@@ -1305,8 +1306,8 @@ class Societe extends CommonObject
 
 		$supplier = false;
 		if (!empty($allowmodcodefournisseur) && !empty($this->fournisseur)) {
-			// Attention get_codecompta peut modifier le code suivant le module utilise
-			if ($this->code_compta_fournisseur == "") {
+			// If $allowmodcodefournisseur is set and value is not set, we generate it
+			if (empty($this->code_compta_fournisseur)) {
 				$ret = $this->get_codecompta('supplier');
 				if ($ret < 0) {
 					return -1;
@@ -1460,7 +1461,7 @@ class Societe extends CommonObject
 
 			if ($customer) {
 				$sql .= ", code_client = ".(!empty($this->code_client) ? "'".$this->db->escape($this->code_client)."'" : "null");
-				$sql .= ", code_compta = ".(!empty($this->code_compta) ? "'".$this->db->escape($this->code_compta)."'" : "null");
+				$sql .= ", code_compta = ".(!empty($this->code_compta_client) ? "'".$this->db->escape($this->code_compta_client)."'" : "null");
 			}
 
 			if ($supplier) {
@@ -3311,7 +3312,8 @@ class Societe extends CommonObject
 				$result = $mod->get_code($this->db, $this, $type);
 
 				if ($type == 'customer') {
-					$this->code_compta = $mod->code;
+					$this->code_compta_client = $mod->code;
+					$this->code_compta = $this->code_compta_client;		// For backward compatibility
 				} elseif ($type == 'supplier') {
 					$this->code_compta_fournisseur = $mod->code;
 				}
@@ -3323,6 +3325,7 @@ class Societe extends CommonObject
 			}
 		} else {
 			if ($type == 'customer') {
+				$this->code_compta_client = '';
 				$this->code_compta = '';
 			} elseif ($type == 'supplier') {
 				$this->code_compta_fournisseur = '';

From 83d931f3c740f88b1e15e09f3ccb87b76959fb4e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 14 Jul 2021 17:40:36 +0200
Subject: [PATCH 1231/1497] FIX #18143

---
 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 a53162b7f2c..6e259e3c7fb 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -6828,6 +6828,8 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 		$substitutionarray = array_merge($substitutionarray, array(
 			'__MYCOMPANY_NAME__'    => $mysoc->name,
 			'__MYCOMPANY_EMAIL__'   => $mysoc->email,
+			'__MYCOMPANY_PHONE__'   => $mysoc->phone,
+			'__MYCOMPANY_FAX__'     => $mysoc->fax,
 			'__MYCOMPANY_PROFID1__' => $mysoc->idprof1,
 			'__MYCOMPANY_PROFID2__' => $mysoc->idprof2,
 			'__MYCOMPANY_PROFID3__' => $mysoc->idprof3,

From 5da40d80f71b2a00fba9b4e8c86c2f12b3e889e9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 15 Jul 2021 16:35:06 +0200
Subject: [PATCH 1232/1497] Fix css

---
 htdocs/core/class/commonobject.class.php | 2 +-
 htdocs/societe/project.php               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index b3ae722a5d3..e372e2211b3 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -7492,7 +7492,7 @@ abstract class CommonObject
 
 						if ($display_type == 'card') {
 							$out .= '<tr '.($html_id ? 'id="'.$html_id.'" ' : '').$csstyle.' class="valuefieldcreate '.$class.$this->element.'_extras_'.$key.' trextrafields_collapse'.$extrafields_collapse_num.(!empty($this->id)?'_'.$this->id:'').'" '.$domData.' >';
-							if ( ! empty($conf->global->MAIN_VIEW_LINE_NUMBER) ) {
+							if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER) && $action == 'view') {
 								$out .= '<td></td>';
 							}
 							$out .= '<td class="wordbreak';
diff --git a/htdocs/societe/project.php b/htdocs/societe/project.php
index 038ed7350d5..c6256324257 100644
--- a/htdocs/societe/project.php
+++ b/htdocs/societe/project.php
@@ -136,7 +136,7 @@ if ($socid) {
 
 	$params = '';
 	$backtopage = $_SERVER['PHP_SELF'].'?socid='.$object->id;
-	$newcardbutton = dolGetButtonTitle($langs->trans("NewProject"), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/projet/card.php?action=create&socid='.$object->id.'&amp;backtopage='.urlencode($backtopage), '', 1, $params);
+	$newcardbutton = dolGetButtonTitle($langs->trans("NewProject"), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/projet/card.php?action=create&socid='.$object->id.'&backtopageforcancel='.urlencode($backtopage), '', 1, $params);
 
 	print '<br>';
 

From 9aad07f20c3ce870692b4416b57a25cc4af35dad Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 15 Jul 2021 21:57:32 +0200
Subject: [PATCH 1233/1497] Remove log

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index e372e2211b3..cd1810ed06c 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -8532,7 +8532,6 @@ abstract class CommonObject
 				// Retrieve all extrafield
 				// fetch optionals attributes and labels
 				$this->fetch_optionals();
-				dol_syslog("aaa=".$this->id);
 
 				return $this->id;
 			} else {

From 0aeeb62628220517a719330bee78916193b9578d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 15 Jul 2021 22:29:03 +0200
Subject: [PATCH 1234/1497] More log on imap card

---
 htdocs/admin/emailcollector_card.php | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/htdocs/admin/emailcollector_card.php b/htdocs/admin/emailcollector_card.php
index 4e2c9e34bf9..fdc0b893087 100644
--- a/htdocs/admin/emailcollector_card.php
+++ b/htdocs/admin/emailcollector_card.php
@@ -103,6 +103,7 @@ $debuginfo = '';
 
 $parameters = array();
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
@@ -239,7 +240,6 @@ if ($action == 'confirm_collect') {
 
 
 
-
 /*
  * View
  */
@@ -434,6 +434,14 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 				$connectstringtarget = $connectstringserver.$object->getEncodedUtf7($targetdir);
 			}
 
+			$timeoutconnect = empty($conf->global->MAIN_USE_CONNECT_TIMEOUT) ? 10 : $conf->global->MAIN_USE_CONNECT_TIMEOUT;
+			$timeoutread = empty($conf->global->MAIN_USE_RESPONSE_TIMEOUT) ? 30 : $conf->global->MAIN_USE_RESPONSE_TIMEOUT;
+
+			dol_syslog("imap_open connectstring=".$connectstringsource." login=".$object->login." password=".$object->password." timeoutconnect=".$timeoutconnect." timeoutread=".$timeoutread);
+
+			imap_timeout(IMAP_OPENTIMEOUT, $timeoutconnect);
+			imap_timeout(IMAP_READTIMEOUT, $timeoutread);
+
 			$connection = imap_open($connectstringsource, $object->login, $object->password);
 		} catch (Exception $e) {
 			print $e->getMessage();
@@ -449,12 +457,15 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		if (function_exists('imap_last_error')) {
 			$morehtml .= '<br>'.imap_last_error();
 		}
+		dol_syslog("Error ".$morehtml, LOG_WARNING);
 		//var_dump(imap_errors())
 	} else {
+		dol_syslog("Imap connected. Now we call imap_num_msg()");
 		$morehtml .= imap_num_msg($connection);
 	}
 
 	if ($connection) {
+		dol_syslog("Imap close");
 		imap_close($connection);
 	}
 

From 1e93a3f8f42a69246cfc1b509a41d1342553c2d8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 15 Jul 2021 22:29:03 +0200
Subject: [PATCH 1235/1497] More log on imap card

---
 htdocs/admin/emailcollector_card.php | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/htdocs/admin/emailcollector_card.php b/htdocs/admin/emailcollector_card.php
index 4e2c9e34bf9..fdc0b893087 100644
--- a/htdocs/admin/emailcollector_card.php
+++ b/htdocs/admin/emailcollector_card.php
@@ -103,6 +103,7 @@ $debuginfo = '';
 
 $parameters = array();
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
@@ -239,7 +240,6 @@ if ($action == 'confirm_collect') {
 
 
 
-
 /*
  * View
  */
@@ -434,6 +434,14 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 				$connectstringtarget = $connectstringserver.$object->getEncodedUtf7($targetdir);
 			}
 
+			$timeoutconnect = empty($conf->global->MAIN_USE_CONNECT_TIMEOUT) ? 10 : $conf->global->MAIN_USE_CONNECT_TIMEOUT;
+			$timeoutread = empty($conf->global->MAIN_USE_RESPONSE_TIMEOUT) ? 30 : $conf->global->MAIN_USE_RESPONSE_TIMEOUT;
+
+			dol_syslog("imap_open connectstring=".$connectstringsource." login=".$object->login." password=".$object->password." timeoutconnect=".$timeoutconnect." timeoutread=".$timeoutread);
+
+			imap_timeout(IMAP_OPENTIMEOUT, $timeoutconnect);
+			imap_timeout(IMAP_READTIMEOUT, $timeoutread);
+
 			$connection = imap_open($connectstringsource, $object->login, $object->password);
 		} catch (Exception $e) {
 			print $e->getMessage();
@@ -449,12 +457,15 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		if (function_exists('imap_last_error')) {
 			$morehtml .= '<br>'.imap_last_error();
 		}
+		dol_syslog("Error ".$morehtml, LOG_WARNING);
 		//var_dump(imap_errors())
 	} else {
+		dol_syslog("Imap connected. Now we call imap_num_msg()");
 		$morehtml .= imap_num_msg($connection);
 	}
 
 	if ($connection) {
+		dol_syslog("Imap close");
 		imap_close($connection);
 	}
 

From 0637ef781f0116810bce288e9d02bfd873fbe3f6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 15 Jul 2021 23:03:24 +0200
Subject: [PATCH 1236/1497] Add samples for imap functions test

---
 test/phpunit/imap_header.txt    | 75 +++++++++++++++++++++++++++++++++
 test/phpunit/imap_htmlmsg.txt   |  1 +
 test/phpunit/imap_plaintext.txt |  1 +
 3 files changed, 77 insertions(+)
 create mode 100644 test/phpunit/imap_header.txt
 create mode 100644 test/phpunit/imap_htmlmsg.txt
 create mode 100644 test/phpunit/imap_plaintext.txt

diff --git a/test/phpunit/imap_header.txt b/test/phpunit/imap_header.txt
new file mode 100644
index 00000000000..5891c66a3da
--- /dev/null
+++ b/test/phpunit/imap_header.txt
@@ -0,0 +1,75 @@
+Delivered-To: testldrdev@gmail.com
+Received: by 2002:ab3:5782:0:0:0:0:0 with SMTP id e2csp698208ltc; Thu, 15 Jul
+ 2021 13:49:41 -0700 (PDT)
+X-Received: by 2002:a63:eb51:: with SMTP id b17mr490127pgk.288.1626382180943;
+ Thu, 15 Jul 2021 13:49:40 -0700 (PDT)
+ARC-Seal: i=1; a=rsa-sha256; t=1626382180; cv=none; d=google.com;
+ s=arc-20160816;
+ b=rEpZkUN9MvFJ+8ckMD+urx6epAp5zUAICUiJjTY9yAAwmp54gZ9XYu/qoVgqVe5rAU
+ oayiqojPUzHArxaIlmftWyK4kF6ErAQxMZocn944kHeCGOigIB2y+u+ij3Ip4Vg6PW62
+ 4cATlnRoDTpnckwrXHnOonzSEHunE2smZgtujdNJ/1p/vbmhByQl3Kg71NzCLzdE3nr6
+ PYQNl/XbTL4BUpKBsbPCbJDNeNOqu/FHBI3R7Nfoy+HDY9LR+aYBR4N6jBQMKyKM32JJ
+ 2yrN9ky6N1n2xfvD4lnbqDyqvgWjmTGP+Dk+UAUeAj3YsS/hM2z41UA9xicPoC/B+Wft XWPQ==
+ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
+ s=arc-20160816; h=to:from:subject:message-id:feedback-id:date:mime-version
+ :dkim-signature; bh=jzUFV8bCmEmAeTpb8amH8O1QwkNos0xYlYqLtpP6SBc=;
+ b=cLnW/O5/vTbct4uiVIanDpvITsoy5pp8c0Cy3ZKppY1t2U0bCaedhyI9LkbwXU0ytU
+ i+qgnSrwydhnvY8Yy13KDUkVtjU9dxmQ/YDYBsLjS7WeFEy9OQkIqCR1czmUoUSEPbgr
+ d/tsVEPg/LwHW74WuG6vUVRidF9XBBQqQHR7ADCvo4DQKRURzpeDF4ggDceiWfhpYjbZ
+ Un//GKujM5WGfV7kkqfprw5UsVG8+pjbKdnTwsCKJ3htju9eYXANf4Odn/kjA5OjP3l3
+ fuqCeus0fSyUw9T4DLe4knRxReOL+MfjQc65ATjFlOfl/9/CPauSFkmPrGKeUHi7m2bA rVCQ==
+ARC-Authentication-Results: i=1; mx.google.com; dkim=pass
+ header.i=@accounts.google.com header.s=20161025 header.b=XOpeYXK3; spf=pass
+ (google.com: domain of
+ 3zj_wyagtcnmef-ivgcprttflekj.xffxcv.tfdkvjkcuiuvmxdrzc.tfd@gaia.bounces.google.com
+ designates 209.85.220.73 as permitted sender)
+ smtp.mailfrom=3ZJ_wYAgTCnMef-iVgcpRTTflekj.XffXcV.TfdkVjkcUiUVmXdRZc.Tfd@gaia.bounces.google.com;
+ dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=accounts.google.com
+Return-Path: <3ZJ_wYAgTCnMef-iVgcpRTTflekj.XffXcV.TfdkVjkcUiUVmXdRZc.Tfd@gaia.bounces.google.com>
+Received: from mail-sor-f73.google.com (mail-sor-f73.google.com.
+ [209.85.220.73]) by mx.google.com with SMTPS id
+ m24sor3147147pls.67.2021.07.15.13.49.40 for <testldrdev@gmail.com> (Google
+ Transport Security); Thu, 15 Jul 2021 13:49:40 -0700 (PDT)
+Received-SPF: pass (google.com: domain of
+ 3zj_wyagtcnmef-ivgcprttflekj.xffxcv.tfdkvjkcuiuvmxdrzc.tfd@gaia.bounces.google.com
+ designates 209.85.220.73 as permitted sender) client-ip=209.85.220.73;
+Authentication-Results: mx.google.com; dkim=pass header.i=@accounts.google.com
+ header.s=20161025 header.b=XOpeYXK3; spf=pass (google.com: domain of
+ 3zj_wyagtcnmef-ivgcprttflekj.xffxcv.tfdkvjkcuiuvmxdrzc.tfd@gaia.bounces.google.com
+ designates 209.85.220.73 as permitted sender)
+ smtp.mailfrom=3ZJ_wYAgTCnMef-iVgcpRTTflekj.XffXcV.TfdkVjkcUiUVmXdRZc.Tfd@gaia.bounces.google.com;
+ dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=accounts.google.com
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=accounts.google.com;
+ s=20161025; h=mime-version:date:feedback-id:message-id:subject:from:to;
+ bh=jzUFV8bCmEmAeTpb8amH8O1QwkNos0xYlYqLtpP6SBc=;
+ b=XOpeYXK3QbrfDh9/pqAG7UruMxyCVah4Lj5tfBPHRh8C6AvzStTVsgRTFzPGuxB9cq
+ XRneLOf3kYKud2kkKMNShaG+/t65suM2MTo3q81Qvt9N6n8motuXmnLnNM7kVCaXM//s
+ BxZjiL4nXdjrQBF0N7wcns7xFS+J9pKZbfbm0BaUV32Kb7ef63PQHwhE+au4ytUynBqj
+ hxfA977RfwEXbFmUInVRJ6IJhMoygnx/Y10AccV0TuuLtnNKJIsPFv04SJcOclwaNJ3H
+ 69GSdpRSNJyqn7Rzm4va6l4Lxhjfjzm7+IVzMx717A5e8dLiLjxftCRS1F6EXTeYUvQ+ QcUQ==
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net;
+ s=20161025;
+ h=x-gm-message-state:mime-version:date:feedback-id:message-id:subject
+ :from:to; bh=jzUFV8bCmEmAeTpb8amH8O1QwkNos0xYlYqLtpP6SBc=;
+ b=uWWatGm2u/TYFa5pXhZCPJ59bmYVNEj9qv3Z5wiotMZ7pWc9mR0LYGgD99IjNs7E0G
+ hhv+GwtrMGft69VPG4GyUbmd7pm27G+ykFu2kLfB5lTRhZNjaqeLLkIS4KgbTlAsJJ7q
+ UNrIvPgpAksxnY79qtneThZOTI4o0s+V94A5T5p3/PN99YXq22RxE/aHCIpMIj/NyJeJ
+ RUGdEaiAjQXuG70ekiFAy2cePOI+WCFZEfYmq6vAJO4y285ID/ovjv4cpFIqTu3QFb/u
+ gdZFQriVXnKyZryLbjN1PlpK0772vsatNh5jC8GgOsJjSqJmZLNR5urtUlnRmTaJ8hoV F3lA==
+X-Gm-Message-State: AOAM5338zSEHryX6TtcvwcYlbrnaMvleKLH9RhoGJaqMLvXSPlD7sWEt
+ pW5IuEivfKUIAHzbl8HeQWtM86OUvsPb26Z/ddNWtw==
+X-Google-Smtp-Source: ABdhPJxfD6pBcAwUGMIoqNyPu3KT+9RON4ujFwzRhm3eCKUYxpRR+2hPoCLgdMzCE1TnOL7ShV3hLBEBAQzFtzZ6ue8glg==
+MIME-Version: 1.0
+X-Received: by 2002:a17:902:ed82:b029:ef:48c8:128e with SMTP id
+ e2-20020a170902ed82b02900ef48c8128emr4950093plj.72.1626382180494; Thu, 15 Jul
+ 2021 13:49:40 -0700 (PDT)
+Date: Thu, 15 Jul 2021 20:49:40 GMT
+X-Account-Notification-Type: 46-anexp#nret-fa
+Feedback-ID: 46-anexp#nret-fa:account-notifier
+X-Notifications: 56c00ab9d6600000
+X-Notifications-Bounce-Info: ARgXy4C6Xm7P0JA65M5w_0EB-KbSHnYA8DuTVsZzaMJT7AktG4DWNKZC7qYb4FkrhakLBYzS11Hsoc4qaJocq__FbWMZwTVOmo9d1gWCxx2JMJOgcGQxMKdQ_UVnkuDZugVRr6nih0prpV8OI7Y0ijFI5KVo1M_9f-HXojR-v_jydOpt3lpHGJ-AIQ
+Message-ID: <btsOkB97XRj0uTo4jpgzYg@notifications.google.com>
+Subject: =?UTF-8?B?QWxlcnRlIGRlIHPDqWN1cml0w6k=?=
+From: Google <no-reply@accounts.google.com>
+To: testldrdev@gmail.com
+Content-Type: multipart/alternative; boundary="000000000000232f0005c72f9c4b"
diff --git a/test/phpunit/imap_htmlmsg.txt b/test/phpunit/imap_htmlmsg.txt
new file mode 100644
index 00000000000..fe6eb0de8d3
--- /dev/null
+++ b/test/phpunit/imap_htmlmsg.txt
@@ -0,0 +1 @@
+<!DOCTYPE html><html lang="en"><head><meta name="format-detection" content="email=no"/><meta name="format-detection" content="date=no"/><style nonce="TOqK6jIi0eJsTXLtZ88YTg">.awl a {color: #FFFFFF; text-decoration: none;} .abml a {color: #000000; font-family: Roboto-Medium,Helvetica,Arial,sans-serif; font-weight: bold; text-decoration: none;} .adgl a {color: rgba(0, 0, 0, 0.87); text-decoration: none;} .afal a {color: #b0b0b0; text-decoration: none;} @media screen and (min-width: 600px) {.v2sp {padding: 6px 30px 0px;} .v2rsp {padding: 0px 10px;}} @media screen and (min-width: 600px) {.mdv2rw {padding: 40px 40px;}} </style><link href="//fonts.googleapis.com/css?family=Google+Sans" rel="stylesheet" type="text/css" nonce="TOqK6jIi0eJsTXLtZ88YTg"/></head><body style="margin: 0; padding: 0;" bgcolor="#FFFFFF"><table width="100%" height="100%" style="min-width: 348px;" border="0" cellspacing="0" cellpadding="0" lang="en"><tr height="32" style="height: 32px;"><td></td></tr><tr align="center"><td><div itemscope itemtype="//schema.org/EmailMessage"><div itemprop="action" itemscope itemtype="//schema.org/ViewAction"><link itemprop="url" href="https://accounts.google.com/AccountChooser?Email=testldrdev@gmail.com&amp;continue=https://myaccount.google.com/alert/nt/1626382180096?rfn%3D46%26rfnc%3D1%26eid%3D4797880215322882540%26et%3D0%26anexp%3Dnret-fa"/><meta itemprop="name" content="Consulter l&#39;activité du compte"/></div></div><table border="0" cellspacing="0" cellpadding="0" style="padding-bottom: 20px; max-width: 516px; min-width: 220px;"><tr><td width="8" style="width: 8px;"></td><td><div style="border-style: solid; border-width: thin; border-color:#dadce0; border-radius: 8px; padding: 40px 20px;" align="center" class="mdv2rw"><img src="https://www.gstatic.com/images/branding/googlelogo/2x/googlelogo_color_74x24dp.png" width="74" height="24" aria-hidden="true" style="margin-bottom: 16px;" alt="Google"><div style="font-family: &#39;Google Sans&#39;,Roboto,RobotoDraft,Helvetica,Arial,sans-serif;border-bottom: thin solid #dadce0; color: rgba(0,0,0,0.87); line-height: 32px; padding-bottom: 24px;text-align: center; word-break: break-word;"><div style="font-size: 24px;">Clé de sécurité ajoutée pour la validation en deux étapes </div><table align="center" style="margin-top:8px;"><tr style="line-height: normal;"><td align="right" style="padding-right:8px;"><img width="20" height="20" style="width: 20px; height: 20px; vertical-align: sub; border-radius: 50%;;" src="https://lh3.googleusercontent.com/a/AATXAJwvtB7TqgrMnOW7GMwuA9xGYOPud8oelpVYYNle=s96" alt=""></td><td><a style="font-family: &#39;Google Sans&#39;,Roboto,RobotoDraft,Helvetica,Arial,sans-serif;color: rgba(0,0,0,0.87); font-size: 14px; line-height: 20px;">testldrdev@gmail.com</a></td></tr></table> </div><div style="font-family: Roboto-Regular,Helvetica,Arial,sans-serif; font-size: 14px; color: rgba(0,0,0,0.87); line-height: 20px;padding-top: 20px; text-align: left;">Si vous n'avez pas ajouté de clé de sécurité, quelqu'un utilise peut-être votre compte. Vérifiez et sécurisez votre compte dès maintenant.<div style="padding-top: 32px; text-align: center;"><a href="https://accounts.google.com/AccountChooser?Email=testldrdev@gmail.com&amp;continue=https://myaccount.google.com/alert/nt/1626382180096?rfn%3D46%26rfnc%3D1%26eid%3D4797880215322882540%26et%3D0%26anexp%3Dnret-fa" target="_blank" link-id="main-button-link" style="font-family: &#39;Google Sans&#39;,Roboto,RobotoDraft,Helvetica,Arial,sans-serif; line-height: 16px; color: #ffffff; font-weight: 400; text-decoration: none;font-size: 14px;display:inline-block;padding: 10px 24px;background-color: #4184F3; border-radius: 5px; min-width: 90px;">Consulter l&#39;activité</a></div></div><div style="padding-top: 20px; font-size: 12px; line-height: 16px; color: #5f6368; letter-spacing: 0.3px; text-align: center">Vous pouvez aussi voir l'activité liée à la sécurité de votre compte ici :<br><a style="color: rgba(0, 0, 0, 0.87);text-decoration: inherit;">https://myaccount.google.com/notifications</a></div></div><div style="text-align: left;"><div style="font-family: Roboto-Regular,Helvetica,Arial,sans-serif;color: rgba(0,0,0,0.54); font-size: 11px; line-height: 18px; padding-top: 12px; text-align: center;"><div>Cet e-mail vous a été envoyé pour vous informer de modifications importantes apportées à votre compte et aux services Google que vous utilisez.</div><div style="direction: ltr;">&copy; 2021 Google Ireland Ltd., <a class="afal" style="font-family: Roboto-Regular,Helvetica,Arial,sans-serif;color: rgba(0,0,0,0.54); font-size: 11px; line-height: 18px; padding-top: 12px; text-align: center;">Gordon House, Barrow Street, Dublin 4, Ireland</a></div></div></div></td><td width="8" style="width: 8px;"></td></tr></table></td></tr><tr height="32" style="height: 32px;"><td></td></tr></table></body></html><br><br>
\ No newline at end of file
diff --git a/test/phpunit/imap_plaintext.txt b/test/phpunit/imap_plaintext.txt
new file mode 100644
index 00000000000..33d44eb847c
--- /dev/null
+++ b/test/phpunit/imap_plaintext.txt
@@ -0,0 +1 @@
+[image: Google] Clé de sécurité ajoutée pour la validation en deux étapes testldrdev@gmail.com Si vous n'avez pas ajouté de clé de sécurité, quelqu'un utilise peut-être votre compte. Vérifiez et sécurisez votre compte dès maintenant. Consulter l'activité Vous pouvez aussi voir l'activité liée à la sécurité de votre compte ici : https://myaccount.google.com/notifications Cet e-mail vous a été envoyé pour vous informer de modifications importantes apportées à votre compte et aux services Google que vous utilisez. © 2021 Google Ireland Ltd., Gordon House, Barrow Street, Dublin 4, Ireland
\ No newline at end of file

From ce27feda84e75c916980bf58ef20eab7433b20c6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 16 Jul 2021 00:05:00 +0200
Subject: [PATCH 1237/1497] Debug v14 Fix email collector (Creation of
 thirparty, set of extrafields)

---
 htdocs/core/class/commonobject.class.php      |  4 +-
 .../class/emailcollector.class.php            | 63 +++++++++++++------
 htdocs/langs/en_US/admin.lang                 |  2 +-
 htdocs/societe/class/societe.class.php        | 31 +--------
 4 files changed, 48 insertions(+), 52 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index cd1810ed06c..ceac7015065 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -6521,11 +6521,11 @@ abstract class CommonObject
 		} elseif (in_array($type, array('int', 'integer'))) {
 			$tmp = explode(',', $size);
 			$newsize = $tmp[0];
-			$out = '<input type="text" class="flat '.$morecss.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$newsize.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').($autofocusoncreate ? ' autofocus' : '').'>';
+			$out = '<input type="text" class="flat '.$morecss.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'"'.($newsize > 0 ? ' maxlength="'.$newsize.'"' : '').' value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').($autofocusoncreate ? ' autofocus' : '').'>';
 		} elseif (in_array($type, array('real'))) {
 			$out = '<input type="text" class="flat '.$morecss.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').($autofocusoncreate ? ' autofocus' : '').'>';
 		} elseif (preg_match('/varchar/', $type)) {
-			$out = '<input type="text" class="flat '.$morecss.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$size.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').($autofocusoncreate ? ' autofocus' : '').'>';
+			$out = '<input type="text" class="flat '.$morecss.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'"'.($size > 0 ? ' maxlength="'.$size.'"' : '').' value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').($autofocusoncreate ? ' autofocus' : '').'>';
 		} elseif (in_array($type, array('mail', 'phone', 'url'))) {
 			$out = '<input type="text" class="flat '.$morecss.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').($autofocusoncreate ? ' autofocus' : '').'>';
 		} elseif (preg_match('/^text/', $type)) {
diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index 0b45db6a808..16df7774470 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -324,6 +324,9 @@ class EmailCollector extends CommonObject
 		// Clear fields
 		$object->ref = "copy_of_".$object->ref;
 		$object->title = $langs->trans("CopyOf")." ".$object->title;
+		if (empty($object->host)) {
+			$object->host = 'imap.example.com';
+		}
 		// ...
 		// Clear extrafields that are unique
 		if (is_array($object->array_options) && count($object->array_options) > 0) {
@@ -849,11 +852,11 @@ class EmailCollector extends CommonObject
 				$regexstring = '';
 				//$transformationstring='';
 				$regforregex = array();
-				if (preg_match('/^EXTRACT:([a-zA-Z0-9]+):(.*):([^:])$/', $valueforproperty, $regforregex)) {
+				if (preg_match('/^EXTRACT:([a-zA-Z0-9_]+):(.*):([^:])$/', $valueforproperty, $regforregex)) {
 					$sourcefield = $regforregex[1];
 					$regexstring = $regforregex[2];
 					//$transofrmationstring=$regforregex[3];
-				} elseif (preg_match('/^EXTRACT:([a-zA-Z0-9]+):(.*)$/', $valueforproperty, $regforregex)) {
+				} elseif (preg_match('/^EXTRACT:([a-zA-Z0-9_]+):(.*)$/', $valueforproperty, $regforregex)) {
 					$sourcefield = $regforregex[1];
 					$regexstring = $regforregex[2];
 				}
@@ -1199,15 +1202,20 @@ class EmailCollector extends CommonObject
 			$iforemailloop = 0;
 			foreach ($arrayofemail as $imapemail) {
 				if ($nbemailprocessed > 1000) {
-					break; // Do not process more than 1000 email per launch (this is a different protection than maxnbcollectedpercollect
+					break; // Do not process more than 1000 email per launch (this is a different protection than maxnbcollectedpercollect)
 				}
 
 				$iforemailloop++;
 
+				// GET header and overview datas
+
 				$header = imap_fetchheader($connection, $imapemail, 0);
+				$overview = imap_fetch_overview($connection, $imapemail, 0);
+
+				/* print $header; var_dump($overview); */
+
+				// Process $header of email
 				$header = preg_replace('/\r\n\s+/m', ' ', $header); // When a header line is on several lines, merge lines
-				/*print $header;
-				print $header;*/
 
 				$matches = array();
 				preg_match_all('/([^: ]+): (.+?(?:\r\n\s(?:.+?))*)\r\n/m', $header, $matches);
@@ -1297,9 +1305,6 @@ class EmailCollector extends CommonObject
 				$this->db->begin();
 
 
-				// GET Email meta datas
-				$overview = imap_fetch_overview($connection, $imapemail, 0);
-
 				dol_syslog("msgid=".$overview[0]->message_id." date=".dol_print_date($overview[0]->udate, 'dayrfc', 'gmt')." from=".$overview[0]->from." to=".$overview[0]->to." subject=".$overview[0]->subject);
 
 				$overview[0]->subject = $this->decodeSMTPSubject($overview[0]->subject);
@@ -1309,10 +1314,14 @@ class EmailCollector extends CommonObject
 				// Removed emojis
 				$overview[0]->subject = preg_replace('/[\x{10000}-\x{10FFFF}]/u', "\xEF\xBF\xBD", $overview[0]->subject);
 
-				// Parse IMAP email structure
+				// GET IMAP email structure/content
+
 				global $htmlmsg, $plainmsg, $charset, $attachments;
+
 				$this->getmsg($connection, $imapemail);
 
+				//print $plainmsg; var_dump($plainmsg); exit;
+
 				//$htmlmsg,$plainmsg,$charset,$attachments
 				$messagetext = $plainmsg ? $plainmsg : dol_string_nohtmltag($htmlmsg, 0);
 				// Removed emojis
@@ -1640,13 +1649,15 @@ class EmailCollector extends CommonObject
 					if ($operation['type'] == 'loadthirdparty' || $operation['type'] == 'loadandcreatethirdparty') {
 						if (empty($operation['actionparam'])) {
 							$errorforactions++;
-							$this->error = "Action loadthirdparty or loadandcreatethirdparty has empty parameter. Must be a rule like 'SET:xxx' or 'EXTRACT:(body|subject):regex' to define how to set or extract data";
+							$this->error = "Action loadthirdparty or loadandcreatethirdparty has empty parameter. Must be a rule like 'name=HEADER:^From:(.*);' or 'name=SET:xxx' or 'name=EXTRACT:(body|subject):regex where 'name' can be replaced with 'id' or 'email' to define how to set or extract data. More properties can also be set, for example client=SET:2;";
 							$this->errors[] = $this->error;
 						} else {
 							$actionparam = $operation['actionparam'];
+							$idtouseforthirdparty = '';
 							$nametouseforthirdparty = '';
+							$emailtouseforthirdparty = '';
 
-							// $this->actionparam = 'SET:aaa' or 'EXTRACT:BODY:....'
+							// $actionparam = 'param=SET:aaa' or 'param=EXTRACT:BODY:....'
 							$arrayvaluetouse = dolExplodeIntoArray($actionparam, ';', '=');
 							foreach ($arrayvaluetouse as $propertytooverwrite => $valueforproperty) {
 								$sourcestring = '';
@@ -1654,7 +1665,7 @@ class EmailCollector extends CommonObject
 								$regexstring = '';
 								$regforregex = array();
 
-								if (preg_match('/^EXTRACT:([a-zA-Z0-9]+):(.*)$/', $valueforproperty, $regforregex)) {
+								if (preg_match('/^EXTRACT:([a-zA-Z0-9_]+):(.*)$/', $valueforproperty, $regforregex)) {
 									$sourcefield = $regforregex[1];
 									$regexstring = $regforregex[2];
 								}
@@ -1674,10 +1685,18 @@ class EmailCollector extends CommonObject
 										if (preg_match('/'.$regexstring.'/ms', $sourcestring, $regforval)) {
 											//var_dump($regforval[count($regforval)-1]);exit;
 											// Overwrite param $tmpproperty
-											$nametouseforthirdparty = isset($regforval[count($regforval) - 1]) ? trim($regforval[count($regforval) - 1]) : null;
+											if ($propertytooverwrite == 'id') {
+												$idtouseforthirdparty = isset($regforval[count($regforval) - 1]) ? trim($regforval[count($regforval) - 1]) : null;
+											} elseif ($propertytooverwrite == 'email') {
+												$emailtouseforthirdparty = isset($regforval[count($regforval) - 1]) ? trim($regforval[count($regforval) - 1]) : null;
+											} else {
+												$nametouseforthirdparty = isset($regforval[count($regforval) - 1]) ? trim($regforval[count($regforval) - 1]) : null;
+											}
 										} else {
 											// Regex not found
+											$idtouseforthirdparty = null;
 											$nametouseforthirdparty = null;
+											$emailtouseforthirdparty = null;
 										}
 										//var_dump($object->$tmpproperty);exit;
 									} else {
@@ -1689,7 +1708,13 @@ class EmailCollector extends CommonObject
 								} elseif (preg_match('/^(SET|SETIFEMPTY):(.*)$/', $valueforproperty, $reg)) {
 									//if (preg_match('/^options_/', $tmpproperty)) $object->array_options[preg_replace('/^options_/', '', $tmpproperty)] = $reg[1];
 									//else $object->$tmpproperty = $reg[1];
-									$nametouseforthirdparty = $reg[2];
+									if ($propertytooverwrite == 'id') {
+										$idtouseforthirdparty = $reg[2];
+									} elseif ($propertytooverwrite == 'email') {
+										$emailtouseforthirdparty = $reg[2];
+									} else {
+										$nametouseforthirdparty = $reg[2];
+									}
 								} else {
 									$errorforactions++;
 									$this->error = 'Bad syntax for description of action parameters: '.$actionparam;
@@ -1698,8 +1723,8 @@ class EmailCollector extends CommonObject
 								}
 							}
 
-							if (!$errorforactions && $nametouseforthirdparty) {
-								$result = $thirdpartystatic->fetch(0, $nametouseforthirdparty);
+							if (!$errorforactions && ($idtouseforthirdparty || $emailtouseforthirdparty || $nametouseforthirdparty)) {
+								$result = $thirdpartystatic->fetch($idtouseforthirdparty, $nametouseforthirdparty, '', '', '', '', '', '', '', '', $emailtouseforthirdparty);
 								if ($result < 0) {
 									$errorforactions++;
 									$this->error = 'Error when getting thirdparty with name '.$nametouseforthirdparty.' (may be 2 record exists with same name ?)';
@@ -1707,20 +1732,20 @@ class EmailCollector extends CommonObject
 									break;
 								} elseif ($result == 0) {
 									if ($operation['type'] == 'loadthirdparty') {
-										dol_syslog("Third party with name ".$nametouseforthirdparty." was not found");
+										dol_syslog("Third party with id=".$idtouseforthirdparty." email=".$emailtouseforthirdparty." name=".$nametouseforthirdparty." was not found");
 
 										$errorforactions++;
 										$this->error = 'ErrorFailedToLoadThirdParty';
 										$this->errors[] = 'ErrorFailedToLoadThirdParty';
 									} elseif ($operation['type'] == 'loadandcreatethirdparty') {
-										dol_syslog("Third party with name ".$nametouseforthirdparty." was not found. We try to create it.");
+										dol_syslog("Third party with id=".$idtouseforthirdparty." email=".$emailtouseforthirdparty." name=".$nametouseforthirdparty." was not found. We try to create it.");
 
 										// Create thirdparty
 										$thirdpartystatic->name = $nametouseforthirdparty;
 										if ($fromtext != $nametouseforthirdparty) {
 											$thirdpartystatic->name_alias = $fromtext;
 										}
-										$thirdpartystatic->email = $from;
+										$thirdpartystatic->email = ($emailtouseforthirdparty ? $emailtouseforthirdparty : $from);
 
 										// Overwrite values with values extracted from source email
 										$errorforthisaction = $this->overwritePropertiesOfObject($thirdpartystatic, $operation['actionparam'], $messagetext, $subject, $header);
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 7af07369759..aca631eef99 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -2090,7 +2090,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\s([^\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
+EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\s([^\s]*);client=SET:2;'<br>
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 422a3f118d8..dc074c817f8 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2002-2006  Rodolphe Quiedeville    <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2019  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2021  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2004       Eric Seigne             <eric.seigne@ryxeo.com>
  * Copyright (C) 2003       Brian Fraval            <brian@fraval.org>
  * Copyright (C) 2006       Andre Cianfarani        <acianfa@free.fr>
@@ -4265,21 +4265,6 @@ class Societe extends CommonObject
 		return $lib;
 	}
 
-
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 *  Set prospect level
-	 *
-	 *  @param  User	$user		User who sets the discount
-	 *	@return	int					<0 if KO, >0 if OK
-	 * @deprecated Use update function instead
-	 */
-	public function set_prospect_level(User $user)
-	{
-		// phpcs:enable
-		return $this->update($this->id, $user);
-	}
-
 	/**
 	 *  Return status of prospect
 	 *
@@ -4359,20 +4344,6 @@ class Societe extends CommonObject
 		return "Error, mode/status not found";
 	}
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 *  Set outstanding value
-	 *
-	 *  @param  User	$user		User making change
-	 *	@return	int					<0 if KO, >0 if OK
-	 * @deprecated Use update function instead
-	 */
-	public function set_OutstandingBill(User $user)
-	{
-		// phpcs:enable
-		return $this->update($this->id, $user);
-	}
-
 	/**
 	 *  Return amount of order not paid and total
 	 *

From 180527d23a582498f8fd3330a708a9d40c1b0c3b Mon Sep 17 00:00:00 2001
From: Florian Mortgat <florian.mortgat@atm-consulting.fr>
Date: Fri, 16 Jul 2021 10:10:57 +0200
Subject: [PATCH 1238/1497] FIX 13.0: class CommandeFournisseurDispatch
 provides trigger for UPDATE but not for CREATE / DELETE

---
 .../fourn/class/fournisseur.commande.dispatch.class.php   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.commande.dispatch.class.php b/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
index a7abed27369..0cffacc19a3 100644
--- a/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
@@ -204,8 +204,8 @@ class CommandeFournisseurDispatch extends CommonObject
 				// want this action calls a trigger.
 
 				//// Call triggers
-				//$result=$this->call_trigger('MYOBJECT_CREATE',$user);
-				//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
+				$result=$this->call_trigger('LINERECEPTION_CREATE', $user);
+				if ($result < 0) $error++;
 				//// End call triggers
 			}
 		}
@@ -419,8 +419,8 @@ class CommandeFournisseurDispatch extends CommonObject
 				// want this action calls a trigger.
 
 				//// Call triggers
-				//$result=$this->call_trigger('MYOBJECT_DELETE',$user);
-				//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
+				$result=$this->call_trigger('LINERECEPTION_DELETE', $user);
+				if ($result < 0) $error++;
 				//// End call triggers
 			}
 		}

From c928de89c6c3b84f5192a4740785b384bf98759d Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Fri, 16 Jul 2021 10:41:06 +0200
Subject: [PATCH 1239/1497] fix: print barcode sould not be available for
 external user

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

diff --git a/htdocs/core/modules/modBarcode.class.php b/htdocs/core/modules/modBarcode.class.php
index 6a894972eb7..4b55f2e438f 100644
--- a/htdocs/core/modules/modBarcode.class.php
+++ b/htdocs/core/modules/modBarcode.class.php
@@ -104,7 +104,7 @@ class modBarcode extends DolibarrModules
 								'enabled'=>'$conf->barcode->enabled', // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
 								'perms'=>'($conf->global->MAIN_USE_ADVANCED_PERMS && $user->rights->barcode->lire_advance) || (! $conf->global->MAIN_USE_ADVANCED_PERMS)', // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
 								'target'=>'',
-								'user'=>2); // 0=Menu for internal users, 1=external users, 2=both
+								'user'=>0); // 0=Menu for internal users, 1=external users, 2=both
 		$r++;
 
 		$this->menu[$r] = array('fk_menu'=>'fk_mainmenu=home,fk_leftmenu=admintools', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode

From 4d6372dda12f9c36c00c1901fb0c9f529f7a8ab1 Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <68746600+marc-dll@users.noreply.github.com>
Date: Fri, 16 Jul 2021 12:10:25 +0200
Subject: [PATCH 1240/1497] FIX: holiday balances: revert part of commit
 1e7df0ba9 to still increment on page visit

---
 htdocs/holiday/define_holiday.php |  4 ++++
 htdocs/holiday/list.php           |  3 +++
 htdocs/hrm/index.php              | 10 ++++++++++
 3 files changed, 17 insertions(+)

diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php
index fcb8b73d486..b3d2c25adda 100644
--- a/htdocs/holiday/define_holiday.php
+++ b/htdocs/holiday/define_holiday.php
@@ -193,6 +193,10 @@ llxHeader('', $langs->trans('CPTitreMenu'));
 
 
 $typeleaves = $holiday->getTypes(1, 1);
+$result = $holiday->updateBalance(); // Create users into table holiday if they don't exists. TODO Remove this whif we use field into table user.
+if ($result < 0) {
+	setEventMessages($holiday->error, $holiday->errors, 'errors');
+}
 
 
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index 9d569f4344e..c62185d5f2a 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -231,6 +231,9 @@ $formfile = new FormFile($db);
 $fuser = new User($db);
 $holidaystatic = new Holiday($db);
 
+// Update sold
+$result = $object->updateBalance();
+
 $title = $langs->trans('CPTitreMenu');
 llxHeader('', $title);
 
diff --git a/htdocs/hrm/index.php b/htdocs/hrm/index.php
index 6cc4dc3b5bd..50fd4c3f521 100644
--- a/htdocs/hrm/index.php
+++ b/htdocs/hrm/index.php
@@ -68,6 +68,16 @@ if (empty($conf->global->MAIN_INFO_SOCIETE_NOM) || empty($conf->global->MAIN_INF
 $max = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
 
 
+/*
+ * Actions
+ */
+
+// Update sold
+if (!empty($conf->holiday->enabled) && !empty($setupcompanynotcomplete)) {
+	$holidaystatic = new Holiday($db);
+	$result = $holidaystatic->updateBalance();
+}
+
 
 /*
  * View

From 501bc853af6c32b74c9a3c8fc6e939f969f643bd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 16 Jul 2021 12:44:15 +0200
Subject: [PATCH 1241/1497] Fix default value

---
 htdocs/install/mysql/tables/llx_object_lang.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/tables/llx_object_lang.sql b/htdocs/install/mysql/tables/llx_object_lang.sql
index cc4352f3acc..01b70b208ff 100644
--- a/htdocs/install/mysql/tables/llx_object_lang.sql
+++ b/htdocs/install/mysql/tables/llx_object_lang.sql
@@ -25,7 +25,7 @@ create table llx_object_lang
   fk_object      integer      DEFAULT 0 NOT NULL,
   type_object    varchar(32)  NOT NULL,					-- value found into $object->element: 'thirdparty', 'contact', '...'
   property       varchar(32)  NOT NULL,					-- name of property
-  lang           varchar(5)   DEFAULT 0 NOT NULL,
+  lang           varchar(5)   DEFAULT '' NOT NULL,
   value          text,
   import_key varchar(14) DEFAULT NULL
 )ENGINE=innodb;

From a344ae89f22bb6c9a9be0d1699a8623d5207d15b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 16 Jul 2021 15:02:23 +0200
Subject: [PATCH 1242/1497] Fix changelog

---
 ChangeLog | 44 +++++++++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 48ba5daa562..f439186f5ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,27 +2,6 @@
 English Dolibarr ChangeLog
 --------------------------------------------------------------
 
-***** ChangeLog for 13.0.4 compared to 13.0.2 *****
-
-FIX: Allow disabling of a module (not a dangerous action) even if there is problem with token (due to bugged modules).
-FIX: 13.0 - fatal - missing inclusion of ajax.lib.php for calling `ajax_autocompleter()`
-FIX: #17919 pictures in docs.
-FIX: #18006
-FIX: Accountancy - if we define a date start, automatic binding try to continue to solve old binding
-FIX: Accoutancy Limit date payment not registered on purchases operations
-FIX: Can't edit replacement invoice
-FIX: deposit can create credit note in payment conf
-FIX: division by zero on create
-FIX: holiday: balances not updated correctly with pgsql because of case sensitivity field
-FIX: holiday: status filter parameter has been renamed but not in links it was used
-FIX: List and Create Companies Left Menus
-FIX: method exists
-FIX: need to add payment sum to getlibstatus function in object linked block
-FIX: permission to close a proposal when using advanced permissions
-FIX: Problem of z-index with popup and top menu
-FIX: same thing on supplier orders
-FIX: Status of invoice when making a replacement invoice
-FIX: update contact birthday alert
 
 ***** ChangeLog for 14.0.0 compared to 13.0.0 *****
 
@@ -249,6 +228,29 @@ Following changes may create regressions for some external modules, but were nec
 * Removed constant MAIN_COUNTRIES_IN_EEC. You can now set if country is in Europe or not from the dictionary of countries.
 
 
+***** ChangeLog for 13.0.4 compared to 13.0.3 *****
+
+FIX: Allow disabling of a module (not a dangerous action) even if there is problem with token (due to bugged modules).
+FIX: 13.0 - fatal - missing inclusion of ajax.lib.php for calling `ajax_autocompleter()`
+FIX: #17919 pictures in docs.
+FIX: #18006
+FIX: Accountancy - if we define a date start, automatic binding try to continue to solve old binding
+FIX: Accoutancy Limit date payment not registered on purchases operations
+FIX: Can't edit replacement invoice
+FIX: deposit can create credit note in payment conf
+FIX: division by zero on create
+FIX: holiday: balances not updated correctly with pgsql because of case sensitivity field
+FIX: holiday: status filter parameter has been renamed but not in links it was used
+FIX: List and Create Companies Left Menus
+FIX: method exists
+FIX: need to add payment sum to getlibstatus function in object linked block
+FIX: permission to close a proposal when using advanced permissions
+FIX: Problem of z-index with popup and top menu
+FIX: same thing on supplier orders
+FIX: Status of invoice when making a replacement invoice
+FIX: update contact birthday alert
+
+
 ***** ChangeLog for 13.0.3 compared to 13.0.2 *****
 
 FIX: 13.0 warning - missing quotes around 'label'

From 284627b693413a8251f11981bd407060b1d162c2 Mon Sep 17 00:00:00 2001
From: trekmorris <78349579+trekmorris@users.noreply.github.com>
Date: Fri, 16 Jul 2021 23:55:29 +0800
Subject: [PATCH 1243/1497] Update opensurvey.lang manually

This file is not auto sync from transifex . So update it manually .
---
 htdocs/langs/zh_TW/opensurvey.lang | 120 ++++++++++++++---------------
 1 file changed, 60 insertions(+), 60 deletions(-)

diff --git a/htdocs/langs/zh_TW/opensurvey.lang b/htdocs/langs/zh_TW/opensurvey.lang
index 51a4283c721..ff927bfc863 100644
--- a/htdocs/langs/zh_TW/opensurvey.lang
+++ b/htdocs/langs/zh_TW/opensurvey.lang
@@ -1,61 +1,61 @@
 # Dolibarr language file - Source file is en_US - opensurvey
-Survey=Poll
-Surveys=Polls
-OrganizeYourMeetingEasily=Organize your meetings and polls easily. First select the type of poll...
-NewSurvey=New poll
-OpenSurveyArea=Polls area
-AddACommentForPoll=You can add a comment into poll...
-AddComment=Add comment
-CreatePoll=Create poll
-PollTitle=Poll title
-ToReceiveEMailForEachVote=Receive an email for each vote
-TypeDate=Type date
-TypeClassic=Type standard
-OpenSurveyStep2=Select your dates among the free days (grey). The selected days are green. You can unselect a day previously selected by clicking again on it
-RemoveAllDays=Remove all days
-CopyHoursOfFirstDay=Copy hours of first day
-RemoveAllHours=Remove all hours
-SelectedDays=Selected days
-TheBestChoice=The best choice currently is
-TheBestChoices=The best choices currently are
-with=with
-OpenSurveyHowTo=If you agree to vote in this poll, you have to give your name, choose the values that fit best for you and validate with the plus button at the end of the line.
-CommentsOfVoters=Comments of voters
-ConfirmRemovalOfPoll=Are you sure you want to remove this poll (and all votes)
-RemovePoll=Remove poll
-UrlForSurvey=URL to communicate to get a direct access to poll
-PollOnChoice=You are creating a poll to make a multi-choice for a poll. First enter all possible choices for your poll:
-CreateSurveyDate=Create a date poll
-CreateSurveyStandard=Create a standard poll
-CheckBox=Simple checkbox
-YesNoList=List (empty/yes/no)
-PourContreList=List (empty/for/against)
-AddNewColumn=Add new column
-TitleChoice=Choice label
-ExportSpreadsheet=Export result spreadsheet
-ExpireDate=極限日期
-NbOfSurveys=Number of polls
-NbOfVoters=No. of voters
-SurveyResults=Results
-PollAdminDesc=You are allowed to change all vote lines of this poll with button "Edit". You can, as well, remove a column or a line with %s. You can also add a new column with %s.
-5MoreChoices=5 more choices
-Against=Against
-YouAreInivitedToVote=You are invited to vote for this poll
-VoteNameAlreadyExists=This name was already used for this poll
-AddADate=Add a date
-AddStartHour=Add start hour
-AddEndHour=Add end hour
-votes=vote(s)
-NoCommentYet=No comments have been posted for this poll yet
-CanComment=Voters can comment in the poll
-CanSeeOthersVote=Voters can see other people's vote
-SelectDayDesc=For each selected day, you can choose, or not, meeting hours in the following format:<br>- empty,<br>- "8h", "8H" or "8:00" to give a meeting's start hour,<br>- "8-11", "8h-11h", "8H-11H" or "8:00-11:00" to give a meeting's start and end hour,<br>- "8h15-11h15", "8H15-11H15" or "8:15-11:15" for the same thing but with minutes.
-BackToCurrentMonth=Back to current month
-ErrorOpenSurveyFillFirstSection=You haven't filled the first section of the poll creation
-ErrorOpenSurveyOneChoice=Enter at least one choice
-ErrorInsertingComment=There was an error while inserting your comment
-MoreChoices=Enter more choices for the voters
-SurveyExpiredInfo=The poll has been closed or voting delay has expired.
-EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s
-ShowSurvey=Show survey
-UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
+Survey=調查
+Surveys=調查
+OrganizeYourMeetingEasily=輕鬆組織會議和調查。首先選擇調查的類型...
+NewSurvey=新調查
+OpenSurveyArea=調查區
+AddACommentForPoll=您可以在調查中加入評論...
+AddComment=增加評論
+CreatePoll=建立調查
+PollTitle=調查標題
+ToReceiveEMailForEachVote=每次投票都會收到一封電子郵件
+TypeDate=日期類型
+TypeClassic=標準類型
+OpenSurveyStep2=在空閒日中選擇日期（灰色）。所選的日期為綠色。您可以通過再次點擊來取消先前選擇的日期
+RemoveAllDays=全部刪除
+CopyHoursOfFirstDay=複制第一天的時間
+RemoveAllHours=刪除所有時間
+SelectedDays=已選擇的日子
+TheBestChoice=目前最好的選擇是
+TheBestChoices=目前最好的選擇是
+with=與
+OpenSurveyHowTo=如果您同意在此次調查中投票，則必須給出自己的名字，選擇最適合您的值，並使用該行末尾的加號按鈕進行驗證。
+CommentsOfVoters=投票人的評論
+ConfirmRemovalOfPoll=您確定要刪除此調查（以及所有投票）嗎？
+RemovePoll=刪除調查
+UrlForSurvey=調查的直接網址
+PollOnChoice=您正在建立多項選擇的調查。首先為您的調查輸入所有可能的選擇：
+CreateSurveyDate=建立日期調查
+CreateSurveyStandard=建立標準調查
+CheckBox=簡易勾選框
+YesNoList=清單（空/是/否）
+PourContreList=清單（空/支持/反對）
+AddNewColumn=增加新欄位
+TitleChoice=選擇標籤
+ExportSpreadsheet=匯出結果表格
+ExpireDate=調查截止日
+NbOfSurveys=投票次數
+NbOfVoters=投票人數
+SurveyResults=結果
+PollAdminDesc=您可以使用“編輯”按鈕更改此民意調查的所有投票行。您也可以使用%s刪除列或行。您也可以使用%s增加新列。
+5MoreChoices=再多5個選項
+Against=反對
+YouAreInivitedToVote=您被邀請參加此項調查
+VoteNameAlreadyExists=此名稱已用於此調查
+AddADate=增加日期
+AddStartHour=增加開始時間
+AddEndHour=增加結束時間
+votes=投票
+NoCommentYet=尚未有此調查的評論
+CanComment=投票者可以在調查中發表評論
+CanSeeOthersVote=投票者可以看到其他人的投票
+SelectDayDesc=對於每個選定的日期，您可以依照以下格式選擇是否選擇開會時間： <br> -空的<br> -“ 8h”，“ 8H”或“ 8:00”指定會議的開始時間， <br> -“ 8-11”，“ 8h-11h”，“ 8H-11H”或“ 8：00-11：00”給出會議的開始和結束時間， <br> -同樣的用“ 8h15-11h15”，“ 8H15-11H15”或“ 8：15-11：15”表示，但要加上分鐘。
+BackToCurrentMonth=回到目前月份
+ErrorOpenSurveyFillFirstSection=您尚未填寫建立調查的第一部分
+ErrorOpenSurveyOneChoice=輸入至少一個選項
+ErrorInsertingComment=插入您的評論時出錯
+MoreChoices=為投票者輸入更多選項
+SurveyExpiredInfo=投票已關閉或投票已到期。
+EmailSomeoneVoted=%s已填滿一行。\n您可以在以下連結找到您的調查：\n%s
+ShowSurvey=顯示調查
+UserMustBeSameThanUserUsedToVote=您必須已投票並使用與投票時相同的用戶名來發表評論

From b309af0ab8745a77cafb4f92196e32ad4a80ab1b Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Mon, 19 Jul 2021 13:43:48 +0200
Subject: [PATCH 1244/1497] First push new scan quanty inventory

---
 htdocs/core/class/html.formother.class.php | 17 ++++--
 htdocs/langs/en_US/stocks.lang             |  4 +-
 htdocs/product/inventory/inventory.php     | 69 ++++++++++++++++++++--
 3 files changed, 79 insertions(+), 11 deletions(-)

diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index 991e3cb37cc..93aee37987f 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -63,7 +63,7 @@ class FormOther
 	 * @param	string	$jstoexecuteonadd		Name of javascript function to call
 	 * @return	string						HTML component
 	 */
-	public function getHTMLScannerForm($jstoexecuteonadd = 'barcodscannerjs')
+	public function getHTMLScannerForm($jstoexecuteonadd = 'barcodescannerjs')
 	{
 		global $langs;
 
@@ -73,9 +73,9 @@ class FormOther
 		$out .= '<div class="div-for-modal-topright" style="padding: 15px">';
 		$out .= '<center><strong>Barcode scanner tool...</strong></center><br>';
 
-		$out .= '<input type="checkbox" name="barcodeforautodetect" checked="checked"> Autodetect if we scan a product barcode or a lot/serial barcode<br>';
-		$out .= '<input type="checkbox" name="barcodeforproduct"> Scan a product barcode<br>';
-		$out .= '<input type="checkbox" name="barcodeforlotserial"> Scan a product lot or serial number<br>';
+		$out .= '<input type="radio" name="barcodemode" value="barcodeforautodetect" checked="checked"> Autodetect if we scan a product barcode or a lot/serial barcode<br>';
+		$out .= '<input type="radio" name="barcodemode" value="barcodeforproduct"> Scan a product barcode<br>';
+		$out .= '<input type="radio" name="barcodemode" value="barcodeforlotserial"> Scan a product lot or serial number<br>';
 
 		$out .= $langs->trans("QtyToAddAfterBarcodeScan").' <input type="text" name="barcodeproductqty" class="width50 right" value="1"><br>';
 		$out .= '<textarea type="text" name="barcodelist" class="centpercent" autofocus rows="'.ROWS_3.'"></textarea>';
@@ -88,7 +88,7 @@ class FormOther
 		*/
 		$out .= '<br>';
 		$out .= '<center>';
-		$out .= '<input type="submit" class="button marginleftonly marginrightonly" name="addscan" value="'.$langs->trans("Add").'">';
+		$out .= '<input type="submit" class="button marginleftonly marginrightonly" id ="exec'.dol_escape_js($jstoexecuteonadd).'" name="addscan" value="'.$langs->trans("Add").'">';
 		$out .= '<input type="submit" class="button marginleftonly marginrightonly" name="cancel" value="'.$langs->trans("Cancel").'">';
 		$out .= '<br>';
 
@@ -96,6 +96,13 @@ class FormOther
 
 		// TODO Add call of javascript $jstoexecuteonadd so each scan will add qty into the inventory page + an ajax save.
 
+		$out .= '<script>';
+		$out .= '$("#exec'.dol_escape_js($jstoexecuteonadd).'").click(function(){
+			console.log("We call js to execute '.dol_escape_js($jstoexecuteonadd).'");
+			'.dol_escape_js($jstoexecuteonadd).'();
+		})';
+		$out .= '</script>';
+
 		$out .= '</center>';
 		$out .= '</div>';
 
diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang
index efa5257498c..2f6bbafca4c 100644
--- a/htdocs/langs/en_US/stocks.lang
+++ b/htdocs/langs/en_US/stocks.lang
@@ -255,4 +255,6 @@ MakeMovementsAndClose=Generate movements and close
 AutofillWithExpected=Fill real quantity with expected quantity
 ShowAllBatchByDefault=By default, show batch details on product "stock" tab
 CollapseBatchDetailHelp=You can set batch detail default display in stocks module configuration
-FieldCannotBeNegative=Field "%s" cannot be negative
\ No newline at end of file
+FieldCannotBeNegative=Field "%s" cannot be negative
+ErrorWrongBarcodemode=Unknown Barcode mode
+ProductDoesNotExist=Product does not exist
diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php
index 85cd0932f46..ffdd26c6803 100644
--- a/htdocs/product/inventory/inventory.php
+++ b/htdocs/product/inventory/inventory.php
@@ -449,7 +449,7 @@ if ($object->id > 0) {
 	print dol_get_fiche_end();
 
 
-	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<form name="formrecord" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="updateinventorylines">';
 	print '<input type="hidden" name="id" value="'.$object->id.'">';
@@ -537,6 +537,63 @@ if ($object->id > 0) {
 
 	// Popup for mass barcode scanning
 	if ($action == 'updatebyscaning') {
+		print '<script>';
+		print 'function barcodescannerjs(){
+			var barcodemode = $("input[name=barcodemode]:checked").val();
+			var barcodeproductqty = $("input[name=barcodeproductqty]").val();
+			var textarea = $("textarea[name=barcodelist]").val();
+			var textarray = textarea.split("\n");
+			if(textarray[0] != ""){
+				var tabproduct = [];
+				$(".expectedqty").each(function(){
+					id = this.id;
+					warehouse = $("#"+id+"_warehouse")[0].firstChild.lastChild.data;
+
+					productbarcode = $("#"+id+"_product")[0].firstChild.title;
+					productbarcode = productbarcode.split("<br>");
+					productbarcode = productbarcode.filter(barcode => barcode.includes("'.$langs->trans('BarCode').'"))[0];
+					productbarcode = productbarcode.slice(productbarcode.indexOf("</b> ")+5);
+
+					productbatchcode = $("#"+id+"_batch")[0].firstChild;
+					if(productbatchcode != null){
+						productbatchcode = productbatchcode.data;
+					}
+
+					tabproduct.push({\'Id\':id,\'Warehouse\':warehouse,\'Barecode\':productbarcode,\'Batch\':productbatchcode,\'Qty\':0});
+				})
+				switch(barcodemode){
+					case "barcodeforautodetect":
+						break;
+					case "barcodeforproduct":
+						textarray.forEach(function(element,index){
+							console.log("Product "+(index+=1)+": "+element);
+							BarCodeDoesNotExist=0;
+							tabproduct.forEach(product => {
+								if(product.Barecode == element){
+									product.Qty+=1;
+								}else{
+									BarCodeDoesNotExist+=1;
+								}
+							})
+							if(BarCodeDoesNotExist >= tabproduct.length){
+								alert("'.$langs->trans('ProductDoesNotExist').': "+element);
+							}
+						})
+						break;
+					case "barcodeforlotserial":
+						break;
+					default:
+						alert("'.$langs->trans("ErrorWrongBarcodemode").' \""+barcodemode+"\"");
+				}
+				tabproduct.forEach(product => {
+					if(product.Qty!=0){
+						$("#"+product.Id+"_input")[0].value = product.Qty*barcodeproductqty;
+					}
+				})
+				document.forms["formrecord"].submit();
+			}
+		}';
+		print '</script>';
 		include DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 		$formother = new FormOther($db);
 		print $formother->getHTMLScannerForm();
@@ -639,15 +696,15 @@ if ($object->id > 0) {
 			}
 
 			print '<tr class="oddeven">';
-			print '<td>';
+			print '<td id="id_'.$obj->rowid.'_warehouse">';
 			print $warehouse_static->getNomUrl(1);
 			print '</td>';
-			print '<td>';
+			print '<td id="id_'.$obj->rowid.'_product">';
 			print $product_static->getNomUrl(1);
 			print '</td>';
 
 			if ($conf->productbatch->enabled) {
-				print '<td>';
+				print '<td id="id_'.$obj->rowid.'_batch">';
 				print $obj->batch;
 				print '</td>';
 			}
@@ -667,6 +724,8 @@ if ($object->id > 0) {
 				print '<td class="right">';
 				print '<a class="reposition" href="'.DOL_URL_ROOT.'/product/inventory/inventory.php?id='.$object->id.'&lineid='.$obj->rowid.'&action=deleteline&token='.newToken().'">'.img_delete().'</a>';
 				print '</td>';
+				$qty_tmp = GETPOST("id_".$obj->rowid."_input_tmp") && price2num(GETPOST("id_".$obj->rowid."_input_tmp", 'MS')) >= 0 ? GETPOST("id_".$obj->rowid."_input_tmp") : $qty_view;
+				print '<input type="hidden" class="maxwidth75 right realqty" name="id_'.$obj->rowid.'_input_tmp" id="id_'.$obj->rowid.'_input_tmp" value="'.$qty_tmp.'">';
 			} else {
 				print $obj->qty_view;
 				$totalfound += $obj->qty_view;
@@ -685,7 +744,7 @@ if ($object->id > 0) {
 	print '</div>';
 
 	if ($object->status == $object::STATUS_VALIDATED) {
-		print '<center><input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'"></center>';
+		print '<center><input id="submitrecord" type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'"></center>';
 	}
 
 	print '</div>';

From 8fdd9deb16fec24b8e23450364e90313bd58d31c Mon Sep 17 00:00:00 2001
From: atm-florian <florian.mortgat@atm-consulting.fr>
Date: Mon, 19 Jul 2021 14:06:56 +0200
Subject: [PATCH 1245/1497] FIX: datepickers cloned using jquery are not
 working

---
 htdocs/fourn/js/lib_dispatch.js.php | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/htdocs/fourn/js/lib_dispatch.js.php b/htdocs/fourn/js/lib_dispatch.js.php
index b4090e8a34d..c6d39038f78 100644
--- a/htdocs/fourn/js/lib_dispatch.js.php
+++ b/htdocs/fourn/js/lib_dispatch.js.php
@@ -53,7 +53,9 @@ function addDispatchLine(index, type, mode)
 	mode = mode || 'qtymissing'
 
 	console.log("fourn/js/lib_dispatch.js.php Split line type="+type+" index="+index+" mode="+mode);
-	var $row = $("tr[name='"+type+'_0_'+index+"']").clone(true); 		// clone first batch line to jQuery object
+	var $row0 = $("tr[name='"+type+'_0_'+index+"']");
+	var $dpopt = $row0.find('.hasDatepicker').first().datepicker('option', 'all'); // get current datepicker options to apply the same to the cloned datepickers
+	var $row = $row0.clone(true); 		// clone first batch line to jQuery object
 	var nbrTrs = $("tr[name^='"+type+"_'][name$='_"+index+"']").length; // position of line for batch
 	var qtyOrdered = parseFloat($("#qty_ordered_0_"+index).val()); 		// Qty ordered is same for all rows
 	var qty = parseFloat($("#qty_"+(nbrTrs - 1)+"_"+index).val());
@@ -81,6 +83,18 @@ function addDispatchLine(index, type, mode)
 	{
 		//replace tr suffix nbr
 		$row.html($row.html().replace(/_0_/g,"_"+nbrTrs+"_"));
+
+		// jquery's deep clone is incompatible with date pickers (the clone shares data with the original)
+		// so we destroy and rebuild the new date pickers
+		setTimeout(() => {
+			$row.find('.hasDatepicker').each((i, dp) => {
+				$(dp).removeData()
+					.removeClass('hasDatepicker');
+				$(dp).next('img.ui-datepicker-trigger').remove();
+				$(dp).datepicker($dpopt);
+			});
+		}, 0);
+
 		//create new select2 to avoid duplicate id of cloned one
 		$row.find("select[name='"+'entrepot_'+nbrTrs+'_'+index+"']").select2();
 		// TODO find solution to copy selected option to new select

From 20f347cd4c69f4a0cb8596235294fa608893d672 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josep=20Llu=C3=ADs?= <joseplluis@lliuretic.cat>
Date: Tue, 20 Jul 2021 07:07:01 +0200
Subject: [PATCH 1246/1497] Add missing line product variables

Add missing line product variables: product_tobatch and product_barcode
---
 htdocs/fourn/class/fournisseur.commande.class.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index f315661b90c..e938b729f80 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -11,6 +11,7 @@
  * Copyright (C) 2018       Nicolas ZABOURI			<info@inovea-conseil.com>
  * Copyright (C) 2018-2020  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2018       Ferran Marcet         	<fmarcet@2byte.es>
+ * Copyright (C) 2021       Josep Lluís Amador      <joseplluis@lliuretic.cat>
  *
  * 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
@@ -460,7 +461,7 @@ class CommandeFournisseur extends CommonOrder
 		$sql .= " l.vat_src_code, l.tva_tx, l.remise_percent, l.subprice,";
 		$sql .= " l.localtax1_tx, l. localtax2_tx, l.localtax1_type, l. localtax2_type, l.total_localtax1, l.total_localtax2,";
 		$sql .= " l.total_ht, l.total_tva, l.total_ttc, l.special_code, l.fk_parent_line, l.rang,";
-		$sql .= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.description as product_desc,";
+		$sql .= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.description as product_desc, p.tobatch as product_tobatch, p.barcode as product_barcode,";
 		$sql .= " l.fk_unit,";
 		$sql .= " l.date_start, l.date_end,";
 		$sql .= ' l.fk_multicurrency, l.multicurrency_code, l.multicurrency_subprice, l.multicurrency_total_ht, l.multicurrency_total_tva, l.multicurrency_total_ttc';
@@ -516,6 +517,8 @@ class CommandeFournisseur extends CommonOrder
 				$line->libelle             = $objp->product_label; // deprecated
 				$line->product_label       = $objp->product_label;
 				$line->product_desc        = $objp->product_desc;
+				$line->product_tobatch     = $objp->product_tobatch;
+				$line->product_barcode     = $objp->product_barcode;
 
 				$line->ref                 = $objp->product_ref; // Ref of product
 				$line->product_ref         = $objp->product_ref; // Ref of product

From dd9eb282303e97948d2716faafb36dce9418d9fa Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Tue, 20 Jul 2021 14:43:36 +0200
Subject: [PATCH 1247/1497] Barcode scanner tool update

---
 htdocs/core/class/html.formother.class.php |   4 -
 htdocs/langs/en_US/stocks.lang             |   3 +
 htdocs/product/inventory/inventory.php     | 159 ++++++++++++++-------
 3 files changed, 109 insertions(+), 57 deletions(-)

diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index 93aee37987f..5f00ed6877b 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -92,10 +92,6 @@ class FormOther
 		$out .= '<input type="submit" class="button marginleftonly marginrightonly" name="cancel" value="'.$langs->trans("Cancel").'">';
 		$out .= '<br>';
 
-		$out .= '<span class="opacitymedium">'.$langs->trans("FeatureNotYetAvailable").'</span>';
-
-		// TODO Add call of javascript $jstoexecuteonadd so each scan will add qty into the inventory page + an ajax save.
-
 		$out .= '<script>';
 		$out .= '$("#exec'.dol_escape_js($jstoexecuteonadd).'").click(function(){
 			console.log("We call js to execute '.dol_escape_js($jstoexecuteonadd).'");
diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang
index 2f6bbafca4c..4396139f1f9 100644
--- a/htdocs/langs/en_US/stocks.lang
+++ b/htdocs/langs/en_US/stocks.lang
@@ -258,3 +258,6 @@ CollapseBatchDetailHelp=You can set batch detail default display in stocks modul
 FieldCannotBeNegative=Field "%s" cannot be negative
 ErrorWrongBarcodemode=Unknown Barcode mode
 ProductDoesNotExist=Product does not exist
+ErrorSameBatchNumber=Same batch number found in inventory list
+ProductBatchDoesNotExist=Product with batch/serial does not exist
+ProductBarcodeDoesNotExist=Product with barcode does not exist
diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php
index ffdd26c6803..a44e004f2e7 100644
--- a/htdocs/product/inventory/inventory.php
+++ b/htdocs/product/inventory/inventory.php
@@ -537,68 +537,120 @@ if ($object->id > 0) {
 
 	// Popup for mass barcode scanning
 	if ($action == 'updatebyscaning') {
-		print '<script>';
-		print 'function barcodescannerjs(){
-			var barcodemode = $("input[name=barcodemode]:checked").val();
-			var barcodeproductqty = $("input[name=barcodeproductqty]").val();
-			var textarea = $("textarea[name=barcodelist]").val();
-			var textarray = textarea.split("\n");
-			if(textarray[0] != ""){
-				var tabproduct = [];
-				$(".expectedqty").each(function(){
-					id = this.id;
-					warehouse = $("#"+id+"_warehouse")[0].firstChild.lastChild.data;
+		if ($permissiontoadd) {
+			print '<script>';
+			print 'function barcodescannerjs(){
+				console.log("We catch inputs in sacnner box");
+				var barcodemode = $("input[name=barcodemode]:checked").val();
+				var barcodeproductqty = $("input[name=barcodeproductqty]").val();
+				var textarea = $("textarea[name=barcodelist]").val();
+				var textarray = textarea.split("\n");
+				if(textarray[0] != ""){
+					var tabproduct = [];
+					$(".expectedqty").each(function(){
+						id = this.id;
+						warehouse = $("#"+id+"_warehouse")[0].firstChild.lastChild.data;
 
-					productbarcode = $("#"+id+"_product")[0].firstChild.title;
-					productbarcode = productbarcode.split("<br>");
-					productbarcode = productbarcode.filter(barcode => barcode.includes("'.$langs->trans('BarCode').'"))[0];
-					productbarcode = productbarcode.slice(productbarcode.indexOf("</b> ")+5);
+						productbarcode = $("#"+id+"_product")[0].firstChild.title;
+						productbarcode = productbarcode.split("<br>");
+						productbarcode = productbarcode.filter(barcode => barcode.includes("'.$langs->trans('BarCode').'"))[0];
+						productbarcode = productbarcode.slice(productbarcode.indexOf("</b> ")+5);
 
-					productbatchcode = $("#"+id+"_batch")[0].firstChild;
-					if(productbatchcode != null){
-						productbatchcode = productbatchcode.data;
-					}
-
-					tabproduct.push({\'Id\':id,\'Warehouse\':warehouse,\'Barecode\':productbarcode,\'Batch\':productbatchcode,\'Qty\':0});
-				})
-				switch(barcodemode){
-					case "barcodeforautodetect":
-						break;
-					case "barcodeforproduct":
-						textarray.forEach(function(element,index){
-							console.log("Product "+(index+=1)+": "+element);
-							BarCodeDoesNotExist=0;
-							tabproduct.forEach(product => {
-								if(product.Barecode == element){
-									product.Qty+=1;
-								}else{
-									BarCodeDoesNotExist+=1;
+						productbatchcode = $("#"+id+"_batch")[0].firstChild;
+						if(productbatchcode != null){
+							productbatchcode = productbatchcode.data;
+						}
+						if(barcodemode != "barcodeforproduct"){
+							tabproduct.forEach(product=>{
+								if(product.Batch == productbatchcode){
+									alert("'.$langs->trans('ErrorSameBatchNumber').': "+productbatchcode);
+									throw"'.$langs->trans('ErrorSameBatchNumber').': "+productbatchcode;
 								}
 							})
-							if(BarCodeDoesNotExist >= tabproduct.length){
-								alert("'.$langs->trans('ProductDoesNotExist').': "+element);
-							}
-						})
-						break;
-					case "barcodeforlotserial":
-						break;
-					default:
-						alert("'.$langs->trans("ErrorWrongBarcodemode").' \""+barcodemode+"\"");
-				}
-				tabproduct.forEach(product => {
-					if(product.Qty!=0){
-						$("#"+product.Id+"_input")[0].value = product.Qty*barcodeproductqty;
+						}
+						tabproduct.push({\'Id\':id,\'Warehouse\':warehouse,\'Barcode\':productbarcode,\'Batch\':productbatchcode,\'Qty\':0});
+					})
+					switch(barcodemode){
+						case "barcodeforautodetect":
+							textarray.forEach(function(element,index){
+								console.log("Product autodetect "+(index+=1)+": "+element);
+								BatchCodeDoesNotExist=0;
+								tabproduct.forEach(product => {
+									if(product.Batch == element || product.Barcode == element){
+										product.Qty+=1;
+									}else{
+										BatchCodeDoesNotExist+=1;
+									}
+								})
+								if(BatchCodeDoesNotExist >= tabproduct.length){
+									alert("'.$langs->trans('ProductDoesNotExist').': "+element);
+								}
+							})
+							break;
+						case "barcodeforproduct":
+							textarray.forEach(function(element,index){
+								console.log("Product "+(index+=1)+": "+element);
+								BarCodeDoesNotExist=0;
+								tabproduct.forEach(product => {
+									if(product.Barcode == element){
+										product.Qty+=1;
+									}else{
+										BarCodeDoesNotExist+=1;
+									}
+								})
+								if(BarCodeDoesNotExist >= tabproduct.length){
+									alert("'.$langs->trans('ProductBarcodeDoesNotExist').': "+element);
+								}
+							})
+							break;
+						case "barcodeforlotserial":
+							textarray.forEach(function(element,index){
+								console.log("Product batch/serial "+(index+=1)+": "+element);
+								BatchCodeDoesNotExist=0;
+								tabproduct.forEach(product => {
+									if(product.Batch == element){
+										product.Qty+=1;
+									}else{
+										BatchCodeDoesNotExist+=1;
+									}
+								})
+								if(BatchCodeDoesNotExist >= tabproduct.length){
+									alert("'.$langs->trans('ProductBatchDoesNotExist').': "+element);
+								}
+							})
+							break;
+						default:
+							alert("'.$langs->trans("ErrorWrongBarcodemode").' \""+barcodemode+"\"");
+							throw"'.$langs->trans('ErrorWrongBarcodemode').' \""+barcodemode+"\"";
 					}
-				})
-				document.forms["formrecord"].submit();
-			}
-		}';
-		print '</script>';
+					tabproduct.forEach(product => {
+						if(product.Qty!=0){
+							console.log("We change #"+product.Id+"_input to match input in scanner box");
+							$("#"+product.Id+"_input")[0].value = product.Qty*barcodeproductqty;
+						}
+					})
+					document.forms["formrecord"].submit();
+				}
+			}';
+			print '</script>';
+		}
 		include DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 		$formother = new FormOther($db);
 		print $formother->getHTMLScannerForm();
 	}
 
+	//Call method to undo changes in real qty
+	print '<script>';
+	print 'jQuery(document).ready(function() {
+		$(".undochangesqty").on("click",function undochangesqty(){
+			id = this.id;
+			id = id.split("_")[1];
+			tmpvalue = $("#id_"+id+"_input_tmp").val()
+			$("#id_"+id+"_input")[0].value = tmpvalue;
+			document.forms["formrecord"].submit();
+		});
+	});';
+	print '</script>';
 
 	print '<div class="fichecenter">';
 	//print '<div class="fichehalfleft">';
@@ -722,9 +774,10 @@ if ($object->id > 0) {
 				print '<input type="text" class="maxwidth75 right realqty" name="id_'.$obj->rowid.'" id="id_'.$obj->rowid.'_input" value="'.$qty_view.'">';
 				print '</td>';
 				print '<td class="right">';
+				print '<a id="undochangesqty_'.$obj->rowid.'" href="#" class="undochangesqty"><span class="fas fa-undo pictoundo" ></span></a> &nbsp';
 				print '<a class="reposition" href="'.DOL_URL_ROOT.'/product/inventory/inventory.php?id='.$object->id.'&lineid='.$obj->rowid.'&action=deleteline&token='.newToken().'">'.img_delete().'</a>';
 				print '</td>';
-				$qty_tmp = GETPOST("id_".$obj->rowid."_input_tmp") && price2num(GETPOST("id_".$obj->rowid."_input_tmp", 'MS')) >= 0 ? GETPOST("id_".$obj->rowid."_input_tmp") : $qty_view;
+				$qty_tmp = price2num(GETPOST("id_".$obj->rowid."_input_tmp", 'MS')) >= 0 ? GETPOST("id_".$obj->rowid."_input_tmp") : $qty_view;
 				print '<input type="hidden" class="maxwidth75 right realqty" name="id_'.$obj->rowid.'_input_tmp" id="id_'.$obj->rowid.'_input_tmp" value="'.$qty_tmp.'">';
 			} else {
 				print $obj->qty_view;

From 60f0eeaea2e6a7e0c52f0a87ea463b2b197feb7e Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Tue, 20 Jul 2021 15:06:33 +0200
Subject: [PATCH 1248/1497] update inventory to be jquerry

---
 htdocs/product/inventory/inventory.php | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php
index a44e004f2e7..01968855836 100644
--- a/htdocs/product/inventory/inventory.php
+++ b/htdocs/product/inventory/inventory.php
@@ -549,17 +549,13 @@ if ($object->id > 0) {
 					var tabproduct = [];
 					$(".expectedqty").each(function(){
 						id = this.id;
-						warehouse = $("#"+id+"_warehouse")[0].firstChild.lastChild.data;
-
-						productbarcode = $("#"+id+"_product")[0].firstChild.title;
+						warehouse = $("#"+id+"_warehouse").children().first().text();
+						productbarcode = $("#"+id+"_product").children().first().attr("title");
 						productbarcode = productbarcode.split("<br>");
 						productbarcode = productbarcode.filter(barcode => barcode.includes("'.$langs->trans('BarCode').'"))[0];
 						productbarcode = productbarcode.slice(productbarcode.indexOf("</b> ")+5);
 
-						productbatchcode = $("#"+id+"_batch")[0].firstChild;
-						if(productbatchcode != null){
-							productbatchcode = productbatchcode.data;
-						}
+						productbatchcode = $("#"+id+"_batch").text();
 						if(barcodemode != "barcodeforproduct"){
 							tabproduct.forEach(product=>{
 								if(product.Batch == productbatchcode){
@@ -626,7 +622,7 @@ if ($object->id > 0) {
 					tabproduct.forEach(product => {
 						if(product.Qty!=0){
 							console.log("We change #"+product.Id+"_input to match input in scanner box");
-							$("#"+product.Id+"_input")[0].value = product.Qty*barcodeproductqty;
+							$("#"+product.Id+"_input").val(product.Qty*barcodeproductqty);
 						}
 					})
 					document.forms["formrecord"].submit();

From 4d6b63dbed10f3df56ceda40d0a0abf4334b971d Mon Sep 17 00:00:00 2001
From: ksar <35605507+ksar-ksar@users.noreply.github.com>
Date: Tue, 20 Jul 2021 16:14:47 +0200
Subject: [PATCH 1249/1497] FIX #18181

FIX #18181
---
 htdocs/core/class/notify.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php
index 6b32799bc89..044115f1568 100644
--- a/htdocs/core/class/notify.class.php
+++ b/htdocs/core/class/notify.class.php
@@ -687,7 +687,7 @@ class Notify
 						break;
 					case 'BILL_PAYED':
 						$link = '<a href="'.$urlwithroot.'/compta/facture/card.php?facid='.$object->id.'&entity='.$object->entity.'">'.$newref.'</a>';
-						$dir_output = $$conf->facture->dir_output."/".get_exdir(0, 0, 0, 1, $object, 'invoice');
+						$dir_output = $conf->facture->dir_output."/".get_exdir(0, 0, 0, 1, $object, 'invoice');
 						$object_type = 'facture';
 						$mesg = $langs->transnoentitiesnoconv("EMailTextInvoicePayed", $link);
 						break;

From 922354f36616288ea69d066206d4c775b4c43e17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Tue, 20 Jul 2021 18:19:27 +0200
Subject: [PATCH 1250/1497] Update projects.php

---
 htdocs/projet/ajax/projects.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/projet/ajax/projects.php b/htdocs/projet/ajax/projects.php
index 0036ae64353..a852ab6bad8 100644
--- a/htdocs/projet/ajax/projects.php
+++ b/htdocs/projet/ajax/projects.php
@@ -63,7 +63,7 @@ if (!GETPOST('mode', 'aZ09') || GETPOST('mode', 'aZ09') != 'gettasks') {
 // Mode to get list of tasks
 if (GETPOST('mode', 'aZ09') == 'gettasks') {
 	$formproject = new FormProjets($db);
-	$formproject->selectTasks((!empty($$socid) ? $socid : -1), 0, 'taskid', 24, 1, '1', 1, 0, 0, 'maxwidth500', GETPOST('projectid', 'int'), '');
+	$formproject->selectTasks((!empty($socid) ? $socid : -1), 0, 'taskid', 24, 1, '1', 1, 0, 0, 'maxwidth500', GETPOST('projectid', 'int'), '');
 	return;
 }
 

From 71b95f3511af58f340924750a7bc4dced327a577 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Tue, 20 Jul 2021 20:54:27 +0200
Subject: [PATCH 1251/1497] fix php8 warnings

---
 htdocs/core/class/html.form.class.php | 52 ++++++++++++++-------------
 1 file changed, 28 insertions(+), 24 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 178404da973..060b98bd156 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4464,7 +4464,7 @@ class Form
 		$sql .= " WHERE 1=1";
 		if ($status != 2) {
 			$sql .= " AND status = ".(int) $status;
-		}
+		}isset($objecttmp->ismultientitymanaged) &&
 		if ($filtre) {
 			$sql .= " AND ".$filtre;
 		}
@@ -6974,13 +6974,15 @@ class Form
 
 		// Search data
 		$sql = "SELECT t.rowid, ".$fieldstoshow." FROM ".MAIN_DB_PREFIX.$objecttmp->table_element." as t";
-		if (isset($objecttmp->ismultientitymanaged) && !is_numeric($objecttmp->ismultientitymanaged)) {
-			$tmparray = explode('@', $objecttmp->ismultientitymanaged);
-			$sql .= ' INNER JOIN '.MAIN_DB_PREFIX.$tmparray[1].' as parenttable ON parenttable.rowid = t.'.$tmparray[0];
-		}
-		if ($objecttmp->ismultientitymanaged == 'fk_soc@societe') {
-			if (!$user->rights->societe->client->voir && !$user->socid) {
-				$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		if (isset($objecttmp->ismultientitymanaged)) {
+			if (!is_numeric($objecttmp->ismultientitymanaged)) {
+				$tmparray = explode('@', $objecttmp->ismultientitymanaged);
+				$sql .= ' INNER JOIN '.MAIN_DB_PREFIX.$tmparray[1].' as parenttable ON parenttable.rowid = t.'.$tmparray[0];
+			}
+			if ($objecttmp->ismultientitymanaged == 'fk_soc@societe') {
+				if (!$user->rights->societe->client->voir && !$user->socid) {
+					$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+				}
 			}
 		}
 
@@ -6991,27 +6993,29 @@ class Form
 			$sql .= $hookmanager->resPrint;
 		} else {
 			$sql .= " WHERE 1=1";
-			if (isset($objecttmp->ismultientitymanaged) && $objecttmp->ismultientitymanaged == 1) {
-				$sql .= " AND t.entity IN (".getEntity($objecttmp->table_element).")";
-			}
-			if (isset($objecttmp->ismultientitymanaged) && !is_numeric($objecttmp->ismultientitymanaged)) {
-				$sql .= ' AND parenttable.entity = t.'.$tmparray[0];
-			}
-			if ($objecttmp->ismultientitymanaged == 1 && !empty($user->socid)) {
-				if ($objecttmp->element == 'societe') {
-					$sql .= " AND t.rowid = ".$user->socid;
-				} else {
-					$sql .= " AND t.fk_soc = ".$user->socid;
+			if (isset($objecttmp->ismultientitymanaged)) {
+				if ($objecttmp->ismultientitymanaged == 1) {
+					$sql .= " AND t.entity IN (".getEntity($objecttmp->table_element).")";
+				}
+				if (!is_numeric($objecttmp->ismultientitymanaged)) {
+					$sql .= ' AND parenttable.entity = t.'.$tmparray[0];
+				}
+				if ($objecttmp->ismultientitymanaged == 1 && !empty($user->socid)) {
+					if ($objecttmp->element == 'societe') {
+						$sql .= " AND t.rowid = ".$user->socid;
+					} else {
+						$sql .= " AND t.fk_soc = ".$user->socid;
+					}
+				}
+				if ($objecttmp->ismultientitymanaged == 'fk_soc@societe') {
+					if (!$user->rights->societe->client->voir && !$user->socid) {
+						$sql .= " AND t.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+					}
 				}
 			}
 			if ($searchkey != '') {
 				$sql .= natural_search(explode(',', $fieldstoshow), $searchkey);
 			}
-			if ($objecttmp->ismultientitymanaged == 'fk_soc@societe') {
-				if (!$user->rights->societe->client->voir && !$user->socid) {
-					$sql .= " AND t.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-				}
-			}
 			if ($objecttmp->filter) {	 // Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
 				/*if (! DolibarrApi::_checkFilters($objecttmp->filter))
 				{

From 828e65c7243bb39836317f1230865a5a800be90b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Tue, 20 Jul 2021 20:56:01 +0200
Subject: [PATCH 1252/1497] Update html.form.class.php

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 060b98bd156..25e8c3c8913 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4464,7 +4464,7 @@ class Form
 		$sql .= " WHERE 1=1";
 		if ($status != 2) {
 			$sql .= " AND status = ".(int) $status;
-		}isset($objecttmp->ismultientitymanaged) &&
+		}
 		if ($filtre) {
 			$sql .= " AND ".$filtre;
 		}

From cea35bd208f6a86da65d82fa014b2c3b480fd800 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 20 Jul 2021 22:14:11 +0200
Subject: [PATCH 1253/1497] Fix pass was lost on error

---
 htdocs/install/default.css  |  3 +++
 htdocs/install/fileconf.php | 10 +++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/htdocs/install/default.css b/htdocs/install/default.css
index 731ac4131b4..85a2f4703c2 100644
--- a/htdocs/install/default.css
+++ b/htdocs/install/default.css
@@ -415,3 +415,6 @@ a.button:hover {
 	vertical-align: text-bottom;
 }
 
+.text-security {
+	-webkit-text-security: disc;
+}
diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php
index 42c8d3459fe..6a4ddc4b79a 100644
--- a/htdocs/install/fileconf.php
+++ b/htdocs/install/fileconf.php
@@ -476,13 +476,13 @@ if (!empty($force_install_noedit)) {
 	<tr class="hidesqlite">
 		<td class="label"><label for="db_pass"><b><?php echo $langs->trans("Password"); ?></b></label></td>
 		<td class="label">
-			<input type="password"
+			<input type="password" class="text-security";
 				   id="db_pass" autocomplete="off"
 				   name="db_pass"
 				   value="<?php
 					// If $force_install_databasepass is on, we don't want to set password, we just show '***'. Real value will be extracted from the forced install file at step1.
 					$autofill = ((!empty($_SESSION['dol_save_pass'])) ? $_SESSION['dol_save_pass'] : str_pad('', strlen($force_install_databasepass), '*'));
-					if (!empty($dolibarr_main_prod)) {
+					if (!empty($dolibarr_main_prod) && empty($_SESSION['dol_save_pass'])) {    // So value can't be found if install page still accessible
 						$autofill = '';
 					}
 					print dol_escape_htmltag($autofill);
@@ -532,7 +532,7 @@ if (!empty($force_install_noedit)) {
 				   id="db_user_root"
 				   name="db_user_root"
 				   class="needroot"
-				   value="<?php print (!empty($force_install_databaserootlogin)) ? $force_install_databaserootlogin : @$db_user_root; ?>"
+				   value="<?php print (!empty($force_install_databaserootlogin)) ? $force_install_databaserootlogin : (isset($db_user_root) ? $db_user_root : ''); ?>"
 				<?php if ($force_install_noedit > 0 && !empty($force_install_databaserootlogin)) {
 					print ' disabled';
 				} ?>
@@ -556,10 +556,10 @@ if (!empty($force_install_noedit)) {
 				   autocomplete="off"
 				   id="db_pass_root"
 				   name="db_pass_root"
-				   class="needroot"
+				   class="needroot text-security"
 				   value="<?php
 					// If $force_install_databaserootpass is on, we don't want to set password here, we just show '***'. Real value will be extracted from the forced install file at step1.
-					$autofill = ((!empty($force_install_databaserootpass)) ? str_pad('', strlen($force_install_databaserootpass), '*') : @$db_pass_root);
+				    $autofill = ((!empty($force_install_databaserootpass)) ? str_pad('', strlen($force_install_databaserootpass), '*') : (isset($db_pass_root) ? $db_pass_root : ''));
 					if (!empty($dolibarr_main_prod)) {
 						$autofill = '';
 					}

From b57eb8284e830e30eefb26e3c5ede076ea24037c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 20 Jul 2021 22:42:23 +0200
Subject: [PATCH 1254/1497] Fix Improper Authorization Check reported by Ahsan
 Aziz.

---
 htdocs/user/card.php             | 4 ++--
 htdocs/user/class/user.class.php | 8 ++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 152c39f79ac..996425c0694 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -314,8 +314,8 @@ if (empty($reshook)) {
 
 			$id = $object->create($user);
 			if ($id > 0) {
-				if (GETPOST('password')) {
-					$object->setPassword($user, GETPOST('password'));
+				if (GETPOST('password', 'none')) {
+					$object->setPassword($user, GETPOST('password','none'));
 				}
 				if (!empty($conf->categorie->enabled)) {
 					// Categories association
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 74137537e74..6d8ff911feb 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1280,6 +1280,10 @@ class User extends CommonObject
 			$langs->load("errors");
 			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Login"));
 			return -1;
+		} elseif (preg_match('/[,@<>"\']/', $this->login)) {
+		    $langs->load("errors");
+		    $this->error = $langs->trans("ErrorBadCharIntoLoginName");
+		    return -1;
 		}
 
 		$this->datec = dol_now();
@@ -1669,6 +1673,10 @@ class User extends CommonObject
 			$langs->load("errors");
 			$this->error = $langs->trans("ErrorFieldRequired", 'Login');
 			return -1;
+		} elseif (preg_match('/[,@<>"\']/', $this->login)) {
+		    $langs->load("errors");
+		    $this->error = $langs->trans("ErrorBadCharIntoLoginName");
+		    return -1;
 		}
 
 		$this->db->begin();

From e25171b9f545a8044dc462b66306380cc028e0fd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 20 Jul 2021 23:03:19 +0200
Subject: [PATCH 1255/1497] Fix phpcs

---
 htdocs/install/fileconf.php      |  2 +-
 htdocs/user/card.php             |  2 +-
 htdocs/user/class/user.class.php | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php
index 6a4ddc4b79a..369d2b93605 100644
--- a/htdocs/install/fileconf.php
+++ b/htdocs/install/fileconf.php
@@ -559,7 +559,7 @@ if (!empty($force_install_noedit)) {
 				   class="needroot text-security"
 				   value="<?php
 					// If $force_install_databaserootpass is on, we don't want to set password here, we just show '***'. Real value will be extracted from the forced install file at step1.
-				    $autofill = ((!empty($force_install_databaserootpass)) ? str_pad('', strlen($force_install_databaserootpass), '*') : (isset($db_pass_root) ? $db_pass_root : ''));
+                    $autofill = ((!empty($force_install_databaserootpass)) ? str_pad('', strlen($force_install_databaserootpass), '*') : (isset($db_pass_root) ? $db_pass_root : ''));
 					if (!empty($dolibarr_main_prod)) {
 						$autofill = '';
 					}
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 996425c0694..c74a6fa729c 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -315,7 +315,7 @@ if (empty($reshook)) {
 			$id = $object->create($user);
 			if ($id > 0) {
 				if (GETPOST('password', 'none')) {
-					$object->setPassword($user, GETPOST('password','none'));
+					$object->setPassword($user, GETPOST('password', 'none'));
 				}
 				if (!empty($conf->categorie->enabled)) {
 					// Categories association
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 6d8ff911feb..b1bc23463fb 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1281,9 +1281,9 @@ class User extends CommonObject
 			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Login"));
 			return -1;
 		} elseif (preg_match('/[,@<>"\']/', $this->login)) {
-		    $langs->load("errors");
-		    $this->error = $langs->trans("ErrorBadCharIntoLoginName");
-		    return -1;
+            $langs->load("errors");
+            $this->error = $langs->trans("ErrorBadCharIntoLoginName");
+            return -1;
 		}
 
 		$this->datec = dol_now();
@@ -1674,9 +1674,9 @@ class User extends CommonObject
 			$this->error = $langs->trans("ErrorFieldRequired", 'Login');
 			return -1;
 		} elseif (preg_match('/[,@<>"\']/', $this->login)) {
-		    $langs->load("errors");
-		    $this->error = $langs->trans("ErrorBadCharIntoLoginName");
-		    return -1;
+            $langs->load("errors");
+            $this->error = $langs->trans("ErrorBadCharIntoLoginName");
+            return -1;
 		}
 
 		$this->db->begin();

From 0e18bd4be1c8debf3482a723b14c70442d564802 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 20 Jul 2021 23:15:31 +0200
Subject: [PATCH 1256/1497] Fix #hunter2cd3fc73-65a1-4615-9143-9e7febd81a15

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

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 99cfe360f9f..4dff3426ac9 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -461,7 +461,7 @@ if ((!defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck) && !empty($conf->gl
 	// Array of action code where CSRFCHECK with token will be forced (so token must be provided on url request)
 	$arrayofactiontoforcetokencheck = array(
 		'activate', 'add', 'addtimespent', 'update', 'install',
-		'confirm_create_user', 'confirm_create_thirdparty', 'confirm_purge', 'confirm_reject_check',
+		'confirm_create_user', 'confirm_create_thirdparty', 'confirm_purge', 'confirm_reject_check', 'confirm_deletedir',
 		'delete', 'deletefilter', 'deleteoperation', 'deleteprof', 'deletepayment', 'disable',
 		'doprev', 'donext', 'dvprev', 'dvnext',
 		'enable', 'setpricelevel'

From 08e06f9789e9a550bc79f6bbbbd6230da20fd28f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 20 Jul 2021 23:28:57 +0200
Subject: [PATCH 1257/1497] Fix #hunter2c606116-f212-49e0-967c-11f8666be43b

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

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 4dff3426ac9..2bd3f3192e5 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -461,7 +461,7 @@ if ((!defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck) && !empty($conf->gl
 	// Array of action code where CSRFCHECK with token will be forced (so token must be provided on url request)
 	$arrayofactiontoforcetokencheck = array(
 		'activate', 'add', 'addtimespent', 'update', 'install',
-		'confirm_create_user', 'confirm_create_thirdparty', 'confirm_purge', 'confirm_reject_check', 'confirm_deletedir',
+		'confirm_create_user', 'confirm_create_thirdparty', 'confirm_purge', 'confirm_reject_check', 'confirm_delete', 'confirm_deletedir',
 		'delete', 'deletefilter', 'deleteoperation', 'deleteprof', 'deletepayment', 'disable',
 		'doprev', 'donext', 'dvprev', 'dvnext',
 		'enable', 'setpricelevel'

From dc7ff07517ce9d165afed9e74f876bc684ea4042 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 20 Jul 2021 23:54:22 +0200
Subject: [PATCH 1258/1497] Fix #huntr7144bb4b-338f-45f0-a70e-088ef1f4c037

---
 htdocs/langs/en_US/main.lang |  3 ++-
 htdocs/main.inc.php          | 14 +++++++++-----
 htdocs/user/card.php         |  4 ++--
 htdocs/user/group/perms.php  | 12 ++++++------
 4 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 94c851bf346..ddd60a9b68e 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -1137,4 +1137,5 @@ CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
 ConfirmCancel=Are you sure you want to cancel
 EmailMsgID=Email MsgID
-Forthcoming=Forthcoming
\ No newline at end of file
+Forthcoming=Forthcoming
+Currently=Currently
\ No newline at end of file
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 4dff3426ac9..2bd95197a2a 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -460,11 +460,15 @@ if (!defined('NOTOKENRENEWAL')) {
 if ((!defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck) && !empty($conf->global->MAIN_SECURITY_CSRF_WITH_TOKEN)) || defined('CSRFCHECK_WITH_TOKEN')) {
 	// Array of action code where CSRFCHECK with token will be forced (so token must be provided on url request)
 	$arrayofactiontoforcetokencheck = array(
-		'activate', 'add', 'addtimespent', 'update', 'install',
-		'confirm_create_user', 'confirm_create_thirdparty', 'confirm_purge', 'confirm_reject_check', 'confirm_deletedir',
-		'delete', 'deletefilter', 'deleteoperation', 'deleteprof', 'deletepayment', 'disable',
-		'doprev', 'donext', 'dvprev', 'dvnext',
-		'enable', 'setpricelevel'
+	    'activate', 'add', 'addrights', 'addtimespent',
+	    'confirm_create_user', 'confirm_create_thirdparty', 'confirm_purge', 'confirm_reject_check', 'confirm_deletedir',
+	    'delete', 'deletefilter', 'deleteoperation', 'deleteprof', 'deletepayment', 'delrights',
+	    'disable',
+	    'doprev', 'donext', 'dvprev', 'dvnext',
+	    'enable',
+	    'install',
+	    'setpricelevel',
+	    'update'
 	);
 	$sensitiveget = false;
 	if (in_array(GETPOST('action', 'aZ09'), $arrayofactiontoforcetokencheck)) {
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index c74a6fa729c..cb7aa69949c 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1437,7 +1437,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			}
 
 			// Employee
-			print '<tr><td>'.$langs->trans("Employee").'</td><td colspan="2">';
+			print '<tr><td>'.$langs->trans("Employee").'</td><td>';
 			print '<input type="checkbox" disabled name="employee" value="1"'.($object->employee ? ' checked="checked"' : '').'>';
 			//print yn($object->employee);
 			print '</td></tr>'."\n";
@@ -1803,7 +1803,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 				print dol_print_date($object->datepreviouslogin, "dayhour").' <span class="opacitymedium">('.$langs->trans("Previous").')</span>, ';
 			}
 			if ($object->datelastlogin) {
-				print dol_print_date($object->datelastlogin, "dayhour").' <span class="opacitymedium">('.$langs->trans("Current").')</span>';
+				print dol_print_date($object->datelastlogin, "dayhour").' <span class="opacitymedium">('.$langs->trans("Currently").')</span>';
 			}
 			print '</td>';
 			print "</tr>\n";
diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php
index 618d705bfcf..9fc4426ecac 100644
--- a/htdocs/user/group/perms.php
+++ b/htdocs/user/group/perms.php
@@ -235,9 +235,9 @@ if ($object->id > 0) {
 	print '<td>'.$langs->trans("Module").'</td>';
 	if ($caneditperms) {
 		print '<td class="center nowrap">';
-		print '<a class="reposition commonlink" title="'.dol_escape_htmltag($langs->trans("All")).'" alt="'.dol_escape_htmltag($langs->trans("All")).'" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;module=allmodules">'.$langs->trans("All")."</a>";
+		print '<a class="reposition commonlink" title="'.dol_escape_htmltag($langs->trans("All")).'" alt="'.dol_escape_htmltag($langs->trans("All")).'" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;module=allmodules&amp;token='.newToken().'">'.$langs->trans("All")."</a>";
 		print '/';
-		print '<a class="reposition commonlink" title="'.dol_escape_htmltag($langs->trans("None")).'" alt="'.dol_escape_htmltag($langs->trans("None")).'" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delrights&amp;entity='.$entity.'&amp;module=allmodules">'.$langs->trans("None")."</a>";
+		print '<a class="reposition commonlink" title="'.dol_escape_htmltag($langs->trans("None")).'" alt="'.dol_escape_htmltag($langs->trans("None")).'" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delrights&amp;entity='.$entity.'&amp;module=allmodules&amp;token='.newToken().'">'.$langs->trans("None")."</a>";
 		print '</td>';
 	}
 	print '<td class="center" width="24">&nbsp;</td>';
@@ -286,9 +286,9 @@ if ($object->id > 0) {
 				print '</td>';
 				if ($caneditperms) {
 					print '<td class="center nowrap">';
-					print '<a class="reposition" title='.$langs->trans("All").' alt='.$langs->trans("All").' href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;module='.$obj->module.'">'.$langs->trans("All")."</a>";
+					print '<a class="reposition" title='.$langs->trans("All").' alt='.$langs->trans("All").' href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;module='.$obj->module.'&amp;token='.newToken().'">'.$langs->trans("All")."</a>";
 					print '/';
-					print '<a class="reposition" title='.$langs->trans("None").' alt='.$langs->trans("None").' href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delrights&amp;entity='.$entity.'&amp;module='.$obj->module.'">'.$langs->trans("None")."</a>";
+					print '<a class="reposition" title='.$langs->trans("None").' alt='.$langs->trans("None").' href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delrights&amp;entity='.$entity.'&amp;module='.$obj->module.'&amp;token='.newToken().'">'.$langs->trans("None")."</a>";
 					print '</td>';
 				} else {
 					print '<td>&nbsp;</td>';
@@ -326,7 +326,7 @@ if ($object->id > 0) {
 				} else {
 					// Do not own permission
 					if ($caneditperms) {
-						print '<td class="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'">';
+						print '<td class="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'&amp;token='.newToken().'">';
 						//print img_edit_add($langs->trans("Add"));
 						print img_picto($langs->trans("Add"), 'switch_off');
 						print '</a></td>';
@@ -336,7 +336,7 @@ if ($object->id > 0) {
 			} else {
 				// Do not own permission
 				if ($caneditperms) {
-					print '<td class="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'">';
+					print '<td class="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'&amp;token='.newToken().'">';
 					//print img_edit_add($langs->trans("Add"));
 					print img_picto($langs->trans("Add"), 'switch_off');
 					print '</a></td>';

From c2f1781fae61f105632bd7f0dd0343f8dc95738b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 21 Jul 2021 00:14:03 +0200
Subject: [PATCH 1259/1497] Fix #huntr5bb5a52-3b1c-40ad-9c64-61735f886736

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

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 2bd95197a2a..d1423009c44 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -461,7 +461,7 @@ if ((!defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck) && !empty($conf->gl
 	// Array of action code where CSRFCHECK with token will be forced (so token must be provided on url request)
 	$arrayofactiontoforcetokencheck = array(
 	    'activate', 'add', 'addrights', 'addtimespent',
-	    'confirm_create_user', 'confirm_create_thirdparty', 'confirm_purge', 'confirm_reject_check', 'confirm_deletedir',
+	    'confirm_create_user', 'confirm_create_thirdparty', 'confirm_purge', 'confirm_reject_check', 'confirm_deletedir', 'confirm_deletefile',
 	    'delete', 'deletefilter', 'deleteoperation', 'deleteprof', 'deletepayment', 'delrights',
 	    'disable',
 	    'doprev', 'donext', 'dvprev', 'dvnext',

From e4bb5ed00877849b24e7d657e7ec4dd05d72be2a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 21 Jul 2021 00:35:08 +0200
Subject: [PATCH 1260/1497] Fix phpcs

---
 htdocs/install/fileconf.php      |  2 +-
 htdocs/main.inc.php              | 18 +++++++++---------
 htdocs/user/class/user.class.php | 12 ++++++------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php
index 369d2b93605..42ea5e423af 100644
--- a/htdocs/install/fileconf.php
+++ b/htdocs/install/fileconf.php
@@ -559,7 +559,7 @@ if (!empty($force_install_noedit)) {
 				   class="needroot text-security"
 				   value="<?php
 					// If $force_install_databaserootpass is on, we don't want to set password here, we just show '***'. Real value will be extracted from the forced install file at step1.
-                    $autofill = ((!empty($force_install_databaserootpass)) ? str_pad('', strlen($force_install_databaserootpass), '*') : (isset($db_pass_root) ? $db_pass_root : ''));
+					$autofill = ((!empty($force_install_databaserootpass)) ? str_pad('', strlen($force_install_databaserootpass), '*') : (isset($db_pass_root) ? $db_pass_root : ''));
 					if (!empty($dolibarr_main_prod)) {
 						$autofill = '';
 					}
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index d1423009c44..a30f02f7fba 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -460,15 +460,15 @@ if (!defined('NOTOKENRENEWAL')) {
 if ((!defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck) && !empty($conf->global->MAIN_SECURITY_CSRF_WITH_TOKEN)) || defined('CSRFCHECK_WITH_TOKEN')) {
 	// Array of action code where CSRFCHECK with token will be forced (so token must be provided on url request)
 	$arrayofactiontoforcetokencheck = array(
-	    'activate', 'add', 'addrights', 'addtimespent',
-	    'confirm_create_user', 'confirm_create_thirdparty', 'confirm_purge', 'confirm_reject_check', 'confirm_deletedir', 'confirm_deletefile',
-	    'delete', 'deletefilter', 'deleteoperation', 'deleteprof', 'deletepayment', 'delrights',
-	    'disable',
-	    'doprev', 'donext', 'dvprev', 'dvnext',
-	    'enable',
-	    'install',
-	    'setpricelevel',
-	    'update'
+        'activate', 'add', 'addrights', 'addtimespent',
+        'confirm_create_user', 'confirm_create_thirdparty', 'confirm_purge', 'confirm_reject_check', 'confirm_deletedir', 'confirm_deletefile',
+        'delete', 'deletefilter', 'deleteoperation', 'deleteprof', 'deletepayment', 'delrights',
+        'disable',
+        'doprev', 'donext', 'dvprev', 'dvnext',
+        'enable',
+        'install',
+        'setpricelevel',
+        'update'
 	);
 	$sensitiveget = false;
 	if (in_array(GETPOST('action', 'aZ09'), $arrayofactiontoforcetokencheck)) {
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index b1bc23463fb..816d3dc3e27 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1281,9 +1281,9 @@ class User extends CommonObject
 			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Login"));
 			return -1;
 		} elseif (preg_match('/[,@<>"\']/', $this->login)) {
-            $langs->load("errors");
-            $this->error = $langs->trans("ErrorBadCharIntoLoginName");
-            return -1;
+			$langs->load("errors");
+			$this->error = $langs->trans("ErrorBadCharIntoLoginName");
+			return -1;
 		}
 
 		$this->datec = dol_now();
@@ -1674,9 +1674,9 @@ class User extends CommonObject
 			$this->error = $langs->trans("ErrorFieldRequired", 'Login');
 			return -1;
 		} elseif (preg_match('/[,@<>"\']/', $this->login)) {
-            $langs->load("errors");
-            $this->error = $langs->trans("ErrorBadCharIntoLoginName");
-            return -1;
+			$langs->load("errors");
+			$this->error = $langs->trans("ErrorBadCharIntoLoginName");
+			return -1;
 		}
 
 		$this->db->begin();

From dbed6bc0da64d23df249189b27d20e7a63d56ad4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 21 Jul 2021 01:18:48 +0200
Subject: [PATCH 1261/1497] Fix #yogosha6678

---
 htdocs/install/check.php | 2 +-
 htdocs/main.inc.php      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/install/check.php b/htdocs/install/check.php
index 35efe1f36b2..99e9e38c958 100644
--- a/htdocs/install/check.php
+++ b/htdocs/install/check.php
@@ -100,7 +100,7 @@ print "<br>\n";
 // Check PHP support for $_GET and $_POST
 if (!isset($_GET["testget"]) && !isset($_POST["testpost"])) {	// We must keep $_GET and $_POST here
 	print '<img src="../theme/eldy/img/warning.png" alt="Warning"> '.$langs->trans("PHPSupportPOSTGETKo");
-	print ' (<a href="'.$_SERVER["PHP_SELF"].'?testget=ok">'.$langs->trans("Recheck").'</a>)';
+	print ' (<a href="'.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?testget=ok">'.$langs->trans("Recheck").'</a>)';
 	print "<br>\n";
 	$checksok = 0;
 } else {
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index a30f02f7fba..cc9ff9e6297 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -80,7 +80,7 @@ function realCharForNumericEntities($matches)
  * Warning: Such a protection can't be enough. It is not reliable as it will always be possible to bypass this. Good protection can
  * only be guaranted by escaping data during output.
  *
- * @param		string		$val		Value brut found int $_GET, $_POST or PHP_SELF
+ * @param		string		$val		Brut value found into $_GET, $_POST or PHP_SELF
  * @param		string		$type		0=POST, 1=GET, 2=PHP_SELF, 3=GET without sql reserved keywords (the less tolerant test)
  * @return		int						>0 if there is an injection, 0 if none
  */

From 23f708c0d4e39341cac703e3710330cca3364148 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 21 Jul 2021 01:27:14 +0200
Subject: [PATCH 1262/1497] Fix phpcs

---
 htdocs/main.inc.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index cc9ff9e6297..2ceb2175799 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -460,15 +460,15 @@ if (!defined('NOTOKENRENEWAL')) {
 if ((!defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck) && !empty($conf->global->MAIN_SECURITY_CSRF_WITH_TOKEN)) || defined('CSRFCHECK_WITH_TOKEN')) {
 	// Array of action code where CSRFCHECK with token will be forced (so token must be provided on url request)
 	$arrayofactiontoforcetokencheck = array(
-        'activate', 'add', 'addrights', 'addtimespent',
-        'confirm_create_user', 'confirm_create_thirdparty', 'confirm_purge', 'confirm_reject_check', 'confirm_deletedir', 'confirm_deletefile',
-        'delete', 'deletefilter', 'deleteoperation', 'deleteprof', 'deletepayment', 'delrights',
-        'disable',
-        'doprev', 'donext', 'dvprev', 'dvnext',
-        'enable',
-        'install',
-        'setpricelevel',
-        'update'
+		'activate', 'add', 'addrights', 'addtimespent',
+		'confirm_create_user', 'confirm_create_thirdparty', 'confirm_purge', 'confirm_reject_check', 'confirm_deletedir', 'confirm_deletefile',
+		'delete', 'deletefilter', 'deleteoperation', 'deleteprof', 'deletepayment', 'delrights',
+		'disable',
+		'doprev', 'donext', 'dvprev', 'dvnext',
+		'enable',
+		'install',
+		'setpricelevel',
+		'update'
 	);
 	$sensitiveget = false;
 	if (in_array(GETPOST('action', 'aZ09'), $arrayofactiontoforcetokencheck)) {

From 062c39c40da01cf1a69be2f1c4212df6a459f0b2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 21 Jul 2021 01:40:45 +0200
Subject: [PATCH 1263/1497] Fix html entities when we should not

---
 htdocs/comm/action/class/actioncomm.class.php | 2 +-
 htdocs/core/js/lib_notification.js.php        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 7fd294b89b2..c6c0d277edd 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -2340,7 +2340,7 @@ class ActionComm extends CommonObject
 						$sendContent = make_substitutions($langs->trans($arraymessage->content), $substitutionarray);
 
 						//Topic
-						$sendTopic = (!empty($arraymessage->topic)) ? $arraymessage->topic : html_entity_decode($langs->trans('EventReminder'));
+						$sendTopic = (!empty($arraymessage->topic)) ? $arraymessage->topic : html_entity_decode($langs->transnoentities('EventReminder'));
 
 						// Recipient
 						$recipient = new User($this->db);
diff --git a/htdocs/core/js/lib_notification.js.php b/htdocs/core/js/lib_notification.js.php
index 616463b944d..ee41555119a 100644
--- a/htdocs/core/js/lib_notification.js.php
+++ b/htdocs/core/js/lib_notification.js.php
@@ -131,8 +131,8 @@ function check_events() {
 
 						if (value.type == 'agenda')
 						{
-							 url = '<?php print DOL_URL_ROOT.'/comm/action/card.php?id='; ?>' + value.id_agenda;
-							title = '<?php print dol_escape_js($langs->trans('EventReminder')) ?>';
+							url = '<?php print DOL_URL_ROOT.'/comm/action/card.php?id='; ?>' + value.id_agenda;
+							title = '<?php print dol_escape_js($langs->transnoentities('EventReminder')) ?>';
 						}
 						var extra = {
 							icon: '<?php print DOL_URL_ROOT.'/theme/common/bell.png'; ?>',

From f2dc3be051c9fc07b08d6b56a3a33c550d2bb2ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Wed, 21 Jul 2021 08:40:07 +0200
Subject: [PATCH 1264/1497] add categories tickets migration

---
 htdocs/install/check.php                      | 42 ++++++++++---------
 .../install/mysql/migration/14.0.0-15.0.0.sql | 15 ++++++-
 2 files changed, 36 insertions(+), 21 deletions(-)

diff --git a/htdocs/install/check.php b/htdocs/install/check.php
index 35efe1f36b2..6c339b4e202 100644
--- a/htdocs/install/check.php
+++ b/htdocs/install/check.php
@@ -411,26 +411,28 @@ if (!file_exists($conffile)) {
 		if (GETPOST('allowupgrade')) {
 			$allowupgrade = true;
 		}
-		$migrationscript = array(array('from'=>'3.0.0', 'to'=>'3.1.0'),
-								array('from'=>'3.1.0', 'to'=>'3.2.0'),
-								array('from'=>'3.2.0', 'to'=>'3.3.0'),
-								array('from'=>'3.3.0', 'to'=>'3.4.0'),
-								array('from'=>'3.4.0', 'to'=>'3.5.0'),
-								array('from'=>'3.5.0', 'to'=>'3.6.0'),
-								array('from'=>'3.6.0', 'to'=>'3.7.0'),
-								array('from'=>'3.7.0', 'to'=>'3.8.0'),
-								array('from'=>'3.8.0', 'to'=>'3.9.0'),
-								array('from'=>'3.9.0', 'to'=>'4.0.0'),
-								array('from'=>'4.0.0', 'to'=>'5.0.0'),
-								array('from'=>'5.0.0', 'to'=>'6.0.0'),
-								array('from'=>'6.0.0', 'to'=>'7.0.0'),
-								array('from'=>'7.0.0', 'to'=>'8.0.0'),
-								array('from'=>'8.0.0', 'to'=>'9.0.0'),
-								array('from'=>'9.0.0', 'to'=>'10.0.0'),
-								array('from'=>'10.0.0', 'to'=>'11.0.0'),
-								array('from'=>'11.0.0', 'to'=>'12.0.0'),
-								array('from'=>'12.0.0', 'to'=>'13.0.0'),
-								array('from'=>'13.0.0', 'to'=>'14.0.0')
+		$migrationscript = array(
+			array('from'=>'3.0.0', 'to'=>'3.1.0'),
+			array('from'=>'3.1.0', 'to'=>'3.2.0'),
+			array('from'=>'3.2.0', 'to'=>'3.3.0'),
+			array('from'=>'3.3.0', 'to'=>'3.4.0'),
+			array('from'=>'3.4.0', 'to'=>'3.5.0'),
+			array('from'=>'3.5.0', 'to'=>'3.6.0'),
+			array('from'=>'3.6.0', 'to'=>'3.7.0'),
+			array('from'=>'3.7.0', 'to'=>'3.8.0'),
+			array('from'=>'3.8.0', 'to'=>'3.9.0'),
+			array('from'=>'3.9.0', 'to'=>'4.0.0'),
+			array('from'=>'4.0.0', 'to'=>'5.0.0'),
+			array('from'=>'5.0.0', 'to'=>'6.0.0'),
+			array('from'=>'6.0.0', 'to'=>'7.0.0'),
+			array('from'=>'7.0.0', 'to'=>'8.0.0'),
+			array('from'=>'8.0.0', 'to'=>'9.0.0'),
+			array('from'=>'9.0.0', 'to'=>'10.0.0'),
+			array('from'=>'10.0.0', 'to'=>'11.0.0'),
+			array('from'=>'11.0.0', 'to'=>'12.0.0'),
+			array('from'=>'12.0.0', 'to'=>'13.0.0'),
+			array('from'=>'13.0.0', 'to'=>'14.0.0'),
+			array('from'=>'14.0.0', 'to'=>'15.0.0'),
 		);
 
 		$count = 0;
diff --git a/htdocs/install/mysql/migration/14.0.0-15.0.0.sql b/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
index 95de2ab7ba6..6652fb5dbf5 100644
--- a/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
+++ b/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
@@ -26,7 +26,7 @@
 -- To set a field as NOT NULL:                 -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name SET NOT NULL;
 -- To set a field as default NULL:             -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name SET DEFAULT NULL;
 -- Note: fields with type BLOB/TEXT can't have default value.
--- To rebuild sequence for postgresql after insert by forcing id autoincrement fields: 
+-- To rebuild sequence for postgresql after insert by forcing id autoincrement fields:
 -- -- VPGSQL8.2 SELECT dol_util_rebuild_sequences();
 
 
@@ -37,3 +37,16 @@
 
 -- v15
 
+CREATE TABLE llx_categorie_ticket
+(
+  fk_categorie  integer NOT NULL,
+  fk_ticket    integer NOT NULL,
+  import_key    varchar(14)
+) ENGINE=innodb;
+
+ALTER TABLE llx_categorie_ticket ADD PRIMARY KEY pk_categorie_ticket (fk_categorie, fk_ticket);
+ALTER TABLE llx_categorie_ticket ADD INDEX idx_categorie_ticket_fk_categorie (fk_categorie);
+ALTER TABLE llx_categorie_ticket ADD INDEX idx_categorie_ticket_fk_ticket (fk_ticket);
+
+ALTER TABLE llx_categorie_ticket ADD CONSTRAINT fk_categorie_ticket_categorie_rowid FOREIGN KEY (fk_categorie) REFERENCES llx_categorie (rowid);
+ALTER TABLE llx_categorie_ticket ADD CONSTRAINT fk_categorie_ticket_ticket_rowid   FOREIGN KEY (fk_ticket) REFERENCES llx_ticket (rowid);

From ee1e6c27804f0c0d9eeda7e965ecd6909c95fd3e Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Wed, 21 Jul 2021 14:52:37 +0200
Subject: [PATCH 1265/1497] fix: bad setEventMessages input

---
 htdocs/product/stock/massstockmove.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/product/stock/massstockmove.php b/htdocs/product/stock/massstockmove.php
index 4e35d3832e5..6ea1e179a66 100644
--- a/htdocs/product/stock/massstockmove.php
+++ b/htdocs/product/stock/massstockmove.php
@@ -209,7 +209,7 @@ if ($action == 'createmovements')
 					if ($result1 < 0)
 					{
 						$error++;
-						setEventMessages($product->errors, $product->errorss, 'errors');
+						setEventMessages($product->error, $product->errors, 'errors');
 					}
 
 					// Add stock
@@ -225,7 +225,7 @@ if ($action == 'createmovements')
 					if ($result2 < 0)
 					{
 						$error++;
-						setEventMessages($product->errors, $product->errorss, 'errors');
+						setEventMessages($product->error, $product->errors, 'errors');
 					}
 				} else {
 					$arraybatchinfo = $product->loadBatchInfo($batch);
@@ -256,7 +256,7 @@ if ($action == 'createmovements')
 					if ($result1 < 0)
 					{
 						$error++;
-						setEventMessages($product->errors, $product->errorss, 'errors');
+						setEventMessages($product->error, $product->errors, 'errors');
 					}
 
 					// Add stock
@@ -275,7 +275,7 @@ if ($action == 'createmovements')
 					if ($result2 < 0)
 					{
 						$error++;
-						setEventMessages($product->errors, $product->errorss, 'errors');
+						setEventMessages($product->error, $product->errors, 'errors');
 					}
 				}
 			} else {

From 8eafbf9101236f50fd672b43e3d8f1b7649ff090 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Wed, 21 Jul 2021 17:00:57 +0200
Subject: [PATCH 1266/1497] add column into export invoice

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

diff --git a/htdocs/core/modules/modFacture.class.php b/htdocs/core/modules/modFacture.class.php
index 475c8fc5996..bb044900acd 100644
--- a/htdocs/core/modules/modFacture.class.php
+++ b/htdocs/core/modules/modFacture.class.php
@@ -273,7 +273,7 @@ class modFacture extends DolibarrModules
 		$this->export_TypeFields_array[$r] = array(
 			's.rowid'=>'Numeric', 's.nom'=>'Text', 'ps.nom'=>'Text', 's.code_client'=>'Text', 's.address'=>'Text', 's.zip'=>'Text', 's.town'=>'Text', 'c.code'=>'Text', 'cd.nom'=>'Text', 's.phone'=>'Text', 's.siren'=>'Text',
 			's.siret'=>'Text', 's.ape'=>'Text', 's.idprof4'=>'Text', 's.code_compta'=>'Text', 's.code_compta_fournisseur'=>'Text', 's.tva_intra'=>'Text',
-			'f.rowid'=>'Numeric', 'f.ref'=>"Text", 'f.ref_client'=>'Text', 'f.type'=>"Numeric", 'f.datec'=>"Date", 'f.datef'=>"Date", 'f.date_lim_reglement'=>"Date",
+			'f.rowid'=>'Numeric', 'f.ref'=>"Text", 'f.ref_client'=>'Text', 'f.type'=>"Numeric", 'f.datec'=>"Date", 'f.datef'=>"Date", 'f.date_lim_reglement'=>"Date", 'f.fk_mode_reglement'=>'Numeric',
 			'f.total_ht'=>"Numeric", 'f.total_ttc'=>"Numeric", 'f.total_tva'=>"Numeric", 'f.localtax1'=>'Numeric', 'f.localtax2'=>'Numeric', 'f.paye'=>"Boolean", 'f.fk_statut'=>'Numeric', 'f.close_code'=>'Text', 'f.close_note'=>'Text',
 			'none.rest'=>"NumericCompute",
 			'f.note_private'=>"Text", 'f.note_public'=>"Text", 'f.fk_user_author'=>'Numeric', 'uc.login'=>'Text', 'f.fk_user_valid'=>'Numeric', 'uv.login'=>'Text',

From 5e6c942caf7592e6ab8a15d5995ecf88278ab797 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Thu, 22 Jul 2021 09:22:42 +0200
Subject: [PATCH 1267/1497] notify class indent

---
 htdocs/core/class/notify.class.php            | 20 +++++++++----------
 ..._50_modNotification_Notification.class.php |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php
index 6b32799bc89..a3bc85cb4e1 100644
--- a/htdocs/core/class/notify.class.php
+++ b/htdocs/core/class/notify.class.php
@@ -65,7 +65,7 @@ class Notify
 	// Les codes actions sont definis dans la table llx_notify_def
 
 	// codes actions supported are
-	// @todo defined also into interface_50_modNotificiation_Notificiation.class.php
+	// @todo defined also into interface_50_modNotificiation_Notification.class.php
 	public $arrayofnotifsupported = array(
 		'BILL_VALIDATE',
 		'BILL_PAYED',
@@ -80,8 +80,8 @@ class Notify
 		'SHIPPING_VALIDATE',
 		'EXPENSE_REPORT_VALIDATE',
 		'EXPENSE_REPORT_APPROVE',
-	'HOLIDAY_VALIDATE',
-	'HOLIDAY_APPROVE',
+		'HOLIDAY_VALIDATE',
+		'HOLIDAY_APPROVE',
 		'ACTION_CREATE'
 	);
 
@@ -546,7 +546,7 @@ class Notify
 								$object_type = 'holiday';
 								$labeltouse = $conf->global->HOLIDAY_APPROVE_TEMPLATE;
 								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextHolidayApproved", $link);
-				break;
+								break;
 							case 'ACTION_CREATE':
 								$link = '<a href="'.$urlwithroot.'/comm/action/card.php?id='.$object->id.'&entity='.$object->entity.'">'.$newref.'</a>';
 								$dir_output = $conf->agenda->dir_output;
@@ -567,10 +567,10 @@ class Notify
 							$subject = make_substitutions($arraydefaultmessage->topic, $substitutionarray, $outputlangs);
 							$message = make_substitutions($arraydefaultmessage->content, $substitutionarray, $outputlangs);
 						} else {
-									$message = $outputlangs->transnoentities("YouReceiveMailBecauseOfNotification", $application, $mysoc->name)."\n";
-									$message .= $outputlangs->transnoentities("YouReceiveMailBecauseOfNotification2", $application, $mysoc->name)."\n";
-									$message .= "\n";
-									$message .= $mesg;
+							$message = $outputlangs->transnoentities("YouReceiveMailBecauseOfNotification", $application, $mysoc->name)."\n";
+							$message .= $outputlangs->transnoentities("YouReceiveMailBecauseOfNotification2", $application, $mysoc->name)."\n";
+							$message .= "\n";
+							$message .= $mesg;
 						}
 
 						$ref = dol_sanitizeFileName($newref);
@@ -687,7 +687,7 @@ class Notify
 						break;
 					case 'BILL_PAYED':
 						$link = '<a href="'.$urlwithroot.'/compta/facture/card.php?facid='.$object->id.'&entity='.$object->entity.'">'.$newref.'</a>';
-						$dir_output = $$conf->facture->dir_output."/".get_exdir(0, 0, 0, 1, $object, 'invoice');
+						$dir_output = $conf->facture->dir_output."/".get_exdir(0, 0, 0, 1, $object, 'invoice');
 						$object_type = 'facture';
 						$mesg = $langs->transnoentitiesnoconv("EMailTextInvoicePayed", $link);
 						break;
@@ -782,7 +782,7 @@ class Notify
 						$dir_output = $conf->holiday->dir_output;
 						$object_type = 'holiday';
 						$mesg = $langs->transnoentitiesnoconv("EMailTextHolidayApproved", $link);
-			break;
+						break;
 					case 'ACTION_CREATE':
 						$link = '<a href="'.$urlwithroot.'/comm/action/card.php?id='.$object->id.'&entity='.$object->entity.'">'.$newref.'</a>';
 						$dir_output = $conf->agenda->dir_output;
diff --git a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
index 7d315f142a7..e2b359809dd 100644
--- a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
+++ b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
@@ -30,7 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
  */
 class InterfaceNotification extends DolibarrTriggers
 {
-	// @todo Defined also into notify.class.php)
+	// @todo Defined also into notify.class.php
 	public $listofmanagedevents = array(
 		'BILL_VALIDATE',
 		'BILL_PAYED',

From 44fa70c7c742fec714a6917c7cfa1b51143496df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Thu, 22 Jul 2021 09:24:14 +0200
Subject: [PATCH 1268/1497] notify class indent

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

diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php
index a3bc85cb4e1..2e0a71460ba 100644
--- a/htdocs/core/class/notify.class.php
+++ b/htdocs/core/class/notify.class.php
@@ -65,7 +65,7 @@ class Notify
 	// Les codes actions sont definis dans la table llx_notify_def
 
 	// codes actions supported are
-	// @todo defined also into interface_50_modNotificiation_Notification.class.php
+	// @todo defined also into interface_50_modNotification_Notification.class.php
 	public $arrayofnotifsupported = array(
 		'BILL_VALIDATE',
 		'BILL_PAYED',

From 6cfd8c6f24392093da804f44799852be3b63ebd2 Mon Sep 17 00:00:00 2001
From: netdrag <andergassen@embedded-research.com>
Date: Thu, 22 Jul 2021 18:38:22 +0200
Subject: [PATCH 1269/1497] Order Supplier Email Sender Extension

Extended the advanced options to specify an email address for the order supplier. Useful if you operate under a brand, but order under a different.
---
 htdocs/core/tpl/card_presend.tpl.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/htdocs/core/tpl/card_presend.tpl.php b/htdocs/core/tpl/card_presend.tpl.php
index c741fb213c2..2c7af954892 100644
--- a/htdocs/core/tpl/card_presend.tpl.php
+++ b/htdocs/core/tpl/card_presend.tpl.php
@@ -137,7 +137,14 @@ if ($action == 'presend') {
 		$formmail->fromname = '';
 		$formmail->fromtype = 'special';
 	}
+    if ($object->element === 'order_supplier' && !empty($conf->global->ORDER_SUPPLIER_EMAIL_SENDER)) {
+        $formmail->frommail = $conf->global->ORDER_SUPPLIER_EMAIL_SENDER;
+        $formmail->fromname = '';
+        $formmail->fromtype = 'special';
+    }
 
+	
+	
 	$formmail->trackid = $trackid;
 	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';

From 4c505619e3b4779ab3f222c308596906638e65eb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Fri, 23 Jul 2021 00:02:14 +0200
Subject: [PATCH 1270/1497] FIX look and field v14

---
 htdocs/contrat/card.php                       | 13 ++-
 htdocs/core/lib/company.lib.php               | 17 ++--
 .../modules/barcode/modules_barcode.class.php |  2 +-
 .../product/mod_codeproduct_elephant.php      |  2 +-
 .../modules/product/modules_product.class.php |  3 +-
 .../modules/societe/modules_societe.class.php |  3 +-
 htdocs/holiday/class/holiday.class.php        |  6 +-
 htdocs/holiday/list.php                       | 10 +-
 .../modulebuilder/template/myobject_list.php  | 17 ++--
 htdocs/product/admin/product.php              | 17 +++-
 .../class/recruitmentjobposition.class.php    |  6 +-
 .../recruitmentjobposition_list.php           | 96 +++++++++++++------
 htdocs/ticket/list.php                        |  2 +-
 13 files changed, 122 insertions(+), 72 deletions(-)

diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 32edf9a1558..d5187c6a040 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -1003,7 +1003,7 @@ if ($action == 'create') {
 		$soc->fetch($socid);
 	}
 
-	if (GETPOST('origin') && GETPOST('originid')) {
+	if (GETPOST('origin') && GETPOST('originid', 'int')) {
 		// Parse element/subelement (ex: project_task)
 		$regs = array();
 		$element = $subelement = GETPOST('origin');
@@ -1013,7 +1013,7 @@ if ($action == 'create') {
 		}
 
 		if ($element == 'project') {
-			$projectid = GETPOST('originid');
+			$projectid = GETPOST('originid', 'int');
 		} else {
 			// For compatibility
 			if ($element == 'order' || $element == 'commande') {
@@ -1094,7 +1094,8 @@ if ($action == 'create') {
 		print '</td>';
 	} else {
 		print '<td>';
-		print $form->select_company('', 'socid', '', 'SelectThirdParty', 1, 0, null, 0, 'minwidth300');
+		print img_picto('', 'company', 'class="pictofixedwidth"');
+		print $form->select_company('', 'socid', '', 'SelectThirdParty', 1, 0, null, 0, 'minwidth300 widthcentpercentminusxx maxwidth500');
 		print ' <a href="'.DOL_URL_ROOT.'/societe/card.php?action=create&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create').'"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddThirdParty").'"></span></a>';
 		print '</td>';
 	}
@@ -1121,11 +1122,13 @@ if ($action == 'create') {
 
 	// Commercial suivi
 	print '<tr><td class="nowrap"><span class="fieldrequired">'.$langs->trans("TypeContact_contrat_internal_SALESREPFOLL").'</span></td><td>';
+	print img_picto('', 'user', 'class="pictofixedwidth"');
 	print $form->select_dolusers(GETPOST("commercial_suivi_id") ?GETPOST("commercial_suivi_id") : $user->id, 'commercial_suivi_id', 1, '');
 	print '</td></tr>';
 
 	// Commercial signature
 	print '<tr><td class="nowrap"><span class="fieldrequired">'.$langs->trans("TypeContact_contrat_internal_SALESREPSIGN").'</span></td><td>';
+	print img_picto('', 'user', 'class="pictofixedwidth"');
 	print $form->select_dolusers(GETPOST("commercial_signature_id") ?GETPOST("commercial_signature_id") : $user->id, 'commercial_signature_id', 1, '');
 	print '</td></tr>';
 
@@ -1686,7 +1689,7 @@ if ($action == 'create') {
 						$colspan++;
 					}
 
-					// Ligne dates prevues
+					// Line dates planed
 					print '<tr class="oddeven">';
 					print '<td colspan="'.$colspan.'">';
 					print $langs->trans("DateStartPlanned").' ';
@@ -1786,7 +1789,7 @@ if ($action == 'create') {
 				print '<table class="notopnoleftnoright tableforservicepart2'.($cursorline < $nbofservices ? ' boxtablenobottom' : '').'" width="100%">';
 
 				print '<tr class="oddeven" '.$moreparam.'>';
-				print '<td>'.$langs->trans("ServiceStatus").': '.$object->lines[$cursorline - 1]->getLibStatut(4).'</td>';
+				print '<td><span class="valignmiddle hideonsmartphone">'.$langs->trans("ServiceStatus").':</span> '.$object->lines[$cursorline - 1]->getLibStatut(4).'</td>';
 				print '<td width="30" class="right">';
 				if ($user->socid == 0) {
 					if ($object->statut > 0 && $action != 'activateline' && $action != 'unactivateline') {
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index cb710c19875..7d261f2d5ab 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -1948,7 +1948,9 @@ function show_subsidiaries($conf, $langs, $db, $object)
 		$socstatic = new Societe($db);
 
 		print load_fiche_titre($langs->trans("Subsidiaries"), '', '');
-		print "\n".'<table class="noborder centpercent">'."\n";
+
+		print "\n".'<div class="div-table-responsive-no-min">'."\n";
+		print '<table class="noborder centpercent">'."\n";
 
 		print '<tr class="liste_titre"><td>'.$langs->trans("Company").'</td>';
 		print '<td>'.$langs->trans("Address").'</td><td>'.$langs->trans("Zip").'</td>';
@@ -1976,17 +1978,17 @@ function show_subsidiaries($conf, $langs, $db, $object)
 
 			print '<tr class="oddeven">';
 
-			print '<td>';
+			print '<td class="tdoverflowmax150">';
 			print $socstatic->getNomUrl(1);
 			print '</td>';
 
-			print '<td>'.$obj->address.'</td>';
-			print '<td>'.$obj->zip.'</td>';
-			print '<td>'.$obj->town.'</td>';
-			print '<td>'.$obj->code_client.'</td>';
+			print '<td class="tdoverflowmax400" title="'.dol_escape_htmltag($obj->address).'">'.dol_escape_htmltag($obj->address).'</td>';
+			print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($obj->zip).'">'.$obj->zip.'</td>';
+			print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($obj->town).'">'.$obj->town.'</td>';
+			print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($obj->code_client).'">'.$obj->code_client.'</td>';
 
 			print '<td class="center">';
-			print '<a href="'.DOL_URL_ROOT.'/societe/card.php?socid='.$obj->rowid.'&amp;action=edit">';
+			print '<a class="editfielda" href="'.DOL_URL_ROOT.'/societe/card.php?socid='.((int) $obj->rowid).'&action=edit">';
 			print img_edit();
 			print '</a></td>';
 
@@ -1994,6 +1996,7 @@ function show_subsidiaries($conf, $langs, $db, $object)
 			$i++;
 		}
 		print "\n</table>\n";
+		print '</div>'."\n";
 	}
 
 	print "<br>\n";
diff --git a/htdocs/core/modules/barcode/modules_barcode.class.php b/htdocs/core/modules/barcode/modules_barcode.class.php
index 99fc8ed366d..01a00405452 100644
--- a/htdocs/core/modules/barcode/modules_barcode.class.php
+++ b/htdocs/core/modules/barcode/modules_barcode.class.php
@@ -138,7 +138,7 @@ abstract class ModeleNumRefBarCode
 	{
 		global $conf;
 
-		$langs->load("admin");
+		$langs->loadLangs(array("admin", "companies"));
 
 		$s = '';
 		$s .= $langs->trans("Name").': <b>'.$this->name.'</b><br>';
diff --git a/htdocs/core/modules/product/mod_codeproduct_elephant.php b/htdocs/core/modules/product/mod_codeproduct_elephant.php
index 5936476e079..0b03bd9b6a4 100644
--- a/htdocs/core/modules/product/mod_codeproduct_elephant.php
+++ b/htdocs/core/modules/product/mod_codeproduct_elephant.php
@@ -118,7 +118,7 @@ class mod_codeproduct_elephant extends ModeleProductCode
 		$texte .= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("ProductCodeModel").'):</td>';
 		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="value1" value="'.(!empty($conf->global->PRODUCT_ELEPHANT_MASK_PRODUCT) ? $conf->global->PRODUCT_ELEPHANT_MASK_PRODUCT : '').'"'.$disabled.'>', $tooltip, 1, 1).'</td>';
 
-		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"'.$disabled.'></td>';
+		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button small" value="'.$langs->trans("Modify").'" name="Button"'.$disabled.'></td>';
 
 		$texte .= '</tr>';
 
diff --git a/htdocs/core/modules/product/modules_product.class.php b/htdocs/core/modules/product/modules_product.class.php
index e0141348568..fef12717e3b 100644
--- a/htdocs/core/modules/product/modules_product.class.php
+++ b/htdocs/core/modules/product/modules_product.class.php
@@ -193,7 +193,8 @@ abstract class ModeleProductCode
 	{
 		global $conf;
 
-		$langs->load("admin");
+		$langs->loadLangs(array("admin", "companies"));
+
 		$strikestart = '';
 		$strikeend = '';
 		if (!empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) {
diff --git a/htdocs/core/modules/societe/modules_societe.class.php b/htdocs/core/modules/societe/modules_societe.class.php
index 28d0120da72..09f6cb9c29d 100644
--- a/htdocs/core/modules/societe/modules_societe.class.php
+++ b/htdocs/core/modules/societe/modules_societe.class.php
@@ -198,7 +198,8 @@ abstract class ModeleThirdPartyCode
 	{
 		global $conf;
 
-		$langs->load("admin");
+		$langs->loadLangs(array("admin", "companies"));
+
 		$strikestart = '';
 		$strikeend = '';
 		if (!empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) {
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index 82229198185..1513eb6ea96 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -1296,11 +1296,11 @@ class Holiday extends CommonObject
 	 *
 	 *   @param 	int		$selected   	Id of preselected status
 	 *   @param		string	$htmlname		Name of HTML select field
+	 *   @param		string	$morecss		More CSS on select component
 	 *   @return    string					Show select of status
 	 */
-	public function selectStatutCP($selected = '', $htmlname = 'select_statut')
+	public function selectStatutCP($selected = '', $htmlname = 'select_statut', $morecss = 'minwidth125')
 	{
-
 		global $langs;
 
 		// Liste des statuts
@@ -1308,7 +1308,7 @@ class Holiday extends CommonObject
 		$nb = count($name) + 1;
 
 		// Select HTML
-		$out = '<select name="'.$htmlname.'" id="'.$htmlname.'" class="flat">'."\n";
+		$out = '<select name="'.$htmlname.'" id="'.$htmlname.'" class="flat'.($morecss ? ' '.$morecss : '').'">'."\n";
 		$out .= '<option value="-1">&nbsp;</option>'."\n";
 
 		// Boucle des statuts
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index ab57a497e8e..e7a09abea6e 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -636,7 +636,7 @@ if ($resql) {
 
 	// Create date
 	if (!empty($arrayfields['cp.date_create']['checked'])) {
-		print '<td class="liste_titre center nowraponall">';
+		print '<td class="liste_titre center width200">';
 		print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_month_create" value="'.dol_escape_htmltag($search_month_create).'">';
 		$formother->select_year($search_year_create, 'search_year_create', 1, $min_year, 0);
 		print '</td>';
@@ -644,7 +644,7 @@ if ($resql) {
 
 	// Create date
 	if (!empty($arrayfields['cp.tms']['checked'])) {
-		print '<td class="liste_titre center nowraponall">';
+		print '<td class="liste_titre center width200">';
 		print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_month_update" value="'.dol_escape_htmltag($search_month_update).'">';
 		$formother->select_year($search_year_update, 'search_year_update', 1, $min_year, 0);
 		print '</td>';
@@ -652,8 +652,8 @@ if ($resql) {
 
 	// Status
 	if (!empty($arrayfields['cp.statut']['checked'])) {
-		print '<td class="liste_titre maxwidthonsmartphone maxwidth200 right">';
-		$object->selectStatutCP($search_status, 'search_status');
+		print '<td class="liste_titre right">';
+		$object->selectStatutCP($search_status, 'search_status', 'minwidth125');
 		print '</td>';
 	}
 
@@ -781,7 +781,7 @@ if ($resql) {
 				}
 			}
 			if (!empty($arrayfields['cp.fk_type']['checked'])) {
-				print '<td>';
+				print '<td class="minwidth100">';
 				$labeltypeleavetoshow = ($langs->trans($typeleaves[$obj->fk_type]['code']) != $typeleaves[$obj->fk_type]['code'] ? $langs->trans($typeleaves[$obj->fk_type]['code']) : $typeleaves[$obj->fk_type]['label']);
 				print empty($typeleaves[$obj->fk_type]['label']) ? $langs->trans("TypeWasDisabledOrRemoved", $obj->fk_type) : $labeltypeleavetoshow;
 				print '</td>';
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 4633a69e6dd..1e319e18ec2 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -327,22 +327,21 @@ $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $objec
 $sql .= $hookmanager->resPrint;
 
 /* If a group by is required
-$sql.= " GROUP BY ";
-foreach($object->fields as $key => $val)
-{
-	$sql.='t.'.$key.', ';
+$sql .= " GROUP BY ";
+foreach($object->fields as $key => $val) {
+	$sql .= 't.'.$key.', ';
 }
 // Add fields from extrafields
-if (! empty($extrafields->attributes[$object->table_element]['label'])) {
+if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
 		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.', ' : '');
 	}
 }
 // Add where from hooks
-$parameters=array();
-$reshook=$hookmanager->executeHooks('printFieldListGroupBy', $parameters, $object);    // Note that $action and $object may have been modified by hook
-$sql.=$hookmanager->resPrint;
-$sql=preg_replace('/,\s*$/','', $sql);
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListGroupBy', $parameters, $object);    // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
+$sql = preg_replace('/,\s*$/', '', $sql);
 */
 
 $sql .= $db->order($sortfield, $sortorder);
diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php
index 5a83c685e0f..fa75a20277f 100644
--- a/htdocs/product/admin/product.php
+++ b/htdocs/product/admin/product.php
@@ -295,13 +295,14 @@ $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 
 print load_fiche_titre($langs->trans("ProductCodeChecker"), '', '');
 
+print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">'."\n";
 print '<tr class="liste_titre">'."\n";
 print '  <td>'.$langs->trans("Name").'</td>';
 print '  <td>'.$langs->trans("Description").'</td>';
 print '  <td>'.$langs->trans("Example").'</td>';
 print '  <td class="center" width="80">'.$langs->trans("Status").'</td>';
-print '  <td class="center" width="60">'.$langs->trans("ShortInfo").'</td>';
+print '  <td class="center"></td>';
 print "</tr>\n";
 
 foreach ($dirproduct as $dirroot) {
@@ -333,7 +334,7 @@ foreach ($dirproduct as $dirroot) {
 				print '<tr class="oddeven">'."\n";
 				print '<td width="140">'.$modCodeProduct->name.'</td>'."\n";
 				print '<td>'.$modCodeProduct->info($langs).'</td>'."\n";
-				print '<td class="nowrap">'.$modCodeProduct->getExample($langs).'</td>'."\n";
+				print '<td class="nowrap"><span class="opacitymedium">'.$modCodeProduct->getExample($langs).'</span></td>'."\n";
 
 				if (!empty($conf->global->PRODUCT_CODEPRODUCT_ADDON) && $conf->global->PRODUCT_CODEPRODUCT_ADDON == $file) {
 					print '<td class="center">'."\n";
@@ -366,6 +367,7 @@ foreach ($dirproduct as $dirroot) {
 	}
 }
 print '</table>';
+print '</div>';
 
 // Module to build doc
 $def = array();
@@ -390,13 +392,14 @@ print '<br>';
 
 print load_fiche_titre($langs->trans("ProductDocumentTemplates"), '', '');
 
+print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Name").'</td>';
 print '<td>'.$langs->trans("Description").'</td>';
 print '<td class="center" width="60">'.$langs->trans("Status")."</td>\n";
 print '<td class="center" width="60">'.$langs->trans("Default")."</td>\n";
-print '<td class="center" width="80">'.$langs->trans("ShortInfo").'</td>';
+print '<td class="center"></td>';
 print '<td class="center" width="80">'.$langs->trans("Preview").'</td>';
 print "</tr>\n";
 
@@ -499,6 +502,8 @@ foreach ($dirmodels as $reldir) {
 }
 
 print '</table>';
+print '</div>';
+
 print "<br>";
 
 /*
@@ -517,6 +522,7 @@ print '<input type="hidden" name="page_y" value="">';
 print load_fiche_titre($langs->trans("ProductOtherConf"), '', '');
 
 
+print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Parameters").'</td>'."\n";
@@ -611,6 +617,7 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 }
 
 print '</table>';
+print '</div>';
 
 print '<div class="center">';
 print '<input type="submit" class="button reposition" value="'.$langs->trans("Modify").'">';
@@ -620,6 +627,7 @@ print '</div>';
 print load_fiche_titre($langs->trans("UserInterface"), '', '');
 
 
+print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Parameters").'</td>'."\n";
@@ -671,7 +679,7 @@ print $form->selectarray(
 	0,
 	0,
 	'',
-	'maxwidth400',
+	'minwidth100imp maxwidth400',
 	1
 );
 print '</td>';
@@ -772,6 +780,7 @@ if (!empty($conf->global->PRODUCT_CANVAS_ABILITY)) {
 }
 
 print '</table>';
+print '</div>';
 
 print '<div class="center">';
 print '<input type="submit" class="button reposition" value="'.$langs->trans("Modify").'">';
diff --git a/htdocs/recruitment/class/recruitmentjobposition.class.php b/htdocs/recruitment/class/recruitmentjobposition.class.php
index 2f180bcc8ec..892ba4121e9 100644
--- a/htdocs/recruitment/class/recruitmentjobposition.class.php
+++ b/htdocs/recruitment/class/recruitmentjobposition.class.php
@@ -101,13 +101,13 @@ class RecruitmentJobPosition extends CommonObject
 	public $fields = array(
 		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'comment'=>"Id"),
 		'entity' => array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'position'=>5, 'notnull'=>1, 'default'=>'1', 'index'=>1),
-		'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>'1', 'position'=>10, 'notnull'=>1, 'visible'=>4, 'noteditable'=>'1', 'default'=>'(PROV)', 'index'=>1, 'searchall'=>1, 'showoncombobox'=>'1', 'comment'=>"Reference of object"),
+		'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>'1', 'position'=>10, 'notnull'=>1, 'visible'=>4, 'noteditable'=>'1', 'default'=>'(PROV)', 'index'=>1, 'searchall'=>1, 'showoncombobox'=>'1', 'comment'=>"Reference of object", 'css'=>'nowraponall'),
 		'label' => array('type'=>'varchar(255)', 'label'=>'JobLabel', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth500', 'csslist'=>'tdoverflowmax300', 'showoncombobox'=>'2', 'autofocusoncreate'=>1),
 		'qty' => array('type'=>'integer', 'label'=>'NbOfEmployeesExpected', 'enabled'=>'1', 'position'=>45, 'notnull'=>1, 'visible'=>1, 'default'=>'1', 'isameasure'=>'1', 'css'=>'maxwidth75imp'),
 		'fk_project' => array('type'=>'integer:Project:projet/class/project.class.php:1', 'label'=>'Project', 'enabled'=>'1', 'position'=>52, 'notnull'=>-1, 'visible'=>-1, 'index'=>1, 'css'=>'maxwidth500', 'picto'=>'project'),
-		'fk_user_recruiter' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'ResponsibleOfRecruitement', 'enabled'=>'1', 'position'=>54, 'notnull'=>1, 'visible'=>1, 'foreignkey'=>'user.rowid', 'csslist'=>'tdoverflowmax150'),
+		'fk_user_recruiter' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'ResponsibleOfRecruitement', 'enabled'=>'1', 'position'=>54, 'notnull'=>1, 'visible'=>1, 'foreignkey'=>'user.rowid', 'css'=>'maxwidth500', 'csslist'=>'tdoverflowmax150', 'picto'=>'user'),
 		'email_recruiter' => array('type'=>'varchar(255)', 'label'=>'EmailRecruiter', 'enabled'=>'1', 'position'=>54, 'notnull'=>0, 'visible'=>-1, 'help'=>'ToUseAGenericEmail', 'picto'=>'email'),
-		'fk_user_supervisor' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'FutureManager', 'enabled'=>'1', 'position'=>55, 'notnull'=>0, 'visible'=>-1, 'foreignkey'=>'user.rowid',),
+		'fk_user_supervisor' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'FutureManager', 'enabled'=>'1', 'position'=>55, 'notnull'=>0, 'visible'=>-1, 'foreignkey'=>'user.rowid', 'css'=>'maxwidth500', 'csslist'=>'tdoverflowmax150', 'picto'=>'user'),
 		'fk_establishment' => array('type'=>'integer:Establishment:hrm/class/establishment.class.php', 'label'=>'Establishment', 'enabled'=>'$conf->hrm->enabled', 'position'=>56, 'notnull'=>0, 'visible'=>-1, 'foreignkey'=>'establishment.rowid',),
 		'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'WorkPlace', 'enabled'=>'1', 'position'=>57, 'notnull'=>-1, 'visible'=>-1, 'css'=>'maxwidth500', 'index'=>1, 'help'=>"IfJobIsLocatedAtAPartner", 'picto'=>'company'),
 		'date_planned' => array('type'=>'date', 'label'=>'DateExpected', 'enabled'=>'1', 'position'=>60, 'notnull'=>0, 'visible'=>1,),
diff --git a/htdocs/recruitment/recruitmentjobposition_list.php b/htdocs/recruitment/recruitmentjobposition_list.php
index 7ccad1de16a..3398a47dca3 100644
--- a/htdocs/recruitment/recruitmentjobposition_list.php
+++ b/htdocs/recruitment/recruitmentjobposition_list.php
@@ -103,8 +103,9 @@ $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
+	// If $page is not defined, or '' or -1 or if we click on clear filters
 	$page = 0;
-}     // If $page is not defined, or '' or -1 or if we click on clear filters
+}
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
@@ -123,6 +124,7 @@ $search_array_options = $extrafields->getOptionalsFromPost($object->table_elemen
 
 // Default sort order (if not yet defined by previous GETPOST)
 if (!$sortfield) {
+	reset($object->fields);					// Reset is required to avoid key() to return null.
 	$sortfield = "t.".key($object->fields); // Set here default search field. By default 1st field in definition.
 }
 if (!$sortorder) {
@@ -146,17 +148,18 @@ foreach ($object->fields as $key => $val) {
 	}
 }
 
-// Definition of fields for list
+// Definition of array of fields for columns
 $arrayfields = array();
 foreach ($object->fields as $key => $val) {
 	// If $val['visible']==0, then we never show the field
 	if (!empty($val['visible'])) {
-		$visible = dol_eval($val['visible'], 1);
+		$visible = (int) dol_eval($val['visible'], 1);
 		$arrayfields['t.'.$key] = array(
 			'label'=>$val['label'],
 			'checked'=>(($visible < 0) ? 0 : 1),
 			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
-			'position'=>$val['position']
+			'position'=>$val['position'],
+			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
 	}
 }
@@ -164,7 +167,7 @@ foreach ($object->fields as $key => $val) {
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
 
 $object->fields = dol_sort_array($object->fields, 'position');
-$arrayfields['nbapplications'] = array('label'=>'Applications', 'checked'=>1, 'enabled'=>1, 'position'=>90);
+$arrayfields['nbapplications'] = array('type'=>'integer', 'label'=>'Applications', 'checked'=>1, 'enabled'=>1, 'position'=>90, 'csslist'=>'right');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
 $permissiontoread = $user->rights->recruitment->recruitmentjobposition->read;
@@ -184,7 +187,8 @@ $result = restrictedArea($user, 'recruitment', 0, 'recruitment_recruitmentjobpos
  */
 
 if (GETPOST('cancel', 'alpha')) {
-	$action = 'list'; $massaction = '';
+	$action = 'list';
+	$massaction = '';
 }
 if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
 	$massaction = '';
@@ -238,13 +242,11 @@ $title = $langs->trans('ListOfPositionsToBeFilled');
 // Build and execute select
 // --------------------------------------------------------------------
 $sql = 'SELECT ';
-foreach ($object->fields as $key => $val) {
-	$sql .= 't.'.$key.', ';
-}
+$sql .= $object->getFieldList('t');
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.' as options_'.$key.', ' : '');
+		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key.' as options_'.$key.', ' : '');
 	}
 }
 // Add fields from hooks
@@ -258,24 +260,42 @@ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."recruitment_recruitmentcandidature as rc O
 if (isset($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (t.rowid = ef.fk_object)";
 }
+// Add table from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
 if ($object->ismultientitymanaged == 1) {
 	$sql .= " WHERE t.entity IN (".getEntity($object->element).")";
 } else {
 	$sql .= " WHERE 1 = 1";
 }
 foreach ($search as $key => $val) {
-	if ($key == 'status' && $search[$key] == -1) {
-		continue;
-	}
-	$mode_search = (($object->isInt($object->fields[$key]) || $object->isFloat($object->fields[$key])) ? 1 : 0);
-	if (strpos($object->fields[$key]['type'], 'integer:') === 0) {
-		if ($search[$key] == '-1') {
-			$search[$key] = '';
+	if (array_key_exists($key, $object->fields)) {
+		if ($key == 'status' && $search[$key] == -1) {
+			continue;
+		}
+		$mode_search = (($object->isInt($object->fields[$key]) || $object->isFloat($object->fields[$key])) ? 1 : 0);
+		if ((strpos($object->fields[$key]['type'], 'integer:') === 0) || (strpos($object->fields[$key]['type'], 'sellist:') === 0) || !empty($object->fields[$key]['arrayofkeyval'])) {
+			if ($search[$key] == '-1' || $search[$key] === '0') {
+				$search[$key] = '';
+			}
+			$mode_search = 2;
+		}
+		if ($search[$key] != '') {
+			$sql .= natural_search($key, $search[$key], (($key == 'status') ? 2 : $mode_search));
+		}
+	} else {
+		if (preg_match('/(_dtstart|_dtend)$/', $key) && $search[$key] != '') {
+			$columnName=preg_replace('/(_dtstart|_dtend)$/', '', $key);
+			if (preg_match('/^(date|timestamp|datetime)/', $object->fields[$columnName]['type'])) {
+				if (preg_match('/_dtstart$/', $key)) {
+					$sql .= " AND t." . $columnName . " >= '" . $db->idate($search[$key]) . "'";
+				}
+				if (preg_match('/_dtend$/', $key)) {
+					$sql .= " AND t." . $columnName . " <= '" . $db->idate($search[$key]) . "'";
+				}
+			}
 		}
-		$mode_search = 2;
-	}
-	if ($search[$key] != '') {
-		$sql .= natural_search($key, $search[$key], (($key == 'status') ? 2 : $mode_search));
 	}
 }
 if ($search_all) {
@@ -372,6 +392,10 @@ if ($optioncss != '') {
 }
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
+// Add $param from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object); // Note that $action and $object may have been modified by hook
+$param .= $hookmanager->resPrint;
 
 // List of mass actions available
 $arrayofmassactions = array(
@@ -449,30 +473,38 @@ print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwit
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
 foreach ($object->fields as $key => $val) {
-	$cssforfield = (empty($val['css']) ? '' : $val['css']);
+	$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 	if ($key == 'status') {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
 	} elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
 	} elseif (in_array($val['type'], array('timestamp'))) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') {
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
 	}
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
 		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
 			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], (isset($search[$key]) ? $search[$key] : ''), $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
-		} elseif (strpos($val['type'], 'integer:') === 0) {
-			print $object->showInputField($val, $key, (isset($search[$key]) ? $search[$key] : ''), '', '', 'search_', 'maxwidth150', 1);
-		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) {
+		} elseif ((strpos($val['type'], 'integer:') === 0) || (strpos($val['type'], 'sellist:') === 0)) {
+			print $object->showInputField($val, $key, (isset($search[$key]) ? $search[$key] : ''), '', '', 'search_', 'maxwidth125', 1);
+		} elseif (!preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
 			print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag(isset($search[$key]) ? $search[$key] : '').'">';
+		} elseif (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
+			print '<div class="nowrap">';
+			print $form->selectDate($search[$key.'_dtstart'] ? $search[$key.'_dtstart'] : '', "search_".$key."_dtstart", 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+			print '</div>';
+			print '<div class="nowrap">';
+			print $form->selectDate($search[$key.'_dtend'] ? $search[$key.'_dtend'] : '', "search_".$key."_dtend", 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
+			print '</div>';
 		}
 		print '</td>';
 	}
 }
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
+
 // Fields from hook
 $parameters = array('arrayfields'=>$arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object); // Note that $action and $object may have been modified by hook
@@ -492,14 +524,14 @@ print '</tr>'."\n";
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
 foreach ($object->fields as $key => $val) {
-	$cssforfield = (empty($val['css']) ? '' : $val['css']);
+	$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 	if ($key == 'status') {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
 	} elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
 	} elseif (in_array($val['type'], array('timestamp'))) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') {
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
 	}
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
@@ -513,7 +545,7 @@ $parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 if (!empty($arrayfields['nbapplications']['checked'])) {
-	print '<td class="liste_titre">'.$langs->trans("Applications").'</td>';
+	print '<td class="liste_titre right">'.$langs->trans("Applications").'</td>';
 }
 // Action column
 print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
@@ -561,7 +593,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
 		}
 
-		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $key != 'status') {
+		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', 'status')) && empty($val['arrayofkeyval'])) {
 			$cssforfield .= ($cssforfield ? ' ' : '').'right';
 		}
 		//if (in_array($key, array('fk_soc', 'fk_user', 'fk_warehouse'))) $cssforfield = 'tdoverflowmax100';
@@ -570,6 +602,8 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 			print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '').'>';
 			if ($key == 'status') {
 				print $object->getLibStatut(5);
+			} elseif ($key == 'rowid') {
+				print $object->showOutputField($val, $key, $object->id, '');
 			} else {
 				print $object->showOutputField($val, $key, $object->$key, '');
 			}
@@ -602,7 +636,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 	}
 	// Action column
 	print '<td class="nowrap center">';
-	if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+	if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
 		$selected = 0;
 		if (in_array($object->id, $arrayofselected)) {
 			$selected = 1;
diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php
index 84ea65fef71..6a65efc8bac 100644
--- a/htdocs/ticket/list.php
+++ b/htdocs/ticket/list.php
@@ -798,7 +798,7 @@ foreach ($object->fields as $key => $val) {
 			if (!empty($search[$key])) {
 				$selectedarray = array_values($search[$key]);
 			}
-			print Form::multiselectarray('search_fk_statut', $arrayofstatus, $selectedarray, 0, 0, 'minwidth100 maxwidth150', 1, 0, '', '', '');
+			print Form::multiselectarray('search_fk_statut', $arrayofstatus, $selectedarray, 0, 0, 'minwidth100imp maxwidth150', 1, 0, '', '', '');
 			print '</td>';
 		} elseif ($key == "fk_soc") {
 			print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'"><input type="text" class="flat maxwidth75" name="search_societe" value="'.dol_escape_htmltag($search_societe).'"></td>';

From 38b34b1f19f4f7b17229b6246f75e068dd9cd98b Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Fri, 23 Jul 2021 12:25:59 +0200
Subject: [PATCH 1271/1497] Update llx_20_c_departements.sql

Panama
---
 .../mysql/data/llx_20_c_departements.sql      | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_20_c_departements.sql b/htdocs/install/mysql/data/llx_20_c_departements.sql
index 27a9f8dd1f5..fecaf87befe 100644
--- a/htdocs/install/mysql/data/llx_20_c_departements.sql
+++ b/htdocs/install/mysql/data/llx_20_c_departements.sql
@@ -766,16 +766,16 @@ INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc
 
 
 -- Panama - 10 Provinces (id country=178)
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('PA-1', 17801, '', 0, '', 'Bocas del Toro');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('PA-2', 17801, '', 0, '', 'Coclé');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('PA-3', 17801, '', 0, '', 'Colón');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('PA-4', 17801, '', 0, '', 'Chiriquí');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('PA-5', 17801, '', 0, '', 'Darién');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('PA-6', 17801, '', 0, '', 'Herrera');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('PA-7', 17801, '', 0, '', 'Los Santos');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('PA-8', 17801, '', 0, '', 'Panamá');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('PA-9', 17801, '', 0, '', 'Veraguas');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('PA-13', 17801, '', 0, '', 'Panamá Oeste');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (17801, 'PA-1',  '', 0, '', 'Bocas del Toro');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (17801, 'PA-2',  '', 0, '', 'Coclé');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (17801, 'PA-3',  '', 0, '', 'Colón');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (17801, 'PA-4',  '', 0, '', 'Chiriquí');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (17801, 'PA-5',  '', 0, '', 'Darién');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (17801, 'PA-6',  '', 0, '', 'Herrera');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (17801, 'PA-7',  '', 0, '', 'Los Santos');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (17801, 'PA-8',  '', 0, '', 'Panamá');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (17801, 'PA-9',  '', 0, '', 'Veraguas');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (17801, 'PA-13', '', 0, '', 'Panamá Oeste');
 
 
 -- Provinces Peru (id country=181)

From 8920590e28bdcbd5676af14449f5706c4bf6670c Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Fri, 23 Jul 2021 12:48:25 +0200
Subject: [PATCH 1272/1497] Update llx_00_c_country.sql
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Singapour  -->  Singapore
Iles Aland  -->  Åland Island
Samoa américaines  -->  American Samoa
Antarctique  -->  Antarctica
Antigua-et-Barbuda  -->  Antigua and Barbuda
Azerbaïdjan  -->  Azerbaijan
---
 htdocs/install/mysql/data/llx_00_c_country.sql | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_00_c_country.sql b/htdocs/install/mysql/data/llx_00_c_country.sql
index ac8eba73a28..4465756f00a 100644
--- a/htdocs/install/mysql/data/llx_00_c_country.sql
+++ b/htdocs/install/mysql/data/llx_00_c_country.sql
@@ -57,19 +57,19 @@ INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (25
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (26,'SA','SAU','Saudi Arabia',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (27,'MC','MCO','Monaco',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (28,'AU','AUS','Australia',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (29,'SG','SGP','Singapour',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (29,'SG','SGP','Singapore',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (30,'AF','AFG','Afghanistan',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (31,'AX','ALA','Iles Aland',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (31,'AX','ALA','Åland Island',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (32,'AL','ALB','Albania',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (33,'AS','ASM','Samoa américaines',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (33,'AS','ASM','American Samoa',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (34,'AD','AND','Andorra',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (35,'AO','AGO','Angola',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (36,'AI','AIA','Anguilla',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (37,'AQ','ATA','Antarctique',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (38,'AG','ATG','Antigua-et-Barbuda',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (37,'AQ','ATA','Antarctica',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (38,'AG','ATG','Antigua and Barbuda',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (39,'AM','ARM','Armenia',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (41,'AT','AUT','Austria',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (42,'AZ','AZE','Azerbaïdjan',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (42,'AZ','AZE','Azerbaijan',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (43,'BS','BHS','Bahamas',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (44,'BH','BHR','Bahreïn',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (45,'BD','BGD','Bangladesh',1,0);

From e93a362a0d585374260be696f91420d922672d4e Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Fri, 23 Jul 2021 18:33:18 +0200
Subject: [PATCH 1273/1497] fix: since be62c2f7 commit selectlist from
 formconfirm were behind the form confirm

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 1213c070acc..56316475ab7 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1182,7 +1182,7 @@ class Form
 			// mode 1
 			$urloption = 'htmlname='.urlencode($htmlname).'&outjson=1&filter='.urlencode($filter).($showtype ? '&showtype='.urlencode($showtype) : '');
 			$out .= ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/societe/ajax/company.php', $urloption, $conf->global->COMPANY_USE_SEARCH_TO_SELECT, 0, $ajaxoptions);
-			$out .= '<style type="text/css">.ui-autocomplete { z-index: 250; }</style>';
+			$out .= '<style type="text/css">.ui-autocomplete { z-index: 1003; }</style>';
 			if (empty($hidelabel)) print $langs->trans("RefOrLabel").' : ';
 			elseif ($hidelabel > 1) {
 				$placeholder = ' placeholder="'.$langs->trans("RefOrLabel").'"';
@@ -6052,7 +6052,7 @@ class Form
 			$urloption = 'htmlname='.$htmlname.'&outjson=1&objectdesc='.$objectdesc.'&filter='.urlencode($objecttmp->filter);
 			// Activate the auto complete using ajax call.
 			$out .= ajax_autocompleter($preselectedvalue, $htmlname, $urlforajaxcall, $urloption, $conf->global->$confkeyforautocompletemode, 0, array());
-			$out .= '<style type="text/css">.ui-autocomplete { z-index: 250; }</style>';
+			$out .= '<style type="text/css">.ui-autocomplete { z-index: 1003; }</style>';
 			if ($placeholder) $placeholder = ' placeholder="'.$placeholder.'"';
 			$out .= '<input type="text" class="'.$morecss.'"'.($disabled ? ' disabled="disabled"' : '').' name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'"'.$placeholder.' />';
 		}

From 5524320fbcee6db99a092a8d20a9cadbd88d8bbb Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Fri, 23 Jul 2021 17:46:44 +0000
Subject: [PATCH 1274/1497] Fixing style errors.

---
 htdocs/core/tpl/card_presend.tpl.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/tpl/card_presend.tpl.php b/htdocs/core/tpl/card_presend.tpl.php
index 2c7af954892..143d8d5536c 100644
--- a/htdocs/core/tpl/card_presend.tpl.php
+++ b/htdocs/core/tpl/card_presend.tpl.php
@@ -137,14 +137,14 @@ if ($action == 'presend') {
 		$formmail->fromname = '';
 		$formmail->fromtype = 'special';
 	}
-    if ($object->element === 'order_supplier' && !empty($conf->global->ORDER_SUPPLIER_EMAIL_SENDER)) {
-        $formmail->frommail = $conf->global->ORDER_SUPPLIER_EMAIL_SENDER;
-        $formmail->fromname = '';
-        $formmail->fromtype = 'special';
-    }
+	if ($object->element === 'order_supplier' && !empty($conf->global->ORDER_SUPPLIER_EMAIL_SENDER)) {
+		$formmail->frommail = $conf->global->ORDER_SUPPLIER_EMAIL_SENDER;
+		$formmail->fromname = '';
+		$formmail->fromtype = 'special';
+	}
+
+
 
-	
-	
 	$formmail->trackid = $trackid;
 	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';

From 5453e3b3b26b406377590f646b01e7bedb3fefc0 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sun, 25 Jul 2021 08:35:03 +0200
Subject: [PATCH 1275/1497] Security

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

diff --git a/htdocs/expensereport/class/paymentexpensereport.class.php b/htdocs/expensereport/class/paymentexpensereport.class.php
index a453b810e6a..6e3e8d34137 100644
--- a/htdocs/expensereport/class/paymentexpensereport.class.php
+++ b/htdocs/expensereport/class/paymentexpensereport.class.php
@@ -169,7 +169,7 @@ class PaymentExpenseReport extends CommonObject
 			$sql .= " VALUES ($this->fk_expensereport, '".$this->db->idate($now)."',";
 			$sql .= " '".$this->db->idate($this->datepaid)."',";
 			$sql .= " ".price2num($totalamount).",";
-			$sql .= " ".$this->fk_typepayment.", '".$this->db->escape($this->num_payment)."', '".$this->db->escape($this->note_public)."', ".$user->id.",";
+			$sql .= " ".((int) $this->fk_typepayment).", '".$this->db->escape($this->num_payment)."', '".$this->db->escape($this->note_public)."', ".((int) $user->id).",";
 			$sql .= " 0)";
 
 			dol_syslog(get_class($this)."::create", LOG_DEBUG);

From 467ecb4a64e7568e5681e16c20fd5f5b79ecaa9c Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sun, 25 Jul 2021 21:21:09 +0200
Subject: [PATCH 1276/1497] ChangeLog

---
 ChangeLog | 42 +++++++++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f439186f5ca..5b296aa88e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,7 +7,7 @@ English Dolibarr ChangeLog
 
 For users:
 ----------
-NEW: Module Recruitement to follow application to job positions is now stable.
+NEW: Module Recruitment to follow application to job positions is now stable.
 NEW: Feature to make Stock Inventories
 NEW: Several security issues after a second private bug hunting campaign. 
 NEW: A lot of fix into english text after a small proofreading campaign (still not perfect, but really better)
@@ -50,7 +50,7 @@ NEW: Make public bookmarks editable by admin users only
 NEW: If main logo not defined, can use the squarred logo on login page
 NEW: The manifest file can use the squared image if available
 NEW: Enhance the multicurrency rate editor
-NEW: Normalyse Type company field with ajax combobox
+NEW: Normalise Type company field with ajax combobox
 NEW: preload product description on selection for customer propal/order/invoice
 NEW: Search usergroups & resources
 NEW: Setup Page for module creation with module builder enhancement #FoundationFunding
@@ -67,14 +67,15 @@ NEW: #16378 more E-Mail Contact substitution Values for better salutation
 NEW: option to keep the "Automatically create the payment" checkbox empty on the tax creation page
 
  Accountancy
-NEW: Accountancy - Add FEC import
-NEW: Accountancy - Add a confirmation form with options on export
-NEW: Accountancy - Add select date from/to in already bind customer and supplier list
-NEW: Accountancy - Format FEC - Add new field DateLimitReglmt
-NEW: Accountancy - In ledger & journals, show link on bank transaction
-NEW: Accountancy - Possibility to filter on journals in balance
-NEW: Accountancy - Add a page to list subledger accounts
-NEW: Multiselect ledger account code filter on book keeping list
+NEW: Add FEC import
+NEW: Add a confirmation form with options on export (for notified export and validate operations)
+NEW: Add select date from/to in already bind customer and supplier list
+NEW: FEC / FEC2 export - Add new field DateLimitReglmt
+NEW: In ledger & journals, show link on bank transaction
+NEW: Possibility to filter on journals in balance
+NEW: Add a page to list subledger accounts
+NEW: Multiselect journal code filter on journal / balance / ledger
+NEW: Add first step to close fiscal year
 
  Agenda
 NEW: add support for Friday as a non working day
@@ -93,7 +94,7 @@ NEW: can filter files in ECM/GED on status Shared / Not shared
 NEW: add a check to avoid an invoice date in the future
 NEW: add the total of margin in invoice list
 NEW: can set a percentage when creating an invoice from another object
-NEW: Support down payment on supplier invoice (& somes ajustments)
+NEW: Support down payment on supplier invoice (& some adjustments)
 
  Margin
 NEW: add the total of margin in invoice list
@@ -162,7 +163,7 @@ NEW: Add a security center page with all information and advices related to the
 NEW: Add a performance center page with all information and advices related to the performance of your instance 
 
  Modules
-NEW: Module Recruitement is now stable
+NEW: Module Recruitment is now stable
 NEW: start new experimental module Event Organization Management
 NEW: start new experimental module Partnership Management
 NEW: start new experimental module Knowledge Management
@@ -171,11 +172,14 @@ NEW: Check update availability for externals modules using a button on module pa
 Module SimplePOS is deprecated - TakePOS is recommended for the future
 
  new Options
-NEW: add option  CONTRACT_ALLOW_EXTERNAL_DOWNLOAD            to make generated doc automatically shared
-NEW: add option  SUPPLIER_PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD   to make generated doc automatically shared
-NEW: add option  MAIN_SECURITY_ANTI_SSRF_SERVER_IP           to define list of IPs that are local IPs
-NEW: add option  SOCIETE_DISABLE_WORKFORCE                   to hide staff field
-NEW: add constant  MAIN_BUGTRACK_URL                         to set a custom url to redirect to when clicking on link "declare a bug"
+NEW: add option  CONTRACT_ALLOW_EXTERNAL_DOWNLOAD                   to make generated doc automatically shared
+NEW: add option  SUPPLIER_PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD          to make generated doc automatically shared
+NEW: add option  MAIN_SECURITY_ANTI_SSRF_SERVER_IP                  to define list of IPs that are local IPs
+NEW: add option  SOCIETE_DISABLE_WORKFORCE                          to hide staff field
+NEW: add constant  MAIN_BUGTRACK_URL                                to set a custom url to redirect to when clicking on link "declare a bug"
+NEW: add constant  ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY    to manage binding with accountancy account declared on thirdparty card
+NEW: add constant  MAIN_PRODUCT_PERENTITY_SHARED                    to manage some informations (Accounting account) when product is shared on several entities
+NEW: add constant  MAIN_COMPANY_PERENTITY_SHARED                    to manage some informations (Accounting account) when company is shared on several entities
 
 
 For developers:
@@ -209,7 +213,7 @@ NEW: hook printFieldListTitle for cabyprodserv.php
 NEW: hook to allow external modules to add their own shortlist of recent objects
 NEW: SQL-altering hooks in the turnover by product report
 NEW: add form confirm hook on company card
-NEW: add hook addSectionECMAuto method to add custom diretory into ECM auto files
+NEW: add hook addSectionECMAuto method to add custom directory into ECM auto files
 
 
 WARNING:
@@ -224,7 +228,7 @@ Following changes may create regressions for some external modules, but were nec
 * If your database is PostgreSQL, you must use version 9.1.0 or more (Dolibarr need the SQL function CONCAT)
 * If your database is MySQL or MariaDB, you need at least version 5.1
 * Function set_price_level() has been renamed into setPriceLevel() to follow camelcase rules
-* removed deprecated subtituion key  __REFCLIENT__  (replaced with __REF_CLIENT__)
+* removed deprecated substitution key  __REFCLIENT__  (replaced with __REF_CLIENT__)
 * Removed constant MAIN_COUNTRIES_IN_EEC. You can now set if country is in Europe or not from the dictionary of countries.
 
 

From 84e5773de855909a6df12eb7015c59ef8210d514 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sun, 25 Jul 2021 22:37:20 +0200
Subject: [PATCH 1277/1497] FIX: Accountancy - Search date on journal

---
 htdocs/accountancy/bookkeeping/list.php | 32 ++++++++++++-------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index a70bb710937..e329a7979f4 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -366,42 +366,42 @@ if (empty($reshook)) {
 	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='.urlencode($tmp['mon']).'&date_creation_startday='.urlencode($tmp['mday']).'&date_creation_startyear='.urlencode($tmp['year']);
+		$param .= '&search_date_creation_startmonth='.urlencode($tmp['mon']).'&search_date_creation_startday='.urlencode($tmp['mday']).'&search_date_creation_startyear='.urlencode($tmp['year']);
 	}
 	if (!empty($search_date_creation_end)) {
 		$filter['t.date_creation<='] = $search_date_creation_end;
 		$tmp = dol_getdate($search_date_creation_end);
-		$param .= '&date_creation_endmonth='.urlencode($tmp['mon']).'&date_creation_endday='.urlencode($tmp['mday']).'&date_creation_endyear='.urlencode($tmp['year']);
+		$param .= '&search_date_creation_endmonth='.urlencode($tmp['mon']).'&search_date_creation_endday='.urlencode($tmp['mday']).'&search_date_creation_endyear='.urlencode($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='.urlencode($tmp['mon']).'&date_modification_startday='.urlencode($tmp['mday']).'&date_modification_startyear='.urlencode($tmp['year']);
+		$param .= '&search_date_modification_startmonth='.urlencode($tmp['mon']).'&search_date_modification_startday='.urlencode($tmp['mday']).'&search_date_modification_startyear='.urlencode($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='.urlencode($tmp['mon']).'&date_modification_endday='.urlencode($tmp['mday']).'&date_modification_endyear='.urlencode($tmp['year']);
+		$param .= '&search_date_modification_endmonth='.urlencode($tmp['mon']).'&search_date_modification_endday='.urlencode($tmp['mday']).'&search_date_modification_endyear='.urlencode($tmp['year']);
 	}
 	if (!empty($search_date_export_start)) {
 		$filter['t.date_export>='] = $search_date_export_start;
 		$tmp = dol_getdate($search_date_export_start);
-		$param .= '&date_export_startmonth='.urlencode($tmp['mon']).'&date_export_startday='.urlencode($tmp['mday']).'&date_export_startyear='.urlencode($tmp['year']);
+		$param .= '&search_date_export_startmonth='.urlencode($tmp['mon']).'&search_date_export_startday='.urlencode($tmp['mday']).'&search_date_export_startyear='.urlencode($tmp['year']);
 	}
 	if (!empty($search_date_export_end)) {
 		$filter['t.date_export<='] = $search_date_export_end;
 		$tmp = dol_getdate($search_date_export_end);
-		$param .= '&date_export_endmonth='.urlencode($tmp['mon']).'&date_export_endday='.urlencode($tmp['mday']).'&date_export_endyear='.urlencode($tmp['year']);
+		$param .= '&search_date_export_endmonth='.urlencode($tmp['mon']).'&search_date_export_endday='.urlencode($tmp['mday']).'&search_date_export_endyear='.urlencode($tmp['year']);
 	}
 	if (!empty($search_date_validation_start)) {
 		$filter['t.date_validated>='] = $search_date_validation_start;
 		$tmp = dol_getdate($search_date_validation_start);
-		$param .= '&date_validation_startmonth='.urlencode($tmp['mon']).'&date_validation_startday='.urlencode($tmp['mday']).'&date_validation_startyear='.urlencode($tmp['year']);
+		$param .= '&search_date_validation_startmonth='.urlencode($tmp['mon']).'&search_date_validation_startday='.urlencode($tmp['mday']).'&search_date_validation_startyear='.urlencode($tmp['year']);
 	}
 	if (!empty($search_date_validation_end)) {
 		$filter['t.date_validated<='] = $search_date_validation_end;
 		$tmp = dol_getdate($search_date_validation_end);
-		$param .= '&date_validation_endmonth='.urlencode($tmp['mon']).'&date_validation_endday='.urlencode($tmp['mday']).'&date_validation_endyear='.urlencode($tmp['year']);
+		$param .= '&search_date_validation_endmonth='.urlencode($tmp['mon']).'&search_date_validation_endday='.urlencode($tmp['mday']).'&search_date_validation_endyear='.urlencode($tmp['year']);
 	}
 	if (!empty($search_debit)) {
 		$filter['t.debit'] = $search_debit;
@@ -904,10 +904,10 @@ print $hookmanager->resPrint;
 if (!empty($arrayfields['t.date_creation']['checked'])) {
 	print '<td class="liste_titre center">';
 	print '<div class="nowrap">';
-	print $form->selectDate($search_date_creation_start, 'date_creation_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
+	print $form->selectDate($search_date_creation_start, 'search_date_creation_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
 	print '</div>';
 	print '<div class="nowrap">';
-	print $form->selectDate($search_date_creation_end, 'date_creation_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"));
+	print $form->selectDate($search_date_creation_end, 'search_date_creation_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"));
 	print '</div>';
 	print '</td>';
 }
@@ -915,10 +915,10 @@ if (!empty($arrayfields['t.date_creation']['checked'])) {
 if (!empty($arrayfields['t.tms']['checked'])) {
 	print '<td class="liste_titre center">';
 	print '<div class="nowrap">';
-	print $form->selectDate($search_date_modification_start, 'date_modification_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
+	print $form->selectDate($search_date_modification_start, 'search_date_modification_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
 	print '</div>';
 	print '<div class="nowrap">';
-	print $form->selectDate($search_date_modification_end, 'date_modification_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
+	print $form->selectDate($search_date_modification_end, 'search_date_modification_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
 	print '</div>';
 	print '</td>';
 }
@@ -926,10 +926,10 @@ if (!empty($arrayfields['t.tms']['checked'])) {
 if (!empty($arrayfields['t.date_export']['checked'])) {
 	print '<td class="liste_titre center">';
 	print '<div class="nowrap">';
-	print $form->selectDate($search_date_export_start, 'date_export_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
+	print $form->selectDate($search_date_export_start, 'search_date_export_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
 	print '</div>';
 	print '<div class="nowrap">';
-	print $form->selectDate($search_date_export_end, 'date_export_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"));
+	print $form->selectDate($search_date_export_end, 'search_date_export_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"));
 	print '</div>';
 	print '</td>';
 }
@@ -937,10 +937,10 @@ if (!empty($arrayfields['t.date_export']['checked'])) {
 if (!empty($arrayfields['t.date_validated']['checked'])) {
 	print '<td class="liste_titre center">';
 	print '<div class="nowrap">';
-	print $form->selectDate($search_date_validation_start, 'date_validation_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
+	print $form->selectDate($search_date_validation_start, 'search_date_validation_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
 	print '</div>';
 	print '<div class="nowrap">';
-	print $form->selectDate($search_date_validation_end, 'date_validation_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"));
+	print $form->selectDate($search_date_validation_end, 'search_date_validation_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"));
 	print '</div>';
 	print '</td>';
 }

From 505543e18e3d6ca331492c9d862fcdf7decb038a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 26 Jul 2021 00:37:47 +0200
Subject: [PATCH 1278/1497] Fix #yogosha6704

---
 htdocs/comm/action/list.php                  | 2 +-
 htdocs/core/class/html.formactions.class.php | 2 +-
 htdocs/core/lib/agenda.lib.php               | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index e95cc3366c5..9c587a934e2 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -47,7 +47,7 @@ $massaction = GETPOST('massaction', 'alpha');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'actioncommlist'; // To manage different context of search
 $resourceid = GETPOST("search_resourceid", "int") ?GETPOST("search_resourceid", "int") : GETPOST("resourceid", "int");
 $pid = GETPOST("search_projectid", 'int', 3) ?GETPOST("search_projectid", 'int', 3) : GETPOST("projectid", 'int', 3);
-$search_status = (GETPOST("search_status", 'alpha') != '') ?GETPOST("search_status", 'alpha') : GETPOST("status", 'alpha');
+$search_status = (GETPOST("search_status", 'aZ09') != '') ? GETPOST("search_status", 'aZ09') : GETPOST("status", 'aZ09');
 $type = GETPOST('search_type', 'alphanohtml') ?GETPOST('search_type', 'alphanohtml') : GETPOST('type', 'alphanohtml');
 $optioncss = GETPOST('optioncss', 'alpha');
 $year = GETPOST("year", 'int');
diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php
index 992efb79bbf..09c94485d11 100644
--- a/htdocs/core/class/html.formactions.class.php
+++ b/htdocs/core/class/html.formactions.class.php
@@ -97,7 +97,7 @@ class FormActions
                 function select_status() {
                     var defaultvalue = $('#select' + htmlname).val();
                     var percentage = $('input[name=percentage]');
-                    var selected = '".(isset($selected) ? $selected : '')."';
+                    var selected = '".(isset($selected) ? dol_escape_js($selected) : '')."';
                     var value = (selected>0?selected:(defaultvalue>=0?defaultvalue:''));
 
                     percentage.val(value);
diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php
index ae96f59d407..9796c49cf59 100644
--- a/htdocs/core/lib/agenda.lib.php
+++ b/htdocs/core/lib/agenda.lib.php
@@ -61,13 +61,13 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
 	// Filters
 	//print '<form name="listactionsfilter" class="listactionsfilter" action="' . $_SERVER["PHP_SELF"] . '" method="get">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
-	print '<input type="hidden" name="year" value="'.$year.'">';
-	print '<input type="hidden" name="month" value="'.$month.'">';
-	print '<input type="hidden" name="day" value="'.$day.'">';
+	print '<input type="hidden" name="year" value="'.((int) $year).'">';
+	print '<input type="hidden" name="month" value="'.((int) $month).'">';
+	print '<input type="hidden" name="day" value="'.((int) $day).'">';
 	if ($massaction != 'predelete' && $massaction != 'preaffecttag') {		// When $massaction == 'predelete', action may be already output to 'delete' by the mass action system.
 		print '<input type="hidden" name="action" value="'.$action.'">';
 	}
-	print '<input type="hidden" name="search_showbirthday" value="'.$showbirthday.'">';
+	print '<input type="hidden" name="search_showbirthday" value="'.((int) $showbirthday).'">';
 
 	if ($canedit) {
 		print '<div class="divsearchfield">';

From bbd84fd13ec2241348d31246125f286c364192d2 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 26 Jul 2021 04:08:05 +0200
Subject: [PATCH 1279/1497] FIX: Missing column Date validation in ledger &
 subledger

---
 .../accountancy/bookkeeping/listbyaccount.php | 56 ++++++++++++++++-
 .../bookkeeping/listbysubaccount.php          | 63 ++++++++++++++++---
 2 files changed, 108 insertions(+), 11 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index 98c3f14191b..c8364c35ee5 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2016       Neil Orley          <neil.orley@oeris.fr>
  * Copyright (C) 2013-2016  Olivier Geffroy     <jeff@jeffinfo.com>
  * Copyright (C) 2013-2020  Florian Henry       <florian.henry@open-concept.pro>
- * Copyright (C) 2013-2020  Alexandre Spangaro  <aspangaro@open-dsi.fr>
+ * Copyright (C) 2013-2021  Alexandre Spangaro  <aspangaro@open-dsi.fr>
  * Copyright (C) 2018       Frédéric France     <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -56,6 +56,14 @@ $search_date_export_endmonth =  GETPOST('search_date_export_endmonth', 'int');
 $search_date_export_endday =  GETPOST('search_date_export_endday', 'int');
 $search_date_export_start = dol_mktime(0, 0, 0, $search_date_export_startmonth, $search_date_export_startday, $search_date_export_startyear);
 $search_date_export_end = dol_mktime(23, 59, 59, $search_date_export_endmonth, $search_date_export_endday, $search_date_export_endyear);
+$search_date_validation_startyear =  GETPOST('search_date_validation_startyear', 'int');
+$search_date_validation_startmonth =  GETPOST('search_date_validation_startmonth', 'int');
+$search_date_validation_startday =  GETPOST('search_date_validation_startday', 'int');
+$search_date_validation_endyear =  GETPOST('search_date_validation_endyear', 'int');
+$search_date_validation_endmonth =  GETPOST('search_date_validation_endmonth', 'int');
+$search_date_validation_endday =  GETPOST('search_date_validation_endday', 'int');
+$search_date_validation_start = dol_mktime(0, 0, 0, $search_date_validation_startmonth, $search_date_validation_startday, $search_date_validation_startyear);
+$search_date_validation_end = dol_mktime(23, 59, 59, $search_date_validation_endmonth, $search_date_validation_endday, $search_date_validation_endyear);
 
 $search_accountancy_code = GETPOST("search_accountancy_code");
 $search_accountancy_code_start = GETPOST('search_accountancy_code_start', 'alpha');
@@ -81,7 +89,7 @@ if (GETPOST("button_delmvt_x") || GETPOST("button_delmvt.x") || GETPOST("button_
 }
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : (empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION) ? $conf->liste_limit : $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : (empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION) ? $conf->liste_limit : $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -144,6 +152,7 @@ $arrayfields = array(
 	't.credit'=>array('label'=>$langs->trans("Credit"), 'checked'=>1),
 	't.lettering_code'=>array('label'=>$langs->trans("LetteringCode"), 'checked'=>1),
 	't.date_export'=>array('label'=>$langs->trans("DateExport"), 'checked'=>1),
+	't.date_validated'=>array('label'=>$langs->trans("DateValidation"), 'checked'=>1),
 );
 
 if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING)) {
@@ -221,6 +230,14 @@ if (empty($reshook)) {
 		$search_date_export_endyear = '';
 		$search_date_export_endmonth = '';
 		$search_date_export_endday = '';
+		$search_date_validation_start = '';
+		$search_date_validation_end = '';
+		$search_date_validation_startyear = '';
+		$search_date_validation_startmonth = '';
+		$search_date_validation_startday = '';
+		$search_date_validation_endyear = '';
+		$search_date_validation_endmonth = '';
+		$search_date_validation_endday = '';
 		$search_debit = '';
 		$search_credit = '';
 		$search_lettering_code = '';
@@ -301,6 +318,14 @@ if (empty($reshook)) {
 		$filter['t.date_export<='] = $search_date_export_end;
 		$param .= '&search_date_export_endmonth='.$search_date_export_endmonth.'&search_date_export_endday='.$search_date_export_endday.'&search_date_export_endyear='.$search_date_export_endyear;
 	}
+	if (!empty($search_date_validation_start)) {
+		$filter['t.date_validated>='] = $search_date_validation_start;
+		$param .= '&search_date_validation_startmonth='.$search_date_validation_startmonth.'&search_date_validation_startday='.$search_date_validation_startday.'&search_date_validation_startyear='.$search_date_validation_startyear;
+	}
+	if (!empty($search_date_validation_end)) {
+		$filter['t.date_validated<='] = $search_date_validation_end;
+		$param .= '&search_date_validation_endmonth='.$search_date_validation_endmonth.'&search_date_validation_endday='.$search_date_validation_endday.'&search_date_validation_endyear='.$search_date_validation_endyear;
+	}
 }
 
 if ($action == 'delbookkeeping' && $user->rights->accounting->mouvements->supprimer) {
@@ -564,6 +589,17 @@ if (!empty($arrayfields['t.date_export']['checked'])) {
 	print '</div>';
 	print '</td>';
 }
+// Date validation
+if (!empty($arrayfields['t.date_validated']['checked'])) {
+	print '<td class="liste_titre center">';
+	print '<div class="nowrap">';
+	print $form->selectDate($search_date_validation_start, 'search_date_validation_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
+	print '</div>';
+	print '<div class="nowrap">';
+	print $form->selectDate($search_date_validation_end, 'search_date_validation_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"));
+	print '</div>';
+	print '</td>';
+}
 
 // Fields from hook
 $parameters = array('arrayfields'=>$arrayfields);
@@ -605,6 +641,9 @@ if (!empty($arrayfields['t.lettering_code']['checked'])) {
 if (!empty($arrayfields['t.date_export']['checked'])) {
 	print_liste_field_titre($arrayfields['t.date_export']['label'], $_SERVER['PHP_SELF'], "t.date_export", "", $param, '', $sortfield, $sortorder, 'center ');
 }
+if (!empty($arrayfields['t.date_validated']['checked'])) {
+	print_liste_field_titre($arrayfields['t.date_validated']['label'], $_SERVER['PHP_SELF'], "t.date_validated", "", $param, '', $sortfield, $sortorder, 'center ');
+}
 // Hook fields
 $parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
@@ -635,7 +674,7 @@ while ($i < min($num, $limit)) {
 	// Is it a break ?
 	if ($accountg != $displayed_account_number || !isset($displayed_account_number)) {
 		$colnumber = 5;
-		$colnumberend = 7;
+		$colnumberend = 8;
 
 		if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING) || empty($arrayfields['t.lettering_code']['checked'])) {
 			$colnumber--;
@@ -643,6 +682,9 @@ while ($i < min($num, $limit)) {
 		if (empty($arrayfields['t.date_export']['checked'])) {
 			$colnumber--;
 		}
+		if (empty($arrayfields['t.date_validated']['checked'])) {
+			$colnumber--;
+		}
 
 		$colspan = $totalarray['nbfield'] - $colnumber;
 		$colspanend = $totalarray['nbfield'] - $colnumberend;
@@ -845,6 +887,14 @@ while ($i < min($num, $limit)) {
 		}
 	}
 
+	// Validated operation date
+	if (!empty($arrayfields['t.date_validated']['checked'])) {
+		print '<td class="center">'.dol_print_date($line->date_validation, 'dayhour').'</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+	}
+
 	// Fields from hook
 	$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj);
 	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
diff --git a/htdocs/accountancy/bookkeeping/listbysubaccount.php b/htdocs/accountancy/bookkeeping/listbysubaccount.php
index 20899c693c6..d2e036b1f60 100644
--- a/htdocs/accountancy/bookkeeping/listbysubaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbysubaccount.php
@@ -2,8 +2,8 @@
 /* Copyright (C) 2016       Neil Orley          <neil.orley@oeris.fr>
  * Copyright (C) 2013-2016  Olivier Geffroy     <jeff@jeffinfo.com>
  * Copyright (C) 2013-2020  Florian Henry       <florian.henry@open-concept.pro>
- * Copyright (C) 2013-2020  Alexandre Spangaro  <aspangaro@open-dsi.fr>
- * Copyright (C) 2018-2020  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2013-2021  Alexandre Spangaro  <aspangaro@open-dsi.fr>
+ * Copyright (C) 2018-2020  Frédéric France		<frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -46,7 +46,7 @@ $search_date_endyear = GETPOST('search_date_endyear', 'int');
 $search_date_endmonth = GETPOST('search_date_endmonth', 'int');
 $search_date_endday = GETPOST('search_date_endday', 'int');
 $search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);
-$search_date_end = dol_mktime(0, 0, 0, $search_date_endmonth, $search_date_endday, $search_date_endyear);
+$search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
 $search_doc_date = dol_mktime(0, 0, 0, GETPOST('doc_datemonth', 'int'), GETPOST('doc_dateday', 'int'), GETPOST('doc_dateyear', 'int'));
 $search_date_export_startyear =  GETPOST('search_date_export_startyear', 'int');
 $search_date_export_startmonth =  GETPOST('search_date_export_startmonth', 'int');
@@ -55,7 +55,15 @@ $search_date_export_endyear =  GETPOST('search_date_export_endyear', 'int');
 $search_date_export_endmonth =  GETPOST('search_date_export_endmonth', 'int');
 $search_date_export_endday =  GETPOST('search_date_export_endday', 'int');
 $search_date_export_start = dol_mktime(0, 0, 0, $search_date_export_startmonth, $search_date_export_startday, $search_date_export_startyear);
-$search_date_export_end = dol_mktime(0, 0, 0, $search_date_export_endmonth, $search_date_export_endday, $search_date_export_endyear);
+$search_date_export_end = dol_mktime(23, 59, 59, $search_date_export_endmonth, $search_date_export_endday, $search_date_export_endyear);
+$search_date_validation_startyear =  GETPOST('search_date_validation_startyear', 'int');
+$search_date_validation_startmonth =  GETPOST('search_date_validation_startmonth', 'int');
+$search_date_validation_startday =  GETPOST('search_date_validation_startday', 'int');
+$search_date_validation_endyear =  GETPOST('search_date_validation_endyear', 'int');
+$search_date_validation_endmonth =  GETPOST('search_date_validation_endmonth', 'int');
+$search_date_validation_endday =  GETPOST('search_date_validation_endday', 'int');
+$search_date_validation_start = dol_mktime(0, 0, 0, $search_date_validation_startmonth, $search_date_validation_startday, $search_date_validation_startyear);
+$search_date_validation_end = dol_mktime(23, 59, 59, $search_date_validation_endmonth, $search_date_validation_endday, $search_date_validation_endyear);
 
 $search_accountancy_code = GETPOST("search_accountancy_code");
 $search_accountancy_code_start = GETPOST('search_accountancy_code_start', 'alpha');
@@ -144,6 +152,7 @@ $arrayfields = array(
 	't.credit'=>array('label'=>$langs->trans("Credit"), 'checked'=>1),
 	't.lettering_code'=>array('label'=>$langs->trans("LetteringCode"), 'checked'=>1),
 	't.date_export'=>array('label'=>$langs->trans("DateExport"), 'checked'=>1),
+	't.date_validated'=>array('label'=>$langs->trans("DateValidation"), 'checked'=>1),
 );
 
 if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING)) {
@@ -221,6 +230,14 @@ if (empty($reshook)) {
 		$search_date_export_endyear = '';
 		$search_date_export_endmonth = '';
 		$search_date_export_endday = '';
+		$search_date_validation_start = '';
+		$search_date_validation_end = '';
+		$search_date_validation_startyear = '';
+		$search_date_validation_startmonth = '';
+		$search_date_validation_startday = '';
+		$search_date_validation_endyear = '';
+		$search_date_validation_endmonth = '';
+		$search_date_validation_endday = '';
 		$search_debit = '';
 		$search_credit = '';
 		$search_lettering_code = '';
@@ -301,6 +318,14 @@ if (empty($reshook)) {
 		$filter['t.date_export<='] = $search_date_export_end;
 		$param .= '&search_date_export_endmonth='.$search_date_export_endmonth.'&search_date_export_endday='.$search_date_export_endday.'&search_date_export_endyear='.$search_date_export_endyear;
 	}
+	if (!empty($search_date_validation_start)) {
+		$filter['t.date_validated>='] = $search_date_validation_start;
+		$param .= '&search_date_validation_startmonth='.$search_date_validation_startmonth.'&search_date_validation_startday='.$search_date_validation_startday.'&search_date_validation_startyear='.$search_date_validation_startyear;
+	}
+	if (!empty($search_date_validation_end)) {
+		$filter['t.date_validated<='] = $search_date_validation_end;
+		$param .= '&search_date_validation_endmonth='.$search_date_validation_endmonth.'&search_date_validation_endday='.$search_date_validation_endday.'&search_date_validation_endyear='.$search_date_validation_endyear;
+	}
 }
 
 if ($action == 'delbookkeeping' && $user->rights->accounting->mouvements->supprimer) {
@@ -373,7 +398,6 @@ $title_page = $langs->trans("Operations").' - '.$langs->trans("VueByAccountAccou
 
 llxHeader('', $title_page);
 
-
 // List
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
@@ -448,7 +472,6 @@ print '<input type="hidden" name="formfilteraction" id="formfilteraction" value=
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 
-
 $parameters = array();
 $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 if (empty($reshook)) {
@@ -568,6 +591,17 @@ if (!empty($arrayfields['t.date_export']['checked'])) {
 	print '</div>';
 	print '</td>';
 }
+// Date validation
+if (!empty($arrayfields['t.date_validated']['checked'])) {
+	print '<td class="liste_titre center">';
+	print '<div class="nowrap">';
+	print $form->selectDate($search_date_validation_start, 'search_date_validation_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
+	print '</div>';
+	print '<div class="nowrap">';
+	print $form->selectDate($search_date_validation_end, 'search_date_validation_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"));
+	print '</div>';
+	print '</td>';
+}
 
 // Fields from hook
 $parameters = array('arrayfields'=>$arrayfields);
@@ -609,6 +643,9 @@ if (!empty($arrayfields['t.lettering_code']['checked'])) {
 if (!empty($arrayfields['t.date_export']['checked'])) {
 	print_liste_field_titre($arrayfields['t.date_export']['label'], $_SERVER['PHP_SELF'], "t.date_export", "", $param, '', $sortfield, $sortorder, 'center ');
 }
+if (!empty($arrayfields['t.date_validated']['checked'])) {
+	print_liste_field_titre($arrayfields['t.date_validated']['label'], $_SERVER['PHP_SELF'], "t.date_validated", "", $param, '', $sortfield, $sortorder, 'center ');
+}
 // Hook fields
 $parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
@@ -639,7 +676,7 @@ while ($i < min($num, $limit)) {
 	// Is it a break ?
 	if ($accountg != $displayed_account_number || !isset($displayed_account_number)) {
 		$colnumber = 5;
-		$colnumberend = 7;
+		$colnumberend = 8;
 
 		if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING) || empty($arrayfields['t.lettering_code']['checked'])) {
 			$colnumber--;
@@ -647,10 +684,12 @@ while ($i < min($num, $limit)) {
 		if (empty($arrayfields['t.date_export']['checked'])) {
 			$colnumber--;
 		}
+		if (empty($arrayfields['t.date_validated']['checked'])) {
+			$colnumber--;
+		}
 
 		$colspan = $totalarray['nbfield'] - $colnumber;
 		$colspanend = $totalarray['nbfield'] - $colnumberend;
-
 		// Show a subtotal by accounting account
 		if (isset($displayed_account_number)) {
 			print '<tr class="liste_total">';
@@ -859,6 +898,14 @@ while ($i < min($num, $limit)) {
 		}
 	}
 
+	// Validated operation date
+	if (!empty($arrayfields['t.date_validated']['checked'])) {
+		print '<td class="center">'.dol_print_date($line->date_validation, 'dayhour').'</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+	}
+
 	// Fields from hook
 	$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj);
 	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook

From 183d413b4529418a74920bb11f95077cf05f8750 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 26 Jul 2021 04:42:35 +0200
Subject: [PATCH 1280/1497] FIX: Accountancy - Rules to delete & modify
 transaction not applied in ledger & subledger

---
 htdocs/accountancy/bookkeeping/card.php             | 4 ++--
 htdocs/accountancy/bookkeeping/list.php             | 2 +-
 htdocs/accountancy/bookkeeping/listbyaccount.php    | 8 +++++---
 htdocs/accountancy/bookkeeping/listbysubaccount.php | 8 +++++---
 htdocs/accountancy/class/bookkeeping.class.php      | 1 +
 5 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index 4c7194b2255..3e74cd0c212 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -683,7 +683,7 @@ if ($action == 'create') {
 						print '<td class="right nowraponall amount">'.price($line->debit).'</td>';
 						print '<td class="right nowraponall amount">'.price($line->credit).'</td>';
 
-						if (empty($line->date_export) || empty($line->date_validation)) {
+						if (empty($line->date_export) && empty($line->date_validation)) {
 							print '<td class="center">';
 							print '<a class="editfielda reposition" href="' . $_SERVER["PHP_SELF"] . '?action=update&id=' . $line->id . '&piece_num=' . urlencode($line->piece_num) . '&mode=' . urlencode($mode) . '&token=' . urlencode(newToken()) . '">';
 							print img_edit('', 0, 'class="marginrightonly"');
@@ -713,7 +713,7 @@ if ($action == 'create') {
 					setEventMessages(null, array($langs->trans('MvtNotCorrectlyBalanced', $total_debit, $total_credit)), 'warnings');
 				}
 
-				if (empty($object->date_export) || empty($object->date_validation)) {
+				if (empty($object->date_export) && empty($object->date_validation)) {
 					if ($action == "" || $action == 'add') {
 						print '<tr class="oddeven">';
 						print '<!-- td columns in add mode -->';
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index a70bb710937..ebc91ae54c7 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -1243,7 +1243,7 @@ while ($i < min($num, $limit)) {
 
 	// Action column
 	print '<td class="nowraponall center">';
-	if (empty($line->date_export) || empty($line->date_validation)) {
+	if (empty($line->date_export) && empty($line->date_validation)) {
 		if ($user->rights->accounting->mouvements->creer) {
 			print '<a class="editfielda paddingleft marginrightonly" href="' . DOL_URL_ROOT . '/accountancy/bookkeeping/card.php?piece_num=' . $line->piece_num . $param . '&page=' . $page . ($sortfield ? '&sortfield=' . $sortfield : '') . ($sortorder ? '&sortorder=' . $sortorder : '') . '">' . img_edit() . '</a>';
 		}
diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index 98c3f14191b..63ecc2d420b 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -852,12 +852,14 @@ while ($i < min($num, $limit)) {
 
 	// Action column
 	print '<td class="nowraponall center">';
-	if (empty($line->date_export)) {
+	if (empty($line->date_export) && empty($line->date_validation)) {
 		if ($user->rights->accounting->mouvements->creer) {
-			print '<a class="editfielda" href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?piece_num='.$line->piece_num.$param.'&page='.$page.($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : '').'">'.img_edit().'</a>';
+			print '<a class="editfielda paddingleft marginrightonly" href="' . DOL_URL_ROOT . '/accountancy/bookkeeping/card.php?piece_num=' . $line->piece_num . $param . '&page=' . $page . ($sortfield ? '&sortfield=' . $sortfield : '') . ($sortorder ? '&sortorder=' . $sortorder : '') . '">' . img_edit() . '</a>';
 		}
+	}
+	if (empty($line->date_validation)) {
 		if ($user->rights->accounting->mouvements->supprimer) {
-			print ' &nbsp; <a class="paddingleft" href="'.$_SERVER['PHP_SELF'].'?action=delmouv&mvt_num='.$line->piece_num.$param.'&page='.$page.($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : '').'">'.img_delete().'</a>';
+			print '<a class="reposition paddingleft marginrightonly" href="'.$_SERVER['PHP_SELF'].'?action=delmouv&mvt_num='.$line->piece_num.$param.'&page='.$page.($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : '').'">'.img_delete().'</a>';
 		}
 	}
 	print '</td>';
diff --git a/htdocs/accountancy/bookkeeping/listbysubaccount.php b/htdocs/accountancy/bookkeeping/listbysubaccount.php
index 20899c693c6..434867112f9 100644
--- a/htdocs/accountancy/bookkeeping/listbysubaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbysubaccount.php
@@ -866,12 +866,14 @@ while ($i < min($num, $limit)) {
 
 	// Action column
 	print '<td class="nowraponall center">';
-	if (empty($line->date_export)) {
+	if (empty($line->date_export) && empty($line->date_validation)) {
 		if ($user->rights->accounting->mouvements->creer) {
-			print '<a class="editfielda" href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?piece_num='.$line->piece_num.$param.'&page='.$page.($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : '').'">'.img_edit().'</a>';
+			print '<a class="editfielda paddingleft marginrightonly" href="' . DOL_URL_ROOT . '/accountancy/bookkeeping/card.php?piece_num=' . $line->piece_num . $param . '&page=' . $page . ($sortfield ? '&sortfield=' . $sortfield : '') . ($sortorder ? '&sortorder=' . $sortorder : '') . '">' . img_edit() . '</a>';
 		}
+	}
+	if (empty($line->date_validation)) {
 		if ($user->rights->accounting->mouvements->supprimer) {
-			print ' &nbsp; <a class="paddingleft" href="'.$_SERVER['PHP_SELF'].'?action=delmouv&mvt_num='.$line->piece_num.$param.'&page='.$page.($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : '').'">'.img_delete().'</a>';
+			print '<a class="reposition paddingleft marginrightonly" href="'.$_SERVER['PHP_SELF'].'?action=delmouv&mvt_num='.$line->piece_num.$param.'&page='.$page.($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : '').'">'.img_delete().'</a>';
 		}
 	}
 	print '</td>';
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 6bd39f4e227..aeaa42154d8 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -1506,6 +1506,7 @@ class BookKeeping extends CommonObject
 		$sql = "DELETE";
 		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
 		$sql .= " WHERE piece_num = ".(int) $piecenum;
+		$sql .= " AND date_validated IS NULL";		// For security, exclusion of validated entries at the time of deletion
 		$sql .= " AND entity IN (".getEntity('accountancy').")";
 
 		$resql = $this->db->query($sql);

From 35862cebfa10256e29b70255048ad164e908d4a4 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 26 Jul 2021 04:49:56 +0200
Subject: [PATCH 1281/1497] Fix card presentation

---
 htdocs/accountancy/bookkeeping/card.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index 3e74cd0c212..c156a388735 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -637,6 +637,8 @@ if ($action == 'create') {
 				print_liste_field_titre("Credit", "", "", "", "", 'class="right"');
 				if (empty($object->date_validation)) {
 					print_liste_field_titre("Action", "", "", "", "", 'width="60" class="center"');
+				} else {
+					print_liste_field_titre("");
 				}
 
 				print "</tr>\n";
@@ -683,8 +685,8 @@ if ($action == 'create') {
 						print '<td class="right nowraponall amount">'.price($line->debit).'</td>';
 						print '<td class="right nowraponall amount">'.price($line->credit).'</td>';
 
+						print '<td class="center">';
 						if (empty($line->date_export) && empty($line->date_validation)) {
-							print '<td class="center">';
 							print '<a class="editfielda reposition" href="' . $_SERVER["PHP_SELF"] . '?action=update&id=' . $line->id . '&piece_num=' . urlencode($line->piece_num) . '&mode=' . urlencode($mode) . '&token=' . urlencode(newToken()) . '">';
 							print img_edit('', 0, 'class="marginrightonly"');
 							print '</a> &nbsp;';

From a7cef1aa1595a768353a6d7980f7437eaecd1f49 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Mon, 26 Jul 2021 10:20:11 +0200
Subject: [PATCH 1282/1497] FIX: cannot add time spend when column ref is not
 displayed

---
 htdocs/projet/tasks/time.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 3b2e36d34c6..2a4b1d6aeee 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -1374,7 +1374,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
         			print '</td>';
         			if (!$i) $totalarray['nbfield']++;
     			}
-            } else {
+            } elseif ($action !== 'createtime') {
             	print '<input type="hidden" name="taskid" value="'.$id.'">';
             }
 

From b5dde982d52c54e1b5a311c485ab2e2f41331239 Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Mon, 26 Jul 2021 10:32:51 +0200
Subject: [PATCH 1283/1497] Fix #18185 : for v13

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

diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 5dceee7751d..04ad5a32fcc 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -482,7 +482,7 @@ if ($search_type_thirdparty && $search_type_thirdparty != '-1') $sql .= natural_
 if (!empty($search_staff) && $search_staff != '-1')            $sql .= natural_search("s.fk_effectif", $search_staff, 2);
 if ($search_level)  $sql .= natural_search("s.fk_prospectlevel", join(',', $search_level), 3);
 if ($search_parent_name)   $sql .= natural_search("s2.nom", $search_parent_name);
-if ($search_stcomm != '' && $search_stcomm != -2) $sql .= natural_search("s.fk_stcomm", $search_stcomm, 2);
+if ($search_stcomm != '' && $search_stcomm != -2) $sql .= natural_search("s.fk_stcomm", $search_stcomm, 1);
 if ($search_import_key)    $sql .= natural_search("s.import_key", $search_import_key);
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';

From a08b63d5616ed86ea6c584d2e7eb034d64941a64 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Mon, 26 Jul 2021 14:29:42 +0200
Subject: [PATCH 1284/1497] Fix for php 8

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

diff --git a/htdocs/adherents/type_translation.php b/htdocs/adherents/type_translation.php
index 7435fc440ed..6c8f273ae77 100644
--- a/htdocs/adherents/type_translation.php
+++ b/htdocs/adherents/type_translation.php
@@ -157,7 +157,7 @@ $form = new Form($db);
 $formadmin = new FormAdmin($db);
 
 $head = member_type_prepare_head($object);
-$titre = $langs->trans("MemberType".$object->type);
+$titre = $langs->trans("MemberType".$object->id);
 
 // Calculate $cnt_trans
 $cnt_trans = 0;

From cfdcad0077950e85cad569a104e09e9bfb34bf4d Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Mon, 26 Jul 2021 14:30:38 +0200
Subject: [PATCH 1285/1497] Update type.php

---
 htdocs/adherents/type.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index 033592a9afc..526bb6cfa8a 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -43,6 +43,8 @@ $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
 
+$sall = GETPOST("filter", "alpha");
+$filter = GETPOST("sall", 'alpha');
 $search_lastname = GETPOST('search_lastname', 'alpha');
 $search_login = GETPOST('search_login', 'alpha');
 $search_email = GETPOST('search_email', 'alpha');

From a181469ff86beba460c9b64f5275562dae3c289b Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Mon, 26 Jul 2021 14:34:45 +0200
Subject: [PATCH 1286/1497] Update type.php

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

diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index 526bb6cfa8a..10560d38648 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -43,8 +43,8 @@ $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
 
-$sall = GETPOST("filter", "alpha");
-$filter = GETPOST("sall", 'alpha');
+$sall = GETPOST("sall", "alpha");
+$filter = GETPOST("filter", 'alpha');
 $search_lastname = GETPOST('search_lastname', 'alpha');
 $search_login = GETPOST('search_login', 'alpha');
 $search_email = GETPOST('search_email', 'alpha');

From d4434859391558b3d5955b6cc6e29967a35027fc Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Mon, 26 Jul 2021 14:52:24 +0200
Subject: [PATCH 1287/1497] Update extrafields_edit.tpl.php

---
 htdocs/core/tpl/extrafields_edit.tpl.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/tpl/extrafields_edit.tpl.php b/htdocs/core/tpl/extrafields_edit.tpl.php
index 5915fb8a633..573c81d8daa 100644
--- a/htdocs/core/tpl/extrafields_edit.tpl.php
+++ b/htdocs/core/tpl/extrafields_edit.tpl.php
@@ -43,7 +43,7 @@ $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object,
 print $hookmanager->resPrint;
 if (empty($reshook)) {
 	$params = array();
-	$params['cols'] = $parameters['colspanvalue'];
+	$params['cols'] =isset($parameters[ 'colspanvalue' ]) ? $parameters[ 'colspanvalue' ] : null;
 	print $object->showOptionals($extrafields, 'edit', $params);
 }
 

From 026e61f1eccc35b36e78a2ff94748c327f66c1f8 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Mon, 26 Jul 2021 14:53:06 +0200
Subject: [PATCH 1288/1497] Update extrafields_edit.tpl.php

---
 htdocs/core/tpl/extrafields_edit.tpl.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/tpl/extrafields_edit.tpl.php b/htdocs/core/tpl/extrafields_edit.tpl.php
index 573c81d8daa..4f35aa86bca 100644
--- a/htdocs/core/tpl/extrafields_edit.tpl.php
+++ b/htdocs/core/tpl/extrafields_edit.tpl.php
@@ -43,7 +43,7 @@ $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object,
 print $hookmanager->resPrint;
 if (empty($reshook)) {
 	$params = array();
-	$params['cols'] =isset($parameters[ 'colspanvalue' ]) ? $parameters[ 'colspanvalue' ] : null;
+	$params['cols'] =isset($parameters['colspanvalue']) ? $parameters['colspanvalue'] : null;
 	print $object->showOptionals($extrafields, 'edit', $params);
 }
 

From b0e2ef4a6ca30572e8d90c6117c2e1778b59da27 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Mon, 26 Jul 2021 14:53:18 +0200
Subject: [PATCH 1289/1497] Update extrafields_edit.tpl.php

---
 htdocs/core/tpl/extrafields_edit.tpl.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/tpl/extrafields_edit.tpl.php b/htdocs/core/tpl/extrafields_edit.tpl.php
index 4f35aa86bca..6d6b6aa8836 100644
--- a/htdocs/core/tpl/extrafields_edit.tpl.php
+++ b/htdocs/core/tpl/extrafields_edit.tpl.php
@@ -43,7 +43,7 @@ $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object,
 print $hookmanager->resPrint;
 if (empty($reshook)) {
 	$params = array();
-	$params['cols'] =isset($parameters['colspanvalue']) ? $parameters['colspanvalue'] : null;
+	$params['cols'] = isset($parameters['colspanvalue']) ? $parameters['colspanvalue'] : null;
 	print $object->showOptionals($extrafields, 'edit', $params);
 }
 

From 4fa72f7dfe733cbc746070f6c70cebb37d6eb7b6 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Mon, 26 Jul 2021 15:04:43 +0200
Subject: [PATCH 1290/1497] fix for php8

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

diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php
index f5a4392a0c0..cd7c1613857 100644
--- a/htdocs/societe/index.php
+++ b/htdocs/societe/index.php
@@ -250,7 +250,9 @@ if (!empty($conf->categorie->enabled) && !empty($conf->global->CATEGORY_GRAPHSTA
 	$thirdpartycateggraph .= '</td></tr>';
 	$thirdpartycateggraph .= '</table>';
 	$thirdpartycateggraph .= '</div>';
-}
+} else {
+$thirdpartycateggraph = '';
+}	
 
 
 /*

From 986dc9c8578680d65253564b5e3756833544709d Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Mon, 26 Jul 2021 13:06:42 +0000
Subject: [PATCH 1291/1497] Fixing style errors.

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

diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php
index cd7c1613857..e7d3ba09db8 100644
--- a/htdocs/societe/index.php
+++ b/htdocs/societe/index.php
@@ -251,8 +251,8 @@ if (!empty($conf->categorie->enabled) && !empty($conf->global->CATEGORY_GRAPHSTA
 	$thirdpartycateggraph .= '</table>';
 	$thirdpartycateggraph .= '</div>';
 } else {
-$thirdpartycateggraph = '';
-}	
+	$thirdpartycateggraph = '';
+}
 
 
 /*

From dc30052d3e9e18f6581a13baf5c6e3c81555aed1 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Mon, 26 Jul 2021 15:07:52 +0200
Subject: [PATCH 1292/1497] fix for php 8

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index a8879ad64f5..410dbd827fe 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -10204,7 +10204,7 @@ function newToken()
  */
 function currentToken()
 {
-	return $_SESSION['token'];
+	return isset($_SESSION['token']) ? $_SESSION['token'] : null;
 }
 
 /**

From 36ba5c6a71ee9c3e85a4c97fc77f57416272744a Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Mon, 26 Jul 2021 15:22:50 +0200
Subject: [PATCH 1293/1497] Fix for php8

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

diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index cd8a3817602..cf412223838 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -1473,7 +1473,7 @@ if (!$error && ($action == 'affecttag' && $confirm == 'yes') && $permissiontoadd
 $parameters['toselect'] = $toselect;
 $parameters['uploaddir'] = $uploaddir;
 $parameters['massaction'] = $massaction;
-$parameters['diroutputmassaction'] = $diroutputmassaction;
+$parameters['diroutputmassaction'] = isset($diroutputmassaction) ? $diroutputmassaction : null;
 
 $reshook = $hookmanager->executeHooks('doMassActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {

From f83f02e4e226330b43b72ca2816bc2bda3a36c0f Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Mon, 26 Jul 2021 15:24:58 +0200
Subject: [PATCH 1294/1497] Fix for php8

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

diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index d669270b565..f7c4d5e4d36 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -175,7 +175,7 @@ if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massa
 	$massaction = '';
 }
 
-$parameters = array('socid'=>$socid);
+$parameters = array('socid'=>isset($socid) ? $socid : null);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');

From 76f0bac703cdb843c07dab05d813a9b66083e74d Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Mon, 26 Jul 2021 15:29:46 +0200
Subject: [PATCH 1295/1497] Fix subscription list

---
 htdocs/adherents/subscription/list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php
index d3d84cb3624..5c422b4df89 100644
--- a/htdocs/adherents/subscription/list.php
+++ b/htdocs/adherents/subscription/list.php
@@ -496,7 +496,7 @@ while ($i < min($num, $limit)) {
 	$adherent->gender = $obj->gender;
 	$adherent->morphy = $obj->morphy;
 	$adherent->email = $obj->email;
-	$adherent->typeid = $obj->type;
+	$adherent->typeid = $obj->fk_type;
 	$adherent->datefin = $db->jdate($obj->datef);
 
 	$typeid = ($obj->fk_type > 0 ? $obj->fk_type : $adherent->typeid);

From 3cb56d3ec6b593062fdea14e686a6ffe1d1b06ef Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Mon, 26 Jul 2021 15:35:31 +0200
Subject: [PATCH 1296/1497] Fix for php8

---
 htdocs/core/tpl/massactions_pre.tpl.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/tpl/massactions_pre.tpl.php b/htdocs/core/tpl/massactions_pre.tpl.php
index 4b8680e11bb..f9c74dd7085 100644
--- a/htdocs/core/tpl/massactions_pre.tpl.php
+++ b/htdocs/core/tpl/massactions_pre.tpl.php
@@ -197,7 +197,7 @@ if ($massaction == 'presend') {
 // Allow Pre-Mass-Action hook (eg for confirmation dialog)
 $parameters = array(
 	'toselect' => $toselect,
-	'uploaddir' => $uploaddir
+	'uploaddir' => isset($uploaddir) ? $uploaddir : null
 );
 
 $reshook = $hookmanager->executeHooks('doPreMassActions', $parameters, $object, $action);

From 053d72c30693c31d93784d8ff66f301450f26cb1 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Mon, 26 Jul 2021 15:37:36 +0200
Subject: [PATCH 1297/1497] fix for php8

---
 htdocs/adherents/subscription/list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php
index d3d84cb3624..70b63e9d938 100644
--- a/htdocs/adherents/subscription/list.php
+++ b/htdocs/adherents/subscription/list.php
@@ -115,7 +115,7 @@ if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massa
 	$massaction = '';
 }
 
-$parameters = array('socid'=>$socid);
+$parameters = array('socid'=>isset($socid) ? $socid : null);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');

From 54c151916ddaca133200a593a9879aef7943f4d9 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Mon, 26 Jul 2021 15:42:43 +0200
Subject: [PATCH 1298/1497] Fix for php 8

---
 htdocs/core/menus/standard/eldy.lib.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index c192d5e6ac6..2f36290c8d4 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1732,11 +1732,11 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 
 				$titleboth = $langs->trans("LeadsOrProjects");
 				$titlenew = $langs->trans("NewLeadOrProject"); // Leads and opportunities by default
-				if ($conf->global->PROJECT_USE_OPPORTUNITIES == 0) {
+				if (isset($conf->global->PROJECT_USE_OPPORTUNITIES) && $conf->global->PROJECT_USE_OPPORTUNITIES == 0) {
 					$titleboth = $langs->trans("Projects");
 					$titlenew = $langs->trans("NewProject");
 				}
-				if ($conf->global->PROJECT_USE_OPPORTUNITIES == 2) {	// 2 = leads only
+				if (isset($conf->global->PROJECT_USE_OPPORTUNITIES) && $conf->global->PROJECT_USE_OPPORTUNITIES == 2) {	// 2 = leads only
 					$titleboth = $langs->trans("Leads");
 					$titlenew = $langs->trans("NewLead");
 				}
@@ -1745,13 +1745,13 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				$newmenu->add("/projet/index.php?leftmenu=projects".($search_project_user ? '&search_project_user='.$search_project_user : ''), $titleboth, 0, $user->rights->projet->lire, '', $mainmenu, 'projects', 0, '', '', '', img_picto('', 'project', 'class="pictofixedwidth"'));
 				$newmenu->add("/projet/card.php?leftmenu=projects&action=create".($search_project_user ? '&search_project_user='.$search_project_user : ''), $titlenew, 1, $user->rights->projet->creer);
 
-				if ($conf->global->PROJECT_USE_OPPORTUNITIES == 0) {
+				if (isset($conf->global->PROJECT_USE_OPPORTUNITIES) && $conf->global->PROJECT_USE_OPPORTUNITIES == 0) {
 					$newmenu->add("/projet/list.php?leftmenu=projets".($search_project_user ? '&search_project_user='.$search_project_user : '').'&search_status=99', $langs->trans("List"), 1, $showmode, '', 'project', 'list');
-				} elseif ($conf->global->PROJECT_USE_OPPORTUNITIES == 1) {
+				} elseif (isset($conf->global->PROJECT_USE_OPPORTUNITIES) && $conf->global->PROJECT_USE_OPPORTUNITIES == 1) {
 					$newmenu->add("/projet/list.php?leftmenu=projets".($search_project_user ? '&search_project_user='.$search_project_user : ''), $langs->trans("List"), 1, $showmode, '', 'project', 'list');
 					$newmenu->add('/projet/list.php?mainmenu=project&amp;leftmenu=list&search_usage_opportunity=1&search_status=99&search_opp_status=openedopp&contextpage=lead', $langs->trans("ListOpenLeads"), 2, $showmode);
 					$newmenu->add('/projet/list.php?mainmenu=project&amp;leftmenu=list&search_opp_status=notopenedopp&search_status=99&contextpage=project', $langs->trans("ListOpenProjects"), 2, $showmode);
-				} elseif ($conf->global->PROJECT_USE_OPPORTUNITIES == 2) {	// 2 = leads only
+				} elseif (isset($conf->global->PROJECT_USE_OPPORTUNITIES) && $conf->global->PROJECT_USE_OPPORTUNITIES == 2) {	// 2 = leads only
 					$newmenu->add('/projet/list.php?mainmenu=project&amp;leftmenu=list&search_usage_opportunity=1&search_status=99', $langs->trans("List"), 2, $showmode);
 				}
 

From a7f55f4778ebe778515edd7baeab2699d912b7f4 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Mon, 26 Jul 2021 15:43:57 +0200
Subject: [PATCH 1299/1497] fix: Expense report line, on update qty can be
 decimal

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

diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index e1e5fb34f2a..07d3e018390 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -2314,7 +2314,7 @@ if ($action == 'create')
 
 							// Quantity
 							print '<td class="right">';
-							print '<input type="number" min="0" class="right maxwidth50" name="qty" value="'.dol_escape_htmltag($line->qty).'" />';
+							print '<input type="text" min="0" class="right maxwidth50" name="qty" value="'.dol_escape_htmltag($line->qty).'" />';
 							print '</td>';
 
 							//print '<td class="right">'.$langs->trans('AmountHT').'</td>';

From a386cf5e89e00af31a868896fe8548bce3499380 Mon Sep 17 00:00:00 2001
From: Robin <yann.robin@batiactugroupe.com>
Date: Tue, 27 Jul 2021 09:09:42 +0200
Subject: [PATCH 1300/1497] add hook product stat

---
 htdocs/product/stats/card.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/product/stats/card.php b/htdocs/product/stats/card.php
index e899cee797f..de6b96332b6 100644
--- a/htdocs/product/stats/card.php
+++ b/htdocs/product/stats/card.php
@@ -58,6 +58,9 @@ $fieldvalue = (!empty($id) ? $id : $ref);
 $fieldtype = (!empty($ref) ? 'ref' : 'rowid');
 $result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
 
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('productstatscard', 'globalcard'));
+
 $tmp = dol_getdate(dol_now());
 $currentyear = $tmp['year'];
 if (empty($search_year)) $search_year = $currentyear;

From d2dc2bfde2568c9ce3853b3afd3d1b1d9e820b4e Mon Sep 17 00:00:00 2001
From: Robin <yann.robin@batiactugroupe.com>
Date: Tue, 27 Jul 2021 09:13:50 +0200
Subject: [PATCH 1301/1497] add hook product composition

---
 htdocs/product/composition/card.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/product/composition/card.php b/htdocs/product/composition/card.php
index 8459fa3e479..4bbcb7d6e27 100644
--- a/htdocs/product/composition/card.php
+++ b/htdocs/product/composition/card.php
@@ -50,6 +50,9 @@ $fieldvalue = (!empty($id) ? $id : (!empty($ref) ? $ref : ''));
 $fieldtype = (!empty($ref) ? 'ref' : 'rowid');
 $result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
 
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('productcompositioncard', 'globalcard'));
+
 $object = new Product($db);
 $objectid = 0;
 if ($id > 0 || !empty($ref))

From bc8be62809ef129ea41763d97f23bb5bdea4e75f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Tue, 27 Jul 2021 10:26:51 +0200
Subject: [PATCH 1302/1497] Update dolreceiptprinter.class.php

---
 htdocs/core/class/dolreceiptprinter.class.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/class/dolreceiptprinter.class.php b/htdocs/core/class/dolreceiptprinter.class.php
index 45c87401416..a3ddb3d7c7f 100644
--- a/htdocs/core/class/dolreceiptprinter.class.php
+++ b/htdocs/core/class/dolreceiptprinter.class.php
@@ -680,9 +680,7 @@ class dolReceiptPrinter extends Printer
 						foreach ($object->lines as $line) {
 							$total_localtax1 += $line->total_localtax1;
 						}
-						foreach ($vatarray as $vatkey => $vatvalue) {
-							$this->printer->text(str_pad(price($total_localtax1), 10, ' ', STR_PAD_LEFT)."\n");
-						}
+						$this->printer->text(str_pad(price($total_localtax1), 10, ' ', STR_PAD_LEFT)."\n");
 						break;
 					case 'DOL_PRINT_OBJECT_TAX2':
 						//var_dump($object);
@@ -690,9 +688,7 @@ class dolReceiptPrinter extends Printer
 						foreach ($object->lines as $line) {
 							$total_localtax2 += $line->total_localtax2;
 						}
-						foreach ($vatarray as $vatkey => $vatvalue) {
-							$this->printer->text(str_pad(price($total_localtax2), 10, ' ', STR_PAD_LEFT)."\n");
-						}
+						$this->printer->text(str_pad(price($total_localtax2), 10, ' ', STR_PAD_LEFT)."\n");
 						break;
 					case 'DOL_PRINT_OBJECT_TOTAL':
 						$title = $langs->trans('TotalHT');

From f4fd4d8e7d1b1e9549cbd3a882208f0dbca196d7 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Tue, 27 Jul 2021 12:09:04 +0200
Subject: [PATCH 1303/1497] new: ref fourn and ref customer same size as ref
 product

---
 htdocs/install/mysql/migration/14.0.0-15.0.0.sql            | 6 ++++--
 htdocs/install/mysql/tables/llx_product_customer_price.sql  | 2 +-
 .../install/mysql/tables/llx_product_fournisseur_price.sql  | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/htdocs/install/mysql/migration/14.0.0-15.0.0.sql b/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
index 95de2ab7ba6..8eaf1767b8a 100644
--- a/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
+++ b/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
@@ -33,7 +33,9 @@
 -- Missing in v14 or lower
 
 
-
-
 -- v15
 
+ALTER TABLE llx_product_fournisseur_price MODIFY COLUMN ref_fourn varchar(128);
+ALTER TABLE llx_product_customer_price MODIFY COLUMN ref_customer varchar(128);
+
+
diff --git a/htdocs/install/mysql/tables/llx_product_customer_price.sql b/htdocs/install/mysql/tables/llx_product_customer_price.sql
index f0d5edf9c2f..361a42a5b54 100644
--- a/htdocs/install/mysql/tables/llx_product_customer_price.sql
+++ b/htdocs/install/mysql/tables/llx_product_customer_price.sql
@@ -28,7 +28,7 @@ create table llx_product_customer_price
   tms					timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_product			integer NOT NULL,
   fk_soc				integer NOT NULL,
-  ref_customer			varchar(30),
+  ref_customer			varchar(128),
   price						double(24,8) DEFAULT 0,
   price_ttc					double(24,8) DEFAULT 0,
   price_min					double(24,8) DEFAULT 0,
diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
index 4e1d75dd1dd..2a01df30e4b 100644
--- a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
+++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
@@ -27,7 +27,7 @@ create table llx_product_fournisseur_price
   tms					timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_product			integer,
   fk_soc				integer,
-  ref_fourn				varchar(30),
+  ref_fourn				varchar(128),
   desc_fourn            text,
   fk_availability		integer,	   
   price					double(24,8) DEFAULT 0,		-- price without tax for quantity

From faf50a5aaaed98343a78d0320f95bf7652b661b2 Mon Sep 17 00:00:00 2001
From: Christian Foellmann <christian@foellmann.de>
Date: Tue, 27 Jul 2021 15:06:28 +0200
Subject: [PATCH 1304/1497] add agenda auto creation on supplier_order
 cancellation

---
 .../interface_50_modAgenda_ActionsAuto.class.php | 15 +++++++++++++++
 htdocs/fourn/commande/card.php                   | 16 ++++++++++++++--
 htdocs/install/mysql/migration/14.0.0-15.0.0.sql |  2 ++
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
index 8e23c258d88..8e6f34383b4 100644
--- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
@@ -556,6 +556,21 @@ class InterfaceActionsAuto extends DolibarrTriggers
 				$object->actionmsg .= $langs->trans("Reason") . ': '.$object->refuse_note;
 			}
 
+			$object->sendtoid = 0;
+		} elseif ($action == 'ORDER_SUPPLIER_CANCEL') {
+			// Load translation files required by the page
+			$langs->loadLangs(array("agenda", "other", "orders", "main"));
+
+			if (empty($object->actionmsg2)) {
+				$object->actionmsg2 = $langs->transnoentities("OrderCanceledInDolibarr", $object->ref);
+			}
+			$object->actionmsg = $langs->transnoentities("OrderCanceledInDolibarr", $object->ref);
+
+			if (!empty($object->cancel_note)) {
+				$object->actionmsg .= '<br>';
+				$object->actionmsg .= $langs->trans("Reason") . ': '.$object->cancel_note;
+			}
+
 			$object->sendtoid = 0;
 		} elseif ($action == 'ORDER_SUPPLIER_SUBMIT') {
 			// Load translation files required by the page
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index cc0f67e4b4e..ed379b2783a 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -1089,6 +1089,9 @@ if (empty($reshook)) {
 	}
 
 	if ($action == 'confirm_cancel' && $confirm == 'yes' && $usercanorder) {
+		if (GETPOST('cancel_note')) {
+			$object->cancel_note = GETPOST('cancel_note');
+		}
 		$result = $object->cancel($user);
 		if ($result > 0) {
 			header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
@@ -1903,9 +1906,18 @@ if ($action == 'create') {
 		$formconfirm  = $form->formconfirm($_SERVER['PHP_SELF']."?id=$object->id", $langs->trans("DenyingThisOrder"), $langs->trans("ConfirmDenyingThisOrder", $object->ref), "confirm_refuse", $formquestion, 0, 1);
 	}
 
-	// Confirmation de l'annulation
+	// Confirmation of cancellation
 	if ($action == 'cancel') {
-		$formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=$object->id", $langs->trans("Cancel"), $langs->trans("ConfirmCancelThisOrder", $object->ref), "confirm_cancel", '', 0, 1);
+		$formquestion = array(
+			array(
+				'type' => 'text',
+				'name' => 'cancel_note',
+				'label' => $langs->trans("Reason"),
+				'value' => '',
+				'morecss' => 'minwidth300'
+			)
+		);
+		$formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=$object->id", $langs->trans("Cancel"), $langs->trans("ConfirmCancelThisOrder", $object->ref), "confirm_cancel", $formquestion, 0, 1);
 	}
 
 	// Confirmation de l'envoi de la commande
diff --git a/htdocs/install/mysql/migration/14.0.0-15.0.0.sql b/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
index 95de2ab7ba6..e319c6116f0 100644
--- a/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
+++ b/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
@@ -36,4 +36,6 @@
 
 
 -- v15
+-- add action trigger
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) VALUES ('ORDER_SUPPLIER_CANCEL','Supplier order request canceled','Executed when a supplier order is canceled','order_supplier',13);
 

From 8b118670c38316c89319691b4a7ba89b4913aaf7 Mon Sep 17 00:00:00 2001
From: Christian Foellmann <christian@foellmann.de>
Date: Tue, 27 Jul 2021 15:11:13 +0200
Subject: [PATCH 1305/1497] fix agenda item refuse

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

diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index ed379b2783a..b43447529b5 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -1892,13 +1892,13 @@ if ($action == 'create') {
 		$formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=".$object->id, $langs->trans("ApproveThisOrder"), $text, "confirm_".$action, $formquestion, 1, 1, 240);
 	}
 
-	// Confirmation de la desapprobation
+	// Confirmation of disapproval
 	if ($action == 'refuse') {
 		$formquestion = array(
 			array(
 				'type' => 'text',
 				'name' => 'refuse_note',
-				'label' => $langs->trans("MotifCP"),
+				'label' => $langs->trans("Reason"),
 				'value' => '',
 				'morecss' => 'minwidth300'
 			)

From cefbcf03f6a43eef6ae58e142bacfe34599c425f Mon Sep 17 00:00:00 2001
From: Christian Foellmann <christian@foellmann.de>
Date: Tue, 27 Jul 2021 16:18:06 +0200
Subject: [PATCH 1306/1497] fix cancel on makeorder (supplier_order)

---
 htdocs/fourn/commande/card.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index cc0f67e4b4e..d5d704c4573 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -983,7 +983,9 @@ if (empty($reshook)) {
 	if ($action == 'commande') {
 		$methodecommande = GETPOST('methodecommande', 'int');
 
-		if ($methodecommande <= 0) {
+		if ($cancel) {
+			$action = '';
+		} elseif ($methodecommande <= 0) {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("OrderMode")), null, 'errors');
 			$action = 'makeorder';
 		}

From d9529f260052b8d159d936bdb8d5ba6c3df38957 Mon Sep 17 00:00:00 2001
From: Christian Foellmann <christian@foellmann.de>
Date: Tue, 27 Jul 2021 16:37:34 +0200
Subject: [PATCH 1307/1497] save makeorder comment to agenda item

---
 .../triggers/interface_50_modAgenda_ActionsAuto.class.php    | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
index 8e23c258d88..fcc51c21df9 100644
--- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
@@ -566,6 +566,11 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			}
 			$object->actionmsg = $langs->transnoentities("SupplierOrderSubmitedInDolibarr", ($object->newref ? $object->newref : $object->ref));
 
+			if (!empty($object->context['comments'])) {
+				$object->actionmsg .= '<br>';
+				$object->actionmsg .= $langs->trans("Comment") . ': '.$object->context['comments'];
+			}
+
 			$object->sendtoid = 0;
 		} elseif ($action == 'ORDER_SUPPLIER_RECEIVE') {
 			// Load translation files required by the page

From 51cfeddaaf0902887e7aae39a086a9e29df85ba2 Mon Sep 17 00:00:00 2001
From: Christian Foellmann <christian@foellmann.de>
Date: Tue, 27 Jul 2021 16:51:14 +0200
Subject: [PATCH 1308/1497] add cancel button to `classifyreception` form on
 supplier_orders

---
 htdocs/fourn/commande/card.php | 50 ++++++++++++++++++++--------------
 1 file changed, 29 insertions(+), 21 deletions(-)

diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index cc0f67e4b4e..d39c90b56da 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -1059,32 +1059,36 @@ if (empty($reshook)) {
 
 	// Set status of reception (complete, partial, ...)
 	if ($action == 'livraison' && $usercanreceived) {
-		$db->begin();
+		if ($cancel) {
+			$action = '';
+		} else {
+			$db->begin();
 
-		if (GETPOST("type") != '') {
-			$date_liv = dol_mktime(GETPOST('rehour'), GETPOST('remin'), GETPOST('resec'), GETPOST("remonth"), GETPOST("reday"), GETPOST("reyear"));
+			if (GETPOST("type") != '') {
+				$date_liv = dol_mktime(GETPOST('rehour'), GETPOST('remin'), GETPOST('resec'), GETPOST("remonth"), GETPOST("reday"), GETPOST("reyear"));
 
-			$result = $object->Livraison($user, $date_liv, GETPOST("type"), GETPOST("comment")); // GETPOST("type") is 'tot', 'par', 'nev', 'can'
-			if ($result > 0) {
-				$langs->load("deliveries");
-				setEventMessages($langs->trans("DeliveryStateSaved"), null);
-				$action = '';
-			} elseif ($result == -3) {
-				$error++;
-				setEventMessages($object->error, $object->errors, 'errors');
+				$result = $object->Livraison($user, $date_liv, GETPOST("type"), GETPOST("comment")); // GETPOST("type") is 'tot', 'par', 'nev', 'can'
+				if ($result > 0) {
+					$langs->load("deliveries");
+					setEventMessages($langs->trans("DeliveryStateSaved"), null);
+					$action = '';
+				} elseif ($result == -3) {
+					$error++;
+					setEventMessages($object->error, $object->errors, 'errors');
+				} else {
+					$error++;
+					setEventMessages($object->error, $object->errors, 'errors');
+				}
 			} else {
 				$error++;
-				setEventMessages($object->error, $object->errors, 'errors');
+				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Delivery")), null, 'errors');
 			}
-		} else {
-			$error++;
-			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Delivery")), null, 'errors');
-		}
 
-		if (!$error) {
-			$db->commit();
-		} else {
-			$db->rollback();
+			if (!$error) {
+				$db->commit();
+			} else {
+				$db->rollback();
+			}
 		}
 	}
 
@@ -2640,7 +2644,11 @@ if ($action == 'create') {
 
 					print '</td></tr>';
 					print '<tr><td>'.$langs->trans("Comment").'</td><td><input size="40" type="text" name="comment"></td></tr>';
-					print '<tr><td class="center" colspan="2"><input type="submit" class="button" value="'.$langs->trans("Receive").'"></td></tr>';
+					print '<tr><td class="center" colspan="2">';
+					print '<input type="submit" name="receive" class="button" value="'.$langs->trans("Receive").'">';
+					print ' &nbsp; &nbsp; ';
+					print '<input type="submit" name="cancel" class="button button-cancel" value="'.$langs->trans("Cancel").'">';
+					print '</td></tr>';
 					print "</table>\n";
 					print "</form>\n";
 					print "<br>";

From 6038ef6bba40059787a8af84faba3dc67e021ef6 Mon Sep 17 00:00:00 2001
From: Lenin Rivas <53640168+leninrivas@users.noreply.github.com>
Date: Tue, 27 Jul 2021 12:28:18 -0500
Subject: [PATCH 1309/1497] Add filter select company

Add filter with name alias and tva intra
---
 htdocs/core/class/html.form.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 178404da973..9ef0f3ee235 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1332,7 +1332,7 @@ class Form
 		}
 
 		// We search companies
-		$sql = "SELECT s.rowid, s.nom as name, s.name_alias, s.client, s.fournisseur, s.code_client, s.code_fournisseur";
+		$sql = "SELECT s.rowid, s.nom as name, s.name_alias, s.tva_intra, s.client, s.fournisseur, s.code_client, s.code_fournisseur";
 		if (!empty($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST)) {
 			$sql .= ", s.address, s.zip, s.town";
 			$sql .= ", dictp.code as country_code";
@@ -1384,6 +1384,7 @@ class Form
 				$sql .= " OR s.barcode LIKE '".$this->db->escape($prefix.$filterkey)."%'";
 			}
 			$sql .= " OR s.code_client LIKE '".$this->db->escape($prefix.$filterkey)."%' OR s.code_fournisseur LIKE '".$this->db->escape($prefix.$filterkey)."%'";
+			$sql .= " OR s.name_alias LIKE '".$this->db->escape($prefix.$filterkey)."%' OR s.tva_intra LIKE '".$this->db->escape($prefix.$filterkey)."%'";
 			$sql .= ")";
 		}
 		$sql .= $this->db->order("nom", "ASC");

From 3e3751e16185c30b73ea20fc012813a524954a14 Mon Sep 17 00:00:00 2001
From: ksar <35605507+ksar-ksar@users.noreply.github.com>
Date: Tue, 27 Jul 2021 22:13:19 +0200
Subject: [PATCH 1310/1497] Add url field

#18212
---
 htdocs/install/mysql/tables/llx_adherent.sql | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/install/mysql/tables/llx_adherent.sql b/htdocs/install/mysql/tables/llx_adherent.sql
index 787a2b15bd7..1d3a784dd74 100644
--- a/htdocs/install/mysql/tables/llx_adherent.sql
+++ b/htdocs/install/mysql/tables/llx_adherent.sql
@@ -48,6 +48,7 @@ create table llx_adherent
   state_id         integer,
   country          integer,
   email            varchar(255),
+  url              varchar(255) NULL,
 
   socialnetworks   text DEFAULT NULL,           -- json with socialnetworks
   skype            varchar(255),                -- deprecated

From 42252abc07fb7a73050af8cc14205bbd96150e79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 28 Jul 2021 10:14:57 +0200
Subject: [PATCH 1311/1497] remove debug

---
 htdocs/accountancy/admin/index.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/accountancy/admin/index.php b/htdocs/accountancy/admin/index.php
index 5f40022518b..9bb9fe3220c 100644
--- a/htdocs/accountancy/admin/index.php
+++ b/htdocs/accountancy/admin/index.php
@@ -93,7 +93,6 @@ if ($action == 'update') {
 		foreach ($list as $constname)
 		{
 			$constvalue = GETPOST($constname, 'alpha');
-			var_dump($constname);
 			if (!dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
 				$error++;
 			}

From 67cc58079763f6792673b70868ee5e3041199883 Mon Sep 17 00:00:00 2001
From: Ferran Marcet <fmarcet@2byte.es>
Date: Wed, 28 Jul 2021 10:45:47 +0200
Subject: [PATCH 1312/1497] Fix: Bad rights on inventory module

---
 htdocs/core/modules/modStock.class.php | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/htdocs/core/modules/modStock.class.php b/htdocs/core/modules/modStock.class.php
index c9379fb25d6..3494cb684dc 100644
--- a/htdocs/core/modules/modStock.class.php
+++ b/htdocs/core/modules/modStock.class.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2012	   Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2021	   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
@@ -148,19 +149,19 @@ class modStock extends DolibarrModules
 		$this->rights[4][4] = 'mouvement';
 		$this->rights[4][5] = 'creer';
 
+		$this->rights[5][0] = 1011;
+		$this->rights[5][1] = 'inventoryReadPermission'; // Permission label
+		$this->rights[5][3] = 0; // Permission by default for new user (0/1)
+		$this->rights[5][4] = 'inventory_advance'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$this->rights[5][5] = 'read'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+
+		$this->rights[6][0] = 1012;
+		$this->rights[6][1] = 'inventoryCreatePermission'; // Permission label
+		$this->rights[6][3] = 0; // Permission by default for new user (0/1)
+		$this->rights[6][4] = 'inventory_advance'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$this->rights[6][5] = 'write'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+
 		if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
-			$this->rights[5][0] = 1011;
-			$this->rights[5][1] = 'inventoryReadPermission'; // Permission label
-			$this->rights[5][3] = 0; // Permission by default for new user (0/1)
-			$this->rights[5][4] = 'inventory_advance'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-			$this->rights[5][5] = 'read'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-
-			$this->rights[6][0] = 1012;
-			$this->rights[6][1] = 'inventoryCreatePermission'; // Permission label
-			$this->rights[6][3] = 0; // Permission by default for new user (0/1)
-			$this->rights[6][4] = 'inventory_advance'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-			$this->rights[6][5] = 'write'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-
 			$this->rights[8][0] = 1014;
 			$this->rights[8][1] = 'inventoryValidatePermission'; // Permission label
 			$this->rights[8][3] = 0; // Permission by default for new user (0/1)

From 0cd8527c3523672383172d41f94d45ba0fca4468 Mon Sep 17 00:00:00 2001
From: Christian Foellmann <christian@foellmann.de>
Date: Wed, 28 Jul 2021 11:01:38 +0200
Subject: [PATCH 1313/1497] longer field for project ref on create and edit

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

diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 3c2d5b02829..ec1a0fee47c 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -511,7 +511,7 @@ if ($action == 'create' && $user->rights->projet->creer) {
 
 	// Ref
 	$suggestedref = (GETPOST("ref") ? GETPOST("ref") : $defaultref);
-	print '<tr><td class="titlefieldcreate"><span class="fieldrequired">'.$langs->trans("Ref").'</span></td><td><input size="12" type="text" name="ref" value="'.dol_escape_htmltag($suggestedref).'">';
+	print '<tr><td class="titlefieldcreate"><span class="fieldrequired">'.$langs->trans("Ref").'</span></td><td><input size="25" type="text" name="ref" value="'.dol_escape_htmltag($suggestedref).'">';
 	print ' '.$form->textwithpicto('', $langs->trans("YouCanCompleteRef", $suggestedref));
 	print '</td></tr>';
 
@@ -796,7 +796,7 @@ if ($action == 'create' && $user->rights->projet->creer) {
 		// Ref
 		$suggestedref = $object->ref;
 		print '<tr><td class="titlefield fieldrequired">'.$langs->trans("Ref").'</td>';
-		print '<td><input size="12" name="ref" value="'.$suggestedref.'">';
+		print '<td><input size="25" name="ref" value="'.$suggestedref.'">';
 		print ' '.$form->textwithpicto('', $langs->trans("YouCanCompleteRef", $suggestedref));
 		print '</td></tr>';
 

From 84d221988f777bced8372e3f486d6217e79658d8 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Wed, 28 Jul 2021 11:17:07 +0200
Subject: [PATCH 1314/1497] fix: add hook addMoreActionButton product price

---
 htdocs/product/price.php | 45 +++++++++++++++++++++++-----------------
 1 file changed, 26 insertions(+), 19 deletions(-)

diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index aad0311502d..bb46839e588 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -1108,34 +1108,41 @@ print dol_get_fiche_end();
 /*
  * Action bar
  */
+
+
 if (!$action || $action == 'delete' || $action == 'showlog_customer_price' || $action == 'showlog_default_price' || $action == 'add_customer_price'
 	|| $action == 'activate_price_by_qty' || $action == 'disable_price_by_qty') {
 	print "\n".'<div class="tabsAction">'."\n";
 
-	if ($object->isVariant()) {
-		if ($user->rights->produit->creer || $user->rights->service->creer) {
-			print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NoEditVariants")).'">'.$langs->trans("UpdateDefaultPrice").'</a></div>';
-		}
-	} else {
-		if (empty($conf->global->PRODUIT_MULTIPRICES) && empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
-			if ($user->rights->produit->creer || $user->rights->service->creer) {
-				print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit_price&amp;id='.$object->id.'">'.$langs->trans("UpdateDefaultPrice").'</a></div>';
-			}
-		}
 
-		if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
+	if (empty($reshook)) {
+		if ($object->isVariant()) {
 			if ($user->rights->produit->creer || $user->rights->service->creer) {
-				print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=add_customer_price&amp;id='.$object->id.'">'.$langs->trans("AddCustomerPrice").'</a></div>';
+				print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="' . dol_escape_htmltag($langs->trans("NoEditVariants")) . '">' . $langs->trans("UpdateDefaultPrice") . '</a></div>';
 			}
-		}
-
-		if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
-			if ($user->rights->produit->creer || $user->rights->service->creer) {
-				print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit_vat&amp;id='.$object->id.'">'.$langs->trans("UpdateVAT").'</a></div>';
+		} else {
+			if (empty($conf->global->PRODUIT_MULTIPRICES) && empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
+				if ($user->rights->produit->creer || $user->rights->service->creer) {
+					print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?action=edit_price&amp;id=' . $object->id . '">' . $langs->trans("UpdateDefaultPrice") . '</a></div>';
+				}
 			}
 
-			if ($user->rights->produit->creer || $user->rights->service->creer) {
-				print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit_price&amp;id='.$object->id.'">'.$langs->trans("UpdateLevelPrices").'</a></div>';
+			if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
+				if ($user->rights->produit->creer || $user->rights->service->creer) {
+					print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?action=add_customer_price&amp;id=' . $object->id . '">' . $langs->trans("AddCustomerPrice") . '</a></div>';
+				}
+			}
+
+			if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
+				if ($user->rights->produit->creer || $user->rights->service->creer) {
+					print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?action=edit_vat&amp;id=' . $object->id . '">' . $langs->trans("UpdateVAT") . '</a></div>';
+				}
+
+				if ($user->rights->produit->creer || $user->rights->service->creer) {
+					print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?action=edit_price&amp;id=' . $object->id . '">' . $langs->trans("UpdateLevelPrices") . '</a></div>';
+				}
 			}
 		}
 	}

From 2980cd9ab2e9cf1e2fa68b78fdf22ea5784d340d Mon Sep 17 00:00:00 2001
From: Ferran Marcet <fmarcet@2byte.es>
Date: Wed, 28 Jul 2021 11:19:21 +0200
Subject: [PATCH 1315/1497] Fix: Price level on company list not filtering

---
 htdocs/societe/list.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 5935ac43b70..85da1594179 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -94,7 +94,7 @@ $search_categ_cus = trim(GETPOST("search_categ_cus", 'int'));
 $search_categ_sup = trim(GETPOST("search_categ_sup", 'int'));
 $search_country = GETPOST("search_country", 'intcomma');
 $search_type_thirdparty = GETPOST("search_type_thirdparty", 'int');
-$search_price_level = GETPOST('search_prive_level', 'int');
+$search_price_level = GETPOST('search_price_level', 'int');
 $search_staff = GETPOST("search_staff", 'int');
 $search_status = GETPOST("search_status", 'int');
 $search_type = GETPOST('search_type', 'alpha');
@@ -356,7 +356,7 @@ if (empty($reshook)) {
 		$search_idprof6 = '';
 		$search_vat = '';
 		$search_type = '';
-		$search_prive_level = '';
+		$search_price_level = '';
 		$search_type_thirdparty = '';
 		$search_staff = '';
 		$search_status = -1;
@@ -639,8 +639,8 @@ if ($search_status != '' && $search_status >= 0) {
 if (!empty($conf->barcode->enabled) && $search_barcode) {
 	$sql .= natural_search("s.barcode", $search_barcode);
 }
-if ($search_prive_level && $search_prive_level != '-1') {
-	$sql .= natural_search("s.price_level", $search_prive_level, 2);
+if ($search_price_level && $search_price_level != '-1') {
+	$sql .= natural_search("s.price_level", $search_price_level, 2);
 }
 if ($search_type_thirdparty && $search_type_thirdparty > 0) {
 	$sql .= natural_search("s.fk_typent", $search_type_thirdparty, 2);
@@ -813,8 +813,8 @@ if ($search_idprof6 != '') {
 if ($search_vat != '') {
 	$param .= '&search_vat='.urlencode($search_vat);
 }
-if ($search_prive_level != '') {
-	$param .= '&search_prive_level='.urlencode($search_prive_level);
+if ($search_price_level != '') {
+	$param .= '&search_price_level='.urlencode($search_price_level);
 }
 if ($search_type_thirdparty != '' && $search_type_thirdparty > 0) {
 	$param .= '&search_type_thirdparty='.urlencode($search_type_thirdparty);
@@ -1094,7 +1094,7 @@ if (!empty($arrayfields['typent.code']['checked'])) {
 // Multiprice level
 if (!empty($arrayfields['s.price_level']['checked'])) {
 	print '<td class="liste_titre">';
-	print '<input class="flat searchstring maxwidth50imp" type="text" name="search_prive_level" value="'.dol_escape_htmltag($search_prive_level).'">';
+	print '<input class="flat searchstring maxwidth50imp" type="text" name="search_price_level" value="'.dol_escape_htmltag($search_price_level).'">';
 	print '</td>';
 }
 // Staff

From aae64eee1e1dda07a69f7efb6aa5f0ca74c37971 Mon Sep 17 00:00:00 2001
From: Ferran Marcet <fmarcet@2byte.es>
Date: Wed, 28 Jul 2021 11:48:38 +0200
Subject: [PATCH 1316/1497] Fix: Not correct redirect link on lots

---
 htdocs/product/stock/productlot_list.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/product/stock/productlot_list.php b/htdocs/product/stock/productlot_list.php
index 58e5bd055f1..78a18ca960b 100644
--- a/htdocs/product/stock/productlot_list.php
+++ b/htdocs/product/stock/productlot_list.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2007-2016  Laurent Destailleur     <eldy@users.sourceforge.net>
- * Copyright (C) 2018       Ferran Marcet           <fmarcet@2byte.es>
+ * Copyright (C) 2018-2021  Ferran Marcet           <fmarcet@2byte.es>
  * Copyright (C) 2019       Frédéric France         <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -299,7 +299,7 @@ if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit
 if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all && !$page) {
 	$obj = $db->fetch_object($resql);
 	$id = $obj->rowid;
-	header("Location: ".dol_buildpath('/mymodule/myobject_card.php', 1).'?id='.$id);
+	header("Location: ".DOL_URL_ROOT.'/product/stock/productlot_card.php?id='.$id);
 	exit;
 }
 

From 712f0b897d66047a3d5d37f90d1ab15896f77129 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Wed, 28 Jul 2021 12:02:45 +0200
Subject: [PATCH 1317/1497] FIX: Accountancy - Debug Export Sage50 / CIEL
 Compta / CIEL Compta Evo (Format XIMPORT)

---
 .../class/accountancyexport.class.php         | 35 ++++++++++++-------
 htdocs/accountancy/tpl/export_journal.tpl.php |  6 ++--
 htdocs/langs/en_US/accountancy.lang           |  2 +-
 3 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index 6ef54ea3029..aa3e24ab545 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2015       Florian Henry       <florian.henry@open-concept.pro>
  * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2016       Pierre-Henry Favre  <phf@atm-consulting.fr>
- * Copyright (C) 2016-2020  Alexandre Spangaro  <aspangaro@open-dsi.fr>
+ * Copyright (C) 2016-2021  Alexandre Spangaro  <aspangaro@open-dsi.fr>
  * Copyright (C) 2013-2017  Olivier Geffroy     <jeff@jeffinfo.com>
  * Copyright (C) 2017       Elarifr. Ari Elbaz  <github@accedinfo.com>
  * Copyright (C) 2017-2019  Frédéric France     <frederic.france@netlogic.fr>
@@ -439,33 +439,42 @@ class AccountancyExport
 	}
 
 	/**
-	 * Export format : CIEL
+	 * Export format : CIEL (Format XIMPORT)
+	 * Format since 2003 compatible CIEL version > 2002 / Sage50
+	 *
+	 * Help : https://sage50c.online-help.sage.fr/aide-technique/
+	 * In sage software | Use menu : "Exchange" > "Importing entries..."
+	 *
+	 * If you want to force filename to "XIMPORT.TXT" for automatically import file present in a directory :
+	 * use constant ACCOUNTING_EXPORT_XIMPORT_FORCE_FILENAME
 	 *
 	 * @param array $TData data
 	 * @return void
 	 */
 	public function exportCiel(&$TData)
 	{
-		global $conf;
-
 		$end_line = "\r\n";
 
 		$i = 1;
-		$date_ecriture = dol_print_date(dol_now(), $conf->global->ACCOUNTING_EXPORT_DATE); // format must be yyyymmdd
+
 		foreach ($TData as $data) {
-			$code_compta = $data->numero_compte;
-			if (!empty($data->subledger_account))
-				$code_compta = $data->subledger_account;
+			$code_compta = length_accountg($data->numero_compte);
+			if (!empty($data->subledger_account)) {
+                $code_compta = length_accounta($data->subledger_account);
+            }
+
+            $date_creation = dol_print_date($data->date_creation, '%Y%m%d');
+            $date_document = dol_print_date($data->doc_date, '%Y%m%d');
 
 			$Tab = array();
-			$Tab['num_ecriture'] = str_pad($i, 5);
+			$Tab['num_ecriture'] = str_pad($data->piece_num, 5);
 			$Tab['code_journal'] = str_pad($data->code_journal, 2);
-			$Tab['date_ecriture'] = $date_ecriture;
-			$Tab['date_ope'] = dol_print_date($data->doc_date, $conf->global->ACCOUNTING_EXPORT_DATE);
-			$Tab['num_piece'] = str_pad(self::trunc($data->piece_num, 12), 12);
+			$Tab['date_ecriture'] = $date_creation;
+			$Tab['date_ope'] = $date_document;
+			$Tab['num_piece'] = str_pad(self::trunc($data->doc_ref, 12), 12);
 			$Tab['num_compte'] = str_pad(self::trunc($code_compta, 11), 11);
 			$Tab['libelle_ecriture'] = str_pad(self::trunc(dol_string_unaccent($data->doc_ref).dol_string_unaccent($data->label_operation), 25), 25);
-			$Tab['montant'] = str_pad(abs($data->montant), 13, ' ', STR_PAD_LEFT);
+			$Tab['montant'] = str_pad(price2fec(abs($data->montant)), 13, ' ', STR_PAD_LEFT);
 			$Tab['type_montant'] = str_pad($data->sens, 1);
 			$Tab['vide'] = str_repeat(' ', 18);
 			$Tab['intitule_compte'] = str_pad(self::trunc(dol_string_unaccent($data->label_operation), 34), 34);
diff --git a/htdocs/accountancy/tpl/export_journal.tpl.php b/htdocs/accountancy/tpl/export_journal.tpl.php
index fb957db2233..c53ec1197f9 100644
--- a/htdocs/accountancy/tpl/export_journal.tpl.php
+++ b/htdocs/accountancy/tpl/export_journal.tpl.php
@@ -58,9 +58,9 @@ if ($accountancyexport->getFormatCode($formatexportset) == $accountancyexport::$
 	$endaccountingperiod = dol_print_date(dol_get_last_day($tmparray['year'], $tmparray['mon']), 'dayxcard');
 
 	$completefilename = $siren."FEC".$endaccountingperiod.".txt";
-}
-else
-{
+} elseif ($accountancyexport->getFormatCode($formatexportset) == $accountancyexport::$EXPORT_TYPE_CIEL && $type_export == "general_ledger" && !empty($conf->global->ACCOUNTING_EXPORT_XIMPORT_FORCE_FILENAME)) {
+	$completefilename = "XIMPORT.TXT";
+} else {
 	$completefilename = ($code ? $code."_" : "").($prefix ? $prefix."_" : "").$filename.($nodateexport ? "" : $date_export).".".$format;
 }
 
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index fea7bf9d0ef..bf58e28e4f6 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -311,7 +311,7 @@ Modelcsv_normal=Classic export
 Modelcsv_CEGID=Export for CEGID Expert Comptabilité
 Modelcsv_COALA=Export for Sage Coala
 Modelcsv_bob50=Export for Sage BOB 50
-Modelcsv_ciel=Export for Sage Ciel Compta or Compta Evolution
+Modelcsv_ciel=Export for Sage50, Ciel Compta or Compta Evo. (Format XIMPORT)
 Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog

From 95ecbb89407e07b8469cdef34cbd45bbce575ccc Mon Sep 17 00:00:00 2001
From: kamel <kamel@kam>
Date: Wed, 28 Jul 2021 12:05:46 +0200
Subject: [PATCH 1318/1497] FIX: add include missing file
 '/core/actions_dellink.inc.php' in project card

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

diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 3c2d5b02829..00c5bb781b2 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -89,6 +89,8 @@ $socid = GETPOST('socid', 'int');
 //if ($user->socid > 0) $socid = $user->socid;    // For external user, no check is done on company because readability is managed by public status of project and assignement.
 restrictedArea($user, 'projet', $object->id, 'projet&project');
 
+$permissiondellink = $user->rights->projet->creer;	// Used by the include of actions_dellink.inc.php
+
 
 /*
  * Actions
@@ -121,6 +123,8 @@ if (empty($reshook)) {
 		$action = '';
 	}
 
+	include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';		// Must be include, not include_once
+
 	if ($action == 'add' && $user->rights->projet->creer) {
 		$error = 0;
 		if (!GETPOST('ref')) {

From 2cd7513936efe2d46b3716f03c788be62d4349de Mon Sep 17 00:00:00 2001
From: kamel <kamel@kam>
Date: Wed, 28 Jul 2021 12:18:35 +0200
Subject: [PATCH 1319/1497] NEW: add link to a element by ref

---
 htdocs/core/actions_dellink.inc.php   | 31 ++++++++++++++++++++++++---
 htdocs/core/class/html.form.class.php | 17 ++++++++++++++-
 2 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/actions_dellink.inc.php b/htdocs/core/actions_dellink.inc.php
index a7ac035506f..60ca4af7409 100644
--- a/htdocs/core/actions_dellink.inc.php
+++ b/htdocs/core/actions_dellink.inc.php
@@ -27,17 +27,42 @@
 // $permissiondellink must be defined
 
 $dellinkid = GETPOST('dellinkid', 'int');
+$addlink = GETPOST('addlink','alpha');
 $addlinkid = GETPOST('idtolinkto', 'int');
+$addlinkref = GETPOST('reftolinkto','alpha');
+$cancellink = GETPOST('cancel','alpha');
 
 // Link invoice to order
-if ($action == 'addlink' && !empty($permissiondellink) && !GETPOST('cancel', 'alpha') && $id > 0 && $addlinkid > 0) {
+if ($action == 'addlink' && !empty($permissiondellink) && !$cancellink && $id > 0 && $addlinkid > 0) {
 	$object->fetch($id);
 	$object->fetch_thirdparty();
-	$result = $object->add_object_linked(GETPOST('addlink', 'alpha'), $addlinkid);
+	$result = $object->add_object_linked($addlink, $addlinkid);
+}
+
+// Link by reference
+if ($action == 'addlinkbyref' && ! empty($permissiondellink) && !$cancellink && $id > 0 && !empty($addlinkref) && !empty($conf->global->MAIN_LINK_BY_REF_IN_LINKTO)) {
+	$element_prop = getElementProperties($addlink);
+	if (is_array($element_prop)) {
+		dol_include_once('/' . $element_prop['classpath'] . '/' . $element_prop['classfile'] . '.class.php');
+
+		$objecttmp = new $element_prop['classname']($db);
+		$ret = $objecttmp->fetch(0, $addlinkref);
+		if ($ret > 0) {
+			$object->fetch($id);
+			$object->fetch_thirdparty();
+			$result = $object->add_object_linked($addlink, $objecttmp->id);
+			if (isset($_POST['reftolinkto'])) unset($_POST['reftolinkto']);
+		} elseif ($ret < 0) {
+			setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
+		} else {
+			$langs->load('errors');
+			setEventMessage($langs->trans('ErrorRecordNotFound'), 'errors');
+		}
+	}
 }
 
 // Delete link
-if ($action == 'dellink' && !empty($permissiondellink) && !GETPOST('cancel', 'alpha') && $dellinkid > 0) {
+if ($action == 'dellink' && !empty($permissiondellink) && !$cancellink && $dellinkid > 0) {
 	$result = $object->deleteObjectLinked(0, '', 0, '', $dellinkid);
 	if ($result < 0) {
 		setEventMessages($object->error, $object->errors, 'errors');
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 9ef0f3ee235..a6280a7c9f5 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -7971,6 +7971,21 @@ class Form
 
 			if (!empty($possiblelink['perms']) && (empty($restrictlinksto) || in_array($key, $restrictlinksto)) && (empty($excludelinksto) || !in_array($key, $excludelinksto))) {
 				print '<div id="'.$key.'list"'.(empty($conf->use_javascript_ajax) ? '' : ' style="display:none"').'>';
+
+				if (!empty($conf->global->MAIN_LINK_BY_REF_IN_LINKTO)) {
+					print '<br><form action="' . $_SERVER["PHP_SELF"] . '" method="POST" name="formlinkedbyref' . $key . '">';
+					print '<input type="hidden" name="id" value="' . $object->id . '">';
+					print '<input type="hidden" name="action" value="addlinkbyref">';
+					print '<input type="hidden" name="addlink" value="' . $key . '">';
+					print '<table class="noborder">';
+					print '<tr>';
+					print '<td>' . $langs->trans("Ref") . '</td>';
+					print '<td><input type="text" name="reftolinkto" value="' . dol_escape_htmltag(GETPOST('reftolinkto', 'alpha')) . '">&nbsp;<input type="submit" class="button valignmiddle" value="' . $langs->trans('ToLink') . '">&nbsp;<input type="submit" class="button" name="cancel" value="' . $langs->trans('Cancel') . '"></td>';
+					print '</tr>';
+					print '</table>';
+					print '</form>';
+				}
+
 				$sql = $possiblelink['sql'];
 
 				$resqllist = $this->db->query($sql);
@@ -8028,7 +8043,7 @@ class Form
 				print '</div>';
 
 				//$linktoelem.=($linktoelem?' &nbsp; ':'');
-				if ($num > 0) {
+				if ($num > 0 || !empty($conf->global->MAIN_LINK_BY_REF_IN_LINKTO)) {
 					$linktoelemlist .= '<li><a href="#linkto'.$key.'" class="linkto dropdowncloseonclick" rel="'.$key.'">'.$langs->trans($possiblelink['label']).' ('.$num.')</a></li>';
 					// } else $linktoelem.=$langs->trans($possiblelink['label']);
 				} else {

From b4ccb1b3551b089437555ebe7ea73e56837b8f11 Mon Sep 17 00:00:00 2001
From: kamel <kamel@kam>
Date: Wed, 28 Jul 2021 12:29:17 +0200
Subject: [PATCH 1320/1497] Corrections stickler-ci

---
 htdocs/core/actions_dellink.inc.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/actions_dellink.inc.php b/htdocs/core/actions_dellink.inc.php
index 60ca4af7409..fbecacce515 100644
--- a/htdocs/core/actions_dellink.inc.php
+++ b/htdocs/core/actions_dellink.inc.php
@@ -27,10 +27,10 @@
 // $permissiondellink must be defined
 
 $dellinkid = GETPOST('dellinkid', 'int');
-$addlink = GETPOST('addlink','alpha');
+$addlink = GETPOST('addlink', 'alpha');
 $addlinkid = GETPOST('idtolinkto', 'int');
-$addlinkref = GETPOST('reftolinkto','alpha');
-$cancellink = GETPOST('cancel','alpha');
+$addlinkref = GETPOST('reftolinkto', 'alpha');
+$cancellink = GETPOST('cancel', 'alpha');
 
 // Link invoice to order
 if ($action == 'addlink' && !empty($permissiondellink) && !$cancellink && $id > 0 && $addlinkid > 0) {

From 7acebd28ca0196f3a720e8226e8e08e95e3e4a2b Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Wed, 28 Jul 2021 14:08:53 +0200
Subject: [PATCH 1321/1497] Add information

---
 htdocs/accountancy/class/accountancyexport.class.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index aa3e24ab545..009a4c3cb74 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -441,6 +441,7 @@ class AccountancyExport
 	/**
 	 * Export format : CIEL (Format XIMPORT)
 	 * Format since 2003 compatible CIEL version > 2002 / Sage50
+	 * Last review for this format : 2021/07/28 Alexandre Spangaro (aspangaro@open-dsi.fr)
 	 *
 	 * Help : https://sage50c.online-help.sage.fr/aide-technique/
 	 * In sage software | Use menu : "Exchange" > "Importing entries..."

From 2054cca6e5606e00869f06c12f76b6890a6215fd Mon Sep 17 00:00:00 2001
From: ksar <35605507+ksar-ksar@users.noreply.github.com>
Date: Wed, 28 Jul 2021 15:14:18 +0200
Subject: [PATCH 1322/1497] FIX #18267

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

diff --git a/htdocs/bom/bom_list.php b/htdocs/bom/bom_list.php
index 76f16c838be..2cd7492395d 100644
--- a/htdocs/bom/bom_list.php
+++ b/htdocs/bom/bom_list.php
@@ -297,7 +297,7 @@ $sql .= $object->getFieldList('t');
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key.' as options_'.$key.', ' : '');
+		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key.' as options_'.$key.' ' : '');
 	}
 }
 // Add fields from hooks

From df8f09985797a38747e939545012ec1e13ab7fc7 Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Wed, 28 Jul 2021 15:57:12 +0200
Subject: [PATCH 1323/1497] Fix a bug in ecm for v14

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

diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 110d80b45d1..2b8a2d15aff 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -1182,7 +1182,7 @@ class FormFile
 		);
 		$reshook = $hookmanager->executeHooks('showFilesList', $parameters, $object);
 
-		if (isset($reshook) && $reshook != '') { // null or '' for bypass
+		if (!empty($reshook)) { // null or '' for bypass
 			return $reshook;
 		} else {
 			if (!is_object($form)) {

From f8563ace0d9bb81ebb89f7302f88450bc242777a Mon Sep 17 00:00:00 2001
From: laurantines <lauriiika@gmail.com>
Date: Wed, 28 Jul 2021 16:14:38 +0200
Subject: [PATCH 1324/1497] Fix opp statusbrequires even if
 PROJECT_USE_OPPORTUNITIES off

If I modify a project and do not have PROJECT_USE_OPPORTUNITIES enabled, I cannot change the project budget. I get the error message that ErrorOppStatusRequiredIfAmount. However, I do not have the opportunities enabled and it does not make sense for that message to appear when I have not added any opportunities.
---
 htdocs/projet/card.php | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 00c5bb781b2..4ee23fd632b 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -136,9 +136,11 @@ if (empty($reshook)) {
 			$error++;
 		}
 
-		if (GETPOST('opp_amount') != '' && !(GETPOST('opp_status') > 0)) {
-			$error++;
-			setEventMessages($langs->trans("ErrorOppStatusRequiredIfAmount"), null, 'errors');
+		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
+			if (GETPOST('opp_amount') != '' && !(GETPOST('opp_status') > 0)) {
+				$error++;
+				setEventMessages($langs->trans("ErrorOppStatusRequiredIfAmount"), null, 'errors');
+			}
 		}
 
 		// Create with status validated immediatly
@@ -274,9 +276,11 @@ if (empty($reshook)) {
 			}
 		}
 
-		if ($object->opp_amount && ($object->opp_status <= 0)) {
-			$error++;
-			setEventMessages($langs->trans("ErrorOppStatusRequiredIfAmount"), null, 'errors');
+		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
+			if ($object->opp_amount && ($object->opp_status <= 0)) {
+				$error++;
+				setEventMessages($langs->trans("ErrorOppStatusRequiredIfAmount"), null, 'errors');
+			}
 		}
 
 		if (!$error) {

From cd63ede35a6c3db0ada94c096949abb0da1ddd09 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Wed, 28 Jul 2021 16:46:57 +0200
Subject: [PATCH 1325/1497] Correctif date

---
 htdocs/accountancy/class/accountancyexport.class.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index 009a4c3cb74..7cd1a153183 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -464,14 +464,14 @@ class AccountancyExport
                 $code_compta = length_accounta($data->subledger_account);
             }
 
-            $date_creation = dol_print_date($data->date_creation, '%Y%m%d');
-            $date_document = dol_print_date($data->doc_date, '%Y%m%d');
+			$date_document = dol_print_date($data->doc_date, '%Y%m%d');
+			$date_echeance = dol_print_date($data->date_lim_reglement, '%Y%m%d');
 
 			$Tab = array();
 			$Tab['num_ecriture'] = str_pad($data->piece_num, 5);
 			$Tab['code_journal'] = str_pad($data->code_journal, 2);
-			$Tab['date_ecriture'] = $date_creation;
-			$Tab['date_ope'] = $date_document;
+			$Tab['date_ecriture'] = str_pad($date_document, 8, ' ', STR_PAD_LEFT);
+			$Tab['date_echeance'] = str_pad($date_echeance, 8, ' ', STR_PAD_LEFT);
 			$Tab['num_piece'] = str_pad(self::trunc($data->doc_ref, 12), 12);
 			$Tab['num_compte'] = str_pad(self::trunc($code_compta, 11), 11);
 			$Tab['libelle_ecriture'] = str_pad(self::trunc(dol_string_unaccent($data->doc_ref).dol_string_unaccent($data->label_operation), 25), 25);

From 20add7d3fcbc0b9189ae2197880c09dd56601f6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josep=20Llu=C3=ADs?= <joseplluis@lliuretic.cat>
Date: Wed, 28 Jul 2021 18:02:55 +0200
Subject: [PATCH 1326/1497] FIX totalDayAll hours in tasks

The extra days hours were not considered in total hours
---
 htdocs/core/js/timesheet.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/js/timesheet.js b/htdocs/core/js/timesheet.js
index 0c8c9ff3245..e9e66787aa0 100644
--- a/htdocs/core/js/timesheet.js
+++ b/htdocs/core/js/timesheet.js
@@ -1,5 +1,6 @@
 /* Copyright (C) 2014      delcroip            <delcroip@gmail.com>
  * Copyright (C) 2015-2017 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2021      Josep Lluís Amador  <joseplluis@lliuretic.cat>
  *
  * 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
@@ -257,7 +258,7 @@ function updateTotal(days,mode)
        		result=parseTime(jQuery('.totalDay'+stringdays).text(),taskTime);
         	if (result >= 0)
         	{
-        		totalhour = totalhour + taskTime.getHours();
+        		totalhour = totalhour + taskTime.getHours() + result*24;
         		totalmin = totalmin + taskTime.getMinutes();
         	}
         }

From 99e256a4172c535a70a756389cb972787740ce38 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Wed, 28 Jul 2021 18:22:26 +0200
Subject: [PATCH 1327/1497] Update functions.lib.php

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 410dbd827fe..a6c62ba2a47 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -10204,7 +10204,7 @@ function newToken()
  */
 function currentToken()
 {
-	return isset($_SESSION['token']) ? $_SESSION['token'] : null;
+	return isset($_SESSION['token']) ? $_SESSION['token'] : '';
 }
 
 /**

From ae5d17815f03a80c9ef21ac4917c1ff0db852e94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Tue, 27 Jul 2021 10:26:51 +0200
Subject: [PATCH 1328/1497] Update dolreceiptprinter.class.php

---
 htdocs/core/class/dolreceiptprinter.class.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/class/dolreceiptprinter.class.php b/htdocs/core/class/dolreceiptprinter.class.php
index 45c87401416..a3ddb3d7c7f 100644
--- a/htdocs/core/class/dolreceiptprinter.class.php
+++ b/htdocs/core/class/dolreceiptprinter.class.php
@@ -680,9 +680,7 @@ class dolReceiptPrinter extends Printer
 						foreach ($object->lines as $line) {
 							$total_localtax1 += $line->total_localtax1;
 						}
-						foreach ($vatarray as $vatkey => $vatvalue) {
-							$this->printer->text(str_pad(price($total_localtax1), 10, ' ', STR_PAD_LEFT)."\n");
-						}
+						$this->printer->text(str_pad(price($total_localtax1), 10, ' ', STR_PAD_LEFT)."\n");
 						break;
 					case 'DOL_PRINT_OBJECT_TAX2':
 						//var_dump($object);
@@ -690,9 +688,7 @@ class dolReceiptPrinter extends Printer
 						foreach ($object->lines as $line) {
 							$total_localtax2 += $line->total_localtax2;
 						}
-						foreach ($vatarray as $vatkey => $vatvalue) {
-							$this->printer->text(str_pad(price($total_localtax2), 10, ' ', STR_PAD_LEFT)."\n");
-						}
+						$this->printer->text(str_pad(price($total_localtax2), 10, ' ', STR_PAD_LEFT)."\n");
 						break;
 					case 'DOL_PRINT_OBJECT_TOTAL':
 						$title = $langs->trans('TotalHT');

From e7af8e9d5ea7d825bea0d58d6e1d816388d0dd73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josep=20Llu=C3=ADs?= <joseplluis@lliuretic.cat>
Date: Wed, 28 Jul 2021 18:02:55 +0200
Subject: [PATCH 1329/1497] FIX totalDayAll hours in tasks

The extra days hours were not considered in total hours
---
 htdocs/core/js/timesheet.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/js/timesheet.js b/htdocs/core/js/timesheet.js
index 0c8c9ff3245..e9e66787aa0 100644
--- a/htdocs/core/js/timesheet.js
+++ b/htdocs/core/js/timesheet.js
@@ -1,5 +1,6 @@
 /* Copyright (C) 2014      delcroip            <delcroip@gmail.com>
  * Copyright (C) 2015-2017 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2021      Josep Lluís Amador  <joseplluis@lliuretic.cat>
  *
  * 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
@@ -257,7 +258,7 @@ function updateTotal(days,mode)
        		result=parseTime(jQuery('.totalDay'+stringdays).text(),taskTime);
         	if (result >= 0)
         	{
-        		totalhour = totalhour + taskTime.getHours();
+        		totalhour = totalhour + taskTime.getHours() + result*24;
         		totalmin = totalmin + taskTime.getMinutes();
         	}
         }

From f6d03fe28ef943906d824b3aaf8db11abf2af9d2 Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Wed, 28 Jul 2021 21:45:11 +0200
Subject: [PATCH 1330/1497] Fix update product lot

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

diff --git a/htdocs/product/stock/class/productlot.class.php b/htdocs/product/stock/class/productlot.class.php
index 52322cf4697..360978ac736 100644
--- a/htdocs/product/stock/class/productlot.class.php
+++ b/htdocs/product/stock/class/productlot.class.php
@@ -402,7 +402,7 @@ class Productlot extends CommonObject
 		$sql .= ' sellby = '.(!isset($this->sellby) || dol_strlen($this->sellby) != 0 ? "'".$this->db->idate($this->sellby)."'" : 'null').',';
 		$sql .= ' eol_date = '.(!isset($this->eol_date) || dol_strlen($this->eol_date) != 0 ? "'".$this->db->idate($this->eol_date)."'" : 'null').',';
 		$sql .= ' manufacturing_date = '.(!isset($this->manufacturing_date) || dol_strlen($this->manufacturing_date) != 0 ? "'".$this->db->idate($this->manufacturing_date)."'" : 'null').',';
-		$sql .= ' scrapping_date = '.(!isset($this->destruction_date) || dol_strlen($this->destruction_date) != 0 ? "'".$this->db->idate($this->destruction_date)."'" : 'null').',';
+		$sql .= ' scrapping_date = '.(!isset($this->scrapping_date) || dol_strlen($this->scrapping_date) != 0 ? "'".$this->db->idate($this->scrapping_date)."'" : 'null').',';
 		//$sql .= ' commissionning_date = '.(!isset($this->first_use_date) || dol_strlen($this->first_use_date) != 0 ? "'".$this->db->idate($this->first_use_date)."'" : 'null').',';
 		//$sql .= ' qc_frequency = '.(!isset($this->qc_frequency) || dol_strlen($this->qc_frequency) != 0 ? "'".$this->db->escape($this->qc_frequency)."'" : 'null').',';
 		$sql .= ' datec = '.(!isset($this->datec) || dol_strlen($this->datec) != 0 ? "'".$this->db->idate($this->datec)."'" : 'null').',';

From fdd0ab8461c46556b0fcc11e3aae539eb3401589 Mon Sep 17 00:00:00 2001
From: atm-florian <florian.mortgat@atm-consulting.fr>
Date: Wed, 28 Jul 2021 23:56:44 +0200
Subject: [PATCH 1331/1497] FIX $conf->task used but it does not exist, use
 $conf->projet instead

---
 .../modules/project/task/doc/doc_generic_task_odt.modules.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
index 566c7f07a2e..638ab70bb84 100644
--- a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
+++ b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
@@ -524,8 +524,8 @@ class doc_generic_task_odt extends ModelePDFTask
 				//print "conf->societe->dir_temp=".$conf->societe->dir_temp;
 
 				dol_mkdir($conf->projet->dir_temp);
-				if (!is_writable($conf->task->dir_temp)) {
-					$this->error = "Failed to write in temp directory ".$conf->task->dir_temp;
+				if (!is_writable($conf->projet->dir_temp)) {
+					$this->error = "Failed to write in temp directory ".$conf->projet->dir_temp;
 					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
 					return -1;
 				}

From 262dd1600b67fec20c028e4021c12456951e3549 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Thu, 29 Jul 2021 06:23:12 +0200
Subject: [PATCH 1332/1497] FIX: Invoice - Missing button to reopen an
 abandoned situation invoice

---
 htdocs/compta/facture/card.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 519f40c254a..fe5d5c3ab0a 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -5206,7 +5206,8 @@ elseif ($id > 0 || !empty($ref))
 			// Reopen a standard paid invoice
 			if ((($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_REPLACEMENT)
 				|| ($object->type == Facture::TYPE_CREDIT_NOTE && empty($discount->id))
-				|| ($object->type == Facture::TYPE_DEPOSIT && empty($discount->id)))
+				|| ($object->type == Facture::TYPE_DEPOSIT && empty($discount->id))
+				|| ($object->type == Facture::TYPE_SITUATION && empty($discount->id)))
 				&& ($object->statut == Facture::STATUS_CLOSED || $object->statut == Facture::STATUS_ABANDONED || ($object->statut == 1 && $object->paye == 1))   // Condition ($object->statut == 1 && $object->paye == 1) should not happened but can be found due to corrupted data
 				&& ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $usercancreate) || $usercanreopen))				// A paid invoice (partially or completely)
 			{

From 8d87bdcf7e86bac4f9305bf54df547e0eeadb9b2 Mon Sep 17 00:00:00 2001
From: Christian Foellmann <christian@foellmann.de>
Date: Thu, 29 Jul 2021 08:18:55 +0200
Subject: [PATCH 1333/1497] add sql data for fresh install

---
 htdocs/install/mysql/data/llx_c_action_trigger.sql | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/install/mysql/data/llx_c_action_trigger.sql b/htdocs/install/mysql/data/llx_c_action_trigger.sql
index 45503449492..38f4b57a72e 100644
--- a/htdocs/install/mysql/data/llx_c_action_trigger.sql
+++ b/htdocs/install/mysql/data/llx_c_action_trigger.sql
@@ -67,6 +67,7 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_SUBMIT','Supplier order request submited','Executed when a supplier order is approved','order_supplier',13);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_RECEIVE','Supplier order request received','Executed when a supplier order is received','order_supplier',13);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_REFUSE','Supplier order request refused','Executed when a supplier order is refused','order_supplier',13);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_CANCEL','Supplier order request canceled','Executed when a supplier order is canceled','order_supplier',13);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_SENTBYMAIL','Supplier order sent by mail','Executed when a supplier order is sent by mail','order_supplier',14);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_CLASSIFY_BILLED','Supplier order set billed','Executed when a supplier order is set as billed','order_supplier',14);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_DELETE','Supplier order deleted','Executed when a supplier order is deleted','order_supplier',14);

From da482018d217d7cfe149b0e91630a3d1718d82b7 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Thu, 29 Jul 2021 10:51:51 +0200
Subject: [PATCH 1334/1497] Fix for php 8

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

diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index 5683c8e6a07..33db393bbc6 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -1628,7 +1628,7 @@ class CMailFile
 	 * @return  array                       array of email => name
 	 * @see getValidAddress()
 	 */
-	public function getArrayAddress($address)
+	public static function getArrayAddress($address)
 	{
 		global $conf;
 

From b5c30126cb646ad10eed29d364e05daef976c443 Mon Sep 17 00:00:00 2001
From: Christian Foellmann <christian@foellmann.de>
Date: Thu, 29 Jul 2021 14:49:41 +0200
Subject: [PATCH 1335/1497] extend the hook `getElementList` to make $ids in
 the hooked function

---
 htdocs/projet/class/project.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index a570e8ed7bb..4f52dd48057 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -744,7 +744,8 @@ class Project extends CommonObject
 			'datefieldname'  => $datefieldname,
 			'dates' => $dates,
 			'datee' => $datee,
-			'fk_projet' => $projectkey
+			'fk_projet' => $projectkey,
+			'ids' => $ids,
 		);
 		$reshook = $hookmanager->executeHooks('getElementList', $parameters, $object, $action);
 		if ($reshook > 0) {

From ae5bb956accb6dc81c266f8c90f2806b955db178 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Thu, 29 Jul 2021 17:18:05 +0200
Subject: [PATCH 1336/1497] fix invoice in stand registration pb

---
 htdocs/core/class/commonobject.class.php      |   6 +-
 htdocs/core/class/html.form.class.php         |   4 +
 .../conferenceorbooth_card.php                |  45 +++++-
 .../conferenceorbooth_list.php                |   2 -
 .../conferenceorboothattendee_card.php        |  10 +-
 .../tpl/linkedobjectblock.tpl.php             |  47 +++++++
 htdocs/langs/en_US/eventorganization.lang     |   2 +
 htdocs/public/payment/paymentok.php           |   9 +-
 htdocs/public/project/suggestbooth.php        | 130 ++++++++++--------
 9 files changed, 191 insertions(+), 64 deletions(-)
 create mode 100644 htdocs/eventorganization/tpl/linkedobjectblock.tpl.php

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index ceac7015065..36df3b1a7b9 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -3791,7 +3791,6 @@ abstract class CommonObject
 					} elseif ($objecttype == 'contact') {
 						 $module = 'societe';
 					}
-
 					// Set classfile
 					$classfile = strtolower($subelement);
 					$classname = ucfirst($subelement);
@@ -3823,6 +3822,11 @@ abstract class CommonObject
 						$classfile = 'conferenceorboothattendee';
 						$classname = 'ConferenceOrBoothAttendee';
 						$module = 'eventorganization';
+					} elseif ($objecttype == 'conferenceorbooth') {
+						$classpath = 'eventorganization/class';
+						$classfile = 'conferenceorbooth';
+						$classname = 'ConferenceOrBooth';
+						$module = 'eventorganization';
 					}
 
 					// Here $module, $classfile and $classname are set
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 816e0a79225..d548c7d91e1 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -7642,6 +7642,10 @@ class Form
 					$tplpath = 'expensereport';
 				} elseif ($objecttype == 'subscription') {
 					$tplpath = 'adherents';
+				} elseif ($objecttype == 'conferenceorbooth') {
+					$tplpath = 'eventorganization';
+				} elseif ($objecttype == 'conferenceorboothattendee') {
+					$tplpath = 'eventorganization';
 				}
 
 				global $linkedObjectBlock;
diff --git a/htdocs/eventorganization/conferenceorbooth_card.php b/htdocs/eventorganization/conferenceorbooth_card.php
index f983994c4ec..6ae9ab9664b 100644
--- a/htdocs/eventorganization/conferenceorbooth_card.php
+++ b/htdocs/eventorganization/conferenceorbooth_card.php
@@ -330,7 +330,15 @@ if (!empty($withproject)) {
 	print "</td></tr>";
 
 	print '<tr><td valign="middle">'.$langs->trans("EventOrganizationICSLink").'</td><td>';
-	print '';
+	// Define $urlwithroot
+	$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
+	$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT;
+
+	// Show message
+	$message = '<a href="'.$urlwithroot.'/public/agenda/agendaexport.php?format=ical'.($conf->entity > 1 ? "&entity=".$conf->entity : "");
+	$message .= '&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : '...');
+	$message .= "&project=".$projectstatic->id.'&module='.urlencode('@eventorganization').'&status='.ConferenceOrBooth::STATUS_CONFIRMED.'">'.$langs->trans('DownloadICSLink').'</a>';
+	print $message;
 	print "</td></tr>";
 
 	print '</table>';
@@ -496,6 +504,41 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	$keyforbreak='pubregister';
 
 	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';
+	$object->fetchObjectLinked();
+
+
+	if (is_array($object->linkedObjects) && count($object->linkedObjects)>0 && array_key_exists("facture", $object->linkedObjects)) {
+		foreach ($object->linkedObjects["facture"] as $fac) {
+			/**
+			 * @var $fac Facture
+			 */
+			if (empty($fac->paye)) {
+				$key = 'paymentlink_'.$fac->id;
+				print '<tr class="field_'.$key.'"><td';
+				print ' class="titlefield fieldname_'.$key;
+				print '">';
+				print img_picto('', 'globe').' <span class="opacitymedium">'.$langs->trans("ToOfferALinkForOnlinePayment", $langs->transnoentitiesnoconv('Online')) . ' '. $fac->ref.'</span><br>';
+				print '</td>';
+
+				print '<td class="valuefield fieldname_'.$key;
+				print '">';
+				$sourcetouse = 'boothlocation';
+				$reftouse = $fac->id;
+				$redirection = $dolibarr_main_url_root.'/public/payment/newpayment.php?source='.$sourcetouse.'&ref='.$reftouse.'&booth='.$object->id;
+				if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
+					if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
+						$redirection .= '&securekey='.dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $sourcetouse . $reftouse, 2); // Use the source in the hash to avoid duplicates if the references are identical
+					} else {
+						$redirection .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
+					}
+				}
+				print '<div class="urllink"><input type="text" id="onlinepaymenturl" class="quatrevingtpercent" value="'.$redirection.'">';
+				print '<a href="'.$redirection.'" target="_blank">'.img_picto('', 'globe', 'class="paddingleft"').'</a></div>';
+				print '</td>';
+				print '</tr>';
+			}
+		}
+	}
 	//var_dump($object);
 	// Other attributes. Fields from hook formObjectOptions and Extrafields.
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
diff --git a/htdocs/eventorganization/conferenceorbooth_list.php b/htdocs/eventorganization/conferenceorbooth_list.php
index 0b1221006a8..ab595e8b86e 100644
--- a/htdocs/eventorganization/conferenceorbooth_list.php
+++ b/htdocs/eventorganization/conferenceorbooth_list.php
@@ -421,8 +421,6 @@ if ($projectid > 0) {
 	$message = '<a href="'.$urlwithroot.'/public/agenda/agendaexport.php?format=ical'.($conf->entity > 1 ? "&entity=".$conf->entity : "");
 	$message .= '&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : '...');
 	$message .= "&project=".$projectid.'&module='.urlencode('@eventorganization').'&status='.ConferenceOrBooth::STATUS_CONFIRMED.'">'.$langs->trans('DownloadICSLink').'</a>';
-	$message .= '</div>';
-	$message .= '<br>';
 	print $message;
 	print "</td></tr>";
 
diff --git a/htdocs/eventorganization/conferenceorboothattendee_card.php b/htdocs/eventorganization/conferenceorboothattendee_card.php
index c5f3a91b10e..fe5ea292e8b 100644
--- a/htdocs/eventorganization/conferenceorboothattendee_card.php
+++ b/htdocs/eventorganization/conferenceorboothattendee_card.php
@@ -336,7 +336,15 @@ if (!empty($withproject)) {
 	print "</td></tr>";
 
 	print '<tr><td valign="middle">'.$langs->trans("EventOrganizationICSLink").'</td><td>';
-	print '';
+	// Define $urlwithroot
+	$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
+	$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT;
+
+	// Show message
+	$message = '<a href="'.$urlwithroot.'/public/agenda/agendaexport.php?format=ical'.($conf->entity > 1 ? "&entity=".$conf->entity : "");
+	$message .= '&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : '...');
+	$message .= "&project=".$projectstatic->id.'&module='.urlencode('@eventorganization').'&status='.ConferenceOrBooth::STATUS_CONFIRMED.'">'.$langs->trans('DownloadICSLink').'</a>';
+	print $message;
 	print "</td></tr>";
 
 	print '</table>';
diff --git a/htdocs/eventorganization/tpl/linkedobjectblock.tpl.php b/htdocs/eventorganization/tpl/linkedobjectblock.tpl.php
new file mode 100644
index 00000000000..f67e086a575
--- /dev/null
+++ b/htdocs/eventorganization/tpl/linkedobjectblock.tpl.php
@@ -0,0 +1,47 @@
+<?php
+/* Copyright (C) 2010-2011	Regis Houssin <regis.houssin@inodbox.com>
+ * Copyright (C) 2013		Juanjo Menent <jmenent@2byte.es>
+ * Copyright (C) 2014       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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+// Protection to avoid direct call of template
+if (empty($conf) || !is_object($conf)) {
+	print "Error, template page can't be called as URL";
+	exit;
+}
+
+echo "<!-- BEGIN PHP TEMPLATE -->\n";
+
+global $user;
+
+$langs = $GLOBALS['langs'];
+$linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
+$langs->load("eventorganization");
+
+$total = 0;
+foreach ($linkedObjectBlock as $key => $objectlink) {
+	echo '<tr class="oddeven">';
+	echo '<td>' . $langs->trans(get_class($objectlink)) . '</td>';
+	echo '<td>'.$objectlink->getNomUrl(1).'</td>';
+	echo '<td class="center"></td>';
+	echo '<td class="center"></td>';
+	echo '<td class="right"></td>';
+	echo '<td class="right"></td>';
+	echo '<td class="right"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key.'">'.img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink').'</a></td>';
+	echo '</tr>';
+}
+
+echo "<!-- END PHP TEMPLATE -->\n";
diff --git a/htdocs/langs/en_US/eventorganization.lang b/htdocs/langs/en_US/eventorganization.lang
index f361e6bc192..67a242e640a 100644
--- a/htdocs/langs/en_US/eventorganization.lang
+++ b/htdocs/langs/en_US/eventorganization.lang
@@ -119,6 +119,8 @@ EventType = Event type
 LabelOfBooth=Booth label
 LabelOfconference=Conference label
 ConferenceIsNotConfirmed=Subcription not available, conference is not confirmed yet
+DateMustBeBeforeThan=%s must be before %s
+DateMustBeAfterThan=%s must be after %s
 
 #
 # Vote page
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 2f566d4bb31..4db8a62a625 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -1031,6 +1031,8 @@ if ($ispaymentok) {
 						if ($resultattendee < 0) {
 							setEventMessages(null, $attendeetovalidate->errors, "errors");
 						} else {
+							$attendeetovalidate->amount=$FinalPaymentAmt;
+							$attendeetovalidate->update($user);
 							$attendeetovalidate->validate($user);
 
 							// Sending mail
@@ -1051,8 +1053,9 @@ if ($ispaymentok) {
 								$arraydefaultmessage = null;
 
 								$labeltouse = $conf->global->EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT;
+
 								if (!empty($labeltouse)) {
-									$arraydefaultmessage = $formmail->getEMailTemplate($db, 'eventorganization_send', $user, $outputlangs, $labeltouse, 1, '');
+									$arraydefaultmessage = $formmail->getEMailTemplate($db, 'conferenceorbooth', $user, $outputlangs, $labeltouse, 1, '');
 								}
 
 								if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
@@ -1066,7 +1069,7 @@ if ($ispaymentok) {
 								$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
 								$texttosend = make_substitutions($msg, $substitutionarray, $outputlangs);
 
-								$sendto = $thirdparty->email;
+								$sendto = $attendeetovalidate->email;
 								$from = $conf->global->MAILING_EMAIL_FROM;
 								$urlback = $_SERVER["REQUEST_URI"];
 
@@ -1233,7 +1236,7 @@ if ($ispaymentok) {
 
 										$labeltouse = $conf->global->EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT;
 										if (!empty($labeltouse)) {
-											$arraydefaultmessage = $formmail->getEMailTemplate($db, 'eventorganization_send', $user, $outputlangs, $labeltouse, 1, '');
+											$arraydefaultmessage = $formmail->getEMailTemplate($db, 'conferenceorbooth', $user, $outputlangs, $labeltouse, 1, '');
 										}
 
 										if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
diff --git a/htdocs/public/project/suggestbooth.php b/htdocs/public/project/suggestbooth.php
index 3ab8e165c7e..c695ea9cec1 100644
--- a/htdocs/public/project/suggestbooth.php
+++ b/htdocs/public/project/suggestbooth.php
@@ -81,9 +81,8 @@ $email = GETPOST("email");
 $societe = GETPOST("societe");
 $label = GETPOST("label");
 $note = GETPOST("note");
-$datestart = GETPOST("datestart");
-$dateend = GETPOST("dateend");
-
+$datestart = dol_mktime(0, 0, 0, GETPOST('datestartmonth', 'int'), GETPOST('datestartday', 'int'), GETPOST('datestartyear', 'int'));
+$dateend = dol_mktime(23, 59, 59, GETPOST('dateendmonth', 'int'), GETPOST('dateendday', 'int'), GETPOST('dateendyear', 'int'));
 $id = GETPOST('id');
 
 $project = new Project($db);
@@ -225,13 +224,19 @@ if (empty($reshook) && $action == 'add') {
 		$error++;
 		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Note"))."<br>\n";
 	}
-	if (!GETPOST("datestart")) {
+	if (empty($datestart)) {
 		$error++;
 		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DateStart"))."<br>\n";
+	} elseif ($datestart < $project->date_start) {
+			$error++;
+			$errmsg .= $langs->trans("DateMustBeAfterThan", $langs->transnoentitiesnoconv("DateStart"), dol_print_date($project->date_start))."<br>\n";
 	}
-	if (!GETPOST("dateend")) {
+	if (empty($dateend)) {
 		$error++;
 		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DateEnd"))."<br>\n";
+	} elseif ($dateend > dol_mktime(23, 59, 59, dol_print_date($project->date_end, '%m'), dol_print_date($project->date_end, '%d'), dol_print_date($project->date_end, '%Y'))) {
+		$error++;
+		$errmsg .= $langs->trans("DateMustBeBeforeThan", $langs->transnoentitiesnoconv("DateEnd"), dol_print_date($project->date_end))."<br>\n";
 	}
 	if (!GETPOST("email")) {
 		$error++;
@@ -376,7 +381,7 @@ if (empty($reshook) && $action == 'add') {
 			$conforbooth->fk_project = $project->id;
 			$conforbooth->note = $note;
 			$conforbooth->fk_action = $eventtype;
-			$conforbooth->datep =$datestart;
+			$conforbooth->datep = $datestart;
 			$conforbooth->datep2 = $dateend;
 			$conforbooth->datec = dol_now();
 			$conforbooth->tms = dol_now();
@@ -423,7 +428,7 @@ if (empty($reshook) && $action == 'add') {
 								$error++;
 							} else {
 								$db->commit();
-								$facture->add_object_linked($contact->element, $contact->id);
+								$facture->add_object_linked($conforbooth->element, $conforbooth->id);
 							}
 						}
 
@@ -436,7 +441,7 @@ if (empty($reshook) && $action == 'add') {
 								$contact->errors = $facture->errors;
 								$error++;
 							}
-							if (!$error) {
+							/*if (!$error) {
 								$valid = true;
 								$sourcetouse = 'boothlocation';
 								$reftouse = $facture->id;
@@ -450,54 +455,12 @@ if (empty($reshook) && $action == 'add') {
 								}
 								Header("Location: ".$redirection);
 								exit;
-							}
+							}*/
 						}
 					} else {
 						// If no price has been set for the booth, we confirm it as suggested and we update
 						$conforbooth->status = ConferenceOrBooth::STATUS_SUGGESTED;
 						$conforbooth->update($user);
-						// Sending mail
-						require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-						include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-						$formmail = new FormMail($db);
-						// Set output language
-						$outputlangs = new Translate('', $conf);
-						$outputlangs->setDefaultLang(empty($thirdparty->default_lang) ? $mysoc->default_lang : $thirdparty->default_lang);
-						// Load traductions files required by page
-						$outputlangs->loadLangs(array("main", "members"));
-						// Get email content from template
-						$arraydefaultmessage = null;
-
-						$labeltouse = $conf->global->EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH;
-						if (!empty($labeltouse)) {
-							$arraydefaultmessage = $formmail->getEMailTemplate($db, 'conferenceorbooth', $user, $outputlangs, $labeltouse, 1, '');
-						}
-
-						if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
-							$subject = $arraydefaultmessage->topic;
-							$msg     = $arraydefaultmessage->content;
-						}
-
-						$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $thirdparty);
-						complete_substitutions_array($substitutionarray, $outputlangs, $object);
-
-						$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
-						$texttosend = make_substitutions($msg, $substitutionarray, $outputlangs);
-
-						$sendto = $thirdparty->email;
-						$from = $conf->global->MAILING_EMAIL_FROM;
-						$urlback = $_SERVER["REQUEST_URI"];
-
-						$ishtml = dol_textishtml($texttosend); // May contain urls
-
-						$mailfile = new CMailFile($subjecttosend, $sendto, $from, $texttosend, array(), array(), array(), '', '', 0, $ishtml);
-
-						$result = $mailfile->sendfile();
-						if ($result) {
-							dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_payment');
-						} else {
-							dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
-						}
 					}
 				}
 			}
@@ -505,6 +468,50 @@ if (empty($reshook) && $action == 'add') {
 	}
 	if (!$error) {
 		$db->commit();
+
+		// Sending mail
+		require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+		$formmail = new FormMail($db);
+		// Set output language
+		$outputlangs = new Translate('', $conf);
+		$outputlangs->setDefaultLang(empty($thirdparty->default_lang) ? $mysoc->default_lang : $thirdparty->default_lang);
+		// Load traductions files required by page
+		$outputlangs->loadLangs(array("main", "members"));
+		// Get email content from template
+		$arraydefaultmessage = null;
+
+		$labeltouse = $conf->global->EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH;
+		if (!empty($labeltouse)) {
+			$arraydefaultmessage = $formmail->getEMailTemplate($db, 'conferenceorbooth', $user, $outputlangs, $labeltouse, 1, '');
+		}
+
+		if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
+			$subject = $arraydefaultmessage->topic;
+			$msg     = $arraydefaultmessage->content;
+		}
+
+		$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $thirdparty);
+		complete_substitutions_array($substitutionarray, $outputlangs, $object);
+
+		$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
+		$texttosend = make_substitutions($msg, $substitutionarray, $outputlangs);
+
+		$sendto = $thirdparty->email;
+		$from = $conf->global->MAILING_EMAIL_FROM;
+		$urlback = $_SERVER["REQUEST_URI"];
+
+		$ishtml = dol_textishtml($texttosend); // May contain urls
+
+		$mailfile = new CMailFile($subjecttosend, $sendto, $from, $texttosend, array(), array(), array(), '', '', 0, $ishtml);
+
+		$result = $mailfile->sendfile();
+		if ($result) {
+			dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_payment');
+		} else {
+			dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
+		}
+
 		$securekeyurl = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$id, 2);
 		$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?id='.$id.'&securekey='.$securekeyurl;
 		Header("Location: ".$redirection);
@@ -630,12 +637,23 @@ print '</td><td><input type="text" name="label" class="minwidth150" value="'.dol
 print '<tr><td>'.$langs->trans("Description").'<FONT COLOR="red">*</FONT></td>'."\n";
 print '<td><textarea name="note" id="note" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.dol_escape_htmltag(GETPOST('note', 'restricthtml'), 0, 1).'</textarea></td></tr>'."\n";
 // Start Date
-print '<tr><td>'.$langs->trans("DateStart").'<FONT COLOR="red">*</FONT></td>'."\n";
-print '<td><input type="date" name="datestart" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('datestart')).'"></td></tr>'."\n";
+print '<tr><td>'.$langs->trans("DateStart").'<FONT COLOR="red">*</FONT>';
+if (!empty($project->date_start)) {
+	print '('.$langs->trans('Min'). ' '.dol_print_date($project->date_start).')';
+}
+print '</td>'."\n";
+print '<td>';
+print $form->selectDate((empty($datestart)?$project->date_start:$datestart), 'datestart');
+print '</td></tr>'."\n";
 // End Date
-print '<tr><td>'.$langs->trans("DateEnd").'<FONT COLOR="red">*</FONT></td>'."\n";
-print '<td><input type="date" name="dateend" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('dateend')).'"></td></tr>'."\n";
-
+print '<tr><td>'.$langs->trans("DateEnd").'<FONT COLOR="red">*</FONT>';
+if (!empty($project->date_end)) {
+	print '('.$langs->trans('Max'). ' '.dol_print_date($project->date_end).')';
+}
+print '</td>'."\n";
+print '<td>';
+print $form->selectDate(empty($dateend)?$project->date_end:$dateend, 'dateend');
+print '</td></tr>'."\n";
 
 print "</table>\n";
 

From 78646d10bb80f5b94ccaf7475ff6a544822d5b09 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Thu, 29 Jul 2021 17:26:17 +0200
Subject: [PATCH 1337/1497] tpl object linked

---
 .../tpl/linkedobjectblock.tpl.php             | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/htdocs/eventorganization/tpl/linkedobjectblock.tpl.php b/htdocs/eventorganization/tpl/linkedobjectblock.tpl.php
index f67e086a575..f2bb6f0c3ae 100644
--- a/htdocs/eventorganization/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/eventorganization/tpl/linkedobjectblock.tpl.php
@@ -36,10 +36,24 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 	echo '<tr class="oddeven">';
 	echo '<td>' . $langs->trans(get_class($objectlink)) . '</td>';
 	echo '<td>'.$objectlink->getNomUrl(1).'</td>';
-	echo '<td class="center"></td>';
-	echo '<td class="center"></td>';
-	echo '<td class="right"></td>';
-	echo '<td class="right"></td>';
+	echo '<td class="center">';
+	if (get_class($objectlink)=='ConferenceOrBooth') {
+		print  dol_trunc($objectlink->label, 20);
+	}
+	print '</td>';
+	echo '<td class="center">';
+	if (get_class($objectlink)=='ConferenceOrBoothAttendee') {
+		print dol_print_date($objectlink->date_subscription);
+	} else {
+		print dol_print_date($objectlink->datep);
+	}
+	print '</td>';
+	echo '<td class="right">';
+	if (get_class($objectlink)=='ConferenceOrBoothAttendee') {
+		print price($objectlink->amount);
+	}
+	print '</td>';
+	echo '<td class="right">'.$objectlink->getLibStatut(3).'</td>';
 	echo '<td class="right"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key.'">'.img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink').'</a></td>';
 	echo '</tr>';
 }

From 12b2ba64eb7a8a2dd5f6b84c0d692e1bdf0e040b Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Thu, 29 Jul 2021 17:49:37 +0200
Subject: [PATCH 1338/1497] Fix right check on thirdparty set on ticket card

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

diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index aaf5b29a985..08d9330a4c6 100644
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -449,7 +449,7 @@ if (empty($reshook)) {
 	}
 
 	// Set parent company
-	if ($action == 'set_thirdparty' && $user->rights->societe->creer) {
+	if ($action == 'set_thirdparty' && $user->rights->ticket->write) {
 		if ($object->fetch(GETPOST('id', 'int'), '', GETPOST('track_id', 'alpha')) >= 0) {
 			$result = $object->setCustomer(GETPOST('editcustomer', 'int'));
 			$url = 'card.php?action=view&track_id=' . GETPOST('track_id', 'alpha');

From 6f3080c67c1e1bb5678e4f3cbc1b488568ae8b82 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Thu, 29 Jul 2021 19:24:12 +0200
Subject: [PATCH 1339/1497] send mail from ConfOrBooth list to attendees or
 santd company

---
 htdocs/core/class/html.formmail.class.php     |   2 +-
 .../conferenceorbooth_contact.php             |  10 +-
 .../conferenceorbooth_document.php            |  11 +-
 .../conferenceorbooth_list.php                |  15 +-
 .../conferenceorboothattendee_list.php        |  10 +-
 .../core/actions_massactions_mail.inc.php     | 315 ++++++++++++++++++
 .../tpl/massactions_mail_pre.tpl.php          | 130 ++++++++
 .../mysql/data/llx_c_email_templates.sql      |  12 +-
 htdocs/langs/fr_FR/eventorganization.lang     |   4 +-
 9 files changed, 492 insertions(+), 17 deletions(-)
 create mode 100644 htdocs/eventorganization/core/actions_massactions_mail.inc.php
 create mode 100644 htdocs/eventorganization/tpl/massactions_mail_pre.tpl.php

diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 06b6a18b870..9da814f3369 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -1255,7 +1255,7 @@ class FormMail extends Form
 	 */
 	public function getEMailTemplate($db, $type_template, $user, $outputlangs, $id = 0, $active = 1, $label = '')
 	{
-		global $conf;
+		global $conf, $langs;
 
 		$ret = new ModelMail();
 
diff --git a/htdocs/eventorganization/conferenceorbooth_contact.php b/htdocs/eventorganization/conferenceorbooth_contact.php
index 4906a4e05e3..8595da92652 100644
--- a/htdocs/eventorganization/conferenceorbooth_contact.php
+++ b/htdocs/eventorganization/conferenceorbooth_contact.php
@@ -309,7 +309,15 @@ if (!empty($withproject)) {
 	print "</td></tr>";
 
 	print '<tr><td valign="middle">'.$langs->trans("EventOrganizationICSLink").'</td><td>';
-	print '';
+	// Define $urlwithroot
+	$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
+	$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT;
+
+	// Show message
+	$message = '<a href="'.$urlwithroot.'/public/agenda/agendaexport.php?format=ical'.($conf->entity > 1 ? "&entity=".$conf->entity : "");
+	$message .= '&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : '...');
+	$message .= "&project=".$projectstatic->id.'&module='.urlencode('@eventorganization').'&status='.ConferenceOrBooth::STATUS_CONFIRMED.'">'.$langs->trans('DownloadICSLink').'</a>';
+	print $message;
 	print "</td></tr>";
 
 	print '</table>';
diff --git a/htdocs/eventorganization/conferenceorbooth_document.php b/htdocs/eventorganization/conferenceorbooth_document.php
index fc3673d618f..8b064c12b72 100644
--- a/htdocs/eventorganization/conferenceorbooth_document.php
+++ b/htdocs/eventorganization/conferenceorbooth_document.php
@@ -266,8 +266,15 @@ if (!empty($withproject)) {
 	print "</td></tr>";
 
 	print '<tr><td valign="middle">'.$langs->trans("EventOrganizationICSLink").'</td><td>';
-	print '';
-	//TODO fill with ics
+	// Define $urlwithroot
+	$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
+	$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT;
+
+	// Show message
+	$message = '<a href="'.$urlwithroot.'/public/agenda/agendaexport.php?format=ical'.($conf->entity > 1 ? "&entity=".$conf->entity : "");
+	$message .= '&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : '...');
+	$message .= "&project=".$projectstatic->id.'&module='.urlencode('@eventorganization').'&status='.ConferenceOrBooth::STATUS_CONFIRMED.'">'.$langs->trans('DownloadICSLink').'</a>';
+	print $message;
 	print "</td></tr>";
 
 	print '</table>';
diff --git a/htdocs/eventorganization/conferenceorbooth_list.php b/htdocs/eventorganization/conferenceorbooth_list.php
index ab595e8b86e..270c87fb15c 100644
--- a/htdocs/eventorganization/conferenceorbooth_list.php
+++ b/htdocs/eventorganization/conferenceorbooth_list.php
@@ -173,7 +173,10 @@ if (GETPOST('cancel', 'alpha')) {
 	$action = 'list';
 	$massaction = '';
 }
-if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend'
+	&& $massaction != 'presend_attendees'
+	&& $massaction != 'confirm_presend'
+	&& $massaction != 'confirm_presend_attendees') {
 	$massaction = '';
 }
 
@@ -211,6 +214,7 @@ if (empty($reshook)) {
 	$objectclass = 'ConferenceOrBooth';
 	$objectlabel = 'ConferenceOrBooth';
 	$uploaddir = $conf->eventorganization->dir_output;
+	include DOL_DOCUMENT_ROOT.'/eventorganization/core/actions_massactions_mail.inc.php';
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
 
@@ -581,12 +585,13 @@ $arrayofmassactions = array(
 	//'validate'=>img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans("Validate"),
 	//'generate_doc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("ReGeneratePDF"),
 	//'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
-	//'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
+	'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail").' - '.$langs->trans("ConferenceOrBooth"),
+	'presend_attendees'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail").' - '.$langs->trans("Attendees"),
 );
 if ($permissiontodelete) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 }
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
+if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'presend_attendees', 'predelete'))) {
 	$arrayofmassactions = array();
 }
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
@@ -610,9 +615,11 @@ print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sort
 $topicmail = "SendConferenceOrBoothRef";
 $modelmail = "conferenceorbooth";
 $objecttmp = new ConferenceOrBooth($db);
-$trackid = 'xxxx'.$object->id;
+$trackid = 'conferenceorbooth_'.$object->id;
+include DOL_DOCUMENT_ROOT.'/eventorganization/tpl/massactions_mail_pre.tpl.php';
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
+
 if ($search_all) {
 	foreach ($fieldstosearchall as $key => $val) {
 		$fieldstosearchall[$key] = $langs->trans($val);
diff --git a/htdocs/eventorganization/conferenceorboothattendee_list.php b/htdocs/eventorganization/conferenceorboothattendee_list.php
index 658640d5834..e8e86a2641a 100644
--- a/htdocs/eventorganization/conferenceorboothattendee_list.php
+++ b/htdocs/eventorganization/conferenceorboothattendee_list.php
@@ -499,7 +499,15 @@ if ($confOrBooth->id > 0) {
 		print "</td></tr>";
 
 		print '<tr><td valign="middle">'.$langs->trans("EventOrganizationICSLink").'</td><td>';
-		print '';
+		// Define $urlwithroot
+		$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
+		$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT;
+
+		// Show message
+		$message = '<a href="'.$urlwithroot.'/public/agenda/agendaexport.php?format=ical'.($conf->entity > 1 ? "&entity=".$conf->entity : "");
+		$message .= '&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : '...');
+		$message .= "&project=".$projectstatic->id.'&module='.urlencode('@eventorganization').'&status='.ConferenceOrBooth::STATUS_CONFIRMED.'">'.$langs->trans('DownloadICSLink').'</a>';
+		print $message;
 		print "</td></tr>";
 
 		print '</table>';
diff --git a/htdocs/eventorganization/core/actions_massactions_mail.inc.php b/htdocs/eventorganization/core/actions_massactions_mail.inc.php
new file mode 100644
index 00000000000..483a1e5bc84
--- /dev/null
+++ b/htdocs/eventorganization/core/actions_massactions_mail.inc.php
@@ -0,0 +1,315 @@
+<?php
+/* Copyright (C) 2015-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2018-2021 Nicolas ZABOURI	<info@inovea-conseil.com>
+ * Copyright (C) 2018 	   Juanjo Menent  <jmenent@2byte.es>
+ * Copyright (C) 2019 	   Ferran Marcet  <fmarcet@2byte.es>
+ * Copyright (C) 2019-2021 Frédéric France <frederic.france@netlogic.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ * or see https://www.gnu.org/
+ */
+
+/**
+ *    \file            htdocs/core/actions_massactions.inc.php
+ *  \brief            Code for actions done with massaction button (send by email, merge pdf, delete, ...)
+ */
+
+
+// $massaction must be defined
+// $objectclass and $objectlabel must be defined
+// $parameters, $object, $action must be defined for the hook.
+
+// $permissiontoread, $permissiontoadd, $permissiontodelete, $permissiontoclose may be defined
+// $uploaddir may be defined (example to $conf->projet->dir_output."/";)
+// $toselect may be defined
+// $diroutputmassaction may be defined
+
+
+// Protection
+if (empty($objectclass) || empty($uploaddir)) {
+	dol_print_error(null, 'include of actions_massactions.inc.php is done but var $objectclass or $uploaddir was not defined');
+	exit;
+}
+
+// For backward compatibility
+if (!empty($permtoread) && empty($permissiontoread)) {
+	$permissiontoread = $permtoread;
+}
+if (!empty($permtocreate) && empty($permissiontoadd)) {
+	$permissiontoadd = $permtocreate;
+}
+if (!empty($permtodelete) && empty($permissiontodelete)) {
+	$permissiontodelete = $permtodelete;
+}
+
+
+// Mass actions. Controls on number of lines checked.
+$maxformassaction = (empty($conf->global->MAIN_LIMIT_FOR_MASS_ACTIONS) ? 1000 : $conf->global->MAIN_LIMIT_FOR_MASS_ACTIONS);
+if (!empty($massaction) && is_array($toselect) && count($toselect) < 1) {
+	$error++;
+	setEventMessages($langs->trans("NoRecordSelected"), null, "warnings");
+}
+if (!$error && is_array($toselect) && count($toselect) > $maxformassaction) {
+	setEventMessages($langs->trans('TooManyRecordForMassAction', $maxformassaction), null, 'errors');
+	$error++;
+}
+
+if (!$error && $massaction == 'confirm_presend_attendees' && !GETPOST('sendmail')) {  // If we do not choose button send (for example when we change template or limit), we must not send email, but keep on send email form
+	$massaction = 'presend_attendees';
+}
+if (!$error && $massaction == 'confirm_presend_attendees') {
+	$resaction = '';
+	$nbsent = 0;
+	$nbignored = 0;
+	$langs->load("mails");
+	include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+
+	$listofobjectid = array();
+
+	$listofobjectref = array();
+	$oneemailperrecipient = (GETPOST('oneemailperrecipient') == 'on' ? 1 : 0);
+
+	if (!$error) {
+		require_once DOL_DOCUMENT_ROOT . '/eventorganization/class/conferenceorboothattendee.class.php';
+		$attendee = new ConferenceOrBoothAttendee($db);
+		$listofselectedid = array();
+		$listofselectedref = array();
+		$objecttmp = new $objectclass($db);
+
+		foreach ($toselect as $toselectid) {
+			$result = $objecttmp->fetch($toselectid);
+			if ($result > 0) {
+				$attendees = $attendee->fetchAll('', '', 0, 0, array('t.fk_actioncomm' => $objecttmp->id));
+				if (is_array($attendees) && count($attendees) > 0) {
+					foreach ($attendees as $attmail) {
+						if (!empty($attmail->email)) {
+							$attmail->fetch_thirdparty();
+							$listofselectedid[$attmail->email] = $attmail;
+							$listofselectedref[$attmail->email] = $objecttmp;
+						}
+					}
+				}
+			}
+		}
+	}
+
+	// Check mandatory parameters
+	if (GETPOST('fromtype', 'alpha') === 'user' && empty($user->email)) {
+		$error++;
+		setEventMessages($langs->trans("NoSenderEmailDefined"), null, 'warnings');
+		$massaction = 'presend_attendees';
+	}
+
+	$receiver = $_POST['receiver'];
+	if (!is_array($receiver)) {
+		if (empty($receiver) || $receiver == '-1') {
+			$receiver = array();
+		} else {
+			$receiver = array($receiver);
+		}
+	}
+	if (!trim($_POST['sendto']) && count($receiver) == 0 && count($listofselectedid) == 1) {    // if only one recipient, receiver is mandatory
+		$error++;
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Recipient")), null, 'warnings');
+		$massaction = 'presend_attendees';
+	}
+
+	if (!GETPOST('subject', 'restricthtml')) {
+		$error++;
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("MailTopic")), null, 'warnings');
+		$massaction = 'presend_attendees';
+	}
+
+	if (!$error) {
+		$objecttmp->fetch_thirdparty();
+		foreach ($listofselectedid as $email => $attendees) {
+			$sendto = '';
+			$sendtocc = '';
+			$sendtobcc = '';
+			$sendtoid = array();
+
+			// Define $sendto
+			$sendto = $attendees->thirdparty->name . '<' . trim($attendees->email) . '>';
+
+			// Define $sendtocc
+			$receivercc = $_POST['receivercc'];
+			if (!is_array($receivercc)) {
+				if ($receivercc == '-1') {
+					$receivercc = array();
+				} else {
+					$receivercc = array($receivercc);
+				}
+			}
+			$tmparray = array();
+			if (trim($_POST['sendtocc'])) {
+				$tmparray[] = trim($_POST['sendtocc']);
+			}
+			$sendtocc = implode(',', $tmparray);
+
+
+			$langs->load("commercial");
+
+			$reg = array();
+			$fromtype = GETPOST('fromtype');
+			if ($fromtype === 'user') {
+				$from = $user->getFullName($langs) . ' <' . $user->email . '>';
+			} elseif ($fromtype === 'company') {
+				$from = $conf->global->MAIN_INFO_SOCIETE_NOM . ' <' . $conf->global->MAIN_INFO_SOCIETE_MAIL . '>';
+			} elseif (preg_match('/user_aliases_(\d+)/', $fromtype, $reg)) {
+				$tmp = explode(',', $user->email_aliases);
+				$from = trim($tmp[($reg[1] - 1)]);
+			} elseif (preg_match('/global_aliases_(\d+)/', $fromtype, $reg)) {
+				$tmp = explode(',', $conf->global->MAIN_INFO_SOCIETE_MAIL_ALIASES);
+				$from = trim($tmp[($reg[1] - 1)]);
+			} elseif (preg_match('/senderprofile_(\d+)_(\d+)/', $fromtype, $reg)) {
+				$sql = 'SELECT rowid, label, email FROM ' . MAIN_DB_PREFIX . 'c_email_senderprofile WHERE rowid = ' . (int) $reg[1];
+				$resql = $db->query($sql);
+				$obj = $db->fetch_object($resql);
+				if ($obj) {
+					$from = $obj->label . ' <' . $obj->email . '>';
+				}
+			} else {
+				$from = $_POST['fromname'] . ' <' . $_POST['frommail'] . '>';
+			}
+
+			$replyto = $from;
+			$subject = GETPOST('subject', 'restricthtml');
+			$message = GETPOST('message', 'restricthtml');
+
+			$sendtobcc = GETPOST('sendtoccc');
+
+			// $objecttmp is a real object or an empty object if we choose to send one email per thirdparty instead of one per object
+			// Make substitution in email content
+			$substitutionarray = getCommonSubstitutionArray($langs, 0, null, $attendees);
+
+			if (!empty($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY)) {
+				$urlwithouturlroot = preg_replace('/' . preg_quote(DOL_URL_ROOT, '/') . '$/i', '', trim($dolibarr_main_url_root));
+				$urlwithroot = $urlwithouturlroot . DOL_URL_ROOT;
+				$url_link = $urlwithroot . '/public/agenda/agendaexport.php?format=ical' . ($conf->entity > 1 ? "&entity=" . $conf->entity : "");
+				$url_link .= '&exportkey=' . ($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ? urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : '...');
+				$url_link .= "&project=" . $listofselectedref[$email]->fk_project . '&module=' . urlencode('@eventorganization') . '&status=' . ConferenceOrBooth::STATUS_CONFIRMED;
+				$html_link = '<a href="' . $url_link . '">' . $langs->trans('DownloadICSLink') . '</a>';
+			}
+			$substitutionarray['__EVENTORGANIZATION_ICS_LINK__'] = $html_link;
+			$substitutionarray['__EVENTORGANIZATION_URL_LINK__'] = $url_link;
+			$substitutionarray['__CHECK_READ__'] = '<img src="' . DOL_MAIN_URL_ROOT . '/public/emailing/mailing-read.php?tag=' . urlencode($attendees->thirdparty->tag) . '&securitykey=' . urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY) . '" width="1" height="1" style="width:1px;height:1px" border="0"/>';
+
+			$parameters = array('mode' => 'formemail');
+
+			if (!empty($listofobjectref)) {
+				$parameters['listofobjectref'] = $listofobjectref;
+			}
+
+			complete_substitutions_array($substitutionarray, $langs, $attendees, $parameters);
+
+			$subjectreplaced = make_substitutions($subject, $substitutionarray);
+			$messagereplaced = make_substitutions($message, $substitutionarray);
+
+
+			if (empty($sendcontext)) {
+				$sendcontext = 'standard';
+			}
+
+			// Send mail (substitutionarray must be done just before this)
+			require_once DOL_DOCUMENT_ROOT . '/core/class/CMailFile.class.php';
+			$mailfile = new CMailFile($subjectreplaced, $sendto, $from, $messagereplaced, array(), array(), array(), $sendtocc, $sendtobcc, $deliveryreceipt, -1, '', '', "attendees_".$attendees->id, '', $sendcontext);
+			if ($mailfile->error) {
+				$resaction .= '<div class="error">' . $mailfile->error . '</div>';
+			} else {
+				$result = $mailfile->sendfile();
+				if ($result) {
+					$resaction .= $langs->trans('MailSuccessfulySent', $mailfile->getValidAddress($from, 2), $mailfile->getValidAddress($sendto, 2)) . '<br>'; // Must not contain "
+					$error = 0;
+
+					dol_syslog("Try to insert email event into agenda for objid=" . $attendees->id . " => objectobj=" . get_class($attendees));
+
+					$actionmsg = $langs->transnoentities('MailSentBy') . ' ' . $from . ' ' . $langs->transnoentities('To') . ' ' . $sendto;
+					if ($message) {
+						if ($sendtocc) {
+							$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc') . ": " . $sendtocc);
+						}
+						$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic') . ": " . $subjectreplaced);
+						$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody') . ":");
+						$actionmsg = dol_concatdesc($actionmsg, $messagereplaced);
+					}
+					$actionmsg2 = '';
+
+					$objectobj2 = $listofselectedref[$email];
+					// Initialisation donnees
+					$objectobj2->actionmsg = $actionmsg; // Long text
+					$objectobj2->actionmsg2 = $actionmsg2; // Short text
+					$objectobj2->fk_element = $objectobj2->id;
+					$objectobj2->elementtype = $objectobj2->element;
+
+					$triggername = 'CONFERENCEORBOOTHATTENDEE_SENTBYMAIL';
+					if (!empty($triggername)) {
+						// Call trigger
+						$result = $objectobj2->call_trigger($triggername, $user);
+						if ($result < 0) {
+							$error++;
+						}
+						// End call triggers
+
+						if ($error) {
+							setEventMessages($db->lasterror(), $objectobj2->errors, 'errors');
+							dol_syslog("Error in trigger " . $triggername . ' ' . $db->lasterror(), LOG_ERR);
+						}
+					}
+
+					$nbsent++; // Nb of object sent
+				} else {
+					$langs->load("other");
+					if ($mailfile->error) {
+						$resaction .= $langs->trans('ErrorFailedToSendMail', $from, $sendto);
+						$resaction .= '<br><div class="error">' . $mailfile->error . '</div>';
+					} elseif (!empty($conf->global->MAIN_DISABLE_ALL_MAILS)) {
+						$resaction .= '<div class="warning">No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS</div>';
+					} else {
+						$resaction .= $langs->trans('ErrorFailedToSendMail', $from, $sendto) . '<br><div class="error">(unhandled error)</div>';
+					}
+				}
+			}
+		}
+	}
+	$resaction .= ($resaction ? '<br>' : $resaction);
+	$resaction .= '<strong>' . $langs->trans("ResultOfMailSending") . ':</strong><br>' . "\n";
+	$resaction .= $langs->trans("NbSelected") . ': ' . count($toselect) . "\n<br>";
+	$resaction .= $langs->trans("NbIgnored") . ': ' . ($nbignored ? $nbignored : 0) . "\n<br>";
+	$resaction .= $langs->trans("NbSent") . ': ' . ($nbsent ? $nbsent : 0) . "\n<br>";
+
+	if ($nbsent) {
+		$action = ''; // Do not show form post if there was at least one successfull sent
+		//setEventMessages($langs->trans("EMailSentToNRecipients", $nbsent.'/'.count($toselect)), null, 'mesgs');
+		setEventMessages($langs->trans("EMailSentForNElements", $nbsent . '/' . count($toselect)), null, 'mesgs');
+		setEventMessages($resaction, null, 'mesgs');
+	} else {
+		//setEventMessages($langs->trans("EMailSentToNRecipients", 0), null, 'warnings');  // May be object has no generated PDF file
+		setEventMessages($resaction, null, 'warnings');
+	}
+
+	$action = 'list';
+	$massaction = '';
+}
+
+
+
+$parameters['toselect'] = $toselect;
+$parameters['uploaddir'] = $uploaddir;
+$parameters['massaction'] = $massaction;
+$parameters['diroutputmassaction'] = isset($diroutputmassaction) ? $diroutputmassaction : null;
+
+$reshook = $hookmanager->executeHooks('doMassActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
diff --git a/htdocs/eventorganization/tpl/massactions_mail_pre.tpl.php b/htdocs/eventorganization/tpl/massactions_mail_pre.tpl.php
new file mode 100644
index 00000000000..17c78babfea
--- /dev/null
+++ b/htdocs/eventorganization/tpl/massactions_mail_pre.tpl.php
@@ -0,0 +1,130 @@
+<?php
+/* Copyright (C)    2013      Cédric Salvador     <csalvador@gpcsolutions.fr>
+ * Copyright (C)    2013-2014 Laurent Destailleur <eldy@users.sourceforge.net>
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ * or see https://www.gnu.org/
+ */
+
+// Following var must be set:
+// $arrayofselected = array of id selected
+// $object
+// $objecttmp=new Propal($db);
+// $topicmail="SendSupplierProposalRef";
+// $modelmail="supplier_proposal_send";
+// $trackid='ord'.$object->id;
+
+if ($massaction == 'presend_attendees') {
+	$langs->load("mails");
+	require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorboothattendee.class.php';
+	$attendee = new ConferenceOrBoothAttendee($db);
+	$listofselectedid = array();
+	$listofselectedref = array();
+
+	if (!GETPOST('cancel', 'alpha')) {
+		foreach ($arrayofselected as $toselectid) {
+			$result = $objecttmp->fetch($toselectid);
+			if ($result > 0) {
+				$attendees = $attendee->fetchAll('', '', 0, 0, array('t.fk_actioncomm'=>$objecttmp->id));
+				if (is_array($attendees) && count($attendees)>0) {
+					foreach ($attendees as $attmail) {
+						if (!empty($attmail->email)) {
+							$listofselectedid[$attmail->email] = $attmail->id;
+							$listofselectedref[$attmail->id][$toselectid] = $objecttmp->ref;
+						}
+					}
+				}
+			}
+		}
+	}
+
+	print '<input type="hidden" name="massaction" value="confirm_presend_attendees">';
+	print '<input type="hidden" name="projectid" value="'.GETPOST('projectid', 'int').'">';
+
+	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+	$formmail = new FormMail($db);
+
+	print dol_get_fiche_head(null, '', '');
+
+	// Cree l'objet formulaire mail
+	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+	$formmail = new FormMail($db);
+	$formmail->withform = -1;
+	$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 = $trackid;
+	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, $trackid);
+	}
+	$formmail->withfrom = 1;
+	$liste = $langs->trans("AllRecipientSelected", count($listofselectedid));
+	$formmail->withtoreadonly = 1;
+
+	$formmail->withoptiononeemailperrecipient = ((count($listofselectedref) == 1 && count(reset($listofselectedref)) == 1) || empty($liste)) ? 0 : ((GETPOST('oneemailperrecipient') == 'on') ? 1 : -1);
+
+	$formmail->withto = empty($liste) ? (GETPOST('sendto', 'alpha') ?GETPOST('sendto', 'alpha') : array()) : $liste;
+	$formmail->withtofree = empty($liste) ? 1 : 0;
+	$formmail->withtocc = 1;
+	$formmail->withtoccc = $conf->global->MAIN_EMAIL_USECCC;
+	$formmail->withtopic = $langs->transnoentities($topicmail, '__REF__', '__REF_CLIENT__');
+	$formmail->withfile = 0;
+	// $formmail->withfile = 2; Not yet supported in mass action
+	$formmail->withmaindocfile = 0; // Add a checkbox "Attach also main document"
+	$formmail->withbody = 1;
+	$formmail->withdeliveryreceipt = 1;
+	$formmail->withcancel = 1;
+
+	// Make substitution in email content
+	$substitutionarray = getCommonSubstitutionArray($langs, 0, null, $object);
+
+	$substitutionarray['__EMAIL__'] = $sendto;
+	$substitutionarray['__CHECK_READ__'] = (is_object($object) && is_object($object->thirdparty)) ? '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.urlencode($object->thirdparty->tag).'&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" width="1" height="1" style="width:1px;height:1px" border="0"/>' : '';
+	$substitutionarray['__PERSONALIZED__'] = ''; // deprecated
+	$substitutionarray['__CONTACTCIVNAME__'] = '';
+
+	$parameters = array(
+		'mode' => 'formemail'
+	);
+	complete_substitutions_array($substitutionarray, $langs, $object, $parameters);
+
+	// Tableau des substitutions
+	$formmail->substit = $substitutionarray;
+
+	// Tableau des parametres complementaires du post
+	$formmail->param['action'] = $action;
+	$formmail->param['models'] = $modelmail;
+	$formmail->param['models_id'] = empty(GETPOST('modelmailselected', 'int'))?$conf->global->EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES:GETPOST('modelmailselected', 'int');
+	$formmail->param['id'] = join(',', $arrayofselected);
+	// $formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
+	if (!empty($conf->global->MAILING_LIMIT_SENDBYWEB) && count($listofselectedid) > $conf->global->MAILING_LIMIT_SENDBYWEB) {
+		$langs->load("errors");
+		print img_warning().' '.$langs->trans('WarningNumberOfRecipientIsRestrictedInMassAction', $conf->global->MAILING_LIMIT_SENDBYWEB);
+		print ' - <a href="javascript: window.history.go(-1)">'.$langs->trans("GoBack").'</a>';
+		$arrayofmassactions = array();
+	} else {
+		print $formmail->get_form();
+	}
+
+	print dol_get_fiche_end();
+}
+// Allow Pre-Mass-Action hook (eg for confirmation dialog)
+$parameters = array(
+	'toselect' => $toselect,
+	'uploaddir' => isset($uploaddir) ? $uploaddir : null
+);
diff --git a/htdocs/install/mysql/data/llx_c_email_templates.sql b/htdocs/install/mysql/data/llx_c_email_templates.sql
index e2b1cd65077..393875dd40f 100644
--- a/htdocs/install/mysql/data/llx_c_email_templates.sql
+++ b/htdocs/install/mysql/data/llx_c_email_templates.sql
@@ -35,9 +35,9 @@ INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private,
 INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, enabled, active, topic, content, content_lines, joinfiles) VALUES (0,'recruitment','recruitmentcandidature_send','',0,null,null,'(AnswerCandidature)'       ,100,'$conf->recruitment->enabled',1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(YourCandidature)__',       '__(Hello)__ __CANDIDATE_FULLNAME__,<br><br>\n\n__(YourCandidatureAnswerMessage)__<br>__ONLINE_INTERVIEW_SCHEDULER_TEXT_AND_URL__\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',null, 0);
 
 -- Event organization 
-INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'conferenceorbooth', '', 0, null, null, 'EventOrganizationEmailAskConf',       10, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailAskConf)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventConfRequestWasReceived)__<br /><br />__ONLINE_PAYMENT_TEXT_AND_URL__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
-INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'conferenceorbooth', '', 0, null, null, 'EventOrganizationEmailAskBooth',      20, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailAskBooth)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventBoothRequestWasReceived)__<br /><br />__ONLINE_PAYMENT_TEXT_AND_URL__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
-INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'conferenceorbooth', '', 0, null, null, 'EventOrganizationEmailSubsBooth',     30, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailSubsBooth)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventBoothSubscriptionWasReceived)__<br /><br />__ONLINE_PAYMENT_TEXT_AND_URL__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
-INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'conferenceorbooth', '', 0, null, null, 'EventOrganizationEmailSubsEvent',     40, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailSubsEvent)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventEventSubscriptionWasReceived)__<br /><br />__(Sincerely)__<br /><br />__MYCOMPANY_NAME__<br />__USER_SIGNATURE__', null, '1', null);
-INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'conferenceorbooth', '', 0, null, null, 'EventOrganizationMassEmailAttendees', 50, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationMassEmailAttendees)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventBulkMailToAttendees)__<br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
-INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'conferenceorbooth', '', 0, null, null, 'EventOrganizationMassEmailSpeakers',  60, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationMassEmailSpeakers)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventBulkMailToSpeakers)__<br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
+INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'conferenceorbooth', '', 0, null, null, '(EventOrganizationEmailAskConf)',       10, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailAskConf)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventConfRequestWasReceived)__<br /><br />__ONLINE_PAYMENT_TEXT_AND_URL__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
+INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'conferenceorbooth', '', 0, null, null, '(EventOrganizationEmailAskBooth)',      20, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailAskBooth)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventBoothRequestWasReceived)__<br /><br />__ONLINE_PAYMENT_TEXT_AND_URL__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
+INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'conferenceorbooth', '', 0, null, null, '(EventOrganizationEmailSubsBooth)',     30, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailSubsBooth)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventBoothSubscriptionWasReceived)__<br /><br />__ONLINE_PAYMENT_TEXT_AND_URL__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
+INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'conferenceorbooth', '', 0, null, null, '(EventOrganizationEmailSubsEvent)',     40, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailSubsEvent)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventEventSubscriptionWasReceived)__<br /><br />__(Sincerely)__<br /><br />__MYCOMPANY_NAME__<br />__USER_SIGNATURE__', null, '1', null);
+INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'conferenceorbooth', '', 0, null, null, '(EventOrganizationMassEmailAttendees)', 50, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationMassEmailAttendees)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventBulkMailToAttendees)__<br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
+INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'conferenceorbooth', '', 0, null, null, '(EventOrganizationMassEmailSpeakers)',  60, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationMassEmailSpeakers)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventBulkMailToSpeakers)__<br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
diff --git a/htdocs/langs/fr_FR/eventorganization.lang b/htdocs/langs/fr_FR/eventorganization.lang
index 7ef2977adc3..ef7de0fd710 100644
--- a/htdocs/langs/fr_FR/eventorganization.lang
+++ b/htdocs/langs/fr_FR/eventorganization.lang
@@ -40,8 +40,8 @@ EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Modèle de courriel à envoyer aprè
 EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Modèle de courriel à envoyer après avoir reçu une suggestion d'un stand.
 EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Modèle de courriel à envoyer après paiement d'une inscription à un stand.
 EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Modèle de courriel à envoyer après paiement d'une inscription à un événement.
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Modèle de courriel pour action de masse aux participants
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Modèle de courriel pour action de masse aux intervenants
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Modèle de courriel pour action de masse aux intervenants
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Modèle de courriel pour action de masse aux participants
 EVENTORGANIZATION_FILTERATTENDEES_CAT = Filtrer la liste de sélection des tiers dans la fiche/le formulaire de création des participants avec/selon la catégorie
 EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filtrer la liste de sélection des tiers dans la fiche/le formulaire de création des participants avec le type de client
 

From f02dee2e2128e07b5f11082fcc8eb307085cf941 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 29 Jul 2021 23:47:59 +0200
Subject: [PATCH 1340/1497] Fix test on missing install.lock

---
 htdocs/admin/system/security.php | 13 ++++++++++++-
 htdocs/langs/en_US/admin.lang    |  3 ++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/htdocs/admin/system/security.php b/htdocs/admin/system/security.php
index 032a23a68c8..79690032901 100644
--- a/htdocs/admin/system/security.php
+++ b/htdocs/admin/system/security.php
@@ -30,7 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/events.class.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("install", "other", "admin"));
+$langs->loadLangs(array("install", "other", "admin", "errors"));
 
 if (!$user->admin) {
 	accessforbidden();
@@ -198,6 +198,7 @@ if (empty($fileswithwritepermission)) {
 	}
 }
 print '<br>';
+print '<br>';
 
 print '<strong>'.$langs->trans("PermissionsOnFile", $conffile).'</strong>: ';		// $conffile is defined into filefunc.inc.php
 $perms = fileperms($dolibarr_main_document_root.'/'.$conffile);
@@ -219,6 +220,16 @@ if ($perms) {
 	print img_warning().' '.$langs->trans("FailedToReadFile", $conffile);
 }
 print '<br>';
+print '<br>';
+
+$installlock = DOL_DATA_ROOT.'/install.lock';
+print '<strong>'.$langs->trans("DolibarrSetup").'</strong>: ';
+if (file_exists($installlock)) {
+	print img_picto('', 'tick').' '.$langs->trans("InstallAndUpgradeLockedBy", $installlock);
+} else {
+	print img_warning().' '.$langs->trans("WarningLockFileDoesNotExists", DOL_DATA_ROOT);
+}
+print '<br>';
 
 
 // File conf.php
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index aca631eef99..76f5c18b70b 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -2148,4 +2148,5 @@ RandomlySelectedIfSeveral=Randomly selected if several pictures are available
 DatabasePasswordObfuscated=Database password is obfuscated in conf file
 DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
 APIsAreNotEnabled=APIs modules are not enabled
-YouShouldSetThisToOff=You should set this to 0 or off
\ No newline at end of file
+YouShouldSetThisToOff=You should set this to 0 or off
+InstallAndUpgradeLockedBy=Install and upgrades are locked by the file <b>%s</b>
\ No newline at end of file

From 9954a0e4bb654dae4cfe40ced290e3ad8c48cb01 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Fri, 30 Jul 2021 00:40:06 +0200
Subject: [PATCH 1341/1497] Fix status of tickets

---
 htdocs/langs/en_US/ticket.lang       |  8 +++++---
 htdocs/ticket/card.php               | 20 ++++++++++++++++----
 htdocs/ticket/class/ticket.class.php | 27 ++++++++++++++-------------
 3 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/htdocs/langs/en_US/ticket.lang b/htdocs/langs/en_US/ticket.lang
index 3c074688b8e..0b54b1d5fa8 100644
--- a/htdocs/langs/en_US/ticket.lang
+++ b/htdocs/langs/en_US/ticket.lang
@@ -66,7 +66,7 @@ NeedMoreInformation=Waiting for reporter feedback
 NeedMoreInformationShort=Waiting for feedback
 Answered=Answered
 Waiting=Waiting
-Closed=Closed
+SolvedClosed=Solved
 Deleted=Deleted
 
 # Dict
@@ -186,9 +186,11 @@ TicketSeverity=Severity
 ShowTicket=See ticket
 RelatedTickets=Related tickets
 TicketAddIntervention=Create intervention
-CloseTicket=Close ticket
-CloseATicket=Close a ticket
+CloseTicket=Close|Solve ticket
+AbandonTicket=Abandon ticket
+CloseATicket=Close|Solve a ticket
 ConfirmCloseAticket=Confirm ticket closing
+ConfirmAbandonTicket=Do you confirm the closing of the ticket to status 'Abandonned'
 ConfirmDeleteTicket=Please confirm ticket deleting
 TicketDeletedSuccess=Ticket deleted with success
 TicketMarkedAsClosed=Ticket marked as closed
diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index 5faa7b201b7..cbdb0f7a6df 100644
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -426,10 +426,10 @@ if (empty($reshook)) {
 		}
 	}
 
-	if ($action == "confirm_close" && GETPOST('confirm', 'alpha') == 'yes' && $user->rights->ticket->write) {
+	if (($action == "confirm_close" || $action == "confirm_abandon") && GETPOST('confirm', 'alpha') == 'yes' && $user->rights->ticket->write) {
 		$object->fetch(GETPOST('id', 'int'), '', GETPOST('track_id', 'alpha'));
 
-		if ($object->close($user)) {
+		if ($object->close($user, ($action == "confirm_abandon" ? 1 : 0))) {
 			setEventMessages($langs->trans('TicketMarkedAsClosed'), null, 'mesgs');
 
 			$url = 'card.php?action=view&track_id='.GETPOST('track_id', 'alpha');
@@ -749,7 +749,7 @@ if ($action == 'create' || $action == 'presend') {
 	print '</div>';
 
 	print '</form>'; */
-} elseif (empty($action) || $action == 'view' || $action == 'addlink' || $action == 'dellink' || $action == 'presend' || $action == 'presend_addmessage' || $action == 'close' || $action == 'delete' || $action == 'editcustomer' || $action == 'progression' || $action == 'reopen'
+} elseif (empty($action) || $action == 'view' || $action == 'addlink' || $action == 'dellink' || $action == 'presend' || $action == 'presend_addmessage' || $action == 'close' || $action == 'abandon' || $action == 'delete' || $action == 'editcustomer' || $action == 'progression' || $action == 'reopen'
 	|| $action == 'editsubject' || $action == 'edit_extras' || $action == 'update_extras' || $action == 'edit_extrafields' || $action == 'set_extrafields' || $action == 'classify' || $action == 'sel_contract' || $action == 'edit_message_init' || $action == 'set_status' || $action == 'dellink') {
 	if ($res > 0) {
 		// or for unauthorized internals users
@@ -764,6 +764,13 @@ if ($action == 'create' || $action == 'presend') {
 				print '<br>';
 			}
 		}
+		// Confirmation abandon
+		if ($action == 'abandon') {
+			print $form->formconfirm($url_page_current."?track_id=".$object->track_id, $langs->trans("AbandonTicket"), $langs->trans("ConfirmAbandonTicket"), "confirm_abandon", '', '', 1);
+			if ($ret == 'html') {
+				print '<br>';
+			}
+		}
 		// Confirmation delete
 		if ($action == 'delete') {
 			print $form->formconfirm($url_page_current."?track_id=".$object->track_id, $langs->trans("Delete"), $langs->trans("ConfirmDeleteTicket"), "confirm_delete_ticket", '', '', 1);
@@ -1296,8 +1303,13 @@ if ($action == 'create' || $action == 'presend') {
 					print '<div class="inline-block divButAction"><a class="butAction" href="card.php?track_id='.$object->track_id.'&action=close">'.$langs->trans('CloseTicket').'</a></div>';
 				}
 
+				// Abadon ticket if statut is read
+				if ($object->fk_statut > 0 && $object->fk_statut < Ticket::STATUS_CLOSED && $user->rights->ticket->write) {
+					print '<div class="inline-block divButAction"><a class="butAction" href="card.php?track_id='.$object->track_id.'&action=abandon">'.$langs->trans('AbandonTicket').'</a></div>';
+				}
+
 				// Re-open ticket
-				if (!$user->socid && $object->fk_statut == Ticket::STATUS_CLOSED && !$user->socid) {
+				if (!$user->socid && ($object->fk_statut == Ticket::STATUS_CLOSED || $object->fk_statut == Ticket::STATUS_CANCELED) && !$user->socid) {
 					print '<div class="inline-block divButAction"><a class="butAction" href="card.php?track_id='.$object->track_id.'&action=reopen">'.$langs->trans('ReOpen').'</a></div>';
 				}
 
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index 89f239db6c6..b67d7922d97 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -218,8 +218,8 @@ class Ticket extends CommonObject
 	const STATUS_IN_PROGRESS = 3;
 	const STATUS_NEED_MORE_INFO = 5;
 	const STATUS_WAITING = 7;			// on hold
-	const STATUS_CLOSED = 8;
-	const STATUS_CANCELED = 9;
+	const STATUS_CLOSED = 8;			// Closed - Solved
+	const STATUS_CANCELED = 9;			// Closed - Not solved
 
 
 	/**
@@ -272,8 +272,8 @@ class Ticket extends CommonObject
 		'message' => array('type'=>'text', 'label'=>'Message', 'visible'=>-2, 'enabled'=>1, 'position'=>540, 'notnull'=>-1,),
 		'email_msgid' => array('type'=>'varchar(255)', 'label'=>'EmailMsgID', 'visible'=>-2, 'enabled'=>1, 'position'=>540, 'notnull'=>-1, 'help'=>'EmailMsgIDDesc'),
 		'progress' => array('type'=>'varchar(100)', 'label'=>'Progression', 'visible'=>-1, 'enabled'=>1, 'position'=>540, 'notnull'=>-1, 'css'=>'right', 'help'=>"", 'isameasure'=>1),
-		'resolution' => array('type'=>'integer', 'label'=>'Resolution', 'visible'=>-1, 'enabled'=>1, 'position'=>550, 'notnull'=>1),
-		'fk_statut' => array('type'=>'integer', 'label'=>'Status', 'visible'=>1, 'enabled'=>1, 'position'=>600, 'notnull'=>1, 'index'=>1, 'arrayofkeyval'=>array(0 => 'Unread', 1 => 'Read', 3 => 'Answered', 4 => 'Assigned', 5 => 'InProgress', 6 => 'Waiting', 8 => 'Closed', 9 => 'Deleted')),
+		//'resolution' => array('type'=>'integer', 'label'=>'Resolution', 'visible'=>-1, 'enabled'=>1, 'position'=>550, 'notnull'=>1),
+		'fk_statut' => array('type'=>'integer', 'label'=>'Status', 'visible'=>1, 'enabled'=>1, 'position'=>600, 'notnull'=>1, 'index'=>1, 'arrayofkeyval'=>array(0 => 'Unread', 1 => 'Read', 3 => 'Answered', 4 => 'Assigned', 5 => 'InProgress', 6 => 'Waiting', 8 => 'SolvedClosed', 9 => 'Deleted')),
 		'import_key' =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>900),
 	);
 	// END MODULEBUILDER PROPERTIES
@@ -295,7 +295,7 @@ class Ticket extends CommonObject
 			self::STATUS_IN_PROGRESS => 'InProgress',
 			self::STATUS_WAITING => 'OnHold',
 			self::STATUS_NEED_MORE_INFO => 'NeedMoreInformationShort',
-			self::STATUS_CLOSED => 'Closed',
+			self::STATUS_CLOSED => 'SolvedClosed',
 			self::STATUS_CANCELED => 'Canceled'
 		);
 		$this->statuts = array(
@@ -305,7 +305,7 @@ class Ticket extends CommonObject
 			self::STATUS_IN_PROGRESS => 'InProgress',
 			self::STATUS_WAITING => 'OnHold',
 			self::STATUS_NEED_MORE_INFO => 'NeedMoreInformation',
-			self::STATUS_CLOSED => 'Closed',
+			self::STATUS_CLOSED => 'SolvedClosed',
 			self::STATUS_CANCELED => 'Canceled'
 		);
 	}
@@ -1747,21 +1747,22 @@ class Ticket extends CommonObject
 	/**
 	 *    Close a ticket
 	 *
-	 *    @param    User    $user      User that close
-	 *    @return   int		           <0 if KO, >0 if OK
+	 *    @param    User    $user      	User that close
+	 *    @param	int		$mode		0=Close solved, 1=Close abandonned
+	 *    @return   int		           	<0 if KO, >0 if OK
 	 */
-	public function close(User $user)
+	public function close(User $user, $mode = 0)
 	{
 		global $conf, $langs;
 
-		if ($this->fk_statut != Ticket::STATUS_CLOSED) { // not closed
+		if ($this->fk_statut != Ticket::STATUS_CLOSED && $this->fk_statut != Ticket::STATUS_CANCELED) { // not closed
 			$this->db->begin();
 
 			$sql = "UPDATE ".MAIN_DB_PREFIX."ticket";
-			$sql .= " SET fk_statut=".Ticket::STATUS_CLOSED.", progress=100, date_close='".$this->db->idate(dol_now())."'";
-			$sql .= " WHERE rowid = ".$this->id;
+			$sql .= " SET fk_statut=".($mode ? Ticket::STATUS_CANCELED : Ticket::STATUS_CLOSED).", progress=100, date_close='".$this->db->idate(dol_now())."'";
+			$sql .= " WHERE rowid = ".((int) $this->id);
 
-			dol_syslog(get_class($this)."::close sql=".$sql);
+			dol_syslog(get_class($this)."::close mode=".$mode);
 			$resql = $this->db->query($sql);
 			if ($resql) {
 				$error = 0;

From 0c3bf536f2e2b5aaa82d87185f9026139696cd72 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Fri, 30 Jul 2021 01:10:15 +0200
Subject: [PATCH 1342/1497] Fix field resolution

---
 htdocs/core/modules/modTicket.class.php | 16 +++++++++++---
 htdocs/ticket/class/ticket.class.php    |  4 +++-
 htdocs/ticket/list.php                  | 28 +++++++++++++++++--------
 3 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/htdocs/core/modules/modTicket.class.php b/htdocs/core/modules/modTicket.class.php
index 8b1a1dc8525..b78125753b2 100644
--- a/htdocs/core/modules/modTicket.class.php
+++ b/htdocs/core/modules/modTicket.class.php
@@ -122,8 +122,18 @@ class modTicket extends DolibarrModules
 		}
 		$this->dictionaries = array(
 			'langs' => 'ticket',
-			'tabname' => array(MAIN_DB_PREFIX."c_ticket_type", MAIN_DB_PREFIX."c_ticket_severity", MAIN_DB_PREFIX."c_ticket_category", MAIN_DB_PREFIX."c_ticket_resolution"),
-			'tablib' => array("TicketDictType", "TicketDictSeverity", "TicketDictCategory", "TicketDictResolution"),
+			'tabname' => array(
+				MAIN_DB_PREFIX."c_ticket_type",
+				MAIN_DB_PREFIX."c_ticket_severity",
+				MAIN_DB_PREFIX."c_ticket_category",
+				MAIN_DB_PREFIX."c_ticket_resolution"
+			),
+			'tablib' => array(
+				"TicketDictType",
+				"TicketDictSeverity",
+				"TicketDictCategory",
+				"TicketDictResolution"
+			),
 			'tabsql' => array(
 				'SELECT f.rowid as rowid, f.code, f.pos, f.label, f.active, f.use_default FROM '.MAIN_DB_PREFIX.'c_ticket_type as f',
 				'SELECT f.rowid as rowid, f.code, f.pos, f.label, f.active, f.use_default FROM '.MAIN_DB_PREFIX.'c_ticket_severity as f',
@@ -135,7 +145,7 @@ class modTicket extends DolibarrModules
 			'tabfieldvalue' => array("code,label,pos,use_default", "code,label,pos,use_default", "code,label,pos,use_default,public", "code,label,pos,use_default"),
 			'tabfieldinsert' => array("code,label,pos,use_default", "code,label,pos,use_default", "code,label,pos,use_default,public", "code,label,pos,use_default"),
 			'tabrowid' => array("rowid", "rowid", "rowid", "rowid"),
-			'tabcond' => array($conf->ticket->enabled, $conf->ticket->enabled, $conf->ticket->enabled, $conf->ticket->enabled),
+			'tabcond' => array($conf->ticket->enabled, $conf->ticket->enabled, $conf->ticket->enabled, $conf->ticket->enabled && !empty($conf->global->TICKET_ENABLE_RESOLUTION)),
 			'tabhelp' => array(
 				array('code'=>$langs->trans("EnterAnyCode"), 'use_default'=>$langs->trans("Enter0or1")),
 				array('code'=>$langs->trans("EnterAnyCode"), 'use_default'=>$langs->trans("Enter0or1")),
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index b67d7922d97..1d449a57e17 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -272,7 +272,7 @@ class Ticket extends CommonObject
 		'message' => array('type'=>'text', 'label'=>'Message', 'visible'=>-2, 'enabled'=>1, 'position'=>540, 'notnull'=>-1,),
 		'email_msgid' => array('type'=>'varchar(255)', 'label'=>'EmailMsgID', 'visible'=>-2, 'enabled'=>1, 'position'=>540, 'notnull'=>-1, 'help'=>'EmailMsgIDDesc'),
 		'progress' => array('type'=>'varchar(100)', 'label'=>'Progression', 'visible'=>-1, 'enabled'=>1, 'position'=>540, 'notnull'=>-1, 'css'=>'right', 'help'=>"", 'isameasure'=>1),
-		//'resolution' => array('type'=>'integer', 'label'=>'Resolution', 'visible'=>-1, 'enabled'=>1, 'position'=>550, 'notnull'=>1),
+		'resolution' => array('type'=>'integer', 'label'=>'Resolution', 'visible'=>-1, 'enabled'=>'$conf->global->TICKET_ENABLE_RESOLUTION', 'position'=>550, 'notnull'=>1),
 		'fk_statut' => array('type'=>'integer', 'label'=>'Status', 'visible'=>1, 'enabled'=>1, 'position'=>600, 'notnull'=>1, 'index'=>1, 'arrayofkeyval'=>array(0 => 'Unread', 1 => 'Read', 3 => 'Answered', 4 => 'Assigned', 5 => 'InProgress', 6 => 'Waiting', 8 => 'SolvedClosed', 9 => 'Deleted')),
 		'import_key' =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>900),
 	);
@@ -286,6 +286,8 @@ class Ticket extends CommonObject
 	 */
 	public function __construct($db)
 	{
+		global $conf;
+
 		$this->db = $db;
 
 		$this->statuts_short = array(
diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php
index 6a65efc8bac..5a55a1ab324 100644
--- a/htdocs/ticket/list.php
+++ b/htdocs/ticket/list.php
@@ -45,9 +45,9 @@ $show_files = GETPOST('show_files', 'int'); // Show files area generated by bulk
 $confirm    = GETPOST('confirm', 'alpha'); // Result of a confirmation
 $cancel     = GETPOST('cancel', 'alpha'); // We click on a Cancel button
 $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'tickep#selectedfieldstlist'; // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'tickep#selectedfieldstlist'; // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
-$optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
+$optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 
 $id = GETPOST('id', 'int');
 $msg_id     = GETPOST('msg_id', 'int');
@@ -73,8 +73,9 @@ $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
+	// If $page is not defined, or '' or -1 or if we click on clear filters
 	$page = 0;
-}     // If $page is not defined, or '' or -1 or if we click on clear filters
+}
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
@@ -107,12 +108,16 @@ if (GETPOST('search_fk_status', 'alpha') == 'non_closed') {
 }
 
 // Initialize array of search criterias
-$search_all = trim(GETPOSTISSET("search_all") ?GETPOSTISSET("search_all", 'alpha') : GETPOST('sall'));
+$search_all = (GETPOSTISSET("search_all") ? GETPOST("search_all", 'alpha') : GETPOST('sall'));
 $search = array();
 foreach ($object->fields as $key => $val) {
-	if (GETPOST('search_'.$key, 'alpha')) {
+	if (GETPOST('search_'.$key, 'alpha') !== '') {
 		$search[$key] = GETPOST('search_'.$key, 'alpha');
 	}
+	if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
+		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOST('search_'.$key.'_dtstartmonth', 'int'), GETPOST('search_'.$key.'_dtstartday', 'int'), GETPOST('search_'.$key.'_dtstartyear', 'int'));
+		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOST('search_'.$key.'_dtendmonth', 'int'), GETPOST('search_'.$key.'_dtendday', 'int'), GETPOST('search_'.$key.'_dtendyear', 'int'));
+	}
 }
 
 // List of fields to search into when doing a "search in all"
@@ -126,12 +131,19 @@ $fieldstosearchall['s.name_alias'] = "AliasNameShort";
 $fieldstosearchall['s.zip'] = "Zip";
 $fieldstosearchall['s.town'] = "Town";
 
-// Definition of fields for list
+// Definition of array of fields for columns
 $arrayfields = array();
 foreach ($object->fields as $key => $val) {
 	// If $val['visible']==0, then we never show the field
 	if (!empty($val['visible'])) {
-		$arrayfields['t.'.$key] = array('label'=>$val['label'], 'checked'=>(($val['visible'] < 0) ? 0 : 1), 'enabled'=>$val['enabled'], 'position'=>$val['position']);
+		$visible = (int) dol_eval($val['visible'], 1);
+		$arrayfields['t.'.$key] = array(
+			'label'=>$val['label'],
+			'checked'=>(($visible < 0) ? 0 : 1),
+			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
+			'position'=>$val['position'],
+			'help'=> isset($val['help']) ? $val['help'] : ''
+		);
 	}
 }
 // Extra fields
@@ -139,8 +151,6 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
 
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
-//if ($socid > 0) $arrayfields['t.fk_soc']['enabled']=0;
-//if ($projectid > 0) $arrayfields['t.fk_project']['enabled']=0;
 
 
 // Security check

From 593e84906b93f09414b9aeb225bfbed395efe391 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Fri, 30 Jul 2021 01:16:04 +0200
Subject: [PATCH 1343/1497] FIX bad closing div on error message

---
 htdocs/public/ticket/create_ticket.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/public/ticket/create_ticket.php b/htdocs/public/ticket/create_ticket.php
index 1d0339f83f8..8f2657b9db6 100644
--- a/htdocs/public/ticket/create_ticket.php
+++ b/htdocs/public/ticket/create_ticket.php
@@ -390,7 +390,7 @@ if ($action != "infos_success") {
 		print '<div class="error">';
 		print $langs->trans("ErrorFieldRequired", $langs->transnoentities("TicketEmailNotificationFrom")).'<br>';
 		print $langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentities("Ticket"));
-		print '<div>';
+		print '</div>';
 	} else {
 		print '<div class="info marginleftonly marginrightonly">'.$langs->trans('TicketPublicInfoCreateTicket').'</div>';
 		$formticket->showForm(0, 'edit', 1);

From 047c575d613070117ec363ecf270d410ef364b56 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Fri, 30 Jul 2021 01:42:52 +0200
Subject: [PATCH 1344/1497] Fix some errors on ticket module

---
 .../interface_50_modAgenda_ActionsAuto.class.php     |  6 +++++-
 htdocs/public/ticket/create_ticket.php               |  3 +--
 htdocs/public/ticket/view.php                        |  6 ++++--
 htdocs/ticket/card.php                               | 12 +++++++++---
 htdocs/ticket/class/ticket.class.php                 |  2 +-
 5 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
index 8e23c258d88..d0597f617fb 100644
--- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
@@ -936,7 +936,11 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			}
 		}
 
-		$object->actionmsg = dol_concatdesc($langs->transnoentities("Author").': '.$user->login, $object->actionmsg);
+		if (!empty($user->login)) {
+			$object->actionmsg = dol_concatdesc($langs->transnoentities("Author").': '.$user->login, $object->actionmsg);
+		} elseif (isset($object->origin_email)) {
+			$object->actionmsg = dol_concatdesc($langs->transnoentities("Author").': '.$object->origin_email, $object->actionmsg);
+		}
 
 		dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
diff --git a/htdocs/public/ticket/create_ticket.php b/htdocs/public/ticket/create_ticket.php
index 8f2657b9db6..b911e7480d3 100644
--- a/htdocs/public/ticket/create_ticket.php
+++ b/htdocs/public/ticket/create_ticket.php
@@ -258,7 +258,7 @@ if (empty($reshook) && $action == 'create_ticket' && GETPOST('add', 'alpha')) {
 
 				$sendto = GETPOST('email', 'alpha');
 
-				$from = $conf->global->MAIN_INFO_SOCIETE_NOM.'<'.$conf->global->TICKET_NOTIFICATION_EMAIL_FROM.'>';
+				$from = $conf->global->MAIN_INFO_SOCIETE_NOM.' <'.$conf->global->TICKET_NOTIFICATION_EMAIL_FROM.'>';
 				$replyto = $from;
 				$sendtocc = '';
 				$deliveryreceipt = 0;
@@ -298,7 +298,6 @@ if (empty($reshook) && $action == 'create_ticket' && GETPOST('add', 'alpha')) {
 					}
 					$message_admin .= '</ul>';
 
-					$message_admin .= '</ul>';
 					$message_admin .= '<p>'.$langs->trans('Message').' : <br>'.$object->message.'</p>';
 					$message_admin .= '<p><a href="'.dol_buildpath('/ticket/card.php', 2).'?track_id='.$object->track_id.'" rel="nofollow noopener">'.$langs->trans('SeeThisTicketIntomanagementInterface').'</a></p>';
 
diff --git a/htdocs/public/ticket/view.php b/htdocs/public/ticket/view.php
index 3fec075160b..6485f9fcee2 100644
--- a/htdocs/public/ticket/view.php
+++ b/htdocs/public/ticket/view.php
@@ -262,8 +262,10 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
 
 		// Category
 		print '<tr><td>'.$langs->trans("Category").'</td><td>';
-		print img_picto('', 'category', 'class="pictofixedwidth"');
-		print dol_escape_htmltag($object->dao->category_label);
+		if ($object->dao->category_label) {
+			print img_picto('', 'category', 'class="pictofixedwidth"');
+			print dol_escape_htmltag($object->dao->category_label);
+		}
 		print '</td></tr>';
 
 		// Severity
diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index cbdb0f7a6df..bbb563a1486 100644
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -1126,15 +1126,21 @@ if ($action == 'create' || $action == 'presend') {
 		} else {
 			// Type
 			print '<tr><td class="titlefield">'.$langs->trans("Type").'</td><td>';
-			print $langs->getLabelFromKey($db, 'TicketTypeShort'.$object->type_code, 'c_ticket_type', 'code', 'label', $object->type_code);
+			if (!empty($object->type_code)) {
+				print $langs->getLabelFromKey($db, 'TicketTypeShort'.$object->type_code, 'c_ticket_type', 'code', 'label', $object->type_code);
+			}
 			print '</td></tr>';
 			// Group
 			print '<tr><td>'.$langs->trans("TicketCategory").'</td><td>';
-			print $langs->getLabelFromKey($db, 'TicketCategoryShort'.$object->category_code, 'c_ticket_category', 'code', 'label', $object->category_code);
+			if (!empty($object->category_code)) {
+				print $langs->getLabelFromKey($db, 'TicketCategoryShort'.$object->category_code, 'c_ticket_category', 'code', 'label', $object->category_code);
+			}
 			print '</td></tr>';
 			// Severity
 			print '<tr><td>'.$langs->trans("TicketSeverity").'</td><td>';
-			print $langs->getLabelFromKey($db, 'TicketSeverityShort'.$object->severity_code, 'c_ticket_severity', 'code', 'label', $object->severity_code);
+			if (!empty($object->severity_code)) {
+				print $langs->getLabelFromKey($db, 'TicketSeverityShort'.$object->severity_code, 'c_ticket_severity', 'code', 'label', $object->severity_code);
+			}
 			print '</td></tr>';
 		}
 		print '</table>'; // End table actions
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index 1d449a57e17..d29a4913b6b 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -461,7 +461,7 @@ class Ticket extends CommonObject
 			$sql .= " ".(!isset($this->progress) ? '0' : "'".$this->db->escape($this->progress)."'").",";
 			$sql .= " ".(!isset($this->timing) ? 'NULL' : "'".$this->db->escape($this->timing)."'").",";
 			$sql .= " ".(!isset($this->type_code) ? 'NULL' : "'".$this->db->escape($this->type_code)."'").",";
-			$sql .= " ".(!isset($this->category_code) ? 'NULL' : "'".$this->db->escape($this->category_code)."'").",";
+			$sql .= " ".(empty($this->category_code) || $this->category_code == '-1' ? 'NULL' : "'".$this->db->escape($this->category_code)."'").",";
 			$sql .= " ".(!isset($this->severity_code) ? 'NULL' : "'".$this->db->escape($this->severity_code)."'").",";
 			$sql .= " ".(!isset($this->datec) || dol_strlen($this->datec) == 0 ? 'NULL' : "'".$this->db->idate($this->datec)."'").",";
 			$sql .= " ".(!isset($this->date_read) || dol_strlen($this->date_read) == 0 ? 'NULL' : "'".$this->db->idate($this->date_read)."'").",";

From 57d637ac713b5e2004614c683974e9701673c54d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Fri, 30 Jul 2021 01:49:43 +0200
Subject: [PATCH 1345/1497] Fix set status of a ticket

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

diff --git a/htdocs/ticket/class/actions_ticket.class.php b/htdocs/ticket/class/actions_ticket.class.php
index b787a437899..d7d971b4edc 100644
--- a/htdocs/ticket/class/actions_ticket.class.php
+++ b/htdocs/ticket/class/actions_ticket.class.php
@@ -408,7 +408,7 @@ class ActionsTicket
 				if ($status == 1) {
 					$urlforbutton = $_SERVER['PHP_SELF'].'?track_id='.$object->track_id.'&action=mark_ticket_read'; // To set as read, we use a dedicated action
 				} else {
-					$urlforbutton = $_SERVER['PHP_SELF'].'?track_id='.$object->track_id.'&action=set_status&token='.newToken().'&new_status='.$status;
+					$urlforbutton = $_SERVER['PHP_SELF'].'?track_id='.$object->track_id.'&action=confirm_set_status&token='.newToken().'&new_status='.$status;
 				}
 
 				print '<a class="butAction butStatus marginbottomonly" href="'.$urlforbutton.'">';

From 8ea6fc3174e4e4d7fcd55bf3fe241ff5e7f85427 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Fri, 30 Jul 2021 09:38:29 +0200
Subject: [PATCH 1346/1497] fix: add hook management into product translation
 tab

---
 htdocs/product/traduction.php | 180 +++++++++++++++++++---------------
 1 file changed, 100 insertions(+), 80 deletions(-)

diff --git a/htdocs/product/traduction.php b/htdocs/product/traduction.php
index b2c3b0d0b2f..0cae81e36c7 100644
--- a/htdocs/product/traduction.php
+++ b/htdocs/product/traduction.php
@@ -62,98 +62,108 @@ if ($object->id > 0) {
 	restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
 }
 
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('producttranslationcard', 'globalcard'));
+
 
 /*
  * Actions
  */
 
-// retour a l'affichage des traduction si annulation
-if ($cancel == $langs->trans("Cancel")) {
-	$action = '';
+$parameters = array('id'=>$id, 'ref'=>$ref);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
-
-if ($action == 'delete' && GETPOST('langtodelete', 'alpha')) {
-	$object = new Product($db);
-	$object->fetch($id);
-	$object->delMultiLangs(GETPOST('langtodelete', 'alpha'), $user);
-	setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
-	$action = '';
-}
-
-// Add translation
-if ($action == 'vadd' && $cancel != $langs->trans("Cancel") && ($user->rights->produit->creer || $user->rights->service->creer)) {
-	$object = new Product($db);
-	$object->fetch($id);
-	$current_lang = $langs->getDefaultLang();
-
-	// update de l'objet
-	if (GETPOST("forcelangprod") == $current_lang) {
-		$object->label		 = GETPOST("libelle");
-		$object->description = dol_htmlcleanlastbr(GETPOST("desc", 'restricthtml'));
-		$object->other		 = dol_htmlcleanlastbr(GETPOST("other", 'restricthtml'));
-
-		$object->update($object->id, $user);
-	} else {
-		$object->multilangs[GETPOST("forcelangprod")]["label"]		= GETPOST("libelle");
-		$object->multilangs[GETPOST("forcelangprod")]["description"] = dol_htmlcleanlastbr(GETPOST("desc", 'restricthtml'));
-		$object->multilangs[GETPOST("forcelangprod")]["other"]		= dol_htmlcleanlastbr(GETPOST("other", 'restricthtml'));
-	}
-
-	// save in database
-	if (GETPOST("forcelangprod")) {
-		$result = $object->setMultiLangs($user);
-	} else {
-		$object->error = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Language"));
-		$result = -1;
-	}
-
-	if ($result > 0) {
+if (empty($reshook)) {
+	// retour a l'affichage des traduction si annulation
+	if ($cancel == $langs->trans("Cancel")) {
 		$action = '';
-	} else {
-		$action = 'add';
-		setEventMessages($object->error, $object->errors, 'errors');
 	}
-}
 
-// Edit translation
-if ($action == 'vedit' && $cancel != $langs->trans("Cancel") && ($user->rights->produit->creer || $user->rights->service->creer)) {
-	$object = new Product($db);
-	$object->fetch($id);
-	$current_lang = $langs->getDefaultLang();
+	if ($action == 'delete' && GETPOST('langtodelete', 'alpha')) {
+		$object = new Product($db);
+		$object->fetch($id);
+		$object->delMultiLangs(GETPOST('langtodelete', 'alpha'), $user);
+		setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
+		$action = '';
+	}
 
-	foreach ($object->multilangs as $key => $value) { // enregistrement des nouvelles valeurs dans l'objet
-		if ($key == $current_lang) {
-			$object->label		 = GETPOST("libelle-".$key);
-			$object->description = dol_htmlcleanlastbr(GETPOST("desc-".$key, 'restricthtml'));
-			$object->other		 = dol_htmlcleanlastbr(GETPOST("other-".$key, 'restricthtml'));
+	// Add translation
+	if ($action == 'vadd' && $cancel != $langs->trans("Cancel") && ($user->rights->produit->creer || $user->rights->service->creer)) {
+		$object = new Product($db);
+		$object->fetch($id);
+		$current_lang = $langs->getDefaultLang();
+
+		// update de l'objet
+		if (GETPOST("forcelangprod") == $current_lang) {
+			$object->label = GETPOST("libelle");
+			$object->description = dol_htmlcleanlastbr(GETPOST("desc", 'restricthtml'));
+			$object->other = dol_htmlcleanlastbr(GETPOST("other", 'restricthtml'));
+
+			$object->update($object->id, $user);
 		} else {
-			$object->multilangs[$key]["label"]		 = GETPOST("libelle-".$key);
-			$object->multilangs[$key]["description"] = dol_htmlcleanlastbr(GETPOST("desc-".$key, 'restricthtml'));
-			$object->multilangs[$key]["other"]		 = dol_htmlcleanlastbr(GETPOST("other-".$key, 'restricthtml'));
+			$object->multilangs[GETPOST("forcelangprod")]["label"] = GETPOST("libelle");
+			$object->multilangs[GETPOST("forcelangprod")]["description"] = dol_htmlcleanlastbr(GETPOST("desc", 'restricthtml'));
+			$object->multilangs[GETPOST("forcelangprod")]["other"] = dol_htmlcleanlastbr(GETPOST("other", 'restricthtml'));
+		}
+
+		// save in database
+		if (GETPOST("forcelangprod")) {
+			$result = $object->setMultiLangs($user);
+		} else {
+			$object->error = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Language"));
+			$result = -1;
+		}
+
+		if ($result > 0) {
+			$action = '';
+		} else {
+			$action = 'add';
+			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
 
-	$result = $object->setMultiLangs($user);
-	if ($result > 0) {
-		$action = '';
-	} else {
-		$action = 'edit';
-		setEventMessages($object->error, $object->errors, 'errors');
+	// Edit translation
+	if ($action == 'vedit' && $cancel != $langs->trans("Cancel") && ($user->rights->produit->creer || $user->rights->service->creer)) {
+		$object = new Product($db);
+		$object->fetch($id);
+		$current_lang = $langs->getDefaultLang();
+
+		foreach ($object->multilangs as $key => $value) { // enregistrement des nouvelles valeurs dans l'objet
+			if ($key == $current_lang) {
+				$object->label = GETPOST("libelle-" . $key);
+				$object->description = dol_htmlcleanlastbr(GETPOST("desc-" . $key, 'restricthtml'));
+				$object->other = dol_htmlcleanlastbr(GETPOST("other-" . $key, 'restricthtml'));
+			} else {
+				$object->multilangs[$key]["label"] = GETPOST("libelle-" . $key);
+				$object->multilangs[$key]["description"] = dol_htmlcleanlastbr(GETPOST("desc-" . $key, 'restricthtml'));
+				$object->multilangs[$key]["other"] = dol_htmlcleanlastbr(GETPOST("other-" . $key, 'restricthtml'));
+			}
+		}
+
+		$result = $object->setMultiLangs($user);
+		if ($result > 0) {
+			$action = '';
+		} else {
+			$action = 'edit';
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
 	}
-}
 
-// Delete translation
-if ($action == 'vdelete' && $cancel != $langs->trans("Cancel") && ($user->rights->produit->creer || $user->rights->service->creer)) {
-	$object = new Product($db);
-	$object->fetch($id);
-	$langtodelete = GETPOST('langdel', 'alpha');
+	// Delete translation
+	if ($action == 'vdelete' && $cancel != $langs->trans("Cancel") && ($user->rights->produit->creer || $user->rights->service->creer)) {
+		$object = new Product($db);
+		$object->fetch($id);
+		$langtodelete = GETPOST('langdel', 'alpha');
 
-	$result = $object->delMultiLangs($langtodelete, $user);
-	if ($result > 0) {
-		$action = '';
-	} else {
-		$action = 'edit';
-		setEventMessages($object->error, $object->errors, 'errors');
+		$result = $object->delMultiLangs($langtodelete, $user);
+		if ($result > 0) {
+			$action = '';
+		} else {
+			$action = 'edit';
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
 	}
 }
 
@@ -216,11 +226,15 @@ print dol_get_fiche_end();
  */
 print "\n".'<div class="tabsAction">'."\n";
 
-if ($action == '') {
-	if ($user->rights->produit->creer || $user->rights->service->creer) {
-		print '<a class="butAction" href="'.DOL_URL_ROOT.'/product/traduction.php?action=add&id='.$object->id.'">'.$langs->trans("Add").'</a>';
-		if ($cnt_trans > 0) {
-			print '<a class="butAction" href="'.DOL_URL_ROOT.'/product/traduction.php?action=edit&id='.$object->id.'">'.$langs->trans("Update").'</a>';
+$parameters = array();
+$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
+if (empty($reshook)) {
+	if ($action == '') {
+		if ($user->rights->produit->creer || $user->rights->service->creer) {
+			print '<a class="butAction" href="' . DOL_URL_ROOT . '/product/traduction.php?action=add&id=' . $object->id . '">' . $langs->trans("Add") . '</a>';
+			if ($cnt_trans > 0) {
+				print '<a class="butAction" href="' . DOL_URL_ROOT . '/product/traduction.php?action=edit&id=' . $object->id . '">' . $langs->trans("Update") . '</a>';
+			}
 		}
 	}
 }
@@ -263,6 +277,9 @@ if ($action == 'edit') {
 		}
 	}
 
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+
 	print '<br>';
 
 	print '<div class="center">';
@@ -334,6 +351,9 @@ if ($action == 'add' && ($user->rights->produit->creer || $user->rights->service
 	}
 	print '</table>';
 
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+
 	print dol_get_fiche_end();
 
 	print '<div class="center">';

From 0102e733069872a5082b779ffbf1c86d65277f5c Mon Sep 17 00:00:00 2001
From: Christian Foellmann <christian@foellmann.de>
Date: Fri, 30 Jul 2021 13:15:01 +0200
Subject: [PATCH 1347/1497] add hook 'menu_LeftMenuArray' to filter the
 leftmenu items

---
 htdocs/core/class/hookmanager.class.php |  1 +
 htdocs/core/menus/standard/eldy.lib.php | 28 ++++++++++++++++++++++---
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index 5e24ee03fa4..4750e0924dd 100644
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -193,6 +193,7 @@ class HookManager
 				'getFormatedSupplierRef',
 				'getIdProfUrl',
 				'getInputIdProf',
+				'menu_LeftMenuItems',
 				'moveUploadedFile',
 				'moreHtmlStatus',
 				'pdf_build_address',
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index c192d5e6ac6..a54d5a7a358 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -688,9 +688,9 @@ function print_end_menu_array()
  * @param 	int			$type_user     		0=Menu for backoffice, 1=Menu for front office
  * @return	int								Nb of menu entries
  */
-function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabMenu, &$menu, $noout = 0, $forcemainmenu = '', $forceleftmenu = '', $moredata = null, $type_user = 0)
-{
-	global $user, $conf, $langs, $dolibarr_main_db_name, $mysoc;
+function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabMenu, &$menu, $noout = 0, $forcemainmenu = '', $forceleftmenu = '', $moredata = null, $type_user = 0) {
+
+	global $user, $conf, $langs, $dolibarr_main_db_name, $mysoc, $hookmanager;
 
 	//var_dump($tabMenu);
 
@@ -1958,6 +1958,28 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 		return 0;
 	}
 
+	// Allow the $menu_array of the menu to be manipulated by modules
+	$parameters = array(
+		'mainmenu' => $mainmenu,
+	);
+	$hook_items = $menu_array;
+	$reshook = $hookmanager->executeHooks('menu_LeftMenuArray', $parameters, $hook_items); // Note that $action and $object may have been modified by some hooks
+
+	if (is_numeric($reshook)) {
+		if ($reshook == 0 && !empty($hookmanager->results)) {
+			$menu_array[] = $hookmanager->results; // add
+		} elseif ($reshook == 1) {
+			$menu_array = $hookmanager->results; // replace
+		}
+
+		// @todo Sort menu items by 'position' value
+//		$position = array();
+//		foreach ($menu_array as $key => $row) {
+//			$position[$key] = $row['position'];
+//		}
+//		array_multisort($position, SORT_ASC, $menu_array);
+	}
+
 	// TODO Use the position property in menu_array to reorder the $menu_array
 	//var_dump($menu_array);
 	/*$new_menu_array = array();

From 3ceb451734a35aaa278a35e717241d4991817a18 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Fri, 30 Jul 2021 11:19:18 +0000
Subject: [PATCH 1348/1497] Fixing style errors.

---
 htdocs/core/menus/standard/eldy.lib.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index a54d5a7a358..8374b71ff96 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -688,7 +688,8 @@ function print_end_menu_array()
  * @param 	int			$type_user     		0=Menu for backoffice, 1=Menu for front office
  * @return	int								Nb of menu entries
  */
-function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabMenu, &$menu, $noout = 0, $forcemainmenu = '', $forceleftmenu = '', $moredata = null, $type_user = 0) {
+function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabMenu, &$menu, $noout = 0, $forcemainmenu = '', $forceleftmenu = '', $moredata = null, $type_user = 0)
+{
 
 	global $user, $conf, $langs, $dolibarr_main_db_name, $mysoc, $hookmanager;
 
@@ -1973,11 +1974,11 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 		}
 
 		// @todo Sort menu items by 'position' value
-//		$position = array();
-//		foreach ($menu_array as $key => $row) {
-//			$position[$key] = $row['position'];
-//		}
-//		array_multisort($position, SORT_ASC, $menu_array);
+		//      $position = array();
+		//      foreach ($menu_array as $key => $row) {
+		//          $position[$key] = $row['position'];
+		//      }
+		//      array_multisort($position, SORT_ASC, $menu_array);
 	}
 
 	// TODO Use the position property in menu_array to reorder the $menu_array

From 63898426d23559a690e4d623dba3c59cf461f1b0 Mon Sep 17 00:00:00 2001
From: atm-florian <florian.mortgat@atm-consulting.fr>
Date: Fri, 30 Jul 2021 13:36:54 +0200
Subject: [PATCH 1349/1497] FIX: on admin/pdf.php (with javascript enabled) if
 you set some boolean confs then click on "save", all boolean values are reset

---
 htdocs/admin/pdf.php | 46 ++++++++++++++++++++++----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php
index d5873e2a50e..cee63fd91fd 100644
--- a/htdocs/admin/pdf.php
+++ b/htdocs/admin/pdf.php
@@ -52,22 +52,22 @@ if ($cancel) {
 }
 
 if ($action == 'update') {
-	dolibarr_set_const($db, "MAIN_PDF_FORMAT", GETPOST("MAIN_PDF_FORMAT"), 'chaine', 0, '', $conf->entity);
+	if (GETPOSTISSET('MAIN_PDF_FORMAT')) dolibarr_set_const($db, "MAIN_PDF_FORMAT", GETPOST("MAIN_PDF_FORMAT"), 'chaine', 0, '', $conf->entity);
 
-	dolibarr_set_const($db, "MAIN_PDF_MARGIN_LEFT", GETPOST("MAIN_PDF_MARGIN_LEFT"), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_PDF_MARGIN_RIGHT", GETPOST("MAIN_PDF_MARGIN_TOP"), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_PDF_MARGIN_BOTTOM", GETPOST("MAIN_PDF_MARGIN_BOTTOM"), 'chaine', 0, '', $conf->entity);
+	if (GETPOSTISSET('MAIN_PDF_MARGIN_LEFT')) dolibarr_set_const($db, "MAIN_PDF_MARGIN_LEFT", GETPOST("MAIN_PDF_MARGIN_LEFT"), 'chaine', 0, '', $conf->entity);
+	if (GETPOSTISSET('MAIN_PDF_MARGIN_RIGHT')) dolibarr_set_const($db, "MAIN_PDF_MARGIN_RIGHT", GETPOST("MAIN_PDF_MARGIN_TOP"), 'chaine', 0, '', $conf->entity);
+	if (GETPOSTISSET('MAIN_PDF_MARGIN_BOTTOM')) dolibarr_set_const($db, "MAIN_PDF_MARGIN_BOTTOM", GETPOST("MAIN_PDF_MARGIN_BOTTOM"), 'chaine', 0, '', $conf->entity);
 
-	dolibarr_set_const($db, "MAIN_PROFID1_IN_ADDRESS", GETPOST("MAIN_PROFID1_IN_ADDRESS"), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_PROFID2_IN_ADDRESS", GETPOST("MAIN_PROFID2_IN_ADDRESS"), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_PROFID3_IN_ADDRESS", GETPOST("MAIN_PROFID3_IN_ADDRESS"), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_PROFID4_IN_ADDRESS", GETPOST("MAIN_PROFID4_IN_ADDRESS"), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_PROFID5_IN_ADDRESS", GETPOST("MAIN_PROFID5_IN_ADDRESS"), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_PROFID6_IN_ADDRESS", GETPOST("MAIN_PROFID6_IN_ADDRESS"), 'chaine', 0, '', $conf->entity);
+	if (GETPOSTISSET('MAIN_PROFID1_IN_ADDRESS')) dolibarr_set_const($db, "MAIN_PROFID1_IN_ADDRESS", GETPOST("MAIN_PROFID1_IN_ADDRESS"), 'chaine', 0, '', $conf->entity);
+	if (GETPOSTISSET('MAIN_PROFID2_IN_ADDRESS')) dolibarr_set_const($db, "MAIN_PROFID2_IN_ADDRESS", GETPOST("MAIN_PROFID2_IN_ADDRESS"), 'chaine', 0, '', $conf->entity);
+	if (GETPOSTISSET('MAIN_PROFID3_IN_ADDRESS')) dolibarr_set_const($db, "MAIN_PROFID3_IN_ADDRESS", GETPOST("MAIN_PROFID3_IN_ADDRESS"), 'chaine', 0, '', $conf->entity);
+	if (GETPOSTISSET('MAIN_PROFID4_IN_ADDRESS')) dolibarr_set_const($db, "MAIN_PROFID4_IN_ADDRESS", GETPOST("MAIN_PROFID4_IN_ADDRESS"), 'chaine', 0, '', $conf->entity);
+	if (GETPOSTISSET('MAIN_PROFID5_IN_ADDRESS')) dolibarr_set_const($db, "MAIN_PROFID5_IN_ADDRESS", GETPOST("MAIN_PROFID5_IN_ADDRESS"), 'chaine', 0, '', $conf->entity);
+	if (GETPOSTISSET('MAIN_PROFID6_IN_ADDRESS')) dolibarr_set_const($db, "MAIN_PROFID6_IN_ADDRESS", GETPOST("MAIN_PROFID6_IN_ADDRESS"), 'chaine', 0, '', $conf->entity);
 
-	dolibarr_set_const($db, "MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT", GETPOST("MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT"), 'chaine', 0, '', $conf->entity);
+	if (GETPOSTISSET('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT')) dolibarr_set_const($db, "MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT", GETPOST("MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT"), 'chaine', 0, '', $conf->entity);
 
-	dolibarr_set_const($db, "MAIN_TVAINTRA_NOT_IN_ADDRESS", GETPOST("MAIN_TVAINTRA_NOT_IN_ADDRESS"), 'chaine', 0, '', $conf->entity);
+	if (GETPOSTISSET('MAIN_TVAINTRA_NOT_IN_ADDRESS')) dolibarr_set_const($db, "MAIN_TVAINTRA_NOT_IN_ADDRESS", GETPOST("MAIN_TVAINTRA_NOT_IN_ADDRESS"), 'chaine', 0, '', $conf->entity);
 
 	if (!empty($conf->projet->enabled)) {
 		if (GETPOST('PDF_SHOW_PROJECT_REF_OR_LABEL') == 'no') {
@@ -82,20 +82,20 @@ if ($action == 'update') {
 		}
 	}
 
-	dolibarr_set_const($db, "MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS", GETPOST("MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS"), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_GENERATE_DOCUMENTS_HIDE_DESC", GETPOST("MAIN_GENERATE_DOCUMENTS_HIDE_DESC"), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_GENERATE_DOCUMENTS_HIDE_REF", GETPOST("MAIN_GENERATE_DOCUMENTS_HIDE_REF"), 'chaine', 0, '', $conf->entity);
+	if (GETPOSTISSET('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS')) dolibarr_set_const($db, "MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS", GETPOST("MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS"), 'chaine', 0, '', $conf->entity);
+	if (GETPOSTISSET('MAIN_GENERATE_DOCUMENTS_HIDE_DESC')) dolibarr_set_const($db, "MAIN_GENERATE_DOCUMENTS_HIDE_DESC", GETPOST("MAIN_GENERATE_DOCUMENTS_HIDE_DESC"), 'chaine', 0, '', $conf->entity);
+	if (GETPOSTISSET('MAIN_GENERATE_DOCUMENTS_HIDE_REF')) dolibarr_set_const($db, "MAIN_GENERATE_DOCUMENTS_HIDE_REF", GETPOST("MAIN_GENERATE_DOCUMENTS_HIDE_REF"), 'chaine', 0, '', $conf->entity);
 
-	dolibarr_set_const($db, "MAIN_DOCUMENTS_LOGO_HEIGHT", GETPOST("MAIN_DOCUMENTS_LOGO_HEIGHT", 'int'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INVERT_SENDER_RECIPIENT", GETPOST("MAIN_INVERT_SENDER_RECIPIENT"), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_PDF_USE_ISO_LOCATION", GETPOST("MAIN_PDF_USE_ISO_LOCATION"), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS", GETPOST("MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS"), 'chaine', 0, '', $conf->entity);
+	if (GETPOSTISSET('MAIN_DOCUMENTS_LOGO_HEIGHT')) dolibarr_set_const($db, "MAIN_DOCUMENTS_LOGO_HEIGHT", GETPOST("MAIN_DOCUMENTS_LOGO_HEIGHT", 'int'), 'chaine', 0, '', $conf->entity);
+	if (GETPOSTISSET('MAIN_INVERT_SENDER_RECIPIENT')) dolibarr_set_const($db, "MAIN_INVERT_SENDER_RECIPIENT", GETPOST("MAIN_INVERT_SENDER_RECIPIENT"), 'chaine', 0, '', $conf->entity);
+	if (GETPOSTISSET('MAIN_PDF_USE_ISO_LOCATION')) dolibarr_set_const($db, "MAIN_PDF_USE_ISO_LOCATION", GETPOST("MAIN_PDF_USE_ISO_LOCATION"), 'chaine', 0, '', $conf->entity);
+	if (GETPOSTISSET('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS')) dolibarr_set_const($db, "MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS", GETPOST("MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS"), 'chaine', 0, '', $conf->entity);
 
-	dolibarr_set_const($db, "MAIN_PDF_MAIN_HIDE_SECOND_TAX", GETPOST("MAIN_PDF_MAIN_HIDE_SECOND_TAX"), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_PDF_MAIN_HIDE_THIRD_TAX", GETPOST("MAIN_PDF_MAIN_HIDE_THIRD_TAX"), 'chaine', 0, '', $conf->entity);
+	if (GETPOSTISSET('MAIN_PDF_MAIN_HIDE_SECOND_TAX')) dolibarr_set_const($db, "MAIN_PDF_MAIN_HIDE_SECOND_TAX", GETPOST("MAIN_PDF_MAIN_HIDE_SECOND_TAX"), 'chaine', 0, '', $conf->entity);
+	if (GETPOSTISSET('MAIN_PDF_MAIN_HIDE_THIRD_TAX')) dolibarr_set_const($db, "MAIN_PDF_MAIN_HIDE_THIRD_TAX", GETPOST("MAIN_PDF_MAIN_HIDE_THIRD_TAX"), 'chaine', 0, '', $conf->entity);
 
-	dolibarr_set_const($db, "PDF_USE_ALSO_LANGUAGE_CODE", GETPOST('PDF_USE_ALSO_LANGUAGE_CODE', 'alpha'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "SHOW_SUBPRODUCT_REF_IN_PDF", GETPOST('SHOW_SUBPRODUCT_REF_IN_PDF', 'alpha'), 'chaine', 0, '', $conf->entity);
+	if (GETPOSTISSET('PDF_USE_ALSO_LANGUAGE_CODE')) dolibarr_set_const($db, "PDF_USE_ALSO_LANGUAGE_CODE", GETPOST('PDF_USE_ALSO_LANGUAGE_CODE', 'alpha'), 'chaine', 0, '', $conf->entity);
+	if (GETPOSTISSET('SHOW_SUBPRODUCT_REF_IN_PDF')) dolibarr_set_const($db, "SHOW_SUBPRODUCT_REF_IN_PDF", GETPOST('SHOW_SUBPRODUCT_REF_IN_PDF', 'alpha'), 'chaine', 0, '', $conf->entity);
 
 	setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 

From 0d70c8189778ac9ca348573a9e2b2193304b452b Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Fri, 30 Jul 2021 15:16:38 +0200
Subject: [PATCH 1350/1497] ix error in website module -> sitemap

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

diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index aa2b357a794..23be98a3b8c 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -2326,7 +2326,7 @@ if ($action == 'generatesitemaps' && $usercanedit) {
 					$domainname = $objp->virtualhost;
 				}
 				if (! preg_match('/^http/i', $domainname)) {
-					$domainname .= 'https://'.$domainname;
+					$domainname = 'https://'.$domainname;
 				}
 				//$pathofpage = $dolibarr_main_url_root.'/'.$pageurl.'.php';
 

From 055a5c4ab6570c30ec0d83efe617362ff68f6e31 Mon Sep 17 00:00:00 2001
From: Christian Foellmann <christian@foellmann.de>
Date: Fri, 30 Jul 2021 15:19:05 +0200
Subject: [PATCH 1351/1497] fix hook name

---
 htdocs/core/class/hookmanager.class.php | 2 +-
 htdocs/core/menus/standard/eldy.lib.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index 4750e0924dd..45643e26e4c 100644
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -193,7 +193,7 @@ class HookManager
 				'getFormatedSupplierRef',
 				'getIdProfUrl',
 				'getInputIdProf',
-				'menu_LeftMenuItems',
+				'menuLeftMenuItems',
 				'moveUploadedFile',
 				'moreHtmlStatus',
 				'pdf_build_address',
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 8374b71ff96..160a56ac740 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1964,7 +1964,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 		'mainmenu' => $mainmenu,
 	);
 	$hook_items = $menu_array;
-	$reshook = $hookmanager->executeHooks('menu_LeftMenuArray', $parameters, $hook_items); // Note that $action and $object may have been modified by some hooks
+	$reshook = $hookmanager->executeHooks('menuLeftMenuItems', $parameters, $hook_items); // Note that $action and $object may have been modified by some hooks
 
 	if (is_numeric($reshook)) {
 		if ($reshook == 0 && !empty($hookmanager->results)) {

From f830a0f5e243dd40306d1db216c3fa5da16f2e7a Mon Sep 17 00:00:00 2001
From: Christian Foellmann <christian@foellmann.de>
Date: Thu, 29 Jul 2021 17:32:06 +0200
Subject: [PATCH 1352/1497] fix `tomail` param in mail form usage

---
 htdocs/core/actions_sendmails.inc.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php
index 83a823edeb2..3c8e4a5fe73 100644
--- a/htdocs/core/actions_sendmails.inc.php
+++ b/htdocs/core/actions_sendmails.inc.php
@@ -186,6 +186,11 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 			$tmparray[] = trim($_POST['sendto']);
 		}
 
+		if (trim($_POST['tomail'])) {
+			// Recipients are provided as free text
+			$tmparray[] = trim($_POST['tomail']);
+		}
+
 		if (count($receiver) > 0) {
 			// Recipient was provided from combo list
 			foreach ($receiver as $key => $val) {

From 9c626bede47eb796c7bffba059891e493d9c6200 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Fri, 30 Jul 2021 18:43:35 +0200
Subject: [PATCH 1353/1497] Fix dol_hash for sha256

---
 htdocs/core/lib/security.lib.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index 598802ea574..d64069aa923 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -98,7 +98,7 @@ function dol_decode($chain, $key = '1')
  *  If constant MAIN_SECURITY_SALT is defined, we use it as a salt (used only if hashing algorightm is something else than 'password_hash').
  *
  * 	@param 		string		$chain		String to hash
- * 	@param		string		$type		Type of hash ('0':auto will use MAIN_SECURITY_HASH_ALGO else md5, '1':sha1, '2':sha1+md5, '3':md5, '4':md5 for OpenLdap with no salt, '5':sha256). Use '3' here, if hash is not needed for security purpose, for security need, prefer '0'.
+ * 	@param		string		$type		Type of hash ('0':auto will use MAIN_SECURITY_HASH_ALGO else md5, '1':sha1, '2':sha1+md5, '3':md5, '4':md5 for OpenLdap with no salt, '5':sha256, '6':password_hash). Use '3' here, if hash is not needed for security purpose, for security need, prefer '0'.
  * 	@return		string					Hash of string
  *  @see getRandomPassword()
  */
@@ -124,8 +124,10 @@ function dol_hash($chain, $type = '0')
 		return md5($chain);
 	} elseif ($type == '4' || $type == 'md5openldap') {
 		return '{md5}'.base64_encode(mhash(MHASH_MD5, $chain)); // For OpenLdap with md5 (based on an unencrypted password in base)
-	} elseif ($type == '5') {
+	} elseif ($type == '5' || $type == 'sha256') {
 		return hash('sha256', $chain);
+	} elseif ($type == '6' || $type == 'password_hash') {
+		return password_hash($chain, PASSWORD_DEFAULT);
 	} elseif (!empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'sha1') {
 		return sha1($chain);
 	} elseif (!empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'sha1md5') {

From 53391546547f5415bbe614784fcad80056847062 Mon Sep 17 00:00:00 2001
From: Lenin Rivas <53640168+leninrivas@users.noreply.github.com>
Date: Fri, 30 Jul 2021 17:47:05 -0500
Subject: [PATCH 1354/1497] tva change too in facture

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

diff --git a/ChangeLog b/ChangeLog
index f439186f5ca..685d1cd2510 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -219,7 +219,7 @@ Following changes may create regressions for some external modules, but were nec
 * The ICS value for direct debit or credit transfer is now stored on each bank account instead of into the global setup.
 * API /setup/shipment_methods has been replaced with API /setup/shipping_methods
 * Field "total" renamed into "total_ht"  for table llx_facture, llx_facture_rec for better field name consistency
-* Field "tva"   renamed into "total_tva" for table llx_propal, llx_supplier_proposal, llx_commande, llx_commande_fournisseur for better field name consistency
+* Field "tva"   renamed into "total_tva" for llx_facture, table llx_propal, llx_supplier_proposal, llx_commande, llx_commande_fournisseur for better field name consistency
 * Field "total" renamed into "total_ttc" for table llx_propal, llx_supplier_proposal for better field name consistency
 * If your database is PostgreSQL, you must use version 9.1.0 or more (Dolibarr need the SQL function CONCAT)
 * If your database is MySQL or MariaDB, you need at least version 5.1

From 9811569b2be6d8ebe6876d1a302f237cff30e43d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sat, 31 Jul 2021 16:22:50 +0200
Subject: [PATCH 1355/1497] FIX #18289 #18294

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

diff --git a/htdocs/imports/emptyexample.php b/htdocs/imports/emptyexample.php
index a50a2fc9996..b919a3c4c3e 100644
--- a/htdocs/imports/emptyexample.php
+++ b/htdocs/imports/emptyexample.php
@@ -102,13 +102,13 @@ if ($attachment) {
 
 
 // List of targets fields
-$headerlinefields = array();
-$contentlinevalues = array();
+$headerlinefields = array();	// Array of fields (label to show)
+$contentlinevalues = array();	// Array of example values
 $i = 0;
 foreach ($fieldstarget as $code => $label) {
 	$withoutstar = preg_replace('/\*/', '', $fieldstarget[$code]);
 	$headerlinefields[] = $langs->transnoentities($withoutstar).($withoutstar != $fieldstarget[$code] ? '*' : '').' ('.$code.')';
-	$contentlinevalues[] = $valuestarget[$code];
+	$contentlinevalues[] = (isset($valuestarget[$code]) ? $valuestarget[$code] : '');
 }
 //var_dump($headerlinefields);
 //var_dump($contentlinevalues);

From af95169d1d0656dcb415757c2d87c8ba1f6972bc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 31 Jul 2021 16:54:18 +0200
Subject: [PATCH 1356/1497] Update actions_sendmails.inc.php

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

diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php
index 3c8e4a5fe73..e5c75a2e7c3 100644
--- a/htdocs/core/actions_sendmails.inc.php
+++ b/htdocs/core/actions_sendmails.inc.php
@@ -182,12 +182,12 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 
 		$tmparray = array();
 		if (trim($_POST['sendto'])) {
-			// Recipients are provided into free text
+			// Recipients are provided into free text field
 			$tmparray[] = trim($_POST['sendto']);
 		}
 
 		if (trim($_POST['tomail'])) {
-			// Recipients are provided as free text
+			// Recipients are provided into free hidden text field
 			$tmparray[] = trim($_POST['tomail']);
 		}
 

From bd35d8626834daac53eee835e220dbbe1a2fada2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sat, 31 Jul 2021 17:20:48 +0200
Subject: [PATCH 1357/1497] Debug v14

---
 htdocs/comm/mailing/cibles.php                     |  7 ++++---
 htdocs/core/modules/mailings/contacts1.modules.php | 14 +++++++++-----
 htdocs/langs/en_US/mails.lang                      |  4 ++--
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index 08e223ed89f..3f2cfc2974c 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2005-2016 Laurent Destailleur  <eldy@uers.sourceforge.net>
+ * Copyright (C) 2005-2021 Laurent Destailleur  <eldy@uers.sourceforge.net>
  * Copyright (C) 2005-2010 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2014	   Florian Henry        <florian.henry@open-concept.pro>
  *
@@ -337,6 +337,7 @@ if ($object->fetch($id) >= 0) {
 			if (is_resource($handle)) {
 				while (($file = readdir($handle)) !== false) {
 					if (substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS') {
+						$reg = array();
 						if (preg_match("/(.*)\.modules\.php$/i", $file, $reg)) {
 							if ($reg[1] == 'example') {
 								continue;
@@ -534,9 +535,9 @@ if ($object->fetch($id) >= 0) {
 
 		$morehtmlcenter = '';
 		if ($allowaddtarget) {
-			$morehtmlcenter = '<span class="opacitymedium">'.$langs->trans("ToClearAllRecipientsClickHere").'</span> <a href="'.$_SERVER["PHP_SELF"].'?clearlist=1&id='.$object->id.'" class="button reposition">'.$langs->trans("TargetsReset").'</a>';
+			$morehtmlcenter = '<span class="opacitymedium">'.$langs->trans("ToClearAllRecipientsClickHere").'</span> <a href="'.$_SERVER["PHP_SELF"].'?clearlist=1&id='.$object->id.'" class="button reposition smallpaddingimp">'.$langs->trans("TargetsReset").'</a>';
 		}
-		$morehtmlcenter .= ' <a class="reposition" href="'.$_SERVER["PHP_SELF"].'?exportcsv=1&id='.$object->id.'">'.$langs->trans("Download").'</a>';
+		$morehtmlcenter .= ' &nbsp; <a class="reposition" href="'.$_SERVER["PHP_SELF"].'?exportcsv=1&id='.$object->id.'">'.$langs->trans("Download").'</a>';
 
 		print_barre_liste($langs->trans("MailSelectedRecipients"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $morehtmlcenter, $num, $nbtotalofrecords, 'generic', 0, '', '', $limit);
 
diff --git a/htdocs/core/modules/mailings/contacts1.modules.php b/htdocs/core/modules/mailings/contacts1.modules.php
index 4bd03593e09..6be129b8815 100644
--- a/htdocs/core/modules/mailings/contacts1.modules.php
+++ b/htdocs/core/modules/mailings/contacts1.modules.php
@@ -141,15 +141,19 @@ class mailing_contacts1 extends MailingTargets
 		$resql = $this->db->query($sql);
 
 		$s .= $langs->trans("PostOrFunction").': ';
-		$s .= '<select name="filter_jobposition" class="flat">';
+		$s .= '<select name="filter_jobposition" class="flat" placeholder="'.dol_escape_htmltag($langs->trans("PostOrFunction")).'">';
 		$s .= '<option value="all">&nbsp;</option>';
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$i = 0;
-			while ($i < $num) {
-				$obj = $this->db->fetch_object($resql);
-				$s .= '<option value="'.dol_escape_htmltag($obj->poste).'">'.dol_escape_htmltag($obj->poste).' ('.$obj->nb.')</option>';
-				$i++;
+			if ($num > 0) {
+				while ($i < $num) {
+					$obj = $this->db->fetch_object($resql);
+					$s .= '<option value="'.dol_escape_htmltag($obj->poste).'">'.dol_escape_htmltag($obj->poste).' ('.$obj->nb.')</option>';
+					$i++;
+				}
+			} else {
+				$s .= '<option disabled="disabled" value="">'.$langs->trans("None").'</option>';
 			}
 		} else {
 			dol_print_error($this->db);
diff --git a/htdocs/langs/en_US/mails.lang b/htdocs/langs/en_US/mails.lang
index 24c86cc885a..1c0dd638eeb 100644
--- a/htdocs/langs/en_US/mails.lang
+++ b/htdocs/langs/en_US/mails.lang
@@ -162,8 +162,8 @@ AdvTgtDeleteFilter=Delete filter
 AdvTgtSaveFilter=Save filter
 AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
-NoContactWithCategoryFound=No contact/address with a category found
-NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
+NoContactWithCategoryFound=No category found linked to some contacts/addresses
+NoContactLinkedToThirdpartieWithCategoryFound=No category found linked to some thirdparties
 OutGoingEmailSetup=Outgoing emails
 InGoingEmailSetup=Incoming emails
 OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)

From b67487b2ca544d1803642bf176d077f78e67c073 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sat, 31 Jul 2021 17:28:43 +0200
Subject: [PATCH 1358/1497] Fix reposition

---
 .../modules/mailings/contacts1.modules.php    | 20 +++++++++----------
 .../core/modules/mailings/pomme.modules.php   | 12 +++++------
 .../modules/mailings/thirdparties.modules.php |  8 ++++----
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/htdocs/core/modules/mailings/contacts1.modules.php b/htdocs/core/modules/mailings/contacts1.modules.php
index 6be129b8815..0ca62392c82 100644
--- a/htdocs/core/modules/mailings/contacts1.modules.php
+++ b/htdocs/core/modules/mailings/contacts1.modules.php
@@ -140,8 +140,8 @@ class mailing_contacts1 extends MailingTargets
 		$sql .= " ORDER BY sp.poste";
 		$resql = $this->db->query($sql);
 
-		$s .= $langs->trans("PostOrFunction").': ';
-		$s .= '<select name="filter_jobposition" class="flat" placeholder="'.dol_escape_htmltag($langs->trans("PostOrFunction")).'">';
+		$s .= $langs->trans("PostOrFunction").' ';
+		$s .= '<select name="filter_jobposition" class="flat marginrightonly" placeholder="'.dol_escape_htmltag($langs->trans("PostOrFunction")).'">';
 		$s .= '<option value="all">&nbsp;</option>';
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
@@ -163,7 +163,7 @@ class mailing_contacts1 extends MailingTargets
 		$s .= ' ';
 
 		// Filter on contact category
-		$s .= $langs->trans("ContactCategoriesShort").': ';
+		$s .= $langs->trans("ContactCategoriesShort").' ';
 		$sql = "SELECT c.label, count(distinct(sp.email)) AS nb";
 		$sql .= " FROM ";
 		$sql .= " ".MAIN_DB_PREFIX."socpeople as sp,";
@@ -179,7 +179,7 @@ class mailing_contacts1 extends MailingTargets
 		$sql .= " ORDER BY c.label";
 		$resql = $this->db->query($sql);
 
-		$s .= '<select name="filter_category" class="flat">';
+		$s .= '<select name="filter_category" class="flat marginrightonly">';
 		$s .= '<option value="all">&nbsp;</option>';
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
@@ -201,8 +201,8 @@ class mailing_contacts1 extends MailingTargets
 		$s .= '<br>';
 
 		// Add prospect of a particular level
-		$s .= $langs->trans("NatureOfThirdParty").': ';
-		$s .= '<select name="filter" class="flat">';
+		$s .= $langs->trans("NatureOfThirdParty").' ';
+		$s .= '<select name="filter" class="flat marginrightonly">';
 		$sql = "SELECT code, label";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_prospectlevel";
 		$sql .= " WHERE active > 0";
@@ -238,7 +238,7 @@ class mailing_contacts1 extends MailingTargets
 		$s .= ' ';
 
 		// Filter on thirdparty category
-		$s .= $langs->trans("CustomersProspectsCategoriesShort").': ';
+		$s .= $langs->trans("CustomersProspectsCategoriesShort").' ';
 		$sql = "SELECT c.label, count(distinct(sp.email)) AS nb";
 		$sql .= " FROM ";
 		$sql .= " ".MAIN_DB_PREFIX."socpeople as sp,";
@@ -254,7 +254,7 @@ class mailing_contacts1 extends MailingTargets
 		$sql .= " ORDER BY c.label";
 		$resql = $this->db->query($sql);
 
-		$s .= '<select name="filter_category_customer" class="flat">';
+		$s .= '<select name="filter_category_customer" class="flat marginrightonly maxwidth200">';
 		$s .= '<option value="all">&nbsp;</option>';
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
@@ -276,7 +276,7 @@ class mailing_contacts1 extends MailingTargets
 		$s .= ' ';
 
 		// Filter on thirdparty category
-		$s .= $langs->trans("SuppliersCategoriesShort").': ';
+		$s .= $langs->trans("SuppliersCategoriesShort").' ';
 		$sql = "SELECT c.label, count(distinct(sp.email)) AS nb";
 		$sql .= " FROM ";
 		$sql .= " ".MAIN_DB_PREFIX."socpeople as sp,";
@@ -292,7 +292,7 @@ class mailing_contacts1 extends MailingTargets
 		$sql .= " ORDER BY c.label";
 		$resql = $this->db->query($sql);
 
-		$s .= '<select name="filter_category_supplier" class="flat">';
+		$s .= '<select name="filter_category_supplier" class="flat marginrightonly maxwidth200">';
 		$s .= '<option value="all">&nbsp;</option>';
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
diff --git a/htdocs/core/modules/mailings/pomme.modules.php b/htdocs/core/modules/mailings/pomme.modules.php
index a2a54c02c55..6880452a416 100644
--- a/htdocs/core/modules/mailings/pomme.modules.php
+++ b/htdocs/core/modules/mailings/pomme.modules.php
@@ -20,13 +20,13 @@
 /**
  *	\file       htdocs/core/modules/mailings/pomme.modules.php
  *	\ingroup    mailing
- *	\brief      File of class to offer a selector of emailing targets with Rule 'Pomme'.
+ *	\brief      File of class to offer a selector of emailing targets of users.
  */
 include_once DOL_DOCUMENT_ROOT.'/core/modules/mailings/modules_mailings.php';
 
 
 /**
- *	Class to offer a selector of emailing targets with Rule 'Peche'.
+ *	Class to offer a selector of emailing targets with Rule 'Pomme'.
  */
 class mailing_pomme extends MailingTargets
 {
@@ -119,16 +119,16 @@ class mailing_pomme extends MailingTargets
 		$langs->load("users");
 
 		$s = '';
-		$s .= $langs->trans("Status").': ';
-		$s .= '<select name="filter" class="flat">';
+		$s .= $langs->trans("Status").' ';
+		$s .= '<select name="filter" class="flat marginrightonly">';
 		$s .= '<option value="-1">&nbsp;</option>';
 		$s .= '<option value="1">'.$langs->trans("Enabled").'</option>';
 		$s .= '<option value="0">'.$langs->trans("Disabled").'</option>';
 		$s .= '</select>';
 
 		$s .= ' ';
-		$s .= $langs->trans("Employee").': ';
-		$s .= '<select name="filteremployee" class="flat">';
+		$s .= $langs->trans("Employee").' ';
+		$s .= '<select name="filteremployee" class="flat marginrightonly">';
 		$s .= '<option value="-1">&nbsp;</option>';
 		$s .= '<option value="1">'.$langs->trans("Yes").'</option>';
 		$s .= '<option value="0">'.$langs->trans("No").'</option>';
diff --git a/htdocs/core/modules/mailings/thirdparties.modules.php b/htdocs/core/modules/mailings/thirdparties.modules.php
index f764c3f5f71..ae26dfc19fd 100644
--- a/htdocs/core/modules/mailings/thirdparties.modules.php
+++ b/htdocs/core/modules/mailings/thirdparties.modules.php
@@ -226,8 +226,8 @@ class mailing_thirdparties extends MailingTargets
 
 		$langs->load("companies");
 
-		$s = $langs->trans("Categories").': ';
-		$s .= '<select name="filter" class="flat">';
+		$s = $langs->trans("Categories").' ';
+		$s .= '<select name="filter" class="flat marginrightonly">';
 
 		// Show categories
 		$sql = "SELECT rowid, label, type, visible";
@@ -276,7 +276,7 @@ class mailing_thirdparties extends MailingTargets
 
 		$s .= '</select> ';
 		$s .= $langs->trans('ProspectCustomer');
-		$s .= ': <select name="filter_client" class="flat">';
+		$s .= ' <select name="filter_client" class="flat marginrightonly">';
 		$s .= '<option value="-1">&nbsp;</option>';
 		if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) {
 			$s .= '<option value="2">'.$langs->trans('Prospect').'</option>';
@@ -292,7 +292,7 @@ class mailing_thirdparties extends MailingTargets
 		$s .= '</select> ';
 
 		$s .= $langs->trans("Status");
-		$s .= ': <select name="filter_status" class="flat">';
+		$s .= ' <select name="filter_status" class="flat marginrightonly">';
 		$s .= '<option value="-1">&nbsp;</option>';
 		$s .= '<option value="1" selected>'.$langs->trans("Enabled").'</option>';
 		$s .= '<option value="0">'.$langs->trans("Disabled").'</option>';

From 5256d6e046894a007664b002ef1b1be0ee94c973 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sat, 31 Jul 2021 17:34:41 +0200
Subject: [PATCH 1359/1497] css

---
 htdocs/accountancy/bookkeeping/list.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index ce91219c306..bc260c77ed3 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -576,7 +576,7 @@ if (!empty($sortfield)) {
 // Export into a file with format defined into setup (FEC, CSV, ...)
 // Must be after definition of $sql
 if ($action == 'export_fileconfirm' && $user->rights->accounting->mouvements->export) {
-	// TODO Replace the fetchAll + ->export later that consume too much memory on large export with the query($sql) and loop on each line to export them.
+	// TODO Replace the fetchAll to get all ->line followed by call to ->export(). It consumew too much memory on large export. Replace this with the query($sql) and loop on each line to export them.
 	$result = $object->fetchAll($sortorder, $sortfield, 0, 0, $filter, 'AND', (empty($conf->global->ACCOUNTING_REEXPORT) ? 0 : 1));
 
 	if ($result < 0) {
@@ -822,7 +822,7 @@ if (!empty($arrayfields['t.piece_num']['checked'])) {
 // Code journal
 if (!empty($arrayfields['t.code_journal']['checked'])) {
 	print '<td class="liste_titre center">';
-	print $formaccounting->multi_select_journal($search_ledger_code, 'search_ledger_code', 0, 1, 1, 1);
+	print $formaccounting->multi_select_journal($search_ledger_code, 'search_ledger_code', 0, 1, 1, 1, 'maxwidth150');
 	print '</td>';
 }
 // Date document
@@ -865,7 +865,7 @@ if (!empty($arrayfields['t.subledger_account']['checked'])) {
 		print $formaccounting->select_auxaccount($search_accountancy_aux_code_end, 'search_accountancy_aux_code_end', $langs->trans('to'), 'maxwidth250', 'subledgeraccount');
 		print '</div>';
 	} else {
-		print '<input type="text" class="maxwidth100" name="search_accountancy_aux_code" value="'.$search_accountancy_aux_code.'">';
+		print '<input type="text" class="maxwidth75" name="search_accountancy_aux_code" value="'.$search_accountancy_aux_code.'">';
 	}
 	print '</td>';
 }

From 893bae0bd71baf4498390479d416c9e117ec9f65 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 2 Aug 2021 11:45:14 +0200
Subject: [PATCH 1360/1497] Update ChangeLog

---
 ChangeLog | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 35696c2fd0f..06a4d819576 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -235,11 +235,11 @@ Following changes may create regressions for some external modules, but were nec
 ***** ChangeLog for 13.0.4 compared to 13.0.3 *****
 
 FIX: Allow disabling of a module (not a dangerous action) even if there is problem with token (due to bugged modules).
-FIX: 13.0 - fatal - missing inclusion of ajax.lib.php for calling `ajax_autocompleter()`
-FIX: #17919 pictures in docs.
+FIX: 13.0 - fatal - missing inclusion of ajax.lib.php for calling 'ajax_autocompleter()'
+FIX: #17919 pictures in docs
 FIX: #18006
 FIX: Accountancy - if we define a date start, automatic binding try to continue to solve old binding
-FIX: Accoutancy Limit date payment not registered on purchases operations
+FIX: Accountancy - Limit date payment not registered on purchases operations
 FIX: Can't edit replacement invoice
 FIX: deposit can create credit note in payment conf
 FIX: division by zero on create
@@ -343,7 +343,7 @@ FIX: File attachment on lots/batches
 FIX: handling $heightforinfotot when he's superior to a page height on Supplier Invoice
 FIX: hourglass and hide button to pay
 FIX: massaction validate invoice do not regenerate PDF
-FIX: missing mp4 video mime
+FIX: #16627 fix missing mp4 video mime
 FIX: picto on shipment to reset qty to 0. Some quantities were not reset.
 FIX: Protection to avoid #16504
 FIX: rounding amount on card updating

From b801188801a73b22ca3db7028d47196b31a66df8 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 2 Aug 2021 12:12:57 +0200
Subject: [PATCH 1361/1497] Update llx_c_actioncomm.sql

---
 .../install/mysql/data/llx_c_actioncomm.sql   | 51 +++++++++++--------
 1 file changed, 30 insertions(+), 21 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_c_actioncomm.sql b/htdocs/install/mysql/data/llx_c_actioncomm.sql
index 47197af644d..38f09ba23d0 100644
--- a/htdocs/install/mysql/data/llx_c_actioncomm.sql
+++ b/htdocs/install/mysql/data/llx_c_actioncomm.sql
@@ -5,6 +5,8 @@
 -- Copyright (C) 2004      Guillaume Delecourt  <guillaume.delecourt@opensides.be>
 -- Copyright (C) 2005-2011 Regis Houssin        <regis.houssin@inodbox.com>
 -- Copyright (C) 2007 	   Patrick Raguin       <patrick.raguin@gmail.com>
+-- Copyright (C) 2021 	   Udo Tamm             <dev@dolibit.de>
+--
 --
 -- 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,6 +23,9 @@
 --
 --
 
+--
+-- Do not put a comment at the end of the line, this file is parsed during the
+-- install and all '--' symbols are removed.
 --
 -- Ne pas placer de commentaire en fin de ligne, ce fichier est parsé lors
 -- de l'install et tous les sigles '--' sont supprimés.
@@ -31,25 +36,29 @@
 --
 
 delete from llx_c_actioncomm where id in (1,2,3,4,5,6,8,9,10,11,30,31,40,50);
--- Code used from 3.3+ when type of event is used
-insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 1,'AC_TEL','system','Phone call',NULL, 1, 2);
-insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 2,'AC_FAX','system','Send Fax',NULL, 1, 3);
-insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 4,'AC_EMAIL','system','Send Email',NULL, 1, 4);
-insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 5,'AC_RDV','system','Rendez-vous',NULL, 1, 1);
-insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 6,'AC_EMAIL_IN','system','reception Email',NULL, 1, 4);
-insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values (11,'AC_INT','system','Intervention on site',NULL, 1, 4);
--- Code kept for backward compatibility < 3.3 
---insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 3,'AC_PROP','systemauto', 'Send commercial proposal by email','propal',0,10);
---insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 8,'AC_COM','systemauto','Send customer order by email','order', 0,8);
---insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 9,'AC_FAC','systemauto', 'Send customer invoice by email','invoice',0,6);
---insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 10,'AC_SHIP','systemauto', 'Send shipping by email','shipping',0,11);
---insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 30,'AC_SUP_ORD','systemauto','Send supplier order by email','order_supplier',0,9);
---insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 31,'AC_SUP_INV','systemauto','Send supplier invoice by email','invoice_supplier',0,7);
--- Code used from 3.3+ when type of event is not used
-insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 40,'AC_OTH_AUTO','systemauto','Other (automatically inserted events)',NULL, 1, 20);
-insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 50,'AC_OTH','system','Other (manually inserted events)',NULL, 1, 5);
 
-INSERT INTO llx_c_actioncomm (id, code, type, libelle, module, active, position) VALUES ( 60,'AC_EO_ONLINECONF','module','Online/Virtual conference','conference@eventorganization', 1, 60);
-INSERT INTO llx_c_actioncomm (id, code, type, libelle, module, active, position) VALUES ( 61,'AC_EO_INDOORCONF','module','Indoor conference','conference@eventorganization', 1, 61);
-INSERT INTO llx_c_actioncomm (id, code, type, libelle, module, active, position) VALUES ( 62,'AC_EO_ONLINEBOOTH','module','Online/Virtual booth','booth@eventorganization', 1, 62);
-INSERT INTO llx_c_actioncomm (id, code, type, libelle, module, active, position) VALUES ( 63,'AC_EO_INDOORBOOTH','module','Indoor booth','booth@eventorganization', 1, 63);
+-- Code used from 3.3+ when type of event is used
+insert into llx_c_actioncomm (id, code, libelle, type, module, active, position) values (  1, 'AC_TEL',       'Phone call',       'system', NULL, 1, 2);
+insert into llx_c_actioncomm (id, code, libelle, type, module, active, position) values (  2, 'AC_FAX',       'Send Fax',         'system', NULL, 1, 3);
+insert into llx_c_actioncomm (id, code, libelle, type, module, active, position) values (  4, 'AC_EMAIL',     'Send Email',       'system', NULL, 1, 4);
+insert into llx_c_actioncomm (id, code, libelle, type, module, active, position) values (  5, 'AC_RDV',       'Rendez-vous',      'system', NULL, 1, 1);
+insert into llx_c_actioncomm (id, code, libelle, type, module, active, position) values (  6, 'AC_EMAIL_IN',  'reception Email',  'system', NULL, 1, 4);
+insert into llx_c_actioncomm (id, code, libelle, type, module, active, position) values ( 11, 'AC_INT',   'Intervention on site', 'system', NULL, 1, 4);
+
+-- Code kept for backward compatibility < 3.3 
+--insert into llx_c_actioncomm (id, code, libelle, type, module, active, position) values (  3, 'AC_PROP',    'Send commercial proposal by email', 'systemauto', 'propal', 0, 10);
+--insert into llx_c_actioncomm (id, code, libelle, type, module, active, position) values (  8, 'AC_COM',     'Send customer order by email',      'systemauto', 'order', 0, 8);
+--insert into llx_c_actioncomm (id, code, libelle, type, module, active, position) values (  9, 'AC_FAC',     'Send customer invoice by email',    'systemauto', 'invoice', 0, 6);
+--insert into llx_c_actioncomm (id, code, libelle, type, module, active, position) values ( 10, 'AC_SHIP',    'Send shipping by email',            'systemauto', 'shipping', 0, 11);
+--insert into llx_c_actioncomm (id, code, libelle, type, module, active, position) values ( 30, 'AC_SUP_ORD', 'Send supplier order by email',      'systemauto', 'order_supplier', 0, 9);
+--insert into llx_c_actioncomm (id, code, libelle, type, module, active, position) values ( 31, 'AC_SUP_INV', 'Send supplier invoice by email',    'systemauto', 'invoice_supplier', 0, 7);
+
+-- Code used from 3.3+ when type of event is not used
+
+insert into llx_c_actioncomm (id, code, libelle, type, module, active, position) values ( 40, 'AC_OTH_AUTO', 'Other (automatically inserted events)', 'systemauto', NULL, 1, 20);
+insert into llx_c_actioncomm (id, code, libelle, type, module, active, position) values ( 50, 'AC_OTH',      'Other (manually inserted events)',      'systemauto', NULL, 1, 5);
+
+INSERT INTO llx_c_actioncomm (id, code, libelle, type, module, active, position) VALUES ( 60, 'AC_EO_ONLINECONF',  'Online/Virtual conference', 'module', 'conference@eventorganization', 1, 60);
+INSERT INTO llx_c_actioncomm (id, code, libelle, type, module, active, position) VALUES ( 61, 'AC_EO_INDOORCONF',  'Indoor conference',         'module', 'conference@eventorganization', 1, 61);
+INSERT INTO llx_c_actioncomm (id, code, libelle, type, module, active, position) VALUES ( 62, 'AC_EO_ONLINEBOOTH', 'Online/Virtual booth',      'module', 'booth@eventorganization', 1, 62);
+INSERT INTO llx_c_actioncomm (id, code, libelle, type, module, active, position) VALUES ( 63, 'AC_EO_INDOORBOOTH', 'Indoor booth',              'module', 'booth@eventorganization', 1, 63);

From 3acb304dd37295115673e214a9a349c4b717f61d Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Mon, 2 Aug 2021 12:35:46 +0200
Subject: [PATCH 1362/1497] fix typo and translation

---
 htdocs/core/db/Database.interface.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/db/Database.interface.php b/htdocs/core/db/Database.interface.php
index 898421978db..9996d09f036 100644
--- a/htdocs/core/db/Database.interface.php
+++ b/htdocs/core/db/Database.interface.php
@@ -122,7 +122,7 @@ interface Database
 	 *  List tables into a database
 	 *
 	 *  @param	string		$database	Name of database
-	 *  @param	string		$table		Nmae of table filter ('xxx%')
+	 *  @param	string		$table		Name of table filter ('xxx%')
 	 *  @return	array					List of tables in an array
 	 */
 	public function DDLListTables($database, $table = '');
@@ -189,7 +189,7 @@ interface Database
 	/**
 	 * Get last ID after an insert INSERT
 	 *
-	 * @param	string 	$tab 		Table name concerned by insert. Ne sert pas sous MySql mais requis pour compatibilite avec Postgresql
+	 * @param	string 	$tab 		Table name concerned by insert. Not used under MySql but required for compatibility with Postgresql
 	 * @param   string 	$fieldid 	Field name
 	 * @return  int                	Id of row
 	 */

From 703217acd04acc594537549e51e0d3fdb39cb117 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Mon, 2 Aug 2021 12:39:45 +0200
Subject: [PATCH 1363/1497] backward

---
 htdocs/core/db/Database.interface.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/db/Database.interface.php b/htdocs/core/db/Database.interface.php
index 9996d09f036..898421978db 100644
--- a/htdocs/core/db/Database.interface.php
+++ b/htdocs/core/db/Database.interface.php
@@ -122,7 +122,7 @@ interface Database
 	 *  List tables into a database
 	 *
 	 *  @param	string		$database	Name of database
-	 *  @param	string		$table		Name of table filter ('xxx%')
+	 *  @param	string		$table		Nmae of table filter ('xxx%')
 	 *  @return	array					List of tables in an array
 	 */
 	public function DDLListTables($database, $table = '');
@@ -189,7 +189,7 @@ interface Database
 	/**
 	 * Get last ID after an insert INSERT
 	 *
-	 * @param	string 	$tab 		Table name concerned by insert. Not used under MySql but required for compatibility with Postgresql
+	 * @param	string 	$tab 		Table name concerned by insert. Ne sert pas sous MySql mais requis pour compatibilite avec Postgresql
 	 * @param   string 	$fieldid 	Field name
 	 * @return  int                	Id of row
 	 */

From 3c05cd075708ed9cb733ecd9f709ffbdb8a6bab7 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Mon, 2 Aug 2021 12:41:55 +0200
Subject: [PATCH 1364/1497] fix typo and translation

---
 htdocs/core/db/Database.interface.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/db/Database.interface.php b/htdocs/core/db/Database.interface.php
index 898421978db..9996d09f036 100644
--- a/htdocs/core/db/Database.interface.php
+++ b/htdocs/core/db/Database.interface.php
@@ -122,7 +122,7 @@ interface Database
 	 *  List tables into a database
 	 *
 	 *  @param	string		$database	Name of database
-	 *  @param	string		$table		Nmae of table filter ('xxx%')
+	 *  @param	string		$table		Name of table filter ('xxx%')
 	 *  @return	array					List of tables in an array
 	 */
 	public function DDLListTables($database, $table = '');
@@ -189,7 +189,7 @@ interface Database
 	/**
 	 * Get last ID after an insert INSERT
 	 *
-	 * @param	string 	$tab 		Table name concerned by insert. Ne sert pas sous MySql mais requis pour compatibilite avec Postgresql
+	 * @param	string 	$tab 		Table name concerned by insert. Not used under MySql but required for compatibility with Postgresql
 	 * @param   string 	$fieldid 	Field name
 	 * @return  int                	Id of row
 	 */

From 04fc2c0ce73c2019d552e781eb068ee1e1fd53e1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 2 Aug 2021 17:49:27 +0200
Subject: [PATCH 1365/1497] css

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

diff --git a/htdocs/admin/paymentbybanktransfer.php b/htdocs/admin/paymentbybanktransfer.php
index 7cf522abc33..be5dc4e76e6 100644
--- a/htdocs/admin/paymentbybanktransfer.php
+++ b/htdocs/admin/paymentbybanktransfer.php
@@ -150,7 +150,7 @@ print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<table class="noborder centpercent">';
 
 print '<tr class="liste_titre">';
-print '<td class="titlefieldcreate">'.$langs->trans("Parameter").'</td>';
+print '<td>'.$langs->trans("Parameter").'</td>';
 print '<td>'.$langs->trans("Value").'</td>';
 print "</tr>";
 

From 8077fae42e1458e45e7c800512fd9e4726ea0b43 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 2 Aug 2021 17:56:58 +0200
Subject: [PATCH 1366/1497] Code comment

---
 htdocs/compta/facture/prelevement.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index f5ac0f19509..6fdc74a7539 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -148,12 +148,6 @@ if ($type == 'bank-transfer') {
 llxHeader('', $title, $helpurl);
 
 
-/* *************************************************************************** */
-/*                                                                             */
-/* Mode fiche                                                                  */
-/*                                                                             */
-/* *************************************************************************** */
-
 if ($object->id > 0) {
 	$selleruserevenustamp = $mysoc->useRevenueStamp();
 
@@ -471,6 +465,7 @@ if ($object->id > 0) {
 	print "</td>";
 	print '</tr>';
 
+	// IBAN of seller or supplier
 	$title = 'CustomerIBAN';
 	if ($type == 'bank-transfer') {
 		$title = 'SupplierIBAN';

From efda27000eaabc22649a3f5bc1a925e4226feb99 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 2 Aug 2021 18:13:35 +0200
Subject: [PATCH 1367/1497] Fix set of date of rum signature

---
 .../societe/class/companybankaccount.class.php   |  7 ++++---
 htdocs/societe/paymentmodes.php                  | 16 ++++++++--------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php
index 6c52359979e..9b767cde34c 100644
--- a/htdocs/societe/class/companybankaccount.class.php
+++ b/htdocs/societe/class/companybankaccount.class.php
@@ -83,7 +83,7 @@ class CompanyBankAccount extends Account
 		$now	= dol_now();
 		$error = 0;
 		// Correct default_rib to be sure to have always one default
-		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_rib where fk_soc = ".$this->socid." AND default_rib = 1 AND type = 'ban'";
+		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_rib where fk_soc = ".((int) $this->socid)." AND default_rib = 1 AND type = 'ban'";
 		$result = $this->db->query($sql);
 		if ($result) {
 			$numrows = $this->db->num_rows($result);
@@ -96,7 +96,7 @@ class CompanyBankAccount extends Account
 		}
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_rib (fk_soc, type, datec)";
-		$sql .= " VALUES (".$this->socid.", 'ban', '".$this->db->idate($now)."')";
+		$sql .= " VALUES (".((int) $this->socid).", 'ban', '".$this->db->idate($now)."')";
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			if ($this->db->affected_rows($resql)) {
@@ -135,6 +135,7 @@ class CompanyBankAccount extends Account
 	public function update(User $user = null, $notrigger = 0)
 	{
 		global $conf;
+
 		$error = 0;
 
 		if (!$this->id) {
@@ -160,7 +161,7 @@ class CompanyBankAccount extends Account
 		$sql .= ",proprio = '".$this->db->escape($this->proprio)."'";
 		$sql .= ",owner_address = '".$this->db->escape($this->owner_address)."'";
 		$sql .= ",default_rib = ".((int) $this->default_rib);
-		if ($conf->prelevement->enabled) {
+		if (!empty($conf->prelevement->enabled)) {
 			$sql .= ",frstrecur = '".$this->db->escape($this->frstrecur)."'";
 			$sql .= ",rum = '".$this->db->escape($this->rum)."'";
 			$sql .= ",date_rum = ".($this->date_rum ? "'".$this->db->idate($this->date_rum)."'" : "null");
diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php
index 93c4fbc2202..97d92007885 100644
--- a/htdocs/societe/paymentmodes.php
+++ b/htdocs/societe/paymentmodes.php
@@ -161,9 +161,6 @@ if (empty($reshook)) {
 			if (empty($companybankaccount->rum)) {
 				$companybankaccount->rum = $prelevement->buildRumNumber($object->code_client, $companybankaccount->datec, $companybankaccount->id);
 			}
-			if (empty($companybankaccount->date_rum)) {
-				$companybankaccount->date_rum = dol_now();
-			}
 
 			$result = $companybankaccount->update($user);
 			if (!$result) {
@@ -268,9 +265,9 @@ if (empty($reshook)) {
 			$companybankaccount->domiciliation   = GETPOST('domiciliation', 'alpha');
 			$companybankaccount->proprio         = GETPOST('proprio', 'alpha');
 			$companybankaccount->owner_address   = GETPOST('owner_address', 'alpha');
-			$companybankaccount->frstrecur       = GETPOST('frstrecur');
+			$companybankaccount->frstrecur       = GETPOST('frstrecur', 'alpha');
 			$companybankaccount->rum             = GETPOST('rum', 'alpha');
-			$companybankaccount->date_rum        = dol_mktime(0, 0, 0, GETPOST('date_rummonth'), GETPOST('date_rumday'), GETPOST('date_rumyear'));
+			$companybankaccount->date_rum        = dol_mktime(0, 0, 0, GETPOST('date_rummonth', 'int'), GETPOST('date_rumday', 'int'), GETPOST('date_rumyear', 'int'));
 			$companybankaccount->datec = dol_now();
 			$companybankaccount->status          = 1;
 
@@ -300,7 +297,6 @@ if (empty($reshook)) {
 
 				if (empty($companybankaccount->rum)) {
 					$companybankaccount->rum = $prelevement->buildRumNumber($object->code_client, $companybankaccount->datec, $companybankaccount->id);
-					$companybankaccount->date_rum = dol_now();
 				}
 			}
 
@@ -1638,8 +1634,10 @@ if ($socid && $action == 'edit' && $user->rights->societe->creer) {
 		print '<tr><td class="titlefield">'.$langs->trans("RUM").'</td>';
 		print '<td><input class="minwidth300" type="text" name="rum" value="'.dol_escape_htmltag($companybankaccount->rum).'"></td></tr>';
 
+		$date_rum = dol_mktime(0, 0, 0, GETPOST('date_rummonth'), GETPOST('date_rumday'), GETPOST('date_rumyear'));
+
 		print '<tr><td class="titlefield">'.$langs->trans("DateRUM").'</td>';
-		print '<td>'.$form->selectDate(GETPOST('date_rum') ?GETPOST('date_rum') : $companybankaccount->date_rum, 'date_rum', 0, 0, 1, 'date_rum').'</td></tr>';
+		print '<td>'.$form->selectDate($date_rum ? $date_rum : $companybankaccount->date_rum, 'date_rum', 0, 0, 1, 'date_rum', 1, 1).'</td></tr>';
 
 		print '<tr><td>'.$langs->trans("WithdrawMode").'</td><td>';
 		$tblArraychoice = array("FRST" => $langs->trans("FRST"), "RECUR" => $langs->trans("RECUR"));
@@ -1800,8 +1798,10 @@ if ($socid && $action == 'create' && $user->rights->societe->creer) {
 		print '<tr><td class="titlefieldcreate">'.$langs->trans("RUM").'</td>';
 		print '<td colspan="4"><input type="text" class="minwidth300" name="rum" value="'.GETPOST('rum', 'alpha').'"> <div class="opacitymedium">'.$langs->trans("RUMWillBeGenerated").'</div></td></tr>';
 
+		$date_rum = dol_mktime(0, 0, 0, GETPOST('date_rummonth'), GETPOST('date_rumday'), GETPOST('date_rumyear'));
+
 		print '<tr><td class="titlefieldcreate">'.$langs->trans("DateRUM").'</td>';
-		print '<td colspan="4">'.$form->selectDate(GETPOST('date_rum'), 'date_rum', 0, 0, 1, 'date_rum').'</td></tr>';
+		print '<td colspan="4">'.$form->selectDate($date_rum, 'date_rum', 0, 0, 1, 'date_rum', 1, 1).'</td></tr>';
 
 		print '<tr><td>'.$langs->trans("WithdrawMode").'</td><td>';
 		$tblArraychoice = array("FRST" => $langs->trans("FRST"), "RECUR" => $langs->trans("RECUR"));

From 61e3a57de701c2ecbe77095bd1fa466fbe31fbaf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 2 Aug 2021 18:23:05 +0200
Subject: [PATCH 1368/1497] Fix label

---
 htdocs/compta/prelevement/create.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index 6793fb0a893..937750648bb 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -206,7 +206,7 @@ print $nb;
 print '</td></tr>';
 
 print '<tr><td>'.$langs->trans("AmountTotal").'</td>';
-print '<td>';
+print '<td class="amount">';
 print price($pricetowithdraw);
 print '</td>';
 print '</tr>';
@@ -225,7 +225,11 @@ print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="type" value="'.$type.'">';
 if ($nb) {
 	if ($pricetowithdraw) {
-		print $langs->trans('BankToReceiveWithdraw').': ';
+		$title = print $langs->trans('BankToReceiveWithdraw').': ';
+		if ($type == 'bank-transfer') {
+			$title .= $langs->trans('BankToPayCreditTransfer').': ';
+		}
+		print $title;
 		$form->select_comptes($conf->global->PRELEVEMENT_ID_BANKACCOUNT, 'id_bankaccount', 0, "courant=1");
 		print ' - ';
 

From 2deaac0fc4f8e689d9407605cf7f5e0487e83e5e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 2 Aug 2021 18:34:38 +0200
Subject: [PATCH 1369/1497] Fix changelog

---
 ChangeLog | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 5b296aa88e2..b54d8df615e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -228,8 +228,9 @@ Following changes may create regressions for some external modules, but were nec
 * If your database is PostgreSQL, you must use version 9.1.0 or more (Dolibarr need the SQL function CONCAT)
 * If your database is MySQL or MariaDB, you need at least version 5.1
 * Function set_price_level() has been renamed into setPriceLevel() to follow camelcase rules
-* removed deprecated substitution key  __REFCLIENT__  (replaced with __REF_CLIENT__)
+* Removed deprecated substitution key  __REFCLIENT__  (replaced with __REF_CLIENT__)
 * Removed constant MAIN_COUNTRIES_IN_EEC. You can now set if country is in Europe or not from the dictionary of countries.
+* v14 seems to work correctly on PHP v8 but it generates a lot of verbose warnings. Currently, v14 i snot yet officialy supported with PHP 8.
 
 
 ***** ChangeLog for 13.0.4 compared to 13.0.3 *****

From fc33d46c7731abb52e79fb489460f290e1fbcf69 Mon Sep 17 00:00:00 2001
From: atm-florian <florian.mortgat@atm-consulting.fr>
Date: Mon, 2 Aug 2021 18:56:45 +0200
Subject: [PATCH 1370/1497] FIX: using Tulip, deposit mask doesn't get saved

---
 htdocs/admin/supplier_invoice.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/htdocs/admin/supplier_invoice.php b/htdocs/admin/supplier_invoice.php
index f307a5905b8..bc587845cda 100644
--- a/htdocs/admin/supplier_invoice.php
+++ b/htdocs/admin/supplier_invoice.php
@@ -59,8 +59,10 @@ $specimenthirdparty->initAsSpecimen();
 if ($action == 'updateMask') {
 	$maskconstinvoice = GETPOST('maskconstinvoice', 'alpha');
 	$maskconstcredit = GETPOST('maskconstcredit', 'alpha');
+	$maskconstdeposit = GETPOST('maskconstdeposit', 'alpha');
 	$maskinvoice = GETPOST('maskinvoice', 'alpha');
 	$maskcredit = GETPOST('maskcredit', 'alpha');
+	$maskdeposit = GETPOST('maskdeposit', 'alpha');
 
 	if ($maskconstinvoice) {
 		$res = dolibarr_set_const($db, $maskconstinvoice, $maskinvoice, 'chaine', 0, '', $conf->entity);
@@ -68,6 +70,9 @@ if ($action == 'updateMask') {
 	if ($maskconstcredit) {
 		$res = dolibarr_set_const($db, $maskconstcredit, $maskcredit, 'chaine', 0, '', $conf->entity);
 	}
+	if ($maskconstdeposit) {
+		$res = dolibarr_set_const($db, $maskconstdeposit, $maskdeposit, 'chaine', 0, '', $conf->entity);
+	}
 
 	if (!($res > 0)) {
 		$error++;

From 000c32c13735dedb826aa3d59f85171eac4ac545 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 2 Aug 2021 20:20:52 +0200
Subject: [PATCH 1371/1497] FIx #18313

---
 htdocs/variants/combinations.php | 9 ++++++---
 htdocs/variants/list.php         | 4 ++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/htdocs/variants/combinations.php b/htdocs/variants/combinations.php
index 0d9de5d857f..c29fc519258 100644
--- a/htdocs/variants/combinations.php
+++ b/htdocs/variants/combinations.php
@@ -30,10 +30,13 @@ $langs->loadLangs(array("products", "other"));
 $id = GETPOST('id', 'int');
 $valueid = GETPOST('valueid', 'int');
 $ref = GETPOST('ref', 'alpha');
-$weight_impact = GETPOST('weight_impact', 'alpha');
-$price_impact = GETPOST('price_impact', 'alpha');
+$weight_impact = price2num(GETPOST('weight_impact', 'alpha'), 2);
 $price_impact_percent = (bool) GETPOST('price_impact_percent');
-
+if ($price_impact_percent) {
+	$price_impact = price2num(GETPOST('price_impact', 'alpha'), 2);
+} else {
+	$price_impact = price2num(GETPOST('price_impact', 'alpha'), 'MU');
+}
 $level_price_impact = GETPOST('level_price_impact', 'array');
 $level_price_impact_percent = GETPOST('level_price_impact_percent', 'array');
 
diff --git a/htdocs/variants/list.php b/htdocs/variants/list.php
index dcf4fdcdb43..ecb42ba25e2 100644
--- a/htdocs/variants/list.php
+++ b/htdocs/variants/list.php
@@ -16,8 +16,8 @@
  */
 
 require '../main.inc.php';
-require DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-require DOL_DOCUMENT_ROOT.'/variants/class/ProductAttribute.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductAttribute.class.php';
 
 $action = GETPOST('action', 'aZ09');
 $object = new ProductAttribute($db);

From 2998c948844592056be74c7c9951379e8a04ba6c Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe@altairis.fr>
Date: Tue, 3 Aug 2021 11:12:19 +0200
Subject: [PATCH 1372/1497] NEW : add constant PROPAL_NOT_BILLABLE

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

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 3c0d8dd9a28..83f28af1d15 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -2579,7 +2579,7 @@ if ($action == 'create') {
 				}
 
 				// Create an invoice and classify billed
-				if ($object->statut == Propal::STATUS_SIGNED) {
+				if ($object->statut == Propal::STATUS_SIGNED && empty($conf->global->PROPAL_NOT_BILLABLE)) {
 					if (!empty($conf->facture->enabled) && $usercancreateinvoice) {
 						print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans("AddBill").'</a>';
 					}

From 7a7287489d25584e09efef52f64b5a49f4892025 Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe@altairis.fr>
Date: Tue, 3 Aug 2021 11:24:21 +0200
Subject: [PATCH 1373/1497] NEW : add constant PROPAL_REOPEN_UNSIGNED_ONLY

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

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 3c0d8dd9a28..802416f1626 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -2529,7 +2529,7 @@ if ($action == 'create') {
 				}
 
 				// ReOpen
-				if (($object->statut == Propal::STATUS_SIGNED || $object->statut == Propal::STATUS_NOTSIGNED || $object->statut == Propal::STATUS_BILLED) && $usercanclose) {
+				if ( (( ! empty($conf->global->PROPAL_REOPEN_UNSIGNED_ONLY) && $object->statut == Propal::STATUS_NOTSIGNED) || (empty($conf->global->PROPAL_REOPEN_UNSIGNED_ONLY) && ($object->statut == Propal::STATUS_SIGNED || $object->statut == Propal::STATUS_NOTSIGNED || $object->statut == Propal::STATUS_BILLED))) && $usercanclose) {
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen'.(empty($conf->global->MAIN_JUMP_TAG) ? '' : '#reopen').'"';
 					print '>'.$langs->trans('ReOpen').'</a>';
 				}

From d1f9762ca9d9c3db6378b1eb4e2daef04ddb1d38 Mon Sep 17 00:00:00 2001
From: lainwir3d <rondu.richard@gmail.com>
Date: Sat, 29 Aug 2020 13:15:55 +0200
Subject: [PATCH 1374/1497] CLOSE #18319 REST API - Shipment: Add 'close'
 action / endpoint / POST method.

Allow "closing" a shipment through the REST API.
---
 .../expedition/class/api_shipments.class.php  | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/htdocs/expedition/class/api_shipments.class.php b/htdocs/expedition/class/api_shipments.class.php
index 2a4b6765b4e..3b4070b138b 100644
--- a/htdocs/expedition/class/api_shipments.class.php
+++ b/htdocs/expedition/class/api_shipments.class.php
@@ -626,6 +626,53 @@ class Shipments extends DolibarrApi
 	}
 	*/
 
+	/**
+	* Close a shipment (Classify it as "Delivered")
+	*
+	* @param   int     $id             Expedition ID
+	* @param   int     $notrigger      Disabled triggers
+	*
+	* @url POST    {id}/close
+	*
+	* @return  int
+	*/
+	public function close($id, $notrigger = 0)
+	{
+		if (!DolibarrApiAccess::$user->rights->expedition->creer) {
+			throw new RestException(401);
+		}
+
+		$result = $this->shipment->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Shipment not found');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('expedition', $this->commande->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		$result = $this->shipment->setClosed();
+		if ($result == 0) {
+			throw new RestException(304, 'Error nothing done. May be object is already closed');
+		}
+		if ($result < 0) {
+			throw new RestException(500, 'Error when closing Order: '.$this->commande->error);
+		}
+
+		$result = $this->shipment->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Shipment not found');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('expedition', $this->commande->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		$this->shipment->fetchObjectLinked();
+
+		return $this->_cleanObjectDatas($this->shipment);
+	}
+
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 * Clean sensible object datas

From d0c57dac3496df06a91d98297a9f105d91a8d0a7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 3 Aug 2021 15:02:09 +0200
Subject: [PATCH 1375/1497] FIx #18217 - Salary - link 'salary' of bank_url not
 managed

---
 .../accountancy/bookkeeping/listbyaccount.php | 37 ++++------
 .../bookkeeping/listbysubaccount.php          | 37 ++++------
 htdocs/accountancy/journal/bankjournal.php    | 69 +++++++++++++++----
 htdocs/compta/bank/bankentries_list.php       | 17 +++--
 htdocs/compta/bank/class/account.class.php    | 12 ++--
 htdocs/core/menus/standard/eldy.lib.php       |  6 +-
 htdocs/langs/en_US/accountancy.lang           |  4 +-
 htdocs/salaries/class/paymentsalary.class.php | 44 ++++++++----
 htdocs/salaries/class/salary.class.php        |  6 ++
 9 files changed, 148 insertions(+), 84 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index 522576350e7..27f23d36a74 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -509,10 +509,9 @@ $moreforfilter = '';
 $moreforfilter .= '<div class="divsearchfield">';
 $moreforfilter .= $langs->trans('AccountAccounting').': ';
 $moreforfilter .= '<div class="nowrap inline-block">';
-$moreforfilter .= $langs->trans('From').' ';
-$moreforfilter .= $formaccounting->select_account($search_accountancy_code_start, 'search_accountancy_code_start', 1, array(), 1, 1, 'maxwidth200');
-$moreforfilter .= ' '.$langs->trans('to').' ';
-$moreforfilter .= $formaccounting->select_account($search_accountancy_code_end, 'search_accountancy_code_end', 1, array(), 1, 1, 'maxwidth200');
+$moreforfilter .= $formaccounting->select_account($search_accountancy_code_start, 'search_accountancy_code_start', $langs->trans('From'), array(), 1, 1, 'maxwidth200');
+$moreforfilter .= ' ';
+$moreforfilter .= $formaccounting->select_account($search_accountancy_code_end, 'search_accountancy_code_end', $langs->trans('to'), array(), 1, 1, 'maxwidth200');
 $moreforfilter .= '</div>';
 $moreforfilter .= '</div>';
 
@@ -671,23 +670,19 @@ while ($i < min($num, $limit)) {
 	$accountg = length_accountg($line->numero_compte);
 	//if (empty($accountg)) $accountg = '-';
 
+	$colspan = 0;			// colspan before field 'label of operation'
+	$colspanend = 3;		// colspan after debit/credit
+	if (!empty($arrayfields['t.piece_num']['checked'])) { $colspan++; }
+	if (!empty($arrayfields['t.code_journal']['checked'])) { $colspan++; }
+	if (!empty($arrayfields['t.doc_date']['checked'])) { $colspan++; }
+	if (!empty($arrayfields['t.doc_ref']['checked'])) { $colspan++; }
+	if (!empty($arrayfields['t.label_operation']['checked'])) { $colspan++; }
+	if (!empty($arrayfields['t.date_export']['checked'])) { $colspanend++; }
+	if (!empty($arrayfields['t.date_validating']['checked'])) { $colspanend++; }
+	if (!empty($arrayfields['t.lettering_code']['checked'])) { $colspanend++; }
+
 	// Is it a break ?
 	if ($accountg != $displayed_account_number || !isset($displayed_account_number)) {
-		$colnumber = 5;
-		$colnumberend = 8;
-
-		if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING) || empty($arrayfields['t.lettering_code']['checked'])) {
-			$colnumber--;
-		}
-		if (empty($arrayfields['t.date_export']['checked'])) {
-			$colnumber--;
-		}
-		if (empty($arrayfields['t.date_validated']['checked'])) {
-			$colnumber--;
-		}
-
-		$colspan = $totalarray['nbfield'] - $colnumber;
-		$colspanend = $totalarray['nbfield'] - $colnumberend;
 		// Show a subtotal by accounting account
 		if (isset($displayed_account_number)) {
 			print '<tr class="liste_total">';
@@ -926,9 +921,7 @@ while ($i < min($num, $limit)) {
 	$i++;
 }
 
-if ($num > 0) {
-	$colspan = $totalarray['nbfield'] - $colnumber;
-	$colspanend = $totalarray['nbfield'] - $colnumberend;
+if ($num > 0 && $colspan > 0) {
 	print '<tr class="liste_total">';
 	print '<td class="right" colspan="'.$colspan.'">'.$langs->trans("TotalForAccount").' '.$accountg.':</td>';
 	print '<td class="nowrap right">'.price($sous_total_debit).'</td>';
diff --git a/htdocs/accountancy/bookkeeping/listbysubaccount.php b/htdocs/accountancy/bookkeeping/listbysubaccount.php
index efc93f1b96c..5e83c729fb1 100644
--- a/htdocs/accountancy/bookkeeping/listbysubaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbysubaccount.php
@@ -511,10 +511,9 @@ $moreforfilter = '';
 $moreforfilter .= '<div class="divsearchfield">';
 $moreforfilter .= $langs->trans('AccountAccounting').': ';
 $moreforfilter .= '<div class="nowrap inline-block">';
-$moreforfilter .= $langs->trans('From').' ';
-$moreforfilter .= $formaccounting->select_auxaccount($search_accountancy_code_start, 'search_accountancy_code_start', 1, 'maxwidth200');
-$moreforfilter .= ' '.$langs->trans('to').' ';
-$moreforfilter .= $formaccounting->select_auxaccount($search_accountancy_code_end, 'search_accountancy_code_end', 1, 'maxwidth200');
+$moreforfilter .= $formaccounting->select_auxaccount($search_accountancy_code_start, 'search_accountancy_code_start', $langs->trans('From'), 'maxwidth200');
+$moreforfilter .= ' ';
+$moreforfilter .= $formaccounting->select_auxaccount($search_accountancy_code_end, 'search_accountancy_code_end', $langs->trans('to'), 'maxwidth200');
 $moreforfilter .= '</div>';
 $moreforfilter .= '</div>';
 
@@ -673,23 +672,19 @@ while ($i < min($num, $limit)) {
 	$accountg = length_accounta($line->subledger_account);
 	//if (empty($accountg)) $accountg = '-';
 
+	$colspan = 0;			// colspan before field 'label of operation'
+	$colspanend = 3;		// colspan after debit/credit
+	if (!empty($arrayfields['t.piece_num']['checked'])) { $colspan++; }
+	if (!empty($arrayfields['t.code_journal']['checked'])) { $colspan++; }
+	if (!empty($arrayfields['t.doc_date']['checked'])) { $colspan++; }
+	if (!empty($arrayfields['t.doc_ref']['checked'])) { $colspan++; }
+	if (!empty($arrayfields['t.label_operation']['checked'])) { $colspan++; }
+	if (!empty($arrayfields['t.date_export']['checked'])) { $colspanend++; }
+	if (!empty($arrayfields['t.date_validating']['checked'])) { $colspanend++; }
+	if (!empty($arrayfields['t.lettering_code']['checked'])) { $colspanend++; }
+
 	// Is it a break ?
 	if ($accountg != $displayed_account_number || !isset($displayed_account_number)) {
-		$colnumber = 5;
-		$colnumberend = 8;
-
-		if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING) || empty($arrayfields['t.lettering_code']['checked'])) {
-			$colnumber--;
-		}
-		if (empty($arrayfields['t.date_export']['checked'])) {
-			$colnumber--;
-		}
-		if (empty($arrayfields['t.date_validated']['checked'])) {
-			$colnumber--;
-		}
-
-		$colspan = $totalarray['nbfield'] - $colnumber;
-		$colspanend = $totalarray['nbfield'] - $colnumberend;
 		// Show a subtotal by accounting account
 		if (isset($displayed_account_number)) {
 			print '<tr class="liste_total">';
@@ -937,9 +932,7 @@ while ($i < min($num, $limit)) {
 	$i++;
 }
 
-if ($num > 0) {
-	$colspan = $totalarray['nbfield'] - $colnumber;
-	$colspanend = $totalarray['nbfield'] - $colnumberend;
+if ($num > 0 && $colspan > 0) {
 	print '<tr class="liste_total">';
 	print '<td class="right" colspan="'.$colspan.'">'.$langs->trans("TotalForAccount").' '.$accountg.':</td>';
 	print '<td class="nowrap right">'.price($sous_total_debit).'</td>';
diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index 34e533974fc..bdda4583d54 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -177,7 +177,7 @@ $accountingjournalstatic->fetch($id_journal);
 $journal = $accountingjournalstatic->code;
 $journal_label = $accountingjournalstatic->label;
 
-
+//print $sql;
 dol_syslog("accountancy/journal/bankjournal.php", LOG_DEBUG);
 $result = $db->query($sql);
 if ($result) {
@@ -252,6 +252,7 @@ if ($result) {
 		);
 
 		// Set accountancy code for user
+		// $obj->accountancy_code is the accountancy_code of table u=user but it is defined only if a link with type 'user' exists)
 		$compta_user = (!empty($obj->accountancy_code) ? $obj->accountancy_code : '');
 
 		$tabuser[$obj->rowid] = array(
@@ -277,7 +278,7 @@ if ($result) {
 			$tabpay[$obj->rowid]["lib"] = dol_trunc($obj->label, 60);
 		}
 
-		// Load of url links to the line into llx_bank
+		// Load of url links to the line into llx_bank (so load llx_bank_url)
 		$links = $object->get_url($obj->rowid); // Get an array('url'=>, 'url_id'=>, 'label'=>, 'type'=> 'fk_bank'=> )
 
 		// By default
@@ -287,7 +288,7 @@ if ($result) {
 
 		// get_url may return -1 which is not traversable
 		if (is_array($links) && count($links) > 0) {
-			// Now loop on each link of record in bank.
+			// Now loop on each link of record in bank (code similar to bankentries_list.php)
 			foreach ($links as $key => $val) {
 				if (in_array($links[$key]['type'], array('sc', 'payment_sc', 'payment', 'payment_supplier', 'payment_vat', 'payment_expensereport', 'banktransfert', 'payment_donation', 'member', 'payment_loan', 'payment_salary', 'payment_various'))) {
 					// So we excluded 'company' and 'user' here. We want only payment lines
@@ -302,6 +303,7 @@ if ($result) {
 					}
 				}
 
+				// Special case to ask later to add more request to get information for old links without company link.
 				if ($links[$key]['type'] == 'withdraw') {
 					$tabmoreinfo[$obj->rowid]['withdraw'] = 1;
 				}
@@ -401,6 +403,44 @@ if ($result) {
 					$paymentsalstatic->label = $links[$key]['label'];
 					$tabpay[$obj->rowid]["lib"] .= ' '.$paymentsalstatic->getNomUrl(2);
 					$tabpay[$obj->rowid]["paymentsalid"] = $paymentsalstatic->id;
+
+					// This part of code is no more required. it is here to solve case where a link were missing (ith v14.0.0) and keep writing in accountancy complete.
+					// Note: A better way to fix this is to delete payement of salary and recreate it, or to fix the bookkeeping table manually after.
+					if (!empty($conf->global->ACCOUNTANCY_AUTOFIX_MISSING_LINK_TO_USEr_ON_SALARY_BANK_PAYMENT)) {
+						$tmpsalary = new Salary($db);
+						$tmpsalary->fetch($paymentsalstatic->id);
+						$tmpsalary->fetch_user($tmpsalary->fk_user);
+
+						$userstatic->id = $tmpsalary->user->id;
+						$userstatic->name = $tmpsalary->user->name;
+						$userstatic->email = $tmpsalary->user->email;
+						$userstatic->firstname = $tmpsalary->user->firstname;
+						$userstatic->lastname = $tmpsalary->user->lastname;
+						$userstatic->statut = $tmpsalary->user->statut;
+						$userstatic->accountancy_code = $tmpsalary->user->accountancy_code;
+
+						if ($userstatic->id > 0) {
+							$tabpay[$obj->rowid]["soclib"] = $userstatic->getNomUrl(1, 'accountancy', 0);
+						} else {
+							$tabpay[$obj->rowid]["soclib"] = '???'; // Should not happen
+						}
+
+						if (empty($obj->typeop_user)) {	// Add test to avoid to add amount twice if a link already exists also on user.
+							$compta_user = $userstatic->accountancy_code;
+							if ($compta_user) {
+								$tabtp[$obj->rowid][$compta_user] += $obj->amount;
+								$tabuser[$obj->rowid] = array(
+								'id' => $userstatic->id,
+								'name' => dolGetFirstLastname($userstatic->firstname, $userstatic->lastname),
+								'lastname' => $userstatic->lastname,
+								'firstname' => $userstatic->firstname,
+								'email' => $userstatic->email,
+								'accountancy_code' => $compta_user,
+								'status' => $userstatic->statut
+								);
+							}
+						}
+					}
 				} elseif ($links[$key]['type'] == 'payment_expensereport') {
 					$paymentexpensereportstatic->id = $links[$key]['url_id'];
 					$tabpay[$obj->rowid]["lib"] .= $paymentexpensereportstatic->getNomUrl(2);
@@ -468,7 +508,7 @@ if ($result) {
 			}
 		}
 
-		// If no links were found to know the amount on thirdparty, we init it to account 'NotDefined'.
+		// If no links were found to know the amount on thirdparty/user, we init it to account 'NotDefined'.
 		if (empty($tabtp[$obj->rowid])) {
 			$tabtp[$obj->rowid]['NotDefined'] = $tabbq[$obj->rowid][$compta_bank];
 		}
@@ -1162,9 +1202,9 @@ if (empty($action) || $action == 'view') {
 						if ($tabtype[$key] == 'unknown') {
 							// We will accept writing, but into a waiting account
 							if (empty($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE) || $conf->global->ACCOUNTING_ACCOUNT_SUSPENSE == '-1') {
-								print '<span class="error">'.$langs->trans('UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking').'</span>';
+								print '<span class="error small">'.$langs->trans('UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking').'</span>';
 							} else {
-								print '<span class="warning">'.$langs->trans('UnknownAccountForThirdparty', length_accountg($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE)).'</span>'; // We will use a waiting account
+								print '<span class="warning small">'.$langs->trans('UnknownAccountForThirdparty', length_accountg($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE)).'</span>'; // We will use a waiting account
 							}
 						} else {
 							// We will refuse writing
@@ -1187,7 +1227,7 @@ if (empty($action) || $action == 'view') {
 							if ($tabtype[$key] == 'member') {
 								$errorstring = 'MainAccountForSubscriptionPaymentNotDefined';
 							}
-							print '<span class="error">'.$langs->trans($errorstring).'</span>';
+							print '<span class="error small">'.$langs->trans($errorstring).'</span>';
 						}
 					} else {
 						print $accounttoshow;
@@ -1196,7 +1236,7 @@ if (empty($action) || $action == 'view') {
 
 					// Subledger account
 					print "<td>";
-					if (in_array($tabtype[$key], array('payment', 'payment_supplier', 'payment_expensereport', 'payment_salary', 'payment_various'))) {	// Type of payment with subledger
+					if (in_array($tabtype[$key], array('payment', 'payment_supplier', 'payment_expensereport', 'payment_salary', 'payment_various'))) {	// Type of payments that uses a subledger
 						$accounttoshowsubledger = length_accounta($k);
 						if ($accounttoshow != $accounttoshowsubledger) {
 							if (empty($accounttoshowsubledger) || $accounttoshowsubledger == 'NotDefined') {
@@ -1205,14 +1245,14 @@ if (empty($action) || $action == 'view') {
 								var_dump($tabbq[$key]);*/
 								//print '<span class="error">'.$langs->trans("ThirdpartyAccountNotDefined").'</span>';
 								if (!empty($tabcompany[$key]['code_compta'])) {
-									if (in_array($tabtype[$key], array('payment_various'))) {
+									if (in_array($tabtype[$key], array('payment_various', 'payment_salary'))) {
 										// For such case, if subledger is not defined, we won't use subledger accounts.
-										print '<span class="warning">'.$langs->trans("ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored").'</span>';
+										print '<span class="warning small">'.$langs->trans("ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored").'</span>';
 									} else {
-										print '<span class="warning">'.$langs->trans("ThirdpartyAccountNotDefinedOrThirdPartyUnknown", $tabcompany[$key]['code_compta']).'</span>';
+										print '<span class="warning small">'.$langs->trans("ThirdpartyAccountNotDefinedOrThirdPartyUnknown", $tabcompany[$key]['code_compta']).'</span>';
 									}
 								} else {
-									print '<span class="error">'.$langs->trans("ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking").'</span>';
+									print '<span class="error small">'.$langs->trans("ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking").'</span>';
 								}
 							} else {
 								print $accounttoshowsubledger;
@@ -1220,10 +1260,15 @@ if (empty($action) || $action == 'view') {
 						}
 					}
 					print "</td>";
+
 					print "<td>".$reflabel."</td>";
+
 					print '<td class="center">'.$val["type_payment"]."</td>";
+
 					print '<td class="right nowraponall amount">'.($mt < 0 ? price(-$mt) : '')."</td>";
+
 					print '<td class="right nowraponall amount">'.($mt >= 0 ? price($mt) : '')."</td>";
+
 					print "</tr>";
 				}
 			}
diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php
index 666621cbdd6..14aeee29d69 100644
--- a/htdocs/compta/bank/bankentries_list.php
+++ b/htdocs/compta/bank/bankentries_list.php
@@ -1346,7 +1346,7 @@ if ($resql) {
 			print '<td class="tdoverflowmax300"'.($titletoshow ? ' title="'.dol_escape_htmltag($titletoshow).'"' : '').'>';
 			print $labeltoshow;	// Already escaped
 
-			// Add links after description
+			// Add info about links after description
 			$cachebankaccount = array();
 			foreach ($links as $key => $val) {
 				print '<!-- '.$links[$key]['type'].' -->';
@@ -1424,6 +1424,7 @@ if ($resql) {
 				} elseif ($links[$key]['type'] == 'sc') {
 				} elseif ($links[$key]['type'] == 'vat') {
 				} elseif ($links[$key]['type'] == 'salary') {
+					// Information is already shown using the payment_salary link. No need of this link.
 				} else {
 					// Show link with label $links[$key]['label']
 					if (!empty($objp->label) && !empty($links[$key]['label'])) {
@@ -1530,15 +1531,21 @@ if ($resql) {
 			}
 
 			if ($companylinked_id) {
-				// TODO Add a cache of loaded companies here
+				// TODO Add a cache of loaded companies here ?
 				$companystatic->fetch($companylinked_id);
 				print $companystatic->getNomUrl(1);
 			} elseif ($userlinked_id &&
 					(($type_link == 'payment_salary' && !empty($user->rights->salaries->read))
 						|| ($type_link == 'payment_sc' && !empty($user->rights->tax->charges->lire)))) {
-				// TODO Add a cache of loaded users here
-				$userstatic->fetch($userlinked_id);
-				print $userstatic->getNomUrl(1);
+				// Get object user from cache or load it
+				if (!empty($conf->cache['user'][$userlinked_id])) {
+					$tmpuser = $conf->cache['user'][$userlinked_id];
+				} else {
+					$tmpuser = new User($db);
+					$tmpuser->fetch($userlinked_id);
+					$conf->cache['user'][$userlinked_id] = $tmpuser;
+				}
+				print $tmpuser->getNomUrl(1);
 			} else {
 				print '&nbsp;';
 			}
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 8619ff25dae..ed61da3592e 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -399,9 +399,9 @@ class Account extends CommonObject
 	/**
 	 *      Add a link between bank line record and its source
 	 *
-	 *      @param	int		$line_id    Id ecriture bancaire
-	 *      @param  int		$url_id     Id parametre url
-	 *      @param  string	$url        Url
+	 *      @param	int		$line_id    Id of bank entry
+	 *      @param  int		$url_id     Id of object related to link
+	 *      @param  string	$url        Url (deprecated, we use now 'url_id' and 'type' instead)
 	 *      @param  string	$label      Link label
 	 *      @param  string	$type       Type of link ('payment', 'company', 'member', ...)
 	 *      @return int         		<0 if KO, id line if OK
@@ -412,13 +412,13 @@ class Account extends CommonObject
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."bank_url (";
 		$sql .= "fk_bank";
 		$sql .= ", url_id";
-		$sql .= ", url";
+		$sql .= ", url";		// deprecated
 		$sql .= ", label";
 		$sql .= ", type";
 		$sql .= ") VALUES (";
 		$sql .= " ".((int) $line_id);
-		$sql .= ", '".$this->db->escape($url_id)."'";
-		$sql .= ", '".$this->db->escape($url)."'";
+		$sql .= ", ".((int) $url_id);
+		$sql .= ", '".$this->db->escape($url)."'";		// dperecated
 		$sql .= ", '".$this->db->escape($label)."'";
 		$sql .= ", '".$this->db->escape($type)."'";
 		$sql .= ")";
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 2f36290c8d4..1fbd91cb623 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1344,15 +1344,15 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				// Accounting
 				$newmenu->add("/accountancy/index.php?leftmenu=accountancy_accountancy", $langs->trans("MenuAccountancy"), 0, $user->rights->accounting->mouvements->lire, '', $mainmenu, 'accountancy', 1, '', '', '', img_picto('', 'accountancy', 'class="paddingright pictofixedwidth"'));
 
-				// Balance
-				$newmenu->add("/accountancy/bookkeeping/balance.php?mainmenu=accountancy&amp;leftmenu=accountancy_accountancy", $langs->trans("AccountBalance"), 1, $user->rights->accounting->mouvements->lire);
-
 				// General Ledger
 				$newmenu->add("/accountancy/bookkeeping/listbyaccount.php?mainmenu=accountancy&amp;leftmenu=accountancy_accountancy", $langs->trans("Bookkeeping"), 1, $user->rights->accounting->mouvements->lire);
 
 				// Journals
 				$newmenu->add("/accountancy/bookkeeping/list.php?mainmenu=accountancy&amp;leftmenu=accountancy_accountancy", $langs->trans("Journals"), 1, $user->rights->accounting->mouvements->lire);
 
+				// Account Balance
+				$newmenu->add("/accountancy/bookkeeping/balance.php?mainmenu=accountancy&amp;leftmenu=accountancy_accountancy", $langs->trans("AccountBalance"), 1, $user->rights->accounting->mouvements->lire);
+
 				// Files
 				if (empty($conf->global->ACCOUNTANCY_HIDE_EXPORT_FILES_MENU)) {
 					$newmenu->add("/compta/accounting-files.php?mainmenu=accountancy&amp;leftmenu=accountancy_files", $langs->trans("AccountantFiles"), 1, $user->rights->accounting->mouvements->lire);
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index ec74c9361f5..771f0a83e7b 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -246,9 +246,9 @@ DescThirdPartyReport=Consult here the list of third-party customers and vendors
 ListAccounts=List of the accounting accounts
 UnknownAccountForThirdparty=Unknown third-party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third-party account. Blocking error
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. We will use %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Subledger account not defined or third party or user unknown. We will use %s
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Third-party unknown and subledger not defined on the payment. We will keep the subledger account value empty.
-ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Subledger account not defined or third party or user unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
diff --git a/htdocs/salaries/class/paymentsalary.class.php b/htdocs/salaries/class/paymentsalary.class.php
index e2b199780f0..76236bb88aa 100644
--- a/htdocs/salaries/class/paymentsalary.class.php
+++ b/htdocs/salaries/class/paymentsalary.class.php
@@ -477,7 +477,7 @@ class PaymentSalary extends CommonObject
 	 *      All payment properties must have been set first like after a call to create().
 	 *
 	 *      @param	User	$user               Object of user making payment
-	 *      @param  string	$mode               'payment_sc'
+	 *      @param  string	$mode               'payment_salary'
 	 *      @param  string	$label              Label to use in bank record
 	 *      @param  int		$accountid          Id of bank account to do link with
 	 *      @param  string	$emetteur_nom       Name of transmitter
@@ -516,8 +516,8 @@ class PaymentSalary extends CommonObject
 				$this->datev
 			);
 
-			// Mise a jour fk_bank dans llx_paiement.
-			// On connait ainsi le paiement qui a genere l'ecriture bancaire
+			// Update fk_bank into llx_paiement_salary.
+			// so we know the payment that was used to generated the bank entry.
 			if ($bank_line_id > 0) {
 				$result = $this->update_fk_bank($bank_line_id);
 				if ($result <= 0) {
@@ -525,9 +525,12 @@ class PaymentSalary extends CommonObject
 					dol_print_error($this->db);
 				}
 
-				// Add link 'payment', 'payment_supplier', 'payment_sc' in bank_url between payment and bank transaction
+				// Add link 'payment_salary' in bank_url between payment and bank transaction
 				$url = '';
-				if ($mode == 'payment_salary') $url = DOL_URL_ROOT.'/salaries/payment_salary/card.php?id=';
+				if ($mode == 'payment_salary') {
+					$url = DOL_URL_ROOT.'/salaries/payment_salary/card.php?id=';
+				}
+
 				if ($url) {
 					$result = $acc->add_url_line($bank_line_id, $this->id, $url, '(paiement)', $mode);
 					if ($result <= 0) {
@@ -536,14 +539,31 @@ class PaymentSalary extends CommonObject
 					}
 				}
 
-				// Add link 'company' in bank_url between invoice and bank transaction (for each invoice concerned by payment)
-				$linkaddedforthirdparty = array();
+				// Add link 'user' in bank_url between user and bank transaction
 				foreach ($this->amounts as $key => $value) {
-					if ($mode == 'payment_salary') {
-						$salary = new Salary($this->db);
-						$salary->fetch($key);
-						$result = $acc->add_url_line($bank_line_id, $salary->id, DOL_URL_ROOT.'/salaries/card.php?id=', '('.$salary->label.')', 'salary');
-						if ($result <= 0) dol_print_error($this->db);
+					if (!$error) {
+						if ($mode == 'payment_salary') {
+							$salary = new Salary($this->db);
+							$salary->fetch($key);
+							$salary->fetch_user($salary->fk_user);
+
+							$fuser = $salary->user;
+
+							if ($fuser->id > 0) {
+								$result = $acc->add_url_line(
+									$bank_line_id,
+									$fuser->id,
+									DOL_URL_ROOT.'/user/card.php?id=',
+									$fuser->getFullName($langs),
+									'user'
+									);
+							}
+							if ($result <= 0) {
+								$this->error = $this->db->lasterror();
+								dol_syslog(get_class($this) . '::addPaymentToBank ' . $this->error);
+								$error++;
+							}
+						}
 					}
 				}
 			} else {
diff --git a/htdocs/salaries/class/salary.class.php b/htdocs/salaries/class/salary.class.php
index 35ceb8a1931..cc50c57ec84 100644
--- a/htdocs/salaries/class/salary.class.php
+++ b/htdocs/salaries/class/salary.class.php
@@ -88,6 +88,12 @@ class Salary extends CommonObject
 	 */
 	public $fk_user_modif;
 
+	/**
+	 * @var user	User
+	 */
+	public $user;
+
+
 	const STATUS_UNPAID = 0;
 	const STATUS_PAID = 1;
 

From ce5acda635e62378a8495b4bd212e8d702017da8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 3 Aug 2021 15:03:41 +0200
Subject: [PATCH 1376/1497] Fix phpcs

---
 htdocs/accountancy/class/accountancyexport.class.php | 4 ++--
 htdocs/projet/tasks/time.php                         | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index 5ac3ebcb37d..a96c672608a 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -488,8 +488,8 @@ class AccountancyExport
 		foreach ($TData as $data) {
 			$code_compta = length_accountg($data->numero_compte);
 			if (!empty($data->subledger_account)) {
-                $code_compta = length_accounta($data->subledger_account);
-            }
+				$code_compta = length_accounta($data->subledger_account);
+			}
 
 			$date_document = dol_print_date($data->doc_date, '%Y%m%d');
 			$date_echeance = dol_print_date($data->date_lim_reglement, '%Y%m%d');
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 1923bde17b2..0daf5439dc0 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -1423,9 +1423,9 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0) {
 						$totalarray['nbfield']++;
 					}
 				}
-            } elseif ($action !== 'createtime') {
-            	print '<input type="hidden" name="taskid" value="'.$id.'">';
-            }
+			} elseif ($action !== 'createtime') {
+				print '<input type="hidden" name="taskid" value="'.$id.'">';
+			}
 
 			// Task label
 			if (!empty($arrayfields['t.task_label']['checked'])) {

From 8b746b64a0601c4c15a6a18ff0d23326e079f98a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 3 Aug 2021 15:04:29 +0200
Subject: [PATCH 1377/1497] Prepare 14.0.1

---
 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 8aa64da85f1..e55ca5b6e04 100644
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -34,7 +34,7 @@ if (!defined('DOL_APPLICATION_TITLE')) {
 	define('DOL_APPLICATION_TITLE', 'Dolibarr');
 }
 if (!defined('DOL_VERSION')) {
-	define('DOL_VERSION', '14.0.0'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
+	define('DOL_VERSION', '14.0.1'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
 }
 
 if (!defined('EURO')) {

From c8fd7ccbb67253e848b2470d26eb6e1532592c0b Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Tue, 3 Aug 2021 15:06:53 +0200
Subject: [PATCH 1378/1497] Close #18043 : fk_user_assign in create ticket

---
 htdocs/core/class/html.formticket.class.php | 8 ++++++++
 htdocs/ticket/card.php                      | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index 53ba83015b3..259e5a3a19a 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -436,6 +436,14 @@ class FormTicket
 				print '<input type="checkbox" id="notify_tiers_at_create" name="notify_tiers_at_create"'.($this->withnotifytiersatcreate ? ' checked="checked"' : '').'>';
 				print '</td></tr>';
 			}
+
+			// User assigned
+			print '<tr><td>';
+			print $langs->trans("AssignedTo");
+			print '</td><td>';
+			print $form->select_dolusers(GETPOST('fk_user_assign', 'int'), 'fk_user_assign', 1);
+			print '</td>';
+			print '</tr>';
 		}
 
 		if (!empty($conf->projet->enabled) && !$this->ispublic) {
diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index f64b6e28fd1..9b5f937455e 100644
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -188,7 +188,7 @@ if (empty($reshook)) {
 			$object->email_from = $user->email;
 			$notifyTiers = GETPOST("notify_tiers_at_create", 'alpha');
 			$object->notify_tiers_at_create = empty($notifyTiers) ? 0 : 1;
-
+			$object->fk_user_assign = GETPOST("fk_user_assign", 'int');
 			$object->fk_project = $projectid;
 
 			$id = $object->create($user);

From 115b0e683129e363cd00f6506809331858958dc0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 3 Aug 2021 15:07:16 +0200
Subject: [PATCH 1379/1497] Update api_shipments.class.php

---
 htdocs/expedition/class/api_shipments.class.php | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/htdocs/expedition/class/api_shipments.class.php b/htdocs/expedition/class/api_shipments.class.php
index 3b4070b138b..a92fd4f436a 100644
--- a/htdocs/expedition/class/api_shipments.class.php
+++ b/htdocs/expedition/class/api_shipments.class.php
@@ -530,14 +530,9 @@ class Shipments extends DolibarrApi
 		if ($result < 0) {
 			throw new RestException(500, 'Error when validating Shipment: '.$this->shipment->error);
 		}
+		
+		// Reload shipment
 		$result = $this->shipment->fetch($id);
-		if (!$result) {
-			throw new RestException(404, 'Shipment not found');
-		}
-
-		if (!DolibarrApi::_checkAccessToResource('expedition', $this->shipment->id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
 
 		$this->shipment->fetchObjectLinked();
 		return $this->_cleanObjectDatas($this->shipment);
@@ -659,14 +654,8 @@ class Shipments extends DolibarrApi
 			throw new RestException(500, 'Error when closing Order: '.$this->commande->error);
 		}
 
+		// Reload shipment
 		$result = $this->shipment->fetch($id);
-		if (!$result) {
-			throw new RestException(404, 'Shipment not found');
-		}
-
-		if (!DolibarrApi::_checkAccessToResource('expedition', $this->commande->id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
 
 		$this->shipment->fetchObjectLinked();
 

From 19f17ed1145685a625d2c7ab9c0bb742fb138f5e Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Wed, 21 Jul 2021 14:52:37 +0200
Subject: [PATCH 1380/1497] fix: bad setEventMessages input

---
 htdocs/product/stock/massstockmove.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/product/stock/massstockmove.php b/htdocs/product/stock/massstockmove.php
index f2432ea25af..9f3390d34af 100644
--- a/htdocs/product/stock/massstockmove.php
+++ b/htdocs/product/stock/massstockmove.php
@@ -209,7 +209,7 @@ if ($action == 'createmovements' && !empty($user->rights->stock->mouvement->cree
 					);
 					if ($result1 < 0) {
 						$error++;
-						setEventMessages($product->errors, $product->errorss, 'errors');
+						setEventMessages($product->error, $product->errors, 'errors');
 					}
 
 					// Add stock
@@ -224,7 +224,7 @@ if ($action == 'createmovements' && !empty($user->rights->stock->mouvement->cree
 					);
 					if ($result2 < 0) {
 						$error++;
-						setEventMessages($product->errors, $product->errorss, 'errors');
+						setEventMessages($product->error, $product->errors, 'errors');
 					}
 				} else {
 					$arraybatchinfo = $product->loadBatchInfo($batch);
@@ -253,7 +253,7 @@ if ($action == 'createmovements' && !empty($user->rights->stock->mouvement->cree
 					);
 					if ($result1 < 0) {
 						$error++;
-						setEventMessages($product->errors, $product->errorss, 'errors');
+						setEventMessages($product->error, $product->errors, 'errors');
 					}
 
 					// Add stock
@@ -271,7 +271,7 @@ if ($action == 'createmovements' && !empty($user->rights->stock->mouvement->cree
 					);
 					if ($result2 < 0) {
 						$error++;
-						setEventMessages($product->errors, $product->errorss, 'errors');
+						setEventMessages($product->error, $product->errors, 'errors');
 					}
 				}
 			} else {

From f00694470fab4a3b38ac415eb18c9b429048ec0e Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe@altairis.fr>
Date: Tue, 3 Aug 2021 15:40:01 +0200
Subject: [PATCH 1381/1497] rename constant to PROPOSAL_ARE_NOT_BILLABLE

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

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 83f28af1d15..9b58b35c4a7 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -2579,7 +2579,7 @@ if ($action == 'create') {
 				}
 
 				// Create an invoice and classify billed
-				if ($object->statut == Propal::STATUS_SIGNED && empty($conf->global->PROPAL_NOT_BILLABLE)) {
+				if ($object->statut == Propal::STATUS_SIGNED && empty($conf->global->PROPOSAL_ARE_NOT_BILLABLE)) {
 					if (!empty($conf->facture->enabled) && $usercancreateinvoice) {
 						print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans("AddBill").'</a>';
 					}

From 9ceab9b86b9adedd37ef6204b483fe969d82c484 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 3 Aug 2021 15:47:00 +0200
Subject: [PATCH 1382/1497] Doc

---
 htdocs/product/class/productbatch.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/product/class/productbatch.class.php b/htdocs/product/class/productbatch.class.php
index f10adee334e..4408afd9ff1 100644
--- a/htdocs/product/class/productbatch.class.php
+++ b/htdocs/product/class/productbatch.class.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2007-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2007-2021 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2013-2014 Cedric GROSS         <c.gross@kreiz-it.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -44,8 +44,8 @@ class Productbatch extends CommonObject
 
 	public $tms = '';
 	public $fk_product_stock;
-	public $sellby = '';
-	public $eatby = '';
+	public $sellby = '';	// dlc
+	public $eatby = '';		// dmd/dluo
 	public $batch = '';
 	public $qty;
 	public $warehouseid;

From 4873a91afc624486f856baa4ac09705cd9cbfbe9 Mon Sep 17 00:00:00 2001
From: lainwir3d <rondu.richard@gmail.com>
Date: Tue, 3 Aug 2021 17:33:06 +0400
Subject: [PATCH 1383/1497] CLOSE #18326 Workflow: Close order on shipment
 closing.

Allow an order to be closed automatically when all linked shipment have been closed and all products / items have been shipped.
---
 htdocs/admin/workflow.php                              | 10 ++++++++--
 htdocs/core/modules/modWorkflow.class.php              |  1 +
 .../interface_20_modWorkflow_WorkflowManager.class.php | 10 ++++++++--
 htdocs/langs/en_US/workflow.lang                       |  1 +
 htdocs/langs/fr_FR/workflow.lang                       |  1 +
 5 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/htdocs/admin/workflow.php b/htdocs/admin/workflow.php
index 09156e08588..1b6fa5bebe7 100644
--- a/htdocs/admin/workflow.php
+++ b/htdocs/admin/workflow.php
@@ -91,15 +91,21 @@ $workflowcodes = array(
 	),
 
 	// Automatic classification of order
-	'WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING'=>array(
+	'WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING'=>array(  // when shipping validated
 		'family'=>'classify_order',
 		'position'=>40,
 		'enabled'=>(!empty($conf->expedition->enabled) && !empty($conf->commande->enabled)),
 		'picto'=>'order'
 	),
-	'WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER'=>array(
+	'WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED'=>array( // when shipping closed
 		'family'=>'classify_order',
 		'position'=>41,
+		'enabled'=>(!empty($conf->expedition->enabled) && !empty($conf->commande->enabled)),
+		'picto'=>'order'
+	),
+	'WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER'=>array(
+		'family'=>'classify_order',
+		'position'=>42,
 		'enabled'=>(!empty($conf->facture->enabled) && !empty($conf->commande->enabled)),
 		'picto'=>'order',
 		'warning'=>''
diff --git a/htdocs/core/modules/modWorkflow.class.php b/htdocs/core/modules/modWorkflow.class.php
index fbf7927ed1c..eaaf15d40a1 100644
--- a/htdocs/core/modules/modWorkflow.class.php
+++ b/htdocs/core/modules/modWorkflow.class.php
@@ -87,6 +87,7 @@ class modWorkflow extends DolibarrModules
 			0=>array('WORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL', 'chaine', '1', 'WORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL', 0, 'current', 0),
 			1=>array('WORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL', 'chaine', '1', 'WORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL', 0, 'current', 0),
 			2=>array('WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING', 'chaine', '1', 'WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING', 0, 'current', 0),
+			3=>array('WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED', 'chaine', '1', 'WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED', 0, 'current', 0),
 			4=>array('WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER', 'chaine', '1', 'WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER', 0, 'current', 0),
 			5=>array('WORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL', 'chaine', '1', 'WORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL', 0, 'current', 0),
 			6=>array('WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER', 'chaine', '1', 'WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER', 0, 'current', 0),
diff --git a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
index 72a08d22494..c47965c7d52 100644
--- a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
+++ b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
@@ -256,10 +256,15 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 			}
 		}
 
-		if ($action == 'SHIPPING_VALIDATE') {
+		if (($action == 'SHIPPING_VALIDATE') || ($action == 'SHIPPING_CLOSED')) {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
-			if (!empty($conf->commande->enabled) && !empty($conf->expedition->enabled) && !empty($conf->workflow->enabled) && !empty($conf->global->WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING)) {
+			if (!empty($conf->commande->enabled) && !empty($conf->expedition->enabled) && !empty($conf->workflow->enabled) && 
+				(
+					(!empty($conf->global->WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING) && ($action == 'SHIPPING_VALIDATE')) ||
+					(!empty($conf->global->WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED) && ($action == 'SHIPPING_CLOSED')) 
+				)
+			) {
 				$qtyshipped = array();
 				$qtyordred = array();
 				require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
@@ -318,6 +323,7 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 				}
 			}
 		}
+
 		 // classify billed reception
 		if ($action == 'BILL_SUPPLIER_VALIDATE') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id, LOG_DEBUG);
diff --git a/htdocs/langs/en_US/workflow.lang b/htdocs/langs/en_US/workflow.lang
index 15fd8ef07c2..fafbc6e8d8a 100644
--- a/htdocs/langs/en_US/workflow.lang
+++ b/htdocs/langs/en_US/workflow.lang
@@ -13,6 +13,7 @@ descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as b
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked order)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales order as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=Classify linked source sales order as shipped when a shipment is closed (and if the quantity shipped by all shipments is the same as in the order to update)
 # Autoclassify purchase order
 descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked proposal)
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
diff --git a/htdocs/langs/fr_FR/workflow.lang b/htdocs/langs/fr_FR/workflow.lang
index 2af480afa83..13fbbace793 100644
--- a/htdocs/langs/fr_FR/workflow.lang
+++ b/htdocs/langs/fr_FR/workflow.lang
@@ -13,6 +13,7 @@ descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classer la/les proposition(s) commer
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classer la/les commande(s) client(s) source(s) facturée(s) à la validation de la facture client (et si le montant de la facture est le même que le montant total des commandes liées)
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classer la/les commande(s) client(s) source(s) à Facturée quand une facture client est passée à Payé (et si le montant de la facture est identique à la somme des commandes sources)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classer la commande source à expédiée à la validation d'une expédition (et si les quantités expédiées dans le bon d'expédition sont les même que dans la commande mise à jour)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=Classer la commande source à expédiée à la cloture d'une expédition (et si les quantités expédiées dans le bon d'expédition sont les même que dans la commande mise à jour)
 # Autoclassify purchase order
 descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classer la ou les proposition(s) commerciale(s) fournisseur sources facturées quand une facture fournisseur est validée (et si le montant de la facture est le même que le total des propositions sources liées)
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classer la ou les commande(s) fournisseur(s) de source(s) à facturée(s) lorsque la facture fournisseur est validée (et si le montant de la facture est le même que le montant total des commandes liées)

From 6e68bf10ef265f1d83c7610070a9dbeee478f5ac Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Tue, 3 Aug 2021 16:06:08 +0200
Subject: [PATCH 1384/1497] Update of card.php to change status

---
 htdocs/ticket/card.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index 9b5f937455e..5d71ee4e393 100644
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -188,7 +188,12 @@ if (empty($reshook)) {
 			$object->email_from = $user->email;
 			$notifyTiers = GETPOST("notify_tiers_at_create", 'alpha');
 			$object->notify_tiers_at_create = empty($notifyTiers) ? 0 : 1;
-			$object->fk_user_assign = GETPOST("fk_user_assign", 'int');
+			$fk_user_assign = GETPOST("fk_user_assign", 'int');
+			if (!empty($fk_user_assign)) {
+				$object->fk_user_assign = $fk_user_assign;
+				$object->fk_statut = $object::STATUS_ASSIGNED;
+			}
+
 			$object->fk_project = $projectid;
 
 			$id = $object->create($user);

From 1da9829d61bfa48aa6e0506f1e5a62db413bb799 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Tue, 3 Aug 2021 14:08:23 +0000
Subject: [PATCH 1385/1497] Fixing style errors.

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

diff --git a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
index c47965c7d52..8235348f21f 100644
--- a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
+++ b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
@@ -259,10 +259,10 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 		if (($action == 'SHIPPING_VALIDATE') || ($action == 'SHIPPING_CLOSED')) {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
-			if (!empty($conf->commande->enabled) && !empty($conf->expedition->enabled) && !empty($conf->workflow->enabled) && 
+			if (!empty($conf->commande->enabled) && !empty($conf->expedition->enabled) && !empty($conf->workflow->enabled) &&
 				(
 					(!empty($conf->global->WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING) && ($action == 'SHIPPING_VALIDATE')) ||
-					(!empty($conf->global->WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED) && ($action == 'SHIPPING_CLOSED')) 
+					(!empty($conf->global->WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED) && ($action == 'SHIPPING_CLOSED'))
 				)
 			) {
 				$qtyshipped = array();

From 1a0eeaf701dc7ccf66792b1445eb09a21c693ccf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 3 Aug 2021 16:35:47 +0200
Subject: [PATCH 1386/1497] Fix phpcs

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

diff --git a/htdocs/expedition/class/api_shipments.class.php b/htdocs/expedition/class/api_shipments.class.php
index a92fd4f436a..eaf66e59125 100644
--- a/htdocs/expedition/class/api_shipments.class.php
+++ b/htdocs/expedition/class/api_shipments.class.php
@@ -530,7 +530,7 @@ class Shipments extends DolibarrApi
 		if ($result < 0) {
 			throw new RestException(500, 'Error when validating Shipment: '.$this->shipment->error);
 		}
-		
+
 		// Reload shipment
 		$result = $this->shipment->fetch($id);
 

From 1c981ccb9d137aa7324001bc9eee463464f722fe Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 3 Aug 2021 17:03:34 +0200
Subject: [PATCH 1387/1497] Fix look and feel v14

---
 htdocs/admin/paymentbybanktransfer.php | 22 ++++++++++++----------
 htdocs/admin/prelevement.php           | 20 +++++++++++---------
 htdocs/compta/bank/line.php            |  8 ++++----
 htdocs/compta/prelevement/create.php   |  7 ++++++-
 htdocs/core/class/html.form.class.php  | 11 +++++++----
 5 files changed, 40 insertions(+), 28 deletions(-)

diff --git a/htdocs/admin/paymentbybanktransfer.php b/htdocs/admin/paymentbybanktransfer.php
index be5dc4e76e6..43ad8c15929 100644
--- a/htdocs/admin/paymentbybanktransfer.php
+++ b/htdocs/admin/paymentbybanktransfer.php
@@ -156,36 +156,38 @@ print "</tr>";
 
 // Bank account (from Banks module)
 print '<tr class="oddeven"><td class="fieldrequired">'.$langs->trans("BankToPayCreditTransfer").'</td>';
-print '<td class="left">';
-$form->select_comptes($conf->global->PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT, 'PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT', 0, "courant=1", 1);
+print '<td>';
+print img_picto('', 'bank_account', 'class="pictofixedwidth"');
+print $form->select_comptes($conf->global->PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT, 'PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT', 0, "courant=1", 1, '', 0, 'minwidth200', 1);
 print '</td></tr>';
 
 /* Moved to bank account data
 // ICS
 print '<tr class="oddeven"><td class="fieldrequired">'.$langs->trans("ICS").'</td>';
-print '<td class="left">';
+print '<td>';
 print '<input type="text" name="PAYMENTBYBANKTRANSFER_ICS" value="'.$conf->global->PAYMENTBYBANKTRANSFER_ICS.'" size="15" ></td>';
 print '</td></tr>';
 */
 
 //User
 print '<tr class="oddeven"><td class="fieldrequired">'.$langs->trans("ResponsibleUser").'</td>';
-print '<td class="left">';
-print $form->select_dolusers($conf->global->PAYMENTBYBANKTRANSFER_USER, 'PAYMENTBYBANKTRANSFER_USER', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
+print '<td>';
+print img_picto('', 'user', 'class="pictofixedwidth"');
+print $form->select_dolusers($conf->global->PAYMENTBYBANKTRANSFER_USER, 'PAYMENTBYBANKTRANSFER_USER', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'minwidth200 maxwidth500');
 print '</td>';
 print '</tr>';
 
 /*
 //EntToEnd
 print '<tr class="oddeven"><td>'.$langs->trans("END_TO_END").'</td>';
-print '<td class="left">';
-print '<input type="text" name="PRELEVEMENT_END_TO_END" value="'.$conf->global->PRELEVEMENT_END_TO_END.'" size="15" ></td>';
+print '<td>';
+print '<input type="text" name="PRELEVEMENT_END_TO_END" value="'.$conf->global->PRELEVEMENT_END_TO_END.'" class="width100"></td>';
 print '</td></tr>';
 
 //USTRD
 print '<tr class="oddeven"><td>'.$langs->trans("USTRD").'</td>';
-print '<td class="left">';
-print '<input type="text" name="PRELEVEMENT_USTRD" value="'.$conf->global->PRELEVEMENT_USTRD.'" size="15" ></td>';
+print '<td>';
+print '<input type="text" name="PRELEVEMENT_USTRD" value="'.$conf->global->PRELEVEMENT_USTRD.'" class="width100"></td>';
 print '</td></tr>';
 */
 
@@ -195,7 +197,7 @@ print '<td class="left">';
 if (!$conf->global->PAYMENTBYBANKTRANSFER_ADDDAYS) {
 	$conf->global->PAYMENTBYBANKTRANSFER_ADDDAYS = 0;
 }
-print '<input type="text" name="PAYMENTBYBANKTRANSFER_ADDDAYS" value="'.$conf->global->PAYMENTBYBANKTRANSFER_ADDDAYS.'" size="15" ></td>';
+print '<input type="text" name="PAYMENTBYBANKTRANSFER_ADDDAYS" value="'.$conf->global->PAYMENTBYBANKTRANSFER_ADDDAYS.'" class="width50"></td>';
 print '</td></tr>';
 print '</table>';
 print '<br>';
diff --git a/htdocs/admin/prelevement.php b/htdocs/admin/prelevement.php
index c7de6d59896..01e3b6d4913 100644
--- a/htdocs/admin/prelevement.php
+++ b/htdocs/admin/prelevement.php
@@ -160,8 +160,9 @@ print "</tr>";
 
 // Bank account (from Banks module)
 print '<tr class="oddeven"><td class="fieldrequired">'.$langs->trans("BankToReceiveWithdraw").'</td>';
-print '<td class="left">';
-$form->select_comptes($conf->global->PRELEVEMENT_ID_BANKACCOUNT, 'PRELEVEMENT_ID_BANKACCOUNT', 0, "courant=1", 1);
+print '<td>';
+print img_picto('', 'bank_account', 'class="pictofixedwidth"');
+print $form->select_comptes($conf->global->PRELEVEMENT_ID_BANKACCOUNT, 'PRELEVEMENT_ID_BANKACCOUNT', 0, "courant=1", 1, '', 0, 'minwidth200', 1);
 print '</td></tr>';
 
 /* Moved to bank account data
@@ -179,8 +180,9 @@ print '</td></tr>';
 
 //User
 print '<tr class="oddeven"><td class="fieldrequired">'.$langs->trans("ResponsibleUser").'</td>';
-print '<td class="left">';
-print $form->select_dolusers($conf->global->PRELEVEMENT_USER, 'PRELEVEMENT_USER', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
+print '<td>';
+print img_picto('', 'user', 'class="pictofixedwidth"');
+print $form->select_dolusers($conf->global->PRELEVEMENT_USER, 'PRELEVEMENT_USER', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'minwidth200 maxwidth500');
 print '</td>';
 print '</tr>';
 
@@ -189,8 +191,8 @@ print '<tr class="oddeven"><td>';
 $htmltext = $langs->trans("KeepThisEmptyInMostCases");
 print $form->textwithpicto($langs->trans("END_TO_END"), $htmltext);
 print '</td>';
-print '<td class="left">';
-print '<input type="text" name="PRELEVEMENT_END_TO_END" value="'.$conf->global->PRELEVEMENT_END_TO_END.'" size="15" ></td>';
+print '<td>';
+print '<input type="text" name="PRELEVEMENT_END_TO_END" value="'.$conf->global->PRELEVEMENT_END_TO_END.'" class="width100"></td>';
 print '</td></tr>';
 
 //USTRD
@@ -199,16 +201,16 @@ $htmltext = $langs->trans("KeepThisEmptyInMostCases");
 print $form->textwithpicto($langs->trans("USTRD"), $htmltext);
 print '</td>';
 print '<td class="left">';
-print '<input type="text" name="PRELEVEMENT_USTRD" value="'.$conf->global->PRELEVEMENT_USTRD.'" size="15" ></td>';
+print '<input type="text" name="PRELEVEMENT_USTRD" value="'.$conf->global->PRELEVEMENT_USTRD.'" class="width100"></td>';
 print '</td></tr>';
 
 //ADDDAYS
 print '<tr class="oddeven"><td>'.$langs->trans("ADDDAYS").'</td>';
-print '<td class="left">';
+print '<td>';
 if (empty($conf->global->PRELEVEMENT_ADDDAYS)) {
 	$conf->global->PRELEVEMENT_ADDDAYS = 0;
 }
-print '<input type="text" name="PRELEVEMENT_ADDDAYS" value="'.$conf->global->PRELEVEMENT_ADDDAYS.'" size="5" ></td>';
+print '<input type="text" name="PRELEVEMENT_ADDDAYS" value="'.$conf->global->PRELEVEMENT_ADDDAYS.'"  class="width50"></td>';
 print '</td></tr>';
 
 print '</table>';
diff --git a/htdocs/compta/bank/line.php b/htdocs/compta/bank/line.php
index 2c33085aa6d..05aed6a215e 100644
--- a/htdocs/compta/bank/line.php
+++ b/htdocs/compta/bank/line.php
@@ -624,21 +624,21 @@ if ($result) {
 
 			print '<table class="border centpercent">';
 
-			print '<tr><td class="titlefield">'.$langs->trans("Conciliation")."</td>";
+			print '<tr><td class="titlefieldcreate">'.$form->textwithpicto($langs->trans("AccountStatement"), $langs->trans("InputReceiptNumber"))."</td>";
 			if ($user->rights->banque->consolidate) {
 				print '<td>';
 				if ($objp->rappro) {
-					print $langs->trans("AccountStatement").' <input name="num_rel_bis" class="flat" value="'.$objp->num_releve.'"'.($objp->rappro ? ' disabled' : '').'>';
+					print '<input name="num_rel_bis" class="flat" value="'.$objp->num_releve.'"'.($objp->rappro ? ' disabled' : '').'>';
 					print '<input name="num_rel" type="hidden" value="'.$objp->num_releve.'">';
 				} else {
-					print $langs->trans("AccountStatement").' <input name="num_rel" class="flat" value="'.$objp->num_releve.'"'.($objp->rappro ? ' disabled' : '').'>';
+					print '<input name="num_rel" class="flat" value="'.$objp->num_releve.'"'.($objp->rappro ? ' disabled' : '').'>';
 				}
 				if ($objp->num_releve) {
 					print ' &nbsp; (<a href="'.DOL_URL_ROOT.'/compta/bank/releve.php?num='.$objp->num_releve.'&account='.$acct->id.'">'.$langs->trans("AccountStatement").' '.$objp->num_releve.')</a>';
 				}
 				print '</td>';
 			} else {
-				print '<td>'.$objp->num_releve.'&nbsp;</td>';
+				print '<td>'.$objp->num_releve.'</td>';
 			}
 			print '</tr>';
 
diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index 937750648bb..be18099b6a8 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -67,6 +67,7 @@ $hookmanager->initHooks(array('directdebitcreatecard', 'globalcard'));
 /*
  * Actions
  */
+
 if (GETPOST('cancel', 'alpha')) {
 	$massaction = '';
 }
@@ -165,7 +166,11 @@ llxHeader('', $langs->trans("NewStandingOrder"));
 
 if (prelevement_check_config($type) < 0) {
 	$langs->load("errors");
-	setEventMessages($langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Withdraw")), null, 'errors');
+	$modulenametoshow = "Withdraw";
+	if ($type == 'bank-transfer') {
+		$modulenametoshow = "PaymentByBankTransfer";
+	}
+	setEventMessages($langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv($modulenametoshow)), null, 'errors');
 }
 
 
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 9e46d55d6a8..4e9da790f28 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1952,15 +1952,12 @@ class Form
 		}
 
 		dol_syslog(get_class($this)."::select_dolusers", LOG_DEBUG);
+
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$i = 0;
 			if ($num) {
-				// Enhance with select2
-				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
-				$out .= ajax_combobox($htmlname);
-
 				// do not use maxwidthonsmartphone by default. Set it by caller so auto size to 100% will work when not defined
 				$out .= '<select class="flat'.($morecss ? ' '.$morecss : ' minwidth200').'" id="'.$htmlname.'" name="'.$htmlname.($multiple ? '[]' : '').'" '.($multiple ? 'multiple' : '').' '.($disabled ? ' disabled' : '').'>';
 				if ($show_empty && !$multiple) {
@@ -2068,6 +2065,12 @@ class Form
 				$out .= '<option value="">'.$langs->trans("None").'</option>';
 			}
 			$out .= '</select>';
+
+			if ($num) {
+				// Enhance with select2
+				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+				$out .= ajax_combobox($htmlname);
+			}
 		} else {
 			dol_print_error($this->db);
 		}

From 892ec3a66166fdecdf56d363e5c74b417805f07c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 3 Aug 2021 17:06:07 +0200
Subject: [PATCH 1388/1497] Update card.php

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

diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index 5d71ee4e393..8a11ac23e23 100644
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -189,7 +189,7 @@ if (empty($reshook)) {
 			$notifyTiers = GETPOST("notify_tiers_at_create", 'alpha');
 			$object->notify_tiers_at_create = empty($notifyTiers) ? 0 : 1;
 			$fk_user_assign = GETPOST("fk_user_assign", 'int');
-			if (!empty($fk_user_assign)) {
+			if ($fk_user_assign > 0) {
 				$object->fk_user_assign = $fk_user_assign;
 				$object->fk_statut = $object::STATUS_ASSIGNED;
 			}

From 5ec3245119ef2a0de931d5361c15caa9bb65a72f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 3 Aug 2021 17:15:55 +0200
Subject: [PATCH 1389/1497] Migration

---
 htdocs/install/mysql/migration/14.0.0-15.0.0.sql | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/install/mysql/migration/14.0.0-15.0.0.sql b/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
index 28d484c7e99..35f5221e34f 100644
--- a/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
+++ b/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
@@ -35,6 +35,8 @@
 
 -- v15
 
+ALTER TABLE llx_knowledgemanagement_knowledgerecord ADD lang varchar(6);
+
 CREATE TABLE llx_categorie_ticket
 (
   fk_categorie  integer NOT NULL,

From ea6cfeb0e84e7e968559dd0567fe0f9d6d7474de Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 3 Aug 2021 19:21:18 +0200
Subject: [PATCH 1390/1497] NEW Increase size of params of action for
 emailcollector

---
 htdocs/install/mysql/migration/14.0.0-15.0.0.sql                | 2 ++
 .../mysql/tables/llx_emailcollector_emailcollectoraction.sql    | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/migration/14.0.0-15.0.0.sql b/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
index 35f5221e34f..89546dd9bb6 100644
--- a/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
+++ b/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
@@ -35,6 +35,8 @@
 
 -- v15
 
+ALTER TABLE llx_emailcollector_emailcollectoraction MODIFY COLUMN actionparam TEXT;
+
 ALTER TABLE llx_knowledgemanagement_knowledgerecord ADD lang varchar(6);
 
 CREATE TABLE llx_categorie_ticket
diff --git a/htdocs/install/mysql/tables/llx_emailcollector_emailcollectoraction.sql b/htdocs/install/mysql/tables/llx_emailcollector_emailcollectoraction.sql
index c45a3dcd1c4..deda90cbdcd 100644
--- a/htdocs/install/mysql/tables/llx_emailcollector_emailcollectoraction.sql
+++ b/htdocs/install/mysql/tables/llx_emailcollector_emailcollectoraction.sql
@@ -19,7 +19,7 @@ CREATE TABLE llx_emailcollector_emailcollectoraction(
 	rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
 	fk_emailcollector INTEGER NOT NULL,
 	type varchar(128) NOT NULL, 
-	actionparam varchar(255) NULL, 
+	actionparam text NULL, 
 	date_creation datetime NOT NULL, 
 	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
 	fk_user_creat integer NOT NULL, 

From a571fab1773af3d38299cfa8a36a65c64ae1af8c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 3 Aug 2021 23:54:36 +0200
Subject: [PATCH 1391/1497] css

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

diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index 9d0d9f1befc..2fafb5636e2 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -182,7 +182,7 @@ if (!empty($conf->propal->enabled) && $user->rights->propal->lire) {
 				print '<tr class="oddeven">';
 				print '<td class="nowrap tdoverflowmax100">'.$propalstatic->getNomUrl(1).'</td>';
 				print '<td class="nowrap tdoverflowmax100">'.$companystatic->getNomUrl(1, 'customer').'</td>';
-				print '<td class="nowrap right tdamount">'.price((!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc)).'</td>';
+				print '<td class="nowrap right tdamount amount">'.price((!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc)).'</td>';
 				print '</tr>';
 
 				$i++;
@@ -278,7 +278,7 @@ if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposa
 				print '<tr class="oddeven">';
 				print '<td class="nowrap tdoverflowmax100">'.$supplierproposalstatic->getNomUrl(1).'</td>';
 				print '<td class="nowrap tdoverflowmax100">'.$companystatic->getNomUrl(1, 'supplier').'</td>';
-				print '<td class="nowrap right tdamount">'.price(!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc).'</td>';
+				print '<td class="nowrap right tdamount amount">'.price(!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc).'</td>';
 				print '</tr>';
 
 				$i++;
@@ -375,7 +375,7 @@ if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
 				print '<tr class="oddeven">';
 				print '<td class="nowrap tdoverflowmax100">'.$orderstatic->getNomUrl(1).'</td>';
 				print '<td class="nowrap tdoverflowmax100">'.$companystatic->getNomUrl(1, 'customer').'</td>';
-				print '<td class="nowrap right tdamount">'.price(!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc).'</td>';
+				print '<td class="nowrap right tdamount amount">'.price(!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc).'</td>';
 				print '</tr>';
 
 				$i++;
@@ -472,7 +472,7 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 				print '<tr class="oddeven">';
 				print '<td class="nowrap tdoverflowmax100">'.$supplierorderstatic->getNomUrl(1).'</td>';
 				print '<td class="nowrap tdoverflowmax100">'.$companystatic->getNomUrl(1, 'supplier').'</td>';
-				print '<td class="nowrap right tdamount">'.price(!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc).'</td>';
+				print '<td class="nowrap right tdamount amount">'.price(!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc).'</td>';
 				print '</tr>';
 
 				$i++;
@@ -862,7 +862,7 @@ if (!empty($conf->propal->enabled) && $user->rights->propal->lire) {
 
 				print '<td class="nowrap">'.$companystatic->getNomUrl(1, 'customer', 44).'</td>';
 				print '<td class="right tddate">'.dol_print_date($db->jdate($obj->dp), 'day').'</td>';
-				print '<td class="right tdamount">'.price(!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc).'</td>';
+				print '<td class="right tdamount amount">'.price(!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc).'</td>';
 				print '<td align="center" width="14">'.$propalstatic->LibStatut($obj->fk_statut, 3).'</td>';
 
 				print '</tr>';
@@ -979,7 +979,7 @@ if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
 
 				print '<td class="nowrap">'.$companystatic->getNomUrl(1, 'customer', 44).'</td>';
 				print '<td class="right tddate">'.dol_print_date($db->jdate($obj->dv), 'day').'</td>';
-				print '<td class="right tdamount">'.price(!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc).'</td>';
+				print '<td class="right tdamount amount">'.price(!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc).'</td>';
 				print '<td align="center" width="14">'.$orderstatic->LibStatut($obj->fk_statut, $obj->billed, 3).'</td>';
 
 				print '</tr>';

From 5f5734e9af8b9f0669b050a2cb129e39b1a47007 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 4 Aug 2021 00:09:33 +0200
Subject: [PATCH 1392/1497] css

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

diff --git a/htdocs/admin/clicktodial.php b/htdocs/admin/clicktodial.php
index 25ada4d2d89..d6525335ad8 100644
--- a/htdocs/admin/clicktodial.php
+++ b/htdocs/admin/clicktodial.php
@@ -134,7 +134,7 @@ if (!empty($conf->global->CLICKTODIAL_URL)) {
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print $langs->trans("LinkToTestClickToDial", $user->login).' : ';
 	print '<input class="flat" type="text" name="phonefortest" value="'.dol_escape_htmltag($phonefortest).'">';
-	print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("RefreshPhoneLink")).'">';
+	print '<input type="submit" class="button small" value="'.dol_escape_htmltag($langs->trans("RefreshPhoneLink")).'">';
 	print '</form>';
 
 	$setupcomplete = 1;
@@ -149,7 +149,7 @@ if (!empty($conf->global->CLICKTODIAL_URL)) {
 	}
 
 	if ($setupcomplete) {
-		print $langs->trans("LinkToTest", $user->login).': '.dol_print_phone($phonefortest, '', 0, 0, 'AC_TEL');
+		print $langs->trans("LinkToTest", $user->login).': '.dol_print_phone($phonefortest, '', 0, 0, 'AC_TEL', '', 1);
 	} else {
 		$langs->load("errors");
 		print '<div class="warning">'.$langs->trans("WarningClickToDialUserSetupNotComplete").'</div>';

From 6c19524fd76dbb4c88353f4dea74ce3eeec7edc0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 4 Aug 2021 00:12:49 +0200
Subject: [PATCH 1393/1497] code comment

---
 htdocs/admin/clicktodial.php      | 2 +-
 htdocs/core/lib/functions.lib.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/admin/clicktodial.php b/htdocs/admin/clicktodial.php
index d6525335ad8..9fd92f45faa 100644
--- a/htdocs/admin/clicktodial.php
+++ b/htdocs/admin/clicktodial.php
@@ -149,7 +149,7 @@ if (!empty($conf->global->CLICKTODIAL_URL)) {
 	}
 
 	if ($setupcomplete) {
-		print $langs->trans("LinkToTest", $user->login).': '.dol_print_phone($phonefortest, '', 0, 0, 'AC_TEL', '', 1);
+		print $langs->trans("LinkToTest", $user->login).': &nbsp; '.dol_print_phone($phonefortest, '', 0, 0, 'AC_TEL', '', 'mobile');
 	} else {
 		$langs->load("errors");
 		print '<div class="warning">'.$langs->trans("WarningClickToDialUserSetupNotComplete").'</div>';
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index a6c62ba2a47..62f4006c1de 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2831,7 +2831,7 @@ function dol_print_socialnetworks($value, $cid, $socid, $type, $dictsocialnetwor
  * 	@param 	int		$socid          Id of third party if known
  * 	@param 	string	$addlink	    ''=no link to create action, 'AC_TEL'=add link to clicktodial (if module enabled) and add link to create event (if conf->global->AGENDA_ADDACTIONFORPHONE set)
  * 	@param 	string	$separ 		    Separation between numbers for a better visibility example : xx.xx.xx.xx.xx
- *  @param	string  $withpicto      Show picto
+ *  @param	string  $withpicto      Show picto ('fax', 'phone', 'mobile')
  *  @param	string	$titlealt	    Text to show on alt
  *  @param  int     $adddivfloat    Add div float around phone.
  * 	@return string 				    Formated phone number

From 26ba153169909456d381d28f7f824ac3a374a82c Mon Sep 17 00:00:00 2001
From: Daniel Mietchen <daniel.mietchen@googlemail.com>
Date: Wed, 4 Aug 2021 00:21:04 -0400
Subject: [PATCH 1394/1497] typo fix and copyedits

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 7878f6270a7..834cc09236e 100644
--- a/README.md
+++ b/README.md
@@ -79,7 +79,7 @@ If you don't have time to install it yourself, you can try some commercial 'read
 
 ## UPGRADING
 
-Dolibarr supports upgrading usually wihtout the need for any (commercial) support (depending on if you use any commercial extensions) and supports upgrading all the way from any version after 2.8 without breakage. This is unique in the ERP ecosystem and a benefit our users highly appreciate!
+Dolibarr supports upgrading, usually without the need for any (commercial) support (depending on if you use any commercial extensions). It supports upgrading all the way from any version after 2.8 without breakage. This is unique in the ERP ecosystem and a benefit our users highly appreciate!
  
 - At first make a backup of your Dolibarr files & than [see](https://wiki.dolibarr.org/index.php/Installation_-_Upgrade#Upgrade_Dolibarr)
 - Check that your installed PHP version is supported by the new version [see PHP support](./doc/phpmatrix.md).

From 8c7b6e66662f7d3629208aeeecd21254b9362395 Mon Sep 17 00:00:00 2001
From: Daniel Mietchen <daniel.mietchen@googlemail.com>
Date: Wed, 4 Aug 2021 00:34:29 -0400
Subject: [PATCH 1395/1497] typo fixes

---
 .github/PULL_REQUEST_TEMPLATE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 035387834bd..84deea18f00 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -3,7 +3,7 @@
 *Please:*
 - *only keep the "Fix", "Close" or "New" section*
 - *follow the project [contributing guidelines](/.github/CONTRIBUTING.md)*
-- *replace the bracket enclosed textswith meaningful informations*
+- *replace the bracket enclosed texts with meaningful information*
 
 
 # Fix #[*issue_number Short description*]

From 4958015e93ae519b81b0270c1399c57708de440e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 4 Aug 2021 12:26:38 +0200
Subject: [PATCH 1396/1497] Fix token

---
 htdocs/admin/tools/dolibarr_export.php |  9 +++++++--
 htdocs/admin/tools/dolibarr_import.php | 12 ++++++++++--
 htdocs/admin/tools/export_files.php    |  4 ++++
 htdocs/admin/tools/listsessions.php    | 11 ++++++++---
 htdocs/admin/tools/purge.php           | 13 +++++++++----
 htdocs/admin/tools/update.php          | 17 +++++++++++------
 6 files changed, 49 insertions(+), 17 deletions(-)

diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php
index 428c80676a2..4f6977ffb41 100644
--- a/htdocs/admin/tools/dolibarr_export.php
+++ b/htdocs/admin/tools/dolibarr_export.php
@@ -136,7 +136,7 @@ $title = $langs->trans("Backup");
 print load_fiche_titre($title, '', 'title_setup');
 //print_barre_liste($langs->trans("Backup"), '', '', '', '', '', $langs->trans("BackupDesc",DOL_DATA_ROOT), 0, 0, 'title_setup');
 
-print '<div class="center opacitymedium">';
+print '<div class="center">';
 print $langs->trans("BackupDesc", DOL_DATA_ROOT);
 print '</div>';
 print '<br>';
@@ -147,8 +147,11 @@ print '<input type="hidden" name="token" value="'.newToken().'" />';
 print '<input type="hidden" name="export_type" value="server" />';
 print '<fieldset id="fieldsetexport"><legend class="legendforfieldsetstep" style="font-size: 3em">1</legend>';
 
+print '<span class="opacitymedium">';
 print $langs->trans("BackupDesc3", $dolibarr_main_db_name).'<br>';
 //print $langs->trans("BackupDescY").'<br>';
+print '</span>';
+
 print '<br>';
 
 print '<div id="backupdatabaseleft" class="fichehalfleft" >';
@@ -157,7 +160,7 @@ $title = $langs->trans("BackupDumpWizard");
 
 print load_fiche_titre($title);
 
-print '<table width="100%" class="'.(!empty($useinecm) ? 'nobordernopadding' : 'liste').' nohover">';
+print '<table class="'.(!empty($useinecm) ? 'nobordernopadding' : 'liste noborderbottom').' nohover centpercent">';
 print '<tr class="liste_titre">';
 print '<td class="liste_titre">';
 print $langs->trans("DatabaseName").' : <b>'.$dolibarr_main_db_name.'</b><br>';
@@ -554,8 +557,10 @@ print '<input type="hidden" name="page_y" value="" />';
 
 print '<fieldset><legend class="legendforfieldsetstep" style="font-size: 3em">2</legend>';
 
+print '<span class="opacitymedium">';
 print $langs->trans("BackupDesc2", DOL_DATA_ROOT).'<br>';
 print $langs->trans("BackupDescX").'<br><br>';
+print '</span>';
 
 print '<div id="backupfilesleft" class="fichehalfleft">';
 
diff --git a/htdocs/admin/tools/dolibarr_import.php b/htdocs/admin/tools/dolibarr_import.php
index 1fc0ca49221..29bfe5c12a4 100644
--- a/htdocs/admin/tools/dolibarr_import.php
+++ b/htdocs/admin/tools/dolibarr_import.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2006-2012	Laurent Destailleur	<eldy@users.sourceforge.net>
+/* Copyright (C) 2006-2021	Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2006-2012	Regis Houssin		<regis.houssin@inodbox.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -22,6 +22,10 @@
  * 		\brief      Page to import database
  */
 
+if (! defined('CSRFCHECK_WITH_TOKEN')) {
+	define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
+}
+
 require '../../main.inc.php';
 
 // Load translation files required by the page
@@ -72,7 +76,7 @@ jQuery(document).ready(function() {
 
 print load_fiche_titre($langs->trans("Restore"), '', 'title_setup');
 
-print '<div class="center opacitymedium">';
+print '<div class="center">';
 print $langs->trans("RestoreDesc", DOL_DATA_ROOT);
 print '</div>';
 print '<br>';
@@ -81,7 +85,9 @@ print '<br>';
 <fieldset>
 <legend style="font-size: 3em">1</legend>
 <?php
+print '<span class="opacitymedium">';
 print $langs->trans("RestoreDesc2", DOL_DATA_ROOT).'<br><br>';
+print '</span>';
 ?>
 </fieldset>
 
@@ -90,7 +96,9 @@ print $langs->trans("RestoreDesc2", DOL_DATA_ROOT).'<br><br>';
 <fieldset>
 <legend style="font-size: 3em">2</legend>
 <?php
+print '<span class="opacitymedium">';
 print $langs->trans("RestoreDesc3", $dolibarr_main_db_name).'<br><br>';
+print '</span>';
 ?>
 
 <?php print $langs->trans("DatabaseName").' : <b>'.$dolibarr_main_db_name.'</b>'; ?><br><br>
diff --git a/htdocs/admin/tools/export_files.php b/htdocs/admin/tools/export_files.php
index 34685676320..384b08e19cf 100644
--- a/htdocs/admin/tools/export_files.php
+++ b/htdocs/admin/tools/export_files.php
@@ -22,6 +22,10 @@
  *		\brief      Page to export documents into a compressed file
  */
 
+if (! defined('CSRFCHECK_WITH_TOKEN')) {
+	define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
+}
+
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
diff --git a/htdocs/admin/tools/listsessions.php b/htdocs/admin/tools/listsessions.php
index 61d2b1cea58..10a38fb59a1 100644
--- a/htdocs/admin/tools/listsessions.php
+++ b/htdocs/admin/tools/listsessions.php
@@ -22,9 +22,14 @@
  *      \brief      List of PHP sessions
  */
 
+if (! defined('CSRFCHECK_WITH_TOKEN')) {
+	define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
+}
+
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 
+
 // Load translation files required by the page
 $langs->loadLangs(array("companies", "install", "users", "other"));
 
@@ -185,14 +190,14 @@ print '<div class="tabsAction">';
 
 
 if (empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED)) {
-	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=lock">'.$langs->trans("LockNewSessions").'</a>';
+	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=lock&token='.newToken().'">'.$langs->trans("LockNewSessions").'</a>';
 } else {
-	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=confirm_unlock">'.$langs->trans("UnlockNewSessions").'</a>';
+	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=confirm_unlock&token='.newToken().'">'.$langs->trans("UnlockNewSessions").'</a>';
 }
 
 if ($savehandler == 'files') {
 	if (count($listofsessions)) {
-		print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=purge">'.$langs->trans("PurgeSessions").'</a>';
+		print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=purge&token='.newToken().'">'.$langs->trans("PurgeSessions").'</a>';
 	}
 }
 
diff --git a/htdocs/admin/tools/purge.php b/htdocs/admin/tools/purge.php
index e20b9c2b13a..09647549c8b 100644
--- a/htdocs/admin/tools/purge.php
+++ b/htdocs/admin/tools/purge.php
@@ -21,15 +21,15 @@
  *		\brief      Page to purge files (temporary or not)
  */
 
+if (! defined('CSRFCHECK_WITH_TOKEN')) {
+	define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
+}
+
 require '../../main.inc.php';
 include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 $langs->load("admin");
 
-if (!$user->admin) {
-	accessforbidden();
-}
-
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 $choice = GETPOST('choice', 'aZ09');
@@ -42,10 +42,15 @@ if (!empty($conf->syslog->enabled)) {
 	$filelog = preg_replace('/DOL_DATA_ROOT/i', DOL_DATA_ROOT, $filelog);
 }
 
+if (!$user->admin) {
+	accessforbidden();
+}
+
 
 /*
  *	Actions
  */
+
 if ($action == 'purge' && !preg_match('/^confirm/i', $choice) && ($choice != 'allfiles' || $confirm == 'yes')) {
 	// Increase limit of time. Works only if we are not in safe mode
 	$ExecTimeLimit = 600;
diff --git a/htdocs/admin/tools/update.php b/htdocs/admin/tools/update.php
index 5a6ff94ce57..821bcd9e3f3 100644
--- a/htdocs/admin/tools/update.php
+++ b/htdocs/admin/tools/update.php
@@ -22,6 +22,10 @@
  *		\brief      Page to make a Dolibarr online upgrade
  */
 
+if (! defined('CSRFCHECK_WITH_TOKEN')) {
+	define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
+}
+
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -100,7 +104,7 @@ if (function_exists('curl_init')) {
 			print $langs->trans("LastStableVersion").' : <b>'.$langs->trans("UpdateServerOffline").'</b><br>';
 		}
 	} else {
-		print $langs->trans("LastStableVersion").' : <a href="'.$_SERVER["PHP_SELF"].'?action=getlastversion" class="button">'.$langs->trans("Check").'</a><br>';
+		print $langs->trans("LastStableVersion").' : <a href="'.$_SERVER["PHP_SELF"].'?action=getlastversion&token='.newToken().'" class="button smallpaddingimp">'.$langs->trans("Check").'</a><br>';
 	}
 }
 
@@ -113,14 +117,14 @@ print '<hr>';
 print $langs->trans("ThisIsProcessToFollow").'<br>';
 print '<b>'.$langs->trans("StepNb", 1).'</b>: ';
 $fullurl = '<a href="'.$urldolibarr.'" target="_blank">'.$urldolibarr.'</a>';
-print $langs->trans("DownloadPackageFromWebSite", $fullurl).'<br>';
+print str_replace('{s}', $fullurl, $langs->trans("DownloadPackageFromWebSite", '{s}')).'<br>';
 print '<b>'.$langs->trans("StepNb", 2).'</b>: ';
-print $langs->trans("UnpackPackageInDolibarrRoot", $dolibarrroot).'<br>';
+print str_replace('{s}', $dolibarrroot, $langs->trans("UnpackPackageInDolibarrRoot", '{s}')).'<br>';
 print '<b>'.$langs->trans("StepNb", 3).'</b>: ';
 print $langs->trans("RemoveLock", $dolibarrdataroot.'/install.lock').'<br>';
 print '<b>'.$langs->trans("StepNb", 4).'</b>: ';
 $fullurl = '<a href="'.DOL_URL_ROOT.'/install/" target="_blank">'.DOL_URL_ROOT.'/install/</a>';
-print $langs->trans("CallUpdatePage", $fullurl).'<br>';
+print str_replace('{s}', $fullurl, $langs->trans("CallUpdatePage", '{s}')).'<br>';
 print '<b>'.$langs->trans("StepNb", 5).'</b>: ';
 print $langs->trans("RestoreLock", $dolibarrdataroot.'/install.lock').'<br>';
 
@@ -133,8 +137,9 @@ print '<br>';
 
 print $langs->trans("AddExtensionThemeModuleOrOther").'<br>';
 print '<hr>';
-
-print $langs->trans("GoModuleSetupArea", DOL_URL_ROOT.'/admin/modules.php?mode=deploy', $langs->transnoentities("Home").' - '.$langs->transnoentities("Setup").' - '.$langs->transnoentities("Modules"));
+$texttoshow = $langs->trans("GoModuleSetupArea", DOL_URL_ROOT.'/admin/modules.php?mode=deploy', '{s2}');
+$texttoshow = str_replace('{s2}', img_picto('', 'tools', 'class="pictofixedwidth"').$langs->transnoentities("Home").' - '.$langs->transnoentities("Setup").' - '.$langs->transnoentities("Modules"), $texttoshow);
+print $texttoshow;
 
 // End of page
 llxFooter();

From 4dfc8bab93a5bef1ee226fb8496b953e1a0a15c9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 4 Aug 2021 12:28:13 +0200
Subject: [PATCH 1397/1497] Fix bad title

---
 htdocs/compta/prelevement/create.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index be18099b6a8..f2d232780c9 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -232,7 +232,7 @@ if ($nb) {
 	if ($pricetowithdraw) {
 		$title = print $langs->trans('BankToReceiveWithdraw').': ';
 		if ($type == 'bank-transfer') {
-			$title .= $langs->trans('BankToPayCreditTransfer').': ';
+			$title = $langs->trans('BankToPayCreditTransfer').': ';
 		}
 		print $title;
 		$form->select_comptes($conf->global->PRELEVEMENT_ID_BANKACCOUNT, 'id_bankaccount', 0, "courant=1");

From 6dc8024d8702925cba437ace802216612ad1eb95 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 4 Aug 2021 12:30:48 +0200
Subject: [PATCH 1398/1497] Fix title

---
 htdocs/compta/prelevement/create.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index f2d232780c9..72dfda2fe43 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -230,7 +230,7 @@ print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="type" value="'.$type.'">';
 if ($nb) {
 	if ($pricetowithdraw) {
-		$title = print $langs->trans('BankToReceiveWithdraw').': ';
+		$title = $langs->trans('BankToReceiveWithdraw').': ';
 		if ($type == 'bank-transfer') {
 			$title = $langs->trans('BankToPayCreditTransfer').': ';
 		}

From aaefb7b32495178fa9cafe172b20f107fc63f5bd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 4 Aug 2021 12:38:28 +0200
Subject: [PATCH 1399/1497] Fix css

---
 htdocs/compta/prelevement/create.php | 3 ++-
 htdocs/core/ajax/selectsearchbox.php | 6 +++---
 htdocs/core/search_page.php          | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index 72dfda2fe43..92ccd5f7bce 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -235,7 +235,8 @@ if ($nb) {
 			$title = $langs->trans('BankToPayCreditTransfer').': ';
 		}
 		print $title;
-		$form->select_comptes($conf->global->PRELEVEMENT_ID_BANKACCOUNT, 'id_bankaccount', 0, "courant=1");
+		print img_picto('', 'bank_account');
+		print $form->select_comptes($conf->global->PRELEVEMENT_ID_BANKACCOUNT, 'id_bankaccount', 0, "courant=1", 0, '', 0, '', 1);
 		print ' - ';
 
 		print $langs->trans('ExecutionDate').' ';
diff --git a/htdocs/core/ajax/selectsearchbox.php b/htdocs/core/ajax/selectsearchbox.php
index 509d10e7858..1814b476d06 100644
--- a/htdocs/core/ajax/selectsearchbox.php
+++ b/htdocs/core/ajax/selectsearchbox.php
@@ -110,13 +110,13 @@ if (!empty($conf->facture->enabled) && empty($conf->global->MAIN_SEARCHFORM_CUST
 }
 
 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_supplier_proposal').' '.$langs->trans("SearchIntoSupplierProposals", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/supplier_proposal/list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
+	$arrayresult['searchintosupplierpropal'] = array('position'=>100, 'img'=>'object_supplier_proposal', 'label'=>$langs->trans("SearchIntoSupplierProposals", $search_boxvalue), 'text'=>img_picto('', 'object_supplier_proposal').' '.$langs->trans("SearchIntoSupplierProposals", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/supplier_proposal/list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
 }
 if (((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) && $user->rights->fournisseur->commande->lire) || (!empty($conf->supplier_order->enabled) &&  $user->rights->supplier_order->lire)) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_ORDER_DISABLED)) {
-	$arrayresult['searchintosupplierorder'] = array('position'=>110, 'img'=>'object_order', 'label'=>$langs->trans("SearchIntoSupplierOrders", $search_boxvalue), 'text'=>img_picto('', 'object_supplier_order').' '.$langs->trans("SearchIntoSupplierOrders", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fourn/commande/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
+	$arrayresult['searchintosupplierorder'] = array('position'=>110, 'img'=>'object_supplier_order', 'label'=>$langs->trans("SearchIntoSupplierOrders", $search_boxvalue), 'text'=>img_picto('', 'object_supplier_order').' '.$langs->trans("SearchIntoSupplierOrders", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fourn/commande/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
 }
 if (((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) && $user->rights->fournisseur->facture->lire) || (!empty($conf->supplier_invoice->enabled) && $user->rights->supplier_invoice->lire)) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_INVOICE_DISABLED)) {
-	$arrayresult['searchintosupplierinvoice'] = array('position'=>120, 'img'=>'object_bill', 'label'=>$langs->trans("SearchIntoSupplierInvoices", $search_boxvalue), 'text'=>img_picto('', 'object_supplier_invoice').' '.$langs->trans("SearchIntoSupplierInvoices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fourn/facture/list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
+	$arrayresult['searchintosupplierinvoice'] = array('position'=>120, 'img'=>'object_supplier_invoice', 'label'=>$langs->trans("SearchIntoSupplierInvoices", $search_boxvalue), 'text'=>img_picto('', 'object_supplier_invoice').' '.$langs->trans("SearchIntoSupplierInvoices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fourn/facture/list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
 }
 
 // Customer payments
diff --git a/htdocs/core/search_page.php b/htdocs/core/search_page.php
index 8581776a2d8..2b82501208a 100644
--- a/htdocs/core/search_page.php
+++ b/htdocs/core/search_page.php
@@ -20,7 +20,7 @@
 
 /**
  *       \file       htdocs/core/search_page.php
- *       \brief      File to return a page with search boxes
+ *       \brief      File to return a page with the complete search form (all search input fields)
  */
 
 //if (! defined('NOREQUIREUSER'))   define('NOREQUIREUSER','1');	// Not disabled cause need to load personalized language
@@ -77,7 +77,7 @@ $hookmanager->initHooks(array('searchform'));
 // Define $searchform
 $searchform = '';
 
-if ($conf->use_javascript_ajax && 1 == 2) {   // select2 is ko with jmobile
+if ($conf->use_javascript_ajax && 1 == 2) {   // select2 is not best with smartphone
 	if (!is_object($form)) {
 		$form = new Form($db);
 	}

From bf49309d581c13e26965da0a13dd1fc90ca7e663 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 4 Aug 2021 12:41:27 +0200
Subject: [PATCH 1400/1497] Fix css

---
 htdocs/compta/prelevement/create.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index 92ccd5f7bce..1956cb14516 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -440,7 +440,7 @@ if ($resql) {
 			}
 			print '</td>';
 			// Amount
-			print '<td class="right">';
+			print '<td class="right amount">';
 			print price($obj->amount, 0, $langs, 0, 0, -1, $conf->currency);
 			print '</td>';
 			// Date

From a84c9943684ded3ea6117d53b2aaa546fb9c3732 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 4 Aug 2021 12:43:36 +0200
Subject: [PATCH 1401/1497] Fix no tooltip on link in error message

---
 htdocs/compta/prelevement/create.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index 1956cb14516..4c36922e5f4 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -96,7 +96,7 @@ if (empty($reshook)) {
 		$bank = new Account($db);
 		$bank->fetch($conf->global->{$default_account});
 		if (empty($bank->ics) || empty($bank->ics_transfer)) {
-			$errormessage = str_replace('{url}', $bank->getNomUrl(1), $langs->trans("ErrorICSmissing", '{url}'));
+			$errormessage = str_replace('{url}', $bank->getNomUrl(1, '', '', -1, 1), $langs->trans("ErrorICSmissing", '{url}'));
 			setEventMessages($errormessage, null, 'errors');
 			header("Location: ".DOL_URL_ROOT.'/compta/prelevement/create.php');
 			exit;

From 2f3105d884fd941ab0d446f66c8a6f3a6982eb6e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 4 Aug 2021 13:05:07 +0200
Subject: [PATCH 1402/1497] Add CSRF protection

---
 htdocs/admin/system/database-tables.php | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/htdocs/admin/system/database-tables.php b/htdocs/admin/system/database-tables.php
index 7535500e799..3d31c516858 100644
--- a/htdocs/admin/system/database-tables.php
+++ b/htdocs/admin/system/database-tables.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2003		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2004-2005	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2021	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2004		Sebastien Di Cintio		<sdicintio@ressource-toi.org>
  * Copyright (C) 2004		Benoit Mortier			<benoit.mortier@opensides.be>
  * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@inodbox.com>
@@ -21,9 +21,13 @@
 
 /**
  *	\file       htdocs/admin/system/database-tables.php
- *	\brief      Page with information on database tables
+ *	\brief      Page with information on database tables. Add also some maintenance action to convert tables.
  */
 
+if (! defined('CSRFCHECK_WITH_TOKEN')) {
+	define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
+}
+
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -126,14 +130,14 @@ if (!$base) {
 				print '</td>';
 				print '<td>'.$obj->Engine.'</td>';
 				if (isset($obj->Engine) && $obj->Engine == "MyISAM") {
-					print '<td><a class="reposition" href="database-tables.php?action=convert&amp;table='.$obj->Name.'">'.$langs->trans("Convert").' InnoDb</a></td>';
+					print '<td><a class="reposition" href="database-tables.php?action=convert&table='.urlencode($obj->Name).'&token='.newToken().'">'.$langs->trans("Convert").' InnoDb</a></td>';
 				} else {
 					print '<td>&nbsp;</td>';
 				}
 				print '<td>';
 				print $obj->Row_format;
 				if (isset($obj->Row_format) && (in_array($obj->Row_format, array("Compact")))) {
-					print '<br><a class="reposition" href="database-tables.php?action=convertdynamic&amp;table='.$obj->Name.'">'.$langs->trans("Convert").' Dynamic</a>';
+					print '<br><a class="reposition" href="database-tables.php?action=convertdynamic&table='.urlencode($obj->Name).'&token='.newToken().'">'.$langs->trans("Convert").' Dynamic</a>';
 				}
 				print '</td>';
 				print '<td align="right">'.$obj->Rows.'</td>';
@@ -145,7 +149,7 @@ if (!$base) {
 				print '<td align="right">'.$obj->Check_time.'</td>';
 				print '<td align="right">'.$obj->Collation;
 				if (isset($obj->Collation) && (in_array($obj->Collation, array("utf8mb4_general_ci", "utf8mb4_unicode_ci", "latin1_swedish_ci")))) {
-					print '<br><a class="reposition" href="database-tables.php?action=convertutf8&amp;table='.$obj->Name.'">'.$langs->trans("Convert").' UTF8</a>';
+					print '<br><a class="reposition" href="database-tables.php?action=convertutf8&table='.urlencode($obj->Name).'&token='.newtoken().'">'.$langs->trans("Convert").' UTF8</a>';
 				}
 				print '</td>';
 				print '</tr>';

From bec87f5739d65826d2221570ba70df2481ef7d43 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 4 Aug 2021 13:12:07 +0200
Subject: [PATCH 1403/1497] Fix translation ICS

---
 htdocs/compta/bank/card.php         | 10 +++++-----
 htdocs/langs/en_US/withdrawals.lang |  3 +--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index ea9f7799849..d1cc0413bfd 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -212,7 +212,7 @@ if (empty($reshook)) {
 		$object->ics = trim(GETPOST("ics", 'alpha'));
 		$object->ics_transfer = trim(GETPOST("ics_transfer", 'alpha'));
 
-		$account_number = GETPOST('account_number', 'alpha');
+		$account_number = GETPOST('account_number', 'alphanohtml');
 		if (empty($account_number) || $account_number == '-1') {
 			$object->account_number = '';
 		} else {
@@ -754,13 +754,13 @@ if ($action == 'create') {
 			print '</td></tr>';
 
 			if ($conf->prelevement->enabled) {
-				print '<tr><td>'.$langs->trans("ICS").'</td>';
+				print '<tr><td>'.$langs->trans("ICS").' ('.$langs->trans("StandingOrder").')</td>';
 				print '<td>'.$object->ics.'</td>';
 				print '</tr>';
 			}
 
 			if ($conf->paymentbybanktransfer->enabled) {
-				print '<tr><td>'.$langs->trans("ICSTransfer").'</td>';
+				print '<tr><td>'.$langs->trans("ICS").' ('.$langs->trans("BankTransfer").')</td>';
 				print '<td>'.$object->ics_transfer.'</td>';
 				print '</tr>';
 			}
@@ -1053,12 +1053,12 @@ if ($action == 'create') {
 			print '<td><input class="minwidth150 maxwidth200onsmartphone" maxlength="11" type="text" class="flat" name="bic" value="'.$object->bic.'"></td></tr>';
 
 			if ($conf->prelevement->enabled) {
-				print '<tr><td>'.$langs->trans("ICS").'</td>';
+				print '<tr><td>'.$langs->trans("ICS").' ('.$langs->trans("StandingOrder").')</td>';
 				print '<td><input class="minwidth150 maxwidth200onsmartphone" maxlength="32" type="text" class="flat" name="ics" value="'.$object->ics.'"></td></tr>';
 			}
 
 			if ($conf->paymentbybanktransfer->enabled) {
-				print '<tr><td>'.$langs->trans("ICSTransfer").'</td>';
+				print '<tr><td>'.$langs->trans("ICS").' ('.$langs->trans("BankTransfer").')</td>';
 				print '<td><input class="minwidth150 maxwidth200onsmartphone" maxlength="32" type="text" class="flat" name="ics_transfer" value="'.$object->ics_transfer.'"></td></tr>';
 			}
 
diff --git a/htdocs/langs/en_US/withdrawals.lang b/htdocs/langs/en_US/withdrawals.lang
index 7d5b57f7da9..a3773a427a1 100644
--- a/htdocs/langs/en_US/withdrawals.lang
+++ b/htdocs/langs/en_US/withdrawals.lang
@@ -133,8 +133,7 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI for direct debit
-ICSTransfer=Creditor Identifier CI for bank transfer
+ICS=Creditor Identifier - ICS
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date

From de228c568760e672d716c4d686dc89924fbb2e18 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 4 Aug 2021 13:18:03 +0200
Subject: [PATCH 1404/1497] Fix bad link. Can't delete SEPA bank transfer
 request

---
 htdocs/compta/prelevement/card.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/compta/prelevement/card.php b/htdocs/compta/prelevement/card.php
index a94d068603a..b03ed9d93e0 100644
--- a/htdocs/compta/prelevement/card.php
+++ b/htdocs/compta/prelevement/card.php
@@ -325,19 +325,19 @@ if ($id > 0 || $ref) {
 
 	// Actions
 	if ($action != 'settransmitted' && $action != 'setcredited') {
-		print "\n<div class=\"tabsAction\">\n";
+		print "\n".'<div class="tabsAction">'."\n";
 
 		if (empty($object->date_trans) && $user->rights->prelevement->bons->send) {
-			print "<a class=\"butAction\" href=\"card.php?action=settransmitted&token='.newToken().'&id=".$object->id."\">".$langs->trans("SetToStatusSent")."</a>";
+			print '<a class="butAction" href="card.php?action=settransmitted&token='.newToken().'&id='.$object->id.'">'.$langs->trans("SetToStatusSent").'</a>';
 		}
 
 		if (!empty($object->date_trans) && $object->date_credit == 0) {
-			print "<a class=\"butAction\" href=\"card.php?action=setcredited&token='.newToken().'&id=".$object->id."\">".$langs->trans("ClassCredited")."</a>";
+			print '<a class="butAction" href="card.php?action=setcredited&token='.newToken().'&id='.$object->id.'">'.$langs->trans("ClassCredited").'</a>';
 		}
 
-		print "<a class=\"butActionDelete\" href=\"card.php?action=delete&token='.newToken().'&id=".$object->id."\">".$langs->trans("Delete")."</a>";
+		print '<a class="butActionDelete" href="card.php?action=delete&token='.newToken().'&id='.$object->id.'">'.$langs->trans("Delete").'</a>';
 
-		print "</div>";
+		print '</div>';
 	}
 
 
@@ -413,7 +413,7 @@ if ($id > 0 || $ref) {
 			print "<td>";
 			print $ligne->LibStatut($obj->statut, 2);
 			print "&nbsp;";
-			print '<a href="'.DOL_URL_ROOT.'/compta/prelevement/line.php?id='.$obj->rowid.'&type='.$object->type.'">';
+			print '<a href="'.DOL_URL_ROOT.'/compta/prelevement/line.php?id='.$obj->rowid.'&type='.$object->type.'&token='.newtoken().'">';
 			print sprintf("%06s", $obj->rowid);
 			print '</a></td>';
 
@@ -434,7 +434,7 @@ if ($id > 0 || $ref) {
 					if ($obj->statut == 2) {
 						if ($user->rights->prelevement->bons->credit) {
 							//print '<a class="butActionDelete" href="line.php?action=rejet&id='.$obj->rowid.'">'.$langs->trans("StandingOrderReject").'</a>';
-							print '<a href="line.php?action=rejet&type='.$object->type.'&id='.$obj->rowid.'">'.$langs->trans("StandingOrderReject").'</a>';
+							print '<a href="line.php?action=rejet&type='.$object->type.'&id='.$obj->rowid.'&token='.newtoken().'">'.$langs->trans("StandingOrderReject").'</a>';
 						} else {
 							//print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans("StandingOrderReject").'</a>';
 						}

From 23ea8d2907671e27e2bf54d76258039e817585c3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 4 Aug 2021 13:22:24 +0200
Subject: [PATCH 1405/1497] Fix link into message

---
 htdocs/compta/prelevement/create.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index 4c36922e5f4..6f045f3ca74 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -125,9 +125,13 @@ if (empty($reshook)) {
 			}
 		} else {
 			if ($type != 'bank-transfer') {
-				setEventMessages($langs->trans("DirectDebitOrderCreated", $bprev->getNomUrl(1)), null);
+				$texttoshow = $langs->trans("DirectDebitOrderCreated", '{s}');
+				$texttoshow = str_replace('{s}', $bprev->getNomUrl(1), $texttoshow);
+				setEventMessages($texttoshow, null);
 			} else {
-				setEventMessages($langs->trans("CreditTransferOrderCreated", $bprev->getNomUrl(1)), null);
+				$texttoshow = $langs->trans("CreditTransferOrderCreated", '{s}');
+				$texttoshow = str_replace('{s}', $bprev->getNomUrl(1), $texttoshow);
+				setEventMessages($texttoshow, null);
 			}
 
 			header("Location: ".DOL_URL_ROOT.'/compta/prelevement/card.php?id='.$bprev->id);

From a9ced1098ddff4a689e23fac59290b286a992316 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 4 Aug 2021 13:51:54 +0200
Subject: [PATCH 1406/1497] Fix lang loaded

---
 htdocs/compta/prelevement/orders_list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/compta/prelevement/orders_list.php b/htdocs/compta/prelevement/orders_list.php
index 5c6f058bff1..3ca9ce32fbe 100644
--- a/htdocs/compta/prelevement/orders_list.php
+++ b/htdocs/compta/prelevement/orders_list.php
@@ -29,7 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.p
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array('banks', 'categories', 'widthdrawals'));
+$langs->loadLangs(array('banks', 'categories', 'withdrawals'));
 
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'directdebitcredittransferlist'; // To manage different context of search
 

From 58ca982e5596ec618675818a58a6b86fe1426a9b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 4 Aug 2021 14:01:57 +0200
Subject: [PATCH 1407/1497] Fix trans

---
 htdocs/commande/class/commande.class.php                   | 2 +-
 htdocs/knowledgemanagement/class/knowledgerecord.class.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 333d4e2ded6..65b446727e5 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -195,7 +195,7 @@ class Commande extends CommonOrder
 
 	/**
 	 * @var int	Date expected for delivery
-	 * @see delivery_date
+	 * @see $delivery_date
 	 * @deprecated
 	 */
 	public $date_livraison;
diff --git a/htdocs/knowledgemanagement/class/knowledgerecord.class.php b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
index 550ef976aba..dacdf57d3a8 100644
--- a/htdocs/knowledgemanagement/class/knowledgerecord.class.php
+++ b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
@@ -114,7 +114,7 @@ class KnowledgeRecord extends CommonObject
 		'answer' => array('type'=>'html', 'label'=>'Solution', 'enabled'=>'1', 'position'=>50, 'notnull'=>0, 'visible'=>3, 'csslist'=>'tdoverflow300'),
 		//'url' => array('type'=>'varchar(255)', 'label'=>'URL', 'enabled'=>'1', 'position'=>55, 'notnull'=>0, 'visible'=>-1, 'csslist'=>'tdoverflow200', 'help'=>'UrlForInfoPage'),
 		'fk_c_ticket_category' => array('type'=>'integer:CTicketCategory:ticket/class/cticketcategory.class.php', 'label'=>'GroupOfTicket', 'enabled'=>'$conf->ticket->enabled', 'position'=>512, 'notnull'=>0, 'visible'=>-1, 'help'=>'YouCanLinkArticleToATicketCategory'),
-		'status' => array('type'=>'integer', 'label'=>'Status', 'enabled'=>'1', 'position'=>1000, 'notnull'=>1, 'visible'=>1, 'default'=>0, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Draft', '1'=>'Valid'),),
+		'status' => array('type'=>'integer', 'label'=>'Status', 'enabled'=>'1', 'position'=>1000, 'notnull'=>1, 'visible'=>1, 'default'=>0, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Draft', '1'=>'Validated'),),
 	);
 	public $rowid;
 	public $ref;

From 841176fdfd0515035e444ac4f5b033c27ff82ef4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 4 Aug 2021 14:38:05 +0200
Subject: [PATCH 1408/1497] Fix set cookie with tag "secure" when https is
 forced.

---
 htdocs/main.inc.php      | 2 +-
 htdocs/takepos/index.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index e7fa5e33e39..49797b1e6e8 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -265,7 +265,7 @@ if (!empty($_POST["DOL_AUTOSET_COOKIE"])) {
 	$cookiename = $tmpautoset[0];
 	$cookievalue = json_encode($cookiearrayvalue);
 	//var_dump('setcookie cookiename='.$cookiename.' cookievalue='.$cookievalue);
-	setcookie($cookiename, empty($cookievalue) ? '' : $cookievalue, empty($cookievalue) ? 0 : (time() + (86400 * 354)), '/', null, false, true); // keep cookie 1 year and add tag httponly
+	setcookie($cookiename, empty($cookievalue) ? '' : $cookievalue, empty($cookievalue) ? 0 : (time() + (86400 * 354)), '/', null, (empty($dolibarr_main_force_https) ? false : true), true); // keep cookie 1 year and add tag httponly
 	if (empty($cookievalue)) {
 		unset($_COOKIE[$cookiename]);
 	}
diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index 1ddab39dcbe..e7b8b8af438 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -67,7 +67,7 @@ if ($_SESSION["takeposterminal"] == "") {
 
 if ($setterminal > 0) {
 	$_SESSION["takeposterminal"] = $setterminal;
-	setcookie("takeposterminal", $setterminal, (time() + (86400 * 354)), '/', null, false, true); // Permanent takeposterminal var in a cookie
+	setcookie("takeposterminal", $setterminal, (time() + (86400 * 354)), '/', null, (empty($dolibarr_main_force_https) ? false : true), true); // Permanent takeposterminal var in a cookie
 }
 
 if ($setcurrency != "") {

From c60927da61025442630295f011d6c89f859e8a1c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 4 Aug 2021 15:16:51 +0200
Subject: [PATCH 1409/1497] Add missing security info

---
 htdocs/admin/system/security.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/htdocs/admin/system/security.php b/htdocs/admin/system/security.php
index 79690032901..fe3c95d1d3e 100644
--- a/htdocs/admin/system/security.php
+++ b/htdocs/admin/system/security.php
@@ -88,10 +88,13 @@ if (function_exists('exec')) {
 }
 print '<br>';
 
-print "<strong>PHP safe_mode</strong> = ".(ini_get('safe_mode') ? ini_get('safe_mode') : yn(0)).' &nbsp; <span class="opacitymedium">'.$langs->trans("Deprecated")." (removed in PHP 5.4)</span><br>\n";
+print "<strong>PHP session.use_strict_mode</strong> = ".(ini_get('session.use_strict_mode') ? ini_get('session.use_strict_mode') : yn(0)).' &nbsp; <span class="opacitymedium">('.$langs->trans("RecommendedValueIs", '1').")</span><br>\n";
+print "<strong>PHP session.use_only_cookies</strong> = ".(ini_get('session.use_only_cookies') ? ini_get('session.use_only_cookies') : yn(0)).' &nbsp; <span class="opacitymedium">('.$langs->trans("RecommendedValueIs", '1').")</span><br>\n";
+print "<strong>PHP session.cookie_samesite</strong> = ".(ini_get('session.cookie_samesite') ? ini_get('session.cookie_samesite') : 'None').' &nbsp; <span class="opacitymedium">('.$langs->trans("RecommendedValueIs", 'Strict').")</span><br>\n";
 print "<strong>PHP open_basedir</strong> = ".(ini_get('open_basedir') ? ini_get('open_basedir') : yn(0).' &nbsp; <span class="opacitymedium">('.$langs->trans("RecommendedValueIs", $langs->transnoentitiesnoconv("ARestrictedPath").', '.$langs->transnoentitiesnoconv("Example").' '.$_SERVER["DOCUMENT_ROOT"]).')</span>')."<br>\n";
 print "<strong>PHP allow_url_fopen</strong> = ".(ini_get('allow_url_fopen') ? img_picto($langs->trans("YouShouldSetThisToOff"), 'warning').' '.ini_get('allow_url_fopen') : yn(0)).' &nbsp; <span class="opacitymedium">('.$langs->trans("RecommendedValueIs", $langs->transnoentitiesnoconv("No")).")</span><br>\n";
 print "<strong>PHP allow_url_include</strong> = ".(ini_get('allow_url_include') ? img_picto($langs->trans("YouShouldSetThisToOff"), 'warning').' '.ini_get('allow_url_include') : yn(0)).' &nbsp; <span class="opacitymedium">('.$langs->trans("RecommendedValueIs", $langs->transnoentitiesnoconv("No")).")</span><br>\n";
+print "<strong>PHP safe_mode</strong> = ".(ini_get('safe_mode') ? ini_get('safe_mode') : yn(0)).' &nbsp; <span class="opacitymedium">'.$langs->trans("Deprecated")." (removed in PHP 5.4)</span><br>\n";
 print "<strong>PHP disable_functions</strong> = ";
 $arrayoffunctionsdisabled = explode(',', ini_get('disable_functions'));
 $arrayoffunctionstodisable = explode(',', 'pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_get_handler,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_async_signals');

From ba403dd33fa070406b5b162a3f5b875a7324a80b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 4 Aug 2021 15:21:01 +0200
Subject: [PATCH 1410/1497] Add missing security info

---
 htdocs/admin/system/security.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/admin/system/security.php b/htdocs/admin/system/security.php
index fe3c95d1d3e..b745ad75818 100644
--- a/htdocs/admin/system/security.php
+++ b/htdocs/admin/system/security.php
@@ -90,6 +90,7 @@ print '<br>';
 
 print "<strong>PHP session.use_strict_mode</strong> = ".(ini_get('session.use_strict_mode') ? ini_get('session.use_strict_mode') : yn(0)).' &nbsp; <span class="opacitymedium">('.$langs->trans("RecommendedValueIs", '1').")</span><br>\n";
 print "<strong>PHP session.use_only_cookies</strong> = ".(ini_get('session.use_only_cookies') ? ini_get('session.use_only_cookies') : yn(0)).' &nbsp; <span class="opacitymedium">('.$langs->trans("RecommendedValueIs", '1').")</span><br>\n";
+print "<strong>PHP session.cookie_httponly</strong> = ".(ini_get('session.cookie_httponly') ? ini_get('session.cookie_httponly') : '').' &nbsp; <span class="opacitymedium">('.$langs->trans("RecommendedValueIs", '1').")</span><br>\n";
 print "<strong>PHP session.cookie_samesite</strong> = ".(ini_get('session.cookie_samesite') ? ini_get('session.cookie_samesite') : 'None').' &nbsp; <span class="opacitymedium">('.$langs->trans("RecommendedValueIs", 'Strict').")</span><br>\n";
 print "<strong>PHP open_basedir</strong> = ".(ini_get('open_basedir') ? ini_get('open_basedir') : yn(0).' &nbsp; <span class="opacitymedium">('.$langs->trans("RecommendedValueIs", $langs->transnoentitiesnoconv("ARestrictedPath").', '.$langs->transnoentitiesnoconv("Example").' '.$_SERVER["DOCUMENT_ROOT"]).')</span>')."<br>\n";
 print "<strong>PHP allow_url_fopen</strong> = ".(ini_get('allow_url_fopen') ? img_picto($langs->trans("YouShouldSetThisToOff"), 'warning').' '.ini_get('allow_url_fopen') : yn(0)).' &nbsp; <span class="opacitymedium">('.$langs->trans("RecommendedValueIs", $langs->transnoentitiesnoconv("No")).")</span><br>\n";

From a5d11a1ccfed1da3591ae8c92715ca6a7871b85e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 4 Aug 2021 15:46:00 +0200
Subject: [PATCH 1411/1497] Fix warning

---
 htdocs/admin/system/security.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/admin/system/security.php b/htdocs/admin/system/security.php
index b745ad75818..1ca4b95856e 100644
--- a/htdocs/admin/system/security.php
+++ b/htdocs/admin/system/security.php
@@ -249,7 +249,7 @@ if (empty($dolibarr_main_prod)) {
 }
 print '<br>';
 
-print '<strong>$dolibarr_nocsrfcheck</strong>: '.$dolibarr_nocsrfcheck;
+print '<strong>$dolibarr_nocsrfcheck</strong>: '.(empty($dolibarr_nocsrfcheck) ? '0' : $dolibarr_nocsrfcheck);
 if (!empty($dolibarr_nocsrfcheck)) {
 	print ' &nbsp; '.img_picto('', 'warning').' '.$langs->trans("IfYouAreOnAProductionSetThis", 0);
 }

From 76038e692dad59196d9b8e4789a836c57c9dce4b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 4 Aug 2021 20:07:12 +0200
Subject: [PATCH 1412/1497] NEW Use an ajax call for the clicktodial feature
 instead of href link.

---
 htdocs/core/js/lib_foot.js.php     | 190 ++++++++++++++++-------------
 htdocs/core/lib/admin.lib.php      |   2 +
 htdocs/core/lib/functions.lib.php  |  15 ++-
 htdocs/core/lib/functions2.lib.php |   4 +-
 4 files changed, 122 insertions(+), 89 deletions(-)

diff --git a/htdocs/core/js/lib_foot.js.php b/htdocs/core/js/lib_foot.js.php
index 00f161a31ef..74a7f543bfc 100644
--- a/htdocs/core/js/lib_foot.js.php
+++ b/htdocs/core/js/lib_foot.js.php
@@ -102,8 +102,7 @@ print "});\n";
 // Wrapper to manage dropdown
 if (!defined('JS_JQUERY_DISABLE_DROPDOWN')) {
 	print "\n/* JS CODE TO ENABLE dropdown (hamburger, linkto, ...) */\n";
-	print '
-              jQuery(document).ready(function () {
+	print '		jQuery(document).ready(function () {
 				  var lastopendropdown = null;
 
                   // Click onto the link "link to" or "hamburger", toggle dropdown
@@ -171,21 +170,19 @@ if (!defined('JS_JQUERY_DISABLE_DROPDOWN')) {
 // Wrapper to manage document_preview
 if ($conf->browser->layout != 'phone') {
 	print "\n/* JS CODE TO ENABLE document_preview */\n"; // Function document_preview is into header
-	print '
-                jQuery(document).ready(function () {
+	print '		jQuery(document).ready(function () {
 			        jQuery(".documentpreview").click(function () {
             		    console.log("We click on preview for element with href="+$(this).attr(\'href\')+" mime="+$(this).attr(\'mime\'));
             		    document_preview($(this).attr(\'href\'), $(this).attr(\'mime\'), \''.dol_escape_js($langs->transnoentities("Preview")).'\');
                 		return false;
         			});
-        		});
-           ' . "\n";
+		});'."\n";
 }
 
 // Code to manage reposition
 print "\n/* JS CODE TO ENABLE reposition management (does not work if a redirect is done after action of submission) */\n";
 print '
-			jQuery(document).ready(function() {
+	jQuery(document).ready(function() {
 				/* If page_y set, we set scollbar with it */
 				page_y=getParameterByName(\'page_y\', 0);				/* search in GET parameter */
 				if (page_y == 0) page_y = jQuery("#page_y").text();		/* search in POST parameter that is filed at bottom of page */
@@ -216,96 +213,123 @@ print '
 						}
 					}
 				});
-			});'."\n";
+	});'."\n";
 
-print "\n/* JS CODE TO ENABLE ClipBoard copy paste*/\n";
-print 'jQuery(\'.clipboardCPShowOnHover\').hover(
-			function() {
-				console.log("We hover a value with a copy paste feature");
-				$(this).children(".clipboardCPButton, .clipboardCPText").show();
-			},
-			function() {
-				console.log("We hover out the value with a copy paste feature");
-				$(this).children(".clipboardCPButton, .clipboardCPText").hide();
-			}
-		);';
-print 'jQuery(\'.clipboardCPButton, .clipboardCPValueToPrint\').click(function() {
-		/* console.log(this.parentNode); */
-		console.log("We click on a clipboardCPButton or clipboardCPValueToPrint class");
-		if (window.getSelection) {
-			selection = window.getSelection();
+// Code to manage Copy To Clipboard click
+print "\n/* JS CODE TO ENABLE ClipBoard copy paste */\n";
+print '
+	jQuery(document).ready(function() {
+				jQuery(\'.clipboardCPShowOnHover\').hover(
+					function() {
+						console.log("We hover a value with a copy paste feature");
+						$(this).children(".clipboardCPButton, .clipboardCPText").show();
+					},
+					function() {
+						console.log("We hover out the value with a copy paste feature");
+						$(this).children(".clipboardCPButton, .clipboardCPText").hide();
+					}
+				);
 
-			range = document.createRange();
-			range.selectNodeContents(this.parentNode.firstChild);
+				jQuery(\'.clipboardCPButton, .clipboardCPValueToPrint\').click(function() {
+					/* console.log(this.parentNode); */
+					console.log("We click on a clipboardCPButton or clipboardCPValueToPrint class");
+					if (window.getSelection) {
+						selection = window.getSelection();
 
-			selection.removeAllRanges();
-			selection.addRange( range );
-		}
-		document.execCommand( \'copy\' );
-		window.getSelection().removeAllRanges();
+						range = document.createRange();
+						range.selectNodeContents(this.parentNode.firstChild);
 
-		/* Show message */
-		var lastchild = this.parentNode.lastChild;
-		var tmp = lastchild.innerHTML
-		lastchild.innerHTML = \''.dol_escape_js($langs->trans('CopiedToClipboard')).'\';
-		setTimeout(() => { lastchild.innerHTML = tmp; }, 1000);
-	})'."\n";
+						selection.removeAllRanges();
+						selection.addRange( range );
+					}
+					document.execCommand( \'copy\' );
+					window.getSelection().removeAllRanges();
+
+					/* Show message */
+					var lastchild = this.parentNode.lastChild;
+					var tmp = lastchild.innerHTML
+					lastchild.innerHTML = \''.dol_escape_js($langs->trans('CopiedToClipboard')).'\';
+					setTimeout(() => { lastchild.innerHTML = tmp; }, 1000);
+				});
+	});'."\n";
+
+// Code to manage clicktodial
+print "\n/* JS CODE TO ENABLE clicktodial call of an URL */\n";
+print '
+	jQuery(document).ready(function() {
+		jQuery(".cssforclicktodial").click(function() {
+			event.preventDefault();
+			console.log("We click on a cssforclicktodial class with url="+this.href);
+			$.ajax({
+			  url: this.href,
+			  type: \'GET\',
+			  data: { token: \''.newToken().'\' }
+			}).done(function(xhr, textStatus, errorThrown) {
+			    /* do nothing */
+			}).fail(function(xhr, textStatus, errorThrown) {
+			    alert("Error: "+textStatus);
+			});
+			return false;
+		});
+	});'."\n";
 
 
+// Code to manage the confirm dialog box
 print "\n/* JS CODE TO ENABLE DIALOG CONFIRM POPUP ON ACTION BUTTON */\n";
-print '$( document ).ready(function() {
-	$(document).on("click", \'.butActionConfirm\', function(event) {
-		event.preventDefault();
+print '
+	jQuery(document).ready(function() {
+		$(document).on("click", \'.butActionConfirm\', function(event) {
+			event.preventDefault();
 
-		// I don\'t use jquery $(this).data(\'confirm-url\'); to get $(this).attr(\'data-confirm-url\'); because .data() can doesn\'t work with ajax
-		var confirmUrl  			= $(this).attr(\'data-confirm-url\');
-		var confirmTitle 			= $(this).attr(\'data-confirm-title\');
-		var confirmContent 			= $(this).attr(\'data-confirm-content\');
-		var confirmActionBtnLabel 	= $(this).attr(\'data-confirm-action-btn-label\');
-		var confirmCancelBtnLabel 	= $(this).attr(\'data-confirm-cancel-btn-label\');
-		var confirmModal	= $(this).attr(\'data-confirm-modal\');
-		if(confirmModal == undefined){ confirmModal = false; }
+			// I don\'t use jquery $(this).data(\'confirm-url\'); to get $(this).attr(\'data-confirm-url\'); because .data() can doesn\'t work with ajax
+			var confirmUrl  			= $(this).attr(\'data-confirm-url\');
+			var confirmTitle 			= $(this).attr(\'data-confirm-title\');
+			var confirmContent 			= $(this).attr(\'data-confirm-content\');
+			var confirmActionBtnLabel 	= $(this).attr(\'data-confirm-action-btn-label\');
+			var confirmCancelBtnLabel 	= $(this).attr(\'data-confirm-cancel-btn-label\');
+			var confirmModal	= $(this).attr(\'data-confirm-modal\');
+			if(confirmModal == undefined){ confirmModal = false; }
 
-		var confirmId = \'confirm-dialog-box\';
-		if($(this).attr(\'id\') != undefined){ var confirmId = confirmId + "-" + $(this).attr(\'id\'); }
-		if($("#" + confirmId)  != undefined) { $(\'#\' + confirmId).remove(); }
+			var confirmId = \'confirm-dialog-box\';
+			if($(this).attr(\'id\') != undefined){ var confirmId = confirmId + "-" + $(this).attr(\'id\'); }
+			if($("#" + confirmId)  != undefined) { $(\'#\' + confirmId).remove(); }
 
-		// Create modal box
+			// Create modal box
 
-		var $confirmBox = $(\'<div/>\', {
-			id: confirmId,
-			title: confirmTitle
-		}).appendTo(\'body\');
+			var $confirmBox = $(\'<div/>\', {
+				id: confirmId,
+				title: confirmTitle
+			}).appendTo(\'body\');
 
-		$confirmBox.dialog({
-			autoOpen: true,
-			modal: confirmModal,
-			//width: Math.min($( window ).width() - 50, 1700),
-			width: \'auto\',
-			dialogClass: \'confirm-dialog-box\',
-			buttons: [
-				{
-					text: confirmActionBtnLabel,
-					"class": \'ui-state-information\',
-					click: function () {
-					window.location.replace(confirmUrl);
-				}
+			$confirmBox.dialog({
+				autoOpen: true,
+				modal: confirmModal,
+				//width: Math.min($( window ).width() - 50, 1700),
+				width: \'auto\',
+				dialogClass: \'confirm-dialog-box\',
+				buttons: [
+					{
+						text: confirmActionBtnLabel,
+						"class": \'ui-state-information\',
+						click: function () {
+						window.location.replace(confirmUrl);
+					}
+					},
+					{
+						text: confirmCancelBtnLabel,
+						"class": \'ui-state-information\',
+						click: function () {
+						$(this).dialog("close");
+					}
+					}
+				],
+				close: function( event, ui ) {
+					$(\'#\'+confirmBox).remove();
 				},
-				{
-					text: confirmCancelBtnLabel,
-					"class": \'ui-state-information\',
-					click: function () {
-					$(this).dialog("close");
+				open: function( event, ui ) {
+					$confirmBox.html(confirmContent);
 				}
-				}
-			],
-			close: function( event, ui ) {
-				$(\'#\'+confirmBox).remove();
-			},
-			open: function( event, ui ) {
-				$confirmBox.html(confirmContent);
-			}
+			});
 		});
 	});
-});
 '."\n";
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index ae260171a0b..683b92fb8d9 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -123,6 +123,7 @@ function versioncompare($versionarray1, $versionarray2)
  *	Return version PHP
  *
  *	@return     array               Tableau de version (vermajeur,vermineur,autre)
+ *  @see versioncompare()
  */
 function versionphparray()
 {
@@ -133,6 +134,7 @@ function versionphparray()
  *	Return version Dolibarr
  *
  *	@return     array               Tableau de version (vermajeur,vermineur,autre)
+ *  @see versioncompare()
  */
 function versiondolibarrarray()
 {
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 62f4006c1de..899b3b0ffda 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3054,11 +3054,18 @@ function dol_print_phone($phone, $countrycode = '', $cid = 0, $socid = 0, $addli
 								'__PASS__'=>$clicktodial_password);
 			$url = make_substitutions($url, $substitarray);
 			$newphonesav = $newphone;
-			$newphone = '<a href="'.$url.'"';
-			if (!empty($conf->global->CLICKTODIAL_FORCENEWTARGET)) {
-				$newphone .= ' target="_blank"';
+			if (empty($conf->global->CLICKTODIAL_DO_NOT_USE_AJAX_CALL)) {
+				// Default and recommended: New method using ajax without submiting a page making a javascript history.go(-1) back
+				$newphone = '<a href="'.$url.'" class="cssforclicktodial"';	// Call of ajax is handled by the lib_foot.js.php on class 'cssforclicktodial'
+				$newphone .= '>'.$newphonesav.'</a>';
+			} else {
+				// Old method
+				$newphone = '<a href="'.$url.'"';
+				if (!empty($conf->global->CLICKTODIAL_FORCENEWTARGET)) {
+					$newphone .= ' target="_blank"';
+				}
+				$newphone .= '>'.$newphonesav.'</a>';
 			}
-			$newphone .= '>'.$newphonesav.'</a>';
 		}
 
 		//if (($cid || $socid) && ! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create)
diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index 0035688c66f..d79f688391d 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -1876,7 +1876,7 @@ function version_os($option = '')
  * 	Return PHP version
  *
  * 	@return		string			PHP version
- *  @see		versionphparray()
+ *  @see		versionphparray(), versioncompare()
  */
 function version_php()
 {
@@ -1887,7 +1887,7 @@ function version_php()
  * 	Return Dolibarr version
  *
  * 	@return		string			Dolibarr version
- *  @see		versiondolibarrarray()
+ *  @see		versiondolibarrarray(), versioncompare()
  */
 function version_dolibarr()
 {

From f6abeca2469b8f3fb765a96655209db5c5575bc2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 4 Aug 2021 20:18:14 +0200
Subject: [PATCH 1413/1497] Fix example

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

diff --git a/htdocs/admin/clicktodial.php b/htdocs/admin/clicktodial.php
index 9fd92f45faa..09ba880dd33 100644
--- a/htdocs/admin/clicktodial.php
+++ b/htdocs/admin/clicktodial.php
@@ -101,8 +101,8 @@ print '<br>';
 print $langs->trans("ClickToDialUrlDesc").'<br>';
 print '<br>';
 print '<span class="opacitymedium">';
-print $langs->trans("Example").':<br>';
-print 'http://myphoneserver/mypage?login=__LOGIN__&password=__PASS__&caller=__PHONEFROM__&called=__PHONETO__<br>';
+print $langs->trans("Examples").':<br>';
+print 'https://myphoneserver/mypage?login=__LOGIN__&password=__PASS__&caller=__PHONEFROM__&called=__PHONETO__<br>';
 print 'sip:__PHONETO__@my.sip.server';
 print '</span>';
 

From 965bdbb34260f0d4b27a13966b0464492b73d1ba Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 4 Aug 2021 23:08:57 +0200
Subject: [PATCH 1414/1497] Trans

---
 htdocs/langs/en_US/admin.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 76f5c18b70b..d4047e654d3 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1780,7 +1780,7 @@ ClickToDialSetup=Click To Dial module setup
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
 ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface, installed on the same computer as the browser, and called when you click on a link starting with "tel:" in your browser. If you need link that start with "sip:" or a full server solution (no need of local software installation), you must set this to "No" and fill next field.
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface, installed on the same computer as the browser, and called when you click on a link starting with "tel:" in your browser. If you need a link that start with "sip:" or a full server solution (no need of local software installation), you must set this to "No" and fill the next field.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Point of Sale
 CashDeskSetup=Point of Sales module setup

From 0a31f3dc1a77ef4468360629382e3231a59f4594 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 4 Aug 2021 23:11:59 +0200
Subject: [PATCH 1415/1497] FIX #18341 lang not loaded

---
 htdocs/admin/agenda_reminder.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/admin/agenda_reminder.php b/htdocs/admin/agenda_reminder.php
index b3a85d1fe4b..2b2da673202 100644
--- a/htdocs/admin/agenda_reminder.php
+++ b/htdocs/admin/agenda_reminder.php
@@ -226,6 +226,7 @@ if (empty($conf->cron->enabled)) {
 		// Get the max frequency of reminder
 		if ($job->id > 0) {
 			if ($job->status != $job::STATUS_ENABLED) {
+				$langs->load("cron");
 				print '<span class="opacitymedium warning">'.$langs->trans("JobXMustBeEnabled", $langs->transnoentitiesnoconv("sendEmailsReminder")).'</span>';
 			} else {
 				print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_AGENDA_REMINDER_EMAIL&amp;token='.newToken().'">'.img_picto($langs->trans('Enabled'), 'switch_on').'</a>';

From 5d717113be3586694ea199316c843363f9b8ca64 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 5 Aug 2021 11:20:43 +0200
Subject: [PATCH 1416/1497] Add language key

---
 htdocs/langs/en_US/languages.lang | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/langs/en_US/languages.lang b/htdocs/langs/en_US/languages.lang
index 373fdf2eab5..e3b6bed94c8 100644
--- a/htdocs/langs/en_US/languages.lang
+++ b/htdocs/langs/en_US/languages.lang
@@ -2,6 +2,7 @@
 Language_am_ET=Ethiopian
 Language_ar_AR=Arabic
 Language_ar_EG=Arabic (Egypt)
+Language_ar_MA=Arabic (Moroco)
 Language_ar_SA=Arabic
 Language_ar_TN=Arabic (Tunisia)
 Language_ar_IQ=Arabic (Iraq)

From 047bbbb298a1da8393f07e1385fb13042751b2a8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 5 Aug 2021 14:42:28 +0200
Subject: [PATCH 1417/1497] NEW Can set/unset the usual working day of the week

---
 htdocs/admin/holiday.php           | 376 +++++++++++++++++------------
 htdocs/core/ajax/constantonoff.php |   8 +-
 htdocs/core/js/lib_head.js.php     |  23 +-
 htdocs/core/lib/ajax.lib.php       |  15 +-
 htdocs/core/lib/date.lib.php       |  12 +-
 htdocs/langs/en_US/holiday.lang    |   1 +
 6 files changed, 265 insertions(+), 170 deletions(-)

diff --git a/htdocs/admin/holiday.php b/htdocs/admin/holiday.php
index f6ac529466e..c9214742d13 100644
--- a/htdocs/admin/holiday.php
+++ b/htdocs/admin/holiday.php
@@ -274,147 +274,141 @@ print '</div>';
 print '<br>';
 
 
-if ($conf->global->MAIN_FEATURES_LEVEL < 2) {
-	print dol_get_fiche_end();
-	// End of page
-	llxFooter();
-	$db->close();
-	exit;
-}
-
 /*
  *  Documents models for Holidays
  */
 
-print load_fiche_titre($langs->trans("TemplatePDFHolidays"), '', '');
+if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
+	print load_fiche_titre($langs->trans("TemplatePDFHolidays"), '', '');
 
-// Defined model definition table
-$def = array();
-$sql = "SELECT nom";
-$sql .= " FROM ".MAIN_DB_PREFIX."document_model";
-$sql .= " WHERE type = '".$db->escape($type)."'";
-$sql .= " AND entity = ".$conf->entity;
-$resql = $db->query($sql);
-if ($resql) {
-	$i = 0;
-	$num_rows = $db->num_rows($resql);
-	while ($i < $num_rows) {
-		$array = $db->fetch_array($resql);
-		array_push($def, $array[0]);
-		$i++;
+	// Defined model definition table
+	$def = array();
+	$sql = "SELECT nom";
+	$sql .= " FROM ".MAIN_DB_PREFIX."document_model";
+	$sql .= " WHERE type = '".$db->escape($type)."'";
+	$sql .= " AND entity = ".$conf->entity;
+	$resql = $db->query($sql);
+	if ($resql) {
+		$i = 0;
+		$num_rows = $db->num_rows($resql);
+		while ($i < $num_rows) {
+			$array = $db->fetch_array($resql);
+			array_push($def, $array[0]);
+			$i++;
+		}
+	} else {
+		dol_print_error($db);
 	}
-} else {
-	dol_print_error($db);
-}
 
 
-print '<div class="div-table-responsive-no-min">';
-print '<table class="noborder centpercent">';
-print '<tr class="liste_titre">';
-print '<td>'.$langs->trans("Name").'</td>';
-print '<td>'.$langs->trans("Description").'</td>';
-print '<td align="center" width="60">'.$langs->trans("Status")."</td>\n";
-print '<td align="center" width="60">'.$langs->trans("Default")."</td>\n";
-print '<td align="center" width="80">'.$langs->trans("ShortInfo").'</td>';
-print '<td align="center" width="80">'.$langs->trans("Preview").'</td>';
-print "</tr>\n";
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print '<td>'.$langs->trans("Name").'</td>';
+	print '<td>'.$langs->trans("Description").'</td>';
+	print '<td align="center" width="60">'.$langs->trans("Status")."</td>\n";
+	print '<td align="center" width="60">'.$langs->trans("Default")."</td>\n";
+	print '<td align="center" width="80">'.$langs->trans("ShortInfo").'</td>';
+	print '<td align="center" width="80">'.$langs->trans("Preview").'</td>';
+	print "</tr>\n";
 
-clearstatcache();
+	clearstatcache();
 
-foreach ($dirmodels as $reldir) {
-	foreach (array('', '/doc') as $valdir) {
-		$realpath = $reldir."core/modules/holiday".$valdir;
-		$dir = dol_buildpath($realpath);
+	foreach ($dirmodels as $reldir) {
+		foreach (array('', '/doc') as $valdir) {
+			$realpath = $reldir."core/modules/holiday".$valdir;
+			$dir = dol_buildpath($realpath);
 
-		if (is_dir($dir)) {
-			$handle = opendir($dir);
-			if (is_resource($handle)) {
-				while (($file = readdir($handle)) !== false) {
-					$filelist[] = $file;
-				}
-				closedir($handle);
-				arsort($filelist);
+			if (is_dir($dir)) {
+				$handle = opendir($dir);
+				if (is_resource($handle)) {
+					while (($file = readdir($handle)) !== false) {
+						$filelist[] = $file;
+					}
+					closedir($handle);
+					arsort($filelist);
 
-				foreach ($filelist as $file) {
-					if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file)) {
-						if (file_exists($dir.'/'.$file)) {
-							$name = substr($file, 4, dol_strlen($file) - 16);
-							$classname = substr($file, 0, dol_strlen($file) - 12);
+					foreach ($filelist as $file) {
+						if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file)) {
+							if (file_exists($dir.'/'.$file)) {
+								$name = substr($file, 4, dol_strlen($file) - 16);
+								$classname = substr($file, 0, dol_strlen($file) - 12);
 
-							require_once $dir.'/'.$file;
-							$module = new $classname($db);
+								require_once $dir.'/'.$file;
+								$module = new $classname($db);
 
-							$modulequalified = 1;
-							if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
-								$modulequalified = 0;
-							}
-							if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
-								$modulequalified = 0;
-							}
-
-							if ($modulequalified) {
-								print '<tr class="oddeven"><td width="100">';
-								print (empty($module->name) ? $name : $module->name);
-								print "</td><td>\n";
-								if (method_exists($module, 'info')) {
-									print $module->info($langs);
-								} else {
-									print $module->description;
+								$modulequalified = 1;
+								if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+									$modulequalified = 0;
+								}
+								if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+									$modulequalified = 0;
 								}
-								print '</td>';
 
-								// Active
-								if (in_array($name, $def)) {
-									print '<td class="center">'."\n";
-									print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=del&value='.$name.'">';
-									print img_picto($langs->trans("Enabled"), 'switch_on');
-									print '</a>';
+								if ($modulequalified) {
+									print '<tr class="oddeven"><td width="100">';
+									print (empty($module->name) ? $name : $module->name);
+									print "</td><td>\n";
+									if (method_exists($module, 'info')) {
+										print $module->info($langs);
+									} else {
+										print $module->description;
+									}
 									print '</td>';
-								} else {
-									print '<td class="center">'."\n";
-									print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
-									print "</td>";
+
+									// Active
+									if (in_array($name, $def)) {
+										print '<td class="center">'."\n";
+										print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=del&value='.$name.'">';
+										print img_picto($langs->trans("Enabled"), 'switch_on');
+										print '</a>';
+										print '</td>';
+									} else {
+										print '<td class="center">'."\n";
+										print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+										print "</td>";
+									}
+
+									// Default
+									print '<td class="center">';
+									if ($conf->global->HOLIDAY_ADDON_PDF == $name) {
+										print img_picto($langs->trans("Default"), 'on');
+									} else {
+										print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+									}
+									print '</td>';
+
+									// Info
+									$htmltooltip = ''.$langs->trans("Name").': '.$module->name;
+									$htmltooltip .= '<br>'.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
+									if ($module->type == 'pdf') {
+										$htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
+									}
+									$htmltooltip .= '<br>'.$langs->trans("Path").': '.preg_replace('/^\//', '', $realpath).'/'.$file;
+
+									$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
+									$htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
+									$htmltooltip .= '<br>'.$langs->trans("PaymentMode").': '.yn($module->option_modereg, 1, 1);
+									$htmltooltip .= '<br>'.$langs->trans("PaymentConditions").': '.yn($module->option_condreg, 1, 1);
+									$htmltooltip .= '<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang, 1, 1);
+									$htmltooltip .= '<br>'.$langs->trans("WatermarkOnDraftOrders").': '.yn($module->option_draft_watermark, 1, 1);
+
+
+									print '<td class="center">';
+									print $form->textwithpicto('', $htmltooltip, 1, 0);
+									print '</td>';
+
+									// Preview
+									print '<td class="center">';
+									if ($module->type == 'pdf') {
+										print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
+									} else {
+										print img_object($langs->trans("PreviewNotAvailable"), 'generic');
+									}
+									print '</td>';
+
+									print "</tr>\n";
 								}
-
-								// Default
-								print '<td class="center">';
-								if ($conf->global->HOLIDAY_ADDON_PDF == $name) {
-									print img_picto($langs->trans("Default"), 'on');
-								} else {
-									print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
-								}
-								print '</td>';
-
-								// Info
-								$htmltooltip = ''.$langs->trans("Name").': '.$module->name;
-								$htmltooltip .= '<br>'.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
-								if ($module->type == 'pdf') {
-									$htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
-								}
-								$htmltooltip .= '<br>'.$langs->trans("Path").': '.preg_replace('/^\//', '', $realpath).'/'.$file;
-
-								$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
-								$htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
-								$htmltooltip .= '<br>'.$langs->trans("PaymentMode").': '.yn($module->option_modereg, 1, 1);
-								$htmltooltip .= '<br>'.$langs->trans("PaymentConditions").': '.yn($module->option_condreg, 1, 1);
-								$htmltooltip .= '<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang, 1, 1);
-								$htmltooltip .= '<br>'.$langs->trans("WatermarkOnDraftOrders").': '.yn($module->option_draft_watermark, 1, 1);
-
-
-								print '<td class="center">';
-								print $form->textwithpicto('', $htmltooltip, 1, 0);
-								print '</td>';
-
-								// Preview
-								print '<td class="center">';
-								if ($module->type == 'pdf') {
-									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
-								} else {
-									print img_object($langs->trans("PreviewNotAvailable"), 'generic');
-								}
-								print '</td>';
-
-								print "</tr>\n";
 							}
 						}
 					}
@@ -422,11 +416,11 @@ foreach ($dirmodels as $reldir) {
 			}
 		}
 	}
-}
 
-print '</table>';
-print '</div>';
-print "<br>";
+	print '</table>';
+	print '</div>';
+	print "<br>";
+}
 
 
 /*
@@ -446,34 +440,118 @@ print '<td>'.$langs->trans("Parameter").'</td>';
 print '<td align="center" width="60">'.$langs->trans("Value").'</td>';
 print "</tr>\n";
 
-$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>';
+/*var_dump($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_MONDAY);
+var_dump($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_FRIDAY);
+var_dump($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY);
+var_dump($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY);
+*/
+if (!isset($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY)) {
+	$conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY = 1;
 }
-$htmltext .= '</i>';
+if (!isset($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY)) {
+	$conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY = 1;
+}
+/*
+var_dump($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_MONDAY);
+var_dump($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_FRIDAY);
+var_dump($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY);
+var_dump($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY);
+*/
 
-print '<tr class="oddeven"><td colspan="2">';
-print $form->textwithpicto($langs->trans("FreeLegalTextOnHolidays"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext, 1, 'help', '', 0, 2, 'tooltiphelp');
-print '<br>';
-$variablename = 'HOLIDAY_FREE_TEXT';
-if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) {
-	print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
+// Set working days
+print '<tr class="oddeven">';
+print "<td>".$langs->trans("XIsAUsualNonWorkingDay", $langs->transnoentitiesnoconv("Monday"))."</td>";
+print '<td class="center">';
+if ($conf->use_javascript_ajax) {
+	print ajax_constantonoff('MAIN_NON_WORKING_DAYS_INCLUDE_MONDAY', array(), null, 0);
 } else {
-	include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-	$doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
-	print $doleditor->Create();
+	if (!empty($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_MONDAY)) {
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_other&MAIN_NON_WORKING_DAYS_INCLUDE_MONDAY=1">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
+	} else {
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_other&MAIN_NON_WORKING_DAYS_INCLUDE_MONDAY=0">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+	}
 }
-print '</td></tr>'."\n";
+print "</td>";
+print "</tr>";
 
-//Use draft Watermark
+// Set working days
+print '<tr class="oddeven">';
+print "<td>".$langs->trans("XIsAUsualNonWorkingDay", $langs->transnoentitiesnoconv("Friday"))."</td>";
+print '<td class="center">';
+if ($conf->use_javascript_ajax) {
+	print ajax_constantonoff('MAIN_NON_WORKING_DAYS_INCLUDE_FRIDAY', array(), null, 0);
+} else {
+	if (!empty($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_FRIDAY)) {
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_other&MAIN_NON_WORKING_DAYS_INCLUDE_FRIDAY=1">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
+	} else {
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_other&MAIN_NON_WORKING_DAYS_INCLUDE_FRIDAY=0">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+	}
+}
+print "</td>";
+print "</tr>";
 
-print '<tr class="oddeven"><td>';
-print $form->textwithpicto($langs->trans("WatermarkOnDraftHolidayCards"), $htmltext, 1, 'help', '', 0, 2, 'watermarktooltip').'<br>';
-print '</td><td>';
-print '<input class="flat minwidth200" type="text" name="HOLIDAY_DRAFT_WATERMARK" value="'.$conf->global->HOLIDAY_DRAFT_WATERMARK.'">';
-print '</td></tr>'."\n";
+// Set working days
+print '<tr class="oddeven">';
+print "<td>".$langs->trans("XIsAUsualNonWorkingDay", $langs->transnoentitiesnoconv("Saturday"))."</td>";
+print '<td class="center">';
+if ($conf->use_javascript_ajax) {
+	print ajax_constantonoff('MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY', array(), null, 0, 0, 0, 2, 0, 1);
+} else {
+	if (!empty($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY)) {
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_other&MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY=1">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
+	} else {
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_other&MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY=0">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+	}
+}
+print "</td>";
+print "</tr>";
+
+// Set working days
+print '<tr class="oddeven">';
+print "<td>".$langs->trans("XIsAUsualNonWorkingDay", $langs->transnoentitiesnoconv("Sunday"))."</td>";
+print '<td class="center">';
+if ($conf->use_javascript_ajax) {
+	print ajax_constantonoff('MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY', array(), null, 0, 0, 0, 2, 0, 1);
+} else {
+	if (!empty($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY)) {
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_other&MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY=1">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
+	} else {
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_other&MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY=0">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+	}
+}
+print "</td>";
+print "</tr>";
+
+if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
+	$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>';
+	}
+	$htmltext .= '</i>';
+
+	print '<tr class="oddeven"><td colspan="2">';
+	print $form->textwithpicto($langs->trans("FreeLegalTextOnHolidays"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext, 1, 'help', '', 0, 2, 'tooltiphelp');
+	print '<br>';
+	$variablename = 'HOLIDAY_FREE_TEXT';
+	if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) {
+		print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
+	} else {
+		include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+		$doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
+		print $doleditor->Create();
+	}
+	print '</td></tr>'."\n";
+
+	//Use draft Watermark
+
+	print '<tr class="oddeven"><td>';
+	print $form->textwithpicto($langs->trans("WatermarkOnDraftHolidayCards"), $htmltext, 1, 'help', '', 0, 2, 'watermarktooltip').'<br>';
+	print '</td><td>';
+	print '<input class="flat minwidth200" type="text" name="HOLIDAY_DRAFT_WATERMARK" value="'.$conf->global->HOLIDAY_DRAFT_WATERMARK.'">';
+	print '</td></tr>'."\n";
+}
 
 print '</table>';
 print '</div>';
diff --git a/htdocs/core/ajax/constantonoff.php b/htdocs/core/ajax/constantonoff.php
index 60684c1520b..b8beec3111a 100644
--- a/htdocs/core/ajax/constantonoff.php
+++ b/htdocs/core/ajax/constantonoff.php
@@ -1,5 +1,6 @@
 <?php
-/* Copyright (C) 2011-2015 Regis Houssin  <regis.houssin@inodbox.com>
+/* Copyright (C) 2011-2015 Regis Houssin <regis.houssin@inodbox.com>
+ * Copyright (C) 2021      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
@@ -47,6 +48,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 
 $action = GETPOST('action', 'aZ09'); // set or del
 $name = GETPOST('name', 'alpha');
+$entity = GETPOST('entity', 'int');
+$value = ((GETPOST('value', 'int') || GETPOST('value', 'int') == '0') ? GETPOST('value', 'int') : 1);
 
 
 /*
@@ -64,9 +67,6 @@ top_httphead();
 
 // Registering the new value of constant
 if (!empty($action) && !empty($name)) {
-	$entity = GETPOST('entity', 'int');
-	$value = (GETPOST('value') ?GETPOST('value') : 1);
-
 	if ($user->admin) {
 		if ($action == 'set') {
 			dolibarr_set_const($db, $name, $value, 'chaine', 0, '', $entity);
diff --git a/htdocs/core/js/lib_head.js.php b/htdocs/core/js/lib_head.js.php
index db63b1a75d4..0d5905b4351 100644
--- a/htdocs/core/js/lib_head.js.php
+++ b/htdocs/core/js/lib_head.js.php
@@ -549,20 +549,27 @@ function hideMessage(fieldId,message) {
  * @param	int		strict		Strict
  * @param   int     forcereload Force reload
  * @param   int     userid      User id
+ * @param	int		value       Value to set
  * @param   string  token       Token
  */
-function setConstant(url, code, input, entity, strict, forcereload, userid, token) {
+function setConstant(url, code, input, entity, strict, forcereload, userid, token, value) {
 	var saved_url = url; /* avoid undefined url */
 	$.post( url, {
 		action: "set",
 		name: code,
 		entity: entity,
-		token: token
+		token: token,
+		value: value
 	},
 	function() {	/* handler for success of post */
-		console.log("url request success forcereload="+forcereload);
-		$("#set_" + code).hide();
-		$("#del_" + code).show();
+		console.log("url request success forcereload="+forcereload+" value="+value);
+		if (value == 0) {
+			$("#set_" + code).show();
+			$("#del_" + code).hide();
+		} else {
+			$("#set_" + code).hide();
+			$("#del_" + code).show();
+		}
 		$.each(input, function(type, data) {
 			// Enable another element
 			if (type == "disabled" && strict != 1) {
@@ -610,7 +617,7 @@ function setConstant(url, code, input, entity, strict, forcereload, userid, toke
 		if (forcereload) {
 			location.reload();
 		}
-	}).fail(function(error) { location.reload(); });	/* When it fails, we always force reload to have setEventErrorMEssage in session visible */
+	}).fail(function(error) { location.reload(); });	/* When it fails, we always force reload to have setEventErrorMessages in session visible */
 }
 
 /*
@@ -681,7 +688,7 @@ function delConstant(url, code, input, entity, strict, forcereload, userid, toke
 		if (forcereload) {
 			location.reload();
 		}
-	}).fail(function(error) { location.reload(); });	/* When it fails, we always force reload to have setEventErrorMEssage in session visible */
+	}).fail(function(error) { location.reload(); });	/* When it fails, we always force reload to have setEventErrorMessages in session visible */
 }
 
 /*
@@ -716,7 +723,7 @@ function confirmConstantAction(action, url, code, input, box, entity, yesButton,
 						text : yesButton,
 						click : function() {
 							if (action == "set") {
-								setConstant(url, code, input, entity, strict, 0, userid, token);
+								setConstant(url, code, input, entity, strict, 0, userid, token, 1);
 							} else if (action == "del") {
 								delConstant(url, code, input, entity, strict, 0, userid, token);
 							}
diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index 99cf4e4f8d1..b59b40b8c9d 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -540,14 +540,15 @@ function ajax_combobox($htmlname, $events = array(), $minLengthToAutocomplete =
  * 	@param	string	$code					Name of constant
  * 	@param	array	$input					Array of complementary actions to do if success ("disabled"|"enabled'|'set'|'del') => CSS element to switch, 'alert' => message to show, ... Example: array('disabled'=>array(0=>'cssid'))
  * 	@param	int		$entity					Entity. Current entity is used if null.
- *  @param	int		$revertonoff			Revert on/off
+ *  @param	int		$revertonoff			1=Revert on/off
  *  @param	int		$strict					Use only "disabled" with delConstant and "enabled" with setConstant
  *  @param	int		$forcereload			Force to reload page if we click/change value (this is supported only when there is no 'alert' option in input)
  *  @param	string	$marginleftonlyshort	1 = Add a short left margin on picto, 2 = Add a larger left margin on picto, 0 = No left margin. Works for fontawesome picto only.
  *  @param	int		$forcenoajax			1 = Force to use a ahref link instead of ajax code.
+ *  @param	int		$setzeroinsteadofdel	1 = Set constantto '0' instead of deleting it
  * 	@return	string
  */
-function ajax_constantonoff($code, $input = array(), $entity = null, $revertonoff = 0, $strict = 0, $forcereload = 0, $marginleftonlyshort = 2, $forcenoajax = 0)
+function ajax_constantonoff($code, $input = array(), $entity = null, $revertonoff = 0, $strict = 0, $forcereload = 0, $marginleftonlyshort = 2, $forcenoajax = 0, $setzeroinsteadofdel = 0)
 {
 	global $conf, $langs, $user;
 
@@ -593,9 +594,13 @@ function ajax_constantonoff($code, $input = array(), $entity = null, $revertonof
 						if (input.alert.del.yesButton) yesButton = input.alert.del.yesButton;
 						if (input.alert.del.noButton)  noButton = input.alert.del.noButton;
 						confirmConstantAction("del", url, code, input, input.alert.del, entity, yesButton, noButton, strict, userid, token);
-					} else {
-						delConstant(url, code, input, entity, 0, '.$forcereload.', userid, token);
-					}
+					} else {';
+		if (empty($setzeroinsteadofdel)) {
+			$out .=' 	delConstant(url, code, input, entity, 0, '.$forcereload.', userid, token);';
+		} else {
+			$out .=' 	setConstant(url, code, input, entity, 0, '.$forcereload.', userid, token, 0);';
+		}
+		$out .= '	}
 				});
 			});
 		</script>'."\n";
diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php
index fe21071901a..8fe9352457b 100644
--- a/htdocs/core/lib/date.lib.php
+++ b/htdocs/core/lib/date.lib.php
@@ -668,15 +668,16 @@ function getGMTEasterDatetime($year)
  *
  *  @param	int			$timestampStart		Timestamp start (UTC with hour, min, sec = 0)
  *  @param	int			$timestampEnd		Timestamp end (UTC with hour, min, sec = 0)
- *  @param	string			$country_code		Country code
- *  @param	int			$lastday		Last day is included, 0: no, 1:yes
+ *  @param	string		$country_code		Country code
+ *  @param	int			$lastday			Last day is included, 0: no, 1:yes
  *  @param	int			$includesaturday	Include saturday as non working day (-1=use setup, 0=no, 1=yes)
  *  @param	int			$includesunday		Include sunday as non working day (-1=use setup, 0=no, 1=yes)
  *  @param	int			$includefriday		Include friday as non working day (-1=use setup, 0=no, 1=yes)
- *  @return	int|string					Number of non working days or error message string if error
+ *  @param	int			$includemonday		Include monday as non working day (-1=use setup, 0=no, 1=yes)
+ *  @return	int|string						Number of non working days or error message string if error
  *  @see num_between_day(), num_open_day()
  */
-function num_public_holiday($timestampStart, $timestampEnd, $country_code = '', $lastday = 0, $includesaturday = -1, $includesunday = -1, $includefriday = -1)
+function num_public_holiday($timestampStart, $timestampEnd, $country_code = '', $lastday = 0, $includesaturday = -1, $includesunday = -1, $includefriday = -1, $includemonday = -1)
 {
 	global $db, $conf, $mysoc;
 
@@ -690,6 +691,9 @@ function num_public_holiday($timestampStart, $timestampEnd, $country_code = '',
 	if (empty($country_code)) {
 		$country_code = $mysoc->country_code;
 	}
+	if ($includemonday < 0) {
+		$includemonday = (isset($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_MONDAY) ? $conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_MONDAY : 0);
+	}
 	if ($includefriday < 0) {
 		$includefriday = (isset($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_FRIDAY) ? $conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_FRIDAY : 0);
 	}
diff --git a/htdocs/langs/en_US/holiday.lang b/htdocs/langs/en_US/holiday.lang
index 0e6b1d69b36..dfbd97cdbdc 100644
--- a/htdocs/langs/en_US/holiday.lang
+++ b/htdocs/langs/en_US/holiday.lang
@@ -133,3 +133,4 @@ WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
 HolidaysToApprove=Holidays to approve
 NobodyHasPermissionToValidateHolidays=Nobody has permission to validate holidays
 HolidayBalanceMonthlyUpdate=Monthly update of holiday balance
+XIsAUsualNonWorkingDay=%s is usualy a NON working day
\ No newline at end of file

From fca3980dce3b2a5fa0b07340155786158f49ff84 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 5 Aug 2021 15:15:03 +0200
Subject: [PATCH 1418/1497] FIX Can't remove a permission of a group

---
 htdocs/user/group/perms.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php
index 9fc4426ecac..3ccbcf94d05 100644
--- a/htdocs/user/group/perms.php
+++ b/htdocs/user/group/perms.php
@@ -315,7 +315,7 @@ if ($object->id > 0) {
 				if (in_array($obj->id, $permsgroupbyentity[$entity])) {
 					// Own permission by group
 					if ($caneditperms) {
-						print '<td class="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'">';
+						print '<td class="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'&amp;token='.newToken().'">';
 						//print img_edit_remove($langs->trans("Remove"));
 						print img_picto($langs->trans("Remove"), 'switch_on');
 						print '</a></td>';

From 591b8acd513eb75483e336f8a1c871bbf20b1853 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 5 Aug 2021 15:57:51 +0200
Subject: [PATCH 1419/1497] FIX show info of company into user dropdown

---
 htdocs/main.inc.php | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 2ceb2175799..e4677499bd6 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -2015,27 +2015,25 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
 	$dropdownBody .= '<span id="topmenulogincompanyinfo-btn"><i class="fa fa-caret-right"></i> '.$langs->trans("ShowCompanyInfos").'</span>';
 	$dropdownBody .= '<div id="topmenulogincompanyinfo" >';
 
-	if (!empty($conf->global->MAIN_INFO_SIREN)) {
-		$dropdownBody .= '<br><b>'.$langs->transcountry("ProfId1Short", $mysoc->country_code).'</b>: <span>'.showValueWithClipboardCPButton($conf->global->MAIN_INFO_SIREN).'</span>';
+	if ($langs->transcountry("ProfId1", $mysoc->country_code) != '-') {
+		$dropdownBody .= '<br><b>'.$langs->transcountry("ProfId1", $mysoc->country_code).'</b>: <span>'.showValueWithClipboardCPButton($conf->global->MAIN_INFO_SIREN).'</span>';
 	}
-	if (!empty($conf->global->MAIN_INFO_SIRET)) {
-		$dropdownBody .= '<br><b>'.$langs->transcountry("ProfId2Short", $mysoc->country_code).'</b>: <span>'.showValueWithClipboardCPButton($conf->global->MAIN_INFO_SIRET).'</span>';
+	if ($langs->transcountry("ProfId2", $mysoc->country_code) != '-') {
+		$dropdownBody .= '<br><b>'.$langs->transcountry("ProfId2", $mysoc->country_code).'</b>: <span>'.showValueWithClipboardCPButton($conf->global->MAIN_INFO_SIRET).'</span>';
 	}
-	if (!empty($conf->global->MAIN_INFO_APE)) {
-		$dropdownBody .= '<br><b>'.$langs->transcountry("ProfId3Short", $mysoc->country_code).'</b>: <span>'.showValueWithClipboardCPButton($conf->global->MAIN_INFO_APE).'</span>';
+	if ($langs->transcountry("ProfId3", $mysoc->country_code) != '-') {
+		$dropdownBody .= '<br><b>'.$langs->transcountry("ProfId3", $mysoc->country_code).'</b>: <span>'.showValueWithClipboardCPButton($conf->global->MAIN_INFO_APE).'</span>';
 	}
-	if (!empty($conf->global->MAIN_INFO_RCS)) {
-		$dropdownBody .= '<br><b>'.$langs->transcountry("ProfId4Short", $mysoc->country_code).'</b>: <span>'.showValueWithClipboardCPButton($conf->global->MAIN_INFO_RCS).'</span>';
+	if ($langs->transcountry("ProfId4", $mysoc->country_code) != '-') {
+		$dropdownBody .= '<br><b>'.$langs->transcountry("ProfId4", $mysoc->country_code).'</b>: <span>'.showValueWithClipboardCPButton($conf->global->MAIN_INFO_RCS).'</span>';
 	}
-	if (!empty($conf->global->MAIN_INFO_PROFID5)) {
-		$dropdownBody .= '<br><b>'.$langs->transcountry("ProfId5Short", $mysoc->country_code).'</b>: <span>'.showValueWithClipboardCPButton($conf->global->MAIN_INFO_PROFID5).'</span>';
+	if ($langs->transcountry("ProfId5", $mysoc->country_code) != '-') {
+		$dropdownBody .= '<br><b>'.$langs->transcountry("ProfId5", $mysoc->country_code).'</b>: <span>'.showValueWithClipboardCPButton($conf->global->MAIN_INFO_PROFID5).'</span>';
 	}
-	if (!empty($conf->global->MAIN_INFO_PROFID6)) {
-		$dropdownBody .= '<br><b>'.$langs->transcountry("ProfId6Short", $mysoc->country_code).'</b>: <span>'.showValueWithClipboardCPButton($conf->global->MAIN_INFO_PROFID6).'</span>';
-	}
-	if (!empty($conf->global->MAIN_INFO_TVAINTRA)) {
-		$dropdownBody .= '<br><b>'.$langs->trans("VATIntraShort").'</b>: <span>'.showValueWithClipboardCPButton($conf->global->MAIN_INFO_TVAINTRA).'</span>';
+	if ($langs->transcountry("ProfId6", $mysoc->country_code) != '-') {
+		$dropdownBody .= '<br><b>'.$langs->transcountry("ProfId6", $mysoc->country_code).'</b>: <span>'.showValueWithClipboardCPButton($conf->global->MAIN_INFO_PROFID6).'</span>';
 	}
+	$dropdownBody .= '<br><b>'.$langs->trans("VATIntraShort").'</b>: <span>'.showValueWithClipboardCPButton($conf->global->MAIN_INFO_TVAINTRA).'</span>';
 
 	$dropdownBody .= '</div>';
 

From 6b20b32f07852c990367a3830c23d5d6a746af51 Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Thu, 5 Aug 2021 16:31:21 +0200
Subject: [PATCH 1420/1497] Fix lang error on hrm/index.php

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

diff --git a/htdocs/hrm/index.php b/htdocs/hrm/index.php
index fe2c42b0d1b..8a294a47e2c 100644
--- a/htdocs/hrm/index.php
+++ b/htdocs/hrm/index.php
@@ -234,7 +234,7 @@ if (!empty($conf->holiday->enabled) && $user->rights->holiday->read) {
 				print '<tr class="oddeven">';
 				print '<td class="nowraponall">'.$holidaystatic->getNomUrl(1).'</td>';
 				print '<td class="tdoverflowmax125">'.$userstatic->getNomUrl(-1, 'leave').'</td>';
-				print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($typeleaves[$obj->fk_type]['label']).'">'.dol_escape_htmltag($typeleaves[$obj->fk_type]['label']).'</td>';
+				print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($langs->trans($typeleaves[$obj->fk_type]['code'])).'">'.dol_escape_htmltag($langs->trans($typeleaves[$obj->fk_type]['code'])).'</td>';
 
 				$starthalfday = ($obj->halfday == -1 || $obj->halfday == 2) ? 'afternoon' : 'morning';
 				$endhalfday = ($obj->halfday == 1 || $obj->halfday == 2) ? 'morning' : 'afternoon';

From d249ffd5adf97f9498ffba3840bf8e1d0d9cc925 Mon Sep 17 00:00:00 2001
From: Erik van Berkum <erikvanberkum@users.noreply.github.com>
Date: Fri, 6 Aug 2021 13:40:19 +0900
Subject: [PATCH 1421/1497] Fix: Change French word to English in English
 array.

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

diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index ee4b64471c3..df5dcba60ad 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -118,7 +118,7 @@ class Mo extends CommonObject
 		'date_end_planned' => array('type'=>'datetime', 'label'=>'DateEndPlannedMo', 'enabled'=>1, 'visible'=>1, 'position'=>56, 'notnull'=>-1, 'index'=>1,),
 		'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>1000, 'notnull'=>-1,),
 		'model_pdf' =>array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>1, 'visible'=>0, 'position'=>1010),
-		'status' => array('type'=>'integer', 'label'=>'Status', 'enabled'=>1, 'visible'=>2, 'position'=>1000, 'default'=>0, 'notnull'=>1, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Brouillon', '1'=>'Validated', '2'=>'InProgress', '3'=>'StatusMOProduced', '9'=>'Canceled')),
+		'status' => array('type'=>'integer', 'label'=>'Status', 'enabled'=>1, 'visible'=>2, 'position'=>1000, 'default'=>0, 'notnull'=>1, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Draft', '1'=>'Validated', '2'=>'InProgress', '3'=>'StatusMOProduced', '9'=>'Canceled')),
 	);
 	public $rowid;
 	public $ref;

From 80c63cae5e6ddaffead1a5c8c14346b7bed22c36 Mon Sep 17 00:00:00 2001
From: Christian Foellmann <christian@foellmann.de>
Date: Fri, 6 Aug 2021 08:32:40 +0200
Subject: [PATCH 1422/1497] add GETPOST to 'target' value on new bookmarks ->
 allows to set default value

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

diff --git a/htdocs/bookmarks/card.php b/htdocs/bookmarks/card.php
index 1094eabf0c6..8ac05863ed0 100644
--- a/htdocs/bookmarks/card.php
+++ b/htdocs/bookmarks/card.php
@@ -40,7 +40,7 @@ $action = GETPOST("action", "alpha");
 $title = (string) GETPOST("title", "alpha");
 $url = (string) GETPOST("url", "alpha");
 $urlsource = GETPOST("urlsource", "alpha");
-$target = GETPOST("target", "alpha");
+$target = GETPOST("target", "int");
 $userid = GETPOST("userid", "int");
 $position = GETPOST("position", "int");
 $backtopage = GETPOST('backtopage', 'alpha');
@@ -169,7 +169,7 @@ if ($action == 'create') {
 	// Target
 	print '<tr><td>'.$langs->trans("BehaviourOnClick").'</td><td>';
 	$liste = array(0=>$langs->trans("ReplaceWindow"), 1=>$langs->trans("OpenANewWindow"));
-	print $form->selectarray('target', $liste, 1);
+	print $form->selectarray('target', $liste, GETPOST('target', 'int'));
 	print '</td><td class="hideonsmartphone"><span class="opacitymedium">'.$langs->trans("ChooseIfANewWindowMustBeOpenedOnClickOnBookmark").'</span></td></tr>';
 
 	// Owner

From 470eec7f5086723e5f7a1bb723db1fb018dc1206 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 6 Aug 2021 11:32:39 +0200
Subject: [PATCH 1423/1497] Remove (hide) not used field "deductible" on social
 contributions.

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

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 1bfc3611439..6835ce82e60 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -202,7 +202,7 @@ $tabsql[3] = "SELECT r.rowid as rowid, r.code_region as state_code, r.nom as lib
 $tabsql[4] = "SELECT c.rowid as rowid, c.code, c.label, c.active, c.favorite FROM ".MAIN_DB_PREFIX."c_country AS c";
 $tabsql[5] = "SELECT c.rowid as rowid, c.code as code, c.label, c.active FROM ".MAIN_DB_PREFIX."c_civility AS c";
 $tabsql[6] = "SELECT a.id    as rowid, a.code as code, a.libelle AS libelle, a.type, a.active, a.module, a.color, a.position FROM ".MAIN_DB_PREFIX."c_actioncomm AS a";
-$tabsql[7] = "SELECT a.id    as rowid, a.code as code, a.libelle AS libelle, a.accountancy_code as accountancy_code, a.deductible, c.code as country_code, c.label as country, a.fk_pays as country_id, a.active FROM ".MAIN_DB_PREFIX."c_chargesociales AS a, ".MAIN_DB_PREFIX."c_country as c WHERE a.fk_pays=c.rowid and c.active=1";
+$tabsql[7] = "SELECT a.id    as rowid, a.code as code, a.libelle AS libelle, a.accountancy_code as accountancy_code, c.code as country_code, c.label as country, a.fk_pays as country_id, a.active FROM ".MAIN_DB_PREFIX."c_chargesociales AS a, ".MAIN_DB_PREFIX."c_country as c WHERE a.fk_pays=c.rowid and c.active=1";
 $tabsql[8] = "SELECT t.id	 as rowid, t.code as code, t.libelle, t.fk_country as country_id, c.code as country_code, c.label as country, t.position, t.active FROM ".MAIN_DB_PREFIX."c_typent as t LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON t.fk_country=c.rowid";
 $tabsql[9] = "SELECT c.code_iso as code, c.label, c.unicode, c.active FROM ".MAIN_DB_PREFIX."c_currencies AS c";
 $tabsql[10] = "SELECT t.rowid, t.code, t.taux, t.localtax1_type, t.localtax1, t.localtax2_type, t.localtax2, c.label as country, c.code as country_code, t.fk_pays as country_id, t.recuperableonly, t.note, t.active, t.accountancy_code_sell, t.accountancy_code_buy FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c WHERE t.fk_pays=c.rowid";
@@ -294,7 +294,7 @@ $tabfield[3] = "code,libelle,country_id,country";
 $tabfield[4] = "code,label";
 $tabfield[5] = "code,label";
 $tabfield[6] = "code,libelle,type,color,position";
-$tabfield[7] = "code,libelle,country,accountancy_code,deductible";
+$tabfield[7] = "code,libelle,country,accountancy_code";
 $tabfield[8] = "code,libelle,country_id,country".(!empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? ',position' : '');
 $tabfield[9] = "code,label,unicode";
 $tabfield[10] = "country_id,country,code,taux,localtax1_type,localtax1,localtax2_type,localtax2,recuperableonly,accountancy_code_sell,accountancy_code_buy,note";
@@ -340,7 +340,7 @@ $tabfieldvalue[3] = "code,libelle,country";
 $tabfieldvalue[4] = "code,label";
 $tabfieldvalue[5] = "code,label";
 $tabfieldvalue[6] = "code,libelle,type,color,position";
-$tabfieldvalue[7] = "code,libelle,country,accountancy_code,deductible";
+$tabfieldvalue[7] = "code,libelle,country,accountancy_code";
 $tabfieldvalue[8] = "code,libelle,country".(!empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? ',position' : '');
 $tabfieldvalue[9] = "code,label,unicode";
 $tabfieldvalue[10] = "country,code,taux,localtax1_type,localtax1,localtax2_type,localtax2,recuperableonly,accountancy_code_sell,accountancy_code_buy,note";
@@ -386,7 +386,7 @@ $tabfieldinsert[3] = "code_region,nom,fk_pays";
 $tabfieldinsert[4] = "code,label";
 $tabfieldinsert[5] = "code,label";
 $tabfieldinsert[6] = "code,libelle,type,color,position";
-$tabfieldinsert[7] = "code,libelle,fk_pays,accountancy_code,deductible";
+$tabfieldinsert[7] = "code,libelle,fk_pays,accountancy_code";
 $tabfieldinsert[8] = "code,libelle,fk_country".(!empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? ',position' : '');
 $tabfieldinsert[9] = "code_iso,label,unicode";
 $tabfieldinsert[10] = "fk_pays,code,taux,localtax1_type,localtax1,localtax2_type,localtax2,recuperableonly,accountancy_code_sell,accountancy_code_buy,note";

From 6cefd0a756429f77f957f1fd89ca0523fda33764 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 6 Aug 2021 12:18:51 +0200
Subject: [PATCH 1424/1497] FIX Link of download main doc on vat list

---
 htdocs/compta/tva/list.php                | 10 +++++++++-
 htdocs/core/class/html.formfile.class.php |  5 +++--
 htdocs/core/lib/files.lib.php             |  9 ++++++---
 htdocs/theme/eldy/global.inc.php          |  3 +++
 htdocs/theme/md/style.css.php             |  6 ++++++
 5 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/htdocs/compta/tva/list.php b/htdocs/compta/tva/list.php
index 69ce8ae8ae5..1dc0180bd60 100644
--- a/htdocs/compta/tva/list.php
+++ b/htdocs/compta/tva/list.php
@@ -31,6 +31,7 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
 
@@ -135,6 +136,7 @@ if (empty($reshook)) {
 
 $form = new Form($db);
 $formother = new FormOther($db);
+$formfile = new FormFile($db);
 $tva_static = new Tva($db);
 $bankstatic = new Account($db);
 $accountingjournal = new AccountingJournal($db);
@@ -445,7 +447,13 @@ while ($i < min($num, $limit)) {
 
 	// Ref
 	if (!empty($arrayfields['t.rowid']['checked'])) {
-		print '<td>'.$tva_static->getNomUrl(1).'</td>';
+		print '<td>';
+		print $tva_static->getNomUrl(1);
+		$filename = dol_sanitizeFileName($tva_static->ref);
+		$filedir = $conf->tax->dir_output.'/vat/'.dol_sanitizeFileName($tva_static->ref);
+		$urlsource = $_SERVER['PHP_SELF'].'?id='.$tva_static->id;
+		print $formfile->getDocumentsLink($tva_static->element, $filename, $filedir, '', 'valignmiddle paddingleft2imp');
+		print '</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 2b8a2d15aff..3a5cff5ea9e 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -985,9 +985,10 @@ class FormFile
 	 *	@param	string	$modulesubdir	Sub-directory to scan (Example: '0/1/10', 'FA/DD/MM/YY/9999'). Use '' if file is not into subdir of module.
 	 *	@param	string	$filedir		Full path to directory to scan
 	 *  @param	string	$filter			Filter filenames on this regex string (Example: '\.pdf$')
+	 *  @param	string	$morecss		Add more css to the download picto
 	 *	@return	string              	Output string with HTML link of documents (might be empty string). This also fill the array ->infofiles
 	 */
-	public function getDocumentsLink($modulepart, $modulesubdir, $filedir, $filter = '')
+	public function getDocumentsLink($modulepart, $modulesubdir, $filedir, $filter = '', $morecss = 'valignmiddle')
 	{
 		global $conf, $langs;
 
@@ -1019,7 +1020,7 @@ class FormFile
 		$out .= '<!-- html.formfile::getDocumentsLink -->'."\n";
 		if (!empty($file_list)) {
 			$out = '<dl class="dropdown inline-block">
-    			<dt><a data-ajax="false" href="#" onClick="return false;">'.img_picto('', 'listlight', '', 0, 0, 0, '', 'valignmiddle').'</a></dt>
+    			<dt><a data-ajax="false" href="#" onClick="return false;">'.img_picto('', 'listlight', '', 0, 0, 0, '', $morecss).'</a></dt>
     			<dd><div class="multichoicedoc" style="position:absolute;left:100px;" ><ul class="ulselectedfields">';
 			$tmpout = '';
 
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index a1085c019a8..766d7cdb763 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -2242,7 +2242,7 @@ function dol_most_recent_file($dir, $regexfilter = '', $excludefilter = array('(
  * Security check when accessing to a document (used by document.php, viewimage.php and webservices to get documents).
  * TODO Replace code that set $accesallowed by a call to restrictedArea()
  *
- * @param	string	$modulepart			Module of document ('module', 'module_user_temp', 'module_user' or 'module_temp')
+ * @param	string	$modulepart			Module of document ('module', 'module_user_temp', 'module_user' or 'module_temp'). Exemple: 'medias', 'invoice', 'logs', 'tax-vat', ...
  * @param	string	$original_file		Relative path with filename, relative to modulepart.
  * @param	string	$entity				Restrict onto entity (0=no restriction)
  * @param  	User	$fuser				User object (forced)
@@ -2270,10 +2270,13 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			$entity = 0;
 		}
 	}
-	// Fix modulepart
+	// Fix modulepart for backward compatibility
 	if ($modulepart == 'users') {
 		$modulepart = 'user';
 	}
+	if ($modulepart == 'tva') {
+		$modulepart = 'tax-vat';
+	}
 
 	//print 'dol_check_secure_access_document modulepart='.$modulepart.' original_file='.$original_file.' entity='.$entity;
 	dol_syslog('dol_check_secure_access_document modulepart='.$modulepart.' original_file='.$original_file.' entity='.$entity);
@@ -2443,7 +2446,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			$accessallowed = 1;
 		}
 		$original_file = (!empty($conf->product->multidir_temp[$entity]) ? $conf->product->multidir_temp[$entity] : $conf->service->multidir_temp[$entity]).'/'.$original_file;
-	} elseif (in_array($modulepart, array('tax', 'tax-vat')) && !empty($conf->tax->dir_output)) {
+	} elseif (in_array($modulepart, array('tax', 'tax-vat', 'tva')) && !empty($conf->tax->dir_output)) {
 		// Wrapping for taxes
 		if ($fuser->rights->tax->charges->{$lire}) {
 			$accessallowed = 1;
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index ab9ab624801..e384007262f 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -736,6 +736,9 @@ textarea.centpercent {
 .paddingleft2 {
 	padding-<?php print $left; ?>: 2px;
 }
+.paddingleft2imp {
+	padding-<?php print $left; ?>: 2px !important;
+}
 .paddingright {
 	padding-<?php print $right; ?>: 4px;
 }
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 8e679e754f2..dfa8b00f9eb 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -878,12 +878,18 @@ textarea.centpercent {
 .paddingleft2 {
 	padding-<?php print $left; ?>: 2px;
 }
+.paddingleft2imp {
+	padding-<?php print $left; ?>: 2px !important;
+}
 .paddingright {
 	padding-<?php print $right; ?>: 4px;
 }
 .paddingright2 {
 	padding-<?php print $right; ?>: 2px;
 }
+.paddingright2imp {
+	padding-<?php print $right; ?>: 2px !important;
+}
 .marginleft2 {
 	margin-<?php print $left; ?>: 2px;
 }

From c0c46fb704b2777be00527f3cb10c8c11b17408e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 6 Aug 2021 12:18:51 +0200
Subject: [PATCH 1425/1497] FIX Link of download main doc on vat list

---
 htdocs/compta/tva/list.php                | 10 +++++++++-
 htdocs/core/class/html.formfile.class.php |  5 +++--
 htdocs/core/lib/files.lib.php             |  9 ++++++---
 htdocs/theme/eldy/global.inc.php          |  3 +++
 htdocs/theme/md/style.css.php             |  6 ++++++
 5 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/htdocs/compta/tva/list.php b/htdocs/compta/tva/list.php
index 69ce8ae8ae5..1dc0180bd60 100644
--- a/htdocs/compta/tva/list.php
+++ b/htdocs/compta/tva/list.php
@@ -31,6 +31,7 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
 
@@ -135,6 +136,7 @@ if (empty($reshook)) {
 
 $form = new Form($db);
 $formother = new FormOther($db);
+$formfile = new FormFile($db);
 $tva_static = new Tva($db);
 $bankstatic = new Account($db);
 $accountingjournal = new AccountingJournal($db);
@@ -445,7 +447,13 @@ while ($i < min($num, $limit)) {
 
 	// Ref
 	if (!empty($arrayfields['t.rowid']['checked'])) {
-		print '<td>'.$tva_static->getNomUrl(1).'</td>';
+		print '<td>';
+		print $tva_static->getNomUrl(1);
+		$filename = dol_sanitizeFileName($tva_static->ref);
+		$filedir = $conf->tax->dir_output.'/vat/'.dol_sanitizeFileName($tva_static->ref);
+		$urlsource = $_SERVER['PHP_SELF'].'?id='.$tva_static->id;
+		print $formfile->getDocumentsLink($tva_static->element, $filename, $filedir, '', 'valignmiddle paddingleft2imp');
+		print '</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 2b8a2d15aff..3a5cff5ea9e 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -985,9 +985,10 @@ class FormFile
 	 *	@param	string	$modulesubdir	Sub-directory to scan (Example: '0/1/10', 'FA/DD/MM/YY/9999'). Use '' if file is not into subdir of module.
 	 *	@param	string	$filedir		Full path to directory to scan
 	 *  @param	string	$filter			Filter filenames on this regex string (Example: '\.pdf$')
+	 *  @param	string	$morecss		Add more css to the download picto
 	 *	@return	string              	Output string with HTML link of documents (might be empty string). This also fill the array ->infofiles
 	 */
-	public function getDocumentsLink($modulepart, $modulesubdir, $filedir, $filter = '')
+	public function getDocumentsLink($modulepart, $modulesubdir, $filedir, $filter = '', $morecss = 'valignmiddle')
 	{
 		global $conf, $langs;
 
@@ -1019,7 +1020,7 @@ class FormFile
 		$out .= '<!-- html.formfile::getDocumentsLink -->'."\n";
 		if (!empty($file_list)) {
 			$out = '<dl class="dropdown inline-block">
-    			<dt><a data-ajax="false" href="#" onClick="return false;">'.img_picto('', 'listlight', '', 0, 0, 0, '', 'valignmiddle').'</a></dt>
+    			<dt><a data-ajax="false" href="#" onClick="return false;">'.img_picto('', 'listlight', '', 0, 0, 0, '', $morecss).'</a></dt>
     			<dd><div class="multichoicedoc" style="position:absolute;left:100px;" ><ul class="ulselectedfields">';
 			$tmpout = '';
 
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 05d8c6c4ec5..3c35bcda2a9 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -2235,7 +2235,7 @@ function dol_most_recent_file($dir, $regexfilter = '', $excludefilter = array('(
  * Security check when accessing to a document (used by document.php, viewimage.php and webservices to get documents).
  * TODO Replace code that set $accesallowed by a call to restrictedArea()
  *
- * @param	string	$modulepart			Module of document ('module', 'module_user_temp', 'module_user' or 'module_temp')
+ * @param	string	$modulepart			Module of document ('module', 'module_user_temp', 'module_user' or 'module_temp'). Exemple: 'medias', 'invoice', 'logs', 'tax-vat', ...
  * @param	string	$original_file		Relative path with filename, relative to modulepart.
  * @param	string	$entity				Restrict onto entity (0=no restriction)
  * @param  	User	$fuser				User object (forced)
@@ -2263,10 +2263,13 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			$entity = 0;
 		}
 	}
-	// Fix modulepart
+	// Fix modulepart for backward compatibility
 	if ($modulepart == 'users') {
 		$modulepart = 'user';
 	}
+	if ($modulepart == 'tva') {
+		$modulepart = 'tax-vat';
+	}
 
 	//print 'dol_check_secure_access_document modulepart='.$modulepart.' original_file='.$original_file.' entity='.$entity;
 	dol_syslog('dol_check_secure_access_document modulepart='.$modulepart.' original_file='.$original_file.' entity='.$entity);
@@ -2436,7 +2439,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			$accessallowed = 1;
 		}
 		$original_file = (!empty($conf->product->multidir_temp[$entity]) ? $conf->product->multidir_temp[$entity] : $conf->service->multidir_temp[$entity]).'/'.$original_file;
-	} elseif (in_array($modulepart, array('tax', 'tax-vat')) && !empty($conf->tax->dir_output)) {
+	} elseif (in_array($modulepart, array('tax', 'tax-vat', 'tva')) && !empty($conf->tax->dir_output)) {
 		// Wrapping for taxes
 		if ($fuser->rights->tax->charges->{$lire}) {
 			$accessallowed = 1;
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index ab9ab624801..e384007262f 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -736,6 +736,9 @@ textarea.centpercent {
 .paddingleft2 {
 	padding-<?php print $left; ?>: 2px;
 }
+.paddingleft2imp {
+	padding-<?php print $left; ?>: 2px !important;
+}
 .paddingright {
 	padding-<?php print $right; ?>: 4px;
 }
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 8e679e754f2..dfa8b00f9eb 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -878,12 +878,18 @@ textarea.centpercent {
 .paddingleft2 {
 	padding-<?php print $left; ?>: 2px;
 }
+.paddingleft2imp {
+	padding-<?php print $left; ?>: 2px !important;
+}
 .paddingright {
 	padding-<?php print $right; ?>: 4px;
 }
 .paddingright2 {
 	padding-<?php print $right; ?>: 2px;
 }
+.paddingright2imp {
+	padding-<?php print $right; ?>: 2px !important;
+}
 .marginleft2 {
 	margin-<?php print $left; ?>: 2px;
 }

From cf74af4401bc0ca68421b3814e6a4a7434cb3206 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 6 Aug 2021 13:07:07 +0200
Subject: [PATCH 1426/1497] css

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

diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php
index aff3e4cce92..d3c7ba504cb 100755
--- a/htdocs/salaries/card.php
+++ b/htdocs/salaries/card.php
@@ -729,7 +729,7 @@ if ($id) {
 	if ($action == 'edit') {
 		print '<tr><td class="fieldrequired">' . $langs->trans("Amount") . '</td><td><input name="amount" size="10" value="' . price($object->amount) . '"></td></tr>';
 	} else {
-		print '<tr><td>' . $langs->trans("Amount") . '</td><td>' . price($object->amount, 0, $outputlangs, 1, -1, -1, $conf->currency) . '</td></tr>';
+		print '<tr><td>' . $langs->trans("Amount") . '</td><td><span class="amount">' . price($object->amount, 0, $langs, 1, -1, -1, $conf->currency) . '</span></td></tr>';
 	}
 
 	// Default mode of payment

From 4c3c6135680d7bafbeb39cb225d316c9980e998d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 6 Aug 2021 13:24:40 +0200
Subject: [PATCH 1427/1497] Fix filter to find files of a ref.

---
 htdocs/core/class/html.formfile.class.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 3a5cff5ea9e..60054ecf5ad 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -981,14 +981,15 @@ class FormFile
 	 *  You may want to call this into a div like this:
 	 *  print '<div class="inline-block valignmiddle">'.$formfile->getDocumentsLink($element_doc, $filename, $filedir).'</div>';
 	 *
-	 *	@param	string	$modulepart		propal, facture, facture_fourn, ...
+	 *	@param	string	$modulepart		'propal', 'facture', 'facture_fourn', ...
 	 *	@param	string	$modulesubdir	Sub-directory to scan (Example: '0/1/10', 'FA/DD/MM/YY/9999'). Use '' if file is not into subdir of module.
 	 *	@param	string	$filedir		Full path to directory to scan
 	 *  @param	string	$filter			Filter filenames on this regex string (Example: '\.pdf$')
 	 *  @param	string	$morecss		Add more css to the download picto
+	 *  @param	string	$allfiles		0=Only generated docs, 1=All files
 	 *	@return	string              	Output string with HTML link of documents (might be empty string). This also fill the array ->infofiles
 	 */
-	public function getDocumentsLink($modulepart, $modulesubdir, $filedir, $filter = '', $morecss = 'valignmiddle')
+	public function getDocumentsLink($modulepart, $modulesubdir, $filedir, $filter = '', $morecss = 'valignmiddle', $allfiles = 0)
 	{
 		global $conf, $langs;
 
@@ -1006,12 +1007,11 @@ class FormFile
 			$entity = ((!empty($regs[1]) && $regs[1] > 1) ? $regs[1] : 1); // If entity id not found in $filedir this is entity 1 by default
 		}
 
-		// Get list of files starting with name of ref (but not followed by "-" to discard uploaded files and get only generated files)
-		// @todo Why not showing by default all files by just removing the '[^\-]+' at end of regex ?
-		if (!empty($conf->global->MAIN_SHOW_ALL_FILES_ON_DOCUMENT_TOOLTIP)) {
-			$filterforfilesearch = preg_quote(basename($modulesubdir), '/');
+		// Get list of files starting with name of ref (Note: files with '^ref\.extension' are generated files, files with '^ref-...' are uploaded files)
+		if ($allfiles || !empty($conf->global->MAIN_SHOW_ALL_FILES_ON_DOCUMENT_TOOLTIP)) {
+			$filterforfilesearch = '^'.preg_quote(basename($modulesubdir), '/');
 		} else {
-			$filterforfilesearch = preg_quote(basename($modulesubdir), '/').'[^\-]+';
+			$filterforfilesearch = '^'.preg_quote(basename($modulesubdir), '/').'\.';
 		}
 		$file_list = dol_dir_list($filedir, 'files', 0, $filterforfilesearch, '\.meta$|\.png$'); // We also discard .meta and .png preview
 

From fec5a22c651037592e655c5a90fb6e66ed975d9c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 6 Aug 2021 13:24:40 +0200
Subject: [PATCH 1428/1497] Fix filter to find files of a ref.

---
 htdocs/core/class/html.formfile.class.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 3a5cff5ea9e..60054ecf5ad 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -981,14 +981,15 @@ class FormFile
 	 *  You may want to call this into a div like this:
 	 *  print '<div class="inline-block valignmiddle">'.$formfile->getDocumentsLink($element_doc, $filename, $filedir).'</div>';
 	 *
-	 *	@param	string	$modulepart		propal, facture, facture_fourn, ...
+	 *	@param	string	$modulepart		'propal', 'facture', 'facture_fourn', ...
 	 *	@param	string	$modulesubdir	Sub-directory to scan (Example: '0/1/10', 'FA/DD/MM/YY/9999'). Use '' if file is not into subdir of module.
 	 *	@param	string	$filedir		Full path to directory to scan
 	 *  @param	string	$filter			Filter filenames on this regex string (Example: '\.pdf$')
 	 *  @param	string	$morecss		Add more css to the download picto
+	 *  @param	string	$allfiles		0=Only generated docs, 1=All files
 	 *	@return	string              	Output string with HTML link of documents (might be empty string). This also fill the array ->infofiles
 	 */
-	public function getDocumentsLink($modulepart, $modulesubdir, $filedir, $filter = '', $morecss = 'valignmiddle')
+	public function getDocumentsLink($modulepart, $modulesubdir, $filedir, $filter = '', $morecss = 'valignmiddle', $allfiles = 0)
 	{
 		global $conf, $langs;
 
@@ -1006,12 +1007,11 @@ class FormFile
 			$entity = ((!empty($regs[1]) && $regs[1] > 1) ? $regs[1] : 1); // If entity id not found in $filedir this is entity 1 by default
 		}
 
-		// Get list of files starting with name of ref (but not followed by "-" to discard uploaded files and get only generated files)
-		// @todo Why not showing by default all files by just removing the '[^\-]+' at end of regex ?
-		if (!empty($conf->global->MAIN_SHOW_ALL_FILES_ON_DOCUMENT_TOOLTIP)) {
-			$filterforfilesearch = preg_quote(basename($modulesubdir), '/');
+		// Get list of files starting with name of ref (Note: files with '^ref\.extension' are generated files, files with '^ref-...' are uploaded files)
+		if ($allfiles || !empty($conf->global->MAIN_SHOW_ALL_FILES_ON_DOCUMENT_TOOLTIP)) {
+			$filterforfilesearch = '^'.preg_quote(basename($modulesubdir), '/');
 		} else {
-			$filterforfilesearch = preg_quote(basename($modulesubdir), '/').'[^\-]+';
+			$filterforfilesearch = '^'.preg_quote(basename($modulesubdir), '/').'\.';
 		}
 		$file_list = dol_dir_list($filedir, 'files', 0, $filterforfilesearch, '\.meta$|\.png$'); // We also discard .meta and .png preview
 

From 864a8b4b3ebda7dd8698c4e2d7e2b4b44f2e31e2 Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <68746600+marc-dll@users.noreply.github.com>
Date: Fri, 6 Aug 2021 16:22:19 +0200
Subject: [PATCH 1429/1497] FIX: holiday card: hooks uninitialized

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

diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index 692b9639805..8929e7881bc 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -81,6 +81,9 @@ if (($id > 0) || $ref)
     }
 }
 
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('holidaycard', 'globalcard'));
+
 $cancreate = 0;
 if (!empty($user->rights->holiday->write_all)) $cancreate = 1;
 if (!empty($user->rights->holiday->write) && in_array($fuserid, $childids)) $cancreate = 1;

From cbc7589559322a97782020facf4e0f8c11bc8b85 Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe@altairis.fr>
Date: Fri, 6 Aug 2021 16:35:49 +0200
Subject: [PATCH 1430/1497] NEW: add constant MAIN_IBAN_NOT_MANDATORY

---
 htdocs/compta/bank/class/account.class.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index ed61da3592e..885051bf36e 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -1519,6 +1519,10 @@ class Account extends CommonObject
 	 */
 	public function needIBAN()
 	{
+		global $conf;
+
+		if ( ! empty($conf->global->MAIN_IBAN_NOT_MANDATORY) ) return 0;
+
 		$country_code = $this->getCountryCode();
 
 		$country_code_in_EEC = array(

From 458f773baf6fdab3d4a831f78455b8696395aee3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 6 Aug 2021 18:32:40 +0200
Subject: [PATCH 1431/1497] Fix security options

---
 htdocs/admin/system/security.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/admin/system/security.php b/htdocs/admin/system/security.php
index 1ca4b95856e..3f90414e6b7 100644
--- a/htdocs/admin/system/security.php
+++ b/htdocs/admin/system/security.php
@@ -372,6 +372,9 @@ print '<br>';
 print '<strong>MAIN_RESTRICTHTML_ONLY_VALID_HTML</strong> = '.(empty($conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML) ? '<span class="opacitymedium">'.$langs->trans("Undefined").' &nbsp; ('.$langs->trans("Recommanded").': 1)</span>' : $conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML)."<br>";
 print '<br>';
 
+print '<strong>MAIN_ALWAYS_CREATE_LOCK_AFTER_LAST_UPGRADE</strong> = '.(empty($conf->global->MAIN_ALWAYS_CREATE_LOCK_AFTER_LAST_UPGRADE) ? '<span class="opacitymedium">'.$langs->trans("Undefined").' &nbsp; ('.$langs->trans("Recommanded").': 1)</span>' : $conf->global->MAIN_ALWAYS_CREATE_LOCK_AFTER_LAST_UPGRADE)."<br>";
+print '<br>';
+
 print '<strong>MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES</strong> = '.(empty($conf->global->MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES) ? '<span class="opacitymedium">'.$langs->trans("Undefined").' &nbsp; ('.$langs->trans("Recommanded").': 1)</span>' : $conf->global->MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES)."<br>";
 print '<br>';
 

From e26eda3f5ff3ac547a750257f69ceb583218aa0d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 6 Aug 2021 18:34:35 +0200
Subject: [PATCH 1432/1497] Position of option

---
 htdocs/admin/system/security.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/admin/system/security.php b/htdocs/admin/system/security.php
index 3f90414e6b7..ea6aa10d3c9 100644
--- a/htdocs/admin/system/security.php
+++ b/htdocs/admin/system/security.php
@@ -175,7 +175,7 @@ print '<br>';
 print load_fiche_titre($langs->trans("OSSetup").' - '.$langs->trans("PermissionsOnFiles"), '', 'folder');
 
 print '<strong>'.$langs->trans("PermissionsOnFilesInWebRoot").'</strong>: ';
-$arrayoffilesinroot = dol_dir_list(DOL_DOCUMENT_ROOT, 'all', 1, '', array('\/custom'), 'name', SORT_ASC, 4, 1, '', 1);
+$arrayoffilesinroot = dol_dir_list(DOL_DOCUMENT_RMAIN_ALWAYS_CREATE_LOCK_AFTER_LAST_UPGRADEOOT, 'all', 1, '', array('\/custom'), 'name', SORT_ASC, 4, 1, '', 1);
 $fileswithwritepermission = array();
 foreach ($arrayoffilesinroot as $fileinroot) {
 	// Test if there is at least one write permission file. If yes, add the entry into array $fileswithwritepermission
@@ -235,7 +235,7 @@ if (file_exists($installlock)) {
 }
 print '<br>';
 
-
+MAIN_ALWAYS_CREATE_LOCK_AFTER_LAST_UPGRADE
 // File conf.php
 
 print '<br>';
@@ -369,10 +369,10 @@ print '<br>';
 print '<strong>MAIN_ALLOW_SVG_FILES_AS_IMAGES</strong> = '.(empty($conf->global->MAIN_ALLOW_SVG_FILES_AS_IMAGES) ? '0 &nbsp; <span class="opacitymedium">('.$langs->trans("Recommanded").': 0)</span>' : $conf->global->MAIN_ALLOW_SVG_FILES_AS_IMAGES)."<br>";
 print '<br>';
 
-print '<strong>MAIN_RESTRICTHTML_ONLY_VALID_HTML</strong> = '.(empty($conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML) ? '<span class="opacitymedium">'.$langs->trans("Undefined").' &nbsp; ('.$langs->trans("Recommanded").': 1)</span>' : $conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML)."<br>";
+print '<strong>MAIN_ALWAYS_CREATE_LOCK_AFTER_LAST_UPGRADE</strong> = '.(empty($conf->global->MAIN_ALWAYS_CREATE_LOCK_AFTER_LAST_UPGRADE) ? '<span class="opacitymedium">'.$langs->trans("Undefined").' &nbsp; ('.$langs->trans("Recommanded").': 1)</span>' : $conf->global->MAIN_ALWAYS_CREATE_LOCK_AFTER_LAST_UPGRADE)."<br>";
 print '<br>';
 
-print '<strong>MAIN_ALWAYS_CREATE_LOCK_AFTER_LAST_UPGRADE</strong> = '.(empty($conf->global->MAIN_ALWAYS_CREATE_LOCK_AFTER_LAST_UPGRADE) ? '<span class="opacitymedium">'.$langs->trans("Undefined").' &nbsp; ('.$langs->trans("Recommanded").': 1)</span>' : $conf->global->MAIN_ALWAYS_CREATE_LOCK_AFTER_LAST_UPGRADE)."<br>";
+print '<strong>MAIN_RESTRICTHTML_ONLY_VALID_HTML</strong> = '.(empty($conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML) ? '<span class="opacitymedium">'.$langs->trans("Undefined").' &nbsp; ('.$langs->trans("Recommanded").': 1)</span>' : $conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML)."<br>";
 print '<br>';
 
 print '<strong>MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES</strong> = '.(empty($conf->global->MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES) ? '<span class="opacitymedium">'.$langs->trans("Undefined").' &nbsp; ('.$langs->trans("Recommanded").': 1)</span>' : $conf->global->MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES)."<br>";

From a7fa238b71dd081b376cabdd2da06ae024bc34c9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 6 Aug 2021 18:35:16 +0200
Subject: [PATCH 1433/1497] Position of option

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

diff --git a/htdocs/admin/system/security.php b/htdocs/admin/system/security.php
index ea6aa10d3c9..478338ad79a 100644
--- a/htdocs/admin/system/security.php
+++ b/htdocs/admin/system/security.php
@@ -175,7 +175,7 @@ print '<br>';
 print load_fiche_titre($langs->trans("OSSetup").' - '.$langs->trans("PermissionsOnFiles"), '', 'folder');
 
 print '<strong>'.$langs->trans("PermissionsOnFilesInWebRoot").'</strong>: ';
-$arrayoffilesinroot = dol_dir_list(DOL_DOCUMENT_RMAIN_ALWAYS_CREATE_LOCK_AFTER_LAST_UPGRADEOOT, 'all', 1, '', array('\/custom'), 'name', SORT_ASC, 4, 1, '', 1);
+$arrayoffilesinroot = dol_dir_list(DOL_DOCUMENT_ROOT, 'all', 1, '', array('\/custom'), 'name', SORT_ASC, 4, 1, '', 1);
 $fileswithwritepermission = array();
 foreach ($arrayoffilesinroot as $fileinroot) {
 	// Test if there is at least one write permission file. If yes, add the entry into array $fileswithwritepermission
@@ -235,7 +235,7 @@ if (file_exists($installlock)) {
 }
 print '<br>';
 
-MAIN_ALWAYS_CREATE_LOCK_AFTER_LAST_UPGRADE
+
 // File conf.php
 
 print '<br>';

From 68482c637bb890f42a135c1baed1c0d81f3f88fc Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Fri, 6 Aug 2021 18:45:25 +0200
Subject: [PATCH 1434/1497] Update actioncomm.class Property contactid should
 be contact_id

---
 htdocs/comm/action/class/actioncomm.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index c6c0d277edd..bbf86d87c59 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -261,7 +261,7 @@ class ActionComm extends CommonObject
 	/**
 	 * @var int socpeople id linked to action
 	 */
-	public $contactid;
+	public $contact_id;
 
 	/**
 	 * @var Societe|null Company linked to action (optional)
@@ -273,7 +273,7 @@ class ActionComm extends CommonObject
 	/**
 	 * @var Contact|null Contact linked to action (optional)
 	 * @deprecated
-	 * @see $contactid
+	 * @see $contact_id
 	 */
 	public $contact;
 

From d437d382d882446f4d282a797f65849aa25e98ab Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 6 Aug 2021 18:48:05 +0200
Subject: [PATCH 1435/1497] Fix trans

---
 htdocs/admin/system/security.php | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/htdocs/admin/system/security.php b/htdocs/admin/system/security.php
index 478338ad79a..c5c149d6b59 100644
--- a/htdocs/admin/system/security.php
+++ b/htdocs/admin/system/security.php
@@ -350,7 +350,7 @@ if (empty($conf->global->MAIN_SECURITY_HASH_ALGO)) {
 if ($conf->global->MAIN_SECURITY_HASH_ALGO != 'password_hash') {
 	print '<br><strong>MAIN_SECURITY_SALT</strong> = '.(empty($conf->global->MAIN_SECURITY_SALT) ? '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>' : $conf->global->MAIN_SECURITY_SALT).'<br>';
 } else {
-	print '<span class="opacitymedium">('.$langs->trans("Recommanded").': password_hash)</span>';
+	print '<span class="opacitymedium">('.$langs->trans("Recommended").': password_hash)</span>';
 	print '<br>';
 }
 if ($conf->global->MAIN_SECURITY_HASH_ALGO != 'password_hash') {
@@ -363,19 +363,19 @@ if ($conf->global->MAIN_SECURITY_HASH_ALGO != 'password_hash') {
 }
 print '<br>';
 
-print '<strong>MAIN_SECURITY_ANTI_SSRF_SERVER_IP</strong> = '.(empty($conf->global->MAIN_SECURITY_ANTI_SSRF_SERVER_IP) ? '<span class="opacitymedium">'.$langs->trans("Undefined").'</span> &nbsp; <span class="opacitymedium">('.$langs->trans("Example").': static-ips-of-server - '.$langs->trans("Note").': common loopback ip like 127.*.*.*, [::1] are already added)</span>' : $conf->global->MAIN_SECURITY_ANTI_SSRF_SERVER_IP)."<br>";
+print '<strong>MAIN_SECURITY_ANTI_SSRF_SERVER_IP</strong> = '.(empty($conf->global->MAIN_SECURITY_ANTI_SSRF_SERVER_IP) ? '<span class="opacitymedium">'.$langs->trans("Undefined").'</span> &nbsp; <span class="opacitymedium">('.$langs->trans("Recommended").': List of static IPs of server separated with coma - '.$langs->trans("Note").': common loopback ip like 127.*.*.*, [::1] are already added)</span>' : $conf->global->MAIN_SECURITY_ANTI_SSRF_SERVER_IP)."<br>";
 print '<br>';
 
-print '<strong>MAIN_ALLOW_SVG_FILES_AS_IMAGES</strong> = '.(empty($conf->global->MAIN_ALLOW_SVG_FILES_AS_IMAGES) ? '0 &nbsp; <span class="opacitymedium">('.$langs->trans("Recommanded").': 0)</span>' : $conf->global->MAIN_ALLOW_SVG_FILES_AS_IMAGES)."<br>";
+print '<strong>MAIN_ALLOW_SVG_FILES_AS_IMAGES</strong> = '.(empty($conf->global->MAIN_ALLOW_SVG_FILES_AS_IMAGES) ? '0 &nbsp; <span class="opacitymedium">('.$langs->trans("Recommended").': 0)</span>' : $conf->global->MAIN_ALLOW_SVG_FILES_AS_IMAGES)."<br>";
 print '<br>';
 
-print '<strong>MAIN_ALWAYS_CREATE_LOCK_AFTER_LAST_UPGRADE</strong> = '.(empty($conf->global->MAIN_ALWAYS_CREATE_LOCK_AFTER_LAST_UPGRADE) ? '<span class="opacitymedium">'.$langs->trans("Undefined").' &nbsp; ('.$langs->trans("Recommanded").': 1)</span>' : $conf->global->MAIN_ALWAYS_CREATE_LOCK_AFTER_LAST_UPGRADE)."<br>";
+print '<strong>MAIN_ALWAYS_CREATE_LOCK_AFTER_LAST_UPGRADE</strong> = '.(empty($conf->global->MAIN_ALWAYS_CREATE_LOCK_AFTER_LAST_UPGRADE) ? '<span class="opacitymedium">'.$langs->trans("Undefined").' &nbsp; ('.$langs->trans("Recommended").': 1)</span>' : $conf->global->MAIN_ALWAYS_CREATE_LOCK_AFTER_LAST_UPGRADE)."<br>";
 print '<br>';
 
-print '<strong>MAIN_RESTRICTHTML_ONLY_VALID_HTML</strong> = '.(empty($conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML) ? '<span class="opacitymedium">'.$langs->trans("Undefined").' &nbsp; ('.$langs->trans("Recommanded").': 1)</span>' : $conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML)."<br>";
+print '<strong>MAIN_RESTRICTHTML_ONLY_VALID_HTML</strong> = '.(empty($conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML) ? '<span class="opacitymedium">'.$langs->trans("Undefined").' &nbsp; ('.$langs->trans("Recommended").': 1)</span>' : $conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML)."<br>";
 print '<br>';
 
-print '<strong>MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES</strong> = '.(empty($conf->global->MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES) ? '<span class="opacitymedium">'.$langs->trans("Undefined").' &nbsp; ('.$langs->trans("Recommanded").': 1)</span>' : $conf->global->MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES)."<br>";
+print '<strong>MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES</strong> = '.(empty($conf->global->MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES) ? '<span class="opacitymedium">'.$langs->trans("Undefined").' &nbsp; ('.$langs->trans("Recommended").': 1)</span>' : $conf->global->MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES)."<br>";
 print '<br>';
 
 print '<strong>MAIN_EXEC_USE_POPEN</strong> = ';
@@ -385,10 +385,14 @@ if (empty($conf->global->MAIN_EXEC_USE_POPEN)) {
 	print $conf->global->MAIN_EXEC_USE_POPEN;
 }
 if ($execmethod == 1) {
-	print ' &nbsp; <span class="opacitymedium">("exec" PHP method will be used for shell commands)</span>';
+	print '<span class="opacitymedium">, "exec" PHP method will be used for shell commands';
+	print ' &nbsp; ('.$langs->trans("Recommended").': '.$langs->trans("Undefined").' '.$langs->trans("or").' 1)';
+	print '</span>';
 }
 if ($execmethod == 2) {
-	print ' &nbsp; <span class="opacitymedium">("popen" PHP method will be used for shell commands)</span>';
+	print '<span class="opacitymedium">, "popen" PHP method will be used for shell commands';
+	print ' &nbsp; ('.$langs->trans("Recommended").': '.$langs->trans("Undefined").' '.$langs->trans("or").' 1)';
+	print '</span>';
 }
 print "<br>";
 print '<br>';

From 143517240554f7f6c321b6c44c4bfba03be71279 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 6 Aug 2021 18:55:41 +0200
Subject: [PATCH 1436/1497] Better help

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

diff --git a/htdocs/admin/system/security.php b/htdocs/admin/system/security.php
index c5c149d6b59..4b98b40fb41 100644
--- a/htdocs/admin/system/security.php
+++ b/htdocs/admin/system/security.php
@@ -366,10 +366,10 @@ print '<br>';
 print '<strong>MAIN_SECURITY_ANTI_SSRF_SERVER_IP</strong> = '.(empty($conf->global->MAIN_SECURITY_ANTI_SSRF_SERVER_IP) ? '<span class="opacitymedium">'.$langs->trans("Undefined").'</span> &nbsp; <span class="opacitymedium">('.$langs->trans("Recommended").': List of static IPs of server separated with coma - '.$langs->trans("Note").': common loopback ip like 127.*.*.*, [::1] are already added)</span>' : $conf->global->MAIN_SECURITY_ANTI_SSRF_SERVER_IP)."<br>";
 print '<br>';
 
-print '<strong>MAIN_ALLOW_SVG_FILES_AS_IMAGES</strong> = '.(empty($conf->global->MAIN_ALLOW_SVG_FILES_AS_IMAGES) ? '0 &nbsp; <span class="opacitymedium">('.$langs->trans("Recommended").': 0)</span>' : $conf->global->MAIN_ALLOW_SVG_FILES_AS_IMAGES)."<br>";
+print '<strong>MAIN_ALLOW_SVG_FILES_AS_IMAGES</strong> = '.(empty($conf->global->MAIN_ALLOW_SVG_FILES_AS_IMAGES) ? '0' : $conf->global->MAIN_ALLOW_SVG_FILES_AS_IMAGES).' &nbsp; <span class="opacitymedium">('.$langs->trans("Recommended").': 0)</span><br>';
 print '<br>';
 
-print '<strong>MAIN_ALWAYS_CREATE_LOCK_AFTER_LAST_UPGRADE</strong> = '.(empty($conf->global->MAIN_ALWAYS_CREATE_LOCK_AFTER_LAST_UPGRADE) ? '<span class="opacitymedium">'.$langs->trans("Undefined").' &nbsp; ('.$langs->trans("Recommended").': 1)</span>' : $conf->global->MAIN_ALWAYS_CREATE_LOCK_AFTER_LAST_UPGRADE)."<br>";
+print '<strong>MAIN_ALWAYS_CREATE_LOCK_AFTER_LAST_UPGRADE</strong> = '.(empty($conf->global->MAIN_ALWAYS_CREATE_LOCK_AFTER_LAST_UPGRADE) ? '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>' : $conf->global->MAIN_ALWAYS_CREATE_LOCK_AFTER_LAST_UPGRADE).' &nbsp; <span class="opacitymedium">('.$langs->trans("Recommended").': 1)</span><br>';
 print '<br>';
 
 print '<strong>MAIN_RESTRICTHTML_ONLY_VALID_HTML</strong> = '.(empty($conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML) ? '<span class="opacitymedium">'.$langs->trans("Undefined").' &nbsp; ('.$langs->trans("Recommended").': 1)</span>' : $conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML)."<br>";

From 948663deb40f38ab739ceafee84fa1e08a105781 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 7 Aug 2021 13:59:07 +0200
Subject: [PATCH 1437/1497] Fix deprecated var

---
 htdocs/admin/system/security.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/admin/system/security.php b/htdocs/admin/system/security.php
index 4b98b40fb41..f2df395060b 100644
--- a/htdocs/admin/system/security.php
+++ b/htdocs/admin/system/security.php
@@ -95,7 +95,7 @@ print "<strong>PHP session.cookie_samesite</strong> = ".(ini_get('session.cookie
 print "<strong>PHP open_basedir</strong> = ".(ini_get('open_basedir') ? ini_get('open_basedir') : yn(0).' &nbsp; <span class="opacitymedium">('.$langs->trans("RecommendedValueIs", $langs->transnoentitiesnoconv("ARestrictedPath").', '.$langs->transnoentitiesnoconv("Example").' '.$_SERVER["DOCUMENT_ROOT"]).')</span>')."<br>\n";
 print "<strong>PHP allow_url_fopen</strong> = ".(ini_get('allow_url_fopen') ? img_picto($langs->trans("YouShouldSetThisToOff"), 'warning').' '.ini_get('allow_url_fopen') : yn(0)).' &nbsp; <span class="opacitymedium">('.$langs->trans("RecommendedValueIs", $langs->transnoentitiesnoconv("No")).")</span><br>\n";
 print "<strong>PHP allow_url_include</strong> = ".(ini_get('allow_url_include') ? img_picto($langs->trans("YouShouldSetThisToOff"), 'warning').' '.ini_get('allow_url_include') : yn(0)).' &nbsp; <span class="opacitymedium">('.$langs->trans("RecommendedValueIs", $langs->transnoentitiesnoconv("No")).")</span><br>\n";
-print "<strong>PHP safe_mode</strong> = ".(ini_get('safe_mode') ? ini_get('safe_mode') : yn(0)).' &nbsp; <span class="opacitymedium">'.$langs->trans("Deprecated")." (removed in PHP 5.4)</span><br>\n";
+//print "<strong>PHP safe_mode</strong> = ".(ini_get('safe_mode') ? ini_get('safe_mode') : yn(0)).' &nbsp; <span class="opacitymedium">'.$langs->trans("Deprecated")." (removed in PHP 5.4)</span><br>\n";
 print "<strong>PHP disable_functions</strong> = ";
 $arrayoffunctionsdisabled = explode(',', ini_get('disable_functions'));
 $arrayoffunctionstodisable = explode(',', 'pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_get_handler,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_async_signals');

From 3f0a5cc6893b9253804f724c6efdc46fc77e9cab Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 8 Aug 2021 12:04:21 +0200
Subject: [PATCH 1438/1497] Fix permission info on permissions group

---
 htdocs/user/group/perms.php | 94 ++++++++++++++++++++++++-------------
 htdocs/user/perms.php       |  6 +--
 2 files changed, 65 insertions(+), 35 deletions(-)

diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php
index 3ccbcf94d05..4bb95b46a89 100644
--- a/htdocs/user/group/perms.php
+++ b/htdocs/user/group/perms.php
@@ -22,9 +22,13 @@
 
 /**
  *		\file		htdocs/user/group/perms.php
- * 		\brief		Onglet user et permissions de la fiche utilisateur
+ * 		\brief		Page to set permissions of a user group record
  */
 
+if (!defined('CSRFCHECK_WITH_TOKEN')) {
+	define('CSRFCHECK_WITH_TOKEN', '1'); // Force use of CSRF protection with tokens even for GET
+}
+
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
@@ -41,6 +45,10 @@ $module = GETPOST('module', 'alpha');
 $rights = GETPOST('rights', 'int');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'groupperms'; // To manage different context of search
 
+if (!isset($id) || empty($id)) {
+	accessforbidden();
+}
+
 // Define if user can read permissions
 $canreadperms = ($user->admin || $user->rights->user->user->lire);
 // Define if user can modify group permissions
@@ -53,12 +61,15 @@ if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
 	$caneditperms = ($user->admin || $user->rights->user->group_advance->write);
 }
 
+// Security check
+//$result = restrictedArea($user, 'user', $id, 'usergroup', '');
 if (!$canreadperms) {
 	accessforbidden();
 }
 
 $object = new Usergroup($db);
 $object->fetch($id);
+$object->getrights();
 
 $entity = $conf->entity;
 
@@ -79,7 +90,7 @@ if ($reshook < 0) {
 if (empty($reshook)) {
 	if ($action == 'addrights' && $caneditperms) {
 		$editgroup = new Usergroup($db);
-		$result = $editgroup->fetch($id);
+		$result = $editgroup->fetch($object->id);
 		if ($result > 0) {
 			$result = $editgroup->addrights($rights, $module, '', $entity);
 			if ($result < 0) {
@@ -88,6 +99,9 @@ if (empty($reshook)) {
 		} else {
 			dol_print_error($db);
 		}
+		
+		$object->clearrights();
+		$object->getrights();
 	}
 
 	if ($action == 'delrights' && $caneditperms) {
@@ -101,11 +115,14 @@ if (empty($reshook)) {
 		} else {
 			dol_print_error($db);
 		}
+		
+		$object->clearrights();
+		$object->getrights();
 	}
 }
 
 
-/**
+/*
  * View
  */
 
@@ -114,11 +131,6 @@ $form = new Form($db);
 llxHeader('', $langs->trans("Permissions"));
 
 if ($object->id > 0) {
-	/*
-	 * Affichage onglets
-	 */
-	$object->getrights(); // Reload permission
-
 	$head = group_prepare_head($object);
 	$title = $langs->trans("Group");
 	print dol_get_fiche_head($head, 'rights', $title, -1, 'group');
@@ -165,8 +177,8 @@ if ($object->id > 0) {
 	$sql .= " FROM ".MAIN_DB_PREFIX."rights_def as r,";
 	$sql .= " ".MAIN_DB_PREFIX."usergroup_rights as gr";
 	$sql .= " WHERE gr.fk_id = r.id";
-	$sql .= " AND gr.entity = ".$entity;
-	$sql .= " AND gr.fk_usergroup = ".$object->id;
+	$sql .= " AND gr.entity = ".((int) $entity);
+	$sql .= " AND gr.fk_usergroup = ".((int) $object->id);
 
 	dol_syslog("get user perms", LOG_DEBUG);
 	$result = $db->query($sql);
@@ -186,6 +198,10 @@ if ($object->id > 0) {
 		dol_print_error($db);
 	}
 
+	/*
+	 * Part to add/remove permissions
+	 */
+	
 	$linkback = '<a href="'.DOL_URL_ROOT.'/user/group/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
 	dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin);
@@ -193,9 +209,6 @@ if ($object->id > 0) {
 	print '<div class="fichecenter">';
 	print '<div class="underbanner clearboth"></div>';
 
-	/*
-	 * Ecran ajout/suppression permission
-	 */
 
 	print '<table class="border centpercent tableforfield">';
 
@@ -235,26 +248,26 @@ if ($object->id > 0) {
 	print '<td>'.$langs->trans("Module").'</td>';
 	if ($caneditperms) {
 		print '<td class="center nowrap">';
-		print '<a class="reposition commonlink" title="'.dol_escape_htmltag($langs->trans("All")).'" alt="'.dol_escape_htmltag($langs->trans("All")).'" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;module=allmodules&amp;token='.newToken().'">'.$langs->trans("All")."</a>";
+		print '<a class="reposition commonlink" title="'.dol_escape_htmltag($langs->trans("All")).'" alt="'.dol_escape_htmltag($langs->trans("All")).'" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;module=allmodules&amp;confirm=yes&amp;token='.newToken().'">'.$langs->trans("All")."</a>";
 		print '/';
-		print '<a class="reposition commonlink" title="'.dol_escape_htmltag($langs->trans("None")).'" alt="'.dol_escape_htmltag($langs->trans("None")).'" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delrights&amp;entity='.$entity.'&amp;module=allmodules&amp;token='.newToken().'">'.$langs->trans("None")."</a>";
+		print '<a class="reposition commonlink" title="'.dol_escape_htmltag($langs->trans("None")).'" alt="'.dol_escape_htmltag($langs->trans("None")).'" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delrights&amp;entity='.$entity.'&amp;module=allmodules&amp;confirm=yes&amp;token='.newToken().'">'.$langs->trans("None")."</a>";
 		print '</td>';
 	}
 	print '<td class="center" width="24">&nbsp;</td>';
 	print '<td>'.$langs->trans("Permissions").'</td>';
 	if ($user->admin) {
-		print '<td class="right">'.$langs->trans("ID").'</td>';
+		print '<td class="right"></td>';
 	}
 	print '</tr>'."\n";
 
-	$sql = "SELECT r.id, r.libelle as label, r.module";
+	$sql = "SELECT r.id, r.libelle as label, r.module, r.perms, r.subperms, r.module_position, r.bydefault";
 	$sql .= " FROM ".MAIN_DB_PREFIX."rights_def as r";
 	$sql .= " WHERE r.libelle NOT LIKE 'tou%'"; // On ignore droits "tous"
-	$sql .= " AND r.entity = ".$entity;
+	$sql .= " AND r.entity = ".((int) $entity);
 	if (empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
 		$sql .= " AND r.perms NOT LIKE '%_advance'"; // Hide advanced perms if option is disable
 	}
-	$sql .= " ORDER BY r.module, r.id";
+	$sql .= " ORDER BY r.family_position, r.module_position, r.module, r.id";
 
 	$result = $db->query($sql);
 	if ($result) {
@@ -265,13 +278,16 @@ if ($object->id > 0) {
 		while ($i < $num) {
 			$obj = $db->fetch_object($result);
 
-			// If line is for a module that doe snot existe anymore (absent of includes/module), we ignore it
+			// If line is for a module that does not exist anymore (absent of includes/module), we ignore it
 			if (empty($modules[$obj->module])) {
 				$i++;
 				continue;
 			}
 
-			if ($oldmod <> $obj->module) {
+			$objMod = $modules[$obj->module];
+			
+			// Break found, it's a new module to catch
+			if (isset($obj->module) && ($oldmod <> $obj->module)) {
 				$oldmod = $obj->module;
 
 				// Break detected, we get objMod
@@ -286,21 +302,22 @@ if ($object->id > 0) {
 				print '</td>';
 				if ($caneditperms) {
 					print '<td class="center nowrap">';
-					print '<a class="reposition" title='.$langs->trans("All").' alt='.$langs->trans("All").' href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;module='.$obj->module.'&amp;token='.newToken().'">'.$langs->trans("All")."</a>";
+					print '<a class="reposition" title="'.dol_escape_htmltag($langs->trans("All")).'" alt="'.$langs->trans("All").'" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;module='.$obj->module.'&amp;token='.newToken().'">'.$langs->trans("All")."</a>";
 					print '/';
-					print '<a class="reposition" title='.$langs->trans("None").' alt='.$langs->trans("None").' href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delrights&amp;entity='.$entity.'&amp;module='.$obj->module.'&amp;token='.newToken().'">'.$langs->trans("None")."</a>";
+					print '<a class="reposition" title="'.dol_escape_htmltag($langs->trans("None")).'" alt="'.$langs->trans("None").'" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delrights&amp;entity='.$entity.'&amp;module='.$obj->module.'&amp;token='.newToken().'">'.$langs->trans("None")."</a>";
 					print '</td>';
 				} else {
 					print '<td>&nbsp;</td>';
 				}
-				print '<td colspan="2">&nbsp;</td>';
-
+				print '<td>&nbsp;</td>';
+				print '<td>&nbsp;</td>';
+				
 				// Permission id
 				if ($user->admin) {
 					print '<td class="right"></td>';
 				}
 
-				print '</tr>';
+				print '</tr>'."\n";
 			}
 
 			print '<!-- '.$obj->module.'->'.$obj->perms.($obj->subperms ? '->'.$obj->subperms : '').' -->'."\n";
@@ -315,7 +332,7 @@ if ($object->id > 0) {
 				if (in_array($obj->id, $permsgroupbyentity[$entity])) {
 					// Own permission by group
 					if ($caneditperms) {
-						print '<td class="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'&amp;token='.newToken().'">';
+						print '<td class="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'&amp;confirm=yes&amp;token='.newToken().'">';
 						//print img_edit_remove($langs->trans("Remove"));
 						print img_picto($langs->trans("Remove"), 'switch_on');
 						print '</a></td>';
@@ -326,7 +343,7 @@ if ($object->id > 0) {
 				} else {
 					// Do not own permission
 					if ($caneditperms) {
-						print '<td class="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'&amp;token='.newToken().'">';
+						print '<td class="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'&amp;confirm=yes&amp;token='.newToken().'">';
 						//print img_edit_add($langs->trans("Add"));
 						print img_picto($langs->trans("Add"), 'switch_off');
 						print '</a></td>';
@@ -336,7 +353,7 @@ if ($object->id > 0) {
 			} else {
 				// Do not own permission
 				if ($caneditperms) {
-					print '<td class="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'&amp;token='.newToken().'">';
+					print '<td class="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'&amp;confirm=yes&amp;token='.newToken().'">';
 					//print img_edit_add($langs->trans("Add"));
 					print img_picto($langs->trans("Add"), 'switch_off');
 					print '</a></td>';
@@ -344,12 +361,25 @@ if ($object->id > 0) {
 				print '<td>&nbsp;</td>';
 			}
 
-			$permlabel = ($conf->global->MAIN_USE_ADVANCED_PERMS && ($langs->trans("PermissionAdvanced".$obj->id) != ("PermissionAdvanced".$obj->id)) ? $langs->trans("PermissionAdvanced".$obj->id) : (($langs->trans("Permission".$obj->id) != ("Permission".$obj->id)) ? $langs->trans("Permission".$obj->id) : $langs->trans($obj->label)));
-			print '<td class="maxwidthonsmartphone">'.$permlabel.'</td>';
+			// Description of permission
+			$permlabel = (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ($langs->trans("PermissionAdvanced".$obj->id) != ("PermissionAdvanced".$obj->id)) ? $langs->trans("PermissionAdvanced".$obj->id) : (($langs->trans("Permission".$obj->id) != ("Permission".$obj->id)) ? $langs->trans("Permission".$obj->id) : $langs->trans($obj->label)));
+			print '<td>';
+			print $permlabel;
+			if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
+				if (preg_match('/_advance$/', $obj->perms)) {
+					print ' <span class="opacitymedium">('.$langs->trans("AdvancedModeOnly").')</span>';
+				}
+			}
+			print '</td>';
 
 			// Permission id
 			if ($user->admin) {
-				print '<td class="right"><span class="opacitymedium">'.$obj->id.'</span></td>';
+				print '<td class="right">';
+				$htmltext = $langs->trans("ID").': '.$obj->id;
+				$htmltext .= '<br>'.$langs->trans("Permission").': user->rights->'.$obj->module.'->'.$obj->perms.($obj->subperms ? '->'.$obj->subperms : '');
+				print $form->textwithpicto('', $htmltext);
+				//print '<span class="opacitymedium">'.$obj->id.'</span>';
+				print '</td>';
 			}
 
 			print '</tr>'."\n";
diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php
index 957c7a3a819..5e96a76119c 100644
--- a/htdocs/user/perms.php
+++ b/htdocs/user/perms.php
@@ -90,7 +90,7 @@ $hookmanager->initHooks(array('usercard', 'userperms', 'globalcard'));
  * Actions
  */
 
-$parameters = array('id'=>$socid);
+$parameters = array('socid'=>$socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -193,7 +193,7 @@ $permsuser = array();
 
 $sql = "SELECT DISTINCT ur.fk_id";
 $sql .= " FROM ".MAIN_DB_PREFIX."user_rights as ur";
-$sql .= " WHERE ur.entity = ".$entity;
+$sql .= " WHERE ur.entity = ".((int) $entity);
 $sql .= " AND ur.fk_user = ".((int) $object->id);
 
 dol_syslog("get user perms", LOG_DEBUG);
@@ -386,7 +386,7 @@ if ($result) {
 
 		// Picto and label of module
 		print '<td class="maxwidthonsmartphone tdoverflowonsmartphone">';
-		//print img_object('', $picto, 'class="pictoobjectwidth"').' '.$objMod->getName();
+		//print img_object('', $picto, 'class="inline-block pictoobjectwidth"').' '.$objMod->getName();
 		print '</td>';
 
 		// Permission and tick

From c377e5ea3d418676a3b43e88fac7a1ab51f67fc1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 8 Aug 2021 12:09:18 +0200
Subject: [PATCH 1439/1497] Fix undefined method

---
 htdocs/user/group/perms.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php
index 4bb95b46a89..e2c419b0543 100644
--- a/htdocs/user/group/perms.php
+++ b/htdocs/user/group/perms.php
@@ -99,9 +99,9 @@ if (empty($reshook)) {
 		} else {
 			dol_print_error($db);
 		}
-		
-		$object->clearrights();
-		$object->getrights();
+
+		$user->clearrights();
+		$user->getrights();
 	}
 
 	if ($action == 'delrights' && $caneditperms) {
@@ -115,9 +115,9 @@ if (empty($reshook)) {
 		} else {
 			dol_print_error($db);
 		}
-		
-		$object->clearrights();
-		$object->getrights();
+
+		$user->clearrights();
+		$user->getrights();
 	}
 }
 
@@ -201,7 +201,7 @@ if ($object->id > 0) {
 	/*
 	 * Part to add/remove permissions
 	 */
-	
+
 	$linkback = '<a href="'.DOL_URL_ROOT.'/user/group/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
 	dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin);
@@ -285,7 +285,7 @@ if ($object->id > 0) {
 			}
 
 			$objMod = $modules[$obj->module];
-			
+
 			// Break found, it's a new module to catch
 			if (isset($obj->module) && ($oldmod <> $obj->module)) {
 				$oldmod = $obj->module;
@@ -311,7 +311,7 @@ if ($object->id > 0) {
 				}
 				print '<td>&nbsp;</td>';
 				print '<td>&nbsp;</td>';
-				
+
 				// Permission id
 				if ($user->admin) {
 					print '<td class="right"></td>';

From 28ff7c894bad496ca8f74522cb7e66e7e27f9929 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 8 Aug 2021 12:14:40 +0200
Subject: [PATCH 1440/1497] Fix missing permission

---
 htdocs/core/menus/standard/eldy.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 1fbd91cb623..28f2b52ed35 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -334,7 +334,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 	// Accounting
 	$tmpentry = array(
 		'enabled'=>(!empty($conf->comptabilite->enabled) || !empty($conf->accounting->enabled) || !empty($conf->asset->enabled) || !empty($conf->intracommreport->enabled)),
-		'perms'=>(!empty($user->rights->compta->resultat->lire) || !empty($user->rights->accounting->mouvements->lire) || !empty($user->rights->asset->read) || !empty($user->rights->intracommreport->read)),
+		'perms'=>(!empty($user->rights->compta->resultat->lire) || !empty($user->rights->accounting->comptarapport->lire) || !empty($user->rights->accounting->mouvements->lire) || !empty($user->rights->asset->read) || !empty($user->rights->intracommreport->read)),
 		'module'=>'comptabilite|accounting|asset|intracommreport'
 	);
 	$menu_arr[] = array(

From 78e993c9f3d253f7b103fc80948bcddc5ce1099a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 8 Aug 2021 12:23:14 +0200
Subject: [PATCH 1441/1497] Fix permission to read reports

---
 htdocs/accountancy/index.php            | 2 +-
 htdocs/core/menus/standard/eldy.lib.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/accountancy/index.php b/htdocs/accountancy/index.php
index 6e13a662948..1842c23f418 100644
--- a/htdocs/accountancy/index.php
+++ b/htdocs/accountancy/index.php
@@ -49,7 +49,7 @@ if (empty($user->rights->accounting->mouvements->lire)) {
 if (empty($conf->comptabilite->enabled) && empty($conf->accounting->enabled) && empty($conf->asset->enabled) && empty($conf->intracommreport->enabled)) {
 	accessforbidden();
 }
-if (empty($user->rights->compta->resultat->lire) && empty($user->rights->accounting->mouvements->lire) && empty($user->rights->asset->read) && empty($user->rights->intracommreport->read)) {
+if (empty($user->rights->compta->resultat->lire) && empty($user->rights->accounting->comptarapport->lire) && empty($user->rights->accounting->mouvements->lire) && empty($user->rights->asset->read) && empty($user->rights->intracommreport->read)) {
 	accessforbidden();
 }
 
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 28f2b52ed35..d0b30d97398 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1205,7 +1205,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 
 			// Accounting (Double entries)
 			if (!empty($conf->accounting->enabled)) {
-				$permtoshowmenu = (!empty($conf->accounting->enabled) || $user->rights->accounting->bind->write || $user->rights->compta->resultat->lire);
+				//$permtoshowmenu = (!empty($conf->accounting->enabled) || $user->rights->accounting->bind->write || $user->rights->compta->resultat->lire);
 				//$newmenu->add("/accountancy/index.php?leftmenu=accountancy", $langs->trans("MenuAccountancy"), 0, $permtoshowmenu, '', $mainmenu, 'accountancy');
 
 				// Configuration
@@ -1342,7 +1342,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				}
 
 				// Accounting
-				$newmenu->add("/accountancy/index.php?leftmenu=accountancy_accountancy", $langs->trans("MenuAccountancy"), 0, $user->rights->accounting->mouvements->lire, '', $mainmenu, 'accountancy', 1, '', '', '', img_picto('', 'accountancy', 'class="paddingright pictofixedwidth"'));
+				$newmenu->add("/accountancy/index.php?leftmenu=accountancy_accountancy", $langs->trans("MenuAccountancy"), 0, $user->rights->accounting->mouvements->lire || $user->rights->accounting->comptarapport->lire, '', $mainmenu, 'accountancy', 1, '', '', '', img_picto('', 'accountancy', 'class="paddingright pictofixedwidth"'));
 
 				// General Ledger
 				$newmenu->add("/accountancy/bookkeeping/listbyaccount.php?mainmenu=accountancy&amp;leftmenu=accountancy_accountancy", $langs->trans("Bookkeeping"), 1, $user->rights->accounting->mouvements->lire);

From 029da815b2071f3743d630f137a7e8ba4411068d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 8 Aug 2021 12:35:52 +0200
Subject: [PATCH 1442/1497] Code comment

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

diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 2a5e3391eb9..909178d4fb1 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -531,7 +531,7 @@ abstract class CommonDocGenerator
 				$totalUp += $line->subprice * $line->qty;
 			}
 
-			// @GS: Calculate total up and total discount percentage
+			// Calculate total up and total discount percentage
 			// Note that this added fields does not match a field into database in Dolibarr (Dolibarr manage discount on lines not as a global property of object)
 			$resarray['object_total_up'] = $totalUp;
 			$resarray['object_total_up_locale'] = price($resarray['object_total_up'], 0, $outputlangs);

From 671baa261d08059bc588429135c7351c699f93a6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 8 Aug 2021 12:57:00 +0200
Subject: [PATCH 1443/1497] Fix var not defined

---
 htdocs/includes/odtphp/odf.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/includes/odtphp/odf.php b/htdocs/includes/odtphp/odf.php
index a66e337aa98..a1663bea1b1 100644
--- a/htdocs/includes/odtphp/odf.php
+++ b/htdocs/includes/odtphp/odf.php
@@ -175,6 +175,9 @@ class Odf
 				'<style:style style:name="supText" style:family="text"><style:text-properties style:text-position="super 58%" /></style:style>'
 			);
 
+			$customStyles = array();
+			$fontDeclarations = array();
+
 			$convertedValue = $this->_replaceHtmlWithOdtTag($this->_getDataFromHtml($value), $customStyles, $fontDeclarations);
 
 			foreach ($customStyles as $key => $val) {

From 6b1fc48bd06d5e05f9cbac7a01df2835b891cff0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 8 Aug 2021 18:22:09 +0200
Subject: [PATCH 1444/1497] Fix var not initialized

---
 htdocs/includes/odtphp/odf.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/includes/odtphp/odf.php b/htdocs/includes/odtphp/odf.php
index a1663bea1b1..a7416258a57 100644
--- a/htdocs/includes/odtphp/odf.php
+++ b/htdocs/includes/odtphp/odf.php
@@ -543,8 +543,9 @@ IMG;
 	 */
 	private function _parse($type = 'content')
 	{
-		// Search all tags fou into condition to complete $this->vars, so we will proceed all tests even if not defined
+		// Search all tags found into condition to complete $this->vars, so we will proceed all tests even if not defined
 		$reg='@\[!--\sIF\s([{}a-zA-Z0-9\.\,_]+)\s--\]@smU';
+		$matches = array();
 		preg_match_all($reg, $this->contentXml, $matches, PREG_SET_ORDER);
 
 		//var_dump($this->vars);exit;

From 091f5ab23be0c6d96e815b6fa0990130404d997d Mon Sep 17 00:00:00 2001
From: andreubisquerra <jove@bisquerra.com>
Date: Sun, 8 Aug 2021 19:12:45 +0200
Subject: [PATCH 1445/1497] Customer Display Lang

---
 htdocs/langs/en_US/cashdesk.lang | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang
index 86fdfd753a5..3b2d704a453 100644
--- a/htdocs/langs/en_US/cashdesk.lang
+++ b/htdocs/langs/en_US/cashdesk.lang
@@ -128,3 +128,4 @@ PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
 ShowPriceHT = Display the column with the price excluding tax (on screen)
 ShowPriceHTOnReceipt = Display the column with the price excluding tax (on the receipt)
+CustomerDisplay=Customer display

From 49b53e04f4b0db61d5befd5b39597430f849fa35 Mon Sep 17 00:00:00 2001
From: andreubisquerra <jove@bisquerra.com>
Date: Sun, 8 Aug 2021 19:13:31 +0200
Subject: [PATCH 1446/1497] Customer Display total on pay

---
 htdocs/takepos/pay.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/htdocs/takepos/pay.php b/htdocs/takepos/pay.php
index ba8ac8f82f7..773118e670f 100644
--- a/htdocs/takepos/pay.php
+++ b/htdocs/takepos/pay.php
@@ -255,6 +255,20 @@ if ($conf->global->TAKEPOS_NUMPAD == 0) {
 			});
 		}, 2500);
 	}
+	
+<?php
+if (!empty($conf->global->TAKEPOS_CUSTOMER_DISPLAY)) {
+	echo "var line1='".$langs->trans('TotalTTC')."'.substring(0,20);";
+	echo "line1=line1.padEnd(20);";
+	echo "var line2='".price($invoice->total_ttc, 1, '', 1, -1, -1)."'.substring(0,20);";
+	echo "line2=line2.padEnd(20);";
+	echo "$.ajax({
+		type: 'GET',
+		data: { text: line1+line2 },
+		url: '".getDolGlobalString('TAKEPOS_PRINT_SERVER')."/display/index.php',
+	});";
+}
+?>
 </script>
 
 <div style="position:relative; padding-top: 20px; left:5%; height:150px; width:90%;">

From bae5b397069f00e549f8c42b420910d2296ce38e Mon Sep 17 00:00:00 2001
From: andreubisquerra <jove@bisquerra.com>
Date: Sun, 8 Aug 2021 19:14:28 +0200
Subject: [PATCH 1447/1497] Customer display on click product

---
 htdocs/takepos/invoice.php | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index 721a7b92ae8..5526a5607d1 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -550,6 +550,10 @@ if ($action == "addline") {
 	if ($idoflineadded <= 0) {
 		$invoice->fetch_thirdparty();
 		$idoflineadded = $invoice->addline($prod->description, $price, 1, $tva_tx, $localtax1_tx, $localtax2_tx, $idproduct, $customer->remise_percent, '', 0, 0, 0, '', $price_base_type, $price_ttc, $prod->type, -1, 0, '', 0, $parent_line, null, '', '', 0, 100, '', null, 0);
+		if (!empty($conf->global->TAKEPOS_CUSTOMER_DISPLAY)) {
+			$CUSTOMER_DISPLAY_line1 = $prod->label;
+			$CUSTOMER_DISPLAY_line2 = price($price_ttc);
+		}
 	}
 
 	$invoice->fetch($placeid);
@@ -1176,6 +1180,23 @@ $( document ).ready(function() {
 
 });
 
+
+<?php
+if (!empty($conf->global->TAKEPOS_CUSTOMER_DISPLAY)) {
+	echo "function CustomerDisplay(){";
+	echo "var line1='".$CUSTOMER_DISPLAY_line1."'.substring(0,20);";
+	echo "line1=line1.padEnd(20);";
+	echo "var line2='".$CUSTOMER_DISPLAY_line2."'.substring(0,20);";
+	echo "line2=line2.padEnd(20);";
+	echo "$.ajax({
+		type: 'GET',
+		data: { text: line1+line2 },
+		url: '".getDolGlobalString('TAKEPOS_PRINT_SERVER')."/display/index.php',
+	});";
+	echo "}";
+}
+?>
+
 </script>
 
 <?php

From 8a513ea4682302e6a4b97125ae5271d1fa80d499 Mon Sep 17 00:00:00 2001
From: andreubisquerra <jove@bisquerra.com>
Date: Sun, 8 Aug 2021 19:15:18 +0200
Subject: [PATCH 1448/1497] Customer display on addline

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

diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index e7b8b8af438..d11a081280c 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -434,7 +434,7 @@ function ClickProduct(position) {
 		if (idproduct=="") return;
 		// Call page invoice.php to generate the section with product lines
 		$("#poslines").load("invoice.php?action=addline&place="+place+"&idproduct="+idproduct+"&selectedline="+selectedline, function() {
-			//$('#poslines').scrollTop($('#poslines')[0].scrollHeight);
+			<?php if (!empty($conf->global->TAKEPOS_CUSTOMER_DISPLAY)) echo "CustomerDisplay();";?>
 		});
 	}
 

From ea531a4c88c89fbd16f0eeb706a64afec2a50f64 Mon Sep 17 00:00:00 2001
From: andreubisquerra <jove@bisquerra.com>
Date: Sun, 8 Aug 2021 19:16:11 +0200
Subject: [PATCH 1449/1497] Customer display settings

---
 htdocs/takepos/admin/receipt.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/htdocs/takepos/admin/receipt.php b/htdocs/takepos/admin/receipt.php
index 9b236fc837a..74a54400fef 100644
--- a/htdocs/takepos/admin/receipt.php
+++ b/htdocs/takepos/admin/receipt.php
@@ -254,6 +254,14 @@ if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector" && filter_var($con
 	print "</td></tr>\n";
 }
 
+if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector" && filter_var($conf->global->TAKEPOS_PRINT_SERVER, FILTER_VALIDATE_URL) == true) {
+	print '<tr class="oddeven"><td>';
+	print $langs->trans('CustomerDisplay');
+	print '<td colspan="2">';
+	print ajax_constantonoff("TAKEPOS_CUSTOMER_DISPLAY", array(), $conf->entity, 0, 0, 1, 0);
+	print "</td></tr>\n";
+}
+
 print '</table>';
 print '</div>';
 

From 91ef2a44fd50676afb6768287c93dcbfdfb4cbd2 Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Mon, 9 Aug 2021 11:17:11 +0200
Subject: [PATCH 1450/1497] Remove strange check on hook printOriginObjectLine.
 Now need reshook.

---
 ChangeLog                                | 10 ++++++++++
 htdocs/core/class/commonobject.class.php | 15 ++++++++++-----
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c477a17d684..66bccd31c06 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,16 @@ English Dolibarr ChangeLog
 --------------------------------------------------------------
 
 
+***** ChangeLog for 15.0.0 compared to 14.0.0 *****
+
+For developers:
+---------------
+
+WARNING:
+
+Following changes may create regressions for some external modules, but were necessary to make Dolibarr better:
+* Update hook 'printOriginObjectLine', removed check on product type and special code. Need now reshook.
+
 ***** ChangeLog for 14.0.0 compared to 13.0.0 *****
 
 For users:
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 36df3b1a7b9..c13d8130774 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -4805,13 +4805,18 @@ abstract class CommonObject
 
 		if (!empty($this->lines)) {
 			foreach ($this->lines as $line) {
-				if (is_object($hookmanager) && (($line->product_type == 9 && !empty($line->special_code)) || !empty($line->fk_parent_line))) {
+				$reshook = 0;
+				//if (is_object($hookmanager) && (($line->product_type == 9 && !empty($line->special_code)) || !empty($line->fk_parent_line))) {
+				if (is_object($hookmanager)) {   // Old code is commented on preceding line.
 					if (empty($line->fk_parent_line)) {
-						$parameters = array('line'=>$line, 'i'=>$i);
-						$action = '';
-						$hookmanager->executeHooks('printOriginObjectLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+						$parameters = array('line'=>$line, 'i'=>$i, 'restrictlist'=>$restrictlist, 'selectedLines'=> $selectedLines);
+						$reshook = $hookmanager->executeHooks('printOriginObjectLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+					} else {
+						$parameters = array('line'=>$line, 'i'=>$i, 'restrictlist'=>$restrictlist, 'selectedLines'=> $selectedLines, 'fk_parent_line'=>$line->fk_parent_line);
+						$reshook = $hookmanager->executeHooks('printOriginObjectSubLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 					}
-				} else {
+				}
+				if (empty($reshook)) {
 					$this->printOriginLine($line, '', $restrictlist, '/core/tpl', $selectedLines);
 				}
 

From 108a5ff7cbf610b29858cef7f1bc6747b58dcda9 Mon Sep 17 00:00:00 2001
From: Quentin VIAL-GOUTEYRON <quentin.vial-gouteyron@atm-consulting.fr>
Date: Mon, 9 Aug 2021 15:14:25 +0200
Subject: [PATCH 1451/1497] FIX postgre filter select search extrafield

---
 htdocs/core/tpl/extrafields_list_search_sql.tpl.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/tpl/extrafields_list_search_sql.tpl.php b/htdocs/core/tpl/extrafields_list_search_sql.tpl.php
index 6b08baddb72..557c057c1c1 100644
--- a/htdocs/core/tpl/extrafields_list_search_sql.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_sql.tpl.php
@@ -41,7 +41,7 @@ if (! empty($extrafieldsobjectkey) && ! empty($search_array_options) && is_array
 			if (in_array($typ, array('chkbxlst', 'checkbox'))) $mode_search=4;	                            // Search on a multiselect field with sql type = text
 			if (is_array($crit)) $crit = implode(' ', $crit); // natural_search() expects a string
 			elseif ($typ === 'select' and is_string($crit) and strpos($crit, ' ') === false) {
-				$sql .= ' AND (' . $extrafieldsobjectprefix.$tmpkey . ' = "' . $db->escape($crit) . '")';
+				$sql .= ' AND (' . $extrafieldsobjectprefix.$tmpkey . ' = \'' . $db->escape($crit) . '\')';
 				continue;
 			}
 			$sql .= natural_search($extrafieldsobjectprefix.$tmpkey, $crit, $mode_search);

From e4cb1e023aa4b678235f5a6115478f3e4bf94e05 Mon Sep 17 00:00:00 2001
From: Christian Foellmann <christian@foellmann.de>
Date: Mon, 9 Aug 2021 15:39:04 +0200
Subject: [PATCH 1452/1497] fix link to supplier card of thirdparty on
 supplier_order list

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

diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index 5fcafb2fdc4..3c89be6bfe4 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -877,7 +877,7 @@ if ($resql) {
 		// Thirdparty
 		if (!empty($arrayfields['s.nom']['checked'])) {
 			print '<td class="tdoverflowmax200">';
-			print $companystatic->getNomUrl(1, 'customer');
+			print $companystatic->getNomUrl(1, 'supplier');
 			print '</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;

From 2de728c07475e86006906e0704dcd11c114626a5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 9 Aug 2021 16:12:20 +0200
Subject: [PATCH 1453/1497] Fix trans

---
 htdocs/langs/en_US/partnership.lang           |  4 ++
 .../partnership/class/partnership.class.php   | 47 +++++++++----------
 2 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/htdocs/langs/en_US/partnership.lang b/htdocs/langs/en_US/partnership.lang
index 3a653e29967..f5b9ebcde24 100644
--- a/htdocs/langs/en_US/partnership.lang
+++ b/htdocs/langs/en_US/partnership.lang
@@ -77,6 +77,10 @@ YourPartnershipRefusedContent=We inform you that your partnership request has be
 YourPartnershipAcceptedContent=We inform you that your partnership request has been accepted.
 YourPartnershipCanceledContent=We inform you that your partnership has been canceled.
 
+CountLastUrlCheckError=Number of errors for last URL check
+LastCheckBacklink=Date of last URL check
+ReasonDeclineOrCancel=Reason for declining or canceling
+
 #
 # Status
 #
diff --git a/htdocs/partnership/class/partnership.class.php b/htdocs/partnership/class/partnership.class.php
index 97da524db31..e7b034e64b5 100644
--- a/htdocs/partnership/class/partnership.class.php
+++ b/htdocs/partnership/class/partnership.class.php
@@ -100,7 +100,27 @@ class Partnership extends CommonObject
 	/**
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
-	public $fields=array();
+	public $fields=array(
+		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
+		'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>'1', 'position'=>10, 'notnull'=>1, 'visible'=>4, 'noteditable'=>'1', 'default'=>'(PROV)', 'index'=>1, 'searchall'=>1, 'showoncombobox'=>'1', 'comment'=>"Reference of object"),
+		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => 1, 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 15, 'index' => 1),
+		//'fk_type' => array('type' => 'integer:PartnershipType:partnership/class/partnershiptype.class.php', 'label' => 'Type', 'default' => 1, 'enabled' => 1, 'visible' => 1, 'position' => 20),
+		'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>'1', 'position'=>61, 'notnull'=>0, 'visible'=>0,),
+		'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>'1', 'position'=>62, 'notnull'=>0, 'visible'=>0,),
+		'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>'1', 'position'=>500, 'notnull'=>1, 'visible'=>-2,),
+		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>'1', 'position'=>501, 'notnull'=>0, 'visible'=>-2,),
+		'fk_user_creat' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>'1', 'position'=>510, 'notnull'=>1, 'visible'=>-2, 'foreignkey'=>'user.rowid',),
+		'fk_user_modif' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>'1', 'position'=>511, 'notnull'=>-1, 'visible'=>-2,),
+		'last_main_doc' => array('type'=>'varchar(255)', 'label'=>'LastMainDoc', 'enabled'=>'1', 'position'=>600, 'notnull'=>0, 'visible'=>0,),
+		'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>'1', 'position'=>1000, 'notnull'=>-1, 'visible'=>-2,),
+		'model_pdf' => array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>'1', 'position'=>1010, 'notnull'=>-1, 'visible'=>0,),
+		'date_partnership_start' => array('type'=>'date', 'label'=>'DatePartnershipStart', 'enabled'=>'1', 'position'=>52, 'notnull'=>1, 'visible'=>1,),
+		'date_partnership_end' => array('type'=>'date', 'label'=>'DatePartnershipEnd', 'enabled'=>'1', 'position'=>53, 'notnull'=>1, 'visible'=>1,),
+		'status' => array('type'=>'smallint', 'label'=>'Status', 'enabled'=>'1', 'position'=>54, 'notnull'=>0, 'visible'=>2, 'index'=>1, 'arrayofkeyval'=>array('-1'=>'','0'=>'Draft', '1'=>'Accepted', '2'=>'Refused', '9'=>'Canceled'),),
+		'count_last_url_check_error' => array('type'=>'integer', 'label'=>'CountLastUrlCheckError', 'enabled'=>'1', 'position'=>63, 'notnull'=>0, 'visible'=>-2, 'default'=>'0',),
+		'last_check_backlink' => array('type'=>'datetime', 'label'=>'LastCheckBacklink', 'enabled'=>'1', 'position'=>65, 'notnull'=>0, 'visible'=>-2,),
+		'reason_decline_or_cancel' => array('type'=>'text', 'label'=>'ReasonDeclineOrCancel', 'enabled'=>'1', 'position'=>64, 'notnull'=>0, 'visible'=>-2,),
+	);
 
 	/**
 	 * @var int rowid
@@ -164,7 +184,6 @@ class Partnership extends CommonObject
 	// public $lines = array();
 
 
-
 	/**
 	 * Constructor
 	 *
@@ -176,32 +195,10 @@ class Partnership extends CommonObject
 
 		$this->db = $db;
 
-		$this->fields=array(
-			'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
-			'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>'1', 'position'=>10, 'notnull'=>1, 'visible'=>4, 'noteditable'=>'1', 'default'=>'(PROV)', 'index'=>1, 'searchall'=>1, 'showoncombobox'=>'1', 'comment'=>"Reference of object"),
-			'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => 1, 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 15, 'index' => 1),
-			//'fk_type' => array('type' => 'integer:PartnershipType:partnership/class/partnershiptype.class.php', 'label' => 'Type', 'default' => 1, 'enabled' => 1, 'visible' => 1, 'position' => 20),
-			'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>'1', 'position'=>61, 'notnull'=>0, 'visible'=>0,),
-			'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>'1', 'position'=>62, 'notnull'=>0, 'visible'=>0,),
-			'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>'1', 'position'=>500, 'notnull'=>1, 'visible'=>-2,),
-			'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>'1', 'position'=>501, 'notnull'=>0, 'visible'=>-2,),
-			'fk_user_creat' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>'1', 'position'=>510, 'notnull'=>1, 'visible'=>-2, 'foreignkey'=>'user.rowid',),
-			'fk_user_modif' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>'1', 'position'=>511, 'notnull'=>-1, 'visible'=>-2,),
-			'last_main_doc' => array('type'=>'varchar(255)', 'label'=>'LastMainDoc', 'enabled'=>'1', 'position'=>600, 'notnull'=>0, 'visible'=>0,),
-			'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>'1', 'position'=>1000, 'notnull'=>-1, 'visible'=>-2,),
-			'model_pdf' => array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>'1', 'position'=>1010, 'notnull'=>-1, 'visible'=>0,),
-			'date_partnership_start' => array('type'=>'date', 'label'=>'DatePartnershipStart', 'enabled'=>'1', 'position'=>52, 'notnull'=>1, 'visible'=>1,),
-			'date_partnership_end' => array('type'=>'date', 'label'=>'DatePartnershipEnd', 'enabled'=>'1', 'position'=>53, 'notnull'=>1, 'visible'=>1,),
-			'status' => array('type'=>'smallint', 'label'=>'Status', 'enabled'=>'1', 'position'=>54, 'notnull'=>0, 'visible'=>2, 'index'=>1, 'arrayofkeyval'=>array('-1'=>'','0'=>$langs->trans('Draft'), '1'=>$langs->trans('Accepted'), '2'=>$langs->trans('Refused'), '9'=>$langs->trans('Canceled')),),
-			'count_last_url_check_error' => array('type'=>'integer', 'label'=>'CountLastUrlCheckError', 'enabled'=>'1', 'position'=>63, 'notnull'=>0, 'visible'=>-2, 'default'=>'0',),
-			'last_check_backlink' => array('type'=>'datetime', 'label'=>'LastCheckBacklink', 'enabled'=>'1', 'position'=>65, 'notnull'=>0, 'visible'=>-2,),
-			'reason_decline_or_cancel' => array('type'=>'text', 'label'=>'ReasonDeclineOrCancel', 'enabled'=>'1', 'position'=>64, 'notnull'=>0, 'visible'=>-2,),
-		);
-
 		if (!empty($conf->global->PARTNERSHIP_IS_MANAGED_FOR) && $conf->global->PARTNERSHIP_IS_MANAGED_FOR == 'member') {
 			$this->fields['fk_member'] = array('type'=>'integer:Adherent:adherents/class/adherent.class.php:1', 'label'=>'Member', 'enabled'=>'1', 'position'=>50, 'notnull'=>-1, 'visible'=>1, 'index'=>1, 'picto'=>'member');
 		} else {
-			$this->fields['fk_soc'] = array('type'=>'integer:Societe:societe/class/societe.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'ThirdParty', 'enabled'=>'1', 'position'=>50, 'notnull'=>-1, 'visible'=>1, 'index'=>1, 'picto'=>'societe');
+			$this->fields['fk_soc'] = array('type'=>'integer:Societe:societe/class/societe.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'ThirdParty', 'enabled'=>'1', 'position'=>50, 'notnull'=>-1, 'visible'=>1, 'index'=>1, 'picto'=>'company');
 		}
 
 		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {

From 305314c04ed4cb7137b52205ffb05ff0b8c2a1ec Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 9 Aug 2021 16:18:33 +0200
Subject: [PATCH 1454/1497] Fix data structure

---
 htdocs/install/mysql/migration/14.0.0-15.0.0.sql | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/install/mysql/migration/14.0.0-15.0.0.sql b/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
index 89546dd9bb6..274e3b145e0 100644
--- a/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
+++ b/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
@@ -32,6 +32,9 @@
 
 -- Missing in v14 or lower
 
+-- VMYSQL4.3 ALTER TABLE llx_partnership MODIFY COLUMN date_partnership_end date NULL;
+-- VPGSQL8.2 ALTER TABLE llx_partnership ALTER COLUMN date_partnership_end DROP NOT NULL;
+
 
 -- v15
 

From 739d8e1c6b108220c6228ecfb4f62c201f86d5a6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 9 Aug 2021 16:19:23 +0200
Subject: [PATCH 1455/1497] Fix data structure

---
 htdocs/install/mysql/migration/13.0.0-14.0.0.sql | 2 ++
 htdocs/install/mysql/tables/llx_partnership.sql  | 2 +-
 htdocs/partnership/class/partnership.class.php   | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index 26a1c238c86..032504dfa61 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -596,3 +596,5 @@ create table llx_onlinesignature
   pathoffile				varchar(255)
 )ENGINE=innodb;
 
+-- VMYSQL4.3 ALTER TABLE llx_partnership MODIFY COLUMN date_partnership_end date NULL;
+-- VPGSQL8.2 ALTER TABLE llx_partnership ALTER COLUMN date_partnership_end DROP NOT NULL;
diff --git a/htdocs/install/mysql/tables/llx_partnership.sql b/htdocs/install/mysql/tables/llx_partnership.sql
index 99dfe0d6ffe..6ab312f8875 100644
--- a/htdocs/install/mysql/tables/llx_partnership.sql
+++ b/htdocs/install/mysql/tables/llx_partnership.sql
@@ -23,7 +23,7 @@ CREATE TABLE llx_partnership(
 	fk_soc integer, 
 	fk_member integer, 
 	date_partnership_start date NOT NULL, 
-	date_partnership_end date NOT NULL, 
+	date_partnership_end date NULL, 
 	entity integer DEFAULT 1 NOT NULL,	-- multi company id, 0 = all
 	reason_decline_or_cancel text NULL,
 	date_creation datetime NOT NULL, 
diff --git a/htdocs/partnership/class/partnership.class.php b/htdocs/partnership/class/partnership.class.php
index e7b034e64b5..a94cff8925d 100644
--- a/htdocs/partnership/class/partnership.class.php
+++ b/htdocs/partnership/class/partnership.class.php
@@ -115,7 +115,7 @@ class Partnership extends CommonObject
 		'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>'1', 'position'=>1000, 'notnull'=>-1, 'visible'=>-2,),
 		'model_pdf' => array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>'1', 'position'=>1010, 'notnull'=>-1, 'visible'=>0,),
 		'date_partnership_start' => array('type'=>'date', 'label'=>'DatePartnershipStart', 'enabled'=>'1', 'position'=>52, 'notnull'=>1, 'visible'=>1,),
-		'date_partnership_end' => array('type'=>'date', 'label'=>'DatePartnershipEnd', 'enabled'=>'1', 'position'=>53, 'notnull'=>1, 'visible'=>1,),
+		'date_partnership_end' => array('type'=>'date', 'label'=>'DatePartnershipEnd', 'enabled'=>'1', 'position'=>53, 'notnull'=>0, 'visible'=>1,),
 		'status' => array('type'=>'smallint', 'label'=>'Status', 'enabled'=>'1', 'position'=>54, 'notnull'=>0, 'visible'=>2, 'index'=>1, 'arrayofkeyval'=>array('-1'=>'','0'=>'Draft', '1'=>'Accepted', '2'=>'Refused', '9'=>'Canceled'),),
 		'count_last_url_check_error' => array('type'=>'integer', 'label'=>'CountLastUrlCheckError', 'enabled'=>'1', 'position'=>63, 'notnull'=>0, 'visible'=>-2, 'default'=>'0',),
 		'last_check_backlink' => array('type'=>'datetime', 'label'=>'LastCheckBacklink', 'enabled'=>'1', 'position'=>65, 'notnull'=>0, 'visible'=>-2,),

From 6e4fb8dd8bf9d937723949eae5a742485d244c68 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 9 Aug 2021 16:48:36 +0200
Subject: [PATCH 1456/1497] Fix debited instead of credited for bank transfer
 sepa status

---
 htdocs/compta/prelevement/card.php                 |  3 ++-
 .../prelevement/class/bonprelevement.class.php     | 14 ++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/htdocs/compta/prelevement/card.php b/htdocs/compta/prelevement/card.php
index b03ed9d93e0..8a232377ab7 100644
--- a/htdocs/compta/prelevement/card.php
+++ b/htdocs/compta/prelevement/card.php
@@ -200,7 +200,8 @@ if ($id > 0 || $ref) {
 
 	//print '<tr><td class="titlefield">'.$langs->trans("Ref").'</td><td>'.$object->getNomUrl(1).'</td></tr>';
 	print '<tr><td class="titlefield">'.$langs->trans("Date").'</td><td>'.dol_print_date($object->datec, 'day').'</td></tr>';
-	print '<tr><td>'.$langs->trans("Amount").'</td><td>'.price($object->amount).'</td></tr>';
+
+	print '<tr><td>'.$langs->trans("Amount").'</td><td><span class="amount">'.price($object->amount).'</span></td></tr>';
 
 	// Status
 	/*
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index f69c7b476a2..1b6afa3cffe 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -82,7 +82,8 @@ class BonPrelevement extends CommonObject
 
 	const STATUS_DRAFT = 0;
 	const STATUS_TRANSFERED = 1;
-	const STATUS_CREDITED = 2;
+	const STATUS_CREDITED = 2;		// STATUS_CREDITED and STATUS_DEBITED is same. Difference is in ->type
+	const STATUS_DEBITED = 2;		// STATUS_CREDITED and STATUS_DEBITED is same. Difference is in ->type
 
 
 	/**
@@ -2343,17 +2344,22 @@ class BonPrelevement extends CommonObject
 			//$langs->load("mymodule");
 			$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('StatusWaiting');
 			$this->labelStatus[self::STATUS_TRANSFERED] = $langs->trans('StatusTrans');
-			$this->labelStatus[self::STATUS_CREDITED] = $langs->trans('StatusCredited');
 			$this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans('StatusWaiting');
 			$this->labelStatusShort[self::STATUS_TRANSFERED] = $langs->trans('StatusTrans');
-			$this->labelStatusShort[self::STATUS_CREDITED] = $langs->trans('StatusCredited');
+			if ($this->type == 'bank-transfer') {
+				$this->labelStatus[self::STATUS_DEBITED] = $langs->trans('StatusDebited');
+				$this->labelStatusShort[self::STATUS_DEBITED] = $langs->trans('StatusDebited');
+			} else {
+				$this->labelStatus[self::STATUS_CREDITED] = $langs->trans('StatusCredited');
+				$this->labelStatusShort[self::STATUS_CREDITED] = $langs->trans('StatusCredited');
+			}
 		}
 
 		$statusType = 'status1';
 		if ($status == self::STATUS_TRANSFERED) {
 			$statusType = 'status3';
 		}
-		if ($status == self::STATUS_CREDITED) {
+		if ($status == self::STATUS_CREDITED || $status == self::STATUS_DEBITED) {
 			$statusType = 'status6';
 		}
 

From 0876cb4cd99183c3b69ba2ab5544f4afdf63d045 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 9 Aug 2021 17:41:23 +0200
Subject: [PATCH 1457/1497] Fix button cancel

---
 htdocs/admin/eventorganization.php | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/htdocs/admin/eventorganization.php b/htdocs/admin/eventorganization.php
index 53d27efeba2..d01aece1ca0 100644
--- a/htdocs/admin/eventorganization.php
+++ b/htdocs/admin/eventorganization.php
@@ -34,13 +34,9 @@ require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 // Translations
 $langs->loadLangs(array("admin", "eventorganization"));
 
-// Access control
-if (!$user->admin) {
-	accessforbidden();
-}
-
 // Parameters
 $action = GETPOST('action', 'aZ09');
+$cancel = GETPOST('cancel', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
 
 $value = GETPOST('value', 'alpha');
@@ -70,11 +66,21 @@ $setupnotempty = 0;
 
 $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 
+// Access control
+if (empty($user->admin)) {
+	accessforbidden();
+}
+
+
 
 /*
  * Actions
  */
 
+if ($cancel) {
+	$action  ='';
+}
+
 if ((float) DOL_VERSION >= 6) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 }
@@ -207,7 +213,7 @@ if ($action == 'edit') {
 	print '<input type="hidden" name="action" value="update">';
 
 	print '<table class="noborder centpercent">';
-	print '<tr class="liste_titre"><td class="titlefieldcreate">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
+	print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
 	foreach ($arrayofparameters as $constname => $val) {
 		if ($val['enabled']==1) {
@@ -293,7 +299,9 @@ if ($action == 'edit') {
 	print '</table>';
 
 	print '<br><div class="center">';
-	print '<input class="button button-save" type="submit" value="'.$langs->trans("Save").'">';
+	print '<input class="button button-save" type="submit" name="save" value="'.$langs->trans("Save").'">';
+	print ' &nbsp; ';
+	print '<input class="button button-cancel" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
 	print '</div>';
 
 	print '</form>';
@@ -301,7 +309,7 @@ if ($action == 'edit') {
 } else {
 	if (!empty($arrayofparameters)) {
 		print '<table class="noborder centpercent">';
-		print '<tr class="liste_titre"><td class="titlefieldcreate">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
+		print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
 		foreach ($arrayofparameters as $constname => $val) {
 			if ($val['enabled']==1) {

From e91c5fc1c5c06893907d0c7d78b30440cfb257b0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 9 Aug 2021 17:55:26 +0200
Subject: [PATCH 1458/1497] Clean code

---
 .../install/mysql/data/llx_c_email_templates.sql | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_c_email_templates.sql b/htdocs/install/mysql/data/llx_c_email_templates.sql
index 393875dd40f..bbfad205cdd 100644
--- a/htdocs/install/mysql/data/llx_c_email_templates.sql
+++ b/htdocs/install/mysql/data/llx_c_email_templates.sql
@@ -21,18 +21,18 @@
 --
 
 -- Bank Thirdparty
-INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, enabled, active, topic, content, content_lines) VALUES (0,'banque','thirdparty','',0,null,null,'(YourSEPAMandate)',1,'$conf->societe->enabled && $conf->banque->enabled && $conf->prelevement->enabled',0,'__(YourSEPAMandate)__','__(Hello)__,<br><br>\n\n__(FindYourSEPAMandate)__ :<br>\n__MYCOMPANY_NAME__<br>\n__MYCOMPANY_FULLADDRESS__<br><br>\n__(Sincerely)__<br>\n__USER_SIGNATURE__',null);
+INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, enabled, active, topic, content, content_lines, joinfiles) VALUES (0, 'banque','thirdparty','',0,null,null,'(YourSEPAMandate)',1,'$conf->societe->enabled && $conf->banque->enabled && $conf->prelevement->enabled',0,'__(YourSEPAMandate)__','__(Hello)__,<br><br>\n\n__(FindYourSEPAMandate)__ :<br>\n__MYCOMPANY_NAME__<br>\n__MYCOMPANY_FULLADDRESS__<br><br>\n__(Sincerely)__<br>\n__USER_SIGNATURE__',null, 0);
 
 -- Members
-INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, enabled, active, topic, content, content_lines, joinfiles) VALUES (0,'adherent','member','',0,null,null,'(SendingEmailOnAutoSubscription)'       ,10,'$conf->adherent->enabled',1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(YourMembershipRequestWasReceived)__','__(Hello)__ __MEMBER_FULLNAME__,<br><br>\n\n__(ThisIsContentOfYourMembershipRequestWasReceived)__<br>\n<br>__ONLINE_PAYMENT_TEXT_AND_URL__<br>\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',null, 0);
-INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, enabled, active, topic, content, content_lines, joinfiles) VALUES (0,'adherent','member','',0,null,null,'(SendingEmailOnMemberValidation)'       ,20,'$conf->adherent->enabled',1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(YourMembershipWasValidated)__',      '__(Hello)__ __MEMBER_FULLNAME__,<br><br>\n\n__(ThisIsContentOfYourMembershipWasValidated)__<br>__(FirstName)__ : __MEMBER_FIRSTNAME__<br>__(LastName)__ : __MEMBER_LASTNAME__<br>__(ID)__ : __MEMBER_ID__<br>\n<br>__ONLINE_PAYMENT_TEXT_AND_URL__<br>\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',null, 0);
-INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, enabled, active, topic, content, content_lines, joinfiles) VALUES (0,'adherent','member','',0,null,null,'(SendingEmailOnNewSubscription)'        ,30,'$conf->adherent->enabled',1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(YourSubscriptionWasRecorded)__',     '__(Hello)__ __MEMBER_FULLNAME__,<br><br>\n\n__(ThisIsContentOfYourSubscriptionWasRecorded)__<br>\n\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',null, 1);
-INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, enabled, active, topic, content, content_lines, joinfiles) VALUES (0,'adherent','member','',0,null,null,'(SendingReminderForExpiredSubscription)',40,'$conf->adherent->enabled',1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(SubscriptionReminderEmail)__',       '__(Hello)__ __MEMBER_FULLNAME__,<br><br>\n\n__(ThisIsContentOfSubscriptionReminderEmail)__<br>\n<br>__ONLINE_PAYMENT_TEXT_AND_URL__<br>\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',null, 0);
-INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, enabled, active, topic, content, content_lines, joinfiles) VALUES (0,'adherent','member','',0,null,null,'(SendingEmailOnCancelation)'            ,50,'$conf->adherent->enabled',1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(YourMembershipWasCanceled)__',       '__(Hello)__ __MEMBER_FULLNAME__,<br><br>\n\n__(YourMembershipWasCanceled)__<br>\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',null, 0);
-INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, enabled, active, topic, content, content_lines, joinfiles) VALUES (0,'adherent','member','',0,null,null,'(SendingAnEMailToMember)'               ,60,'$conf->adherent->enabled',1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(CardContent)__',                     '__(Hello)__,<br><br>\n\n__(ThisIsContentOfYourCard)__<br>\n__(ID)__ : __ID__<br>\n__(Civiliyty)__ : __MEMBER_CIVILITY__<br>\n__(Firstname)__ : __MEMBER_FIRSTNAME__<br>\n__(Lastname)__ : __MEMBER_LASTNAME__<br>\n__(Fullname)__ : __MEMBER_FULLNAME__<br>\n__(Company)__ : __MEMBER_COMPANY__<br>\n__(Address)__ : __MEMBER_ADDRESS__<br>\n__(Zip)__ : __MEMBER_ZIP__<br>\n__(Town)__ : __MEMBER_TOWN__<br>\n__(Country)__ : __MEMBER_COUNTRY__<br>\n__(Email)__ : __MEMBER_EMAIL__<br>\n__(Birthday)__ : __MEMBER_BIRTH__<br>\n__(Photo)__ : __MEMBER_PHOTO__<br>\n__(Login)__ : __MEMBER_LOGIN__<br>\n__(Password)__ : __MEMBER_PASSWORD__<br>\n__(Phone)__ : __MEMBER_PHONE__<br>\n__(PhonePerso)__ : __MEMBER_PHONEPRO__<br>\n__(PhoneMobile)__ : __MEMBER_PHONEMOBILE__<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',null, 0);
+INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, enabled, active, topic, content, content_lines, joinfiles) VALUES (0, 'adherent','member','',0,null,null,'(SendingEmailOnAutoSubscription)'       ,10,'$conf->adherent->enabled',1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(YourMembershipRequestWasReceived)__','__(Hello)__ __MEMBER_FULLNAME__,<br><br>\n\n__(ThisIsContentOfYourMembershipRequestWasReceived)__<br>\n<br>__ONLINE_PAYMENT_TEXT_AND_URL__<br>\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',null, 0);
+INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, enabled, active, topic, content, content_lines, joinfiles) VALUES (0, 'adherent','member','',0,null,null,'(SendingEmailOnMemberValidation)'       ,20,'$conf->adherent->enabled',1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(YourMembershipWasValidated)__',      '__(Hello)__ __MEMBER_FULLNAME__,<br><br>\n\n__(ThisIsContentOfYourMembershipWasValidated)__<br>__(FirstName)__ : __MEMBER_FIRSTNAME__<br>__(LastName)__ : __MEMBER_LASTNAME__<br>__(ID)__ : __MEMBER_ID__<br>\n<br>__ONLINE_PAYMENT_TEXT_AND_URL__<br>\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',null, 0);
+INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, enabled, active, topic, content, content_lines, joinfiles) VALUES (0, 'adherent','member','',0,null,null,'(SendingEmailOnNewSubscription)'        ,30,'$conf->adherent->enabled',1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(YourSubscriptionWasRecorded)__',     '__(Hello)__ __MEMBER_FULLNAME__,<br><br>\n\n__(ThisIsContentOfYourSubscriptionWasRecorded)__<br>\n\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',null, 1);
+INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, enabled, active, topic, content, content_lines, joinfiles) VALUES (0, 'adherent','member','',0,null,null,'(SendingReminderForExpiredSubscription)',40,'$conf->adherent->enabled',1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(SubscriptionReminderEmail)__',       '__(Hello)__ __MEMBER_FULLNAME__,<br><br>\n\n__(ThisIsContentOfSubscriptionReminderEmail)__<br>\n<br>__ONLINE_PAYMENT_TEXT_AND_URL__<br>\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',null, 0);
+INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, enabled, active, topic, content, content_lines, joinfiles) VALUES (0, 'adherent','member','',0,null,null,'(SendingEmailOnCancelation)'            ,50,'$conf->adherent->enabled',1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(YourMembershipWasCanceled)__',       '__(Hello)__ __MEMBER_FULLNAME__,<br><br>\n\n__(YourMembershipWasCanceled)__<br>\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',null, 0);
+INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, enabled, active, topic, content, content_lines, joinfiles) VALUES (0, 'adherent','member','',0,null,null,'(SendingAnEMailToMember)'               ,60,'$conf->adherent->enabled',1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(CardContent)__',                     '__(Hello)__,<br><br>\n\n__(ThisIsContentOfYourCard)__<br>\n__(ID)__ : __ID__<br>\n__(Civiliyty)__ : __MEMBER_CIVILITY__<br>\n__(Firstname)__ : __MEMBER_FIRSTNAME__<br>\n__(Lastname)__ : __MEMBER_LASTNAME__<br>\n__(Fullname)__ : __MEMBER_FULLNAME__<br>\n__(Company)__ : __MEMBER_COMPANY__<br>\n__(Address)__ : __MEMBER_ADDRESS__<br>\n__(Zip)__ : __MEMBER_ZIP__<br>\n__(Town)__ : __MEMBER_TOWN__<br>\n__(Country)__ : __MEMBER_COUNTRY__<br>\n__(Email)__ : __MEMBER_EMAIL__<br>\n__(Birthday)__ : __MEMBER_BIRTH__<br>\n__(Photo)__ : __MEMBER_PHOTO__<br>\n__(Login)__ : __MEMBER_LOGIN__<br>\n__(Password)__ : __MEMBER_PASSWORD__<br>\n__(Phone)__ : __MEMBER_PHONE__<br>\n__(PhonePerso)__ : __MEMBER_PHONEPRO__<br>\n__(PhoneMobile)__ : __MEMBER_PHONEMOBILE__<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',null, 0);
 
 -- Recruiting
-INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, enabled, active, topic, content, content_lines, joinfiles) VALUES (0,'recruitment','recruitmentcandidature_send','',0,null,null,'(AnswerCandidature)'       ,100,'$conf->recruitment->enabled',1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(YourCandidature)__',       '__(Hello)__ __CANDIDATE_FULLNAME__,<br><br>\n\n__(YourCandidatureAnswerMessage)__<br>__ONLINE_INTERVIEW_SCHEDULER_TEXT_AND_URL__\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',null, 0);
+INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, enabled, active, topic, content, content_lines, joinfiles) VALUES (0, 'recruitment','recruitmentcandidature_send','',0,null,null,'(AnswerCandidature)'       ,100,'$conf->recruitment->enabled',1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(YourCandidature)__',       '__(Hello)__ __CANDIDATE_FULLNAME__,<br><br>\n\n__(YourCandidatureAnswerMessage)__<br>__ONLINE_INTERVIEW_SCHEDULER_TEXT_AND_URL__\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',null, 0);
 
 -- Event organization 
 INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'conferenceorbooth', '', 0, null, null, '(EventOrganizationEmailAskConf)',       10, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailAskConf)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventConfRequestWasReceived)__<br /><br />__ONLINE_PAYMENT_TEXT_AND_URL__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);

From 2c5e0a595b22b15b9c0e8d32a83b798152014e31 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 9 Aug 2021 17:58:08 +0200
Subject: [PATCH 1459/1497] Fix init data missing

---
 htdocs/install/mysql/data/llx_c_email_templates.sql | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/htdocs/install/mysql/data/llx_c_email_templates.sql b/htdocs/install/mysql/data/llx_c_email_templates.sql
index bbfad205cdd..4005506e887 100644
--- a/htdocs/install/mysql/data/llx_c_email_templates.sql
+++ b/htdocs/install/mysql/data/llx_c_email_templates.sql
@@ -41,3 +41,9 @@ INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private,
 INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'conferenceorbooth', '', 0, null, null, '(EventOrganizationEmailSubsEvent)',     40, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailSubsEvent)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventEventSubscriptionWasReceived)__<br /><br />__(Sincerely)__<br /><br />__MYCOMPANY_NAME__<br />__USER_SIGNATURE__', null, '1', null);
 INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'conferenceorbooth', '', 0, null, null, '(EventOrganizationMassEmailAttendees)', 50, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationMassEmailAttendees)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventBulkMailToAttendees)__<br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
 INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'conferenceorbooth', '', 0, null, null, '(EventOrganizationMassEmailSpeakers)',  60, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationMassEmailSpeakers)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventBulkMailToSpeakers)__<br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
+
+-- Partnership
+INSERT INTO llx_c_email_templates (entity, module, type_template, label, lang, position, topic, joinfiles, content) VALUES (0, 'partnership', 'partnership_send', '(SendingEmailOnPartnershipWillSoonBeCanceled)', '', 100, '[__[MAIN_INFO_SOCIETE_NOM]__] - __(YourPartnershipWillSoonBeCanceledTopic)__', 0, '<body>\n <p>__(Hello)__,<br><br>\n__(YourPartnershipWillSoonBeCanceledContent)__</p>\n<br />\n\n<br />\n\n            __(Sincerely)__ <br />\n            __[MAIN_INFO_SOCIETE_NOM]__ <br />\n </body>\n');
+INSERT INTO llx_c_email_templates (entity, module, type_template, label, lang, position, topic, joinfiles, content) VALUES (0, 'partnership', 'partnership_send', '(SendingEmailOnPartnershipCanceled)', '', 100, '[__[MAIN_INFO_SOCIETE_NOM]__] - __(YourPartnershipCanceledTopic)__', 0, '<body>\n <p>__(Hello)__,<br><br>\n__(YourPartnershipCanceledContent)__</p>\n<br />\n\n<br />\n\n            __(Sincerely)__ <br />\n            __[MAIN_INFO_SOCIETE_NOM]__ <br />\n </body>\n');
+INSERT INTO llx_c_email_templates (entity, module, type_template, label, lang, position, topic, joinfiles, content) VALUES (0, 'partnership', 'partnership_send', '(SendingEmailOnPartnershipRefused)', '', 100, '[__[MAIN_INFO_SOCIETE_NOM]__] - __(YourPartnershipRefusedTopic)__', 0, '<body>\n <p>__(Hello)__,<br><br>\n__(YourPartnershipRefusedContent)__</p>\n<br />\n\n<br />\n\n            __(Sincerely)__ <br />\n            __[MAIN_INFO_SOCIETE_NOM]__ <br />\n </body>\n');
+INSERT INTO llx_c_email_templates (entity, module, type_template, label, lang, position, topic, joinfiles, content) VALUES (0, 'partnership', 'partnership_send', '(SendingEmailOnPartnershipAccepted)', '', 100, '[__[MAIN_INFO_SOCIETE_NOM]__] - __(YourPartnershipAcceptedTopic)__', 0, '<body>\n <p>__(Hello)__,<br><br>\n__(YourPartnershipAcceptedContent)__</p>\n<br />\n\n<br />\n\n            __(Sincerely)__ <br />\n            __[MAIN_INFO_SOCIETE_NOM]__ <br />\n </body>\n');

From b5b53e382e9327951d185e8a162f3fefbcace437 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 9 Aug 2021 18:01:41 +0200
Subject: [PATCH 1460/1497] Fix missing template

---
 htdocs/admin/mails_templates.php | 3 +++
 htdocs/langs/en_US/admin.lang    | 1 +
 2 files changed, 4 insertions(+)

diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index 8d0fb1165a8..db3c45a0776 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -230,6 +230,9 @@ if (!empty($conf->agenda->enabled)) {
 if (!empty($conf->eventorganization->enabled) && !empty($user->rights->eventorganization->read)) {
 	$elementList['eventorganization_send'] = img_picto('', 'action', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToSendEventOrganization'));
 }
+if (!empty($conf->partnership->enabled) && !empty($user->rights->partnership->read)) {
+	$elementList['partnership_send'] = img_picto('', 'partnership', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToPartnership'));
+}
 
 $parameters = array('elementList'=>$elementList);
 $reshook = $hookmanager->executeHooks('emailElementlist', $parameters); // Note that $action and $object may have been modified by some hooks
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index d4047e654d3..1484a741e80 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -2129,6 +2129,7 @@ AskThisIDToYourBank=Contact your bank to get this ID
 AdvancedModeOnly=Permision available in Advanced permission mode only
 ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
 MailToSendEventOrganization=Event Organization
+MailToPartnership=Partnership
 AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
 YouShouldDisablePHPFunctions=You should disable PHP functions
 IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands in custom code, you shoud disable PHP functions

From 3f58e7c5db9eaf83c3575a7d18b3070527e6a42b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 9 Aug 2021 18:31:34 +0200
Subject: [PATCH 1461/1497] Debug status of partnership

---
 .../partnership/class/partnership.class.php   | 20 ++++--
 htdocs/partnership/partnership_card.php       | 64 ++++++++++++++++---
 2 files changed, 68 insertions(+), 16 deletions(-)

diff --git a/htdocs/partnership/class/partnership.class.php b/htdocs/partnership/class/partnership.class.php
index a94cff8925d..feef3c7e81f 100644
--- a/htdocs/partnership/class/partnership.class.php
+++ b/htdocs/partnership/class/partnership.class.php
@@ -65,8 +65,9 @@ class Partnership extends CommonObject
 
 
 	const STATUS_DRAFT = 0;
-	const STATUS_ACCEPTED = 1;
-	const STATUS_REFUSED = 2;
+	const STATUS_VALIDATED = 1;		// Validate (no more draft)
+	const STATUS_ACCEPTED = 2;		// Approved
+	const STATUS_REFUSED = 3;		// Refused
 	const STATUS_CANCELED = 9;
 
 
@@ -590,7 +591,7 @@ class Partnership extends CommonObject
 		$error = 0;
 
 		// Protection
-		if ($this->status == self::STATUS_ACCEPTED) {
+		if ($this->status == self::STATUS_VALIDATED) {
 			dol_syslog(get_class($this)."::validate action abandonned: already validated", LOG_WARNING);
 			return 0;
 		}
@@ -619,7 +620,7 @@ class Partnership extends CommonObject
 			// Validate
 			$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
 			$sql .= " SET ref = '".$this->db->escape($num)."',";
-			$sql .= " status = ".self::STATUS_ACCEPTED;
+			$sql .= " status = ".self::STATUS_VALIDATED;
 			if (!empty($this->fields['date_validation'])) {
 				$sql .= ", date_validation = '".$this->db->idate($now)."'";
 			}
@@ -686,7 +687,7 @@ class Partnership extends CommonObject
 		// Set new ref and current status
 		if (!$error) {
 			$this->ref = $num;
-			$this->status = self::STATUS_ACCEPTED;
+			$this->status = self::STATUS_VALIDATED;
 		}
 
 		if (!$error) {
@@ -1064,17 +1065,24 @@ class Partnership extends CommonObject
 			global $langs;
 			//$langs->load("partnership");
 			$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('Draft');
+			$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('Validated');
 			$this->labelStatus[self::STATUS_ACCEPTED] = $langs->trans('Accepted');
 			$this->labelStatus[self::STATUS_REFUSED] = $langs->trans('Refused');
 			$this->labelStatus[self::STATUS_CANCELED] = $langs->trans('Canceled');
 			$this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans('Draft');
+			$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('Validated');
 			$this->labelStatusShort[self::STATUS_ACCEPTED] = $langs->trans('Accepted');
 			$this->labelStatusShort[self::STATUS_REFUSED] = $langs->trans('Refused');
 			$this->labelStatusShort[self::STATUS_CANCELED] = $langs->trans('Canceled');
 		}
 
 		$statusType = 'status'.$status;
-		//if ($status == self::STATUS_ACCEPTED) $statusType = 'status1';
+		if ($status == self::STATUS_ACCEPTED) {
+			$statusType = 'status4';
+		}
+		if ($status == self::STATUS_REFUSED) {
+			$statusType = 'status9';
+		}
 		if ($status == self::STATUS_CANCELED) {
 			$statusType = 'status6';
 		}
diff --git a/htdocs/partnership/partnership_card.php b/htdocs/partnership/partnership_card.php
index e79924caf48..e0fa5b90f4c 100644
--- a/htdocs/partnership/partnership_card.php
+++ b/htdocs/partnership/partnership_card.php
@@ -1,6 +1,6 @@
 <?php
-/* Copyright (C) 2017 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2021		NextGestion			<contact@nextgestion.com>
+/* Copyright (C) 2017-2021 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2021      NextGestion			<contact@nextgestion.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
@@ -120,7 +120,39 @@ if (empty($reshook)) {
 	$triggermodname = 'PARTNERSHIP_MODIFY'; // Name of trigger action code to execute when we modify record
 
 	// Action accept object
-	if ($action == 'confirm_accept' && $confirm == 'yes' && $permissiontoadd) {
+	if ($action == 'confirm_validate' && $confirm == 'yes' && $permissiontoadd) {
+		$result = $object->validate($user);
+		if ($result >= 0) {
+			// Define output language
+			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+				if (method_exists($object, 'generateDocument')) {
+					$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($id); // Reload to get new records
+
+					$model = $object->model_pdf;
+
+					$retgen = $object->generateDocument($model, $outputlangs, 0, 0, 0);
+					if ($retgen < 0) {
+						setEventMessages($object->error, $object->errors, 'warnings');
+					}
+				}
+			}
+		} else {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	} elseif ($action == 'confirm_accept' && $confirm == 'yes' && $permissiontoadd) {
 		$result = $object->accept($user);
 		if ($result >= 0) {
 			// Define output language
@@ -143,7 +175,7 @@ if (empty($reshook)) {
 
 					$model = $object->model_pdf;
 
-					$retgen = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
+					$retgen = $object->generateDocument($model, $outputlangs, 0, 0, 0);
 					if ($retgen < 0) {
 						setEventMessages($object->error, $object->errors, 'warnings');
 					}
@@ -339,7 +371,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToReopon'), $langs->trans('ConfirmReoponAsk', $object->ref), 'confirm_reopen', $formquestion, 'yes', 1);
 	}
 
-	// Refuse confirmatio
+	// Refuse confirmation
 	if ($action == 'refuse') {
 		//Form to close proposal (signed or not)
 		$formquestion = array(
@@ -533,23 +565,35 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 				print dolGetButtonAction($langs->trans('SendMail'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init&token='.newToken().'#formmailbeforetitle');
 			}
 
+			if ($object->status == $object::STATUS_DRAFT) {
+				print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&token='.newToken(), '', $permissiontoadd);
+			}
+
 			// Back to draft
 			if ($object->status != $object::STATUS_DRAFT) {
 				print dolGetButtonAction($langs->trans('SetToDraft'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_setdraft&confirm=yes&token='.newToken(), '', $permissiontoadd);
 			}
 
-			print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&token='.newToken(), '', $permissiontoadd);
-
-			// Accept
+			// Validate
 			if ($object->status == $object::STATUS_DRAFT) {
 				if (empty($object->table_element_line) || (is_array($object->lines) && count($object->lines) > 0)) {
-					print dolGetButtonAction($langs->trans('Validate'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_accept&confirm=yes&token='.newToken(), '', $permissiontoadd);
+					print dolGetButtonAction($langs->trans('Validate'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_validate&confirm=yes&token='.newToken(), '', $permissiontoadd);
 				} else {
 					$langs->load("errors");
 					print dolGetButtonAction($langs->trans("ErrorAddAtLeastOneLineFirst"), $langs->trans("Validate"), 'default', '#', '', 0);
 				}
 			}
 
+			// Approve
+			if ($object->status == $object::STATUS_VALIDATED) {
+				if (empty($object->table_element_line) || (is_array($object->lines) && count($object->lines) > 0)) {
+					print dolGetButtonAction($langs->trans('Approved'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_accept&confirm=yes&token='.newToken(), '', $permissiontoadd);
+				} else {
+					$langs->load("errors");
+					print dolGetButtonAction($langs->trans("ErrorAddAtLeastOneLineFirst"), $langs->trans("Approved"), 'default', '#', '', 0);
+				}
+			}
+
 			// Cancel
 			if ($permissiontoadd) {
 				if ($object->status == $object::STATUS_ACCEPTED) {
@@ -562,7 +606,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 			// Refuse
 			if ($permissiontoadd) {
-				if ($object->status != $object::STATUS_ACCEPTED && $object->status != $object::STATUS_CANCELED && $object->status != $object::STATUS_REFUSED) {
+				if ($object->status != $object::STATUS_DRAFT && $object->status != $object::STATUS_ACCEPTED && $object->status != $object::STATUS_CANCELED && $object->status != $object::STATUS_REFUSED) {
 					print dolGetButtonAction($langs->trans('Refuse'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=refuse&token='.newToken(), '', $permissiontoadd);
 				}
 			}

From 6a9217474d70cd0f55704ec243d59e659a8f31a4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 9 Aug 2021 20:01:06 +0200
Subject: [PATCH 1462/1497] FIX Can't set cost price when product is not on
 purchase

---
 htdocs/product/fournisseurs.php  | 20 +++++++++++++-----
 htdocs/product/price.php         | 36 +++++++++++++++++++++++++++++---
 htdocs/product/stock/product.php | 25 +++++++++++++++++++---
 3 files changed, 70 insertions(+), 11 deletions(-)

diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index 1234deef497..97f29de72f6 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -103,6 +103,9 @@ if ($id > 0 || $ref) {
 	$object->fetch($id, $ref);
 }
 
+$usercanread = (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->lire) || ($object->type == Product::TYPE_SERVICE && $user->rights->service->lire));
+$usercancreate = (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->creer) || ($object->type == Product::TYPE_SERVICE && $user->rights->service->creer));
+
 if ($object->id > 0) {
 	if ($object->type == $object::TYPE_PRODUCT) {
 		restrictedArea($user, 'produit', $object->id, 'product&product', '', '');
@@ -123,9 +126,6 @@ if ($cancel) {
 	$action = '';
 }
 
-$usercanread = (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->lire) || ($object->type == Product::TYPE_SERVICE && $user->rights->service->lire));
-$usercancreate = (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->creer) || ($object->type == Product::TYPE_SERVICE && $user->rights->service->creer));
-
 $parameters = array('socid'=>$socid, 'id_prod'=>$id);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
@@ -404,13 +404,23 @@ if ($id > 0 || $ref) {
 			print '<div class="underbanner clearboth"></div>';
 			print '<table class="border tableforfield centpercent">';
 
+			// Type
+			if (!empty($conf->product->enabled) && !empty($conf->service->enabled)) {
+				$typeformat = 'select;0:'.$langs->trans("Product").',1:'.$langs->trans("Service");
+				print '<tr><td class="">';
+				print (empty($conf->global->PRODUCT_DENY_CHANGE_PRODUCT_TYPE)) ? $form->editfieldkey("Type", 'fk_product_type', $object->type, $object, 0, $typeformat) : $langs->trans('Type');
+				print '</td><td>';
+				print $form->editfieldval("Type", 'fk_product_type', $object->type, $object, 0, $typeformat);
+				print '</td></tr>';
+			}
+
 			// Cost price. Can be used for margin module for option "calculate margin on explicit cost price
 			print '<tr><td>';
 			$textdesc = $langs->trans("CostPriceDescription");
 			$textdesc .= "<br>".$langs->trans("CostPriceUsage");
 			$text = $form->textwithpicto($langs->trans("CostPrice"), $textdesc, 1, 'help', '');
 			print $form->editfieldkey($text, 'cost_price', $object->cost_price, $object, $usercancreate, 'amount:6');
-			print '</td><td colspan="2">';
+			print '</td><td>';
 			print $form->editfieldval($text, 'cost_price', $object->cost_price, $object, $usercancreate, 'amount:6');
 			print '</td></tr>';
 
@@ -425,7 +435,7 @@ if ($id > 0 || $ref) {
 
 			// Best buying Price
 			print '<tr><td class="titlefieldcreate">'.$langs->trans("BuyingPriceMin").'</td>';
-			print '<td colspan="2">';
+			print '<td>';
 			$product_fourn = new ProductFournisseur($db);
 			if ($product_fourn->find_min_price_product_fournisseur($object->id) > 0) {
 				if ($product_fourn->product_fourn_price_id > 0) {
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index bb46839e588..03867bb65e9 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -717,8 +717,18 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_
 		$soc->id = $socid;
 		$soc->fetch($socid);
 
+		// Type
+		if (!empty($conf->product->enabled) && !empty($conf->service->enabled)) {
+			$typeformat = 'select;0:'.$langs->trans("Product").',1:'.$langs->trans("Service");
+			print '<tr><td class="">';
+			print (empty($conf->global->PRODUCT_DENY_CHANGE_PRODUCT_TYPE)) ? $form->editfieldkey("Type", 'fk_product_type', $object->type, $object, 0, $typeformat) : $langs->trans('Type');
+			print '</td><td>';
+			print $form->editfieldval("Type", 'fk_product_type', $object->type, $object, 0, $typeformat);
+			print '</td></tr>';
+		}
+
 		// Selling price
-		print '<tr><td class="titlefield">';
+		print '<tr><td class="titlefieldcreate">';
 		print $langs->trans("SellingPrice");
 		print '</td>';
 		print '<td colspan="2">';
@@ -791,13 +801,33 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_
 		}
 	} else {
 		if (!empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL)) {  // using this option is a bug. kept for backward compatibility
+			// Type
+			if (!empty($conf->product->enabled) && !empty($conf->service->enabled)) {
+				$typeformat = 'select;0:'.$langs->trans("Product").',1:'.$langs->trans("Service");
+				print '<tr><td class="">';
+				print (empty($conf->global->PRODUCT_DENY_CHANGE_PRODUCT_TYPE)) ? $form->editfieldkey("Type", 'fk_product_type', $object->type, $object, 0, $typeformat) : $langs->trans('Type');
+				print '</td><td>';
+				print $form->editfieldval("Type", 'fk_product_type', $object->type, $object, 0, $typeformat);
+				print '</td></tr>';
+			}
+
 			// We show only vat for level 1
-			print '<tr><td class="titlefield">'.$langs->trans("DefaultTaxRate").'</td>';
+			print '<tr><td class="titlefieldcreate">'.$langs->trans("DefaultTaxRate").'</td>';
 			print '<td colspan="2">'.vatrate($object->multiprices_tva_tx[1], true).'</td>';
 			print '</tr>';
 		} else {
+			// Type
+			if (!empty($conf->product->enabled) && !empty($conf->service->enabled)) {
+				$typeformat = 'select;0:'.$langs->trans("Product").',1:'.$langs->trans("Service");
+				print '<tr><td class="">';
+				print (empty($conf->global->PRODUCT_DENY_CHANGE_PRODUCT_TYPE)) ? $form->editfieldkey("Type", 'fk_product_type', $object->type, $object, 0, $typeformat) : $langs->trans('Type');
+				print '</td><td>';
+				print $form->editfieldval("Type", 'fk_product_type', $object->type, $object, 0, $typeformat);
+				print '</td></tr>';
+			}
+
 			// TVA
-			print '<tr><td class="titlefield">'.$langs->trans("DefaultTaxRate").'</td><td>';
+			print '<tr><td class="titlefieldcreate">'.$langs->trans("DefaultTaxRate").'</td><td>';
 
 			$positiverates = '';
 			if (price2num($object->tva_tx)) {
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index a00feb194a0..7fcee8f59cd 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -77,6 +77,7 @@ $batchnumber = GETPOST('batch_number', 'san_alpha');
 if (!empty($batchnumber)) {
 	$batchnumber = trim($batchnumber);
 }
+$cost_price = GETPOST('cost_price', 'alpha');
 
 // Security check
 if ($user->socid) {
@@ -113,6 +114,9 @@ $hookmanager->initHooks(array('stockproductcard', 'globalcard'));
 
 $error = 0;
 
+$usercanread = (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->lire) || ($object->type == Product::TYPE_SERVICE && $user->rights->service->lire));
+$usercancreate = (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->creer) || ($object->type == Product::TYPE_SERVICE && $user->rights->service->creer));
+
 if ($object->id > 0) {
 	if ($object->type == $object::TYPE_PRODUCT) {
 		restrictedArea($user, 'produit', $object->id, 'product&product', '', '');
@@ -139,6 +143,21 @@ if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
 
+if ($action == 'setcost_price') {
+	if ($id) {
+		$result = $object->fetch($id);
+		$object->cost_price = price2num($cost_price);
+		$result = $object->update($object->id, $user);
+		if ($result > 0) {
+			setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
+			$action = '';
+		} else {
+			$error++;
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	}
+}
+
 if ($action == 'addlimitstockwarehouse' && !empty($user->rights->produit->creer)) {
 	$seuil_stock_alerte = GETPOST('seuil_stock_alerte');
 	$desiredstock = GETPOST('desiredstock');
@@ -600,9 +619,9 @@ if ($id > 0 || $ref) {
 			if (!empty($conf->product->enabled) && !empty($conf->service->enabled)) {
 				$typeformat = 'select;0:'.$langs->trans("Product").',1:'.$langs->trans("Service");
 				print '<tr><td class="">';
-				print (empty($conf->global->PRODUCT_DENY_CHANGE_PRODUCT_TYPE)) ? $form->editfieldkey("Type", 'fk_product_type', $object->type, $object, $usercancreate, $typeformat) : $langs->trans('Type');
+				print (empty($conf->global->PRODUCT_DENY_CHANGE_PRODUCT_TYPE)) ? $form->editfieldkey("Type", 'fk_product_type', $object->type, $object, 0, $typeformat) : $langs->trans('Type');
 				print '</td><td>';
-				print $form->editfieldval("Type", 'fk_product_type', $object->type, $object, $usercancreate, $typeformat);
+				print $form->editfieldval("Type", 'fk_product_type', $object->type, $object, 0, $typeformat);
 				print '</td></tr>';
 			}
 
@@ -618,7 +637,7 @@ if ($id > 0 || $ref) {
 			$textdesc .= "<br>".$langs->trans("CostPriceUsage");
 			$text = $form->textwithpicto($langs->trans("CostPrice"), $textdesc, 1, 'help', '');
 			print $form->editfieldkey($text, 'cost_price', $object->cost_price, $object, $usercancreate, 'amount:6');
-			print '</td><td colspan="2">';
+			print '</td><td>';
 			print $form->editfieldval($text, 'cost_price', $object->cost_price, $object, $usercancreate, 'amount:6');
 			print '</td></tr>';
 

From f3dbe81df45e21989add4ef92fc5e824d5a2d9a7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 9 Aug 2021 20:01:06 +0200
Subject: [PATCH 1463/1497] FIX Can't set cost price when product is not on
 purchase

---
 htdocs/product/fournisseurs.php  | 20 +++++++++++++-----
 htdocs/product/price.php         | 36 +++++++++++++++++++++++++++++---
 htdocs/product/stock/product.php | 25 +++++++++++++++++++---
 3 files changed, 70 insertions(+), 11 deletions(-)

diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index 1234deef497..97f29de72f6 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -103,6 +103,9 @@ if ($id > 0 || $ref) {
 	$object->fetch($id, $ref);
 }
 
+$usercanread = (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->lire) || ($object->type == Product::TYPE_SERVICE && $user->rights->service->lire));
+$usercancreate = (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->creer) || ($object->type == Product::TYPE_SERVICE && $user->rights->service->creer));
+
 if ($object->id > 0) {
 	if ($object->type == $object::TYPE_PRODUCT) {
 		restrictedArea($user, 'produit', $object->id, 'product&product', '', '');
@@ -123,9 +126,6 @@ if ($cancel) {
 	$action = '';
 }
 
-$usercanread = (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->lire) || ($object->type == Product::TYPE_SERVICE && $user->rights->service->lire));
-$usercancreate = (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->creer) || ($object->type == Product::TYPE_SERVICE && $user->rights->service->creer));
-
 $parameters = array('socid'=>$socid, 'id_prod'=>$id);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
@@ -404,13 +404,23 @@ if ($id > 0 || $ref) {
 			print '<div class="underbanner clearboth"></div>';
 			print '<table class="border tableforfield centpercent">';
 
+			// Type
+			if (!empty($conf->product->enabled) && !empty($conf->service->enabled)) {
+				$typeformat = 'select;0:'.$langs->trans("Product").',1:'.$langs->trans("Service");
+				print '<tr><td class="">';
+				print (empty($conf->global->PRODUCT_DENY_CHANGE_PRODUCT_TYPE)) ? $form->editfieldkey("Type", 'fk_product_type', $object->type, $object, 0, $typeformat) : $langs->trans('Type');
+				print '</td><td>';
+				print $form->editfieldval("Type", 'fk_product_type', $object->type, $object, 0, $typeformat);
+				print '</td></tr>';
+			}
+
 			// Cost price. Can be used for margin module for option "calculate margin on explicit cost price
 			print '<tr><td>';
 			$textdesc = $langs->trans("CostPriceDescription");
 			$textdesc .= "<br>".$langs->trans("CostPriceUsage");
 			$text = $form->textwithpicto($langs->trans("CostPrice"), $textdesc, 1, 'help', '');
 			print $form->editfieldkey($text, 'cost_price', $object->cost_price, $object, $usercancreate, 'amount:6');
-			print '</td><td colspan="2">';
+			print '</td><td>';
 			print $form->editfieldval($text, 'cost_price', $object->cost_price, $object, $usercancreate, 'amount:6');
 			print '</td></tr>';
 
@@ -425,7 +435,7 @@ if ($id > 0 || $ref) {
 
 			// Best buying Price
 			print '<tr><td class="titlefieldcreate">'.$langs->trans("BuyingPriceMin").'</td>';
-			print '<td colspan="2">';
+			print '<td>';
 			$product_fourn = new ProductFournisseur($db);
 			if ($product_fourn->find_min_price_product_fournisseur($object->id) > 0) {
 				if ($product_fourn->product_fourn_price_id > 0) {
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index bb46839e588..03867bb65e9 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -717,8 +717,18 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_
 		$soc->id = $socid;
 		$soc->fetch($socid);
 
+		// Type
+		if (!empty($conf->product->enabled) && !empty($conf->service->enabled)) {
+			$typeformat = 'select;0:'.$langs->trans("Product").',1:'.$langs->trans("Service");
+			print '<tr><td class="">';
+			print (empty($conf->global->PRODUCT_DENY_CHANGE_PRODUCT_TYPE)) ? $form->editfieldkey("Type", 'fk_product_type', $object->type, $object, 0, $typeformat) : $langs->trans('Type');
+			print '</td><td>';
+			print $form->editfieldval("Type", 'fk_product_type', $object->type, $object, 0, $typeformat);
+			print '</td></tr>';
+		}
+
 		// Selling price
-		print '<tr><td class="titlefield">';
+		print '<tr><td class="titlefieldcreate">';
 		print $langs->trans("SellingPrice");
 		print '</td>';
 		print '<td colspan="2">';
@@ -791,13 +801,33 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_
 		}
 	} else {
 		if (!empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL)) {  // using this option is a bug. kept for backward compatibility
+			// Type
+			if (!empty($conf->product->enabled) && !empty($conf->service->enabled)) {
+				$typeformat = 'select;0:'.$langs->trans("Product").',1:'.$langs->trans("Service");
+				print '<tr><td class="">';
+				print (empty($conf->global->PRODUCT_DENY_CHANGE_PRODUCT_TYPE)) ? $form->editfieldkey("Type", 'fk_product_type', $object->type, $object, 0, $typeformat) : $langs->trans('Type');
+				print '</td><td>';
+				print $form->editfieldval("Type", 'fk_product_type', $object->type, $object, 0, $typeformat);
+				print '</td></tr>';
+			}
+
 			// We show only vat for level 1
-			print '<tr><td class="titlefield">'.$langs->trans("DefaultTaxRate").'</td>';
+			print '<tr><td class="titlefieldcreate">'.$langs->trans("DefaultTaxRate").'</td>';
 			print '<td colspan="2">'.vatrate($object->multiprices_tva_tx[1], true).'</td>';
 			print '</tr>';
 		} else {
+			// Type
+			if (!empty($conf->product->enabled) && !empty($conf->service->enabled)) {
+				$typeformat = 'select;0:'.$langs->trans("Product").',1:'.$langs->trans("Service");
+				print '<tr><td class="">';
+				print (empty($conf->global->PRODUCT_DENY_CHANGE_PRODUCT_TYPE)) ? $form->editfieldkey("Type", 'fk_product_type', $object->type, $object, 0, $typeformat) : $langs->trans('Type');
+				print '</td><td>';
+				print $form->editfieldval("Type", 'fk_product_type', $object->type, $object, 0, $typeformat);
+				print '</td></tr>';
+			}
+
 			// TVA
-			print '<tr><td class="titlefield">'.$langs->trans("DefaultTaxRate").'</td><td>';
+			print '<tr><td class="titlefieldcreate">'.$langs->trans("DefaultTaxRate").'</td><td>';
 
 			$positiverates = '';
 			if (price2num($object->tva_tx)) {
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index a00feb194a0..7fcee8f59cd 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -77,6 +77,7 @@ $batchnumber = GETPOST('batch_number', 'san_alpha');
 if (!empty($batchnumber)) {
 	$batchnumber = trim($batchnumber);
 }
+$cost_price = GETPOST('cost_price', 'alpha');
 
 // Security check
 if ($user->socid) {
@@ -113,6 +114,9 @@ $hookmanager->initHooks(array('stockproductcard', 'globalcard'));
 
 $error = 0;
 
+$usercanread = (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->lire) || ($object->type == Product::TYPE_SERVICE && $user->rights->service->lire));
+$usercancreate = (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->creer) || ($object->type == Product::TYPE_SERVICE && $user->rights->service->creer));
+
 if ($object->id > 0) {
 	if ($object->type == $object::TYPE_PRODUCT) {
 		restrictedArea($user, 'produit', $object->id, 'product&product', '', '');
@@ -139,6 +143,21 @@ if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
 
+if ($action == 'setcost_price') {
+	if ($id) {
+		$result = $object->fetch($id);
+		$object->cost_price = price2num($cost_price);
+		$result = $object->update($object->id, $user);
+		if ($result > 0) {
+			setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
+			$action = '';
+		} else {
+			$error++;
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	}
+}
+
 if ($action == 'addlimitstockwarehouse' && !empty($user->rights->produit->creer)) {
 	$seuil_stock_alerte = GETPOST('seuil_stock_alerte');
 	$desiredstock = GETPOST('desiredstock');
@@ -600,9 +619,9 @@ if ($id > 0 || $ref) {
 			if (!empty($conf->product->enabled) && !empty($conf->service->enabled)) {
 				$typeformat = 'select;0:'.$langs->trans("Product").',1:'.$langs->trans("Service");
 				print '<tr><td class="">';
-				print (empty($conf->global->PRODUCT_DENY_CHANGE_PRODUCT_TYPE)) ? $form->editfieldkey("Type", 'fk_product_type', $object->type, $object, $usercancreate, $typeformat) : $langs->trans('Type');
+				print (empty($conf->global->PRODUCT_DENY_CHANGE_PRODUCT_TYPE)) ? $form->editfieldkey("Type", 'fk_product_type', $object->type, $object, 0, $typeformat) : $langs->trans('Type');
 				print '</td><td>';
-				print $form->editfieldval("Type", 'fk_product_type', $object->type, $object, $usercancreate, $typeformat);
+				print $form->editfieldval("Type", 'fk_product_type', $object->type, $object, 0, $typeformat);
 				print '</td></tr>';
 			}
 
@@ -618,7 +637,7 @@ if ($id > 0 || $ref) {
 			$textdesc .= "<br>".$langs->trans("CostPriceUsage");
 			$text = $form->textwithpicto($langs->trans("CostPrice"), $textdesc, 1, 'help', '');
 			print $form->editfieldkey($text, 'cost_price', $object->cost_price, $object, $usercancreate, 'amount:6');
-			print '</td><td colspan="2">';
+			print '</td><td>';
 			print $form->editfieldval($text, 'cost_price', $object->cost_price, $object, $usercancreate, 'amount:6');
 			print '</td></tr>';
 

From b610cc1c6ca45f99291c39cd4180eebe83dbf34b Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <68746600+marc-dll@users.noreply.github.com>
Date: Tue, 10 Aug 2021 11:18:25 +0200
Subject: [PATCH 1464/1497] FIX: shipping validation workflow: 'ORDER_CLOSE'
 trigger called from wrong object

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

diff --git a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
index b40900dd6c7..e58f84f338c 100644
--- a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
+++ b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
@@ -309,7 +309,7 @@ class InterfaceWorkflowManager extends DolibarrTriggers
         		$diff_array = array_diff_assoc($qtyordred, $qtyshipped);
         		if (count($diff_array) == 0) {
         			//No diff => mean everythings is shipped
-        			$ret = $object->setStatut(Commande::STATUS_CLOSED, $object->origin_id, $object->origin, 'ORDER_CLOSE');
+        			$ret = $order->setStatut(Commande::STATUS_CLOSED, $object->origin_id, $object->origin, 'ORDER_CLOSE');
         			if ($ret < 0) {
         				$this->error = $object->error; $this->errors = $object->errors;
         				return $ret;

From 3b73abed7cb17fa180ab7be0ce81412a7cceb7fe Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 10 Aug 2021 11:40:25 +0200
Subject: [PATCH 1465/1497] css

---
 htdocs/admin/index.php        | 6 ++++--
 htdocs/langs/en_US/admin.lang | 3 +++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/htdocs/admin/index.php b/htdocs/admin/index.php
index aa571644871..37f99db5735 100644
--- a/htdocs/admin/index.php
+++ b/htdocs/admin/index.php
@@ -82,7 +82,8 @@ print '<br><br>';
 if (empty($conf->global->MAIN_INFO_SOCIETE_NOM) || empty($conf->global->MAIN_INFO_SOCIETE_COUNTRY)) {
 	$setupcompanynotcomplete = 1;
 }
-print img_picto('', 'company', 'class="paddingright"').' '.$langs->trans("SetupDescription3", DOL_URL_ROOT.'/admin/company.php?mainmenu=home'.(empty($setupcompanynotcomplete) ? '' : '&action=edit'), $langs->transnoentities("Setup"), $langs->transnoentities("MenuCompanySetup"));
+print img_picto('', 'company', 'class="paddingright valignmiddle big"').' '.$langs->trans("SetupDescriptionLink", DOL_URL_ROOT.'/admin/company.php?mainmenu=home'.(empty($setupcompanynotcomplete) ? '' : '&action=edit'), $langs->transnoentities("Setup"), $langs->transnoentities("MenuCompanySetup"));
+print '<br><br>'.$langs->trans("SetupDescription3b");
 if (!empty($setupcompanynotcomplete)) {
 	$langs->load("errors");
 	$warnpicto = img_warning($langs->trans("WarningMandatorySetupNotComplete"), 'style="padding-right: 6px;"');
@@ -93,7 +94,8 @@ print '<br>';
 print '<br>';
 
 // Show info setup module
-print img_picto('', 'cog', 'class="paddingright"').' '.$langs->trans("SetupDescription4", DOL_URL_ROOT.'/admin/modules.php?mainmenu=home', $langs->transnoentities("Setup"), $langs->transnoentities("Modules"));
+print img_picto('', 'cog', 'class="paddingright valignmiddle big"').' '.$langs->trans("SetupDescriptionLink", DOL_URL_ROOT.'/admin/modules.php?mainmenu=home', $langs->transnoentities("Setup"), $langs->transnoentities("Modules"));
+print '<br><br>'.$langs->trans("SetupDescription4b");
 if (count($conf->modules) <= (empty($conf->global->MAIN_MIN_NB_ENABLED_MODULE_FOR_WARNING) ? 1 : $conf->global->MAIN_MIN_NB_ENABLED_MODULE_FOR_WARNING)) {	// If only minimal initial modules enabled
 	$langs->load("errors");
 	$warnpicto = img_warning($langs->trans("WarningEnableYourModulesApplications"), 'style="padding-right: 6px;"');
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 98c9e954ac2..3c982e6fd1e 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1193,6 +1193,9 @@ SetupDescription2=The following two sections are mandatory (the two first entrie
 SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
 SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
 SetupDescription5=Other Setup menu entries manage optional parameters.
+SetupDescriptionLink=<a href="%s">%s - %s</a>
+SetupDescription3b=Basic parameters used to customize the default behavior of your application (e.g for country-related features).
+SetupDescription4b=This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
 AuditedSecurityEvents=Security events that are audited
 NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
 Audit=Security events

From 93fb6bce71d816d6d7c59c3cd4936e1aefafed44 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 10 Aug 2021 12:26:41 +0200
Subject: [PATCH 1466/1497] css

---
 htdocs/admin/index.php           | 4 ++--
 htdocs/theme/eldy/global.inc.php | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/htdocs/admin/index.php b/htdocs/admin/index.php
index 37f99db5735..c02ee501d94 100644
--- a/htdocs/admin/index.php
+++ b/htdocs/admin/index.php
@@ -82,7 +82,7 @@ print '<br><br>';
 if (empty($conf->global->MAIN_INFO_SOCIETE_NOM) || empty($conf->global->MAIN_INFO_SOCIETE_COUNTRY)) {
 	$setupcompanynotcomplete = 1;
 }
-print img_picto('', 'company', 'class="paddingright valignmiddle big"').' '.$langs->trans("SetupDescriptionLink", DOL_URL_ROOT.'/admin/company.php?mainmenu=home'.(empty($setupcompanynotcomplete) ? '' : '&action=edit'), $langs->transnoentities("Setup"), $langs->transnoentities("MenuCompanySetup"));
+print img_picto('', 'company', 'class="paddingright valignmiddle double"').' '.$langs->trans("SetupDescriptionLink", DOL_URL_ROOT.'/admin/company.php?mainmenu=home'.(empty($setupcompanynotcomplete) ? '' : '&action=edit'), $langs->transnoentities("Setup"), $langs->transnoentities("MenuCompanySetup"));
 print '<br><br>'.$langs->trans("SetupDescription3b");
 if (!empty($setupcompanynotcomplete)) {
 	$langs->load("errors");
@@ -94,7 +94,7 @@ print '<br>';
 print '<br>';
 
 // Show info setup module
-print img_picto('', 'cog', 'class="paddingright valignmiddle big"').' '.$langs->trans("SetupDescriptionLink", DOL_URL_ROOT.'/admin/modules.php?mainmenu=home', $langs->transnoentities("Setup"), $langs->transnoentities("Modules"));
+print img_picto('', 'cog', 'class="paddingright valignmiddle double"').' '.$langs->trans("SetupDescriptionLink", DOL_URL_ROOT.'/admin/modules.php?mainmenu=home', $langs->transnoentities("Setup"), $langs->transnoentities("Modules"));
 print '<br><br>'.$langs->trans("SetupDescription4b");
 if (count($conf->modules) <= (empty($conf->global->MAIN_MIN_NB_ENABLED_MODULE_FOR_WARNING) ? 1 : $conf->global->MAIN_MIN_NB_ENABLED_MODULE_FOR_WARNING)) {	// If only minimal initial modules enabled
 	$langs->load("errors");
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index e384007262f..0f4ac71fd54 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -647,6 +647,9 @@ textarea.centpercent {
 .large {
 	font-size: 125%;
 }
+.double {
+	font-size: 2em;
+}
 
 .h1 .small, .h1 small, .h2 .small, .h2 small, .h3 .small, .h3 small, h1 .small, h1 small, h2 .small, h2 small, h3 .small, h3 small {
 	font-size: 65%;

From b10eaf08f186bd4e28f6e474dcb0e2c7b7c13d84 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 10 Aug 2021 12:47:06 +0200
Subject: [PATCH 1467/1497] Experiment a spider

---
 dev/tools/spider.php | 141 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 141 insertions(+)
 create mode 100644 dev/tools/spider.php

diff --git a/dev/tools/spider.php b/dev/tools/spider.php
new file mode 100644
index 00000000000..ee1172f3939
--- /dev/null
+++ b/dev/tools/spider.php
@@ -0,0 +1,141 @@
+#!/usr/bin/env php
+<?php
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file 	dev/tools/spider.php
+ * \brief 	Script to spider Dolibarr app.
+ */
+
+$crawledLinks=array();
+const MAX_DEPTH=2;
+
+
+/**
+ * @param string $url	URL
+ * @param string $depth	Depth
+ * @return string		String
+ */
+function followLink($url, $depth = 0)
+{
+	global $crawledLinks;
+	$crawling=array();
+	if ($depth>MAX_DEPTH) {
+		echo "<div style='color:red;'>The Crawler is giving up!</div>";
+		return;
+	}
+	$options=array(
+		'http'=>array(
+			'method'=>"GET",
+			'user-agent'=>"gfgBot/0.1\n"
+		)
+	);
+	$context=stream_context_create($options);
+	$doc=new DomDocument();
+	@$doc->loadHTML(file_get_contents($url, false, $context));
+	$links=$doc->getElementsByTagName('a');
+	$pageTitle=getDocTitle($doc, $url);
+	$metaData=getDocMetaData($doc);
+	foreach ($links as $i) {
+		$link=$i->getAttribute('href');
+		if (ignoreLink($link)) continue;
+		$link=convertLink($url, $link);
+		if (!in_array($link, $crawledLinks)) {
+			$crawledLinks[]=$link;
+			$crawling[]=$link;
+			insertIntoDatabase($link, $pageTitle, $metaData, $depth);
+		}
+	}
+	foreach ($crawling as $crawlURL)
+		followLink($crawlURL, $depth+1);
+}
+
+/**
+ * @param string $site	Site
+ * @param string $path	Path
+ * @return string		String
+ */
+function convertLink($site, $path)
+{
+	if (substr_compare($path, "//", 0, 2)==0)
+		return parse_url($site)['scheme'].$path;
+	elseif (substr_compare($path, "http://", 0, 7)==0 or
+		substr_compare($path, "https://", 0, 8)==0 or
+		substr_compare($path, "www.", 0, 4)==0)
+		return $path;
+	else return $site.'/'.$path;
+}
+
+/**
+ * @param string $url	URL
+ * @return boolean
+ */
+function ignoreLink($url)
+{
+	return $url[0]=="#" or substr($url, 0, 11) == "javascript:";
+}
+
+/**
+ * @param string 	$link		URL
+ * @param string	$title		Title
+ * @param string 	$metaData	Array
+ * @param int 		$depth		Depth
+ * @return void
+ */
+function insertIntoDatabase($link, $title, &$metaData, $depth)
+{
+	//global $crawledLinks;
+
+	echo "Inserting new record {URL= ".$link.", Title = '$title', Description = '".$metaData['description']."', Keywords = ' ".$metaData['keywords']."'}<br/><br/><br/>";
+
+	//²$crawledLinks[]=$link;
+}
+
+/**
+ * @param string 	$doc		Doc
+ * @param string	$url		URL
+ * @return string				URL/Title
+ */
+function getDocTitle(&$doc, $url)
+{
+	$titleNodes=$doc->getElementsByTagName('title');
+	if (count($titleNodes)==0 or !isset($titleNodes[0]->nodeValue))
+		return $url;
+	$title=str_replace('', '\n', $titleNodes[0]->nodeValue);
+	return (strlen($title)<1)?$url:$title;
+}
+
+/**
+ * @param string 	$doc		Doc
+ * @return array				Array
+ */
+function getDocMetaData(&$doc)
+{
+	$metaData=array();
+	$metaNodes=$doc->getElementsByTagName('meta');
+	foreach ($metaNodes as $node)
+		$metaData[$node->getAttribute("name")] = $node->getAttribute("content");
+	if (!isset($metaData['description']))
+		$metaData['description']='No Description Available';
+	if (!isset($metaData['keywords'])) $metaData['keywords']='';
+	return array(
+		'keywords'=>str_replace('', '\n', $metaData['keywords']),
+		'description'=>str_replace('', '\n', $metaData['description'])
+	);
+}
+
+
+followLink("http://localhost/dolibarr_dev/htdocs");

From 114f31df1d4cb6cd794c19e9a8aaa90de0aceafb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 10 Aug 2021 12:55:43 +0200
Subject: [PATCH 1468/1497] Doc

---
 dev/tools/spider.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dev/tools/spider.php b/dev/tools/spider.php
index ee1172f3939..954978b24df 100644
--- a/dev/tools/spider.php
+++ b/dev/tools/spider.php
@@ -18,6 +18,10 @@
 /**
  * \file 	dev/tools/spider.php
  * \brief 	Script to spider Dolibarr app.
+ *
+ * To use it:
+ * - Disable module "bookmark"
+ * - Exclude param  optioncss, token, sortfield, sortorder
  */
 
 $crawledLinks=array();

From 6ece5f6931c87ea30ac1778e58bb39158627f913 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 10 Aug 2021 13:01:57 +0200
Subject: [PATCH 1469/1497] FIX avoid to have link to create bookmar on page to
 create bookmark

---
 htdocs/bookmarks/bookmarks.lib.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/htdocs/bookmarks/bookmarks.lib.php b/htdocs/bookmarks/bookmarks.lib.php
index 4c52182cff7..324f62d0e21 100644
--- a/htdocs/bookmarks/bookmarks.lib.php
+++ b/htdocs/bookmarks/bookmarks.lib.php
@@ -72,10 +72,12 @@ function printDropdownBookmarksList()
 	// Url to go on create new bookmark page
 	$newbtn = '';
 	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);
-		$newbtn .= '<a class="top-menu-dropdown-link" title="'.$langs->trans('AddThisPageToBookmarks').'" href="'.dol_escape_htmltag($urltoadd).'" >';
-		$newbtn .= img_picto('', 'add', '', false, 0, 0, '', 'paddingright').dol_escape_htmltag($langs->trans('AddThisPageToBookmarks')).'</a>';
+		if (!preg_match('/bookmarks\/card.php/', $_SERVER['PHP_SELF'])) {
+			//$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);
+			$newbtn .= '<a class="top-menu-dropdown-link" title="'.$langs->trans('AddThisPageToBookmarks').'" href="'.dol_escape_htmltag($urltoadd).'" >';
+			$newbtn .= img_picto('', 'add', '', false, 0, 0, '', 'paddingright').dol_escape_htmltag($langs->trans('AddThisPageToBookmarks')).'</a>';
+		}
 	}
 
 	// Menu with list of bookmarks

From 31d6aaf6b451f17b15649354468cb34e1452f1d7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 10 Aug 2021 13:06:57 +0200
Subject: [PATCH 1470/1497] FIX avoid to have link to create bookmar on page to
 create bookmark

---
 htdocs/bookmarks/bookmarks.lib.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/htdocs/bookmarks/bookmarks.lib.php b/htdocs/bookmarks/bookmarks.lib.php
index 324f62d0e21..d24ba63ef55 100644
--- a/htdocs/bookmarks/bookmarks.lib.php
+++ b/htdocs/bookmarks/bookmarks.lib.php
@@ -107,9 +107,11 @@ function printDropdownBookmarksList()
 			$searchForm .= 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;url='.urlencode($url);
-				$searchForm .= '<option value="newbookmark" class="optionblue" rel="'.dol_escape_htmltag($urltoadd).'"';
-				$searchForm .= ' data-html="'.dol_escape_htmltag(img_picto('', 'bookmark').' '.$langs->trans('AddThisPageToBookmarks').'...').'">'.dol_escape_htmltag($langs->trans('AddThisPageToBookmarks').'...').'</option>';
+				if (!preg_match('/bookmarks\/card.php/', $_SERVER['PHP_SELF'])) {
+					$urltoadd = DOL_URL_ROOT.'/bookmarks/card.php?action=create&amp;url='.urlencode($url);
+					$searchForm .= '<option value="newbookmark" class="optionblue" rel="'.dol_escape_htmltag($urltoadd).'"';
+					$searchForm .= ' data-html="'.dol_escape_htmltag(img_picto('', 'bookmark').' '.$langs->trans('AddThisPageToBookmarks').'...').'">'.dol_escape_htmltag($langs->trans('AddThisPageToBookmarks').'...').'</option>';
+				}
 			}
 			$i = 0;
 			while ((empty($conf->global->BOOKMARKS_SHOW_IN_MENU) || $i < $conf->global->BOOKMARKS_SHOW_IN_MENU) && $obj = $db->fetch_object($resql)) {

From bef0989b159d7863bcae7de862b56842c4a52e75 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 10 Aug 2021 13:34:21 +0200
Subject: [PATCH 1471/1497] Missing declaration

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 36df3b1a7b9..7e781e6c2eb 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -123,6 +123,12 @@ abstract class CommonObject
 	 */
 	protected $table_ref_field = '';
 
+	/**
+	 * 0=Default, 1=View may be restricted to sales representative only if no permission to see all or to company of external user if external user
+	 * @var integer
+	 */
+	public $restrictiononfksoc = 0;
+
 
 
 	// Following vars are used by some objects only. We keep this property here in CommonObject to be able to provide common method using them.

From 2860c5e3ab4b97dab7e648c4d6a27a20adb50961 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 10 Aug 2021 16:36:54 +0200
Subject: [PATCH 1472/1497] Fix missing dir

---
 htdocs/admin/dav.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/htdocs/admin/dav.php b/htdocs/admin/dav.php
index e7983ae4b95..df14ef4c1b0 100644
--- a/htdocs/admin/dav.php
+++ b/htdocs/admin/dav.php
@@ -45,6 +45,11 @@ $arrayofparameters = array(
 	'DAV_ALLOW_ECM_DIR'=>array('css'=>'minwidth200', 'enabled'=>$conf->ecm->enabled)
 );
 
+// To fix when dire does not exists
+dol_mkdir($conf->dav->dir_output.'/temp');
+dol_mkdir($conf->dav->dir_output.'/public');
+dol_mkdir($conf->dav->dir_output.'/private');
+
 
 /*
  * Actions

From 5e0aaeb6e422949d961d746cdcdfc5d6b0ce1628 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 10 Aug 2021 16:40:33 +0200
Subject: [PATCH 1473/1497] Fix warning

---
 htdocs/website/samples/wrapper.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/website/samples/wrapper.php b/htdocs/website/samples/wrapper.php
index 4802755608f..34f6db8d044 100644
--- a/htdocs/website/samples/wrapper.php
+++ b/htdocs/website/samples/wrapper.php
@@ -226,9 +226,9 @@ if ($rss) {
 	// Find the subdirectory name as the reference
 	include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 	$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
+	$accessallowed              = empty($check_access['accessallowed']) ? '' : $check_access['accessallowed'];
+	$sqlprotectagainstexternals = empty($check_access['sqlprotectagainstexternals']) ? '' : $check_access['sqlprotectagainstexternals'];
+	$fullpath_original_file     = empty($check_access['original_file']) ? '' : $check_access['original_file']; // $fullpath_original_file is now a full path name
 	if ($hashp) {
 		$accessallowed = 1; // When using hashp, link is public so we force $accessallowed
 		$sqlprotectagainstexternals = '';

From 087e2691038e151eb1d78c04283545b00861d243 Mon Sep 17 00:00:00 2001
From: Gauthier PC portable 024 <gauthier.verdol@atm-consulting.fr>
Date: Tue, 10 Aug 2021 17:34:47 +0200
Subject: [PATCH 1474/1497] FIX : on supplier order, JOIN with product fourn
 price table must be done with fk_soc too to avoid display several times a
 same line (because of same supplier product ref)

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

diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index dbb454ef800..08516fbc7d2 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -464,7 +464,7 @@ class CommandeFournisseur extends CommonOrder
     	$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet	as l";
     	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON l.fk_product = p.rowid';
 		if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING))
-			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON l.fk_product = pfp.fk_product and l.ref = pfp.ref_fourn";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON l.fk_product = pfp.fk_product and l.ref = pfp.ref_fourn AND pfp.fk_soc = ".$this->socid;
     	$sql .= " WHERE l.fk_commande = ".$this->id;
     	if ($only_product) $sql .= ' AND p.fk_product_type = 0';
     	$sql .= " ORDER BY l.rang, l.rowid";

From 005e25375af38c03825a15dc2c6530f2472d9195 Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Date: Tue, 10 Aug 2021 17:51:39 +0200
Subject: [PATCH 1475/1497] ok

---
 htdocs/admin/pdf_other.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/admin/pdf_other.php b/htdocs/admin/pdf_other.php
index ed14f2ac119..01ba7236f90 100644
--- a/htdocs/admin/pdf_other.php
+++ b/htdocs/admin/pdf_other.php
@@ -53,6 +53,9 @@ if ($cancel) {
 }
 
 if ($action == 'update') {
+
+	if (GETPOSTISSET('MAIN_GENERATE_PROPOSALS_WITH_PICTURE')) dolibarr_set_const($db, "MAIN_GENERATE_PROPOSALS_WITH_PICTURE", GETPOST("MAIN_GENERATE_PROPOSALS_WITH_PICTURE"), 'chaine', 0, '', $conf->entity);
+
 	setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 
 	header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup");

From 69e31e16550713a75885bd11b9ada9328df87552 Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Date: Tue, 10 Aug 2021 18:04:59 +0200
Subject: [PATCH 1476/1497] ok

---
 htdocs/admin/pdf_other.php    | 24 ++++++++++++++++++++++++
 htdocs/langs/en_US/admin.lang |  2 ++
 2 files changed, 26 insertions(+)

diff --git a/htdocs/admin/pdf_other.php b/htdocs/admin/pdf_other.php
index ed14f2ac119..a030548f885 100644
--- a/htdocs/admin/pdf_other.php
+++ b/htdocs/admin/pdf_other.php
@@ -53,6 +53,10 @@ if ($cancel) {
 }
 
 if ($action == 'update') {
+
+	if (GETPOSTISSET('PROPOSAL_PDF_HIDE_PAYMENTTERM')) dolibarr_set_const($db, "PROPOSAL_PDF_HIDE_PAYMENTTERM", GETPOST("PROPOSAL_PDF_HIDE_PAYMENTTERM"), 'chaine', 0, '', $conf->entity);
+	if (GETPOSTISSET('PROPOSAL_PDF_HIDE_PAYMENTMODE')) dolibarr_set_const($db, "PROPOSAL_PDF_HIDE_PAYMENTMODE", GETPOST("PROPOSAL_PDF_HIDE_PAYMENTMODE"), 'chaine', 0, '', $conf->entity);
+
 	setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 
 	header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup");
@@ -103,6 +107,26 @@ if ($conf->use_javascript_ajax) {
 }
 print '</td></tr>';
 
+print '<tr class="oddeven"><td>'.$langs->trans("PROPOSAL_PDF_HIDE_PAYMENTTERM");
+print '</td><td>';
+if ($conf->use_javascript_ajax) {
+	print ajax_constantonoff('PROPOSAL_PDF_HIDE_PAYMENTTERM');
+} else {
+	$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+	print $form->selectarray("PROPOSAL_PDF_HIDE_PAYMENTTERM", $arrval, $conf->global->PROPOSAL_PDF_HIDE_PAYMENTTERM);
+}
+print '</td></tr>';
+
+print '<tr class="oddeven"><td>'.$langs->trans("PROPOSAL_PDF_HIDE_PAYMENTMODE");
+print '</td><td>';
+if ($conf->use_javascript_ajax) {
+	print ajax_constantonoff('PROPOSAL_PDF_HIDE_PAYMENTMODE');
+} else {
+	$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+	print $form->selectarray("PROPOSAL_PDF_HIDE_PAYMENTMODE", $arrval, $conf->global->PROPOSAL_PDF_HIDE_PAYMENTMODE);
+}
+print '</td></tr>';
+
 /*
 print '<tr class="oddeven"><td>'.$langs->trans("MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING").'</td><td>';
 if ($conf->use_javascript_ajax) {
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 3c982e6fd1e..95eeb4396ee 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1995,6 +1995,8 @@ MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add picture on proposal line
+PROPOSAL_PDF_HIDE_PAYMENTTERM=Hide payments conditions
+PROPOSAL_PDF_HIDE_PAYMENTMODE=Hide payment mode
 MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add electronic sign in PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups

From 4faf6f5d84df0eeb22e7c499cd7e9ee5100e640f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 10 Aug 2021 19:28:06 +0200
Subject: [PATCH 1477/1497] Fix crlf

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 4e9da790f28..cee87c8ab41 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -969,7 +969,7 @@ class Form
 						$out .= '<option value="'.($usecodeaskey ? ($usecodeaskey == 'code2' ? $row['code_iso'] : $row['code_iso3']) : $row['rowid']).'" data-html="'.dol_escape_htmltag($labeltoshow).'" data-eec="'.((int) $row['eec']).'">';
 					}
 					$out .= $labeltoshow;
-					$out .= '</option>';
+					$out .= '</option>'."\n";
 				}
 			}
 			$out .= '</select>';

From f48a9aa3adef3eefc5154c32b14a7d94d468d80f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 10 Aug 2021 19:44:55 +0200
Subject: [PATCH 1478/1497] Optimize size of html

---
 htdocs/core/class/html.form.class.php |  2 +-
 htdocs/core/lib/functions.lib.php     | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 2b37179dd74..42ffcbb2f6d 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -958,7 +958,7 @@ class Form
 					if ($row['code_iso']) {
 						$labeltoshow .= ' <span class="opacitymedium">('.$row['code_iso'].')</span>';
 						if (empty($hideflags)) {
-							$tmpflag = picto_from_langcode($row['code_iso'], 'class="saturatemedium paddingrightonly"');
+							$tmpflag = picto_from_langcode($row['code_iso'], 'class="saturatemedium paddingrightonly"', 1);
 							$labeltoshow = $tmpflag.' '.$labeltoshow;
 						}
 					}
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 899b3b0ffda..a9cb45e06fb 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3790,7 +3790,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 		return $fullpathpicto;
 	}
 		// tag title is used for tooltip on <a>, tag alt can be used with very simple text on image for blind people
-	return '<img src="'.$fullpathpicto.'" alt="'.dol_escape_htmltag($alt).'"'.(($notitle || empty($titlealt)) ? '' : ' title="'.dol_escape_htmltag($titlealt).'"').($moreatt ? ' '.$moreatt.($morecss ? ' class="'.$morecss.'"' : '') : ' class="inline-block'.($morecss ? ' '.$morecss : '').'"').'>'; // Alt is used for accessibility, title for popup
+	return '<img src="'.$fullpathpicto.'"'.($notitle ? '' : ' alt="'.dol_escape_htmltag($alt).'"').(($notitle || empty($titlealt)) ? '' : ' title="'.dol_escape_htmltag($titlealt).'"').($moreatt ? ' '.$moreatt.($morecss ? ' class="'.$morecss.'"' : '') : ' class="inline-block'.($morecss ? ' '.$morecss : '').'"').'>'; // Alt is used for accessibility, title for popup
 }
 
 /**
@@ -3850,10 +3850,11 @@ function img_weather($titlealt, $picto, $moreatt = '', $pictoisfullpath = 0, $mo
  *	@param      string		$picto       		Name of image file to show (If no extension provided, we use '.png'). Image must be stored into htdocs/theme/common directory.
  *	@param		string		$moreatt			Add more attribute on img tag
  *	@param		int			$pictoisfullpath	If 1, image path is a full path
+ *  @param		int			$notitle			1=Disable tag title. Use it if you add js tooltip, to avoid duplicate tooltip.
  *	@return     string      					Return img tag
  *  @see        img_object(), img_picto()
  */
-function img_picto_common($titlealt, $picto, $moreatt = '', $pictoisfullpath = 0)
+function img_picto_common($titlealt, $picto, $moreatt = '', $pictoisfullpath = 0, $notitle = 0)
 {
 	global $conf;
 
@@ -3875,7 +3876,7 @@ function img_picto_common($titlealt, $picto, $moreatt = '', $pictoisfullpath = 0
 		}
 	}
 
-	return img_picto($titlealt, $path, $moreatt, 1);
+	return img_picto($titlealt, $path, $moreatt, 1, 0, $notitle);
 }
 
 /**
@@ -8126,9 +8127,10 @@ function dol_validElement($element)
  *
  * 	@param	string	$codelang	Language code ('en_IN', 'fr_CA', ...) or ISO Country code on 2 characters in uppercase ('IN', 'FR')
  *  @param	string	$moreatt	Add more attribute on img tag (For example 'style="float: right"' or 'class="saturatemedium"')
+ *  @param	int		$notitlealt	No title alt
  * 	@return	string				HTML img string with flag.
  */
-function picto_from_langcode($codelang, $moreatt = '')
+function picto_from_langcode($codelang, $moreatt = '', $notitlealt = 0)
 {
 	if (empty($codelang)) {
 		return '';
@@ -8161,7 +8163,7 @@ function picto_from_langcode($codelang, $moreatt = '')
 		$flagImage = empty($tmparray[1]) ? $tmparray[0] : $tmparray[1];
 	}
 
-	return img_picto_common($codelang, 'flags/'.strtolower($flagImage).'.png', $moreatt);
+	return img_picto_common($codelang, 'flags/'.strtolower($flagImage).'.png', $moreatt, 0, $notitlealt);
 }
 
 /**

From 8f8ff50d35e84a3028f7bc156e6c30d0d7a7aa83 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Wed, 11 Aug 2021 06:50:50 +0000
Subject: [PATCH 1479/1497] Fixing style errors.

---
 htdocs/admin/pdf_other.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/admin/pdf_other.php b/htdocs/admin/pdf_other.php
index 01ba7236f90..f03bfc6a5ec 100644
--- a/htdocs/admin/pdf_other.php
+++ b/htdocs/admin/pdf_other.php
@@ -53,7 +53,6 @@ if ($cancel) {
 }
 
 if ($action == 'update') {
-
 	if (GETPOSTISSET('MAIN_GENERATE_PROPOSALS_WITH_PICTURE')) dolibarr_set_const($db, "MAIN_GENERATE_PROPOSALS_WITH_PICTURE", GETPOST("MAIN_GENERATE_PROPOSALS_WITH_PICTURE"), 'chaine', 0, '', $conf->entity);
 
 	setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');

From 120ac514957d7d73616256f1978394fb4531f9c7 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Wed, 11 Aug 2021 06:52:10 +0000
Subject: [PATCH 1480/1497] Fixing style errors.

---
 htdocs/admin/pdf_other.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/admin/pdf_other.php b/htdocs/admin/pdf_other.php
index a030548f885..af00853f8ab 100644
--- a/htdocs/admin/pdf_other.php
+++ b/htdocs/admin/pdf_other.php
@@ -53,7 +53,6 @@ if ($cancel) {
 }
 
 if ($action == 'update') {
-
 	if (GETPOSTISSET('PROPOSAL_PDF_HIDE_PAYMENTTERM')) dolibarr_set_const($db, "PROPOSAL_PDF_HIDE_PAYMENTTERM", GETPOST("PROPOSAL_PDF_HIDE_PAYMENTTERM"), 'chaine', 0, '', $conf->entity);
 	if (GETPOSTISSET('PROPOSAL_PDF_HIDE_PAYMENTMODE')) dolibarr_set_const($db, "PROPOSAL_PDF_HIDE_PAYMENTMODE", GETPOST("PROPOSAL_PDF_HIDE_PAYMENTMODE"), 'chaine', 0, '', $conf->entity);
 

From 6fbd93999fe888f5e5f396cf85de53f426f5935e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 11 Aug 2021 13:33:51 +0200
Subject: [PATCH 1481/1497] css

---
 htdocs/core/class/html.form.class.php | 2 +-
 htdocs/product/card.php               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index cee87c8ab41..33d2f70caa4 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4724,7 +4724,7 @@ class Form
 			$more .= '<div class="tagtable paddingtopbottomonly centpercent noborderspacing">'."\n";
 			foreach ($formquestion as $key => $input) {
 				if (is_array($input) && !empty($input)) {
-					$size = (!empty($input['size']) ? ' size="'.$input['size'].'"' : '');
+					$size = (!empty($input['size']) ? ' size="'.$input['size'].'"' : '');	// deprecated. Use morecss instead.
 					$moreattr = (!empty($input['moreattr']) ? ' '.$input['moreattr'] : '');
 					$morecss = (!empty($input['morecss']) ? ' '.$input['morecss'] : '');
 
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 2472c764d7e..281613caae9 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -2417,7 +2417,7 @@ if (($action == 'clone' && (empty($conf->use_javascript_ajax) || !empty($conf->d
 	// Define confirmation messages
 	$formquestionclone = array(
 		'text' => $langs->trans("ConfirmClone"),
-		array('type' => 'text', 'name' => 'clone_ref', 'label' => $langs->trans("NewRefForClone"), 'value' => empty($tmpcode) ? $langs->trans("CopyOf").' '.$object->ref : $tmpcode, 'size'=>24),
+		array('type' => 'text', 'name' => 'clone_ref', 'label' => $langs->trans("NewRefForClone"), 'value' => empty($tmpcode) ? $langs->trans("CopyOf").' '.$object->ref : $tmpcode, 'morecss'=>'width150'),
 		array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneContentProduct"), 'value' => 1),
 		array('type' => 'checkbox', 'name' => 'clone_categories', 'label' => $langs->trans("CloneCategoriesProduct"), 'value' => 1),
 	);

From c12905f0f3ce498bfa9ae226ed5079ad50f3983c Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Date: Tue, 10 Aug 2021 17:51:39 +0200
Subject: [PATCH 1482/1497] ok

---
 htdocs/admin/pdf_other.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/admin/pdf_other.php b/htdocs/admin/pdf_other.php
index ed14f2ac119..01ba7236f90 100644
--- a/htdocs/admin/pdf_other.php
+++ b/htdocs/admin/pdf_other.php
@@ -53,6 +53,9 @@ if ($cancel) {
 }
 
 if ($action == 'update') {
+
+	if (GETPOSTISSET('MAIN_GENERATE_PROPOSALS_WITH_PICTURE')) dolibarr_set_const($db, "MAIN_GENERATE_PROPOSALS_WITH_PICTURE", GETPOST("MAIN_GENERATE_PROPOSALS_WITH_PICTURE"), 'chaine', 0, '', $conf->entity);
+
 	setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 
 	header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup");

From 775164f84a0f513d44f7b7d1a67204945be50f7d Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Wed, 11 Aug 2021 06:50:50 +0000
Subject: [PATCH 1483/1497] Fixing style errors.

---
 htdocs/admin/pdf_other.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/admin/pdf_other.php b/htdocs/admin/pdf_other.php
index 01ba7236f90..f03bfc6a5ec 100644
--- a/htdocs/admin/pdf_other.php
+++ b/htdocs/admin/pdf_other.php
@@ -53,7 +53,6 @@ if ($cancel) {
 }
 
 if ($action == 'update') {
-
 	if (GETPOSTISSET('MAIN_GENERATE_PROPOSALS_WITH_PICTURE')) dolibarr_set_const($db, "MAIN_GENERATE_PROPOSALS_WITH_PICTURE", GETPOST("MAIN_GENERATE_PROPOSALS_WITH_PICTURE"), 'chaine', 0, '', $conf->entity);
 
 	setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');

From 8da328b183a9ffeeaa828bfc40898eaaa3a486ea Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 11 Aug 2021 15:44:48 +0200
Subject: [PATCH 1484/1497] Update extrafields_list_search_sql.tpl.php

---
 htdocs/core/tpl/extrafields_list_search_sql.tpl.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/tpl/extrafields_list_search_sql.tpl.php b/htdocs/core/tpl/extrafields_list_search_sql.tpl.php
index 557c057c1c1..f62f65f18e9 100644
--- a/htdocs/core/tpl/extrafields_list_search_sql.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_sql.tpl.php
@@ -41,7 +41,7 @@ if (! empty($extrafieldsobjectkey) && ! empty($search_array_options) && is_array
 			if (in_array($typ, array('chkbxlst', 'checkbox'))) $mode_search=4;	                            // Search on a multiselect field with sql type = text
 			if (is_array($crit)) $crit = implode(' ', $crit); // natural_search() expects a string
 			elseif ($typ === 'select' and is_string($crit) and strpos($crit, ' ') === false) {
-				$sql .= ' AND (' . $extrafieldsobjectprefix.$tmpkey . ' = \'' . $db->escape($crit) . '\')';
+				$sql .= " AND (" . $extrafieldsobjectprefix.$tmpkey . " = '" . $db->escape($crit) . "')";
 				continue;
 			}
 			$sql .= natural_search($extrafieldsobjectprefix.$tmpkey, $crit, $mode_search);

From 310b5c974b60d80dc87e4630d8bcd137ab39e970 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 11 Aug 2021 19:43:12 +0200
Subject: [PATCH 1485/1497] Fix help

---
 htdocs/core/modules/expedition/doc/pdf_rouget.modules.php | 2 +-
 htdocs/langs/en_US/admin.lang                             | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
index 79ceb166eed..2fef145800f 100644
--- a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
@@ -127,7 +127,7 @@ class pdf_rouget extends ModelePdfExpedition
 
 		$this->db = $db;
 		$this->name = "rouget";
-		$this->description = $langs->trans("DocumentModelStandardPDF");
+		$this->description = $langs->trans("DocumentModelStandardPDF").' ('.$langs->trans("OldImplementation").')';
 		$this->update_main_doc_field = 1; // Save the name of generated file as the main doc when generating a doc with this template
 
 		$this->type = 'pdf';
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 55a0b0a34c3..db435d13c96 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -2155,4 +2155,5 @@ DatabasePasswordObfuscated=Database password is obfuscated in conf file
 DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
 APIsAreNotEnabled=APIs modules are not enabled
 YouShouldSetThisToOff=You should set this to 0 or off
-InstallAndUpgradeLockedBy=Install and upgrades are locked by the file <b>%s</b>
\ No newline at end of file
+InstallAndUpgradeLockedBy=Install and upgrades are locked by the file <b>%s</b>
+OldImplementation=Old implementation

From 687eb536aee1eb8a71d0077abc0ab1de20118a55 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 11 Aug 2021 20:05:03 +0200
Subject: [PATCH 1486/1497] Update card.php

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

diff --git a/htdocs/bookmarks/card.php b/htdocs/bookmarks/card.php
index 8ac05863ed0..f7795a14f47 100644
--- a/htdocs/bookmarks/card.php
+++ b/htdocs/bookmarks/card.php
@@ -169,7 +169,7 @@ if ($action == 'create') {
 	// Target
 	print '<tr><td>'.$langs->trans("BehaviourOnClick").'</td><td>';
 	$liste = array(0=>$langs->trans("ReplaceWindow"), 1=>$langs->trans("OpenANewWindow"));
-	print $form->selectarray('target', $liste, GETPOST('target', 'int'));
+	print $form->selectarray('target', $liste, GETPOSTISSET('target') ? GETPOST('target', 'int') : 1);
 	print '</td><td class="hideonsmartphone"><span class="opacitymedium">'.$langs->trans("ChooseIfANewWindowMustBeOpenedOnClickOnBookmark").'</span></td></tr>';
 
 	// Owner

From 51a28a4ac4f6a2f9c5a630503aacca9d54e888ab Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Thu, 5 Aug 2021 16:31:21 +0200
Subject: [PATCH 1487/1497] Fix lang error on hrm/index.php

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

diff --git a/htdocs/hrm/index.php b/htdocs/hrm/index.php
index fe2c42b0d1b..8a294a47e2c 100644
--- a/htdocs/hrm/index.php
+++ b/htdocs/hrm/index.php
@@ -234,7 +234,7 @@ if (!empty($conf->holiday->enabled) && $user->rights->holiday->read) {
 				print '<tr class="oddeven">';
 				print '<td class="nowraponall">'.$holidaystatic->getNomUrl(1).'</td>';
 				print '<td class="tdoverflowmax125">'.$userstatic->getNomUrl(-1, 'leave').'</td>';
-				print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($typeleaves[$obj->fk_type]['label']).'">'.dol_escape_htmltag($typeleaves[$obj->fk_type]['label']).'</td>';
+				print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($langs->trans($typeleaves[$obj->fk_type]['code'])).'">'.dol_escape_htmltag($langs->trans($typeleaves[$obj->fk_type]['code'])).'</td>';
 
 				$starthalfday = ($obj->halfday == -1 || $obj->halfday == 2) ? 'afternoon' : 'morning';
 				$endhalfday = ($obj->halfday == 1 || $obj->halfday == 2) ? 'morning' : 'afternoon';

From bf721438231ee143cb6a224faced52ba0270e4d7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 11 Aug 2021 21:04:03 +0200
Subject: [PATCH 1488/1497] Fix phpcs

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

diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 885051bf36e..03ec879c5ad 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -1521,7 +1521,9 @@ class Account extends CommonObject
 	{
 		global $conf;
 
-		if ( ! empty($conf->global->MAIN_IBAN_NOT_MANDATORY) ) return 0;
+		if (!empty($conf->global->MAIN_IBAN_IS_NEVER_MANDATORY)) {
+			return 0;
+		}
 
 		$country_code = $this->getCountryCode();
 

From 9e54dc0dcbf21f09e2ab266526275ce8c73f9a63 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 11 Aug 2021 21:31:14 +0200
Subject: [PATCH 1489/1497] typo

---
 htdocs/install/mysql/tables/llx_product.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/tables/llx_product.sql b/htdocs/install/mysql/tables/llx_product.sql
index 4aad3393137..1e15dd5a940 100644
--- a/htdocs/install/mysql/tables/llx_product.sql
+++ b/htdocs/install/mysql/tables/llx_product.sql
@@ -103,5 +103,5 @@ create table llx_product
   desiredstock                  float      DEFAULT 0,
   fk_unit                       integer      DEFAULT NULL,
   price_autogen                 tinyint      DEFAULT 0,
-  fk_project                    integer      DEFAULT NULL           -- Used when product was generated by a project or is specifif to a project
+  fk_project                    integer      DEFAULT NULL           -- Used when the product was generated by a project or is specific to a project
 )ENGINE=innodb;

From 80673e0efc56cf87cd7f2135e0ad442203c9410e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 11 Aug 2021 21:32:39 +0200
Subject: [PATCH 1490/1497] Update card.php

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

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 5fed4bc4ca1..e28d873c209 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -17,7 +17,7 @@
  * Copyright (C) 2016		Meziane Sof		     <virtualsof@yahoo.fr>
  * Copyright (C) 2017		Josep Lluís Amador	 <joseplluis@lliuretic.cat>
  * Copyright (C) 2019       Frédéric France      <frederic.france@netlogic.fr>
- * Copyright (C) 2019-2020  Thibault FOUCART     <support@ptibo gxiv.net>
+ * Copyright (C) 2019-2020  Thibault FOUCART     <support@ptibogxiv.net>
  * Copyright (C) 2020  		Pierre Ardoin     	 <mapiolca@me.com>
  *
  * This program is free software; you can redistribute it and/or modify

From 3befe8f3839c9f5d1301daa3c47e4633df0f7ccc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 11 Aug 2021 21:34:11 +0200
Subject: [PATCH 1491/1497] Update 12.0.0-13.0.0.sql

---
 htdocs/install/mysql/migration/12.0.0-13.0.0.sql | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
index 95d6d208145..c83755009ae 100644
--- a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
+++ b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
@@ -29,7 +29,6 @@
 
 
 -- Missing in v12 or lower
-ALTER TABLE llx_product ADD COLUMN fk_default_bom integer DEFAULT NULL;
 
 ALTER TABLE llx_payment_salary MODIFY COLUMN ref varchar(30) NULL;
 ALTER TABLE llx_payment_various MODIFY COLUMN ref varchar(30) NULL;

From eadfc9f4aefa535f7491af496b831dc16fca2c9d Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Wed, 11 Aug 2021 19:36:18 +0000
Subject: [PATCH 1492/1497] Fixing style errors.

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

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 40d63c4643f..0645ca9c2a6 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -2115,7 +2115,7 @@ class Product extends CommonObject
 				$this->localtax2_tx                    = $obj->localtax2_tx;
 				$this->localtax1_type                = $obj->localtax1_type;
 				$this->localtax2_type                = $obj->localtax2_type;
-				
+
 				$this->finished                        = $obj->finished;
 				$this->fk_default_bom                  = $obj->fk_default_bom;
 

From 5b30cf3e77ae6b4bcb9d59029aebb3acda8add06 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 11 Aug 2021 21:44:18 +0200
Subject: [PATCH 1493/1497] Update card.php

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

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 9cbb7d56ec4..2332d97feab 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1911,7 +1911,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 			print '<table class="border centpercent">';
 
-			if ($object->isService() && !empty($conf->bom->enabled)) {
+			if (!$object->isService() && !empty($conf->bom->enabled)) {
 					print '<tr><td>'.$form->textwithpicto($langs->trans("DefaultBOM"), $langs->trans("DefaultBOMDesc")).'</td><td colspan="3">';
 					$bomkey = "Bom:bom/class/bom.class.php:0:t.status=1 AND t.fk_product=".$object->id;
 					print $form->selectForForms($bomkey, 'fk_default_bom', $object->fk_default_bom, 1);

From 3c0601d1f95d676d1c5f645844334a611087cad2 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Wed, 11 Aug 2021 19:46:39 +0000
Subject: [PATCH 1494/1497] Fixing style errors.

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

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 2332d97feab..818b2621fe9 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -68,7 +68,7 @@ if (!empty($conf->accounting->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
 }
 if (!empty($conf->bom->enabled)) {
-  require_once DOL_DOCUMENT_ROOT.'/bom/class/bom.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/bom/class/bom.class.php';
 }
 
 // Load translation files required by the page

From 3af8e18b3c2c7dd26276998e5069b4ddc1252b1a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 11 Aug 2021 21:47:28 +0200
Subject: [PATCH 1495/1497] Create card.php

---
 htdocs/product/card.php | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 818b2621fe9..edd309b9c15 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -68,7 +68,7 @@ if (!empty($conf->accounting->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
 }
 if (!empty($conf->bom->enabled)) {
-	require_once DOL_DOCUMENT_ROOT.'/bom/class/bom.class.php';
+  require_once DOL_DOCUMENT_ROOT.'/bom/class/bom.class.php';
 }
 
 // Load translation files required by the page
@@ -2280,16 +2280,6 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 					print '</td></tr>';
 				}
 
-				if ($conf->bom->enabled) {
-					print '<tr><td class="titlefield">'.$form->textwithpicto($langs->trans("DefaultBOM"), $langs->trans("DefaultBOMDesc")).'</td><td colspan="2">';
-					if ($object->fk_default_bom) {
-						$bom_static = new BOM($db);
-						$bom_static->fetch($object->fk_default_bom);
-						print $bom_static->getNomUrl(1);
-					}
-					print '</td></tr>';
-				}
-
 				// Brut Weight
 				if (empty($conf->global->PRODUCT_DISABLE_WEIGHT)) {
 					print '<tr><td class="titlefield">'.$langs->trans("Weight").'</td><td>';
@@ -2380,6 +2370,17 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				print '<tr><td>'.$langs->trans("QCFrequency").'</td><td>'.$object->qc_frequency.'</td></tr>';
 			}
 
+			if (!$object->isService() && !empty($conf->bom->enabled)) {
+				print '<tr><td class="titlefield">'.$form->textwithpicto($langs->trans("DefaultBOM"), $langs->trans("DefaultBOMDesc")).'</td><td>';
+				if ($object->fk_default_bom) {
+					$bom_static = new BOM($db);
+					$bom_static->fetch($object->fk_default_bom);
+					print $bom_static->getNomUrl(1);
+				}
+				print '</td></tr>';
+			}
+
+
 			// Other attributes
 			$parameters = array();
 			include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';

From 0d2e3ece1a8c30e1d04affe71e33040f75ce371f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 11 Aug 2021 21:50:28 +0200
Subject: [PATCH 1496/1497] Update card.php

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

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index edd309b9c15..6a87350f02b 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1912,7 +1912,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print '<table class="border centpercent">';
 
 			if (!$object->isService() && !empty($conf->bom->enabled)) {
-					print '<tr><td>'.$form->textwithpicto($langs->trans("DefaultBOM"), $langs->trans("DefaultBOMDesc")).'</td><td colspan="3">';
+					print '<tr><td>'.$form->textwithpicto($langs->trans("DefaultBOM"), $langs->trans("DefaultBOMDesc")).'</td><td>';
 					$bomkey = "Bom:bom/class/bom.class.php:0:t.status=1 AND t.fk_product=".$object->id;
 					print $form->selectForForms($bomkey, 'fk_default_bom', $object->fk_default_bom, 1);
 					print '</td></tr>';

From d66df5cb6082bf8517c34e5ccd692434c7f8341b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 11 Aug 2021 21:53:21 +0200
Subject: [PATCH 1497/1497] Complete #15548

---
 htdocs/install/mysql/migration/14.0.0-15.0.0.sql | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/install/mysql/migration/14.0.0-15.0.0.sql b/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
index 274e3b145e0..92eb2b7a012 100644
--- a/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
+++ b/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
@@ -60,3 +60,5 @@ ALTER TABLE llx_product_customer_price MODIFY COLUMN ref_customer varchar(128);
 
 -- -- add action trigger
 INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) VALUES ('ORDER_SUPPLIER_CANCEL','Supplier order request canceled','Executed when a supplier order is canceled','order_supplier',13);
+
+ALTER TABLE llx_product ADD COLUMN fk_default_bom integer DEFAULT NULL;